diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
new file mode 100644
index 00000000..51f1a321
--- /dev/null
+++ b/.github/FUNDING.yml
@@ -0,0 +1,4 @@
+# These are supported funding model platforms
+
+patreon: riverfor
+custom: ["https://paypal.me/qpyriver"]
diff --git a/.gitignore b/.gitignore
index f3579da9..1c454d72 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,29 @@
 *.iml
 .gradle
 build
+__MACOSX
 .idea
-gradle
+keystore
 .DS_Store
-*.pyc
+local.properties
+*.apk
+qbaselib.iml
+.*
+!/.gitignore
+gradle-wrapper.properties
+Android.mk
+qpython/src/main/jni/python/libpython2.7.b
+qpysdk/src/main/obj
+values-fr
+values-tr
+build.gradle.new
+captures
+old.git
+qpython/qpython.key
+qpython/cn/release/output.json
+qpython/od/release/*
+qpython/cn
+qpython/google
+qpython/os
+qpython/ol
+qpython/op
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 00000000..441d4c0b
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,12 @@
+[submodule "qbaselib"]
+	path = qbaselib
+	url = git@github.com:qpython-android/qbaselib.git
+[submodule "qftplib"]
+	path = qftplib
+	url = git@github.com:qpython-android/qftplib.git
+[submodule "qpysdk/src/main/jni"]
+	path = qpysdk/src/main/jni
+	url = git@github.com:qpython-android/pygamesdl2-jni.git
+[submodule "qpysl4a"]
+	path = qpysl4a
+	url = git@github.com:qpython-android/qpysl4a.git
diff --git a/LICENSE b/LICENSE
deleted file mode 100644
index 33396733..00000000
--- a/LICENSE
+++ /dev/null
@@ -1,13 +0,0 @@
-Copyright [2017] [YAN HECUN <river@qpython.org>]
-
-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.
diff --git a/README.md b/README.md
index 29bef179..9912213e 100644
--- a/README.md
+++ b/README.md
@@ -1,58 +1,79 @@
-# QPython Project
-<p align="center"><a href="http://www.qpython.org" target="_blank"><img src="http://www.qpython.org/images/bestpython.png"></a></p>
+# About
 
-Welcome to read the QPython guide!
 
-QPython is a script engine that runs Python on android devices. It lets your android device run Python scripts and projects. It contains the Python interpreter, console, editor, and the SL4A Library for Android. It’s Python on Android!
+<p align="center"><a href="https://play.google.com/store/apps/details?id=org.qpython.qpy" target="_blank"><img src="https://lh3.googleusercontent.com/E2sU2Mca-geyscWogW2ZsQC3dY1Y46a3HU35NoHv0AIBvCgQn_ZRZ2MOeA5tg3YkWg=s360-rw"></a></p>
 
+Welcome to the QPython project!
 
-QPython has several millions users in the world already, it's a great project for programming users, welcome to join us for contributing to this project NOW.
+QPython is the Python engine for android. It contains some amazing features such as Python interpreter, runtime environment, editor and QPYI and integrated SL4A. It makes it easy for you to use Python on Android. And it's FREE.
 
+Compared with other Python apps, QPython mainly solves how to use Python to drive your Android device work. Good SL4A support is our main goal, such as android's camera, sensor, sms media APIs etc.
 
-What's NEW
-------------------------
-QPython project include the QPython https://play.google.com/store/apps/details?id=org.qpython.qpy and QPython3 https://play.google.com/store/apps/details?id=org.qpython.qpy3 applications.
+QPython already has millions of users worldwide and it is also an open source project.
 
-QPython application is using the **Python 2.7.2** , and QPython application is using the  **Python 3.2.2** .
+For different usage scenarios, QPython has two branches, namely QPython Ox and 3x.
 
+QPython Ox is mainly aimed at programming learners, and it provides more friendly features for beginners.
+QPython 3x is mainly for experienced Python users, and it provides some advanced technical features.
 
-QPython's newest version is 1.3.0 (Released on 2017/3/20) , QPython3's newest version is 1.0.2 (Released on 2017/3/29), New versions include many amazing features, please upgrade to the newest version as soon from google play, amazon appstore etc.
+## Quick start
 
+This repository is the QPython Ox project repository, you can follow the below steps to run it.
 
-Thanks these guys who are contributing
-----------------------------------------
-They are pushing on the QPython project moving forward.
+- Macos + Android studio, (Ubuntu may work too)
+- git clone git@github.com:qpython-android/qpython.git
+- git submodule init
+- git submodule sync
+- git submodule update
+- build it...
 
-River, Mae, Zoom.Quiet, MathiasLuo, liyuanrui, Kyle kersey ...
+Get more information from [wiki](https://github.com/qpython-android/qpython/wiki) for developing QPython
 
+## Related 
 
-Do you want to join the great QPython team ? You could Ask qustions on twitter https://twitter.com/qpython or email us mailto:support@qpython.org.
-And you could fork us on github https://github.com/qpython-android/qpython and send pull request.
+- [QPython 3x features](https://github.com/qpython-android/qpython.org/blob/master/qpython-docs/source/en/qpython_3x_featues.rst), [QPython Ox features](https://github.com/qpython-android/qpython.org/blob/master/qpython-docs/source/en/qpython_ox_featues.rst)
+- [QPySL4A APIs](https://github.com/qpython-android/qpysl4a/blob/master/doc/en/APIs.rst) and [test scripts](https://github.com/qpython-android/qpysl4a/issues/1)
+- QPYPI Packages
 
+## How to ask QPython related questions
+In order to benefit those guys who have the same issue with QPython, we suggest that you should ask the issue which is related with QPython within public techical communities.
 
-QPython Communities
-----------------------
-**There are many active QPython communities where you could meet the QPython users like you**
 
-* Join Facebook community https://www.facebook.com/groups/qpython
-* Join Google group https://groups.google.com/forum/#!forum/qpython
-* Join Gitter chat https://gitter.com/qpython-android/qpython
-* Join G+ community https://plus.google.com/communities/111759148772865961493
-* QPython on Stackoverflow http://stackoverflow.com/questions/tagged/qpython
+### English QPythonista Community
 
-**And you could talk to us through social network**
+- [Ask in stackoverflow](https://stackoverflow.com/questions/tagged/qpython)
+- [Discuss QPython Programming in QPython Group](https://www.facebook.com/groups/qpython/)
 
-* Like us on facebook https://www.facebook.com/QPython
-* Follow us on twitter https://twitter.com/qpython
+### Chinese QPythonista Community
 
-* Report issue https://github.com/qpython-android/qpython/issues
-* Email us mailto:support@qpython.org
+- [在segmentfault提问 - Chinese](https://segmentfault.com/t/qpython)
+- [在贴吧讨论 - Chinese](https://tieba.baidu.com/f?ie=utf-8&kw=qpython)
 
+### Report issues
 
-Support
--------------
-We are happy to hear feedback from you,  but sometimes some bugs or features demand may not be implemented soon for we lack resources.
+Please tell us your phone's informatioin, android os information, QPython branch, and your code, where did you install it and the detailed stituation you have encountered.
 
-So if you have any issue need the core developer team to solve with higher priority, you could try the https://www.bountysource.com .
+- [Report an app's issue](https://github.com/qpython-android/qpython/issues)
+- [Report an non-app's issue](https://github.com/qpython-android/qpython.org/issues)
+- [Request to support a package](https://github.com/qpython-android/qpypi/issues)
 
-**It's the official QPython Users & Contributors' Guide, please follow http://www.qpython.org for more information.**
+## Donation
+
+- harford (Wechat)
+- 晨晖 (Wechat)
+
+THANK YOU VERY MUCH FOR DONATION!
+
+
+## How to contribute
+WE NEED YOUR HELP AND CONTRIBUTE, WE WILL BE VERY GRATEFUL IF YOU CAN TELL US YOUR IDEA OR SUGGESTION.
+
+IF YOU WANT TO PARTICIPATE THIS PROJECT, PLEASE SEND YOUR EMAIL TO US, WE WILL INVITE YOU INTO QPYTHON SLACK GROUP WHERE WE WILL DISCUSS HOW TO PUSH ON QPYTHON.
+
+- Email: support@qpython.org
+- Twitter: @qpython
+- Facebook: https://www.facebook.com/qpython
+
+Or you can join [qpython slack](https://join.slack.com/t/qpython/shared_invite/enQtOTI1MDY1NzM4NjU2LTljZDI3MjI0ZmZmNzIwNzAwMTU2ZDIyNGRjMTJiOTQ4MzgzY2Y3NDU5YzJjNTQ5MmM4Nzk2MGI4YWZmY2VhOTU)
+
+THANK YOU.
diff --git a/build.gradle b/build.gradle
index d769076f..d576ffd4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,31 +1,52 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
+def supportVersion = "28.0.0" // equals to line60
+def retrofitVersion = "2.1.0"
+def rxVersion = "1.2.1"
 
-//task wrapper(type: Wrapper) {
-//    ersion = '2.2.1'
-//    gradleV
-//    distributionUrl = 'https://services.gradle.org/distributions/gradle-2.2.1-all.zip'
-//}
+def okhttpVersion = '3.10.0'
+
+def butterknifeVersion = '9.0.0' //eqals to line 26
 
 buildscript {
     repositories {
         jcenter()
+        google()
         mavenCentral()
+
+        maven { url "https://plugins.gradle.org/m2/" }
+        maven { url "https://maven.google.com" }
     }
+
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.0'
-        classpath 'me.tatarka:gradle-retrolambda:3.2.5'
-        classpath 'com.jakewharton.sdkmanager:gradle-plugin:0.12.0'
-        classpath "io.realm:realm-gradle-plugin:1.1.1"
-        classpath 'com.jakewharton:butterknife-gradle-plugin:8.5.1'
-        classpath "io.realm:realm-gradle-plugin:3.0.0"
+        classpath 'com.android.tools.build:gradle:3.5.3'
+
+        // A gradle plugin for getting java lambda support in java 6, 7 and android
+        // https://github.com/evant/gradle-retrolambda
+        classpath 'me.tatarka:gradle-retrolambda:3.7.0'
+
+        // Gradle plugin which downloads and manages your Android SDK.
+        //classpath 'com.jakewharton.sdkmanager:gradle-plugin:0.12.0'
+
+        // Field and method binding for Android views which uses annotation processing to generate boilerplate code for you.
+        // https://github.com/JakeWharton/butterknife
+        classpath "com.jakewharton:butterknife-gradle-plugin:9.0.0-rc2"
+
+        // Realm is a mobile database: a replacement for SQLite & ORMs
+        // https://github.com/realm/realm-java
+        classpath "io.realm:realm-gradle-plugin:3.5.0"
+
+        classpath 'com.google.gms:google-services:4.0.2'
     }
 }
 
 allprojects {
     repositories {
         jcenter()
+        google()
+
+        mavenCentral()
         maven { url "https://jitpack.io" }
         maven { url 'https://dl.bintray.com/azeesoft/maven' }
+        //maven { url "http://mvn.leancloud.cn/nexus/content/repositories/public" }
     }
 }
 
@@ -33,12 +54,65 @@ task clean(type: Delete) {
     delete rootProject.buildDir
 }
 
-
 subprojects {
     def androidHome
-
     if ((androidHome = System.env.'ANDROID_HOME')
             && (androidHome = androidHome as File).exists()
-            && androidHome.canWrite())
-        apply plugin: 'android-sdk-manager'
+            && androidHome.canWrite()) {
+        //apply plugin: 'android-sdk-manager'
+    }
+
+    project.configurations.all {
+        resolutionStrategy.eachDependency { details ->
+            if (details.requested.group == 'com.android.support'
+                    && !details.requested.name.contains('multidex')) {
+                details.useVersion "${supportVersion}"
+            }
+        }
+
+    }
 }
+
+ext {
+    libOkHttp3 = "com.squareup.okhttp3:okhttp:${okhttpVersion}"
+
+    libRxJava = "io.reactivex:rxandroid:${rxVersion}"
+    libRxAndroid = "io.reactivex:rxjava:${rxVersion}"
+    libFileDownloaderLib = 'com.liulishuo.filedownloader:library:0.3.5'
+
+    libSupportV4 = "com.android.support:support-v4:${supportVersion}"
+    libSupportV4Design = 'com.android.support:design:${supportVersion}'
+
+    libSupportV7 = "com.android.support:appcompat-v7:${supportVersion}"
+    libSupportCardView = "com.android.support:cardview-v7:${supportVersion}"
+
+    libSupportPreference = "com.android.support:preference-v14:${supportVersion}"
+    libSupportAnnotation = "com.android.support:support-annotations:${supportVersion}"
+    libSupportDesign = "com.android.support:design:${supportVersion}"
+    libOkHttp3Log = "com.squareup.okhttp3:logging-interceptor:${okhttpVersion}"
+
+    minSdkVersion = 14
+    targetSdkVersion = 28
+    compileSdkVersion = 28
+    buildToolsVersion = '28.0.3'
+
+    // firebase related https://firebase.google.com/docs/android/setup
+    firebaseCore = "com.google.firebase:firebase-core:16.0.6"
+    firebaseMsg = "com.google.firebase:firebase-messaging:17.3.4"
+    firebaseAuth = "com.google.firebase:firebase-auth:16.1.0"
+    firebaseDatabase = "com.google.firebase:firebase-database:16.0.5"
+
+    // https://developers.google.com/android/guides/setup
+    googlePlayServiceAuth = "com.google.android.gms:play-services-auth:16.0.1"
+
+    leakcanaryDebug = 'com.squareup.leakcanary:leakcanary-android:1.5.4'
+    leakcanaryRelease = 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.4'
+    libGoogleGuava = 'com.google.guava:guava:18.0'
+
+    retrofit = "com.squareup.retrofit2:retrofit:${retrofitVersion}"
+    retrofitCoverterGson = "com.squareup.retrofit2:converter-gson:${retrofitVersion}"
+    retrofitAdapterRxjava = "com.squareup.retrofit2:adapter-rxjava:${retrofitVersion}"
+
+    libButterknife = "com.jakewharton:butterknife:${butterknifeVersion}"
+    libButterknifeCompiler ="com.jakewharton:butterknife-compiler:${butterknifeVersion}"
+}
\ No newline at end of file
diff --git a/debug.keystore b/debug.keystore
new file mode 100644
index 00000000..70dc936c
Binary files /dev/null and b/debug.keystore differ
diff --git a/docs/.buildinfo b/docs/.buildinfo
deleted file mode 100644
index 6a83f7d7..00000000
--- a/docs/.buildinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-# Sphinx build info version 1
-# This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
-config: 0991b60e109f8efd00cf6abd94a92cc2
-tags: 645f666f9bcd5a90fca523b33c5a78b7
diff --git a/docs/CNAME b/docs/CNAME
deleted file mode 100644
index 4632497e..00000000
--- a/docs/CNAME
+++ /dev/null
@@ -1 +0,0 @@
-www.qpython.org
diff --git a/docs/QPython_3x_featues.md b/docs/QPython_3x_featues.md
new file mode 100644
index 00000000..491234b5
--- /dev/null
+++ b/docs/QPython_3x_featues.md
@@ -0,0 +1,36 @@
+# QPython 3x featues
+
+Because google play and some appstores have strict requirements on the permissions of the app, we use different strategies in different appstores, which is why the branch name will be different. For example, L means Limited, and S means it contains Sensitive permissions.
+
+## Python
+- Python3.6.6
+- QRCode Reader
+- Editor
+- QPYPI
+- Ftp
+
+## Android Permissions
+
+### Both QPython 3S and 3L
+
+- android.permission.INTERNET
+- android.permission.ACCESS_SUPERUSER
+- android.permission.WAKE_LOCK
+- android.permission.ACCESS_NETWORK_STATE
+- android.permission.ACCESS_WIFI_STATE
+- android.permission.RECEIVE_BOOT_COMPLETED
+- android.permission.CAMERA
+- android.permission.FLASHLIGHT
+- android.permission.VIBRATE
+- android.permission.RECEIVE_USER_PRESENT
+- com.android.vending.BILLING
+- com.android.browser.permission.READ_HISTORY_BOOKMARKS
+- com.android.browser.permission.WRITE_HISTORY_BOOKMARKS
+- com.android.launcher.permission.INSTALL_SHORTCUT
+- com.android.launcher.permission.UNINSTALL_SHORTCUT
+- android.permission.READ_EXTERNAL_STORAGE
+- android.permission.WRITE_EXTERNAL_STORAGE
+- android.permission.ACCESS_COARSE_LOCATION
+- android.permission.ACCESS_FINE_LOCATION
+
+### QPython 3S
diff --git a/docs/QPython_Ox_featues.md b/docs/QPython_Ox_featues.md
new file mode 100644
index 00000000..fdfb8c09
--- /dev/null
+++ b/docs/QPython_Ox_featues.md
@@ -0,0 +1,40 @@
+# QPython Ox featues
+
+Because google play and some appstores have strict requirements on the permissions of the app, we use different strategies in different appstores, which is why the branch name will be different. For example, L means Limited, and S means it contains Sensitive permissions.
+
+## Python
+- Python3 + Python2 basis
+- QRCode Reader
+- Editor
+- QPYPI
+- Ftp
+- Course
+
+## Permissions
+### Both QPython OL and OS
+- android.permission.INTERNET
+- android.permission.ACCESS_SUPERUSER
+- android.permission.WAKE_LOCK
+- android.permission.ACCESS_NETWORK_STATE
+- android.permission.ACCESS_WIFI_STATE
+- android.permission.RECEIVE_BOOT_COMPLETED
+- android.permission.CAMERA
+- android.permission.FLASHLIGHT
+- android.permission.VIBRATE
+- android.permission.RECEIVE_USER_PRESENT
+- com.android.vending.BILLING
+- com.android.browser.permission.READ_HISTORY_BOOKMARKS
+- com.android.browser.permission.WRITE_HISTORY_BOOKMARKS
+- com.android.launcher.permission.INSTALL_SHORTCUT
+- com.android.launcher.permission.UNINSTALL_SHORTCUT
+- android.permission.READ_EXTERNAL_STORAGE
+- android.permission.WRITE_EXTERNAL_STORAGE
+- android.permission.ACCESS_COARSE_LOCATION
+- android.permission.ACCESS_FINE_LOCATION
+
+### QPython OS
+- android.permission.FOREGROUND_SERVICE
+- android.permission.BLUETOOTH
+- android.permission.BLUETOOTH_ADMIN
+- android.permission.NFC
+- android.permission.RECORD_AUDIO
diff --git a/docs/README.md b/docs/README.md
new file mode 100644
index 00000000..42a966ab
--- /dev/null
+++ b/docs/README.md
@@ -0,0 +1,2 @@
+# About
+QPython documentation
diff --git a/docs/_sources/document.txt b/docs/_sources/document.txt
deleted file mode 100644
index 7ef4e7ee..00000000
--- a/docs/_sources/document.txt
+++ /dev/null
@@ -1,111 +0,0 @@
-.. QPython documentation master file, created by
-   sphinx-quickstart on Fri Apr  7 15:07:35 2017.
-   You can adapt this file completely to your liking, but it should at least
-   contain the root `toctree` directive.
-
-.. image:: _static/bestpython.png
-
-
-Welcome to read the QPython guide!
-=============================================
-
-QPython is a script engine that runs Python on android devices. It lets your android device run Python scripts and projects. It contains the Python interpreter, console, editor, and the SL4A Library for Android. It’s Python on Android!
-
-
-QPython has several millions users in the world already, it's a great project for programming users, welcome to join us for contributing to this project NOW.
-
-
-What's NEW
-------------------------
-QPython project include the `QPython <https://play.google.com/store/apps/details?id=org.qpython.qpy>`_ and `QPython3 <https://play.google.com/store/apps/details?id=org.qpython.qpy3>`_ applications.
-
-QPython application is using the **Python 2.7.2** , and QPython application is using the  **Python 3.2.2** .
-
-
-QPython's newest version is 1.3.2 (Released on 2017/5/12) , QPython3's newest version is 1.0.2 (Released on 2017/3/29), New versions include many amazing features, please upgrade to the newest version as soon from google play, amazon appstore etc.
-
-
-Thanks these guys who are contributing
-----------------------------------------
-They are pushing on the QPython project moving forward.
-
-.. image:: https://avatars0.githubusercontent.com/u/3059527?v=3&s=60
-   :target: https://github.com/riverfor
-   :alt: River is the project's organizer and the current online QPython's author.
-
-.. image:: https://avatars0.githubusercontent.com/u/10812534?v=3&s=60
-   :target: https://github.com/pollyfat
-   :alt: Mae is a beautiful and talented girl developer who is good at python & android programming.
-
-.. image:: https://avatars0.githubusercontent.com/u/22494?v=3&s=60
-   :target: https://github.com/ZoomQuiet
-   :alt: Zoom.Quiet is a knowledgeable guy who is famous in many opensource communities.
-
-.. image:: https://avatars3.githubusercontent.com/u/10219741?v=3&s=60
-   :target: https://github.com/mathiasluo
-   :alt: MathiasLuo is a android geek developer
-
-.. image:: https://avatars2.githubusercontent.com/u/25975283?v=3&s=60
-   :target: https://github.com/liyuanrui
-   :alt: liyuanrui is a Chinese geek
-
-.. image:: https://avatars3.githubusercontent.com/u/5159173?v=3&s=60
-   :target: https://github.com/kylelk
-   :alt: Kyle kersey is a US geek
-
-
-Do you want to join the great QPython team ? You could `Ask qustions on twitter <https://twitter.com/qpython>`_ or `email us <mailto:support@qpython.org>`_.
-And you could `fork us on github <https://github.com/qpython-android/qpython>`_ and send pull request.
-
-
-QPython Communities
-----------------------
-**There are many active QPython communities where you could meet the QPython users like you**
-
-* `Join Facebook community <https://www.facebook.com/groups/qpython>`_
-* `Join Google group <https://groups.google.com/forum/#!forum/qpython>`_
-* `Join Gitter chat <https://gitter.com/qpython-android/qpython>`_
-* `Join G+ community(For QPython testers) <https://plus.google.com/communities/111759148772865961493>`_
-* `QPython on Stackoverflow <http://stackoverflow.com/questions/tagged/qpython>`_
-
-**And you could talk to us through social network**
-
-* `Like us on facebook <https://www.facebook.com/QPython>`_
-* `Follow us on twitter <https://twitter.com/qpython>`_
-
-* `Report issue <https://github.com/qpython-android/qpython/issues>`_
-* `Email us <mailto:support@qpython.org>`_
-
-
-**It's the official QPython Users & Contributors' Guide, please follow these steps for using and contributing.**
-
-Support
--------------
-We are happy to hear feedback from you,  but sometimes some bugs or features demand may not be implemented soon for we lack resources.
-
-So if you have any issue need the core developer team to solve with higher priority, you could try the `bountysource service <https://www.bountysource.com/>`_.
-
-
-
-Now, let's GO
----------------
-.. toctree::
-   :maxdepth: 2
-
-   en/guide
-
-Others
----------------
-.. toctree::
-   :maxdepth: 2
-
-   en/faq
-
-
-For Chinese users
--------------------
-.. toctree::
-   :maxdepth: 2
-
-   zhindex
-
diff --git a/docs/_sources/en/faq.txt b/docs/_sources/en/faq.txt
deleted file mode 100644
index a891d3dd..00000000
--- a/docs/_sources/en/faq.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-FAQ
-====
-
-
-**How to run qpython script from other terminals ?**
-
--  You could "share to" qpython from 3rd apps.
-
-- You need to root the android device first, then soure the env vars  (Just like the qpython wiki link you mentioned) and execute the /data/data/org.qpython.qpy/bin/python or /data/data/org.qpython.qpy/bin/python-android5 (for android 5 above)
-
-
-`Case sample <http://stackoverflow.com/questions/32110131/how-to-run-android-qpython-script-from-cmd-droidedit-terminal>`_
-
-
-
-**Support pygame ?**
-
-Even you could import pygame in QPython, but QPython doesn't support pygame now.
-
-We will consider to support it later, please follow us on facebook to get it's progress.
-
-
-`Case sample <http://stackoverflow.com/questions/30489732/qpythonpygame-segmentation-fault>`_
-
-
-
diff --git a/docs/_sources/en/guide.txt b/docs/_sources/en/guide.txt
deleted file mode 100644
index e13917ea..00000000
--- a/docs/_sources/en/guide.txt
+++ /dev/null
@@ -1,47 +0,0 @@
-Getting started
-==========================
-How to start quickly ? Just follow the following steps:
-
-.. toctree::
-   :maxdepth: 2
-
-   guide_howtostart
-   guide_helloworld
-
-
-Programming Guide
-========================
-
-If you you want to know more about how to program through qpython, just follow these steps:
-
-
-.. toctree::
-   :maxdepth: 2
-
-   guide_program
-   guide_ide
-   guide_libraries
-   guide_extend
-
-
-**QPython project is not only a powerful Python engine for android, but is a active technology community also.**
-
-Developers' Guide
-=======================
-QPython developers' goal is pushing out a great Python for android.
-
-.. toctree::
-   :maxdepth: 2
-
-   guide_developers
-
-
-Contributors' Guide
-========================
-
-Welcome to join QPython contributors team, you are not just a user, but a creator of QPython.
-
-.. toctree::
-   :maxdepth: 2
-
-   guide_contributors
diff --git a/docs/_sources/en/guide_androidhelpers.txt b/docs/_sources/en/guide_androidhelpers.txt
deleted file mode 100644
index 1dd97265..00000000
--- a/docs/_sources/en/guide_androidhelpers.txt
+++ /dev/null
@@ -1,2035 +0,0 @@
-The Scripting Layer for Android (abridged as SL4A, and previously named Android Scripting Environment or ASE) is a library that allows the creation and running of scripts written in various scripting languages directly on Android devices. QPython start to extend the SL4A project and integrate it.
-
-
-.. image:: ../_static/sl4a.jpg
-
-There are many SL4A APIs, if you found any issue, please `report an issue <https://github.com/qpython-android/qpython/issues>`_.
-
-AndroidFacade
-===============
-
-Clipboard APIs
-----------------
-.. py:function:: setClipboard(text)
-
-   Put text in the clipboard
-
-   :param str text: text
-
-.. py:function:: getClipboard(text)
-
-   Read text from the clipboard
-
-   :return: The text in the clipboard
-
-
-::
-
-    sample code to show setClipboard/getClipboard
-
-
-Intent & startActivity APIs
-----------------------------------
-.. py:function:: makeIntent(action, uri, type, extras, categories, packagename, classname, flags)
-
-   Starts an activity and returns the result
-
-   :param str action: action
-   :param str uri(Optional): uri
-   :param str type(Optional): MIME type/subtype of the URI
-   :param object extras(Optional): a Map of extras to add to the Intent
-   :param list categories(Optional): a List of categories to add to the Intent
-   :param str packagename(Optional): name of package. If used, requires classname to be useful
-   :param str classname(Optional): name of class. If used, requires packagename to be useful
-   :param int flags(Optional): Intent flags
-
-   :return: An object representing an Intent
-
-
-::
-
-    sample code to show makeIntent
-
-
-.. py:function:: getIntent()
-
-   Returns the intent that launched the script
-
-::
-
-    sample code to show getIntent
-
-
-.. py:function:: startActivityForResult(action, uri, type, extras, packagename, classname)
-
-   Starts an activity and returns the result
-
-   :param str action: action
-   :param str uri(Optional): uri
-   :param str type(Optional): MIME type/subtype of the URI
-   :param object extras(Optional): a Map of extras to add to the Intent
-   :param str packagename(Optional): name of package. If used, requires classname to be useful
-   :param str classname(Optional): name of class. If used, requires packagename to be useful
-
-   :return: A Map representation of the result Intent
-
-
-::
-
-    sample code to show startActivityForResult
-
-
-.. py:function:: startActivityForResultIntent(intent)
-
-   Starts an activity and returns the result
-
-   :param Intent intent: Intent in the format as returned from makeIntent
-
-   :return: A Map representation of the result Intent
-
-
-::
-
-    sample code to show startActivityForResultIntent
-
-.. py:function:: startActivityIntent(intent, wait)
-
-   Starts an activity
-
-   :param Intent intent: Intent in the format as returned from makeIntent
-   :param bool wait(Optional): block until the user exits the started activity
-
-::
-
-    sample code to show startActivityIntent
-
-
-.. py:function:: startActivity(action, uri, type, extras, wait, packagename, classname)
-
-   Starts an activity
-
-   :param str action: action
-   :param str uri(Optional): uri
-   :param str type(Optional): MIME type/subtype of the URI
-   :param object extras(Optional): a Map of extras to add to the Intent
-   :param bool wait(Optional): block until the user exits the started activity
-   :param str packagename(Optional): name of package. If used, requires classname to be useful
-   :param str classname(Optional): name of class. If used, requires packagename to be useful
-
-::
-
-    sample code to show startActivityForResultIntent
-
-
-SendBroadcast APIs
--------------------
-.. py:function:: sendBroadcast(action, uri, type, extras, packagename, classname)
-
-   Send a broadcast
-
-   :param str action: action
-   :param str uri(Optional): uri
-   :param str type(Optional): MIME type/subtype of the URI
-   :param object extras(Optional): a Map of extras to add to the Intent
-   :param str packagename(Optional): name of package. If used, requires classname to be useful
-   :param str classname(Optional): name of class. If used, requires packagename to be useful
-
-
-::
-
-    sample code to show sendBroadcast
-
-.. py:function:: sendBroadcastIntent(intent)
-
-   Send a broadcast
-
-   :param Intent intent: Intent in the format as returned from makeIntent
-
-::
-
-    sample code to show sendBroadcastIntent
-
-
-Vibrate
-----------
-.. py:function:: vibrate(intent)
-
-   Vibrates the phone or a specified duration in milliseconds
-
-   :param int duration: duration in milliseconds
-
-::
-
-    sample code to show vibrate
-
-
-NetworkStatus
----------------
-.. py:function:: getNetworkStatus()
-
-   Returns the status of network connection
-
-::
-
-    sample code to show getNetworkStatus
-
-PackageVersion APIs
-------------------------------
-.. py:function:: requiredVersion(requiredVersion)
-
-   Checks if version of QPython SL4A is greater than or equal to the specified version
-
-   :param int requiredVersion: requiredVersion
-
-   :return: true or false
-
-
-.. py:function:: getPackageVersionCode(packageName)
-
-   Returns package version code
-
-   :param str packageName: packageName
-
-   :return: Package version code
-
-.. py:function:: getPackageVersion(packageName)
-
-   Returns package version name
-
-   :param str packageName: packageName
-
-   :return: Package version name
-
-
-::
-
-    sample code to show getPackageVersionCode & getPackageVersion
-
-
-System APIs
---------------------------------
-.. py:function:: getConstants(classname)
-
-   Get list of constants (static final fields) for a class
-
-   :param str classname: classname
-
-   :return: list
-
-::
-
-    sample code to show getConstants
-
-.. py:function:: environment()
-
-   A map of various useful environment details
-
-   :return: environment map object includes id, display, offset, TZ, SDK, download, appcache, availblocks, blocksize, blockcount, sdcard
-
-::
-
-    sample code to show environment
-
-.. py:function:: log(message)
-
-   Writes message to logcat
-
-   :param str message: message
-
-::
-
-    sample code to show log
-
-
-SendEmail
-----------
-.. py:function:: sendEmail(to, subject, body, attachmentUri)
-
-   Launches an activity that sends an e-mail message to a given recipient
-
-   :param str to: A comma separated list of recipients
-   :param str subject: subject
-   :param str body: mail body
-   :param str attachmentUri(Optional): message
-
-::
-
-    sample code to show sendEmail
-
-
-Toast, getInput, getPassword, notify APIs
-------------------------------------------------
-.. py:function:: makeToast(message)
-
-   Displays a short-duration Toast notification
-
-   :param str message: message
-
-::
-
-    sample code to show makeToast
-
-.. py:function:: getInput(title, message)
-
-   Queries the user for a text input
-
-   :param str title: title of the input box
-   :param str message: message to display above the input box
-
-::
-
-    sample code to show getInput
-
-.. py:function:: getPassword(title, message)
-
-   Queries the user for a password
-
-   :param str title: title of the input box
-   :param str message: message to display above the input box
-
-::
-
-    sample code to show getPassword
-
-.. py:function:: notify(title, message, url)
-
-   Displays a notification that will be canceled when the user clicks on it
-
-   :param str title: title
-   :param str message: message 
-   :param str url(optional): url 
-
-::
-    import androidhelper
-    droid = androidhelper.Android()
-    droid.notify('Hello','QPython','http://qpython.org') # you could set the 3rd parameter None also
-
-
-
-ApplicationManagerFacade
-=========================
-
-Manager APIs
--------------
-
-.. py:function:: getLaunchableApplications()
-
-   Returns a list of all launchable application class names
-
-   :return: map object
-
-::
-
-    sample code to show getLaunchableApplications
-
-
-.. py:function:: launch(classname)
-
-   Start activity with the given class name
-
-   :param str classname: classname 
-
-::
-
-    sample code to show launch
-
-.. py:function:: getRunningPackages()
-
-   Returns a list of packages running activities or services
-
-   :return: List of packages running activities
-
-::
-
-    sample code to show getRunningPackages
-
-.. py:function:: forceStopPackage(packageName)
-
-   Force stops a package
-
-   :param str packageName: packageName
-
-::
-
-    sample code to show forceStopPackage
-
-
-CameraFacade
-=========================
-
-.. py:function:: cameraCapturePicture(targetPath)
-
-   Take a picture and save it to the specified path
-
-   :return: A map of Booleans autoFocus and takePicture where True indicates success
-
-.. py:function:: cameraInteractiveCapturePicture(targetPath)
-
-   Starts the image capture application to take a picture and saves it to the specified path
-
-CommonIntentsFacade
-=========================
-
-Barcode
-----------
-.. py:function:: scanBarcode()
-
-   Starts the barcode scanner
-
-   :return: A Map representation of the result Intent
-
-View APIs
-----------
-.. py:function:: pick(uri)
-
-   Display content to be picked by URI (e.g. contacts)
-
-   :return: A map of result values
-
-.. py:function:: view(uri, type, extras)
-
-   Start activity with view action by URI (i.e. browser, contacts, etc.)
-
-.. py:function:: viewMap(query)
-
-   Opens a map search for query (e.g. pizza, 123 My Street)
-
-.. py:function:: viewContacts()
-
-   Opens the list of contacts
-
-.. py:function:: viewHtml(path)
-
-   Opens the browser to display a local HTML file
-
-.. py:function:: search(query)
-
-   Starts a search for the given query
-
-ContactsFacade
-=========================
-
-.. py:function:: pickContact()
-
-   Displays a list of contacts to pick from
-
-   :return: A map of result values
-
-.. py:function:: pickPhone()
-
-   Displays a list of phone numbers to pick from
-
-   :return: The selected phone number
-
-.. py:function:: contactsGetAttributes()
-
-   Returns a List of all possible attributes for contacts
-
-   :return: a List of contacts as Maps
-
-.. py:function:: contactsGetIds()
-
-   Returns a List of all contact IDs
-
-.. py:function:: contactsGet(attributes)
-
-   Returns a List of all contacts
-
-.. py:function:: contactsGetById(id)
-
-   Returns contacts by ID
-
-.. py:function:: contactsGetCount()
-
-   Returns the number of contacts
-
-.. py:function:: queryContent(uri, attributes, selection, selectionArgs, order)
-
-   Content Resolver Query
-
-   :return: result of query as Maps
-
-.. py:function:: queryAttributes(uri)
-
-   Content Resolver Query Attributes
-
-   :return: a list of available columns for a given content uri
-
-EventFacade
-=========================
-
-.. py:function:: eventClearBuffer()
-
-   Clears all events from the event buffer
-
-.. py:function:: eventRegisterForBroadcast(category, enqueue)
-
-   Registers a listener for a new broadcast signal
-
-.. py:function:: eventUnregisterForBroadcast(category)
-
-   Stop listening for a broadcast signal
-
-.. py:function:: eventGetBrodcastCategories()
-
-   Lists all the broadcast signals we are listening for
-
-.. py:function:: eventPoll(number_of_events)
-
-   Returns and removes the oldest n events (i.e. location or sensor update, etc.) from the event buffer
-
-   :return: A List of Maps of event properties
-
-.. py:function:: eventWaitFor(eventName, timeout)
-
-   Blocks until an event with the supplied name occurs. The returned event is not removed from the buffer
-
-   :return: Map of event properties
-
-.. py:function:: eventWait(timeout)
-
-   Blocks until an event occurs. The returned event is removed from the buffer
-
-   :return: Map of event properties
-
-.. py:function:: eventPost(name, data, enqueue)
-
-   Post an event to the event queue
-
-.. py:function:: rpcPostEvent(name, data)
-
-   Post an event to the event queue
-
-.. py:function:: receiveEvent()
-
-   Returns and removes the oldest event (i.e. location or sensor update, etc.) from the event buffer
-
-   :return: Map of event properties
-
-.. py:function:: waitForEvent(eventName, timeout)
-
-   Blocks until an event with the supplied name occurs. The returned event is not removed from the buffer
-
-   :return: Map of event properties
-
-.. py:function:: startEventDispatcher(port)
-
-   Opens up a socket where you can read for events posted
-
-.. py:function:: stopEventDispatcher()
-
-   Stops the event server, you can't read in the port anymore
-
-LocationFacade
-=========================
-
-Providers APIs
------------------
-
-.. py:function:: locationProviders()
-
-   Returns availables providers on the phone
-
-.. py:function:: locationProviderEnabled(provider)
-
-   Ask if provider is enabled
-
-Location APIs
------------------
-.. py:function:: startLocating(minDistance, minUpdateDistance)
-
-   Starts collecting location data
-
-.. py:function:: readLocation()
-
-   Returns the current location as indicated by all available providers
-
-   :return: A map of location information by provider
-
-.. py:function:: stopLocating()
-
-   Stops collecting location data
-
-.. py:function:: getLastKnownLocation()
-
-   Returns the last known location of the device
-
-   :return: A map of location information by provider
-
-*sample code*
-::
-
-    Droid = androidhelper.Android()
-    location = Droid.getLastKnownLocation().result
-    location = location.get('network', location.get('gps'))
-
-
-GEO
------------
-.. py:function:: geocode(latitude, longitude, maxResults)
-
-   Returns a list of addresses for the given latitude and longitude
-
-   :return: A list of addresses
-
-PhoneFacade
-=========================
-
-PhoneStat APIs
-----------------
-
-.. py:function:: startTrackingPhoneState()
-
-   Starts tracking phone state
-
-.. py:function:: readPhoneState()
-
-   Returns the current phone state and incoming number
-
-   :return: A Map of "state" and "incomingNumber"
-
-.. py:function:: stopTrackingPhoneState()
-
-   Stops tracking phone state
-
-
-Call & Dia APIs
-----------------
-
-.. py:function:: phoneCall(uri)
-
-   Calls a contact/phone number by URI
-
-.. py:function:: phoneCallNumber(number)
-
-   Calls a phone number
-
-.. py:function:: phoneDial(uri)
-
-   Dials a contact/phone number by URI
-
-.. py:function:: phoneDialNumber(number)
-
-   Dials a phone number
-
-
-
-Get information APIs
-------------------------
-.. py:function:: getCellLocation()
-
-   Returns the current cell location
-
-.. py:function:: getNetworkOperator()
-
-   Returns the numeric name (MCC+MNC) of current registered operator
-
-.. py:function:: getNetworkOperatorName()
-
-   Returns the alphabetic name of current registered operator
-
-.. py:function:: getNetworkType()
-
-   Returns a the radio technology (network type) currently in use on the device
-
-.. py:function:: getPhoneType()
-
-   Returns the device phone type
-
-.. py:function:: getSimCountryIso()
-
-   Returns the ISO country code equivalent for the SIM provider's country code
-
-.. py:function:: getSimOperator()
-
-   Returns the MCC+MNC (mobile country code + mobile network code) of the provider of the SIM. 5 or 6 decimal digits
-
-.. py:function:: getSimOperatorName()
-
-   Returns the Service Provider Name (SPN)
-
-.. py:function:: getSimSerialNumber()
-
-   Returns the serial number of the SIM, if applicable. Return null if it is unavailable
-
-.. py:function:: getSimState()
-
-   Returns the state of the device SIM card
-
-.. py:function:: getSubscriberId()
-
-   Returns the unique subscriber ID, for example, the IMSI for a GSM phone. Return null if it is unavailable
-
-.. py:function:: getVoiceMailAlphaTag()
-
-   Retrieves the alphabetic identifier associated with the voice mail number
-
-.. py:function:: getVoiceMailNumber()
-
-   Returns the voice mail number. Return null if it is unavailable
-
-.. py:function:: checkNetworkRoaming()
-
-   Returns true if the device is considered roaming on the current network, for GSM purposes
-
-.. py:function:: getDeviceId()
-
-   Returns the unique device ID, for example, the IMEI for GSM and the MEID for CDMA phones. Return null if device ID is not available
-
-.. py:function:: getDeviceSoftwareVersion()
-
-   Returns the software version number for the device, for example, the IMEI/SV for GSM phones. Return null if the software version is not available
-
-.. py:function:: getLine1Number()
-
-   Returns the phone number string for line 1, for example, the MSISDN for a GSM phone. Return null if it is unavailable
-
-.. py:function:: getNeighboringCellInfo()
-
-   Returns the neighboring cell information of the device
-
-MediaRecorderFacade
-=========================
-
-
-Audio
---------
-
-.. py:function:: recorderStartMicrophone(targetPath)
-
-   Records audio from the microphone and saves it to the given location
-
-Video APIs
------------
-
-.. py:function:: recorderStartVideo(targetPath, duration, videoSize)
-
-   Records video from the camera and saves it to the given location.
-   Duration specifies the maximum duration of the recording session.
-   If duration is 0 this method will return and the recording will only be stopped
-   when recorderStop is called or when a scripts exits.
-   Otherwise it will block for the time period equal to the duration argument.
-   videoSize: 0=160x120, 1=320x240, 2=352x288, 3=640x480, 4=800x480.
-
-
-.. py:function:: recorderCaptureVideo(targetPath, duration, recordAudio)
-
-   Records video (and optionally audio) from the camera and saves it to the given location.
-   Duration specifies the maximum duration of the recording session.
-   If duration is not provided this method will return immediately and the recording will only be stopped
-   when recorderStop is called or when a scripts exits.
-   Otherwise it will block for the time period equal to the duration argument.
-
-.. py:function:: startInteractiveVideoRecording(path)
-
-   Starts the video capture application to record a video and saves it to the specified path
-
-
-Stop
---------
-.. py:function:: recorderStop()
-
-   Stops a previously started recording
-
-
-SensorManagerFacade
-=========================
-
-Start & Stop
--------------
-.. py:function:: startSensingTimed(sensorNumber, delayTime)
-
-   Starts recording sensor data to be available for polling
-
-.. py:function:: startSensingThreshold(ensorNumber, threshold, axis)
-
-   Records to the Event Queue sensor data exceeding a chosen threshold
-
-.. py:function:: startSensing(sampleSize)
-
-   Starts recording sensor data to be available for polling
-
-.. py:function:: stopSensing()
-
-   Stops collecting sensor data
-
-Read data APIs
----------------
-.. py:function:: readSensors()
-
-   Returns the most recently recorded sensor data
-
-.. py:function:: sensorsGetAccuracy()
-
-   Returns the most recently received accuracy value
-
-.. py:function:: sensorsGetLight()
-
-   Returns the most recently received light value
-
-.. py:function:: sensorsReadAccelerometer()
-
-   Returns the most recently received accelerometer values
-
-   :return: a List of Floats [(acceleration on the) X axis, Y axis, Z axis]
-
-.. py:function:: sensorsReadMagnetometer()
-
-   Returns the most recently received magnetic field values
-
-   :return: a List of Floats [(magnetic field value for) X axis, Y axis, Z axis]
-
-.. py:function:: sensorsReadOrientation()
-
-   Returns the most recently received orientation values
-
-   :return: a List of Doubles [azimuth, pitch, roll]
-
-*sample code*
-::
-
-    Droid = androidhelper.Android()
-    Droid.startSensingTimed(1, 250)
-    sensor = Droid.sensorsReadOrientation().result
-    Droid.stopSensing()
-
-
-SettingsFacade
-=========================
-
-Screen
-----------
-
-.. py:function:: setScreenTimeout(value)
-
-   Sets the screen timeout to this number of seconds
-
-   :return: The original screen timeout
-
-.. py:function:: getScreenTimeout()
-
-   Gets the screen timeout
-
-   :return: the current screen timeout in seconds
-
-AirplanerMode
----------------------
-
-.. py:function:: checkAirplaneMode()
-
-   Checks the airplane mode setting
-
-   :return: True if airplane mode is enabled
-
-.. py:function:: toggleAirplaneMode(enabled)
-
-   Toggles airplane mode on and off
-
-   :return: True if airplane mode is enabled
-
-Ringer Silent Mode
----------------------
-
-.. py:function:: checkRingerSilentMode()
-
-   Checks the ringer silent mode setting
-
-   :return: True if ringer silent mode is enabled
-
-.. py:function:: toggleRingerSilentMode(enabled)
-
-   Toggles ringer silent mode on and off
-
-   :return: True if ringer silent mode is enabled
-
-Vibrate Mode
----------------------
-
-.. py:function:: toggleVibrateMode(enabled)
-
-   Toggles vibrate mode on and off. If ringer=true then set Ringer setting, else set Notification setting
-
-   :return: True if vibrate mode is enabled
-
-.. py:function:: getVibrateMode(ringer)
-
-   Checks Vibration setting. If ringer=true then query Ringer setting, else query Notification setting
-
-   :return: True if vibrate mode is enabled
-
-Ringer & Media Volume
----------------------
-
-.. py:function:: getMaxRingerVolume()
-
-   Returns the maximum ringer volume
-
-.. py:function:: getRingerVolume()
-
-   Returns the current ringer volume
-
-.. py:function:: setRingerVolume(volume)
-
-   Sets the ringer volume
-
-.. py:function:: getMaxMediaVolume()
-
-   Returns the maximum media volume
-
-.. py:function:: getMediaVolume()
-
-   Returns the current media volume
-
-.. py:function:: setMediaVolume(volume)
-
-   Sets the media volume
-
-Screen Brightness
----------------------
-
-.. py:function:: getScreenBrightness()
-
-   Returns the screen backlight brightness
-
-   :return: the current screen brightness between 0 and 255
-
-.. py:function:: setScreenBrightness(value)
-
-   Sets the the screen backlight brightness
-
-   :return: the original screen brightness
-
-.. py:function:: checkScreenOn()
-
-   Checks if the screen is on or off (requires API level 7)
-
-   :return: True if the screen is currently on
-
-
-SmsFacade
-=========================
-
-.. py:function:: smsSend(destinationAddress, text)
-
-   Sends an SMS
-
-   :param str destinationAddress: typically a phone number
-   :param str text:
-
-.. py:function:: smsGetMessageCount(unreadOnly, folder)
-
-   Returns the number of messages
-
-   :param bool unreadOnly: typically a phone number
-   :param str folder(optional): default "inbox"
-
-.. py:function:: smsGetMessageIds(unreadOnly, folder)
-
-   Returns a List of all message IDs
-
-   :param bool unreadOnly: typically a phone number
-   :param str folder(optional): default "inbox"
-
-.. py:function:: smsGetMessages(unreadOnly, folder, attributes)
-
-   Returns a List of all messages
-
-   :param bool unreadOnly: typically a phone number
-   :param str folder: default "inbox"
-   :param list attributes(optional): attributes
-
-   :return: a List of messages as Maps
-
-.. py:function:: smsGetMessageById(id, attributes)
-
-   Returns message attributes
-
-   :param int id: message ID
-   :param list attributes(optional): attributes
-
-   :return: a List of messages as Maps
-
-.. py:function:: smsGetAttributes()
-
-   Returns a List of all possible message attributes
-
-.. py:function:: smsDeleteMessage(id)
-
-   Deletes a message
-
-   :param int id: message ID
-
-   :return: True if the message was deleted
-
-.. py:function:: smsMarkMessageRead(ids, read)
-
-   Marks messages as read
-
-   :param list ids: List of message IDs to mark as read
-   :param bool read:  true or false
-
-   :return: number of messages marked read
-
-SpeechRecognitionFacade
-=========================
-
-.. py:function:: recognizeSpeech(prompt, language, languageModel)
-
-   Recognizes user's speech and returns the most likely result
-
-   :param str prompt(optional): text prompt to show to the user when asking them to speak
-   :param str language(optional): language override to inform the recognizer that it should expect speech in a language different than the one set in the java.util.Locale.getDefault()
-   :param str languageModel(optional): informs the recognizer which speech model to prefer (see android.speech.RecognizeIntent)
-
-   :return: An empty string in case the speech cannot be recongnized
-
-
-ToneGeneratorFacade
-=========================
-
-.. py:function:: generateDtmfTones(phoneNumber, toneDuration)
-
-   Generate DTMF tones for the given phone number
-
-   :param str phoneNumber: phone number
-   :param int toneDuration(optional): default 100, duration of each tone in milliseconds
-
-
-WakeLockFacade
-=========================
-
-.. py:function:: wakeLockAcquireFull()
-
-   Acquires a full wake lock (CPU on, screen bright, keyboard bright)
-
-.. py:function:: wakeLockAcquirePartial()
-
-   Acquires a partial wake lock (CPU on)
-
-.. py:function:: wakeLockAcquireBright()
-
-   Acquires a bright wake lock (CPU on, screen bright)
-
-.. py:function:: wakeLockAcquireDim()
-
-   Acquires a dim wake lock (CPU on, screen dim)
-
-.. py:function:: wakeLockRelease()
-
-   Releases the wake lock
-
-WifiFacade
-=========================
-
-.. py:function:: wifiGetScanResults()
-
-   Returns the list of access points found during the most recent Wifi scan
-
-.. py:function:: wifiLockAcquireFull()
-
-   Acquires a full Wifi lock
-
-.. py:function:: wifiLockAcquireScanOnly()
-
-   Acquires a scan only Wifi lock
-
-.. py:function:: wifiLockRelease()
-
-   Releases a previously acquired Wifi lock
-
-.. py:function:: wifiStartScan()
-
-   Starts a scan for Wifi access points
-
-   :return: True if the scan was initiated successfully
-
-.. py:function:: checkWifiState()
-
-   Checks Wifi state
-
-   :return: True if Wifi is enabled
-
-.. py:function:: toggleWifiState(enabled)
-
-   Toggle Wifi on and off
-
-   :param bool enabled(optional): enabled
-
-   :return: True if Wifi is enabled
-
-.. py:function:: wifiDisconnect()
-
-   Disconnects from the currently active access point
-
-   :return: True if the operation succeeded
-
-.. py:function:: wifiGetConnectionInfo()
-
-   Returns information about the currently active access point
-
-.. py:function:: wifiReassociate()
-
-   Returns information about the currently active access point
-
-   :return: True if the operation succeeded
-
-.. py:function:: wifiReconnect()
-
-   Reconnects to the currently active access point
-
-   :return: True if the operation succeeded
-
-
-BatteryManagerFacade
-=========================
-
-.. py:function:: readBatteryData()
-
-   Returns the most recently recorded battery data
-
-.. py:function:: batteryStartMonitoring()
-
-   Starts tracking battery state
-
-.. py:function:: batteryStopMonitoring()
-
-   Stops tracking battery state
-
-.. py:function:: batteryGetStatus()
-
-   Returns  the most recently received battery status data:
-   1 - unknown;
-   2 - charging;
-   3 - discharging;
-   4 - not charging;
-   5 - full
-
-.. py:function:: batteryGetHealth()
-
-   Returns the most recently received battery health data:
-   1 - unknown;
-   2 - good;
-   3 - overheat;
-   4 - dead;
-   5 - over voltage;
-   6 - unspecified failure
-
-.. py:function:: batteryGetPlugType()
-
-   Returns the most recently received plug type data:
-   -1 - unknown
-   0 - unplugged
-   1 - power source is an AC charger
-   2 - power source is a USB port
-
-
-.. py:function:: batteryCheckPresent()
-
-   Returns the most recently received battery presence data
-
-.. py:function:: batteryGetLevel()
-
-   Returns the most recently received battery level (percentage)
-
-.. py:function:: batteryGetVoltage()
-
-   Returns the most recently received battery voltage
-
-.. py:function:: batteryGetTemperature()
-
-   Returns the most recently received battery temperature
-
-.. py:function:: batteryGetTechnology()
-
-   Returns the most recently received battery technology data
-
-
-ActivityResultFacade
-=========================
-
-.. py:function:: setResultBoolean(resultCode, resultValue)
-
-   Sets the result of a script execution. Whenever the script APK is called via startActivityForResult(),
-   the resulting intent will contain SCRIPT_RESULT extra with the given value
-
-   :param int resultCode:
-   :param byte resultValue:
-
-
-.. py:function:: setResultByte(resultCode, resultValue)
-
-   Sets the result of a script execution. Whenever the script APK is called via startActivityForResult(),
-   the resulting intent will contain SCRIPT_RESULT extra with the given value
-
-   :param int resultCode:
-   :param byte resultValue:
-
-.. py:function:: setResultShort(resultCode, resultValue)
-
-   Sets the result of a script execution. Whenever the script APK is called via startActivityForResult(),
-   the resulting intent will contain SCRIPT_RESULT extra with the given value
-
-   :param int resultCode:
-   :param byte resultValue:
-
-.. py:function:: setResultChar(resultCode, resultValue)
-
-   Sets the result of a script execution. Whenever the script APK is called via startActivityForResult(),
-   the resulting intent will contain SCRIPT_RESULT extra with the given value
-
-   :param int resultCode:
-   :param byte resultValue:
-
-
-.. py:function:: setResultInteger(resultCode, resultValue)
-
-   Sets the result of a script execution. Whenever the script APK is called via startActivityForResult(),
-   the resulting intent will contain SCRIPT_RESULT extra with the given value
-
-   :param int resultCode:
-   :param byte resultValue:
-
-.. py:function:: setResultLong(resultCode, resultValue)
-
-   Sets the result of a script execution. Whenever the script APK is called via startActivityForResult(),
-   the resulting intent will contain SCRIPT_RESULT extra with the given value
-
-   :param int resultCode:
-   :param byte resultValue:
-
-.. py:function:: setResultFloat(resultCode, resultValue)
-
-   Sets the result of a script execution. Whenever the script APK is called via startActivityForResult(),
-   the resulting intent will contain SCRIPT_RESULT extra with the given value
-
-   :param int resultCode:
-   :param byte resultValue:
-
-.. py:function:: setResultDouble(resultCode, resultValue)
-
-   Sets the result of a script execution. Whenever the script APK is called via startActivityForResult(),
-   the resulting intent will contain SCRIPT_RESULT extra with the given value
-
-   :param int resultCode:
-   :param byte resultValue:
-
-.. py:function:: setResultString(resultCode, resultValue)
-
-   Sets the result of a script execution. Whenever the script APK is called via startActivityForResult(),
-   the resulting intent will contain SCRIPT_RESULT extra with the given value
-
-   :param int resultCode:
-   :param byte resultValue:
-
-.. py:function:: setResultBooleanArray(resultCode, resultValue)
-
-   Sets the result of a script execution. Whenever the script APK is called via startActivityForResult(),
-   the resulting intent will contain SCRIPT_RESULT extra with the given value
-
-   :param int resultCode:
-   :param byte resultValue:
-
-.. py:function:: setResultByteArray(resultCode, resultValue)
-
-   Sets the result of a script execution. Whenever the script APK is called via startActivityForResult(),
-   the resulting intent will contain SCRIPT_RESULT extra with the given value
-
-   :param int resultCode:
-   :param byte resultValue:
-
-.. py:function:: setResultShortArray(resultCode, resultValue)
-
-   Sets the result of a script execution. Whenever the script APK is called via startActivityForResult(),
-   the resulting intent will contain SCRIPT_RESULT extra with the given value
-
-   :param int resultCode:
-   :param byte resultValue:
-
-.. py:function:: setResultCharArray(resultCode, resultValue)
-
-   Sets the result of a script execution. Whenever the script APK is called via startActivityForResult(),
-   the resulting intent will contain SCRIPT_RESULT extra with the given value
-
-   :param int resultCode:
-   :param byte resultValue:
-
-.. py:function:: setResultIntegerArray(resultCode, resultValue)
-
-   Sets the result of a script execution. Whenever the script APK is called via startActivityForResult(),
-   the resulting intent will contain SCRIPT_RESULT extra with the given value
-
-   :param int resultCode:
-   :param byte resultValue:
-
-.. py:function:: setResultLongArray(resultCode, resultValue)
-
-   Sets the result of a script execution. Whenever the script APK is called via startActivityForResult(),
-   the resulting intent will contain SCRIPT_RESULT extra with the given value
-
-   :param int resultCode:
-   :param byte resultValue:
-
-.. py:function:: setResultFloatArray(resultCode, resultValue)
-
-   Sets the result of a script execution. Whenever the script APK is called via startActivityForResult(),
-   the resulting intent will contain SCRIPT_RESULT extra with the given value
-
-   :param int resultCode:
-   :param byte resultValue:
-
-.. py:function:: setResultDoubleArray(resultCode, resultValue)
-
-   Sets the result of a script execution. Whenever the script APK is called via startActivityForResult(),
-   the resulting intent will contain SCRIPT_RESULT extra with the given value
-
-   :param int resultCode:
-   :param byte resultValue:
-
-.. py:function:: setResultStringArray(resultCode, resultValue)
-
-   Sets the result of a script execution. Whenever the script APK is called via startActivityForResult(),
-   the resulting intent will contain SCRIPT_RESULT extra with the given value
-
-   :param int resultCode:
-   :param byte resultValue:
-
-.. py:function:: setResultSerializable(resultCode, resultValue)
-
-   Sets the result of a script execution. Whenever the script APK is called via startActivityForResult(),
-   the resulting intent will contain SCRIPT_RESULT extra with the given value
-
-   :param int resultCode:
-   :param byte resultValue:
-
-
-MediaPlayerFacade
-=========================
-
-Control
------------------
-.. py:function:: mediaPlay(url, tag, play)
-
-   Open a media file
-
-   :param str url: url of media resource
-   :param str tag(optional): string identifying resource (default=default)
-   :param bool play(optional): start playing immediately
-
-   :return: true if play successful
-
-.. py:function:: mediaPlayPause(tag)
-
-   pause playing media file
-
-   :param str tag: string identifying resource (default=default)
-
-   :return: true if successful
-
-.. py:function:: mediaPlayStart(tag)
-
-   start playing media file
-
-   :param str tag: string identifying resource (default=default)
-
-   :return: true if successful
-
-.. py:function:: mediaPlayClose(tag)
-
-   Close media file
-
-   :param str tag: string identifying resource (default=default)
-
-   :return: true if successful
-
-.. py:function:: mediaIsPlaying(tag)
-
-   Checks if media file is playing
-
-   :param str tag: string identifying resource (default=default)
-
-   :return: true if successful
-
-
-.. py:function:: mediaPlaySetLooping(enabled, tag)
-
-   Set Looping
-
-   :param bool enabled: default true
-   :param str tag: string identifying resource (default=default)
-
-   :return: True if successful
-
-.. py:function:: mediaPlaySeek(msec, tag)
-
-   Seek To Position
-
-   :param int msec: default true
-   :param str tag: string identifying resource (default=default)
-
-   :return: New Position (in ms)
-
-Get Information
------------------
-.. py:function:: mediaPlayInfo(tag)
-
-   Information on current media
-
-   :param str tag: string identifying resource (default=default)
-
-   :return: Media Information
-
-.. py:function:: mediaPlayList()
-
-   Lists currently loaded media
-
-   :return: List of Media Tags
-
-
-PreferencesFacade
-=========================
-
-.. py:function:: prefGetValue(key, filename)
-
-   Read a value from shared preferences
-
-   :param str key: key
-   :param str filename(optional): Desired preferences file. If not defined, uses the default Shared Preferences.
-
-
-.. py:function:: prefPutValue(key, value, filename)
-
-   Write a value to shared preferences
-
-   :param str key: key
-   :param str value: value
-   :param str filename(optional): Desired preferences file. If not defined, uses the default Shared Preferences.
-
-.. py:function:: prefGetAll(filename)
-
-   Get list of Shared Preference Values
-
-   :param str filename(optional): Desired preferences file. If not defined, uses the default Shared Preferences.
-
-
-QPyInterfaceFacade
-=========================
-
-.. py:function:: executeQPy(script)
-
-   Execute a qpython script by absolute path
-
-   :param str script: The absolute path of the qpython script
-
-   :return: bool
-
-
-TextToSpeechFacade
-=========================
-
-.. py:function:: ttsSpeak(message)
-
-   Speaks the provided message via TTS
-
-   :param str message: message
-
-.. py:function:: ttsIsSpeaking()
-
-   Returns True if speech is currently in progress
-
-EyesFreeFacade
-=========================
-
-.. py:function:: ttsSpeak(message)
-
-   Speaks the provided message via TTS
-
-   :param str message: message
-
-
-BluetoothFacade
-=========================
-
-.. py:function:: bluetoothActiveConnections()
-
-   Returns active Bluetooth connections
-
-
-.. py:function:: bluetoothWriteBinary(base64, connID)
-
-   Send bytes over the currently open Bluetooth connection
-
-   :param str base64: A base64 encoded String of the bytes to be sent
-   :param str connID(optional): Connection id
-
-.. py:function:: bluetoothReadBinary(bufferSize, connID)
-
-   Read up to bufferSize bytes and return a chunked, base64 encoded string
-
-   :param int bufferSize: default 4096
-   :param str connID(optional): Connection id
-
-.. py:function:: bluetoothConnect(uuid, address)
-
-   Connect to a device over Bluetooth. Blocks until the connection is established or fails
-
-   :param str uuid: The UUID passed here must match the UUID used by the server device
-   :param str address(optional): The user will be presented with a list of discovered devices to choose from if an address is not provided
-
-   :return: True if the connection was established successfully
-
-.. py:function:: bluetoothAccept(uuid, timeout)
-
-   Listens for and accepts a Bluetooth connection. Blocks until the connection is established or fails
-
-   :param str uuid: The UUID passed here must match the UUID used by the server device
-   :param int timeout: How long to wait for a new connection, 0 is wait for ever (default=0)
-
-.. py:function:: bluetoothMakeDiscoverable(duration)
-
-   Requests that the device be discoverable for Bluetooth connections
-
-   :param int duration: period of time, in seconds, during which the device should be discoverable (default=300)
-
-.. py:function:: bluetoothWrite(ascii, connID)
-
-   Sends ASCII characters over the currently open Bluetooth connection
-
-   :param str ascii: text
-   :param str connID: Connection id
-
-.. py:function:: bluetoothReadReady(connID)
-
-   Sends ASCII characters over the currently open Bluetooth connection
-
-   :param str ascii: text
-   :param str connID: Connection id
-
-.. py:function:: bluetoothRead(bufferSize, connID)
-
-   Read up to bufferSize ASCII characters
-
-   :param int bufferSize: default=4096
-   :param str connID(optional): Connection id
-
-.. py:function:: bluetoothReadLine(connID)
-
-   Read the next line
-
-   :param str connID(optional): Connection id
-
-.. py:function:: bluetoothGetRemoteDeviceName(address)
-
-   Queries a remote device for it's name or null if it can't be resolved
-
-   :param str address: Bluetooth Address For Target Device
-
-.. py:function:: bluetoothGetLocalName()
-
-   Gets the Bluetooth Visible device name
-
-.. py:function:: bluetoothSetLocalName(name)
-
-   Sets the Bluetooth Visible device name, returns True on success
-
-   :param str name: New local name
-
-.. py:function:: bluetoothGetScanMode()
-
-   Gets the scan mode for the local dongle.
-   Return values:
-   -1 when Bluetooth is disabled.
-   0 if non discoverable and non connectable.
-   1 connectable non discoverable.
-   3 connectable and discoverable.
-
-.. py:function:: bluetoothGetConnectedDeviceName(connID)
-
-   Returns the name of the connected device
-
-   :param str connID: Connection id
-
-.. py:function:: checkBluetoothState()
-
-   Checks Bluetooth state
-
-   :return: True if Bluetooth is enabled
-
-.. py:function:: toggleBluetoothState(enabled, prompt)
-
-   Toggle Bluetooth on and off
-
-   :param bool enabled:
-   :param str prompt: Prompt the user to confirm changing the Bluetooth state, default=true
-
-   :return: True if Bluetooth is enabled
-
-.. py:function:: bluetoothStop(connID)
-
-   Stops Bluetooth connection
-
-   :param str connID: Connection id
-
-.. py:function:: bluetoothGetLocalAddress()
-
-   Returns the hardware address of the local Bluetooth adapter
-
-.. py:function:: bluetoothDiscoveryStart()
-
-   Start the remote device discovery process
-
-   :return: true on success, false on error
-
-.. py:function:: bluetoothDiscoveryCancel()
-
-   Cancel the current device discovery process
-
-   :return: true on success, false on error
-
-.. py:function:: bluetoothIsDiscovering()
-
-   Return true if the local Bluetooth adapter is currently in the device discovery process
-
-
-SignalStrengthFacade
-=========================
-.. py:function:: startTrackingSignalStrengths()
-
-   Starts tracking signal strengths
-
-.. py:function:: readSignalStrengths()
-
-   Returns the current signal strengths
-
-   :return: A map of gsm_signal_strength
-
-.. py:function:: stopTrackingSignalStrengths()
-
-   Stops tracking signal strength
-
-
-WebCamFacade
-=========================
-
-.. py:function:: webcamStart(resolutionLevel, jpegQuality, port)
-
-   Starts an MJPEG stream and returns a Tuple of address and port for the stream
-
-   :param int resolutionLevel: increasing this number provides higher resolution (default=0)
-   :param int jpegQuality: a number from 0-10 (default=20)
-   :param int port: If port is specified, the webcam service will bind to port, otherwise it will pick any available port (default=0)
-
-.. py:function:: webcamAdjustQuality(resolutionLevel, jpegQuality)
-
-   Adjusts the quality of the webcam stream while it is running
-
-   :param int resolutionLevel: increasing this number provides higher resolution (default=0)
-   :param int jpegQuality: a number from 0-10 (default=20)
-
-.. py:function:: cameraStartPreview(resolutionLevel, jpegQuality, filepath)
-
-   Start Preview Mode. Throws 'preview' events
-
-   :param int resolutionLevel: increasing this number provides higher resolution (default=0)
-   :param int jpegQuality: a number from 0-10 (default=20)
-   :param str filepath: Path to store jpeg files
-
-   :return: True if successful
-
-.. py:function:: cameraStopPreview()
-
-   Stop the preview mode
-
-
-UiFacade
-=========================
-
-Dialog
---------
-.. py:function:: dialogCreateInput(title, message, defaultText, inputType)
-
-   Create a text input dialog
-
-   :param str title: title of the input box
-   :param str message: message to display above the input box
-   :param str defaultText(optional): text to insert into the input box
-   :param str inputType(optional): type of input data, ie number or text
-
-.. py:function:: dialogCreatePassword(title, message)
-
-   Create a password input dialog
-
-   :param str title: title of the input box
-   :param str message: message to display above the input box
-
-.. py:function:: dialogGetInput(title, message, defaultText)
-
-   Create a password input dialog
-
-   :param str title: title of the input box
-   :param str message: message to display above the input box
-   :param str defaultText(optional): text to insert into the input box
-
-.. py:function:: dialogGetPassword(title, message)
-
-   Queries the user for a password
-
-   :param str title: title of the password box
-   :param str message: message to display above the input box
-
-.. py:function:: dialogCreateSeekBar(start, maximum, title)
-
-   Create seek bar dialog
-
-   :param int start: default=50
-   :param int maximum: default=100
-   :param int title: title
-
-.. py:function:: dialogCreateTimePicker(hour, minute, is24hour)
-
-   Create time picker dialog
-
-   :param int hour: default=0
-   :param int miute: default=0
-   :param bool is24hour: default=false
-
-.. py:function:: dialogCreateDatePicker(year, month, day)
-
-   Create date picker dialog
-
-   :param int year: default=1970
-   :param int month: default=1
-   :param int day: default=1
-
-
-NFC
--------------
-**Data structs**
-*QPython NFC json result*
-::
-
-    {
-    "role": <role>, # could be self/master/slave
-    "stat": <stat>, # could be ok / fail / cancl
-    "message": <message get> 
-    }
-
-**APIs**
-
-.. py:function:: dialogCreateNFCBeamMaster(title, message, inputType)
-
-   Create a dialog where you could create a qpython beam master
-
-   :param str title: title of the input box
-   :param str message: message to display above the input box
-   :param str inputType(optional): type of input data, ie number or text
-
-.. py:function:: NFCBeamMessage(content, title, message)
-
-   Create a dialog where you could create a qpython beam master
-
-   :param str content: message you want to sent
-   :param str title: title of the input box
-   :param str message: message to display above the input box
-   :param str inputType(optional): type of input data, ie number or text
-
-.. py:function:: dialogCreateNFCBeamSlave(title, message)
-
-   Create a qpython beam slave
-
-   :param str title: title of the input box
-   :param str message: message to display above the input box
-
-Progress
---------------
-.. py:function:: dialogCreateSpinnerProgress(message, maximumProgress)
-
-   Create a spinner progress dialog
-
-   :param str message(optional): message
-   :param int maximunProgress(optional): dfault=100
-
-.. py:function:: dialogSetCurrentProgress(current)
-
-   Set progress dialog current value
-
-   :param int current: current
-
-.. py:function:: dialogSetMaxProgress(max)
-
-   Set progress dialog maximum value
-
-   :param int max: max
-
-
-.. py:function:: dialogCreateHorizontalProgress(title, message, maximumProgress)
-
-   Create a horizontal progress dialog
-
-   :param str title(optional): title
-   :param str message(optional): message
-   :param int maximunProgress(optional): dfault=100
-
-
-Alert
-----------
-.. py:function:: dialogCreateAlert(title, message)
-
-   Create alert dialog
-
-   :param str title(optional): title
-   :param str message(optional): message
-   :param int maximunProgress(optional): dfault=100
-
-
-Dialog Control
----------------
-.. py:function:: dialogSetPositiveButtonText(text)
-
-   Set alert dialog positive button text
-
-   :param str text: text
-
-.. py:function:: dialogSetNegativeButtonText(text)
-
-   Set alert dialog negative button text
-
-   :param str text: text
-
-.. py:function:: dialogSetNeutralButtonText(text)
-
-   Set alert dialog button text
-
-   :param str text: text
-
-.. py:function:: dialogSetItems(items)
-
-   Set alert dialog list items
-
-   :param list items: items
-
-.. py:function:: dialogSetSingleChoiceItems(items, selected)
-
-   Set alert dialog list items
-
-   :param list items: items
-   :param int selected: selected item index (default=0)
-
-.. py:function:: dialogSetMultiChoiceItems(items, selected)
-
-   Set dialog multiple choice items and selection
-
-   :param list items: items
-   :param int selected: selected item index (default=0)
-
-.. py:function:: addContextMenuItem(label, event, eventData)
-
-   Adds a new item to context menu
-
-   :param str label: label for this menu item
-   :param str event: event that will be generated on menu item click
-   :param object eventData: event object
-
-.. py:function:: addOptionsMenuItem(label, event, eventData, iconName)
-
-   Adds a new item to context menu
-
-   :param str label: label for this menu item
-   :param str event: event that will be generated on menu item click
-   :param object eventData: event object
-   :param str iconName: Android system menu icon, see http://developer.android.com/reference/android/R.drawable.html
-
-.. py:function:: dialogGetResponse()
-
-   Returns dialog response
-
-.. py:function:: dialogGetSelectedItems()
-
-   This method provides list of items user selected
-
-.. py:function:: dialogDismiss()
-
-   Dismiss dialog
-
-.. py:function:: dialogShow()
-
-   Show dialog
-
-
-Layout
----------
-.. py:function:: fullShow(layout)
-
-   Show Full Screen
-
-   :param string layout: String containing View layout
-
-.. py:function:: fullDismiss()
-
-   Dismiss Full Screen
-
-.. py:function:: fullQuery()
-
-   Get Fullscreen Properties
-
-.. py:function:: fullQueryDetail(id)
-
-   Get fullscreen properties for a specific widget
-
-   :param str id: id of layout widget
-
-.. py:function:: fullSetProperty(id)
-
-   Set fullscreen widget property
-
-   :param str id: id of layout widget
-   :param str property: name of property to set
-   :param str value: value to set property to
-
-.. py:function:: fullSetList(id, list)
-
-   Attach a list to a fullscreen widget
-
-   :param str id: id of layout widget
-   :param list list: List to set
-
-.. py:function:: fullKeyOverride(keycodes, enable)
-
-   Override default key actions
-
-   :param str keycodes: id of layout widget
-   :param bool enable: List to set (default=true)
-
-
-
-WebView
------------
-.. py:function:: webViewShow()
-
-   Display a WebView with the given URL
-
-   :param str url: url
-   :param bool wait(optional): block until the user exits the WebView
-
-USB Host Serial Facade
-======================
-
-*QPython 1.3.1+ and QPython3 1.0.3+ contains this feature*
-
-SL4A Facade for USB Serial devices by Android USB Host API.
-
-
-It control the USB-Serial like devices
-from Andoroid which has USB Host Controller .
-
-The sample
-`demonstration is also available at youtube video <http://www.youtube.com/watch?v=EJ7qiGXaI74>`_
-
-
-Requirements
--------------
-* Android device which has USB Host controller (and enabled in that firmware).
-* Android 4.0 (API14) or later.
-* USB Serial devices (see [Status](#Status)).
-* USB Serial devices were not handled by Android kernel.
-
-  > I heard some android phone handle USB Serial devices
-  > make /dev/ttyUSB0 in kernel level.
-  > In this case, Android does not be able to handle the device
-  > from OS level.
-
-  please check Android Applications be able to grab the target USB Devices,
-  such as `USB Device Info <https://play.google.com/store/apps/details?id=aws.apps.usbDeviceEnumerator>`_.
-
-Status
----------------
-* probably work with USB CDC, like FTDI, Arduino or else.
-
-* 2012/09/10: work with 78K0F0730 device (new RL78) with Tragi BIOS board.
-
-  `M78K0F0730 <http://www.marutsu.co.jp/shohin_55296/>`_
-
-* 2012/09/24: work with some pl2303 devcies.
-
-Author
--------
-This facade developped by `Kuri65536 <https://bitbucket.org/kuri65536/usbhostserialfacade>`_
-you can see the commit log in it.
-
-
-APIs
---------
-.. py:function:: usbserialGetDeviceList()
-
-   Returns USB devices reported by USB Host API.
-
-   :return: Returns "Map of id and string information Map<String, String>
-
-
-.. py:function:: usbserialDisconnect(connID)
-
-   Disconnect all USB-device
-
-   :param str connID: connection ID
-
-.. py:function:: usbserialActiveConnections()
-
-   Returns active USB-device connections.
-
-   :return: Returns "Active USB-device connections by Map UUID vs device-name."
-
-
-.. py:function:: usbserialWriteBinary(base64, connID)
-
-   Send bytes over the currently open USB Serial connection.
-
-   :param str base64:
-   :param str connId:
-
-.. py:function:: usbserialReadBinary(bufferSize, connID)
-
-   Read up to bufferSize bytes and return a chunked, base64 encoded string
-
-   :param int bufferSize:
-   :param str connId:
-
-.. py:function:: usbserialConnect(hash, options)
-
-   Connect to a device with USB-Host. request the connection and exit
-
-   :param str hash:
-   :param str options:
-
-   :return: Returns messages the request status
-
-.. py:function:: usbserialHostEnable()
-
-   Requests that the host be enable for USB Serial connections.
-
-   :return: True if the USB Device is accesible
-
-.. py:function:: usbserialWrite(String ascii, String connID)
-
-   Sends ASCII characters over the currently open USB Serial connection
-
-   :param str ascii:
-   :param str connID:
-
-.. py:function:: usbserialReadReady(connID)
-
-   :param str connID:
-
-   :return: True if the next read is guaranteed not to block
-
-
-.. py:function:: usbserialRead(connID, bufferSize)
-
-   Read up to bufferSize ASCII characters.
-
-   :param str connID:
-   :param int bufferSize:
-
-.. py:function:: usbserialGetDeviceName(connID)
-
-   Queries a remote device for it's name or null if it can't be resolved
-
-   :param str connID:
diff --git a/docs/_sources/en/guide_contributors.txt b/docs/_sources/en/guide_contributors.txt
deleted file mode 100644
index 4de51a61..00000000
--- a/docs/_sources/en/guide_contributors.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-Welcome contribute
-===============================
-Thanks for supporting this project, QPython is a greate project, and we hope you join us to help with make it more greater.  
-
-Please send email to us(support at qpython.org) to introduce youself briefly, and which part do you want to contribute.
-
-Then we will consider to invite you to join the qpython-collaborator group.
-
-How to help with test
-========================
-
-.. toctree::
-   :maxdepth: 2
-
-   guide_contributors_test
-
-How to contribute documentation
-================================
-
-How to translate
-================================
-
-
-How to launch a local QPython users community
-================================================================
-
-How to organise a local qpython user sharing event
-----------------------------------------
-
-How to became the developer member
-====================================
-
-How to develop qpython built-in programs
-----------------------------------------
-
-How to sponsor QPython project
-====================================
-
-
-More detail coming soon...
diff --git a/docs/_sources/en/guide_contributors_test.txt b/docs/_sources/en/guide_contributors_test.txt
deleted file mode 100644
index 84c8d78c..00000000
--- a/docs/_sources/en/guide_contributors_test.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-QPython is keeping develop! 
-If you are interested about what we are doing and want to make some contribution, follow this guide to make this project better!
-
-
-Join the tester community
---------------------------
-We create a G+ community where you could report bugs or offer suggestions -> `QPython tester G+ community(For QPython testers) <https://plus.google.com/communities/111759148772865961493>`_
-
-Join us now!
-
-.. image:: ../_static/1.png
-   :scale: 50 %
-
-
-Become a tester
-----------------
-After join the tester community, you could become a tester!
-Click this and become a tester ->  `I'm ready for test <https://play.google.com/apps/testing/org.qpython.qpy>`_
-
-.. image:: ../_static/2.png
-
-Report or suggest
--------------------
-If you find out any bugs or have any cool idea about QPython, please let us know about it.
-You could write down your suggestion or bug report on the community.
-
-.. image:: ../_static/3.png
-
-
-
-Feedback
----------
-Send your feedback to QPython using the contact information: support@qptyhon.org
\ No newline at end of file
diff --git a/docs/_sources/en/guide_developers.txt b/docs/_sources/en/guide_developers.txt
deleted file mode 100644
index 22a7d2b3..00000000
--- a/docs/_sources/en/guide_developers.txt
+++ /dev/null
@@ -1,75 +0,0 @@
-Android
-==============================
-Android part offers the common Python user interaction functions, like console, editor, file browsing, QRCode reader etc.
-
-
-Console
----------
-
-
-Editor
------------
-
-
-File browsing
-------------
-
-
-QRCode reader
-------------------------
-
-
-QSL4A
-==============================
-QSL4A is the folk of SL4A for QPython, which allows users being able to program with Python script for android.
-
-
-QPython Core
-==============================
-Besides Python core, QPython core offer three types programming mode also.
-
-Python 2.x
------------
-
-Python 3.x
------------
-
-Console program
----------------
-
-Kivy program
-------------
-
-WebApp program
---------------
-
-
-
-Pip and libraries
-==============================
-Pip and libraries offer great expansion ability for QPython.
-
-Pip
----------
-
-Libraries
-----------
-
-
-Quick tools
-==============================
-Quick tools offers better guide for using QPython well for different users.
-
-QPython API
-------------
-
-FTP
---------
-
-
-QPY.IO (Enterprise service)
-==============================
-It's a enterprise service which aim at offering quick android development delivery with QPython.
-
-It's QPython's maintainers' main paid service, but not a opensource project.
-
diff --git a/docs/_sources/en/guide_extend.txt b/docs/_sources/en/guide_extend.txt
deleted file mode 100644
index bda077ed..00000000
--- a/docs/_sources/en/guide_extend.txt
+++ /dev/null
@@ -1,131 +0,0 @@
-QPython Open API 
-=====================================================
-QPython has an open activity which allow you run qpython from outside.
-
-The MPyAPI's definition seems like the following:
-
-::
-
-        <activity 
-            android:name="org.qpython.qpylib.MPyApi"
-            android:label="@string/qpy_run_with_share"
-            android:screenOrientation="user"
-            android:configChanges="orientation|keyboardHidden"
-            android:exported="true">
-            <intent-filter>
-                <action android:name="org.qpython.qpylib.action.MPyApi" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-                <data android:scheme="http" />
-                <data android:scheme="https" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.SEND"/>
-                <category android:name="android.intent.category.DEFAULT"/>
-                <data android:mimeType="text/plain"/>
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.SEND"/>
-                <category android:name="android.intent.category.DEFAULT"/>
-                <data android:mimeType="image/*"/>
-            </intent-filter>
-        </activity>
-
-
-**So, with it's help, you could:**
-
-Share some content to QPython's scripts
----------------------------------------------
-You could choose some content in some app, and share to qpython's script, then you could handle the content with the **sys.argv[2]**
-
-`Watch the demo video on YouTube <https://www.youtube.com/watch?v=2Y50Yir8TWg>`_
-
-
-Run QPython's script from your own application
-------------------------------------------------------
-
-You can call QPython to run some script or python code in your application by call this activity, like the following sample:
-
-::
-
-    // code sample shows how to call qpython API
-    String extPlgPlusName = "org.qpython.qpy";          // QPython package name
-    Intent intent = new Intent();
-    intent.setClassName(extPlgPlusName, "org.qpython.qpylib.MPyApi");
-    intent.setAction(extPlgPlusName + ".action.MPyApi");
-
-    Bundle mBundle = new Bundle();
-    mBundle.putString("app", "myappid");
-    mBundle.putString("act", "onPyApi");
-    mBundle.putString("flag", "onQPyExec"); // any String flag you may use in your context
-    mBundle.putString("param", "");         // param String param you may use in your context
-
-    /*
-    * The Python code we will run
-    */
-    String code = "import androidhelper\n" +
-                "droid = androidhelper.Android()\n" +
-                "line = droid.dialogGetInput()\n" +
-                "s = 'Hello %s' % line.result\n" +
-                "droid.makeToast(s)\n"
-
-    mBundle.putString("pycode", code);
-    intent.putExtras(mBundle);
-    startActivityForResult(intent, SCRIPT_EXEC_PY);
-    ...
-
-
-
-    // And you can handle the qpython callabck result in onActivityResult
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        if (requestCode == SCRIPT_EXEC_PY) {
-            if (data!=null) {
-                Bundle bundle = data.getExtras();
-                String flag = bundle.getString("flag");
-                String param = bundle.getString("param");
-                String result = bundle.getString("result"); // Result your Pycode generate
-                Toast.makeText(this, "onQPyExec: return ("+result+")", Toast.LENGTH_SHORT).show();
-            } else {
-                Toast.makeText(this, "onQPyExec: data is null", Toast.LENGTH_SHORT).show();
-
-            }
-        }
-    }
-
-
-`Checkout the full project from github <https://github.com/qpython-android/app-call-qpython-api>`_
-
-And there is `a production application - QPython Plugin for Tasker <https://play.google.com/store/apps/details?id=com.qpython.tasker2>`_
-
-QPython Online Service
-=====================================================
-
-Now the QPython online service only open for QPython, not QPython3.
-
-
-QPypi
----------------------------------------------------------
-Can I install some packages which required pre-compiled ?
-Sure, you could install some pre-compiled packages from QPypi, you could find it through "Libraries" on dashboard.
-
-
-.. image:: ../_static/guide_extend_pic2.png
-
-If you couldn't found the package here, you could send email to river@qpython.org .
-
-QPY.IO
----------------------------------------------------
-Can I build an independent APK from QPython script?
-
-Sure you can. now the service is **in BETA**, it's a challenging thing. We will publish it as a online service, for we want to let the development process is simple, you don't need to own the development environment set up when you want to build a application.
-
-
-.. image:: ../_static/guide_extend_pic1.png
-
-If you want to try it out or have some business proposal, please contact with us by sending email to river@qpython.org .
diff --git a/docs/_sources/en/guide_helloworld.txt b/docs/_sources/en/guide_helloworld.txt
deleted file mode 100644
index d07001f6..00000000
--- a/docs/_sources/en/guide_helloworld.txt
+++ /dev/null
@@ -1,121 +0,0 @@
-Writing "Hello World"
-========================
-
-
-Hello world
-----------------
-.. image:: ../_static/guide_helloworld_pic1.png
-   :alt: hello world
-
-Well, after you became a bit more familiar with QPython, let's create our first program in QPython. Obviously, it will be `helloworld.py`. ;)
-
-Start QPython, open editor and enter the following code:
-
-::
-
-    import androidhelper
-    droid = androidhelper.Android()
-    droid.makeToast('Hello, Username!')
-
-No wonder, it's just similar to any other hello-world program. When executed, it just shows pop-up message on the screen (see screenshot on the top). Anyway, it's a good example of QPython program.
-
-SL4A library
-------------
-
-It begins with *import androidhelper* — the most useful module in QPython, which encapsulates almost all interface with Android, available in Python. Any script developed in QPython starts with this statement (at least if it claims to communicate with user). Read more about Python library `here <http://docs.python.org/2.7/library/intro.html>`_ and import statement `here <http://docs.python.org/2.7/reference/simple_stmts.html#import>`_
-
-By the way, if you're going to make your script compatible with SL4A, you should replace the first line with the following code (and use `android` instead `androidhelper` further in the program):
-
-::
-
-    try:
-        import androidhelper as android
-    except ImportError:
-        import android
-
-Ok, next we're creating an object `droid` (actually a class), it is necessary to call RPC functions in order to communicate with Android.
-
-And the last line of our code calls such function, `droid.makeToast()`, which shows a small pop-up message (a "toast") on the screen.
-
-Well, let's add some more functionality. Let it ask the user name and greet them.
-
-More samples
----------------
-We can display a simple dialog box with the title, prompt, edit field and buttons **Ok** and **Cancel** using `dialogGetInput` call. Replace the last line of your code and save it as `hello1.py`:
-
-::
-
-    import androidhelper
-    droid = androidhelper.Android()
-    respond = droid.dialogGetInput("Hello", "What is your name?")
-
-Well, I think it should return any respond, any user reaction. That's why I wrote `respond = ...`. But what the call actually returns? Let's check. Just add `print` statement after the last line:
-
-::
-
-    import androidhelper
-    droid = androidhelper.Android()
-    respond = droid.dialogGetInput("Hello", "What is your name?")
-    print respond
-
-Then save and run it... 
-
-Oops! Nothing printed? Don't worry. Just pull notification bar and you will see "QPython Program Output: hello1.py" — tap it!
-
-
-As you can see, `droid.dialogGetInput()` returns a JSON object with three fields. We need only one — `result` which contains an actual input from user.
-
-Let's add script's reaction:
-
-::
-
-    import androidhelper
-    droid = androidhelper.Android()
-    respond = droid.dialogGetInput("Hello", "What is your name?")
-    print respond
-    message = 'Hello, %s!' % respond.result
-    droid.makeToast(message)
-
-Last two lines (1) format the message and (2) show the message to the user in the toast. See `Python docs <http://docs.python.org/2.7/tutorial/inputoutput.html?highlight=format%20operator#old-string-formatting>`_ if you still don't know what `%` means.
-
-Wow! It works! ;)
-
-Now I'm going to add a bit of logic there. Think: what happen if the user clicks **Cancel** button, or clicks **Ok** leaving the input field blank?
-
-You can play with the program checking what contains `respond` variable in every case.
-
-First of all, I want to put text entered by user to a separate variable: `name = respond.result`. Then I'm going to check it, and if it contains any real text, it will be considered as a name and will be used in greeting. Otherwise another message will be shown. Replace fifth line `message = 'Hello, %s!' % respond.result` with the following code:
-
-::
-
-    name = respond.result
-    if name:
-        message = 'Hello, %s!' % name
-    else:
-        message = "Hey! And you're not very polite, %Username%!"
-
-Use **<** and **>** buttons on the toolbar to indent/unindent lines in if-statement (or just use space/backspace keys). You can read more about indentation in Python `here <http://docs.python.org/2.7/tutorial/introduction.html?highlight=indent#first-steps-towards-programming>`_; if-statement described `here <http://docs.python.org/2.7/tutorial/controlflow.html#if-statements>`_.
-
-First of all, we put user input to the variable `name`. Then we check does `name` contain anything? In case the user left the line blank and clicked **Ok**, the return value is empty string `''`. In case of **Cancel** button pressed, the return value is `None`. Both are treated as false in if-statement. So, only if `name` contans anything meaninful, then-statement is executed and greeting "Hello, ...!" shown. In case of empty input the user will see "Hey! And you're not very polite, %Username%!" message.
-
-Ok, here is the whole program:
-
-::
-
-    import androidhelper
-    droid = androidhelper.Android()
-    respond = droid.dialogGetInput("Hello", "What is your name?")
-    print respond
-    name = respond.result
-    if name:
-        message = 'Hello, %s!' % name
-    else:
-        message = "Hey! And you're not very polite, %Username%!"
-    droid.makeToast(message)
-
-
-`Thanks dmych offer the first draft in his blog <http://onetimeblog.logdown.com/posts/2014/01/23/first-program-in-qpython>`_
-
-
-
-
diff --git a/docs/_sources/en/guide_howtostart.txt b/docs/_sources/en/guide_howtostart.txt
deleted file mode 100644
index 8575d63e..00000000
--- a/docs/_sources/en/guide_howtostart.txt
+++ /dev/null
@@ -1,133 +0,0 @@
-
-
-QPython: How To Start
-========================
-Now, I will introduce the QPython's features through it's interfaces.
-
-1. Dashboard
-------------------
-
-.. image:: ../_static/guide_howtostart_pic1.png
-   :alt: QPython start
-
-
-After you installed QPython, start it in the usual way by tapping its icon in the menu. Screenshot on the top of this post shows what you should see when QPython just started. 
-
-**Start button**
-
-By tapping the big button with Python logo in the center of the screen you can 
-
-**Launch your local script or project**
-
-*Get script from QR code* (funny brand new way to share and distribute your code, you can create QRCode through `QPython's QRCode generator <http://qpython.com/#qrcode>`_
-
-Now you can install many 3rd libaries ( pure python libraries mainly ) through pip_console.py script.
-
-If you want QPython to run some script of project when you click the start button, you can make it by setting default program in setting activity.
-
-
-**Developer kit dashboard**
-
-If you swipe to the left instead of tapping, you will see another (second) main screen of QPython *(Pic. 2)*. As for me, it is much more useful and comfortable for developer.
-
-.. image:: ../_static/guide_howtostart_pic2.png
-   :alt: QPython develop dashboard
-
-
-Tools available here:
-
-* **Console** — yes, it's regular Python console, feel free to comunicate with interpreter directly
-* **Editor** — QPython has a nice text editor integrated with the rest, you can write code and run it without leaving the application
-* **My QPython** — here you can find your scripts and projects
-* **System** — maintain libraries and components: install and uninstall them
-* **Package Index** opens the page `QPyPI <http://qpypi.qpython.org/>`_ in browser allowing to install packages listed there
-* **Community** leads to `QPython.org <http://qpython.org/>`_ page. Feel free to join or ask&answer questions in the QPython community.
-
-By long clicking on the console or editor, you have chance to create the shortcut on desktop which allow you enter console or editor directly.
-
-Next, let's see the console and the editor. 
-
-2. Console and editor
--------------------------
-
-.. image:: ../_static/guide_howtostart_pic3.png
-   :alt: QPython console
-
-
-As I said before, there is an ordinary Python console. Many people usually use it to explore objects' properties, consult about syntax and test their ideas. You can type your commands directly and Python interpreter will execute them. You can open additional consoles by tapping the plus button (1) and usedrop-down list on the upper left corner to switch between consoles (2). To close the console just tap the close button (3).
-
-.. image:: ../_static/guide_howtostart_pic4.png
-   :alt: QPython notification
-
-
-Please note, there will be notification in the notification bar unless you explicitly close the console and you always can reach the open console by tapping the notification. 
-
-
-
-.. image:: ../_static/guide_howtostart_pic5.png
-   :alt: QPython editor
-
-
-The editor allows you obviously (hello Cap!) enter and modify text. Here you can develop your scripts, save them and execute. The editor supports Python syntax highlighting and shows line numbers (there is no ability to go to the line by number though). *(above picture)*
-
-When typing, you can easily control indentation level (which is critical for Python code) using two buttons on the toolbar (1). Next buttons on the toolbar are **Save** and **Save As** (2), then goes **Run** (3), **Undo**, **Search**, **Recent Files** and **Settings** buttons. Also there are two buttons on the top: **Open** and **New** (5).
-
-When saving, don't forget to add `.py` estension to the file name since the editor don't do it for you.
-
-3. Programs
---------------------
-You can find the scripts or projects in My QPython. My QPython contains the scripts and Projects. 
-
-By long clicking on script or project, you have chance to create the shortcut for the script or project. Once you have created the shortcuts on desktop, you can directly run the script or project from desktop.
-
-
-**Scripts**
-Scripts : A single script. The scripts are in the  /sdcard/com.hipipal.qpyplus/scripts directory.
-If you want your script could be found in My QPython, please upload it to this directory.
-
-When you click the script, you can choose the following actions:
-
-- Run : Run the script
-- Open : Edit the script with built-in editor
-- Rename : Rename the script
-- Delete : Delete the script
-
-**Projects**
-Projects : A directory which should contain the main.py as the project's default launch script, and you can put other dependency 3rd libraries or resources in the same directory, if you want your project could be found in My QPython, please upload them into this directory.
-
-When you click on the project, you can choose the following actions:
-
-- Run : run the project
-- Open : use it to explore project's resources
-- Rename : Rename the project
-- Delete : Delete the project
-
-4. Libraries 
---------------
-
-By installing 3rd libraries, you can extend your qpython's programming ability quickly. There are some ways to install libraries.
-
-**QPypi**
-
-You can install some pre-built libraries from QPypi, like numpy etc.
-
-**Pip console**
-
-You can install most pure python libraries through pip console.
-
-
-Besides the two ways above, you could copy libraries into the /sdcard/qpython/lib/python2.7/site-packages in your device.
-
-
-*Notice:*
-Some libraries mixed with c/c++ files could not be install through pip console for the android lacks the compiler environment, you could ask help from qpython developer team.
-
-
-5. Community
---------------
-It will redirect to the QPython.org, including somthe source of this documentation, and there are some qpython user communities' link, many questions of qpython usage or programming could be asked in the community.
-
-
-
-
-`Thanks dmych offer the first draft in his blog <http://onetimeblog.logdown.com/posts/2014/01/22/qpython-how-to-start>`_
diff --git a/docs/_sources/en/guide_ide.txt b/docs/_sources/en/guide_ide.txt
deleted file mode 100644
index 45865c81..00000000
--- a/docs/_sources/en/guide_ide.txt
+++ /dev/null
@@ -1,49 +0,0 @@
-Use the best way for developing
-===================================================
-
-
-Develop from QEditor
-----------------------------------------
-QEditor is the QPython's built-in editor, which supports Python / HTML syntax highlight.
-
-
-**QEditor's main features**
-
-* Edit / View plain text file, like Python, Lua, HTML, Javascript and so on
-
-* Edit and run Python script & Python syntax highlight
-
-* Edit and run Shell script
-
-* Preview HTML with built-in HTML browser
-
-* Search by keyword, code snippets, code share
-
-You could run the QPython script directly when you develop from QEditor, so when you are moving it's the most convient way for QPython develop.
-
-
-Develop from browser
---------------------------------------
-QPython has a built-in script which is **qedit4web.py**, you could see it when you click the start button and choose  "Run local script".
-After run it, you could see the result.
-
-.. image:: ../_static/guide_ide_qedit4web.png
-   :alt: QPython qedit4web
-
-Then, you could access the url from your PC/Laptop's browser for developing, just like the below pics.
-
-.. image:: ../_static/guide_ide_qedit4web_choose.png
-   :alt: QPython qedit4web choose project or file
-
-*After choose some project or script, you could start to develop*
-
-.. image:: ../_static/guide_ide_qedit4web_develop.png
-   :alt: QPython qedit4web
-
-
-With it's help, you could write from browser and run from your android phone. It is very convenient.
-
-
-Develop from your computer
---------------------------
-Besides the above ways, you could develop the script with your way, then upload to your phone and run with QPython also.
diff --git a/docs/_sources/en/guide_libraries.txt b/docs/_sources/en/guide_libraries.txt
deleted file mode 100644
index e4bb3ef2..00000000
--- a/docs/_sources/en/guide_libraries.txt
+++ /dev/null
@@ -1,292 +0,0 @@
-QPython built-in Libraries
-==========================
-QPython is using the Python 2.7.2 and it support most Python stardard libraries. And you could see their documentation through Python documentation.
-
-QPython dynload libraries 
---------------------------------------------------------------
-Just like Python, QPython contains python built-in .so libraries.
-
-Usually, you don't need to  import them manually, they were used in stardard libraries, and could be imported automatically.
-
-* _codecs_cn.so
-* _codecs_hk.so
-* _codecs_iso2022.so
-* _codecs_jp.so
-* _codecs_kr.so
-* _codecs_tw.so
-* _csv.so
-* _ctypes.so
-* _ctypes_test.so
-* _hashlib.so
-* _heapq.so
-* _hotshot.so
-* _io.so
-* _json.so
-* _lsprof.so
-* _multibytecodec.so
-* _sqlite3.so
-* _ssl.so
-* _testcapi.so
-* audioop.so
-* future_builtins.so
-* grp.so
-* mmap.so
-* resource.so
-* syslog.so
-* termios.so
-* unicodedata.so
-
-QPython stardard libraries
----------------------------
-The following libraries are the stardard QPython libraries which are the same as Python:
-
-- `BaseHTTPServer.py <https://docs.python.org/2/library/basehttpserver.html>`_
-- `binhex.py <https://docs.python.org/2/library/binhex.html>`_
-- `fnmatch.py <https://docs.python.org/2/library/fnmatch.html>`_
-- mhlib.py
-- quopri.py
-- sysconfig.py
-- Bastion.py
-- bisect.py
-- formatter.py
-- mimetools.py
-- random.py
-- tabnanny.py
-- CGIHTTPServer.py
-- bsddb
-- fpformat.py
-- mimetypes.py
-- re.py
-- tarfile.py
-- ConfigParser.py
-- cProfile.py
-- fractions.py
-- mimify.py
-- repr.py
-- telnetlib.py
-- Cookie.py
-- calendar.py
-- ftplib.py
-- modulefinder.py
-- rexec.py
-- tempfile.py
-- DocXMLRPCServer.py
-- cgi.py
-- functools.py
-- multifile.py
-- rfc822.py
-- textwrap.py
-- HTMLParser.py
-- cgitb.py
-- genericpath.py
-- mutex.py
-- rlcompleter.py
-- this.py
-- chunk.py
-- getopt.py
-- netrc.py
-- robotparser.py
-- threading.py
-- MimeWriter.py
-- cmd.py
-- getpass.py
-- new.py
-- runpy.py
-- timeit.py
-- Queue.py
-- code.py
-- gettext.py
-- nntplib.py
-- sched.py
-- toaiff.py
-- SimpleHTTPServer.py
-- codecs.py
-- glob.py
-- ntpath.py
-- sets.py
-- token.py
-- SimpleXMLRPCServer.py
-- codeop.py
-- gzip.py
-- nturl2path.py
-- sgmllib.py
-- tokenize.py
-- SocketServer.py
-- collections.py
-- hashlib.py
-- numbers.py
-- sha.py
-- trace.py
-- StringIO.py
-- colorsys.py
-- heapq.py
-- opcode.py
-- shelve.py
-- traceback.py
-- UserDict.py
-- commands.py
-- hmac.py
-- optparse.py
-- shlex.py
-- tty.py
-- UserList.py
-- compileall.py
-- hotshot
-- os.py
-- shutil.py
-- types.py
-- UserString.py
-- compiler
-- htmlentitydefs.py
-- os2emxpath.py
-- site.py
-- unittest
-- _LWPCookieJar.py
-- config
-- htmllib.py
-- smtpd.py
-- urllib.py
-- _MozillaCookieJar.py
-- contextlib.py
-- httplib.py
-- pdb.py
-- smtplib.py
-- urllib2.py
-- __future__.py
-- cookielib.py
-- ihooks.py
-- pickle.py
-- sndhdr.py
-- urlparse.py
-- __phello__.foo.py
-- copy.py
-- imaplib.py
-- pickletools.py
-- socket.py
-- user.py
-- _abcoll.py
-- copy_reg.py
-- imghdr.py
-- pipes.py
-- sqlite3
-- uu.py
-- _pyio.py
-- csv.py
-- importlib
-- pkgutil.py
-- sre.py
-- uuid.py
-- _strptime.py
-- ctypes
-- imputil.py
-- plat-linux4
-- sre_compile.py
-- warnings.py
-- _threading_local.py
-- dbhash.py
-- inspect.py
-- platform.py
-- sre_constants.py
-- wave.py
-- _weakrefset.py
-- decimal.py
-- io.py
-- plistlib.py
-- sre_parse.py
-- weakref.py
-- abc.py
-- difflib.py
-- json
-- popen2.py
-- ssl.py
-- webbrowser.py
-- aifc.py
-- dircache.py
-- keyword.py
-- poplib.py
-- stat.py
-- whichdb.py
-- antigravity.py
-- dis.py
-- lib-tk
-- posixfile.py
-- statvfs.py
-- wsgiref
-- anydbm.py
-- distutils
-- linecache.py
-- posixpath.py
-- string.py
-- argparse.py
-- doctest.py
-- locale.py
-- pprint.py
-- stringold.py
-- xdrlib.py
-- ast.py
-- dumbdbm.py
-- logging
-- profile.py
-- stringprep.py
-- xml
-- asynchat.py
-- dummy_thread.py
-- macpath.py
-- pstats.py
-- struct.py
-- xmllib.py
-- asyncore.py
-- dummy_threading.py
-- macurl2path.py
-- pty.py
-- subprocess.py
-- xmlrpclib.py
-- atexit.py
-- email
-- mailbox.py
-- py_compile.py
-- sunau.py
-- zipfile.py
-- audiodev.py
-- encodings
-- mailcap.py
-- pyclbr.py
-- sunaudio.py
-- base64.py
-- filecmp.py
-- markupbase.py
-- pydoc.py
-- symbol.py
-- bdb.py
-- fileinput.py
-- md5.py
-- pydoc_data
-- symtable.py
-
-
-
-Python 3rd Libraries
-==========================
-
-- `BeautifulSoup.py(3) <https://www.crummy.com/software/BeautifulSoup/bs3/documentation.html>`_
-- pkg_resources.py
-- androidhelper
-- plyer
-- `bottle.py <http://bottlepy.org/docs/dev/>`_
-- qpy.py
-- qpythoninit.py
-- setuptools
-- `pip <https://pypi.python.org/pypi/pip/>`_
-
-
-Androidhelper APIs
-========================
-To simplify QPython SL4A development in IDEs with a
-"hepler" class derived from the default Android class containing
-SL4A facade functions & API documentation
-
-
-.. toctree::
-   :maxdepth: 2
-
-   guide_androidhelpers
diff --git a/docs/_sources/en/guide_program.txt b/docs/_sources/en/guide_program.txt
deleted file mode 100644
index 07962d77..00000000
--- a/docs/_sources/en/guide_program.txt
+++ /dev/null
@@ -1,191 +0,0 @@
-QPython's main features
-====================================
-
-**With QPython, you could build android applications with android application and script language now.**
-
-
-Why should I choose QPython
-------------------------
-The smartphone is becomming people's essential information & technical assitant, so an flexiable script engine could help people complete most jobs efficiently without complex development.
-
-QPython offer **an amazing developing experience**, with it's help, you could implement the program easily without complex installing IDE, compiling, package progress etc.
-
-QPython's main features
--------------------------
-You can do most jobs through QPython just like the way that Python does on PC/Laptop.
-
-
-**Libraries**
-
-- QPython supports most stardard Python libraries.
-
-- QPython supports many 3rd Python libraries which implemented with pure Python code.
-
-- QPython supports some Python libraries mixed with C/C++ code which pre-compiled by QPython develop team.
-
-- QPython allows you put on the libraries by yourself.
-
-Besides these, QPython offers some extra features which Python doesn't offer, Like:
-
-- Android APIs Access(Like SMS, GPS, NFC, BLUETOOTH etc)
-
-*Why QPython require so many permissions?*
-
-QPython need these permissions to access Android's API.
-
-
-**Runtime modes**
-
-QPython supports several runtime modes for android.
-
-**Console mode**
-
-It's the default runtime mode in QPython, it's very common in PC/laptop.
-
-
-**Kivy mode**
-
-QPython supports `Kivy <http://kivy.org>`_ as the GUI programming solution.
-
-
-Kivy is an open source Python library for rapid development of applications that make use of innovative user interfaces, such as multi-touch apps.
-
-Your device should support opengl2.0 for supporting kivy mode.
-
-By insert into the following header in your script, you can let your script run with kivy mode.
-
-::
-
-    #qpy:kivy
-
-
-*An kivy program in QPython sample*
-
-::
-
-    #qpy:kivy
-    from kivy.app import App
-    from kivy.uix.button import Button
-
-    class TestApp(App):
-        def build(self):
-            return Button(text='Hello World')
-
-    TestApp().run()
-
-
-If your library require the opengl driver, you shoule declare the kivy mode header in your script, like the jnius.
-
-*NOTE: QPython3 didn't support kivy mode yet, we have plan to support it in the future*
-
-**WebApp mode**
-
-We recommend you implement WebApp with QPython for it offer the easy to accomplish UI and Take advantage of Python's fast programming strong point.
-
-WebApp will start a webview in front, and run a python web service background. 
-You could use *bottle*(QPython built-in library) to implement the web service, or you could install *django* / *flask* framework also.
-
-
-By insert into the following header in your script, you can let your script run with webapp mode.
-
-::
-
-    #qpy:webapp:<app title>
-    #qpy:<fullscreen or remove this line>
-    #qpy://<ip:port:path>
-
-For example
-
-::
-
-    #qpy:webapp:Hello QPython
-    #qpy://localhost:8080/hello
-
-
-The previous should start a webview which should load the *http://localhost:8080/hello* as the default page, and the webview will keep the titlebar which title is "Hello QPython", if you add the *#qpy:fullscreen* it will hide the titlebar.
-
-
-::
-
-    #qpy:webapp:Hello Qpython
-    #qpy://127.0.0.1:8080/
-    """
-    This is a sample for qpython webapp
-    """
-
-    from bottle import Bottle, ServerAdapter
-    from bottle import run, debug, route, error, static_file, template
-
-
-    ######### QPYTHON WEB SERVER ###############
-
-    class MyWSGIRefServer(ServerAdapter):
-        server = None
-
-        def run(self, handler):
-            from wsgiref.simple_server import make_server, WSGIRequestHandler
-            if self.quiet:
-                class QuietHandler(WSGIRequestHandler):
-                    def log_request(*args, **kw): pass
-                self.options['handler_class'] = QuietHandler
-            self.server = make_server(self.host, self.port, handler, **self.options)
-            self.server.serve_forever()
-
-        def stop(self):
-            #sys.stderr.close()
-            import threading 
-            threading.Thread(target=self.server.shutdown).start() 
-            #self.server.shutdown()
-            self.server.server_close() #<--- alternative but causes bad fd exception
-            print "# qpyhttpd stop"
-
-
-    ######### BUILT-IN ROUTERS ###############
-    @route('/__exit', method=['GET','HEAD'])
-    def __exit():
-        global server
-        server.stop()
-
-    @route('/assets/<filepath:path>')
-    def server_static(filepath):
-        return static_file(filepath, root='/sdcard')
-
-
-    ######### WEBAPP ROUTERS ###############
-    @route('/')
-    def home():
-        return template('<h1>Hello {{name}} !</h1>'+ \
-        '<a href="/assets/qpython/projects/WebApp Sample/main.py">View source</a>',name='QPython')
-
-
-    ######### WEBAPP ROUTERS ###############
-    app = Bottle()
-    app.route('/', method='GET')(home)
-    app.route('/__exit', method=['GET','HEAD'])(__exit)
-    app.route('/assets/<filepath:path>', method='GET')(server_static)
-
-    try:
-        server = MyWSGIRefServer(host="127.0.0.1", port="8080")
-        app.run(server=server,reloader=False)
-    except Exception,ex:
-        print "Exception: %s" % repr(ex)
-
-
-If you want the webapp could be close when you exit the webview, you have to define the *@route('/__exit', method=['GET','HEAD'])* method , for the qpython will request the *http://localhost:8080/__exit* when you exit the webview. So you can release other resource in this function.
-
-.. image:: ../_static/guide_program_pic1.png
-   :alt: QPython WebApp Sample 
-
-*Running screenshot*
-
-
-In the other part of the code, you could implement a webserver whish serve on localhost:8080 and make the URL /hello implement as your webapp's homepage.
-
-
-**Q mode**
-
-If you don't want the QPython display some UI, pelase try to use the QScript mode, it could run a script background, just insert the following header into your script:
-
-::
-
-    #qpy:qpyapp
diff --git a/docs/_sources/zh/contributorshowto.txt b/docs/_sources/zh/contributorshowto.txt
deleted file mode 100644
index da17ec1e..00000000
--- a/docs/_sources/zh/contributorshowto.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-
-QPython文档体系说明
----------------------
-
-QPython 文档体系分为 英文／中文 两部分，我们努力保持两种语言对应内容的准确和同步，其中内容其中又分为
-
-* 快速开始 （使用上的帮助）
-
-* 编程指南 （主要是用QPython来进行编程和开发的指南）
-
-* QPython黑客指南 （深入折腾的指导）
-
-* 贡献者指南 （QPython贡献者指南，分为在QPython team内的，和以外的）
-
-
-如何提交文档
--------------------------------
-文档非常重要，我们用sphinx来组织文档，并且文档会通过github page功能直接推到qpython.org网站中
-在想要贡献QPython文档之前仔细阅读我们的指南
-
-* git clone http://github.com/qpython-android/qpython
-
-* 进入到 项目的qpython-docs目录中
-
-* 按照sphinx规则编辑source中的文件即可
-
-* 最后cd到qpython-docs中并运行build.sh
-
-* 打开浏览器打开本地文件检查，
-
-* 如果检查无问题则可以提交，然后浏览qpython.org即可看到最新的更新
-
-
-如何提交翻译
--------------------------------
-QPython是一个支持多语言的应用，你可以通过以下方式来提交对应国家的翻译
diff --git a/docs/_sources/zh/howtostart.txt b/docs/_sources/zh/howtostart.txt
deleted file mode 100644
index 8a1ed07f..00000000
--- a/docs/_sources/zh/howtostart.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-快速开始
-=========
-
-* `QPython － 使用说明 <http://wiki.qpython.org/zh/doc/how-to-start>`_
-* `QPython － 快速开始 <http://wiki.qpython.org/zh/quick-start>`_
-* `“你好，世界！” <http://wiki.qpython.org/zh/doc/hello-world>`_
-
-编程指南
-============
-
-* `QPython － 开发 WEB APP <http://wiki.qpython.org/zh/webapp/sample>`_
-* `QPython － Bottle 快速了解 <http://wiki.qpython.org/zh/webapp/bottle>`_
-
-QPython黑客指南
-=================
-
-* `QPython － 编程向导 <http://wiki.qpython.org/zh/doc/program_guide/>`_
-* `QPython 黑客 <http://wiki.qpython.org/zh/diveinto/>`_
-
-贡献者指南
-=================
-欢迎加入 QPython 团队
-
-.. toctree::
-   :maxdepth: 2
-
-   contributorshowto
-
diff --git a/docs/_sources/zh/quickstart.txt b/docs/_sources/zh/quickstart.txt
deleted file mode 100644
index eb41fb3b..00000000
--- a/docs/_sources/zh/quickstart.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-���ٿ�ʼ
-========
-
diff --git a/docs/_sources/zhindex.txt b/docs/_sources/zhindex.txt
deleted file mode 100644
index 6006633f..00000000
--- a/docs/_sources/zhindex.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-中文用户向导
-=============================================
-
-欢迎 ！
-------------------------------
-QPython/QPython3 的最新版本1.3.2(QPython), 1.0.2(QPython3) 已经发布，它包含了许多惊艳的特性，请从应用市场安装
-
-
-QPython 起步
-------------------------
-.. toctree::
-   :maxdepth: 2
-
-   zh/howtostart
-
-
-更多链接
-------------------------------
-* `常见问题 <http://wiki.qpython.org/zh/faq/>`_
-* `在百度贴吧里讨论 <http://tieba.baidu.com/f?ie=utf-8&kw=qpython>`_
-* `在微博问我们问题 <http://weibo.com/qpython>`_
-* `给我们发邮件 <mailto:support@qpython.org>`_
-* `报告问题 <https://github.com/qpython-android/qpython/issues>`_
-
-QPython 用户开发组
-------------------------------
-* 请加入 `QPython 用户开发者组 <https://groups.google.com/forum/?hl=en#!forum/qpython>`_ 来和全世界的 QPython 用户一块来玩转QPython。
-* 加入QPython QQ组（Q群：540717901）来和中国活跃的QPython 用户一起玩转 QPython
-
-如何贡献
----------
-想成为 QPython 的贡献者么？请 `给我们发邮件 <mailto:support@qpython.org>`_
-
diff --git a/docs/document.html b/docs/document.html
deleted file mode 100644
index 2eb7d19f..00000000
--- a/docs/document.html
+++ /dev/null
@@ -1,251 +0,0 @@
-<!DOCTYPE html>
-<html>
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>Welcome to read the QPython guide! &mdash; QPython 0.9 documentation</title>
-<link rel="stylesheet" href="static/qpython_theme.css" type="text/css" />
-<link rel="stylesheet" href="static/pygments.css" type="text/css" />
-<script type="text/javascript">
-var DOCUMENTATION_OPTIONS = {
-URL_ROOT:    './',
-VERSION:     '0.9',
-COLLAPSE_INDEX: false,
-FILE_SUFFIX: '.html',
-HAS_SOURCE:  true
-};
-</script>
-<script type="text/javascript" src="static/jquery.js"></script>
-<script type="text/javascript" src="static/underscore.js"></script>
-<script type="text/javascript" src="static/doctools.js"></script>
-<link rel="top" title="QPython 0.9 documentation" href="#" />
-<link rel="next" title="Getting started" href="en/guide.html" />
-<meta charset="UTF-8">
-<link href="http://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet">
-<script src="http://cdn.bootcss.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
-<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
-</head>
-<body role="document">
-<div class="header doc-header">
-<div class="col-lg-offset-2 col-lg-8 col-md-offset-2 col-md-8 col-sm-offset-2 col-sm-8  index-header">
-<div class="navbar-header">
-<button type="button" class="navbar-toggle" data-toggle="collapse"
-data-target="#example-navbar-collapse">
-<span class="sr-only">切换导航</span>
-<span class="icon-bar"></span>
-<span class="icon-bar"></span>
-<span class="icon-bar"></span>
-</button>
-<a href="/index.html" class="logo"><img src="static/img_logo.png"></a>
-</div>
-<ul class="header-title hidden-xs">
-<li class="header-phone-selected">
-<a href="/index.html">Home</a>
-</li>
-<li>
-<a href="/document.html" class="header-selected">Guide</a>
-<span class="header-title-selected"></span>
-</li>
-<li>
-<a target="_blank" href="https://github.com/qpython-android/qpython">Github</a>
-</li>
-</ul>
-<div class="search-box hidden-xs">
-<form action="search.html">
-<input type="search" name="q" placeholder="keyword">
-<input type="hidden" name="check_keywords" value="yes" />
-<input type="hidden" name="area" value="default" />
-<button><img src="static/ic_search.png"></button>
-</form>
-</div>
-</div>
-</div>
-<div class="row doc-content">
-<div class="content-main col-sm-offset-2 col-sm-8">
-<div class="content-wrapper col-sm-4">
-<div class="left-menu">
-<div class="doc-title hidden-xs">QPthon</div>
-<div class="sidebar  collapse navbar-collapse"  id="example-navbar-collapse">
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="en/guide.html">Getting started</a></li>
-<li class="toctree-l1"><a class="reference internal" href="en/guide.html#programming-guide">Programming Guide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="en/guide.html#developers-guide">Developers&#8217; Guide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="en/guide.html#contributors-guide">Contributors&#8217; Guide</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="en/faq.html">FAQ</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="zhindex.html">中文用户向导</a></li>
-</ul>
-<div class="search-phone visible-xs">
-<form action="search.html">
-<input type="search" name="q" placeholder="keyword">
-<input type="hidden" name="check_keywords" value="yes" />
-<input type="hidden" name="area" value="default" />
-<button><img src="static/ic_search.png"></button>
-</form>
-</div>
-</div>
-</div>
-</div>
-<div class="content col-sm-8">
-<div class="document">
-<ul class="crumbs">
-<li><a href="#">Guide</a> &raquo;</li>
-<li>Welcome to read the QPython guide!</li>
-</ul>
-<div class="documentwrapper">
-<div class="bodywrapper">
-<div class="body" role="main">
-<img alt="images/bestpython.png" src="images/bestpython.png" />
-<div class="section" id="welcome-to-read-the-qpython-guide">
-<h1>Welcome to read the QPython guide!<a class="headerlink" href="#welcome-to-read-the-qpython-guide" title="Permalink to this headline">¶</a></h1>
-<p>QPython is a script engine that runs Python on android devices. It lets your android device run Python scripts and projects. It contains the Python interpreter, console, editor, and the SL4A Library for Android. It’s Python on Android!</p>
-<p>QPython has several millions users in the world already, it&#8217;s a great project for programming users, welcome to join us for contributing to this project NOW.</p>
-<div class="section" id="what-s-new">
-<h2>What&#8217;s NEW<a class="headerlink" href="#what-s-new" title="Permalink to this headline">¶</a></h2>
-<p>QPython project include the <a class="reference external" href="https://play.google.com/store/apps/details?id=org.qpython.qpy">QPython</a> and <a class="reference external" href="https://play.google.com/store/apps/details?id=org.qpython.qpy3">QPython3</a> applications.</p>
-<p>QPython application is using the <strong>Python 2.7.2</strong> , and QPython application is using the  <strong>Python 3.2.2</strong> .</p>
-<p>QPython&#8217;s newest version is 1.3.2 (Released on 2017/5/12) , QPython3&#8217;s newest version is 1.0.2 (Released on 2017/3/29), New versions include many amazing features, please upgrade to the newest version as soon from google play, amazon appstore etc.</p>
-</div>
-<div class="section" id="thanks-these-guys-who-are-contributing">
-<h2>Thanks these guys who are contributing<a class="headerlink" href="#thanks-these-guys-who-are-contributing" title="Permalink to this headline">¶</a></h2>
-<p>They are pushing on the QPython project moving forward.</p>
-<a class="reference external image-reference" href="https://github.com/riverfor"><img alt="River is the project's organizer and the current online QPython's author." src="https://avatars0.githubusercontent.com/u/3059527?v=3&amp;s=60" /></a>
-<a class="reference external image-reference" href="https://github.com/pollyfat"><img alt="Mae is a beautiful and talented girl developer who is good at python &amp; android programming." src="https://avatars0.githubusercontent.com/u/10812534?v=3&amp;s=60" /></a>
-<a class="reference external image-reference" href="https://github.com/ZoomQuiet"><img alt="Zoom.Quiet is a knowledgeable guy who is famous in many opensource communities." src="https://avatars0.githubusercontent.com/u/22494?v=3&amp;s=60" /></a>
-<a class="reference external image-reference" href="https://github.com/mathiasluo"><img alt="MathiasLuo is a android geek developer" src="https://avatars3.githubusercontent.com/u/10219741?v=3&amp;s=60" /></a>
-<a class="reference external image-reference" href="https://github.com/liyuanrui"><img alt="liyuanrui is a Chinese geek" src="https://avatars2.githubusercontent.com/u/25975283?v=3&amp;s=60" /></a>
-<a class="reference external image-reference" href="https://github.com/kylelk"><img alt="Kyle kersey is a US geek" src="https://avatars3.githubusercontent.com/u/5159173?v=3&amp;s=60" /></a>
-<p>Do you want to join the great QPython team ? You could <a class="reference external" href="https://twitter.com/qpython">Ask qustions on twitter</a> or <a class="reference external" href="mailto:support&#37;&#52;&#48;qpython&#46;org">email us</a>.
-And you could <a class="reference external" href="https://github.com/qpython-android/qpython">fork us on github</a> and send pull request.</p>
-</div>
-<div class="section" id="qpython-communities">
-<h2>QPython Communities<a class="headerlink" href="#qpython-communities" title="Permalink to this headline">¶</a></h2>
-<p><strong>There are many active QPython communities where you could meet the QPython users like you</strong></p>
-<ul class="simple">
-<li><a class="reference external" href="https://www.facebook.com/groups/qpython">Join Facebook community</a></li>
-<li><a class="reference external" href="https://groups.google.com/forum/#!forum/qpython">Join Google group</a></li>
-<li><a class="reference external" href="https://gitter.com/qpython-android/qpython">Join Gitter chat</a></li>
-<li><a class="reference external" href="https://plus.google.com/communities/111759148772865961493">Join G+ community(For QPython testers)</a></li>
-<li><a class="reference external" href="http://stackoverflow.com/questions/tagged/qpython">QPython on Stackoverflow</a></li>
-</ul>
-<p><strong>And you could talk to us through social network</strong></p>
-<ul class="simple">
-<li><a class="reference external" href="https://www.facebook.com/QPython">Like us on facebook</a></li>
-<li><a class="reference external" href="https://twitter.com/qpython">Follow us on twitter</a></li>
-<li><a class="reference external" href="https://github.com/qpython-android/qpython/issues">Report issue</a></li>
-<li><a class="reference external" href="mailto:support&#37;&#52;&#48;qpython&#46;org">Email us</a></li>
-</ul>
-<p><strong>It&#8217;s the official QPython Users &amp; Contributors&#8217; Guide, please follow these steps for using and contributing.</strong></p>
-</div>
-<div class="section" id="support">
-<h2>Support<a class="headerlink" href="#support" title="Permalink to this headline">¶</a></h2>
-<p>We are happy to hear feedback from you,  but sometimes some bugs or features demand may not be implemented soon for we lack resources.</p>
-<p>So if you have any issue need the core developer team to solve with higher priority, you could try the <a class="reference external" href="https://www.bountysource.com/">bountysource service</a>.</p>
-</div>
-<div class="section" id="now-let-s-go">
-<h2>Now, let&#8217;s GO<a class="headerlink" href="#now-let-s-go" title="Permalink to this headline">¶</a></h2>
-<div class="toctree-wrapper compound">
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="en/guide.html">Getting started</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="en/guide_howtostart.html">QPython: How To Start</a></li>
-<li class="toctree-l2"><a class="reference internal" href="en/guide_helloworld.html">Writing &#8220;Hello World&#8221;</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="en/guide.html#programming-guide">Programming Guide</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="en/guide_program.html">QPython&#8217;s main features</a></li>
-<li class="toctree-l2"><a class="reference internal" href="en/guide_ide.html">Use the best way for developing</a></li>
-<li class="toctree-l2"><a class="reference internal" href="en/guide_libraries.html">QPython built-in Libraries</a></li>
-<li class="toctree-l2"><a class="reference internal" href="en/guide_libraries.html#python-3rd-libraries">Python 3rd Libraries</a></li>
-<li class="toctree-l2"><a class="reference internal" href="en/guide_libraries.html#androidhelper-apis">Androidhelper APIs</a></li>
-<li class="toctree-l2"><a class="reference internal" href="en/guide_extend.html">QPython Open API</a></li>
-<li class="toctree-l2"><a class="reference internal" href="en/guide_extend.html#qpython-online-service">QPython Online Service</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="en/guide.html#developers-guide">Developers&#8217; Guide</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="en/guide_developers.html">Android</a></li>
-<li class="toctree-l2"><a class="reference internal" href="en/guide_developers.html#qsl4a">QSL4A</a></li>
-<li class="toctree-l2"><a class="reference internal" href="en/guide_developers.html#qpython-core">QPython Core</a></li>
-<li class="toctree-l2"><a class="reference internal" href="en/guide_developers.html#pip-and-libraries">Pip and libraries</a></li>
-<li class="toctree-l2"><a class="reference internal" href="en/guide_developers.html#quick-tools">Quick tools</a></li>
-<li class="toctree-l2"><a class="reference internal" href="en/guide_developers.html#qpy-io-enterprise-service">QPY.IO (Enterprise service)</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="en/guide.html#contributors-guide">Contributors&#8217; Guide</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="en/guide_contributors.html">Welcome contribute</a></li>
-<li class="toctree-l2"><a class="reference internal" href="en/guide_contributors.html#how-to-help-with-test">How to help with test</a></li>
-<li class="toctree-l2"><a class="reference internal" href="en/guide_contributors.html#how-to-contribute-documentation">How to contribute documentation</a></li>
-<li class="toctree-l2"><a class="reference internal" href="en/guide_contributors.html#how-to-translate">How to translate</a></li>
-<li class="toctree-l2"><a class="reference internal" href="en/guide_contributors.html#how-to-launch-a-local-qpython-users-community">How to launch a local QPython users community</a></li>
-<li class="toctree-l2"><a class="reference internal" href="en/guide_contributors.html#how-to-became-the-developer-member">How to became the developer member</a></li>
-<li class="toctree-l2"><a class="reference internal" href="en/guide_contributors.html#how-to-sponsor-qpython-project">How to sponsor QPython project</a></li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<div class="section" id="others">
-<h2>Others<a class="headerlink" href="#others" title="Permalink to this headline">¶</a></h2>
-<div class="toctree-wrapper compound">
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="en/faq.html">FAQ</a></li>
-</ul>
-</div>
-</div>
-<div class="section" id="for-chinese-users">
-<h2>For Chinese users<a class="headerlink" href="#for-chinese-users" title="Permalink to this headline">¶</a></h2>
-<div class="toctree-wrapper compound">
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="zhindex.html">中文用户向导</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="zhindex.html#id2">欢迎 ！</a></li>
-<li class="toctree-l2"><a class="reference internal" href="zhindex.html#qpython">QPython 起步</a></li>
-<li class="toctree-l2"><a class="reference internal" href="zhindex.html#id3">更多链接</a></li>
-<li class="toctree-l2"><a class="reference internal" href="zhindex.html#id9">QPython 用户开发组</a></li>
-<li class="toctree-l2"><a class="reference internal" href="zhindex.html#id11">如何贡献</a></li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-</div>
-</div>
-</div>
-</div>
-</div>
-<div class="fb-comments" data-href="http://qpython.org" data-numposts="10"></div>
-</div>
-</div>
-<div class="col-sm-2"></div>
-</div>
-<footer id="footer">
-<div class="col-sm-offset-2 col-sm-6 footer-div1">
-<div class="footer-block-item">
-<span class="footer-item1">Built with Sphinx using a theme provid by QPython.</span>
-<span class="footer-item2 visible-xs">
-&#169; Copyright 2017, QPython.
-</span>
-</div>
-</div>
-<div class="col-sm-2 footer-div2">
-<a href="/index.html" class="pull-right"><img src="static/img_logo.png"></a>
-</div>
-</footer>
-<script type="text/javascript">
-$('.fb-comments').attr('data-href', (window.location.href.split('#')[0]).split('?')[0])
-(function(d, s, id) {
-var js, fjs = d.getElementsByTagName(s)[0];
-if (d.getElementById(id)) return;
-js = d.createElement(s); js.id = id;
-js.src = "//connect.facebook.net/en_US/sdk.js#xfbml=1&version=v2.8&appId=1680815145503311";
-fjs.parentNode.insertBefore(js, fjs);
-}(document, 'script', 'facebook-jssdk'));
-$(function(){
-if ($('#footer')[0].offsetTop < $(window).height()){
-$('#footer').addClass('to-bottom')
-}
-})
-</script>
-</body>
-</html>
diff --git a/docs/en/faq.html b/docs/en/faq.html
deleted file mode 100644
index b065103b..00000000
--- a/docs/en/faq.html
+++ /dev/null
@@ -1,153 +0,0 @@
-<!DOCTYPE html>
-<html>
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>FAQ &mdash; QPython 0.9 documentation</title>
-<link rel="stylesheet" href="../static/qpython_theme.css" type="text/css" />
-<link rel="stylesheet" href="../static/pygments.css" type="text/css" />
-<script type="text/javascript">
-var DOCUMENTATION_OPTIONS = {
-URL_ROOT:    '../',
-VERSION:     '0.9',
-COLLAPSE_INDEX: false,
-FILE_SUFFIX: '.html',
-HAS_SOURCE:  true
-};
-</script>
-<script type="text/javascript" src="../static/jquery.js"></script>
-<script type="text/javascript" src="../static/underscore.js"></script>
-<script type="text/javascript" src="../static/doctools.js"></script>
-<link rel="top" title="QPython 0.9 documentation" href="../document.html" />
-<link rel="next" title="中文用户向导" href="../zhindex.html" />
-<link rel="prev" title="Join the tester community" href="guide_contributors_test.html" />
-<meta charset="UTF-8">
-<link href="http://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet">
-<script src="http://cdn.bootcss.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
-<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
-</head>
-<body role="document">
-<div class="header doc-header">
-<div class="col-lg-offset-2 col-lg-8 col-md-offset-2 col-md-8 col-sm-offset-2 col-sm-8  index-header">
-<div class="navbar-header">
-<button type="button" class="navbar-toggle" data-toggle="collapse"
-data-target="#example-navbar-collapse">
-<span class="sr-only">切换导航</span>
-<span class="icon-bar"></span>
-<span class="icon-bar"></span>
-<span class="icon-bar"></span>
-</button>
-<a href="/index.html" class="logo"><img src="../static/img_logo.png"></a>
-</div>
-<ul class="header-title hidden-xs">
-<li class="header-phone-selected">
-<a href="/index.html">Home</a>
-</li>
-<li>
-<a href="/document.html" class="header-selected">Guide</a>
-<span class="header-title-selected"></span>
-</li>
-<li>
-<a target="_blank" href="https://github.com/qpython-android/qpython">Github</a>
-</li>
-</ul>
-<div class="search-box hidden-xs">
-<form action="../search.html">
-<input type="search" name="q" placeholder="keyword">
-<input type="hidden" name="check_keywords" value="yes" />
-<input type="hidden" name="area" value="default" />
-<button><img src="../static/ic_search.png"></button>
-</form>
-</div>
-</div>
-</div>
-<div class="row doc-content">
-<div class="content-main col-sm-offset-2 col-sm-8">
-<div class="content-wrapper col-sm-4">
-<div class="left-menu">
-<div class="doc-title hidden-xs">QPthon</div>
-<div class="sidebar  collapse navbar-collapse"  id="example-navbar-collapse">
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="guide.html">Getting started</a></li>
-<li class="toctree-l1"><a class="reference internal" href="guide.html#programming-guide">Programming Guide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="guide.html#developers-guide">Developers&#8217; Guide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="guide.html#contributors-guide">Contributors&#8217; Guide</a></li>
-</ul>
-<ul class="current">
-<li class="toctree-l1 current"><a class="current reference internal" href="#">FAQ</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../zhindex.html">中文用户向导</a></li>
-</ul>
-<div class="search-phone visible-xs">
-<form action="../search.html">
-<input type="search" name="q" placeholder="keyword">
-<input type="hidden" name="check_keywords" value="yes" />
-<input type="hidden" name="area" value="default" />
-<button><img src="../static/ic_search.png"></button>
-</form>
-</div>
-</div>
-</div>
-</div>
-<div class="content col-sm-8">
-<div class="document">
-<ul class="crumbs">
-<li><a href="../document.html">Guide</a> &raquo;</li>
-<li>FAQ</li>
-</ul>
-<div class="documentwrapper">
-<div class="bodywrapper">
-<div class="body" role="main">
-<div class="section" id="faq">
-<h1>FAQ<a class="headerlink" href="#faq" title="Permalink to this headline">¶</a></h1>
-<p><strong>How to run qpython script from other terminals ?</strong></p>
-<ul class="simple">
-<li>You could &#8220;share to&#8221; qpython from 3rd apps.</li>
-<li>You need to root the android device first, then soure the env vars  (Just like the qpython wiki link you mentioned) and execute the /data/data/org.qpython.qpy/bin/python or /data/data/org.qpython.qpy/bin/python-android5 (for android 5 above)</li>
-</ul>
-<p><a class="reference external" href="http://stackoverflow.com/questions/32110131/how-to-run-android-qpython-script-from-cmd-droidedit-terminal">Case sample</a></p>
-<p><strong>Support pygame ?</strong></p>
-<p>Even you could import pygame in QPython, but QPython doesn&#8217;t support pygame now.</p>
-<p>We will consider to support it later, please follow us on facebook to get it&#8217;s progress.</p>
-<p><a class="reference external" href="http://stackoverflow.com/questions/30489732/qpythonpygame-segmentation-fault">Case sample</a></p>
-</div>
-</div>
-</div>
-</div>
-</div>
-<div class="fb-comments" data-href="http://qpython.org" data-numposts="10"></div>
-</div>
-</div>
-<div class="col-sm-2"></div>
-</div>
-<footer id="footer">
-<div class="col-sm-offset-2 col-sm-6 footer-div1">
-<div class="footer-block-item">
-<span class="footer-item1">Built with Sphinx using a theme provid by QPython.</span>
-<span class="footer-item2 visible-xs">
-&#169; Copyright 2017, QPython.
-</span>
-</div>
-</div>
-<div class="col-sm-2 footer-div2">
-<a href="/index.html" class="pull-right"><img src="../static/img_logo.png"></a>
-</div>
-</footer>
-<script type="text/javascript">
-$('.fb-comments').attr('data-href', (window.location.href.split('#')[0]).split('?')[0])
-(function(d, s, id) {
-var js, fjs = d.getElementsByTagName(s)[0];
-if (d.getElementById(id)) return;
-js = d.createElement(s); js.id = id;
-js.src = "//connect.facebook.net/en_US/sdk.js#xfbml=1&version=v2.8&appId=1680815145503311";
-fjs.parentNode.insertBefore(js, fjs);
-}(document, 'script', 'facebook-jssdk'));
-$(function(){
-if ($('#footer')[0].offsetTop < $(window).height()){
-$('#footer').addClass('to-bottom')
-}
-})
-</script>
-</body>
-</html>
diff --git a/docs/en/guide.html b/docs/en/guide.html
deleted file mode 100644
index a7e20c35..00000000
--- a/docs/en/guide.html
+++ /dev/null
@@ -1,321 +0,0 @@
-<!DOCTYPE html>
-<html>
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>Getting started &mdash; QPython 0.9 documentation</title>
-<link rel="stylesheet" href="../static/qpython_theme.css" type="text/css" />
-<link rel="stylesheet" href="../static/pygments.css" type="text/css" />
-<script type="text/javascript">
-var DOCUMENTATION_OPTIONS = {
-URL_ROOT:    '../',
-VERSION:     '0.9',
-COLLAPSE_INDEX: false,
-FILE_SUFFIX: '.html',
-HAS_SOURCE:  true
-};
-</script>
-<script type="text/javascript" src="../static/jquery.js"></script>
-<script type="text/javascript" src="../static/underscore.js"></script>
-<script type="text/javascript" src="../static/doctools.js"></script>
-<link rel="top" title="QPython 0.9 documentation" href="../document.html" />
-<link rel="next" title="QPython: How To Start" href="guide_howtostart.html" />
-<link rel="prev" title="Welcome to read the QPython guide!" href="../document.html" />
-<meta charset="UTF-8">
-<link href="http://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet">
-<script src="http://cdn.bootcss.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
-<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
-</head>
-<body role="document">
-<div class="header doc-header">
-<div class="col-lg-offset-2 col-lg-8 col-md-offset-2 col-md-8 col-sm-offset-2 col-sm-8  index-header">
-<div class="navbar-header">
-<button type="button" class="navbar-toggle" data-toggle="collapse"
-data-target="#example-navbar-collapse">
-<span class="sr-only">切换导航</span>
-<span class="icon-bar"></span>
-<span class="icon-bar"></span>
-<span class="icon-bar"></span>
-</button>
-<a href="/index.html" class="logo"><img src="../static/img_logo.png"></a>
-</div>
-<ul class="header-title hidden-xs">
-<li class="header-phone-selected">
-<a href="/index.html">Home</a>
-</li>
-<li>
-<a href="/document.html" class="header-selected">Guide</a>
-<span class="header-title-selected"></span>
-</li>
-<li>
-<a target="_blank" href="https://github.com/qpython-android/qpython">Github</a>
-</li>
-</ul>
-<div class="search-box hidden-xs">
-<form action="../search.html">
-<input type="search" name="q" placeholder="keyword">
-<input type="hidden" name="check_keywords" value="yes" />
-<input type="hidden" name="area" value="default" />
-<button><img src="../static/ic_search.png"></button>
-</form>
-</div>
-</div>
-</div>
-<div class="row doc-content">
-<div class="content-main col-sm-offset-2 col-sm-8">
-<div class="content-wrapper col-sm-4">
-<div class="left-menu">
-<div class="doc-title hidden-xs">QPthon</div>
-<div class="sidebar  collapse navbar-collapse"  id="example-navbar-collapse">
-<ul class="current">
-<li class="toctree-l1 current"><a class="current reference internal" href="#">Getting started</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="guide_howtostart.html">QPython: How To Start</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_helloworld.html">Writing &#8220;Hello World&#8221;</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="#programming-guide">Programming Guide</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="guide_program.html">QPython&#8217;s main features</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_ide.html">Use the best way for developing</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_libraries.html">QPython built-in Libraries</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_libraries.html#python-3rd-libraries">Python 3rd Libraries</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_libraries.html#androidhelper-apis">Androidhelper APIs</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_extend.html">QPython Open API</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_extend.html#qpython-online-service">QPython Online Service</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="#developers-guide">Developers&#8217; Guide</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="guide_developers.html">Android</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_developers.html#qsl4a">QSL4A</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_developers.html#qpython-core">QPython Core</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_developers.html#pip-and-libraries">Pip and libraries</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_developers.html#quick-tools">Quick tools</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_developers.html#qpy-io-enterprise-service">QPY.IO (Enterprise service)</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="#contributors-guide">Contributors&#8217; Guide</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="guide_contributors.html">Welcome contribute</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_contributors.html#how-to-help-with-test">How to help with test</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_contributors.html#how-to-contribute-documentation">How to contribute documentation</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_contributors.html#how-to-translate">How to translate</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_contributors.html#how-to-launch-a-local-qpython-users-community">How to launch a local QPython users community</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_contributors.html#how-to-became-the-developer-member">How to became the developer member</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_contributors.html#how-to-sponsor-qpython-project">How to sponsor QPython project</a></li>
-</ul>
-</li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="faq.html">FAQ</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../zhindex.html">中文用户向导</a></li>
-</ul>
-<div class="search-phone visible-xs">
-<form action="../search.html">
-<input type="search" name="q" placeholder="keyword">
-<input type="hidden" name="check_keywords" value="yes" />
-<input type="hidden" name="area" value="default" />
-<button><img src="../static/ic_search.png"></button>
-</form>
-</div>
-</div>
-</div>
-</div>
-<div class="content col-sm-8">
-<div class="document">
-<ul class="crumbs">
-<li><a href="../document.html">Guide</a> &raquo;</li>
-<li>Getting started</li>
-</ul>
-<div class="documentwrapper">
-<div class="bodywrapper">
-<div class="body" role="main">
-<div class="section" id="getting-started">
-<h1>Getting started<a class="headerlink" href="#getting-started" title="Permalink to this headline">¶</a></h1>
-<p>How to start quickly ? Just follow the following steps:</p>
-<div class="toctree-wrapper compound">
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="guide_howtostart.html">QPython: How To Start</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="guide_howtostart.html#dashboard">1. Dashboard</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_howtostart.html#console-and-editor">2. Console and editor</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_howtostart.html#programs">3. Programs</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_howtostart.html#libraries">4. Libraries</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_howtostart.html#community">5. Community</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="guide_helloworld.html">Writing &#8220;Hello World&#8221;</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="guide_helloworld.html#hello-world">Hello world</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_helloworld.html#sl4a-library">SL4A library</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_helloworld.html#more-samples">More samples</a></li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<div class="section" id="programming-guide">
-<h1>Programming Guide<a class="headerlink" href="#programming-guide" title="Permalink to this headline">¶</a></h1>
-<p>If you you want to know more about how to program through qpython, just follow these steps:</p>
-<div class="toctree-wrapper compound">
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="guide_program.html">QPython&#8217;s main features</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="guide_program.html#why-should-i-choose-qpython">Why should I choose QPython</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_program.html#id1">QPython&#8217;s main features</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="guide_ide.html">Use the best way for developing</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="guide_ide.html#develop-from-qeditor">Develop from QEditor</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_ide.html#develop-from-browser">Develop from browser</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_ide.html#develop-from-your-computer">Develop from your computer</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="guide_libraries.html">QPython built-in Libraries</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="guide_libraries.html#qpython-dynload-libraries">QPython dynload libraries</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_libraries.html#qpython-stardard-libraries">QPython stardard libraries</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="guide_libraries.html#python-3rd-libraries">Python 3rd Libraries</a></li>
-<li class="toctree-l1"><a class="reference internal" href="guide_libraries.html#androidhelper-apis">Androidhelper APIs</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="guide_androidhelpers.html">AndroidFacade</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_androidhelpers.html#applicationmanagerfacade">ApplicationManagerFacade</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_androidhelpers.html#camerafacade">CameraFacade</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_androidhelpers.html#commonintentsfacade">CommonIntentsFacade</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_androidhelpers.html#contactsfacade">ContactsFacade</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_androidhelpers.html#eventfacade">EventFacade</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_androidhelpers.html#locationfacade">LocationFacade</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_androidhelpers.html#phonefacade">PhoneFacade</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_androidhelpers.html#mediarecorderfacade">MediaRecorderFacade</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_androidhelpers.html#sensormanagerfacade">SensorManagerFacade</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_androidhelpers.html#settingsfacade">SettingsFacade</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_androidhelpers.html#smsfacade">SmsFacade</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_androidhelpers.html#speechrecognitionfacade">SpeechRecognitionFacade</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_androidhelpers.html#tonegeneratorfacade">ToneGeneratorFacade</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_androidhelpers.html#wakelockfacade">WakeLockFacade</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_androidhelpers.html#wififacade">WifiFacade</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_androidhelpers.html#batterymanagerfacade">BatteryManagerFacade</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_androidhelpers.html#activityresultfacade">ActivityResultFacade</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_androidhelpers.html#mediaplayerfacade">MediaPlayerFacade</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_androidhelpers.html#preferencesfacade">PreferencesFacade</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_androidhelpers.html#qpyinterfacefacade">QPyInterfaceFacade</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_androidhelpers.html#texttospeechfacade">TextToSpeechFacade</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_androidhelpers.html#eyesfreefacade">EyesFreeFacade</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_androidhelpers.html#bluetoothfacade">BluetoothFacade</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_androidhelpers.html#signalstrengthfacade">SignalStrengthFacade</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_androidhelpers.html#webcamfacade">WebCamFacade</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_androidhelpers.html#uifacade">UiFacade</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_androidhelpers.html#usb-host-serial-facade">USB Host Serial Facade</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="guide_extend.html">QPython Open API</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="guide_extend.html#share-some-content-to-qpython-s-scripts">Share some content to QPython&#8217;s scripts</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_extend.html#run-qpython-s-script-from-your-own-application">Run QPython&#8217;s script from your own application</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="guide_extend.html#qpython-online-service">QPython Online Service</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="guide_extend.html#qpypi">QPypi</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_extend.html#qpy-io">QPY.IO</a></li>
-</ul>
-</li>
-</ul>
-</div>
-<p><strong>QPython project is not only a powerful Python engine for android, but is a active technology community also.</strong></p>
-</div>
-<div class="section" id="developers-guide">
-<h1>Developers&#8217; Guide<a class="headerlink" href="#developers-guide" title="Permalink to this headline">¶</a></h1>
-<p>QPython developers&#8217; goal is pushing out a great Python for android.</p>
-<div class="toctree-wrapper compound">
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="guide_developers.html">Android</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="guide_developers.html#console">Console</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_developers.html#editor">Editor</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_developers.html#file-browsing">File browsing</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_developers.html#qrcode-reader">QRCode reader</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="guide_developers.html#qsl4a">QSL4A</a></li>
-<li class="toctree-l1"><a class="reference internal" href="guide_developers.html#qpython-core">QPython Core</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="guide_developers.html#python-2-x">Python 2.x</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_developers.html#python-3-x">Python 3.x</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_developers.html#console-program">Console program</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_developers.html#kivy-program">Kivy program</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_developers.html#webapp-program">WebApp program</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="guide_developers.html#pip-and-libraries">Pip and libraries</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="guide_developers.html#pip">Pip</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_developers.html#libraries">Libraries</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="guide_developers.html#quick-tools">Quick tools</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="guide_developers.html#qpython-api">QPython API</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_developers.html#ftp">FTP</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="guide_developers.html#qpy-io-enterprise-service">QPY.IO (Enterprise service)</a></li>
-</ul>
-</div>
-</div>
-<div class="section" id="contributors-guide">
-<h1>Contributors&#8217; Guide<a class="headerlink" href="#contributors-guide" title="Permalink to this headline">¶</a></h1>
-<p>Welcome to join QPython contributors team, you are not just a user, but a creator of QPython.</p>
-<div class="toctree-wrapper compound">
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="guide_contributors.html">Welcome contribute</a></li>
-<li class="toctree-l1"><a class="reference internal" href="guide_contributors.html#how-to-help-with-test">How to help with test</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="guide_contributors_test.html">Join the tester community</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_contributors_test.html#become-a-tester">Become a tester</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_contributors_test.html#report-or-suggest">Report or suggest</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_contributors_test.html#feedback">Feedback</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="guide_contributors.html#how-to-contribute-documentation">How to contribute documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="guide_contributors.html#how-to-translate">How to translate</a></li>
-<li class="toctree-l1"><a class="reference internal" href="guide_contributors.html#how-to-launch-a-local-qpython-users-community">How to launch a local QPython users community</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="guide_contributors.html#how-to-organise-a-local-qpython-user-sharing-event">How to organise a local qpython user sharing event</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="guide_contributors.html#how-to-became-the-developer-member">How to became the developer member</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="guide_contributors.html#how-to-develop-qpython-built-in-programs">How to develop qpython built-in programs</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="guide_contributors.html#how-to-sponsor-qpython-project">How to sponsor QPython project</a></li>
-</ul>
-</div>
-</div>
-</div>
-</div>
-</div>
-</div>
-<div class="fb-comments" data-href="http://qpython.org" data-numposts="10"></div>
-</div>
-</div>
-<div class="col-sm-2"></div>
-</div>
-<footer id="footer">
-<div class="col-sm-offset-2 col-sm-6 footer-div1">
-<div class="footer-block-item">
-<span class="footer-item1">Built with Sphinx using a theme provid by QPython.</span>
-<span class="footer-item2 visible-xs">
-&#169; Copyright 2017, QPython.
-</span>
-</div>
-</div>
-<div class="col-sm-2 footer-div2">
-<a href="/index.html" class="pull-right"><img src="../static/img_logo.png"></a>
-</div>
-</footer>
-<script type="text/javascript">
-$('.fb-comments').attr('data-href', (window.location.href.split('#')[0]).split('?')[0])
-(function(d, s, id) {
-var js, fjs = d.getElementsByTagName(s)[0];
-if (d.getElementById(id)) return;
-js = d.createElement(s); js.id = id;
-js.src = "//connect.facebook.net/en_US/sdk.js#xfbml=1&version=v2.8&appId=1680815145503311";
-fjs.parentNode.insertBefore(js, fjs);
-}(document, 'script', 'facebook-jssdk'));
-$(function(){
-if ($('#footer')[0].offsetTop < $(window).height()){
-$('#footer').addClass('to-bottom')
-}
-})
-</script>
-</body>
-</html>
diff --git a/docs/en/guide_androidhelpers.html b/docs/en/guide_androidhelpers.html
deleted file mode 100644
index 38a7df7d..00000000
--- a/docs/en/guide_androidhelpers.html
+++ /dev/null
@@ -1,3668 +0,0 @@
-<!DOCTYPE html>
-<html>
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>AndroidFacade &mdash; QPython 0.9 documentation</title>
-<link rel="stylesheet" href="../static/qpython_theme.css" type="text/css" />
-<link rel="stylesheet" href="../static/pygments.css" type="text/css" />
-<script type="text/javascript">
-var DOCUMENTATION_OPTIONS = {
-URL_ROOT:    '../',
-VERSION:     '0.9',
-COLLAPSE_INDEX: false,
-FILE_SUFFIX: '.html',
-HAS_SOURCE:  true
-};
-</script>
-<script type="text/javascript" src="../static/jquery.js"></script>
-<script type="text/javascript" src="../static/underscore.js"></script>
-<script type="text/javascript" src="../static/doctools.js"></script>
-<link rel="top" title="QPython 0.9 documentation" href="../document.html" />
-<link rel="up" title="QPython built-in Libraries" href="guide_libraries.html" />
-<link rel="next" title="QPython Open API" href="guide_extend.html" />
-<link rel="prev" title="QPython built-in Libraries" href="guide_libraries.html" />
-<meta charset="UTF-8">
-<link href="http://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet">
-<script src="http://cdn.bootcss.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
-<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
-</head>
-<body role="document">
-<div class="header doc-header">
-<div class="col-lg-offset-2 col-lg-8 col-md-offset-2 col-md-8 col-sm-offset-2 col-sm-8  index-header">
-<div class="navbar-header">
-<button type="button" class="navbar-toggle" data-toggle="collapse"
-data-target="#example-navbar-collapse">
-<span class="sr-only">切换导航</span>
-<span class="icon-bar"></span>
-<span class="icon-bar"></span>
-<span class="icon-bar"></span>
-</button>
-<a href="/index.html" class="logo"><img src="../static/img_logo.png"></a>
-</div>
-<ul class="header-title hidden-xs">
-<li class="header-phone-selected">
-<a href="/index.html">Home</a>
-</li>
-<li>
-<a href="/document.html" class="header-selected">Guide</a>
-<span class="header-title-selected"></span>
-</li>
-<li>
-<a target="_blank" href="https://github.com/qpython-android/qpython">Github</a>
-</li>
-</ul>
-<div class="search-box hidden-xs">
-<form action="../search.html">
-<input type="search" name="q" placeholder="keyword">
-<input type="hidden" name="check_keywords" value="yes" />
-<input type="hidden" name="area" value="default" />
-<button><img src="../static/ic_search.png"></button>
-</form>
-</div>
-</div>
-</div>
-<div class="row doc-content">
-<div class="content-main col-sm-offset-2 col-sm-8">
-<div class="content-wrapper col-sm-4">
-<div class="left-menu">
-<div class="doc-title hidden-xs">QPthon</div>
-<div class="sidebar  collapse navbar-collapse"  id="example-navbar-collapse">
-<ul class="current">
-<li class="toctree-l1"><a class="reference internal" href="guide.html">Getting started</a></li>
-<li class="toctree-l1 current"><a class="reference internal" href="guide.html#programming-guide">Programming Guide</a><ul class="current">
-<li class="toctree-l2"><a class="reference internal" href="guide_program.html">QPython&#8217;s main features</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_ide.html">Use the best way for developing</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_libraries.html">QPython built-in Libraries</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_libraries.html#python-3rd-libraries">Python 3rd Libraries</a></li>
-<li class="toctree-l2 current"><a class="reference internal" href="guide_libraries.html#androidhelper-apis">Androidhelper APIs</a><ul class="current">
-<li class="toctree-l3 current"><a class="current reference internal" href="#">AndroidFacade</a></li>
-<li class="toctree-l3"><a class="reference internal" href="#applicationmanagerfacade">ApplicationManagerFacade</a></li>
-<li class="toctree-l3"><a class="reference internal" href="#camerafacade">CameraFacade</a></li>
-<li class="toctree-l3"><a class="reference internal" href="#commonintentsfacade">CommonIntentsFacade</a></li>
-<li class="toctree-l3"><a class="reference internal" href="#contactsfacade">ContactsFacade</a></li>
-<li class="toctree-l3"><a class="reference internal" href="#eventfacade">EventFacade</a></li>
-<li class="toctree-l3"><a class="reference internal" href="#locationfacade">LocationFacade</a></li>
-<li class="toctree-l3"><a class="reference internal" href="#phonefacade">PhoneFacade</a></li>
-<li class="toctree-l3"><a class="reference internal" href="#mediarecorderfacade">MediaRecorderFacade</a></li>
-<li class="toctree-l3"><a class="reference internal" href="#sensormanagerfacade">SensorManagerFacade</a></li>
-<li class="toctree-l3"><a class="reference internal" href="#settingsfacade">SettingsFacade</a></li>
-<li class="toctree-l3"><a class="reference internal" href="#smsfacade">SmsFacade</a></li>
-<li class="toctree-l3"><a class="reference internal" href="#speechrecognitionfacade">SpeechRecognitionFacade</a></li>
-<li class="toctree-l3"><a class="reference internal" href="#tonegeneratorfacade">ToneGeneratorFacade</a></li>
-<li class="toctree-l3"><a class="reference internal" href="#wakelockfacade">WakeLockFacade</a></li>
-<li class="toctree-l3"><a class="reference internal" href="#wififacade">WifiFacade</a></li>
-<li class="toctree-l3"><a class="reference internal" href="#batterymanagerfacade">BatteryManagerFacade</a></li>
-<li class="toctree-l3"><a class="reference internal" href="#activityresultfacade">ActivityResultFacade</a></li>
-<li class="toctree-l3"><a class="reference internal" href="#mediaplayerfacade">MediaPlayerFacade</a></li>
-<li class="toctree-l3"><a class="reference internal" href="#preferencesfacade">PreferencesFacade</a></li>
-<li class="toctree-l3"><a class="reference internal" href="#qpyinterfacefacade">QPyInterfaceFacade</a></li>
-<li class="toctree-l3"><a class="reference internal" href="#texttospeechfacade">TextToSpeechFacade</a></li>
-<li class="toctree-l3"><a class="reference internal" href="#eyesfreefacade">EyesFreeFacade</a></li>
-<li class="toctree-l3"><a class="reference internal" href="#bluetoothfacade">BluetoothFacade</a></li>
-<li class="toctree-l3"><a class="reference internal" href="#signalstrengthfacade">SignalStrengthFacade</a></li>
-<li class="toctree-l3"><a class="reference internal" href="#webcamfacade">WebCamFacade</a></li>
-<li class="toctree-l3"><a class="reference internal" href="#uifacade">UiFacade</a></li>
-<li class="toctree-l3"><a class="reference internal" href="#usb-host-serial-facade">USB Host Serial Facade</a></li>
-</ul>
-</li>
-<li class="toctree-l2"><a class="reference internal" href="guide_extend.html">QPython Open API</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_extend.html#qpython-online-service">QPython Online Service</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="guide.html#developers-guide">Developers&#8217; Guide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="guide.html#contributors-guide">Contributors&#8217; Guide</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="faq.html">FAQ</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../zhindex.html">中文用户向导</a></li>
-</ul>
-<div class="search-phone visible-xs">
-<form action="../search.html">
-<input type="search" name="q" placeholder="keyword">
-<input type="hidden" name="check_keywords" value="yes" />
-<input type="hidden" name="area" value="default" />
-<button><img src="../static/ic_search.png"></button>
-</form>
-</div>
-</div>
-</div>
-</div>
-<div class="content col-sm-8">
-<div class="document">
-<ul class="crumbs">
-<li><a href="../document.html">Guide</a> &raquo;</li>
-<li><a href="guide.html">Getting started</a> &raquo;</li>
-<li><a href="guide_libraries.html">QPython built-in Libraries</a> &raquo;</li>
-<li>AndroidFacade</li>
-</ul>
-<div class="documentwrapper">
-<div class="bodywrapper">
-<div class="body" role="main">
-<p>The Scripting Layer for Android (abridged as SL4A, and previously named Android Scripting Environment or ASE) is a library that allows the creation and running of scripts written in various scripting languages directly on Android devices. QPython start to extend the SL4A project and integrate it.</p>
-<img alt="../images/sl4a.jpg" src="../images/sl4a.jpg" />
-<p>There are many SL4A APIs, if you found any issue, please <a class="reference external" href="https://github.com/qpython-android/qpython/issues">report an issue</a>.</p>
-<div class="section" id="androidfacade">
-<h1>AndroidFacade<a class="headerlink" href="#androidfacade" title="Permalink to this headline">¶</a></h1>
-<div class="section" id="clipboard-apis">
-<h2>Clipboard APIs<a class="headerlink" href="#clipboard-apis" title="Permalink to this headline">¶</a></h2>
-<dl class="function">
-<dt id="setClipboard">
-<code class="descname">setClipboard</code><span class="sig-paren">(</span><em>text</em><span class="sig-paren">)</span><a class="headerlink" href="#setClipboard" title="Permalink to this definition">¶</a></dt>
-<dd><p>Put text in the clipboard</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>text</strong> (<em>str</em>) &#8211; text</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="getClipboard">
-<code class="descname">getClipboard</code><span class="sig-paren">(</span><em>text</em><span class="sig-paren">)</span><a class="headerlink" href="#getClipboard" title="Permalink to this definition">¶</a></dt>
-<dd><p>Read text from the clipboard</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Returns:</th><td class="field-body">The text in the clipboard</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="n">sample</span> <span class="n">code</span> <span class="n">to</span> <span class="n">show</span> <span class="n">setClipboard</span><span class="o">/</span><span class="n">getClipboard</span>
-</pre></div>
-</div>
-</div>
-<div class="section" id="intent-startactivity-apis">
-<h2>Intent &amp; startActivity APIs<a class="headerlink" href="#intent-startactivity-apis" title="Permalink to this headline">¶</a></h2>
-<dl class="function">
-<dt id="makeIntent">
-<code class="descname">makeIntent</code><span class="sig-paren">(</span><em>action</em>, <em>uri</em>, <em>type</em>, <em>extras</em>, <em>categories</em>, <em>packagename</em>, <em>classname</em>, <em>flags</em><span class="sig-paren">)</span><a class="headerlink" href="#makeIntent" title="Permalink to this definition">¶</a></dt>
-<dd><p>Starts an activity and returns the result</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first simple">
-<li><strong>action</strong> (<em>str</em>) &#8211; action</li>
-<li><strong>uri(Optional)</strong> (<em>str</em>) &#8211; uri</li>
-<li><strong>type(Optional)</strong> (<em>str</em>) &#8211; MIME type/subtype of the URI</li>
-<li><strong>extras(Optional)</strong> (<em>object</em>) &#8211; a Map of extras to add to the Intent</li>
-<li><strong>categories(Optional)</strong> (<em>list</em>) &#8211; a List of categories to add to the Intent</li>
-<li><strong>packagename(Optional)</strong> (<em>str</em>) &#8211; name of package. If used, requires classname to be useful</li>
-<li><strong>classname(Optional)</strong> (<em>str</em>) &#8211; name of class. If used, requires packagename to be useful</li>
-<li><strong>flags(Optional)</strong> (<em>int</em>) &#8211; Intent flags</li>
-</ul>
-</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Returns:</th><td class="field-body"><p class="first last">An object representing an Intent</p>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="n">sample</span> <span class="n">code</span> <span class="n">to</span> <span class="n">show</span> <span class="n">makeIntent</span>
-</pre></div>
-</div>
-<dl class="function">
-<dt id="getIntent">
-<code class="descname">getIntent</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#getIntent" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns the intent that launched the script</p>
-</dd></dl>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="n">sample</span> <span class="n">code</span> <span class="n">to</span> <span class="n">show</span> <span class="n">getIntent</span>
-</pre></div>
-</div>
-<dl class="function">
-<dt id="startActivityForResult">
-<code class="descname">startActivityForResult</code><span class="sig-paren">(</span><em>action</em>, <em>uri</em>, <em>type</em>, <em>extras</em>, <em>packagename</em>, <em>classname</em><span class="sig-paren">)</span><a class="headerlink" href="#startActivityForResult" title="Permalink to this definition">¶</a></dt>
-<dd><p>Starts an activity and returns the result</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first simple">
-<li><strong>action</strong> (<em>str</em>) &#8211; action</li>
-<li><strong>uri(Optional)</strong> (<em>str</em>) &#8211; uri</li>
-<li><strong>type(Optional)</strong> (<em>str</em>) &#8211; MIME type/subtype of the URI</li>
-<li><strong>extras(Optional)</strong> (<em>object</em>) &#8211; a Map of extras to add to the Intent</li>
-<li><strong>packagename(Optional)</strong> (<em>str</em>) &#8211; name of package. If used, requires classname to be useful</li>
-<li><strong>classname(Optional)</strong> (<em>str</em>) &#8211; name of class. If used, requires packagename to be useful</li>
-</ul>
-</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Returns:</th><td class="field-body"><p class="first last">A Map representation of the result Intent</p>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="n">sample</span> <span class="n">code</span> <span class="n">to</span> <span class="n">show</span> <span class="n">startActivityForResult</span>
-</pre></div>
-</div>
-<dl class="function">
-<dt id="startActivityForResultIntent">
-<code class="descname">startActivityForResultIntent</code><span class="sig-paren">(</span><em>intent</em><span class="sig-paren">)</span><a class="headerlink" href="#startActivityForResultIntent" title="Permalink to this definition">¶</a></dt>
-<dd><p>Starts an activity and returns the result</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>intent</strong> (<em>Intent</em>) &#8211; Intent in the format as returned from makeIntent</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Returns:</th><td class="field-body">A Map representation of the result Intent</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="n">sample</span> <span class="n">code</span> <span class="n">to</span> <span class="n">show</span> <span class="n">startActivityForResultIntent</span>
-</pre></div>
-</div>
-<dl class="function">
-<dt id="startActivityIntent">
-<code class="descname">startActivityIntent</code><span class="sig-paren">(</span><em>intent</em>, <em>wait</em><span class="sig-paren">)</span><a class="headerlink" href="#startActivityIntent" title="Permalink to this definition">¶</a></dt>
-<dd><p>Starts an activity</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>intent</strong> (<em>Intent</em>) &#8211; Intent in the format as returned from makeIntent</li>
-<li><strong>wait(Optional)</strong> (<em>bool</em>) &#8211; block until the user exits the started activity</li>
-</ul>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="n">sample</span> <span class="n">code</span> <span class="n">to</span> <span class="n">show</span> <span class="n">startActivityIntent</span>
-</pre></div>
-</div>
-<dl class="function">
-<dt id="startActivity">
-<code class="descname">startActivity</code><span class="sig-paren">(</span><em>action</em>, <em>uri</em>, <em>type</em>, <em>extras</em>, <em>wait</em>, <em>packagename</em>, <em>classname</em><span class="sig-paren">)</span><a class="headerlink" href="#startActivity" title="Permalink to this definition">¶</a></dt>
-<dd><p>Starts an activity</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>action</strong> (<em>str</em>) &#8211; action</li>
-<li><strong>uri(Optional)</strong> (<em>str</em>) &#8211; uri</li>
-<li><strong>type(Optional)</strong> (<em>str</em>) &#8211; MIME type/subtype of the URI</li>
-<li><strong>extras(Optional)</strong> (<em>object</em>) &#8211; a Map of extras to add to the Intent</li>
-<li><strong>wait(Optional)</strong> (<em>bool</em>) &#8211; block until the user exits the started activity</li>
-<li><strong>packagename(Optional)</strong> (<em>str</em>) &#8211; name of package. If used, requires classname to be useful</li>
-<li><strong>classname(Optional)</strong> (<em>str</em>) &#8211; name of class. If used, requires packagename to be useful</li>
-</ul>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="n">sample</span> <span class="n">code</span> <span class="n">to</span> <span class="n">show</span> <span class="n">startActivityForResultIntent</span>
-</pre></div>
-</div>
-</div>
-<div class="section" id="sendbroadcast-apis">
-<h2>SendBroadcast APIs<a class="headerlink" href="#sendbroadcast-apis" title="Permalink to this headline">¶</a></h2>
-<dl class="function">
-<dt id="sendBroadcast">
-<code class="descname">sendBroadcast</code><span class="sig-paren">(</span><em>action</em>, <em>uri</em>, <em>type</em>, <em>extras</em>, <em>packagename</em>, <em>classname</em><span class="sig-paren">)</span><a class="headerlink" href="#sendBroadcast" title="Permalink to this definition">¶</a></dt>
-<dd><p>Send a broadcast</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>action</strong> (<em>str</em>) &#8211; action</li>
-<li><strong>uri(Optional)</strong> (<em>str</em>) &#8211; uri</li>
-<li><strong>type(Optional)</strong> (<em>str</em>) &#8211; MIME type/subtype of the URI</li>
-<li><strong>extras(Optional)</strong> (<em>object</em>) &#8211; a Map of extras to add to the Intent</li>
-<li><strong>packagename(Optional)</strong> (<em>str</em>) &#8211; name of package. If used, requires classname to be useful</li>
-<li><strong>classname(Optional)</strong> (<em>str</em>) &#8211; name of class. If used, requires packagename to be useful</li>
-</ul>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="n">sample</span> <span class="n">code</span> <span class="n">to</span> <span class="n">show</span> <span class="n">sendBroadcast</span>
-</pre></div>
-</div>
-<dl class="function">
-<dt id="sendBroadcastIntent">
-<code class="descname">sendBroadcastIntent</code><span class="sig-paren">(</span><em>intent</em><span class="sig-paren">)</span><a class="headerlink" href="#sendBroadcastIntent" title="Permalink to this definition">¶</a></dt>
-<dd><p>Send a broadcast</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>intent</strong> (<em>Intent</em>) &#8211; Intent in the format as returned from makeIntent</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="n">sample</span> <span class="n">code</span> <span class="n">to</span> <span class="n">show</span> <span class="n">sendBroadcastIntent</span>
-</pre></div>
-</div>
-</div>
-<div class="section" id="vibrate">
-<h2>Vibrate<a class="headerlink" href="#vibrate" title="Permalink to this headline">¶</a></h2>
-<dl class="function">
-<dt>
-<code class="descname">vibrate</code><span class="sig-paren">(</span><em>intent</em><span class="sig-paren">)</span></dt>
-<dd><p>Vibrates the phone or a specified duration in milliseconds</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>duration</strong> (<em>int</em>) &#8211; duration in milliseconds</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="n">sample</span> <span class="n">code</span> <span class="n">to</span> <span class="n">show</span> <span class="n">vibrate</span>
-</pre></div>
-</div>
-</div>
-<div class="section" id="networkstatus">
-<h2>NetworkStatus<a class="headerlink" href="#networkstatus" title="Permalink to this headline">¶</a></h2>
-<dl class="function">
-<dt id="getNetworkStatus">
-<code class="descname">getNetworkStatus</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#getNetworkStatus" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns the status of network connection</p>
-</dd></dl>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="n">sample</span> <span class="n">code</span> <span class="n">to</span> <span class="n">show</span> <span class="n">getNetworkStatus</span>
-</pre></div>
-</div>
-</div>
-<div class="section" id="packageversion-apis">
-<h2>PackageVersion APIs<a class="headerlink" href="#packageversion-apis" title="Permalink to this headline">¶</a></h2>
-<dl class="function">
-<dt id="requiredVersion">
-<code class="descname">requiredVersion</code><span class="sig-paren">(</span><em>requiredVersion</em><span class="sig-paren">)</span><a class="headerlink" href="#requiredVersion" title="Permalink to this definition">¶</a></dt>
-<dd><p>Checks if version of QPython SL4A is greater than or equal to the specified version</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>requiredVersion</strong> (<em>int</em>) &#8211; requiredVersion</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Returns:</th><td class="field-body">true or false</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="getPackageVersionCode">
-<code class="descname">getPackageVersionCode</code><span class="sig-paren">(</span><em>packageName</em><span class="sig-paren">)</span><a class="headerlink" href="#getPackageVersionCode" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns package version code</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>packageName</strong> (<em>str</em>) &#8211; packageName</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Returns:</th><td class="field-body">Package version code</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="getPackageVersion">
-<code class="descname">getPackageVersion</code><span class="sig-paren">(</span><em>packageName</em><span class="sig-paren">)</span><a class="headerlink" href="#getPackageVersion" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns package version name</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>packageName</strong> (<em>str</em>) &#8211; packageName</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Returns:</th><td class="field-body">Package version name</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="n">sample</span> <span class="n">code</span> <span class="n">to</span> <span class="n">show</span> <span class="n">getPackageVersionCode</span> <span class="o">&amp;</span> <span class="n">getPackageVersion</span>
-</pre></div>
-</div>
-</div>
-<div class="section" id="system-apis">
-<h2>System APIs<a class="headerlink" href="#system-apis" title="Permalink to this headline">¶</a></h2>
-<dl class="function">
-<dt id="getConstants">
-<code class="descname">getConstants</code><span class="sig-paren">(</span><em>classname</em><span class="sig-paren">)</span><a class="headerlink" href="#getConstants" title="Permalink to this definition">¶</a></dt>
-<dd><p>Get list of constants (static final fields) for a class</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>classname</strong> (<em>str</em>) &#8211; classname</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Returns:</th><td class="field-body">list</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="n">sample</span> <span class="n">code</span> <span class="n">to</span> <span class="n">show</span> <span class="n">getConstants</span>
-</pre></div>
-</div>
-<dl class="function">
-<dt id="environment">
-<code class="descname">environment</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#environment" title="Permalink to this definition">¶</a></dt>
-<dd><p>A map of various useful environment details</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Returns:</th><td class="field-body">environment map object includes id, display, offset, TZ, SDK, download, appcache, availblocks, blocksize, blockcount, sdcard</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="n">sample</span> <span class="n">code</span> <span class="n">to</span> <span class="n">show</span> <span class="n">environment</span>
-</pre></div>
-</div>
-<dl class="function">
-<dt id="log">
-<code class="descname">log</code><span class="sig-paren">(</span><em>message</em><span class="sig-paren">)</span><a class="headerlink" href="#log" title="Permalink to this definition">¶</a></dt>
-<dd><p>Writes message to logcat</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>message</strong> (<em>str</em>) &#8211; message</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="n">sample</span> <span class="n">code</span> <span class="n">to</span> <span class="n">show</span> <span class="n">log</span>
-</pre></div>
-</div>
-</div>
-<div class="section" id="sendemail">
-<h2>SendEmail<a class="headerlink" href="#sendemail" title="Permalink to this headline">¶</a></h2>
-<dl class="function">
-<dt id="sendEmail">
-<code class="descname">sendEmail</code><span class="sig-paren">(</span><em>to</em>, <em>subject</em>, <em>body</em>, <em>attachmentUri</em><span class="sig-paren">)</span><a class="headerlink" href="#sendEmail" title="Permalink to this definition">¶</a></dt>
-<dd><p>Launches an activity that sends an e-mail message to a given recipient</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>to</strong> (<em>str</em>) &#8211; A comma separated list of recipients</li>
-<li><strong>subject</strong> (<em>str</em>) &#8211; subject</li>
-<li><strong>body</strong> (<em>str</em>) &#8211; mail body</li>
-<li><strong>attachmentUri(Optional)</strong> (<em>str</em>) &#8211; message</li>
-</ul>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="n">sample</span> <span class="n">code</span> <span class="n">to</span> <span class="n">show</span> <span class="n">sendEmail</span>
-</pre></div>
-</div>
-</div>
-<div class="section" id="toast-getinput-getpassword-notify-apis">
-<h2>Toast, getInput, getPassword, notify APIs<a class="headerlink" href="#toast-getinput-getpassword-notify-apis" title="Permalink to this headline">¶</a></h2>
-<dl class="function">
-<dt id="makeToast">
-<code class="descname">makeToast</code><span class="sig-paren">(</span><em>message</em><span class="sig-paren">)</span><a class="headerlink" href="#makeToast" title="Permalink to this definition">¶</a></dt>
-<dd><p>Displays a short-duration Toast notification</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>message</strong> (<em>str</em>) &#8211; message</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="n">sample</span> <span class="n">code</span> <span class="n">to</span> <span class="n">show</span> <span class="n">makeToast</span>
-</pre></div>
-</div>
-<dl class="function">
-<dt id="getInput">
-<code class="descname">getInput</code><span class="sig-paren">(</span><em>title</em>, <em>message</em><span class="sig-paren">)</span><a class="headerlink" href="#getInput" title="Permalink to this definition">¶</a></dt>
-<dd><p>Queries the user for a text input</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>title</strong> (<em>str</em>) &#8211; title of the input box</li>
-<li><strong>message</strong> (<em>str</em>) &#8211; message to display above the input box</li>
-</ul>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="n">sample</span> <span class="n">code</span> <span class="n">to</span> <span class="n">show</span> <span class="n">getInput</span>
-</pre></div>
-</div>
-<dl class="function">
-<dt id="getPassword">
-<code class="descname">getPassword</code><span class="sig-paren">(</span><em>title</em>, <em>message</em><span class="sig-paren">)</span><a class="headerlink" href="#getPassword" title="Permalink to this definition">¶</a></dt>
-<dd><p>Queries the user for a password</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>title</strong> (<em>str</em>) &#8211; title of the input box</li>
-<li><strong>message</strong> (<em>str</em>) &#8211; message to display above the input box</li>
-</ul>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="n">sample</span> <span class="n">code</span> <span class="n">to</span> <span class="n">show</span> <span class="n">getPassword</span>
-</pre></div>
-</div>
-<dl class="function">
-<dt id="notify">
-<code class="descname">notify</code><span class="sig-paren">(</span><em>title</em>, <em>message</em>, <em>url</em><span class="sig-paren">)</span><a class="headerlink" href="#notify" title="Permalink to this definition">¶</a></dt>
-<dd><p>Displays a notification that will be canceled when the user clicks on it</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>title</strong> (<em>str</em>) &#8211; title</li>
-<li><strong>message</strong> (<em>str</em>) &#8211; message</li>
-<li><strong>url(optional)</strong> (<em>str</em>) &#8211; url</li>
-</ul>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="docutils">
-<dt>::</dt>
-<dd>import androidhelper
-droid = androidhelper.Android()
-droid.notify(&#8216;Hello&#8217;,&#8217;QPython&#8217;,&#8217;<a class="reference external" href="http://qpython.org">http://qpython.org</a>&#8216;) # you could set the 3rd parameter None also</dd>
-</dl>
-</div>
-</div>
-<div class="section" id="applicationmanagerfacade">
-<h1>ApplicationManagerFacade<a class="headerlink" href="#applicationmanagerfacade" title="Permalink to this headline">¶</a></h1>
-<div class="section" id="manager-apis">
-<h2>Manager APIs<a class="headerlink" href="#manager-apis" title="Permalink to this headline">¶</a></h2>
-<dl class="function">
-<dt id="getLaunchableApplications">
-<code class="descname">getLaunchableApplications</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#getLaunchableApplications" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns a list of all launchable application class names</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Returns:</th><td class="field-body">map object</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="n">sample</span> <span class="n">code</span> <span class="n">to</span> <span class="n">show</span> <span class="n">getLaunchableApplications</span>
-</pre></div>
-</div>
-<dl class="function">
-<dt id="launch">
-<code class="descname">launch</code><span class="sig-paren">(</span><em>classname</em><span class="sig-paren">)</span><a class="headerlink" href="#launch" title="Permalink to this definition">¶</a></dt>
-<dd><p>Start activity with the given class name</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>classname</strong> (<em>str</em>) &#8211; classname</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="n">sample</span> <span class="n">code</span> <span class="n">to</span> <span class="n">show</span> <span class="n">launch</span>
-</pre></div>
-</div>
-<dl class="function">
-<dt id="getRunningPackages">
-<code class="descname">getRunningPackages</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#getRunningPackages" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns a list of packages running activities or services</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Returns:</th><td class="field-body">List of packages running activities</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="n">sample</span> <span class="n">code</span> <span class="n">to</span> <span class="n">show</span> <span class="n">getRunningPackages</span>
-</pre></div>
-</div>
-<dl class="function">
-<dt id="forceStopPackage">
-<code class="descname">forceStopPackage</code><span class="sig-paren">(</span><em>packageName</em><span class="sig-paren">)</span><a class="headerlink" href="#forceStopPackage" title="Permalink to this definition">¶</a></dt>
-<dd><p>Force stops a package</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>packageName</strong> (<em>str</em>) &#8211; packageName</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="n">sample</span> <span class="n">code</span> <span class="n">to</span> <span class="n">show</span> <span class="n">forceStopPackage</span>
-</pre></div>
-</div>
-</div>
-</div>
-<div class="section" id="camerafacade">
-<h1>CameraFacade<a class="headerlink" href="#camerafacade" title="Permalink to this headline">¶</a></h1>
-<dl class="function">
-<dt id="cameraCapturePicture">
-<code class="descname">cameraCapturePicture</code><span class="sig-paren">(</span><em>targetPath</em><span class="sig-paren">)</span><a class="headerlink" href="#cameraCapturePicture" title="Permalink to this definition">¶</a></dt>
-<dd><p>Take a picture and save it to the specified path</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Returns:</th><td class="field-body">A map of Booleans autoFocus and takePicture where True indicates success</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="cameraInteractiveCapturePicture">
-<code class="descname">cameraInteractiveCapturePicture</code><span class="sig-paren">(</span><em>targetPath</em><span class="sig-paren">)</span><a class="headerlink" href="#cameraInteractiveCapturePicture" title="Permalink to this definition">¶</a></dt>
-<dd><p>Starts the image capture application to take a picture and saves it to the specified path</p>
-</dd></dl>
-</div>
-<div class="section" id="commonintentsfacade">
-<h1>CommonIntentsFacade<a class="headerlink" href="#commonintentsfacade" title="Permalink to this headline">¶</a></h1>
-<div class="section" id="barcode">
-<h2>Barcode<a class="headerlink" href="#barcode" title="Permalink to this headline">¶</a></h2>
-<dl class="function">
-<dt id="scanBarcode">
-<code class="descname">scanBarcode</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#scanBarcode" title="Permalink to this definition">¶</a></dt>
-<dd><p>Starts the barcode scanner</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Returns:</th><td class="field-body">A Map representation of the result Intent</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-</div>
-<div class="section" id="view-apis">
-<h2>View APIs<a class="headerlink" href="#view-apis" title="Permalink to this headline">¶</a></h2>
-<dl class="function">
-<dt id="pick">
-<code class="descname">pick</code><span class="sig-paren">(</span><em>uri</em><span class="sig-paren">)</span><a class="headerlink" href="#pick" title="Permalink to this definition">¶</a></dt>
-<dd><p>Display content to be picked by URI (e.g. contacts)</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Returns:</th><td class="field-body">A map of result values</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="view">
-<code class="descname">view</code><span class="sig-paren">(</span><em>uri</em>, <em>type</em>, <em>extras</em><span class="sig-paren">)</span><a class="headerlink" href="#view" title="Permalink to this definition">¶</a></dt>
-<dd><p>Start activity with view action by URI (i.e. browser, contacts, etc.)</p>
-</dd></dl>
-<dl class="function">
-<dt id="viewMap">
-<code class="descname">viewMap</code><span class="sig-paren">(</span><em>query</em><span class="sig-paren">)</span><a class="headerlink" href="#viewMap" title="Permalink to this definition">¶</a></dt>
-<dd><p>Opens a map search for query (e.g. pizza, 123 My Street)</p>
-</dd></dl>
-<dl class="function">
-<dt id="viewContacts">
-<code class="descname">viewContacts</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#viewContacts" title="Permalink to this definition">¶</a></dt>
-<dd><p>Opens the list of contacts</p>
-</dd></dl>
-<dl class="function">
-<dt id="viewHtml">
-<code class="descname">viewHtml</code><span class="sig-paren">(</span><em>path</em><span class="sig-paren">)</span><a class="headerlink" href="#viewHtml" title="Permalink to this definition">¶</a></dt>
-<dd><p>Opens the browser to display a local HTML file</p>
-</dd></dl>
-<dl class="function">
-<dt id="search">
-<code class="descname">search</code><span class="sig-paren">(</span><em>query</em><span class="sig-paren">)</span><a class="headerlink" href="#search" title="Permalink to this definition">¶</a></dt>
-<dd><p>Starts a search for the given query</p>
-</dd></dl>
-</div>
-</div>
-<div class="section" id="contactsfacade">
-<h1>ContactsFacade<a class="headerlink" href="#contactsfacade" title="Permalink to this headline">¶</a></h1>
-<dl class="function">
-<dt id="pickContact">
-<code class="descname">pickContact</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#pickContact" title="Permalink to this definition">¶</a></dt>
-<dd><p>Displays a list of contacts to pick from</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Returns:</th><td class="field-body">A map of result values</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="pickPhone">
-<code class="descname">pickPhone</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#pickPhone" title="Permalink to this definition">¶</a></dt>
-<dd><p>Displays a list of phone numbers to pick from</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Returns:</th><td class="field-body">The selected phone number</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="contactsGetAttributes">
-<code class="descname">contactsGetAttributes</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#contactsGetAttributes" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns a List of all possible attributes for contacts</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Returns:</th><td class="field-body">a List of contacts as Maps</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="contactsGetIds">
-<code class="descname">contactsGetIds</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#contactsGetIds" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns a List of all contact IDs</p>
-</dd></dl>
-<dl class="function">
-<dt id="contactsGet">
-<code class="descname">contactsGet</code><span class="sig-paren">(</span><em>attributes</em><span class="sig-paren">)</span><a class="headerlink" href="#contactsGet" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns a List of all contacts</p>
-</dd></dl>
-<dl class="function">
-<dt id="contactsGetById">
-<code class="descname">contactsGetById</code><span class="sig-paren">(</span><em>id</em><span class="sig-paren">)</span><a class="headerlink" href="#contactsGetById" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns contacts by ID</p>
-</dd></dl>
-<dl class="function">
-<dt id="contactsGetCount">
-<code class="descname">contactsGetCount</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#contactsGetCount" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns the number of contacts</p>
-</dd></dl>
-<dl class="function">
-<dt id="queryContent">
-<code class="descname">queryContent</code><span class="sig-paren">(</span><em>uri</em>, <em>attributes</em>, <em>selection</em>, <em>selectionArgs</em>, <em>order</em><span class="sig-paren">)</span><a class="headerlink" href="#queryContent" title="Permalink to this definition">¶</a></dt>
-<dd><p>Content Resolver Query</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Returns:</th><td class="field-body">result of query as Maps</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="queryAttributes">
-<code class="descname">queryAttributes</code><span class="sig-paren">(</span><em>uri</em><span class="sig-paren">)</span><a class="headerlink" href="#queryAttributes" title="Permalink to this definition">¶</a></dt>
-<dd><p>Content Resolver Query Attributes</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Returns:</th><td class="field-body">a list of available columns for a given content uri</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-</div>
-<div class="section" id="eventfacade">
-<h1>EventFacade<a class="headerlink" href="#eventfacade" title="Permalink to this headline">¶</a></h1>
-<dl class="function">
-<dt id="eventClearBuffer">
-<code class="descname">eventClearBuffer</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#eventClearBuffer" title="Permalink to this definition">¶</a></dt>
-<dd><p>Clears all events from the event buffer</p>
-</dd></dl>
-<dl class="function">
-<dt id="eventRegisterForBroadcast">
-<code class="descname">eventRegisterForBroadcast</code><span class="sig-paren">(</span><em>category</em>, <em>enqueue</em><span class="sig-paren">)</span><a class="headerlink" href="#eventRegisterForBroadcast" title="Permalink to this definition">¶</a></dt>
-<dd><p>Registers a listener for a new broadcast signal</p>
-</dd></dl>
-<dl class="function">
-<dt id="eventUnregisterForBroadcast">
-<code class="descname">eventUnregisterForBroadcast</code><span class="sig-paren">(</span><em>category</em><span class="sig-paren">)</span><a class="headerlink" href="#eventUnregisterForBroadcast" title="Permalink to this definition">¶</a></dt>
-<dd><p>Stop listening for a broadcast signal</p>
-</dd></dl>
-<dl class="function">
-<dt id="eventGetBrodcastCategories">
-<code class="descname">eventGetBrodcastCategories</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#eventGetBrodcastCategories" title="Permalink to this definition">¶</a></dt>
-<dd><p>Lists all the broadcast signals we are listening for</p>
-</dd></dl>
-<dl class="function">
-<dt id="eventPoll">
-<code class="descname">eventPoll</code><span class="sig-paren">(</span><em>number_of_events</em><span class="sig-paren">)</span><a class="headerlink" href="#eventPoll" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns and removes the oldest n events (i.e. location or sensor update, etc.) from the event buffer</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Returns:</th><td class="field-body">A List of Maps of event properties</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="eventWaitFor">
-<code class="descname">eventWaitFor</code><span class="sig-paren">(</span><em>eventName</em>, <em>timeout</em><span class="sig-paren">)</span><a class="headerlink" href="#eventWaitFor" title="Permalink to this definition">¶</a></dt>
-<dd><p>Blocks until an event with the supplied name occurs. The returned event is not removed from the buffer</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Returns:</th><td class="field-body">Map of event properties</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="eventWait">
-<code class="descname">eventWait</code><span class="sig-paren">(</span><em>timeout</em><span class="sig-paren">)</span><a class="headerlink" href="#eventWait" title="Permalink to this definition">¶</a></dt>
-<dd><p>Blocks until an event occurs. The returned event is removed from the buffer</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Returns:</th><td class="field-body">Map of event properties</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="eventPost">
-<code class="descname">eventPost</code><span class="sig-paren">(</span><em>name</em>, <em>data</em>, <em>enqueue</em><span class="sig-paren">)</span><a class="headerlink" href="#eventPost" title="Permalink to this definition">¶</a></dt>
-<dd><p>Post an event to the event queue</p>
-</dd></dl>
-<dl class="function">
-<dt id="rpcPostEvent">
-<code class="descname">rpcPostEvent</code><span class="sig-paren">(</span><em>name</em>, <em>data</em><span class="sig-paren">)</span><a class="headerlink" href="#rpcPostEvent" title="Permalink to this definition">¶</a></dt>
-<dd><p>Post an event to the event queue</p>
-</dd></dl>
-<dl class="function">
-<dt id="receiveEvent">
-<code class="descname">receiveEvent</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#receiveEvent" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns and removes the oldest event (i.e. location or sensor update, etc.) from the event buffer</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Returns:</th><td class="field-body">Map of event properties</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="waitForEvent">
-<code class="descname">waitForEvent</code><span class="sig-paren">(</span><em>eventName</em>, <em>timeout</em><span class="sig-paren">)</span><a class="headerlink" href="#waitForEvent" title="Permalink to this definition">¶</a></dt>
-<dd><p>Blocks until an event with the supplied name occurs. The returned event is not removed from the buffer</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Returns:</th><td class="field-body">Map of event properties</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="startEventDispatcher">
-<code class="descname">startEventDispatcher</code><span class="sig-paren">(</span><em>port</em><span class="sig-paren">)</span><a class="headerlink" href="#startEventDispatcher" title="Permalink to this definition">¶</a></dt>
-<dd><p>Opens up a socket where you can read for events posted</p>
-</dd></dl>
-<dl class="function">
-<dt id="stopEventDispatcher">
-<code class="descname">stopEventDispatcher</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#stopEventDispatcher" title="Permalink to this definition">¶</a></dt>
-<dd><p>Stops the event server, you can&#8217;t read in the port anymore</p>
-</dd></dl>
-</div>
-<div class="section" id="locationfacade">
-<h1>LocationFacade<a class="headerlink" href="#locationfacade" title="Permalink to this headline">¶</a></h1>
-<div class="section" id="providers-apis">
-<h2>Providers APIs<a class="headerlink" href="#providers-apis" title="Permalink to this headline">¶</a></h2>
-<dl class="function">
-<dt id="locationProviders">
-<code class="descname">locationProviders</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#locationProviders" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns availables providers on the phone</p>
-</dd></dl>
-<dl class="function">
-<dt id="locationProviderEnabled">
-<code class="descname">locationProviderEnabled</code><span class="sig-paren">(</span><em>provider</em><span class="sig-paren">)</span><a class="headerlink" href="#locationProviderEnabled" title="Permalink to this definition">¶</a></dt>
-<dd><p>Ask if provider is enabled</p>
-</dd></dl>
-</div>
-<div class="section" id="location-apis">
-<h2>Location APIs<a class="headerlink" href="#location-apis" title="Permalink to this headline">¶</a></h2>
-<dl class="function">
-<dt id="startLocating">
-<code class="descname">startLocating</code><span class="sig-paren">(</span><em>minDistance</em>, <em>minUpdateDistance</em><span class="sig-paren">)</span><a class="headerlink" href="#startLocating" title="Permalink to this definition">¶</a></dt>
-<dd><p>Starts collecting location data</p>
-</dd></dl>
-<dl class="function">
-<dt id="readLocation">
-<code class="descname">readLocation</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#readLocation" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns the current location as indicated by all available providers</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Returns:</th><td class="field-body">A map of location information by provider</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="stopLocating">
-<code class="descname">stopLocating</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#stopLocating" title="Permalink to this definition">¶</a></dt>
-<dd><p>Stops collecting location data</p>
-</dd></dl>
-<dl class="function">
-<dt id="getLastKnownLocation">
-<code class="descname">getLastKnownLocation</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#getLastKnownLocation" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns the last known location of the device</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Returns:</th><td class="field-body">A map of location information by provider</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<p><em>sample code</em></p>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="n">Droid</span> <span class="o">=</span> <span class="n">androidhelper</span><span class="o">.</span><span class="n">Android</span><span class="p">()</span>
-<span class="n">location</span> <span class="o">=</span> <span class="n">Droid</span><span class="o">.</span><span class="n">getLastKnownLocation</span><span class="p">()</span><span class="o">.</span><span class="n">result</span>
-<span class="n">location</span> <span class="o">=</span> <span class="n">location</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;network&#39;</span><span class="p">,</span> <span class="n">location</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;gps&#39;</span><span class="p">))</span>
-</pre></div>
-</div>
-</div>
-<div class="section" id="geo">
-<h2>GEO<a class="headerlink" href="#geo" title="Permalink to this headline">¶</a></h2>
-<dl class="function">
-<dt id="geocode">
-<code class="descname">geocode</code><span class="sig-paren">(</span><em>latitude</em>, <em>longitude</em>, <em>maxResults</em><span class="sig-paren">)</span><a class="headerlink" href="#geocode" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns a list of addresses for the given latitude and longitude</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Returns:</th><td class="field-body">A list of addresses</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-</div>
-</div>
-<div class="section" id="phonefacade">
-<h1>PhoneFacade<a class="headerlink" href="#phonefacade" title="Permalink to this headline">¶</a></h1>
-<div class="section" id="phonestat-apis">
-<h2>PhoneStat APIs<a class="headerlink" href="#phonestat-apis" title="Permalink to this headline">¶</a></h2>
-<dl class="function">
-<dt id="startTrackingPhoneState">
-<code class="descname">startTrackingPhoneState</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#startTrackingPhoneState" title="Permalink to this definition">¶</a></dt>
-<dd><p>Starts tracking phone state</p>
-</dd></dl>
-<dl class="function">
-<dt id="readPhoneState">
-<code class="descname">readPhoneState</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#readPhoneState" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns the current phone state and incoming number</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Returns:</th><td class="field-body">A Map of &#8220;state&#8221; and &#8220;incomingNumber&#8221;</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="stopTrackingPhoneState">
-<code class="descname">stopTrackingPhoneState</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#stopTrackingPhoneState" title="Permalink to this definition">¶</a></dt>
-<dd><p>Stops tracking phone state</p>
-</dd></dl>
-</div>
-<div class="section" id="call-dia-apis">
-<h2>Call &amp; Dia APIs<a class="headerlink" href="#call-dia-apis" title="Permalink to this headline">¶</a></h2>
-<dl class="function">
-<dt id="phoneCall">
-<code class="descname">phoneCall</code><span class="sig-paren">(</span><em>uri</em><span class="sig-paren">)</span><a class="headerlink" href="#phoneCall" title="Permalink to this definition">¶</a></dt>
-<dd><p>Calls a contact/phone number by URI</p>
-</dd></dl>
-<dl class="function">
-<dt id="phoneCallNumber">
-<code class="descname">phoneCallNumber</code><span class="sig-paren">(</span><em>number</em><span class="sig-paren">)</span><a class="headerlink" href="#phoneCallNumber" title="Permalink to this definition">¶</a></dt>
-<dd><p>Calls a phone number</p>
-</dd></dl>
-<dl class="function">
-<dt id="phoneDial">
-<code class="descname">phoneDial</code><span class="sig-paren">(</span><em>uri</em><span class="sig-paren">)</span><a class="headerlink" href="#phoneDial" title="Permalink to this definition">¶</a></dt>
-<dd><p>Dials a contact/phone number by URI</p>
-</dd></dl>
-<dl class="function">
-<dt id="phoneDialNumber">
-<code class="descname">phoneDialNumber</code><span class="sig-paren">(</span><em>number</em><span class="sig-paren">)</span><a class="headerlink" href="#phoneDialNumber" title="Permalink to this definition">¶</a></dt>
-<dd><p>Dials a phone number</p>
-</dd></dl>
-</div>
-<div class="section" id="get-information-apis">
-<h2>Get information APIs<a class="headerlink" href="#get-information-apis" title="Permalink to this headline">¶</a></h2>
-<dl class="function">
-<dt id="getCellLocation">
-<code class="descname">getCellLocation</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#getCellLocation" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns the current cell location</p>
-</dd></dl>
-<dl class="function">
-<dt id="getNetworkOperator">
-<code class="descname">getNetworkOperator</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#getNetworkOperator" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns the numeric name (MCC+MNC) of current registered operator</p>
-</dd></dl>
-<dl class="function">
-<dt id="getNetworkOperatorName">
-<code class="descname">getNetworkOperatorName</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#getNetworkOperatorName" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns the alphabetic name of current registered operator</p>
-</dd></dl>
-<dl class="function">
-<dt id="getNetworkType">
-<code class="descname">getNetworkType</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#getNetworkType" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns a the radio technology (network type) currently in use on the device</p>
-</dd></dl>
-<dl class="function">
-<dt id="getPhoneType">
-<code class="descname">getPhoneType</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#getPhoneType" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns the device phone type</p>
-</dd></dl>
-<dl class="function">
-<dt id="getSimCountryIso">
-<code class="descname">getSimCountryIso</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#getSimCountryIso" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns the ISO country code equivalent for the SIM provider&#8217;s country code</p>
-</dd></dl>
-<dl class="function">
-<dt id="getSimOperator">
-<code class="descname">getSimOperator</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#getSimOperator" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns the MCC+MNC (mobile country code + mobile network code) of the provider of the SIM. 5 or 6 decimal digits</p>
-</dd></dl>
-<dl class="function">
-<dt id="getSimOperatorName">
-<code class="descname">getSimOperatorName</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#getSimOperatorName" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns the Service Provider Name (SPN)</p>
-</dd></dl>
-<dl class="function">
-<dt id="getSimSerialNumber">
-<code class="descname">getSimSerialNumber</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#getSimSerialNumber" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns the serial number of the SIM, if applicable. Return null if it is unavailable</p>
-</dd></dl>
-<dl class="function">
-<dt id="getSimState">
-<code class="descname">getSimState</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#getSimState" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns the state of the device SIM card</p>
-</dd></dl>
-<dl class="function">
-<dt id="getSubscriberId">
-<code class="descname">getSubscriberId</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#getSubscriberId" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns the unique subscriber ID, for example, the IMSI for a GSM phone. Return null if it is unavailable</p>
-</dd></dl>
-<dl class="function">
-<dt id="getVoiceMailAlphaTag">
-<code class="descname">getVoiceMailAlphaTag</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#getVoiceMailAlphaTag" title="Permalink to this definition">¶</a></dt>
-<dd><p>Retrieves the alphabetic identifier associated with the voice mail number</p>
-</dd></dl>
-<dl class="function">
-<dt id="getVoiceMailNumber">
-<code class="descname">getVoiceMailNumber</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#getVoiceMailNumber" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns the voice mail number. Return null if it is unavailable</p>
-</dd></dl>
-<dl class="function">
-<dt id="checkNetworkRoaming">
-<code class="descname">checkNetworkRoaming</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#checkNetworkRoaming" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns true if the device is considered roaming on the current network, for GSM purposes</p>
-</dd></dl>
-<dl class="function">
-<dt id="getDeviceId">
-<code class="descname">getDeviceId</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#getDeviceId" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns the unique device ID, for example, the IMEI for GSM and the MEID for CDMA phones. Return null if device ID is not available</p>
-</dd></dl>
-<dl class="function">
-<dt id="getDeviceSoftwareVersion">
-<code class="descname">getDeviceSoftwareVersion</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#getDeviceSoftwareVersion" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns the software version number for the device, for example, the IMEI/SV for GSM phones. Return null if the software version is not available</p>
-</dd></dl>
-<dl class="function">
-<dt id="getLine1Number">
-<code class="descname">getLine1Number</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#getLine1Number" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns the phone number string for line 1, for example, the MSISDN for a GSM phone. Return null if it is unavailable</p>
-</dd></dl>
-<dl class="function">
-<dt id="getNeighboringCellInfo">
-<code class="descname">getNeighboringCellInfo</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#getNeighboringCellInfo" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns the neighboring cell information of the device</p>
-</dd></dl>
-</div>
-</div>
-<div class="section" id="mediarecorderfacade">
-<h1>MediaRecorderFacade<a class="headerlink" href="#mediarecorderfacade" title="Permalink to this headline">¶</a></h1>
-<div class="section" id="audio">
-<h2>Audio<a class="headerlink" href="#audio" title="Permalink to this headline">¶</a></h2>
-<dl class="function">
-<dt id="recorderStartMicrophone">
-<code class="descname">recorderStartMicrophone</code><span class="sig-paren">(</span><em>targetPath</em><span class="sig-paren">)</span><a class="headerlink" href="#recorderStartMicrophone" title="Permalink to this definition">¶</a></dt>
-<dd><p>Records audio from the microphone and saves it to the given location</p>
-</dd></dl>
-</div>
-<div class="section" id="video-apis">
-<h2>Video APIs<a class="headerlink" href="#video-apis" title="Permalink to this headline">¶</a></h2>
-<dl class="function">
-<dt id="recorderStartVideo">
-<code class="descname">recorderStartVideo</code><span class="sig-paren">(</span><em>targetPath</em>, <em>duration</em>, <em>videoSize</em><span class="sig-paren">)</span><a class="headerlink" href="#recorderStartVideo" title="Permalink to this definition">¶</a></dt>
-<dd><p>Records video from the camera and saves it to the given location.
-Duration specifies the maximum duration of the recording session.
-If duration is 0 this method will return and the recording will only be stopped
-when recorderStop is called or when a scripts exits.
-Otherwise it will block for the time period equal to the duration argument.
-videoSize: 0=160x120, 1=320x240, 2=352x288, 3=640x480, 4=800x480.</p>
-</dd></dl>
-<dl class="function">
-<dt id="recorderCaptureVideo">
-<code class="descname">recorderCaptureVideo</code><span class="sig-paren">(</span><em>targetPath</em>, <em>duration</em>, <em>recordAudio</em><span class="sig-paren">)</span><a class="headerlink" href="#recorderCaptureVideo" title="Permalink to this definition">¶</a></dt>
-<dd><p>Records video (and optionally audio) from the camera and saves it to the given location.
-Duration specifies the maximum duration of the recording session.
-If duration is not provided this method will return immediately and the recording will only be stopped
-when recorderStop is called or when a scripts exits.
-Otherwise it will block for the time period equal to the duration argument.</p>
-</dd></dl>
-<dl class="function">
-<dt id="startInteractiveVideoRecording">
-<code class="descname">startInteractiveVideoRecording</code><span class="sig-paren">(</span><em>path</em><span class="sig-paren">)</span><a class="headerlink" href="#startInteractiveVideoRecording" title="Permalink to this definition">¶</a></dt>
-<dd><p>Starts the video capture application to record a video and saves it to the specified path</p>
-</dd></dl>
-</div>
-<div class="section" id="stop">
-<h2>Stop<a class="headerlink" href="#stop" title="Permalink to this headline">¶</a></h2>
-<dl class="function">
-<dt id="recorderStop">
-<code class="descname">recorderStop</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#recorderStop" title="Permalink to this definition">¶</a></dt>
-<dd><p>Stops a previously started recording</p>
-</dd></dl>
-</div>
-</div>
-<div class="section" id="sensormanagerfacade">
-<h1>SensorManagerFacade<a class="headerlink" href="#sensormanagerfacade" title="Permalink to this headline">¶</a></h1>
-<div class="section" id="start-stop">
-<h2>Start &amp; Stop<a class="headerlink" href="#start-stop" title="Permalink to this headline">¶</a></h2>
-<dl class="function">
-<dt id="startSensingTimed">
-<code class="descname">startSensingTimed</code><span class="sig-paren">(</span><em>sensorNumber</em>, <em>delayTime</em><span class="sig-paren">)</span><a class="headerlink" href="#startSensingTimed" title="Permalink to this definition">¶</a></dt>
-<dd><p>Starts recording sensor data to be available for polling</p>
-</dd></dl>
-<dl class="function">
-<dt id="startSensingThreshold">
-<code class="descname">startSensingThreshold</code><span class="sig-paren">(</span><em>ensorNumber</em>, <em>threshold</em>, <em>axis</em><span class="sig-paren">)</span><a class="headerlink" href="#startSensingThreshold" title="Permalink to this definition">¶</a></dt>
-<dd><p>Records to the Event Queue sensor data exceeding a chosen threshold</p>
-</dd></dl>
-<dl class="function">
-<dt id="startSensing">
-<code class="descname">startSensing</code><span class="sig-paren">(</span><em>sampleSize</em><span class="sig-paren">)</span><a class="headerlink" href="#startSensing" title="Permalink to this definition">¶</a></dt>
-<dd><p>Starts recording sensor data to be available for polling</p>
-</dd></dl>
-<dl class="function">
-<dt id="stopSensing">
-<code class="descname">stopSensing</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#stopSensing" title="Permalink to this definition">¶</a></dt>
-<dd><p>Stops collecting sensor data</p>
-</dd></dl>
-</div>
-<div class="section" id="read-data-apis">
-<h2>Read data APIs<a class="headerlink" href="#read-data-apis" title="Permalink to this headline">¶</a></h2>
-<dl class="function">
-<dt id="readSensors">
-<code class="descname">readSensors</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#readSensors" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns the most recently recorded sensor data</p>
-</dd></dl>
-<dl class="function">
-<dt id="sensorsGetAccuracy">
-<code class="descname">sensorsGetAccuracy</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#sensorsGetAccuracy" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns the most recently received accuracy value</p>
-</dd></dl>
-<dl class="function">
-<dt id="sensorsGetLight">
-<code class="descname">sensorsGetLight</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#sensorsGetLight" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns the most recently received light value</p>
-</dd></dl>
-<dl class="function">
-<dt id="sensorsReadAccelerometer">
-<code class="descname">sensorsReadAccelerometer</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#sensorsReadAccelerometer" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns the most recently received accelerometer values</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Returns:</th><td class="field-body">a List of Floats [(acceleration on the) X axis, Y axis, Z axis]</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="sensorsReadMagnetometer">
-<code class="descname">sensorsReadMagnetometer</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#sensorsReadMagnetometer" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns the most recently received magnetic field values</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Returns:</th><td class="field-body">a List of Floats [(magnetic field value for) X axis, Y axis, Z axis]</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="sensorsReadOrientation">
-<code class="descname">sensorsReadOrientation</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#sensorsReadOrientation" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns the most recently received orientation values</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Returns:</th><td class="field-body">a List of Doubles [azimuth, pitch, roll]</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<p><em>sample code</em></p>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="n">Droid</span> <span class="o">=</span> <span class="n">androidhelper</span><span class="o">.</span><span class="n">Android</span><span class="p">()</span>
-<span class="n">Droid</span><span class="o">.</span><span class="n">startSensingTimed</span><span class="p">(</span><span class="mi">1</span><span class="p">,</span> <span class="mi">250</span><span class="p">)</span>
-<span class="n">sensor</span> <span class="o">=</span> <span class="n">Droid</span><span class="o">.</span><span class="n">sensorsReadOrientation</span><span class="p">()</span><span class="o">.</span><span class="n">result</span>
-<span class="n">Droid</span><span class="o">.</span><span class="n">stopSensing</span><span class="p">()</span>
-</pre></div>
-</div>
-</div>
-</div>
-<div class="section" id="settingsfacade">
-<h1>SettingsFacade<a class="headerlink" href="#settingsfacade" title="Permalink to this headline">¶</a></h1>
-<div class="section" id="screen">
-<h2>Screen<a class="headerlink" href="#screen" title="Permalink to this headline">¶</a></h2>
-<dl class="function">
-<dt id="setScreenTimeout">
-<code class="descname">setScreenTimeout</code><span class="sig-paren">(</span><em>value</em><span class="sig-paren">)</span><a class="headerlink" href="#setScreenTimeout" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the screen timeout to this number of seconds</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Returns:</th><td class="field-body">The original screen timeout</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="getScreenTimeout">
-<code class="descname">getScreenTimeout</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#getScreenTimeout" title="Permalink to this definition">¶</a></dt>
-<dd><p>Gets the screen timeout</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Returns:</th><td class="field-body">the current screen timeout in seconds</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-</div>
-<div class="section" id="airplanermode">
-<h2>AirplanerMode<a class="headerlink" href="#airplanermode" title="Permalink to this headline">¶</a></h2>
-<dl class="function">
-<dt id="checkAirplaneMode">
-<code class="descname">checkAirplaneMode</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#checkAirplaneMode" title="Permalink to this definition">¶</a></dt>
-<dd><p>Checks the airplane mode setting</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Returns:</th><td class="field-body">True if airplane mode is enabled</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="toggleAirplaneMode">
-<code class="descname">toggleAirplaneMode</code><span class="sig-paren">(</span><em>enabled</em><span class="sig-paren">)</span><a class="headerlink" href="#toggleAirplaneMode" title="Permalink to this definition">¶</a></dt>
-<dd><p>Toggles airplane mode on and off</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Returns:</th><td class="field-body">True if airplane mode is enabled</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-</div>
-<div class="section" id="ringer-silent-mode">
-<h2>Ringer Silent Mode<a class="headerlink" href="#ringer-silent-mode" title="Permalink to this headline">¶</a></h2>
-<dl class="function">
-<dt id="checkRingerSilentMode">
-<code class="descname">checkRingerSilentMode</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#checkRingerSilentMode" title="Permalink to this definition">¶</a></dt>
-<dd><p>Checks the ringer silent mode setting</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Returns:</th><td class="field-body">True if ringer silent mode is enabled</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="toggleRingerSilentMode">
-<code class="descname">toggleRingerSilentMode</code><span class="sig-paren">(</span><em>enabled</em><span class="sig-paren">)</span><a class="headerlink" href="#toggleRingerSilentMode" title="Permalink to this definition">¶</a></dt>
-<dd><p>Toggles ringer silent mode on and off</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Returns:</th><td class="field-body">True if ringer silent mode is enabled</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-</div>
-<div class="section" id="vibrate-mode">
-<h2>Vibrate Mode<a class="headerlink" href="#vibrate-mode" title="Permalink to this headline">¶</a></h2>
-<dl class="function">
-<dt id="toggleVibrateMode">
-<code class="descname">toggleVibrateMode</code><span class="sig-paren">(</span><em>enabled</em><span class="sig-paren">)</span><a class="headerlink" href="#toggleVibrateMode" title="Permalink to this definition">¶</a></dt>
-<dd><p>Toggles vibrate mode on and off. If ringer=true then set Ringer setting, else set Notification setting</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Returns:</th><td class="field-body">True if vibrate mode is enabled</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="getVibrateMode">
-<code class="descname">getVibrateMode</code><span class="sig-paren">(</span><em>ringer</em><span class="sig-paren">)</span><a class="headerlink" href="#getVibrateMode" title="Permalink to this definition">¶</a></dt>
-<dd><p>Checks Vibration setting. If ringer=true then query Ringer setting, else query Notification setting</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Returns:</th><td class="field-body">True if vibrate mode is enabled</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-</div>
-<div class="section" id="ringer-media-volume">
-<h2>Ringer &amp; Media Volume<a class="headerlink" href="#ringer-media-volume" title="Permalink to this headline">¶</a></h2>
-<dl class="function">
-<dt id="getMaxRingerVolume">
-<code class="descname">getMaxRingerVolume</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#getMaxRingerVolume" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns the maximum ringer volume</p>
-</dd></dl>
-<dl class="function">
-<dt id="getRingerVolume">
-<code class="descname">getRingerVolume</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#getRingerVolume" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns the current ringer volume</p>
-</dd></dl>
-<dl class="function">
-<dt id="setRingerVolume">
-<code class="descname">setRingerVolume</code><span class="sig-paren">(</span><em>volume</em><span class="sig-paren">)</span><a class="headerlink" href="#setRingerVolume" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the ringer volume</p>
-</dd></dl>
-<dl class="function">
-<dt id="getMaxMediaVolume">
-<code class="descname">getMaxMediaVolume</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#getMaxMediaVolume" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns the maximum media volume</p>
-</dd></dl>
-<dl class="function">
-<dt id="getMediaVolume">
-<code class="descname">getMediaVolume</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#getMediaVolume" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns the current media volume</p>
-</dd></dl>
-<dl class="function">
-<dt id="setMediaVolume">
-<code class="descname">setMediaVolume</code><span class="sig-paren">(</span><em>volume</em><span class="sig-paren">)</span><a class="headerlink" href="#setMediaVolume" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the media volume</p>
-</dd></dl>
-</div>
-<div class="section" id="screen-brightness">
-<h2>Screen Brightness<a class="headerlink" href="#screen-brightness" title="Permalink to this headline">¶</a></h2>
-<dl class="function">
-<dt id="getScreenBrightness">
-<code class="descname">getScreenBrightness</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#getScreenBrightness" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns the screen backlight brightness</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Returns:</th><td class="field-body">the current screen brightness between 0 and 255</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="setScreenBrightness">
-<code class="descname">setScreenBrightness</code><span class="sig-paren">(</span><em>value</em><span class="sig-paren">)</span><a class="headerlink" href="#setScreenBrightness" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the the screen backlight brightness</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Returns:</th><td class="field-body">the original screen brightness</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="checkScreenOn">
-<code class="descname">checkScreenOn</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#checkScreenOn" title="Permalink to this definition">¶</a></dt>
-<dd><p>Checks if the screen is on or off (requires API level 7)</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Returns:</th><td class="field-body">True if the screen is currently on</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-</div>
-</div>
-<div class="section" id="smsfacade">
-<h1>SmsFacade<a class="headerlink" href="#smsfacade" title="Permalink to this headline">¶</a></h1>
-<dl class="function">
-<dt id="smsSend">
-<code class="descname">smsSend</code><span class="sig-paren">(</span><em>destinationAddress</em>, <em>text</em><span class="sig-paren">)</span><a class="headerlink" href="#smsSend" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sends an SMS</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>destinationAddress</strong> (<em>str</em>) &#8211; typically a phone number</li>
-<li><strong>text</strong> (<em>str</em>) &#8211; </li>
-</ul>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="smsGetMessageCount">
-<code class="descname">smsGetMessageCount</code><span class="sig-paren">(</span><em>unreadOnly</em>, <em>folder</em><span class="sig-paren">)</span><a class="headerlink" href="#smsGetMessageCount" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns the number of messages</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>unreadOnly</strong> (<em>bool</em>) &#8211; typically a phone number</li>
-<li><strong>folder(optional)</strong> (<em>str</em>) &#8211; default &#8220;inbox&#8221;</li>
-</ul>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="smsGetMessageIds">
-<code class="descname">smsGetMessageIds</code><span class="sig-paren">(</span><em>unreadOnly</em>, <em>folder</em><span class="sig-paren">)</span><a class="headerlink" href="#smsGetMessageIds" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns a List of all message IDs</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>unreadOnly</strong> (<em>bool</em>) &#8211; typically a phone number</li>
-<li><strong>folder(optional)</strong> (<em>str</em>) &#8211; default &#8220;inbox&#8221;</li>
-</ul>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="smsGetMessages">
-<code class="descname">smsGetMessages</code><span class="sig-paren">(</span><em>unreadOnly</em>, <em>folder</em>, <em>attributes</em><span class="sig-paren">)</span><a class="headerlink" href="#smsGetMessages" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns a List of all messages</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first simple">
-<li><strong>unreadOnly</strong> (<em>bool</em>) &#8211; typically a phone number</li>
-<li><strong>folder</strong> (<em>str</em>) &#8211; default &#8220;inbox&#8221;</li>
-<li><strong>attributes(optional)</strong> (<em>list</em>) &#8211; attributes</li>
-</ul>
-</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Returns:</th><td class="field-body"><p class="first last">a List of messages as Maps</p>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="smsGetMessageById">
-<code class="descname">smsGetMessageById</code><span class="sig-paren">(</span><em>id</em>, <em>attributes</em><span class="sig-paren">)</span><a class="headerlink" href="#smsGetMessageById" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns message attributes</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first simple">
-<li><strong>id</strong> (<em>int</em>) &#8211; message ID</li>
-<li><strong>attributes(optional)</strong> (<em>list</em>) &#8211; attributes</li>
-</ul>
-</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Returns:</th><td class="field-body"><p class="first last">a List of messages as Maps</p>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="smsGetAttributes">
-<code class="descname">smsGetAttributes</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#smsGetAttributes" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns a List of all possible message attributes</p>
-</dd></dl>
-<dl class="function">
-<dt id="smsDeleteMessage">
-<code class="descname">smsDeleteMessage</code><span class="sig-paren">(</span><em>id</em><span class="sig-paren">)</span><a class="headerlink" href="#smsDeleteMessage" title="Permalink to this definition">¶</a></dt>
-<dd><p>Deletes a message</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>id</strong> (<em>int</em>) &#8211; message ID</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Returns:</th><td class="field-body">True if the message was deleted</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="smsMarkMessageRead">
-<code class="descname">smsMarkMessageRead</code><span class="sig-paren">(</span><em>ids</em>, <em>read</em><span class="sig-paren">)</span><a class="headerlink" href="#smsMarkMessageRead" title="Permalink to this definition">¶</a></dt>
-<dd><p>Marks messages as read</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first simple">
-<li><strong>ids</strong> (<em>list</em>) &#8211; List of message IDs to mark as read</li>
-<li><strong>read</strong> (<em>bool</em>) &#8211; true or false</li>
-</ul>
-</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Returns:</th><td class="field-body"><p class="first last">number of messages marked read</p>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-</div>
-<div class="section" id="speechrecognitionfacade">
-<h1>SpeechRecognitionFacade<a class="headerlink" href="#speechrecognitionfacade" title="Permalink to this headline">¶</a></h1>
-<dl class="function">
-<dt id="recognizeSpeech">
-<code class="descname">recognizeSpeech</code><span class="sig-paren">(</span><em>prompt</em>, <em>language</em>, <em>languageModel</em><span class="sig-paren">)</span><a class="headerlink" href="#recognizeSpeech" title="Permalink to this definition">¶</a></dt>
-<dd><p>Recognizes user&#8217;s speech and returns the most likely result</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first simple">
-<li><strong>prompt(optional)</strong> (<em>str</em>) &#8211; text prompt to show to the user when asking them to speak</li>
-<li><strong>language(optional)</strong> (<em>str</em>) &#8211; language override to inform the recognizer that it should expect speech in a language different than the one set in the java.util.Locale.getDefault()</li>
-<li><strong>languageModel(optional)</strong> (<em>str</em>) &#8211; informs the recognizer which speech model to prefer (see android.speech.RecognizeIntent)</li>
-</ul>
-</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Returns:</th><td class="field-body"><p class="first last">An empty string in case the speech cannot be recongnized</p>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-</div>
-<div class="section" id="tonegeneratorfacade">
-<h1>ToneGeneratorFacade<a class="headerlink" href="#tonegeneratorfacade" title="Permalink to this headline">¶</a></h1>
-<dl class="function">
-<dt id="generateDtmfTones">
-<code class="descname">generateDtmfTones</code><span class="sig-paren">(</span><em>phoneNumber</em>, <em>toneDuration</em><span class="sig-paren">)</span><a class="headerlink" href="#generateDtmfTones" title="Permalink to this definition">¶</a></dt>
-<dd><p>Generate DTMF tones for the given phone number</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>phoneNumber</strong> (<em>str</em>) &#8211; phone number</li>
-<li><strong>toneDuration(optional)</strong> (<em>int</em>) &#8211; default 100, duration of each tone in milliseconds</li>
-</ul>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-</div>
-<div class="section" id="wakelockfacade">
-<h1>WakeLockFacade<a class="headerlink" href="#wakelockfacade" title="Permalink to this headline">¶</a></h1>
-<dl class="function">
-<dt id="wakeLockAcquireFull">
-<code class="descname">wakeLockAcquireFull</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#wakeLockAcquireFull" title="Permalink to this definition">¶</a></dt>
-<dd><p>Acquires a full wake lock (CPU on, screen bright, keyboard bright)</p>
-</dd></dl>
-<dl class="function">
-<dt id="wakeLockAcquirePartial">
-<code class="descname">wakeLockAcquirePartial</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#wakeLockAcquirePartial" title="Permalink to this definition">¶</a></dt>
-<dd><p>Acquires a partial wake lock (CPU on)</p>
-</dd></dl>
-<dl class="function">
-<dt id="wakeLockAcquireBright">
-<code class="descname">wakeLockAcquireBright</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#wakeLockAcquireBright" title="Permalink to this definition">¶</a></dt>
-<dd><p>Acquires a bright wake lock (CPU on, screen bright)</p>
-</dd></dl>
-<dl class="function">
-<dt id="wakeLockAcquireDim">
-<code class="descname">wakeLockAcquireDim</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#wakeLockAcquireDim" title="Permalink to this definition">¶</a></dt>
-<dd><p>Acquires a dim wake lock (CPU on, screen dim)</p>
-</dd></dl>
-<dl class="function">
-<dt id="wakeLockRelease">
-<code class="descname">wakeLockRelease</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#wakeLockRelease" title="Permalink to this definition">¶</a></dt>
-<dd><p>Releases the wake lock</p>
-</dd></dl>
-</div>
-<div class="section" id="wififacade">
-<h1>WifiFacade<a class="headerlink" href="#wififacade" title="Permalink to this headline">¶</a></h1>
-<dl class="function">
-<dt id="wifiGetScanResults">
-<code class="descname">wifiGetScanResults</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#wifiGetScanResults" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns the list of access points found during the most recent Wifi scan</p>
-</dd></dl>
-<dl class="function">
-<dt id="wifiLockAcquireFull">
-<code class="descname">wifiLockAcquireFull</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#wifiLockAcquireFull" title="Permalink to this definition">¶</a></dt>
-<dd><p>Acquires a full Wifi lock</p>
-</dd></dl>
-<dl class="function">
-<dt id="wifiLockAcquireScanOnly">
-<code class="descname">wifiLockAcquireScanOnly</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#wifiLockAcquireScanOnly" title="Permalink to this definition">¶</a></dt>
-<dd><p>Acquires a scan only Wifi lock</p>
-</dd></dl>
-<dl class="function">
-<dt id="wifiLockRelease">
-<code class="descname">wifiLockRelease</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#wifiLockRelease" title="Permalink to this definition">¶</a></dt>
-<dd><p>Releases a previously acquired Wifi lock</p>
-</dd></dl>
-<dl class="function">
-<dt id="wifiStartScan">
-<code class="descname">wifiStartScan</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#wifiStartScan" title="Permalink to this definition">¶</a></dt>
-<dd><p>Starts a scan for Wifi access points</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Returns:</th><td class="field-body">True if the scan was initiated successfully</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="checkWifiState">
-<code class="descname">checkWifiState</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#checkWifiState" title="Permalink to this definition">¶</a></dt>
-<dd><p>Checks Wifi state</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Returns:</th><td class="field-body">True if Wifi is enabled</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="toggleWifiState">
-<code class="descname">toggleWifiState</code><span class="sig-paren">(</span><em>enabled</em><span class="sig-paren">)</span><a class="headerlink" href="#toggleWifiState" title="Permalink to this definition">¶</a></dt>
-<dd><p>Toggle Wifi on and off</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>enabled(optional)</strong> (<em>bool</em>) &#8211; enabled</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Returns:</th><td class="field-body">True if Wifi is enabled</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="wifiDisconnect">
-<code class="descname">wifiDisconnect</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#wifiDisconnect" title="Permalink to this definition">¶</a></dt>
-<dd><p>Disconnects from the currently active access point</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Returns:</th><td class="field-body">True if the operation succeeded</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="wifiGetConnectionInfo">
-<code class="descname">wifiGetConnectionInfo</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#wifiGetConnectionInfo" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns information about the currently active access point</p>
-</dd></dl>
-<dl class="function">
-<dt id="wifiReassociate">
-<code class="descname">wifiReassociate</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#wifiReassociate" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns information about the currently active access point</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Returns:</th><td class="field-body">True if the operation succeeded</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="wifiReconnect">
-<code class="descname">wifiReconnect</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#wifiReconnect" title="Permalink to this definition">¶</a></dt>
-<dd><p>Reconnects to the currently active access point</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Returns:</th><td class="field-body">True if the operation succeeded</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-</div>
-<div class="section" id="batterymanagerfacade">
-<h1>BatteryManagerFacade<a class="headerlink" href="#batterymanagerfacade" title="Permalink to this headline">¶</a></h1>
-<dl class="function">
-<dt id="readBatteryData">
-<code class="descname">readBatteryData</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#readBatteryData" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns the most recently recorded battery data</p>
-</dd></dl>
-<dl class="function">
-<dt id="batteryStartMonitoring">
-<code class="descname">batteryStartMonitoring</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#batteryStartMonitoring" title="Permalink to this definition">¶</a></dt>
-<dd><p>Starts tracking battery state</p>
-</dd></dl>
-<dl class="function">
-<dt id="batteryStopMonitoring">
-<code class="descname">batteryStopMonitoring</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#batteryStopMonitoring" title="Permalink to this definition">¶</a></dt>
-<dd><p>Stops tracking battery state</p>
-</dd></dl>
-<dl class="function">
-<dt id="batteryGetStatus">
-<code class="descname">batteryGetStatus</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#batteryGetStatus" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns  the most recently received battery status data:
-1 - unknown;
-2 - charging;
-3 - discharging;
-4 - not charging;
-5 - full</p>
-</dd></dl>
-<dl class="function">
-<dt id="batteryGetHealth">
-<code class="descname">batteryGetHealth</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#batteryGetHealth" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns the most recently received battery health data:
-1 - unknown;
-2 - good;
-3 - overheat;
-4 - dead;
-5 - over voltage;
-6 - unspecified failure</p>
-</dd></dl>
-<dl class="function">
-<dt id="batteryGetPlugType">
-<code class="descname">batteryGetPlugType</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#batteryGetPlugType" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns the most recently received plug type data:
--1 - unknown
-0 - unplugged
-1 - power source is an AC charger
-2 - power source is a USB port</p>
-</dd></dl>
-<dl class="function">
-<dt id="batteryCheckPresent">
-<code class="descname">batteryCheckPresent</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#batteryCheckPresent" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns the most recently received battery presence data</p>
-</dd></dl>
-<dl class="function">
-<dt id="batteryGetLevel">
-<code class="descname">batteryGetLevel</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#batteryGetLevel" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns the most recently received battery level (percentage)</p>
-</dd></dl>
-<dl class="function">
-<dt id="batteryGetVoltage">
-<code class="descname">batteryGetVoltage</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#batteryGetVoltage" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns the most recently received battery voltage</p>
-</dd></dl>
-<dl class="function">
-<dt id="batteryGetTemperature">
-<code class="descname">batteryGetTemperature</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#batteryGetTemperature" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns the most recently received battery temperature</p>
-</dd></dl>
-<dl class="function">
-<dt id="batteryGetTechnology">
-<code class="descname">batteryGetTechnology</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#batteryGetTechnology" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns the most recently received battery technology data</p>
-</dd></dl>
-</div>
-<div class="section" id="activityresultfacade">
-<h1>ActivityResultFacade<a class="headerlink" href="#activityresultfacade" title="Permalink to this headline">¶</a></h1>
-<dl class="function">
-<dt id="setResultBoolean">
-<code class="descname">setResultBoolean</code><span class="sig-paren">(</span><em>resultCode</em>, <em>resultValue</em><span class="sig-paren">)</span><a class="headerlink" href="#setResultBoolean" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the result of a script execution. Whenever the script APK is called via startActivityForResult(),
-the resulting intent will contain SCRIPT_RESULT extra with the given value</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>resultCode</strong> (<em>int</em>) &#8211; </li>
-<li><strong>resultValue</strong> (<em>byte</em>) &#8211; </li>
-</ul>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="setResultByte">
-<code class="descname">setResultByte</code><span class="sig-paren">(</span><em>resultCode</em>, <em>resultValue</em><span class="sig-paren">)</span><a class="headerlink" href="#setResultByte" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the result of a script execution. Whenever the script APK is called via startActivityForResult(),
-the resulting intent will contain SCRIPT_RESULT extra with the given value</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>resultCode</strong> (<em>int</em>) &#8211; </li>
-<li><strong>resultValue</strong> (<em>byte</em>) &#8211; </li>
-</ul>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="setResultShort">
-<code class="descname">setResultShort</code><span class="sig-paren">(</span><em>resultCode</em>, <em>resultValue</em><span class="sig-paren">)</span><a class="headerlink" href="#setResultShort" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the result of a script execution. Whenever the script APK is called via startActivityForResult(),
-the resulting intent will contain SCRIPT_RESULT extra with the given value</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>resultCode</strong> (<em>int</em>) &#8211; </li>
-<li><strong>resultValue</strong> (<em>byte</em>) &#8211; </li>
-</ul>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="setResultChar">
-<code class="descname">setResultChar</code><span class="sig-paren">(</span><em>resultCode</em>, <em>resultValue</em><span class="sig-paren">)</span><a class="headerlink" href="#setResultChar" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the result of a script execution. Whenever the script APK is called via startActivityForResult(),
-the resulting intent will contain SCRIPT_RESULT extra with the given value</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>resultCode</strong> (<em>int</em>) &#8211; </li>
-<li><strong>resultValue</strong> (<em>byte</em>) &#8211; </li>
-</ul>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="setResultInteger">
-<code class="descname">setResultInteger</code><span class="sig-paren">(</span><em>resultCode</em>, <em>resultValue</em><span class="sig-paren">)</span><a class="headerlink" href="#setResultInteger" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the result of a script execution. Whenever the script APK is called via startActivityForResult(),
-the resulting intent will contain SCRIPT_RESULT extra with the given value</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>resultCode</strong> (<em>int</em>) &#8211; </li>
-<li><strong>resultValue</strong> (<em>byte</em>) &#8211; </li>
-</ul>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="setResultLong">
-<code class="descname">setResultLong</code><span class="sig-paren">(</span><em>resultCode</em>, <em>resultValue</em><span class="sig-paren">)</span><a class="headerlink" href="#setResultLong" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the result of a script execution. Whenever the script APK is called via startActivityForResult(),
-the resulting intent will contain SCRIPT_RESULT extra with the given value</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>resultCode</strong> (<em>int</em>) &#8211; </li>
-<li><strong>resultValue</strong> (<em>byte</em>) &#8211; </li>
-</ul>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="setResultFloat">
-<code class="descname">setResultFloat</code><span class="sig-paren">(</span><em>resultCode</em>, <em>resultValue</em><span class="sig-paren">)</span><a class="headerlink" href="#setResultFloat" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the result of a script execution. Whenever the script APK is called via startActivityForResult(),
-the resulting intent will contain SCRIPT_RESULT extra with the given value</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>resultCode</strong> (<em>int</em>) &#8211; </li>
-<li><strong>resultValue</strong> (<em>byte</em>) &#8211; </li>
-</ul>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="setResultDouble">
-<code class="descname">setResultDouble</code><span class="sig-paren">(</span><em>resultCode</em>, <em>resultValue</em><span class="sig-paren">)</span><a class="headerlink" href="#setResultDouble" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the result of a script execution. Whenever the script APK is called via startActivityForResult(),
-the resulting intent will contain SCRIPT_RESULT extra with the given value</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>resultCode</strong> (<em>int</em>) &#8211; </li>
-<li><strong>resultValue</strong> (<em>byte</em>) &#8211; </li>
-</ul>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="setResultString">
-<code class="descname">setResultString</code><span class="sig-paren">(</span><em>resultCode</em>, <em>resultValue</em><span class="sig-paren">)</span><a class="headerlink" href="#setResultString" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the result of a script execution. Whenever the script APK is called via startActivityForResult(),
-the resulting intent will contain SCRIPT_RESULT extra with the given value</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>resultCode</strong> (<em>int</em>) &#8211; </li>
-<li><strong>resultValue</strong> (<em>byte</em>) &#8211; </li>
-</ul>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="setResultBooleanArray">
-<code class="descname">setResultBooleanArray</code><span class="sig-paren">(</span><em>resultCode</em>, <em>resultValue</em><span class="sig-paren">)</span><a class="headerlink" href="#setResultBooleanArray" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the result of a script execution. Whenever the script APK is called via startActivityForResult(),
-the resulting intent will contain SCRIPT_RESULT extra with the given value</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>resultCode</strong> (<em>int</em>) &#8211; </li>
-<li><strong>resultValue</strong> (<em>byte</em>) &#8211; </li>
-</ul>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="setResultByteArray">
-<code class="descname">setResultByteArray</code><span class="sig-paren">(</span><em>resultCode</em>, <em>resultValue</em><span class="sig-paren">)</span><a class="headerlink" href="#setResultByteArray" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the result of a script execution. Whenever the script APK is called via startActivityForResult(),
-the resulting intent will contain SCRIPT_RESULT extra with the given value</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>resultCode</strong> (<em>int</em>) &#8211; </li>
-<li><strong>resultValue</strong> (<em>byte</em>) &#8211; </li>
-</ul>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="setResultShortArray">
-<code class="descname">setResultShortArray</code><span class="sig-paren">(</span><em>resultCode</em>, <em>resultValue</em><span class="sig-paren">)</span><a class="headerlink" href="#setResultShortArray" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the result of a script execution. Whenever the script APK is called via startActivityForResult(),
-the resulting intent will contain SCRIPT_RESULT extra with the given value</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>resultCode</strong> (<em>int</em>) &#8211; </li>
-<li><strong>resultValue</strong> (<em>byte</em>) &#8211; </li>
-</ul>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="setResultCharArray">
-<code class="descname">setResultCharArray</code><span class="sig-paren">(</span><em>resultCode</em>, <em>resultValue</em><span class="sig-paren">)</span><a class="headerlink" href="#setResultCharArray" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the result of a script execution. Whenever the script APK is called via startActivityForResult(),
-the resulting intent will contain SCRIPT_RESULT extra with the given value</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>resultCode</strong> (<em>int</em>) &#8211; </li>
-<li><strong>resultValue</strong> (<em>byte</em>) &#8211; </li>
-</ul>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="setResultIntegerArray">
-<code class="descname">setResultIntegerArray</code><span class="sig-paren">(</span><em>resultCode</em>, <em>resultValue</em><span class="sig-paren">)</span><a class="headerlink" href="#setResultIntegerArray" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the result of a script execution. Whenever the script APK is called via startActivityForResult(),
-the resulting intent will contain SCRIPT_RESULT extra with the given value</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>resultCode</strong> (<em>int</em>) &#8211; </li>
-<li><strong>resultValue</strong> (<em>byte</em>) &#8211; </li>
-</ul>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="setResultLongArray">
-<code class="descname">setResultLongArray</code><span class="sig-paren">(</span><em>resultCode</em>, <em>resultValue</em><span class="sig-paren">)</span><a class="headerlink" href="#setResultLongArray" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the result of a script execution. Whenever the script APK is called via startActivityForResult(),
-the resulting intent will contain SCRIPT_RESULT extra with the given value</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>resultCode</strong> (<em>int</em>) &#8211; </li>
-<li><strong>resultValue</strong> (<em>byte</em>) &#8211; </li>
-</ul>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="setResultFloatArray">
-<code class="descname">setResultFloatArray</code><span class="sig-paren">(</span><em>resultCode</em>, <em>resultValue</em><span class="sig-paren">)</span><a class="headerlink" href="#setResultFloatArray" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the result of a script execution. Whenever the script APK is called via startActivityForResult(),
-the resulting intent will contain SCRIPT_RESULT extra with the given value</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>resultCode</strong> (<em>int</em>) &#8211; </li>
-<li><strong>resultValue</strong> (<em>byte</em>) &#8211; </li>
-</ul>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="setResultDoubleArray">
-<code class="descname">setResultDoubleArray</code><span class="sig-paren">(</span><em>resultCode</em>, <em>resultValue</em><span class="sig-paren">)</span><a class="headerlink" href="#setResultDoubleArray" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the result of a script execution. Whenever the script APK is called via startActivityForResult(),
-the resulting intent will contain SCRIPT_RESULT extra with the given value</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>resultCode</strong> (<em>int</em>) &#8211; </li>
-<li><strong>resultValue</strong> (<em>byte</em>) &#8211; </li>
-</ul>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="setResultStringArray">
-<code class="descname">setResultStringArray</code><span class="sig-paren">(</span><em>resultCode</em>, <em>resultValue</em><span class="sig-paren">)</span><a class="headerlink" href="#setResultStringArray" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the result of a script execution. Whenever the script APK is called via startActivityForResult(),
-the resulting intent will contain SCRIPT_RESULT extra with the given value</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>resultCode</strong> (<em>int</em>) &#8211; </li>
-<li><strong>resultValue</strong> (<em>byte</em>) &#8211; </li>
-</ul>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="setResultSerializable">
-<code class="descname">setResultSerializable</code><span class="sig-paren">(</span><em>resultCode</em>, <em>resultValue</em><span class="sig-paren">)</span><a class="headerlink" href="#setResultSerializable" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the result of a script execution. Whenever the script APK is called via startActivityForResult(),
-the resulting intent will contain SCRIPT_RESULT extra with the given value</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>resultCode</strong> (<em>int</em>) &#8211; </li>
-<li><strong>resultValue</strong> (<em>byte</em>) &#8211; </li>
-</ul>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-</div>
-<div class="section" id="mediaplayerfacade">
-<h1>MediaPlayerFacade<a class="headerlink" href="#mediaplayerfacade" title="Permalink to this headline">¶</a></h1>
-<div class="section" id="control">
-<h2>Control<a class="headerlink" href="#control" title="Permalink to this headline">¶</a></h2>
-<dl class="function">
-<dt id="mediaPlay">
-<code class="descname">mediaPlay</code><span class="sig-paren">(</span><em>url</em>, <em>tag</em>, <em>play</em><span class="sig-paren">)</span><a class="headerlink" href="#mediaPlay" title="Permalink to this definition">¶</a></dt>
-<dd><p>Open a media file</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first simple">
-<li><strong>url</strong> (<em>str</em>) &#8211; url of media resource</li>
-<li><strong>tag(optional)</strong> (<em>str</em>) &#8211; string identifying resource (default=default)</li>
-<li><strong>play(optional)</strong> (<em>bool</em>) &#8211; start playing immediately</li>
-</ul>
-</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Returns:</th><td class="field-body"><p class="first last">true if play successful</p>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="mediaPlayPause">
-<code class="descname">mediaPlayPause</code><span class="sig-paren">(</span><em>tag</em><span class="sig-paren">)</span><a class="headerlink" href="#mediaPlayPause" title="Permalink to this definition">¶</a></dt>
-<dd><p>pause playing media file</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>tag</strong> (<em>str</em>) &#8211; string identifying resource (default=default)</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Returns:</th><td class="field-body">true if successful</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="mediaPlayStart">
-<code class="descname">mediaPlayStart</code><span class="sig-paren">(</span><em>tag</em><span class="sig-paren">)</span><a class="headerlink" href="#mediaPlayStart" title="Permalink to this definition">¶</a></dt>
-<dd><p>start playing media file</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>tag</strong> (<em>str</em>) &#8211; string identifying resource (default=default)</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Returns:</th><td class="field-body">true if successful</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="mediaPlayClose">
-<code class="descname">mediaPlayClose</code><span class="sig-paren">(</span><em>tag</em><span class="sig-paren">)</span><a class="headerlink" href="#mediaPlayClose" title="Permalink to this definition">¶</a></dt>
-<dd><p>Close media file</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>tag</strong> (<em>str</em>) &#8211; string identifying resource (default=default)</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Returns:</th><td class="field-body">true if successful</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="mediaIsPlaying">
-<code class="descname">mediaIsPlaying</code><span class="sig-paren">(</span><em>tag</em><span class="sig-paren">)</span><a class="headerlink" href="#mediaIsPlaying" title="Permalink to this definition">¶</a></dt>
-<dd><p>Checks if media file is playing</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>tag</strong> (<em>str</em>) &#8211; string identifying resource (default=default)</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Returns:</th><td class="field-body">true if successful</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="mediaPlaySetLooping">
-<code class="descname">mediaPlaySetLooping</code><span class="sig-paren">(</span><em>enabled</em>, <em>tag</em><span class="sig-paren">)</span><a class="headerlink" href="#mediaPlaySetLooping" title="Permalink to this definition">¶</a></dt>
-<dd><p>Set Looping</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first simple">
-<li><strong>enabled</strong> (<em>bool</em>) &#8211; default true</li>
-<li><strong>tag</strong> (<em>str</em>) &#8211; string identifying resource (default=default)</li>
-</ul>
-</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Returns:</th><td class="field-body"><p class="first last">True if successful</p>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="mediaPlaySeek">
-<code class="descname">mediaPlaySeek</code><span class="sig-paren">(</span><em>msec</em>, <em>tag</em><span class="sig-paren">)</span><a class="headerlink" href="#mediaPlaySeek" title="Permalink to this definition">¶</a></dt>
-<dd><p>Seek To Position</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first simple">
-<li><strong>msec</strong> (<em>int</em>) &#8211; default true</li>
-<li><strong>tag</strong> (<em>str</em>) &#8211; string identifying resource (default=default)</li>
-</ul>
-</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Returns:</th><td class="field-body"><p class="first last">New Position (in ms)</p>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-</div>
-<div class="section" id="get-information">
-<h2>Get Information<a class="headerlink" href="#get-information" title="Permalink to this headline">¶</a></h2>
-<dl class="function">
-<dt id="mediaPlayInfo">
-<code class="descname">mediaPlayInfo</code><span class="sig-paren">(</span><em>tag</em><span class="sig-paren">)</span><a class="headerlink" href="#mediaPlayInfo" title="Permalink to this definition">¶</a></dt>
-<dd><p>Information on current media</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>tag</strong> (<em>str</em>) &#8211; string identifying resource (default=default)</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Returns:</th><td class="field-body">Media Information</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="mediaPlayList">
-<code class="descname">mediaPlayList</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#mediaPlayList" title="Permalink to this definition">¶</a></dt>
-<dd><p>Lists currently loaded media</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Returns:</th><td class="field-body">List of Media Tags</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-</div>
-</div>
-<div class="section" id="preferencesfacade">
-<h1>PreferencesFacade<a class="headerlink" href="#preferencesfacade" title="Permalink to this headline">¶</a></h1>
-<dl class="function">
-<dt id="prefGetValue">
-<code class="descname">prefGetValue</code><span class="sig-paren">(</span><em>key</em>, <em>filename</em><span class="sig-paren">)</span><a class="headerlink" href="#prefGetValue" title="Permalink to this definition">¶</a></dt>
-<dd><p>Read a value from shared preferences</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>key</strong> (<em>str</em>) &#8211; key</li>
-<li><strong>filename(optional)</strong> (<em>str</em>) &#8211; Desired preferences file. If not defined, uses the default Shared Preferences.</li>
-</ul>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="prefPutValue">
-<code class="descname">prefPutValue</code><span class="sig-paren">(</span><em>key</em>, <em>value</em>, <em>filename</em><span class="sig-paren">)</span><a class="headerlink" href="#prefPutValue" title="Permalink to this definition">¶</a></dt>
-<dd><p>Write a value to shared preferences</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>key</strong> (<em>str</em>) &#8211; key</li>
-<li><strong>value</strong> (<em>str</em>) &#8211; value</li>
-<li><strong>filename(optional)</strong> (<em>str</em>) &#8211; Desired preferences file. If not defined, uses the default Shared Preferences.</li>
-</ul>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="prefGetAll">
-<code class="descname">prefGetAll</code><span class="sig-paren">(</span><em>filename</em><span class="sig-paren">)</span><a class="headerlink" href="#prefGetAll" title="Permalink to this definition">¶</a></dt>
-<dd><p>Get list of Shared Preference Values</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>filename(optional)</strong> (<em>str</em>) &#8211; Desired preferences file. If not defined, uses the default Shared Preferences.</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-</div>
-<div class="section" id="qpyinterfacefacade">
-<h1>QPyInterfaceFacade<a class="headerlink" href="#qpyinterfacefacade" title="Permalink to this headline">¶</a></h1>
-<dl class="function">
-<dt id="executeQPy">
-<code class="descname">executeQPy</code><span class="sig-paren">(</span><em>script</em><span class="sig-paren">)</span><a class="headerlink" href="#executeQPy" title="Permalink to this definition">¶</a></dt>
-<dd><p>Execute a qpython script by absolute path</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>script</strong> (<em>str</em>) &#8211; The absolute path of the qpython script</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Returns:</th><td class="field-body">bool</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-</div>
-<div class="section" id="texttospeechfacade">
-<h1>TextToSpeechFacade<a class="headerlink" href="#texttospeechfacade" title="Permalink to this headline">¶</a></h1>
-<dl class="function">
-<dt id="ttsSpeak">
-<code class="descname">ttsSpeak</code><span class="sig-paren">(</span><em>message</em><span class="sig-paren">)</span><a class="headerlink" href="#ttsSpeak" title="Permalink to this definition">¶</a></dt>
-<dd><p>Speaks the provided message via TTS</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>message</strong> (<em>str</em>) &#8211; message</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="ttsIsSpeaking">
-<code class="descname">ttsIsSpeaking</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#ttsIsSpeaking" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns True if speech is currently in progress</p>
-</dd></dl>
-</div>
-<div class="section" id="eyesfreefacade">
-<h1>EyesFreeFacade<a class="headerlink" href="#eyesfreefacade" title="Permalink to this headline">¶</a></h1>
-<dl class="function">
-<dt>
-<code class="descname">ttsSpeak</code><span class="sig-paren">(</span><em>message</em><span class="sig-paren">)</span></dt>
-<dd><p>Speaks the provided message via TTS</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>message</strong> (<em>str</em>) &#8211; message</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-</div>
-<div class="section" id="bluetoothfacade">
-<h1>BluetoothFacade<a class="headerlink" href="#bluetoothfacade" title="Permalink to this headline">¶</a></h1>
-<dl class="function">
-<dt id="bluetoothActiveConnections">
-<code class="descname">bluetoothActiveConnections</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#bluetoothActiveConnections" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns active Bluetooth connections</p>
-</dd></dl>
-<dl class="function">
-<dt id="bluetoothWriteBinary">
-<code class="descname">bluetoothWriteBinary</code><span class="sig-paren">(</span><em>base64</em>, <em>connID</em><span class="sig-paren">)</span><a class="headerlink" href="#bluetoothWriteBinary" title="Permalink to this definition">¶</a></dt>
-<dd><p>Send bytes over the currently open Bluetooth connection</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>base64</strong> (<em>str</em>) &#8211; A base64 encoded String of the bytes to be sent</li>
-<li><strong>connID(optional)</strong> (<em>str</em>) &#8211; Connection id</li>
-</ul>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="bluetoothReadBinary">
-<code class="descname">bluetoothReadBinary</code><span class="sig-paren">(</span><em>bufferSize</em>, <em>connID</em><span class="sig-paren">)</span><a class="headerlink" href="#bluetoothReadBinary" title="Permalink to this definition">¶</a></dt>
-<dd><p>Read up to bufferSize bytes and return a chunked, base64 encoded string</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>bufferSize</strong> (<em>int</em>) &#8211; default 4096</li>
-<li><strong>connID(optional)</strong> (<em>str</em>) &#8211; Connection id</li>
-</ul>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="bluetoothConnect">
-<code class="descname">bluetoothConnect</code><span class="sig-paren">(</span><em>uuid</em>, <em>address</em><span class="sig-paren">)</span><a class="headerlink" href="#bluetoothConnect" title="Permalink to this definition">¶</a></dt>
-<dd><p>Connect to a device over Bluetooth. Blocks until the connection is established or fails</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first simple">
-<li><strong>uuid</strong> (<em>str</em>) &#8211; The UUID passed here must match the UUID used by the server device</li>
-<li><strong>address(optional)</strong> (<em>str</em>) &#8211; The user will be presented with a list of discovered devices to choose from if an address is not provided</li>
-</ul>
-</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Returns:</th><td class="field-body"><p class="first last">True if the connection was established successfully</p>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="bluetoothAccept">
-<code class="descname">bluetoothAccept</code><span class="sig-paren">(</span><em>uuid</em>, <em>timeout</em><span class="sig-paren">)</span><a class="headerlink" href="#bluetoothAccept" title="Permalink to this definition">¶</a></dt>
-<dd><p>Listens for and accepts a Bluetooth connection. Blocks until the connection is established or fails</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>uuid</strong> (<em>str</em>) &#8211; The UUID passed here must match the UUID used by the server device</li>
-<li><strong>timeout</strong> (<em>int</em>) &#8211; How long to wait for a new connection, 0 is wait for ever (default=0)</li>
-</ul>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="bluetoothMakeDiscoverable">
-<code class="descname">bluetoothMakeDiscoverable</code><span class="sig-paren">(</span><em>duration</em><span class="sig-paren">)</span><a class="headerlink" href="#bluetoothMakeDiscoverable" title="Permalink to this definition">¶</a></dt>
-<dd><p>Requests that the device be discoverable for Bluetooth connections</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>duration</strong> (<em>int</em>) &#8211; period of time, in seconds, during which the device should be discoverable (default=300)</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="bluetoothWrite">
-<code class="descname">bluetoothWrite</code><span class="sig-paren">(</span><em>ascii</em>, <em>connID</em><span class="sig-paren">)</span><a class="headerlink" href="#bluetoothWrite" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sends ASCII characters over the currently open Bluetooth connection</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>ascii</strong> (<em>str</em>) &#8211; text</li>
-<li><strong>connID</strong> (<em>str</em>) &#8211; Connection id</li>
-</ul>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="bluetoothReadReady">
-<code class="descname">bluetoothReadReady</code><span class="sig-paren">(</span><em>connID</em><span class="sig-paren">)</span><a class="headerlink" href="#bluetoothReadReady" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sends ASCII characters over the currently open Bluetooth connection</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>ascii</strong> (<em>str</em>) &#8211; text</li>
-<li><strong>connID</strong> (<em>str</em>) &#8211; Connection id</li>
-</ul>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="bluetoothRead">
-<code class="descname">bluetoothRead</code><span class="sig-paren">(</span><em>bufferSize</em>, <em>connID</em><span class="sig-paren">)</span><a class="headerlink" href="#bluetoothRead" title="Permalink to this definition">¶</a></dt>
-<dd><p>Read up to bufferSize ASCII characters</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>bufferSize</strong> (<em>int</em>) &#8211; default=4096</li>
-<li><strong>connID(optional)</strong> (<em>str</em>) &#8211; Connection id</li>
-</ul>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="bluetoothReadLine">
-<code class="descname">bluetoothReadLine</code><span class="sig-paren">(</span><em>connID</em><span class="sig-paren">)</span><a class="headerlink" href="#bluetoothReadLine" title="Permalink to this definition">¶</a></dt>
-<dd><p>Read the next line</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>connID(optional)</strong> (<em>str</em>) &#8211; Connection id</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="bluetoothGetRemoteDeviceName">
-<code class="descname">bluetoothGetRemoteDeviceName</code><span class="sig-paren">(</span><em>address</em><span class="sig-paren">)</span><a class="headerlink" href="#bluetoothGetRemoteDeviceName" title="Permalink to this definition">¶</a></dt>
-<dd><p>Queries a remote device for it&#8217;s name or null if it can&#8217;t be resolved</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>address</strong> (<em>str</em>) &#8211; Bluetooth Address For Target Device</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="bluetoothGetLocalName">
-<code class="descname">bluetoothGetLocalName</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#bluetoothGetLocalName" title="Permalink to this definition">¶</a></dt>
-<dd><p>Gets the Bluetooth Visible device name</p>
-</dd></dl>
-<dl class="function">
-<dt id="bluetoothSetLocalName">
-<code class="descname">bluetoothSetLocalName</code><span class="sig-paren">(</span><em>name</em><span class="sig-paren">)</span><a class="headerlink" href="#bluetoothSetLocalName" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the Bluetooth Visible device name, returns True on success</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>name</strong> (<em>str</em>) &#8211; New local name</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="bluetoothGetScanMode">
-<code class="descname">bluetoothGetScanMode</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#bluetoothGetScanMode" title="Permalink to this definition">¶</a></dt>
-<dd><p>Gets the scan mode for the local dongle.
-Return values:
--1 when Bluetooth is disabled.
-0 if non discoverable and non connectable.
-1 connectable non discoverable.
-3 connectable and discoverable.</p>
-</dd></dl>
-<dl class="function">
-<dt id="bluetoothGetConnectedDeviceName">
-<code class="descname">bluetoothGetConnectedDeviceName</code><span class="sig-paren">(</span><em>connID</em><span class="sig-paren">)</span><a class="headerlink" href="#bluetoothGetConnectedDeviceName" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns the name of the connected device</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>connID</strong> (<em>str</em>) &#8211; Connection id</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="checkBluetoothState">
-<code class="descname">checkBluetoothState</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#checkBluetoothState" title="Permalink to this definition">¶</a></dt>
-<dd><p>Checks Bluetooth state</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Returns:</th><td class="field-body">True if Bluetooth is enabled</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="toggleBluetoothState">
-<code class="descname">toggleBluetoothState</code><span class="sig-paren">(</span><em>enabled</em>, <em>prompt</em><span class="sig-paren">)</span><a class="headerlink" href="#toggleBluetoothState" title="Permalink to this definition">¶</a></dt>
-<dd><p>Toggle Bluetooth on and off</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first simple">
-<li><strong>enabled</strong> (<em>bool</em>) &#8211; </li>
-<li><strong>prompt</strong> (<em>str</em>) &#8211; Prompt the user to confirm changing the Bluetooth state, default=true</li>
-</ul>
-</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Returns:</th><td class="field-body"><p class="first last">True if Bluetooth is enabled</p>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="bluetoothStop">
-<code class="descname">bluetoothStop</code><span class="sig-paren">(</span><em>connID</em><span class="sig-paren">)</span><a class="headerlink" href="#bluetoothStop" title="Permalink to this definition">¶</a></dt>
-<dd><p>Stops Bluetooth connection</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>connID</strong> (<em>str</em>) &#8211; Connection id</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="bluetoothGetLocalAddress">
-<code class="descname">bluetoothGetLocalAddress</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#bluetoothGetLocalAddress" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns the hardware address of the local Bluetooth adapter</p>
-</dd></dl>
-<dl class="function">
-<dt id="bluetoothDiscoveryStart">
-<code class="descname">bluetoothDiscoveryStart</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#bluetoothDiscoveryStart" title="Permalink to this definition">¶</a></dt>
-<dd><p>Start the remote device discovery process</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Returns:</th><td class="field-body">true on success, false on error</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="bluetoothDiscoveryCancel">
-<code class="descname">bluetoothDiscoveryCancel</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#bluetoothDiscoveryCancel" title="Permalink to this definition">¶</a></dt>
-<dd><p>Cancel the current device discovery process</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Returns:</th><td class="field-body">true on success, false on error</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="bluetoothIsDiscovering">
-<code class="descname">bluetoothIsDiscovering</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#bluetoothIsDiscovering" title="Permalink to this definition">¶</a></dt>
-<dd><p>Return true if the local Bluetooth adapter is currently in the device discovery process</p>
-</dd></dl>
-</div>
-<div class="section" id="signalstrengthfacade">
-<h1>SignalStrengthFacade<a class="headerlink" href="#signalstrengthfacade" title="Permalink to this headline">¶</a></h1>
-<dl class="function">
-<dt id="startTrackingSignalStrengths">
-<code class="descname">startTrackingSignalStrengths</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#startTrackingSignalStrengths" title="Permalink to this definition">¶</a></dt>
-<dd><p>Starts tracking signal strengths</p>
-</dd></dl>
-<dl class="function">
-<dt id="readSignalStrengths">
-<code class="descname">readSignalStrengths</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#readSignalStrengths" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns the current signal strengths</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Returns:</th><td class="field-body">A map of gsm_signal_strength</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="stopTrackingSignalStrengths">
-<code class="descname">stopTrackingSignalStrengths</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#stopTrackingSignalStrengths" title="Permalink to this definition">¶</a></dt>
-<dd><p>Stops tracking signal strength</p>
-</dd></dl>
-</div>
-<div class="section" id="webcamfacade">
-<h1>WebCamFacade<a class="headerlink" href="#webcamfacade" title="Permalink to this headline">¶</a></h1>
-<dl class="function">
-<dt id="webcamStart">
-<code class="descname">webcamStart</code><span class="sig-paren">(</span><em>resolutionLevel</em>, <em>jpegQuality</em>, <em>port</em><span class="sig-paren">)</span><a class="headerlink" href="#webcamStart" title="Permalink to this definition">¶</a></dt>
-<dd><p>Starts an MJPEG stream and returns a Tuple of address and port for the stream</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>resolutionLevel</strong> (<em>int</em>) &#8211; increasing this number provides higher resolution (default=0)</li>
-<li><strong>jpegQuality</strong> (<em>int</em>) &#8211; a number from 0-10 (default=20)</li>
-<li><strong>port</strong> (<em>int</em>) &#8211; If port is specified, the webcam service will bind to port, otherwise it will pick any available port (default=0)</li>
-</ul>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="webcamAdjustQuality">
-<code class="descname">webcamAdjustQuality</code><span class="sig-paren">(</span><em>resolutionLevel</em>, <em>jpegQuality</em><span class="sig-paren">)</span><a class="headerlink" href="#webcamAdjustQuality" title="Permalink to this definition">¶</a></dt>
-<dd><p>Adjusts the quality of the webcam stream while it is running</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>resolutionLevel</strong> (<em>int</em>) &#8211; increasing this number provides higher resolution (default=0)</li>
-<li><strong>jpegQuality</strong> (<em>int</em>) &#8211; a number from 0-10 (default=20)</li>
-</ul>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="cameraStartPreview">
-<code class="descname">cameraStartPreview</code><span class="sig-paren">(</span><em>resolutionLevel</em>, <em>jpegQuality</em>, <em>filepath</em><span class="sig-paren">)</span><a class="headerlink" href="#cameraStartPreview" title="Permalink to this definition">¶</a></dt>
-<dd><p>Start Preview Mode. Throws &#8216;preview&#8217; events</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first simple">
-<li><strong>resolutionLevel</strong> (<em>int</em>) &#8211; increasing this number provides higher resolution (default=0)</li>
-<li><strong>jpegQuality</strong> (<em>int</em>) &#8211; a number from 0-10 (default=20)</li>
-<li><strong>filepath</strong> (<em>str</em>) &#8211; Path to store jpeg files</li>
-</ul>
-</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Returns:</th><td class="field-body"><p class="first last">True if successful</p>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="cameraStopPreview">
-<code class="descname">cameraStopPreview</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#cameraStopPreview" title="Permalink to this definition">¶</a></dt>
-<dd><p>Stop the preview mode</p>
-</dd></dl>
-</div>
-<div class="section" id="uifacade">
-<h1>UiFacade<a class="headerlink" href="#uifacade" title="Permalink to this headline">¶</a></h1>
-<div class="section" id="dialog">
-<h2>Dialog<a class="headerlink" href="#dialog" title="Permalink to this headline">¶</a></h2>
-<dl class="function">
-<dt id="dialogCreateInput">
-<code class="descname">dialogCreateInput</code><span class="sig-paren">(</span><em>title</em>, <em>message</em>, <em>defaultText</em>, <em>inputType</em><span class="sig-paren">)</span><a class="headerlink" href="#dialogCreateInput" title="Permalink to this definition">¶</a></dt>
-<dd><p>Create a text input dialog</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>title</strong> (<em>str</em>) &#8211; title of the input box</li>
-<li><strong>message</strong> (<em>str</em>) &#8211; message to display above the input box</li>
-<li><strong>defaultText(optional)</strong> (<em>str</em>) &#8211; text to insert into the input box</li>
-<li><strong>inputType(optional)</strong> (<em>str</em>) &#8211; type of input data, ie number or text</li>
-</ul>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="dialogCreatePassword">
-<code class="descname">dialogCreatePassword</code><span class="sig-paren">(</span><em>title</em>, <em>message</em><span class="sig-paren">)</span><a class="headerlink" href="#dialogCreatePassword" title="Permalink to this definition">¶</a></dt>
-<dd><p>Create a password input dialog</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>title</strong> (<em>str</em>) &#8211; title of the input box</li>
-<li><strong>message</strong> (<em>str</em>) &#8211; message to display above the input box</li>
-</ul>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="dialogGetInput">
-<code class="descname">dialogGetInput</code><span class="sig-paren">(</span><em>title</em>, <em>message</em>, <em>defaultText</em><span class="sig-paren">)</span><a class="headerlink" href="#dialogGetInput" title="Permalink to this definition">¶</a></dt>
-<dd><p>Create a password input dialog</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>title</strong> (<em>str</em>) &#8211; title of the input box</li>
-<li><strong>message</strong> (<em>str</em>) &#8211; message to display above the input box</li>
-<li><strong>defaultText(optional)</strong> (<em>str</em>) &#8211; text to insert into the input box</li>
-</ul>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="dialogGetPassword">
-<code class="descname">dialogGetPassword</code><span class="sig-paren">(</span><em>title</em>, <em>message</em><span class="sig-paren">)</span><a class="headerlink" href="#dialogGetPassword" title="Permalink to this definition">¶</a></dt>
-<dd><p>Queries the user for a password</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>title</strong> (<em>str</em>) &#8211; title of the password box</li>
-<li><strong>message</strong> (<em>str</em>) &#8211; message to display above the input box</li>
-</ul>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="dialogCreateSeekBar">
-<code class="descname">dialogCreateSeekBar</code><span class="sig-paren">(</span><em>start</em>, <em>maximum</em>, <em>title</em><span class="sig-paren">)</span><a class="headerlink" href="#dialogCreateSeekBar" title="Permalink to this definition">¶</a></dt>
-<dd><p>Create seek bar dialog</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>start</strong> (<em>int</em>) &#8211; default=50</li>
-<li><strong>maximum</strong> (<em>int</em>) &#8211; default=100</li>
-<li><strong>title</strong> (<em>int</em>) &#8211; title</li>
-</ul>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="dialogCreateTimePicker">
-<code class="descname">dialogCreateTimePicker</code><span class="sig-paren">(</span><em>hour</em>, <em>minute</em>, <em>is24hour</em><span class="sig-paren">)</span><a class="headerlink" href="#dialogCreateTimePicker" title="Permalink to this definition">¶</a></dt>
-<dd><p>Create time picker dialog</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>hour</strong> (<em>int</em>) &#8211; default=0</li>
-<li><strong>miute</strong> (<em>int</em>) &#8211; default=0</li>
-<li><strong>is24hour</strong> (<em>bool</em>) &#8211; default=false</li>
-</ul>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="dialogCreateDatePicker">
-<code class="descname">dialogCreateDatePicker</code><span class="sig-paren">(</span><em>year</em>, <em>month</em>, <em>day</em><span class="sig-paren">)</span><a class="headerlink" href="#dialogCreateDatePicker" title="Permalink to this definition">¶</a></dt>
-<dd><p>Create date picker dialog</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>year</strong> (<em>int</em>) &#8211; default=1970</li>
-<li><strong>month</strong> (<em>int</em>) &#8211; default=1</li>
-<li><strong>day</strong> (<em>int</em>) &#8211; default=1</li>
-</ul>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-</div>
-<div class="section" id="nfc">
-<h2>NFC<a class="headerlink" href="#nfc" title="Permalink to this headline">¶</a></h2>
-<p><strong>Data structs</strong>
-<em>QPython NFC json result</em></p>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="p">{</span>
-<span class="s2">&quot;role&quot;</span><span class="p">:</span> <span class="o">&lt;</span><span class="n">role</span><span class="o">&gt;</span><span class="p">,</span> <span class="c1"># could be self/master/slave</span>
-<span class="s2">&quot;stat&quot;</span><span class="p">:</span> <span class="o">&lt;</span><span class="n">stat</span><span class="o">&gt;</span><span class="p">,</span> <span class="c1"># could be ok / fail / cancl</span>
-<span class="s2">&quot;message&quot;</span><span class="p">:</span> <span class="o">&lt;</span><span class="n">message</span> <span class="n">get</span><span class="o">&gt;</span>
-<span class="p">}</span>
-</pre></div>
-</div>
-<p><strong>APIs</strong></p>
-<dl class="function">
-<dt id="dialogCreateNFCBeamMaster">
-<code class="descname">dialogCreateNFCBeamMaster</code><span class="sig-paren">(</span><em>title</em>, <em>message</em>, <em>inputType</em><span class="sig-paren">)</span><a class="headerlink" href="#dialogCreateNFCBeamMaster" title="Permalink to this definition">¶</a></dt>
-<dd><p>Create a dialog where you could create a qpython beam master</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>title</strong> (<em>str</em>) &#8211; title of the input box</li>
-<li><strong>message</strong> (<em>str</em>) &#8211; message to display above the input box</li>
-<li><strong>inputType(optional)</strong> (<em>str</em>) &#8211; type of input data, ie number or text</li>
-</ul>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="NFCBeamMessage">
-<code class="descname">NFCBeamMessage</code><span class="sig-paren">(</span><em>content</em>, <em>title</em>, <em>message</em><span class="sig-paren">)</span><a class="headerlink" href="#NFCBeamMessage" title="Permalink to this definition">¶</a></dt>
-<dd><p>Create a dialog where you could create a qpython beam master</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>content</strong> (<em>str</em>) &#8211; message you want to sent</li>
-<li><strong>title</strong> (<em>str</em>) &#8211; title of the input box</li>
-<li><strong>message</strong> (<em>str</em>) &#8211; message to display above the input box</li>
-<li><strong>inputType(optional)</strong> (<em>str</em>) &#8211; type of input data, ie number or text</li>
-</ul>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="dialogCreateNFCBeamSlave">
-<code class="descname">dialogCreateNFCBeamSlave</code><span class="sig-paren">(</span><em>title</em>, <em>message</em><span class="sig-paren">)</span><a class="headerlink" href="#dialogCreateNFCBeamSlave" title="Permalink to this definition">¶</a></dt>
-<dd><p>Create a qpython beam slave</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>title</strong> (<em>str</em>) &#8211; title of the input box</li>
-<li><strong>message</strong> (<em>str</em>) &#8211; message to display above the input box</li>
-</ul>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-</div>
-<div class="section" id="progress">
-<h2>Progress<a class="headerlink" href="#progress" title="Permalink to this headline">¶</a></h2>
-<dl class="function">
-<dt id="dialogCreateSpinnerProgress">
-<code class="descname">dialogCreateSpinnerProgress</code><span class="sig-paren">(</span><em>message</em>, <em>maximumProgress</em><span class="sig-paren">)</span><a class="headerlink" href="#dialogCreateSpinnerProgress" title="Permalink to this definition">¶</a></dt>
-<dd><p>Create a spinner progress dialog</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>message(optional)</strong> (<em>str</em>) &#8211; message</li>
-<li><strong>maximunProgress(optional)</strong> (<em>int</em>) &#8211; dfault=100</li>
-</ul>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="dialogSetCurrentProgress">
-<code class="descname">dialogSetCurrentProgress</code><span class="sig-paren">(</span><em>current</em><span class="sig-paren">)</span><a class="headerlink" href="#dialogSetCurrentProgress" title="Permalink to this definition">¶</a></dt>
-<dd><p>Set progress dialog current value</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>current</strong> (<em>int</em>) &#8211; current</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="dialogSetMaxProgress">
-<code class="descname">dialogSetMaxProgress</code><span class="sig-paren">(</span><em>max</em><span class="sig-paren">)</span><a class="headerlink" href="#dialogSetMaxProgress" title="Permalink to this definition">¶</a></dt>
-<dd><p>Set progress dialog maximum value</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>max</strong> (<em>int</em>) &#8211; max</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="dialogCreateHorizontalProgress">
-<code class="descname">dialogCreateHorizontalProgress</code><span class="sig-paren">(</span><em>title</em>, <em>message</em>, <em>maximumProgress</em><span class="sig-paren">)</span><a class="headerlink" href="#dialogCreateHorizontalProgress" title="Permalink to this definition">¶</a></dt>
-<dd><p>Create a horizontal progress dialog</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>title(optional)</strong> (<em>str</em>) &#8211; title</li>
-<li><strong>message(optional)</strong> (<em>str</em>) &#8211; message</li>
-<li><strong>maximunProgress(optional)</strong> (<em>int</em>) &#8211; dfault=100</li>
-</ul>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-</div>
-<div class="section" id="alert">
-<h2>Alert<a class="headerlink" href="#alert" title="Permalink to this headline">¶</a></h2>
-<dl class="function">
-<dt id="dialogCreateAlert">
-<code class="descname">dialogCreateAlert</code><span class="sig-paren">(</span><em>title</em>, <em>message</em><span class="sig-paren">)</span><a class="headerlink" href="#dialogCreateAlert" title="Permalink to this definition">¶</a></dt>
-<dd><p>Create alert dialog</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>title(optional)</strong> (<em>str</em>) &#8211; title</li>
-<li><strong>message(optional)</strong> (<em>str</em>) &#8211; message</li>
-<li><strong>maximunProgress(optional)</strong> (<em>int</em>) &#8211; dfault=100</li>
-</ul>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-</div>
-<div class="section" id="dialog-control">
-<h2>Dialog Control<a class="headerlink" href="#dialog-control" title="Permalink to this headline">¶</a></h2>
-<dl class="function">
-<dt id="dialogSetPositiveButtonText">
-<code class="descname">dialogSetPositiveButtonText</code><span class="sig-paren">(</span><em>text</em><span class="sig-paren">)</span><a class="headerlink" href="#dialogSetPositiveButtonText" title="Permalink to this definition">¶</a></dt>
-<dd><p>Set alert dialog positive button text</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>text</strong> (<em>str</em>) &#8211; text</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="dialogSetNegativeButtonText">
-<code class="descname">dialogSetNegativeButtonText</code><span class="sig-paren">(</span><em>text</em><span class="sig-paren">)</span><a class="headerlink" href="#dialogSetNegativeButtonText" title="Permalink to this definition">¶</a></dt>
-<dd><p>Set alert dialog negative button text</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>text</strong> (<em>str</em>) &#8211; text</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="dialogSetNeutralButtonText">
-<code class="descname">dialogSetNeutralButtonText</code><span class="sig-paren">(</span><em>text</em><span class="sig-paren">)</span><a class="headerlink" href="#dialogSetNeutralButtonText" title="Permalink to this definition">¶</a></dt>
-<dd><p>Set alert dialog button text</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>text</strong> (<em>str</em>) &#8211; text</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="dialogSetItems">
-<code class="descname">dialogSetItems</code><span class="sig-paren">(</span><em>items</em><span class="sig-paren">)</span><a class="headerlink" href="#dialogSetItems" title="Permalink to this definition">¶</a></dt>
-<dd><p>Set alert dialog list items</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>items</strong> (<em>list</em>) &#8211; items</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="dialogSetSingleChoiceItems">
-<code class="descname">dialogSetSingleChoiceItems</code><span class="sig-paren">(</span><em>items</em>, <em>selected</em><span class="sig-paren">)</span><a class="headerlink" href="#dialogSetSingleChoiceItems" title="Permalink to this definition">¶</a></dt>
-<dd><p>Set alert dialog list items</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>items</strong> (<em>list</em>) &#8211; items</li>
-<li><strong>selected</strong> (<em>int</em>) &#8211; selected item index (default=0)</li>
-</ul>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="dialogSetMultiChoiceItems">
-<code class="descname">dialogSetMultiChoiceItems</code><span class="sig-paren">(</span><em>items</em>, <em>selected</em><span class="sig-paren">)</span><a class="headerlink" href="#dialogSetMultiChoiceItems" title="Permalink to this definition">¶</a></dt>
-<dd><p>Set dialog multiple choice items and selection</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>items</strong> (<em>list</em>) &#8211; items</li>
-<li><strong>selected</strong> (<em>int</em>) &#8211; selected item index (default=0)</li>
-</ul>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="addContextMenuItem">
-<code class="descname">addContextMenuItem</code><span class="sig-paren">(</span><em>label</em>, <em>event</em>, <em>eventData</em><span class="sig-paren">)</span><a class="headerlink" href="#addContextMenuItem" title="Permalink to this definition">¶</a></dt>
-<dd><p>Adds a new item to context menu</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>label</strong> (<em>str</em>) &#8211; label for this menu item</li>
-<li><strong>event</strong> (<em>str</em>) &#8211; event that will be generated on menu item click</li>
-<li><strong>eventData</strong> (<em>object</em>) &#8211; event object</li>
-</ul>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="addOptionsMenuItem">
-<code class="descname">addOptionsMenuItem</code><span class="sig-paren">(</span><em>label</em>, <em>event</em>, <em>eventData</em>, <em>iconName</em><span class="sig-paren">)</span><a class="headerlink" href="#addOptionsMenuItem" title="Permalink to this definition">¶</a></dt>
-<dd><p>Adds a new item to context menu</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>label</strong> (<em>str</em>) &#8211; label for this menu item</li>
-<li><strong>event</strong> (<em>str</em>) &#8211; event that will be generated on menu item click</li>
-<li><strong>eventData</strong> (<em>object</em>) &#8211; event object</li>
-<li><strong>iconName</strong> (<em>str</em>) &#8211; Android system menu icon, see <a class="reference external" href="http://developer.android.com/reference/android/R.drawable.html">http://developer.android.com/reference/android/R.drawable.html</a></li>
-</ul>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="dialogGetResponse">
-<code class="descname">dialogGetResponse</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#dialogGetResponse" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns dialog response</p>
-</dd></dl>
-<dl class="function">
-<dt id="dialogGetSelectedItems">
-<code class="descname">dialogGetSelectedItems</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#dialogGetSelectedItems" title="Permalink to this definition">¶</a></dt>
-<dd><p>This method provides list of items user selected</p>
-</dd></dl>
-<dl class="function">
-<dt id="dialogDismiss">
-<code class="descname">dialogDismiss</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#dialogDismiss" title="Permalink to this definition">¶</a></dt>
-<dd><p>Dismiss dialog</p>
-</dd></dl>
-<dl class="function">
-<dt id="dialogShow">
-<code class="descname">dialogShow</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#dialogShow" title="Permalink to this definition">¶</a></dt>
-<dd><p>Show dialog</p>
-</dd></dl>
-</div>
-<div class="section" id="layout">
-<h2>Layout<a class="headerlink" href="#layout" title="Permalink to this headline">¶</a></h2>
-<dl class="function">
-<dt id="fullShow">
-<code class="descname">fullShow</code><span class="sig-paren">(</span><em>layout</em><span class="sig-paren">)</span><a class="headerlink" href="#fullShow" title="Permalink to this definition">¶</a></dt>
-<dd><p>Show Full Screen</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>layout</strong> (<em>string</em>) &#8211; String containing View layout</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="fullDismiss">
-<code class="descname">fullDismiss</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#fullDismiss" title="Permalink to this definition">¶</a></dt>
-<dd><p>Dismiss Full Screen</p>
-</dd></dl>
-<dl class="function">
-<dt id="fullQuery">
-<code class="descname">fullQuery</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#fullQuery" title="Permalink to this definition">¶</a></dt>
-<dd><p>Get Fullscreen Properties</p>
-</dd></dl>
-<dl class="function">
-<dt id="fullQueryDetail">
-<code class="descname">fullQueryDetail</code><span class="sig-paren">(</span><em>id</em><span class="sig-paren">)</span><a class="headerlink" href="#fullQueryDetail" title="Permalink to this definition">¶</a></dt>
-<dd><p>Get fullscreen properties for a specific widget</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>id</strong> (<em>str</em>) &#8211; id of layout widget</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="fullSetProperty">
-<code class="descname">fullSetProperty</code><span class="sig-paren">(</span><em>id</em><span class="sig-paren">)</span><a class="headerlink" href="#fullSetProperty" title="Permalink to this definition">¶</a></dt>
-<dd><p>Set fullscreen widget property</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>id</strong> (<em>str</em>) &#8211; id of layout widget</li>
-<li><strong>property</strong> (<em>str</em>) &#8211; name of property to set</li>
-<li><strong>value</strong> (<em>str</em>) &#8211; value to set property to</li>
-</ul>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="fullSetList">
-<code class="descname">fullSetList</code><span class="sig-paren">(</span><em>id</em>, <em>list</em><span class="sig-paren">)</span><a class="headerlink" href="#fullSetList" title="Permalink to this definition">¶</a></dt>
-<dd><p>Attach a list to a fullscreen widget</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>id</strong> (<em>str</em>) &#8211; id of layout widget</li>
-<li><strong>list</strong> (<em>list</em>) &#8211; List to set</li>
-</ul>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="fullKeyOverride">
-<code class="descname">fullKeyOverride</code><span class="sig-paren">(</span><em>keycodes</em>, <em>enable</em><span class="sig-paren">)</span><a class="headerlink" href="#fullKeyOverride" title="Permalink to this definition">¶</a></dt>
-<dd><p>Override default key actions</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>keycodes</strong> (<em>str</em>) &#8211; id of layout widget</li>
-<li><strong>enable</strong> (<em>bool</em>) &#8211; List to set (default=true)</li>
-</ul>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-</div>
-<div class="section" id="webview">
-<h2>WebView<a class="headerlink" href="#webview" title="Permalink to this headline">¶</a></h2>
-<dl class="function">
-<dt id="webViewShow">
-<code class="descname">webViewShow</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#webViewShow" title="Permalink to this definition">¶</a></dt>
-<dd><p>Display a WebView with the given URL</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>url</strong> (<em>str</em>) &#8211; url</li>
-<li><strong>wait(optional)</strong> (<em>bool</em>) &#8211; block until the user exits the WebView</li>
-</ul>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-</div>
-</div>
-<div class="section" id="usb-host-serial-facade">
-<h1>USB Host Serial Facade<a class="headerlink" href="#usb-host-serial-facade" title="Permalink to this headline">¶</a></h1>
-<p><em>QPython 1.3.1+ and QPython3 1.0.3+ contains this feature</em></p>
-<p>SL4A Facade for USB Serial devices by Android USB Host API.</p>
-<p>It control the USB-Serial like devices
-from Andoroid which has USB Host Controller .</p>
-<p>The sample
-<a class="reference external" href="http://www.youtube.com/watch?v=EJ7qiGXaI74">demonstration is also available at youtube video</a></p>
-<div class="section" id="requirements">
-<h2>Requirements<a class="headerlink" href="#requirements" title="Permalink to this headline">¶</a></h2>
-<ul>
-<li><p class="first">Android device which has USB Host controller (and enabled in that firmware).</p>
-</li>
-<li><p class="first">Android 4.0 (API14) or later.</p>
-</li>
-<li><p class="first">USB Serial devices (see [Status](#Status)).</p>
-</li>
-<li><p class="first">USB Serial devices were not handled by Android kernel.</p>
-<p>&gt; I heard some android phone handle USB Serial devices
-&gt; make /dev/ttyUSB0 in kernel level.
-&gt; In this case, Android does not be able to handle the device
-&gt; from OS level.</p>
-<p>please check Android Applications be able to grab the target USB Devices,
-such as <a class="reference external" href="https://play.google.com/store/apps/details?id=aws.apps.usbDeviceEnumerator">USB Device Info</a>.</p>
-</li>
-</ul>
-</div>
-<div class="section" id="status">
-<h2>Status<a class="headerlink" href="#status" title="Permalink to this headline">¶</a></h2>
-<ul>
-<li><p class="first">probably work with USB CDC, like FTDI, Arduino or else.</p>
-</li>
-<li><p class="first">2012/09/10: work with 78K0F0730 device (new RL78) with Tragi BIOS board.</p>
-<p><a class="reference external" href="http://www.marutsu.co.jp/shohin_55296/">M78K0F0730</a></p>
-</li>
-<li><p class="first">2012/09/24: work with some pl2303 devcies.</p>
-</li>
-</ul>
-</div>
-<div class="section" id="author">
-<h2>Author<a class="headerlink" href="#author" title="Permalink to this headline">¶</a></h2>
-<p>This facade developped by <a class="reference external" href="https://bitbucket.org/kuri65536/usbhostserialfacade">Kuri65536</a>
-you can see the commit log in it.</p>
-</div>
-<div class="section" id="apis">
-<h2>APIs<a class="headerlink" href="#apis" title="Permalink to this headline">¶</a></h2>
-<dl class="function">
-<dt id="usbserialGetDeviceList">
-<code class="descname">usbserialGetDeviceList</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#usbserialGetDeviceList" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns USB devices reported by USB Host API.</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Returns:</th><td class="field-body">Returns &#8220;Map of id and string information Map&lt;String, String&gt;</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="usbserialDisconnect">
-<code class="descname">usbserialDisconnect</code><span class="sig-paren">(</span><em>connID</em><span class="sig-paren">)</span><a class="headerlink" href="#usbserialDisconnect" title="Permalink to this definition">¶</a></dt>
-<dd><p>Disconnect all USB-device</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>connID</strong> (<em>str</em>) &#8211; connection ID</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="usbserialActiveConnections">
-<code class="descname">usbserialActiveConnections</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#usbserialActiveConnections" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns active USB-device connections.</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Returns:</th><td class="field-body">Returns &#8220;Active USB-device connections by Map UUID vs device-name.&#8221;</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="usbserialWriteBinary">
-<code class="descname">usbserialWriteBinary</code><span class="sig-paren">(</span><em>base64</em>, <em>connID</em><span class="sig-paren">)</span><a class="headerlink" href="#usbserialWriteBinary" title="Permalink to this definition">¶</a></dt>
-<dd><p>Send bytes over the currently open USB Serial connection.</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>base64</strong> (<em>str</em>) &#8211; </li>
-<li><strong>connId</strong> (<em>str</em>) &#8211; </li>
-</ul>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="usbserialReadBinary">
-<code class="descname">usbserialReadBinary</code><span class="sig-paren">(</span><em>bufferSize</em>, <em>connID</em><span class="sig-paren">)</span><a class="headerlink" href="#usbserialReadBinary" title="Permalink to this definition">¶</a></dt>
-<dd><p>Read up to bufferSize bytes and return a chunked, base64 encoded string</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>bufferSize</strong> (<em>int</em>) &#8211; </li>
-<li><strong>connId</strong> (<em>str</em>) &#8211; </li>
-</ul>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="usbserialConnect">
-<code class="descname">usbserialConnect</code><span class="sig-paren">(</span><em>hash</em>, <em>options</em><span class="sig-paren">)</span><a class="headerlink" href="#usbserialConnect" title="Permalink to this definition">¶</a></dt>
-<dd><p>Connect to a device with USB-Host. request the connection and exit</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first simple">
-<li><strong>hash</strong> (<em>str</em>) &#8211; </li>
-<li><strong>options</strong> (<em>str</em>) &#8211; </li>
-</ul>
-</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Returns:</th><td class="field-body"><p class="first last">Returns messages the request status</p>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="usbserialHostEnable">
-<code class="descname">usbserialHostEnable</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#usbserialHostEnable" title="Permalink to this definition">¶</a></dt>
-<dd><p>Requests that the host be enable for USB Serial connections.</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Returns:</th><td class="field-body">True if the USB Device is accesible</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="usbserialWrite">
-<code class="descname">usbserialWrite</code><span class="sig-paren">(</span><em>String ascii</em>, <em>String connID</em><span class="sig-paren">)</span><a class="headerlink" href="#usbserialWrite" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sends ASCII characters over the currently open USB Serial connection</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>ascii</strong> (<em>str</em>) &#8211; </li>
-<li><strong>connID</strong> (<em>str</em>) &#8211; </li>
-</ul>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="usbserialReadReady">
-<code class="descname">usbserialReadReady</code><span class="sig-paren">(</span><em>connID</em><span class="sig-paren">)</span><a class="headerlink" href="#usbserialReadReady" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>connID</strong> (<em>str</em>) &#8211; </td>
-</tr>
-<tr class="field-even field"><th class="field-name">Returns:</th><td class="field-body">True if the next read is guaranteed not to block</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="usbserialRead">
-<code class="descname">usbserialRead</code><span class="sig-paren">(</span><em>connID</em>, <em>bufferSize</em><span class="sig-paren">)</span><a class="headerlink" href="#usbserialRead" title="Permalink to this definition">¶</a></dt>
-<dd><p>Read up to bufferSize ASCII characters.</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>connID</strong> (<em>str</em>) &#8211; </li>
-<li><strong>bufferSize</strong> (<em>int</em>) &#8211; </li>
-</ul>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-<dl class="function">
-<dt id="usbserialGetDeviceName">
-<code class="descname">usbserialGetDeviceName</code><span class="sig-paren">(</span><em>connID</em><span class="sig-paren">)</span><a class="headerlink" href="#usbserialGetDeviceName" title="Permalink to this definition">¶</a></dt>
-<dd><p>Queries a remote device for it&#8217;s name or null if it can&#8217;t be resolved</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>connID</strong> (<em>str</em>) &#8211; </td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-</div>
-</div>
-</div>
-</div>
-</div>
-</div>
-<div class="fb-comments" data-href="http://qpython.org" data-numposts="10"></div>
-</div>
-</div>
-<div class="col-sm-2"></div>
-</div>
-<footer id="footer">
-<div class="col-sm-offset-2 col-sm-6 footer-div1">
-<div class="footer-block-item">
-<span class="footer-item1">Built with Sphinx using a theme provid by QPython.</span>
-<span class="footer-item2 visible-xs">
-&#169; Copyright 2017, QPython.
-</span>
-</div>
-</div>
-<div class="col-sm-2 footer-div2">
-<a href="/index.html" class="pull-right"><img src="../static/img_logo.png"></a>
-</div>
-</footer>
-<script type="text/javascript">
-$('.fb-comments').attr('data-href', (window.location.href.split('#')[0]).split('?')[0])
-(function(d, s, id) {
-var js, fjs = d.getElementsByTagName(s)[0];
-if (d.getElementById(id)) return;
-js = d.createElement(s); js.id = id;
-js.src = "//connect.facebook.net/en_US/sdk.js#xfbml=1&version=v2.8&appId=1680815145503311";
-fjs.parentNode.insertBefore(js, fjs);
-}(document, 'script', 'facebook-jssdk'));
-$(function(){
-if ($('#footer')[0].offsetTop < $(window).height()){
-$('#footer').addClass('to-bottom')
-}
-})
-</script>
-</body>
-</html>
diff --git a/docs/en/guide_contributors.html b/docs/en/guide_contributors.html
deleted file mode 100644
index b885560f..00000000
--- a/docs/en/guide_contributors.html
+++ /dev/null
@@ -1,202 +0,0 @@
-<!DOCTYPE html>
-<html>
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>Welcome contribute &mdash; QPython 0.9 documentation</title>
-<link rel="stylesheet" href="../static/qpython_theme.css" type="text/css" />
-<link rel="stylesheet" href="../static/pygments.css" type="text/css" />
-<script type="text/javascript">
-var DOCUMENTATION_OPTIONS = {
-URL_ROOT:    '../',
-VERSION:     '0.9',
-COLLAPSE_INDEX: false,
-FILE_SUFFIX: '.html',
-HAS_SOURCE:  true
-};
-</script>
-<script type="text/javascript" src="../static/jquery.js"></script>
-<script type="text/javascript" src="../static/underscore.js"></script>
-<script type="text/javascript" src="../static/doctools.js"></script>
-<link rel="top" title="QPython 0.9 documentation" href="../document.html" />
-<link rel="up" title="Getting started" href="guide.html" />
-<link rel="next" title="Join the tester community" href="guide_contributors_test.html" />
-<link rel="prev" title="Android" href="guide_developers.html" />
-<meta charset="UTF-8">
-<link href="http://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet">
-<script src="http://cdn.bootcss.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
-<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
-</head>
-<body role="document">
-<div class="header doc-header">
-<div class="col-lg-offset-2 col-lg-8 col-md-offset-2 col-md-8 col-sm-offset-2 col-sm-8  index-header">
-<div class="navbar-header">
-<button type="button" class="navbar-toggle" data-toggle="collapse"
-data-target="#example-navbar-collapse">
-<span class="sr-only">切换导航</span>
-<span class="icon-bar"></span>
-<span class="icon-bar"></span>
-<span class="icon-bar"></span>
-</button>
-<a href="/index.html" class="logo"><img src="../static/img_logo.png"></a>
-</div>
-<ul class="header-title hidden-xs">
-<li class="header-phone-selected">
-<a href="/index.html">Home</a>
-</li>
-<li>
-<a href="/document.html" class="header-selected">Guide</a>
-<span class="header-title-selected"></span>
-</li>
-<li>
-<a target="_blank" href="https://github.com/qpython-android/qpython">Github</a>
-</li>
-</ul>
-<div class="search-box hidden-xs">
-<form action="../search.html">
-<input type="search" name="q" placeholder="keyword">
-<input type="hidden" name="check_keywords" value="yes" />
-<input type="hidden" name="area" value="default" />
-<button><img src="../static/ic_search.png"></button>
-</form>
-</div>
-</div>
-</div>
-<div class="row doc-content">
-<div class="content-main col-sm-offset-2 col-sm-8">
-<div class="content-wrapper col-sm-4">
-<div class="left-menu">
-<div class="doc-title hidden-xs">QPthon</div>
-<div class="sidebar  collapse navbar-collapse"  id="example-navbar-collapse">
-<ul class="current">
-<li class="toctree-l1"><a class="reference internal" href="guide.html">Getting started</a></li>
-<li class="toctree-l1"><a class="reference internal" href="guide.html#programming-guide">Programming Guide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="guide.html#developers-guide">Developers&#8217; Guide</a></li>
-<li class="toctree-l1 current"><a class="reference internal" href="guide.html#contributors-guide">Contributors&#8217; Guide</a><ul class="current">
-<li class="toctree-l2 current"><a class="current reference internal" href="#">Welcome contribute</a></li>
-<li class="toctree-l2"><a class="reference internal" href="#how-to-help-with-test">How to help with test</a><ul>
-<li class="toctree-l3"><a class="reference internal" href="guide_contributors_test.html">Join the tester community</a></li>
-<li class="toctree-l3"><a class="reference internal" href="guide_contributors_test.html#become-a-tester">Become a tester</a></li>
-<li class="toctree-l3"><a class="reference internal" href="guide_contributors_test.html#report-or-suggest">Report or suggest</a></li>
-<li class="toctree-l3"><a class="reference internal" href="guide_contributors_test.html#feedback">Feedback</a></li>
-</ul>
-</li>
-<li class="toctree-l2"><a class="reference internal" href="#how-to-contribute-documentation">How to contribute documentation</a></li>
-<li class="toctree-l2"><a class="reference internal" href="#how-to-translate">How to translate</a></li>
-<li class="toctree-l2"><a class="reference internal" href="#how-to-launch-a-local-qpython-users-community">How to launch a local QPython users community</a><ul>
-<li class="toctree-l3"><a class="reference internal" href="#how-to-organise-a-local-qpython-user-sharing-event">How to organise a local qpython user sharing event</a></li>
-</ul>
-</li>
-<li class="toctree-l2"><a class="reference internal" href="#how-to-became-the-developer-member">How to became the developer member</a><ul>
-<li class="toctree-l3"><a class="reference internal" href="#how-to-develop-qpython-built-in-programs">How to develop qpython built-in programs</a></li>
-</ul>
-</li>
-<li class="toctree-l2"><a class="reference internal" href="#how-to-sponsor-qpython-project">How to sponsor QPython project</a></li>
-</ul>
-</li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="faq.html">FAQ</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../zhindex.html">中文用户向导</a></li>
-</ul>
-<div class="search-phone visible-xs">
-<form action="../search.html">
-<input type="search" name="q" placeholder="keyword">
-<input type="hidden" name="check_keywords" value="yes" />
-<input type="hidden" name="area" value="default" />
-<button><img src="../static/ic_search.png"></button>
-</form>
-</div>
-</div>
-</div>
-</div>
-<div class="content col-sm-8">
-<div class="document">
-<ul class="crumbs">
-<li><a href="../document.html">Guide</a> &raquo;</li>
-<li><a href="guide.html">Getting started</a> &raquo;</li>
-<li>Welcome contribute</li>
-</ul>
-<div class="documentwrapper">
-<div class="bodywrapper">
-<div class="body" role="main">
-<div class="section" id="welcome-contribute">
-<h1>Welcome contribute<a class="headerlink" href="#welcome-contribute" title="Permalink to this headline">¶</a></h1>
-<p>Thanks for supporting this project, QPython is a greate project, and we hope you join us to help with make it more greater.</p>
-<p>Please send email to us(support at qpython.org) to introduce youself briefly, and which part do you want to contribute.</p>
-<p>Then we will consider to invite you to join the qpython-collaborator group.</p>
-</div>
-<div class="section" id="how-to-help-with-test">
-<h1>How to help with test<a class="headerlink" href="#how-to-help-with-test" title="Permalink to this headline">¶</a></h1>
-<div class="toctree-wrapper compound">
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="guide_contributors_test.html">Join the tester community</a></li>
-<li class="toctree-l1"><a class="reference internal" href="guide_contributors_test.html#become-a-tester">Become a tester</a></li>
-<li class="toctree-l1"><a class="reference internal" href="guide_contributors_test.html#report-or-suggest">Report or suggest</a></li>
-<li class="toctree-l1"><a class="reference internal" href="guide_contributors_test.html#feedback">Feedback</a></li>
-</ul>
-</div>
-</div>
-<div class="section" id="how-to-contribute-documentation">
-<h1>How to contribute documentation<a class="headerlink" href="#how-to-contribute-documentation" title="Permalink to this headline">¶</a></h1>
-</div>
-<div class="section" id="how-to-translate">
-<h1>How to translate<a class="headerlink" href="#how-to-translate" title="Permalink to this headline">¶</a></h1>
-</div>
-<div class="section" id="how-to-launch-a-local-qpython-users-community">
-<h1>How to launch a local QPython users community<a class="headerlink" href="#how-to-launch-a-local-qpython-users-community" title="Permalink to this headline">¶</a></h1>
-<div class="section" id="how-to-organise-a-local-qpython-user-sharing-event">
-<h2>How to organise a local qpython user sharing event<a class="headerlink" href="#how-to-organise-a-local-qpython-user-sharing-event" title="Permalink to this headline">¶</a></h2>
-</div>
-</div>
-<div class="section" id="how-to-became-the-developer-member">
-<h1>How to became the developer member<a class="headerlink" href="#how-to-became-the-developer-member" title="Permalink to this headline">¶</a></h1>
-<div class="section" id="how-to-develop-qpython-built-in-programs">
-<h2>How to develop qpython built-in programs<a class="headerlink" href="#how-to-develop-qpython-built-in-programs" title="Permalink to this headline">¶</a></h2>
-</div>
-</div>
-<div class="section" id="how-to-sponsor-qpython-project">
-<h1>How to sponsor QPython project<a class="headerlink" href="#how-to-sponsor-qpython-project" title="Permalink to this headline">¶</a></h1>
-<p>More detail coming soon...</p>
-</div>
-</div>
-</div>
-</div>
-</div>
-<div class="fb-comments" data-href="http://qpython.org" data-numposts="10"></div>
-</div>
-</div>
-<div class="col-sm-2"></div>
-</div>
-<footer id="footer">
-<div class="col-sm-offset-2 col-sm-6 footer-div1">
-<div class="footer-block-item">
-<span class="footer-item1">Built with Sphinx using a theme provid by QPython.</span>
-<span class="footer-item2 visible-xs">
-&#169; Copyright 2017, QPython.
-</span>
-</div>
-</div>
-<div class="col-sm-2 footer-div2">
-<a href="/index.html" class="pull-right"><img src="../static/img_logo.png"></a>
-</div>
-</footer>
-<script type="text/javascript">
-$('.fb-comments').attr('data-href', (window.location.href.split('#')[0]).split('?')[0])
-(function(d, s, id) {
-var js, fjs = d.getElementsByTagName(s)[0];
-if (d.getElementById(id)) return;
-js = d.createElement(s); js.id = id;
-js.src = "//connect.facebook.net/en_US/sdk.js#xfbml=1&version=v2.8&appId=1680815145503311";
-fjs.parentNode.insertBefore(js, fjs);
-}(document, 'script', 'facebook-jssdk'));
-$(function(){
-if ($('#footer')[0].offsetTop < $(window).height()){
-$('#footer').addClass('to-bottom')
-}
-})
-</script>
-</body>
-</html>
diff --git a/docs/en/guide_contributors_test.html b/docs/en/guide_contributors_test.html
deleted file mode 100644
index 4bc3ab39..00000000
--- a/docs/en/guide_contributors_test.html
+++ /dev/null
@@ -1,182 +0,0 @@
-<!DOCTYPE html>
-<html>
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>Join the tester community &mdash; QPython 0.9 documentation</title>
-<link rel="stylesheet" href="../static/qpython_theme.css" type="text/css" />
-<link rel="stylesheet" href="../static/pygments.css" type="text/css" />
-<script type="text/javascript">
-var DOCUMENTATION_OPTIONS = {
-URL_ROOT:    '../',
-VERSION:     '0.9',
-COLLAPSE_INDEX: false,
-FILE_SUFFIX: '.html',
-HAS_SOURCE:  true
-};
-</script>
-<script type="text/javascript" src="../static/jquery.js"></script>
-<script type="text/javascript" src="../static/underscore.js"></script>
-<script type="text/javascript" src="../static/doctools.js"></script>
-<link rel="top" title="QPython 0.9 documentation" href="../document.html" />
-<link rel="up" title="Welcome contribute" href="guide_contributors.html" />
-<link rel="next" title="FAQ" href="faq.html" />
-<link rel="prev" title="Welcome contribute" href="guide_contributors.html" />
-<meta charset="UTF-8">
-<link href="http://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet">
-<script src="http://cdn.bootcss.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
-<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
-</head>
-<body role="document">
-<div class="header doc-header">
-<div class="col-lg-offset-2 col-lg-8 col-md-offset-2 col-md-8 col-sm-offset-2 col-sm-8  index-header">
-<div class="navbar-header">
-<button type="button" class="navbar-toggle" data-toggle="collapse"
-data-target="#example-navbar-collapse">
-<span class="sr-only">切换导航</span>
-<span class="icon-bar"></span>
-<span class="icon-bar"></span>
-<span class="icon-bar"></span>
-</button>
-<a href="/index.html" class="logo"><img src="../static/img_logo.png"></a>
-</div>
-<ul class="header-title hidden-xs">
-<li class="header-phone-selected">
-<a href="/index.html">Home</a>
-</li>
-<li>
-<a href="/document.html" class="header-selected">Guide</a>
-<span class="header-title-selected"></span>
-</li>
-<li>
-<a target="_blank" href="https://github.com/qpython-android/qpython">Github</a>
-</li>
-</ul>
-<div class="search-box hidden-xs">
-<form action="../search.html">
-<input type="search" name="q" placeholder="keyword">
-<input type="hidden" name="check_keywords" value="yes" />
-<input type="hidden" name="area" value="default" />
-<button><img src="../static/ic_search.png"></button>
-</form>
-</div>
-</div>
-</div>
-<div class="row doc-content">
-<div class="content-main col-sm-offset-2 col-sm-8">
-<div class="content-wrapper col-sm-4">
-<div class="left-menu">
-<div class="doc-title hidden-xs">QPthon</div>
-<div class="sidebar  collapse navbar-collapse"  id="example-navbar-collapse">
-<ul class="current">
-<li class="toctree-l1"><a class="reference internal" href="guide.html">Getting started</a></li>
-<li class="toctree-l1"><a class="reference internal" href="guide.html#programming-guide">Programming Guide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="guide.html#developers-guide">Developers&#8217; Guide</a></li>
-<li class="toctree-l1 current"><a class="reference internal" href="guide.html#contributors-guide">Contributors&#8217; Guide</a><ul class="current">
-<li class="toctree-l2"><a class="reference internal" href="guide_contributors.html">Welcome contribute</a></li>
-<li class="toctree-l2 current"><a class="reference internal" href="guide_contributors.html#how-to-help-with-test">How to help with test</a><ul class="current">
-<li class="toctree-l3 current"><a class="current reference internal" href="#">Join the tester community</a></li>
-<li class="toctree-l3"><a class="reference internal" href="#become-a-tester">Become a tester</a></li>
-<li class="toctree-l3"><a class="reference internal" href="#report-or-suggest">Report or suggest</a></li>
-<li class="toctree-l3"><a class="reference internal" href="#feedback">Feedback</a></li>
-</ul>
-</li>
-<li class="toctree-l2"><a class="reference internal" href="guide_contributors.html#how-to-contribute-documentation">How to contribute documentation</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_contributors.html#how-to-translate">How to translate</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_contributors.html#how-to-launch-a-local-qpython-users-community">How to launch a local QPython users community</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_contributors.html#how-to-became-the-developer-member">How to became the developer member</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_contributors.html#how-to-sponsor-qpython-project">How to sponsor QPython project</a></li>
-</ul>
-</li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="faq.html">FAQ</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../zhindex.html">中文用户向导</a></li>
-</ul>
-<div class="search-phone visible-xs">
-<form action="../search.html">
-<input type="search" name="q" placeholder="keyword">
-<input type="hidden" name="check_keywords" value="yes" />
-<input type="hidden" name="area" value="default" />
-<button><img src="../static/ic_search.png"></button>
-</form>
-</div>
-</div>
-</div>
-</div>
-<div class="content col-sm-8">
-<div class="document">
-<ul class="crumbs">
-<li><a href="../document.html">Guide</a> &raquo;</li>
-<li><a href="guide.html">Getting started</a> &raquo;</li>
-<li><a href="guide_contributors.html">Welcome contribute</a> &raquo;</li>
-<li>Join the tester community</li>
-</ul>
-<div class="documentwrapper">
-<div class="bodywrapper">
-<div class="body" role="main">
-<p>QPython is keeping develop!
-If you are interested about what we are doing and want to make some contribution, follow this guide to make this project better!</p>
-<div class="section" id="join-the-tester-community">
-<h1>Join the tester community<a class="headerlink" href="#join-the-tester-community" title="Permalink to this headline">¶</a></h1>
-<p>We create a G+ community where you could report bugs or offer suggestions -&gt; <a class="reference external" href="https://plus.google.com/communities/111759148772865961493">QPython tester G+ community(For QPython testers)</a></p>
-<p>Join us now!</p>
-<a class="reference internal image-reference" href="../images/1.png"><img alt="../images/1.png" src="../images/1.png" style="width: 361.5px; height: 687.5px;" /></a>
-</div>
-<div class="section" id="become-a-tester">
-<h1>Become a tester<a class="headerlink" href="#become-a-tester" title="Permalink to this headline">¶</a></h1>
-<p>After join the tester community, you could become a tester!
-Click this and become a tester -&gt;  <a class="reference external" href="https://play.google.com/apps/testing/org.qpython.qpy">I&#8217;m ready for test</a></p>
-<img alt="../images/2.png" src="../images/2.png" />
-</div>
-<div class="section" id="report-or-suggest">
-<h1>Report or suggest<a class="headerlink" href="#report-or-suggest" title="Permalink to this headline">¶</a></h1>
-<p>If you find out any bugs or have any cool idea about QPython, please let us know about it.
-You could write down your suggestion or bug report on the community.</p>
-<img alt="../images/3.png" src="../images/3.png" />
-</div>
-<div class="section" id="feedback">
-<h1>Feedback<a class="headerlink" href="#feedback" title="Permalink to this headline">¶</a></h1>
-<p>Send your feedback to QPython using the contact information: <a class="reference external" href="mailto:support&#37;&#52;&#48;qptyhon&#46;org">support<span>&#64;</span>qptyhon<span>&#46;</span>org</a></p>
-</div>
-</div>
-</div>
-</div>
-</div>
-<div class="fb-comments" data-href="http://qpython.org" data-numposts="10"></div>
-</div>
-</div>
-<div class="col-sm-2"></div>
-</div>
-<footer id="footer">
-<div class="col-sm-offset-2 col-sm-6 footer-div1">
-<div class="footer-block-item">
-<span class="footer-item1">Built with Sphinx using a theme provid by QPython.</span>
-<span class="footer-item2 visible-xs">
-&#169; Copyright 2017, QPython.
-</span>
-</div>
-</div>
-<div class="col-sm-2 footer-div2">
-<a href="/index.html" class="pull-right"><img src="../static/img_logo.png"></a>
-</div>
-</footer>
-<script type="text/javascript">
-$('.fb-comments').attr('data-href', (window.location.href.split('#')[0]).split('?')[0])
-(function(d, s, id) {
-var js, fjs = d.getElementsByTagName(s)[0];
-if (d.getElementById(id)) return;
-js = d.createElement(s); js.id = id;
-js.src = "//connect.facebook.net/en_US/sdk.js#xfbml=1&version=v2.8&appId=1680815145503311";
-fjs.parentNode.insertBefore(js, fjs);
-}(document, 'script', 'facebook-jssdk'));
-$(function(){
-if ($('#footer')[0].offsetTop < $(window).height()){
-$('#footer').addClass('to-bottom')
-}
-})
-</script>
-</body>
-</html>
diff --git a/docs/en/guide_developers.html b/docs/en/guide_developers.html
deleted file mode 100644
index 4b59144f..00000000
--- a/docs/en/guide_developers.html
+++ /dev/null
@@ -1,235 +0,0 @@
-<!DOCTYPE html>
-<html>
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>Android &mdash; QPython 0.9 documentation</title>
-<link rel="stylesheet" href="../static/qpython_theme.css" type="text/css" />
-<link rel="stylesheet" href="../static/pygments.css" type="text/css" />
-<script type="text/javascript">
-var DOCUMENTATION_OPTIONS = {
-URL_ROOT:    '../',
-VERSION:     '0.9',
-COLLAPSE_INDEX: false,
-FILE_SUFFIX: '.html',
-HAS_SOURCE:  true
-};
-</script>
-<script type="text/javascript" src="../static/jquery.js"></script>
-<script type="text/javascript" src="../static/underscore.js"></script>
-<script type="text/javascript" src="../static/doctools.js"></script>
-<link rel="top" title="QPython 0.9 documentation" href="../document.html" />
-<link rel="up" title="Getting started" href="guide.html" />
-<link rel="next" title="Welcome contribute" href="guide_contributors.html" />
-<link rel="prev" title="QPython Open API" href="guide_extend.html" />
-<meta charset="UTF-8">
-<link href="http://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet">
-<script src="http://cdn.bootcss.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
-<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
-</head>
-<body role="document">
-<div class="header doc-header">
-<div class="col-lg-offset-2 col-lg-8 col-md-offset-2 col-md-8 col-sm-offset-2 col-sm-8  index-header">
-<div class="navbar-header">
-<button type="button" class="navbar-toggle" data-toggle="collapse"
-data-target="#example-navbar-collapse">
-<span class="sr-only">切换导航</span>
-<span class="icon-bar"></span>
-<span class="icon-bar"></span>
-<span class="icon-bar"></span>
-</button>
-<a href="/index.html" class="logo"><img src="../static/img_logo.png"></a>
-</div>
-<ul class="header-title hidden-xs">
-<li class="header-phone-selected">
-<a href="/index.html">Home</a>
-</li>
-<li>
-<a href="/document.html" class="header-selected">Guide</a>
-<span class="header-title-selected"></span>
-</li>
-<li>
-<a target="_blank" href="https://github.com/qpython-android/qpython">Github</a>
-</li>
-</ul>
-<div class="search-box hidden-xs">
-<form action="../search.html">
-<input type="search" name="q" placeholder="keyword">
-<input type="hidden" name="check_keywords" value="yes" />
-<input type="hidden" name="area" value="default" />
-<button><img src="../static/ic_search.png"></button>
-</form>
-</div>
-</div>
-</div>
-<div class="row doc-content">
-<div class="content-main col-sm-offset-2 col-sm-8">
-<div class="content-wrapper col-sm-4">
-<div class="left-menu">
-<div class="doc-title hidden-xs">QPthon</div>
-<div class="sidebar  collapse navbar-collapse"  id="example-navbar-collapse">
-<ul class="current">
-<li class="toctree-l1"><a class="reference internal" href="guide.html">Getting started</a></li>
-<li class="toctree-l1"><a class="reference internal" href="guide.html#programming-guide">Programming Guide</a></li>
-<li class="toctree-l1 current"><a class="reference internal" href="guide.html#developers-guide">Developers&#8217; Guide</a><ul class="current">
-<li class="toctree-l2 current"><a class="current reference internal" href="#">Android</a><ul>
-<li class="toctree-l3"><a class="reference internal" href="#console">Console</a></li>
-<li class="toctree-l3"><a class="reference internal" href="#editor">Editor</a></li>
-<li class="toctree-l3"><a class="reference internal" href="#file-browsing">File browsing</a></li>
-<li class="toctree-l3"><a class="reference internal" href="#qrcode-reader">QRCode reader</a></li>
-</ul>
-</li>
-<li class="toctree-l2"><a class="reference internal" href="#qsl4a">QSL4A</a></li>
-<li class="toctree-l2"><a class="reference internal" href="#qpython-core">QPython Core</a><ul>
-<li class="toctree-l3"><a class="reference internal" href="#python-2-x">Python 2.x</a></li>
-<li class="toctree-l3"><a class="reference internal" href="#python-3-x">Python 3.x</a></li>
-<li class="toctree-l3"><a class="reference internal" href="#console-program">Console program</a></li>
-<li class="toctree-l3"><a class="reference internal" href="#kivy-program">Kivy program</a></li>
-<li class="toctree-l3"><a class="reference internal" href="#webapp-program">WebApp program</a></li>
-</ul>
-</li>
-<li class="toctree-l2"><a class="reference internal" href="#pip-and-libraries">Pip and libraries</a><ul>
-<li class="toctree-l3"><a class="reference internal" href="#pip">Pip</a></li>
-<li class="toctree-l3"><a class="reference internal" href="#libraries">Libraries</a></li>
-</ul>
-</li>
-<li class="toctree-l2"><a class="reference internal" href="#quick-tools">Quick tools</a><ul>
-<li class="toctree-l3"><a class="reference internal" href="#qpython-api">QPython API</a></li>
-<li class="toctree-l3"><a class="reference internal" href="#ftp">FTP</a></li>
-</ul>
-</li>
-<li class="toctree-l2"><a class="reference internal" href="#qpy-io-enterprise-service">QPY.IO (Enterprise service)</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="guide.html#contributors-guide">Contributors&#8217; Guide</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="faq.html">FAQ</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../zhindex.html">中文用户向导</a></li>
-</ul>
-<div class="search-phone visible-xs">
-<form action="../search.html">
-<input type="search" name="q" placeholder="keyword">
-<input type="hidden" name="check_keywords" value="yes" />
-<input type="hidden" name="area" value="default" />
-<button><img src="../static/ic_search.png"></button>
-</form>
-</div>
-</div>
-</div>
-</div>
-<div class="content col-sm-8">
-<div class="document">
-<ul class="crumbs">
-<li><a href="../document.html">Guide</a> &raquo;</li>
-<li><a href="guide.html">Getting started</a> &raquo;</li>
-<li>Android</li>
-</ul>
-<div class="documentwrapper">
-<div class="bodywrapper">
-<div class="body" role="main">
-<div class="section" id="android">
-<h1>Android<a class="headerlink" href="#android" title="Permalink to this headline">¶</a></h1>
-<p>Android part offers the common Python user interaction functions, like console, editor, file browsing, QRCode reader etc.</p>
-<div class="section" id="console">
-<h2>Console<a class="headerlink" href="#console" title="Permalink to this headline">¶</a></h2>
-</div>
-<div class="section" id="editor">
-<h2>Editor<a class="headerlink" href="#editor" title="Permalink to this headline">¶</a></h2>
-</div>
-<div class="section" id="file-browsing">
-<h2>File browsing<a class="headerlink" href="#file-browsing" title="Permalink to this headline">¶</a></h2>
-</div>
-<div class="section" id="qrcode-reader">
-<h2>QRCode reader<a class="headerlink" href="#qrcode-reader" title="Permalink to this headline">¶</a></h2>
-</div>
-</div>
-<div class="section" id="qsl4a">
-<h1>QSL4A<a class="headerlink" href="#qsl4a" title="Permalink to this headline">¶</a></h1>
-<p>QSL4A is the folk of SL4A for QPython, which allows users being able to program with Python script for android.</p>
-</div>
-<div class="section" id="qpython-core">
-<h1>QPython Core<a class="headerlink" href="#qpython-core" title="Permalink to this headline">¶</a></h1>
-<p>Besides Python core, QPython core offer three types programming mode also.</p>
-<div class="section" id="python-2-x">
-<h2>Python 2.x<a class="headerlink" href="#python-2-x" title="Permalink to this headline">¶</a></h2>
-</div>
-<div class="section" id="python-3-x">
-<h2>Python 3.x<a class="headerlink" href="#python-3-x" title="Permalink to this headline">¶</a></h2>
-</div>
-<div class="section" id="console-program">
-<h2>Console program<a class="headerlink" href="#console-program" title="Permalink to this headline">¶</a></h2>
-</div>
-<div class="section" id="kivy-program">
-<h2>Kivy program<a class="headerlink" href="#kivy-program" title="Permalink to this headline">¶</a></h2>
-</div>
-<div class="section" id="webapp-program">
-<h2>WebApp program<a class="headerlink" href="#webapp-program" title="Permalink to this headline">¶</a></h2>
-</div>
-</div>
-<div class="section" id="pip-and-libraries">
-<h1>Pip and libraries<a class="headerlink" href="#pip-and-libraries" title="Permalink to this headline">¶</a></h1>
-<p>Pip and libraries offer great expansion ability for QPython.</p>
-<div class="section" id="pip">
-<h2>Pip<a class="headerlink" href="#pip" title="Permalink to this headline">¶</a></h2>
-</div>
-<div class="section" id="libraries">
-<h2>Libraries<a class="headerlink" href="#libraries" title="Permalink to this headline">¶</a></h2>
-</div>
-</div>
-<div class="section" id="quick-tools">
-<h1>Quick tools<a class="headerlink" href="#quick-tools" title="Permalink to this headline">¶</a></h1>
-<p>Quick tools offers better guide for using QPython well for different users.</p>
-<div class="section" id="qpython-api">
-<h2>QPython API<a class="headerlink" href="#qpython-api" title="Permalink to this headline">¶</a></h2>
-</div>
-<div class="section" id="ftp">
-<h2>FTP<a class="headerlink" href="#ftp" title="Permalink to this headline">¶</a></h2>
-</div>
-</div>
-<div class="section" id="qpy-io-enterprise-service">
-<h1>QPY.IO (Enterprise service)<a class="headerlink" href="#qpy-io-enterprise-service" title="Permalink to this headline">¶</a></h1>
-<p>It&#8217;s a enterprise service which aim at offering quick android development delivery with QPython.</p>
-<p>It&#8217;s QPython&#8217;s maintainers&#8217; main paid service, but not a opensource project.</p>
-</div>
-</div>
-</div>
-</div>
-</div>
-<div class="fb-comments" data-href="http://qpython.org" data-numposts="10"></div>
-</div>
-</div>
-<div class="col-sm-2"></div>
-</div>
-<footer id="footer">
-<div class="col-sm-offset-2 col-sm-6 footer-div1">
-<div class="footer-block-item">
-<span class="footer-item1">Built with Sphinx using a theme provid by QPython.</span>
-<span class="footer-item2 visible-xs">
-&#169; Copyright 2017, QPython.
-</span>
-</div>
-</div>
-<div class="col-sm-2 footer-div2">
-<a href="/index.html" class="pull-right"><img src="../static/img_logo.png"></a>
-</div>
-</footer>
-<script type="text/javascript">
-$('.fb-comments').attr('data-href', (window.location.href.split('#')[0]).split('?')[0])
-(function(d, s, id) {
-var js, fjs = d.getElementsByTagName(s)[0];
-if (d.getElementById(id)) return;
-js = d.createElement(s); js.id = id;
-js.src = "//connect.facebook.net/en_US/sdk.js#xfbml=1&version=v2.8&appId=1680815145503311";
-fjs.parentNode.insertBefore(js, fjs);
-}(document, 'script', 'facebook-jssdk'));
-$(function(){
-if ($('#footer')[0].offsetTop < $(window).height()){
-$('#footer').addClass('to-bottom')
-}
-})
-</script>
-</body>
-</html>
diff --git a/docs/en/guide_extend.html b/docs/en/guide_extend.html
deleted file mode 100644
index a9d40183..00000000
--- a/docs/en/guide_extend.html
+++ /dev/null
@@ -1,264 +0,0 @@
-<!DOCTYPE html>
-<html>
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>QPython Open API &mdash; QPython 0.9 documentation</title>
-<link rel="stylesheet" href="../static/qpython_theme.css" type="text/css" />
-<link rel="stylesheet" href="../static/pygments.css" type="text/css" />
-<script type="text/javascript">
-var DOCUMENTATION_OPTIONS = {
-URL_ROOT:    '../',
-VERSION:     '0.9',
-COLLAPSE_INDEX: false,
-FILE_SUFFIX: '.html',
-HAS_SOURCE:  true
-};
-</script>
-<script type="text/javascript" src="../static/jquery.js"></script>
-<script type="text/javascript" src="../static/underscore.js"></script>
-<script type="text/javascript" src="../static/doctools.js"></script>
-<link rel="top" title="QPython 0.9 documentation" href="../document.html" />
-<link rel="up" title="Getting started" href="guide.html" />
-<link rel="next" title="Android" href="guide_developers.html" />
-<link rel="prev" title="AndroidFacade" href="guide_androidhelpers.html" />
-<meta charset="UTF-8">
-<link href="http://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet">
-<script src="http://cdn.bootcss.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
-<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
-</head>
-<body role="document">
-<div class="header doc-header">
-<div class="col-lg-offset-2 col-lg-8 col-md-offset-2 col-md-8 col-sm-offset-2 col-sm-8  index-header">
-<div class="navbar-header">
-<button type="button" class="navbar-toggle" data-toggle="collapse"
-data-target="#example-navbar-collapse">
-<span class="sr-only">切换导航</span>
-<span class="icon-bar"></span>
-<span class="icon-bar"></span>
-<span class="icon-bar"></span>
-</button>
-<a href="/index.html" class="logo"><img src="../static/img_logo.png"></a>
-</div>
-<ul class="header-title hidden-xs">
-<li class="header-phone-selected">
-<a href="/index.html">Home</a>
-</li>
-<li>
-<a href="/document.html" class="header-selected">Guide</a>
-<span class="header-title-selected"></span>
-</li>
-<li>
-<a target="_blank" href="https://github.com/qpython-android/qpython">Github</a>
-</li>
-</ul>
-<div class="search-box hidden-xs">
-<form action="../search.html">
-<input type="search" name="q" placeholder="keyword">
-<input type="hidden" name="check_keywords" value="yes" />
-<input type="hidden" name="area" value="default" />
-<button><img src="../static/ic_search.png"></button>
-</form>
-</div>
-</div>
-</div>
-<div class="row doc-content">
-<div class="content-main col-sm-offset-2 col-sm-8">
-<div class="content-wrapper col-sm-4">
-<div class="left-menu">
-<div class="doc-title hidden-xs">QPthon</div>
-<div class="sidebar  collapse navbar-collapse"  id="example-navbar-collapse">
-<ul class="current">
-<li class="toctree-l1"><a class="reference internal" href="guide.html">Getting started</a></li>
-<li class="toctree-l1 current"><a class="reference internal" href="guide.html#programming-guide">Programming Guide</a><ul class="current">
-<li class="toctree-l2"><a class="reference internal" href="guide_program.html">QPython&#8217;s main features</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_ide.html">Use the best way for developing</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_libraries.html">QPython built-in Libraries</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_libraries.html#python-3rd-libraries">Python 3rd Libraries</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_libraries.html#androidhelper-apis">Androidhelper APIs</a></li>
-<li class="toctree-l2 current"><a class="current reference internal" href="#">QPython Open API</a><ul>
-<li class="toctree-l3"><a class="reference internal" href="#share-some-content-to-qpython-s-scripts">Share some content to QPython&#8217;s scripts</a></li>
-<li class="toctree-l3"><a class="reference internal" href="#run-qpython-s-script-from-your-own-application">Run QPython&#8217;s script from your own application</a></li>
-</ul>
-</li>
-<li class="toctree-l2"><a class="reference internal" href="#qpython-online-service">QPython Online Service</a><ul>
-<li class="toctree-l3"><a class="reference internal" href="#qpypi">QPypi</a></li>
-<li class="toctree-l3"><a class="reference internal" href="#qpy-io">QPY.IO</a></li>
-</ul>
-</li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="guide.html#developers-guide">Developers&#8217; Guide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="guide.html#contributors-guide">Contributors&#8217; Guide</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="faq.html">FAQ</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../zhindex.html">中文用户向导</a></li>
-</ul>
-<div class="search-phone visible-xs">
-<form action="../search.html">
-<input type="search" name="q" placeholder="keyword">
-<input type="hidden" name="check_keywords" value="yes" />
-<input type="hidden" name="area" value="default" />
-<button><img src="../static/ic_search.png"></button>
-</form>
-</div>
-</div>
-</div>
-</div>
-<div class="content col-sm-8">
-<div class="document">
-<ul class="crumbs">
-<li><a href="../document.html">Guide</a> &raquo;</li>
-<li><a href="guide.html">Getting started</a> &raquo;</li>
-<li>QPython Open API</li>
-</ul>
-<div class="documentwrapper">
-<div class="bodywrapper">
-<div class="body" role="main">
-<div class="section" id="qpython-open-api">
-<h1>QPython Open API<a class="headerlink" href="#qpython-open-api" title="Permalink to this headline">¶</a></h1>
-<p>QPython has an open activity which allow you run qpython from outside.</p>
-<p>The MPyAPI&#8217;s definition seems like the following:</p>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="o">&lt;</span><span class="n">activity</span>
-<span class="n">android</span><span class="p">:</span><span class="n">name</span><span class="o">=</span><span class="s2">&quot;org.qpython.qpylib.MPyApi&quot;</span>
-<span class="n">android</span><span class="p">:</span><span class="n">label</span><span class="o">=</span><span class="s2">&quot;@string/qpy_run_with_share&quot;</span>
-<span class="n">android</span><span class="p">:</span><span class="n">screenOrientation</span><span class="o">=</span><span class="s2">&quot;user&quot;</span>
-<span class="n">android</span><span class="p">:</span><span class="n">configChanges</span><span class="o">=</span><span class="s2">&quot;orientation|keyboardHidden&quot;</span>
-<span class="n">android</span><span class="p">:</span><span class="n">exported</span><span class="o">=</span><span class="s2">&quot;true&quot;</span><span class="o">&gt;</span>
-<span class="o">&lt;</span><span class="n">intent</span><span class="o">-</span><span class="nb">filter</span><span class="o">&gt;</span>
-<span class="o">&lt;</span><span class="n">action</span> <span class="n">android</span><span class="p">:</span><span class="n">name</span><span class="o">=</span><span class="s2">&quot;org.qpython.qpylib.action.MPyApi&quot;</span> <span class="o">/&gt;</span>
-<span class="o">&lt;</span><span class="n">category</span> <span class="n">android</span><span class="p">:</span><span class="n">name</span><span class="o">=</span><span class="s2">&quot;android.intent.category.DEFAULT&quot;</span> <span class="o">/&gt;</span>
-<span class="o">&lt;</span><span class="n">category</span> <span class="n">android</span><span class="p">:</span><span class="n">name</span><span class="o">=</span><span class="s2">&quot;android.intent.category.LAUNCHER&quot;</span> <span class="o">/&gt;</span>
-<span class="o">&lt;/</span><span class="n">intent</span><span class="o">-</span><span class="nb">filter</span><span class="o">&gt;</span>
-<span class="o">&lt;</span><span class="n">intent</span><span class="o">-</span><span class="nb">filter</span><span class="o">&gt;</span>
-<span class="o">&lt;</span><span class="n">action</span> <span class="n">android</span><span class="p">:</span><span class="n">name</span><span class="o">=</span><span class="s2">&quot;android.intent.action.VIEW&quot;</span> <span class="o">/&gt;</span>
-<span class="o">&lt;</span><span class="n">category</span> <span class="n">android</span><span class="p">:</span><span class="n">name</span><span class="o">=</span><span class="s2">&quot;android.intent.category.DEFAULT&quot;</span> <span class="o">/&gt;</span>
-<span class="o">&lt;</span><span class="n">category</span> <span class="n">android</span><span class="p">:</span><span class="n">name</span><span class="o">=</span><span class="s2">&quot;android.intent.category.BROWSABLE&quot;</span> <span class="o">/&gt;</span>
-<span class="o">&lt;</span><span class="n">data</span> <span class="n">android</span><span class="p">:</span><span class="n">scheme</span><span class="o">=</span><span class="s2">&quot;http&quot;</span> <span class="o">/&gt;</span>
-<span class="o">&lt;</span><span class="n">data</span> <span class="n">android</span><span class="p">:</span><span class="n">scheme</span><span class="o">=</span><span class="s2">&quot;https&quot;</span> <span class="o">/&gt;</span>
-<span class="o">&lt;/</span><span class="n">intent</span><span class="o">-</span><span class="nb">filter</span><span class="o">&gt;</span>
-<span class="o">&lt;</span><span class="n">intent</span><span class="o">-</span><span class="nb">filter</span><span class="o">&gt;</span>
-<span class="o">&lt;</span><span class="n">action</span> <span class="n">android</span><span class="p">:</span><span class="n">name</span><span class="o">=</span><span class="s2">&quot;android.intent.action.SEND&quot;</span><span class="o">/&gt;</span>
-<span class="o">&lt;</span><span class="n">category</span> <span class="n">android</span><span class="p">:</span><span class="n">name</span><span class="o">=</span><span class="s2">&quot;android.intent.category.DEFAULT&quot;</span><span class="o">/&gt;</span>
-<span class="o">&lt;</span><span class="n">data</span> <span class="n">android</span><span class="p">:</span><span class="n">mimeType</span><span class="o">=</span><span class="s2">&quot;text/plain&quot;</span><span class="o">/&gt;</span>
-<span class="o">&lt;/</span><span class="n">intent</span><span class="o">-</span><span class="nb">filter</span><span class="o">&gt;</span>
-<span class="o">&lt;</span><span class="n">intent</span><span class="o">-</span><span class="nb">filter</span><span class="o">&gt;</span>
-<span class="o">&lt;</span><span class="n">action</span> <span class="n">android</span><span class="p">:</span><span class="n">name</span><span class="o">=</span><span class="s2">&quot;android.intent.action.SEND&quot;</span><span class="o">/&gt;</span>
-<span class="o">&lt;</span><span class="n">category</span> <span class="n">android</span><span class="p">:</span><span class="n">name</span><span class="o">=</span><span class="s2">&quot;android.intent.category.DEFAULT&quot;</span><span class="o">/&gt;</span>
-<span class="o">&lt;</span><span class="n">data</span> <span class="n">android</span><span class="p">:</span><span class="n">mimeType</span><span class="o">=</span><span class="s2">&quot;image/*&quot;</span><span class="o">/&gt;</span>
-<span class="o">&lt;/</span><span class="n">intent</span><span class="o">-</span><span class="nb">filter</span><span class="o">&gt;</span>
-<span class="o">&lt;/</span><span class="n">activity</span><span class="o">&gt;</span>
-</pre></div>
-</div>
-<p><strong>So, with it&#8217;s help, you could:</strong></p>
-<div class="section" id="share-some-content-to-qpython-s-scripts">
-<h2>Share some content to QPython&#8217;s scripts<a class="headerlink" href="#share-some-content-to-qpython-s-scripts" title="Permalink to this headline">¶</a></h2>
-<p>You could choose some content in some app, and share to qpython&#8217;s script, then you could handle the content with the <strong>sys.argv[2]</strong></p>
-<p><a class="reference external" href="https://www.youtube.com/watch?v=2Y50Yir8TWg">Watch the demo video on YouTube</a></p>
-</div>
-<div class="section" id="run-qpython-s-script-from-your-own-application">
-<h2>Run QPython&#8217;s script from your own application<a class="headerlink" href="#run-qpython-s-script-from-your-own-application" title="Permalink to this headline">¶</a></h2>
-<p>You can call QPython to run some script or python code in your application by call this activity, like the following sample:</p>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="o">//</span> <span class="n">code</span> <span class="n">sample</span> <span class="n">shows</span> <span class="n">how</span> <span class="n">to</span> <span class="n">call</span> <span class="n">qpython</span> <span class="n">API</span>
-<span class="n">String</span> <span class="n">extPlgPlusName</span> <span class="o">=</span> <span class="s2">&quot;org.qpython.qpy&quot;</span><span class="p">;</span>          <span class="o">//</span> <span class="n">QPython</span> <span class="n">package</span> <span class="n">name</span>
-<span class="n">Intent</span> <span class="n">intent</span> <span class="o">=</span> <span class="n">new</span> <span class="n">Intent</span><span class="p">();</span>
-<span class="n">intent</span><span class="o">.</span><span class="n">setClassName</span><span class="p">(</span><span class="n">extPlgPlusName</span><span class="p">,</span> <span class="s2">&quot;org.qpython.qpylib.MPyApi&quot;</span><span class="p">);</span>
-<span class="n">intent</span><span class="o">.</span><span class="n">setAction</span><span class="p">(</span><span class="n">extPlgPlusName</span> <span class="o">+</span> <span class="s2">&quot;.action.MPyApi&quot;</span><span class="p">);</span>
-<span class="n">Bundle</span> <span class="n">mBundle</span> <span class="o">=</span> <span class="n">new</span> <span class="n">Bundle</span><span class="p">();</span>
-<span class="n">mBundle</span><span class="o">.</span><span class="n">putString</span><span class="p">(</span><span class="s2">&quot;app&quot;</span><span class="p">,</span> <span class="s2">&quot;myappid&quot;</span><span class="p">);</span>
-<span class="n">mBundle</span><span class="o">.</span><span class="n">putString</span><span class="p">(</span><span class="s2">&quot;act&quot;</span><span class="p">,</span> <span class="s2">&quot;onPyApi&quot;</span><span class="p">);</span>
-<span class="n">mBundle</span><span class="o">.</span><span class="n">putString</span><span class="p">(</span><span class="s2">&quot;flag&quot;</span><span class="p">,</span> <span class="s2">&quot;onQPyExec&quot;</span><span class="p">);</span> <span class="o">//</span> <span class="nb">any</span> <span class="n">String</span> <span class="n">flag</span> <span class="n">you</span> <span class="n">may</span> <span class="n">use</span> <span class="ow">in</span> <span class="n">your</span> <span class="n">context</span>
-<span class="n">mBundle</span><span class="o">.</span><span class="n">putString</span><span class="p">(</span><span class="s2">&quot;param&quot;</span><span class="p">,</span> <span class="s2">&quot;&quot;</span><span class="p">);</span>         <span class="o">//</span> <span class="n">param</span> <span class="n">String</span> <span class="n">param</span> <span class="n">you</span> <span class="n">may</span> <span class="n">use</span> <span class="ow">in</span> <span class="n">your</span> <span class="n">context</span>
-<span class="o">/*</span>
-<span class="o">*</span> <span class="n">The</span> <span class="n">Python</span> <span class="n">code</span> <span class="n">we</span> <span class="n">will</span> <span class="n">run</span>
-<span class="o">*/</span>
-<span class="n">String</span> <span class="n">code</span> <span class="o">=</span> <span class="s2">&quot;import androidhelper</span><span class="se">\n</span><span class="s2">&quot;</span> <span class="o">+</span>
-<span class="s2">&quot;droid = androidhelper.Android()</span><span class="se">\n</span><span class="s2">&quot;</span> <span class="o">+</span>
-<span class="s2">&quot;line = droid.dialogGetInput()</span><span class="se">\n</span><span class="s2">&quot;</span> <span class="o">+</span>
-<span class="s2">&quot;s = &#39;Hello </span><span class="si">%s</span><span class="s2">&#39; </span><span class="si">% li</span><span class="s2">ne.result</span><span class="se">\n</span><span class="s2">&quot;</span> <span class="o">+</span>
-<span class="s2">&quot;droid.makeToast(s)</span><span class="se">\n</span><span class="s2">&quot;</span>
-<span class="n">mBundle</span><span class="o">.</span><span class="n">putString</span><span class="p">(</span><span class="s2">&quot;pycode&quot;</span><span class="p">,</span> <span class="n">code</span><span class="p">);</span>
-<span class="n">intent</span><span class="o">.</span><span class="n">putExtras</span><span class="p">(</span><span class="n">mBundle</span><span class="p">);</span>
-<span class="n">startActivityForResult</span><span class="p">(</span><span class="n">intent</span><span class="p">,</span> <span class="n">SCRIPT_EXEC_PY</span><span class="p">);</span>
-<span class="o">...</span>
-<span class="o">//</span> <span class="n">And</span> <span class="n">you</span> <span class="n">can</span> <span class="n">handle</span> <span class="n">the</span> <span class="n">qpython</span> <span class="n">callabck</span> <span class="n">result</span> <span class="ow">in</span> <span class="n">onActivityResult</span>
-<span class="nd">@Override</span>
-<span class="n">protected</span> <span class="n">void</span> <span class="n">onActivityResult</span><span class="p">(</span><span class="nb">int</span> <span class="n">requestCode</span><span class="p">,</span> <span class="nb">int</span> <span class="n">resultCode</span><span class="p">,</span> <span class="n">Intent</span> <span class="n">data</span><span class="p">)</span> <span class="p">{</span>
-<span class="k">if</span> <span class="p">(</span><span class="n">requestCode</span> <span class="o">==</span> <span class="n">SCRIPT_EXEC_PY</span><span class="p">)</span> <span class="p">{</span>
-<span class="k">if</span> <span class="p">(</span><span class="n">data</span><span class="o">!=</span><span class="n">null</span><span class="p">)</span> <span class="p">{</span>
-<span class="n">Bundle</span> <span class="n">bundle</span> <span class="o">=</span> <span class="n">data</span><span class="o">.</span><span class="n">getExtras</span><span class="p">();</span>
-<span class="n">String</span> <span class="n">flag</span> <span class="o">=</span> <span class="n">bundle</span><span class="o">.</span><span class="n">getString</span><span class="p">(</span><span class="s2">&quot;flag&quot;</span><span class="p">);</span>
-<span class="n">String</span> <span class="n">param</span> <span class="o">=</span> <span class="n">bundle</span><span class="o">.</span><span class="n">getString</span><span class="p">(</span><span class="s2">&quot;param&quot;</span><span class="p">);</span>
-<span class="n">String</span> <span class="n">result</span> <span class="o">=</span> <span class="n">bundle</span><span class="o">.</span><span class="n">getString</span><span class="p">(</span><span class="s2">&quot;result&quot;</span><span class="p">);</span> <span class="o">//</span> <span class="n">Result</span> <span class="n">your</span> <span class="n">Pycode</span> <span class="n">generate</span>
-<span class="n">Toast</span><span class="o">.</span><span class="n">makeText</span><span class="p">(</span><span class="n">this</span><span class="p">,</span> <span class="s2">&quot;onQPyExec: return (&quot;</span><span class="o">+</span><span class="n">result</span><span class="o">+</span><span class="s2">&quot;)&quot;</span><span class="p">,</span> <span class="n">Toast</span><span class="o">.</span><span class="n">LENGTH_SHORT</span><span class="p">)</span><span class="o">.</span><span class="n">show</span><span class="p">();</span>
-<span class="p">}</span> <span class="k">else</span> <span class="p">{</span>
-<span class="n">Toast</span><span class="o">.</span><span class="n">makeText</span><span class="p">(</span><span class="n">this</span><span class="p">,</span> <span class="s2">&quot;onQPyExec: data is null&quot;</span><span class="p">,</span> <span class="n">Toast</span><span class="o">.</span><span class="n">LENGTH_SHORT</span><span class="p">)</span><span class="o">.</span><span class="n">show</span><span class="p">();</span>
-<span class="p">}</span>
-<span class="p">}</span>
-<span class="p">}</span>
-</pre></div>
-</div>
-<p><a class="reference external" href="https://github.com/qpython-android/app-call-qpython-api">Checkout the full project from github</a></p>
-<p>And there is <a class="reference external" href="https://play.google.com/store/apps/details?id=com.qpython.tasker2">a production application - QPython Plugin for Tasker</a></p>
-</div>
-</div>
-<div class="section" id="qpython-online-service">
-<h1>QPython Online Service<a class="headerlink" href="#qpython-online-service" title="Permalink to this headline">¶</a></h1>
-<p>Now the QPython online service only open for QPython, not QPython3.</p>
-<div class="section" id="qpypi">
-<h2>QPypi<a class="headerlink" href="#qpypi" title="Permalink to this headline">¶</a></h2>
-<p>Can I install some packages which required pre-compiled ?
-Sure, you could install some pre-compiled packages from QPypi, you could find it through &#8220;Libraries&#8221; on dashboard.</p>
-<img alt="../images/guide_extend_pic2.png" src="../images/guide_extend_pic2.png" />
-<p>If you couldn&#8217;t found the package here, you could send email to <a class="reference external" href="mailto:river&#37;&#52;&#48;qpython&#46;org">river<span>&#64;</span>qpython<span>&#46;</span>org</a> .</p>
-</div>
-<div class="section" id="qpy-io">
-<h2>QPY.IO<a class="headerlink" href="#qpy-io" title="Permalink to this headline">¶</a></h2>
-<p>Can I build an independent APK from QPython script?</p>
-<p>Sure you can. now the service is <strong>in BETA</strong>, it&#8217;s a challenging thing. We will publish it as a online service, for we want to let the development process is simple, you don&#8217;t need to own the development environment set up when you want to build a application.</p>
-<img alt="../images/guide_extend_pic1.png" src="../images/guide_extend_pic1.png" />
-<p>If you want to try it out or have some business proposal, please contact with us by sending email to <a class="reference external" href="mailto:river&#37;&#52;&#48;qpython&#46;org">river<span>&#64;</span>qpython<span>&#46;</span>org</a> .</p>
-</div>
-</div>
-</div>
-</div>
-</div>
-</div>
-<div class="fb-comments" data-href="http://qpython.org" data-numposts="10"></div>
-</div>
-</div>
-<div class="col-sm-2"></div>
-</div>
-<footer id="footer">
-<div class="col-sm-offset-2 col-sm-6 footer-div1">
-<div class="footer-block-item">
-<span class="footer-item1">Built with Sphinx using a theme provid by QPython.</span>
-<span class="footer-item2 visible-xs">
-&#169; Copyright 2017, QPython.
-</span>
-</div>
-</div>
-<div class="col-sm-2 footer-div2">
-<a href="/index.html" class="pull-right"><img src="../static/img_logo.png"></a>
-</div>
-</footer>
-<script type="text/javascript">
-$('.fb-comments').attr('data-href', (window.location.href.split('#')[0]).split('?')[0])
-(function(d, s, id) {
-var js, fjs = d.getElementsByTagName(s)[0];
-if (d.getElementById(id)) return;
-js = d.createElement(s); js.id = id;
-js.src = "//connect.facebook.net/en_US/sdk.js#xfbml=1&version=v2.8&appId=1680815145503311";
-fjs.parentNode.insertBefore(js, fjs);
-}(document, 'script', 'facebook-jssdk'));
-$(function(){
-if ($('#footer')[0].offsetTop < $(window).height()){
-$('#footer').addClass('to-bottom')
-}
-})
-</script>
-</body>
-</html>
diff --git a/docs/en/guide_helloworld.html b/docs/en/guide_helloworld.html
deleted file mode 100644
index 7d34fcf4..00000000
--- a/docs/en/guide_helloworld.html
+++ /dev/null
@@ -1,236 +0,0 @@
-<!DOCTYPE html>
-<html>
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>Writing “Hello World” &mdash; QPython 0.9 documentation</title>
-<link rel="stylesheet" href="../static/qpython_theme.css" type="text/css" />
-<link rel="stylesheet" href="../static/pygments.css" type="text/css" />
-<script type="text/javascript">
-var DOCUMENTATION_OPTIONS = {
-URL_ROOT:    '../',
-VERSION:     '0.9',
-COLLAPSE_INDEX: false,
-FILE_SUFFIX: '.html',
-HAS_SOURCE:  true
-};
-</script>
-<script type="text/javascript" src="../static/jquery.js"></script>
-<script type="text/javascript" src="../static/underscore.js"></script>
-<script type="text/javascript" src="../static/doctools.js"></script>
-<link rel="top" title="QPython 0.9 documentation" href="../document.html" />
-<link rel="up" title="Getting started" href="guide.html" />
-<link rel="next" title="QPython’s main features" href="guide_program.html" />
-<link rel="prev" title="QPython: How To Start" href="guide_howtostart.html" />
-<meta charset="UTF-8">
-<link href="http://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet">
-<script src="http://cdn.bootcss.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
-<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
-</head>
-<body role="document">
-<div class="header doc-header">
-<div class="col-lg-offset-2 col-lg-8 col-md-offset-2 col-md-8 col-sm-offset-2 col-sm-8  index-header">
-<div class="navbar-header">
-<button type="button" class="navbar-toggle" data-toggle="collapse"
-data-target="#example-navbar-collapse">
-<span class="sr-only">切换导航</span>
-<span class="icon-bar"></span>
-<span class="icon-bar"></span>
-<span class="icon-bar"></span>
-</button>
-<a href="/index.html" class="logo"><img src="../static/img_logo.png"></a>
-</div>
-<ul class="header-title hidden-xs">
-<li class="header-phone-selected">
-<a href="/index.html">Home</a>
-</li>
-<li>
-<a href="/document.html" class="header-selected">Guide</a>
-<span class="header-title-selected"></span>
-</li>
-<li>
-<a target="_blank" href="https://github.com/qpython-android/qpython">Github</a>
-</li>
-</ul>
-<div class="search-box hidden-xs">
-<form action="../search.html">
-<input type="search" name="q" placeholder="keyword">
-<input type="hidden" name="check_keywords" value="yes" />
-<input type="hidden" name="area" value="default" />
-<button><img src="../static/ic_search.png"></button>
-</form>
-</div>
-</div>
-</div>
-<div class="row doc-content">
-<div class="content-main col-sm-offset-2 col-sm-8">
-<div class="content-wrapper col-sm-4">
-<div class="left-menu">
-<div class="doc-title hidden-xs">QPthon</div>
-<div class="sidebar  collapse navbar-collapse"  id="example-navbar-collapse">
-<ul class="current">
-<li class="toctree-l1 current"><a class="reference internal" href="guide.html">Getting started</a><ul class="current">
-<li class="toctree-l2"><a class="reference internal" href="guide_howtostart.html">QPython: How To Start</a></li>
-<li class="toctree-l2 current"><a class="current reference internal" href="#">Writing &#8220;Hello World&#8221;</a><ul>
-<li class="toctree-l3"><a class="reference internal" href="#hello-world">Hello world</a></li>
-<li class="toctree-l3"><a class="reference internal" href="#sl4a-library">SL4A library</a></li>
-<li class="toctree-l3"><a class="reference internal" href="#more-samples">More samples</a></li>
-</ul>
-</li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="guide.html#programming-guide">Programming Guide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="guide.html#developers-guide">Developers&#8217; Guide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="guide.html#contributors-guide">Contributors&#8217; Guide</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="faq.html">FAQ</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../zhindex.html">中文用户向导</a></li>
-</ul>
-<div class="search-phone visible-xs">
-<form action="../search.html">
-<input type="search" name="q" placeholder="keyword">
-<input type="hidden" name="check_keywords" value="yes" />
-<input type="hidden" name="area" value="default" />
-<button><img src="../static/ic_search.png"></button>
-</form>
-</div>
-</div>
-</div>
-</div>
-<div class="content col-sm-8">
-<div class="document">
-<ul class="crumbs">
-<li><a href="../document.html">Guide</a> &raquo;</li>
-<li><a href="guide.html">Getting started</a> &raquo;</li>
-<li>Writing &#8220;Hello World&#8221;</li>
-</ul>
-<div class="documentwrapper">
-<div class="bodywrapper">
-<div class="body" role="main">
-<div class="section" id="writing-hello-world">
-<h1>Writing &#8220;Hello World&#8221;<a class="headerlink" href="#writing-hello-world" title="Permalink to this headline">¶</a></h1>
-<div class="section" id="hello-world">
-<h2>Hello world<a class="headerlink" href="#hello-world" title="Permalink to this headline">¶</a></h2>
-<img alt="hello world" src="../images/guide_helloworld_pic1.png" />
-<p>Well, after you became a bit more familiar with QPython, let&#8217;s create our first program in QPython. Obviously, it will be <cite>helloworld.py</cite>. ;)</p>
-<p>Start QPython, open editor and enter the following code:</p>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="kn">import</span> <span class="nn">androidhelper</span>
-<span class="n">droid</span> <span class="o">=</span> <span class="n">androidhelper</span><span class="o">.</span><span class="n">Android</span><span class="p">()</span>
-<span class="n">droid</span><span class="o">.</span><span class="n">makeToast</span><span class="p">(</span><span class="s1">&#39;Hello, Username!&#39;</span><span class="p">)</span>
-</pre></div>
-</div>
-<p>No wonder, it&#8217;s just similar to any other hello-world program. When executed, it just shows pop-up message on the screen (see screenshot on the top). Anyway, it&#8217;s a good example of QPython program.</p>
-</div>
-<div class="section" id="sl4a-library">
-<h2>SL4A library<a class="headerlink" href="#sl4a-library" title="Permalink to this headline">¶</a></h2>
-<p>It begins with <em>import androidhelper</em> — the most useful module in QPython, which encapsulates almost all interface with Android, available in Python. Any script developed in QPython starts with this statement (at least if it claims to communicate with user). Read more about Python library <a class="reference external" href="http://docs.python.org/2.7/library/intro.html">here</a> and import statement <a class="reference external" href="http://docs.python.org/2.7/reference/simple_stmts.html#import">here</a></p>
-<p>By the way, if you&#8217;re going to make your script compatible with SL4A, you should replace the first line with the following code (and use <cite>android</cite> instead <cite>androidhelper</cite> further in the program):</p>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="k">try</span><span class="p">:</span>
-<span class="kn">import</span> <span class="nn">androidhelper</span> <span class="k">as</span> <span class="nn">android</span>
-<span class="k">except</span> <span class="ne">ImportError</span><span class="p">:</span>
-<span class="kn">import</span> <span class="nn">android</span>
-</pre></div>
-</div>
-<p>Ok, next we&#8217;re creating an object <cite>droid</cite> (actually a class), it is necessary to call RPC functions in order to communicate with Android.</p>
-<p>And the last line of our code calls such function, <cite>droid.makeToast()</cite>, which shows a small pop-up message (a &#8220;toast&#8221;) on the screen.</p>
-<p>Well, let&#8217;s add some more functionality. Let it ask the user name and greet them.</p>
-</div>
-<div class="section" id="more-samples">
-<h2>More samples<a class="headerlink" href="#more-samples" title="Permalink to this headline">¶</a></h2>
-<p>We can display a simple dialog box with the title, prompt, edit field and buttons <strong>Ok</strong> and <strong>Cancel</strong> using <cite>dialogGetInput</cite> call. Replace the last line of your code and save it as <cite>hello1.py</cite>:</p>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="kn">import</span> <span class="nn">androidhelper</span>
-<span class="n">droid</span> <span class="o">=</span> <span class="n">androidhelper</span><span class="o">.</span><span class="n">Android</span><span class="p">()</span>
-<span class="n">respond</span> <span class="o">=</span> <span class="n">droid</span><span class="o">.</span><span class="n">dialogGetInput</span><span class="p">(</span><span class="s2">&quot;Hello&quot;</span><span class="p">,</span> <span class="s2">&quot;What is your name?&quot;</span><span class="p">)</span>
-</pre></div>
-</div>
-<p>Well, I think it should return any respond, any user reaction. That&#8217;s why I wrote <cite>respond = ...</cite>. But what the call actually returns? Let&#8217;s check. Just add <cite>print</cite> statement after the last line:</p>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="kn">import</span> <span class="nn">androidhelper</span>
-<span class="n">droid</span> <span class="o">=</span> <span class="n">androidhelper</span><span class="o">.</span><span class="n">Android</span><span class="p">()</span>
-<span class="n">respond</span> <span class="o">=</span> <span class="n">droid</span><span class="o">.</span><span class="n">dialogGetInput</span><span class="p">(</span><span class="s2">&quot;Hello&quot;</span><span class="p">,</span> <span class="s2">&quot;What is your name?&quot;</span><span class="p">)</span>
-<span class="nb">print</span> <span class="n">respond</span>
-</pre></div>
-</div>
-<p>Then save and run it...</p>
-<p>Oops! Nothing printed? Don&#8217;t worry. Just pull notification bar and you will see &#8220;QPython Program Output: hello1.py&#8221; — tap it!</p>
-<p>As you can see, <cite>droid.dialogGetInput()</cite> returns a JSON object with three fields. We need only one — <cite>result</cite> which contains an actual input from user.</p>
-<p>Let&#8217;s add script&#8217;s reaction:</p>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="kn">import</span> <span class="nn">androidhelper</span>
-<span class="n">droid</span> <span class="o">=</span> <span class="n">androidhelper</span><span class="o">.</span><span class="n">Android</span><span class="p">()</span>
-<span class="n">respond</span> <span class="o">=</span> <span class="n">droid</span><span class="o">.</span><span class="n">dialogGetInput</span><span class="p">(</span><span class="s2">&quot;Hello&quot;</span><span class="p">,</span> <span class="s2">&quot;What is your name?&quot;</span><span class="p">)</span>
-<span class="nb">print</span> <span class="n">respond</span>
-<span class="n">message</span> <span class="o">=</span> <span class="s1">&#39;Hello, </span><span class="si">%s</span><span class="s1">!&#39;</span> <span class="o">%</span> <span class="n">respond</span><span class="o">.</span><span class="n">result</span>
-<span class="n">droid</span><span class="o">.</span><span class="n">makeToast</span><span class="p">(</span><span class="n">message</span><span class="p">)</span>
-</pre></div>
-</div>
-<p>Last two lines (1) format the message and (2) show the message to the user in the toast. See <a class="reference external" href="http://docs.python.org/2.7/tutorial/inputoutput.html?highlight=format%20operator#old-string-formatting">Python docs</a> if you still don&#8217;t know what <cite>%</cite> means.</p>
-<p>Wow! It works! ;)</p>
-<p>Now I&#8217;m going to add a bit of logic there. Think: what happen if the user clicks <strong>Cancel</strong> button, or clicks <strong>Ok</strong> leaving the input field blank?</p>
-<p>You can play with the program checking what contains <cite>respond</cite> variable in every case.</p>
-<p>First of all, I want to put text entered by user to a separate variable: <cite>name = respond.result</cite>. Then I&#8217;m going to check it, and if it contains any real text, it will be considered as a name and will be used in greeting. Otherwise another message will be shown. Replace fifth line <cite>message = &#8216;Hello, %s!&#8217; % respond.result</cite> with the following code:</p>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="n">name</span> <span class="o">=</span> <span class="n">respond</span><span class="o">.</span><span class="n">result</span>
-<span class="k">if</span> <span class="n">name</span><span class="p">:</span>
-<span class="n">message</span> <span class="o">=</span> <span class="s1">&#39;Hello, </span><span class="si">%s</span><span class="s1">!&#39;</span> <span class="o">%</span> <span class="n">name</span>
-<span class="k">else</span><span class="p">:</span>
-<span class="n">message</span> <span class="o">=</span> <span class="s2">&quot;Hey! And you&#39;re not very polite, %Username%!&quot;</span>
-</pre></div>
-</div>
-<p>Use <strong>&lt;</strong> and <strong>&gt;</strong> buttons on the toolbar to indent/unindent lines in if-statement (or just use space/backspace keys). You can read more about indentation in Python <a class="reference external" href="http://docs.python.org/2.7/tutorial/introduction.html?highlight=indent#first-steps-towards-programming">here</a>; if-statement described <a class="reference external" href="http://docs.python.org/2.7/tutorial/controlflow.html#if-statements">here</a>.</p>
-<p>First of all, we put user input to the variable <cite>name</cite>. Then we check does <cite>name</cite> contain anything? In case the user left the line blank and clicked <strong>Ok</strong>, the return value is empty string <cite>&#8216;&#8217;</cite>. In case of <strong>Cancel</strong> button pressed, the return value is <cite>None</cite>. Both are treated as false in if-statement. So, only if <cite>name</cite> contans anything meaninful, then-statement is executed and greeting &#8220;Hello, ...!&#8221; shown. In case of empty input the user will see &#8220;Hey! And you&#8217;re not very polite, %Username%!&#8221; message.</p>
-<p>Ok, here is the whole program:</p>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="kn">import</span> <span class="nn">androidhelper</span>
-<span class="n">droid</span> <span class="o">=</span> <span class="n">androidhelper</span><span class="o">.</span><span class="n">Android</span><span class="p">()</span>
-<span class="n">respond</span> <span class="o">=</span> <span class="n">droid</span><span class="o">.</span><span class="n">dialogGetInput</span><span class="p">(</span><span class="s2">&quot;Hello&quot;</span><span class="p">,</span> <span class="s2">&quot;What is your name?&quot;</span><span class="p">)</span>
-<span class="nb">print</span> <span class="n">respond</span>
-<span class="n">name</span> <span class="o">=</span> <span class="n">respond</span><span class="o">.</span><span class="n">result</span>
-<span class="k">if</span> <span class="n">name</span><span class="p">:</span>
-<span class="n">message</span> <span class="o">=</span> <span class="s1">&#39;Hello, </span><span class="si">%s</span><span class="s1">!&#39;</span> <span class="o">%</span> <span class="n">name</span>
-<span class="k">else</span><span class="p">:</span>
-<span class="n">message</span> <span class="o">=</span> <span class="s2">&quot;Hey! And you&#39;re not very polite, %Username%!&quot;</span>
-<span class="n">droid</span><span class="o">.</span><span class="n">makeToast</span><span class="p">(</span><span class="n">message</span><span class="p">)</span>
-</pre></div>
-</div>
-<p><a class="reference external" href="http://onetimeblog.logdown.com/posts/2014/01/23/first-program-in-qpython">Thanks dmych offer the first draft in his blog</a></p>
-</div>
-</div>
-</div>
-</div>
-</div>
-</div>
-<div class="fb-comments" data-href="http://qpython.org" data-numposts="10"></div>
-</div>
-</div>
-<div class="col-sm-2"></div>
-</div>
-<footer id="footer">
-<div class="col-sm-offset-2 col-sm-6 footer-div1">
-<div class="footer-block-item">
-<span class="footer-item1">Built with Sphinx using a theme provid by QPython.</span>
-<span class="footer-item2 visible-xs">
-&#169; Copyright 2017, QPython.
-</span>
-</div>
-</div>
-<div class="col-sm-2 footer-div2">
-<a href="/index.html" class="pull-right"><img src="../static/img_logo.png"></a>
-</div>
-</footer>
-<script type="text/javascript">
-$('.fb-comments').attr('data-href', (window.location.href.split('#')[0]).split('?')[0])
-(function(d, s, id) {
-var js, fjs = d.getElementsByTagName(s)[0];
-if (d.getElementById(id)) return;
-js = d.createElement(s); js.id = id;
-js.src = "//connect.facebook.net/en_US/sdk.js#xfbml=1&version=v2.8&appId=1680815145503311";
-fjs.parentNode.insertBefore(js, fjs);
-}(document, 'script', 'facebook-jssdk'));
-$(function(){
-if ($('#footer')[0].offsetTop < $(window).height()){
-$('#footer').addClass('to-bottom')
-}
-})
-</script>
-</body>
-</html>
diff --git a/docs/en/guide_howtostart.html b/docs/en/guide_howtostart.html
deleted file mode 100644
index e1b9d06f..00000000
--- a/docs/en/guide_howtostart.html
+++ /dev/null
@@ -1,233 +0,0 @@
-<!DOCTYPE html>
-<html>
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>QPython: How To Start &mdash; QPython 0.9 documentation</title>
-<link rel="stylesheet" href="../static/qpython_theme.css" type="text/css" />
-<link rel="stylesheet" href="../static/pygments.css" type="text/css" />
-<script type="text/javascript">
-var DOCUMENTATION_OPTIONS = {
-URL_ROOT:    '../',
-VERSION:     '0.9',
-COLLAPSE_INDEX: false,
-FILE_SUFFIX: '.html',
-HAS_SOURCE:  true
-};
-</script>
-<script type="text/javascript" src="../static/jquery.js"></script>
-<script type="text/javascript" src="../static/underscore.js"></script>
-<script type="text/javascript" src="../static/doctools.js"></script>
-<link rel="top" title="QPython 0.9 documentation" href="../document.html" />
-<link rel="up" title="Getting started" href="guide.html" />
-<link rel="next" title="Writing “Hello World”" href="guide_helloworld.html" />
-<link rel="prev" title="Getting started" href="guide.html" />
-<meta charset="UTF-8">
-<link href="http://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet">
-<script src="http://cdn.bootcss.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
-<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
-</head>
-<body role="document">
-<div class="header doc-header">
-<div class="col-lg-offset-2 col-lg-8 col-md-offset-2 col-md-8 col-sm-offset-2 col-sm-8  index-header">
-<div class="navbar-header">
-<button type="button" class="navbar-toggle" data-toggle="collapse"
-data-target="#example-navbar-collapse">
-<span class="sr-only">切换导航</span>
-<span class="icon-bar"></span>
-<span class="icon-bar"></span>
-<span class="icon-bar"></span>
-</button>
-<a href="/index.html" class="logo"><img src="../static/img_logo.png"></a>
-</div>
-<ul class="header-title hidden-xs">
-<li class="header-phone-selected">
-<a href="/index.html">Home</a>
-</li>
-<li>
-<a href="/document.html" class="header-selected">Guide</a>
-<span class="header-title-selected"></span>
-</li>
-<li>
-<a target="_blank" href="https://github.com/qpython-android/qpython">Github</a>
-</li>
-</ul>
-<div class="search-box hidden-xs">
-<form action="../search.html">
-<input type="search" name="q" placeholder="keyword">
-<input type="hidden" name="check_keywords" value="yes" />
-<input type="hidden" name="area" value="default" />
-<button><img src="../static/ic_search.png"></button>
-</form>
-</div>
-</div>
-</div>
-<div class="row doc-content">
-<div class="content-main col-sm-offset-2 col-sm-8">
-<div class="content-wrapper col-sm-4">
-<div class="left-menu">
-<div class="doc-title hidden-xs">QPthon</div>
-<div class="sidebar  collapse navbar-collapse"  id="example-navbar-collapse">
-<ul class="current">
-<li class="toctree-l1 current"><a class="reference internal" href="guide.html">Getting started</a><ul class="current">
-<li class="toctree-l2 current"><a class="current reference internal" href="#">QPython: How To Start</a><ul>
-<li class="toctree-l3"><a class="reference internal" href="#dashboard">1. Dashboard</a></li>
-<li class="toctree-l3"><a class="reference internal" href="#console-and-editor">2. Console and editor</a></li>
-<li class="toctree-l3"><a class="reference internal" href="#programs">3. Programs</a></li>
-<li class="toctree-l3"><a class="reference internal" href="#libraries">4. Libraries</a></li>
-<li class="toctree-l3"><a class="reference internal" href="#community">5. Community</a></li>
-</ul>
-</li>
-<li class="toctree-l2"><a class="reference internal" href="guide_helloworld.html">Writing &#8220;Hello World&#8221;</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="guide.html#programming-guide">Programming Guide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="guide.html#developers-guide">Developers&#8217; Guide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="guide.html#contributors-guide">Contributors&#8217; Guide</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="faq.html">FAQ</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../zhindex.html">中文用户向导</a></li>
-</ul>
-<div class="search-phone visible-xs">
-<form action="../search.html">
-<input type="search" name="q" placeholder="keyword">
-<input type="hidden" name="check_keywords" value="yes" />
-<input type="hidden" name="area" value="default" />
-<button><img src="../static/ic_search.png"></button>
-</form>
-</div>
-</div>
-</div>
-</div>
-<div class="content col-sm-8">
-<div class="document">
-<ul class="crumbs">
-<li><a href="../document.html">Guide</a> &raquo;</li>
-<li><a href="guide.html">Getting started</a> &raquo;</li>
-<li>QPython: How To Start</li>
-</ul>
-<div class="documentwrapper">
-<div class="bodywrapper">
-<div class="body" role="main">
-<div class="section" id="qpython-how-to-start">
-<h1>QPython: How To Start<a class="headerlink" href="#qpython-how-to-start" title="Permalink to this headline">¶</a></h1>
-<p>Now, I will introduce the QPython&#8217;s features through it&#8217;s interfaces.</p>
-<div class="section" id="dashboard">
-<h2>1. Dashboard<a class="headerlink" href="#dashboard" title="Permalink to this headline">¶</a></h2>
-<img alt="QPython start" src="../images/guide_howtostart_pic1.png" />
-<p>After you installed QPython, start it in the usual way by tapping its icon in the menu. Screenshot on the top of this post shows what you should see when QPython just started.</p>
-<p><strong>Start button</strong></p>
-<p>By tapping the big button with Python logo in the center of the screen you can</p>
-<p><strong>Launch your local script or project</strong></p>
-<p><em>Get script from QR code</em> (funny brand new way to share and distribute your code, you can create QRCode through <a class="reference external" href="http://qpython.com/#qrcode">QPython&#8217;s QRCode generator</a></p>
-<p>Now you can install many 3rd libaries ( pure python libraries mainly ) through pip_console.py script.</p>
-<p>If you want QPython to run some script of project when you click the start button, you can make it by setting default program in setting activity.</p>
-<p><strong>Developer kit dashboard</strong></p>
-<p>If you swipe to the left instead of tapping, you will see another (second) main screen of QPython <em>(Pic. 2)</em>. As for me, it is much more useful and comfortable for developer.</p>
-<img alt="QPython develop dashboard" src="../images/guide_howtostart_pic2.png" />
-<p>Tools available here:</p>
-<ul class="simple">
-<li><strong>Console</strong> — yes, it&#8217;s regular Python console, feel free to comunicate with interpreter directly</li>
-<li><strong>Editor</strong> — QPython has a nice text editor integrated with the rest, you can write code and run it without leaving the application</li>
-<li><strong>My QPython</strong> — here you can find your scripts and projects</li>
-<li><strong>System</strong> — maintain libraries and components: install and uninstall them</li>
-<li><strong>Package Index</strong> opens the page <a class="reference external" href="http://qpypi.qpython.org/">QPyPI</a> in browser allowing to install packages listed there</li>
-<li><strong>Community</strong> leads to <a class="reference external" href="http://qpython.org/">QPython.org</a> page. Feel free to join or ask&amp;answer questions in the QPython community.</li>
-</ul>
-<p>By long clicking on the console or editor, you have chance to create the shortcut on desktop which allow you enter console or editor directly.</p>
-<p>Next, let&#8217;s see the console and the editor.</p>
-</div>
-<div class="section" id="console-and-editor">
-<h2>2. Console and editor<a class="headerlink" href="#console-and-editor" title="Permalink to this headline">¶</a></h2>
-<img alt="QPython console" src="../images/guide_howtostart_pic3.png" />
-<p>As I said before, there is an ordinary Python console. Many people usually use it to explore objects&#8217; properties, consult about syntax and test their ideas. You can type your commands directly and Python interpreter will execute them. You can open additional consoles by tapping the plus button (1) and usedrop-down list on the upper left corner to switch between consoles (2). To close the console just tap the close button (3).</p>
-<img alt="QPython notification" src="../images/guide_howtostart_pic4.png" />
-<p>Please note, there will be notification in the notification bar unless you explicitly close the console and you always can reach the open console by tapping the notification.</p>
-<img alt="QPython editor" src="../images/guide_howtostart_pic5.png" />
-<p>The editor allows you obviously (hello Cap!) enter and modify text. Here you can develop your scripts, save them and execute. The editor supports Python syntax highlighting and shows line numbers (there is no ability to go to the line by number though). <em>(above picture)</em></p>
-<p>When typing, you can easily control indentation level (which is critical for Python code) using two buttons on the toolbar (1). Next buttons on the toolbar are <strong>Save</strong> and <strong>Save As</strong> (2), then goes <strong>Run</strong> (3), <strong>Undo</strong>, <strong>Search</strong>, <strong>Recent Files</strong> and <strong>Settings</strong> buttons. Also there are two buttons on the top: <strong>Open</strong> and <strong>New</strong> (5).</p>
-<p>When saving, don&#8217;t forget to add <cite>.py</cite> estension to the file name since the editor don&#8217;t do it for you.</p>
-</div>
-<div class="section" id="programs">
-<h2>3. Programs<a class="headerlink" href="#programs" title="Permalink to this headline">¶</a></h2>
-<p>You can find the scripts or projects in My QPython. My QPython contains the scripts and Projects.</p>
-<p>By long clicking on script or project, you have chance to create the shortcut for the script or project. Once you have created the shortcuts on desktop, you can directly run the script or project from desktop.</p>
-<p><strong>Scripts</strong>
-Scripts : A single script. The scripts are in the  /sdcard/com.hipipal.qpyplus/scripts directory.
-If you want your script could be found in My QPython, please upload it to this directory.</p>
-<p>When you click the script, you can choose the following actions:</p>
-<ul class="simple">
-<li>Run : Run the script</li>
-<li>Open : Edit the script with built-in editor</li>
-<li>Rename : Rename the script</li>
-<li>Delete : Delete the script</li>
-</ul>
-<p><strong>Projects</strong>
-Projects : A directory which should contain the main.py as the project&#8217;s default launch script, and you can put other dependency 3rd libraries or resources in the same directory, if you want your project could be found in My QPython, please upload them into this directory.</p>
-<p>When you click on the project, you can choose the following actions:</p>
-<ul class="simple">
-<li>Run : run the project</li>
-<li>Open : use it to explore project&#8217;s resources</li>
-<li>Rename : Rename the project</li>
-<li>Delete : Delete the project</li>
-</ul>
-</div>
-<div class="section" id="libraries">
-<h2>4. Libraries<a class="headerlink" href="#libraries" title="Permalink to this headline">¶</a></h2>
-<p>By installing 3rd libraries, you can extend your qpython&#8217;s programming ability quickly. There are some ways to install libraries.</p>
-<p><strong>QPypi</strong></p>
-<p>You can install some pre-built libraries from QPypi, like numpy etc.</p>
-<p><strong>Pip console</strong></p>
-<p>You can install most pure python libraries through pip console.</p>
-<p>Besides the two ways above, you could copy libraries into the /sdcard/qpython/lib/python2.7/site-packages in your device.</p>
-<p><em>Notice:</em>
-Some libraries mixed with c/c++ files could not be install through pip console for the android lacks the compiler environment, you could ask help from qpython developer team.</p>
-</div>
-<div class="section" id="community">
-<h2>5. Community<a class="headerlink" href="#community" title="Permalink to this headline">¶</a></h2>
-<p>It will redirect to the QPython.org, including somthe source of this documentation, and there are some qpython user communities&#8217; link, many questions of qpython usage or programming could be asked in the community.</p>
-<p><a class="reference external" href="http://onetimeblog.logdown.com/posts/2014/01/22/qpython-how-to-start">Thanks dmych offer the first draft in his blog</a></p>
-</div>
-</div>
-</div>
-</div>
-</div>
-</div>
-<div class="fb-comments" data-href="http://qpython.org" data-numposts="10"></div>
-</div>
-</div>
-<div class="col-sm-2"></div>
-</div>
-<footer id="footer">
-<div class="col-sm-offset-2 col-sm-6 footer-div1">
-<div class="footer-block-item">
-<span class="footer-item1">Built with Sphinx using a theme provid by QPython.</span>
-<span class="footer-item2 visible-xs">
-&#169; Copyright 2017, QPython.
-</span>
-</div>
-</div>
-<div class="col-sm-2 footer-div2">
-<a href="/index.html" class="pull-right"><img src="../static/img_logo.png"></a>
-</div>
-</footer>
-<script type="text/javascript">
-$('.fb-comments').attr('data-href', (window.location.href.split('#')[0]).split('?')[0])
-(function(d, s, id) {
-var js, fjs = d.getElementsByTagName(s)[0];
-if (d.getElementById(id)) return;
-js = d.createElement(s); js.id = id;
-js.src = "//connect.facebook.net/en_US/sdk.js#xfbml=1&version=v2.8&appId=1680815145503311";
-fjs.parentNode.insertBefore(js, fjs);
-}(document, 'script', 'facebook-jssdk'));
-$(function(){
-if ($('#footer')[0].offsetTop < $(window).height()){
-$('#footer').addClass('to-bottom')
-}
-})
-</script>
-</body>
-</html>
diff --git a/docs/en/guide_ide.html b/docs/en/guide_ide.html
deleted file mode 100644
index 5f54ddb8..00000000
--- a/docs/en/guide_ide.html
+++ /dev/null
@@ -1,187 +0,0 @@
-<!DOCTYPE html>
-<html>
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>Use the best way for developing &mdash; QPython 0.9 documentation</title>
-<link rel="stylesheet" href="../static/qpython_theme.css" type="text/css" />
-<link rel="stylesheet" href="../static/pygments.css" type="text/css" />
-<script type="text/javascript">
-var DOCUMENTATION_OPTIONS = {
-URL_ROOT:    '../',
-VERSION:     '0.9',
-COLLAPSE_INDEX: false,
-FILE_SUFFIX: '.html',
-HAS_SOURCE:  true
-};
-</script>
-<script type="text/javascript" src="../static/jquery.js"></script>
-<script type="text/javascript" src="../static/underscore.js"></script>
-<script type="text/javascript" src="../static/doctools.js"></script>
-<link rel="top" title="QPython 0.9 documentation" href="../document.html" />
-<link rel="up" title="Getting started" href="guide.html" />
-<link rel="next" title="QPython built-in Libraries" href="guide_libraries.html" />
-<link rel="prev" title="QPython’s main features" href="guide_program.html" />
-<meta charset="UTF-8">
-<link href="http://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet">
-<script src="http://cdn.bootcss.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
-<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
-</head>
-<body role="document">
-<div class="header doc-header">
-<div class="col-lg-offset-2 col-lg-8 col-md-offset-2 col-md-8 col-sm-offset-2 col-sm-8  index-header">
-<div class="navbar-header">
-<button type="button" class="navbar-toggle" data-toggle="collapse"
-data-target="#example-navbar-collapse">
-<span class="sr-only">切换导航</span>
-<span class="icon-bar"></span>
-<span class="icon-bar"></span>
-<span class="icon-bar"></span>
-</button>
-<a href="/index.html" class="logo"><img src="../static/img_logo.png"></a>
-</div>
-<ul class="header-title hidden-xs">
-<li class="header-phone-selected">
-<a href="/index.html">Home</a>
-</li>
-<li>
-<a href="/document.html" class="header-selected">Guide</a>
-<span class="header-title-selected"></span>
-</li>
-<li>
-<a target="_blank" href="https://github.com/qpython-android/qpython">Github</a>
-</li>
-</ul>
-<div class="search-box hidden-xs">
-<form action="../search.html">
-<input type="search" name="q" placeholder="keyword">
-<input type="hidden" name="check_keywords" value="yes" />
-<input type="hidden" name="area" value="default" />
-<button><img src="../static/ic_search.png"></button>
-</form>
-</div>
-</div>
-</div>
-<div class="row doc-content">
-<div class="content-main col-sm-offset-2 col-sm-8">
-<div class="content-wrapper col-sm-4">
-<div class="left-menu">
-<div class="doc-title hidden-xs">QPthon</div>
-<div class="sidebar  collapse navbar-collapse"  id="example-navbar-collapse">
-<ul class="current">
-<li class="toctree-l1"><a class="reference internal" href="guide.html">Getting started</a></li>
-<li class="toctree-l1 current"><a class="reference internal" href="guide.html#programming-guide">Programming Guide</a><ul class="current">
-<li class="toctree-l2"><a class="reference internal" href="guide_program.html">QPython&#8217;s main features</a></li>
-<li class="toctree-l2 current"><a class="current reference internal" href="#">Use the best way for developing</a><ul>
-<li class="toctree-l3"><a class="reference internal" href="#develop-from-qeditor">Develop from QEditor</a></li>
-<li class="toctree-l3"><a class="reference internal" href="#develop-from-browser">Develop from browser</a></li>
-<li class="toctree-l3"><a class="reference internal" href="#develop-from-your-computer">Develop from your computer</a></li>
-</ul>
-</li>
-<li class="toctree-l2"><a class="reference internal" href="guide_libraries.html">QPython built-in Libraries</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_libraries.html#python-3rd-libraries">Python 3rd Libraries</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_libraries.html#androidhelper-apis">Androidhelper APIs</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_extend.html">QPython Open API</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_extend.html#qpython-online-service">QPython Online Service</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="guide.html#developers-guide">Developers&#8217; Guide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="guide.html#contributors-guide">Contributors&#8217; Guide</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="faq.html">FAQ</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../zhindex.html">中文用户向导</a></li>
-</ul>
-<div class="search-phone visible-xs">
-<form action="../search.html">
-<input type="search" name="q" placeholder="keyword">
-<input type="hidden" name="check_keywords" value="yes" />
-<input type="hidden" name="area" value="default" />
-<button><img src="../static/ic_search.png"></button>
-</form>
-</div>
-</div>
-</div>
-</div>
-<div class="content col-sm-8">
-<div class="document">
-<ul class="crumbs">
-<li><a href="../document.html">Guide</a> &raquo;</li>
-<li><a href="guide.html">Getting started</a> &raquo;</li>
-<li>Use the best way for developing</li>
-</ul>
-<div class="documentwrapper">
-<div class="bodywrapper">
-<div class="body" role="main">
-<div class="section" id="use-the-best-way-for-developing">
-<h1>Use the best way for developing<a class="headerlink" href="#use-the-best-way-for-developing" title="Permalink to this headline">¶</a></h1>
-<div class="section" id="develop-from-qeditor">
-<h2>Develop from QEditor<a class="headerlink" href="#develop-from-qeditor" title="Permalink to this headline">¶</a></h2>
-<p>QEditor is the QPython&#8217;s built-in editor, which supports Python / HTML syntax highlight.</p>
-<p><strong>QEditor&#8217;s main features</strong></p>
-<ul class="simple">
-<li>Edit / View plain text file, like Python, Lua, HTML, Javascript and so on</li>
-<li>Edit and run Python script &amp; Python syntax highlight</li>
-<li>Edit and run Shell script</li>
-<li>Preview HTML with built-in HTML browser</li>
-<li>Search by keyword, code snippets, code share</li>
-</ul>
-<p>You could run the QPython script directly when you develop from QEditor, so when you are moving it&#8217;s the most convient way for QPython develop.</p>
-</div>
-<div class="section" id="develop-from-browser">
-<h2>Develop from browser<a class="headerlink" href="#develop-from-browser" title="Permalink to this headline">¶</a></h2>
-<p>QPython has a built-in script which is <strong>qedit4web.py</strong>, you could see it when you click the start button and choose  &#8220;Run local script&#8221;.
-After run it, you could see the result.</p>
-<img alt="QPython qedit4web" src="../images/guide_ide_qedit4web.png" />
-<p>Then, you could access the url from your PC/Laptop&#8217;s browser for developing, just like the below pics.</p>
-<img alt="QPython qedit4web choose project or file" src="../images/guide_ide_qedit4web_choose.png" />
-<p><em>After choose some project or script, you could start to develop</em></p>
-<img alt="QPython qedit4web" src="../images/guide_ide_qedit4web_develop.png" />
-<p>With it&#8217;s help, you could write from browser and run from your android phone. It is very convenient.</p>
-</div>
-<div class="section" id="develop-from-your-computer">
-<h2>Develop from your computer<a class="headerlink" href="#develop-from-your-computer" title="Permalink to this headline">¶</a></h2>
-<p>Besides the above ways, you could develop the script with your way, then upload to your phone and run with QPython also.</p>
-</div>
-</div>
-</div>
-</div>
-</div>
-</div>
-<div class="fb-comments" data-href="http://qpython.org" data-numposts="10"></div>
-</div>
-</div>
-<div class="col-sm-2"></div>
-</div>
-<footer id="footer">
-<div class="col-sm-offset-2 col-sm-6 footer-div1">
-<div class="footer-block-item">
-<span class="footer-item1">Built with Sphinx using a theme provid by QPython.</span>
-<span class="footer-item2 visible-xs">
-&#169; Copyright 2017, QPython.
-</span>
-</div>
-</div>
-<div class="col-sm-2 footer-div2">
-<a href="/index.html" class="pull-right"><img src="../static/img_logo.png"></a>
-</div>
-</footer>
-<script type="text/javascript">
-$('.fb-comments').attr('data-href', (window.location.href.split('#')[0]).split('?')[0])
-(function(d, s, id) {
-var js, fjs = d.getElementsByTagName(s)[0];
-if (d.getElementById(id)) return;
-js = d.createElement(s); js.id = id;
-js.src = "//connect.facebook.net/en_US/sdk.js#xfbml=1&version=v2.8&appId=1680815145503311";
-fjs.parentNode.insertBefore(js, fjs);
-}(document, 'script', 'facebook-jssdk'));
-$(function(){
-if ($('#footer')[0].offsetTop < $(window).height()){
-$('#footer').addClass('to-bottom')
-}
-})
-</script>
-</body>
-</html>
diff --git a/docs/en/guide_libraries.html b/docs/en/guide_libraries.html
deleted file mode 100644
index 784344c9..00000000
--- a/docs/en/guide_libraries.html
+++ /dev/null
@@ -1,567 +0,0 @@
-<!DOCTYPE html>
-<html>
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>QPython built-in Libraries &mdash; QPython 0.9 documentation</title>
-<link rel="stylesheet" href="../static/qpython_theme.css" type="text/css" />
-<link rel="stylesheet" href="../static/pygments.css" type="text/css" />
-<script type="text/javascript">
-var DOCUMENTATION_OPTIONS = {
-URL_ROOT:    '../',
-VERSION:     '0.9',
-COLLAPSE_INDEX: false,
-FILE_SUFFIX: '.html',
-HAS_SOURCE:  true
-};
-</script>
-<script type="text/javascript" src="../static/jquery.js"></script>
-<script type="text/javascript" src="../static/underscore.js"></script>
-<script type="text/javascript" src="../static/doctools.js"></script>
-<link rel="top" title="QPython 0.9 documentation" href="../document.html" />
-<link rel="up" title="Getting started" href="guide.html" />
-<link rel="next" title="AndroidFacade" href="guide_androidhelpers.html" />
-<link rel="prev" title="Use the best way for developing" href="guide_ide.html" />
-<meta charset="UTF-8">
-<link href="http://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet">
-<script src="http://cdn.bootcss.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
-<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
-</head>
-<body role="document">
-<div class="header doc-header">
-<div class="col-lg-offset-2 col-lg-8 col-md-offset-2 col-md-8 col-sm-offset-2 col-sm-8  index-header">
-<div class="navbar-header">
-<button type="button" class="navbar-toggle" data-toggle="collapse"
-data-target="#example-navbar-collapse">
-<span class="sr-only">切换导航</span>
-<span class="icon-bar"></span>
-<span class="icon-bar"></span>
-<span class="icon-bar"></span>
-</button>
-<a href="/index.html" class="logo"><img src="../static/img_logo.png"></a>
-</div>
-<ul class="header-title hidden-xs">
-<li class="header-phone-selected">
-<a href="/index.html">Home</a>
-</li>
-<li>
-<a href="/document.html" class="header-selected">Guide</a>
-<span class="header-title-selected"></span>
-</li>
-<li>
-<a target="_blank" href="https://github.com/qpython-android/qpython">Github</a>
-</li>
-</ul>
-<div class="search-box hidden-xs">
-<form action="../search.html">
-<input type="search" name="q" placeholder="keyword">
-<input type="hidden" name="check_keywords" value="yes" />
-<input type="hidden" name="area" value="default" />
-<button><img src="../static/ic_search.png"></button>
-</form>
-</div>
-</div>
-</div>
-<div class="row doc-content">
-<div class="content-main col-sm-offset-2 col-sm-8">
-<div class="content-wrapper col-sm-4">
-<div class="left-menu">
-<div class="doc-title hidden-xs">QPthon</div>
-<div class="sidebar  collapse navbar-collapse"  id="example-navbar-collapse">
-<ul class="current">
-<li class="toctree-l1"><a class="reference internal" href="guide.html">Getting started</a></li>
-<li class="toctree-l1 current"><a class="reference internal" href="guide.html#programming-guide">Programming Guide</a><ul class="current">
-<li class="toctree-l2"><a class="reference internal" href="guide_program.html">QPython&#8217;s main features</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_ide.html">Use the best way for developing</a></li>
-<li class="toctree-l2 current"><a class="current reference internal" href="#">QPython built-in Libraries</a><ul>
-<li class="toctree-l3"><a class="reference internal" href="#qpython-dynload-libraries">QPython dynload libraries</a></li>
-<li class="toctree-l3"><a class="reference internal" href="#qpython-stardard-libraries">QPython stardard libraries</a></li>
-</ul>
-</li>
-<li class="toctree-l2"><a class="reference internal" href="#python-3rd-libraries">Python 3rd Libraries</a></li>
-<li class="toctree-l2"><a class="reference internal" href="#androidhelper-apis">Androidhelper APIs</a><ul>
-<li class="toctree-l3"><a class="reference internal" href="guide_androidhelpers.html">AndroidFacade</a></li>
-<li class="toctree-l3"><a class="reference internal" href="guide_androidhelpers.html#applicationmanagerfacade">ApplicationManagerFacade</a></li>
-<li class="toctree-l3"><a class="reference internal" href="guide_androidhelpers.html#camerafacade">CameraFacade</a></li>
-<li class="toctree-l3"><a class="reference internal" href="guide_androidhelpers.html#commonintentsfacade">CommonIntentsFacade</a></li>
-<li class="toctree-l3"><a class="reference internal" href="guide_androidhelpers.html#contactsfacade">ContactsFacade</a></li>
-<li class="toctree-l3"><a class="reference internal" href="guide_androidhelpers.html#eventfacade">EventFacade</a></li>
-<li class="toctree-l3"><a class="reference internal" href="guide_androidhelpers.html#locationfacade">LocationFacade</a></li>
-<li class="toctree-l3"><a class="reference internal" href="guide_androidhelpers.html#phonefacade">PhoneFacade</a></li>
-<li class="toctree-l3"><a class="reference internal" href="guide_androidhelpers.html#mediarecorderfacade">MediaRecorderFacade</a></li>
-<li class="toctree-l3"><a class="reference internal" href="guide_androidhelpers.html#sensormanagerfacade">SensorManagerFacade</a></li>
-<li class="toctree-l3"><a class="reference internal" href="guide_androidhelpers.html#settingsfacade">SettingsFacade</a></li>
-<li class="toctree-l3"><a class="reference internal" href="guide_androidhelpers.html#smsfacade">SmsFacade</a></li>
-<li class="toctree-l3"><a class="reference internal" href="guide_androidhelpers.html#speechrecognitionfacade">SpeechRecognitionFacade</a></li>
-<li class="toctree-l3"><a class="reference internal" href="guide_androidhelpers.html#tonegeneratorfacade">ToneGeneratorFacade</a></li>
-<li class="toctree-l3"><a class="reference internal" href="guide_androidhelpers.html#wakelockfacade">WakeLockFacade</a></li>
-<li class="toctree-l3"><a class="reference internal" href="guide_androidhelpers.html#wififacade">WifiFacade</a></li>
-<li class="toctree-l3"><a class="reference internal" href="guide_androidhelpers.html#batterymanagerfacade">BatteryManagerFacade</a></li>
-<li class="toctree-l3"><a class="reference internal" href="guide_androidhelpers.html#activityresultfacade">ActivityResultFacade</a></li>
-<li class="toctree-l3"><a class="reference internal" href="guide_androidhelpers.html#mediaplayerfacade">MediaPlayerFacade</a></li>
-<li class="toctree-l3"><a class="reference internal" href="guide_androidhelpers.html#preferencesfacade">PreferencesFacade</a></li>
-<li class="toctree-l3"><a class="reference internal" href="guide_androidhelpers.html#qpyinterfacefacade">QPyInterfaceFacade</a></li>
-<li class="toctree-l3"><a class="reference internal" href="guide_androidhelpers.html#texttospeechfacade">TextToSpeechFacade</a></li>
-<li class="toctree-l3"><a class="reference internal" href="guide_androidhelpers.html#eyesfreefacade">EyesFreeFacade</a></li>
-<li class="toctree-l3"><a class="reference internal" href="guide_androidhelpers.html#bluetoothfacade">BluetoothFacade</a></li>
-<li class="toctree-l3"><a class="reference internal" href="guide_androidhelpers.html#signalstrengthfacade">SignalStrengthFacade</a></li>
-<li class="toctree-l3"><a class="reference internal" href="guide_androidhelpers.html#webcamfacade">WebCamFacade</a></li>
-<li class="toctree-l3"><a class="reference internal" href="guide_androidhelpers.html#uifacade">UiFacade</a></li>
-<li class="toctree-l3"><a class="reference internal" href="guide_androidhelpers.html#usb-host-serial-facade">USB Host Serial Facade</a></li>
-</ul>
-</li>
-<li class="toctree-l2"><a class="reference internal" href="guide_extend.html">QPython Open API</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_extend.html#qpython-online-service">QPython Online Service</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="guide.html#developers-guide">Developers&#8217; Guide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="guide.html#contributors-guide">Contributors&#8217; Guide</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="faq.html">FAQ</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../zhindex.html">中文用户向导</a></li>
-</ul>
-<div class="search-phone visible-xs">
-<form action="../search.html">
-<input type="search" name="q" placeholder="keyword">
-<input type="hidden" name="check_keywords" value="yes" />
-<input type="hidden" name="area" value="default" />
-<button><img src="../static/ic_search.png"></button>
-</form>
-</div>
-</div>
-</div>
-</div>
-<div class="content col-sm-8">
-<div class="document">
-<ul class="crumbs">
-<li><a href="../document.html">Guide</a> &raquo;</li>
-<li><a href="guide.html">Getting started</a> &raquo;</li>
-<li>QPython built-in Libraries</li>
-</ul>
-<div class="documentwrapper">
-<div class="bodywrapper">
-<div class="body" role="main">
-<div class="section" id="qpython-built-in-libraries">
-<h1>QPython built-in Libraries<a class="headerlink" href="#qpython-built-in-libraries" title="Permalink to this headline">¶</a></h1>
-<p>QPython is using the Python 2.7.2 and it support most Python stardard libraries. And you could see their documentation through Python documentation.</p>
-<div class="section" id="qpython-dynload-libraries">
-<h2>QPython dynload libraries<a class="headerlink" href="#qpython-dynload-libraries" title="Permalink to this headline">¶</a></h2>
-<p>Just like Python, QPython contains python built-in .so libraries.</p>
-<p>Usually, you don&#8217;t need to  import them manually, they were used in stardard libraries, and could be imported automatically.</p>
-<ul class="simple">
-<li>_codecs_cn.so</li>
-<li>_codecs_hk.so</li>
-<li>_codecs_iso2022.so</li>
-<li>_codecs_jp.so</li>
-<li>_codecs_kr.so</li>
-<li>_codecs_tw.so</li>
-<li>_csv.so</li>
-<li>_ctypes.so</li>
-<li>_ctypes_test.so</li>
-<li>_hashlib.so</li>
-<li>_heapq.so</li>
-<li>_hotshot.so</li>
-<li>_io.so</li>
-<li>_json.so</li>
-<li>_lsprof.so</li>
-<li>_multibytecodec.so</li>
-<li>_sqlite3.so</li>
-<li>_ssl.so</li>
-<li>_testcapi.so</li>
-<li>audioop.so</li>
-<li>future_builtins.so</li>
-<li>grp.so</li>
-<li>mmap.so</li>
-<li>resource.so</li>
-<li>syslog.so</li>
-<li>termios.so</li>
-<li>unicodedata.so</li>
-</ul>
-</div>
-<div class="section" id="qpython-stardard-libraries">
-<h2>QPython stardard libraries<a class="headerlink" href="#qpython-stardard-libraries" title="Permalink to this headline">¶</a></h2>
-<p>The following libraries are the stardard QPython libraries which are the same as Python:</p>
-<ul class="simple">
-<li><a class="reference external" href="https://docs.python.org/2/library/basehttpserver.html">BaseHTTPServer.py</a></li>
-<li><a class="reference external" href="https://docs.python.org/2/library/binhex.html">binhex.py</a></li>
-<li><a class="reference external" href="https://docs.python.org/2/library/fnmatch.html">fnmatch.py</a></li>
-<li>mhlib.py</li>
-<li>quopri.py</li>
-<li>sysconfig.py</li>
-<li>Bastion.py</li>
-<li>bisect.py</li>
-<li>formatter.py</li>
-<li>mimetools.py</li>
-<li>random.py</li>
-<li>tabnanny.py</li>
-<li>CGIHTTPServer.py</li>
-<li>bsddb</li>
-<li>fpformat.py</li>
-<li>mimetypes.py</li>
-<li>re.py</li>
-<li>tarfile.py</li>
-<li>ConfigParser.py</li>
-<li>cProfile.py</li>
-<li>fractions.py</li>
-<li>mimify.py</li>
-<li>repr.py</li>
-<li>telnetlib.py</li>
-<li>Cookie.py</li>
-<li>calendar.py</li>
-<li>ftplib.py</li>
-<li>modulefinder.py</li>
-<li>rexec.py</li>
-<li>tempfile.py</li>
-<li>DocXMLRPCServer.py</li>
-<li>cgi.py</li>
-<li>functools.py</li>
-<li>multifile.py</li>
-<li>rfc822.py</li>
-<li>textwrap.py</li>
-<li>HTMLParser.py</li>
-<li>cgitb.py</li>
-<li>genericpath.py</li>
-<li>mutex.py</li>
-<li>rlcompleter.py</li>
-<li>this.py</li>
-<li>chunk.py</li>
-<li>getopt.py</li>
-<li>netrc.py</li>
-<li>robotparser.py</li>
-<li>threading.py</li>
-<li>MimeWriter.py</li>
-<li>cmd.py</li>
-<li>getpass.py</li>
-<li>new.py</li>
-<li>runpy.py</li>
-<li>timeit.py</li>
-<li>Queue.py</li>
-<li>code.py</li>
-<li>gettext.py</li>
-<li>nntplib.py</li>
-<li>sched.py</li>
-<li>toaiff.py</li>
-<li>SimpleHTTPServer.py</li>
-<li>codecs.py</li>
-<li>glob.py</li>
-<li>ntpath.py</li>
-<li>sets.py</li>
-<li>token.py</li>
-<li>SimpleXMLRPCServer.py</li>
-<li>codeop.py</li>
-<li>gzip.py</li>
-<li>nturl2path.py</li>
-<li>sgmllib.py</li>
-<li>tokenize.py</li>
-<li>SocketServer.py</li>
-<li>collections.py</li>
-<li>hashlib.py</li>
-<li>numbers.py</li>
-<li>sha.py</li>
-<li>trace.py</li>
-<li>StringIO.py</li>
-<li>colorsys.py</li>
-<li>heapq.py</li>
-<li>opcode.py</li>
-<li>shelve.py</li>
-<li>traceback.py</li>
-<li>UserDict.py</li>
-<li>commands.py</li>
-<li>hmac.py</li>
-<li>optparse.py</li>
-<li>shlex.py</li>
-<li>tty.py</li>
-<li>UserList.py</li>
-<li>compileall.py</li>
-<li>hotshot</li>
-<li>os.py</li>
-<li>shutil.py</li>
-<li>types.py</li>
-<li>UserString.py</li>
-<li>compiler</li>
-<li>htmlentitydefs.py</li>
-<li>os2emxpath.py</li>
-<li>site.py</li>
-<li>unittest</li>
-<li>_LWPCookieJar.py</li>
-<li>config</li>
-<li>htmllib.py</li>
-<li>smtpd.py</li>
-<li>urllib.py</li>
-<li>_MozillaCookieJar.py</li>
-<li>contextlib.py</li>
-<li>httplib.py</li>
-<li>pdb.py</li>
-<li>smtplib.py</li>
-<li>urllib2.py</li>
-<li>__future__.py</li>
-<li>cookielib.py</li>
-<li>ihooks.py</li>
-<li>pickle.py</li>
-<li>sndhdr.py</li>
-<li>urlparse.py</li>
-<li>__phello__.foo.py</li>
-<li>copy.py</li>
-<li>imaplib.py</li>
-<li>pickletools.py</li>
-<li>socket.py</li>
-<li>user.py</li>
-<li>_abcoll.py</li>
-<li>copy_reg.py</li>
-<li>imghdr.py</li>
-<li>pipes.py</li>
-<li>sqlite3</li>
-<li>uu.py</li>
-<li>_pyio.py</li>
-<li>csv.py</li>
-<li>importlib</li>
-<li>pkgutil.py</li>
-<li>sre.py</li>
-<li>uuid.py</li>
-<li>_strptime.py</li>
-<li>ctypes</li>
-<li>imputil.py</li>
-<li>plat-linux4</li>
-<li>sre_compile.py</li>
-<li>warnings.py</li>
-<li>_threading_local.py</li>
-<li>dbhash.py</li>
-<li>inspect.py</li>
-<li>platform.py</li>
-<li>sre_constants.py</li>
-<li>wave.py</li>
-<li>_weakrefset.py</li>
-<li>decimal.py</li>
-<li>io.py</li>
-<li>plistlib.py</li>
-<li>sre_parse.py</li>
-<li>weakref.py</li>
-<li>abc.py</li>
-<li>difflib.py</li>
-<li>json</li>
-<li>popen2.py</li>
-<li>ssl.py</li>
-<li>webbrowser.py</li>
-<li>aifc.py</li>
-<li>dircache.py</li>
-<li>keyword.py</li>
-<li>poplib.py</li>
-<li>stat.py</li>
-<li>whichdb.py</li>
-<li>antigravity.py</li>
-<li>dis.py</li>
-<li>lib-tk</li>
-<li>posixfile.py</li>
-<li>statvfs.py</li>
-<li>wsgiref</li>
-<li>anydbm.py</li>
-<li>distutils</li>
-<li>linecache.py</li>
-<li>posixpath.py</li>
-<li>string.py</li>
-<li>argparse.py</li>
-<li>doctest.py</li>
-<li>locale.py</li>
-<li>pprint.py</li>
-<li>stringold.py</li>
-<li>xdrlib.py</li>
-<li>ast.py</li>
-<li>dumbdbm.py</li>
-<li>logging</li>
-<li>profile.py</li>
-<li>stringprep.py</li>
-<li>xml</li>
-<li>asynchat.py</li>
-<li>dummy_thread.py</li>
-<li>macpath.py</li>
-<li>pstats.py</li>
-<li>struct.py</li>
-<li>xmllib.py</li>
-<li>asyncore.py</li>
-<li>dummy_threading.py</li>
-<li>macurl2path.py</li>
-<li>pty.py</li>
-<li>subprocess.py</li>
-<li>xmlrpclib.py</li>
-<li>atexit.py</li>
-<li>email</li>
-<li>mailbox.py</li>
-<li>py_compile.py</li>
-<li>sunau.py</li>
-<li>zipfile.py</li>
-<li>audiodev.py</li>
-<li>encodings</li>
-<li>mailcap.py</li>
-<li>pyclbr.py</li>
-<li>sunaudio.py</li>
-<li>base64.py</li>
-<li>filecmp.py</li>
-<li>markupbase.py</li>
-<li>pydoc.py</li>
-<li>symbol.py</li>
-<li>bdb.py</li>
-<li>fileinput.py</li>
-<li>md5.py</li>
-<li>pydoc_data</li>
-<li>symtable.py</li>
-</ul>
-</div>
-</div>
-<div class="section" id="python-3rd-libraries">
-<h1>Python 3rd Libraries<a class="headerlink" href="#python-3rd-libraries" title="Permalink to this headline">¶</a></h1>
-<ul class="simple">
-<li><a class="reference external" href="https://www.crummy.com/software/BeautifulSoup/bs3/documentation.html">BeautifulSoup.py(3)</a></li>
-<li>pkg_resources.py</li>
-<li>androidhelper</li>
-<li>plyer</li>
-<li><a class="reference external" href="http://bottlepy.org/docs/dev/">bottle.py</a></li>
-<li>qpy.py</li>
-<li>qpythoninit.py</li>
-<li>setuptools</li>
-<li><a class="reference external" href="https://pypi.python.org/pypi/pip/">pip</a></li>
-</ul>
-</div>
-<div class="section" id="androidhelper-apis">
-<h1>Androidhelper APIs<a class="headerlink" href="#androidhelper-apis" title="Permalink to this headline">¶</a></h1>
-<p>To simplify QPython SL4A development in IDEs with a
-&#8220;hepler&#8221; class derived from the default Android class containing
-SL4A facade functions &amp; API documentation</p>
-<div class="toctree-wrapper compound">
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="guide_androidhelpers.html">AndroidFacade</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="guide_androidhelpers.html#clipboard-apis">Clipboard APIs</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_androidhelpers.html#intent-startactivity-apis">Intent &amp; startActivity APIs</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_androidhelpers.html#sendbroadcast-apis">SendBroadcast APIs</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_androidhelpers.html#vibrate">Vibrate</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_androidhelpers.html#networkstatus">NetworkStatus</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_androidhelpers.html#packageversion-apis">PackageVersion APIs</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_androidhelpers.html#system-apis">System APIs</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_androidhelpers.html#sendemail">SendEmail</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_androidhelpers.html#toast-getinput-getpassword-notify-apis">Toast, getInput, getPassword, notify APIs</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="guide_androidhelpers.html#applicationmanagerfacade">ApplicationManagerFacade</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="guide_androidhelpers.html#manager-apis">Manager APIs</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="guide_androidhelpers.html#camerafacade">CameraFacade</a></li>
-<li class="toctree-l1"><a class="reference internal" href="guide_androidhelpers.html#commonintentsfacade">CommonIntentsFacade</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="guide_androidhelpers.html#barcode">Barcode</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_androidhelpers.html#view-apis">View APIs</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="guide_androidhelpers.html#contactsfacade">ContactsFacade</a></li>
-<li class="toctree-l1"><a class="reference internal" href="guide_androidhelpers.html#eventfacade">EventFacade</a></li>
-<li class="toctree-l1"><a class="reference internal" href="guide_androidhelpers.html#locationfacade">LocationFacade</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="guide_androidhelpers.html#providers-apis">Providers APIs</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_androidhelpers.html#location-apis">Location APIs</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_androidhelpers.html#geo">GEO</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="guide_androidhelpers.html#phonefacade">PhoneFacade</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="guide_androidhelpers.html#phonestat-apis">PhoneStat APIs</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_androidhelpers.html#call-dia-apis">Call &amp; Dia APIs</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_androidhelpers.html#get-information-apis">Get information APIs</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="guide_androidhelpers.html#mediarecorderfacade">MediaRecorderFacade</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="guide_androidhelpers.html#audio">Audio</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_androidhelpers.html#video-apis">Video APIs</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_androidhelpers.html#stop">Stop</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="guide_androidhelpers.html#sensormanagerfacade">SensorManagerFacade</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="guide_androidhelpers.html#start-stop">Start &amp; Stop</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_androidhelpers.html#read-data-apis">Read data APIs</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="guide_androidhelpers.html#settingsfacade">SettingsFacade</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="guide_androidhelpers.html#screen">Screen</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_androidhelpers.html#airplanermode">AirplanerMode</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_androidhelpers.html#ringer-silent-mode">Ringer Silent Mode</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_androidhelpers.html#vibrate-mode">Vibrate Mode</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_androidhelpers.html#ringer-media-volume">Ringer &amp; Media Volume</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_androidhelpers.html#screen-brightness">Screen Brightness</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="guide_androidhelpers.html#smsfacade">SmsFacade</a></li>
-<li class="toctree-l1"><a class="reference internal" href="guide_androidhelpers.html#speechrecognitionfacade">SpeechRecognitionFacade</a></li>
-<li class="toctree-l1"><a class="reference internal" href="guide_androidhelpers.html#tonegeneratorfacade">ToneGeneratorFacade</a></li>
-<li class="toctree-l1"><a class="reference internal" href="guide_androidhelpers.html#wakelockfacade">WakeLockFacade</a></li>
-<li class="toctree-l1"><a class="reference internal" href="guide_androidhelpers.html#wififacade">WifiFacade</a></li>
-<li class="toctree-l1"><a class="reference internal" href="guide_androidhelpers.html#batterymanagerfacade">BatteryManagerFacade</a></li>
-<li class="toctree-l1"><a class="reference internal" href="guide_androidhelpers.html#activityresultfacade">ActivityResultFacade</a></li>
-<li class="toctree-l1"><a class="reference internal" href="guide_androidhelpers.html#mediaplayerfacade">MediaPlayerFacade</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="guide_androidhelpers.html#control">Control</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_androidhelpers.html#get-information">Get Information</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="guide_androidhelpers.html#preferencesfacade">PreferencesFacade</a></li>
-<li class="toctree-l1"><a class="reference internal" href="guide_androidhelpers.html#qpyinterfacefacade">QPyInterfaceFacade</a></li>
-<li class="toctree-l1"><a class="reference internal" href="guide_androidhelpers.html#texttospeechfacade">TextToSpeechFacade</a></li>
-<li class="toctree-l1"><a class="reference internal" href="guide_androidhelpers.html#eyesfreefacade">EyesFreeFacade</a></li>
-<li class="toctree-l1"><a class="reference internal" href="guide_androidhelpers.html#bluetoothfacade">BluetoothFacade</a></li>
-<li class="toctree-l1"><a class="reference internal" href="guide_androidhelpers.html#signalstrengthfacade">SignalStrengthFacade</a></li>
-<li class="toctree-l1"><a class="reference internal" href="guide_androidhelpers.html#webcamfacade">WebCamFacade</a></li>
-<li class="toctree-l1"><a class="reference internal" href="guide_androidhelpers.html#uifacade">UiFacade</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="guide_androidhelpers.html#dialog">Dialog</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_androidhelpers.html#nfc">NFC</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_androidhelpers.html#progress">Progress</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_androidhelpers.html#alert">Alert</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_androidhelpers.html#dialog-control">Dialog Control</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_androidhelpers.html#layout">Layout</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_androidhelpers.html#webview">WebView</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="guide_androidhelpers.html#usb-host-serial-facade">USB Host Serial Facade</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="guide_androidhelpers.html#requirements">Requirements</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_androidhelpers.html#status">Status</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_androidhelpers.html#author">Author</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_androidhelpers.html#apis">APIs</a></li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-</div>
-</div>
-</div>
-</div>
-<div class="fb-comments" data-href="http://qpython.org" data-numposts="10"></div>
-</div>
-</div>
-<div class="col-sm-2"></div>
-</div>
-<footer id="footer">
-<div class="col-sm-offset-2 col-sm-6 footer-div1">
-<div class="footer-block-item">
-<span class="footer-item1">Built with Sphinx using a theme provid by QPython.</span>
-<span class="footer-item2 visible-xs">
-&#169; Copyright 2017, QPython.
-</span>
-</div>
-</div>
-<div class="col-sm-2 footer-div2">
-<a href="/index.html" class="pull-right"><img src="../static/img_logo.png"></a>
-</div>
-</footer>
-<script type="text/javascript">
-$('.fb-comments').attr('data-href', (window.location.href.split('#')[0]).split('?')[0])
-(function(d, s, id) {
-var js, fjs = d.getElementsByTagName(s)[0];
-if (d.getElementById(id)) return;
-js = d.createElement(s); js.id = id;
-js.src = "//connect.facebook.net/en_US/sdk.js#xfbml=1&version=v2.8&appId=1680815145503311";
-fjs.parentNode.insertBefore(js, fjs);
-}(document, 'script', 'facebook-jssdk'));
-$(function(){
-if ($('#footer')[0].offsetTop < $(window).height()){
-$('#footer').addClass('to-bottom')
-}
-})
-</script>
-</body>
-</html>
diff --git a/docs/en/guide_program.html b/docs/en/guide_program.html
deleted file mode 100644
index 7d921f9d..00000000
--- a/docs/en/guide_program.html
+++ /dev/null
@@ -1,280 +0,0 @@
-<!DOCTYPE html>
-<html>
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>QPython’s main features &mdash; QPython 0.9 documentation</title>
-<link rel="stylesheet" href="../static/qpython_theme.css" type="text/css" />
-<link rel="stylesheet" href="../static/pygments.css" type="text/css" />
-<script type="text/javascript">
-var DOCUMENTATION_OPTIONS = {
-URL_ROOT:    '../',
-VERSION:     '0.9',
-COLLAPSE_INDEX: false,
-FILE_SUFFIX: '.html',
-HAS_SOURCE:  true
-};
-</script>
-<script type="text/javascript" src="../static/jquery.js"></script>
-<script type="text/javascript" src="../static/underscore.js"></script>
-<script type="text/javascript" src="../static/doctools.js"></script>
-<link rel="top" title="QPython 0.9 documentation" href="../document.html" />
-<link rel="up" title="Getting started" href="guide.html" />
-<link rel="next" title="Use the best way for developing" href="guide_ide.html" />
-<link rel="prev" title="Writing “Hello World”" href="guide_helloworld.html" />
-<meta charset="UTF-8">
-<link href="http://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet">
-<script src="http://cdn.bootcss.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
-<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
-</head>
-<body role="document">
-<div class="header doc-header">
-<div class="col-lg-offset-2 col-lg-8 col-md-offset-2 col-md-8 col-sm-offset-2 col-sm-8  index-header">
-<div class="navbar-header">
-<button type="button" class="navbar-toggle" data-toggle="collapse"
-data-target="#example-navbar-collapse">
-<span class="sr-only">切换导航</span>
-<span class="icon-bar"></span>
-<span class="icon-bar"></span>
-<span class="icon-bar"></span>
-</button>
-<a href="/index.html" class="logo"><img src="../static/img_logo.png"></a>
-</div>
-<ul class="header-title hidden-xs">
-<li class="header-phone-selected">
-<a href="/index.html">Home</a>
-</li>
-<li>
-<a href="/document.html" class="header-selected">Guide</a>
-<span class="header-title-selected"></span>
-</li>
-<li>
-<a target="_blank" href="https://github.com/qpython-android/qpython">Github</a>
-</li>
-</ul>
-<div class="search-box hidden-xs">
-<form action="../search.html">
-<input type="search" name="q" placeholder="keyword">
-<input type="hidden" name="check_keywords" value="yes" />
-<input type="hidden" name="area" value="default" />
-<button><img src="../static/ic_search.png"></button>
-</form>
-</div>
-</div>
-</div>
-<div class="row doc-content">
-<div class="content-main col-sm-offset-2 col-sm-8">
-<div class="content-wrapper col-sm-4">
-<div class="left-menu">
-<div class="doc-title hidden-xs">QPthon</div>
-<div class="sidebar  collapse navbar-collapse"  id="example-navbar-collapse">
-<ul class="current">
-<li class="toctree-l1"><a class="reference internal" href="guide.html">Getting started</a></li>
-<li class="toctree-l1 current"><a class="reference internal" href="guide.html#programming-guide">Programming Guide</a><ul class="current">
-<li class="toctree-l2 current"><a class="current reference internal" href="#">QPython&#8217;s main features</a><ul>
-<li class="toctree-l3"><a class="reference internal" href="#why-should-i-choose-qpython">Why should I choose QPython</a></li>
-<li class="toctree-l3"><a class="reference internal" href="#id1">QPython&#8217;s main features</a></li>
-</ul>
-</li>
-<li class="toctree-l2"><a class="reference internal" href="guide_ide.html">Use the best way for developing</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_libraries.html">QPython built-in Libraries</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_libraries.html#python-3rd-libraries">Python 3rd Libraries</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_libraries.html#androidhelper-apis">Androidhelper APIs</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_extend.html">QPython Open API</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guide_extend.html#qpython-online-service">QPython Online Service</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="guide.html#developers-guide">Developers&#8217; Guide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="guide.html#contributors-guide">Contributors&#8217; Guide</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="faq.html">FAQ</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../zhindex.html">中文用户向导</a></li>
-</ul>
-<div class="search-phone visible-xs">
-<form action="../search.html">
-<input type="search" name="q" placeholder="keyword">
-<input type="hidden" name="check_keywords" value="yes" />
-<input type="hidden" name="area" value="default" />
-<button><img src="../static/ic_search.png"></button>
-</form>
-</div>
-</div>
-</div>
-</div>
-<div class="content col-sm-8">
-<div class="document">
-<ul class="crumbs">
-<li><a href="../document.html">Guide</a> &raquo;</li>
-<li><a href="guide.html">Getting started</a> &raquo;</li>
-<li>QPython&#8217;s main features</li>
-</ul>
-<div class="documentwrapper">
-<div class="bodywrapper">
-<div class="body" role="main">
-<div class="section" id="qpython-s-main-features">
-<h1>QPython&#8217;s main features<a class="headerlink" href="#qpython-s-main-features" title="Permalink to this headline">¶</a></h1>
-<p><strong>With QPython, you could build android applications with android application and script language now.</strong></p>
-<div class="section" id="why-should-i-choose-qpython">
-<h2>Why should I choose QPython<a class="headerlink" href="#why-should-i-choose-qpython" title="Permalink to this headline">¶</a></h2>
-<p>The smartphone is becomming people&#8217;s essential information &amp; technical assitant, so an flexiable script engine could help people complete most jobs efficiently without complex development.</p>
-<p>QPython offer <strong>an amazing developing experience</strong>, with it&#8217;s help, you could implement the program easily without complex installing IDE, compiling, package progress etc.</p>
-</div>
-<div class="section" id="id1">
-<h2>QPython&#8217;s main features<a class="headerlink" href="#id1" title="Permalink to this headline">¶</a></h2>
-<p>You can do most jobs through QPython just like the way that Python does on PC/Laptop.</p>
-<p><strong>Libraries</strong></p>
-<ul class="simple">
-<li>QPython supports most stardard Python libraries.</li>
-<li>QPython supports many 3rd Python libraries which implemented with pure Python code.</li>
-<li>QPython supports some Python libraries mixed with C/C++ code which pre-compiled by QPython develop team.</li>
-<li>QPython allows you put on the libraries by yourself.</li>
-</ul>
-<p>Besides these, QPython offers some extra features which Python doesn&#8217;t offer, Like:</p>
-<ul class="simple">
-<li>Android APIs Access(Like SMS, GPS, NFC, BLUETOOTH etc)</li>
-</ul>
-<p><em>Why QPython require so many permissions?</em></p>
-<p>QPython need these permissions to access Android&#8217;s API.</p>
-<p><strong>Runtime modes</strong></p>
-<p>QPython supports several runtime modes for android.</p>
-<p><strong>Console mode</strong></p>
-<p>It&#8217;s the default runtime mode in QPython, it&#8217;s very common in PC/laptop.</p>
-<p><strong>Kivy mode</strong></p>
-<p>QPython supports <a class="reference external" href="http://kivy.org">Kivy</a> as the GUI programming solution.</p>
-<p>Kivy is an open source Python library for rapid development of applications that make use of innovative user interfaces, such as multi-touch apps.</p>
-<p>Your device should support opengl2.0 for supporting kivy mode.</p>
-<p>By insert into the following header in your script, you can let your script run with kivy mode.</p>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="c1">#qpy:kivy</span>
-</pre></div>
-</div>
-<p><em>An kivy program in QPython sample</em></p>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="c1">#qpy:kivy</span>
-<span class="kn">from</span> <span class="nn">kivy.app</span> <span class="k">import</span> <span class="n">App</span>
-<span class="kn">from</span> <span class="nn">kivy.uix.button</span> <span class="k">import</span> <span class="n">Button</span>
-<span class="k">class</span> <span class="nc">TestApp</span><span class="p">(</span><span class="n">App</span><span class="p">):</span>
-<span class="k">def</span> <span class="nf">build</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
-<span class="k">return</span> <span class="n">Button</span><span class="p">(</span><span class="n">text</span><span class="o">=</span><span class="s1">&#39;Hello World&#39;</span><span class="p">)</span>
-<span class="n">TestApp</span><span class="p">()</span><span class="o">.</span><span class="n">run</span><span class="p">()</span>
-</pre></div>
-</div>
-<p>If your library require the opengl driver, you shoule declare the kivy mode header in your script, like the jnius.</p>
-<p><em>NOTE: QPython3 didn&#8217;t support kivy mode yet, we have plan to support it in the future</em></p>
-<p><strong>WebApp mode</strong></p>
-<p>We recommend you implement WebApp with QPython for it offer the easy to accomplish UI and Take advantage of Python&#8217;s fast programming strong point.</p>
-<p>WebApp will start a webview in front, and run a python web service background.
-You could use <em>bottle*(QPython built-in library) to implement the web service, or you could install *django</em> / <em>flask</em> framework also.</p>
-<p>By insert into the following header in your script, you can let your script run with webapp mode.</p>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="c1">#qpy:webapp:&lt;app title&gt;</span>
-<span class="c1">#qpy:&lt;fullscreen or remove this line&gt;</span>
-<span class="c1">#qpy://&lt;ip:port:path&gt;</span>
-</pre></div>
-</div>
-<p>For example</p>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="c1">#qpy:webapp:Hello QPython</span>
-<span class="c1">#qpy://localhost:8080/hello</span>
-</pre></div>
-</div>
-<p>The previous should start a webview which should load the <em>http://localhost:8080/hello</em> as the default page, and the webview will keep the titlebar which title is &#8220;Hello QPython&#8221;, if you add the <em>#qpy:fullscreen</em> it will hide the titlebar.</p>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="c1">#qpy:webapp:Hello Qpython</span>
-<span class="c1">#qpy://127.0.0.1:8080/</span>
-<span class="sd">&quot;&quot;&quot;</span>
-<span class="sd">This is a sample for qpython webapp</span>
-<span class="sd">&quot;&quot;&quot;</span>
-<span class="kn">from</span> <span class="nn">bottle</span> <span class="k">import</span> <span class="n">Bottle</span><span class="p">,</span> <span class="n">ServerAdapter</span>
-<span class="kn">from</span> <span class="nn">bottle</span> <span class="k">import</span> <span class="n">run</span><span class="p">,</span> <span class="n">debug</span><span class="p">,</span> <span class="n">route</span><span class="p">,</span> <span class="n">error</span><span class="p">,</span> <span class="n">static_file</span><span class="p">,</span> <span class="n">template</span>
-<span class="c1">######### QPYTHON WEB SERVER ###############</span>
-<span class="k">class</span> <span class="nc">MyWSGIRefServer</span><span class="p">(</span><span class="n">ServerAdapter</span><span class="p">):</span>
-<span class="n">server</span> <span class="o">=</span> <span class="kc">None</span>
-<span class="k">def</span> <span class="nf">run</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">handler</span><span class="p">):</span>
-<span class="kn">from</span> <span class="nn">wsgiref.simple_server</span> <span class="k">import</span> <span class="n">make_server</span><span class="p">,</span> <span class="n">WSGIRequestHandler</span>
-<span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">quiet</span><span class="p">:</span>
-<span class="k">class</span> <span class="nc">QuietHandler</span><span class="p">(</span><span class="n">WSGIRequestHandler</span><span class="p">):</span>
-<span class="k">def</span> <span class="nf">log_request</span><span class="p">(</span><span class="o">*</span><span class="n">args</span><span class="p">,</span> <span class="o">**</span><span class="n">kw</span><span class="p">):</span> <span class="k">pass</span>
-<span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="p">[</span><span class="s1">&#39;handler_class&#39;</span><span class="p">]</span> <span class="o">=</span> <span class="n">QuietHandler</span>
-<span class="bp">self</span><span class="o">.</span><span class="n">server</span> <span class="o">=</span> <span class="n">make_server</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">host</span><span class="p">,</span> <span class="bp">self</span><span class="o">.</span><span class="n">port</span><span class="p">,</span> <span class="n">handler</span><span class="p">,</span> <span class="o">**</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="p">)</span>
-<span class="bp">self</span><span class="o">.</span><span class="n">server</span><span class="o">.</span><span class="n">serve_forever</span><span class="p">()</span>
-<span class="k">def</span> <span class="nf">stop</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
-<span class="c1">#sys.stderr.close()</span>
-<span class="kn">import</span> <span class="nn">threading</span>
-<span class="n">threading</span><span class="o">.</span><span class="n">Thread</span><span class="p">(</span><span class="n">target</span><span class="o">=</span><span class="bp">self</span><span class="o">.</span><span class="n">server</span><span class="o">.</span><span class="n">shutdown</span><span class="p">)</span><span class="o">.</span><span class="n">start</span><span class="p">()</span>
-<span class="c1">#self.server.shutdown()</span>
-<span class="bp">self</span><span class="o">.</span><span class="n">server</span><span class="o">.</span><span class="n">server_close</span><span class="p">()</span> <span class="c1">#&lt;--- alternative but causes bad fd exception</span>
-<span class="nb">print</span> <span class="s2">&quot;# qpyhttpd stop&quot;</span>
-<span class="c1">######### BUILT-IN ROUTERS ###############</span>
-<span class="nd">@route</span><span class="p">(</span><span class="s1">&#39;/__exit&#39;</span><span class="p">,</span> <span class="n">method</span><span class="o">=</span><span class="p">[</span><span class="s1">&#39;GET&#39;</span><span class="p">,</span><span class="s1">&#39;HEAD&#39;</span><span class="p">])</span>
-<span class="k">def</span> <span class="nf">__exit</span><span class="p">():</span>
-<span class="k">global</span> <span class="n">server</span>
-<span class="n">server</span><span class="o">.</span><span class="n">stop</span><span class="p">()</span>
-<span class="nd">@route</span><span class="p">(</span><span class="s1">&#39;/assets/&lt;filepath:path&gt;&#39;</span><span class="p">)</span>
-<span class="k">def</span> <span class="nf">serverstatic</span><span class="p">(</span><span class="n">filepath</span><span class="p">):</span>
-<span class="k">return</span> <span class="n">static_file</span><span class="p">(</span><span class="n">filepath</span><span class="p">,</span> <span class="n">root</span><span class="o">=</span><span class="s1">&#39;/sdcard&#39;</span><span class="p">)</span>
-<span class="c1">######### WEBAPP ROUTERS ###############</span>
-<span class="nd">@route</span><span class="p">(</span><span class="s1">&#39;/&#39;</span><span class="p">)</span>
-<span class="k">def</span> <span class="nf">home</span><span class="p">():</span>
-<span class="k">return</span> <span class="n">template</span><span class="p">(</span><span class="s1">&#39;&lt;h1&gt;Hello {{name}} !&lt;/h1&gt;&#39;</span><span class="o">+</span> \
-<span class="s1">&#39;&lt;a href=&quot;/assets/qpython/projects/WebApp Sample/main.py&quot;&gt;View source&lt;/a&gt;&#39;</span><span class="p">,</span><span class="n">name</span><span class="o">=</span><span class="s1">&#39;QPython&#39;</span><span class="p">)</span>
-<span class="c1">######### WEBAPP ROUTERS ###############</span>
-<span class="n">app</span> <span class="o">=</span> <span class="n">Bottle</span><span class="p">()</span>
-<span class="n">app</span><span class="o">.</span><span class="n">route</span><span class="p">(</span><span class="s1">&#39;/&#39;</span><span class="p">,</span> <span class="n">method</span><span class="o">=</span><span class="s1">&#39;GET&#39;</span><span class="p">)(</span><span class="n">home</span><span class="p">)</span>
-<span class="n">app</span><span class="o">.</span><span class="n">route</span><span class="p">(</span><span class="s1">&#39;/__exit&#39;</span><span class="p">,</span> <span class="n">method</span><span class="o">=</span><span class="p">[</span><span class="s1">&#39;GET&#39;</span><span class="p">,</span><span class="s1">&#39;HEAD&#39;</span><span class="p">])(</span><span class="n">__exit</span><span class="p">)</span>
-<span class="n">app</span><span class="o">.</span><span class="n">route</span><span class="p">(</span><span class="s1">&#39;/assets/&lt;filepath:path&gt;&#39;</span><span class="p">,</span> <span class="n">method</span><span class="o">=</span><span class="s1">&#39;GET&#39;</span><span class="p">)(</span><span class="n">serverstatic</span><span class="p">)</span>
-<span class="k">try</span><span class="p">:</span>
-<span class="n">server</span> <span class="o">=</span> <span class="n">MyWSGIRefServer</span><span class="p">(</span><span class="n">host</span><span class="o">=</span><span class="s2">&quot;127.0.0.1&quot;</span><span class="p">,</span> <span class="n">port</span><span class="o">=</span><span class="s2">&quot;8080&quot;</span><span class="p">)</span>
-<span class="n">app</span><span class="o">.</span><span class="n">run</span><span class="p">(</span><span class="n">server</span><span class="o">=</span><span class="n">server</span><span class="p">,</span><span class="n">reloader</span><span class="o">=</span><span class="kc">False</span><span class="p">)</span>
-<span class="k">except</span> <span class="ne">Exception</span><span class="p">,</span><span class="n">ex</span><span class="p">:</span>
-<span class="nb">print</span> <span class="s2">&quot;Exception: </span><span class="si">%s</span><span class="s2">&quot;</span> <span class="o">%</span> <span class="nb">repr</span><span class="p">(</span><span class="n">ex</span><span class="p">)</span>
-</pre></div>
-</div>
-<p>If you want the webapp could be close when you exit the webview, you have to define the <em>&#64;route(&#8216;/__exit&#8217;, method=[&#8216;GET&#8217;,&#8217;HEAD&#8217;])</em> method , for the qpython will request the <em>http://localhost:8080/__exit</em> when you exit the webview. So you can release other resource in this function.</p>
-<img alt="QPython WebApp Sample" src="../images/guide_program_pic1.png" />
-<p><em>Running screenshot</em></p>
-<p>In the other part of the code, you could implement a webserver whish serve on localhost:8080 and make the URL /hello implement as your webapp&#8217;s homepage.</p>
-<p><strong>Q mode</strong></p>
-<p>If you don&#8217;t want the QPython display some UI, pelase try to use the QScript mode, it could run a script background, just insert the following header into your script:</p>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="c1">#qpy:qpyapp</span>
-</pre></div>
-</div>
-</div>
-</div>
-</div>
-</div>
-</div>
-</div>
-<div class="fb-comments" data-href="http://qpython.org" data-numposts="10"></div>
-</div>
-</div>
-<div class="col-sm-2"></div>
-</div>
-<footer id="footer">
-<div class="col-sm-offset-2 col-sm-6 footer-div1">
-<div class="footer-block-item">
-<span class="footer-item1">Built with Sphinx using a theme provid by QPython.</span>
-<span class="footer-item2 visible-xs">
-&#169; Copyright 2017, QPython.
-</span>
-</div>
-</div>
-<div class="col-sm-2 footer-div2">
-<a href="/index.html" class="pull-right"><img src="../static/img_logo.png"></a>
-</div>
-</footer>
-<script type="text/javascript">
-$('.fb-comments').attr('data-href', (window.location.href.split('#')[0]).split('?')[0])
-(function(d, s, id) {
-var js, fjs = d.getElementsByTagName(s)[0];
-if (d.getElementById(id)) return;
-js = d.createElement(s); js.id = id;
-js.src = "//connect.facebook.net/en_US/sdk.js#xfbml=1&version=v2.8&appId=1680815145503311";
-fjs.parentNode.insertBefore(js, fjs);
-}(document, 'script', 'facebook-jssdk'));
-$(function(){
-if ($('#footer')[0].offsetTop < $(window).height()){
-$('#footer').addClass('to-bottom')
-}
-})
-</script>
-</body>
-</html>
diff --git a/docs/favicon.ico b/docs/favicon.ico
deleted file mode 100644
index 5650a967..00000000
Binary files a/docs/favicon.ico and /dev/null differ
diff --git a/docs/genindex.html b/docs/genindex.html
deleted file mode 100644
index 82f09869..00000000
--- a/docs/genindex.html
+++ /dev/null
@@ -1,821 +0,0 @@
-<!DOCTYPE html>
-<html>
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>Index &mdash; QPython 0.9 documentation</title>
-<link rel="stylesheet" href="static/qpython_theme.css" type="text/css" />
-<link rel="stylesheet" href="static/pygments.css" type="text/css" />
-<script type="text/javascript">
-var DOCUMENTATION_OPTIONS = {
-URL_ROOT:    './',
-VERSION:     '0.9',
-COLLAPSE_INDEX: false,
-FILE_SUFFIX: '.html',
-HAS_SOURCE:  true
-};
-</script>
-<script type="text/javascript" src="static/jquery.js"></script>
-<script type="text/javascript" src="static/underscore.js"></script>
-<script type="text/javascript" src="static/doctools.js"></script>
-<link rel="top" title="QPython 0.9 documentation" href="document.html" />
-<meta charset="UTF-8">
-<link href="http://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet">
-<script src="http://cdn.bootcss.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
-<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
-</head>
-<body role="document">
-<div class="header doc-header">
-<div class="col-lg-offset-2 col-lg-8 col-md-offset-2 col-md-8 col-sm-offset-2 col-sm-8  index-header">
-<div class="navbar-header">
-<button type="button" class="navbar-toggle" data-toggle="collapse"
-data-target="#example-navbar-collapse">
-<span class="sr-only">切换导航</span>
-<span class="icon-bar"></span>
-<span class="icon-bar"></span>
-<span class="icon-bar"></span>
-</button>
-<a href="/index.html" class="logo"><img src="static/img_logo.png"></a>
-</div>
-<ul class="header-title hidden-xs">
-<li class="header-phone-selected">
-<a href="/index.html">Home</a>
-</li>
-<li>
-<a href="/document.html" class="header-selected">Guide</a>
-<span class="header-title-selected"></span>
-</li>
-<li>
-<a target="_blank" href="https://github.com/qpython-android/qpython">Github</a>
-</li>
-</ul>
-<div class="search-box hidden-xs">
-<form action="search.html">
-<input type="search" name="q" placeholder="keyword">
-<input type="hidden" name="check_keywords" value="yes" />
-<input type="hidden" name="area" value="default" />
-<button><img src="static/ic_search.png"></button>
-</form>
-</div>
-</div>
-</div>
-<div class="row doc-content">
-<div class="content-main col-sm-offset-2 col-sm-8">
-<div class="content-wrapper col-sm-4">
-<div class="left-menu">
-<div class="doc-title hidden-xs">QPthon</div>
-<div class="sidebar  collapse navbar-collapse"  id="example-navbar-collapse">
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="en/guide.html">Getting started</a></li>
-<li class="toctree-l1"><a class="reference internal" href="en/guide.html#programming-guide">Programming Guide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="en/guide.html#developers-guide">Developers&#8217; Guide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="en/guide.html#contributors-guide">Contributors&#8217; Guide</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="en/faq.html">FAQ</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="zhindex.html">中文用户向导</a></li>
-</ul>
-<div class="search-phone visible-xs">
-<form action="search.html">
-<input type="search" name="q" placeholder="keyword">
-<input type="hidden" name="check_keywords" value="yes" />
-<input type="hidden" name="area" value="default" />
-<button><img src="static/ic_search.png"></button>
-</form>
-</div>
-</div>
-</div>
-</div>
-<div class="content col-sm-8">
-<div class="document">
-<ul class="crumbs">
-<li><a href="document.html">Guide</a> &raquo;</li>
-<li>Index</li>
-</ul>
-<div class="documentwrapper">
-<div class="bodywrapper">
-<div class="body" role="main">
-<h1 id="index">Index</h1>
-<div class="genindex-jumpbox">
-<a href="#A"><strong>A</strong></a>
-| <a href="#B"><strong>B</strong></a>
-| <a href="#C"><strong>C</strong></a>
-| <a href="#D"><strong>D</strong></a>
-| <a href="#E"><strong>E</strong></a>
-| <a href="#F"><strong>F</strong></a>
-| <a href="#G"><strong>G</strong></a>
-| <a href="#L"><strong>L</strong></a>
-| <a href="#M"><strong>M</strong></a>
-| <a href="#N"><strong>N</strong></a>
-| <a href="#P"><strong>P</strong></a>
-| <a href="#Q"><strong>Q</strong></a>
-| <a href="#R"><strong>R</strong></a>
-| <a href="#S"><strong>S</strong></a>
-| <a href="#T"><strong>T</strong></a>
-| <a href="#U"><strong>U</strong></a>
-| <a href="#V"><strong>V</strong></a>
-| <a href="#W"><strong>W</strong></a>
-</div>
-<h2 id="A">A</h2>
-<table style="width: 100%" class="indextable genindextable"><tr>
-<td style="width: 33%" valign="top"><dl>
-<dt><a href="en/guide_androidhelpers.html#addContextMenuItem">addContextMenuItem() (built-in function)</a>
-</dt>
-</dl></td>
-<td style="width: 33%" valign="top"><dl>
-<dt><a href="en/guide_androidhelpers.html#addOptionsMenuItem">addOptionsMenuItem() (built-in function)</a>
-</dt>
-</dl></td>
-</tr></table>
-<h2 id="B">B</h2>
-<table style="width: 100%" class="indextable genindextable"><tr>
-<td style="width: 33%" valign="top"><dl>
-<dt><a href="en/guide_androidhelpers.html#batteryCheckPresent">batteryCheckPresent() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#batteryGetHealth">batteryGetHealth() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#batteryGetLevel">batteryGetLevel() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#batteryGetPlugType">batteryGetPlugType() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#batteryGetStatus">batteryGetStatus() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#batteryGetTechnology">batteryGetTechnology() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#batteryGetTemperature">batteryGetTemperature() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#batteryGetVoltage">batteryGetVoltage() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#batteryStartMonitoring">batteryStartMonitoring() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#batteryStopMonitoring">batteryStopMonitoring() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#bluetoothAccept">bluetoothAccept() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#bluetoothActiveConnections">bluetoothActiveConnections() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#bluetoothConnect">bluetoothConnect() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#bluetoothDiscoveryCancel">bluetoothDiscoveryCancel() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#bluetoothDiscoveryStart">bluetoothDiscoveryStart() (built-in function)</a>
-</dt>
-</dl></td>
-<td style="width: 33%" valign="top"><dl>
-<dt><a href="en/guide_androidhelpers.html#bluetoothGetConnectedDeviceName">bluetoothGetConnectedDeviceName() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#bluetoothGetLocalAddress">bluetoothGetLocalAddress() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#bluetoothGetLocalName">bluetoothGetLocalName() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#bluetoothGetRemoteDeviceName">bluetoothGetRemoteDeviceName() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#bluetoothGetScanMode">bluetoothGetScanMode() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#bluetoothIsDiscovering">bluetoothIsDiscovering() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#bluetoothMakeDiscoverable">bluetoothMakeDiscoverable() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#bluetoothRead">bluetoothRead() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#bluetoothReadBinary">bluetoothReadBinary() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#bluetoothReadLine">bluetoothReadLine() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#bluetoothReadReady">bluetoothReadReady() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#bluetoothSetLocalName">bluetoothSetLocalName() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#bluetoothStop">bluetoothStop() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#bluetoothWrite">bluetoothWrite() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#bluetoothWriteBinary">bluetoothWriteBinary() (built-in function)</a>
-</dt>
-</dl></td>
-</tr></table>
-<h2 id="C">C</h2>
-<table style="width: 100%" class="indextable genindextable"><tr>
-<td style="width: 33%" valign="top"><dl>
-<dt><a href="en/guide_androidhelpers.html#cameraCapturePicture">cameraCapturePicture() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#cameraInteractiveCapturePicture">cameraInteractiveCapturePicture() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#cameraStartPreview">cameraStartPreview() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#cameraStopPreview">cameraStopPreview() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#checkAirplaneMode">checkAirplaneMode() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#checkBluetoothState">checkBluetoothState() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#checkNetworkRoaming">checkNetworkRoaming() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#checkRingerSilentMode">checkRingerSilentMode() (built-in function)</a>
-</dt>
-</dl></td>
-<td style="width: 33%" valign="top"><dl>
-<dt><a href="en/guide_androidhelpers.html#checkScreenOn">checkScreenOn() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#checkWifiState">checkWifiState() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#contactsGet">contactsGet() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#contactsGetAttributes">contactsGetAttributes() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#contactsGetById">contactsGetById() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#contactsGetCount">contactsGetCount() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#contactsGetIds">contactsGetIds() (built-in function)</a>
-</dt>
-</dl></td>
-</tr></table>
-<h2 id="D">D</h2>
-<table style="width: 100%" class="indextable genindextable"><tr>
-<td style="width: 33%" valign="top"><dl>
-<dt><a href="en/guide_androidhelpers.html#dialogCreateAlert">dialogCreateAlert() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#dialogCreateDatePicker">dialogCreateDatePicker() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#dialogCreateHorizontalProgress">dialogCreateHorizontalProgress() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#dialogCreateInput">dialogCreateInput() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#dialogCreateNFCBeamMaster">dialogCreateNFCBeamMaster() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#dialogCreateNFCBeamSlave">dialogCreateNFCBeamSlave() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#dialogCreatePassword">dialogCreatePassword() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#dialogCreateSeekBar">dialogCreateSeekBar() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#dialogCreateSpinnerProgress">dialogCreateSpinnerProgress() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#dialogCreateTimePicker">dialogCreateTimePicker() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#dialogDismiss">dialogDismiss() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#dialogGetInput">dialogGetInput() (built-in function)</a>
-</dt>
-</dl></td>
-<td style="width: 33%" valign="top"><dl>
-<dt><a href="en/guide_androidhelpers.html#dialogGetPassword">dialogGetPassword() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#dialogGetResponse">dialogGetResponse() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#dialogGetSelectedItems">dialogGetSelectedItems() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#dialogSetCurrentProgress">dialogSetCurrentProgress() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#dialogSetItems">dialogSetItems() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#dialogSetMaxProgress">dialogSetMaxProgress() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#dialogSetMultiChoiceItems">dialogSetMultiChoiceItems() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#dialogSetNegativeButtonText">dialogSetNegativeButtonText() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#dialogSetNeutralButtonText">dialogSetNeutralButtonText() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#dialogSetPositiveButtonText">dialogSetPositiveButtonText() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#dialogSetSingleChoiceItems">dialogSetSingleChoiceItems() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#dialogShow">dialogShow() (built-in function)</a>
-</dt>
-</dl></td>
-</tr></table>
-<h2 id="E">E</h2>
-<table style="width: 100%" class="indextable genindextable"><tr>
-<td style="width: 33%" valign="top"><dl>
-<dt><a href="en/guide_androidhelpers.html#environment">environment() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#eventClearBuffer">eventClearBuffer() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#eventGetBrodcastCategories">eventGetBrodcastCategories() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#eventPoll">eventPoll() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#eventPost">eventPost() (built-in function)</a>
-</dt>
-</dl></td>
-<td style="width: 33%" valign="top"><dl>
-<dt><a href="en/guide_androidhelpers.html#eventRegisterForBroadcast">eventRegisterForBroadcast() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#eventUnregisterForBroadcast">eventUnregisterForBroadcast() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#eventWait">eventWait() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#eventWaitFor">eventWaitFor() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#executeQPy">executeQPy() (built-in function)</a>
-</dt>
-</dl></td>
-</tr></table>
-<h2 id="F">F</h2>
-<table style="width: 100%" class="indextable genindextable"><tr>
-<td style="width: 33%" valign="top"><dl>
-<dt><a href="en/guide_androidhelpers.html#forceStopPackage">forceStopPackage() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#fullDismiss">fullDismiss() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#fullKeyOverride">fullKeyOverride() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#fullQuery">fullQuery() (built-in function)</a>
-</dt>
-</dl></td>
-<td style="width: 33%" valign="top"><dl>
-<dt><a href="en/guide_androidhelpers.html#fullQueryDetail">fullQueryDetail() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#fullSetList">fullSetList() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#fullSetProperty">fullSetProperty() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#fullShow">fullShow() (built-in function)</a>
-</dt>
-</dl></td>
-</tr></table>
-<h2 id="G">G</h2>
-<table style="width: 100%" class="indextable genindextable"><tr>
-<td style="width: 33%" valign="top"><dl>
-<dt><a href="en/guide_androidhelpers.html#generateDtmfTones">generateDtmfTones() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#geocode">geocode() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#getCellLocation">getCellLocation() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#getClipboard">getClipboard() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#getConstants">getConstants() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#getDeviceId">getDeviceId() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#getDeviceSoftwareVersion">getDeviceSoftwareVersion() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#getInput">getInput() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#getIntent">getIntent() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#getLastKnownLocation">getLastKnownLocation() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#getLaunchableApplications">getLaunchableApplications() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#getLine1Number">getLine1Number() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#getMaxMediaVolume">getMaxMediaVolume() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#getMaxRingerVolume">getMaxRingerVolume() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#getMediaVolume">getMediaVolume() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#getNeighboringCellInfo">getNeighboringCellInfo() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#getNetworkOperator">getNetworkOperator() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#getNetworkOperatorName">getNetworkOperatorName() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#getNetworkStatus">getNetworkStatus() (built-in function)</a>
-</dt>
-</dl></td>
-<td style="width: 33%" valign="top"><dl>
-<dt><a href="en/guide_androidhelpers.html#getNetworkType">getNetworkType() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#getPackageVersion">getPackageVersion() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#getPackageVersionCode">getPackageVersionCode() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#getPassword">getPassword() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#getPhoneType">getPhoneType() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#getRingerVolume">getRingerVolume() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#getRunningPackages">getRunningPackages() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#getScreenBrightness">getScreenBrightness() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#getScreenTimeout">getScreenTimeout() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#getSimCountryIso">getSimCountryIso() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#getSimOperator">getSimOperator() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#getSimOperatorName">getSimOperatorName() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#getSimSerialNumber">getSimSerialNumber() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#getSimState">getSimState() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#getSubscriberId">getSubscriberId() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#getVibrateMode">getVibrateMode() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#getVoiceMailAlphaTag">getVoiceMailAlphaTag() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#getVoiceMailNumber">getVoiceMailNumber() (built-in function)</a>
-</dt>
-</dl></td>
-</tr></table>
-<h2 id="L">L</h2>
-<table style="width: 100%" class="indextable genindextable"><tr>
-<td style="width: 33%" valign="top"><dl>
-<dt><a href="en/guide_androidhelpers.html#launch">launch() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#locationProviderEnabled">locationProviderEnabled() (built-in function)</a>
-</dt>
-</dl></td>
-<td style="width: 33%" valign="top"><dl>
-<dt><a href="en/guide_androidhelpers.html#locationProviders">locationProviders() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#log">log() (built-in function)</a>
-</dt>
-</dl></td>
-</tr></table>
-<h2 id="M">M</h2>
-<table style="width: 100%" class="indextable genindextable"><tr>
-<td style="width: 33%" valign="top"><dl>
-<dt><a href="en/guide_androidhelpers.html#makeIntent">makeIntent() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#makeToast">makeToast() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#mediaIsPlaying">mediaIsPlaying() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#mediaPlay">mediaPlay() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#mediaPlayClose">mediaPlayClose() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#mediaPlayInfo">mediaPlayInfo() (built-in function)</a>
-</dt>
-</dl></td>
-<td style="width: 33%" valign="top"><dl>
-<dt><a href="en/guide_androidhelpers.html#mediaPlayList">mediaPlayList() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#mediaPlayPause">mediaPlayPause() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#mediaPlaySeek">mediaPlaySeek() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#mediaPlaySetLooping">mediaPlaySetLooping() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#mediaPlayStart">mediaPlayStart() (built-in function)</a>
-</dt>
-</dl></td>
-</tr></table>
-<h2 id="N">N</h2>
-<table style="width: 100%" class="indextable genindextable"><tr>
-<td style="width: 33%" valign="top"><dl>
-<dt><a href="en/guide_androidhelpers.html#NFCBeamMessage">NFCBeamMessage() (built-in function)</a>
-</dt>
-</dl></td>
-<td style="width: 33%" valign="top"><dl>
-<dt><a href="en/guide_androidhelpers.html#notify">notify() (built-in function)</a>
-</dt>
-</dl></td>
-</tr></table>
-<h2 id="P">P</h2>
-<table style="width: 100%" class="indextable genindextable"><tr>
-<td style="width: 33%" valign="top"><dl>
-<dt><a href="en/guide_androidhelpers.html#phoneCall">phoneCall() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#phoneCallNumber">phoneCallNumber() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#phoneDial">phoneDial() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#phoneDialNumber">phoneDialNumber() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#pick">pick() (built-in function)</a>
-</dt>
-</dl></td>
-<td style="width: 33%" valign="top"><dl>
-<dt><a href="en/guide_androidhelpers.html#pickContact">pickContact() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#pickPhone">pickPhone() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#prefGetAll">prefGetAll() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#prefGetValue">prefGetValue() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#prefPutValue">prefPutValue() (built-in function)</a>
-</dt>
-</dl></td>
-</tr></table>
-<h2 id="Q">Q</h2>
-<table style="width: 100%" class="indextable genindextable"><tr>
-<td style="width: 33%" valign="top"><dl>
-<dt><a href="en/guide_androidhelpers.html#queryAttributes">queryAttributes() (built-in function)</a>
-</dt>
-</dl></td>
-<td style="width: 33%" valign="top"><dl>
-<dt><a href="en/guide_androidhelpers.html#queryContent">queryContent() (built-in function)</a>
-</dt>
-</dl></td>
-</tr></table>
-<h2 id="R">R</h2>
-<table style="width: 100%" class="indextable genindextable"><tr>
-<td style="width: 33%" valign="top"><dl>
-<dt><a href="en/guide_androidhelpers.html#readBatteryData">readBatteryData() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#readLocation">readLocation() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#readPhoneState">readPhoneState() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#readSensors">readSensors() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#readSignalStrengths">readSignalStrengths() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#receiveEvent">receiveEvent() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#recognizeSpeech">recognizeSpeech() (built-in function)</a>
-</dt>
-</dl></td>
-<td style="width: 33%" valign="top"><dl>
-<dt><a href="en/guide_androidhelpers.html#recorderCaptureVideo">recorderCaptureVideo() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#recorderStartMicrophone">recorderStartMicrophone() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#recorderStartVideo">recorderStartVideo() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#recorderStop">recorderStop() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#requiredVersion">requiredVersion() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#rpcPostEvent">rpcPostEvent() (built-in function)</a>
-</dt>
-</dl></td>
-</tr></table>
-<h2 id="S">S</h2>
-<table style="width: 100%" class="indextable genindextable"><tr>
-<td style="width: 33%" valign="top"><dl>
-<dt><a href="en/guide_androidhelpers.html#scanBarcode">scanBarcode() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#search">search() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#sendBroadcast">sendBroadcast() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#sendBroadcastIntent">sendBroadcastIntent() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#sendEmail">sendEmail() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#sensorsGetAccuracy">sensorsGetAccuracy() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#sensorsGetLight">sensorsGetLight() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#sensorsReadAccelerometer">sensorsReadAccelerometer() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#sensorsReadMagnetometer">sensorsReadMagnetometer() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#sensorsReadOrientation">sensorsReadOrientation() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#setClipboard">setClipboard() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#setMediaVolume">setMediaVolume() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#setResultBoolean">setResultBoolean() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#setResultBooleanArray">setResultBooleanArray() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#setResultByte">setResultByte() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#setResultByteArray">setResultByteArray() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#setResultChar">setResultChar() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#setResultCharArray">setResultCharArray() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#setResultDouble">setResultDouble() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#setResultDoubleArray">setResultDoubleArray() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#setResultFloat">setResultFloat() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#setResultFloatArray">setResultFloatArray() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#setResultInteger">setResultInteger() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#setResultIntegerArray">setResultIntegerArray() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#setResultLong">setResultLong() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#setResultLongArray">setResultLongArray() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#setResultSerializable">setResultSerializable() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#setResultShort">setResultShort() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#setResultShortArray">setResultShortArray() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#setResultString">setResultString() (built-in function)</a>
-</dt>
-</dl></td>
-<td style="width: 33%" valign="top"><dl>
-<dt><a href="en/guide_androidhelpers.html#setResultStringArray">setResultStringArray() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#setRingerVolume">setRingerVolume() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#setScreenBrightness">setScreenBrightness() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#setScreenTimeout">setScreenTimeout() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#smsDeleteMessage">smsDeleteMessage() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#smsGetAttributes">smsGetAttributes() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#smsGetMessageById">smsGetMessageById() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#smsGetMessageCount">smsGetMessageCount() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#smsGetMessageIds">smsGetMessageIds() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#smsGetMessages">smsGetMessages() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#smsMarkMessageRead">smsMarkMessageRead() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#smsSend">smsSend() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#startActivity">startActivity() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#startActivityForResult">startActivityForResult() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#startActivityForResultIntent">startActivityForResultIntent() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#startActivityIntent">startActivityIntent() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#startEventDispatcher">startEventDispatcher() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#startInteractiveVideoRecording">startInteractiveVideoRecording() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#startLocating">startLocating() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#startSensing">startSensing() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#startSensingThreshold">startSensingThreshold() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#startSensingTimed">startSensingTimed() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#startTrackingPhoneState">startTrackingPhoneState() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#startTrackingSignalStrengths">startTrackingSignalStrengths() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#stopEventDispatcher">stopEventDispatcher() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#stopLocating">stopLocating() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#stopSensing">stopSensing() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#stopTrackingPhoneState">stopTrackingPhoneState() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#stopTrackingSignalStrengths">stopTrackingSignalStrengths() (built-in function)</a>
-</dt>
-</dl></td>
-</tr></table>
-<h2 id="T">T</h2>
-<table style="width: 100%" class="indextable genindextable"><tr>
-<td style="width: 33%" valign="top"><dl>
-<dt><a href="en/guide_androidhelpers.html#toggleAirplaneMode">toggleAirplaneMode() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#toggleBluetoothState">toggleBluetoothState() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#toggleRingerSilentMode">toggleRingerSilentMode() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#toggleVibrateMode">toggleVibrateMode() (built-in function)</a>
-</dt>
-</dl></td>
-<td style="width: 33%" valign="top"><dl>
-<dt><a href="en/guide_androidhelpers.html#toggleWifiState">toggleWifiState() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#ttsIsSpeaking">ttsIsSpeaking() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#ttsSpeak">ttsSpeak() (built-in function)</a>, <a href="en/guide_androidhelpers.html#ttsSpeak">[1]</a>
-</dt>
-</dl></td>
-</tr></table>
-<h2 id="U">U</h2>
-<table style="width: 100%" class="indextable genindextable"><tr>
-<td style="width: 33%" valign="top"><dl>
-<dt><a href="en/guide_androidhelpers.html#usbserialActiveConnections">usbserialActiveConnections() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#usbserialConnect">usbserialConnect() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#usbserialDisconnect">usbserialDisconnect() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#usbserialGetDeviceList">usbserialGetDeviceList() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#usbserialGetDeviceName">usbserialGetDeviceName() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#usbserialHostEnable">usbserialHostEnable() (built-in function)</a>
-</dt>
-</dl></td>
-<td style="width: 33%" valign="top"><dl>
-<dt><a href="en/guide_androidhelpers.html#usbserialRead">usbserialRead() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#usbserialReadBinary">usbserialReadBinary() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#usbserialReadReady">usbserialReadReady() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#usbserialWrite">usbserialWrite() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#usbserialWriteBinary">usbserialWriteBinary() (built-in function)</a>
-</dt>
-</dl></td>
-</tr></table>
-<h2 id="V">V</h2>
-<table style="width: 100%" class="indextable genindextable"><tr>
-<td style="width: 33%" valign="top"><dl>
-<dt><a href="en/guide_androidhelpers.html#vibrate">vibrate() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#view">view() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#viewContacts">viewContacts() (built-in function)</a>
-</dt>
-</dl></td>
-<td style="width: 33%" valign="top"><dl>
-<dt><a href="en/guide_androidhelpers.html#viewHtml">viewHtml() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#viewMap">viewMap() (built-in function)</a>
-</dt>
-</dl></td>
-</tr></table>
-<h2 id="W">W</h2>
-<table style="width: 100%" class="indextable genindextable"><tr>
-<td style="width: 33%" valign="top"><dl>
-<dt><a href="en/guide_androidhelpers.html#waitForEvent">waitForEvent() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#wakeLockAcquireBright">wakeLockAcquireBright() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#wakeLockAcquireDim">wakeLockAcquireDim() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#wakeLockAcquireFull">wakeLockAcquireFull() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#wakeLockAcquirePartial">wakeLockAcquirePartial() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#wakeLockRelease">wakeLockRelease() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#webcamAdjustQuality">webcamAdjustQuality() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#webcamStart">webcamStart() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#webViewShow">webViewShow() (built-in function)</a>
-</dt>
-</dl></td>
-<td style="width: 33%" valign="top"><dl>
-<dt><a href="en/guide_androidhelpers.html#wifiDisconnect">wifiDisconnect() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#wifiGetConnectionInfo">wifiGetConnectionInfo() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#wifiGetScanResults">wifiGetScanResults() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#wifiLockAcquireFull">wifiLockAcquireFull() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#wifiLockAcquireScanOnly">wifiLockAcquireScanOnly() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#wifiLockRelease">wifiLockRelease() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#wifiReassociate">wifiReassociate() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#wifiReconnect">wifiReconnect() (built-in function)</a>
-</dt>
-<dt><a href="en/guide_androidhelpers.html#wifiStartScan">wifiStartScan() (built-in function)</a>
-</dt>
-</dl></td>
-</tr></table>
-</div>
-</div>
-</div>
-</div>
-<div class="fb-comments" data-href="http://qpython.org" data-numposts="10"></div>
-</div>
-</div>
-<div class="col-sm-2"></div>
-</div>
-<footer id="footer">
-<div class="col-sm-offset-2 col-sm-6 footer-div1">
-<div class="footer-block-item">
-<span class="footer-item1">Built with Sphinx using a theme provid by QPython.</span>
-<span class="footer-item2 visible-xs">
-&#169; Copyright 2017, QPython.
-</span>
-</div>
-</div>
-<div class="col-sm-2 footer-div2">
-<a href="/index.html" class="pull-right"><img src="static/img_logo.png"></a>
-</div>
-</footer>
-<script type="text/javascript">
-$('.fb-comments').attr('data-href', (window.location.href.split('#')[0]).split('?')[0])
-(function(d, s, id) {
-var js, fjs = d.getElementsByTagName(s)[0];
-if (d.getElementById(id)) return;
-js = d.createElement(s); js.id = id;
-js.src = "//connect.facebook.net/en_US/sdk.js#xfbml=1&version=v2.8&appId=1680815145503311";
-fjs.parentNode.insertBefore(js, fjs);
-}(document, 'script', 'facebook-jssdk'));
-$(function(){
-if ($('#footer')[0].offsetTop < $(window).height()){
-$('#footer').addClass('to-bottom')
-}
-})
-</script>
-</body>
-</html>
diff --git a/docs/images/1.png b/docs/images/1.png
deleted file mode 100644
index a539f0e8..00000000
Binary files a/docs/images/1.png and /dev/null differ
diff --git a/docs/images/2.png b/docs/images/2.png
deleted file mode 100644
index dd65bc6c..00000000
Binary files a/docs/images/2.png and /dev/null differ
diff --git a/docs/images/3.png b/docs/images/3.png
deleted file mode 100644
index cb9bbea5..00000000
Binary files a/docs/images/3.png and /dev/null differ
diff --git a/docs/images/bestpython.png b/docs/images/bestpython.png
deleted file mode 100644
index 59940ff3..00000000
Binary files a/docs/images/bestpython.png and /dev/null differ
diff --git a/docs/images/guide_extend_pic1.png b/docs/images/guide_extend_pic1.png
deleted file mode 100644
index fae7de0e..00000000
Binary files a/docs/images/guide_extend_pic1.png and /dev/null differ
diff --git a/docs/images/guide_extend_pic2.png b/docs/images/guide_extend_pic2.png
deleted file mode 100644
index bcff8648..00000000
Binary files a/docs/images/guide_extend_pic2.png and /dev/null differ
diff --git a/docs/images/guide_helloworld_pic1.png b/docs/images/guide_helloworld_pic1.png
deleted file mode 100644
index 712e9864..00000000
Binary files a/docs/images/guide_helloworld_pic1.png and /dev/null differ
diff --git a/docs/images/guide_howtostart_pic1.png b/docs/images/guide_howtostart_pic1.png
deleted file mode 100644
index 54c666a7..00000000
Binary files a/docs/images/guide_howtostart_pic1.png and /dev/null differ
diff --git a/docs/images/guide_howtostart_pic2.png b/docs/images/guide_howtostart_pic2.png
deleted file mode 100644
index 296a5150..00000000
Binary files a/docs/images/guide_howtostart_pic2.png and /dev/null differ
diff --git a/docs/images/guide_howtostart_pic3.png b/docs/images/guide_howtostart_pic3.png
deleted file mode 100644
index f7caf8c7..00000000
Binary files a/docs/images/guide_howtostart_pic3.png and /dev/null differ
diff --git a/docs/images/guide_howtostart_pic4.png b/docs/images/guide_howtostart_pic4.png
deleted file mode 100644
index 6d2b2fc3..00000000
Binary files a/docs/images/guide_howtostart_pic4.png and /dev/null differ
diff --git a/docs/images/guide_howtostart_pic5.png b/docs/images/guide_howtostart_pic5.png
deleted file mode 100644
index 9e30aed4..00000000
Binary files a/docs/images/guide_howtostart_pic5.png and /dev/null differ
diff --git a/docs/images/guide_ide_qedit4web.png b/docs/images/guide_ide_qedit4web.png
deleted file mode 100644
index 09f2ccb3..00000000
Binary files a/docs/images/guide_ide_qedit4web.png and /dev/null differ
diff --git a/docs/images/guide_ide_qedit4web_choose.png b/docs/images/guide_ide_qedit4web_choose.png
deleted file mode 100644
index 6f3edfd3..00000000
Binary files a/docs/images/guide_ide_qedit4web_choose.png and /dev/null differ
diff --git a/docs/images/guide_ide_qedit4web_develop.png b/docs/images/guide_ide_qedit4web_develop.png
deleted file mode 100644
index 0fde32ce..00000000
Binary files a/docs/images/guide_ide_qedit4web_develop.png and /dev/null differ
diff --git a/docs/images/guide_program_pic1.png b/docs/images/guide_program_pic1.png
deleted file mode 100644
index 4cdf975c..00000000
Binary files a/docs/images/guide_program_pic1.png and /dev/null differ
diff --git a/docs/images/sl4a.jpg b/docs/images/sl4a.jpg
deleted file mode 100644
index cf451532..00000000
Binary files a/docs/images/sl4a.jpg and /dev/null differ
diff --git a/docs/index.html b/docs/index.html
deleted file mode 100755
index 1361441d..00000000
--- a/docs/index.html
+++ /dev/null
@@ -1,171 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-        <title>QPython -  Best Mobile Python IDE</title>
-        <meta charset="utf-8">
-        <meta name="keywords" content="QPython,Best Mobile Python IDE,python,qpython文档"/>
-        <meta name="description" content="QPython,Best Mobile Python IDE,python,qpython文档"/>
-    <link href="http://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet">
-    <script src="http://cdn.bootcss.com/jquery/3.2.1/jquery.min.js"></script>
-    <script src="http://cdn.bootcss.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
-    <meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
-    <link rel="stylesheet" type="text/css" href="static/qpython_theme.css">
-</head>
-<body>
-	<header>
-		<div class="col-lg-offset-2 col-lg-8 col-md-offset-2 col-md-8 col-sm-offset-2 col-sm-8 index-header">
-
-			<div class="navbar-header">
-				<button type="button" class="navbar-toggle" data-toggle="collapse"
-						data-target="#example-navbar-collapse">
-					<span class="sr-only">切换导航</span>
-					<span class="icon-bar"></span>
-					<span class="icon-bar"></span>
-					<span class="icon-bar"></span>
-				</button>
-				<a href="/index.html" class="logo"><img src="static/img_logo.png"></a>
-			</div>
-
-			<ul class="header-title collapse navbar-collapse" id="example-navbar-collapse">
-				<li class="header-phone-selected">
-					<a href="/index.html" class="header-selected">Home</a>
-					<!-- <span class="header-title-selected"></span> -->
-				</li>
-				<li>
-					<a href="/document.html">Guide</a>
-				</li>
-				<li>
-					<a target="_blank" href="https://github.com/qpython-android/qpython">Github</a>
-				</li>
-			</ul>
-			<div class="search-box hidden-xs">
-				<form action="/search.html">
-					<input type="search" name="q" placeholder="keyword">
-					<input type="hidden" name="check_keywords" value="yes" />
-            					<input type="hidden" name="area" value="default" />
-					<button><img src="static/ic_search.png"></button>
-				</form>
-			</div>
-		</div>
-	</header>
-
-	<main class="index-main">
-		<div class="row index-main-pic clear-margin">
-			<div class="col-lg-offset-2 col-lg-8 col-md-offset-2 col-md-8 col-sm-offset-2 col-sm-8">
-				<img src="static/img_banner-1@2x.jpg" class="img-responsive hidden-xs">
-				<img src="static/img_banner-1.jpg" class="img-responsive visible-xs">
-			</div>
-			<div class="col-lg-2 col-md-2 col-sm-2"></div>
-		</div>
-
-		<div class="row index-content">
-			<div class="col-lg-offset-2 col-lg-8 col-md-offset-2 col-md-8 col-sm-offset-2 col-sm-8">
-				<h2 class="h2"><span class="index-tag"></span>Welcome to read the QPython guide!</h2>
-				<div class="index-content-text">
-					QPython is a script engine that runs Python on android devices. lt lets your android device run Python scripts and projects. lt contains the Python interpreter,console,editor,and the SL4A Libray for Android. lt’s Python on Android!
-				</div>
-				<ul class="index-shop-logo-ul">
-					<li style="text-align: center;" class="visible-xs">
-						<a target="_brank" href="https://play.google.com/store/apps/details?id=org.qpython.qpy
-"><img class="index-shop-img" src="static/ic_googleplay_2x.png"></a>
-					</li>
-					<li style="text-align: center;" class="visible-xs">
-						<a target="_brank" href="https://play.google.com/store/apps/details?id=org.qpython.qpy3
-"><img class="index-shop-img" src="static/ic_googleplay_3_2x.png"></a>		
-					</li>
-				</ul>
-			</div>
-		</div>
-	</main>
-
-	<div class="index-more">
-		<div class="row clear-margin">
-			<div class="col-lg-offset-2 col-lg-8 col-md-offset-2 col-md-8 col-sm-offset-2 col-sm-8">
-				<ul class="row">
-					<li class="col-sm-4 index-more-li">
-						<div class="index-more-item">
-							<h4><img src="static/ic_new@2x.png" width="19px"> What’s NEW</h4>
-							<p>QPython project include the QPython and QPython3 applications.</p>
-							<p>QPython application is using the Python 2.7.2, and QPyton application is using the Python 3.2.2.</p>
-							<p>QPython’s newest version is 1.3.(Released on 2017/3/20),QPython3’s newest ……</p>
-						</div>
-					</li>
-					<li class="col-sm-4 index-more-li">
-						<div class="index-more-item">
-							<h4><img src="static/ic_community@2x.png" width="19px"> QPython communities</h4>
-							<p>There are many active QPython communities where you could meet the QPython users like you </p>
-							<ul>
-								<li>　•　Join Facebook community</li>
-								<li>　•　Join Google group</li>
-								<li>　•　Join Gitter chat</li>
-								<li>　•　Join G+ community(For QPython testers)</li>
-								<li>　•　QPython on Stackoverflow</li>
-							</ul>
-						</div>
-					</li>
-					<li class="col-sm-4 index-more-li">
-						<div class="index-more-item">
-							<h4><img src="static/ic_support@2x.png" width="19px"> Support</h4>
-							<p>We are happy to hear feedback from you, but sometimes some bugs or features demand may not be implented soon for we lack resources.</p>
-							<p>We are happy to hear feedback from you, but sometimes some bugs or features demand may not be implented soon for we lack resources.</p>
-						</div>
-					</li>
-				</ul>
-			</div>
-		</div>
-		<div class="row index-faq clear-margin">
-			<div class="col-sm-offset-2 col-sm-8">
-				<ul>
-					<li class="index-faq-li col-sm-4 hidden-xs">
-						<a href="http://www.facebook.com/qpython" target="_brank"><img class="index-link-logo" src="static/ic_facebook.png" width="44px"></a>
-						<a href="http://www.twitter.com/qpython" target="_brank"><img class="index-link-logo" src="static/ic_twitter.png" width="44px"></a>
-					</li>
-					<li class="index-faq-li col-sm-4">
-						<img src="static/ic_faq@2x.png">
-						<span class="span-faq">FAQ</span>
-						<p class="p-faq">
-							<a href="/en/faq.html">How to run qpython script from other terminals ?</a>
-						</p>
-					</li>
-					<li class="index-faq-li col-sm-4 hidden-xs">
-						<!-- <div style="text-align: right;">
-							<img class="index-shop-img" src="static/ic_appstore_2x.png">
-						</div> -->
-						<div style="text-align: right;">
-							<a target="_brank" href="https://play.google.com/store/apps/details?id=org.qpython.qpy
-"><img class="index-shop-img" src="static/ic_googleplay_2x.png"></a>		
-						</div>
-						<div style="text-align: right;">
-							<a target="_brank" href="https://play.google.com/store/apps/details?id=org.qpython.qpy3
-"><img class="index-shop-img" src="static/ic_googleplay_3_2x.png"></a>		
-						</div>
-					</li>
-				</ul>
-			</div>
-		</div>
-	</div>
-	<footer>
-		<div class="col-sm-offset-2 col-sm-6 footer-div1">
-			<div class="footer-block-item">
-				<span class="footer-item1">Built with Sphinx using a theme provid by QPython.</span>
-				<span class="footer-item2 visible-xs">Copyight 2017, QPython.</span>
-			</div>
-		</div>
-		<div class="col-sm-2 footer-div2">
-			<a href="/index.html" class="pull-right"><img src="static/img_logo.png"></a>
-		</div>
-	</footer>
-</body>
-</html>
-
-<script>
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-
-  ga('create', 'UA-36070037-1', 'auto');
-  ga('send', 'pageview');
-
-</script>
-
diff --git a/docs/objects.inv b/docs/objects.inv
deleted file mode 100644
index e5f60c63..00000000
Binary files a/docs/objects.inv and /dev/null differ
diff --git a/docs/quick-start/index.html b/docs/quick-start/index.html
deleted file mode 100644
index 19b2bad9..00000000
--- a/docs/quick-start/index.html
+++ /dev/null
@@ -1,189 +0,0 @@
-<!DOCTYPE html>
-<!--[if IE 6]>
-<html id="ie6" lang="en-US">
-<![endif]-->
-<!--[if IE 7]>
-<html id="ie7" lang="en-US">
-<![endif]-->
-<!--[if IE 8]>
-<html id="ie8" lang="en-US">
-<![endif]-->
-<!--[if !(IE 6) | !(IE 7) | !(IE 8)  ]><!-->
-<html lang="en-US">
-<!--<![endif]-->
-<head>
-<meta charset="UTF-8" />
-<meta name="viewport" content="width=device-width" />
-<title>Quick Start | QPyPI</title>
-<link rel="profile" href="http://gmpg.org/xfn/11" />
-<link rel="stylesheet" type="text/css" media="all" href="http://qpython.com/qrcode/wp-content/themes/twentyeleven/style.css" />
-<script type='text/javascript' src='http://code.jquery.com/jquery-1.8.3.min.js'></script>
-<style type="text/css">.recentcomments a{display:inline !important;padding:0 !important;margin:0 !important;}
-button {
-padding: 10px 16px;
-font-size: 18px;
-line-height: 1.33;
-border-radius: 6px;
-color: #ffffff;
-background-color: #5cb85c;
-border-color: #4cae4c;
-display: inline-block;
-padding: 6px 12px;
-margin-bottom: 0;
-font-size: 14px;
-font-weight: normal;
-line-height: 1.428571429;
-text-align: center;
-white-space: nowrap;
-vertical-align: middle;
-cursor: pointer;
-background-image: none;
-border: 1px solid transparent;
-border-radius: 4px;
--webkit-user-select: none;
--moz-user-select: none;
--ms-user-select: none;
--o-user-select: none;
-user-select: none;
-
-}
-</style>
-</head>
-
-<body class="page page-id-472 page-template-default single-author singular one-column content" style='background:white'>
-<div id="page" class="hfeed">
-    <header id="branding" role="banner" style='border-top:0px'>
-            <nav id="access" role="navigation">
-                <div class="menu"></div>
-            </nav><!-- #access -->
-    </header><!-- #branding -->
-
-    <div id="main" style='padding-top:0px'>
-        <div id="primary">
-            <div id="content" role="main">
-
-                <article id="post-472" class="post-472 page type-page status-publish hentry">
-                    <header class="entry-header"><h1 class="entry-title">Quick Start</h1></header><!-- .entry-header -->
-                    <div class="entry-content" style='padding:0px'>
-                    <div>
-<h2>A hands-on introduction to Python for beginning programmers</h2>
-<p>If you are a new guy to QPython, you should watch the tutorial video and just follow the steps to learn how to run script with QPython
-</p>
-<div style='text-align:center'><button style="display:inline" type="submit" value="" class="btn_c" id="step5-btn">Watch Tutorial</button></div>
-</div>
-<div style="padding-top:30px">
-<h2>Running with Console</h2>
-<p>Running QPython&#8217;s simple script with console model</p>
-<pre style="box-shadow:inset 0 1px 1px rgba(0,0,0,0.1);border:1px solid #ddd" id="step1-code">#qpy:2
-#qpy:console
-#qpy:http://qpython.com/s/qpy-sample.py
-
-class Calculator(object):
-    #define class to simulate a simple calculator
-    def __init__ (self):
-        #start with zero
-        self.current = 0
-    def add(self, amount):
-        #add number to current
-        self.current += amount
-    def getCurrent(self):
-        return self.current
-
-myBuddy = Calculator() # make myBuddy into a Calculator object
-myBuddy.add(2) #use myBuddy's new add method derived from the Calculator class
-print(myBuddy.getCurrent()) #print myBuddy's current instance variable
-
-</pre>
-<div style='text-align:center'><button style="display:inline" type="submit" value="" class="btn_c" id="step1-btn">Copy to editor to run</button></div>
-</div>
-<div style="padding-top:30px">
-<h2>Running with Kivy</h2>
-<p>Running QPython&#8217;s script with GUI model ( Kivy library )</p>
-<pre style="box-shadow:inset 0 1px 1px rgba(0,0,0,0.1);border:1px solid #ddd" id="step2-code">#qpy:2
-#qpy:kivy
-#qpy:http://qpython.com/s/qpy-guisample.py
-
-from kivy.app import App
-from kivy.uix.button import Button
-
-class TestApp(App):
-    def build(self):
-        # display a button with the text : Hello QPython 
-        return Button(text='Hello QPython')
-
-TestApp().run()
-</pre>
-<div style='text-align:center'><button style="display:inline" type="submit" value="Copy to editor to run" class="btn_c" id="step2-btn">Copy to editor to run</button></div>
-</div>
-<div style="padding-top:30px">
-<h2>Running as Web App ( QPython needs >= 0.9.7.x )</h2>
-<p>Running Web App with QPython</p>
-<pre style="box-shadow:inset 0 1px 1px rgba(0,0,0,0.1);border:1px solid #ddd" id="step6-code">#qpy:2
-#qpy:webapp:Hello Qpython
-#qpy://localhost:8080/hello
-"""
-This is a sample for qpython webapp
-"""
-from bottle import route, run
-
-@route('/hello')
-def hello():
-    return "Hello World!"
-
-run(host='localhost', port=8080)</pre>
-<div style='text-align:center'><button style="display:inline" type="submit" value="Copy to editor to run" class="btn_c" id="step6-btn">Copy to editor to run</button></div>
-</div>
-
-<div style='padding:20px'></div>
-<script>
-var milib;
-if (milib==undefined) {
-var milib = function(){
-};
-milib.qeditor = function(str){
-alert('please open it with QPython browser')
-};
-milib.a8playVideoFromGW= function(url){
-window.open(url)
-};
-milib.qpylibinstall = function(cat,url,target){
-window.open(url)
-};
-milib.gotoIfPay = function(url, packageId, packageUrl){
-window.open(url)
-};
-} else {
-}
-$(document).ready(function() {
-$('#step1-btn').click(function(e){
-milib.qeditor($('#step1-code').html())
-});
-$('#step2-btn').click(function(e){
-milib.qeditor($('#step2-code').html())
-});
-$('#step6-btn').click(function(e){
-milib.qeditor($('#step6-code').html())
-});
-$('#step3-btn').click(function(e){
-location.href='http://packages.qpython.org'
-});
-$('#step4-btn').click(function(e){
-location.href='http://wiki.qpython.org'
-});
-$('#step5-btn').click(function(e){
-milib.openUrl("https://m.youtube.com/results?q=python+programming&#038;sm=3");
-//milib.a8playVideoFromGW('http://www.youtube.com/watch?v=72RKMMyLxS8')
-//milib.a8playVideoFromGW('http://www.youtube.com/watch?v=N-ae8Q_7iCA')
-});
-});
-</script></p>
-                    </div><!-- .entry-content -->
-                    <footer class="entry-meta"></footer><!-- .entry-meta -->
-                </article><!-- #post-472 -->
-                <div id="comments"></div><!-- #comments -->
-            </div><!-- #content -->
-        </div><!-- #primary -->
-    </div><!-- #main -->
-</div><!-- #page -->
-</body>
-</html>
diff --git a/docs/search.html b/docs/search.html
deleted file mode 100644
index e58bf913..00000000
--- a/docs/search.html
+++ /dev/null
@@ -1,164 +0,0 @@
-<!DOCTYPE html>
-<html>
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>Search &mdash; QPython 0.9 documentation</title>
-<link rel="stylesheet" href="static/qpython_theme.css" type="text/css" />
-<link rel="stylesheet" href="static/pygments.css" type="text/css" />
-<script type="text/javascript">
-var DOCUMENTATION_OPTIONS = {
-URL_ROOT:    './',
-VERSION:     '0.9',
-COLLAPSE_INDEX: false,
-FILE_SUFFIX: '.html',
-HAS_SOURCE:  true
-};
-</script>
-<script type="text/javascript" src="static/jquery.js"></script>
-<script type="text/javascript" src="static/underscore.js"></script>
-<script type="text/javascript" src="static/doctools.js"></script>
-<script type="text/javascript" src="static/searchtools.js"></script>
-<link rel="top" title="QPython 0.9 documentation" href="document.html" />
-<script type="text/javascript">
-jQuery(function() { Search.loadIndex("searchindex.js"); });
-</script>
-<script type="text/javascript" id="searchindexloader"></script>
-<meta charset="UTF-8">
-<link href="http://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet">
-<script src="http://cdn.bootcss.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
-<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
-</head>
-<body role="document">
-<div class="header doc-header">
-<div class="col-lg-offset-2 col-lg-8 col-md-offset-2 col-md-8 col-sm-offset-2 col-sm-8  index-header">
-<div class="navbar-header">
-<button type="button" class="navbar-toggle" data-toggle="collapse"
-data-target="#example-navbar-collapse">
-<span class="sr-only">切换导航</span>
-<span class="icon-bar"></span>
-<span class="icon-bar"></span>
-<span class="icon-bar"></span>
-</button>
-<a href="/index.html" class="logo"><img src="static/img_logo.png"></a>
-</div>
-<ul class="header-title hidden-xs">
-<li class="header-phone-selected">
-<a href="/index.html">Home</a>
-</li>
-<li>
-<a href="/document.html" class="header-selected">Guide</a>
-<span class="header-title-selected"></span>
-</li>
-<li>
-<a target="_blank" href="https://github.com/qpython-android/qpython">Github</a>
-</li>
-</ul>
-<div class="search-box hidden-xs">
-<form action="#">
-<input type="search" name="q" placeholder="keyword">
-<input type="hidden" name="check_keywords" value="yes" />
-<input type="hidden" name="area" value="default" />
-<button><img src="static/ic_search.png"></button>
-</form>
-</div>
-</div>
-</div>
-<div class="row doc-content">
-<div class="content-main col-sm-offset-2 col-sm-8">
-<div class="content-wrapper col-sm-4">
-<div class="left-menu">
-<div class="doc-title hidden-xs">QPthon</div>
-<div class="sidebar  collapse navbar-collapse"  id="example-navbar-collapse">
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="en/guide.html">Getting started</a></li>
-<li class="toctree-l1"><a class="reference internal" href="en/guide.html#programming-guide">Programming Guide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="en/guide.html#developers-guide">Developers&#8217; Guide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="en/guide.html#contributors-guide">Contributors&#8217; Guide</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="en/faq.html">FAQ</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="zhindex.html">中文用户向导</a></li>
-</ul>
-<div class="search-phone visible-xs">
-<form action="#">
-<input type="search" name="q" placeholder="keyword">
-<input type="hidden" name="check_keywords" value="yes" />
-<input type="hidden" name="area" value="default" />
-<button><img src="static/ic_search.png"></button>
-</form>
-</div>
-</div>
-</div>
-</div>
-<div class="content col-sm-8">
-<div class="document">
-<ul class="crumbs">
-<li><a href="document.html">Guide</a> &raquo;</li>
-<li>Search</li>
-</ul>
-<div class="documentwrapper">
-<div class="bodywrapper">
-<div class="body" role="main">
-<h1 id="search-documentation">Search</h1>
-<div id="fallback" class="admonition warning">
-<script type="text/javascript">$('#fallback').hide();</script>
-<p>
-Please activate JavaScript to enable the search
-functionality.
-</p>
-</div>
-<p>
-From here you can search these documents. Enter your search
-words into the box below and click "search". Note that the search
-function will automatically search for all of the words. Pages
-containing fewer words won't appear in the result list.
-</p>
-<form action="" method="get">
-<input type="text" name="q" value="" />
-<input type="submit" value="search" />
-<span id="search-progress" style="padding-left: 10px"></span>
-</form>
-<div id="search-results">
-</div>
-</div>
-</div>
-</div>
-</div>
-<div class="fb-comments" data-href="http://qpython.org" data-numposts="10"></div>
-</div>
-</div>
-<div class="col-sm-2"></div>
-</div>
-<footer id="footer">
-<div class="col-sm-offset-2 col-sm-6 footer-div1">
-<div class="footer-block-item">
-<span class="footer-item1">Built with Sphinx using a theme provid by QPython.</span>
-<span class="footer-item2 visible-xs">
-&#169; Copyright 2017, QPython.
-</span>
-</div>
-</div>
-<div class="col-sm-2 footer-div2">
-<a href="/index.html" class="pull-right"><img src="static/img_logo.png"></a>
-</div>
-</footer>
-<script type="text/javascript">
-$('.fb-comments').attr('data-href', (window.location.href.split('#')[0]).split('?')[0])
-(function(d, s, id) {
-var js, fjs = d.getElementsByTagName(s)[0];
-if (d.getElementById(id)) return;
-js = d.createElement(s); js.id = id;
-js.src = "//connect.facebook.net/en_US/sdk.js#xfbml=1&version=v2.8&appId=1680815145503311";
-fjs.parentNode.insertBefore(js, fjs);
-}(document, 'script', 'facebook-jssdk'));
-$(function(){
-if ($('#footer')[0].offsetTop < $(window).height()){
-$('#footer').addClass('to-bottom')
-}
-})
-</script>
-</body>
-</html>
diff --git a/docs/searchindex.js b/docs/searchindex.js
deleted file mode 100644
index 390fa416..00000000
--- a/docs/searchindex.js
+++ /dev/null
@@ -1 +0,0 @@
-Search.setIndex({envversion:48,filenames:["document","en/faq","en/guide","en/guide_androidhelpers","en/guide_contributors","en/guide_contributors_test","en/guide_developers","en/guide_extend","en/guide_helloworld","en/guide_howtostart","en/guide_ide","en/guide_libraries","en/guide_program","zh/contributorshowto","zh/howtostart","zh/quickstart","zhindex"],objects:{"":{NFCBeamMessage:[3,0,1,""],addContextMenuItem:[3,0,1,""],addOptionsMenuItem:[3,0,1,""],batteryCheckPresent:[3,0,1,""],batteryGetHealth:[3,0,1,""],batteryGetLevel:[3,0,1,""],batteryGetPlugType:[3,0,1,""],batteryGetStatus:[3,0,1,""],batteryGetTechnology:[3,0,1,""],batteryGetTemperature:[3,0,1,""],batteryGetVoltage:[3,0,1,""],batteryStartMonitoring:[3,0,1,""],batteryStopMonitoring:[3,0,1,""],bluetoothAccept:[3,0,1,""],bluetoothActiveConnections:[3,0,1,""],bluetoothConnect:[3,0,1,""],bluetoothDiscoveryCancel:[3,0,1,""],bluetoothDiscoveryStart:[3,0,1,""],bluetoothGetConnectedDeviceName:[3,0,1,""],bluetoothGetLocalAddress:[3,0,1,""],bluetoothGetLocalName:[3,0,1,""],bluetoothGetRemoteDeviceName:[3,0,1,""],bluetoothGetScanMode:[3,0,1,""],bluetoothIsDiscovering:[3,0,1,""],bluetoothMakeDiscoverable:[3,0,1,""],bluetoothRead:[3,0,1,""],bluetoothReadBinary:[3,0,1,""],bluetoothReadLine:[3,0,1,""],bluetoothReadReady:[3,0,1,""],bluetoothSetLocalName:[3,0,1,""],bluetoothStop:[3,0,1,""],bluetoothWrite:[3,0,1,""],bluetoothWriteBinary:[3,0,1,""],cameraCapturePicture:[3,0,1,""],cameraInteractiveCapturePicture:[3,0,1,""],cameraStartPreview:[3,0,1,""],cameraStopPreview:[3,0,1,""],checkAirplaneMode:[3,0,1,""],checkBluetoothState:[3,0,1,""],checkNetworkRoaming:[3,0,1,""],checkRingerSilentMode:[3,0,1,""],checkScreenOn:[3,0,1,""],checkWifiState:[3,0,1,""],contactsGet:[3,0,1,""],contactsGetAttributes:[3,0,1,""],contactsGetById:[3,0,1,""],contactsGetCount:[3,0,1,""],contactsGetIds:[3,0,1,""],dialogCreateAlert:[3,0,1,""],dialogCreateDatePicker:[3,0,1,""],dialogCreateHorizontalProgress:[3,0,1,""],dialogCreateInput:[3,0,1,""],dialogCreateNFCBeamMaster:[3,0,1,""],dialogCreateNFCBeamSlave:[3,0,1,""],dialogCreatePassword:[3,0,1,""],dialogCreateSeekBar:[3,0,1,""],dialogCreateSpinnerProgress:[3,0,1,""],dialogCreateTimePicker:[3,0,1,""],dialogDismiss:[3,0,1,""],dialogGetInput:[3,0,1,""],dialogGetPassword:[3,0,1,""],dialogGetResponse:[3,0,1,""],dialogGetSelectedItems:[3,0,1,""],dialogSetCurrentProgress:[3,0,1,""],dialogSetItems:[3,0,1,""],dialogSetMaxProgress:[3,0,1,""],dialogSetMultiChoiceItems:[3,0,1,""],dialogSetNegativeButtonText:[3,0,1,""],dialogSetNeutralButtonText:[3,0,1,""],dialogSetPositiveButtonText:[3,0,1,""],dialogSetSingleChoiceItems:[3,0,1,""],dialogShow:[3,0,1,""],environment:[3,0,1,""],eventClearBuffer:[3,0,1,""],eventGetBrodcastCategories:[3,0,1,""],eventPoll:[3,0,1,""],eventPost:[3,0,1,""],eventRegisterForBroadcast:[3,0,1,""],eventUnregisterForBroadcast:[3,0,1,""],eventWait:[3,0,1,""],eventWaitFor:[3,0,1,""],executeQPy:[3,0,1,""],forceStopPackage:[3,0,1,""],fullDismiss:[3,0,1,""],fullKeyOverride:[3,0,1,""],fullQuery:[3,0,1,""],fullQueryDetail:[3,0,1,""],fullSetList:[3,0,1,""],fullSetProperty:[3,0,1,""],fullShow:[3,0,1,""],generateDtmfTones:[3,0,1,""],geocode:[3,0,1,""],getCellLocation:[3,0,1,""],getClipboard:[3,0,1,""],getConstants:[3,0,1,""],getDeviceId:[3,0,1,""],getDeviceSoftwareVersion:[3,0,1,""],getInput:[3,0,1,""],getIntent:[3,0,1,""],getLastKnownLocation:[3,0,1,""],getLaunchableApplications:[3,0,1,""],getLine1Number:[3,0,1,""],getMaxMediaVolume:[3,0,1,""],getMaxRingerVolume:[3,0,1,""],getMediaVolume:[3,0,1,""],getNeighboringCellInfo:[3,0,1,""],getNetworkOperator:[3,0,1,""],getNetworkOperatorName:[3,0,1,""],getNetworkStatus:[3,0,1,""],getNetworkType:[3,0,1,""],getPackageVersion:[3,0,1,""],getPackageVersionCode:[3,0,1,""],getPassword:[3,0,1,""],getPhoneType:[3,0,1,""],getRingerVolume:[3,0,1,""],getRunningPackages:[3,0,1,""],getScreenBrightness:[3,0,1,""],getScreenTimeout:[3,0,1,""],getSimCountryIso:[3,0,1,""],getSimOperator:[3,0,1,""],getSimOperatorName:[3,0,1,""],getSimSerialNumber:[3,0,1,""],getSimState:[3,0,1,""],getSubscriberId:[3,0,1,""],getVibrateMode:[3,0,1,""],getVoiceMailAlphaTag:[3,0,1,""],getVoiceMailNumber:[3,0,1,""],launch:[3,0,1,""],locationProviderEnabled:[3,0,1,""],locationProviders:[3,0,1,""],log:[3,0,1,""],makeIntent:[3,0,1,""],makeToast:[3,0,1,""],mediaIsPlaying:[3,0,1,""],mediaPlay:[3,0,1,""],mediaPlayClose:[3,0,1,""],mediaPlayInfo:[3,0,1,""],mediaPlayList:[3,0,1,""],mediaPlayPause:[3,0,1,""],mediaPlaySeek:[3,0,1,""],mediaPlaySetLooping:[3,0,1,""],mediaPlayStart:[3,0,1,""],notify:[3,0,1,""],phoneCall:[3,0,1,""],phoneCallNumber:[3,0,1,""],phoneDial:[3,0,1,""],phoneDialNumber:[3,0,1,""],pick:[3,0,1,""],pickContact:[3,0,1,""],pickPhone:[3,0,1,""],prefGetAll:[3,0,1,""],prefGetValue:[3,0,1,""],prefPutValue:[3,0,1,""],queryAttributes:[3,0,1,""],queryContent:[3,0,1,""],readBatteryData:[3,0,1,""],readLocation:[3,0,1,""],readPhoneState:[3,0,1,""],readSensors:[3,0,1,""],readSignalStrengths:[3,0,1,""],receiveEvent:[3,0,1,""],recognizeSpeech:[3,0,1,""],recorderCaptureVideo:[3,0,1,""],recorderStartMicrophone:[3,0,1,""],recorderStartVideo:[3,0,1,""],recorderStop:[3,0,1,""],requiredVersion:[3,0,1,""],rpcPostEvent:[3,0,1,""],scanBarcode:[3,0,1,""],search:[3,0,1,""],sendBroadcast:[3,0,1,""],sendBroadcastIntent:[3,0,1,""],sendEmail:[3,0,1,""],sensorsGetAccuracy:[3,0,1,""],sensorsGetLight:[3,0,1,""],sensorsReadAccelerometer:[3,0,1,""],sensorsReadMagnetometer:[3,0,1,""],sensorsReadOrientation:[3,0,1,""],setClipboard:[3,0,1,""],setMediaVolume:[3,0,1,""],setResultBoolean:[3,0,1,""],setResultBooleanArray:[3,0,1,""],setResultByte:[3,0,1,""],setResultByteArray:[3,0,1,""],setResultChar:[3,0,1,""],setResultCharArray:[3,0,1,""],setResultDouble:[3,0,1,""],setResultDoubleArray:[3,0,1,""],setResultFloat:[3,0,1,""],setResultFloatArray:[3,0,1,""],setResultInteger:[3,0,1,""],setResultIntegerArray:[3,0,1,""],setResultLong:[3,0,1,""],setResultLongArray:[3,0,1,""],setResultSerializable:[3,0,1,""],setResultShort:[3,0,1,""],setResultShortArray:[3,0,1,""],setResultString:[3,0,1,""],setResultStringArray:[3,0,1,""],setRingerVolume:[3,0,1,""],setScreenBrightness:[3,0,1,""],setScreenTimeout:[3,0,1,""],smsDeleteMessage:[3,0,1,""],smsGetAttributes:[3,0,1,""],smsGetMessageById:[3,0,1,""],smsGetMessageCount:[3,0,1,""],smsGetMessageIds:[3,0,1,""],smsGetMessages:[3,0,1,""],smsMarkMessageRead:[3,0,1,""],smsSend:[3,0,1,""],startActivity:[3,0,1,""],startActivityForResult:[3,0,1,""],startActivityForResultIntent:[3,0,1,""],startActivityIntent:[3,0,1,""],startEventDispatcher:[3,0,1,""],startInteractiveVideoRecording:[3,0,1,""],startLocating:[3,0,1,""],startSensing:[3,0,1,""],startSensingThreshold:[3,0,1,""],startSensingTimed:[3,0,1,""],startTrackingPhoneState:[3,0,1,""],startTrackingSignalStrengths:[3,0,1,""],stopEventDispatcher:[3,0,1,""],stopLocating:[3,0,1,""],stopSensing:[3,0,1,""],stopTrackingPhoneState:[3,0,1,""],stopTrackingSignalStrengths:[3,0,1,""],toggleAirplaneMode:[3,0,1,""],toggleBluetoothState:[3,0,1,""],toggleRingerSilentMode:[3,0,1,""],toggleVibrateMode:[3,0,1,""],toggleWifiState:[3,0,1,""],ttsIsSpeaking:[3,0,1,""],ttsSpeak:[3,0,1,""],usbserialActiveConnections:[3,0,1,""],usbserialConnect:[3,0,1,""],usbserialDisconnect:[3,0,1,""],usbserialGetDeviceList:[3,0,1,""],usbserialGetDeviceName:[3,0,1,""],usbserialHostEnable:[3,0,1,""],usbserialRead:[3,0,1,""],usbserialReadBinary:[3,0,1,""],usbserialReadReady:[3,0,1,""],usbserialWrite:[3,0,1,""],usbserialWriteBinary:[3,0,1,""],view:[3,0,1,""],viewContacts:[3,0,1,""],viewHtml:[3,0,1,""],viewMap:[3,0,1,""],waitForEvent:[3,0,1,""],wakeLockAcquireBright:[3,0,1,""],wakeLockAcquireDim:[3,0,1,""],wakeLockAcquireFull:[3,0,1,""],wakeLockAcquirePartial:[3,0,1,""],wakeLockRelease:[3,0,1,""],webViewShow:[3,0,1,""],webcamAdjustQuality:[3,0,1,""],webcamStart:[3,0,1,""],wifiDisconnect:[3,0,1,""],wifiGetConnectionInfo:[3,0,1,""],wifiGetScanResults:[3,0,1,""],wifiLockAcquireFull:[3,0,1,""],wifiLockAcquireScanOnly:[3,0,1,""],wifiLockRelease:[3,0,1,""],wifiReassociate:[3,0,1,""],wifiReconnect:[3,0,1,""],wifiStartScan:[3,0,1,""]}},objnames:{"0":["py","function","Python function"]},objtypes:{"0":"py:function"},terms:{"160x120":3,"320x240":3,"352x288":3,"3rd":[0,1,2,3,9],"640x480":3,"78k0f0730":3,"800x480":3,"\u4e16\u754c":14,"\u4e24\u90e8\u5206":13,"\u4e2d\u6587":13,"\u4e2d\u6587\u7528\u6237\u5411\u5bfc":0,"\u4e3b\u8981\u662f\u7528qpython\u6765\u8fdb\u884c\u7f16\u7a0b\u548c\u5f00\u53d1\u7684\u6307\u5357":13,"\u4f60\u53ef\u4ee5\u901a\u8fc7\u4ee5\u4e0b\u65b9\u5f0f\u6765\u63d0\u4ea4\u5bf9\u5e94\u56fd\u5bb6\u7684\u7ffb\u8bd1":13,"\u4f60\u597d":14,"\u4f7f\u7528\u4e0a\u7684\u5e2e\u52a9":13,"\u4f7f\u7528\u8bf4\u660e":14,"\u5176\u4e2d\u5185\u5bb9\u5176\u4e2d\u53c8\u5206\u4e3a":13,"\u5206\u4e3a\u5728qpython":13,"\u52a0\u5165qpython":16,"\u548c\u4ee5\u5916\u7684":13,"\u56e2\u961f":14,"\u5728\u5fae\u535a\u95ee\u6211\u4eec\u95ee\u9898":16,"\u5728\u60f3\u8981\u8d21\u732eqpython\u6587\u6863\u4e4b\u524d\u4ed4\u7ec6\u9605\u8bfb\u6211\u4eec\u7684\u6307\u5357":13,"\u5728\u767e\u5ea6\u8d34\u5427\u91cc\u8ba8\u8bba":16,"\u5982\u4f55\u8d21\u732e":0,"\u5982\u679c\u68c0\u67e5\u65e0\u95ee\u9898\u5219\u53ef\u4ee5\u63d0\u4ea4":13,"\u5b83\u5305\u542b\u4e86\u8bb8\u591a\u60ca\u8273\u7684\u7279\u6027":16,"\u5df2\u7ecf\u53d1\u5e03":16,"\u5e38\u89c1\u95ee\u9898":16,"\u5e76\u4e14\u6587\u6863\u4f1a\u901a\u8fc7github":13,"\u5f00\u53d1":14,"\u5feb\u901f\u4e86\u89e3":14,"\u5feb\u901f\u5f00\u59cb":13,"\u60f3\u6210\u4e3a":16,"\u6211\u4eec\u52aa\u529b\u4fdd\u6301\u4e24\u79cd\u8bed\u8a00\u5bf9\u5e94\u5185\u5bb9\u7684\u51c6\u786e\u548c\u540c\u6b65":13,"\u6211\u4eec\u7528sphinx\u6765\u7ec4\u7ec7\u6587\u6863":13,"\u6253\u5f00\u6d4f\u89c8\u5668\u6253\u5f00\u672c\u5730\u6587\u4ef6\u68c0\u67e5":13,"\u62a5\u544a\u95ee\u9898":16,"\u6309\u7167sphinx\u89c4\u5219\u7f16\u8f91source\u4e2d\u7684\u6587\u4ef6\u5373\u53ef":13,"\u6587\u6863\u4f53\u7cfb\u5206\u4e3a":13,"\u6587\u6863\u975e\u5e38\u91cd\u8981":13,"\u66f4\u591a\u94fe\u63a5":0,"\u6700\u540ecd\u5230qpython":13,"\u6765\u548c\u4e2d\u56fd\u6d3b\u8dc3\u7684qpython":16,"\u6765\u548c\u5168\u4e16\u754c\u7684":16,"\u6b22\u8fce":0,"\u6b22\u8fce\u52a0\u5165":14,"\u6df1\u5165\u6298\u817e\u7684\u6307\u5bfc":13,"\u7136\u540e\u6d4f\u89c8qpython":13,"\u7528\u6237\u4e00\u5757\u6765\u73a9\u8f6cqpython":16,"\u7528\u6237\u4e00\u8d77\u73a9\u8f6c":16,"\u7528\u6237\u5f00\u53d1\u7ec4":0,"\u7528\u6237\u5f00\u53d1\u8005\u7ec4":16,"\u7684\u6700\u65b0\u7248\u672c1":16,"\u7684\u8d21\u732e\u8005\u4e48":16,"\u7ed9\u6211\u4eec\u53d1\u90ae\u4ef6":16,"\u7f16\u7a0b\u5411\u5bfc":14,"\u7f16\u7a0b\u6307\u5357":13,"\u82f1\u6587":13,"\u8bf7":16,"\u8bf7\u4ece\u5e94\u7528\u5e02\u573a\u5b89\u88c5":16,"\u8bf7\u52a0\u5165":16,"\u8d21\u732e\u8005\u6307\u5357":13,"\u8d77\u6b65":0,"\u8fdb\u5165\u5230":13,"\u9879\u76ee\u7684qpython":13,"\u9ed1\u5ba2":14,"__exit":12,"__future__":11,"__phello__":11,"_abcol":11,"_codecs_cn":11,"_codecs_hk":11,"_codecs_iso2022":11,"_codecs_jp":11,"_codecs_kr":11,"_codecs_tw":11,"_csv":11,"_ctype":11,"_ctypes_test":11,"_hashlib":11,"_heapq":11,"_hotshot":11,"_io":11,"_json":11,"_lsprof":11,"_lwpcookiejar":11,"_mozillacookiejar":11,"_multibytecodec":11,"_pyio":11,"_sqlite3":11,"_ssl":11,"_strptime":11,"_testcapi":11,"_threading_loc":11,"_weakrefset":11,"boolean":3,"byte":3,"case":[1,3,8],"class":[3,8,11,12],"default":[3,7,9,11,12],"docs\u4e2d\u5e76\u8fd0\u884cbuild":13,"docs\u76ee\u5f55\u4e2d":13,"export":7,"final":3,"float":3,"function":[6,8,11,12],"import":[1,3,7,8,11,12],"int":[3,7],"long":[3,9],"null":[3,7],"org\u5373\u53ef\u770b\u5230\u6700\u65b0\u7684\u66f4\u65b0":13,"org\u7f51\u7ad9\u4e2d":13,"page\u529f\u80fd\u76f4\u63a5\u63a8\u5230qpython":13,"qpython\u662f\u4e00\u4e2a\u652f\u6301\u591a\u8bed\u8a00\u7684\u5e94\u7528":13,"qpython\u8d21\u732e\u8005\u6307\u5357":13,"qpython\u9ed1\u5ba2\u6307\u5357":13,"qq\u7ec4":16,"return":[3,7,8,12],"short":3,"static":3,"switch":9,"team\u5185\u7684":13,"throw":3,"true":[3,7],"try":[0,7,8,12],"var":1,"void":7,"while":3,abc:11,abil:[6,9],abl:[3,6],about:[2,3,5,8,9],abov:[1,3,9,10],abridg:3,absolut:3,acceler:3,acceleromet:3,accept:3,acces:3,access:[3,10,12],accomplish:12,accuraci:3,acquir:3,act:7,action:[3,7,9],activ:[0,2,3,7,9],active:3,activityresultfacad:2,actual:8,adapt:3,add:[3,8,9,12],addcontextmenuitem:3,addit:9,addoptionsmenuitem:3,address:3,adjust:3,advantag:12,after:[5,8,9,10],aifc:11,aim:6,airplan:3,all:[3,8],allow:[3,6,7,9,12],almost:8,alphabet:3,alreadi:0,also:[2,3,6,9,10,12],altern:12,alwai:9,amaz:[0,12],amazon:0,andoroid:3,android5:1,android:[0,1,2,3],androidfacad:2,androidhelp:[0,2,3,7,8],ani:[0,3,5,7,8],anoth:[8,9],answer:9,antigrav:11,any:8,anydbm:11,anymor:3,anyth:8,anywai:8,api14:3,api:[0,2],apk:[3,7],app:[1,7,12,14],appcach:3,applic:[0,2,3],applicat:3,applicationmanagerfacad:2,appstor:0,arduino:3,arg:12,argpars:11,argument:3,argv:7,ascii:3,ase:3,ask:[0,3,8,9],asset:12,assit:12,associ:3,ast:11,asynchat:11,asyncor:11,atexit:11,attach:3,attachmenturi:3,attribut:3,audiodev:11,audioop:11,autofocu:3,automat:11,avail:[3,8,9],availblock:3,axi:3,azimuth:3,background:12,backlight:3,backspac:8,bad:12,bar:[3,8,9],base64:[3,11],basehttpserv:11,bastion:11,batteri:3,batterycheckpres:3,batterygethealth:3,batterygetlevel:3,batterygetplugtyp:3,batterygetstatu:3,batterygettechnolog:3,batterygettemperatur:3,batterygetvoltag:3,batterymanagerfacad:2,batterystartmonitor:3,batterystopmonitor:3,bdb:11,beam:3,beautifulsoup:11,becam:[0,2],becom:[2,4],befor:9,begin:8,below:10,besid:[6,9,10,12],best:[0,2],beta:7,better:[5,6],between:[3,9],big:9,bin:1,bind:3,binhex:11,bios:3,bisect:11,bit:8,blank:8,block:3,blockcount:3,blocksiz:3,blog:[8,9],bluetooth:[3,12],bluetoothaccept:3,bluetoothactiveconnect:3,bluetoothconnect:3,bluetoothdiscoverycancel:3,bluetoothdiscoverystart:3,bluetoothfacad:2,bluetoothgetconnecteddevicenam:3,bluetoothgetlocaladdress:3,bluetoothgetlocalnam:3,bluetoothgetremotedevicenam:3,bluetoothgetscanmod:3,bluetoothisdiscov:3,bluetoothmakediscover:3,bluetoothread:3,bluetoothreadbinari:3,bluetoothreadlin:3,bluetoothreadreadi:3,bluetoothsetlocalnam:3,bluetoothstop:3,bluetoothwrit:3,bluetoothwritebinari:3,board:3,bodi:3,bool:3,both:8,bottl:[11,12,14],bountysourc:0,box:[3,8],brand:9,briefli:4,broadcast:3,brows:2,browsable:7,browser:[2,3,9],bsddb:11,buffer:3,buffers:3,bug:[0,5],build:[7,12],built:[0,2],bundl:7,busi:7,button:[3,8,9,10,12],calendar:11,callabck:7,camera:3,cameracapturepictur:3,camerafacad:2,camerainteractivecapturepictur:3,camerastartpreview:3,camerastoppreview:3,can:[3,7,8,9,12],cancel:[3,8],cancl:3,cannot:3,cap:9,captur:3,card:3,categori:[3,7],caus:12,cdc:3,cdma:3,cell:3,center:9,cgi:11,cgihttpserver:11,cgitb:11,challeng:7,chanc:9,chang:3,charact:3,charg:3,charger:3,chat:0,check:[3,8],checkairplanemod:3,checkbluetoothst:3,checknetworkroam:3,checkout:7,checkringersilentmod:3,checkscreenon:3,checkwifist:3,choic:3,choos:[2,3,7,9,10],chosen:3,chunk:[3,11],claim:8,classnam:3,clear:3,click:[3,5,8,9,10],clone:13,close:[3,9,12],cmd:11,code:[3,7,8,9,10,11,12],codec:11,codeop:11,collabor:4,collect:[3,11],colorsi:11,column:3,com:[3,9,13],come:4,comfort:9,comma:3,command:[9,11],commit:3,common:[6,12],commonintentsfacad:2,compat:8,compil:[7,9,11,12],compileal:11,complet:12,complex:12,compon:9,comput:2,comun:9,config:11,configchang:7,configpars:11,confirm:3,connect:3,connid:3,consid:[1,3,4,8],consol:[0,2],constant:3,consult:9,contact:[3,5,7],contactsfacad:2,contactsget:3,contactsgetattribut:3,contactsgetbyid:3,contactsgetcount:3,contactsgetid:3,contain:[0,3,8,9,11],contan:8,content:[2,3],context:[3,7],contextlib:11,contributor:0,conveni:10,convient:10,cooki:11,cookielib:11,cool:5,copi:[9,11],copy_reg:11,core:[0,2],corner:9,could:[0,1,3,5,7,9,10,11,12],couldn:7,countri:3,cprofil:11,cpu:3,creat:[3,5,8,9],creation:3,creator:2,critic:9,csv:11,ctype:11,current:3,dai:3,dashboard:[2,7],data:1,date:3,dbhash:11,dead:3,debug:12,decim:[3,11],declar:12,def:12,defaulttext:3,defin:[3,12],definit:7,delaytim:3,delet:[3,9],deliveri:6,demand:0,demo:7,demonstr:3,depend:9,deriv:11,describ:8,desir:3,desktop:9,destinationaddress:3,detail:[3,4],dev:3,devci:3,develop:0,devic:[0,1,3,9,12],dfault:3,dial:3,dialogcreatealert:3,dialogcreatedatepick:3,dialogcreatehorizontalprogress:3,dialogcreateinput:3,dialogcreatenfcbeammast:3,dialogcreatenfcbeamslav:3,dialogcreatepassword:3,dialogcreateseekbar:3,dialogcreatespinnerprogress:3,dialogcreatetimepick:3,dialogdismiss:3,dialoggetinput:[3,7,8],dialoggetpassword:3,dialoggetrespons:3,dialoggetselecteditem:3,dialogsetcurrentprogress:3,dialogsetitem:3,dialogsetmaxprogress:3,dialogsetmultichoiceitem:3,dialogsetnegativebuttontext:3,dialogsetneutralbuttontext:3,dialogsetpositivebuttontext:3,dialogsetsinglechoiceitem:3,dialogshow:3,didn:12,differ:[3,6],difflib:11,digit:3,dim:3,dircach:11,directli:[3,9,10],directori:9,disabl:3,discharg:3,disconnect:3,discov:3,discover:3,discoveri:3,dismiss:3,displai:[3,8,12],distribut:9,distutil:11,django:12,dmych:[8,9],doc:8,doctest:11,document:[0,2],docxmlrpcserv:11,doe:[3,8,12],doesn:[1,12],don:[7,8,9,11,12],dongl:3,doubl:3,down:[5,9],download:3,draft:[8,9],drawabl:3,driver:12,droid:[3,7,8],dtmf:3,dumbdbm:11,dummy_thread:11,durat:3,dure:3,dynload:2,each:3,easi:12,easili:[9,12],edit:[8,9,10],editor:[0,2],effici:12,els:[3,7,8],email:[0,4,7,11],empti:[3,8],enabl:3,encapsul:8,encod:[3,11],engin:[0,2,12],enqueu:3,ensornumb:3,enter:[8,9],enterpris:[0,2],env:1,environ:[3,7,9],equal:3,equival:3,error:[3,12],essenti:12,establish:3,estens:9,etc:[0,3,6,9,12],even:1,event:[2,3],eventclearbuff:3,eventdata:3,eventfacad:2,eventgetbrodcastcategori:3,eventnam:3,eventpol:3,eventpost:3,eventregisterforbroadcast:3,eventunregisterforbroadcast:3,eventwait:3,eventwaitfor:3,ever:3,everi:8,exampl:[3,8,12],exceed:3,except:[8,12],exception:12,execut:[1,3,8,9],executeqpi:3,exit:[3,12],expans:6,expect:3,experi:12,explicitli:9,explor:9,extend:[3,9],extplgplusnam:7,extra:[3,12],eyesfreefacad:2,facad:2,facebook:[0,1],fail:3,failur:3,fals:[3,8,12],familiar:8,faq:0,fast:12,featur:[0,2,3,9,10],feedback:[0,2,4],feel:9,field:[3,8],fifth:8,file:[2,3],filecmp:11,fileinput:11,filenam:3,filepath:[3,12],filter:7,find:[5,7,9],firmwar:3,first:[1,8,9],flag:[3,7],flask:12,flexiabl:12,fnmatch:11,folder:3,folk:6,follow:[0,1,2,5,7,8,9,11,12],foo:11,forc:3,forcestoppackag:3,forget:9,fork:0,format:[3,8],formatt:11,forward:0,found:[3,7,9],fpformat:11,fraction:11,framework:12,free:9,from:[0,1,2,3],front:12,ftdi:3,ftp:2,ftplib:11,full:[3,7],fulldismiss:3,fullkeyoverrid:3,fullqueri:3,fullquerydetail:3,fullscreen:[3,12],fullsetlist:3,fullsetproperti:3,fullshow:3,functool:11,funni:9,further:8,futur:12,future_builtin:11,gener:[3,7,9],generatedtmfton:3,genericpath:11,geocod:3,get:[0,1],getcellloc:3,getclipboard:3,getconst:3,getdefault:3,getdeviceid:3,getdevicesoftwarevers:3,getextra:7,getintent:3,getlastknownloc:3,getlaunchableappl:3,getline1numb:3,getmaxmediavolum:3,getmaxringervolum:3,getmediavolum:3,getneighboringcellinfo:3,getnetworkoper:3,getnetworkoperatornam:3,getnetworkstatu:3,getnetworktyp:3,getopt:11,getpackagevers:3,getpackageversioncod:3,getpass:11,getphonetyp:3,getringervolum:3,getrunningpackag:3,getscreenbright:3,getscreentimeout:3,getsimcountryiso:3,getsimoper:3,getsimoperatornam:3,getsimserialnumb:3,getsimst:3,getstr:7,getsubscriberid:3,gettext:11,getvibratemod:3,getvoicemailalphatag:3,getvoicemailnumb:3,git:13,github:[0,7,13],gitter:0,given:3,glob:11,global:12,goal:2,goe:9,good:[3,8],googl:0,gps:12,grab:3,great:[0,2,4,6],greater:[3,4],greet:8,group:[0,4],grp:11,gsm:3,gsm_signal_strength:3,guarante:3,gzip:11,handl:[3,7],handler:12,handler_class:12,happen:8,happi:0,hardwar:3,hash:3,hashlib:11,have:[0,5,7,9,12],head:12,header:12,health:3,heapq:11,hear:0,heard:3,hei:8,hello1:8,hello:[0,2,3,7],helloworld:8,help:[0,2],hepler:11,here:[3,7,8,9],hide:12,higher:[0,3],highlight:[9,10],hipip:9,hmac:11,home:12,homepag:12,hope:4,horizont:3,host:2,hotshot:11,hour:3,how:[0,1,2,3],href:12,html:[3,10],htmlentitydef:11,htmllib:11,htmlparser:11,http:[3,7,12,13],httplib:11,icon:[3,9],iconnam:3,ide:[11,12],idea:[5,9],identifi:3,ihook:11,imag:[3,7],imaplib:11,imei:3,imghdr:11,immedi:3,implement:[0,12],importerror:8,importlib:11,imputil:11,imsi:3,inbox:3,includ:[0,3,9],incom:3,incomingnumb:3,increas:3,indent:[8,9],independ:7,index:[3,9],indic:3,info:3,initi:3,innov:12,input:[3,8],inputtyp:3,insert:[3,12],inspect:11,instal:[7,9,12],instead:[8,9],integr:[3,9],interact:6,interest:5,interfac:[8,9,12],interpret:[0,9],introduc:[4,9],invit:4,is24hour:3,iso:3,issu:[0,3],item:3,java:3,javascript:10,jniu:12,job:12,join:[0,2,4],jpeg:3,jpegqual:3,json:[3,8,11],just:[1,2,8,9,10,11,12],keep:[5,12],kei:[3,8],kernel:3,keyboard:3,keyboardhidden:7,keycod:3,keyword:[10,11],kit:9,kivi:2,know:[2,5,8],known:3,kuri65536:3,label:[3,7],lack:[0,9],languag:[3,12],languagemodel:3,laptop:[10,12],last:[3,8],later:[1,3],latitud:3,launch:[0,2,3],launchabl:3,launcher:7,layer:3,lead:9,least:8,leav:[8,9],left:[8,9],length_short:7,level:[3,9],lib:[9,11],libari:9,librari:[0,2,3],light:3,like:[0,1,3,6,7,9,10,11,12],line:[3,7,8,9,12],linecach:11,link:[1,9],linux4:11,list:[3,9],listen:3,load:[3,12],local:[0,2,3],localhost:12,locationfacad:2,locationprovid:3,locationprovideren:3,lock:3,log:[3,11],log_request:12,logcat:3,logic:8,logo:9,longitud:3,loop:3,lua:10,m78k0f0730:3,macpath:11,macurl2path:11,magnet:3,mai:[0,7],mail:3,mailbox:11,mailcap:11,main:[0,2,6,9,10],mainli:9,maintain:[6,9],make:[3,4,5,8,9,12],make_serv:12,makeint:3,maketext:7,maketoast:[3,7,8],mani:[0,3,9,12],manual:11,map:3,mark:3,markupbas:11,master:3,match:3,max:3,maximum:3,maximumprogress:3,maximunprogress:3,maxresult:3,mbundl:7,mcc:3,md5:11,mean:8,meanin:8,mediaisplai:3,mediaplai:3,mediaplayclos:3,mediaplayerfacad:2,mediaplayinfo:3,mediaplaylist:3,mediaplaypaus:3,mediaplayseek:3,mediaplaysetloop:3,mediaplaystart:3,mediarecorderfacad:2,meet:0,meid:3,member:[0,2],mention:1,menu:[3,9],messag:[3,8],method:[3,12],mhlib:11,microphon:3,million:0,millisecond:3,mime:3,mimetool:11,mimetyp:[7,11],mimewrit:11,mimifi:11,mindist:3,minupdatedist:3,minut:3,miut:3,mix:[9,12],mjpeg:3,mmap:11,mnc:3,mobil:3,model:3,modifi:9,modul:8,modulefind:11,month:3,more:[2,4],most:[3,8,9,10,11,12],move:[0,10],mpyapi:7,msec:3,msisdn:3,much:9,multi:12,multifil:11,multipl:3,must:3,mutex:11,myappid:7,mywsgirefserv:12,name:[3,7,8,9,12],necessari:8,need:[0,1,7,8,11,12],neg:3,neighbor:3,netrc:11,network:[0,3],newest:0,next:[3,8,9],nfcbeammessag:3,nice:9,nntplib:11,non:3,none:[3,8,12],note:[9,12],noth:8,notic:9,notif:[3,8,9],ntpath:11,nturl2path:11,number:[3,9,11],number_of_ev:3,numer:3,numpi:9,object:[3,8,9],obvious:9,obviousli:8,occur:3,off:3,offer:[5,6,8,9,12],offici:0,offset:3,oldest:3,onactivityresult:7,once:9,onli:[2,3,7,8],onlin:7,online:[0,2],onpyapi:7,onqpyexec:7,oop:8,opcod:11,open:[0,2,3],opengl2:12,opengl:12,opensourc:6,oper:3,option:[3,12],optional:3,optpars:11,order:[3,8],ordinari:9,org:[1,3,4,5,7,9],organis:2,orient:[3,7],origin:3,os2emxpath:11,otherwis:[3,8],our:8,out:[2,5,7],output:8,outsid:7,over:3,overheat:3,overrid:[3,7],own:2,packag:[3,7,9,12],packagenam:3,page:[9,12],paid:6,param:7,paramet:3,part:[4,6,12],partial:3,pass:[3,12],password:3,path:[3,12],paus:3,pdb:11,pelas:12,peopl:[9,12],percentag:3,period:3,permiss:12,phone:[3,10],phonecal:3,phonecallnumb:3,phonedi:3,phonedialnumb:3,phonefacad:2,phonenumb:3,pic:[9,10],pick:3,pickcontact:3,picker:3,pickl:11,pickletool:11,pickphon:3,pictur:[3,9],pip:[0,2],pip_consol:9,pipe:11,pitch:3,pizza:3,pkg_resourc:11,pkgutil:11,pl2303:3,plai:[0,3,8],plain:[7,10],plan:12,plat:11,platform:11,pleas:[0,1,3,4,5,7,9],plistlib:11,plu:9,plug:3,plugin:7,plyer:11,point:[3,12],polit:8,poll:3,pop:8,popen2:11,poplib:11,port:[3,12],posit:3,posixfil:11,posixpath:11,possibl:3,post:[3,9],power:[2,3],pprint:11,pre:[7,9,12],prefer:3,preferencesfacad:2,prefgetal:3,prefgetvalu:3,prefputvalu:3,presenc:3,present:3,press:8,preview:[3,10],previou:12,previous:3,print:[8,12],prioriti:0,probabl:3,process:[3,7],product:7,profil:11,program:0,progress:1,project:[0,2,3],prompt:[3,8],properti:[3,9],propos:7,protect:7,pstat:11,pty:11,publish:7,pull:[0,8],pure:[9,12],purpos:3,push:[0,2],put:[3,8,9,12],putextra:7,putstr:7,py_compil:11,pyclbr:11,pycod:7,pydoc:11,pydoc_data:11,pygam:1,python2:9,python:[0,1,2],qedit4web:10,qeditor:2,qptyhon:5,qpy:[0,1,2],qpy_run_with_shar:7,qpyapp:12,qpyhttpd:12,qpyinterfacefacad:2,qpylib:7,qpypi:2,qpyplu:9,qpython3:[0,3,7,12,16],qpythoninit:11,qrcode:2,qscript:12,qsl4a:[0,2],qualiti:3,queri:3,queryattribut:3,querycont:3,question:9,queue:[3,11],quick:[0,2],quickli:[2,9],quiet:12,quiethandl:12,quopri:11,qustion:0,radio:3,random:11,rapid:12,reach:9,reaction:8,readbatterydata:3,reader:2,readi:5,readloc:3,readphonest:3,readsensor:3,readsignalstrength:3,real:8,receiv:3,receiveev:3,recent:[3,9],recipi:3,recogn:3,recognizeint:3,recognizespeech:3,recommend:12,recongn:3,reconnect:3,record:3,recordaudio:3,recordercapturevideo:3,recorderstartmicrophon:3,recorderstartvideo:3,recorderstop:3,redirect:9,refer:3,regist:3,regular:9,releas:[0,3,12],reload:12,remot:3,remov:[3,12],renam:9,replac:8,report:[0,2,3,4],repr:[11,12],repres:3,represent:3,request:[0,3,12],requestcod:7,requiredvers:3,resolut:3,resolutionlevel:3,resolv:3,resourc:[0,3,9,11,12],respond:8,respons:3,rest:9,result:[3,7,8,10],resultcod:[3,7],resultvalu:3,retriev:3,rexec:11,rfc822:11,river:7,rl78:3,rlcomplet:11,roam:3,robotpars:11,role:3,roll:3,root:[1,12],rout:12,routers:12,rpc:8,rpcpostevent:3,run:[0,1,2,3],runpi:11,runtim:12,said:9,same:[9,11],sampl:[1,2,3,7],samples:3,save:[3,8,9],scan:3,scanbarcod:3,scanner:3,sched:11,scheme:7,screenorient:7,screenshot:[8,9,12],script:[0,1,2,3,6],script_exec_py:7,script_result:3,sdcard:[3,9,12],sdk:3,search:[3,9,10],second:[3,9],see:[3,8,9,10,11],seek:3,seem:7,select:3,selectionarg:3,self:[3,12],send:[0,3,4,5,7],sendbroadcastint:3,sensor:3,sensormanagerfacad:2,sensornumb:3,sensorsgetaccuraci:3,sensorsgetlight:3,sensorsreadacceleromet:3,sensorsreadmagnetomet:3,sensorsreadorient:3,sent:3,separ:[3,8],serial:2,serv:12,serve_forev:12,server:[3,12],server_clos:12,server_stat:12,serveradapt:12,servic:[0,2,3],session:3,set:[3,7,9,11],setaction:7,setclassnam:7,setclipboard:3,setmediavolum:3,setresultboolean:3,setresultbooleanarrai:3,setresultbyt:3,setresultbytearrai:3,setresultchar:3,setresultchararrai:3,setresultdoubl:3,setresultdoublearrai:3,setresultfloat:3,setresultfloatarrai:3,setresultinteg:3,setresultintegerarrai:3,setresultlong:3,setresultlongarrai:3,setresultserializ:3,setresultshort:3,setresultshortarrai:3,setresultstr:3,setresultstringarrai:3,setringervolum:3,setscreenbright:3,setscreentimeout:3,settingsfacad:2,setuptool:11,sever:[0,12],sgmllib:11,sha:11,share:[1,2,3],shell:10,shelv:11,shlex:11,shortcut:9,shoul:12,should:[2,3,8,9],show:[3,7,8,9],shown:8,shutdown:12,shutil:11,signal:3,signalstrengthfacad:2,sim:3,similar:8,simpl:[7,8],simple_serv:12,simplehttpserv:11,simplexmlrpcserv:11,simplifi:11,sinc:9,singl:9,site:[9,11],sl4a:[0,2,3,6],slave:3,small:8,smartphon:12,sms:[3,12],smsdeletemessag:3,smsfacad:2,smsgetattribut:3,smsgetmessag:3,smsgetmessagebyid:3,smsgetmessagecount:3,smsgetmessageid:3,smsmarkmessageread:3,smssend:3,smtpd:11,smtplib:11,sndhdr:11,snippet:10,social:0,socket:[3,11],socketserv:11,softwar:3,solut:12,solv:0,some:[0,2,3,5],sometim:0,somth:9,soon:[0,4],sour:1,sourc:[3,9,12],space:8,speak:3,specif:3,specifi:3,speech:3,speechrecognitionfacad:2,spinner:3,spn:3,sponsor:[0,2],sqlite3:11,sre:11,sre_compil:11,sre_const:11,sre_pars:11,ssl:11,stackoverflow:0,stardard:2,start:0,startactivityforresult:[3,7],startactivityforresultint:3,startactivityint:3,starteventdispatch:3,startinteractivevideorecord:3,startloc:3,startsens:3,startsensingthreshold:3,startsensingtim:3,starttrackingphonest:3,starttrackingsignalstrength:3,stat:[3,11],state:3,statement:8,static_fil:12,statvf:11,stderr:12,step:[0,2],still:8,stopeventdispatch:3,stoploc:3,stopsens:3,stoptrackingphonest:3,stoptrackingsignalstrength:3,store:3,str:3,stream:3,street:3,strength:3,string:[3,7,8,11],stringio:11,stringold:11,stringprep:11,strong:12,struct:[3,11],subject:3,subprocess:11,subscrib:3,subtyp:3,succeed:3,success:3,successfulli:3,suggest:[2,4],sunau:11,sunaudio:11,suppli:3,sure:7,swipe:9,symbol:11,symtabl:11,syntax:[9,10],sysconfig:11,syslog:11,tabnanni:11,tag:3,take:[3,12],takepictur:3,talk:0,tap:[8,9],tarfil:11,target:[3,12],targetpath:3,tasker:7,team:[0,2,9,12],technic:12,technolog:[2,3],telnetlib:11,temperatur:3,tempfil:11,templat:12,termin:1,termio:11,test:[0,2],testapp:12,tester:[0,2,4],text:[3,7,8,9,10,12],texttospeechfacad:2,textwrap:11,than:3,thei:[0,11],them:[3,8,9,11],thi:[0,3,4,5,7,8,9,11,12],thing:7,think:8,though:9,thread:[11,12],three:[6,8],threshold:3,through:[0,2,7,9,11,12],time:3,timeit:11,timeout:3,titl:[3,8,12],titlebar:12,toaiff:11,toggl:3,toggleairplanemod:3,togglebluetoothst:3,toggleringersilentmod:3,togglevibratemod:3,togglewifist:3,token:11,tone:3,tonedur:3,tonegeneratorfacad:2,tool:[0,2],toolbar:[8,9],top:[8,9],touch:12,trace:11,traceback:11,track:3,tragi:3,translat:[0,2],treat:8,tts:3,ttsisspeak:3,ttsspeak:3,tty:11,ttyusb0:3,tupl:3,twitter:0,two:[8,9],type:[3,6,9,11],typic:3,uifacad:2,uix:12,unavail:3,undo:9,unicodedata:11,unind:8,uninstal:9,uniqu:3,unittest:11,unknown:3,unless:9,unplug:3,unreadonli:3,unspecifi:3,until:3,updat:3,upgrad:0,upload:[9,10],upper:9,uri:3,url:[3,10,12],urllib2:11,urllib:11,urlpars:11,usag:9,usb:2,usbserialactiveconnect:3,usbserialconnect:3,usbserialdisconnect:3,usbserialgetdevicelist:3,usbserialgetdevicenam:3,usbserialhosten:3,usbserialread:3,usbserialreadbinari:3,usbserialreadreadi:3,usbserialwrit:3,usbserialwritebinari:3,use:[0,2,8],usedrop:9,userdict:11,userlist:11,usernam:8,userstr:11,usual:9,usualli:11,util:3,uuid:[3,11],valu:[3,8],variabl:8,variou:3,veri:[8,10,12],version:[0,3],via:3,videos:3,viewcontact:3,viewhtml:3,viewmap:3,visibl:3,voic:3,voltag:3,wai:[0,2,8,9],wait:3,waitforev:3,wake:3,wakelockacquirebright:3,wakelockacquiredim:3,wakelockacquireful:3,wakelockacquireparti:3,wakelockfacad:2,wakelockreleas:3,want:[0,2,3,4,5,7,8,9,12],warn:11,watch:7,wave:11,weakref:11,web:[12,14],webapp:2,webbrows:11,webcam:3,webcamadjustqu:3,webcamfacad:2,webcamstart:3,webserv:12,webviewshow:3,well:[6,8],were:[3,11],when:[3,7,8,9,10,12],whenev:3,where:[0,3,5],which:[3,4,6,7,8,9,10,11,12],whichdb:11,whish:12,whole:8,why:[2,8],widget:3,wifi:3,wifidisconnect:3,wififacad:2,wifigetconnectioninfo:3,wifigetscanresult:3,wifilockacquireful:3,wifilockacquirescanonli:3,wifilockreleas:3,wifireassoci:3,wifireconnect:3,wifistartscan:3,wiki:1,without:[9,12],wonder:8,work:[3,8],world:[0,2],worri:8,wow:8,write:[0,2,3,5],written:3,wrote:8,wsgiref:[11,12],wsgirequesthandl:12,xdrlib:11,xml:11,xmllib:11,xmlrpclib:11,year:3,yet:12,you:[0,1,2,3,4,5,7,8,9,10,11,12],your:[0,2,5],yourself:12,youself:4,youtub:[3,7],zipfil:11},titles:["Welcome to read the QPython guide!","FAQ","Getting started","AndroidFacade","Welcome contribute","Join the tester community","Android","QPython Open API","Writing &#8220;Hello World&#8221;","QPython: How To Start","Use the best way for developing","QPython built-in Libraries","QPython&#8217;s main features","QPython\u6587\u6863\u4f53\u7cfb\u8bf4\u660e","\u5feb\u901f\u5f00\u59cb","???\u067f?\u02bc","\u4e2d\u6587\u7528\u6237\u5411\u5bfc"],titleterms:{"3rd":11,"\u02bc":15,"\u067f":15,"\u4e2d\u6587\u7528\u6237\u5411\u5bfc":16,"\u5982\u4f55\u63d0\u4ea4\u6587\u6863":13,"\u5982\u4f55\u63d0\u4ea4\u7ffb\u8bd1":13,"\u5982\u4f55\u8d21\u732e":16,"\u5feb\u901f\u5f00\u59cb":14,"\u66f4\u591a\u94fe\u63a5":16,"\u6b22\u8fce":16,"\u7528\u6237\u5f00\u53d1\u7ec4":16,"\u7f16\u7a0b\u6307\u5357":14,"\u8d21\u732e\u8005\u6307\u5357":14,"\u8d77\u6b65":16,"new":0,"qpython\u6587\u6863\u4f53\u7cfb\u8bf4\u660e":13,"qpython\u9ed1\u5ba2\u6307\u5357":14,activityresultfacad:3,airplanermod:3,alert:3,android:6,androidfacad:3,androidhelp:11,api:[3,6,7,11],applic:7,applicationmanagerfacad:3,audio:3,author:3,barcod:3,batterymanagerfacad:3,becam:4,becom:5,best:10,bluetoothfacad:3,bright:3,brows:6,browser:10,built:[4,11],call:3,camerafacad:3,chines:0,choos:12,clipboard:3,commonintentsfacad:3,commun:[0,4,5,9],comput:10,consol:[6,9],contactsfacad:3,content:7,contribut:[0,4],contributor:2,control:3,core:6,dashboard:9,data:3,develop:[2,4,10],dia:3,dialog:3,document:4,dynload:11,editor:[6,9],enterpris:6,event:4,eventfacad:3,eyesfreefacad:3,facad:3,faq:1,featur:12,feedback:5,file:6,from:[7,10],ftp:6,geo:3,get:[2,3],getinput:3,getpassword:3,gui:0,guid:[0,2],hello:8,help:4,host:3,how:[4,9],inform:3,informat:3,intent:3,join:5,kivi:6,launch:4,layout:3,let:0,librari:[6,8,9,11],local:4,locat:3,locationfacad:3,main:12,manag:3,media:3,mediaplayerfacad:3,mediarecorderfacad:3,member:4,mode:3,more:8,networkstatu:3,nfc:3,notifi:3,now:0,online:7,open:7,organis:4,other:0,own:7,packagevers:3,phonefacad:3,phonestat:3,pip:6,preferencesfacad:3,program:[2,4,6,9],progress:3,project:4,provid:3,python:[6,11],qeditor:10,qpy:[6,7],qpyinterfacefacad:3,qpypi:7,qpython:[0,4,6,7,9,11,12,16],qrcode:6,qsl4a:6,quick:6,read:[0,3],reader:6,report:5,requir:3,ringer:3,run:7,sampl:8,screen:3,script:7,sendbroadcast:3,sendemail:3,sensormanagerfacad:3,serial:3,servic:[6,7],settingsfacad:3,share:[4,7],should:12,signalstrengthfacad:3,silent:3,sl4a:8,smsfacad:3,some:7,speechrecognitionfacad:3,sponsor:4,stardard:11,start:[2,3,9],startactiv:3,statu:3,stop:3,suggest:5,support:0,system:3,test:4,tester:5,texttospeechfacad:3,thank:0,toast:3,tonegeneratorfacad:3,tool:6,translat:4,uifacad:3,usb:3,use:10,user:[0,4],vibrat:3,video:3,view:3,volum:3,wai:10,wakelockfacad:3,webapp:6,webcamfacad:3,webview:3,welcom:[0,4],what:0,who:0,why:12,wififacad:3,world:8,write:8,your:[7,10]}})
\ No newline at end of file
diff --git a/docs/static/1.png b/docs/static/1.png
deleted file mode 100644
index a539f0e8..00000000
Binary files a/docs/static/1.png and /dev/null differ
diff --git a/docs/static/2.png b/docs/static/2.png
deleted file mode 100644
index dd65bc6c..00000000
Binary files a/docs/static/2.png and /dev/null differ
diff --git a/docs/static/3.png b/docs/static/3.png
deleted file mode 100644
index cb9bbea5..00000000
Binary files a/docs/static/3.png and /dev/null differ
diff --git a/docs/static/ajax-loader.gif b/docs/static/ajax-loader.gif
deleted file mode 100644
index 61faf8ca..00000000
Binary files a/docs/static/ajax-loader.gif and /dev/null differ
diff --git a/docs/static/basic.css b/docs/static/basic.css
deleted file mode 100644
index 2b513f0c..00000000
--- a/docs/static/basic.css
+++ /dev/null
@@ -1,604 +0,0 @@
-/*
- * basic.css
- * ~~~~~~~~~
- *
- * Sphinx stylesheet -- basic theme.
- *
- * :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
- * :license: BSD, see LICENSE for details.
- *
- */
-
-/* -- main layout ----------------------------------------------------------- */
-
-div.clearer {
-    clear: both;
-}
-
-/* -- relbar ---------------------------------------------------------------- */
-
-div.related {
-    width: 100%;
-    font-size: 90%;
-}
-
-div.related h3 {
-    display: none;
-}
-
-div.related ul {
-    margin: 0;
-    padding: 0 0 0 10px;
-    list-style: none;
-}
-
-div.related li {
-    display: inline;
-}
-
-div.related li.right {
-    float: right;
-    margin-right: 5px;
-}
-
-/* -- sidebar --------------------------------------------------------------- */
-
-div.sphinxsidebarwrapper {
-    padding: 10px 5px 0 10px;
-}
-
-div.sphinxsidebar {
-    float: left;
-    width: 230px;
-    margin-left: -100%;
-    font-size: 90%;
-    word-wrap: break-word;
-    overflow-wrap : break-word;
-}
-
-div.sphinxsidebar ul {
-    list-style: none;
-}
-
-div.sphinxsidebar ul ul,
-div.sphinxsidebar ul.want-points {
-    margin-left: 20px;
-    list-style: square;
-}
-
-div.sphinxsidebar ul ul {
-    margin-top: 0;
-    margin-bottom: 0;
-}
-
-div.sphinxsidebar form {
-    margin-top: 10px;
-}
-
-div.sphinxsidebar input {
-    border: 1px solid #98dbcc;
-    font-family: sans-serif;
-    font-size: 1em;
-}
-
-div.sphinxsidebar #searchbox input[type="text"] {
-    width: 170px;
-}
-
-img {
-    border: 0;
-    max-width: 100%;
-}
-
-/* -- search page ----------------------------------------------------------- */
-
-ul.search {
-    margin: 10px 0 0 20px;
-    padding: 0;
-}
-
-ul.search li {
-    padding: 5px 0 5px 20px;
-    background-image: url(file.png);
-    background-repeat: no-repeat;
-    background-position: 0 7px;
-}
-
-ul.search li a {
-    font-weight: bold;
-}
-
-ul.search li div.context {
-    color: #888;
-    margin: 2px 0 0 30px;
-    text-align: left;
-}
-
-ul.keywordmatches li.goodmatch a {
-    font-weight: bold;
-}
-
-/* -- index page ------------------------------------------------------------ */
-
-table.contentstable {
-    width: 90%;
-}
-
-table.contentstable p.biglink {
-    line-height: 150%;
-}
-
-a.biglink {
-    font-size: 1.3em;
-}
-
-span.linkdescr {
-    font-style: italic;
-    padding-top: 5px;
-    font-size: 90%;
-}
-
-/* -- general index --------------------------------------------------------- */
-
-table.indextable {
-    width: 100%;
-}
-
-table.indextable td {
-    text-align: left;
-    vertical-align: top;
-}
-
-table.indextable dl, table.indextable dd {
-    margin-top: 0;
-    margin-bottom: 0;
-}
-
-table.indextable tr.pcap {
-    height: 10px;
-}
-
-table.indextable tr.cap {
-    margin-top: 10px;
-    background-color: #f2f2f2;
-}
-
-img.toggler {
-    margin-right: 3px;
-    margin-top: 3px;
-    cursor: pointer;
-}
-
-div.modindex-jumpbox {
-    border-top: 1px solid #ddd;
-    border-bottom: 1px solid #ddd;
-    margin: 1em 0 1em 0;
-    padding: 0.4em;
-}
-
-div.genindex-jumpbox {
-    border-top: 1px solid #ddd;
-    border-bottom: 1px solid #ddd;
-    margin: 1em 0 1em 0;
-    padding: 0.4em;
-}
-
-/* -- general body styles --------------------------------------------------- */
-
-div.body p, div.body dd, div.body li, div.body blockquote {
-    -moz-hyphens: auto;
-    -ms-hyphens: auto;
-    -webkit-hyphens: auto;
-    hyphens: auto;
-}
-
-a.headerlink {
-    visibility: hidden;
-}
-
-h1:hover > a.headerlink,
-h2:hover > a.headerlink,
-h3:hover > a.headerlink,
-h4:hover > a.headerlink,
-h5:hover > a.headerlink,
-h6:hover > a.headerlink,
-dt:hover > a.headerlink,
-caption:hover > a.headerlink,
-p.caption:hover > a.headerlink,
-div.code-block-caption:hover > a.headerlink {
-    visibility: visible;
-}
-
-div.body p.caption {
-    text-align: inherit;
-}
-
-div.body td {
-    text-align: left;
-}
-
-.field-list ul {
-    padding-left: 1em;
-}
-
-.first {
-    margin-top: 0 !important;
-}
-
-p.rubric {
-    margin-top: 30px;
-    font-weight: bold;
-}
-
-img.align-left, .figure.align-left, object.align-left {
-    clear: left;
-    float: left;
-    margin-right: 1em;
-}
-
-img.align-right, .figure.align-right, object.align-right {
-    clear: right;
-    float: right;
-    margin-left: 1em;
-}
-
-img.align-center, .figure.align-center, object.align-center {
-  display: block;
-  margin-left: auto;
-  margin-right: auto;
-}
-
-.align-left {
-    text-align: left;
-}
-
-.align-center {
-    text-align: center;
-}
-
-.align-right {
-    text-align: right;
-}
-
-/* -- sidebars -------------------------------------------------------------- */
-
-div.sidebar {
-    margin: 0 0 0.5em 1em;
-    border: 1px solid #ddb;
-    padding: 7px 7px 0 7px;
-    background-color: #ffe;
-    width: 40%;
-    float: right;
-}
-
-p.sidebar-title {
-    font-weight: bold;
-}
-
-/* -- topics ---------------------------------------------------------------- */
-
-div.topic {
-    border: 1px solid #ccc;
-    padding: 7px 7px 0 7px;
-    margin: 10px 0 10px 0;
-}
-
-p.topic-title {
-    font-size: 1.1em;
-    font-weight: bold;
-    margin-top: 10px;
-}
-
-/* -- admonitions ----------------------------------------------------------- */
-
-div.admonition {
-    margin-top: 10px;
-    margin-bottom: 10px;
-    padding: 7px;
-}
-
-div.admonition dt {
-    font-weight: bold;
-}
-
-div.admonition dl {
-    margin-bottom: 0;
-}
-
-p.admonition-title {
-    margin: 0px 10px 5px 0px;
-    font-weight: bold;
-}
-
-div.body p.centered {
-    text-align: center;
-    margin-top: 25px;
-}
-
-/* -- tables ---------------------------------------------------------------- */
-
-table.docutils {
-    border: 0;
-    border-collapse: collapse;
-}
-
-table caption span.caption-number {
-    font-style: italic;
-}
-
-table caption span.caption-text {
-}
-
-table.docutils td, table.docutils th {
-    padding: 1px 8px 1px 5px;
-    border-top: 0;
-    border-left: 0;
-    border-right: 0;
-    border-bottom: 1px solid #aaa;
-}
-
-table.field-list td, table.field-list th {
-    border: 0 !important;
-}
-
-table.footnote td, table.footnote th {
-    border: 0 !important;
-}
-
-th {
-    text-align: left;
-    padding-right: 5px;
-}
-
-table.citation {
-    border-left: solid 1px gray;
-    margin-left: 1px;
-}
-
-table.citation td {
-    border-bottom: none;
-}
-
-/* -- figures --------------------------------------------------------------- */
-
-div.figure {
-    margin: 0.5em;
-    padding: 0.5em;
-}
-
-div.figure p.caption {
-    padding: 0.3em;
-}
-
-div.figure p.caption span.caption-number {
-    font-style: italic;
-}
-
-div.figure p.caption span.caption-text {
-}
-
-
-/* -- other body styles ----------------------------------------------------- */
-
-ol.arabic {
-    list-style: decimal;
-}
-
-ol.loweralpha {
-    list-style: lower-alpha;
-}
-
-ol.upperalpha {
-    list-style: upper-alpha;
-}
-
-ol.lowerroman {
-    list-style: lower-roman;
-}
-
-ol.upperroman {
-    list-style: upper-roman;
-}
-
-dl {
-    margin-bottom: 15px;
-}
-
-dd p {
-    margin-top: 0px;
-}
-
-dd ul, dd table {
-    margin-bottom: 10px;
-}
-
-dd {
-    margin-top: 3px;
-    margin-bottom: 10px;
-    margin-left: 30px;
-}
-
-dt:target, .highlighted {
-    background-color: #fbe54e;
-}
-
-dl.glossary dt {
-    font-weight: bold;
-    font-size: 1.1em;
-}
-
-.field-list ul {
-    margin: 0;
-    padding-left: 1em;
-}
-
-.field-list p {
-    margin: 0;
-}
-
-.optional {
-    font-size: 1.3em;
-}
-
-.sig-paren {
-    font-size: larger;
-}
-
-.versionmodified {
-    font-style: italic;
-}
-
-.system-message {
-    background-color: #fda;
-    padding: 5px;
-    border: 3px solid red;
-}
-
-.footnote:target  {
-    background-color: #ffa;
-}
-
-.line-block {
-    display: block;
-    margin-top: 1em;
-    margin-bottom: 1em;
-}
-
-.line-block .line-block {
-    margin-top: 0;
-    margin-bottom: 0;
-    margin-left: 1.5em;
-}
-
-.guilabel, .menuselection {
-    font-family: sans-serif;
-}
-
-.accelerator {
-    text-decoration: underline;
-}
-
-.classifier {
-    font-style: oblique;
-}
-
-abbr, acronym {
-    border-bottom: dotted 1px;
-    cursor: help;
-}
-
-/* -- code displays --------------------------------------------------------- */
-
-pre {
-    overflow: auto;
-    overflow-y: hidden;  /* fixes display issues on Chrome browsers */
-}
-
-td.linenos pre {
-    padding: 5px 0px;
-    border: 0;
-    background-color: transparent;
-    color: #aaa;
-}
-
-table.highlighttable {
-    margin-left: 0.5em;
-}
-
-table.highlighttable td {
-    padding: 0 0.5em 0 0.5em;
-}
-
-div.code-block-caption {
-    padding: 2px 5px;
-    font-size: small;
-}
-
-div.code-block-caption code {
-    background-color: transparent;
-}
-
-div.code-block-caption + div > div.highlight > pre {
-    margin-top: 0;
-}
-
-div.code-block-caption span.caption-number {
-    padding: 0.1em 0.3em;
-    font-style: italic;
-}
-
-div.code-block-caption span.caption-text {
-}
-
-div.literal-block-wrapper {
-    padding: 1em 1em 0;
-}
-
-div.literal-block-wrapper div.highlight {
-    margin: 0;
-}
-
-code.descname {
-    background-color: transparent;
-    font-weight: bold;
-    font-size: 1.2em;
-}
-
-code.descclassname {
-    background-color: transparent;
-}
-
-code.xref, a code {
-    background-color: transparent;
-    font-weight: bold;
-}
-
-h1 code, h2 code, h3 code, h4 code, h5 code, h6 code {
-    background-color: transparent;
-}
-
-.viewcode-link {
-    float: right;
-}
-
-.viewcode-back {
-    float: right;
-    font-family: sans-serif;
-}
-
-div.viewcode-block:target {
-    margin: -1px -10px;
-    padding: 0 10px;
-}
-
-/* -- math display ---------------------------------------------------------- */
-
-img.math {
-    vertical-align: middle;
-}
-
-div.body div.math p {
-    text-align: center;
-}
-
-span.eqno {
-    float: right;
-}
-
-/* -- printout stylesheet --------------------------------------------------- */
-
-@media print {
-    div.document,
-    div.documentwrapper,
-    div.bodywrapper {
-        margin: 0 !important;
-        width: 100%;
-    }
-
-    div.sphinxsidebar,
-    div.related,
-    div.footer,
-    #top-link {
-        display: none;
-    }
-}
\ No newline at end of file
diff --git a/docs/static/bestpython.png b/docs/static/bestpython.png
deleted file mode 100644
index 59940ff3..00000000
Binary files a/docs/static/bestpython.png and /dev/null differ
diff --git a/docs/static/comment-bright.png b/docs/static/comment-bright.png
deleted file mode 100644
index 551517b8..00000000
Binary files a/docs/static/comment-bright.png and /dev/null differ
diff --git a/docs/static/comment-close.png b/docs/static/comment-close.png
deleted file mode 100644
index 09b54be4..00000000
Binary files a/docs/static/comment-close.png and /dev/null differ
diff --git a/docs/static/comment.png b/docs/static/comment.png
deleted file mode 100644
index 92feb52b..00000000
Binary files a/docs/static/comment.png and /dev/null differ
diff --git a/docs/static/doctools.js b/docs/static/doctools.js
deleted file mode 100644
index 81634956..00000000
--- a/docs/static/doctools.js
+++ /dev/null
@@ -1,287 +0,0 @@
-/*
- * doctools.js
- * ~~~~~~~~~~~
- *
- * Sphinx JavaScript utilities for all documentation.
- *
- * :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
- * :license: BSD, see LICENSE for details.
- *
- */
-
-/**
- * select a different prefix for underscore
- */
-$u = _.noConflict();
-
-/**
- * make the code below compatible with browsers without
- * an installed firebug like debugger
-if (!window.console || !console.firebug) {
-  var names = ["log", "debug", "info", "warn", "error", "assert", "dir",
-    "dirxml", "group", "groupEnd", "time", "timeEnd", "count", "trace",
-    "profile", "profileEnd"];
-  window.console = {};
-  for (var i = 0; i < names.length; ++i)
-    window.console[names[i]] = function() {};
-}
- */
-
-/**
- * small helper function to urldecode strings
- */
-jQuery.urldecode = function(x) {
-  return decodeURIComponent(x).replace(/\+/g, ' ');
-};
-
-/**
- * small helper function to urlencode strings
- */
-jQuery.urlencode = encodeURIComponent;
-
-/**
- * This function returns the parsed url parameters of the
- * current request. Multiple values per key are supported,
- * it will always return arrays of strings for the value parts.
- */
-jQuery.getQueryParameters = function(s) {
-  if (typeof s == 'undefined')
-    s = document.location.search;
-  var parts = s.substr(s.indexOf('?') + 1).split('&');
-  var result = {};
-  for (var i = 0; i < parts.length; i++) {
-    var tmp = parts[i].split('=', 2);
-    var key = jQuery.urldecode(tmp[0]);
-    var value = jQuery.urldecode(tmp[1]);
-    if (key in result)
-      result[key].push(value);
-    else
-      result[key] = [value];
-  }
-  return result;
-};
-
-/**
- * highlight a given string on a jquery object by wrapping it in
- * span elements with the given class name.
- */
-jQuery.fn.highlightText = function(text, className) {
-  function highlight(node) {
-    if (node.nodeType == 3) {
-      var val = node.nodeValue;
-      var pos = val.toLowerCase().indexOf(text);
-      if (pos >= 0 && !jQuery(node.parentNode).hasClass(className)) {
-        var span = document.createElement("span");
-        span.className = className;
-        span.appendChild(document.createTextNode(val.substr(pos, text.length)));
-        node.parentNode.insertBefore(span, node.parentNode.insertBefore(
-          document.createTextNode(val.substr(pos + text.length)),
-          node.nextSibling));
-        node.nodeValue = val.substr(0, pos);
-      }
-    }
-    else if (!jQuery(node).is("button, select, textarea")) {
-      jQuery.each(node.childNodes, function() {
-        highlight(this);
-      });
-    }
-  }
-  return this.each(function() {
-    highlight(this);
-  });
-};
-
-/*
- * backward compatibility for jQuery.browser
- * This will be supported until firefox bug is fixed.
- */
-if (!jQuery.browser) {
-  jQuery.uaMatch = function(ua) {
-    ua = ua.toLowerCase();
-
-    var match = /(chrome)[ \/]([\w.]+)/.exec(ua) ||
-      /(webkit)[ \/]([\w.]+)/.exec(ua) ||
-      /(opera)(?:.*version|)[ \/]([\w.]+)/.exec(ua) ||
-      /(msie) ([\w.]+)/.exec(ua) ||
-      ua.indexOf("compatible") < 0 && /(mozilla)(?:.*? rv:([\w.]+)|)/.exec(ua) ||
-      [];
-
-    return {
-      browser: match[ 1 ] || "",
-      version: match[ 2 ] || "0"
-    };
-  };
-  jQuery.browser = {};
-  jQuery.browser[jQuery.uaMatch(navigator.userAgent).browser] = true;
-}
-
-/**
- * Small JavaScript module for the documentation.
- */
-var Documentation = {
-
-  init : function() {
-    this.fixFirefoxAnchorBug();
-    this.highlightSearchWords();
-    this.initIndexTable();
-    
-  },
-
-  /**
-   * i18n support
-   */
-  TRANSLATIONS : {},
-  PLURAL_EXPR : function(n) { return n == 1 ? 0 : 1; },
-  LOCALE : 'unknown',
-
-  // gettext and ngettext don't access this so that the functions
-  // can safely bound to a different name (_ = Documentation.gettext)
-  gettext : function(string) {
-    var translated = Documentation.TRANSLATIONS[string];
-    if (typeof translated == 'undefined')
-      return string;
-    return (typeof translated == 'string') ? translated : translated[0];
-  },
-
-  ngettext : function(singular, plural, n) {
-    var translated = Documentation.TRANSLATIONS[singular];
-    if (typeof translated == 'undefined')
-      return (n == 1) ? singular : plural;
-    return translated[Documentation.PLURALEXPR(n)];
-  },
-
-  addTranslations : function(catalog) {
-    for (var key in catalog.messages)
-      this.TRANSLATIONS[key] = catalog.messages[key];
-    this.PLURAL_EXPR = new Function('n', 'return +(' + catalog.plural_expr + ')');
-    this.LOCALE = catalog.locale;
-  },
-
-  /**
-   * add context elements like header anchor links
-   */
-  addContextElements : function() {
-    $('div[id] > :header:first').each(function() {
-      $('<a class="headerlink">\u00B6</a>').
-      attr('href', '#' + this.id).
-      attr('title', _('Permalink to this headline')).
-      appendTo(this);
-    });
-    $('dt[id]').each(function() {
-      $('<a class="headerlink">\u00B6</a>').
-      attr('href', '#' + this.id).
-      attr('title', _('Permalink to this definition')).
-      appendTo(this);
-    });
-  },
-
-  /**
-   * workaround a firefox stupidity
-   * see: https://bugzilla.mozilla.org/show_bug.cgi?id=645075
-   */
-  fixFirefoxAnchorBug : function() {
-    if (document.location.hash)
-      window.setTimeout(function() {
-        document.location.href += '';
-      }, 10);
-  },
-
-  /**
-   * highlight the search words provided in the url in the text
-   */
-  highlightSearchWords : function() {
-    var params = $.getQueryParameters();
-    var terms = (params.highlight) ? params.highlight[0].split(/\s+/) : [];
-    if (terms.length) {
-      var body = $('div.body');
-      if (!body.length) {
-        body = $('body');
-      }
-      window.setTimeout(function() {
-        $.each(terms, function() {
-          body.highlightText(this.toLowerCase(), 'highlighted');
-        });
-      }, 10);
-      $('<p class="highlight-link"><a href="javascript:Documentation.' +
-        'hideSearchWords()">' + _('Hide Search Matches') + '</a></p>')
-          .appendTo($('#searchbox'));
-    }
-  },
-
-  /**
-   * init the domain index toggle buttons
-   */
-  initIndexTable : function() {
-    var togglers = $('img.toggler').click(function() {
-      var src = $(this).attr('src');
-      var idnum = $(this).attr('id').substr(7);
-      $('tr.cg-' + idnum).toggle();
-      if (src.substr(-9) == 'minus.png')
-        $(this).attr('src', src.substr(0, src.length-9) + 'plus.png');
-      else
-        $(this).attr('src', src.substr(0, src.length-8) + 'minus.png');
-    }).css('display', '');
-    if (DOCUMENTATION_OPTIONS.COLLAPSE_INDEX) {
-        togglers.click();
-    }
-  },
-
-  /**
-   * helper function to hide the search marks again
-   */
-  hideSearchWords : function() {
-    $('#searchbox .highlight-link').fadeOut(300);
-    $('span.highlighted').removeClass('highlighted');
-  },
-
-  /**
-   * make the url absolute
-   */
-  makeURL : function(relativeURL) {
-    return DOCUMENTATION_OPTIONS.URL_ROOT + '/' + relativeURL;
-  },
-
-  /**
-   * get the current relative url
-   */
-  getCurrentURL : function() {
-    var path = document.location.pathname;
-    var parts = path.split(/\//);
-    $.each(DOCUMENTATION_OPTIONS.URL_ROOT.split(/\//), function() {
-      if (this == '..')
-        parts.pop();
-    });
-    var url = parts.join('/');
-    return path.substring(url.lastIndexOf('/') + 1, path.length - 1);
-  },
-
-  initOnKeyListeners: function() {
-    $(document).keyup(function(event) {
-      var activeElementType = document.activeElement.tagName;
-      // don't navigate when in search box or textarea
-      if (activeElementType !== 'TEXTAREA' && activeElementType !== 'INPUT' && activeElementType !== 'SELECT') {
-        switch (event.keyCode) {
-          case 37: // left
-            var prevHref = $('link[rel="prev"]').prop('href');
-            if (prevHref) {
-              window.location.href = prevHref;
-              return false;
-            }
-          case 39: // right
-            var nextHref = $('link[rel="next"]').prop('href');
-            if (nextHref) {
-              window.location.href = nextHref;
-              return false;
-            }
-        }
-      }
-    });
-  }
-};
-
-// quick alias for translations
-_ = Documentation.gettext;
-
-$(document).ready(function() {
-  Documentation.init();
-});
\ No newline at end of file
diff --git a/docs/static/down-pressed.png b/docs/static/down-pressed.png
deleted file mode 100644
index 7c30d004..00000000
Binary files a/docs/static/down-pressed.png and /dev/null differ
diff --git a/docs/static/down.png b/docs/static/down.png
deleted file mode 100644
index f48098a4..00000000
Binary files a/docs/static/down.png and /dev/null differ
diff --git a/docs/static/file.png b/docs/static/file.png
deleted file mode 100644
index 254c60bf..00000000
Binary files a/docs/static/file.png and /dev/null differ
diff --git a/docs/static/guide_extend_pic1.png b/docs/static/guide_extend_pic1.png
deleted file mode 100644
index fae7de0e..00000000
Binary files a/docs/static/guide_extend_pic1.png and /dev/null differ
diff --git a/docs/static/guide_extend_pic2.png b/docs/static/guide_extend_pic2.png
deleted file mode 100644
index bcff8648..00000000
Binary files a/docs/static/guide_extend_pic2.png and /dev/null differ
diff --git a/docs/static/guide_helloworld_pic1.png b/docs/static/guide_helloworld_pic1.png
deleted file mode 100644
index 712e9864..00000000
Binary files a/docs/static/guide_helloworld_pic1.png and /dev/null differ
diff --git a/docs/static/guide_howtostart_pic1.png b/docs/static/guide_howtostart_pic1.png
deleted file mode 100644
index 54c666a7..00000000
Binary files a/docs/static/guide_howtostart_pic1.png and /dev/null differ
diff --git a/docs/static/guide_howtostart_pic2.png b/docs/static/guide_howtostart_pic2.png
deleted file mode 100644
index 296a5150..00000000
Binary files a/docs/static/guide_howtostart_pic2.png and /dev/null differ
diff --git a/docs/static/guide_howtostart_pic3.png b/docs/static/guide_howtostart_pic3.png
deleted file mode 100644
index f7caf8c7..00000000
Binary files a/docs/static/guide_howtostart_pic3.png and /dev/null differ
diff --git a/docs/static/guide_howtostart_pic4.png b/docs/static/guide_howtostart_pic4.png
deleted file mode 100644
index 6d2b2fc3..00000000
Binary files a/docs/static/guide_howtostart_pic4.png and /dev/null differ
diff --git a/docs/static/guide_howtostart_pic5.png b/docs/static/guide_howtostart_pic5.png
deleted file mode 100644
index 9e30aed4..00000000
Binary files a/docs/static/guide_howtostart_pic5.png and /dev/null differ
diff --git a/docs/static/guide_ide_qedit4web.png b/docs/static/guide_ide_qedit4web.png
deleted file mode 100644
index 09f2ccb3..00000000
Binary files a/docs/static/guide_ide_qedit4web.png and /dev/null differ
diff --git a/docs/static/guide_ide_qedit4web_choose.png b/docs/static/guide_ide_qedit4web_choose.png
deleted file mode 100644
index 6f3edfd3..00000000
Binary files a/docs/static/guide_ide_qedit4web_choose.png and /dev/null differ
diff --git a/docs/static/guide_ide_qedit4web_develop.png b/docs/static/guide_ide_qedit4web_develop.png
deleted file mode 100644
index 0fde32ce..00000000
Binary files a/docs/static/guide_ide_qedit4web_develop.png and /dev/null differ
diff --git a/docs/static/guide_program_pic1.png b/docs/static/guide_program_pic1.png
deleted file mode 100644
index 4cdf975c..00000000
Binary files a/docs/static/guide_program_pic1.png and /dev/null differ
diff --git a/docs/static/ic_appstore@2x.png b/docs/static/ic_appstore@2x.png
deleted file mode 100644
index d70ade36..00000000
Binary files a/docs/static/ic_appstore@2x.png and /dev/null differ
diff --git a/docs/static/ic_appstore_2x.png b/docs/static/ic_appstore_2x.png
deleted file mode 100644
index 1582c40d..00000000
Binary files a/docs/static/ic_appstore_2x.png and /dev/null differ
diff --git a/docs/static/ic_community@2x.png b/docs/static/ic_community@2x.png
deleted file mode 100644
index 6984f28f..00000000
Binary files a/docs/static/ic_community@2x.png and /dev/null differ
diff --git a/docs/static/ic_facebook.png b/docs/static/ic_facebook.png
deleted file mode 100644
index 027c863e..00000000
Binary files a/docs/static/ic_facebook.png and /dev/null differ
diff --git a/docs/static/ic_faq@2x.png b/docs/static/ic_faq@2x.png
deleted file mode 100644
index 1f89df68..00000000
Binary files a/docs/static/ic_faq@2x.png and /dev/null differ
diff --git a/docs/static/ic_googleplay@2x.png b/docs/static/ic_googleplay@2x.png
deleted file mode 100644
index 3b46dd00..00000000
Binary files a/docs/static/ic_googleplay@2x.png and /dev/null differ
diff --git a/docs/static/ic_googleplay_2x.png b/docs/static/ic_googleplay_2x.png
deleted file mode 100644
index 1e62373c..00000000
Binary files a/docs/static/ic_googleplay_2x.png and /dev/null differ
diff --git a/docs/static/ic_googleplay_3_2x.png b/docs/static/ic_googleplay_3_2x.png
deleted file mode 100644
index c5086adf..00000000
Binary files a/docs/static/ic_googleplay_3_2x.png and /dev/null differ
diff --git a/docs/static/ic_new@2x.png b/docs/static/ic_new@2x.png
deleted file mode 100644
index 215bb040..00000000
Binary files a/docs/static/ic_new@2x.png and /dev/null differ
diff --git a/docs/static/ic_search.png b/docs/static/ic_search.png
deleted file mode 100644
index 0b6623ad..00000000
Binary files a/docs/static/ic_search.png and /dev/null differ
diff --git a/docs/static/ic_support@2x.png b/docs/static/ic_support@2x.png
deleted file mode 100644
index c06804c9..00000000
Binary files a/docs/static/ic_support@2x.png and /dev/null differ
diff --git a/docs/static/ic_twitter.png b/docs/static/ic_twitter.png
deleted file mode 100644
index 8dcf2eeb..00000000
Binary files a/docs/static/ic_twitter.png and /dev/null differ
diff --git a/docs/static/img_background.png b/docs/static/img_background.png
deleted file mode 100644
index f2009093..00000000
Binary files a/docs/static/img_background.png and /dev/null differ
diff --git a/docs/static/img_banner-1.jpg b/docs/static/img_banner-1.jpg
deleted file mode 100644
index 35179f4e..00000000
Binary files a/docs/static/img_banner-1.jpg and /dev/null differ
diff --git a/docs/static/img_banner-1.png b/docs/static/img_banner-1.png
deleted file mode 100644
index 1be1cf32..00000000
Binary files a/docs/static/img_banner-1.png and /dev/null differ
diff --git a/docs/static/img_banner-1@2x.jpg b/docs/static/img_banner-1@2x.jpg
deleted file mode 100644
index e17b703a..00000000
Binary files a/docs/static/img_banner-1@2x.jpg and /dev/null differ
diff --git a/docs/static/img_banner-1@2x.png b/docs/static/img_banner-1@2x.png
deleted file mode 100644
index 0942fe79..00000000
Binary files a/docs/static/img_banner-1@2x.png and /dev/null differ
diff --git a/docs/static/img_logo.png b/docs/static/img_logo.png
deleted file mode 100644
index 1fdedce6..00000000
Binary files a/docs/static/img_logo.png and /dev/null differ
diff --git a/docs/static/jquery-1.11.1.js b/docs/static/jquery-1.11.1.js
deleted file mode 100644
index d4b67f7e..00000000
--- a/docs/static/jquery-1.11.1.js
+++ /dev/null
@@ -1,10308 +0,0 @@
-/*!
- * jQuery JavaScript Library v1.11.1
- * http://jquery.com/
- *
- * Includes Sizzle.js
- * http://sizzlejs.com/
- *
- * Copyright 2005, 2014 jQuery Foundation, Inc. and other contributors
- * Released under the MIT license
- * http://jquery.org/license
- *
- * Date: 2014-05-01T17:42Z
- */
-
-(function( global, factory ) {
-
-	if ( typeof module === "object" && typeof module.exports === "object" ) {
-		// For CommonJS and CommonJS-like environments where a proper window is present,
-		// execute the factory and get jQuery
-		// For environments that do not inherently posses a window with a document
-		// (such as Node.js), expose a jQuery-making factory as module.exports
-		// This accentuates the need for the creation of a real window
-		// e.g. var jQuery = require("jquery")(window);
-		// See ticket #14549 for more info
-		module.exports = global.document ?
-			factory( global, true ) :
-			function( w ) {
-				if ( !w.document ) {
-					throw new Error( "jQuery requires a window with a document" );
-				}
-				return factory( w );
-			};
-	} else {
-		factory( global );
-	}
-
-// Pass this if window is not defined yet
-}(typeof window !== "undefined" ? window : this, function( window, noGlobal ) {
-
-// Can't do this because several apps including ASP.NET trace
-// the stack via arguments.caller.callee and Firefox dies if
-// you try to trace through "use strict" call chains. (#13335)
-// Support: Firefox 18+
-//
-
-var deletedIds = [];
-
-var slice = deletedIds.slice;
-
-var concat = deletedIds.concat;
-
-var push = deletedIds.push;
-
-var indexOf = deletedIds.indexOf;
-
-var class2type = {};
-
-var toString = class2type.toString;
-
-var hasOwn = class2type.hasOwnProperty;
-
-var support = {};
-
-
-
-var
-	version = "1.11.1",
-
-	// Define a local copy of jQuery
-	jQuery = function( selector, context ) {
-		// The jQuery object is actually just the init constructor 'enhanced'
-		// Need init if jQuery is called (just allow error to be thrown if not included)
-		return new jQuery.fn.init( selector, context );
-	},
-
-	// Support: Android<4.1, IE<9
-	// Make sure we trim BOM and NBSP
-	rtrim = /^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,
-
-	// Matches dashed string for camelizing
-	rmsPrefix = /^-ms-/,
-	rdashAlpha = /-([\da-z])/gi,
-
-	// Used by jQuery.camelCase as callback to replace()
-	fcamelCase = function( all, letter ) {
-		return letter.toUpperCase();
-	};
-
-jQuery.fn = jQuery.prototype = {
-	// The current version of jQuery being used
-	jquery: version,
-
-	constructor: jQuery,
-
-	// Start with an empty selector
-	selector: "",
-
-	// The default length of a jQuery object is 0
-	length: 0,
-
-	toArray: function() {
-		return slice.call( this );
-	},
-
-	// Get the Nth element in the matched element set OR
-	// Get the whole matched element set as a clean array
-	get: function( num ) {
-		return num != null ?
-
-			// Return just the one element from the set
-			( num < 0 ? this[ num + this.length ] : this[ num ] ) :
-
-			// Return all the elements in a clean array
-			slice.call( this );
-	},
-
-	// Take an array of elements and push it onto the stack
-	// (returning the new matched element set)
-	pushStack: function( elems ) {
-
-		// Build a new jQuery matched element set
-		var ret = jQuery.merge( this.constructor(), elems );
-
-		// Add the old object onto the stack (as a reference)
-		ret.prevObject = this;
-		ret.context = this.context;
-
-		// Return the newly-formed element set
-		return ret;
-	},
-
-	// Execute a callback for every element in the matched set.
-	// (You can seed the arguments with an array of args, but this is
-	// only used internally.)
-	each: function( callback, args ) {
-		return jQuery.each( this, callback, args );
-	},
-
-	map: function( callback ) {
-		return this.pushStack( jQuery.map(this, function( elem, i ) {
-			return callback.call( elem, i, elem );
-		}));
-	},
-
-	slice: function() {
-		return this.pushStack( slice.apply( this, arguments ) );
-	},
-
-	first: function() {
-		return this.eq( 0 );
-	},
-
-	last: function() {
-		return this.eq( -1 );
-	},
-
-	eq: function( i ) {
-		var len = this.length,
-			j = +i + ( i < 0 ? len : 0 );
-		return this.pushStack( j >= 0 && j < len ? [ this[j] ] : [] );
-	},
-
-	end: function() {
-		return this.prevObject || this.constructor(null);
-	},
-
-	// For internal use only.
-	// Behaves like an Array's method, not like a jQuery method.
-	push: push,
-	sort: deletedIds.sort,
-	splice: deletedIds.splice
-};
-
-jQuery.extend = jQuery.fn.extend = function() {
-	var src, copyIsArray, copy, name, options, clone,
-		target = arguments[0] || {},
-		i = 1,
-		length = arguments.length,
-		deep = false;
-
-	// Handle a deep copy situation
-	if ( typeof target === "boolean" ) {
-		deep = target;
-
-		// skip the boolean and the target
-		target = arguments[ i ] || {};
-		i++;
-	}
-
-	// Handle case when target is a string or something (possible in deep copy)
-	if ( typeof target !== "object" && !jQuery.isFunction(target) ) {
-		target = {};
-	}
-
-	// extend jQuery itself if only one argument is passed
-	if ( i === length ) {
-		target = this;
-		i--;
-	}
-
-	for ( ; i < length; i++ ) {
-		// Only deal with non-null/undefined values
-		if ( (options = arguments[ i ]) != null ) {
-			// Extend the base object
-			for ( name in options ) {
-				src = target[ name ];
-				copy = options[ name ];
-
-				// Prevent never-ending loop
-				if ( target === copy ) {
-					continue;
-				}
-
-				// Recurse if we're merging plain objects or arrays
-				if ( deep && copy && ( jQuery.isPlainObject(copy) || (copyIsArray = jQuery.isArray(copy)) ) ) {
-					if ( copyIsArray ) {
-						copyIsArray = false;
-						clone = src && jQuery.isArray(src) ? src : [];
-
-					} else {
-						clone = src && jQuery.isPlainObject(src) ? src : {};
-					}
-
-					// Never move original objects, clone them
-					target[ name ] = jQuery.extend( deep, clone, copy );
-
-				// Don't bring in undefined values
-				} else if ( copy !== undefined ) {
-					target[ name ] = copy;
-				}
-			}
-		}
-	}
-
-	// Return the modified object
-	return target;
-};
-
-jQuery.extend({
-	// Unique for each copy of jQuery on the page
-	expando: "jQuery" + ( version + Math.random() ).replace( /\D/g, "" ),
-
-	// Assume jQuery is ready without the ready module
-	isReady: true,
-
-	error: function( msg ) {
-		throw new Error( msg );
-	},
-
-	noop: function() {},
-
-	// See test/unit/core.js for details concerning isFunction.
-	// Since version 1.3, DOM methods and functions like alert
-	// aren't supported. They return false on IE (#2968).
-	isFunction: function( obj ) {
-		return jQuery.type(obj) === "function";
-	},
-
-	isArray: Array.isArray || function( obj ) {
-		return jQuery.type(obj) === "array";
-	},
-
-	isWindow: function( obj ) {
-		/* jshint eqeqeq: false */
-		return obj != null && obj == obj.window;
-	},
-
-	isNumeric: function( obj ) {
-		// parseFloat NaNs numeric-cast false positives (null|true|false|"")
-		// ...but misinterprets leading-number strings, particularly hex literals ("0x...")
-		// subtraction forces infinities to NaN
-		return !jQuery.isArray( obj ) && obj - parseFloat( obj ) >= 0;
-	},
-
-	isEmptyObject: function( obj ) {
-		var name;
-		for ( name in obj ) {
-			return false;
-		}
-		return true;
-	},
-
-	isPlainObject: function( obj ) {
-		var key;
-
-		// Must be an Object.
-		// Because of IE, we also have to check the presence of the constructor property.
-		// Make sure that DOM nodes and window objects don't pass through, as well
-		if ( !obj || jQuery.type(obj) !== "object" || obj.nodeType || jQuery.isWindow( obj ) ) {
-			return false;
-		}
-
-		try {
-			// Not own constructor property must be Object
-			if ( obj.constructor &&
-				!hasOwn.call(obj, "constructor") &&
-				!hasOwn.call(obj.constructor.prototype, "isPrototypeOf") ) {
-				return false;
-			}
-		} catch ( e ) {
-			// IE8,9 Will throw exceptions on certain host objects #9897
-			return false;
-		}
-
-		// Support: IE<9
-		// Handle iteration over inherited properties before own properties.
-		if ( support.ownLast ) {
-			for ( key in obj ) {
-				return hasOwn.call( obj, key );
-			}
-		}
-
-		// Own properties are enumerated firstly, so to speed up,
-		// if last one is own, then all properties are own.
-		for ( key in obj ) {}
-
-		return key === undefined || hasOwn.call( obj, key );
-	},
-
-	type: function( obj ) {
-		if ( obj == null ) {
-			return obj + "";
-		}
-		return typeof obj === "object" || typeof obj === "function" ?
-			class2type[ toString.call(obj) ] || "object" :
-			typeof obj;
-	},
-
-	// Evaluates a script in a global context
-	// Workarounds based on findings by Jim Driscoll
-	// http://weblogs.java.net/blog/driscoll/archive/2009/09/08/eval-javascript-global-context
-	globalEval: function( data ) {
-		if ( data && jQuery.trim( data ) ) {
-			// We use execScript on Internet Explorer
-			// We use an anonymous function so that context is window
-			// rather than jQuery in Firefox
-			( window.execScript || function( data ) {
-				window[ "eval" ].call( window, data );
-			} )( data );
-		}
-	},
-
-	// Convert dashed to camelCase; used by the css and data modules
-	// Microsoft forgot to hump their vendor prefix (#9572)
-	camelCase: function( string ) {
-		return string.replace( rmsPrefix, "ms-" ).replace( rdashAlpha, fcamelCase );
-	},
-
-	nodeName: function( elem, name ) {
-		return elem.nodeName && elem.nodeName.toLowerCase() === name.toLowerCase();
-	},
-
-	// args is for internal usage only
-	each: function( obj, callback, args ) {
-		var value,
-			i = 0,
-			length = obj.length,
-			isArray = isArraylike( obj );
-
-		if ( args ) {
-			if ( isArray ) {
-				for ( ; i < length; i++ ) {
-					value = callback.apply( obj[ i ], args );
-
-					if ( value === false ) {
-						break;
-					}
-				}
-			} else {
-				for ( i in obj ) {
-					value = callback.apply( obj[ i ], args );
-
-					if ( value === false ) {
-						break;
-					}
-				}
-			}
-
-		// A special, fast, case for the most common use of each
-		} else {
-			if ( isArray ) {
-				for ( ; i < length; i++ ) {
-					value = callback.call( obj[ i ], i, obj[ i ] );
-
-					if ( value === false ) {
-						break;
-					}
-				}
-			} else {
-				for ( i in obj ) {
-					value = callback.call( obj[ i ], i, obj[ i ] );
-
-					if ( value === false ) {
-						break;
-					}
-				}
-			}
-		}
-
-		return obj;
-	},
-
-	// Support: Android<4.1, IE<9
-	trim: function( text ) {
-		return text == null ?
-			"" :
-			( text + "" ).replace( rtrim, "" );
-	},
-
-	// results is for internal usage only
-	makeArray: function( arr, results ) {
-		var ret = results || [];
-
-		if ( arr != null ) {
-			if ( isArraylike( Object(arr) ) ) {
-				jQuery.merge( ret,
-					typeof arr === "string" ?
-					[ arr ] : arr
-				);
-			} else {
-				push.call( ret, arr );
-			}
-		}
-
-		return ret;
-	},
-
-	inArray: function( elem, arr, i ) {
-		var len;
-
-		if ( arr ) {
-			if ( indexOf ) {
-				return indexOf.call( arr, elem, i );
-			}
-
-			len = arr.length;
-			i = i ? i < 0 ? Math.max( 0, len + i ) : i : 0;
-
-			for ( ; i < len; i++ ) {
-				// Skip accessing in sparse arrays
-				if ( i in arr && arr[ i ] === elem ) {
-					return i;
-				}
-			}
-		}
-
-		return -1;
-	},
-
-	merge: function( first, second ) {
-		var len = +second.length,
-			j = 0,
-			i = first.length;
-
-		while ( j < len ) {
-			first[ i++ ] = second[ j++ ];
-		}
-
-		// Support: IE<9
-		// Workaround casting of .length to NaN on otherwise arraylike objects (e.g., NodeLists)
-		if ( len !== len ) {
-			while ( second[j] !== undefined ) {
-				first[ i++ ] = second[ j++ ];
-			}
-		}
-
-		first.length = i;
-
-		return first;
-	},
-
-	grep: function( elems, callback, invert ) {
-		var callbackInverse,
-			matches = [],
-			i = 0,
-			length = elems.length,
-			callbackExpect = !invert;
-
-		// Go through the array, only saving the items
-		// that pass the validator function
-		for ( ; i < length; i++ ) {
-			callbackInverse = !callback( elems[ i ], i );
-			if ( callbackInverse !== callbackExpect ) {
-				matches.push( elems[ i ] );
-			}
-		}
-
-		return matches;
-	},
-
-	// arg is for internal usage only
-	map: function( elems, callback, arg ) {
-		var value,
-			i = 0,
-			length = elems.length,
-			isArray = isArraylike( elems ),
-			ret = [];
-
-		// Go through the array, translating each of the items to their new values
-		if ( isArray ) {
-			for ( ; i < length; i++ ) {
-				value = callback( elems[ i ], i, arg );
-
-				if ( value != null ) {
-					ret.push( value );
-				}
-			}
-
-		// Go through every key on the object,
-		} else {
-			for ( i in elems ) {
-				value = callback( elems[ i ], i, arg );
-
-				if ( value != null ) {
-					ret.push( value );
-				}
-			}
-		}
-
-		// Flatten any nested arrays
-		return concat.apply( [], ret );
-	},
-
-	// A global GUID counter for objects
-	guid: 1,
-
-	// Bind a function to a context, optionally partially applying any
-	// arguments.
-	proxy: function( fn, context ) {
-		var args, proxy, tmp;
-
-		if ( typeof context === "string" ) {
-			tmp = fn[ context ];
-			context = fn;
-			fn = tmp;
-		}
-
-		// Quick check to determine if target is callable, in the spec
-		// this throws a TypeError, but we will just return undefined.
-		if ( !jQuery.isFunction( fn ) ) {
-			return undefined;
-		}
-
-		// Simulated bind
-		args = slice.call( arguments, 2 );
-		proxy = function() {
-			return fn.apply( context || this, args.concat( slice.call( arguments ) ) );
-		};
-
-		// Set the guid of unique handler to the same of original handler, so it can be removed
-		proxy.guid = fn.guid = fn.guid || jQuery.guid++;
-
-		return proxy;
-	},
-
-	now: function() {
-		return +( new Date() );
-	},
-
-	// jQuery.support is not used in Core but other projects attach their
-	// properties to it so it needs to exist.
-	support: support
-});
-
-// Populate the class2type map
-jQuery.each("Boolean Number String Function Array Date RegExp Object Error".split(" "), function(i, name) {
-	class2type[ "[object " + name + "]" ] = name.toLowerCase();
-});
-
-function isArraylike( obj ) {
-	var length = obj.length,
-		type = jQuery.type( obj );
-
-	if ( type === "function" || jQuery.isWindow( obj ) ) {
-		return false;
-	}
-
-	if ( obj.nodeType === 1 && length ) {
-		return true;
-	}
-
-	return type === "array" || length === 0 ||
-		typeof length === "number" && length > 0 && ( length - 1 ) in obj;
-}
-var Sizzle =
-/*!
- * Sizzle CSS Selector Engine v1.10.19
- * http://sizzlejs.com/
- *
- * Copyright 2013 jQuery Foundation, Inc. and other contributors
- * Released under the MIT license
- * http://jquery.org/license
- *
- * Date: 2014-04-18
- */
-(function( window ) {
-
-var i,
-	support,
-	Expr,
-	getText,
-	isXML,
-	tokenize,
-	compile,
-	select,
-	outermostContext,
-	sortInput,
-	hasDuplicate,
-
-	// Local document vars
-	setDocument,
-	document,
-	docElem,
-	documentIsHTML,
-	rbuggyQSA,
-	rbuggyMatches,
-	matches,
-	contains,
-
-	// Instance-specific data
-	expando = "sizzle" + -(new Date()),
-	preferredDoc = window.document,
-	dirruns = 0,
-	done = 0,
-	classCache = createCache(),
-	tokenCache = createCache(),
-	compilerCache = createCache(),
-	sortOrder = function( a, b ) {
-		if ( a === b ) {
-			hasDuplicate = true;
-		}
-		return 0;
-	},
-
-	// General-purpose constants
-	strundefined = typeof undefined,
-	MAX_NEGATIVE = 1 << 31,
-
-	// Instance methods
-	hasOwn = ({}).hasOwnProperty,
-	arr = [],
-	pop = arr.pop,
-	push_native = arr.push,
-	push = arr.push,
-	slice = arr.slice,
-	// Use a stripped-down indexOf if we can't use a native one
-	indexOf = arr.indexOf || function( elem ) {
-		var i = 0,
-			len = this.length;
-		for ( ; i < len; i++ ) {
-			if ( this[i] === elem ) {
-				return i;
-			}
-		}
-		return -1;
-	},
-
-	booleans = "checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",
-
-	// Regular expressions
-
-	// Whitespace characters http://www.w3.org/TR/css3-selectors/#whitespace
-	whitespace = "[\\x20\\t\\r\\n\\f]",
-	// http://www.w3.org/TR/css3-syntax/#characters
-	characterEncoding = "(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",
-
-	// Loosely modeled on CSS identifier characters
-	// An unquoted value should be a CSS identifier http://www.w3.org/TR/css3-selectors/#attribute-selectors
-	// Proper syntax: http://www.w3.org/TR/CSS21/syndata.html#value-def-identifier
-	identifier = characterEncoding.replace( "w", "w#" ),
-
-	// Attribute selectors: http://www.w3.org/TR/selectors/#attribute-selectors
-	attributes = "\\[" + whitespace + "*(" + characterEncoding + ")(?:" + whitespace +
-		// Operator (capture 2)
-		"*([*^$|!~]?=)" + whitespace +
-		// "Attribute values must be CSS identifiers [capture 5] or strings [capture 3 or capture 4]"
-		"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|(" + identifier + "))|)" + whitespace +
-		"*\\]",
-
-	pseudos = ":(" + characterEncoding + ")(?:\\((" +
-		// To reduce the number of selectors needing tokenize in the preFilter, prefer arguments:
-		// 1. quoted (capture 3; capture 4 or capture 5)
-		"('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|" +
-		// 2. simple (capture 6)
-		"((?:\\\\.|[^\\\\()[\\]]|" + attributes + ")*)|" +
-		// 3. anything else (capture 2)
-		".*" +
-		")\\)|)",
-
-	// Leading and non-escaped trailing whitespace, capturing some non-whitespace characters preceding the latter
-	rtrim = new RegExp( "^" + whitespace + "+|((?:^|[^\\\\])(?:\\\\.)*)" + whitespace + "+$", "g" ),
-
-	rcomma = new RegExp( "^" + whitespace + "*," + whitespace + "*" ),
-	rcombinators = new RegExp( "^" + whitespace + "*([>+~]|" + whitespace + ")" + whitespace + "*" ),
-
-	rattributeQuotes = new RegExp( "=" + whitespace + "*([^\\]'\"]*?)" + whitespace + "*\\]", "g" ),
-
-	rpseudo = new RegExp( pseudos ),
-	ridentifier = new RegExp( "^" + identifier + "$" ),
-
-	matchExpr = {
-		"ID": new RegExp( "^#(" + characterEncoding + ")" ),
-		"CLASS": new RegExp( "^\\.(" + characterEncoding + ")" ),
-		"TAG": new RegExp( "^(" + characterEncoding.replace( "w", "w*" ) + ")" ),
-		"ATTR": new RegExp( "^" + attributes ),
-		"PSEUDO": new RegExp( "^" + pseudos ),
-		"CHILD": new RegExp( "^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\(" + whitespace +
-			"*(even|odd|(([+-]|)(\\d*)n|)" + whitespace + "*(?:([+-]|)" + whitespace +
-			"*(\\d+)|))" + whitespace + "*\\)|)", "i" ),
-		"bool": new RegExp( "^(?:" + booleans + ")$", "i" ),
-		// For use in libraries implementing .is()
-		// We use this for POS matching in `select`
-		"needsContext": new RegExp( "^" + whitespace + "*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\(" +
-			whitespace + "*((?:-\\d)?\\d*)" + whitespace + "*\\)|)(?=[^-]|$)", "i" )
-	},
-
-	rinputs = /^(?:input|select|textarea|button)$/i,
-	rheader = /^h\d$/i,
-
-	rnative = /^[^{]+\{\s*\[native \w/,
-
-	// Easily-parseable/retrievable ID or TAG or CLASS selectors
-	rquickExpr = /^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,
-
-	rsibling = /[+~]/,
-	rescape = /'|\\/g,
-
-	// CSS escapes http://www.w3.org/TR/CSS21/syndata.html#escaped-characters
-	runescape = new RegExp( "\\\\([\\da-f]{1,6}" + whitespace + "?|(" + whitespace + ")|.)", "ig" ),
-	funescape = function( _, escaped, escapedWhitespace ) {
-		var high = "0x" + escaped - 0x10000;
-		// NaN means non-codepoint
-		// Support: Firefox<24
-		// Workaround erroneous numeric interpretation of +"0x"
-		return high !== high || escapedWhitespace ?
-			escaped :
-			high < 0 ?
-				// BMP codepoint
-				String.fromCharCode( high + 0x10000 ) :
-				// Supplemental Plane codepoint (surrogate pair)
-				String.fromCharCode( high >> 10 | 0xD800, high & 0x3FF | 0xDC00 );
-	};
-
-// Optimize for push.apply( _, NodeList )
-try {
-	push.apply(
-		(arr = slice.call( preferredDoc.childNodes )),
-		preferredDoc.childNodes
-	);
-	// Support: Android<4.0
-	// Detect silently failing push.apply
-	arr[ preferredDoc.childNodes.length ].nodeType;
-} catch ( e ) {
-	push = { apply: arr.length ?
-
-		// Leverage slice if possible
-		function( target, els ) {
-			push_native.apply( target, slice.call(els) );
-		} :
-
-		// Support: IE<9
-		// Otherwise append directly
-		function( target, els ) {
-			var j = target.length,
-				i = 0;
-			// Can't trust NodeList.length
-			while ( (target[j++] = els[i++]) ) {}
-			target.length = j - 1;
-		}
-	};
-}
-
-function Sizzle( selector, context, results, seed ) {
-	var match, elem, m, nodeType,
-		// QSA vars
-		i, groups, old, nid, newContext, newSelector;
-
-	if ( ( context ? context.ownerDocument || context : preferredDoc ) !== document ) {
-		setDocument( context );
-	}
-
-	context = context || document;
-	results = results || [];
-
-	if ( !selector || typeof selector !== "string" ) {
-		return results;
-	}
-
-	if ( (nodeType = context.nodeType) !== 1 && nodeType !== 9 ) {
-		return [];
-	}
-
-	if ( documentIsHTML && !seed ) {
-
-		// Shortcuts
-		if ( (match = rquickExpr.exec( selector )) ) {
-			// Speed-up: Sizzle("#ID")
-			if ( (m = match[1]) ) {
-				if ( nodeType === 9 ) {
-					elem = context.getElementById( m );
-					// Check parentNode to catch when Blackberry 4.6 returns
-					// nodes that are no longer in the document (jQuery #6963)
-					if ( elem && elem.parentNode ) {
-						// Handle the case where IE, Opera, and Webkit return items
-						// by name instead of ID
-						if ( elem.id === m ) {
-							results.push( elem );
-							return results;
-						}
-					} else {
-						return results;
-					}
-				} else {
-					// Context is not a document
-					if ( context.ownerDocument && (elem = context.ownerDocument.getElementById( m )) &&
-						contains( context, elem ) && elem.id === m ) {
-						results.push( elem );
-						return results;
-					}
-				}
-
-			// Speed-up: Sizzle("TAG")
-			} else if ( match[2] ) {
-				push.apply( results, context.getElementsByTagName( selector ) );
-				return results;
-
-			// Speed-up: Sizzle(".CLASS")
-			} else if ( (m = match[3]) && support.getElementsByClassName && context.getElementsByClassName ) {
-				push.apply( results, context.getElementsByClassName( m ) );
-				return results;
-			}
-		}
-
-		// QSA path
-		if ( support.qsa && (!rbuggyQSA || !rbuggyQSA.test( selector )) ) {
-			nid = old = expando;
-			newContext = context;
-			newSelector = nodeType === 9 && selector;
-
-			// qSA works strangely on Element-rooted queries
-			// We can work around this by specifying an extra ID on the root
-			// and working up from there (Thanks to Andrew Dupont for the technique)
-			// IE 8 doesn't work on object elements
-			if ( nodeType === 1 && context.nodeName.toLowerCase() !== "object" ) {
-				groups = tokenize( selector );
-
-				if ( (old = context.getAttribute("id")) ) {
-					nid = old.replace( rescape, "\\$&" );
-				} else {
-					context.setAttribute( "id", nid );
-				}
-				nid = "[id='" + nid + "'] ";
-
-				i = groups.length;
-				while ( i-- ) {
-					groups[i] = nid + toSelector( groups[i] );
-				}
-				newContext = rsibling.test( selector ) && testContext( context.parentNode ) || context;
-				newSelector = groups.join(",");
-			}
-
-			if ( newSelector ) {
-				try {
-					push.apply( results,
-						newContext.querySelectorAll( newSelector )
-					);
-					return results;
-				} catch(qsaError) {
-				} finally {
-					if ( !old ) {
-						context.removeAttribute("id");
-					}
-				}
-			}
-		}
-	}
-
-	// All others
-	return select( selector.replace( rtrim, "$1" ), context, results, seed );
-}
-
-/**
- * Create key-value caches of limited size
- * @returns {Function(string, Object)} Returns the Object data after storing it on itself with
- *	property name the (space-suffixed) string and (if the cache is larger than Expr.cacheLength)
- *	deleting the oldest entry
- */
-function createCache() {
-	var keys = [];
-
-	function cache( key, value ) {
-		// Use (key + " ") to avoid collision with native prototype properties (see Issue #157)
-		if ( keys.push( key + " " ) > Expr.cacheLength ) {
-			// Only keep the most recent entries
-			delete cache[ keys.shift() ];
-		}
-		return (cache[ key + " " ] = value);
-	}
-	return cache;
-}
-
-/**
- * Mark a function for special use by Sizzle
- * @param {Function} fn The function to mark
- */
-function markFunction( fn ) {
-	fn[ expando ] = true;
-	return fn;
-}
-
-/**
- * Support testing using an element
- * @param {Function} fn Passed the created div and expects a boolean result
- */
-function assert( fn ) {
-	var div = document.createElement("div");
-
-	try {
-		return !!fn( div );
-	} catch (e) {
-		return false;
-	} finally {
-		// Remove from its parent by default
-		if ( div.parentNode ) {
-			div.parentNode.removeChild( div );
-		}
-		// release memory in IE
-		div = null;
-	}
-}
-
-/**
- * Adds the same handler for all of the specified attrs
- * @param {String} attrs Pipe-separated list of attributes
- * @param {Function} handler The method that will be applied
- */
-function addHandle( attrs, handler ) {
-	var arr = attrs.split("|"),
-		i = attrs.length;
-
-	while ( i-- ) {
-		Expr.attrHandle[ arr[i] ] = handler;
-	}
-}
-
-/**
- * Checks document order of two siblings
- * @param {Element} a
- * @param {Element} b
- * @returns {Number} Returns less than 0 if a precedes b, greater than 0 if a follows b
- */
-function siblingCheck( a, b ) {
-	var cur = b && a,
-		diff = cur && a.nodeType === 1 && b.nodeType === 1 &&
-			( ~b.sourceIndex || MAX_NEGATIVE ) -
-			( ~a.sourceIndex || MAX_NEGATIVE );
-
-	// Use IE sourceIndex if available on both nodes
-	if ( diff ) {
-		return diff;
-	}
-
-	// Check if b follows a
-	if ( cur ) {
-		while ( (cur = cur.nextSibling) ) {
-			if ( cur === b ) {
-				return -1;
-			}
-		}
-	}
-
-	return a ? 1 : -1;
-}
-
-/**
- * Returns a function to use in pseudos for input types
- * @param {String} type
- */
-function createInputPseudo( type ) {
-	return function( elem ) {
-		var name = elem.nodeName.toLowerCase();
-		return name === "input" && elem.type === type;
-	};
-}
-
-/**
- * Returns a function to use in pseudos for buttons
- * @param {String} type
- */
-function createButtonPseudo( type ) {
-	return function( elem ) {
-		var name = elem.nodeName.toLowerCase();
-		return (name === "input" || name === "button") && elem.type === type;
-	};
-}
-
-/**
- * Returns a function to use in pseudos for positionals
- * @param {Function} fn
- */
-function createPositionalPseudo( fn ) {
-	return markFunction(function( argument ) {
-		argument = +argument;
-		return markFunction(function( seed, matches ) {
-			var j,
-				matchIndexes = fn( [], seed.length, argument ),
-				i = matchIndexes.length;
-
-			// Match elements found at the specified indexes
-			while ( i-- ) {
-				if ( seed[ (j = matchIndexes[i]) ] ) {
-					seed[j] = !(matches[j] = seed[j]);
-				}
-			}
-		});
-	});
-}
-
-/**
- * Checks a node for validity as a Sizzle context
- * @param {Element|Object=} context
- * @returns {Element|Object|Boolean} The input node if acceptable, otherwise a falsy value
- */
-function testContext( context ) {
-	return context && typeof context.getElementsByTagName !== strundefined && context;
-}
-
-// Expose support vars for convenience
-support = Sizzle.support = {};
-
-/**
- * Detects XML nodes
- * @param {Element|Object} elem An element or a document
- * @returns {Boolean} True iff elem is a non-HTML XML node
- */
-isXML = Sizzle.isXML = function( elem ) {
-	// documentElement is verified for cases where it doesn't yet exist
-	// (such as loading iframes in IE - #4833)
-	var documentElement = elem && (elem.ownerDocument || elem).documentElement;
-	return documentElement ? documentElement.nodeName !== "HTML" : false;
-};
-
-/**
- * Sets document-related variables once based on the current document
- * @param {Element|Object} [doc] An element or document object to use to set the document
- * @returns {Object} Returns the current document
- */
-setDocument = Sizzle.setDocument = function( node ) {
-	var hasCompare,
-		doc = node ? node.ownerDocument || node : preferredDoc,
-		parent = doc.defaultView;
-
-	// If no document and documentElement is available, return
-	if ( doc === document || doc.nodeType !== 9 || !doc.documentElement ) {
-		return document;
-	}
-
-	// Set our document
-	document = doc;
-	docElem = doc.documentElement;
-
-	// Support tests
-	documentIsHTML = !isXML( doc );
-
-	// Support: IE>8
-	// If iframe document is assigned to "document" variable and if iframe has been reloaded,
-	// IE will throw "permission denied" error when accessing "document" variable, see jQuery #13936
-	// IE6-8 do not support the defaultView property so parent will be undefined
-	if ( parent && parent !== parent.top ) {
-		// IE11 does not have attachEvent, so all must suffer
-		if ( parent.addEventListener ) {
-			parent.addEventListener( "unload", function() {
-				setDocument();
-			}, false );
-		} else if ( parent.attachEvent ) {
-			parent.attachEvent( "onunload", function() {
-				setDocument();
-			});
-		}
-	}
-
-	/* Attributes
-	---------------------------------------------------------------------- */
-
-	// Support: IE<8
-	// Verify that getAttribute really returns attributes and not properties (excepting IE8 booleans)
-	support.attributes = assert(function( div ) {
-		div.className = "i";
-		return !div.getAttribute("className");
-	});
-
-	/* getElement(s)By*
-	---------------------------------------------------------------------- */
-
-	// Check if getElementsByTagName("*") returns only elements
-	support.getElementsByTagName = assert(function( div ) {
-		div.appendChild( doc.createComment("") );
-		return !div.getElementsByTagName("*").length;
-	});
-
-	// Check if getElementsByClassName can be trusted
-	support.getElementsByClassName = rnative.test( doc.getElementsByClassName ) && assert(function( div ) {
-		div.innerHTML = "<div class='a'></div><div class='a i'></div>";
-
-		// Support: Safari<4
-		// Catch class over-caching
-		div.firstChild.className = "i";
-		// Support: Opera<10
-		// Catch gEBCN failure to find non-leading classes
-		return div.getElementsByClassName("i").length === 2;
-	});
-
-	// Support: IE<10
-	// Check if getElementById returns elements by name
-	// The broken getElementById methods don't pick up programatically-set names,
-	// so use a roundabout getElementsByName test
-	support.getById = assert(function( div ) {
-		docElem.appendChild( div ).id = expando;
-		return !doc.getElementsByName || !doc.getElementsByName( expando ).length;
-	});
-
-	// ID find and filter
-	if ( support.getById ) {
-		Expr.find["ID"] = function( id, context ) {
-			if ( typeof context.getElementById !== strundefined && documentIsHTML ) {
-				var m = context.getElementById( id );
-				// Check parentNode to catch when Blackberry 4.6 returns
-				// nodes that are no longer in the document #6963
-				return m && m.parentNode ? [ m ] : [];
-			}
-		};
-		Expr.filter["ID"] = function( id ) {
-			var attrId = id.replace( runescape, funescape );
-			return function( elem ) {
-				return elem.getAttribute("id") === attrId;
-			};
-		};
-	} else {
-		// Support: IE6/7
-		// getElementById is not reliable as a find shortcut
-		delete Expr.find["ID"];
-
-		Expr.filter["ID"] =  function( id ) {
-			var attrId = id.replace( runescape, funescape );
-			return function( elem ) {
-				var node = typeof elem.getAttributeNode !== strundefined && elem.getAttributeNode("id");
-				return node && node.value === attrId;
-			};
-		};
-	}
-
-	// Tag
-	Expr.find["TAG"] = support.getElementsByTagName ?
-		function( tag, context ) {
-			if ( typeof context.getElementsByTagName !== strundefined ) {
-				return context.getElementsByTagName( tag );
-			}
-		} :
-		function( tag, context ) {
-			var elem,
-				tmp = [],
-				i = 0,
-				results = context.getElementsByTagName( tag );
-
-			// Filter out possible comments
-			if ( tag === "*" ) {
-				while ( (elem = results[i++]) ) {
-					if ( elem.nodeType === 1 ) {
-						tmp.push( elem );
-					}
-				}
-
-				return tmp;
-			}
-			return results;
-		};
-
-	// Class
-	Expr.find["CLASS"] = support.getElementsByClassName && function( className, context ) {
-		if ( typeof context.getElementsByClassName !== strundefined && documentIsHTML ) {
-			return context.getElementsByClassName( className );
-		}
-	};
-
-	/* QSA/matchesSelector
-	---------------------------------------------------------------------- */
-
-	// QSA and matchesSelector support
-
-	// matchesSelector(:active) reports false when true (IE9/Opera 11.5)
-	rbuggyMatches = [];
-
-	// qSa(:focus) reports false when true (Chrome 21)
-	// We allow this because of a bug in IE8/9 that throws an error
-	// whenever `document.activeElement` is accessed on an iframe
-	// So, we allow :focus to pass through QSA all the time to avoid the IE error
-	// See http://bugs.jquery.com/ticket/13378
-	rbuggyQSA = [];
-
-	if ( (support.qsa = rnative.test( doc.querySelectorAll )) ) {
-		// Build QSA regex
-		// Regex strategy adopted from Diego Perini
-		assert(function( div ) {
-			// Select is set to empty string on purpose
-			// This is to test IE's treatment of not explicitly
-			// setting a boolean content attribute,
-			// since its presence should be enough
-			// http://bugs.jquery.com/ticket/12359
-			div.innerHTML = "<select msallowclip=''><option selected=''></option></select>";
-
-			// Support: IE8, Opera 11-12.16
-			// Nothing should be selected when empty strings follow ^= or $= or *=
-			// The test attribute must be unknown in Opera but "safe" for WinRT
-			// http://msdn.microsoft.com/en-us/library/ie/hh465388.aspx#attribute_section
-			if ( div.querySelectorAll("[msallowclip^='']").length ) {
-				rbuggyQSA.push( "[*^$]=" + whitespace + "*(?:''|\"\")" );
-			}
-
-			// Support: IE8
-			// Boolean attributes and "value" are not treated correctly
-			if ( !div.querySelectorAll("[selected]").length ) {
-				rbuggyQSA.push( "\\[" + whitespace + "*(?:value|" + booleans + ")" );
-			}
-
-			// Webkit/Opera - :checked should return selected option elements
-			// http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked
-			// IE8 throws error here and will not see later tests
-			if ( !div.querySelectorAll(":checked").length ) {
-				rbuggyQSA.push(":checked");
-			}
-		});
-
-		assert(function( div ) {
-			// Support: Windows 8 Native Apps
-			// The type and name attributes are restricted during .innerHTML assignment
-			var input = doc.createElement("input");
-			input.setAttribute( "type", "hidden" );
-			div.appendChild( input ).setAttribute( "name", "D" );
-
-			// Support: IE8
-			// Enforce case-sensitivity of name attribute
-			if ( div.querySelectorAll("[name=d]").length ) {
-				rbuggyQSA.push( "name" + whitespace + "*[*^$|!~]?=" );
-			}
-
-			// FF 3.5 - :enabled/:disabled and hidden elements (hidden elements are still enabled)
-			// IE8 throws error here and will not see later tests
-			if ( !div.querySelectorAll(":enabled").length ) {
-				rbuggyQSA.push( ":enabled", ":disabled" );
-			}
-
-			// Opera 10-11 does not throw on post-comma invalid pseudos
-			div.querySelectorAll("*,:x");
-			rbuggyQSA.push(",.*:");
-		});
-	}
-
-	if ( (support.matchesSelector = rnative.test( (matches = docElem.matches ||
-		docElem.webkitMatchesSelector ||
-		docElem.mozMatchesSelector ||
-		docElem.oMatchesSelector ||
-		docElem.msMatchesSelector) )) ) {
-
-		assert(function( div ) {
-			// Check to see if it's possible to do matchesSelector
-			// on a disconnected node (IE 9)
-			support.disconnectedMatch = matches.call( div, "div" );
-
-			// This should fail with an exception
-			// Gecko does not error, returns false instead
-			matches.call( div, "[s!='']:x" );
-			rbuggyMatches.push( "!=", pseudos );
-		});
-	}
-
-	rbuggyQSA = rbuggyQSA.length && new RegExp( rbuggyQSA.join("|") );
-	rbuggyMatches = rbuggyMatches.length && new RegExp( rbuggyMatches.join("|") );
-
-	/* Contains
-	---------------------------------------------------------------------- */
-	hasCompare = rnative.test( docElem.compareDocumentPosition );
-
-	// Element contains another
-	// Purposefully does not implement inclusive descendent
-	// As in, an element does not contain itself
-	contains = hasCompare || rnative.test( docElem.contains ) ?
-		function( a, b ) {
-			var adown = a.nodeType === 9 ? a.documentElement : a,
-				bup = b && b.parentNode;
-			return a === bup || !!( bup && bup.nodeType === 1 && (
-				adown.contains ?
-					adown.contains( bup ) :
-					a.compareDocumentPosition && a.compareDocumentPosition( bup ) & 16
-			));
-		} :
-		function( a, b ) {
-			if ( b ) {
-				while ( (b = b.parentNode) ) {
-					if ( b === a ) {
-						return true;
-					}
-				}
-			}
-			return false;
-		};
-
-	/* Sorting
-	---------------------------------------------------------------------- */
-
-	// Document order sorting
-	sortOrder = hasCompare ?
-	function( a, b ) {
-
-		// Flag for duplicate removal
-		if ( a === b ) {
-			hasDuplicate = true;
-			return 0;
-		}
-
-		// Sort on method existence if only one input has compareDocumentPosition
-		var compare = !a.compareDocumentPosition - !b.compareDocumentPosition;
-		if ( compare ) {
-			return compare;
-		}
-
-		// Calculate position if both inputs belong to the same document
-		compare = ( a.ownerDocument || a ) === ( b.ownerDocument || b ) ?
-			a.compareDocumentPosition( b ) :
-
-			// Otherwise we know they are disconnected
-			1;
-
-		// Disconnected nodes
-		if ( compare & 1 ||
-			(!support.sortDetached && b.compareDocumentPosition( a ) === compare) ) {
-
-			// Choose the first element that is related to our preferred document
-			if ( a === doc || a.ownerDocument === preferredDoc && contains(preferredDoc, a) ) {
-				return -1;
-			}
-			if ( b === doc || b.ownerDocument === preferredDoc && contains(preferredDoc, b) ) {
-				return 1;
-			}
-
-			// Maintain original order
-			return sortInput ?
-				( indexOf.call( sortInput, a ) - indexOf.call( sortInput, b ) ) :
-				0;
-		}
-
-		return compare & 4 ? -1 : 1;
-	} :
-	function( a, b ) {
-		// Exit early if the nodes are identical
-		if ( a === b ) {
-			hasDuplicate = true;
-			return 0;
-		}
-
-		var cur,
-			i = 0,
-			aup = a.parentNode,
-			bup = b.parentNode,
-			ap = [ a ],
-			bp = [ b ];
-
-		// Parentless nodes are either documents or disconnected
-		if ( !aup || !bup ) {
-			return a === doc ? -1 :
-				b === doc ? 1 :
-				aup ? -1 :
-				bup ? 1 :
-				sortInput ?
-				( indexOf.call( sortInput, a ) - indexOf.call( sortInput, b ) ) :
-				0;
-
-		// If the nodes are siblings, we can do a quick check
-		} else if ( aup === bup ) {
-			return siblingCheck( a, b );
-		}
-
-		// Otherwise we need full lists of their ancestors for comparison
-		cur = a;
-		while ( (cur = cur.parentNode) ) {
-			ap.unshift( cur );
-		}
-		cur = b;
-		while ( (cur = cur.parentNode) ) {
-			bp.unshift( cur );
-		}
-
-		// Walk down the tree looking for a discrepancy
-		while ( ap[i] === bp[i] ) {
-			i++;
-		}
-
-		return i ?
-			// Do a sibling check if the nodes have a common ancestor
-			siblingCheck( ap[i], bp[i] ) :
-
-			// Otherwise nodes in our document sort first
-			ap[i] === preferredDoc ? -1 :
-			bp[i] === preferredDoc ? 1 :
-			0;
-	};
-
-	return doc;
-};
-
-Sizzle.matches = function( expr, elements ) {
-	return Sizzle( expr, null, null, elements );
-};
-
-Sizzle.matchesSelector = function( elem, expr ) {
-	// Set document vars if needed
-	if ( ( elem.ownerDocument || elem ) !== document ) {
-		setDocument( elem );
-	}
-
-	// Make sure that attribute selectors are quoted
-	expr = expr.replace( rattributeQuotes, "='$1']" );
-
-	if ( support.matchesSelector && documentIsHTML &&
-		( !rbuggyMatches || !rbuggyMatches.test( expr ) ) &&
-		( !rbuggyQSA     || !rbuggyQSA.test( expr ) ) ) {
-
-		try {
-			var ret = matches.call( elem, expr );
-
-			// IE 9's matchesSelector returns false on disconnected nodes
-			if ( ret || support.disconnectedMatch ||
-					// As well, disconnected nodes are said to be in a document
-					// fragment in IE 9
-					elem.document && elem.document.nodeType !== 11 ) {
-				return ret;
-			}
-		} catch(e) {}
-	}
-
-	return Sizzle( expr, document, null, [ elem ] ).length > 0;
-};
-
-Sizzle.contains = function( context, elem ) {
-	// Set document vars if needed
-	if ( ( context.ownerDocument || context ) !== document ) {
-		setDocument( context );
-	}
-	return contains( context, elem );
-};
-
-Sizzle.attr = function( elem, name ) {
-	// Set document vars if needed
-	if ( ( elem.ownerDocument || elem ) !== document ) {
-		setDocument( elem );
-	}
-
-	var fn = Expr.attrHandle[ name.toLowerCase() ],
-		// Don't get fooled by Object.prototype properties (jQuery #13807)
-		val = fn && hasOwn.call( Expr.attrHandle, name.toLowerCase() ) ?
-			fn( elem, name, !documentIsHTML ) :
-			undefined;
-
-	return val !== undefined ?
-		val :
-		support.attributes || !documentIsHTML ?
-			elem.getAttribute( name ) :
-			(val = elem.getAttributeNode(name)) && val.specified ?
-				val.value :
-				null;
-};
-
-Sizzle.error = function( msg ) {
-	throw new Error( "Syntax error, unrecognized expression: " + msg );
-};
-
-/**
- * Document sorting and removing duplicates
- * @param {ArrayLike} results
- */
-Sizzle.uniqueSort = function( results ) {
-	var elem,
-		duplicates = [],
-		j = 0,
-		i = 0;
-
-	// Unless we *know* we can detect duplicates, assume their presence
-	hasDuplicate = !support.detectDuplicates;
-	sortInput = !support.sortStable && results.slice( 0 );
-	results.sort( sortOrder );
-
-	if ( hasDuplicate ) {
-		while ( (elem = results[i++]) ) {
-			if ( elem === results[ i ] ) {
-				j = duplicates.push( i );
-			}
-		}
-		while ( j-- ) {
-			results.splice( duplicates[ j ], 1 );
-		}
-	}
-
-	// Clear input after sorting to release objects
-	// See https://github.com/jquery/sizzle/pull/225
-	sortInput = null;
-
-	return results;
-};
-
-/**
- * Utility function for retrieving the text value of an array of DOM nodes
- * @param {Array|Element} elem
- */
-getText = Sizzle.getText = function( elem ) {
-	var node,
-		ret = "",
-		i = 0,
-		nodeType = elem.nodeType;
-
-	if ( !nodeType ) {
-		// If no nodeType, this is expected to be an array
-		while ( (node = elem[i++]) ) {
-			// Do not traverse comment nodes
-			ret += getText( node );
-		}
-	} else if ( nodeType === 1 || nodeType === 9 || nodeType === 11 ) {
-		// Use textContent for elements
-		// innerText usage removed for consistency of new lines (jQuery #11153)
-		if ( typeof elem.textContent === "string" ) {
-			return elem.textContent;
-		} else {
-			// Traverse its children
-			for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) {
-				ret += getText( elem );
-			}
-		}
-	} else if ( nodeType === 3 || nodeType === 4 ) {
-		return elem.nodeValue;
-	}
-	// Do not include comment or processing instruction nodes
-
-	return ret;
-};
-
-Expr = Sizzle.selectors = {
-
-	// Can be adjusted by the user
-	cacheLength: 50,
-
-	createPseudo: markFunction,
-
-	match: matchExpr,
-
-	attrHandle: {},
-
-	find: {},
-
-	relative: {
-		">": { dir: "parentNode", first: true },
-		" ": { dir: "parentNode" },
-		"+": { dir: "previousSibling", first: true },
-		"~": { dir: "previousSibling" }
-	},
-
-	preFilter: {
-		"ATTR": function( match ) {
-			match[1] = match[1].replace( runescape, funescape );
-
-			// Move the given value to match[3] whether quoted or unquoted
-			match[3] = ( match[3] || match[4] || match[5] || "" ).replace( runescape, funescape );
-
-			if ( match[2] === "~=" ) {
-				match[3] = " " + match[3] + " ";
-			}
-
-			return match.slice( 0, 4 );
-		},
-
-		"CHILD": function( match ) {
-			/* matches from matchExpr["CHILD"]
-				1 type (only|nth|...)
-				2 what (child|of-type)
-				3 argument (even|odd|\d*|\d*n([+-]\d+)?|...)
-				4 xn-component of xn+y argument ([+-]?\d*n|)
-				5 sign of xn-component
-				6 x of xn-component
-				7 sign of y-component
-				8 y of y-component
-			*/
-			match[1] = match[1].toLowerCase();
-
-			if ( match[1].slice( 0, 3 ) === "nth" ) {
-				// nth-* requires argument
-				if ( !match[3] ) {
-					Sizzle.error( match[0] );
-				}
-
-				// numeric x and y parameters for Expr.filter.CHILD
-				// remember that false/true cast respectively to 0/1
-				match[4] = +( match[4] ? match[5] + (match[6] || 1) : 2 * ( match[3] === "even" || match[3] === "odd" ) );
-				match[5] = +( ( match[7] + match[8] ) || match[3] === "odd" );
-
-			// other types prohibit arguments
-			} else if ( match[3] ) {
-				Sizzle.error( match[0] );
-			}
-
-			return match;
-		},
-
-		"PSEUDO": function( match ) {
-			var excess,
-				unquoted = !match[6] && match[2];
-
-			if ( matchExpr["CHILD"].test( match[0] ) ) {
-				return null;
-			}
-
-			// Accept quoted arguments as-is
-			if ( match[3] ) {
-				match[2] = match[4] || match[5] || "";
-
-			// Strip excess characters from unquoted arguments
-			} else if ( unquoted && rpseudo.test( unquoted ) &&
-				// Get excess from tokenize (recursively)
-				(excess = tokenize( unquoted, true )) &&
-				// advance to the next closing parenthesis
-				(excess = unquoted.indexOf( ")", unquoted.length - excess ) - unquoted.length) ) {
-
-				// excess is a negative index
-				match[0] = match[0].slice( 0, excess );
-				match[2] = unquoted.slice( 0, excess );
-			}
-
-			// Return only captures needed by the pseudo filter method (type and argument)
-			return match.slice( 0, 3 );
-		}
-	},
-
-	filter: {
-
-		"TAG": function( nodeNameSelector ) {
-			var nodeName = nodeNameSelector.replace( runescape, funescape ).toLowerCase();
-			return nodeNameSelector === "*" ?
-				function() { return true; } :
-				function( elem ) {
-					return elem.nodeName && elem.nodeName.toLowerCase() === nodeName;
-				};
-		},
-
-		"CLASS": function( className ) {
-			var pattern = classCache[ className + " " ];
-
-			return pattern ||
-				(pattern = new RegExp( "(^|" + whitespace + ")" + className + "(" + whitespace + "|$)" )) &&
-				classCache( className, function( elem ) {
-					return pattern.test( typeof elem.className === "string" && elem.className || typeof elem.getAttribute !== strundefined && elem.getAttribute("class") || "" );
-				});
-		},
-
-		"ATTR": function( name, operator, check ) {
-			return function( elem ) {
-				var result = Sizzle.attr( elem, name );
-
-				if ( result == null ) {
-					return operator === "!=";
-				}
-				if ( !operator ) {
-					return true;
-				}
-
-				result += "";
-
-				return operator === "=" ? result === check :
-					operator === "!=" ? result !== check :
-					operator === "^=" ? check && result.indexOf( check ) === 0 :
-					operator === "*=" ? check && result.indexOf( check ) > -1 :
-					operator === "$=" ? check && result.slice( -check.length ) === check :
-					operator === "~=" ? ( " " + result + " " ).indexOf( check ) > -1 :
-					operator === "|=" ? result === check || result.slice( 0, check.length + 1 ) === check + "-" :
-					false;
-			};
-		},
-
-		"CHILD": function( type, what, argument, first, last ) {
-			var simple = type.slice( 0, 3 ) !== "nth",
-				forward = type.slice( -4 ) !== "last",
-				ofType = what === "of-type";
-
-			return first === 1 && last === 0 ?
-
-				// Shortcut for :nth-*(n)
-				function( elem ) {
-					return !!elem.parentNode;
-				} :
-
-				function( elem, context, xml ) {
-					var cache, outerCache, node, diff, nodeIndex, start,
-						dir = simple !== forward ? "nextSibling" : "previousSibling",
-						parent = elem.parentNode,
-						name = ofType && elem.nodeName.toLowerCase(),
-						useCache = !xml && !ofType;
-
-					if ( parent ) {
-
-						// :(first|last|only)-(child|of-type)
-						if ( simple ) {
-							while ( dir ) {
-								node = elem;
-								while ( (node = node[ dir ]) ) {
-									if ( ofType ? node.nodeName.toLowerCase() === name : node.nodeType === 1 ) {
-										return false;
-									}
-								}
-								// Reverse direction for :only-* (if we haven't yet done so)
-								start = dir = type === "only" && !start && "nextSibling";
-							}
-							return true;
-						}
-
-						start = [ forward ? parent.firstChild : parent.lastChild ];
-
-						// non-xml :nth-child(...) stores cache data on `parent`
-						if ( forward && useCache ) {
-							// Seek `elem` from a previously-cached index
-							outerCache = parent[ expando ] || (parent[ expando ] = {});
-							cache = outerCache[ type ] || [];
-							nodeIndex = cache[0] === dirruns && cache[1];
-							diff = cache[0] === dirruns && cache[2];
-							node = nodeIndex && parent.childNodes[ nodeIndex ];
-
-							while ( (node = ++nodeIndex && node && node[ dir ] ||
-
-								// Fallback to seeking `elem` from the start
-								(diff = nodeIndex = 0) || start.pop()) ) {
-
-								// When found, cache indexes on `parent` and break
-								if ( node.nodeType === 1 && ++diff && node === elem ) {
-									outerCache[ type ] = [ dirruns, nodeIndex, diff ];
-									break;
-								}
-							}
-
-						// Use previously-cached element index if available
-						} else if ( useCache && (cache = (elem[ expando ] || (elem[ expando ] = {}))[ type ]) && cache[0] === dirruns ) {
-							diff = cache[1];
-
-						// xml :nth-child(...) or :nth-last-child(...) or :nth(-last)?-of-type(...)
-						} else {
-							// Use the same loop as above to seek `elem` from the start
-							while ( (node = ++nodeIndex && node && node[ dir ] ||
-								(diff = nodeIndex = 0) || start.pop()) ) {
-
-								if ( ( ofType ? node.nodeName.toLowerCase() === name : node.nodeType === 1 ) && ++diff ) {
-									// Cache the index of each encountered element
-									if ( useCache ) {
-										(node[ expando ] || (node[ expando ] = {}))[ type ] = [ dirruns, diff ];
-									}
-
-									if ( node === elem ) {
-										break;
-									}
-								}
-							}
-						}
-
-						// Incorporate the offset, then check against cycle size
-						diff -= last;
-						return diff === first || ( diff % first === 0 && diff / first >= 0 );
-					}
-				};
-		},
-
-		"PSEUDO": function( pseudo, argument ) {
-			// pseudo-class names are case-insensitive
-			// http://www.w3.org/TR/selectors/#pseudo-classes
-			// Prioritize by case sensitivity in case custom pseudos are added with uppercase letters
-			// Remember that setFilters inherits from pseudos
-			var args,
-				fn = Expr.pseudos[ pseudo ] || Expr.setFilters[ pseudo.toLowerCase() ] ||
-					Sizzle.error( "unsupported pseudo: " + pseudo );
-
-			// The user may use createPseudo to indicate that
-			// arguments are needed to create the filter function
-			// just as Sizzle does
-			if ( fn[ expando ] ) {
-				return fn( argument );
-			}
-
-			// But maintain support for old signatures
-			if ( fn.length > 1 ) {
-				args = [ pseudo, pseudo, "", argument ];
-				return Expr.setFilters.hasOwnProperty( pseudo.toLowerCase() ) ?
-					markFunction(function( seed, matches ) {
-						var idx,
-							matched = fn( seed, argument ),
-							i = matched.length;
-						while ( i-- ) {
-							idx = indexOf.call( seed, matched[i] );
-							seed[ idx ] = !( matches[ idx ] = matched[i] );
-						}
-					}) :
-					function( elem ) {
-						return fn( elem, 0, args );
-					};
-			}
-
-			return fn;
-		}
-	},
-
-	pseudos: {
-		// Potentially complex pseudos
-		"not": markFunction(function( selector ) {
-			// Trim the selector passed to compile
-			// to avoid treating leading and trailing
-			// spaces as combinators
-			var input = [],
-				results = [],
-				matcher = compile( selector.replace( rtrim, "$1" ) );
-
-			return matcher[ expando ] ?
-				markFunction(function( seed, matches, context, xml ) {
-					var elem,
-						unmatched = matcher( seed, null, xml, [] ),
-						i = seed.length;
-
-					// Match elements unmatched by `matcher`
-					while ( i-- ) {
-						if ( (elem = unmatched[i]) ) {
-							seed[i] = !(matches[i] = elem);
-						}
-					}
-				}) :
-				function( elem, context, xml ) {
-					input[0] = elem;
-					matcher( input, null, xml, results );
-					return !results.pop();
-				};
-		}),
-
-		"has": markFunction(function( selector ) {
-			return function( elem ) {
-				return Sizzle( selector, elem ).length > 0;
-			};
-		}),
-
-		"contains": markFunction(function( text ) {
-			return function( elem ) {
-				return ( elem.textContent || elem.innerText || getText( elem ) ).indexOf( text ) > -1;
-			};
-		}),
-
-		// "Whether an element is represented by a :lang() selector
-		// is based solely on the element's language value
-		// being equal to the identifier C,
-		// or beginning with the identifier C immediately followed by "-".
-		// The matching of C against the element's language value is performed case-insensitively.
-		// The identifier C does not have to be a valid language name."
-		// http://www.w3.org/TR/selectors/#lang-pseudo
-		"lang": markFunction( function( lang ) {
-			// lang value must be a valid identifier
-			if ( !ridentifier.test(lang || "") ) {
-				Sizzle.error( "unsupported lang: " + lang );
-			}
-			lang = lang.replace( runescape, funescape ).toLowerCase();
-			return function( elem ) {
-				var elemLang;
-				do {
-					if ( (elemLang = documentIsHTML ?
-						elem.lang :
-						elem.getAttribute("xml:lang") || elem.getAttribute("lang")) ) {
-
-						elemLang = elemLang.toLowerCase();
-						return elemLang === lang || elemLang.indexOf( lang + "-" ) === 0;
-					}
-				} while ( (elem = elem.parentNode) && elem.nodeType === 1 );
-				return false;
-			};
-		}),
-
-		// Miscellaneous
-		"target": function( elem ) {
-			var hash = window.location && window.location.hash;
-			return hash && hash.slice( 1 ) === elem.id;
-		},
-
-		"root": function( elem ) {
-			return elem === docElem;
-		},
-
-		"focus": function( elem ) {
-			return elem === document.activeElement && (!document.hasFocus || document.hasFocus()) && !!(elem.type || elem.href || ~elem.tabIndex);
-		},
-
-		// Boolean properties
-		"enabled": function( elem ) {
-			return elem.disabled === false;
-		},
-
-		"disabled": function( elem ) {
-			return elem.disabled === true;
-		},
-
-		"checked": function( elem ) {
-			// In CSS3, :checked should return both checked and selected elements
-			// http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked
-			var nodeName = elem.nodeName.toLowerCase();
-			return (nodeName === "input" && !!elem.checked) || (nodeName === "option" && !!elem.selected);
-		},
-
-		"selected": function( elem ) {
-			// Accessing this property makes selected-by-default
-			// options in Safari work properly
-			if ( elem.parentNode ) {
-				elem.parentNode.selectedIndex;
-			}
-
-			return elem.selected === true;
-		},
-
-		// Contents
-		"empty": function( elem ) {
-			// http://www.w3.org/TR/selectors/#empty-pseudo
-			// :empty is negated by element (1) or content nodes (text: 3; cdata: 4; entity ref: 5),
-			//   but not by others (comment: 8; processing instruction: 7; etc.)
-			// nodeType < 6 works because attributes (2) do not appear as children
-			for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) {
-				if ( elem.nodeType < 6 ) {
-					return false;
-				}
-			}
-			return true;
-		},
-
-		"parent": function( elem ) {
-			return !Expr.pseudos["empty"]( elem );
-		},
-
-		// Element/input types
-		"header": function( elem ) {
-			return rheader.test( elem.nodeName );
-		},
-
-		"input": function( elem ) {
-			return rinputs.test( elem.nodeName );
-		},
-
-		"button": function( elem ) {
-			var name = elem.nodeName.toLowerCase();
-			return name === "input" && elem.type === "button" || name === "button";
-		},
-
-		"text": function( elem ) {
-			var attr;
-			return elem.nodeName.toLowerCase() === "input" &&
-				elem.type === "text" &&
-
-				// Support: IE<8
-				// New HTML5 attribute values (e.g., "search") appear with elem.type === "text"
-				( (attr = elem.getAttribute("type")) == null || attr.toLowerCase() === "text" );
-		},
-
-		// Position-in-collection
-		"first": createPositionalPseudo(function() {
-			return [ 0 ];
-		}),
-
-		"last": createPositionalPseudo(function( matchIndexes, length ) {
-			return [ length - 1 ];
-		}),
-
-		"eq": createPositionalPseudo(function( matchIndexes, length, argument ) {
-			return [ argument < 0 ? argument + length : argument ];
-		}),
-
-		"even": createPositionalPseudo(function( matchIndexes, length ) {
-			var i = 0;
-			for ( ; i < length; i += 2 ) {
-				matchIndexes.push( i );
-			}
-			return matchIndexes;
-		}),
-
-		"odd": createPositionalPseudo(function( matchIndexes, length ) {
-			var i = 1;
-			for ( ; i < length; i += 2 ) {
-				matchIndexes.push( i );
-			}
-			return matchIndexes;
-		}),
-
-		"lt": createPositionalPseudo(function( matchIndexes, length, argument ) {
-			var i = argument < 0 ? argument + length : argument;
-			for ( ; --i >= 0; ) {
-				matchIndexes.push( i );
-			}
-			return matchIndexes;
-		}),
-
-		"gt": createPositionalPseudo(function( matchIndexes, length, argument ) {
-			var i = argument < 0 ? argument + length : argument;
-			for ( ; ++i < length; ) {
-				matchIndexes.push( i );
-			}
-			return matchIndexes;
-		})
-	}
-};
-
-Expr.pseudos["nth"] = Expr.pseudos["eq"];
-
-// Add button/input type pseudos
-for ( i in { radio: true, checkbox: true, file: true, password: true, image: true } ) {
-	Expr.pseudos[ i ] = createInputPseudo( i );
-}
-for ( i in { submit: true, reset: true } ) {
-	Expr.pseudos[ i ] = createButtonPseudo( i );
-}
-
-// Easy API for creating new setFilters
-function setFilters() {}
-setFilters.prototype = Expr.filters = Expr.pseudos;
-Expr.setFilters = new setFilters();
-
-tokenize = Sizzle.tokenize = function( selector, parseOnly ) {
-	var matched, match, tokens, type,
-		soFar, groups, preFilters,
-		cached = tokenCache[ selector + " " ];
-
-	if ( cached ) {
-		return parseOnly ? 0 : cached.slice( 0 );
-	}
-
-	soFar = selector;
-	groups = [];
-	preFilters = Expr.preFilter;
-
-	while ( soFar ) {
-
-		// Comma and first run
-		if ( !matched || (match = rcomma.exec( soFar )) ) {
-			if ( match ) {
-				// Don't consume trailing commas as valid
-				soFar = soFar.slice( match[0].length ) || soFar;
-			}
-			groups.push( (tokens = []) );
-		}
-
-		matched = false;
-
-		// Combinators
-		if ( (match = rcombinators.exec( soFar )) ) {
-			matched = match.shift();
-			tokens.push({
-				value: matched,
-				// Cast descendant combinators to space
-				type: match[0].replace( rtrim, " " )
-			});
-			soFar = soFar.slice( matched.length );
-		}
-
-		// Filters
-		for ( type in Expr.filter ) {
-			if ( (match = matchExpr[ type ].exec( soFar )) && (!preFilters[ type ] ||
-				(match = preFilters[ type ]( match ))) ) {
-				matched = match.shift();
-				tokens.push({
-					value: matched,
-					type: type,
-					matches: match
-				});
-				soFar = soFar.slice( matched.length );
-			}
-		}
-
-		if ( !matched ) {
-			break;
-		}
-	}
-
-	// Return the length of the invalid excess
-	// if we're just parsing
-	// Otherwise, throw an error or return tokens
-	return parseOnly ?
-		soFar.length :
-		soFar ?
-			Sizzle.error( selector ) :
-			// Cache the tokens
-			tokenCache( selector, groups ).slice( 0 );
-};
-
-function toSelector( tokens ) {
-	var i = 0,
-		len = tokens.length,
-		selector = "";
-	for ( ; i < len; i++ ) {
-		selector += tokens[i].value;
-	}
-	return selector;
-}
-
-function addCombinator( matcher, combinator, base ) {
-	var dir = combinator.dir,
-		checkNonElements = base && dir === "parentNode",
-		doneName = done++;
-
-	return combinator.first ?
-		// Check against closest ancestor/preceding element
-		function( elem, context, xml ) {
-			while ( (elem = elem[ dir ]) ) {
-				if ( elem.nodeType === 1 || checkNonElements ) {
-					return matcher( elem, context, xml );
-				}
-			}
-		} :
-
-		// Check against all ancestor/preceding elements
-		function( elem, context, xml ) {
-			var oldCache, outerCache,
-				newCache = [ dirruns, doneName ];
-
-			// We can't set arbitrary data on XML nodes, so they don't benefit from dir caching
-			if ( xml ) {
-				while ( (elem = elem[ dir ]) ) {
-					if ( elem.nodeType === 1 || checkNonElements ) {
-						if ( matcher( elem, context, xml ) ) {
-							return true;
-						}
-					}
-				}
-			} else {
-				while ( (elem = elem[ dir ]) ) {
-					if ( elem.nodeType === 1 || checkNonElements ) {
-						outerCache = elem[ expando ] || (elem[ expando ] = {});
-						if ( (oldCache = outerCache[ dir ]) &&
-							oldCache[ 0 ] === dirruns && oldCache[ 1 ] === doneName ) {
-
-							// Assign to newCache so results back-propagate to previous elements
-							return (newCache[ 2 ] = oldCache[ 2 ]);
-						} else {
-							// Reuse newcache so results back-propagate to previous elements
-							outerCache[ dir ] = newCache;
-
-							// A match means we're done; a fail means we have to keep checking
-							if ( (newCache[ 2 ] = matcher( elem, context, xml )) ) {
-								return true;
-							}
-						}
-					}
-				}
-			}
-		};
-}
-
-function elementMatcher( matchers ) {
-	return matchers.length > 1 ?
-		function( elem, context, xml ) {
-			var i = matchers.length;
-			while ( i-- ) {
-				if ( !matchers[i]( elem, context, xml ) ) {
-					return false;
-				}
-			}
-			return true;
-		} :
-		matchers[0];
-}
-
-function multipleContexts( selector, contexts, results ) {
-	var i = 0,
-		len = contexts.length;
-	for ( ; i < len; i++ ) {
-		Sizzle( selector, contexts[i], results );
-	}
-	return results;
-}
-
-function condense( unmatched, map, filter, context, xml ) {
-	var elem,
-		newUnmatched = [],
-		i = 0,
-		len = unmatched.length,
-		mapped = map != null;
-
-	for ( ; i < len; i++ ) {
-		if ( (elem = unmatched[i]) ) {
-			if ( !filter || filter( elem, context, xml ) ) {
-				newUnmatched.push( elem );
-				if ( mapped ) {
-					map.push( i );
-				}
-			}
-		}
-	}
-
-	return newUnmatched;
-}
-
-function setMatcher( preFilter, selector, matcher, postFilter, postFinder, postSelector ) {
-	if ( postFilter && !postFilter[ expando ] ) {
-		postFilter = setMatcher( postFilter );
-	}
-	if ( postFinder && !postFinder[ expando ] ) {
-		postFinder = setMatcher( postFinder, postSelector );
-	}
-	return markFunction(function( seed, results, context, xml ) {
-		var temp, i, elem,
-			preMap = [],
-			postMap = [],
-			preexisting = results.length,
-
-			// Get initial elements from seed or context
-			elems = seed || multipleContexts( selector || "*", context.nodeType ? [ context ] : context, [] ),
-
-			// Prefilter to get matcher input, preserving a map for seed-results synchronization
-			matcherIn = preFilter && ( seed || !selector ) ?
-				condense( elems, preMap, preFilter, context, xml ) :
-				elems,
-
-			matcherOut = matcher ?
-				// If we have a postFinder, or filtered seed, or non-seed postFilter or preexisting results,
-				postFinder || ( seed ? preFilter : preexisting || postFilter ) ?
-
-					// ...intermediate processing is necessary
-					[] :
-
-					// ...otherwise use results directly
-					results :
-				matcherIn;
-
-		// Find primary matches
-		if ( matcher ) {
-			matcher( matcherIn, matcherOut, context, xml );
-		}
-
-		// Apply postFilter
-		if ( postFilter ) {
-			temp = condense( matcherOut, postMap );
-			postFilter( temp, [], context, xml );
-
-			// Un-match failing elements by moving them back to matcherIn
-			i = temp.length;
-			while ( i-- ) {
-				if ( (elem = temp[i]) ) {
-					matcherOut[ postMap[i] ] = !(matcherIn[ postMap[i] ] = elem);
-				}
-			}
-		}
-
-		if ( seed ) {
-			if ( postFinder || preFilter ) {
-				if ( postFinder ) {
-					// Get the final matcherOut by condensing this intermediate into postFinder contexts
-					temp = [];
-					i = matcherOut.length;
-					while ( i-- ) {
-						if ( (elem = matcherOut[i]) ) {
-							// Restore matcherIn since elem is not yet a final match
-							temp.push( (matcherIn[i] = elem) );
-						}
-					}
-					postFinder( null, (matcherOut = []), temp, xml );
-				}
-
-				// Move matched elements from seed to results to keep them synchronized
-				i = matcherOut.length;
-				while ( i-- ) {
-					if ( (elem = matcherOut[i]) &&
-						(temp = postFinder ? indexOf.call( seed, elem ) : preMap[i]) > -1 ) {
-
-						seed[temp] = !(results[temp] = elem);
-					}
-				}
-			}
-
-		// Add elements to results, through postFinder if defined
-		} else {
-			matcherOut = condense(
-				matcherOut === results ?
-					matcherOut.splice( preexisting, matcherOut.length ) :
-					matcherOut
-			);
-			if ( postFinder ) {
-				postFinder( null, results, matcherOut, xml );
-			} else {
-				push.apply( results, matcherOut );
-			}
-		}
-	});
-}
-
-function matcherFromTokens( tokens ) {
-	var checkContext, matcher, j,
-		len = tokens.length,
-		leadingRelative = Expr.relative[ tokens[0].type ],
-		implicitRelative = leadingRelative || Expr.relative[" "],
-		i = leadingRelative ? 1 : 0,
-
-		// The foundational matcher ensures that elements are reachable from top-level context(s)
-		matchContext = addCombinator( function( elem ) {
-			return elem === checkContext;
-		}, implicitRelative, true ),
-		matchAnyContext = addCombinator( function( elem ) {
-			return indexOf.call( checkContext, elem ) > -1;
-		}, implicitRelative, true ),
-		matchers = [ function( elem, context, xml ) {
-			return ( !leadingRelative && ( xml || context !== outermostContext ) ) || (
-				(checkContext = context).nodeType ?
-					matchContext( elem, context, xml ) :
-					matchAnyContext( elem, context, xml ) );
-		} ];
-
-	for ( ; i < len; i++ ) {
-		if ( (matcher = Expr.relative[ tokens[i].type ]) ) {
-			matchers = [ addCombinator(elementMatcher( matchers ), matcher) ];
-		} else {
-			matcher = Expr.filter[ tokens[i].type ].apply( null, tokens[i].matches );
-
-			// Return special upon seeing a positional matcher
-			if ( matcher[ expando ] ) {
-				// Find the next relative operator (if any) for proper handling
-				j = ++i;
-				for ( ; j < len; j++ ) {
-					if ( Expr.relative[ tokens[j].type ] ) {
-						break;
-					}
-				}
-				return setMatcher(
-					i > 1 && elementMatcher( matchers ),
-					i > 1 && toSelector(
-						// If the preceding token was a descendant combinator, insert an implicit any-element `*`
-						tokens.slice( 0, i - 1 ).concat({ value: tokens[ i - 2 ].type === " " ? "*" : "" })
-					).replace( rtrim, "$1" ),
-					matcher,
-					i < j && matcherFromTokens( tokens.slice( i, j ) ),
-					j < len && matcherFromTokens( (tokens = tokens.slice( j )) ),
-					j < len && toSelector( tokens )
-				);
-			}
-			matchers.push( matcher );
-		}
-	}
-
-	return elementMatcher( matchers );
-}
-
-function matcherFromGroupMatchers( elementMatchers, setMatchers ) {
-	var bySet = setMatchers.length > 0,
-		byElement = elementMatchers.length > 0,
-		superMatcher = function( seed, context, xml, results, outermost ) {
-			var elem, j, matcher,
-				matchedCount = 0,
-				i = "0",
-				unmatched = seed && [],
-				setMatched = [],
-				contextBackup = outermostContext,
-				// We must always have either seed elements or outermost context
-				elems = seed || byElement && Expr.find["TAG"]( "*", outermost ),
-				// Use integer dirruns iff this is the outermost matcher
-				dirrunsUnique = (dirruns += contextBackup == null ? 1 : Math.random() || 0.1),
-				len = elems.length;
-
-			if ( outermost ) {
-				outermostContext = context !== document && context;
-			}
-
-			// Add elements passing elementMatchers directly to results
-			// Keep `i` a string if there are no elements so `matchedCount` will be "00" below
-			// Support: IE<9, Safari
-			// Tolerate NodeList properties (IE: "length"; Safari: <number>) matching elements by id
-			for ( ; i !== len && (elem = elems[i]) != null; i++ ) {
-				if ( byElement && elem ) {
-					j = 0;
-					while ( (matcher = elementMatchers[j++]) ) {
-						if ( matcher( elem, context, xml ) ) {
-							results.push( elem );
-							break;
-						}
-					}
-					if ( outermost ) {
-						dirruns = dirrunsUnique;
-					}
-				}
-
-				// Track unmatched elements for set filters
-				if ( bySet ) {
-					// They will have gone through all possible matchers
-					if ( (elem = !matcher && elem) ) {
-						matchedCount--;
-					}
-
-					// Lengthen the array for every element, matched or not
-					if ( seed ) {
-						unmatched.push( elem );
-					}
-				}
-			}
-
-			// Apply set filters to unmatched elements
-			matchedCount += i;
-			if ( bySet && i !== matchedCount ) {
-				j = 0;
-				while ( (matcher = setMatchers[j++]) ) {
-					matcher( unmatched, setMatched, context, xml );
-				}
-
-				if ( seed ) {
-					// Reintegrate element matches to eliminate the need for sorting
-					if ( matchedCount > 0 ) {
-						while ( i-- ) {
-							if ( !(unmatched[i] || setMatched[i]) ) {
-								setMatched[i] = pop.call( results );
-							}
-						}
-					}
-
-					// Discard index placeholder values to get only actual matches
-					setMatched = condense( setMatched );
-				}
-
-				// Add matches to results
-				push.apply( results, setMatched );
-
-				// Seedless set matches succeeding multiple successful matchers stipulate sorting
-				if ( outermost && !seed && setMatched.length > 0 &&
-					( matchedCount + setMatchers.length ) > 1 ) {
-
-					Sizzle.uniqueSort( results );
-				}
-			}
-
-			// Override manipulation of globals by nested matchers
-			if ( outermost ) {
-				dirruns = dirrunsUnique;
-				outermostContext = contextBackup;
-			}
-
-			return unmatched;
-		};
-
-	return bySet ?
-		markFunction( superMatcher ) :
-		superMatcher;
-}
-
-compile = Sizzle.compile = function( selector, match /* Internal Use Only */ ) {
-	var i,
-		setMatchers = [],
-		elementMatchers = [],
-		cached = compilerCache[ selector + " " ];
-
-	if ( !cached ) {
-		// Generate a function of recursive functions that can be used to check each element
-		if ( !match ) {
-			match = tokenize( selector );
-		}
-		i = match.length;
-		while ( i-- ) {
-			cached = matcherFromTokens( match[i] );
-			if ( cached[ expando ] ) {
-				setMatchers.push( cached );
-			} else {
-				elementMatchers.push( cached );
-			}
-		}
-
-		// Cache the compiled function
-		cached = compilerCache( selector, matcherFromGroupMatchers( elementMatchers, setMatchers ) );
-
-		// Save selector and tokenization
-		cached.selector = selector;
-	}
-	return cached;
-};
-
-/**
- * A low-level selection function that works with Sizzle's compiled
- *  selector functions
- * @param {String|Function} selector A selector or a pre-compiled
- *  selector function built with Sizzle.compile
- * @param {Element} context
- * @param {Array} [results]
- * @param {Array} [seed] A set of elements to match against
- */
-select = Sizzle.select = function( selector, context, results, seed ) {
-	var i, tokens, token, type, find,
-		compiled = typeof selector === "function" && selector,
-		match = !seed && tokenize( (selector = compiled.selector || selector) );
-
-	results = results || [];
-
-	// Try to minimize operations if there is no seed and only one group
-	if ( match.length === 1 ) {
-
-		// Take a shortcut and set the context if the root selector is an ID
-		tokens = match[0] = match[0].slice( 0 );
-		if ( tokens.length > 2 && (token = tokens[0]).type === "ID" &&
-				support.getById && context.nodeType === 9 && documentIsHTML &&
-				Expr.relative[ tokens[1].type ] ) {
-
-			context = ( Expr.find["ID"]( token.matches[0].replace(runescape, funescape), context ) || [] )[0];
-			if ( !context ) {
-				return results;
-
-			// Precompiled matchers will still verify ancestry, so step up a level
-			} else if ( compiled ) {
-				context = context.parentNode;
-			}
-
-			selector = selector.slice( tokens.shift().value.length );
-		}
-
-		// Fetch a seed set for right-to-left matching
-		i = matchExpr["needsContext"].test( selector ) ? 0 : tokens.length;
-		while ( i-- ) {
-			token = tokens[i];
-
-			// Abort if we hit a combinator
-			if ( Expr.relative[ (type = token.type) ] ) {
-				break;
-			}
-			if ( (find = Expr.find[ type ]) ) {
-				// Search, expanding context for leading sibling combinators
-				if ( (seed = find(
-					token.matches[0].replace( runescape, funescape ),
-					rsibling.test( tokens[0].type ) && testContext( context.parentNode ) || context
-				)) ) {
-
-					// If seed is empty or no tokens remain, we can return early
-					tokens.splice( i, 1 );
-					selector = seed.length && toSelector( tokens );
-					if ( !selector ) {
-						push.apply( results, seed );
-						return results;
-					}
-
-					break;
-				}
-			}
-		}
-	}
-
-	// Compile and execute a filtering function if one is not provided
-	// Provide `match` to avoid retokenization if we modified the selector above
-	( compiled || compile( selector, match ) )(
-		seed,
-		context,
-		!documentIsHTML,
-		results,
-		rsibling.test( selector ) && testContext( context.parentNode ) || context
-	);
-	return results;
-};
-
-// One-time assignments
-
-// Sort stability
-support.sortStable = expando.split("").sort( sortOrder ).join("") === expando;
-
-// Support: Chrome<14
-// Always assume duplicates if they aren't passed to the comparison function
-support.detectDuplicates = !!hasDuplicate;
-
-// Initialize against the default document
-setDocument();
-
-// Support: Webkit<537.32 - Safari 6.0.3/Chrome 25 (fixed in Chrome 27)
-// Detached nodes confoundingly follow *each other*
-support.sortDetached = assert(function( div1 ) {
-	// Should return 1, but returns 4 (following)
-	return div1.compareDocumentPosition( document.createElement("div") ) & 1;
-});
-
-// Support: IE<8
-// Prevent attribute/property "interpolation"
-// http://msdn.microsoft.com/en-us/library/ms536429%28VS.85%29.aspx
-if ( !assert(function( div ) {
-	div.innerHTML = "<a href='#'></a>";
-	return div.firstChild.getAttribute("href") === "#" ;
-}) ) {
-	addHandle( "type|href|height|width", function( elem, name, isXML ) {
-		if ( !isXML ) {
-			return elem.getAttribute( name, name.toLowerCase() === "type" ? 1 : 2 );
-		}
-	});
-}
-
-// Support: IE<9
-// Use defaultValue in place of getAttribute("value")
-if ( !support.attributes || !assert(function( div ) {
-	div.innerHTML = "<input/>";
-	div.firstChild.setAttribute( "value", "" );
-	return div.firstChild.getAttribute( "value" ) === "";
-}) ) {
-	addHandle( "value", function( elem, name, isXML ) {
-		if ( !isXML && elem.nodeName.toLowerCase() === "input" ) {
-			return elem.defaultValue;
-		}
-	});
-}
-
-// Support: IE<9
-// Use getAttributeNode to fetch booleans when getAttribute lies
-if ( !assert(function( div ) {
-	return div.getAttribute("disabled") == null;
-}) ) {
-	addHandle( booleans, function( elem, name, isXML ) {
-		var val;
-		if ( !isXML ) {
-			return elem[ name ] === true ? name.toLowerCase() :
-					(val = elem.getAttributeNode( name )) && val.specified ?
-					val.value :
-				null;
-		}
-	});
-}
-
-return Sizzle;
-
-})( window );
-
-
-
-jQuery.find = Sizzle;
-jQuery.expr = Sizzle.selectors;
-jQuery.expr[":"] = jQuery.expr.pseudos;
-jQuery.unique = Sizzle.uniqueSort;
-jQuery.text = Sizzle.getText;
-jQuery.isXMLDoc = Sizzle.isXML;
-jQuery.contains = Sizzle.contains;
-
-
-
-var rneedsContext = jQuery.expr.match.needsContext;
-
-var rsingleTag = (/^<(\w+)\s*\/?>(?:<\/\1>|)$/);
-
-
-
-var risSimple = /^.[^:#\[\.,]*$/;
-
-// Implement the identical functionality for filter and not
-function winnow( elements, qualifier, not ) {
-	if ( jQuery.isFunction( qualifier ) ) {
-		return jQuery.grep( elements, function( elem, i ) {
-			/* jshint -W018 */
-			return !!qualifier.call( elem, i, elem ) !== not;
-		});
-
-	}
-
-	if ( qualifier.nodeType ) {
-		return jQuery.grep( elements, function( elem ) {
-			return ( elem === qualifier ) !== not;
-		});
-
-	}
-
-	if ( typeof qualifier === "string" ) {
-		if ( risSimple.test( qualifier ) ) {
-			return jQuery.filter( qualifier, elements, not );
-		}
-
-		qualifier = jQuery.filter( qualifier, elements );
-	}
-
-	return jQuery.grep( elements, function( elem ) {
-		return ( jQuery.inArray( elem, qualifier ) >= 0 ) !== not;
-	});
-}
-
-jQuery.filter = function( expr, elems, not ) {
-	var elem = elems[ 0 ];
-
-	if ( not ) {
-		expr = ":not(" + expr + ")";
-	}
-
-	return elems.length === 1 && elem.nodeType === 1 ?
-		jQuery.find.matchesSelector( elem, expr ) ? [ elem ] : [] :
-		jQuery.find.matches( expr, jQuery.grep( elems, function( elem ) {
-			return elem.nodeType === 1;
-		}));
-};
-
-jQuery.fn.extend({
-	find: function( selector ) {
-		var i,
-			ret = [],
-			self = this,
-			len = self.length;
-
-		if ( typeof selector !== "string" ) {
-			return this.pushStack( jQuery( selector ).filter(function() {
-				for ( i = 0; i < len; i++ ) {
-					if ( jQuery.contains( self[ i ], this ) ) {
-						return true;
-					}
-				}
-			}) );
-		}
-
-		for ( i = 0; i < len; i++ ) {
-			jQuery.find( selector, self[ i ], ret );
-		}
-
-		// Needed because $( selector, context ) becomes $( context ).find( selector )
-		ret = this.pushStack( len > 1 ? jQuery.unique( ret ) : ret );
-		ret.selector = this.selector ? this.selector + " " + selector : selector;
-		return ret;
-	},
-	filter: function( selector ) {
-		return this.pushStack( winnow(this, selector || [], false) );
-	},
-	not: function( selector ) {
-		return this.pushStack( winnow(this, selector || [], true) );
-	},
-	is: function( selector ) {
-		return !!winnow(
-			this,
-
-			// If this is a positional/relative selector, check membership in the returned set
-			// so $("p:first").is("p:last") won't return true for a doc with two "p".
-			typeof selector === "string" && rneedsContext.test( selector ) ?
-				jQuery( selector ) :
-				selector || [],
-			false
-		).length;
-	}
-});
-
-
-// Initialize a jQuery object
-
-
-// A central reference to the root jQuery(document)
-var rootjQuery,
-
-	// Use the correct document accordingly with window argument (sandbox)
-	document = window.document,
-
-	// A simple way to check for HTML strings
-	// Prioritize #id over <tag> to avoid XSS via location.hash (#9521)
-	// Strict HTML recognition (#11290: must start with <)
-	rquickExpr = /^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,
-
-	init = jQuery.fn.init = function( selector, context ) {
-		var match, elem;
-
-		// HANDLE: $(""), $(null), $(undefined), $(false)
-		if ( !selector ) {
-			return this;
-		}
-
-		// Handle HTML strings
-		if ( typeof selector === "string" ) {
-			if ( selector.charAt(0) === "<" && selector.charAt( selector.length - 1 ) === ">" && selector.length >= 3 ) {
-				// Assume that strings that start and end with <> are HTML and skip the regex check
-				match = [ null, selector, null ];
-
-			} else {
-				match = rquickExpr.exec( selector );
-			}
-
-			// Match html or make sure no context is specified for #id
-			if ( match && (match[1] || !context) ) {
-
-				// HANDLE: $(html) -> $(array)
-				if ( match[1] ) {
-					context = context instanceof jQuery ? context[0] : context;
-
-					// scripts is true for back-compat
-					// Intentionally let the error be thrown if parseHTML is not present
-					jQuery.merge( this, jQuery.parseHTML(
-						match[1],
-						context && context.nodeType ? context.ownerDocument || context : document,
-						true
-					) );
-
-					// HANDLE: $(html, props)
-					if ( rsingleTag.test( match[1] ) && jQuery.isPlainObject( context ) ) {
-						for ( match in context ) {
-							// Properties of context are called as methods if possible
-							if ( jQuery.isFunction( this[ match ] ) ) {
-								this[ match ]( context[ match ] );
-
-							// ...and otherwise set as attributes
-							} else {
-								this.attr( match, context[ match ] );
-							}
-						}
-					}
-
-					return this;
-
-				// HANDLE: $(#id)
-				} else {
-					elem = document.getElementById( match[2] );
-
-					// Check parentNode to catch when Blackberry 4.6 returns
-					// nodes that are no longer in the document #6963
-					if ( elem && elem.parentNode ) {
-						// Handle the case where IE and Opera return items
-						// by name instead of ID
-						if ( elem.id !== match[2] ) {
-							return rootjQuery.find( selector );
-						}
-
-						// Otherwise, we inject the element directly into the jQuery object
-						this.length = 1;
-						this[0] = elem;
-					}
-
-					this.context = document;
-					this.selector = selector;
-					return this;
-				}
-
-			// HANDLE: $(expr, $(...))
-			} else if ( !context || context.jquery ) {
-				return ( context || rootjQuery ).find( selector );
-
-			// HANDLE: $(expr, context)
-			// (which is just equivalent to: $(context).find(expr)
-			} else {
-				return this.constructor( context ).find( selector );
-			}
-
-		// HANDLE: $(DOMElement)
-		} else if ( selector.nodeType ) {
-			this.context = this[0] = selector;
-			this.length = 1;
-			return this;
-
-		// HANDLE: $(function)
-		// Shortcut for document ready
-		} else if ( jQuery.isFunction( selector ) ) {
-			return typeof rootjQuery.ready !== "undefined" ?
-				rootjQuery.ready( selector ) :
-				// Execute immediately if ready is not present
-				selector( jQuery );
-		}
-
-		if ( selector.selector !== undefined ) {
-			this.selector = selector.selector;
-			this.context = selector.context;
-		}
-
-		return jQuery.makeArray( selector, this );
-	};
-
-// Give the init function the jQuery prototype for later instantiation
-init.prototype = jQuery.fn;
-
-// Initialize central reference
-rootjQuery = jQuery( document );
-
-
-var rparentsprev = /^(?:parents|prev(?:Until|All))/,
-	// methods guaranteed to produce a unique set when starting from a unique set
-	guaranteedUnique = {
-		children: true,
-		contents: true,
-		next: true,
-		prev: true
-	};
-
-jQuery.extend({
-	dir: function( elem, dir, until ) {
-		var matched = [],
-			cur = elem[ dir ];
-
-		while ( cur && cur.nodeType !== 9 && (until === undefined || cur.nodeType !== 1 || !jQuery( cur ).is( until )) ) {
-			if ( cur.nodeType === 1 ) {
-				matched.push( cur );
-			}
-			cur = cur[dir];
-		}
-		return matched;
-	},
-
-	sibling: function( n, elem ) {
-		var r = [];
-
-		for ( ; n; n = n.nextSibling ) {
-			if ( n.nodeType === 1 && n !== elem ) {
-				r.push( n );
-			}
-		}
-
-		return r;
-	}
-});
-
-jQuery.fn.extend({
-	has: function( target ) {
-		var i,
-			targets = jQuery( target, this ),
-			len = targets.length;
-
-		return this.filter(function() {
-			for ( i = 0; i < len; i++ ) {
-				if ( jQuery.contains( this, targets[i] ) ) {
-					return true;
-				}
-			}
-		});
-	},
-
-	closest: function( selectors, context ) {
-		var cur,
-			i = 0,
-			l = this.length,
-			matched = [],
-			pos = rneedsContext.test( selectors ) || typeof selectors !== "string" ?
-				jQuery( selectors, context || this.context ) :
-				0;
-
-		for ( ; i < l; i++ ) {
-			for ( cur = this[i]; cur && cur !== context; cur = cur.parentNode ) {
-				// Always skip document fragments
-				if ( cur.nodeType < 11 && (pos ?
-					pos.index(cur) > -1 :
-
-					// Don't pass non-elements to Sizzle
-					cur.nodeType === 1 &&
-						jQuery.find.matchesSelector(cur, selectors)) ) {
-
-					matched.push( cur );
-					break;
-				}
-			}
-		}
-
-		return this.pushStack( matched.length > 1 ? jQuery.unique( matched ) : matched );
-	},
-
-	// Determine the position of an element within
-	// the matched set of elements
-	index: function( elem ) {
-
-		// No argument, return index in parent
-		if ( !elem ) {
-			return ( this[0] && this[0].parentNode ) ? this.first().prevAll().length : -1;
-		}
-
-		// index in selector
-		if ( typeof elem === "string" ) {
-			return jQuery.inArray( this[0], jQuery( elem ) );
-		}
-
-		// Locate the position of the desired element
-		return jQuery.inArray(
-			// If it receives a jQuery object, the first element is used
-			elem.jquery ? elem[0] : elem, this );
-	},
-
-	add: function( selector, context ) {
-		return this.pushStack(
-			jQuery.unique(
-				jQuery.merge( this.get(), jQuery( selector, context ) )
-			)
-		);
-	},
-
-	addBack: function( selector ) {
-		return this.add( selector == null ?
-			this.prevObject : this.prevObject.filter(selector)
-		);
-	}
-});
-
-function sibling( cur, dir ) {
-	do {
-		cur = cur[ dir ];
-	} while ( cur && cur.nodeType !== 1 );
-
-	return cur;
-}
-
-jQuery.each({
-	parent: function( elem ) {
-		var parent = elem.parentNode;
-		return parent && parent.nodeType !== 11 ? parent : null;
-	},
-	parents: function( elem ) {
-		return jQuery.dir( elem, "parentNode" );
-	},
-	parentsUntil: function( elem, i, until ) {
-		return jQuery.dir( elem, "parentNode", until );
-	},
-	next: function( elem ) {
-		return sibling( elem, "nextSibling" );
-	},
-	prev: function( elem ) {
-		return sibling( elem, "previousSibling" );
-	},
-	nextAll: function( elem ) {
-		return jQuery.dir( elem, "nextSibling" );
-	},
-	prevAll: function( elem ) {
-		return jQuery.dir( elem, "previousSibling" );
-	},
-	nextUntil: function( elem, i, until ) {
-		return jQuery.dir( elem, "nextSibling", until );
-	},
-	prevUntil: function( elem, i, until ) {
-		return jQuery.dir( elem, "previousSibling", until );
-	},
-	siblings: function( elem ) {
-		return jQuery.sibling( ( elem.parentNode || {} ).firstChild, elem );
-	},
-	children: function( elem ) {
-		return jQuery.sibling( elem.firstChild );
-	},
-	contents: function( elem ) {
-		return jQuery.nodeName( elem, "iframe" ) ?
-			elem.contentDocument || elem.contentWindow.document :
-			jQuery.merge( [], elem.childNodes );
-	}
-}, function( name, fn ) {
-	jQuery.fn[ name ] = function( until, selector ) {
-		var ret = jQuery.map( this, fn, until );
-
-		if ( name.slice( -5 ) !== "Until" ) {
-			selector = until;
-		}
-
-		if ( selector && typeof selector === "string" ) {
-			ret = jQuery.filter( selector, ret );
-		}
-
-		if ( this.length > 1 ) {
-			// Remove duplicates
-			if ( !guaranteedUnique[ name ] ) {
-				ret = jQuery.unique( ret );
-			}
-
-			// Reverse order for parents* and prev-derivatives
-			if ( rparentsprev.test( name ) ) {
-				ret = ret.reverse();
-			}
-		}
-
-		return this.pushStack( ret );
-	};
-});
-var rnotwhite = (/\S+/g);
-
-
-
-// String to Object options format cache
-var optionsCache = {};
-
-// Convert String-formatted options into Object-formatted ones and store in cache
-function createOptions( options ) {
-	var object = optionsCache[ options ] = {};
-	jQuery.each( options.match( rnotwhite ) || [], function( _, flag ) {
-		object[ flag ] = true;
-	});
-	return object;
-}
-
-/*
- * Create a callback list using the following parameters:
- *
- *	options: an optional list of space-separated options that will change how
- *			the callback list behaves or a more traditional option object
- *
- * By default a callback list will act like an event callback list and can be
- * "fired" multiple times.
- *
- * Possible options:
- *
- *	once:			will ensure the callback list can only be fired once (like a Deferred)
- *
- *	memory:			will keep track of previous values and will call any callback added
- *					after the list has been fired right away with the latest "memorized"
- *					values (like a Deferred)
- *
- *	unique:			will ensure a callback can only be added once (no duplicate in the list)
- *
- *	stopOnFalse:	interrupt callings when a callback returns false
- *
- */
-jQuery.Callbacks = function( options ) {
-
-	// Convert options from String-formatted to Object-formatted if needed
-	// (we check in cache first)
-	options = typeof options === "string" ?
-		( optionsCache[ options ] || createOptions( options ) ) :
-		jQuery.extend( {}, options );
-
-	var // Flag to know if list is currently firing
-		firing,
-		// Last fire value (for non-forgettable lists)
-		memory,
-		// Flag to know if list was already fired
-		fired,
-		// End of the loop when firing
-		firingLength,
-		// Index of currently firing callback (modified by remove if needed)
-		firingIndex,
-		// First callback to fire (used internally by add and fireWith)
-		firingStart,
-		// Actual callback list
-		list = [],
-		// Stack of fire calls for repeatable lists
-		stack = !options.once && [],
-		// Fire callbacks
-		fire = function( data ) {
-			memory = options.memory && data;
-			fired = true;
-			firingIndex = firingStart || 0;
-			firingStart = 0;
-			firingLength = list.length;
-			firing = true;
-			for ( ; list && firingIndex < firingLength; firingIndex++ ) {
-				if ( list[ firingIndex ].apply( data[ 0 ], data[ 1 ] ) === false && options.stopOnFalse ) {
-					memory = false; // To prevent further calls using add
-					break;
-				}
-			}
-			firing = false;
-			if ( list ) {
-				if ( stack ) {
-					if ( stack.length ) {
-						fire( stack.shift() );
-					}
-				} else if ( memory ) {
-					list = [];
-				} else {
-					self.disable();
-				}
-			}
-		},
-		// Actual Callbacks object
-		self = {
-			// Add a callback or a collection of callbacks to the list
-			add: function() {
-				if ( list ) {
-					// First, we save the current length
-					var start = list.length;
-					(function add( args ) {
-						jQuery.each( args, function( _, arg ) {
-							var type = jQuery.type( arg );
-							if ( type === "function" ) {
-								if ( !options.unique || !self.has( arg ) ) {
-									list.push( arg );
-								}
-							} else if ( arg && arg.length && type !== "string" ) {
-								// Inspect recursively
-								add( arg );
-							}
-						});
-					})( arguments );
-					// Do we need to add the callbacks to the
-					// current firing batch?
-					if ( firing ) {
-						firingLength = list.length;
-					// With memory, if we're not firing then
-					// we should call right away
-					} else if ( memory ) {
-						firingStart = start;
-						fire( memory );
-					}
-				}
-				return this;
-			},
-			// Remove a callback from the list
-			remove: function() {
-				if ( list ) {
-					jQuery.each( arguments, function( _, arg ) {
-						var index;
-						while ( ( index = jQuery.inArray( arg, list, index ) ) > -1 ) {
-							list.splice( index, 1 );
-							// Handle firing indexes
-							if ( firing ) {
-								if ( index <= firingLength ) {
-									firingLength--;
-								}
-								if ( index <= firingIndex ) {
-									firingIndex--;
-								}
-							}
-						}
-					});
-				}
-				return this;
-			},
-			// Check if a given callback is in the list.
-			// If no argument is given, return whether or not list has callbacks attached.
-			has: function( fn ) {
-				return fn ? jQuery.inArray( fn, list ) > -1 : !!( list && list.length );
-			},
-			// Remove all callbacks from the list
-			empty: function() {
-				list = [];
-				firingLength = 0;
-				return this;
-			},
-			// Have the list do nothing anymore
-			disable: function() {
-				list = stack = memory = undefined;
-				return this;
-			},
-			// Is it disabled?
-			disabled: function() {
-				return !list;
-			},
-			// Lock the list in its current state
-			lock: function() {
-				stack = undefined;
-				if ( !memory ) {
-					self.disable();
-				}
-				return this;
-			},
-			// Is it locked?
-			locked: function() {
-				return !stack;
-			},
-			// Call all callbacks with the given context and arguments
-			fireWith: function( context, args ) {
-				if ( list && ( !fired || stack ) ) {
-					args = args || [];
-					args = [ context, args.slice ? args.slice() : args ];
-					if ( firing ) {
-						stack.push( args );
-					} else {
-						fire( args );
-					}
-				}
-				return this;
-			},
-			// Call all the callbacks with the given arguments
-			fire: function() {
-				self.fireWith( this, arguments );
-				return this;
-			},
-			// To know if the callbacks have already been called at least once
-			fired: function() {
-				return !!fired;
-			}
-		};
-
-	return self;
-};
-
-
-jQuery.extend({
-
-	Deferred: function( func ) {
-		var tuples = [
-				// action, add listener, listener list, final state
-				[ "resolve", "done", jQuery.Callbacks("once memory"), "resolved" ],
-				[ "reject", "fail", jQuery.Callbacks("once memory"), "rejected" ],
-				[ "notify", "progress", jQuery.Callbacks("memory") ]
-			],
-			state = "pending",
-			promise = {
-				state: function() {
-					return state;
-				},
-				always: function() {
-					deferred.done( arguments ).fail( arguments );
-					return this;
-				},
-				then: function( /* fnDone, fnFail, fnProgress */ ) {
-					var fns = arguments;
-					return jQuery.Deferred(function( newDefer ) {
-						jQuery.each( tuples, function( i, tuple ) {
-							var fn = jQuery.isFunction( fns[ i ] ) && fns[ i ];
-							// deferred[ done | fail | progress ] for forwarding actions to newDefer
-							deferred[ tuple[1] ](function() {
-								var returned = fn && fn.apply( this, arguments );
-								if ( returned && jQuery.isFunction( returned.promise ) ) {
-									returned.promise()
-										.done( newDefer.resolve )
-										.fail( newDefer.reject )
-										.progress( newDefer.notify );
-								} else {
-									newDefer[ tuple[ 0 ] + "With" ]( this === promise ? newDefer.promise() : this, fn ? [ returned ] : arguments );
-								}
-							});
-						});
-						fns = null;
-					}).promise();
-				},
-				// Get a promise for this deferred
-				// If obj is provided, the promise aspect is added to the object
-				promise: function( obj ) {
-					return obj != null ? jQuery.extend( obj, promise ) : promise;
-				}
-			},
-			deferred = {};
-
-		// Keep pipe for back-compat
-		promise.pipe = promise.then;
-
-		// Add list-specific methods
-		jQuery.each( tuples, function( i, tuple ) {
-			var list = tuple[ 2 ],
-				stateString = tuple[ 3 ];
-
-			// promise[ done | fail | progress ] = list.add
-			promise[ tuple[1] ] = list.add;
-
-			// Handle state
-			if ( stateString ) {
-				list.add(function() {
-					// state = [ resolved | rejected ]
-					state = stateString;
-
-				// [ reject_list | resolve_list ].disable; progress_list.lock
-				}, tuples[ i ^ 1 ][ 2 ].disable, tuples[ 2 ][ 2 ].lock );
-			}
-
-			// deferred[ resolve | reject | notify ]
-			deferred[ tuple[0] ] = function() {
-				deferred[ tuple[0] + "With" ]( this === deferred ? promise : this, arguments );
-				return this;
-			};
-			deferred[ tuple[0] + "With" ] = list.fireWith;
-		});
-
-		// Make the deferred a promise
-		promise.promise( deferred );
-
-		// Call given func if any
-		if ( func ) {
-			func.call( deferred, deferred );
-		}
-
-		// All done!
-		return deferred;
-	},
-
-	// Deferred helper
-	when: function( subordinate /* , ..., subordinateN */ ) {
-		var i = 0,
-			resolveValues = slice.call( arguments ),
-			length = resolveValues.length,
-
-			// the count of uncompleted subordinates
-			remaining = length !== 1 || ( subordinate && jQuery.isFunction( subordinate.promise ) ) ? length : 0,
-
-			// the master Deferred. If resolveValues consist of only a single Deferred, just use that.
-			deferred = remaining === 1 ? subordinate : jQuery.Deferred(),
-
-			// Update function for both resolve and progress values
-			updateFunc = function( i, contexts, values ) {
-				return function( value ) {
-					contexts[ i ] = this;
-					values[ i ] = arguments.length > 1 ? slice.call( arguments ) : value;
-					if ( values === progressValues ) {
-						deferred.notifyWith( contexts, values );
-
-					} else if ( !(--remaining) ) {
-						deferred.resolveWith( contexts, values );
-					}
-				};
-			},
-
-			progressValues, progressContexts, resolveContexts;
-
-		// add listeners to Deferred subordinates; treat others as resolved
-		if ( length > 1 ) {
-			progressValues = new Array( length );
-			progressContexts = new Array( length );
-			resolveContexts = new Array( length );
-			for ( ; i < length; i++ ) {
-				if ( resolveValues[ i ] && jQuery.isFunction( resolveValues[ i ].promise ) ) {
-					resolveValues[ i ].promise()
-						.done( updateFunc( i, resolveContexts, resolveValues ) )
-						.fail( deferred.reject )
-						.progress( updateFunc( i, progressContexts, progressValues ) );
-				} else {
-					--remaining;
-				}
-			}
-		}
-
-		// if we're not waiting on anything, resolve the master
-		if ( !remaining ) {
-			deferred.resolveWith( resolveContexts, resolveValues );
-		}
-
-		return deferred.promise();
-	}
-});
-
-
-// The deferred used on DOM ready
-var readyList;
-
-jQuery.fn.ready = function( fn ) {
-	// Add the callback
-	jQuery.ready.promise().done( fn );
-
-	return this;
-};
-
-jQuery.extend({
-	// Is the DOM ready to be used? Set to true once it occurs.
-	isReady: false,
-
-	// A counter to track how many items to wait for before
-	// the ready event fires. See #6781
-	readyWait: 1,
-
-	// Hold (or release) the ready event
-	holdReady: function( hold ) {
-		if ( hold ) {
-			jQuery.readyWait++;
-		} else {
-			jQuery.ready( true );
-		}
-	},
-
-	// Handle when the DOM is ready
-	ready: function( wait ) {
-
-		// Abort if there are pending holds or we're already ready
-		if ( wait === true ? --jQuery.readyWait : jQuery.isReady ) {
-			return;
-		}
-
-		// Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443).
-		if ( !document.body ) {
-			return setTimeout( jQuery.ready );
-		}
-
-		// Remember that the DOM is ready
-		jQuery.isReady = true;
-
-		// If a normal DOM Ready event fired, decrement, and wait if need be
-		if ( wait !== true && --jQuery.readyWait > 0 ) {
-			return;
-		}
-
-		// If there are functions bound, to execute
-		readyList.resolveWith( document, [ jQuery ] );
-
-		// Trigger any bound ready events
-		if ( jQuery.fn.triggerHandler ) {
-			jQuery( document ).triggerHandler( "ready" );
-			jQuery( document ).off( "ready" );
-		}
-	}
-});
-
-/**
- * Clean-up method for dom ready events
- */
-function detach() {
-	if ( document.addEventListener ) {
-		document.removeEventListener( "DOMContentLoaded", completed, false );
-		window.removeEventListener( "load", completed, false );
-
-	} else {
-		document.detachEvent( "onreadystatechange", completed );
-		window.detachEvent( "onload", completed );
-	}
-}
-
-/**
- * The ready event handler and self cleanup method
- */
-function completed() {
-	// readyState === "complete" is good enough for us to call the dom ready in oldIE
-	if ( document.addEventListener || event.type === "load" || document.readyState === "complete" ) {
-		detach();
-		jQuery.ready();
-	}
-}
-
-jQuery.ready.promise = function( obj ) {
-	if ( !readyList ) {
-
-		readyList = jQuery.Deferred();
-
-		// Catch cases where $(document).ready() is called after the browser event has already occurred.
-		// we once tried to use readyState "interactive" here, but it caused issues like the one
-		// discovered by ChrisS here: http://bugs.jquery.com/ticket/12282#comment:15
-		if ( document.readyState === "complete" ) {
-			// Handle it asynchronously to allow scripts the opportunity to delay ready
-			setTimeout( jQuery.ready );
-
-		// Standards-based browsers support DOMContentLoaded
-		} else if ( document.addEventListener ) {
-			// Use the handy event callback
-			document.addEventListener( "DOMContentLoaded", completed, false );
-
-			// A fallback to window.onload, that will always work
-			window.addEventListener( "load", completed, false );
-
-		// If IE event model is used
-		} else {
-			// Ensure firing before onload, maybe late but safe also for iframes
-			document.attachEvent( "onreadystatechange", completed );
-
-			// A fallback to window.onload, that will always work
-			window.attachEvent( "onload", completed );
-
-			// If IE and not a frame
-			// continually check to see if the document is ready
-			var top = false;
-
-			try {
-				top = window.frameElement == null && document.documentElement;
-			} catch(e) {}
-
-			if ( top && top.doScroll ) {
-				(function doScrollCheck() {
-					if ( !jQuery.isReady ) {
-
-						try {
-							// Use the trick by Diego Perini
-							// http://javascript.nwbox.com/IEContentLoaded/
-							top.doScroll("left");
-						} catch(e) {
-							return setTimeout( doScrollCheck, 50 );
-						}
-
-						// detach all dom ready events
-						detach();
-
-						// and execute any waiting functions
-						jQuery.ready();
-					}
-				})();
-			}
-		}
-	}
-	return readyList.promise( obj );
-};
-
-
-var strundefined = typeof undefined;
-
-
-
-// Support: IE<9
-// Iteration over object's inherited properties before its own
-var i;
-for ( i in jQuery( support ) ) {
-	break;
-}
-support.ownLast = i !== "0";
-
-// Note: most support tests are defined in their respective modules.
-// false until the test is run
-support.inlineBlockNeedsLayout = false;
-
-// Execute ASAP in case we need to set body.style.zoom
-jQuery(function() {
-	// Minified: var a,b,c,d
-	var val, div, body, container;
-
-	body = document.getElementsByTagName( "body" )[ 0 ];
-	if ( !body || !body.style ) {
-		// Return for frameset docs that don't have a body
-		return;
-	}
-
-	// Setup
-	div = document.createElement( "div" );
-	container = document.createElement( "div" );
-	container.style.cssText = "position:absolute;border:0;width:0;height:0;top:0;left:-9999px";
-	body.appendChild( container ).appendChild( div );
-
-	if ( typeof div.style.zoom !== strundefined ) {
-		// Support: IE<8
-		// Check if natively block-level elements act like inline-block
-		// elements when setting their display to 'inline' and giving
-		// them layout
-		div.style.cssText = "display:inline;margin:0;border:0;padding:1px;width:1px;zoom:1";
-
-		support.inlineBlockNeedsLayout = val = div.offsetWidth === 3;
-		if ( val ) {
-			// Prevent IE 6 from affecting layout for positioned elements #11048
-			// Prevent IE from shrinking the body in IE 7 mode #12869
-			// Support: IE<8
-			body.style.zoom = 1;
-		}
-	}
-
-	body.removeChild( container );
-});
-
-
-
-
-(function() {
-	var div = document.createElement( "div" );
-
-	// Execute the test only if not already executed in another module.
-	if (support.deleteExpando == null) {
-		// Support: IE<9
-		support.deleteExpando = true;
-		try {
-			delete div.test;
-		} catch( e ) {
-			support.deleteExpando = false;
-		}
-	}
-
-	// Null elements to avoid leaks in IE.
-	div = null;
-})();
-
-
-/**
- * Determines whether an object can have data
- */
-jQuery.acceptData = function( elem ) {
-	var noData = jQuery.noData[ (elem.nodeName + " ").toLowerCase() ],
-		nodeType = +elem.nodeType || 1;
-
-	// Do not set data on non-element DOM nodes because it will not be cleared (#8335).
-	return nodeType !== 1 && nodeType !== 9 ?
-		false :
-
-		// Nodes accept data unless otherwise specified; rejection can be conditional
-		!noData || noData !== true && elem.getAttribute("classid") === noData;
-};
-
-
-var rbrace = /^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,
-	rmultiDash = /([A-Z])/g;
-
-function dataAttr( elem, key, data ) {
-	// If nothing was found internally, try to fetch any
-	// data from the HTML5 data-* attribute
-	if ( data === undefined && elem.nodeType === 1 ) {
-
-		var name = "data-" + key.replace( rmultiDash, "-$1" ).toLowerCase();
-
-		data = elem.getAttribute( name );
-
-		if ( typeof data === "string" ) {
-			try {
-				data = data === "true" ? true :
-					data === "false" ? false :
-					data === "null" ? null :
-					// Only convert to a number if it doesn't change the string
-					+data + "" === data ? +data :
-					rbrace.test( data ) ? jQuery.parseJSON( data ) :
-					data;
-			} catch( e ) {}
-
-			// Make sure we set the data so it isn't changed later
-			jQuery.data( elem, key, data );
-
-		} else {
-			data = undefined;
-		}
-	}
-
-	return data;
-}
-
-// checks a cache object for emptiness
-function isEmptyDataObject( obj ) {
-	var name;
-	for ( name in obj ) {
-
-		// if the public data object is empty, the private is still empty
-		if ( name === "data" && jQuery.isEmptyObject( obj[name] ) ) {
-			continue;
-		}
-		if ( name !== "toJSON" ) {
-			return false;
-		}
-	}
-
-	return true;
-}
-
-function internalData( elem, name, data, pvt /* Internal Use Only */ ) {
-	if ( !jQuery.acceptData( elem ) ) {
-		return;
-	}
-
-	var ret, thisCache,
-		internalKey = jQuery.expando,
-
-		// We have to handle DOM nodes and JS objects differently because IE6-7
-		// can't GC object references properly across the DOM-JS boundary
-		isNode = elem.nodeType,
-
-		// Only DOM nodes need the global jQuery cache; JS object data is
-		// attached directly to the object so GC can occur automatically
-		cache = isNode ? jQuery.cache : elem,
-
-		// Only defining an ID for JS objects if its cache already exists allows
-		// the code to shortcut on the same path as a DOM node with no cache
-		id = isNode ? elem[ internalKey ] : elem[ internalKey ] && internalKey;
-
-	// Avoid doing any more work than we need to when trying to get data on an
-	// object that has no data at all
-	if ( (!id || !cache[id] || (!pvt && !cache[id].data)) && data === undefined && typeof name === "string" ) {
-		return;
-	}
-
-	if ( !id ) {
-		// Only DOM nodes need a new unique ID for each element since their data
-		// ends up in the global cache
-		if ( isNode ) {
-			id = elem[ internalKey ] = deletedIds.pop() || jQuery.guid++;
-		} else {
-			id = internalKey;
-		}
-	}
-
-	if ( !cache[ id ] ) {
-		// Avoid exposing jQuery metadata on plain JS objects when the object
-		// is serialized using JSON.stringify
-		cache[ id ] = isNode ? {} : { toJSON: jQuery.noop };
-	}
-
-	// An object can be passed to jQuery.data instead of a key/value pair; this gets
-	// shallow copied over onto the existing cache
-	if ( typeof name === "object" || typeof name === "function" ) {
-		if ( pvt ) {
-			cache[ id ] = jQuery.extend( cache[ id ], name );
-		} else {
-			cache[ id ].data = jQuery.extend( cache[ id ].data, name );
-		}
-	}
-
-	thisCache = cache[ id ];
-
-	// jQuery data() is stored in a separate object inside the object's internal data
-	// cache in order to avoid key collisions between internal data and user-defined
-	// data.
-	if ( !pvt ) {
-		if ( !thisCache.data ) {
-			thisCache.data = {};
-		}
-
-		thisCache = thisCache.data;
-	}
-
-	if ( data !== undefined ) {
-		thisCache[ jQuery.camelCase( name ) ] = data;
-	}
-
-	// Check for both converted-to-camel and non-converted data property names
-	// If a data property was specified
-	if ( typeof name === "string" ) {
-
-		// First Try to find as-is property data
-		ret = thisCache[ name ];
-
-		// Test for null|undefined property data
-		if ( ret == null ) {
-
-			// Try to find the camelCased property
-			ret = thisCache[ jQuery.camelCase( name ) ];
-		}
-	} else {
-		ret = thisCache;
-	}
-
-	return ret;
-}
-
-function internalRemoveData( elem, name, pvt ) {
-	if ( !jQuery.acceptData( elem ) ) {
-		return;
-	}
-
-	var thisCache, i,
-		isNode = elem.nodeType,
-
-		// See jQuery.data for more information
-		cache = isNode ? jQuery.cache : elem,
-		id = isNode ? elem[ jQuery.expando ] : jQuery.expando;
-
-	// If there is already no cache entry for this object, there is no
-	// purpose in continuing
-	if ( !cache[ id ] ) {
-		return;
-	}
-
-	if ( name ) {
-
-		thisCache = pvt ? cache[ id ] : cache[ id ].data;
-
-		if ( thisCache ) {
-
-			// Support array or space separated string names for data keys
-			if ( !jQuery.isArray( name ) ) {
-
-				// try the string as a key before any manipulation
-				if ( name in thisCache ) {
-					name = [ name ];
-				} else {
-
-					// split the camel cased version by spaces unless a key with the spaces exists
-					name = jQuery.camelCase( name );
-					if ( name in thisCache ) {
-						name = [ name ];
-					} else {
-						name = name.split(" ");
-					}
-				}
-			} else {
-				// If "name" is an array of keys...
-				// When data is initially created, via ("key", "val") signature,
-				// keys will be converted to camelCase.
-				// Since there is no way to tell _how_ a key was added, remove
-				// both plain key and camelCase key. #12786
-				// This will only penalize the array argument path.
-				name = name.concat( jQuery.map( name, jQuery.camelCase ) );
-			}
-
-			i = name.length;
-			while ( i-- ) {
-				delete thisCache[ name[i] ];
-			}
-
-			// If there is no data left in the cache, we want to continue
-			// and let the cache object itself get destroyed
-			if ( pvt ? !isEmptyDataObject(thisCache) : !jQuery.isEmptyObject(thisCache) ) {
-				return;
-			}
-		}
-	}
-
-	// See jQuery.data for more information
-	if ( !pvt ) {
-		delete cache[ id ].data;
-
-		// Don't destroy the parent cache unless the internal data object
-		// had been the only thing left in it
-		if ( !isEmptyDataObject( cache[ id ] ) ) {
-			return;
-		}
-	}
-
-	// Destroy the cache
-	if ( isNode ) {
-		jQuery.cleanData( [ elem ], true );
-
-	// Use delete when supported for expandos or `cache` is not a window per isWindow (#10080)
-	/* jshint eqeqeq: false */
-	} else if ( support.deleteExpando || cache != cache.window ) {
-		/* jshint eqeqeq: true */
-		delete cache[ id ];
-
-	// When all else fails, null
-	} else {
-		cache[ id ] = null;
-	}
-}
-
-jQuery.extend({
-	cache: {},
-
-	// The following elements (space-suffixed to avoid Object.prototype collisions)
-	// throw uncatchable exceptions if you attempt to set expando properties
-	noData: {
-		"applet ": true,
-		"embed ": true,
-		// ...but Flash objects (which have this classid) *can* handle expandos
-		"object ": "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"
-	},
-
-	hasData: function( elem ) {
-		elem = elem.nodeType ? jQuery.cache[ elem[jQuery.expando] ] : elem[ jQuery.expando ];
-		return !!elem && !isEmptyDataObject( elem );
-	},
-
-	data: function( elem, name, data ) {
-		return internalData( elem, name, data );
-	},
-
-	removeData: function( elem, name ) {
-		return internalRemoveData( elem, name );
-	},
-
-	// For internal use only.
-	_data: function( elem, name, data ) {
-		return internalData( elem, name, data, true );
-	},
-
-	_removeData: function( elem, name ) {
-		return internalRemoveData( elem, name, true );
-	}
-});
-
-jQuery.fn.extend({
-	data: function( key, value ) {
-		var i, name, data,
-			elem = this[0],
-			attrs = elem && elem.attributes;
-
-		// Special expections of .data basically thwart jQuery.access,
-		// so implement the relevant behavior ourselves
-
-		// Gets all values
-		if ( key === undefined ) {
-			if ( this.length ) {
-				data = jQuery.data( elem );
-
-				if ( elem.nodeType === 1 && !jQuery._data( elem, "parsedAttrs" ) ) {
-					i = attrs.length;
-					while ( i-- ) {
-
-						// Support: IE11+
-						// The attrs elements can be null (#14894)
-						if ( attrs[ i ] ) {
-							name = attrs[ i ].name;
-							if ( name.indexOf( "data-" ) === 0 ) {
-								name = jQuery.camelCase( name.slice(5) );
-								dataAttr( elem, name, data[ name ] );
-							}
-						}
-					}
-					jQuery._data( elem, "parsedAttrs", true );
-				}
-			}
-
-			return data;
-		}
-
-		// Sets multiple values
-		if ( typeof key === "object" ) {
-			return this.each(function() {
-				jQuery.data( this, key );
-			});
-		}
-
-		return arguments.length > 1 ?
-
-			// Sets one value
-			this.each(function() {
-				jQuery.data( this, key, value );
-			}) :
-
-			// Gets one value
-			// Try to fetch any internally stored data first
-			elem ? dataAttr( elem, key, jQuery.data( elem, key ) ) : undefined;
-	},
-
-	removeData: function( key ) {
-		return this.each(function() {
-			jQuery.removeData( this, key );
-		});
-	}
-});
-
-
-jQuery.extend({
-	queue: function( elem, type, data ) {
-		var queue;
-
-		if ( elem ) {
-			type = ( type || "fx" ) + "queue";
-			queue = jQuery._data( elem, type );
-
-			// Speed up dequeue by getting out quickly if this is just a lookup
-			if ( data ) {
-				if ( !queue || jQuery.isArray(data) ) {
-					queue = jQuery._data( elem, type, jQuery.makeArray(data) );
-				} else {
-					queue.push( data );
-				}
-			}
-			return queue || [];
-		}
-	},
-
-	dequeue: function( elem, type ) {
-		type = type || "fx";
-
-		var queue = jQuery.queue( elem, type ),
-			startLength = queue.length,
-			fn = queue.shift(),
-			hooks = jQuery._queueHooks( elem, type ),
-			next = function() {
-				jQuery.dequeue( elem, type );
-			};
-
-		// If the fx queue is dequeued, always remove the progress sentinel
-		if ( fn === "inprogress" ) {
-			fn = queue.shift();
-			startLength--;
-		}
-
-		if ( fn ) {
-
-			// Add a progress sentinel to prevent the fx queue from being
-			// automatically dequeued
-			if ( type === "fx" ) {
-				queue.unshift( "inprogress" );
-			}
-
-			// clear up the last queue stop function
-			delete hooks.stop;
-			fn.call( elem, next, hooks );
-		}
-
-		if ( !startLength && hooks ) {
-			hooks.empty.fire();
-		}
-	},
-
-	// not intended for public consumption - generates a queueHooks object, or returns the current one
-	_queueHooks: function( elem, type ) {
-		var key = type + "queueHooks";
-		return jQuery._data( elem, key ) || jQuery._data( elem, key, {
-			empty: jQuery.Callbacks("once memory").add(function() {
-				jQuery._removeData( elem, type + "queue" );
-				jQuery._removeData( elem, key );
-			})
-		});
-	}
-});
-
-jQuery.fn.extend({
-	queue: function( type, data ) {
-		var setter = 2;
-
-		if ( typeof type !== "string" ) {
-			data = type;
-			type = "fx";
-			setter--;
-		}
-
-		if ( arguments.length < setter ) {
-			return jQuery.queue( this[0], type );
-		}
-
-		return data === undefined ?
-			this :
-			this.each(function() {
-				var queue = jQuery.queue( this, type, data );
-
-				// ensure a hooks for this queue
-				jQuery._queueHooks( this, type );
-
-				if ( type === "fx" && queue[0] !== "inprogress" ) {
-					jQuery.dequeue( this, type );
-				}
-			});
-	},
-	dequeue: function( type ) {
-		return this.each(function() {
-			jQuery.dequeue( this, type );
-		});
-	},
-	clearQueue: function( type ) {
-		return this.queue( type || "fx", [] );
-	},
-	// Get a promise resolved when queues of a certain type
-	// are emptied (fx is the type by default)
-	promise: function( type, obj ) {
-		var tmp,
-			count = 1,
-			defer = jQuery.Deferred(),
-			elements = this,
-			i = this.length,
-			resolve = function() {
-				if ( !( --count ) ) {
-					defer.resolveWith( elements, [ elements ] );
-				}
-			};
-
-		if ( typeof type !== "string" ) {
-			obj = type;
-			type = undefined;
-		}
-		type = type || "fx";
-
-		while ( i-- ) {
-			tmp = jQuery._data( elements[ i ], type + "queueHooks" );
-			if ( tmp && tmp.empty ) {
-				count++;
-				tmp.empty.add( resolve );
-			}
-		}
-		resolve();
-		return defer.promise( obj );
-	}
-});
-var pnum = (/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/).source;
-
-var cssExpand = [ "Top", "Right", "Bottom", "Left" ];
-
-var isHidden = function( elem, el ) {
-		// isHidden might be called from jQuery#filter function;
-		// in that case, element will be second argument
-		elem = el || elem;
-		return jQuery.css( elem, "display" ) === "none" || !jQuery.contains( elem.ownerDocument, elem );
-	};
-
-
-
-// Multifunctional method to get and set values of a collection
-// The value/s can optionally be executed if it's a function
-var access = jQuery.access = function( elems, fn, key, value, chainable, emptyGet, raw ) {
-	var i = 0,
-		length = elems.length,
-		bulk = key == null;
-
-	// Sets many values
-	if ( jQuery.type( key ) === "object" ) {
-		chainable = true;
-		for ( i in key ) {
-			jQuery.access( elems, fn, i, key[i], true, emptyGet, raw );
-		}
-
-	// Sets one value
-	} else if ( value !== undefined ) {
-		chainable = true;
-
-		if ( !jQuery.isFunction( value ) ) {
-			raw = true;
-		}
-
-		if ( bulk ) {
-			// Bulk operations run against the entire set
-			if ( raw ) {
-				fn.call( elems, value );
-				fn = null;
-
-			// ...except when executing function values
-			} else {
-				bulk = fn;
-				fn = function( elem, key, value ) {
-					return bulk.call( jQuery( elem ), value );
-				};
-			}
-		}
-
-		if ( fn ) {
-			for ( ; i < length; i++ ) {
-				fn( elems[i], key, raw ? value : value.call( elems[i], i, fn( elems[i], key ) ) );
-			}
-		}
-	}
-
-	return chainable ?
-		elems :
-
-		// Gets
-		bulk ?
-			fn.call( elems ) :
-			length ? fn( elems[0], key ) : emptyGet;
-};
-var rcheckableType = (/^(?:checkbox|radio)$/i);
-
-
-
-(function() {
-	// Minified: var a,b,c
-	var input = document.createElement( "input" ),
-		div = document.createElement( "div" ),
-		fragment = document.createDocumentFragment();
-
-	// Setup
-	div.innerHTML = "  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>";
-
-	// IE strips leading whitespace when .innerHTML is used
-	support.leadingWhitespace = div.firstChild.nodeType === 3;
-
-	// Make sure that tbody elements aren't automatically inserted
-	// IE will insert them into empty tables
-	support.tbody = !div.getElementsByTagName( "tbody" ).length;
-
-	// Make sure that link elements get serialized correctly by innerHTML
-	// This requires a wrapper element in IE
-	support.htmlSerialize = !!div.getElementsByTagName( "link" ).length;
-
-	// Makes sure cloning an html5 element does not cause problems
-	// Where outerHTML is undefined, this still works
-	support.html5Clone =
-		document.createElement( "nav" ).cloneNode( true ).outerHTML !== "<:nav></:nav>";
-
-	// Check if a disconnected checkbox will retain its checked
-	// value of true after appended to the DOM (IE6/7)
-	input.type = "checkbox";
-	input.checked = true;
-	fragment.appendChild( input );
-	support.appendChecked = input.checked;
-
-	// Make sure textarea (and checkbox) defaultValue is properly cloned
-	// Support: IE6-IE11+
-	div.innerHTML = "<textarea>x</textarea>";
-	support.noCloneChecked = !!div.cloneNode( true ).lastChild.defaultValue;
-
-	// #11217 - WebKit loses check when the name is after the checked attribute
-	fragment.appendChild( div );
-	div.innerHTML = "<input type='radio' checked='checked' name='t'/>";
-
-	// Support: Safari 5.1, iOS 5.1, Android 4.x, Android 2.3
-	// old WebKit doesn't clone checked state correctly in fragments
-	support.checkClone = div.cloneNode( true ).cloneNode( true ).lastChild.checked;
-
-	// Support: IE<9
-	// Opera does not clone events (and typeof div.attachEvent === undefined).
-	// IE9-10 clones events bound via attachEvent, but they don't trigger with .click()
-	support.noCloneEvent = true;
-	if ( div.attachEvent ) {
-		div.attachEvent( "onclick", function() {
-			support.noCloneEvent = false;
-		});
-
-		div.cloneNode( true ).click();
-	}
-
-	// Execute the test only if not already executed in another module.
-	if (support.deleteExpando == null) {
-		// Support: IE<9
-		support.deleteExpando = true;
-		try {
-			delete div.test;
-		} catch( e ) {
-			support.deleteExpando = false;
-		}
-	}
-})();
-
-
-(function() {
-	var i, eventName,
-		div = document.createElement( "div" );
-
-	// Support: IE<9 (lack submit/change bubble), Firefox 23+ (lack focusin event)
-	for ( i in { submit: true, change: true, focusin: true }) {
-		eventName = "on" + i;
-
-		if ( !(support[ i + "Bubbles" ] = eventName in window) ) {
-			// Beware of CSP restrictions (https://developer.mozilla.org/en/Security/CSP)
-			div.setAttribute( eventName, "t" );
-			support[ i + "Bubbles" ] = div.attributes[ eventName ].expando === false;
-		}
-	}
-
-	// Null elements to avoid leaks in IE.
-	div = null;
-})();
-
-
-var rformElems = /^(?:input|select|textarea)$/i,
-	rkeyEvent = /^key/,
-	rmouseEvent = /^(?:mouse|pointer|contextmenu)|click/,
-	rfocusMorph = /^(?:focusinfocus|focusoutblur)$/,
-	rtypenamespace = /^([^.]*)(?:\.(.+)|)$/;
-
-function returnTrue() {
-	return true;
-}
-
-function returnFalse() {
-	return false;
-}
-
-function safeActiveElement() {
-	try {
-		return document.activeElement;
-	} catch ( err ) { }
-}
-
-/*
- * Helper functions for managing events -- not part of the public interface.
- * Props to Dean Edwards' addEvent library for many of the ideas.
- */
-jQuery.event = {
-
-	global: {},
-
-	add: function( elem, types, handler, data, selector ) {
-		var tmp, events, t, handleObjIn,
-			special, eventHandle, handleObj,
-			handlers, type, namespaces, origType,
-			elemData = jQuery._data( elem );
-
-		// Don't attach events to noData or text/comment nodes (but allow plain objects)
-		if ( !elemData ) {
-			return;
-		}
-
-		// Caller can pass in an object of custom data in lieu of the handler
-		if ( handler.handler ) {
-			handleObjIn = handler;
-			handler = handleObjIn.handler;
-			selector = handleObjIn.selector;
-		}
-
-		// Make sure that the handler has a unique ID, used to find/remove it later
-		if ( !handler.guid ) {
-			handler.guid = jQuery.guid++;
-		}
-
-		// Init the element's event structure and main handler, if this is the first
-		if ( !(events = elemData.events) ) {
-			events = elemData.events = {};
-		}
-		if ( !(eventHandle = elemData.handle) ) {
-			eventHandle = elemData.handle = function( e ) {
-				// Discard the second event of a jQuery.event.trigger() and
-				// when an event is called after a page has unloaded
-				return typeof jQuery !== strundefined && (!e || jQuery.event.triggered !== e.type) ?
-					jQuery.event.dispatch.apply( eventHandle.elem, arguments ) :
-					undefined;
-			};
-			// Add elem as a property of the handle fn to prevent a memory leak with IE non-native events
-			eventHandle.elem = elem;
-		}
-
-		// Handle multiple events separated by a space
-		types = ( types || "" ).match( rnotwhite ) || [ "" ];
-		t = types.length;
-		while ( t-- ) {
-			tmp = rtypenamespace.exec( types[t] ) || [];
-			type = origType = tmp[1];
-			namespaces = ( tmp[2] || "" ).split( "." ).sort();
-
-			// There *must* be a type, no attaching namespace-only handlers
-			if ( !type ) {
-				continue;
-			}
-
-			// If event changes its type, use the special event handlers for the changed type
-			special = jQuery.event.special[ type ] || {};
-
-			// If selector defined, determine special event api type, otherwise given type
-			type = ( selector ? special.delegateType : special.bindType ) || type;
-
-			// Update special based on newly reset type
-			special = jQuery.event.special[ type ] || {};
-
-			// handleObj is passed to all event handlers
-			handleObj = jQuery.extend({
-				type: type,
-				origType: origType,
-				data: data,
-				handler: handler,
-				guid: handler.guid,
-				selector: selector,
-				needsContext: selector && jQuery.expr.match.needsContext.test( selector ),
-				namespace: namespaces.join(".")
-			}, handleObjIn );
-
-			// Init the event handler queue if we're the first
-			if ( !(handlers = events[ type ]) ) {
-				handlers = events[ type ] = [];
-				handlers.delegateCount = 0;
-
-				// Only use addEventListener/attachEvent if the special events handler returns false
-				if ( !special.setup || special.setup.call( elem, data, namespaces, eventHandle ) === false ) {
-					// Bind the global event handler to the element
-					if ( elem.addEventListener ) {
-						elem.addEventListener( type, eventHandle, false );
-
-					} else if ( elem.attachEvent ) {
-						elem.attachEvent( "on" + type, eventHandle );
-					}
-				}
-			}
-
-			if ( special.add ) {
-				special.add.call( elem, handleObj );
-
-				if ( !handleObj.handler.guid ) {
-					handleObj.handler.guid = handler.guid;
-				}
-			}
-
-			// Add to the element's handler list, delegates in front
-			if ( selector ) {
-				handlers.splice( handlers.delegateCount++, 0, handleObj );
-			} else {
-				handlers.push( handleObj );
-			}
-
-			// Keep track of which events have ever been used, for event optimization
-			jQuery.event.global[ type ] = true;
-		}
-
-		// Nullify elem to prevent memory leaks in IE
-		elem = null;
-	},
-
-	// Detach an event or set of events from an element
-	remove: function( elem, types, handler, selector, mappedTypes ) {
-		var j, handleObj, tmp,
-			origCount, t, events,
-			special, handlers, type,
-			namespaces, origType,
-			elemData = jQuery.hasData( elem ) && jQuery._data( elem );
-
-		if ( !elemData || !(events = elemData.events) ) {
-			return;
-		}
-
-		// Once for each type.namespace in types; type may be omitted
-		types = ( types || "" ).match( rnotwhite ) || [ "" ];
-		t = types.length;
-		while ( t-- ) {
-			tmp = rtypenamespace.exec( types[t] ) || [];
-			type = origType = tmp[1];
-			namespaces = ( tmp[2] || "" ).split( "." ).sort();
-
-			// Unbind all events (on this namespace, if provided) for the element
-			if ( !type ) {
-				for ( type in events ) {
-					jQuery.event.remove( elem, type + types[ t ], handler, selector, true );
-				}
-				continue;
-			}
-
-			special = jQuery.event.special[ type ] || {};
-			type = ( selector ? special.delegateType : special.bindType ) || type;
-			handlers = events[ type ] || [];
-			tmp = tmp[2] && new RegExp( "(^|\\.)" + namespaces.join("\\.(?:.*\\.|)") + "(\\.|$)" );
-
-			// Remove matching events
-			origCount = j = handlers.length;
-			while ( j-- ) {
-				handleObj = handlers[ j ];
-
-				if ( ( mappedTypes || origType === handleObj.origType ) &&
-					( !handler || handler.guid === handleObj.guid ) &&
-					( !tmp || tmp.test( handleObj.namespace ) ) &&
-					( !selector || selector === handleObj.selector || selector === "**" && handleObj.selector ) ) {
-					handlers.splice( j, 1 );
-
-					if ( handleObj.selector ) {
-						handlers.delegateCount--;
-					}
-					if ( special.remove ) {
-						special.remove.call( elem, handleObj );
-					}
-				}
-			}
-
-			// Remove generic event handler if we removed something and no more handlers exist
-			// (avoids potential for endless recursion during removal of special event handlers)
-			if ( origCount && !handlers.length ) {
-				if ( !special.teardown || special.teardown.call( elem, namespaces, elemData.handle ) === false ) {
-					jQuery.removeEvent( elem, type, elemData.handle );
-				}
-
-				delete events[ type ];
-			}
-		}
-
-		// Remove the expando if it's no longer used
-		if ( jQuery.isEmptyObject( events ) ) {
-			delete elemData.handle;
-
-			// removeData also checks for emptiness and clears the expando if empty
-			// so use it instead of delete
-			jQuery._removeData( elem, "events" );
-		}
-	},
-
-	trigger: function( event, data, elem, onlyHandlers ) {
-		var handle, ontype, cur,
-			bubbleType, special, tmp, i,
-			eventPath = [ elem || document ],
-			type = hasOwn.call( event, "type" ) ? event.type : event,
-			namespaces = hasOwn.call( event, "namespace" ) ? event.namespace.split(".") : [];
-
-		cur = tmp = elem = elem || document;
-
-		// Don't do events on text and comment nodes
-		if ( elem.nodeType === 3 || elem.nodeType === 8 ) {
-			return;
-		}
-
-		// focus/blur morphs to focusin/out; ensure we're not firing them right now
-		if ( rfocusMorph.test( type + jQuery.event.triggered ) ) {
-			return;
-		}
-
-		if ( type.indexOf(".") >= 0 ) {
-			// Namespaced trigger; create a regexp to match event type in handle()
-			namespaces = type.split(".");
-			type = namespaces.shift();
-			namespaces.sort();
-		}
-		ontype = type.indexOf(":") < 0 && "on" + type;
-
-		// Caller can pass in a jQuery.Event object, Object, or just an event type string
-		event = event[ jQuery.expando ] ?
-			event :
-			new jQuery.Event( type, typeof event === "object" && event );
-
-		// Trigger bitmask: & 1 for native handlers; & 2 for jQuery (always true)
-		event.isTrigger = onlyHandlers ? 2 : 3;
-		event.namespace = namespaces.join(".");
-		event.namespace_re = event.namespace ?
-			new RegExp( "(^|\\.)" + namespaces.join("\\.(?:.*\\.|)") + "(\\.|$)" ) :
-			null;
-
-		// Clean up the event in case it is being reused
-		event.result = undefined;
-		if ( !event.target ) {
-			event.target = elem;
-		}
-
-		// Clone any incoming data and prepend the event, creating the handler arg list
-		data = data == null ?
-			[ event ] :
-			jQuery.makeArray( data, [ event ] );
-
-		// Allow special events to draw outside the lines
-		special = jQuery.event.special[ type ] || {};
-		if ( !onlyHandlers && special.trigger && special.trigger.apply( elem, data ) === false ) {
-			return;
-		}
-
-		// Determine event propagation path in advance, per W3C events spec (#9951)
-		// Bubble up to document, then to window; watch for a global ownerDocument var (#9724)
-		if ( !onlyHandlers && !special.noBubble && !jQuery.isWindow( elem ) ) {
-
-			bubbleType = special.delegateType || type;
-			if ( !rfocusMorph.test( bubbleType + type ) ) {
-				cur = cur.parentNode;
-			}
-			for ( ; cur; cur = cur.parentNode ) {
-				eventPath.push( cur );
-				tmp = cur;
-			}
-
-			// Only add window if we got to document (e.g., not plain obj or detached DOM)
-			if ( tmp === (elem.ownerDocument || document) ) {
-				eventPath.push( tmp.defaultView || tmp.parentWindow || window );
-			}
-		}
-
-		// Fire handlers on the event path
-		i = 0;
-		while ( (cur = eventPath[i++]) && !event.isPropagationStopped() ) {
-
-			event.type = i > 1 ?
-				bubbleType :
-				special.bindType || type;
-
-			// jQuery handler
-			handle = ( jQuery._data( cur, "events" ) || {} )[ event.type ] && jQuery._data( cur, "handle" );
-			if ( handle ) {
-				handle.apply( cur, data );
-			}
-
-			// Native handler
-			handle = ontype && cur[ ontype ];
-			if ( handle && handle.apply && jQuery.acceptData( cur ) ) {
-				event.result = handle.apply( cur, data );
-				if ( event.result === false ) {
-					event.preventDefault();
-				}
-			}
-		}
-		event.type = type;
-
-		// If nobody prevented the default action, do it now
-		if ( !onlyHandlers && !event.isDefaultPrevented() ) {
-
-			if ( (!special._default || special._default.apply( eventPath.pop(), data ) === false) &&
-				jQuery.acceptData( elem ) ) {
-
-				// Call a native DOM method on the target with the same name name as the event.
-				// Can't use an .isFunction() check here because IE6/7 fails that test.
-				// Don't do default actions on window, that's where global variables be (#6170)
-				if ( ontype && elem[ type ] && !jQuery.isWindow( elem ) ) {
-
-					// Don't re-trigger an onFOO event when we call its FOO() method
-					tmp = elem[ ontype ];
-
-					if ( tmp ) {
-						elem[ ontype ] = null;
-					}
-
-					// Prevent re-triggering of the same event, since we already bubbled it above
-					jQuery.event.triggered = type;
-					try {
-						elem[ type ]();
-					} catch ( e ) {
-						// IE<9 dies on focus/blur to hidden element (#1486,#12518)
-						// only reproducible on winXP IE8 native, not IE9 in IE8 mode
-					}
-					jQuery.event.triggered = undefined;
-
-					if ( tmp ) {
-						elem[ ontype ] = tmp;
-					}
-				}
-			}
-		}
-
-		return event.result;
-	},
-
-	dispatch: function( event ) {
-
-		// Make a writable jQuery.Event from the native event object
-		event = jQuery.event.fix( event );
-
-		var i, ret, handleObj, matched, j,
-			handlerQueue = [],
-			args = slice.call( arguments ),
-			handlers = ( jQuery._data( this, "events" ) || {} )[ event.type ] || [],
-			special = jQuery.event.special[ event.type ] || {};
-
-		// Use the fix-ed jQuery.Event rather than the (read-only) native event
-		args[0] = event;
-		event.delegateTarget = this;
-
-		// Call the preDispatch hook for the mapped type, and let it bail if desired
-		if ( special.preDispatch && special.preDispatch.call( this, event ) === false ) {
-			return;
-		}
-
-		// Determine handlers
-		handlerQueue = jQuery.event.handlers.call( this, event, handlers );
-
-		// Run delegates first; they may want to stop propagation beneath us
-		i = 0;
-		while ( (matched = handlerQueue[ i++ ]) && !event.isPropagationStopped() ) {
-			event.currentTarget = matched.elem;
-
-			j = 0;
-			while ( (handleObj = matched.handlers[ j++ ]) && !event.isImmediatePropagationStopped() ) {
-
-				// Triggered event must either 1) have no namespace, or
-				// 2) have namespace(s) a subset or equal to those in the bound event (both can have no namespace).
-				if ( !event.namespace_re || event.namespace_re.test( handleObj.namespace ) ) {
-
-					event.handleObj = handleObj;
-					event.data = handleObj.data;
-
-					ret = ( (jQuery.event.special[ handleObj.origType ] || {}).handle || handleObj.handler )
-							.apply( matched.elem, args );
-
-					if ( ret !== undefined ) {
-						if ( (event.result = ret) === false ) {
-							event.preventDefault();
-							event.stopPropagation();
-						}
-					}
-				}
-			}
-		}
-
-		// Call the postDispatch hook for the mapped type
-		if ( special.postDispatch ) {
-			special.postDispatch.call( this, event );
-		}
-
-		return event.result;
-	},
-
-	handlers: function( event, handlers ) {
-		var sel, handleObj, matches, i,
-			handlerQueue = [],
-			delegateCount = handlers.delegateCount,
-			cur = event.target;
-
-		// Find delegate handlers
-		// Black-hole SVG <use> instance trees (#13180)
-		// Avoid non-left-click bubbling in Firefox (#3861)
-		if ( delegateCount && cur.nodeType && (!event.button || event.type !== "click") ) {
-
-			/* jshint eqeqeq: false */
-			for ( ; cur != this; cur = cur.parentNode || this ) {
-				/* jshint eqeqeq: true */
-
-				// Don't check non-elements (#13208)
-				// Don't process clicks on disabled elements (#6911, #8165, #11382, #11764)
-				if ( cur.nodeType === 1 && (cur.disabled !== true || event.type !== "click") ) {
-					matches = [];
-					for ( i = 0; i < delegateCount; i++ ) {
-						handleObj = handlers[ i ];
-
-						// Don't conflict with Object.prototype properties (#13203)
-						sel = handleObj.selector + " ";
-
-						if ( matches[ sel ] === undefined ) {
-							matches[ sel ] = handleObj.needsContext ?
-								jQuery( sel, this ).index( cur ) >= 0 :
-								jQuery.find( sel, this, null, [ cur ] ).length;
-						}
-						if ( matches[ sel ] ) {
-							matches.push( handleObj );
-						}
-					}
-					if ( matches.length ) {
-						handlerQueue.push({ elem: cur, handlers: matches });
-					}
-				}
-			}
-		}
-
-		// Add the remaining (directly-bound) handlers
-		if ( delegateCount < handlers.length ) {
-			handlerQueue.push({ elem: this, handlers: handlers.slice( delegateCount ) });
-		}
-
-		return handlerQueue;
-	},
-
-	fix: function( event ) {
-		if ( event[ jQuery.expando ] ) {
-			return event;
-		}
-
-		// Create a writable copy of the event object and normalize some properties
-		var i, prop, copy,
-			type = event.type,
-			originalEvent = event,
-			fixHook = this.fixHooks[ type ];
-
-		if ( !fixHook ) {
-			this.fixHooks[ type ] = fixHook =
-				rmouseEvent.test( type ) ? this.mouseHooks :
-				rkeyEvent.test( type ) ? this.keyHooks :
-				{};
-		}
-		copy = fixHook.props ? this.props.concat( fixHook.props ) : this.props;
-
-		event = new jQuery.Event( originalEvent );
-
-		i = copy.length;
-		while ( i-- ) {
-			prop = copy[ i ];
-			event[ prop ] = originalEvent[ prop ];
-		}
-
-		// Support: IE<9
-		// Fix target property (#1925)
-		if ( !event.target ) {
-			event.target = originalEvent.srcElement || document;
-		}
-
-		// Support: Chrome 23+, Safari?
-		// Target should not be a text node (#504, #13143)
-		if ( event.target.nodeType === 3 ) {
-			event.target = event.target.parentNode;
-		}
-
-		// Support: IE<9
-		// For mouse/key events, metaKey==false if it's undefined (#3368, #11328)
-		event.metaKey = !!event.metaKey;
-
-		return fixHook.filter ? fixHook.filter( event, originalEvent ) : event;
-	},
-
-	// Includes some event props shared by KeyEvent and MouseEvent
-	props: "altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),
-
-	fixHooks: {},
-
-	keyHooks: {
-		props: "char charCode key keyCode".split(" "),
-		filter: function( event, original ) {
-
-			// Add which for key events
-			if ( event.which == null ) {
-				event.which = original.charCode != null ? original.charCode : original.keyCode;
-			}
-
-			return event;
-		}
-	},
-
-	mouseHooks: {
-		props: "button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),
-		filter: function( event, original ) {
-			var body, eventDoc, doc,
-				button = original.button,
-				fromElement = original.fromElement;
-
-			// Calculate pageX/Y if missing and clientX/Y available
-			if ( event.pageX == null && original.clientX != null ) {
-				eventDoc = event.target.ownerDocument || document;
-				doc = eventDoc.documentElement;
-				body = eventDoc.body;
-
-				event.pageX = original.clientX + ( doc && doc.scrollLeft || body && body.scrollLeft || 0 ) - ( doc && doc.clientLeft || body && body.clientLeft || 0 );
-				event.pageY = original.clientY + ( doc && doc.scrollTop  || body && body.scrollTop  || 0 ) - ( doc && doc.clientTop  || body && body.clientTop  || 0 );
-			}
-
-			// Add relatedTarget, if necessary
-			if ( !event.relatedTarget && fromElement ) {
-				event.relatedTarget = fromElement === event.target ? original.toElement : fromElement;
-			}
-
-			// Add which for click: 1 === left; 2 === middle; 3 === right
-			// Note: button is not normalized, so don't use it
-			if ( !event.which && button !== undefined ) {
-				event.which = ( button & 1 ? 1 : ( button & 2 ? 3 : ( button & 4 ? 2 : 0 ) ) );
-			}
-
-			return event;
-		}
-	},
-
-	special: {
-		load: {
-			// Prevent triggered image.load events from bubbling to window.load
-			noBubble: true
-		},
-		focus: {
-			// Fire native event if possible so blur/focus sequence is correct
-			trigger: function() {
-				if ( this !== safeActiveElement() && this.focus ) {
-					try {
-						this.focus();
-						return false;
-					} catch ( e ) {
-						// Support: IE<9
-						// If we error on focus to hidden element (#1486, #12518),
-						// let .trigger() run the handlers
-					}
-				}
-			},
-			delegateType: "focusin"
-		},
-		blur: {
-			trigger: function() {
-				if ( this === safeActiveElement() && this.blur ) {
-					this.blur();
-					return false;
-				}
-			},
-			delegateType: "focusout"
-		},
-		click: {
-			// For checkbox, fire native event so checked state will be right
-			trigger: function() {
-				if ( jQuery.nodeName( this, "input" ) && this.type === "checkbox" && this.click ) {
-					this.click();
-					return false;
-				}
-			},
-
-			// For cross-browser consistency, don't fire native .click() on links
-			_default: function( event ) {
-				return jQuery.nodeName( event.target, "a" );
-			}
-		},
-
-		beforeunload: {
-			postDispatch: function( event ) {
-
-				// Support: Firefox 20+
-				// Firefox doesn't alert if the returnValue field is not set.
-				if ( event.result !== undefined && event.originalEvent ) {
-					event.originalEvent.returnValue = event.result;
-				}
-			}
-		}
-	},
-
-	simulate: function( type, elem, event, bubble ) {
-		// Piggyback on a donor event to simulate a different one.
-		// Fake originalEvent to avoid donor's stopPropagation, but if the
-		// simulated event prevents default then we do the same on the donor.
-		var e = jQuery.extend(
-			new jQuery.Event(),
-			event,
-			{
-				type: type,
-				isSimulated: true,
-				originalEvent: {}
-			}
-		);
-		if ( bubble ) {
-			jQuery.event.trigger( e, null, elem );
-		} else {
-			jQuery.event.dispatch.call( elem, e );
-		}
-		if ( e.isDefaultPrevented() ) {
-			event.preventDefault();
-		}
-	}
-};
-
-jQuery.removeEvent = document.removeEventListener ?
-	function( elem, type, handle ) {
-		if ( elem.removeEventListener ) {
-			elem.removeEventListener( type, handle, false );
-		}
-	} :
-	function( elem, type, handle ) {
-		var name = "on" + type;
-
-		if ( elem.detachEvent ) {
-
-			// #8545, #7054, preventing memory leaks for custom events in IE6-8
-			// detachEvent needed property on element, by name of that event, to properly expose it to GC
-			if ( typeof elem[ name ] === strundefined ) {
-				elem[ name ] = null;
-			}
-
-			elem.detachEvent( name, handle );
-		}
-	};
-
-jQuery.Event = function( src, props ) {
-	// Allow instantiation without the 'new' keyword
-	if ( !(this instanceof jQuery.Event) ) {
-		return new jQuery.Event( src, props );
-	}
-
-	// Event object
-	if ( src && src.type ) {
-		this.originalEvent = src;
-		this.type = src.type;
-
-		// Events bubbling up the document may have been marked as prevented
-		// by a handler lower down the tree; reflect the correct value.
-		this.isDefaultPrevented = src.defaultPrevented ||
-				src.defaultPrevented === undefined &&
-				// Support: IE < 9, Android < 4.0
-				src.returnValue === false ?
-			returnTrue :
-			returnFalse;
-
-	// Event type
-	} else {
-		this.type = src;
-	}
-
-	// Put explicitly provided properties onto the event object
-	if ( props ) {
-		jQuery.extend( this, props );
-	}
-
-	// Create a timestamp if incoming event doesn't have one
-	this.timeStamp = src && src.timeStamp || jQuery.now();
-
-	// Mark it as fixed
-	this[ jQuery.expando ] = true;
-};
-
-// jQuery.Event is based on DOM3 Events as specified by the ECMAScript Language Binding
-// http://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html
-jQuery.Event.prototype = {
-	isDefaultPrevented: returnFalse,
-	isPropagationStopped: returnFalse,
-	isImmediatePropagationStopped: returnFalse,
-
-	preventDefault: function() {
-		var e = this.originalEvent;
-
-		this.isDefaultPrevented = returnTrue;
-		if ( !e ) {
-			return;
-		}
-
-		// If preventDefault exists, run it on the original event
-		if ( e.preventDefault ) {
-			e.preventDefault();
-
-		// Support: IE
-		// Otherwise set the returnValue property of the original event to false
-		} else {
-			e.returnValue = false;
-		}
-	},
-	stopPropagation: function() {
-		var e = this.originalEvent;
-
-		this.isPropagationStopped = returnTrue;
-		if ( !e ) {
-			return;
-		}
-		// If stopPropagation exists, run it on the original event
-		if ( e.stopPropagation ) {
-			e.stopPropagation();
-		}
-
-		// Support: IE
-		// Set the cancelBubble property of the original event to true
-		e.cancelBubble = true;
-	},
-	stopImmediatePropagation: function() {
-		var e = this.originalEvent;
-
-		this.isImmediatePropagationStopped = returnTrue;
-
-		if ( e && e.stopImmediatePropagation ) {
-			e.stopImmediatePropagation();
-		}
-
-		this.stopPropagation();
-	}
-};
-
-// Create mouseenter/leave events using mouseover/out and event-time checks
-jQuery.each({
-	mouseenter: "mouseover",
-	mouseleave: "mouseout",
-	pointerenter: "pointerover",
-	pointerleave: "pointerout"
-}, function( orig, fix ) {
-	jQuery.event.special[ orig ] = {
-		delegateType: fix,
-		bindType: fix,
-
-		handle: function( event ) {
-			var ret,
-				target = this,
-				related = event.relatedTarget,
-				handleObj = event.handleObj;
-
-			// For mousenter/leave call the handler if related is outside the target.
-			// NB: No relatedTarget if the mouse left/entered the browser window
-			if ( !related || (related !== target && !jQuery.contains( target, related )) ) {
-				event.type = handleObj.origType;
-				ret = handleObj.handler.apply( this, arguments );
-				event.type = fix;
-			}
-			return ret;
-		}
-	};
-});
-
-// IE submit delegation
-if ( !support.submitBubbles ) {
-
-	jQuery.event.special.submit = {
-		setup: function() {
-			// Only need this for delegated form submit events
-			if ( jQuery.nodeName( this, "form" ) ) {
-				return false;
-			}
-
-			// Lazy-add a submit handler when a descendant form may potentially be submitted
-			jQuery.event.add( this, "click._submit keypress._submit", function( e ) {
-				// Node name check avoids a VML-related crash in IE (#9807)
-				var elem = e.target,
-					form = jQuery.nodeName( elem, "input" ) || jQuery.nodeName( elem, "button" ) ? elem.form : undefined;
-				if ( form && !jQuery._data( form, "submitBubbles" ) ) {
-					jQuery.event.add( form, "submit._submit", function( event ) {
-						event._submit_bubble = true;
-					});
-					jQuery._data( form, "submitBubbles", true );
-				}
-			});
-			// return undefined since we don't need an event listener
-		},
-
-		postDispatch: function( event ) {
-			// If form was submitted by the user, bubble the event up the tree
-			if ( event._submit_bubble ) {
-				delete event._submit_bubble;
-				if ( this.parentNode && !event.isTrigger ) {
-					jQuery.event.simulate( "submit", this.parentNode, event, true );
-				}
-			}
-		},
-
-		teardown: function() {
-			// Only need this for delegated form submit events
-			if ( jQuery.nodeName( this, "form" ) ) {
-				return false;
-			}
-
-			// Remove delegated handlers; cleanData eventually reaps submit handlers attached above
-			jQuery.event.remove( this, "._submit" );
-		}
-	};
-}
-
-// IE change delegation and checkbox/radio fix
-if ( !support.changeBubbles ) {
-
-	jQuery.event.special.change = {
-
-		setup: function() {
-
-			if ( rformElems.test( this.nodeName ) ) {
-				// IE doesn't fire change on a check/radio until blur; trigger it on click
-				// after a propertychange. Eat the blur-change in special.change.handle.
-				// This still fires onchange a second time for check/radio after blur.
-				if ( this.type === "checkbox" || this.type === "radio" ) {
-					jQuery.event.add( this, "propertychange._change", function( event ) {
-						if ( event.originalEvent.propertyName === "checked" ) {
-							this._just_changed = true;
-						}
-					});
-					jQuery.event.add( this, "click._change", function( event ) {
-						if ( this._just_changed && !event.isTrigger ) {
-							this._just_changed = false;
-						}
-						// Allow triggered, simulated change events (#11500)
-						jQuery.event.simulate( "change", this, event, true );
-					});
-				}
-				return false;
-			}
-			// Delegated event; lazy-add a change handler on descendant inputs
-			jQuery.event.add( this, "beforeactivate._change", function( e ) {
-				var elem = e.target;
-
-				if ( rformElems.test( elem.nodeName ) && !jQuery._data( elem, "changeBubbles" ) ) {
-					jQuery.event.add( elem, "change._change", function( event ) {
-						if ( this.parentNode && !event.isSimulated && !event.isTrigger ) {
-							jQuery.event.simulate( "change", this.parentNode, event, true );
-						}
-					});
-					jQuery._data( elem, "changeBubbles", true );
-				}
-			});
-		},
-
-		handle: function( event ) {
-			var elem = event.target;
-
-			// Swallow native change events from checkbox/radio, we already triggered them above
-			if ( this !== elem || event.isSimulated || event.isTrigger || (elem.type !== "radio" && elem.type !== "checkbox") ) {
-				return event.handleObj.handler.apply( this, arguments );
-			}
-		},
-
-		teardown: function() {
-			jQuery.event.remove( this, "._change" );
-
-			return !rformElems.test( this.nodeName );
-		}
-	};
-}
-
-// Create "bubbling" focus and blur events
-if ( !support.focusinBubbles ) {
-	jQuery.each({ focus: "focusin", blur: "focusout" }, function( orig, fix ) {
-
-		// Attach a single capturing handler on the document while someone wants focusin/focusout
-		var handler = function( event ) {
-				jQuery.event.simulate( fix, event.target, jQuery.event.fix( event ), true );
-			};
-
-		jQuery.event.special[ fix ] = {
-			setup: function() {
-				var doc = this.ownerDocument || this,
-					attaches = jQuery._data( doc, fix );
-
-				if ( !attaches ) {
-					doc.addEventListener( orig, handler, true );
-				}
-				jQuery._data( doc, fix, ( attaches || 0 ) + 1 );
-			},
-			teardown: function() {
-				var doc = this.ownerDocument || this,
-					attaches = jQuery._data( doc, fix ) - 1;
-
-				if ( !attaches ) {
-					doc.removeEventListener( orig, handler, true );
-					jQuery._removeData( doc, fix );
-				} else {
-					jQuery._data( doc, fix, attaches );
-				}
-			}
-		};
-	});
-}
-
-jQuery.fn.extend({
-
-	on: function( types, selector, data, fn, /*INTERNAL*/ one ) {
-		var type, origFn;
-
-		// Types can be a map of types/handlers
-		if ( typeof types === "object" ) {
-			// ( types-Object, selector, data )
-			if ( typeof selector !== "string" ) {
-				// ( types-Object, data )
-				data = data || selector;
-				selector = undefined;
-			}
-			for ( type in types ) {
-				this.on( type, selector, data, types[ type ], one );
-			}
-			return this;
-		}
-
-		if ( data == null && fn == null ) {
-			// ( types, fn )
-			fn = selector;
-			data = selector = undefined;
-		} else if ( fn == null ) {
-			if ( typeof selector === "string" ) {
-				// ( types, selector, fn )
-				fn = data;
-				data = undefined;
-			} else {
-				// ( types, data, fn )
-				fn = data;
-				data = selector;
-				selector = undefined;
-			}
-		}
-		if ( fn === false ) {
-			fn = returnFalse;
-		} else if ( !fn ) {
-			return this;
-		}
-
-		if ( one === 1 ) {
-			origFn = fn;
-			fn = function( event ) {
-				// Can use an empty set, since event contains the info
-				jQuery().off( event );
-				return origFn.apply( this, arguments );
-			};
-			// Use same guid so caller can remove using origFn
-			fn.guid = origFn.guid || ( origFn.guid = jQuery.guid++ );
-		}
-		return this.each( function() {
-			jQuery.event.add( this, types, fn, data, selector );
-		});
-	},
-	one: function( types, selector, data, fn ) {
-		return this.on( types, selector, data, fn, 1 );
-	},
-	off: function( types, selector, fn ) {
-		var handleObj, type;
-		if ( types && types.preventDefault && types.handleObj ) {
-			// ( event )  dispatched jQuery.Event
-			handleObj = types.handleObj;
-			jQuery( types.delegateTarget ).off(
-				handleObj.namespace ? handleObj.origType + "." + handleObj.namespace : handleObj.origType,
-				handleObj.selector,
-				handleObj.handler
-			);
-			return this;
-		}
-		if ( typeof types === "object" ) {
-			// ( types-object [, selector] )
-			for ( type in types ) {
-				this.off( type, selector, types[ type ] );
-			}
-			return this;
-		}
-		if ( selector === false || typeof selector === "function" ) {
-			// ( types [, fn] )
-			fn = selector;
-			selector = undefined;
-		}
-		if ( fn === false ) {
-			fn = returnFalse;
-		}
-		return this.each(function() {
-			jQuery.event.remove( this, types, fn, selector );
-		});
-	},
-
-	trigger: function( type, data ) {
-		return this.each(function() {
-			jQuery.event.trigger( type, data, this );
-		});
-	},
-	triggerHandler: function( type, data ) {
-		var elem = this[0];
-		if ( elem ) {
-			return jQuery.event.trigger( type, data, elem, true );
-		}
-	}
-});
-
-
-function createSafeFragment( document ) {
-	var list = nodeNames.split( "|" ),
-		safeFrag = document.createDocumentFragment();
-
-	if ( safeFrag.createElement ) {
-		while ( list.length ) {
-			safeFrag.createElement(
-				list.pop()
-			);
-		}
-	}
-	return safeFrag;
-}
-
-var nodeNames = "abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|" +
-		"header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",
-	rinlinejQuery = / jQuery\d+="(?:null|\d+)"/g,
-	rnoshimcache = new RegExp("<(?:" + nodeNames + ")[\\s/>]", "i"),
-	rleadingWhitespace = /^\s+/,
-	rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,
-	rtagName = /<([\w:]+)/,
-	rtbody = /<tbody/i,
-	rhtml = /<|&#?\w+;/,
-	rnoInnerhtml = /<(?:script|style|link)/i,
-	// checked="checked" or checked
-	rchecked = /checked\s*(?:[^=]|=\s*.checked.)/i,
-	rscriptType = /^$|\/(?:java|ecma)script/i,
-	rscriptTypeMasked = /^true\/(.*)/,
-	rcleanScript = /^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,
-
-	// We have to close these tags to support XHTML (#13200)
-	wrapMap = {
-		option: [ 1, "<select multiple='multiple'>", "</select>" ],
-		legend: [ 1, "<fieldset>", "</fieldset>" ],
-		area: [ 1, "<map>", "</map>" ],
-		param: [ 1, "<object>", "</object>" ],
-		thead: [ 1, "<table>", "</table>" ],
-		tr: [ 2, "<table><tbody>", "</tbody></table>" ],
-		col: [ 2, "<table><tbody></tbody><colgroup>", "</colgroup></table>" ],
-		td: [ 3, "<table><tbody><tr>", "</tr></tbody></table>" ],
-
-		// IE6-8 can't serialize link, script, style, or any html5 (NoScope) tags,
-		// unless wrapped in a div with non-breaking characters in front of it.
-		_default: support.htmlSerialize ? [ 0, "", "" ] : [ 1, "X<div>", "</div>"  ]
-	},
-	safeFragment = createSafeFragment( document ),
-	fragmentDiv = safeFragment.appendChild( document.createElement("div") );
-
-wrapMap.optgroup = wrapMap.option;
-wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead;
-wrapMap.th = wrapMap.td;
-
-function getAll( context, tag ) {
-	var elems, elem,
-		i = 0,
-		found = typeof context.getElementsByTagName !== strundefined ? context.getElementsByTagName( tag || "*" ) :
-			typeof context.querySelectorAll !== strundefined ? context.querySelectorAll( tag || "*" ) :
-			undefined;
-
-	if ( !found ) {
-		for ( found = [], elems = context.childNodes || context; (elem = elems[i]) != null; i++ ) {
-			if ( !tag || jQuery.nodeName( elem, tag ) ) {
-				found.push( elem );
-			} else {
-				jQuery.merge( found, getAll( elem, tag ) );
-			}
-		}
-	}
-
-	return tag === undefined || tag && jQuery.nodeName( context, tag ) ?
-		jQuery.merge( [ context ], found ) :
-		found;
-}
-
-// Used in buildFragment, fixes the defaultChecked property
-function fixDefaultChecked( elem ) {
-	if ( rcheckableType.test( elem.type ) ) {
-		elem.defaultChecked = elem.checked;
-	}
-}
-
-// Support: IE<8
-// Manipulating tables requires a tbody
-function manipulationTarget( elem, content ) {
-	return jQuery.nodeName( elem, "table" ) &&
-		jQuery.nodeName( content.nodeType !== 11 ? content : content.firstChild, "tr" ) ?
-
-		elem.getElementsByTagName("tbody")[0] ||
-			elem.appendChild( elem.ownerDocument.createElement("tbody") ) :
-		elem;
-}
-
-// Replace/restore the type attribute of script elements for safe DOM manipulation
-function disableScript( elem ) {
-	elem.type = (jQuery.find.attr( elem, "type" ) !== null) + "/" + elem.type;
-	return elem;
-}
-function restoreScript( elem ) {
-	var match = rscriptTypeMasked.exec( elem.type );
-	if ( match ) {
-		elem.type = match[1];
-	} else {
-		elem.removeAttribute("type");
-	}
-	return elem;
-}
-
-// Mark scripts as having already been evaluated
-function setGlobalEval( elems, refElements ) {
-	var elem,
-		i = 0;
-	for ( ; (elem = elems[i]) != null; i++ ) {
-		jQuery._data( elem, "globalEval", !refElements || jQuery._data( refElements[i], "globalEval" ) );
-	}
-}
-
-function cloneCopyEvent( src, dest ) {
-
-	if ( dest.nodeType !== 1 || !jQuery.hasData( src ) ) {
-		return;
-	}
-
-	var type, i, l,
-		oldData = jQuery._data( src ),
-		curData = jQuery._data( dest, oldData ),
-		events = oldData.events;
-
-	if ( events ) {
-		delete curData.handle;
-		curData.events = {};
-
-		for ( type in events ) {
-			for ( i = 0, l = events[ type ].length; i < l; i++ ) {
-				jQuery.event.add( dest, type, events[ type ][ i ] );
-			}
-		}
-	}
-
-	// make the cloned public data object a copy from the original
-	if ( curData.data ) {
-		curData.data = jQuery.extend( {}, curData.data );
-	}
-}
-
-function fixCloneNodeIssues( src, dest ) {
-	var nodeName, e, data;
-
-	// We do not need to do anything for non-Elements
-	if ( dest.nodeType !== 1 ) {
-		return;
-	}
-
-	nodeName = dest.nodeName.toLowerCase();
-
-	// IE6-8 copies events bound via attachEvent when using cloneNode.
-	if ( !support.noCloneEvent && dest[ jQuery.expando ] ) {
-		data = jQuery._data( dest );
-
-		for ( e in data.events ) {
-			jQuery.removeEvent( dest, e, data.handle );
-		}
-
-		// Event data gets referenced instead of copied if the expando gets copied too
-		dest.removeAttribute( jQuery.expando );
-	}
-
-	// IE blanks contents when cloning scripts, and tries to evaluate newly-set text
-	if ( nodeName === "script" && dest.text !== src.text ) {
-		disableScript( dest ).text = src.text;
-		restoreScript( dest );
-
-	// IE6-10 improperly clones children of object elements using classid.
-	// IE10 throws NoModificationAllowedError if parent is null, #12132.
-	} else if ( nodeName === "object" ) {
-		if ( dest.parentNode ) {
-			dest.outerHTML = src.outerHTML;
-		}
-
-		// This path appears unavoidable for IE9. When cloning an object
-		// element in IE9, the outerHTML strategy above is not sufficient.
-		// If the src has innerHTML and the destination does not,
-		// copy the src.innerHTML into the dest.innerHTML. #10324
-		if ( support.html5Clone && ( src.innerHTML && !jQuery.trim(dest.innerHTML) ) ) {
-			dest.innerHTML = src.innerHTML;
-		}
-
-	} else if ( nodeName === "input" && rcheckableType.test( src.type ) ) {
-		// IE6-8 fails to persist the checked state of a cloned checkbox
-		// or radio button. Worse, IE6-7 fail to give the cloned element
-		// a checked appearance if the defaultChecked value isn't also set
-
-		dest.defaultChecked = dest.checked = src.checked;
-
-		// IE6-7 get confused and end up setting the value of a cloned
-		// checkbox/radio button to an empty string instead of "on"
-		if ( dest.value !== src.value ) {
-			dest.value = src.value;
-		}
-
-	// IE6-8 fails to return the selected option to the default selected
-	// state when cloning options
-	} else if ( nodeName === "option" ) {
-		dest.defaultSelected = dest.selected = src.defaultSelected;
-
-	// IE6-8 fails to set the defaultValue to the correct value when
-	// cloning other types of input fields
-	} else if ( nodeName === "input" || nodeName === "textarea" ) {
-		dest.defaultValue = src.defaultValue;
-	}
-}
-
-jQuery.extend({
-	clone: function( elem, dataAndEvents, deepDataAndEvents ) {
-		var destElements, node, clone, i, srcElements,
-			inPage = jQuery.contains( elem.ownerDocument, elem );
-
-		if ( support.html5Clone || jQuery.isXMLDoc(elem) || !rnoshimcache.test( "<" + elem.nodeName + ">" ) ) {
-			clone = elem.cloneNode( true );
-
-		// IE<=8 does not properly clone detached, unknown element nodes
-		} else {
-			fragmentDiv.innerHTML = elem.outerHTML;
-			fragmentDiv.removeChild( clone = fragmentDiv.firstChild );
-		}
-
-		if ( (!support.noCloneEvent || !support.noCloneChecked) &&
-				(elem.nodeType === 1 || elem.nodeType === 11) && !jQuery.isXMLDoc(elem) ) {
-
-			// We eschew Sizzle here for performance reasons: http://jsperf.com/getall-vs-sizzle/2
-			destElements = getAll( clone );
-			srcElements = getAll( elem );
-
-			// Fix all IE cloning issues
-			for ( i = 0; (node = srcElements[i]) != null; ++i ) {
-				// Ensure that the destination node is not null; Fixes #9587
-				if ( destElements[i] ) {
-					fixCloneNodeIssues( node, destElements[i] );
-				}
-			}
-		}
-
-		// Copy the events from the original to the clone
-		if ( dataAndEvents ) {
-			if ( deepDataAndEvents ) {
-				srcElements = srcElements || getAll( elem );
-				destElements = destElements || getAll( clone );
-
-				for ( i = 0; (node = srcElements[i]) != null; i++ ) {
-					cloneCopyEvent( node, destElements[i] );
-				}
-			} else {
-				cloneCopyEvent( elem, clone );
-			}
-		}
-
-		// Preserve script evaluation history
-		destElements = getAll( clone, "script" );
-		if ( destElements.length > 0 ) {
-			setGlobalEval( destElements, !inPage && getAll( elem, "script" ) );
-		}
-
-		destElements = srcElements = node = null;
-
-		// Return the cloned set
-		return clone;
-	},
-
-	buildFragment: function( elems, context, scripts, selection ) {
-		var j, elem, contains,
-			tmp, tag, tbody, wrap,
-			l = elems.length,
-
-			// Ensure a safe fragment
-			safe = createSafeFragment( context ),
-
-			nodes = [],
-			i = 0;
-
-		for ( ; i < l; i++ ) {
-			elem = elems[ i ];
-
-			if ( elem || elem === 0 ) {
-
-				// Add nodes directly
-				if ( jQuery.type( elem ) === "object" ) {
-					jQuery.merge( nodes, elem.nodeType ? [ elem ] : elem );
-
-				// Convert non-html into a text node
-				} else if ( !rhtml.test( elem ) ) {
-					nodes.push( context.createTextNode( elem ) );
-
-				// Convert html into DOM nodes
-				} else {
-					tmp = tmp || safe.appendChild( context.createElement("div") );
-
-					// Deserialize a standard representation
-					tag = (rtagName.exec( elem ) || [ "", "" ])[ 1 ].toLowerCase();
-					wrap = wrapMap[ tag ] || wrapMap._default;
-
-					tmp.innerHTML = wrap[1] + elem.replace( rxhtmlTag, "<$1></$2>" ) + wrap[2];
-
-					// Descend through wrappers to the right content
-					j = wrap[0];
-					while ( j-- ) {
-						tmp = tmp.lastChild;
-					}
-
-					// Manually add leading whitespace removed by IE
-					if ( !support.leadingWhitespace && rleadingWhitespace.test( elem ) ) {
-						nodes.push( context.createTextNode( rleadingWhitespace.exec( elem )[0] ) );
-					}
-
-					// Remove IE's autoinserted <tbody> from table fragments
-					if ( !support.tbody ) {
-
-						// String was a <table>, *may* have spurious <tbody>
-						elem = tag === "table" && !rtbody.test( elem ) ?
-							tmp.firstChild :
-
-							// String was a bare <thead> or <tfoot>
-							wrap[1] === "<table>" && !rtbody.test( elem ) ?
-								tmp :
-								0;
-
-						j = elem && elem.childNodes.length;
-						while ( j-- ) {
-							if ( jQuery.nodeName( (tbody = elem.childNodes[j]), "tbody" ) && !tbody.childNodes.length ) {
-								elem.removeChild( tbody );
-							}
-						}
-					}
-
-					jQuery.merge( nodes, tmp.childNodes );
-
-					// Fix #12392 for WebKit and IE > 9
-					tmp.textContent = "";
-
-					// Fix #12392 for oldIE
-					while ( tmp.firstChild ) {
-						tmp.removeChild( tmp.firstChild );
-					}
-
-					// Remember the top-level container for proper cleanup
-					tmp = safe.lastChild;
-				}
-			}
-		}
-
-		// Fix #11356: Clear elements from fragment
-		if ( tmp ) {
-			safe.removeChild( tmp );
-		}
-
-		// Reset defaultChecked for any radios and checkboxes
-		// about to be appended to the DOM in IE 6/7 (#8060)
-		if ( !support.appendChecked ) {
-			jQuery.grep( getAll( nodes, "input" ), fixDefaultChecked );
-		}
-
-		i = 0;
-		while ( (elem = nodes[ i++ ]) ) {
-
-			// #4087 - If origin and destination elements are the same, and this is
-			// that element, do not do anything
-			if ( selection && jQuery.inArray( elem, selection ) !== -1 ) {
-				continue;
-			}
-
-			contains = jQuery.contains( elem.ownerDocument, elem );
-
-			// Append to fragment
-			tmp = getAll( safe.appendChild( elem ), "script" );
-
-			// Preserve script evaluation history
-			if ( contains ) {
-				setGlobalEval( tmp );
-			}
-
-			// Capture executables
-			if ( scripts ) {
-				j = 0;
-				while ( (elem = tmp[ j++ ]) ) {
-					if ( rscriptType.test( elem.type || "" ) ) {
-						scripts.push( elem );
-					}
-				}
-			}
-		}
-
-		tmp = null;
-
-		return safe;
-	},
-
-	cleanData: function( elems, /* internal */ acceptData ) {
-		var elem, type, id, data,
-			i = 0,
-			internalKey = jQuery.expando,
-			cache = jQuery.cache,
-			deleteExpando = support.deleteExpando,
-			special = jQuery.event.special;
-
-		for ( ; (elem = elems[i]) != null; i++ ) {
-			if ( acceptData || jQuery.acceptData( elem ) ) {
-
-				id = elem[ internalKey ];
-				data = id && cache[ id ];
-
-				if ( data ) {
-					if ( data.events ) {
-						for ( type in data.events ) {
-							if ( special[ type ] ) {
-								jQuery.event.remove( elem, type );
-
-							// This is a shortcut to avoid jQuery.event.remove's overhead
-							} else {
-								jQuery.removeEvent( elem, type, data.handle );
-							}
-						}
-					}
-
-					// Remove cache only if it was not already removed by jQuery.event.remove
-					if ( cache[ id ] ) {
-
-						delete cache[ id ];
-
-						// IE does not allow us to delete expando properties from nodes,
-						// nor does it have a removeAttribute function on Document nodes;
-						// we must handle all of these cases
-						if ( deleteExpando ) {
-							delete elem[ internalKey ];
-
-						} else if ( typeof elem.removeAttribute !== strundefined ) {
-							elem.removeAttribute( internalKey );
-
-						} else {
-							elem[ internalKey ] = null;
-						}
-
-						deletedIds.push( id );
-					}
-				}
-			}
-		}
-	}
-});
-
-jQuery.fn.extend({
-	text: function( value ) {
-		return access( this, function( value ) {
-			return value === undefined ?
-				jQuery.text( this ) :
-				this.empty().append( ( this[0] && this[0].ownerDocument || document ).createTextNode( value ) );
-		}, null, value, arguments.length );
-	},
-
-	append: function() {
-		return this.domManip( arguments, function( elem ) {
-			if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) {
-				var target = manipulationTarget( this, elem );
-				target.appendChild( elem );
-			}
-		});
-	},
-
-	prepend: function() {
-		return this.domManip( arguments, function( elem ) {
-			if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) {
-				var target = manipulationTarget( this, elem );
-				target.insertBefore( elem, target.firstChild );
-			}
-		});
-	},
-
-	before: function() {
-		return this.domManip( arguments, function( elem ) {
-			if ( this.parentNode ) {
-				this.parentNode.insertBefore( elem, this );
-			}
-		});
-	},
-
-	after: function() {
-		return this.domManip( arguments, function( elem ) {
-			if ( this.parentNode ) {
-				this.parentNode.insertBefore( elem, this.nextSibling );
-			}
-		});
-	},
-
-	remove: function( selector, keepData /* Internal Use Only */ ) {
-		var elem,
-			elems = selector ? jQuery.filter( selector, this ) : this,
-			i = 0;
-
-		for ( ; (elem = elems[i]) != null; i++ ) {
-
-			if ( !keepData && elem.nodeType === 1 ) {
-				jQuery.cleanData( getAll( elem ) );
-			}
-
-			if ( elem.parentNode ) {
-				if ( keepData && jQuery.contains( elem.ownerDocument, elem ) ) {
-					setGlobalEval( getAll( elem, "script" ) );
-				}
-				elem.parentNode.removeChild( elem );
-			}
-		}
-
-		return this;
-	},
-
-	empty: function() {
-		var elem,
-			i = 0;
-
-		for ( ; (elem = this[i]) != null; i++ ) {
-			// Remove element nodes and prevent memory leaks
-			if ( elem.nodeType === 1 ) {
-				jQuery.cleanData( getAll( elem, false ) );
-			}
-
-			// Remove any remaining nodes
-			while ( elem.firstChild ) {
-				elem.removeChild( elem.firstChild );
-			}
-
-			// If this is a select, ensure that it displays empty (#12336)
-			// Support: IE<9
-			if ( elem.options && jQuery.nodeName( elem, "select" ) ) {
-				elem.options.length = 0;
-			}
-		}
-
-		return this;
-	},
-
-	clone: function( dataAndEvents, deepDataAndEvents ) {
-		dataAndEvents = dataAndEvents == null ? false : dataAndEvents;
-		deepDataAndEvents = deepDataAndEvents == null ? dataAndEvents : deepDataAndEvents;
-
-		return this.map(function() {
-			return jQuery.clone( this, dataAndEvents, deepDataAndEvents );
-		});
-	},
-
-	html: function( value ) {
-		return access( this, function( value ) {
-			var elem = this[ 0 ] || {},
-				i = 0,
-				l = this.length;
-
-			if ( value === undefined ) {
-				return elem.nodeType === 1 ?
-					elem.innerHTML.replace( rinlinejQuery, "" ) :
-					undefined;
-			}
-
-			// See if we can take a shortcut and just use innerHTML
-			if ( typeof value === "string" && !rnoInnerhtml.test( value ) &&
-				( support.htmlSerialize || !rnoshimcache.test( value )  ) &&
-				( support.leadingWhitespace || !rleadingWhitespace.test( value ) ) &&
-				!wrapMap[ (rtagName.exec( value ) || [ "", "" ])[ 1 ].toLowerCase() ] ) {
-
-				value = value.replace( rxhtmlTag, "<$1></$2>" );
-
-				try {
-					for (; i < l; i++ ) {
-						// Remove element nodes and prevent memory leaks
-						elem = this[i] || {};
-						if ( elem.nodeType === 1 ) {
-							jQuery.cleanData( getAll( elem, false ) );
-							elem.innerHTML = value;
-						}
-					}
-
-					elem = 0;
-
-				// If using innerHTML throws an exception, use the fallback method
-				} catch(e) {}
-			}
-
-			if ( elem ) {
-				this.empty().append( value );
-			}
-		}, null, value, arguments.length );
-	},
-
-	replaceWith: function() {
-		var arg = arguments[ 0 ];
-
-		// Make the changes, replacing each context element with the new content
-		this.domManip( arguments, function( elem ) {
-			arg = this.parentNode;
-
-			jQuery.cleanData( getAll( this ) );
-
-			if ( arg ) {
-				arg.replaceChild( elem, this );
-			}
-		});
-
-		// Force removal if there was no new content (e.g., from empty arguments)
-		return arg && (arg.length || arg.nodeType) ? this : this.remove();
-	},
-
-	detach: function( selector ) {
-		return this.remove( selector, true );
-	},
-
-	domManip: function( args, callback ) {
-
-		// Flatten any nested arrays
-		args = concat.apply( [], args );
-
-		var first, node, hasScripts,
-			scripts, doc, fragment,
-			i = 0,
-			l = this.length,
-			set = this,
-			iNoClone = l - 1,
-			value = args[0],
-			isFunction = jQuery.isFunction( value );
-
-		// We can't cloneNode fragments that contain checked, in WebKit
-		if ( isFunction ||
-				( l > 1 && typeof value === "string" &&
-					!support.checkClone && rchecked.test( value ) ) ) {
-			return this.each(function( index ) {
-				var self = set.eq( index );
-				if ( isFunction ) {
-					args[0] = value.call( this, index, self.html() );
-				}
-				self.domManip( args, callback );
-			});
-		}
-
-		if ( l ) {
-			fragment = jQuery.buildFragment( args, this[ 0 ].ownerDocument, false, this );
-			first = fragment.firstChild;
-
-			if ( fragment.childNodes.length === 1 ) {
-				fragment = first;
-			}
-
-			if ( first ) {
-				scripts = jQuery.map( getAll( fragment, "script" ), disableScript );
-				hasScripts = scripts.length;
-
-				// Use the original fragment for the last item instead of the first because it can end up
-				// being emptied incorrectly in certain situations (#8070).
-				for ( ; i < l; i++ ) {
-					node = fragment;
-
-					if ( i !== iNoClone ) {
-						node = jQuery.clone( node, true, true );
-
-						// Keep references to cloned scripts for later restoration
-						if ( hasScripts ) {
-							jQuery.merge( scripts, getAll( node, "script" ) );
-						}
-					}
-
-					callback.call( this[i], node, i );
-				}
-
-				if ( hasScripts ) {
-					doc = scripts[ scripts.length - 1 ].ownerDocument;
-
-					// Reenable scripts
-					jQuery.map( scripts, restoreScript );
-
-					// Evaluate executable scripts on first document insertion
-					for ( i = 0; i < hasScripts; i++ ) {
-						node = scripts[ i ];
-						if ( rscriptType.test( node.type || "" ) &&
-							!jQuery._data( node, "globalEval" ) && jQuery.contains( doc, node ) ) {
-
-							if ( node.src ) {
-								// Optional AJAX dependency, but won't run scripts if not present
-								if ( jQuery._evalUrl ) {
-									jQuery._evalUrl( node.src );
-								}
-							} else {
-								jQuery.globalEval( ( node.text || node.textContent || node.innerHTML || "" ).replace( rcleanScript, "" ) );
-							}
-						}
-					}
-				}
-
-				// Fix #11809: Avoid leaking memory
-				fragment = first = null;
-			}
-		}
-
-		return this;
-	}
-});
-
-jQuery.each({
-	appendTo: "append",
-	prependTo: "prepend",
-	insertBefore: "before",
-	insertAfter: "after",
-	replaceAll: "replaceWith"
-}, function( name, original ) {
-	jQuery.fn[ name ] = function( selector ) {
-		var elems,
-			i = 0,
-			ret = [],
-			insert = jQuery( selector ),
-			last = insert.length - 1;
-
-		for ( ; i <= last; i++ ) {
-			elems = i === last ? this : this.clone(true);
-			jQuery( insert[i] )[ original ]( elems );
-
-			// Modern browsers can apply jQuery collections as arrays, but oldIE needs a .get()
-			push.apply( ret, elems.get() );
-		}
-
-		return this.pushStack( ret );
-	};
-});
-
-
-var iframe,
-	elemdisplay = {};
-
-/**
- * Retrieve the actual display of a element
- * @param {String} name nodeName of the element
- * @param {Object} doc Document object
- */
-// Called only from within defaultDisplay
-function actualDisplay( name, doc ) {
-	var style,
-		elem = jQuery( doc.createElement( name ) ).appendTo( doc.body ),
-
-		// getDefaultComputedStyle might be reliably used only on attached element
-		display = window.getDefaultComputedStyle && ( style = window.getDefaultComputedStyle( elem[ 0 ] ) ) ?
-
-			// Use of this method is a temporary fix (more like optmization) until something better comes along,
-			// since it was removed from specification and supported only in FF
-			style.display : jQuery.css( elem[ 0 ], "display" );
-
-	// We don't have any data stored on the element,
-	// so use "detach" method as fast way to get rid of the element
-	elem.detach();
-
-	return display;
-}
-
-/**
- * Try to determine the default display value of an element
- * @param {String} nodeName
- */
-function defaultDisplay( nodeName ) {
-	var doc = document,
-		display = elemdisplay[ nodeName ];
-
-	if ( !display ) {
-		display = actualDisplay( nodeName, doc );
-
-		// If the simple way fails, read from inside an iframe
-		if ( display === "none" || !display ) {
-
-			// Use the already-created iframe if possible
-			iframe = (iframe || jQuery( "<iframe frameborder='0' width='0' height='0'/>" )).appendTo( doc.documentElement );
-
-			// Always write a new HTML skeleton so Webkit and Firefox don't choke on reuse
-			doc = ( iframe[ 0 ].contentWindow || iframe[ 0 ].contentDocument ).document;
-
-			// Support: IE
-			doc.write();
-			doc.close();
-
-			display = actualDisplay( nodeName, doc );
-			iframe.detach();
-		}
-
-		// Store the correct default display
-		elemdisplay[ nodeName ] = display;
-	}
-
-	return display;
-}
-
-
-(function() {
-	var shrinkWrapBlocksVal;
-
-	support.shrinkWrapBlocks = function() {
-		if ( shrinkWrapBlocksVal != null ) {
-			return shrinkWrapBlocksVal;
-		}
-
-		// Will be changed later if needed.
-		shrinkWrapBlocksVal = false;
-
-		// Minified: var b,c,d
-		var div, body, container;
-
-		body = document.getElementsByTagName( "body" )[ 0 ];
-		if ( !body || !body.style ) {
-			// Test fired too early or in an unsupported environment, exit.
-			return;
-		}
-
-		// Setup
-		div = document.createElement( "div" );
-		container = document.createElement( "div" );
-		container.style.cssText = "position:absolute;border:0;width:0;height:0;top:0;left:-9999px";
-		body.appendChild( container ).appendChild( div );
-
-		// Support: IE6
-		// Check if elements with layout shrink-wrap their children
-		if ( typeof div.style.zoom !== strundefined ) {
-			// Reset CSS: box-sizing; display; margin; border
-			div.style.cssText =
-				// Support: Firefox<29, Android 2.3
-				// Vendor-prefix box-sizing
-				"-webkit-box-sizing:content-box;-moz-box-sizing:content-box;" +
-				"box-sizing:content-box;display:block;margin:0;border:0;" +
-				"padding:1px;width:1px;zoom:1";
-			div.appendChild( document.createElement( "div" ) ).style.width = "5px";
-			shrinkWrapBlocksVal = div.offsetWidth !== 3;
-		}
-
-		body.removeChild( container );
-
-		return shrinkWrapBlocksVal;
-	};
-
-})();
-var rmargin = (/^margin/);
-
-var rnumnonpx = new RegExp( "^(" + pnum + ")(?!px)[a-z%]+$", "i" );
-
-
-
-var getStyles, curCSS,
-	rposition = /^(top|right|bottom|left)$/;
-
-if ( window.getComputedStyle ) {
-	getStyles = function( elem ) {
-		return elem.ownerDocument.defaultView.getComputedStyle( elem, null );
-	};
-
-	curCSS = function( elem, name, computed ) {
-		var width, minWidth, maxWidth, ret,
-			style = elem.style;
-
-		computed = computed || getStyles( elem );
-
-		// getPropertyValue is only needed for .css('filter') in IE9, see #12537
-		ret = computed ? computed.getPropertyValue( name ) || computed[ name ] : undefined;
-
-		if ( computed ) {
-
-			if ( ret === "" && !jQuery.contains( elem.ownerDocument, elem ) ) {
-				ret = jQuery.style( elem, name );
-			}
-
-			// A tribute to the "awesome hack by Dean Edwards"
-			// Chrome < 17 and Safari 5.0 uses "computed value" instead of "used value" for margin-right
-			// Safari 5.1.7 (at least) returns percentage for a larger set of values, but width seems to be reliably pixels
-			// this is against the CSSOM draft spec: http://dev.w3.org/csswg/cssom/#resolved-values
-			if ( rnumnonpx.test( ret ) && rmargin.test( name ) ) {
-
-				// Remember the original values
-				width = style.width;
-				minWidth = style.minWidth;
-				maxWidth = style.maxWidth;
-
-				// Put in the new values to get a computed value out
-				style.minWidth = style.maxWidth = style.width = ret;
-				ret = computed.width;
-
-				// Revert the changed values
-				style.width = width;
-				style.minWidth = minWidth;
-				style.maxWidth = maxWidth;
-			}
-		}
-
-		// Support: IE
-		// IE returns zIndex value as an integer.
-		return ret === undefined ?
-			ret :
-			ret + "";
-	};
-} else if ( document.documentElement.currentStyle ) {
-	getStyles = function( elem ) {
-		return elem.currentStyle;
-	};
-
-	curCSS = function( elem, name, computed ) {
-		var left, rs, rsLeft, ret,
-			style = elem.style;
-
-		computed = computed || getStyles( elem );
-		ret = computed ? computed[ name ] : undefined;
-
-		// Avoid setting ret to empty string here
-		// so we don't default to auto
-		if ( ret == null && style && style[ name ] ) {
-			ret = style[ name ];
-		}
-
-		// From the awesome hack by Dean Edwards
-		// http://erik.eae.net/archives/2007/07/27/18.54.15/#comment-102291
-
-		// If we're not dealing with a regular pixel number
-		// but a number that has a weird ending, we need to convert it to pixels
-		// but not position css attributes, as those are proportional to the parent element instead
-		// and we can't measure the parent instead because it might trigger a "stacking dolls" problem
-		if ( rnumnonpx.test( ret ) && !rposition.test( name ) ) {
-
-			// Remember the original values
-			left = style.left;
-			rs = elem.runtimeStyle;
-			rsLeft = rs && rs.left;
-
-			// Put in the new values to get a computed value out
-			if ( rsLeft ) {
-				rs.left = elem.currentStyle.left;
-			}
-			style.left = name === "fontSize" ? "1em" : ret;
-			ret = style.pixelLeft + "px";
-
-			// Revert the changed values
-			style.left = left;
-			if ( rsLeft ) {
-				rs.left = rsLeft;
-			}
-		}
-
-		// Support: IE
-		// IE returns zIndex value as an integer.
-		return ret === undefined ?
-			ret :
-			ret + "" || "auto";
-	};
-}
-
-
-
-
-function addGetHookIf( conditionFn, hookFn ) {
-	// Define the hook, we'll check on the first run if it's really needed.
-	return {
-		get: function() {
-			var condition = conditionFn();
-
-			if ( condition == null ) {
-				// The test was not ready at this point; screw the hook this time
-				// but check again when needed next time.
-				return;
-			}
-
-			if ( condition ) {
-				// Hook not needed (or it's not possible to use it due to missing dependency),
-				// remove it.
-				// Since there are no other hooks for marginRight, remove the whole object.
-				delete this.get;
-				return;
-			}
-
-			// Hook needed; redefine it so that the support test is not executed again.
-
-			return (this.get = hookFn).apply( this, arguments );
-		}
-	};
-}
-
-
-(function() {
-	// Minified: var b,c,d,e,f,g, h,i
-	var div, style, a, pixelPositionVal, boxSizingReliableVal,
-		reliableHiddenOffsetsVal, reliableMarginRightVal;
-
-	// Setup
-	div = document.createElement( "div" );
-	div.innerHTML = "  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>";
-	a = div.getElementsByTagName( "a" )[ 0 ];
-	style = a && a.style;
-
-	// Finish early in limited (non-browser) environments
-	if ( !style ) {
-		return;
-	}
-
-	style.cssText = "float:left;opacity:.5";
-
-	// Support: IE<9
-	// Make sure that element opacity exists (as opposed to filter)
-	support.opacity = style.opacity === "0.5";
-
-	// Verify style float existence
-	// (IE uses styleFloat instead of cssFloat)
-	support.cssFloat = !!style.cssFloat;
-
-	div.style.backgroundClip = "content-box";
-	div.cloneNode( true ).style.backgroundClip = "";
-	support.clearCloneStyle = div.style.backgroundClip === "content-box";
-
-	// Support: Firefox<29, Android 2.3
-	// Vendor-prefix box-sizing
-	support.boxSizing = style.boxSizing === "" || style.MozBoxSizing === "" ||
-		style.WebkitBoxSizing === "";
-
-	jQuery.extend(support, {
-		reliableHiddenOffsets: function() {
-			if ( reliableHiddenOffsetsVal == null ) {
-				computeStyleTests();
-			}
-			return reliableHiddenOffsetsVal;
-		},
-
-		boxSizingReliable: function() {
-			if ( boxSizingReliableVal == null ) {
-				computeStyleTests();
-			}
-			return boxSizingReliableVal;
-		},
-
-		pixelPosition: function() {
-			if ( pixelPositionVal == null ) {
-				computeStyleTests();
-			}
-			return pixelPositionVal;
-		},
-
-		// Support: Android 2.3
-		reliableMarginRight: function() {
-			if ( reliableMarginRightVal == null ) {
-				computeStyleTests();
-			}
-			return reliableMarginRightVal;
-		}
-	});
-
-	function computeStyleTests() {
-		// Minified: var b,c,d,j
-		var div, body, container, contents;
-
-		body = document.getElementsByTagName( "body" )[ 0 ];
-		if ( !body || !body.style ) {
-			// Test fired too early or in an unsupported environment, exit.
-			return;
-		}
-
-		// Setup
-		div = document.createElement( "div" );
-		container = document.createElement( "div" );
-		container.style.cssText = "position:absolute;border:0;width:0;height:0;top:0;left:-9999px";
-		body.appendChild( container ).appendChild( div );
-
-		div.style.cssText =
-			// Support: Firefox<29, Android 2.3
-			// Vendor-prefix box-sizing
-			"-webkit-box-sizing:border-box;-moz-box-sizing:border-box;" +
-			"box-sizing:border-box;display:block;margin-top:1%;top:1%;" +
-			"border:1px;padding:1px;width:4px;position:absolute";
-
-		// Support: IE<9
-		// Assume reasonable values in the absence of getComputedStyle
-		pixelPositionVal = boxSizingReliableVal = false;
-		reliableMarginRightVal = true;
-
-		// Check for getComputedStyle so that this code is not run in IE<9.
-		if ( window.getComputedStyle ) {
-			pixelPositionVal = ( window.getComputedStyle( div, null ) || {} ).top !== "1%";
-			boxSizingReliableVal =
-				( window.getComputedStyle( div, null ) || { width: "4px" } ).width === "4px";
-
-			// Support: Android 2.3
-			// Div with explicit width and no margin-right incorrectly
-			// gets computed margin-right based on width of container (#3333)
-			// WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right
-			contents = div.appendChild( document.createElement( "div" ) );
-
-			// Reset CSS: box-sizing; display; margin; border; padding
-			contents.style.cssText = div.style.cssText =
-				// Support: Firefox<29, Android 2.3
-				// Vendor-prefix box-sizing
-				"-webkit-box-sizing:content-box;-moz-box-sizing:content-box;" +
-				"box-sizing:content-box;display:block;margin:0;border:0;padding:0";
-			contents.style.marginRight = contents.style.width = "0";
-			div.style.width = "1px";
-
-			reliableMarginRightVal =
-				!parseFloat( ( window.getComputedStyle( contents, null ) || {} ).marginRight );
-		}
-
-		// Support: IE8
-		// Check if table cells still have offsetWidth/Height when they are set
-		// to display:none and there are still other visible table cells in a
-		// table row; if so, offsetWidth/Height are not reliable for use when
-		// determining if an element has been hidden directly using
-		// display:none (it is still safe to use offsets if a parent element is
-		// hidden; don safety goggles and see bug #4512 for more information).
-		div.innerHTML = "<table><tr><td></td><td>t</td></tr></table>";
-		contents = div.getElementsByTagName( "td" );
-		contents[ 0 ].style.cssText = "margin:0;border:0;padding:0;display:none";
-		reliableHiddenOffsetsVal = contents[ 0 ].offsetHeight === 0;
-		if ( reliableHiddenOffsetsVal ) {
-			contents[ 0 ].style.display = "";
-			contents[ 1 ].style.display = "none";
-			reliableHiddenOffsetsVal = contents[ 0 ].offsetHeight === 0;
-		}
-
-		body.removeChild( container );
-	}
-
-})();
-
-
-// A method for quickly swapping in/out CSS properties to get correct calculations.
-jQuery.swap = function( elem, options, callback, args ) {
-	var ret, name,
-		old = {};
-
-	// Remember the old values, and insert the new ones
-	for ( name in options ) {
-		old[ name ] = elem.style[ name ];
-		elem.style[ name ] = options[ name ];
-	}
-
-	ret = callback.apply( elem, args || [] );
-
-	// Revert the old values
-	for ( name in options ) {
-		elem.style[ name ] = old[ name ];
-	}
-
-	return ret;
-};
-
-
-var
-		ralpha = /alpha\([^)]*\)/i,
-	ropacity = /opacity\s*=\s*([^)]*)/,
-
-	// swappable if display is none or starts with table except "table", "table-cell", or "table-caption"
-	// see here for display values: https://developer.mozilla.org/en-US/docs/CSS/display
-	rdisplayswap = /^(none|table(?!-c[ea]).+)/,
-	rnumsplit = new RegExp( "^(" + pnum + ")(.*)$", "i" ),
-	rrelNum = new RegExp( "^([+-])=(" + pnum + ")", "i" ),
-
-	cssShow = { position: "absolute", visibility: "hidden", display: "block" },
-	cssNormalTransform = {
-		letterSpacing: "0",
-		fontWeight: "400"
-	},
-
-	cssPrefixes = [ "Webkit", "O", "Moz", "ms" ];
-
-
-// return a css property mapped to a potentially vendor prefixed property
-function vendorPropName( style, name ) {
-
-	// shortcut for names that are not vendor prefixed
-	if ( name in style ) {
-		return name;
-	}
-
-	// check for vendor prefixed names
-	var capName = name.charAt(0).toUpperCase() + name.slice(1),
-		origName = name,
-		i = cssPrefixes.length;
-
-	while ( i-- ) {
-		name = cssPrefixes[ i ] + capName;
-		if ( name in style ) {
-			return name;
-		}
-	}
-
-	return origName;
-}
-
-function showHide( elements, show ) {
-	var display, elem, hidden,
-		values = [],
-		index = 0,
-		length = elements.length;
-
-	for ( ; index < length; index++ ) {
-		elem = elements[ index ];
-		if ( !elem.style ) {
-			continue;
-		}
-
-		values[ index ] = jQuery._data( elem, "olddisplay" );
-		display = elem.style.display;
-		if ( show ) {
-			// Reset the inline display of this element to learn if it is
-			// being hidden by cascaded rules or not
-			if ( !values[ index ] && display === "none" ) {
-				elem.style.display = "";
-			}
-
-			// Set elements which have been overridden with display: none
-			// in a stylesheet to whatever the default browser style is
-			// for such an element
-			if ( elem.style.display === "" && isHidden( elem ) ) {
-				values[ index ] = jQuery._data( elem, "olddisplay", defaultDisplay(elem.nodeName) );
-			}
-		} else {
-			hidden = isHidden( elem );
-
-			if ( display && display !== "none" || !hidden ) {
-				jQuery._data( elem, "olddisplay", hidden ? display : jQuery.css( elem, "display" ) );
-			}
-		}
-	}
-
-	// Set the display of most of the elements in a second loop
-	// to avoid the constant reflow
-	for ( index = 0; index < length; index++ ) {
-		elem = elements[ index ];
-		if ( !elem.style ) {
-			continue;
-		}
-		if ( !show || elem.style.display === "none" || elem.style.display === "" ) {
-			elem.style.display = show ? values[ index ] || "" : "none";
-		}
-	}
-
-	return elements;
-}
-
-function setPositiveNumber( elem, value, subtract ) {
-	var matches = rnumsplit.exec( value );
-	return matches ?
-		// Guard against undefined "subtract", e.g., when used as in cssHooks
-		Math.max( 0, matches[ 1 ] - ( subtract || 0 ) ) + ( matches[ 2 ] || "px" ) :
-		value;
-}
-
-function augmentWidthOrHeight( elem, name, extra, isBorderBox, styles ) {
-	var i = extra === ( isBorderBox ? "border" : "content" ) ?
-		// If we already have the right measurement, avoid augmentation
-		4 :
-		// Otherwise initialize for horizontal or vertical properties
-		name === "width" ? 1 : 0,
-
-		val = 0;
-
-	for ( ; i < 4; i += 2 ) {
-		// both box models exclude margin, so add it if we want it
-		if ( extra === "margin" ) {
-			val += jQuery.css( elem, extra + cssExpand[ i ], true, styles );
-		}
-
-		if ( isBorderBox ) {
-			// border-box includes padding, so remove it if we want content
-			if ( extra === "content" ) {
-				val -= jQuery.css( elem, "padding" + cssExpand[ i ], true, styles );
-			}
-
-			// at this point, extra isn't border nor margin, so remove border
-			if ( extra !== "margin" ) {
-				val -= jQuery.css( elem, "border" + cssExpand[ i ] + "Width", true, styles );
-			}
-		} else {
-			// at this point, extra isn't content, so add padding
-			val += jQuery.css( elem, "padding" + cssExpand[ i ], true, styles );
-
-			// at this point, extra isn't content nor padding, so add border
-			if ( extra !== "padding" ) {
-				val += jQuery.css( elem, "border" + cssExpand[ i ] + "Width", true, styles );
-			}
-		}
-	}
-
-	return val;
-}
-
-function getWidthOrHeight( elem, name, extra ) {
-
-	// Start with offset property, which is equivalent to the border-box value
-	var valueIsBorderBox = true,
-		val = name === "width" ? elem.offsetWidth : elem.offsetHeight,
-		styles = getStyles( elem ),
-		isBorderBox = support.boxSizing && jQuery.css( elem, "boxSizing", false, styles ) === "border-box";
-
-	// some non-html elements return undefined for offsetWidth, so check for null/undefined
-	// svg - https://bugzilla.mozilla.org/show_bug.cgi?id=649285
-	// MathML - https://bugzilla.mozilla.org/show_bug.cgi?id=491668
-	if ( val <= 0 || val == null ) {
-		// Fall back to computed then uncomputed css if necessary
-		val = curCSS( elem, name, styles );
-		if ( val < 0 || val == null ) {
-			val = elem.style[ name ];
-		}
-
-		// Computed unit is not pixels. Stop here and return.
-		if ( rnumnonpx.test(val) ) {
-			return val;
-		}
-
-		// we need the check for style in case a browser which returns unreliable values
-		// for getComputedStyle silently falls back to the reliable elem.style
-		valueIsBorderBox = isBorderBox && ( support.boxSizingReliable() || val === elem.style[ name ] );
-
-		// Normalize "", auto, and prepare for extra
-		val = parseFloat( val ) || 0;
-	}
-
-	// use the active box-sizing model to add/subtract irrelevant styles
-	return ( val +
-		augmentWidthOrHeight(
-			elem,
-			name,
-			extra || ( isBorderBox ? "border" : "content" ),
-			valueIsBorderBox,
-			styles
-		)
-	) + "px";
-}
-
-jQuery.extend({
-	// Add in style property hooks for overriding the default
-	// behavior of getting and setting a style property
-	cssHooks: {
-		opacity: {
-			get: function( elem, computed ) {
-				if ( computed ) {
-					// We should always get a number back from opacity
-					var ret = curCSS( elem, "opacity" );
-					return ret === "" ? "1" : ret;
-				}
-			}
-		}
-	},
-
-	// Don't automatically add "px" to these possibly-unitless properties
-	cssNumber: {
-		"columnCount": true,
-		"fillOpacity": true,
-		"flexGrow": true,
-		"flexShrink": true,
-		"fontWeight": true,
-		"lineHeight": true,
-		"opacity": true,
-		"order": true,
-		"orphans": true,
-		"widows": true,
-		"zIndex": true,
-		"zoom": true
-	},
-
-	// Add in properties whose names you wish to fix before
-	// setting or getting the value
-	cssProps: {
-		// normalize float css property
-		"float": support.cssFloat ? "cssFloat" : "styleFloat"
-	},
-
-	// Get and set the style property on a DOM Node
-	style: function( elem, name, value, extra ) {
-		// Don't set styles on text and comment nodes
-		if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 || !elem.style ) {
-			return;
-		}
-
-		// Make sure that we're working with the right name
-		var ret, type, hooks,
-			origName = jQuery.camelCase( name ),
-			style = elem.style;
-
-		name = jQuery.cssProps[ origName ] || ( jQuery.cssProps[ origName ] = vendorPropName( style, origName ) );
-
-		// gets hook for the prefixed version
-		// followed by the unprefixed version
-		hooks = jQuery.cssHooks[ name ] || jQuery.cssHooks[ origName ];
-
-		// Check if we're setting a value
-		if ( value !== undefined ) {
-			type = typeof value;
-
-			// convert relative number strings (+= or -=) to relative numbers. #7345
-			if ( type === "string" && (ret = rrelNum.exec( value )) ) {
-				value = ( ret[1] + 1 ) * ret[2] + parseFloat( jQuery.css( elem, name ) );
-				// Fixes bug #9237
-				type = "number";
-			}
-
-			// Make sure that null and NaN values aren't set. See: #7116
-			if ( value == null || value !== value ) {
-				return;
-			}
-
-			// If a number was passed in, add 'px' to the (except for certain CSS properties)
-			if ( type === "number" && !jQuery.cssNumber[ origName ] ) {
-				value += "px";
-			}
-
-			// Fixes #8908, it can be done more correctly by specifing setters in cssHooks,
-			// but it would mean to define eight (for every problematic property) identical functions
-			if ( !support.clearCloneStyle && value === "" && name.indexOf("background") === 0 ) {
-				style[ name ] = "inherit";
-			}
-
-			// If a hook was provided, use that value, otherwise just set the specified value
-			if ( !hooks || !("set" in hooks) || (value = hooks.set( elem, value, extra )) !== undefined ) {
-
-				// Support: IE
-				// Swallow errors from 'invalid' CSS values (#5509)
-				try {
-					style[ name ] = value;
-				} catch(e) {}
-			}
-
-		} else {
-			// If a hook was provided get the non-computed value from there
-			if ( hooks && "get" in hooks && (ret = hooks.get( elem, false, extra )) !== undefined ) {
-				return ret;
-			}
-
-			// Otherwise just get the value from the style object
-			return style[ name ];
-		}
-	},
-
-	css: function( elem, name, extra, styles ) {
-		var num, val, hooks,
-			origName = jQuery.camelCase( name );
-
-		// Make sure that we're working with the right name
-		name = jQuery.cssProps[ origName ] || ( jQuery.cssProps[ origName ] = vendorPropName( elem.style, origName ) );
-
-		// gets hook for the prefixed version
-		// followed by the unprefixed version
-		hooks = jQuery.cssHooks[ name ] || jQuery.cssHooks[ origName ];
-
-		// If a hook was provided get the computed value from there
-		if ( hooks && "get" in hooks ) {
-			val = hooks.get( elem, true, extra );
-		}
-
-		// Otherwise, if a way to get the computed value exists, use that
-		if ( val === undefined ) {
-			val = curCSS( elem, name, styles );
-		}
-
-		//convert "normal" to computed value
-		if ( val === "normal" && name in cssNormalTransform ) {
-			val = cssNormalTransform[ name ];
-		}
-
-		// Return, converting to number if forced or a qualifier was provided and val looks numeric
-		if ( extra === "" || extra ) {
-			num = parseFloat( val );
-			return extra === true || jQuery.isNumeric( num ) ? num || 0 : val;
-		}
-		return val;
-	}
-});
-
-jQuery.each([ "height", "width" ], function( i, name ) {
-	jQuery.cssHooks[ name ] = {
-		get: function( elem, computed, extra ) {
-			if ( computed ) {
-				// certain elements can have dimension info if we invisibly show them
-				// however, it must have a current display style that would benefit from this
-				return rdisplayswap.test( jQuery.css( elem, "display" ) ) && elem.offsetWidth === 0 ?
-					jQuery.swap( elem, cssShow, function() {
-						return getWidthOrHeight( elem, name, extra );
-					}) :
-					getWidthOrHeight( elem, name, extra );
-			}
-		},
-
-		set: function( elem, value, extra ) {
-			var styles = extra && getStyles( elem );
-			return setPositiveNumber( elem, value, extra ?
-				augmentWidthOrHeight(
-					elem,
-					name,
-					extra,
-					support.boxSizing && jQuery.css( elem, "boxSizing", false, styles ) === "border-box",
-					styles
-				) : 0
-			);
-		}
-	};
-});
-
-if ( !support.opacity ) {
-	jQuery.cssHooks.opacity = {
-		get: function( elem, computed ) {
-			// IE uses filters for opacity
-			return ropacity.test( (computed && elem.currentStyle ? elem.currentStyle.filter : elem.style.filter) || "" ) ?
-				( 0.01 * parseFloat( RegExp.$1 ) ) + "" :
-				computed ? "1" : "";
-		},
-
-		set: function( elem, value ) {
-			var style = elem.style,
-				currentStyle = elem.currentStyle,
-				opacity = jQuery.isNumeric( value ) ? "alpha(opacity=" + value * 100 + ")" : "",
-				filter = currentStyle && currentStyle.filter || style.filter || "";
-
-			// IE has trouble with opacity if it does not have layout
-			// Force it by setting the zoom level
-			style.zoom = 1;
-
-			// if setting opacity to 1, and no other filters exist - attempt to remove filter attribute #6652
-			// if value === "", then remove inline opacity #12685
-			if ( ( value >= 1 || value === "" ) &&
-					jQuery.trim( filter.replace( ralpha, "" ) ) === "" &&
-					style.removeAttribute ) {
-
-				// Setting style.filter to null, "" & " " still leave "filter:" in the cssText
-				// if "filter:" is present at all, clearType is disabled, we want to avoid this
-				// style.removeAttribute is IE Only, but so apparently is this code path...
-				style.removeAttribute( "filter" );
-
-				// if there is no filter style applied in a css rule or unset inline opacity, we are done
-				if ( value === "" || currentStyle && !currentStyle.filter ) {
-					return;
-				}
-			}
-
-			// otherwise, set new filter values
-			style.filter = ralpha.test( filter ) ?
-				filter.replace( ralpha, opacity ) :
-				filter + " " + opacity;
-		}
-	};
-}
-
-jQuery.cssHooks.marginRight = addGetHookIf( support.reliableMarginRight,
-	function( elem, computed ) {
-		if ( computed ) {
-			// WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right
-			// Work around by temporarily setting element display to inline-block
-			return jQuery.swap( elem, { "display": "inline-block" },
-				curCSS, [ elem, "marginRight" ] );
-		}
-	}
-);
-
-// These hooks are used by animate to expand properties
-jQuery.each({
-	margin: "",
-	padding: "",
-	border: "Width"
-}, function( prefix, suffix ) {
-	jQuery.cssHooks[ prefix + suffix ] = {
-		expand: function( value ) {
-			var i = 0,
-				expanded = {},
-
-				// assumes a single number if not a string
-				parts = typeof value === "string" ? value.split(" ") : [ value ];
-
-			for ( ; i < 4; i++ ) {
-				expanded[ prefix + cssExpand[ i ] + suffix ] =
-					parts[ i ] || parts[ i - 2 ] || parts[ 0 ];
-			}
-
-			return expanded;
-		}
-	};
-
-	if ( !rmargin.test( prefix ) ) {
-		jQuery.cssHooks[ prefix + suffix ].set = setPositiveNumber;
-	}
-});
-
-jQuery.fn.extend({
-	css: function( name, value ) {
-		return access( this, function( elem, name, value ) {
-			var styles, len,
-				map = {},
-				i = 0;
-
-			if ( jQuery.isArray( name ) ) {
-				styles = getStyles( elem );
-				len = name.length;
-
-				for ( ; i < len; i++ ) {
-					map[ name[ i ] ] = jQuery.css( elem, name[ i ], false, styles );
-				}
-
-				return map;
-			}
-
-			return value !== undefined ?
-				jQuery.style( elem, name, value ) :
-				jQuery.css( elem, name );
-		}, name, value, arguments.length > 1 );
-	},
-	show: function() {
-		return showHide( this, true );
-	},
-	hide: function() {
-		return showHide( this );
-	},
-	toggle: function( state ) {
-		if ( typeof state === "boolean" ) {
-			return state ? this.show() : this.hide();
-		}
-
-		return this.each(function() {
-			if ( isHidden( this ) ) {
-				jQuery( this ).show();
-			} else {
-				jQuery( this ).hide();
-			}
-		});
-	}
-});
-
-
-function Tween( elem, options, prop, end, easing ) {
-	return new Tween.prototype.init( elem, options, prop, end, easing );
-}
-jQuery.Tween = Tween;
-
-Tween.prototype = {
-	constructor: Tween,
-	init: function( elem, options, prop, end, easing, unit ) {
-		this.elem = elem;
-		this.prop = prop;
-		this.easing = easing || "swing";
-		this.options = options;
-		this.start = this.now = this.cur();
-		this.end = end;
-		this.unit = unit || ( jQuery.cssNumber[ prop ] ? "" : "px" );
-	},
-	cur: function() {
-		var hooks = Tween.propHooks[ this.prop ];
-
-		return hooks && hooks.get ?
-			hooks.get( this ) :
-			Tween.propHooks._default.get( this );
-	},
-	run: function( percent ) {
-		var eased,
-			hooks = Tween.propHooks[ this.prop ];
-
-		if ( this.options.duration ) {
-			this.pos = eased = jQuery.easing[ this.easing ](
-				percent, this.options.duration * percent, 0, 1, this.options.duration
-			);
-		} else {
-			this.pos = eased = percent;
-		}
-		this.now = ( this.end - this.start ) * eased + this.start;
-
-		if ( this.options.step ) {
-			this.options.step.call( this.elem, this.now, this );
-		}
-
-		if ( hooks && hooks.set ) {
-			hooks.set( this );
-		} else {
-			Tween.propHooks._default.set( this );
-		}
-		return this;
-	}
-};
-
-Tween.prototype.init.prototype = Tween.prototype;
-
-Tween.propHooks = {
-	_default: {
-		get: function( tween ) {
-			var result;
-
-			if ( tween.elem[ tween.prop ] != null &&
-				(!tween.elem.style || tween.elem.style[ tween.prop ] == null) ) {
-				return tween.elem[ tween.prop ];
-			}
-
-			// passing an empty string as a 3rd parameter to .css will automatically
-			// attempt a parseFloat and fallback to a string if the parse fails
-			// so, simple values such as "10px" are parsed to Float.
-			// complex values such as "rotate(1rad)" are returned as is.
-			result = jQuery.css( tween.elem, tween.prop, "" );
-			// Empty strings, null, undefined and "auto" are converted to 0.
-			return !result || result === "auto" ? 0 : result;
-		},
-		set: function( tween ) {
-			// use step hook for back compat - use cssHook if its there - use .style if its
-			// available and use plain properties where available
-			if ( jQuery.fx.step[ tween.prop ] ) {
-				jQuery.fx.step[ tween.prop ]( tween );
-			} else if ( tween.elem.style && ( tween.elem.style[ jQuery.cssProps[ tween.prop ] ] != null || jQuery.cssHooks[ tween.prop ] ) ) {
-				jQuery.style( tween.elem, tween.prop, tween.now + tween.unit );
-			} else {
-				tween.elem[ tween.prop ] = tween.now;
-			}
-		}
-	}
-};
-
-// Support: IE <=9
-// Panic based approach to setting things on disconnected nodes
-
-Tween.propHooks.scrollTop = Tween.propHooks.scrollLeft = {
-	set: function( tween ) {
-		if ( tween.elem.nodeType && tween.elem.parentNode ) {
-			tween.elem[ tween.prop ] = tween.now;
-		}
-	}
-};
-
-jQuery.easing = {
-	linear: function( p ) {
-		return p;
-	},
-	swing: function( p ) {
-		return 0.5 - Math.cos( p * Math.PI ) / 2;
-	}
-};
-
-jQuery.fx = Tween.prototype.init;
-
-// Back Compat <1.8 extension point
-jQuery.fx.step = {};
-
-
-
-
-var
-	fxNow, timerId,
-	rfxtypes = /^(?:toggle|show|hide)$/,
-	rfxnum = new RegExp( "^(?:([+-])=|)(" + pnum + ")([a-z%]*)$", "i" ),
-	rrun = /queueHooks$/,
-	animationPrefilters = [ defaultPrefilter ],
-	tweeners = {
-		"*": [ function( prop, value ) {
-			var tween = this.createTween( prop, value ),
-				target = tween.cur(),
-				parts = rfxnum.exec( value ),
-				unit = parts && parts[ 3 ] || ( jQuery.cssNumber[ prop ] ? "" : "px" ),
-
-				// Starting value computation is required for potential unit mismatches
-				start = ( jQuery.cssNumber[ prop ] || unit !== "px" && +target ) &&
-					rfxnum.exec( jQuery.css( tween.elem, prop ) ),
-				scale = 1,
-				maxIterations = 20;
-
-			if ( start && start[ 3 ] !== unit ) {
-				// Trust units reported by jQuery.css
-				unit = unit || start[ 3 ];
-
-				// Make sure we update the tween properties later on
-				parts = parts || [];
-
-				// Iteratively approximate from a nonzero starting point
-				start = +target || 1;
-
-				do {
-					// If previous iteration zeroed out, double until we get *something*
-					// Use a string for doubling factor so we don't accidentally see scale as unchanged below
-					scale = scale || ".5";
-
-					// Adjust and apply
-					start = start / scale;
-					jQuery.style( tween.elem, prop, start + unit );
-
-				// Update scale, tolerating zero or NaN from tween.cur()
-				// And breaking the loop if scale is unchanged or perfect, or if we've just had enough
-				} while ( scale !== (scale = tween.cur() / target) && scale !== 1 && --maxIterations );
-			}
-
-			// Update tween properties
-			if ( parts ) {
-				start = tween.start = +start || +target || 0;
-				tween.unit = unit;
-				// If a +=/-= token was provided, we're doing a relative animation
-				tween.end = parts[ 1 ] ?
-					start + ( parts[ 1 ] + 1 ) * parts[ 2 ] :
-					+parts[ 2 ];
-			}
-
-			return tween;
-		} ]
-	};
-
-// Animations created synchronously will run synchronously
-function createFxNow() {
-	setTimeout(function() {
-		fxNow = undefined;
-	});
-	return ( fxNow = jQuery.now() );
-}
-
-// Generate parameters to create a standard animation
-function genFx( type, includeWidth ) {
-	var which,
-		attrs = { height: type },
-		i = 0;
-
-	// if we include width, step value is 1 to do all cssExpand values,
-	// if we don't include width, step value is 2 to skip over Left and Right
-	includeWidth = includeWidth ? 1 : 0;
-	for ( ; i < 4 ; i += 2 - includeWidth ) {
-		which = cssExpand[ i ];
-		attrs[ "margin" + which ] = attrs[ "padding" + which ] = type;
-	}
-
-	if ( includeWidth ) {
-		attrs.opacity = attrs.width = type;
-	}
-
-	return attrs;
-}
-
-function createTween( value, prop, animation ) {
-	var tween,
-		collection = ( tweeners[ prop ] || [] ).concat( tweeners[ "*" ] ),
-		index = 0,
-		length = collection.length;
-	for ( ; index < length; index++ ) {
-		if ( (tween = collection[ index ].call( animation, prop, value )) ) {
-
-			// we're done with this property
-			return tween;
-		}
-	}
-}
-
-function defaultPrefilter( elem, props, opts ) {
-	/* jshint validthis: true */
-	var prop, value, toggle, tween, hooks, oldfire, display, checkDisplay,
-		anim = this,
-		orig = {},
-		style = elem.style,
-		hidden = elem.nodeType && isHidden( elem ),
-		dataShow = jQuery._data( elem, "fxshow" );
-
-	// handle queue: false promises
-	if ( !opts.queue ) {
-		hooks = jQuery._queueHooks( elem, "fx" );
-		if ( hooks.unqueued == null ) {
-			hooks.unqueued = 0;
-			oldfire = hooks.empty.fire;
-			hooks.empty.fire = function() {
-				if ( !hooks.unqueued ) {
-					oldfire();
-				}
-			};
-		}
-		hooks.unqueued++;
-
-		anim.always(function() {
-			// doing this makes sure that the complete handler will be called
-			// before this completes
-			anim.always(function() {
-				hooks.unqueued--;
-				if ( !jQuery.queue( elem, "fx" ).length ) {
-					hooks.empty.fire();
-				}
-			});
-		});
-	}
-
-	// height/width overflow pass
-	if ( elem.nodeType === 1 && ( "height" in props || "width" in props ) ) {
-		// Make sure that nothing sneaks out
-		// Record all 3 overflow attributes because IE does not
-		// change the overflow attribute when overflowX and
-		// overflowY are set to the same value
-		opts.overflow = [ style.overflow, style.overflowX, style.overflowY ];
-
-		// Set display property to inline-block for height/width
-		// animations on inline elements that are having width/height animated
-		display = jQuery.css( elem, "display" );
-
-		// Test default display if display is currently "none"
-		checkDisplay = display === "none" ?
-			jQuery._data( elem, "olddisplay" ) || defaultDisplay( elem.nodeName ) : display;
-
-		if ( checkDisplay === "inline" && jQuery.css( elem, "float" ) === "none" ) {
-
-			// inline-level elements accept inline-block;
-			// block-level elements need to be inline with layout
-			if ( !support.inlineBlockNeedsLayout || defaultDisplay( elem.nodeName ) === "inline" ) {
-				style.display = "inline-block";
-			} else {
-				style.zoom = 1;
-			}
-		}
-	}
-
-	if ( opts.overflow ) {
-		style.overflow = "hidden";
-		if ( !support.shrinkWrapBlocks() ) {
-			anim.always(function() {
-				style.overflow = opts.overflow[ 0 ];
-				style.overflowX = opts.overflow[ 1 ];
-				style.overflowY = opts.overflow[ 2 ];
-			});
-		}
-	}
-
-	// show/hide pass
-	for ( prop in props ) {
-		value = props[ prop ];
-		if ( rfxtypes.exec( value ) ) {
-			delete props[ prop ];
-			toggle = toggle || value === "toggle";
-			if ( value === ( hidden ? "hide" : "show" ) ) {
-
-				// If there is dataShow left over from a stopped hide or show and we are going to proceed with show, we should pretend to be hidden
-				if ( value === "show" && dataShow && dataShow[ prop ] !== undefined ) {
-					hidden = true;
-				} else {
-					continue;
-				}
-			}
-			orig[ prop ] = dataShow && dataShow[ prop ] || jQuery.style( elem, prop );
-
-		// Any non-fx value stops us from restoring the original display value
-		} else {
-			display = undefined;
-		}
-	}
-
-	if ( !jQuery.isEmptyObject( orig ) ) {
-		if ( dataShow ) {
-			if ( "hidden" in dataShow ) {
-				hidden = dataShow.hidden;
-			}
-		} else {
-			dataShow = jQuery._data( elem, "fxshow", {} );
-		}
-
-		// store state if its toggle - enables .stop().toggle() to "reverse"
-		if ( toggle ) {
-			dataShow.hidden = !hidden;
-		}
-		if ( hidden ) {
-			jQuery( elem ).show();
-		} else {
-			anim.done(function() {
-				jQuery( elem ).hide();
-			});
-		}
-		anim.done(function() {
-			var prop;
-			jQuery._removeData( elem, "fxshow" );
-			for ( prop in orig ) {
-				jQuery.style( elem, prop, orig[ prop ] );
-			}
-		});
-		for ( prop in orig ) {
-			tween = createTween( hidden ? dataShow[ prop ] : 0, prop, anim );
-
-			if ( !( prop in dataShow ) ) {
-				dataShow[ prop ] = tween.start;
-				if ( hidden ) {
-					tween.end = tween.start;
-					tween.start = prop === "width" || prop === "height" ? 1 : 0;
-				}
-			}
-		}
-
-	// If this is a noop like .hide().hide(), restore an overwritten display value
-	} else if ( (display === "none" ? defaultDisplay( elem.nodeName ) : display) === "inline" ) {
-		style.display = display;
-	}
-}
-
-function propFilter( props, specialEasing ) {
-	var index, name, easing, value, hooks;
-
-	// camelCase, specialEasing and expand cssHook pass
-	for ( index in props ) {
-		name = jQuery.camelCase( index );
-		easing = specialEasing[ name ];
-		value = props[ index ];
-		if ( jQuery.isArray( value ) ) {
-			easing = value[ 1 ];
-			value = props[ index ] = value[ 0 ];
-		}
-
-		if ( index !== name ) {
-			props[ name ] = value;
-			delete props[ index ];
-		}
-
-		hooks = jQuery.cssHooks[ name ];
-		if ( hooks && "expand" in hooks ) {
-			value = hooks.expand( value );
-			delete props[ name ];
-
-			// not quite $.extend, this wont overwrite keys already present.
-			// also - reusing 'index' from above because we have the correct "name"
-			for ( index in value ) {
-				if ( !( index in props ) ) {
-					props[ index ] = value[ index ];
-					specialEasing[ index ] = easing;
-				}
-			}
-		} else {
-			specialEasing[ name ] = easing;
-		}
-	}
-}
-
-function Animation( elem, properties, options ) {
-	var result,
-		stopped,
-		index = 0,
-		length = animationPrefilters.length,
-		deferred = jQuery.Deferred().always( function() {
-			// don't match elem in the :animated selector
-			delete tick.elem;
-		}),
-		tick = function() {
-			if ( stopped ) {
-				return false;
-			}
-			var currentTime = fxNow || createFxNow(),
-				remaining = Math.max( 0, animation.startTime + animation.duration - currentTime ),
-				// archaic crash bug won't allow us to use 1 - ( 0.5 || 0 ) (#12497)
-				temp = remaining / animation.duration || 0,
-				percent = 1 - temp,
-				index = 0,
-				length = animation.tweens.length;
-
-			for ( ; index < length ; index++ ) {
-				animation.tweens[ index ].run( percent );
-			}
-
-			deferred.notifyWith( elem, [ animation, percent, remaining ]);
-
-			if ( percent < 1 && length ) {
-				return remaining;
-			} else {
-				deferred.resolveWith( elem, [ animation ] );
-				return false;
-			}
-		},
-		animation = deferred.promise({
-			elem: elem,
-			props: jQuery.extend( {}, properties ),
-			opts: jQuery.extend( true, { specialEasing: {} }, options ),
-			originalProperties: properties,
-			originalOptions: options,
-			startTime: fxNow || createFxNow(),
-			duration: options.duration,
-			tweens: [],
-			createTween: function( prop, end ) {
-				var tween = jQuery.Tween( elem, animation.opts, prop, end,
-						animation.opts.specialEasing[ prop ] || animation.opts.easing );
-				animation.tweens.push( tween );
-				return tween;
-			},
-			stop: function( gotoEnd ) {
-				var index = 0,
-					// if we are going to the end, we want to run all the tweens
-					// otherwise we skip this part
-					length = gotoEnd ? animation.tweens.length : 0;
-				if ( stopped ) {
-					return this;
-				}
-				stopped = true;
-				for ( ; index < length ; index++ ) {
-					animation.tweens[ index ].run( 1 );
-				}
-
-				// resolve when we played the last frame
-				// otherwise, reject
-				if ( gotoEnd ) {
-					deferred.resolveWith( elem, [ animation, gotoEnd ] );
-				} else {
-					deferred.rejectWith( elem, [ animation, gotoEnd ] );
-				}
-				return this;
-			}
-		}),
-		props = animation.props;
-
-	propFilter( props, animation.opts.specialEasing );
-
-	for ( ; index < length ; index++ ) {
-		result = animationPrefilters[ index ].call( animation, elem, props, animation.opts );
-		if ( result ) {
-			return result;
-		}
-	}
-
-	jQuery.map( props, createTween, animation );
-
-	if ( jQuery.isFunction( animation.opts.start ) ) {
-		animation.opts.start.call( elem, animation );
-	}
-
-	jQuery.fx.timer(
-		jQuery.extend( tick, {
-			elem: elem,
-			anim: animation,
-			queue: animation.opts.queue
-		})
-	);
-
-	// attach callbacks from options
-	return animation.progress( animation.opts.progress )
-		.done( animation.opts.done, animation.opts.complete )
-		.fail( animation.opts.fail )
-		.always( animation.opts.always );
-}
-
-jQuery.Animation = jQuery.extend( Animation, {
-	tweener: function( props, callback ) {
-		if ( jQuery.isFunction( props ) ) {
-			callback = props;
-			props = [ "*" ];
-		} else {
-			props = props.split(" ");
-		}
-
-		var prop,
-			index = 0,
-			length = props.length;
-
-		for ( ; index < length ; index++ ) {
-			prop = props[ index ];
-			tweeners[ prop ] = tweeners[ prop ] || [];
-			tweeners[ prop ].unshift( callback );
-		}
-	},
-
-	prefilter: function( callback, prepend ) {
-		if ( prepend ) {
-			animationPrefilters.unshift( callback );
-		} else {
-			animationPrefilters.push( callback );
-		}
-	}
-});
-
-jQuery.speed = function( speed, easing, fn ) {
-	var opt = speed && typeof speed === "object" ? jQuery.extend( {}, speed ) : {
-		complete: fn || !fn && easing ||
-			jQuery.isFunction( speed ) && speed,
-		duration: speed,
-		easing: fn && easing || easing && !jQuery.isFunction( easing ) && easing
-	};
-
-	opt.duration = jQuery.fx.off ? 0 : typeof opt.duration === "number" ? opt.duration :
-		opt.duration in jQuery.fx.speeds ? jQuery.fx.speeds[ opt.duration ] : jQuery.fx.speeds._default;
-
-	// normalize opt.queue - true/undefined/null -> "fx"
-	if ( opt.queue == null || opt.queue === true ) {
-		opt.queue = "fx";
-	}
-
-	// Queueing
-	opt.old = opt.complete;
-
-	opt.complete = function() {
-		if ( jQuery.isFunction( opt.old ) ) {
-			opt.old.call( this );
-		}
-
-		if ( opt.queue ) {
-			jQuery.dequeue( this, opt.queue );
-		}
-	};
-
-	return opt;
-};
-
-jQuery.fn.extend({
-	fadeTo: function( speed, to, easing, callback ) {
-
-		// show any hidden elements after setting opacity to 0
-		return this.filter( isHidden ).css( "opacity", 0 ).show()
-
-			// animate to the value specified
-			.end().animate({ opacity: to }, speed, easing, callback );
-	},
-	animate: function( prop, speed, easing, callback ) {
-		var empty = jQuery.isEmptyObject( prop ),
-			optall = jQuery.speed( speed, easing, callback ),
-			doAnimation = function() {
-				// Operate on a copy of prop so per-property easing won't be lost
-				var anim = Animation( this, jQuery.extend( {}, prop ), optall );
-
-				// Empty animations, or finishing resolves immediately
-				if ( empty || jQuery._data( this, "finish" ) ) {
-					anim.stop( true );
-				}
-			};
-			doAnimation.finish = doAnimation;
-
-		return empty || optall.queue === false ?
-			this.each( doAnimation ) :
-			this.queue( optall.queue, doAnimation );
-	},
-	stop: function( type, clearQueue, gotoEnd ) {
-		var stopQueue = function( hooks ) {
-			var stop = hooks.stop;
-			delete hooks.stop;
-			stop( gotoEnd );
-		};
-
-		if ( typeof type !== "string" ) {
-			gotoEnd = clearQueue;
-			clearQueue = type;
-			type = undefined;
-		}
-		if ( clearQueue && type !== false ) {
-			this.queue( type || "fx", [] );
-		}
-
-		return this.each(function() {
-			var dequeue = true,
-				index = type != null && type + "queueHooks",
-				timers = jQuery.timers,
-				data = jQuery._data( this );
-
-			if ( index ) {
-				if ( data[ index ] && data[ index ].stop ) {
-					stopQueue( data[ index ] );
-				}
-			} else {
-				for ( index in data ) {
-					if ( data[ index ] && data[ index ].stop && rrun.test( index ) ) {
-						stopQueue( data[ index ] );
-					}
-				}
-			}
-
-			for ( index = timers.length; index--; ) {
-				if ( timers[ index ].elem === this && (type == null || timers[ index ].queue === type) ) {
-					timers[ index ].anim.stop( gotoEnd );
-					dequeue = false;
-					timers.splice( index, 1 );
-				}
-			}
-
-			// start the next in the queue if the last step wasn't forced
-			// timers currently will call their complete callbacks, which will dequeue
-			// but only if they were gotoEnd
-			if ( dequeue || !gotoEnd ) {
-				jQuery.dequeue( this, type );
-			}
-		});
-	},
-	finish: function( type ) {
-		if ( type !== false ) {
-			type = type || "fx";
-		}
-		return this.each(function() {
-			var index,
-				data = jQuery._data( this ),
-				queue = data[ type + "queue" ],
-				hooks = data[ type + "queueHooks" ],
-				timers = jQuery.timers,
-				length = queue ? queue.length : 0;
-
-			// enable finishing flag on private data
-			data.finish = true;
-
-			// empty the queue first
-			jQuery.queue( this, type, [] );
-
-			if ( hooks && hooks.stop ) {
-				hooks.stop.call( this, true );
-			}
-
-			// look for any active animations, and finish them
-			for ( index = timers.length; index--; ) {
-				if ( timers[ index ].elem === this && timers[ index ].queue === type ) {
-					timers[ index ].anim.stop( true );
-					timers.splice( index, 1 );
-				}
-			}
-
-			// look for any animations in the old queue and finish them
-			for ( index = 0; index < length; index++ ) {
-				if ( queue[ index ] && queue[ index ].finish ) {
-					queue[ index ].finish.call( this );
-				}
-			}
-
-			// turn off finishing flag
-			delete data.finish;
-		});
-	}
-});
-
-jQuery.each([ "toggle", "show", "hide" ], function( i, name ) {
-	var cssFn = jQuery.fn[ name ];
-	jQuery.fn[ name ] = function( speed, easing, callback ) {
-		return speed == null || typeof speed === "boolean" ?
-			cssFn.apply( this, arguments ) :
-			this.animate( genFx( name, true ), speed, easing, callback );
-	};
-});
-
-// Generate shortcuts for custom animations
-jQuery.each({
-	slideDown: genFx("show"),
-	slideUp: genFx("hide"),
-	slideToggle: genFx("toggle"),
-	fadeIn: { opacity: "show" },
-	fadeOut: { opacity: "hide" },
-	fadeToggle: { opacity: "toggle" }
-}, function( name, props ) {
-	jQuery.fn[ name ] = function( speed, easing, callback ) {
-		return this.animate( props, speed, easing, callback );
-	};
-});
-
-jQuery.timers = [];
-jQuery.fx.tick = function() {
-	var timer,
-		timers = jQuery.timers,
-		i = 0;
-
-	fxNow = jQuery.now();
-
-	for ( ; i < timers.length; i++ ) {
-		timer = timers[ i ];
-		// Checks the timer has not already been removed
-		if ( !timer() && timers[ i ] === timer ) {
-			timers.splice( i--, 1 );
-		}
-	}
-
-	if ( !timers.length ) {
-		jQuery.fx.stop();
-	}
-	fxNow = undefined;
-};
-
-jQuery.fx.timer = function( timer ) {
-	jQuery.timers.push( timer );
-	if ( timer() ) {
-		jQuery.fx.start();
-	} else {
-		jQuery.timers.pop();
-	}
-};
-
-jQuery.fx.interval = 13;
-
-jQuery.fx.start = function() {
-	if ( !timerId ) {
-		timerId = setInterval( jQuery.fx.tick, jQuery.fx.interval );
-	}
-};
-
-jQuery.fx.stop = function() {
-	clearInterval( timerId );
-	timerId = null;
-};
-
-jQuery.fx.speeds = {
-	slow: 600,
-	fast: 200,
-	// Default speed
-	_default: 400
-};
-
-
-// Based off of the plugin by Clint Helfers, with permission.
-// http://blindsignals.com/index.php/2009/07/jquery-delay/
-jQuery.fn.delay = function( time, type ) {
-	time = jQuery.fx ? jQuery.fx.speeds[ time ] || time : time;
-	type = type || "fx";
-
-	return this.queue( type, function( next, hooks ) {
-		var timeout = setTimeout( next, time );
-		hooks.stop = function() {
-			clearTimeout( timeout );
-		};
-	});
-};
-
-
-(function() {
-	// Minified: var a,b,c,d,e
-	var input, div, select, a, opt;
-
-	// Setup
-	div = document.createElement( "div" );
-	div.setAttribute( "className", "t" );
-	div.innerHTML = "  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>";
-	a = div.getElementsByTagName("a")[ 0 ];
-
-	// First batch of tests.
-	select = document.createElement("select");
-	opt = select.appendChild( document.createElement("option") );
-	input = div.getElementsByTagName("input")[ 0 ];
-
-	a.style.cssText = "top:1px";
-
-	// Test setAttribute on camelCase class. If it works, we need attrFixes when doing get/setAttribute (ie6/7)
-	support.getSetAttribute = div.className !== "t";
-
-	// Get the style information from getAttribute
-	// (IE uses .cssText instead)
-	support.style = /top/.test( a.getAttribute("style") );
-
-	// Make sure that URLs aren't manipulated
-	// (IE normalizes it by default)
-	support.hrefNormalized = a.getAttribute("href") === "/a";
-
-	// Check the default checkbox/radio value ("" on WebKit; "on" elsewhere)
-	support.checkOn = !!input.value;
-
-	// Make sure that a selected-by-default option has a working selected property.
-	// (WebKit defaults to false instead of true, IE too, if it's in an optgroup)
-	support.optSelected = opt.selected;
-
-	// Tests for enctype support on a form (#6743)
-	support.enctype = !!document.createElement("form").enctype;
-
-	// Make sure that the options inside disabled selects aren't marked as disabled
-	// (WebKit marks them as disabled)
-	select.disabled = true;
-	support.optDisabled = !opt.disabled;
-
-	// Support: IE8 only
-	// Check if we can trust getAttribute("value")
-	input = document.createElement( "input" );
-	input.setAttribute( "value", "" );
-	support.input = input.getAttribute( "value" ) === "";
-
-	// Check if an input maintains its value after becoming a radio
-	input.value = "t";
-	input.setAttribute( "type", "radio" );
-	support.radioValue = input.value === "t";
-})();
-
-
-var rreturn = /\r/g;
-
-jQuery.fn.extend({
-	val: function( value ) {
-		var hooks, ret, isFunction,
-			elem = this[0];
-
-		if ( !arguments.length ) {
-			if ( elem ) {
-				hooks = jQuery.valHooks[ elem.type ] || jQuery.valHooks[ elem.nodeName.toLowerCase() ];
-
-				if ( hooks && "get" in hooks && (ret = hooks.get( elem, "value" )) !== undefined ) {
-					return ret;
-				}
-
-				ret = elem.value;
-
-				return typeof ret === "string" ?
-					// handle most common string cases
-					ret.replace(rreturn, "") :
-					// handle cases where value is null/undef or number
-					ret == null ? "" : ret;
-			}
-
-			return;
-		}
-
-		isFunction = jQuery.isFunction( value );
-
-		return this.each(function( i ) {
-			var val;
-
-			if ( this.nodeType !== 1 ) {
-				return;
-			}
-
-			if ( isFunction ) {
-				val = value.call( this, i, jQuery( this ).val() );
-			} else {
-				val = value;
-			}
-
-			// Treat null/undefined as ""; convert numbers to string
-			if ( val == null ) {
-				val = "";
-			} else if ( typeof val === "number" ) {
-				val += "";
-			} else if ( jQuery.isArray( val ) ) {
-				val = jQuery.map( val, function( value ) {
-					return value == null ? "" : value + "";
-				});
-			}
-
-			hooks = jQuery.valHooks[ this.type ] || jQuery.valHooks[ this.nodeName.toLowerCase() ];
-
-			// If set returns undefined, fall back to normal setting
-			if ( !hooks || !("set" in hooks) || hooks.set( this, val, "value" ) === undefined ) {
-				this.value = val;
-			}
-		});
-	}
-});
-
-jQuery.extend({
-	valHooks: {
-		option: {
-			get: function( elem ) {
-				var val = jQuery.find.attr( elem, "value" );
-				return val != null ?
-					val :
-					// Support: IE10-11+
-					// option.text throws exceptions (#14686, #14858)
-					jQuery.trim( jQuery.text( elem ) );
-			}
-		},
-		select: {
-			get: function( elem ) {
-				var value, option,
-					options = elem.options,
-					index = elem.selectedIndex,
-					one = elem.type === "select-one" || index < 0,
-					values = one ? null : [],
-					max = one ? index + 1 : options.length,
-					i = index < 0 ?
-						max :
-						one ? index : 0;
-
-				// Loop through all the selected options
-				for ( ; i < max; i++ ) {
-					option = options[ i ];
-
-					// oldIE doesn't update selected after form reset (#2551)
-					if ( ( option.selected || i === index ) &&
-							// Don't return options that are disabled or in a disabled optgroup
-							( support.optDisabled ? !option.disabled : option.getAttribute("disabled") === null ) &&
-							( !option.parentNode.disabled || !jQuery.nodeName( option.parentNode, "optgroup" ) ) ) {
-
-						// Get the specific value for the option
-						value = jQuery( option ).val();
-
-						// We don't need an array for one selects
-						if ( one ) {
-							return value;
-						}
-
-						// Multi-Selects return an array
-						values.push( value );
-					}
-				}
-
-				return values;
-			},
-
-			set: function( elem, value ) {
-				var optionSet, option,
-					options = elem.options,
-					values = jQuery.makeArray( value ),
-					i = options.length;
-
-				while ( i-- ) {
-					option = options[ i ];
-
-					if ( jQuery.inArray( jQuery.valHooks.option.get( option ), values ) >= 0 ) {
-
-						// Support: IE6
-						// When new option element is added to select box we need to
-						// force reflow of newly added node in order to workaround delay
-						// of initialization properties
-						try {
-							option.selected = optionSet = true;
-
-						} catch ( _ ) {
-
-							// Will be executed only in IE6
-							option.scrollHeight;
-						}
-
-					} else {
-						option.selected = false;
-					}
-				}
-
-				// Force browsers to behave consistently when non-matching value is set
-				if ( !optionSet ) {
-					elem.selectedIndex = -1;
-				}
-
-				return options;
-			}
-		}
-	}
-});
-
-// Radios and checkboxes getter/setter
-jQuery.each([ "radio", "checkbox" ], function() {
-	jQuery.valHooks[ this ] = {
-		set: function( elem, value ) {
-			if ( jQuery.isArray( value ) ) {
-				return ( elem.checked = jQuery.inArray( jQuery(elem).val(), value ) >= 0 );
-			}
-		}
-	};
-	if ( !support.checkOn ) {
-		jQuery.valHooks[ this ].get = function( elem ) {
-			// Support: Webkit
-			// "" is returned instead of "on" if a value isn't specified
-			return elem.getAttribute("value") === null ? "on" : elem.value;
-		};
-	}
-});
-
-
-
-
-var nodeHook, boolHook,
-	attrHandle = jQuery.expr.attrHandle,
-	ruseDefault = /^(?:checked|selected)$/i,
-	getSetAttribute = support.getSetAttribute,
-	getSetInput = support.input;
-
-jQuery.fn.extend({
-	attr: function( name, value ) {
-		return access( this, jQuery.attr, name, value, arguments.length > 1 );
-	},
-
-	removeAttr: function( name ) {
-		return this.each(function() {
-			jQuery.removeAttr( this, name );
-		});
-	}
-});
-
-jQuery.extend({
-	attr: function( elem, name, value ) {
-		var hooks, ret,
-			nType = elem.nodeType;
-
-		// don't get/set attributes on text, comment and attribute nodes
-		if ( !elem || nType === 3 || nType === 8 || nType === 2 ) {
-			return;
-		}
-
-		// Fallback to prop when attributes are not supported
-		if ( typeof elem.getAttribute === strundefined ) {
-			return jQuery.prop( elem, name, value );
-		}
-
-		// All attributes are lowercase
-		// Grab necessary hook if one is defined
-		if ( nType !== 1 || !jQuery.isXMLDoc( elem ) ) {
-			name = name.toLowerCase();
-			hooks = jQuery.attrHooks[ name ] ||
-				( jQuery.expr.match.bool.test( name ) ? boolHook : nodeHook );
-		}
-
-		if ( value !== undefined ) {
-
-			if ( value === null ) {
-				jQuery.removeAttr( elem, name );
-
-			} else if ( hooks && "set" in hooks && (ret = hooks.set( elem, value, name )) !== undefined ) {
-				return ret;
-
-			} else {
-				elem.setAttribute( name, value + "" );
-				return value;
-			}
-
-		} else if ( hooks && "get" in hooks && (ret = hooks.get( elem, name )) !== null ) {
-			return ret;
-
-		} else {
-			ret = jQuery.find.attr( elem, name );
-
-			// Non-existent attributes return null, we normalize to undefined
-			return ret == null ?
-				undefined :
-				ret;
-		}
-	},
-
-	removeAttr: function( elem, value ) {
-		var name, propName,
-			i = 0,
-			attrNames = value && value.match( rnotwhite );
-
-		if ( attrNames && elem.nodeType === 1 ) {
-			while ( (name = attrNames[i++]) ) {
-				propName = jQuery.propFix[ name ] || name;
-
-				// Boolean attributes get special treatment (#10870)
-				if ( jQuery.expr.match.bool.test( name ) ) {
-					// Set corresponding property to false
-					if ( getSetInput && getSetAttribute || !ruseDefault.test( name ) ) {
-						elem[ propName ] = false;
-					// Support: IE<9
-					// Also clear defaultChecked/defaultSelected (if appropriate)
-					} else {
-						elem[ jQuery.camelCase( "default-" + name ) ] =
-							elem[ propName ] = false;
-					}
-
-				// See #9699 for explanation of this approach (setting first, then removal)
-				} else {
-					jQuery.attr( elem, name, "" );
-				}
-
-				elem.removeAttribute( getSetAttribute ? name : propName );
-			}
-		}
-	},
-
-	attrHooks: {
-		type: {
-			set: function( elem, value ) {
-				if ( !support.radioValue && value === "radio" && jQuery.nodeName(elem, "input") ) {
-					// Setting the type on a radio button after the value resets the value in IE6-9
-					// Reset value to default in case type is set after value during creation
-					var val = elem.value;
-					elem.setAttribute( "type", value );
-					if ( val ) {
-						elem.value = val;
-					}
-					return value;
-				}
-			}
-		}
-	}
-});
-
-// Hook for boolean attributes
-boolHook = {
-	set: function( elem, value, name ) {
-		if ( value === false ) {
-			// Remove boolean attributes when set to false
-			jQuery.removeAttr( elem, name );
-		} else if ( getSetInput && getSetAttribute || !ruseDefault.test( name ) ) {
-			// IE<8 needs the *property* name
-			elem.setAttribute( !getSetAttribute && jQuery.propFix[ name ] || name, name );
-
-		// Use defaultChecked and defaultSelected for oldIE
-		} else {
-			elem[ jQuery.camelCase( "default-" + name ) ] = elem[ name ] = true;
-		}
-
-		return name;
-	}
-};
-
-// Retrieve booleans specially
-jQuery.each( jQuery.expr.match.bool.source.match( /\w+/g ), function( i, name ) {
-
-	var getter = attrHandle[ name ] || jQuery.find.attr;
-
-	attrHandle[ name ] = getSetInput && getSetAttribute || !ruseDefault.test( name ) ?
-		function( elem, name, isXML ) {
-			var ret, handle;
-			if ( !isXML ) {
-				// Avoid an infinite loop by temporarily removing this function from the getter
-				handle = attrHandle[ name ];
-				attrHandle[ name ] = ret;
-				ret = getter( elem, name, isXML ) != null ?
-					name.toLowerCase() :
-					null;
-				attrHandle[ name ] = handle;
-			}
-			return ret;
-		} :
-		function( elem, name, isXML ) {
-			if ( !isXML ) {
-				return elem[ jQuery.camelCase( "default-" + name ) ] ?
-					name.toLowerCase() :
-					null;
-			}
-		};
-});
-
-// fix oldIE attroperties
-if ( !getSetInput || !getSetAttribute ) {
-	jQuery.attrHooks.value = {
-		set: function( elem, value, name ) {
-			if ( jQuery.nodeName( elem, "input" ) ) {
-				// Does not return so that setAttribute is also used
-				elem.defaultValue = value;
-			} else {
-				// Use nodeHook if defined (#1954); otherwise setAttribute is fine
-				return nodeHook && nodeHook.set( elem, value, name );
-			}
-		}
-	};
-}
-
-// IE6/7 do not support getting/setting some attributes with get/setAttribute
-if ( !getSetAttribute ) {
-
-	// Use this for any attribute in IE6/7
-	// This fixes almost every IE6/7 issue
-	nodeHook = {
-		set: function( elem, value, name ) {
-			// Set the existing or create a new attribute node
-			var ret = elem.getAttributeNode( name );
-			if ( !ret ) {
-				elem.setAttributeNode(
-					(ret = elem.ownerDocument.createAttribute( name ))
-				);
-			}
-
-			ret.value = value += "";
-
-			// Break association with cloned elements by also using setAttribute (#9646)
-			if ( name === "value" || value === elem.getAttribute( name ) ) {
-				return value;
-			}
-		}
-	};
-
-	// Some attributes are constructed with empty-string values when not defined
-	attrHandle.id = attrHandle.name = attrHandle.coords =
-		function( elem, name, isXML ) {
-			var ret;
-			if ( !isXML ) {
-				return (ret = elem.getAttributeNode( name )) && ret.value !== "" ?
-					ret.value :
-					null;
-			}
-		};
-
-	// Fixing value retrieval on a button requires this module
-	jQuery.valHooks.button = {
-		get: function( elem, name ) {
-			var ret = elem.getAttributeNode( name );
-			if ( ret && ret.specified ) {
-				return ret.value;
-			}
-		},
-		set: nodeHook.set
-	};
-
-	// Set contenteditable to false on removals(#10429)
-	// Setting to empty string throws an error as an invalid value
-	jQuery.attrHooks.contenteditable = {
-		set: function( elem, value, name ) {
-			nodeHook.set( elem, value === "" ? false : value, name );
-		}
-	};
-
-	// Set width and height to auto instead of 0 on empty string( Bug #8150 )
-	// This is for removals
-	jQuery.each([ "width", "height" ], function( i, name ) {
-		jQuery.attrHooks[ name ] = {
-			set: function( elem, value ) {
-				if ( value === "" ) {
-					elem.setAttribute( name, "auto" );
-					return value;
-				}
-			}
-		};
-	});
-}
-
-if ( !support.style ) {
-	jQuery.attrHooks.style = {
-		get: function( elem ) {
-			// Return undefined in the case of empty string
-			// Note: IE uppercases css property names, but if we were to .toLowerCase()
-			// .cssText, that would destroy case senstitivity in URL's, like in "background"
-			return elem.style.cssText || undefined;
-		},
-		set: function( elem, value ) {
-			return ( elem.style.cssText = value + "" );
-		}
-	};
-}
-
-
-
-
-var rfocusable = /^(?:input|select|textarea|button|object)$/i,
-	rclickable = /^(?:a|area)$/i;
-
-jQuery.fn.extend({
-	prop: function( name, value ) {
-		return access( this, jQuery.prop, name, value, arguments.length > 1 );
-	},
-
-	removeProp: function( name ) {
-		name = jQuery.propFix[ name ] || name;
-		return this.each(function() {
-			// try/catch handles cases where IE balks (such as removing a property on window)
-			try {
-				this[ name ] = undefined;
-				delete this[ name ];
-			} catch( e ) {}
-		});
-	}
-});
-
-jQuery.extend({
-	propFix: {
-		"for": "htmlFor",
-		"class": "className"
-	},
-
-	prop: function( elem, name, value ) {
-		var ret, hooks, notxml,
-			nType = elem.nodeType;
-
-		// don't get/set properties on text, comment and attribute nodes
-		if ( !elem || nType === 3 || nType === 8 || nType === 2 ) {
-			return;
-		}
-
-		notxml = nType !== 1 || !jQuery.isXMLDoc( elem );
-
-		if ( notxml ) {
-			// Fix name and attach hooks
-			name = jQuery.propFix[ name ] || name;
-			hooks = jQuery.propHooks[ name ];
-		}
-
-		if ( value !== undefined ) {
-			return hooks && "set" in hooks && (ret = hooks.set( elem, value, name )) !== undefined ?
-				ret :
-				( elem[ name ] = value );
-
-		} else {
-			return hooks && "get" in hooks && (ret = hooks.get( elem, name )) !== null ?
-				ret :
-				elem[ name ];
-		}
-	},
-
-	propHooks: {
-		tabIndex: {
-			get: function( elem ) {
-				// elem.tabIndex doesn't always return the correct value when it hasn't been explicitly set
-				// http://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/
-				// Use proper attribute retrieval(#12072)
-				var tabindex = jQuery.find.attr( elem, "tabindex" );
-
-				return tabindex ?
-					parseInt( tabindex, 10 ) :
-					rfocusable.test( elem.nodeName ) || rclickable.test( elem.nodeName ) && elem.href ?
-						0 :
-						-1;
-			}
-		}
-	}
-});
-
-// Some attributes require a special call on IE
-// http://msdn.microsoft.com/en-us/library/ms536429%28VS.85%29.aspx
-if ( !support.hrefNormalized ) {
-	// href/src property should get the full normalized URL (#10299/#12915)
-	jQuery.each([ "href", "src" ], function( i, name ) {
-		jQuery.propHooks[ name ] = {
-			get: function( elem ) {
-				return elem.getAttribute( name, 4 );
-			}
-		};
-	});
-}
-
-// Support: Safari, IE9+
-// mis-reports the default selected property of an option
-// Accessing the parent's selectedIndex property fixes it
-if ( !support.optSelected ) {
-	jQuery.propHooks.selected = {
-		get: function( elem ) {
-			var parent = elem.parentNode;
-
-			if ( parent ) {
-				parent.selectedIndex;
-
-				// Make sure that it also works with optgroups, see #5701
-				if ( parent.parentNode ) {
-					parent.parentNode.selectedIndex;
-				}
-			}
-			return null;
-		}
-	};
-}
-
-jQuery.each([
-	"tabIndex",
-	"readOnly",
-	"maxLength",
-	"cellSpacing",
-	"cellPadding",
-	"rowSpan",
-	"colSpan",
-	"useMap",
-	"frameBorder",
-	"contentEditable"
-], function() {
-	jQuery.propFix[ this.toLowerCase() ] = this;
-});
-
-// IE6/7 call enctype encoding
-if ( !support.enctype ) {
-	jQuery.propFix.enctype = "encoding";
-}
-
-
-
-
-var rclass = /[\t\r\n\f]/g;
-
-jQuery.fn.extend({
-	addClass: function( value ) {
-		var classes, elem, cur, clazz, j, finalValue,
-			i = 0,
-			len = this.length,
-			proceed = typeof value === "string" && value;
-
-		if ( jQuery.isFunction( value ) ) {
-			return this.each(function( j ) {
-				jQuery( this ).addClass( value.call( this, j, this.className ) );
-			});
-		}
-
-		if ( proceed ) {
-			// The disjunction here is for better compressibility (see removeClass)
-			classes = ( value || "" ).match( rnotwhite ) || [];
-
-			for ( ; i < len; i++ ) {
-				elem = this[ i ];
-				cur = elem.nodeType === 1 && ( elem.className ?
-					( " " + elem.className + " " ).replace( rclass, " " ) :
-					" "
-				);
-
-				if ( cur ) {
-					j = 0;
-					while ( (clazz = classes[j++]) ) {
-						if ( cur.indexOf( " " + clazz + " " ) < 0 ) {
-							cur += clazz + " ";
-						}
-					}
-
-					// only assign if different to avoid unneeded rendering.
-					finalValue = jQuery.trim( cur );
-					if ( elem.className !== finalValue ) {
-						elem.className = finalValue;
-					}
-				}
-			}
-		}
-
-		return this;
-	},
-
-	removeClass: function( value ) {
-		var classes, elem, cur, clazz, j, finalValue,
-			i = 0,
-			len = this.length,
-			proceed = arguments.length === 0 || typeof value === "string" && value;
-
-		if ( jQuery.isFunction( value ) ) {
-			return this.each(function( j ) {
-				jQuery( this ).removeClass( value.call( this, j, this.className ) );
-			});
-		}
-		if ( proceed ) {
-			classes = ( value || "" ).match( rnotwhite ) || [];
-
-			for ( ; i < len; i++ ) {
-				elem = this[ i ];
-				// This expression is here for better compressibility (see addClass)
-				cur = elem.nodeType === 1 && ( elem.className ?
-					( " " + elem.className + " " ).replace( rclass, " " ) :
-					""
-				);
-
-				if ( cur ) {
-					j = 0;
-					while ( (clazz = classes[j++]) ) {
-						// Remove *all* instances
-						while ( cur.indexOf( " " + clazz + " " ) >= 0 ) {
-							cur = cur.replace( " " + clazz + " ", " " );
-						}
-					}
-
-					// only assign if different to avoid unneeded rendering.
-					finalValue = value ? jQuery.trim( cur ) : "";
-					if ( elem.className !== finalValue ) {
-						elem.className = finalValue;
-					}
-				}
-			}
-		}
-
-		return this;
-	},
-
-	toggleClass: function( value, stateVal ) {
-		var type = typeof value;
-
-		if ( typeof stateVal === "boolean" && type === "string" ) {
-			return stateVal ? this.addClass( value ) : this.removeClass( value );
-		}
-
-		if ( jQuery.isFunction( value ) ) {
-			return this.each(function( i ) {
-				jQuery( this ).toggleClass( value.call(this, i, this.className, stateVal), stateVal );
-			});
-		}
-
-		return this.each(function() {
-			if ( type === "string" ) {
-				// toggle individual class names
-				var className,
-					i = 0,
-					self = jQuery( this ),
-					classNames = value.match( rnotwhite ) || [];
-
-				while ( (className = classNames[ i++ ]) ) {
-					// check each className given, space separated list
-					if ( self.hasClass( className ) ) {
-						self.removeClass( className );
-					} else {
-						self.addClass( className );
-					}
-				}
-
-			// Toggle whole class name
-			} else if ( type === strundefined || type === "boolean" ) {
-				if ( this.className ) {
-					// store className if set
-					jQuery._data( this, "__className__", this.className );
-				}
-
-				// If the element has a class name or if we're passed "false",
-				// then remove the whole classname (if there was one, the above saved it).
-				// Otherwise bring back whatever was previously saved (if anything),
-				// falling back to the empty string if nothing was stored.
-				this.className = this.className || value === false ? "" : jQuery._data( this, "__className__" ) || "";
-			}
-		});
-	},
-
-	hasClass: function( selector ) {
-		var className = " " + selector + " ",
-			i = 0,
-			l = this.length;
-		for ( ; i < l; i++ ) {
-			if ( this[i].nodeType === 1 && (" " + this[i].className + " ").replace(rclass, " ").indexOf( className ) >= 0 ) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-});
-
-
-
-
-// Return jQuery for attributes-only inclusion
-
-
-jQuery.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( i, name ) {
-
-	// Handle event binding
-	jQuery.fn[ name ] = function( data, fn ) {
-		return arguments.length > 0 ?
-			this.on( name, null, data, fn ) :
-			this.trigger( name );
-	};
-});
-
-jQuery.fn.extend({
-	hover: function( fnOver, fnOut ) {
-		return this.mouseenter( fnOver ).mouseleave( fnOut || fnOver );
-	},
-
-	bind: function( types, data, fn ) {
-		return this.on( types, null, data, fn );
-	},
-	unbind: function( types, fn ) {
-		return this.off( types, null, fn );
-	},
-
-	delegate: function( selector, types, data, fn ) {
-		return this.on( types, selector, data, fn );
-	},
-	undelegate: function( selector, types, fn ) {
-		// ( namespace ) or ( selector, types [, fn] )
-		return arguments.length === 1 ? this.off( selector, "**" ) : this.off( types, selector || "**", fn );
-	}
-});
-
-
-var nonce = jQuery.now();
-
-var rquery = (/\?/);
-
-
-
-var rvalidtokens = /(,)|(\[|{)|(}|])|"(?:[^"\\\r\n]|\\["\\\/bfnrt]|\\u[\da-fA-F]{4})*"\s*:?|true|false|null|-?(?!0\d)\d+(?:\.\d+|)(?:[eE][+-]?\d+|)/g;
-
-jQuery.parseJSON = function( data ) {
-	// Attempt to parse using the native JSON parser first
-	if ( window.JSON && window.JSON.parse ) {
-		// Support: Android 2.3
-		// Workaround failure to string-cast null input
-		return window.JSON.parse( data + "" );
-	}
-
-	var requireNonComma,
-		depth = null,
-		str = jQuery.trim( data + "" );
-
-	// Guard against invalid (and possibly dangerous) input by ensuring that nothing remains
-	// after removing valid tokens
-	return str && !jQuery.trim( str.replace( rvalidtokens, function( token, comma, open, close ) {
-
-		// Force termination if we see a misplaced comma
-		if ( requireNonComma && comma ) {
-			depth = 0;
-		}
-
-		// Perform no more replacements after returning to outermost depth
-		if ( depth === 0 ) {
-			return token;
-		}
-
-		// Commas must not follow "[", "{", or ","
-		requireNonComma = open || comma;
-
-		// Determine new depth
-		// array/object open ("[" or "{"): depth += true - false (increment)
-		// array/object close ("]" or "}"): depth += false - true (decrement)
-		// other cases ("," or primitive): depth += true - true (numeric cast)
-		depth += !close - !open;
-
-		// Remove this token
-		return "";
-	}) ) ?
-		( Function( "return " + str ) )() :
-		jQuery.error( "Invalid JSON: " + data );
-};
-
-
-// Cross-browser xml parsing
-jQuery.parseXML = function( data ) {
-	var xml, tmp;
-	if ( !data || typeof data !== "string" ) {
-		return null;
-	}
-	try {
-		if ( window.DOMParser ) { // Standard
-			tmp = new DOMParser();
-			xml = tmp.parseFromString( data, "text/xml" );
-		} else { // IE
-			xml = new ActiveXObject( "Microsoft.XMLDOM" );
-			xml.async = "false";
-			xml.loadXML( data );
-		}
-	} catch( e ) {
-		xml = undefined;
-	}
-	if ( !xml || !xml.documentElement || xml.getElementsByTagName( "parsererror" ).length ) {
-		jQuery.error( "Invalid XML: " + data );
-	}
-	return xml;
-};
-
-
-var
-	// Document location
-	ajaxLocParts,
-	ajaxLocation,
-
-	rhash = /#.*$/,
-	rts = /([?&])_=[^&]*/,
-	rheaders = /^(.*?):[ \t]*([^\r\n]*)\r?$/mg, // IE leaves an \r character at EOL
-	// #7653, #8125, #8152: local protocol detection
-	rlocalProtocol = /^(?:about|app|app-storage|.+-extension|file|res|widget):$/,
-	rnoContent = /^(?:GET|HEAD)$/,
-	rprotocol = /^\/\//,
-	rurl = /^([\w.+-]+:)(?:\/\/(?:[^\/?#]*@|)([^\/?#:]*)(?::(\d+)|)|)/,
-
-	/* Prefilters
-	 * 1) They are useful to introduce custom dataTypes (see ajax/jsonp.js for an example)
-	 * 2) These are called:
-	 *    - BEFORE asking for a transport
-	 *    - AFTER param serialization (s.data is a string if s.processData is true)
-	 * 3) key is the dataType
-	 * 4) the catchall symbol "*" can be used
-	 * 5) execution will start with transport dataType and THEN continue down to "*" if needed
-	 */
-	prefilters = {},
-
-	/* Transports bindings
-	 * 1) key is the dataType
-	 * 2) the catchall symbol "*" can be used
-	 * 3) selection will start with transport dataType and THEN go to "*" if needed
-	 */
-	transports = {},
-
-	// Avoid comment-prolog char sequence (#10098); must appease lint and evade compression
-	allTypes = "*/".concat("*");
-
-// #8138, IE may throw an exception when accessing
-// a field from window.location if document.domain has been set
-try {
-	ajaxLocation = location.href;
-} catch( e ) {
-	// Use the href attribute of an A element
-	// since IE will modify it given document.location
-	ajaxLocation = document.createElement( "a" );
-	ajaxLocation.href = "";
-	ajaxLocation = ajaxLocation.href;
-}
-
-// Segment location into parts
-ajaxLocParts = rurl.exec( ajaxLocation.toLowerCase() ) || [];
-
-// Base "constructor" for jQuery.ajaxPrefilter and jQuery.ajaxTransport
-function addToPrefiltersOrTransports( structure ) {
-
-	// dataTypeExpression is optional and defaults to "*"
-	return function( dataTypeExpression, func ) {
-
-		if ( typeof dataTypeExpression !== "string" ) {
-			func = dataTypeExpression;
-			dataTypeExpression = "*";
-		}
-
-		var dataType,
-			i = 0,
-			dataTypes = dataTypeExpression.toLowerCase().match( rnotwhite ) || [];
-
-		if ( jQuery.isFunction( func ) ) {
-			// For each dataType in the dataTypeExpression
-			while ( (dataType = dataTypes[i++]) ) {
-				// Prepend if requested
-				if ( dataType.charAt( 0 ) === "+" ) {
-					dataType = dataType.slice( 1 ) || "*";
-					(structure[ dataType ] = structure[ dataType ] || []).unshift( func );
-
-				// Otherwise append
-				} else {
-					(structure[ dataType ] = structure[ dataType ] || []).push( func );
-				}
-			}
-		}
-	};
-}
-
-// Base inspection function for prefilters and transports
-function inspectPrefiltersOrTransports( structure, options, originalOptions, jqXHR ) {
-
-	var inspected = {},
-		seekingTransport = ( structure === transports );
-
-	function inspect( dataType ) {
-		var selected;
-		inspected[ dataType ] = true;
-		jQuery.each( structure[ dataType ] || [], function( _, prefilterOrFactory ) {
-			var dataTypeOrTransport = prefilterOrFactory( options, originalOptions, jqXHR );
-			if ( typeof dataTypeOrTransport === "string" && !seekingTransport && !inspected[ dataTypeOrTransport ] ) {
-				options.dataTypes.unshift( dataTypeOrTransport );
-				inspect( dataTypeOrTransport );
-				return false;
-			} else if ( seekingTransport ) {
-				return !( selected = dataTypeOrTransport );
-			}
-		});
-		return selected;
-	}
-
-	return inspect( options.dataTypes[ 0 ] ) || !inspected[ "*" ] && inspect( "*" );
-}
-
-// A special extend for ajax options
-// that takes "flat" options (not to be deep extended)
-// Fixes #9887
-function ajaxExtend( target, src ) {
-	var deep, key,
-		flatOptions = jQuery.ajaxSettings.flatOptions || {};
-
-	for ( key in src ) {
-		if ( src[ key ] !== undefined ) {
-			( flatOptions[ key ] ? target : ( deep || (deep = {}) ) )[ key ] = src[ key ];
-		}
-	}
-	if ( deep ) {
-		jQuery.extend( true, target, deep );
-	}
-
-	return target;
-}
-
-/* Handles responses to an ajax request:
- * - finds the right dataType (mediates between content-type and expected dataType)
- * - returns the corresponding response
- */
-function ajaxHandleResponses( s, jqXHR, responses ) {
-	var firstDataType, ct, finalDataType, type,
-		contents = s.contents,
-		dataTypes = s.dataTypes;
-
-	// Remove auto dataType and get content-type in the process
-	while ( dataTypes[ 0 ] === "*" ) {
-		dataTypes.shift();
-		if ( ct === undefined ) {
-			ct = s.mimeType || jqXHR.getResponseHeader("Content-Type");
-		}
-	}
-
-	// Check if we're dealing with a known content-type
-	if ( ct ) {
-		for ( type in contents ) {
-			if ( contents[ type ] && contents[ type ].test( ct ) ) {
-				dataTypes.unshift( type );
-				break;
-			}
-		}
-	}
-
-	// Check to see if we have a response for the expected dataType
-	if ( dataTypes[ 0 ] in responses ) {
-		finalDataType = dataTypes[ 0 ];
-	} else {
-		// Try convertible dataTypes
-		for ( type in responses ) {
-			if ( !dataTypes[ 0 ] || s.converters[ type + " " + dataTypes[0] ] ) {
-				finalDataType = type;
-				break;
-			}
-			if ( !firstDataType ) {
-				firstDataType = type;
-			}
-		}
-		// Or just use first one
-		finalDataType = finalDataType || firstDataType;
-	}
-
-	// If we found a dataType
-	// We add the dataType to the list if needed
-	// and return the corresponding response
-	if ( finalDataType ) {
-		if ( finalDataType !== dataTypes[ 0 ] ) {
-			dataTypes.unshift( finalDataType );
-		}
-		return responses[ finalDataType ];
-	}
-}
-
-/* Chain conversions given the request and the original response
- * Also sets the responseXXX fields on the jqXHR instance
- */
-function ajaxConvert( s, response, jqXHR, isSuccess ) {
-	var conv2, current, conv, tmp, prev,
-		converters = {},
-		// Work with a copy of dataTypes in case we need to modify it for conversion
-		dataTypes = s.dataTypes.slice();
-
-	// Create converters map with lowercased keys
-	if ( dataTypes[ 1 ] ) {
-		for ( conv in s.converters ) {
-			converters[ conv.toLowerCase() ] = s.converters[ conv ];
-		}
-	}
-
-	current = dataTypes.shift();
-
-	// Convert to each sequential dataType
-	while ( current ) {
-
-		if ( s.responseFields[ current ] ) {
-			jqXHR[ s.responseFields[ current ] ] = response;
-		}
-
-		// Apply the dataFilter if provided
-		if ( !prev && isSuccess && s.dataFilter ) {
-			response = s.dataFilter( response, s.dataType );
-		}
-
-		prev = current;
-		current = dataTypes.shift();
-
-		if ( current ) {
-
-			// There's only work to do if current dataType is non-auto
-			if ( current === "*" ) {
-
-				current = prev;
-
-			// Convert response if prev dataType is non-auto and differs from current
-			} else if ( prev !== "*" && prev !== current ) {
-
-				// Seek a direct converter
-				conv = converters[ prev + " " + current ] || converters[ "* " + current ];
-
-				// If none found, seek a pair
-				if ( !conv ) {
-					for ( conv2 in converters ) {
-
-						// If conv2 outputs current
-						tmp = conv2.split( " " );
-						if ( tmp[ 1 ] === current ) {
-
-							// If prev can be converted to accepted input
-							conv = converters[ prev + " " + tmp[ 0 ] ] ||
-								converters[ "* " + tmp[ 0 ] ];
-							if ( conv ) {
-								// Condense equivalence converters
-								if ( conv === true ) {
-									conv = converters[ conv2 ];
-
-								// Otherwise, insert the intermediate dataType
-								} else if ( converters[ conv2 ] !== true ) {
-									current = tmp[ 0 ];
-									dataTypes.unshift( tmp[ 1 ] );
-								}
-								break;
-							}
-						}
-					}
-				}
-
-				// Apply converter (if not an equivalence)
-				if ( conv !== true ) {
-
-					// Unless errors are allowed to bubble, catch and return them
-					if ( conv && s[ "throws" ] ) {
-						response = conv( response );
-					} else {
-						try {
-							response = conv( response );
-						} catch ( e ) {
-							return { state: "parsererror", error: conv ? e : "No conversion from " + prev + " to " + current };
-						}
-					}
-				}
-			}
-		}
-	}
-
-	return { state: "success", data: response };
-}
-
-jQuery.extend({
-
-	// Counter for holding the number of active queries
-	active: 0,
-
-	// Last-Modified header cache for next request
-	lastModified: {},
-	etag: {},
-
-	ajaxSettings: {
-		url: ajaxLocation,
-		type: "GET",
-		isLocal: rlocalProtocol.test( ajaxLocParts[ 1 ] ),
-		global: true,
-		processData: true,
-		async: true,
-		contentType: "application/x-www-form-urlencoded; charset=UTF-8",
-		/*
-		timeout: 0,
-		data: null,
-		dataType: null,
-		username: null,
-		password: null,
-		cache: null,
-		throws: false,
-		traditional: false,
-		headers: {},
-		*/
-
-		accepts: {
-			"*": allTypes,
-			text: "text/plain",
-			html: "text/html",
-			xml: "application/xml, text/xml",
-			json: "application/json, text/javascript"
-		},
-
-		contents: {
-			xml: /xml/,
-			html: /html/,
-			json: /json/
-		},
-
-		responseFields: {
-			xml: "responseXML",
-			text: "responseText",
-			json: "responseJSON"
-		},
-
-		// Data converters
-		// Keys separate source (or catchall "*") and destination types with a single space
-		converters: {
-
-			// Convert anything to text
-			"* text": String,
-
-			// Text to html (true = no transformation)
-			"text html": true,
-
-			// Evaluate text as a json expression
-			"text json": jQuery.parseJSON,
-
-			// Parse text as xml
-			"text xml": jQuery.parseXML
-		},
-
-		// For options that shouldn't be deep extended:
-		// you can add your own custom options here if
-		// and when you create one that shouldn't be
-		// deep extended (see ajaxExtend)
-		flatOptions: {
-			url: true,
-			context: true
-		}
-	},
-
-	// Creates a full fledged settings object into target
-	// with both ajaxSettings and settings fields.
-	// If target is omitted, writes into ajaxSettings.
-	ajaxSetup: function( target, settings ) {
-		return settings ?
-
-			// Building a settings object
-			ajaxExtend( ajaxExtend( target, jQuery.ajaxSettings ), settings ) :
-
-			// Extending ajaxSettings
-			ajaxExtend( jQuery.ajaxSettings, target );
-	},
-
-	ajaxPrefilter: addToPrefiltersOrTransports( prefilters ),
-	ajaxTransport: addToPrefiltersOrTransports( transports ),
-
-	// Main method
-	ajax: function( url, options ) {
-
-		// If url is an object, simulate pre-1.5 signature
-		if ( typeof url === "object" ) {
-			options = url;
-			url = undefined;
-		}
-
-		// Force options to be an object
-		options = options || {};
-
-		var // Cross-domain detection vars
-			parts,
-			// Loop variable
-			i,
-			// URL without anti-cache param
-			cacheURL,
-			// Response headers as string
-			responseHeadersString,
-			// timeout handle
-			timeoutTimer,
-
-			// To know if global events are to be dispatched
-			fireGlobals,
-
-			transport,
-			// Response headers
-			responseHeaders,
-			// Create the final options object
-			s = jQuery.ajaxSetup( {}, options ),
-			// Callbacks context
-			callbackContext = s.context || s,
-			// Context for global events is callbackContext if it is a DOM node or jQuery collection
-			globalEventContext = s.context && ( callbackContext.nodeType || callbackContext.jquery ) ?
-				jQuery( callbackContext ) :
-				jQuery.event,
-			// Deferreds
-			deferred = jQuery.Deferred(),
-			completeDeferred = jQuery.Callbacks("once memory"),
-			// Status-dependent callbacks
-			statusCode = s.statusCode || {},
-			// Headers (they are sent all at once)
-			requestHeaders = {},
-			requestHeadersNames = {},
-			// The jqXHR state
-			state = 0,
-			// Default abort message
-			strAbort = "canceled",
-			// Fake xhr
-			jqXHR = {
-				readyState: 0,
-
-				// Builds headers hashtable if needed
-				getResponseHeader: function( key ) {
-					var match;
-					if ( state === 2 ) {
-						if ( !responseHeaders ) {
-							responseHeaders = {};
-							while ( (match = rheaders.exec( responseHeadersString )) ) {
-								responseHeaders[ match[1].toLowerCase() ] = match[ 2 ];
-							}
-						}
-						match = responseHeaders[ key.toLowerCase() ];
-					}
-					return match == null ? null : match;
-				},
-
-				// Raw string
-				getAllResponseHeaders: function() {
-					return state === 2 ? responseHeadersString : null;
-				},
-
-				// Caches the header
-				setRequestHeader: function( name, value ) {
-					var lname = name.toLowerCase();
-					if ( !state ) {
-						name = requestHeadersNames[ lname ] = requestHeadersNames[ lname ] || name;
-						requestHeaders[ name ] = value;
-					}
-					return this;
-				},
-
-				// Overrides response content-type header
-				overrideMimeType: function( type ) {
-					if ( !state ) {
-						s.mimeType = type;
-					}
-					return this;
-				},
-
-				// Status-dependent callbacks
-				statusCode: function( map ) {
-					var code;
-					if ( map ) {
-						if ( state < 2 ) {
-							for ( code in map ) {
-								// Lazy-add the new callback in a way that preserves old ones
-								statusCode[ code ] = [ statusCode[ code ], map[ code ] ];
-							}
-						} else {
-							// Execute the appropriate callbacks
-							jqXHR.always( map[ jqXHR.status ] );
-						}
-					}
-					return this;
-				},
-
-				// Cancel the request
-				abort: function( statusText ) {
-					var finalText = statusText || strAbort;
-					if ( transport ) {
-						transport.abort( finalText );
-					}
-					done( 0, finalText );
-					return this;
-				}
-			};
-
-		// Attach deferreds
-		deferred.promise( jqXHR ).complete = completeDeferred.add;
-		jqXHR.success = jqXHR.done;
-		jqXHR.error = jqXHR.fail;
-
-		// Remove hash character (#7531: and string promotion)
-		// Add protocol if not provided (#5866: IE7 issue with protocol-less urls)
-		// Handle falsy url in the settings object (#10093: consistency with old signature)
-		// We also use the url parameter if available
-		s.url = ( ( url || s.url || ajaxLocation ) + "" ).replace( rhash, "" ).replace( rprotocol, ajaxLocParts[ 1 ] + "//" );
-
-		// Alias method option to type as per ticket #12004
-		s.type = options.method || options.type || s.method || s.type;
-
-		// Extract dataTypes list
-		s.dataTypes = jQuery.trim( s.dataType || "*" ).toLowerCase().match( rnotwhite ) || [ "" ];
-
-		// A cross-domain request is in order when we have a protocol:host:port mismatch
-		if ( s.crossDomain == null ) {
-			parts = rurl.exec( s.url.toLowerCase() );
-			s.crossDomain = !!( parts &&
-				( parts[ 1 ] !== ajaxLocParts[ 1 ] || parts[ 2 ] !== ajaxLocParts[ 2 ] ||
-					( parts[ 3 ] || ( parts[ 1 ] === "http:" ? "80" : "443" ) ) !==
-						( ajaxLocParts[ 3 ] || ( ajaxLocParts[ 1 ] === "http:" ? "80" : "443" ) ) )
-			);
-		}
-
-		// Convert data if not already a string
-		if ( s.data && s.processData && typeof s.data !== "string" ) {
-			s.data = jQuery.param( s.data, s.traditional );
-		}
-
-		// Apply prefilters
-		inspectPrefiltersOrTransports( prefilters, s, options, jqXHR );
-
-		// If request was aborted inside a prefilter, stop there
-		if ( state === 2 ) {
-			return jqXHR;
-		}
-
-		// We can fire global events as of now if asked to
-		fireGlobals = s.global;
-
-		// Watch for a new set of requests
-		if ( fireGlobals && jQuery.active++ === 0 ) {
-			jQuery.event.trigger("ajaxStart");
-		}
-
-		// Uppercase the type
-		s.type = s.type.toUpperCase();
-
-		// Determine if request has content
-		s.hasContent = !rnoContent.test( s.type );
-
-		// Save the URL in case we're toying with the If-Modified-Since
-		// and/or If-None-Match header later on
-		cacheURL = s.url;
-
-		// More options handling for requests with no content
-		if ( !s.hasContent ) {
-
-			// If data is available, append data to url
-			if ( s.data ) {
-				cacheURL = ( s.url += ( rquery.test( cacheURL ) ? "&" : "?" ) + s.data );
-				// #9682: remove data so that it's not used in an eventual retry
-				delete s.data;
-			}
-
-			// Add anti-cache in url if needed
-			if ( s.cache === false ) {
-				s.url = rts.test( cacheURL ) ?
-
-					// If there is already a '_' parameter, set its value
-					cacheURL.replace( rts, "$1_=" + nonce++ ) :
-
-					// Otherwise add one to the end
-					cacheURL + ( rquery.test( cacheURL ) ? "&" : "?" ) + "_=" + nonce++;
-			}
-		}
-
-		// Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
-		if ( s.ifModified ) {
-			if ( jQuery.lastModified[ cacheURL ] ) {
-				jqXHR.setRequestHeader( "If-Modified-Since", jQuery.lastModified[ cacheURL ] );
-			}
-			if ( jQuery.etag[ cacheURL ] ) {
-				jqXHR.setRequestHeader( "If-None-Match", jQuery.etag[ cacheURL ] );
-			}
-		}
-
-		// Set the correct header, if data is being sent
-		if ( s.data && s.hasContent && s.contentType !== false || options.contentType ) {
-			jqXHR.setRequestHeader( "Content-Type", s.contentType );
-		}
-
-		// Set the Accepts header for the server, depending on the dataType
-		jqXHR.setRequestHeader(
-			"Accept",
-			s.dataTypes[ 0 ] && s.accepts[ s.dataTypes[0] ] ?
-				s.accepts[ s.dataTypes[0] ] + ( s.dataTypes[ 0 ] !== "*" ? ", " + allTypes + "; q=0.01" : "" ) :
-				s.accepts[ "*" ]
-		);
-
-		// Check for headers option
-		for ( i in s.headers ) {
-			jqXHR.setRequestHeader( i, s.headers[ i ] );
-		}
-
-		// Allow custom headers/mimetypes and early abort
-		if ( s.beforeSend && ( s.beforeSend.call( callbackContext, jqXHR, s ) === false || state === 2 ) ) {
-			// Abort if not done already and return
-			return jqXHR.abort();
-		}
-
-		// aborting is no longer a cancellation
-		strAbort = "abort";
-
-		// Install callbacks on deferreds
-		for ( i in { success: 1, error: 1, complete: 1 } ) {
-			jqXHR[ i ]( s[ i ] );
-		}
-
-		// Get transport
-		transport = inspectPrefiltersOrTransports( transports, s, options, jqXHR );
-
-		// If no transport, we auto-abort
-		if ( !transport ) {
-			done( -1, "No Transport" );
-		} else {
-			jqXHR.readyState = 1;
-
-			// Send global event
-			if ( fireGlobals ) {
-				globalEventContext.trigger( "ajaxSend", [ jqXHR, s ] );
-			}
-			// Timeout
-			if ( s.async && s.timeout > 0 ) {
-				timeoutTimer = setTimeout(function() {
-					jqXHR.abort("timeout");
-				}, s.timeout );
-			}
-
-			try {
-				state = 1;
-				transport.send( requestHeaders, done );
-			} catch ( e ) {
-				// Propagate exception as error if not done
-				if ( state < 2 ) {
-					done( -1, e );
-				// Simply rethrow otherwise
-				} else {
-					throw e;
-				}
-			}
-		}
-
-		// Callback for when everything is done
-		function done( status, nativeStatusText, responses, headers ) {
-			var isSuccess, success, error, response, modified,
-				statusText = nativeStatusText;
-
-			// Called once
-			if ( state === 2 ) {
-				return;
-			}
-
-			// State is "done" now
-			state = 2;
-
-			// Clear timeout if it exists
-			if ( timeoutTimer ) {
-				clearTimeout( timeoutTimer );
-			}
-
-			// Dereference transport for early garbage collection
-			// (no matter how long the jqXHR object will be used)
-			transport = undefined;
-
-			// Cache response headers
-			responseHeadersString = headers || "";
-
-			// Set readyState
-			jqXHR.readyState = status > 0 ? 4 : 0;
-
-			// Determine if successful
-			isSuccess = status >= 200 && status < 300 || status === 304;
-
-			// Get response data
-			if ( responses ) {
-				response = ajaxHandleResponses( s, jqXHR, responses );
-			}
-
-			// Convert no matter what (that way responseXXX fields are always set)
-			response = ajaxConvert( s, response, jqXHR, isSuccess );
-
-			// If successful, handle type chaining
-			if ( isSuccess ) {
-
-				// Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
-				if ( s.ifModified ) {
-					modified = jqXHR.getResponseHeader("Last-Modified");
-					if ( modified ) {
-						jQuery.lastModified[ cacheURL ] = modified;
-					}
-					modified = jqXHR.getResponseHeader("etag");
-					if ( modified ) {
-						jQuery.etag[ cacheURL ] = modified;
-					}
-				}
-
-				// if no content
-				if ( status === 204 || s.type === "HEAD" ) {
-					statusText = "nocontent";
-
-				// if not modified
-				} else if ( status === 304 ) {
-					statusText = "notmodified";
-
-				// If we have data, let's convert it
-				} else {
-					statusText = response.state;
-					success = response.data;
-					error = response.error;
-					isSuccess = !error;
-				}
-			} else {
-				// We extract error from statusText
-				// then normalize statusText and status for non-aborts
-				error = statusText;
-				if ( status || !statusText ) {
-					statusText = "error";
-					if ( status < 0 ) {
-						status = 0;
-					}
-				}
-			}
-
-			// Set data for the fake xhr object
-			jqXHR.status = status;
-			jqXHR.statusText = ( nativeStatusText || statusText ) + "";
-
-			// Success/Error
-			if ( isSuccess ) {
-				deferred.resolveWith( callbackContext, [ success, statusText, jqXHR ] );
-			} else {
-				deferred.rejectWith( callbackContext, [ jqXHR, statusText, error ] );
-			}
-
-			// Status-dependent callbacks
-			jqXHR.statusCode( statusCode );
-			statusCode = undefined;
-
-			if ( fireGlobals ) {
-				globalEventContext.trigger( isSuccess ? "ajaxSuccess" : "ajaxError",
-					[ jqXHR, s, isSuccess ? success : error ] );
-			}
-
-			// Complete
-			completeDeferred.fireWith( callbackContext, [ jqXHR, statusText ] );
-
-			if ( fireGlobals ) {
-				globalEventContext.trigger( "ajaxComplete", [ jqXHR, s ] );
-				// Handle the global AJAX counter
-				if ( !( --jQuery.active ) ) {
-					jQuery.event.trigger("ajaxStop");
-				}
-			}
-		}
-
-		return jqXHR;
-	},
-
-	getJSON: function( url, data, callback ) {
-		return jQuery.get( url, data, callback, "json" );
-	},
-
-	getScript: function( url, callback ) {
-		return jQuery.get( url, undefined, callback, "script" );
-	}
-});
-
-jQuery.each( [ "get", "post" ], function( i, method ) {
-	jQuery[ method ] = function( url, data, callback, type ) {
-		// shift arguments if data argument was omitted
-		if ( jQuery.isFunction( data ) ) {
-			type = type || callback;
-			callback = data;
-			data = undefined;
-		}
-
-		return jQuery.ajax({
-			url: url,
-			type: method,
-			dataType: type,
-			data: data,
-			success: callback
-		});
-	};
-});
-
-// Attach a bunch of functions for handling common AJAX events
-jQuery.each( [ "ajaxStart", "ajaxStop", "ajaxComplete", "ajaxError", "ajaxSuccess", "ajaxSend" ], function( i, type ) {
-	jQuery.fn[ type ] = function( fn ) {
-		return this.on( type, fn );
-	};
-});
-
-
-jQuery._evalUrl = function( url ) {
-	return jQuery.ajax({
-		url: url,
-		type: "GET",
-		dataType: "script",
-		async: false,
-		global: false,
-		"throws": true
-	});
-};
-
-
-jQuery.fn.extend({
-	wrapAll: function( html ) {
-		if ( jQuery.isFunction( html ) ) {
-			return this.each(function(i) {
-				jQuery(this).wrapAll( html.call(this, i) );
-			});
-		}
-
-		if ( this[0] ) {
-			// The elements to wrap the target around
-			var wrap = jQuery( html, this[0].ownerDocument ).eq(0).clone(true);
-
-			if ( this[0].parentNode ) {
-				wrap.insertBefore( this[0] );
-			}
-
-			wrap.map(function() {
-				var elem = this;
-
-				while ( elem.firstChild && elem.firstChild.nodeType === 1 ) {
-					elem = elem.firstChild;
-				}
-
-				return elem;
-			}).append( this );
-		}
-
-		return this;
-	},
-
-	wrapInner: function( html ) {
-		if ( jQuery.isFunction( html ) ) {
-			return this.each(function(i) {
-				jQuery(this).wrapInner( html.call(this, i) );
-			});
-		}
-
-		return this.each(function() {
-			var self = jQuery( this ),
-				contents = self.contents();
-
-			if ( contents.length ) {
-				contents.wrapAll( html );
-
-			} else {
-				self.append( html );
-			}
-		});
-	},
-
-	wrap: function( html ) {
-		var isFunction = jQuery.isFunction( html );
-
-		return this.each(function(i) {
-			jQuery( this ).wrapAll( isFunction ? html.call(this, i) : html );
-		});
-	},
-
-	unwrap: function() {
-		return this.parent().each(function() {
-			if ( !jQuery.nodeName( this, "body" ) ) {
-				jQuery( this ).replaceWith( this.childNodes );
-			}
-		}).end();
-	}
-});
-
-
-jQuery.expr.filters.hidden = function( elem ) {
-	// Support: Opera <= 12.12
-	// Opera reports offsetWidths and offsetHeights less than zero on some elements
-	return elem.offsetWidth <= 0 && elem.offsetHeight <= 0 ||
-		(!support.reliableHiddenOffsets() &&
-			((elem.style && elem.style.display) || jQuery.css( elem, "display" )) === "none");
-};
-
-jQuery.expr.filters.visible = function( elem ) {
-	return !jQuery.expr.filters.hidden( elem );
-};
-
-
-
-
-var r20 = /%20/g,
-	rbracket = /\[\]$/,
-	rCRLF = /\r?\n/g,
-	rsubmitterTypes = /^(?:submit|button|image|reset|file)$/i,
-	rsubmittable = /^(?:input|select|textarea|keygen)/i;
-
-function buildParams( prefix, obj, traditional, add ) {
-	var name;
-
-	if ( jQuery.isArray( obj ) ) {
-		// Serialize array item.
-		jQuery.each( obj, function( i, v ) {
-			if ( traditional || rbracket.test( prefix ) ) {
-				// Treat each array item as a scalar.
-				add( prefix, v );
-
-			} else {
-				// Item is non-scalar (array or object), encode its numeric index.
-				buildParams( prefix + "[" + ( typeof v === "object" ? i : "" ) + "]", v, traditional, add );
-			}
-		});
-
-	} else if ( !traditional && jQuery.type( obj ) === "object" ) {
-		// Serialize object item.
-		for ( name in obj ) {
-			buildParams( prefix + "[" + name + "]", obj[ name ], traditional, add );
-		}
-
-	} else {
-		// Serialize scalar item.
-		add( prefix, obj );
-	}
-}
-
-// Serialize an array of form elements or a set of
-// key/values into a query string
-jQuery.param = function( a, traditional ) {
-	var prefix,
-		s = [],
-		add = function( key, value ) {
-			// If value is a function, invoke it and return its value
-			value = jQuery.isFunction( value ) ? value() : ( value == null ? "" : value );
-			s[ s.length ] = encodeURIComponent( key ) + "=" + encodeURIComponent( value );
-		};
-
-	// Set traditional to true for jQuery <= 1.3.2 behavior.
-	if ( traditional === undefined ) {
-		traditional = jQuery.ajaxSettings && jQuery.ajaxSettings.traditional;
-	}
-
-	// If an array was passed in, assume that it is an array of form elements.
-	if ( jQuery.isArray( a ) || ( a.jquery && !jQuery.isPlainObject( a ) ) ) {
-		// Serialize the form elements
-		jQuery.each( a, function() {
-			add( this.name, this.value );
-		});
-
-	} else {
-		// If traditional, encode the "old" way (the way 1.3.2 or older
-		// did it), otherwise encode params recursively.
-		for ( prefix in a ) {
-			buildParams( prefix, a[ prefix ], traditional, add );
-		}
-	}
-
-	// Return the resulting serialization
-	return s.join( "&" ).replace( r20, "+" );
-};
-
-jQuery.fn.extend({
-	serialize: function() {
-		return jQuery.param( this.serializeArray() );
-	},
-	serializeArray: function() {
-		return this.map(function() {
-			// Can add propHook for "elements" to filter or add form elements
-			var elements = jQuery.prop( this, "elements" );
-			return elements ? jQuery.makeArray( elements ) : this;
-		})
-		.filter(function() {
-			var type = this.type;
-			// Use .is(":disabled") so that fieldset[disabled] works
-			return this.name && !jQuery( this ).is( ":disabled" ) &&
-				rsubmittable.test( this.nodeName ) && !rsubmitterTypes.test( type ) &&
-				( this.checked || !rcheckableType.test( type ) );
-		})
-		.map(function( i, elem ) {
-			var val = jQuery( this ).val();
-
-			return val == null ?
-				null :
-				jQuery.isArray( val ) ?
-					jQuery.map( val, function( val ) {
-						return { name: elem.name, value: val.replace( rCRLF, "\r\n" ) };
-					}) :
-					{ name: elem.name, value: val.replace( rCRLF, "\r\n" ) };
-		}).get();
-	}
-});
-
-
-// Create the request object
-// (This is still attached to ajaxSettings for backward compatibility)
-jQuery.ajaxSettings.xhr = window.ActiveXObject !== undefined ?
-	// Support: IE6+
-	function() {
-
-		// XHR cannot access local files, always use ActiveX for that case
-		return !this.isLocal &&
-
-			// Support: IE7-8
-			// oldIE XHR does not support non-RFC2616 methods (#13240)
-			// See http://msdn.microsoft.com/en-us/library/ie/ms536648(v=vs.85).aspx
-			// and http://www.w3.org/Protocols/rfc2616/rfc2616-sec9.html#sec9
-			// Although this check for six methods instead of eight
-			// since IE also does not support "trace" and "connect"
-			/^(get|post|head|put|delete|options)$/i.test( this.type ) &&
-
-			createStandardXHR() || createActiveXHR();
-	} :
-	// For all other browsers, use the standard XMLHttpRequest object
-	createStandardXHR;
-
-var xhrId = 0,
-	xhrCallbacks = {},
-	xhrSupported = jQuery.ajaxSettings.xhr();
-
-// Support: IE<10
-// Open requests must be manually aborted on unload (#5280)
-if ( window.ActiveXObject ) {
-	jQuery( window ).on( "unload", function() {
-		for ( var key in xhrCallbacks ) {
-			xhrCallbacks[ key ]( undefined, true );
-		}
-	});
-}
-
-// Determine support properties
-support.cors = !!xhrSupported && ( "withCredentials" in xhrSupported );
-xhrSupported = support.ajax = !!xhrSupported;
-
-// Create transport if the browser can provide an xhr
-if ( xhrSupported ) {
-
-	jQuery.ajaxTransport(function( options ) {
-		// Cross domain only allowed if supported through XMLHttpRequest
-		if ( !options.crossDomain || support.cors ) {
-
-			var callback;
-
-			return {
-				send: function( headers, complete ) {
-					var i,
-						xhr = options.xhr(),
-						id = ++xhrId;
-
-					// Open the socket
-					xhr.open( options.type, options.url, options.async, options.username, options.password );
-
-					// Apply custom fields if provided
-					if ( options.xhrFields ) {
-						for ( i in options.xhrFields ) {
-							xhr[ i ] = options.xhrFields[ i ];
-						}
-					}
-
-					// Override mime type if needed
-					if ( options.mimeType && xhr.overrideMimeType ) {
-						xhr.overrideMimeType( options.mimeType );
-					}
-
-					// X-Requested-With header
-					// For cross-domain requests, seeing as conditions for a preflight are
-					// akin to a jigsaw puzzle, we simply never set it to be sure.
-					// (it can always be set on a per-request basis or even using ajaxSetup)
-					// For same-domain requests, won't change header if already provided.
-					if ( !options.crossDomain && !headers["X-Requested-With"] ) {
-						headers["X-Requested-With"] = "XMLHttpRequest";
-					}
-
-					// Set headers
-					for ( i in headers ) {
-						// Support: IE<9
-						// IE's ActiveXObject throws a 'Type Mismatch' exception when setting
-						// request header to a null-value.
-						//
-						// To keep consistent with other XHR implementations, cast the value
-						// to string and ignore `undefined`.
-						if ( headers[ i ] !== undefined ) {
-							xhr.setRequestHeader( i, headers[ i ] + "" );
-						}
-					}
-
-					// Do send the request
-					// This may raise an exception which is actually
-					// handled in jQuery.ajax (so no try/catch here)
-					xhr.send( ( options.hasContent && options.data ) || null );
-
-					// Listener
-					callback = function( _, isAbort ) {
-						var status, statusText, responses;
-
-						// Was never called and is aborted or complete
-						if ( callback && ( isAbort || xhr.readyState === 4 ) ) {
-							// Clean up
-							delete xhrCallbacks[ id ];
-							callback = undefined;
-							xhr.onreadystatechange = jQuery.noop;
-
-							// Abort manually if needed
-							if ( isAbort ) {
-								if ( xhr.readyState !== 4 ) {
-									xhr.abort();
-								}
-							} else {
-								responses = {};
-								status = xhr.status;
-
-								// Support: IE<10
-								// Accessing binary-data responseText throws an exception
-								// (#11426)
-								if ( typeof xhr.responseText === "string" ) {
-									responses.text = xhr.responseText;
-								}
-
-								// Firefox throws an exception when accessing
-								// statusText for faulty cross-domain requests
-								try {
-									statusText = xhr.statusText;
-								} catch( e ) {
-									// We normalize with Webkit giving an empty statusText
-									statusText = "";
-								}
-
-								// Filter status for non standard behaviors
-
-								// If the request is local and we have data: assume a success
-								// (success with no data won't get notified, that's the best we
-								// can do given current implementations)
-								if ( !status && options.isLocal && !options.crossDomain ) {
-									status = responses.text ? 200 : 404;
-								// IE - #1450: sometimes returns 1223 when it should be 204
-								} else if ( status === 1223 ) {
-									status = 204;
-								}
-							}
-						}
-
-						// Call complete if needed
-						if ( responses ) {
-							complete( status, statusText, responses, xhr.getAllResponseHeaders() );
-						}
-					};
-
-					if ( !options.async ) {
-						// if we're in sync mode we fire the callback
-						callback();
-					} else if ( xhr.readyState === 4 ) {
-						// (IE6 & IE7) if it's in cache and has been
-						// retrieved directly we need to fire the callback
-						setTimeout( callback );
-					} else {
-						// Add to the list of active xhr callbacks
-						xhr.onreadystatechange = xhrCallbacks[ id ] = callback;
-					}
-				},
-
-				abort: function() {
-					if ( callback ) {
-						callback( undefined, true );
-					}
-				}
-			};
-		}
-	});
-}
-
-// Functions to create xhrs
-function createStandardXHR() {
-	try {
-		return new window.XMLHttpRequest();
-	} catch( e ) {}
-}
-
-function createActiveXHR() {
-	try {
-		return new window.ActiveXObject( "Microsoft.XMLHTTP" );
-	} catch( e ) {}
-}
-
-
-
-
-// Install script dataType
-jQuery.ajaxSetup({
-	accepts: {
-		script: "text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"
-	},
-	contents: {
-		script: /(?:java|ecma)script/
-	},
-	converters: {
-		"text script": function( text ) {
-			jQuery.globalEval( text );
-			return text;
-		}
-	}
-});
-
-// Handle cache's special case and global
-jQuery.ajaxPrefilter( "script", function( s ) {
-	if ( s.cache === undefined ) {
-		s.cache = false;
-	}
-	if ( s.crossDomain ) {
-		s.type = "GET";
-		s.global = false;
-	}
-});
-
-// Bind script tag hack transport
-jQuery.ajaxTransport( "script", function(s) {
-
-	// This transport only deals with cross domain requests
-	if ( s.crossDomain ) {
-
-		var script,
-			head = document.head || jQuery("head")[0] || document.documentElement;
-
-		return {
-
-			send: function( _, callback ) {
-
-				script = document.createElement("script");
-
-				script.async = true;
-
-				if ( s.scriptCharset ) {
-					script.charset = s.scriptCharset;
-				}
-
-				script.src = s.url;
-
-				// Attach handlers for all browsers
-				script.onload = script.onreadystatechange = function( _, isAbort ) {
-
-					if ( isAbort || !script.readyState || /loaded|complete/.test( script.readyState ) ) {
-
-						// Handle memory leak in IE
-						script.onload = script.onreadystatechange = null;
-
-						// Remove the script
-						if ( script.parentNode ) {
-							script.parentNode.removeChild( script );
-						}
-
-						// Dereference the script
-						script = null;
-
-						// Callback if not abort
-						if ( !isAbort ) {
-							callback( 200, "success" );
-						}
-					}
-				};
-
-				// Circumvent IE6 bugs with base elements (#2709 and #4378) by prepending
-				// Use native DOM manipulation to avoid our domManip AJAX trickery
-				head.insertBefore( script, head.firstChild );
-			},
-
-			abort: function() {
-				if ( script ) {
-					script.onload( undefined, true );
-				}
-			}
-		};
-	}
-});
-
-
-
-
-var oldCallbacks = [],
-	rjsonp = /(=)\?(?=&|$)|\?\?/;
-
-// Default jsonp settings
-jQuery.ajaxSetup({
-	jsonp: "callback",
-	jsonpCallback: function() {
-		var callback = oldCallbacks.pop() || ( jQuery.expando + "_" + ( nonce++ ) );
-		this[ callback ] = true;
-		return callback;
-	}
-});
-
-// Detect, normalize options and install callbacks for jsonp requests
-jQuery.ajaxPrefilter( "json jsonp", function( s, originalSettings, jqXHR ) {
-
-	var callbackName, overwritten, responseContainer,
-		jsonProp = s.jsonp !== false && ( rjsonp.test( s.url ) ?
-			"url" :
-			typeof s.data === "string" && !( s.contentType || "" ).indexOf("application/x-www-form-urlencoded") && rjsonp.test( s.data ) && "data"
-		);
-
-	// Handle iff the expected data type is "jsonp" or we have a parameter to set
-	if ( jsonProp || s.dataTypes[ 0 ] === "jsonp" ) {
-
-		// Get callback name, remembering preexisting value associated with it
-		callbackName = s.jsonpCallback = jQuery.isFunction( s.jsonpCallback ) ?
-			s.jsonpCallback() :
-			s.jsonpCallback;
-
-		// Insert callback into url or form data
-		if ( jsonProp ) {
-			s[ jsonProp ] = s[ jsonProp ].replace( rjsonp, "$1" + callbackName );
-		} else if ( s.jsonp !== false ) {
-			s.url += ( rquery.test( s.url ) ? "&" : "?" ) + s.jsonp + "=" + callbackName;
-		}
-
-		// Use data converter to retrieve json after script execution
-		s.converters["script json"] = function() {
-			if ( !responseContainer ) {
-				jQuery.error( callbackName + " was not called" );
-			}
-			return responseContainer[ 0 ];
-		};
-
-		// force json dataType
-		s.dataTypes[ 0 ] = "json";
-
-		// Install callback
-		overwritten = window[ callbackName ];
-		window[ callbackName ] = function() {
-			responseContainer = arguments;
-		};
-
-		// Clean-up function (fires after converters)
-		jqXHR.always(function() {
-			// Restore preexisting value
-			window[ callbackName ] = overwritten;
-
-			// Save back as free
-			if ( s[ callbackName ] ) {
-				// make sure that re-using the options doesn't screw things around
-				s.jsonpCallback = originalSettings.jsonpCallback;
-
-				// save the callback name for future use
-				oldCallbacks.push( callbackName );
-			}
-
-			// Call if it was a function and we have a response
-			if ( responseContainer && jQuery.isFunction( overwritten ) ) {
-				overwritten( responseContainer[ 0 ] );
-			}
-
-			responseContainer = overwritten = undefined;
-		});
-
-		// Delegate to script
-		return "script";
-	}
-});
-
-
-
-
-// data: string of html
-// context (optional): If specified, the fragment will be created in this context, defaults to document
-// keepScripts (optional): If true, will include scripts passed in the html string
-jQuery.parseHTML = function( data, context, keepScripts ) {
-	if ( !data || typeof data !== "string" ) {
-		return null;
-	}
-	if ( typeof context === "boolean" ) {
-		keepScripts = context;
-		context = false;
-	}
-	context = context || document;
-
-	var parsed = rsingleTag.exec( data ),
-		scripts = !keepScripts && [];
-
-	// Single tag
-	if ( parsed ) {
-		return [ context.createElement( parsed[1] ) ];
-	}
-
-	parsed = jQuery.buildFragment( [ data ], context, scripts );
-
-	if ( scripts && scripts.length ) {
-		jQuery( scripts ).remove();
-	}
-
-	return jQuery.merge( [], parsed.childNodes );
-};
-
-
-// Keep a copy of the old load method
-var _load = jQuery.fn.load;
-
-/**
- * Load a url into a page
- */
-jQuery.fn.load = function( url, params, callback ) {
-	if ( typeof url !== "string" && _load ) {
-		return _load.apply( this, arguments );
-	}
-
-	var selector, response, type,
-		self = this,
-		off = url.indexOf(" ");
-
-	if ( off >= 0 ) {
-		selector = jQuery.trim( url.slice( off, url.length ) );
-		url = url.slice( 0, off );
-	}
-
-	// If it's a function
-	if ( jQuery.isFunction( params ) ) {
-
-		// We assume that it's the callback
-		callback = params;
-		params = undefined;
-
-	// Otherwise, build a param string
-	} else if ( params && typeof params === "object" ) {
-		type = "POST";
-	}
-
-	// If we have elements to modify, make the request
-	if ( self.length > 0 ) {
-		jQuery.ajax({
-			url: url,
-
-			// if "type" variable is undefined, then "GET" method will be used
-			type: type,
-			dataType: "html",
-			data: params
-		}).done(function( responseText ) {
-
-			// Save response for use in complete callback
-			response = arguments;
-
-			self.html( selector ?
-
-				// If a selector was specified, locate the right elements in a dummy div
-				// Exclude scripts to avoid IE 'Permission Denied' errors
-				jQuery("<div>").append( jQuery.parseHTML( responseText ) ).find( selector ) :
-
-				// Otherwise use the full result
-				responseText );
-
-		}).complete( callback && function( jqXHR, status ) {
-			self.each( callback, response || [ jqXHR.responseText, status, jqXHR ] );
-		});
-	}
-
-	return this;
-};
-
-
-
-
-jQuery.expr.filters.animated = function( elem ) {
-	return jQuery.grep(jQuery.timers, function( fn ) {
-		return elem === fn.elem;
-	}).length;
-};
-
-
-
-
-
-var docElem = window.document.documentElement;
-
-/**
- * Gets a window from an element
- */
-function getWindow( elem ) {
-	return jQuery.isWindow( elem ) ?
-		elem :
-		elem.nodeType === 9 ?
-			elem.defaultView || elem.parentWindow :
-			false;
-}
-
-jQuery.offset = {
-	setOffset: function( elem, options, i ) {
-		var curPosition, curLeft, curCSSTop, curTop, curOffset, curCSSLeft, calculatePosition,
-			position = jQuery.css( elem, "position" ),
-			curElem = jQuery( elem ),
-			props = {};
-
-		// set position first, in-case top/left are set even on static elem
-		if ( position === "static" ) {
-			elem.style.position = "relative";
-		}
-
-		curOffset = curElem.offset();
-		curCSSTop = jQuery.css( elem, "top" );
-		curCSSLeft = jQuery.css( elem, "left" );
-		calculatePosition = ( position === "absolute" || position === "fixed" ) &&
-			jQuery.inArray("auto", [ curCSSTop, curCSSLeft ] ) > -1;
-
-		// need to be able to calculate position if either top or left is auto and position is either absolute or fixed
-		if ( calculatePosition ) {
-			curPosition = curElem.position();
-			curTop = curPosition.top;
-			curLeft = curPosition.left;
-		} else {
-			curTop = parseFloat( curCSSTop ) || 0;
-			curLeft = parseFloat( curCSSLeft ) || 0;
-		}
-
-		if ( jQuery.isFunction( options ) ) {
-			options = options.call( elem, i, curOffset );
-		}
-
-		if ( options.top != null ) {
-			props.top = ( options.top - curOffset.top ) + curTop;
-		}
-		if ( options.left != null ) {
-			props.left = ( options.left - curOffset.left ) + curLeft;
-		}
-
-		if ( "using" in options ) {
-			options.using.call( elem, props );
-		} else {
-			curElem.css( props );
-		}
-	}
-};
-
-jQuery.fn.extend({
-	offset: function( options ) {
-		if ( arguments.length ) {
-			return options === undefined ?
-				this :
-				this.each(function( i ) {
-					jQuery.offset.setOffset( this, options, i );
-				});
-		}
-
-		var docElem, win,
-			box = { top: 0, left: 0 },
-			elem = this[ 0 ],
-			doc = elem && elem.ownerDocument;
-
-		if ( !doc ) {
-			return;
-		}
-
-		docElem = doc.documentElement;
-
-		// Make sure it's not a disconnected DOM node
-		if ( !jQuery.contains( docElem, elem ) ) {
-			return box;
-		}
-
-		// If we don't have gBCR, just use 0,0 rather than error
-		// BlackBerry 5, iOS 3 (original iPhone)
-		if ( typeof elem.getBoundingClientRect !== strundefined ) {
-			box = elem.getBoundingClientRect();
-		}
-		win = getWindow( doc );
-		return {
-			top: box.top  + ( win.pageYOffset || docElem.scrollTop )  - ( docElem.clientTop  || 0 ),
-			left: box.left + ( win.pageXOffset || docElem.scrollLeft ) - ( docElem.clientLeft || 0 )
-		};
-	},
-
-	position: function() {
-		if ( !this[ 0 ] ) {
-			return;
-		}
-
-		var offsetParent, offset,
-			parentOffset = { top: 0, left: 0 },
-			elem = this[ 0 ];
-
-		// fixed elements are offset from window (parentOffset = {top:0, left: 0}, because it is its only offset parent
-		if ( jQuery.css( elem, "position" ) === "fixed" ) {
-			// we assume that getBoundingClientRect is available when computed position is fixed
-			offset = elem.getBoundingClientRect();
-		} else {
-			// Get *real* offsetParent
-			offsetParent = this.offsetParent();
-
-			// Get correct offsets
-			offset = this.offset();
-			if ( !jQuery.nodeName( offsetParent[ 0 ], "html" ) ) {
-				parentOffset = offsetParent.offset();
-			}
-
-			// Add offsetParent borders
-			parentOffset.top  += jQuery.css( offsetParent[ 0 ], "borderTopWidth", true );
-			parentOffset.left += jQuery.css( offsetParent[ 0 ], "borderLeftWidth", true );
-		}
-
-		// Subtract parent offsets and element margins
-		// note: when an element has margin: auto the offsetLeft and marginLeft
-		// are the same in Safari causing offset.left to incorrectly be 0
-		return {
-			top:  offset.top  - parentOffset.top - jQuery.css( elem, "marginTop", true ),
-			left: offset.left - parentOffset.left - jQuery.css( elem, "marginLeft", true)
-		};
-	},
-
-	offsetParent: function() {
-		return this.map(function() {
-			var offsetParent = this.offsetParent || docElem;
-
-			while ( offsetParent && ( !jQuery.nodeName( offsetParent, "html" ) && jQuery.css( offsetParent, "position" ) === "static" ) ) {
-				offsetParent = offsetParent.offsetParent;
-			}
-			return offsetParent || docElem;
-		});
-	}
-});
-
-// Create scrollLeft and scrollTop methods
-jQuery.each( { scrollLeft: "pageXOffset", scrollTop: "pageYOffset" }, function( method, prop ) {
-	var top = /Y/.test( prop );
-
-	jQuery.fn[ method ] = function( val ) {
-		return access( this, function( elem, method, val ) {
-			var win = getWindow( elem );
-
-			if ( val === undefined ) {
-				return win ? (prop in win) ? win[ prop ] :
-					win.document.documentElement[ method ] :
-					elem[ method ];
-			}
-
-			if ( win ) {
-				win.scrollTo(
-					!top ? val : jQuery( win ).scrollLeft(),
-					top ? val : jQuery( win ).scrollTop()
-				);
-
-			} else {
-				elem[ method ] = val;
-			}
-		}, method, val, arguments.length, null );
-	};
-});
-
-// Add the top/left cssHooks using jQuery.fn.position
-// Webkit bug: https://bugs.webkit.org/show_bug.cgi?id=29084
-// getComputedStyle returns percent when specified for top/left/bottom/right
-// rather than make the css module depend on the offset module, we just check for it here
-jQuery.each( [ "top", "left" ], function( i, prop ) {
-	jQuery.cssHooks[ prop ] = addGetHookIf( support.pixelPosition,
-		function( elem, computed ) {
-			if ( computed ) {
-				computed = curCSS( elem, prop );
-				// if curCSS returns percentage, fallback to offset
-				return rnumnonpx.test( computed ) ?
-					jQuery( elem ).position()[ prop ] + "px" :
-					computed;
-			}
-		}
-	);
-});
-
-
-// Create innerHeight, innerWidth, height, width, outerHeight and outerWidth methods
-jQuery.each( { Height: "height", Width: "width" }, function( name, type ) {
-	jQuery.each( { padding: "inner" + name, content: type, "": "outer" + name }, function( defaultExtra, funcName ) {
-		// margin is only for outerHeight, outerWidth
-		jQuery.fn[ funcName ] = function( margin, value ) {
-			var chainable = arguments.length && ( defaultExtra || typeof margin !== "boolean" ),
-				extra = defaultExtra || ( margin === true || value === true ? "margin" : "border" );
-
-			return access( this, function( elem, type, value ) {
-				var doc;
-
-				if ( jQuery.isWindow( elem ) ) {
-					// As of 5/8/2012 this will yield incorrect results for Mobile Safari, but there
-					// isn't a whole lot we can do. See pull request at this URL for discussion:
-					// https://github.com/jquery/jquery/pull/764
-					return elem.document.documentElement[ "client" + name ];
-				}
-
-				// Get document width or height
-				if ( elem.nodeType === 9 ) {
-					doc = elem.documentElement;
-
-					// Either scroll[Width/Height] or offset[Width/Height] or client[Width/Height], whichever is greatest
-					// unfortunately, this causes bug #3838 in IE6/8 only, but there is currently no good, small way to fix it.
-					return Math.max(
-						elem.body[ "scroll" + name ], doc[ "scroll" + name ],
-						elem.body[ "offset" + name ], doc[ "offset" + name ],
-						doc[ "client" + name ]
-					);
-				}
-
-				return value === undefined ?
-					// Get width or height on the element, requesting but not forcing parseFloat
-					jQuery.css( elem, type, extra ) :
-
-					// Set width or height on the element
-					jQuery.style( elem, type, value, extra );
-			}, type, chainable ? margin : undefined, chainable, null );
-		};
-	});
-});
-
-
-// The number of elements contained in the matched element set
-jQuery.fn.size = function() {
-	return this.length;
-};
-
-jQuery.fn.andSelf = jQuery.fn.addBack;
-
-
-
-
-// Register as a named AMD module, since jQuery can be concatenated with other
-// files that may use define, but not via a proper concatenation script that
-// understands anonymous AMD modules. A named AMD is safest and most robust
-// way to register. Lowercase jquery is used because AMD module names are
-// derived from file names, and jQuery is normally delivered in a lowercase
-// file name. Do this after creating the global so that if an AMD module wants
-// to call noConflict to hide this version of jQuery, it will work.
-
-// Note that for maximum portability, libraries that are not jQuery should
-// declare themselves as anonymous modules, and avoid setting a global if an
-// AMD loader is present. jQuery is a special case. For more information, see
-// https://github.com/jrburke/requirejs/wiki/Updating-existing-libraries#wiki-anon
-
-if ( typeof define === "function" && define.amd ) {
-	define( "jquery", [], function() {
-		return jQuery;
-	});
-}
-
-
-
-
-var
-	// Map over jQuery in case of overwrite
-	_jQuery = window.jQuery,
-
-	// Map over the $ in case of overwrite
-	_$ = window.$;
-
-jQuery.noConflict = function( deep ) {
-	if ( window.$ === jQuery ) {
-		window.$ = _$;
-	}
-
-	if ( deep && window.jQuery === jQuery ) {
-		window.jQuery = _jQuery;
-	}
-
-	return jQuery;
-};
-
-// Expose jQuery and $ identifiers, even in
-// AMD (#7102#comment:10, https://github.com/jquery/jquery/pull/557)
-// and CommonJS for browser emulators (#13566)
-if ( typeof noGlobal === strundefined ) {
-	window.jQuery = window.$ = jQuery;
-}
-
-
-
-
-return jQuery;
-
-}));
diff --git a/docs/static/jquery.js b/docs/static/jquery.js
deleted file mode 100644
index ab28a247..00000000
--- a/docs/static/jquery.js
+++ /dev/null
@@ -1,4 +0,0 @@
-/*! jQuery v1.11.1 | (c) 2005, 2014 jQuery Foundation, Inc. | jquery.org/license */
-!function(a,b){"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){var c=[],d=c.slice,e=c.concat,f=c.push,g=c.indexOf,h={},i=h.toString,j=h.hasOwnProperty,k={},l="1.11.1",m=function(a,b){return new m.fn.init(a,b)},n=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,o=/^-ms-/,p=/-([\da-z])/gi,q=function(a,b){return b.toUpperCase()};m.fn=m.prototype={jquery:l,constructor:m,selector:"",length:0,toArray:function(){return d.call(this)},get:function(a){return null!=a?0>a?this[a+this.length]:this[a]:d.call(this)},pushStack:function(a){var b=m.merge(this.constructor(),a);return b.prevObject=this,b.context=this.context,b},each:function(a,b){return m.each(this,a,b)},map:function(a){return this.pushStack(m.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(d.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(a){var b=this.length,c=+a+(0>a?b:0);return this.pushStack(c>=0&&b>c?[this[c]]:[])},end:function(){return this.prevObject||this.constructor(null)},push:f,sort:c.sort,splice:c.splice},m.extend=m.fn.extend=function(){var a,b,c,d,e,f,g=arguments[0]||{},h=1,i=arguments.length,j=!1;for("boolean"==typeof g&&(j=g,g=arguments[h]||{},h++),"object"==typeof g||m.isFunction(g)||(g={}),h===i&&(g=this,h--);i>h;h++)if(null!=(e=arguments[h]))for(d in e)a=g[d],c=e[d],g!==c&&(j&&c&&(m.isPlainObject(c)||(b=m.isArray(c)))?(b?(b=!1,f=a&&m.isArray(a)?a:[]):f=a&&m.isPlainObject(a)?a:{},g[d]=m.extend(j,f,c)):void 0!==c&&(g[d]=c));return g},m.extend({expando:"jQuery"+(l+Math.random()).replace(/\D/g,""),isReady:!0,error:function(a){throw new Error(a)},noop:function(){},isFunction:function(a){return"function"===m.type(a)},isArray:Array.isArray||function(a){return"array"===m.type(a)},isWindow:function(a){return null!=a&&a==a.window},isNumeric:function(a){return!m.isArray(a)&&a-parseFloat(a)>=0},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},isPlainObject:function(a){var b;if(!a||"object"!==m.type(a)||a.nodeType||m.isWindow(a))return!1;try{if(a.constructor&&!j.call(a,"constructor")&&!j.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}if(k.ownLast)for(b in a)return j.call(a,b);for(b in a);return void 0===b||j.call(a,b)},type:function(a){return null==a?a+"":"object"==typeof a||"function"==typeof a?h[i.call(a)]||"object":typeof a},globalEval:function(b){b&&m.trim(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(o,"ms-").replace(p,q)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()},each:function(a,b,c){var d,e=0,f=a.length,g=r(a);if(c){if(g){for(;f>e;e++)if(d=b.apply(a[e],c),d===!1)break}else for(e in a)if(d=b.apply(a[e],c),d===!1)break}else if(g){for(;f>e;e++)if(d=b.call(a[e],e,a[e]),d===!1)break}else for(e in a)if(d=b.call(a[e],e,a[e]),d===!1)break;return a},trim:function(a){return null==a?"":(a+"").replace(n,"")},makeArray:function(a,b){var c=b||[];return null!=a&&(r(Object(a))?m.merge(c,"string"==typeof a?[a]:a):f.call(c,a)),c},inArray:function(a,b,c){var d;if(b){if(g)return g.call(b,a,c);for(d=b.length,c=c?0>c?Math.max(0,d+c):c:0;d>c;c++)if(c in b&&b[c]===a)return c}return-1},merge:function(a,b){var c=+b.length,d=0,e=a.length;while(c>d)a[e++]=b[d++];if(c!==c)while(void 0!==b[d])a[e++]=b[d++];return a.length=e,a},grep:function(a,b,c){for(var d,e=[],f=0,g=a.length,h=!c;g>f;f++)d=!b(a[f],f),d!==h&&e.push(a[f]);return e},map:function(a,b,c){var d,f=0,g=a.length,h=r(a),i=[];if(h)for(;g>f;f++)d=b(a[f],f,c),null!=d&&i.push(d);else for(f in a)d=b(a[f],f,c),null!=d&&i.push(d);return e.apply([],i)},guid:1,proxy:function(a,b){var c,e,f;return"string"==typeof b&&(f=a[b],b=a,a=f),m.isFunction(a)?(c=d.call(arguments,2),e=function(){return a.apply(b||this,c.concat(d.call(arguments)))},e.guid=a.guid=a.guid||m.guid++,e):void 0},now:function(){return+new Date},support:k}),m.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(a,b){h["[object "+b+"]"]=b.toLowerCase()});function r(a){var b=a.length,c=m.type(a);return"function"===c||m.isWindow(a)?!1:1===a.nodeType&&b?!0:"array"===c||0===b||"number"==typeof b&&b>0&&b-1 in a}var s=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u="sizzle"+-new Date,v=a.document,w=0,x=0,y=gb(),z=gb(),A=gb(),B=function(a,b){return a===b&&(l=!0),0},C="undefined",D=1<<31,E={}.hasOwnProperty,F=[],G=F.pop,H=F.push,I=F.push,J=F.slice,K=F.indexOf||function(a){for(var b=0,c=this.length;c>b;b++)if(this[b]===a)return b;return-1},L="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",M="[\\x20\\t\\r\\n\\f]",N="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",O=N.replace("w","w#"),P="\\["+M+"*("+N+")(?:"+M+"*([*^$|!~]?=)"+M+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+O+"))|)"+M+"*\\]",Q=":("+N+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+P+")*)|.*)\\)|)",R=new RegExp("^"+M+"+|((?:^|[^\\\\])(?:\\\\.)*)"+M+"+$","g"),S=new RegExp("^"+M+"*,"+M+"*"),T=new RegExp("^"+M+"*([>+~]|"+M+")"+M+"*"),U=new RegExp("="+M+"*([^\\]'\"]*?)"+M+"*\\]","g"),V=new RegExp(Q),W=new RegExp("^"+O+"$"),X={ID:new RegExp("^#("+N+")"),CLASS:new RegExp("^\\.("+N+")"),TAG:new RegExp("^("+N.replace("w","w*")+")"),ATTR:new RegExp("^"+P),PSEUDO:new RegExp("^"+Q),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:new RegExp("^(?:"+L+")$","i"),needsContext:new RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},Y=/^(?:input|select|textarea|button)$/i,Z=/^h\d$/i,$=/^[^{]+\{\s*\[native \w/,_=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ab=/[+~]/,bb=/'|\\/g,cb=new RegExp("\\\\([\\da-f]{1,6}"+M+"?|("+M+")|.)","ig"),db=function(a,b,c){var d="0x"+b-65536;return d!==d||c?b:0>d?String.fromCharCode(d+65536):String.fromCharCode(d>>10|55296,1023&d|56320)};try{I.apply(F=J.call(v.childNodes),v.childNodes),F[v.childNodes.length].nodeType}catch(eb){I={apply:F.length?function(a,b){H.apply(a,J.call(b))}:function(a,b){var c=a.length,d=0;while(a[c++]=b[d++]);a.length=c-1}}}function fb(a,b,d,e){var f,h,j,k,l,o,r,s,w,x;if((b?b.ownerDocument||b:v)!==n&&m(b),b=b||n,d=d||[],!a||"string"!=typeof a)return d;if(1!==(k=b.nodeType)&&9!==k)return[];if(p&&!e){if(f=_.exec(a))if(j=f[1]){if(9===k){if(h=b.getElementById(j),!h||!h.parentNode)return d;if(h.id===j)return d.push(h),d}else if(b.ownerDocument&&(h=b.ownerDocument.getElementById(j))&&t(b,h)&&h.id===j)return d.push(h),d}else{if(f[2])return I.apply(d,b.getElementsByTagName(a)),d;if((j=f[3])&&c.getElementsByClassName&&b.getElementsByClassName)return I.apply(d,b.getElementsByClassName(j)),d}if(c.qsa&&(!q||!q.test(a))){if(s=r=u,w=b,x=9===k&&a,1===k&&"object"!==b.nodeName.toLowerCase()){o=g(a),(r=b.getAttribute("id"))?s=r.replace(bb,"\\$&"):b.setAttribute("id",s),s="[id='"+s+"'] ",l=o.length;while(l--)o[l]=s+qb(o[l]);w=ab.test(a)&&ob(b.parentNode)||b,x=o.join(",")}if(x)try{return I.apply(d,w.querySelectorAll(x)),d}catch(y){}finally{r||b.removeAttribute("id")}}}return i(a.replace(R,"$1"),b,d,e)}function gb(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function hb(a){return a[u]=!0,a}function ib(a){var b=n.createElement("div");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function jb(a,b){var c=a.split("|"),e=a.length;while(e--)d.attrHandle[c[e]]=b}function kb(a,b){var c=b&&a,d=c&&1===a.nodeType&&1===b.nodeType&&(~b.sourceIndex||D)-(~a.sourceIndex||D);if(d)return d;if(c)while(c=c.nextSibling)if(c===b)return-1;return a?1:-1}function lb(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function mb(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function nb(a){return hb(function(b){return b=+b,hb(function(c,d){var e,f=a([],c.length,b),g=f.length;while(g--)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function ob(a){return a&&typeof a.getElementsByTagName!==C&&a}c=fb.support={},f=fb.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?"HTML"!==b.nodeName:!1},m=fb.setDocument=function(a){var b,e=a?a.ownerDocument||a:v,g=e.defaultView;return e!==n&&9===e.nodeType&&e.documentElement?(n=e,o=e.documentElement,p=!f(e),g&&g!==g.top&&(g.addEventListener?g.addEventListener("unload",function(){m()},!1):g.attachEvent&&g.attachEvent("onunload",function(){m()})),c.attributes=ib(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=ib(function(a){return a.appendChild(e.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=$.test(e.getElementsByClassName)&&ib(function(a){return a.innerHTML="<div class='a'></div><div class='a i'></div>",a.firstChild.className="i",2===a.getElementsByClassName("i").length}),c.getById=ib(function(a){return o.appendChild(a).id=u,!e.getElementsByName||!e.getElementsByName(u).length}),c.getById?(d.find.ID=function(a,b){if(typeof b.getElementById!==C&&p){var c=b.getElementById(a);return c&&c.parentNode?[c]:[]}},d.filter.ID=function(a){var b=a.replace(cb,db);return function(a){return a.getAttribute("id")===b}}):(delete d.find.ID,d.filter.ID=function(a){var b=a.replace(cb,db);return function(a){var c=typeof a.getAttributeNode!==C&&a.getAttributeNode("id");return c&&c.value===b}}),d.find.TAG=c.getElementsByTagName?function(a,b){return typeof b.getElementsByTagName!==C?b.getElementsByTagName(a):void 0}:function(a,b){var c,d=[],e=0,f=b.getElementsByTagName(a);if("*"===a){while(c=f[e++])1===c.nodeType&&d.push(c);return d}return f},d.find.CLASS=c.getElementsByClassName&&function(a,b){return typeof b.getElementsByClassName!==C&&p?b.getElementsByClassName(a):void 0},r=[],q=[],(c.qsa=$.test(e.querySelectorAll))&&(ib(function(a){a.innerHTML="<select msallowclip=''><option selected=''></option></select>",a.querySelectorAll("[msallowclip^='']").length&&q.push("[*^$]="+M+"*(?:''|\"\")"),a.querySelectorAll("[selected]").length||q.push("\\["+M+"*(?:value|"+L+")"),a.querySelectorAll(":checked").length||q.push(":checked")}),ib(function(a){var b=e.createElement("input");b.setAttribute("type","hidden"),a.appendChild(b).setAttribute("name","D"),a.querySelectorAll("[name=d]").length&&q.push("name"+M+"*[*^$|!~]?="),a.querySelectorAll(":enabled").length||q.push(":enabled",":disabled"),a.querySelectorAll("*,:x"),q.push(",.*:")})),(c.matchesSelector=$.test(s=o.matches||o.webkitMatchesSelector||o.mozMatchesSelector||o.oMatchesSelector||o.msMatchesSelector))&&ib(function(a){c.disconnectedMatch=s.call(a,"div"),s.call(a,"[s!='']:x"),r.push("!=",Q)}),q=q.length&&new RegExp(q.join("|")),r=r.length&&new RegExp(r.join("|")),b=$.test(o.compareDocumentPosition),t=b||$.test(o.contains)?function(a,b){var c=9===a.nodeType?a.documentElement:a,d=b&&b.parentNode;return a===d||!(!d||1!==d.nodeType||!(c.contains?c.contains(d):a.compareDocumentPosition&&16&a.compareDocumentPosition(d)))}:function(a,b){if(b)while(b=b.parentNode)if(b===a)return!0;return!1},B=b?function(a,b){if(a===b)return l=!0,0;var d=!a.compareDocumentPosition-!b.compareDocumentPosition;return d?d:(d=(a.ownerDocument||a)===(b.ownerDocument||b)?a.compareDocumentPosition(b):1,1&d||!c.sortDetached&&b.compareDocumentPosition(a)===d?a===e||a.ownerDocument===v&&t(v,a)?-1:b===e||b.ownerDocument===v&&t(v,b)?1:k?K.call(k,a)-K.call(k,b):0:4&d?-1:1)}:function(a,b){if(a===b)return l=!0,0;var c,d=0,f=a.parentNode,g=b.parentNode,h=[a],i=[b];if(!f||!g)return a===e?-1:b===e?1:f?-1:g?1:k?K.call(k,a)-K.call(k,b):0;if(f===g)return kb(a,b);c=a;while(c=c.parentNode)h.unshift(c);c=b;while(c=c.parentNode)i.unshift(c);while(h[d]===i[d])d++;return d?kb(h[d],i[d]):h[d]===v?-1:i[d]===v?1:0},e):n},fb.matches=function(a,b){return fb(a,null,null,b)},fb.matchesSelector=function(a,b){if((a.ownerDocument||a)!==n&&m(a),b=b.replace(U,"='$1']"),!(!c.matchesSelector||!p||r&&r.test(b)||q&&q.test(b)))try{var d=s.call(a,b);if(d||c.disconnectedMatch||a.document&&11!==a.document.nodeType)return d}catch(e){}return fb(b,n,null,[a]).length>0},fb.contains=function(a,b){return(a.ownerDocument||a)!==n&&m(a),t(a,b)},fb.attr=function(a,b){(a.ownerDocument||a)!==n&&m(a);var e=d.attrHandle[b.toLowerCase()],f=e&&E.call(d.attrHandle,b.toLowerCase())?e(a,b,!p):void 0;return void 0!==f?f:c.attributes||!p?a.getAttribute(b):(f=a.getAttributeNode(b))&&f.specified?f.value:null},fb.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},fb.uniqueSort=function(a){var b,d=[],e=0,f=0;if(l=!c.detectDuplicates,k=!c.sortStable&&a.slice(0),a.sort(B),l){while(b=a[f++])b===a[f]&&(e=d.push(f));while(e--)a.splice(d[e],1)}return k=null,a},e=fb.getText=function(a){var b,c="",d=0,f=a.nodeType;if(f){if(1===f||9===f||11===f){if("string"==typeof a.textContent)return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=e(a)}else if(3===f||4===f)return a.nodeValue}else while(b=a[d++])c+=e(b);return c},d=fb.selectors={cacheLength:50,createPseudo:hb,match:X,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(cb,db),a[3]=(a[3]||a[4]||a[5]||"").replace(cb,db),"~="===a[2]&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),"nth"===a[1].slice(0,3)?(a[3]||fb.error(a[0]),a[4]=+(a[4]?a[5]+(a[6]||1):2*("even"===a[3]||"odd"===a[3])),a[5]=+(a[7]+a[8]||"odd"===a[3])):a[3]&&fb.error(a[0]),a},PSEUDO:function(a){var b,c=!a[6]&&a[2];return X.CHILD.test(a[0])?null:(a[3]?a[2]=a[4]||a[5]||"":c&&V.test(c)&&(b=g(c,!0))&&(b=c.indexOf(")",c.length-b)-c.length)&&(a[0]=a[0].slice(0,b),a[2]=c.slice(0,b)),a.slice(0,3))}},filter:{TAG:function(a){var b=a.replace(cb,db).toLowerCase();return"*"===a?function(){return!0}:function(a){return a.nodeName&&a.nodeName.toLowerCase()===b}},CLASS:function(a){var b=y[a+" "];return b||(b=new RegExp("(^|"+M+")"+a+"("+M+"|$)"))&&y(a,function(a){return b.test("string"==typeof a.className&&a.className||typeof a.getAttribute!==C&&a.getAttribute("class")||"")})},ATTR:function(a,b,c){return function(d){var e=fb.attr(d,a);return null==e?"!="===b:b?(e+="","="===b?e===c:"!="===b?e!==c:"^="===b?c&&0===e.indexOf(c):"*="===b?c&&e.indexOf(c)>-1:"$="===b?c&&e.slice(-c.length)===c:"~="===b?(" "+e+" ").indexOf(c)>-1:"|="===b?e===c||e.slice(0,c.length+1)===c+"-":!1):!0}},CHILD:function(a,b,c,d,e){var f="nth"!==a.slice(0,3),g="last"!==a.slice(-4),h="of-type"===b;return 1===d&&0===e?function(a){return!!a.parentNode}:function(b,c,i){var j,k,l,m,n,o,p=f!==g?"nextSibling":"previousSibling",q=b.parentNode,r=h&&b.nodeName.toLowerCase(),s=!i&&!h;if(q){if(f){while(p){l=b;while(l=l[p])if(h?l.nodeName.toLowerCase()===r:1===l.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&s){k=q[u]||(q[u]={}),j=k[a]||[],n=j[0]===w&&j[1],m=j[0]===w&&j[2],l=n&&q.childNodes[n];while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if(1===l.nodeType&&++m&&l===b){k[a]=[w,n,m];break}}else if(s&&(j=(b[u]||(b[u]={}))[a])&&j[0]===w)m=j[1];else while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if((h?l.nodeName.toLowerCase()===r:1===l.nodeType)&&++m&&(s&&((l[u]||(l[u]={}))[a]=[w,m]),l===b))break;return m-=e,m===d||m%d===0&&m/d>=0}}},PSEUDO:function(a,b){var c,e=d.pseudos[a]||d.setFilters[a.toLowerCase()]||fb.error("unsupported pseudo: "+a);return e[u]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?hb(function(a,c){var d,f=e(a,b),g=f.length;while(g--)d=K.call(a,f[g]),a[d]=!(c[d]=f[g])}):function(a){return e(a,0,c)}):e}},pseudos:{not:hb(function(a){var b=[],c=[],d=h(a.replace(R,"$1"));return d[u]?hb(function(a,b,c,e){var f,g=d(a,null,e,[]),h=a.length;while(h--)(f=g[h])&&(a[h]=!(b[h]=f))}):function(a,e,f){return b[0]=a,d(b,null,f,c),!c.pop()}}),has:hb(function(a){return function(b){return fb(a,b).length>0}}),contains:hb(function(a){return function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:hb(function(a){return W.test(a||"")||fb.error("unsupported lang: "+a),a=a.replace(cb,db).toLowerCase(),function(b){var c;do if(c=p?b.lang:b.getAttribute("xml:lang")||b.getAttribute("lang"))return c=c.toLowerCase(),c===a||0===c.indexOf(a+"-");while((b=b.parentNode)&&1===b.nodeType);return!1}}),target:function(b){var c=a.location&&a.location.hash;return c&&c.slice(1)===b.id},root:function(a){return a===o},focus:function(a){return a===n.activeElement&&(!n.hasFocus||n.hasFocus())&&!!(a.type||a.href||~a.tabIndex)},enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&!!a.checked||"option"===b&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},empty:function(a){for(a=a.firstChild;a;a=a.nextSibling)if(a.nodeType<6)return!1;return!0},parent:function(a){return!d.pseudos.empty(a)},header:function(a){return Z.test(a.nodeName)},input:function(a){return Y.test(a.nodeName)},button:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&"button"===a.type||"button"===b},text:function(a){var b;return"input"===a.nodeName.toLowerCase()&&"text"===a.type&&(null==(b=a.getAttribute("type"))||"text"===b.toLowerCase())},first:nb(function(){return[0]}),last:nb(function(a,b){return[b-1]}),eq:nb(function(a,b,c){return[0>c?c+b:c]}),even:nb(function(a,b){for(var c=0;b>c;c+=2)a.push(c);return a}),odd:nb(function(a,b){for(var c=1;b>c;c+=2)a.push(c);return a}),lt:nb(function(a,b,c){for(var d=0>c?c+b:c;--d>=0;)a.push(d);return a}),gt:nb(function(a,b,c){for(var d=0>c?c+b:c;++d<b;)a.push(d);return a})}},d.pseudos.nth=d.pseudos.eq;for(b in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})d.pseudos[b]=lb(b);for(b in{submit:!0,reset:!0})d.pseudos[b]=mb(b);function pb(){}pb.prototype=d.filters=d.pseudos,d.setFilters=new pb,g=fb.tokenize=function(a,b){var c,e,f,g,h,i,j,k=z[a+" "];if(k)return b?0:k.slice(0);h=a,i=[],j=d.preFilter;while(h){(!c||(e=S.exec(h)))&&(e&&(h=h.slice(e[0].length)||h),i.push(f=[])),c=!1,(e=T.exec(h))&&(c=e.shift(),f.push({value:c,type:e[0].replace(R," ")}),h=h.slice(c.length));for(g in d.filter)!(e=X[g].exec(h))||j[g]&&!(e=j[g](e))||(c=e.shift(),f.push({value:c,type:g,matches:e}),h=h.slice(c.length));if(!c)break}return b?h.length:h?fb.error(a):z(a,i).slice(0)};function qb(a){for(var b=0,c=a.length,d="";c>b;b++)d+=a[b].value;return d}function rb(a,b,c){var d=b.dir,e=c&&"parentNode"===d,f=x++;return b.first?function(b,c,f){while(b=b[d])if(1===b.nodeType||e)return a(b,c,f)}:function(b,c,g){var h,i,j=[w,f];if(g){while(b=b[d])if((1===b.nodeType||e)&&a(b,c,g))return!0}else while(b=b[d])if(1===b.nodeType||e){if(i=b[u]||(b[u]={}),(h=i[d])&&h[0]===w&&h[1]===f)return j[2]=h[2];if(i[d]=j,j[2]=a(b,c,g))return!0}}}function sb(a){return a.length>1?function(b,c,d){var e=a.length;while(e--)if(!a[e](b,c,d))return!1;return!0}:a[0]}function tb(a,b,c){for(var d=0,e=b.length;e>d;d++)fb(a,b[d],c);return c}function ub(a,b,c,d,e){for(var f,g=[],h=0,i=a.length,j=null!=b;i>h;h++)(f=a[h])&&(!c||c(f,d,e))&&(g.push(f),j&&b.push(h));return g}function vb(a,b,c,d,e,f){return d&&!d[u]&&(d=vb(d)),e&&!e[u]&&(e=vb(e,f)),hb(function(f,g,h,i){var j,k,l,m=[],n=[],o=g.length,p=f||tb(b||"*",h.nodeType?[h]:h,[]),q=!a||!f&&b?p:ub(p,m,a,h,i),r=c?e||(f?a:o||d)?[]:g:q;if(c&&c(q,r,h,i),d){j=ub(r,n),d(j,[],h,i),k=j.length;while(k--)(l=j[k])&&(r[n[k]]=!(q[n[k]]=l))}if(f){if(e||a){if(e){j=[],k=r.length;while(k--)(l=r[k])&&j.push(q[k]=l);e(null,r=[],j,i)}k=r.length;while(k--)(l=r[k])&&(j=e?K.call(f,l):m[k])>-1&&(f[j]=!(g[j]=l))}}else r=ub(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):I.apply(g,r)})}function wb(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],h=g||d.relative[" "],i=g?1:0,k=rb(function(a){return a===b},h,!0),l=rb(function(a){return K.call(b,a)>-1},h,!0),m=[function(a,c,d){return!g&&(d||c!==j)||((b=c).nodeType?k(a,c,d):l(a,c,d))}];f>i;i++)if(c=d.relative[a[i].type])m=[rb(sb(m),c)];else{if(c=d.filter[a[i].type].apply(null,a[i].matches),c[u]){for(e=++i;f>e;e++)if(d.relative[a[e].type])break;return vb(i>1&&sb(m),i>1&&qb(a.slice(0,i-1).concat({value:" "===a[i-2].type?"*":""})).replace(R,"$1"),c,e>i&&wb(a.slice(i,e)),f>e&&wb(a=a.slice(e)),f>e&&qb(a))}m.push(c)}return sb(m)}function xb(a,b){var c=b.length>0,e=a.length>0,f=function(f,g,h,i,k){var l,m,o,p=0,q="0",r=f&&[],s=[],t=j,u=f||e&&d.find.TAG("*",k),v=w+=null==t?1:Math.random()||.1,x=u.length;for(k&&(j=g!==n&&g);q!==x&&null!=(l=u[q]);q++){if(e&&l){m=0;while(o=a[m++])if(o(l,g,h)){i.push(l);break}k&&(w=v)}c&&((l=!o&&l)&&p--,f&&r.push(l))}if(p+=q,c&&q!==p){m=0;while(o=b[m++])o(r,s,g,h);if(f){if(p>0)while(q--)r[q]||s[q]||(s[q]=G.call(i));s=ub(s)}I.apply(i,s),k&&!f&&s.length>0&&p+b.length>1&&fb.uniqueSort(i)}return k&&(w=v,j=t),r};return c?hb(f):f}return h=fb.compile=function(a,b){var c,d=[],e=[],f=A[a+" "];if(!f){b||(b=g(a)),c=b.length;while(c--)f=wb(b[c]),f[u]?d.push(f):e.push(f);f=A(a,xb(e,d)),f.selector=a}return f},i=fb.select=function(a,b,e,f){var i,j,k,l,m,n="function"==typeof a&&a,o=!f&&g(a=n.selector||a);if(e=e||[],1===o.length){if(j=o[0]=o[0].slice(0),j.length>2&&"ID"===(k=j[0]).type&&c.getById&&9===b.nodeType&&p&&d.relative[j[1].type]){if(b=(d.find.ID(k.matches[0].replace(cb,db),b)||[])[0],!b)return e;n&&(b=b.parentNode),a=a.slice(j.shift().value.length)}i=X.needsContext.test(a)?0:j.length;while(i--){if(k=j[i],d.relative[l=k.type])break;if((m=d.find[l])&&(f=m(k.matches[0].replace(cb,db),ab.test(j[0].type)&&ob(b.parentNode)||b))){if(j.splice(i,1),a=f.length&&qb(j),!a)return I.apply(e,f),e;break}}}return(n||h(a,o))(f,b,!p,e,ab.test(a)&&ob(b.parentNode)||b),e},c.sortStable=u.split("").sort(B).join("")===u,c.detectDuplicates=!!l,m(),c.sortDetached=ib(function(a){return 1&a.compareDocumentPosition(n.createElement("div"))}),ib(function(a){return a.innerHTML="<a href='#'></a>","#"===a.firstChild.getAttribute("href")})||jb("type|href|height|width",function(a,b,c){return c?void 0:a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),c.attributes&&ib(function(a){return a.innerHTML="<input/>",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||jb("value",function(a,b,c){return c||"input"!==a.nodeName.toLowerCase()?void 0:a.defaultValue}),ib(function(a){return null==a.getAttribute("disabled")})||jb(L,function(a,b,c){var d;return c?void 0:a[b]===!0?b.toLowerCase():(d=a.getAttributeNode(b))&&d.specified?d.value:null}),fb}(a);m.find=s,m.expr=s.selectors,m.expr[":"]=m.expr.pseudos,m.unique=s.uniqueSort,m.text=s.getText,m.isXMLDoc=s.isXML,m.contains=s.contains;var t=m.expr.match.needsContext,u=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,v=/^.[^:#\[\.,]*$/;function w(a,b,c){if(m.isFunction(b))return m.grep(a,function(a,d){return!!b.call(a,d,a)!==c});if(b.nodeType)return m.grep(a,function(a){return a===b!==c});if("string"==typeof b){if(v.test(b))return m.filter(b,a,c);b=m.filter(b,a)}return m.grep(a,function(a){return m.inArray(a,b)>=0!==c})}m.filter=function(a,b,c){var d=b[0];return c&&(a=":not("+a+")"),1===b.length&&1===d.nodeType?m.find.matchesSelector(d,a)?[d]:[]:m.find.matches(a,m.grep(b,function(a){return 1===a.nodeType}))},m.fn.extend({find:function(a){var b,c=[],d=this,e=d.length;if("string"!=typeof a)return this.pushStack(m(a).filter(function(){for(b=0;e>b;b++)if(m.contains(d[b],this))return!0}));for(b=0;e>b;b++)m.find(a,d[b],c);return c=this.pushStack(e>1?m.unique(c):c),c.selector=this.selector?this.selector+" "+a:a,c},filter:function(a){return this.pushStack(w(this,a||[],!1))},not:function(a){return this.pushStack(w(this,a||[],!0))},is:function(a){return!!w(this,"string"==typeof a&&t.test(a)?m(a):a||[],!1).length}});var x,y=a.document,z=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,A=m.fn.init=function(a,b){var c,d;if(!a)return this;if("string"==typeof a){if(c="<"===a.charAt(0)&&">"===a.charAt(a.length-1)&&a.length>=3?[null,a,null]:z.exec(a),!c||!c[1]&&b)return!b||b.jquery?(b||x).find(a):this.constructor(b).find(a);if(c[1]){if(b=b instanceof m?b[0]:b,m.merge(this,m.parseHTML(c[1],b&&b.nodeType?b.ownerDocument||b:y,!0)),u.test(c[1])&&m.isPlainObject(b))for(c in b)m.isFunction(this[c])?this[c](b[c]):this.attr(c,b[c]);return this}if(d=y.getElementById(c[2]),d&&d.parentNode){if(d.id!==c[2])return x.find(a);this.length=1,this[0]=d}return this.context=y,this.selector=a,this}return a.nodeType?(this.context=this[0]=a,this.length=1,this):m.isFunction(a)?"undefined"!=typeof x.ready?x.ready(a):a(m):(void 0!==a.selector&&(this.selector=a.selector,this.context=a.context),m.makeArray(a,this))};A.prototype=m.fn,x=m(y);var B=/^(?:parents|prev(?:Until|All))/,C={children:!0,contents:!0,next:!0,prev:!0};m.extend({dir:function(a,b,c){var d=[],e=a[b];while(e&&9!==e.nodeType&&(void 0===c||1!==e.nodeType||!m(e).is(c)))1===e.nodeType&&d.push(e),e=e[b];return d},sibling:function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c}}),m.fn.extend({has:function(a){var b,c=m(a,this),d=c.length;return this.filter(function(){for(b=0;d>b;b++)if(m.contains(this,c[b]))return!0})},closest:function(a,b){for(var c,d=0,e=this.length,f=[],g=t.test(a)||"string"!=typeof a?m(a,b||this.context):0;e>d;d++)for(c=this[d];c&&c!==b;c=c.parentNode)if(c.nodeType<11&&(g?g.index(c)>-1:1===c.nodeType&&m.find.matchesSelector(c,a))){f.push(c);break}return this.pushStack(f.length>1?m.unique(f):f)},index:function(a){return a?"string"==typeof a?m.inArray(this[0],m(a)):m.inArray(a.jquery?a[0]:a,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(a,b){return this.pushStack(m.unique(m.merge(this.get(),m(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}});function D(a,b){do a=a[b];while(a&&1!==a.nodeType);return a}m.each({parent:function(a){var b=a.parentNode;return b&&11!==b.nodeType?b:null},parents:function(a){return m.dir(a,"parentNode")},parentsUntil:function(a,b,c){return m.dir(a,"parentNode",c)},next:function(a){return D(a,"nextSibling")},prev:function(a){return D(a,"previousSibling")},nextAll:function(a){return m.dir(a,"nextSibling")},prevAll:function(a){return m.dir(a,"previousSibling")},nextUntil:function(a,b,c){return m.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return m.dir(a,"previousSibling",c)},siblings:function(a){return m.sibling((a.parentNode||{}).firstChild,a)},children:function(a){return m.sibling(a.firstChild)},contents:function(a){return m.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:m.merge([],a.childNodes)}},function(a,b){m.fn[a]=function(c,d){var e=m.map(this,b,c);return"Until"!==a.slice(-5)&&(d=c),d&&"string"==typeof d&&(e=m.filter(d,e)),this.length>1&&(C[a]||(e=m.unique(e)),B.test(a)&&(e=e.reverse())),this.pushStack(e)}});var E=/\S+/g,F={};function G(a){var b=F[a]={};return m.each(a.match(E)||[],function(a,c){b[c]=!0}),b}m.Callbacks=function(a){a="string"==typeof a?F[a]||G(a):m.extend({},a);var b,c,d,e,f,g,h=[],i=!a.once&&[],j=function(l){for(c=a.memory&&l,d=!0,f=g||0,g=0,e=h.length,b=!0;h&&e>f;f++)if(h[f].apply(l[0],l[1])===!1&&a.stopOnFalse){c=!1;break}b=!1,h&&(i?i.length&&j(i.shift()):c?h=[]:k.disable())},k={add:function(){if(h){var d=h.length;!function f(b){m.each(b,function(b,c){var d=m.type(c);"function"===d?a.unique&&k.has(c)||h.push(c):c&&c.length&&"string"!==d&&f(c)})}(arguments),b?e=h.length:c&&(g=d,j(c))}return this},remove:function(){return h&&m.each(arguments,function(a,c){var d;while((d=m.inArray(c,h,d))>-1)h.splice(d,1),b&&(e>=d&&e--,f>=d&&f--)}),this},has:function(a){return a?m.inArray(a,h)>-1:!(!h||!h.length)},empty:function(){return h=[],e=0,this},disable:function(){return h=i=c=void 0,this},disabled:function(){return!h},lock:function(){return i=void 0,c||k.disable(),this},locked:function(){return!i},fireWith:function(a,c){return!h||d&&!i||(c=c||[],c=[a,c.slice?c.slice():c],b?i.push(c):j(c)),this},fire:function(){return k.fireWith(this,arguments),this},fired:function(){return!!d}};return k},m.extend({Deferred:function(a){var b=[["resolve","done",m.Callbacks("once memory"),"resolved"],["reject","fail",m.Callbacks("once memory"),"rejected"],["notify","progress",m.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return m.Deferred(function(c){m.each(b,function(b,f){var g=m.isFunction(a[b])&&a[b];e[f[1]](function(){var a=g&&g.apply(this,arguments);a&&m.isFunction(a.promise)?a.promise().done(c.resolve).fail(c.reject).progress(c.notify):c[f[0]+"With"](this===d?c.promise():this,g?[a]:arguments)})}),a=null}).promise()},promise:function(a){return null!=a?m.extend(a,d):d}},e={};return d.pipe=d.then,m.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[1^a][2].disable,b[2][2].lock),e[f[0]]=function(){return e[f[0]+"With"](this===e?d:this,arguments),this},e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b=0,c=d.call(arguments),e=c.length,f=1!==e||a&&m.isFunction(a.promise)?e:0,g=1===f?a:m.Deferred(),h=function(a,b,c){return function(e){b[a]=this,c[a]=arguments.length>1?d.call(arguments):e,c===i?g.notifyWith(b,c):--f||g.resolveWith(b,c)}},i,j,k;if(e>1)for(i=new Array(e),j=new Array(e),k=new Array(e);e>b;b++)c[b]&&m.isFunction(c[b].promise)?c[b].promise().done(h(b,k,c)).fail(g.reject).progress(h(b,j,i)):--f;return f||g.resolveWith(k,c),g.promise()}});var H;m.fn.ready=function(a){return m.ready.promise().done(a),this},m.extend({isReady:!1,readyWait:1,holdReady:function(a){a?m.readyWait++:m.ready(!0)},ready:function(a){if(a===!0?!--m.readyWait:!m.isReady){if(!y.body)return setTimeout(m.ready);m.isReady=!0,a!==!0&&--m.readyWait>0||(H.resolveWith(y,[m]),m.fn.triggerHandler&&(m(y).triggerHandler("ready"),m(y).off("ready")))}}});function I(){y.addEventListener?(y.removeEventListener("DOMContentLoaded",J,!1),a.removeEventListener("load",J,!1)):(y.detachEvent("onreadystatechange",J),a.detachEvent("onload",J))}function J(){(y.addEventListener||"load"===event.type||"complete"===y.readyState)&&(I(),m.ready())}m.ready.promise=function(b){if(!H)if(H=m.Deferred(),"complete"===y.readyState)setTimeout(m.ready);else if(y.addEventListener)y.addEventListener("DOMContentLoaded",J,!1),a.addEventListener("load",J,!1);else{y.attachEvent("onreadystatechange",J),a.attachEvent("onload",J);var c=!1;try{c=null==a.frameElement&&y.documentElement}catch(d){}c&&c.doScroll&&!function e(){if(!m.isReady){try{c.doScroll("left")}catch(a){return setTimeout(e,50)}I(),m.ready()}}()}return H.promise(b)};var K="undefined",L;for(L in m(k))break;k.ownLast="0"!==L,k.inlineBlockNeedsLayout=!1,m(function(){var a,b,c,d;c=y.getElementsByTagName("body")[0],c&&c.style&&(b=y.createElement("div"),d=y.createElement("div"),d.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",c.appendChild(d).appendChild(b),typeof b.style.zoom!==K&&(b.style.cssText="display:inline;margin:0;border:0;padding:1px;width:1px;zoom:1",k.inlineBlockNeedsLayout=a=3===b.offsetWidth,a&&(c.style.zoom=1)),c.removeChild(d))}),function(){var a=y.createElement("div");if(null==k.deleteExpando){k.deleteExpando=!0;try{delete a.test}catch(b){k.deleteExpando=!1}}a=null}(),m.acceptData=function(a){var b=m.noData[(a.nodeName+" ").toLowerCase()],c=+a.nodeType||1;return 1!==c&&9!==c?!1:!b||b!==!0&&a.getAttribute("classid")===b};var M=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,N=/([A-Z])/g;function O(a,b,c){if(void 0===c&&1===a.nodeType){var d="data-"+b.replace(N,"-$1").toLowerCase();if(c=a.getAttribute(d),"string"==typeof c){try{c="true"===c?!0:"false"===c?!1:"null"===c?null:+c+""===c?+c:M.test(c)?m.parseJSON(c):c}catch(e){}m.data(a,b,c)}else c=void 0}return c}function P(a){var b;for(b in a)if(("data"!==b||!m.isEmptyObject(a[b]))&&"toJSON"!==b)return!1;return!0}function Q(a,b,d,e){if(m.acceptData(a)){var f,g,h=m.expando,i=a.nodeType,j=i?m.cache:a,k=i?a[h]:a[h]&&h;
-if(k&&j[k]&&(e||j[k].data)||void 0!==d||"string"!=typeof b)return k||(k=i?a[h]=c.pop()||m.guid++:h),j[k]||(j[k]=i?{}:{toJSON:m.noop}),("object"==typeof b||"function"==typeof b)&&(e?j[k]=m.extend(j[k],b):j[k].data=m.extend(j[k].data,b)),g=j[k],e||(g.data||(g.data={}),g=g.data),void 0!==d&&(g[m.camelCase(b)]=d),"string"==typeof b?(f=g[b],null==f&&(f=g[m.camelCase(b)])):f=g,f}}function R(a,b,c){if(m.acceptData(a)){var d,e,f=a.nodeType,g=f?m.cache:a,h=f?a[m.expando]:m.expando;if(g[h]){if(b&&(d=c?g[h]:g[h].data)){m.isArray(b)?b=b.concat(m.map(b,m.camelCase)):b in d?b=[b]:(b=m.camelCase(b),b=b in d?[b]:b.split(" ")),e=b.length;while(e--)delete d[b[e]];if(c?!P(d):!m.isEmptyObject(d))return}(c||(delete g[h].data,P(g[h])))&&(f?m.cleanData([a],!0):k.deleteExpando||g!=g.window?delete g[h]:g[h]=null)}}}m.extend({cache:{},noData:{"applet ":!0,"embed ":!0,"object ":"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"},hasData:function(a){return a=a.nodeType?m.cache[a[m.expando]]:a[m.expando],!!a&&!P(a)},data:function(a,b,c){return Q(a,b,c)},removeData:function(a,b){return R(a,b)},_data:function(a,b,c){return Q(a,b,c,!0)},_removeData:function(a,b){return R(a,b,!0)}}),m.fn.extend({data:function(a,b){var c,d,e,f=this[0],g=f&&f.attributes;if(void 0===a){if(this.length&&(e=m.data(f),1===f.nodeType&&!m._data(f,"parsedAttrs"))){c=g.length;while(c--)g[c]&&(d=g[c].name,0===d.indexOf("data-")&&(d=m.camelCase(d.slice(5)),O(f,d,e[d])));m._data(f,"parsedAttrs",!0)}return e}return"object"==typeof a?this.each(function(){m.data(this,a)}):arguments.length>1?this.each(function(){m.data(this,a,b)}):f?O(f,a,m.data(f,a)):void 0},removeData:function(a){return this.each(function(){m.removeData(this,a)})}}),m.extend({queue:function(a,b,c){var d;return a?(b=(b||"fx")+"queue",d=m._data(a,b),c&&(!d||m.isArray(c)?d=m._data(a,b,m.makeArray(c)):d.push(c)),d||[]):void 0},dequeue:function(a,b){b=b||"fx";var c=m.queue(a,b),d=c.length,e=c.shift(),f=m._queueHooks(a,b),g=function(){m.dequeue(a,b)};"inprogress"===e&&(e=c.shift(),d--),e&&("fx"===b&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return m._data(a,c)||m._data(a,c,{empty:m.Callbacks("once memory").add(function(){m._removeData(a,b+"queue"),m._removeData(a,c)})})}}),m.fn.extend({queue:function(a,b){var c=2;return"string"!=typeof a&&(b=a,a="fx",c--),arguments.length<c?m.queue(this[0],a):void 0===b?this:this.each(function(){var c=m.queue(this,a,b);m._queueHooks(this,a),"fx"===a&&"inprogress"!==c[0]&&m.dequeue(this,a)})},dequeue:function(a){return this.each(function(){m.dequeue(this,a)})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,b){var c,d=1,e=m.Deferred(),f=this,g=this.length,h=function(){--d||e.resolveWith(f,[f])};"string"!=typeof a&&(b=a,a=void 0),a=a||"fx";while(g--)c=m._data(f[g],a+"queueHooks"),c&&c.empty&&(d++,c.empty.add(h));return h(),e.promise(b)}});var S=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,T=["Top","Right","Bottom","Left"],U=function(a,b){return a=b||a,"none"===m.css(a,"display")||!m.contains(a.ownerDocument,a)},V=m.access=function(a,b,c,d,e,f,g){var h=0,i=a.length,j=null==c;if("object"===m.type(c)){e=!0;for(h in c)m.access(a,b,h,c[h],!0,f,g)}else if(void 0!==d&&(e=!0,m.isFunction(d)||(g=!0),j&&(g?(b.call(a,d),b=null):(j=b,b=function(a,b,c){return j.call(m(a),c)})),b))for(;i>h;h++)b(a[h],c,g?d:d.call(a[h],h,b(a[h],c)));return e?a:j?b.call(a):i?b(a[0],c):f},W=/^(?:checkbox|radio)$/i;!function(){var a=y.createElement("input"),b=y.createElement("div"),c=y.createDocumentFragment();if(b.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",k.leadingWhitespace=3===b.firstChild.nodeType,k.tbody=!b.getElementsByTagName("tbody").length,k.htmlSerialize=!!b.getElementsByTagName("link").length,k.html5Clone="<:nav></:nav>"!==y.createElement("nav").cloneNode(!0).outerHTML,a.type="checkbox",a.checked=!0,c.appendChild(a),k.appendChecked=a.checked,b.innerHTML="<textarea>x</textarea>",k.noCloneChecked=!!b.cloneNode(!0).lastChild.defaultValue,c.appendChild(b),b.innerHTML="<input type='radio' checked='checked' name='t'/>",k.checkClone=b.cloneNode(!0).cloneNode(!0).lastChild.checked,k.noCloneEvent=!0,b.attachEvent&&(b.attachEvent("onclick",function(){k.noCloneEvent=!1}),b.cloneNode(!0).click()),null==k.deleteExpando){k.deleteExpando=!0;try{delete b.test}catch(d){k.deleteExpando=!1}}}(),function(){var b,c,d=y.createElement("div");for(b in{submit:!0,change:!0,focusin:!0})c="on"+b,(k[b+"Bubbles"]=c in a)||(d.setAttribute(c,"t"),k[b+"Bubbles"]=d.attributes[c].expando===!1);d=null}();var X=/^(?:input|select|textarea)$/i,Y=/^key/,Z=/^(?:mouse|pointer|contextmenu)|click/,$=/^(?:focusinfocus|focusoutblur)$/,_=/^([^.]*)(?:\.(.+)|)$/;function ab(){return!0}function bb(){return!1}function cb(){try{return y.activeElement}catch(a){}}m.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,n,o,p,q,r=m._data(a);if(r){c.handler&&(i=c,c=i.handler,e=i.selector),c.guid||(c.guid=m.guid++),(g=r.events)||(g=r.events={}),(k=r.handle)||(k=r.handle=function(a){return typeof m===K||a&&m.event.triggered===a.type?void 0:m.event.dispatch.apply(k.elem,arguments)},k.elem=a),b=(b||"").match(E)||[""],h=b.length;while(h--)f=_.exec(b[h])||[],o=q=f[1],p=(f[2]||"").split(".").sort(),o&&(j=m.event.special[o]||{},o=(e?j.delegateType:j.bindType)||o,j=m.event.special[o]||{},l=m.extend({type:o,origType:q,data:d,handler:c,guid:c.guid,selector:e,needsContext:e&&m.expr.match.needsContext.test(e),namespace:p.join(".")},i),(n=g[o])||(n=g[o]=[],n.delegateCount=0,j.setup&&j.setup.call(a,d,p,k)!==!1||(a.addEventListener?a.addEventListener(o,k,!1):a.attachEvent&&a.attachEvent("on"+o,k))),j.add&&(j.add.call(a,l),l.handler.guid||(l.handler.guid=c.guid)),e?n.splice(n.delegateCount++,0,l):n.push(l),m.event.global[o]=!0);a=null}},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,n,o,p,q,r=m.hasData(a)&&m._data(a);if(r&&(k=r.events)){b=(b||"").match(E)||[""],j=b.length;while(j--)if(h=_.exec(b[j])||[],o=q=h[1],p=(h[2]||"").split(".").sort(),o){l=m.event.special[o]||{},o=(d?l.delegateType:l.bindType)||o,n=k[o]||[],h=h[2]&&new RegExp("(^|\\.)"+p.join("\\.(?:.*\\.|)")+"(\\.|$)"),i=f=n.length;while(f--)g=n[f],!e&&q!==g.origType||c&&c.guid!==g.guid||h&&!h.test(g.namespace)||d&&d!==g.selector&&("**"!==d||!g.selector)||(n.splice(f,1),g.selector&&n.delegateCount--,l.remove&&l.remove.call(a,g));i&&!n.length&&(l.teardown&&l.teardown.call(a,p,r.handle)!==!1||m.removeEvent(a,o,r.handle),delete k[o])}else for(o in k)m.event.remove(a,o+b[j],c,d,!0);m.isEmptyObject(k)&&(delete r.handle,m._removeData(a,"events"))}},trigger:function(b,c,d,e){var f,g,h,i,k,l,n,o=[d||y],p=j.call(b,"type")?b.type:b,q=j.call(b,"namespace")?b.namespace.split("."):[];if(h=l=d=d||y,3!==d.nodeType&&8!==d.nodeType&&!$.test(p+m.event.triggered)&&(p.indexOf(".")>=0&&(q=p.split("."),p=q.shift(),q.sort()),g=p.indexOf(":")<0&&"on"+p,b=b[m.expando]?b:new m.Event(p,"object"==typeof b&&b),b.isTrigger=e?2:3,b.namespace=q.join("."),b.namespace_re=b.namespace?new RegExp("(^|\\.)"+q.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,b.result=void 0,b.target||(b.target=d),c=null==c?[b]:m.makeArray(c,[b]),k=m.event.special[p]||{},e||!k.trigger||k.trigger.apply(d,c)!==!1)){if(!e&&!k.noBubble&&!m.isWindow(d)){for(i=k.delegateType||p,$.test(i+p)||(h=h.parentNode);h;h=h.parentNode)o.push(h),l=h;l===(d.ownerDocument||y)&&o.push(l.defaultView||l.parentWindow||a)}n=0;while((h=o[n++])&&!b.isPropagationStopped())b.type=n>1?i:k.bindType||p,f=(m._data(h,"events")||{})[b.type]&&m._data(h,"handle"),f&&f.apply(h,c),f=g&&h[g],f&&f.apply&&m.acceptData(h)&&(b.result=f.apply(h,c),b.result===!1&&b.preventDefault());if(b.type=p,!e&&!b.isDefaultPrevented()&&(!k._default||k._default.apply(o.pop(),c)===!1)&&m.acceptData(d)&&g&&d[p]&&!m.isWindow(d)){l=d[g],l&&(d[g]=null),m.event.triggered=p;try{d[p]()}catch(r){}m.event.triggered=void 0,l&&(d[g]=l)}return b.result}},dispatch:function(a){a=m.event.fix(a);var b,c,e,f,g,h=[],i=d.call(arguments),j=(m._data(this,"events")||{})[a.type]||[],k=m.event.special[a.type]||{};if(i[0]=a,a.delegateTarget=this,!k.preDispatch||k.preDispatch.call(this,a)!==!1){h=m.event.handlers.call(this,a,j),b=0;while((f=h[b++])&&!a.isPropagationStopped()){a.currentTarget=f.elem,g=0;while((e=f.handlers[g++])&&!a.isImmediatePropagationStopped())(!a.namespace_re||a.namespace_re.test(e.namespace))&&(a.handleObj=e,a.data=e.data,c=((m.event.special[e.origType]||{}).handle||e.handler).apply(f.elem,i),void 0!==c&&(a.result=c)===!1&&(a.preventDefault(),a.stopPropagation()))}return k.postDispatch&&k.postDispatch.call(this,a),a.result}},handlers:function(a,b){var c,d,e,f,g=[],h=b.delegateCount,i=a.target;if(h&&i.nodeType&&(!a.button||"click"!==a.type))for(;i!=this;i=i.parentNode||this)if(1===i.nodeType&&(i.disabled!==!0||"click"!==a.type)){for(e=[],f=0;h>f;f++)d=b[f],c=d.selector+" ",void 0===e[c]&&(e[c]=d.needsContext?m(c,this).index(i)>=0:m.find(c,this,null,[i]).length),e[c]&&e.push(d);e.length&&g.push({elem:i,handlers:e})}return h<b.length&&g.push({elem:this,handlers:b.slice(h)}),g},fix:function(a){if(a[m.expando])return a;var b,c,d,e=a.type,f=a,g=this.fixHooks[e];g||(this.fixHooks[e]=g=Z.test(e)?this.mouseHooks:Y.test(e)?this.keyHooks:{}),d=g.props?this.props.concat(g.props):this.props,a=new m.Event(f),b=d.length;while(b--)c=d[b],a[c]=f[c];return a.target||(a.target=f.srcElement||y),3===a.target.nodeType&&(a.target=a.target.parentNode),a.metaKey=!!a.metaKey,g.filter?g.filter(a,f):a},props:"altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(a,b){return null==a.which&&(a.which=null!=b.charCode?b.charCode:b.keyCode),a}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(a,b){var c,d,e,f=b.button,g=b.fromElement;return null==a.pageX&&null!=b.clientX&&(d=a.target.ownerDocument||y,e=d.documentElement,c=d.body,a.pageX=b.clientX+(e&&e.scrollLeft||c&&c.scrollLeft||0)-(e&&e.clientLeft||c&&c.clientLeft||0),a.pageY=b.clientY+(e&&e.scrollTop||c&&c.scrollTop||0)-(e&&e.clientTop||c&&c.clientTop||0)),!a.relatedTarget&&g&&(a.relatedTarget=g===a.target?b.toElement:g),a.which||void 0===f||(a.which=1&f?1:2&f?3:4&f?2:0),a}},special:{load:{noBubble:!0},focus:{trigger:function(){if(this!==cb()&&this.focus)try{return this.focus(),!1}catch(a){}},delegateType:"focusin"},blur:{trigger:function(){return this===cb()&&this.blur?(this.blur(),!1):void 0},delegateType:"focusout"},click:{trigger:function(){return m.nodeName(this,"input")&&"checkbox"===this.type&&this.click?(this.click(),!1):void 0},_default:function(a){return m.nodeName(a.target,"a")}},beforeunload:{postDispatch:function(a){void 0!==a.result&&a.originalEvent&&(a.originalEvent.returnValue=a.result)}}},simulate:function(a,b,c,d){var e=m.extend(new m.Event,c,{type:a,isSimulated:!0,originalEvent:{}});d?m.event.trigger(e,null,b):m.event.dispatch.call(b,e),e.isDefaultPrevented()&&c.preventDefault()}},m.removeEvent=y.removeEventListener?function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)}:function(a,b,c){var d="on"+b;a.detachEvent&&(typeof a[d]===K&&(a[d]=null),a.detachEvent(d,c))},m.Event=function(a,b){return this instanceof m.Event?(a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||void 0===a.defaultPrevented&&a.returnValue===!1?ab:bb):this.type=a,b&&m.extend(this,b),this.timeStamp=a&&a.timeStamp||m.now(),void(this[m.expando]=!0)):new m.Event(a,b)},m.Event.prototype={isDefaultPrevented:bb,isPropagationStopped:bb,isImmediatePropagationStopped:bb,preventDefault:function(){var a=this.originalEvent;this.isDefaultPrevented=ab,a&&(a.preventDefault?a.preventDefault():a.returnValue=!1)},stopPropagation:function(){var a=this.originalEvent;this.isPropagationStopped=ab,a&&(a.stopPropagation&&a.stopPropagation(),a.cancelBubble=!0)},stopImmediatePropagation:function(){var a=this.originalEvent;this.isImmediatePropagationStopped=ab,a&&a.stopImmediatePropagation&&a.stopImmediatePropagation(),this.stopPropagation()}},m.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(a,b){m.event.special[a]={delegateType:b,bindType:b,handle:function(a){var c,d=this,e=a.relatedTarget,f=a.handleObj;return(!e||e!==d&&!m.contains(d,e))&&(a.type=f.origType,c=f.handler.apply(this,arguments),a.type=b),c}}}),k.submitBubbles||(m.event.special.submit={setup:function(){return m.nodeName(this,"form")?!1:void m.event.add(this,"click._submit keypress._submit",function(a){var b=a.target,c=m.nodeName(b,"input")||m.nodeName(b,"button")?b.form:void 0;c&&!m._data(c,"submitBubbles")&&(m.event.add(c,"submit._submit",function(a){a._submit_bubble=!0}),m._data(c,"submitBubbles",!0))})},postDispatch:function(a){a._submit_bubble&&(delete a._submit_bubble,this.parentNode&&!a.isTrigger&&m.event.simulate("submit",this.parentNode,a,!0))},teardown:function(){return m.nodeName(this,"form")?!1:void m.event.remove(this,"._submit")}}),k.changeBubbles||(m.event.special.change={setup:function(){return X.test(this.nodeName)?(("checkbox"===this.type||"radio"===this.type)&&(m.event.add(this,"propertychange._change",function(a){"checked"===a.originalEvent.propertyName&&(this._just_changed=!0)}),m.event.add(this,"click._change",function(a){this._just_changed&&!a.isTrigger&&(this._just_changed=!1),m.event.simulate("change",this,a,!0)})),!1):void m.event.add(this,"beforeactivate._change",function(a){var b=a.target;X.test(b.nodeName)&&!m._data(b,"changeBubbles")&&(m.event.add(b,"change._change",function(a){!this.parentNode||a.isSimulated||a.isTrigger||m.event.simulate("change",this.parentNode,a,!0)}),m._data(b,"changeBubbles",!0))})},handle:function(a){var b=a.target;return this!==b||a.isSimulated||a.isTrigger||"radio"!==b.type&&"checkbox"!==b.type?a.handleObj.handler.apply(this,arguments):void 0},teardown:function(){return m.event.remove(this,"._change"),!X.test(this.nodeName)}}),k.focusinBubbles||m.each({focus:"focusin",blur:"focusout"},function(a,b){var c=function(a){m.event.simulate(b,a.target,m.event.fix(a),!0)};m.event.special[b]={setup:function(){var d=this.ownerDocument||this,e=m._data(d,b);e||d.addEventListener(a,c,!0),m._data(d,b,(e||0)+1)},teardown:function(){var d=this.ownerDocument||this,e=m._data(d,b)-1;e?m._data(d,b,e):(d.removeEventListener(a,c,!0),m._removeData(d,b))}}}),m.fn.extend({on:function(a,b,c,d,e){var f,g;if("object"==typeof a){"string"!=typeof b&&(c=c||b,b=void 0);for(f in a)this.on(f,b,c,a[f],e);return this}if(null==c&&null==d?(d=b,c=b=void 0):null==d&&("string"==typeof b?(d=c,c=void 0):(d=c,c=b,b=void 0)),d===!1)d=bb;else if(!d)return this;return 1===e&&(g=d,d=function(a){return m().off(a),g.apply(this,arguments)},d.guid=g.guid||(g.guid=m.guid++)),this.each(function(){m.event.add(this,a,d,c,b)})},one:function(a,b,c,d){return this.on(a,b,c,d,1)},off:function(a,b,c){var d,e;if(a&&a.preventDefault&&a.handleObj)return d=a.handleObj,m(a.delegateTarget).off(d.namespace?d.origType+"."+d.namespace:d.origType,d.selector,d.handler),this;if("object"==typeof a){for(e in a)this.off(e,b,a[e]);return this}return(b===!1||"function"==typeof b)&&(c=b,b=void 0),c===!1&&(c=bb),this.each(function(){m.event.remove(this,a,c,b)})},trigger:function(a,b){return this.each(function(){m.event.trigger(a,b,this)})},triggerHandler:function(a,b){var c=this[0];return c?m.event.trigger(a,b,c,!0):void 0}});function db(a){var b=eb.split("|"),c=a.createDocumentFragment();if(c.createElement)while(b.length)c.createElement(b.pop());return c}var eb="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",fb=/ jQuery\d+="(?:null|\d+)"/g,gb=new RegExp("<(?:"+eb+")[\\s/>]","i"),hb=/^\s+/,ib=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,jb=/<([\w:]+)/,kb=/<tbody/i,lb=/<|&#?\w+;/,mb=/<(?:script|style|link)/i,nb=/checked\s*(?:[^=]|=\s*.checked.)/i,ob=/^$|\/(?:java|ecma)script/i,pb=/^true\/(.*)/,qb=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,rb={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],area:[1,"<map>","</map>"],param:[1,"<object>","</object>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:k.htmlSerialize?[0,"",""]:[1,"X<div>","</div>"]},sb=db(y),tb=sb.appendChild(y.createElement("div"));rb.optgroup=rb.option,rb.tbody=rb.tfoot=rb.colgroup=rb.caption=rb.thead,rb.th=rb.td;function ub(a,b){var c,d,e=0,f=typeof a.getElementsByTagName!==K?a.getElementsByTagName(b||"*"):typeof a.querySelectorAll!==K?a.querySelectorAll(b||"*"):void 0;if(!f)for(f=[],c=a.childNodes||a;null!=(d=c[e]);e++)!b||m.nodeName(d,b)?f.push(d):m.merge(f,ub(d,b));return void 0===b||b&&m.nodeName(a,b)?m.merge([a],f):f}function vb(a){W.test(a.type)&&(a.defaultChecked=a.checked)}function wb(a,b){return m.nodeName(a,"table")&&m.nodeName(11!==b.nodeType?b:b.firstChild,"tr")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function xb(a){return a.type=(null!==m.find.attr(a,"type"))+"/"+a.type,a}function yb(a){var b=pb.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function zb(a,b){for(var c,d=0;null!=(c=a[d]);d++)m._data(c,"globalEval",!b||m._data(b[d],"globalEval"))}function Ab(a,b){if(1===b.nodeType&&m.hasData(a)){var c,d,e,f=m._data(a),g=m._data(b,f),h=f.events;if(h){delete g.handle,g.events={};for(c in h)for(d=0,e=h[c].length;e>d;d++)m.event.add(b,c,h[c][d])}g.data&&(g.data=m.extend({},g.data))}}function Bb(a,b){var c,d,e;if(1===b.nodeType){if(c=b.nodeName.toLowerCase(),!k.noCloneEvent&&b[m.expando]){e=m._data(b);for(d in e.events)m.removeEvent(b,d,e.handle);b.removeAttribute(m.expando)}"script"===c&&b.text!==a.text?(xb(b).text=a.text,yb(b)):"object"===c?(b.parentNode&&(b.outerHTML=a.outerHTML),k.html5Clone&&a.innerHTML&&!m.trim(b.innerHTML)&&(b.innerHTML=a.innerHTML)):"input"===c&&W.test(a.type)?(b.defaultChecked=b.checked=a.checked,b.value!==a.value&&(b.value=a.value)):"option"===c?b.defaultSelected=b.selected=a.defaultSelected:("input"===c||"textarea"===c)&&(b.defaultValue=a.defaultValue)}}m.extend({clone:function(a,b,c){var d,e,f,g,h,i=m.contains(a.ownerDocument,a);if(k.html5Clone||m.isXMLDoc(a)||!gb.test("<"+a.nodeName+">")?f=a.cloneNode(!0):(tb.innerHTML=a.outerHTML,tb.removeChild(f=tb.firstChild)),!(k.noCloneEvent&&k.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||m.isXMLDoc(a)))for(d=ub(f),h=ub(a),g=0;null!=(e=h[g]);++g)d[g]&&Bb(e,d[g]);if(b)if(c)for(h=h||ub(a),d=d||ub(f),g=0;null!=(e=h[g]);g++)Ab(e,d[g]);else Ab(a,f);return d=ub(f,"script"),d.length>0&&zb(d,!i&&ub(a,"script")),d=h=e=null,f},buildFragment:function(a,b,c,d){for(var e,f,g,h,i,j,l,n=a.length,o=db(b),p=[],q=0;n>q;q++)if(f=a[q],f||0===f)if("object"===m.type(f))m.merge(p,f.nodeType?[f]:f);else if(lb.test(f)){h=h||o.appendChild(b.createElement("div")),i=(jb.exec(f)||["",""])[1].toLowerCase(),l=rb[i]||rb._default,h.innerHTML=l[1]+f.replace(ib,"<$1></$2>")+l[2],e=l[0];while(e--)h=h.lastChild;if(!k.leadingWhitespace&&hb.test(f)&&p.push(b.createTextNode(hb.exec(f)[0])),!k.tbody){f="table"!==i||kb.test(f)?"<table>"!==l[1]||kb.test(f)?0:h:h.firstChild,e=f&&f.childNodes.length;while(e--)m.nodeName(j=f.childNodes[e],"tbody")&&!j.childNodes.length&&f.removeChild(j)}m.merge(p,h.childNodes),h.textContent="";while(h.firstChild)h.removeChild(h.firstChild);h=o.lastChild}else p.push(b.createTextNode(f));h&&o.removeChild(h),k.appendChecked||m.grep(ub(p,"input"),vb),q=0;while(f=p[q++])if((!d||-1===m.inArray(f,d))&&(g=m.contains(f.ownerDocument,f),h=ub(o.appendChild(f),"script"),g&&zb(h),c)){e=0;while(f=h[e++])ob.test(f.type||"")&&c.push(f)}return h=null,o},cleanData:function(a,b){for(var d,e,f,g,h=0,i=m.expando,j=m.cache,l=k.deleteExpando,n=m.event.special;null!=(d=a[h]);h++)if((b||m.acceptData(d))&&(f=d[i],g=f&&j[f])){if(g.events)for(e in g.events)n[e]?m.event.remove(d,e):m.removeEvent(d,e,g.handle);j[f]&&(delete j[f],l?delete d[i]:typeof d.removeAttribute!==K?d.removeAttribute(i):d[i]=null,c.push(f))}}}),m.fn.extend({text:function(a){return V(this,function(a){return void 0===a?m.text(this):this.empty().append((this[0]&&this[0].ownerDocument||y).createTextNode(a))},null,a,arguments.length)},append:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=wb(this,a);b.appendChild(a)}})},prepend:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=wb(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},remove:function(a,b){for(var c,d=a?m.filter(a,this):this,e=0;null!=(c=d[e]);e++)b||1!==c.nodeType||m.cleanData(ub(c)),c.parentNode&&(b&&m.contains(c.ownerDocument,c)&&zb(ub(c,"script")),c.parentNode.removeChild(c));return this},empty:function(){for(var a,b=0;null!=(a=this[b]);b++){1===a.nodeType&&m.cleanData(ub(a,!1));while(a.firstChild)a.removeChild(a.firstChild);a.options&&m.nodeName(a,"select")&&(a.options.length=0)}return this},clone:function(a,b){return a=null==a?!1:a,b=null==b?a:b,this.map(function(){return m.clone(this,a,b)})},html:function(a){return V(this,function(a){var b=this[0]||{},c=0,d=this.length;if(void 0===a)return 1===b.nodeType?b.innerHTML.replace(fb,""):void 0;if(!("string"!=typeof a||mb.test(a)||!k.htmlSerialize&&gb.test(a)||!k.leadingWhitespace&&hb.test(a)||rb[(jb.exec(a)||["",""])[1].toLowerCase()])){a=a.replace(ib,"<$1></$2>");try{for(;d>c;c++)b=this[c]||{},1===b.nodeType&&(m.cleanData(ub(b,!1)),b.innerHTML=a);b=0}catch(e){}}b&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(){var a=arguments[0];return this.domManip(arguments,function(b){a=this.parentNode,m.cleanData(ub(this)),a&&a.replaceChild(b,this)}),a&&(a.length||a.nodeType)?this:this.remove()},detach:function(a){return this.remove(a,!0)},domManip:function(a,b){a=e.apply([],a);var c,d,f,g,h,i,j=0,l=this.length,n=this,o=l-1,p=a[0],q=m.isFunction(p);if(q||l>1&&"string"==typeof p&&!k.checkClone&&nb.test(p))return this.each(function(c){var d=n.eq(c);q&&(a[0]=p.call(this,c,d.html())),d.domManip(a,b)});if(l&&(i=m.buildFragment(a,this[0].ownerDocument,!1,this),c=i.firstChild,1===i.childNodes.length&&(i=c),c)){for(g=m.map(ub(i,"script"),xb),f=g.length;l>j;j++)d=i,j!==o&&(d=m.clone(d,!0,!0),f&&m.merge(g,ub(d,"script"))),b.call(this[j],d,j);if(f)for(h=g[g.length-1].ownerDocument,m.map(g,yb),j=0;f>j;j++)d=g[j],ob.test(d.type||"")&&!m._data(d,"globalEval")&&m.contains(h,d)&&(d.src?m._evalUrl&&m._evalUrl(d.src):m.globalEval((d.text||d.textContent||d.innerHTML||"").replace(qb,"")));i=c=null}return this}}),m.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){m.fn[a]=function(a){for(var c,d=0,e=[],g=m(a),h=g.length-1;h>=d;d++)c=d===h?this:this.clone(!0),m(g[d])[b](c),f.apply(e,c.get());return this.pushStack(e)}});var Cb,Db={};function Eb(b,c){var d,e=m(c.createElement(b)).appendTo(c.body),f=a.getDefaultComputedStyle&&(d=a.getDefaultComputedStyle(e[0]))?d.display:m.css(e[0],"display");return e.detach(),f}function Fb(a){var b=y,c=Db[a];return c||(c=Eb(a,b),"none"!==c&&c||(Cb=(Cb||m("<iframe frameborder='0' width='0' height='0'/>")).appendTo(b.documentElement),b=(Cb[0].contentWindow||Cb[0].contentDocument).document,b.write(),b.close(),c=Eb(a,b),Cb.detach()),Db[a]=c),c}!function(){var a;k.shrinkWrapBlocks=function(){if(null!=a)return a;a=!1;var b,c,d;return c=y.getElementsByTagName("body")[0],c&&c.style?(b=y.createElement("div"),d=y.createElement("div"),d.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",c.appendChild(d).appendChild(b),typeof b.style.zoom!==K&&(b.style.cssText="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;margin:0;border:0;padding:1px;width:1px;zoom:1",b.appendChild(y.createElement("div")).style.width="5px",a=3!==b.offsetWidth),c.removeChild(d),a):void 0}}();var Gb=/^margin/,Hb=new RegExp("^("+S+")(?!px)[a-z%]+$","i"),Ib,Jb,Kb=/^(top|right|bottom|left)$/;a.getComputedStyle?(Ib=function(a){return a.ownerDocument.defaultView.getComputedStyle(a,null)},Jb=function(a,b,c){var d,e,f,g,h=a.style;return c=c||Ib(a),g=c?c.getPropertyValue(b)||c[b]:void 0,c&&(""!==g||m.contains(a.ownerDocument,a)||(g=m.style(a,b)),Hb.test(g)&&Gb.test(b)&&(d=h.width,e=h.minWidth,f=h.maxWidth,h.minWidth=h.maxWidth=h.width=g,g=c.width,h.width=d,h.minWidth=e,h.maxWidth=f)),void 0===g?g:g+""}):y.documentElement.currentStyle&&(Ib=function(a){return a.currentStyle},Jb=function(a,b,c){var d,e,f,g,h=a.style;return c=c||Ib(a),g=c?c[b]:void 0,null==g&&h&&h[b]&&(g=h[b]),Hb.test(g)&&!Kb.test(b)&&(d=h.left,e=a.runtimeStyle,f=e&&e.left,f&&(e.left=a.currentStyle.left),h.left="fontSize"===b?"1em":g,g=h.pixelLeft+"px",h.left=d,f&&(e.left=f)),void 0===g?g:g+""||"auto"});function Lb(a,b){return{get:function(){var c=a();if(null!=c)return c?void delete this.get:(this.get=b).apply(this,arguments)}}}!function(){var b,c,d,e,f,g,h;if(b=y.createElement("div"),b.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",d=b.getElementsByTagName("a")[0],c=d&&d.style){c.cssText="float:left;opacity:.5",k.opacity="0.5"===c.opacity,k.cssFloat=!!c.cssFloat,b.style.backgroundClip="content-box",b.cloneNode(!0).style.backgroundClip="",k.clearCloneStyle="content-box"===b.style.backgroundClip,k.boxSizing=""===c.boxSizing||""===c.MozBoxSizing||""===c.WebkitBoxSizing,m.extend(k,{reliableHiddenOffsets:function(){return null==g&&i(),g},boxSizingReliable:function(){return null==f&&i(),f},pixelPosition:function(){return null==e&&i(),e},reliableMarginRight:function(){return null==h&&i(),h}});function i(){var b,c,d,i;c=y.getElementsByTagName("body")[0],c&&c.style&&(b=y.createElement("div"),d=y.createElement("div"),d.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",c.appendChild(d).appendChild(b),b.style.cssText="-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;display:block;margin-top:1%;top:1%;border:1px;padding:1px;width:4px;position:absolute",e=f=!1,h=!0,a.getComputedStyle&&(e="1%"!==(a.getComputedStyle(b,null)||{}).top,f="4px"===(a.getComputedStyle(b,null)||{width:"4px"}).width,i=b.appendChild(y.createElement("div")),i.style.cssText=b.style.cssText="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;margin:0;border:0;padding:0",i.style.marginRight=i.style.width="0",b.style.width="1px",h=!parseFloat((a.getComputedStyle(i,null)||{}).marginRight)),b.innerHTML="<table><tr><td></td><td>t</td></tr></table>",i=b.getElementsByTagName("td"),i[0].style.cssText="margin:0;border:0;padding:0;display:none",g=0===i[0].offsetHeight,g&&(i[0].style.display="",i[1].style.display="none",g=0===i[0].offsetHeight),c.removeChild(d))}}}(),m.swap=function(a,b,c,d){var e,f,g={};for(f in b)g[f]=a.style[f],a.style[f]=b[f];e=c.apply(a,d||[]);for(f in b)a.style[f]=g[f];return e};var Mb=/alpha\([^)]*\)/i,Nb=/opacity\s*=\s*([^)]*)/,Ob=/^(none|table(?!-c[ea]).+)/,Pb=new RegExp("^("+S+")(.*)$","i"),Qb=new RegExp("^([+-])=("+S+")","i"),Rb={position:"absolute",visibility:"hidden",display:"block"},Sb={letterSpacing:"0",fontWeight:"400"},Tb=["Webkit","O","Moz","ms"];function Ub(a,b){if(b in a)return b;var c=b.charAt(0).toUpperCase()+b.slice(1),d=b,e=Tb.length;while(e--)if(b=Tb[e]+c,b in a)return b;return d}function Vb(a,b){for(var c,d,e,f=[],g=0,h=a.length;h>g;g++)d=a[g],d.style&&(f[g]=m._data(d,"olddisplay"),c=d.style.display,b?(f[g]||"none"!==c||(d.style.display=""),""===d.style.display&&U(d)&&(f[g]=m._data(d,"olddisplay",Fb(d.nodeName)))):(e=U(d),(c&&"none"!==c||!e)&&m._data(d,"olddisplay",e?c:m.css(d,"display"))));for(g=0;h>g;g++)d=a[g],d.style&&(b&&"none"!==d.style.display&&""!==d.style.display||(d.style.display=b?f[g]||"":"none"));return a}function Wb(a,b,c){var d=Pb.exec(b);return d?Math.max(0,d[1]-(c||0))+(d[2]||"px"):b}function Xb(a,b,c,d,e){for(var f=c===(d?"border":"content")?4:"width"===b?1:0,g=0;4>f;f+=2)"margin"===c&&(g+=m.css(a,c+T[f],!0,e)),d?("content"===c&&(g-=m.css(a,"padding"+T[f],!0,e)),"margin"!==c&&(g-=m.css(a,"border"+T[f]+"Width",!0,e))):(g+=m.css(a,"padding"+T[f],!0,e),"padding"!==c&&(g+=m.css(a,"border"+T[f]+"Width",!0,e)));return g}function Yb(a,b,c){var d=!0,e="width"===b?a.offsetWidth:a.offsetHeight,f=Ib(a),g=k.boxSizing&&"border-box"===m.css(a,"boxSizing",!1,f);if(0>=e||null==e){if(e=Jb(a,b,f),(0>e||null==e)&&(e=a.style[b]),Hb.test(e))return e;d=g&&(k.boxSizingReliable()||e===a.style[b]),e=parseFloat(e)||0}return e+Xb(a,b,c||(g?"border":"content"),d,f)+"px"}m.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=Jb(a,"opacity");return""===c?"1":c}}}},cssNumber:{columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":k.cssFloat?"cssFloat":"styleFloat"},style:function(a,b,c,d){if(a&&3!==a.nodeType&&8!==a.nodeType&&a.style){var e,f,g,h=m.camelCase(b),i=a.style;if(b=m.cssProps[h]||(m.cssProps[h]=Ub(i,h)),g=m.cssHooks[b]||m.cssHooks[h],void 0===c)return g&&"get"in g&&void 0!==(e=g.get(a,!1,d))?e:i[b];if(f=typeof c,"string"===f&&(e=Qb.exec(c))&&(c=(e[1]+1)*e[2]+parseFloat(m.css(a,b)),f="number"),null!=c&&c===c&&("number"!==f||m.cssNumber[h]||(c+="px"),k.clearCloneStyle||""!==c||0!==b.indexOf("background")||(i[b]="inherit"),!(g&&"set"in g&&void 0===(c=g.set(a,c,d)))))try{i[b]=c}catch(j){}}},css:function(a,b,c,d){var e,f,g,h=m.camelCase(b);return b=m.cssProps[h]||(m.cssProps[h]=Ub(a.style,h)),g=m.cssHooks[b]||m.cssHooks[h],g&&"get"in g&&(f=g.get(a,!0,c)),void 0===f&&(f=Jb(a,b,d)),"normal"===f&&b in Sb&&(f=Sb[b]),""===c||c?(e=parseFloat(f),c===!0||m.isNumeric(e)?e||0:f):f}}),m.each(["height","width"],function(a,b){m.cssHooks[b]={get:function(a,c,d){return c?Ob.test(m.css(a,"display"))&&0===a.offsetWidth?m.swap(a,Rb,function(){return Yb(a,b,d)}):Yb(a,b,d):void 0},set:function(a,c,d){var e=d&&Ib(a);return Wb(a,c,d?Xb(a,b,d,k.boxSizing&&"border-box"===m.css(a,"boxSizing",!1,e),e):0)}}}),k.opacity||(m.cssHooks.opacity={get:function(a,b){return Nb.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=m.isNumeric(b)?"alpha(opacity="+100*b+")":"",f=d&&d.filter||c.filter||"";c.zoom=1,(b>=1||""===b)&&""===m.trim(f.replace(Mb,""))&&c.removeAttribute&&(c.removeAttribute("filter"),""===b||d&&!d.filter)||(c.filter=Mb.test(f)?f.replace(Mb,e):f+" "+e)}}),m.cssHooks.marginRight=Lb(k.reliableMarginRight,function(a,b){return b?m.swap(a,{display:"inline-block"},Jb,[a,"marginRight"]):void 0}),m.each({margin:"",padding:"",border:"Width"},function(a,b){m.cssHooks[a+b]={expand:function(c){for(var d=0,e={},f="string"==typeof c?c.split(" "):[c];4>d;d++)e[a+T[d]+b]=f[d]||f[d-2]||f[0];return e}},Gb.test(a)||(m.cssHooks[a+b].set=Wb)}),m.fn.extend({css:function(a,b){return V(this,function(a,b,c){var d,e,f={},g=0;if(m.isArray(b)){for(d=Ib(a),e=b.length;e>g;g++)f[b[g]]=m.css(a,b[g],!1,d);return f}return void 0!==c?m.style(a,b,c):m.css(a,b)},a,b,arguments.length>1)},show:function(){return Vb(this,!0)},hide:function(){return Vb(this)},toggle:function(a){return"boolean"==typeof a?a?this.show():this.hide():this.each(function(){U(this)?m(this).show():m(this).hide()})}});function Zb(a,b,c,d,e){return new Zb.prototype.init(a,b,c,d,e)}m.Tween=Zb,Zb.prototype={constructor:Zb,init:function(a,b,c,d,e,f){this.elem=a,this.prop=c,this.easing=e||"swing",this.options=b,this.start=this.now=this.cur(),this.end=d,this.unit=f||(m.cssNumber[c]?"":"px")
-},cur:function(){var a=Zb.propHooks[this.prop];return a&&a.get?a.get(this):Zb.propHooks._default.get(this)},run:function(a){var b,c=Zb.propHooks[this.prop];return this.pos=b=this.options.duration?m.easing[this.easing](a,this.options.duration*a,0,1,this.options.duration):a,this.now=(this.end-this.start)*b+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),c&&c.set?c.set(this):Zb.propHooks._default.set(this),this}},Zb.prototype.init.prototype=Zb.prototype,Zb.propHooks={_default:{get:function(a){var b;return null==a.elem[a.prop]||a.elem.style&&null!=a.elem.style[a.prop]?(b=m.css(a.elem,a.prop,""),b&&"auto"!==b?b:0):a.elem[a.prop]},set:function(a){m.fx.step[a.prop]?m.fx.step[a.prop](a):a.elem.style&&(null!=a.elem.style[m.cssProps[a.prop]]||m.cssHooks[a.prop])?m.style(a.elem,a.prop,a.now+a.unit):a.elem[a.prop]=a.now}}},Zb.propHooks.scrollTop=Zb.propHooks.scrollLeft={set:function(a){a.elem.nodeType&&a.elem.parentNode&&(a.elem[a.prop]=a.now)}},m.easing={linear:function(a){return a},swing:function(a){return.5-Math.cos(a*Math.PI)/2}},m.fx=Zb.prototype.init,m.fx.step={};var $b,_b,ac=/^(?:toggle|show|hide)$/,bc=new RegExp("^(?:([+-])=|)("+S+")([a-z%]*)$","i"),cc=/queueHooks$/,dc=[ic],ec={"*":[function(a,b){var c=this.createTween(a,b),d=c.cur(),e=bc.exec(b),f=e&&e[3]||(m.cssNumber[a]?"":"px"),g=(m.cssNumber[a]||"px"!==f&&+d)&&bc.exec(m.css(c.elem,a)),h=1,i=20;if(g&&g[3]!==f){f=f||g[3],e=e||[],g=+d||1;do h=h||".5",g/=h,m.style(c.elem,a,g+f);while(h!==(h=c.cur()/d)&&1!==h&&--i)}return e&&(g=c.start=+g||+d||0,c.unit=f,c.end=e[1]?g+(e[1]+1)*e[2]:+e[2]),c}]};function fc(){return setTimeout(function(){$b=void 0}),$b=m.now()}function gc(a,b){var c,d={height:a},e=0;for(b=b?1:0;4>e;e+=2-b)c=T[e],d["margin"+c]=d["padding"+c]=a;return b&&(d.opacity=d.width=a),d}function hc(a,b,c){for(var d,e=(ec[b]||[]).concat(ec["*"]),f=0,g=e.length;g>f;f++)if(d=e[f].call(c,b,a))return d}function ic(a,b,c){var d,e,f,g,h,i,j,l,n=this,o={},p=a.style,q=a.nodeType&&U(a),r=m._data(a,"fxshow");c.queue||(h=m._queueHooks(a,"fx"),null==h.unqueued&&(h.unqueued=0,i=h.empty.fire,h.empty.fire=function(){h.unqueued||i()}),h.unqueued++,n.always(function(){n.always(function(){h.unqueued--,m.queue(a,"fx").length||h.empty.fire()})})),1===a.nodeType&&("height"in b||"width"in b)&&(c.overflow=[p.overflow,p.overflowX,p.overflowY],j=m.css(a,"display"),l="none"===j?m._data(a,"olddisplay")||Fb(a.nodeName):j,"inline"===l&&"none"===m.css(a,"float")&&(k.inlineBlockNeedsLayout&&"inline"!==Fb(a.nodeName)?p.zoom=1:p.display="inline-block")),c.overflow&&(p.overflow="hidden",k.shrinkWrapBlocks()||n.always(function(){p.overflow=c.overflow[0],p.overflowX=c.overflow[1],p.overflowY=c.overflow[2]}));for(d in b)if(e=b[d],ac.exec(e)){if(delete b[d],f=f||"toggle"===e,e===(q?"hide":"show")){if("show"!==e||!r||void 0===r[d])continue;q=!0}o[d]=r&&r[d]||m.style(a,d)}else j=void 0;if(m.isEmptyObject(o))"inline"===("none"===j?Fb(a.nodeName):j)&&(p.display=j);else{r?"hidden"in r&&(q=r.hidden):r=m._data(a,"fxshow",{}),f&&(r.hidden=!q),q?m(a).show():n.done(function(){m(a).hide()}),n.done(function(){var b;m._removeData(a,"fxshow");for(b in o)m.style(a,b,o[b])});for(d in o)g=hc(q?r[d]:0,d,n),d in r||(r[d]=g.start,q&&(g.end=g.start,g.start="width"===d||"height"===d?1:0))}}function jc(a,b){var c,d,e,f,g;for(c in a)if(d=m.camelCase(c),e=b[d],f=a[c],m.isArray(f)&&(e=f[1],f=a[c]=f[0]),c!==d&&(a[d]=f,delete a[c]),g=m.cssHooks[d],g&&"expand"in g){f=g.expand(f),delete a[d];for(c in f)c in a||(a[c]=f[c],b[c]=e)}else b[d]=e}function kc(a,b,c){var d,e,f=0,g=dc.length,h=m.Deferred().always(function(){delete i.elem}),i=function(){if(e)return!1;for(var b=$b||fc(),c=Math.max(0,j.startTime+j.duration-b),d=c/j.duration||0,f=1-d,g=0,i=j.tweens.length;i>g;g++)j.tweens[g].run(f);return h.notifyWith(a,[j,f,c]),1>f&&i?c:(h.resolveWith(a,[j]),!1)},j=h.promise({elem:a,props:m.extend({},b),opts:m.extend(!0,{specialEasing:{}},c),originalProperties:b,originalOptions:c,startTime:$b||fc(),duration:c.duration,tweens:[],createTween:function(b,c){var d=m.Tween(a,j.opts,b,c,j.opts.specialEasing[b]||j.opts.easing);return j.tweens.push(d),d},stop:function(b){var c=0,d=b?j.tweens.length:0;if(e)return this;for(e=!0;d>c;c++)j.tweens[c].run(1);return b?h.resolveWith(a,[j,b]):h.rejectWith(a,[j,b]),this}}),k=j.props;for(jc(k,j.opts.specialEasing);g>f;f++)if(d=dc[f].call(j,a,k,j.opts))return d;return m.map(k,hc,j),m.isFunction(j.opts.start)&&j.opts.start.call(a,j),m.fx.timer(m.extend(i,{elem:a,anim:j,queue:j.opts.queue})),j.progress(j.opts.progress).done(j.opts.done,j.opts.complete).fail(j.opts.fail).always(j.opts.always)}m.Animation=m.extend(kc,{tweener:function(a,b){m.isFunction(a)?(b=a,a=["*"]):a=a.split(" ");for(var c,d=0,e=a.length;e>d;d++)c=a[d],ec[c]=ec[c]||[],ec[c].unshift(b)},prefilter:function(a,b){b?dc.unshift(a):dc.push(a)}}),m.speed=function(a,b,c){var d=a&&"object"==typeof a?m.extend({},a):{complete:c||!c&&b||m.isFunction(a)&&a,duration:a,easing:c&&b||b&&!m.isFunction(b)&&b};return d.duration=m.fx.off?0:"number"==typeof d.duration?d.duration:d.duration in m.fx.speeds?m.fx.speeds[d.duration]:m.fx.speeds._default,(null==d.queue||d.queue===!0)&&(d.queue="fx"),d.old=d.complete,d.complete=function(){m.isFunction(d.old)&&d.old.call(this),d.queue&&m.dequeue(this,d.queue)},d},m.fn.extend({fadeTo:function(a,b,c,d){return this.filter(U).css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){var e=m.isEmptyObject(a),f=m.speed(b,c,d),g=function(){var b=kc(this,m.extend({},a),f);(e||m._data(this,"finish"))&&b.stop(!0)};return g.finish=g,e||f.queue===!1?this.each(g):this.queue(f.queue,g)},stop:function(a,b,c){var d=function(a){var b=a.stop;delete a.stop,b(c)};return"string"!=typeof a&&(c=b,b=a,a=void 0),b&&a!==!1&&this.queue(a||"fx",[]),this.each(function(){var b=!0,e=null!=a&&a+"queueHooks",f=m.timers,g=m._data(this);if(e)g[e]&&g[e].stop&&d(g[e]);else for(e in g)g[e]&&g[e].stop&&cc.test(e)&&d(g[e]);for(e=f.length;e--;)f[e].elem!==this||null!=a&&f[e].queue!==a||(f[e].anim.stop(c),b=!1,f.splice(e,1));(b||!c)&&m.dequeue(this,a)})},finish:function(a){return a!==!1&&(a=a||"fx"),this.each(function(){var b,c=m._data(this),d=c[a+"queue"],e=c[a+"queueHooks"],f=m.timers,g=d?d.length:0;for(c.finish=!0,m.queue(this,a,[]),e&&e.stop&&e.stop.call(this,!0),b=f.length;b--;)f[b].elem===this&&f[b].queue===a&&(f[b].anim.stop(!0),f.splice(b,1));for(b=0;g>b;b++)d[b]&&d[b].finish&&d[b].finish.call(this);delete c.finish})}}),m.each(["toggle","show","hide"],function(a,b){var c=m.fn[b];m.fn[b]=function(a,d,e){return null==a||"boolean"==typeof a?c.apply(this,arguments):this.animate(gc(b,!0),a,d,e)}}),m.each({slideDown:gc("show"),slideUp:gc("hide"),slideToggle:gc("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){m.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),m.timers=[],m.fx.tick=function(){var a,b=m.timers,c=0;for($b=m.now();c<b.length;c++)a=b[c],a()||b[c]!==a||b.splice(c--,1);b.length||m.fx.stop(),$b=void 0},m.fx.timer=function(a){m.timers.push(a),a()?m.fx.start():m.timers.pop()},m.fx.interval=13,m.fx.start=function(){_b||(_b=setInterval(m.fx.tick,m.fx.interval))},m.fx.stop=function(){clearInterval(_b),_b=null},m.fx.speeds={slow:600,fast:200,_default:400},m.fn.delay=function(a,b){return a=m.fx?m.fx.speeds[a]||a:a,b=b||"fx",this.queue(b,function(b,c){var d=setTimeout(b,a);c.stop=function(){clearTimeout(d)}})},function(){var a,b,c,d,e;b=y.createElement("div"),b.setAttribute("className","t"),b.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",d=b.getElementsByTagName("a")[0],c=y.createElement("select"),e=c.appendChild(y.createElement("option")),a=b.getElementsByTagName("input")[0],d.style.cssText="top:1px",k.getSetAttribute="t"!==b.className,k.style=/top/.test(d.getAttribute("style")),k.hrefNormalized="/a"===d.getAttribute("href"),k.checkOn=!!a.value,k.optSelected=e.selected,k.enctype=!!y.createElement("form").enctype,c.disabled=!0,k.optDisabled=!e.disabled,a=y.createElement("input"),a.setAttribute("value",""),k.input=""===a.getAttribute("value"),a.value="t",a.setAttribute("type","radio"),k.radioValue="t"===a.value}();var lc=/\r/g;m.fn.extend({val:function(a){var b,c,d,e=this[0];{if(arguments.length)return d=m.isFunction(a),this.each(function(c){var e;1===this.nodeType&&(e=d?a.call(this,c,m(this).val()):a,null==e?e="":"number"==typeof e?e+="":m.isArray(e)&&(e=m.map(e,function(a){return null==a?"":a+""})),b=m.valHooks[this.type]||m.valHooks[this.nodeName.toLowerCase()],b&&"set"in b&&void 0!==b.set(this,e,"value")||(this.value=e))});if(e)return b=m.valHooks[e.type]||m.valHooks[e.nodeName.toLowerCase()],b&&"get"in b&&void 0!==(c=b.get(e,"value"))?c:(c=e.value,"string"==typeof c?c.replace(lc,""):null==c?"":c)}}}),m.extend({valHooks:{option:{get:function(a){var b=m.find.attr(a,"value");return null!=b?b:m.trim(m.text(a))}},select:{get:function(a){for(var b,c,d=a.options,e=a.selectedIndex,f="select-one"===a.type||0>e,g=f?null:[],h=f?e+1:d.length,i=0>e?h:f?e:0;h>i;i++)if(c=d[i],!(!c.selected&&i!==e||(k.optDisabled?c.disabled:null!==c.getAttribute("disabled"))||c.parentNode.disabled&&m.nodeName(c.parentNode,"optgroup"))){if(b=m(c).val(),f)return b;g.push(b)}return g},set:function(a,b){var c,d,e=a.options,f=m.makeArray(b),g=e.length;while(g--)if(d=e[g],m.inArray(m.valHooks.option.get(d),f)>=0)try{d.selected=c=!0}catch(h){d.scrollHeight}else d.selected=!1;return c||(a.selectedIndex=-1),e}}}}),m.each(["radio","checkbox"],function(){m.valHooks[this]={set:function(a,b){return m.isArray(b)?a.checked=m.inArray(m(a).val(),b)>=0:void 0}},k.checkOn||(m.valHooks[this].get=function(a){return null===a.getAttribute("value")?"on":a.value})});var mc,nc,oc=m.expr.attrHandle,pc=/^(?:checked|selected)$/i,qc=k.getSetAttribute,rc=k.input;m.fn.extend({attr:function(a,b){return V(this,m.attr,a,b,arguments.length>1)},removeAttr:function(a){return this.each(function(){m.removeAttr(this,a)})}}),m.extend({attr:function(a,b,c){var d,e,f=a.nodeType;if(a&&3!==f&&8!==f&&2!==f)return typeof a.getAttribute===K?m.prop(a,b,c):(1===f&&m.isXMLDoc(a)||(b=b.toLowerCase(),d=m.attrHooks[b]||(m.expr.match.bool.test(b)?nc:mc)),void 0===c?d&&"get"in d&&null!==(e=d.get(a,b))?e:(e=m.find.attr(a,b),null==e?void 0:e):null!==c?d&&"set"in d&&void 0!==(e=d.set(a,c,b))?e:(a.setAttribute(b,c+""),c):void m.removeAttr(a,b))},removeAttr:function(a,b){var c,d,e=0,f=b&&b.match(E);if(f&&1===a.nodeType)while(c=f[e++])d=m.propFix[c]||c,m.expr.match.bool.test(c)?rc&&qc||!pc.test(c)?a[d]=!1:a[m.camelCase("default-"+c)]=a[d]=!1:m.attr(a,c,""),a.removeAttribute(qc?c:d)},attrHooks:{type:{set:function(a,b){if(!k.radioValue&&"radio"===b&&m.nodeName(a,"input")){var c=a.value;return a.setAttribute("type",b),c&&(a.value=c),b}}}}}),nc={set:function(a,b,c){return b===!1?m.removeAttr(a,c):rc&&qc||!pc.test(c)?a.setAttribute(!qc&&m.propFix[c]||c,c):a[m.camelCase("default-"+c)]=a[c]=!0,c}},m.each(m.expr.match.bool.source.match(/\w+/g),function(a,b){var c=oc[b]||m.find.attr;oc[b]=rc&&qc||!pc.test(b)?function(a,b,d){var e,f;return d||(f=oc[b],oc[b]=e,e=null!=c(a,b,d)?b.toLowerCase():null,oc[b]=f),e}:function(a,b,c){return c?void 0:a[m.camelCase("default-"+b)]?b.toLowerCase():null}}),rc&&qc||(m.attrHooks.value={set:function(a,b,c){return m.nodeName(a,"input")?void(a.defaultValue=b):mc&&mc.set(a,b,c)}}),qc||(mc={set:function(a,b,c){var d=a.getAttributeNode(c);return d||a.setAttributeNode(d=a.ownerDocument.createAttribute(c)),d.value=b+="","value"===c||b===a.getAttribute(c)?b:void 0}},oc.id=oc.name=oc.coords=function(a,b,c){var d;return c?void 0:(d=a.getAttributeNode(b))&&""!==d.value?d.value:null},m.valHooks.button={get:function(a,b){var c=a.getAttributeNode(b);return c&&c.specified?c.value:void 0},set:mc.set},m.attrHooks.contenteditable={set:function(a,b,c){mc.set(a,""===b?!1:b,c)}},m.each(["width","height"],function(a,b){m.attrHooks[b]={set:function(a,c){return""===c?(a.setAttribute(b,"auto"),c):void 0}}})),k.style||(m.attrHooks.style={get:function(a){return a.style.cssText||void 0},set:function(a,b){return a.style.cssText=b+""}});var sc=/^(?:input|select|textarea|button|object)$/i,tc=/^(?:a|area)$/i;m.fn.extend({prop:function(a,b){return V(this,m.prop,a,b,arguments.length>1)},removeProp:function(a){return a=m.propFix[a]||a,this.each(function(){try{this[a]=void 0,delete this[a]}catch(b){}})}}),m.extend({propFix:{"for":"htmlFor","class":"className"},prop:function(a,b,c){var d,e,f,g=a.nodeType;if(a&&3!==g&&8!==g&&2!==g)return f=1!==g||!m.isXMLDoc(a),f&&(b=m.propFix[b]||b,e=m.propHooks[b]),void 0!==c?e&&"set"in e&&void 0!==(d=e.set(a,c,b))?d:a[b]=c:e&&"get"in e&&null!==(d=e.get(a,b))?d:a[b]},propHooks:{tabIndex:{get:function(a){var b=m.find.attr(a,"tabindex");return b?parseInt(b,10):sc.test(a.nodeName)||tc.test(a.nodeName)&&a.href?0:-1}}}}),k.hrefNormalized||m.each(["href","src"],function(a,b){m.propHooks[b]={get:function(a){return a.getAttribute(b,4)}}}),k.optSelected||(m.propHooks.selected={get:function(a){var b=a.parentNode;return b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex),null}}),m.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){m.propFix[this.toLowerCase()]=this}),k.enctype||(m.propFix.enctype="encoding");var uc=/[\t\r\n\f]/g;m.fn.extend({addClass:function(a){var b,c,d,e,f,g,h=0,i=this.length,j="string"==typeof a&&a;if(m.isFunction(a))return this.each(function(b){m(this).addClass(a.call(this,b,this.className))});if(j)for(b=(a||"").match(E)||[];i>h;h++)if(c=this[h],d=1===c.nodeType&&(c.className?(" "+c.className+" ").replace(uc," "):" ")){f=0;while(e=b[f++])d.indexOf(" "+e+" ")<0&&(d+=e+" ");g=m.trim(d),c.className!==g&&(c.className=g)}return this},removeClass:function(a){var b,c,d,e,f,g,h=0,i=this.length,j=0===arguments.length||"string"==typeof a&&a;if(m.isFunction(a))return this.each(function(b){m(this).removeClass(a.call(this,b,this.className))});if(j)for(b=(a||"").match(E)||[];i>h;h++)if(c=this[h],d=1===c.nodeType&&(c.className?(" "+c.className+" ").replace(uc," "):"")){f=0;while(e=b[f++])while(d.indexOf(" "+e+" ")>=0)d=d.replace(" "+e+" "," ");g=a?m.trim(d):"",c.className!==g&&(c.className=g)}return this},toggleClass:function(a,b){var c=typeof a;return"boolean"==typeof b&&"string"===c?b?this.addClass(a):this.removeClass(a):this.each(m.isFunction(a)?function(c){m(this).toggleClass(a.call(this,c,this.className,b),b)}:function(){if("string"===c){var b,d=0,e=m(this),f=a.match(E)||[];while(b=f[d++])e.hasClass(b)?e.removeClass(b):e.addClass(b)}else(c===K||"boolean"===c)&&(this.className&&m._data(this,"__className__",this.className),this.className=this.className||a===!1?"":m._data(this,"__className__")||"")})},hasClass:function(a){for(var b=" "+a+" ",c=0,d=this.length;d>c;c++)if(1===this[c].nodeType&&(" "+this[c].className+" ").replace(uc," ").indexOf(b)>=0)return!0;return!1}}),m.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(a,b){m.fn[b]=function(a,c){return arguments.length>0?this.on(b,null,a,c):this.trigger(b)}}),m.fn.extend({hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)},bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return 1===arguments.length?this.off(a,"**"):this.off(b,a||"**",c)}});var vc=m.now(),wc=/\?/,xc=/(,)|(\[|{)|(}|])|"(?:[^"\\\r\n]|\\["\\\/bfnrt]|\\u[\da-fA-F]{4})*"\s*:?|true|false|null|-?(?!0\d)\d+(?:\.\d+|)(?:[eE][+-]?\d+|)/g;m.parseJSON=function(b){if(a.JSON&&a.JSON.parse)return a.JSON.parse(b+"");var c,d=null,e=m.trim(b+"");return e&&!m.trim(e.replace(xc,function(a,b,e,f){return c&&b&&(d=0),0===d?a:(c=e||b,d+=!f-!e,"")}))?Function("return "+e)():m.error("Invalid JSON: "+b)},m.parseXML=function(b){var c,d;if(!b||"string"!=typeof b)return null;try{a.DOMParser?(d=new DOMParser,c=d.parseFromString(b,"text/xml")):(c=new ActiveXObject("Microsoft.XMLDOM"),c.async="false",c.loadXML(b))}catch(e){c=void 0}return c&&c.documentElement&&!c.getElementsByTagName("parsererror").length||m.error("Invalid XML: "+b),c};var yc,zc,Ac=/#.*$/,Bc=/([?&])_=[^&]*/,Cc=/^(.*?):[ \t]*([^\r\n]*)\r?$/gm,Dc=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,Ec=/^(?:GET|HEAD)$/,Fc=/^\/\//,Gc=/^([\w.+-]+:)(?:\/\/(?:[^\/?#]*@|)([^\/?#:]*)(?::(\d+)|)|)/,Hc={},Ic={},Jc="*/".concat("*");try{zc=location.href}catch(Kc){zc=y.createElement("a"),zc.href="",zc=zc.href}yc=Gc.exec(zc.toLowerCase())||[];function Lc(a){return function(b,c){"string"!=typeof b&&(c=b,b="*");var d,e=0,f=b.toLowerCase().match(E)||[];if(m.isFunction(c))while(d=f[e++])"+"===d.charAt(0)?(d=d.slice(1)||"*",(a[d]=a[d]||[]).unshift(c)):(a[d]=a[d]||[]).push(c)}}function Mc(a,b,c,d){var e={},f=a===Ic;function g(h){var i;return e[h]=!0,m.each(a[h]||[],function(a,h){var j=h(b,c,d);return"string"!=typeof j||f||e[j]?f?!(i=j):void 0:(b.dataTypes.unshift(j),g(j),!1)}),i}return g(b.dataTypes[0])||!e["*"]&&g("*")}function Nc(a,b){var c,d,e=m.ajaxSettings.flatOptions||{};for(d in b)void 0!==b[d]&&((e[d]?a:c||(c={}))[d]=b[d]);return c&&m.extend(!0,a,c),a}function Oc(a,b,c){var d,e,f,g,h=a.contents,i=a.dataTypes;while("*"===i[0])i.shift(),void 0===e&&(e=a.mimeType||b.getResponseHeader("Content-Type"));if(e)for(g in h)if(h[g]&&h[g].test(e)){i.unshift(g);break}if(i[0]in c)f=i[0];else{for(g in c){if(!i[0]||a.converters[g+" "+i[0]]){f=g;break}d||(d=g)}f=f||d}return f?(f!==i[0]&&i.unshift(f),c[f]):void 0}function Pc(a,b,c,d){var e,f,g,h,i,j={},k=a.dataTypes.slice();if(k[1])for(g in a.converters)j[g.toLowerCase()]=a.converters[g];f=k.shift();while(f)if(a.responseFields[f]&&(c[a.responseFields[f]]=b),!i&&d&&a.dataFilter&&(b=a.dataFilter(b,a.dataType)),i=f,f=k.shift())if("*"===f)f=i;else if("*"!==i&&i!==f){if(g=j[i+" "+f]||j["* "+f],!g)for(e in j)if(h=e.split(" "),h[1]===f&&(g=j[i+" "+h[0]]||j["* "+h[0]])){g===!0?g=j[e]:j[e]!==!0&&(f=h[0],k.unshift(h[1]));break}if(g!==!0)if(g&&a["throws"])b=g(b);else try{b=g(b)}catch(l){return{state:"parsererror",error:g?l:"No conversion from "+i+" to "+f}}}return{state:"success",data:b}}m.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:zc,type:"GET",isLocal:Dc.test(yc[1]),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":Jc,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":m.parseJSON,"text xml":m.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(a,b){return b?Nc(Nc(a,m.ajaxSettings),b):Nc(m.ajaxSettings,a)},ajaxPrefilter:Lc(Hc),ajaxTransport:Lc(Ic),ajax:function(a,b){"object"==typeof a&&(b=a,a=void 0),b=b||{};var c,d,e,f,g,h,i,j,k=m.ajaxSetup({},b),l=k.context||k,n=k.context&&(l.nodeType||l.jquery)?m(l):m.event,o=m.Deferred(),p=m.Callbacks("once memory"),q=k.statusCode||{},r={},s={},t=0,u="canceled",v={readyState:0,getResponseHeader:function(a){var b;if(2===t){if(!j){j={};while(b=Cc.exec(f))j[b[1].toLowerCase()]=b[2]}b=j[a.toLowerCase()]}return null==b?null:b},getAllResponseHeaders:function(){return 2===t?f:null},setRequestHeader:function(a,b){var c=a.toLowerCase();return t||(a=s[c]=s[c]||a,r[a]=b),this},overrideMimeType:function(a){return t||(k.mimeType=a),this},statusCode:function(a){var b;if(a)if(2>t)for(b in a)q[b]=[q[b],a[b]];else v.always(a[v.status]);return this},abort:function(a){var b=a||u;return i&&i.abort(b),x(0,b),this}};if(o.promise(v).complete=p.add,v.success=v.done,v.error=v.fail,k.url=((a||k.url||zc)+"").replace(Ac,"").replace(Fc,yc[1]+"//"),k.type=b.method||b.type||k.method||k.type,k.dataTypes=m.trim(k.dataType||"*").toLowerCase().match(E)||[""],null==k.crossDomain&&(c=Gc.exec(k.url.toLowerCase()),k.crossDomain=!(!c||c[1]===yc[1]&&c[2]===yc[2]&&(c[3]||("http:"===c[1]?"80":"443"))===(yc[3]||("http:"===yc[1]?"80":"443")))),k.data&&k.processData&&"string"!=typeof k.data&&(k.data=m.param(k.data,k.traditional)),Mc(Hc,k,b,v),2===t)return v;h=k.global,h&&0===m.active++&&m.event.trigger("ajaxStart"),k.type=k.type.toUpperCase(),k.hasContent=!Ec.test(k.type),e=k.url,k.hasContent||(k.data&&(e=k.url+=(wc.test(e)?"&":"?")+k.data,delete k.data),k.cache===!1&&(k.url=Bc.test(e)?e.replace(Bc,"$1_="+vc++):e+(wc.test(e)?"&":"?")+"_="+vc++)),k.ifModified&&(m.lastModified[e]&&v.setRequestHeader("If-Modified-Since",m.lastModified[e]),m.etag[e]&&v.setRequestHeader("If-None-Match",m.etag[e])),(k.data&&k.hasContent&&k.contentType!==!1||b.contentType)&&v.setRequestHeader("Content-Type",k.contentType),v.setRequestHeader("Accept",k.dataTypes[0]&&k.accepts[k.dataTypes[0]]?k.accepts[k.dataTypes[0]]+("*"!==k.dataTypes[0]?", "+Jc+"; q=0.01":""):k.accepts["*"]);for(d in k.headers)v.setRequestHeader(d,k.headers[d]);if(k.beforeSend&&(k.beforeSend.call(l,v,k)===!1||2===t))return v.abort();u="abort";for(d in{success:1,error:1,complete:1})v[d](k[d]);if(i=Mc(Ic,k,b,v)){v.readyState=1,h&&n.trigger("ajaxSend",[v,k]),k.async&&k.timeout>0&&(g=setTimeout(function(){v.abort("timeout")},k.timeout));try{t=1,i.send(r,x)}catch(w){if(!(2>t))throw w;x(-1,w)}}else x(-1,"No Transport");function x(a,b,c,d){var j,r,s,u,w,x=b;2!==t&&(t=2,g&&clearTimeout(g),i=void 0,f=d||"",v.readyState=a>0?4:0,j=a>=200&&300>a||304===a,c&&(u=Oc(k,v,c)),u=Pc(k,u,v,j),j?(k.ifModified&&(w=v.getResponseHeader("Last-Modified"),w&&(m.lastModified[e]=w),w=v.getResponseHeader("etag"),w&&(m.etag[e]=w)),204===a||"HEAD"===k.type?x="nocontent":304===a?x="notmodified":(x=u.state,r=u.data,s=u.error,j=!s)):(s=x,(a||!x)&&(x="error",0>a&&(a=0))),v.status=a,v.statusText=(b||x)+"",j?o.resolveWith(l,[r,x,v]):o.rejectWith(l,[v,x,s]),v.statusCode(q),q=void 0,h&&n.trigger(j?"ajaxSuccess":"ajaxError",[v,k,j?r:s]),p.fireWith(l,[v,x]),h&&(n.trigger("ajaxComplete",[v,k]),--m.active||m.event.trigger("ajaxStop")))}return v},getJSON:function(a,b,c){return m.get(a,b,c,"json")},getScript:function(a,b){return m.get(a,void 0,b,"script")}}),m.each(["get","post"],function(a,b){m[b]=function(a,c,d,e){return m.isFunction(c)&&(e=e||d,d=c,c=void 0),m.ajax({url:a,type:b,dataType:e,data:c,success:d})}}),m.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(a,b){m.fn[b]=function(a){return this.on(b,a)}}),m._evalUrl=function(a){return m.ajax({url:a,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0})},m.fn.extend({wrapAll:function(a){if(m.isFunction(a))return this.each(function(b){m(this).wrapAll(a.call(this,b))});if(this[0]){var b=m(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&1===a.firstChild.nodeType)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){return this.each(m.isFunction(a)?function(b){m(this).wrapInner(a.call(this,b))}:function(){var b=m(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=m.isFunction(a);return this.each(function(c){m(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){m.nodeName(this,"body")||m(this).replaceWith(this.childNodes)}).end()}}),m.expr.filters.hidden=function(a){return a.offsetWidth<=0&&a.offsetHeight<=0||!k.reliableHiddenOffsets()&&"none"===(a.style&&a.style.display||m.css(a,"display"))},m.expr.filters.visible=function(a){return!m.expr.filters.hidden(a)};var Qc=/%20/g,Rc=/\[\]$/,Sc=/\r?\n/g,Tc=/^(?:submit|button|image|reset|file)$/i,Uc=/^(?:input|select|textarea|keygen)/i;function Vc(a,b,c,d){var e;if(m.isArray(b))m.each(b,function(b,e){c||Rc.test(a)?d(a,e):Vc(a+"["+("object"==typeof e?b:"")+"]",e,c,d)});else if(c||"object"!==m.type(b))d(a,b);else for(e in b)Vc(a+"["+e+"]",b[e],c,d)}m.param=function(a,b){var c,d=[],e=function(a,b){b=m.isFunction(b)?b():null==b?"":b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};if(void 0===b&&(b=m.ajaxSettings&&m.ajaxSettings.traditional),m.isArray(a)||a.jquery&&!m.isPlainObject(a))m.each(a,function(){e(this.name,this.value)});else for(c in a)Vc(c,a[c],b,e);return d.join("&").replace(Qc,"+")},m.fn.extend({serialize:function(){return m.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var a=m.prop(this,"elements");return a?m.makeArray(a):this}).filter(function(){var a=this.type;return this.name&&!m(this).is(":disabled")&&Uc.test(this.nodeName)&&!Tc.test(a)&&(this.checked||!W.test(a))}).map(function(a,b){var c=m(this).val();return null==c?null:m.isArray(c)?m.map(c,function(a){return{name:b.name,value:a.replace(Sc,"\r\n")}}):{name:b.name,value:c.replace(Sc,"\r\n")}}).get()}}),m.ajaxSettings.xhr=void 0!==a.ActiveXObject?function(){return!this.isLocal&&/^(get|post|head|put|delete|options)$/i.test(this.type)&&Zc()||$c()}:Zc;var Wc=0,Xc={},Yc=m.ajaxSettings.xhr();a.ActiveXObject&&m(a).on("unload",function(){for(var a in Xc)Xc[a](void 0,!0)}),k.cors=!!Yc&&"withCredentials"in Yc,Yc=k.ajax=!!Yc,Yc&&m.ajaxTransport(function(a){if(!a.crossDomain||k.cors){var b;return{send:function(c,d){var e,f=a.xhr(),g=++Wc;if(f.open(a.type,a.url,a.async,a.username,a.password),a.xhrFields)for(e in a.xhrFields)f[e]=a.xhrFields[e];a.mimeType&&f.overrideMimeType&&f.overrideMimeType(a.mimeType),a.crossDomain||c["X-Requested-With"]||(c["X-Requested-With"]="XMLHttpRequest");for(e in c)void 0!==c[e]&&f.setRequestHeader(e,c[e]+"");f.send(a.hasContent&&a.data||null),b=function(c,e){var h,i,j;if(b&&(e||4===f.readyState))if(delete Xc[g],b=void 0,f.onreadystatechange=m.noop,e)4!==f.readyState&&f.abort();else{j={},h=f.status,"string"==typeof f.responseText&&(j.text=f.responseText);try{i=f.statusText}catch(k){i=""}h||!a.isLocal||a.crossDomain?1223===h&&(h=204):h=j.text?200:404}j&&d(h,i,j,f.getAllResponseHeaders())},a.async?4===f.readyState?setTimeout(b):f.onreadystatechange=Xc[g]=b:b()},abort:function(){b&&b(void 0,!0)}}}});function Zc(){try{return new a.XMLHttpRequest}catch(b){}}function $c(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}m.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/(?:java|ecma)script/},converters:{"text script":function(a){return m.globalEval(a),a}}}),m.ajaxPrefilter("script",function(a){void 0===a.cache&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),m.ajaxTransport("script",function(a){if(a.crossDomain){var b,c=y.head||m("head")[0]||y.documentElement;return{send:function(d,e){b=y.createElement("script"),b.async=!0,a.scriptCharset&&(b.charset=a.scriptCharset),b.src=a.url,b.onload=b.onreadystatechange=function(a,c){(c||!b.readyState||/loaded|complete/.test(b.readyState))&&(b.onload=b.onreadystatechange=null,b.parentNode&&b.parentNode.removeChild(b),b=null,c||e(200,"success"))},c.insertBefore(b,c.firstChild)},abort:function(){b&&b.onload(void 0,!0)}}}});var _c=[],ad=/(=)\?(?=&|$)|\?\?/;m.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var a=_c.pop()||m.expando+"_"+vc++;return this[a]=!0,a}}),m.ajaxPrefilter("json jsonp",function(b,c,d){var e,f,g,h=b.jsonp!==!1&&(ad.test(b.url)?"url":"string"==typeof b.data&&!(b.contentType||"").indexOf("application/x-www-form-urlencoded")&&ad.test(b.data)&&"data");return h||"jsonp"===b.dataTypes[0]?(e=b.jsonpCallback=m.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,h?b[h]=b[h].replace(ad,"$1"+e):b.jsonp!==!1&&(b.url+=(wc.test(b.url)?"&":"?")+b.jsonp+"="+e),b.converters["script json"]=function(){return g||m.error(e+" was not called"),g[0]},b.dataTypes[0]="json",f=a[e],a[e]=function(){g=arguments},d.always(function(){a[e]=f,b[e]&&(b.jsonpCallback=c.jsonpCallback,_c.push(e)),g&&m.isFunction(f)&&f(g[0]),g=f=void 0}),"script"):void 0}),m.parseHTML=function(a,b,c){if(!a||"string"!=typeof a)return null;"boolean"==typeof b&&(c=b,b=!1),b=b||y;var d=u.exec(a),e=!c&&[];return d?[b.createElement(d[1])]:(d=m.buildFragment([a],b,e),e&&e.length&&m(e).remove(),m.merge([],d.childNodes))};var bd=m.fn.load;m.fn.load=function(a,b,c){if("string"!=typeof a&&bd)return bd.apply(this,arguments);var d,e,f,g=this,h=a.indexOf(" ");return h>=0&&(d=m.trim(a.slice(h,a.length)),a=a.slice(0,h)),m.isFunction(b)?(c=b,b=void 0):b&&"object"==typeof b&&(f="POST"),g.length>0&&m.ajax({url:a,type:f,dataType:"html",data:b}).done(function(a){e=arguments,g.html(d?m("<div>").append(m.parseHTML(a)).find(d):a)}).complete(c&&function(a,b){g.each(c,e||[a.responseText,b,a])}),this},m.expr.filters.animated=function(a){return m.grep(m.timers,function(b){return a===b.elem}).length};var cd=a.document.documentElement;function dd(a){return m.isWindow(a)?a:9===a.nodeType?a.defaultView||a.parentWindow:!1}m.offset={setOffset:function(a,b,c){var d,e,f,g,h,i,j,k=m.css(a,"position"),l=m(a),n={};"static"===k&&(a.style.position="relative"),h=l.offset(),f=m.css(a,"top"),i=m.css(a,"left"),j=("absolute"===k||"fixed"===k)&&m.inArray("auto",[f,i])>-1,j?(d=l.position(),g=d.top,e=d.left):(g=parseFloat(f)||0,e=parseFloat(i)||0),m.isFunction(b)&&(b=b.call(a,c,h)),null!=b.top&&(n.top=b.top-h.top+g),null!=b.left&&(n.left=b.left-h.left+e),"using"in b?b.using.call(a,n):l.css(n)}},m.fn.extend({offset:function(a){if(arguments.length)return void 0===a?this:this.each(function(b){m.offset.setOffset(this,a,b)});var b,c,d={top:0,left:0},e=this[0],f=e&&e.ownerDocument;if(f)return b=f.documentElement,m.contains(b,e)?(typeof e.getBoundingClientRect!==K&&(d=e.getBoundingClientRect()),c=dd(f),{top:d.top+(c.pageYOffset||b.scrollTop)-(b.clientTop||0),left:d.left+(c.pageXOffset||b.scrollLeft)-(b.clientLeft||0)}):d},position:function(){if(this[0]){var a,b,c={top:0,left:0},d=this[0];return"fixed"===m.css(d,"position")?b=d.getBoundingClientRect():(a=this.offsetParent(),b=this.offset(),m.nodeName(a[0],"html")||(c=a.offset()),c.top+=m.css(a[0],"borderTopWidth",!0),c.left+=m.css(a[0],"borderLeftWidth",!0)),{top:b.top-c.top-m.css(d,"marginTop",!0),left:b.left-c.left-m.css(d,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||cd;while(a&&!m.nodeName(a,"html")&&"static"===m.css(a,"position"))a=a.offsetParent;return a||cd})}}),m.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(a,b){var c=/Y/.test(b);m.fn[a]=function(d){return V(this,function(a,d,e){var f=dd(a);return void 0===e?f?b in f?f[b]:f.document.documentElement[d]:a[d]:void(f?f.scrollTo(c?m(f).scrollLeft():e,c?e:m(f).scrollTop()):a[d]=e)},a,d,arguments.length,null)}}),m.each(["top","left"],function(a,b){m.cssHooks[b]=Lb(k.pixelPosition,function(a,c){return c?(c=Jb(a,b),Hb.test(c)?m(a).position()[b]+"px":c):void 0})}),m.each({Height:"height",Width:"width"},function(a,b){m.each({padding:"inner"+a,content:b,"":"outer"+a},function(c,d){m.fn[d]=function(d,e){var f=arguments.length&&(c||"boolean"!=typeof d),g=c||(d===!0||e===!0?"margin":"border");return V(this,function(b,c,d){var e;return m.isWindow(b)?b.document.documentElement["client"+a]:9===b.nodeType?(e=b.documentElement,Math.max(b.body["scroll"+a],e["scroll"+a],b.body["offset"+a],e["offset"+a],e["client"+a])):void 0===d?m.css(b,c,g):m.style(b,c,d,g)},b,f?d:void 0,f,null)}})}),m.fn.size=function(){return this.length},m.fn.andSelf=m.fn.addBack,"function"==typeof define&&define.amd&&define("jquery",[],function(){return m});var ed=a.jQuery,fd=a.$;return m.noConflict=function(b){return a.$===m&&(a.$=fd),b&&a.jQuery===m&&(a.jQuery=ed),m},typeof b===K&&(a.jQuery=a.$=m),m});
diff --git a/docs/static/minus.png b/docs/static/minus.png
deleted file mode 100644
index 0f22b16b..00000000
Binary files a/docs/static/minus.png and /dev/null differ
diff --git a/docs/static/plus.png b/docs/static/plus.png
deleted file mode 100644
index 0cfe084c..00000000
Binary files a/docs/static/plus.png and /dev/null differ
diff --git a/docs/static/pygments.css b/docs/static/pygments.css
deleted file mode 100644
index 20c4814d..00000000
--- a/docs/static/pygments.css
+++ /dev/null
@@ -1,69 +0,0 @@
-.highlight .hll { background-color: #ffffcc }
-.highlight  { background: #eeffcc; }
-.highlight .c { color: #408090; font-style: italic } /* Comment */
-.highlight .err { border: 1px solid #FF0000 } /* Error */
-.highlight .k { color: #007020; font-weight: bold } /* Keyword */
-.highlight .o { color: #666666 } /* Operator */
-.highlight .ch { color: #408090; font-style: italic } /* Comment.Hashbang */
-.highlight .cm { color: #408090; font-style: italic } /* Comment.Multiline */
-.highlight .cp { color: #007020 } /* Comment.Preproc */
-.highlight .cpf { color: #408090; font-style: italic } /* Comment.PreprocFile */
-.highlight .c1 { color: #408090; font-style: italic } /* Comment.Single */
-.highlight .cs { color: #408090; background-color: #fff0f0 } /* Comment.Special */
-.highlight .gd { color: #A00000 } /* Generic.Deleted */
-.highlight .ge { font-style: italic } /* Generic.Emph */
-.highlight .gr { color: #FF0000 } /* Generic.Error */
-.highlight .gh { color: #000080; font-weight: bold } /* Generic.Heading */
-.highlight .gi { color: #00A000 } /* Generic.Inserted */
-.highlight .go { color: #333333 } /* Generic.Output */
-.highlight .gp { color: #c65d09; font-weight: bold } /* Generic.Prompt */
-.highlight .gs { font-weight: bold } /* Generic.Strong */
-.highlight .gu { color: #800080; font-weight: bold } /* Generic.Subheading */
-.highlight .gt { color: #0044DD } /* Generic.Traceback */
-.highlight .kc { color: #007020; font-weight: bold } /* Keyword.Constant */
-.highlight .kd { color: #007020; font-weight: bold } /* Keyword.Declaration */
-.highlight .kn { color: #007020; font-weight: bold } /* Keyword.Namespace */
-.highlight .kp { color: #007020 } /* Keyword.Pseudo */
-.highlight .kr { color: #007020; font-weight: bold } /* Keyword.Reserved */
-.highlight .kt { color: #902000 } /* Keyword.Type */
-.highlight .m { color: #208050 } /* Literal.Number */
-.highlight .s { color: #4070a0 } /* Literal.String */
-.highlight .na { color: #4070a0 } /* Name.Attribute */
-.highlight .nb { color: #007020 } /* Name.Builtin */
-.highlight .nc { color: #0e84b5; font-weight: bold } /* Name.Class */
-.highlight .no { color: #60add5 } /* Name.Constant */
-.highlight .nd { color: #555555; font-weight: bold } /* Name.Decorator */
-.highlight .ni { color: #d55537; font-weight: bold } /* Name.Entity */
-.highlight .ne { color: #007020 } /* Name.Exception */
-.highlight .nf { color: #06287e } /* Name.Function */
-.highlight .nl { color: #002070; font-weight: bold } /* Name.Label */
-.highlight .nn { color: #0e84b5; font-weight: bold } /* Name.Namespace */
-.highlight .nt { color: #062873; font-weight: bold } /* Name.Tag */
-.highlight .nv { color: #bb60d5 } /* Name.Variable */
-.highlight .ow { color: #007020; font-weight: bold } /* Operator.Word */
-.highlight .w { color: #bbbbbb } /* Text.Whitespace */
-.highlight .mb { color: #208050 } /* Literal.Number.Bin */
-.highlight .mf { color: #208050 } /* Literal.Number.Float */
-.highlight .mh { color: #208050 } /* Literal.Number.Hex */
-.highlight .mi { color: #208050 } /* Literal.Number.Integer */
-.highlight .mo { color: #208050 } /* Literal.Number.Oct */
-.highlight .sa { color: #4070a0 } /* Literal.String.Affix */
-.highlight .sb { color: #4070a0 } /* Literal.String.Backtick */
-.highlight .sc { color: #4070a0 } /* Literal.String.Char */
-.highlight .dl { color: #4070a0 } /* Literal.String.Delimiter */
-.highlight .sd { color: #4070a0; font-style: italic } /* Literal.String.Doc */
-.highlight .s2 { color: #4070a0 } /* Literal.String.Double */
-.highlight .se { color: #4070a0; font-weight: bold } /* Literal.String.Escape */
-.highlight .sh { color: #4070a0 } /* Literal.String.Heredoc */
-.highlight .si { color: #70a0d0; font-style: italic } /* Literal.String.Interpol */
-.highlight .sx { color: #c65d09 } /* Literal.String.Other */
-.highlight .sr { color: #235388 } /* Literal.String.Regex */
-.highlight .s1 { color: #4070a0 } /* Literal.String.Single */
-.highlight .ss { color: #517918 } /* Literal.String.Symbol */
-.highlight .bp { color: #007020 } /* Name.Builtin.Pseudo */
-.highlight .fm { color: #06287e } /* Name.Function.Magic */
-.highlight .vc { color: #bb60d5 } /* Name.Variable.Class */
-.highlight .vg { color: #bb60d5 } /* Name.Variable.Global */
-.highlight .vi { color: #bb60d5 } /* Name.Variable.Instance */
-.highlight .vm { color: #bb60d5 } /* Name.Variable.Magic */
-.highlight .il { color: #208050 } /* Literal.Number.Integer.Long */
\ No newline at end of file
diff --git a/docs/static/qpython_theme.css b/docs/static/qpython_theme.css
deleted file mode 100644
index 60b5bd4b..00000000
--- a/docs/static/qpython_theme.css
+++ /dev/null
@@ -1,577 +0,0 @@
-html { overflow-x: hidden; overflow-y: auto; }
-* {
-	margin: 0;
-	padding: 0;
-}
-li {
-	list-style: none;
-}
-a {
-	text-decoration: none;
-}
-.headerlink {
-	opacity: 0.1;
-}
-.crumbs li{
-	display: inline;
-}
-.index-more {
-	background-color: #efefef;
-	padding-top: 40px;
-}
-.index-more-item {
-	background: #FFFEFE;
-	border-radius: 3px;
-	padding: 15px 22px;
-}
-.index-more-item h4 {
-	font-family: Roboto-Condensed;
-	font-size: 20px;
-	color: #000000;
-	letter-spacing: 0.43px;
-}
-.index-more-item p {
-	font-family: Roboto-Light;
-	font-size: 14px;
-	color: #4A4A4A;
-	letter-spacing: 0;
-	line-height: 20px;
-}
-.p-faq {
-	margin-top: 20px;
-	font-family: Roboto-Light;
-	font-size: 12.7px;
-	color: #4A4A4A;
-	letter-spacing: 0.27px;
-}
-
-@media screen and (min-width: 768px) {
-	header {
-		height: 250px;
-		background-color: #000;
-		background: url('img_background.png') no-repeat;
-		background-size: cover;
-		font-family: Roboto-Thin;
-	}
-	header * {
-		display: inline-block;
-	}
-	.header {
-		background-color:  #000;
-		height: 80px;
-	}
-	.index-header {
-		display: flex;
-	    justify-content: space-between;
-	    -moz-justify-content: space-between;
-	    -webkit-justify-content: space-between;
-	    align-items: center;
-	}
-	.logo {
-		margin-left: -25px;
-	}
-	.header-title {
-		text-align: center;
-	}
-	.header-title li{
-		display: inline;
-		font-family: Roboto-Thin;
-		font-size: 16px;
-		margin-right: 25px;
-		position: relative;
-	}
-	.header-title li:last-child {
-		margin-right: 0;
-	}
-	.header-title li a {
-		color: #8a8787;
-	}
-	.header-title li .header-selected {
-		color:  #fff;
-	}
-	.header-title .header-title-selected {
-		width: 6px;
-		height: 6px;
-		display: block;
-		background: #49B300;
-		position: absolute;
-		left: 50%;
-		bottom: -15px;
-		border-radius: 50%;
-	}
-	.search-box {
-		position: relative;
-		margin-right: 4%;
-	}
-	.search-box input {
-		border: 0;
-		border-bottom: 1px solid #FFFFFF;
-		background-color: transparent;
-		font-size: 14px;
-		color: #fff;
-		width: 120px;
-	}
-	.search-box button{
-		background-color: transparent;
-		border: 0;
-	}
-	.search-box button {
-		position: absolute;
-		top: -3px;
-		right: 2px;
-	}
-	.index-main-pic {
-		margin-top: -150px;
-	}
-	.index-main-pic {
-		margin-top: -150px;
-	}
-	.clear-margin {
-		margin-left: 10px;
-		margin-right: 10px;
-	}
-	.index-content {
-		margin-top: 50px;
-	}
-	.index-content h2 {
-		font-size: 36px;
-		color: #4A4A4A;
-		letter-spacing: 0.07px;
-		margin-bottom: 30px;
-	}
-	.index-tag {
-		display: inline-block;
-		background: #FFDE00;
-		width: 30px;
-		height: 30px;
-		margin-right: 10px;
-		margin-top: 5px;
-	}
-	.index-content-text {
-		font-size: 20px;
-		color: #000000;
-		letter-spacing: 0.01px;
-		line-height: 30px;
-		margin-bottom: 40px;
-	}
-	.index-more-item {
-		background: #FFFEFE;
-		border-radius: 3px;
-		padding: 10px 20px;
-	}
-	.index-more .index-more-li {
-		padding-left: 10px;
-		padding-right: 10px;
-	}
-	.index-more-item {
-		min-height: 350px;
-	}
-	.index-faq {
-		margin-top: 60px;
-		padding-bottom: 40px;
-	}
-	.index-faq-li {
-		padding-left: 0;
-		padding-right: 0;
-	}
-	.index-faq-li > img {
-		width: 30px;
-	}
-	.index-link-logo {
-		margin-right: 35px;
-		margin-top: 20px;
-	}
-	.span-faq {
-		font-size: 25.65px;
-		color: #000000;
-		letter-spacing: 0.55px;
-		vertical-align: middle;
-	}
-	.index-shop-img {
-		height: 40px;
-		margin-bottom: 10px;
-		border-radius: 5px;
-		border:1px solid #ccc;
-	}
-	footer {
-		min-height: 80px;
-		background-color: #2F2F2F;
-		font-size: 18px;
-		color: #FFFFFF;
-		letter-spacing: 0.11px;
-	}
-	.footer-block-item {
-		color: #fff;
-		margin-top: 25px;
-		font-family: Roboto-Thin;
-	}
-}
-
-@media screen and (min-width: 992px) {
-	header {
-		height: 350px;
-	}
-	.index-main-pic {
-		margin-top: -220px;
-	}
-	.index-more-item {
-		min-height: 320px;
-	}
-}
-
-@media screen and (min-width: 1200px) {
-	header {
-		height: 482px;
-	}
-	.index-main-pic {
-		margin-top: -300px;
-	}
-	.index-more-item {
-		min-height: 270px;
-	}
-}
-
-@media screen and (max-width: 767px) {
-	header {
-		min-height: 70px;
-		background-color: #000;
-		font-family: Roboto-Thin;
-	}
-	.index-header {
-		padding: 0;
-	}
-	.logo img {
-		height: 50px;
-		margin: 10px 18px;
-	}
-	.header-title li {
-		text-align: center;
-		line-height: 35px;
-	}
-	.index-header .navbar-header {
-		border-bottom: 1px solid #555;
-	}
-	.header-title li a {
-		color: #fff;
-	}
-	.navbar-header button {
-		margin-top: 20px;
-	}
-	.navbar-toggle .icon-bar {
-		background-color: #fff;
-	}
-	.header-phone-selected {
-		background-color: #555;
-	}
-	.index-main-pic img {
-		width: 100%;
-	}
-	.index-content h2{
-		font-family: Roboto-Condensed;
-		font-size: 15.75px;
-		color: #000000;
-		letter-spacing: 0.03px;
-		font-weight: 600;
-	}
-	.index-content > div {
-		margin: 35px;
-		margin-bottom: 20px;
-		text-align: center;
-	}
-	.index-content-text {
-		font-family: Roboto-Light;
-		font-size: 10px;
-		color: #000000;
-		letter-spacing: 0;
-		line-height: 20px;
-		margin-top: 10px;
-	}
-	.index-shop-img {
-		height: 40px;
-		margin-bottom: 15px;
-	}
-	.index-shop-logo-ul {
-		margin-top: 30px;
-		margin-bottom:20px;
-	}
-	.index-more-li {
-		margin: 0 30px 30px 30px;
-	}
-	.index-faq-li {
-		margin: 0 30px 30px 30px;
-	}
-	.span-faq {
-		font-family: Roboto-Condensed;
-		font-size: 22px;
-		color: #000000;
-		letter-spacing: 0.47px;
-		vertical-align: middle;
-	}
-	.index-faq-li > img {
-		width: 22px;
-	}
-
-	footer {
-		padding: 25px;
-		background-color: #000;
-		color: #fff;
-		position: relative;
-	}
-	.footer-item1 {
-		font-family: Roboto-Light;
-		font-size: 11px;
-		letter-spacing: 0.07px;
-		line-height: 18px;
-		width: 70%;
-	}
-	.footer-item2 {
-		font-family: .PingFangSC-Regular;
-		font-size: 11px;
-		letter-spacing: 0.46px;
-		line-height: 30px;
-	}
-	.footer-div1 {
-		width: 70%;
-	}
-	.footer-div2 {
-		position: absolute !important;
-		bottom: 30px;
-		right: 30px;
-	}
-	.footer-div2 img {
-		width: 57px;
-	}
-}
-
-
-/************doc css****************/
-@media screen and (min-width: 768px) {
-	#example-navbar-collapse {
-		overflow-y: auto !important;
-	}
-	.doc-content {
-		margin-top: 80px;
-	}
-	.doc-header {
-		position: fixed;
-		top: 0;
-		height: 80px;
-		width: 100%;
-		z-index: 10;
-	}
-	.crumbs {
-		height: 55px;
-		font-family: Roboto-Light;
-		font-size: 17px;
-		color: #4A4A4A;
-		margin-top: 30px;
-		border-bottom:  1px solid #BEBCBF;;
-	}
-	.doc-title {
-		font-family: Roboto-Condensed;
-		font-size: 25px;
-		color: #333333;
-		height: 45px;
-		margin-top: 20px;
-	}
-	.toctree-l1>a{
-		font-family: Roboto-Thin;
-		font-size: 16px;
-		color: #4A4A4A;
-	}
-	.toctree-l1 {
-		margin-top: 20px;
-	}
-	.toctree-l1 > ul {
-		margin-left: 1.8em;
-	}
-	.toctree-l2 > a {
-		font-family: Roboto-Light;
-		font-size: 14px;
-		color: #4A4A4A;
-	}
-	.toctree-l2{
-		margin-top: 20px;
-		margin-bottom: 20px;
-	}
-
-	.toctree-l2 > ul {
-		margin-left: 1.8em;
-	}
-	.toctree-l3 > a {
-		font-family: Roboto-Regular;
-		font-size: 12px;
-		color: #737373;
-	}
-	.toctree-l3{
-		margin-top: 15px;
-		margin-bottom: 15px;
-	}
-	.body h1,.body h2,.body h3,.body h4,.body h5,.body  h6 {
-		margin-bottom: 20px;
-	}
-	.left-menu {
-		position: fixed;
-		width: 18%;
-	}
-	.sidebar {
-		max-height: 500px;
-		overflow-x: hidden; 
-		overflow-y: auto;
-	}
-	.to-bottom {
-		position: fixed;
-		bottom: 0;
-		width: 100%;
-	}
-}
-
-@media screen and (max-width: 767px) {
-	#thanks-these-guys-who-are-contributing .image-reference img{
-		margin: 0;
-	}
-	.doc-header {
-		background-color: #000;
-	}
-	.sidebar {
-		background-color: #000;
-	}
-	.sidebar a {
-		color: #fff;
-	}
-	.content-main {
-		padding-left: 0 !important;
-		padding-right:  0 !important; 
-	}
-	.toctree-l1>a{
-		font-family: Roboto-Thin;
-		font-size: 20px;
-		font-weight: 600;
-	}
-	.toctree-l1 {
-		margin-top: 10px;
-	}
-	.toctree-l2 > a {
-		font-family: Roboto-Bold;
-		font-size: 16px;
-	}
-	.toctree-l2{
-		margin-top: 12px;
-		margin-bottom: 12px;
-	}
-	.toctree-l3 > a {
-		font-family: Roboto-Regular;
-		font-size: 14px;
-	}
-	.toctree-l3{
-		margin-top: 10px;
-		margin-bottom: 10px;
-	}
-	.toctree-l2 ul>li:last-child {
-		margin-bottom: 25px;
-	}
-	.search-phone {
-		position: relative;
-		margin-right: 4%;
-		margin-top: 25px;
-		margin-bottom: 25px;
-	}
-	.search-phone input {
-		border: 0;
-		border-bottom: 1px solid #eee;
-		background-color: transparent;
-		font-size: 14px;
-		color: #fff;
-		width: 100%;
-	}
-	.search-phone button{
-		background-color: transparent;
-		border: 0;
-	}
-	.search-phone button {
-		position: absolute;
-		top: -3px;
-		right: 2px;
-	}
-	.sidebar {
-		padding-left: 35px !important;
-	}
-	.left-menu {
-		margin: -15px;
-		/*margin-bottom: 15px;*/
-	}
-	.doc-content {
-		padding: 15px;
-	}
-	/*.doc-content {
-		margin-top: 80px;
-		padding: 15px;
-	}
-	.doc-header {
-		position: fixed;
-		top: 0;
-		height: 70px;
-		width: 100%;
-		z-index: 10;
-	}
-	html {
-		background-color: #000;
-	}
-	body {
-		background-color: #fff;
-	}
-	.document {
-		padding-top: 20px;
-	}*/
-	.crumbs {
-		margin-top: 20px;
-	}
-}
-
-	.body h1 {
-		font-family: Roboto-Bold;
-		font-size: 22px;
-		color: #4A4A4A;
-		font-weight: 600;
-	}
-	.body h2 {
-		font-family: Roboto-Bold;
-		font-size: 18px;
-		color: #4A4A4A;
-		font-weight: 600;
-	}
-	.body img {
-		max-width: 100%;
-		margin: 15px auto;
-	}
-	.body p {
-		line-height: 25px;
-	}
-	.simple li{
-		line-height: 25px;
-		margin-bottom: 10px;
-		letter-spacing: 0.5px;
-	}
-	.simple  {
-		margin-left: 1.8em;
-	}
-	.search {
-		margin-bottom: 80px;
-	}
-	.search li {
-	    	padding: 20px 0;
-	    	border-bottom: 1px solid #ccc;
-	}
-	.highlight {
-	    	background: #EFEFEF !important;
-	    	color: #93A1A1;
-	}
-	.highlight pre {
-	    	padding: 1em;
-	}
-	.highlight .p {
-	    	color: #93A1A1;
-	}
-	.highlight span {
-	    	line-height: 24px;
-	}
diff --git a/docs/static/searchtools.js b/docs/static/searchtools.js
deleted file mode 100644
index 066857ce..00000000
--- a/docs/static/searchtools.js
+++ /dev/null
@@ -1,651 +0,0 @@
-/*
- * searchtools.js_t
- * ~~~~~~~~~~~~~~~~
- *
- * Sphinx JavaScript utilities for the full-text search.
- *
- * :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
- * :license: BSD, see LICENSE for details.
- *
- */
-
-
-/* Non-minified version JS is _stemmer.js if file is provided */ 
-/**
- * Porter Stemmer
- */
-var Stemmer = function() {
-
-  var step2list = {
-    ational: 'ate',
-    tional: 'tion',
-    enci: 'ence',
-    anci: 'ance',
-    izer: 'ize',
-    bli: 'ble',
-    alli: 'al',
-    entli: 'ent',
-    eli: 'e',
-    ousli: 'ous',
-    ization: 'ize',
-    ation: 'ate',
-    ator: 'ate',
-    alism: 'al',
-    iveness: 'ive',
-    fulness: 'ful',
-    ousness: 'ous',
-    aliti: 'al',
-    iviti: 'ive',
-    biliti: 'ble',
-    logi: 'log'
-  };
-
-  var step3list = {
-    icate: 'ic',
-    ative: '',
-    alize: 'al',
-    iciti: 'ic',
-    ical: 'ic',
-    ful: '',
-    ness: ''
-  };
-
-  var c = "[^aeiou]";          // consonant
-  var v = "[aeiouy]";          // vowel
-  var C = c + "[^aeiouy]*";    // consonant sequence
-  var V = v + "[aeiou]*";      // vowel sequence
-
-  var mgr0 = "^(" + C + ")?" + V + C;                      // [C]VC... is m>0
-  var meq1 = "^(" + C + ")?" + V + C + "(" + V + ")?$";    // [C]VC[V] is m=1
-  var mgr1 = "^(" + C + ")?" + V + C + V + C;              // [C]VCVC... is m>1
-  var s_v   = "^(" + C + ")?" + v;                         // vowel in stem
-
-  this.stemWord = function (w) {
-    var stem;
-    var suffix;
-    var firstch;
-    var origword = w;
-
-    if (w.length < 3)
-      return w;
-
-    var re;
-    var re2;
-    var re3;
-    var re4;
-
-    firstch = w.substr(0,1);
-    if (firstch == "y")
-      w = firstch.toUpperCase() + w.substr(1);
-
-    // Step 1a
-    re = /^(.+?)(ss|i)es$/;
-    re2 = /^(.+?)([^s])s$/;
-
-    if (re.test(w))
-      w = w.replace(re,"$1$2");
-    else if (re2.test(w))
-      w = w.replace(re2,"$1$2");
-
-    // Step 1b
-    re = /^(.+?)eed$/;
-    re2 = /^(.+?)(ed|ing)$/;
-    if (re.test(w)) {
-      var fp = re.exec(w);
-      re = new RegExp(mgr0);
-      if (re.test(fp[1])) {
-        re = /.$/;
-        w = w.replace(re,"");
-      }
-    }
-    else if (re2.test(w)) {
-      var fp = re2.exec(w);
-      stem = fp[1];
-      re2 = new RegExp(s_v);
-      if (re2.test(stem)) {
-        w = stem;
-        re2 = /(at|bl|iz)$/;
-        re3 = new RegExp("([^aeiouylsz])\\1$");
-        re4 = new RegExp("^" + C + v + "[^aeiouwxy]$");
-        if (re2.test(w))
-          w = w + "e";
-        else if (re3.test(w)) {
-          re = /.$/;
-          w = w.replace(re,"");
-        }
-        else if (re4.test(w))
-          w = w + "e";
-      }
-    }
-
-    // Step 1c
-    re = /^(.+?)y$/;
-    if (re.test(w)) {
-      var fp = re.exec(w);
-      stem = fp[1];
-      re = new RegExp(s_v);
-      if (re.test(stem))
-        w = stem + "i";
-    }
-
-    // Step 2
-    re = /^(.+?)(ational|tional|enci|anci|izer|bli|alli|entli|eli|ousli|ization|ation|ator|alism|iveness|fulness|ousness|aliti|iviti|biliti|logi)$/;
-    if (re.test(w)) {
-      var fp = re.exec(w);
-      stem = fp[1];
-      suffix = fp[2];
-      re = new RegExp(mgr0);
-      if (re.test(stem))
-        w = stem + step2list[suffix];
-    }
-
-    // Step 3
-    re = /^(.+?)(icate|ative|alize|iciti|ical|ful|ness)$/;
-    if (re.test(w)) {
-      var fp = re.exec(w);
-      stem = fp[1];
-      suffix = fp[2];
-      re = new RegExp(mgr0);
-      if (re.test(stem))
-        w = stem + step3list[suffix];
-    }
-
-    // Step 4
-    re = /^(.+?)(al|ance|ence|er|ic|able|ible|ant|ement|ment|ent|ou|ism|ate|iti|ous|ive|ize)$/;
-    re2 = /^(.+?)(s|t)(ion)$/;
-    if (re.test(w)) {
-      var fp = re.exec(w);
-      stem = fp[1];
-      re = new RegExp(mgr1);
-      if (re.test(stem))
-        w = stem;
-    }
-    else if (re2.test(w)) {
-      var fp = re2.exec(w);
-      stem = fp[1] + fp[2];
-      re2 = new RegExp(mgr1);
-      if (re2.test(stem))
-        w = stem;
-    }
-
-    // Step 5
-    re = /^(.+?)e$/;
-    if (re.test(w)) {
-      var fp = re.exec(w);
-      stem = fp[1];
-      re = new RegExp(mgr1);
-      re2 = new RegExp(meq1);
-      re3 = new RegExp("^" + C + v + "[^aeiouwxy]$");
-      if (re.test(stem) || (re2.test(stem) && !(re3.test(stem))))
-        w = stem;
-    }
-    re = /ll$/;
-    re2 = new RegExp(mgr1);
-    if (re.test(w) && re2.test(w)) {
-      re = /.$/;
-      w = w.replace(re,"");
-    }
-
-    // and turn initial Y back to y
-    if (firstch == "y")
-      w = firstch.toLowerCase() + w.substr(1);
-    return w;
-  }
-}
-
-
-
-/**
- * Simple result scoring code.
- */
-var Scorer = {
-  // Implement the following function to further tweak the score for each result
-  // The function takes a result array [filename, title, anchor, descr, score]
-  // and returns the new score.
-  /*
-  score: function(result) {
-    return result[4];
-  },
-  */
-
-  // query matches the full name of an object
-  objNameMatch: 11,
-  // or matches in the last dotted part of the object name
-  objPartialMatch: 6,
-  // Additive scores depending on the priority of the object
-  objPrio: {0:  15,   // used to be importantResults
-            1:  5,   // used to be objectResults
-            2: -5},  // used to be unimportantResults
-  //  Used when the priority is not in the mapping.
-  objPrioDefault: 0,
-
-  // query found in title
-  title: 15,
-  // query found in terms
-  term: 5
-};
-
-
-/**
- * Search Module
- */
-var Search = {
-
-  _index : null,
-  _queued_query : null,
-  _pulse_status : -1,
-
-  init : function() {
-      var params = $.getQueryParameters();
-      if (params.q) {
-          var query = params.q[0];
-          $('input[name="q"]')[0].value = query;
-          this.performSearch(query);
-      }
-  },
-
-  loadIndex : function(url) {
-    $.ajax({type: "GET", url: url, data: null,
-            dataType: "script", cache: true,
-            complete: function(jqxhr, textstatus) {
-              if (textstatus != "success") {
-                document.getElementById("searchindexloader").src = url;
-              }
-            }});
-  },
-
-  setIndex : function(index) {
-    var q;
-    this._index = index;
-    if ((q = this._queued_query) !== null) {
-      this._queued_query = null;
-      Search.query(q);
-    }
-  },
-
-  hasIndex : function() {
-      return this._index !== null;
-  },
-
-  deferQuery : function(query) {
-      this._queued_query = query;
-  },
-
-  stopPulse : function() {
-      this._pulse_status = 0;
-  },
-
-  startPulse : function() {
-    if (this._pulse_status >= 0)
-        return;
-    function pulse() {
-      var i;
-      Search._pulse_status = (Search._pulse_status + 1) % 4;
-      var dotString = '';
-      for (i = 0; i < Search._pulse_status; i++)
-        dotString += '.';
-      Search.dots.text(dotString);
-      if (Search._pulse_status > -1)
-        window.setTimeout(pulse, 500);
-    }
-    pulse();
-  },
-
-  /**
-   * perform a search for something (or wait until index is loaded)
-   */
-  performSearch : function(query) {
-    // create the required interface elements
-    this.out = $('#search-results');
-    this.title = $('<h2>' + _('Searching') + '</h2>').appendTo(this.out);
-    this.dots = $('<span></span>').appendTo(this.title);
-    this.status = $('<p style="display: none"></p>').appendTo(this.out);
-    this.output = $('<ul class="search"/>').appendTo(this.out);
-
-    $('#search-progress').text(_('Preparing search...'));
-    this.startPulse();
-
-    // index already loaded, the browser was quick!
-    if (this.hasIndex())
-      this.query(query);
-    else
-      this.deferQuery(query);
-  },
-
-  /**
-   * execute search (requires search index to be loaded)
-   */
-  query : function(query) {
-    var i;
-    var stopwords = ["a","and","are","as","at","be","but","by","for","if","in","into","is","it","near","no","not","of","on","or","such","that","the","their","then","there","these","they","this","to","was","will","with"];
-
-    // stem the searchterms and add them to the correct list
-    var stemmer = new Stemmer();
-    var searchterms = [];
-    var excluded = [];
-    var hlterms = [];
-    var tmp = query.split(/\s+/);
-    var objectterms = [];
-    for (i = 0; i < tmp.length; i++) {
-      if (tmp[i] !== "") {
-          objectterms.push(tmp[i].toLowerCase());
-      }
-
-      if ($u.indexOf(stopwords, tmp[i].toLowerCase()) != -1 || tmp[i].match(/^\d+$/) ||
-          tmp[i] === "") {
-        // skip this "word"
-        continue;
-      }
-      // stem the word
-      var word = stemmer.stemWord(tmp[i].toLowerCase());
-      var toAppend;
-      // select the correct list
-      if (word[0] == '-') {
-        toAppend = excluded;
-        word = word.substr(1);
-      }
-      else {
-        toAppend = searchterms;
-        hlterms.push(tmp[i].toLowerCase());
-      }
-      // only add if not already in the list
-      if (!$u.contains(toAppend, word))
-        toAppend.push(word);
-    }
-    var highlightstring = '?highlight=' + $.urlencode(hlterms.join(" "));
-
-    // console.debug('SEARCH: searching for:');
-    // console.info('required: ', searchterms);
-    // console.info('excluded: ', excluded);
-
-    // prepare search
-    var terms = this._index.terms;
-    var titleterms = this._index.titleterms;
-
-    // array of [filename, title, anchor, descr, score]
-    var results = [];
-    $('#search-progress').empty();
-
-    // lookup as object
-    for (i = 0; i < objectterms.length; i++) {
-      var others = [].concat(objectterms.slice(0, i),
-                             objectterms.slice(i+1, objectterms.length));
-      results = results.concat(this.performObjectSearch(objectterms[i], others));
-    }
-
-    // lookup as search terms in fulltext
-    results = results.concat(this.performTermsSearch(searchterms, excluded, terms, titleterms));
-
-    // let the scorer override scores with a custom scoring function
-    if (Scorer.score) {
-      for (i = 0; i < results.length; i++)
-        results[i][4] = Scorer.score(results[i]);
-    }
-
-    // now sort the results by score (in opposite order of appearance, since the
-    // display function below uses pop() to retrieve items) and then
-    // alphabetically
-    results.sort(function(a, b) {
-      var left = a[4];
-      var right = b[4];
-      if (left > right) {
-        return 1;
-      } else if (left < right) {
-        return -1;
-      } else {
-        // same score: sort alphabetically
-        left = a[1].toLowerCase();
-        right = b[1].toLowerCase();
-        return (left > right) ? -1 : ((left < right) ? 1 : 0);
-      }
-    });
-
-    // for debugging
-    //Search.lastresults = results.slice();  // a copy
-    //console.info('search results:', Search.lastresults);
-
-    // print the results
-    var resultCount = results.length;
-    function displayNextItem() {
-      // results left, load the summary and display it
-      if (results.length) {
-        var item = results.pop();
-        var listItem = $('<li style="display:none"></li>');
-        if (DOCUMENTATION_OPTIONS.FILE_SUFFIX === '') {
-          // dirhtml builder
-          var dirname = item[0] + '/';
-          if (dirname.match(/\/index\/$/)) {
-            dirname = dirname.substring(0, dirname.length-6);
-          } else if (dirname == 'index/') {
-            dirname = '';
-          }
-          listItem.append($('<a/>').attr('href',
-            DOCUMENTATION_OPTIONS.URL_ROOT + dirname +
-            highlightstring + item[2]).html(item[1]));
-        } else {
-          // normal html builders
-          listItem.append($('<a/>').attr('href',
-            item[0] + DOCUMENTATION_OPTIONS.FILE_SUFFIX +
-            highlightstring + item[2]).html(item[1]));
-        }
-        if (item[3]) {
-          listItem.append($('<span> (' + item[3] + ')</span>'));
-          Search.output.append(listItem);
-          listItem.slideDown(5, function() {
-            displayNextItem();
-          });
-        } else if (DOCUMENTATION_OPTIONS.HAS_SOURCE) {
-          $.ajax({url: DOCUMENTATION_OPTIONS.URL_ROOT + '_sources/' + item[0] + '.txt',
-                  dataType: "text",
-                  complete: function(jqxhr, textstatus) {
-                    var data = jqxhr.responseText;
-                    if (data !== '' && data !== undefined) {
-                      listItem.append(Search.makeSearchSummary(data, searchterms, hlterms));
-                    }
-                    Search.output.append(listItem);
-                    listItem.slideDown(5, function() {
-                      displayNextItem();
-                    });
-                  }});
-        } else {
-          // no source available, just display title
-          Search.output.append(listItem);
-          listItem.slideDown(5, function() {
-            displayNextItem();
-          });
-        }
-      }
-      // search finished, update title and status message
-      else {
-        Search.stopPulse();
-        Search.title.text(_('Search Results'));
-        if (!resultCount)
-          Search.status.text(_('Your search did not match any documents. Please make sure that all words are spelled correctly and that you\'ve selected enough categories.'));
-        else
-            Search.status.text(_('Search finished, found %s page(s) matching the search query.').replace('%s', resultCount));
-        Search.status.fadeIn(500);
-      }
-    }
-    displayNextItem();
-  },
-
-  /**
-   * search for object names
-   */
-  performObjectSearch : function(object, otherterms) {
-    var filenames = this._index.filenames;
-    var objects = this._index.objects;
-    var objnames = this._index.objnames;
-    var titles = this._index.titles;
-
-    var i;
-    var results = [];
-
-    for (var prefix in objects) {
-      for (var name in objects[prefix]) {
-        var fullname = (prefix ? prefix + '.' : '') + name;
-        if (fullname.toLowerCase().indexOf(object) > -1) {
-          var score = 0;
-          var parts = fullname.split('.');
-          // check for different match types: exact matches of full name or
-          // "last name" (i.e. last dotted part)
-          if (fullname == object || parts[parts.length - 1] == object) {
-            score += Scorer.objNameMatch;
-          // matches in last name
-          } else if (parts[parts.length - 1].indexOf(object) > -1) {
-            score += Scorer.objPartialMatch;
-          }
-          var match = objects[prefix][name];
-          var objname = objnames[match[1]][2];
-          var title = titles[match[0]];
-          // If more than one term searched for, we require other words to be
-          // found in the name/title/description
-          if (otherterms.length > 0) {
-            var haystack = (prefix + ' ' + name + ' ' +
-                            objname + ' ' + title).toLowerCase();
-            var allfound = true;
-            for (i = 0; i < otherterms.length; i++) {
-              if (haystack.indexOf(otherterms[i]) == -1) {
-                allfound = false;
-                break;
-              }
-            }
-            if (!allfound) {
-              continue;
-            }
-          }
-          var descr = objname + _(', in ') + title;
-
-          var anchor = match[3];
-          if (anchor === '')
-            anchor = fullname;
-          else if (anchor == '-')
-            anchor = objnames[match[1]][1] + '-' + fullname;
-          // add custom score for some objects according to scorer
-          if (Scorer.objPrio.hasOwnProperty(match[2])) {
-            score += Scorer.objPrio[match[2]];
-          } else {
-            score += Scorer.objPrioDefault;
-          }
-          results.push([filenames[match[0]], fullname, '#'+anchor, descr, score]);
-        }
-      }
-    }
-
-    return results;
-  },
-
-  /**
-   * search for full-text terms in the index
-   */
-  performTermsSearch : function(searchterms, excluded, terms, titleterms) {
-    var filenames = this._index.filenames;
-    var titles = this._index.titles;
-
-    var i, j, file;
-    var fileMap = {};
-    var scoreMap = {};
-    var results = [];
-
-    // perform the search on the required terms
-    for (i = 0; i < searchterms.length; i++) {
-      var word = searchterms[i];
-      var files = [];
-      var _o = [
-        {files: terms[word], score: Scorer.term},
-        {files: titleterms[word], score: Scorer.title}
-      ];
-
-      // no match but word was a required one
-      if ($u.every(_o, function(o){return o.files === undefined;})) {
-        break;
-      }
-      // found search word in contents
-      $u.each(_o, function(o) {
-        var _files = o.files;
-        if (_files === undefined)
-          return
-
-        if (_files.length === undefined)
-          _files = [_files];
-        files = files.concat(_files);
-
-        // set score for the word in each file to Scorer.term
-        for (j = 0; j < _files.length; j++) {
-          file = _files[j];
-          if (!(file in scoreMap))
-            scoreMap[file] = {}
-          scoreMap[file][word] = o.score;
-        }
-      });
-
-      // create the mapping
-      for (j = 0; j < files.length; j++) {
-        file = files[j];
-        if (file in fileMap)
-          fileMap[file].push(word);
-        else
-          fileMap[file] = [word];
-      }
-    }
-
-    // now check if the files don't contain excluded terms
-    for (file in fileMap) {
-      var valid = true;
-
-      // check if all requirements are matched
-      if (fileMap[file].length != searchterms.length)
-          continue;
-
-      // ensure that none of the excluded terms is in the search result
-      for (i = 0; i < excluded.length; i++) {
-        if (terms[excluded[i]] == file ||
-            titleterms[excluded[i]] == file ||
-            $u.contains(terms[excluded[i]] || [], file) ||
-            $u.contains(titleterms[excluded[i]] || [], file)) {
-          valid = false;
-          break;
-        }
-      }
-
-      // if we have still a valid result we can add it to the result list
-      if (valid) {
-        // select one (max) score for the file.
-        // for better ranking, we should calculate ranking by using words statistics like basic tf-idf...
-        var score = $u.max($u.map(fileMap[file], function(w){return scoreMap[file][w]}));
-        results.push([filenames[file], titles[file], '', null, score]);
-      }
-    }
-    return results;
-  },
-
-  /**
-   * helper function to return a node containing the
-   * search summary for a given text. keywords is a list
-   * of stemmed words, hlwords is the list of normal, unstemmed
-   * words. the first one is used to find the occurrence, the
-   * latter for highlighting it.
-   */
-  makeSearchSummary : function(text, keywords, hlwords) {
-    var textLower = text.toLowerCase();
-    var start = 0;
-    $.each(keywords, function() {
-      var i = textLower.indexOf(this.toLowerCase());
-      if (i > -1)
-        start = i;
-    });
-    start = Math.max(start - 120, 0);
-    var excerpt = ((start > 0) ? '...' : '') +
-      $.trim(text.substr(start, 240)) +
-      ((start + 240 - text.length) ? '...' : '');
-    var rv = $('<div class="context"></div>').text(excerpt);
-    $.each(hlwords, function() {
-      rv = rv.highlightText(this, 'highlighted');
-    });
-    return rv;
-  }
-};
-
-$(document).ready(function() {
-  Search.init();
-});
\ No newline at end of file
diff --git a/docs/static/sl4a.jpg b/docs/static/sl4a.jpg
deleted file mode 100644
index cf451532..00000000
Binary files a/docs/static/sl4a.jpg and /dev/null differ
diff --git a/docs/static/taskerplugin-for-qpython.png b/docs/static/taskerplugin-for-qpython.png
deleted file mode 100644
index c78414f5..00000000
Binary files a/docs/static/taskerplugin-for-qpython.png and /dev/null differ
diff --git a/docs/static/underscore-1.3.1.js b/docs/static/underscore-1.3.1.js
deleted file mode 100644
index 208d4cd8..00000000
--- a/docs/static/underscore-1.3.1.js
+++ /dev/null
@@ -1,999 +0,0 @@
-//     Underscore.js 1.3.1
-//     (c) 2009-2012 Jeremy Ashkenas, DocumentCloud Inc.
-//     Underscore is freely distributable under the MIT license.
-//     Portions of Underscore are inspired or borrowed from Prototype,
-//     Oliver Steele's Functional, and John Resig's Micro-Templating.
-//     For all details and documentation:
-//     http://documentcloud.github.com/underscore
-
-(function() {
-
-  // Baseline setup
-  // --------------
-
-  // Establish the root object, `window` in the browser, or `global` on the server.
-  var root = this;
-
-  // Save the previous value of the `_` variable.
-  var previousUnderscore = root._;
-
-  // Establish the object that gets returned to break out of a loop iteration.
-  var breaker = {};
-
-  // Save bytes in the minified (but not gzipped) version:
-  var ArrayProto = Array.prototype, ObjProto = Object.prototype, FuncProto = Function.prototype;
-
-  // Create quick reference variables for speed access to core prototypes.
-  var slice            = ArrayProto.slice,
-      unshift          = ArrayProto.unshift,
-      toString         = ObjProto.toString,
-      hasOwnProperty   = ObjProto.hasOwnProperty;
-
-  // All **ECMAScript 5** native function implementations that we hope to use
-  // are declared here.
-  var
-    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,
-    nativeBind         = FuncProto.bind;
-
-  // Create a safe reference to the Underscore object for use below.
-  var _ = function(obj) { return new wrapper(obj); };
-
-  // Export the Underscore object for **Node.js**, with
-  // backwards-compatibility for the old `require()` API. If we're in
-  // the browser, add `_` as a global object via a string identifier,
-  // for Closure Compiler "advanced" mode.
-  if (typeof exports !== 'undefined') {
-    if (typeof module !== 'undefined' && module.exports) {
-      exports = module.exports = _;
-    }
-    exports._ = _;
-  } else {
-    root['_'] = _;
-  }
-
-  // Current version.
-  _.VERSION = '1.3.1';
-
-  // Collection Functions
-  // --------------------
-
-  // The cornerstone, an `each` implementation, aka `forEach`.
-  // Handles objects with the built-in `forEach`, arrays, and raw objects.
-  // Delegates to **ECMAScript 5**'s native `forEach` if available.
-  var each = _.each = _.forEach = function(obj, iterator, context) {
-    if (obj == null) return;
-    if (nativeForEach && obj.forEach === nativeForEach) {
-      obj.forEach(iterator, context);
-    } else if (obj.length === +obj.length) {
-      for (var i = 0, l = obj.length; i < l; i++) {
-        if (i in obj && iterator.call(context, obj[i], i, obj) === breaker) return;
-      }
-    } else {
-      for (var key in obj) {
-        if (_.has(obj, key)) {
-          if (iterator.call(context, obj[key], key, obj) === breaker) return;
-        }
-      }
-    }
-  };
-
-  // Return the results of applying the iterator to each element.
-  // Delegates to **ECMAScript 5**'s native `map` if available.
-  _.map = _.collect = function(obj, iterator, context) {
-    var results = [];
-    if (obj == null) return results;
-    if (nativeMap && obj.map === nativeMap) return obj.map(iterator, context);
-    each(obj, function(value, index, list) {
-      results[results.length] = iterator.call(context, value, index, list);
-    });
-    if (obj.length === +obj.length) results.length = obj.length;
-    return results;
-  };
-
-  // **Reduce** builds up a single result from a list of values, aka `inject`,
-  // or `foldl`. Delegates to **ECMAScript 5**'s native `reduce` if available.
-  _.reduce = _.foldl = _.inject = function(obj, iterator, memo, context) {
-    var initial = arguments.length > 2;
-    if (obj == null) obj = [];
-    if (nativeReduce && obj.reduce === nativeReduce) {
-      if (context) iterator = _.bind(iterator, context);
-      return initial ? obj.reduce(iterator, memo) : obj.reduce(iterator);
-    }
-    each(obj, function(value, index, list) {
-      if (!initial) {
-        memo = value;
-        initial = true;
-      } else {
-        memo = iterator.call(context, memo, value, index, list);
-      }
-    });
-    if (!initial) throw new TypeError('Reduce of empty array with no initial value');
-    return memo;
-  };
-
-  // The right-associative version of reduce, also known as `foldr`.
-  // Delegates to **ECMAScript 5**'s native `reduceRight` if available.
-  _.reduceRight = _.foldr = function(obj, iterator, memo, context) {
-    var initial = arguments.length > 2;
-    if (obj == null) obj = [];
-    if (nativeReduceRight && obj.reduceRight === nativeReduceRight) {
-      if (context) iterator = _.bind(iterator, context);
-      return initial ? obj.reduceRight(iterator, memo) : obj.reduceRight(iterator);
-    }
-    var reversed = _.toArray(obj).reverse();
-    if (context && !initial) iterator = _.bind(iterator, context);
-    return initial ? _.reduce(reversed, iterator, memo, context) : _.reduce(reversed, iterator);
-  };
-
-  // Return the first value which passes a truth test. Aliased as `detect`.
-  _.find = _.detect = function(obj, iterator, context) {
-    var result;
-    any(obj, function(value, index, list) {
-      if (iterator.call(context, value, index, list)) {
-        result = value;
-        return true;
-      }
-    });
-    return result;
-  };
-
-  // Return all the elements that pass a truth test.
-  // Delegates to **ECMAScript 5**'s native `filter` if available.
-  // Aliased as `select`.
-  _.filter = _.select = function(obj, iterator, context) {
-    var results = [];
-    if (obj == null) return results;
-    if (nativeFilter && obj.filter === nativeFilter) return obj.filter(iterator, context);
-    each(obj, function(value, index, list) {
-      if (iterator.call(context, value, index, list)) results[results.length] = value;
-    });
-    return results;
-  };
-
-  // Return all the elements for which a truth test fails.
-  _.reject = function(obj, iterator, context) {
-    var results = [];
-    if (obj == null) return results;
-    each(obj, function(value, index, list) {
-      if (!iterator.call(context, value, index, list)) results[results.length] = value;
-    });
-    return results;
-  };
-
-  // Determine whether all of the elements match a truth test.
-  // Delegates to **ECMAScript 5**'s native `every` if available.
-  // Aliased as `all`.
-  _.every = _.all = function(obj, iterator, context) {
-    var result = true;
-    if (obj == null) return result;
-    if (nativeEvery && obj.every === nativeEvery) return obj.every(iterator, context);
-    each(obj, function(value, index, list) {
-      if (!(result = result && iterator.call(context, value, index, list))) return breaker;
-    });
-    return result;
-  };
-
-  // Determine if at least one element in the object matches a truth test.
-  // Delegates to **ECMAScript 5**'s native `some` if available.
-  // Aliased as `any`.
-  var any = _.some = _.any = function(obj, iterator, context) {
-    iterator || (iterator = _.identity);
-    var result = false;
-    if (obj == null) return result;
-    if (nativeSome && obj.some === nativeSome) return obj.some(iterator, context);
-    each(obj, function(value, index, list) {
-      if (result || (result = iterator.call(context, value, index, list))) return breaker;
-    });
-    return !!result;
-  };
-
-  // Determine if a given value is included in the array or object using `===`.
-  // Aliased as `contains`.
-  _.include = _.contains = function(obj, target) {
-    var found = false;
-    if (obj == null) return found;
-    if (nativeIndexOf && obj.indexOf === nativeIndexOf) return obj.indexOf(target) != -1;
-    found = any(obj, function(value) {
-      return value === target;
-    });
-    return found;
-  };
-
-  // Invoke a method (with arguments) on every item in a collection.
-  _.invoke = function(obj, method) {
-    var args = slice.call(arguments, 2);
-    return _.map(obj, function(value) {
-      return (_.isFunction(method) ? method || value : value[method]).apply(value, args);
-    });
-  };
-
-  // Convenience version of a common use case of `map`: fetching a property.
-  _.pluck = function(obj, key) {
-    return _.map(obj, function(value){ return value[key]; });
-  };
-
-  // Return the maximum element or (element-based computation).
-  _.max = function(obj, iterator, context) {
-    if (!iterator && _.isArray(obj)) return Math.max.apply(Math, obj);
-    if (!iterator && _.isEmpty(obj)) return -Infinity;
-    var result = {computed : -Infinity};
-    each(obj, function(value, index, list) {
-      var computed = iterator ? iterator.call(context, value, index, list) : value;
-      computed >= result.computed && (result = {value : value, computed : computed});
-    });
-    return result.value;
-  };
-
-  // Return the minimum element (or element-based computation).
-  _.min = function(obj, iterator, context) {
-    if (!iterator && _.isArray(obj)) return Math.min.apply(Math, obj);
-    if (!iterator && _.isEmpty(obj)) return Infinity;
-    var result = {computed : Infinity};
-    each(obj, function(value, index, list) {
-      var computed = iterator ? iterator.call(context, value, index, list) : value;
-      computed < result.computed && (result = {value : value, computed : computed});
-    });
-    return result.value;
-  };
-
-  // Shuffle an array.
-  _.shuffle = function(obj) {
-    var shuffled = [], rand;
-    each(obj, function(value, index, list) {
-      if (index == 0) {
-        shuffled[0] = value;
-      } else {
-        rand = Math.floor(Math.random() * (index + 1));
-        shuffled[index] = shuffled[rand];
-        shuffled[rand] = value;
-      }
-    });
-    return shuffled;
-  };
-
-  // Sort the object's values by a criterion produced by an iterator.
-  _.sortBy = function(obj, iterator, context) {
-    return _.pluck(_.map(obj, function(value, index, list) {
-      return {
-        value : value,
-        criteria : iterator.call(context, value, index, list)
-      };
-    }).sort(function(left, right) {
-      var a = left.criteria, b = right.criteria;
-      return a < b ? -1 : a > b ? 1 : 0;
-    }), 'value');
-  };
-
-  // Groups the object's values by a criterion. Pass either a string attribute
-  // to group by, or a function that returns the criterion.
-  _.groupBy = function(obj, val) {
-    var result = {};
-    var iterator = _.isFunction(val) ? val : function(obj) { return obj[val]; };
-    each(obj, function(value, index) {
-      var key = iterator(value, index);
-      (result[key] || (result[key] = [])).push(value);
-    });
-    return result;
-  };
-
-  // Use a comparator function to figure out at what index an object should
-  // be inserted so as to maintain order. Uses binary search.
-  _.sortedIndex = function(array, obj, iterator) {
-    iterator || (iterator = _.identity);
-    var low = 0, high = array.length;
-    while (low < high) {
-      var mid = (low + high) >> 1;
-      iterator(array[mid]) < iterator(obj) ? low = mid + 1 : high = mid;
-    }
-    return low;
-  };
-
-  // Safely convert anything iterable into a real, live array.
-  _.toArray = function(iterable) {
-    if (!iterable)                return [];
-    if (iterable.toArray)         return iterable.toArray();
-    if (_.isArray(iterable))      return slice.call(iterable);
-    if (_.isArguments(iterable))  return slice.call(iterable);
-    return _.values(iterable);
-  };
-
-  // Return the number of elements in an object.
-  _.size = function(obj) {
-    return _.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 = _.head = function(array, n, guard) {
-    return (n != null) && !guard ? slice.call(array, 0, n) : array[0];
-  };
-
-  // Returns everything but the last entry of the array. Especcialy useful on
-  // the arguments object. Passing **n** will return all the values in
-  // the array, excluding the last N. The **guard** check allows it to work with
-  // `_.map`.
-  _.initial = function(array, n, guard) {
-    return slice.call(array, 0, array.length - ((n == null) || guard ? 1 : n));
-  };
-
-  // Get the last element of an array. Passing **n** will return the last N
-  // values in the array. The **guard** check allows it to work with `_.map`.
-  _.last = function(array, n, guard) {
-    if ((n != null) && !guard) {
-      return slice.call(array, Math.max(array.length - n, 0));
-    } else {
-      return array[array.length - 1];
-    }
-  };
-
-  // 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 = _.tail = function(array, index, guard) {
-    return slice.call(array, (index == null) || guard ? 1 : index);
-  };
-
-  // Trim out all falsy values from an array.
-  _.compact = function(array) {
-    return _.filter(array, function(value){ return !!value; });
-  };
-
-  // Return a completely flattened version of an array.
-  _.flatten = function(array, shallow) {
-    return _.reduce(array, function(memo, value) {
-      if (_.isArray(value)) return memo.concat(shallow ? value : _.flatten(value));
-      memo[memo.length] = value;
-      return memo;
-    }, []);
-  };
-
-  // Return a version of the array that does not contain the specified value(s).
-  _.without = function(array) {
-    return _.difference(array, slice.call(arguments, 1));
-  };
-
-  // Produce a duplicate-free version of the array. If the array has already
-  // been sorted, you have the option of using a faster algorithm.
-  // Aliased as `unique`.
-  _.uniq = _.unique = function(array, isSorted, iterator) {
-    var initial = iterator ? _.map(array, iterator) : array;
-    var result = [];
-    _.reduce(initial, function(memo, el, i) {
-      if (0 == i || (isSorted === true ? _.last(memo) != el : !_.include(memo, el))) {
-        memo[memo.length] = el;
-        result[result.length] = array[i];
-      }
-      return memo;
-    }, []);
-    return result;
-  };
-
-  // Produce an array that contains the union: each distinct element from all of
-  // the passed-in arrays.
-  _.union = function() {
-    return _.uniq(_.flatten(arguments, true));
-  };
-
-  // Produce an array that contains every item shared between all the
-  // passed-in arrays. (Aliased as "intersect" for back-compat.)
-  _.intersection = _.intersect = function(array) {
-    var rest = slice.call(arguments, 1);
-    return _.filter(_.uniq(array), function(item) {
-      return _.every(rest, function(other) {
-        return _.indexOf(other, item) >= 0;
-      });
-    });
-  };
-
-  // Take the difference between one array and a number of other arrays.
-  // Only the elements present in just the first array will remain.
-  _.difference = function(array) {
-    var rest = _.flatten(slice.call(arguments, 1));
-    return _.filter(array, function(value){ return !_.include(rest, value); });
-  };
-
-  // Zip together multiple lists into a single array -- elements that share
-  // an index go together.
-  _.zip = function() {
-    var args = slice.call(arguments);
-    var length = _.max(_.pluck(args, 'length'));
-    var results = new Array(length);
-    for (var i = 0; i < length; i++) results[i] = _.pluck(args, "" + i);
-    return 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.
-  // Delegates to **ECMAScript 5**'s native `indexOf` if available.
-  // If the array is large and already in sort order, pass `true`
-  // for **isSorted** to use binary search.
-  _.indexOf = function(array, item, isSorted) {
-    if (array == null) return -1;
-    var i, l;
-    if (isSorted) {
-      i = _.sortedIndex(array, item);
-      return array[i] === item ? i : -1;
-    }
-    if (nativeIndexOf && array.indexOf === nativeIndexOf) return array.indexOf(item);
-    for (i = 0, l = array.length; i < l; i++) if (i in array && array[i] === item) return i;
-    return -1;
-  };
-
-  // Delegates to **ECMAScript 5**'s native `lastIndexOf` if available.
-  _.lastIndexOf = function(array, item) {
-    if (array == null) return -1;
-    if (nativeLastIndexOf && array.lastIndexOf === nativeLastIndexOf) return array.lastIndexOf(item);
-    var i = array.length;
-    while (i--) if (i in array && array[i] === item) return i;
-    return -1;
-  };
-
-  // Generate an integer Array containing an arithmetic progression. A port of
-  // the native Python `range()` function. See
-  // [the Python documentation](http://docs.python.org/library/functions.html#range).
-  _.range = function(start, stop, step) {
-    if (arguments.length <= 1) {
-      stop = start || 0;
-      start = 0;
-    }
-    step = arguments[2] || 1;
-
-    var len = Math.max(Math.ceil((stop - start) / step), 0);
-    var idx = 0;
-    var range = new Array(len);
-
-    while(idx < len) {
-      range[idx++] = start;
-      start += step;
-    }
-
-    return range;
-  };
-
-  // Function (ahem) Functions
-  // ------------------
-
-  // Reusable constructor function for prototype setting.
-  var ctor = function(){};
-
-  // Create a function bound to a given object (assigning `this`, and arguments,
-  // optionally). Binding with arguments is also known as `curry`.
-  // Delegates to **ECMAScript 5**'s native `Function.bind` if available.
-  // We check for `func.bind` first, to fail fast when `func` is undefined.
-  _.bind = function bind(func, context) {
-    var bound, args;
-    if (func.bind === nativeBind && nativeBind) return nativeBind.apply(func, slice.call(arguments, 1));
-    if (!_.isFunction(func)) throw new TypeError;
-    args = slice.call(arguments, 2);
-    return bound = function() {
-      if (!(this instanceof bound)) return func.apply(context, args.concat(slice.call(arguments)));
-      ctor.prototype = func.prototype;
-      var self = new ctor;
-      var result = func.apply(self, args.concat(slice.call(arguments)));
-      if (Object(result) === result) return result;
-      return self;
-    };
-  };
-
-  // Bind all of an object's methods to that object. Useful for ensuring that
-  // all callbacks defined on an object belong to it.
-  _.bindAll = function(obj) {
-    var funcs = slice.call(arguments, 1);
-    if (funcs.length == 0) funcs = _.functions(obj);
-    each(funcs, function(f) { obj[f] = _.bind(obj[f], obj); });
-    return obj;
-  };
-
-  // Memoize an expensive function by storing its results.
-  _.memoize = function(func, hasher) {
-    var memo = {};
-    hasher || (hasher = _.identity);
-    return function() {
-      var key = hasher.apply(this, arguments);
-      return _.has(memo, key) ? memo[key] : (memo[key] = func.apply(this, arguments));
-    };
-  };
-
-  // Delays a function for the given number of milliseconds, and then calls
-  // it with the arguments supplied.
-  _.delay = function(func, wait) {
-    var args = slice.call(arguments, 2);
-    return setTimeout(function(){ return func.apply(func, args); }, wait);
-  };
-
-  // Defers a function, scheduling it to run after the current call stack has
-  // cleared.
-  _.defer = function(func) {
-    return _.delay.apply(_, [func, 1].concat(slice.call(arguments, 1)));
-  };
-
-  // Returns a function, that, when invoked, will only be triggered at most once
-  // during a given window of time.
-  _.throttle = function(func, wait) {
-    var context, args, timeout, throttling, more;
-    var whenDone = _.debounce(function(){ more = throttling = false; }, wait);
-    return function() {
-      context = this; args = arguments;
-      var later = function() {
-        timeout = null;
-        if (more) func.apply(context, args);
-        whenDone();
-      };
-      if (!timeout) timeout = setTimeout(later, wait);
-      if (throttling) {
-        more = true;
-      } else {
-        func.apply(context, args);
-      }
-      whenDone();
-      throttling = true;
-    };
-  };
-
-  // Returns a function, that, as long as it continues to be invoked, will not
-  // be triggered. The function will be called after it stops being called for
-  // N milliseconds.
-  _.debounce = function(func, wait) {
-    var timeout;
-    return function() {
-      var context = this, args = arguments;
-      var later = function() {
-        timeout = null;
-        func.apply(context, args);
-      };
-      clearTimeout(timeout);
-      timeout = setTimeout(later, wait);
-    };
-  };
-
-  // Returns a function that will be executed at most one time, no matter how
-  // often you call it. Useful for lazy initialization.
-  _.once = function(func) {
-    var ran = false, memo;
-    return function() {
-      if (ran) return memo;
-      ran = true;
-      return memo = func.apply(this, 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 = function(func, wrapper) {
-    return function() {
-      var args = [func].concat(slice.call(arguments, 0));
-      return wrapper.apply(this, args);
-    };
-  };
-
-  // Returns a function that is the composition of a list of functions, each
-  // consuming the return value of the function that follows.
-  _.compose = function() {
-    var funcs = arguments;
-    return function() {
-      var args = arguments;
-      for (var i = funcs.length - 1; i >= 0; i--) {
-        args = [funcs[i].apply(this, args)];
-      }
-      return args[0];
-    };
-  };
-
-  // Returns a function that will only be executed after being called N times.
-  _.after = function(times, func) {
-    if (times <= 0) return func();
-    return function() {
-      if (--times < 1) { return func.apply(this, arguments); }
-    };
-  };
-
-  // Object Functions
-  // ----------------
-
-  // Retrieve the names of an object's properties.
-  // Delegates to **ECMAScript 5**'s native `Object.keys`
-  _.keys = nativeKeys || function(obj) {
-    if (obj !== Object(obj)) throw new TypeError('Invalid object');
-    var keys = [];
-    for (var key in obj) if (_.has(obj, key)) keys[keys.length] = key;
-    return keys;
-  };
-
-  // Retrieve the values of an object's properties.
-  _.values = function(obj) {
-    return _.map(obj, _.identity);
-  };
-
-  // Return a sorted list of the function names available on the object.
-  // Aliased as `methods`
-  _.functions = _.methods = function(obj) {
-    var names = [];
-    for (var key in obj) {
-      if (_.isFunction(obj[key])) names.push(key);
-    }
-    return names.sort();
-  };
-
-  // Extend a given object with all the properties in passed-in object(s).
-  _.extend = function(obj) {
-    each(slice.call(arguments, 1), function(source) {
-      for (var prop in source) {
-        obj[prop] = source[prop];
-      }
-    });
-    return obj;
-  };
-
-  // Fill in a given object with default properties.
-  _.defaults = function(obj) {
-    each(slice.call(arguments, 1), function(source) {
-      for (var prop in source) {
-        if (obj[prop] == null) obj[prop] = source[prop];
-      }
-    });
-    return obj;
-  };
-
-  // Create a (shallow-cloned) duplicate of an object.
-  _.clone = function(obj) {
-    if (!_.isObject(obj)) return obj;
-    return _.isArray(obj) ? obj.slice() : _.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 = function(obj, interceptor) {
-    interceptor(obj);
-    return obj;
-  };
-
-  // Internal recursive comparison function.
-  function eq(a, b, stack) {
-    // Identical objects are equal. `0 === -0`, but they aren't identical.
-    // See the Harmony `egal` proposal: http://wiki.ecmascript.org/doku.php?id=harmony:egal.
-    if (a === b) return a !== 0 || 1 / a == 1 / b;
-    // A strict comparison is necessary because `null == undefined`.
-    if (a == null || b == null) return a === b;
-    // Unwrap any wrapped objects.
-    if (a._chain) a = a._wrapped;
-    if (b._chain) b = b._wrapped;
-    // Invoke a custom `isEqual` method if one is provided.
-    if (a.isEqual && _.isFunction(a.isEqual)) return a.isEqual(b);
-    if (b.isEqual && _.isFunction(b.isEqual)) return b.isEqual(a);
-    // Compare `[[Class]]` names.
-    var className = toString.call(a);
-    if (className != toString.call(b)) return false;
-    switch (className) {
-      // Strings, numbers, dates, and booleans are compared by value.
-      case '[object String]':
-        // Primitives and their corresponding object wrappers are equivalent; thus, `"5"` is
-        // equivalent to `new String("5")`.
-        return a == String(b);
-      case '[object Number]':
-        // `NaN`s are equivalent, but non-reflexive. An `egal` comparison is performed for
-        // other numeric values.
-        return a != +a ? b != +b : (a == 0 ? 1 / a == 1 / b : a == +b);
-      case '[object Date]':
-      case '[object Boolean]':
-        // Coerce dates and booleans to numeric primitive values. Dates are compared by their
-        // millisecond representations. Note that invalid dates with millisecond representations
-        // of `NaN` are not equivalent.
-        return +a == +b;
-      // RegExps are compared by their source patterns and flags.
-      case '[object RegExp]':
-        return a.source == b.source &&
-               a.global == b.global &&
-               a.multiline == b.multiline &&
-               a.ignoreCase == b.ignoreCase;
-    }
-    if (typeof a != 'object' || typeof b != 'object') return false;
-    // Assume equality for cyclic structures. The algorithm for detecting cyclic
-    // structures is adapted from ES 5.1 section 15.12.3, abstract operation `JO`.
-    var length = stack.length;
-    while (length--) {
-      // Linear search. Performance is inversely proportional to the number of
-      // unique nested structures.
-      if (stack[length] == a) return true;
-    }
-    // Add the first object to the stack of traversed objects.
-    stack.push(a);
-    var size = 0, result = true;
-    // Recursively compare objects and arrays.
-    if (className == '[object Array]') {
-      // Compare array lengths to determine if a deep comparison is necessary.
-      size = a.length;
-      result = size == b.length;
-      if (result) {
-        // Deep compare the contents, ignoring non-numeric properties.
-        while (size--) {
-          // Ensure commutative equality for sparse arrays.
-          if (!(result = size in a == size in b && eq(a[size], b[size], stack))) break;
-        }
-      }
-    } else {
-      // Objects with different constructors are not equivalent.
-      if ('constructor' in a != 'constructor' in b || a.constructor != b.constructor) return false;
-      // Deep compare objects.
-      for (var key in a) {
-        if (_.has(a, key)) {
-          // Count the expected number of properties.
-          size++;
-          // Deep compare each member.
-          if (!(result = _.has(b, key) && eq(a[key], b[key], stack))) break;
-        }
-      }
-      // Ensure that both objects contain the same number of properties.
-      if (result) {
-        for (key in b) {
-          if (_.has(b, key) && !(size--)) break;
-        }
-        result = !size;
-      }
-    }
-    // Remove the first object from the stack of traversed objects.
-    stack.pop();
-    return result;
-  }
-
-  // Perform a deep comparison to check if two objects are equal.
-  _.isEqual = function(a, b) {
-    return eq(a, b, []);
-  };
-
-  // Is a given array, string, or object empty?
-  // An "empty" object has no enumerable own-properties.
-  _.isEmpty = function(obj) {
-    if (_.isArray(obj) || _.isString(obj)) return obj.length === 0;
-    for (var key in obj) if (_.has(obj, key)) return false;
-    return true;
-  };
-
-  // Is a given value a DOM element?
-  _.isElement = function(obj) {
-    return !!(obj && obj.nodeType == 1);
-  };
-
-  // Is a given value an array?
-  // Delegates to ECMA5's native Array.isArray
-  _.isArray = nativeIsArray || function(obj) {
-    return toString.call(obj) == '[object Array]';
-  };
-
-  // Is a given variable an object?
-  _.isObject = function(obj) {
-    return obj === Object(obj);
-  };
-
-  // Is a given variable an arguments object?
-  _.isArguments = function(obj) {
-    return toString.call(obj) == '[object Arguments]';
-  };
-  if (!_.isArguments(arguments)) {
-    _.isArguments = function(obj) {
-      return !!(obj && _.has(obj, 'callee'));
-    };
-  }
-
-  // Is a given value a function?
-  _.isFunction = function(obj) {
-    return toString.call(obj) == '[object Function]';
-  };
-
-  // Is a given value a string?
-  _.isString = function(obj) {
-    return toString.call(obj) == '[object String]';
-  };
-
-  // Is a given value a number?
-  _.isNumber = function(obj) {
-    return toString.call(obj) == '[object Number]';
-  };
-
-  // Is the given value `NaN`?
-  _.isNaN = function(obj) {
-    // `NaN` is the only value for which `===` is not reflexive.
-    return obj !== obj;
-  };
-
-  // Is a given value a boolean?
-  _.isBoolean = function(obj) {
-    return obj === true || obj === false || toString.call(obj) == '[object Boolean]';
-  };
-
-  // Is a given value a date?
-  _.isDate = function(obj) {
-    return toString.call(obj) == '[object Date]';
-  };
-
-  // Is the given value a regular expression?
-  _.isRegExp = function(obj) {
-    return toString.call(obj) == '[object RegExp]';
-  };
-
-  // Is a given value equal to null?
-  _.isNull = function(obj) {
-    return obj === null;
-  };
-
-  // Is a given variable undefined?
-  _.isUndefined = function(obj) {
-    return obj === void 0;
-  };
-
-  // Has own property?
-  _.has = function(obj, key) {
-    return hasOwnProperty.call(obj, key);
-  };
-
-  // Utility Functions
-  // -----------------
-
-  // Run Underscore.js in *noConflict* mode, returning the `_` variable to its
-  // previous owner. Returns a reference to the Underscore object.
-  _.noConflict = function() {
-    root._ = previousUnderscore;
-    return this;
-  };
-
-  // Keep the identity function around for default iterators.
-  _.identity = function(value) {
-    return value;
-  };
-
-  // Run a function **n** times.
-  _.times = function (n, iterator, context) {
-    for (var i = 0; i < n; i++) iterator.call(context, i);
-  };
-
-  // Escape a string for HTML interpolation.
-  _.escape = function(string) {
-    return (''+string).replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;').replace(/'/g, '&#x27;').replace(/\//g,'&#x2F;');
-  };
-
-  // Add your own custom functions to the Underscore object, ensuring that
-  // they're correctly added to the OOP wrapper as well.
-  _.mixin = function(obj) {
-    each(_.functions(obj), function(name){
-      addToWrapper(name, _[name] = obj[name]);
-    });
-  };
-
-  // Generate a unique integer id (unique within the entire client session).
-  // Useful for temporary DOM ids.
-  var idCounter = 0;
-  _.uniqueId = function(prefix) {
-    var id = idCounter++;
-    return prefix ? prefix + id : id;
-  };
-
-  // By default, Underscore uses ERB-style template delimiters, change the
-  // following template settings to use alternative delimiters.
-  _.templateSettings = {
-    evaluate    : /<%([\s\S]+?)%>/g,
-    interpolate : /<%=([\s\S]+?)%>/g,
-    escape      : /<%-([\s\S]+?)%>/g
-  };
-
-  // When customizing `templateSettings`, if you don't want to define an
-  // interpolation, evaluation or escaping regex, we need one that is
-  // guaranteed not to match.
-  var noMatch = /.^/;
-
-  // Within an interpolation, evaluation, or escaping, remove HTML escaping
-  // that had been previously added.
-  var unescape = function(code) {
-    return code.replace(/\\\\/g, '\\').replace(/\\'/g, "'");
-  };
-
-  // JavaScript micro-templating, similar to John Resig's implementation.
-  // Underscore templating handles arbitrary delimiters, preserves whitespace,
-  // and correctly escapes quotes within interpolated code.
-  _.template = function(str, data) {
-    var c  = _.templateSettings;
-    var tmpl = 'var __p=[],print=function(){__p.push.apply(__p,arguments);};' +
-      'with(obj||{}){__p.push(\'' +
-      str.replace(/\\/g, '\\\\')
-         .replace(/'/g, "\\'")
-         .replace(c.escape || noMatch, function(match, code) {
-           return "',_.escape(" + unescape(code) + "),'";
-         })
-         .replace(c.interpolate || noMatch, function(match, code) {
-           return "'," + unescape(code) + ",'";
-         })
-         .replace(c.evaluate || noMatch, function(match, code) {
-           return "');" + unescape(code).replace(/[\r\n\t]/g, ' ') + ";__p.push('";
-         })
-         .replace(/\r/g, '\\r')
-         .replace(/\n/g, '\\n')
-         .replace(/\t/g, '\\t')
-         + "');}return __p.join('');";
-    var func = new Function('obj', '_', tmpl);
-    if (data) return func(data, _);
-    return function(data) {
-      return func.call(this, data, _);
-    };
-  };
-
-  // Add a "chain" function, which will delegate to the wrapper.
-  _.chain = function(obj) {
-    return _(obj).chain();
-  };
-
-  // 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.
-  var wrapper = function(obj) { this._wrapped = obj; };
-
-  // Expose `wrapper.prototype` as `_.prototype`
-  _.prototype = wrapper.prototype;
-
-  // Helper function to continue chaining intermediate results.
-  var result = function(obj, chain) {
-    return chain ? _(obj).chain() : obj;
-  };
-
-  // A method to easily add functions to the OOP wrapper.
-  var addToWrapper = function(name, func) {
-    wrapper.prototype[name] = function() {
-      var args = slice.call(arguments);
-      unshift.call(args, this._wrapped);
-      return result(func.apply(_, args), this._chain);
-    };
-  };
-
-  // Add all of the Underscore functions to the wrapper object.
-  _.mixin(_);
-
-  // Add all mutator Array functions to the wrapper.
-  each(['pop', 'push', 'reverse', 'shift', 'sort', 'splice', 'unshift'], function(name) {
-    var method = ArrayProto[name];
-    wrapper.prototype[name] = function() {
-      var wrapped = this._wrapped;
-      method.apply(wrapped, arguments);
-      var length = wrapped.length;
-      if ((name == 'shift' || name == 'splice') && length === 0) delete wrapped[0];
-      return result(wrapped, this._chain);
-    };
-  });
-
-  // Add all accessor Array functions to the wrapper.
-  each(['concat', 'join', 'slice'], function(name) {
-    var method = ArrayProto[name];
-    wrapper.prototype[name] = function() {
-      return result(method.apply(this._wrapped, arguments), this._chain);
-    };
-  });
-
-  // Start chaining a wrapped Underscore object.
-  wrapper.prototype.chain = function() {
-    this._chain = true;
-    return this;
-  };
-
-  // Extracts the result from a wrapped and chained object.
-  wrapper.prototype.value = function() {
-    return this._wrapped;
-  };
-
-}).call(this);
diff --git a/docs/static/underscore.js b/docs/static/underscore.js
deleted file mode 100644
index 5b55f32b..00000000
--- a/docs/static/underscore.js
+++ /dev/null
@@ -1,31 +0,0 @@
-// Underscore.js 1.3.1
-// (c) 2009-2012 Jeremy Ashkenas, DocumentCloud Inc.
-// Underscore is freely distributable under the MIT license.
-// Portions of Underscore are inspired or borrowed from Prototype,
-// Oliver Steele's Functional, and John Resig's Micro-Templating.
-// For all details and documentation:
-// http://documentcloud.github.com/underscore
-(function(){function q(a,c,d){if(a===c)return a!==0||1/a==1/c;if(a==null||c==null)return a===c;if(a._chain)a=a._wrapped;if(c._chain)c=c._wrapped;if(a.isEqual&&b.isFunction(a.isEqual))return a.isEqual(c);if(c.isEqual&&b.isFunction(c.isEqual))return c.isEqual(a);var e=l.call(a);if(e!=l.call(c))return false;switch(e){case "[object String]":return a==String(c);case "[object Number]":return a!=+a?c!=+c:a==0?1/a==1/c:a==+c;case "[object Date]":case "[object Boolean]":return+a==+c;case "[object RegExp]":return a.source==
-c.source&&a.global==c.global&&a.multiline==c.multiline&&a.ignoreCase==c.ignoreCase}if(typeof a!="object"||typeof c!="object")return false;for(var f=d.length;f--;)if(d[f]==a)return true;d.push(a);var f=0,g=true;if(e=="[object Array]"){if(f=a.length,g=f==c.length)for(;f--;)if(!(g=f in a==f in c&&q(a[f],c[f],d)))break}else{if("constructor"in a!="constructor"in c||a.constructor!=c.constructor)return false;for(var h in a)if(b.has(a,h)&&(f++,!(g=b.has(c,h)&&q(a[h],c[h],d))))break;if(g){for(h in c)if(b.has(c,
-h)&&!f--)break;g=!f}}d.pop();return g}var r=this,G=r._,n={},k=Array.prototype,o=Object.prototype,i=k.slice,H=k.unshift,l=o.toString,I=o.hasOwnProperty,w=k.forEach,x=k.map,y=k.reduce,z=k.reduceRight,A=k.filter,B=k.every,C=k.some,p=k.indexOf,D=k.lastIndexOf,o=Array.isArray,J=Object.keys,s=Function.prototype.bind,b=function(a){return new m(a)};if(typeof exports!=="undefined"){if(typeof module!=="undefined"&&module.exports)exports=module.exports=b;exports._=b}else r._=b;b.VERSION="1.3.1";var j=b.each=
-b.forEach=function(a,c,d){if(a!=null)if(w&&a.forEach===w)a.forEach(c,d);else if(a.length===+a.length)for(var e=0,f=a.length;e<f;e++){if(e in a&&c.call(d,a[e],e,a)===n)break}else for(e in a)if(b.has(a,e)&&c.call(d,a[e],e,a)===n)break};b.map=b.collect=function(a,c,b){var e=[];if(a==null)return e;if(x&&a.map===x)return a.map(c,b);j(a,function(a,g,h){e[e.length]=c.call(b,a,g,h)});if(a.length===+a.length)e.length=a.length;return e};b.reduce=b.foldl=b.inject=function(a,c,d,e){var f=arguments.length>2;a==
-null&&(a=[]);if(y&&a.reduce===y)return e&&(c=b.bind(c,e)),f?a.reduce(c,d):a.reduce(c);j(a,function(a,b,i){f?d=c.call(e,d,a,b,i):(d=a,f=true)});if(!f)throw new TypeError("Reduce of empty array with no initial value");return d};b.reduceRight=b.foldr=function(a,c,d,e){var f=arguments.length>2;a==null&&(a=[]);if(z&&a.reduceRight===z)return e&&(c=b.bind(c,e)),f?a.reduceRight(c,d):a.reduceRight(c);var g=b.toArray(a).reverse();e&&!f&&(c=b.bind(c,e));return f?b.reduce(g,c,d,e):b.reduce(g,c)};b.find=b.detect=
-function(a,c,b){var e;E(a,function(a,g,h){if(c.call(b,a,g,h))return e=a,true});return e};b.filter=b.select=function(a,c,b){var e=[];if(a==null)return e;if(A&&a.filter===A)return a.filter(c,b);j(a,function(a,g,h){c.call(b,a,g,h)&&(e[e.length]=a)});return e};b.reject=function(a,c,b){var e=[];if(a==null)return e;j(a,function(a,g,h){c.call(b,a,g,h)||(e[e.length]=a)});return e};b.every=b.all=function(a,c,b){var e=true;if(a==null)return e;if(B&&a.every===B)return a.every(c,b);j(a,function(a,g,h){if(!(e=
-e&&c.call(b,a,g,h)))return n});return e};var E=b.some=b.any=function(a,c,d){c||(c=b.identity);var e=false;if(a==null)return e;if(C&&a.some===C)return a.some(c,d);j(a,function(a,b,h){if(e||(e=c.call(d,a,b,h)))return n});return!!e};b.include=b.contains=function(a,c){var b=false;if(a==null)return b;return p&&a.indexOf===p?a.indexOf(c)!=-1:b=E(a,function(a){return a===c})};b.invoke=function(a,c){var d=i.call(arguments,2);return b.map(a,function(a){return(b.isFunction(c)?c||a:a[c]).apply(a,d)})};b.pluck=
-function(a,c){return b.map(a,function(a){return a[c]})};b.max=function(a,c,d){if(!c&&b.isArray(a))return Math.max.apply(Math,a);if(!c&&b.isEmpty(a))return-Infinity;var e={computed:-Infinity};j(a,function(a,b,h){b=c?c.call(d,a,b,h):a;b>=e.computed&&(e={value:a,computed:b})});return e.value};b.min=function(a,c,d){if(!c&&b.isArray(a))return Math.min.apply(Math,a);if(!c&&b.isEmpty(a))return Infinity;var e={computed:Infinity};j(a,function(a,b,h){b=c?c.call(d,a,b,h):a;b<e.computed&&(e={value:a,computed:b})});
-return e.value};b.shuffle=function(a){var b=[],d;j(a,function(a,f){f==0?b[0]=a:(d=Math.floor(Math.random()*(f+1)),b[f]=b[d],b[d]=a)});return b};b.sortBy=function(a,c,d){return b.pluck(b.map(a,function(a,b,g){return{value:a,criteria:c.call(d,a,b,g)}}).sort(function(a,b){var c=a.criteria,d=b.criteria;return c<d?-1:c>d?1:0}),"value")};b.groupBy=function(a,c){var d={},e=b.isFunction(c)?c:function(a){return a[c]};j(a,function(a,b){var c=e(a,b);(d[c]||(d[c]=[])).push(a)});return d};b.sortedIndex=function(a,
-c,d){d||(d=b.identity);for(var e=0,f=a.length;e<f;){var g=e+f>>1;d(a[g])<d(c)?e=g+1:f=g}return e};b.toArray=function(a){return!a?[]:a.toArray?a.toArray():b.isArray(a)?i.call(a):b.isArguments(a)?i.call(a):b.values(a)};b.size=function(a){return b.toArray(a).length};b.first=b.head=function(a,b,d){return b!=null&&!d?i.call(a,0,b):a[0]};b.initial=function(a,b,d){return i.call(a,0,a.length-(b==null||d?1:b))};b.last=function(a,b,d){return b!=null&&!d?i.call(a,Math.max(a.length-b,0)):a[a.length-1]};b.rest=
-b.tail=function(a,b,d){return i.call(a,b==null||d?1:b)};b.compact=function(a){return b.filter(a,function(a){return!!a})};b.flatten=function(a,c){return b.reduce(a,function(a,e){if(b.isArray(e))return a.concat(c?e:b.flatten(e));a[a.length]=e;return a},[])};b.without=function(a){return b.difference(a,i.call(arguments,1))};b.uniq=b.unique=function(a,c,d){var d=d?b.map(a,d):a,e=[];b.reduce(d,function(d,g,h){if(0==h||(c===true?b.last(d)!=g:!b.include(d,g)))d[d.length]=g,e[e.length]=a[h];return d},[]);
-return e};b.union=function(){return b.uniq(b.flatten(arguments,true))};b.intersection=b.intersect=function(a){var c=i.call(arguments,1);return b.filter(b.uniq(a),function(a){return b.every(c,function(c){return b.indexOf(c,a)>=0})})};b.difference=function(a){var c=b.flatten(i.call(arguments,1));return b.filter(a,function(a){return!b.include(c,a)})};b.zip=function(){for(var a=i.call(arguments),c=b.max(b.pluck(a,"length")),d=Array(c),e=0;e<c;e++)d[e]=b.pluck(a,""+e);return d};b.indexOf=function(a,c,
-d){if(a==null)return-1;var e;if(d)return d=b.sortedIndex(a,c),a[d]===c?d:-1;if(p&&a.indexOf===p)return a.indexOf(c);for(d=0,e=a.length;d<e;d++)if(d in a&&a[d]===c)return d;return-1};b.lastIndexOf=function(a,b){if(a==null)return-1;if(D&&a.lastIndexOf===D)return a.lastIndexOf(b);for(var d=a.length;d--;)if(d in a&&a[d]===b)return d;return-1};b.range=function(a,b,d){arguments.length<=1&&(b=a||0,a=0);for(var d=arguments[2]||1,e=Math.max(Math.ceil((b-a)/d),0),f=0,g=Array(e);f<e;)g[f++]=a,a+=d;return g};
-var F=function(){};b.bind=function(a,c){var d,e;if(a.bind===s&&s)return s.apply(a,i.call(arguments,1));if(!b.isFunction(a))throw new TypeError;e=i.call(arguments,2);return d=function(){if(!(this instanceof d))return a.apply(c,e.concat(i.call(arguments)));F.prototype=a.prototype;var b=new F,g=a.apply(b,e.concat(i.call(arguments)));return Object(g)===g?g:b}};b.bindAll=function(a){var c=i.call(arguments,1);c.length==0&&(c=b.functions(a));j(c,function(c){a[c]=b.bind(a[c],a)});return a};b.memoize=function(a,
-c){var d={};c||(c=b.identity);return function(){var e=c.apply(this,arguments);return b.has(d,e)?d[e]:d[e]=a.apply(this,arguments)}};b.delay=function(a,b){var d=i.call(arguments,2);return setTimeout(function(){return a.apply(a,d)},b)};b.defer=function(a){return b.delay.apply(b,[a,1].concat(i.call(arguments,1)))};b.throttle=function(a,c){var d,e,f,g,h,i=b.debounce(function(){h=g=false},c);return function(){d=this;e=arguments;var b;f||(f=setTimeout(function(){f=null;h&&a.apply(d,e);i()},c));g?h=true:
-a.apply(d,e);i();g=true}};b.debounce=function(a,b){var d;return function(){var e=this,f=arguments;clearTimeout(d);d=setTimeout(function(){d=null;a.apply(e,f)},b)}};b.once=function(a){var b=false,d;return function(){if(b)return d;b=true;return d=a.apply(this,arguments)}};b.wrap=function(a,b){return function(){var d=[a].concat(i.call(arguments,0));return b.apply(this,d)}};b.compose=function(){var a=arguments;return function(){for(var b=arguments,d=a.length-1;d>=0;d--)b=[a[d].apply(this,b)];return b[0]}};
-b.after=function(a,b){return a<=0?b():function(){if(--a<1)return b.apply(this,arguments)}};b.keys=J||function(a){if(a!==Object(a))throw new TypeError("Invalid object");var c=[],d;for(d in a)b.has(a,d)&&(c[c.length]=d);return c};b.values=function(a){return b.map(a,b.identity)};b.functions=b.methods=function(a){var c=[],d;for(d in a)b.isFunction(a[d])&&c.push(d);return c.sort()};b.extend=function(a){j(i.call(arguments,1),function(b){for(var d in b)a[d]=b[d]});return a};b.defaults=function(a){j(i.call(arguments,
-1),function(b){for(var d in b)a[d]==null&&(a[d]=b[d])});return a};b.clone=function(a){return!b.isObject(a)?a:b.isArray(a)?a.slice():b.extend({},a)};b.tap=function(a,b){b(a);return a};b.isEqual=function(a,b){return q(a,b,[])};b.isEmpty=function(a){if(b.isArray(a)||b.isString(a))return a.length===0;for(var c in a)if(b.has(a,c))return false;return true};b.isElement=function(a){return!!(a&&a.nodeType==1)};b.isArray=o||function(a){return l.call(a)=="[object Array]"};b.isObject=function(a){return a===Object(a)};
-b.isArguments=function(a){return l.call(a)=="[object Arguments]"};if(!b.isArguments(arguments))b.isArguments=function(a){return!(!a||!b.has(a,"callee"))};b.isFunction=function(a){return l.call(a)=="[object Function]"};b.isString=function(a){return l.call(a)=="[object String]"};b.isNumber=function(a){return l.call(a)=="[object Number]"};b.isNaN=function(a){return a!==a};b.isBoolean=function(a){return a===true||a===false||l.call(a)=="[object Boolean]"};b.isDate=function(a){return l.call(a)=="[object Date]"};
-b.isRegExp=function(a){return l.call(a)=="[object RegExp]"};b.isNull=function(a){return a===null};b.isUndefined=function(a){return a===void 0};b.has=function(a,b){return I.call(a,b)};b.noConflict=function(){r._=G;return this};b.identity=function(a){return a};b.times=function(a,b,d){for(var e=0;e<a;e++)b.call(d,e)};b.escape=function(a){return(""+a).replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/"/g,"&quot;").replace(/'/g,"&#x27;").replace(/\//g,"&#x2F;")};b.mixin=function(a){j(b.functions(a),
-function(c){K(c,b[c]=a[c])})};var L=0;b.uniqueId=function(a){var b=L++;return a?a+b:b};b.templateSettings={evaluate:/<%([\s\S]+?)%>/g,interpolate:/<%=([\s\S]+?)%>/g,escape:/<%-([\s\S]+?)%>/g};var t=/.^/,u=function(a){return a.replace(/\\\\/g,"\\").replace(/\\'/g,"'")};b.template=function(a,c){var d=b.templateSettings,d="var __p=[],print=function(){__p.push.apply(__p,arguments);};with(obj||{}){__p.push('"+a.replace(/\\/g,"\\\\").replace(/'/g,"\\'").replace(d.escape||t,function(a,b){return"',_.escape("+
-u(b)+"),'"}).replace(d.interpolate||t,function(a,b){return"',"+u(b)+",'"}).replace(d.evaluate||t,function(a,b){return"');"+u(b).replace(/[\r\n\t]/g," ")+";__p.push('"}).replace(/\r/g,"\\r").replace(/\n/g,"\\n").replace(/\t/g,"\\t")+"');}return __p.join('');",e=new Function("obj","_",d);return c?e(c,b):function(a){return e.call(this,a,b)}};b.chain=function(a){return b(a).chain()};var m=function(a){this._wrapped=a};b.prototype=m.prototype;var v=function(a,c){return c?b(a).chain():a},K=function(a,c){m.prototype[a]=
-function(){var a=i.call(arguments);H.call(a,this._wrapped);return v(c.apply(b,a),this._chain)}};b.mixin(b);j("pop,push,reverse,shift,sort,splice,unshift".split(","),function(a){var b=k[a];m.prototype[a]=function(){var d=this._wrapped;b.apply(d,arguments);var e=d.length;(a=="shift"||a=="splice")&&e===0&&delete d[0];return v(d,this._chain)}});j(["concat","join","slice"],function(a){var b=k[a];m.prototype[a]=function(){return v(b.apply(this._wrapped,arguments),this._chain)}});m.prototype.chain=function(){this._chain=
-true;return this};m.prototype.value=function(){return this._wrapped}}).call(this);
diff --git a/docs/static/up-pressed.png b/docs/static/up-pressed.png
deleted file mode 100644
index 99e72109..00000000
Binary files a/docs/static/up-pressed.png and /dev/null differ
diff --git a/docs/static/up.png b/docs/static/up.png
deleted file mode 100644
index 26de002e..00000000
Binary files a/docs/static/up.png and /dev/null differ
diff --git a/docs/static/websupport.js b/docs/static/websupport.js
deleted file mode 100644
index 98e7f40b..00000000
--- a/docs/static/websupport.js
+++ /dev/null
@@ -1,808 +0,0 @@
-/*
- * websupport.js
- * ~~~~~~~~~~~~~
- *
- * sphinx.websupport utilities for all documentation.
- *
- * :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
- * :license: BSD, see LICENSE for details.
- *
- */
-
-(function($) {
-  $.fn.autogrow = function() {
-    return this.each(function() {
-    var textarea = this;
-
-    $.fn.autogrow.resize(textarea);
-
-    $(textarea)
-      .focus(function() {
-        textarea.interval = setInterval(function() {
-          $.fn.autogrow.resize(textarea);
-        }, 500);
-      })
-      .blur(function() {
-        clearInterval(textarea.interval);
-      });
-    });
-  };
-
-  $.fn.autogrow.resize = function(textarea) {
-    var lineHeight = parseInt($(textarea).css('line-height'), 10);
-    var lines = textarea.value.split('\n');
-    var columns = textarea.cols;
-    var lineCount = 0;
-    $.each(lines, function() {
-      lineCount += Math.ceil(this.length / columns) || 1;
-    });
-    var height = lineHeight * (lineCount + 1);
-    $(textarea).css('height', height);
-  };
-})(jQuery);
-
-(function($) {
-  var comp, by;
-
-  function init() {
-    initEvents();
-    initComparator();
-  }
-
-  function initEvents() {
-    $(document).on("click", 'a.comment-close', function(event) {
-      event.preventDefault();
-      hide($(this).attr('id').substring(2));
-    });
-    $(document).on("click", 'a.vote', function(event) {
-      event.preventDefault();
-      handleVote($(this));
-    });
-    $(document).on("click", 'a.reply', function(event) {
-      event.preventDefault();
-      openReply($(this).attr('id').substring(2));
-    });
-    $(document).on("click", 'a.close-reply', function(event) {
-      event.preventDefault();
-      closeReply($(this).attr('id').substring(2));
-    });
-    $(document).on("click", 'a.sort-option', function(event) {
-      event.preventDefault();
-      handleReSort($(this));
-    });
-    $(document).on("click", 'a.show-proposal', function(event) {
-      event.preventDefault();
-      showProposal($(this).attr('id').substring(2));
-    });
-    $(document).on("click", 'a.hide-proposal', function(event) {
-      event.preventDefault();
-      hideProposal($(this).attr('id').substring(2));
-    });
-    $(document).on("click", 'a.show-propose-change', function(event) {
-      event.preventDefault();
-      showProposeChange($(this).attr('id').substring(2));
-    });
-    $(document).on("click", 'a.hide-propose-change', function(event) {
-      event.preventDefault();
-      hideProposeChange($(this).attr('id').substring(2));
-    });
-    $(document).on("click", 'a.accept-comment', function(event) {
-      event.preventDefault();
-      acceptComment($(this).attr('id').substring(2));
-    });
-    $(document).on("click", 'a.delete-comment', function(event) {
-      event.preventDefault();
-      deleteComment($(this).attr('id').substring(2));
-    });
-    $(document).on("click", 'a.comment-markup', function(event) {
-      event.preventDefault();
-      toggleCommentMarkupBox($(this).attr('id').substring(2));
-    });
-  }
-
-  /**
-   * Set comp, which is a comparator function used for sorting and
-   * inserting comments into the list.
-   */
-  function setComparator() {
-    // If the first three letters are "asc", sort in ascending order
-    // and remove the prefix.
-    if (by.substring(0,3) == 'asc') {
-      var i = by.substring(3);
-      comp = function(a, b) { return a[i] - b[i]; };
-    } else {
-      // Otherwise sort in descending order.
-      comp = function(a, b) { return b[by] - a[by]; };
-    }
-
-    // Reset link styles and format the selected sort option.
-    $('a.sel').attr('href', '#').removeClass('sel');
-    $('a.by' + by).removeAttr('href').addClass('sel');
-  }
-
-  /**
-   * Create a comp function. If the user has preferences stored in
-   * the sortBy cookie, use those, otherwise use the default.
-   */
-  function initComparator() {
-    by = 'rating'; // Default to sort by rating.
-    // If the sortBy cookie is set, use that instead.
-    if (document.cookie.length > 0) {
-      var start = document.cookie.indexOf('sortBy=');
-      if (start != -1) {
-        start = start + 7;
-        var end = document.cookie.indexOf(";", start);
-        if (end == -1) {
-          end = document.cookie.length;
-          by = unescape(document.cookie.substring(start, end));
-        }
-      }
-    }
-    setComparator();
-  }
-
-  /**
-   * Show a comment div.
-   */
-  function show(id) {
-    $('#ao' + id).hide();
-    $('#ah' + id).show();
-    var context = $.extend({id: id}, opts);
-    var popup = $(renderTemplate(popupTemplate, context)).hide();
-    popup.find('textarea[name="proposal"]').hide();
-    popup.find('a.by' + by).addClass('sel');
-    var form = popup.find('#cf' + id);
-    form.submit(function(event) {
-      event.preventDefault();
-      addComment(form);
-    });
-    $('#s' + id).after(popup);
-    popup.slideDown('fast', function() {
-      getComments(id);
-    });
-  }
-
-  /**
-   * Hide a comment div.
-   */
-  function hide(id) {
-    $('#ah' + id).hide();
-    $('#ao' + id).show();
-    var div = $('#sc' + id);
-    div.slideUp('fast', function() {
-      div.remove();
-    });
-  }
-
-  /**
-   * Perform an ajax request to get comments for a node
-   * and insert the comments into the comments tree.
-   */
-  function getComments(id) {
-    $.ajax({
-     type: 'GET',
-     url: opts.getCommentsURL,
-     data: {node: id},
-     success: function(data, textStatus, request) {
-       var ul = $('#cl' + id);
-       var speed = 100;
-       $('#cf' + id)
-         .find('textarea[name="proposal"]')
-         .data('source', data.source);
-
-       if (data.comments.length === 0) {
-         ul.html('<li>No comments yet.</li>');
-         ul.data('empty', true);
-       } else {
-         // If there are comments, sort them and put them in the list.
-         var comments = sortComments(data.comments);
-         speed = data.comments.length * 100;
-         appendComments(comments, ul);
-         ul.data('empty', false);
-       }
-       $('#cn' + id).slideUp(speed + 200);
-       ul.slideDown(speed);
-     },
-     error: function(request, textStatus, error) {
-       showError('Oops, there was a problem retrieving the comments.');
-     },
-     dataType: 'json'
-    });
-  }
-
-  /**
-   * Add a comment via ajax and insert the comment into the comment tree.
-   */
-  function addComment(form) {
-    var node_id = form.find('input[name="node"]').val();
-    var parent_id = form.find('input[name="parent"]').val();
-    var text = form.find('textarea[name="comment"]').val();
-    var proposal = form.find('textarea[name="proposal"]').val();
-
-    if (text == '') {
-      showError('Please enter a comment.');
-      return;
-    }
-
-    // Disable the form that is being submitted.
-    form.find('textarea,input').attr('disabled', 'disabled');
-
-    // Send the comment to the server.
-    $.ajax({
-      type: "POST",
-      url: opts.addCommentURL,
-      dataType: 'json',
-      data: {
-        node: node_id,
-        parent: parent_id,
-        text: text,
-        proposal: proposal
-      },
-      success: function(data, textStatus, error) {
-        // Reset the form.
-        if (node_id) {
-          hideProposeChange(node_id);
-        }
-        form.find('textarea')
-          .val('')
-          .add(form.find('input'))
-          .removeAttr('disabled');
-	var ul = $('#cl' + (node_id || parent_id));
-        if (ul.data('empty')) {
-          $(ul).empty();
-          ul.data('empty', false);
-        }
-        insertComment(data.comment);
-        var ao = $('#ao' + node_id);
-        ao.find('img').attr({'src': opts.commentBrightImage});
-        if (node_id) {
-          // if this was a "root" comment, remove the commenting box
-          // (the user can get it back by reopening the comment popup)
-          $('#ca' + node_id).slideUp();
-        }
-      },
-      error: function(request, textStatus, error) {
-        form.find('textarea,input').removeAttr('disabled');
-        showError('Oops, there was a problem adding the comment.');
-      }
-    });
-  }
-
-  /**
-   * Recursively append comments to the main comment list and children
-   * lists, creating the comment tree.
-   */
-  function appendComments(comments, ul) {
-    $.each(comments, function() {
-      var div = createCommentDiv(this);
-      ul.append($(document.createElement('li')).html(div));
-      appendComments(this.children, div.find('ul.comment-children'));
-      // To avoid stagnating data, don't store the comments children in data.
-      this.children = null;
-      div.data('comment', this);
-    });
-  }
-
-  /**
-   * After adding a new comment, it must be inserted in the correct
-   * location in the comment tree.
-   */
-  function insertComment(comment) {
-    var div = createCommentDiv(comment);
-
-    // To avoid stagnating data, don't store the comments children in data.
-    comment.children = null;
-    div.data('comment', comment);
-
-    var ul = $('#cl' + (comment.node || comment.parent));
-    var siblings = getChildren(ul);
-
-    var li = $(document.createElement('li'));
-    li.hide();
-
-    // Determine where in the parents children list to insert this comment.
-    for(i=0; i < siblings.length; i++) {
-      if (comp(comment, siblings[i]) <= 0) {
-        $('#cd' + siblings[i].id)
-          .parent()
-          .before(li.html(div));
-        li.slideDown('fast');
-        return;
-      }
-    }
-
-    // If we get here, this comment rates lower than all the others,
-    // or it is the only comment in the list.
-    ul.append(li.html(div));
-    li.slideDown('fast');
-  }
-
-  function acceptComment(id) {
-    $.ajax({
-      type: 'POST',
-      url: opts.acceptCommentURL,
-      data: {id: id},
-      success: function(data, textStatus, request) {
-        $('#cm' + id).fadeOut('fast');
-        $('#cd' + id).removeClass('moderate');
-      },
-      error: function(request, textStatus, error) {
-        showError('Oops, there was a problem accepting the comment.');
-      }
-    });
-  }
-
-  function deleteComment(id) {
-    $.ajax({
-      type: 'POST',
-      url: opts.deleteCommentURL,
-      data: {id: id},
-      success: function(data, textStatus, request) {
-        var div = $('#cd' + id);
-        if (data == 'delete') {
-          // Moderator mode: remove the comment and all children immediately
-          div.slideUp('fast', function() {
-            div.remove();
-          });
-          return;
-        }
-        // User mode: only mark the comment as deleted
-        div
-          .find('span.user-id:first')
-          .text('[deleted]').end()
-          .find('div.comment-text:first')
-          .text('[deleted]').end()
-          .find('#cm' + id + ', #dc' + id + ', #ac' + id + ', #rc' + id +
-                ', #sp' + id + ', #hp' + id + ', #cr' + id + ', #rl' + id)
-          .remove();
-        var comment = div.data('comment');
-        comment.username = '[deleted]';
-        comment.text = '[deleted]';
-        div.data('comment', comment);
-      },
-      error: function(request, textStatus, error) {
-        showError('Oops, there was a problem deleting the comment.');
-      }
-    });
-  }
-
-  function showProposal(id) {
-    $('#sp' + id).hide();
-    $('#hp' + id).show();
-    $('#pr' + id).slideDown('fast');
-  }
-
-  function hideProposal(id) {
-    $('#hp' + id).hide();
-    $('#sp' + id).show();
-    $('#pr' + id).slideUp('fast');
-  }
-
-  function showProposeChange(id) {
-    $('#pc' + id).hide();
-    $('#hc' + id).show();
-    var textarea = $('#pt' + id);
-    textarea.val(textarea.data('source'));
-    $.fn.autogrow.resize(textarea[0]);
-    textarea.slideDown('fast');
-  }
-
-  function hideProposeChange(id) {
-    $('#hc' + id).hide();
-    $('#pc' + id).show();
-    var textarea = $('#pt' + id);
-    textarea.val('').removeAttr('disabled');
-    textarea.slideUp('fast');
-  }
-
-  function toggleCommentMarkupBox(id) {
-    $('#mb' + id).toggle();
-  }
-
-  /** Handle when the user clicks on a sort by link. */
-  function handleReSort(link) {
-    var classes = link.attr('class').split(/\s+/);
-    for (var i=0; i<classes.length; i++) {
-      if (classes[i] != 'sort-option') {
-	by = classes[i].substring(2);
-      }
-    }
-    setComparator();
-    // Save/update the sortBy cookie.
-    var expiration = new Date();
-    expiration.setDate(expiration.getDate() + 365);
-    document.cookie= 'sortBy=' + escape(by) +
-                     ';expires=' + expiration.toUTCString();
-    $('ul.comment-ul').each(function(index, ul) {
-      var comments = getChildren($(ul), true);
-      comments = sortComments(comments);
-      appendComments(comments, $(ul).empty());
-    });
-  }
-
-  /**
-   * Function to process a vote when a user clicks an arrow.
-   */
-  function handleVote(link) {
-    if (!opts.voting) {
-      showError("You'll need to login to vote.");
-      return;
-    }
-
-    var id = link.attr('id');
-    if (!id) {
-      // Didn't click on one of the voting arrows.
-      return;
-    }
-    // If it is an unvote, the new vote value is 0,
-    // Otherwise it's 1 for an upvote, or -1 for a downvote.
-    var value = 0;
-    if (id.charAt(1) != 'u') {
-      value = id.charAt(0) == 'u' ? 1 : -1;
-    }
-    // The data to be sent to the server.
-    var d = {
-      comment_id: id.substring(2),
-      value: value
-    };
-
-    // Swap the vote and unvote links.
-    link.hide();
-    $('#' + id.charAt(0) + (id.charAt(1) == 'u' ? 'v' : 'u') + d.comment_id)
-      .show();
-
-    // The div the comment is displayed in.
-    var div = $('div#cd' + d.comment_id);
-    var data = div.data('comment');
-
-    // If this is not an unvote, and the other vote arrow has
-    // already been pressed, unpress it.
-    if ((d.value !== 0) && (data.vote === d.value * -1)) {
-      $('#' + (d.value == 1 ? 'd' : 'u') + 'u' + d.comment_id).hide();
-      $('#' + (d.value == 1 ? 'd' : 'u') + 'v' + d.comment_id).show();
-    }
-
-    // Update the comments rating in the local data.
-    data.rating += (data.vote === 0) ? d.value : (d.value - data.vote);
-    data.vote = d.value;
-    div.data('comment', data);
-
-    // Change the rating text.
-    div.find('.rating:first')
-      .text(data.rating + ' point' + (data.rating == 1 ? '' : 's'));
-
-    // Send the vote information to the server.
-    $.ajax({
-      type: "POST",
-      url: opts.processVoteURL,
-      data: d,
-      error: function(request, textStatus, error) {
-        showError('Oops, there was a problem casting that vote.');
-      }
-    });
-  }
-
-  /**
-   * Open a reply form used to reply to an existing comment.
-   */
-  function openReply(id) {
-    // Swap out the reply link for the hide link
-    $('#rl' + id).hide();
-    $('#cr' + id).show();
-
-    // Add the reply li to the children ul.
-    var div = $(renderTemplate(replyTemplate, {id: id})).hide();
-    $('#cl' + id)
-      .prepend(div)
-      // Setup the submit handler for the reply form.
-      .find('#rf' + id)
-      .submit(function(event) {
-        event.preventDefault();
-        addComment($('#rf' + id));
-        closeReply(id);
-      })
-      .find('input[type=button]')
-      .click(function() {
-        closeReply(id);
-      });
-    div.slideDown('fast', function() {
-      $('#rf' + id).find('textarea').focus();
-    });
-  }
-
-  /**
-   * Close the reply form opened with openReply.
-   */
-  function closeReply(id) {
-    // Remove the reply div from the DOM.
-    $('#rd' + id).slideUp('fast', function() {
-      $(this).remove();
-    });
-
-    // Swap out the hide link for the reply link
-    $('#cr' + id).hide();
-    $('#rl' + id).show();
-  }
-
-  /**
-   * Recursively sort a tree of comments using the comp comparator.
-   */
-  function sortComments(comments) {
-    comments.sort(comp);
-    $.each(comments, function() {
-      this.children = sortComments(this.children);
-    });
-    return comments;
-  }
-
-  /**
-   * Get the children comments from a ul. If recursive is true,
-   * recursively include childrens' children.
-   */
-  function getChildren(ul, recursive) {
-    var children = [];
-    ul.children().children("[id^='cd']")
-      .each(function() {
-        var comment = $(this).data('comment');
-        if (recursive)
-          comment.children = getChildren($(this).find('#cl' + comment.id), true);
-        children.push(comment);
-      });
-    return children;
-  }
-
-  /** Create a div to display a comment in. */
-  function createCommentDiv(comment) {
-    if (!comment.displayed && !opts.moderator) {
-      return $('<div class="moderate">Thank you!  Your comment will show up '
-               + 'once it is has been approved by a moderator.</div>');
-    }
-    // Prettify the comment rating.
-    comment.pretty_rating = comment.rating + ' point' +
-      (comment.rating == 1 ? '' : 's');
-    // Make a class (for displaying not yet moderated comments differently)
-    comment.css_class = comment.displayed ? '' : ' moderate';
-    // Create a div for this comment.
-    var context = $.extend({}, opts, comment);
-    var div = $(renderTemplate(commentTemplate, context));
-
-    // If the user has voted on this comment, highlight the correct arrow.
-    if (comment.vote) {
-      var direction = (comment.vote == 1) ? 'u' : 'd';
-      div.find('#' + direction + 'v' + comment.id).hide();
-      div.find('#' + direction + 'u' + comment.id).show();
-    }
-
-    if (opts.moderator || comment.text != '[deleted]') {
-      div.find('a.reply').show();
-      if (comment.proposal_diff)
-        div.find('#sp' + comment.id).show();
-      if (opts.moderator && !comment.displayed)
-        div.find('#cm' + comment.id).show();
-      if (opts.moderator || (opts.username == comment.username))
-        div.find('#dc' + comment.id).show();
-    }
-    return div;
-  }
-
-  /**
-   * A simple template renderer. Placeholders such as <%id%> are replaced
-   * by context['id'] with items being escaped. Placeholders such as <#id#>
-   * are not escaped.
-   */
-  function renderTemplate(template, context) {
-    var esc = $(document.createElement('div'));
-
-    function handle(ph, escape) {
-      var cur = context;
-      $.each(ph.split('.'), function() {
-        cur = cur[this];
-      });
-      return escape ? esc.text(cur || "").html() : cur;
-    }
-
-    return template.replace(/<([%#])([\w\.]*)\1>/g, function() {
-      return handle(arguments[2], arguments[1] == '%' ? true : false);
-    });
-  }
-
-  /** Flash an error message briefly. */
-  function showError(message) {
-    $(document.createElement('div')).attr({'class': 'popup-error'})
-      .append($(document.createElement('div'))
-               .attr({'class': 'error-message'}).text(message))
-      .appendTo('body')
-      .fadeIn("slow")
-      .delay(2000)
-      .fadeOut("slow");
-  }
-
-  /** Add a link the user uses to open the comments popup. */
-  $.fn.comment = function() {
-    return this.each(function() {
-      var id = $(this).attr('id').substring(1);
-      var count = COMMENT_METADATA[id];
-      var title = count + ' comment' + (count == 1 ? '' : 's');
-      var image = count > 0 ? opts.commentBrightImage : opts.commentImage;
-      var addcls = count == 0 ? ' nocomment' : '';
-      $(this)
-        .append(
-          $(document.createElement('a')).attr({
-            href: '#',
-            'class': 'sphinx-comment-open' + addcls,
-            id: 'ao' + id
-          })
-            .append($(document.createElement('img')).attr({
-              src: image,
-              alt: 'comment',
-              title: title
-            }))
-            .click(function(event) {
-              event.preventDefault();
-              show($(this).attr('id').substring(2));
-            })
-        )
-        .append(
-          $(document.createElement('a')).attr({
-            href: '#',
-            'class': 'sphinx-comment-close hidden',
-            id: 'ah' + id
-          })
-            .append($(document.createElement('img')).attr({
-              src: opts.closeCommentImage,
-              alt: 'close',
-              title: 'close'
-            }))
-            .click(function(event) {
-              event.preventDefault();
-              hide($(this).attr('id').substring(2));
-            })
-        );
-    });
-  };
-
-  var opts = {
-    processVoteURL: '/_process_vote',
-    addCommentURL: '/_add_comment',
-    getCommentsURL: '/_get_comments',
-    acceptCommentURL: '/_accept_comment',
-    deleteCommentURL: '/_delete_comment',
-    commentImage: '/static/_static/comment.png',
-    closeCommentImage: '/static/_static/comment-close.png',
-    loadingImage: '/static/_static/ajax-loader.gif',
-    commentBrightImage: '/static/_static/comment-bright.png',
-    upArrow: '/static/_static/up.png',
-    downArrow: '/static/_static/down.png',
-    upArrowPressed: '/static/_static/up-pressed.png',
-    downArrowPressed: '/static/_static/down-pressed.png',
-    voting: false,
-    moderator: false
-  };
-
-  if (typeof COMMENT_OPTIONS != "undefined") {
-    opts = jQuery.extend(opts, COMMENT_OPTIONS);
-  }
-
-  var popupTemplate = '\
-    <div class="sphinx-comments" id="sc<%id%>">\
-      <p class="sort-options">\
-        Sort by:\
-        <a href="#" class="sort-option byrating">best rated</a>\
-        <a href="#" class="sort-option byascage">newest</a>\
-        <a href="#" class="sort-option byage">oldest</a>\
-      </p>\
-      <div class="comment-header">Comments</div>\
-      <div class="comment-loading" id="cn<%id%>">\
-        loading comments... <img src="<%loadingImage%>" alt="" /></div>\
-      <ul id="cl<%id%>" class="comment-ul"></ul>\
-      <div id="ca<%id%>">\
-      <p class="add-a-comment">Add a comment\
-        (<a href="#" class="comment-markup" id="ab<%id%>">markup</a>):</p>\
-      <div class="comment-markup-box" id="mb<%id%>">\
-        reStructured text markup: <i>*emph*</i>, <b>**strong**</b>, \
-        <code>``code``</code>, \
-        code blocks: <code>::</code> and an indented block after blank line</div>\
-      <form method="post" id="cf<%id%>" class="comment-form" action="">\
-        <textarea name="comment" cols="80"></textarea>\
-        <p class="propose-button">\
-          <a href="#" id="pc<%id%>" class="show-propose-change">\
-            Propose a change &#9657;\
-          </a>\
-          <a href="#" id="hc<%id%>" class="hide-propose-change">\
-            Propose a change &#9663;\
-          </a>\
-        </p>\
-        <textarea name="proposal" id="pt<%id%>" cols="80"\
-                  spellcheck="false"></textarea>\
-        <input type="submit" value="Add comment" />\
-        <input type="hidden" name="node" value="<%id%>" />\
-        <input type="hidden" name="parent" value="" />\
-      </form>\
-      </div>\
-    </div>';
-
-  var commentTemplate = '\
-    <div id="cd<%id%>" class="sphinx-comment<%css_class%>">\
-      <div class="vote">\
-        <div class="arrow">\
-          <a href="#" id="uv<%id%>" class="vote" title="vote up">\
-            <img src="<%upArrow%>" />\
-          </a>\
-          <a href="#" id="uu<%id%>" class="un vote" title="vote up">\
-            <img src="<%upArrowPressed%>" />\
-          </a>\
-        </div>\
-        <div class="arrow">\
-          <a href="#" id="dv<%id%>" class="vote" title="vote down">\
-            <img src="<%downArrow%>" id="da<%id%>" />\
-          </a>\
-          <a href="#" id="du<%id%>" class="un vote" title="vote down">\
-            <img src="<%downArrowPressed%>" />\
-          </a>\
-        </div>\
-      </div>\
-      <div class="comment-content">\
-        <p class="tagline comment">\
-          <span class="user-id"><%username%></span>\
-          <span class="rating"><%pretty_rating%></span>\
-          <span class="delta"><%time.delta%></span>\
-        </p>\
-        <div class="comment-text comment"><#text#></div>\
-        <p class="comment-opts comment">\
-          <a href="#" class="reply hidden" id="rl<%id%>">reply &#9657;</a>\
-          <a href="#" class="close-reply" id="cr<%id%>">reply &#9663;</a>\
-          <a href="#" id="sp<%id%>" class="show-proposal">proposal &#9657;</a>\
-          <a href="#" id="hp<%id%>" class="hide-proposal">proposal &#9663;</a>\
-          <a href="#" id="dc<%id%>" class="delete-comment hidden">delete</a>\
-          <span id="cm<%id%>" class="moderation hidden">\
-            <a href="#" id="ac<%id%>" class="accept-comment">accept</a>\
-          </span>\
-        </p>\
-        <pre class="proposal" id="pr<%id%>">\
-<#proposal_diff#>\
-        </pre>\
-          <ul class="comment-children" id="cl<%id%>"></ul>\
-        </div>\
-        <div class="clearleft"></div>\
-      </div>\
-    </div>';
-
-  var replyTemplate = '\
-    <li>\
-      <div class="reply-div" id="rd<%id%>">\
-        <form id="rf<%id%>">\
-          <textarea name="comment" cols="80"></textarea>\
-          <input type="submit" value="Add reply" />\
-          <input type="button" value="Cancel" />\
-          <input type="hidden" name="parent" value="<%id%>" />\
-          <input type="hidden" name="node" value="" />\
-        </form>\
-      </div>\
-    </li>';
-
-  $(document).ready(function() {
-    init();
-  });
-})(jQuery);
-
-$(document).ready(function() {
-  // add comment anchors for all paragraphs that are commentable
-  $('.sphinx-has-comment').comment();
-
-  // highlight search words in search results
-  $("div.context").each(function() {
-    var params = $.getQueryParameters();
-    var terms = (params.q) ? params.q[0].split(/\s+/) : [];
-    var result = $(this);
-    $.each(terms, function() {
-      result.highlightText(this.toLowerCase(), 'highlighted');
-    });
-  });
-
-  // directly open comment window if requested
-  var anchor = document.location.hash;
-  if (anchor.substring(0, 9) == '#comment-') {
-    $('#ao' + anchor.substring(9)).click();
-    document.location.hash = '#s' + anchor.substring(9);
-  }
-});
diff --git a/docs/zh/contributorshowto.html b/docs/zh/contributorshowto.html
deleted file mode 100644
index 3d9d378c..00000000
--- a/docs/zh/contributorshowto.html
+++ /dev/null
@@ -1,182 +0,0 @@
-<!DOCTYPE html>
-<html>
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>QPython文档体系说明 &mdash; QPython 0.9 documentation</title>
-<link rel="stylesheet" href="../static/qpython_theme.css" type="text/css" />
-<link rel="stylesheet" href="../static/pygments.css" type="text/css" />
-<script type="text/javascript">
-var DOCUMENTATION_OPTIONS = {
-URL_ROOT:    '../',
-VERSION:     '0.9',
-COLLAPSE_INDEX: false,
-FILE_SUFFIX: '.html',
-HAS_SOURCE:  true
-};
-</script>
-<script type="text/javascript" src="../static/jquery.js"></script>
-<script type="text/javascript" src="../static/underscore.js"></script>
-<script type="text/javascript" src="../static/doctools.js"></script>
-<link rel="top" title="QPython 0.9 documentation" href="../document.html" />
-<link rel="up" title="快速开始" href="howtostart.html" />
-<link rel="prev" title="快速开始" href="howtostart.html" />
-<meta charset="UTF-8">
-<link href="http://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet">
-<script src="http://cdn.bootcss.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
-<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
-</head>
-<body role="document">
-<div class="header doc-header">
-<div class="col-lg-offset-2 col-lg-8 col-md-offset-2 col-md-8 col-sm-offset-2 col-sm-8  index-header">
-<div class="navbar-header">
-<button type="button" class="navbar-toggle" data-toggle="collapse"
-data-target="#example-navbar-collapse">
-<span class="sr-only">切换导航</span>
-<span class="icon-bar"></span>
-<span class="icon-bar"></span>
-<span class="icon-bar"></span>
-</button>
-<a href="/index.html" class="logo"><img src="../static/img_logo.png"></a>
-</div>
-<ul class="header-title hidden-xs">
-<li class="header-phone-selected">
-<a href="/index.html">Home</a>
-</li>
-<li>
-<a href="/document.html" class="header-selected">Guide</a>
-<span class="header-title-selected"></span>
-</li>
-<li>
-<a target="_blank" href="https://github.com/qpython-android/qpython">Github</a>
-</li>
-</ul>
-<div class="search-box hidden-xs">
-<form action="../search.html">
-<input type="search" name="q" placeholder="keyword">
-<input type="hidden" name="check_keywords" value="yes" />
-<input type="hidden" name="area" value="default" />
-<button><img src="../static/ic_search.png"></button>
-</form>
-</div>
-</div>
-</div>
-<div class="row doc-content">
-<div class="content-main col-sm-offset-2 col-sm-8">
-<div class="content-wrapper col-sm-4">
-<div class="left-menu">
-<div class="doc-title hidden-xs">QPthon</div>
-<div class="sidebar  collapse navbar-collapse"  id="example-navbar-collapse">
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../en/guide.html">Getting started</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../en/guide.html#programming-guide">Programming Guide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../en/guide.html#developers-guide">Developers&#8217; Guide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../en/guide.html#contributors-guide">Contributors&#8217; Guide</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../en/faq.html">FAQ</a></li>
-</ul>
-<ul class="current">
-<li class="toctree-l1 current"><a class="reference internal" href="../zhindex.html">中文用户向导</a><ul class="current">
-<li class="toctree-l2"><a class="reference internal" href="../zhindex.html#id2">欢迎 ！</a></li>
-<li class="toctree-l2 current"><a class="reference internal" href="../zhindex.html#qpython">QPython 起步</a><ul class="current">
-<li class="toctree-l3"><a class="reference internal" href="howtostart.html">快速开始</a></li>
-<li class="toctree-l3"><a class="reference internal" href="howtostart.html#id4">编程指南</a></li>
-<li class="toctree-l3"><a class="reference internal" href="howtostart.html#id5">QPython黑客指南</a></li>
-<li class="toctree-l3 current"><a class="reference internal" href="howtostart.html#id8">贡献者指南</a></li>
-</ul>
-</li>
-<li class="toctree-l2"><a class="reference internal" href="../zhindex.html#id3">更多链接</a></li>
-<li class="toctree-l2"><a class="reference internal" href="../zhindex.html#id9">QPython 用户开发组</a></li>
-<li class="toctree-l2"><a class="reference internal" href="../zhindex.html#id11">如何贡献</a></li>
-</ul>
-</li>
-</ul>
-<div class="search-phone visible-xs">
-<form action="../search.html">
-<input type="search" name="q" placeholder="keyword">
-<input type="hidden" name="check_keywords" value="yes" />
-<input type="hidden" name="area" value="default" />
-<button><img src="../static/ic_search.png"></button>
-</form>
-</div>
-</div>
-</div>
-</div>
-<div class="content col-sm-8">
-<div class="document">
-<ul class="crumbs">
-<li><a href="../document.html">Guide</a> &raquo;</li>
-<li><a href="../zhindex.html">中文用户向导</a> &raquo;</li>
-<li><a href="howtostart.html">快速开始</a> &raquo;</li>
-<li>QPython文档体系说明</li>
-</ul>
-<div class="documentwrapper">
-<div class="bodywrapper">
-<div class="body" role="main">
-<div class="section" id="qpython">
-<h1>QPython文档体系说明<a class="headerlink" href="#qpython" title="Permalink to this headline">¶</a></h1>
-<p>QPython 文档体系分为 英文／中文 两部分，我们努力保持两种语言对应内容的准确和同步，其中内容其中又分为</p>
-<ul class="simple">
-<li>快速开始 （使用上的帮助）</li>
-<li>编程指南 （主要是用QPython来进行编程和开发的指南）</li>
-<li>QPython黑客指南 （深入折腾的指导）</li>
-<li>贡献者指南 （QPython贡献者指南，分为在QPython team内的，和以外的）</li>
-</ul>
-</div>
-<div class="section" id="id1">
-<h1>如何提交文档<a class="headerlink" href="#id1" title="Permalink to this headline">¶</a></h1>
-<p>文档非常重要，我们用sphinx来组织文档，并且文档会通过github page功能直接推到qpython.org网站中
-在想要贡献QPython文档之前仔细阅读我们的指南</p>
-<ul class="simple">
-<li>git clone <a class="reference external" href="http://github.com/qpython-android/qpython">http://github.com/qpython-android/qpython</a></li>
-<li>进入到 项目的qpython-docs目录中</li>
-<li>按照sphinx规则编辑source中的文件即可</li>
-<li>最后cd到qpython-docs中并运行build.sh</li>
-<li>打开浏览器打开本地文件检查，</li>
-<li>如果检查无问题则可以提交，然后浏览qpython.org即可看到最新的更新</li>
-</ul>
-</div>
-<div class="section" id="id2">
-<h1>如何提交翻译<a class="headerlink" href="#id2" title="Permalink to this headline">¶</a></h1>
-<p>QPython是一个支持多语言的应用，你可以通过以下方式来提交对应国家的翻译</p>
-</div>
-</div>
-</div>
-</div>
-</div>
-<div class="fb-comments" data-href="http://qpython.org" data-numposts="10"></div>
-</div>
-</div>
-<div class="col-sm-2"></div>
-</div>
-<footer id="footer">
-<div class="col-sm-offset-2 col-sm-6 footer-div1">
-<div class="footer-block-item">
-<span class="footer-item1">Built with Sphinx using a theme provid by QPython.</span>
-<span class="footer-item2 visible-xs">
-&#169; Copyright 2017, QPython.
-</span>
-</div>
-</div>
-<div class="col-sm-2 footer-div2">
-<a href="/index.html" class="pull-right"><img src="../static/img_logo.png"></a>
-</div>
-</footer>
-<script type="text/javascript">
-$('.fb-comments').attr('data-href', (window.location.href.split('#')[0]).split('?')[0])
-(function(d, s, id) {
-var js, fjs = d.getElementsByTagName(s)[0];
-if (d.getElementById(id)) return;
-js = d.createElement(s); js.id = id;
-js.src = "//connect.facebook.net/en_US/sdk.js#xfbml=1&version=v2.8&appId=1680815145503311";
-fjs.parentNode.insertBefore(js, fjs);
-}(document, 'script', 'facebook-jssdk'));
-$(function(){
-if ($('#footer')[0].offsetTop < $(window).height()){
-$('#footer').addClass('to-bottom')
-}
-})
-</script>
-</body>
-</html>
diff --git a/docs/zh/howtostart.html b/docs/zh/howtostart.html
deleted file mode 100644
index 5d0382c0..00000000
--- a/docs/zh/howtostart.html
+++ /dev/null
@@ -1,188 +0,0 @@
-<!DOCTYPE html>
-<html>
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>快速开始 &mdash; QPython 0.9 documentation</title>
-<link rel="stylesheet" href="../static/qpython_theme.css" type="text/css" />
-<link rel="stylesheet" href="../static/pygments.css" type="text/css" />
-<script type="text/javascript">
-var DOCUMENTATION_OPTIONS = {
-URL_ROOT:    '../',
-VERSION:     '0.9',
-COLLAPSE_INDEX: false,
-FILE_SUFFIX: '.html',
-HAS_SOURCE:  true
-};
-</script>
-<script type="text/javascript" src="../static/jquery.js"></script>
-<script type="text/javascript" src="../static/underscore.js"></script>
-<script type="text/javascript" src="../static/doctools.js"></script>
-<link rel="top" title="QPython 0.9 documentation" href="../document.html" />
-<link rel="up" title="中文用户向导" href="../zhindex.html" />
-<link rel="next" title="QPython文档体系说明" href="contributorshowto.html" />
-<link rel="prev" title="中文用户向导" href="../zhindex.html" />
-<meta charset="UTF-8">
-<link href="http://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet">
-<script src="http://cdn.bootcss.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
-<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
-</head>
-<body role="document">
-<div class="header doc-header">
-<div class="col-lg-offset-2 col-lg-8 col-md-offset-2 col-md-8 col-sm-offset-2 col-sm-8  index-header">
-<div class="navbar-header">
-<button type="button" class="navbar-toggle" data-toggle="collapse"
-data-target="#example-navbar-collapse">
-<span class="sr-only">切换导航</span>
-<span class="icon-bar"></span>
-<span class="icon-bar"></span>
-<span class="icon-bar"></span>
-</button>
-<a href="/index.html" class="logo"><img src="../static/img_logo.png"></a>
-</div>
-<ul class="header-title hidden-xs">
-<li class="header-phone-selected">
-<a href="/index.html">Home</a>
-</li>
-<li>
-<a href="/document.html" class="header-selected">Guide</a>
-<span class="header-title-selected"></span>
-</li>
-<li>
-<a target="_blank" href="https://github.com/qpython-android/qpython">Github</a>
-</li>
-</ul>
-<div class="search-box hidden-xs">
-<form action="../search.html">
-<input type="search" name="q" placeholder="keyword">
-<input type="hidden" name="check_keywords" value="yes" />
-<input type="hidden" name="area" value="default" />
-<button><img src="../static/ic_search.png"></button>
-</form>
-</div>
-</div>
-</div>
-<div class="row doc-content">
-<div class="content-main col-sm-offset-2 col-sm-8">
-<div class="content-wrapper col-sm-4">
-<div class="left-menu">
-<div class="doc-title hidden-xs">QPthon</div>
-<div class="sidebar  collapse navbar-collapse"  id="example-navbar-collapse">
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../en/guide.html">Getting started</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../en/guide.html#programming-guide">Programming Guide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../en/guide.html#developers-guide">Developers&#8217; Guide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../en/guide.html#contributors-guide">Contributors&#8217; Guide</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../en/faq.html">FAQ</a></li>
-</ul>
-<ul class="current">
-<li class="toctree-l1 current"><a class="reference internal" href="../zhindex.html">中文用户向导</a><ul class="current">
-<li class="toctree-l2"><a class="reference internal" href="../zhindex.html#id2">欢迎 ！</a></li>
-<li class="toctree-l2 current"><a class="reference internal" href="../zhindex.html#qpython">QPython 起步</a><ul class="current">
-<li class="toctree-l3 current"><a class="current reference internal" href="#">快速开始</a></li>
-<li class="toctree-l3"><a class="reference internal" href="#id4">编程指南</a></li>
-<li class="toctree-l3"><a class="reference internal" href="#id5">QPython黑客指南</a></li>
-<li class="toctree-l3"><a class="reference internal" href="#id8">贡献者指南</a></li>
-</ul>
-</li>
-<li class="toctree-l2"><a class="reference internal" href="../zhindex.html#id3">更多链接</a></li>
-<li class="toctree-l2"><a class="reference internal" href="../zhindex.html#id9">QPython 用户开发组</a></li>
-<li class="toctree-l2"><a class="reference internal" href="../zhindex.html#id11">如何贡献</a></li>
-</ul>
-</li>
-</ul>
-<div class="search-phone visible-xs">
-<form action="../search.html">
-<input type="search" name="q" placeholder="keyword">
-<input type="hidden" name="check_keywords" value="yes" />
-<input type="hidden" name="area" value="default" />
-<button><img src="../static/ic_search.png"></button>
-</form>
-</div>
-</div>
-</div>
-</div>
-<div class="content col-sm-8">
-<div class="document">
-<ul class="crumbs">
-<li><a href="../document.html">Guide</a> &raquo;</li>
-<li><a href="../zhindex.html">中文用户向导</a> &raquo;</li>
-<li>快速开始</li>
-</ul>
-<div class="documentwrapper">
-<div class="bodywrapper">
-<div class="body" role="main">
-<div class="section" id="id1">
-<h1>快速开始<a class="headerlink" href="#id1" title="Permalink to this headline">¶</a></h1>
-<ul class="simple">
-<li><a class="reference external" href="http://wiki.qpython.org/zh/doc/how-to-start">QPython － 使用说明</a></li>
-<li><a class="reference external" href="http://wiki.qpython.org/zh/quick-start">QPython － 快速开始</a></li>
-<li><a class="reference external" href="http://wiki.qpython.org/zh/doc/hello-world">“你好，世界！”</a></li>
-</ul>
-</div>
-<div class="section" id="id4">
-<h1>编程指南<a class="headerlink" href="#id4" title="Permalink to this headline">¶</a></h1>
-<ul class="simple">
-<li><a class="reference external" href="http://wiki.qpython.org/zh/webapp/sample">QPython － 开发 WEB APP</a></li>
-<li><a class="reference external" href="http://wiki.qpython.org/zh/webapp/bottle">QPython － Bottle 快速了解</a></li>
-</ul>
-</div>
-<div class="section" id="id5">
-<h1>QPython黑客指南<a class="headerlink" href="#id5" title="Permalink to this headline">¶</a></h1>
-<ul class="simple">
-<li><a class="reference external" href="http://wiki.qpython.org/zh/doc/program_guide/">QPython － 编程向导</a></li>
-<li><a class="reference external" href="http://wiki.qpython.org/zh/diveinto/">QPython 黑客</a></li>
-</ul>
-</div>
-<div class="section" id="id8">
-<h1>贡献者指南<a class="headerlink" href="#id8" title="Permalink to this headline">¶</a></h1>
-<p>欢迎加入 QPython 团队</p>
-<div class="toctree-wrapper compound">
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="contributorshowto.html">QPython文档体系说明</a></li>
-<li class="toctree-l1"><a class="reference internal" href="contributorshowto.html#id1">如何提交文档</a></li>
-<li class="toctree-l1"><a class="reference internal" href="contributorshowto.html#id2">如何提交翻译</a></li>
-</ul>
-</div>
-</div>
-</div>
-</div>
-</div>
-</div>
-<div class="fb-comments" data-href="http://qpython.org" data-numposts="10"></div>
-</div>
-</div>
-<div class="col-sm-2"></div>
-</div>
-<footer id="footer">
-<div class="col-sm-offset-2 col-sm-6 footer-div1">
-<div class="footer-block-item">
-<span class="footer-item1">Built with Sphinx using a theme provid by QPython.</span>
-<span class="footer-item2 visible-xs">
-&#169; Copyright 2017, QPython.
-</span>
-</div>
-</div>
-<div class="col-sm-2 footer-div2">
-<a href="/index.html" class="pull-right"><img src="../static/img_logo.png"></a>
-</div>
-</footer>
-<script type="text/javascript">
-$('.fb-comments').attr('data-href', (window.location.href.split('#')[0]).split('?')[0])
-(function(d, s, id) {
-var js, fjs = d.getElementsByTagName(s)[0];
-if (d.getElementById(id)) return;
-js = d.createElement(s); js.id = id;
-js.src = "//connect.facebook.net/en_US/sdk.js#xfbml=1&version=v2.8&appId=1680815145503311";
-fjs.parentNode.insertBefore(js, fjs);
-}(document, 'script', 'facebook-jssdk'));
-$(function(){
-if ($('#footer')[0].offsetTop < $(window).height()){
-$('#footer').addClass('to-bottom')
-}
-})
-</script>
-</body>
-</html>
diff --git a/docs/zh/quickstart.html b/docs/zh/quickstart.html
deleted file mode 100644
index 974a0141..00000000
--- a/docs/zh/quickstart.html
+++ /dev/null
@@ -1,141 +0,0 @@
-<!DOCTYPE html>
-<html>
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>???ٿ?ʼ &mdash; QPython 0.9 documentation</title>
-<link rel="stylesheet" href="../static/qpython_theme.css" type="text/css" />
-<link rel="stylesheet" href="../static/pygments.css" type="text/css" />
-<script type="text/javascript">
-var DOCUMENTATION_OPTIONS = {
-URL_ROOT:    '../',
-VERSION:     '0.9',
-COLLAPSE_INDEX: false,
-FILE_SUFFIX: '.html',
-HAS_SOURCE:  true
-};
-</script>
-<script type="text/javascript" src="../static/jquery.js"></script>
-<script type="text/javascript" src="../static/underscore.js"></script>
-<script type="text/javascript" src="../static/doctools.js"></script>
-<link rel="top" title="QPython 0.9 documentation" href="../document.html" />
-<meta charset="UTF-8">
-<link href="http://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet">
-<script src="http://cdn.bootcss.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
-<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
-</head>
-<body role="document">
-<div class="header doc-header">
-<div class="col-lg-offset-2 col-lg-8 col-md-offset-2 col-md-8 col-sm-offset-2 col-sm-8  index-header">
-<div class="navbar-header">
-<button type="button" class="navbar-toggle" data-toggle="collapse"
-data-target="#example-navbar-collapse">
-<span class="sr-only">切换导航</span>
-<span class="icon-bar"></span>
-<span class="icon-bar"></span>
-<span class="icon-bar"></span>
-</button>
-<a href="/index.html" class="logo"><img src="../static/img_logo.png"></a>
-</div>
-<ul class="header-title hidden-xs">
-<li class="header-phone-selected">
-<a href="/index.html">Home</a>
-</li>
-<li>
-<a href="/document.html" class="header-selected">Guide</a>
-<span class="header-title-selected"></span>
-</li>
-<li>
-<a target="_blank" href="https://github.com/qpython-android/qpython">Github</a>
-</li>
-</ul>
-<div class="search-box hidden-xs">
-<form action="../search.html">
-<input type="search" name="q" placeholder="keyword">
-<input type="hidden" name="check_keywords" value="yes" />
-<input type="hidden" name="area" value="default" />
-<button><img src="../static/ic_search.png"></button>
-</form>
-</div>
-</div>
-</div>
-<div class="row doc-content">
-<div class="content-main col-sm-offset-2 col-sm-8">
-<div class="content-wrapper col-sm-4">
-<div class="left-menu">
-<div class="doc-title hidden-xs">QPthon</div>
-<div class="sidebar  collapse navbar-collapse"  id="example-navbar-collapse">
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../en/guide.html">Getting started</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../en/guide.html#programming-guide">Programming Guide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../en/guide.html#developers-guide">Developers&#8217; Guide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../en/guide.html#contributors-guide">Contributors&#8217; Guide</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../en/faq.html">FAQ</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../zhindex.html">中文用户向导</a></li>
-</ul>
-<div class="search-phone visible-xs">
-<form action="../search.html">
-<input type="search" name="q" placeholder="keyword">
-<input type="hidden" name="check_keywords" value="yes" />
-<input type="hidden" name="area" value="default" />
-<button><img src="../static/ic_search.png"></button>
-</form>
-</div>
-</div>
-</div>
-</div>
-<div class="content col-sm-8">
-<div class="document">
-<ul class="crumbs">
-<li><a href="../document.html">Guide</a> &raquo;</li>
-<li>???ٿ?ʼ</li>
-</ul>
-<div class="documentwrapper">
-<div class="bodywrapper">
-<div class="body" role="main">
-<div class="section" id="id1">
-<h1>???ٿ?ʼ<a class="headerlink" href="#id1" title="Permalink to this headline">¶</a></h1>
-</div>
-</div>
-</div>
-</div>
-</div>
-<div class="fb-comments" data-href="http://qpython.org" data-numposts="10"></div>
-</div>
-</div>
-<div class="col-sm-2"></div>
-</div>
-<footer id="footer">
-<div class="col-sm-offset-2 col-sm-6 footer-div1">
-<div class="footer-block-item">
-<span class="footer-item1">Built with Sphinx using a theme provid by QPython.</span>
-<span class="footer-item2 visible-xs">
-&#169; Copyright 2017, QPython.
-</span>
-</div>
-</div>
-<div class="col-sm-2 footer-div2">
-<a href="/index.html" class="pull-right"><img src="../static/img_logo.png"></a>
-</div>
-</footer>
-<script type="text/javascript">
-$('.fb-comments').attr('data-href', (window.location.href.split('#')[0]).split('?')[0])
-(function(d, s, id) {
-var js, fjs = d.getElementsByTagName(s)[0];
-if (d.getElementById(id)) return;
-js = d.createElement(s); js.id = id;
-js.src = "//connect.facebook.net/en_US/sdk.js#xfbml=1&version=v2.8&appId=1680815145503311";
-fjs.parentNode.insertBefore(js, fjs);
-}(document, 'script', 'facebook-jssdk'));
-$(function(){
-if ($('#footer')[0].offsetTop < $(window).height()){
-$('#footer').addClass('to-bottom')
-}
-})
-</script>
-</body>
-</html>
diff --git a/docs/zhindex.html b/docs/zhindex.html
deleted file mode 100644
index d79e2d9b..00000000
--- a/docs/zhindex.html
+++ /dev/null
@@ -1,197 +0,0 @@
-<!DOCTYPE html>
-<html>
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>中文用户向导 &mdash; QPython 0.9 documentation</title>
-<link rel="stylesheet" href="static/qpython_theme.css" type="text/css" />
-<link rel="stylesheet" href="static/pygments.css" type="text/css" />
-<script type="text/javascript">
-var DOCUMENTATION_OPTIONS = {
-URL_ROOT:    './',
-VERSION:     '0.9',
-COLLAPSE_INDEX: false,
-FILE_SUFFIX: '.html',
-HAS_SOURCE:  true
-};
-</script>
-<script type="text/javascript" src="static/jquery.js"></script>
-<script type="text/javascript" src="static/underscore.js"></script>
-<script type="text/javascript" src="static/doctools.js"></script>
-<link rel="top" title="QPython 0.9 documentation" href="document.html" />
-<link rel="next" title="快速开始" href="zh/howtostart.html" />
-<link rel="prev" title="FAQ" href="en/faq.html" />
-<meta charset="UTF-8">
-<link href="http://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet">
-<script src="http://cdn.bootcss.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
-<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
-</head>
-<body role="document">
-<div class="header doc-header">
-<div class="col-lg-offset-2 col-lg-8 col-md-offset-2 col-md-8 col-sm-offset-2 col-sm-8  index-header">
-<div class="navbar-header">
-<button type="button" class="navbar-toggle" data-toggle="collapse"
-data-target="#example-navbar-collapse">
-<span class="sr-only">切换导航</span>
-<span class="icon-bar"></span>
-<span class="icon-bar"></span>
-<span class="icon-bar"></span>
-</button>
-<a href="/index.html" class="logo"><img src="static/img_logo.png"></a>
-</div>
-<ul class="header-title hidden-xs">
-<li class="header-phone-selected">
-<a href="/index.html">Home</a>
-</li>
-<li>
-<a href="/document.html" class="header-selected">Guide</a>
-<span class="header-title-selected"></span>
-</li>
-<li>
-<a target="_blank" href="https://github.com/qpython-android/qpython">Github</a>
-</li>
-</ul>
-<div class="search-box hidden-xs">
-<form action="search.html">
-<input type="search" name="q" placeholder="keyword">
-<input type="hidden" name="check_keywords" value="yes" />
-<input type="hidden" name="area" value="default" />
-<button><img src="static/ic_search.png"></button>
-</form>
-</div>
-</div>
-</div>
-<div class="row doc-content">
-<div class="content-main col-sm-offset-2 col-sm-8">
-<div class="content-wrapper col-sm-4">
-<div class="left-menu">
-<div class="doc-title hidden-xs">QPthon</div>
-<div class="sidebar  collapse navbar-collapse"  id="example-navbar-collapse">
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="en/guide.html">Getting started</a></li>
-<li class="toctree-l1"><a class="reference internal" href="en/guide.html#programming-guide">Programming Guide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="en/guide.html#developers-guide">Developers&#8217; Guide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="en/guide.html#contributors-guide">Contributors&#8217; Guide</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="en/faq.html">FAQ</a></li>
-</ul>
-<ul class="current">
-<li class="toctree-l1 current"><a class="current reference internal" href="#">中文用户向导</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="#id2">欢迎 ！</a></li>
-<li class="toctree-l2"><a class="reference internal" href="#qpython">QPython 起步</a><ul>
-<li class="toctree-l3"><a class="reference internal" href="zh/howtostart.html">快速开始</a></li>
-<li class="toctree-l3"><a class="reference internal" href="zh/howtostart.html#id4">编程指南</a></li>
-<li class="toctree-l3"><a class="reference internal" href="zh/howtostart.html#id5">QPython黑客指南</a></li>
-<li class="toctree-l3"><a class="reference internal" href="zh/howtostart.html#id8">贡献者指南</a></li>
-</ul>
-</li>
-<li class="toctree-l2"><a class="reference internal" href="#id3">更多链接</a></li>
-<li class="toctree-l2"><a class="reference internal" href="#id9">QPython 用户开发组</a></li>
-<li class="toctree-l2"><a class="reference internal" href="#id11">如何贡献</a></li>
-</ul>
-</li>
-</ul>
-<div class="search-phone visible-xs">
-<form action="search.html">
-<input type="search" name="q" placeholder="keyword">
-<input type="hidden" name="check_keywords" value="yes" />
-<input type="hidden" name="area" value="default" />
-<button><img src="static/ic_search.png"></button>
-</form>
-</div>
-</div>
-</div>
-</div>
-<div class="content col-sm-8">
-<div class="document">
-<ul class="crumbs">
-<li><a href="document.html">Guide</a> &raquo;</li>
-<li>中文用户向导</li>
-</ul>
-<div class="documentwrapper">
-<div class="bodywrapper">
-<div class="body" role="main">
-<div class="section" id="id1">
-<h1>中文用户向导<a class="headerlink" href="#id1" title="Permalink to this headline">¶</a></h1>
-<div class="section" id="id2">
-<h2>欢迎 ！<a class="headerlink" href="#id2" title="Permalink to this headline">¶</a></h2>
-<p>QPython/QPython3 的最新版本1.3.2(QPython), 1.0.2(QPython3) 已经发布，它包含了许多惊艳的特性，请从应用市场安装</p>
-</div>
-<div class="section" id="qpython">
-<h2>QPython 起步<a class="headerlink" href="#qpython" title="Permalink to this headline">¶</a></h2>
-<div class="toctree-wrapper compound">
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="zh/howtostart.html">快速开始</a></li>
-<li class="toctree-l1"><a class="reference internal" href="zh/howtostart.html#id4">编程指南</a></li>
-<li class="toctree-l1"><a class="reference internal" href="zh/howtostart.html#id5">QPython黑客指南</a></li>
-<li class="toctree-l1"><a class="reference internal" href="zh/howtostart.html#id8">贡献者指南</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="zh/contributorshowto.html">QPython文档体系说明</a></li>
-<li class="toctree-l2"><a class="reference internal" href="zh/contributorshowto.html#id1">如何提交文档</a></li>
-<li class="toctree-l2"><a class="reference internal" href="zh/contributorshowto.html#id2">如何提交翻译</a></li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<div class="section" id="id3">
-<h2>更多链接<a class="headerlink" href="#id3" title="Permalink to this headline">¶</a></h2>
-<ul class="simple">
-<li><a class="reference external" href="http://wiki.qpython.org/zh/faq/">常见问题</a></li>
-<li><a class="reference external" href="http://tieba.baidu.com/f?ie=utf-8&amp;kw=qpython">在百度贴吧里讨论</a></li>
-<li><a class="reference external" href="http://weibo.com/qpython">在微博问我们问题</a></li>
-<li><a class="reference external" href="mailto:support&#37;&#52;&#48;qpython&#46;org">给我们发邮件</a></li>
-<li><a class="reference external" href="https://github.com/qpython-android/qpython/issues">报告问题</a></li>
-</ul>
-</div>
-<div class="section" id="id9">
-<h2>QPython 用户开发组<a class="headerlink" href="#id9" title="Permalink to this headline">¶</a></h2>
-<ul class="simple">
-<li>请加入 <a class="reference external" href="https://groups.google.com/forum/?hl=en#!forum/qpython">QPython 用户开发者组</a> 来和全世界的 QPython 用户一块来玩转QPython。</li>
-<li>加入QPython QQ组（Q群：540717901）来和中国活跃的QPython 用户一起玩转 QPython</li>
-</ul>
-</div>
-<div class="section" id="id11">
-<h2>如何贡献<a class="headerlink" href="#id11" title="Permalink to this headline">¶</a></h2>
-<p>想成为 QPython 的贡献者么？请 <a class="reference external" href="mailto:support&#37;&#52;&#48;qpython&#46;org">给我们发邮件</a></p>
-</div>
-</div>
-</div>
-</div>
-</div>
-</div>
-<div class="fb-comments" data-href="http://qpython.org" data-numposts="10"></div>
-</div>
-</div>
-<div class="col-sm-2"></div>
-</div>
-<footer id="footer">
-<div class="col-sm-offset-2 col-sm-6 footer-div1">
-<div class="footer-block-item">
-<span class="footer-item1">Built with Sphinx using a theme provid by QPython.</span>
-<span class="footer-item2 visible-xs">
-&#169; Copyright 2017, QPython.
-</span>
-</div>
-</div>
-<div class="col-sm-2 footer-div2">
-<a href="/index.html" class="pull-right"><img src="static/img_logo.png"></a>
-</div>
-</footer>
-<script type="text/javascript">
-$('.fb-comments').attr('data-href', (window.location.href.split('#')[0]).split('?')[0])
-(function(d, s, id) {
-var js, fjs = d.getElementsByTagName(s)[0];
-if (d.getElementById(id)) return;
-js = d.createElement(s); js.id = id;
-js.src = "//connect.facebook.net/en_US/sdk.js#xfbml=1&version=v2.8&appId=1680815145503311";
-fjs.parentNode.insertBefore(js, fjs);
-}(document, 'script', 'facebook-jssdk'));
-$(function(){
-if ($('#footer')[0].offsetTop < $(window).height()){
-$('#footer').addClass('to-bottom')
-}
-})
-</script>
-</body>
-</html>
diff --git a/gradle.properties b/gradle.properties
index 4b2fdcba..12d6a46b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -14,5 +14,6 @@
 # org.gradle.parallel=true
 #Sun May 29 21:58:12 CST 2016
 org.gradle.jvmargs=-Xmx2048m
-android.useDeprecatedNdk=true
 org.gradle.daemon=true
+android.debug.obsoleteApi=true
+#android.useDeprecatedNdk=true
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 00000000..f6b961fd
Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradlew b/gradlew
old mode 100644
new mode 100755
index 9d82f789..cccdd3d5
--- a/gradlew
+++ b/gradlew
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 ##############################################################################
 ##
@@ -6,20 +6,38 @@
 ##
 ##############################################################################
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
 
 APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
-warn ( ) {
+warn () {
     echo "$*"
 }
 
-die ( ) {
+die () {
     echo
     echo "$*"
     echo
@@ -30,6 +48,7 @@ die ( ) {
 cygwin=false
 msys=false
 darwin=false
+nonstop=false
 case "`uname`" in
   CYGWIN* )
     cygwin=true
@@ -40,26 +59,11 @@ case "`uname`" in
   MINGW* )
     msys=true
     ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
 esac
 
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 # Determine the Java command to use to start the JVM.
@@ -85,7 +89,7 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
     MAX_FD_LIMIT=`ulimit -H -n`
     if [ $? -eq 0 ] ; then
         if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -150,11 +154,19 @@ if $cygwin ; then
     esac
 fi
 
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
 }
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
index aec99730..e95643d6 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -8,14 +8,14 @@
 @rem Set local scope for the variables with windows NT shell
 if "%OS%"=="Windows_NT" setlocal
 
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
 set DIRNAME=%~dp0
 if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
@@ -46,10 +46,9 @@ echo location of your Java installation.
 goto fail
 
 :init
-@rem Get command-line arguments, handling Windowz variants
+@rem Get command-line arguments, handling Windows variants
 
 if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
 
 :win9xME_args
 @rem Slurp the command line arguments.
@@ -60,11 +59,6 @@ set _SKIP=2
 if "x%~1" == "x" goto execute
 
 set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
 
 :execute
 @rem Setup the command line
diff --git a/local.properties b/local.properties
index aa2093ac..4929a5a2 100644
--- a/local.properties
+++ b/local.properties
@@ -1,12 +1,9 @@
-## This file is automatically generated by Android Studio.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must *NOT* be checked into Version Control Systems,
+## This file must *NOT* be checked into Version Control Systems,
 # as it contains information specific to your local configuration.
 #
 # Location of the SDK. This is only used by Gradle.
 # For customization when using a Version Control System, please read the
 # header note.
-#Wed Mar 22 13:38:36 CST 2017
+#Thu Aug 02 10:23:49 CST 2018
+ndk.dir=/Users/yanhecun/Library/Android/sdk/ndk-bundle
 sdk.dir=/Users/yanhecun/Library/Android/sdk
-ndk.dir=/Users/yanhecun/Develop/android-ndk-r10e
diff --git a/qbaselib b/qbaselib
new file mode 160000
index 00000000..d379973c
--- /dev/null
+++ b/qbaselib
@@ -0,0 +1 @@
+Subproject commit d379973cb724f65f342a1fbfc7b426b185b7ce32
diff --git a/qftplib b/qftplib
new file mode 160000
index 00000000..c1ab9384
--- /dev/null
+++ b/qftplib
@@ -0,0 +1 @@
+Subproject commit c1ab93848ec77ba6670332acff1e712a3c00301b
diff --git a/qpypluginman/.gitignore b/qpypluginman/.gitignore
deleted file mode 100644
index 3543521e..00000000
--- a/qpypluginman/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
diff --git a/qpypluginman/build.gradle b/qpypluginman/build.gradle
index 26d16e31..3d455a43 100644
--- a/qpypluginman/build.gradle
+++ b/qpypluginman/build.gradle
@@ -1,29 +1,31 @@
-apply plugin: 'com.android.library'
-
-android {
-    compileSdkVersion 23
-    buildToolsVersion '25.0.0'
-
-    defaultConfig {
-        minSdkVersion 15
-        targetSdkVersion 23
-        versionCode 1
-        versionName "1.0"
-    }
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-        }
-    }
-}
-
-dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    testCompile 'junit:junit:4.12'
-    compile 'com.squareup.okhttp3:okhttp:3.4.0'
-    compile 'io.reactivex:rxandroid:1.2.1'
-    compile 'io.reactivex:rxjava:1.1.6'
-    compile 'com.android.support:support-v4:23.4.0'
-    compile 'com.liulishuo.filedownloader:library:0.3.5'
-}
+apply plugin: 'com.android.library'
+
+android {
+    compileSdkVersion rootProject.ext.compileSdkVersion
+
+    defaultConfig {
+        minSdkVersion rootProject.ext.minSdkVersion
+        targetSdkVersion rootProject.ext.targetSdkVersion
+        versionCode 1
+        versionName "1.0"
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+    lintOptions {
+        abortOnError false
+    }
+}
+
+dependencies {
+//    api fileTree(include: ['*.jar'], dir: 'libs')
+    //testApi 'junit:junit:4.12'
+    api rootProject.ext.libOkHttp3
+    api rootProject.ext.libRxJava
+    api rootProject.ext.libRxAndroid
+    api rootProject.ext.libFileDownloaderLib
+    api rootProject.ext.libSupportV4
+}
diff --git a/qpypluginman/proguard-rules.pro b/qpypluginman/proguard-rules.pro
index ce612161..36693fa1 100644
--- a/qpypluginman/proguard-rules.pro
+++ b/qpypluginman/proguard-rules.pro
@@ -1,17 +1,17 @@
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in C:\Users\Jay\AppData\Local\Android\Sdk/tools/proguard/proguard-android.txt
-# You can edit the include mPath and order by changing the proguardFiles
-# directive in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in C:\Users\Jay\AppData\Local\Android\Sdk/tools/proguard/proguard-android.txt
+# You can edit the include mPath and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
diff --git a/qpypluginman/src/main/AndroidManifest.xml b/qpypluginman/src/main/AndroidManifest.xml
index d010ff2f..3592f067 100644
--- a/qpypluginman/src/main/AndroidManifest.xml
+++ b/qpypluginman/src/main/AndroidManifest.xml
@@ -1,8 +1,8 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.quseit.common.updater">
-
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-
-</manifest>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.quseit.common.updater">
+
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+
+</manifest>
diff --git a/qpypluginman/src/main/java/com/quseit/common/updater/Updater.java b/qpypluginman/src/main/java/com/quseit/common/updater/Updater.java
index eb08c609..08de8c45 100644
--- a/qpypluginman/src/main/java/com/quseit/common/updater/Updater.java
+++ b/qpypluginman/src/main/java/com/quseit/common/updater/Updater.java
@@ -1,149 +1,178 @@
-package com.quseit.common.updater;
-
-
-import android.app.Application;
-import android.content.Context;
-
-import com.quseit.common.updater.convertor.Convertor;
-import com.quseit.common.updater.downloader.DefaultDownloader;
-import com.quseit.common.updater.downloader.Downloader;
-import com.quseit.common.updater.service.DefaultService;
-import com.quseit.common.updater.service.Service;
-import com.quseit.common.updater.updatepkg.UpdatePackage;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.List;
-
-import rx.Observable;
-import rx.Subscriber;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.functions.Action1;
-import rx.functions.Func1;
-import rx.schedulers.Schedulers;
-
-public class Updater {
-    public static final String TAG = "Updater";
-    private static List<UpdatePackage> pkgs;
-
-    private static Service service;
-    private static Convertor convertor;
-    private static Downloader downloader;
-
-    private static String url;
-    private static Context context;
-
-    public static synchronized void init(Application app, String url, Convertor convertor) {
-        Updater.context = app.getApplicationContext();
-        Updater.url = url;
-        Updater.convertor = convertor;
-
-        Updater.service = new DefaultService();
-        Updater.downloader = new DefaultDownloader(app.getApplicationContext());
-    }
-
-    public static void checkUpdate(final CheckUpdateCallback callback) {
-        Observable
-                .create(new Observable.OnSubscribe<String>() {
-                    @Override
-                    public void call(Subscriber<? super String> subscriber) {
-                        try {
-                            String response = service.request(url);
-                            subscriber.onNext(response);
-                        } catch (IOException e) {
-                            subscriber.onError(e);
-                        } finally {
-                            subscriber.onCompleted();
-                        }
-                    }
-                })
-                .subscribeOn(Schedulers.io())
-                .observeOn(Schedulers.computation())
-                .map(new Func1<String, List<? extends UpdatePackage>>() {
-                    @Override
-                    public List<? extends UpdatePackage> call(String response) {
-                        return convertor.transform(response);
-                    }
-                })
-                .flatMap(new Func1<List<? extends UpdatePackage>, Observable<UpdatePackage>>() {
-                    @Override
-                    public Observable<UpdatePackage> call(List<? extends UpdatePackage> updatePkgs) {
-                        return Observable.from(updatePkgs);
-                    }
-                })
-                .filter(new Func1<UpdatePackage, Boolean>() {
-                    @Override
-                    public Boolean call(UpdatePackage updatePackage) {
-                        return updatePackage.checkVersion();
-                    }
-                })
-                .toList()
-                .doOnNext(new Action1<List<UpdatePackage>>() {
-                    @Override
-                    public void call(List<UpdatePackage> pkgs) {
-                        // 保存最新的获取的更新包
-                        Updater.pkgs = pkgs;
-                    }
-                })
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(
-                        new Action1<List<UpdatePackage>>() {
-                            @Override
-                            public void call(List<UpdatePackage> updatePackages) {
-                                if (!updatePackages.isEmpty()) {
-                                    callback.hasUpdate(updatePackages);
-                                } else {
-                                    callback.noneUpdate();
-                                }
-                            }
-                        },
-                        new Action1<Throwable>() {
-                            @Override
-                            public void call(Throwable throwable) {
-                                throwable.printStackTrace();
-                                callback.error(throwable);
-                            }
-                        });
-    }
-
-    public static void update(UpdatePackage pkg) {
-        downloadAndInstall(pkg);
-    }
-
-    public static void update() {
-        // 检查是否调用过 checkUpdate
-        if (Updater.pkgs == null) {
-            return;
-        }
-
-        downloadAndInstall(pkgs);
-    }
-
-    private static void downloadAndInstall(final UpdatePackage pkg) {
-        downloader.download(pkg.getName(), pkg.getDownloadUrl(),
-                new Downloader.Callback() {
-                    @Override
-                    public void complete(String name, File installer) {
-                        pkg.install(installer);
-                    }
-                });
-    }
-
-    private static void downloadAndInstall(List<UpdatePackage> pkgs) {
-        for (UpdatePackage pkg : pkgs) {
-            downloadAndInstall(pkg);
-        }
-    }
-
-    public static Context getContext() {
-        return context;
-    }
-
-    public interface CheckUpdateCallback {
-        void hasUpdate(List<UpdatePackage> pkgs);
-
-        void noneUpdate();
-
-        void error(Throwable e);
-    }
-}
+package com.quseit.common.updater;
+
+
+import android.app.Application;
+import android.content.Context;
+
+import com.quseit.common.updater.convertor.Convertor;
+import com.quseit.common.updater.downloader.DefaultDownloader;
+import com.quseit.common.updater.downloader.Downloader;
+import com.quseit.common.updater.service.DefaultService;
+import com.quseit.common.updater.service.Service;
+import com.quseit.common.updater.updatepkg.UpdatePackage;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.List;
+
+import rx.Observable;
+import rx.Subscriber;
+import rx.android.schedulers.AndroidSchedulers;
+import rx.functions.Action1;
+import rx.functions.Func1;
+import rx.schedulers.Schedulers;
+
+public class Updater {
+    public static final String TAG = "Updater";
+    private static List<UpdatePackage> pkgs;
+
+    private static Service service;
+    private static Convertor convertor;
+    private static Downloader downloader;
+
+    private static String url;
+    private static Context context;
+
+    public static synchronized void init(Application app, String url, Convertor convertor) {
+        Updater.context = app.getApplicationContext();
+        Updater.url = url;
+        Updater.convertor = convertor;
+
+        Updater.service = new DefaultService();
+        Updater.downloader = new DefaultDownloader(app.getApplicationContext());
+    }
+
+    // download service
+    public static void downloadAs(String file, String url, String savePath) {
+        Updater.downloader.download(file, url, savePath,  new Downloader.Callback() {
+            @Override
+            public void pending(String name) {
+
+            }
+
+            @Override
+            public void complete(String name, File installer) {
+            }
+
+            @Override
+            public void error(String err) {
+
+            }
+        });
+    }
+    // update servivce
+    public static void checkUpdate(final CheckUpdateCallback callback) {
+        Observable
+                .create(new Observable.OnSubscribe<String>() {
+                    @Override
+                    public void call(Subscriber<? super String> subscriber) {
+                        try {
+                            String response = service.request(url);
+                            subscriber.onNext(response);
+                        } catch (IOException e) {
+                            subscriber.onError(e);
+                        } finally {
+                            subscriber.onCompleted();
+                        }
+                    }
+                })
+                .subscribeOn(Schedulers.io())
+                .observeOn(Schedulers.computation())
+                .map(new Func1<String, List<? extends UpdatePackage>>() {
+                    @Override
+                    public List<? extends UpdatePackage> call(String response) {
+                        return convertor.transform(response);
+                    }
+                })
+                .flatMap(new Func1<List<? extends UpdatePackage>, Observable<UpdatePackage>>() {
+                    @Override
+                    public Observable<UpdatePackage> call(List<? extends UpdatePackage> updatePkgs) {
+                        return Observable.from(updatePkgs);
+                    }
+                })
+                .filter(new Func1<UpdatePackage, Boolean>() {
+                    @Override
+                    public Boolean call(UpdatePackage updatePackage) {
+                        return updatePackage.checkVersion();
+                    }
+                })
+                .toList()
+                .doOnNext(new Action1<List<UpdatePackage>>() {
+                    @Override
+                    public void call(List<UpdatePackage> pkgs) {
+                        // 保存最新的获取的更新包
+                        Updater.pkgs = pkgs;
+                    }
+                })
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(
+                        new Action1<List<UpdatePackage>>() {
+                            @Override
+                            public void call(List<UpdatePackage> updatePackages) {
+                                if (!updatePackages.isEmpty()) {
+                                    callback.hasUpdate(updatePackages);
+                                } else {
+                                    callback.noneUpdate();
+                                }
+                            }
+                        },
+                        new Action1<Throwable>() {
+                            @Override
+                            public void call(Throwable throwable) {
+                                throwable.printStackTrace();
+                                callback.error(throwable);
+                            }
+                        });
+    }
+
+    public static void update(UpdatePackage pkg) {
+        downloadAndInstall(pkg);
+    }
+
+    public static void update() {
+        // 检查是否调用过 checkUpdate
+        if (Updater.pkgs == null) {
+            return;
+        }
+
+        downloadAndInstall(pkgs);
+    }
+
+    private static void downloadAndInstall(final UpdatePackage pkg) {
+        downloader.download(pkg.getName(), pkg.getDownloadUrl(),
+                new Downloader.Callback() {
+                    @Override
+                    public void pending(String name) {
+
+                    }
+
+                    @Override
+                    public void complete(String name, File installer) {
+                        pkg.install(installer);
+                    }
+
+                    @Override
+                    public void error(String err) {
+
+                    }
+                });
+    }
+
+    private static void downloadAndInstall(List<UpdatePackage> pkgs) {
+        for (UpdatePackage pkg : pkgs) {
+            downloadAndInstall(pkg);
+        }
+    }
+
+    public static Context getContext() {
+        return context;
+    }
+
+    public interface CheckUpdateCallback {
+        void hasUpdate(List<UpdatePackage> pkgs);
+
+        void noneUpdate();
+
+        void error(Throwable e);
+    }
+}
diff --git a/qpypluginman/src/main/java/com/quseit/common/updater/callback/DialogCallback.java b/qpypluginman/src/main/java/com/quseit/common/updater/callback/DialogCallback.java
index a13454cb..53f7b155 100644
--- a/qpypluginman/src/main/java/com/quseit/common/updater/callback/DialogCallback.java
+++ b/qpypluginman/src/main/java/com/quseit/common/updater/callback/DialogCallback.java
@@ -1,138 +1,138 @@
-package com.quseit.common.updater.callback;
-
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.content.DialogInterface;
-import android.os.Bundle;
-import android.support.v4.app.DialogFragment;
-import android.support.v4.app.FragmentActivity;
-import android.widget.Toast;
-
-import com.quseit.common.updater.R;
-import com.quseit.common.updater.Updater;
-import com.quseit.common.updater.updatepkg.UpdatePackage;
-
-import java.util.List;
-
-public class DialogCallback implements Updater.CheckUpdateCallback {
-    private FragmentActivity mActivity;
-    private boolean mIsSilence;
-
-    public DialogCallback(FragmentActivity activity, boolean isSilence) {
-        mActivity = activity;
-        mIsSilence = isSilence;
-    }
-
-    @Override
-    public void hasUpdate(List<UpdatePackage> pkgs) {
-        StringBuilder description = new StringBuilder();
-        for (UpdatePackage pkg : pkgs) {
-            description
-                    .append(pkg.getName())
-                    .append("：")
-                    .append("\n")
-                    .append(pkg.getVersionDescription())
-                    .append("\n\n");
-        }
-        description.delete(description.length() - 2, description.length());
-
-        DialogFragment dialog = SimpleReminderDialogFragment.newInstance(description.toString());
-        try {
-            dialog.show(mActivity.getSupportFragmentManager(), SimpleReminderDialogFragment.TAG);
-        } catch (Exception e) {
-            // mActivity 不可用时忽略
-        }
-    }
-
-    @Override
-    public void noneUpdate() {
-        try {
-            if (!mIsSilence) {
-                Toast.makeText(mActivity, R.string.latest_version, Toast.LENGTH_SHORT).show();
-            }
-        } catch (Exception e) {
-            // mActivity 不可用时忽略
-        }
-    }
-
-    @Override
-    public void error(Throwable e) {
-        try {
-            if (!mIsSilence) {
-                Toast.makeText(mActivity, R.string.check_update_error, Toast.LENGTH_SHORT).show();
-            }
-        } catch (Exception e1) {
-            // mActivity 不可用时忽略
-        }
-    }
-
-    public static class SimpleReminderDialogFragment extends DialogFragment {
-        public static final String TAG = "SimpleReminderDialogFragment";
-        private static final String DESCRIPTION = "description";
-
-        public static SimpleReminderDialogFragment newInstance(String description) {
-            Bundle args = new Bundle();
-            args.putString(DESCRIPTION, description);
-            SimpleReminderDialogFragment fragment = new SimpleReminderDialogFragment();
-            fragment.setArguments(args);
-            return fragment;
-        }
-
-        @Override
-        public Dialog onCreateDialog(Bundle savedInstanceState) {
-            return new AlertDialog.Builder(getActivity())
-                    .setTitle(R.string.has_update)
-                    .setPositiveButton(R.string.update, new DialogInterface.OnClickListener() {
-                        @Override
-                        public void onClick(DialogInterface dialogInterface, int i) {
-                            Updater.update();
-                            dismiss();
-                        }
-                    })
-                    .setNegativeButton(R.string.show_detail, new DialogInterface.OnClickListener() {
-                        @Override
-                        public void onClick(DialogInterface dialogInterface, int i) {
-                            String description = getArguments().getString(DESCRIPTION);
-                            DialogFragment dialog = DetailReminderDialogFragment.newInstance(description);
-                            dialog.show(getFragmentManager(), DetailReminderDialogFragment.TAG);
-                            dismiss();
-                        }
-                    })
-                    .create();
-        }
-    }
-
-    public static class DetailReminderDialogFragment extends DialogFragment {
-        public static final String TAG = "DetailReminderDialogFragment";
-        private static final String DESCRIPTION = "description";
-
-        public static DetailReminderDialogFragment newInstance(String description) {
-            Bundle args = new Bundle();
-            args.putString(DESCRIPTION, description);
-            DetailReminderDialogFragment fragment = new DetailReminderDialogFragment();
-            fragment.setArguments(args);
-            return fragment;
-        }
-
-        @Override
-        public Dialog onCreateDialog(Bundle savedInstanceState) {
-            return new AlertDialog.Builder(getActivity())
-                    .setTitle(R.string.has_update)
-                    .setMessage(getArguments().getString(DESCRIPTION))
-                    .setPositiveButton(R.string.update, new DialogInterface.OnClickListener() {
-                        @Override
-                        public void onClick(DialogInterface dialogInterface, int i) {
-                            Updater.update();
-                            dismiss();
-                        }
-                    })
-                    .setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
-                        @Override
-                        public void onClick(DialogInterface dialogInterface, int i) {
-                            dismiss();
-                        }
-                    })
-                    .create();
-        }
-    }
-}
+package com.quseit.common.updater.callback;
+
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.content.DialogInterface;
+import android.os.Bundle;
+import android.support.v4.app.DialogFragment;
+import android.support.v4.app.FragmentActivity;
+import android.widget.Toast;
+
+import com.quseit.common.updater.R;
+import com.quseit.common.updater.Updater;
+import com.quseit.common.updater.updatepkg.UpdatePackage;
+
+import java.util.List;
+
+public class DialogCallback implements Updater.CheckUpdateCallback {
+    private FragmentActivity mActivity;
+    private boolean mIsSilence;
+
+    public DialogCallback(FragmentActivity activity, boolean isSilence) {
+        mActivity = activity;
+        mIsSilence = isSilence;
+    }
+
+    @Override
+    public void hasUpdate(List<UpdatePackage> pkgs) {
+        StringBuilder description = new StringBuilder();
+        for (UpdatePackage pkg : pkgs) {
+            description
+                    .append(pkg.getName())
+                    .append("：")
+                    .append("\n")
+                    .append(pkg.getVersionDescription())
+                    .append("\n\n");
+        }
+        description.delete(description.length() - 2, description.length());
+
+        DialogFragment dialog = SimpleReminderDialogFragment.newInstance(description.toString());
+        try {
+            dialog.show(mActivity.getSupportFragmentManager(), SimpleReminderDialogFragment.TAG);
+        } catch (Exception e) {
+            // mActivity 不可用时忽略
+        }
+    }
+
+    @Override
+    public void noneUpdate() {
+        try {
+            if (!mIsSilence) {
+                Toast.makeText(mActivity, R.string.latest_version, Toast.LENGTH_SHORT).show();
+            }
+        } catch (Exception e) {
+            // mActivity 不可用时忽略
+        }
+    }
+
+    @Override
+    public void error(Throwable e) {
+        try {
+            if (!mIsSilence) {
+                Toast.makeText(mActivity, R.string.check_update_error, Toast.LENGTH_SHORT).show();
+            }
+        } catch (Exception e1) {
+            // mActivity 不可用时忽略
+        }
+    }
+
+    public static class SimpleReminderDialogFragment extends DialogFragment {
+        public static final String TAG = "SimpleReminderDialogFragment";
+        private static final String DESCRIPTION = "description";
+
+        public static SimpleReminderDialogFragment newInstance(String description) {
+            Bundle args = new Bundle();
+            args.putString(DESCRIPTION, description);
+            SimpleReminderDialogFragment fragment = new SimpleReminderDialogFragment();
+            fragment.setArguments(args);
+            return fragment;
+        }
+
+        @Override
+        public Dialog onCreateDialog(Bundle savedInstanceState) {
+            return new AlertDialog.Builder(getActivity())
+                    .setTitle(R.string.has_update)
+                    .setPositiveButton(R.string.update, new DialogInterface.OnClickListener() {
+                        @Override
+                        public void onClick(DialogInterface dialogInterface, int i) {
+                            Updater.update();
+                            dismiss();
+                        }
+                    })
+                    .setNegativeButton(R.string.show_detail, new DialogInterface.OnClickListener() {
+                        @Override
+                        public void onClick(DialogInterface dialogInterface, int i) {
+                            String description = getArguments().getString(DESCRIPTION);
+                            DialogFragment dialog = DetailReminderDialogFragment.newInstance(description);
+                            dialog.show(getFragmentManager(), DetailReminderDialogFragment.TAG);
+                            dismiss();
+                        }
+                    })
+                    .create();
+        }
+    }
+
+    public static class DetailReminderDialogFragment extends DialogFragment {
+        public static final String TAG = "DetailReminderDialogFragment";
+        private static final String DESCRIPTION = "description";
+
+        public static DetailReminderDialogFragment newInstance(String description) {
+            Bundle args = new Bundle();
+            args.putString(DESCRIPTION, description);
+            DetailReminderDialogFragment fragment = new DetailReminderDialogFragment();
+            fragment.setArguments(args);
+            return fragment;
+        }
+
+        @Override
+        public Dialog onCreateDialog(Bundle savedInstanceState) {
+            return new AlertDialog.Builder(getActivity())
+                    .setTitle(R.string.has_update)
+                    .setMessage(getArguments().getString(DESCRIPTION))
+                    .setPositiveButton(R.string.update, new DialogInterface.OnClickListener() {
+                        @Override
+                        public void onClick(DialogInterface dialogInterface, int i) {
+                            Updater.update();
+                            dismiss();
+                        }
+                    })
+                    .setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
+                        @Override
+                        public void onClick(DialogInterface dialogInterface, int i) {
+                            dismiss();
+                        }
+                    })
+                    .create();
+        }
+    }
+}
diff --git a/qpypluginman/src/main/java/com/quseit/common/updater/convertor/Convertor.java b/qpypluginman/src/main/java/com/quseit/common/updater/convertor/Convertor.java
index 9bdda98c..972d93da 100644
--- a/qpypluginman/src/main/java/com/quseit/common/updater/convertor/Convertor.java
+++ b/qpypluginman/src/main/java/com/quseit/common/updater/convertor/Convertor.java
@@ -1,10 +1,10 @@
-package com.quseit.common.updater.convertor;
-
-
-import com.quseit.common.updater.updatepkg.UpdatePackage;
-
-import java.util.List;
-
-public interface Convertor {
-    List<? extends UpdatePackage> transform(String response);
-}
+package com.quseit.common.updater.convertor;
+
+
+import com.quseit.common.updater.updatepkg.UpdatePackage;
+
+import java.util.List;
+
+public interface Convertor {
+    List<? extends UpdatePackage> transform(String response);
+}
diff --git a/qpypluginman/src/main/java/com/quseit/common/updater/downloader/DefaultDownloader.java b/qpypluginman/src/main/java/com/quseit/common/updater/downloader/DefaultDownloader.java
index adb67fbc..3cd3182e 100644
--- a/qpypluginman/src/main/java/com/quseit/common/updater/downloader/DefaultDownloader.java
+++ b/qpypluginman/src/main/java/com/quseit/common/updater/downloader/DefaultDownloader.java
@@ -1,80 +1,104 @@
-package com.quseit.common.updater.downloader;
-
-import android.app.Notification;
-import android.app.NotificationManager;
-import android.content.Context;
-import android.os.Environment;
-import android.support.v4.app.NotificationCompat;
-
-import com.liulishuo.filedownloader.BaseDownloadTask;
-import com.liulishuo.filedownloader.FileDownloadListener;
-import com.liulishuo.filedownloader.FileDownloader;
-import com.quseit.common.updater.R;
-
-import java.io.File;
-
-import static android.os.Environment.getExternalStoragePublicDirectory;
-
-public class DefaultDownloader implements Downloader {
-    public static final String TAG = "DefaultDownloader";
-    public final String DEFAULT_PATH;
-    private final Context context;
-    private final NotificationManager notificationManager;
-
-
-    public DefaultDownloader(Context context) {
-        this.context = context;
-        FileDownloader.init(context);
-        notificationManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
-        DEFAULT_PATH = getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS).getAbsolutePath();
-    }
-
-    @Override
-    public void download(final String name, String url, final Callback callback) {
-        String path = DEFAULT_PATH + "/" + name;
-        FileDownloader.getImpl()
-                .create(url)
-                .setPath(path, false)
-                .setCallbackProgressTimes(300)
-                .setListener(new FileDownloadListener() {
-                    @Override
-                    protected void pending(BaseDownloadTask task, int soFarBytes, int totalBytes) {
-
-                    }
-
-                    @Override
-                    protected void progress(BaseDownloadTask task, int soFarBytes, int totalBytes) {
-                        Notification notification = new NotificationCompat.Builder(context)
-                                .setSmallIcon(R.drawable.ic_cloud_download_black_24dp)
-                                .setContentTitle(context.getText(R.string.downloading))
-                                .setContentText(name)
-                                .setProgress(totalBytes, soFarBytes, false)
-                                .build();
-                        notificationManager.notify(name.hashCode(), notification);
-                    }
-
-                    @Override
-                    protected void completed(BaseDownloadTask task) {
-                        notificationManager.cancel(name.hashCode());
-                        File file = new File(task.getTargetFilePath());
-                        callback.complete(name, file);
-                    }
-
-                    @Override
-                    protected void paused(BaseDownloadTask task, int soFarBytes, int totalBytes) {
-
-                    }
-
-                    @Override
-                    protected void error(BaseDownloadTask task, Throwable e) {
-
-                    }
-
-                    @Override
-                    protected void warn(BaseDownloadTask task) {
-
-                    }
-                })
-                .start();
-    }
+package com.quseit.common.updater.downloader;
+
+import android.app.Notification;
+import android.app.NotificationManager;
+import android.content.Context;
+import android.os.Environment;
+import android.support.v4.app.NotificationCompat;
+import android.util.Log;
+
+import com.liulishuo.filedownloader.BaseDownloadTask;
+import com.liulishuo.filedownloader.FileDownloadListener;
+import com.liulishuo.filedownloader.FileDownloader;
+import com.quseit.common.updater.R;
+
+import java.io.File;
+
+import static android.os.Environment.getExternalStoragePublicDirectory;
+
+public class DefaultDownloader implements Downloader {
+    public static final String TAG = "DefaultDownloader";
+    public final String DEFAULT_PATH;
+    private final Context context;
+    private final NotificationManager notificationManager;
+
+    public DefaultDownloader(Context context) {
+        this.context = context;
+        FileDownloader.init(context);
+        notificationManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
+        DEFAULT_PATH = getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS).getAbsolutePath();
+    }
+
+    @Override
+    public void download(final String name, String url, final Callback callback) {
+        String path = DEFAULT_PATH + "/" + name;
+        download(name, url, path, callback);
+    }
+
+    @Override
+    public void download(final String name, String url, final String path, final Callback callback) {
+        Log.d(TAG, "download:"+name+":"+url+"["+path+"]");
+        FileDownloader.getImpl()
+        .create(url)
+        .setPath(path, false)
+        .setCallbackProgressTimes(2000)
+        .setListener(new FileDownloadListener() {
+            @Override
+            protected void pending(BaseDownloadTask task, int soFarBytes, int totalBytes) {
+                Log.d(TAG, "download:pending:");
+                callback.pending(name);
+            }
+
+            @Override
+            protected void progress(BaseDownloadTask task, int soFarBytes, int totalBytes) {
+                Log.d(TAG, "download:progress:");
+
+                Notification notification = new NotificationCompat.Builder(context)
+                        .setSmallIcon(R.drawable.ic_cloud_download_black_24dp)
+                        .setContentTitle(context.getText(R.string.downloading))
+                        .setContentText(name)
+                        .setProgress(totalBytes, soFarBytes, false)
+                        .build();
+                notificationManager.notify(name.hashCode(), notification);
+            }
+
+            @Override
+            protected void completed(BaseDownloadTask task) {
+                Log.d(TAG, "download:completed:");
+
+                //notificationManager.cancel(name.hashCode());
+                Notification notification = new NotificationCompat.Builder(context)
+                        .setSmallIcon(R.drawable.ic_cloud_download_black_24dp)
+                        .setContentTitle(context.getText(R.string.downloaded))
+                        .setContentText(name)
+                        .setProgress(100, 100, false)
+                        .build();
+
+                notificationManager.notify(name.hashCode(),notification);
+                File file = new File(task.getTargetFilePath());
+                callback.complete(name, file);
+            }
+
+            @Override
+            protected void paused(BaseDownloadTask task, int soFarBytes, int totalBytes) {
+                Log.d(TAG, "download:paused:");
+
+            }
+
+            @Override
+            protected void error(BaseDownloadTask task, Throwable e) {
+                Log.d(TAG, "download:error:"+e.getLocalizedMessage());
+                callback.error(e.getLocalizedMessage());
+
+            }
+
+            @Override
+            protected void warn(BaseDownloadTask task) {
+                Log.d(TAG, "download:warn:");
+
+            }
+        })
+        .start();
+
+    }
 }
\ No newline at end of file
diff --git a/qpypluginman/src/main/java/com/quseit/common/updater/downloader/Downloader.java b/qpypluginman/src/main/java/com/quseit/common/updater/downloader/Downloader.java
index 0d863326..260db300 100644
--- a/qpypluginman/src/main/java/com/quseit/common/updater/downloader/Downloader.java
+++ b/qpypluginman/src/main/java/com/quseit/common/updater/downloader/Downloader.java
@@ -1,11 +1,15 @@
-package com.quseit.common.updater.downloader;
-
-import java.io.File;
-
-public interface Downloader {
-    void download(String name, String url, Callback callback);
-
-    interface Callback {
-        void complete(String name, File installer);
-    }
-}
+package com.quseit.common.updater.downloader;
+
+import java.io.File;
+
+public interface Downloader {
+    void download(String name, String url, Callback callback);
+
+    void download(String name, String url, String savePath, Callback callback);
+
+    interface Callback {
+        void pending(String name);
+        void complete(String name, File installer);
+        void error(String err);
+    }
+}
diff --git a/qpypluginman/src/main/java/com/quseit/common/updater/service/DefaultService.java b/qpypluginman/src/main/java/com/quseit/common/updater/service/DefaultService.java
index 48cab3b4..3fde70af 100644
--- a/qpypluginman/src/main/java/com/quseit/common/updater/service/DefaultService.java
+++ b/qpypluginman/src/main/java/com/quseit/common/updater/service/DefaultService.java
@@ -1,22 +1,22 @@
-package com.quseit.common.updater.service;
-
-import java.io.IOException;
-
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-
-public class DefaultService implements Service {
-    private final OkHttpClient client;
-
-    public DefaultService() {
-        client = new OkHttpClient();
-    }
-
-    @Override
-    public String request(String url) throws IOException {
-        Request request = new Request.Builder()
-                .url(url)
-                .build();
-        return client.newCall(request).execute().body().string();
-    }
-}
+package com.quseit.common.updater.service;
+
+import java.io.IOException;
+
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+
+public class DefaultService implements Service {
+    private final OkHttpClient client;
+
+    public DefaultService() {
+        client = new OkHttpClient();
+    }
+
+    @Override
+    public String request(String url) throws IOException {
+        Request request = new Request.Builder()
+                .url(url)
+                .build();
+        return client.newCall(request).execute().body().string();
+    }
+}
diff --git a/qpypluginman/src/main/java/com/quseit/common/updater/service/Service.java b/qpypluginman/src/main/java/com/quseit/common/updater/service/Service.java
index 39e6ba85..6690791c 100644
--- a/qpypluginman/src/main/java/com/quseit/common/updater/service/Service.java
+++ b/qpypluginman/src/main/java/com/quseit/common/updater/service/Service.java
@@ -1,7 +1,7 @@
-package com.quseit.common.updater.service;
-
-import java.io.IOException;
-
-public interface Service {
-    String request(String url) throws IOException;
-}
+package com.quseit.common.updater.service;
+
+import java.io.IOException;
+
+public interface Service {
+    String request(String url) throws IOException;
+}
diff --git a/qpypluginman/src/main/java/com/quseit/common/updater/updatepkg/Apk.java b/qpypluginman/src/main/java/com/quseit/common/updater/updatepkg/Apk.java
index 7a9d47cc..55c3a465 100644
--- a/qpypluginman/src/main/java/com/quseit/common/updater/updatepkg/Apk.java
+++ b/qpypluginman/src/main/java/com/quseit/common/updater/updatepkg/Apk.java
@@ -1,70 +1,70 @@
-package com.quseit.common.updater.updatepkg;
-
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
-import android.net.Uri;
-
-import com.quseit.common.updater.Updater;
-
-import java.io.File;
-
-public class Apk implements UpdatePackage {
-    private String name;
-    private String version;
-    private int versionCode;
-    private String description;
-    private String url;
-
-    public Apk(String name, String version, int versionCode, String description, String url) {
-        this.name = name;
-        this.version = version;
-        this.versionCode = versionCode;
-        this.description = description;
-        this.url = url;
-    }
-
-    @Override
-    public String getName() {
-        return this.name;
-    }
-
-    @Override
-    public String getVersion() {
-        return String.valueOf(this.version);
-    }
-
-    public String getVersionDescription() {
-        return this.description;
-    }
-
-    @Override
-    public String getDownloadUrl() {
-        return this.url;
-    }
-
-    @Override
-    public boolean checkVersion() {
-        Context context = Updater.getContext();
-        PackageManager packageManager = context.getPackageManager();
-        PackageInfo packageInfo = null;
-        try {
-            packageInfo = packageManager.getPackageInfo(context.getPackageName(), 0);
-
-        } catch (PackageManager.NameNotFoundException e) {
-            e.printStackTrace();
-        }
-        int localVersion = packageInfo.versionCode;
-        return this.versionCode > localVersion;
-    }
-
-    @Override
-    public void install(File installFile) {
-        Uri uri = Uri.fromFile(installFile);
-        Intent intent = new Intent(Intent.ACTION_VIEW);
-        intent.setDataAndType(uri, "application/vnd.android.package-archive");
-        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        Updater.getContext().startActivity(intent);
-    }
-}
+package com.quseit.common.updater.updatepkg;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.net.Uri;
+
+import com.quseit.common.updater.Updater;
+
+import java.io.File;
+
+public class Apk implements UpdatePackage {
+    private String name;
+    private String version;
+    private int versionCode;
+    private String description;
+    private String url;
+
+    public Apk(String name, String version, int versionCode, String description, String url) {
+        this.name = name;
+        this.version = version;
+        this.versionCode = versionCode;
+        this.description = description;
+        this.url = url;
+    }
+
+    @Override
+    public String getName() {
+        return this.name;
+    }
+
+    @Override
+    public String getVersion() {
+        return String.valueOf(this.version);
+    }
+
+    public String getVersionDescription() {
+        return this.description;
+    }
+
+    @Override
+    public String getDownloadUrl() {
+        return this.url;
+    }
+
+    @Override
+    public boolean checkVersion() {
+        Context context = Updater.getContext();
+        PackageManager packageManager = context.getPackageManager();
+        PackageInfo packageInfo = null;
+        try {
+            packageInfo = packageManager.getPackageInfo(context.getPackageName(), 0);
+
+        } catch (PackageManager.NameNotFoundException e) {
+            e.printStackTrace();
+        }
+        int localVersion = packageInfo.versionCode;
+        return this.versionCode > localVersion;
+    }
+
+    @Override
+    public void install(File installFile) {
+        Uri uri = Uri.fromFile(installFile);
+        Intent intent = new Intent(Intent.ACTION_VIEW);
+        intent.setDataAndType(uri, "application/vnd.android.package-archive");
+        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        Updater.getContext().startActivity(intent);
+    }
+}
diff --git a/qpypluginman/src/main/java/com/quseit/common/updater/updatepkg/UpdatePackage.java b/qpypluginman/src/main/java/com/quseit/common/updater/updatepkg/UpdatePackage.java
index cf5d1d49..e274e6fe 100644
--- a/qpypluginman/src/main/java/com/quseit/common/updater/updatepkg/UpdatePackage.java
+++ b/qpypluginman/src/main/java/com/quseit/common/updater/updatepkg/UpdatePackage.java
@@ -1,18 +1,18 @@
-package com.quseit.common.updater.updatepkg;
-
-import java.io.File;
-
-public interface UpdatePackage {
-
-    String getName();
-
-    String getVersion();
-
-    String getVersionDescription();
-
-    String getDownloadUrl();
-
-    boolean checkVersion();
-
-    void install(File file);
-}
+package com.quseit.common.updater.updatepkg;
+
+import java.io.File;
+
+public interface UpdatePackage {
+
+    String getName();
+
+    String getVersion();
+
+    String getVersionDescription();
+
+    String getDownloadUrl();
+
+    boolean checkVersion();
+
+    void install(File file);
+}
diff --git a/qpypluginman/src/main/res/values-zh-rCn/strings.xml b/qpypluginman/src/main/res/values-zh-rCn/strings.xml
index 45c4ec6c..a2154f42 100644
--- a/qpypluginman/src/main/res/values-zh-rCn/strings.xml
+++ b/qpypluginman/src/main/res/values-zh-rCn/strings.xml
@@ -1,11 +1,11 @@
-<resources>
-    <string name="check_update_error">检查更新失败</string>
-    <string name="latest_version">您的应用已经是最新版本</string>
-    <string name="reminder">提示</string>
-    <string name="has_update">应用有更新</string>
-    <string name="update">更新</string>
-    <string name="show_detail">显示详情</string>
-    <string name="cancel">取消</string>
-    <string name="downloading">正在下载</string>
-    <string name="download_complete">下载完成</string>
-</resources>
+<resources>
+    <string name="check_update_error">检查更新失败</string>
+    <string name="latest_version">您的应用已经是最新版本</string>
+    <string name="has_update">应用有更新</string>
+    <string name="update">更新</string>
+    <string name="show_detail">显示详情</string>
+    <string name="cancel">取消</string>
+    <string name="downloading">正在下载</string>
+    <string name="downloaded">下载完成</string>
+
+</resources>
diff --git a/qpypluginman/src/main/res/values-zh-rTW/strings.xml b/qpypluginman/src/main/res/values-zh-rTW/strings.xml
new file mode 100644
index 00000000..bc9f6cf0
--- /dev/null
+++ b/qpypluginman/src/main/res/values-zh-rTW/strings.xml
@@ -0,0 +1,11 @@
+<resources>
+    <string name="check_update_error">檢查更新失敗</string>
+    <string name="latest_version">已經更新</string>
+    <string name="reminder">提示</string>
+    <string name="has_update">有可使用的新版本</string>
+    <string name="update">更新</string>
+    <string name="show_detail">顯示詳細內容</string>
+    <string name="cancel">取消</string>
+    <string name="downloading">正在下載</string>
+    <string name="download_complete">已下載</string>
+</resources>
diff --git a/qpypluginman/src/main/res/values/strings.xml b/qpypluginman/src/main/res/values/strings.xml
index 53689eaf..f700bcae 100644
--- a/qpypluginman/src/main/res/values/strings.xml
+++ b/qpypluginman/src/main/res/values/strings.xml
@@ -1,11 +1,11 @@
-<resources>
-    <string name="check_update_error">Check update fail</string>
-    <string name="latest_version">Already update</string>
-    <string name="reminder">Hint</string>
-    <string name="has_update">New version available</string>
-    <string name="update">Update</string>
-    <string name="show_detail">Show detail</string>
-    <string name="cancel">Cancel</string>
-    <string name="downloading">Downloading</string>
-    <string name="download_complete">Downloaded</string>
-</resources>
+<resources>
+    <string name="check_update_error">Check update fail</string>
+    <string name="latest_version">Already update</string>
+    <string name="has_update">New version available</string>
+    <string name="update">Update</string>
+    <string name="show_detail">Show detail</string>
+    <string name="cancel">Cancel</string>
+    <string name="downloading">Downloading</string>
+    <string name="downloaded">Completed</string>
+
+</resources>
diff --git a/qpysdk/.gitignore b/qpysdk/.gitignore
deleted file mode 100644
index f0a3a345..00000000
--- a/qpysdk/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-*.iml
-.gradle
-build
-.idea
-gradle
-.DS_Store
diff --git a/qpysdk/build.gradle b/qpysdk/build.gradle
index a0333849..deab3e87 100644
--- a/qpysdk/build.gradle
+++ b/qpysdk/build.gradle
@@ -1,18 +1,17 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion '25.0.0'
+    compileSdkVersion rootProject.ext.compileSdkVersion
+    buildToolsVersion rootProject.ext.buildToolsVersion
 
     defaultConfig {
-        minSdkVersion 15
-        targetSdkVersion 23
+        minSdkVersion rootProject.ext.minSdkVersion
+        targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 1
         versionName "1.0"
 
         ndk {
-            moduleName "com_googlecode_android_scripting_Exec"
-            ldLibs "log"
+            abiFilters 'armeabi-v7a',"arm64-v8a"
         }
     }
     buildTypes {
@@ -21,10 +20,26 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    externalNativeBuild {
+        ndkBuild {
+            path 'src/main/jni/Android.mk'
+        }
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    lintOptions {
+        abortOnError false
+    }
 }
 
+
 dependencies {
-    //compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile files('libs/locale_platform.jar')
-    compile 'com.google.guava:guava:18.0'
+//    api fileTree(dir: 'libs', include: ['*.jar'])
+//    api files('libs/locale_platform.jar')
+    api rootProject.ext.libGoogleGuava
+    api project(':qbaselib')
+    api project(':qpysl4a')
 }
diff --git a/qpysdk/src/main/AndroidManifest.xml b/qpysdk/src/main/AndroidManifest.xml
index f50fef40..7ec0ded8 100644
--- a/qpysdk/src/main/AndroidManifest.xml
+++ b/qpysdk/src/main/AndroidManifest.xml
@@ -1,11 +1,11 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.quseit.qpyengine">
 
-    <application
-        android:allowBackup="true"
-        android:label="@string/app_name"
-        android:supportsRtl="true">
+    <!--<application-->
+        <!--android:allowBackup="true"-->
+        <!--android:label="@string/app_name"-->
+        <!--android:supportsRtl="true">-->
 
-    </application>
+    <!--</application>-->
 
 </manifest>
diff --git a/qpysdk/src/main/assets/QPy_WebApp b/qpysdk/src/main/assets/QPy_WebApp
deleted file mode 100644
index 682d292c..00000000
--- a/qpysdk/src/main/assets/QPy_WebApp
+++ /dev/null
@@ -1,70 +0,0 @@
-#-*-coding:utf-8-*-
-#qpy:webapp:WebAppSample
-#qpy://127.0.0.1:8080/
-"""
-This is a sample of WebApp
-
-@Author river
-"""
-
-from bottle import Bottle, ServerAdapter
-from bottle import run, debug, route, error, static_file, template, redirect
-
-import urllib2
-import os
-import json
-#### 常量定义 #########
-ASSETS = "/assets/"
-ROOT = os.path.dirname(os.path.abspath(__file__))
-
-
-######### QPYTHON WEB SERVER ###############
-
-class MyWSGIRefServer(ServerAdapter):
-    server = None
-
-    def run(self, handler):
-        from wsgiref.simple_server import make_server, WSGIRequestHandler
-        if self.quiet:
-            class QuietHandler(WSGIRequestHandler):
-                def log_request(*args, **kw): pass
-            self.options['handler_class'] = QuietHandler
-        self.server = make_server(self.host, self.port, handler, **self.options)
-        self.server.serve_forever()
-
-    def stop(self):
-        #sys.stderr.close()
-        import threading 
-        threading.Thread(target=self.server.shutdown).start() 
-        #self.server.shutdown()
-        self.server.server_close() 
-        print "# QWEBAPPEND"
-
-
-######### BUILT-IN ROUTERS ###############
-def __exit():
-    global server
-    server.stop()
-
-def __ping():
-    return "ok"
-
-def server_static(filepath):
-    return static_file(filepath, root=ROOT+'/assets')
-
-def home():
-    return "This is a QPython's WebApp"
-
-
-######### WEBAPP ROUTERS ###############
-app = Bottle()
-app.route('/', method='GET')(home)
-app.route('/__exit', method=['GET','HEAD'])(__exit)
-app.route('/__ping', method=['GET','HEAD'])(__ping)
-app.route('/assets/:filepath', method='GET')(server_static)
-
-try:
-    server = MyWSGIRefServer(host="127.0.0.1", port="8080")
-    app.run(server=server,reloader=False)
-except Exception,ex:
-    print "Exception: %s" % repr(ex)
diff --git a/qpysdk/src/main/assets/html/index.html b/qpysdk/src/main/assets/html/index.html
index 2283e77a..aee35474 100644
--- a/qpysdk/src/main/assets/html/index.html
+++ b/qpysdk/src/main/assets/html/index.html
@@ -4,7 +4,7 @@
     <style>
         .loading div{
         position: relative;
-        top:40px;
+        top:240px;
         width: 8px;
         height: 8px;
         border-radius: 8px;
@@ -20,7 +20,7 @@
 <meta name="apple-mobile-web-app-status-bar-style" content="black">
 <title>MIAndLib WebView</title>
 <link rel="stylesheet" type="text/css" href="../stylesheets/css/style.css" />
-<script type="text/javascript" src="../stylesheets/js/jquery.js"></script>
+<script type="text/javascript" src="../stylesheets/js/jquery.min.js"></script>
 <!--script type="text/javascript" src="../android.js"></script>
 <script type="text/javascript" src="../json2.js"></script-->
 
diff --git a/qpysdk/src/main/assets/html/index.js b/qpysdk/src/main/assets/html/index.js
index 58599db6..3b27247a 100644
--- a/qpysdk/src/main/assets/html/index.js
+++ b/qpysdk/src/main/assets/html/index.js
@@ -3,12 +3,12 @@ function gotoApp() {
 	total = total+1
 	if (total>=10) {
 		//setTimeout('milib.closeWait()',100);
-	    $('#mainEle').html('<div id="loading">Error: Web App failed to start,<br />retry or <a href="javascript:milib.showLog()">check the log</a>.</div>');
-	
+	    $('#mainEle').html('<div id="loading">Fail to start QPyWebapp, please check manually.</div>');
+	    milib.onNext("timeout");
+
 	} else {
 	 	if (milib.isSrvOk("")) {
 	    	setTimeout('window.location=milib.getSrv()',100);
-	    	
 		} else {
 			if (total<15) {
 		    	setTimeout('gotoApp()',3000);
@@ -23,8 +23,7 @@ function gotoApp() {
     milib.loadConsole("");
 
     gotoApp();
-    
-    
+
     /*var droid = new AndroidHelper();
     droid.makeToast('HelloWorld')*/
 }
diff --git a/qpysdk/src/main/assets/private.mp3 b/qpysdk/src/main/assets/private.mp3
deleted file mode 100644
index f1e5d007..00000000
Binary files a/qpysdk/src/main/assets/private.mp3 and /dev/null differ
diff --git a/qpysdk/src/main/assets/stylesheets/css/bootstrap.min.css b/qpysdk/src/main/assets/stylesheets/css/bootstrap.min.css
new file mode 100644
index 00000000..88269128
--- /dev/null
+++ b/qpysdk/src/main/assets/stylesheets/css/bootstrap.min.css
@@ -0,0 +1,7 @@
+/*!
+ * Bootstrap v4.1.3 (https://getbootstrap.com/)
+ * Copyright 2011-2018 The Bootstrap Authors
+ * Copyright 2011-2018 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ */:root{--blue:#007bff;--indigo:#6610f2;--purple:#6f42c1;--pink:#e83e8c;--red:#dc3545;--orange:#fd7e14;--yellow:#ffc107;--green:#28a745;--teal:#20c997;--cyan:#17a2b8;--white:#fff;--gray:#6c757d;--gray-dark:#343a40;--primary:#007bff;--secondary:#6c757d;--success:#28a745;--info:#17a2b8;--warning:#ffc107;--danger:#dc3545;--light:#f8f9fa;--dark:#343a40;--breakpoint-xs:0;--breakpoint-sm:576px;--breakpoint-md:768px;--breakpoint-lg:992px;--breakpoint-xl:1200px;--font-family-sans-serif:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji";--font-family-monospace:SFMono-Regular,Menlo,Monaco,Consolas,"Liberation Mono","Courier New",monospace}*,::after,::before{box-sizing:border-box}html{font-family:sans-serif;line-height:1.15;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;-ms-overflow-style:scrollbar;-webkit-tap-highlight-color:transparent}@-ms-viewport{width:device-width}article,aside,figcaption,figure,footer,header,hgroup,main,nav,section{display:block}body{margin:0;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji";font-size:1rem;font-weight:400;line-height:1.5;color:#212529;text-align:left;background-color:#fff}[tabindex="-1"]:focus{outline:0!important}hr{box-sizing:content-box;height:0;overflow:visible}h1,h2,h3,h4,h5,h6{margin-top:0;margin-bottom:.5rem}p{margin-top:0;margin-bottom:1rem}abbr[data-original-title],abbr[title]{text-decoration:underline;-webkit-text-decoration:underline dotted;text-decoration:underline dotted;cursor:help;border-bottom:0}address{margin-bottom:1rem;font-style:normal;line-height:inherit}dl,ol,ul{margin-top:0;margin-bottom:1rem}ol ol,ol ul,ul ol,ul ul{margin-bottom:0}dt{font-weight:700}dd{margin-bottom:.5rem;margin-left:0}blockquote{margin:0 0 1rem}dfn{font-style:italic}b,strong{font-weight:bolder}small{font-size:80%}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sub{bottom:-.25em}sup{top:-.5em}a{color:#007bff;text-decoration:none;background-color:transparent;-webkit-text-decoration-skip:objects}a:hover{color:#0056b3;text-decoration:underline}a:not([href]):not([tabindex]){color:inherit;text-decoration:none}a:not([href]):not([tabindex]):focus,a:not([href]):not([tabindex]):hover{color:inherit;text-decoration:none}a:not([href]):not([tabindex]):focus{outline:0}code,kbd,pre,samp{font-family:SFMono-Regular,Menlo,Monaco,Consolas,"Liberation Mono","Courier New",monospace;font-size:1em}pre{margin-top:0;margin-bottom:1rem;overflow:auto;-ms-overflow-style:scrollbar}figure{margin:0 0 1rem}img{vertical-align:middle;border-style:none}svg{overflow:hidden;vertical-align:middle}table{border-collapse:collapse}caption{padding-top:.75rem;padding-bottom:.75rem;color:#6c757d;text-align:left;caption-side:bottom}th{text-align:inherit}label{display:inline-block;margin-bottom:.5rem}button{border-radius:0}button:focus{outline:1px dotted;outline:5px auto -webkit-focus-ring-color}button,input,optgroup,select,textarea{margin:0;font-family:inherit;font-size:inherit;line-height:inherit}button,input{overflow:visible}button,select{text-transform:none}[type=reset],[type=submit],button,html [type=button]{-webkit-appearance:button}[type=button]::-moz-focus-inner,[type=reset]::-moz-focus-inner,[type=submit]::-moz-focus-inner,button::-moz-focus-inner{padding:0;border-style:none}input[type=checkbox],input[type=radio]{box-sizing:border-box;padding:0}input[type=date],input[type=datetime-local],input[type=month],input[type=time]{-webkit-appearance:listbox}textarea{overflow:auto;resize:vertical}fieldset{min-width:0;padding:0;margin:0;border:0}legend{display:block;width:100%;max-width:100%;padding:0;margin-bottom:.5rem;font-size:1.5rem;line-height:inherit;color:inherit;white-space:normal}progress{vertical-align:baseline}[type=number]::-webkit-inner-spin-button,[type=number]::-webkit-outer-spin-button{height:auto}[type=search]{outline-offset:-2px;-webkit-appearance:none}[type=search]::-webkit-search-cancel-button,[type=search]::-webkit-search-decoration{-webkit-appearance:none}::-webkit-file-upload-button{font:inherit;-webkit-appearance:button}output{display:inline-block}summary{display:list-item;cursor:pointer}template{display:none}[hidden]{display:none!important}.h1,.h2,.h3,.h4,.h5,.h6,h1,h2,h3,h4,h5,h6{margin-bottom:.5rem;font-family:inherit;font-weight:500;line-height:1.2;color:inherit}.h1,h1{font-size:2.5rem}.h2,h2{font-size:2rem}.h3,h3{font-size:1.75rem}.h4,h4{font-size:1.5rem}.h5,h5{font-size:1.25rem}.h6,h6{font-size:1rem}.lead{font-size:1.25rem;font-weight:300}.display-1{font-size:6rem;font-weight:300;line-height:1.2}.display-2{font-size:5.5rem;font-weight:300;line-height:1.2}.display-3{font-size:4.5rem;font-weight:300;line-height:1.2}.display-4{font-size:3.5rem;font-weight:300;line-height:1.2}hr{margin-top:1rem;margin-bottom:1rem;border:0;border-top:1px solid rgba(0,0,0,.1)}.small,small{font-size:80%;font-weight:400}.mark,mark{padding:.2em;background-color:#fcf8e3}.list-unstyled{padding-left:0;list-style:none}.list-inline{padding-left:0;list-style:none}.list-inline-item{display:inline-block}.list-inline-item:not(:last-child){margin-right:.5rem}.initialism{font-size:90%;text-transform:uppercase}.blockquote{margin-bottom:1rem;font-size:1.25rem}.blockquote-footer{display:block;font-size:80%;color:#6c757d}.blockquote-footer::before{content:"\2014 \00A0"}.img-fluid{max-width:100%;height:auto}.img-thumbnail{padding:.25rem;background-color:#fff;border:1px solid #dee2e6;border-radius:.25rem;max-width:100%;height:auto}.figure{display:inline-block}.figure-img{margin-bottom:.5rem;line-height:1}.figure-caption{font-size:90%;color:#6c757d}code{font-size:87.5%;color:#e83e8c;word-break:break-word}a>code{color:inherit}kbd{padding:.2rem .4rem;font-size:87.5%;color:#fff;background-color:#212529;border-radius:.2rem}kbd kbd{padding:0;font-size:100%;font-weight:700}pre{display:block;font-size:87.5%;color:#212529}pre code{font-size:inherit;color:inherit;word-break:normal}.pre-scrollable{max-height:340px;overflow-y:scroll}.container{width:100%;padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}@media (min-width:576px){.container{max-width:540px}}@media (min-width:768px){.container{max-width:720px}}@media (min-width:992px){.container{max-width:960px}}@media (min-width:1200px){.container{max-width:1140px}}.container-fluid{width:100%;padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}.row{display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;margin-right:-15px;margin-left:-15px}.no-gutters{margin-right:0;margin-left:0}.no-gutters>.col,.no-gutters>[class*=col-]{padding-right:0;padding-left:0}.col,.col-1,.col-10,.col-11,.col-12,.col-2,.col-3,.col-4,.col-5,.col-6,.col-7,.col-8,.col-9,.col-auto,.col-lg,.col-lg-1,.col-lg-10,.col-lg-11,.col-lg-12,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9,.col-lg-auto,.col-md,.col-md-1,.col-md-10,.col-md-11,.col-md-12,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9,.col-md-auto,.col-sm,.col-sm-1,.col-sm-10,.col-sm-11,.col-sm-12,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9,.col-sm-auto,.col-xl,.col-xl-1,.col-xl-10,.col-xl-11,.col-xl-12,.col-xl-2,.col-xl-3,.col-xl-4,.col-xl-5,.col-xl-6,.col-xl-7,.col-xl-8,.col-xl-9,.col-xl-auto{position:relative;width:100%;min-height:1px;padding-right:15px;padding-left:15px}.col{-ms-flex-preferred-size:0;flex-basis:0;-ms-flex-positive:1;flex-grow:1;max-width:100%}.col-auto{-ms-flex:0 0 auto;flex:0 0 auto;width:auto;max-width:none}.col-1{-ms-flex:0 0 8.333333%;flex:0 0 8.333333%;max-width:8.333333%}.col-2{-ms-flex:0 0 16.666667%;flex:0 0 16.666667%;max-width:16.666667%}.col-3{-ms-flex:0 0 25%;flex:0 0 25%;max-width:25%}.col-4{-ms-flex:0 0 33.333333%;flex:0 0 33.333333%;max-width:33.333333%}.col-5{-ms-flex:0 0 41.666667%;flex:0 0 41.666667%;max-width:41.666667%}.col-6{-ms-flex:0 0 50%;flex:0 0 50%;max-width:50%}.col-7{-ms-flex:0 0 58.333333%;flex:0 0 58.333333%;max-width:58.333333%}.col-8{-ms-flex:0 0 66.666667%;flex:0 0 66.666667%;max-width:66.666667%}.col-9{-ms-flex:0 0 75%;flex:0 0 75%;max-width:75%}.col-10{-ms-flex:0 0 83.333333%;flex:0 0 83.333333%;max-width:83.333333%}.col-11{-ms-flex:0 0 91.666667%;flex:0 0 91.666667%;max-width:91.666667%}.col-12{-ms-flex:0 0 100%;flex:0 0 100%;max-width:100%}.order-first{-ms-flex-order:-1;order:-1}.order-last{-ms-flex-order:13;order:13}.order-0{-ms-flex-order:0;order:0}.order-1{-ms-flex-order:1;order:1}.order-2{-ms-flex-order:2;order:2}.order-3{-ms-flex-order:3;order:3}.order-4{-ms-flex-order:4;order:4}.order-5{-ms-flex-order:5;order:5}.order-6{-ms-flex-order:6;order:6}.order-7{-ms-flex-order:7;order:7}.order-8{-ms-flex-order:8;order:8}.order-9{-ms-flex-order:9;order:9}.order-10{-ms-flex-order:10;order:10}.order-11{-ms-flex-order:11;order:11}.order-12{-ms-flex-order:12;order:12}.offset-1{margin-left:8.333333%}.offset-2{margin-left:16.666667%}.offset-3{margin-left:25%}.offset-4{margin-left:33.333333%}.offset-5{margin-left:41.666667%}.offset-6{margin-left:50%}.offset-7{margin-left:58.333333%}.offset-8{margin-left:66.666667%}.offset-9{margin-left:75%}.offset-10{margin-left:83.333333%}.offset-11{margin-left:91.666667%}@media (min-width:576px){.col-sm{-ms-flex-preferred-size:0;flex-basis:0;-ms-flex-positive:1;flex-grow:1;max-width:100%}.col-sm-auto{-ms-flex:0 0 auto;flex:0 0 auto;width:auto;max-width:none}.col-sm-1{-ms-flex:0 0 8.333333%;flex:0 0 8.333333%;max-width:8.333333%}.col-sm-2{-ms-flex:0 0 16.666667%;flex:0 0 16.666667%;max-width:16.666667%}.col-sm-3{-ms-flex:0 0 25%;flex:0 0 25%;max-width:25%}.col-sm-4{-ms-flex:0 0 33.333333%;flex:0 0 33.333333%;max-width:33.333333%}.col-sm-5{-ms-flex:0 0 41.666667%;flex:0 0 41.666667%;max-width:41.666667%}.col-sm-6{-ms-flex:0 0 50%;flex:0 0 50%;max-width:50%}.col-sm-7{-ms-flex:0 0 58.333333%;flex:0 0 58.333333%;max-width:58.333333%}.col-sm-8{-ms-flex:0 0 66.666667%;flex:0 0 66.666667%;max-width:66.666667%}.col-sm-9{-ms-flex:0 0 75%;flex:0 0 75%;max-width:75%}.col-sm-10{-ms-flex:0 0 83.333333%;flex:0 0 83.333333%;max-width:83.333333%}.col-sm-11{-ms-flex:0 0 91.666667%;flex:0 0 91.666667%;max-width:91.666667%}.col-sm-12{-ms-flex:0 0 100%;flex:0 0 100%;max-width:100%}.order-sm-first{-ms-flex-order:-1;order:-1}.order-sm-last{-ms-flex-order:13;order:13}.order-sm-0{-ms-flex-order:0;order:0}.order-sm-1{-ms-flex-order:1;order:1}.order-sm-2{-ms-flex-order:2;order:2}.order-sm-3{-ms-flex-order:3;order:3}.order-sm-4{-ms-flex-order:4;order:4}.order-sm-5{-ms-flex-order:5;order:5}.order-sm-6{-ms-flex-order:6;order:6}.order-sm-7{-ms-flex-order:7;order:7}.order-sm-8{-ms-flex-order:8;order:8}.order-sm-9{-ms-flex-order:9;order:9}.order-sm-10{-ms-flex-order:10;order:10}.order-sm-11{-ms-flex-order:11;order:11}.order-sm-12{-ms-flex-order:12;order:12}.offset-sm-0{margin-left:0}.offset-sm-1{margin-left:8.333333%}.offset-sm-2{margin-left:16.666667%}.offset-sm-3{margin-left:25%}.offset-sm-4{margin-left:33.333333%}.offset-sm-5{margin-left:41.666667%}.offset-sm-6{margin-left:50%}.offset-sm-7{margin-left:58.333333%}.offset-sm-8{margin-left:66.666667%}.offset-sm-9{margin-left:75%}.offset-sm-10{margin-left:83.333333%}.offset-sm-11{margin-left:91.666667%}}@media (min-width:768px){.col-md{-ms-flex-preferred-size:0;flex-basis:0;-ms-flex-positive:1;flex-grow:1;max-width:100%}.col-md-auto{-ms-flex:0 0 auto;flex:0 0 auto;width:auto;max-width:none}.col-md-1{-ms-flex:0 0 8.333333%;flex:0 0 8.333333%;max-width:8.333333%}.col-md-2{-ms-flex:0 0 16.666667%;flex:0 0 16.666667%;max-width:16.666667%}.col-md-3{-ms-flex:0 0 25%;flex:0 0 25%;max-width:25%}.col-md-4{-ms-flex:0 0 33.333333%;flex:0 0 33.333333%;max-width:33.333333%}.col-md-5{-ms-flex:0 0 41.666667%;flex:0 0 41.666667%;max-width:41.666667%}.col-md-6{-ms-flex:0 0 50%;flex:0 0 50%;max-width:50%}.col-md-7{-ms-flex:0 0 58.333333%;flex:0 0 58.333333%;max-width:58.333333%}.col-md-8{-ms-flex:0 0 66.666667%;flex:0 0 66.666667%;max-width:66.666667%}.col-md-9{-ms-flex:0 0 75%;flex:0 0 75%;max-width:75%}.col-md-10{-ms-flex:0 0 83.333333%;flex:0 0 83.333333%;max-width:83.333333%}.col-md-11{-ms-flex:0 0 91.666667%;flex:0 0 91.666667%;max-width:91.666667%}.col-md-12{-ms-flex:0 0 100%;flex:0 0 100%;max-width:100%}.order-md-first{-ms-flex-order:-1;order:-1}.order-md-last{-ms-flex-order:13;order:13}.order-md-0{-ms-flex-order:0;order:0}.order-md-1{-ms-flex-order:1;order:1}.order-md-2{-ms-flex-order:2;order:2}.order-md-3{-ms-flex-order:3;order:3}.order-md-4{-ms-flex-order:4;order:4}.order-md-5{-ms-flex-order:5;order:5}.order-md-6{-ms-flex-order:6;order:6}.order-md-7{-ms-flex-order:7;order:7}.order-md-8{-ms-flex-order:8;order:8}.order-md-9{-ms-flex-order:9;order:9}.order-md-10{-ms-flex-order:10;order:10}.order-md-11{-ms-flex-order:11;order:11}.order-md-12{-ms-flex-order:12;order:12}.offset-md-0{margin-left:0}.offset-md-1{margin-left:8.333333%}.offset-md-2{margin-left:16.666667%}.offset-md-3{margin-left:25%}.offset-md-4{margin-left:33.333333%}.offset-md-5{margin-left:41.666667%}.offset-md-6{margin-left:50%}.offset-md-7{margin-left:58.333333%}.offset-md-8{margin-left:66.666667%}.offset-md-9{margin-left:75%}.offset-md-10{margin-left:83.333333%}.offset-md-11{margin-left:91.666667%}}@media (min-width:992px){.col-lg{-ms-flex-preferred-size:0;flex-basis:0;-ms-flex-positive:1;flex-grow:1;max-width:100%}.col-lg-auto{-ms-flex:0 0 auto;flex:0 0 auto;width:auto;max-width:none}.col-lg-1{-ms-flex:0 0 8.333333%;flex:0 0 8.333333%;max-width:8.333333%}.col-lg-2{-ms-flex:0 0 16.666667%;flex:0 0 16.666667%;max-width:16.666667%}.col-lg-3{-ms-flex:0 0 25%;flex:0 0 25%;max-width:25%}.col-lg-4{-ms-flex:0 0 33.333333%;flex:0 0 33.333333%;max-width:33.333333%}.col-lg-5{-ms-flex:0 0 41.666667%;flex:0 0 41.666667%;max-width:41.666667%}.col-lg-6{-ms-flex:0 0 50%;flex:0 0 50%;max-width:50%}.col-lg-7{-ms-flex:0 0 58.333333%;flex:0 0 58.333333%;max-width:58.333333%}.col-lg-8{-ms-flex:0 0 66.666667%;flex:0 0 66.666667%;max-width:66.666667%}.col-lg-9{-ms-flex:0 0 75%;flex:0 0 75%;max-width:75%}.col-lg-10{-ms-flex:0 0 83.333333%;flex:0 0 83.333333%;max-width:83.333333%}.col-lg-11{-ms-flex:0 0 91.666667%;flex:0 0 91.666667%;max-width:91.666667%}.col-lg-12{-ms-flex:0 0 100%;flex:0 0 100%;max-width:100%}.order-lg-first{-ms-flex-order:-1;order:-1}.order-lg-last{-ms-flex-order:13;order:13}.order-lg-0{-ms-flex-order:0;order:0}.order-lg-1{-ms-flex-order:1;order:1}.order-lg-2{-ms-flex-order:2;order:2}.order-lg-3{-ms-flex-order:3;order:3}.order-lg-4{-ms-flex-order:4;order:4}.order-lg-5{-ms-flex-order:5;order:5}.order-lg-6{-ms-flex-order:6;order:6}.order-lg-7{-ms-flex-order:7;order:7}.order-lg-8{-ms-flex-order:8;order:8}.order-lg-9{-ms-flex-order:9;order:9}.order-lg-10{-ms-flex-order:10;order:10}.order-lg-11{-ms-flex-order:11;order:11}.order-lg-12{-ms-flex-order:12;order:12}.offset-lg-0{margin-left:0}.offset-lg-1{margin-left:8.333333%}.offset-lg-2{margin-left:16.666667%}.offset-lg-3{margin-left:25%}.offset-lg-4{margin-left:33.333333%}.offset-lg-5{margin-left:41.666667%}.offset-lg-6{margin-left:50%}.offset-lg-7{margin-left:58.333333%}.offset-lg-8{margin-left:66.666667%}.offset-lg-9{margin-left:75%}.offset-lg-10{margin-left:83.333333%}.offset-lg-11{margin-left:91.666667%}}@media (min-width:1200px){.col-xl{-ms-flex-preferred-size:0;flex-basis:0;-ms-flex-positive:1;flex-grow:1;max-width:100%}.col-xl-auto{-ms-flex:0 0 auto;flex:0 0 auto;width:auto;max-width:none}.col-xl-1{-ms-flex:0 0 8.333333%;flex:0 0 8.333333%;max-width:8.333333%}.col-xl-2{-ms-flex:0 0 16.666667%;flex:0 0 16.666667%;max-width:16.666667%}.col-xl-3{-ms-flex:0 0 25%;flex:0 0 25%;max-width:25%}.col-xl-4{-ms-flex:0 0 33.333333%;flex:0 0 33.333333%;max-width:33.333333%}.col-xl-5{-ms-flex:0 0 41.666667%;flex:0 0 41.666667%;max-width:41.666667%}.col-xl-6{-ms-flex:0 0 50%;flex:0 0 50%;max-width:50%}.col-xl-7{-ms-flex:0 0 58.333333%;flex:0 0 58.333333%;max-width:58.333333%}.col-xl-8{-ms-flex:0 0 66.666667%;flex:0 0 66.666667%;max-width:66.666667%}.col-xl-9{-ms-flex:0 0 75%;flex:0 0 75%;max-width:75%}.col-xl-10{-ms-flex:0 0 83.333333%;flex:0 0 83.333333%;max-width:83.333333%}.col-xl-11{-ms-flex:0 0 91.666667%;flex:0 0 91.666667%;max-width:91.666667%}.col-xl-12{-ms-flex:0 0 100%;flex:0 0 100%;max-width:100%}.order-xl-first{-ms-flex-order:-1;order:-1}.order-xl-last{-ms-flex-order:13;order:13}.order-xl-0{-ms-flex-order:0;order:0}.order-xl-1{-ms-flex-order:1;order:1}.order-xl-2{-ms-flex-order:2;order:2}.order-xl-3{-ms-flex-order:3;order:3}.order-xl-4{-ms-flex-order:4;order:4}.order-xl-5{-ms-flex-order:5;order:5}.order-xl-6{-ms-flex-order:6;order:6}.order-xl-7{-ms-flex-order:7;order:7}.order-xl-8{-ms-flex-order:8;order:8}.order-xl-9{-ms-flex-order:9;order:9}.order-xl-10{-ms-flex-order:10;order:10}.order-xl-11{-ms-flex-order:11;order:11}.order-xl-12{-ms-flex-order:12;order:12}.offset-xl-0{margin-left:0}.offset-xl-1{margin-left:8.333333%}.offset-xl-2{margin-left:16.666667%}.offset-xl-3{margin-left:25%}.offset-xl-4{margin-left:33.333333%}.offset-xl-5{margin-left:41.666667%}.offset-xl-6{margin-left:50%}.offset-xl-7{margin-left:58.333333%}.offset-xl-8{margin-left:66.666667%}.offset-xl-9{margin-left:75%}.offset-xl-10{margin-left:83.333333%}.offset-xl-11{margin-left:91.666667%}}.table{width:100%;margin-bottom:1rem;background-color:transparent}.table td,.table th{padding:.75rem;vertical-align:top;border-top:1px solid #dee2e6}.table thead th{vertical-align:bottom;border-bottom:2px solid #dee2e6}.table tbody+tbody{border-top:2px solid #dee2e6}.table .table{background-color:#fff}.table-sm td,.table-sm th{padding:.3rem}.table-bordered{border:1px solid #dee2e6}.table-bordered td,.table-bordered th{border:1px solid #dee2e6}.table-bordered thead td,.table-bordered thead th{border-bottom-width:2px}.table-borderless tbody+tbody,.table-borderless td,.table-borderless th,.table-borderless thead th{border:0}.table-striped tbody tr:nth-of-type(odd){background-color:rgba(0,0,0,.05)}.table-hover tbody tr:hover{background-color:rgba(0,0,0,.075)}.table-primary,.table-primary>td,.table-primary>th{background-color:#b8daff}.table-hover .table-primary:hover{background-color:#9fcdff}.table-hover .table-primary:hover>td,.table-hover .table-primary:hover>th{background-color:#9fcdff}.table-secondary,.table-secondary>td,.table-secondary>th{background-color:#d6d8db}.table-hover .table-secondary:hover{background-color:#c8cbcf}.table-hover .table-secondary:hover>td,.table-hover .table-secondary:hover>th{background-color:#c8cbcf}.table-success,.table-success>td,.table-success>th{background-color:#c3e6cb}.table-hover .table-success:hover{background-color:#b1dfbb}.table-hover .table-success:hover>td,.table-hover .table-success:hover>th{background-color:#b1dfbb}.table-info,.table-info>td,.table-info>th{background-color:#bee5eb}.table-hover .table-info:hover{background-color:#abdde5}.table-hover .table-info:hover>td,.table-hover .table-info:hover>th{background-color:#abdde5}.table-warning,.table-warning>td,.table-warning>th{background-color:#ffeeba}.table-hover .table-warning:hover{background-color:#ffe8a1}.table-hover .table-warning:hover>td,.table-hover .table-warning:hover>th{background-color:#ffe8a1}.table-danger,.table-danger>td,.table-danger>th{background-color:#f5c6cb}.table-hover .table-danger:hover{background-color:#f1b0b7}.table-hover .table-danger:hover>td,.table-hover .table-danger:hover>th{background-color:#f1b0b7}.table-light,.table-light>td,.table-light>th{background-color:#fdfdfe}.table-hover .table-light:hover{background-color:#ececf6}.table-hover .table-light:hover>td,.table-hover .table-light:hover>th{background-color:#ececf6}.table-dark,.table-dark>td,.table-dark>th{background-color:#c6c8ca}.table-hover .table-dark:hover{background-color:#b9bbbe}.table-hover .table-dark:hover>td,.table-hover .table-dark:hover>th{background-color:#b9bbbe}.table-active,.table-active>td,.table-active>th{background-color:rgba(0,0,0,.075)}.table-hover .table-active:hover{background-color:rgba(0,0,0,.075)}.table-hover .table-active:hover>td,.table-hover .table-active:hover>th{background-color:rgba(0,0,0,.075)}.table .thead-dark th{color:#fff;background-color:#212529;border-color:#32383e}.table .thead-light th{color:#495057;background-color:#e9ecef;border-color:#dee2e6}.table-dark{color:#fff;background-color:#212529}.table-dark td,.table-dark th,.table-dark thead th{border-color:#32383e}.table-dark.table-bordered{border:0}.table-dark.table-striped tbody tr:nth-of-type(odd){background-color:rgba(255,255,255,.05)}.table-dark.table-hover tbody tr:hover{background-color:rgba(255,255,255,.075)}@media (max-width:575.98px){.table-responsive-sm{display:block;width:100%;overflow-x:auto;-webkit-overflow-scrolling:touch;-ms-overflow-style:-ms-autohiding-scrollbar}.table-responsive-sm>.table-bordered{border:0}}@media (max-width:767.98px){.table-responsive-md{display:block;width:100%;overflow-x:auto;-webkit-overflow-scrolling:touch;-ms-overflow-style:-ms-autohiding-scrollbar}.table-responsive-md>.table-bordered{border:0}}@media (max-width:991.98px){.table-responsive-lg{display:block;width:100%;overflow-x:auto;-webkit-overflow-scrolling:touch;-ms-overflow-style:-ms-autohiding-scrollbar}.table-responsive-lg>.table-bordered{border:0}}@media (max-width:1199.98px){.table-responsive-xl{display:block;width:100%;overflow-x:auto;-webkit-overflow-scrolling:touch;-ms-overflow-style:-ms-autohiding-scrollbar}.table-responsive-xl>.table-bordered{border:0}}.table-responsive{display:block;width:100%;overflow-x:auto;-webkit-overflow-scrolling:touch;-ms-overflow-style:-ms-autohiding-scrollbar}.table-responsive>.table-bordered{border:0}.form-control{display:block;width:100%;height:calc(2.25rem + 2px);padding:.375rem .75rem;font-size:1rem;line-height:1.5;color:#495057;background-color:#fff;background-clip:padding-box;border:1px solid #ced4da;border-radius:.25rem;transition:border-color .15s ease-in-out,box-shadow .15s ease-in-out}@media screen and (prefers-reduced-motion:reduce){.form-control{transition:none}}.form-control::-ms-expand{background-color:transparent;border:0}.form-control:focus{color:#495057;background-color:#fff;border-color:#80bdff;outline:0;box-shadow:0 0 0 .2rem rgba(0,123,255,.25)}.form-control::-webkit-input-placeholder{color:#6c757d;opacity:1}.form-control::-moz-placeholder{color:#6c757d;opacity:1}.form-control:-ms-input-placeholder{color:#6c757d;opacity:1}.form-control::-ms-input-placeholder{color:#6c757d;opacity:1}.form-control::placeholder{color:#6c757d;opacity:1}.form-control:disabled,.form-control[readonly]{background-color:#e9ecef;opacity:1}select.form-control:focus::-ms-value{color:#495057;background-color:#fff}.form-control-file,.form-control-range{display:block;width:100%}.col-form-label{padding-top:calc(.375rem + 1px);padding-bottom:calc(.375rem + 1px);margin-bottom:0;font-size:inherit;line-height:1.5}.col-form-label-lg{padding-top:calc(.5rem + 1px);padding-bottom:calc(.5rem + 1px);font-size:1.25rem;line-height:1.5}.col-form-label-sm{padding-top:calc(.25rem + 1px);padding-bottom:calc(.25rem + 1px);font-size:.875rem;line-height:1.5}.form-control-plaintext{display:block;width:100%;padding-top:.375rem;padding-bottom:.375rem;margin-bottom:0;line-height:1.5;color:#212529;background-color:transparent;border:solid transparent;border-width:1px 0}.form-control-plaintext.form-control-lg,.form-control-plaintext.form-control-sm{padding-right:0;padding-left:0}.form-control-sm{height:calc(1.8125rem + 2px);padding:.25rem .5rem;font-size:.875rem;line-height:1.5;border-radius:.2rem}.form-control-lg{height:calc(2.875rem + 2px);padding:.5rem 1rem;font-size:1.25rem;line-height:1.5;border-radius:.3rem}select.form-control[multiple],select.form-control[size]{height:auto}textarea.form-control{height:auto}.form-group{margin-bottom:1rem}.form-text{display:block;margin-top:.25rem}.form-row{display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;margin-right:-5px;margin-left:-5px}.form-row>.col,.form-row>[class*=col-]{padding-right:5px;padding-left:5px}.form-check{position:relative;display:block;padding-left:1.25rem}.form-check-input{position:absolute;margin-top:.3rem;margin-left:-1.25rem}.form-check-input:disabled~.form-check-label{color:#6c757d}.form-check-label{margin-bottom:0}.form-check-inline{display:-ms-inline-flexbox;display:inline-flex;-ms-flex-align:center;align-items:center;padding-left:0;margin-right:.75rem}.form-check-inline .form-check-input{position:static;margin-top:0;margin-right:.3125rem;margin-left:0}.valid-feedback{display:none;width:100%;margin-top:.25rem;font-size:80%;color:#28a745}.valid-tooltip{position:absolute;top:100%;z-index:5;display:none;max-width:100%;padding:.25rem .5rem;margin-top:.1rem;font-size:.875rem;line-height:1.5;color:#fff;background-color:rgba(40,167,69,.9);border-radius:.25rem}.custom-select.is-valid,.form-control.is-valid,.was-validated .custom-select:valid,.was-validated .form-control:valid{border-color:#28a745}.custom-select.is-valid:focus,.form-control.is-valid:focus,.was-validated .custom-select:valid:focus,.was-validated .form-control:valid:focus{border-color:#28a745;box-shadow:0 0 0 .2rem rgba(40,167,69,.25)}.custom-select.is-valid~.valid-feedback,.custom-select.is-valid~.valid-tooltip,.form-control.is-valid~.valid-feedback,.form-control.is-valid~.valid-tooltip,.was-validated .custom-select:valid~.valid-feedback,.was-validated .custom-select:valid~.valid-tooltip,.was-validated .form-control:valid~.valid-feedback,.was-validated .form-control:valid~.valid-tooltip{display:block}.form-control-file.is-valid~.valid-feedback,.form-control-file.is-valid~.valid-tooltip,.was-validated .form-control-file:valid~.valid-feedback,.was-validated .form-control-file:valid~.valid-tooltip{display:block}.form-check-input.is-valid~.form-check-label,.was-validated .form-check-input:valid~.form-check-label{color:#28a745}.form-check-input.is-valid~.valid-feedback,.form-check-input.is-valid~.valid-tooltip,.was-validated .form-check-input:valid~.valid-feedback,.was-validated .form-check-input:valid~.valid-tooltip{display:block}.custom-control-input.is-valid~.custom-control-label,.was-validated .custom-control-input:valid~.custom-control-label{color:#28a745}.custom-control-input.is-valid~.custom-control-label::before,.was-validated .custom-control-input:valid~.custom-control-label::before{background-color:#71dd8a}.custom-control-input.is-valid~.valid-feedback,.custom-control-input.is-valid~.valid-tooltip,.was-validated .custom-control-input:valid~.valid-feedback,.was-validated .custom-control-input:valid~.valid-tooltip{display:block}.custom-control-input.is-valid:checked~.custom-control-label::before,.was-validated .custom-control-input:valid:checked~.custom-control-label::before{background-color:#34ce57}.custom-control-input.is-valid:focus~.custom-control-label::before,.was-validated .custom-control-input:valid:focus~.custom-control-label::before{box-shadow:0 0 0 1px #fff,0 0 0 .2rem rgba(40,167,69,.25)}.custom-file-input.is-valid~.custom-file-label,.was-validated .custom-file-input:valid~.custom-file-label{border-color:#28a745}.custom-file-input.is-valid~.custom-file-label::after,.was-validated .custom-file-input:valid~.custom-file-label::after{border-color:inherit}.custom-file-input.is-valid~.valid-feedback,.custom-file-input.is-valid~.valid-tooltip,.was-validated .custom-file-input:valid~.valid-feedback,.was-validated .custom-file-input:valid~.valid-tooltip{display:block}.custom-file-input.is-valid:focus~.custom-file-label,.was-validated .custom-file-input:valid:focus~.custom-file-label{box-shadow:0 0 0 .2rem rgba(40,167,69,.25)}.invalid-feedback{display:none;width:100%;margin-top:.25rem;font-size:80%;color:#dc3545}.invalid-tooltip{position:absolute;top:100%;z-index:5;display:none;max-width:100%;padding:.25rem .5rem;margin-top:.1rem;font-size:.875rem;line-height:1.5;color:#fff;background-color:rgba(220,53,69,.9);border-radius:.25rem}.custom-select.is-invalid,.form-control.is-invalid,.was-validated .custom-select:invalid,.was-validated .form-control:invalid{border-color:#dc3545}.custom-select.is-invalid:focus,.form-control.is-invalid:focus,.was-validated .custom-select:invalid:focus,.was-validated .form-control:invalid:focus{border-color:#dc3545;box-shadow:0 0 0 .2rem rgba(220,53,69,.25)}.custom-select.is-invalid~.invalid-feedback,.custom-select.is-invalid~.invalid-tooltip,.form-control.is-invalid~.invalid-feedback,.form-control.is-invalid~.invalid-tooltip,.was-validated .custom-select:invalid~.invalid-feedback,.was-validated .custom-select:invalid~.invalid-tooltip,.was-validated .form-control:invalid~.invalid-feedback,.was-validated .form-control:invalid~.invalid-tooltip{display:block}.form-control-file.is-invalid~.invalid-feedback,.form-control-file.is-invalid~.invalid-tooltip,.was-validated .form-control-file:invalid~.invalid-feedback,.was-validated .form-control-file:invalid~.invalid-tooltip{display:block}.form-check-input.is-invalid~.form-check-label,.was-validated .form-check-input:invalid~.form-check-label{color:#dc3545}.form-check-input.is-invalid~.invalid-feedback,.form-check-input.is-invalid~.invalid-tooltip,.was-validated .form-check-input:invalid~.invalid-feedback,.was-validated .form-check-input:invalid~.invalid-tooltip{display:block}.custom-control-input.is-invalid~.custom-control-label,.was-validated .custom-control-input:invalid~.custom-control-label{color:#dc3545}.custom-control-input.is-invalid~.custom-control-label::before,.was-validated .custom-control-input:invalid~.custom-control-label::before{background-color:#efa2a9}.custom-control-input.is-invalid~.invalid-feedback,.custom-control-input.is-invalid~.invalid-tooltip,.was-validated .custom-control-input:invalid~.invalid-feedback,.was-validated .custom-control-input:invalid~.invalid-tooltip{display:block}.custom-control-input.is-invalid:checked~.custom-control-label::before,.was-validated .custom-control-input:invalid:checked~.custom-control-label::before{background-color:#e4606d}.custom-control-input.is-invalid:focus~.custom-control-label::before,.was-validated .custom-control-input:invalid:focus~.custom-control-label::before{box-shadow:0 0 0 1px #fff,0 0 0 .2rem rgba(220,53,69,.25)}.custom-file-input.is-invalid~.custom-file-label,.was-validated .custom-file-input:invalid~.custom-file-label{border-color:#dc3545}.custom-file-input.is-invalid~.custom-file-label::after,.was-validated .custom-file-input:invalid~.custom-file-label::after{border-color:inherit}.custom-file-input.is-invalid~.invalid-feedback,.custom-file-input.is-invalid~.invalid-tooltip,.was-validated .custom-file-input:invalid~.invalid-feedback,.was-validated .custom-file-input:invalid~.invalid-tooltip{display:block}.custom-file-input.is-invalid:focus~.custom-file-label,.was-validated .custom-file-input:invalid:focus~.custom-file-label{box-shadow:0 0 0 .2rem rgba(220,53,69,.25)}.form-inline{display:-ms-flexbox;display:flex;-ms-flex-flow:row wrap;flex-flow:row wrap;-ms-flex-align:center;align-items:center}.form-inline .form-check{width:100%}@media (min-width:576px){.form-inline label{display:-ms-flexbox;display:flex;-ms-flex-align:center;align-items:center;-ms-flex-pack:center;justify-content:center;margin-bottom:0}.form-inline .form-group{display:-ms-flexbox;display:flex;-ms-flex:0 0 auto;flex:0 0 auto;-ms-flex-flow:row wrap;flex-flow:row wrap;-ms-flex-align:center;align-items:center;margin-bottom:0}.form-inline .form-control{display:inline-block;width:auto;vertical-align:middle}.form-inline .form-control-plaintext{display:inline-block}.form-inline .custom-select,.form-inline .input-group{width:auto}.form-inline .form-check{display:-ms-flexbox;display:flex;-ms-flex-align:center;align-items:center;-ms-flex-pack:center;justify-content:center;width:auto;padding-left:0}.form-inline .form-check-input{position:relative;margin-top:0;margin-right:.25rem;margin-left:0}.form-inline .custom-control{-ms-flex-align:center;align-items:center;-ms-flex-pack:center;justify-content:center}.form-inline .custom-control-label{margin-bottom:0}}.btn{display:inline-block;font-weight:400;text-align:center;white-space:nowrap;vertical-align:middle;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;border:1px solid transparent;padding:.375rem .75rem;font-size:1rem;line-height:1.5;border-radius:.25rem;transition:color .15s ease-in-out,background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out}@media screen and (prefers-reduced-motion:reduce){.btn{transition:none}}.btn:focus,.btn:hover{text-decoration:none}.btn.focus,.btn:focus{outline:0;box-shadow:0 0 0 .2rem rgba(0,123,255,.25)}.btn.disabled,.btn:disabled{opacity:.65}.btn:not(:disabled):not(.disabled){cursor:pointer}a.btn.disabled,fieldset:disabled a.btn{pointer-events:none}.btn-primary{color:#fff;background-color:#007bff;border-color:#007bff}.btn-primary:hover{color:#fff;background-color:#0069d9;border-color:#0062cc}.btn-primary.focus,.btn-primary:focus{box-shadow:0 0 0 .2rem rgba(0,123,255,.5)}.btn-primary.disabled,.btn-primary:disabled{color:#fff;background-color:#007bff;border-color:#007bff}.btn-primary:not(:disabled):not(.disabled).active,.btn-primary:not(:disabled):not(.disabled):active,.show>.btn-primary.dropdown-toggle{color:#fff;background-color:#0062cc;border-color:#005cbf}.btn-primary:not(:disabled):not(.disabled).active:focus,.btn-primary:not(:disabled):not(.disabled):active:focus,.show>.btn-primary.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(0,123,255,.5)}.btn-secondary{color:#fff;background-color:#6c757d;border-color:#6c757d}.btn-secondary:hover{color:#fff;background-color:#5a6268;border-color:#545b62}.btn-secondary.focus,.btn-secondary:focus{box-shadow:0 0 0 .2rem rgba(108,117,125,.5)}.btn-secondary.disabled,.btn-secondary:disabled{color:#fff;background-color:#6c757d;border-color:#6c757d}.btn-secondary:not(:disabled):not(.disabled).active,.btn-secondary:not(:disabled):not(.disabled):active,.show>.btn-secondary.dropdown-toggle{color:#fff;background-color:#545b62;border-color:#4e555b}.btn-secondary:not(:disabled):not(.disabled).active:focus,.btn-secondary:not(:disabled):not(.disabled):active:focus,.show>.btn-secondary.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(108,117,125,.5)}.btn-success{color:#fff;background-color:#28a745;border-color:#28a745}.btn-success:hover{color:#fff;background-color:#218838;border-color:#1e7e34}.btn-success.focus,.btn-success:focus{box-shadow:0 0 0 .2rem rgba(40,167,69,.5)}.btn-success.disabled,.btn-success:disabled{color:#fff;background-color:#28a745;border-color:#28a745}.btn-success:not(:disabled):not(.disabled).active,.btn-success:not(:disabled):not(.disabled):active,.show>.btn-success.dropdown-toggle{color:#fff;background-color:#1e7e34;border-color:#1c7430}.btn-success:not(:disabled):not(.disabled).active:focus,.btn-success:not(:disabled):not(.disabled):active:focus,.show>.btn-success.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(40,167,69,.5)}.btn-info{color:#fff;background-color:#17a2b8;border-color:#17a2b8}.btn-info:hover{color:#fff;background-color:#138496;border-color:#117a8b}.btn-info.focus,.btn-info:focus{box-shadow:0 0 0 .2rem rgba(23,162,184,.5)}.btn-info.disabled,.btn-info:disabled{color:#fff;background-color:#17a2b8;border-color:#17a2b8}.btn-info:not(:disabled):not(.disabled).active,.btn-info:not(:disabled):not(.disabled):active,.show>.btn-info.dropdown-toggle{color:#fff;background-color:#117a8b;border-color:#10707f}.btn-info:not(:disabled):not(.disabled).active:focus,.btn-info:not(:disabled):not(.disabled):active:focus,.show>.btn-info.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(23,162,184,.5)}.btn-warning{color:#212529;background-color:#ffc107;border-color:#ffc107}.btn-warning:hover{color:#212529;background-color:#e0a800;border-color:#d39e00}.btn-warning.focus,.btn-warning:focus{box-shadow:0 0 0 .2rem rgba(255,193,7,.5)}.btn-warning.disabled,.btn-warning:disabled{color:#212529;background-color:#ffc107;border-color:#ffc107}.btn-warning:not(:disabled):not(.disabled).active,.btn-warning:not(:disabled):not(.disabled):active,.show>.btn-warning.dropdown-toggle{color:#212529;background-color:#d39e00;border-color:#c69500}.btn-warning:not(:disabled):not(.disabled).active:focus,.btn-warning:not(:disabled):not(.disabled):active:focus,.show>.btn-warning.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(255,193,7,.5)}.btn-danger{color:#fff;background-color:#dc3545;border-color:#dc3545}.btn-danger:hover{color:#fff;background-color:#c82333;border-color:#bd2130}.btn-danger.focus,.btn-danger:focus{box-shadow:0 0 0 .2rem rgba(220,53,69,.5)}.btn-danger.disabled,.btn-danger:disabled{color:#fff;background-color:#dc3545;border-color:#dc3545}.btn-danger:not(:disabled):not(.disabled).active,.btn-danger:not(:disabled):not(.disabled):active,.show>.btn-danger.dropdown-toggle{color:#fff;background-color:#bd2130;border-color:#b21f2d}.btn-danger:not(:disabled):not(.disabled).active:focus,.btn-danger:not(:disabled):not(.disabled):active:focus,.show>.btn-danger.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(220,53,69,.5)}.btn-light{color:#212529;background-color:#f8f9fa;border-color:#f8f9fa}.btn-light:hover{color:#212529;background-color:#e2e6ea;border-color:#dae0e5}.btn-light.focus,.btn-light:focus{box-shadow:0 0 0 .2rem rgba(248,249,250,.5)}.btn-light.disabled,.btn-light:disabled{color:#212529;background-color:#f8f9fa;border-color:#f8f9fa}.btn-light:not(:disabled):not(.disabled).active,.btn-light:not(:disabled):not(.disabled):active,.show>.btn-light.dropdown-toggle{color:#212529;background-color:#dae0e5;border-color:#d3d9df}.btn-light:not(:disabled):not(.disabled).active:focus,.btn-light:not(:disabled):not(.disabled):active:focus,.show>.btn-light.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(248,249,250,.5)}.btn-dark{color:#fff;background-color:#343a40;border-color:#343a40}.btn-dark:hover{color:#fff;background-color:#23272b;border-color:#1d2124}.btn-dark.focus,.btn-dark:focus{box-shadow:0 0 0 .2rem rgba(52,58,64,.5)}.btn-dark.disabled,.btn-dark:disabled{color:#fff;background-color:#343a40;border-color:#343a40}.btn-dark:not(:disabled):not(.disabled).active,.btn-dark:not(:disabled):not(.disabled):active,.show>.btn-dark.dropdown-toggle{color:#fff;background-color:#1d2124;border-color:#171a1d}.btn-dark:not(:disabled):not(.disabled).active:focus,.btn-dark:not(:disabled):not(.disabled):active:focus,.show>.btn-dark.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(52,58,64,.5)}.btn-outline-primary{color:#007bff;background-color:transparent;background-image:none;border-color:#007bff}.btn-outline-primary:hover{color:#fff;background-color:#007bff;border-color:#007bff}.btn-outline-primary.focus,.btn-outline-primary:focus{box-shadow:0 0 0 .2rem rgba(0,123,255,.5)}.btn-outline-primary.disabled,.btn-outline-primary:disabled{color:#007bff;background-color:transparent}.btn-outline-primary:not(:disabled):not(.disabled).active,.btn-outline-primary:not(:disabled):not(.disabled):active,.show>.btn-outline-primary.dropdown-toggle{color:#fff;background-color:#007bff;border-color:#007bff}.btn-outline-primary:not(:disabled):not(.disabled).active:focus,.btn-outline-primary:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-primary.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(0,123,255,.5)}.btn-outline-secondary{color:#6c757d;background-color:transparent;background-image:none;border-color:#6c757d}.btn-outline-secondary:hover{color:#fff;background-color:#6c757d;border-color:#6c757d}.btn-outline-secondary.focus,.btn-outline-secondary:focus{box-shadow:0 0 0 .2rem rgba(108,117,125,.5)}.btn-outline-secondary.disabled,.btn-outline-secondary:disabled{color:#6c757d;background-color:transparent}.btn-outline-secondary:not(:disabled):not(.disabled).active,.btn-outline-secondary:not(:disabled):not(.disabled):active,.show>.btn-outline-secondary.dropdown-toggle{color:#fff;background-color:#6c757d;border-color:#6c757d}.btn-outline-secondary:not(:disabled):not(.disabled).active:focus,.btn-outline-secondary:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-secondary.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(108,117,125,.5)}.btn-outline-success{color:#28a745;background-color:transparent;background-image:none;border-color:#28a745}.btn-outline-success:hover{color:#fff;background-color:#28a745;border-color:#28a745}.btn-outline-success.focus,.btn-outline-success:focus{box-shadow:0 0 0 .2rem rgba(40,167,69,.5)}.btn-outline-success.disabled,.btn-outline-success:disabled{color:#28a745;background-color:transparent}.btn-outline-success:not(:disabled):not(.disabled).active,.btn-outline-success:not(:disabled):not(.disabled):active,.show>.btn-outline-success.dropdown-toggle{color:#fff;background-color:#28a745;border-color:#28a745}.btn-outline-success:not(:disabled):not(.disabled).active:focus,.btn-outline-success:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-success.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(40,167,69,.5)}.btn-outline-info{color:#17a2b8;background-color:transparent;background-image:none;border-color:#17a2b8}.btn-outline-info:hover{color:#fff;background-color:#17a2b8;border-color:#17a2b8}.btn-outline-info.focus,.btn-outline-info:focus{box-shadow:0 0 0 .2rem rgba(23,162,184,.5)}.btn-outline-info.disabled,.btn-outline-info:disabled{color:#17a2b8;background-color:transparent}.btn-outline-info:not(:disabled):not(.disabled).active,.btn-outline-info:not(:disabled):not(.disabled):active,.show>.btn-outline-info.dropdown-toggle{color:#fff;background-color:#17a2b8;border-color:#17a2b8}.btn-outline-info:not(:disabled):not(.disabled).active:focus,.btn-outline-info:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-info.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(23,162,184,.5)}.btn-outline-warning{color:#ffc107;background-color:transparent;background-image:none;border-color:#ffc107}.btn-outline-warning:hover{color:#212529;background-color:#ffc107;border-color:#ffc107}.btn-outline-warning.focus,.btn-outline-warning:focus{box-shadow:0 0 0 .2rem rgba(255,193,7,.5)}.btn-outline-warning.disabled,.btn-outline-warning:disabled{color:#ffc107;background-color:transparent}.btn-outline-warning:not(:disabled):not(.disabled).active,.btn-outline-warning:not(:disabled):not(.disabled):active,.show>.btn-outline-warning.dropdown-toggle{color:#212529;background-color:#ffc107;border-color:#ffc107}.btn-outline-warning:not(:disabled):not(.disabled).active:focus,.btn-outline-warning:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-warning.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(255,193,7,.5)}.btn-outline-danger{color:#dc3545;background-color:transparent;background-image:none;border-color:#dc3545}.btn-outline-danger:hover{color:#fff;background-color:#dc3545;border-color:#dc3545}.btn-outline-danger.focus,.btn-outline-danger:focus{box-shadow:0 0 0 .2rem rgba(220,53,69,.5)}.btn-outline-danger.disabled,.btn-outline-danger:disabled{color:#dc3545;background-color:transparent}.btn-outline-danger:not(:disabled):not(.disabled).active,.btn-outline-danger:not(:disabled):not(.disabled):active,.show>.btn-outline-danger.dropdown-toggle{color:#fff;background-color:#dc3545;border-color:#dc3545}.btn-outline-danger:not(:disabled):not(.disabled).active:focus,.btn-outline-danger:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-danger.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(220,53,69,.5)}.btn-outline-light{color:#f8f9fa;background-color:transparent;background-image:none;border-color:#f8f9fa}.btn-outline-light:hover{color:#212529;background-color:#f8f9fa;border-color:#f8f9fa}.btn-outline-light.focus,.btn-outline-light:focus{box-shadow:0 0 0 .2rem rgba(248,249,250,.5)}.btn-outline-light.disabled,.btn-outline-light:disabled{color:#f8f9fa;background-color:transparent}.btn-outline-light:not(:disabled):not(.disabled).active,.btn-outline-light:not(:disabled):not(.disabled):active,.show>.btn-outline-light.dropdown-toggle{color:#212529;background-color:#f8f9fa;border-color:#f8f9fa}.btn-outline-light:not(:disabled):not(.disabled).active:focus,.btn-outline-light:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-light.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(248,249,250,.5)}.btn-outline-dark{color:#343a40;background-color:transparent;background-image:none;border-color:#343a40}.btn-outline-dark:hover{color:#fff;background-color:#343a40;border-color:#343a40}.btn-outline-dark.focus,.btn-outline-dark:focus{box-shadow:0 0 0 .2rem rgba(52,58,64,.5)}.btn-outline-dark.disabled,.btn-outline-dark:disabled{color:#343a40;background-color:transparent}.btn-outline-dark:not(:disabled):not(.disabled).active,.btn-outline-dark:not(:disabled):not(.disabled):active,.show>.btn-outline-dark.dropdown-toggle{color:#fff;background-color:#343a40;border-color:#343a40}.btn-outline-dark:not(:disabled):not(.disabled).active:focus,.btn-outline-dark:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-dark.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(52,58,64,.5)}.btn-link{font-weight:400;color:#007bff;background-color:transparent}.btn-link:hover{color:#0056b3;text-decoration:underline;background-color:transparent;border-color:transparent}.btn-link.focus,.btn-link:focus{text-decoration:underline;border-color:transparent;box-shadow:none}.btn-link.disabled,.btn-link:disabled{color:#6c757d;pointer-events:none}.btn-group-lg>.btn,.btn-lg{padding:.5rem 1rem;font-size:1.25rem;line-height:1.5;border-radius:.3rem}.btn-group-sm>.btn,.btn-sm{padding:.25rem .5rem;font-size:.875rem;line-height:1.5;border-radius:.2rem}.btn-block{display:block;width:100%}.btn-block+.btn-block{margin-top:.5rem}input[type=button].btn-block,input[type=reset].btn-block,input[type=submit].btn-block{width:100%}.fade{transition:opacity .15s linear}@media screen and (prefers-reduced-motion:reduce){.fade{transition:none}}.fade:not(.show){opacity:0}.collapse:not(.show){display:none}.collapsing{position:relative;height:0;overflow:hidden;transition:height .35s ease}@media screen and (prefers-reduced-motion:reduce){.collapsing{transition:none}}.dropdown,.dropleft,.dropright,.dropup{position:relative}.dropdown-toggle::after{display:inline-block;width:0;height:0;margin-left:.255em;vertical-align:.255em;content:"";border-top:.3em solid;border-right:.3em solid transparent;border-bottom:0;border-left:.3em solid transparent}.dropdown-toggle:empty::after{margin-left:0}.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:10rem;padding:.5rem 0;margin:.125rem 0 0;font-size:1rem;color:#212529;text-align:left;list-style:none;background-color:#fff;background-clip:padding-box;border:1px solid rgba(0,0,0,.15);border-radius:.25rem}.dropdown-menu-right{right:0;left:auto}.dropup .dropdown-menu{top:auto;bottom:100%;margin-top:0;margin-bottom:.125rem}.dropup .dropdown-toggle::after{display:inline-block;width:0;height:0;margin-left:.255em;vertical-align:.255em;content:"";border-top:0;border-right:.3em solid transparent;border-bottom:.3em solid;border-left:.3em solid transparent}.dropup .dropdown-toggle:empty::after{margin-left:0}.dropright .dropdown-menu{top:0;right:auto;left:100%;margin-top:0;margin-left:.125rem}.dropright .dropdown-toggle::after{display:inline-block;width:0;height:0;margin-left:.255em;vertical-align:.255em;content:"";border-top:.3em solid transparent;border-right:0;border-bottom:.3em solid transparent;border-left:.3em solid}.dropright .dropdown-toggle:empty::after{margin-left:0}.dropright .dropdown-toggle::after{vertical-align:0}.dropleft .dropdown-menu{top:0;right:100%;left:auto;margin-top:0;margin-right:.125rem}.dropleft .dropdown-toggle::after{display:inline-block;width:0;height:0;margin-left:.255em;vertical-align:.255em;content:""}.dropleft .dropdown-toggle::after{display:none}.dropleft .dropdown-toggle::before{display:inline-block;width:0;height:0;margin-right:.255em;vertical-align:.255em;content:"";border-top:.3em solid transparent;border-right:.3em solid;border-bottom:.3em solid transparent}.dropleft .dropdown-toggle:empty::after{margin-left:0}.dropleft .dropdown-toggle::before{vertical-align:0}.dropdown-menu[x-placement^=bottom],.dropdown-menu[x-placement^=left],.dropdown-menu[x-placement^=right],.dropdown-menu[x-placement^=top]{right:auto;bottom:auto}.dropdown-divider{height:0;margin:.5rem 0;overflow:hidden;border-top:1px solid #e9ecef}.dropdown-item{display:block;width:100%;padding:.25rem 1.5rem;clear:both;font-weight:400;color:#212529;text-align:inherit;white-space:nowrap;background-color:transparent;border:0}.dropdown-item:focus,.dropdown-item:hover{color:#16181b;text-decoration:none;background-color:#f8f9fa}.dropdown-item.active,.dropdown-item:active{color:#fff;text-decoration:none;background-color:#007bff}.dropdown-item.disabled,.dropdown-item:disabled{color:#6c757d;background-color:transparent}.dropdown-menu.show{display:block}.dropdown-header{display:block;padding:.5rem 1.5rem;margin-bottom:0;font-size:.875rem;color:#6c757d;white-space:nowrap}.dropdown-item-text{display:block;padding:.25rem 1.5rem;color:#212529}.btn-group,.btn-group-vertical{position:relative;display:-ms-inline-flexbox;display:inline-flex;vertical-align:middle}.btn-group-vertical>.btn,.btn-group>.btn{position:relative;-ms-flex:0 1 auto;flex:0 1 auto}.btn-group-vertical>.btn:hover,.btn-group>.btn:hover{z-index:1}.btn-group-vertical>.btn.active,.btn-group-vertical>.btn:active,.btn-group-vertical>.btn:focus,.btn-group>.btn.active,.btn-group>.btn:active,.btn-group>.btn:focus{z-index:1}.btn-group .btn+.btn,.btn-group .btn+.btn-group,.btn-group .btn-group+.btn,.btn-group .btn-group+.btn-group,.btn-group-vertical .btn+.btn,.btn-group-vertical .btn+.btn-group,.btn-group-vertical .btn-group+.btn,.btn-group-vertical .btn-group+.btn-group{margin-left:-1px}.btn-toolbar{display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;-ms-flex-pack:start;justify-content:flex-start}.btn-toolbar .input-group{width:auto}.btn-group>.btn:first-child{margin-left:0}.btn-group>.btn-group:not(:last-child)>.btn,.btn-group>.btn:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn-group:not(:first-child)>.btn,.btn-group>.btn:not(:first-child){border-top-left-radius:0;border-bottom-left-radius:0}.dropdown-toggle-split{padding-right:.5625rem;padding-left:.5625rem}.dropdown-toggle-split::after,.dropright .dropdown-toggle-split::after,.dropup .dropdown-toggle-split::after{margin-left:0}.dropleft .dropdown-toggle-split::before{margin-right:0}.btn-group-sm>.btn+.dropdown-toggle-split,.btn-sm+.dropdown-toggle-split{padding-right:.375rem;padding-left:.375rem}.btn-group-lg>.btn+.dropdown-toggle-split,.btn-lg+.dropdown-toggle-split{padding-right:.75rem;padding-left:.75rem}.btn-group-vertical{-ms-flex-direction:column;flex-direction:column;-ms-flex-align:start;align-items:flex-start;-ms-flex-pack:center;justify-content:center}.btn-group-vertical .btn,.btn-group-vertical .btn-group{width:100%}.btn-group-vertical>.btn+.btn,.btn-group-vertical>.btn+.btn-group,.btn-group-vertical>.btn-group+.btn,.btn-group-vertical>.btn-group+.btn-group{margin-top:-1px;margin-left:0}.btn-group-vertical>.btn-group:not(:last-child)>.btn,.btn-group-vertical>.btn:not(:last-child):not(.dropdown-toggle){border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn-group:not(:first-child)>.btn,.btn-group-vertical>.btn:not(:first-child){border-top-left-radius:0;border-top-right-radius:0}.btn-group-toggle>.btn,.btn-group-toggle>.btn-group>.btn{margin-bottom:0}.btn-group-toggle>.btn input[type=checkbox],.btn-group-toggle>.btn input[type=radio],.btn-group-toggle>.btn-group>.btn input[type=checkbox],.btn-group-toggle>.btn-group>.btn input[type=radio]{position:absolute;clip:rect(0,0,0,0);pointer-events:none}.input-group{position:relative;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;-ms-flex-align:stretch;align-items:stretch;width:100%}.input-group>.custom-file,.input-group>.custom-select,.input-group>.form-control{position:relative;-ms-flex:1 1 auto;flex:1 1 auto;width:1%;margin-bottom:0}.input-group>.custom-file+.custom-file,.input-group>.custom-file+.custom-select,.input-group>.custom-file+.form-control,.input-group>.custom-select+.custom-file,.input-group>.custom-select+.custom-select,.input-group>.custom-select+.form-control,.input-group>.form-control+.custom-file,.input-group>.form-control+.custom-select,.input-group>.form-control+.form-control{margin-left:-1px}.input-group>.custom-file .custom-file-input:focus~.custom-file-label,.input-group>.custom-select:focus,.input-group>.form-control:focus{z-index:3}.input-group>.custom-file .custom-file-input:focus{z-index:4}.input-group>.custom-select:not(:last-child),.input-group>.form-control:not(:last-child){border-top-right-radius:0;border-bottom-right-radius:0}.input-group>.custom-select:not(:first-child),.input-group>.form-control:not(:first-child){border-top-left-radius:0;border-bottom-left-radius:0}.input-group>.custom-file{display:-ms-flexbox;display:flex;-ms-flex-align:center;align-items:center}.input-group>.custom-file:not(:last-child) .custom-file-label,.input-group>.custom-file:not(:last-child) .custom-file-label::after{border-top-right-radius:0;border-bottom-right-radius:0}.input-group>.custom-file:not(:first-child) .custom-file-label{border-top-left-radius:0;border-bottom-left-radius:0}.input-group-append,.input-group-prepend{display:-ms-flexbox;display:flex}.input-group-append .btn,.input-group-prepend .btn{position:relative;z-index:2}.input-group-append .btn+.btn,.input-group-append .btn+.input-group-text,.input-group-append .input-group-text+.btn,.input-group-append .input-group-text+.input-group-text,.input-group-prepend .btn+.btn,.input-group-prepend .btn+.input-group-text,.input-group-prepend .input-group-text+.btn,.input-group-prepend .input-group-text+.input-group-text{margin-left:-1px}.input-group-prepend{margin-right:-1px}.input-group-append{margin-left:-1px}.input-group-text{display:-ms-flexbox;display:flex;-ms-flex-align:center;align-items:center;padding:.375rem .75rem;margin-bottom:0;font-size:1rem;font-weight:400;line-height:1.5;color:#495057;text-align:center;white-space:nowrap;background-color:#e9ecef;border:1px solid #ced4da;border-radius:.25rem}.input-group-text input[type=checkbox],.input-group-text input[type=radio]{margin-top:0}.input-group-lg>.form-control,.input-group-lg>.input-group-append>.btn,.input-group-lg>.input-group-append>.input-group-text,.input-group-lg>.input-group-prepend>.btn,.input-group-lg>.input-group-prepend>.input-group-text{height:calc(2.875rem + 2px);padding:.5rem 1rem;font-size:1.25rem;line-height:1.5;border-radius:.3rem}.input-group-sm>.form-control,.input-group-sm>.input-group-append>.btn,.input-group-sm>.input-group-append>.input-group-text,.input-group-sm>.input-group-prepend>.btn,.input-group-sm>.input-group-prepend>.input-group-text{height:calc(1.8125rem + 2px);padding:.25rem .5rem;font-size:.875rem;line-height:1.5;border-radius:.2rem}.input-group>.input-group-append:last-child>.btn:not(:last-child):not(.dropdown-toggle),.input-group>.input-group-append:last-child>.input-group-text:not(:last-child),.input-group>.input-group-append:not(:last-child)>.btn,.input-group>.input-group-append:not(:last-child)>.input-group-text,.input-group>.input-group-prepend>.btn,.input-group>.input-group-prepend>.input-group-text{border-top-right-radius:0;border-bottom-right-radius:0}.input-group>.input-group-append>.btn,.input-group>.input-group-append>.input-group-text,.input-group>.input-group-prepend:first-child>.btn:not(:first-child),.input-group>.input-group-prepend:first-child>.input-group-text:not(:first-child),.input-group>.input-group-prepend:not(:first-child)>.btn,.input-group>.input-group-prepend:not(:first-child)>.input-group-text{border-top-left-radius:0;border-bottom-left-radius:0}.custom-control{position:relative;display:block;min-height:1.5rem;padding-left:1.5rem}.custom-control-inline{display:-ms-inline-flexbox;display:inline-flex;margin-right:1rem}.custom-control-input{position:absolute;z-index:-1;opacity:0}.custom-control-input:checked~.custom-control-label::before{color:#fff;background-color:#007bff}.custom-control-input:focus~.custom-control-label::before{box-shadow:0 0 0 1px #fff,0 0 0 .2rem rgba(0,123,255,.25)}.custom-control-input:active~.custom-control-label::before{color:#fff;background-color:#b3d7ff}.custom-control-input:disabled~.custom-control-label{color:#6c757d}.custom-control-input:disabled~.custom-control-label::before{background-color:#e9ecef}.custom-control-label{position:relative;margin-bottom:0}.custom-control-label::before{position:absolute;top:.25rem;left:-1.5rem;display:block;width:1rem;height:1rem;pointer-events:none;content:"";-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;background-color:#dee2e6}.custom-control-label::after{position:absolute;top:.25rem;left:-1.5rem;display:block;width:1rem;height:1rem;content:"";background-repeat:no-repeat;background-position:center center;background-size:50% 50%}.custom-checkbox .custom-control-label::before{border-radius:.25rem}.custom-checkbox .custom-control-input:checked~.custom-control-label::before{background-color:#007bff}.custom-checkbox .custom-control-input:checked~.custom-control-label::after{background-image:url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 8 8'%3E%3Cpath fill='%23fff' d='M6.564.75l-3.59 3.612-1.538-1.55L0 4.26 2.974 7.25 8 2.193z'/%3E%3C/svg%3E")}.custom-checkbox .custom-control-input:indeterminate~.custom-control-label::before{background-color:#007bff}.custom-checkbox .custom-control-input:indeterminate~.custom-control-label::after{background-image:url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 4 4'%3E%3Cpath stroke='%23fff' d='M0 2h4'/%3E%3C/svg%3E")}.custom-checkbox .custom-control-input:disabled:checked~.custom-control-label::before{background-color:rgba(0,123,255,.5)}.custom-checkbox .custom-control-input:disabled:indeterminate~.custom-control-label::before{background-color:rgba(0,123,255,.5)}.custom-radio .custom-control-label::before{border-radius:50%}.custom-radio .custom-control-input:checked~.custom-control-label::before{background-color:#007bff}.custom-radio .custom-control-input:checked~.custom-control-label::after{background-image:url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='-4 -4 8 8'%3E%3Ccircle r='3' fill='%23fff'/%3E%3C/svg%3E")}.custom-radio .custom-control-input:disabled:checked~.custom-control-label::before{background-color:rgba(0,123,255,.5)}.custom-select{display:inline-block;width:100%;height:calc(2.25rem + 2px);padding:.375rem 1.75rem .375rem .75rem;line-height:1.5;color:#495057;vertical-align:middle;background:#fff url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 4 5'%3E%3Cpath fill='%23343a40' d='M2 0L0 2h4zm0 5L0 3h4z'/%3E%3C/svg%3E") no-repeat right .75rem center;background-size:8px 10px;border:1px solid #ced4da;border-radius:.25rem;-webkit-appearance:none;-moz-appearance:none;appearance:none}.custom-select:focus{border-color:#80bdff;outline:0;box-shadow:0 0 0 .2rem rgba(128,189,255,.5)}.custom-select:focus::-ms-value{color:#495057;background-color:#fff}.custom-select[multiple],.custom-select[size]:not([size="1"]){height:auto;padding-right:.75rem;background-image:none}.custom-select:disabled{color:#6c757d;background-color:#e9ecef}.custom-select::-ms-expand{opacity:0}.custom-select-sm{height:calc(1.8125rem + 2px);padding-top:.375rem;padding-bottom:.375rem;font-size:75%}.custom-select-lg{height:calc(2.875rem + 2px);padding-top:.375rem;padding-bottom:.375rem;font-size:125%}.custom-file{position:relative;display:inline-block;width:100%;height:calc(2.25rem + 2px);margin-bottom:0}.custom-file-input{position:relative;z-index:2;width:100%;height:calc(2.25rem + 2px);margin:0;opacity:0}.custom-file-input:focus~.custom-file-label{border-color:#80bdff;box-shadow:0 0 0 .2rem rgba(0,123,255,.25)}.custom-file-input:focus~.custom-file-label::after{border-color:#80bdff}.custom-file-input:disabled~.custom-file-label{background-color:#e9ecef}.custom-file-input:lang(en)~.custom-file-label::after{content:"Browse"}.custom-file-label{position:absolute;top:0;right:0;left:0;z-index:1;height:calc(2.25rem + 2px);padding:.375rem .75rem;line-height:1.5;color:#495057;background-color:#fff;border:1px solid #ced4da;border-radius:.25rem}.custom-file-label::after{position:absolute;top:0;right:0;bottom:0;z-index:3;display:block;height:2.25rem;padding:.375rem .75rem;line-height:1.5;color:#495057;content:"Browse";background-color:#e9ecef;border-left:1px solid #ced4da;border-radius:0 .25rem .25rem 0}.custom-range{width:100%;padding-left:0;background-color:transparent;-webkit-appearance:none;-moz-appearance:none;appearance:none}.custom-range:focus{outline:0}.custom-range:focus::-webkit-slider-thumb{box-shadow:0 0 0 1px #fff,0 0 0 .2rem rgba(0,123,255,.25)}.custom-range:focus::-moz-range-thumb{box-shadow:0 0 0 1px #fff,0 0 0 .2rem rgba(0,123,255,.25)}.custom-range:focus::-ms-thumb{box-shadow:0 0 0 1px #fff,0 0 0 .2rem rgba(0,123,255,.25)}.custom-range::-moz-focus-outer{border:0}.custom-range::-webkit-slider-thumb{width:1rem;height:1rem;margin-top:-.25rem;background-color:#007bff;border:0;border-radius:1rem;transition:background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out;-webkit-appearance:none;appearance:none}@media screen and (prefers-reduced-motion:reduce){.custom-range::-webkit-slider-thumb{transition:none}}.custom-range::-webkit-slider-thumb:active{background-color:#b3d7ff}.custom-range::-webkit-slider-runnable-track{width:100%;height:.5rem;color:transparent;cursor:pointer;background-color:#dee2e6;border-color:transparent;border-radius:1rem}.custom-range::-moz-range-thumb{width:1rem;height:1rem;background-color:#007bff;border:0;border-radius:1rem;transition:background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out;-moz-appearance:none;appearance:none}@media screen and (prefers-reduced-motion:reduce){.custom-range::-moz-range-thumb{transition:none}}.custom-range::-moz-range-thumb:active{background-color:#b3d7ff}.custom-range::-moz-range-track{width:100%;height:.5rem;color:transparent;cursor:pointer;background-color:#dee2e6;border-color:transparent;border-radius:1rem}.custom-range::-ms-thumb{width:1rem;height:1rem;margin-top:0;margin-right:.2rem;margin-left:.2rem;background-color:#007bff;border:0;border-radius:1rem;transition:background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out;appearance:none}@media screen and (prefers-reduced-motion:reduce){.custom-range::-ms-thumb{transition:none}}.custom-range::-ms-thumb:active{background-color:#b3d7ff}.custom-range::-ms-track{width:100%;height:.5rem;color:transparent;cursor:pointer;background-color:transparent;border-color:transparent;border-width:.5rem}.custom-range::-ms-fill-lower{background-color:#dee2e6;border-radius:1rem}.custom-range::-ms-fill-upper{margin-right:15px;background-color:#dee2e6;border-radius:1rem}.custom-control-label::before,.custom-file-label,.custom-select{transition:background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out}@media screen and (prefers-reduced-motion:reduce){.custom-control-label::before,.custom-file-label,.custom-select{transition:none}}.nav{display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;padding-left:0;margin-bottom:0;list-style:none}.nav-link{display:block;padding:.5rem 1rem}.nav-link:focus,.nav-link:hover{text-decoration:none}.nav-link.disabled{color:#6c757d}.nav-tabs{border-bottom:1px solid #dee2e6}.nav-tabs .nav-item{margin-bottom:-1px}.nav-tabs .nav-link{border:1px solid transparent;border-top-left-radius:.25rem;border-top-right-radius:.25rem}.nav-tabs .nav-link:focus,.nav-tabs .nav-link:hover{border-color:#e9ecef #e9ecef #dee2e6}.nav-tabs .nav-link.disabled{color:#6c757d;background-color:transparent;border-color:transparent}.nav-tabs .nav-item.show .nav-link,.nav-tabs .nav-link.active{color:#495057;background-color:#fff;border-color:#dee2e6 #dee2e6 #fff}.nav-tabs .dropdown-menu{margin-top:-1px;border-top-left-radius:0;border-top-right-radius:0}.nav-pills .nav-link{border-radius:.25rem}.nav-pills .nav-link.active,.nav-pills .show>.nav-link{color:#fff;background-color:#007bff}.nav-fill .nav-item{-ms-flex:1 1 auto;flex:1 1 auto;text-align:center}.nav-justified .nav-item{-ms-flex-preferred-size:0;flex-basis:0;-ms-flex-positive:1;flex-grow:1;text-align:center}.tab-content>.tab-pane{display:none}.tab-content>.active{display:block}.navbar{position:relative;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;-ms-flex-align:center;align-items:center;-ms-flex-pack:justify;justify-content:space-between;padding:.5rem 1rem}.navbar>.container,.navbar>.container-fluid{display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;-ms-flex-align:center;align-items:center;-ms-flex-pack:justify;justify-content:space-between}.navbar-brand{display:inline-block;padding-top:.3125rem;padding-bottom:.3125rem;margin-right:1rem;font-size:1.25rem;line-height:inherit;white-space:nowrap}.navbar-brand:focus,.navbar-brand:hover{text-decoration:none}.navbar-nav{display:-ms-flexbox;display:flex;-ms-flex-direction:column;flex-direction:column;padding-left:0;margin-bottom:0;list-style:none}.navbar-nav .nav-link{padding-right:0;padding-left:0}.navbar-nav .dropdown-menu{position:static;float:none}.navbar-text{display:inline-block;padding-top:.5rem;padding-bottom:.5rem}.navbar-collapse{-ms-flex-preferred-size:100%;flex-basis:100%;-ms-flex-positive:1;flex-grow:1;-ms-flex-align:center;align-items:center}.navbar-toggler{padding:.25rem .75rem;font-size:1.25rem;line-height:1;background-color:transparent;border:1px solid transparent;border-radius:.25rem}.navbar-toggler:focus,.navbar-toggler:hover{text-decoration:none}.navbar-toggler:not(:disabled):not(.disabled){cursor:pointer}.navbar-toggler-icon{display:inline-block;width:1.5em;height:1.5em;vertical-align:middle;content:"";background:no-repeat center center;background-size:100% 100%}@media (max-width:575.98px){.navbar-expand-sm>.container,.navbar-expand-sm>.container-fluid{padding-right:0;padding-left:0}}@media (min-width:576px){.navbar-expand-sm{-ms-flex-flow:row nowrap;flex-flow:row nowrap;-ms-flex-pack:start;justify-content:flex-start}.navbar-expand-sm .navbar-nav{-ms-flex-direction:row;flex-direction:row}.navbar-expand-sm .navbar-nav .dropdown-menu{position:absolute}.navbar-expand-sm .navbar-nav .nav-link{padding-right:.5rem;padding-left:.5rem}.navbar-expand-sm>.container,.navbar-expand-sm>.container-fluid{-ms-flex-wrap:nowrap;flex-wrap:nowrap}.navbar-expand-sm .navbar-collapse{display:-ms-flexbox!important;display:flex!important;-ms-flex-preferred-size:auto;flex-basis:auto}.navbar-expand-sm .navbar-toggler{display:none}}@media (max-width:767.98px){.navbar-expand-md>.container,.navbar-expand-md>.container-fluid{padding-right:0;padding-left:0}}@media (min-width:768px){.navbar-expand-md{-ms-flex-flow:row nowrap;flex-flow:row nowrap;-ms-flex-pack:start;justify-content:flex-start}.navbar-expand-md .navbar-nav{-ms-flex-direction:row;flex-direction:row}.navbar-expand-md .navbar-nav .dropdown-menu{position:absolute}.navbar-expand-md .navbar-nav .nav-link{padding-right:.5rem;padding-left:.5rem}.navbar-expand-md>.container,.navbar-expand-md>.container-fluid{-ms-flex-wrap:nowrap;flex-wrap:nowrap}.navbar-expand-md .navbar-collapse{display:-ms-flexbox!important;display:flex!important;-ms-flex-preferred-size:auto;flex-basis:auto}.navbar-expand-md .navbar-toggler{display:none}}@media (max-width:991.98px){.navbar-expand-lg>.container,.navbar-expand-lg>.container-fluid{padding-right:0;padding-left:0}}@media (min-width:992px){.navbar-expand-lg{-ms-flex-flow:row nowrap;flex-flow:row nowrap;-ms-flex-pack:start;justify-content:flex-start}.navbar-expand-lg .navbar-nav{-ms-flex-direction:row;flex-direction:row}.navbar-expand-lg .navbar-nav .dropdown-menu{position:absolute}.navbar-expand-lg .navbar-nav .nav-link{padding-right:.5rem;padding-left:.5rem}.navbar-expand-lg>.container,.navbar-expand-lg>.container-fluid{-ms-flex-wrap:nowrap;flex-wrap:nowrap}.navbar-expand-lg .navbar-collapse{display:-ms-flexbox!important;display:flex!important;-ms-flex-preferred-size:auto;flex-basis:auto}.navbar-expand-lg .navbar-toggler{display:none}}@media (max-width:1199.98px){.navbar-expand-xl>.container,.navbar-expand-xl>.container-fluid{padding-right:0;padding-left:0}}@media (min-width:1200px){.navbar-expand-xl{-ms-flex-flow:row nowrap;flex-flow:row nowrap;-ms-flex-pack:start;justify-content:flex-start}.navbar-expand-xl .navbar-nav{-ms-flex-direction:row;flex-direction:row}.navbar-expand-xl .navbar-nav .dropdown-menu{position:absolute}.navbar-expand-xl .navbar-nav .nav-link{padding-right:.5rem;padding-left:.5rem}.navbar-expand-xl>.container,.navbar-expand-xl>.container-fluid{-ms-flex-wrap:nowrap;flex-wrap:nowrap}.navbar-expand-xl .navbar-collapse{display:-ms-flexbox!important;display:flex!important;-ms-flex-preferred-size:auto;flex-basis:auto}.navbar-expand-xl .navbar-toggler{display:none}}.navbar-expand{-ms-flex-flow:row nowrap;flex-flow:row nowrap;-ms-flex-pack:start;justify-content:flex-start}.navbar-expand>.container,.navbar-expand>.container-fluid{padding-right:0;padding-left:0}.navbar-expand .navbar-nav{-ms-flex-direction:row;flex-direction:row}.navbar-expand .navbar-nav .dropdown-menu{position:absolute}.navbar-expand .navbar-nav .nav-link{padding-right:.5rem;padding-left:.5rem}.navbar-expand>.container,.navbar-expand>.container-fluid{-ms-flex-wrap:nowrap;flex-wrap:nowrap}.navbar-expand .navbar-collapse{display:-ms-flexbox!important;display:flex!important;-ms-flex-preferred-size:auto;flex-basis:auto}.navbar-expand .navbar-toggler{display:none}.navbar-light .navbar-brand{color:rgba(0,0,0,.9)}.navbar-light .navbar-brand:focus,.navbar-light .navbar-brand:hover{color:rgba(0,0,0,.9)}.navbar-light .navbar-nav .nav-link{color:rgba(0,0,0,.5)}.navbar-light .navbar-nav .nav-link:focus,.navbar-light .navbar-nav .nav-link:hover{color:rgba(0,0,0,.7)}.navbar-light .navbar-nav .nav-link.disabled{color:rgba(0,0,0,.3)}.navbar-light .navbar-nav .active>.nav-link,.navbar-light .navbar-nav .nav-link.active,.navbar-light .navbar-nav .nav-link.show,.navbar-light .navbar-nav .show>.nav-link{color:rgba(0,0,0,.9)}.navbar-light .navbar-toggler{color:rgba(0,0,0,.5);border-color:rgba(0,0,0,.1)}.navbar-light .navbar-toggler-icon{background-image:url("data:image/svg+xml;charset=utf8,%3Csvg viewBox='0 0 30 30' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath stroke='rgba(0, 0, 0, 0.5)' stroke-width='2' stroke-linecap='round' stroke-miterlimit='10' d='M4 7h22M4 15h22M4 23h22'/%3E%3C/svg%3E")}.navbar-light .navbar-text{color:rgba(0,0,0,.5)}.navbar-light .navbar-text a{color:rgba(0,0,0,.9)}.navbar-light .navbar-text a:focus,.navbar-light .navbar-text a:hover{color:rgba(0,0,0,.9)}.navbar-dark .navbar-brand{color:#fff}.navbar-dark .navbar-brand:focus,.navbar-dark .navbar-brand:hover{color:#fff}.navbar-dark .navbar-nav .nav-link{color:rgba(255,255,255,.5)}.navbar-dark .navbar-nav .nav-link:focus,.navbar-dark .navbar-nav .nav-link:hover{color:rgba(255,255,255,.75)}.navbar-dark .navbar-nav .nav-link.disabled{color:rgba(255,255,255,.25)}.navbar-dark .navbar-nav .active>.nav-link,.navbar-dark .navbar-nav .nav-link.active,.navbar-dark .navbar-nav .nav-link.show,.navbar-dark .navbar-nav .show>.nav-link{color:#fff}.navbar-dark .navbar-toggler{color:rgba(255,255,255,.5);border-color:rgba(255,255,255,.1)}.navbar-dark .navbar-toggler-icon{background-image:url("data:image/svg+xml;charset=utf8,%3Csvg viewBox='0 0 30 30' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath stroke='rgba(255, 255, 255, 0.5)' stroke-width='2' stroke-linecap='round' stroke-miterlimit='10' d='M4 7h22M4 15h22M4 23h22'/%3E%3C/svg%3E")}.navbar-dark .navbar-text{color:rgba(255,255,255,.5)}.navbar-dark .navbar-text a{color:#fff}.navbar-dark .navbar-text a:focus,.navbar-dark .navbar-text a:hover{color:#fff}.card{position:relative;display:-ms-flexbox;display:flex;-ms-flex-direction:column;flex-direction:column;min-width:0;word-wrap:break-word;background-color:#fff;background-clip:border-box;border:1px solid rgba(0,0,0,.125);border-radius:.25rem}.card>hr{margin-right:0;margin-left:0}.card>.list-group:first-child .list-group-item:first-child{border-top-left-radius:.25rem;border-top-right-radius:.25rem}.card>.list-group:last-child .list-group-item:last-child{border-bottom-right-radius:.25rem;border-bottom-left-radius:.25rem}.card-body{-ms-flex:1 1 auto;flex:1 1 auto;padding:1.25rem}.card-title{margin-bottom:.75rem}.card-subtitle{margin-top:-.375rem;margin-bottom:0}.card-text:last-child{margin-bottom:0}.card-link:hover{text-decoration:none}.card-link+.card-link{margin-left:1.25rem}.card-header{padding:.75rem 1.25rem;margin-bottom:0;background-color:rgba(0,0,0,.03);border-bottom:1px solid rgba(0,0,0,.125)}.card-header:first-child{border-radius:calc(.25rem - 1px) calc(.25rem - 1px) 0 0}.card-header+.list-group .list-group-item:first-child{border-top:0}.card-footer{padding:.75rem 1.25rem;background-color:rgba(0,0,0,.03);border-top:1px solid rgba(0,0,0,.125)}.card-footer:last-child{border-radius:0 0 calc(.25rem - 1px) calc(.25rem - 1px)}.card-header-tabs{margin-right:-.625rem;margin-bottom:-.75rem;margin-left:-.625rem;border-bottom:0}.card-header-pills{margin-right:-.625rem;margin-left:-.625rem}.card-img-overlay{position:absolute;top:0;right:0;bottom:0;left:0;padding:1.25rem}.card-img{width:100%;border-radius:calc(.25rem - 1px)}.card-img-top{width:100%;border-top-left-radius:calc(.25rem - 1px);border-top-right-radius:calc(.25rem - 1px)}.card-img-bottom{width:100%;border-bottom-right-radius:calc(.25rem - 1px);border-bottom-left-radius:calc(.25rem - 1px)}.card-deck{display:-ms-flexbox;display:flex;-ms-flex-direction:column;flex-direction:column}.card-deck .card{margin-bottom:15px}@media (min-width:576px){.card-deck{-ms-flex-flow:row wrap;flex-flow:row wrap;margin-right:-15px;margin-left:-15px}.card-deck .card{display:-ms-flexbox;display:flex;-ms-flex:1 0 0%;flex:1 0 0%;-ms-flex-direction:column;flex-direction:column;margin-right:15px;margin-bottom:0;margin-left:15px}}.card-group{display:-ms-flexbox;display:flex;-ms-flex-direction:column;flex-direction:column}.card-group>.card{margin-bottom:15px}@media (min-width:576px){.card-group{-ms-flex-flow:row wrap;flex-flow:row wrap}.card-group>.card{-ms-flex:1 0 0%;flex:1 0 0%;margin-bottom:0}.card-group>.card+.card{margin-left:0;border-left:0}.card-group>.card:first-child{border-top-right-radius:0;border-bottom-right-radius:0}.card-group>.card:first-child .card-header,.card-group>.card:first-child .card-img-top{border-top-right-radius:0}.card-group>.card:first-child .card-footer,.card-group>.card:first-child .card-img-bottom{border-bottom-right-radius:0}.card-group>.card:last-child{border-top-left-radius:0;border-bottom-left-radius:0}.card-group>.card:last-child .card-header,.card-group>.card:last-child .card-img-top{border-top-left-radius:0}.card-group>.card:last-child .card-footer,.card-group>.card:last-child .card-img-bottom{border-bottom-left-radius:0}.card-group>.card:only-child{border-radius:.25rem}.card-group>.card:only-child .card-header,.card-group>.card:only-child .card-img-top{border-top-left-radius:.25rem;border-top-right-radius:.25rem}.card-group>.card:only-child .card-footer,.card-group>.card:only-child .card-img-bottom{border-bottom-right-radius:.25rem;border-bottom-left-radius:.25rem}.card-group>.card:not(:first-child):not(:last-child):not(:only-child){border-radius:0}.card-group>.card:not(:first-child):not(:last-child):not(:only-child) .card-footer,.card-group>.card:not(:first-child):not(:last-child):not(:only-child) .card-header,.card-group>.card:not(:first-child):not(:last-child):not(:only-child) .card-img-bottom,.card-group>.card:not(:first-child):not(:last-child):not(:only-child) .card-img-top{border-radius:0}}.card-columns .card{margin-bottom:.75rem}@media (min-width:576px){.card-columns{-webkit-column-count:3;-moz-column-count:3;column-count:3;-webkit-column-gap:1.25rem;-moz-column-gap:1.25rem;column-gap:1.25rem;orphans:1;widows:1}.card-columns .card{display:inline-block;width:100%}}.accordion .card:not(:first-of-type):not(:last-of-type){border-bottom:0;border-radius:0}.accordion .card:not(:first-of-type) .card-header:first-child{border-radius:0}.accordion .card:first-of-type{border-bottom:0;border-bottom-right-radius:0;border-bottom-left-radius:0}.accordion .card:last-of-type{border-top-left-radius:0;border-top-right-radius:0}.breadcrumb{display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;padding:.75rem 1rem;margin-bottom:1rem;list-style:none;background-color:#e9ecef;border-radius:.25rem}.breadcrumb-item+.breadcrumb-item{padding-left:.5rem}.breadcrumb-item+.breadcrumb-item::before{display:inline-block;padding-right:.5rem;color:#6c757d;content:"/"}.breadcrumb-item+.breadcrumb-item:hover::before{text-decoration:underline}.breadcrumb-item+.breadcrumb-item:hover::before{text-decoration:none}.breadcrumb-item.active{color:#6c757d}.pagination{display:-ms-flexbox;display:flex;padding-left:0;list-style:none;border-radius:.25rem}.page-link{position:relative;display:block;padding:.5rem .75rem;margin-left:-1px;line-height:1.25;color:#007bff;background-color:#fff;border:1px solid #dee2e6}.page-link:hover{z-index:2;color:#0056b3;text-decoration:none;background-color:#e9ecef;border-color:#dee2e6}.page-link:focus{z-index:2;outline:0;box-shadow:0 0 0 .2rem rgba(0,123,255,.25)}.page-link:not(:disabled):not(.disabled){cursor:pointer}.page-item:first-child .page-link{margin-left:0;border-top-left-radius:.25rem;border-bottom-left-radius:.25rem}.page-item:last-child .page-link{border-top-right-radius:.25rem;border-bottom-right-radius:.25rem}.page-item.active .page-link{z-index:1;color:#fff;background-color:#007bff;border-color:#007bff}.page-item.disabled .page-link{color:#6c757d;pointer-events:none;cursor:auto;background-color:#fff;border-color:#dee2e6}.pagination-lg .page-link{padding:.75rem 1.5rem;font-size:1.25rem;line-height:1.5}.pagination-lg .page-item:first-child .page-link{border-top-left-radius:.3rem;border-bottom-left-radius:.3rem}.pagination-lg .page-item:last-child .page-link{border-top-right-radius:.3rem;border-bottom-right-radius:.3rem}.pagination-sm .page-link{padding:.25rem .5rem;font-size:.875rem;line-height:1.5}.pagination-sm .page-item:first-child .page-link{border-top-left-radius:.2rem;border-bottom-left-radius:.2rem}.pagination-sm .page-item:last-child .page-link{border-top-right-radius:.2rem;border-bottom-right-radius:.2rem}.badge{display:inline-block;padding:.25em .4em;font-size:75%;font-weight:700;line-height:1;text-align:center;white-space:nowrap;vertical-align:baseline;border-radius:.25rem}.badge:empty{display:none}.btn .badge{position:relative;top:-1px}.badge-pill{padding-right:.6em;padding-left:.6em;border-radius:10rem}.badge-primary{color:#fff;background-color:#007bff}.badge-primary[href]:focus,.badge-primary[href]:hover{color:#fff;text-decoration:none;background-color:#0062cc}.badge-secondary{color:#fff;background-color:#6c757d}.badge-secondary[href]:focus,.badge-secondary[href]:hover{color:#fff;text-decoration:none;background-color:#545b62}.badge-success{color:#fff;background-color:#28a745}.badge-success[href]:focus,.badge-success[href]:hover{color:#fff;text-decoration:none;background-color:#1e7e34}.badge-info{color:#fff;background-color:#17a2b8}.badge-info[href]:focus,.badge-info[href]:hover{color:#fff;text-decoration:none;background-color:#117a8b}.badge-warning{color:#212529;background-color:#ffc107}.badge-warning[href]:focus,.badge-warning[href]:hover{color:#212529;text-decoration:none;background-color:#d39e00}.badge-danger{color:#fff;background-color:#dc3545}.badge-danger[href]:focus,.badge-danger[href]:hover{color:#fff;text-decoration:none;background-color:#bd2130}.badge-light{color:#212529;background-color:#f8f9fa}.badge-light[href]:focus,.badge-light[href]:hover{color:#212529;text-decoration:none;background-color:#dae0e5}.badge-dark{color:#fff;background-color:#343a40}.badge-dark[href]:focus,.badge-dark[href]:hover{color:#fff;text-decoration:none;background-color:#1d2124}.jumbotron{padding:2rem 1rem;margin-bottom:2rem;background-color:#e9ecef;border-radius:.3rem}@media (min-width:576px){.jumbotron{padding:4rem 2rem}}.jumbotron-fluid{padding-right:0;padding-left:0;border-radius:0}.alert{position:relative;padding:.75rem 1.25rem;margin-bottom:1rem;border:1px solid transparent;border-radius:.25rem}.alert-heading{color:inherit}.alert-link{font-weight:700}.alert-dismissible{padding-right:4rem}.alert-dismissible .close{position:absolute;top:0;right:0;padding:.75rem 1.25rem;color:inherit}.alert-primary{color:#004085;background-color:#cce5ff;border-color:#b8daff}.alert-primary hr{border-top-color:#9fcdff}.alert-primary .alert-link{color:#002752}.alert-secondary{color:#383d41;background-color:#e2e3e5;border-color:#d6d8db}.alert-secondary hr{border-top-color:#c8cbcf}.alert-secondary .alert-link{color:#202326}.alert-success{color:#155724;background-color:#d4edda;border-color:#c3e6cb}.alert-success hr{border-top-color:#b1dfbb}.alert-success .alert-link{color:#0b2e13}.alert-info{color:#0c5460;background-color:#d1ecf1;border-color:#bee5eb}.alert-info hr{border-top-color:#abdde5}.alert-info .alert-link{color:#062c33}.alert-warning{color:#856404;background-color:#fff3cd;border-color:#ffeeba}.alert-warning hr{border-top-color:#ffe8a1}.alert-warning .alert-link{color:#533f03}.alert-danger{color:#721c24;background-color:#f8d7da;border-color:#f5c6cb}.alert-danger hr{border-top-color:#f1b0b7}.alert-danger .alert-link{color:#491217}.alert-light{color:#818182;background-color:#fefefe;border-color:#fdfdfe}.alert-light hr{border-top-color:#ececf6}.alert-light .alert-link{color:#686868}.alert-dark{color:#1b1e21;background-color:#d6d8d9;border-color:#c6c8ca}.alert-dark hr{border-top-color:#b9bbbe}.alert-dark .alert-link{color:#040505}@-webkit-keyframes progress-bar-stripes{from{background-position:1rem 0}to{background-position:0 0}}@keyframes progress-bar-stripes{from{background-position:1rem 0}to{background-position:0 0}}.progress{display:-ms-flexbox;display:flex;height:1rem;overflow:hidden;font-size:.75rem;background-color:#e9ecef;border-radius:.25rem}.progress-bar{display:-ms-flexbox;display:flex;-ms-flex-direction:column;flex-direction:column;-ms-flex-pack:center;justify-content:center;color:#fff;text-align:center;white-space:nowrap;background-color:#007bff;transition:width .6s ease}@media screen and (prefers-reduced-motion:reduce){.progress-bar{transition:none}}.progress-bar-striped{background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-size:1rem 1rem}.progress-bar-animated{-webkit-animation:progress-bar-stripes 1s linear infinite;animation:progress-bar-stripes 1s linear infinite}.media{display:-ms-flexbox;display:flex;-ms-flex-align:start;align-items:flex-start}.media-body{-ms-flex:1;flex:1}.list-group{display:-ms-flexbox;display:flex;-ms-flex-direction:column;flex-direction:column;padding-left:0;margin-bottom:0}.list-group-item-action{width:100%;color:#495057;text-align:inherit}.list-group-item-action:focus,.list-group-item-action:hover{color:#495057;text-decoration:none;background-color:#f8f9fa}.list-group-item-action:active{color:#212529;background-color:#e9ecef}.list-group-item{position:relative;display:block;padding:.75rem 1.25rem;margin-bottom:-1px;background-color:#fff;border:1px solid rgba(0,0,0,.125)}.list-group-item:first-child{border-top-left-radius:.25rem;border-top-right-radius:.25rem}.list-group-item:last-child{margin-bottom:0;border-bottom-right-radius:.25rem;border-bottom-left-radius:.25rem}.list-group-item:focus,.list-group-item:hover{z-index:1;text-decoration:none}.list-group-item.disabled,.list-group-item:disabled{color:#6c757d;background-color:#fff}.list-group-item.active{z-index:2;color:#fff;background-color:#007bff;border-color:#007bff}.list-group-flush .list-group-item{border-right:0;border-left:0;border-radius:0}.list-group-flush:first-child .list-group-item:first-child{border-top:0}.list-group-flush:last-child .list-group-item:last-child{border-bottom:0}.list-group-item-primary{color:#004085;background-color:#b8daff}.list-group-item-primary.list-group-item-action:focus,.list-group-item-primary.list-group-item-action:hover{color:#004085;background-color:#9fcdff}.list-group-item-primary.list-group-item-action.active{color:#fff;background-color:#004085;border-color:#004085}.list-group-item-secondary{color:#383d41;background-color:#d6d8db}.list-group-item-secondary.list-group-item-action:focus,.list-group-item-secondary.list-group-item-action:hover{color:#383d41;background-color:#c8cbcf}.list-group-item-secondary.list-group-item-action.active{color:#fff;background-color:#383d41;border-color:#383d41}.list-group-item-success{color:#155724;background-color:#c3e6cb}.list-group-item-success.list-group-item-action:focus,.list-group-item-success.list-group-item-action:hover{color:#155724;background-color:#b1dfbb}.list-group-item-success.list-group-item-action.active{color:#fff;background-color:#155724;border-color:#155724}.list-group-item-info{color:#0c5460;background-color:#bee5eb}.list-group-item-info.list-group-item-action:focus,.list-group-item-info.list-group-item-action:hover{color:#0c5460;background-color:#abdde5}.list-group-item-info.list-group-item-action.active{color:#fff;background-color:#0c5460;border-color:#0c5460}.list-group-item-warning{color:#856404;background-color:#ffeeba}.list-group-item-warning.list-group-item-action:focus,.list-group-item-warning.list-group-item-action:hover{color:#856404;background-color:#ffe8a1}.list-group-item-warning.list-group-item-action.active{color:#fff;background-color:#856404;border-color:#856404}.list-group-item-danger{color:#721c24;background-color:#f5c6cb}.list-group-item-danger.list-group-item-action:focus,.list-group-item-danger.list-group-item-action:hover{color:#721c24;background-color:#f1b0b7}.list-group-item-danger.list-group-item-action.active{color:#fff;background-color:#721c24;border-color:#721c24}.list-group-item-light{color:#818182;background-color:#fdfdfe}.list-group-item-light.list-group-item-action:focus,.list-group-item-light.list-group-item-action:hover{color:#818182;background-color:#ececf6}.list-group-item-light.list-group-item-action.active{color:#fff;background-color:#818182;border-color:#818182}.list-group-item-dark{color:#1b1e21;background-color:#c6c8ca}.list-group-item-dark.list-group-item-action:focus,.list-group-item-dark.list-group-item-action:hover{color:#1b1e21;background-color:#b9bbbe}.list-group-item-dark.list-group-item-action.active{color:#fff;background-color:#1b1e21;border-color:#1b1e21}.close{float:right;font-size:1.5rem;font-weight:700;line-height:1;color:#000;text-shadow:0 1px 0 #fff;opacity:.5}.close:not(:disabled):not(.disabled){cursor:pointer}.close:not(:disabled):not(.disabled):focus,.close:not(:disabled):not(.disabled):hover{color:#000;text-decoration:none;opacity:.75}button.close{padding:0;background-color:transparent;border:0;-webkit-appearance:none}.modal-open{overflow:hidden}.modal-open .modal{overflow-x:hidden;overflow-y:auto}.modal{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1050;display:none;overflow:hidden;outline:0}.modal-dialog{position:relative;width:auto;margin:.5rem;pointer-events:none}.modal.fade .modal-dialog{transition:-webkit-transform .3s ease-out;transition:transform .3s ease-out;transition:transform .3s ease-out,-webkit-transform .3s ease-out;-webkit-transform:translate(0,-25%);transform:translate(0,-25%)}@media screen and (prefers-reduced-motion:reduce){.modal.fade .modal-dialog{transition:none}}.modal.show .modal-dialog{-webkit-transform:translate(0,0);transform:translate(0,0)}.modal-dialog-centered{display:-ms-flexbox;display:flex;-ms-flex-align:center;align-items:center;min-height:calc(100% - (.5rem * 2))}.modal-dialog-centered::before{display:block;height:calc(100vh - (.5rem * 2));content:""}.modal-content{position:relative;display:-ms-flexbox;display:flex;-ms-flex-direction:column;flex-direction:column;width:100%;pointer-events:auto;background-color:#fff;background-clip:padding-box;border:1px solid rgba(0,0,0,.2);border-radius:.3rem;outline:0}.modal-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1040;background-color:#000}.modal-backdrop.fade{opacity:0}.modal-backdrop.show{opacity:.5}.modal-header{display:-ms-flexbox;display:flex;-ms-flex-align:start;align-items:flex-start;-ms-flex-pack:justify;justify-content:space-between;padding:1rem;border-bottom:1px solid #e9ecef;border-top-left-radius:.3rem;border-top-right-radius:.3rem}.modal-header .close{padding:1rem;margin:-1rem -1rem -1rem auto}.modal-title{margin-bottom:0;line-height:1.5}.modal-body{position:relative;-ms-flex:1 1 auto;flex:1 1 auto;padding:1rem}.modal-footer{display:-ms-flexbox;display:flex;-ms-flex-align:center;align-items:center;-ms-flex-pack:end;justify-content:flex-end;padding:1rem;border-top:1px solid #e9ecef}.modal-footer>:not(:first-child){margin-left:.25rem}.modal-footer>:not(:last-child){margin-right:.25rem}.modal-scrollbar-measure{position:absolute;top:-9999px;width:50px;height:50px;overflow:scroll}@media (min-width:576px){.modal-dialog{max-width:500px;margin:1.75rem auto}.modal-dialog-centered{min-height:calc(100% - (1.75rem * 2))}.modal-dialog-centered::before{height:calc(100vh - (1.75rem * 2))}.modal-sm{max-width:300px}}@media (min-width:992px){.modal-lg{max-width:800px}}.tooltip{position:absolute;z-index:1070;display:block;margin:0;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji";font-style:normal;font-weight:400;line-height:1.5;text-align:left;text-align:start;text-decoration:none;text-shadow:none;text-transform:none;letter-spacing:normal;word-break:normal;word-spacing:normal;white-space:normal;line-break:auto;font-size:.875rem;word-wrap:break-word;opacity:0}.tooltip.show{opacity:.9}.tooltip .arrow{position:absolute;display:block;width:.8rem;height:.4rem}.tooltip .arrow::before{position:absolute;content:"";border-color:transparent;border-style:solid}.bs-tooltip-auto[x-placement^=top],.bs-tooltip-top{padding:.4rem 0}.bs-tooltip-auto[x-placement^=top] .arrow,.bs-tooltip-top .arrow{bottom:0}.bs-tooltip-auto[x-placement^=top] .arrow::before,.bs-tooltip-top .arrow::before{top:0;border-width:.4rem .4rem 0;border-top-color:#000}.bs-tooltip-auto[x-placement^=right],.bs-tooltip-right{padding:0 .4rem}.bs-tooltip-auto[x-placement^=right] .arrow,.bs-tooltip-right .arrow{left:0;width:.4rem;height:.8rem}.bs-tooltip-auto[x-placement^=right] .arrow::before,.bs-tooltip-right .arrow::before{right:0;border-width:.4rem .4rem .4rem 0;border-right-color:#000}.bs-tooltip-auto[x-placement^=bottom],.bs-tooltip-bottom{padding:.4rem 0}.bs-tooltip-auto[x-placement^=bottom] .arrow,.bs-tooltip-bottom .arrow{top:0}.bs-tooltip-auto[x-placement^=bottom] .arrow::before,.bs-tooltip-bottom .arrow::before{bottom:0;border-width:0 .4rem .4rem;border-bottom-color:#000}.bs-tooltip-auto[x-placement^=left],.bs-tooltip-left{padding:0 .4rem}.bs-tooltip-auto[x-placement^=left] .arrow,.bs-tooltip-left .arrow{right:0;width:.4rem;height:.8rem}.bs-tooltip-auto[x-placement^=left] .arrow::before,.bs-tooltip-left .arrow::before{left:0;border-width:.4rem 0 .4rem .4rem;border-left-color:#000}.tooltip-inner{max-width:200px;padding:.25rem .5rem;color:#fff;text-align:center;background-color:#000;border-radius:.25rem}.popover{position:absolute;top:0;left:0;z-index:1060;display:block;max-width:276px;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji";font-style:normal;font-weight:400;line-height:1.5;text-align:left;text-align:start;text-decoration:none;text-shadow:none;text-transform:none;letter-spacing:normal;word-break:normal;word-spacing:normal;white-space:normal;line-break:auto;font-size:.875rem;word-wrap:break-word;background-color:#fff;background-clip:padding-box;border:1px solid rgba(0,0,0,.2);border-radius:.3rem}.popover .arrow{position:absolute;display:block;width:1rem;height:.5rem;margin:0 .3rem}.popover .arrow::after,.popover .arrow::before{position:absolute;display:block;content:"";border-color:transparent;border-style:solid}.bs-popover-auto[x-placement^=top],.bs-popover-top{margin-bottom:.5rem}.bs-popover-auto[x-placement^=top] .arrow,.bs-popover-top .arrow{bottom:calc((.5rem + 1px) * -1)}.bs-popover-auto[x-placement^=top] .arrow::after,.bs-popover-auto[x-placement^=top] .arrow::before,.bs-popover-top .arrow::after,.bs-popover-top .arrow::before{border-width:.5rem .5rem 0}.bs-popover-auto[x-placement^=top] .arrow::before,.bs-popover-top .arrow::before{bottom:0;border-top-color:rgba(0,0,0,.25)}.bs-popover-auto[x-placement^=top] .arrow::after,.bs-popover-top .arrow::after{bottom:1px;border-top-color:#fff}.bs-popover-auto[x-placement^=right],.bs-popover-right{margin-left:.5rem}.bs-popover-auto[x-placement^=right] .arrow,.bs-popover-right .arrow{left:calc((.5rem + 1px) * -1);width:.5rem;height:1rem;margin:.3rem 0}.bs-popover-auto[x-placement^=right] .arrow::after,.bs-popover-auto[x-placement^=right] .arrow::before,.bs-popover-right .arrow::after,.bs-popover-right .arrow::before{border-width:.5rem .5rem .5rem 0}.bs-popover-auto[x-placement^=right] .arrow::before,.bs-popover-right .arrow::before{left:0;border-right-color:rgba(0,0,0,.25)}.bs-popover-auto[x-placement^=right] .arrow::after,.bs-popover-right .arrow::after{left:1px;border-right-color:#fff}.bs-popover-auto[x-placement^=bottom],.bs-popover-bottom{margin-top:.5rem}.bs-popover-auto[x-placement^=bottom] .arrow,.bs-popover-bottom .arrow{top:calc((.5rem + 1px) * -1)}.bs-popover-auto[x-placement^=bottom] .arrow::after,.bs-popover-auto[x-placement^=bottom] .arrow::before,.bs-popover-bottom .arrow::after,.bs-popover-bottom .arrow::before{border-width:0 .5rem .5rem .5rem}.bs-popover-auto[x-placement^=bottom] .arrow::before,.bs-popover-bottom .arrow::before{top:0;border-bottom-color:rgba(0,0,0,.25)}.bs-popover-auto[x-placement^=bottom] .arrow::after,.bs-popover-bottom .arrow::after{top:1px;border-bottom-color:#fff}.bs-popover-auto[x-placement^=bottom] .popover-header::before,.bs-popover-bottom .popover-header::before{position:absolute;top:0;left:50%;display:block;width:1rem;margin-left:-.5rem;content:"";border-bottom:1px solid #f7f7f7}.bs-popover-auto[x-placement^=left],.bs-popover-left{margin-right:.5rem}.bs-popover-auto[x-placement^=left] .arrow,.bs-popover-left .arrow{right:calc((.5rem + 1px) * -1);width:.5rem;height:1rem;margin:.3rem 0}.bs-popover-auto[x-placement^=left] .arrow::after,.bs-popover-auto[x-placement^=left] .arrow::before,.bs-popover-left .arrow::after,.bs-popover-left .arrow::before{border-width:.5rem 0 .5rem .5rem}.bs-popover-auto[x-placement^=left] .arrow::before,.bs-popover-left .arrow::before{right:0;border-left-color:rgba(0,0,0,.25)}.bs-popover-auto[x-placement^=left] .arrow::after,.bs-popover-left .arrow::after{right:1px;border-left-color:#fff}.popover-header{padding:.5rem .75rem;margin-bottom:0;font-size:1rem;color:inherit;background-color:#f7f7f7;border-bottom:1px solid #ebebeb;border-top-left-radius:calc(.3rem - 1px);border-top-right-radius:calc(.3rem - 1px)}.popover-header:empty{display:none}.popover-body{padding:.5rem .75rem;color:#212529}.carousel{position:relative}.carousel-inner{position:relative;width:100%;overflow:hidden}.carousel-item{position:relative;display:none;-ms-flex-align:center;align-items:center;width:100%;-webkit-backface-visibility:hidden;backface-visibility:hidden;-webkit-perspective:1000px;perspective:1000px}.carousel-item-next,.carousel-item-prev,.carousel-item.active{display:block;transition:-webkit-transform .6s ease;transition:transform .6s ease;transition:transform .6s ease,-webkit-transform .6s ease}@media screen and (prefers-reduced-motion:reduce){.carousel-item-next,.carousel-item-prev,.carousel-item.active{transition:none}}.carousel-item-next,.carousel-item-prev{position:absolute;top:0}.carousel-item-next.carousel-item-left,.carousel-item-prev.carousel-item-right{-webkit-transform:translateX(0);transform:translateX(0)}@supports ((-webkit-transform-style:preserve-3d) or (transform-style:preserve-3d)){.carousel-item-next.carousel-item-left,.carousel-item-prev.carousel-item-right{-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0)}}.active.carousel-item-right,.carousel-item-next{-webkit-transform:translateX(100%);transform:translateX(100%)}@supports ((-webkit-transform-style:preserve-3d) or (transform-style:preserve-3d)){.active.carousel-item-right,.carousel-item-next{-webkit-transform:translate3d(100%,0,0);transform:translate3d(100%,0,0)}}.active.carousel-item-left,.carousel-item-prev{-webkit-transform:translateX(-100%);transform:translateX(-100%)}@supports ((-webkit-transform-style:preserve-3d) or (transform-style:preserve-3d)){.active.carousel-item-left,.carousel-item-prev{-webkit-transform:translate3d(-100%,0,0);transform:translate3d(-100%,0,0)}}.carousel-fade .carousel-item{opacity:0;transition-duration:.6s;transition-property:opacity}.carousel-fade .carousel-item-next.carousel-item-left,.carousel-fade .carousel-item-prev.carousel-item-right,.carousel-fade .carousel-item.active{opacity:1}.carousel-fade .active.carousel-item-left,.carousel-fade .active.carousel-item-right{opacity:0}.carousel-fade .active.carousel-item-left,.carousel-fade .active.carousel-item-prev,.carousel-fade .carousel-item-next,.carousel-fade .carousel-item-prev,.carousel-fade .carousel-item.active{-webkit-transform:translateX(0);transform:translateX(0)}@supports ((-webkit-transform-style:preserve-3d) or (transform-style:preserve-3d)){.carousel-fade .active.carousel-item-left,.carousel-fade .active.carousel-item-prev,.carousel-fade .carousel-item-next,.carousel-fade .carousel-item-prev,.carousel-fade .carousel-item.active{-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0)}}.carousel-control-next,.carousel-control-prev{position:absolute;top:0;bottom:0;display:-ms-flexbox;display:flex;-ms-flex-align:center;align-items:center;-ms-flex-pack:center;justify-content:center;width:15%;color:#fff;text-align:center;opacity:.5}.carousel-control-next:focus,.carousel-control-next:hover,.carousel-control-prev:focus,.carousel-control-prev:hover{color:#fff;text-decoration:none;outline:0;opacity:.9}.carousel-control-prev{left:0}.carousel-control-next{right:0}.carousel-control-next-icon,.carousel-control-prev-icon{display:inline-block;width:20px;height:20px;background:transparent no-repeat center center;background-size:100% 100%}.carousel-control-prev-icon{background-image:url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' fill='%23fff' viewBox='0 0 8 8'%3E%3Cpath d='M5.25 0l-4 4 4 4 1.5-1.5-2.5-2.5 2.5-2.5-1.5-1.5z'/%3E%3C/svg%3E")}.carousel-control-next-icon{background-image:url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' fill='%23fff' viewBox='0 0 8 8'%3E%3Cpath d='M2.75 0l-1.5 1.5 2.5 2.5-2.5 2.5 1.5 1.5 4-4-4-4z'/%3E%3C/svg%3E")}.carousel-indicators{position:absolute;right:0;bottom:10px;left:0;z-index:15;display:-ms-flexbox;display:flex;-ms-flex-pack:center;justify-content:center;padding-left:0;margin-right:15%;margin-left:15%;list-style:none}.carousel-indicators li{position:relative;-ms-flex:0 1 auto;flex:0 1 auto;width:30px;height:3px;margin-right:3px;margin-left:3px;text-indent:-999px;cursor:pointer;background-color:rgba(255,255,255,.5)}.carousel-indicators li::before{position:absolute;top:-10px;left:0;display:inline-block;width:100%;height:10px;content:""}.carousel-indicators li::after{position:absolute;bottom:-10px;left:0;display:inline-block;width:100%;height:10px;content:""}.carousel-indicators .active{background-color:#fff}.carousel-caption{position:absolute;right:15%;bottom:20px;left:15%;z-index:10;padding-top:20px;padding-bottom:20px;color:#fff;text-align:center}.align-baseline{vertical-align:baseline!important}.align-top{vertical-align:top!important}.align-middle{vertical-align:middle!important}.align-bottom{vertical-align:bottom!important}.align-text-bottom{vertical-align:text-bottom!important}.align-text-top{vertical-align:text-top!important}.bg-primary{background-color:#007bff!important}a.bg-primary:focus,a.bg-primary:hover,button.bg-primary:focus,button.bg-primary:hover{background-color:#0062cc!important}.bg-secondary{background-color:#6c757d!important}a.bg-secondary:focus,a.bg-secondary:hover,button.bg-secondary:focus,button.bg-secondary:hover{background-color:#545b62!important}.bg-success{background-color:#28a745!important}a.bg-success:focus,a.bg-success:hover,button.bg-success:focus,button.bg-success:hover{background-color:#1e7e34!important}.bg-info{background-color:#17a2b8!important}a.bg-info:focus,a.bg-info:hover,button.bg-info:focus,button.bg-info:hover{background-color:#117a8b!important}.bg-warning{background-color:#ffc107!important}a.bg-warning:focus,a.bg-warning:hover,button.bg-warning:focus,button.bg-warning:hover{background-color:#d39e00!important}.bg-danger{background-color:#dc3545!important}a.bg-danger:focus,a.bg-danger:hover,button.bg-danger:focus,button.bg-danger:hover{background-color:#bd2130!important}.bg-light{background-color:#f8f9fa!important}a.bg-light:focus,a.bg-light:hover,button.bg-light:focus,button.bg-light:hover{background-color:#dae0e5!important}.bg-dark{background-color:#343a40!important}a.bg-dark:focus,a.bg-dark:hover,button.bg-dark:focus,button.bg-dark:hover{background-color:#1d2124!important}.bg-white{background-color:#fff!important}.bg-transparent{background-color:transparent!important}.border{border:1px solid #dee2e6!important}.border-top{border-top:1px solid #dee2e6!important}.border-right{border-right:1px solid #dee2e6!important}.border-bottom{border-bottom:1px solid #dee2e6!important}.border-left{border-left:1px solid #dee2e6!important}.border-0{border:0!important}.border-top-0{border-top:0!important}.border-right-0{border-right:0!important}.border-bottom-0{border-bottom:0!important}.border-left-0{border-left:0!important}.border-primary{border-color:#007bff!important}.border-secondary{border-color:#6c757d!important}.border-success{border-color:#28a745!important}.border-info{border-color:#17a2b8!important}.border-warning{border-color:#ffc107!important}.border-danger{border-color:#dc3545!important}.border-light{border-color:#f8f9fa!important}.border-dark{border-color:#343a40!important}.border-white{border-color:#fff!important}.rounded{border-radius:.25rem!important}.rounded-top{border-top-left-radius:.25rem!important;border-top-right-radius:.25rem!important}.rounded-right{border-top-right-radius:.25rem!important;border-bottom-right-radius:.25rem!important}.rounded-bottom{border-bottom-right-radius:.25rem!important;border-bottom-left-radius:.25rem!important}.rounded-left{border-top-left-radius:.25rem!important;border-bottom-left-radius:.25rem!important}.rounded-circle{border-radius:50%!important}.rounded-0{border-radius:0!important}.clearfix::after{display:block;clear:both;content:""}.d-none{display:none!important}.d-inline{display:inline!important}.d-inline-block{display:inline-block!important}.d-block{display:block!important}.d-table{display:table!important}.d-table-row{display:table-row!important}.d-table-cell{display:table-cell!important}.d-flex{display:-ms-flexbox!important;display:flex!important}.d-inline-flex{display:-ms-inline-flexbox!important;display:inline-flex!important}@media (min-width:576px){.d-sm-none{display:none!important}.d-sm-inline{display:inline!important}.d-sm-inline-block{display:inline-block!important}.d-sm-block{display:block!important}.d-sm-table{display:table!important}.d-sm-table-row{display:table-row!important}.d-sm-table-cell{display:table-cell!important}.d-sm-flex{display:-ms-flexbox!important;display:flex!important}.d-sm-inline-flex{display:-ms-inline-flexbox!important;display:inline-flex!important}}@media (min-width:768px){.d-md-none{display:none!important}.d-md-inline{display:inline!important}.d-md-inline-block{display:inline-block!important}.d-md-block{display:block!important}.d-md-table{display:table!important}.d-md-table-row{display:table-row!important}.d-md-table-cell{display:table-cell!important}.d-md-flex{display:-ms-flexbox!important;display:flex!important}.d-md-inline-flex{display:-ms-inline-flexbox!important;display:inline-flex!important}}@media (min-width:992px){.d-lg-none{display:none!important}.d-lg-inline{display:inline!important}.d-lg-inline-block{display:inline-block!important}.d-lg-block{display:block!important}.d-lg-table{display:table!important}.d-lg-table-row{display:table-row!important}.d-lg-table-cell{display:table-cell!important}.d-lg-flex{display:-ms-flexbox!important;display:flex!important}.d-lg-inline-flex{display:-ms-inline-flexbox!important;display:inline-flex!important}}@media (min-width:1200px){.d-xl-none{display:none!important}.d-xl-inline{display:inline!important}.d-xl-inline-block{display:inline-block!important}.d-xl-block{display:block!important}.d-xl-table{display:table!important}.d-xl-table-row{display:table-row!important}.d-xl-table-cell{display:table-cell!important}.d-xl-flex{display:-ms-flexbox!important;display:flex!important}.d-xl-inline-flex{display:-ms-inline-flexbox!important;display:inline-flex!important}}@media print{.d-print-none{display:none!important}.d-print-inline{display:inline!important}.d-print-inline-block{display:inline-block!important}.d-print-block{display:block!important}.d-print-table{display:table!important}.d-print-table-row{display:table-row!important}.d-print-table-cell{display:table-cell!important}.d-print-flex{display:-ms-flexbox!important;display:flex!important}.d-print-inline-flex{display:-ms-inline-flexbox!important;display:inline-flex!important}}.embed-responsive{position:relative;display:block;width:100%;padding:0;overflow:hidden}.embed-responsive::before{display:block;content:""}.embed-responsive .embed-responsive-item,.embed-responsive embed,.embed-responsive iframe,.embed-responsive object,.embed-responsive video{position:absolute;top:0;bottom:0;left:0;width:100%;height:100%;border:0}.embed-responsive-21by9::before{padding-top:42.857143%}.embed-responsive-16by9::before{padding-top:56.25%}.embed-responsive-4by3::before{padding-top:75%}.embed-responsive-1by1::before{padding-top:100%}.flex-row{-ms-flex-direction:row!important;flex-direction:row!important}.flex-column{-ms-flex-direction:column!important;flex-direction:column!important}.flex-row-reverse{-ms-flex-direction:row-reverse!important;flex-direction:row-reverse!important}.flex-column-reverse{-ms-flex-direction:column-reverse!important;flex-direction:column-reverse!important}.flex-wrap{-ms-flex-wrap:wrap!important;flex-wrap:wrap!important}.flex-nowrap{-ms-flex-wrap:nowrap!important;flex-wrap:nowrap!important}.flex-wrap-reverse{-ms-flex-wrap:wrap-reverse!important;flex-wrap:wrap-reverse!important}.flex-fill{-ms-flex:1 1 auto!important;flex:1 1 auto!important}.flex-grow-0{-ms-flex-positive:0!important;flex-grow:0!important}.flex-grow-1{-ms-flex-positive:1!important;flex-grow:1!important}.flex-shrink-0{-ms-flex-negative:0!important;flex-shrink:0!important}.flex-shrink-1{-ms-flex-negative:1!important;flex-shrink:1!important}.justify-content-start{-ms-flex-pack:start!important;justify-content:flex-start!important}.justify-content-end{-ms-flex-pack:end!important;justify-content:flex-end!important}.justify-content-center{-ms-flex-pack:center!important;justify-content:center!important}.justify-content-between{-ms-flex-pack:justify!important;justify-content:space-between!important}.justify-content-around{-ms-flex-pack:distribute!important;justify-content:space-around!important}.align-items-start{-ms-flex-align:start!important;align-items:flex-start!important}.align-items-end{-ms-flex-align:end!important;align-items:flex-end!important}.align-items-center{-ms-flex-align:center!important;align-items:center!important}.align-items-baseline{-ms-flex-align:baseline!important;align-items:baseline!important}.align-items-stretch{-ms-flex-align:stretch!important;align-items:stretch!important}.align-content-start{-ms-flex-line-pack:start!important;align-content:flex-start!important}.align-content-end{-ms-flex-line-pack:end!important;align-content:flex-end!important}.align-content-center{-ms-flex-line-pack:center!important;align-content:center!important}.align-content-between{-ms-flex-line-pack:justify!important;align-content:space-between!important}.align-content-around{-ms-flex-line-pack:distribute!important;align-content:space-around!important}.align-content-stretch{-ms-flex-line-pack:stretch!important;align-content:stretch!important}.align-self-auto{-ms-flex-item-align:auto!important;align-self:auto!important}.align-self-start{-ms-flex-item-align:start!important;align-self:flex-start!important}.align-self-end{-ms-flex-item-align:end!important;align-self:flex-end!important}.align-self-center{-ms-flex-item-align:center!important;align-self:center!important}.align-self-baseline{-ms-flex-item-align:baseline!important;align-self:baseline!important}.align-self-stretch{-ms-flex-item-align:stretch!important;align-self:stretch!important}@media (min-width:576px){.flex-sm-row{-ms-flex-direction:row!important;flex-direction:row!important}.flex-sm-column{-ms-flex-direction:column!important;flex-direction:column!important}.flex-sm-row-reverse{-ms-flex-direction:row-reverse!important;flex-direction:row-reverse!important}.flex-sm-column-reverse{-ms-flex-direction:column-reverse!important;flex-direction:column-reverse!important}.flex-sm-wrap{-ms-flex-wrap:wrap!important;flex-wrap:wrap!important}.flex-sm-nowrap{-ms-flex-wrap:nowrap!important;flex-wrap:nowrap!important}.flex-sm-wrap-reverse{-ms-flex-wrap:wrap-reverse!important;flex-wrap:wrap-reverse!important}.flex-sm-fill{-ms-flex:1 1 auto!important;flex:1 1 auto!important}.flex-sm-grow-0{-ms-flex-positive:0!important;flex-grow:0!important}.flex-sm-grow-1{-ms-flex-positive:1!important;flex-grow:1!important}.flex-sm-shrink-0{-ms-flex-negative:0!important;flex-shrink:0!important}.flex-sm-shrink-1{-ms-flex-negative:1!important;flex-shrink:1!important}.justify-content-sm-start{-ms-flex-pack:start!important;justify-content:flex-start!important}.justify-content-sm-end{-ms-flex-pack:end!important;justify-content:flex-end!important}.justify-content-sm-center{-ms-flex-pack:center!important;justify-content:center!important}.justify-content-sm-between{-ms-flex-pack:justify!important;justify-content:space-between!important}.justify-content-sm-around{-ms-flex-pack:distribute!important;justify-content:space-around!important}.align-items-sm-start{-ms-flex-align:start!important;align-items:flex-start!important}.align-items-sm-end{-ms-flex-align:end!important;align-items:flex-end!important}.align-items-sm-center{-ms-flex-align:center!important;align-items:center!important}.align-items-sm-baseline{-ms-flex-align:baseline!important;align-items:baseline!important}.align-items-sm-stretch{-ms-flex-align:stretch!important;align-items:stretch!important}.align-content-sm-start{-ms-flex-line-pack:start!important;align-content:flex-start!important}.align-content-sm-end{-ms-flex-line-pack:end!important;align-content:flex-end!important}.align-content-sm-center{-ms-flex-line-pack:center!important;align-content:center!important}.align-content-sm-between{-ms-flex-line-pack:justify!important;align-content:space-between!important}.align-content-sm-around{-ms-flex-line-pack:distribute!important;align-content:space-around!important}.align-content-sm-stretch{-ms-flex-line-pack:stretch!important;align-content:stretch!important}.align-self-sm-auto{-ms-flex-item-align:auto!important;align-self:auto!important}.align-self-sm-start{-ms-flex-item-align:start!important;align-self:flex-start!important}.align-self-sm-end{-ms-flex-item-align:end!important;align-self:flex-end!important}.align-self-sm-center{-ms-flex-item-align:center!important;align-self:center!important}.align-self-sm-baseline{-ms-flex-item-align:baseline!important;align-self:baseline!important}.align-self-sm-stretch{-ms-flex-item-align:stretch!important;align-self:stretch!important}}@media (min-width:768px){.flex-md-row{-ms-flex-direction:row!important;flex-direction:row!important}.flex-md-column{-ms-flex-direction:column!important;flex-direction:column!important}.flex-md-row-reverse{-ms-flex-direction:row-reverse!important;flex-direction:row-reverse!important}.flex-md-column-reverse{-ms-flex-direction:column-reverse!important;flex-direction:column-reverse!important}.flex-md-wrap{-ms-flex-wrap:wrap!important;flex-wrap:wrap!important}.flex-md-nowrap{-ms-flex-wrap:nowrap!important;flex-wrap:nowrap!important}.flex-md-wrap-reverse{-ms-flex-wrap:wrap-reverse!important;flex-wrap:wrap-reverse!important}.flex-md-fill{-ms-flex:1 1 auto!important;flex:1 1 auto!important}.flex-md-grow-0{-ms-flex-positive:0!important;flex-grow:0!important}.flex-md-grow-1{-ms-flex-positive:1!important;flex-grow:1!important}.flex-md-shrink-0{-ms-flex-negative:0!important;flex-shrink:0!important}.flex-md-shrink-1{-ms-flex-negative:1!important;flex-shrink:1!important}.justify-content-md-start{-ms-flex-pack:start!important;justify-content:flex-start!important}.justify-content-md-end{-ms-flex-pack:end!important;justify-content:flex-end!important}.justify-content-md-center{-ms-flex-pack:center!important;justify-content:center!important}.justify-content-md-between{-ms-flex-pack:justify!important;justify-content:space-between!important}.justify-content-md-around{-ms-flex-pack:distribute!important;justify-content:space-around!important}.align-items-md-start{-ms-flex-align:start!important;align-items:flex-start!important}.align-items-md-end{-ms-flex-align:end!important;align-items:flex-end!important}.align-items-md-center{-ms-flex-align:center!important;align-items:center!important}.align-items-md-baseline{-ms-flex-align:baseline!important;align-items:baseline!important}.align-items-md-stretch{-ms-flex-align:stretch!important;align-items:stretch!important}.align-content-md-start{-ms-flex-line-pack:start!important;align-content:flex-start!important}.align-content-md-end{-ms-flex-line-pack:end!important;align-content:flex-end!important}.align-content-md-center{-ms-flex-line-pack:center!important;align-content:center!important}.align-content-md-between{-ms-flex-line-pack:justify!important;align-content:space-between!important}.align-content-md-around{-ms-flex-line-pack:distribute!important;align-content:space-around!important}.align-content-md-stretch{-ms-flex-line-pack:stretch!important;align-content:stretch!important}.align-self-md-auto{-ms-flex-item-align:auto!important;align-self:auto!important}.align-self-md-start{-ms-flex-item-align:start!important;align-self:flex-start!important}.align-self-md-end{-ms-flex-item-align:end!important;align-self:flex-end!important}.align-self-md-center{-ms-flex-item-align:center!important;align-self:center!important}.align-self-md-baseline{-ms-flex-item-align:baseline!important;align-self:baseline!important}.align-self-md-stretch{-ms-flex-item-align:stretch!important;align-self:stretch!important}}@media (min-width:992px){.flex-lg-row{-ms-flex-direction:row!important;flex-direction:row!important}.flex-lg-column{-ms-flex-direction:column!important;flex-direction:column!important}.flex-lg-row-reverse{-ms-flex-direction:row-reverse!important;flex-direction:row-reverse!important}.flex-lg-column-reverse{-ms-flex-direction:column-reverse!important;flex-direction:column-reverse!important}.flex-lg-wrap{-ms-flex-wrap:wrap!important;flex-wrap:wrap!important}.flex-lg-nowrap{-ms-flex-wrap:nowrap!important;flex-wrap:nowrap!important}.flex-lg-wrap-reverse{-ms-flex-wrap:wrap-reverse!important;flex-wrap:wrap-reverse!important}.flex-lg-fill{-ms-flex:1 1 auto!important;flex:1 1 auto!important}.flex-lg-grow-0{-ms-flex-positive:0!important;flex-grow:0!important}.flex-lg-grow-1{-ms-flex-positive:1!important;flex-grow:1!important}.flex-lg-shrink-0{-ms-flex-negative:0!important;flex-shrink:0!important}.flex-lg-shrink-1{-ms-flex-negative:1!important;flex-shrink:1!important}.justify-content-lg-start{-ms-flex-pack:start!important;justify-content:flex-start!important}.justify-content-lg-end{-ms-flex-pack:end!important;justify-content:flex-end!important}.justify-content-lg-center{-ms-flex-pack:center!important;justify-content:center!important}.justify-content-lg-between{-ms-flex-pack:justify!important;justify-content:space-between!important}.justify-content-lg-around{-ms-flex-pack:distribute!important;justify-content:space-around!important}.align-items-lg-start{-ms-flex-align:start!important;align-items:flex-start!important}.align-items-lg-end{-ms-flex-align:end!important;align-items:flex-end!important}.align-items-lg-center{-ms-flex-align:center!important;align-items:center!important}.align-items-lg-baseline{-ms-flex-align:baseline!important;align-items:baseline!important}.align-items-lg-stretch{-ms-flex-align:stretch!important;align-items:stretch!important}.align-content-lg-start{-ms-flex-line-pack:start!important;align-content:flex-start!important}.align-content-lg-end{-ms-flex-line-pack:end!important;align-content:flex-end!important}.align-content-lg-center{-ms-flex-line-pack:center!important;align-content:center!important}.align-content-lg-between{-ms-flex-line-pack:justify!important;align-content:space-between!important}.align-content-lg-around{-ms-flex-line-pack:distribute!important;align-content:space-around!important}.align-content-lg-stretch{-ms-flex-line-pack:stretch!important;align-content:stretch!important}.align-self-lg-auto{-ms-flex-item-align:auto!important;align-self:auto!important}.align-self-lg-start{-ms-flex-item-align:start!important;align-self:flex-start!important}.align-self-lg-end{-ms-flex-item-align:end!important;align-self:flex-end!important}.align-self-lg-center{-ms-flex-item-align:center!important;align-self:center!important}.align-self-lg-baseline{-ms-flex-item-align:baseline!important;align-self:baseline!important}.align-self-lg-stretch{-ms-flex-item-align:stretch!important;align-self:stretch!important}}@media (min-width:1200px){.flex-xl-row{-ms-flex-direction:row!important;flex-direction:row!important}.flex-xl-column{-ms-flex-direction:column!important;flex-direction:column!important}.flex-xl-row-reverse{-ms-flex-direction:row-reverse!important;flex-direction:row-reverse!important}.flex-xl-column-reverse{-ms-flex-direction:column-reverse!important;flex-direction:column-reverse!important}.flex-xl-wrap{-ms-flex-wrap:wrap!important;flex-wrap:wrap!important}.flex-xl-nowrap{-ms-flex-wrap:nowrap!important;flex-wrap:nowrap!important}.flex-xl-wrap-reverse{-ms-flex-wrap:wrap-reverse!important;flex-wrap:wrap-reverse!important}.flex-xl-fill{-ms-flex:1 1 auto!important;flex:1 1 auto!important}.flex-xl-grow-0{-ms-flex-positive:0!important;flex-grow:0!important}.flex-xl-grow-1{-ms-flex-positive:1!important;flex-grow:1!important}.flex-xl-shrink-0{-ms-flex-negative:0!important;flex-shrink:0!important}.flex-xl-shrink-1{-ms-flex-negative:1!important;flex-shrink:1!important}.justify-content-xl-start{-ms-flex-pack:start!important;justify-content:flex-start!important}.justify-content-xl-end{-ms-flex-pack:end!important;justify-content:flex-end!important}.justify-content-xl-center{-ms-flex-pack:center!important;justify-content:center!important}.justify-content-xl-between{-ms-flex-pack:justify!important;justify-content:space-between!important}.justify-content-xl-around{-ms-flex-pack:distribute!important;justify-content:space-around!important}.align-items-xl-start{-ms-flex-align:start!important;align-items:flex-start!important}.align-items-xl-end{-ms-flex-align:end!important;align-items:flex-end!important}.align-items-xl-center{-ms-flex-align:center!important;align-items:center!important}.align-items-xl-baseline{-ms-flex-align:baseline!important;align-items:baseline!important}.align-items-xl-stretch{-ms-flex-align:stretch!important;align-items:stretch!important}.align-content-xl-start{-ms-flex-line-pack:start!important;align-content:flex-start!important}.align-content-xl-end{-ms-flex-line-pack:end!important;align-content:flex-end!important}.align-content-xl-center{-ms-flex-line-pack:center!important;align-content:center!important}.align-content-xl-between{-ms-flex-line-pack:justify!important;align-content:space-between!important}.align-content-xl-around{-ms-flex-line-pack:distribute!important;align-content:space-around!important}.align-content-xl-stretch{-ms-flex-line-pack:stretch!important;align-content:stretch!important}.align-self-xl-auto{-ms-flex-item-align:auto!important;align-self:auto!important}.align-self-xl-start{-ms-flex-item-align:start!important;align-self:flex-start!important}.align-self-xl-end{-ms-flex-item-align:end!important;align-self:flex-end!important}.align-self-xl-center{-ms-flex-item-align:center!important;align-self:center!important}.align-self-xl-baseline{-ms-flex-item-align:baseline!important;align-self:baseline!important}.align-self-xl-stretch{-ms-flex-item-align:stretch!important;align-self:stretch!important}}.float-left{float:left!important}.float-right{float:right!important}.float-none{float:none!important}@media (min-width:576px){.float-sm-left{float:left!important}.float-sm-right{float:right!important}.float-sm-none{float:none!important}}@media (min-width:768px){.float-md-left{float:left!important}.float-md-right{float:right!important}.float-md-none{float:none!important}}@media (min-width:992px){.float-lg-left{float:left!important}.float-lg-right{float:right!important}.float-lg-none{float:none!important}}@media (min-width:1200px){.float-xl-left{float:left!important}.float-xl-right{float:right!important}.float-xl-none{float:none!important}}.position-static{position:static!important}.position-relative{position:relative!important}.position-absolute{position:absolute!important}.position-fixed{position:fixed!important}.position-sticky{position:-webkit-sticky!important;position:sticky!important}.fixed-top{position:fixed;top:0;right:0;left:0;z-index:1030}.fixed-bottom{position:fixed;right:0;bottom:0;left:0;z-index:1030}@supports ((position:-webkit-sticky) or (position:sticky)){.sticky-top{position:-webkit-sticky;position:sticky;top:0;z-index:1020}}.sr-only{position:absolute;width:1px;height:1px;padding:0;overflow:hidden;clip:rect(0,0,0,0);white-space:nowrap;border:0}.sr-only-focusable:active,.sr-only-focusable:focus{position:static;width:auto;height:auto;overflow:visible;clip:auto;white-space:normal}.shadow-sm{box-shadow:0 .125rem .25rem rgba(0,0,0,.075)!important}.shadow{box-shadow:0 .5rem 1rem rgba(0,0,0,.15)!important}.shadow-lg{box-shadow:0 1rem 3rem rgba(0,0,0,.175)!important}.shadow-none{box-shadow:none!important}.w-25{width:25%!important}.w-50{width:50%!important}.w-75{width:75%!important}.w-100{width:100%!important}.w-auto{width:auto!important}.h-25{height:25%!important}.h-50{height:50%!important}.h-75{height:75%!important}.h-100{height:100%!important}.h-auto{height:auto!important}.mw-100{max-width:100%!important}.mh-100{max-height:100%!important}.m-0{margin:0!important}.mt-0,.my-0{margin-top:0!important}.mr-0,.mx-0{margin-right:0!important}.mb-0,.my-0{margin-bottom:0!important}.ml-0,.mx-0{margin-left:0!important}.m-1{margin:.25rem!important}.mt-1,.my-1{margin-top:.25rem!important}.mr-1,.mx-1{margin-right:.25rem!important}.mb-1,.my-1{margin-bottom:.25rem!important}.ml-1,.mx-1{margin-left:.25rem!important}.m-2{margin:.5rem!important}.mt-2,.my-2{margin-top:.5rem!important}.mr-2,.mx-2{margin-right:.5rem!important}.mb-2,.my-2{margin-bottom:.5rem!important}.ml-2,.mx-2{margin-left:.5rem!important}.m-3{margin:1rem!important}.mt-3,.my-3{margin-top:1rem!important}.mr-3,.mx-3{margin-right:1rem!important}.mb-3,.my-3{margin-bottom:1rem!important}.ml-3,.mx-3{margin-left:1rem!important}.m-4{margin:1.5rem!important}.mt-4,.my-4{margin-top:1.5rem!important}.mr-4,.mx-4{margin-right:1.5rem!important}.mb-4,.my-4{margin-bottom:1.5rem!important}.ml-4,.mx-4{margin-left:1.5rem!important}.m-5{margin:3rem!important}.mt-5,.my-5{margin-top:3rem!important}.mr-5,.mx-5{margin-right:3rem!important}.mb-5,.my-5{margin-bottom:3rem!important}.ml-5,.mx-5{margin-left:3rem!important}.p-0{padding:0!important}.pt-0,.py-0{padding-top:0!important}.pr-0,.px-0{padding-right:0!important}.pb-0,.py-0{padding-bottom:0!important}.pl-0,.px-0{padding-left:0!important}.p-1{padding:.25rem!important}.pt-1,.py-1{padding-top:.25rem!important}.pr-1,.px-1{padding-right:.25rem!important}.pb-1,.py-1{padding-bottom:.25rem!important}.pl-1,.px-1{padding-left:.25rem!important}.p-2{padding:.5rem!important}.pt-2,.py-2{padding-top:.5rem!important}.pr-2,.px-2{padding-right:.5rem!important}.pb-2,.py-2{padding-bottom:.5rem!important}.pl-2,.px-2{padding-left:.5rem!important}.p-3{padding:1rem!important}.pt-3,.py-3{padding-top:1rem!important}.pr-3,.px-3{padding-right:1rem!important}.pb-3,.py-3{padding-bottom:1rem!important}.pl-3,.px-3{padding-left:1rem!important}.p-4{padding:1.5rem!important}.pt-4,.py-4{padding-top:1.5rem!important}.pr-4,.px-4{padding-right:1.5rem!important}.pb-4,.py-4{padding-bottom:1.5rem!important}.pl-4,.px-4{padding-left:1.5rem!important}.p-5{padding:3rem!important}.pt-5,.py-5{padding-top:3rem!important}.pr-5,.px-5{padding-right:3rem!important}.pb-5,.py-5{padding-bottom:3rem!important}.pl-5,.px-5{padding-left:3rem!important}.m-auto{margin:auto!important}.mt-auto,.my-auto{margin-top:auto!important}.mr-auto,.mx-auto{margin-right:auto!important}.mb-auto,.my-auto{margin-bottom:auto!important}.ml-auto,.mx-auto{margin-left:auto!important}@media (min-width:576px){.m-sm-0{margin:0!important}.mt-sm-0,.my-sm-0{margin-top:0!important}.mr-sm-0,.mx-sm-0{margin-right:0!important}.mb-sm-0,.my-sm-0{margin-bottom:0!important}.ml-sm-0,.mx-sm-0{margin-left:0!important}.m-sm-1{margin:.25rem!important}.mt-sm-1,.my-sm-1{margin-top:.25rem!important}.mr-sm-1,.mx-sm-1{margin-right:.25rem!important}.mb-sm-1,.my-sm-1{margin-bottom:.25rem!important}.ml-sm-1,.mx-sm-1{margin-left:.25rem!important}.m-sm-2{margin:.5rem!important}.mt-sm-2,.my-sm-2{margin-top:.5rem!important}.mr-sm-2,.mx-sm-2{margin-right:.5rem!important}.mb-sm-2,.my-sm-2{margin-bottom:.5rem!important}.ml-sm-2,.mx-sm-2{margin-left:.5rem!important}.m-sm-3{margin:1rem!important}.mt-sm-3,.my-sm-3{margin-top:1rem!important}.mr-sm-3,.mx-sm-3{margin-right:1rem!important}.mb-sm-3,.my-sm-3{margin-bottom:1rem!important}.ml-sm-3,.mx-sm-3{margin-left:1rem!important}.m-sm-4{margin:1.5rem!important}.mt-sm-4,.my-sm-4{margin-top:1.5rem!important}.mr-sm-4,.mx-sm-4{margin-right:1.5rem!important}.mb-sm-4,.my-sm-4{margin-bottom:1.5rem!important}.ml-sm-4,.mx-sm-4{margin-left:1.5rem!important}.m-sm-5{margin:3rem!important}.mt-sm-5,.my-sm-5{margin-top:3rem!important}.mr-sm-5,.mx-sm-5{margin-right:3rem!important}.mb-sm-5,.my-sm-5{margin-bottom:3rem!important}.ml-sm-5,.mx-sm-5{margin-left:3rem!important}.p-sm-0{padding:0!important}.pt-sm-0,.py-sm-0{padding-top:0!important}.pr-sm-0,.px-sm-0{padding-right:0!important}.pb-sm-0,.py-sm-0{padding-bottom:0!important}.pl-sm-0,.px-sm-0{padding-left:0!important}.p-sm-1{padding:.25rem!important}.pt-sm-1,.py-sm-1{padding-top:.25rem!important}.pr-sm-1,.px-sm-1{padding-right:.25rem!important}.pb-sm-1,.py-sm-1{padding-bottom:.25rem!important}.pl-sm-1,.px-sm-1{padding-left:.25rem!important}.p-sm-2{padding:.5rem!important}.pt-sm-2,.py-sm-2{padding-top:.5rem!important}.pr-sm-2,.px-sm-2{padding-right:.5rem!important}.pb-sm-2,.py-sm-2{padding-bottom:.5rem!important}.pl-sm-2,.px-sm-2{padding-left:.5rem!important}.p-sm-3{padding:1rem!important}.pt-sm-3,.py-sm-3{padding-top:1rem!important}.pr-sm-3,.px-sm-3{padding-right:1rem!important}.pb-sm-3,.py-sm-3{padding-bottom:1rem!important}.pl-sm-3,.px-sm-3{padding-left:1rem!important}.p-sm-4{padding:1.5rem!important}.pt-sm-4,.py-sm-4{padding-top:1.5rem!important}.pr-sm-4,.px-sm-4{padding-right:1.5rem!important}.pb-sm-4,.py-sm-4{padding-bottom:1.5rem!important}.pl-sm-4,.px-sm-4{padding-left:1.5rem!important}.p-sm-5{padding:3rem!important}.pt-sm-5,.py-sm-5{padding-top:3rem!important}.pr-sm-5,.px-sm-5{padding-right:3rem!important}.pb-sm-5,.py-sm-5{padding-bottom:3rem!important}.pl-sm-5,.px-sm-5{padding-left:3rem!important}.m-sm-auto{margin:auto!important}.mt-sm-auto,.my-sm-auto{margin-top:auto!important}.mr-sm-auto,.mx-sm-auto{margin-right:auto!important}.mb-sm-auto,.my-sm-auto{margin-bottom:auto!important}.ml-sm-auto,.mx-sm-auto{margin-left:auto!important}}@media (min-width:768px){.m-md-0{margin:0!important}.mt-md-0,.my-md-0{margin-top:0!important}.mr-md-0,.mx-md-0{margin-right:0!important}.mb-md-0,.my-md-0{margin-bottom:0!important}.ml-md-0,.mx-md-0{margin-left:0!important}.m-md-1{margin:.25rem!important}.mt-md-1,.my-md-1{margin-top:.25rem!important}.mr-md-1,.mx-md-1{margin-right:.25rem!important}.mb-md-1,.my-md-1{margin-bottom:.25rem!important}.ml-md-1,.mx-md-1{margin-left:.25rem!important}.m-md-2{margin:.5rem!important}.mt-md-2,.my-md-2{margin-top:.5rem!important}.mr-md-2,.mx-md-2{margin-right:.5rem!important}.mb-md-2,.my-md-2{margin-bottom:.5rem!important}.ml-md-2,.mx-md-2{margin-left:.5rem!important}.m-md-3{margin:1rem!important}.mt-md-3,.my-md-3{margin-top:1rem!important}.mr-md-3,.mx-md-3{margin-right:1rem!important}.mb-md-3,.my-md-3{margin-bottom:1rem!important}.ml-md-3,.mx-md-3{margin-left:1rem!important}.m-md-4{margin:1.5rem!important}.mt-md-4,.my-md-4{margin-top:1.5rem!important}.mr-md-4,.mx-md-4{margin-right:1.5rem!important}.mb-md-4,.my-md-4{margin-bottom:1.5rem!important}.ml-md-4,.mx-md-4{margin-left:1.5rem!important}.m-md-5{margin:3rem!important}.mt-md-5,.my-md-5{margin-top:3rem!important}.mr-md-5,.mx-md-5{margin-right:3rem!important}.mb-md-5,.my-md-5{margin-bottom:3rem!important}.ml-md-5,.mx-md-5{margin-left:3rem!important}.p-md-0{padding:0!important}.pt-md-0,.py-md-0{padding-top:0!important}.pr-md-0,.px-md-0{padding-right:0!important}.pb-md-0,.py-md-0{padding-bottom:0!important}.pl-md-0,.px-md-0{padding-left:0!important}.p-md-1{padding:.25rem!important}.pt-md-1,.py-md-1{padding-top:.25rem!important}.pr-md-1,.px-md-1{padding-right:.25rem!important}.pb-md-1,.py-md-1{padding-bottom:.25rem!important}.pl-md-1,.px-md-1{padding-left:.25rem!important}.p-md-2{padding:.5rem!important}.pt-md-2,.py-md-2{padding-top:.5rem!important}.pr-md-2,.px-md-2{padding-right:.5rem!important}.pb-md-2,.py-md-2{padding-bottom:.5rem!important}.pl-md-2,.px-md-2{padding-left:.5rem!important}.p-md-3{padding:1rem!important}.pt-md-3,.py-md-3{padding-top:1rem!important}.pr-md-3,.px-md-3{padding-right:1rem!important}.pb-md-3,.py-md-3{padding-bottom:1rem!important}.pl-md-3,.px-md-3{padding-left:1rem!important}.p-md-4{padding:1.5rem!important}.pt-md-4,.py-md-4{padding-top:1.5rem!important}.pr-md-4,.px-md-4{padding-right:1.5rem!important}.pb-md-4,.py-md-4{padding-bottom:1.5rem!important}.pl-md-4,.px-md-4{padding-left:1.5rem!important}.p-md-5{padding:3rem!important}.pt-md-5,.py-md-5{padding-top:3rem!important}.pr-md-5,.px-md-5{padding-right:3rem!important}.pb-md-5,.py-md-5{padding-bottom:3rem!important}.pl-md-5,.px-md-5{padding-left:3rem!important}.m-md-auto{margin:auto!important}.mt-md-auto,.my-md-auto{margin-top:auto!important}.mr-md-auto,.mx-md-auto{margin-right:auto!important}.mb-md-auto,.my-md-auto{margin-bottom:auto!important}.ml-md-auto,.mx-md-auto{margin-left:auto!important}}@media (min-width:992px){.m-lg-0{margin:0!important}.mt-lg-0,.my-lg-0{margin-top:0!important}.mr-lg-0,.mx-lg-0{margin-right:0!important}.mb-lg-0,.my-lg-0{margin-bottom:0!important}.ml-lg-0,.mx-lg-0{margin-left:0!important}.m-lg-1{margin:.25rem!important}.mt-lg-1,.my-lg-1{margin-top:.25rem!important}.mr-lg-1,.mx-lg-1{margin-right:.25rem!important}.mb-lg-1,.my-lg-1{margin-bottom:.25rem!important}.ml-lg-1,.mx-lg-1{margin-left:.25rem!important}.m-lg-2{margin:.5rem!important}.mt-lg-2,.my-lg-2{margin-top:.5rem!important}.mr-lg-2,.mx-lg-2{margin-right:.5rem!important}.mb-lg-2,.my-lg-2{margin-bottom:.5rem!important}.ml-lg-2,.mx-lg-2{margin-left:.5rem!important}.m-lg-3{margin:1rem!important}.mt-lg-3,.my-lg-3{margin-top:1rem!important}.mr-lg-3,.mx-lg-3{margin-right:1rem!important}.mb-lg-3,.my-lg-3{margin-bottom:1rem!important}.ml-lg-3,.mx-lg-3{margin-left:1rem!important}.m-lg-4{margin:1.5rem!important}.mt-lg-4,.my-lg-4{margin-top:1.5rem!important}.mr-lg-4,.mx-lg-4{margin-right:1.5rem!important}.mb-lg-4,.my-lg-4{margin-bottom:1.5rem!important}.ml-lg-4,.mx-lg-4{margin-left:1.5rem!important}.m-lg-5{margin:3rem!important}.mt-lg-5,.my-lg-5{margin-top:3rem!important}.mr-lg-5,.mx-lg-5{margin-right:3rem!important}.mb-lg-5,.my-lg-5{margin-bottom:3rem!important}.ml-lg-5,.mx-lg-5{margin-left:3rem!important}.p-lg-0{padding:0!important}.pt-lg-0,.py-lg-0{padding-top:0!important}.pr-lg-0,.px-lg-0{padding-right:0!important}.pb-lg-0,.py-lg-0{padding-bottom:0!important}.pl-lg-0,.px-lg-0{padding-left:0!important}.p-lg-1{padding:.25rem!important}.pt-lg-1,.py-lg-1{padding-top:.25rem!important}.pr-lg-1,.px-lg-1{padding-right:.25rem!important}.pb-lg-1,.py-lg-1{padding-bottom:.25rem!important}.pl-lg-1,.px-lg-1{padding-left:.25rem!important}.p-lg-2{padding:.5rem!important}.pt-lg-2,.py-lg-2{padding-top:.5rem!important}.pr-lg-2,.px-lg-2{padding-right:.5rem!important}.pb-lg-2,.py-lg-2{padding-bottom:.5rem!important}.pl-lg-2,.px-lg-2{padding-left:.5rem!important}.p-lg-3{padding:1rem!important}.pt-lg-3,.py-lg-3{padding-top:1rem!important}.pr-lg-3,.px-lg-3{padding-right:1rem!important}.pb-lg-3,.py-lg-3{padding-bottom:1rem!important}.pl-lg-3,.px-lg-3{padding-left:1rem!important}.p-lg-4{padding:1.5rem!important}.pt-lg-4,.py-lg-4{padding-top:1.5rem!important}.pr-lg-4,.px-lg-4{padding-right:1.5rem!important}.pb-lg-4,.py-lg-4{padding-bottom:1.5rem!important}.pl-lg-4,.px-lg-4{padding-left:1.5rem!important}.p-lg-5{padding:3rem!important}.pt-lg-5,.py-lg-5{padding-top:3rem!important}.pr-lg-5,.px-lg-5{padding-right:3rem!important}.pb-lg-5,.py-lg-5{padding-bottom:3rem!important}.pl-lg-5,.px-lg-5{padding-left:3rem!important}.m-lg-auto{margin:auto!important}.mt-lg-auto,.my-lg-auto{margin-top:auto!important}.mr-lg-auto,.mx-lg-auto{margin-right:auto!important}.mb-lg-auto,.my-lg-auto{margin-bottom:auto!important}.ml-lg-auto,.mx-lg-auto{margin-left:auto!important}}@media (min-width:1200px){.m-xl-0{margin:0!important}.mt-xl-0,.my-xl-0{margin-top:0!important}.mr-xl-0,.mx-xl-0{margin-right:0!important}.mb-xl-0,.my-xl-0{margin-bottom:0!important}.ml-xl-0,.mx-xl-0{margin-left:0!important}.m-xl-1{margin:.25rem!important}.mt-xl-1,.my-xl-1{margin-top:.25rem!important}.mr-xl-1,.mx-xl-1{margin-right:.25rem!important}.mb-xl-1,.my-xl-1{margin-bottom:.25rem!important}.ml-xl-1,.mx-xl-1{margin-left:.25rem!important}.m-xl-2{margin:.5rem!important}.mt-xl-2,.my-xl-2{margin-top:.5rem!important}.mr-xl-2,.mx-xl-2{margin-right:.5rem!important}.mb-xl-2,.my-xl-2{margin-bottom:.5rem!important}.ml-xl-2,.mx-xl-2{margin-left:.5rem!important}.m-xl-3{margin:1rem!important}.mt-xl-3,.my-xl-3{margin-top:1rem!important}.mr-xl-3,.mx-xl-3{margin-right:1rem!important}.mb-xl-3,.my-xl-3{margin-bottom:1rem!important}.ml-xl-3,.mx-xl-3{margin-left:1rem!important}.m-xl-4{margin:1.5rem!important}.mt-xl-4,.my-xl-4{margin-top:1.5rem!important}.mr-xl-4,.mx-xl-4{margin-right:1.5rem!important}.mb-xl-4,.my-xl-4{margin-bottom:1.5rem!important}.ml-xl-4,.mx-xl-4{margin-left:1.5rem!important}.m-xl-5{margin:3rem!important}.mt-xl-5,.my-xl-5{margin-top:3rem!important}.mr-xl-5,.mx-xl-5{margin-right:3rem!important}.mb-xl-5,.my-xl-5{margin-bottom:3rem!important}.ml-xl-5,.mx-xl-5{margin-left:3rem!important}.p-xl-0{padding:0!important}.pt-xl-0,.py-xl-0{padding-top:0!important}.pr-xl-0,.px-xl-0{padding-right:0!important}.pb-xl-0,.py-xl-0{padding-bottom:0!important}.pl-xl-0,.px-xl-0{padding-left:0!important}.p-xl-1{padding:.25rem!important}.pt-xl-1,.py-xl-1{padding-top:.25rem!important}.pr-xl-1,.px-xl-1{padding-right:.25rem!important}.pb-xl-1,.py-xl-1{padding-bottom:.25rem!important}.pl-xl-1,.px-xl-1{padding-left:.25rem!important}.p-xl-2{padding:.5rem!important}.pt-xl-2,.py-xl-2{padding-top:.5rem!important}.pr-xl-2,.px-xl-2{padding-right:.5rem!important}.pb-xl-2,.py-xl-2{padding-bottom:.5rem!important}.pl-xl-2,.px-xl-2{padding-left:.5rem!important}.p-xl-3{padding:1rem!important}.pt-xl-3,.py-xl-3{padding-top:1rem!important}.pr-xl-3,.px-xl-3{padding-right:1rem!important}.pb-xl-3,.py-xl-3{padding-bottom:1rem!important}.pl-xl-3,.px-xl-3{padding-left:1rem!important}.p-xl-4{padding:1.5rem!important}.pt-xl-4,.py-xl-4{padding-top:1.5rem!important}.pr-xl-4,.px-xl-4{padding-right:1.5rem!important}.pb-xl-4,.py-xl-4{padding-bottom:1.5rem!important}.pl-xl-4,.px-xl-4{padding-left:1.5rem!important}.p-xl-5{padding:3rem!important}.pt-xl-5,.py-xl-5{padding-top:3rem!important}.pr-xl-5,.px-xl-5{padding-right:3rem!important}.pb-xl-5,.py-xl-5{padding-bottom:3rem!important}.pl-xl-5,.px-xl-5{padding-left:3rem!important}.m-xl-auto{margin:auto!important}.mt-xl-auto,.my-xl-auto{margin-top:auto!important}.mr-xl-auto,.mx-xl-auto{margin-right:auto!important}.mb-xl-auto,.my-xl-auto{margin-bottom:auto!important}.ml-xl-auto,.mx-xl-auto{margin-left:auto!important}}.text-monospace{font-family:SFMono-Regular,Menlo,Monaco,Consolas,"Liberation Mono","Courier New",monospace}.text-justify{text-align:justify!important}.text-nowrap{white-space:nowrap!important}.text-truncate{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.text-left{text-align:left!important}.text-right{text-align:right!important}.text-center{text-align:center!important}@media (min-width:576px){.text-sm-left{text-align:left!important}.text-sm-right{text-align:right!important}.text-sm-center{text-align:center!important}}@media (min-width:768px){.text-md-left{text-align:left!important}.text-md-right{text-align:right!important}.text-md-center{text-align:center!important}}@media (min-width:992px){.text-lg-left{text-align:left!important}.text-lg-right{text-align:right!important}.text-lg-center{text-align:center!important}}@media (min-width:1200px){.text-xl-left{text-align:left!important}.text-xl-right{text-align:right!important}.text-xl-center{text-align:center!important}}.text-lowercase{text-transform:lowercase!important}.text-uppercase{text-transform:uppercase!important}.text-capitalize{text-transform:capitalize!important}.font-weight-light{font-weight:300!important}.font-weight-normal{font-weight:400!important}.font-weight-bold{font-weight:700!important}.font-italic{font-style:italic!important}.text-white{color:#fff!important}.text-primary{color:#007bff!important}a.text-primary:focus,a.text-primary:hover{color:#0062cc!important}.text-secondary{color:#6c757d!important}a.text-secondary:focus,a.text-secondary:hover{color:#545b62!important}.text-success{color:#28a745!important}a.text-success:focus,a.text-success:hover{color:#1e7e34!important}.text-info{color:#17a2b8!important}a.text-info:focus,a.text-info:hover{color:#117a8b!important}.text-warning{color:#ffc107!important}a.text-warning:focus,a.text-warning:hover{color:#d39e00!important}.text-danger{color:#dc3545!important}a.text-danger:focus,a.text-danger:hover{color:#bd2130!important}.text-light{color:#f8f9fa!important}a.text-light:focus,a.text-light:hover{color:#dae0e5!important}.text-dark{color:#343a40!important}a.text-dark:focus,a.text-dark:hover{color:#1d2124!important}.text-body{color:#212529!important}.text-muted{color:#6c757d!important}.text-black-50{color:rgba(0,0,0,.5)!important}.text-white-50{color:rgba(255,255,255,.5)!important}.text-hide{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.visible{visibility:visible!important}.invisible{visibility:hidden!important}@media print{*,::after,::before{text-shadow:none!important;box-shadow:none!important}a:not(.btn){text-decoration:underline}abbr[title]::after{content:" (" attr(title) ")"}pre{white-space:pre-wrap!important}blockquote,pre{border:1px solid #adb5bd;page-break-inside:avoid}thead{display:table-header-group}img,tr{page-break-inside:avoid}h2,h3,p{orphans:3;widows:3}h2,h3{page-break-after:avoid}@page{size:a3}body{min-width:992px!important}.container{min-width:992px!important}.navbar{display:none}.badge{border:1px solid #000}.table{border-collapse:collapse!important}.table td,.table th{background-color:#fff!important}.table-bordered td,.table-bordered th{border:1px solid #dee2e6!important}.table-dark{color:inherit}.table-dark tbody+tbody,.table-dark td,.table-dark th,.table-dark thead th{border-color:#dee2e6}.table .thead-dark th{color:inherit;border-color:#dee2e6}}
+/*# sourceMappingURL=bootstrap.min.css.map */
\ No newline at end of file
diff --git a/qpysdk/src/main/assets/stylesheets/css/sticky-footer.css b/qpysdk/src/main/assets/stylesheets/css/sticky-footer.css
new file mode 100644
index 00000000..ebe29104
--- /dev/null
+++ b/qpysdk/src/main/assets/stylesheets/css/sticky-footer.css
@@ -0,0 +1,28 @@
+/* Sticky footer styles
+-------------------------------------------------- */
+html {
+  position: relative;
+  min-height: 100%;
+}
+body {
+  margin-bottom: 60px; /* Margin bottom by footer height */
+}
+.footer {
+  position: absolute;
+  bottom: 0;
+  width: 100%;
+  height: 60px; /* Set the fixed height of the footer here */
+  line-height: 60px; /* Vertically center the text there */
+  background-color: #f5f5f5;
+}
+
+
+/* Custom page CSS
+-------------------------------------------------- */
+/* Not required for template or sticky footer method. */
+
+.container {
+  width: auto;
+  max-width: 680px;
+  padding: 0 15px;
+}
diff --git a/qpysdk/src/main/assets/stylesheets/js/bootstrap.min.js b/qpysdk/src/main/assets/stylesheets/js/bootstrap.min.js
new file mode 100644
index 00000000..00c895f0
--- /dev/null
+++ b/qpysdk/src/main/assets/stylesheets/js/bootstrap.min.js
@@ -0,0 +1,7 @@
+/*!
+  * Bootstrap v4.1.3 (https://getbootstrap.com/)
+  * Copyright 2011-2018 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
+  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+  */
+!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?e(exports,require("jquery"),require("popper.js")):"function"==typeof define&&define.amd?define(["exports","jquery","popper.js"],e):e(t.bootstrap={},t.jQuery,t.Popper)}(this,function(t,e,h){"use strict";function i(t,e){for(var n=0;n<e.length;n++){var i=e[n];i.enumerable=i.enumerable||!1,i.configurable=!0,"value"in i&&(i.writable=!0),Object.defineProperty(t,i.key,i)}}function s(t,e,n){return e&&i(t.prototype,e),n&&i(t,n),t}function l(r){for(var t=1;t<arguments.length;t++){var o=null!=arguments[t]?arguments[t]:{},e=Object.keys(o);"function"==typeof Object.getOwnPropertySymbols&&(e=e.concat(Object.getOwnPropertySymbols(o).filter(function(t){return Object.getOwnPropertyDescriptor(o,t).enumerable}))),e.forEach(function(t){var e,n,i;e=r,i=o[n=t],n in e?Object.defineProperty(e,n,{value:i,enumerable:!0,configurable:!0,writable:!0}):e[n]=i})}return r}e=e&&e.hasOwnProperty("default")?e.default:e,h=h&&h.hasOwnProperty("default")?h.default:h;var r,n,o,a,c,u,f,d,g,_,m,p,v,y,E,C,T,b,S,I,A,D,w,N,O,k,P,j,H,L,R,x,W,U,q,F,K,M,Q,B,V,Y,z,J,Z,G,$,X,tt,et,nt,it,rt,ot,st,at,lt,ct,ht,ut,ft,dt,gt,_t,mt,pt,vt,yt,Et,Ct,Tt,bt,St,It,At,Dt,wt,Nt,Ot,kt,Pt,jt,Ht,Lt,Rt,xt,Wt,Ut,qt,Ft,Kt,Mt,Qt,Bt,Vt,Yt,zt,Jt,Zt,Gt,$t,Xt,te,ee,ne,ie,re,oe,se,ae,le,ce,he,ue,fe,de,ge,_e,me,pe,ve,ye,Ee,Ce,Te,be,Se,Ie,Ae,De,we,Ne,Oe,ke,Pe,je,He,Le,Re,xe,We,Ue,qe,Fe,Ke,Me,Qe,Be,Ve,Ye,ze,Je,Ze,Ge,$e,Xe,tn,en,nn,rn,on,sn,an,ln,cn,hn,un,fn,dn,gn,_n,mn,pn,vn,yn,En,Cn,Tn,bn,Sn,In,An,Dn,wn,Nn,On,kn,Pn,jn,Hn,Ln,Rn,xn,Wn,Un,qn,Fn=function(i){var e="transitionend";function t(t){var e=this,n=!1;return i(this).one(l.TRANSITION_END,function(){n=!0}),setTimeout(function(){n||l.triggerTransitionEnd(e)},t),this}var l={TRANSITION_END:"bsTransitionEnd",getUID:function(t){for(;t+=~~(1e6*Math.random()),document.getElementById(t););return t},getSelectorFromElement:function(t){var e=t.getAttribute("data-target");e&&"#"!==e||(e=t.getAttribute("href")||"");try{return document.querySelector(e)?e:null}catch(t){return null}},getTransitionDurationFromElement:function(t){if(!t)return 0;var e=i(t).css("transition-duration");return parseFloat(e)?(e=e.split(",")[0],1e3*parseFloat(e)):0},reflow:function(t){return t.offsetHeight},triggerTransitionEnd:function(t){i(t).trigger(e)},supportsTransitionEnd:function(){return Boolean(e)},isElement:function(t){return(t[0]||t).nodeType},typeCheckConfig:function(t,e,n){for(var i in n)if(Object.prototype.hasOwnProperty.call(n,i)){var r=n[i],o=e[i],s=o&&l.isElement(o)?"element":(a=o,{}.toString.call(a).match(/\s([a-z]+)/i)[1].toLowerCase());if(!new RegExp(r).test(s))throw new Error(t.toUpperCase()+': Option "'+i+'" provided type "'+s+'" but expected type "'+r+'".')}var a}};return i.fn.emulateTransitionEnd=t,i.event.special[l.TRANSITION_END]={bindType:e,delegateType:e,handle:function(t){if(i(t.target).is(this))return t.handleObj.handler.apply(this,arguments)}},l}(e),Kn=(n="alert",a="."+(o="bs.alert"),c=(r=e).fn[n],u={CLOSE:"close"+a,CLOSED:"closed"+a,CLICK_DATA_API:"click"+a+".data-api"},f="alert",d="fade",g="show",_=function(){function i(t){this._element=t}var t=i.prototype;return t.close=function(t){var e=this._element;t&&(e=this._getRootElement(t)),this._triggerCloseEvent(e).isDefaultPrevented()||this._removeElement(e)},t.dispose=function(){r.removeData(this._element,o),this._element=null},t._getRootElement=function(t){var e=Fn.getSelectorFromElement(t),n=!1;return e&&(n=document.querySelector(e)),n||(n=r(t).closest("."+f)[0]),n},t._triggerCloseEvent=function(t){var e=r.Event(u.CLOSE);return r(t).trigger(e),e},t._removeElement=function(e){var n=this;if(r(e).removeClass(g),r(e).hasClass(d)){var t=Fn.getTransitionDurationFromElement(e);r(e).one(Fn.TRANSITION_END,function(t){return n._destroyElement(e,t)}).emulateTransitionEnd(t)}else this._destroyElement(e)},t._destroyElement=function(t){r(t).detach().trigger(u.CLOSED).remove()},i._jQueryInterface=function(n){return this.each(function(){var t=r(this),e=t.data(o);e||(e=new i(this),t.data(o,e)),"close"===n&&e[n](this)})},i._handleDismiss=function(e){return function(t){t&&t.preventDefault(),e.close(this)}},s(i,null,[{key:"VERSION",get:function(){return"4.1.3"}}]),i}(),r(document).on(u.CLICK_DATA_API,'[data-dismiss="alert"]',_._handleDismiss(new _)),r.fn[n]=_._jQueryInterface,r.fn[n].Constructor=_,r.fn[n].noConflict=function(){return r.fn[n]=c,_._jQueryInterface},_),Mn=(p="button",y="."+(v="bs.button"),E=".data-api",C=(m=e).fn[p],T="active",b="btn",I='[data-toggle^="button"]',A='[data-toggle="buttons"]',D="input",w=".active",N=".btn",O={CLICK_DATA_API:"click"+y+E,FOCUS_BLUR_DATA_API:(S="focus")+y+E+" blur"+y+E},k=function(){function n(t){this._element=t}var t=n.prototype;return t.toggle=function(){var t=!0,e=!0,n=m(this._element).closest(A)[0];if(n){var i=this._element.querySelector(D);if(i){if("radio"===i.type)if(i.checked&&this._element.classList.contains(T))t=!1;else{var r=n.querySelector(w);r&&m(r).removeClass(T)}if(t){if(i.hasAttribute("disabled")||n.hasAttribute("disabled")||i.classList.contains("disabled")||n.classList.contains("disabled"))return;i.checked=!this._element.classList.contains(T),m(i).trigger("change")}i.focus(),e=!1}}e&&this._element.setAttribute("aria-pressed",!this._element.classList.contains(T)),t&&m(this._element).toggleClass(T)},t.dispose=function(){m.removeData(this._element,v),this._element=null},n._jQueryInterface=function(e){return this.each(function(){var t=m(this).data(v);t||(t=new n(this),m(this).data(v,t)),"toggle"===e&&t[e]()})},s(n,null,[{key:"VERSION",get:function(){return"4.1.3"}}]),n}(),m(document).on(O.CLICK_DATA_API,I,function(t){t.preventDefault();var e=t.target;m(e).hasClass(b)||(e=m(e).closest(N)),k._jQueryInterface.call(m(e),"toggle")}).on(O.FOCUS_BLUR_DATA_API,I,function(t){var e=m(t.target).closest(N)[0];m(e).toggleClass(S,/^focus(in)?$/.test(t.type))}),m.fn[p]=k._jQueryInterface,m.fn[p].Constructor=k,m.fn[p].noConflict=function(){return m.fn[p]=C,k._jQueryInterface},k),Qn=(j="carousel",L="."+(H="bs.carousel"),R=".data-api",x=(P=e).fn[j],W={interval:5e3,keyboard:!0,slide:!1,pause:"hover",wrap:!0},U={interval:"(number|boolean)",keyboard:"boolean",slide:"(boolean|string)",pause:"(string|boolean)",wrap:"boolean"},q="next",F="prev",K="left",M="right",Q={SLIDE:"slide"+L,SLID:"slid"+L,KEYDOWN:"keydown"+L,MOUSEENTER:"mouseenter"+L,MOUSELEAVE:"mouseleave"+L,TOUCHEND:"touchend"+L,LOAD_DATA_API:"load"+L+R,CLICK_DATA_API:"click"+L+R},B="carousel",V="active",Y="slide",z="carousel-item-right",J="carousel-item-left",Z="carousel-item-next",G="carousel-item-prev",$=".active",X=".active.carousel-item",tt=".carousel-item",et=".carousel-item-next, .carousel-item-prev",nt=".carousel-indicators",it="[data-slide], [data-slide-to]",rt='[data-ride="carousel"]',ot=function(){function o(t,e){this._items=null,this._interval=null,this._activeElement=null,this._isPaused=!1,this._isSliding=!1,this.touchTimeout=null,this._config=this._getConfig(e),this._element=P(t)[0],this._indicatorsElement=this._element.querySelector(nt),this._addEventListeners()}var t=o.prototype;return t.next=function(){this._isSliding||this._slide(q)},t.nextWhenVisible=function(){!document.hidden&&P(this._element).is(":visible")&&"hidden"!==P(this._element).css("visibility")&&this.next()},t.prev=function(){this._isSliding||this._slide(F)},t.pause=function(t){t||(this._isPaused=!0),this._element.querySelector(et)&&(Fn.triggerTransitionEnd(this._element),this.cycle(!0)),clearInterval(this._interval),this._interval=null},t.cycle=function(t){t||(this._isPaused=!1),this._interval&&(clearInterval(this._interval),this._interval=null),this._config.interval&&!this._isPaused&&(this._interval=setInterval((document.visibilityState?this.nextWhenVisible:this.next).bind(this),this._config.interval))},t.to=function(t){var e=this;this._activeElement=this._element.querySelector(X);var n=this._getItemIndex(this._activeElement);if(!(t>this._items.length-1||t<0))if(this._isSliding)P(this._element).one(Q.SLID,function(){return e.to(t)});else{if(n===t)return this.pause(),void this.cycle();var i=n<t?q:F;this._slide(i,this._items[t])}},t.dispose=function(){P(this._element).off(L),P.removeData(this._element,H),this._items=null,this._config=null,this._element=null,this._interval=null,this._isPaused=null,this._isSliding=null,this._activeElement=null,this._indicatorsElement=null},t._getConfig=function(t){return t=l({},W,t),Fn.typeCheckConfig(j,t,U),t},t._addEventListeners=function(){var e=this;this._config.keyboard&&P(this._element).on(Q.KEYDOWN,function(t){return e._keydown(t)}),"hover"===this._config.pause&&(P(this._element).on(Q.MOUSEENTER,function(t){return e.pause(t)}).on(Q.MOUSELEAVE,function(t){return e.cycle(t)}),"ontouchstart"in document.documentElement&&P(this._element).on(Q.TOUCHEND,function(){e.pause(),e.touchTimeout&&clearTimeout(e.touchTimeout),e.touchTimeout=setTimeout(function(t){return e.cycle(t)},500+e._config.interval)}))},t._keydown=function(t){if(!/input|textarea/i.test(t.target.tagName))switch(t.which){case 37:t.preventDefault(),this.prev();break;case 39:t.preventDefault(),this.next()}},t._getItemIndex=function(t){return this._items=t&&t.parentNode?[].slice.call(t.parentNode.querySelectorAll(tt)):[],this._items.indexOf(t)},t._getItemByDirection=function(t,e){var n=t===q,i=t===F,r=this._getItemIndex(e),o=this._items.length-1;if((i&&0===r||n&&r===o)&&!this._config.wrap)return e;var s=(r+(t===F?-1:1))%this._items.length;return-1===s?this._items[this._items.length-1]:this._items[s]},t._triggerSlideEvent=function(t,e){var n=this._getItemIndex(t),i=this._getItemIndex(this._element.querySelector(X)),r=P.Event(Q.SLIDE,{relatedTarget:t,direction:e,from:i,to:n});return P(this._element).trigger(r),r},t._setActiveIndicatorElement=function(t){if(this._indicatorsElement){var e=[].slice.call(this._indicatorsElement.querySelectorAll($));P(e).removeClass(V);var n=this._indicatorsElement.children[this._getItemIndex(t)];n&&P(n).addClass(V)}},t._slide=function(t,e){var n,i,r,o=this,s=this._element.querySelector(X),a=this._getItemIndex(s),l=e||s&&this._getItemByDirection(t,s),c=this._getItemIndex(l),h=Boolean(this._interval);if(t===q?(n=J,i=Z,r=K):(n=z,i=G,r=M),l&&P(l).hasClass(V))this._isSliding=!1;else if(!this._triggerSlideEvent(l,r).isDefaultPrevented()&&s&&l){this._isSliding=!0,h&&this.pause(),this._setActiveIndicatorElement(l);var u=P.Event(Q.SLID,{relatedTarget:l,direction:r,from:a,to:c});if(P(this._element).hasClass(Y)){P(l).addClass(i),Fn.reflow(l),P(s).addClass(n),P(l).addClass(n);var f=Fn.getTransitionDurationFromElement(s);P(s).one(Fn.TRANSITION_END,function(){P(l).removeClass(n+" "+i).addClass(V),P(s).removeClass(V+" "+i+" "+n),o._isSliding=!1,setTimeout(function(){return P(o._element).trigger(u)},0)}).emulateTransitionEnd(f)}else P(s).removeClass(V),P(l).addClass(V),this._isSliding=!1,P(this._element).trigger(u);h&&this.cycle()}},o._jQueryInterface=function(i){return this.each(function(){var t=P(this).data(H),e=l({},W,P(this).data());"object"==typeof i&&(e=l({},e,i));var n="string"==typeof i?i:e.slide;if(t||(t=new o(this,e),P(this).data(H,t)),"number"==typeof i)t.to(i);else if("string"==typeof n){if("undefined"==typeof t[n])throw new TypeError('No method named "'+n+'"');t[n]()}else e.interval&&(t.pause(),t.cycle())})},o._dataApiClickHandler=function(t){var e=Fn.getSelectorFromElement(this);if(e){var n=P(e)[0];if(n&&P(n).hasClass(B)){var i=l({},P(n).data(),P(this).data()),r=this.getAttribute("data-slide-to");r&&(i.interval=!1),o._jQueryInterface.call(P(n),i),r&&P(n).data(H).to(r),t.preventDefault()}}},s(o,null,[{key:"VERSION",get:function(){return"4.1.3"}},{key:"Default",get:function(){return W}}]),o}(),P(document).on(Q.CLICK_DATA_API,it,ot._dataApiClickHandler),P(window).on(Q.LOAD_DATA_API,function(){for(var t=[].slice.call(document.querySelectorAll(rt)),e=0,n=t.length;e<n;e++){var i=P(t[e]);ot._jQueryInterface.call(i,i.data())}}),P.fn[j]=ot._jQueryInterface,P.fn[j].Constructor=ot,P.fn[j].noConflict=function(){return P.fn[j]=x,ot._jQueryInterface},ot),Bn=(at="collapse",ct="."+(lt="bs.collapse"),ht=(st=e).fn[at],ut={toggle:!0,parent:""},ft={toggle:"boolean",parent:"(string|element)"},dt={SHOW:"show"+ct,SHOWN:"shown"+ct,HIDE:"hide"+ct,HIDDEN:"hidden"+ct,CLICK_DATA_API:"click"+ct+".data-api"},gt="show",_t="collapse",mt="collapsing",pt="collapsed",vt="width",yt="height",Et=".show, .collapsing",Ct='[data-toggle="collapse"]',Tt=function(){function a(e,t){this._isTransitioning=!1,this._element=e,this._config=this._getConfig(t),this._triggerArray=st.makeArray(document.querySelectorAll('[data-toggle="collapse"][href="#'+e.id+'"],[data-toggle="collapse"][data-target="#'+e.id+'"]'));for(var n=[].slice.call(document.querySelectorAll(Ct)),i=0,r=n.length;i<r;i++){var o=n[i],s=Fn.getSelectorFromElement(o),a=[].slice.call(document.querySelectorAll(s)).filter(function(t){return t===e});null!==s&&0<a.length&&(this._selector=s,this._triggerArray.push(o))}this._parent=this._config.parent?this._getParent():null,this._config.parent||this._addAriaAndCollapsedClass(this._element,this._triggerArray),this._config.toggle&&this.toggle()}var t=a.prototype;return t.toggle=function(){st(this._element).hasClass(gt)?this.hide():this.show()},t.show=function(){var t,e,n=this;if(!this._isTransitioning&&!st(this._element).hasClass(gt)&&(this._parent&&0===(t=[].slice.call(this._parent.querySelectorAll(Et)).filter(function(t){return t.getAttribute("data-parent")===n._config.parent})).length&&(t=null),!(t&&(e=st(t).not(this._selector).data(lt))&&e._isTransitioning))){var i=st.Event(dt.SHOW);if(st(this._element).trigger(i),!i.isDefaultPrevented()){t&&(a._jQueryInterface.call(st(t).not(this._selector),"hide"),e||st(t).data(lt,null));var r=this._getDimension();st(this._element).removeClass(_t).addClass(mt),this._element.style[r]=0,this._triggerArray.length&&st(this._triggerArray).removeClass(pt).attr("aria-expanded",!0),this.setTransitioning(!0);var o="scroll"+(r[0].toUpperCase()+r.slice(1)),s=Fn.getTransitionDurationFromElement(this._element);st(this._element).one(Fn.TRANSITION_END,function(){st(n._element).removeClass(mt).addClass(_t).addClass(gt),n._element.style[r]="",n.setTransitioning(!1),st(n._element).trigger(dt.SHOWN)}).emulateTransitionEnd(s),this._element.style[r]=this._element[o]+"px"}}},t.hide=function(){var t=this;if(!this._isTransitioning&&st(this._element).hasClass(gt)){var e=st.Event(dt.HIDE);if(st(this._element).trigger(e),!e.isDefaultPrevented()){var n=this._getDimension();this._element.style[n]=this._element.getBoundingClientRect()[n]+"px",Fn.reflow(this._element),st(this._element).addClass(mt).removeClass(_t).removeClass(gt);var i=this._triggerArray.length;if(0<i)for(var r=0;r<i;r++){var o=this._triggerArray[r],s=Fn.getSelectorFromElement(o);if(null!==s)st([].slice.call(document.querySelectorAll(s))).hasClass(gt)||st(o).addClass(pt).attr("aria-expanded",!1)}this.setTransitioning(!0);this._element.style[n]="";var a=Fn.getTransitionDurationFromElement(this._element);st(this._element).one(Fn.TRANSITION_END,function(){t.setTransitioning(!1),st(t._element).removeClass(mt).addClass(_t).trigger(dt.HIDDEN)}).emulateTransitionEnd(a)}}},t.setTransitioning=function(t){this._isTransitioning=t},t.dispose=function(){st.removeData(this._element,lt),this._config=null,this._parent=null,this._element=null,this._triggerArray=null,this._isTransitioning=null},t._getConfig=function(t){return(t=l({},ut,t)).toggle=Boolean(t.toggle),Fn.typeCheckConfig(at,t,ft),t},t._getDimension=function(){return st(this._element).hasClass(vt)?vt:yt},t._getParent=function(){var n=this,t=null;Fn.isElement(this._config.parent)?(t=this._config.parent,"undefined"!=typeof this._config.parent.jquery&&(t=this._config.parent[0])):t=document.querySelector(this._config.parent);var e='[data-toggle="collapse"][data-parent="'+this._config.parent+'"]',i=[].slice.call(t.querySelectorAll(e));return st(i).each(function(t,e){n._addAriaAndCollapsedClass(a._getTargetFromElement(e),[e])}),t},t._addAriaAndCollapsedClass=function(t,e){if(t){var n=st(t).hasClass(gt);e.length&&st(e).toggleClass(pt,!n).attr("aria-expanded",n)}},a._getTargetFromElement=function(t){var e=Fn.getSelectorFromElement(t);return e?document.querySelector(e):null},a._jQueryInterface=function(i){return this.each(function(){var t=st(this),e=t.data(lt),n=l({},ut,t.data(),"object"==typeof i&&i?i:{});if(!e&&n.toggle&&/show|hide/.test(i)&&(n.toggle=!1),e||(e=new a(this,n),t.data(lt,e)),"string"==typeof i){if("undefined"==typeof e[i])throw new TypeError('No method named "'+i+'"');e[i]()}})},s(a,null,[{key:"VERSION",get:function(){return"4.1.3"}},{key:"Default",get:function(){return ut}}]),a}(),st(document).on(dt.CLICK_DATA_API,Ct,function(t){"A"===t.currentTarget.tagName&&t.preventDefault();var n=st(this),e=Fn.getSelectorFromElement(this),i=[].slice.call(document.querySelectorAll(e));st(i).each(function(){var t=st(this),e=t.data(lt)?"toggle":n.data();Tt._jQueryInterface.call(t,e)})}),st.fn[at]=Tt._jQueryInterface,st.fn[at].Constructor=Tt,st.fn[at].noConflict=function(){return st.fn[at]=ht,Tt._jQueryInterface},Tt),Vn=(St="dropdown",At="."+(It="bs.dropdown"),Dt=".data-api",wt=(bt=e).fn[St],Nt=new RegExp("38|40|27"),Ot={HIDE:"hide"+At,HIDDEN:"hidden"+At,SHOW:"show"+At,SHOWN:"shown"+At,CLICK:"click"+At,CLICK_DATA_API:"click"+At+Dt,KEYDOWN_DATA_API:"keydown"+At+Dt,KEYUP_DATA_API:"keyup"+At+Dt},kt="disabled",Pt="show",jt="dropup",Ht="dropright",Lt="dropleft",Rt="dropdown-menu-right",xt="position-static",Wt='[data-toggle="dropdown"]',Ut=".dropdown form",qt=".dropdown-menu",Ft=".navbar-nav",Kt=".dropdown-menu .dropdown-item:not(.disabled):not(:disabled)",Mt="top-start",Qt="top-end",Bt="bottom-start",Vt="bottom-end",Yt="right-start",zt="left-start",Jt={offset:0,flip:!0,boundary:"scrollParent",reference:"toggle",display:"dynamic"},Zt={offset:"(number|string|function)",flip:"boolean",boundary:"(string|element)",reference:"(string|element)",display:"string"},Gt=function(){function c(t,e){this._element=t,this._popper=null,this._config=this._getConfig(e),this._menu=this._getMenuElement(),this._inNavbar=this._detectNavbar(),this._addEventListeners()}var t=c.prototype;return t.toggle=function(){if(!this._element.disabled&&!bt(this._element).hasClass(kt)){var t=c._getParentFromElement(this._element),e=bt(this._menu).hasClass(Pt);if(c._clearMenus(),!e){var n={relatedTarget:this._element},i=bt.Event(Ot.SHOW,n);if(bt(t).trigger(i),!i.isDefaultPrevented()){if(!this._inNavbar){if("undefined"==typeof h)throw new TypeError("Bootstrap dropdown require Popper.js (https://popper.js.org)");var r=this._element;"parent"===this._config.reference?r=t:Fn.isElement(this._config.reference)&&(r=this._config.reference,"undefined"!=typeof this._config.reference.jquery&&(r=this._config.reference[0])),"scrollParent"!==this._config.boundary&&bt(t).addClass(xt),this._popper=new h(r,this._menu,this._getPopperConfig())}"ontouchstart"in document.documentElement&&0===bt(t).closest(Ft).length&&bt(document.body).children().on("mouseover",null,bt.noop),this._element.focus(),this._element.setAttribute("aria-expanded",!0),bt(this._menu).toggleClass(Pt),bt(t).toggleClass(Pt).trigger(bt.Event(Ot.SHOWN,n))}}}},t.dispose=function(){bt.removeData(this._element,It),bt(this._element).off(At),this._element=null,(this._menu=null)!==this._popper&&(this._popper.destroy(),this._popper=null)},t.update=function(){this._inNavbar=this._detectNavbar(),null!==this._popper&&this._popper.scheduleUpdate()},t._addEventListeners=function(){var e=this;bt(this._element).on(Ot.CLICK,function(t){t.preventDefault(),t.stopPropagation(),e.toggle()})},t._getConfig=function(t){return t=l({},this.constructor.Default,bt(this._element).data(),t),Fn.typeCheckConfig(St,t,this.constructor.DefaultType),t},t._getMenuElement=function(){if(!this._menu){var t=c._getParentFromElement(this._element);t&&(this._menu=t.querySelector(qt))}return this._menu},t._getPlacement=function(){var t=bt(this._element.parentNode),e=Bt;return t.hasClass(jt)?(e=Mt,bt(this._menu).hasClass(Rt)&&(e=Qt)):t.hasClass(Ht)?e=Yt:t.hasClass(Lt)?e=zt:bt(this._menu).hasClass(Rt)&&(e=Vt),e},t._detectNavbar=function(){return 0<bt(this._element).closest(".navbar").length},t._getPopperConfig=function(){var e=this,t={};"function"==typeof this._config.offset?t.fn=function(t){return t.offsets=l({},t.offsets,e._config.offset(t.offsets)||{}),t}:t.offset=this._config.offset;var n={placement:this._getPlacement(),modifiers:{offset:t,flip:{enabled:this._config.flip},preventOverflow:{boundariesElement:this._config.boundary}}};return"static"===this._config.display&&(n.modifiers.applyStyle={enabled:!1}),n},c._jQueryInterface=function(e){return this.each(function(){var t=bt(this).data(It);if(t||(t=new c(this,"object"==typeof e?e:null),bt(this).data(It,t)),"string"==typeof e){if("undefined"==typeof t[e])throw new TypeError('No method named "'+e+'"');t[e]()}})},c._clearMenus=function(t){if(!t||3!==t.which&&("keyup"!==t.type||9===t.which))for(var e=[].slice.call(document.querySelectorAll(Wt)),n=0,i=e.length;n<i;n++){var r=c._getParentFromElement(e[n]),o=bt(e[n]).data(It),s={relatedTarget:e[n]};if(t&&"click"===t.type&&(s.clickEvent=t),o){var a=o._menu;if(bt(r).hasClass(Pt)&&!(t&&("click"===t.type&&/input|textarea/i.test(t.target.tagName)||"keyup"===t.type&&9===t.which)&&bt.contains(r,t.target))){var l=bt.Event(Ot.HIDE,s);bt(r).trigger(l),l.isDefaultPrevented()||("ontouchstart"in document.documentElement&&bt(document.body).children().off("mouseover",null,bt.noop),e[n].setAttribute("aria-expanded","false"),bt(a).removeClass(Pt),bt(r).removeClass(Pt).trigger(bt.Event(Ot.HIDDEN,s)))}}}},c._getParentFromElement=function(t){var e,n=Fn.getSelectorFromElement(t);return n&&(e=document.querySelector(n)),e||t.parentNode},c._dataApiKeydownHandler=function(t){if((/input|textarea/i.test(t.target.tagName)?!(32===t.which||27!==t.which&&(40!==t.which&&38!==t.which||bt(t.target).closest(qt).length)):Nt.test(t.which))&&(t.preventDefault(),t.stopPropagation(),!this.disabled&&!bt(this).hasClass(kt))){var e=c._getParentFromElement(this),n=bt(e).hasClass(Pt);if((n||27===t.which&&32===t.which)&&(!n||27!==t.which&&32!==t.which)){var i=[].slice.call(e.querySelectorAll(Kt));if(0!==i.length){var r=i.indexOf(t.target);38===t.which&&0<r&&r--,40===t.which&&r<i.length-1&&r++,r<0&&(r=0),i[r].focus()}}else{if(27===t.which){var o=e.querySelector(Wt);bt(o).trigger("focus")}bt(this).trigger("click")}}},s(c,null,[{key:"VERSION",get:function(){return"4.1.3"}},{key:"Default",get:function(){return Jt}},{key:"DefaultType",get:function(){return Zt}}]),c}(),bt(document).on(Ot.KEYDOWN_DATA_API,Wt,Gt._dataApiKeydownHandler).on(Ot.KEYDOWN_DATA_API,qt,Gt._dataApiKeydownHandler).on(Ot.CLICK_DATA_API+" "+Ot.KEYUP_DATA_API,Gt._clearMenus).on(Ot.CLICK_DATA_API,Wt,function(t){t.preventDefault(),t.stopPropagation(),Gt._jQueryInterface.call(bt(this),"toggle")}).on(Ot.CLICK_DATA_API,Ut,function(t){t.stopPropagation()}),bt.fn[St]=Gt._jQueryInterface,bt.fn[St].Constructor=Gt,bt.fn[St].noConflict=function(){return bt.fn[St]=wt,Gt._jQueryInterface},Gt),Yn=(Xt="modal",ee="."+(te="bs.modal"),ne=($t=e).fn[Xt],ie={backdrop:!0,keyboard:!0,focus:!0,show:!0},re={backdrop:"(boolean|string)",keyboard:"boolean",focus:"boolean",show:"boolean"},oe={HIDE:"hide"+ee,HIDDEN:"hidden"+ee,SHOW:"show"+ee,SHOWN:"shown"+ee,FOCUSIN:"focusin"+ee,RESIZE:"resize"+ee,CLICK_DISMISS:"click.dismiss"+ee,KEYDOWN_DISMISS:"keydown.dismiss"+ee,MOUSEUP_DISMISS:"mouseup.dismiss"+ee,MOUSEDOWN_DISMISS:"mousedown.dismiss"+ee,CLICK_DATA_API:"click"+ee+".data-api"},se="modal-scrollbar-measure",ae="modal-backdrop",le="modal-open",ce="fade",he="show",ue=".modal-dialog",fe='[data-toggle="modal"]',de='[data-dismiss="modal"]',ge=".fixed-top, .fixed-bottom, .is-fixed, .sticky-top",_e=".sticky-top",me=function(){function r(t,e){this._config=this._getConfig(e),this._element=t,this._dialog=t.querySelector(ue),this._backdrop=null,this._isShown=!1,this._isBodyOverflowing=!1,this._ignoreBackdropClick=!1,this._scrollbarWidth=0}var t=r.prototype;return t.toggle=function(t){return this._isShown?this.hide():this.show(t)},t.show=function(t){var e=this;if(!this._isTransitioning&&!this._isShown){$t(this._element).hasClass(ce)&&(this._isTransitioning=!0);var n=$t.Event(oe.SHOW,{relatedTarget:t});$t(this._element).trigger(n),this._isShown||n.isDefaultPrevented()||(this._isShown=!0,this._checkScrollbar(),this._setScrollbar(),this._adjustDialog(),$t(document.body).addClass(le),this._setEscapeEvent(),this._setResizeEvent(),$t(this._element).on(oe.CLICK_DISMISS,de,function(t){return e.hide(t)}),$t(this._dialog).on(oe.MOUSEDOWN_DISMISS,function(){$t(e._element).one(oe.MOUSEUP_DISMISS,function(t){$t(t.target).is(e._element)&&(e._ignoreBackdropClick=!0)})}),this._showBackdrop(function(){return e._showElement(t)}))}},t.hide=function(t){var e=this;if(t&&t.preventDefault(),!this._isTransitioning&&this._isShown){var n=$t.Event(oe.HIDE);if($t(this._element).trigger(n),this._isShown&&!n.isDefaultPrevented()){this._isShown=!1;var i=$t(this._element).hasClass(ce);if(i&&(this._isTransitioning=!0),this._setEscapeEvent(),this._setResizeEvent(),$t(document).off(oe.FOCUSIN),$t(this._element).removeClass(he),$t(this._element).off(oe.CLICK_DISMISS),$t(this._dialog).off(oe.MOUSEDOWN_DISMISS),i){var r=Fn.getTransitionDurationFromElement(this._element);$t(this._element).one(Fn.TRANSITION_END,function(t){return e._hideModal(t)}).emulateTransitionEnd(r)}else this._hideModal()}}},t.dispose=function(){$t.removeData(this._element,te),$t(window,document,this._element,this._backdrop).off(ee),this._config=null,this._element=null,this._dialog=null,this._backdrop=null,this._isShown=null,this._isBodyOverflowing=null,this._ignoreBackdropClick=null,this._scrollbarWidth=null},t.handleUpdate=function(){this._adjustDialog()},t._getConfig=function(t){return t=l({},ie,t),Fn.typeCheckConfig(Xt,t,re),t},t._showElement=function(t){var e=this,n=$t(this._element).hasClass(ce);this._element.parentNode&&this._element.parentNode.nodeType===Node.ELEMENT_NODE||document.body.appendChild(this._element),this._element.style.display="block",this._element.removeAttribute("aria-hidden"),this._element.scrollTop=0,n&&Fn.reflow(this._element),$t(this._element).addClass(he),this._config.focus&&this._enforceFocus();var i=$t.Event(oe.SHOWN,{relatedTarget:t}),r=function(){e._config.focus&&e._element.focus(),e._isTransitioning=!1,$t(e._element).trigger(i)};if(n){var o=Fn.getTransitionDurationFromElement(this._element);$t(this._dialog).one(Fn.TRANSITION_END,r).emulateTransitionEnd(o)}else r()},t._enforceFocus=function(){var e=this;$t(document).off(oe.FOCUSIN).on(oe.FOCUSIN,function(t){document!==t.target&&e._element!==t.target&&0===$t(e._element).has(t.target).length&&e._element.focus()})},t._setEscapeEvent=function(){var e=this;this._isShown&&this._config.keyboard?$t(this._element).on(oe.KEYDOWN_DISMISS,function(t){27===t.which&&(t.preventDefault(),e.hide())}):this._isShown||$t(this._element).off(oe.KEYDOWN_DISMISS)},t._setResizeEvent=function(){var e=this;this._isShown?$t(window).on(oe.RESIZE,function(t){return e.handleUpdate(t)}):$t(window).off(oe.RESIZE)},t._hideModal=function(){var t=this;this._element.style.display="none",this._element.setAttribute("aria-hidden",!0),this._isTransitioning=!1,this._showBackdrop(function(){$t(document.body).removeClass(le),t._resetAdjustments(),t._resetScrollbar(),$t(t._element).trigger(oe.HIDDEN)})},t._removeBackdrop=function(){this._backdrop&&($t(this._backdrop).remove(),this._backdrop=null)},t._showBackdrop=function(t){var e=this,n=$t(this._element).hasClass(ce)?ce:"";if(this._isShown&&this._config.backdrop){if(this._backdrop=document.createElement("div"),this._backdrop.className=ae,n&&this._backdrop.classList.add(n),$t(this._backdrop).appendTo(document.body),$t(this._element).on(oe.CLICK_DISMISS,function(t){e._ignoreBackdropClick?e._ignoreBackdropClick=!1:t.target===t.currentTarget&&("static"===e._config.backdrop?e._element.focus():e.hide())}),n&&Fn.reflow(this._backdrop),$t(this._backdrop).addClass(he),!t)return;if(!n)return void t();var i=Fn.getTransitionDurationFromElement(this._backdrop);$t(this._backdrop).one(Fn.TRANSITION_END,t).emulateTransitionEnd(i)}else if(!this._isShown&&this._backdrop){$t(this._backdrop).removeClass(he);var r=function(){e._removeBackdrop(),t&&t()};if($t(this._element).hasClass(ce)){var o=Fn.getTransitionDurationFromElement(this._backdrop);$t(this._backdrop).one(Fn.TRANSITION_END,r).emulateTransitionEnd(o)}else r()}else t&&t()},t._adjustDialog=function(){var t=this._element.scrollHeight>document.documentElement.clientHeight;!this._isBodyOverflowing&&t&&(this._element.style.paddingLeft=this._scrollbarWidth+"px"),this._isBodyOverflowing&&!t&&(this._element.style.paddingRight=this._scrollbarWidth+"px")},t._resetAdjustments=function(){this._element.style.paddingLeft="",this._element.style.paddingRight=""},t._checkScrollbar=function(){var t=document.body.getBoundingClientRect();this._isBodyOverflowing=t.left+t.right<window.innerWidth,this._scrollbarWidth=this._getScrollbarWidth()},t._setScrollbar=function(){var r=this;if(this._isBodyOverflowing){var t=[].slice.call(document.querySelectorAll(ge)),e=[].slice.call(document.querySelectorAll(_e));$t(t).each(function(t,e){var n=e.style.paddingRight,i=$t(e).css("padding-right");$t(e).data("padding-right",n).css("padding-right",parseFloat(i)+r._scrollbarWidth+"px")}),$t(e).each(function(t,e){var n=e.style.marginRight,i=$t(e).css("margin-right");$t(e).data("margin-right",n).css("margin-right",parseFloat(i)-r._scrollbarWidth+"px")});var n=document.body.style.paddingRight,i=$t(document.body).css("padding-right");$t(document.body).data("padding-right",n).css("padding-right",parseFloat(i)+this._scrollbarWidth+"px")}},t._resetScrollbar=function(){var t=[].slice.call(document.querySelectorAll(ge));$t(t).each(function(t,e){var n=$t(e).data("padding-right");$t(e).removeData("padding-right"),e.style.paddingRight=n||""});var e=[].slice.call(document.querySelectorAll(""+_e));$t(e).each(function(t,e){var n=$t(e).data("margin-right");"undefined"!=typeof n&&$t(e).css("margin-right",n).removeData("margin-right")});var n=$t(document.body).data("padding-right");$t(document.body).removeData("padding-right"),document.body.style.paddingRight=n||""},t._getScrollbarWidth=function(){var t=document.createElement("div");t.className=se,document.body.appendChild(t);var e=t.getBoundingClientRect().width-t.clientWidth;return document.body.removeChild(t),e},r._jQueryInterface=function(n,i){return this.each(function(){var t=$t(this).data(te),e=l({},ie,$t(this).data(),"object"==typeof n&&n?n:{});if(t||(t=new r(this,e),$t(this).data(te,t)),"string"==typeof n){if("undefined"==typeof t[n])throw new TypeError('No method named "'+n+'"');t[n](i)}else e.show&&t.show(i)})},s(r,null,[{key:"VERSION",get:function(){return"4.1.3"}},{key:"Default",get:function(){return ie}}]),r}(),$t(document).on(oe.CLICK_DATA_API,fe,function(t){var e,n=this,i=Fn.getSelectorFromElement(this);i&&(e=document.querySelector(i));var r=$t(e).data(te)?"toggle":l({},$t(e).data(),$t(this).data());"A"!==this.tagName&&"AREA"!==this.tagName||t.preventDefault();var o=$t(e).one(oe.SHOW,function(t){t.isDefaultPrevented()||o.one(oe.HIDDEN,function(){$t(n).is(":visible")&&n.focus()})});me._jQueryInterface.call($t(e),r,this)}),$t.fn[Xt]=me._jQueryInterface,$t.fn[Xt].Constructor=me,$t.fn[Xt].noConflict=function(){return $t.fn[Xt]=ne,me._jQueryInterface},me),zn=(ve="tooltip",Ee="."+(ye="bs.tooltip"),Ce=(pe=e).fn[ve],Te="bs-tooltip",be=new RegExp("(^|\\s)"+Te+"\\S+","g"),Ae={animation:!0,template:'<div class="tooltip" role="tooltip"><div class="arrow"></div><div class="tooltip-inner"></div></div>',trigger:"hover focus",title:"",delay:0,html:!(Ie={AUTO:"auto",TOP:"top",RIGHT:"right",BOTTOM:"bottom",LEFT:"left"}),selector:!(Se={animation:"boolean",template:"string",title:"(string|element|function)",trigger:"string",delay:"(number|object)",html:"boolean",selector:"(string|boolean)",placement:"(string|function)",offset:"(number|string)",container:"(string|element|boolean)",fallbackPlacement:"(string|array)",boundary:"(string|element)"}),placement:"top",offset:0,container:!1,fallbackPlacement:"flip",boundary:"scrollParent"},we="out",Ne={HIDE:"hide"+Ee,HIDDEN:"hidden"+Ee,SHOW:(De="show")+Ee,SHOWN:"shown"+Ee,INSERTED:"inserted"+Ee,CLICK:"click"+Ee,FOCUSIN:"focusin"+Ee,FOCUSOUT:"focusout"+Ee,MOUSEENTER:"mouseenter"+Ee,MOUSELEAVE:"mouseleave"+Ee},Oe="fade",ke="show",Pe=".tooltip-inner",je=".arrow",He="hover",Le="focus",Re="click",xe="manual",We=function(){function i(t,e){if("undefined"==typeof h)throw new TypeError("Bootstrap tooltips require Popper.js (https://popper.js.org)");this._isEnabled=!0,this._timeout=0,this._hoverState="",this._activeTrigger={},this._popper=null,this.element=t,this.config=this._getConfig(e),this.tip=null,this._setListeners()}var t=i.prototype;return t.enable=function(){this._isEnabled=!0},t.disable=function(){this._isEnabled=!1},t.toggleEnabled=function(){this._isEnabled=!this._isEnabled},t.toggle=function(t){if(this._isEnabled)if(t){var e=this.constructor.DATA_KEY,n=pe(t.currentTarget).data(e);n||(n=new this.constructor(t.currentTarget,this._getDelegateConfig()),pe(t.currentTarget).data(e,n)),n._activeTrigger.click=!n._activeTrigger.click,n._isWithActiveTrigger()?n._enter(null,n):n._leave(null,n)}else{if(pe(this.getTipElement()).hasClass(ke))return void this._leave(null,this);this._enter(null,this)}},t.dispose=function(){clearTimeout(this._timeout),pe.removeData(this.element,this.constructor.DATA_KEY),pe(this.element).off(this.constructor.EVENT_KEY),pe(this.element).closest(".modal").off("hide.bs.modal"),this.tip&&pe(this.tip).remove(),this._isEnabled=null,this._timeout=null,this._hoverState=null,(this._activeTrigger=null)!==this._popper&&this._popper.destroy(),this._popper=null,this.element=null,this.config=null,this.tip=null},t.show=function(){var e=this;if("none"===pe(this.element).css("display"))throw new Error("Please use show on visible elements");var t=pe.Event(this.constructor.Event.SHOW);if(this.isWithContent()&&this._isEnabled){pe(this.element).trigger(t);var n=pe.contains(this.element.ownerDocument.documentElement,this.element);if(t.isDefaultPrevented()||!n)return;var i=this.getTipElement(),r=Fn.getUID(this.constructor.NAME);i.setAttribute("id",r),this.element.setAttribute("aria-describedby",r),this.setContent(),this.config.animation&&pe(i).addClass(Oe);var o="function"==typeof this.config.placement?this.config.placement.call(this,i,this.element):this.config.placement,s=this._getAttachment(o);this.addAttachmentClass(s);var a=!1===this.config.container?document.body:pe(document).find(this.config.container);pe(i).data(this.constructor.DATA_KEY,this),pe.contains(this.element.ownerDocument.documentElement,this.tip)||pe(i).appendTo(a),pe(this.element).trigger(this.constructor.Event.INSERTED),this._popper=new h(this.element,i,{placement:s,modifiers:{offset:{offset:this.config.offset},flip:{behavior:this.config.fallbackPlacement},arrow:{element:je},preventOverflow:{boundariesElement:this.config.boundary}},onCreate:function(t){t.originalPlacement!==t.placement&&e._handlePopperPlacementChange(t)},onUpdate:function(t){e._handlePopperPlacementChange(t)}}),pe(i).addClass(ke),"ontouchstart"in document.documentElement&&pe(document.body).children().on("mouseover",null,pe.noop);var l=function(){e.config.animation&&e._fixTransition();var t=e._hoverState;e._hoverState=null,pe(e.element).trigger(e.constructor.Event.SHOWN),t===we&&e._leave(null,e)};if(pe(this.tip).hasClass(Oe)){var c=Fn.getTransitionDurationFromElement(this.tip);pe(this.tip).one(Fn.TRANSITION_END,l).emulateTransitionEnd(c)}else l()}},t.hide=function(t){var e=this,n=this.getTipElement(),i=pe.Event(this.constructor.Event.HIDE),r=function(){e._hoverState!==De&&n.parentNode&&n.parentNode.removeChild(n),e._cleanTipClass(),e.element.removeAttribute("aria-describedby"),pe(e.element).trigger(e.constructor.Event.HIDDEN),null!==e._popper&&e._popper.destroy(),t&&t()};if(pe(this.element).trigger(i),!i.isDefaultPrevented()){if(pe(n).removeClass(ke),"ontouchstart"in document.documentElement&&pe(document.body).children().off("mouseover",null,pe.noop),this._activeTrigger[Re]=!1,this._activeTrigger[Le]=!1,this._activeTrigger[He]=!1,pe(this.tip).hasClass(Oe)){var o=Fn.getTransitionDurationFromElement(n);pe(n).one(Fn.TRANSITION_END,r).emulateTransitionEnd(o)}else r();this._hoverState=""}},t.update=function(){null!==this._popper&&this._popper.scheduleUpdate()},t.isWithContent=function(){return Boolean(this.getTitle())},t.addAttachmentClass=function(t){pe(this.getTipElement()).addClass(Te+"-"+t)},t.getTipElement=function(){return this.tip=this.tip||pe(this.config.template)[0],this.tip},t.setContent=function(){var t=this.getTipElement();this.setElementContent(pe(t.querySelectorAll(Pe)),this.getTitle()),pe(t).removeClass(Oe+" "+ke)},t.setElementContent=function(t,e){var n=this.config.html;"object"==typeof e&&(e.nodeType||e.jquery)?n?pe(e).parent().is(t)||t.empty().append(e):t.text(pe(e).text()):t[n?"html":"text"](e)},t.getTitle=function(){var t=this.element.getAttribute("data-original-title");return t||(t="function"==typeof this.config.title?this.config.title.call(this.element):this.config.title),t},t._getAttachment=function(t){return Ie[t.toUpperCase()]},t._setListeners=function(){var i=this;this.config.trigger.split(" ").forEach(function(t){if("click"===t)pe(i.element).on(i.constructor.Event.CLICK,i.config.selector,function(t){return i.toggle(t)});else if(t!==xe){var e=t===He?i.constructor.Event.MOUSEENTER:i.constructor.Event.FOCUSIN,n=t===He?i.constructor.Event.MOUSELEAVE:i.constructor.Event.FOCUSOUT;pe(i.element).on(e,i.config.selector,function(t){return i._enter(t)}).on(n,i.config.selector,function(t){return i._leave(t)})}pe(i.element).closest(".modal").on("hide.bs.modal",function(){return i.hide()})}),this.config.selector?this.config=l({},this.config,{trigger:"manual",selector:""}):this._fixTitle()},t._fixTitle=function(){var t=typeof this.element.getAttribute("data-original-title");(this.element.getAttribute("title")||"string"!==t)&&(this.element.setAttribute("data-original-title",this.element.getAttribute("title")||""),this.element.setAttribute("title",""))},t._enter=function(t,e){var n=this.constructor.DATA_KEY;(e=e||pe(t.currentTarget).data(n))||(e=new this.constructor(t.currentTarget,this._getDelegateConfig()),pe(t.currentTarget).data(n,e)),t&&(e._activeTrigger["focusin"===t.type?Le:He]=!0),pe(e.getTipElement()).hasClass(ke)||e._hoverState===De?e._hoverState=De:(clearTimeout(e._timeout),e._hoverState=De,e.config.delay&&e.config.delay.show?e._timeout=setTimeout(function(){e._hoverState===De&&e.show()},e.config.delay.show):e.show())},t._leave=function(t,e){var n=this.constructor.DATA_KEY;(e=e||pe(t.currentTarget).data(n))||(e=new this.constructor(t.currentTarget,this._getDelegateConfig()),pe(t.currentTarget).data(n,e)),t&&(e._activeTrigger["focusout"===t.type?Le:He]=!1),e._isWithActiveTrigger()||(clearTimeout(e._timeout),e._hoverState=we,e.config.delay&&e.config.delay.hide?e._timeout=setTimeout(function(){e._hoverState===we&&e.hide()},e.config.delay.hide):e.hide())},t._isWithActiveTrigger=function(){for(var t in this._activeTrigger)if(this._activeTrigger[t])return!0;return!1},t._getConfig=function(t){return"number"==typeof(t=l({},this.constructor.Default,pe(this.element).data(),"object"==typeof t&&t?t:{})).delay&&(t.delay={show:t.delay,hide:t.delay}),"number"==typeof t.title&&(t.title=t.title.toString()),"number"==typeof t.content&&(t.content=t.content.toString()),Fn.typeCheckConfig(ve,t,this.constructor.DefaultType),t},t._getDelegateConfig=function(){var t={};if(this.config)for(var e in this.config)this.constructor.Default[e]!==this.config[e]&&(t[e]=this.config[e]);return t},t._cleanTipClass=function(){var t=pe(this.getTipElement()),e=t.attr("class").match(be);null!==e&&e.length&&t.removeClass(e.join(""))},t._handlePopperPlacementChange=function(t){var e=t.instance;this.tip=e.popper,this._cleanTipClass(),this.addAttachmentClass(this._getAttachment(t.placement))},t._fixTransition=function(){var t=this.getTipElement(),e=this.config.animation;null===t.getAttribute("x-placement")&&(pe(t).removeClass(Oe),this.config.animation=!1,this.hide(),this.show(),this.config.animation=e)},i._jQueryInterface=function(n){return this.each(function(){var t=pe(this).data(ye),e="object"==typeof n&&n;if((t||!/dispose|hide/.test(n))&&(t||(t=new i(this,e),pe(this).data(ye,t)),"string"==typeof n)){if("undefined"==typeof t[n])throw new TypeError('No method named "'+n+'"');t[n]()}})},s(i,null,[{key:"VERSION",get:function(){return"4.1.3"}},{key:"Default",get:function(){return Ae}},{key:"NAME",get:function(){return ve}},{key:"DATA_KEY",get:function(){return ye}},{key:"Event",get:function(){return Ne}},{key:"EVENT_KEY",get:function(){return Ee}},{key:"DefaultType",get:function(){return Se}}]),i}(),pe.fn[ve]=We._jQueryInterface,pe.fn[ve].Constructor=We,pe.fn[ve].noConflict=function(){return pe.fn[ve]=Ce,We._jQueryInterface},We),Jn=(qe="popover",Ke="."+(Fe="bs.popover"),Me=(Ue=e).fn[qe],Qe="bs-popover",Be=new RegExp("(^|\\s)"+Qe+"\\S+","g"),Ve=l({},zn.Default,{placement:"right",trigger:"click",content:"",template:'<div class="popover" role="tooltip"><div class="arrow"></div><h3 class="popover-header"></h3><div class="popover-body"></div></div>'}),Ye=l({},zn.DefaultType,{content:"(string|element|function)"}),ze="fade",Ze=".popover-header",Ge=".popover-body",$e={HIDE:"hide"+Ke,HIDDEN:"hidden"+Ke,SHOW:(Je="show")+Ke,SHOWN:"shown"+Ke,INSERTED:"inserted"+Ke,CLICK:"click"+Ke,FOCUSIN:"focusin"+Ke,FOCUSOUT:"focusout"+Ke,MOUSEENTER:"mouseenter"+Ke,MOUSELEAVE:"mouseleave"+Ke},Xe=function(t){var e,n;function i(){return t.apply(this,arguments)||this}n=t,(e=i).prototype=Object.create(n.prototype),(e.prototype.constructor=e).__proto__=n;var r=i.prototype;return r.isWithContent=function(){return this.getTitle()||this._getContent()},r.addAttachmentClass=function(t){Ue(this.getTipElement()).addClass(Qe+"-"+t)},r.getTipElement=function(){return this.tip=this.tip||Ue(this.config.template)[0],this.tip},r.setContent=function(){var t=Ue(this.getTipElement());this.setElementContent(t.find(Ze),this.getTitle());var e=this._getContent();"function"==typeof e&&(e=e.call(this.element)),this.setElementContent(t.find(Ge),e),t.removeClass(ze+" "+Je)},r._getContent=function(){return this.element.getAttribute("data-content")||this.config.content},r._cleanTipClass=function(){var t=Ue(this.getTipElement()),e=t.attr("class").match(Be);null!==e&&0<e.length&&t.removeClass(e.join(""))},i._jQueryInterface=function(n){return this.each(function(){var t=Ue(this).data(Fe),e="object"==typeof n?n:null;if((t||!/destroy|hide/.test(n))&&(t||(t=new i(this,e),Ue(this).data(Fe,t)),"string"==typeof n)){if("undefined"==typeof t[n])throw new TypeError('No method named "'+n+'"');t[n]()}})},s(i,null,[{key:"VERSION",get:function(){return"4.1.3"}},{key:"Default",get:function(){return Ve}},{key:"NAME",get:function(){return qe}},{key:"DATA_KEY",get:function(){return Fe}},{key:"Event",get:function(){return $e}},{key:"EVENT_KEY",get:function(){return Ke}},{key:"DefaultType",get:function(){return Ye}}]),i}(zn),Ue.fn[qe]=Xe._jQueryInterface,Ue.fn[qe].Constructor=Xe,Ue.fn[qe].noConflict=function(){return Ue.fn[qe]=Me,Xe._jQueryInterface},Xe),Zn=(en="scrollspy",rn="."+(nn="bs.scrollspy"),on=(tn=e).fn[en],sn={offset:10,method:"auto",target:""},an={offset:"number",method:"string",target:"(string|element)"},ln={ACTIVATE:"activate"+rn,SCROLL:"scroll"+rn,LOAD_DATA_API:"load"+rn+".data-api"},cn="dropdown-item",hn="active",un='[data-spy="scroll"]',fn=".active",dn=".nav, .list-group",gn=".nav-link",_n=".nav-item",mn=".list-group-item",pn=".dropdown",vn=".dropdown-item",yn=".dropdown-toggle",En="offset",Cn="position",Tn=function(){function n(t,e){var n=this;this._element=t,this._scrollElement="BODY"===t.tagName?window:t,this._config=this._getConfig(e),this._selector=this._config.target+" "+gn+","+this._config.target+" "+mn+","+this._config.target+" "+vn,this._offsets=[],this._targets=[],this._activeTarget=null,this._scrollHeight=0,tn(this._scrollElement).on(ln.SCROLL,function(t){return n._process(t)}),this.refresh(),this._process()}var t=n.prototype;return t.refresh=function(){var e=this,t=this._scrollElement===this._scrollElement.window?En:Cn,r="auto"===this._config.method?t:this._config.method,o=r===Cn?this._getScrollTop():0;this._offsets=[],this._targets=[],this._scrollHeight=this._getScrollHeight(),[].slice.call(document.querySelectorAll(this._selector)).map(function(t){var e,n=Fn.getSelectorFromElement(t);if(n&&(e=document.querySelector(n)),e){var i=e.getBoundingClientRect();if(i.width||i.height)return[tn(e)[r]().top+o,n]}return null}).filter(function(t){return t}).sort(function(t,e){return t[0]-e[0]}).forEach(function(t){e._offsets.push(t[0]),e._targets.push(t[1])})},t.dispose=function(){tn.removeData(this._element,nn),tn(this._scrollElement).off(rn),this._element=null,this._scrollElement=null,this._config=null,this._selector=null,this._offsets=null,this._targets=null,this._activeTarget=null,this._scrollHeight=null},t._getConfig=function(t){if("string"!=typeof(t=l({},sn,"object"==typeof t&&t?t:{})).target){var e=tn(t.target).attr("id");e||(e=Fn.getUID(en),tn(t.target).attr("id",e)),t.target="#"+e}return Fn.typeCheckConfig(en,t,an),t},t._getScrollTop=function(){return this._scrollElement===window?this._scrollElement.pageYOffset:this._scrollElement.scrollTop},t._getScrollHeight=function(){return this._scrollElement.scrollHeight||Math.max(document.body.scrollHeight,document.documentElement.scrollHeight)},t._getOffsetHeight=function(){return this._scrollElement===window?window.innerHeight:this._scrollElement.getBoundingClientRect().height},t._process=function(){var t=this._getScrollTop()+this._config.offset,e=this._getScrollHeight(),n=this._config.offset+e-this._getOffsetHeight();if(this._scrollHeight!==e&&this.refresh(),n<=t){var i=this._targets[this._targets.length-1];this._activeTarget!==i&&this._activate(i)}else{if(this._activeTarget&&t<this._offsets[0]&&0<this._offsets[0])return this._activeTarget=null,void this._clear();for(var r=this._offsets.length;r--;){this._activeTarget!==this._targets[r]&&t>=this._offsets[r]&&("undefined"==typeof this._offsets[r+1]||t<this._offsets[r+1])&&this._activate(this._targets[r])}}},t._activate=function(e){this._activeTarget=e,this._clear();var t=this._selector.split(",");t=t.map(function(t){return t+'[data-target="'+e+'"],'+t+'[href="'+e+'"]'});var n=tn([].slice.call(document.querySelectorAll(t.join(","))));n.hasClass(cn)?(n.closest(pn).find(yn).addClass(hn),n.addClass(hn)):(n.addClass(hn),n.parents(dn).prev(gn+", "+mn).addClass(hn),n.parents(dn).prev(_n).children(gn).addClass(hn)),tn(this._scrollElement).trigger(ln.ACTIVATE,{relatedTarget:e})},t._clear=function(){var t=[].slice.call(document.querySelectorAll(this._selector));tn(t).filter(fn).removeClass(hn)},n._jQueryInterface=function(e){return this.each(function(){var t=tn(this).data(nn);if(t||(t=new n(this,"object"==typeof e&&e),tn(this).data(nn,t)),"string"==typeof e){if("undefined"==typeof t[e])throw new TypeError('No method named "'+e+'"');t[e]()}})},s(n,null,[{key:"VERSION",get:function(){return"4.1.3"}},{key:"Default",get:function(){return sn}}]),n}(),tn(window).on(ln.LOAD_DATA_API,function(){for(var t=[].slice.call(document.querySelectorAll(un)),e=t.length;e--;){var n=tn(t[e]);Tn._jQueryInterface.call(n,n.data())}}),tn.fn[en]=Tn._jQueryInterface,tn.fn[en].Constructor=Tn,tn.fn[en].noConflict=function(){return tn.fn[en]=on,Tn._jQueryInterface},Tn),Gn=(In="."+(Sn="bs.tab"),An=(bn=e).fn.tab,Dn={HIDE:"hide"+In,HIDDEN:"hidden"+In,SHOW:"show"+In,SHOWN:"shown"+In,CLICK_DATA_API:"click"+In+".data-api"},wn="dropdown-menu",Nn="active",On="disabled",kn="fade",Pn="show",jn=".dropdown",Hn=".nav, .list-group",Ln=".active",Rn="> li > .active",xn='[data-toggle="tab"], [data-toggle="pill"], [data-toggle="list"]',Wn=".dropdown-toggle",Un="> .dropdown-menu .active",qn=function(){function i(t){this._element=t}var t=i.prototype;return t.show=function(){var n=this;if(!(this._element.parentNode&&this._element.parentNode.nodeType===Node.ELEMENT_NODE&&bn(this._element).hasClass(Nn)||bn(this._element).hasClass(On))){var t,i,e=bn(this._element).closest(Hn)[0],r=Fn.getSelectorFromElement(this._element);if(e){var o="UL"===e.nodeName?Rn:Ln;i=(i=bn.makeArray(bn(e).find(o)))[i.length-1]}var s=bn.Event(Dn.HIDE,{relatedTarget:this._element}),a=bn.Event(Dn.SHOW,{relatedTarget:i});if(i&&bn(i).trigger(s),bn(this._element).trigger(a),!a.isDefaultPrevented()&&!s.isDefaultPrevented()){r&&(t=document.querySelector(r)),this._activate(this._element,e);var l=function(){var t=bn.Event(Dn.HIDDEN,{relatedTarget:n._element}),e=bn.Event(Dn.SHOWN,{relatedTarget:i});bn(i).trigger(t),bn(n._element).trigger(e)};t?this._activate(t,t.parentNode,l):l()}}},t.dispose=function(){bn.removeData(this._element,Sn),this._element=null},t._activate=function(t,e,n){var i=this,r=("UL"===e.nodeName?bn(e).find(Rn):bn(e).children(Ln))[0],o=n&&r&&bn(r).hasClass(kn),s=function(){return i._transitionComplete(t,r,n)};if(r&&o){var a=Fn.getTransitionDurationFromElement(r);bn(r).one(Fn.TRANSITION_END,s).emulateTransitionEnd(a)}else s()},t._transitionComplete=function(t,e,n){if(e){bn(e).removeClass(Pn+" "+Nn);var i=bn(e.parentNode).find(Un)[0];i&&bn(i).removeClass(Nn),"tab"===e.getAttribute("role")&&e.setAttribute("aria-selected",!1)}if(bn(t).addClass(Nn),"tab"===t.getAttribute("role")&&t.setAttribute("aria-selected",!0),Fn.reflow(t),bn(t).addClass(Pn),t.parentNode&&bn(t.parentNode).hasClass(wn)){var r=bn(t).closest(jn)[0];if(r){var o=[].slice.call(r.querySelectorAll(Wn));bn(o).addClass(Nn)}t.setAttribute("aria-expanded",!0)}n&&n()},i._jQueryInterface=function(n){return this.each(function(){var t=bn(this),e=t.data(Sn);if(e||(e=new i(this),t.data(Sn,e)),"string"==typeof n){if("undefined"==typeof e[n])throw new TypeError('No method named "'+n+'"');e[n]()}})},s(i,null,[{key:"VERSION",get:function(){return"4.1.3"}}]),i}(),bn(document).on(Dn.CLICK_DATA_API,xn,function(t){t.preventDefault(),qn._jQueryInterface.call(bn(this),"show")}),bn.fn.tab=qn._jQueryInterface,bn.fn.tab.Constructor=qn,bn.fn.tab.noConflict=function(){return bn.fn.tab=An,qn._jQueryInterface},qn);!function(t){if("undefined"==typeof t)throw new TypeError("Bootstrap's JavaScript requires jQuery. jQuery must be included before Bootstrap's JavaScript.");var e=t.fn.jquery.split(" ")[0].split(".");if(e[0]<2&&e[1]<9||1===e[0]&&9===e[1]&&e[2]<1||4<=e[0])throw new Error("Bootstrap's JavaScript requires at least jQuery v1.9.1 but less than v4.0.0")}(e),t.Util=Fn,t.Alert=Kn,t.Button=Mn,t.Carousel=Qn,t.Collapse=Bn,t.Dropdown=Vn,t.Modal=Yn,t.Popover=Jn,t.Scrollspy=Zn,t.Tab=Gn,t.Tooltip=zn,Object.defineProperty(t,"__esModule",{value:!0})});
+//# sourceMappingURL=bootstrap.min.js.map
\ No newline at end of file
diff --git a/qpysdk/src/main/assets/stylesheets/js/jquery.js b/qpysdk/src/main/assets/stylesheets/js/jquery.js
deleted file mode 100644
index 16ad06c5..00000000
--- a/qpysdk/src/main/assets/stylesheets/js/jquery.js
+++ /dev/null
@@ -1,4 +0,0 @@
-/*! jQuery v1.7.2 jquery.com | jquery.org/license */
-(function(a,b){function cy(a){return f.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:!1}function cu(a){if(!cj[a]){var b=c.body,d=f("<"+a+">").appendTo(b),e=d.css("display");d.remove();if(e==="none"||e===""){ck||(ck=c.createElement("iframe"),ck.frameBorder=ck.width=ck.height=0),b.appendChild(ck);if(!cl||!ck.createElement)cl=(ck.contentWindow||ck.contentDocument).document,cl.write((f.support.boxModel?"<!doctype html>":"")+"<html><body>"),cl.close();d=cl.createElement(a),cl.body.appendChild(d),e=f.css(d,"display"),b.removeChild(ck)}cj[a]=e}return cj[a]}function ct(a,b){var c={};f.each(cp.concat.apply([],cp.slice(0,b)),function(){c[this]=a});return c}function cs(){cq=b}function cr(){setTimeout(cs,0);return cq=f.now()}function ci(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}function ch(){try{return new a.XMLHttpRequest}catch(b){}}function cb(a,c){a.dataFilter&&(c=a.dataFilter(c,a.dataType));var d=a.dataTypes,e={},g,h,i=d.length,j,k=d[0],l,m,n,o,p;for(g=1;g<i;g++){if(g===1)for(h in a.converters)typeof h=="string"&&(e[h.toLowerCase()]=a.converters[h]);l=k,k=d[g];if(k==="*")k=l;else if(l!=="*"&&l!==k){m=l+" "+k,n=e[m]||e["* "+k];if(!n){p=b;for(o in e){j=o.split(" ");if(j[0]===l||j[0]==="*"){p=e[j[1]+" "+k];if(p){o=e[o],o===!0?n=p:p===!0&&(n=o);break}}}}!n&&!p&&f.error("No conversion from "+m.replace(" "," to ")),n!==!0&&(c=n?n(c):p(o(c)))}}return c}function ca(a,c,d){var e=a.contents,f=a.dataTypes,g=a.responseFields,h,i,j,k;for(i in g)i in d&&(c[g[i]]=d[i]);while(f[0]==="*")f.shift(),h===b&&(h=a.mimeType||c.getResponseHeader("content-type"));if(h)for(i in e)if(e[i]&&e[i].test(h)){f.unshift(i);break}if(f[0]in d)j=f[0];else{for(i in d){if(!f[0]||a.converters[i+" "+f[0]]){j=i;break}k||(k=i)}j=j||k}if(j){j!==f[0]&&f.unshift(j);return d[j]}}function b_(a,b,c,d){if(f.isArray(b))f.each(b,function(b,e){c||bD.test(a)?d(a,e):b_(a+"["+(typeof e=="object"?b:"")+"]",e,c,d)});else if(!c&&f.type(b)==="object")for(var e in b)b_(a+"["+e+"]",b[e],c,d);else d(a,b)}function b$(a,c){var d,e,g=f.ajaxSettings.flatOptions||{};for(d in c)c[d]!==b&&((g[d]?a:e||(e={}))[d]=c[d]);e&&f.extend(!0,a,e)}function bZ(a,c,d,e,f,g){f=f||c.dataTypes[0],g=g||{},g[f]=!0;var h=a[f],i=0,j=h?h.length:0,k=a===bS,l;for(;i<j&&(k||!l);i++)l=h[i](c,d,e),typeof l=="string"&&(!k||g[l]?l=b:(c.dataTypes.unshift(l),l=bZ(a,c,d,e,l,g)));(k||!l)&&!g["*"]&&(l=bZ(a,c,d,e,"*",g));return l}function bY(a){return function(b,c){typeof b!="string"&&(c=b,b="*");if(f.isFunction(c)){var d=b.toLowerCase().split(bO),e=0,g=d.length,h,i,j;for(;e<g;e++)h=d[e],j=/^\+/.test(h),j&&(h=h.substr(1)||"*"),i=a[h]=a[h]||[],i[j?"unshift":"push"](c)}}}function bB(a,b,c){var d=b==="width"?a.offsetWidth:a.offsetHeight,e=b==="width"?1:0,g=4;if(d>0){if(c!=="border")for(;e<g;e+=2)c||(d-=parseFloat(f.css(a,"padding"+bx[e]))||0),c==="margin"?d+=parseFloat(f.css(a,c+bx[e]))||0:d-=parseFloat(f.css(a,"border"+bx[e]+"Width"))||0;return d+"px"}d=by(a,b);if(d<0||d==null)d=a.style[b];if(bt.test(d))return d;d=parseFloat(d)||0;if(c)for(;e<g;e+=2)d+=parseFloat(f.css(a,"padding"+bx[e]))||0,c!=="padding"&&(d+=parseFloat(f.css(a,"border"+bx[e]+"Width"))||0),c==="margin"&&(d+=parseFloat(f.css(a,c+bx[e]))||0);return d+"px"}function bo(a){var b=c.createElement("div");bh.appendChild(b),b.innerHTML=a.outerHTML;return b.firstChild}function bn(a){var b=(a.nodeName||"").toLowerCase();b==="input"?bm(a):b!=="script"&&typeof a.getElementsByTagName!="undefined"&&f.grep(a.getElementsByTagName("input"),bm)}function bm(a){if(a.type==="checkbox"||a.type==="radio")a.defaultChecked=a.checked}function bl(a){return typeof a.getElementsByTagName!="undefined"?a.getElementsByTagName("*"):typeof a.querySelectorAll!="undefined"?a.querySelectorAll("*"):[]}function bk(a,b){var c;b.nodeType===1&&(b.clearAttributes&&b.clearAttributes(),b.mergeAttributes&&b.mergeAttributes(a),c=b.nodeName.toLowerCase(),c==="object"?b.outerHTML=a.outerHTML:c!=="input"||a.type!=="checkbox"&&a.type!=="radio"?c==="option"?b.selected=a.defaultSelected:c==="input"||c==="textarea"?b.defaultValue=a.defaultValue:c==="script"&&b.text!==a.text&&(b.text=a.text):(a.checked&&(b.defaultChecked=b.checked=a.checked),b.value!==a.value&&(b.value=a.value)),b.removeAttribute(f.expando),b.removeAttribute("_submit_attached"),b.removeAttribute("_change_attached"))}function bj(a,b){if(b.nodeType===1&&!!f.hasData(a)){var c,d,e,g=f._data(a),h=f._data(b,g),i=g.events;if(i){delete h.handle,h.events={};for(c in i)for(d=0,e=i[c].length;d<e;d++)f.event.add(b,c,i[c][d])}h.data&&(h.data=f.extend({},h.data))}}function bi(a,b){return f.nodeName(a,"table")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function U(a){var b=V.split("|"),c=a.createDocumentFragment();if(c.createElement)while(b.length)c.createElement(b.pop());return c}function T(a,b,c){b=b||0;if(f.isFunction(b))return f.grep(a,function(a,d){var e=!!b.call(a,d,a);return e===c});if(b.nodeType)return f.grep(a,function(a,d){return a===b===c});if(typeof b=="string"){var d=f.grep(a,function(a){return a.nodeType===1});if(O.test(b))return f.filter(b,d,!c);b=f.filter(b,d)}return f.grep(a,function(a,d){return f.inArray(a,b)>=0===c})}function S(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function K(){return!0}function J(){return!1}function n(a,b,c){var d=b+"defer",e=b+"queue",g=b+"mark",h=f._data(a,d);h&&(c==="queue"||!f._data(a,e))&&(c==="mark"||!f._data(a,g))&&setTimeout(function(){!f._data(a,e)&&!f._data(a,g)&&(f.removeData(a,d,!0),h.fire())},0)}function m(a){for(var b in a){if(b==="data"&&f.isEmptyObject(a[b]))continue;if(b!=="toJSON")return!1}return!0}function l(a,c,d){if(d===b&&a.nodeType===1){var e="data-"+c.replace(k,"-$1").toLowerCase();d=a.getAttribute(e);if(typeof d=="string"){try{d=d==="true"?!0:d==="false"?!1:d==="null"?null:f.isNumeric(d)?+d:j.test(d)?f.parseJSON(d):d}catch(g){}f.data(a,c,d)}else d=b}return d}function h(a){var b=g[a]={},c,d;a=a.split(/\s+/);for(c=0,d=a.length;c<d;c++)b[a[c]]=!0;return b}var c=a.document,d=a.navigator,e=a.location,f=function(){function J(){if(!e.isReady){try{c.documentElement.doScroll("left")}catch(a){setTimeout(J,1);return}e.ready()}}var e=function(a,b){return new e.fn.init(a,b,h)},f=a.jQuery,g=a.$,h,i=/^(?:[^#<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,j=/\S/,k=/^\s+/,l=/\s+$/,m=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,n=/^[\],:{}\s]*$/,o=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,p=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,q=/(?:^|:|,)(?:\s*\[)+/g,r=/(webkit)[ \/]([\w.]+)/,s=/(opera)(?:.*version)?[ \/]([\w.]+)/,t=/(msie) ([\w.]+)/,u=/(mozilla)(?:.*? rv:([\w.]+))?/,v=/-([a-z]|[0-9])/ig,w=/^-ms-/,x=function(a,b){return(b+"").toUpperCase()},y=d.userAgent,z,A,B,C=Object.prototype.toString,D=Object.prototype.hasOwnProperty,E=Array.prototype.push,F=Array.prototype.slice,G=String.prototype.trim,H=Array.prototype.indexOf,I={};e.fn=e.prototype={constructor:e,init:function(a,d,f){var g,h,j,k;if(!a)return this;if(a.nodeType){this.context=this[0]=a,this.length=1;return this}if(a==="body"&&!d&&c.body){this.context=c,this[0]=c.body,this.selector=a,this.length=1;return this}if(typeof a=="string"){a.charAt(0)!=="<"||a.charAt(a.length-1)!==">"||a.length<3?g=i.exec(a):g=[null,a,null];if(g&&(g[1]||!d)){if(g[1]){d=d instanceof e?d[0]:d,k=d?d.ownerDocument||d:c,j=m.exec(a),j?e.isPlainObject(d)?(a=[c.createElement(j[1])],e.fn.attr.call(a,d,!0)):a=[k.createElement(j[1])]:(j=e.buildFragment([g[1]],[k]),a=(j.cacheable?e.clone(j.fragment):j.fragment).childNodes);return e.merge(this,a)}h=c.getElementById(g[2]);if(h&&h.parentNode){if(h.id!==g[2])return f.find(a);this.length=1,this[0]=h}this.context=c,this.selector=a;return this}return!d||d.jquery?(d||f).find(a):this.constructor(d).find(a)}if(e.isFunction(a))return f.ready(a);a.selector!==b&&(this.selector=a.selector,this.context=a.context);return e.makeArray(a,this)},selector:"",jquery:"1.7.2",length:0,size:function(){return this.length},toArray:function(){return F.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var d=this.constructor();e.isArray(a)?E.apply(d,a):e.merge(d,a),d.prevObject=this,d.context=this.context,b==="find"?d.selector=this.selector+(this.selector?" ":"")+c:b&&(d.selector=this.selector+"."+b+"("+c+")");return d},each:function(a,b){return e.each(this,a,b)},ready:function(a){e.bindReady(),A.add(a);return this},eq:function(a){a=+a;return a===-1?this.slice(a):this.slice(a,a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(F.apply(this,arguments),"slice",F.call(arguments).join(","))},map:function(a){return this.pushStack(e.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:E,sort:[].sort,splice:[].splice},e.fn.init.prototype=e.fn,e.extend=e.fn.extend=function(){var a,c,d,f,g,h,i=arguments[0]||{},j=1,k=arguments.length,l=!1;typeof i=="boolean"&&(l=i,i=arguments[1]||{},j=2),typeof i!="object"&&!e.isFunction(i)&&(i={}),k===j&&(i=this,--j);for(;j<k;j++)if((a=arguments[j])!=null)for(c in a){d=i[c],f=a[c];if(i===f)continue;l&&f&&(e.isPlainObject(f)||(g=e.isArray(f)))?(g?(g=!1,h=d&&e.isArray(d)?d:[]):h=d&&e.isPlainObject(d)?d:{},i[c]=e.extend(l,h,f)):f!==b&&(i[c]=f)}return i},e.extend({noConflict:function(b){a.$===e&&(a.$=g),b&&a.jQuery===e&&(a.jQuery=f);return e},isReady:!1,readyWait:1,holdReady:function(a){a?e.readyWait++:e.ready(!0)},ready:function(a){if(a===!0&&!--e.readyWait||a!==!0&&!e.isReady){if(!c.body)return setTimeout(e.ready,1);e.isReady=!0;if(a!==!0&&--e.readyWait>0)return;A.fireWith(c,[e]),e.fn.trigger&&e(c).trigger("ready").off("ready")}},bindReady:function(){if(!A){A=e.Callbacks("once memory");if(c.readyState==="complete")return setTimeout(e.ready,1);if(c.addEventListener)c.addEventListener("DOMContentLoaded",B,!1),a.addEventListener("load",e.ready,!1);else if(c.attachEvent){c.attachEvent("onreadystatechange",B),a.attachEvent("onload",e.ready);var b=!1;try{b=a.frameElement==null}catch(d){}c.documentElement.doScroll&&b&&J()}}},isFunction:function(a){return e.type(a)==="function"},isArray:Array.isArray||function(a){return e.type(a)==="array"},isWindow:function(a){return a!=null&&a==a.window},isNumeric:function(a){return!isNaN(parseFloat(a))&&isFinite(a)},type:function(a){return a==null?String(a):I[C.call(a)]||"object"},isPlainObject:function(a){if(!a||e.type(a)!=="object"||a.nodeType||e.isWindow(a))return!1;try{if(a.constructor&&!D.call(a,"constructor")&&!D.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}var d;for(d in a);return d===b||D.call(a,d)},isEmptyObject:function(a){for(var b in a)return!1;return!0},error:function(a){throw new Error(a)},parseJSON:function(b){if(typeof b!="string"||!b)return null;b=e.trim(b);if(a.JSON&&a.JSON.parse)return a.JSON.parse(b);if(n.test(b.replace(o,"@").replace(p,"]").replace(q,"")))return(new Function("return "+b))();e.error("Invalid JSON: "+b)},parseXML:function(c){if(typeof c!="string"||!c)return null;var d,f;try{a.DOMParser?(f=new DOMParser,d=f.parseFromString(c,"text/xml")):(d=new ActiveXObject("Microsoft.XMLDOM"),d.async="false",d.loadXML(c))}catch(g){d=b}(!d||!d.documentElement||d.getElementsByTagName("parsererror").length)&&e.error("Invalid XML: "+c);return d},noop:function(){},globalEval:function(b){b&&j.test(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(w,"ms-").replace(v,x)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,c,d){var f,g=0,h=a.length,i=h===b||e.isFunction(a);if(d){if(i){for(f in a)if(c.apply(a[f],d)===!1)break}else for(;g<h;)if(c.apply(a[g++],d)===!1)break}else if(i){for(f in a)if(c.call(a[f],f,a[f])===!1)break}else for(;g<h;)if(c.call(a[g],g,a[g++])===!1)break;return a},trim:G?function(a){return a==null?"":G.call(a)}:function(a){return a==null?"":(a+"").replace(k,"").replace(l,"")},makeArray:function(a,b){var c=b||[];if(a!=null){var d=e.type(a);a.length==null||d==="string"||d==="function"||d==="regexp"||e.isWindow(a)?E.call(c,a):e.merge(c,a)}return c},inArray:function(a,b,c){var d;if(b){if(H)return H.call(b,a,c);d=b.length,c=c?c<0?Math.max(0,d+c):c:0;for(;c<d;c++)if(c in b&&b[c]===a)return c}return-1},merge:function(a,c){var d=a.length,e=0;if(typeof c.length=="number")for(var f=c.length;e<f;e++)a[d++]=c[e];else while(c[e]!==b)a[d++]=c[e++];a.length=d;return a},grep:function(a,b,c){var d=[],e;c=!!c;for(var f=0,g=a.length;f<g;f++)e=!!b(a[f],f),c!==e&&d.push(a[f]);return d},map:function(a,c,d){var f,g,h=[],i=0,j=a.length,k=a instanceof e||j!==b&&typeof j=="number"&&(j>0&&a[0]&&a[j-1]||j===0||e.isArray(a));if(k)for(;i<j;i++)f=c(a[i],i,d),f!=null&&(h[h.length]=f);else for(g in a)f=c(a[g],g,d),f!=null&&(h[h.length]=f);return h.concat.apply([],h)},guid:1,proxy:function(a,c){if(typeof c=="string"){var d=a[c];c=a,a=d}if(!e.isFunction(a))return b;var f=F.call(arguments,2),g=function(){return a.apply(c,f.concat(F.call(arguments)))};g.guid=a.guid=a.guid||g.guid||e.guid++;return g},access:function(a,c,d,f,g,h,i){var j,k=d==null,l=0,m=a.length;if(d&&typeof d=="object"){for(l in d)e.access(a,c,l,d[l],1,h,f);g=1}else if(f!==b){j=i===b&&e.isFunction(f),k&&(j?(j=c,c=function(a,b,c){return j.call(e(a),c)}):(c.call(a,f),c=null));if(c)for(;l<m;l++)c(a[l],d,j?f.call(a[l],l,c(a[l],d)):f,i);g=1}return g?a:k?c.call(a):m?c(a[0],d):h},now:function(){return(new Date).getTime()},uaMatch:function(a){a=a.toLowerCase();var b=r.exec(a)||s.exec(a)||t.exec(a)||a.indexOf("compatible")<0&&u.exec(a)||[];return{browser:b[1]||"",version:b[2]||"0"}},sub:function(){function a(b,c){return new a.fn.init(b,c)}e.extend(!0,a,this),a.superclass=this,a.fn=a.prototype=this(),a.fn.constructor=a,a.sub=this.sub,a.fn.init=function(d,f){f&&f instanceof e&&!(f instanceof a)&&(f=a(f));return e.fn.init.call(this,d,f,b)},a.fn.init.prototype=a.fn;var b=a(c);return a},browser:{}}),e.each("Boolean Number String Function Array Date RegExp Object".split(" "),function(a,b){I["[object "+b+"]"]=b.toLowerCase()}),z=e.uaMatch(y),z.browser&&(e.browser[z.browser]=!0,e.browser.version=z.version),e.browser.webkit&&(e.browser.safari=!0),j.test(" ")&&(k=/^[\s\xA0]+/,l=/[\s\xA0]+$/),h=e(c),c.addEventListener?B=function(){c.removeEventListener("DOMContentLoaded",B,!1),e.ready()}:c.attachEvent&&(B=function(){c.readyState==="complete"&&(c.detachEvent("onreadystatechange",B),e.ready())});return e}(),g={};f.Callbacks=function(a){a=a?g[a]||h(a):{};var c=[],d=[],e,i,j,k,l,m,n=function(b){var d,e,g,h,i;for(d=0,e=b.length;d<e;d++)g=b[d],h=f.type(g),h==="array"?n(g):h==="function"&&(!a.unique||!p.has(g))&&c.push(g)},o=function(b,f){f=f||[],e=!a.memory||[b,f],i=!0,j=!0,m=k||0,k=0,l=c.length;for(;c&&m<l;m++)if(c[m].apply(b,f)===!1&&a.stopOnFalse){e=!0;break}j=!1,c&&(a.once?e===!0?p.disable():c=[]:d&&d.length&&(e=d.shift(),p.fireWith(e[0],e[1])))},p={add:function(){if(c){var a=c.length;n(arguments),j?l=c.length:e&&e!==!0&&(k=a,o(e[0],e[1]))}return this},remove:function(){if(c){var b=arguments,d=0,e=b.length;for(;d<e;d++)for(var f=0;f<c.length;f++)if(b[d]===c[f]){j&&f<=l&&(l--,f<=m&&m--),c.splice(f--,1);if(a.unique)break}}return this},has:function(a){if(c){var b=0,d=c.length;for(;b<d;b++)if(a===c[b])return!0}return!1},empty:function(){c=[];return this},disable:function(){c=d=e=b;return this},disabled:function(){return!c},lock:function(){d=b,(!e||e===!0)&&p.disable();return this},locked:function(){return!d},fireWith:function(b,c){d&&(j?a.once||d.push([b,c]):(!a.once||!e)&&o(b,c));return this},fire:function(){p.fireWith(this,arguments);return this},fired:function(){return!!i}};return p};var i=[].slice;f.extend({Deferred:function(a){var b=f.Callbacks("once memory"),c=f.Callbacks("once memory"),d=f.Callbacks("memory"),e="pending",g={resolve:b,reject:c,notify:d},h={done:b.add,fail:c.add,progress:d.add,state:function(){return e},isResolved:b.fired,isRejected:c.fired,then:function(a,b,c){i.done(a).fail(b).progress(c);return this},always:function(){i.done.apply(i,arguments).fail.apply(i,arguments);return this},pipe:function(a,b,c){return f.Deferred(function(d){f.each({done:[a,"resolve"],fail:[b,"reject"],progress:[c,"notify"]},function(a,b){var c=b[0],e=b[1],g;f.isFunction(c)?i[a](function(){g=c.apply(this,arguments),g&&f.isFunction(g.promise)?g.promise().then(d.resolve,d.reject,d.notify):d[e+"With"](this===i?d:this,[g])}):i[a](d[e])})}).promise()},promise:function(a){if(a==null)a=h;else for(var b in h)a[b]=h[b];return a}},i=h.promise({}),j;for(j in g)i[j]=g[j].fire,i[j+"With"]=g[j].fireWith;i.done(function(){e="resolved"},c.disable,d.lock).fail(function(){e="rejected"},b.disable,d.lock),a&&a.call(i,i);return i},when:function(a){function m(a){return function(b){e[a]=arguments.length>1?i.call(arguments,0):b,j.notifyWith(k,e)}}function l(a){return function(c){b[a]=arguments.length>1?i.call(arguments,0):c,--g||j.resolveWith(j,b)}}var b=i.call(arguments,0),c=0,d=b.length,e=Array(d),g=d,h=d,j=d<=1&&a&&f.isFunction(a.promise)?a:f.Deferred(),k=j.promise();if(d>1){for(;c<d;c++)b[c]&&b[c].promise&&f.isFunction(b[c].promise)?b[c].promise().then(l(c),j.reject,m(c)):--g;g||j.resolveWith(j,b)}else j!==a&&j.resolveWith(j,d?[a]:[]);return k}}),f.support=function(){var b,d,e,g,h,i,j,k,l,m,n,o,p=c.createElement("div"),q=c.documentElement;p.setAttribute("className","t"),p.innerHTML="   <link/><table></table><a href='/a' style='top:1px;float:left;opacity:.55;'>a</a><input type='checkbox'/>",d=p.getElementsByTagName("*"),e=p.getElementsByTagName("a")[0];if(!d||!d.length||!e)return{};g=c.createElement("select"),h=g.appendChild(c.createElement("option")),i=p.getElementsByTagName("input")[0],b={leadingWhitespace:p.firstChild.nodeType===3,tbody:!p.getElementsByTagName("tbody").length,htmlSerialize:!!p.getElementsByTagName("link").length,style:/top/.test(e.getAttribute("style")),hrefNormalized:e.getAttribute("href")==="/a",opacity:/^0.55/.test(e.style.opacity),cssFloat:!!e.style.cssFloat,checkOn:i.value==="on",optSelected:h.selected,getSetAttribute:p.className!=="t",enctype:!!c.createElement("form").enctype,html5Clone:c.createElement("nav").cloneNode(!0).outerHTML!=="<:nav></:nav>",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0,pixelMargin:!0},f.boxModel=b.boxModel=c.compatMode==="CSS1Compat",i.checked=!0,b.noCloneChecked=i.cloneNode(!0).checked,g.disabled=!0,b.optDisabled=!h.disabled;try{delete p.test}catch(r){b.deleteExpando=!1}!p.addEventListener&&p.attachEvent&&p.fireEvent&&(p.attachEvent("onclick",function(){b.noCloneEvent=!1}),p.cloneNode(!0).fireEvent("onclick")),i=c.createElement("input"),i.value="t",i.setAttribute("type","radio"),b.radioValue=i.value==="t",i.setAttribute("checked","checked"),i.setAttribute("name","t"),p.appendChild(i),j=c.createDocumentFragment(),j.appendChild(p.lastChild),b.checkClone=j.cloneNode(!0).cloneNode(!0).lastChild.checked,b.appendChecked=i.checked,j.removeChild(i),j.appendChild(p);if(p.attachEvent)for(n in{submit:1,change:1,focusin:1})m="on"+n,o=m in p,o||(p.setAttribute(m,"return;"),o=typeof p[m]=="function"),b[n+"Bubbles"]=o;j.removeChild(p),j=g=h=p=i=null,f(function(){var d,e,g,h,i,j,l,m,n,q,r,s,t,u=c.getElementsByTagName("body")[0];!u||(m=1,t="padding:0;margin:0;border:",r="position:absolute;top:0;left:0;width:1px;height:1px;",s=t+"0;visibility:hidden;",n="style='"+r+t+"5px solid #000;",q="<div "+n+"display:block;'><div style='"+t+"0;display:block;overflow:hidden;'></div></div>"+"<table "+n+"' cellpadding='0' cellspacing='0'>"+"<tr><td></td></tr></table>",d=c.createElement("div"),d.style.cssText=s+"width:0;height:0;position:static;top:0;margin-top:"+m+"px",u.insertBefore(d,u.firstChild),p=c.createElement("div"),d.appendChild(p),p.innerHTML="<table><tr><td style='"+t+"0;display:none'></td><td>t</td></tr></table>",k=p.getElementsByTagName("td"),o=k[0].offsetHeight===0,k[0].style.display="",k[1].style.display="none",b.reliableHiddenOffsets=o&&k[0].offsetHeight===0,a.getComputedStyle&&(p.innerHTML="",l=c.createElement("div"),l.style.width="0",l.style.marginRight="0",p.style.width="2px",p.appendChild(l),b.reliableMarginRight=(parseInt((a.getComputedStyle(l,null)||{marginRight:0}).marginRight,10)||0)===0),typeof p.style.zoom!="undefined"&&(p.innerHTML="",p.style.width=p.style.padding="1px",p.style.border=0,p.style.overflow="hidden",p.style.display="inline",p.style.zoom=1,b.inlineBlockNeedsLayout=p.offsetWidth===3,p.style.display="block",p.style.overflow="visible",p.innerHTML="<div style='width:5px;'></div>",b.shrinkWrapBlocks=p.offsetWidth!==3),p.style.cssText=r+s,p.innerHTML=q,e=p.firstChild,g=e.firstChild,i=e.nextSibling.firstChild.firstChild,j={doesNotAddBorder:g.offsetTop!==5,doesAddBorderForTableAndCells:i.offsetTop===5},g.style.position="fixed",g.style.top="20px",j.fixedPosition=g.offsetTop===20||g.offsetTop===15,g.style.position=g.style.top="",e.style.overflow="hidden",e.style.position="relative",j.subtractsBorderForOverflowNotVisible=g.offsetTop===-5,j.doesNotIncludeMarginInBodyOffset=u.offsetTop!==m,a.getComputedStyle&&(p.style.marginTop="1%",b.pixelMargin=(a.getComputedStyle(p,null)||{marginTop:0}).marginTop!=="1%"),typeof d.style.zoom!="undefined"&&(d.style.zoom=1),u.removeChild(d),l=p=d=null,f.extend(b,j))});return b}();var j=/^(?:\{.*\}|\[.*\])$/,k=/([A-Z])/g;f.extend({cache:{},uuid:0,expando:"jQuery"+(f.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){a=a.nodeType?f.cache[a[f.expando]]:a[f.expando];return!!a&&!m(a)},data:function(a,c,d,e){if(!!f.acceptData(a)){var g,h,i,j=f.expando,k=typeof c=="string",l=a.nodeType,m=l?f.cache:a,n=l?a[j]:a[j]&&j,o=c==="events";if((!n||!m[n]||!o&&!e&&!m[n].data)&&k&&d===b)return;n||(l?a[j]=n=++f.uuid:n=j),m[n]||(m[n]={},l||(m[n].toJSON=f.noop));if(typeof c=="object"||typeof c=="function")e?m[n]=f.extend(m[n],c):m[n].data=f.extend(m[n].data,c);g=h=m[n],e||(h.data||(h.data={}),h=h.data),d!==b&&(h[f.camelCase(c)]=d);if(o&&!h[c])return g.events;k?(i=h[c],i==null&&(i=h[f.camelCase(c)])):i=h;return i}},removeData:function(a,b,c){if(!!f.acceptData(a)){var d,e,g,h=f.expando,i=a.nodeType,j=i?f.cache:a,k=i?a[h]:h;if(!j[k])return;if(b){d=c?j[k]:j[k].data;if(d){f.isArray(b)||(b in d?b=[b]:(b=f.camelCase(b),b in d?b=[b]:b=b.split(" ")));for(e=0,g=b.length;e<g;e++)delete d[b[e]];if(!(c?m:f.isEmptyObject)(d))return}}if(!c){delete j[k].data;if(!m(j[k]))return}f.support.deleteExpando||!j.setInterval?delete j[k]:j[k]=null,i&&(f.support.deleteExpando?delete a[h]:a.removeAttribute?a.removeAttribute(h):a[h]=null)}},_data:function(a,b,c){return f.data(a,b,c,!0)},acceptData:function(a){if(a.nodeName){var b=f.noData[a.nodeName.toLowerCase()];if(b)return b!==!0&&a.getAttribute("classid")===b}return!0}}),f.fn.extend({data:function(a,c){var d,e,g,h,i,j=this[0],k=0,m=null;if(a===b){if(this.length){m=f.data(j);if(j.nodeType===1&&!f._data(j,"parsedAttrs")){g=j.attributes;for(i=g.length;k<i;k++)h=g[k].name,h.indexOf("data-")===0&&(h=f.camelCase(h.substring(5)),l(j,h,m[h]));f._data(j,"parsedAttrs",!0)}}return m}if(typeof a=="object")return this.each(function(){f.data(this,a)});d=a.split(".",2),d[1]=d[1]?"."+d[1]:"",e=d[1]+"!";return f.access(this,function(c){if(c===b){m=this.triggerHandler("getData"+e,[d[0]]),m===b&&j&&(m=f.data(j,a),m=l(j,a,m));return m===b&&d[1]?this.data(d[0]):m}d[1]=c,this.each(function(){var b=f(this);b.triggerHandler("setData"+e,d),f.data(this,a,c),b.triggerHandler("changeData"+e,d)})},null,c,arguments.length>1,null,!1)},removeData:function(a){return this.each(function(){f.removeData(this,a)})}}),f.extend({_mark:function(a,b){a&&(b=(b||"fx")+"mark",f._data(a,b,(f._data(a,b)||0)+1))},_unmark:function(a,b,c){a!==!0&&(c=b,b=a,a=!1);if(b){c=c||"fx";var d=c+"mark",e=a?0:(f._data(b,d)||1)-1;e?f._data(b,d,e):(f.removeData(b,d,!0),n(b,c,"mark"))}},queue:function(a,b,c){var d;if(a){b=(b||"fx")+"queue",d=f._data(a,b),c&&(!d||f.isArray(c)?d=f._data(a,b,f.makeArray(c)):d.push(c));return d||[]}},dequeue:function(a,b){b=b||"fx";var c=f.queue(a,b),d=c.shift(),e={};d==="inprogress"&&(d=c.shift()),d&&(b==="fx"&&c.unshift("inprogress"),f._data(a,b+".run",e),d.call(a,function(){f.dequeue(a,b)},e)),c.length||(f.removeData(a,b+"queue "+b+".run",!0),n(a,b,"queue"))}}),f.fn.extend({queue:function(a,c){var d=2;typeof a!="string"&&(c=a,a="fx",d--);if(arguments.length<d)return f.queue(this[0],a);return c===b?this:this.each(function(){var b=f.queue(this,a,c);a==="fx"&&b[0]!=="inprogress"&&f.dequeue(this,a)})},dequeue:function(a){return this.each(function(){f.dequeue(this,a)})},delay:function(a,b){a=f.fx?f.fx.speeds[a]||a:a,b=b||"fx";return this.queue(b,function(b,c){var d=setTimeout(b,a);c.stop=function(){clearTimeout(d)}})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,c){function m(){--h||d.resolveWith(e,[e])}typeof a!="string"&&(c=a,a=b),a=a||"fx";var d=f.Deferred(),e=this,g=e.length,h=1,i=a+"defer",j=a+"queue",k=a+"mark",l;while(g--)if(l=f.data(e[g],i,b,!0)||(f.data(e[g],j,b,!0)||f.data(e[g],k,b,!0))&&f.data(e[g],i,f.Callbacks("once memory"),!0))h++,l.add(m);m();return d.promise(c)}});var o=/[\n\t\r]/g,p=/\s+/,q=/\r/g,r=/^(?:button|input)$/i,s=/^(?:button|input|object|select|textarea)$/i,t=/^a(?:rea)?$/i,u=/^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i,v=f.support.getSetAttribute,w,x,y;f.fn.extend({attr:function(a,b){return f.access(this,f.attr,a,b,arguments.length>1)},removeAttr:function(a){return this.each(function(){f.removeAttr(this,a)})},prop:function(a,b){return f.access(this,f.prop,a,b,arguments.length>1)},removeProp:function(a){a=f.propFix[a]||a;return this.each(function(){try{this[a]=b,delete this[a]}catch(c){}})},addClass:function(a){var b,c,d,e,g,h,i;if(f.isFunction(a))return this.each(function(b){f(this).addClass(a.call(this,b,this.className))});if(a&&typeof a=="string"){b=a.split(p);for(c=0,d=this.length;c<d;c++){e=this[c];if(e.nodeType===1)if(!e.className&&b.length===1)e.className=a;else{g=" "+e.className+" ";for(h=0,i=b.length;h<i;h++)~g.indexOf(" "+b[h]+" ")||(g+=b[h]+" ");e.className=f.trim(g)}}}return this},removeClass:function(a){var c,d,e,g,h,i,j;if(f.isFunction(a))return this.each(function(b){f(this).removeClass(a.call(this,b,this.className))});if(a&&typeof a=="string"||a===b){c=(a||"").split(p);for(d=0,e=this.length;d<e;d++){g=this[d];if(g.nodeType===1&&g.className)if(a){h=(" "+g.className+" ").replace(o," ");for(i=0,j=c.length;i<j;i++)h=h.replace(" "+c[i]+" "," ");g.className=f.trim(h)}else g.className=""}}return this},toggleClass:function(a,b){var c=typeof a,d=typeof b=="boolean";if(f.isFunction(a))return this.each(function(c){f(this).toggleClass(a.call(this,c,this.className,b),b)});return this.each(function(){if(c==="string"){var e,g=0,h=f(this),i=b,j=a.split(p);while(e=j[g++])i=d?i:!h.hasClass(e),h[i?"addClass":"removeClass"](e)}else if(c==="undefined"||c==="boolean")this.className&&f._data(this,"__className__",this.className),this.className=this.className||a===!1?"":f._data(this,"__className__")||""})},hasClass:function(a){var b=" "+a+" ",c=0,d=this.length;for(;c<d;c++)if(this[c].nodeType===1&&(" "+this[c].className+" ").replace(o," ").indexOf(b)>-1)return!0;return!1},val:function(a){var c,d,e,g=this[0];{if(!!arguments.length){e=f.isFunction(a);return this.each(function(d){var g=f(this),h;if(this.nodeType===1){e?h=a.call(this,d,g.val()):h=a,h==null?h="":typeof h=="number"?h+="":f.isArray(h)&&(h=f.map(h,function(a){return a==null?"":a+""})),c=f.valHooks[this.type]||f.valHooks[this.nodeName.toLowerCase()];if(!c||!("set"in c)||c.set(this,h,"value")===b)this.value=h}})}if(g){c=f.valHooks[g.type]||f.valHooks[g.nodeName.toLowerCase()];if(c&&"get"in c&&(d=c.get(g,"value"))!==b)return d;d=g.value;return typeof d=="string"?d.replace(q,""):d==null?"":d}}}}),f.extend({valHooks:{option:{get:function(a){var b=a.attributes.value;return!b||b.specified?a.value:a.text}},select:{get:function(a){var b,c,d,e,g=a.selectedIndex,h=[],i=a.options,j=a.type==="select-one";if(g<0)return null;c=j?g:0,d=j?g+1:i.length;for(;c<d;c++){e=i[c];if(e.selected&&(f.support.optDisabled?!e.disabled:e.getAttribute("disabled")===null)&&(!e.parentNode.disabled||!f.nodeName(e.parentNode,"optgroup"))){b=f(e).val();if(j)return b;h.push(b)}}if(j&&!h.length&&i.length)return f(i[g]).val();return h},set:function(a,b){var c=f.makeArray(b);f(a).find("option").each(function(){this.selected=f.inArray(f(this).val(),c)>=0}),c.length||(a.selectedIndex=-1);return c}}},attrFn:{val:!0,css:!0,html:!0,text:!0,data:!0,width:!0,height:!0,offset:!0},attr:function(a,c,d,e){var g,h,i,j=a.nodeType;if(!!a&&j!==3&&j!==8&&j!==2){if(e&&c in f.attrFn)return f(a)[c](d);if(typeof a.getAttribute=="undefined")return f.prop(a,c,d);i=j!==1||!f.isXMLDoc(a),i&&(c=c.toLowerCase(),h=f.attrHooks[c]||(u.test(c)?x:w));if(d!==b){if(d===null){f.removeAttr(a,c);return}if(h&&"set"in h&&i&&(g=h.set(a,d,c))!==b)return g;a.setAttribute(c,""+d);return d}if(h&&"get"in h&&i&&(g=h.get(a,c))!==null)return g;g=a.getAttribute(c);return g===null?b:g}},removeAttr:function(a,b){var c,d,e,g,h,i=0;if(b&&a.nodeType===1){d=b.toLowerCase().split(p),g=d.length;for(;i<g;i++)e=d[i],e&&(c=f.propFix[e]||e,h=u.test(e),h||f.attr(a,e,""),a.removeAttribute(v?e:c),h&&c in a&&(a[c]=!1))}},attrHooks:{type:{set:function(a,b){if(r.test(a.nodeName)&&a.parentNode)f.error("type property can't be changed");else if(!f.support.radioValue&&b==="radio"&&f.nodeName(a,"input")){var c=a.value;a.setAttribute("type",b),c&&(a.value=c);return b}}},value:{get:function(a,b){if(w&&f.nodeName(a,"button"))return w.get(a,b);return b in a?a.value:null},set:function(a,b,c){if(w&&f.nodeName(a,"button"))return w.set(a,b,c);a.value=b}}},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(a,c,d){var e,g,h,i=a.nodeType;if(!!a&&i!==3&&i!==8&&i!==2){h=i!==1||!f.isXMLDoc(a),h&&(c=f.propFix[c]||c,g=f.propHooks[c]);return d!==b?g&&"set"in g&&(e=g.set(a,d,c))!==b?e:a[c]=d:g&&"get"in g&&(e=g.get(a,c))!==null?e:a[c]}},propHooks:{tabIndex:{get:function(a){var c=a.getAttributeNode("tabindex");return c&&c.specified?parseInt(c.value,10):s.test(a.nodeName)||t.test(a.nodeName)&&a.href?0:b}}}}),f.attrHooks.tabindex=f.propHooks.tabIndex,x={get:function(a,c){var d,e=f.prop(a,c);return e===!0||typeof e!="boolean"&&(d=a.getAttributeNode(c))&&d.nodeValue!==!1?c.toLowerCase():b},set:function(a,b,c){var d;b===!1?f.removeAttr(a,c):(d=f.propFix[c]||c,d in a&&(a[d]=!0),a.setAttribute(c,c.toLowerCase()));return c}},v||(y={name:!0,id:!0,coords:!0},w=f.valHooks.button={get:function(a,c){var d;d=a.getAttributeNode(c);return d&&(y[c]?d.nodeValue!=="":d.specified)?d.nodeValue:b},set:function(a,b,d){var e=a.getAttributeNode(d);e||(e=c.createAttribute(d),a.setAttributeNode(e));return e.nodeValue=b+""}},f.attrHooks.tabindex.set=w.set,f.each(["width","height"],function(a,b){f.attrHooks[b]=f.extend(f.attrHooks[b],{set:function(a,c){if(c===""){a.setAttribute(b,"auto");return c}}})}),f.attrHooks.contenteditable={get:w.get,set:function(a,b,c){b===""&&(b="false"),w.set(a,b,c)}}),f.support.hrefNormalized||f.each(["href","src","width","height"],function(a,c){f.attrHooks[c]=f.extend(f.attrHooks[c],{get:function(a){var d=a.getAttribute(c,2);return d===null?b:d}})}),f.support.style||(f.attrHooks.style={get:function(a){return a.style.cssText.toLowerCase()||b},set:function(a,b){return a.style.cssText=""+b}}),f.support.optSelected||(f.propHooks.selected=f.extend(f.propHooks.selected,{get:function(a){var b=a.parentNode;b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex);return null}})),f.support.enctype||(f.propFix.enctype="encoding"),f.support.checkOn||f.each(["radio","checkbox"],function(){f.valHooks[this]={get:function(a){return a.getAttribute("value")===null?"on":a.value}}}),f.each(["radio","checkbox"],function(){f.valHooks[this]=f.extend(f.valHooks[this],{set:function(a,b){if(f.isArray(b))return a.checked=f.inArray(f(a).val(),b)>=0}})});var z=/^(?:textarea|input|select)$/i,A=/^([^\.]*)?(?:\.(.+))?$/,B=/(?:^|\s)hover(\.\S+)?\b/,C=/^key/,D=/^(?:mouse|contextmenu)|click/,E=/^(?:focusinfocus|focusoutblur)$/,F=/^(\w*)(?:#([\w\-]+))?(?:\.([\w\-]+))?$/,G=function(
-a){var b=F.exec(a);b&&(b[1]=(b[1]||"").toLowerCase(),b[3]=b[3]&&new RegExp("(?:^|\\s)"+b[3]+"(?:\\s|$)"));return b},H=function(a,b){var c=a.attributes||{};return(!b[1]||a.nodeName.toLowerCase()===b[1])&&(!b[2]||(c.id||{}).value===b[2])&&(!b[3]||b[3].test((c["class"]||{}).value))},I=function(a){return f.event.special.hover?a:a.replace(B,"mouseenter$1 mouseleave$1")};f.event={add:function(a,c,d,e,g){var h,i,j,k,l,m,n,o,p,q,r,s;if(!(a.nodeType===3||a.nodeType===8||!c||!d||!(h=f._data(a)))){d.handler&&(p=d,d=p.handler,g=p.selector),d.guid||(d.guid=f.guid++),j=h.events,j||(h.events=j={}),i=h.handle,i||(h.handle=i=function(a){return typeof f!="undefined"&&(!a||f.event.triggered!==a.type)?f.event.dispatch.apply(i.elem,arguments):b},i.elem=a),c=f.trim(I(c)).split(" ");for(k=0;k<c.length;k++){l=A.exec(c[k])||[],m=l[1],n=(l[2]||"").split(".").sort(),s=f.event.special[m]||{},m=(g?s.delegateType:s.bindType)||m,s=f.event.special[m]||{},o=f.extend({type:m,origType:l[1],data:e,handler:d,guid:d.guid,selector:g,quick:g&&G(g),namespace:n.join(".")},p),r=j[m];if(!r){r=j[m]=[],r.delegateCount=0;if(!s.setup||s.setup.call(a,e,n,i)===!1)a.addEventListener?a.addEventListener(m,i,!1):a.attachEvent&&a.attachEvent("on"+m,i)}s.add&&(s.add.call(a,o),o.handler.guid||(o.handler.guid=d.guid)),g?r.splice(r.delegateCount++,0,o):r.push(o),f.event.global[m]=!0}a=null}},global:{},remove:function(a,b,c,d,e){var g=f.hasData(a)&&f._data(a),h,i,j,k,l,m,n,o,p,q,r,s;if(!!g&&!!(o=g.events)){b=f.trim(I(b||"")).split(" ");for(h=0;h<b.length;h++){i=A.exec(b[h])||[],j=k=i[1],l=i[2];if(!j){for(j in o)f.event.remove(a,j+b[h],c,d,!0);continue}p=f.event.special[j]||{},j=(d?p.delegateType:p.bindType)||j,r=o[j]||[],m=r.length,l=l?new RegExp("(^|\\.)"+l.split(".").sort().join("\\.(?:.*\\.)?")+"(\\.|$)"):null;for(n=0;n<r.length;n++)s=r[n],(e||k===s.origType)&&(!c||c.guid===s.guid)&&(!l||l.test(s.namespace))&&(!d||d===s.selector||d==="**"&&s.selector)&&(r.splice(n--,1),s.selector&&r.delegateCount--,p.remove&&p.remove.call(a,s));r.length===0&&m!==r.length&&((!p.teardown||p.teardown.call(a,l)===!1)&&f.removeEvent(a,j,g.handle),delete o[j])}f.isEmptyObject(o)&&(q=g.handle,q&&(q.elem=null),f.removeData(a,["events","handle"],!0))}},customEvent:{getData:!0,setData:!0,changeData:!0},trigger:function(c,d,e,g){if(!e||e.nodeType!==3&&e.nodeType!==8){var h=c.type||c,i=[],j,k,l,m,n,o,p,q,r,s;if(E.test(h+f.event.triggered))return;h.indexOf("!")>=0&&(h=h.slice(0,-1),k=!0),h.indexOf(".")>=0&&(i=h.split("."),h=i.shift(),i.sort());if((!e||f.event.customEvent[h])&&!f.event.global[h])return;c=typeof c=="object"?c[f.expando]?c:new f.Event(h,c):new f.Event(h),c.type=h,c.isTrigger=!0,c.exclusive=k,c.namespace=i.join("."),c.namespace_re=c.namespace?new RegExp("(^|\\.)"+i.join("\\.(?:.*\\.)?")+"(\\.|$)"):null,o=h.indexOf(":")<0?"on"+h:"";if(!e){j=f.cache;for(l in j)j[l].events&&j[l].events[h]&&f.event.trigger(c,d,j[l].handle.elem,!0);return}c.result=b,c.target||(c.target=e),d=d!=null?f.makeArray(d):[],d.unshift(c),p=f.event.special[h]||{};if(p.trigger&&p.trigger.apply(e,d)===!1)return;r=[[e,p.bindType||h]];if(!g&&!p.noBubble&&!f.isWindow(e)){s=p.delegateType||h,m=E.test(s+h)?e:e.parentNode,n=null;for(;m;m=m.parentNode)r.push([m,s]),n=m;n&&n===e.ownerDocument&&r.push([n.defaultView||n.parentWindow||a,s])}for(l=0;l<r.length&&!c.isPropagationStopped();l++)m=r[l][0],c.type=r[l][1],q=(f._data(m,"events")||{})[c.type]&&f._data(m,"handle"),q&&q.apply(m,d),q=o&&m[o],q&&f.acceptData(m)&&q.apply(m,d)===!1&&c.preventDefault();c.type=h,!g&&!c.isDefaultPrevented()&&(!p._default||p._default.apply(e.ownerDocument,d)===!1)&&(h!=="click"||!f.nodeName(e,"a"))&&f.acceptData(e)&&o&&e[h]&&(h!=="focus"&&h!=="blur"||c.target.offsetWidth!==0)&&!f.isWindow(e)&&(n=e[o],n&&(e[o]=null),f.event.triggered=h,e[h](),f.event.triggered=b,n&&(e[o]=n));return c.result}},dispatch:function(c){c=f.event.fix(c||a.event);var d=(f._data(this,"events")||{})[c.type]||[],e=d.delegateCount,g=[].slice.call(arguments,0),h=!c.exclusive&&!c.namespace,i=f.event.special[c.type]||{},j=[],k,l,m,n,o,p,q,r,s,t,u;g[0]=c,c.delegateTarget=this;if(!i.preDispatch||i.preDispatch.call(this,c)!==!1){if(e&&(!c.button||c.type!=="click")){n=f(this),n.context=this.ownerDocument||this;for(m=c.target;m!=this;m=m.parentNode||this)if(m.disabled!==!0){p={},r=[],n[0]=m;for(k=0;k<e;k++)s=d[k],t=s.selector,p[t]===b&&(p[t]=s.quick?H(m,s.quick):n.is(t)),p[t]&&r.push(s);r.length&&j.push({elem:m,matches:r})}}d.length>e&&j.push({elem:this,matches:d.slice(e)});for(k=0;k<j.length&&!c.isPropagationStopped();k++){q=j[k],c.currentTarget=q.elem;for(l=0;l<q.matches.length&&!c.isImmediatePropagationStopped();l++){s=q.matches[l];if(h||!c.namespace&&!s.namespace||c.namespace_re&&c.namespace_re.test(s.namespace))c.data=s.data,c.handleObj=s,o=((f.event.special[s.origType]||{}).handle||s.handler).apply(q.elem,g),o!==b&&(c.result=o,o===!1&&(c.preventDefault(),c.stopPropagation()))}}i.postDispatch&&i.postDispatch.call(this,c);return c.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(a,b){a.which==null&&(a.which=b.charCode!=null?b.charCode:b.keyCode);return a}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(a,d){var e,f,g,h=d.button,i=d.fromElement;a.pageX==null&&d.clientX!=null&&(e=a.target.ownerDocument||c,f=e.documentElement,g=e.body,a.pageX=d.clientX+(f&&f.scrollLeft||g&&g.scrollLeft||0)-(f&&f.clientLeft||g&&g.clientLeft||0),a.pageY=d.clientY+(f&&f.scrollTop||g&&g.scrollTop||0)-(f&&f.clientTop||g&&g.clientTop||0)),!a.relatedTarget&&i&&(a.relatedTarget=i===a.target?d.toElement:i),!a.which&&h!==b&&(a.which=h&1?1:h&2?3:h&4?2:0);return a}},fix:function(a){if(a[f.expando])return a;var d,e,g=a,h=f.event.fixHooks[a.type]||{},i=h.props?this.props.concat(h.props):this.props;a=f.Event(g);for(d=i.length;d;)e=i[--d],a[e]=g[e];a.target||(a.target=g.srcElement||c),a.target.nodeType===3&&(a.target=a.target.parentNode),a.metaKey===b&&(a.metaKey=a.ctrlKey);return h.filter?h.filter(a,g):a},special:{ready:{setup:f.bindReady},load:{noBubble:!0},focus:{delegateType:"focusin"},blur:{delegateType:"focusout"},beforeunload:{setup:function(a,b,c){f.isWindow(this)&&(this.onbeforeunload=c)},teardown:function(a,b){this.onbeforeunload===b&&(this.onbeforeunload=null)}}},simulate:function(a,b,c,d){var e=f.extend(new f.Event,c,{type:a,isSimulated:!0,originalEvent:{}});d?f.event.trigger(e,null,b):f.event.dispatch.call(b,e),e.isDefaultPrevented()&&c.preventDefault()}},f.event.handle=f.event.dispatch,f.removeEvent=c.removeEventListener?function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)}:function(a,b,c){a.detachEvent&&a.detachEvent("on"+b,c)},f.Event=function(a,b){if(!(this instanceof f.Event))return new f.Event(a,b);a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||a.returnValue===!1||a.getPreventDefault&&a.getPreventDefault()?K:J):this.type=a,b&&f.extend(this,b),this.timeStamp=a&&a.timeStamp||f.now(),this[f.expando]=!0},f.Event.prototype={preventDefault:function(){this.isDefaultPrevented=K;var a=this.originalEvent;!a||(a.preventDefault?a.preventDefault():a.returnValue=!1)},stopPropagation:function(){this.isPropagationStopped=K;var a=this.originalEvent;!a||(a.stopPropagation&&a.stopPropagation(),a.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=K,this.stopPropagation()},isDefaultPrevented:J,isPropagationStopped:J,isImmediatePropagationStopped:J},f.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){f.event.special[a]={delegateType:b,bindType:b,handle:function(a){var c=this,d=a.relatedTarget,e=a.handleObj,g=e.selector,h;if(!d||d!==c&&!f.contains(c,d))a.type=e.origType,h=e.handler.apply(this,arguments),a.type=b;return h}}}),f.support.submitBubbles||(f.event.special.submit={setup:function(){if(f.nodeName(this,"form"))return!1;f.event.add(this,"click._submit keypress._submit",function(a){var c=a.target,d=f.nodeName(c,"input")||f.nodeName(c,"button")?c.form:b;d&&!d._submit_attached&&(f.event.add(d,"submit._submit",function(a){a._submit_bubble=!0}),d._submit_attached=!0)})},postDispatch:function(a){a._submit_bubble&&(delete a._submit_bubble,this.parentNode&&!a.isTrigger&&f.event.simulate("submit",this.parentNode,a,!0))},teardown:function(){if(f.nodeName(this,"form"))return!1;f.event.remove(this,"._submit")}}),f.support.changeBubbles||(f.event.special.change={setup:function(){if(z.test(this.nodeName)){if(this.type==="checkbox"||this.type==="radio")f.event.add(this,"propertychange._change",function(a){a.originalEvent.propertyName==="checked"&&(this._just_changed=!0)}),f.event.add(this,"click._change",function(a){this._just_changed&&!a.isTrigger&&(this._just_changed=!1,f.event.simulate("change",this,a,!0))});return!1}f.event.add(this,"beforeactivate._change",function(a){var b=a.target;z.test(b.nodeName)&&!b._change_attached&&(f.event.add(b,"change._change",function(a){this.parentNode&&!a.isSimulated&&!a.isTrigger&&f.event.simulate("change",this.parentNode,a,!0)}),b._change_attached=!0)})},handle:function(a){var b=a.target;if(this!==b||a.isSimulated||a.isTrigger||b.type!=="radio"&&b.type!=="checkbox")return a.handleObj.handler.apply(this,arguments)},teardown:function(){f.event.remove(this,"._change");return z.test(this.nodeName)}}),f.support.focusinBubbles||f.each({focus:"focusin",blur:"focusout"},function(a,b){var d=0,e=function(a){f.event.simulate(b,a.target,f.event.fix(a),!0)};f.event.special[b]={setup:function(){d++===0&&c.addEventListener(a,e,!0)},teardown:function(){--d===0&&c.removeEventListener(a,e,!0)}}}),f.fn.extend({on:function(a,c,d,e,g){var h,i;if(typeof a=="object"){typeof c!="string"&&(d=d||c,c=b);for(i in a)this.on(i,c,d,a[i],g);return this}d==null&&e==null?(e=c,d=c=b):e==null&&(typeof c=="string"?(e=d,d=b):(e=d,d=c,c=b));if(e===!1)e=J;else if(!e)return this;g===1&&(h=e,e=function(a){f().off(a);return h.apply(this,arguments)},e.guid=h.guid||(h.guid=f.guid++));return this.each(function(){f.event.add(this,a,e,d,c)})},one:function(a,b,c,d){return this.on(a,b,c,d,1)},off:function(a,c,d){if(a&&a.preventDefault&&a.handleObj){var e=a.handleObj;f(a.delegateTarget).off(e.namespace?e.origType+"."+e.namespace:e.origType,e.selector,e.handler);return this}if(typeof a=="object"){for(var g in a)this.off(g,c,a[g]);return this}if(c===!1||typeof c=="function")d=c,c=b;d===!1&&(d=J);return this.each(function(){f.event.remove(this,a,d,c)})},bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},live:function(a,b,c){f(this.context).on(a,this.selector,b,c);return this},die:function(a,b){f(this.context).off(a,this.selector||"**",b);return this},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return arguments.length==1?this.off(a,"**"):this.off(b,a,c)},trigger:function(a,b){return this.each(function(){f.event.trigger(a,b,this)})},triggerHandler:function(a,b){if(this[0])return f.event.trigger(a,b,this[0],!0)},toggle:function(a){var b=arguments,c=a.guid||f.guid++,d=0,e=function(c){var e=(f._data(this,"lastToggle"+a.guid)||0)%d;f._data(this,"lastToggle"+a.guid,e+1),c.preventDefault();return b[e].apply(this,arguments)||!1};e.guid=c;while(d<b.length)b[d++].guid=c;return this.click(e)},hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}}),f.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(a,b){f.fn[b]=function(a,c){c==null&&(c=a,a=null);return arguments.length>0?this.on(b,null,a,c):this.trigger(b)},f.attrFn&&(f.attrFn[b]=!0),C.test(b)&&(f.event.fixHooks[b]=f.event.keyHooks),D.test(b)&&(f.event.fixHooks[b]=f.event.mouseHooks)}),function(){function x(a,b,c,e,f,g){for(var h=0,i=e.length;h<i;h++){var j=e[h];if(j){var k=!1;j=j[a];while(j){if(j[d]===c){k=e[j.sizset];break}if(j.nodeType===1){g||(j[d]=c,j.sizset=h);if(typeof b!="string"){if(j===b){k=!0;break}}else if(m.filter(b,[j]).length>0){k=j;break}}j=j[a]}e[h]=k}}}function w(a,b,c,e,f,g){for(var h=0,i=e.length;h<i;h++){var j=e[h];if(j){var k=!1;j=j[a];while(j){if(j[d]===c){k=e[j.sizset];break}j.nodeType===1&&!g&&(j[d]=c,j.sizset=h);if(j.nodeName.toLowerCase()===b){k=j;break}j=j[a]}e[h]=k}}}var a=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,d="sizcache"+(Math.random()+"").replace(".",""),e=0,g=Object.prototype.toString,h=!1,i=!0,j=/\\/g,k=/\r\n/g,l=/\W/;[0,0].sort(function(){i=!1;return 0});var m=function(b,d,e,f){e=e||[],d=d||c;var h=d;if(d.nodeType!==1&&d.nodeType!==9)return[];if(!b||typeof b!="string")return e;var i,j,k,l,n,q,r,t,u=!0,v=m.isXML(d),w=[],x=b;do{a.exec(""),i=a.exec(x);if(i){x=i[3],w.push(i[1]);if(i[2]){l=i[3];break}}}while(i);if(w.length>1&&p.exec(b))if(w.length===2&&o.relative[w[0]])j=y(w[0]+w[1],d,f);else{j=o.relative[w[0]]?[d]:m(w.shift(),d);while(w.length)b=w.shift(),o.relative[b]&&(b+=w.shift()),j=y(b,j,f)}else{!f&&w.length>1&&d.nodeType===9&&!v&&o.match.ID.test(w[0])&&!o.match.ID.test(w[w.length-1])&&(n=m.find(w.shift(),d,v),d=n.expr?m.filter(n.expr,n.set)[0]:n.set[0]);if(d){n=f?{expr:w.pop(),set:s(f)}:m.find(w.pop(),w.length===1&&(w[0]==="~"||w[0]==="+")&&d.parentNode?d.parentNode:d,v),j=n.expr?m.filter(n.expr,n.set):n.set,w.length>0?k=s(j):u=!1;while(w.length)q=w.pop(),r=q,o.relative[q]?r=w.pop():q="",r==null&&(r=d),o.relative[q](k,r,v)}else k=w=[]}k||(k=j),k||m.error(q||b);if(g.call(k)==="[object Array]")if(!u)e.push.apply(e,k);else if(d&&d.nodeType===1)for(t=0;k[t]!=null;t++)k[t]&&(k[t]===!0||k[t].nodeType===1&&m.contains(d,k[t]))&&e.push(j[t]);else for(t=0;k[t]!=null;t++)k[t]&&k[t].nodeType===1&&e.push(j[t]);else s(k,e);l&&(m(l,h,e,f),m.uniqueSort(e));return e};m.uniqueSort=function(a){if(u){h=i,a.sort(u);if(h)for(var b=1;b<a.length;b++)a[b]===a[b-1]&&a.splice(b--,1)}return a},m.matches=function(a,b){return m(a,null,null,b)},m.matchesSelector=function(a,b){return m(b,null,null,[a]).length>0},m.find=function(a,b,c){var d,e,f,g,h,i;if(!a)return[];for(e=0,f=o.order.length;e<f;e++){h=o.order[e];if(g=o.leftMatch[h].exec(a)){i=g[1],g.splice(1,1);if(i.substr(i.length-1)!=="\\"){g[1]=(g[1]||"").replace(j,""),d=o.find[h](g,b,c);if(d!=null){a=a.replace(o.match[h],"");break}}}}d||(d=typeof b.getElementsByTagName!="undefined"?b.getElementsByTagName("*"):[]);return{set:d,expr:a}},m.filter=function(a,c,d,e){var f,g,h,i,j,k,l,n,p,q=a,r=[],s=c,t=c&&c[0]&&m.isXML(c[0]);while(a&&c.length){for(h in o.filter)if((f=o.leftMatch[h].exec(a))!=null&&f[2]){k=o.filter[h],l=f[1],g=!1,f.splice(1,1);if(l.substr(l.length-1)==="\\")continue;s===r&&(r=[]);if(o.preFilter[h]){f=o.preFilter[h](f,s,d,r,e,t);if(!f)g=i=!0;else if(f===!0)continue}if(f)for(n=0;(j=s[n])!=null;n++)j&&(i=k(j,f,n,s),p=e^i,d&&i!=null?p?g=!0:s[n]=!1:p&&(r.push(j),g=!0));if(i!==b){d||(s=r),a=a.replace(o.match[h],"");if(!g)return[];break}}if(a===q)if(g==null)m.error(a);else break;q=a}return s},m.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)};var n=m.getText=function(a){var b,c,d=a.nodeType,e="";if(d){if(d===1||d===9||d===11){if(typeof a.textContent=="string")return a.textContent;if(typeof a.innerText=="string")return a.innerText.replace(k,"");for(a=a.firstChild;a;a=a.nextSibling)e+=n(a)}else if(d===3||d===4)return a.nodeValue}else for(b=0;c=a[b];b++)c.nodeType!==8&&(e+=n(c));return e},o=m.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,CLASS:/\.((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF\-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF\-]|\\.)+)\s*(?:(\S?=)\s*(?:(['"])(.*?)\3|(#?(?:[\w\u00c0-\uFFFF\-]|\\.)*)|)|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*\-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\(\s*(even|odd|(?:[+\-]?\d+|(?:[+\-]?\d*)?n\s*(?:[+\-]\s*\d+)?))\s*\))?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^\-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF\-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/},leftMatch:{},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(a){return a.getAttribute("href")},type:function(a){return a.getAttribute("type")}},relative:{"+":function(a,b){var c=typeof b=="string",d=c&&!l.test(b),e=c&&!d;d&&(b=b.toLowerCase());for(var f=0,g=a.length,h;f<g;f++)if(h=a[f]){while((h=h.previousSibling)&&h.nodeType!==1);a[f]=e||h&&h.nodeName.toLowerCase()===b?h||!1:h===b}e&&m.filter(b,a,!0)},">":function(a,b){var c,d=typeof b=="string",e=0,f=a.length;if(d&&!l.test(b)){b=b.toLowerCase();for(;e<f;e++){c=a[e];if(c){var g=c.parentNode;a[e]=g.nodeName.toLowerCase()===b?g:!1}}}else{for(;e<f;e++)c=a[e],c&&(a[e]=d?c.parentNode:c.parentNode===b);d&&m.filter(b,a,!0)}},"":function(a,b,c){var d,f=e++,g=x;typeof b=="string"&&!l.test(b)&&(b=b.toLowerCase(),d=b,g=w),g("parentNode",b,f,a,d,c)},"~":function(a,b,c){var d,f=e++,g=x;typeof b=="string"&&!l.test(b)&&(b=b.toLowerCase(),d=b,g=w),g("previousSibling",b,f,a,d,c)}},find:{ID:function(a,b,c){if(typeof b.getElementById!="undefined"&&!c){var d=b.getElementById(a[1]);return d&&d.parentNode?[d]:[]}},NAME:function(a,b){if(typeof b.getElementsByName!="undefined"){var c=[],d=b.getElementsByName(a[1]);for(var e=0,f=d.length;e<f;e++)d[e].getAttribute("name")===a[1]&&c.push(d[e]);return c.length===0?null:c}},TAG:function(a,b){if(typeof b.getElementsByTagName!="undefined")return b.getElementsByTagName(a[1])}},preFilter:{CLASS:function(a,b,c,d,e,f){a=" "+a[1].replace(j,"")+" ";if(f)return a;for(var g=0,h;(h=b[g])!=null;g++)h&&(e^(h.className&&(" "+h.className+" ").replace(/[\t\n\r]/g," ").indexOf(a)>=0)?c||d.push(h):c&&(b[g]=!1));return!1},ID:function(a){return a[1].replace(j,"")},TAG:function(a,b){return a[1].replace(j,"").toLowerCase()},CHILD:function(a){if(a[1]==="nth"){a[2]||m.error(a[0]),a[2]=a[2].replace(/^\+|\s*/g,"");var b=/(-?)(\d*)(?:n([+\-]?\d*))?/.exec(a[2]==="even"&&"2n"||a[2]==="odd"&&"2n+1"||!/\D/.test(a[2])&&"0n+"+a[2]||a[2]);a[2]=b[1]+(b[2]||1)-0,a[3]=b[3]-0}else a[2]&&m.error(a[0]);a[0]=e++;return a},ATTR:function(a,b,c,d,e,f){var g=a[1]=a[1].replace(j,"");!f&&o.attrMap[g]&&(a[1]=o.attrMap[g]),a[4]=(a[4]||a[5]||"").replace(j,""),a[2]==="~="&&(a[4]=" "+a[4]+" ");return a},PSEUDO:function(b,c,d,e,f){if(b[1]==="not")if((a.exec(b[3])||"").length>1||/^\w/.test(b[3]))b[3]=m(b[3],null,null,c);else{var g=m.filter(b[3],c,d,!0^f);d||e.push.apply(e,g);return!1}else if(o.match.POS.test(b[0])||o.match.CHILD.test(b[0]))return!0;return b},POS:function(a){a.unshift(!0);return a}},filters:{enabled:function(a){return a.disabled===!1&&a.type!=="hidden"},disabled:function(a){return a.disabled===!0},checked:function(a){return a.checked===!0},selected:function(a){a.parentNode&&a.parentNode.selectedIndex;return a.selected===!0},parent:function(a){return!!a.firstChild},empty:function(a){return!a.firstChild},has:function(a,b,c){return!!m(c[3],a).length},header:function(a){return/h\d/i.test(a.nodeName)},text:function(a){var b=a.getAttribute("type"),c=a.type;return a.nodeName.toLowerCase()==="input"&&"text"===c&&(b===c||b===null)},radio:function(a){return a.nodeName.toLowerCase()==="input"&&"radio"===a.type},checkbox:function(a){return a.nodeName.toLowerCase()==="input"&&"checkbox"===a.type},file:function(a){return a.nodeName.toLowerCase()==="input"&&"file"===a.type},password:function(a){return a.nodeName.toLowerCase()==="input"&&"password"===a.type},submit:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"submit"===a.type},image:function(a){return a.nodeName.toLowerCase()==="input"&&"image"===a.type},reset:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"reset"===a.type},button:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&"button"===a.type||b==="button"},input:function(a){return/input|select|textarea|button/i.test(a.nodeName)},focus:function(a){return a===a.ownerDocument.activeElement}},setFilters:{first:function(a,b){return b===0},last:function(a,b,c,d){return b===d.length-1},even:function(a,b){return b%2===0},odd:function(a,b){return b%2===1},lt:function(a,b,c){return b<c[3]-0},gt:function(a,b,c){return b>c[3]-0},nth:function(a,b,c){return c[3]-0===b},eq:function(a,b,c){return c[3]-0===b}},filter:{PSEUDO:function(a,b,c,d){var e=b[1],f=o.filters[e];if(f)return f(a,c,b,d);if(e==="contains")return(a.textContent||a.innerText||n([a])||"").indexOf(b[3])>=0;if(e==="not"){var g=b[3];for(var h=0,i=g.length;h<i;h++)if(g[h]===a)return!1;return!0}m.error(e)},CHILD:function(a,b){var c,e,f,g,h,i,j,k=b[1],l=a;switch(k){case"only":case"first":while(l=l.previousSibling)if(l.nodeType===1)return!1;if(k==="first")return!0;l=a;case"last":while(l=l.nextSibling)if(l.nodeType===1)return!1;return!0;case"nth":c=b[2],e=b[3];if(c===1&&e===0)return!0;f=b[0],g=a.parentNode;if(g&&(g[d]!==f||!a.nodeIndex)){i=0;for(l=g.firstChild;l;l=l.nextSibling)l.nodeType===1&&(l.nodeIndex=++i);g[d]=f}j=a.nodeIndex-e;return c===0?j===0:j%c===0&&j/c>=0}},ID:function(a,b){return a.nodeType===1&&a.getAttribute("id")===b},TAG:function(a,b){return b==="*"&&a.nodeType===1||!!a.nodeName&&a.nodeName.toLowerCase()===b},CLASS:function(a,b){return(" "+(a.className||a.getAttribute("class"))+" ").indexOf(b)>-1},ATTR:function(a,b){var c=b[1],d=m.attr?m.attr(a,c):o.attrHandle[c]?o.attrHandle[c](a):a[c]!=null?a[c]:a.getAttribute(c),e=d+"",f=b[2],g=b[4];return d==null?f==="!=":!f&&m.attr?d!=null:f==="="?e===g:f==="*="?e.indexOf(g)>=0:f==="~="?(" "+e+" ").indexOf(g)>=0:g?f==="!="?e!==g:f==="^="?e.indexOf(g)===0:f==="$="?e.substr(e.length-g.length)===g:f==="|="?e===g||e.substr(0,g.length+1)===g+"-":!1:e&&d!==!1},POS:function(a,b,c,d){var e=b[2],f=o.setFilters[e];if(f)return f(a,c,b,d)}}},p=o.match.POS,q=function(a,b){return"\\"+(b-0+1)};for(var r in o.match)o.match[r]=new RegExp(o.match[r].source+/(?![^\[]*\])(?![^\(]*\))/.source),o.leftMatch[r]=new RegExp(/(^(?:.|\r|\n)*?)/.source+o.match[r].source.replace(/\\(\d+)/g,q));o.match.globalPOS=p;var s=function(a,b){a=Array.prototype.slice.call(a,0);if(b){b.push.apply(b,a);return b}return a};try{Array.prototype.slice.call(c.documentElement.childNodes,0)[0].nodeType}catch(t){s=function(a,b){var c=0,d=b||[];if(g.call(a)==="[object Array]")Array.prototype.push.apply(d,a);else if(typeof a.length=="number")for(var e=a.length;c<e;c++)d.push(a[c]);else for(;a[c];c++)d.push(a[c]);return d}}var u,v;c.documentElement.compareDocumentPosition?u=function(a,b){if(a===b){h=!0;return 0}if(!a.compareDocumentPosition||!b.compareDocumentPosition)return a.compareDocumentPosition?-1:1;return a.compareDocumentPosition(b)&4?-1:1}:(u=function(a,b){if(a===b){h=!0;return 0}if(a.sourceIndex&&b.sourceIndex)return a.sourceIndex-b.sourceIndex;var c,d,e=[],f=[],g=a.parentNode,i=b.parentNode,j=g;if(g===i)return v(a,b);if(!g)return-1;if(!i)return 1;while(j)e.unshift(j),j=j.parentNode;j=i;while(j)f.unshift(j),j=j.parentNode;c=e.length,d=f.length;for(var k=0;k<c&&k<d;k++)if(e[k]!==f[k])return v(e[k],f[k]);return k===c?v(a,f[k],-1):v(e[k],b,1)},v=function(a,b,c){if(a===b)return c;var d=a.nextSibling;while(d){if(d===b)return-1;d=d.nextSibling}return 1}),function(){var a=c.createElement("div"),d="script"+(new Date).getTime(),e=c.documentElement;a.innerHTML="<a name='"+d+"'/>",e.insertBefore(a,e.firstChild),c.getElementById(d)&&(o.find.ID=function(a,c,d){if(typeof c.getElementById!="undefined"&&!d){var e=c.getElementById(a[1]);return e?e.id===a[1]||typeof e.getAttributeNode!="undefined"&&e.getAttributeNode("id").nodeValue===a[1]?[e]:b:[]}},o.filter.ID=function(a,b){var c=typeof a.getAttributeNode!="undefined"&&a.getAttributeNode("id");return a.nodeType===1&&c&&c.nodeValue===b}),e.removeChild(a),e=a=null}(),function(){var a=c.createElement("div");a.appendChild(c.createComment("")),a.getElementsByTagName("*").length>0&&(o.find.TAG=function(a,b){var c=b.getElementsByTagName(a[1]);if(a[1]==="*"){var d=[];for(var e=0;c[e];e++)c[e].nodeType===1&&d.push(c[e]);c=d}return c}),a.innerHTML="<a href='#'></a>",a.firstChild&&typeof a.firstChild.getAttribute!="undefined"&&a.firstChild.getAttribute("href")!=="#"&&(o.attrHandle.href=function(a){return a.getAttribute("href",2)}),a=null}(),c.querySelectorAll&&function(){var a=m,b=c.createElement("div"),d="__sizzle__";b.innerHTML="<p class='TEST'></p>";if(!b.querySelectorAll||b.querySelectorAll(".TEST").length!==0){m=function(b,e,f,g){e=e||c;if(!g&&!m.isXML(e)){var h=/^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec(b);if(h&&(e.nodeType===1||e.nodeType===9)){if(h[1])return s(e.getElementsByTagName(b),f);if(h[2]&&o.find.CLASS&&e.getElementsByClassName)return s(e.getElementsByClassName(h[2]),f)}if(e.nodeType===9){if(b==="body"&&e.body)return s([e.body],f);if(h&&h[3]){var i=e.getElementById(h[3]);if(!i||!i.parentNode)return s([],f);if(i.id===h[3])return s([i],f)}try{return s(e.querySelectorAll(b),f)}catch(j){}}else if(e.nodeType===1&&e.nodeName.toLowerCase()!=="object"){var k=e,l=e.getAttribute("id"),n=l||d,p=e.parentNode,q=/^\s*[+~]/.test(b);l?n=n.replace(/'/g,"\\$&"):e.setAttribute("id",n),q&&p&&(e=e.parentNode);try{if(!q||p)return s(e.querySelectorAll("[id='"+n+"'] "+b),f)}catch(r){}finally{l||k.removeAttribute("id")}}}return a(b,e,f,g)};for(var e in a)m[e]=a[e];b=null}}(),function(){var a=c.documentElement,b=a.matchesSelector||a.mozMatchesSelector||a.webkitMatchesSelector||a.msMatchesSelector;if(b){var d=!b.call(c.createElement("div"),"div"),e=!1;try{b.call(c.documentElement,"[test!='']:sizzle")}catch(f){e=!0}m.matchesSelector=function(a,c){c=c.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!m.isXML(a))try{if(e||!o.match.PSEUDO.test(c)&&!/!=/.test(c)){var f=b.call(a,c);if(f||!d||a.document&&a.document.nodeType!==11)return f}}catch(g){}return m(c,null,null,[a]).length>0}}}(),function(){var a=c.createElement("div");a.innerHTML="<div class='test e'></div><div class='test'></div>";if(!!a.getElementsByClassName&&a.getElementsByClassName("e").length!==0){a.lastChild.className="e";if(a.getElementsByClassName("e").length===1)return;o.order.splice(1,0,"CLASS"),o.find.CLASS=function(a,b,c){if(typeof b.getElementsByClassName!="undefined"&&!c)return b.getElementsByClassName(a[1])},a=null}}(),c.documentElement.contains?m.contains=function(a,b){return a!==b&&(a.contains?a.contains(b):!0)}:c.documentElement.compareDocumentPosition?m.contains=function(a,b){return!!(a.compareDocumentPosition(b)&16)}:m.contains=function(){return!1},m.isXML=function(a){var b=(a?a.ownerDocument||a:0).documentElement;return b?b.nodeName!=="HTML":!1};var y=function(a,b,c){var d,e=[],f="",g=b.nodeType?[b]:b;while(d=o.match.PSEUDO.exec(a))f+=d[0],a=a.replace(o.match.PSEUDO,"");a=o.relative[a]?a+"*":a;for(var h=0,i=g.length;h<i;h++)m(a,g[h],e,c);return m.filter(f,e)};m.attr=f.attr,m.selectors.attrMap={},f.find=m,f.expr=m.selectors,f.expr[":"]=f.expr.filters,f.unique=m.uniqueSort,f.text=m.getText,f.isXMLDoc=m.isXML,f.contains=m.contains}();var L=/Until$/,M=/^(?:parents|prevUntil|prevAll)/,N=/,/,O=/^.[^:#\[\.,]*$/,P=Array.prototype.slice,Q=f.expr.match.globalPOS,R={children:!0,contents:!0,next:!0,prev:!0};f.fn.extend({find:function(a){var b=this,c,d;if(typeof a!="string")return f(a).filter(function(){for(c=0,d=b.length;c<d;c++)if(f.contains(b[c],this))return!0});var e=this.pushStack("","find",a),g,h,i;for(c=0,d=this.length;c<d;c++){g=e.length,f.find(a,this[c],e);if(c>0)for(h=g;h<e.length;h++)for(i=0;i<g;i++)if(e[i]===e[h]){e.splice(h--,1);break}}return e},has:function(a){var b=f(a);return this.filter(function(){for(var a=0,c=b.length;a<c;a++)if(f.contains(this,b[a]))return!0})},not:function(a){return this.pushStack(T(this,a,!1),"not",a)},filter:function(a){return this.pushStack(T(this,a,!0),"filter",a)},is:function(a){return!!a&&(typeof a=="string"?Q.test(a)?f(a,this.context).index(this[0])>=0:f.filter(a,this).length>0:this.filter(a).length>0)},closest:function(a,b){var c=[],d,e,g=this[0];if(f.isArray(a)){var h=1;while(g&&g.ownerDocument&&g!==b){for(d=0;d<a.length;d++)f(g).is(a[d])&&c.push({selector:a[d],elem:g,level:h});g=g.parentNode,h++}return c}var i=Q.test(a)||typeof a!="string"?f(a,b||this.context):0;for(d=0,e=this.length;d<e;d++){g=this[d];while(g){if(i?i.index(g)>-1:f.find.matchesSelector(g,a)){c.push(g);break}g=g.parentNode;if(!g||!g.ownerDocument||g===b||g.nodeType===11)break}}c=c.length>1?f.unique(c):c;return this.pushStack(c,"closest",a)},index:function(a){if(!a)return this[0]&&this[0].parentNode?this.prevAll().length:-1;if(typeof a=="string")return f.inArray(this[0],f(a));return f.inArray(a.jquery?a[0]:a,this)},add:function(a,b){var c=typeof a=="string"?f(a,b):f.makeArray(a&&a.nodeType?[a]:a),d=f.merge(this.get(),c);return this.pushStack(S(c[0])||S(d[0])?d:f.unique(d))},andSelf:function(){return this.add(this.prevObject)}}),f.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return f.dir(a,"parentNode")},parentsUntil:function(a,b,c){return f.dir(a,"parentNode",c)},next:function(a){return f.nth(a,2,"nextSibling")},prev:function(a){return f.nth(a,2,"previousSibling")},nextAll:function(a){return f.dir(a,"nextSibling")},prevAll:function(a){return f.dir(a,"previousSibling")},nextUntil:function(a,b,c){return f.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return f.dir(a,"previousSibling",c)},siblings:function(a){return f.sibling((a.parentNode||{}).firstChild,a)},children:function(a){return f.sibling(a.firstChild)},contents:function(a){return f.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:f.makeArray(a.childNodes)}},function(a,b){f.fn[a]=function(c,d){var e=f.map(this,b,c);L.test(a)||(d=c),d&&typeof d=="string"&&(e=f.filter(d,e)),e=this.length>1&&!R[a]?f.unique(e):e,(this.length>1||N.test(d))&&M.test(a)&&(e=e.reverse());return this.pushStack(e,a,P.call(arguments).join(","))}}),f.extend({filter:function(a,b,c){c&&(a=":not("+a+")");return b.length===1?f.find.matchesSelector(b[0],a)?[b[0]]:[]:f.find.matches(a,b)},dir:function(a,c,d){var e=[],g=a[c];while(g&&g.nodeType!==9&&(d===b||g.nodeType!==1||!f(g).is(d)))g.nodeType===1&&e.push(g),g=g[c];return e},nth:function(a,b,c,d){b=b||1;var e=0;for(;a;a=a[c])if(a.nodeType===1&&++e===b)break;return a},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var V="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",W=/ jQuery\d+="(?:\d+|null)"/g,X=/^\s+/,Y=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,Z=/<([\w:]+)/,$=/<tbody/i,_=/<|&#?\w+;/,ba=/<(?:script|style)/i,bb=/<(?:script|object|embed|option|style)/i,bc=new RegExp("<(?:"+V+")[\\s/>]","i"),bd=/checked\s*(?:[^=]|=\s*.checked.)/i,be=/\/(java|ecma)script/i,bf=/^\s*<!(?:\[CDATA\[|\-\-)/,bg={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,"",""]},bh=U(c);bg.optgroup=bg.option,bg.tbody=bg.tfoot=bg.colgroup=bg.caption=bg.thead,bg.th=bg.td,f.support.htmlSerialize||(bg._default=[1,"div<div>","</div>"]),f.fn.extend({text:function(a){return f.access(this,function(a){return a===b?f.text(this):this.empty().append((this[0]&&this[0].ownerDocument||c).createTextNode(a))},null,a,arguments.length)},wrapAll:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapAll(a.call(this,b))});if(this[0]){var b=f(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapInner(a.call(this,b))});return this.each(function(){var b=f(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=f.isFunction(a);return this.each(function(c){f(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){f.nodeName(this,"body")||f(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=f
-.clean(arguments);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,f.clean(arguments));return a}},remove:function(a,b){for(var c=0,d;(d=this[c])!=null;c++)if(!a||f.filter(a,[d]).length)!b&&d.nodeType===1&&(f.cleanData(d.getElementsByTagName("*")),f.cleanData([d])),d.parentNode&&d.parentNode.removeChild(d);return this},empty:function(){for(var a=0,b;(b=this[a])!=null;a++){b.nodeType===1&&f.cleanData(b.getElementsByTagName("*"));while(b.firstChild)b.removeChild(b.firstChild)}return this},clone:function(a,b){a=a==null?!1:a,b=b==null?a:b;return this.map(function(){return f.clone(this,a,b)})},html:function(a){return f.access(this,function(a){var c=this[0]||{},d=0,e=this.length;if(a===b)return c.nodeType===1?c.innerHTML.replace(W,""):null;if(typeof a=="string"&&!ba.test(a)&&(f.support.leadingWhitespace||!X.test(a))&&!bg[(Z.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Y,"<$1></$2>");try{for(;d<e;d++)c=this[d]||{},c.nodeType===1&&(f.cleanData(c.getElementsByTagName("*")),c.innerHTML=a);c=0}catch(g){}}c&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(a){if(this[0]&&this[0].parentNode){if(f.isFunction(a))return this.each(function(b){var c=f(this),d=c.html();c.replaceWith(a.call(this,b,d))});typeof a!="string"&&(a=f(a).detach());return this.each(function(){var b=this.nextSibling,c=this.parentNode;f(this).remove(),b?f(b).before(a):f(c).append(a)})}return this.length?this.pushStack(f(f.isFunction(a)?a():a),"replaceWith",a):this},detach:function(a){return this.remove(a,!0)},domManip:function(a,c,d){var e,g,h,i,j=a[0],k=[];if(!f.support.checkClone&&arguments.length===3&&typeof j=="string"&&bd.test(j))return this.each(function(){f(this).domManip(a,c,d,!0)});if(f.isFunction(j))return this.each(function(e){var g=f(this);a[0]=j.call(this,e,c?g.html():b),g.domManip(a,c,d)});if(this[0]){i=j&&j.parentNode,f.support.parentNode&&i&&i.nodeType===11&&i.childNodes.length===this.length?e={fragment:i}:e=f.buildFragment(a,this,k),h=e.fragment,h.childNodes.length===1?g=h=h.firstChild:g=h.firstChild;if(g){c=c&&f.nodeName(g,"tr");for(var l=0,m=this.length,n=m-1;l<m;l++)d.call(c?bi(this[l],g):this[l],e.cacheable||m>1&&l<n?f.clone(h,!0,!0):h)}k.length&&f.each(k,function(a,b){b.src?f.ajax({type:"GET",global:!1,url:b.src,async:!1,dataType:"script"}):f.globalEval((b.text||b.textContent||b.innerHTML||"").replace(bf,"/*$0*/")),b.parentNode&&b.parentNode.removeChild(b)})}return this}}),f.buildFragment=function(a,b,d){var e,g,h,i,j=a[0];b&&b[0]&&(i=b[0].ownerDocument||b[0]),i.createDocumentFragment||(i=c),a.length===1&&typeof j=="string"&&j.length<512&&i===c&&j.charAt(0)==="<"&&!bb.test(j)&&(f.support.checkClone||!bd.test(j))&&(f.support.html5Clone||!bc.test(j))&&(g=!0,h=f.fragments[j],h&&h!==1&&(e=h)),e||(e=i.createDocumentFragment(),f.clean(a,i,e,d)),g&&(f.fragments[j]=h?e:1);return{fragment:e,cacheable:g}},f.fragments={},f.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){f.fn[a]=function(c){var d=[],e=f(c),g=this.length===1&&this[0].parentNode;if(g&&g.nodeType===11&&g.childNodes.length===1&&e.length===1){e[b](this[0]);return this}for(var h=0,i=e.length;h<i;h++){var j=(h>0?this.clone(!0):this).get();f(e[h])[b](j),d=d.concat(j)}return this.pushStack(d,a,e.selector)}}),f.extend({clone:function(a,b,c){var d,e,g,h=f.support.html5Clone||f.isXMLDoc(a)||!bc.test("<"+a.nodeName+">")?a.cloneNode(!0):bo(a);if((!f.support.noCloneEvent||!f.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!f.isXMLDoc(a)){bk(a,h),d=bl(a),e=bl(h);for(g=0;d[g];++g)e[g]&&bk(d[g],e[g])}if(b){bj(a,h);if(c){d=bl(a),e=bl(h);for(g=0;d[g];++g)bj(d[g],e[g])}}d=e=null;return h},clean:function(a,b,d,e){var g,h,i,j=[];b=b||c,typeof b.createElement=="undefined"&&(b=b.ownerDocument||b[0]&&b[0].ownerDocument||c);for(var k=0,l;(l=a[k])!=null;k++){typeof l=="number"&&(l+="");if(!l)continue;if(typeof l=="string")if(!_.test(l))l=b.createTextNode(l);else{l=l.replace(Y,"<$1></$2>");var m=(Z.exec(l)||["",""])[1].toLowerCase(),n=bg[m]||bg._default,o=n[0],p=b.createElement("div"),q=bh.childNodes,r;b===c?bh.appendChild(p):U(b).appendChild(p),p.innerHTML=n[1]+l+n[2];while(o--)p=p.lastChild;if(!f.support.tbody){var s=$.test(l),t=m==="table"&&!s?p.firstChild&&p.firstChild.childNodes:n[1]==="<table>"&&!s?p.childNodes:[];for(i=t.length-1;i>=0;--i)f.nodeName(t[i],"tbody")&&!t[i].childNodes.length&&t[i].parentNode.removeChild(t[i])}!f.support.leadingWhitespace&&X.test(l)&&p.insertBefore(b.createTextNode(X.exec(l)[0]),p.firstChild),l=p.childNodes,p&&(p.parentNode.removeChild(p),q.length>0&&(r=q[q.length-1],r&&r.parentNode&&r.parentNode.removeChild(r)))}var u;if(!f.support.appendChecked)if(l[0]&&typeof (u=l.length)=="number")for(i=0;i<u;i++)bn(l[i]);else bn(l);l.nodeType?j.push(l):j=f.merge(j,l)}if(d){g=function(a){return!a.type||be.test(a.type)};for(k=0;j[k];k++){h=j[k];if(e&&f.nodeName(h,"script")&&(!h.type||be.test(h.type)))e.push(h.parentNode?h.parentNode.removeChild(h):h);else{if(h.nodeType===1){var v=f.grep(h.getElementsByTagName("script"),g);j.splice.apply(j,[k+1,0].concat(v))}d.appendChild(h)}}}return j},cleanData:function(a){var b,c,d=f.cache,e=f.event.special,g=f.support.deleteExpando;for(var h=0,i;(i=a[h])!=null;h++){if(i.nodeName&&f.noData[i.nodeName.toLowerCase()])continue;c=i[f.expando];if(c){b=d[c];if(b&&b.events){for(var j in b.events)e[j]?f.event.remove(i,j):f.removeEvent(i,j,b.handle);b.handle&&(b.handle.elem=null)}g?delete i[f.expando]:i.removeAttribute&&i.removeAttribute(f.expando),delete d[c]}}}});var bp=/alpha\([^)]*\)/i,bq=/opacity=([^)]*)/,br=/([A-Z]|^ms)/g,bs=/^[\-+]?(?:\d*\.)?\d+$/i,bt=/^-?(?:\d*\.)?\d+(?!px)[^\d\s]+$/i,bu=/^([\-+])=([\-+.\de]+)/,bv=/^margin/,bw={position:"absolute",visibility:"hidden",display:"block"},bx=["Top","Right","Bottom","Left"],by,bz,bA;f.fn.css=function(a,c){return f.access(this,function(a,c,d){return d!==b?f.style(a,c,d):f.css(a,c)},a,c,arguments.length>1)},f.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=by(a,"opacity");return c===""?"1":c}return a.style.opacity}}},cssNumber:{fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":f.support.cssFloat?"cssFloat":"styleFloat"},style:function(a,c,d,e){if(!!a&&a.nodeType!==3&&a.nodeType!==8&&!!a.style){var g,h,i=f.camelCase(c),j=a.style,k=f.cssHooks[i];c=f.cssProps[i]||i;if(d===b){if(k&&"get"in k&&(g=k.get(a,!1,e))!==b)return g;return j[c]}h=typeof d,h==="string"&&(g=bu.exec(d))&&(d=+(g[1]+1)*+g[2]+parseFloat(f.css(a,c)),h="number");if(d==null||h==="number"&&isNaN(d))return;h==="number"&&!f.cssNumber[i]&&(d+="px");if(!k||!("set"in k)||(d=k.set(a,d))!==b)try{j[c]=d}catch(l){}}},css:function(a,c,d){var e,g;c=f.camelCase(c),g=f.cssHooks[c],c=f.cssProps[c]||c,c==="cssFloat"&&(c="float");if(g&&"get"in g&&(e=g.get(a,!0,d))!==b)return e;if(by)return by(a,c)},swap:function(a,b,c){var d={},e,f;for(f in b)d[f]=a.style[f],a.style[f]=b[f];e=c.call(a);for(f in b)a.style[f]=d[f];return e}}),f.curCSS=f.css,c.defaultView&&c.defaultView.getComputedStyle&&(bz=function(a,b){var c,d,e,g,h=a.style;b=b.replace(br,"-$1").toLowerCase(),(d=a.ownerDocument.defaultView)&&(e=d.getComputedStyle(a,null))&&(c=e.getPropertyValue(b),c===""&&!f.contains(a.ownerDocument.documentElement,a)&&(c=f.style(a,b))),!f.support.pixelMargin&&e&&bv.test(b)&&bt.test(c)&&(g=h.width,h.width=c,c=e.width,h.width=g);return c}),c.documentElement.currentStyle&&(bA=function(a,b){var c,d,e,f=a.currentStyle&&a.currentStyle[b],g=a.style;f==null&&g&&(e=g[b])&&(f=e),bt.test(f)&&(c=g.left,d=a.runtimeStyle&&a.runtimeStyle.left,d&&(a.runtimeStyle.left=a.currentStyle.left),g.left=b==="fontSize"?"1em":f,f=g.pixelLeft+"px",g.left=c,d&&(a.runtimeStyle.left=d));return f===""?"auto":f}),by=bz||bA,f.each(["height","width"],function(a,b){f.cssHooks[b]={get:function(a,c,d){if(c)return a.offsetWidth!==0?bB(a,b,d):f.swap(a,bw,function(){return bB(a,b,d)})},set:function(a,b){return bs.test(b)?b+"px":b}}}),f.support.opacity||(f.cssHooks.opacity={get:function(a,b){return bq.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?parseFloat(RegExp.$1)/100+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=f.isNumeric(b)?"alpha(opacity="+b*100+")":"",g=d&&d.filter||c.filter||"";c.zoom=1;if(b>=1&&f.trim(g.replace(bp,""))===""){c.removeAttribute("filter");if(d&&!d.filter)return}c.filter=bp.test(g)?g.replace(bp,e):g+" "+e}}),f(function(){f.support.reliableMarginRight||(f.cssHooks.marginRight={get:function(a,b){return f.swap(a,{display:"inline-block"},function(){return b?by(a,"margin-right"):a.style.marginRight})}})}),f.expr&&f.expr.filters&&(f.expr.filters.hidden=function(a){var b=a.offsetWidth,c=a.offsetHeight;return b===0&&c===0||!f.support.reliableHiddenOffsets&&(a.style&&a.style.display||f.css(a,"display"))==="none"},f.expr.filters.visible=function(a){return!f.expr.filters.hidden(a)}),f.each({margin:"",padding:"",border:"Width"},function(a,b){f.cssHooks[a+b]={expand:function(c){var d,e=typeof c=="string"?c.split(" "):[c],f={};for(d=0;d<4;d++)f[a+bx[d]+b]=e[d]||e[d-2]||e[0];return f}}});var bC=/%20/g,bD=/\[\]$/,bE=/\r?\n/g,bF=/#.*$/,bG=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,bH=/^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,bI=/^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,bJ=/^(?:GET|HEAD)$/,bK=/^\/\//,bL=/\?/,bM=/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,bN=/^(?:select|textarea)/i,bO=/\s+/,bP=/([?&])_=[^&]*/,bQ=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+))?)?/,bR=f.fn.load,bS={},bT={},bU,bV,bW=["*/"]+["*"];try{bU=e.href}catch(bX){bU=c.createElement("a"),bU.href="",bU=bU.href}bV=bQ.exec(bU.toLowerCase())||[],f.fn.extend({load:function(a,c,d){if(typeof a!="string"&&bR)return bR.apply(this,arguments);if(!this.length)return this;var e=a.indexOf(" ");if(e>=0){var g=a.slice(e,a.length);a=a.slice(0,e)}var h="GET";c&&(f.isFunction(c)?(d=c,c=b):typeof c=="object"&&(c=f.param(c,f.ajaxSettings.traditional),h="POST"));var i=this;f.ajax({url:a,type:h,dataType:"html",data:c,complete:function(a,b,c){c=a.responseText,a.isResolved()&&(a.done(function(a){c=a}),i.html(g?f("<div>").append(c.replace(bM,"")).find(g):c)),d&&i.each(d,[c,b,a])}});return this},serialize:function(){return f.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?f.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||bN.test(this.nodeName)||bH.test(this.type))}).map(function(a,b){var c=f(this).val();return c==null?null:f.isArray(c)?f.map(c,function(a,c){return{name:b.name,value:a.replace(bE,"\r\n")}}):{name:b.name,value:c.replace(bE,"\r\n")}}).get()}}),f.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){f.fn[b]=function(a){return this.on(b,a)}}),f.each(["get","post"],function(a,c){f[c]=function(a,d,e,g){f.isFunction(d)&&(g=g||e,e=d,d=b);return f.ajax({type:c,url:a,data:d,success:e,dataType:g})}}),f.extend({getScript:function(a,c){return f.get(a,b,c,"script")},getJSON:function(a,b,c){return f.get(a,b,c,"json")},ajaxSetup:function(a,b){b?b$(a,f.ajaxSettings):(b=a,a=f.ajaxSettings),b$(a,b);return a},ajaxSettings:{url:bU,isLocal:bI.test(bV[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","*":bW},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":f.parseJSON,"text xml":f.parseXML},flatOptions:{context:!0,url:!0}},ajaxPrefilter:bY(bS),ajaxTransport:bY(bT),ajax:function(a,c){function w(a,c,l,m){if(s!==2){s=2,q&&clearTimeout(q),p=b,n=m||"",v.readyState=a>0?4:0;var o,r,u,w=c,x=l?ca(d,v,l):b,y,z;if(a>=200&&a<300||a===304){if(d.ifModified){if(y=v.getResponseHeader("Last-Modified"))f.lastModified[k]=y;if(z=v.getResponseHeader("Etag"))f.etag[k]=z}if(a===304)w="notmodified",o=!0;else try{r=cb(d,x),w="success",o=!0}catch(A){w="parsererror",u=A}}else{u=w;if(!w||a)w="error",a<0&&(a=0)}v.status=a,v.statusText=""+(c||w),o?h.resolveWith(e,[r,w,v]):h.rejectWith(e,[v,w,u]),v.statusCode(j),j=b,t&&g.trigger("ajax"+(o?"Success":"Error"),[v,d,o?r:u]),i.fireWith(e,[v,w]),t&&(g.trigger("ajaxComplete",[v,d]),--f.active||f.event.trigger("ajaxStop"))}}typeof a=="object"&&(c=a,a=b),c=c||{};var d=f.ajaxSetup({},c),e=d.context||d,g=e!==d&&(e.nodeType||e instanceof f)?f(e):f.event,h=f.Deferred(),i=f.Callbacks("once memory"),j=d.statusCode||{},k,l={},m={},n,o,p,q,r,s=0,t,u,v={readyState:0,setRequestHeader:function(a,b){if(!s){var c=a.toLowerCase();a=m[c]=m[c]||a,l[a]=b}return this},getAllResponseHeaders:function(){return s===2?n:null},getResponseHeader:function(a){var c;if(s===2){if(!o){o={};while(c=bG.exec(n))o[c[1].toLowerCase()]=c[2]}c=o[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){s||(d.mimeType=a);return this},abort:function(a){a=a||"abort",p&&p.abort(a),w(0,a);return this}};h.promise(v),v.success=v.done,v.error=v.fail,v.complete=i.add,v.statusCode=function(a){if(a){var b;if(s<2)for(b in a)j[b]=[j[b],a[b]];else b=a[v.status],v.then(b,b)}return this},d.url=((a||d.url)+"").replace(bF,"").replace(bK,bV[1]+"//"),d.dataTypes=f.trim(d.dataType||"*").toLowerCase().split(bO),d.crossDomain==null&&(r=bQ.exec(d.url.toLowerCase()),d.crossDomain=!(!r||r[1]==bV[1]&&r[2]==bV[2]&&(r[3]||(r[1]==="http:"?80:443))==(bV[3]||(bV[1]==="http:"?80:443)))),d.data&&d.processData&&typeof d.data!="string"&&(d.data=f.param(d.data,d.traditional)),bZ(bS,d,c,v);if(s===2)return!1;t=d.global,d.type=d.type.toUpperCase(),d.hasContent=!bJ.test(d.type),t&&f.active++===0&&f.event.trigger("ajaxStart");if(!d.hasContent){d.data&&(d.url+=(bL.test(d.url)?"&":"?")+d.data,delete d.data),k=d.url;if(d.cache===!1){var x=f.now(),y=d.url.replace(bP,"$1_="+x);d.url=y+(y===d.url?(bL.test(d.url)?"&":"?")+"_="+x:"")}}(d.data&&d.hasContent&&d.contentType!==!1||c.contentType)&&v.setRequestHeader("Content-Type",d.contentType),d.ifModified&&(k=k||d.url,f.lastModified[k]&&v.setRequestHeader("If-Modified-Since",f.lastModified[k]),f.etag[k]&&v.setRequestHeader("If-None-Match",f.etag[k])),v.setRequestHeader("Accept",d.dataTypes[0]&&d.accepts[d.dataTypes[0]]?d.accepts[d.dataTypes[0]]+(d.dataTypes[0]!=="*"?", "+bW+"; q=0.01":""):d.accepts["*"]);for(u in d.headers)v.setRequestHeader(u,d.headers[u]);if(d.beforeSend&&(d.beforeSend.call(e,v,d)===!1||s===2)){v.abort();return!1}for(u in{success:1,error:1,complete:1})v[u](d[u]);p=bZ(bT,d,c,v);if(!p)w(-1,"No Transport");else{v.readyState=1,t&&g.trigger("ajaxSend",[v,d]),d.async&&d.timeout>0&&(q=setTimeout(function(){v.abort("timeout")},d.timeout));try{s=1,p.send(l,w)}catch(z){if(s<2)w(-1,z);else throw z}}return v},param:function(a,c){var d=[],e=function(a,b){b=f.isFunction(b)?b():b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=f.ajaxSettings.traditional);if(f.isArray(a)||a.jquery&&!f.isPlainObject(a))f.each(a,function(){e(this.name,this.value)});else for(var g in a)b_(g,a[g],c,e);return d.join("&").replace(bC,"+")}}),f.extend({active:0,lastModified:{},etag:{}});var cc=f.now(),cd=/(\=)\?(&|$)|\?\?/i;f.ajaxSetup({jsonp:"callback",jsonpCallback:function(){return f.expando+"_"+cc++}}),f.ajaxPrefilter("json jsonp",function(b,c,d){var e=typeof b.data=="string"&&/^application\/x\-www\-form\-urlencoded/.test(b.contentType);if(b.dataTypes[0]==="jsonp"||b.jsonp!==!1&&(cd.test(b.url)||e&&cd.test(b.data))){var g,h=b.jsonpCallback=f.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,i=a[h],j=b.url,k=b.data,l="$1"+h+"$2";b.jsonp!==!1&&(j=j.replace(cd,l),b.url===j&&(e&&(k=k.replace(cd,l)),b.data===k&&(j+=(/\?/.test(j)?"&":"?")+b.jsonp+"="+h))),b.url=j,b.data=k,a[h]=function(a){g=[a]},d.always(function(){a[h]=i,g&&f.isFunction(i)&&a[h](g[0])}),b.converters["script json"]=function(){g||f.error(h+" was not called");return g[0]},b.dataTypes[0]="json";return"script"}}),f.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){f.globalEval(a);return a}}}),f.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),f.ajaxTransport("script",function(a){if(a.crossDomain){var d,e=c.head||c.getElementsByTagName("head")[0]||c.documentElement;return{send:function(f,g){d=c.createElement("script"),d.async="async",a.scriptCharset&&(d.charset=a.scriptCharset),d.src=a.url,d.onload=d.onreadystatechange=function(a,c){if(c||!d.readyState||/loaded|complete/.test(d.readyState))d.onload=d.onreadystatechange=null,e&&d.parentNode&&e.removeChild(d),d=b,c||g(200,"success")},e.insertBefore(d,e.firstChild)},abort:function(){d&&d.onload(0,1)}}}});var ce=a.ActiveXObject?function(){for(var a in cg)cg[a](0,1)}:!1,cf=0,cg;f.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&ch()||ci()}:ch,function(a){f.extend(f.support,{ajax:!!a,cors:!!a&&"withCredentials"in a})}(f.ajaxSettings.xhr()),f.support.ajax&&f.ajaxTransport(function(c){if(!c.crossDomain||f.support.cors){var d;return{send:function(e,g){var h=c.xhr(),i,j;c.username?h.open(c.type,c.url,c.async,c.username,c.password):h.open(c.type,c.url,c.async);if(c.xhrFields)for(j in c.xhrFields)h[j]=c.xhrFields[j];c.mimeType&&h.overrideMimeType&&h.overrideMimeType(c.mimeType),!c.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(j in e)h.setRequestHeader(j,e[j])}catch(k){}h.send(c.hasContent&&c.data||null),d=function(a,e){var j,k,l,m,n;try{if(d&&(e||h.readyState===4)){d=b,i&&(h.onreadystatechange=f.noop,ce&&delete cg[i]);if(e)h.readyState!==4&&h.abort();else{j=h.status,l=h.getAllResponseHeaders(),m={},n=h.responseXML,n&&n.documentElement&&(m.xml=n);try{m.text=h.responseText}catch(a){}try{k=h.statusText}catch(o){k=""}!j&&c.isLocal&&!c.crossDomain?j=m.text?200:404:j===1223&&(j=204)}}}catch(p){e||g(-1,p)}m&&g(j,k,m,l)},!c.async||h.readyState===4?d():(i=++cf,ce&&(cg||(cg={},f(a).unload(ce)),cg[i]=d),h.onreadystatechange=d)},abort:function(){d&&d(0,1)}}}});var cj={},ck,cl,cm=/^(?:toggle|show|hide)$/,cn=/^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,co,cp=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]],cq;f.fn.extend({show:function(a,b,c){var d,e;if(a||a===0)return this.animate(ct("show",3),a,b,c);for(var g=0,h=this.length;g<h;g++)d=this[g],d.style&&(e=d.style.display,!f._data(d,"olddisplay")&&e==="none"&&(e=d.style.display=""),(e===""&&f.css(d,"display")==="none"||!f.contains(d.ownerDocument.documentElement,d))&&f._data(d,"olddisplay",cu(d.nodeName)));for(g=0;g<h;g++){d=this[g];if(d.style){e=d.style.display;if(e===""||e==="none")d.style.display=f._data(d,"olddisplay")||""}}return this},hide:function(a,b,c){if(a||a===0)return this.animate(ct("hide",3),a,b,c);var d,e,g=0,h=this.length;for(;g<h;g++)d=this[g],d.style&&(e=f.css(d,"display"),e!=="none"&&!f._data(d,"olddisplay")&&f._data(d,"olddisplay",e));for(g=0;g<h;g++)this[g].style&&(this[g].style.display="none");return this},_toggle:f.fn.toggle,toggle:function(a,b,c){var d=typeof a=="boolean";f.isFunction(a)&&f.isFunction(b)?this._toggle.apply(this,arguments):a==null||d?this.each(function(){var b=d?a:f(this).is(":hidden");f(this)[b?"show":"hide"]()}):this.animate(ct("toggle",3),a,b,c);return this},fadeTo:function(a,b,c,d){return this.filter(":hidden").css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){function g(){e.queue===!1&&f._mark(this);var b=f.extend({},e),c=this.nodeType===1,d=c&&f(this).is(":hidden"),g,h,i,j,k,l,m,n,o,p,q;b.animatedProperties={};for(i in a){g=f.camelCase(i),i!==g&&(a[g]=a[i],delete a[i]);if((k=f.cssHooks[g])&&"expand"in k){l=k.expand(a[g]),delete a[g];for(i in l)i in a||(a[i]=l[i])}}for(g in a){h=a[g],f.isArray(h)?(b.animatedProperties[g]=h[1],h=a[g]=h[0]):b.animatedProperties[g]=b.specialEasing&&b.specialEasing[g]||b.easing||"swing";if(h==="hide"&&d||h==="show"&&!d)return b.complete.call(this);c&&(g==="height"||g==="width")&&(b.overflow=[this.style.overflow,this.style.overflowX,this.style.overflowY],f.css(this,"display")==="inline"&&f.css(this,"float")==="none"&&(!f.support.inlineBlockNeedsLayout||cu(this.nodeName)==="inline"?this.style.display="inline-block":this.style.zoom=1))}b.overflow!=null&&(this.style.overflow="hidden");for(i in a)j=new f.fx(this,b,i),h=a[i],cm.test(h)?(q=f._data(this,"toggle"+i)||(h==="toggle"?d?"show":"hide":0),q?(f._data(this,"toggle"+i,q==="show"?"hide":"show"),j[q]()):j[h]()):(m=cn.exec(h),n=j.cur(),m?(o=parseFloat(m[2]),p=m[3]||(f.cssNumber[i]?"":"px"),p!=="px"&&(f.style(this,i,(o||1)+p),n=(o||1)/j.cur()*n,f.style(this,i,n+p)),m[1]&&(o=(m[1]==="-="?-1:1)*o+n),j.custom(n,o,p)):j.custom(n,h,""));return!0}var e=f.speed(b,c,d);if(f.isEmptyObject(a))return this.each(e.complete,[!1]);a=f.extend({},a);return e.queue===!1?this.each(g):this.queue(e.queue,g)},stop:function(a,c,d){typeof a!="string"&&(d=c,c=a,a=b),c&&a!==!1&&this.queue(a||"fx",[]);return this.each(function(){function h(a,b,c){var e=b[c];f.removeData(a,c,!0),e.stop(d)}var b,c=!1,e=f.timers,g=f._data(this);d||f._unmark(!0,this);if(a==null)for(b in g)g[b]&&g[b].stop&&b.indexOf(".run")===b.length-4&&h(this,g,b);else g[b=a+".run"]&&g[b].stop&&h(this,g,b);for(b=e.length;b--;)e[b].elem===this&&(a==null||e[b].queue===a)&&(d?e[b](!0):e[b].saveState(),c=!0,e.splice(b,1));(!d||!c)&&f.dequeue(this,a)})}}),f.each({slideDown:ct("show",1),slideUp:ct("hide",1),slideToggle:ct("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){f.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),f.extend({speed:function(a,b,c){var d=a&&typeof a=="object"?f.extend({},a):{complete:c||!c&&b||f.isFunction(a)&&a,duration:a,easing:c&&b||b&&!f.isFunction(b)&&b};d.duration=f.fx.off?0:typeof d.duration=="number"?d.duration:d.duration in f.fx.speeds?f.fx.speeds[d.duration]:f.fx.speeds._default;if(d.queue==null||d.queue===!0)d.queue="fx";d.old=d.complete,d.complete=function(a){f.isFunction(d.old)&&d.old.call(this),d.queue?f.dequeue(this,d.queue):a!==!1&&f._unmark(this)};return d},easing:{linear:function(a){return a},swing:function(a){return-Math.cos(a*Math.PI)/2+.5}},timers:[],fx:function(a,b,c){this.options=b,this.elem=a,this.prop=c,b.orig=b.orig||{}}}),f.fx.prototype={update:function(){this.options.step&&this.options.step.call(this.elem,this.now,this),(f.fx.step[this.prop]||f.fx.step._default)(this)},cur:function(){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null))return this.elem[this.prop];var a,b=f.css(this.elem,this.prop);return isNaN(a=parseFloat(b))?!b||b==="auto"?0:b:a},custom:function(a,c,d){function h(a){return e.step(a)}var e=this,g=f.fx;this.startTime=cq||cr(),this.end=c,this.now=this.start=a,this.pos=this.state=0,this.unit=d||this.unit||(f.cssNumber[this.prop]?"":"px"),h.queue=this.options.queue,h.elem=this.elem,h.saveState=function(){f._data(e.elem,"fxshow"+e.prop)===b&&(e.options.hide?f._data(e.elem,"fxshow"+e.prop,e.start):e.options.show&&f._data(e.elem,"fxshow"+e.prop,e.end))},h()&&f.timers.push(h)&&!co&&(co=setInterval(g.tick,g.interval))},show:function(){var a=f._data(this.elem,"fxshow"+this.prop);this.options.orig[this.prop]=a||f.style(this.elem,this.prop),this.options.show=!0,a!==b?this.custom(this.cur(),a):this.custom(this.prop==="width"||this.prop==="height"?1:0,this.cur()),f(this.elem).show()},hide:function(){this.options.orig[this.prop]=f._data(this.elem,"fxshow"+this.prop)||f.style(this.elem,this.prop),this.options.hide=!0,this.custom(this.cur(),0)},step:function(a){var b,c,d,e=cq||cr(),g=!0,h=this.elem,i=this.options;if(a||e>=i.duration+this.startTime){this.now=this.end,this.pos=this.state=1,this.update(),i.animatedProperties[this.prop]=!0;for(b in i.animatedProperties)i.animatedProperties[b]!==!0&&(g=!1);if(g){i.overflow!=null&&!f.support.shrinkWrapBlocks&&f.each(["","X","Y"],function(a,b){h.style["overflow"+b]=i.overflow[a]}),i.hide&&f(h).hide();if(i.hide||i.show)for(b in i.animatedProperties)f.style(h,b,i.orig[b]),f.removeData(h,"fxshow"+b,!0),f.removeData(h,"toggle"+b,!0);d=i.complete,d&&(i.complete=!1,d.call(h))}return!1}i.duration==Infinity?this.now=e:(c=e-this.startTime,this.state=c/i.duration,this.pos=f.easing[i.animatedProperties[this.prop]](this.state,c,0,1,i.duration),this.now=this.start+(this.end-this.start)*this.pos),this.update();return!0}},f.extend(f.fx,{tick:function(){var a,b=f.timers,c=0;for(;c<b.length;c++)a=b[c],!a()&&b[c]===a&&b.splice(c--,1);b.length||f.fx.stop()},interval:13,stop:function(){clearInterval(co),co=null},speeds:{slow:600,fast:200,_default:400},step:{opacity:function(a){f.style(a.elem,"opacity",a.now)},_default:function(a){a.elem.style&&a.elem.style[a.prop]!=null?a.elem.style[a.prop]=a.now+a.unit:a.elem[a.prop]=a.now}}}),f.each(cp.concat.apply([],cp),function(a,b){b.indexOf("margin")&&(f.fx.step[b]=function(a){f.style(a.elem,b,Math.max(0,a.now)+a.unit)})}),f.expr&&f.expr.filters&&(f.expr.filters.animated=function(a){return f.grep(f.timers,function(b){return a===b.elem}).length});var cv,cw=/^t(?:able|d|h)$/i,cx=/^(?:body|html)$/i;"getBoundingClientRect"in c.documentElement?cv=function(a,b,c,d){try{d=a.getBoundingClientRect()}catch(e){}if(!d||!f.contains(c,a))return d?{top:d.top,left:d.left}:{top:0,left:0};var g=b.body,h=cy(b),i=c.clientTop||g.clientTop||0,j=c.clientLeft||g.clientLeft||0,k=h.pageYOffset||f.support.boxModel&&c.scrollTop||g.scrollTop,l=h.pageXOffset||f.support.boxModel&&c.scrollLeft||g.scrollLeft,m=d.top+k-i,n=d.left+l-j;return{top:m,left:n}}:cv=function(a,b,c){var d,e=a.offsetParent,g=a,h=b.body,i=b.defaultView,j=i?i.getComputedStyle(a,null):a.currentStyle,k=a.offsetTop,l=a.offsetLeft;while((a=a.parentNode)&&a!==h&&a!==c){if(f.support.fixedPosition&&j.position==="fixed")break;d=i?i.getComputedStyle(a,null):a.currentStyle,k-=a.scrollTop,l-=a.scrollLeft,a===e&&(k+=a.offsetTop,l+=a.offsetLeft,f.support.doesNotAddBorder&&(!f.support.doesAddBorderForTableAndCells||!cw.test(a.nodeName))&&(k+=parseFloat(d.borderTopWidth)||0,l+=parseFloat(d.borderLeftWidth)||0),g=e,e=a.offsetParent),f.support.subtractsBorderForOverflowNotVisible&&d.overflow!=="visible"&&(k+=parseFloat(d.borderTopWidth)||0,l+=parseFloat(d.borderLeftWidth)||0),j=d}if(j.position==="relative"||j.position==="static")k+=h.offsetTop,l+=h.offsetLeft;f.support.fixedPosition&&j.position==="fixed"&&(k+=Math.max(c.scrollTop,h.scrollTop),l+=Math.max(c.scrollLeft,h.scrollLeft));return{top:k,left:l}},f.fn.offset=function(a){if(arguments.length)return a===b?this:this.each(function(b){f.offset.setOffset(this,a,b)});var c=this[0],d=c&&c.ownerDocument;if(!d)return null;if(c===d.body)return f.offset.bodyOffset(c);return cv(c,d,d.documentElement)},f.offset={bodyOffset:function(a){var b=a.offsetTop,c=a.offsetLeft;f.support.doesNotIncludeMarginInBodyOffset&&(b+=parseFloat(f.css(a,"marginTop"))||0,c+=parseFloat(f.css(a,"marginLeft"))||0);return{top:b,left:c}},setOffset:function(a,b,c){var d=f.css(a,"position");d==="static"&&(a.style.position="relative");var e=f(a),g=e.offset(),h=f.css(a,"top"),i=f.css(a,"left"),j=(d==="absolute"||d==="fixed")&&f.inArray("auto",[h,i])>-1,k={},l={},m,n;j?(l=e.position(),m=l.top,n=l.left):(m=parseFloat(h)||0,n=parseFloat(i)||0),f.isFunction(b)&&(b=b.call(a,c,g)),b.top!=null&&(k.top=b.top-g.top+m),b.left!=null&&(k.left=b.left-g.left+n),"using"in b?b.using.call(a,k):e.css(k)}},f.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),c=this.offset(),d=cx.test(b[0].nodeName)?{top:0,left:0}:b.offset();c.top-=parseFloat(f.css(a,"marginTop"))||0,c.left-=parseFloat(f.css(a,"marginLeft"))||0,d.top+=parseFloat(f.css(b[0],"borderTopWidth"))||0,d.left+=parseFloat(f.css(b[0],"borderLeftWidth"))||0;return{top:c.top-d.top,left:c.left-d.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||c.body;while(a&&!cx.test(a.nodeName)&&f.css(a,"position")==="static")a=a.offsetParent;return a})}}),f.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(a,c){var d=/Y/.test(c);f.fn[a]=function(e){return f.access(this,function(a,e,g){var h=cy(a);if(g===b)return h?c in h?h[c]:f.support.boxModel&&h.document.documentElement[e]||h.document.body[e]:a[e];h?h.scrollTo(d?f(h).scrollLeft():g,d?g:f(h).scrollTop()):a[e]=g},a,e,arguments.length,null)}}),f.each({Height:"height",Width:"width"},function(a,c){var d="client"+a,e="scroll"+a,g="offset"+a;f.fn["inner"+a]=function(){var a=this[0];return a?a.style?parseFloat(f.css(a,c,"padding")):this[c]():null},f.fn["outer"+a]=function(a){var b=this[0];return b?b.style?parseFloat(f.css(b,c,a?"margin":"border")):this[c]():null},f.fn[c]=function(a){return f.access(this,function(a,c,h){var i,j,k,l;if(f.isWindow(a)){i=a.document,j=i.documentElement[d];return f.support.boxModel&&j||i.body&&i.body[d]||j}if(a.nodeType===9){i=a.documentElement;if(i[d]>=i[e])return i[d];return Math.max(a.body[e],i[e],a.body[g],i[g])}if(h===b){k=f.css(a,c),l=parseFloat(k);return f.isNumeric(l)?l:k}f(a).css(c,h)},c,a,arguments.length,null)}}),a.jQuery=a.$=f,typeof define=="function"&&define.amd&&define.amd.jQuery&&define("jquery",[],function(){return f})})(window);
\ No newline at end of file
diff --git a/qpysdk/src/main/assets/stylesheets/js/jquery.min.js b/qpysdk/src/main/assets/stylesheets/js/jquery.min.js
new file mode 100644
index 00000000..a1c07fd8
--- /dev/null
+++ b/qpysdk/src/main/assets/stylesheets/js/jquery.min.js
@@ -0,0 +1,2 @@
+/*! jQuery v3.4.1 | (c) JS Foundation and other contributors | jquery.org/license */
+!function(e,t){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}("undefined"!=typeof window?window:this,function(C,e){"use strict";var t=[],E=C.document,r=Object.getPrototypeOf,s=t.slice,g=t.concat,u=t.push,i=t.indexOf,n={},o=n.toString,v=n.hasOwnProperty,a=v.toString,l=a.call(Object),y={},m=function(e){return"function"==typeof e&&"number"!=typeof e.nodeType},x=function(e){return null!=e&&e===e.window},c={type:!0,src:!0,nonce:!0,noModule:!0};function b(e,t,n){var r,i,o=(n=n||E).createElement("script");if(o.text=e,t)for(r in c)(i=t[r]||t.getAttribute&&t.getAttribute(r))&&o.setAttribute(r,i);n.head.appendChild(o).parentNode.removeChild(o)}function w(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?n[o.call(e)]||"object":typeof e}var f="3.4.1",k=function(e,t){return new k.fn.init(e,t)},p=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g;function d(e){var t=!!e&&"length"in e&&e.length,n=w(e);return!m(e)&&!x(e)&&("array"===n||0===t||"number"==typeof t&&0<t&&t-1 in e)}k.fn=k.prototype={jquery:f,constructor:k,length:0,toArray:function(){return s.call(this)},get:function(e){return null==e?s.call(this):e<0?this[e+this.length]:this[e]},pushStack:function(e){var t=k.merge(this.constructor(),e);return t.prevObject=this,t},each:function(e){return k.each(this,e)},map:function(n){return this.pushStack(k.map(this,function(e,t){return n.call(e,t,e)}))},slice:function(){return this.pushStack(s.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(e){var t=this.length,n=+e+(e<0?t:0);return this.pushStack(0<=n&&n<t?[this[n]]:[])},end:function(){return this.prevObject||this.constructor()},push:u,sort:t.sort,splice:t.splice},k.extend=k.fn.extend=function(){var e,t,n,r,i,o,a=arguments[0]||{},s=1,u=arguments.length,l=!1;for("boolean"==typeof a&&(l=a,a=arguments[s]||{},s++),"object"==typeof a||m(a)||(a={}),s===u&&(a=this,s--);s<u;s++)if(null!=(e=arguments[s]))for(t in e)r=e[t],"__proto__"!==t&&a!==r&&(l&&r&&(k.isPlainObject(r)||(i=Array.isArray(r)))?(n=a[t],o=i&&!Array.isArray(n)?[]:i||k.isPlainObject(n)?n:{},i=!1,a[t]=k.extend(l,o,r)):void 0!==r&&(a[t]=r));return a},k.extend({expando:"jQuery"+(f+Math.random()).replace(/\D/g,""),isReady:!0,error:function(e){throw new Error(e)},noop:function(){},isPlainObject:function(e){var t,n;return!(!e||"[object Object]"!==o.call(e))&&(!(t=r(e))||"function"==typeof(n=v.call(t,"constructor")&&t.constructor)&&a.call(n)===l)},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},globalEval:function(e,t){b(e,{nonce:t&&t.nonce})},each:function(e,t){var n,r=0;if(d(e)){for(n=e.length;r<n;r++)if(!1===t.call(e[r],r,e[r]))break}else for(r in e)if(!1===t.call(e[r],r,e[r]))break;return e},trim:function(e){return null==e?"":(e+"").replace(p,"")},makeArray:function(e,t){var n=t||[];return null!=e&&(d(Object(e))?k.merge(n,"string"==typeof e?[e]:e):u.call(n,e)),n},inArray:function(e,t,n){return null==t?-1:i.call(t,e,n)},merge:function(e,t){for(var n=+t.length,r=0,i=e.length;r<n;r++)e[i++]=t[r];return e.length=i,e},grep:function(e,t,n){for(var r=[],i=0,o=e.length,a=!n;i<o;i++)!t(e[i],i)!==a&&r.push(e[i]);return r},map:function(e,t,n){var r,i,o=0,a=[];if(d(e))for(r=e.length;o<r;o++)null!=(i=t(e[o],o,n))&&a.push(i);else for(o in e)null!=(i=t(e[o],o,n))&&a.push(i);return g.apply([],a)},guid:1,support:y}),"function"==typeof Symbol&&(k.fn[Symbol.iterator]=t[Symbol.iterator]),k.each("Boolean Number String Function Array Date RegExp Object Error Symbol".split(" "),function(e,t){n["[object "+t+"]"]=t.toLowerCase()});var h=function(n){var e,d,b,o,i,h,f,g,w,u,l,T,C,a,E,v,s,c,y,k="sizzle"+1*new Date,m=n.document,S=0,r=0,p=ue(),x=ue(),N=ue(),A=ue(),D=function(e,t){return e===t&&(l=!0),0},j={}.hasOwnProperty,t=[],q=t.pop,L=t.push,H=t.push,O=t.slice,P=function(e,t){for(var n=0,r=e.length;n<r;n++)if(e[n]===t)return n;return-1},R="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",M="[\\x20\\t\\r\\n\\f]",I="(?:\\\\.|[\\w-]|[^\0-\\xa0])+",W="\\["+M+"*("+I+")(?:"+M+"*([*^$|!~]?=)"+M+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+I+"))|)"+M+"*\\]",$=":("+I+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+W+")*)|.*)\\)|)",F=new RegExp(M+"+","g"),B=new RegExp("^"+M+"+|((?:^|[^\\\\])(?:\\\\.)*)"+M+"+$","g"),_=new RegExp("^"+M+"*,"+M+"*"),z=new RegExp("^"+M+"*([>+~]|"+M+")"+M+"*"),U=new RegExp(M+"|>"),X=new RegExp($),V=new RegExp("^"+I+"$"),G={ID:new RegExp("^#("+I+")"),CLASS:new RegExp("^\\.("+I+")"),TAG:new RegExp("^("+I+"|[*])"),ATTR:new RegExp("^"+W),PSEUDO:new RegExp("^"+$),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:new RegExp("^(?:"+R+")$","i"),needsContext:new RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},Y=/HTML$/i,Q=/^(?:input|select|textarea|button)$/i,J=/^h\d$/i,K=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ee=/[+~]/,te=new RegExp("\\\\([\\da-f]{1,6}"+M+"?|("+M+")|.)","ig"),ne=function(e,t,n){var r="0x"+t-65536;return r!=r||n?t:r<0?String.fromCharCode(r+65536):String.fromCharCode(r>>10|55296,1023&r|56320)},re=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g,ie=function(e,t){return t?"\0"===e?"\ufffd":e.slice(0,-1)+"\\"+e.charCodeAt(e.length-1).toString(16)+" ":"\\"+e},oe=function(){T()},ae=be(function(e){return!0===e.disabled&&"fieldset"===e.nodeName.toLowerCase()},{dir:"parentNode",next:"legend"});try{H.apply(t=O.call(m.childNodes),m.childNodes),t[m.childNodes.length].nodeType}catch(e){H={apply:t.length?function(e,t){L.apply(e,O.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function se(t,e,n,r){var i,o,a,s,u,l,c,f=e&&e.ownerDocument,p=e?e.nodeType:9;if(n=n||[],"string"!=typeof t||!t||1!==p&&9!==p&&11!==p)return n;if(!r&&((e?e.ownerDocument||e:m)!==C&&T(e),e=e||C,E)){if(11!==p&&(u=Z.exec(t)))if(i=u[1]){if(9===p){if(!(a=e.getElementById(i)))return n;if(a.id===i)return n.push(a),n}else if(f&&(a=f.getElementById(i))&&y(e,a)&&a.id===i)return n.push(a),n}else{if(u[2])return H.apply(n,e.getElementsByTagName(t)),n;if((i=u[3])&&d.getElementsByClassName&&e.getElementsByClassName)return H.apply(n,e.getElementsByClassName(i)),n}if(d.qsa&&!A[t+" "]&&(!v||!v.test(t))&&(1!==p||"object"!==e.nodeName.toLowerCase())){if(c=t,f=e,1===p&&U.test(t)){(s=e.getAttribute("id"))?s=s.replace(re,ie):e.setAttribute("id",s=k),o=(l=h(t)).length;while(o--)l[o]="#"+s+" "+xe(l[o]);c=l.join(","),f=ee.test(t)&&ye(e.parentNode)||e}try{return H.apply(n,f.querySelectorAll(c)),n}catch(e){A(t,!0)}finally{s===k&&e.removeAttribute("id")}}}return g(t.replace(B,"$1"),e,n,r)}function ue(){var r=[];return function e(t,n){return r.push(t+" ")>b.cacheLength&&delete e[r.shift()],e[t+" "]=n}}function le(e){return e[k]=!0,e}function ce(e){var t=C.createElement("fieldset");try{return!!e(t)}catch(e){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function fe(e,t){var n=e.split("|"),r=n.length;while(r--)b.attrHandle[n[r]]=t}function pe(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&e.sourceIndex-t.sourceIndex;if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function de(t){return function(e){return"input"===e.nodeName.toLowerCase()&&e.type===t}}function he(n){return function(e){var t=e.nodeName.toLowerCase();return("input"===t||"button"===t)&&e.type===n}}function ge(t){return function(e){return"form"in e?e.parentNode&&!1===e.disabled?"label"in e?"label"in e.parentNode?e.parentNode.disabled===t:e.disabled===t:e.isDisabled===t||e.isDisabled!==!t&&ae(e)===t:e.disabled===t:"label"in e&&e.disabled===t}}function ve(a){return le(function(o){return o=+o,le(function(e,t){var n,r=a([],e.length,o),i=r.length;while(i--)e[n=r[i]]&&(e[n]=!(t[n]=e[n]))})})}function ye(e){return e&&"undefined"!=typeof e.getElementsByTagName&&e}for(e in d=se.support={},i=se.isXML=function(e){var t=e.namespaceURI,n=(e.ownerDocument||e).documentElement;return!Y.test(t||n&&n.nodeName||"HTML")},T=se.setDocument=function(e){var t,n,r=e?e.ownerDocument||e:m;return r!==C&&9===r.nodeType&&r.documentElement&&(a=(C=r).documentElement,E=!i(C),m!==C&&(n=C.defaultView)&&n.top!==n&&(n.addEventListener?n.addEventListener("unload",oe,!1):n.attachEvent&&n.attachEvent("onunload",oe)),d.attributes=ce(function(e){return e.className="i",!e.getAttribute("className")}),d.getElementsByTagName=ce(function(e){return e.appendChild(C.createComment("")),!e.getElementsByTagName("*").length}),d.getElementsByClassName=K.test(C.getElementsByClassName),d.getById=ce(function(e){return a.appendChild(e).id=k,!C.getElementsByName||!C.getElementsByName(k).length}),d.getById?(b.filter.ID=function(e){var t=e.replace(te,ne);return function(e){return e.getAttribute("id")===t}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n=t.getElementById(e);return n?[n]:[]}}):(b.filter.ID=function(e){var n=e.replace(te,ne);return function(e){var t="undefined"!=typeof e.getAttributeNode&&e.getAttributeNode("id");return t&&t.value===n}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n,r,i,o=t.getElementById(e);if(o){if((n=o.getAttributeNode("id"))&&n.value===e)return[o];i=t.getElementsByName(e),r=0;while(o=i[r++])if((n=o.getAttributeNode("id"))&&n.value===e)return[o]}return[]}}),b.find.TAG=d.getElementsByTagName?function(e,t){return"undefined"!=typeof t.getElementsByTagName?t.getElementsByTagName(e):d.qsa?t.querySelectorAll(e):void 0}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},b.find.CLASS=d.getElementsByClassName&&function(e,t){if("undefined"!=typeof t.getElementsByClassName&&E)return t.getElementsByClassName(e)},s=[],v=[],(d.qsa=K.test(C.querySelectorAll))&&(ce(function(e){a.appendChild(e).innerHTML="<a id='"+k+"'></a><select id='"+k+"-\r\\' msallowcapture=''><option selected=''></option></select>",e.querySelectorAll("[msallowcapture^='']").length&&v.push("[*^$]="+M+"*(?:''|\"\")"),e.querySelectorAll("[selected]").length||v.push("\\["+M+"*(?:value|"+R+")"),e.querySelectorAll("[id~="+k+"-]").length||v.push("~="),e.querySelectorAll(":checked").length||v.push(":checked"),e.querySelectorAll("a#"+k+"+*").length||v.push(".#.+[+~]")}),ce(function(e){e.innerHTML="<a href='' disabled='disabled'></a><select disabled='disabled'><option/></select>";var t=C.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),e.querySelectorAll("[name=d]").length&&v.push("name"+M+"*[*^$|!~]?="),2!==e.querySelectorAll(":enabled").length&&v.push(":enabled",":disabled"),a.appendChild(e).disabled=!0,2!==e.querySelectorAll(":disabled").length&&v.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),v.push(",.*:")})),(d.matchesSelector=K.test(c=a.matches||a.webkitMatchesSelector||a.mozMatchesSelector||a.oMatchesSelector||a.msMatchesSelector))&&ce(function(e){d.disconnectedMatch=c.call(e,"*"),c.call(e,"[s!='']:x"),s.push("!=",$)}),v=v.length&&new RegExp(v.join("|")),s=s.length&&new RegExp(s.join("|")),t=K.test(a.compareDocumentPosition),y=t||K.test(a.contains)?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},D=t?function(e,t){if(e===t)return l=!0,0;var n=!e.compareDocumentPosition-!t.compareDocumentPosition;return n||(1&(n=(e.ownerDocument||e)===(t.ownerDocument||t)?e.compareDocumentPosition(t):1)||!d.sortDetached&&t.compareDocumentPosition(e)===n?e===C||e.ownerDocument===m&&y(m,e)?-1:t===C||t.ownerDocument===m&&y(m,t)?1:u?P(u,e)-P(u,t):0:4&n?-1:1)}:function(e,t){if(e===t)return l=!0,0;var n,r=0,i=e.parentNode,o=t.parentNode,a=[e],s=[t];if(!i||!o)return e===C?-1:t===C?1:i?-1:o?1:u?P(u,e)-P(u,t):0;if(i===o)return pe(e,t);n=e;while(n=n.parentNode)a.unshift(n);n=t;while(n=n.parentNode)s.unshift(n);while(a[r]===s[r])r++;return r?pe(a[r],s[r]):a[r]===m?-1:s[r]===m?1:0}),C},se.matches=function(e,t){return se(e,null,null,t)},se.matchesSelector=function(e,t){if((e.ownerDocument||e)!==C&&T(e),d.matchesSelector&&E&&!A[t+" "]&&(!s||!s.test(t))&&(!v||!v.test(t)))try{var n=c.call(e,t);if(n||d.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(e){A(t,!0)}return 0<se(t,C,null,[e]).length},se.contains=function(e,t){return(e.ownerDocument||e)!==C&&T(e),y(e,t)},se.attr=function(e,t){(e.ownerDocument||e)!==C&&T(e);var n=b.attrHandle[t.toLowerCase()],r=n&&j.call(b.attrHandle,t.toLowerCase())?n(e,t,!E):void 0;return void 0!==r?r:d.attributes||!E?e.getAttribute(t):(r=e.getAttributeNode(t))&&r.specified?r.value:null},se.escape=function(e){return(e+"").replace(re,ie)},se.error=function(e){throw new Error("Syntax error, unrecognized expression: "+e)},se.uniqueSort=function(e){var t,n=[],r=0,i=0;if(l=!d.detectDuplicates,u=!d.sortStable&&e.slice(0),e.sort(D),l){while(t=e[i++])t===e[i]&&(r=n.push(i));while(r--)e.splice(n[r],1)}return u=null,e},o=se.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(1===i||9===i||11===i){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=o(e)}else if(3===i||4===i)return e.nodeValue}else while(t=e[r++])n+=o(t);return n},(b=se.selectors={cacheLength:50,createPseudo:le,match:G,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(te,ne),e[3]=(e[3]||e[4]||e[5]||"").replace(te,ne),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||se.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&se.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return G.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&X.test(n)&&(t=h(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(te,ne).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=p[e+" "];return t||(t=new RegExp("(^|"+M+")"+e+"("+M+"|$)"))&&p(e,function(e){return t.test("string"==typeof e.className&&e.className||"undefined"!=typeof e.getAttribute&&e.getAttribute("class")||"")})},ATTR:function(n,r,i){return function(e){var t=se.attr(e,n);return null==t?"!="===r:!r||(t+="","="===r?t===i:"!="===r?t!==i:"^="===r?i&&0===t.indexOf(i):"*="===r?i&&-1<t.indexOf(i):"$="===r?i&&t.slice(-i.length)===i:"~="===r?-1<(" "+t.replace(F," ")+" ").indexOf(i):"|="===r&&(t===i||t.slice(0,i.length+1)===i+"-"))}},CHILD:function(h,e,t,g,v){var y="nth"!==h.slice(0,3),m="last"!==h.slice(-4),x="of-type"===e;return 1===g&&0===v?function(e){return!!e.parentNode}:function(e,t,n){var r,i,o,a,s,u,l=y!==m?"nextSibling":"previousSibling",c=e.parentNode,f=x&&e.nodeName.toLowerCase(),p=!n&&!x,d=!1;if(c){if(y){while(l){a=e;while(a=a[l])if(x?a.nodeName.toLowerCase()===f:1===a.nodeType)return!1;u=l="only"===h&&!u&&"nextSibling"}return!0}if(u=[m?c.firstChild:c.lastChild],m&&p){d=(s=(r=(i=(o=(a=c)[k]||(a[k]={}))[a.uniqueID]||(o[a.uniqueID]={}))[h]||[])[0]===S&&r[1])&&r[2],a=s&&c.childNodes[s];while(a=++s&&a&&a[l]||(d=s=0)||u.pop())if(1===a.nodeType&&++d&&a===e){i[h]=[S,s,d];break}}else if(p&&(d=s=(r=(i=(o=(a=e)[k]||(a[k]={}))[a.uniqueID]||(o[a.uniqueID]={}))[h]||[])[0]===S&&r[1]),!1===d)while(a=++s&&a&&a[l]||(d=s=0)||u.pop())if((x?a.nodeName.toLowerCase()===f:1===a.nodeType)&&++d&&(p&&((i=(o=a[k]||(a[k]={}))[a.uniqueID]||(o[a.uniqueID]={}))[h]=[S,d]),a===e))break;return(d-=v)===g||d%g==0&&0<=d/g}}},PSEUDO:function(e,o){var t,a=b.pseudos[e]||b.setFilters[e.toLowerCase()]||se.error("unsupported pseudo: "+e);return a[k]?a(o):1<a.length?(t=[e,e,"",o],b.setFilters.hasOwnProperty(e.toLowerCase())?le(function(e,t){var n,r=a(e,o),i=r.length;while(i--)e[n=P(e,r[i])]=!(t[n]=r[i])}):function(e){return a(e,0,t)}):a}},pseudos:{not:le(function(e){var r=[],i=[],s=f(e.replace(B,"$1"));return s[k]?le(function(e,t,n,r){var i,o=s(e,null,r,[]),a=e.length;while(a--)(i=o[a])&&(e[a]=!(t[a]=i))}):function(e,t,n){return r[0]=e,s(r,null,n,i),r[0]=null,!i.pop()}}),has:le(function(t){return function(e){return 0<se(t,e).length}}),contains:le(function(t){return t=t.replace(te,ne),function(e){return-1<(e.textContent||o(e)).indexOf(t)}}),lang:le(function(n){return V.test(n||"")||se.error("unsupported lang: "+n),n=n.replace(te,ne).toLowerCase(),function(e){var t;do{if(t=E?e.lang:e.getAttribute("xml:lang")||e.getAttribute("lang"))return(t=t.toLowerCase())===n||0===t.indexOf(n+"-")}while((e=e.parentNode)&&1===e.nodeType);return!1}}),target:function(e){var t=n.location&&n.location.hash;return t&&t.slice(1)===e.id},root:function(e){return e===a},focus:function(e){return e===C.activeElement&&(!C.hasFocus||C.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:ge(!1),disabled:ge(!0),checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,!0===e.selected},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeType<6)return!1;return!0},parent:function(e){return!b.pseudos.empty(e)},header:function(e){return J.test(e.nodeName)},input:function(e){return Q.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||"text"===t.toLowerCase())},first:ve(function(){return[0]}),last:ve(function(e,t){return[t-1]}),eq:ve(function(e,t,n){return[n<0?n+t:n]}),even:ve(function(e,t){for(var n=0;n<t;n+=2)e.push(n);return e}),odd:ve(function(e,t){for(var n=1;n<t;n+=2)e.push(n);return e}),lt:ve(function(e,t,n){for(var r=n<0?n+t:t<n?t:n;0<=--r;)e.push(r);return e}),gt:ve(function(e,t,n){for(var r=n<0?n+t:n;++r<t;)e.push(r);return e})}}).pseudos.nth=b.pseudos.eq,{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})b.pseudos[e]=de(e);for(e in{submit:!0,reset:!0})b.pseudos[e]=he(e);function me(){}function xe(e){for(var t=0,n=e.length,r="";t<n;t++)r+=e[t].value;return r}function be(s,e,t){var u=e.dir,l=e.next,c=l||u,f=t&&"parentNode"===c,p=r++;return e.first?function(e,t,n){while(e=e[u])if(1===e.nodeType||f)return s(e,t,n);return!1}:function(e,t,n){var r,i,o,a=[S,p];if(n){while(e=e[u])if((1===e.nodeType||f)&&s(e,t,n))return!0}else while(e=e[u])if(1===e.nodeType||f)if(i=(o=e[k]||(e[k]={}))[e.uniqueID]||(o[e.uniqueID]={}),l&&l===e.nodeName.toLowerCase())e=e[u]||e;else{if((r=i[c])&&r[0]===S&&r[1]===p)return a[2]=r[2];if((i[c]=a)[2]=s(e,t,n))return!0}return!1}}function we(i){return 1<i.length?function(e,t,n){var r=i.length;while(r--)if(!i[r](e,t,n))return!1;return!0}:i[0]}function Te(e,t,n,r,i){for(var o,a=[],s=0,u=e.length,l=null!=t;s<u;s++)(o=e[s])&&(n&&!n(o,r,i)||(a.push(o),l&&t.push(s)));return a}function Ce(d,h,g,v,y,e){return v&&!v[k]&&(v=Ce(v)),y&&!y[k]&&(y=Ce(y,e)),le(function(e,t,n,r){var i,o,a,s=[],u=[],l=t.length,c=e||function(e,t,n){for(var r=0,i=t.length;r<i;r++)se(e,t[r],n);return n}(h||"*",n.nodeType?[n]:n,[]),f=!d||!e&&h?c:Te(c,s,d,n,r),p=g?y||(e?d:l||v)?[]:t:f;if(g&&g(f,p,n,r),v){i=Te(p,u),v(i,[],n,r),o=i.length;while(o--)(a=i[o])&&(p[u[o]]=!(f[u[o]]=a))}if(e){if(y||d){if(y){i=[],o=p.length;while(o--)(a=p[o])&&i.push(f[o]=a);y(null,p=[],i,r)}o=p.length;while(o--)(a=p[o])&&-1<(i=y?P(e,a):s[o])&&(e[i]=!(t[i]=a))}}else p=Te(p===t?p.splice(l,p.length):p),y?y(null,t,p,r):H.apply(t,p)})}function Ee(e){for(var i,t,n,r=e.length,o=b.relative[e[0].type],a=o||b.relative[" "],s=o?1:0,u=be(function(e){return e===i},a,!0),l=be(function(e){return-1<P(i,e)},a,!0),c=[function(e,t,n){var r=!o&&(n||t!==w)||((i=t).nodeType?u(e,t,n):l(e,t,n));return i=null,r}];s<r;s++)if(t=b.relative[e[s].type])c=[be(we(c),t)];else{if((t=b.filter[e[s].type].apply(null,e[s].matches))[k]){for(n=++s;n<r;n++)if(b.relative[e[n].type])break;return Ce(1<s&&we(c),1<s&&xe(e.slice(0,s-1).concat({value:" "===e[s-2].type?"*":""})).replace(B,"$1"),t,s<n&&Ee(e.slice(s,n)),n<r&&Ee(e=e.slice(n)),n<r&&xe(e))}c.push(t)}return we(c)}return me.prototype=b.filters=b.pseudos,b.setFilters=new me,h=se.tokenize=function(e,t){var n,r,i,o,a,s,u,l=x[e+" "];if(l)return t?0:l.slice(0);a=e,s=[],u=b.preFilter;while(a){for(o in n&&!(r=_.exec(a))||(r&&(a=a.slice(r[0].length)||a),s.push(i=[])),n=!1,(r=z.exec(a))&&(n=r.shift(),i.push({value:n,type:r[0].replace(B," ")}),a=a.slice(n.length)),b.filter)!(r=G[o].exec(a))||u[o]&&!(r=u[o](r))||(n=r.shift(),i.push({value:n,type:o,matches:r}),a=a.slice(n.length));if(!n)break}return t?a.length:a?se.error(e):x(e,s).slice(0)},f=se.compile=function(e,t){var n,v,y,m,x,r,i=[],o=[],a=N[e+" "];if(!a){t||(t=h(e)),n=t.length;while(n--)(a=Ee(t[n]))[k]?i.push(a):o.push(a);(a=N(e,(v=o,m=0<(y=i).length,x=0<v.length,r=function(e,t,n,r,i){var o,a,s,u=0,l="0",c=e&&[],f=[],p=w,d=e||x&&b.find.TAG("*",i),h=S+=null==p?1:Math.random()||.1,g=d.length;for(i&&(w=t===C||t||i);l!==g&&null!=(o=d[l]);l++){if(x&&o){a=0,t||o.ownerDocument===C||(T(o),n=!E);while(s=v[a++])if(s(o,t||C,n)){r.push(o);break}i&&(S=h)}m&&((o=!s&&o)&&u--,e&&c.push(o))}if(u+=l,m&&l!==u){a=0;while(s=y[a++])s(c,f,t,n);if(e){if(0<u)while(l--)c[l]||f[l]||(f[l]=q.call(r));f=Te(f)}H.apply(r,f),i&&!e&&0<f.length&&1<u+y.length&&se.uniqueSort(r)}return i&&(S=h,w=p),c},m?le(r):r))).selector=e}return a},g=se.select=function(e,t,n,r){var i,o,a,s,u,l="function"==typeof e&&e,c=!r&&h(e=l.selector||e);if(n=n||[],1===c.length){if(2<(o=c[0]=c[0].slice(0)).length&&"ID"===(a=o[0]).type&&9===t.nodeType&&E&&b.relative[o[1].type]){if(!(t=(b.find.ID(a.matches[0].replace(te,ne),t)||[])[0]))return n;l&&(t=t.parentNode),e=e.slice(o.shift().value.length)}i=G.needsContext.test(e)?0:o.length;while(i--){if(a=o[i],b.relative[s=a.type])break;if((u=b.find[s])&&(r=u(a.matches[0].replace(te,ne),ee.test(o[0].type)&&ye(t.parentNode)||t))){if(o.splice(i,1),!(e=r.length&&xe(o)))return H.apply(n,r),n;break}}}return(l||f(e,c))(r,t,!E,n,!t||ee.test(e)&&ye(t.parentNode)||t),n},d.sortStable=k.split("").sort(D).join("")===k,d.detectDuplicates=!!l,T(),d.sortDetached=ce(function(e){return 1&e.compareDocumentPosition(C.createElement("fieldset"))}),ce(function(e){return e.innerHTML="<a href='#'></a>","#"===e.firstChild.getAttribute("href")})||fe("type|href|height|width",function(e,t,n){if(!n)return e.getAttribute(t,"type"===t.toLowerCase()?1:2)}),d.attributes&&ce(function(e){return e.innerHTML="<input/>",e.firstChild.setAttribute("value",""),""===e.firstChild.getAttribute("value")})||fe("value",function(e,t,n){if(!n&&"input"===e.nodeName.toLowerCase())return e.defaultValue}),ce(function(e){return null==e.getAttribute("disabled")})||fe(R,function(e,t,n){var r;if(!n)return!0===e[t]?t.toLowerCase():(r=e.getAttributeNode(t))&&r.specified?r.value:null}),se}(C);k.find=h,k.expr=h.selectors,k.expr[":"]=k.expr.pseudos,k.uniqueSort=k.unique=h.uniqueSort,k.text=h.getText,k.isXMLDoc=h.isXML,k.contains=h.contains,k.escapeSelector=h.escape;var T=function(e,t,n){var r=[],i=void 0!==n;while((e=e[t])&&9!==e.nodeType)if(1===e.nodeType){if(i&&k(e).is(n))break;r.push(e)}return r},S=function(e,t){for(var n=[];e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n},N=k.expr.match.needsContext;function A(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()}var D=/^<([a-z][^\/\0>:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i;function j(e,n,r){return m(n)?k.grep(e,function(e,t){return!!n.call(e,t,e)!==r}):n.nodeType?k.grep(e,function(e){return e===n!==r}):"string"!=typeof n?k.grep(e,function(e){return-1<i.call(n,e)!==r}):k.filter(n,e,r)}k.filter=function(e,t,n){var r=t[0];return n&&(e=":not("+e+")"),1===t.length&&1===r.nodeType?k.find.matchesSelector(r,e)?[r]:[]:k.find.matches(e,k.grep(t,function(e){return 1===e.nodeType}))},k.fn.extend({find:function(e){var t,n,r=this.length,i=this;if("string"!=typeof e)return this.pushStack(k(e).filter(function(){for(t=0;t<r;t++)if(k.contains(i[t],this))return!0}));for(n=this.pushStack([]),t=0;t<r;t++)k.find(e,i[t],n);return 1<r?k.uniqueSort(n):n},filter:function(e){return this.pushStack(j(this,e||[],!1))},not:function(e){return this.pushStack(j(this,e||[],!0))},is:function(e){return!!j(this,"string"==typeof e&&N.test(e)?k(e):e||[],!1).length}});var q,L=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]+))$/;(k.fn.init=function(e,t,n){var r,i;if(!e)return this;if(n=n||q,"string"==typeof e){if(!(r="<"===e[0]&&">"===e[e.length-1]&&3<=e.length?[null,e,null]:L.exec(e))||!r[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(r[1]){if(t=t instanceof k?t[0]:t,k.merge(this,k.parseHTML(r[1],t&&t.nodeType?t.ownerDocument||t:E,!0)),D.test(r[1])&&k.isPlainObject(t))for(r in t)m(this[r])?this[r](t[r]):this.attr(r,t[r]);return this}return(i=E.getElementById(r[2]))&&(this[0]=i,this.length=1),this}return e.nodeType?(this[0]=e,this.length=1,this):m(e)?void 0!==n.ready?n.ready(e):e(k):k.makeArray(e,this)}).prototype=k.fn,q=k(E);var H=/^(?:parents|prev(?:Until|All))/,O={children:!0,contents:!0,next:!0,prev:!0};function P(e,t){while((e=e[t])&&1!==e.nodeType);return e}k.fn.extend({has:function(e){var t=k(e,this),n=t.length;return this.filter(function(){for(var e=0;e<n;e++)if(k.contains(this,t[e]))return!0})},closest:function(e,t){var n,r=0,i=this.length,o=[],a="string"!=typeof e&&k(e);if(!N.test(e))for(;r<i;r++)for(n=this[r];n&&n!==t;n=n.parentNode)if(n.nodeType<11&&(a?-1<a.index(n):1===n.nodeType&&k.find.matchesSelector(n,e))){o.push(n);break}return this.pushStack(1<o.length?k.uniqueSort(o):o)},index:function(e){return e?"string"==typeof e?i.call(k(e),this[0]):i.call(this,e.jquery?e[0]:e):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){return this.pushStack(k.uniqueSort(k.merge(this.get(),k(e,t))))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}}),k.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return T(e,"parentNode")},parentsUntil:function(e,t,n){return T(e,"parentNode",n)},next:function(e){return P(e,"nextSibling")},prev:function(e){return P(e,"previousSibling")},nextAll:function(e){return T(e,"nextSibling")},prevAll:function(e){return T(e,"previousSibling")},nextUntil:function(e,t,n){return T(e,"nextSibling",n)},prevUntil:function(e,t,n){return T(e,"previousSibling",n)},siblings:function(e){return S((e.parentNode||{}).firstChild,e)},children:function(e){return S(e.firstChild)},contents:function(e){return"undefined"!=typeof e.contentDocument?e.contentDocument:(A(e,"template")&&(e=e.content||e),k.merge([],e.childNodes))}},function(r,i){k.fn[r]=function(e,t){var n=k.map(this,i,e);return"Until"!==r.slice(-5)&&(t=e),t&&"string"==typeof t&&(n=k.filter(t,n)),1<this.length&&(O[r]||k.uniqueSort(n),H.test(r)&&n.reverse()),this.pushStack(n)}});var R=/[^\x20\t\r\n\f]+/g;function M(e){return e}function I(e){throw e}function W(e,t,n,r){var i;try{e&&m(i=e.promise)?i.call(e).done(t).fail(n):e&&m(i=e.then)?i.call(e,t,n):t.apply(void 0,[e].slice(r))}catch(e){n.apply(void 0,[e])}}k.Callbacks=function(r){var e,n;r="string"==typeof r?(e=r,n={},k.each(e.match(R)||[],function(e,t){n[t]=!0}),n):k.extend({},r);var i,t,o,a,s=[],u=[],l=-1,c=function(){for(a=a||r.once,o=i=!0;u.length;l=-1){t=u.shift();while(++l<s.length)!1===s[l].apply(t[0],t[1])&&r.stopOnFalse&&(l=s.length,t=!1)}r.memory||(t=!1),i=!1,a&&(s=t?[]:"")},f={add:function(){return s&&(t&&!i&&(l=s.length-1,u.push(t)),function n(e){k.each(e,function(e,t){m(t)?r.unique&&f.has(t)||s.push(t):t&&t.length&&"string"!==w(t)&&n(t)})}(arguments),t&&!i&&c()),this},remove:function(){return k.each(arguments,function(e,t){var n;while(-1<(n=k.inArray(t,s,n)))s.splice(n,1),n<=l&&l--}),this},has:function(e){return e?-1<k.inArray(e,s):0<s.length},empty:function(){return s&&(s=[]),this},disable:function(){return a=u=[],s=t="",this},disabled:function(){return!s},lock:function(){return a=u=[],t||i||(s=t=""),this},locked:function(){return!!a},fireWith:function(e,t){return a||(t=[e,(t=t||[]).slice?t.slice():t],u.push(t),i||c()),this},fire:function(){return f.fireWith(this,arguments),this},fired:function(){return!!o}};return f},k.extend({Deferred:function(e){var o=[["notify","progress",k.Callbacks("memory"),k.Callbacks("memory"),2],["resolve","done",k.Callbacks("once memory"),k.Callbacks("once memory"),0,"resolved"],["reject","fail",k.Callbacks("once memory"),k.Callbacks("once memory"),1,"rejected"]],i="pending",a={state:function(){return i},always:function(){return s.done(arguments).fail(arguments),this},"catch":function(e){return a.then(null,e)},pipe:function(){var i=arguments;return k.Deferred(function(r){k.each(o,function(e,t){var n=m(i[t[4]])&&i[t[4]];s[t[1]](function(){var e=n&&n.apply(this,arguments);e&&m(e.promise)?e.promise().progress(r.notify).done(r.resolve).fail(r.reject):r[t[0]+"With"](this,n?[e]:arguments)})}),i=null}).promise()},then:function(t,n,r){var u=0;function l(i,o,a,s){return function(){var n=this,r=arguments,e=function(){var e,t;if(!(i<u)){if((e=a.apply(n,r))===o.promise())throw new TypeError("Thenable self-resolution");t=e&&("object"==typeof e||"function"==typeof e)&&e.then,m(t)?s?t.call(e,l(u,o,M,s),l(u,o,I,s)):(u++,t.call(e,l(u,o,M,s),l(u,o,I,s),l(u,o,M,o.notifyWith))):(a!==M&&(n=void 0,r=[e]),(s||o.resolveWith)(n,r))}},t=s?e:function(){try{e()}catch(e){k.Deferred.exceptionHook&&k.Deferred.exceptionHook(e,t.stackTrace),u<=i+1&&(a!==I&&(n=void 0,r=[e]),o.rejectWith(n,r))}};i?t():(k.Deferred.getStackHook&&(t.stackTrace=k.Deferred.getStackHook()),C.setTimeout(t))}}return k.Deferred(function(e){o[0][3].add(l(0,e,m(r)?r:M,e.notifyWith)),o[1][3].add(l(0,e,m(t)?t:M)),o[2][3].add(l(0,e,m(n)?n:I))}).promise()},promise:function(e){return null!=e?k.extend(e,a):a}},s={};return k.each(o,function(e,t){var n=t[2],r=t[5];a[t[1]]=n.add,r&&n.add(function(){i=r},o[3-e][2].disable,o[3-e][3].disable,o[0][2].lock,o[0][3].lock),n.add(t[3].fire),s[t[0]]=function(){return s[t[0]+"With"](this===s?void 0:this,arguments),this},s[t[0]+"With"]=n.fireWith}),a.promise(s),e&&e.call(s,s),s},when:function(e){var n=arguments.length,t=n,r=Array(t),i=s.call(arguments),o=k.Deferred(),a=function(t){return function(e){r[t]=this,i[t]=1<arguments.length?s.call(arguments):e,--n||o.resolveWith(r,i)}};if(n<=1&&(W(e,o.done(a(t)).resolve,o.reject,!n),"pending"===o.state()||m(i[t]&&i[t].then)))return o.then();while(t--)W(i[t],a(t),o.reject);return o.promise()}});var $=/^(Eval|Internal|Range|Reference|Syntax|Type|URI)Error$/;k.Deferred.exceptionHook=function(e,t){C.console&&C.console.warn&&e&&$.test(e.name)&&C.console.warn("jQuery.Deferred exception: "+e.message,e.stack,t)},k.readyException=function(e){C.setTimeout(function(){throw e})};var F=k.Deferred();function B(){E.removeEventListener("DOMContentLoaded",B),C.removeEventListener("load",B),k.ready()}k.fn.ready=function(e){return F.then(e)["catch"](function(e){k.readyException(e)}),this},k.extend({isReady:!1,readyWait:1,ready:function(e){(!0===e?--k.readyWait:k.isReady)||(k.isReady=!0)!==e&&0<--k.readyWait||F.resolveWith(E,[k])}}),k.ready.then=F.then,"complete"===E.readyState||"loading"!==E.readyState&&!E.documentElement.doScroll?C.setTimeout(k.ready):(E.addEventListener("DOMContentLoaded",B),C.addEventListener("load",B));var _=function(e,t,n,r,i,o,a){var s=0,u=e.length,l=null==n;if("object"===w(n))for(s in i=!0,n)_(e,t,s,n[s],!0,o,a);else if(void 0!==r&&(i=!0,m(r)||(a=!0),l&&(a?(t.call(e,r),t=null):(l=t,t=function(e,t,n){return l.call(k(e),n)})),t))for(;s<u;s++)t(e[s],n,a?r:r.call(e[s],s,t(e[s],n)));return i?e:l?t.call(e):u?t(e[0],n):o},z=/^-ms-/,U=/-([a-z])/g;function X(e,t){return t.toUpperCase()}function V(e){return e.replace(z,"ms-").replace(U,X)}var G=function(e){return 1===e.nodeType||9===e.nodeType||!+e.nodeType};function Y(){this.expando=k.expando+Y.uid++}Y.uid=1,Y.prototype={cache:function(e){var t=e[this.expando];return t||(t={},G(e)&&(e.nodeType?e[this.expando]=t:Object.defineProperty(e,this.expando,{value:t,configurable:!0}))),t},set:function(e,t,n){var r,i=this.cache(e);if("string"==typeof t)i[V(t)]=n;else for(r in t)i[V(r)]=t[r];return i},get:function(e,t){return void 0===t?this.cache(e):e[this.expando]&&e[this.expando][V(t)]},access:function(e,t,n){return void 0===t||t&&"string"==typeof t&&void 0===n?this.get(e,t):(this.set(e,t,n),void 0!==n?n:t)},remove:function(e,t){var n,r=e[this.expando];if(void 0!==r){if(void 0!==t){n=(t=Array.isArray(t)?t.map(V):(t=V(t))in r?[t]:t.match(R)||[]).length;while(n--)delete r[t[n]]}(void 0===t||k.isEmptyObject(r))&&(e.nodeType?e[this.expando]=void 0:delete e[this.expando])}},hasData:function(e){var t=e[this.expando];return void 0!==t&&!k.isEmptyObject(t)}};var Q=new Y,J=new Y,K=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,Z=/[A-Z]/g;function ee(e,t,n){var r,i;if(void 0===n&&1===e.nodeType)if(r="data-"+t.replace(Z,"-$&").toLowerCase(),"string"==typeof(n=e.getAttribute(r))){try{n="true"===(i=n)||"false"!==i&&("null"===i?null:i===+i+""?+i:K.test(i)?JSON.parse(i):i)}catch(e){}J.set(e,t,n)}else n=void 0;return n}k.extend({hasData:function(e){return J.hasData(e)||Q.hasData(e)},data:function(e,t,n){return J.access(e,t,n)},removeData:function(e,t){J.remove(e,t)},_data:function(e,t,n){return Q.access(e,t,n)},_removeData:function(e,t){Q.remove(e,t)}}),k.fn.extend({data:function(n,e){var t,r,i,o=this[0],a=o&&o.attributes;if(void 0===n){if(this.length&&(i=J.get(o),1===o.nodeType&&!Q.get(o,"hasDataAttrs"))){t=a.length;while(t--)a[t]&&0===(r=a[t].name).indexOf("data-")&&(r=V(r.slice(5)),ee(o,r,i[r]));Q.set(o,"hasDataAttrs",!0)}return i}return"object"==typeof n?this.each(function(){J.set(this,n)}):_(this,function(e){var t;if(o&&void 0===e)return void 0!==(t=J.get(o,n))?t:void 0!==(t=ee(o,n))?t:void 0;this.each(function(){J.set(this,n,e)})},null,e,1<arguments.length,null,!0)},removeData:function(e){return this.each(function(){J.remove(this,e)})}}),k.extend({queue:function(e,t,n){var r;if(e)return t=(t||"fx")+"queue",r=Q.get(e,t),n&&(!r||Array.isArray(n)?r=Q.access(e,t,k.makeArray(n)):r.push(n)),r||[]},dequeue:function(e,t){t=t||"fx";var n=k.queue(e,t),r=n.length,i=n.shift(),o=k._queueHooks(e,t);"inprogress"===i&&(i=n.shift(),r--),i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,function(){k.dequeue(e,t)},o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return Q.get(e,n)||Q.access(e,n,{empty:k.Callbacks("once memory").add(function(){Q.remove(e,[t+"queue",n])})})}}),k.fn.extend({queue:function(t,n){var e=2;return"string"!=typeof t&&(n=t,t="fx",e--),arguments.length<e?k.queue(this[0],t):void 0===n?this:this.each(function(){var e=k.queue(this,t,n);k._queueHooks(this,t),"fx"===t&&"inprogress"!==e[0]&&k.dequeue(this,t)})},dequeue:function(e){return this.each(function(){k.dequeue(this,e)})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,t){var n,r=1,i=k.Deferred(),o=this,a=this.length,s=function(){--r||i.resolveWith(o,[o])};"string"!=typeof e&&(t=e,e=void 0),e=e||"fx";while(a--)(n=Q.get(o[a],e+"queueHooks"))&&n.empty&&(r++,n.empty.add(s));return s(),i.promise(t)}});var te=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,ne=new RegExp("^(?:([+-])=|)("+te+")([a-z%]*)$","i"),re=["Top","Right","Bottom","Left"],ie=E.documentElement,oe=function(e){return k.contains(e.ownerDocument,e)},ae={composed:!0};ie.getRootNode&&(oe=function(e){return k.contains(e.ownerDocument,e)||e.getRootNode(ae)===e.ownerDocument});var se=function(e,t){return"none"===(e=t||e).style.display||""===e.style.display&&oe(e)&&"none"===k.css(e,"display")},ue=function(e,t,n,r){var i,o,a={};for(o in t)a[o]=e.style[o],e.style[o]=t[o];for(o in i=n.apply(e,r||[]),t)e.style[o]=a[o];return i};function le(e,t,n,r){var i,o,a=20,s=r?function(){return r.cur()}:function(){return k.css(e,t,"")},u=s(),l=n&&n[3]||(k.cssNumber[t]?"":"px"),c=e.nodeType&&(k.cssNumber[t]||"px"!==l&&+u)&&ne.exec(k.css(e,t));if(c&&c[3]!==l){u/=2,l=l||c[3],c=+u||1;while(a--)k.style(e,t,c+l),(1-o)*(1-(o=s()/u||.5))<=0&&(a=0),c/=o;c*=2,k.style(e,t,c+l),n=n||[]}return n&&(c=+c||+u||0,i=n[1]?c+(n[1]+1)*n[2]:+n[2],r&&(r.unit=l,r.start=c,r.end=i)),i}var ce={};function fe(e,t){for(var n,r,i,o,a,s,u,l=[],c=0,f=e.length;c<f;c++)(r=e[c]).style&&(n=r.style.display,t?("none"===n&&(l[c]=Q.get(r,"display")||null,l[c]||(r.style.display="")),""===r.style.display&&se(r)&&(l[c]=(u=a=o=void 0,a=(i=r).ownerDocument,s=i.nodeName,(u=ce[s])||(o=a.body.appendChild(a.createElement(s)),u=k.css(o,"display"),o.parentNode.removeChild(o),"none"===u&&(u="block"),ce[s]=u)))):"none"!==n&&(l[c]="none",Q.set(r,"display",n)));for(c=0;c<f;c++)null!=l[c]&&(e[c].style.display=l[c]);return e}k.fn.extend({show:function(){return fe(this,!0)},hide:function(){return fe(this)},toggle:function(e){return"boolean"==typeof e?e?this.show():this.hide():this.each(function(){se(this)?k(this).show():k(this).hide()})}});var pe=/^(?:checkbox|radio)$/i,de=/<([a-z][^\/\0>\x20\t\r\n\f]*)/i,he=/^$|^module$|\/(?:java|ecma)script/i,ge={option:[1,"<select multiple='multiple'>","</select>"],thead:[1,"<table>","</table>"],col:[2,"<table><colgroup>","</colgroup></table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:[0,"",""]};function ve(e,t){var n;return n="undefined"!=typeof e.getElementsByTagName?e.getElementsByTagName(t||"*"):"undefined"!=typeof e.querySelectorAll?e.querySelectorAll(t||"*"):[],void 0===t||t&&A(e,t)?k.merge([e],n):n}function ye(e,t){for(var n=0,r=e.length;n<r;n++)Q.set(e[n],"globalEval",!t||Q.get(t[n],"globalEval"))}ge.optgroup=ge.option,ge.tbody=ge.tfoot=ge.colgroup=ge.caption=ge.thead,ge.th=ge.td;var me,xe,be=/<|&#?\w+;/;function we(e,t,n,r,i){for(var o,a,s,u,l,c,f=t.createDocumentFragment(),p=[],d=0,h=e.length;d<h;d++)if((o=e[d])||0===o)if("object"===w(o))k.merge(p,o.nodeType?[o]:o);else if(be.test(o)){a=a||f.appendChild(t.createElement("div")),s=(de.exec(o)||["",""])[1].toLowerCase(),u=ge[s]||ge._default,a.innerHTML=u[1]+k.htmlPrefilter(o)+u[2],c=u[0];while(c--)a=a.lastChild;k.merge(p,a.childNodes),(a=f.firstChild).textContent=""}else p.push(t.createTextNode(o));f.textContent="",d=0;while(o=p[d++])if(r&&-1<k.inArray(o,r))i&&i.push(o);else if(l=oe(o),a=ve(f.appendChild(o),"script"),l&&ye(a),n){c=0;while(o=a[c++])he.test(o.type||"")&&n.push(o)}return f}me=E.createDocumentFragment().appendChild(E.createElement("div")),(xe=E.createElement("input")).setAttribute("type","radio"),xe.setAttribute("checked","checked"),xe.setAttribute("name","t"),me.appendChild(xe),y.checkClone=me.cloneNode(!0).cloneNode(!0).lastChild.checked,me.innerHTML="<textarea>x</textarea>",y.noCloneChecked=!!me.cloneNode(!0).lastChild.defaultValue;var Te=/^key/,Ce=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,Ee=/^([^.]*)(?:\.(.+)|)/;function ke(){return!0}function Se(){return!1}function Ne(e,t){return e===function(){try{return E.activeElement}catch(e){}}()==("focus"===t)}function Ae(e,t,n,r,i,o){var a,s;if("object"==typeof t){for(s in"string"!=typeof n&&(r=r||n,n=void 0),t)Ae(e,s,n,r,t[s],o);return e}if(null==r&&null==i?(i=n,r=n=void 0):null==i&&("string"==typeof n?(i=r,r=void 0):(i=r,r=n,n=void 0)),!1===i)i=Se;else if(!i)return e;return 1===o&&(a=i,(i=function(e){return k().off(e),a.apply(this,arguments)}).guid=a.guid||(a.guid=k.guid++)),e.each(function(){k.event.add(this,t,i,r,n)})}function De(e,i,o){o?(Q.set(e,i,!1),k.event.add(e,i,{namespace:!1,handler:function(e){var t,n,r=Q.get(this,i);if(1&e.isTrigger&&this[i]){if(r.length)(k.event.special[i]||{}).delegateType&&e.stopPropagation();else if(r=s.call(arguments),Q.set(this,i,r),t=o(this,i),this[i](),r!==(n=Q.get(this,i))||t?Q.set(this,i,!1):n={},r!==n)return e.stopImmediatePropagation(),e.preventDefault(),n.value}else r.length&&(Q.set(this,i,{value:k.event.trigger(k.extend(r[0],k.Event.prototype),r.slice(1),this)}),e.stopImmediatePropagation())}})):void 0===Q.get(e,i)&&k.event.add(e,i,ke)}k.event={global:{},add:function(t,e,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,v=Q.get(t);if(v){n.handler&&(n=(o=n).handler,i=o.selector),i&&k.find.matchesSelector(ie,i),n.guid||(n.guid=k.guid++),(u=v.events)||(u=v.events={}),(a=v.handle)||(a=v.handle=function(e){return"undefined"!=typeof k&&k.event.triggered!==e.type?k.event.dispatch.apply(t,arguments):void 0}),l=(e=(e||"").match(R)||[""]).length;while(l--)d=g=(s=Ee.exec(e[l])||[])[1],h=(s[2]||"").split(".").sort(),d&&(f=k.event.special[d]||{},d=(i?f.delegateType:f.bindType)||d,f=k.event.special[d]||{},c=k.extend({type:d,origType:g,data:r,handler:n,guid:n.guid,selector:i,needsContext:i&&k.expr.match.needsContext.test(i),namespace:h.join(".")},o),(p=u[d])||((p=u[d]=[]).delegateCount=0,f.setup&&!1!==f.setup.call(t,r,h,a)||t.addEventListener&&t.addEventListener(d,a)),f.add&&(f.add.call(t,c),c.handler.guid||(c.handler.guid=n.guid)),i?p.splice(p.delegateCount++,0,c):p.push(c),k.event.global[d]=!0)}},remove:function(e,t,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,v=Q.hasData(e)&&Q.get(e);if(v&&(u=v.events)){l=(t=(t||"").match(R)||[""]).length;while(l--)if(d=g=(s=Ee.exec(t[l])||[])[1],h=(s[2]||"").split(".").sort(),d){f=k.event.special[d]||{},p=u[d=(r?f.delegateType:f.bindType)||d]||[],s=s[2]&&new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),a=o=p.length;while(o--)c=p[o],!i&&g!==c.origType||n&&n.guid!==c.guid||s&&!s.test(c.namespace)||r&&r!==c.selector&&("**"!==r||!c.selector)||(p.splice(o,1),c.selector&&p.delegateCount--,f.remove&&f.remove.call(e,c));a&&!p.length&&(f.teardown&&!1!==f.teardown.call(e,h,v.handle)||k.removeEvent(e,d,v.handle),delete u[d])}else for(d in u)k.event.remove(e,d+t[l],n,r,!0);k.isEmptyObject(u)&&Q.remove(e,"handle events")}},dispatch:function(e){var t,n,r,i,o,a,s=k.event.fix(e),u=new Array(arguments.length),l=(Q.get(this,"events")||{})[s.type]||[],c=k.event.special[s.type]||{};for(u[0]=s,t=1;t<arguments.length;t++)u[t]=arguments[t];if(s.delegateTarget=this,!c.preDispatch||!1!==c.preDispatch.call(this,s)){a=k.event.handlers.call(this,s,l),t=0;while((i=a[t++])&&!s.isPropagationStopped()){s.currentTarget=i.elem,n=0;while((o=i.handlers[n++])&&!s.isImmediatePropagationStopped())s.rnamespace&&!1!==o.namespace&&!s.rnamespace.test(o.namespace)||(s.handleObj=o,s.data=o.data,void 0!==(r=((k.event.special[o.origType]||{}).handle||o.handler).apply(i.elem,u))&&!1===(s.result=r)&&(s.preventDefault(),s.stopPropagation()))}return c.postDispatch&&c.postDispatch.call(this,s),s.result}},handlers:function(e,t){var n,r,i,o,a,s=[],u=t.delegateCount,l=e.target;if(u&&l.nodeType&&!("click"===e.type&&1<=e.button))for(;l!==this;l=l.parentNode||this)if(1===l.nodeType&&("click"!==e.type||!0!==l.disabled)){for(o=[],a={},n=0;n<u;n++)void 0===a[i=(r=t[n]).selector+" "]&&(a[i]=r.needsContext?-1<k(i,this).index(l):k.find(i,this,null,[l]).length),a[i]&&o.push(r);o.length&&s.push({elem:l,handlers:o})}return l=this,u<t.length&&s.push({elem:l,handlers:t.slice(u)}),s},addProp:function(t,e){Object.defineProperty(k.Event.prototype,t,{enumerable:!0,configurable:!0,get:m(e)?function(){if(this.originalEvent)return e(this.originalEvent)}:function(){if(this.originalEvent)return this.originalEvent[t]},set:function(e){Object.defineProperty(this,t,{enumerable:!0,configurable:!0,writable:!0,value:e})}})},fix:function(e){return e[k.expando]?e:new k.Event(e)},special:{load:{noBubble:!0},click:{setup:function(e){var t=this||e;return pe.test(t.type)&&t.click&&A(t,"input")&&De(t,"click",ke),!1},trigger:function(e){var t=this||e;return pe.test(t.type)&&t.click&&A(t,"input")&&De(t,"click"),!0},_default:function(e){var t=e.target;return pe.test(t.type)&&t.click&&A(t,"input")&&Q.get(t,"click")||A(t,"a")}},beforeunload:{postDispatch:function(e){void 0!==e.result&&e.originalEvent&&(e.originalEvent.returnValue=e.result)}}}},k.removeEvent=function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n)},k.Event=function(e,t){if(!(this instanceof k.Event))return new k.Event(e,t);e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||void 0===e.defaultPrevented&&!1===e.returnValue?ke:Se,this.target=e.target&&3===e.target.nodeType?e.target.parentNode:e.target,this.currentTarget=e.currentTarget,this.relatedTarget=e.relatedTarget):this.type=e,t&&k.extend(this,t),this.timeStamp=e&&e.timeStamp||Date.now(),this[k.expando]=!0},k.Event.prototype={constructor:k.Event,isDefaultPrevented:Se,isPropagationStopped:Se,isImmediatePropagationStopped:Se,isSimulated:!1,preventDefault:function(){var e=this.originalEvent;this.isDefaultPrevented=ke,e&&!this.isSimulated&&e.preventDefault()},stopPropagation:function(){var e=this.originalEvent;this.isPropagationStopped=ke,e&&!this.isSimulated&&e.stopPropagation()},stopImmediatePropagation:function(){var e=this.originalEvent;this.isImmediatePropagationStopped=ke,e&&!this.isSimulated&&e.stopImmediatePropagation(),this.stopPropagation()}},k.each({altKey:!0,bubbles:!0,cancelable:!0,changedTouches:!0,ctrlKey:!0,detail:!0,eventPhase:!0,metaKey:!0,pageX:!0,pageY:!0,shiftKey:!0,view:!0,"char":!0,code:!0,charCode:!0,key:!0,keyCode:!0,button:!0,buttons:!0,clientX:!0,clientY:!0,offsetX:!0,offsetY:!0,pointerId:!0,pointerType:!0,screenX:!0,screenY:!0,targetTouches:!0,toElement:!0,touches:!0,which:function(e){var t=e.button;return null==e.which&&Te.test(e.type)?null!=e.charCode?e.charCode:e.keyCode:!e.which&&void 0!==t&&Ce.test(e.type)?1&t?1:2&t?3:4&t?2:0:e.which}},k.event.addProp),k.each({focus:"focusin",blur:"focusout"},function(e,t){k.event.special[e]={setup:function(){return De(this,e,Ne),!1},trigger:function(){return De(this,e),!0},delegateType:t}}),k.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(e,i){k.event.special[e]={delegateType:i,bindType:i,handle:function(e){var t,n=e.relatedTarget,r=e.handleObj;return n&&(n===this||k.contains(this,n))||(e.type=r.origType,t=r.handler.apply(this,arguments),e.type=i),t}}}),k.fn.extend({on:function(e,t,n,r){return Ae(this,e,t,n,r)},one:function(e,t,n,r){return Ae(this,e,t,n,r,1)},off:function(e,t,n){var r,i;if(e&&e.preventDefault&&e.handleObj)return r=e.handleObj,k(e.delegateTarget).off(r.namespace?r.origType+"."+r.namespace:r.origType,r.selector,r.handler),this;if("object"==typeof e){for(i in e)this.off(i,t,e[i]);return this}return!1!==t&&"function"!=typeof t||(n=t,t=void 0),!1===n&&(n=Se),this.each(function(){k.event.remove(this,e,n,t)})}});var je=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([a-z][^\/\0>\x20\t\r\n\f]*)[^>]*)\/>/gi,qe=/<script|<style|<link/i,Le=/checked\s*(?:[^=]|=\s*.checked.)/i,He=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g;function Oe(e,t){return A(e,"table")&&A(11!==t.nodeType?t:t.firstChild,"tr")&&k(e).children("tbody")[0]||e}function Pe(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function Re(e){return"true/"===(e.type||"").slice(0,5)?e.type=e.type.slice(5):e.removeAttribute("type"),e}function Me(e,t){var n,r,i,o,a,s,u,l;if(1===t.nodeType){if(Q.hasData(e)&&(o=Q.access(e),a=Q.set(t,o),l=o.events))for(i in delete a.handle,a.events={},l)for(n=0,r=l[i].length;n<r;n++)k.event.add(t,i,l[i][n]);J.hasData(e)&&(s=J.access(e),u=k.extend({},s),J.set(t,u))}}function Ie(n,r,i,o){r=g.apply([],r);var e,t,a,s,u,l,c=0,f=n.length,p=f-1,d=r[0],h=m(d);if(h||1<f&&"string"==typeof d&&!y.checkClone&&Le.test(d))return n.each(function(e){var t=n.eq(e);h&&(r[0]=d.call(this,e,t.html())),Ie(t,r,i,o)});if(f&&(t=(e=we(r,n[0].ownerDocument,!1,n,o)).firstChild,1===e.childNodes.length&&(e=t),t||o)){for(s=(a=k.map(ve(e,"script"),Pe)).length;c<f;c++)u=e,c!==p&&(u=k.clone(u,!0,!0),s&&k.merge(a,ve(u,"script"))),i.call(n[c],u,c);if(s)for(l=a[a.length-1].ownerDocument,k.map(a,Re),c=0;c<s;c++)u=a[c],he.test(u.type||"")&&!Q.access(u,"globalEval")&&k.contains(l,u)&&(u.src&&"module"!==(u.type||"").toLowerCase()?k._evalUrl&&!u.noModule&&k._evalUrl(u.src,{nonce:u.nonce||u.getAttribute("nonce")}):b(u.textContent.replace(He,""),u,l))}return n}function We(e,t,n){for(var r,i=t?k.filter(t,e):e,o=0;null!=(r=i[o]);o++)n||1!==r.nodeType||k.cleanData(ve(r)),r.parentNode&&(n&&oe(r)&&ye(ve(r,"script")),r.parentNode.removeChild(r));return e}k.extend({htmlPrefilter:function(e){return e.replace(je,"<$1></$2>")},clone:function(e,t,n){var r,i,o,a,s,u,l,c=e.cloneNode(!0),f=oe(e);if(!(y.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||k.isXMLDoc(e)))for(a=ve(c),r=0,i=(o=ve(e)).length;r<i;r++)s=o[r],u=a[r],void 0,"input"===(l=u.nodeName.toLowerCase())&&pe.test(s.type)?u.checked=s.checked:"input"!==l&&"textarea"!==l||(u.defaultValue=s.defaultValue);if(t)if(n)for(o=o||ve(e),a=a||ve(c),r=0,i=o.length;r<i;r++)Me(o[r],a[r]);else Me(e,c);return 0<(a=ve(c,"script")).length&&ye(a,!f&&ve(e,"script")),c},cleanData:function(e){for(var t,n,r,i=k.event.special,o=0;void 0!==(n=e[o]);o++)if(G(n)){if(t=n[Q.expando]){if(t.events)for(r in t.events)i[r]?k.event.remove(n,r):k.removeEvent(n,r,t.handle);n[Q.expando]=void 0}n[J.expando]&&(n[J.expando]=void 0)}}}),k.fn.extend({detach:function(e){return We(this,e,!0)},remove:function(e){return We(this,e)},text:function(e){return _(this,function(e){return void 0===e?k.text(this):this.empty().each(function(){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||(this.textContent=e)})},null,e,arguments.length)},append:function(){return Ie(this,arguments,function(e){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||Oe(this,e).appendChild(e)})},prepend:function(){return Ie(this,arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=Oe(this,e);t.insertBefore(e,t.firstChild)}})},before:function(){return Ie(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return Ie(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},empty:function(){for(var e,t=0;null!=(e=this[t]);t++)1===e.nodeType&&(k.cleanData(ve(e,!1)),e.textContent="");return this},clone:function(e,t){return e=null!=e&&e,t=null==t?e:t,this.map(function(){return k.clone(this,e,t)})},html:function(e){return _(this,function(e){var t=this[0]||{},n=0,r=this.length;if(void 0===e&&1===t.nodeType)return t.innerHTML;if("string"==typeof e&&!qe.test(e)&&!ge[(de.exec(e)||["",""])[1].toLowerCase()]){e=k.htmlPrefilter(e);try{for(;n<r;n++)1===(t=this[n]||{}).nodeType&&(k.cleanData(ve(t,!1)),t.innerHTML=e);t=0}catch(e){}}t&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(){var n=[];return Ie(this,arguments,function(e){var t=this.parentNode;k.inArray(this,n)<0&&(k.cleanData(ve(this)),t&&t.replaceChild(e,this))},n)}}),k.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,a){k.fn[e]=function(e){for(var t,n=[],r=k(e),i=r.length-1,o=0;o<=i;o++)t=o===i?this:this.clone(!0),k(r[o])[a](t),u.apply(n,t.get());return this.pushStack(n)}});var $e=new RegExp("^("+te+")(?!px)[a-z%]+$","i"),Fe=function(e){var t=e.ownerDocument.defaultView;return t&&t.opener||(t=C),t.getComputedStyle(e)},Be=new RegExp(re.join("|"),"i");function _e(e,t,n){var r,i,o,a,s=e.style;return(n=n||Fe(e))&&(""!==(a=n.getPropertyValue(t)||n[t])||oe(e)||(a=k.style(e,t)),!y.pixelBoxStyles()&&$e.test(a)&&Be.test(t)&&(r=s.width,i=s.minWidth,o=s.maxWidth,s.minWidth=s.maxWidth=s.width=a,a=n.width,s.width=r,s.minWidth=i,s.maxWidth=o)),void 0!==a?a+"":a}function ze(e,t){return{get:function(){if(!e())return(this.get=t).apply(this,arguments);delete this.get}}}!function(){function e(){if(u){s.style.cssText="position:absolute;left:-11111px;width:60px;margin-top:1px;padding:0;border:0",u.style.cssText="position:relative;display:block;box-sizing:border-box;overflow:scroll;margin:auto;border:1px;padding:1px;width:60%;top:1%",ie.appendChild(s).appendChild(u);var e=C.getComputedStyle(u);n="1%"!==e.top,a=12===t(e.marginLeft),u.style.right="60%",o=36===t(e.right),r=36===t(e.width),u.style.position="absolute",i=12===t(u.offsetWidth/3),ie.removeChild(s),u=null}}function t(e){return Math.round(parseFloat(e))}var n,r,i,o,a,s=E.createElement("div"),u=E.createElement("div");u.style&&(u.style.backgroundClip="content-box",u.cloneNode(!0).style.backgroundClip="",y.clearCloneStyle="content-box"===u.style.backgroundClip,k.extend(y,{boxSizingReliable:function(){return e(),r},pixelBoxStyles:function(){return e(),o},pixelPosition:function(){return e(),n},reliableMarginLeft:function(){return e(),a},scrollboxSize:function(){return e(),i}}))}();var Ue=["Webkit","Moz","ms"],Xe=E.createElement("div").style,Ve={};function Ge(e){var t=k.cssProps[e]||Ve[e];return t||(e in Xe?e:Ve[e]=function(e){var t=e[0].toUpperCase()+e.slice(1),n=Ue.length;while(n--)if((e=Ue[n]+t)in Xe)return e}(e)||e)}var Ye=/^(none|table(?!-c[ea]).+)/,Qe=/^--/,Je={position:"absolute",visibility:"hidden",display:"block"},Ke={letterSpacing:"0",fontWeight:"400"};function Ze(e,t,n){var r=ne.exec(t);return r?Math.max(0,r[2]-(n||0))+(r[3]||"px"):t}function et(e,t,n,r,i,o){var a="width"===t?1:0,s=0,u=0;if(n===(r?"border":"content"))return 0;for(;a<4;a+=2)"margin"===n&&(u+=k.css(e,n+re[a],!0,i)),r?("content"===n&&(u-=k.css(e,"padding"+re[a],!0,i)),"margin"!==n&&(u-=k.css(e,"border"+re[a]+"Width",!0,i))):(u+=k.css(e,"padding"+re[a],!0,i),"padding"!==n?u+=k.css(e,"border"+re[a]+"Width",!0,i):s+=k.css(e,"border"+re[a]+"Width",!0,i));return!r&&0<=o&&(u+=Math.max(0,Math.ceil(e["offset"+t[0].toUpperCase()+t.slice(1)]-o-u-s-.5))||0),u}function tt(e,t,n){var r=Fe(e),i=(!y.boxSizingReliable()||n)&&"border-box"===k.css(e,"boxSizing",!1,r),o=i,a=_e(e,t,r),s="offset"+t[0].toUpperCase()+t.slice(1);if($e.test(a)){if(!n)return a;a="auto"}return(!y.boxSizingReliable()&&i||"auto"===a||!parseFloat(a)&&"inline"===k.css(e,"display",!1,r))&&e.getClientRects().length&&(i="border-box"===k.css(e,"boxSizing",!1,r),(o=s in e)&&(a=e[s])),(a=parseFloat(a)||0)+et(e,t,n||(i?"border":"content"),o,r,a)+"px"}function nt(e,t,n,r,i){return new nt.prototype.init(e,t,n,r,i)}k.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=_e(e,"opacity");return""===n?"1":n}}}},cssNumber:{animationIterationCount:!0,columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,gridArea:!0,gridColumn:!0,gridColumnEnd:!0,gridColumnStart:!0,gridRow:!0,gridRowEnd:!0,gridRowStart:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{},style:function(e,t,n,r){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var i,o,a,s=V(t),u=Qe.test(t),l=e.style;if(u||(t=Ge(s)),a=k.cssHooks[t]||k.cssHooks[s],void 0===n)return a&&"get"in a&&void 0!==(i=a.get(e,!1,r))?i:l[t];"string"===(o=typeof n)&&(i=ne.exec(n))&&i[1]&&(n=le(e,t,i),o="number"),null!=n&&n==n&&("number"!==o||u||(n+=i&&i[3]||(k.cssNumber[s]?"":"px")),y.clearCloneStyle||""!==n||0!==t.indexOf("background")||(l[t]="inherit"),a&&"set"in a&&void 0===(n=a.set(e,n,r))||(u?l.setProperty(t,n):l[t]=n))}},css:function(e,t,n,r){var i,o,a,s=V(t);return Qe.test(t)||(t=Ge(s)),(a=k.cssHooks[t]||k.cssHooks[s])&&"get"in a&&(i=a.get(e,!0,n)),void 0===i&&(i=_e(e,t,r)),"normal"===i&&t in Ke&&(i=Ke[t]),""===n||n?(o=parseFloat(i),!0===n||isFinite(o)?o||0:i):i}}),k.each(["height","width"],function(e,u){k.cssHooks[u]={get:function(e,t,n){if(t)return!Ye.test(k.css(e,"display"))||e.getClientRects().length&&e.getBoundingClientRect().width?tt(e,u,n):ue(e,Je,function(){return tt(e,u,n)})},set:function(e,t,n){var r,i=Fe(e),o=!y.scrollboxSize()&&"absolute"===i.position,a=(o||n)&&"border-box"===k.css(e,"boxSizing",!1,i),s=n?et(e,u,n,a,i):0;return a&&o&&(s-=Math.ceil(e["offset"+u[0].toUpperCase()+u.slice(1)]-parseFloat(i[u])-et(e,u,"border",!1,i)-.5)),s&&(r=ne.exec(t))&&"px"!==(r[3]||"px")&&(e.style[u]=t,t=k.css(e,u)),Ze(0,t,s)}}}),k.cssHooks.marginLeft=ze(y.reliableMarginLeft,function(e,t){if(t)return(parseFloat(_e(e,"marginLeft"))||e.getBoundingClientRect().left-ue(e,{marginLeft:0},function(){return e.getBoundingClientRect().left}))+"px"}),k.each({margin:"",padding:"",border:"Width"},function(i,o){k.cssHooks[i+o]={expand:function(e){for(var t=0,n={},r="string"==typeof e?e.split(" "):[e];t<4;t++)n[i+re[t]+o]=r[t]||r[t-2]||r[0];return n}},"margin"!==i&&(k.cssHooks[i+o].set=Ze)}),k.fn.extend({css:function(e,t){return _(this,function(e,t,n){var r,i,o={},a=0;if(Array.isArray(t)){for(r=Fe(e),i=t.length;a<i;a++)o[t[a]]=k.css(e,t[a],!1,r);return o}return void 0!==n?k.style(e,t,n):k.css(e,t)},e,t,1<arguments.length)}}),((k.Tween=nt).prototype={constructor:nt,init:function(e,t,n,r,i,o){this.elem=e,this.prop=n,this.easing=i||k.easing._default,this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=o||(k.cssNumber[n]?"":"px")},cur:function(){var e=nt.propHooks[this.prop];return e&&e.get?e.get(this):nt.propHooks._default.get(this)},run:function(e){var t,n=nt.propHooks[this.prop];return this.options.duration?this.pos=t=k.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):nt.propHooks._default.set(this),this}}).init.prototype=nt.prototype,(nt.propHooks={_default:{get:function(e){var t;return 1!==e.elem.nodeType||null!=e.elem[e.prop]&&null==e.elem.style[e.prop]?e.elem[e.prop]:(t=k.css(e.elem,e.prop,""))&&"auto"!==t?t:0},set:function(e){k.fx.step[e.prop]?k.fx.step[e.prop](e):1!==e.elem.nodeType||!k.cssHooks[e.prop]&&null==e.elem.style[Ge(e.prop)]?e.elem[e.prop]=e.now:k.style(e.elem,e.prop,e.now+e.unit)}}}).scrollTop=nt.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},k.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2},_default:"swing"},k.fx=nt.prototype.init,k.fx.step={};var rt,it,ot,at,st=/^(?:toggle|show|hide)$/,ut=/queueHooks$/;function lt(){it&&(!1===E.hidden&&C.requestAnimationFrame?C.requestAnimationFrame(lt):C.setTimeout(lt,k.fx.interval),k.fx.tick())}function ct(){return C.setTimeout(function(){rt=void 0}),rt=Date.now()}function ft(e,t){var n,r=0,i={height:e};for(t=t?1:0;r<4;r+=2-t)i["margin"+(n=re[r])]=i["padding"+n]=e;return t&&(i.opacity=i.width=e),i}function pt(e,t,n){for(var r,i=(dt.tweeners[t]||[]).concat(dt.tweeners["*"]),o=0,a=i.length;o<a;o++)if(r=i[o].call(n,t,e))return r}function dt(o,e,t){var n,a,r=0,i=dt.prefilters.length,s=k.Deferred().always(function(){delete u.elem}),u=function(){if(a)return!1;for(var e=rt||ct(),t=Math.max(0,l.startTime+l.duration-e),n=1-(t/l.duration||0),r=0,i=l.tweens.length;r<i;r++)l.tweens[r].run(n);return s.notifyWith(o,[l,n,t]),n<1&&i?t:(i||s.notifyWith(o,[l,1,0]),s.resolveWith(o,[l]),!1)},l=s.promise({elem:o,props:k.extend({},e),opts:k.extend(!0,{specialEasing:{},easing:k.easing._default},t),originalProperties:e,originalOptions:t,startTime:rt||ct(),duration:t.duration,tweens:[],createTween:function(e,t){var n=k.Tween(o,l.opts,e,t,l.opts.specialEasing[e]||l.opts.easing);return l.tweens.push(n),n},stop:function(e){var t=0,n=e?l.tweens.length:0;if(a)return this;for(a=!0;t<n;t++)l.tweens[t].run(1);return e?(s.notifyWith(o,[l,1,0]),s.resolveWith(o,[l,e])):s.rejectWith(o,[l,e]),this}}),c=l.props;for(!function(e,t){var n,r,i,o,a;for(n in e)if(i=t[r=V(n)],o=e[n],Array.isArray(o)&&(i=o[1],o=e[n]=o[0]),n!==r&&(e[r]=o,delete e[n]),(a=k.cssHooks[r])&&"expand"in a)for(n in o=a.expand(o),delete e[r],o)n in e||(e[n]=o[n],t[n]=i);else t[r]=i}(c,l.opts.specialEasing);r<i;r++)if(n=dt.prefilters[r].call(l,o,c,l.opts))return m(n.stop)&&(k._queueHooks(l.elem,l.opts.queue).stop=n.stop.bind(n)),n;return k.map(c,pt,l),m(l.opts.start)&&l.opts.start.call(o,l),l.progress(l.opts.progress).done(l.opts.done,l.opts.complete).fail(l.opts.fail).always(l.opts.always),k.fx.timer(k.extend(u,{elem:o,anim:l,queue:l.opts.queue})),l}k.Animation=k.extend(dt,{tweeners:{"*":[function(e,t){var n=this.createTween(e,t);return le(n.elem,e,ne.exec(t),n),n}]},tweener:function(e,t){m(e)?(t=e,e=["*"]):e=e.match(R);for(var n,r=0,i=e.length;r<i;r++)n=e[r],dt.tweeners[n]=dt.tweeners[n]||[],dt.tweeners[n].unshift(t)},prefilters:[function(e,t,n){var r,i,o,a,s,u,l,c,f="width"in t||"height"in t,p=this,d={},h=e.style,g=e.nodeType&&se(e),v=Q.get(e,"fxshow");for(r in n.queue||(null==(a=k._queueHooks(e,"fx")).unqueued&&(a.unqueued=0,s=a.empty.fire,a.empty.fire=function(){a.unqueued||s()}),a.unqueued++,p.always(function(){p.always(function(){a.unqueued--,k.queue(e,"fx").length||a.empty.fire()})})),t)if(i=t[r],st.test(i)){if(delete t[r],o=o||"toggle"===i,i===(g?"hide":"show")){if("show"!==i||!v||void 0===v[r])continue;g=!0}d[r]=v&&v[r]||k.style(e,r)}if((u=!k.isEmptyObject(t))||!k.isEmptyObject(d))for(r in f&&1===e.nodeType&&(n.overflow=[h.overflow,h.overflowX,h.overflowY],null==(l=v&&v.display)&&(l=Q.get(e,"display")),"none"===(c=k.css(e,"display"))&&(l?c=l:(fe([e],!0),l=e.style.display||l,c=k.css(e,"display"),fe([e]))),("inline"===c||"inline-block"===c&&null!=l)&&"none"===k.css(e,"float")&&(u||(p.done(function(){h.display=l}),null==l&&(c=h.display,l="none"===c?"":c)),h.display="inline-block")),n.overflow&&(h.overflow="hidden",p.always(function(){h.overflow=n.overflow[0],h.overflowX=n.overflow[1],h.overflowY=n.overflow[2]})),u=!1,d)u||(v?"hidden"in v&&(g=v.hidden):v=Q.access(e,"fxshow",{display:l}),o&&(v.hidden=!g),g&&fe([e],!0),p.done(function(){for(r in g||fe([e]),Q.remove(e,"fxshow"),d)k.style(e,r,d[r])})),u=pt(g?v[r]:0,r,p),r in v||(v[r]=u.start,g&&(u.end=u.start,u.start=0))}],prefilter:function(e,t){t?dt.prefilters.unshift(e):dt.prefilters.push(e)}}),k.speed=function(e,t,n){var r=e&&"object"==typeof e?k.extend({},e):{complete:n||!n&&t||m(e)&&e,duration:e,easing:n&&t||t&&!m(t)&&t};return k.fx.off?r.duration=0:"number"!=typeof r.duration&&(r.duration in k.fx.speeds?r.duration=k.fx.speeds[r.duration]:r.duration=k.fx.speeds._default),null!=r.queue&&!0!==r.queue||(r.queue="fx"),r.old=r.complete,r.complete=function(){m(r.old)&&r.old.call(this),r.queue&&k.dequeue(this,r.queue)},r},k.fn.extend({fadeTo:function(e,t,n,r){return this.filter(se).css("opacity",0).show().end().animate({opacity:t},e,n,r)},animate:function(t,e,n,r){var i=k.isEmptyObject(t),o=k.speed(e,n,r),a=function(){var e=dt(this,k.extend({},t),o);(i||Q.get(this,"finish"))&&e.stop(!0)};return a.finish=a,i||!1===o.queue?this.each(a):this.queue(o.queue,a)},stop:function(i,e,o){var a=function(e){var t=e.stop;delete e.stop,t(o)};return"string"!=typeof i&&(o=e,e=i,i=void 0),e&&!1!==i&&this.queue(i||"fx",[]),this.each(function(){var e=!0,t=null!=i&&i+"queueHooks",n=k.timers,r=Q.get(this);if(t)r[t]&&r[t].stop&&a(r[t]);else for(t in r)r[t]&&r[t].stop&&ut.test(t)&&a(r[t]);for(t=n.length;t--;)n[t].elem!==this||null!=i&&n[t].queue!==i||(n[t].anim.stop(o),e=!1,n.splice(t,1));!e&&o||k.dequeue(this,i)})},finish:function(a){return!1!==a&&(a=a||"fx"),this.each(function(){var e,t=Q.get(this),n=t[a+"queue"],r=t[a+"queueHooks"],i=k.timers,o=n?n.length:0;for(t.finish=!0,k.queue(this,a,[]),r&&r.stop&&r.stop.call(this,!0),e=i.length;e--;)i[e].elem===this&&i[e].queue===a&&(i[e].anim.stop(!0),i.splice(e,1));for(e=0;e<o;e++)n[e]&&n[e].finish&&n[e].finish.call(this);delete t.finish})}}),k.each(["toggle","show","hide"],function(e,r){var i=k.fn[r];k.fn[r]=function(e,t,n){return null==e||"boolean"==typeof e?i.apply(this,arguments):this.animate(ft(r,!0),e,t,n)}}),k.each({slideDown:ft("show"),slideUp:ft("hide"),slideToggle:ft("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(e,r){k.fn[e]=function(e,t,n){return this.animate(r,e,t,n)}}),k.timers=[],k.fx.tick=function(){var e,t=0,n=k.timers;for(rt=Date.now();t<n.length;t++)(e=n[t])()||n[t]!==e||n.splice(t--,1);n.length||k.fx.stop(),rt=void 0},k.fx.timer=function(e){k.timers.push(e),k.fx.start()},k.fx.interval=13,k.fx.start=function(){it||(it=!0,lt())},k.fx.stop=function(){it=null},k.fx.speeds={slow:600,fast:200,_default:400},k.fn.delay=function(r,e){return r=k.fx&&k.fx.speeds[r]||r,e=e||"fx",this.queue(e,function(e,t){var n=C.setTimeout(e,r);t.stop=function(){C.clearTimeout(n)}})},ot=E.createElement("input"),at=E.createElement("select").appendChild(E.createElement("option")),ot.type="checkbox",y.checkOn=""!==ot.value,y.optSelected=at.selected,(ot=E.createElement("input")).value="t",ot.type="radio",y.radioValue="t"===ot.value;var ht,gt=k.expr.attrHandle;k.fn.extend({attr:function(e,t){return _(this,k.attr,e,t,1<arguments.length)},removeAttr:function(e){return this.each(function(){k.removeAttr(this,e)})}}),k.extend({attr:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return"undefined"==typeof e.getAttribute?k.prop(e,t,n):(1===o&&k.isXMLDoc(e)||(i=k.attrHooks[t.toLowerCase()]||(k.expr.match.bool.test(t)?ht:void 0)),void 0!==n?null===n?void k.removeAttr(e,t):i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:(e.setAttribute(t,n+""),n):i&&"get"in i&&null!==(r=i.get(e,t))?r:null==(r=k.find.attr(e,t))?void 0:r)},attrHooks:{type:{set:function(e,t){if(!y.radioValue&&"radio"===t&&A(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},removeAttr:function(e,t){var n,r=0,i=t&&t.match(R);if(i&&1===e.nodeType)while(n=i[r++])e.removeAttribute(n)}}),ht={set:function(e,t,n){return!1===t?k.removeAttr(e,n):e.setAttribute(n,n),n}},k.each(k.expr.match.bool.source.match(/\w+/g),function(e,t){var a=gt[t]||k.find.attr;gt[t]=function(e,t,n){var r,i,o=t.toLowerCase();return n||(i=gt[o],gt[o]=r,r=null!=a(e,t,n)?o:null,gt[o]=i),r}});var vt=/^(?:input|select|textarea|button)$/i,yt=/^(?:a|area)$/i;function mt(e){return(e.match(R)||[]).join(" ")}function xt(e){return e.getAttribute&&e.getAttribute("class")||""}function bt(e){return Array.isArray(e)?e:"string"==typeof e&&e.match(R)||[]}k.fn.extend({prop:function(e,t){return _(this,k.prop,e,t,1<arguments.length)},removeProp:function(e){return this.each(function(){delete this[k.propFix[e]||e]})}}),k.extend({prop:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return 1===o&&k.isXMLDoc(e)||(t=k.propFix[t]||t,i=k.propHooks[t]),void 0!==n?i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:e[t]=n:i&&"get"in i&&null!==(r=i.get(e,t))?r:e[t]},propHooks:{tabIndex:{get:function(e){var t=k.find.attr(e,"tabindex");return t?parseInt(t,10):vt.test(e.nodeName)||yt.test(e.nodeName)&&e.href?0:-1}}},propFix:{"for":"htmlFor","class":"className"}}),y.optSelected||(k.propHooks.selected={get:function(e){var t=e.parentNode;return t&&t.parentNode&&t.parentNode.selectedIndex,null},set:function(e){var t=e.parentNode;t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex)}}),k.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){k.propFix[this.toLowerCase()]=this}),k.fn.extend({addClass:function(t){var e,n,r,i,o,a,s,u=0;if(m(t))return this.each(function(e){k(this).addClass(t.call(this,e,xt(this)))});if((e=bt(t)).length)while(n=this[u++])if(i=xt(n),r=1===n.nodeType&&" "+mt(i)+" "){a=0;while(o=e[a++])r.indexOf(" "+o+" ")<0&&(r+=o+" ");i!==(s=mt(r))&&n.setAttribute("class",s)}return this},removeClass:function(t){var e,n,r,i,o,a,s,u=0;if(m(t))return this.each(function(e){k(this).removeClass(t.call(this,e,xt(this)))});if(!arguments.length)return this.attr("class","");if((e=bt(t)).length)while(n=this[u++])if(i=xt(n),r=1===n.nodeType&&" "+mt(i)+" "){a=0;while(o=e[a++])while(-1<r.indexOf(" "+o+" "))r=r.replace(" "+o+" "," ");i!==(s=mt(r))&&n.setAttribute("class",s)}return this},toggleClass:function(i,t){var o=typeof i,a="string"===o||Array.isArray(i);return"boolean"==typeof t&&a?t?this.addClass(i):this.removeClass(i):m(i)?this.each(function(e){k(this).toggleClass(i.call(this,e,xt(this),t),t)}):this.each(function(){var e,t,n,r;if(a){t=0,n=k(this),r=bt(i);while(e=r[t++])n.hasClass(e)?n.removeClass(e):n.addClass(e)}else void 0!==i&&"boolean"!==o||((e=xt(this))&&Q.set(this,"__className__",e),this.setAttribute&&this.setAttribute("class",e||!1===i?"":Q.get(this,"__className__")||""))})},hasClass:function(e){var t,n,r=0;t=" "+e+" ";while(n=this[r++])if(1===n.nodeType&&-1<(" "+mt(xt(n))+" ").indexOf(t))return!0;return!1}});var wt=/\r/g;k.fn.extend({val:function(n){var r,e,i,t=this[0];return arguments.length?(i=m(n),this.each(function(e){var t;1===this.nodeType&&(null==(t=i?n.call(this,e,k(this).val()):n)?t="":"number"==typeof t?t+="":Array.isArray(t)&&(t=k.map(t,function(e){return null==e?"":e+""})),(r=k.valHooks[this.type]||k.valHooks[this.nodeName.toLowerCase()])&&"set"in r&&void 0!==r.set(this,t,"value")||(this.value=t))})):t?(r=k.valHooks[t.type]||k.valHooks[t.nodeName.toLowerCase()])&&"get"in r&&void 0!==(e=r.get(t,"value"))?e:"string"==typeof(e=t.value)?e.replace(wt,""):null==e?"":e:void 0}}),k.extend({valHooks:{option:{get:function(e){var t=k.find.attr(e,"value");return null!=t?t:mt(k.text(e))}},select:{get:function(e){var t,n,r,i=e.options,o=e.selectedIndex,a="select-one"===e.type,s=a?null:[],u=a?o+1:i.length;for(r=o<0?u:a?o:0;r<u;r++)if(((n=i[r]).selected||r===o)&&!n.disabled&&(!n.parentNode.disabled||!A(n.parentNode,"optgroup"))){if(t=k(n).val(),a)return t;s.push(t)}return s},set:function(e,t){var n,r,i=e.options,o=k.makeArray(t),a=i.length;while(a--)((r=i[a]).selected=-1<k.inArray(k.valHooks.option.get(r),o))&&(n=!0);return n||(e.selectedIndex=-1),o}}}}),k.each(["radio","checkbox"],function(){k.valHooks[this]={set:function(e,t){if(Array.isArray(t))return e.checked=-1<k.inArray(k(e).val(),t)}},y.checkOn||(k.valHooks[this].get=function(e){return null===e.getAttribute("value")?"on":e.value})}),y.focusin="onfocusin"in C;var Tt=/^(?:focusinfocus|focusoutblur)$/,Ct=function(e){e.stopPropagation()};k.extend(k.event,{trigger:function(e,t,n,r){var i,o,a,s,u,l,c,f,p=[n||E],d=v.call(e,"type")?e.type:e,h=v.call(e,"namespace")?e.namespace.split("."):[];if(o=f=a=n=n||E,3!==n.nodeType&&8!==n.nodeType&&!Tt.test(d+k.event.triggered)&&(-1<d.indexOf(".")&&(d=(h=d.split(".")).shift(),h.sort()),u=d.indexOf(":")<0&&"on"+d,(e=e[k.expando]?e:new k.Event(d,"object"==typeof e&&e)).isTrigger=r?2:3,e.namespace=h.join("."),e.rnamespace=e.namespace?new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,e.result=void 0,e.target||(e.target=n),t=null==t?[e]:k.makeArray(t,[e]),c=k.event.special[d]||{},r||!c.trigger||!1!==c.trigger.apply(n,t))){if(!r&&!c.noBubble&&!x(n)){for(s=c.delegateType||d,Tt.test(s+d)||(o=o.parentNode);o;o=o.parentNode)p.push(o),a=o;a===(n.ownerDocument||E)&&p.push(a.defaultView||a.parentWindow||C)}i=0;while((o=p[i++])&&!e.isPropagationStopped())f=o,e.type=1<i?s:c.bindType||d,(l=(Q.get(o,"events")||{})[e.type]&&Q.get(o,"handle"))&&l.apply(o,t),(l=u&&o[u])&&l.apply&&G(o)&&(e.result=l.apply(o,t),!1===e.result&&e.preventDefault());return e.type=d,r||e.isDefaultPrevented()||c._default&&!1!==c._default.apply(p.pop(),t)||!G(n)||u&&m(n[d])&&!x(n)&&((a=n[u])&&(n[u]=null),k.event.triggered=d,e.isPropagationStopped()&&f.addEventListener(d,Ct),n[d](),e.isPropagationStopped()&&f.removeEventListener(d,Ct),k.event.triggered=void 0,a&&(n[u]=a)),e.result}},simulate:function(e,t,n){var r=k.extend(new k.Event,n,{type:e,isSimulated:!0});k.event.trigger(r,null,t)}}),k.fn.extend({trigger:function(e,t){return this.each(function(){k.event.trigger(e,t,this)})},triggerHandler:function(e,t){var n=this[0];if(n)return k.event.trigger(e,t,n,!0)}}),y.focusin||k.each({focus:"focusin",blur:"focusout"},function(n,r){var i=function(e){k.event.simulate(r,e.target,k.event.fix(e))};k.event.special[r]={setup:function(){var e=this.ownerDocument||this,t=Q.access(e,r);t||e.addEventListener(n,i,!0),Q.access(e,r,(t||0)+1)},teardown:function(){var e=this.ownerDocument||this,t=Q.access(e,r)-1;t?Q.access(e,r,t):(e.removeEventListener(n,i,!0),Q.remove(e,r))}}});var Et=C.location,kt=Date.now(),St=/\?/;k.parseXML=function(e){var t;if(!e||"string"!=typeof e)return null;try{t=(new C.DOMParser).parseFromString(e,"text/xml")}catch(e){t=void 0}return t&&!t.getElementsByTagName("parsererror").length||k.error("Invalid XML: "+e),t};var Nt=/\[\]$/,At=/\r?\n/g,Dt=/^(?:submit|button|image|reset|file)$/i,jt=/^(?:input|select|textarea|keygen)/i;function qt(n,e,r,i){var t;if(Array.isArray(e))k.each(e,function(e,t){r||Nt.test(n)?i(n,t):qt(n+"["+("object"==typeof t&&null!=t?e:"")+"]",t,r,i)});else if(r||"object"!==w(e))i(n,e);else for(t in e)qt(n+"["+t+"]",e[t],r,i)}k.param=function(e,t){var n,r=[],i=function(e,t){var n=m(t)?t():t;r[r.length]=encodeURIComponent(e)+"="+encodeURIComponent(null==n?"":n)};if(null==e)return"";if(Array.isArray(e)||e.jquery&&!k.isPlainObject(e))k.each(e,function(){i(this.name,this.value)});else for(n in e)qt(n,e[n],t,i);return r.join("&")},k.fn.extend({serialize:function(){return k.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=k.prop(this,"elements");return e?k.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!k(this).is(":disabled")&&jt.test(this.nodeName)&&!Dt.test(e)&&(this.checked||!pe.test(e))}).map(function(e,t){var n=k(this).val();return null==n?null:Array.isArray(n)?k.map(n,function(e){return{name:t.name,value:e.replace(At,"\r\n")}}):{name:t.name,value:n.replace(At,"\r\n")}}).get()}});var Lt=/%20/g,Ht=/#.*$/,Ot=/([?&])_=[^&]*/,Pt=/^(.*?):[ \t]*([^\r\n]*)$/gm,Rt=/^(?:GET|HEAD)$/,Mt=/^\/\//,It={},Wt={},$t="*/".concat("*"),Ft=E.createElement("a");function Bt(o){return function(e,t){"string"!=typeof e&&(t=e,e="*");var n,r=0,i=e.toLowerCase().match(R)||[];if(m(t))while(n=i[r++])"+"===n[0]?(n=n.slice(1)||"*",(o[n]=o[n]||[]).unshift(t)):(o[n]=o[n]||[]).push(t)}}function _t(t,i,o,a){var s={},u=t===Wt;function l(e){var r;return s[e]=!0,k.each(t[e]||[],function(e,t){var n=t(i,o,a);return"string"!=typeof n||u||s[n]?u?!(r=n):void 0:(i.dataTypes.unshift(n),l(n),!1)}),r}return l(i.dataTypes[0])||!s["*"]&&l("*")}function zt(e,t){var n,r,i=k.ajaxSettings.flatOptions||{};for(n in t)void 0!==t[n]&&((i[n]?e:r||(r={}))[n]=t[n]);return r&&k.extend(!0,e,r),e}Ft.href=Et.href,k.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:Et.href,type:"GET",isLocal:/^(?:about|app|app-storage|.+-extension|file|res|widget):$/.test(Et.protocol),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":$t,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/\bxml\b/,html:/\bhtml/,json:/\bjson\b/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":JSON.parse,"text xml":k.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?zt(zt(e,k.ajaxSettings),t):zt(k.ajaxSettings,e)},ajaxPrefilter:Bt(It),ajaxTransport:Bt(Wt),ajax:function(e,t){"object"==typeof e&&(t=e,e=void 0),t=t||{};var c,f,p,n,d,r,h,g,i,o,v=k.ajaxSetup({},t),y=v.context||v,m=v.context&&(y.nodeType||y.jquery)?k(y):k.event,x=k.Deferred(),b=k.Callbacks("once memory"),w=v.statusCode||{},a={},s={},u="canceled",T={readyState:0,getResponseHeader:function(e){var t;if(h){if(!n){n={};while(t=Pt.exec(p))n[t[1].toLowerCase()+" "]=(n[t[1].toLowerCase()+" "]||[]).concat(t[2])}t=n[e.toLowerCase()+" "]}return null==t?null:t.join(", ")},getAllResponseHeaders:function(){return h?p:null},setRequestHeader:function(e,t){return null==h&&(e=s[e.toLowerCase()]=s[e.toLowerCase()]||e,a[e]=t),this},overrideMimeType:function(e){return null==h&&(v.mimeType=e),this},statusCode:function(e){var t;if(e)if(h)T.always(e[T.status]);else for(t in e)w[t]=[w[t],e[t]];return this},abort:function(e){var t=e||u;return c&&c.abort(t),l(0,t),this}};if(x.promise(T),v.url=((e||v.url||Et.href)+"").replace(Mt,Et.protocol+"//"),v.type=t.method||t.type||v.method||v.type,v.dataTypes=(v.dataType||"*").toLowerCase().match(R)||[""],null==v.crossDomain){r=E.createElement("a");try{r.href=v.url,r.href=r.href,v.crossDomain=Ft.protocol+"//"+Ft.host!=r.protocol+"//"+r.host}catch(e){v.crossDomain=!0}}if(v.data&&v.processData&&"string"!=typeof v.data&&(v.data=k.param(v.data,v.traditional)),_t(It,v,t,T),h)return T;for(i in(g=k.event&&v.global)&&0==k.active++&&k.event.trigger("ajaxStart"),v.type=v.type.toUpperCase(),v.hasContent=!Rt.test(v.type),f=v.url.replace(Ht,""),v.hasContent?v.data&&v.processData&&0===(v.contentType||"").indexOf("application/x-www-form-urlencoded")&&(v.data=v.data.replace(Lt,"+")):(o=v.url.slice(f.length),v.data&&(v.processData||"string"==typeof v.data)&&(f+=(St.test(f)?"&":"?")+v.data,delete v.data),!1===v.cache&&(f=f.replace(Ot,"$1"),o=(St.test(f)?"&":"?")+"_="+kt+++o),v.url=f+o),v.ifModified&&(k.lastModified[f]&&T.setRequestHeader("If-Modified-Since",k.lastModified[f]),k.etag[f]&&T.setRequestHeader("If-None-Match",k.etag[f])),(v.data&&v.hasContent&&!1!==v.contentType||t.contentType)&&T.setRequestHeader("Content-Type",v.contentType),T.setRequestHeader("Accept",v.dataTypes[0]&&v.accepts[v.dataTypes[0]]?v.accepts[v.dataTypes[0]]+("*"!==v.dataTypes[0]?", "+$t+"; q=0.01":""):v.accepts["*"]),v.headers)T.setRequestHeader(i,v.headers[i]);if(v.beforeSend&&(!1===v.beforeSend.call(y,T,v)||h))return T.abort();if(u="abort",b.add(v.complete),T.done(v.success),T.fail(v.error),c=_t(Wt,v,t,T)){if(T.readyState=1,g&&m.trigger("ajaxSend",[T,v]),h)return T;v.async&&0<v.timeout&&(d=C.setTimeout(function(){T.abort("timeout")},v.timeout));try{h=!1,c.send(a,l)}catch(e){if(h)throw e;l(-1,e)}}else l(-1,"No Transport");function l(e,t,n,r){var i,o,a,s,u,l=t;h||(h=!0,d&&C.clearTimeout(d),c=void 0,p=r||"",T.readyState=0<e?4:0,i=200<=e&&e<300||304===e,n&&(s=function(e,t,n){var r,i,o,a,s=e.contents,u=e.dataTypes;while("*"===u[0])u.shift(),void 0===r&&(r=e.mimeType||t.getResponseHeader("Content-Type"));if(r)for(i in s)if(s[i]&&s[i].test(r)){u.unshift(i);break}if(u[0]in n)o=u[0];else{for(i in n){if(!u[0]||e.converters[i+" "+u[0]]){o=i;break}a||(a=i)}o=o||a}if(o)return o!==u[0]&&u.unshift(o),n[o]}(v,T,n)),s=function(e,t,n,r){var i,o,a,s,u,l={},c=e.dataTypes.slice();if(c[1])for(a in e.converters)l[a.toLowerCase()]=e.converters[a];o=c.shift();while(o)if(e.responseFields[o]&&(n[e.responseFields[o]]=t),!u&&r&&e.dataFilter&&(t=e.dataFilter(t,e.dataType)),u=o,o=c.shift())if("*"===o)o=u;else if("*"!==u&&u!==o){if(!(a=l[u+" "+o]||l["* "+o]))for(i in l)if((s=i.split(" "))[1]===o&&(a=l[u+" "+s[0]]||l["* "+s[0]])){!0===a?a=l[i]:!0!==l[i]&&(o=s[0],c.unshift(s[1]));break}if(!0!==a)if(a&&e["throws"])t=a(t);else try{t=a(t)}catch(e){return{state:"parsererror",error:a?e:"No conversion from "+u+" to "+o}}}return{state:"success",data:t}}(v,s,T,i),i?(v.ifModified&&((u=T.getResponseHeader("Last-Modified"))&&(k.lastModified[f]=u),(u=T.getResponseHeader("etag"))&&(k.etag[f]=u)),204===e||"HEAD"===v.type?l="nocontent":304===e?l="notmodified":(l=s.state,o=s.data,i=!(a=s.error))):(a=l,!e&&l||(l="error",e<0&&(e=0))),T.status=e,T.statusText=(t||l)+"",i?x.resolveWith(y,[o,l,T]):x.rejectWith(y,[T,l,a]),T.statusCode(w),w=void 0,g&&m.trigger(i?"ajaxSuccess":"ajaxError",[T,v,i?o:a]),b.fireWith(y,[T,l]),g&&(m.trigger("ajaxComplete",[T,v]),--k.active||k.event.trigger("ajaxStop")))}return T},getJSON:function(e,t,n){return k.get(e,t,n,"json")},getScript:function(e,t){return k.get(e,void 0,t,"script")}}),k.each(["get","post"],function(e,i){k[i]=function(e,t,n,r){return m(t)&&(r=r||n,n=t,t=void 0),k.ajax(k.extend({url:e,type:i,dataType:r,data:t,success:n},k.isPlainObject(e)&&e))}}),k._evalUrl=function(e,t){return k.ajax({url:e,type:"GET",dataType:"script",cache:!0,async:!1,global:!1,converters:{"text script":function(){}},dataFilter:function(e){k.globalEval(e,t)}})},k.fn.extend({wrapAll:function(e){var t;return this[0]&&(m(e)&&(e=e.call(this[0])),t=k(e,this[0].ownerDocument).eq(0).clone(!0),this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstElementChild)e=e.firstElementChild;return e}).append(this)),this},wrapInner:function(n){return m(n)?this.each(function(e){k(this).wrapInner(n.call(this,e))}):this.each(function(){var e=k(this),t=e.contents();t.length?t.wrapAll(n):e.append(n)})},wrap:function(t){var n=m(t);return this.each(function(e){k(this).wrapAll(n?t.call(this,e):t)})},unwrap:function(e){return this.parent(e).not("body").each(function(){k(this).replaceWith(this.childNodes)}),this}}),k.expr.pseudos.hidden=function(e){return!k.expr.pseudos.visible(e)},k.expr.pseudos.visible=function(e){return!!(e.offsetWidth||e.offsetHeight||e.getClientRects().length)},k.ajaxSettings.xhr=function(){try{return new C.XMLHttpRequest}catch(e){}};var Ut={0:200,1223:204},Xt=k.ajaxSettings.xhr();y.cors=!!Xt&&"withCredentials"in Xt,y.ajax=Xt=!!Xt,k.ajaxTransport(function(i){var o,a;if(y.cors||Xt&&!i.crossDomain)return{send:function(e,t){var n,r=i.xhr();if(r.open(i.type,i.url,i.async,i.username,i.password),i.xhrFields)for(n in i.xhrFields)r[n]=i.xhrFields[n];for(n in i.mimeType&&r.overrideMimeType&&r.overrideMimeType(i.mimeType),i.crossDomain||e["X-Requested-With"]||(e["X-Requested-With"]="XMLHttpRequest"),e)r.setRequestHeader(n,e[n]);o=function(e){return function(){o&&(o=a=r.onload=r.onerror=r.onabort=r.ontimeout=r.onreadystatechange=null,"abort"===e?r.abort():"error"===e?"number"!=typeof r.status?t(0,"error"):t(r.status,r.statusText):t(Ut[r.status]||r.status,r.statusText,"text"!==(r.responseType||"text")||"string"!=typeof r.responseText?{binary:r.response}:{text:r.responseText},r.getAllResponseHeaders()))}},r.onload=o(),a=r.onerror=r.ontimeout=o("error"),void 0!==r.onabort?r.onabort=a:r.onreadystatechange=function(){4===r.readyState&&C.setTimeout(function(){o&&a()})},o=o("abort");try{r.send(i.hasContent&&i.data||null)}catch(e){if(o)throw e}},abort:function(){o&&o()}}}),k.ajaxPrefilter(function(e){e.crossDomain&&(e.contents.script=!1)}),k.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/\b(?:java|ecma)script\b/},converters:{"text script":function(e){return k.globalEval(e),e}}}),k.ajaxPrefilter("script",function(e){void 0===e.cache&&(e.cache=!1),e.crossDomain&&(e.type="GET")}),k.ajaxTransport("script",function(n){var r,i;if(n.crossDomain||n.scriptAttrs)return{send:function(e,t){r=k("<script>").attr(n.scriptAttrs||{}).prop({charset:n.scriptCharset,src:n.url}).on("load error",i=function(e){r.remove(),i=null,e&&t("error"===e.type?404:200,e.type)}),E.head.appendChild(r[0])},abort:function(){i&&i()}}});var Vt,Gt=[],Yt=/(=)\?(?=&|$)|\?\?/;k.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=Gt.pop()||k.expando+"_"+kt++;return this[e]=!0,e}}),k.ajaxPrefilter("json jsonp",function(e,t,n){var r,i,o,a=!1!==e.jsonp&&(Yt.test(e.url)?"url":"string"==typeof e.data&&0===(e.contentType||"").indexOf("application/x-www-form-urlencoded")&&Yt.test(e.data)&&"data");if(a||"jsonp"===e.dataTypes[0])return r=e.jsonpCallback=m(e.jsonpCallback)?e.jsonpCallback():e.jsonpCallback,a?e[a]=e[a].replace(Yt,"$1"+r):!1!==e.jsonp&&(e.url+=(St.test(e.url)?"&":"?")+e.jsonp+"="+r),e.converters["script json"]=function(){return o||k.error(r+" was not called"),o[0]},e.dataTypes[0]="json",i=C[r],C[r]=function(){o=arguments},n.always(function(){void 0===i?k(C).removeProp(r):C[r]=i,e[r]&&(e.jsonpCallback=t.jsonpCallback,Gt.push(r)),o&&m(i)&&i(o[0]),o=i=void 0}),"script"}),y.createHTMLDocument=((Vt=E.implementation.createHTMLDocument("").body).innerHTML="<form></form><form></form>",2===Vt.childNodes.length),k.parseHTML=function(e,t,n){return"string"!=typeof e?[]:("boolean"==typeof t&&(n=t,t=!1),t||(y.createHTMLDocument?((r=(t=E.implementation.createHTMLDocument("")).createElement("base")).href=E.location.href,t.head.appendChild(r)):t=E),o=!n&&[],(i=D.exec(e))?[t.createElement(i[1])]:(i=we([e],t,o),o&&o.length&&k(o).remove(),k.merge([],i.childNodes)));var r,i,o},k.fn.load=function(e,t,n){var r,i,o,a=this,s=e.indexOf(" ");return-1<s&&(r=mt(e.slice(s)),e=e.slice(0,s)),m(t)?(n=t,t=void 0):t&&"object"==typeof t&&(i="POST"),0<a.length&&k.ajax({url:e,type:i||"GET",dataType:"html",data:t}).done(function(e){o=arguments,a.html(r?k("<div>").append(k.parseHTML(e)).find(r):e)}).always(n&&function(e,t){a.each(function(){n.apply(this,o||[e.responseText,t,e])})}),this},k.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){k.fn[t]=function(e){return this.on(t,e)}}),k.expr.pseudos.animated=function(t){return k.grep(k.timers,function(e){return t===e.elem}).length},k.offset={setOffset:function(e,t,n){var r,i,o,a,s,u,l=k.css(e,"position"),c=k(e),f={};"static"===l&&(e.style.position="relative"),s=c.offset(),o=k.css(e,"top"),u=k.css(e,"left"),("absolute"===l||"fixed"===l)&&-1<(o+u).indexOf("auto")?(a=(r=c.position()).top,i=r.left):(a=parseFloat(o)||0,i=parseFloat(u)||0),m(t)&&(t=t.call(e,n,k.extend({},s))),null!=t.top&&(f.top=t.top-s.top+a),null!=t.left&&(f.left=t.left-s.left+i),"using"in t?t.using.call(e,f):c.css(f)}},k.fn.extend({offset:function(t){if(arguments.length)return void 0===t?this:this.each(function(e){k.offset.setOffset(this,t,e)});var e,n,r=this[0];return r?r.getClientRects().length?(e=r.getBoundingClientRect(),n=r.ownerDocument.defaultView,{top:e.top+n.pageYOffset,left:e.left+n.pageXOffset}):{top:0,left:0}:void 0},position:function(){if(this[0]){var e,t,n,r=this[0],i={top:0,left:0};if("fixed"===k.css(r,"position"))t=r.getBoundingClientRect();else{t=this.offset(),n=r.ownerDocument,e=r.offsetParent||n.documentElement;while(e&&(e===n.body||e===n.documentElement)&&"static"===k.css(e,"position"))e=e.parentNode;e&&e!==r&&1===e.nodeType&&((i=k(e).offset()).top+=k.css(e,"borderTopWidth",!0),i.left+=k.css(e,"borderLeftWidth",!0))}return{top:t.top-i.top-k.css(r,"marginTop",!0),left:t.left-i.left-k.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent;while(e&&"static"===k.css(e,"position"))e=e.offsetParent;return e||ie})}}),k.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(t,i){var o="pageYOffset"===i;k.fn[t]=function(e){return _(this,function(e,t,n){var r;if(x(e)?r=e:9===e.nodeType&&(r=e.defaultView),void 0===n)return r?r[i]:e[t];r?r.scrollTo(o?r.pageXOffset:n,o?n:r.pageYOffset):e[t]=n},t,e,arguments.length)}}),k.each(["top","left"],function(e,n){k.cssHooks[n]=ze(y.pixelPosition,function(e,t){if(t)return t=_e(e,n),$e.test(t)?k(e).position()[n]+"px":t})}),k.each({Height:"height",Width:"width"},function(a,s){k.each({padding:"inner"+a,content:s,"":"outer"+a},function(r,o){k.fn[o]=function(e,t){var n=arguments.length&&(r||"boolean"!=typeof e),i=r||(!0===e||!0===t?"margin":"border");return _(this,function(e,t,n){var r;return x(e)?0===o.indexOf("outer")?e["inner"+a]:e.document.documentElement["client"+a]:9===e.nodeType?(r=e.documentElement,Math.max(e.body["scroll"+a],r["scroll"+a],e.body["offset"+a],r["offset"+a],r["client"+a])):void 0===n?k.css(e,t,i):k.style(e,t,n,i)},s,n?e:void 0,n)}})}),k.each("blur focus focusin focusout resize scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup contextmenu".split(" "),function(e,n){k.fn[n]=function(e,t){return 0<arguments.length?this.on(n,null,e,t):this.trigger(n)}}),k.fn.extend({hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)}}),k.fn.extend({bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)}}),k.proxy=function(e,t){var n,r,i;if("string"==typeof t&&(n=e[t],t=e,e=n),m(e))return r=s.call(arguments,2),(i=function(){return e.apply(t||this,r.concat(s.call(arguments)))}).guid=e.guid=e.guid||k.guid++,i},k.holdReady=function(e){e?k.readyWait++:k.ready(!0)},k.isArray=Array.isArray,k.parseJSON=JSON.parse,k.nodeName=A,k.isFunction=m,k.isWindow=x,k.camelCase=V,k.type=w,k.now=Date.now,k.isNumeric=function(e){var t=k.type(e);return("number"===t||"string"===t)&&!isNaN(e-parseFloat(e))},"function"==typeof define&&define.amd&&define("jquery",[],function(){return k});var Qt=C.jQuery,Jt=C.$;return k.noConflict=function(e){return C.$===k&&(C.$=Jt),e&&C.jQuery===k&&(C.jQuery=Qt),k},e||(C.jQuery=C.$=k),k});
diff --git a/qpysdk/src/main/assets/webapp.html b/qpysdk/src/main/assets/webapp.html
new file mode 100644
index 00000000..b1119779
--- /dev/null
+++ b/qpysdk/src/main/assets/webapp.html
@@ -0,0 +1,43 @@
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+    <meta name="description" content="">
+    <meta name="author" content="">
+    <title>QPY WEBAPP</title>
+    <link href="file:///android_asset/stylesheets/css/bootstrap.min.css" rel="stylesheet">
+    <link href="file:///android_asset/stylesheets/css/sticky-footer.css" rel="stylesheet">
+    <script src="file:///android_asset/stylesheets/js/jquery.min.js"></script>
+    <script src="file:///android_asset/stylesheets/js/bootstrap.min.js"></script>
+    {{QPYBUILTIN}}
+    <script>
+        function appExit() {
+            var android = new AndroidHelper();
+            android.dismiss();
+        }
+    </script>
+</head>
+<body>
+
+<div class="d-flex flex-column flex-md-row align-items-center p-3 px-md-4 mb-3 bg-white border-bottom shadow-sm">
+    <h5 class="my-0 mr-md-auto font-weight-normal" id="app-name">QPY WEBAPP</h5>
+    <nav class="my-2 my-md-0 mr-md-3" id="app-nav">
+        <a class="p-2 text-dark" href="#">NAV1</a>
+        <a class="p-2 text-dark" href="#">NAV2</a>
+    </nav>
+    <a class="btn btn-outline-primary" id="app-exit" href="javascript:appExit()">Exit</a>
+</div>
+
+<!-- Begin page content -->
+<main role="main" class="container">
+    {{WEBAPPCONTENT}}
+</main>
+
+<footer class="footer">
+    <div class="container">
+        <a href="javascript:appExit()" class="text-muted">Exit</a>
+        <span class="text-muted float-right">Powered by QPY</span>
+    </div>
+</footer>
+</body>
+</html>
\ No newline at end of file
diff --git a/qpysdk/src/main/java/com/android/vending/billing/IInAppBillingService.aidl b/qpysdk/src/main/java/com/android/vending/billing/IInAppBillingService.aidl
new file mode 100644
index 00000000..2a492f78
--- /dev/null
+++ b/qpysdk/src/main/java/com/android/vending/billing/IInAppBillingService.aidl
@@ -0,0 +1,144 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * 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.
+ */
+
+package com.android.vending.billing;
+
+import android.os.Bundle;
+
+/**
+ * InAppBillingService is the service that provides in-app billing version 3 and beyond.
+ * This service provides the following features:
+ * 1. Provides a new API to get details of in-app items published for the app including
+ *    price, type, title and description.
+ * 2. The purchase flow is synchronous and purchase information is available immediately
+ *    after it completes.
+ * 3. Purchase information of in-app purchases is maintained within the Google Play system
+ *    till the purchase is consumed.
+ * 4. An API to consume a purchase of an inapp item. All purchases of one-time
+ *    in-app items are consumable and thereafter can be purchased again.
+ * 5. An API to get current purchases of the user immediately. This will not contain any
+ *    consumed purchases.
+ *
+ * All calls will give a response code with the following possible values
+ * RESULT_OK = 0 - success
+ * RESULT_USER_CANCELED = 1 - user pressed back or canceled a dialog
+ * RESULT_BILLING_UNAVAILABLE = 3 - this billing API version is not supported for the type requested
+ * RESULT_ITEM_UNAVAILABLE = 4 - requested SKU is not available for purchase
+ * RESULT_DEVELOPER_ERROR = 5 - invalid arguments provided to the API
+ * RESULT_ERROR = 6 - Fatal error during the API action
+ * RESULT_ITEM_ALREADY_OWNED = 7 - Failure to purchase since item is already owned
+ * RESULT_ITEM_NOT_OWNED = 8 - Failure to consume since item is not owned
+ */
+interface IInAppBillingService {
+    /**
+     * Checks support for the requested billing API version, package and in-app type.
+     * Minimum API version supported by this interface is 3.
+     * @param apiVersion the billing version which the app is using
+     * @param packageName the package name of the calling app
+     * @param type type of the in-app item being purchased "inapp" for one-time purchases
+     *        and "subs" for subscription.
+     * @return RESULT_OK(0) on success, corresponding result code on failures
+     */
+    int isBillingSupported(int apiVersion, String packageName, String type);
+
+    /**
+     * Provides details of a list of SKUs
+     * Given a list of SKUs of a valid type in the skusBundle, this returns a bundle
+     * with a list JSON strings containing the productId, price, title and description.
+     * This API can be called with a maximum of 20 SKUs.
+     * @param apiVersion billing API version that the Third-party is using
+     * @param packageName the package name of the calling app
+     * @param skusBundle bundle containing a StringArrayList of SKUs with key "ITEM_ID_LIST"
+     * @return Bundle containing the following key-value pairs
+     *         "RESPONSE_CODE" with int value, RESULT_OK(0) if success, other response codes on
+     *              failure as listed above.
+     *         "DETAILS_LIST" with a StringArrayList containing purchase information
+     *              in JSON format similar to:
+     *              '{ "productId" : "exampleSku", "type" : "inapp", "price" : "$5.00",
+     *                 "title : "Example Title", "description" : "This is an example description" }'
+     */
+    Bundle getSkuDetails(int apiVersion, String packageName, String type, in Bundle skusBundle);
+
+    /**
+     * Returns a pending intent to launch the purchase flow for an in-app item by providing a SKU,
+     * the type, a unique purchase token and an optional developer payload.
+     * @param apiVersion billing API version that the app is using
+     * @param packageName package name of the calling app
+     * @param sku the SKU of the in-app item as published in the developer console
+     * @param type the type of the in-app item ("inapp" for one-time purchases
+     *        and "subs" for subscription).
+     * @param developerPayload optional argument to be sent back with the purchase information
+     * @return Bundle containing the following key-value pairs
+     *         "RESPONSE_CODE" with int value, RESULT_OK(0) if success, other response codes on
+     *              failure as listed above.
+     *         "BUY_INTENT" - PendingIntent to start the purchase flow
+     *
+     * The Pending intent should be launched with startIntentSenderForResult. When purchase flow
+     * has completed, the onActivityResult() will give a resultCode of OK or CANCELED.
+     * If the purchase is successful, the result data will contain the following key-value pairs
+     *         "RESPONSE_CODE" with int value, RESULT_OK(0) if success, other response codes on
+     *              failure as listed above.
+     *         "INAPP_PURCHASE_DATA" - String in JSON format similar to
+     *              '{"orderId":"12999763169054705758.1371079406387615",
+     *                "packageName":"com.example.app",
+     *                "productId":"exampleSku",
+     *                "purchaseTime":1345678900000,
+     *                "purchaseToken" : "122333444455555",
+     *                "developerPayload":"example developer payload" }'
+     *         "INAPP_DATA_SIGNATURE" - String containing the signature of the purchase data that
+     *                                  was signed with the private key of the developer
+     *                                  TODO: change this to app-specific keys.
+     */
+    Bundle getBuyIntent(int apiVersion, String packageName, String sku, String type,
+        String developerPayload);
+
+    /**
+     * Returns the current SKUs owned by the user of the type and package name specified along with
+     * purchase information and a signature of the data to be validated.
+     * This will return all SKUs that have been purchased in V3 and managed items purchased using
+     * V1 and V2 that have not been consumed.
+     * @param apiVersion billing API version that the app is using
+     * @param packageName package name of the calling app
+     * @param type the type of the in-app items being requested
+     *        ("inapp" for one-time purchases and "subs" for subscription).
+     * @param continuationToken to be set as null for the first call, if the number of owned
+     *        skus are too many, a continuationToken is returned in the response bundle.
+     *        This method can be called again with the continuation token to get the next set of
+     *        owned skus.
+     * @return Bundle containing the following key-value pairs
+     *         "RESPONSE_CODE" with int value, RESULT_OK(0) if success, other response codes on
+     *              failure as listed above.
+     *         "INAPP_PURCHASE_ITEM_LIST" - StringArrayList containing the list of SKUs
+     *         "INAPP_PURCHASE_DATA_LIST" - StringArrayList containing the purchase information
+     *         "INAPP_DATA_SIGNATURE_LIST"- StringArrayList containing the signatures
+     *                                      of the purchase information
+     *         "INAPP_CONTINUATION_TOKEN" - String containing a continuation token for the
+     *                                      next set of in-app purchases. Only set if the
+     *                                      user has more owned skus than the current list.
+     */
+    Bundle getPurchases(int apiVersion, String packageName, String type, String continuationToken);
+
+    /**
+     * Consume the last purchase of the given SKU. This will result in this item being removed
+     * from all subsequent responses to getPurchases() and allow re-purchase of this item.
+     * @param apiVersion billing API version that the app is using
+     * @param packageName package name of the calling app
+     * @param purchaseToken token in the purchase information JSON that identifies the purchase
+     *        to be consumed
+     * @return 0 if consumption succeeded. Appropriate error values for failures.
+     */
+    int consumePurchase(int apiVersion, String packageName, String purchaseToken);
+}
diff --git a/qpysdk/src/main/java/com/googlecode/android_scripting/Exec.java b/qpysdk/src/main/java/com/googlecode/android_scripting/Exec.java
deleted file mode 100644
index 9f832d9a..00000000
--- a/qpysdk/src/main/java/com/googlecode/android_scripting/Exec.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * 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.
- */
-
-package com.googlecode.android_scripting;
-
-import java.io.FileDescriptor;
-
-/**
- * Tools for executing commands.
- */
-public class Exec {
-  /**
-   * @param cmd
-   *          The command to execute
-   * @param arg0
-   *          The first argument to the command, may be null
-   * @param arg1
-   *          the second argument to the command, may be null
-   * @return the file descriptor of the started process.
-   * 
-   */
-  public static FileDescriptor createSubprocess(String command, String[] arguments,
-      String[] environmentVariables, String workingDirectory) {
-    return createSubprocess(command, arguments, environmentVariables, workingDirectory, null);
-  }
-
-  /**
-   * @param cmd
-   *          The command to execute
-   * @param arguments
-   *          Array of arguments, may be null
-   * @param environmentVariables
-   *          Array of environment variables, may be null
-   * @param processId
-   *          A one-element array to which the process ID of the started process will be written.
-   * @return the file descriptor of the opened process's psuedo-terminal.
-   * 
-   */
-  public static native FileDescriptor createSubprocess(String command, String[] arguments,
-      String[] environmentVariables, String workingDirectory, int[] processId);
-
-  public static native void setPtyWindowSize(FileDescriptor fd, int row, int col, int xpixel,
-      int ypixel);
-
-  /**
-   * Causes the calling thread to wait for the process associated with the receiver to finish
-   * executing.
-   * 
-   * @return The exit value of the Process being waited on
-   * 
-   */
-  public static native int waitFor(int processId);
-  public static native void nativeSetEnv(String name, String value);
-  public static native void nativeInit();
-
-  static {
-    System.loadLibrary("com_googlecode_android_scripting_Exec");
-  }
-}
diff --git a/qpysdk/src/main/java/org/audiostream/AudioIn.java b/qpysdk/src/main/java/org/audiostream/AudioIn.java
index a027b5fa..6823aec7 100644
--- a/qpysdk/src/main/java/org/audiostream/AudioIn.java
+++ b/qpysdk/src/main/java/org/audiostream/AudioIn.java
@@ -6,11 +6,6 @@
 
 import java.lang.Thread;
 import android.os.Process;
-import android.media.MediaRecorder;
-import android.media.MediaRecorder.AudioSource;
-import android.media.MediaRecorder.OutputFormat;
-import android.media.MediaRecorder.AudioEncoder;
-import android.media.AudioFormat;
 import android.media.AudioRecord;
 import android.util.Log;
 import java.nio.ByteBuffer;
diff --git a/qpysdk/src/main/java/org/libsdl/app/SDLActivity.java b/qpysdk/src/main/java/org/libsdl/app/SDLActivity.java
new file mode 100644
index 00000000..6d683b6e
--- /dev/null
+++ b/qpysdk/src/main/java/org/libsdl/app/SDLActivity.java
@@ -0,0 +1,1668 @@
+package org.libsdl.app;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.lang.reflect.Method;
+
+import android.app.*;
+import android.content.*;
+import android.content.res.Configuration;
+import android.view.*;
+import android.view.inputmethod.BaseInputConnection;
+import android.view.inputmethod.EditorInfo;
+import android.view.inputmethod.InputConnection;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.AbsoluteLayout;
+import android.widget.Button;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+import android.os.*;
+import android.util.Log;
+import android.util.SparseArray;
+import android.graphics.*;
+import android.graphics.drawable.Drawable;
+import android.media.*;
+import android.hardware.*;
+import android.content.pm.ActivityInfo;
+
+/**
+    SDL Activity
+*/
+public class SDLActivity extends Activity {
+    private static final String TAG = "SDL";
+
+    // Keep track of the paused state
+    public static boolean mIsPaused, mIsSurfaceReady, mHasFocus;
+    public static boolean mExitCalledFromJava;
+
+    /** If shared libraries (e.g. SDL or the native application) could not be loaded. */
+    public static boolean mBrokenLibraries;
+
+    // If we want to separate mouse and touch events.
+    //  This is only toggled in native code when a hint is set!
+    public static boolean mSeparateMouseAndTouch;
+
+    // Main components
+    protected static SDLActivity mSingleton;
+    protected static SDLSurface mSurface;
+    protected static View mTextEdit;
+    protected static ViewGroup mLayout;
+    protected static SDLJoystickHandler mJoystickHandler;
+
+    // This is what SDL runs in. It invokes SDL_main(), eventually
+    protected static Thread mSDLThread;
+
+    // Audio
+    protected static AudioTrack mAudioTrack;
+
+    /**
+     * This method is called by SDL before loading the native shared libraries.
+     * It can be overridden to provide names of shared libraries to be loaded.
+     * The default implementation returns the defaults. It never returns null.
+     * An array returned by a new implementation must at least contain "SDL2".
+     * Also keep in mind that the order the libraries are loaded may matter.
+     * @return names of shared libraries to be loaded (e.g. "SDL2", "main").
+     */
+    protected String[] getLibraries() {
+        return new String[] {
+            "SDL2",
+            // "SDL2_image",
+            // "SDL2_mixer",
+            // "SDL2_net",
+            // "SDL2_ttf",
+            "main"
+        };
+    }
+
+    // Load the .so
+    public void loadLibraries() {
+       for (String lib : getLibraries()) {
+          System.loadLibrary(lib);
+       }
+    }
+
+    /**
+     * This method is called by SDL before starting the native application thread.
+     * It can be overridden to provide the arguments after the application name.
+     * The default implementation returns an empty array. It never returns null.
+     * @return arguments for the native application.
+     */
+    protected String[] getArguments() {
+        return new String[0];
+    }
+
+    public static void initialize() {
+        // The static nature of the singleton and Android quirkyness force us to initialize everything here
+        // Otherwise, when exiting the app and returning to it, these variables *keep* their pre exit values
+        mSingleton = null;
+        mSurface = null;
+        mTextEdit = null;
+        mLayout = null;
+        mJoystickHandler = null;
+        mSDLThread = null;
+        mAudioTrack = null;
+        mExitCalledFromJava = false;
+        mBrokenLibraries = false;
+        mIsPaused = false;
+        mIsSurfaceReady = false;
+        mHasFocus = true;
+    }
+
+    // Setup
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        Log.v(TAG, "Device: " + android.os.Build.DEVICE);
+        Log.v(TAG, "Model: " + android.os.Build.MODEL);
+        Log.v(TAG, "onCreate(): " + mSingleton);
+        super.onCreate(savedInstanceState);
+
+        SDLActivity.initialize();
+        // So we can call stuff from static callbacks
+        mSingleton = this;
+
+        // Load shared libraries
+        String errorMsgBrokenLib = "";
+        try {
+            loadLibraries();
+        } catch(UnsatisfiedLinkError e) {
+            System.err.println(e.getMessage());
+            mBrokenLibraries = true;
+            errorMsgBrokenLib = e.getMessage();
+        } catch(Exception e) {
+            System.err.println(e.getMessage());
+            mBrokenLibraries = true;
+            errorMsgBrokenLib = e.getMessage();
+        }
+
+        if (mBrokenLibraries)
+        {
+            AlertDialog.Builder dlgAlert  = new AlertDialog.Builder(this);
+            dlgAlert.setMessage("An error occurred while trying to start the application. Please try again and/or reinstall."
+                  + System.getProperty("line.separator")
+                  + System.getProperty("line.separator")
+                  + "Error: " + errorMsgBrokenLib);
+            dlgAlert.setTitle("SDL Error");
+            dlgAlert.setPositiveButton("Exit",
+                new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog,int id) {
+                        // if this button is clicked, close current activity
+                        SDLActivity.mSingleton.finish();
+                    }
+                });
+           dlgAlert.setCancelable(false);
+           dlgAlert.create().show();
+
+           return;
+        }
+
+        // Set up the surface
+        mSurface = new SDLSurface(getApplication());
+
+        if(Build.VERSION.SDK_INT >= 12) {
+            mJoystickHandler = new SDLJoystickHandler_API12();
+        }
+        else {
+            mJoystickHandler = new SDLJoystickHandler();
+        }
+
+        mLayout = new AbsoluteLayout(this);
+        mLayout.addView(mSurface);
+
+        setContentView(mLayout);
+
+        // Get filename from "Open with" of another application
+        Intent intent = getIntent();
+
+        if (intent != null && intent.getData() != null) {
+            String filename = intent.getData().getPath();
+            if (filename != null) {
+                Log.v(TAG, "Got filename: " + filename);
+                SDLActivity.onNativeDropFile(filename);
+            }
+        }
+    }
+
+    // Events
+    @Override
+    protected void onPause() {
+        Log.v(TAG, "onPause()");
+        super.onPause();
+
+        if (SDLActivity.mBrokenLibraries) {
+           return;
+        }
+
+        SDLActivity.handlePause();
+    }
+
+    @Override
+    protected void onResume() {
+        Log.v(TAG, "onResume()");
+        super.onResume();
+
+        if (SDLActivity.mBrokenLibraries) {
+           return;
+        }
+
+        SDLActivity.handleResume();
+    }
+
+
+    @Override
+    public void onWindowFocusChanged(boolean hasFocus) {
+        super.onWindowFocusChanged(hasFocus);
+        Log.v(TAG, "onWindowFocusChanged(): " + hasFocus);
+
+        if (SDLActivity.mBrokenLibraries) {
+           return;
+        }
+
+        SDLActivity.mHasFocus = hasFocus;
+        if (hasFocus) {
+            SDLActivity.handleResume();
+        }
+    }
+
+    @Override
+    public void onLowMemory() {
+        Log.v(TAG, "onLowMemory()");
+        super.onLowMemory();
+
+        if (SDLActivity.mBrokenLibraries) {
+           return;
+        }
+
+        SDLActivity.nativeLowMemory();
+    }
+
+    @Override
+    protected void onDestroy() {
+        Log.v(TAG, "onDestroy()");
+
+        if (SDLActivity.mBrokenLibraries) {
+           super.onDestroy();
+           // Reset everything in case the user re opens the app
+           SDLActivity.initialize();
+           return;
+        }
+
+        // Send a quit message to the application
+        SDLActivity.mExitCalledFromJava = true;
+        SDLActivity.nativeQuit();
+
+        // Now wait for the SDL thread to quit
+        if (SDLActivity.mSDLThread != null) {
+            try {
+                SDLActivity.mSDLThread.join();
+            } catch(Exception e) {
+                Log.v(TAG, "Problem stopping thread: " + e);
+            }
+            SDLActivity.mSDLThread = null;
+
+            //LogUtil.v(TAG, "Finished waiting for SDL thread");
+        }
+
+        super.onDestroy();
+        // Reset everything in case the user re opens the app
+        SDLActivity.initialize();
+    }
+
+    @Override
+    public boolean dispatchKeyEvent(KeyEvent event) {
+
+        if (SDLActivity.mBrokenLibraries) {
+           return false;
+        }
+
+        int keyCode = event.getKeyCode();
+        Log.d(TAG, "dispatchKeyEvent:"+keyCode);
+        // Ignore certain special keys so they're handled by Android
+        if (keyCode == KeyEvent.KEYCODE_VOLUME_DOWN ||
+            keyCode == KeyEvent.KEYCODE_VOLUME_UP ||
+            keyCode == KeyEvent.KEYCODE_CAMERA ||
+            //keyCode == KeyEvent.KEYCODE_BACK ||
+            keyCode == 168 || /* API 11: KeyEvent.KEYCODE_ZOOM_IN */
+            keyCode == 169 /* API 11: KeyEvent.KEYCODE_ZOOM_OUT */
+
+            ) {
+            return false;
+        }
+        if (keyCode == KeyEvent.KEYCODE_BACK) {
+            handleNativeExit();
+            return false;
+        }
+        return super.dispatchKeyEvent(event);
+    }
+
+    @Override
+    public void onConfigurationChanged(Configuration newConfig) {
+        // TODO Auto-generated method stub
+        super.onConfigurationChanged(newConfig);
+        if (newConfig.orientation==Configuration.ORIENTATION_LANDSCAPE) {
+            // Nothing need to be done here
+
+        } else {
+            // Nothing need to be done here
+        }
+
+    }
+
+    /** Called by onPause or surfaceDestroyed. Even if surfaceDestroyed
+     *  is the first to be called, mIsSurfaceReady should still be set
+     *  to 'true' during the call to onPause (in a usual scenario).
+     */
+    public static void handlePause() {
+        if (!SDLActivity.mIsPaused && SDLActivity.mIsSurfaceReady) {
+            SDLActivity.mIsPaused = true;
+            SDLActivity.nativePause();
+            mSurface.enableSensor(Sensor.TYPE_ACCELEROMETER, false);
+        }
+    }
+
+    /** Called by onResume or surfaceCreated. An actual resume should be done only when the surface is ready.
+     * Note: Some Android variants may send multiple surfaceChanged events, so we don't need to resume
+     * every time we get one of those events, only if it comes after surfaceDestroyed
+     */
+    public static void handleResume() {
+        if (SDLActivity.mIsPaused && SDLActivity.mIsSurfaceReady && SDLActivity.mHasFocus) {
+            SDLActivity.mIsPaused = false;
+            SDLActivity.nativeResume();
+            mSurface.handleResume();
+        }
+    }
+
+    /* The native thread has finished */
+    public static void handleNativeExit() {
+    	System.exit(0);
+//    	SDLActivity.mSDLThread = null;
+//        mSingleton.finish();
+    }
+
+
+    // Messages from the SDLMain thread
+    static final int COMMAND_CHANGE_TITLE = 1;
+    static final int COMMAND_UNUSED = 2;
+    static final int COMMAND_TEXTEDIT_HIDE = 3;
+    static final int COMMAND_SET_KEEP_SCREEN_ON = 5;
+
+    protected static final int COMMAND_USER = 0x8000;
+
+    /**
+     * This method is called by SDL if SDL did not handle a message itself.
+     * This happens if a received message contains an unsupported command.
+     * Method can be overwritten to handle Messages in a different class.
+     * @param command the command of the message.
+     * @param param the parameter of the message. May be null.
+     * @return if the message was handled in overridden method.
+     */
+    protected boolean onUnhandledMessage(int command, Object param) {
+        return false;
+    }
+
+    /**
+     * A Handler class for Messages from native SDL applications.
+     * It uses current Activities as target (e.g. for the title).
+     * static to prevent implicit references to enclosing object.
+     */
+    protected static class SDLCommandHandler extends Handler {
+        @Override
+        public void handleMessage(Message msg) {
+            Context context = getContext();
+            if (context == null) {
+                Log.e(TAG, "error handling message, getContext() returned null");
+                return;
+            }
+            switch (msg.arg1) {
+            case COMMAND_CHANGE_TITLE:
+                if (context instanceof Activity) {
+                    ((Activity) context).setTitle((String)msg.obj);
+                } else {
+                    Log.e(TAG, "error handling message, getContext() returned no Activity");
+                }
+                break;
+            case COMMAND_TEXTEDIT_HIDE:
+                if (mTextEdit != null) {
+                    mTextEdit.setVisibility(View.GONE);
+
+                    InputMethodManager imm = (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE);
+                    imm.hideSoftInputFromWindow(mTextEdit.getWindowToken(), 0);
+                }
+                break;
+            case COMMAND_SET_KEEP_SCREEN_ON:
+            {
+                Window window = ((Activity) context).getWindow();
+                if (window != null) {
+                    if ((msg.obj instanceof Integer) && (((Integer) msg.obj).intValue() != 0)) {
+                        window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+                    } else {
+                        window.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+                    }
+                }
+                break;
+            }
+            default:
+                if ((context instanceof SDLActivity) && !((SDLActivity) context).onUnhandledMessage(msg.arg1, msg.obj)) {
+                    Log.e(TAG, "error handling message, command is " + msg.arg1);
+                }
+            }
+        }
+    }
+
+    // Handler for the messages
+    Handler commandHandler = new SDLCommandHandler();
+
+    // Send a message from the SDLMain thread
+    boolean sendCommand(int command, Object data) {
+        Message msg = commandHandler.obtainMessage();
+        msg.arg1 = command;
+        msg.obj = data;
+        return commandHandler.sendMessage(msg);
+    }
+
+    // C functions we call
+    public static native int nativeInit(Object arguments);
+    public static native void nativeLowMemory();
+    public static native void nativeQuit();
+    public static native void nativePause();
+    public static native void nativeResume();
+    public static native void onNativeDropFile(String filename);
+    public static native void onNativeResize(int x, int y, int format, float rate);
+    public static native int onNativePadDown(int device_id, int keycode);
+    public static native int onNativePadUp(int device_id, int keycode);
+    public static native void onNativeJoy(int device_id, int axis,
+                                          float value);
+    public static native void onNativeHat(int device_id, int hat_id,
+                                          int x, int y);
+    public static native void onNativeKeyDown(int keycode);
+    public static native void onNativeKeyUp(int keycode);
+    public static native void onNativeKeyboardFocusLost();
+    public static native void onNativeMouse(int button, int action, float x, float y);
+    public static native void onNativeTouch(int touchDevId, int pointerFingerId,
+                                            int action, float x,
+                                            float y, float p);
+    public static native void onNativeAccel(float x, float y, float z);
+    public static native void onNativeSurfaceChanged();
+    public static native void onNativeSurfaceDestroyed();
+    public static native void nativeFlipBuffers();
+    public static native int nativeAddJoystick(int device_id, String name,
+                                               int is_accelerometer, int nbuttons,
+                                               int naxes, int nhats, int nballs);
+    public static native int nativeRemoveJoystick(int device_id);
+    public static native String nativeGetHint(String name);
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static void flipBuffers() {
+        SDLActivity.nativeFlipBuffers();
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static boolean setActivityTitle(String title) {
+        // Called from SDLMain() thread and can't directly affect the view
+        return mSingleton.sendCommand(COMMAND_CHANGE_TITLE, title);
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static boolean sendMessage(int command, int param) {
+        return mSingleton.sendCommand(command, Integer.valueOf(param));
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static Context getContext() {
+        return mSingleton;
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     * @return result of getSystemService(name) but executed on UI thread.
+     */
+    public Object getSystemServiceFromUiThread(final String name) {
+        final Object lock = new Object();
+        final Object[] results = new Object[2]; // array for writable variables
+        synchronized (lock) {
+            runOnUiThread(new Runnable() {
+                @Override
+                public void run() {
+                    synchronized (lock) {
+                        results[0] = getSystemService(name);
+                        results[1] = Boolean.TRUE;
+                        lock.notify();
+                    }
+                }
+            });
+            if (results[1] == null) {
+                try {
+                    lock.wait();
+                } catch (InterruptedException ex) {
+                    ex.printStackTrace();
+                }
+            }
+        }
+        return results[0];
+    }
+
+    static class ShowTextInputTask implements Runnable {
+        /*
+         * This is used to regulate the pan&scan method to have some offset from
+         * the bottom edge of the input region and the top edge of an input
+         * method (soft keyboard)
+         */
+        static final int HEIGHT_PADDING = 15;
+
+        public int x, y, w, h;
+
+        public ShowTextInputTask(int x, int y, int w, int h) {
+            this.x = x;
+            this.y = y;
+            this.w = w;
+            this.h = h;
+        }
+
+        @Override
+        public void run() {
+            AbsoluteLayout.LayoutParams params = new AbsoluteLayout.LayoutParams(
+                    w, h + HEIGHT_PADDING, x, y);
+
+            if (mTextEdit == null) {
+                mTextEdit = new DummyEdit(getContext());
+
+                mLayout.addView(mTextEdit, params);
+            } else {
+                mTextEdit.setLayoutParams(params);
+            }
+
+            mTextEdit.setVisibility(View.VISIBLE);
+            mTextEdit.requestFocus();
+
+            InputMethodManager imm = (InputMethodManager) getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
+            imm.showSoftInput(mTextEdit, 0);
+        }
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static boolean showTextInput(int x, int y, int w, int h) {
+        // Transfer the task to the main thread as a Runnable
+        return mSingleton.commandHandler.post(new ShowTextInputTask(x, y, w, h));
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static Surface getNativeSurface() {
+        return SDLActivity.mSurface.getNativeSurface();
+    }
+
+    // Audio
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static int audioInit(int sampleRate, boolean is16Bit, boolean isStereo, int desiredFrames) {
+        int channelConfig = isStereo ? AudioFormat.CHANNEL_CONFIGURATION_STEREO : AudioFormat.CHANNEL_CONFIGURATION_MONO;
+        int audioFormat = is16Bit ? AudioFormat.ENCODING_PCM_16BIT : AudioFormat.ENCODING_PCM_8BIT;
+        int frameSize = (isStereo ? 2 : 1) * (is16Bit ? 2 : 1);
+
+        Log.v(TAG, "SDL audio: wanted " + (isStereo ? "stereo" : "mono") + " " + (is16Bit ? "16-bit" : "8-bit") + " " + (sampleRate / 1000f) + "kHz, " + desiredFrames + " frames buffer");
+
+        // Let the user pick a larger buffer if they really want -- but ye
+        // gods they probably shouldn't, the minimums are horrifyingly high
+        // latency already
+        desiredFrames = Math.max(desiredFrames, (AudioTrack.getMinBufferSize(sampleRate, channelConfig, audioFormat) + frameSize - 1) / frameSize);
+
+        if (mAudioTrack == null) {
+            mAudioTrack = new AudioTrack(AudioManager.STREAM_MUSIC, sampleRate,
+                    channelConfig, audioFormat, desiredFrames * frameSize, AudioTrack.MODE_STREAM);
+
+            // Instantiating AudioTrack can "succeed" without an exception and the track may still be invalid
+            // Ref: https://android.googlesource.com/platform/frameworks/base/+/refs/heads/master/media/java/android/media/AudioTrack.java
+            // Ref: http://developer.android.com/reference/android/media/AudioTrack.html#getState()
+
+            if (mAudioTrack.getState() != AudioTrack.STATE_INITIALIZED) {
+                Log.e(TAG, "Failed during initialization of Audio Track");
+                mAudioTrack = null;
+                return -1;
+            }
+
+            mAudioTrack.play();
+        }
+
+        Log.v(TAG, "SDL audio: got " + ((mAudioTrack.getChannelCount() >= 2) ? "stereo" : "mono") + " " + ((mAudioTrack.getAudioFormat() == AudioFormat.ENCODING_PCM_16BIT) ? "16-bit" : "8-bit") + " " + (mAudioTrack.getSampleRate() / 1000f) + "kHz, " + desiredFrames + " frames buffer");
+
+        return 0;
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static void audioWriteShortBuffer(short[] buffer) {
+        for (int i = 0; i < buffer.length; ) {
+            int result = mAudioTrack.write(buffer, i, buffer.length - i);
+            if (result > 0) {
+                i += result;
+            } else if (result == 0) {
+                try {
+                    Thread.sleep(1);
+                } catch(InterruptedException e) {
+                    // Nom nom
+                }
+            } else {
+                Log.w(TAG, "SDL audio: error return from write(short)");
+                return;
+            }
+        }
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static void audioWriteByteBuffer(byte[] buffer) {
+        for (int i = 0; i < buffer.length; ) {
+            int result = mAudioTrack.write(buffer, i, buffer.length - i);
+            if (result > 0) {
+                i += result;
+            } else if (result == 0) {
+                try {
+                    Thread.sleep(1);
+                } catch(InterruptedException e) {
+                    // Nom nom
+                }
+            } else {
+                Log.w(TAG, "SDL audio: error return from write(byte)");
+                return;
+            }
+        }
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static void audioQuit() {
+        if (mAudioTrack != null) {
+            mAudioTrack.stop();
+            mAudioTrack = null;
+        }
+    }
+
+    // Input
+
+    /**
+     * This method is called by SDL using JNI.
+     * @return an array which may be empty but is never null.
+     */
+    public static int[] inputGetInputDeviceIds(int sources) {
+        int[] ids = InputDevice.getDeviceIds();
+        int[] filtered = new int[ids.length];
+        int used = 0;
+        for (int i = 0; i < ids.length; ++i) {
+            InputDevice device = InputDevice.getDevice(ids[i]);
+            if ((device != null) && ((device.getSources() & sources) != 0)) {
+                filtered[used++] = device.getId();
+            }
+        }
+        return Arrays.copyOf(filtered, used);
+    }
+
+    // Joystick glue code, just a series of stubs that redirect to the SDLJoystickHandler instance
+    public static boolean handleJoystickMotionEvent(MotionEvent event) {
+        return mJoystickHandler.handleMotionEvent(event);
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static void pollInputDevices() {
+        if (SDLActivity.mSDLThread != null) {
+            mJoystickHandler.pollInputDevices();
+        }
+    }
+
+    // APK extension files support
+
+    /** com.android.vending.expansion.zipfile.ZipResourceFile object or null. */
+    private Object expansionFile;
+
+    /** com.android.vending.expansion.zipfile.ZipResourceFile's getInputStream() or null. */
+    private Method expansionFileMethod;
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public InputStream openAPKExtensionInputStream(String fileName) throws IOException {
+        // Get a ZipResourceFile representing a merger of both the main and patch files
+        if (expansionFile == null) {
+            Integer mainVersion = Integer.valueOf(nativeGetHint("SDL_ANDROID_APK_EXPANSION_MAIN_FILE_VERSION"));
+            Integer patchVersion = Integer.valueOf(nativeGetHint("SDL_ANDROID_APK_EXPANSION_PATCH_FILE_VERSION"));
+
+            try {
+                // To avoid direct dependency on Google APK extension library that is
+                // not a part of Android SDK we access it using reflection
+                expansionFile = Class.forName("com.android.vending.expansion.zipfile.APKExpansionSupport")
+                    .getMethod("getAPKExpansionZipFile", Context.class, int.class, int.class)
+                    .invoke(null, this, mainVersion, patchVersion);
+
+                expansionFileMethod = expansionFile.getClass()
+                    .getMethod("getInputStream", String.class);
+            } catch (Exception ex) {
+                ex.printStackTrace();
+                expansionFile = null;
+                expansionFileMethod = null;
+            }
+        }
+
+        // Get an input stream for a known file inside the expansion file ZIPs
+        InputStream fileStream;
+        try {
+            fileStream = (InputStream)expansionFileMethod.invoke(expansionFile, fileName);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            fileStream = null;
+        }
+
+        if (fileStream == null) {
+            throw new IOException();
+        }
+
+        return fileStream;
+    }
+
+    // Messagebox
+
+    /** Result of current messagebox. Also used for blocking the calling thread. */
+    protected final int[] messageboxSelection = new int[1];
+
+    /** Id of current dialog. */
+    protected int dialogs = 0;
+
+    /**
+     * This method is called by SDL using JNI.
+     * Shows the messagebox from UI thread and block calling thread.
+     * buttonFlags, buttonIds and buttonTexts must have same length.
+     * @param buttonFlags array containing flags for every button.
+     * @param buttonIds array containing id for every button.
+     * @param buttonTexts array containing text for every button.
+     * @param colors null for default or array of length 5 containing colors.
+     * @return button id or -1.
+     */
+    public int messageboxShowMessageBox(
+            final int flags,
+            final String title,
+            final String message,
+            final int[] buttonFlags,
+            final int[] buttonIds,
+            final String[] buttonTexts,
+            final int[] colors) {
+
+        messageboxSelection[0] = -1;
+
+        // sanity checks
+
+        if ((buttonFlags.length != buttonIds.length) && (buttonIds.length != buttonTexts.length)) {
+            return -1; // implementation broken
+        }
+
+        // collect arguments for Dialog
+
+        final Bundle args = new Bundle();
+        args.putInt("flags", flags);
+        args.putString("title", title);
+        args.putString("message", message);
+        args.putIntArray("buttonFlags", buttonFlags);
+        args.putIntArray("buttonIds", buttonIds);
+        args.putStringArray("buttonTexts", buttonTexts);
+        args.putIntArray("colors", colors);
+
+        // trigger Dialog creation on UI thread
+
+        runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                showDialog(dialogs++, args);
+            }
+        });
+
+        // block the calling thread
+
+        synchronized (messageboxSelection) {
+            try {
+                messageboxSelection.wait();
+            } catch (InterruptedException ex) {
+                ex.printStackTrace();
+                return -1;
+            }
+        }
+
+        // return selected value
+
+        return messageboxSelection[0];
+    }
+
+    @Override
+    protected Dialog onCreateDialog(int ignore, Bundle args) {
+
+        // TODO set values from "flags" to messagebox dialog
+
+        // get colors
+
+        int[] colors = args.getIntArray("colors");
+        int backgroundColor;
+        int textColor;
+        int buttonBorderColor;
+        int buttonBackgroundColor;
+        int buttonSelectedColor;
+        if (colors != null) {
+            int i = -1;
+            backgroundColor = colors[++i];
+            textColor = colors[++i];
+            buttonBorderColor = colors[++i];
+            buttonBackgroundColor = colors[++i];
+            buttonSelectedColor = colors[++i];
+        } else {
+            backgroundColor = Color.TRANSPARENT;
+            textColor = Color.TRANSPARENT;
+            buttonBorderColor = Color.TRANSPARENT;
+            buttonBackgroundColor = Color.TRANSPARENT;
+            buttonSelectedColor = Color.TRANSPARENT;
+        }
+
+        // create dialog with title and a listener to wake up calling thread
+
+        final Dialog dialog = new Dialog(this);
+        dialog.setTitle(args.getString("title"));
+        dialog.setCancelable(false);
+        dialog.setOnDismissListener(new DialogInterface.OnDismissListener() {
+            @Override
+            public void onDismiss(DialogInterface unused) {
+                synchronized (messageboxSelection) {
+                    messageboxSelection.notify();
+                }
+            }
+        });
+
+        // create text
+
+        TextView message = new TextView(this);
+        message.setGravity(Gravity.CENTER);
+        message.setText(args.getString("message"));
+        if (textColor != Color.TRANSPARENT) {
+            message.setTextColor(textColor);
+        }
+
+        // create buttons
+
+        int[] buttonFlags = args.getIntArray("buttonFlags");
+        int[] buttonIds = args.getIntArray("buttonIds");
+        String[] buttonTexts = args.getStringArray("buttonTexts");
+
+        final SparseArray<Button> mapping = new SparseArray<Button>();
+
+        LinearLayout buttons = new LinearLayout(this);
+        buttons.setOrientation(LinearLayout.HORIZONTAL);
+        buttons.setGravity(Gravity.CENTER);
+        for (int i = 0; i < buttonTexts.length; ++i) {
+            Button button = new Button(this);
+            final int id = buttonIds[i];
+            button.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    messageboxSelection[0] = id;
+                    dialog.dismiss();
+                }
+            });
+            if (buttonFlags[i] != 0) {
+                // see SDL_messagebox.h
+                if ((buttonFlags[i] & 0x00000001) != 0) {
+                    mapping.put(KeyEvent.KEYCODE_ENTER, button);
+                }
+                if ((buttonFlags[i] & 0x00000002) != 0) {
+                    mapping.put(111, button); /* API 11: KeyEvent.KEYCODE_ESCAPE */
+                }
+            }
+            button.setText(buttonTexts[i]);
+            if (textColor != Color.TRANSPARENT) {
+                button.setTextColor(textColor);
+            }
+            if (buttonBorderColor != Color.TRANSPARENT) {
+                // TODO set color for border of messagebox button
+            }
+            if (buttonBackgroundColor != Color.TRANSPARENT) {
+                Drawable drawable = button.getBackground();
+                if (drawable == null) {
+                    // setting the color this way removes the style
+                    button.setBackgroundColor(buttonBackgroundColor);
+                } else {
+                    // setting the color this way keeps the style (gradient, padding, etc.)
+                    drawable.setColorFilter(buttonBackgroundColor, PorterDuff.Mode.MULTIPLY);
+                }
+            }
+            if (buttonSelectedColor != Color.TRANSPARENT) {
+                // TODO set color for selected messagebox button
+            }
+            buttons.addView(button);
+        }
+
+        // create content
+
+        LinearLayout content = new LinearLayout(this);
+        content.setOrientation(LinearLayout.VERTICAL);
+        content.addView(message);
+        content.addView(buttons);
+        if (backgroundColor != Color.TRANSPARENT) {
+            content.setBackgroundColor(backgroundColor);
+        }
+
+        // add content to dialog and return
+
+        dialog.setContentView(content);
+        dialog.setOnKeyListener(new Dialog.OnKeyListener() {
+            @Override
+            public boolean onKey(DialogInterface d, int keyCode, KeyEvent event) {
+                Button button = mapping.get(keyCode);
+                if (button != null) {
+                    if (event.getAction() == KeyEvent.ACTION_UP) {
+                        button.performClick();
+                    }
+                    return true; // also for ignored actions
+                }
+                return false;
+            }
+        });
+
+        return dialog;
+    }
+}
+
+/**
+    Simple nativeInit() runnable
+*/
+class SDLMain implements Runnable {
+    @Override
+    public void run() {
+        // Runs SDL_main()
+        SDLActivity.nativeInit(SDLActivity.mSingleton.getArguments());
+
+        //LogUtil.v("SDL", "SDL thread terminated");
+    }
+}
+
+
+/**
+    SDLSurface. This is what we draw on, so we need to know when it's created
+    in order to do anything useful.
+
+    Because of this, that's where we set up the SDL thread
+*/
+class SDLSurface extends SurfaceView implements SurfaceHolder.Callback,
+    View.OnKeyListener, View.OnTouchListener, SensorEventListener  {
+
+    // Sensors
+    protected static SensorManager mSensorManager;
+    protected static Display mDisplay;
+
+    // Keep track of the surface size to normalize touch events
+    protected static float mWidth, mHeight;
+
+    // Startup
+    public SDLSurface(Context context) {
+        super(context);
+        getHolder().addCallback(this);
+
+        setFocusable(true);
+        setFocusableInTouchMode(true);
+        requestFocus();
+        setOnKeyListener(this);
+        setOnTouchListener(this);
+
+        mDisplay = ((WindowManager)context.getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay();
+        mSensorManager = (SensorManager)context.getSystemService(Context.SENSOR_SERVICE);
+
+        if(Build.VERSION.SDK_INT >= 12) {
+            setOnGenericMotionListener(new SDLGenericMotionListener_API12());
+        }
+
+        // Some arbitrary defaults to avoid a potential division by zero
+        mWidth = 1.0f;
+        mHeight = 1.0f;
+    }
+
+    public void handleResume() {
+        setFocusable(true);
+        setFocusableInTouchMode(true);
+        requestFocus();
+        setOnKeyListener(this);
+        setOnTouchListener(this);
+        enableSensor(Sensor.TYPE_ACCELEROMETER, true);
+    }
+
+    public Surface getNativeSurface() {
+        return getHolder().getSurface();
+    }
+
+    // Called when we have a valid drawing surface
+    @Override
+    public void surfaceCreated(SurfaceHolder holder) {
+        Log.v("SDL", "surfaceCreated()");
+        holder.setType(SurfaceHolder.SURFACE_TYPE_GPU);
+    }
+
+    // Called when we lose the surface
+    @Override
+    public void surfaceDestroyed(SurfaceHolder holder) {
+        Log.v("SDL", "surfaceDestroyed()");
+        // Call this *before* setting mIsSurfaceReady to 'false'
+        SDLActivity.handlePause();
+        SDLActivity.mIsSurfaceReady = false;
+        SDLActivity.onNativeSurfaceDestroyed();
+    }
+
+    // Called when the surface is resized
+    @Override
+    public void surfaceChanged(SurfaceHolder holder,
+                               int format, int width, int height) {
+        Log.v("SDL", "surfaceChanged()");
+
+        int sdlFormat = 0x15151002; // SDL_PIXELFORMAT_RGB565 by default
+        switch (format) {
+        case PixelFormat.A_8:
+            Log.v("SDL", "pixel format A_8");
+            break;
+        case PixelFormat.LA_88:
+            Log.v("SDL", "pixel format LA_88");
+            break;
+        case PixelFormat.L_8:
+            Log.v("SDL", "pixel format L_8");
+            break;
+        case PixelFormat.RGBA_4444:
+            Log.v("SDL", "pixel format RGBA_4444");
+            sdlFormat = 0x15421002; // SDL_PIXELFORMAT_RGBA4444
+            break;
+        case PixelFormat.RGBA_5551:
+            Log.v("SDL", "pixel format RGBA_5551");
+            sdlFormat = 0x15441002; // SDL_PIXELFORMAT_RGBA5551
+            break;
+        case PixelFormat.RGBA_8888:
+            Log.v("SDL", "pixel format RGBA_8888");
+            sdlFormat = 0x16462004; // SDL_PIXELFORMAT_RGBA8888
+            break;
+        case PixelFormat.RGBX_8888:
+            Log.v("SDL", "pixel format RGBX_8888");
+            sdlFormat = 0x16261804; // SDL_PIXELFORMAT_RGBX8888
+            break;
+        case PixelFormat.RGB_332:
+            Log.v("SDL", "pixel format RGB_332");
+            sdlFormat = 0x14110801; // SDL_PIXELFORMAT_RGB332
+            break;
+        case PixelFormat.RGB_565:
+            Log.v("SDL", "pixel format RGB_565");
+            sdlFormat = 0x15151002; // SDL_PIXELFORMAT_RGB565
+            break;
+        case PixelFormat.RGB_888:
+            Log.v("SDL", "pixel format RGB_888");
+            // Not sure this is right, maybe SDL_PIXELFORMAT_RGB24 instead?
+            sdlFormat = 0x16161804; // SDL_PIXELFORMAT_RGB888
+            break;
+        default:
+            Log.v("SDL", "pixel format unknown " + format);
+            break;
+        }
+
+        mWidth = width;
+        mHeight = height;
+        SDLActivity.onNativeResize(width, height, sdlFormat, mDisplay.getRefreshRate());
+        Log.v("SDL", "Window size: " + width + "x" + height);
+
+
+        boolean skip = false;
+        int requestedOrientation = SDLActivity.mSingleton.getRequestedOrientation();
+
+        if (requestedOrientation == ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED)
+        {
+            // Accept any
+        }
+        else if (requestedOrientation == ActivityInfo.SCREEN_ORIENTATION_PORTRAIT)
+        {
+            if (mWidth > mHeight) {
+               skip = true;
+            }
+        } else if (requestedOrientation == ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE) {
+            if (mWidth < mHeight) {
+               skip = true;
+            }
+        }
+
+        // Special Patch for Square Resolution: Black Berry Passport
+        if (skip) {
+           double min = Math.min(mWidth, mHeight);
+           double max = Math.max(mWidth, mHeight);
+
+           if (max / min < 1.20) {
+              Log.v("SDL", "Don't skip on such aspect-ratio. Could be a square resolution.");
+              skip = false;
+           }
+        }
+
+        if (skip) {
+           Log.v("SDL", "Skip .. Surface is not ready.");
+           return;
+        }
+
+
+        // Set mIsSurfaceReady to 'true' *before* making a call to handleResume
+        SDLActivity.mIsSurfaceReady = true;
+        SDLActivity.onNativeSurfaceChanged();
+
+
+        if (SDLActivity.mSDLThread == null) {
+            // This is the entry point to the C app.
+            // Start up the C app thread and enable sensor input for the first time
+
+            final Thread sdlThread = new Thread(new SDLMain(), "SDLThread");
+            enableSensor(Sensor.TYPE_ACCELEROMETER, true);
+            sdlThread.start();
+
+            // Set up a listener thread to catch when the native thread ends
+            SDLActivity.mSDLThread = new Thread(new Runnable(){
+                @Override
+                public void run(){
+                    try {
+                        sdlThread.join();
+                    }
+                    catch(Exception e){}
+                    finally{
+                        // Native thread has finished
+                        if (! SDLActivity.mExitCalledFromJava) {
+                            SDLActivity.handleNativeExit();
+                        }
+                    }
+                }
+            }, "SDLThreadListener");
+            SDLActivity.mSDLThread.start();
+        }
+
+        if (SDLActivity.mHasFocus) {
+            SDLActivity.handleResume();
+        }
+    }
+
+    // unused
+    @Override
+    public void onDraw(Canvas canvas) {}
+
+
+    // Key events
+    @Override
+    public boolean onKey(View  v, int keyCode, KeyEvent event) {
+        // Dispatch the different events depending on where they come from
+        // Some SOURCE_DPAD or SOURCE_GAMEPAD are also SOURCE_KEYBOARD
+        // So, we try to process them as DPAD or GAMEPAD events first, if that fails we try them as KEYBOARD
+
+        if ( (event.getSource() & InputDevice.SOURCE_GAMEPAD) != 0 ||
+                   (event.getSource() & InputDevice.SOURCE_DPAD) != 0 ) {
+            if (event.getAction() == KeyEvent.ACTION_DOWN) {
+                if (SDLActivity.onNativePadDown(event.getDeviceId(), keyCode) == 0) {
+                    return true;
+                }
+            } else if (event.getAction() == KeyEvent.ACTION_UP) {
+                if (SDLActivity.onNativePadUp(event.getDeviceId(), keyCode) == 0) {
+                    return true;
+                }
+            }
+        }
+
+        if( (event.getSource() & InputDevice.SOURCE_KEYBOARD) != 0) {
+            if (event.getAction() == KeyEvent.ACTION_DOWN) {
+                //LogUtil.v("SDL", "key down: " + keyCode);
+                SDLActivity.onNativeKeyDown(keyCode);
+                return true;
+            }
+            else if (event.getAction() == KeyEvent.ACTION_UP) {
+                //LogUtil.v("SDL", "key up: " + keyCode);
+                SDLActivity.onNativeKeyUp(keyCode);
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    // Touch events
+    @Override
+    public boolean onTouch(View v, MotionEvent event) {
+        /* Ref: http://developer.android.com/training/gestures/multi.html */
+        final int touchDevId = event.getDeviceId();
+        final int pointerCount = event.getPointerCount();
+        int action = event.getActionMasked();
+        int pointerFingerId;
+        int mouseButton;
+        int i = -1;
+        float x,y,p;
+
+        // !!! FIXME: dump this SDK check after 2.0.4 ships and require API14.
+
+        // RAPT: Got rid of the mSeparateMouseAndTouch check. We want mouse events (since we'd like
+        // to know about the right mouse button), but we also want to generate mouse events for
+        // touches, so we can't use the hint.
+
+        if (event.getSource() == InputDevice.SOURCE_MOUSE) {
+            if (Build.VERSION.SDK_INT < 14) {
+                mouseButton = 1;    // For Android==12 all mouse buttons are the left button
+            } else {
+                try {
+                    mouseButton = (Integer) event.getClass().getMethod("getButtonState").invoke(event);
+                } catch(Exception e) {
+                    mouseButton = 1;    // oh well.
+                }
+            }
+            SDLActivity.onNativeMouse(mouseButton, action, event.getX(0), event.getY(0));
+        } else {
+            switch(action) {
+                case MotionEvent.ACTION_MOVE:
+                    for (i = 0; i < pointerCount; i++) {
+                        pointerFingerId = event.getPointerId(i);
+                        x = event.getX(i) / mWidth;
+                        y = event.getY(i) / mHeight;
+                        p = event.getPressure(i);
+                        if (p > 1.0f) {
+                            // may be larger than 1.0f on some devices
+                            // see the documentation of getPressure(i)
+                            p = 1.0f;
+                        }
+                        SDLActivity.onNativeTouch(touchDevId, pointerFingerId, action, x, y, p);
+                    }
+                    break;
+
+                case MotionEvent.ACTION_UP:
+                case MotionEvent.ACTION_DOWN:
+                    // Primary pointer up/down, the index is always zero
+                    i = 0;
+                case MotionEvent.ACTION_POINTER_UP:
+                case MotionEvent.ACTION_POINTER_DOWN:
+                    // Non primary pointer up/down
+                    if (i == -1) {
+                        i = event.getActionIndex();
+                    }
+
+                    pointerFingerId = event.getPointerId(i);
+                    x = event.getX(i) / mWidth;
+                    y = event.getY(i) / mHeight;
+                    p = event.getPressure(i);
+                    if (p > 1.0f) {
+                        // may be larger than 1.0f on some devices
+                        // see the documentation of getPressure(i)
+                        p = 1.0f;
+                    }
+                    SDLActivity.onNativeTouch(touchDevId, pointerFingerId, action, x, y, p);
+                    break;
+
+                case MotionEvent.ACTION_CANCEL:
+                    for (i = 0; i < pointerCount; i++) {
+                        pointerFingerId = event.getPointerId(i);
+                        x = event.getX(i) / mWidth;
+                        y = event.getY(i) / mHeight;
+                        p = event.getPressure(i);
+                        if (p > 1.0f) {
+                            // may be larger than 1.0f on some devices
+                            // see the documentation of getPressure(i)
+                            p = 1.0f;
+                        }
+                        SDLActivity.onNativeTouch(touchDevId, pointerFingerId, MotionEvent.ACTION_UP, x, y, p);
+                    }
+                    break;
+
+                default:
+                    break;
+            }
+        }
+
+        return true;
+   }
+
+    // Sensor events
+    public void enableSensor(int sensortype, boolean enabled) {
+        // TODO: This uses getDefaultSensor - what if we have >1 accels?
+        if (enabled) {
+            mSensorManager.registerListener(this,
+                            mSensorManager.getDefaultSensor(sensortype),
+                            SensorManager.SENSOR_DELAY_GAME, null);
+        } else {
+            mSensorManager.unregisterListener(this,
+                            mSensorManager.getDefaultSensor(sensortype));
+        }
+    }
+
+    @Override
+    public void onAccuracyChanged(Sensor sensor, int accuracy) {
+        // TODO
+    }
+
+    @Override
+    public void onSensorChanged(SensorEvent event) {
+        if (event.sensor.getType() == Sensor.TYPE_ACCELEROMETER) {
+            float x, y;
+            switch (mDisplay.getRotation()) {
+                case Surface.ROTATION_90:
+                    x = -event.values[1];
+                    y = event.values[0];
+                    break;
+                case Surface.ROTATION_270:
+                    x = event.values[1];
+                    y = -event.values[0];
+                    break;
+                case Surface.ROTATION_180:
+                    x = -event.values[1];
+                    y = -event.values[0];
+                    break;
+                default:
+                    x = event.values[0];
+                    y = event.values[1];
+                    break;
+            }
+            SDLActivity.onNativeAccel(-x / SensorManager.GRAVITY_EARTH,
+                                      y / SensorManager.GRAVITY_EARTH,
+                                      event.values[2] / SensorManager.GRAVITY_EARTH - 1);
+        }
+    }
+}
+
+/* This is a fake invisible editor view that receives the input and defines the
+ * pan&scan region
+ */
+class DummyEdit extends View implements View.OnKeyListener {
+    InputConnection ic;
+
+    public DummyEdit(Context context) {
+        super(context);
+        setFocusableInTouchMode(true);
+        setFocusable(true);
+        setOnKeyListener(this);
+    }
+
+    @Override
+    public boolean onCheckIsTextEditor() {
+        return true;
+    }
+
+    @Override
+    public boolean onKey(View v, int keyCode, KeyEvent event) {
+
+        // This handles the hardware keyboard input
+        if (event.isPrintingKey()) {
+            if (event.getAction() == KeyEvent.ACTION_DOWN) {
+                ic.commitText(String.valueOf((char) event.getUnicodeChar()), 1);
+            }
+            return true;
+        }
+
+        if (event.getAction() == KeyEvent.ACTION_DOWN) {
+            SDLActivity.onNativeKeyDown(keyCode);
+            return true;
+        } else if (event.getAction() == KeyEvent.ACTION_UP) {
+            SDLActivity.onNativeKeyUp(keyCode);
+            return true;
+        }
+
+        return false;
+    }
+
+    //
+    @Override
+    public boolean onKeyPreIme (int keyCode, KeyEvent event) {
+        // As seen on StackOverflow: http://stackoverflow.com/questions/7634346/keyboard-hide-event
+        // FIXME: Discussion at http://bugzilla.libsdl.org/show_bug.cgi?id=1639
+        // FIXME: This is not a 100% effective solution to the problem of detecting if the keyboard is showing or not
+        // FIXME: A more effective solution would be to change our Layout from AbsoluteLayout to Relative or Linear
+        // FIXME: And determine the keyboard presence doing this: http://stackoverflow.com/questions/2150078/how-to-check-visibility-of-software-keyboard-in-android
+        // FIXME: An even more effective way would be if Android provided this out of the box, but where would the fun be in that :)
+        if (event.getAction()==KeyEvent.ACTION_UP && keyCode == KeyEvent.KEYCODE_BACK) {
+            if (SDLActivity.mTextEdit != null && SDLActivity.mTextEdit.getVisibility() == View.VISIBLE) {
+                SDLActivity.onNativeKeyboardFocusLost();
+            }
+        }
+        return super.onKeyPreIme(keyCode, event);
+    }
+
+    @Override
+    public InputConnection onCreateInputConnection(EditorInfo outAttrs) {
+        ic = new SDLInputConnection(this, true);
+
+        outAttrs.imeOptions = EditorInfo.IME_FLAG_NO_EXTRACT_UI
+                | 33554432 /* API 11: EditorInfo.IME_FLAG_NO_FULLSCREEN */;
+
+        return ic;
+    }
+}
+
+class SDLInputConnection extends BaseInputConnection {
+
+    public SDLInputConnection(View targetView, boolean fullEditor) {
+        super(targetView, fullEditor);
+
+    }
+
+    @Override
+    public boolean sendKeyEvent(KeyEvent event) {
+
+        /*
+         * This handles the keycodes from soft keyboard (and IME-translated
+         * input from hardkeyboard)
+         */
+        int keyCode = event.getKeyCode();
+        if (event.getAction() == KeyEvent.ACTION_DOWN) {
+
+            if (event.getUnicodeChar() != 0) {
+                commitText(String.valueOf((char) event.getUnicodeChar()), 1);
+            }
+
+            SDLActivity.onNativeKeyDown(keyCode);
+
+            return true;
+        } else if (event.getAction() == KeyEvent.ACTION_UP) {
+
+            SDLActivity.onNativeKeyUp(keyCode);
+            return true;
+        }
+        return super.sendKeyEvent(event);
+    }
+
+    @Override
+    public boolean commitText(CharSequence text, int newCursorPosition) {
+
+        nativeCommitText(text.toString(), newCursorPosition);
+
+        return super.commitText(text, newCursorPosition);
+    }
+
+    @Override
+    public boolean setComposingText(CharSequence text, int newCursorPosition) {
+
+        nativeSetComposingText(text.toString(), newCursorPosition);
+
+        return super.setComposingText(text, newCursorPosition);
+    }
+
+    public native void nativeCommitText(String text, int newCursorPosition);
+
+    public native void nativeSetComposingText(String text, int newCursorPosition);
+
+    @Override
+    public boolean deleteSurroundingText(int beforeLength, int afterLength) {
+        // Workaround to capture backspace key. Ref: http://stackoverflow.com/questions/14560344/android-backspace-in-webview-baseinputconnection
+        if (beforeLength == 1 && afterLength == 0) {
+            // backspace
+            return super.sendKeyEvent(new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DEL))
+                && super.sendKeyEvent(new KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_DEL));
+        }
+
+        return super.deleteSurroundingText(beforeLength, afterLength);
+    }
+}
+
+/* A null joystick handler for API level < 12 devices (the accelerometer is handled separately) */
+class SDLJoystickHandler {
+
+    /**
+     * Handles given MotionEvent.
+     * @param event the event to be handled.
+     * @return if given event was processed.
+     */
+    public boolean handleMotionEvent(MotionEvent event) {
+        return false;
+    }
+
+    /**
+     * Handles adding and removing of input devices.
+     */
+    public void pollInputDevices() {
+    }
+}
+
+/* Actual joystick functionality available for API >= 12 devices */
+class SDLJoystickHandler_API12 extends SDLJoystickHandler {
+
+    static class SDLJoystick {
+        public int device_id;
+        public String name;
+        public ArrayList<InputDevice.MotionRange> axes;
+        public ArrayList<InputDevice.MotionRange> hats;
+    }
+    static class RangeComparator implements Comparator<InputDevice.MotionRange> {
+        @Override
+        public int compare(InputDevice.MotionRange arg0, InputDevice.MotionRange arg1) {
+            return arg0.getAxis() - arg1.getAxis();
+        }
+    }
+
+    private ArrayList<SDLJoystick> mJoysticks;
+
+    public SDLJoystickHandler_API12() {
+
+        mJoysticks = new ArrayList<SDLJoystick>();
+    }
+
+    @Override
+    public void pollInputDevices() {
+        int[] deviceIds = InputDevice.getDeviceIds();
+        // It helps processing the device ids in reverse order
+        // For example, in the case of the XBox 360 wireless dongle,
+        // so the first controller seen by SDL matches what the receiver
+        // considers to be the first controller
+
+        for(int i=deviceIds.length-1; i>-1; i--) {
+            SDLJoystick joystick = getJoystick(deviceIds[i]);
+            if (joystick == null) {
+                joystick = new SDLJoystick();
+                InputDevice joystickDevice = InputDevice.getDevice(deviceIds[i]);
+
+                if (
+                      (joystickDevice.getSources() & InputDevice.SOURCE_CLASS_JOYSTICK) != 0
+                   ||
+                      (joystickDevice.getSources() & InputDevice.SOURCE_CLASS_BUTTON) != 0
+                  )
+                {
+                    joystick.device_id = deviceIds[i];
+                    joystick.name = joystickDevice.getName();
+                    joystick.axes = new ArrayList<InputDevice.MotionRange>();
+                    joystick.hats = new ArrayList<InputDevice.MotionRange>();
+
+                    List<InputDevice.MotionRange> ranges = joystickDevice.getMotionRanges();
+                    Collections.sort(ranges, new RangeComparator());
+                    for (InputDevice.MotionRange range : ranges ) {
+                        if ((range.getSource() & InputDevice.SOURCE_CLASS_JOYSTICK) != 0 ) {
+                            if (range.getAxis() == MotionEvent.AXIS_HAT_X ||
+                                range.getAxis() == MotionEvent.AXIS_HAT_Y) {
+                                joystick.hats.add(range);
+                            }
+                            else {
+                                joystick.axes.add(range);
+                            }
+                        }
+                    }
+
+                    mJoysticks.add(joystick);
+                    SDLActivity.nativeAddJoystick(joystick.device_id, joystick.name, 0, -1,
+                                                  joystick.axes.size(), joystick.hats.size()/2, 0);
+                }
+            }
+        }
+
+        /* Check removed devices */
+        ArrayList<Integer> removedDevices = new ArrayList<Integer>();
+        for(int i=0; i < mJoysticks.size(); i++) {
+            int device_id = mJoysticks.get(i).device_id;
+            int j;
+            for (j=0; j < deviceIds.length; j++) {
+                if (device_id == deviceIds[j]) break;
+            }
+            if (j == deviceIds.length) {
+                removedDevices.add(Integer.valueOf(device_id));
+            }
+        }
+
+        for(int i=0; i < removedDevices.size(); i++) {
+            int device_id = removedDevices.get(i).intValue();
+            SDLActivity.nativeRemoveJoystick(device_id);
+            for (int j=0; j < mJoysticks.size(); j++) {
+                if (mJoysticks.get(j).device_id == device_id) {
+                    mJoysticks.remove(j);
+                    break;
+                }
+            }
+        }
+    }
+
+    protected SDLJoystick getJoystick(int device_id) {
+        for(int i=0; i < mJoysticks.size(); i++) {
+            if (mJoysticks.get(i).device_id == device_id) {
+                return mJoysticks.get(i);
+            }
+        }
+        return null;
+    }
+
+    @Override
+    public boolean handleMotionEvent(MotionEvent event) {
+        if ( (event.getSource() & InputDevice.SOURCE_JOYSTICK) != 0) {
+            int actionPointerIndex = event.getActionIndex();
+            int action = event.getActionMasked();
+            switch(action) {
+                case MotionEvent.ACTION_MOVE:
+                    SDLJoystick joystick = getJoystick(event.getDeviceId());
+                    if ( joystick != null ) {
+                        for (int i = 0; i < joystick.axes.size(); i++) {
+                            InputDevice.MotionRange range = joystick.axes.get(i);
+                            /* Normalize the value to -1...1 */
+                            float value = ( event.getAxisValue( range.getAxis(), actionPointerIndex) - range.getMin() ) / range.getRange() * 2.0f - 1.0f;
+                            SDLActivity.onNativeJoy(joystick.device_id, i, value );
+                        }
+                        for (int i = 0; i < joystick.hats.size(); i+=2) {
+                            int hatX = Math.round(event.getAxisValue( joystick.hats.get(i).getAxis(), actionPointerIndex ) );
+                            int hatY = Math.round(event.getAxisValue( joystick.hats.get(i+1).getAxis(), actionPointerIndex ) );
+                            SDLActivity.onNativeHat(joystick.device_id, i/2, hatX, hatY );
+                        }
+                    }
+                    break;
+                default:
+                    break;
+            }
+        }
+        return true;
+    }
+}
+
+class SDLGenericMotionListener_API12 implements View.OnGenericMotionListener {
+    // Generic Motion (mouse hover, joystick...) events go here
+    @Override
+    public boolean onGenericMotion(View v, MotionEvent event) {
+        float x, y;
+        int mouseButton;
+        int action;
+
+        switch ( event.getSource() ) {
+            case InputDevice.SOURCE_JOYSTICK:
+            case InputDevice.SOURCE_GAMEPAD:
+            case InputDevice.SOURCE_DPAD:
+                SDLActivity.handleJoystickMotionEvent(event);
+                return true;
+
+            case InputDevice.SOURCE_MOUSE:
+                action = event.getActionMasked();
+                switch (action) {
+                    case MotionEvent.ACTION_SCROLL:
+                        x = event.getAxisValue(MotionEvent.AXIS_HSCROLL, 0);
+                        y = event.getAxisValue(MotionEvent.AXIS_VSCROLL, 0);
+                        SDLActivity.onNativeMouse(0, action, x, y);
+                        return true;
+
+                    case MotionEvent.ACTION_HOVER_MOVE:
+                        x = event.getX(0);
+                        y = event.getY(0);
+
+                        SDLActivity.onNativeMouse(0, action, x, y);
+                        return true;
+
+                    default:
+                        break;
+                }
+
+            default:
+                break;
+        }
+
+        // Event was not managed
+        return false;
+    }
+}
diff --git a/qpysdk/src/main/java/org/qpython/qpysdk/Exec.java b/qpysdk/src/main/java/org/qpython/qpysdk/Exec.java
new file mode 100644
index 00000000..e1a98307
--- /dev/null
+++ b/qpysdk/src/main/java/org/qpython/qpysdk/Exec.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright (C) 2007 The Android Open Source Project
+ *
+ * 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.
+ */
+
+package org.qpython.qpysdk;
+
+import java.io.FileDescriptor;
+
+/**
+ * Tools for executing commands.
+ */
+public class Exec {
+  /**
+   * @param command
+   *          The command to execute
+   * @param arguments
+   *          The first argument to the command, may be null
+   * @param environmentVariables
+   *          the second argument to the command, may be null
+   * @param workingDirectory
+   * @return the file descriptor of the started process.
+   * 
+   */
+  public static FileDescriptor createSubprocess(String command, String[] arguments,
+      String[] environmentVariables, String workingDirectory) {
+    return createSubprocess(command, arguments, environmentVariables, workingDirectory, null);
+  }
+
+  /**
+   * @param command
+   *          The command to execute
+   * @param arguments
+   *          Array of arguments, may be null
+   * @param environmentVariables
+   *          Array of environment variables, may be null
+   * @param processId
+   *          A one-element array to which the process ID of the started process will be written.
+   * @return the file descriptor of the opened process's psuedo-terminal.
+   * 
+   */
+  public static native FileDescriptor createSubprocess(String command, String[] arguments,
+      String[] environmentVariables, String workingDirectory, int[] processId);
+
+  public static native void setPtyWindowSize(FileDescriptor fd, int row, int col, int xpixel,
+      int ypixel);
+
+  /**
+   * Causes the calling thread to wait for the process associated with the receiver to finish
+   * executing.
+   * 
+   * @return The exit value of the Process being waited on
+   * 
+   */
+  public static native int waitFor(int processId);
+  public static native void nativeSetEnv(String name, String value);
+  public static native void nativeInit();
+
+  static {
+    System.loadLibrary("qpysdk");
+  }
+}
diff --git a/qpysdk/src/main/java/org/qpython/qpysdk/QPyConstants.java b/qpysdk/src/main/java/org/qpython/qpysdk/QPyConstants.java
new file mode 100644
index 00000000..bf9ebd1d
--- /dev/null
+++ b/qpysdk/src/main/java/org/qpython/qpysdk/QPyConstants.java
@@ -0,0 +1,46 @@
+package org.qpython.qpysdk;
+
+import android.os.Environment;
+
+import com.quseit.config.BASE_CONF;
+
+public interface QPyConstants extends BASE_CONF {
+
+    final String WEB_PROJECT     = "web";
+    final String CONSOLE_PROJECT = "console";
+    final String KIVY_PROJECT    = "kivy";
+    final String PYGAME_PROJECT    = "pygame";
+    final String QUIET_PROJECT    = "quiet";
+    final String QSL4A_PROJECT    = "qsl4a";
+
+    String BASE_PATH         = "qpython";
+    String AD_URL            = "https://apu2.quseit.com/ad/";
+
+    String UPDATE_URL  = "https://apu2.quseit.com/conf/update/";
+    String LOG_URL     = "https://apu2.quseit.com/conf/log/";
+    String IAP_LOG_URL = "https://apu2.quseit.com/conf/iaplog/";
+
+    String DFROM_RUN   = ".runtime";
+    String PY_CACHE    = ".qpyc";
+
+    String DFROM_QPY2 = "scripts";
+    String DFROM_QPY3 = "scripts3";
+    String DFROM_PRJ2 = "projects";
+    String DFROM_PRJ3 = "projects3";
+
+    final String KEY_PY3_RES = "setting.py3resource.path";
+    final String KEY_NOTEBOOK_RES = "setting.notebook3sresource.path";
+    final String KEY_NOTEBOOK2_RES = "setting.notebook2resource.path";
+
+
+    String ABSOLUTE_PATH = Environment.getExternalStorageDirectory().getPath() + "/" + BASE_PATH;
+    String PY_CACHE_PATH = ABSOLUTE_PATH+"/"+PY_CACHE;
+    String ABSOLUTE_LOG = ABSOLUTE_PATH + "/log/last.log";
+
+    String PYTHON_2 = "2.x";
+
+    String QPYC3 = "https://dl.qpy.io/py3.json";
+    String QPYC2COMPATIBLE = "https://dl.qpy.io/py2compatible.json";
+    String QPYC3_VER_KEY= "setting.py3resource.ver";
+    String QPYC2COMPATIBLE_VER_KEY="setting.py2compatibleresource.ver";
+}
diff --git a/qpysdk/src/main/java/org/qpython/qpysdk/QPySDK.java b/qpysdk/src/main/java/org/qpython/qpysdk/QPySDK.java
index 1881c431..516f523e 100644
--- a/qpysdk/src/main/java/org/qpython/qpysdk/QPySDK.java
+++ b/qpysdk/src/main/java/org/qpython/qpysdk/QPySDK.java
@@ -6,8 +6,10 @@
 import android.os.Environment;
 import android.os.Message;
 import android.util.Log;
+import android.widget.Toast;
 
 import org.qpython.qpysdk.utils.AssetExtract;
+import org.qpython.qpysdk.utils.FileExtract;
 import org.qpython.qpysdk.utils.FileUtils;
 import org.qpython.qpysdk.utils.ResourceManager;
 import org.qpython.qpysdk.utils.StreamGobbler;
@@ -15,6 +17,7 @@
 import java.io.File;
 import java.io.FileDescriptor;
 import java.io.FileInputStream;
+import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -29,18 +32,16 @@
  */
 public class QPySDK {
 
-    private final String TAG = "QPySDK";
-    private ResourceManager resourceManager;
-
-    Context context;
+    private static final int    PID_INIT_VALUE      = -1;
+    private static final int    DEFAULT_BUFFER_SIZE = 8192;
+    private final        String TAG                 = "QPySDK";
+    Context  context;
     Activity activity;
-
     ArrayList<String> mArguments = new ArrayList<String>();
-    private static final int PID_INIT_VALUE = -1;
-    private static final int DEFAULT_BUFFER_SIZE = 8192;
-    InputStream mIn;
-    OutputStream mOut;
+    InputStream    mIn;
+    OutputStream   mOut;
     FileDescriptor mFd;
+    private ResourceManager resourceManager;
 
     public QPySDK(Context con, Activity act) {
         resourceManager = new ResourceManager(act);
@@ -48,20 +49,25 @@ public QPySDK(Context con, Activity act) {
         context = con;
     }
 
-    void _recursiveDelete(File f) {
-        if (f.isDirectory()) {
-            if (f.listFiles()!=null) {
-                for (File r : f.listFiles()) {
-                    _recursiveDelete(r);
+    public static void  recursiveDelete(String path) {
+        _recursiveDelete(new File(path));
+    }
+    static void _recursiveDelete(File f) {
+        if (f.exists()) {
+            if (f.isDirectory()) {
+                if (f.listFiles() != null) {
+                    for (File r : f.listFiles()) {
+                        if (!f.getName().equals(".") && !f.getName().equals("..")) {
+                            _recursiveDelete(r);
+                        }
+                    }
                 }
             }
+            f.delete();
         }
-        f.delete();
     }
 
 
-
-
     public void runPyService() {
         Log.d(TAG, "runPyService");
         String launchScript = this.context.getFilesDir() + "/main.py";
@@ -88,11 +94,10 @@ public void playQScript(final String script) {
         mArguments.add(script);
         String[] argumentsArray = mArguments.toArray(new String[mArguments.size()]);
 
-        final File mLog = new File(String.format("%s", Environment.getExternalStorageDirectory() + "/.qpysdk.run.log"));
+        final File mLog = new File(String.format("%s", QPyConstants.ABSOLUTE_LOG));
         File logDir = mLog.getParentFile();
 
-        mFd = com.googlecode.android_scripting.Exec.createSubprocess(binaryPath, argumentsArray, getEnvironmentArray(f.getParentFile() + ""), Environment.getExternalStorageDirectory() + "/", pid);
-        //Log.d("QPY", "binaryPath:"+binaryPath+"-argumentsArray:"+argumentsArray+"-getEnvironmentArray:"+getEnvironmentArray()+"-getWorkingDirectory:"+getWorkingDirectory()+"-pid:"+pid);
+        mFd = Exec.createSubprocess(binaryPath, argumentsArray, getEnvironmentArray(f.getParentFile() + ""), Environment.getExternalStorageDirectory() + "/", pid);
         final AtomicInteger mPid = new AtomicInteger(PID_INIT_VALUE);
 
         mPid.set(pid[0]);
@@ -103,7 +108,7 @@ public void playQScript(final String script) {
 
         new Thread(new Runnable() {
             public void run() {
-                int returnValue = com.googlecode.android_scripting.Exec.waitFor(mPid.get());
+                int returnValue = Exec.waitFor(mPid.get());
                 //long mEndTime = System.currentTimeMillis();
                 int pid = mPid.getAndSet(PID_INIT_VALUE);
                 Log.d("", "out:" + mFd.out.toString());
@@ -153,7 +158,6 @@ private String[] getEnvironmentArray(String pyPath) {
                 + filesDir + "/lib/python2.7/lib-dynload/:"
                 + pyPath);
 
-
         //environmentVariables.add("PYTHONSTARTUP=" + externalStorage + "/lib/python2.7/site-packages/qpythoninit.py");
         environmentVariables.add("PYTHONOPTIMIZE=2");
 
@@ -165,7 +169,6 @@ private String[] getEnvironmentArray(String pyPath) {
             td.mkdirs();
         }
 
-
         environmentVariables.add("ANDROID_PUBLIC=" + externalStorage);
         environmentVariables.add("ANDROID_PRIVATE=" + this.context.getFilesDir().getAbsolutePath());
         environmentVariables.add("ANDROID_ARGUMENT=" + pyPath);
@@ -178,12 +181,116 @@ private String[] getEnvironmentArray(String pyPath) {
         return environment;
     }
 
+    public void extractRes(File file, File target, boolean forceExtrac) {
+        String fileName = file.getName().startsWith(".") ? file.getName().substring(1, file.getName().length()) : file.getName();
+        fileName = fileName.substring(0, !file.getName().contains(".") ? file.getName().length() : file.getName().indexOf("."));
+
+        String data_version = resourceManager.getString(fileName + "_version");
+        if (data_version==null) {
+            data_version = "0";
+        }
+        String disk_version = "0";
+
+        Log.d(TAG, "extractRes:"+fileName+"["+data_version+"]"+"["+disk_version+"]");
+
+        String disk_version_fn = target.getAbsolutePath() + "/" + fileName + ".version";
+        try {
+            byte buf[] = new byte[64];
+            InputStream is = new FileInputStream(disk_version_fn);
+            int len = is.read(buf);
+            disk_version = new String(buf, 0, len);
+            is.close();
+        } catch (FileNotFoundException e) {
+            disk_version = "0";
+        } catch (IOException e) {
+            disk_version = "0";
+        }
+
+        if ((int) (Double.parseDouble(data_version) - Double.parseDouble(disk_version)) > 0 || disk_version.equals("0") || forceExtrac) {
+            target.mkdirs();
+            if (!new FileExtract().extractTar(file, target.getAbsolutePath())) {
+                Log.d(TAG,"Could not extract " + fileName + " data.");
+            }
+        }
+
+        chmodX();
+    }
+
+    public void extractRes(final String resource, File target, boolean force) {
+        // The version of data in memory and on disk.
+        String data_version = resourceManager.getString(resource + "_version");
+        String disk_version = "0";
+
+        //LogUtil.d(TAG, "data_version:"+data_version+"-"+resource + "_version"+"-"+resourceManager);
+        // If no version, no unpacking is necessary.
+        if (data_version == null) {
+            return;
+        }
+
+        // Check the current disk version, if any.
+        String filesDir = target.getAbsolutePath();
+        String disk_version_fn = filesDir + "/" + resource + ".version";
+
+        try {
+            byte buf[] = new byte[64];
+            InputStream is = new FileInputStream(disk_version_fn);
+            int len = is.read(buf);
+            disk_version = new String(buf, 0, len);
+            is.close();
+        } catch (Exception e) {
+            disk_version = "0";
+        }
+
+
+        //LogUtil.d(TAG, "data_version:"+Math.round(Double.parseDouble(data_version))+"-disk_version:"+Math.round(Double.parseDouble(disk_version))+"-RET:"+(int)(Double.parseDouble(data_version)-Double.parseDouble(disk_version)));
+        if (((int) (Double.parseDouble(data_version) - Double.parseDouble(disk_version)) > 0 || disk_version.equals("0"))
+                || force) {
+            Log.v(TAG, "Extracting " + resource + " assets.");
+
+            //recursiveDelete(target);
+            target.mkdirs();
+
+            AssetExtract ae = new AssetExtract(this.activity);
+            boolean ret = ae.extractTar(resource + ".mp3", target.getAbsolutePath());
+            if (!ret) {
+                //Toast.makeText(this.context, "Could not extract " + resource + " data, please reinstall and make sure your device have enough space", Toast.LENGTH_SHORT).show();
+            } else {
+
+                try {
+                /*if (resource.equals("private")) {
+                    Toast.makeText(getApplicationContext(), R.string.first_load, Toast.LENGTH_SHORT).show();
+            	}*/
+                    // Write .nomedia.
+                    new File(target, ".nomedia").createNewFile();
+
+                    // Write version file.
+                    FileOutputStream os = new FileOutputStream(disk_version_fn);
+                    os.write(data_version.getBytes());
+                    os.close();
+                } catch (Exception e) {
+                    Log.w("python", e);
+                    Toast.makeText(this.context, "Could not extract " + resource + " data, make sure your device have enough space.", Toast.LENGTH_LONG);
+                }
+            }
+        } else {
+            Log.d(TAG, "NO EXTRACT");
+
+        }
+        if (resource.startsWith("private") || resource.startsWith("notebook")) {
+            chmodX();
+        }
+    }
 
     public void extractRes(final String resource, File target) {
+        extractRes( resource, target, false);
+    }
+
+
+    public void extractRes2(final String resource, File target) {
         Log.d(TAG, "extractRes:" + target);
         // The version of data in memory and on disk.
         String data_version = resourceManager.getString(resource + "_version");
-        String disk_version = null;
+        String disk_version;
 
         // If no version, no unpacking is necessary.
         if (data_version == null) {
@@ -209,12 +316,13 @@ public void extractRes(final String resource, File target) {
         if (!data_version.equals(disk_version)) {
             Log.v("python", "Extracting " + resource + " assets.");
 
-            _recursiveDelete(target);
+            //_recursiveDelete(target);
             target.mkdirs();
 
             AssetExtract ae = new AssetExtract(activity);
             if (!ae.extractTar(resource + ".mp3", target.getAbsolutePath())) {
                 //toastError("Could not extract " + resource + " data.");
+//            if (!ae.copyFromAssetsToInternalStorage(resource + ".zip")) {
             } else {
 
                 try {
@@ -230,20 +338,23 @@ public void extractRes(final String resource, File target) {
             }
         }
 
-        if (resource.startsWith("private")) {
-            File bind = new File(this.context.getFilesDir() + "/bin");
-            if (bind.listFiles() != null) {
-                for (File bin : bind.listFiles()) {
-                    try {
-                        //Log.d(TAG, "chmod:"+bin.getAbsolutePath());
+        if (resource.startsWith("private") || resource.startsWith("notebook")) {
+            chmodX();
+        }
+    }
 
-                        FileUtils.chmod(bin, 0755);
-                    } catch (Exception e1) {
-                        e1.printStackTrace();
-                    }
+    private void chmodX () {
+        File bind = new File(this.context.getFilesDir() + "/bin");
+        if (bind.listFiles() != null) {
+            for (File bin : bind.listFiles()) {
+                try {
+                    //LogUtil.d(TAG, "chmod:"+bin.getAbsolutePath());
+
+                    FileUtils.chmod(bin, 0755);
+                } catch (Exception e1) {
+                    e1.printStackTrace();
                 }
             }
         }
-
     }
 }
diff --git a/qpysdk/src/main/java/org/qpython/qpysdk/jtar/Octal.java b/qpysdk/src/main/java/org/qpython/qpysdk/jtar/Octal.java
deleted file mode 100644
index 265cc29d..00000000
--- a/qpysdk/src/main/java/org/qpython/qpysdk/jtar/Octal.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/**
- * Copyright 2010 Xeus Technologies 
- * 
- * 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. 
- * 
- */
-
-package org.qpython.qpysdk.jtar;
-
-/**
- * @author Kamran Zafar
- * 
- */
-public class Octal {
-
-    /**
-     * Parse an octal string from a header buffer. This is used for the file
-     * permission mode value.
-     * 
-     * @param header
-     *            The header buffer from which to parse.
-     * @param offset
-     *            The offset into the buffer from which to parse.
-     * @param length
-     *            The number of header bytes to parse.
-     * 
-     * @return The long value of the octal string.
-     */
-    public static long parseOctal(byte[] header, int offset, int length) {
-        long result = 0;
-        boolean stillPadding = true;
-
-        int end = offset + length;
-        for( int i = offset; i < end; ++i ) {
-            if( header[i] == 0 )
-                break;
-
-            if( header[i] == (byte) ' ' || header[i] == '0' ) {
-                if( stillPadding )
-                    continue;
-
-                if( header[i] == (byte) ' ' )
-                    break;
-            }
-
-            stillPadding = false;
-
-            result = ( result << 3 ) + ( header[i] - '0' );
-        }
-
-        return result;
-    }
-
-    /**
-     * Parse an octal integer from a header buffer.
-     * 
-     * @param value
-     * @param buf
-     *            The header buffer from which to parse.
-     * @param offset
-     *            The offset into the buffer from which to parse.
-     * @param length
-     *            The number of header bytes to parse.
-     * 
-     * @return The integer value of the octal bytes.
-     */
-    public static int getOctalBytes(long value, byte[] buf, int offset, int length) {
-        int idx = length - 1;
-
-        buf[offset + idx] = 0;
-        --idx;
-        buf[offset + idx] = (byte) ' ';
-        --idx;
-
-        if( value == 0 ) {
-            buf[offset + idx] = (byte) '0';
-            --idx;
-        } else {
-            for( long val = value; idx >= 0 && val > 0; --idx ) {
-                buf[offset + idx] = (byte) ( (byte) '0' + (byte) ( val & 7 ) );
-                val = val >> 3;
-            }
-        }
-
-        for( ; idx >= 0; --idx ) {
-            buf[offset + idx] = (byte) ' ';
-        }
-
-        return offset + length;
-    }
-
-    /**
-     * Parse the checksum octal integer from a header buffer.
-     * 
-     * @param value
-     * @param buf
-     *            The header buffer from which to parse.
-     * @param offset
-     *            The offset into the buffer from which to parse.
-     * @param length
-     *            The number of header bytes to parse.
-     * @return The integer value of the entry's checksum.
-     */
-    public static int getCheckSumOctalBytes(long value, byte[] buf, int offset, int length) {
-        getOctalBytes( value, buf, offset, length );
-        buf[offset + length - 1] = (byte) ' ';
-        buf[offset + length - 2] = 0;
-        return offset + length;
-    }
-
-    /**
-     * Parse an octal long integer from a header buffer.
-     * 
-     * @param value
-     * @param buf
-     *            The header buffer from which to parse.
-     * @param offset
-     *            The offset into the buffer from which to parse.
-     * @param length
-     *            The number of header bytes to parse.
-     * 
-     * @return The long value of the octal bytes.
-     */
-    public static int getLongOctalBytes(long value, byte[] buf, int offset, int length) {
-        byte[] temp = new byte[length + 1];
-        getOctalBytes( value, temp, 0, length + 1 );
-        System.arraycopy(temp, 0, buf, offset, length);
-        return offset + length;
-    }
-
-}
diff --git a/qpysdk/src/main/java/org/qpython/qpysdk/jtar/TarConstants.java b/qpysdk/src/main/java/org/qpython/qpysdk/jtar/TarConstants.java
deleted file mode 100644
index dec83da1..00000000
--- a/qpysdk/src/main/java/org/qpython/qpysdk/jtar/TarConstants.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * Copyright 2010 Xeus Technologies 
- * 
- * 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. 
- * 
- */
-
-package org.qpython.qpysdk.jtar;
-
-/**
- * @author Kamran Zafar
- * 
- */
-public class TarConstants {
-    public static final int EOF_BLOCK = 1024;
-    public static final int DATA_BLOCK = 512;
-    public static final int HEADER_BLOCK = 512;
-}
diff --git a/qpysdk/src/main/java/org/qpython/qpysdk/jtar/TarEntry.java b/qpysdk/src/main/java/org/qpython/qpysdk/jtar/TarEntry.java
deleted file mode 100644
index a36fda33..00000000
--- a/qpysdk/src/main/java/org/qpython/qpysdk/jtar/TarEntry.java
+++ /dev/null
@@ -1,286 +0,0 @@
-/**
- * Copyright 2010 Xeus Technologies 
- * 
- * 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. 
- * 
- */
-
-package org.qpython.qpysdk.jtar;
-
-import java.io.File;
-import java.util.Date;
-
-/**
- * @author Kamran Zafar
- * 
- */
-public class TarEntry {
-    protected File file;
-    protected TarHeader header;
-
-    private TarEntry() {
-        this.file = null;
-        this.header = new TarHeader();
-    }
-
-    public TarEntry(File file, String entryName) {
-        this();
-        this.file = file;
-        this.extractTarHeader( entryName );
-    }
-
-    public TarEntry(byte[] headerBuf) {
-        this();
-        this.parseTarHeader( headerBuf );
-    }
-
-    public boolean equals(TarEntry it) {
-        return this.header.name.toString().equals( it.header.name.toString() );
-    }
-
-    public boolean isDescendent(TarEntry desc) {
-        return desc.header.name.toString().startsWith( this.header.name.toString() );
-    }
-
-    public TarHeader getHeader() {
-        return this.header;
-    }
-
-    public String getName() {
-        return this.header.name.toString();
-    }
-
-    public void setName(String name) {
-        this.header.name = new StringBuffer( name );
-    }
-
-    public int getUserId() {
-        return this.header.userId;
-    }
-
-    public void setUserId(int userId) {
-        this.header.userId = userId;
-    }
-
-    public int getGroupId() {
-        return this.header.groupId;
-    }
-
-    public void setGroupId(int groupId) {
-        this.header.groupId = groupId;
-    }
-
-    public String getUserName() {
-        return this.header.userName.toString();
-    }
-
-    public void setUserName(String userName) {
-        this.header.userName = new StringBuffer( userName );
-    }
-
-    public String getGroupName() {
-        return this.header.groupName.toString();
-    }
-
-    public void setGroupName(String groupName) {
-        this.header.groupName = new StringBuffer( groupName );
-    }
-
-    public void setIds(int userId, int groupId) {
-        this.setUserId( userId );
-        this.setGroupId( groupId );
-    }
-
-    public void setModTime(long time) {
-        this.header.modTime = time / 1000;
-    }
-
-    public void setModTime(Date time) {
-        this.header.modTime = time.getTime() / 1000;
-    }
-
-    public Date getModTime() {
-        return new Date( this.header.modTime * 1000 );
-    }
-
-    public File getFile() {
-        return this.file;
-    }
-
-    public long getSize() {
-        return this.header.size;
-    }
-
-    public void setSize(long size) {
-        this.header.size = size;
-    }
-
-    /**
-     * Checks if the org.xeustechnologies.jtar entry is a directory
-     * 
-     * @return
-     */
-    public boolean isDirectory() {
-        if( this.file != null )
-            return this.file.isDirectory();
-
-        if( this.header != null ) {
-            if( this.header.linkFlag == TarHeader.LF_DIR )
-                return true;
-
-            if( this.header.name.toString().endsWith( "/" ) )
-                return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Extract header from File
-     * 
-     * @param entryName
-     */
-    public void extractTarHeader(String entryName) {
-        String name = entryName;
-
-        name = name.replace( File.separatorChar, '/' );
-
-        if( name.startsWith( "/" ) )
-            name = name.substring( 1 );
-
-        header.linkName = new StringBuffer( "" );
-
-        header.name = new StringBuffer( name );
-
-        if( file.isDirectory() ) {
-            header.mode = 040755;
-            header.linkFlag = TarHeader.LF_DIR;
-            if( header.name.charAt( header.name.length() - 1 ) != '/' )
-                header.name.append( "/" );
-        } else {
-            header.mode = 0100644;
-            header.linkFlag = TarHeader.LF_NORMAL;
-        }
-
-        header.size = file.length();
-        header.modTime = file.lastModified() / 1000;
-        header.checkSum = 0;
-        header.devMajor = 0;
-        header.devMinor = 0;
-    }
-
-    /**
-     * Calculate checksum
-     * 
-     * @param buf
-     * @return
-     */
-    public long computeCheckSum(byte[] buf) {
-        long sum = 0;
-
-        for( int i = 0; i < buf.length; ++i ) {
-            sum += 255 & buf[i];
-        }
-
-        return sum;
-    }
-
-    /**
-     * Writes the header to the byte buffer
-     * 
-     * @param outbuf
-     */
-    public void writeEntryHeader(byte[] outbuf) {
-        int offset = 0;
-
-        offset = TarHeader.getNameBytes( this.header.name, outbuf, offset, TarHeader.NAMELEN );
-        offset = Octal.getOctalBytes( this.header.mode, outbuf, offset, TarHeader.MODELEN );
-        offset = Octal.getOctalBytes( this.header.userId, outbuf, offset, TarHeader.UIDLEN );
-        offset = Octal.getOctalBytes( this.header.groupId, outbuf, offset, TarHeader.GIDLEN );
-
-        long size = this.header.size;
-
-        offset = Octal.getLongOctalBytes( size, outbuf, offset, TarHeader.SIZELEN );
-        offset = Octal.getLongOctalBytes( this.header.modTime, outbuf, offset, TarHeader.MODTIMELEN );
-
-        int csOffset = offset;
-        for( int c = 0; c < TarHeader.CHKSUMLEN; ++c )
-            outbuf[offset++] = (byte) ' ';
-
-        outbuf[offset++] = this.header.linkFlag;
-
-        offset = TarHeader.getNameBytes( this.header.linkName, outbuf, offset, TarHeader.NAMELEN );
-        offset = TarHeader.getNameBytes( this.header.magic, outbuf, offset, TarHeader.MAGICLEN );
-        offset = TarHeader.getNameBytes( this.header.userName, outbuf, offset, TarHeader.UNAMELEN );
-        offset = TarHeader.getNameBytes( this.header.groupName, outbuf, offset, TarHeader.GNAMELEN );
-        offset = Octal.getOctalBytes( this.header.devMajor, outbuf, offset, TarHeader.DEVLEN );
-        offset = Octal.getOctalBytes( this.header.devMinor, outbuf, offset, TarHeader.DEVLEN );
-
-        for( ; offset < outbuf.length; )
-            outbuf[offset++] = 0;
-
-        long checkSum = this.computeCheckSum( outbuf );
-
-        Octal.getCheckSumOctalBytes( checkSum, outbuf, csOffset, TarHeader.CHKSUMLEN );
-    }
-
-    /**
-     * Parses the tar header to the byte buffer
-     * 
-     * @param header
-     * @param bh
-     */
-    public void parseTarHeader(byte[] bh) {
-        int offset = 0;
-
-        header.name = TarHeader.parseName( bh, offset, TarHeader.NAMELEN );
-        offset += TarHeader.NAMELEN;
-
-        header.mode = (int) Octal.parseOctal( bh, offset, TarHeader.MODELEN );
-        offset += TarHeader.MODELEN;
-
-        header.userId = (int) Octal.parseOctal( bh, offset, TarHeader.UIDLEN );
-        offset += TarHeader.UIDLEN;
-
-        header.groupId = (int) Octal.parseOctal( bh, offset, TarHeader.GIDLEN );
-        offset += TarHeader.GIDLEN;
-
-        header.size = Octal.parseOctal( bh, offset, TarHeader.SIZELEN );
-        offset += TarHeader.SIZELEN;
-
-        header.modTime = Octal.parseOctal( bh, offset, TarHeader.MODTIMELEN );
-        offset += TarHeader.MODTIMELEN;
-
-        header.checkSum = (int) Octal.parseOctal( bh, offset, TarHeader.CHKSUMLEN );
-        offset += TarHeader.CHKSUMLEN;
-
-        header.linkFlag = bh[offset++];
-
-        header.linkName = TarHeader.parseName( bh, offset, TarHeader.NAMELEN );
-        offset += TarHeader.NAMELEN;
-
-        header.magic = TarHeader.parseName( bh, offset, TarHeader.MAGICLEN );
-        offset += TarHeader.MAGICLEN;
-
-        header.userName = TarHeader.parseName( bh, offset, TarHeader.UNAMELEN );
-        offset += TarHeader.UNAMELEN;
-
-        header.groupName = TarHeader.parseName( bh, offset, TarHeader.GNAMELEN );
-        offset += TarHeader.GNAMELEN;
-
-        header.devMajor = (int) Octal.parseOctal( bh, offset, TarHeader.DEVLEN );
-        offset += TarHeader.DEVLEN;
-
-        header.devMinor = (int) Octal.parseOctal( bh, offset, TarHeader.DEVLEN );
-    }
-}
\ No newline at end of file
diff --git a/qpysdk/src/main/java/org/qpython/qpysdk/jtar/TarHeader.java b/qpysdk/src/main/java/org/qpython/qpysdk/jtar/TarHeader.java
deleted file mode 100644
index 03e70193..00000000
--- a/qpysdk/src/main/java/org/qpython/qpysdk/jtar/TarHeader.java
+++ /dev/null
@@ -1,197 +0,0 @@
-/**
- * Copyright 2010 Xeus Technologies 
- * 
- * 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. 
- * 
- */
-
-package org.qpython.qpysdk.jtar;
-
-/**
- * Header
- * 
- * <pre>
- * Offset  Size     Field
- * 0       100      File name
- * 100     8        File mode
- * 108     8        Owner's numeric user ID
- * 116     8        Group's numeric user ID
- * 124     12       File size in bytes
- * 136     12       Last modification time in numeric Unix time format
- * 148     8        Checksum for header block
- * 156     1        Link indicator (file type)
- * 157     100      Name of linked file
- * </pre>
- * 
- * 
- * File Types
- * 
- * <pre>
- * Value        Meaning
- * '0'          Normal file
- * (ASCII NUL)  Normal file (now obsolete)
- * '1'          Hard link
- * '2'          Symbolic link
- * '3'          Character special
- * '4'          Block special
- * '5'          Directory
- * '6'          FIFO
- * '7'          Contigous
- * </pre>
- * 
- * 
- * 
- * Ustar header
- * 
- * <pre>
- * Offset  Size    Field
- * 257     6       UStar indicator "ustar"
- * 263     2       UStar version "00"
- * 265     32      Owner user name
- * 297     32      Owner group name
- * 329     8       Device major number
- * 337     8       Device minor number
- * 345     155     Filename prefix
- * </pre>
- */
-
-public class TarHeader {
-
-    /*
-     * Header
-     */
-    public static final int NAMELEN = 100;
-    public static final int MODELEN = 8;
-    public static final int UIDLEN = 8;
-    public static final int GIDLEN = 8;
-    public static final int SIZELEN = 12;
-    public static final int MODTIMELEN = 12;
-    public static final int CHKSUMLEN = 8;
-    public static final byte LF_OLDNORM = 0;
-
-    /*
-     * File Types
-     */
-    public static final byte LF_NORMAL = (byte) '0';
-    public static final byte LF_LINK = (byte) '1';
-    public static final byte LF_SYMLINK = (byte) '2';
-    public static final byte LF_CHR = (byte) '3';
-    public static final byte LF_BLK = (byte) '4';
-    public static final byte LF_DIR = (byte) '5';
-    public static final byte LF_FIFO = (byte) '6';
-    public static final byte LF_CONTIG = (byte) '7';
-
-    /*
-     * Ustar header
-     */
-
-    public static final int MAGICLEN = 8;
-    /**
-     * The magic tag representing a POSIX tar archive.
-     */
-    public static final String TMAGIC = "ustar";
-
-    /**
-     * The magic tag representing a GNU tar archive.
-     */
-    public static final String GNU_TMAGIC = "ustar  ";
-
-    public static final int UNAMELEN = 32;
-    public static final int GNAMELEN = 32;
-    public static final int DEVLEN = 8;
-
-    // Header values
-    public StringBuffer name;
-    public int mode;
-    public int userId;
-    public int groupId;
-    public long size;
-    public long modTime;
-    public int checkSum;
-    public byte linkFlag;
-    public StringBuffer linkName;
-    public StringBuffer magic;
-    public StringBuffer userName;
-    public StringBuffer groupName;
-    public int devMajor;
-    public int devMinor;
-
-    public TarHeader() {
-        this.magic = new StringBuffer( TarHeader.TMAGIC );
-
-        this.name = new StringBuffer();
-        this.linkName = new StringBuffer();
-
-        String user = System.getProperty("user.name", "");
-
-        if( user.length() > 31 )
-            user = user.substring( 0, 31 );
-
-        this.userId = 0;
-        this.groupId = 0;
-        this.userName = new StringBuffer( user );
-        this.groupName = new StringBuffer( "" );
-    }
-
-    /**
-     * Parse an entry name from a header buffer.
-     * 
-     * @param name
-     * @param header
-     *            The header buffer from which to parse.
-     * @param offset
-     *            The offset into the buffer from which to parse.
-     * @param length
-     *            The number of header bytes to parse.
-     * @return The header's entry name.
-     */
-    public static StringBuffer parseName(byte[] header, int offset, int length) {
-        StringBuffer result = new StringBuffer( length );
-
-        int end = offset + length;
-        for( int i = offset; i < end; ++i ) {
-            if( header[i] == 0 )
-                break;
-            result.append( (char) header[i] );
-        }
-
-        return result;
-    }
-
-    /**
-     * Determine the number of bytes in an entry name.
-     * 
-     * @param name
-     * @param header
-     *            The header buffer from which to parse.
-     * @param offset
-     *            The offset into the buffer from which to parse.
-     * @param length
-     *            The number of header bytes to parse.
-     * @return The number of bytes in a header's entry name.
-     */
-    public static int getNameBytes(StringBuffer name, byte[] buf, int offset, int length) {
-        int i;
-
-        for( i = 0; i < length && i < name.length(); ++i ) {
-            buf[offset + i] = (byte) name.charAt( i );
-        }
-
-        for( ; i < length; ++i ) {
-            buf[offset + i] = 0;
-        }
-
-        return offset + length;
-    }
-
-}
\ No newline at end of file
diff --git a/qpysdk/src/main/java/org/qpython/qpysdk/jtar/TarInputStream.java b/qpysdk/src/main/java/org/qpython/qpysdk/jtar/TarInputStream.java
deleted file mode 100644
index 4382ecc7..00000000
--- a/qpysdk/src/main/java/org/qpython/qpysdk/jtar/TarInputStream.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/**
- * Copyright 2010 Xeus Technologies 
- * 
- * 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. 
- * 
- */
-
-package org.qpython.qpysdk.jtar;
-
-import java.io.FilterInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-/**
- * @author Kamran Zafar
- * 
- */
-public class TarInputStream extends FilterInputStream {
-
-    private TarEntry currentEntry;
-    private long currentFileSize;
-    private long bytesRead;
-
-    public TarInputStream(InputStream in) {
-        super( in );
-        currentFileSize = 0;
-        bytesRead = 0;
-    }
-
-    @Override
-    public boolean markSupported() {
-        return false;
-    }
-
-    /**
-     * Not supported
-     * 
-     */
-    @Override
-    public synchronized void mark(int readlimit) {
-    }
-
-    /**
-     * Not supported
-     * 
-     */
-    @Override
-    public synchronized void reset() throws IOException {
-        throw new IOException( "mark/reset not supported" );
-    }
-
-    /**
-     * Read a byte
-     * 
-     * @see java.io.FilterInputStream#read()
-     */
-    @Override
-    public int read() throws IOException {
-        byte[] buf = new byte[1];
-
-        int res = this.read( buf, 0, 1 );
-
-        if( res != -1 ) {
-            return buf[0];
-        }
-
-        return res;
-    }
-
-    /**
-     * Checks if the bytes being read exceed the entry size and adjusts the byte
-     * array length. Updates the byte counters
-     *
-     *
-     * @see java.io.FilterInputStream#read(byte[], int, int)
-     */
-    @Override
-    public int read(byte[] b, int off, int len) throws IOException {
-        if( currentEntry != null ) {
-            if( currentFileSize == currentEntry.getSize() ) {
-                return -1;
-            } else if( ( currentEntry.getSize() - currentFileSize ) < len ) {
-                len = (int) ( currentEntry.getSize() - currentFileSize );
-            }
-        }
-
-        int br = super.read( b, off, len );
-
-        if( br != -1 ) {
-            if( currentEntry != null ) {
-                currentFileSize += br;
-            }
-
-            bytesRead += br;
-        }
-
-        return br;
-    }
-
-    /**
-     * Returns the next entry in the tar file
-     * 
-     * @return TarEntry
-     * @throws IOException
-     */
-    public TarEntry getNextEntry() throws IOException {
-        closeCurrentEntry();
-
-        byte[] header = new byte[TarConstants.HEADER_BLOCK];
-
-        int res = read( header );
-
-        // Invalid header size
-        if( res != TarConstants.HEADER_BLOCK ) {
-            throw new IOException( "Invalid entry header of size [" + res + "]; expected [" + TarConstants.HEADER_BLOCK
-                    + "]" );
-        }
-
-        // Check if record is null
-        boolean eof = true;
-        for( byte b : header ) {
-            if( b != 0 ) {
-                eof = false;
-                break;
-            }
-        }
-
-        if( !eof ) {
-            currentEntry = new TarEntry( header );
-        }
-
-        return currentEntry;
-    }
-
-    /**
-     * Closes the current tar entry
-     * 
-     * @throws IOException
-     */
-    protected void closeCurrentEntry() throws IOException {
-        if( currentEntry != null ) {
-            if( currentEntry.getSize() > currentFileSize ) {
-                // Not fully read, skip rest of the bytes
-                skip( currentEntry.getSize() - currentFileSize );
-                bytesRead += ( currentEntry.getSize() - currentFileSize );
-            }
-
-            currentEntry = null;
-            currentFileSize = 0L;
-            skipPad();
-        }
-    }
-
-    /**
-     * Skips the pad at the end of each tar entry file content
-     * 
-     * @throws IOException
-     */
-    protected void skipPad() throws IOException {
-        if( bytesRead > 0 ) {
-            int extra = (int) ( bytesRead % TarConstants.DATA_BLOCK );
-
-            if( extra > 0 ) {
-                skip( TarConstants.DATA_BLOCK - extra );
-                bytesRead += ( TarConstants.DATA_BLOCK - extra );
-            }
-        }
-    }
-}
diff --git a/qpysdk/src/main/java/org/qpython/qpysdk/jtar/TarOutputStream.java b/qpysdk/src/main/java/org/qpython/qpysdk/jtar/TarOutputStream.java
deleted file mode 100644
index 7e6e8e04..00000000
--- a/qpysdk/src/main/java/org/qpython/qpysdk/jtar/TarOutputStream.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/**
- * Copyright 2010 Xeus Technologies 
- * 
- * 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. 
- * 
- */
-
-package org.qpython.qpysdk.jtar;
-
-import java.io.FilterOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-
-/**
- * @author Kamran Zafar
- * 
- */
-public class TarOutputStream extends FilterOutputStream {
-    private long bytesWritten;
-    private long currentFileSize;
-    private TarEntry currentEntry;
-
-    public TarOutputStream(OutputStream out) {
-        super( out );
-        bytesWritten = 0;
-        currentFileSize = 0;
-    }
-
-    /**
-     * Appends the EOF record and closes the stream
-     * 
-     * @see java.io.FilterOutputStream#close()
-     */
-    @Override
-    public void close() throws IOException {
-        closeCurrentEntry();
-        write( new byte[TarConstants.EOF_BLOCK] );
-        super.close();
-    }
-
-    /**
-     * Writes a byte to the stream and updates byte counters
-     *
-     * @see java.io.FilterOutputStream#write(int)
-     */
-    @Override
-    public void write(int b) throws IOException {
-        super.write( b );
-        bytesWritten += 1;
-
-        if( currentEntry != null ) {
-            currentFileSize += 1;
-        }
-    }
-
-    /**
-     * Checks if the bytes being written exceed the current entry size.
-     *
-     * @see java.io.FilterOutputStream#write(byte[], int, int)
-     */
-    @Override
-    public void write(byte[] b, int off, int len) throws IOException {
-        if( currentEntry != null && !currentEntry.isDirectory() ) {
-            if( currentEntry.getSize() < currentFileSize + len ) {
-                throw new IOException( "The current entry[" + currentEntry.getName() + "] size["
-                        + currentEntry.getSize() + "] is smaller than the bytes[" + ( currentFileSize + len )
-                        + "] being written." );
-            }
-        }
-
-        super.write( b, off, len );
-    }
-
-    /**
-     * Writes the next tar entry header on the stream
-     * 
-     * @param entry
-     * @throws IOException
-     */
-    public void putNextEntry(TarEntry entry) throws IOException {
-        closeCurrentEntry();
-
-        byte[] header = new byte[TarConstants.HEADER_BLOCK];
-        entry.writeEntryHeader( header );
-
-        write( header );
-
-        currentEntry = entry;
-    }
-
-    /**
-     * Closes the current tar entry
-     * 
-     * @throws IOException
-     */
-    protected void closeCurrentEntry() throws IOException {
-        if( currentEntry != null ) {
-            if( currentEntry.getSize() > currentFileSize ) {
-                throw new IOException( "The current entry[" + currentEntry.getName() + "] of size["
-                        + currentEntry.getSize() + "] has not been fully written." );
-            }
-
-            currentEntry = null;
-            currentFileSize = 0;
-
-            pad();
-        }
-    }
-
-    /**
-     * Pads the last content block
-     * 
-     * @throws IOException
-     */
-    protected void pad() throws IOException {
-        if( bytesWritten > 0 ) {
-            int extra = (int) ( bytesWritten % TarConstants.DATA_BLOCK );
-
-            if( extra > 0 ) {
-                write( new byte[TarConstants.DATA_BLOCK - extra] );
-            }
-        }
-    }
-}
diff --git a/qpysdk/src/main/java/org/qpython/qpysdk/jtar/TarUtils.java b/qpysdk/src/main/java/org/qpython/qpysdk/jtar/TarUtils.java
deleted file mode 100644
index 564c3909..00000000
--- a/qpysdk/src/main/java/org/qpython/qpysdk/jtar/TarUtils.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/**
- * Copyright 2010 Xeus Technologies 
- * 
- * 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. 
- * 
- */
-
-package org.qpython.qpysdk.jtar;
-
-import java.io.File;
-
-/**
- * @author Kamran
- * 
- */
-public class TarUtils {
-    /**
-     * Determines the tar file size of the given folder/file path
-     * 
-     * @param path
-     * @return
-     */
-    public static long calculateTarSize(File path) {
-        return tarSize( path ) + TarConstants.EOF_BLOCK;
-    }
-
-    private static long tarSize(File dir) {
-        long size = 0;
-
-        if( dir.isFile() ) {
-            return entrySize( dir.length() );
-        } else {
-            File[] subFiles = dir.listFiles();
-
-            if( subFiles != null && subFiles.length > 0 ) {
-                for( File file : subFiles ) {
-                    if( file.isFile() ) {
-                        size += entrySize( file.length() );
-                    } else {
-                        size += tarSize( file );
-                    }
-                }
-            } else {
-                // Empty folder header
-                return TarConstants.HEADER_BLOCK;
-            }
-        }
-
-        return size;
-    }
-
-    private static long entrySize(long fileSize) {
-        long size = 0;
-        size += TarConstants.HEADER_BLOCK; // Header
-        size += fileSize; // File size
-
-        long extra = size % TarConstants.DATA_BLOCK;
-
-        if( extra > 0 ) {
-            size += ( TarConstants.DATA_BLOCK - extra ); // pad
-        }
-
-        return size;
-    }
-}
diff --git a/qpysdk/src/main/java/org/qpython/qpysdk/utils/AndroidCompat.java b/qpysdk/src/main/java/org/qpython/qpysdk/utils/AndroidCompat.java
new file mode 100644
index 00000000..7eaab89e
--- /dev/null
+++ b/qpysdk/src/main/java/org/qpython/qpysdk/utils/AndroidCompat.java
@@ -0,0 +1,47 @@
+package org.qpython.qpysdk.utils;
+
+/**
+ * The classes in this package take advantage of the fact that the VM does
+ * not attempt to load a class until it's accessed, and the verifier
+ * does not run until a class is loaded.  By keeping the methods which
+ * are unavailable on older platforms in subclasses which are only ever
+ * accessed on platforms where they are available, we can preserve
+ * compatibility with older platforms without resorting to reflection.
+ * <p>
+ * See http://developer.android.com/resources/articles/backward-compatibility.html
+ * and http://android-developers.blogspot.com/2010/07/how-to-have-your-cupcake-and-eat-it-too.html
+ * for further discussion of this technique.
+ */
+
+public class AndroidCompat {
+     public final static int SDK = getSDK();
+
+    // The era of Holo Design
+    public final static boolean V11ToV20;
+
+    static {
+        V11ToV20 = (SDK >= 11) && (SDK <= 20);
+    }
+
+    private final static int getSDK() {
+        int result;
+        try {
+            result = AndroidLevel4PlusCompat.getSDKInt();
+        } catch (VerifyError e) {
+            // We must be at an SDK level less than 4.
+            try {
+                result = Integer.valueOf(android.os.Build.VERSION.SDK);
+            } catch (NumberFormatException e2) {
+                // Couldn't parse string, assume the worst.
+                result = 1;
+            }
+        }
+        return result;
+    }
+}
+
+class AndroidLevel4PlusCompat {
+    static int getSDKInt() {
+        return android.os.Build.VERSION.SDK_INT;
+    }
+}
diff --git a/qpysdk/src/main/java/org/qpython/qpysdk/utils/AssetExtract.java b/qpysdk/src/main/java/org/qpython/qpysdk/utils/AssetExtract.java
index da35ac99..340f8365 100644
--- a/qpysdk/src/main/java/org/qpython/qpysdk/utils/AssetExtract.java
+++ b/qpysdk/src/main/java/org/qpython/qpysdk/utils/AssetExtract.java
@@ -1,31 +1,32 @@
-// This string is autogenerated by ChangeAppSettings.sh, do not change
-// spaces amount
 package org.qpython.qpysdk.utils;
 
+import java.io.*;
+
 import android.app.Activity;
-import android.content.res.AssetManager;
 import android.util.Log;
 
-import org.qpython.qpysdk.jtar.TarEntry;
-import org.qpython.qpysdk.jtar.TarInputStream;
-
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.OutputStream;
+import java.io.FileOutputStream;
+import java.io.File;
+
 import java.util.zip.GZIPInputStream;
 
+import android.content.res.AssetManager;
+
+import com.quseit.common.jtar.TarEntry;
+import com.quseit.common.jtar.TarInputStream;
+
+
 public class AssetExtract {
 
     private AssetManager mAssetManager = null;
-    private Activity mActivity = null;
+    //private Activity mActivity = null;
 
     public AssetExtract(Activity act) {
-        mActivity = act;
+        //mActivity = act;
         mAssetManager = act.getAssets();
     }
 
@@ -58,24 +59,37 @@ public boolean extractTar(String asset, String target) {
                 break;
             }
 
-            Log.i("python", "extracting " + entry.getName());
+            Log.i("python", "extracting ["+entry.getName()+"]");
+
+//            if (entry.getName()!=null && entry.getName().trim().equals("")) {
+//                LogUtil.i("python", "extracting none");
+//
+//                continue;
+//            }
 
             if (entry.isDirectory()) {
 
                 try {
                     new File(target +"/" + entry.getName()).mkdirs();
-                } catch ( SecurityException e ) { };
+                } catch ( SecurityException e ) {
+                    Log.e("python", "could not open SecurityException" + e);
+
+                };
 
                 continue;
             }
 
             OutputStream out = null;
-            String path = target + "/" + entry.getName();
+            String path = target + "/" + entry.getName().trim();
 
             try {
                 out = new BufferedOutputStream(new FileOutputStream(path), 8192);
             } catch ( FileNotFoundException e ) {
-            } catch ( SecurityException e ) { };
+                Log.e("python", "could not open FileNotFoundException:" + e);
+
+            } catch ( SecurityException e ) {
+                Log.e("python", "could not open SecurityException:" + e);
+            };
 
             if ( out == null ) {
                 Log.e("python", "could not open " + path);
@@ -96,7 +110,7 @@ public boolean extractTar(String asset, String target) {
                 out.flush();
                 out.close();
             } catch ( java.io.IOException e ) {
-                Log.e("python", "extracting zip", e);
+                Log.e("python", "extracting zip：", e);
                 return false;
             }
         }
@@ -105,6 +119,8 @@ public boolean extractTar(String asset, String target) {
             tis.close();
             assetStream.close();
         } catch (IOException e) {
+            Log.e("python", "extracting zip IOException：", e);
+
             // pass
         }
 
diff --git a/qpysdk/src/main/java/org/qpython/qpysdk/utils/DateTimeHelper.java b/qpysdk/src/main/java/org/qpython/qpysdk/utils/DateTimeHelper.java
index 60b7dcf6..6da7ccb2 100644
--- a/qpysdk/src/main/java/org/qpython/qpysdk/utils/DateTimeHelper.java
+++ b/qpysdk/src/main/java/org/qpython/qpysdk/utils/DateTimeHelper.java
@@ -2,6 +2,7 @@
 
 import android.util.Log;
 
+import java.sql.Timestamp;
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -10,114 +11,112 @@
 import java.util.Locale;
 
 public class DateTimeHelper {
-	   public static String converTime(long timestamp, String[] timeLabels){
-           long currentSeconds = System.currentTimeMillis()/1000;
-           long timeGap = currentSeconds-timestamp;//与现在时间相差秒数
-           //Log.d(TAG, "converTime:"+currentSeconds+"-"+timestamp);
-           String timeStr = null;
-           if (timeGap>24*60*60) {//1天以上
-                   timeStr = timeGap/(24*60*60)+timeLabels[0];
-           }else if(timeGap>60*60){//1小时-24小时
-                   timeStr = timeGap/(60*60)+timeLabels[1];
-           }else if(timeGap>60){//1分钟-59分钟
-                   timeStr = timeGap/60+timeLabels[2];
-           }else{//1秒钟-59秒钟
-                   timeStr = timeLabels[3];
-           }
-           return timeStr;
-   }
-   
-   public static String getStandardTime(long timestamp){
-           SimpleDateFormat sdf = new SimpleDateFormat("MM月dd日 HH:mm");
-           Date date = new Date(timestamp*1000);
-           sdf.format(date);
-           return sdf.format(date);
-   }
-	
-   public static final String getDateAsDirName(){
-       Calendar cal = Calendar.getInstance();
-       java.text.SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-       String cdate = sdf.format(cal.getTime());
-       return cdate;
+    // Wed Dec 15 02:53:36 +0000 2010
+    public static final DateFormat TWITTER_DATE_FORMATTER = new SimpleDateFormat(
+            "E MMM d HH:mm:ss Z yyyy", Locale.US);
+    public static final DateFormat TWITTER_SEARCH_API_DATE_FORMATTER = new SimpleDateFormat(
+            "E, d MMM yyyy HH:mm:ss Z", Locale.US);
+    public static final DateFormat AGO_FULL_DATE_FORMATTER = new SimpleDateFormat(
+            "yyyy-MM-dd HH:mm");
+    private static final String TAG = "DateTimeHelper";
+
+    public static String converTime(long timestamp, String[] timeLabels) {
+        long currentSeconds = System.currentTimeMillis() / 1000;
+        long timeGap = currentSeconds - timestamp;//与现在时间相差秒数
+        //LogUtil.d(TAG, "converTime:"+currentSeconds+"-"+timestamp);
+        String timeStr = null;
+        if (timeGap > 24 * 60 * 60) {//1天以上
+            timeStr = timeGap / (24 * 60 * 60) + timeLabels[0];
+        } else if (timeGap > 60 * 60) {//1小时-24小时
+            timeStr = timeGap / (60 * 60) + timeLabels[1];
+        } else if (timeGap > 60) {//1分钟-59分钟
+            timeStr = timeGap / 60 + timeLabels[2];
+        } else {//1秒钟-59秒钟
+            timeStr = timeLabels[3];
+        }
+        return timeStr;
     }
 
-   public static final String getDateAss(){
-       Calendar cal = Calendar.getInstance();
-       java.text.SimpleDateFormat sdf = new SimpleDateFormat("MM-dd-HH-mm");
-       String cdate = sdf.format(cal.getTime());
-       return cdate;
+    public static String getStandardTime(long timestamp) {
+        SimpleDateFormat sdf = new SimpleDateFormat("MM月dd日 HH:mm");
+        Date date = new Date(timestamp * 1000);
+        sdf.format(date);
+        return sdf.format(date);
     }
 
-    public static final String getDate(){
-       Calendar cal = Calendar.getInstance();
-       java.text.SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-       String cdate = sdf.format(cal.getTime());
-       return cdate;
+    public static final String getDateAsDirName() {
+        Calendar cal = Calendar.getInstance();
+        java.text.SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        String cdate = sdf.format(cal.getTime());
+        return cdate;
+    }
+
+    public static final String getDateAss() {
+        Calendar cal = Calendar.getInstance();
+        java.text.SimpleDateFormat sdf = new SimpleDateFormat("MM-dd-HH-mm");
+        String cdate = sdf.format(cal.getTime());
+        return cdate;
+    }
+
+    public static final String getDate() {
+        Calendar cal = Calendar.getInstance();
+        java.text.SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        String cdate = sdf.format(cal.getTime());
+        return cdate;
     }
 
-    public static final String getDateMin(){
+    public static final String getDateMin() {
         Calendar cal = Calendar.getInstance();
         java.text.SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
         String cdate = sdf.format(cal.getTime());
         return cdate;
-     }
+    }
 
     public static final String getTodayFull() {
         Calendar cal = Calendar.getInstance();
         java.text.SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd 00:00:00");
         String cdate = sdf.format(cal.getTime());
-        //Log.d(TAG, "getTodayFull:"+cdate);
+        //LogUtil.d(TAG, "getTodayFull:"+cdate);
         return cdate;
     }
 
-    public static final int getTimeAsInt(){
+    public static final int getTimeAsInt() {
         Calendar cal = Calendar.getInstance();
         java.text.SimpleDateFormat sdf = new SimpleDateFormat("HHmmss");
         String cdate = sdf.format(cal.getTime());
         return Integer.parseInt(cdate);
-     }
-    public static final String getDateAsF(){
+    }
+
+    public static final String getDateAsF() {
         Calendar cal = Calendar.getInstance();
         java.text.SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
         String cdate = sdf.format(cal.getTime());
         return cdate;
-     }
-	private static final String TAG = "DateTimeHelper";
-
-	// Wed Dec 15 02:53:36 +0000 2010
-	public static final DateFormat TWITTER_DATE_FORMATTER = new SimpleDateFormat(
-			"E MMM d HH:mm:ss Z yyyy", Locale.US);
-
-	public static final DateFormat TWITTER_SEARCH_API_DATE_FORMATTER = new SimpleDateFormat(
-			"E, d MMM yyyy HH:mm:ss Z", Locale.US);
-
-	public static final Date parseDateTime(String dateString) {
-		try {
-			Log.v(TAG, String.format("in parseDateTime, dateString=%s",
-					dateString));
-			return TWITTER_DATE_FORMATTER.parse(dateString);
-		} catch (ParseException e) {
-			Log.w(TAG, "Could not parse Twitter date string: " + dateString);
-			return null;
-		}
-	}
-
+    }
 
-	public static final Date parseSearchApiDateTime(String dateString) {
-		try {
-			return TWITTER_SEARCH_API_DATE_FORMATTER.parse(dateString);
-		} catch (ParseException e) {
-			Log.w(TAG, "Could not parse Twitter search date string: "
-					+ dateString);
-			return null;
-		}
-	}
+    public static final Date parseDateTime(String dateString) {
+        try {
+            Log.v(TAG, String.format("in parseDateTime, dateString=%s",
+                    dateString));
+            return TWITTER_DATE_FORMATTER.parse(dateString);
+        } catch (ParseException e) {
+            Log.w(TAG, "Could not parse Twitter date string: " + dateString);
+            return null;
+        }
+    }
 
-	public static final DateFormat AGO_FULL_DATE_FORMATTER = new SimpleDateFormat(
-			"yyyy-MM-dd HH:mm");
+    public static final Date parseSearchApiDateTime(String dateString) {
+        try {
+            return TWITTER_SEARCH_API_DATE_FORMATTER.parse(dateString);
+        } catch (ParseException e) {
+            Log.w(TAG, "Could not parse Twitter search date string: "
+                    + dateString);
+            return null;
+        }
+    }
 
 	/*public static String getRelativeDate(Date date) {
-		Date now = new Date();
+        Date now = new Date();
 
 		String prefix = PassingerApp.mContext
 				.getString(R.string.tweet_created_at_beautify_prefix);
@@ -160,121 +159,142 @@ public static final Date parseSearchApiDateTime(String dateString) {
 		return AGO_FULL_DATE_FORMATTER.format(date);
 	}*/
 
-	public static long getNowTime() {
-		return Calendar.getInstance().getTime().getTime();
-	}
-
-	public static long getDiffMin(String date1, String date2) {
-		SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-		//java.util.Date now;
-		java.util.Date begin;
-		try {
-			begin = df.parse(date1);
-			java.util.Date end = df.parse(date2);
-			//Log.d(TAG, date1+"-"+date2);
-			long between=(end.getTime()-begin.getTime())/1000;//除以1000是为了转换成秒
+    public static long getNowTime() {
+        return Calendar.getInstance().getTime().getTime();
+    }
 
-			long minute1=between%3600/60;
+    public static long getDiffMin(String date1, String date2) {
+        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        //java.util.Date now;
+        java.util.Date begin;
+        try {
+            begin = df.parse(date1);
+            java.util.Date end = df.parse(date2);
+            //LogUtil.d(TAG, date1+"-"+date2);
+            long between = (end.getTime() - begin.getTime()) / 1000;//除以1000是为了转换成秒
 
-			return minute1;
-		} catch (ParseException e) {
-			e.printStackTrace();
+            long minute1 = between % 3600 / 60;
 
-			return 0;
-		}
+            return minute1;
+        } catch (ParseException e) {
+            e.printStackTrace();
 
-	}
-	public static String getDiff(Date begin, Date end) {
-		//long between=(end.getTime()-begin.getTime())/1000;//除以1000是为了转换成秒
+            return 0;
+        }
 
-		//long day1=between/(24*3600);
-		int day2 = (end.getMonth()*100+end.getDate())-(begin.getMonth()*100+begin.getDate());
+    }
 
-		//long hour1=between%(24*3600)/3600;
-		//long minute1=between%3600/60;
-		//long second1=between%60/60;
-		//String dateAt = String.valueOf(begin.getYear())+CONF.T_Y+String.valueOf(begin.getMonth())+CONF.T_M+String.valueOf(begin.getDay())+CONF.T_D;
-		String x1 = String.valueOf(begin.getHours());
-		if (x1.length()==1) {
-			x1 = "0"+x1;
-		}
-		String x2 = String.valueOf(begin.getMinutes());
-		if (x2.length()==1) {
-			x2 = "0"+x2;
-		}
-		String timeAt = x1+":"+x2;
-		//String ret = "";
-		//Log.d(TAG, "getDiff:"+date1+"-"+date2+"-"+(end.getMonth()*100+end.getDate())+"-"+(begin.getMonth()*100+begin.getDate()));
-
-		SimpleDateFormat ymformatter = new SimpleDateFormat("yyyyMM");
-		String bYm = ymformatter.format(begin);
-		String eYm = ymformatter.format(end);
-
-		if (bYm.equals(eYm)) {
-			if (day2>1) {
-				SimpleDateFormat formatter = new SimpleDateFormat("MM-dd");
-				return formatter.format(begin)+" "+timeAt;
-			}
-
-			if (day2==1) {
-				return "Yesterday "+timeAt;
-			}
-			/*if (day2==2) {
+    public static String getDiff(Date begin, Date end) {
+        //long between=(end.getTime()-begin.getTime())/1000;//除以1000是为了转换成秒
+
+        //long day1=between/(24*3600);
+        int day2 = (end.getMonth() * 100 + end.getDate()) - (begin.getMonth() * 100 + begin.getDate());
+
+        //long hour1=between%(24*3600)/3600;
+        //long minute1=between%3600/60;
+        //long second1=between%60/60;
+        //String dateAt = String.valueOf(begin.getYear())+BASE_CONF.T_Y+String.valueOf(begin.getMonth())+BASE_CONF.T_M+String.valueOf(begin.getDay())+BASE_CONF.T_D;
+        String x1 = String.valueOf(begin.getHours());
+        if (x1.length() == 1) {
+            x1 = "0" + x1;
+        }
+        String x2 = String.valueOf(begin.getMinutes());
+        if (x2.length() == 1) {
+            x2 = "0" + x2;
+        }
+        String timeAt = x1 + ":" + x2;
+        //String ret = "";
+        //LogUtil.d(TAG, "getDiff:"+date1+"-"+date2+"-"+(end.getMonth()*100+end.getDate())+"-"+(begin.getMonth()*100+begin.getDate()));
+
+        SimpleDateFormat ymformatter = new SimpleDateFormat("yyyyMM");
+        String bYm = ymformatter.format(begin);
+        String eYm = ymformatter.format(end);
+
+        if (bYm.equals(eYm)) {
+            if (day2 > 1) {
+                SimpleDateFormat formatter = new SimpleDateFormat("MM-dd");
+                return formatter.format(begin) + " " + timeAt;
+            }
+
+            if (day2 == 1) {
+                return "Yesterday " + timeAt;
+            }
+            /*if (day2==2) {
 				return CONF.T_BS+" "+timeAt;
 			} */
 
-			return "Today "+timeAt;
+            return "Today " + timeAt;
 
 
-		} else {
-			SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
-			return formatter.format(begin)+" "+timeAt;
-		}
+        } else {
+            SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
+            return formatter.format(begin) + " " + timeAt;
+        }
 
-	}
-	public static String getDiff(String date1, String date2) {
-		SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-		//java.util.Date now;
-		try {
-			java.util.Date begin=df.parse(date1);
-			java.util.Date end = df.parse(date2);
-			return DateTimeHelper.getDiff(begin, end);
-
-		} catch (ParseException e) {
-			e.printStackTrace();
-			return "unknow";
-		}
+    }
 
-	}
-	
-	public static String longTimeToString(int i) {
-		StringBuilder sb = new StringBuilder();
-		i = i / 1000;
-		int m = i / 60;
-		int s = i % 60;
-		if (i >= 60) {
-			if (m < 10) {
-				sb.append("0");
-				sb.append(String.valueOf(m));
-			} else {
-				sb.append(String.valueOf(m));
-			}
-			sb.append(":");
-			if (s > 9) {
-				sb.append(String.valueOf(s));
-			} else {
-				sb.append("0");
-				sb.append(String.valueOf(s));
-			}
-		} else {
-			sb.append("00:");
-			if (s > 9) {
-				sb.append(String.valueOf(s));
-			} else {
-				sb.append("0");
-				sb.append(String.valueOf(s));
-			}
-		}
-		return sb.toString();
-	}
+    public static String getDiff(String date1, String date2) {
+        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        //java.util.Date now;
+        try {
+            java.util.Date begin = df.parse(date1);
+            java.util.Date end = df.parse(date2);
+            return DateTimeHelper.getDiff(begin, end);
+
+        } catch (ParseException e) {
+            e.printStackTrace();
+            return "unknow";
+        }
+
+    }
+
+    public static String longTimeToString(int i) {
+        StringBuilder sb = new StringBuilder();
+        i = i / 1000;
+        int m = i / 60;
+        int s = i % 60;
+        if (i >= 60) {
+            if (m < 10) {
+                sb.append("0");
+                sb.append(String.valueOf(m));
+            } else {
+                sb.append(String.valueOf(m));
+            }
+            sb.append(":");
+            if (s > 9) {
+                sb.append(String.valueOf(s));
+            } else {
+                sb.append("0");
+                sb.append(String.valueOf(s));
+            }
+        } else {
+            sb.append("00:");
+            if (s > 9) {
+                sb.append(String.valueOf(s));
+            } else {
+                sb.append("0");
+                sb.append(String.valueOf(s));
+            }
+        }
+        return sb.toString();
+    }
+
+    /**
+     * @return Is the first time later than the second time
+     */
+    public static boolean isLater(String timeOne, String timeTwo) {
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss.SSS");
+        Date parsedDateOne, parsedDateTwo;
+        if (timeTwo.equals("")) {
+            return true;
+        }
+        try {
+            parsedDateOne = dateFormat.parse(timeOne);
+            parsedDateTwo = dateFormat.parse(timeTwo);
+            return parsedDateOne.after(parsedDateTwo);
+        } catch (ParseException e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
 }
diff --git a/qpysdk/src/main/java/org/qpython/qpysdk/utils/FileExtract.java b/qpysdk/src/main/java/org/qpython/qpysdk/utils/FileExtract.java
new file mode 100644
index 00000000..14905714
--- /dev/null
+++ b/qpysdk/src/main/java/org/qpython/qpysdk/utils/FileExtract.java
@@ -0,0 +1,97 @@
+package org.qpython.qpysdk.utils;
+
+import android.util.Log;
+
+import com.quseit.common.jtar.TarEntry;
+import com.quseit.common.jtar.TarInputStream;
+
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.zip.GZIPInputStream;
+
+
+public class FileExtract {
+    public boolean extractTar(File tar, String target) {
+
+        byte buf[] = new byte[8 * 1024];
+
+        InputStream assetStream;
+        TarInputStream tis;
+
+        try {
+            assetStream = new FileInputStream(tar);
+            tis = new TarInputStream(new BufferedInputStream(new GZIPInputStream(new BufferedInputStream(assetStream, 8192)), 8192));
+        } catch (IOException e) {
+            return false;
+        }
+
+        while (true) {
+            TarEntry entry;
+
+            try {
+                entry = tis.getNextEntry();
+            } catch (java.io.IOException e) {
+                return false;
+            }
+
+            if (entry == null) {
+                Log.d("FileExtract","ENCOUNTER NULL WHEN extractTarS");
+                break;
+            }
+            if (entry.isDirectory()) {
+
+                try {
+                    new File(target + "/" + entry.getName()).mkdirs();
+                } catch (SecurityException ignore) {
+                }
+                continue;
+            }
+
+            OutputStream out = null;
+            String path = target + "/" + entry.getName().trim();
+
+            try {
+                Log.d("FileExtract","FILE:"+path);
+                out = new BufferedOutputStream(new FileOutputStream(path), 8192);
+            } catch (FileNotFoundException ignore) {
+            } catch (SecurityException ignore) {
+            }
+
+            if (out == null) {
+                return false;
+            }
+
+            try {
+                while (true) {
+                    int len = tis.read(buf);
+
+                    if (len == -1) {
+                        break;
+                    }
+
+                    out.write(buf, 0, len);
+                }
+
+                out.flush();
+                out.close();
+            } catch (java.io.IOException e) {
+                return false;
+            }
+        }
+
+        try {
+            tis.close();
+            assetStream.close();
+        } catch (IOException ignore) {
+        }
+
+        return true;
+    }
+}
diff --git a/qpysdk/src/main/java/org/qpython/qpysdk/utils/FileHelper.java b/qpysdk/src/main/java/org/qpython/qpysdk/utils/FileHelper.java
index 2247d5a1..90ffe237 100644
--- a/qpysdk/src/main/java/org/qpython/qpysdk/utils/FileHelper.java
+++ b/qpysdk/src/main/java/org/qpython/qpysdk/utils/FileHelper.java
@@ -42,7 +42,7 @@ public static final void createFileFromAssetsIfNExists(Context con, String filen
 		File yy = new File(dst);
 		if (!yy.exists()) {
 			String content = FileHelper.LoadDataFromAssets(con, filename);
-			FileHelper.writeToFile(dst, content);
+			FileHelper.writeToFile(dst, content, false);
 		}
 	}
 	public static void openFile(Context context, String filePath, String fileExtension) {
@@ -115,9 +115,9 @@ public static void putFileContents(Context context, String filename, String cont
 		}
 	}
 
-	public static void writeToFile(String filePath, String data) {
+	public static void writeToFile(String filePath, String data, boolean append) {
 		try {
-			FileOutputStream fOut = new FileOutputStream(filePath);
+			FileOutputStream fOut = new FileOutputStream(filePath, append);
             fOut.write(data.getBytes());
             fOut.flush();
             fOut.close();
@@ -144,12 +144,12 @@ public static String getFileContentsFromAssets(Context context, String filename)
 		
 		} catch(Exception e) {
 			e.printStackTrace();
-			//Log.d(TAG, "getFileContentsFromAssets:"+e.getMessage());
+			//LogUtil.d(TAG, "getFileContentsFromAssets:"+e.getMessage());
 		}  
 		return content; 
 	}
 	public static String getFileContents(String filename) {
-		
+
         File scriptFile = new File( filename );
         String tContent = "";
         if (scriptFile.exists()) {
@@ -157,7 +157,7 @@ public static String getFileContents(String filename) {
 			try {
 				in = new BufferedReader(new FileReader(scriptFile));
             	String line;
-            	
+
 				while ((line = in.readLine())!=null) {
 					tContent += line+"\n";
 				}
@@ -173,16 +173,46 @@ public static String getFileContents(String filename) {
         }
 		return tContent;
 	}
-	
+
+	public static String getFileContents(String filename, int pos) {
+
+		File scriptFile = new File( filename );
+		String tContent = "";
+		if (scriptFile.exists()) {
+			BufferedReader in;
+			try {
+				in = new BufferedReader(new FileReader(scriptFile));
+				String line;
+
+				while ((line = in.readLine())!=null) {
+					tContent += line+"\n";
+					if (tContent.length()>=pos) {
+						in.close();
+						return tContent;
+					}
+				}
+				in.close();
+			} catch (FileNotFoundException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			} catch (IOException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+
+		}
+		return tContent;
+	}
+
 	public static void clearDir(String dir, int level, boolean deleteS) {
-		//Log.d(TAG, "clearDir:"+dir);
+		//LogUtil.d(TAG, "clearDir:"+dir);
 		File basePath = new File(dir);
 		if (basePath.exists() && basePath.isDirectory()) {
 			for (File item : basePath.listFiles()) {
 				if (item.isFile()) {
-					//Log.d(TAG, "deleteItem:"+item.getAbsolutePath());
+					//LogUtil.d(TAG, "deleteItem:"+item.getAbsolutePath());
 					item.delete();
-					
+
 				} else if (item.isDirectory()){
 					clearDir(item.getAbsolutePath(), level+1, deleteS);
 				}
@@ -190,10 +220,9 @@ public static void clearDir(String dir, int level, boolean deleteS) {
 			if (level>0 || deleteS) {
 				basePath.delete();
 			}
-			
-			
 		}
 	}
+
 	public static File getBasePath(String parDir, String subdir) throws IOException {
 		try {
 		File basePath = new File(Environment.getExternalStorageDirectory(),
@@ -233,7 +262,7 @@ public static File getBasePath(String parDir, String subdir) throws IOException
 	
 	/*public static File getBasePath(String subdir) throws IOException {
 		File basePath = new File(Environment.getExternalStorageDirectory(),
-				CONF.BASE_PATH);
+				BASE_CONF.BASE_PATH);
 
 		if (!basePath.exists()) {
 			if (!basePath.mkdirs()) {
@@ -244,7 +273,7 @@ public static File getBasePath(String parDir, String subdir) throws IOException
 		File subPath = null;
 		if (!subdir.equals("")) {
 			subPath = new File(Environment.getExternalStorageDirectory(),
-					CONF.BASE_PATH+"/"+subdir);
+					BASE_CONF.BASE_PATH+"/"+subdir);
 			if (!subPath.exists()) {
 				if (!subPath.mkdirs()) {
 					throw new IOException(String.format("%s cannot be created!",
@@ -301,13 +330,13 @@ public static String getFileName(String filename) {
     public static String getExt(String filename, String def) {
     	String[] yy = filename.split("\\?");
         String[] xx = yy[0].split("\\.");
-        //Log.d(TAG, "filename:"+filename+"-size:"+xx.length);
+        //LogUtil.d(TAG, "filename:"+filename+"-size:"+xx.length);
     
         if (xx.length<2) {
             return def; 
         } else {
             String ext = xx[xx.length-1];
-            //Log.d(TAG, "ext:"+ext);
+            //LogUtil.d(TAG, "ext:"+ext);
             return ext;
         }   
     } 
diff --git a/qpysdk/src/main/java/org/qpython/qpysdk/utils/StreamGobbler.java b/qpysdk/src/main/java/org/qpython/qpysdk/utils/StreamGobbler.java
index cce157d1..0c762949 100644
--- a/qpysdk/src/main/java/org/qpython/qpysdk/utils/StreamGobbler.java
+++ b/qpysdk/src/main/java/org/qpython/qpysdk/utils/StreamGobbler.java
@@ -1,308 +1,308 @@
-package org.qpython.qpysdk.utils;
-
-import android.util.Log;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-/**
- * A <code>StreamGobbler</code> is an InputStream that uses an internal worker thread to constantly consume input from
- * another InputStream. It uses a buffer to store the consumed data. The buffer size is automatically adjusted, if
- * needed.
- * <p>
- * This class is sometimes very convenient - if you wrap a session's STDOUT and STDERR InputStreams with instances of
- * this class, then you don't have to bother about the shared window of STDOUT and STDERR in the low level SSH-2
- * protocol, since all arriving data will be immediatelly consumed by the worker threads. Also, as a side effect, the
- * streams will be buffered (e.g., single byte read() operations are faster).
- * <p>
- * Other SSH for Java libraries include this functionality by default in their STDOUT and STDERR InputStream
- * implementations, however, please be aware that this approach has also a downside:
- * <p>
- * If you do not call the StreamGobbler's <code>read()</code> method often enough and the peer is constantly sending
- * huge amounts of data, then you will sooner or later encounter a low memory situation due to the aggregated data
- * (well, it also depends on the Java heap size). Joe Average will like this class anyway - a paranoid programmer would
- * never use such an approach.
- * <p>
- * The term "StreamGobbler" was taken from an article called "When Runtime.exec() won't", see
- * http://www.javaworld.com/javaworld/jw-12-2000/jw-1229-traps.html.
- * 
- * @author Christian Plattner, plattner@trilead.com
- * @version $Id: StreamGobbler.java,v 1.1 2007/10/15 12:49:56 cplattne Exp $
- */
-
-public class StreamGobbler extends InputStream {
-	class GobblerThread extends Thread {
-		/*
-		@Override
-		public void run() {
-
-			while (true) {
-				try {
-					byte[] saveBuffer = null;
-
-					int avail = is.read(buffer, write_pos, buffer.length - write_pos);
-					synchronized (synchronizer) {
-						if (avail <= 0) {
-							isEOF = true;
-							synchronizer.notifyAll();
-							break;
-						}
-						write_pos += avail;
-
-						int space_available = buffer.length - write_pos;
-						Log.e("space_available:" + buffer.length + "-" + write_pos);
-
-						if (space_available == 0) {
-							if (read_pos > 0) {
-								saveBuffer = new byte[read_pos];
-								System.arraycopy(buffer, 0, saveBuffer, 0, read_pos);
-								System.arraycopy(buffer, read_pos, buffer, 0, buffer.length - read_pos);
-								write_pos -= read_pos;
-								read_pos = 0;
-
-								Log.e("read_pos > 0:" + buffer);
-
-							}
-							else {
-								write_pos = 0;
-								saveBuffer = buffer;
-
-								Log.e("read_pos <=0 :" + buffer);
-
-							}
-						}
-
-						synchronizer.notifyAll();
-					}
-					writeToFile(saveBuffer);
-
-				}
-				catch (IOException e) {
-					synchronized (synchronizer) {
-						exception = e;
-						synchronizer.notifyAll();
-						break;
-					}
-				}
-			}
-		}*/
-
-		public void run() {
-			byte[] buff = new byte[8192];
-
-			while (true) {
-				try {
-					int avail = is.read(buff);
-
-					synchronized (synchronizer) {
-						if (avail <= 0) {
-							isEOF = true;
-							synchronizer.notifyAll();
-							break;
-						}
-
-						int space_available = buffer.length - write_pos;
-
-						if (space_available < avail) {
-
-							int unread_size = write_pos - read_pos;
-							int need_space = unread_size + avail;
-
-							byte[] new_buffer = buffer;
-
-							if (need_space > buffer.length) {
-								int inc = need_space / 3;
-								inc = (inc < 256) ? 256 : inc;
-								inc = (inc > 8192) ? 8192 : inc;
-								new_buffer = new byte[need_space + inc];
-							}
-
-							if (unread_size > 0)
-								System.arraycopy(buffer, read_pos, new_buffer, 0, unread_size);
-
-							buffer = new_buffer;
-
-							read_pos = 0;
-							write_pos = unread_size;
-						}
-
-						byte[] s_buffer = new byte[avail];
-						System.arraycopy(buff, 0, s_buffer, 0, avail);
-						System.arraycopy(buff, 0, buffer, write_pos, avail);
-						write_pos += avail;
-
-						synchronizer.notifyAll();
-						writeToFile(s_buffer);
-						// Log.e("OUTPUT:"+String.valueOf(s_buffer));
-					}
-
-				}
-				catch (IOException e) {
-					synchronized (synchronizer) {
-						exception = e;
-						synchronizer.notifyAll();
-						break;
-					}
-				}
-			}
-		}
-	}
-
-	private InputStream is;
-
-	private GobblerThread t;
-
-	private Object synchronizer = new Object();
-
-	private boolean isEOF = false;
-
-	private boolean isClosed = false;
-
-	private IOException exception = null;
-
-	private byte[] buffer;
-
-	private int read_pos = 0;
-
-	private int write_pos = 0;
-
-	private final FileOutputStream mLogStream;
-
-	private final int mBufferSize;
-
-	public StreamGobbler(InputStream is, File log, int buffer_size) {
-		this.is = is;
-		mBufferSize = buffer_size;
-		FileOutputStream out = null;
-		try {
-			out = new FileOutputStream(log, false);
-		}
-		catch (IOException e) {
-			Log.e("StreamGobbler", e+"");
-		}
-		mLogStream = out;
-		buffer = new byte[mBufferSize];
-		t = new GobblerThread();
-		t.setDaemon(true);
-		t.start();
-	}
-
-	public void writeToFile(byte[] buffer) {
-
-		if (mLogStream != null && buffer != null) {
-			try {
-				mLogStream.write(buffer);
-			}
-			catch (IOException e) {
-				Log.e("StreamGobbler", e+"");
-			}
-		}
-	}
-
-	@Override
-	public int read() throws IOException {
-		synchronized (synchronizer) {
-			if (isClosed) {
-				throw new IOException("This StreamGobbler is closed.");
-			}
-
-			while (read_pos == write_pos) {
-				if (exception != null) {
-					throw exception;
-				}
-
-				if (isEOF) {
-					return -1;
-				}
-
-				try {
-					synchronizer.wait();
-				}
-				catch (InterruptedException e) {
-				}
-			}
-
-			int b = buffer[read_pos++] & 0xff;
-
-			return b;
-		}
-	}
-
-	@Override
-	public int available() throws IOException {
-		synchronized (synchronizer) {
-			if (isClosed) {
-				throw new IOException("This StreamGobbler is closed.");
-			}
-
-			return write_pos - read_pos;
-		}
-	}
-
-	@Override
-	public int read(byte[] b) throws IOException {
-		return read(b, 0, b.length);
-	}
-
-	@Override
-	public void close() throws IOException {
-		synchronized (synchronizer) {
-			if (isClosed) {
-				return;
-			}
-			isClosed = true;
-			isEOF = true;
-			synchronizer.notifyAll();
-			is.close();
-		}
-	}
-
-	@Override
-	public int read(byte[] b, int off, int len) throws IOException {
-		if (b == null) {
-			throw new NullPointerException();
-		}
-
-		if ((off < 0) || (len < 0) || ((off + len) > b.length) || ((off + len) < 0) || (off > b.length)) {
-			throw new IndexOutOfBoundsException();
-		}
-
-		if (len == 0) {
-			return 0;
-		}
-
-		synchronized (synchronizer) {
-			if (isClosed) {
-				throw new IOException("This StreamGobbler is closed.");
-			}
-
-			while (read_pos == write_pos) {
-				if (exception != null) {
-					throw exception;
-				}
-
-				if (isEOF) {
-					return -1;
-				}
-
-				try {
-					synchronizer.wait();
-				}
-				catch (InterruptedException e) {
-				}
-			}
-
-			int avail = write_pos - read_pos;
-
-			avail = (avail > len) ? len : avail;
-
-			System.arraycopy(buffer, read_pos, b, off, avail);
-
-			read_pos += avail;
-
-			return avail;
-		}
-	}
-}
+package org.qpython.qpysdk.utils;
+
+import android.util.Log;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ * A <code>StreamGobbler</code> is an InputStream that uses an internal worker thread to constantly consume input from
+ * another InputStream. It uses a buffer to store the consumed data. The buffer size is automatically adjusted, if
+ * needed.
+ * <p>
+ * This class is sometimes very convenient - if you wrap a session's STDOUT and STDERR InputStreams with instances of
+ * this class, then you don't have to bother about the shared window of STDOUT and STDERR in the low level SSH-2
+ * protocol, since all arriving data will be immediatelly consumed by the worker threads. Also, as a side effect, the
+ * streams will be buffered (e.g., single byte read() operations are faster).
+ * <p>
+ * Other SSH for Java libraries include this functionality by default in their STDOUT and STDERR InputStream
+ * implementations, however, please be aware that this approach has also a downside:
+ * <p>
+ * If you do not call the StreamGobbler's <code>read()</code> method often enough and the peer is constantly sending
+ * huge amounts of data, then you will sooner or later encounter a low memory situation due to the aggregated data
+ * (well, it also depends on the Java heap size). Joe Average will like this class anyway - a paranoid programmer would
+ * never use such an approach.
+ * <p>
+ * The term "StreamGobbler" was taken from an article called "When Runtime.exec() won't", see
+ * http://www.javaworld.com/javaworld/jw-12-2000/jw-1229-traps.html.
+ * 
+ * @author Christian Plattner, plattner@trilead.com
+ * @version $Id: StreamGobbler.java,v 1.1 2007/10/15 12:49:56 cplattne Exp $
+ */
+
+public class StreamGobbler extends InputStream {
+	class GobblerThread extends Thread {
+		/*
+		@Override
+		public void run() {
+
+			while (true) {
+				try {
+					byte[] saveBuffer = null;
+
+					int avail = is.read(buffer, write_pos, buffer.length - write_pos);
+					synchronized (synchronizer) {
+						if (avail <= 0) {
+							isEOF = true;
+							synchronizer.notifyAll();
+							break;
+						}
+						write_pos += avail;
+
+						int space_available = buffer.length - write_pos;
+						LogUtil.e("space_available:" + buffer.length + "-" + write_pos);
+
+						if (space_available == 0) {
+							if (read_pos > 0) {
+								saveBuffer = new byte[read_pos];
+								System.arraycopy(buffer, 0, saveBuffer, 0, read_pos);
+								System.arraycopy(buffer, read_pos, buffer, 0, buffer.length - read_pos);
+								write_pos -= read_pos;
+								read_pos = 0;
+
+								LogUtil.e("read_pos > 0:" + buffer);
+
+							}
+							else {
+								write_pos = 0;
+								saveBuffer = buffer;
+
+								LogUtil.e("read_pos <=0 :" + buffer);
+
+							}
+						}
+
+						synchronizer.notifyAll();
+					}
+					writeToFile(saveBuffer);
+
+				}
+				catch (IOException e) {
+					synchronized (synchronizer) {
+						exception = e;
+						synchronizer.notifyAll();
+						break;
+					}
+				}
+			}
+		}*/
+
+		public void run() {
+			byte[] buff = new byte[8192];
+
+			while (true) {
+				try {
+					int avail = is.read(buff);
+
+					synchronized (synchronizer) {
+						if (avail <= 0) {
+							isEOF = true;
+							synchronizer.notifyAll();
+							break;
+						}
+
+						int space_available = buffer.length - write_pos;
+
+						if (space_available < avail) {
+
+							int unread_size = write_pos - read_pos;
+							int need_space = unread_size + avail;
+
+							byte[] new_buffer = buffer;
+
+							if (need_space > buffer.length) {
+								int inc = need_space / 3;
+								inc = (inc < 256) ? 256 : inc;
+								inc = (inc > 8192) ? 8192 : inc;
+								new_buffer = new byte[need_space + inc];
+							}
+
+							if (unread_size > 0)
+								System.arraycopy(buffer, read_pos, new_buffer, 0, unread_size);
+
+							buffer = new_buffer;
+
+							read_pos = 0;
+							write_pos = unread_size;
+						}
+
+						byte[] s_buffer = new byte[avail];
+						System.arraycopy(buff, 0, s_buffer, 0, avail);
+						System.arraycopy(buff, 0, buffer, write_pos, avail);
+						write_pos += avail;
+
+						synchronizer.notifyAll();
+						writeToFile(s_buffer);
+						// LogUtil.e("OUTPUT:"+String.valueOf(s_buffer));
+					}
+
+				}
+				catch (IOException e) {
+					synchronized (synchronizer) {
+						exception = e;
+						synchronizer.notifyAll();
+						break;
+					}
+				}
+			}
+		}
+	}
+
+	private InputStream is;
+
+	private GobblerThread t;
+
+	private Object synchronizer = new Object();
+
+	private boolean isEOF = false;
+
+	private boolean isClosed = false;
+
+	private IOException exception = null;
+
+	private byte[] buffer;
+
+	private int read_pos = 0;
+
+	private int write_pos = 0;
+
+	private final FileOutputStream mLogStream;
+
+	private final int mBufferSize;
+
+	public StreamGobbler(InputStream is, File log, int buffer_size) {
+		this.is = is;
+		mBufferSize = buffer_size;
+		FileOutputStream out = null;
+		try {
+			out = new FileOutputStream(log, false);
+		}
+		catch (IOException e) {
+			Log.e("StreamGobbler", e+"");
+		}
+		mLogStream = out;
+		buffer = new byte[mBufferSize];
+		t = new GobblerThread();
+		t.setDaemon(true);
+		t.start();
+	}
+
+	public void writeToFile(byte[] buffer) {
+
+		if (mLogStream != null && buffer != null) {
+			try {
+				mLogStream.write(buffer);
+			}
+			catch (IOException e) {
+				Log.e("StreamGobbler", e+"");
+			}
+		}
+	}
+
+	@Override
+	public int read() throws IOException {
+		synchronized (synchronizer) {
+			if (isClosed) {
+				throw new IOException("This StreamGobbler is closed.");
+			}
+
+			while (read_pos == write_pos) {
+				if (exception != null) {
+					throw exception;
+				}
+
+				if (isEOF) {
+					return -1;
+				}
+
+				try {
+					synchronizer.wait();
+				}
+				catch (InterruptedException e) {
+				}
+			}
+
+			int b = buffer[read_pos++] & 0xff;
+
+			return b;
+		}
+	}
+
+	@Override
+	public int available() throws IOException {
+		synchronized (synchronizer) {
+			if (isClosed) {
+				throw new IOException("This StreamGobbler is closed.");
+			}
+
+			return write_pos - read_pos;
+		}
+	}
+
+	@Override
+	public int read(byte[] b) throws IOException {
+		return read(b, 0, b.length);
+	}
+
+	@Override
+	public void close() throws IOException {
+		synchronized (synchronizer) {
+			if (isClosed) {
+				return;
+			}
+			isClosed = true;
+			isEOF = true;
+			synchronizer.notifyAll();
+			is.close();
+		}
+	}
+
+	@Override
+	public int read(byte[] b, int off, int len) throws IOException {
+		if (b == null) {
+			throw new NullPointerException();
+		}
+
+		if ((off < 0) || (len < 0) || ((off + len) > b.length) || ((off + len) < 0) || (off > b.length)) {
+			throw new IndexOutOfBoundsException();
+		}
+
+		if (len == 0) {
+			return 0;
+		}
+
+		synchronized (synchronizer) {
+			if (isClosed) {
+				throw new IOException("This StreamGobbler is closed.");
+			}
+
+			while (read_pos == write_pos) {
+				if (exception != null) {
+					throw exception;
+				}
+
+				if (isEOF) {
+					return -1;
+				}
+
+				try {
+					synchronizer.wait();
+				}
+				catch (InterruptedException e) {
+				}
+			}
+
+			int avail = write_pos - read_pos;
+
+			avail = (avail > len) ? len : avail;
+
+			System.arraycopy(buffer, read_pos, b, off, avail);
+
+			read_pos += avail;
+
+			return avail;
+		}
+	}
+}
diff --git a/qpysdk/src/main/java/org/qpython/qpysdk/utils/Utils.java b/qpysdk/src/main/java/org/qpython/qpysdk/utils/Utils.java
index fdb17fb0..ecbca606 100644
--- a/qpysdk/src/main/java/org/qpython/qpysdk/utils/Utils.java
+++ b/qpysdk/src/main/java/org/qpython/qpysdk/utils/Utils.java
@@ -1,15 +1,27 @@
 package org.qpython.qpysdk.utils;
 
 import android.app.ActivityManager;
+import android.app.Notification;
+import android.app.PendingIntent;
 import android.content.Context;
+import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.ConfigurationInfo;
+import android.graphics.Bitmap;
+import android.os.Build;
 import android.util.Log;
 
+import com.quseit.qpyengine.R;
+
 import java.io.IOException;
+import java.lang.reflect.Field;
+import java.net.ConnectException;
 import java.net.HttpURLConnection;
+import java.net.InetSocketAddress;
 import java.net.MalformedURLException;
+import java.net.Socket;
 import java.net.URL;
+import java.sql.Time;
 
 /**
  * Created by yhc on 16/8/21.
@@ -17,6 +29,73 @@
 public class Utils {
     static final String TAG = "Utils";
 
+    public final int KIVY_REQUEST_CODE = 10103;
+    public static final String TITLE = "title";
+    public static final String PATH = "path";
+
+    public static void checkRunTimeLog(Context context, String title, String path) {
+        final Intent updateIntent = new Intent();
+        updateIntent.setClassName(context.getPackageName(), "org.qpython.qpy.main.activity.LogActivity");
+        updateIntent.putExtra(TITLE, title);
+        updateIntent.putExtra(PATH, path);
+        context.startActivity(updateIntent);
+
+    }
+    public static String getCode(Context context) {
+        String packageName = context.getPackageName();
+        String[] xcode = packageName.split("\\.");
+        String code = xcode[xcode.length-1];
+        return code;
+    }
+
+    private static int reverseResourceId(Context ctx,String resourceName,String typeName) {
+        if (ctx == null) {
+            // FIXME 这里请使用 {@link IllegalArgumentException}
+            throw new IllegalArgumentException();
+        }
+        return ctx.getResources().getIdentifier(resourceName, typeName, ctx.getApplicationContext().getPackageName());
+    }
+    public static int getDrawableId(Context ctx,String drawableResourceName) {
+        return reverseResourceId(ctx,drawableResourceName,"drawable");
+    }
+
+
+    public static Notification getNotification(Context context, String contentTitle, String contentText, PendingIntent intent,
+                                               int smallIconId, Bitmap largeIconId, int flags) {
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN) {
+            Notification notification = new Notification.Builder(context) //new Notification(icon, tickerText, when);
+                    .setTicker(contentTitle)
+                    .setContentTitle(contentTitle)
+                    .setContentText(contentText)
+                    .setSmallIcon(smallIconId)
+                    .setLargeIcon(largeIconId)
+                    .setAutoCancel(true)
+                    .setContentIntent(intent)
+                    .build();
+
+            return notification;
+        } else if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB){
+            Notification notification = new Notification.Builder(context) //new Notification(icon, tickerText, when);
+                    .setTicker(contentTitle)
+                    .setContentTitle(contentTitle)
+                    .setContentText(contentText)
+                    .setSmallIcon(smallIconId)
+                    .setSmallIcon(smallIconId)
+                    .setLargeIcon(largeIconId)
+                    .setAutoCancel(true)
+                    .setContentIntent(intent)
+                    .getNotification();
+            return notification;
+        } else {
+            Notification notification = new Notification(smallIconId, contentTitle, System.currentTimeMillis());
+            notification.tickerText = contentTitle;
+            notification.contentIntent = intent;
+            notification.flags |= flags;
+            return null;
+        }
+    }
+
+
     public static String getSP(Context context, String key)	{
         String val;
         SharedPreferences obj = context.getSharedPreferences("qpyspf",0);
@@ -33,22 +112,62 @@ public static boolean isOpenGL2supported(Context context) {
         final boolean supportsEs2 = configurationInfo.reqGlEsVersion >= 0x20000;
         return supportsEs2;
     }
-    public static boolean httpPing(String url, int timeout) {
-        //Log.d(TAG, "httpPing:"+url+"-"+timeout);
-        url = url.replaceFirst("https", "http"); // Otherwise an exception may be thrown on invalid SSL certificates.
 
+    public static boolean socketPing(String url, int timeout) {
         try {
+            Thread.sleep(timeout);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+
+        try {
+            URL hello = new URL(url);
+            Log.d(TAG, "socketPing:" + hello.getHost() + "-" + hello.getPort() + "-");
+            Socket s = new Socket();
+            s.connect(new InetSocketAddress(hello.getHost(), hello.getPort()), timeout);
+            s.close();
+
+            return true;
+        } catch (ConnectException ex) {
+            return false;
+        } catch (Exception e) {
+            return false;
+        }
+    }
+    public static boolean httpPing(String url, int timeout)  {
+        Log.d(TAG, "httpPing:"+url);
+        url = url.replaceFirst("https", "http"); // Otherwise an exception may be thrown on invalid SSL certificates.
+        try {
+//            URL hello = new URL(url);
+//            LogUtil.d(TAG, "httpPing:"+hello.getHost()+"-"+hello.getPort()+"-");
+//
+//            Socket s = new Socket(hello.getHost(), hello.getPort());
+//            boolean stat = s.isConnected();
+//
+//            s.close();
+//
+//
+//            return stat;
+
             HttpURLConnection connection = (HttpURLConnection) new URL(url).openConnection();
             connection.setConnectTimeout(timeout);
             connection.setReadTimeout(timeout);
-            connection.setRequestMethod("HEAD");
+            connection.setRequestMethod("GET");
             int responseCode = connection.getResponseCode();
-            //Log.d(TAG, "responseCode:"+responseCode);
+            Log.d(TAG, "responseCode:"+responseCode);
+
+            try {
+                Thread.sleep(timeout);
+            } catch (InterruptedException ex) {
+
+            }
+
             return (responseCode>0);
             //return (200 <= responseCode && responseCode <= 399);
         } catch (IOException exception) {
             Log.d(TAG, "exception:"+exception.getLocalizedMessage());
 
+
             return false;
         }
     }
@@ -64,7 +183,7 @@ static public boolean isSrvOk(String srv) {
             return ret;
 
         } catch (MalformedURLException e) {
-            //Log.d("Bean", "MalformedURLException:"+e);
+            //LogUtil.d("Bean", "MalformedURLException:"+e);
             return false;
         }
     }
diff --git a/qpysdk/src/main/java/org/renpy/android/AssetExtract.java b/qpysdk/src/main/java/org/renpy/android/AssetExtract.java
index 5f4874a3..b04a1436 100644
--- a/qpysdk/src/main/java/org/renpy/android/AssetExtract.java
+++ b/qpysdk/src/main/java/org/renpy/android/AssetExtract.java
@@ -2,29 +2,33 @@
 // spaces amount
 package org.renpy.android;
 
+import java.io.*;
+
 import android.app.Activity;
-import android.content.res.AssetManager;
 import android.util.Log;
 
-import org.qpython.qpysdk.jtar.TarEntry;
-import org.qpython.qpysdk.jtar.TarInputStream;
-
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.OutputStream;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.File;
+
 import java.util.zip.GZIPInputStream;
 
-public class AssetExtract {
+import android.content.res.AssetManager;
+
+import com.quseit.common.jtar.TarEntry;
+import com.quseit.common.jtar.TarInputStream;
+
+
+class AssetExtract {
 
     private AssetManager mAssetManager = null;
     private Activity mActivity = null;
 
-    public AssetExtract(Activity act) {
+    AssetExtract(Activity act) {
         mActivity = act;
         mAssetManager = act.getAssets();
     }
@@ -36,6 +40,8 @@ public boolean extractTar(String asset, String target) {
         InputStream assetStream = null;
         TarInputStream tis = null;
 
+        Log.i("python", "extracting " + asset + " to " + target);
+        
         try {
             assetStream = mAssetManager.open(asset, AssetManager.ACCESS_STREAMING);
             tis = new TarInputStream(new BufferedInputStream(new GZIPInputStream(new BufferedInputStream(assetStream, 8192)), 8192));
@@ -58,7 +64,7 @@ public boolean extractTar(String asset, String target) {
                 break;
             }
 
-            Log.i("python", "extracting " + entry.getName());
+            // LogUtil.i("python", "extracting " + entry.getName());
 
             if (entry.isDirectory()) {
 
diff --git a/qpysdk/src/main/java/org/renpy/android/Audio.java b/qpysdk/src/main/java/org/renpy/android/Audio.java
deleted file mode 100644
index a824e4ca..00000000
--- a/qpysdk/src/main/java/org/renpy/android/Audio.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
-   Simple DirectMedia Layer
-   Java source code (C) 2009-2011 Sergii Pylypenko
-
-   This software is provided 'as-is', without any express or implied
-   warranty.  In no event will the authors be held liable for any damages
-   arising from the use of this software.
-
-   Permission is granted to anyone to use this software for any purpose,
-   including commercial applications, and to alter it and redistribute it
-   freely, subject to the following restrictions:
-
-   1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required. 
-   2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-   3. This notice may not be removed or altered from any source distribution.
-   */
-
-package org.renpy.android;
-
-
-import android.media.AudioFormat;
-import android.media.AudioManager;
-import android.media.AudioTrack;
-
-
-class AudioThread {
-
-    private PythonActivity mParent;
-    private AudioTrack mAudio;
-    private byte[] mAudioBuffer;
-    private int mVirtualBufSize;
-
-    public AudioThread(PythonActivity parent)
-    {
-        mParent = parent;
-        mAudio = null;
-        mAudioBuffer = null;
-        nativeAudioInitJavaCallbacks();
-    }
-
-    public int fillBuffer()
-    {
-        if( mParent.isPaused() )
-        {
-            try{
-                Thread.sleep(200);
-            } catch (InterruptedException e) {}
-        }
-        else
-        {
-            //if( Globals.AudioBufferConfig == 0 ) // Gives too much spam to logcat, makes things worse
-            //     mAudio.flush();
-
-            mAudio.write( mAudioBuffer, 0, mVirtualBufSize );
-        }
-
-        return 1;
-    }
-
-    public int initAudio(int rate, int channels, int encoding, int bufSize)
-    {
-        if( mAudio == null )
-        {
-            channels = ( channels == 1 ) ? AudioFormat.CHANNEL_CONFIGURATION_MONO : 
-                AudioFormat.CHANNEL_CONFIGURATION_STEREO;
-            encoding = ( encoding == 1 ) ? AudioFormat.ENCODING_PCM_16BIT :
-                AudioFormat.ENCODING_PCM_8BIT;
-
-            mVirtualBufSize = bufSize;
-
-            if( AudioTrack.getMinBufferSize( rate, channels, encoding ) > bufSize )
-                bufSize = AudioTrack.getMinBufferSize( rate, channels, encoding );
-
-            /**
-              if(Globals.AudioBufferConfig != 0) {    // application's choice - use minimal buffer
-              bufSize = (int)((float)bufSize * (((float)(Globals.AudioBufferConfig - 1) * 2.5f) + 1.0f));
-              mVirtualBufSize = bufSize;
-              }
-             **/
-            mAudioBuffer = new byte[bufSize];
-
-            mAudio = new AudioTrack(AudioManager.STREAM_MUSIC,
-                    rate,
-                    channels,
-                    encoding,
-                    bufSize,
-                    AudioTrack.MODE_STREAM );
-            mAudio.play();
-        }
-        return mVirtualBufSize;
-    }
-
-    public byte[] getBuffer()
-    {
-        return mAudioBuffer;
-    }
-
-    public int deinitAudio()
-    {
-        if( mAudio != null )
-        {
-            mAudio.stop();
-            mAudio.release();
-            mAudio = null;
-        }
-        mAudioBuffer = null;
-        return 1;
-    }
-
-    public int initAudioThread()
-    {
-        // Make audio thread priority higher so audio thread won't get underrun
-        Thread.currentThread().setPriority(Thread.MAX_PRIORITY);
-        return 1;
-    }
-
-    public int pauseAudioPlayback()
-    {
-        if( mAudio != null )
-        {
-            mAudio.pause();
-            return 1;
-        }
-        return 0;
-    }
-
-    public int resumeAudioPlayback()
-    {
-        if( mAudio != null )
-        {
-            mAudio.play();
-            return 1;
-        }
-        return 0;
-    }
-
-    private native int nativeAudioInitJavaCallbacks();
-
-    static {
-        System.loadLibrary("sdl");
-
-    }
-}
-
diff --git a/qpysdk/src/main/java/org/renpy/android/Configuration.java b/qpysdk/src/main/java/org/renpy/android/Configuration.java
deleted file mode 100644
index ad780697..00000000
--- a/qpysdk/src/main/java/org/renpy/android/Configuration.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package org.renpy.android;
-
-public class Configuration {
-    
-    static public boolean use_billing = false;
-    static public String billing_pubkey = null;
-    
-    static public byte billing_salt[] = new byte[] {41, -90, -116, -41, 66, -53, 122, -110, -127, -96, -88, 77, 127, 115, 1, 73, 57, 110, 48, -116};
-}
\ No newline at end of file
diff --git a/qpysdk/src/main/java/org/renpy/android/Constants.java b/qpysdk/src/main/java/org/renpy/android/Constants.java
new file mode 100644
index 00000000..1fc0b646
--- /dev/null
+++ b/qpysdk/src/main/java/org/renpy/android/Constants.java
@@ -0,0 +1,14 @@
+package org.renpy.android;
+
+public class Constants {
+	// Used by the google play store.
+//    public static String PLAY_BASE64_PUBLIC_KEY = "{{ config.google_play_key }}";
+//    public static byte[] PLAY_SALT = new byte[] { {{ config.google_play_salt }} };
+//
+//    // Used by the expansion downloader.
+//    public static int fileVersion = {{ config.numeric_version }};
+//    public static int fileSize = {{ file_size }};
+
+    // Used by the in-app purchasing code.
+    public static String store = "{{ config.store }}";
+}
diff --git a/qpysdk/src/main/java/org/renpy/android/Hardware.java b/qpysdk/src/main/java/org/renpy/android/Hardware.java
deleted file mode 100644
index 01ed712b..00000000
--- a/qpysdk/src/main/java/org/renpy/android/Hardware.java
+++ /dev/null
@@ -1,284 +0,0 @@
-package org.renpy.android;
-
-import android.content.Context;
-import android.os.Vibrator;
-import android.hardware.Sensor;
-import android.hardware.SensorEvent;
-import android.hardware.SensorEventListener;
-import android.hardware.SensorManager;
-import android.util.DisplayMetrics;
-import android.view.inputmethod.InputMethodManager;
-import android.view.inputmethod.EditorInfo;
-import android.view.View;
-
-import java.util.List;
-import java.util.ArrayList;
-import android.net.wifi.ScanResult;
-import android.net.wifi.WifiManager;
-import android.content.BroadcastReceiver;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.net.ConnectivityManager;
-import android.net.NetworkInfo;
-
-
-/**
- * Methods that are expected to be called via JNI, to access the
- * device's non-screen hardware. (For example, the vibration and
- * accelerometer.)
- */
-public class Hardware {
-
-    // The context.
-    static Context context;
-    static View view;
-
-    /**
-     * Vibrate for s seconds.
-     */
-    public static void vibrate(double s) {
-        Vibrator v = (Vibrator) context.getSystemService(Context.VIBRATOR_SERVICE);
-        if (v != null) {
-            v.vibrate((int) (1000 * s));
-        }
-    }
-
-    /**
-     * Get an Overview of all Hardware Sensors of an Android Device
-     */
-    public static String getHardwareSensors() {
-        SensorManager sm = (SensorManager) context.getSystemService(Context.SENSOR_SERVICE);
-        List<Sensor> allSensors = sm.getSensorList(Sensor.TYPE_ALL);
-
-        if (allSensors != null) {
-            String resultString = "";
-            for (Sensor s : allSensors) {
-                resultString += String.format("Name=" + s.getName());
-                resultString += String.format(",Vendor=" + s.getVendor());
-                resultString += String.format(",Version=" + s.getVersion());
-                resultString += String.format(",MaximumRange=" + s.getMaximumRange());
-                // XXX MinDelay is not in the 2.2
-                //resultString += String.format(",MinDelay=" + s.getMinDelay());
-                resultString += String.format(",Power=" + s.getPower());
-                resultString += String.format(",Type=" + s.getType() + "\n");
-            }
-            return resultString;
-        }
-        return "";
-    }
-
-
-    /**
-     * Get Access to 3 Axis Hardware Sensors Accelerometer, Orientation and Magnetic Field Sensors
-     */
-    public static class generic3AxisSensor implements SensorEventListener {
-        private final SensorManager sSensorManager;
-        private final Sensor sSensor;
-        private final int sSensorType;
-        SensorEvent sSensorEvent;
-
-        public generic3AxisSensor(int sensorType) {
-            sSensorType = sensorType;
-            sSensorManager = (SensorManager)context.getSystemService(Context.SENSOR_SERVICE);
-            sSensor = sSensorManager.getDefaultSensor(sSensorType);
-        }
-
-        public void onAccuracyChanged(Sensor sensor, int accuracy) {
-        }
-
-        public void onSensorChanged(SensorEvent event) {
-            sSensorEvent = event;
-        }
-
-        /**
-         * Enable or disable the Sensor by registering/unregistering
-         */
-        public void changeStatus(boolean enable) {
-            if (enable) {
-                sSensorManager.registerListener(this, sSensor, SensorManager.SENSOR_DELAY_NORMAL);
-            } else {
-                sSensorManager.unregisterListener(this, sSensor);
-            }
-        }
-
-        /**
-         * Read the Sensor
-         */ 
-        public float[] readSensor() {
-            if (sSensorEvent != null) {
-                return sSensorEvent.values;
-            } else {
-                float rv[] = { 0f, 0f, 0f };
-                return rv;
-            }
-        }
-    }
-
-    public static generic3AxisSensor accelerometerSensor = null;
-    public static generic3AxisSensor orientationSensor = null;
-    public static generic3AxisSensor magneticFieldSensor = null;
-
-    /**
-     * functions for backward compatibility reasons
-     */
-
-    public static void accelerometerEnable(boolean enable) {
-        if ( accelerometerSensor == null )
-            accelerometerSensor = new generic3AxisSensor(Sensor.TYPE_ACCELEROMETER);
-        accelerometerSensor.changeStatus(enable);
-    }
-    public static float[] accelerometerReading() {
-        float rv[] = { 0f, 0f, 0f };
-        if ( accelerometerSensor == null )
-            return rv;
-        return (float[]) accelerometerSensor.readSensor();
-    }
-    public static void orientationSensorEnable(boolean enable) {
-        if ( orientationSensor == null )
-            orientationSensor = new generic3AxisSensor(Sensor.TYPE_ORIENTATION);
-        orientationSensor.changeStatus(enable);
-    }
-    public static float[] orientationSensorReading() {
-        float rv[] = { 0f, 0f, 0f };
-        if ( orientationSensor == null )
-            return rv;
-        return (float[]) orientationSensor.readSensor();
-    }
-    public static void magneticFieldSensorEnable(boolean enable) {
-        if ( magneticFieldSensor == null )
-            magneticFieldSensor = new generic3AxisSensor(Sensor.TYPE_MAGNETIC_FIELD);
-        magneticFieldSensor.changeStatus(enable);
-    }
-    public static float[] magneticFieldSensorReading() {
-        float rv[] = { 0f, 0f, 0f };
-        if ( magneticFieldSensor == null )
-            return rv;
-        return (float[]) magneticFieldSensor.readSensor();
-    }
-
-    static public DisplayMetrics metrics = new DisplayMetrics();
-
-    /**
-     * Get display DPI.
-     */
-    public static int getDPI() {
-        return metrics.densityDpi;
-    }
-
-    /**
-     * Show the soft keyboard.
-     */
-    public static void showKeyboard(int input_type) {
-        //Log.i("python", "hardware.Java show_keyword  " input_type);
-
-        InputMethodManager imm = (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE);
-
-        SDLSurfaceView vw = (SDLSurfaceView) view;
-
-        int inputType = input_type;
-
-        if (vw.inputType != inputType){
-            vw.inputType = inputType;
-            imm.restartInput(view);
-            }
-
-        imm.showSoftInput(view, InputMethodManager.SHOW_FORCED);
-    }
-
-    /**
-     * Hide the soft keyboard.
-     */
-    public static void hideKeyboard() {
-        InputMethodManager imm = (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE);
-        imm.hideSoftInputFromWindow(view.getWindowToken(), 0);
-    }
-
-    /**
-     * Scan WiFi networks
-     */
-    static List<ScanResult> latestResult;
-
-    public static void enableWifiScanner()
-    {
-        IntentFilter i = new IntentFilter();
-        i.addAction(WifiManager.SCAN_RESULTS_AVAILABLE_ACTION);
-
-        context.registerReceiver(new BroadcastReceiver() {
-
-            @Override
-            public void onReceive(Context c, Intent i) {
-                // Code to execute when SCAN_RESULTS_AVAILABLE_ACTION event occurs
-                WifiManager w = (WifiManager) c.getSystemService(Context.WIFI_SERVICE);
-                latestResult = w.getScanResults(); // Returns a <list> of scanResults
-            }
-
-        }, i);
-
-    }
-
-    public static String scanWifi() {
-
-        // Now you can call this and it should execute the broadcastReceiver's
-        // onReceive()
-        WifiManager wm = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
-        boolean a = wm.startScan();
-
-        if (latestResult != null){
-
-            String latestResultString = "";
-            for (ScanResult result : latestResult)
-            {
-                latestResultString += String.format("%s\t%s\t%d\n", result.SSID, result.BSSID, result.level);
-            }
-
-            return latestResultString;
-        }
-
-        return "";
-    }
-
-    /**
-     * network state
-     */
-
-    public static boolean network_state = false;
-
-    /**
-     * Check network state directly
-     *
-     * (only one connection can be active at a given moment, detects all network type)
-     *
-     */
-    public static boolean checkNetwork()
-    {
-        boolean state = false;
-        final ConnectivityManager conMgr =  (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
-
-        final NetworkInfo activeNetwork = conMgr.getActiveNetworkInfo();
-        if (activeNetwork != null && activeNetwork.isConnected()) {
-            state = true;
-        } else {
-            state = false;
-        }
-
-        return state;
-    }
-
-    /**
-     * To recieve network state changes
-     */
-    public static void registerNetworkCheck()
-    {
-        IntentFilter i = new IntentFilter();
-        i.addAction(ConnectivityManager.CONNECTIVITY_ACTION);
-        context.registerReceiver(new BroadcastReceiver() {
-
-            @Override
-            public void onReceive(Context c, Intent i) {
-                network_state = checkNetwork();
-            }
-
-        }, i);
-    }
-
-}
diff --git a/qpysdk/src/main/java/org/renpy/android/Project.java b/qpysdk/src/main/java/org/renpy/android/Project.java
deleted file mode 100644
index 0fc835c1..00000000
--- a/qpysdk/src/main/java/org/renpy/android/Project.java
+++ /dev/null
@@ -1,116 +0,0 @@
-package org.renpy.android;
-
-import java.io.UnsupportedEncodingException;
-import java.io.File;
-import java.io.FileInputStream;
-import java.util.Properties;
-
-import android.util.Log;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-
-
-/**
- * This represents a project we've scanned for.
- */
-public class Project {
-
-    String dir = null;
-    String title = null;
-    String author = null;
-    Bitmap icon = null;
-    boolean landscape = false;
-    boolean fullscreen = false;
-
-    static String decode(String s) {
-        try {
-            return new String(s.getBytes("ISO-8859-1"), "UTF-8");
-        } catch (UnsupportedEncodingException e) {
-            return s;
-        }
-    }
-
-    /**
-     * Scans directory for a project.txt file. If it finds one,
-     * and it looks valid enough, then it creates a new Project,
-     * and returns that. Otherwise, returns null.
-     */
-    public static Project scanDirectory(File dir) {
-
-        // We might have a link file.
-        if (dir.getAbsolutePath().endsWith(".link")) {
-            try {
-
-                // Scan the android.txt file.
-                File propfile = new File(dir, "android.txt");
-                if (!propfile.exists()) {
-                    return null;
-
-                }
-                FileInputStream in = new FileInputStream(propfile);
-                Properties p = new Properties();
-                p.load(in);
-                in.close();
-                String directory = p.getProperty("directory", null);
-
-                if (directory == null) {
-                    return null;
-                }
-
-                dir = new File(directory);
-
-                
-
-
-            } catch (Exception e) {
-                Log.i("Project", "Couldn't open link file " + dir, e);
-            }
-        }
-
-        // Make sure we're dealing with a directory.
-        if (! dir.isDirectory()) {
-            return null;
-        }
-
-        try {
-
-            // Scan the android.txt file.
-            File propfile = new File(dir, "android.txt");
-            if (!propfile.exists()) {
-                return null;
-
-            }
-            FileInputStream in = new FileInputStream(propfile);
-            Properties p = new Properties();
-            p.load(in);
-            in.close();
-
-            // Get the various properties.
-            String title = decode(p.getProperty("title", "Untitled"));
-            String author = decode(p.getProperty("author", ""));
-            boolean landscape = p.getProperty("orientation", "portrait").equals("landscape");
-            boolean fullscreen = p.getProperty("fullscreen", "0").equals("1");
-
-            // Create the project object.
-            Project rv = new Project();
-            rv.title = title;
-            rv.author = author;
-            rv.icon = BitmapFactory.decodeFile(new File(dir, "icon.png").getAbsolutePath());
-            rv.landscape = landscape;
-            rv.dir = dir.getAbsolutePath();
-            rv.fullscreen = fullscreen;
-            
-
-            return rv;
-
-        } catch (Exception e) {
-            Log.i("Project", "Couldn't open android.txt", e);
-        }
-
-        return null;
-
-    }
-
-
-
-}
diff --git a/qpysdk/src/main/java/org/renpy/android/ProjectAdapter.java b/qpysdk/src/main/java/org/renpy/android/ProjectAdapter.java
deleted file mode 100644
index 566d46a8..00000000
--- a/qpysdk/src/main/java/org/renpy/android/ProjectAdapter.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package org.renpy.android;
-
-import android.app.Activity;
-import android.content.Context;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.Gravity;
-import android.widget.ArrayAdapter;
-import android.widget.TextView;
-import android.widget.LinearLayout;
-import android.widget.ImageView;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.util.Log;
-
-public class ProjectAdapter extends ArrayAdapter<Project> {
-
-    private Activity mContext;
-    private ResourceManager resourceManager;
-    
-    
-    public ProjectAdapter(Activity context) {
-        super(context, 0);
-
-        mContext = context;
-        resourceManager = new ResourceManager(context);
-    }
-
-    public View getView(int position, View convertView, ViewGroup parent) {
-        Project p = getItem(position);
-
-        View v = resourceManager.inflateView("chooser_item");
-        TextView title = (TextView) resourceManager.getViewById(v, "title");
-        TextView author = (TextView) resourceManager.getViewById(v, "author");
-        ImageView icon = (ImageView) resourceManager.getViewById(v, "icon");
-
-        title.setText(p.title);
-        author.setText(p.author);
-        icon.setImageBitmap(p.icon);
-        
-        return v;        
-    }
-}
diff --git a/qpysdk/src/main/java/org/renpy/android/ProjectChooser.java b/qpysdk/src/main/java/org/renpy/android/ProjectChooser.java
deleted file mode 100644
index 49ff71ac..00000000
--- a/qpysdk/src/main/java/org/renpy/android/ProjectChooser.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package org.renpy.android;
-
-import android.app.Activity;
-import android.os.Bundle;
-
-import android.content.Intent;
-import android.content.res.Resources;
-import android.util.Log;
-import android.view.View;
-import android.widget.ListView;
-import android.widget.TextView;
-import android.widget.AdapterView;
-import android.os.Environment;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-import android.net.Uri;
-
-public class ProjectChooser extends Activity implements AdapterView.OnItemClickListener {
-
-    ResourceManager resourceManager;
-
-    String urlScheme;
-
-    @Override
-    public void onStart()
-    {
-        super.onStart();
-
-        resourceManager = new ResourceManager(this);
-
-        urlScheme = resourceManager.getString("urlScheme");
-
-        // Set the window title.
-        setTitle(resourceManager.getString("appName"));
-
-        // Scan the sdcard for files, and sort them.
-        File dir = new File(Environment.getExternalStorageDirectory(), urlScheme);
-
-        File entries[] = dir.listFiles();
-
-        if (entries == null) {
-            entries = new File[0];
-        }
-
-        Arrays.sort(entries);
-
-        // Create a ProjectAdapter and fill it with projects.
-        ProjectAdapter projectAdapter = new ProjectAdapter(this);
-
-        // Populate it with the properties files.
-        for (File d : entries) {
-            Project p = Project.scanDirectory(d);
-            if (p != null) {
-                projectAdapter.add(p);
-            }
-        }
-
-        if (projectAdapter.getCount() != 0) {        
-
-            View v = resourceManager.inflateView("project_chooser");
-            ListView l = (ListView) resourceManager.getViewById(v, "projectList");
-
-            l.setAdapter(projectAdapter);                
-            l.setOnItemClickListener(this);
-
-            setContentView(v);
-
-        } else {
-
-            View v = resourceManager.inflateView("project_empty");
-            TextView emptyText = (TextView) resourceManager.getViewById(v, "emptyText");
-
-            emptyText.setText("No projects are available to launch. Please place a project into " + dir + " and restart this application. Press the back button to exit.");
-
-            setContentView(v);
-        }
-    }
-
-    public void onItemClick(AdapterView parent, View view, int position, long id) {
-        Project p = (Project) parent.getItemAtPosition(position);
-
-        Intent intent = new Intent(
-                "org.renpy.LAUNCH",
-                Uri.fromParts(urlScheme, p.dir, ""));
-
-        intent.setClassName(getPackageName(), "org.renpy.android.PythonActivity");
-        this.startActivity(intent);
-        this.finish();
-    }
-
-
-}
diff --git a/qpysdk/src/main/java/org/renpy/android/PythonActivity.java b/qpysdk/src/main/java/org/renpy/android/PythonActivity.java
deleted file mode 100644
index d50b19ee..00000000
--- a/qpysdk/src/main/java/org/renpy/android/PythonActivity.java
+++ /dev/null
@@ -1,676 +0,0 @@
-package org.renpy.android;
-
-import android.app.Activity;
-import android.app.NotificationManager;
-import android.content.BroadcastReceiver;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.content.ServiceConnection;
-import android.content.pm.ActivityInfo;
-import android.content.pm.ApplicationInfo;
-import android.os.Bundle;
-import android.os.Environment;
-import android.os.IBinder;
-import android.util.Log;
-import android.view.KeyEvent;
-import android.view.MotionEvent;
-import android.view.Window;
-import android.view.WindowManager;
-import android.widget.Toast;
-
-import org.qpython.qpysdk.utils.FileHelper;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-public class PythonActivity extends Activity implements Runnable {
-	protected static final String TAG = "QPythonActivity";
-
-	// The audio thread for streaming audio...
-    private static AudioThread mAudioThread = null;
-
-    // The SDLSurfaceView we contain.
-    public static SDLSurfaceView mView = null;
-	public static PythonActivity mActivity = null;
-	public static ApplicationInfo mInfo = null;
-    // Did we launch our thread?
-    private boolean mLaunchedThread = false;
-
-    private ResourceManager resourceManager;
-    private boolean debugLog = true;
-
-    // The path to the directory contaning our external storage.
-    private File externalStorage;
-
-    // The path to the directory containing the game.
-    private File mPath = null;
-    private File mScript;
-
-    boolean _isPaused = false;    
-    
-    private static final String DB_INITIALIZED = "db_initialized";
-    		
-    boolean isMain = false;
-
-    public final static int PY_NOTI_FLAG = 123400;
-    public static final String EXTRA_CONTENT_URL0 = "org.qpython.qpysdk.extra.CONTENT_URL0";
-    public static final String EXTRA_CONTENT_URL1 = "org.qpython.qpysdk.extra.CONTENT_URL1";
-    public static final String EXTRA_CONTENT_URL2 = "org.qpython.qpysdk.extra.CONTENT_URL2";
-    public static final String EXTRA_CONTENT_URL3 = "org.qpython.qpysdk.extra.CONTENT_URL3";
-    public static final String EXTRA_CONTENT_URL4 = "org.qpython.qpysdk.extra.CONTENT_URL4";
-    public static final String EXTRA_CONTENT_URL5 = "org.qpython.qpysdk.extra.CONTENT_URL5";
-    public static final String EXTRA_CONTENT_URL6 = "org.qpython.qpysdk.extra.CONTENT_URL6";
-    public static final String EXTRA_CONTENT_URL7 = "org.qpython.qpysdk.extra.CONTENT_URL7";
-    public static final String EXTRA_CONTENT_URL8 = "org.qpython.qpysdk.extra.CONTENT_URL8";
-    public static final String EXTRA_CONTENT_URL9 = "org.qpython.qpysdk.extra.CONTENT_URL9";
-    public final static String LIB_DIR = "lib";
-
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        Hardware.context = this;
-        Action.context = this;
-        mActivity = this;
-
-        getWindowManager().getDefaultDisplay().getMetrics(Hardware.metrics);
-
-        resourceManager = new ResourceManager(this);
-        //externalStorage = new File(Environment.getExternalStorageDirectory(), getPackageName());
-        String debugFlag = getIntent().getStringExtra(EXTRA_CONTENT_URL5);
-        if (debugFlag!=null) {
-        	if (debugFlag.equals("0")) {
-        		debugLog = false;
-        	}
-        }
-        String root = getIntent().getStringExtra(EXTRA_CONTENT_URL4);
-        if (root != null) {
-        	File n = new File(root);
-        	if (n.exists()) {
-        		externalStorage = n;
-        	} else {
-        		externalStorage = new File(Environment.getExternalStorageDirectory(), root);
-        	}
-        } else {
-            externalStorage = new File(Environment.getExternalStorageDirectory(), "qpython");
-        }
-        Log.d(TAG, "externalStorage:"+externalStorage);
-        mScript = null;
-        // Figure out the directory where the game is. If the game was
-        // given to us via an intent, then we use the scheme-specific
-        // part of that intent to determine the file to launch. We
-        // also use the android.txt file to determine the orientation.
-        //
-        // Otherwise, we use the public data, if we have it, or the
-        // private data if we do not.
-        String act = getIntent().getStringExtra(EXTRA_CONTENT_URL1);
-        
-        boolean fullscreen = false;
-        if (act!=null && act.equals("execute")) {
-            mPath = new File(getIntent().getStringExtra(EXTRA_CONTENT_URL2));
-            
-			File f = new File(mPath, "main.py");
-			if (f.exists()) {
-	        	if (FileHelper.getFileContents(f.toString()).contains("#qpy:fullscreen")) {
-	        		fullscreen = true;
-	        	}
-			}
-			
-			
-	        Project p = Project.scanDirectory(mPath);
-
-	        if (p != null) {
-	            if (p.landscape) {
-	                setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
-	            } else {
-	                setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
-	            }
-	            
-				if ( p.fullscreen ) {
-					fullscreen = true;
-				}
-
-	        }
-        } else {
-        	String fn = getIntent().getStringExtra(EXTRA_CONTENT_URL2);
-        	if (fn == null) {
-        		isMain = true;
-        		
-        		fn = "/sdcard/qpython/launcher.py";
-        	}
-        	mScript = new File(fn);
-        	if (!mScript.exists()) {
-				String file1 = FileHelper.LoadDataFromAssets(this, "main.py");
-				FileHelper.writeToFile(fn, file1);
-
-        	}
-        	mPath = mScript.getParentFile();
-        	
-        	if (FileHelper.getFileContents(mScript.toString()).contains("#qpy:fullscreen")) {
-        		fullscreen = true;
-        	}
-        	//Log.d(TAG, "mscript:"+mScript+"-mPath"+mPath);
-        }
-        
-        //
-        if (fullscreen) {
-			getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
-					WindowManager.LayoutParams.FLAG_FULLSCREEN);
-        }
-
-        // Let old apps know they started.
-        try {
-            FileWriter f = new FileWriter(new File(mPath, ".launch"));
-            f.write("started");
-            f.close();
-        } catch (IOException e) {
-            // pass
-        }
-
-        
-        updateNotification(mPath.toString());
-
-        //Log.d("PythonActivity", "mPath:"+mPath.toString());
-        // go to fullscreen mode
-        requestWindowFeature(Window.FEATURE_NO_TITLE);
-        String full = getIntent().getStringExtra(EXTRA_CONTENT_URL3);
-        
-		File logFile = new File(mPath, ".run.log");
-		if (logFile.exists()) {
-			logFile.delete();
-		}
-
-		//this.bindService(new Intent(PythonActivity.this, PyScriptService.class), connection, BIND_AUTO_CREATE);
-
-		String s = "";
-		if (mScript!=null) {
-			s = mScript.getName();
-		} else {
-			File f = new File(mPath, "main.py");
-			if (f.exists()) {
-				s = "main.py";
-			} else {
-				f = new File(mPath, "main.pyo");
-				if (f.exists()) {
-					s = "main.pyo";
-				}
-			}
-		}
-		
-		/*try {
-			this.mInfo = this.getPackageManager().getApplicationInfo(
-					this.getPackageName(), PackageManager.GET_META_DATA);
-			Log.v(TAG, "metadata fullscreen is" + this.mInfo.metaData.get("fullscreen"));
-			if ( (Integer)this.mInfo.metaData.get("fullscreen") == 1 ) {
-				getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
-						WindowManager.LayoutParams.FLAG_FULLSCREEN);
-			}
-		} catch (PackageManager.NameNotFoundException e) {
-		
-		}*/
-		//
-		
-//		if (isMain) {	//
-//			Intent intent = new Intent();
-//			intent.setClassName(PythonActivity.this, "com.hipipal.sl4alib.PyScriptService");
-//			this.bindService(intent, connection, BIND_AUTO_CREATE);
-//		}
-		
-			
-		Log.d(TAG, "[RUN param:"+externalStorage.getAbsolutePath().toString()+"-"+mPath.getAbsolutePath().toString()+"-"+s+"]");
-        mView = new SDLSurfaceView(
-                this,
-                mPath.getAbsolutePath().toString(),
-                s,
-                externalStorage.getAbsolutePath().toString()
-                );
-        
-        IntentFilter filter = new IntentFilter(".PythonActivity");
-        registerReceiver(mReceiver, filter);
-
-		startPyScreen();
-    }
-    
-	private ServiceConnection connection = new ServiceConnection() {
-		@Override
-		public void onServiceConnected(ComponentName name, IBinder service) {		
-			//if (!CONF.DEBUG) 
-			Log.d(TAG, "onServiceConnected");
-			//binded = true;
-		}
-
-		@Override
-		public void onServiceDisconnected(ComponentName name) {
-			//if (!CONF.DEBUG) 
-			Log.d(TAG, "onServiceDisconnected");
-			//binded = false;
-		}
-	};
-
-
-
-    public void startPyScreen() {
-        // Start showing an SDLSurfaceView.
-        Hardware.view = mView;
-        setContentView(mView);
-        
-        // Force the background window color if asked
-        /*if ( this.mInfo.metaData.containsKey("android.background_color") ) {
-        	getWindow().getDecorView().setBackgroundColor(
-        			this.mInfo.metaData.getInt("android.background_color"));
-        }*/
-
-    }
-    
-    /**
-     * Show an error using a toast. (Only makes sense from non-UI
-     * threads.)
-     */
-    public void toastError(final String msg) {
-
-        final Activity thisActivity = this;
-        runOnUiThread(new Runnable () {
-                public void run() {
-                    Toast.makeText(thisActivity, msg, Toast.LENGTH_LONG).show();
-                }
-            });
-
-        // Wait to show the error.
-        synchronized (this) {
-            try {
-                this.wait(1000);
-            } catch (InterruptedException e) {
-            }
-        }
-    }
-
-    public void recursiveDelete(File f) {
-        if (f.isDirectory()) {
-            for (File r : f.listFiles()) {
-                recursiveDelete(r);
-            }
-        }
-        f.delete();
-    }
-
-
-    /**
-     * This determines if unpacking one the zip files included in
-     * the .apk is necessary. If it is, the zip file is unpacked.
-     */
-    public void unpackDataInPyAct(final String resource, File target) {
-    	
-        // The version of data in memory and on disk.
-        String data_version = resourceManager.getString(resource + "_version");
-        String disk_version = "0";
-
-        // If no version, no unpacking is necessary.
-        if (data_version == null) {
-            return;
-        }
-
-        // Check the current disk version, if any.
-        String filesDir = target.getAbsolutePath();
-        String disk_version_fn = filesDir + "/" + resource + ".version";
-
-        try {
-            byte buf[] = new byte[64];
-            InputStream is = new FileInputStream(disk_version_fn);
-            int len = is.read(buf);
-            disk_version = new String(buf, 0, len);
-            is.close();
-        } catch (Exception e) {
-            disk_version = "0";
-        }
-
-        // If the disk data is out of date, extract it and write the
-        // version file.
-        /*boolean extract = false;
-        if (disk_version.equals("")) {
-        	extract = true;
-        } else {
-        	Float data_v = Float.parseFloat(data_version);
-        	Float disk_v = Float.parseFloat(disk_version);
-        	if (data_v.intValue()>disk_v.intValue()) {
-        		extract = true;
-        	}
-        }*/
-        //Log.d(TAG, "data_version:"+Math.round(Double.parseDouble(data_version))+"-disk_version:"+Math.round(Double.parseDouble(disk_version))+"-RET:"+(int)(Double.parseDouble(data_version)-Double.parseDouble(disk_version)));
-        if ((int)(Double.parseDouble(data_version)-Double.parseDouble(disk_version))>0 || disk_version.equals("0")) {
-            Log.v(TAG, "Extracting " + resource + " assets.");
-
-            //recursiveDelete(target);
-            target.mkdirs();
-
-            AssetExtract ae = new AssetExtract(this);
-            if (!ae.extractTar(resource + ".mp3", target.getAbsolutePath())) {
-                toastError("Could not extract " + resource + " data.");
-            }
-
-            try {
-            	/*if (resource.equals("private")) {
-            		Toast.makeText(getApplicationContext(), R.string.first_load, Toast.LENGTH_SHORT).show();
-            	}*/
-                // Write .nomedia.
-                new File(target, ".nomedia").createNewFile();
-
-                // Write version file.
-                FileOutputStream os = new FileOutputStream(disk_version_fn);
-                os.write(data_version.getBytes());
-                os.close();
-            } catch (Exception e) {
-                Log.w("python", e);
-                toastError("Could not extract " + resource + " data, make sure your device have enough space.");
-            }
-
-        } else {
-        	Log.d(TAG, "NO MEDIA EXTRACTED");
-        }
-    }
-    
-    public static void loadLibrary(File libPath) {
-        System.loadLibrary("sdl");
-        System.loadLibrary("sdl_image");
-        System.loadLibrary("sdl_ttf");
-        System.loadLibrary("sdl_mixer");
-        System.loadLibrary("python2.7");
-        System.loadLibrary("application");
-        System.loadLibrary("sdl_main");
-
-
-        try {
-            System.loadLibrary("pymodules");
-        } catch(UnsatisfiedLinkError e) {
-            Log.e("PythonActivity","Exception occured when loading pymodules ocre:"+e.getLocalizedMessage());
-        }
-
-        try {
-            System.loadLibrary("sqlite3");
-            System.load(libPath + "/lib/python2.7/lib-dynload/_sqlite3.so");
-        } catch(UnsatisfiedLinkError e) {
-            Log.e("PythonActivity","Exception occured when loading libsqlite3 ocre:"+e.getLocalizedMessage());
-        }
-        //String libPath = new File(Environment.getExternalStorageDirectory(), mActivity.getPackageName()).toString()+"/"+CONF.DFROM_LIB;
-
-        try {
-            System.load(libPath + "/lib/python2.7/lib-dynload/_io.so");
-            System.load(libPath + "/lib/python2.7/lib-dynload/unicodedata.so");
-
-        } catch(UnsatisfiedLinkError e) {
-        	Log.d("PythonActivity", "Exception occured when loading python modules:"+e.getLocalizedMessage());
-        }
-        
-        try {
-            System.load(libPath + "/lib/python2.7/lib-dynload/_imaging.so");
-            System.load(libPath + "/lib/python2.7/lib-dynload/_imagingft.so");
-            System.load(libPath + "/lib/python2.7/lib-dynload/_imagingmath.so");
-        } catch(UnsatisfiedLinkError e) {
-        }
-    }
-
-    public void run() {
-        unpackDataInPyAct("private", getFilesDir());
-        unpackDataInPyAct("public", new File(externalStorage+"/"+LIB_DIR));
-
-        if ( mAudioThread == null ) {
-            Log.i("python", "starting audio thread");
-            mAudioThread = new AudioThread(this);
-        }
-
-        //
-        runOnUiThread(new Runnable () {
-                public void run() {
-                	if (mView !=null) {
-                		mView.start();
-                	}
-                }
-            });
-    }
-
-    @Override
-    protected void onPause() {
-        _isPaused = true;
-        super.onPause();
-
-        if (mView != null) {
-            mView.onPause();
-        }
-    }
-    		
-    @Override
-    protected void onResume() {
-        super.onResume();
-        _isPaused = false;
-
-        if (!mLaunchedThread) {
-            mLaunchedThread = true;
-            new Thread(this).start();
-        }
-
-        if (mView != null) {
-            mView.onResume();
-        }
-    }
-
-    public boolean isPaused() {
-        return _isPaused;
-    }
-
-    @Override
-    public boolean onKeyDown(int keyCode, final KeyEvent event) {
-        if (mView != null && mView.mStarted && SDLSurfaceView.nativeKey(keyCode, 1, event.getUnicodeChar())) {
-            return true;
-        } else {
-            return super.onKeyDown(keyCode, event);
-        }
-    }
-
-    @Override
-    public boolean onKeyUp(int keyCode, final KeyEvent event) {
-        //Log.i("python", "key up " + mView + " " + mView.mStarted);
-        if (mView != null && mView.mStarted && SDLSurfaceView.nativeKey(keyCode, 0, event.getUnicodeChar())) {
-            return true;
-        } else {
-            return super.onKeyUp(keyCode, event);
-        }
-    }
-
-    @Override
-    public boolean dispatchTouchEvent(final MotionEvent ev) {
-        if (mView != null) {
-            mView.onTouchEvent(ev);
-            return true;
-        } else {
-            return super.dispatchTouchEvent(ev);
-        }
-    }
-
-    @Override
-	public void onDestroy() {
-		//Log.d(TAG, "onDestroy"+mScript.getAbsolutePath());
-
-		unregisterReceiver(mReceiver);
-		if (isMain) {
-			this.unbindService(connection);
-		}
-		//this.unbindService(connection);
-
-		if (mView != null) {
-			mView.onDestroy();
-			mView = null;
-		}
-		//Log.i(TAG, "on destroy (exit1)");
-		
-		//this.finish();
-		// 发送通知给对应的activity
-		String code;
-		if (mScript!=null) {
-			code = FileHelper.getFileContents(mScript.getAbsolutePath());
-		} else {
-			code = "";
-		}
-
-		File noexit = new File(mPath, ".noexit");
-
-		if (!noexit.exists() && !code.contains("#qpy:noend")) {
-			Intent intent1 = new Intent(".MIndexAct");
-			sendBroadcast(intent1);
-			
-			Intent intent2 = new Intent(".UProfileAct");
-			sendBroadcast(intent2);
-			
-			updateNotification(mPath.toString());
-
-		} else {
-			updateNotification(mPath.toString());
-		}
-		
-		try{
-			super.onDestroy();
-		} catch (Exception e) {
-			
-		}
-	}
-    
-    public static void start_service(String serviceTitle, String serviceDescription,
-            String pythonServiceArgument) {
-        Intent serviceIntent = new Intent(PythonActivity.mActivity, PythonService.class);
-        String argument = PythonActivity.mActivity.getFilesDir().getAbsolutePath();
-        String filesDirectory = PythonActivity.mActivity.mPath.getAbsolutePath();
-        serviceIntent.putExtra("androidPrivate", argument);
-        serviceIntent.putExtra("androidArgument", filesDirectory);
-        serviceIntent.putExtra("pythonHome", argument);
-        serviceIntent.putExtra("pythonPath", argument + ":" + filesDirectory + "/lib");
-        serviceIntent.putExtra("serviceTitle", serviceTitle);
-        serviceIntent.putExtra("serviceDescription", serviceDescription);
-        serviceIntent.putExtra("pythonServiceArgument", pythonServiceArgument);
-        PythonActivity.mActivity.startService(serviceIntent);
-    } 
-    public static void stop_service() {
-        Intent serviceIntent = new Intent(PythonActivity.mActivity, PythonService.class);
-        PythonActivity.mActivity.stopService(serviceIntent);
-    }
-
-    //----------------------------------------------------------------------------
-    // Listener interface for onNewIntent
-    //
-
-    public interface NewIntentListener {
-        void onNewIntent(Intent intent);
-    }
-
-    private List<NewIntentListener> newIntentListeners = null;
-
-    public void registerNewIntentListener(NewIntentListener listener) {
-        if ( this.newIntentListeners == null )
-            this.newIntentListeners = Collections.synchronizedList(new ArrayList<NewIntentListener>());
-        this.newIntentListeners.add(listener);
-    }
-
-    public void unregisterNewIntentListener(NewIntentListener listener) {
-        if ( this.newIntentListeners == null )
-            return;
-        this.newIntentListeners.remove(listener);
-    }
-
-    @Override
-    protected void onNewIntent(Intent intent) {
-        if ( this.newIntentListeners == null )
-            return;
-        if ( this.mView != null )
-            this.mView.onResume();
-        synchronized ( this.newIntentListeners ) {
-            Iterator<NewIntentListener> iterator = this.newIntentListeners.iterator();
-            while ( iterator.hasNext() ) {
-                (iterator.next()).onNewIntent(intent);
-            }
-        }
-    }
-
-    //----------------------------------------------------------------------------
-    // Listener interface for onActivityResult
-    //
-
-    public interface ActivityResultListener {
-        void onActivityResult(int requestCode, int resultCode, Intent data);
-    }
-
-    private List<ActivityResultListener> activityResultListeners = null;
-
-    public void registerActivityResultListener(ActivityResultListener listener) {
-        if ( this.activityResultListeners == null )
-            this.activityResultListeners = Collections.synchronizedList(new ArrayList<ActivityResultListener>());
-        this.activityResultListeners.add(listener);
-    }
-
-    public void unregisterActivityResultListener(ActivityResultListener listener) {
-        if ( this.activityResultListeners == null )
-            return;
-        this.activityResultListeners.remove(listener);
-    }
-
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent intent) {
-        if ( this.activityResultListeners == null )
-            return;
-        if ( this.mView != null )
-            this.mView.onResume();
-        synchronized ( this.activityResultListeners ) {
-            Iterator<ActivityResultListener> iterator = this.activityResultListeners.iterator();
-            while ( iterator.hasNext() )
-                (iterator.next()).onActivityResult(requestCode, resultCode, intent);
-        }
-    }
-
-
-////////////////    
-    protected final BroadcastReceiver mReceiver = new BroadcastReceiver() {
-		@Override
-		public void onReceive(Context context, Intent intent) {
-			Log.d(TAG, "mReceiver");
-			startPyScreen();
-		}
-    };
-	
-	
-	protected void updateNotification(String scriptFile) {
-		String script = scriptFile.substring(scriptFile.lastIndexOf("/")+1);
-		String logFile = scriptFile+"/.run.log";
-		//Log.d(TAG, "updateNotification:(scriptFile)"+scriptFile+"(logFile)"+logFile);
-
-	    NotificationManager notificationManager = (NotificationManager)this.getSystemService(this.NOTIFICATION_SERVICE);
-
-	    if (mScript!=null) {
-	    	script = mScript.getName();
-	    }
-//
-//		Intent updateIntent = new Intent(this, OLogAct.class);
-//		updateIntent.putExtra(CONF.EXTRA_CONTENT_URL1, logFile);
-//		updateIntent.putExtra(CONF.EXTRA_CONTENT_URL2, script);
-//
-//		boolean notiFlag = true;
-//
-//        PendingIntent updatePendingIntent = PendingIntent.getActivity(this, DateTimeHelper.getTimeAsInt(), updateIntent,0);
-//        Notification notification = new Notification(R.drawable.ic_about, "QPython log", 1000);
-//
-//        // This contentIntent is a noop.
-//        //PendingIntent contentIntent = PendingIntent.getService(this, 0, new Intent(), 0);
-//        notification.contentIntent = updatePendingIntent;
-//        notification.setLatestEventInfo(this, "QPython", "Log : "+script, updatePendingIntent);
-//        notification.flags = Notification.FLAG_AUTO_CANCEL;
-//
-//        notificationManager.notify(PY_NOTI_FLAG, notification);
-	}
-}
-
diff --git a/qpysdk/src/main/java/org/renpy/android/PythonSDLActivity.java b/qpysdk/src/main/java/org/renpy/android/PythonSDLActivity.java
new file mode 100644
index 00000000..e727399e
--- /dev/null
+++ b/qpysdk/src/main/java/org/renpy/android/PythonSDLActivity.java
@@ -0,0 +1,450 @@
+package org.renpy.android;
+
+import org.libsdl.app.SDLActivity;
+import org.qpython.qpysdk.QPyConstants;
+import org.qpython.qpysdk.utils.FileHelper;
+import org.qpython.qpysdk.utils.Utils;
+
+import android.annotation.SuppressLint;
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.ActivityInfo;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Bundle;
+import android.os.Environment;
+import android.os.PowerManager;
+import android.os.Vibrator;
+import android.util.DisplayMetrics;
+import android.util.Log;
+import android.view.View;
+import android.view.View.OnSystemUiVisibilityChangeListener;
+import android.widget.FrameLayout;
+import android.widget.LinearLayout;
+import android.widget.Toast;
+
+
+import com.quseit.util.NAction;
+import com.quseit.util.NUtil;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.InputStream;
+
+public class PythonSDLActivity extends SDLActivity {
+
+    public final static int    PY_NOTI_FLAG = 123400;
+    public static final String NOTIFY       = "notify";
+    public static final String ACT          = "act";
+    public static final String PATH         = "path";
+    public static final String DEBUG_FLAG   = "debug_flag";
+    public static final String ROOT         = "root";
+    public static final String FULL         = "full";
+
+    private final String TAG = "PythonSDLActivity";
+    /**
+     * This exists so python code can access this activity.
+     */
+    public static PythonSDLActivity mActivity = null;
+
+    /**
+     * The layout that contains the SDL view. VideoPlayer uses this to add
+     * its own view on on top of the SDL view.
+     */
+    public FrameLayout mFrameLayout;
+
+
+    /**
+     * A layout that contains mLayout. This is a 3x3 grid, with the layout
+     * in the center. The idea is that if someone wants to show an ad, they
+     * can stick it in one of the other cells..
+     */
+    public LinearLayout mVbox;
+
+    ResourceManager resourceManager;
+
+
+    protected String[] getLibraries() {
+        return new String[] {
+            "png16",
+            "SDL2",
+            "SDL2_image",
+            "SDL2_ttf",
+            "SDL2_gfx",
+            "SDL2_mixer",
+            "python2.7",
+            "main",
+        };
+    }
+
+
+    // GUI code. /////////////////////////////////////////////////////////////
+
+
+    public void addView(View view, int index) {
+        mVbox.addView(view, index, new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT, (float) 0.0));
+    }
+
+    public void removeView(View view) {
+        mVbox.removeView(view);
+    }
+
+    @Override
+    public void setContentView(View view) {
+        mFrameLayout = new FrameLayout(this);
+        mFrameLayout.addView(view);
+
+        mVbox = new LinearLayout(this);
+        mVbox.setOrientation(LinearLayout.VERTICAL);
+        mVbox.addView(mFrameLayout, new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, 0, (float) 1.0));
+
+        super.setContentView(mVbox);
+    }
+
+
+    private void setupMainWindowDisplayMode() {
+        View decorView = setSystemUiVisibilityMode();
+        decorView.setOnSystemUiVisibilityChangeListener(new OnSystemUiVisibilityChangeListener() {
+            @Override
+            public void onSystemUiVisibilityChange(int visibility) {
+                setSystemUiVisibilityMode(); // Needed to avoid exiting immersive_sticky when keyboard is displayed
+            }
+        });
+    }
+
+    private View setSystemUiVisibilityMode() {
+        View decorView = getWindow().getDecorView();
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+
+            int options;
+            options =
+                    View.SYSTEM_UI_FLAG_LAYOUT_STABLE
+                    | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
+                    | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
+                    | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION // hide nav bar
+                    | View.SYSTEM_UI_FLAG_FULLSCREEN // hide status bar
+                    | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY;
+
+            decorView.setSystemUiVisibility(options);
+
+        }
+
+        return decorView;
+    }
+
+    @Override
+    public void onWindowFocusChanged(boolean hasFocus) {
+        super.onWindowFocusChanged(hasFocus);
+
+        if (hasFocus) {
+            setupMainWindowDisplayMode();
+        }
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        setupMainWindowDisplayMode();
+    }
+
+    // Code to unpack python and get things running ///////////////////////////
+
+    public void recursiveDelete(File f) {
+        if (f.isDirectory()) {
+            for (File r : f.listFiles()) {
+                recursiveDelete(r);
+            }
+        }
+        f.delete();
+    }
+
+    /**
+     * This determines if unpacking one the zip files included in
+     * the .apk is necessary. If it is, the zip file is unpacked.
+     */
+    public void unpackData(final String resource, File target) {
+
+        /**
+         * Delete main.pyo unconditionally. This fixes a problem where we have
+         * a main.py newer than main.pyo, but start.c won't run it.
+         */
+        new File(target, "main.py").delete();
+
+        boolean shouldUnpack = false;
+
+        // The version of data in memory and on disk.
+        String data_version = resourceManager.getString(resource + "_version");
+        String disk_version = null;
+
+        String filesDir = target.getAbsolutePath();
+        String disk_version_fn = filesDir + "/" + resource + ".version";
+
+        // If no version, no unpacking is necessary.
+        if (data_version != null) {
+
+            try {
+                byte buf[] = new byte[64];
+                InputStream is = new FileInputStream(disk_version_fn);
+                int len = is.read(buf);
+                disk_version = new String(buf, 0, len);
+                is.close();
+            } catch (Exception e) {
+                disk_version = "";
+            }
+
+            if (! data_version.equals(disk_version)) {
+                shouldUnpack = true;
+            }
+        }
+
+
+        // If the disk data is out of date, extract it and write the
+        // version file.
+        if (shouldUnpack) {
+            Log.v("python", "Extracting " + resource + " assets.");
+
+            // Delete old libraries & renpy files.
+            recursiveDelete(new File(target, "lib"));
+            recursiveDelete(new File(target, "renpy"));
+
+            target.mkdirs();
+
+            AssetExtract ae = new AssetExtract(this);
+            if (!ae.extractTar(resource + ".mp3", target.getAbsolutePath())) {
+                toastError("Could not extract " + resource + " data.");
+            }
+
+            try {
+                // Write .nomedia.
+                new File(target, ".nomedia").createNewFile();
+
+                // Write version file.
+                FileOutputStream os = new FileOutputStream(disk_version_fn);
+                os.write(data_version.getBytes());
+                os.close();
+            } catch (Exception e) {
+                Log.w("python", e);
+            }
+        }
+
+    }
+
+    /**
+     * Show an error using a toast. (Only makes sense from non-UI
+     * threads.)
+     */
+    public void toastError(final String msg) {
+
+        final Activity thisActivity = this;
+
+        runOnUiThread(new Runnable () {
+            public void run() {
+                Toast.makeText(thisActivity, msg, Toast.LENGTH_LONG).show();
+            }
+        });
+
+        // Wait to show the error.
+        synchronized (this) {
+            try {
+                this.wait(1000);
+            } catch (InterruptedException e) {
+            }
+        }
+    }
+
+    public static native void nativeSetEnv(String variable, String value);
+
+    public void initEnviron() {
+        Log.v("python", "initEnviron");
+
+        Intent intent = getIntent();
+
+        String script = null;
+        if (intent != null && intent.getData() != null) {
+            script = intent.getData().getPath();
+        }
+        File path;
+
+        if (script!=null) {
+            path = new File(script).getParentFile();
+            nativeSetEnv("ANDROID_ARGUMENT", path.getAbsolutePath());
+
+        } else {
+            nativeSetEnv("ANDROID_ARGUMENT", QPyConstants.ABSOLUTE_PATH);
+
+        }
+
+
+
+
+    }
+    public void preparePython() {
+        Log.v("python", "Starting preparePython.");
+
+        Intent intent = getIntent();
+        String script = null;
+        if (intent != null && intent.getData() != null) {
+
+            script = intent.getData().getPath();
+        }
+
+
+        mActivity = this;
+
+        resourceManager = new ResourceManager(this);
+
+        File oldExternalStorage = new File(Environment.getExternalStorageDirectory(), getPackageName());
+        File externalStorage = getExternalFilesDir(null);
+        File path;
+
+        if (externalStorage == null) {
+            externalStorage = oldExternalStorage;
+        }
+
+        if (script!=null) {
+            path = new File(script).getParentFile();
+            if (path.getName().startsWith("scripts")) {
+                nativeSetEnv("ANDROID_MAIN", new File(script).getName());
+
+            } else {
+                nativeSetEnv("ANDROID_MAIN", "main.py");
+
+            }
+
+        } else {
+            nativeSetEnv("ANDROID_MAIN", "main.py");
+
+            path = getFilesDir();
+        }
+
+        nativeSetEnv("ANDROID_LOG", QPyConstants.ABSOLUTE_LOG);
+
+        File filesDir = getFilesDir();
+        //unpackData("private", getFilesDir());
+        // unpackData("public", externalStorage);
+
+        nativeSetEnv("ANDROID_ARGUMENT", path.getAbsolutePath());
+        nativeSetEnv("ANDROID_PRIVATE", getFilesDir().getAbsolutePath());
+        nativeSetEnv("ANDROID_PUBLIC", QPyConstants.ABSOLUTE_PATH);
+        nativeSetEnv("ANDROID_OLD_PUBLIC", oldExternalStorage.getAbsolutePath());
+
+        nativeSetEnv("LD_LIBRARY_PATH", ".:"+filesDir+"/lib/"+":"+filesDir+"/:"+filesDir.getParentFile()+"/lib/");
+        nativeSetEnv("AP_HOST", Utils.getSP(mActivity, "sl4a.hostname"));
+        nativeSetEnv("AP_PORT", Utils.getSP(mActivity, "sl4a.port"));
+        nativeSetEnv("AP_HANDSHAKE", Utils.getSP(mActivity, "sl4a.secue"));
+
+        // Figure out the APK path.
+        String apkFilePath;
+        ApplicationInfo appInfo;
+        PackageManager packMgmr = getApplication().getPackageManager();
+
+        try {
+            appInfo = packMgmr.getApplicationInfo(getPackageName(), 0);
+            apkFilePath = appInfo.sourceDir;
+        } catch (NameNotFoundException e) {
+            apkFilePath = "";
+        }
+
+        nativeSetEnv("ANDROID_APK", apkFilePath);
+
+        String expansionFile = getIntent().getStringExtra("expansionFile");
+
+//        if (expansionFile != null) {
+//            nativeSetEnv("ANDROID_EXPANSION", expansionFile);
+//        }
+
+        nativeSetEnv("PYTHONOPTIMIZE", "2");
+        nativeSetEnv("PYTHONHOME", getFilesDir().getAbsolutePath());
+        nativeSetEnv("PYTHONPATH", path.getAbsolutePath() + ":" + getFilesDir().getAbsolutePath() + "/lib");
+
+        Log.v("python", "Finished preparePython.");
+
+    };
+
+    // HACK BY RIVER
+    static {
+        //System.load("/data/data/org.qpython.qpy/files/lib/libpython2.7.so.1.0");
+    }
+
+    // Code to support devicePurchase. /////////////////////////////////////////
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        //preparePython();
+
+        //  Intent intent = getIntent();
+//        boolean isLandscape = true;
+//        if (intent != null && intent.getData() != null) {
+//            String script = intent.getData().getPath();
+//            String header_512 = FileHelper.getFileContents(script, 512);
+//                isLandscape = header_512.contains("#qpy:landscape");
+//
+//            LogUtil.d(TAG, "onCreate:"+script);
+//
+//        }
+
+//        if (isLandscape) {
+//            setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
+//        } else {
+//            setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+//        }
+        super.onCreate(savedInstanceState);
+
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+    }
+
+    protected void onActivityResult(int requestCode, int resultCode, Intent intent) {
+        super.onActivityResult(requestCode, resultCode, intent);
+    }
+
+    // Code to support public APIs. ////////////////////////////////////////////
+
+    public void openUrl(String url) {
+        Log.i("python", "Opening URL: " + url);
+
+        Intent i = new Intent(Intent.ACTION_VIEW);
+        i.setData(Uri.parse(url));
+        startActivity(i);
+    }
+
+    @SuppressLint("MissingPermission")
+    public void vibrate(double s) {
+        Vibrator v = (Vibrator) getSystemService(Context.VIBRATOR_SERVICE);
+        if (v != null) {
+            v.vibrate((int) (1000 * s));
+        }
+    }
+
+    public int getDPI() {
+        DisplayMetrics metrics = new DisplayMetrics();
+        getWindowManager().getDefaultDisplay().getMetrics(metrics);
+        return metrics.densityDpi;
+    }
+
+    public PowerManager.WakeLock wakeLock = null;
+
+    public void setWakeLock(boolean active) {
+        if (wakeLock == null) {
+            PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE);
+            wakeLock = pm.newWakeLock(PowerManager.SCREEN_BRIGHT_WAKE_LOCK, "Screen On");
+            wakeLock.setReferenceCounted(false);
+        }
+
+        if (active) {
+            wakeLock.acquire();
+        } else {
+            wakeLock.release();
+        }
+    }
+
+}
diff --git a/qpysdk/src/main/java/org/renpy/android/PythonService.java b/qpysdk/src/main/java/org/renpy/android/PythonService.java
deleted file mode 100644
index b086e799..00000000
--- a/qpysdk/src/main/java/org/renpy/android/PythonService.java
+++ /dev/null
@@ -1,125 +0,0 @@
-package org.renpy.android;
-
-import android.app.Service;
-import android.os.IBinder;
-import android.os.Bundle;
-import android.content.Intent;
-import android.content.Context;
-import android.util.Log;
-import android.app.Notification;
-import android.app.PendingIntent;
-import android.os.Process;
-
-public class PythonService extends Service  implements Runnable {
-
-    // Thread for Python code
-    private Thread pythonThread = null;
-
-    // Python environment variables
-    private String androidPrivate;
-    private String androidArgument;
-    private String pythonHome;
-    private String pythonPath;
-    // Argument to pass to Python code,
-    private String pythonServiceArgument;
-    public static Service mService = null;
-
-    @Override
-    public IBinder onBind(Intent arg0) {
-        return null;
-    }
-
-    @Override
-    public void onCreate() {
-        super.onCreate();
-    }
-
-    @Override
-    public int onStartCommand(Intent intent, int flags, int startId) {
-        if (pythonThread != null) {
-            Log.v("python service", "service exists, do not start again");
-            return START_NOT_STICKY;
-        }
-
-        Bundle extras = intent.getExtras();
-        androidPrivate = extras.getString("androidPrivate");
-        // service code is located in service subdir
-        androidArgument = extras.getString("androidArgument") + "/service";
-        pythonHome = extras.getString("pythonHome");
-        pythonPath = extras.getString("pythonPath");
-        pythonServiceArgument = extras.getString("pythonServiceArgument");
-        String serviceTitle = extras.getString("serviceTitle");
-        String serviceDescription = extras.getString("serviceDescription");
-
-        pythonThread = new Thread(this);
-        pythonThread.start();
-
-        Context context = getApplicationContext();
-        Notification notification = new Notification(context.getApplicationInfo().icon,
-                serviceTitle,
-                System.currentTimeMillis());
-        Intent contextIntent = new Intent(context, PythonActivity.class);
-        PendingIntent pIntent = PendingIntent.getActivity(context, 0, contextIntent,
-                PendingIntent.FLAG_UPDATE_CURRENT);
-        //notification.setLatestEventInfo(context, serviceTitle, serviceDescription, pIntent);
-        startForeground(1, notification);
-
-        return START_NOT_STICKY;
-    }
-
-    @Override
-    public void onDestroy() {
-        super.onDestroy();
-        pythonThread = null;
-        Process.killProcess(Process.myPid());
-    }
-
-    @Override
-    public void run(){
-
-        // libraries loading, the same way PythonActivity.run() do
-        System.loadLibrary("sdl");
-        System.loadLibrary("sdl_image");
-        System.loadLibrary("sdl_ttf");
-        System.loadLibrary("sdl_mixer");
-        System.loadLibrary("python2.7");
-        System.loadLibrary("application");
-        System.loadLibrary("sdl_main");
-        
-
-        System.load(getFilesDir() + "/lib/python2.7/lib-dynload/_io.so");
-        System.load(getFilesDir() + "/lib/python2.7/lib-dynload/unicodedata.so");
-        
-        try {
-            System.loadLibrary("ctypes");
-            System.load(getFilesDir() + "/lib/python2.7/lib-dynload/_ctypes.so");
-        } catch(UnsatisfiedLinkError e) {
-        }
-
-        try {
-            System.loadLibrary("sqlite3");
-            System.load(getFilesDir() + "/lib/python2.7/lib-dynload/_sqlite3.so");
-        } catch(UnsatisfiedLinkError e) {
-        }
-
-        try {
-            System.load(getFilesDir() + "/lib/python2.7/lib-dynload/_imaging.so");
-            System.load(getFilesDir() + "/lib/python2.7/lib-dynload/_imagingft.so");
-            System.load(getFilesDir() + "/lib/python2.7/lib-dynload/_imagingmath.so");
-        } catch(UnsatisfiedLinkError e) {
-        }
-
-        this.mService = this;
-        nativeInitJavaEnv();
-        nativeStart(androidPrivate, androidArgument, pythonHome, pythonPath,
-                pythonServiceArgument);
-    }
-
-    // Native part
-    public static native void nativeStart(String androidPrivate, String androidArgument,
-            String pythonHome, String pythonPath,
-            String pythonServiceArgument);
-
-    public static native void nativeInitJavaEnv();
-
-}
diff --git a/qpysdk/src/main/java/org/renpy/android/RenPySound.java b/qpysdk/src/main/java/org/renpy/android/RenPySound.java
index c0d1ea59..59ad47d8 100644
--- a/qpysdk/src/main/java/org/renpy/android/RenPySound.java
+++ b/qpysdk/src/main/java/org/renpy/android/RenPySound.java
@@ -91,6 +91,8 @@ synchronized void play() {
             prepared[0] = prepared[1];
             prepared[1] = false;
 
+            Log.i("python", "Using queued file " + filename[0]);
+
             if (filename[0] != null) {
                 updateVolume();
 
@@ -188,10 +190,7 @@ synchronized void unpause() {
         }
 
         synchronized int get_pos(){
-			if (prepared[0]) {
-				return player[0].getCurrentPosition();
-			}
-			return 0;
+            return player[0].getCurrentPosition();
         }
 
         synchronized int get_length(){
@@ -216,8 +215,8 @@ synchronized public void onPrepared(MediaPlayer mp) {
          * Called on completion.
          */
         synchronized public void onCompletion(MediaPlayer mp) {
-            if (mp == player[0]) {
-                play();
+        	if (mp == player[0]) {
+        		play();
             }
         }
 
@@ -242,7 +241,7 @@ static Channel getChannel(int num) {
         return rv;
     }
 
-    static void queue(int channel, String filename, String real_fn, long base, long length) {        
+    public static void queue(int channel, String filename, String real_fn, long base, long length) {
         Channel c = getChannel(channel);
         c.queue(filename, real_fn, base, length);
         if (c.filename[0] == null) {
@@ -251,7 +250,7 @@ static void queue(int channel, String filename, String real_fn, long base, long
 
     }
 
-    static void play(int channel,
+    public static void play(int channel,
             String filename,
             String real_fn,
             long base,
@@ -262,23 +261,23 @@ static void play(int channel,
         c.play();
     }
 
-    static void seek(int channel, float position){
+    public static void seek(int channel, float position){
         Channel c = getChannel(channel);
         c.seek(position);
     }
 
-    static void stop(int channel) {
+    public static void stop(int channel) {
         Channel c = getChannel(channel);
         c.stop();
     }
 
-    static void dequeue(int channel) {
+    public static void dequeue(int channel) {
         Channel c = getChannel(channel);
         c.dequeue();
     }
 
 
-    static String playing_name(int channel) {
+    public static String playing_name(int channel) {
         Channel c = getChannel(channel);
         if (c.filename[0] == null) {
             return "";
@@ -287,7 +286,7 @@ static String playing_name(int channel) {
         return c.filename[0];
     }
 
-    static int queue_depth(int channel) {
+    public static int queue_depth(int channel) {
         Channel c = getChannel(channel);
 
         if (c.filename[0] == null) return 0;
@@ -295,37 +294,37 @@ static int queue_depth(int channel) {
         return 2;
     }
 
-    static void set_volume(int channel, float v) {
+    public static void set_volume(int channel, float v) {
         Channel c = getChannel(channel);
         c.set_volume(v);
     }
 
-    static void set_secondary_volume(int channel, float v) {
+    public static void set_secondary_volume(int channel, float v) {
         Channel c = getChannel(channel);
         c.set_secondary_volume(v);
     }
 
-    static void set_pan(int channel, float pan) {
+    public static void set_pan(int channel, float pan) {
         Channel c = getChannel(channel);
         c.set_pan(pan);
     }
 
-    static void pause(int channel) {
+    public static void pause(int channel) {
         Channel c = getChannel(channel);
         c.pause();
     }
 
-    static void unpause(int channel) {
+    public static void unpause(int channel) {
         Channel c = getChannel(channel);
         c.unpause();
     }
 
-    static int get_pos(int channel){
+    public static int get_pos(int channel){
         Channel c = getChannel(channel);
         return c.get_pos();
     }
 
-    static int get_length(int channel){
+    public static int get_length(int channel){
         Channel c = getChannel(channel);
         return c.get_length();
     }
diff --git a/qpysdk/src/main/java/org/renpy/android/SDLSurfaceView.java b/qpysdk/src/main/java/org/renpy/android/SDLSurfaceView.java
deleted file mode 100644
index 18ade397..00000000
--- a/qpysdk/src/main/java/org/renpy/android/SDLSurfaceView.java
+++ /dev/null
@@ -1,1498 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * 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.
- */
-
-// This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount
-package org.renpy.android;
-
-import android.annotation.SuppressLint;
-import android.annotation.TargetApi;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.ActivityInfo;
-import android.content.pm.ApplicationInfo;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.Color;
-import android.graphics.Rect;
-import android.net.Uri;
-import android.opengl.GLES20;
-import android.opengl.GLSurfaceView;
-import android.opengl.GLUtils;
-import android.opengl.Matrix;
-import android.os.Build;
-import android.os.Handler;
-import android.os.PowerManager;
-import android.util.Log;
-import android.view.KeyEvent;
-import android.view.MotionEvent;
-import android.view.SurfaceHolder;
-import android.view.SurfaceView;
-import android.view.inputmethod.BaseInputConnection;
-import android.view.inputmethod.CompletionInfo;
-import android.view.inputmethod.EditorInfo;
-import android.view.inputmethod.ExtractedText;
-import android.view.inputmethod.ExtractedTextRequest;
-import android.view.inputmethod.InputConnection;
-
-import org.qpython.qpysdk.utils.Utils;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-import java.nio.FloatBuffer;
-
-import javax.microedition.khronos.egl.EGL10;
-import javax.microedition.khronos.egl.EGLConfig;
-import javax.microedition.khronos.egl.EGLContext;
-import javax.microedition.khronos.egl.EGLDisplay;
-import javax.microedition.khronos.egl.EGLSurface;
-
-//API 11 only
-//import android.view.inputmethod.CorrectionInfo;
-
-
-public class SDLSurfaceView extends SurfaceView implements SurfaceHolder.Callback, Runnable {
-    static private final String TAG = "SDLSurface";
-    static private final boolean DEBUG = false;
-    static private final String mVertexShader =
-        "uniform mat4 uMVPMatrix;\n" +
-        "attribute vec4 aPosition;\n" +
-        "attribute vec2 aTextureCoord;\n" +
-        "varying vec2 vTextureCoord;\n" +
-        "void main() {\n" +
-        "  gl_Position = uMVPMatrix * aPosition;\n" +
-        "  vTextureCoord = aTextureCoord;\n" +
-        "}\n";
-
-    static private final String mFragmentShader =
-        "precision mediump float;\n" +
-        "varying vec2 vTextureCoord;\n" +
-        "uniform sampler2D sTexture;\n" +
-        "void main() {\n" +
-        "  gl_FragColor = texture2D(sTexture, vTextureCoord);\n" +
-
-        "}\n";
-    private static class ConfigChooser implements GLSurfaceView.EGLConfigChooser {
-
-        public ConfigChooser(int r, int g, int b, int a, int depth, int stencil) {
-            mRedSize = r;
-            mGreenSize = g;
-            mBlueSize = b;
-            mAlphaSize = a;
-            mDepthSize = depth;
-            mStencilSize = stencil;
-        }
-
-        /* This EGL config specification is used to specify 2.0 rendering.
-         * We use a minimum size of 4 bits for red/green/blue, but will
-         * perform actual matching in chooseConfig() below.
-         */
-        private static int EGL_OPENGL_ES2_BIT = 4;
-        private static int[] s_configAttribs2 =
-        {
-            EGL10.EGL_RED_SIZE, 4,
-            EGL10.EGL_GREEN_SIZE, 4,
-            EGL10.EGL_BLUE_SIZE, 4,
-            EGL10.EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
-            EGL10.EGL_NONE
-        };
-
-        public EGLConfig chooseConfig(EGL10 egl, EGLDisplay display) {
-
-            /* Get the number of minimally matching EGL configurations
-            */
-            int[] num_config = new int[1];
-            egl.eglChooseConfig(display, s_configAttribs2, null, 0, num_config);
-
-            int numConfigs = num_config[0];
-
-            if (numConfigs <= 0) {
-                throw new IllegalArgumentException("No configs match configSpec");
-            }
-
-            /* Allocate then read the array of minimally matching EGL configs
-            */
-            EGLConfig[] configs = new EGLConfig[numConfigs];
-            egl.eglChooseConfig(display, s_configAttribs2, configs, numConfigs, num_config);
-
-            /* Now return the "best" one
-            */
-            //printConfigs(egl, display, configs);
-            return chooseConfig(egl, display, configs);
-        }
-
-        public EGLConfig chooseConfig(EGL10 egl, EGLDisplay display,
-                EGLConfig[] configs) {
-            for(EGLConfig config : configs) {
-                int d = findConfigAttrib(egl, display, config,
-                        EGL10.EGL_DEPTH_SIZE, 0);
-                int s = findConfigAttrib(egl, display, config,
-                        EGL10.EGL_STENCIL_SIZE, 0);
-
-                // We need at least mDepthSize and mStencilSize bits
-                if (d < mDepthSize || s < mStencilSize)
-                    continue;
-
-                // We want an *exact* match for red/green/blue/alpha
-                int r = findConfigAttrib(egl, display, config,
-                        EGL10.EGL_RED_SIZE, 0);
-                int g = findConfigAttrib(egl, display, config,
-                        EGL10.EGL_GREEN_SIZE, 0);
-                int b = findConfigAttrib(egl, display, config,
-                        EGL10.EGL_BLUE_SIZE, 0);
-                int a = findConfigAttrib(egl, display, config,
-                        EGL10.EGL_ALPHA_SIZE, 0);
-
-                if (r == mRedSize && g == mGreenSize && b == mBlueSize && a == mAlphaSize)
-                    return config;
-            }
-            return null;
-        }
-
-        private int findConfigAttrib(EGL10 egl, EGLDisplay display,
-                EGLConfig config, int attribute, int defaultValue) {
-
-            if (egl.eglGetConfigAttrib(display, config, attribute, mValue)) {
-                return mValue[0];
-            }
-            return defaultValue;
-        }
-
-        private void printConfigs(EGL10 egl, EGLDisplay display,
-                EGLConfig[] configs) {
-            int numConfigs = configs.length;
-            Log.w(TAG, String.format("%d configurations", numConfigs));
-            for (int i = 0; i < numConfigs; i++) {
-                Log.w(TAG, String.format("Configuration %d:\n", i));
-                printConfig(egl, display, configs[i]);
-            }
-        }
-
-        private void printConfig(EGL10 egl, EGLDisplay display,
-                EGLConfig config) {
-            int[] attributes = {
-                EGL10.EGL_BUFFER_SIZE,
-                EGL10.EGL_ALPHA_SIZE,
-                EGL10.EGL_BLUE_SIZE,
-                EGL10.EGL_GREEN_SIZE,
-                EGL10.EGL_RED_SIZE,
-                EGL10.EGL_DEPTH_SIZE,
-                EGL10.EGL_STENCIL_SIZE,
-                EGL10.EGL_CONFIG_CAVEAT,
-                EGL10.EGL_CONFIG_ID,
-                EGL10.EGL_LEVEL,
-                EGL10.EGL_MAX_PBUFFER_HEIGHT,
-                EGL10.EGL_MAX_PBUFFER_PIXELS,
-                EGL10.EGL_MAX_PBUFFER_WIDTH,
-                EGL10.EGL_NATIVE_RENDERABLE,
-                EGL10.EGL_NATIVE_VISUAL_ID,
-                EGL10.EGL_NATIVE_VISUAL_TYPE,
-                0x3030, // EGL10.EGL_PRESERVED_RESOURCES,
-                EGL10.EGL_SAMPLES,
-                EGL10.EGL_SAMPLE_BUFFERS,
-                EGL10.EGL_SURFACE_TYPE,
-                EGL10.EGL_TRANSPARENT_TYPE,
-                EGL10.EGL_TRANSPARENT_RED_VALUE,
-                EGL10.EGL_TRANSPARENT_GREEN_VALUE,
-                EGL10.EGL_TRANSPARENT_BLUE_VALUE,
-                0x3039, // EGL10.EGL_BIND_TO_TEXTURE_RGB,
-                0x303A, // EGL10.EGL_BIND_TO_TEXTURE_RGBA,
-                0x303B, // EGL10.EGL_MIN_SWAP_INTERVAL,
-                0x303C, // EGL10.EGL_MAX_SWAP_INTERVAL,
-                EGL10.EGL_LUMINANCE_SIZE,
-                EGL10.EGL_ALPHA_MASK_SIZE,
-                EGL10.EGL_COLOR_BUFFER_TYPE,
-                EGL10.EGL_RENDERABLE_TYPE,
-                0x3042 // EGL10.EGL_CONFORMANT
-            };
-            String[] names = {
-                "EGL_BUFFER_SIZE",
-                "EGL_ALPHA_SIZE",
-                "EGL_BLUE_SIZE",
-                "EGL_GREEN_SIZE",
-                "EGL_RED_SIZE",
-                "EGL_DEPTH_SIZE",
-                "EGL_STENCIL_SIZE",
-                "EGL_CONFIG_CAVEAT",
-                "EGL_CONFIG_ID",
-                "EGL_LEVEL",
-                "EGL_MAX_PBUFFER_HEIGHT",
-                "EGL_MAX_PBUFFER_PIXELS",
-                "EGL_MAX_PBUFFER_WIDTH",
-                "EGL_NATIVE_RENDERABLE",
-                "EGL_NATIVE_VISUAL_ID",
-                "EGL_NATIVE_VISUAL_TYPE",
-                "EGL_PRESERVED_RESOURCES",
-                "EGL_SAMPLES",
-                "EGL_SAMPLE_BUFFERS",
-                "EGL_SURFACE_TYPE",
-                "EGL_TRANSPARENT_TYPE",
-                "EGL_TRANSPARENT_RED_VALUE",
-                "EGL_TRANSPARENT_GREEN_VALUE",
-                "EGL_TRANSPARENT_BLUE_VALUE",
-                "EGL_BIND_TO_TEXTURE_RGB",
-                "EGL_BIND_TO_TEXTURE_RGBA",
-                "EGL_MIN_SWAP_INTERVAL",
-                "EGL_MAX_SWAP_INTERVAL",
-                "EGL_LUMINANCE_SIZE",
-                "EGL_ALPHA_MASK_SIZE",
-                "EGL_COLOR_BUFFER_TYPE",
-                "EGL_RENDERABLE_TYPE",
-                "EGL_CONFORMANT"
-            };
-            int[] value = new int[1];
-            for (int i = 0; i < attributes.length; i++) {
-                int attribute = attributes[i];
-                String name = names[i];
-                if ( egl.eglGetConfigAttrib(display, config, attribute, value)) {
-                    Log.w(TAG, String.format("  %s: %d\n", name, value[0]));
-                } else {
-                    // Log.w(TAG, String.format("  %s: failed\n", name));
-                    while (egl.eglGetError() != EGL10.EGL_SUCCESS);
-                }
-            }
-        }
-
-        // Subclasses can adjust these values:
-        protected int mRedSize;
-        protected int mGreenSize;
-        protected int mBlueSize;
-        protected int mAlphaSize;
-        protected int mDepthSize;
-        protected int mStencilSize;
-        private int[] mValue = new int[1];
-    }
-
-    public interface OnInterceptTouchListener {
-        boolean onTouch(MotionEvent ev);
-    }
-
-    private OnInterceptTouchListener mOnInterceptTouchListener = null;
-
-    // The activity we're a part of.
-    private static PythonActivity mActivity;
-
-    // Have we started yet?
-    public boolean mStarted = false;
-
-    // what is the textinput type while calling the keyboard
-    public int inputType = EditorInfo.TYPE_CLASS_TEXT;
-
-    public int kHeight = 0;
-    // Is Python ready to receive input events?
-    static boolean mInputActivated = false;
-
-    // The number of times we should clear the screen after swap.
-    private int mClears = 2;
-
-    // Has the display been changed?
-    private boolean mChanged = false;
-
-    // Are we running yet?
-    private boolean mRunning = false;
-
-    // The EGL used by our thread.
-    private EGL10 mEgl = null;
-
-    // The EGL Display used.
-    private EGLDisplay mEglDisplay = null;
-
-    // The EGL Context used.
-    private EGLContext mEglContext = null;
-
-    // The EGL Surface used.
-    private EGLSurface mEglSurface = null;
-
-    // The EGL Config used.
-    private EGLConfig mEglConfig = null;
-
-    // The user program is not participating in the pause protocol.
-    static int PAUSE_NOT_PARTICIPATING = 0;
-
-    // A pause has not been requested by the OS.
-    static int PAUSE_NONE = 1;
-
-    // A pause has been requested by Android, but the user program has
-    // not bothered responding yet.
-    static int PAUSE_REQUEST = 2;
-
-    // The user program is waiting in waitForResume.
-    static int PAUSE_WAIT_FOR_RESUME = 3;
-
-    static int PAUSE_STOP_REQUEST = 4;
-    static int PAUSE_STOP_ACK = 5;
-
-    // This stores the state of the pause system.
-    static int mPause = PAUSE_NOT_PARTICIPATING;
-
-    private PowerManager.WakeLock wakeLock;
-
-    // This stores the length of the text in pridiction/swype buffer
-    private int mDelLen = 0;
-
-    // The width and height. (This should be set at startup time -
-    // these values just prevent segfaults and divide by zero, etc.)
-    int mWidth = 100;
-    int mHeight = 100;
-
-    // The name of the directory where the context stores its files.
-    String mFilesDirectory = null;
-
-    // The value of the argument passed in.
-    String mArgument = null;
-    String mScript = null;
-    String mDirectory = null;
-    
-
-    // The resource manager we use.
-    ResourceManager mResourceManager;
-
-    // Access to our meta-data
-    private ApplicationInfo ai;
-
-    // Text before/after cursor
-    static String mTbf = "";
-    static String mTaf = "";
-
-    public static void updateTextFromCursor(String bef, String aft){
-        mTbf = bef;
-        mTaf = aft;
-        if (DEBUG) Log.d(TAG, String.format("mtbf: %s mtaf:%s <<<<<<<<<", mTbf, mTaf));
-        }
-
-    // Our own view
-    static SDLSurfaceView instance = null;
-
-	public SDLSurfaceView(PythonActivity act, String argument, String script, String directory) {
-        super(act);
-        
-        mScript = script;
-        
-        SDLSurfaceView.instance = this;
-
-        mActivity = act;
-        mResourceManager = new ResourceManager(act);
-
-        SurfaceHolder holder = getHolder();
-        holder.addCallback(this);
-        holder.setType(SurfaceHolder.SURFACE_TYPE_GPU);
-
-        mFilesDirectory = mActivity.getFilesDir().getAbsolutePath();
-        mDirectory = directory;
-        
-        mArgument = argument;
-
-        PowerManager pm = (PowerManager) act.getSystemService(Context.POWER_SERVICE);
-
-        wakeLock = null;
-        /*try {
-            ai = act.getPackageManager().getApplicationInfo(
-                    act.getPackageName(), PackageManager.GET_META_DATA);
-            if ( (Integer)ai.metaData.get("wakelock") == 1 ) {
-                wakeLock = pm.newWakeLock(PowerManager.SCREEN_BRIGHT_WAKE_LOCK, "Screen On");
-            }
-        } catch (PackageManager.NameNotFoundException e) {
-        }*/
-
-        /*if ( ai.metaData.getInt("surface.transparent") != 0 ) {
-            Log.d(TAG, "Surface will be transparent.");
-            setZOrderOnTop(true);
-            getHolder().setFormat(PixelFormat.TRANSPARENT);
-        } else {
-            Log.i(TAG, "Surface will NOT be transparent");
-        }*/
-
-    }
-
-
-    /**
-     * The user program should call this frequently to check if a
-     * pause has been requested by android. If this ever returns
-     * true, the user program should clean up and call waitForResume.
-     */
-    public int checkPause() {
-        if (mPause == PAUSE_NOT_PARTICIPATING) {
-            mPause = PAUSE_NONE;
-        }
-
-        if (mPause == PAUSE_REQUEST) {
-            return 1;
-        } else {
-            return 0;
-        }
-    }
-
-
-    /**
-     * The user program should call this quickly after checkPause
-     * returns true. This causes the android application to sleep,
-     * waiting for resume. While sleeping, it should not have any
-     * activity. (Notably, it should stop all timers.)
-     *
-     * While we're waiting in this method, android is allowed to
-     * kill us to reclaim memory, without any further warning.
-     */
-    public void waitForResume() {
-        synchronized (this) {
-            mPause = PAUSE_WAIT_FOR_RESUME;
-
-            // Notify any threads waiting in onPause.
-            this.notifyAll();
-
-            while (mPause == PAUSE_WAIT_FOR_RESUME) {
-                try {
-                    this.wait();
-                } catch (InterruptedException e) {
-                }
-            }
-        }
-        setOpenFile();
-    }
-
-    /**
-     * if the activity was called with a file parameter, put it in the
-     * 'PYTHON_OPENFILE' env var
-     */
-    public static void setOpenFile(){
-        final android.content.Intent intent = mActivity.getIntent();
-        if (intent != null) {
-            final android.net.Uri data = intent.getData();
-            if (data != null && data.getEncodedPath() != null){
-                nativeSetEnv("PYTHON_OPENFILE", data.getEncodedPath());
-            }
-        }
-    }
-
-
-    public void closeSoftKeyboard(){
-        // close the IME overlay(keyboard)
-        Hardware.hideKeyboard();
-    }
-
-    /**
-     * Inform the view that the activity is paused. The owner of this view must
-     * call this method when the activity is paused. Calling this method will
-     * pause the rendering thread.
-     * Must not be called before a renderer has been set.
-     */
-    public void onPause() {
-
-        this.closeSoftKeyboard();
-        synchronized (this) {
-            if (mPause == PAUSE_NONE) {
-                mPause = PAUSE_REQUEST;
-
-                while (mPause == PAUSE_REQUEST) {
-                    try {
-                        this.wait();
-                    } catch (InterruptedException e) {
-                        // pass
-                    }
-                }
-            }
-        }
-
-        if ( wakeLock != null )
-            wakeLock.release();
-
-    }
-
-    /**
-     * Inform the view that the activity is resumed. The owner of this view must
-     * call this method when the activity is resumed. Calling this method will
-     * recreate the OpenGL display and resume the rendering
-     * thread.
-     * Must not be called before a renderer has been set.
-     */
-    public void onResume() {
-        synchronized (this) {
-            if (mPause == PAUSE_WAIT_FOR_RESUME) {
-                mPause = PAUSE_NONE;
-                this.notifyAll();
-            }
-        }
-        if ( wakeLock != null )
-            wakeLock.acquire();
-    }
-
-    public void onDestroy() {
-        Log.w(TAG, "onDestroy() called");
-        this.closeSoftKeyboard();
-        synchronized (this) {
-            this.notifyAll();
-
-            if ( mPause == PAUSE_STOP_ACK ) {
-                Log.d(TAG, "onDestroy() app already leaved.");
-                return;
-            }
-
-
-            // application didn't leave, give 10s before closing.
-            // hopefully, this could be enough for launching the on_stop() trigger within the app.
-            mPause = PAUSE_STOP_REQUEST;
-            int i = 50;
-
-            Log.d(TAG, "onDestroy() stop requested, wait for an event from the app");
-            for (; i >= 0 && mPause == PAUSE_STOP_REQUEST; i--) {
-                try {
-                    this.wait(200);
-                } catch (InterruptedException e) {
-                    break;
-                }
-            }
-            Log.d(TAG, "onDestroy() stop finished waiting.");
-        }
-    }
-
-    static int checkStop() {
-        if (mPause == PAUSE_STOP_REQUEST)
-            return 1;
-        return 0;
-    }
-
-    static void ackStop() {
-        Log.d(TAG, "ackStop() notify");
-        synchronized (instance) {
-            mPause = PAUSE_STOP_ACK;
-            instance.notifyAll();
-        }
-    }
-
-
-    /**
-     * This method is part of the SurfaceHolder.Callback interface, and is
-     * not normally called or subclassed by clients of GLSurfaceView.
-     */
-    public void surfaceCreated(SurfaceHolder holder) {
-        if (DEBUG) Log.d(TAG, "surfaceCreated()");
-        synchronized (this) {
-            if (!mStarted) {
-                this.notifyAll();
-            }
-        }
-    }
-
-    /**
-     * This method is part of the SurfaceHolder.Callback interface, and is
-     * not normally called or subclassed by clients of GLSurfaceView.
-     */
-    public void surfaceDestroyed(SurfaceHolder holder) {
-        if (DEBUG) Log.d(TAG, "surfaceDestroyed()");
-    }
-
-    /**
-     * This method is part of the SurfaceHolder.Callback interface, and is
-     * not normally called or subclassed by clients of GLSurfaceView.
-     */
-    public void surfaceChanged(SurfaceHolder holder, int format, int w, int h) {
-        if (DEBUG) Log.i(TAG, String.format("surfaceChanged() fmt=%d size=%dx%d", format, w, h));
-
-        mWidth = w;
-        mHeight = h;
-
-        if (mActivity.getRequestedOrientation() == ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE &&
-                mWidth < mHeight) {
-            return;
-                }
-
-        if (mActivity.getRequestedOrientation() == ActivityInfo.SCREEN_ORIENTATION_PORTRAIT &&
-                mWidth > mHeight) {
-            return;
-                }
-
-        if (!mRunning) {
-            mRunning = true;
-            new Thread(this).start();
-        } else {
-            mChanged = true;
-            if (mStarted) {
-                nativeExpose();
-            }
-        }
-    }
-
-
-    public void run() {
-//        File libPath = mActivity.getApplicationContext().getFilesDir();
-//        System.load(libPath+"/libsdl.so");
-//        System.load(libPath+"/libsdl_image.so");
-//        System.load(libPath+"/libsdl_ttf.so");
-//        System.load(libPath+"/libsdl_mixer.so");
-//        System.load(libPath+"/libsdl_main.so");
-//
-//        try {
-//            System.load(libPath+"/libpython27.so");
-//            System.load(libPath+"/libapplication.so");
-//            System.load(libPath+"/libsqlite3.so");
-//        } catch(UnsatisfiedLinkError e) {
-//            Log.e("SDLSurfaceView","Exception occured when loading QPy ocre:"+e.getLocalizedMessage());
-//        }
-
-        mEgl = (EGL10) EGLContext.getEGL();
-
-        mEglDisplay = mEgl.eglGetDisplay(EGL10.EGL_DEFAULT_DISPLAY);
-
-        int[] version = new int[2];
-        mEgl.eglInitialize(mEglDisplay, version);
-
-        // Pick an appropriate config. We just take the first config
-        // the system offers to us, because anything more complicated
-        // than that stands a really good chance of not working.
-        int[] configSpec = {
-            // RENDERABLE_TYPE = OpenGL ES is the default.
-            EGL10.EGL_NONE
-        };
-
-        EGLConfig[] configs = new EGLConfig[1];
-        int EGL_CONTEXT_CLIENT_VERSION = 0x3098;
-        int[] num_config = new int[1];
-        int[] attrib_list = {EGL_CONTEXT_CLIENT_VERSION, 2, EGL10.EGL_NONE };
-
-        // Create an opengl es 2.0 surface
-        Log.i(TAG, "Choose egl configuration");
-        int configToTest = 0;
-        boolean configFound = false;
-
-        while (true) {
-            try {
-                if (configToTest == 0) {
-                    Log.i(TAG, "Try to use graphics config R8G8B8A8S8");
-                    ConfigChooser chooser = new ConfigChooser(
-                            // rgba
-                            8, 8, 8, 8,
-                            // depth
-                           0,
-                            // stencil
-                            8);
-                    mEglConfig = chooser.chooseConfig(mEgl, mEglDisplay);
-                } else if (configToTest == 1) {
-                    Log.i(TAG, "Try to use graphics config R5G6B5S8");
-                    ConfigChooser chooser = new ConfigChooser(
-                            // rgba
-                            5, 6, 5, 0,
-                            // depth
-                            0,
-                            // stencil
-                            8);
-                    mEglConfig = chooser.chooseConfig(mEgl, mEglDisplay);
-                } else {
-                    Log.e(TAG, "Unable to find a correct surface for this device !");
-                    break;
-                }
-
-            } catch (IllegalArgumentException e) {
-                configToTest++;
-                continue;
-            }
-
-            if (DEBUG) Log.d(TAG, "Create egl context");
-            mEglContext = mEgl.eglCreateContext(mEglDisplay, mEglConfig, EGL10.EGL_NO_CONTEXT, attrib_list);
-            if (mEglContext == null) {
-                Log.w(TAG, "Unable to create egl context with this configuration, try the next one.");
-                configToTest++;
-                continue;
-            }
-
-            Log.w(TAG, "Create egl surface");
-            if (!createSurface()) {
-                Log.w(TAG, "Unable to create egl surface with this configuration, try the next one.");
-                configToTest++;
-                continue;
-            }
-
-            configFound = true;
-            break;
-        }
-
-        if (!configFound) {
-            System.exit(0);
-            return;
-        }
-
-        if (DEBUG) Log.d(TAG, "Done egl");
-        waitForStart();
-
-        nativeResize(mWidth, mHeight);
-        nativeInitJavaCallbacks();
-        File filesDir = mActivity.getFilesDir();
-
-        nativeSetEnv("LD_LIBRARY_PATH", filesDir+"/lib/"+":"+filesDir+"/:"+filesDir.getParentFile()+"/lib/");
-
-        nativeSetEnv("IS_PROJECT", "1");
-        nativeSetEnv("ANDROID_PUBLIC", mDirectory);
-        nativeSetEnv("ANDROID_PRIVATE", mFilesDirectory);
-        nativeSetEnv("ANDROID_ARGUMENT", mArgument);
-        nativeSetEnv("ANDROID_SCRIPT", mScript);
-
-        nativeSetEnv("AP_HOST", Utils.getSP(mActivity, "sl4a.hostname"));
-        nativeSetEnv("AP_PORT", Utils.getSP(mActivity, "sl4a.port"));
-        nativeSetEnv("AP_HANDSHAKE", Utils.getSP(mActivity, "sl4a.secue"));
-//
-        nativeSetEnv("PYTHONOPTIMIZE", "2");
-        nativeSetEnv("PYTHONHOME", mFilesDirectory);
-        nativeSetEnv("PYTHONPATH", mArgument + ":" + mFilesDirectory + "/lib");
-
-        nativeSetEnv("KIVY_BUILD", "android");
-        nativeSetEnv("KIVY_NO_FILELOG", "1");
-
-        // XXX Using SetOpenFile make a crash in nativeSetEnv. I don't
-        // understand why, maybe because the method is static or something.
-        // Anyway, if you remove that part of the code, ensure the Laucher
-        // (ProjectChooser) is still working.
-        final android.content.Intent intent = mActivity.getIntent();
-        if (intent != null) {
-            final android.net.Uri data = intent.getData();
-            if (data != null && data.getEncodedPath() != null)
-                nativeSetEnv("PYTHON_OPENFILE", data.getEncodedPath());
-        }
-
-        nativeSetMultitouchUsed();
-        nativeInit();
-
-        mPause = PAUSE_STOP_ACK;
-
-        //Log.i(TAG, "End of native init, stop everything (exit0)");
-        mActivity.finish();
-        
-        //System.exit(0);
-    }
-
-    @SuppressLint("NewApi")
-	private void waitForStart() {
-
-        int presplashId = mResourceManager.getIdentifier("presplash2", "drawable");
-        InputStream is = mActivity.getResources().openRawResource(presplashId);
-
-        Bitmap bitmap = null;
-        try {
-            bitmap = BitmapFactory.decodeStream(is);
-            bitmap = bitmap.copy(Bitmap.Config.ARGB_8888, false);
-        } finally {
-            try {
-                is.close();
-            } catch (IOException e) { }
-        }
-
-        mTriangleVertices = ByteBuffer.allocateDirect(mTriangleVerticesData.length
-                * FLOAT_SIZE_BYTES).order(ByteOrder.nativeOrder()).asFloatBuffer();
-        mTriangleVertices.put(mTriangleVerticesData).position(0);
-
-        mProgram = createProgram(mVertexShader, mFragmentShader);
-        if (mProgram == 0) {
-            synchronized (this) {
-                while (!mStarted) {
-                    try {
-                        this.wait(250);
-                    } catch (InterruptedException e) {
-                        continue;
-                    }
-                }
-            }
-            return;
-        }
-
-        maPositionHandle = GLES20.glGetAttribLocation(mProgram, "aPosition");
-        checkGlError("glGetAttribLocation aPosition");
-        if (maPositionHandle == -1) {
-            throw new RuntimeException("Could not get attrib location for aPosition");
-        }
-        maTextureHandle = GLES20.glGetAttribLocation(mProgram, "aTextureCoord");
-        checkGlError("glGetAttribLocation aTextureCoord");
-        if (maTextureHandle == -1) {
-            throw new RuntimeException("Could not get attrib location for aTextureCoord");
-        }
-
-        muMVPMatrixHandle = GLES20.glGetUniformLocation(mProgram, "uMVPMatrix");
-        checkGlError("glGetUniformLocation uMVPMatrix");
-        if (muMVPMatrixHandle == -1) {
-            throw new RuntimeException("Could not get attrib location for uMVPMatrix");
-        }
-
-        // Create our texture. This has to be done each time the
-        // surface is created.
-
-        int[] textures = new int[1];
-        GLES20.glGenTextures(1, textures, 0);
-
-        mTextureID = textures[0];
-        GLES20.glBindTexture(GLES20.GL_TEXTURE_2D, mTextureID);
-
-        GLES20.glTexParameterf(GLES20.GL_TEXTURE_2D, GLES20.GL_TEXTURE_MIN_FILTER,
-                GLES20.GL_LINEAR);
-        GLES20.glTexParameterf(GLES20.GL_TEXTURE_2D,
-                GLES20.GL_TEXTURE_MAG_FILTER,
-                GLES20.GL_LINEAR);
-
-        GLES20.glTexParameteri(GLES20.GL_TEXTURE_2D, GLES20.GL_TEXTURE_WRAP_S,
-                GLES20.GL_CLAMP_TO_EDGE);
-        GLES20.glTexParameteri(GLES20.GL_TEXTURE_2D, GLES20.GL_TEXTURE_WRAP_T,
-                GLES20.GL_CLAMP_TO_EDGE);
-
-        GLUtils.texImage2D(GLES20.GL_TEXTURE_2D, 0, bitmap, 0);
-
-        Matrix.setLookAtM(mVMatrix, 0, 0, 0, -5, 0f, 0f, 0f, 0f, 1.0f, 0.0f);
-
-        GLES20.glViewport(0, 0, mWidth, mHeight);
-
-        if (bitmap != null) {
-            float mx = ((float)mWidth / bitmap.getWidth()) / 2.0f;
-            float my = ((float)mHeight / bitmap.getHeight()) / 2.0f;
-            Matrix.orthoM(mProjMatrix, 0, -mx, mx, my, -my, 0, 10);
-            int value = bitmap.getPixel(0, 0);
-            Color color = new Color();
-            GLES20.glClearColor(
-                    (float)color.red(value) / 255.0f,
-                    (float)color.green(value) / 255.0f,
-                    (float)color.blue(value) / 255.0f,
-                    0.0f);
-        } else {
-            Matrix.orthoM(mProjMatrix, 0, -1, 1, -1, 1, 0, 10);
-            GLES20.glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
-        }
-
-        GLES20.glClear(GLES20.GL_DEPTH_BUFFER_BIT | GLES20.GL_COLOR_BUFFER_BIT);
-        GLES20.glUseProgram(mProgram);
-        checkGlError("glUseProgram");
-
-        GLES20.glActiveTexture(GLES20.GL_TEXTURE0);
-        GLES20.glBindTexture(GLES20.GL_TEXTURE_2D, mTextureID);
-
-        mTriangleVertices.position(TRIANGLE_VERTICES_DATA_POS_OFFSET);
-        GLES20.glVertexAttribPointer(maPositionHandle, 3, GLES20.GL_FLOAT, false,
-                TRIANGLE_VERTICES_DATA_STRIDE_BYTES, mTriangleVertices);
-        checkGlError("glVertexAttribPointer maPosition");
-        mTriangleVertices.position(TRIANGLE_VERTICES_DATA_UV_OFFSET);
-        GLES20.glEnableVertexAttribArray(maPositionHandle);
-        checkGlError("glEnableVertexAttribArray maPositionHandle");
-        GLES20.glVertexAttribPointer(maTextureHandle, 2, GLES20.GL_FLOAT, false,
-                TRIANGLE_VERTICES_DATA_STRIDE_BYTES, mTriangleVertices);
-        checkGlError("glVertexAttribPointer maTextureHandle");
-        GLES20.glEnableVertexAttribArray(maTextureHandle);
-        checkGlError("glEnableVertexAttribArray maTextureHandle");
-
-        Matrix.setRotateM(mMMatrix, 0, 0, 0, 0, 1.0f);
-        Matrix.multiplyMM(mMVPMatrix, 0, mVMatrix, 0, mMMatrix, 0);
-        Matrix.multiplyMM(mMVPMatrix, 0, mProjMatrix, 0, mMVPMatrix, 0);
-
-        GLES20.glUniformMatrix4fv(muMVPMatrixHandle, 1, false, mMVPMatrix, 0);
-
-        // Ensure that, even with double buffer, or if we lost one buffer (like
-        // BufferQueue has been abandoned!), it will work.
-        for ( int i = 0; i < 2; i++ ) {
-            GLES20.glClear(GLES20.GL_DEPTH_BUFFER_BIT | GLES20.GL_COLOR_BUFFER_BIT);
-            GLES20.glDrawArrays(GLES20.GL_TRIANGLES, 0, 6);
-            checkGlError("glDrawArrays");
-            swapBuffers();
-        }
-
-        // Wait to be notified it's okay to start Python.
-        synchronized (this) {
-            while (!mStarted) {
-                // Draw & Flip.
-                GLES20.glClear(GLES20.GL_DEPTH_BUFFER_BIT | GLES20.GL_COLOR_BUFFER_BIT);
-                GLES20.glDrawArrays(GLES20.GL_TRIANGLES, 0, 6);
-                swapBuffers();
-
-                try {
-                    this.wait(250);
-                } catch (InterruptedException e) {
-                }
-            }
-        }
-
-        GLES20.glActiveTexture(GLES20.GL_TEXTURE0);
-        GLES20.glBindTexture(GLES20.GL_TEXTURE_2D, 0);
-
-        // Delete texture.
-        GLES20.glDeleteTextures(1, textures, 0);
-        if (bitmap != null)
-            bitmap.recycle();
-
-        // Delete program
-        GLES20.glDeleteProgram(mProgram);
-    }
-
-
-    public void start() {
-        this.setFocusableInTouchMode(true);
-        this.setFocusable(true);
-        this.requestFocus();
-
-        synchronized (this) {
-            mStarted = true;
-            this.notify();
-        }
-
-    }
-
-    public boolean createSurface() {
-        mChanged = false;
-
-        // Destroy the old surface.
-        if (mEglSurface != null) {
-
-            /*
-             * Unbind and destroy the old EGL surface, if
-             * there is one.
-             */
-            mEgl.eglMakeCurrent(mEglDisplay, EGL10.EGL_NO_SURFACE,
-                    EGL10.EGL_NO_SURFACE, EGL10.EGL_NO_CONTEXT);
-            mEgl.eglDestroySurface(mEglDisplay, mEglSurface);
-        }
-
-        // Create a new surface.
-        mEglSurface = mEgl.eglCreateWindowSurface(
-                mEglDisplay, mEglConfig, getHolder(), null);
-
-        // Make the new surface current.
-        boolean rv = mEgl.eglMakeCurrent(
-                mEglDisplay, mEglSurface, mEglSurface, mEglContext);
-        if (!rv) {
-            mEglSurface = null;
-            return false;
-        }
-
-        if (mStarted) {
-            if (mInputActivated)
-                nativeResizeEvent(mWidth, mHeight);
-            else
-                nativeResize(mWidth, mHeight);
-
-            // If the size didn't change, kivy might no rerender the scene. Force it.
-            nativeExpose();
-        }
-
-        return true;
-
-    }
-
-    @SuppressLint("NewApi")
-	public int swapBuffers() {
-        // If the display has been changed, then disregard all the
-        // rendering we've done to it, and make a new surface.
-        //
-        // Otherwise, swap the buffers.
-        if (mChanged) {
-            createSurface();
-            mClears = 2;
-            return 0;
-
-        } else {
-            mEgl.eglSwapBuffers(mEglDisplay, mEglSurface);
-            if (mClears-- > 0)
-                GLES20.glClear(GLES20.GL_COLOR_BUFFER_BIT);
-            return 1;
-        }
-
-    }
-
-    private static final int INVALID_POINTER_ID = -1;
-    private int mActivePointerId = INVALID_POINTER_ID;
-
-    public void setInterceptTouchListener(OnInterceptTouchListener listener) {
-        this.mOnInterceptTouchListener = listener;
-    }
-
-    @Override
-    public boolean onTouchEvent(final MotionEvent event) {
-
-        if (mInputActivated == false)
-            return true;
-
-        if (mOnInterceptTouchListener != null)
-            if (mOnInterceptTouchListener.onTouch(event))
-                return false;
-
-        int action = event.getAction() & MotionEvent.ACTION_MASK;
-        int sdlAction = -1;
-        int pointerId = -1;
-        int pointerIndex = -1;
-
-        switch ( action ) {
-            case MotionEvent.ACTION_DOWN:
-            case MotionEvent.ACTION_POINTER_DOWN:
-                sdlAction = 0;
-                break;
-            case MotionEvent.ACTION_MOVE:
-                sdlAction = 2;
-                break;
-            case MotionEvent.ACTION_UP:
-            case MotionEvent.ACTION_POINTER_UP:
-                sdlAction = 1;
-                break;
-        }
-
-        // http://android-developers.blogspot.com/2010/06/making-sense-of-multitouch.html
-        switch ( action  & MotionEvent.ACTION_MASK ) {
-            case MotionEvent.ACTION_DOWN:
-            case MotionEvent.ACTION_MOVE:
-            case MotionEvent.ACTION_UP:
-                pointerIndex = event.findPointerIndex(mActivePointerId);
-                break;
-            case MotionEvent.ACTION_POINTER_DOWN:
-            case MotionEvent.ACTION_POINTER_UP:
-                pointerIndex = (event.getAction() & MotionEvent.ACTION_POINTER_INDEX_MASK)
-                    >> MotionEvent.ACTION_POINTER_INDEX_SHIFT;
-                if ( action == MotionEvent.ACTION_POINTER_UP ) {
-                    pointerId = event.getPointerId(pointerIndex);
-                    if ( pointerId == mActivePointerId )
-                        mActivePointerId = event.getPointerId(pointerIndex == 0 ? 1 : 0);
-                }
-                break;
-        }
-
-        if ( sdlAction >= 0 ) {
-
-            for ( int i = 0; i < event.getPointerCount(); i++ ) {
-
-                if ( pointerIndex == -1 || pointerIndex == i ) {
-
-                    /**
-                      Log.i("python", String.format("mouse id=%d action=%d x=%f y=%f",
-                      event.getPointerId(i),
-                      sdlAction,
-                      event.getX(i),
-                      event.getY(i)
-                      ));
-                     **/
-                    SDLSurfaceView.nativeMouse(
-                            (int)event.getX(i),
-                            (int)event.getY(i),
-                            sdlAction,
-                            event.getPointerId(i),
-                            (int)(event.getPressure(i) * 1000.0),
-                            (int)(event.getSize(i) * 1000.0));
-                }
-
-            }
-
-        }
-
-        return true;
-    };
-
-    @Override
-    public boolean onKeyDown(int keyCode, final KeyEvent event) {
-        if (DEBUG) Log.d(TAG, String.format("onKeyDown() keyCode=%d", keyCode));
-        if (mDelLen > 0){
-            mDelLen = 0;
-            return true;
-        }
-        if (mInputActivated && nativeKey(keyCode, 1, event.getUnicodeChar())) {
-            return true;
-        } else {
-            return super.onKeyDown(keyCode, event);
-        }
-    }
-
-    @Override
-    public boolean onKeyUp(int keyCode, final KeyEvent event) {
-        if (DEBUG) Log.d(TAG, String.format("onKeyUp() keyCode=%d", keyCode));
-        if (mDelLen > 0){
-            mDelLen = 0;
-            return true;
-        }
-        if (mInputActivated && nativeKey(keyCode, 0, event.getUnicodeChar())) {
-            return true;
-        } else {
-            return super.onKeyUp(keyCode, event);
-        }
-    }
-
-    @Override
-    public boolean onKeyMultiple(int keyCode, int count, KeyEvent event){
-        String keys = event.getCharacters();
-        if (DEBUG)
-            Log.d(TAG, String.format(
-                "onKeyMultiple() keyCode=%d count=%d, keys=%s", keyCode, count, keys));
-        if (keys == null) {
-            return super.onKeyMultiple(keyCode, count, event);
-        }
-        char[] keysBuffer = new char[keys.length()];
-        if (mDelLen > 0){
-            mDelLen = 0;
-            return true;
-        }
-        if (keyCode == 0){
-            // FIXME: here is hardcoded value of "q" key
-            // on hacker's keyboard. It is passed to
-            // nativeKey function to get it worked if
-            // we get 9 and some non-ascii characters
-            // but it my cause some odd behaviour
-            keyCode = 45;
-        }
-        if (mInputActivated && event.getAction() == KeyEvent.ACTION_MULTIPLE){
-            String message = String.format("INSERTN:%s", keys);
-            dispatchCommand(message);
-            return true;
-        }else {
-            return super.onKeyMultiple(keyCode, count, event);
-        }
-    }
-
-    @Override
-    public boolean onKeyPreIme(int keyCode, final KeyEvent event){
-        if (DEBUG) Log.d(TAG, String.format("onKeyPreIme() keyCode=%d", keyCode));
-        if (mInputActivated){
-            switch (event.getAction()) {
-                case KeyEvent.ACTION_DOWN:
-                    return onKeyDown(keyCode, event);
-                case KeyEvent.ACTION_UP:
-                    return onKeyUp(keyCode, event);
-                case KeyEvent.ACTION_MULTIPLE:
-                    return onKeyMultiple(
-                            keyCode,
-                            event.getRepeatCount(),
-                            event);
-            }
-            return false;
-        }
-        return super.onKeyPreIme(keyCode, event);
-    }
-
-    public void delayed_message(String message, int delay){
-        Handler handler = new Handler();
-        final String msg = message;
-        final int d = delay;
-        handler.postDelayed(new Runnable(){
-        @Override
-            public void run(){
-                dispatchCommand(msg);
-        }
-        }, d);
-    }
-
-    public void dispatchCommand(String message){
-
-        int delay = 0;
-        while (message.length() > 50){
-            delayed_message(message.substring(0, 50), delay);
-            delay += 100;
-            message = String.format("INSERTN:%s", message.substring(50, message.length()));
-            if (message.length() <= 50){
-                delayed_message(message, delay+50);
-                return;
-            }
-        }
-
-        if (DEBUG) Log.d(TAG, String.format("dispatch :%s", message));
-        int keyCode = 45;
-        //send control sequence start
-        nativeKey(keyCode, 1, 1);
-        nativeKey(keyCode, 0, 1);
-
-        for(int i=0; i < message.length(); i++){
-            //Calls both up/down events to emulate key pressing
-            nativeKey(keyCode, 1, (int) message.charAt(i));
-            nativeKey(keyCode, 0, (int) message.charAt(i));
-        }
-
-        //send control sequence end \x02
-        nativeKey(keyCode, 1, 2);
-        nativeKey(keyCode, 0, 2);
-
-    }
-
-    @Override
-    public InputConnection onCreateInputConnection(EditorInfo outAttrs) {
-        outAttrs.inputType = inputType;
-        // ask IME to avoid taking full screen on landscape mode
-        outAttrs.imeOptions = EditorInfo.IME_FLAG_NO_EXTRACT_UI;
-
-        // add a listener for the layout chnages to the IME view
-        final android.view.View activityRootView = mActivity.getWindow().getDecorView();
-        final android.view.Display default_display = mActivity.getWindowManager().getDefaultDisplay();
-        activityRootView.getViewTreeObserver().addOnGlobalLayoutListener(new android.view.ViewTreeObserver.OnGlobalLayoutListener() {
-            @Override
-            public void onGlobalLayout() {
-                Rect rctx = new Rect();
-                activityRootView.getWindowVisibleDisplayFrame(rctx);
-                int heightDiff = default_display.getHeight() - (rctx.bottom - rctx.top);
-                if (heightDiff != kHeight){
-                    Log.i("Python:", String.format("Layout Triggered, Keyboard_height: %s", heightDiff));
-                    //send control sequence start /x04 == kayboard layout changed
-                    nativeKey(45, 1, 4);
-                    nativeKey(45, 0, 4);
-                    }    
-                kHeight = heightDiff;
-                }    
-            }); 
-        return new BaseInputConnection(this, false){
-
-            private void deleteLastText(){
-                // send back space keys
-                if (DEBUG) Log.i("Python:", String.format("delete text%s", mDelLen));
-
-                if (mDelLen == 0){
-                    return;
-                }
-
-                String message = String.format("DEL:%s", mDelLen);
-                dispatchCommand(message);
-            }
-
-            @Override
-            public boolean endBatchEdit() {
-                if (DEBUG) Log.i("Python:", "endBatchEdit");
-                return super.endBatchEdit();
-            }
-
-            @Override
-            public boolean beginBatchEdit() {
-                if (DEBUG) Log.i("Python:", "beginBatchEdit");
-                return super.beginBatchEdit();
-            }
-
-            @Override
-            public boolean commitCompletion(CompletionInfo text){
-                if (DEBUG) Log.i("Python:", String.format("Commit Completion %s", text));
-                return super.commitCompletion(text);
-            }
-
-            /*API11 only
-            @Override
-            public boolean commitCorrection(CorrectionInfo correctionInfo){
-                if (DEBUG) Log.i("Python:", String.format("Commit Correction"));
-                return super.commitCorrection(correctionInfo);
-            }*/
-
-            @Override
-            public boolean commitText(CharSequence text, int newCursorPosition) {
-                // some code which takes the input and manipulates it and calls editText.getText().replace() afterwards
-                this.deleteLastText();
-                if (DEBUG) Log.i("Python:", String.format("Commit Text %s", text));
-                mDelLen = 0;
-                return super.commitText(text, newCursorPosition);
-            }
-
-            @Override
-            public boolean sendKeyEvent(KeyEvent event){
-                if (DEBUG) Log.d("Python:", String.format("sendKeyEvent %s", event.getKeyCode()));
-                return super.sendKeyEvent(event);
-            }
-
-            @Override
-            public boolean setComposingRegion(int start, int end){
-                if (DEBUG) Log.d("Python:", String.format("Set Composing Region %s %s", start, end));
-                finishComposingText();
-                if (start < 0 || start > end)
-                    return true;
-                //dispatchCommand(String.format("SEL:%s,%s,%s", mTbf.length(), start, end));
-                return true;
-                //return super.setComposingRegion(start, end);
-            }
-
-            @Override
-            public boolean setComposingText(CharSequence text,
-                int newCursorPosition){
-                this.deleteLastText();
-                if (DEBUG) Log.i("Python:", String.format("set Composing Text %s", text));
-                // send text
-                String message = String.format("INSERT:%s", text);
-                dispatchCommand(message);
-                // store len to be deleted for next time
-                mDelLen = text.length();
-                return super.setComposingText(text, newCursorPosition);
-            }
-
-            @Override
-            public boolean finishComposingText(){
-                if (DEBUG) Log.i("Python:", String.format("finish Composing Text"));
-                return super.finishComposingText();
-            }
-
-            @Override
-            public boolean deleteSurroundingText (int beforeLength, int afterLength){
-                if (DEBUG) Log.d("Python:", String.format("delete surrounding Text %s %s", beforeLength, afterLength));
-                // move cursor to place from where to start deleting
-                // send right arrow keys
-                for (int i = 0; i < afterLength; i++){
-                    nativeKey(45, 1, 39);
-                    nativeKey(45, 0, 39);
-                }
-                // remove text before cursor
-                mDelLen = beforeLength + afterLength;
-                this.deleteLastText();
-                mDelLen = 0;
-
-                return super.deleteSurroundingText(beforeLength, afterLength);
-            }
-
-            @Override
-            public ExtractedText getExtractedText (ExtractedTextRequest request, int flags){
-                if (DEBUG) Log.d("Python:", String.format("getExtractedText %s %s", request.describeContents(), flags));
-                    return super.getExtractedText(request, flags);
-            }
-
-            @SuppressLint("NewApi")
-			@Override
-            public CharSequence getSelectedText(int flags){
-                if (DEBUG) Log.d("Python:", String.format("getSelectedText %s", flags));
-                    return super.getSelectedText(flags);
-            }
-
-            @Override
-            public CharSequence getTextBeforeCursor(int n, int flags){
-                if (DEBUG) Log.d("Python:", String.format("getTextBeforeCursor %s %s", n, flags));
-                /*int len = mTbf.length();
-                int len_n = Math.min(len, n);
-                int start = Math.max(len - n, 0);
-                String tbf = mTbf.substring(start,  start + len_n);
-                return tbf;*/
-                return super.getTextBeforeCursor(n, flags);
-            }
-
-            @Override
-            public CharSequence getTextAfterCursor(int n, int flags){
-                if (DEBUG) Log.d("Python:", String.format("getTextAfterCursor %s %s", n, flags));
-                Log.d("Python:", String.format("TextAfterCursor %s", mTaf));
-                //return mTaf.substring(0, Math.min(mTaf.length(), n));
-                return super.getTextAfterCursor(n, flags);
-            }
-
-            @Override
-            public boolean setSelection(int start, int end){
-                if (DEBUG) Log.d("Python:", String.format("Set Selection %s %s", start, end));
-                return super.setSelection(start, end);
-            }
-        };
-    }
-
-    static void activateInput() {
-        mInputActivated = true;
-    }
-
-    static void openUrl(String url) {
-        Log.i("python", "Opening URL: " + url);
-
-        Intent i = new Intent(Intent.ACTION_VIEW);
-        i.setData(Uri.parse(url));
-        mActivity.startActivity(i);
-    }
-
-    // Taken from the "GLES20TriangleRenderer" in Android SDK
-    @SuppressLint("NewApi")
-	private int loadShader(int shaderType, String source) {
-        int shader = GLES20.glCreateShader(shaderType);
-        if (shader != 0) {
-            GLES20.glShaderSource(shader, source);
-            GLES20.glCompileShader(shader);
-            int[] compiled = new int[1];
-            GLES20.glGetShaderiv(shader, GLES20.GL_COMPILE_STATUS, compiled, 0);
-            if (compiled[0] == 0) {
-                Log.e(TAG, "Could not compile shader " + shaderType + ":");
-                Log.e(TAG, GLES20.glGetShaderInfoLog(shader));
-                GLES20.glDeleteShader(shader);
-                shader = 0;
-            }
-        }
-        return shader;
-    }
-
-    @TargetApi(Build.VERSION_CODES.FROYO)
-	private int createProgram(String vertexSource, String fragmentSource) {
-        int vertexShader = loadShader(GLES20.GL_VERTEX_SHADER, vertexSource);
-        if (vertexShader == 0) {
-            return 0;
-        }
-
-        int pixelShader = loadShader(GLES20.GL_FRAGMENT_SHADER, fragmentSource);
-        if (pixelShader == 0) {
-            return 0;
-        }
-
-        int program = GLES20.glCreateProgram();
-        if (program != 0) {
-            GLES20.glAttachShader(program, vertexShader);
-            checkGlError("glAttachShader");
-            GLES20.glAttachShader(program, pixelShader);
-            checkGlError("glAttachShader");
-            GLES20.glLinkProgram(program);
-            int[] linkStatus = new int[1];
-            GLES20.glGetProgramiv(program, GLES20.GL_LINK_STATUS, linkStatus, 0);
-            if (linkStatus[0] != GLES20.GL_TRUE) {
-                Log.e(TAG, "Could not link program: ");
-                Log.e(TAG, GLES20.glGetProgramInfoLog(program));
-                GLES20.glDeleteProgram(program);
-                program = 0;
-            }
-        }
-        return program;
-    }
-
-    @SuppressLint("NewApi")
-	private void checkGlError(String op) {
-        int error;
-        while ((error = GLES20.glGetError()) != GLES20.GL_NO_ERROR) {
-            Log.e(TAG, op + ": glError " + error);
-            //throw new RuntimeException(op + ": glError " + error);
-        }
-    }
-    private static final int FLOAT_SIZE_BYTES = 4;
-    private static final int TRIANGLE_VERTICES_DATA_STRIDE_BYTES = 5 * FLOAT_SIZE_BYTES;
-    private static final int TRIANGLE_VERTICES_DATA_POS_OFFSET = 0;
-    private static final int TRIANGLE_VERTICES_DATA_UV_OFFSET = 3;
-    private final float[] mTriangleVerticesData = {
-        // X, Y, Z, U, V
-        -0.5f, -0.5f, 0, 1.0f, 0.0f,
-        0.5f, -0.5f, 0, 0.0f, 0.0f,
-        0.5f, 0.5f, 0, 0.0f, 1.0f,
-        -0.5f, -0.5f, 0, 1.0f, 0.0f,
-        0.5f, 0.5f, 0, 0.0f, 1.0f,
-        -0.5f, 0.5f, 0, 1.0f, 1.0f,
-    };
-
-    private FloatBuffer mTriangleVertices;
-
-    private float[] mMVPMatrix = new float[16];
-    private float[] mProjMatrix = new float[16];
-    private float[] mMMatrix = new float[16];
-    private float[] mVMatrix = new float[16];
-    private int mProgram;
-    private int mTextureID;
-    private int muMVPMatrixHandle;
-    private int maPositionHandle;
-    private int maTextureHandle;
-
-    // Native part
-
-    public static native void nativeSetEnv(String name, String value);
-    public static native void nativeInit();
-
-    public static native void nativeMouse( int x, int y, int action, int pointerId, int pressure, int radius );
-    public static native boolean nativeKey(int keyCode, int down, int unicode);
-    public static native void nativeSetMouseUsed();
-    public static native void nativeSetMultitouchUsed();
-
-    public native void nativeResize(int width, int height);
-    public native void nativeResizeEvent(int width, int height);
-    public native void nativeExpose();
-    public native void nativeInitJavaCallbacks();
-
-    static {
-        //System.loadLibrary("com_googlecode_android_scripting_Exec");
-        System.loadLibrary("sdl");
-        System.loadLibrary("sdl_image");
-        System.loadLibrary("sdl_ttf");
-        System.loadLibrary("sdl_mixer");
-        System.loadLibrary("python2.7");
-        System.loadLibrary("application");
-        System.loadLibrary("sdl_main");
-    }
-
-}
diff --git a/qpysdk/src/main/java/org/renpy/android/VideoPlayer.java b/qpysdk/src/main/java/org/renpy/android/VideoPlayer.java
new file mode 100644
index 00000000..40a74833
--- /dev/null
+++ b/qpysdk/src/main/java/org/renpy/android/VideoPlayer.java
@@ -0,0 +1,168 @@
+package org.renpy.android;
+
+import android.media.MediaPlayer;
+import android.util.Log;
+import android.view.SurfaceView;
+import android.view.SurfaceHolder;
+
+import java.io.FileInputStream;
+import java.io.IOException;
+
+public class VideoPlayer implements SurfaceHolder.Callback, MediaPlayer.OnErrorListener, MediaPlayer.OnCompletionListener {
+
+	MediaPlayer player = null;
+	SurfaceView view = null;
+
+	boolean playing = true;
+
+
+	public boolean onError(MediaPlayer mp, int what, int extra) {
+		Log.i("VP", "Error is " + what + " " + extra);
+		return false;
+	}
+
+	public void onCompletion(MediaPlayer mp) {
+		Log.i("VP", "Completion.");
+
+		if (playing) {
+			stop();
+		}
+	}
+
+	public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) {
+	}
+
+	public void surfaceCreated(SurfaceHolder holder) {
+		Log.i("VP", "Surface created.");
+
+		try {
+			player = new MediaPlayer();
+
+			player.setOnErrorListener(this);
+			player.setOnCompletionListener(this);
+
+			player.setDisplay(view.getHolder());
+
+			Log.i("VP", "Set display.");
+
+			FileInputStream f = new FileInputStream(realFn);
+
+	        if (length >= 0) {
+	            player.setDataSource(f.getFD(), base, length);
+	        } else {
+	            player.setDataSource(f.getFD());
+	        }
+
+			f.close();
+
+	        Log.i("VP", "Set input stream.");
+
+			player.prepare();
+
+			Log.i("VP", "Prepared, duration = " + player.getDuration());
+
+			player.start();
+
+			Log.i("VP", "Started playing");
+
+
+		} catch (Exception e) {
+
+			Log.e("VP", "exception in surface creation", e);
+			stop();
+			return;
+		}
+
+		synchronized (VideoPlayer.this) {
+			VideoPlayer.this.notifyAll();
+		}
+	}
+
+	public void surfaceDestroyed(SurfaceHolder holder) {
+	}
+
+	/**
+	 * This runs on the UI thread to create the surface.
+	 */
+	private void startPlaying() {
+		Log.i("VP", "startPlaying called");
+
+
+		view = new SurfaceView(PythonSDLActivity.mActivity);
+		view.setZOrderOnTop(true);
+
+		view.getHolder().addCallback(this);
+
+		PythonSDLActivity.mActivity.mFrameLayout.addView(view);
+
+		Log.i("VP", "startPlaying done");
+	}
+
+	/**
+	 * This runs on the UI thread to remove the view.
+	 */
+	private void stopPlaying() {
+		player.release();
+		PythonSDLActivity.mActivity.mFrameLayout.removeView(view);
+	}
+
+	public void pause() {
+		if (playing) {
+			player.pause();
+			Log.i("VP", "paused");
+		}
+	}
+
+	public void unpause() {
+		if (playing) {
+			player.start();
+			Log.i("VP", "unpaused");
+		}
+	}
+
+
+	public void stop() {
+
+		playing = false;
+
+		PythonSDLActivity.mActivity.runOnUiThread(new Runnable() {
+			public void run() {
+				stopPlaying();
+			}
+		});
+	}
+
+	public boolean isPlaying() {
+		return this.playing;
+	}
+
+	String realFn;
+	long base;
+	long length;
+
+	/**
+	 * Creates a new videoplayer and starts it playing.
+	 */
+	public VideoPlayer(String realFn, long base, long length) {
+
+		this.realFn = realFn;
+		this.base = base;
+		this.length = length;
+
+		synchronized (this) {
+			PythonSDLActivity.mActivity.runOnUiThread(new Runnable() {
+				public void run() {
+					startPlaying();
+				}
+			});
+
+			try {
+				wait();
+			} catch (InterruptedException e) {
+
+			}
+		}
+
+	}
+
+}
diff --git a/qpysdk/src/main/jni b/qpysdk/src/main/jni
new file mode 160000
index 00000000..3ee8b209
--- /dev/null
+++ b/qpysdk/src/main/jni
@@ -0,0 +1 @@
+Subproject commit 3ee8b209df6481a585826a44bfa94eeecd621e4e
diff --git a/qpysdk/src/main/jni/Android.mk b/qpysdk/src/main/jni/Android.mk
deleted file mode 100644
index 8b7cbb9c..00000000
--- a/qpysdk/src/main/jni/Android.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE    := com_googlecode_android_scripting_Exec
-LOCAL_SRC_FILES := com_googlecode_android_scripting_Exec.cpp
-LOCAL_LDLIBS    := -llog
-
-include $(BUILD_SHARED_LIBRARY)
diff --git a/qpysdk/src/main/jni/Application.mk b/qpysdk/src/main/jni/Application.mk
deleted file mode 100644
index aacc3d0a..00000000
--- a/qpysdk/src/main/jni/Application.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-# Build for ARMv5TE, mips and x86 architectures.
-APP_ABI := armeabi armeabi-v7a
\ No newline at end of file
diff --git a/qpysdk/src/main/jni/com_googlecode_android_scripting_Exec.cpp b/qpysdk/src/main/jni/com_googlecode_android_scripting_Exec.cpp
deleted file mode 100644
index 82b3f838..00000000
--- a/qpysdk/src/main/jni/com_googlecode_android_scripting_Exec.cpp
+++ /dev/null
@@ -1,225 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- * Copyright (C) 2009 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.
- */
-
-#include "com_googlecode_android_scripting_Exec.h"
-
-#include <errno.h>
-#include <fcntl.h>
-#include <stdlib.h>
-#include <sys/ioctl.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <termios.h>
-#include <unistd.h>
-#include <stdio.h>
-
-#include "android/log.h"
-
-#define LOG_TAG "Exec"
-#define LOGE(...) __android_log_print(ANDROID_LOG_ERROR, LOG_TAG, __VA_ARGS__)
-
-int CreateSubprocess(const char* cmd, char* args[], char* vars[], char *wkdir, pid_t* pid) {
-  char* devname;
-  int ptm = open("/dev/ptmx", O_RDWR);
-  if(ptm < 0){
-    LOGE("Cannot open /dev/ptmx: %s\n", strerror(errno));
-    return -1;
-  }
-  fcntl(ptm, F_SETFD, FD_CLOEXEC);
-
-//  if (grantpt(ptm) || unlockpt(ptm) ||
-  if (unlockpt(ptm) ||
-
-  ((devname = (char*) ptsname(ptm)) == 0)) {
-    LOGE("Trouble with /dev/ptmx: %s\n", strerror(errno));
-    return -1;
-  }
-
-  *pid = fork();
-  if(*pid < 0) {
-    LOGE("Fork failed: %s\n", strerror(errno));
-    return -1;
-  }
-
-  if(*pid == 0){
-    int pts;
-    setsid();
-    pts = open(devname, O_RDWR);
-    if(pts < 0) {
-      exit(-1);
-    }
-    dup2(pts, 0);
-    dup2(pts, 1);
-    dup2(pts, 2);
-    close(ptm);
-    if (wkdir) chdir(wkdir);
-    execve(cmd, args, vars);
-    exit(-1);
-  } else {
-    return ptm;
-  }
-}
-
-void JNU_ThrowByName(JNIEnv* env, const char* name, const char* msg) {
-  jclass clazz = env->FindClass(name);
-  if (clazz != NULL) {
-    env->ThrowNew(clazz, msg);
-  }
-  env->DeleteLocalRef(clazz);
-}
-
-char* JNU_GetStringNativeChars(JNIEnv* env, jstring jstr) {
-  if (jstr == NULL) {
-    return NULL;
-  }
-  jbyteArray bytes = 0;
-  jthrowable exc;
-  char* result = 0;
-  if (env->EnsureLocalCapacity(2) < 0) {
-    return 0; /* out of memory error */
-  }
-  jclass Class_java_lang_String = env->FindClass("java/lang/String");
-  jmethodID MID_String_getBytes = env->GetMethodID(
-      Class_java_lang_String, "getBytes", "()[B");
-  bytes = (jbyteArray) env->CallObjectMethod(jstr, MID_String_getBytes);
-  exc = env->ExceptionOccurred();
-  if (!exc) {
-    jint len = env->GetArrayLength(bytes);
-    result = (char*) malloc(len + 1);
-    if (result == 0) {
-      JNU_ThrowByName(env, "java/lang/OutOfMemoryError", 0);
-      env->DeleteLocalRef(bytes);
-      return 0;
-    }
-    env->GetByteArrayRegion(bytes, 0, len, (jbyte*) result);
-    result[len] = 0; /* NULL-terminate */
-  } else {
-    env->DeleteLocalRef(exc);
-  }
-  env->DeleteLocalRef(bytes);
-  return result;
-}
-
-int JNU_GetFdFromFileDescriptor(JNIEnv* env, jobject fileDescriptor) {
-  jclass Class_java_io_FileDescriptor = env->FindClass("java/io/FileDescriptor");
-  jfieldID descriptor = env->GetFieldID(Class_java_io_FileDescriptor, "descriptor", "I");
-  return env->GetIntField(fileDescriptor, descriptor);
-}
-
-JNIEXPORT jobject JNICALL Java_com_googlecode_android_1scripting_Exec_createSubprocess(
-    JNIEnv* env, jclass clazz, jstring cmd, jobjectArray argArray, jobjectArray varArray,
-    jstring workingDirectory,
-    jintArray processIdArray) {
-  char* cmd_native = JNU_GetStringNativeChars(env, cmd);
-  char* wkdir_native = JNU_GetStringNativeChars(env, workingDirectory);
-  pid_t pid;
-  jsize len = 0;
-  if (argArray) {
-    len = env->GetArrayLength(argArray);
-  }
-  char* args[len + 2];
-  args[0] = cmd_native;
-  for (int i = 0; i < len; i++) {
-    jstring arg = (jstring) env->GetObjectArrayElement(argArray, i);
-    char* arg_native = JNU_GetStringNativeChars(env, arg);
-    args[i + 1] = arg_native;
-  }
-  args[len + 1] = NULL;
-
-  len = 0;
-  if (varArray) {
-    len = env->GetArrayLength(varArray);
-  }
-  char* vars[len + 1];
-  for (int i = 0; i < len; i++) {
-    jstring var = (jstring) env->GetObjectArrayElement(varArray, i);
-    char* var_native = JNU_GetStringNativeChars(env, var);
-    vars[i] = var_native;
-  }
-  vars[len] = NULL;
-
-  int ptm = CreateSubprocess(cmd_native, args, vars, wkdir_native, &pid);
-  if (processIdArray) {
-    if (env->GetArrayLength(processIdArray) > 0) {
-      jboolean isCopy;
-      int* proccessId = (int*) env->GetPrimitiveArrayCritical(processIdArray, &isCopy);
-      if (proccessId) {
-        *proccessId = (int) pid;
-        env->ReleasePrimitiveArrayCritical(processIdArray, proccessId, 0);
-      }
-    }
-  }
-
-  jclass Class_java_io_FileDescriptor =
-      env->FindClass("java/io/FileDescriptor");
-  jmethodID init = env->GetMethodID(Class_java_io_FileDescriptor, "<init>", "()V");
-  jobject result = env->NewObject(Class_java_io_FileDescriptor, init);
-
-  if (!result) {
-    LOGE("Couldn't create a FileDescriptor.");
-  } else {
-    jfieldID descriptor = env->GetFieldID(Class_java_io_FileDescriptor, "descriptor", "I");
-    env->SetIntField(result, descriptor, ptm);
-  }
-  return result;
-}
-
-JNIEXPORT void JNICALL Java_com_googlecode_android_1scripting_Exec_setPtyWindowSize(
-    JNIEnv* env, jclass clazz, jobject fileDescriptor, jint row, jint col, jint xpixel,
-    jint ypixel) {
-  struct winsize sz;
-  int fd = JNU_GetFdFromFileDescriptor(env, fileDescriptor);
-  if (env->ExceptionOccurred() != NULL) {
-    return;
-  }
-  sz.ws_row = row;
-  sz.ws_col = col;
-  sz.ws_xpixel = xpixel;
-  sz.ws_ypixel = ypixel;
-  ioctl(fd, TIOCSWINSZ, &sz);
-}
-
-JNIEXPORT jint JNICALL Java_com_googlecode_android_1scripting_Exec_waitFor(JNIEnv* env, jclass clazz, jint procId) {
-  int status;
-  waitpid(procId, &status, 0);
-  int result = 0;
-  if (WIFEXITED(status)) {
-    result = WEXITSTATUS(status);
-  }
-  return result;
-}
-
-JNIEXPORT jint JNICALL Java_com_googlecode_android_1scripting_Exec_nativeInit
-        ( JNIEnv*  env, jobject thiz )
-        {
-          int argc = 1;
-          char * argv[] = { "sdl" };
-          main( argc, argv );
-        };
-
-JNIEXPORT jint JNICALL Java_com_googlecode_android_1scripting_Exec_nativeSetEnv
-        (JNIEnv*  env, jobject thiz, jstring j_name, jstring j_value) {
-
-  jboolean iscopy;
-  const char *name = env->GetStringUTFChars(j_name, &iscopy);
-  const char *value = env->GetStringUTFChars(j_value, &iscopy);
-  setenv(name, value, 1);
-  env->ReleaseStringUTFChars(j_name, name);
-  env->ReleaseStringUTFChars(j_value, value);
-
-}
-
diff --git a/qpysdk/src/main/jni/com_googlecode_android_scripting_Exec.h b/qpysdk/src/main/jni/com_googlecode_android_scripting_Exec.h
deleted file mode 100644
index 35df879b..00000000
--- a/qpysdk/src/main/jni/com_googlecode_android_scripting_Exec.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class com_googlecode_android_scripting_Exec */
-
-#ifndef _Included_com_googlecode_android_scripting_Exec
-#define _Included_com_googlecode_android_scripting_Exec
-#ifdef __cplusplus
-extern "C" {
-#endif
-/*
- * Class:     com_googlecode_android_scripting_Exec
- * Method:    createSubprocess
- * Signature: (Ljava/lang/String;[Ljava/lang/String;[Ljava/lang/String;[I)Ljava/io/FileDescriptor;
- */
-JNIEXPORT jobject JNICALL Java_com_googlecode_android_1scripting_Exec_createSubprocess
-  (JNIEnv *, jclass, jstring, jobjectArray, jobjectArray, jstring, jintArray);
-
-/*
- * Class:     com_googlecode_android_scripting_Exec
- * Method:    setPtyWindowSize
- * Signature: (Ljava/io/FileDescriptor;IIII)V
- */
-JNIEXPORT void JNICALL Java_com_googlecode_android_1scripting_Exec_setPtyWindowSize
-  (JNIEnv *, jclass, jobject, jint, jint, jint, jint);
-
-/*
- * Class:     com_googlecode_android_scripting_Exec
- * Method:    waitFor
- * Signature: (I)I
- */
-JNIEXPORT jint JNICALL Java_com_googlecode_android_1scripting_Exec_waitFor
-  (JNIEnv *, jclass, jint);
-
-
-JNIEXPORT jint JNICALL Java_com_googlecode_android_1scripting_Exec_nativeInit
-        ( JNIEnv*  env, jobject thiz );
-
-JNIEXPORT jint JNICALL Java_com_googlecode_android_1scripting_Exec_nativeSetEnv
-        (JNIEnv*  env, jobject thiz, jstring j_name, jstring j_value);
-
-
- int main(int argc, char *argv[])
- {
- }
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/qpysdk/src/main/libs/armeabi-v7a/libSDL2.so b/qpysdk/src/main/libs/armeabi-v7a/libSDL2.so
new file mode 100755
index 00000000..5338e91e
Binary files /dev/null and b/qpysdk/src/main/libs/armeabi-v7a/libSDL2.so differ
diff --git a/qpysdk/src/main/libs/armeabi-v7a/libSDL2_gfx.so b/qpysdk/src/main/libs/armeabi-v7a/libSDL2_gfx.so
new file mode 100755
index 00000000..80d01e32
Binary files /dev/null and b/qpysdk/src/main/libs/armeabi-v7a/libSDL2_gfx.so differ
diff --git a/qpysdk/src/main/libs/armeabi-v7a/libSDL2_image.so b/qpysdk/src/main/libs/armeabi-v7a/libSDL2_image.so
new file mode 100755
index 00000000..03484635
Binary files /dev/null and b/qpysdk/src/main/libs/armeabi-v7a/libSDL2_image.so differ
diff --git a/qpysdk/src/main/libs/armeabi-v7a/libSDL2_mixer.so b/qpysdk/src/main/libs/armeabi-v7a/libSDL2_mixer.so
new file mode 100755
index 00000000..c48ebb56
Binary files /dev/null and b/qpysdk/src/main/libs/armeabi-v7a/libSDL2_mixer.so differ
diff --git a/qpysdk/src/main/libs/armeabi-v7a/libSDL2_ttf.so b/qpysdk/src/main/libs/armeabi-v7a/libSDL2_ttf.so
new file mode 100755
index 00000000..98aeea15
Binary files /dev/null and b/qpysdk/src/main/libs/armeabi-v7a/libSDL2_ttf.so differ
diff --git a/qpysdk/src/main/libs/armeabi-v7a/libmain.so b/qpysdk/src/main/libs/armeabi-v7a/libmain.so
new file mode 100755
index 00000000..44643b21
Binary files /dev/null and b/qpysdk/src/main/libs/armeabi-v7a/libmain.so differ
diff --git a/qpysdk/src/main/libs/armeabi-v7a/libpng16.so b/qpysdk/src/main/libs/armeabi-v7a/libpng16.so
new file mode 100755
index 00000000..a16e3512
Binary files /dev/null and b/qpysdk/src/main/libs/armeabi-v7a/libpng16.so differ
diff --git a/qpysdk/src/main/libs/armeabi-v7a/libpython2.7.so b/qpysdk/src/main/libs/armeabi-v7a/libpython2.7.so
new file mode 100755
index 00000000..4b3fbaa5
Binary files /dev/null and b/qpysdk/src/main/libs/armeabi-v7a/libpython2.7.so differ
diff --git a/qpysdk/src/main/libs/armeabi-v7a/libqpysdk.so b/qpysdk/src/main/libs/armeabi-v7a/libqpysdk.so
new file mode 100755
index 00000000..1b189d79
Binary files /dev/null and b/qpysdk/src/main/libs/armeabi-v7a/libqpysdk.so differ
diff --git a/qpysdk/src/main/res/values-zh-rCN/strings.xml b/qpysdk/src/main/res/values-zh-rCN/strings.xml
new file mode 100644
index 00000000..fa7fe166
--- /dev/null
+++ b/qpysdk/src/main/res/values-zh-rCN/strings.xml
@@ -0,0 +1,4 @@
+<resources>
+    <string name="app_name">QPYSDK</string>
+    <string name="open_log">查看日志么？</string>
+</resources>
diff --git a/qpysdk/src/main/res/values/strings.xml b/qpysdk/src/main/res/values/strings.xml
index 8d739766..d87960cf 100644
--- a/qpysdk/src/main/res/values/strings.xml
+++ b/qpysdk/src/main/res/values/strings.xml
@@ -1,3 +1,4 @@
 <resources>
-    <string name="app_name">QPyengine</string>
-</resources>
+    <string name="app_name">QPYSDK</string>
+    <string name="open_log">Do you want to check the runtime log?</string>
+</resources>
\ No newline at end of file
diff --git a/qpysl4a b/qpysl4a
new file mode 160000
index 00000000..fc9d4745
--- /dev/null
+++ b/qpysl4a
@@ -0,0 +1 @@
+Subproject commit fc9d47452c2cdd99b1314c2d5f913dfea33698ad
diff --git a/qpysl4a/.gitignore b/qpysl4a/.gitignore
deleted file mode 100644
index 3543521e..00000000
--- a/qpysl4a/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
diff --git a/qpysl4a/build.gradle b/qpysl4a/build.gradle
deleted file mode 100644
index ccf63183..00000000
--- a/qpysl4a/build.gradle
+++ /dev/null
@@ -1,44 +0,0 @@
-apply plugin: 'com.android.library'
-
-android {
-    compileSdkVersion 23
-    buildToolsVersion '25.0.0'
-
-    defaultConfig {
-        minSdkVersion 15
-        targetSdkVersion 23
-        versionCode 1
-        versionName "1.0"
-    }
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-        }
-    }
-
-    defaultPublishConfig 'release'
-    publishNonDefault true
-    productFlavors {
-        library {
-            /* This strange empty flavour is actually needed
-               for the below to be successful
-    debugCompile project(path: ':common', configuration: "libraryDebug")
-    releaseCompile project(path: ':common', configuration: "libraryRelease")
-           */
-        }
-    }
-
-    dataBinding {
-        enabled = true
-    }
-}
-
-dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    testCompile 'junit:junit:4.12'
-    compile 'com.android.support:design:23.4.0'
-    compile 'com.android.support:appcompat-v7:23.4.0'
-
-    compile 'com.google.guava:guava:18.0'
-}
diff --git a/qpysl4a/proguard-rules.pro b/qpysl4a/proguard-rules.pro
deleted file mode 100644
index ce612161..00000000
--- a/qpysl4a/proguard-rules.pro
+++ /dev/null
@@ -1,17 +0,0 @@
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in C:\Users\Jay\AppData\Local\Android\Sdk/tools/proguard/proguard-android.txt
-# You can edit the include mPath and order by changing the proguardFiles
-# directive in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
diff --git a/qpysl4a/src/main/AndroidManifest.xml b/qpysl4a/src/main/AndroidManifest.xml
deleted file mode 100644
index 6287ed13..00000000
--- a/qpysl4a/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.qpython.qsl4a">
-
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-    <uses-permission android:name="android.permission.BLUETOOTH" />
-    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
-    <uses-permission android:name="android.permission.NFC" />
-</manifest>
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/QPyScriptService.java b/qpysl4a/src/main/java/org/qpython/qsl4a/QPyScriptService.java
deleted file mode 100644
index 5ccf2c8f..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/QPyScriptService.java
+++ /dev/null
@@ -1,202 +0,0 @@
-package org.qpython.qsl4a;
-
-import android.annotation.SuppressLint;
-import android.app.Service;
-import android.content.Context;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.os.AsyncTask;
-import android.os.Binder;
-import android.os.Handler;
-import android.os.IBinder;
-import android.os.Message;
-import android.util.Log;
-
-import org.qpython.qsl4a.qsl4a.AndroidProxy;
-import org.qpython.qsl4a.qsl4a.interpreter.InterpreterConfiguration;
-import org.qpython.qsl4a.qsl4a.jsonrpc.RpcReceiverManager;
-import org.qpython.qsl4a.qsl4a.util.SPFUtils;
-
-import java.util.concurrent.CountDownLatch;
-
-//public class QPyScriptService extends ForegroundService {
-
-public class QPyScriptService extends Service {
-    private static final String TAG = "QPyScriptService";
-
-    //private final static int NOTIFICATION_ID = NotificationIdFactory.create();
-    private final CountDownLatch mLatch = new CountDownLatch(1);
-    private final IBinder mBinder;
-
-    @SuppressWarnings("unused")
-    private static QPyScriptService instance;
-    @SuppressWarnings("unused")
-    private boolean killMe;
-    public static String scriptName;
-
-    private InterpreterConfiguration mInterpreterConfiguration = null;
-    private RpcReceiverManager mFacadeManager;
-    private AndroidProxy mProxy;
-
-    private static Context context = null;
-    @SuppressWarnings("unused")
-    private int mStartId;
-
-    static {
-        instance = null;
-    }
-
-    // ------------------------------------------------------------------------------------------------------
-
-    public class LocalBinder extends Binder {
-        public QPyScriptService getService() {
-            return QPyScriptService.this;
-        }
-    }
-
-    // ------------------------------------------------------------------------------------------------------
-
-    @Override
-    public void onDestroy() {
-        Log.d(TAG, "onDestroy");
-
-        if (mProxy != null) {
-            mProxy.shutdown();
-        }
-
-        super.onDestroy();
-    }
-
-    // ------------------------------------------------------------------------------------------------------
-
-    public QPyScriptService() {
-//		super(NOTIFICATION_ID);
-        super();
-
-        mBinder = new LocalBinder();
-    }
-
-    // ------------------------------------------------------------------------------------------------------
-
-    @Override
-    public IBinder onBind(Intent intent) {
-        return mBinder;
-    }
-
-    // ------------------------------------------------------------------------------------------------------
-
-    public static Context getAppContext() {
-        return QPyScriptService.context;
-    }
-
-    // ------------------------------------------------------------------------------------------------------
-
-    @Override
-    public void onCreate() {
-        Log.d(TAG, "onCreate");
-        super.onCreate();
-        QPyScriptService.context = getApplicationContext();
-
-        // clear before run
-        /*File logFile = new File( Environment.getExternalStorageDirectory()+"/"+CONF.BASE_PATH+"/"+scriptName.substring(scriptName.lastIndexOf("/")+1)+".log" );
-        if (logFile.exists()) {
-        	logFile.delete();
-        }
-		killProcess();	*/
-        // River Modify
-        instance = this;
-        this.killMe = false;
-
-        new startMyAsyncTask().execute(101);
-    }
-
-    // ------------------------------------------------------------------------------------------------------
-
-    @SuppressWarnings("deprecation")
-    @Override
-    public void onStart(Intent intent, final int startId) {
-        super.onStart(intent, startId);
-    }
-
-    // ------------------------------------------------------------------------------------------------------
-
-    public class startMyAsyncTask extends AsyncTask<Integer, Integer, Boolean> {
-        @Override
-        protected void onPreExecute() {
-        }
-
-        @Override
-        protected Boolean doInBackground(Integer... params) {
-            Log.d(TAG, "doInBackground");
-            startMyMain(params[0]);
-            return true;
-        }
-
-        @Override
-        protected void onProgressUpdate(Integer... values) {
-        }
-
-        @Override
-        protected void onPostExecute(Boolean installStatus) {
-            Log.d(TAG, "startMyAsyncTask:onPostExecute");
-        }
-    }
-
-    // ------------------------------------------------------------------------------------------------------
-
-    private void startMyMain(final int startId) {
-        try {
-            mProxy = new AndroidProxy(this, null, true);
-
-            mProxy.startLocal();
-            SPFUtils.setSP(getAppContext(), "sl4a.hostname", mProxy.getAddress().getHostName());
-            SPFUtils.setSP(getAppContext(), "sl4a.port", "" + mProxy.getAddress().getPort());
-            SPFUtils.setSP(getAppContext(), "sl4a.secue", mProxy.getSecret());
-
-            Log.d(TAG, "startMyMain:" + mProxy.getAddress().getHostName() + ":" + mProxy.getAddress().getPort() + ":" + mProxy.getSecret());
-            mLatch.countDown();
-        } catch (Exception e) {
-
-        }
-    }
-
-    // ------------------------------------------------------------------------------------------------------
-
-    RpcReceiverManager getRpcReceiverManager() throws InterruptedException {
-        mLatch.await();
-
-        if (mFacadeManager == null) { // Facade manage may not be available on startup.
-            mFacadeManager = mProxy.getRpcReceiverManagerFactory()
-                    .getRpcReceiverManagers().get(0);
-        }
-        return mFacadeManager;
-    }
-
-    public void updateNotify(Message msg) {
-        updatePositionHandler.sendMessage(msg);
-    }
-
-    @SuppressLint("HandlerLeak")
-    private Handler updatePositionHandler = new Handler() {
-        @Override
-        public void handleMessage(Message msg) {
-            @SuppressWarnings("unused")
-            String file = (String) msg.obj;
-            //updateNotification(msg.what, file);
-        }
-    };
-
-    public static String getSP(Context context, String key)	{
-        String val;
-        SharedPreferences obj = context.getSharedPreferences("qsl4a_db",0);
-        val = obj.getString(key,"");
-        return val;
-    }
-    public static void setSP(Context context, String key,String val) {
-        SharedPreferences obj = context.getSharedPreferences("qsl4a_db",0);
-        SharedPreferences.Editor wobj;
-        wobj = obj.edit();
-        wobj.putString(key, val);
-        wobj.commit();
-    }
-}
\ No newline at end of file
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/QSL4APP.java b/qpysl4a/src/main/java/org/qpython/qsl4a/QSL4APP.java
deleted file mode 100644
index 30931a88..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/QSL4APP.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package org.qpython.qsl4a;
-
-import android.app.Activity;
-import android.app.Application;
-
-import org.qpython.qsl4a.qsl4a.FutureActivityTaskExecutor;
-import org.qpython.qsl4a.qsl4a.Log;
-import org.qpython.qsl4a.qsl4a.interpreter.InterpreterConfiguration;
-import org.qpython.qsl4a.qsl4a.interpreter.InterpreterConstants;
-import org.qpython.qsl4a.qsl4a.trigger.TriggerRepository;
-
-import java.util.Map;
-import java.util.concurrent.CountDownLatch;
-
-
-public class QSL4APP extends Application implements InterpreterConfiguration.ConfigurationObserver {
-
-    Map<String, Integer> movieDirs = null;
-
-    @Override
-    public void onCreate() {
-        super.onCreate();
-
-        mConfiguration = new InterpreterConfiguration(this);
-        mConfiguration.registerObserver(this);
-        mConfiguration.startDiscovering(InterpreterConstants.MIME + QSL4AScript.getFileExtension(this));
-
-        //注册crashHandler类
-        int xq = 30;
-    }  
-
-	
-    /*@Override
-    public Class<?> getHomeActivityClass() {
-    }*/
-//
-//    @Override
-//    public Intent getMainApplicationIntent() {
-//    	return null;
-//        //return new Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.app_url)));
-//    }
-
-
-    private volatile boolean receivedConfigUpdate = false;
-    private final CountDownLatch mLatch = new CountDownLatch(1);
-
-    private final FutureActivityTaskExecutor mTaskExecutor = new FutureActivityTaskExecutor(this);
-    private TriggerRepository mTriggerRepository;
-
-    protected InterpreterConfiguration mConfiguration;
-
-    public FutureActivityTaskExecutor getTaskExecutor() {
-        return mTaskExecutor;
-    }
-
-
-    public InterpreterConfiguration getInterpreterConfiguration() {
-        return mConfiguration;
-    }
-
-    public TriggerRepository getTriggerRepository() {
-        return mTriggerRepository;
-    }
-
-
-    @Override
-    public void onConfigurationChanged() {
-        receivedConfigUpdate = true;
-        mLatch.countDown();
-    }
-
-    public boolean readyToStart() {
-        try {
-            mLatch.await();
-        } catch (InterruptedException e) {
-            Log.e(e);
-        }
-        return receivedConfigUpdate;
-    }
-
-
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/QSL4AScript.java b/qpysl4a/src/main/java/org/qpython/qsl4a/QSL4AScript.java
deleted file mode 100644
index 7b9a96c1..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/QSL4AScript.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.qpython.qsl4a;
-
-import android.content.Context;
-
-public class QSL4AScript {
-
-//  public final static int ID = R.raw.pymain;
-
-  public static String sFileName;
-
-  public static String getFileName(Context context) {
-//    if (sFileName == null) {
-//      Resources resources = context.getResources();
-//      String name = resources.getText(ID).toString();
-//      sFileName = name.substring(name.lastIndexOf('/') + 1, name.length());
-//    }
-    sFileName = "main.py";
-    return sFileName;
-  }
-
-  public static String getFileExtension(Context context) {
-    if (sFileName == null) {
-      getFileName(context);
-    }
-    int dotIndex = sFileName.lastIndexOf('.');
-    if (dotIndex == -1) {
-      return null;
-    }
-    return sFileName.substring(dotIndex);
-  }
-
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/codec/Base64Codec.java b/qpysl4a/src/main/java/org/qpython/qsl4a/codec/Base64Codec.java
deleted file mode 100644
index badf8ba1..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/codec/Base64Codec.java
+++ /dev/null
@@ -1,1050 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You 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.
- */
-
-package org.qpython.qsl4a.codec;
-
-import java.math.BigInteger;
-
-/**
- * Provides Base64 encoding and decoding as defined by RFC 2045.
- * 
- * <p>
- * This class implements section <cite>6.8. Base64 Content-Transfer-Encoding</cite> from RFC 2045 <cite>Multipurpose
- * Internet Mail Extensions (MIME) Part One: Format of Internet Message Bodies</cite> by Freed and Borenstein.
- * </p>
- * <p>
- * The class can be parameterized in the following manner with various constructors:
- * <ul>
- * <li>URL-safe mode: Default off.</li>
- * <li>Line length: Default 76. Line length that aren't multiples of 4 will still essentially end up being multiples of
- * 4 in the encoded data.
- * <li>Line separator: Default is CRLF ("\r\n")</li>
- * </ul>
- * </p>
- * <p>
- * Since this class operates directly on byte streams, and not character streams, it is hard-coded to only encode/decode
- * character encodings which are compatible with the lower 127 ASCII chart (ISO-8859-1, Windows-1252, UTF-8, etc).
- * </p>
- * 
- * @see <a href="http://www.ietf.org/rfc/rfc2045.txt">RFC 2045</a>
- * @author Apache Software Foundation
- * @since 1.0
- * @version $Id: Base64.java 801706 2009-08-06 16:27:06Z niallp $
- */
-public class Base64Codec implements BinaryEncoder, BinaryDecoder {
-    private static final int DEFAULT_BUFFER_RESIZE_FACTOR = 2;
-
-    private static final int DEFAULT_BUFFER_SIZE = 8192;
-
-    /**
-     * Chunk size per RFC 2045 section 6.8.
-     * 
-     * <p>
-     * The {@value} character limit does not count the trailing CRLF, but counts all other characters, including any
-     * equal signs.
-     * </p>
-     * 
-     * @see <a href="http://www.ietf.org/rfc/rfc2045.txt">RFC 2045 section 6.8</a>
-     */
-    static final int CHUNK_SIZE = 76;
-
-    /**
-     * Chunk separator per RFC 2045 section 2.1.
-     *
-     * <p>
-     * N.B. The next major release may break compatibility and make this field private.
-     * </p>
-     * 
-     * @see <a href="http://www.ietf.org/rfc/rfc2045.txt">RFC 2045 section 2.1</a>
-     */
-    static final byte[] CHUNK_SEPARATOR = {'\r', '\n'};
-
-    /**
-     * This array is a lookup table that translates 6-bit positive integer index values into their "Base64 Alphabet"
-     * equivalents as specified in Table 1 of RFC 2045.
-     * 
-     * Thanks to "commons" project in ws.apache.org for this code.
-     * http://svn.apache.org/repos/asf/webservices/commons/trunk/modules/util/
-     */
-    private static final byte[] STANDARD_ENCODE_TABLE = {
-            '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',
-            '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', '+', '/'
-    };
-
-    /**
-     * This is a copy of the STANDARD_ENCODE_TABLE above, but with + and /
-     * changed to - and _ to make the encoded Base64 results more URL-SAFE.
-     * This table is only used when the Base64's mode is set to URL-SAFE.
-     */    
-    private static final byte[] URL_SAFE_ENCODE_TABLE = {
-            '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',
-            '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', '-', '_'
-    };
-
-    /**
-     * Byte used to pad output.
-     */
-    private static final byte PAD = '=';
-
-    /**
-     * This array is a lookup table that translates Unicode characters drawn from the "Base64 Alphabet" (as specified in
-     * Table 1 of RFC 2045) into their 6-bit positive integer equivalents. Characters that are not in the Base64
-     * alphabet but fall within the bounds of the array are translated to -1.
-     * 
-     * Note: '+' and '-' both decode to 62. '/' and '_' both decode to 63. This means decoder seamlessly handles both
-     * URL_SAFE and STANDARD base64. (The encoder, on the other hand, needs to know ahead of time what to emit).
-     * 
-     * Thanks to "commons" project in ws.apache.org for this code.
-     * http://svn.apache.org/repos/asf/webservices/commons/trunk/modules/util/
-     */
-    private static final byte[] DECODE_TABLE = {
-            -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-            -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-            -1, -1, -1, -1, -1, -1, -1, -1, -1, 62, -1, 62, -1, 63, 52, 53, 54,
-            55, 56, 57, 58, 59, 60, 61, -1, -1, -1, -1, -1, -1, -1, 0, 1, 2, 3, 4,
-            5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23,
-            24, 25, -1, -1, -1, -1, 63, -1, 26, 27, 28, 29, 30, 31, 32, 33, 34,
-            35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51
-    };
-
-    /** Mask used to extract 6 bits, used when encoding */
-    private static final int MASK_6BITS = 0x3f;
-
-    /** Mask used to extract 8 bits, used in decoding base64 bytes */
-    private static final int MASK_8BITS = 0xff;
-
-    // The static final fields above are used for the original static byte[] methods on Base64.
-    // The private member fields below are used with the new streaming approach, which requires
-    // some state be preserved between calls of encode() and decode().
-
-    /**
-     * Encode table to use: either STANDARD or URL_SAFE. Note: the DECODE_TABLE above remains static because it is able
-     * to decode both STANDARD and URL_SAFE streams, but the encodeTable must be a member variable so we can switch
-     * between the two modes.
-     */
-    private final byte[] encodeTable;
-
-    /**
-     * Line length for encoding. Not used when decoding. A value of zero or less implies no chunking of the base64
-     * encoded data.
-     */
-    private final int lineLength;
-
-    /**
-     * Line separator for encoding. Not used when decoding. Only used if lineLength > 0.
-     */
-    private final byte[] lineSeparator;
-
-    /**
-     * Convenience variable to help us determine when our buffer is going to run out of room and needs resizing.
-     * <code>decodeSize = 3 + lineSeparator.length;</code>
-     */
-    private final int decodeSize;
-
-    /**
-     * Convenience variable to help us determine when our buffer is going to run out of room and needs resizing.
-     * <code>encodeSize = 4 + lineSeparator.length;</code>
-     */
-    private final int encodeSize;
-
-    /**
-     * Buffer for streaming.
-     */
-    private byte[] buffer;
-
-    /**
-     * Position where next character should be written in the buffer.
-     */
-    private int pos;
-
-    /**
-     * Position where next character should be read from the buffer.
-     */
-    private int readPos;
-
-    /**
-     * Variable tracks how many characters have been written to the current line. Only used when encoding. We use it to
-     * make sure each encoded line never goes beyond lineLength (if lineLength > 0).
-     */
-    private int currentLinePos;
-
-    /**
-     * Writes to the buffer only occur after every 3 reads when encoding, an every 4 reads when decoding. This variable
-     * helps track that.
-     */
-    private int modulus;
-
-    /**
-     * Boolean flag to indicate the EOF has been reached. Once EOF has been reached, this Base64 object becomes useless,
-     * and must be thrown away.
-     */
-    private boolean eof;
-
-    /**
-     * Place holder for the 3 bytes we're dealing with for our base64 logic. Bitwise operations store and extract the
-     * base64 encoding or decoding from this variable.
-     */
-    private int x;
-
-    /**
-     * Creates a Base64 codec used for decoding (all modes) and encoding in URL-unsafe mode.
-     * <p>
-     * When encoding the line length is 76, the line separator is CRLF, and the encoding table is STANDARD_ENCODE_TABLE.
-     * </p>
-     * 
-     * <p>
-     * When decoding all variants are supported.
-     * </p>
-     */
-    public Base64Codec() {
-        this(false);
-    }
-
-    /**
-     * Creates a Base64 codec used for decoding (all modes) and encoding in the given URL-safe mode.
-     * <p>
-     * When encoding the line length is 76, the line separator is CRLF, and the encoding table is STANDARD_ENCODE_TABLE.
-     * </p>
-     * 
-     * <p>
-     * When decoding all variants are supported.
-     * </p>
-     * 
-     * @param urlSafe
-     *            if <code>true</code>, URL-safe encoding is used. In most cases this should be set to
-     *            <code>false</code>.
-     * @since 1.4
-     */
-    public Base64Codec(boolean urlSafe) {
-        this(CHUNK_SIZE, CHUNK_SEPARATOR, urlSafe);
-    }
-
-    /**
-     * Creates a Base64 codec used for decoding (all modes) and encoding in URL-unsafe mode.
-     * <p>
-     * When encoding the line length is given in the constructor, the line separator is CRLF, and the encoding table is
-     * STANDARD_ENCODE_TABLE.
-     * </p>
-     * <p>
-     * Line lengths that aren't multiples of 4 will still essentially end up being multiples of 4 in the encoded data.
-     * </p>
-     * <p>
-     * When decoding all variants are supported.
-     * </p>
-     * 
-     * @param lineLength
-     *            Each line of encoded data will be at most of the given length (rounded down to nearest multiple of 4).
-     *            If lineLength <= 0, then the output will not be divided into lines (chunks). Ignored when decoding.
-     * @since 1.4
-     */
-    public Base64Codec(int lineLength) {
-        this(lineLength, CHUNK_SEPARATOR);
-    }
-
-    /**
-     * Creates a Base64 codec used for decoding (all modes) and encoding in URL-unsafe mode.
-     * <p>
-     * When encoding the line length and line separator are given in the constructor, and the encoding table is
-     * STANDARD_ENCODE_TABLE.
-     * </p>
-     * <p>
-     * Line lengths that aren't multiples of 4 will still essentially end up being multiples of 4 in the encoded data.
-     * </p>
-     * <p>
-     * When decoding all variants are supported.
-     * </p>
-     * 
-     * @param lineLength
-     *            Each line of encoded data will be at most of the given length (rounded down to nearest multiple of 4).
-     *            If lineLength <= 0, then the output will not be divided into lines (chunks). Ignored when decoding.
-     * @param lineSeparator
-     *            Each line of encoded data will end with this sequence of bytes.
-     * @throws IllegalArgumentException
-     *             Thrown when the provided lineSeparator included some base64 characters.
-     * @since 1.4
-     */
-    public Base64Codec(int lineLength, byte[] lineSeparator) {
-        this(lineLength, lineSeparator, false);
-    }
-
-    /**
-     * Creates a Base64 codec used for decoding (all modes) and encoding in URL-unsafe mode.
-     * <p>
-     * When encoding the line length and line separator are given in the constructor, and the encoding table is
-     * STANDARD_ENCODE_TABLE.
-     * </p>
-     * <p>
-     * Line lengths that aren't multiples of 4 will still essentially end up being multiples of 4 in the encoded data.
-     * </p>
-     * <p>
-     * When decoding all variants are supported.
-     * </p>
-     * 
-     * @param lineLength
-     *            Each line of encoded data will be at most of the given length (rounded down to nearest multiple of 4).
-     *            If lineLength <= 0, then the output will not be divided into lines (chunks). Ignored when decoding.
-     * @param lineSeparator
-     *            Each line of encoded data will end with this sequence of bytes.
-     * @param urlSafe
-     *            Instead of emitting '+' and '/' we emit '-' and '_' respectively. urlSafe is only applied to encode
-     *            operations. Decoding seamlessly handles both modes.
-     * @throws IllegalArgumentException
-     *             The provided lineSeparator included some base64 characters. That's not going to work!
-     * @since 1.4
-     */
-    public Base64Codec(int lineLength, byte[] lineSeparator, boolean urlSafe) {
-        if (lineSeparator == null) {
-            lineLength = 0;  // disable chunk-separating
-            lineSeparator = CHUNK_SEPARATOR;  // this just gets ignored
-        }
-        this.lineLength = lineLength > 0 ? (lineLength / 4) * 4 : 0;
-        this.lineSeparator = new byte[lineSeparator.length];
-        System.arraycopy(lineSeparator, 0, this.lineSeparator, 0, lineSeparator.length);
-        if (lineLength > 0) {
-            this.encodeSize = 4 + lineSeparator.length;
-        } else {
-            this.encodeSize = 4;
-        }
-        this.decodeSize = this.encodeSize - 1;
-        if (containsBase64Byte(lineSeparator)) {
-            String sep = StringUtils.newStringUtf8(lineSeparator);
-            throw new IllegalArgumentException("lineSeperator must not contain base64 characters: [" + sep + "]");
-        }
-        this.encodeTable = urlSafe ? URL_SAFE_ENCODE_TABLE : STANDARD_ENCODE_TABLE;
-    }
-
-    /**
-     * Returns our current encode mode. True if we're URL-SAFE, false otherwise.
-     * 
-     * @return true if we're in URL-SAFE mode, false otherwise.
-     * @since 1.4
-     */
-    public boolean isUrlSafe() {
-        return this.encodeTable == URL_SAFE_ENCODE_TABLE;
-    }
-
-    /**
-     * Returns true if this Base64 object has buffered data for reading.
-     * 
-     * @return true if there is Base64 object still available for reading.
-     */
-    boolean hasData() {
-        return this.buffer != null;
-    }
-
-    /**
-     * Returns the amount of buffered data available for reading.
-     * 
-     * @return The amount of buffered data available for reading.
-     */
-    int avail() {
-        return buffer != null ? pos - readPos : 0;
-    }
-
-    /** Doubles our buffer. */
-    private void resizeBuffer() {
-        if (buffer == null) {
-            buffer = new byte[DEFAULT_BUFFER_SIZE];
-            pos = 0;
-            readPos = 0;
-        } else {
-            byte[] b = new byte[buffer.length * DEFAULT_BUFFER_RESIZE_FACTOR];
-            System.arraycopy(buffer, 0, b, 0, buffer.length);
-            buffer = b;
-        }
-    }
-
-    /**
-     * Extracts buffered data into the provided byte[] array, starting at position bPos, up to a maximum of bAvail
-     * bytes. Returns how many bytes were actually extracted.
-     * 
-     * @param b
-     *            byte[] array to extract the buffered data into.
-     * @param bPos
-     *            position in byte[] array to start extraction at.
-     * @param bAvail
-     *            amount of bytes we're allowed to extract. We may extract fewer (if fewer are available).
-     * @return The number of bytes successfully extracted into the provided byte[] array.
-     */
-    int readResults(byte[] b, int bPos, int bAvail) {
-        if (buffer != null) {
-            int len = Math.min(avail(), bAvail);
-            if (buffer != b) {
-                System.arraycopy(buffer, readPos, b, bPos, len);
-                readPos += len;
-                if (readPos >= pos) {
-                    buffer = null;
-                }
-            } else {
-                // Re-using the original consumer's output array is only
-                // allowed for one round.
-                buffer = null;
-            }
-            return len;
-        }
-        return eof ? -1 : 0;
-    }
-
-    /**
-     * Sets the streaming buffer. This is a small optimization where we try to buffer directly to the consumer's output
-     * array for one round (if the consumer calls this method first) instead of starting our own buffer.
-     * 
-     * @param out
-     *            byte[] array to buffer directly to.
-     * @param outPos
-     *            Position to start buffering into.
-     * @param outAvail
-     *            Amount of bytes available for direct buffering.
-     */
-    void setInitialBuffer(byte[] out, int outPos, int outAvail) {
-        // We can re-use consumer's original output array under
-        // special circumstances, saving on some System.arraycopy().
-        if (out != null && out.length == outAvail) {
-            buffer = out;
-            pos = outPos;
-            readPos = outPos;
-        }
-    }
-
-    /**
-     * <p>
-     * Encodes all of the provided data, starting at inPos, for inAvail bytes. Must be called at least twice: once with
-     * the data to encode, and once with inAvail set to "-1" to alert encoder that EOF has been reached, so flush last
-     * remaining bytes (if not multiple of 3).
-     * </p>
-     * <p>
-     * Thanks to "commons" project in ws.apache.org for the bitwise operations, and general approach.
-     * http://svn.apache.org/repos/asf/webservices/commons/trunk/modules/util/
-     * </p>
-     * 
-     * @param in
-     *            byte[] array of binary data to base64 encode.
-     * @param inPos
-     *            Position to start reading data from.
-     * @param inAvail
-     *            Amount of bytes available from input for encoding.
-     */
-    void encode(byte[] in, int inPos, int inAvail) {
-        if (eof) {
-            return;
-        }
-        // inAvail < 0 is how we're informed of EOF in the underlying data we're
-        // encoding.
-        if (inAvail < 0) {
-            eof = true;
-            if (buffer == null || buffer.length - pos < encodeSize) {
-                resizeBuffer();
-            }
-            switch (modulus) {
-                case 1 :
-                    buffer[pos++] = encodeTable[(x >> 2) & MASK_6BITS];
-                    buffer[pos++] = encodeTable[(x << 4) & MASK_6BITS];
-                    // URL-SAFE skips the padding to further reduce size.
-                    if (encodeTable == STANDARD_ENCODE_TABLE) {
-                        buffer[pos++] = PAD;
-                        buffer[pos++] = PAD;
-                    }
-                    break;
-
-                case 2 :
-                    buffer[pos++] = encodeTable[(x >> 10) & MASK_6BITS];
-                    buffer[pos++] = encodeTable[(x >> 4) & MASK_6BITS];
-                    buffer[pos++] = encodeTable[(x << 2) & MASK_6BITS];
-                    // URL-SAFE skips the padding to further reduce size.
-                    if (encodeTable == STANDARD_ENCODE_TABLE) {
-                        buffer[pos++] = PAD;
-                    }
-                    break;
-            }
-            if (lineLength > 0 && pos > 0) {
-                System.arraycopy(lineSeparator, 0, buffer, pos, lineSeparator.length);
-                pos += lineSeparator.length;
-            }
-        } else {
-            for (int i = 0; i < inAvail; i++) {
-                if (buffer == null || buffer.length - pos < encodeSize) {
-                    resizeBuffer();
-                }
-                modulus = (++modulus) % 3;
-                int b = in[inPos++];
-                if (b < 0) {
-                    b += 256;
-                }
-                x = (x << 8) + b;
-                if (0 == modulus) {
-                    buffer[pos++] = encodeTable[(x >> 18) & MASK_6BITS];
-                    buffer[pos++] = encodeTable[(x >> 12) & MASK_6BITS];
-                    buffer[pos++] = encodeTable[(x >> 6) & MASK_6BITS];
-                    buffer[pos++] = encodeTable[x & MASK_6BITS];
-                    currentLinePos += 4;
-                    if (lineLength > 0 && lineLength <= currentLinePos) {
-                        System.arraycopy(lineSeparator, 0, buffer, pos, lineSeparator.length);
-                        pos += lineSeparator.length;
-                        currentLinePos = 0;
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * <p>
-     * Decodes all of the provided data, starting at inPos, for inAvail bytes. Should be called at least twice: once
-     * with the data to decode, and once with inAvail set to "-1" to alert decoder that EOF has been reached. The "-1"
-     * call is not necessary when decoding, but it doesn't hurt, either.
-     * </p>
-     * <p>
-     * Ignores all non-base64 characters. This is how chunked (e.g. 76 character) data is handled, since CR and LF are
-     * silently ignored, but has implications for other bytes, too. This method subscribes to the garbage-in,
-     * garbage-out philosophy: it will not check the provided data for validity.
-     * </p>
-     * <p>
-     * Thanks to "commons" project in ws.apache.org for the bitwise operations, and general approach.
-     * http://svn.apache.org/repos/asf/webservices/commons/trunk/modules/util/
-     * </p>
-     * 
-     * @param in
-     *            byte[] array of ascii data to base64 decode.
-     * @param inPos
-     *            Position to start reading data from.
-     * @param inAvail
-     *            Amount of bytes available from input for encoding.
-     */
-    void decode(byte[] in, int inPos, int inAvail) {
-        if (eof) {
-            return;
-        }
-        if (inAvail < 0) {
-            eof = true;
-        }
-        for (int i = 0; i < inAvail; i++) {
-            if (buffer == null || buffer.length - pos < decodeSize) {
-                resizeBuffer();
-            }
-            byte b = in[inPos++];
-            if (b == PAD) {
-                // We're done.
-                eof = true;
-                break;
-            } else {
-                if (b >= 0 && b < DECODE_TABLE.length) {
-                    int result = DECODE_TABLE[b];
-                    if (result >= 0) {
-                        modulus = (++modulus) % 4;
-                        x = (x << 6) + result;
-                        if (modulus == 0) {
-                            buffer[pos++] = (byte) ((x >> 16) & MASK_8BITS);
-                            buffer[pos++] = (byte) ((x >> 8) & MASK_8BITS);
-                            buffer[pos++] = (byte) (x & MASK_8BITS);
-                        }
-                    }
-                }
-            }
-        }
-
-        // Two forms of EOF as far as base64 decoder is concerned: actual
-        // EOF (-1) and first time '=' character is encountered in stream.
-        // This approach makes the '=' padding characters completely optional.
-        if (eof && modulus != 0) {
-            x = x << 6;
-            switch (modulus) {
-                case 2 :
-                    x = x << 6;
-                    buffer[pos++] = (byte) ((x >> 16) & MASK_8BITS);
-                    break;
-                case 3 :
-                    buffer[pos++] = (byte) ((x >> 16) & MASK_8BITS);
-                    buffer[pos++] = (byte) ((x >> 8) & MASK_8BITS);
-                    break;
-            }
-        }
-    }
-
-    /**
-     * Returns whether or not the <code>octet</code> is in the base 64 alphabet.
-     * 
-     * @param octet
-     *            The value to test
-     * @return <code>true</code> if the value is defined in the the base 64 alphabet, <code>false</code> otherwise.
-     * @since 1.4
-     */
-    public static boolean isBase64(byte octet) {
-        return octet == PAD || (octet >= 0 && octet < DECODE_TABLE.length && DECODE_TABLE[octet] != -1);
-    }
-
-    /**
-     * Tests a given byte array to see if it contains only valid characters within the Base64 alphabet. Currently the
-     * method treats whitespace as valid.
-     * 
-     * @param arrayOctet
-     *            byte array to test
-     * @return <code>true</code> if all bytes are valid characters in the Base64 alphabet or if the byte array is empty;
-     *         false, otherwise
-     */
-    public static boolean isArrayByteBase64(byte[] arrayOctet) {
-        for (int i = 0; i < arrayOctet.length; i++) {
-            if (!isBase64(arrayOctet[i]) && !isWhiteSpace(arrayOctet[i])) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Tests a given byte array to see if it contains only valid characters within the Base64 alphabet.
-     * 
-     * @param arrayOctet
-     *            byte array to test
-     * @return <code>true</code> if any byte is a valid character in the Base64 alphabet; false herwise
-     */
-    private static boolean containsBase64Byte(byte[] arrayOctet) {
-        for (int i = 0; i < arrayOctet.length; i++) {
-            if (isBase64(arrayOctet[i])) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Encodes binary data using the base64 algorithm but does not chunk the output.
-     * 
-     * @param binaryData
-     *            binary data to encode
-     * @return byte[] containing Base64 characters in their UTF-8 representation.
-     */
-    public static byte[] encodeBase64(byte[] binaryData) {
-        return encodeBase64(binaryData, false);
-    }
-
-    /**
-     * Encodes binary data using the base64 algorithm into 76 character blocks separated by CRLF.
-     *
-     * @param binaryData
-     *            binary data to encode
-     * @return String containing Base64 characters.
-     * @since 1.4
-     */    
-    public static String encodeBase64String(byte[] binaryData) {
-        return StringUtils.newStringUtf8(encodeBase64(binaryData, true));
-    }
-    
-    /**
-     * Encodes binary data using a URL-safe variation of the base64 algorithm but does not chunk the output. The
-     * url-safe variation emits - and _ instead of + and / characters.
-     * 
-     * @param binaryData
-     *            binary data to encode
-     * @return byte[] containing Base64 characters in their UTF-8 representation.
-     * @since 1.4
-     */
-    public static byte[] encodeBase64URLSafe(byte[] binaryData) {
-        return encodeBase64(binaryData, false, true);
-    }
-
-    /**
-     * Encodes binary data using a URL-safe variation of the base64 algorithm but does not chunk the output. The
-     * url-safe variation emits - and _ instead of + and / characters.
-     *
-     * @param binaryData
-     *            binary data to encode
-     * @return String containing Base64 characters
-     * @since 1.4
-     */    
-    public static String encodeBase64URLSafeString(byte[] binaryData) {
-        return StringUtils.newStringUtf8(encodeBase64(binaryData, false, true));
-    }    
-
-    /**
-     * Encodes binary data using the base64 algorithm and chunks the encoded output into 76 character blocks
-     * 
-     * @param binaryData
-     *            binary data to encode
-     * @return Base64 characters chunked in 76 character blocks
-     */
-    public static byte[] encodeBase64Chunked(byte[] binaryData) {
-        return encodeBase64(binaryData, true);
-    }
-
-    /**
-     * Decodes an Object using the base64 algorithm. This method is provided in order to satisfy the requirements of the
-     * Decoder interface, and will throw a DecoderException if the supplied object is not of type byte[] or String.
-     * 
-     * @param pObject
-     *            Object to decode
-     * @return An object (of type byte[]) containing the binary data which corresponds to the byte[] or String supplied.
-     * @throws DecoderException
-     *             if the parameter supplied is not of type byte[]
-     */
-    public Object decode(Object pObject) throws DecoderException {        
-        if (pObject instanceof byte[]) {
-            return decode((byte[]) pObject);
-        } else if (pObject instanceof String) {
-            return decode((String) pObject);
-        } else {
-            throw new DecoderException("Parameter supplied to Base64 decode is not a byte[] or a String");
-        }
-    }
-
-    /**
-     * Decodes a String containing containing characters in the Base64 alphabet.
-     *
-     * @param pArray
-     *            A String containing Base64 character data
-     * @return a byte array containing binary data
-     * @since 1.4
-     */
-    public byte[] decode(String pArray) {
-        return decode(StringUtils.getBytesUtf8(pArray));
-    }
-
-    /**
-     * Decodes a byte[] containing containing characters in the Base64 alphabet.
-     * 
-     * @param pArray
-     *            A byte array containing Base64 character data
-     * @return a byte array containing binary data
-     */
-    public byte[] decode(byte[] pArray) {
-        reset();
-        if (pArray == null || pArray.length == 0) {
-            return pArray;
-        }
-        long len = (pArray.length * 3) / 4;
-        byte[] buf = new byte[(int) len];
-        setInitialBuffer(buf, 0, buf.length);
-        decode(pArray, 0, pArray.length);
-        decode(pArray, 0, -1); // Notify decoder of EOF.
-
-        // Would be nice to just return buf (like we sometimes do in the encode
-        // logic), but we have no idea what the line-length was (could even be
-        // variable).  So we cannot determine ahead of time exactly how big an
-        // array is necessary.  Hence the need to construct a 2nd byte array to
-        // hold the final result:
-
-        byte[] result = new byte[pos];
-        readResults(result, 0, result.length);
-        return result;
-    }
-
-    /**
-     * Encodes binary data using the base64 algorithm, optionally chunking the output into 76 character blocks.
-     * 
-     * @param binaryData
-     *            Array containing binary data to encode.
-     * @param isChunked
-     *            if <code>true</code> this encoder will chunk the base64 output into 76 character blocks
-     * @return Base64-encoded data.
-     * @throws IllegalArgumentException
-     *             Thrown when the input array needs an output array bigger than {@link Integer#MAX_VALUE}
-     */
-    public static byte[] encodeBase64(byte[] binaryData, boolean isChunked) {
-        return encodeBase64(binaryData, isChunked, false);
-    }
-
-    /**
-     * Encodes binary data using the base64 algorithm, optionally chunking the output into 76 character blocks.
-     * 
-     * @param binaryData
-     *            Array containing binary data to encode.
-     * @param isChunked
-     *            if <code>true</code> this encoder will chunk the base64 output into 76 character blocks
-     * @param urlSafe
-     *            if <code>true</code> this encoder will emit - and _ instead of the usual + and / characters.
-     * @return Base64-encoded data.
-     * @throws IllegalArgumentException
-     *             Thrown when the input array needs an output array bigger than {@link Integer#MAX_VALUE}
-     * @since 1.4
-     */
-    public static byte[] encodeBase64(byte[] binaryData, boolean isChunked, boolean urlSafe) {
-        return encodeBase64(binaryData, isChunked, urlSafe, Integer.MAX_VALUE);
-    }
-
-    /**
-     * Encodes binary data using the base64 algorithm, optionally chunking the output into 76 character blocks.
-     * 
-     * @param binaryData
-     *            Array containing binary data to encode.
-     * @param isChunked
-     *            if <code>true</code> this encoder will chunk the base64 output into 76 character blocks
-     * @param urlSafe
-     *            if <code>true</code> this encoder will emit - and _ instead of the usual + and / characters.
-     * @param maxResultSize
-     *            The maximum result size to accept.
-     * @return Base64-encoded data.
-     * @throws IllegalArgumentException
-     *             Thrown when the input array needs an output array bigger than maxResultSize
-     * @since 1.4
-     */
-    public static byte[] encodeBase64(byte[] binaryData, boolean isChunked, boolean urlSafe, int maxResultSize) {
-        if (binaryData == null || binaryData.length == 0) {
-            return binaryData;
-        }
-
-        long len = getEncodeLength(binaryData, CHUNK_SIZE, CHUNK_SEPARATOR);
-        if (len > maxResultSize) {
-            throw new IllegalArgumentException("Input array too big, the output array would be bigger (" +
-                len +
-                ") than the specified maxium size of " +
-                maxResultSize);
-        }
-                
-        Base64Codec b64 = isChunked ? new Base64Codec(urlSafe) : new Base64Codec(0, CHUNK_SEPARATOR, urlSafe);
-        return b64.encode(binaryData);
-    }
-
-    /**
-     * Decodes a Base64 String into octets
-     *
-     * @param base64String
-     *            String containing Base64 data
-     * @return Array containing decoded data.
-     * @since 1.4
-     */
-    public static byte[] decodeBase64(String base64String) {
-        return new Base64Codec().decode(base64String);
-    }
-
-    /**
-     * Decodes Base64 data into octets
-     * 
-     * @param base64Data
-     *            Byte array containing Base64 data
-     * @return Array containing decoded data.
-     */
-    public static byte[] decodeBase64(byte[] base64Data) {
-        return new Base64Codec().decode(base64Data);
-    }
-
-    /**
-     * Discards any whitespace from a base-64 encoded block.
-     * 
-     * @param data
-     *            The base-64 encoded data to discard the whitespace from.
-     * @return The data, less whitespace (see RFC 2045).
-     * @deprecated This method is no longer needed
-     */
-    static byte[] discardWhitespace(byte[] data) {
-        byte groomedData[] = new byte[data.length];
-        int bytesCopied = 0;
-        for (int i = 0; i < data.length; i++) {
-            switch (data[i]) {
-                case ' ' :
-                case '\n' :
-                case '\r' :
-                case '\t' :
-                    break;
-                default :
-                    groomedData[bytesCopied++] = data[i];
-            }
-        }
-        byte packedData[] = new byte[bytesCopied];
-        System.arraycopy(groomedData, 0, packedData, 0, bytesCopied);
-        return packedData;
-    }
-
-    /**
-     * Checks if a byte value is whitespace or not.
-     * 
-     * @param byteToCheck
-     *            the byte to check
-     * @return true if byte is whitespace, false otherwise
-     */
-    private static boolean isWhiteSpace(byte byteToCheck) {
-        switch (byteToCheck) {
-            case ' ' :
-            case '\n' :
-            case '\r' :
-            case '\t' :
-                return true;
-            default :
-                return false;
-        }
-    }
-
-    // Implementation of the Encoder Interface
-
-    /**
-     * Encodes an Object using the base64 algorithm. This method is provided in order to satisfy the requirements of the
-     * Encoder interface, and will throw an EncoderException if the supplied object is not of type byte[].
-     * 
-     * @param pObject
-     *            Object to encode
-     * @return An object (of type byte[]) containing the base64 encoded data which corresponds to the byte[] supplied.
-     * @throws EncoderException
-     *             if the parameter supplied is not of type byte[]
-     */
-    public Object encode(Object pObject) throws EncoderException {
-        if (!(pObject instanceof byte[])) {
-            throw new EncoderException("Parameter supplied to Base64 encode is not a byte[]");
-        }
-        return encode((byte[]) pObject);
-    }
-
-    /**
-     * Encodes a byte[] containing binary data, into a String containing characters in the Base64 alphabet.
-     *
-     * @param pArray
-     *            a byte array containing binary data
-     * @return A String containing only Base64 character data
-     * @since 1.4
-     */    
-    public String encodeToString(byte[] pArray) {
-        return StringUtils.newStringUtf8(encode(pArray));
-    }
-
-    /**
-     * Encodes a byte[] containing binary data, into a byte[] containing characters in the Base64 alphabet.
-     * 
-     * @param pArray
-     *            a byte array containing binary data
-     * @return A byte array containing only Base64 character data
-     */
-    public byte[] encode(byte[] pArray) {
-        reset();        
-        if (pArray == null || pArray.length == 0) {
-            return pArray;
-        }
-        long len = getEncodeLength(pArray, lineLength, lineSeparator);
-        byte[] buf = new byte[(int) len];
-        setInitialBuffer(buf, 0, buf.length);
-        encode(pArray, 0, pArray.length);
-        encode(pArray, 0, -1); // Notify encoder of EOF.
-        // Encoder might have resized, even though it was unnecessary.
-        if (buffer != buf) {
-            readResults(buf, 0, buf.length);
-        }
-        // In URL-SAFE mode we skip the padding characters, so sometimes our
-        // final length is a bit smaller.
-        if (isUrlSafe() && pos < buf.length) {
-            byte[] smallerBuf = new byte[pos];
-            System.arraycopy(buf, 0, smallerBuf, 0, pos);
-            buf = smallerBuf;
-        }
-        return buf;        
-    }
-
-    /**
-     * Pre-calculates the amount of space needed to base64-encode the supplied array.
-     *
-     * @param pArray byte[] array which will later be encoded
-     * @param chunkSize line-length of the output (<= 0 means no chunking) between each
-     *        chunkSeparator (e.g. CRLF).
-     * @param chunkSeparator the sequence of bytes used to separate chunks of output (e.g. CRLF).
-     *
-     * @return amount of space needed to encoded the supplied array.  Returns
-     *         a long since a max-len array will require Integer.MAX_VALUE + 33%.
-     */
-    private static long getEncodeLength(byte[] pArray, int chunkSize, byte[] chunkSeparator) {
-        // base64 always encodes to multiples of 4.
-        chunkSize = (chunkSize / 4) * 4;
-
-        long len = (pArray.length * 4) / 3;
-        long mod = len % 4;
-        if (mod != 0) {
-            len += 4 - mod;
-        }
-        if (chunkSize > 0) {
-            boolean lenChunksPerfectly = len % chunkSize == 0;
-            len += (len / chunkSize) * chunkSeparator.length;
-            if (!lenChunksPerfectly) {
-                len += chunkSeparator.length;
-            }
-        }
-        return len;
-    }
-
-    // Implementation of integer encoding used for crypto
-    /**
-     * Decodes a byte64-encoded integer according to crypto standards such as W3C's XML-Signature
-     * 
-     * @param pArray
-     *            a byte array containing base64 character data
-     * @return A BigInteger
-     * @since 1.4
-     */
-    public static BigInteger decodeInteger(byte[] pArray) {
-        return new BigInteger(1, decodeBase64(pArray));
-    }
-
-    /**
-     * Encodes to a byte64-encoded integer according to crypto standards such as W3C's XML-Signature
-     * 
-     * @param bigInt
-     *            a BigInteger
-     * @return A byte array containing base64 character data
-     * @throws NullPointerException
-     *             if null is passed in
-     * @since 1.4
-     */
-    public static byte[] encodeInteger(BigInteger bigInt) {
-        if (bigInt == null) {
-            throw new NullPointerException("encodeInteger called with null parameter");
-        }
-        return encodeBase64(toIntegerBytes(bigInt), false);
-    }
-
-    /**
-     * Returns a byte-array representation of a <code>BigInteger</code> without sign bit.
-     * 
-     * @param bigInt
-     *            <code>BigInteger</code> to be converted
-     * @return a byte array representation of the BigInteger parameter
-     */
-    static byte[] toIntegerBytes(BigInteger bigInt) {
-        int bitlen = bigInt.bitLength();
-        // round bitlen
-        bitlen = ((bitlen + 7) >> 3) << 3;
-        byte[] bigBytes = bigInt.toByteArray();
-
-        if (((bigInt.bitLength() % 8) != 0) && (((bigInt.bitLength() / 8) + 1) == (bitlen / 8))) {
-            return bigBytes;
-        }
-        // set up params for copying everything but sign bit
-        int startSrc = 0;
-        int len = bigBytes.length;
-
-        // if bigInt is exactly byte-aligned, just skip signbit in copy
-        if ((bigInt.bitLength() % 8) == 0) {
-            startSrc = 1;
-            len--;
-        }
-        int startDst = bitlen / 8 - len; // to pad w/ nulls as per spec
-        byte[] resizedBytes = new byte[bitlen / 8];
-        System.arraycopy(bigBytes, startSrc, resizedBytes, startDst, len);
-        return resizedBytes;
-    }
-
-    /**
-     * Resets this Base64 object to its initial newly constructed state.
-     */
-    private void reset() {
-        buffer = null;
-        pos = 0;
-        readPos = 0;
-        currentLinePos = 0;
-        modulus = 0;
-        eof = false;
-    }
-
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/codec/BinaryDecoder.java b/qpysl4a/src/main/java/org/qpython/qsl4a/codec/BinaryDecoder.java
deleted file mode 100644
index 2c3190a4..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/codec/BinaryDecoder.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You 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.
- */
-
-package org.qpython.qsl4a.codec;
-
-/**
- * Defines common decoding methods for byte array decoders.
- *
- * @author Apache Software Foundation
- * @version $Id: BinaryDecoder.java 651573 2008-04-25 11:11:21Z niallp $
- */
-public interface BinaryDecoder extends Decoder {
-
-    /**
-     * Decodes a byte array and returns the results as a byte array. 
-     *
-     * @param pArray A byte array which has been encoded with the
-     *      appropriate encoder
-     * 
-     * @return a byte array that contains decoded content
-     * 
-     * @throws DecoderException A decoder exception is thrown
-     *          if a Decoder encounters a failure condition during
-     *          the decode process.
-     */
-    byte[] decode(byte[] pArray) throws DecoderException;
-}  
-
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/codec/BinaryEncoder.java b/qpysl4a/src/main/java/org/qpython/qsl4a/codec/BinaryEncoder.java
deleted file mode 100644
index 66b691a1..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/codec/BinaryEncoder.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You 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.
- */
-
-package org.qpython.qsl4a.codec;
-
-/**
- * Defines common encoding methods for byte array encoders.
- * 
- * @author Apache Software Foundation
- * @version $Id: BinaryEncoder.java 651573 2008-04-25 11:11:21Z niallp $
- */
-public interface BinaryEncoder extends Encoder {
-    
-    /**
-     * Encodes a byte array and return the encoded data
-     * as a byte array.
-     * 
-     * @param pArray Data to be encoded
-     *
-     * @return A byte array containing the encoded data
-     * 
-     * @throws EncoderException thrown if the Encoder
-     *      encounters a failure condition during the
-     *      encoding process.
-     */
-    byte[] encode(byte[] pArray) throws EncoderException;
-}  
-
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/codec/CharEncoding.java b/qpysl4a/src/main/java/org/qpython/qsl4a/codec/CharEncoding.java
deleted file mode 100644
index 86b206e5..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/codec/CharEncoding.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You 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.
- */
-
-package org.qpython.qsl4a.codec;
-
-/**
- * Character encoding names required of every implementation of the Java platform.
- * 
- * From the Java documentation <a href="http://java.sun.com/j2se/1.4.2/docs/api/java/nio/charset/Charset.html">Standard
- * charsets</a>:
- * <p>
- * <cite>Every implementation of the Java platform is required to support the following character encodings. Consult the
- * release documentation for your implementation to see if any other encodings are supported. Consult the release
- * documentation for your implementation to see if any other encodings are supported. </cite>
- * </p>
- * 
- * <ul>
- * <li><code>US-ASCII</code><br/>
- * Seven-bit ASCII, a.k.a. ISO646-US, a.k.a. the Basic Latin block of the Unicode character set.</li>
- * <li><code>ISO-8859-1</code><br/>
- * ISO Latin Alphabet No. 1, a.k.a. ISO-LATIN-1.</li>
- * <li><code>UTF-8</code><br/>
- * Eight-bit Unicode Transformation Format.</li>
- * <li><code>UTF-16BE</code><br/>
- * Sixteen-bit Unicode Transformation Format, big-endian byte order.</li>
- * <li><code>UTF-16LE</code><br/>
- * Sixteen-bit Unicode Transformation Format, little-endian byte order.</li>
- * <li><code>UTF-16</code><br/>
- * Sixteen-bit Unicode Transformation Format, byte order specified by a mandatory initial byte-order mark (either order
- * accepted on input, big-endian used on output.)</li>
- * </ul>
- * 
- * This perhaps would best belong in the [lang] project. Even if a similar interface is defined in [lang], it is not
- * forseen that [codec] would be made to depend on [lang].
- * 
- * @see <a href="http://java.sun.com/j2se/1.4.2/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
- * @author Apache Software Foundation
- * @since 1.4
- * @version $Id: CharEncoding.java 797857 2009-07-25 23:43:33Z ggregory $
- */
-public class CharEncoding {
-    /**
-     * CharEncodingISO Latin Alphabet No. 1, a.k.a. ISO-LATIN-1. </p>
-     * <p>
-     * Every implementation of the Java platform is required to support this character encoding.
-     * </p>
-     * 
-     * @see <a href="http://java.sun.com/j2se/1.4.2/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
-     */
-    public static final String ISO_8859_1 = "ISO-8859-1";
-
-    /**
-     * <p>
-     * Seven-bit ASCII, also known as ISO646-US, also known as the Basic Latin block of the Unicode character set.
-     * </p>
-     * <p>
-     * Every implementation of the Java platform is required to support this character encoding.
-     * </p>
-     * 
-     * @see <a href="http://java.sun.com/j2se/1.4.2/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
-     */
-    public static final String US_ASCII = "US-ASCII";
-
-    /**
-     * <p>
-     * Sixteen-bit Unicode Transformation Format, The byte order specified by a mandatory initial byte-order mark
-     * (either order accepted on input, big-endian used on output)
-     * </p>
-     * <p>
-     * Every implementation of the Java platform is required to support this character encoding.
-     * </p>
-     * 
-     * @see <a href="http://java.sun.com/j2se/1.4.2/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
-     */
-    public static final String UTF_16 = "UTF-16";
-
-    /**
-     * <p>
-     * Sixteen-bit Unicode Transformation Format, big-endian byte order.
-     * </p>
-     * <p>
-     * Every implementation of the Java platform is required to support this character encoding.
-     * </p>
-     * 
-     * @see <a href="http://java.sun.com/j2se/1.4.2/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
-     */
-    public static final String UTF_16BE = "UTF-16BE";
-
-    /**
-     * <p>
-     * Sixteen-bit Unicode Transformation Format, little-endian byte order.
-     * </p>
-     * <p>
-     * Every implementation of the Java platform is required to support this character encoding.
-     * </p>
-     * 
-     * @see <a href="http://java.sun.com/j2se/1.4.2/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
-     */
-    public static final String UTF_16LE = "UTF-16LE";
-
-    /**
-     * <p>
-     * Eight-bit Unicode Transformation Format.
-     * </p>
-     * <p>
-     * Every implementation of the Java platform is required to support this character encoding.
-     * </p>
-     * 
-     * @see <a href="http://java.sun.com/j2se/1.4.2/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
-     */
-    public static final String UTF_8 = "UTF-8";
-}
\ No newline at end of file
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/codec/Decoder.java b/qpysl4a/src/main/java/org/qpython/qsl4a/codec/Decoder.java
deleted file mode 100644
index 7c4a29db..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/codec/Decoder.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You 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.
- */
-
-package org.qpython.qsl4a.codec;
-
-/**
- * <p>Provides the highest level of abstraction for Decoders.
- * This is the sister interface of {@link Encoder}.  All
- * Decoders implement this common generic interface.</p>
- * 
- * <p>Allows a user to pass a generic Object to any Decoder 
- * implementation in the codec package.</p>
- * 
- * <p>One of the two interfaces at the center of the codec package.</p>
- * 
- * @author Apache Software Foundation
- * @version $Id: Decoder.java 797690 2009-07-24 23:28:35Z ggregory $
- */
-public interface Decoder {
-
-    /**
-     * Decodes an "encoded" Object and returns a "decoded"
-     * Object.  Note that the implementation of this
-     * interface will try to cast the Object parameter
-     * to the specific type expected by a particular Decoder
-     * implementation.  If a {@link ClassCastException} occurs
-     * this decode method will throw a DecoderException.
-     * 
-     * @param pObject an object to "decode"
-     * 
-     * @return a 'decoded" object
-     * 
-     * @throws DecoderException a decoder exception can
-     * be thrown for any number of reasons.  Some good
-     * candidates are that the parameter passed to this
-     * method is null, a param cannot be cast to the
-     * appropriate type for a specific encoder.
-     */
-    Object decode(Object pObject) throws DecoderException;
-}  
-
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/codec/DecoderException.java b/qpysl4a/src/main/java/org/qpython/qsl4a/codec/DecoderException.java
deleted file mode 100644
index 4243c774..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/codec/DecoderException.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You 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.
- */
-
-package org.qpython.qsl4a.codec;
-
-/**
- * Thrown when a Decoder has encountered a failure condition during a decode.
- * 
- * @author Apache Software Foundation
- * @version $Id: DecoderException.java 797804 2009-07-25 17:27:04Z ggregory $
- */
-public class DecoderException extends Exception {
-
-    /**
-     * Declares the Serial Version Uid.
-     * 
-     * @see <a href="http://c2.com/cgi/wiki?AlwaysDeclareSerialVersionUid">Always Declare Serial Version Uid</a>
-     */
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * Constructs a new exception with <code>null</code> as its detail message. The cause is not initialized, and may
-     * subsequently be initialized by a call to {@link #initCause}.
-     * 
-     * @since 1.4
-     */
-    public DecoderException() {
-        super();
-    }
-
-    /**
-     * Constructs a new exception with the specified detail message. The cause is not initialized, and may subsequently
-     * be initialized by a call to {@link #initCause}.
-     * 
-     * @param message
-     *            The detail message which is saved for later retrieval by the {@link #getMessage()} method.
-     */
-    public DecoderException(String message) {
-        super(message);
-    }
-
-    /**
-     * Constructsa new exception with the specified detail message and cause.
-     * 
-     * <p>
-     * Note that the detail message associated with <code>cause</code> is not automatically incorporated into this
-     * exception's detail message.
-     * </p>
-     * 
-     * @param message
-     *            The detail message which is saved for later retrieval by the {@link #getMessage()} method.
-     * @param cause
-     *            The cause which is saved for later retrieval by the {@link #getCause()} method. A <code>null</code>
-     *            value is permitted, and indicates that the cause is nonexistent or unknown.
-     * @since 1.4
-     */
-    public DecoderException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    /**
-     * Constructs a new exception with the specified cause and a detail message of <code>(cause==null ?
-     * null : cause.toString())</code> (which typically contains the class and detail message of <code>cause</code>).
-     * This constructor is useful for exceptions that are little more than wrappers for other throwables.
-     * 
-     * @param cause
-     *            The cause which is saved for later retrieval by the {@link #getCause()} method. A <code>null</code>
-     *            value is permitted, and indicates that the cause is nonexistent or unknown.
-     * @since 1.4
-     */
-    public DecoderException(Throwable cause) {
-        super(cause);
-    }
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/codec/Encoder.java b/qpysl4a/src/main/java/org/qpython/qsl4a/codec/Encoder.java
deleted file mode 100644
index b5c1c13d..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/codec/Encoder.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You 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.
- */
-
-package org.qpython.qsl4a.codec;
-
-/**
- * <p>Provides the highest level of abstraction for Encoders.
- * This is the sister interface of {@link Decoder}.  Every implementation of
- * Encoder provides this common generic interface whic allows a user to pass a 
- * generic Object to any Encoder implementation in the codec package.</p>
- *
- * @author Apache Software Foundation
- * @version $Id: Encoder.java 634915 2008-03-08 09:30:25Z bayard $
- */
-public interface Encoder {
-    
-    /**
-     * Encodes an "Object" and returns the encoded content 
-     * as an Object.  The Objects here may just be <code>byte[]</code>
-     * or <code>String</code>s depending on the implementation used.
-     *   
-     * @param pObject An object ot encode
-     * 
-     * @return An "encoded" Object
-     * 
-     * @throws EncoderException an encoder exception is
-     *  thrown if the encoder experiences a failure
-     *  condition during the encoding process.
-     */
-    Object encode(Object pObject) throws EncoderException;
-}  
-
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/codec/EncoderException.java b/qpysl4a/src/main/java/org/qpython/qsl4a/codec/EncoderException.java
deleted file mode 100644
index ad4cb3bc..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/codec/EncoderException.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You 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.
- */
-
-package org.qpython.qsl4a.codec;
-
-/**
- * Thrown when there is a failure condition during the encoding process. This exception is thrown when an Encoder
- * encounters a encoding specific exception such as invalid data, inability to calculate a checksum, characters outside
- * of the expected range.
- * 
- * @author Apache Software Foundation
- * @version $Id: EncoderException.java 797804 2009-07-25 17:27:04Z ggregory $
- */
-public class EncoderException extends Exception {
-
-    /**
-     * Declares the Serial Version Uid.
-     * 
-     * @see <a href="http://c2.com/cgi/wiki?AlwaysDeclareSerialVersionUid">Always Declare Serial Version Uid</a>
-     */
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * Constructs a new exception with <code>null</code> as its detail message. The cause is not initialized, and may
-     * subsequently be initialized by a call to {@link #initCause}.
-     * 
-     * @since 1.4
-     */
-    public EncoderException() {
-        super();
-    }
-
-    /**
-     * Constructs a new exception with the specified detail message. The cause is not initialized, and may subsequently
-     * be initialized by a call to {@link #initCause}.
-     * 
-     * @param message
-     *            a useful message relating to the encoder specific error.
-     */
-    public EncoderException(String message) {
-        super(message);
-    }
-
-    /**
-     * Constructs a new exception with the specified detail message and cause.
-     * 
-     * <p>
-     * Note that the detail message associated with <code>cause</code> is not automatically incorporated into this
-     * exception's detail message.
-     * </p>
-     * 
-     * @param message
-     *            The detail message which is saved for later retrieval by the {@link #getMessage()} method.
-     * @param cause
-     *            The cause which is saved for later retrieval by the {@link #getCause()} method. A <code>null</code>
-     *            value is permitted, and indicates that the cause is nonexistent or unknown.
-     * @since 1.4
-     */
-    public EncoderException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    /**
-     * Constructs a new exception with the specified cause and a detail message of <code>(cause==null ?
-     * null : cause.toString())</code> (which typically contains the class and detail message of <code>cause</code>).
-     * This constructor is useful for exceptions that are little more than wrappers for other throwables.
-     * 
-     * @param cause
-     *            The cause which is saved for later retrieval by the {@link #getCause()} method. A <code>null</code>
-     *            value is permitted, and indicates that the cause is nonexistent or unknown.
-     * @since 1.4
-     */
-    public EncoderException(Throwable cause) {
-        super(cause);
-    }
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/codec/StreamGobbler.java b/qpysl4a/src/main/java/org/qpython/qsl4a/codec/StreamGobbler.java
deleted file mode 100644
index 07b1b8e2..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/codec/StreamGobbler.java
+++ /dev/null
@@ -1,310 +0,0 @@
-package org.qpython.qsl4a.codec;
-
-
-
-import org.qpython.qsl4a.qsl4a.Log;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-/**
- * A <code>StreamGobbler</code> is an InputStream that uses an internal worker thread to constantly consume input from
- * another InputStream. It uses a buffer to store the consumed data. The buffer size is automatically adjusted, if
- * needed.
- * <p>
- * This class is sometimes very convenient - if you wrap a session's STDOUT and STDERR InputStreams with instances of
- * this class, then you don't have to bother about the shared window of STDOUT and STDERR in the low level SSH-2
- * protocol, since all arriving data will be immediatelly consumed by the worker threads. Also, as a side effect, the
- * streams will be buffered (e.g., single byte read() operations are faster).
- * <p>
- * Other SSH for Java libraries include this functionality by default in their STDOUT and STDERR InputStream
- * implementations, however, please be aware that this approach has also a downside:
- * <p>
- * If you do not call the StreamGobbler's <code>read()</code> method often enough and the peer is constantly sending
- * huge amounts of data, then you will sooner or later encounter a low memory situation due to the aggregated data
- * (well, it also depends on the Java heap size). Joe Average will like this class anyway - a paranoid programmer would
- * never use such an approach.
- * <p>
- * The term "StreamGobbler" was taken from an article called "When Runtime.exec() won't", see
- * http://www.javaworld.com/javaworld/jw-12-2000/jw-1229-traps.html.
- * 
- * @author Christian Plattner, plattner@trilead.com
- * @version $Id: StreamGobbler.java,v 1.1 2007/10/15 12:49:56 cplattne Exp $
- */
-
-public class StreamGobbler extends InputStream {
-	class GobblerThread extends Thread {
-		/*
-		@Override
-		public void run() {
-
-			while (true) {
-				try {
-					byte[] saveBuffer = null;
-
-					int avail = is.read(buffer, write_pos, buffer.length - write_pos);
-					synchronized (synchronizer) {
-						if (avail <= 0) {
-							isEOF = true;
-							synchronizer.notifyAll();
-							break;
-						}
-						write_pos += avail;
-
-						int space_available = buffer.length - write_pos;
-						Log.e("space_available:" + buffer.length + "-" + write_pos);
-
-						if (space_available == 0) {
-							if (read_pos > 0) {
-								saveBuffer = new byte[read_pos];
-								System.arraycopy(buffer, 0, saveBuffer, 0, read_pos);
-								System.arraycopy(buffer, read_pos, buffer, 0, buffer.length - read_pos);
-								write_pos -= read_pos;
-								read_pos = 0;
-
-								Log.e("read_pos > 0:" + buffer);
-
-							}
-							else {
-								write_pos = 0;
-								saveBuffer = buffer;
-
-								Log.e("read_pos <=0 :" + buffer);
-
-							}
-						}
-
-						synchronizer.notifyAll();
-					}
-					writeToFile(saveBuffer);
-
-				}
-				catch (IOException e) {
-					synchronized (synchronizer) {
-						exception = e;
-						synchronizer.notifyAll();
-						break;
-					}
-				}
-			}
-		}*/
-
-		public void run() {
-			byte[] buff = new byte[8192];
-
-			while (true) {
-				try {
-					int avail = is.read(buff);
-
-					synchronized (synchronizer) {
-						if (avail <= 0) {
-							isEOF = true;
-							synchronizer.notifyAll();
-							break;
-						}
-
-						int space_available = buffer.length - write_pos;
-
-						if (space_available < avail) {
-
-							int unread_size = write_pos - read_pos;
-							int need_space = unread_size + avail;
-
-							byte[] new_buffer = buffer;
-
-							if (need_space > buffer.length) {
-								int inc = need_space / 3;
-								inc = (inc < 256) ? 256 : inc;
-								inc = (inc > 8192) ? 8192 : inc;
-								new_buffer = new byte[need_space + inc];
-							}
-
-							if (unread_size > 0)
-								System.arraycopy(buffer, read_pos, new_buffer, 0, unread_size);
-
-							buffer = new_buffer;
-
-							read_pos = 0;
-							write_pos = unread_size;
-						}
-
-						byte[] s_buffer = new byte[avail];
-						System.arraycopy(buff, 0, s_buffer, 0, avail);
-						System.arraycopy(buff, 0, buffer, write_pos, avail);
-						write_pos += avail;
-
-						synchronizer.notifyAll();
-						writeToFile(s_buffer);
-						// Log.e("OUTPUT:"+String.valueOf(s_buffer));
-					}
-
-				}
-				catch (IOException e) {
-					synchronized (synchronizer) {
-						exception = e;
-						synchronizer.notifyAll();
-						break;
-					}
-				}
-			}
-		}
-	}
-
-	private InputStream is;
-
-	private GobblerThread t;
-
-	private Object synchronizer = new Object();
-
-	private boolean isEOF = false;
-
-	private boolean isClosed = false;
-
-	private IOException exception = null;
-
-	private byte[] buffer;
-
-	private int read_pos = 0;
-
-	private int write_pos = 0;
-
-	private final FileOutputStream mLogStream;
-
-	private final int mBufferSize;
-
-	public StreamGobbler(InputStream is, File log, int buffer_size) {
-		this.is = is;
-		mBufferSize = buffer_size;
-		FileOutputStream out = null;
-		try {
-			out = new FileOutputStream(log, false);
-		}
-		catch (IOException e) {
-			Log.e(e);
-		}
-		mLogStream = out;
-		buffer = new byte[mBufferSize];
-		t = new GobblerThread();
-		t.setDaemon(true);
-		t.start();
-	}
-
-	public void writeToFile(byte[] buffer) {
-
-		if (mLogStream != null && buffer != null) {
-			try {
-				mLogStream.write(buffer);
-			}
-			catch (IOException e) {
-				Log.e(e);
-			}
-		}
-	}
-
-	@Override
-	public int read() throws IOException {
-		synchronized (synchronizer) {
-			if (isClosed) {
-				throw new IOException("This StreamGobbler is closed.");
-			}
-
-			while (read_pos == write_pos) {
-				if (exception != null) {
-					throw exception;
-				}
-
-				if (isEOF) {
-					return -1;
-				}
-
-				try {
-					synchronizer.wait();
-				}
-				catch (InterruptedException e) {
-				}
-			}
-
-			int b = buffer[read_pos++] & 0xff;
-
-			return b;
-		}
-	}
-
-	@Override
-	public int available() throws IOException {
-		synchronized (synchronizer) {
-			if (isClosed) {
-				throw new IOException("This StreamGobbler is closed.");
-			}
-
-			return write_pos - read_pos;
-		}
-	}
-
-	@Override
-	public int read(byte[] b) throws IOException {
-		return read(b, 0, b.length);
-	}
-
-	@Override
-	public void close() throws IOException {
-		synchronized (synchronizer) {
-			if (isClosed) {
-				return;
-			}
-			isClosed = true;
-			isEOF = true;
-			synchronizer.notifyAll();
-			is.close();
-		}
-	}
-
-	@Override
-	public int read(byte[] b, int off, int len) throws IOException {
-		if (b == null) {
-			throw new NullPointerException();
-		}
-
-		if ((off < 0) || (len < 0) || ((off + len) > b.length) || ((off + len) < 0) || (off > b.length)) {
-			throw new IndexOutOfBoundsException();
-		}
-
-		if (len == 0) {
-			return 0;
-		}
-
-		synchronized (synchronizer) {
-			if (isClosed) {
-				throw new IOException("This StreamGobbler is closed.");
-			}
-
-			while (read_pos == write_pos) {
-				if (exception != null) {
-					throw exception;
-				}
-
-				if (isEOF) {
-					return -1;
-				}
-
-				try {
-					synchronizer.wait();
-				}
-				catch (InterruptedException e) {
-				}
-			}
-
-			int avail = write_pos - read_pos;
-
-			avail = (avail > len) ? len : avail;
-
-			System.arraycopy(buffer, read_pos, b, off, avail);
-
-			read_pos += avail;
-
-			return avail;
-		}
-	}
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/codec/StringUtils.java b/qpysl4a/src/main/java/org/qpython/qsl4a/codec/StringUtils.java
deleted file mode 100644
index 64096fcf..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/codec/StringUtils.java
+++ /dev/null
@@ -1,277 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You 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.
- */
-
-package org.qpython.qsl4a.codec;
-
-import java.io.UnsupportedEncodingException;
-
-/**
- * Converts String to and from bytes using the encodings required by the Java specification. These encodings are specified in <a
- * href="http://java.sun.com/j2se/1.4.2/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
- * 
- * @see CharEncoding
- * @see <a href="http://java.sun.com/j2se/1.4.2/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
- * @author <a href="mailto:ggregory@seagullsw.com">Gary Gregory</a>
- * @version $Id: StringUtils.java 801391 2009-08-05 19:55:54Z ggregory $
- * @since 1.4
- */
-public class StringUtils {
-
-    /**
-     * Encodes the given string into a sequence of bytes using the ISO-8859-1 charset, storing the result into a new
-     * byte array.
-     * 
-     * @param string
-     *            the String to encode
-     * @return encoded bytes
-     * @throws IllegalStateException
-     *             Thrown when the charset is missing, which should be never according the the Java specification.
-     * @see <a href="http://java.sun.com/j2se/1.4.2/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
-     * @see #getBytesUnchecked(String, String)
-     */
-    public static byte[] getBytesIso8859_1(String string) {
-        return StringUtils.getBytesUnchecked(string, CharEncoding.ISO_8859_1);
-    }
-
-    /**
-     * Encodes the given string into a sequence of bytes using the US-ASCII charset, storing the result into a new byte
-     * array.
-     * 
-     * @param string
-     *            the String to encode
-     * @return encoded bytes
-     * @throws IllegalStateException
-     *             Thrown when the charset is missing, which should be never according the the Java specification.
-     * @see <a href="http://java.sun.com/j2se/1.4.2/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
-     * @see #getBytesUnchecked(String, String)
-     */
-    public static byte[] getBytesUsAscii(String string) {
-        return StringUtils.getBytesUnchecked(string, CharEncoding.US_ASCII);
-    }
-
-    /**
-     * Encodes the given string into a sequence of bytes using the UTF-16 charset, storing the result into a new byte
-     * array.
-     * 
-     * @param string
-     *            the String to encode
-     * @return encoded bytes
-     * @throws IllegalStateException
-     *             Thrown when the charset is missing, which should be never according the the Java specification.
-     * @see <a href="http://java.sun.com/j2se/1.4.2/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
-     * @see #getBytesUnchecked(String, String)
-     */
-    public static byte[] getBytesUtf16(String string) {
-        return StringUtils.getBytesUnchecked(string, CharEncoding.UTF_16);
-    }
-
-    /**
-     * Encodes the given string into a sequence of bytes using the UTF-16BE charset, storing the result into a new byte
-     * array.
-     * 
-     * @param string
-     *            the String to encode
-     * @return encoded bytes
-     * @throws IllegalStateException
-     *             Thrown when the charset is missing, which should be never according the the Java specification.
-     * @see <a href="http://java.sun.com/j2se/1.4.2/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
-     * @see #getBytesUnchecked(String, String)
-     */
-    public static byte[] getBytesUtf16Be(String string) {
-        return StringUtils.getBytesUnchecked(string, CharEncoding.UTF_16BE);
-    }
-
-    /**
-     * Encodes the given string into a sequence of bytes using the UTF-16LE charset, storing the result into a new byte
-     * array.
-     * 
-     * @param string
-     *            the String to encode
-     * @return encoded bytes
-     * @throws IllegalStateException
-     *             Thrown when the charset is missing, which should be never according the the Java specification.
-     * @see <a href="http://java.sun.com/j2se/1.4.2/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
-     * @see #getBytesUnchecked(String, String)
-     */
-    public static byte[] getBytesUtf16Le(String string) {
-        return StringUtils.getBytesUnchecked(string, CharEncoding.UTF_16LE);
-    }
-
-    /**
-     * Encodes the given string into a sequence of bytes using the UTF-8 charset, storing the result into a new byte
-     * array.
-     * 
-     * @param string
-     *            the String to encode
-     * @return encoded bytes
-     * @throws IllegalStateException
-     *             Thrown when the charset is missing, which should be never according the the Java specification.
-     * @see <a href="http://java.sun.com/j2se/1.4.2/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
-     * @see #getBytesUnchecked(String, String)
-     */
-    public static byte[] getBytesUtf8(String string) {
-        return StringUtils.getBytesUnchecked(string, CharEncoding.UTF_8);
-    }
-
-    /**
-     * Encodes the given string into a sequence of bytes using the named charset, storing the result into a new byte
-     * array.
-     * <p>
-     * This method catches {@link UnsupportedEncodingException} and rethrows it as {@link IllegalStateException}, which
-     * should never happen for a required charset name. Use this method when the encoding is required to be in the JRE.
-     * </p>
-     * 
-     * @param string
-     *            the String to encode
-     * @param charsetName
-     *            The name of a required {@link java.nio.charset.Charset}
-     * @return encoded bytes
-     * @throws IllegalStateException
-     *             Thrown when a {@link UnsupportedEncodingException} is caught, which should never happen for a
-     *             required charset name.
-     * @see CharEncoding
-     * @see String#getBytes(String)
-     */
-    public static byte[] getBytesUnchecked(String string, String charsetName) {
-        if (string == null) {
-            return null;
-        }
-        try {
-            return string.getBytes(charsetName);
-        } catch (UnsupportedEncodingException e) {
-            throw StringUtils.newIllegalStateException(charsetName, e);
-        }
-    }
-
-    private static IllegalStateException newIllegalStateException(String charsetName, UnsupportedEncodingException e) {
-        return new IllegalStateException(charsetName + ": " + e);
-    }
-
-    /**
-     * Constructs a new <code>String</code> by decoding the specified array of bytes using the given charset.
-     * <p>
-     * This method catches {@link UnsupportedEncodingException} and re-throws it as {@link IllegalStateException}, which
-     * should never happen for a required charset name. Use this method when the encoding is required to be in the JRE.
-     * </p>
-     * 
-     * @param bytes
-     *            The bytes to be decoded into characters
-     * @param charsetName
-     *            The name of a required {@link java.nio.charset.Charset}
-     * @return A new <code>String</code> decoded from the specified array of bytes using the given charset.
-     * @throws IllegalStateException
-     *             Thrown when a {@link UnsupportedEncodingException} is caught, which should never happen for a
-     *             required charset name.
-     * @see CharEncoding
-     * @see String#String(byte[], String)
-     */
-    public static String newString(byte[] bytes, String charsetName) {
-        if (bytes == null) {
-            return null;
-        }
-        try {
-            return new String(bytes, charsetName);
-        } catch (UnsupportedEncodingException e) {
-            throw StringUtils.newIllegalStateException(charsetName, e);
-        }
-    }
-
-    /**
-     * Constructs a new <code>String</code> by decoding the specified array of bytes using the ISO-8859-1 charset.
-     * 
-     * @param bytes
-     *            The bytes to be decoded into characters
-     * @return A new <code>String</code> decoded from the specified array of bytes using the given charset.
-     * @throws IllegalStateException
-     *             Thrown when a {@link UnsupportedEncodingException} is caught, which should never happen since the
-     *             charset is required.
-     */
-    public static String newStringIso8859_1(byte[] bytes) {
-        return StringUtils.newString(bytes, CharEncoding.ISO_8859_1);
-    }
-
-    /**
-     * Constructs a new <code>String</code> by decoding the specified array of bytes using the US-ASCII charset.
-     * 
-     * @param bytes
-     *            The bytes to be decoded into characters
-     * @return A new <code>String</code> decoded from the specified array of bytes using the given charset.
-     * @throws IllegalStateException
-     *             Thrown when a {@link UnsupportedEncodingException} is caught, which should never happen since the
-     *             charset is required.
-     */
-    public static String newStringUsAscii(byte[] bytes) {
-        return StringUtils.newString(bytes, CharEncoding.US_ASCII);
-    }
-
-    /**
-     * Constructs a new <code>String</code> by decoding the specified array of bytes using the UTF-16 charset.
-     * 
-     * @param bytes
-     *            The bytes to be decoded into characters
-     * @return A new <code>String</code> decoded from the specified array of bytes using the given charset.
-     * @throws IllegalStateException
-     *             Thrown when a {@link UnsupportedEncodingException} is caught, which should never happen since the
-     *             charset is required.
-     */
-    public static String newStringUtf16(byte[] bytes) {
-        return StringUtils.newString(bytes, CharEncoding.UTF_16);
-    }
-
-    /**
-     * Constructs a new <code>String</code> by decoding the specified array of bytes using the UTF-16BE charset.
-     * 
-     * @param bytes
-     *            The bytes to be decoded into characters
-     * @return A new <code>String</code> decoded from the specified array of bytes using the given charset.
-     * @throws IllegalStateException
-     *             Thrown when a {@link UnsupportedEncodingException} is caught, which should never happen since the
-     *             charset is required.
-     */
-    public static String newStringUtf16Be(byte[] bytes) {
-        return StringUtils.newString(bytes, CharEncoding.UTF_16BE);
-    }
-
-    /**
-     * Constructs a new <code>String</code> by decoding the specified array of bytes using the UTF-16LE charset.
-     * 
-     * @param bytes
-     *            The bytes to be decoded into characters
-     * @return A new <code>String</code> decoded from the specified array of bytes using the given charset.
-     * @throws IllegalStateException
-     *             Thrown when a {@link UnsupportedEncodingException} is caught, which should never happen since the
-     *             charset is required.
-     */
-    public static String newStringUtf16Le(byte[] bytes) {
-        return StringUtils.newString(bytes, CharEncoding.UTF_16LE);
-    }
-
-    /**
-     * Constructs a new <code>String</code> by decoding the specified array of bytes using the UTF-8 charset.
-     * 
-     * @param bytes
-     *            The bytes to be decoded into characters
-     * @return A new <code>String</code> decoded from the specified array of bytes using the given charset.
-     * @throws IllegalStateException
-     *             Thrown when a {@link UnsupportedEncodingException} is caught, which should never happen since the
-     *             charset is required.
-     */
-    public static String newStringUtf8(byte[] bytes) {
-        return StringUtils.newString(bytes, CharEncoding.UTF_8);
-    }
-
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/Analytics.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/Analytics.java
deleted file mode 100644
index 3af0dd71..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/Analytics.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright (C) 2009 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.
- */
-
-package org.qpython.qsl4a.qsl4a;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.preference.PreferenceManager;
-
-
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-public class Analytics {
-  private static SharedPreferences mPrefs;
-  private static String mSl4aVersion;
-  private static ExecutorService mWorkPool;
-  private static volatile boolean mStarted = false;
-
-  private Analytics() {
-    // Utility class.
-  }
-
-  // TODO(Alexey): Add Javadoc. "Also, it would be cool to wrap up the Analytics API into a facade."
-  @SuppressWarnings("deprecation")
-public static synchronized void start(Context context, String analyticsAccountId) {
-    if (context == null || analyticsAccountId == null) {
-      return;
-    }
-    mSl4aVersion = Version.getVersion(context);
-    mPrefs = PreferenceManager.getDefaultSharedPreferences(context);
-    mWorkPool = Executors.newSingleThreadExecutor();
-    mStarted = true;
-  }
-
-  private static class PageNameBuilder {
-    private final StringBuilder mmName = new StringBuilder();
-
-    void add(String pathPart) {
-      mmName.append("/");
-      mmName.append(pathPart);
-    }
-
-    String build() {
-      return mmName.toString();
-    }
-  }
-
-  public static void track(final String... nameParts) {
-    if (mStarted && mPrefs.getBoolean("usagetracking", false)) {
-      mWorkPool.submit(new Runnable() {
-        public void run() {
-          PageNameBuilder builder = new PageNameBuilder();
-          builder.add(mSl4aVersion);
-          for (String part : nameParts) {
-            builder.add(part);
-          }
-          String name = builder.build();
-        }
-      });
-    }
-  }
-
-  public static void trackActivity(Activity activity) {
-    String name = activity.getClass().getSimpleName();
-    track(name);
-  }
-
-  @SuppressWarnings("deprecation")
-public static synchronized void stop() {
-    if (mStarted) {
-      mStarted = false;
-      mWorkPool.shutdownNow();
-    }
-  }
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/AndroidProxy.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/AndroidProxy.java
deleted file mode 100644
index e106f755..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/AndroidProxy.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright (C) 2009 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.
- */
-
-package org.qpython.qsl4a.qsl4a;
-
-import android.app.Service;
-import android.content.Intent;
-
-import org.qpython.qsl4a.qsl4a.facade.FacadeConfiguration;
-import org.qpython.qsl4a.qsl4a.facade.FacadeManagerFactory;
-import org.qpython.qsl4a.qsl4a.jsonrpc.JsonRpcServer;
-import org.qpython.qsl4a.qsl4a.jsonrpc.RpcReceiverManagerFactory;
-
-import java.net.InetSocketAddress;
-import java.util.UUID;
-
-public class AndroidProxy {
-
-  private InetSocketAddress mAddress;
-  private final JsonRpcServer mJsonRpcServer;
-  private final UUID mSecret;
-  private final RpcReceiverManagerFactory mFacadeManagerFactory;
-
-  /**
-   * 
-   * @param service
-   *          Android service (required to build facades).
-   * @param intent
-   *          the intent that launched the proxy/script.
-   * @param requiresHandshake
-   *          indicates whether RPC security protocol should be enabled.
-   */
-  public AndroidProxy(Service service, Intent intent, boolean requiresHandshake) {
-    if (requiresHandshake) {
-      mSecret = UUID.randomUUID();
-    } else {
-      mSecret = null;
-    }
-    mFacadeManagerFactory =
-        new FacadeManagerFactory(FacadeConfiguration.getSdkLevel(), service, intent,
-            FacadeConfiguration.getFacadeClasses());
-    mJsonRpcServer = new JsonRpcServer(mFacadeManagerFactory, getSecret());
-  }
-
-  public InetSocketAddress getAddress() {
-    return mAddress;
-  }
-
-  public InetSocketAddress startLocal() {
-    return startLocal(0);
-  }
-
-  public InetSocketAddress startLocal(int port) {
-    mAddress = mJsonRpcServer.startLocal(port);
-    return mAddress;
-  }
-  
-  public InetSocketAddress startPublic() {
-    return startPublic(0);
-  }
-
-  public InetSocketAddress startPublic(int port) {
-    mAddress = mJsonRpcServer.startPublic(port);
-    return mAddress;
-  }
-
-  public void shutdown() {
-	  if (mJsonRpcServer!=null) {
-		  mJsonRpcServer.shutdown();
-	  }
-  }
-
-  public String getSecret() {
-    if (mSecret == null) {
-      return null;
-    }
-    return mSecret.toString();
-  }
-
-  public RpcReceiverManagerFactory getRpcReceiverManagerFactory() {
-    return mFacadeManagerFactory;
-  }
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/BaseApplication.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/BaseApplication.java
deleted file mode 100644
index 61f85c3a..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/BaseApplication.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2009 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.
- */
-
-package org.qpython.qsl4a.qsl4a;
-
-import android.app.Application;
-
-import org.qpython.qsl4a.qsl4a.interpreter.InterpreterConfiguration;
-import org.qpython.qsl4a.qsl4a.trigger.TriggerRepository;
-
-public class BaseApplication extends Application {
-
-    private final FutureActivityTaskExecutor mTaskExecutor = new FutureActivityTaskExecutor(this);
-    private TriggerRepository mTriggerRepository;
-
-    protected InterpreterConfiguration mConfiguration;
-
-    public FutureActivityTaskExecutor getTaskExecutor() {
-        return mTaskExecutor;
-    }
-
-    @Override
-    public void onCreate() {
-        super.onCreate();
-        mConfiguration = new InterpreterConfiguration(this);
-        mConfiguration.startDiscovering();
-        mTriggerRepository = new TriggerRepository(this);
-    }
-
-    public InterpreterConfiguration getInterpreterConfiguration() {
-        return mConfiguration;
-    }
-
-    public TriggerRepository getTriggerRepository() {
-        return mTriggerRepository;
-    }
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/Constants.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/Constants.java
deleted file mode 100644
index 4a2c32c9..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/Constants.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Copyright (C) 2009 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.
- */
-
-package org.qpython.qsl4a.qsl4a;
-
-import android.content.ComponentName;
-
-public interface Constants {
-
-  public static final String ACTION_LAUNCH_FOREGROUND_SCRIPT =
-      "com.googlecode.android_scripting.action.LAUNCH_FOREGROUND_SCRIPT";
-  public static final String ACTION_LAUNCH_BACKGROUND_SCRIPT =
-      "com.googlecode.android_scripting.action.LAUNCH_BACKGROUND_SCRIPT";
-  public static final String ACTION_LAUNCH_SCRIPT_FOR_RESULT =
-      "com.googlecode.android_scripting.action.ACTION_LAUNCH_SCRIPT_FOR_RESULT";
-  public static final String ACTION_LAUNCH_INTERPRETER =
-      "com.googlecode.android_scripting.action.LAUNCH_INTERPRETER";
-  public static final String ACTION_EDIT_SCRIPT =
-      "com.googlecode.android_scripting.action.EDIT_SCRIPT";
-  public static final String ACTION_SAVE_SCRIPT =
-      "com.googlecode.android_scripting.action.SAVE_SCRIPT";
-  public static final String ACTION_SAVE_AND_RUN_SCRIPT =
-      "com.googlecode.android_scripting.action.SAVE_AND_RUN_SCRIPT";
-  public static final String ACTION_KILL_PROCESS =
-      "com.googlecode.android_scripting.action.KILL_PROCESS";
-  public static final String ACTION_KILL_ALL = "com.googlecode.android_scripting.action.KILL_ALL";
-  public static final String ACTION_SHOW_RUNNING_SCRIPTS =
-      "com.googlecode.android_scripting.action.SHOW_RUNNING_SCRIPTS";
-  public static final String ACTION_CANCEL_NOTIFICATION =
-      "com.googlecode.android_scripting.action.CANCEL_NOTIFICAITON";
-  public static final String ACTION_ACTIVITY_RESULT =
-      "com.googlecode.android_scripting.action.ACTIVITY_RESULT";
-  public static final String ACTION_LAUNCH_SERVER =
-      "com.googlecode.android_scripting.action.LAUNCH_SERVER";
-
-  public static final String EXTRA_RESULT = "SCRIPT_RESULT";
-  public static final String EXTRA_SCRIPT_PATH =
-      "com.googlecode.android_scripting.extra.SCRIPT_PATH";
-  public static final String EXTRA_SCRIPT_CONTENT =
-      "com.googlecode.android_scripting.extra.SCRIPT_CONTENT";
-  public static final String EXTRA_INTERPRETER_NAME =
-      "com.googlecode.android_scripting.extra.INTERPRETER_NAME";
-
-  public static final String EXTRA_USE_EXTERNAL_IP =
-      "com.googlecode.android_scripting.extra.USE_PUBLIC_IP";
-  public static final String EXTRA_USE_SERVICE_PORT =
-      "com.googlecode.android_scripting.extra.USE_SERVICE_PORT";
-  public static final String EXTRA_SCRIPT_TEXT =
-      "com.googlecode.android_scripting.extra.SCRIPT_TEXT";
-  public static final String EXTRA_RPC_HELP_TEXT =
-      "com.googlecode.android_scripting.extra.RPC_HELP_TEXT";
-  public static final String EXTRA_API_PROMPT_RPC_NAME =
-      "com.googlecode.android_scripting.extra.API_PROMPT_RPC_NAME";
-  public static final String EXTRA_API_PROMPT_VALUES =
-      "com.googlecode.android_scripting.extra.API_PROMPT_VALUES";
-  public static final String EXTRA_PROXY_PORT = "com.googlecode.android_scripting.extra.PROXY_PORT";
-  public static final String EXTRA_PROCESS_ID =
-      "com.googlecode.android_scripting.extra.SCRIPT_PROCESS_ID";
-  public static final String EXTRA_IS_NEW_SCRIPT =
-      "com.googlecode.android_scripting.extra.IS_NEW_SCRIPT";
-  public static final String EXTRA_TRIGGER_ID =
-      "com.googlecode.android_scripting.extra.EXTRA_TRIGGER_ID";
-  public static final String EXTRA_LAUNCH_IN_BACKGROUND =
-      "com.googlecode.android_scripting.extra.EXTRA_LAUNCH_IN_BACKGROUND";
-  public static final String EXTRA_TASK_ID = "com.googlecode.android_scripting.extra.EXTRA_TASK_ID";
-
-  // BluetoothDeviceManager
-  public static final String EXTRA_DEVICE_ADDRESS =
-      "com.googlecode.android_scripting.extra.device_address";
-
-  public static final ComponentName SL4A_SERVICE_COMPONENT_NAME = new ComponentName(
-      "com.googlecode.android_scripting",
-      "com.googlecode.android_scripting.activity.ScriptingLayerService");
-  public static final ComponentName SL4A_SERVICE_LAUNCHER_COMPONENT_NAME = new ComponentName(
-      "com.googlecode.android_scripting",
-      "com.googlecode.android_scripting.activity.ScriptingLayerServiceLauncher");
-  public static final ComponentName BLUETOOTH_DEVICE_LIST_COMPONENT_NAME = new ComponentName(
-      "com.googlecode.android_scripting",
-      "com.googlecode.android_scripting.activity.BluetoothDeviceList");
-  public static final ComponentName TRIGGER_SERVICE_COMPONENT_NAME = new ComponentName(
-      "com.googlecode.android_scripting",
-      "com.googlecode.android_scripting.activity.TriggerService");
-
-  // Preference Keys
-
-  public static final String FORCE_BROWSER = "helpForceBrowser";
-  public final static String HIDE_NOTIFY = "hideServiceNotifications";
-}
\ No newline at end of file
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/Exec.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/Exec.java
deleted file mode 100644
index 1acb34e8..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/Exec.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * 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.
- */
-
-package org.qpython.qsl4a.qsl4a;
-
-import java.io.FileDescriptor;
-
-/**
- * Tools for executing commands.
- */
-public class Exec {
-  /**
-   * @param cmd
-   *          The command to execute
-   * @param arg0
-   *          The first argument to the command, may be null
-   * @param arg1
-   *          the second argument to the command, may be null
-   * @return the file descriptor of the started process.
-   * 
-   */
-  public static FileDescriptor createSubprocess(String command, String[] arguments,
-      String[] environmentVariables, String workingDirectory) {
-    return createSubprocess(command, arguments, environmentVariables, workingDirectory, null);
-  }
-
-  /**
-   * @param cmd
-   *          The command to execute
-   * @param arguments
-   *          Array of arguments, may be null
-   * @param environmentVariables
-   *          Array of environment variables, may be null
-   * @param processId
-   *          A one-element array to which the process ID of the started process will be written.
-   * @return the file descriptor of the opened process's psuedo-terminal.
-   * 
-   */
-  public static native FileDescriptor createSubprocess(String command, String[] arguments,
-      String[] environmentVariables, String workingDirectory, int[] processId);
-
-  public static native void setPtyWindowSize(FileDescriptor fd, int row, int col, int xpixel,
-      int ypixel);
-
-  /**
-   * Causes the calling thread to wait for the process associated with the receiver to finish
-   * executing.
-   * 
-   * @return The exit value of the Process being waited on
-   * 
-   */
-  public static native int waitFor(int processId);
-
-  static {
-    System.loadLibrary("com_googlecode_android_scripting_Exec");
-  }
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/FeaturedInterpreters.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/FeaturedInterpreters.java
deleted file mode 100644
index 842a26e0..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/FeaturedInterpreters.java
+++ /dev/null
@@ -1,106 +0,0 @@
-// Copyright 2010 Google Inc. All Rights Reserved.
-
-package org.qpython.qsl4a.qsl4a;
-
-import android.content.Context;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class FeaturedInterpreters {
-  private static final Map<String, FeaturedInterpreter> mNameMap =
-      new HashMap<String, FeaturedInterpreter>();
-  private static final Map<String, FeaturedInterpreter> mExtensionMap =
-      new HashMap<String, FeaturedInterpreter>();
-
-  static {
-    try {
-      FeaturedInterpreter interpreters[] =
-          {
-            new FeaturedInterpreter("BeanShell 2.0b4", ".bsh",
-                "http://android-scripting.googlecode.com/files/beanshell_for_android_r2.apk"),
-            new FeaturedInterpreter("JRuby", ".rb",
-                "https://github.com/downloads/ruboto/sl4a_jruby_interpreter/JRubyForAndroid_r2dev.apk"),
-            new FeaturedInterpreter("Lua 5.1.4", ".lua",
-                "http://android-scripting.googlecode.com/files/lua_for_android_r1.apk"),
-            new FeaturedInterpreter("Perl 5.10.1", ".pl",
-                "http://android-scripting.googlecode.com/files/perl_for_android_r1.apk"),
-            new FeaturedInterpreter("Python 2.6.2", ".py",
-                "http://python-for-android.googlecode.com/files/PythonForAndroid_r5.apk"),
-            new FeaturedInterpreter("Rhino 1.7R2", ".js",
-                "http://android-scripting.googlecode.com/files/rhino_for_android_r2.apk"),
-            new FeaturedInterpreter("PHP 5.3.3", ".php",
-                "http://php-for-android.googlecode.com/files/phpforandroid_r1.apk") };
-      for (FeaturedInterpreter interpreter : interpreters) {
-        mNameMap.put(interpreter.mmName, interpreter);
-        mExtensionMap.put(interpreter.mmExtension, interpreter);
-      }
-    } catch (MalformedURLException e) {
-      Log.e(e);
-    }
-  }
-
-  public static List<String> getList() {
-    ArrayList<String> list = new ArrayList<String>(mNameMap.keySet());
-    Collections.sort(list);
-    return list;
-  }
-
-  public static URL getUrlForName(String name) {
-    if (!mNameMap.containsKey(name)) {
-      return null;
-    }
-    return mNameMap.get(name).mmUrl;
-  }
-
-  public static String getInterpreterNameForScript(String fileName) {
-    String extension = getExtension(fileName);
-    if (extension == null || !mExtensionMap.containsKey(extension)) {
-      return null;
-    }
-    return mExtensionMap.get(extension).mmName;
-  }
-
-  public static boolean isSupported(String fileName) {
-    String extension = getExtension(fileName);
-    return (extension != null) && (mExtensionMap.containsKey(extension));
-  }
-
-  public static int getInterpreterIcon(Context context, String key) {
-    String packageName = context.getPackageName();
-    String name = "_icon";
-    if (key.contains(".")) {
-      name = key.substring(key.lastIndexOf('.') + 1) + name;
-    } else {
-      name = key + name;
-    }
-    return context.getResources().getIdentifier(name, "drawable", packageName);
-  }
-
-  private static String getExtension(String fileName) {
-    int dotIndex = fileName.lastIndexOf('.');
-    if (dotIndex == -1) {
-      return null;
-    }
-    return fileName.substring(dotIndex);
-  }
-
-  private static class FeaturedInterpreter {
-    private final String mmName;
-    private final String mmExtension;
-    private final URL mmUrl;
-
-    private FeaturedInterpreter(String name, String extension, String url)
-        throws MalformedURLException {
-      mmName = name;
-      mmExtension = extension;
-      mmUrl = new URL(url);
-    }
-  }
-
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/FileUtils.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/FileUtils.java
deleted file mode 100644
index 68d7a2ff..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/FileUtils.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
- * Copyright (C) 2010 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.
- */
-
-package org.qpython.qsl4a.qsl4a;
-
-import android.content.Context;
-import android.content.res.AssetManager;
-import android.os.Environment;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.lang.reflect.Method;
-
-/**
- * Utility functions for handling files.
- * 
- * @author Damon Kohler (damonkohler@gmail.com)
- */
-public class FileUtils {
-
-  private FileUtils() {
-    // Utility class.
-  }
-
-  static public boolean externalStorageMounted() {
-    String state = Environment.getExternalStorageState();
-    return Environment.MEDIA_MOUNTED.equals(state)
-        || Environment.MEDIA_MOUNTED_READ_ONLY.equals(state);
-  }
-
-  public static int chmod(File path, int mode) throws Exception {
-    Class<?> fileUtils = Class.forName("android.os.FileUtils");
-    Method setPermissions =
-        fileUtils.getMethod("setPermissions", String.class, int.class, int.class, int.class);
-    return (Integer) setPermissions.invoke(null, path.getAbsolutePath(), mode, -1, -1);
-  }
-
-  public static boolean recursiveChmod(File root, int mode) throws Exception {
-    boolean success = chmod(root, mode) == 0;
-    for (File path : root.listFiles()) {
-      if (path.isDirectory()) {
-        success = recursiveChmod(path, mode);
-      }
-      success &= (chmod(path, mode) == 0);
-    }
-    return success;
-  }
-
-  public static boolean delete(File path) {
-    boolean result = true;
-    if (path.exists()) {
-      if (path.isDirectory()) {
-        for (File child : path.listFiles()) {
-          result &= delete(child);
-        }
-        result &= path.delete(); // Delete empty directory.
-      }
-      if (path.isFile()) {
-        result &= path.delete();
-      }
-      if (!result) {
-        Log.e("Delete failed;");
-      }
-      return result;
-    } else {
-      Log.e("File does not exist.");
-      return false;
-    }
-  }
-
-  public static File copyFromStream(String name, InputStream input) {
-    if (name == null || name.length() == 0) {
-      Log.e("No script name specified.");
-      return null;
-    }
-    File file = new File(name);
-    if (!makeDirectories(file.getParentFile(), 0755)) {
-      return null;
-    }
-    try {
-      OutputStream output = new FileOutputStream(file);
-      IoUtils.copy(input, output);
-    } catch (Exception e) {
-      Log.e(e);
-      return null;
-    }
-    return file;
-  }
-
-  public static boolean makeDirectories(File directory, int mode) {
-    File parent = directory;
-    while (parent.getParentFile() != null && !parent.exists()) {
-      parent = parent.getParentFile();
-    }
-    if (!directory.exists()) {
-      Log.v("Creating directory: " + directory.getName());
-      if (!directory.mkdirs()) {
-        Log.e("Failed to create directory.");
-        return false;
-      }
-    }
-    try {
-      recursiveChmod(parent, mode);
-    } catch (Exception e) {
-      Log.e(e);
-      return false;
-    }
-    return true;
-  }
-
-  public static File getExternalDownload() {
-    try {
-      Class<?> c = Class.forName("android.os.Environment");
-      Method m = c.getDeclaredMethod("getExternalStoragePublicDirectory", String.class);
-      String download = c.getDeclaredField("DIRECTORY_DOWNLOADS").get(null).toString();
-      return (File) m.invoke(null, download);
-    } catch (Exception e) {
-      return new File(Environment.getExternalStorageDirectory(), "Download");
-    }
-  }
-
-  public static boolean rename(File file, String name) {
-    return file.renameTo(new File(file.getParent(), name));
-  }
-
-  public static String readToString(File file) throws IOException {
-    if (file == null || !file.exists()) {
-      return null;
-    }
-    FileReader reader = new FileReader(file);
-    StringBuilder out = new StringBuilder();
-    char[] buffer = new char[1024 * 4];
-    int numRead = 0;
-    while ((numRead = reader.read(buffer)) > -1) {
-      out.append(String.valueOf(buffer, 0, numRead));
-    }
-    reader.close();
-    return out.toString();
-  }
-
-  public static String readFromAssetsFile(Context context, String name) throws IOException {
-    AssetManager am = context.getAssets();
-    BufferedReader reader = new BufferedReader(new InputStreamReader(am.open(name)));
-    String line;
-    StringBuilder builder = new StringBuilder();
-    while ((line = reader.readLine()) != null) {
-      builder.append(line);
-    }
-    reader.close();
-    return builder.toString();
-  }
-
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/ForegroundService.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/ForegroundService.java
deleted file mode 100644
index 265552c2..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/ForegroundService.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package org.qpython.qsl4a.qsl4a;
-
-import android.app.Notification;
-import android.app.NotificationManager;
-import android.app.Service;
-
-import java.lang.reflect.Method;
-
-public abstract class ForegroundService extends Service {
-  private static final Class<?>[] mStartForegroundSignature =
-      new Class[] { int.class, Notification.class };
-  private static final Class<?>[] mStopForegroundSignature = new Class[] { boolean.class };
-
-  private final int mNotificationId;
-
-  private NotificationManager mNotificationManager;
-  private Method mStartForeground;
-  private Method mStopForeground;
-  private Object[] mStartForegroundArgs = new Object[2];
-  private Object[] mStopForegroundArgs = new Object[1];
-
-  public ForegroundService(int id) {
-    mNotificationId = id;
-  }
-
-  protected abstract Notification createNotification();
-
-  /**
-   * This is a wrapper around the new startForeground method, using the older APIs if it is not
-   * available.
-   */
-  private void startForegroundCompat(Notification notification) {
-    // If we have the new startForeground API, then use it.
-    if (mStartForeground != null) {
-      mStartForegroundArgs[0] = Integer.valueOf(mNotificationId);
-      mStartForegroundArgs[1] = notification;
-      try {
-        mStartForeground.invoke(this, mStartForegroundArgs);
-      } catch (Exception e) {
-        Log.e(e);
-      }
-      return;
-    }
-
-    // Fall back on the old API.
-    startForegroundCompat(notification);
-    if (notification != null) {
-      mNotificationManager.notify(mNotificationId, notification);
-    }
-  }
-  
-  
-
-  /**
-   * This is a wrapper around the new stopForeground method, using the older APIs if it is not
-   * available.
-   */
-  private void stopForegroundCompat() {
-    // If we have the new stopForeground API, then use it.
-    if (mStopForeground != null) {
-      mStopForegroundArgs[0] = Boolean.TRUE;
-      try {
-        mStopForeground.invoke(this, mStopForegroundArgs);
-      } catch (Exception e) {
-        Log.e(e);
-      }
-      return;
-    }
-
-    // Fall back on the old API. Note to cancel BEFORE changing the
-    // foreground state, since we could be killed at that point.
-    mNotificationManager.cancel(mNotificationId);
-    stopForeground(true);
-
-  }
-
-  @Override
-  public void onCreate() {
-    mNotificationManager = (NotificationManager) getSystemService(NOTIFICATION_SERVICE);
-    try {
-      mStartForeground = getClass().getMethod("startForeground", mStartForegroundSignature);
-      mStopForeground = getClass().getMethod("stopForeground", mStopForegroundSignature);
-    } catch (NoSuchMethodException e) {
-      // Running on an older platform.
-      mStartForeground = mStopForeground = null;
-    }
-    startForegroundCompat(createNotification());
-  }
-
-  @Override
-  public void onDestroy() {
-    // Make sure our notification is gone.
-    stopForegroundCompat();
-  }
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/FutureActivityTaskExecutor.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/FutureActivityTaskExecutor.java
deleted file mode 100644
index 5634294b..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/FutureActivityTaskExecutor.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (C) 2010 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.
- */
-
-package org.qpython.qsl4a.qsl4a;
-
-import android.content.Context;
-import android.content.Intent;
-
-
-import org.qpython.qsl4a.qsl4a.activity.FutureActivity;
-import org.qpython.qsl4a.qsl4a.future.FutureActivityTask;
-
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.atomic.AtomicInteger;
-
-public class FutureActivityTaskExecutor {
-
-  private final Context mContext;
-  private final Map<Integer, FutureActivityTask<?>> mTaskMap =
-      new ConcurrentHashMap<Integer, FutureActivityTask<?>>();
-  private final AtomicInteger mIdGenerator = new AtomicInteger(0);
-
-  public FutureActivityTaskExecutor(Context context) {
-    mContext = context;
-  }
-
-  public void execute(FutureActivityTask<?> task) {
-    int id = mIdGenerator.incrementAndGet();
-    mTaskMap.put(id, task);
-    launchHelper(id);
-  }
-
-  public FutureActivityTask<?> getTask(int id) {
-    return mTaskMap.remove(id);
-  }
-
-  private void launchHelper(int id) {
-    Intent helper = new Intent(mContext, FutureActivity.class);
-    helper.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
-    helper.putExtra(Constants.EXTRA_TASK_ID, id);
-    mContext.startActivity(helper);
-  }
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/IntentBuilders.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/IntentBuilders.java
deleted file mode 100644
index e8b1d154..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/IntentBuilders.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- * Copyright (C) 2009 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.
- */
-
-package org.qpython.qsl4a.qsl4a;
-
-import android.app.PendingIntent;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.os.Parcelable;
-
-import org.qpython.qsl4a.qsl4a.interpreter.Interpreter;
-
-import java.io.File;
-
-public class IntentBuilders {
-  /** An arbitrary value that is used to identify pending intents for executing scripts. */
-  private static final int EXECUTE_SCRIPT_REQUEST_CODE = 0x12f412a;
-
-  private IntentBuilders() {
-    // Utility class.
-  }
-
-  public static Intent buildTriggerServiceIntent() {
-    Intent intent = new Intent();
-    intent.setComponent(Constants.TRIGGER_SERVICE_COMPONENT_NAME);
-    return intent;
-  }
-
-  /**
-   * Builds an intent that will launch a script in the background.
-   * 
-   * @param script
-   *          the script to launch
-   * @return the intent that will launch the script
-   */
-  public static Intent buildStartInBackgroundIntent(File script) {
-    final ComponentName componentName = Constants.SL4A_SERVICE_LAUNCHER_COMPONENT_NAME;
-    Intent intent = new Intent();
-    intent.setComponent(componentName);
-    intent.setAction(Constants.ACTION_LAUNCH_BACKGROUND_SCRIPT);
-    intent.putExtra(Constants.EXTRA_SCRIPT_PATH, script.getAbsolutePath());
-    return intent;
-  }
-
-  /**
-   * Builds an intent that launches a script in a terminal.
-   * 
-   * @param script
-   *          the script to launch
-   * @return the intent that will launch the script
-   */
-  public static Intent buildStartInTerminalIntent(File script) {
-    final ComponentName componentName = Constants.SL4A_SERVICE_LAUNCHER_COMPONENT_NAME;
-    Intent intent = new Intent();
-    intent.setComponent(componentName);
-    intent.setAction(Constants.ACTION_LAUNCH_FOREGROUND_SCRIPT);
-    intent.putExtra(Constants.EXTRA_SCRIPT_PATH, script.getAbsolutePath());
-    return intent;
-  }
-
-  /**
-   * Builds an intent that launches an interpreter.
-   * 
-   * @param interpreterName
-   *          the interpreter to launch
-   * @return the intent that will launch the interpreter
-   */
-  public static Intent buildStartInterpreterIntent(String interpreterName) {
-    final ComponentName componentName = Constants.SL4A_SERVICE_LAUNCHER_COMPONENT_NAME;
-    Intent intent = new Intent();
-    intent.setComponent(componentName);
-    intent.setAction(Constants.ACTION_LAUNCH_INTERPRETER);
-    intent.putExtra(Constants.EXTRA_INTERPRETER_NAME, interpreterName);
-    return intent;
-  }
-
-  /**
-   * Builds an intent that creates a shortcut to launch the provided interpreter.
-   * 
-   * @param interpreter
-   *          the interpreter to link to
-   * @param iconResource
-   *          the icon resource to associate with the shortcut
-   * @return the intent that will create the shortcut
-   */
-  public static Intent buildInterpreterShortcutIntent(Interpreter interpreter,
-      Parcelable iconResource) {
-    Intent intent = new Intent();
-    intent.putExtra(Intent.EXTRA_SHORTCUT_INTENT,
-        buildStartInterpreterIntent(interpreter.getName()));
-    intent.putExtra(Intent.EXTRA_SHORTCUT_NAME, interpreter.getNiceName());
-    intent.putExtra(Intent.EXTRA_SHORTCUT_ICON_RESOURCE, iconResource);
-    return intent;
-  }
-
-  /**
-   * Builds an intent that creates a shortcut to launch the provided script in the background.
-   * 
-   * @param script
-   *          the script to link to
-   * @param iconResource
-   *          the icon resource to associate with the shortcut
-   * @return the intent that will create the shortcut
-   */
-  public static Intent buildBackgroundShortcutIntent(File script, Parcelable iconResource) {
-    Intent intent = new Intent();
-    intent.putExtra(Intent.EXTRA_SHORTCUT_INTENT, buildStartInBackgroundIntent(script));
-    intent.putExtra(Intent.EXTRA_SHORTCUT_NAME, script.getName());
-    intent.putExtra(Intent.EXTRA_SHORTCUT_ICON_RESOURCE, iconResource);
-    return intent;
-  }
-
-  /**
-   * Builds an intent that creates a shortcut to launch the provided script in a terminal.
-   * 
-   * @param script
-   *          the script to link to
-   * @param iconResource
-   *          the icon resource to associate with the shortcut
-   * @return the intent that will create the shortcut
-   */
-  public static Intent buildTerminalShortcutIntent(File script, Parcelable iconResource) {
-    Intent intent = new Intent();
-    intent.putExtra(Intent.EXTRA_SHORTCUT_INTENT, buildStartInTerminalIntent(script));
-    intent.putExtra(Intent.EXTRA_SHORTCUT_NAME, script.getName());
-    intent.putExtra(Intent.EXTRA_SHORTCUT_ICON_RESOURCE, iconResource);
-    return intent;
-  }
-
-  /**
-   * Creates a pending intent that can be used to start the trigger service.
-   * 
-   * @param context
-   *          the context under whose authority to launch the intent
-   * 
-   * @return {@link PendingIntent} object for running the trigger service
-   */
-  public static PendingIntent buildTriggerServicePendingIntent(Context context) {
-    final Intent intent = buildTriggerServiceIntent();
-    return PendingIntent.getService(context, EXECUTE_SCRIPT_REQUEST_CODE, intent,
-        PendingIntent.FLAG_UPDATE_CURRENT);
-  }
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/IoUtils.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/IoUtils.java
deleted file mode 100644
index e6b52bac..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/IoUtils.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (C) 2010 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.
- */
-
-package org.qpython.qsl4a.qsl4a;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-public class IoUtils {
-  private static final int BUFFER_SIZE = 1024 * 8;
-
-  private IoUtils() {
-    // Utility class.
-  }
-
-  public static int copy(InputStream input, OutputStream output) throws Exception, IOException {
-    byte[] buffer = new byte[BUFFER_SIZE];
-
-    BufferedInputStream in = new BufferedInputStream(input, BUFFER_SIZE);
-    BufferedOutputStream out = new BufferedOutputStream(output, BUFFER_SIZE);
-    int count = 0, n = 0;
-    try {
-      while ((n = in.read(buffer, 0, BUFFER_SIZE)) != -1) {
-        out.write(buffer, 0, n);
-        count += n;
-      }
-      out.flush();
-    } finally {
-      try {
-        out.close();
-      } catch (IOException e) {
-        Log.e(e.getMessage(), e);
-      }
-      try {
-        in.close();
-      } catch (IOException e) {
-        Log.e(e.getMessage(), e);
-      }
-    }
-    return count;
-  }
-
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/Log.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/Log.java
deleted file mode 100644
index 284d3646..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/Log.java
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
- * Copyright (C) 2009 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.
- */
-
-package org.qpython.qsl4a.qsl4a;
-
-import android.app.AlertDialog;
-import android.app.Notification;
-import android.app.NotificationManager;
-import android.app.PendingIntent;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.widget.Toast;
-
-public class Log {
-  private Log() {
-    // Utility class.
-  }
-
-  private static String getTag() {
-    StackTraceElement[] stackTraceElements = Thread.currentThread().getStackTrace();
-    String fullClassName = stackTraceElements[4].getClassName();
-    String className = fullClassName.substring(fullClassName.lastIndexOf(".") + 1);
-    int lineNumber = stackTraceElements[4].getLineNumber();
-    return "sl4a." + className + ":" + lineNumber;
-  }
-
-  private static void toast(Context context, String message) {
-    Toast.makeText(context, message, Toast.LENGTH_SHORT).show();
-  }
-
-  @SuppressWarnings("deprecation")
-public static void notify(Context context, String title, String contentTitle, String message) {
-    android.util.Log.v(getTag(), String.format("%s %s", contentTitle, message));
-
-    String packageName = context.getPackageName();
-    int iconId = context.getResources().getIdentifier("stat_sys_warning", "drawable", packageName);
-    NotificationManager notificationManager =
-        (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
-    Notification note = new Notification(iconId > 0 ? iconId : -1, title, 0);
-    //note.setLatestEventInfo(context, contentTitle, message, PendingIntent.getService(context, 0,
-    //    null, 0));
-    note.contentView.getLayoutId();
-    notificationManager.notify(NotificationIdFactory.create(), note);
-  }
-
-  public static void showDialog(final Context context, final String title, final String message) {
-    android.util.Log.v(getTag(), String.format("%s %s", title, message));
-
-    MainThread.run(context, new Runnable() {
-      @Override
-      public void run() {
-        AlertDialog.Builder builder = new AlertDialog.Builder(context);
-        builder.setTitle(title);
-        builder.setMessage(message);
-
-        DialogInterface.OnClickListener buttonListener = new DialogInterface.OnClickListener() {
-          @Override
-          public void onClick(DialogInterface dialog, int which) {
-            dialog.dismiss();
-          }
-        };
-        builder.setPositiveButton("Ok", buttonListener);
-        builder.show();
-      }
-    });
-  }
-
-  public static void v(String message) {
-    android.util.Log.v(getTag(), message);
-  }
-
-  public static void v(String message, Throwable e) {
-    android.util.Log.v(getTag(), message, e);
-  }
-
-  public static void v(Context context, String message) {
-    toast(context, message);
-    android.util.Log.v(getTag(), message);
-  }
-
-  public static void v(Context context, String message, Throwable e) {
-    toast(context, message);
-    android.util.Log.v(getTag(), message, e);
-  }
-
-  public static void e(Throwable e) {
-    android.util.Log.e(getTag(), "Error", e);
-  }
-
-  public static void e(String message) {
-    android.util.Log.e(getTag(), message);
-  }
-
-  public static void e(String message, Throwable e) {
-    android.util.Log.e(getTag(), message, e);
-  }
-
-  public static void e(Context context, String message) {
-    toast(context, message);
-    android.util.Log.e(getTag(), message);
-  }
-
-  public static void e(Context context, String message, Throwable e) {
-    toast(context, message);
-    android.util.Log.e(getTag(), message, e);
-  }
-
-  public static void w(Throwable e) {
-    android.util.Log.w(getTag(), "Warning", e);
-  }
-
-  public static void w(String message) {
-    android.util.Log.w(getTag(), message);
-  }
-
-  public static void w(String message, Throwable e) {
-    android.util.Log.w(getTag(), message, e);
-  }
-
-  public static void w(Context context, String message) {
-    toast(context, message);
-    android.util.Log.w(getTag(), message);
-  }
-
-  public static void w(Context context, String message, Throwable e) {
-    toast(context, message);
-    android.util.Log.w(getTag(), message, e);
-  }
-
-  public static void d(String message) {
-    android.util.Log.d(getTag(), message);
-  }
-
-  public static void d(String message, Throwable e) {
-    android.util.Log.d(getTag(), message, e);
-  }
-
-  public static void d(Context context, String message) {
-    toast(context, message);
-    android.util.Log.d(getTag(), message);
-  }
-
-  public static void d(Context context, String message, Throwable e) {
-    toast(context, message);
-    android.util.Log.d(getTag(), message, e);
-  }
-
-  public static void i(String message) {
-    android.util.Log.i(getTag(), message);
-  }
-
-  public static void i(String message, Throwable e) {
-    android.util.Log.i(getTag(), message, e);
-  }
-
-  public static void i(Context context, String message) {
-    toast(context, message);
-    android.util.Log.i(getTag(), message);
-  }
-
-  public static void i(Context context, String message, Throwable e) {
-    toast(context, message);
-    android.util.Log.i(getTag(), message, e);
-  }
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/MainThread.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/MainThread.java
deleted file mode 100644
index da6cf93d..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/MainThread.java
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright 2010 Google Inc. All Rights Reserved.
-
-package org.qpython.qsl4a.qsl4a;
-
-import android.content.Context;
-import android.os.Handler;
-
-
-import org.qpython.qsl4a.qsl4a.future.FutureResult;
-
-import java.util.concurrent.Callable;
-
-public class MainThread {
-
-  private MainThread() {
-    // Utility class.
-  }
-
-  /**
-   * Executed in the main thread, returns the result of an execution. Anything that runs here should
-   * finish quickly to avoid hanging the UI thread.
-   */
-  public static <T> T run(Context context, final Callable<T> task) {
-    final FutureResult<T> result = new FutureResult<T>();
-    Handler handler = new Handler(context.getMainLooper());
-    handler.post(new Runnable() {
-      @Override
-      public void run() {
-        try {
-          result.set(task.call());
-        } catch (Exception e) {
-          Log.e(e);
-          result.set(null);
-        }
-      }
-    });
-    try {
-      return result.get();
-    } catch (InterruptedException e) {
-      Log.e(e);
-    }
-    return null;
-  }
-
-  public static void run(Context context, final Runnable task) {
-    Handler handler = new Handler(context.getMainLooper());
-    handler.post(new Runnable() {
-      @Override
-      public void run() {
-        task.run();
-      }
-    });
-  }
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/NotificationIdFactory.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/NotificationIdFactory.java
deleted file mode 100644
index db0b3499..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/NotificationIdFactory.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2010 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.
- */
-
-package org.qpython.qsl4a.qsl4a;
-
-import java.util.concurrent.atomic.AtomicInteger;
-
-/**
- * Creates unique ids to identify the notifications created by the android scripting service and the
- * trigger service.
- * 
- * @author Felix Arends (felix.arends@gmail.com)
- * 
- */
-public final class NotificationIdFactory {
-  private static final AtomicInteger mNextId = new AtomicInteger(0);
-
-  public static int create() {
-    return mNextId.incrementAndGet();
-  }
-
-  private NotificationIdFactory() {
-  }
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/Process.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/Process.java
deleted file mode 100644
index dc66d282..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/Process.java
+++ /dev/null
@@ -1,205 +0,0 @@
-/*
- * Copyright (C) 2010 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.
- */
-
-package org.qpython.qsl4a.qsl4a;
-
-import org.qpython.qsl4a.codec.StreamGobbler;
-import org.qpython.qsl4a.qsl4a.interpreter.InterpreterConstants;
-
-import java.io.File;
-import java.io.FileDescriptor;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.concurrent.atomic.AtomicInteger;
-
-public class Process {
-
-  private static final int DEFAULT_BUFFER_SIZE = 8192;
-
-  private final List<String> mArguments;
-  private final Map<String, String> mEnvironment;
-
-  private static final int PID_INIT_VALUE = -1;
-
-  private File mBinary;
-  private String mName;
-  private long mStartTime;
-  private long mEndTime;
-
-  protected final AtomicInteger mPid;
-  protected FileDescriptor mFd;
-  protected OutputStream mOut;
-  protected InputStream mIn;
-  protected File mLog;
-
-  public Process() {
-    mArguments = new ArrayList<String>();
-    mEnvironment = new HashMap<String, String>();
-    mPid = new AtomicInteger(PID_INIT_VALUE);
-  }
-
-  public void addArgument(String argument) {
-    mArguments.add(argument);
-  }
-
-  public void addAllArguments(List<String> arguments) {
-    mArguments.addAll(arguments);
-  }
-
-  public void putAllEnvironmentVariables(Map<String, String> environment) {
-    mEnvironment.putAll(environment);
-  }
-
-  public void putEnvironmentVariable(String key, String value) {
-    mEnvironment.put(key, value);
-  }
-
-  public void setBinary(File binary) {
-    if (!binary.exists()) {
-      throw new RuntimeException("Binary " + binary + " does not exist!");
-    }
-    mBinary = binary;
-  }
-
-  public Integer getPid() {
-    return mPid.get();
-  }
-
-  public FileDescriptor getFd() {
-    return mFd;
-  }
-
-  public OutputStream getOut() {
-    return mOut;
-  }
-
-  public OutputStream getErr() {
-    return getOut();
-  }
-
-  public File getLogFile() {
-    return mLog;
-  }
-
-  public InputStream getIn() {
-    return mIn;
-  }
-
-  public void start(final Runnable shutdownHook) {
-    if (isAlive()) {
-      throw new RuntimeException("Attempted to start process that is already running.");
-    }
-
-    String binaryPath = mBinary.getAbsolutePath();
-    Log.v("Executing " + binaryPath + " with arguments " + mArguments + " and with environment "
-        + mEnvironment.toString());
-
-    int[] pid = new int[1];
-    String[] argumentsArray = mArguments.toArray(new String[mArguments.size()]);
-    mLog = new File(String.format("%s/%s.log", InterpreterConstants.SDCARD_SL4A_ROOT, getName()));
-
-    mFd =
-        Exec.createSubprocess(binaryPath, argumentsArray, getEnvironmentArray(),
-            getWorkingDirectory(), pid);
-    mPid.set(pid[0]);
-    mOut = new FileOutputStream(mFd);
-    mIn = new StreamGobbler(new FileInputStream(mFd), mLog, DEFAULT_BUFFER_SIZE);
-    mStartTime = System.currentTimeMillis();
-
-    new Thread(new Runnable() {
-      public void run() {
-        int result = Exec.waitFor(mPid.get());
-        mEndTime = System.currentTimeMillis();
-        int pid = mPid.getAndSet(PID_INIT_VALUE);
-        Log.v("Process " + pid + " exited with result code " + result + ".");
-        try {
-          mIn.close();
-        } catch (IOException e) {
-          Log.e(e);
-        }
-        try {
-          mOut.close();
-        } catch (IOException e) {
-          Log.e(e);
-        }
-        if (shutdownHook != null) {
-          shutdownHook.run();
-        }
-      }
-    }).start();
-  }
-
-  private String[] getEnvironmentArray() {
-    List<String> environmentVariables = new ArrayList<String>();
-    for (Entry<String, String> entry : mEnvironment.entrySet()) {
-      environmentVariables.add(entry.getKey() + "=" + entry.getValue());
-    }
-    String[] environment = environmentVariables.toArray(new String[environmentVariables.size()]);
-    return environment;
-  }
-
-  public void kill() {
-    if (isAlive()) {
-      android.os.Process.killProcess(mPid.get());
-      Log.v("Killed process " + mPid);
-    }
-  }
-
-  public boolean isAlive() {
-    return (mFd != null && mFd.valid()) && mPid.get() != PID_INIT_VALUE;
-  }
-
-  public String getUptime() {
-    long ms;
-    if (!isAlive()) {
-      ms = mEndTime - mStartTime;
-    } else {
-      ms = System.currentTimeMillis() - mStartTime;
-    }
-    StringBuilder buffer = new StringBuilder();
-    int days = (int) (ms / (1000 * 60 * 60 * 24));
-    int hours = (int) (ms % (1000 * 60 * 60 * 24)) / 3600000;
-    int minutes = (int) (ms % 3600000) / 60000;
-    int seconds = (int) (ms % 60000) / 1000;
-    if (days != 0) {
-      buffer.append(String.format("%02d:%02d:", days, hours));
-    } else if (hours != 0) {
-      buffer.append(String.format("%02d:", hours));
-    }
-    buffer.append(String.format("%02d:%02d", minutes, seconds));
-    return buffer.toString();
-  }
-
-  public String getName() {
-    return mName;
-  }
-
-  public void setName(String name) {
-    mName = name;
-  }
-
-  public String getWorkingDirectory() {
-    return null;
-  }
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/ScriptLauncher.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/ScriptLauncher.java
deleted file mode 100644
index 2a573fee..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/ScriptLauncher.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright (C) 2009 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.
- */
-
-package org.qpython.qsl4a.qsl4a;
-
-import android.app.Service;
-import android.content.Intent;
-
-
-import java.io.File;
-
-import org.qpython.qsl4a.QSL4APP;
-import org.qpython.qsl4a.qsl4a.facade.FacadeConfiguration;
-import org.qpython.qsl4a.qsl4a.facade.FacadeManager;
-import org.qpython.qsl4a.qsl4a.interpreter.Interpreter;
-import org.qpython.qsl4a.qsl4a.interpreter.InterpreterConfiguration;
-import org.qpython.qsl4a.qsl4a.interpreter.InterpreterProcess;
-import org.qpython.qsl4a.qsl4a.interpreter.html.HtmlActivityTask;
-import org.qpython.qsl4a.qsl4a.interpreter.html.HtmlInterpreter;
-
-public class ScriptLauncher {
-
-  private ScriptLauncher() {
-    // Utility class.
-  }
-
-  public static HtmlActivityTask launchHtmlScript(File script, Service service, Intent intent,
-                                                  InterpreterConfiguration config) {
-    if (!script.exists()) {
-      throw new RuntimeException("No such script to launch.");
-    }
-    HtmlInterpreter interpreter =
-        (HtmlInterpreter) config.getInterpreterByName(HtmlInterpreter.HTML);
-    if (interpreter == null) {
-      throw new RuntimeException("HtmlInterpreter is not available.");
-    }
-    final FacadeManager manager =
-        new FacadeManager(FacadeConfiguration.getSdkLevel(), service, intent,
-            FacadeConfiguration.getFacadeClasses());
-    FutureActivityTaskExecutor executor =
-        ((QSL4APP) service.getApplication()).getTaskExecutor();
-    final HtmlActivityTask task =
-        new HtmlActivityTask(manager, interpreter.getAndroidJsSource(),
-            interpreter.getJsonSource(), script.getAbsolutePath(), true);
-    executor.execute(task);
-    return task;
-  }
-
-  public static InterpreterProcess launchInterpreter(final AndroidProxy proxy, Intent intent,
-                                                     InterpreterConfiguration config, Runnable shutdownHook) {
-    Interpreter interpreter;
-    String interpreterName;
-    interpreterName = intent.getStringExtra(Constants.EXTRA_INTERPRETER_NAME);
-    interpreter = config.getInterpreterByName(interpreterName);
-    InterpreterProcess process = new InterpreterProcess(interpreter, proxy);
-    if (shutdownHook == null) {
-      process.start(new Runnable() {
-        @Override
-        public void run() {
-          proxy.shutdown();
-        }
-      });
-    } else {
-      process.start(shutdownHook);
-    }
-    return process;
-  }
-
-  public static ScriptProcess launchScript(File script, InterpreterConfiguration configuration,
-      final AndroidProxy proxy, Runnable shutdownHook) {
-    if (!script.exists()) {
-      throw new RuntimeException("No such script to launch.");
-    }
-    ScriptProcess process = new ScriptProcess(script, configuration, proxy);
-    if (shutdownHook == null) {
-      process.start(new Runnable() {
-        @Override
-        public void run() {
-          proxy.shutdown();
-        }
-      });
-    } else {
-      process.start(shutdownHook);
-    }
-    return process;
-  }
-}
\ No newline at end of file
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/ScriptProcess.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/ScriptProcess.java
deleted file mode 100644
index f5b7433e..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/ScriptProcess.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2010 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.
- */
-
-package org.qpython.qsl4a.qsl4a;
-
-import org.qpython.qsl4a.qsl4a.interpreter.Interpreter;
-import org.qpython.qsl4a.qsl4a.interpreter.InterpreterConfiguration;
-import org.qpython.qsl4a.qsl4a.interpreter.InterpreterProcess;
-
-import java.io.File;
-
-public class ScriptProcess extends InterpreterProcess {
-
-  private final File mScript;
-
-  public ScriptProcess(File script, InterpreterConfiguration configuration, AndroidProxy proxy) {
-    super(configuration.getInterpreterForScript(script.getName()), proxy);
-    mScript = script;
-    String scriptName = script.getName();
-    setName(scriptName);
-    Interpreter interpreter = configuration.getInterpreterForScript(scriptName);
-    setCommand(String.format(interpreter.getScriptCommand(), script.getAbsolutePath()));
-  }
-
-  public String getPath() {
-    return mScript.getPath();
-  }
-
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/ScriptStorageAdapter.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/ScriptStorageAdapter.java
deleted file mode 100644
index 05f5928b..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/ScriptStorageAdapter.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Copyright (C) 2009 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.
- */
-
-package org.qpython.qsl4a.qsl4a;
-
-import org.qpython.qsl4a.qsl4a.interpreter.Interpreter;
-import org.qpython.qsl4a.qsl4a.interpreter.InterpreterConfiguration;
-import org.qpython.qsl4a.qsl4a.interpreter.InterpreterConstants;
-
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-
-/**
- * Manages storage and retrieval of scripts on the file system.
- * 
- * @author Damon Kohler (damonkohler@gmail.com)
- */
-public class ScriptStorageAdapter {
-
-  private ScriptStorageAdapter() {
-    // Utility class.
-  }
-
-  /**
-   * Writes data to the script by name and overwrites any existing data.
-   */
-  public static void writeScript(File script, String data) {
-    if (script.getParent() == null) {
-      script = new File(InterpreterConstants.SCRIPTS_ROOT, script.getPath());
-    }
-    try {
-      FileWriter stream = new FileWriter(script, false /* overwrite */);
-      BufferedWriter out = new BufferedWriter(stream);
-      out.write(data);
-      out.close();
-    } catch (IOException e) {
-      Log.e("Failed to write script.", e);
-    }
-  }
-
-  /**
-   * Returns a list of all available script {@link File}s.
-   */
-  public static List<File> listAllScripts(File dir) {
-    if (dir == null) {
-      dir = new File(InterpreterConstants.SCRIPTS_ROOT);
-    }
-    if (dir.exists()) {
-      List<File> scripts = Arrays.asList(dir.listFiles());
-      Collections.sort(scripts, new Comparator<File>() {
-        @Override
-        public int compare(File file1, File file2) {
-          if (file1.isDirectory() && !file2.isDirectory()) {
-            return -1;
-          } else if (!file1.isDirectory() && file2.isDirectory()) {
-            return 1;
-          }
-          return file1.compareTo(file2);
-        }
-      });
-      return scripts;
-    }
-    return new ArrayList<File>();
-  }
-
-  /**
-   * Returns a list of script {@link File}s from the given folder for which there is an interpreter
-   * installed.
-   */
-  public static List<File> listExecutableScripts(File directory, InterpreterConfiguration config) {
-    // NOTE(damonkohler): Creating a LinkedList here is necessary in order to be able to filter it
-    // later.
-    List<File> scripts = new LinkedList<File>(listAllScripts(directory));
-    // Filter out any files that don't have interpreters installed.
-    for (Iterator<File> it = scripts.iterator(); it.hasNext();) {
-      File script = it.next();
-      if (script.isDirectory()) {
-        continue;
-      }
-      Interpreter interpreter = config.getInterpreterForScript(script.getName());
-      if (interpreter == null || !interpreter.isInstalled()) {
-        it.remove();
-      }
-    }
-    return scripts;
-  }
-
-  /**
-   * Returns a list of all (including subfolders) script {@link File}s for which there is an
-   * interpreter installed.
-   */
-  public static List<File> listExecutableScriptsRecursively(File directory,
-      InterpreterConfiguration config) {
-    // NOTE(damonkohler): Creating a LinkedList here is necessary in order to be able to filter it
-    // later.
-    List<File> scripts = new LinkedList<File>();
-    List<File> files = listAllScripts(directory);
-
-    // Filter out any files that don't have interpreters installed.
-    for (Iterator<File> it = files.iterator(); it.hasNext();) {
-      File file = it.next();
-      if (file.isDirectory()) {
-        scripts.addAll(listExecutableScriptsRecursively(file, config));
-      }
-      Interpreter interpreter = config.getInterpreterForScript(file.getName());
-      if (interpreter != null && interpreter.isInstalled()) {
-        scripts.add(file);
-      }
-    }
-    Collections.sort(scripts);
-    return scripts;
-  }
-}
\ No newline at end of file
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/SimpleServer.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/SimpleServer.java
deleted file mode 100644
index 26d17d07..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/SimpleServer.java
+++ /dev/null
@@ -1,259 +0,0 @@
-/*
- * Copyright (C) 2009 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.
- */
-
-package org.qpython.qsl4a.qsl4a;
-
-import com.google.common.collect.Lists;
-
-import java.io.IOException;
-import java.net.Inet4Address;
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.net.NetworkInterface;
-import java.net.ServerSocket;
-import java.net.Socket;
-import java.net.SocketException;
-import java.net.UnknownHostException;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.List;
-import java.util.concurrent.CopyOnWriteArrayList;
-
-/**
- * A simple server.
- * 
- * @author Damon Kohler (damonkohler@gmail.com)
- */
-public abstract class SimpleServer {
-
-  private final CopyOnWriteArrayList<ConnectionThread> mConnectionThreads =
-      new CopyOnWriteArrayList<ConnectionThread>();
-  private final List<SimpleServerObserver> mObservers = Lists.newArrayList();
-  private volatile boolean mStopServer = false;
-  private ServerSocket mServer;
-  private Thread mServerThread;
-
-  public interface SimpleServerObserver {
-    public void onConnect();
-
-    public void onDisconnect();
-  }
-
-  protected abstract void handleConnection(Socket socket) throws Exception;
-
-  /** Adds an observer. */
-  public void addObserver(SimpleServerObserver observer) {
-    mObservers.add(observer);
-  }
-
-  /** Removes an observer. */
-  public void removeObserver(SimpleServerObserver observer) {
-    mObservers.remove(observer);
-  }
-
-  private void notifyOnConnect() {
-    for (SimpleServerObserver observer : mObservers) {
-      observer.onConnect();
-    }
-  }
-
-  private void notifyOnDisconnect() {
-    for (SimpleServerObserver observer : mObservers) {
-      observer.onDisconnect();
-    }
-  }
-
-  private final class ConnectionThread extends Thread {
-    private final Socket mmSocket;
-
-    private ConnectionThread(Socket socket) {
-      setName("SimpleServer ConnectionThread " + getId());
-      mmSocket = socket;
-    }
-
-    @Override
-    public void run() {
-      Log.v("Server thread " + getId() + " started.");
-      try {
-        handleConnection(mmSocket);
-      } catch (Exception e) {
-        if (!mStopServer) {
-          Log.e("Server error.", e);
-        }
-      } finally {
-        close();
-        mConnectionThreads.remove(this);
-        notifyOnDisconnect();
-        Log.v("Server thread " + getId() + " died.");
-      }
-    }
-
-    private void close() {
-      if (mmSocket != null) {
-        try {
-          mmSocket.close();
-        } catch (IOException e) {
-          Log.e(e.getMessage(), e);
-        }
-      }
-    }
-  }
-
-  /** Returns the number of active connections to this server. */
-  public int getNumberOfConnections() {
-    return mConnectionThreads.size();
-  }
-
-  public static InetAddress getPublicInetAddress() throws UnknownHostException, SocketException {
-
-    InetAddress candidate = null;
-    Enumeration<NetworkInterface> nets = NetworkInterface.getNetworkInterfaces();
-    for (NetworkInterface netint : Collections.list(nets)) {
-      /*if (netint.isLoopback() || !netint.isUp()) { // Ignore if localhost or not active
-        continue;
-      }*/
-      Enumeration<InetAddress> addresses = netint.getInetAddresses();
-      for (InetAddress address : Collections.list(addresses)) {
-        if (address instanceof Inet4Address) {
-          return address; // Prefer ipv4
-        }
-        candidate = address; // Probably an ipv6
-      }
-    }
-    if (candidate != null) {
-      return candidate; // return ipv6 address if no suitable ipv6
-    }
-    return InetAddress.getLocalHost(); // No damn matches. Give up, return local host.
-  }
-
-  /**
-   * Starts the RPC server bound to the localhost address.
-   * 
-   * @param port
-   *          the port to bind to or 0 to pick any unused port
-   * 
-   * @return the port that the server is bound to
-   */
-  public InetSocketAddress startLocal(int port) {
-    InetAddress address;
-    try {
-      address = InetAddress.getLocalHost();
-      mServer = new ServerSocket(port, 5 /* backlog */, address);
-    } catch (Exception e) {
-      Log.e("Failed to start server.", e);
-      return null;
-    }
-    int boundPort = start();
-    return InetSocketAddress.createUnresolved(mServer.getInetAddress().getHostAddress(), boundPort);
-  }
-
-  /**
-   * data Starts the RPC server bound to the public facing address.
-   * 
-   * @param port
-   *          the port to bind to or 0 to pick any unused port
-   * 
-   * @return the port that the server is bound to
-   */
-  public InetSocketAddress startPublic(int port) {
-    InetAddress address;
-    try {
-      // address = getPublicInetAddress();
-      address = null;
-      mServer = new ServerSocket(port, 5 /* backlog */, address);
-    } catch (Exception e) {
-      Log.e("Failed to start server.", e);
-      return null;
-    }
-    int boundPort = start();
-    return InetSocketAddress.createUnresolved(mServer.getInetAddress().getHostAddress(), boundPort);
-  }
-
-  /**
-   * data Starts the RPC server bound to all interfaces
-   * 
-   * @param port
-   *          the port to bind to or 0 to pick any unused port
-   * 
-   * @return the port that the server is bound to
-   */
-  public InetSocketAddress startAllInterfaces(int port) {
-    try {
-      mServer = new ServerSocket(port, 5 /* backlog */);
-    } catch (Exception e) {
-      Log.e("Failed to start server.", e);
-      return null;
-    }
-    int boundPort = start();
-    return InetSocketAddress.createUnresolved(mServer.getInetAddress().getHostAddress(), boundPort);
-  }
-
-  private int start() {
-    mServerThread = new Thread() {
-      @Override
-      public void run() {
-        while (!mStopServer) {
-          try {
-            Socket sock = mServer.accept();
-            if (!mStopServer) {
-              startConnectionThread(sock);
-            } else {
-              sock.close();
-            }
-          } catch (IOException e) {
-            if (!mStopServer) {
-              Log.e("Failed to accept connection.", e);
-            }
-          }
-        }
-      }
-    };
-    mServerThread.start();
-    Log.v("Bound to " + mServer.getInetAddress());
-    return mServer.getLocalPort();
-  }
-
-  private void startConnectionThread(final Socket sock) {
-    ConnectionThread networkThread = new ConnectionThread(sock);
-    mConnectionThreads.add(networkThread);
-    networkThread.start();
-    notifyOnConnect();
-  }
-
-  public void shutdown() {
-    // Stop listening on the server socket to ensure that
-    // beyond this point there are no incoming requests.
-    mStopServer = true;
-    try {
-    	if (mServer!=null) {
-    		mServer.close();
-    	}
-    } catch (IOException e) {
-      Log.e("Failed to close server socket.", e);
-    }
-    // Since the server is not running, the mNetworkThreads set can only
-    // shrink from this point onward. We can just stop all of the running helper
-    // threads. In the worst case, one of the running threads will already have
-    // shut down. Since this is a CopyOnWriteList, we don't have to worry about
-    // concurrency issues while iterating over the set of threads.
-    for (ConnectionThread connectionThread : mConnectionThreads) {
-      connectionThread.close();
-    }
-    for (SimpleServerObserver observer : mObservers) {
-      removeObserver(observer);
-    }
-  }
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/SingleThreadExecutor.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/SingleThreadExecutor.java
deleted file mode 100644
index 5a72c0bf..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/SingleThreadExecutor.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2010 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.
- */
-
-package org.qpython.qsl4a.qsl4a;
-
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
-
-public class SingleThreadExecutor extends ThreadPoolExecutor {
-
-  public SingleThreadExecutor() {
-    super(1, 1, 0L, TimeUnit.MILLISECONDS, new LinkedBlockingQueue<Runnable>());
-  }
-
-  @Override
-  protected void afterExecute(Runnable r, Throwable t) {
-    if (t != null) {
-      throw new RuntimeException(t);
-    }
-  }
-}
\ No newline at end of file
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/StringUtils.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/StringUtils.java
deleted file mode 100644
index da1fa35c..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/StringUtils.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package org.qpython.qsl4a.qsl4a;
-
-import java.util.Collection;
-import java.util.Iterator;
-
-public class StringUtils {
-
-  private StringUtils() {
-    // Utility class.
-  }
-  public static String addSlashes(String txt)
-  {
-    if (null != txt)
-    {
-      txt = txt.replace("\\", "\\\\") ;
-      txt = txt.replace("\'", "\\\'") ;
-      //txt = txt.replace(" ", "\\ ") ;
-
-    }
-
-    return txt ;
-  }
-
-  public static String join(Collection<String> collection, String delimiter) {
-    StringBuffer buffer = new StringBuffer();
-    Iterator<String> iter = collection.iterator();
-    while (iter.hasNext()) {
-      buffer.append(iter.next());
-      if (iter.hasNext()) {
-        buffer.append(delimiter);
-      }
-    }
-    return buffer.toString();
-  }
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/Version.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/Version.java
deleted file mode 100644
index b40e2cdf..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/Version.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2009 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.
- */
-
-package org.qpython.qsl4a.qsl4a;
-
-import android.content.Context;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
-
-public class Version {
-
-  private Version() {
-    // Utility class.
-  }
-
-  public static String getVersion(Context context) {
-    try {
-      PackageInfo info = context.getPackageManager().getPackageInfo(context.getPackageName(), 0);
-      return info.versionName;
-    } catch (PackageManager.NameNotFoundException e) {
-      Log.e("Package name not found", e);
-    }
-    return "?";
-  }
-
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/activity/FutureActivity.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/activity/FutureActivity.java
deleted file mode 100644
index 378bb145..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/activity/FutureActivity.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
- * Copyright (C) 2010 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.
- */
-
-package org.qpython.qsl4a.qsl4a.activity;
-
-import android.app.Activity;
-import android.app.Service;
-import android.content.Intent;
-import android.content.pm.ResolveInfo;
-import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
-import android.view.ContextMenu;
-import android.view.ContextMenu.ContextMenuInfo;
-import android.view.KeyEvent;
-import android.view.Menu;
-import android.view.View;
-
-import org.qpython.qsl4a.QSL4APP;
-import org.qpython.qsl4a.qsl4a.Constants;
-import org.qpython.qsl4a.qsl4a.FutureActivityTaskExecutor;
-import org.qpython.qsl4a.qsl4a.Log;
-import org.qpython.qsl4a.qsl4a.future.FutureActivityTask;
-
-/**
- * This {@link Activity} is launched by {@link }s in order to perform operations that a
- * {@link Service} is unable to do. For example: start another activity for result, show dialogs,
- * etc.
- * 
- * @author Damon Kohler (damonkohler@gmail.com)
- */
-public class FutureActivity extends AppCompatActivity {
-  private FutureActivityTask<?> mTask;
-  
-  private int count = 0;
-
-  @Override
-  protected void onCreate(Bundle savedInstanceState) {
-    super.onCreate(savedInstanceState);
-    Log.v("FutureActivity created.");
-    int id = getIntent().getIntExtra(Constants.EXTRA_TASK_ID, 0);
-    if (id == 0) {
-      throw new RuntimeException("FutureActivityTask ID is not specified.");
-    }
-    // River Modify
-    FutureActivityTaskExecutor taskQueue = ((QSL4APP) getApplication()).getTaskExecutor();
-    mTask = taskQueue.getTask(id);
-    if (mTask == null) { // TODO: (Robbie) This is now less of a kludge. Would still like to know
-                         // what is happening.
-      Log.w("FutureActivity has no task!");
-      try {
-        Intent intent = new Intent(Intent.ACTION_MAIN); // Should default to main of current app.
-        intent.addCategory(Intent.CATEGORY_LAUNCHER);
-        String packageName = getPackageName();
-        for (ResolveInfo resolve : getPackageManager().queryIntentActivities(intent, 0)) {
-          if (resolve.activityInfo.packageName.equals(packageName)) {
-            intent.setClassName(packageName, resolve.activityInfo.name);
-            break;
-          }
-        }
-        startActivity(intent);
-      } catch (Exception e) {
-        Log.e("Can't find main activity.");
-      }
-    } else {
-      mTask.setActivity(this);
-      mTask.onCreate();
-    }
-  }
-
-  @Override
-  protected void onStart() {
-    super.onStart();
-    if (mTask != null) {
-      mTask.onStart();
-    }
-  }
-
-  @Override
-  protected void onResume() {
-    super.onResume();
-    if (mTask != null) {
-      mTask.onResume();
-    }
-  }
-
-  @Override
-  protected void onPause() {
-    super.onPause();
-    if (mTask != null) {
-      mTask.onPause();
-    }
-  }
-
-  @Override
-  protected void onStop() {
-    super.onStop();
-    if (mTask != null) {
-      mTask.onStop();
-    }
-  }
-
-  @Override
-  protected void onDestroy() {
-    super.onDestroy();
-    if (mTask != null) {
-      mTask.onDestroy();
-    }
-  }
-
-  @Override
-  public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) {
-    if (mTask != null) {
-      mTask.onCreateContextMenu(menu, v, menuInfo);
-    }
-  }
-
-  @Override
-  public boolean onPrepareOptionsMenu(Menu menu) {
-    super.onPrepareOptionsMenu(menu);
-    if (mTask == null) {
-      return false;
-    } else {
-      return mTask.onPrepareOptionsMenu(menu);
-    }
-  }
-
-  @Override
-  public void onActivityResult(int requestCode, int resultCode, Intent data) {
-    if (mTask != null) {
-      mTask.onActivityResult(requestCode, resultCode, data);
-    }
-  }
-
-	@Override
-	protected void onNewIntent(Intent intent) {
-		super.onNewIntent(intent);
-		if (mTask != null) {
-			mTask.onNewIntent(intent);
-		}
-	}
-  @Override
-  public boolean onKeyDown(int keyCode, KeyEvent event) {
-    if (mTask != null) {
-      return mTask.onKeyDown(keyCode, event);
-    }
-    return false;
-  }
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/bluetooth/BluetoothDiscoveryHelper.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/bluetooth/BluetoothDiscoveryHelper.java
deleted file mode 100644
index c85b73b9..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/bluetooth/BluetoothDiscoveryHelper.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright (C) 2010 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.
- */
-
-package org.qpython.qsl4a.qsl4a.bluetooth;
-
-import android.bluetooth.BluetoothAdapter;
-import android.bluetooth.BluetoothDevice;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-
-import java.util.Set;
-
-public class BluetoothDiscoveryHelper {
-
-  public static interface BluetoothDiscoveryListener {
-    public void addBondedDevice(String name, String address);
-
-    public void addDevice(String name, String address);
-
-    public void scanDone();
-  }
-
-  private final Context mContext;
-  private final BluetoothDiscoveryListener mListener;
-  private final BroadcastReceiver mReceiver;
-
-  public BluetoothDiscoveryHelper(Context context, BluetoothDiscoveryListener listener) {
-    mContext = context;
-    mListener = listener;
-    mReceiver = new BluetoothReceiver();
-  }
-
-  private class BluetoothReceiver extends BroadcastReceiver {
-    @Override
-    public void onReceive(Context context, Intent intent) {
-      final String action = intent.getAction();
-
-      if (BluetoothDevice.ACTION_FOUND.equals(action)) {
-        // Get the BluetoothDevice object from the Intent.
-        BluetoothDevice device = intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
-        // If it's already paired, skip it, because it's been listed already.
-        if (device.getBondState() != BluetoothDevice.BOND_BONDED) {
-          mListener.addDevice(device.getName(), device.getAddress());
-        }
-      } else if (BluetoothAdapter.ACTION_DISCOVERY_FINISHED.equals(action)) {
-        mListener.scanDone();
-      }
-    }
-  }
-
-  public void startDiscovery() {
-    BluetoothAdapter bluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
-
-    if (bluetoothAdapter.isDiscovering()) {
-      bluetoothAdapter.cancelDiscovery();
-    }
-
-    Set<BluetoothDevice> pairedDevices = bluetoothAdapter.getBondedDevices();
-    for (BluetoothDevice device : pairedDevices) {
-      mListener.addBondedDevice(device.getName(), device.getAddress());
-    }
-
-    final IntentFilter deviceFoundFilter = new IntentFilter(BluetoothDevice.ACTION_FOUND);
-    mContext.registerReceiver(mReceiver, deviceFoundFilter);
-
-    final IntentFilter discoveryFinishedFilter =
-        new IntentFilter(BluetoothAdapter.ACTION_DISCOVERY_FINISHED);
-    mContext.registerReceiver(mReceiver, discoveryFinishedFilter);
-
-    if (!bluetoothAdapter.isEnabled()) {
-      bluetoothAdapter.enable();
-    }
-
-    bluetoothAdapter.startDiscovery();
-  }
-
-  public void cancel() {
-    mContext.unregisterReceiver(mReceiver);
-    mListener.scanDone();
-  }
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/event/Event.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/event/Event.java
deleted file mode 100644
index e6144017..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/event/Event.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (C) 2010 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.
- */
-
-package org.qpython.qsl4a.qsl4a.event;
-
-import com.google.common.base.Preconditions;
-
-public class Event {
-
-  private String mName;
-  private Object mData;
-  private double mCreationTime;
-
-  public Event(String name, Object data) {
-    Preconditions.checkNotNull(name);
-    setName(name);
-    setData(data);
-    mCreationTime = System.currentTimeMillis() * 1000;
-  }
-
-  public void setName(String name) {
-    mName = name;
-  }
-
-  public String getName() {
-    return mName;
-  }
-
-  public void setData(Object data) {
-    mData = data;
-  }
-
-  public Object getData() {
-    return mData;
-  }
-
-  public double getCreationTime() {
-    return mCreationTime;
-  }
-
-  public boolean nameEquals(String name) {
-    return mName.equals(name);
-  }
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/exception/Sl4aException.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/exception/Sl4aException.java
deleted file mode 100644
index 2cbb4b9c..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/exception/Sl4aException.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2009 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.
- */
-
-package org.qpython.qsl4a.qsl4a.exception;
-
-@SuppressWarnings("serial")
-public class Sl4aException extends Exception {
-
-  public Sl4aException(Exception e) {
-    super(e);
-  }
-
-  public Sl4aException(String message) {
-    super(message);
-  }
-
-  public Sl4aException(String message, Exception e) {
-    super(message, e);
-  }
-
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/ActivityResultFacade.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/ActivityResultFacade.java
deleted file mode 100644
index 37db1f5b..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/ActivityResultFacade.java
+++ /dev/null
@@ -1,327 +0,0 @@
-/*
- * Copyright (C) 2010 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.
- */
-
-package org.qpython.qsl4a.qsl4a.facade;
-
-import android.app.Activity;
-import android.content.Intent;
-
-import org.qpython.qsl4a.qsl4a.Constants;
-import org.qpython.qsl4a.qsl4a.jsonrpc.RpcReceiver;
-import org.qpython.qsl4a.qsl4a.rpc.Rpc;
-import org.qpython.qsl4a.qsl4a.rpc.RpcParameter;
-
-import java.io.Serializable;
-
-/**
- * Allows you to return results to a startActivityForResult call.
- * 
- * @author Alexey Reznichenko (alexey.reznichenko@gmail.com)
- */
-public class ActivityResultFacade extends RpcReceiver {
-
-  private static final String sRpcDescription =
-      "Sets the result of a script execution. Whenever the script APK is called via "
-          + "startActivityForResult(), the resulting intent will contain " + Constants.EXTRA_RESULT
-          + " extra with the given value.";
-  private static final String sCodeDescription =
-      "The result code to propagate back to the originating activity, often RESULT_CANCELED (0) "
-          + "or RESULT_OK (-1)";
-
-  private Activity mActivity = null;
-  private Intent mResult = null;
-  private int mResultCode;
-
-  public ActivityResultFacade(FacadeManager manager) {
-    super(manager);
-  }
-
-  @Rpc(description = sRpcDescription)
-  public synchronized void setResultBoolean(
-      @RpcParameter(name = "resultCode", description = sCodeDescription) Integer resultCode,
-      @RpcParameter(name = "resultValue") Boolean resultValue) {
-    mResult = new Intent();
-    mResult.putExtra(Constants.EXTRA_RESULT, resultValue.booleanValue());
-    mResultCode = resultCode;
-    if (mActivity != null) {
-      setResult();
-    }
-  }
-
-  @Rpc(description = sRpcDescription)
-  public synchronized void setResultByte(
-      @RpcParameter(name = "resultCode", description = sCodeDescription) Integer resultCode,
-      @RpcParameter(name = "resultValue") Byte resultValue) {
-    mResult = new Intent();
-    mResult.putExtra(Constants.EXTRA_RESULT, resultValue.byteValue());
-    mResultCode = resultCode;
-    if (mActivity != null) {
-      setResult();
-    }
-  }
-
-  @Rpc(description = sRpcDescription)
-  public synchronized void setResultShort(
-      @RpcParameter(name = "resultCode", description = sCodeDescription) Integer resultCode,
-      @RpcParameter(name = "resultValue") Short resultValue) {
-    mResult = new Intent();
-    mResult.putExtra(Constants.EXTRA_RESULT, resultValue.shortValue());
-    mResultCode = resultCode;
-    if (mActivity != null) {
-      setResult();
-    }
-  }
-
-  @Rpc(description = sRpcDescription)
-  public synchronized void setResultChar(
-      @RpcParameter(name = "resultCode", description = sCodeDescription) Integer resultCode,
-      @RpcParameter(name = "resultValue") Character resultValue) {
-    mResult = new Intent();
-    mResult.putExtra(Constants.EXTRA_RESULT, resultValue.charValue());
-    mResultCode = resultCode;
-    if (mActivity != null) {
-      setResult();
-    }
-  }
-
-  @Rpc(description = sRpcDescription)
-  public synchronized void setResultInteger(
-      @RpcParameter(name = "resultCode", description = sCodeDescription) Integer resultCode,
-      @RpcParameter(name = "resultValue") Integer resultValue) {
-    mResult = new Intent();
-    mResult.putExtra(Constants.EXTRA_RESULT, resultValue.intValue());
-    mResultCode = resultCode;
-    if (mActivity != null) {
-      setResult();
-    }
-  }
-
-  @Rpc(description = sRpcDescription)
-  public synchronized void setResultLong(
-      @RpcParameter(name = "resultCode", description = sCodeDescription) Integer resultCode,
-      @RpcParameter(name = "resultValue") Long resultValue) {
-    mResult = new Intent();
-    mResult.putExtra(Constants.EXTRA_RESULT, resultValue.longValue());
-    mResultCode = resultCode;
-    if (mActivity != null) {
-      setResult();
-    }
-  }
-
-  @Rpc(description = sRpcDescription)
-  public synchronized void setResultFloat(
-      @RpcParameter(name = "resultCode", description = sCodeDescription) Integer resultCode,
-      @RpcParameter(name = "resultValue") Float resultValue) {
-    mResult = new Intent();
-    mResult.putExtra(Constants.EXTRA_RESULT, resultValue.floatValue());
-    mResultCode = resultCode;
-    if (mActivity != null) {
-      setResult();
-    }
-  }
-
-  @Rpc(description = sRpcDescription)
-  public synchronized void setResultDouble(
-      @RpcParameter(name = "resultCode", description = sCodeDescription) Integer resultCode,
-      @RpcParameter(name = "resultValue") Double resultValue) {
-    mResult = new Intent();
-    mResult.putExtra(Constants.EXTRA_RESULT, resultValue.doubleValue());
-    mResultCode = resultCode;
-    if (mActivity != null) {
-      setResult();
-    }
-  }
-
-  @Rpc(description = sRpcDescription)
-  public synchronized void setResultString(
-      @RpcParameter(name = "resultCode", description = sCodeDescription) Integer resultCode,
-      @RpcParameter(name = "resultValue") String resultValue) {
-    mResult = new Intent();
-    mResult.putExtra(Constants.EXTRA_RESULT, resultValue);
-    mResultCode = resultCode;
-    if (mActivity != null) {
-      setResult();
-    }
-  }
-
-  @Rpc(description = sRpcDescription)
-  public synchronized void setResultBooleanArray(
-      @RpcParameter(name = "resultCode", description = sCodeDescription) Integer resultCode,
-      @RpcParameter(name = "resultValue") Boolean[] resultValue) {
-    mResult = new Intent();
-    boolean[] array = new boolean[resultValue.length];
-    for (int i = 0; i < resultValue.length; i++) {
-      array[i] = resultValue[i];
-    }
-    mResult.putExtra(Constants.EXTRA_RESULT, array);
-    mResultCode = resultCode;
-    if (mActivity != null) {
-      setResult();
-    }
-  }
-
-  @Rpc(description = sRpcDescription)
-  public synchronized void setResultByteArray(
-      @RpcParameter(name = "resultCode", description = sCodeDescription) Integer resultCode,
-      @RpcParameter(name = "resultValue") Byte[] resultValue) {
-    mResult = new Intent();
-    byte[] array = new byte[resultValue.length];
-    for (int i = 0; i < resultValue.length; i++) {
-      array[i] = resultValue[i];
-    }
-    mResult.putExtra(Constants.EXTRA_RESULT, array);
-    mResultCode = resultCode;
-    if (mActivity != null) {
-      setResult();
-    }
-  }
-
-  @Rpc(description = sRpcDescription)
-  public synchronized void setResultShortArray(
-      @RpcParameter(name = "resultCode", description = sCodeDescription) Integer resultCode,
-      @RpcParameter(name = "resultValue") Short[] resultValue) {
-    mResult = new Intent();
-    short[] array = new short[resultValue.length];
-    for (int i = 0; i < resultValue.length; i++) {
-      array[i] = resultValue[i];
-    }
-    mResult.putExtra(Constants.EXTRA_RESULT, array);
-    mResultCode = resultCode;
-    if (mActivity != null) {
-      setResult();
-    }
-  }
-
-  @Rpc(description = sRpcDescription)
-  public synchronized void setResultCharArray(
-      @RpcParameter(name = "resultCode", description = sCodeDescription) Integer resultCode,
-      @RpcParameter(name = "resultValue") Character[] resultValue) {
-    mResult = new Intent();
-    char[] array = new char[resultValue.length];
-    for (int i = 0; i < resultValue.length; i++) {
-      array[i] = resultValue[i];
-    }
-    mResult.putExtra(Constants.EXTRA_RESULT, array);
-    mResultCode = resultCode;
-    if (mActivity != null) {
-      setResult();
-    }
-  }
-
-  @Rpc(description = sRpcDescription)
-  public synchronized void setResultIntegerArray(
-      @RpcParameter(name = "resultCode", description = sCodeDescription) Integer resultCode,
-      @RpcParameter(name = "resultValue") Integer[] resultValue) {
-    mResult = new Intent();
-    int[] array = new int[resultValue.length];
-    for (int i = 0; i < resultValue.length; i++) {
-      array[i] = resultValue[i];
-    }
-    mResult.putExtra(Constants.EXTRA_RESULT, array);
-    mResultCode = resultCode;
-    if (mActivity != null) {
-      setResult();
-    }
-  }
-
-  @Rpc(description = sRpcDescription)
-  public synchronized void setResultLongArray(
-      @RpcParameter(name = "resultCode", description = sCodeDescription) Integer resultCode,
-      @RpcParameter(name = "resultValue") Long[] resultValue) {
-    mResult = new Intent();
-    long[] array = new long[resultValue.length];
-    for (int i = 0; i < resultValue.length; i++) {
-      array[i] = resultValue[i];
-    }
-    mResult.putExtra(Constants.EXTRA_RESULT, array);
-    mResultCode = resultCode;
-    if (mActivity != null) {
-      setResult();
-    }
-  }
-
-  @Rpc(description = sRpcDescription)
-  public synchronized void setResultFloatArray(
-      @RpcParameter(name = "resultCode", description = sCodeDescription) Integer resultCode,
-      @RpcParameter(name = "resultValue") Float[] resultValue) {
-    mResult = new Intent();
-    float[] array = new float[resultValue.length];
-    for (int i = 0; i < resultValue.length; i++) {
-      array[i] = resultValue[i];
-    }
-    mResult.putExtra(Constants.EXTRA_RESULT, array);
-    mResultCode = resultCode;
-    if (mActivity != null) {
-      setResult();
-    }
-  }
-
-  @Rpc(description = sRpcDescription)
-  public synchronized void setResultDoubleArray(
-      @RpcParameter(name = "resultCode", description = sCodeDescription) Integer resultCode,
-      @RpcParameter(name = "resultValue") Double[] resultValue) {
-    mResult = new Intent();
-    double[] array = new double[resultValue.length];
-    for (int i = 0; i < resultValue.length; i++) {
-      array[i] = resultValue[i];
-    }
-    mResult.putExtra(Constants.EXTRA_RESULT, array);
-    mResultCode = resultCode;
-    if (mActivity != null) {
-      setResult();
-    }
-  }
-
-  @Rpc(description = sRpcDescription)
-  public synchronized void setResultStringArray(
-      @RpcParameter(name = "resultCode", description = sCodeDescription) Integer resultCode,
-      @RpcParameter(name = "resultValue") String[] resultValue) {
-    mResult = new Intent();
-    mResult.putExtra(Constants.EXTRA_RESULT, resultValue);
-    mResultCode = resultCode;
-    if (mActivity != null) {
-      setResult();
-    }
-  }
-
-  @Rpc(description = sRpcDescription)
-  public synchronized void setResultSerializable(
-      @RpcParameter(name = "resultCode", description = sCodeDescription) Integer resultCode,
-      @RpcParameter(name = "resultValue") Serializable resultValue) {
-    mResult = new Intent();
-    mResult.putExtra(Constants.EXTRA_RESULT, resultValue);
-    mResultCode = resultCode;
-    if (mActivity != null) {
-      setResult();
-    }
-  }
-
-  public synchronized void setActivity(Activity activity) {
-    mActivity = activity;
-    if (mResult != null) {
-      setResult();
-    }
-  }
-
-  private void setResult() {
-    mActivity.setResult(mResultCode, mResult);
-    mActivity.finish();
-  }
-
-  @Override
-  public void shutdown() {
-  }
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/AndroidFacade.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/AndroidFacade.java
deleted file mode 100644
index 5a61ae59..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/AndroidFacade.java
+++ /dev/null
@@ -1,767 +0,0 @@
-/*
- * Copyright (C) 2009 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.
- */
-
-package org.qpython.qsl4a.qsl4a.facade;
-
-import android.annotation.SuppressLint;
-import android.app.AlertDialog;
-import android.app.Notification;
-import android.app.NotificationManager;
-import android.app.PendingIntent;
-import android.app.Service;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.PackageManager.NameNotFoundException;
-import android.net.ConnectivityManager;
-import android.net.NetworkInfo;
-import android.net.Uri;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Looper;
-import android.os.StatFs;
-import android.os.Vibrator;
-import android.text.ClipboardManager;
-import android.text.InputType;
-import android.text.method.PasswordTransformationMethod;
-import android.widget.EditText;
-import android.widget.Toast;
-
-import org.qpython.qsl4a.QSL4APP;
-import org.qpython.qsl4a.qsl4a.FileUtils;
-import org.qpython.qsl4a.qsl4a.FutureActivityTaskExecutor;
-import org.qpython.qsl4a.qsl4a.Log;
-import org.qpython.qsl4a.qsl4a.NotificationIdFactory;
-
-
-import org.qpython.qsl4a.qsl4a.future.FutureActivityTask;
-import org.qpython.qsl4a.qsl4a.jsonrpc.RpcReceiver;
-import org.qpython.qsl4a.qsl4a.rpc.Rpc;
-import org.qpython.qsl4a.qsl4a.rpc.RpcDefault;
-import org.qpython.qsl4a.qsl4a.rpc.RpcDeprecated;
-import org.qpython.qsl4a.qsl4a.rpc.RpcOptional;
-import org.qpython.qsl4a.qsl4a.rpc.RpcParameter;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.TimeZone;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-/**
- * Some general purpose Android routines.<br>
- * <h2>Intents</h2> Intents are returned as a map, in the following form:<br>
- * <ul>
- * <li><b>action</b> - action.
- * <li><b>data</b> - url
- * <li><b>type</b> - mime type
- * <li><b>packagename</b> - name of package. If used, requires classname to be useful (optional)
- * <li><b>classname</b> - name of class. If used, requires packagename to be useful (optional)
- * <li><b>categories</b> - list of categories
- * <li><b>extras</b> - map of extras
- * <li><b>flags</b> - integer flags.
- * </ul>
- * <br>
- * An intent can be built using the {@see #makeIntent} call, but can also be constructed exterally.
- * 
- */
-@SuppressWarnings("deprecation")
-public class AndroidFacade extends RpcReceiver {
-  /**
-   * An instance of this interface is passed to the facade. From this object, the resource IDs can
-   * be obtained.
-   */
-  public interface Resources {
-    int getLogo48();
-  }
-
-  private final Service mService;
-  private final Handler mHandler;
-  private final Intent mIntent;
-  private final FutureActivityTaskExecutor mTaskQueue;
-
-  private final Vibrator mVibrator;
-  private final NotificationManager mNotificationManager;
-
-  private final Resources mResources;
-  private ClipboardManager mClipboard = null;
-
-  @Override
-  public void shutdown() {
-  }
-
-  public AndroidFacade(FacadeManager manager) {
-    super(manager);
-    mService = manager.getService();
-    mIntent = manager.getIntent();
-    // River Modify
-    QSL4APP application = ((QSL4APP) mService.getApplication());
-    mTaskQueue = application.getTaskExecutor();
-    mHandler = new Handler(mService.getMainLooper());
-    mVibrator = (Vibrator) mService.getSystemService(Context.VIBRATOR_SERVICE);
-    mNotificationManager =
-        (NotificationManager) mService.getSystemService(Context.NOTIFICATION_SERVICE);
-    mResources = manager.getAndroidFacadeResources();
-
-  }
-
-  ClipboardManager getClipboardManager() {
-    Object clipboard = null;
-    if (mClipboard == null) {
-      try {
-        clipboard = mService.getSystemService(Context.CLIPBOARD_SERVICE);
-      } catch (Exception e) {
-        Looper.prepare(); // Clipboard manager won't work without this on higher SDK levels...
-        clipboard = mService.getSystemService(Context.CLIPBOARD_SERVICE);
-      }
-      mClipboard = (ClipboardManager) clipboard;
-      if (mClipboard == null) {
-        Log.w("Clipboard managed not accessible.");
-      }
-    }
-    return mClipboard;
-  }
-
-  /**
-   * Creates a new AndroidFacade that simplifies the interface to various Android APIs.
-   * 
-   * @param service
-   *          is the {@link Context} the APIs will run under
-   */
-
-  @Rpc(description = "Put text in the clipboard.")
-  public void setClipboard(@RpcParameter(name = "text") String text) {
-    getClipboardManager().setText(text);
-  }
-
-  @Rpc(description = "Read text from the clipboard.", returns = "The text in the clipboard.")
-  public String getClipboard() {
-    CharSequence text = getClipboardManager().getText();
-    return text == null ? null : text.toString();
-  }
-
-  Intent startActivityForResult(final Intent intent) {
-    FutureActivityTask<Intent> task = new FutureActivityTask<Intent>() {
-      @Override
-      public void onCreate() {
-        super.onCreate();
-        try {
-          startActivityForResult(intent, 0);
-        } catch (Exception e) {
-          intent.putExtra("EXCEPTION", e.getMessage());
-          setResult(intent);
-        }
-      }
-
-      @Override
-      public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        setResult(data);
-      }
-    };
-    mTaskQueue.execute(task);
-
-    try {
-      return task.getResult();
-    } catch (Exception e) {
-      throw new RuntimeException(e);
-    } finally {
-      task.finish();
-    }
-  }
-
-  // TODO(damonkohler): Pull this out into proper argument deserialization and support
-  // complex/nested types being passed in.
-  public static void putExtrasFromJsonObject(JSONObject extras, Intent intent) throws JSONException {
-    JSONArray names = extras.names();
-    for (int i = 0; i < names.length(); i++) {
-      String name = names.getString(i);
-      Object data = extras.get(name);
-      if (data == null) {
-        continue;
-      }
-      if (data instanceof Integer) {
-        intent.putExtra(name, (Integer) data);
-      }
-      if (data instanceof Float) {
-        intent.putExtra(name, (Float) data);
-      }
-      if (data instanceof Double) {
-        intent.putExtra(name, (Double) data);
-      }
-      if (data instanceof Long) {
-        intent.putExtra(name, (Long) data);
-      }
-      if (data instanceof String) {
-        intent.putExtra(name, (String) data);
-      }
-      if (data instanceof Boolean) {
-        intent.putExtra(name, (Boolean) data);
-      }
-      // Nested JSONObject
-      if (data instanceof JSONObject) {
-        Bundle nestedBundle = new Bundle();
-        intent.putExtra(name, nestedBundle);
-        putNestedJSONObject((JSONObject) data, nestedBundle);
-      }
-      // Nested JSONArray. Doesn't support mixed types in single array
-      if (data instanceof JSONArray) {
-        // Empty array. No way to tell what type of data to pass on, so skipping
-        if (((JSONArray) data).length() == 0) {
-          Log.e("Empty array not supported in JSONObject, skipping");
-          continue;
-        }
-        // Integer
-        if (((JSONArray) data).get(0) instanceof Integer) {
-          Integer[] integerArrayData = new Integer[((JSONArray) data).length()];
-          for (int j = 0; j < ((JSONArray) data).length(); ++j) {
-            integerArrayData[j] = ((JSONArray) data).getInt(j);
-          }
-          intent.putExtra(name, integerArrayData);
-        }
-        // Double
-        if (((JSONArray) data).get(0) instanceof Double) {
-          Double[] doubleArrayData = new Double[((JSONArray) data).length()];
-          for (int j = 0; j < ((JSONArray) data).length(); ++j) {
-            doubleArrayData[j] = ((JSONArray) data).getDouble(j);
-          }
-          intent.putExtra(name, doubleArrayData);
-        }
-        // Long
-        if (((JSONArray) data).get(0) instanceof Long) {
-          Long[] longArrayData = new Long[((JSONArray) data).length()];
-          for (int j = 0; j < ((JSONArray) data).length(); ++j) {
-            longArrayData[j] = ((JSONArray) data).getLong(j);
-          }
-          intent.putExtra(name, longArrayData);
-        }
-        // String
-        if (((JSONArray) data).get(0) instanceof String) {
-          String[] stringArrayData = new String[((JSONArray) data).length()];
-          for (int j = 0; j < ((JSONArray) data).length(); ++j) {
-            stringArrayData[j] = ((JSONArray) data).getString(j);
-          }
-          intent.putExtra(name, stringArrayData);
-        }
-        // Boolean
-        if (((JSONArray) data).get(0) instanceof Boolean) {
-          Boolean[] booleanArrayData = new Boolean[((JSONArray) data).length()];
-          for (int j = 0; j < ((JSONArray) data).length(); ++j) {
-            booleanArrayData[j] = ((JSONArray) data).getBoolean(j);
-          }
-          intent.putExtra(name, booleanArrayData);
-        }
-      }
-    }
-  }
-
-  // Contributed by Emmanuel T
-  // Nested Array handling contributed by Sergey Zelenev
-  private static void putNestedJSONObject(JSONObject jsonObject, Bundle bundle)
-      throws JSONException {
-    JSONArray names = jsonObject.names();
-    for (int i = 0; i < names.length(); i++) {
-      String name = names.getString(i);
-      Object data = jsonObject.get(name);
-      if (data == null) {
-        continue;
-      }
-      if (data instanceof Integer) {
-        bundle.putInt(name, ((Integer) data).intValue());
-      }
-      if (data instanceof Float) {
-        bundle.putFloat(name, ((Float) data).floatValue());
-      }
-      if (data instanceof Double) {
-        bundle.putDouble(name, ((Double) data).doubleValue());
-      }
-      if (data instanceof Long) {
-        bundle.putLong(name, ((Long) data).longValue());
-      }
-      if (data instanceof String) {
-        bundle.putString(name, (String) data);
-      }
-      if (data instanceof Boolean) {
-        bundle.putBoolean(name, ((Boolean) data).booleanValue());
-      }
-      // Nested JSONObject
-      if (data instanceof JSONObject) {
-        Bundle nestedBundle = new Bundle();
-        bundle.putBundle(name, nestedBundle);
-        putNestedJSONObject((JSONObject) data, nestedBundle);
-      }
-      // Nested JSONArray. Doesn't support mixed types in single array
-      if (data instanceof JSONArray) {
-        // Empty array. No way to tell what type of data to pass on, so skipping
-        if (((JSONArray) data).length() == 0) {
-          Log.e("Empty array not supported in nested JSONObject, skipping");
-          continue;
-        }
-        // Integer
-        if (((JSONArray) data).get(0) instanceof Integer) {
-          int[] integerArrayData = new int[((JSONArray) data).length()];
-          for (int j = 0; j < ((JSONArray) data).length(); ++j) {
-            integerArrayData[j] = ((JSONArray) data).getInt(j);
-          }
-          bundle.putIntArray(name, integerArrayData);
-        }
-        // Double
-        if (((JSONArray) data).get(0) instanceof Double) {
-          double[] doubleArrayData = new double[((JSONArray) data).length()];
-          for (int j = 0; j < ((JSONArray) data).length(); ++j) {
-            doubleArrayData[j] = ((JSONArray) data).getDouble(j);
-          }
-          bundle.putDoubleArray(name, doubleArrayData);
-        }
-        // Long
-        if (((JSONArray) data).get(0) instanceof Long) {
-          long[] longArrayData = new long[((JSONArray) data).length()];
-          for (int j = 0; j < ((JSONArray) data).length(); ++j) {
-            longArrayData[j] = ((JSONArray) data).getLong(j);
-          }
-          bundle.putLongArray(name, longArrayData);
-        }
-        // String
-        if (((JSONArray) data).get(0) instanceof String) {
-          String[] stringArrayData = new String[((JSONArray) data).length()];
-          for (int j = 0; j < ((JSONArray) data).length(); ++j) {
-            stringArrayData[j] = ((JSONArray) data).getString(j);
-          }
-          bundle.putStringArray(name, stringArrayData);
-        }
-        // Boolean
-        if (((JSONArray) data).get(0) instanceof Boolean) {
-          boolean[] booleanArrayData = new boolean[((JSONArray) data).length()];
-          for (int j = 0; j < ((JSONArray) data).length(); ++j) {
-            booleanArrayData[j] = ((JSONArray) data).getBoolean(j);
-          }
-          bundle.putBooleanArray(name, booleanArrayData);
-        }
-      }
-    }
-  }
-
-  void startActivity(final Intent intent) {
-    try {
-      intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-      mService.startActivity(intent);
-    } catch (Exception e) {
-      Log.e("Failed to launch intent.", e);
-    }
-  }
-
-  private Intent buildIntent(String action, String uri, String type, JSONObject extras,
-      String packagename, String classname, JSONArray categories) throws JSONException {
-    Intent intent = new Intent(action);
-    intent.setDataAndType(uri != null ? Uri.parse(uri) : null, type);
-    if (packagename != null && classname != null) {
-      intent.setComponent(new ComponentName(packagename, classname));
-    }
-    if (extras != null) {
-      putExtrasFromJsonObject(extras, intent);
-    }
-    if (categories != null) {
-      for (int i = 0; i < categories.length(); i++) {
-        intent.addCategory(categories.getString(i));
-      }
-    }
-    return intent;
-  }
-
-  // TODO(damonkohler): It's unnecessary to add the complication of choosing between startActivity
-  // and startActivityForResult. It's probably better to just always use the ForResult version.
-  // However, this makes the call always blocking. We'd need to add an extra boolean parameter to
-  // indicate if we should wait for a result.
-  @Rpc(description = "Starts an activity and returns the result.", returns = "A Map representation of the result Intent.")
-  public Intent startActivityForResult(
-      @RpcParameter(name = "action") String action,
-      @RpcParameter(name = "uri") @RpcOptional String uri,
-      @RpcParameter(name = "type", description = "MIME type/subtype of the URI") @RpcOptional String type,
-      @RpcParameter(name = "extras", description = "a Map of extras to add to the Intent") @RpcOptional JSONObject extras,
-      @RpcParameter(name = "packagename", description = "name of package. If used, requires classname to be useful") @RpcOptional String packagename,
-      @RpcParameter(name = "classname", description = "name of class. If used, requires packagename to be useful") @RpcOptional String classname)
-      throws JSONException {
-    final Intent intent = buildIntent(action, uri, type, extras, packagename, classname, null);
-    return startActivityForResult(intent);
-  }
-
-  @Rpc(description = "Starts an activity and returns the result.", returns = "A Map representation of the result Intent.")
-  public Intent startActivityForResultIntent(
-      @RpcParameter(name = "intent", description = "Intent in the format as returned from makeIntent") Intent intent) {
-    return startActivityForResult(intent);
-  }
-
-  private void doStartActivity(final Intent intent, Boolean wait) throws Exception {
-    if (wait == null || wait == false) {
-      startActivity(intent);
-    } else {
-      FutureActivityTask<Intent> task = new FutureActivityTask<Intent>() {
-        private boolean mSecondResume = false;
-
-        @Override
-        public void onCreate() {
-          super.onCreate();
-          startActivity(intent);
-        }
-
-        @Override
-        public void onResume() {
-          if (mSecondResume) {
-            finish();
-          }
-          mSecondResume = true;
-        }
-
-        @Override
-        public void onDestroy() {
-          setResult(null);
-        }
-
-      };
-      mTaskQueue.execute(task);
-
-      try {
-        task.getResult();
-      } catch (Exception e) {
-        throw new RuntimeException(e);
-      }
-    }
-  }
-
-  /**
-   * packagename and classname, if provided, are used in a 'setComponent' call.
-   */
-  @Rpc(description = "Starts an activity.")
-  public void startActivity(
-      @RpcParameter(name = "action") String action,
-      @RpcParameter(name = "uri") @RpcOptional String uri,
-      @RpcParameter(name = "type", description = "MIME type/subtype of the URI") @RpcOptional String type,
-      @RpcParameter(name = "extras", description = "a Map of extras to add to the Intent") @RpcOptional JSONObject extras,
-      @RpcParameter(name = "wait", description = "block until the user exits the started activity") @RpcOptional Boolean wait,
-      @RpcParameter(name = "packagename", description = "name of package. If used, requires classname to be useful") @RpcOptional String packagename,
-      @RpcParameter(name = "classname", description = "name of class. If used, requires packagename to be useful") @RpcOptional String classname)
-      throws Exception {
-    final Intent intent = buildIntent(action, uri, type, extras, packagename, classname, null);
-    doStartActivity(intent, wait);
-  }
-
-  @Rpc(description = "Send a broadcast.")
-  public void sendBroadcast(
-      @RpcParameter(name = "action") String action,
-      @RpcParameter(name = "uri") @RpcOptional String uri,
-      @RpcParameter(name = "type", description = "MIME type/subtype of the URI") @RpcOptional String type,
-      @RpcParameter(name = "extras", description = "a Map of extras to add to the Intent") @RpcOptional JSONObject extras,
-      @RpcParameter(name = "packagename", description = "name of package. If used, requires classname to be useful") @RpcOptional String packagename,
-      @RpcParameter(name = "classname", description = "name of class. If used, requires packagename to be useful") @RpcOptional String classname)
-      throws JSONException {
-    final Intent intent = buildIntent(action, uri, type, extras, packagename, classname, null);
-    try {
-      mService.sendBroadcast(intent);
-    } catch (Exception e) {
-      Log.e("Failed to broadcast intent.", e);
-    }
-  }
-
-  @Rpc(description = "Create an Intent.", returns = "An object representing an Intent")
-  public Intent makeIntent(
-      @RpcParameter(name = "action") String action,
-      @RpcParameter(name = "uri") @RpcOptional String uri,
-      @RpcParameter(name = "type", description = "MIME type/subtype of the URI") @RpcOptional String type,
-      @RpcParameter(name = "extras", description = "a Map of extras to add to the Intent") @RpcOptional JSONObject extras,
-      @RpcParameter(name = "categories", description = "a List of categories to add to the Intent") @RpcOptional JSONArray categories,
-      @RpcParameter(name = "packagename", description = "name of package. If used, requires classname to be useful") @RpcOptional String packagename,
-      @RpcParameter(name = "classname", description = "name of class. If used, requires packagename to be useful") @RpcOptional String classname,
-      @RpcParameter(name = "flags", description = "Intent flags") @RpcOptional Integer flags)
-      throws JSONException {
-    Intent intent = buildIntent(action, uri, type, extras, packagename, classname, categories);
-    intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-    if (flags != null) {
-      intent.setFlags(flags);
-    }
-    return intent;
-  }
-
-  @Rpc(description = "Start Activity using Intent")
-  public void startActivityIntent(
-      @RpcParameter(name = "intent", description = "Intent in the format as returned from makeIntent") Intent intent,
-      @RpcParameter(name = "wait", description = "block until the user exits the started activity") @RpcOptional Boolean wait)
-      throws Exception {
-    doStartActivity(intent, wait);
-  }
-
-  @Rpc(description = "Send Broadcast Intent")
-  public void sendBroadcastIntent(
-      @RpcParameter(name = "intent", description = "Intent in the format as returned from makeIntent") Intent intent)
-      throws Exception {
-    mService.sendBroadcast(intent);
-  }
-
-  @Rpc(description = "Vibrates the phone or a specified duration in milliseconds.")
-  public void vibrate(
-      @RpcParameter(name = "duration", description = "duration in milliseconds") @RpcDefault("300") Integer duration) {
-    mVibrator.vibrate(duration);
-  }
-
-  @Rpc(description = "Displays a short-duration Toast notification.")
-  public void makeToast(@RpcParameter(name = "message") final String message) {
-    mHandler.post(new Runnable() {
-      public void run() {
-        Toast.makeText(mService, message, Toast.LENGTH_SHORT).show();
-      }
-    });
-  }
-
-  private String getInputFromAlertDialog(final String title, final String message,
-      final boolean password) {
-    final FutureActivityTask<String> task = new FutureActivityTask<String>() {
-      @Override
-      public void onCreate() {
-        super.onCreate();
-        final EditText input = new EditText(getActivity());
-        if (password) {
-          input.setInputType(InputType.TYPE_TEXT_VARIATION_PASSWORD);
-          input.setTransformationMethod(new PasswordTransformationMethod());
-        }
-        AlertDialog.Builder alert = new AlertDialog.Builder(getActivity());
-        alert.setTitle(title);
-        alert.setMessage(message);
-        alert.setView(input);
-        alert.setPositiveButton("Ok", new DialogInterface.OnClickListener() {
-          @Override
-          public void onClick(DialogInterface dialog, int whichButton) {
-            dialog.dismiss();
-            setResult(input.getText().toString());
-            finish();
-          }
-        });
-        alert.setOnCancelListener(new DialogInterface.OnCancelListener() {
-          @Override
-          public void onCancel(DialogInterface dialog) {
-            dialog.dismiss();
-            setResult(null);
-            finish();
-          }
-        });
-        alert.show();
-      }
-    };
-    mTaskQueue.execute(task);
-
-    try {
-      return task.getResult();
-    } catch (Exception e) {
-      Log.e("Failed to display dialog.", e);
-      throw new RuntimeException(e);
-    }
-  }
-
-  @Rpc(description = "Queries the user for a text input.")
-  @RpcDeprecated(value = "dialogGetInput", release = "r3")
-  public String getInput(
-      @RpcParameter(name = "title", description = "title of the input box") @RpcDefault("SL4A Input") final String title,
-      @RpcParameter(name = "message", description = "message to display above the input box") @RpcDefault("Please enter value:") final String message) {
-    return getInputFromAlertDialog(title, message, false);
-  }
-
-  @Rpc(description = "Queries the user for a password.")
-  @RpcDeprecated(value = "dialogGetPassword", release = "r3")
-  public String getPassword(
-      @RpcParameter(name = "title", description = "title of the input box") @RpcDefault("SL4A Password Input") final String title,
-      @RpcParameter(name = "message", description = "message to display above the input box") @RpcDefault("Please enter password:") final String message) {
-    return getInputFromAlertDialog(title, message, true);
-  }
-
-  @Rpc(description = "Displays a notification that will be canceled when the user clicks on it.")
-  public void notify(@RpcParameter(name = "title", description = "title") String title,
-      @RpcParameter(name = "message") String message) {
-    Notification notification =
-        new Notification(mResources.getLogo48(), message, System.currentTimeMillis());
-    // This contentIntent is a noop.
-    PendingIntent contentIntent = PendingIntent.getService(mService, 0, new Intent(), 0);
-    //notification.setLatestEventInfo(mService, title, message, contentIntent);
-    notification.flags = Notification.FLAG_AUTO_CANCEL;
-
-    // Get a unique notification id from the application.
-    final int notificationId = NotificationIdFactory.create();
-    mNotificationManager.notify(notificationId, notification);
-  }
-
-  @Rpc(description = "Returns the status of network connection.")
-  public boolean getNetworkStatus() {
-    try {
-      ConnectivityManager nInfo = (ConnectivityManager) mService.getApplicationContext().getSystemService(Context.CONNECTIVITY_SERVICE);
-      nInfo.getActiveNetworkInfo().isConnectedOrConnecting();
-
-
-      ConnectivityManager cm = (ConnectivityManager) mService.getApplicationContext().getSystemService(Context.CONNECTIVITY_SERVICE);
-      NetworkInfo netInfo = cm.getActiveNetworkInfo();
-      if (netInfo != null && netInfo.isConnectedOrConnecting()) {
-        return true;
-      } else {
-        return false;
-      }
-    } catch (Exception e) {
-      return false;
-    }
-  }
-
-  
-  @Rpc(description = "Returns the intent that launched the script.")
-  public Object getIntent() {
-    return mIntent;
-  }
-
-  @Rpc(description = "Launches an activity that sends an e-mail message to a given recipient.")
-  public void sendEmail(
-      @RpcParameter(name = "to", description = "A comma separated list of recipients.") final String to,
-      @RpcParameter(name = "subject") final String subject,
-      @RpcParameter(name = "body") final String body,
-      @RpcParameter(name = "attachmentUri") @RpcOptional final String attachmentUri) {
-    final Intent intent = new Intent(android.content.Intent.ACTION_SEND);
-    intent.setType("plain/text");
-    intent.putExtra(android.content.Intent.EXTRA_EMAIL, to.split(","));
-    intent.putExtra(android.content.Intent.EXTRA_SUBJECT, subject);
-    intent.putExtra(android.content.Intent.EXTRA_TEXT, body);
-    if (attachmentUri != null) {
-      intent.putExtra(android.content.Intent.EXTRA_STREAM, Uri.parse(attachmentUri));
-    }
-    startActivity(intent);
-  }
-
-  @Rpc(description = "Returns package version code.")
-  public int getPackageVersionCode(@RpcParameter(name = "packageName") final String packageName) {
-    int result = -1;
-    PackageInfo pInfo = null;
-    try {
-      pInfo =
-          mService.getPackageManager().getPackageInfo(packageName, PackageManager.GET_META_DATA);
-    } catch (NameNotFoundException e) {
-      pInfo = null;
-    }
-    if (pInfo != null) {
-      result = pInfo.versionCode;
-    }
-    return result;
-  }
-
-  @Rpc(description = "Returns package version name.")
-  public String getPackageVersion(@RpcParameter(name = "packageName") final String packageName) {
-    PackageInfo packageInfo = null;
-    try {
-      packageInfo =
-          mService.getPackageManager().getPackageInfo(packageName, PackageManager.GET_META_DATA);
-    } catch (NameNotFoundException e) {
-      return null;
-    }
-    if (packageInfo != null) {
-      return packageInfo.versionName;
-    }
-    return null;
-  }
-
-  @Rpc(description = "Checks if version of SL4A is greater than or equal to the specified version.")
-  public boolean requiredVersion(@RpcParameter(name = "requiredVersion") final Integer version) {
-    boolean result = false;
-    int packageVersion = getPackageVersionCode("com.googlecode.android_scripting");
-    if (version > -1) {
-      result = (packageVersion >= version);
-    }
-    return result;
-  }
-
-  @Rpc(description = "Writes message to logcat.")
-  public void log(@RpcParameter(name = "message") String message) {
-    android.util.Log.v("SCRIPT", message);
-  }
-
-  /**
-   * 
-   * Map returned:
-   * 
-   * <pre>
-   *   TZ = Timezone
-   *     id = Timezone ID
-   *     display = Timezone display name
-   *     offset = Offset from UTC (in ms)
-   *   SDK = SDK Version
-   *   download = default download path
-   *   appcache = Location of application cache 
-   *   sdcard = Space on sdcard
-   *     availblocks = Available blocks
-   *     blockcount = Total Blocks
-   *     blocksize = size of block.
-   * </pre>
-   */
-  @SuppressLint("SdCardPath")
-@Rpc(description = "A map of various useful environment details")
-  public Map<String, Object> environment() {
-    Map<String, Object> result = new HashMap<String, Object>();
-    Map<String, Object> zone = new HashMap<String, Object>();
-    Map<String, Object> space = new HashMap<String, Object>();
-    TimeZone tz = TimeZone.getDefault();
-    zone.put("id", tz.getID());
-    zone.put("display", tz.getDisplayName());
-    zone.put("offset", tz.getOffset((new Date()).getTime()));
-    result.put("TZ", zone);
-    result.put("SDK", android.os.Build.VERSION.SDK);
-    result.put("download", FileUtils.getExternalDownload().getAbsolutePath());
-    result.put("appcache", mService.getCacheDir().getAbsolutePath());
-    try {
-      StatFs fs = new StatFs("/sdcard");
-      space.put("availblocks", fs.getAvailableBlocks());
-      space.put("blocksize", fs.getBlockSize());
-      space.put("blockcount", fs.getBlockCount());
-    } catch (Exception e) {
-      space.put("exception", e.toString());
-    }
-    result.put("sdcard", space);
-    return result;
-  }
-
-  @Rpc(description = "Get list of constants (static final fields) for a class")
-  public Bundle getConstants(
-      @RpcParameter(name = "classname", description = "Class to get constants from") String classname)
-      throws Exception {
-    Bundle result = new Bundle();
-    int flags = Modifier.FINAL | Modifier.PUBLIC | Modifier.STATIC;
-    Class<?> clazz = Class.forName(classname);
-    for (Field field : clazz.getFields()) {
-      if ((field.getModifiers() & flags) == flags) {
-        Class<?> type = field.getType();
-        String name = field.getName();
-        if (type == int.class) {
-          result.putInt(name, field.getInt(null));
-        } else if (type == long.class) {
-          result.putLong(name, field.getLong(null));
-        } else if (type == double.class) {
-          result.putDouble(name, field.getDouble(null));
-        } else if (type == char.class) {
-          result.putChar(name, field.getChar(null));
-        } else if (type instanceof Object) {
-          result.putString(name, field.get(null).toString());
-        }
-      }
-    }
-    return result;
-  }
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/ApplicationManagerFacade.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/ApplicationManagerFacade.java
deleted file mode 100644
index 57518fc0..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/ApplicationManagerFacade.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package org.qpython.qsl4a.qsl4a.facade;
-
-import android.app.ActivityManager;
-import android.app.Service;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-
-
-import org.qpython.qsl4a.qsl4a.jsonrpc.RpcReceiver;
-import org.qpython.qsl4a.qsl4a.rpc.Rpc;
-import org.qpython.qsl4a.qsl4a.rpc.RpcParameter;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * Facade for managing Applications.
- * 
- */
-public class ApplicationManagerFacade extends RpcReceiver {
-
-  private final AndroidFacade mAndroidFacade;
-  private final ActivityManager mActivityManager;
-  private final PackageManager mPackageManager;
-
-  public ApplicationManagerFacade(FacadeManager manager) {
-    super(manager);
-    Service service = manager.getService();
-    mAndroidFacade = manager.getReceiver(AndroidFacade.class);
-    mActivityManager = (ActivityManager) service.getSystemService(Context.ACTIVITY_SERVICE);
-    mPackageManager = service.getPackageManager();
-  }
-
-  @Rpc(description = "Returns a list of all launchable application class names.")
-  public Map<String, String> getLaunchableApplications() {
-    Intent intent = new Intent(Intent.ACTION_MAIN);
-    intent.addCategory(Intent.CATEGORY_LAUNCHER);
-    List<ResolveInfo> resolveInfos = mPackageManager.queryIntentActivities(intent, 0);
-    Map<String, String> applications = new HashMap<String, String>();
-    for (ResolveInfo info : resolveInfos) {
-      applications.put(info.loadLabel(mPackageManager).toString(), info.activityInfo.name);
-    }
-    return applications;
-  }
-
-  @Rpc(description = "Start activity with the given class name.")
-  public void launch(@RpcParameter(name = "className") String className) {
-    Intent intent = new Intent(Intent.ACTION_MAIN);
-    String packageName = className.substring(0, className.lastIndexOf("."));
-    intent.setClassName(packageName, className);
-    mAndroidFacade.startActivity(intent);
-  }
-
-  @Rpc(description = "Returns a list of packages running activities or services.", returns = "List of packages running activities.")
-  public List<String> getRunningPackages() {
-    Set<String> runningPackages = new HashSet<String>();
-    List<ActivityManager.RunningAppProcessInfo> appProcesses =
-        mActivityManager.getRunningAppProcesses();
-    for (ActivityManager.RunningAppProcessInfo info : appProcesses) {
-      runningPackages.addAll(Arrays.asList(info.pkgList));
-    }
-    List<ActivityManager.RunningServiceInfo> serviceProcesses =
-        mActivityManager.getRunningServices(Integer.MAX_VALUE);
-    for (ActivityManager.RunningServiceInfo info : serviceProcesses) {
-      runningPackages.add(info.service.getPackageName());
-    }
-    return new ArrayList<String>(runningPackages);
-  }
-
-  @SuppressWarnings("deprecation")
-@Rpc(description = "Force stops a package.")
-  public void forceStopPackage(
-      @RpcParameter(name = "packageName", description = "name of package") String packageName) {
-    mActivityManager.restartPackage(packageName);
-  }
-
-  @Override
-  public void shutdown() {
-  }
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/BatteryManagerFacade.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/BatteryManagerFacade.java
deleted file mode 100644
index d7cdaba4..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/BatteryManagerFacade.java
+++ /dev/null
@@ -1,219 +0,0 @@
-/*
- * Copyright (C) 2010 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.
- */
-
-package org.qpython.qsl4a.qsl4a.facade;
-
-import android.app.Service;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.os.BatteryManager;
-import android.os.Bundle;
-
-import org.qpython.qsl4a.qsl4a.Log;
-import org.qpython.qsl4a.qsl4a.jsonrpc.RpcReceiver;
-import org.qpython.qsl4a.qsl4a.rpc.Rpc;
-import org.qpython.qsl4a.qsl4a.rpc.RpcMinSdk;
-import org.qpython.qsl4a.qsl4a.rpc.RpcStartEvent;
-import org.qpython.qsl4a.qsl4a.rpc.RpcStopEvent;
-
-import java.lang.reflect.Field;
-
-/**
- * Exposes Batterymanager API. Note that in order to use any of the batteryGet* functions, you need
- * to batteryStartMonitoring, and then wait for a "battery" event. Sleeping for a second will
- * usually work just as well.
- * 
- * @author Alexey Reznichenko (alexey.reznichenko@gmail.com)
- * @author Robbie Matthews (rjmatthews62@gmail.com)
- */
-public class BatteryManagerFacade extends RpcReceiver {
-
-  private final Service mService;
-  private final EventFacade mEventFacade;
-  private final int mSdkVersion;
-
-  private BatteryStateListener mReceiver;
-
-  private volatile Bundle mBatteryData = null;
-  private volatile Integer mBatteryStatus = null;
-  private volatile Integer mBatteryHealth = null;
-  private volatile Integer mPlugType = null;
-
-  private volatile Boolean mBatteryPresent = null;
-  private volatile Integer mBatteryLevel = null;
-  private volatile Integer mBatteryMaxLevel = null;
-  private volatile Integer mBatteryVoltage = null;
-  private volatile Integer mBatteryTemperature = null;
-  private volatile String mBatteryTechnology = null;
-
-  public BatteryManagerFacade(FacadeManager manager) {
-    super(manager);
-    mService = manager.getService();
-    mSdkVersion = manager.getSdkLevel();
-    mEventFacade = manager.getReceiver(EventFacade.class);
-    mReceiver = null;
-    mBatteryData = null;
-  }
-
-  private class BatteryStateListener extends BroadcastReceiver {
-
-    private final EventFacade mmEventFacade;
-
-    private BatteryStateListener(EventFacade facade) {
-      mmEventFacade = facade;
-    }
-
-    @Override
-    public void onReceive(Context context, Intent intent) {
-      mBatteryStatus = intent.getIntExtra("status", 1);
-      mBatteryHealth = intent.getIntExtra("health", 1);
-      mPlugType = intent.getIntExtra("plugged", -1);
-      if (mSdkVersion >= 5) {
-        mBatteryPresent =
-            intent.getBooleanExtra(getBatteryManagerFieldValue("EXTRA_PRESENT"), false);
-        mBatteryLevel = intent.getIntExtra(getBatteryManagerFieldValue("EXTRA_LEVEL"), -1);
-        mBatteryMaxLevel = intent.getIntExtra(getBatteryManagerFieldValue("EXTRA_SCALE"), 0);
-        mBatteryVoltage = intent.getIntExtra(getBatteryManagerFieldValue("EXTRA_VOLTAGE"), -1);
-        mBatteryTemperature =
-            intent.getIntExtra(getBatteryManagerFieldValue("EXTRA_TEMPERATURE"), -1);
-        mBatteryTechnology = intent.getStringExtra(getBatteryManagerFieldValue("EXTRA_TECHNOLOGY"));
-      }
-      Bundle data = new Bundle();
-      data.putInt("status", mBatteryStatus);
-      data.putInt("health", mBatteryHealth);
-      data.putInt("plugged", mPlugType);
-      if (mSdkVersion >= 5) {
-        data.putBoolean("battery_present", mBatteryPresent);
-        if (mBatteryMaxLevel == null || mBatteryMaxLevel == 100 || mBatteryMaxLevel == 0) {
-          data.putInt("level", mBatteryLevel);
-        } else {
-          data.putInt("level", (int) (mBatteryLevel * 100.0 / mBatteryMaxLevel));
-        }
-        data.putInt("voltage", mBatteryVoltage);
-        data.putInt("temperature", mBatteryTemperature);
-        data.putString("technology", mBatteryTechnology);
-      }
-      mBatteryData = data;
-      mmEventFacade.postEvent("battery", mBatteryData.clone());
-    }
-  }
-
-  private String getBatteryManagerFieldValue(String name) {
-    try {
-      Field f = BatteryManager.class.getField(name);
-      return f.get(null).toString();
-    } catch (Exception e) {
-      Log.e(e);
-    }
-    return null;
-  }
-
-  @Rpc(description = "Returns the most recently recorded battery data.")
-  public Bundle readBatteryData() {
-    return mBatteryData;
-  }
-
-  /**
-   * throws "battery" events
-   */
-  @Rpc(description = "Starts tracking battery state.")
-  @RpcStartEvent("battery")
-  public void batteryStartMonitoring() {
-    if (mReceiver == null) {
-      IntentFilter filter = new IntentFilter();
-      filter.addAction(Intent.ACTION_BATTERY_CHANGED);
-      mReceiver = new BatteryStateListener(mEventFacade);
-      mService.registerReceiver(mReceiver, filter);
-    }
-  }
-
-  @Rpc(description = "Stops tracking battery state.")
-  @RpcStopEvent("battery")
-  public void batteryStopMonitoring() {
-    if (mReceiver != null) {
-      mService.unregisterReceiver(mReceiver);
-      mReceiver = null;
-    }
-    mBatteryData = null;
-  }
-
-  @Override
-  public void shutdown() {
-    batteryStopMonitoring();
-  }
-
-  @Rpc(description = "Returns  the most recently received battery status data:" + "\n1 - unknown;"
-      + "\n2 - charging;" + "\n3 - discharging;" + "\n4 - not charging;" + "\n5 - full;")
-  public Integer batteryGetStatus() {
-    return mBatteryStatus;
-  }
-
-  @Rpc(description = "Returns the most recently received battery health data:" + "\n1 - unknown;"
-      + "\n2 - good;" + "\n3 - overheat;" + "\n4 - dead;" + "\n5 - over voltage;"
-      + "\n6 - unspecified failure;")
-  public Integer batteryGetHealth() {
-    return mBatteryHealth;
-  }
-
-  /** Power source is an AC charger. */
-  public static final int BATTERY_PLUGGED_AC = 1;
-  /** Power source is a USB port. */
-  public static final int BATTERY_PLUGGED_USB = 2;
-
-  @Rpc(description = "Returns the most recently received plug type data:" + "\n-1 - unknown"
-      + "\n0 - unplugged;" + "\n1 - power source is an AC charger"
-      + "\n2 - power source is a USB port")
-  public Integer batteryGetPlugType() {
-    return mPlugType;
-  }
-
-  @Rpc(description = "Returns the most recently received battery presence data.")
-  @RpcMinSdk(5)
-  public Boolean batteryCheckPresent() {
-    return mBatteryPresent;
-  }
-
-  @Rpc(description = "Returns the most recently received battery level (percentage).")
-  @RpcMinSdk(5)
-  public Integer batteryGetLevel() {
-    if (mBatteryMaxLevel == null || mBatteryMaxLevel == 100 || mBatteryMaxLevel == 0) {
-      return mBatteryLevel;
-    } else {
-      return (int) (mBatteryLevel * 100.0 / mBatteryMaxLevel);
-    }
-  }
-
-  @Rpc(description = "Returns the most recently received battery voltage.")
-  @RpcMinSdk(5)
-  public Integer batteryGetVoltage() {
-    return mBatteryVoltage;
-  }
-
-  @Rpc(description = "Returns the most recently received battery temperature.")
-  @RpcMinSdk(5)
-  public Integer batteryGetTemperature() {
-    return mBatteryTemperature;
-  }
-
-  @Rpc(description = "Returns the most recently received battery technology data.")
-  @RpcMinSdk(5)
-  public String batteryGetTechnology() {
-    return mBatteryTechnology;
-  }
-
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/BluetoothFacade.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/BluetoothFacade.java
deleted file mode 100644
index d12c0781..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/BluetoothFacade.java
+++ /dev/null
@@ -1,532 +0,0 @@
-/*
- * Copyright (C) 2010 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.
- */
-
-package org.qpython.qsl4a.qsl4a.facade;
-
-import android.bluetooth.BluetoothAdapter;
-import android.bluetooth.BluetoothDevice;
-import android.bluetooth.BluetoothServerSocket;
-import android.bluetooth.BluetoothSocket;
-import android.content.Intent;
-
-
-import org.qpython.qsl4a.codec.Base64Codec;
-import org.qpython.qsl4a.qsl4a.Constants;
-import org.qpython.qsl4a.qsl4a.Log;
-import org.qpython.qsl4a.qsl4a.MainThread;
-import org.qpython.qsl4a.qsl4a.jsonrpc.RpcReceiver;
-import org.qpython.qsl4a.qsl4a.rpc.Rpc;
-import org.qpython.qsl4a.qsl4a.rpc.RpcDefault;
-import org.qpython.qsl4a.qsl4a.rpc.RpcMinSdk;
-import org.qpython.qsl4a.qsl4a.rpc.RpcOptional;
-import org.qpython.qsl4a.qsl4a.rpc.RpcParameter;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-import java.util.concurrent.Callable;
-
-
-/**
- * Bluetooth functions.
- * 
- */
-// Discovery functions added by Eden Sayag
-
-@RpcMinSdk(5)
-public class BluetoothFacade extends RpcReceiver {
-
-  // UUID for SL4A.
-  private static final String DEFAULT_UUID = "457807c0-4897-11df-9879-0800200c9a66";
-  private static final String SDP_NAME = "SL4A";
-
-  private Map<String, BluetoothConnection> connections = new HashMap<String, BluetoothConnection>();
-  private AndroidFacade mAndroidFacade;
-  private BluetoothAdapter mBluetoothAdapter;
-
-  public BluetoothFacade(FacadeManager manager) {
-    super(manager);
-    mAndroidFacade = manager.getReceiver(AndroidFacade.class);
-    mBluetoothAdapter = MainThread.run(manager.getService(), new Callable<BluetoothAdapter>() {
-      @Override
-      public BluetoothAdapter call() throws Exception {
-        return BluetoothAdapter.getDefaultAdapter();
-      }
-    });
-  }
-
-  @Rpc(description = "Returns active Bluetooth connections.")
-  public Map<String, String> bluetoothActiveConnections() {
-    Map<String, String> out = new HashMap<String, String>();
-    for (Map.Entry<String, BluetoothConnection> entry : connections.entrySet()) {
-      if (entry.getValue().isConnected()) {
-        out.put(entry.getKey(), entry.getValue().getRemoteBluetoothAddress());
-      }
-    }
-
-    return out;
-  }
-
-  private BluetoothConnection getConnection(String connID) throws IOException {
-    BluetoothConnection conn = null;
-    if (connID.trim().length() > 0) {
-      conn = connections.get(connID);
-    } else if (connections.size() == 1) {
-      conn = (BluetoothConnection) connections.values().toArray()[0];
-    }
-    if (conn == null) {
-      throw new IOException("Bluetooth not ready for this connID.");
-    }
-    return conn;
-  }
-
-  @Rpc(description = "Send bytes over the currently open Bluetooth connection.")
-  public void bluetoothWriteBinary(
-      @RpcParameter(name = "base64", description = "A base64 encoded String of the bytes to be sent.") String base64,
-      @RpcParameter(name = "connID", description = "Connection id") @RpcDefault("") @RpcOptional String connID)
-      throws IOException {
-    BluetoothConnection conn = getConnection(connID);
-    try {
-      conn.write(Base64Codec.decodeBase64(base64));
-    } catch (IOException e) {
-      connections.remove(conn.getUUID());
-      throw e;
-    }
-  }
-
-  @Rpc(description = "Read up to bufferSize bytes and return a chunked, base64 encoded string.")
-  public String bluetoothReadBinary(
-      @RpcParameter(name = "bufferSize") @RpcDefault("4096") Integer bufferSize,
-      @RpcParameter(name = "connID", description = "Connection id") @RpcDefault("") @RpcOptional String connID)
-      throws IOException {
-
-    BluetoothConnection conn = getConnection(connID);
-    try {
-      return Base64Codec.encodeBase64String(conn.readBinary(bufferSize));
-    } catch (IOException e) {
-      connections.remove(conn.getUUID());
-      throw e;
-    }
-  }
-
-  private String addConnection(BluetoothConnection conn) {
-    String uuid = UUID.randomUUID().toString();
-    connections.put(uuid, conn);
-    conn.setUUID(uuid);
-    return uuid;
-  }
-
-  @Rpc(description = "Connect to a device over Bluetooth. Blocks until the connection is established or fails.", returns = "True if the connection was established successfully.")
-  public String bluetoothConnect(
-      @RpcParameter(name = "uuid", description = "The UUID passed here must match the UUID used by the server device.") @RpcDefault(DEFAULT_UUID) String uuid,
-      @RpcParameter(name = "address", description = "The user will be presented with a list of discovered devices to choose from if an address is not provided.") @RpcOptional String address)
-      throws IOException {
-    if (address == null) {
-      Intent deviceChooserIntent = new Intent();
-      deviceChooserIntent.setComponent(Constants.BLUETOOTH_DEVICE_LIST_COMPONENT_NAME);
-      Intent result = mAndroidFacade.startActivityForResult(deviceChooserIntent);
-      if (result != null && result.hasExtra(Constants.EXTRA_DEVICE_ADDRESS)) {
-        address = result.getStringExtra(Constants.EXTRA_DEVICE_ADDRESS);
-      } else {
-        return null;
-      }
-    }
-    BluetoothDevice mDevice;
-    BluetoothSocket mSocket;
-    BluetoothConnection conn;
-    mDevice = mBluetoothAdapter.getRemoteDevice(address);
-    mSocket = mDevice.createRfcommSocketToServiceRecord(UUID.fromString(uuid));
-    // Always cancel discovery because it will slow down a connection.
-    mBluetoothAdapter.cancelDiscovery();
-    mSocket.connect();
-    conn = new BluetoothConnection(mSocket);
-    return addConnection(conn);
-  }
-
-  @Rpc(description = "Listens for and accepts a Bluetooth connection. Blocks until the connection is established or fails.")
-  public String bluetoothAccept(
-      @RpcParameter(name = "uuid") @RpcDefault(DEFAULT_UUID) String uuid,
-      @RpcParameter(name = "timeout", description = "How long to wait for a new connection, 0 is wait for ever") @RpcDefault("0") Integer timeout)
-      throws IOException {
-    BluetoothServerSocket mServerSocket;
-    mServerSocket =
-        mBluetoothAdapter.listenUsingRfcommWithServiceRecord(SDP_NAME, UUID.fromString(uuid));
-    BluetoothSocket mSocket = mServerSocket.accept(timeout.intValue());
-    BluetoothConnection conn = new BluetoothConnection(mSocket, mServerSocket);
-    return addConnection(conn);
-  }
-
-  @Rpc(description = "Requests that the device be discoverable for Bluetooth connections.")
-  public void bluetoothMakeDiscoverable(
-      @RpcParameter(name = "duration", description = "period of time, in seconds, during which the device should be discoverable") @RpcDefault("300") Integer duration) {
-    if (mBluetoothAdapter.getScanMode() != BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE) {
-      Intent discoverableIntent = new Intent(BluetoothAdapter.ACTION_REQUEST_DISCOVERABLE);
-      discoverableIntent.putExtra(BluetoothAdapter.EXTRA_DISCOVERABLE_DURATION, duration);
-      // Use startActivityForResult to make this a synchronous call.
-      mAndroidFacade.startActivityForResult(discoverableIntent);
-    }
-  }
-
-  @Rpc(description = "Sends ASCII characters over the currently open Bluetooth connection.")
-  public void bluetoothWrite(@RpcParameter(name = "ascii") String ascii,
-      @RpcParameter(name = "connID", description = "Connection id") @RpcDefault("") String connID)
-      throws IOException {
-    BluetoothConnection conn = getConnection(connID);
-    try {
-      conn.write(ascii);
-    } catch (IOException e) {
-      connections.remove(conn.getUUID());
-      throw e;
-    }
-  }
-
-  @Rpc(description = "Returns True if the next read is guaranteed not to block.")
-  public Boolean bluetoothReadReady(
-      @RpcParameter(name = "connID", description = "Connection id") @RpcDefault("") @RpcOptional String connID)
-      throws IOException {
-    BluetoothConnection conn = getConnection(connID);
-    try {
-      return conn.readReady();
-    } catch (IOException e) {
-      connections.remove(conn.getUUID());
-      throw e;
-    }
-  }
-
-  @Rpc(description = "Read up to bufferSize ASCII characters.")
-  public String bluetoothRead(
-      @RpcParameter(name = "bufferSize") @RpcDefault("4096") Integer bufferSize,
-      @RpcParameter(name = "connID", description = "Connection id") @RpcOptional @RpcDefault("") String connID)
-      throws IOException {
-    BluetoothConnection conn = getConnection(connID);
-    try {
-      return conn.read(bufferSize);
-    } catch (IOException e) {
-      connections.remove(conn.getUUID());
-      throw e;
-    }
-  }
-
-  @Rpc(description = "Read the next line.")
-  public String bluetoothReadLine(
-      @RpcParameter(name = "connID", description = "Connection id") @RpcOptional @RpcDefault("") String connID)
-      throws IOException {
-    BluetoothConnection conn = getConnection(connID);
-    try {
-      return conn.readLine();
-    } catch (IOException e) {
-      connections.remove(conn.getUUID());
-      throw e;
-    }
-  }
-
-  @Rpc(description = "Queries a remote device for it's name or null if it can't be resolved")
-  public String bluetoothGetRemoteDeviceName(
-      @RpcParameter(name = "address", description = "Bluetooth Address For Target Device") String address) {
-    try {
-      BluetoothDevice mDevice;
-      mDevice = mBluetoothAdapter.getRemoteDevice(address);
-      return mDevice.getName();
-    } catch (Exception e) {
-      return null;
-    }
-  }
-
-  @Rpc(description = "Gets the Bluetooth Visible device name")
-  public String bluetoothGetLocalName() {
-    return mBluetoothAdapter.getName();
-  }
-
-  @Rpc(description = "Sets the Bluetooth Visible device name, returns True on success")
-  public boolean bluetoothSetLocalName(
-      @RpcParameter(name = "name", description = "New local name") String name) {
-    return mBluetoothAdapter.setName(name);
-  }
-
-  @Rpc(description = "Gets the scan mode for the local dongle.\r\n" + "Return values:\r\n"
-      + "\t-1 when Bluetooth is disabled.\r\n" + "\t0 if non discoverable and non connectable.\r\n"
-      + "\r1 connectable non discoverable." + "\r3 connectable and discoverable.")
-  public int bluetoothGetScanMode() {
-    if (mBluetoothAdapter.getState() == BluetoothAdapter.STATE_OFF
-        || mBluetoothAdapter.getState() == BluetoothAdapter.STATE_TURNING_OFF) {
-      return -1;
-    }
-
-    switch (mBluetoothAdapter.getScanMode()) {
-    case BluetoothAdapter.SCAN_MODE_NONE:
-      return 0;
-    case BluetoothAdapter.SCAN_MODE_CONNECTABLE:
-      return 1;
-    case BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE:
-      return 3;
-    default:
-      return mBluetoothAdapter.getScanMode() - 20;
-    }
-  }
-
-  @Rpc(description = "Returns the name of the connected device.")
-  public String bluetoothGetConnectedDeviceName(
-      @RpcParameter(name = "connID", description = "Connection id") @RpcOptional @RpcDefault("") String connID)
-      throws IOException {
-    BluetoothConnection conn = getConnection(connID);
-    return conn.getConnectedDeviceName();
-  }
-
-  @Rpc(description = "Checks Bluetooth state.", returns = "True if Bluetooth is enabled.")
-  public Boolean checkBluetoothState() {
-    return mBluetoothAdapter.isEnabled();
-  }
-
-  @Rpc(description = "Toggle Bluetooth on and off.", returns = "True if Bluetooth is enabled.")
-  public Boolean toggleBluetoothState(
-      @RpcParameter(name = "enabled") @RpcOptional Boolean enabled,
-      @RpcParameter(name = "prompt", description = "Prompt the user to confirm changing the Bluetooth state.") @RpcDefault("true") Boolean prompt) {
-    if (enabled == null) {
-      enabled = !checkBluetoothState();
-    }
-    if (enabled) {
-      if (prompt) {
-        Intent intent = new Intent(BluetoothAdapter.ACTION_REQUEST_ENABLE);
-        // TODO(damonkohler): Use the result to determine if this was successful. At any rate, keep
-        // using startActivityForResult in order to synchronize this call.
-        mAndroidFacade.startActivityForResult(intent);
-      } else {
-        // TODO(damonkohler): Make this synchronous as well.
-        mBluetoothAdapter.enable();
-      }
-    } else {
-      // TODO(damonkohler): Add support for prompting on disable.
-      // TODO(damonkohler): Make this synchronous as well.
-      shutdown();
-      mBluetoothAdapter.disable();
-    }
-    return enabled;
-  }
-
-  @Rpc(description = "Stops Bluetooth connection.")
-  public void bluetoothStop(
-      @RpcParameter(name = "connID", description = "Connection id") @RpcOptional @RpcDefault("") String connID) {
-    BluetoothConnection conn;
-    try {
-      conn = getConnection(connID);
-    } catch (IOException e) {
-      // TODO Auto-generated catch block
-      e.printStackTrace();
-      return;
-    }
-    if (conn == null) {
-      return;
-    }
-
-    conn.stop();
-    connections.remove(conn.getUUID());
-  }
-
-  @Rpc(description = "Returns the hardware address of the local Bluetooth adapter. ")
-  public String bluetoothGetLocalAddress() {
-    return mBluetoothAdapter.getAddress();
-  }
-
-  @Rpc(description = "Start the remote device discovery process. ", returns = "true on success, false on error")
-  public Boolean bluetoothDiscoveryStart() {
-    return mBluetoothAdapter.startDiscovery();
-  }
-
-  @Rpc(description = "Cancel the current device discovery process.", returns = "true on success, false on error")
-  public Boolean bluetoothDiscoveryCancel() {
-    return mBluetoothAdapter.cancelDiscovery();
-  }
-
-  @Rpc(description = "Return true if the local Bluetooth adapter is currently in the device discovery process. ")
-  public Boolean bluetoothIsDiscovering() {
-    return mBluetoothAdapter.isDiscovering();
-  }
-
-  @Override
-  public void shutdown() {
-    for (Map.Entry<String, BluetoothConnection> entry : connections.entrySet()) {
-      entry.getValue().stop();
-    }
-    connections.clear();
-  }
-}
-
-class BluetoothConnection {
-  private BluetoothSocket mSocket;
-  private BluetoothDevice mDevice;
-  private OutputStream mOutputStream;
-  private InputStream mInputStream;
-  private BufferedReader mReader;
-  private BluetoothServerSocket mServerSocket;
-  private String UUID;
-
-  public BluetoothConnection(BluetoothSocket mSocket) throws IOException {
-    this(mSocket, null);
-  }
-
-  public BluetoothConnection(BluetoothSocket mSocket, BluetoothServerSocket mServerSocket)
-      throws IOException {
-    this.mSocket = mSocket;
-    mOutputStream = mSocket.getOutputStream();
-    mInputStream = mSocket.getInputStream();
-    mDevice = mSocket.getRemoteDevice();
-    mReader = new BufferedReader(new InputStreamReader(mInputStream, "ASCII"));
-    this.mServerSocket = mServerSocket;
-  }
-
-  public void setUUID(String UUID) {
-    this.UUID = UUID;
-  }
-
-  public String getUUID() {
-    return UUID;
-  }
-
-  public String getRemoteBluetoothAddress() {
-    return mDevice.getAddress();
-  }
-
-  public boolean isConnected() {
-    if (mSocket == null) {
-      return false;
-    }
-    try {
-      mSocket.getRemoteDevice();
-      mInputStream.available();
-      mReader.ready();
-      return true;
-    } catch (Exception e) {
-      return false;
-    }
-  }
-
-  public void write(byte[] out) throws IOException {
-    if (mOutputStream != null) {
-      mOutputStream.write(out);
-    } else {
-      throw new IOException("Bluetooth not ready.");
-    }
-  }
-
-  public void write(String out) throws IOException {
-    this.write(out.getBytes());
-  }
-
-  public Boolean readReady() throws IOException {
-    if (mReader != null) {
-      return mReader.ready();
-    }
-    throw new IOException("Bluetooth not ready.");
-  }
-
-  public byte[] readBinary() throws IOException {
-    return this.readBinary(4096);
-  }
-
-  public byte[] readBinary(int bufferSize) throws IOException {
-    if (mReader != null) {
-      byte[] buffer = new byte[bufferSize];
-      int bytesRead = mInputStream.read(buffer);
-      if (bytesRead == -1) {
-        Log.e("Read failed.");
-        throw new IOException("Read failed.");
-      }
-      byte[] truncatedBuffer = new byte[bytesRead];
-      System.arraycopy(buffer, 0, truncatedBuffer, 0, bytesRead);
-      return truncatedBuffer;
-    }
-
-    throw new IOException("Bluetooth not ready.");
-
-  }
-
-  public String read() throws IOException {
-    return this.read(4096);
-  }
-
-  public String read(int bufferSize) throws IOException {
-    if (mReader != null) {
-      char[] buffer = new char[bufferSize];
-      int bytesRead = mReader.read(buffer);
-      if (bytesRead == -1) {
-        Log.e("Read failed.");
-        throw new IOException("Read failed.");
-      }
-      return new String(buffer, 0, bytesRead);
-    }
-    throw new IOException("Bluetooth not ready.");
-  }
-
-  public String readLine() throws IOException {
-    if (mReader != null) {
-      return mReader.readLine();
-    }
-    throw new IOException("Bluetooth not ready.");
-  }
-
-  public String getConnectedDeviceName() {
-    return mDevice.getName();
-  }
-
-  public void stop() {
-    if (mSocket != null) {
-      try {
-        mSocket.close();
-      } catch (IOException e) {
-        Log.e(e);
-      }
-    }
-    mSocket = null;
-    if (mServerSocket != null) {
-      try {
-        mServerSocket.close();
-      } catch (IOException e) {
-        Log.e(e);
-      }
-    }
-    mServerSocket = null;
-
-    if (mInputStream != null) {
-      try {
-        mInputStream.close();
-      } catch (IOException e) {
-        Log.e(e);
-      }
-    }
-    mInputStream = null;
-    if (mOutputStream != null) {
-      try {
-        mOutputStream.close();
-      } catch (IOException e) {
-        Log.e(e);
-      }
-    }
-    mOutputStream = null;
-    if (mReader != null) {
-      try {
-        mReader.close();
-      } catch (IOException e) {
-        Log.e(e);
-      }
-    }
-    mReader = null;
-  }
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/CameraFacade.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/CameraFacade.java
deleted file mode 100644
index 7813f451..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/CameraFacade.java
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
- * Copyright (C) 2010 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.
- */
-
-package org.qpython.qsl4a.qsl4a.facade;
-
-import android.app.Service;
-
-import android.content.Intent;
-import android.hardware.Camera;
-import android.hardware.Camera.AutoFocusCallback;
-import android.hardware.Camera.Parameters;
-import android.hardware.Camera.PictureCallback;
-import android.net.Uri;
-import android.os.Bundle;
-import android.provider.MediaStore;
-import android.view.SurfaceHolder;
-import android.view.SurfaceView;
-import android.view.WindowManager;
-import android.view.SurfaceHolder.Callback;
-
-import org.qpython.qsl4a.QSL4APP;
-import org.qpython.qsl4a.qsl4a.FileUtils;
-import org.qpython.qsl4a.qsl4a.FutureActivityTaskExecutor;
-import org.qpython.qsl4a.qsl4a.Log;
-
-
-import org.qpython.qsl4a.qsl4a.future.FutureActivityTask;
-import org.qpython.qsl4a.qsl4a.jsonrpc.RpcReceiver;
-import org.qpython.qsl4a.qsl4a.rpc.Rpc;
-import org.qpython.qsl4a.qsl4a.rpc.RpcDefault;
-import org.qpython.qsl4a.qsl4a.rpc.RpcParameter;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.lang.reflect.Method;
-import java.util.concurrent.CountDownLatch;
-
-/**
- * Access Camera functions.
- * 
- */
-public class CameraFacade extends RpcReceiver {
-
-  private final Service mService;
-  private final Parameters mParameters;
-
-  private class BooleanResult {
-    boolean mmResult = false;
-  }
-
-  public CameraFacade(FacadeManager manager) {
-    super(manager);
-    mService = manager.getService();
-    Camera camera = Camera.open();
-    try {
-      mParameters = camera.getParameters();
-    } finally {
-      camera.release();
-    }
-  }
-
-  @Rpc(description = "Take a picture and save it to the specified path.", returns = "A map of Booleans autoFocus and takePicture where True indicates success.")
-  public Bundle cameraCapturePicture(@RpcParameter(name = "targetPath") final String targetPath,
-      @RpcParameter(name = "useAutoFocus") @RpcDefault("true") Boolean useAutoFocus)
-      throws InterruptedException {
-    final BooleanResult autoFocusResult = new BooleanResult();
-    final BooleanResult takePictureResult = new BooleanResult();
-
-    Camera camera = Camera.open();
-    camera.setParameters(mParameters);
-
-    try {
-      Method method = camera.getClass().getMethod("setDisplayOrientation", int.class);
-      method.invoke(camera, 90);
-    } catch (Exception e) {
-      Log.e(e);
-    }
-
-    try {
-      FutureActivityTask<SurfaceHolder> previewTask = setPreviewDisplay(camera);
-      camera.startPreview();
-      if (useAutoFocus) {
-        autoFocus(autoFocusResult, camera);
-      }
-      takePicture(new File(targetPath), takePictureResult, camera);
-      previewTask.finish();
-    } catch (Exception e) {
-      Log.e(e);
-    } finally {
-      camera.release();
-    }
-
-    Bundle result = new Bundle();
-    result.putBoolean("autoFocus", autoFocusResult.mmResult);
-    result.putBoolean("takePicture", takePictureResult.mmResult);
-    return result;
-  }
-
-  private FutureActivityTask<SurfaceHolder> setPreviewDisplay(Camera camera) throws IOException,
-      InterruptedException {
-    FutureActivityTask<SurfaceHolder> task = new FutureActivityTask<SurfaceHolder>() {
-      @SuppressWarnings("deprecation")
-	@Override
-      public void onCreate() {
-        super.onCreate();
-        final SurfaceView view = new SurfaceView(getActivity());
-        getActivity().setContentView(view);
-        getActivity().getWindow().setSoftInputMode(
-            WindowManager.LayoutParams.SOFT_INPUT_STATE_UNCHANGED);
-        view.getHolder().setType(SurfaceHolder.SURFACE_TYPE_PUSH_BUFFERS);
-        view.getHolder().addCallback(new Callback() {
-          @Override
-          public void surfaceDestroyed(SurfaceHolder holder) {
-          }
-
-          @Override
-          public void surfaceCreated(SurfaceHolder holder) {
-            setResult(view.getHolder());
-          }
-
-          @Override
-          public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) {
-          }
-        });
-      }
-    };
-    FutureActivityTaskExecutor taskQueue =
-        ((QSL4APP) mService.getApplication()).getTaskExecutor();
-    taskQueue.execute(task);
-    camera.setPreviewDisplay(task.getResult());
-    return task;
-  }
-
-  private void takePicture(final File file, final BooleanResult takePictureResult,
-      final Camera camera) throws InterruptedException {
-    final CountDownLatch latch = new CountDownLatch(1);
-    camera.takePicture(null, null, new PictureCallback() {
-      @Override
-      public void onPictureTaken(byte[] data, Camera camera) {
-        if (!FileUtils.makeDirectories(file.getParentFile(), 0755)) {
-          takePictureResult.mmResult = false;
-          return;
-        }
-        try {
-          FileOutputStream output = new FileOutputStream(file);
-          output.write(data);
-          output.close();
-          takePictureResult.mmResult = true;
-        } catch (FileNotFoundException e) {
-          Log.e("Failed to save picture.", e);
-          takePictureResult.mmResult = false;
-          return;
-        } catch (IOException e) {
-          Log.e("Failed to save picture.", e);
-          takePictureResult.mmResult = false;
-          return;
-        } finally {
-          latch.countDown();
-        }
-      }
-    });
-    latch.await();
-  }
-
-  private void autoFocus(final BooleanResult result, final Camera camera)
-      throws InterruptedException {
-    final CountDownLatch latch = new CountDownLatch(1);
-    {
-      camera.autoFocus(new AutoFocusCallback() {
-        @Override
-        public void onAutoFocus(boolean success, Camera camera) {
-          result.mmResult = success;
-          latch.countDown();
-        }
-      });
-      latch.await();
-    }
-  }
-
-  @Override
-  public void shutdown() {
-    // Nothing to clean up.
-  }
-
-  @Rpc(description = "Starts the image capture application to take a picture and saves it to the specified path.")
-  public void cameraInteractiveCapturePicture(
-      @RpcParameter(name = "targetPath") final String targetPath) {
-    Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
-    File file = new File(targetPath);
-    intent.putExtra(MediaStore.EXTRA_OUTPUT, Uri.fromFile(file));
-    AndroidFacade facade = mManager.getReceiver(AndroidFacade.class);
-    facade.startActivityForResult(intent);
-  }
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/CommonIntentsFacade.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/CommonIntentsFacade.java
deleted file mode 100644
index 34d75b55..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/CommonIntentsFacade.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package org.qpython.qsl4a.qsl4a.facade;
-
-import android.app.SearchManager;
-import android.content.Intent;
-import android.net.Uri;
-import android.provider.Contacts.People;
-
-
-import org.qpython.qsl4a.qsl4a.jsonrpc.RpcReceiver;
-import org.qpython.qsl4a.qsl4a.rpc.Rpc;
-import org.qpython.qsl4a.qsl4a.rpc.RpcOptional;
-import org.qpython.qsl4a.qsl4a.rpc.RpcParameter;
-
-import java.io.File;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-/**
- * A selection of commonly used intents. <br>
- * <br>
- * These can be used to trigger some common tasks.
- * 
- */
-@SuppressWarnings("deprecation")
-public class CommonIntentsFacade extends RpcReceiver {
-
-  private final AndroidFacade mAndroidFacade;
-
-  public CommonIntentsFacade(FacadeManager manager) {
-    super(manager);
-    mAndroidFacade = manager.getReceiver(AndroidFacade.class);
-  }
-
-  @Override
-  public void shutdown() {
-  }
-
-  @Rpc(description = "Display content to be picked by URI (e.g. contacts)", returns = "A map of result values.")
-  public Intent pick(@RpcParameter(name = "uri") String uri) throws JSONException {
-    return mAndroidFacade.startActivityForResult(Intent.ACTION_PICK, uri, null, null, null, null);
-  }
-
-  @Rpc(description = "Starts the barcode scanner.", returns = "A Map representation of the result Intent.")
-  public Intent scanBarcode() throws JSONException {
-    return mAndroidFacade.startActivityForResult("com.google.zxing.client.android.SCAN", null,
-        null, null, null, null);
-  }
-
-  private void view(Uri uri, String type) {
-    Intent intent = new Intent(Intent.ACTION_VIEW);
-    intent.setDataAndType(uri, type);
-    mAndroidFacade.startActivity(intent);
-  }
-
-  @Rpc(description = "Start activity with view action by URI (i.e. browser, contacts, etc.).")
-  public void view(
-      @RpcParameter(name = "uri") String uri,
-      @RpcParameter(name = "type", description = "MIME type/subtype of the URI") @RpcOptional String type,
-      @RpcParameter(name = "extras", description = "a Map of extras to add to the Intent") @RpcOptional JSONObject extras)
-      throws Exception {
-    mAndroidFacade.startActivity(Intent.ACTION_VIEW, uri, type, extras, true, null, null);
-  }
-
-  @Rpc(description = "Opens a map search for query (e.g. pizza, 123 My Street).")
-  public void viewMap(@RpcParameter(name = "query, e.g. pizza, 123 My Street") String query)
-      throws Exception {
-    view("geo:0,0?q=" + query, null, null);
-  }
-
-  @Rpc(description = "Opens the list of contacts.")
-  public void viewContacts() throws JSONException {
-    view(People.CONTENT_URI, null);
-  }
-
-  @Rpc(description = "Opens the browser to display a local HTML file.")
-  public void viewHtml(
-      @RpcParameter(name = "path", description = "the path to the HTML file") String path)
-      throws JSONException {
-    File file = new File(path);
-    view(Uri.fromFile(file), "text/html");
-  }
-
-  @Rpc(description = "Starts a search for the given query.")
-  public void search(@RpcParameter(name = "query") String query) {
-    Intent intent = new Intent(Intent.ACTION_SEARCH);
-    intent.putExtra(SearchManager.QUERY, query);
-    mAndroidFacade.startActivity(intent);
-  }
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/ContactsFacade.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/ContactsFacade.java
deleted file mode 100644
index 3174c471..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/ContactsFacade.java
+++ /dev/null
@@ -1,306 +0,0 @@
-/*
- * Copyright (C) 2010 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.
- */
-
-package org.qpython.qsl4a.qsl4a.facade;
-
-import android.app.Service;
-import android.content.ContentResolver;
-import android.content.ContentUris;
-import android.content.Intent;
-import android.database.Cursor;
-import android.net.Uri;
-import android.provider.Contacts.People;
-import android.provider.Contacts.PhonesColumns;
-
-
-import org.qpython.qsl4a.qsl4a.jsonrpc.RpcReceiver;
-import org.qpython.qsl4a.qsl4a.rpc.Rpc;
-import org.qpython.qsl4a.qsl4a.rpc.RpcOptional;
-import org.qpython.qsl4a.qsl4a.rpc.RpcParameter;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-/**
- * Provides access to contacts related functionality.
- * 
- * @author MeanEYE.rcf (meaneye.rcf@gmail.com
- */
-@SuppressWarnings("deprecation")
-public class ContactsFacade extends RpcReceiver {
-  private static final Uri CONTACTS_URI = Uri.parse("content://contacts/people");
-  private final ContentResolver mContentResolver;
-  private final Service mService;
-  private final CommonIntentsFacade mCommonIntentsFacade;
-  public Uri mPhoneContent = null;
-  public String mContactId;
-  public String mPrimary;
-  public String mPhoneNumber;
-  public String mHasPhoneNumber;
-
-  public ContactsFacade(FacadeManager manager) {
-    super(manager);
-    mService = manager.getService();
-    mContentResolver = mService.getContentResolver();
-    mCommonIntentsFacade = manager.getReceiver(CommonIntentsFacade.class);
-    try {
-      // Backward compatibility... get contract stuff using reflection
-      Class<?> phone = Class.forName("android.provider.ContactsContract$CommonDataKinds$Phone");
-      mPhoneContent = (Uri) phone.getField("CONTENT_URI").get(null);
-      mContactId = (String) phone.getField("CONTACT_ID").get(null);
-      mPrimary = (String) phone.getField("IS_PRIMARY").get(null);
-      mPhoneNumber = (String) phone.getField("NUMBER").get(null);
-      mHasPhoneNumber = (String) phone.getField("HAS_PHONE_NUMBER").get(null);
-    } catch (Exception e) {
-    }
-  }
-
-  private Uri buildUri(Integer id) {
-    Uri uri = ContentUris.withAppendedId(People.CONTENT_URI, id);
-    return uri;
-  }
-
-  @Rpc(description = "Displays a list of contacts to pick from.", returns = "A map of result values.")
-  public Intent pickContact() throws JSONException {
-    return mCommonIntentsFacade.pick("content://contacts/people");
-  }
-
-  @Rpc(description = "Displays a list of phone numbers to pick from.", returns = "The selected phone number.")
-  public String pickPhone() throws JSONException {
-    String result = null;
-    Intent data = mCommonIntentsFacade.pick("content://contacts/phones");
-    if (data != null) {
-      Uri phoneData = data.getData();
-      Cursor cursor = mService.getContentResolver().query(phoneData, null, null, null, null);
-      if (cursor != null) {
-        if (cursor.moveToFirst()) {
-          result = cursor.getString(cursor.getColumnIndexOrThrow(PhonesColumns.NUMBER));
-        }
-        cursor.close();
-      }
-    }
-    return result;
-  }
-
-  @Rpc(description = "Returns a List of all possible attributes for contacts.")
-  public List<String> contactsGetAttributes() {
-    List<String> result = new ArrayList<String>();
-    Cursor cursor = mContentResolver.query(CONTACTS_URI, null, null, null, null);
-    if (cursor != null) {
-      String[] columns = cursor.getColumnNames();
-      for (int i = 0; i < columns.length; i++) {
-        result.add(columns[i]);
-      }
-      cursor.close();
-    }
-    return result;
-  }
-
-  // TODO(MeanEYE.rcf): Add ability to narrow selection by providing named pairs of attributes.
-  @Rpc(description = "Returns a List of all contact IDs.")
-  public List<Integer> contactsGetIds() {
-    List<Integer> result = new ArrayList<Integer>();
-    String[] columns = { "_id" };
-    Cursor cursor = mContentResolver.query(CONTACTS_URI, columns, null, null, null);
-    if (cursor != null) {
-      while (cursor.moveToNext()) {
-        result.add(cursor.getInt(0));
-      }
-      cursor.close();
-    }
-    return result;
-  }
-
-  @Rpc(description = "Returns a List of all contacts.", returns = "a List of contacts as Maps")
-  public List<JSONObject> contactsGet(
-      @RpcParameter(name = "attributes") @RpcOptional JSONArray attributes) throws JSONException {
-    List<JSONObject> result = new ArrayList<JSONObject>();
-    String[] columns;
-    if (attributes == null || attributes.length() == 0) {
-      // In case no attributes are specified we set the default ones.
-      columns = new String[] { "_id", "name", "primary_phone", "primary_email", "type" };
-    } else {
-      // Convert selected attributes list into usable string list.
-      columns = new String[attributes.length()];
-      for (int i = 0; i < attributes.length(); i++) {
-        columns[i] = attributes.getString(i);
-      }
-    }
-    List<String> queryList = new ArrayList<String>();
-    for (String s : columns) {
-      queryList.add(s);
-    }
-    if (!queryList.contains("_id")) {
-      queryList.add("_id");
-    }
-
-    String[] query = queryList.toArray(new String[queryList.size()]);
-    Cursor cursor = mContentResolver.query(CONTACTS_URI, query, null, null, null);
-    if (cursor != null) {
-      int idIndex = cursor.getColumnIndex("_id");
-      while (cursor.moveToNext()) {
-        String id = cursor.getString(idIndex);
-        JSONObject message = new JSONObject();
-        for (int i = 0; i < columns.length; i++) {
-          String key = columns[i];
-          String value = cursor.getString(cursor.getColumnIndex(key));
-          if (mPhoneNumber != null) {
-            if (key.equals("primary_phone")) {
-              value = findPhone(id);
-            }
-          }
-          message.put(key, value);
-        }
-        result.add(message);
-      }
-      cursor.close();
-    }
-    return result;
-  }
-
-  private String findPhone(String id) {
-    String result = null;
-    if (id == null || id.equals("")) {
-      return result;
-    }
-    try {
-      if (Integer.parseInt(id) > 0) {
-        Cursor pCur =
-            mContentResolver.query(mPhoneContent, new String[] { mPhoneNumber }, mContactId
-                + " = ? and " + mPrimary + "=1", new String[] { id }, null);
-        if (pCur != null) {
-          pCur.getColumnNames();
-          while (pCur.moveToNext()) {
-            result = pCur.getString(0);
-            break;
-          }
-        }
-        pCur.close();
-      }
-    } catch (Exception e) {
-      return null;
-    }
-    return result;
-  }
-
-  @Rpc(description = "Returns contacts by ID.")
-  public JSONObject contactsGetById(@RpcParameter(name = "id") Integer id,
-      @RpcParameter(name = "attributes") @RpcOptional JSONArray attributes) throws JSONException {
-    JSONObject result = null;
-    Uri uri = buildUri(id);
-    String[] columns;
-    if (attributes == null || attributes.length() == 0) {
-      // In case no attributes are specified we set the default ones.
-      columns = new String[] { "_id", "name", "primary_phone", "primary_email", "type" };
-    } else {
-      // Convert selected attributes list into usable string list.
-      columns = new String[attributes.length()];
-      for (int i = 0; i < attributes.length(); i++) {
-        columns[i] = attributes.getString(i);
-      }
-    }
-    Cursor cursor = mContentResolver.query(uri, columns, null, null, null);
-    if (cursor != null) {
-      result = new JSONObject();
-      cursor.moveToFirst();
-      for (int i = 0; i < columns.length; i++) {
-        result.put(columns[i], cursor.getString(i));
-      }
-      cursor.close();
-    }
-    return result;
-  }
-
-  // TODO(MeanEYE.rcf): Add ability to narrow selection by providing named pairs of attributes.
-  @Rpc(description = "Returns the number of contacts.")
-  public Integer contactsGetCount() {
-    Integer result = 0;
-    Cursor cursor = mContentResolver.query(CONTACTS_URI, null, null, null, null);
-    if (cursor != null) {
-      result = cursor.getCount();
-      cursor.close();
-    }
-    return result;
-  }
-
-  private String[] jsonToArray(JSONArray array) throws JSONException {
-    String[] result = null;
-    if (array != null && array.length() > 0) {
-      result = new String[array.length()];
-      for (int i = 0; i < array.length(); i++) {
-        result[i] = array.getString(i);
-      }
-    }
-    return result;
-  }
-
-  /**
-   * Exactly as per <a href=
-   * "http://developer.android.com/reference/android/content/ContentResolver.html#query%28android.net.Uri,%20java.lang.String[],%20java.lang.String,%20java.lang.String[],%20java.lang.String%29"
-   * >ContentResolver.query</a>
-   */
-  @Rpc(description = "Content Resolver Query", returns = "result of query as Maps")
-  public List<JSONObject> queryContent(
-      @RpcParameter(name = "uri", description = "The URI, using the content:// scheme, for the content to retrieve.") String uri,
-      @RpcParameter(name = "attributes", description = "A list of which columns to return. Passing null will return all columns") @RpcOptional JSONArray attributes,
-      @RpcParameter(name = "selection", description = "A filter declaring which rows to return") @RpcOptional String selection,
-      @RpcParameter(name = "selectionArgs", description = "You may include ?s in selection, which will be replaced by the values from selectionArgs") @RpcOptional JSONArray selectionArgs,
-      @RpcParameter(name = "order", description = "How to order the rows") @RpcOptional String order)
-      throws JSONException {
-    List<JSONObject> result = new ArrayList<JSONObject>();
-    String[] columns = jsonToArray(attributes);
-    String[] args = jsonToArray(selectionArgs);
-    Cursor cursor = mContentResolver.query(Uri.parse(uri), columns, selection, args, order);
-    if (cursor != null) {
-      String[] names = cursor.getColumnNames();
-      while (cursor.moveToNext()) {
-        JSONObject message = new JSONObject();
-        for (int i = 0; i < cursor.getColumnCount(); i++) {
-          String key = names[i];
-          String value = cursor.getString(i);
-          message.put(key, value);
-        }
-        result.add(message);
-      }
-      cursor.close();
-    }
-    return result;
-  }
-
-  @Rpc(description = "Content Resolver Query Attributes", returns = "a list of available columns for a given content uri")
-  public JSONArray queryAttributes(
-      @RpcParameter(name = "uri", description = "The URI, using the content:// scheme, for the content to retrieve.") String uri)
-      throws JSONException {
-    JSONArray result = new JSONArray();
-    Cursor cursor = mContentResolver.query(Uri.parse(uri), null, "1=0", null, null);
-    if (cursor != null) {
-      String[] names = cursor.getColumnNames();
-      for (String name : names) {
-        result.put(name);
-      }
-      cursor.close();
-    }
-    return result;
-  }
-
-  @Override
-  public void shutdown() {
-  }
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/EventFacade.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/EventFacade.java
deleted file mode 100644
index dfc70ece..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/EventFacade.java
+++ /dev/null
@@ -1,375 +0,0 @@
-/*
- * Copyright (C) 2010 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.
- */
-
-package org.qpython.qsl4a.qsl4a.facade;
-
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.os.Bundle;
-
-import com.google.common.collect.ArrayListMultimap;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Multimap;
-import com.google.common.collect.Multimaps;
-import org.qpython.qsl4a.qsl4a.event.Event;
-import org.qpython.qsl4a.qsl4a.future.FutureResult;
-import org.qpython.qsl4a.qsl4a.jsonrpc.JsonBuilder;
-import org.qpython.qsl4a.qsl4a.jsonrpc.RpcReceiver;
-import org.qpython.qsl4a.qsl4a.rpc.Rpc;
-import org.qpython.qsl4a.qsl4a.rpc.RpcDefault;
-import org.qpython.qsl4a.qsl4a.rpc.RpcDeprecated;
-import org.qpython.qsl4a.qsl4a.rpc.RpcName;
-import org.qpython.qsl4a.qsl4a.rpc.RpcOptional;
-import org.qpython.qsl4a.qsl4a.rpc.RpcParameter;
-
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Queue;
-import java.util.Set;
-import java.util.concurrent.ConcurrentLinkedQueue;
-import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.concurrent.TimeUnit;
-
-import org.json.JSONException;
-
-/**
- * Manage the event queue. <br>
- * <br>
- * <b>Usage Notes:</b><br>
- * EventFacade APIs interact with the Event Queue (a data buffer containing up to 1024 event
- * entries).<br>
- * Events are automatically entered into the Event Queue following API calls such as startSensing()
- * and startLocating().<br>
- * The Event Facade provides control over how events are entered into (and removed from) the Event
- * Queue.<br>
- * The Event Queue provides a useful means of recording background events (such as sensor data) when
- * the phone is busy with foreground activities.
- * 
- * @author Felix Arends (felix.arends@gmail.com)
- * 
- */
-public class EventFacade extends RpcReceiver {
-  /**
-   * The maximum length of the event queue. Old events will be discarded when this limit is
-   * exceeded.
-   */
-  private static final int MAX_QUEUE_SIZE = 1024;
-  private final Queue<Event> mEventQueue = new ConcurrentLinkedQueue<Event>();
-  private final CopyOnWriteArrayList<EventObserver> mGlobalEventObservers =
-      new CopyOnWriteArrayList<EventObserver>();
-  private final Multimap<String, EventObserver> mNamedEventObservers = Multimaps
-      .synchronizedListMultimap(ArrayListMultimap.<String, EventObserver> create());
-  private EventServer mEventServer = null;
-  private final HashMap<String, BroadcastListener> mBroadcastListeners =
-      new HashMap<String, BroadcastListener>();
-  private final Context mContext;
-
-  public EventFacade(FacadeManager manager) {
-    super(manager);
-    mContext = manager.getService().getApplicationContext();
-  }
-
-  /**
-   * Example (python): droid.eventClearBuffer()
-   */
-  @Rpc(description = "Clears all events from the event buffer.")
-  public void eventClearBuffer() {
-    mEventQueue.clear();
-  }
-
-  /**
-   * Registers a listener for a new broadcast signal
-   */
-  @Rpc(description = "Registers a listener for a new broadcast signal")
-  public boolean eventRegisterForBroadcast(
-      @RpcParameter(name = "category") String category,
-      @RpcParameter(name = "enqueue", description = "Should this events be added to the event queue or only dispatched") @RpcDefault(value = "true") Boolean enqueue) {
-    if (mBroadcastListeners.containsKey(category)) {
-      return false;
-    }
-
-    BroadcastListener b = new BroadcastListener(this, enqueue.booleanValue());
-    IntentFilter c = new IntentFilter(category);
-    mContext.registerReceiver(b, c);
-    mBroadcastListeners.put(category, b);
-
-    return true;
-  }
-
-  @Rpc(description = "Stop listening for a broadcast signal")
-  public void eventUnregisterForBroadcast(@RpcParameter(name = "category") String category) {
-    if (!mBroadcastListeners.containsKey(category)) {
-      return;
-    }
-
-    mContext.unregisterReceiver(mBroadcastListeners.get(category));
-    mBroadcastListeners.remove(category);
-  }
-
-  @Rpc(description = "Lists all the broadcast signals we are listening for")
-  public Set<String> eventGetBrodcastCategories() {
-    return mBroadcastListeners.keySet();
-  }
-
-  /**
-   * Actual data returned in the map will depend on the type of event.
-   * 
-   * <pre>
-   * Example (python):
-   *     import android, time
-   *     droid = android.Android()
-   *     droid.startSensing()
-   *     time.sleep(1)
-   *     droid.eventClearBuffer()
-   *     time.sleep(1)
-   *     e = eventPoll(1).result
-   *     event_entry_number = 0
-   *     x = e[event_entry_ number]['data']['xforce']
-   * </pre>
-   * 
-   * e has the format:<br>
-   * [{u'data': {u'accuracy': 0, u'pitch': -0.48766891956329345, u'xmag': -5.6875, u'azimuth':
-   * 0.3312483489513397, u'zforce': 8.3492730000000002, u'yforce': 4.5628165999999997, u'time':
-   * 1297072704.813, u'ymag': -11.125, u'zmag': -42.375, u'roll': -0.059393649548292161, u'xforce':
-   * 0.42223078000000003}, u'name': u'sensors', u'time': 1297072704813000L}]<br>
-   * x has the string value of the x force data (0.42223078000000003) at the time of the event
-   * entry. </pre>
-   */
-
-  @Rpc(description = "Returns and removes the oldest n events (i.e. location or sensor update, etc.) from the event buffer.", returns = "A List of Maps of event properties.")
-  public List<Event> eventPoll(
-      @RpcParameter(name = "number_of_events") @RpcDefault("1") Integer number_of_events) {
-    List<Event> events = Lists.newArrayList();
-    for (int i = 0; i < number_of_events; i++) {
-      Event event = mEventQueue.poll();
-      if (event == null) {
-        break;
-      }
-      events.add(event);
-    }
-    return events;
-  }
-
-  @Rpc(description = "Blocks until an event with the supplied name occurs. The returned event is not removed from the buffer.", returns = "Map of event properties.")
-  public Event eventWaitFor(
-      @RpcParameter(name = "eventName") final String eventName,
-      @RpcParameter(name = "timeout", description = "the maximum time to wait (in ms)") @RpcOptional Integer timeout)
-      throws InterruptedException {
-    synchronized (mEventQueue) { // First check to make sure it isn't already there
-      for (Event event : mEventQueue) {
-        if (event.getName().equals(eventName)) {
-          return event;
-        }
-      }
-    }
-    final FutureResult<Event> futureEvent = new FutureResult<Event>();
-    addNamedEventObserver(eventName, new EventObserver() {
-      @Override
-      public void onEventReceived(Event event) {
-        if (event.getName().equals(eventName)) {
-          synchronized (futureEvent) {
-            if (!futureEvent.isDone()) {
-              futureEvent.set(event);
-              removeEventObserver(this);
-            }
-          }
-        }
-      }
-    });
-    if (timeout != null) {
-      return futureEvent.get(timeout, TimeUnit.MILLISECONDS);
-    } else {
-      return futureEvent.get();
-    }
-  }
-
-  @Rpc(description = "Blocks until an event occurs. The returned event is removed from the buffer.", returns = "Map of event properties.")
-  public Event eventWait(
-      @RpcParameter(name = "timeout", description = "the maximum time to wait") @RpcOptional Integer timeout)
-      throws InterruptedException {
-    Event result = null;
-    final FutureResult<Event> futureEvent = new FutureResult<Event>();
-    synchronized (mEventQueue) { // Anything in queue?
-      if (mEventQueue.size() > 0) {
-        return mEventQueue.poll(); // return it.
-      }
-    }
-    EventObserver observer = new EventObserver() {
-      @Override
-      public void onEventReceived(Event event) { // set up observer for any events.
-        synchronized (futureEvent) {
-          if (!futureEvent.isDone()) {
-            futureEvent.set(event);
-            removeEventObserver(this);
-          }
-          mEventQueue.remove(event);
-        }
-      }
-    };
-    addGlobalEventObserver(observer);
-    if (timeout != null) {
-      result = futureEvent.get(timeout, TimeUnit.MILLISECONDS);
-    } else {
-      result = futureEvent.get();
-    }
-    removeEventObserver(observer); // Make quite sure this goes away.
-    return result;
-  }
-
-  /**
-   * <pre>
-   * Example:
-   *   import android
-   *   from datetime import datetime
-   *   droid = android.Android()
-   *   t = datetime.now()
-   *   droid.eventPost('Some Event', t)
-   * </pre>
-   */
-  @Rpc(description = "Post an event to the event queue.")
-  public void eventPost(
-      @RpcParameter(name = "name", description = "Name of event") String name,
-      @RpcParameter(name = "data", description = "Data contained in event.") String data,
-      @RpcParameter(name = "enqueue", description = "Set to False if you don't want your events to be added to the event queue, just dispatched.") @RpcOptional @RpcDefault("false") Boolean enqueue) {
-    postEvent(name, data, enqueue.booleanValue());
-  }
-
-  /**
-   * Post an event and queue it
-   */
-  public void postEvent(String name, Object data) {
-    postEvent(name, data, true);
-  }
-
-  /**
-   * Posts an event with to the event queue.
-   */
-  public void postEvent(String name, Object data, boolean enqueue) {
-    Event event = new Event(name, data);
-    if (enqueue != false) {
-      mEventQueue.add(event);
-      if (mEventQueue.size() > MAX_QUEUE_SIZE) {
-        mEventQueue.remove();
-      }
-    }
-    synchronized (mNamedEventObservers) {
-      for (EventObserver observer : mNamedEventObservers.get(name)) {
-        observer.onEventReceived(event);
-      }
-    }
-    synchronized (mGlobalEventObservers) {
-      for (EventObserver observer : mGlobalEventObservers) {
-        observer.onEventReceived(event);
-      }
-    }
-  }
-
-  @RpcDeprecated(value = "eventPost", release = "r4")
-  @Rpc(description = "Post an event to the event queue.")
-  @RpcName(name = "postEvent")
-  public void rpcPostEvent(@RpcParameter(name = "name") String name,
-      @RpcParameter(name = "data") String data) {
-    postEvent(name, data);
-  }
-
-  @RpcDeprecated(value = "eventPoll", release = "r4")
-  @Rpc(description = "Returns and removes the oldest event (i.e. location or sensor update, etc.) from the event buffer.", returns = "Map of event properties.")
-  public Event receiveEvent() {
-    return mEventQueue.poll();
-  }
-
-  @RpcDeprecated(value = "eventWaitFor", release = "r4")
-  @Rpc(description = "Blocks until an event with the supplied name occurs. The returned event is not removed from the buffer.", returns = "Map of event properties.")
-  public Event waitForEvent(
-      @RpcParameter(name = "eventName") final String eventName,
-      @RpcParameter(name = "timeout", description = "the maximum time to wait") @RpcOptional Integer timeout)
-      throws InterruptedException {
-    return eventWaitFor(eventName, timeout);
-  }
-
-  @Rpc(description = "Opens up a socket where you can read for events posted")
-  public int startEventDispatcher(
-      @RpcParameter(name = "port", description = "Port to use") @RpcDefault("0") @RpcOptional() Integer port) {
-    if (mEventServer == null) {
-      mEventServer = new EventServer(port);
-      addGlobalEventObserver(mEventServer);
-    }
-    return mEventServer.getAddress().getPort();
-  }
-
-  @Rpc(description = "Stops the event server, you can't read in the port anymore")
-  public void stopEventDispatcher() throws RuntimeException {
-    if (mEventServer == null) {
-      throw new RuntimeException("Not running");
-    }
-    mEventServer.shutdown();
-    removeEventObserver(mEventServer);
-    mEventServer = null;
-    return;
-  }
-
-  @Override
-  public void shutdown() {
-    try {
-      stopEventDispatcher();
-    } catch (Exception err) {
-    }
-    // let others (like webviews) know we're going down
-    postEvent("sl4a", "{\"shutdown\": \"event-facade\"}");
-  }
-
-  public void addNamedEventObserver(String eventName, EventObserver observer) {
-    mNamedEventObservers.put(eventName, observer);
-  }
-
-  public void addGlobalEventObserver(EventObserver observer) {
-    mGlobalEventObservers.add(observer);
-  }
-
-  public void removeEventObserver(EventObserver observer) {
-    mNamedEventObservers.removeAll(observer);
-    mGlobalEventObservers.remove(observer);
-  }
-
-  public interface EventObserver {
-    public void onEventReceived(Event event);
-  }
-
-  public class BroadcastListener extends android.content.BroadcastReceiver {
-    private EventFacade mParent;
-    private boolean mEnQueue;
-
-    public BroadcastListener(EventFacade parent, boolean enqueue) {
-      mParent = parent;
-      mEnQueue = enqueue;
-    }
-
-    @Override
-    public void onReceive(Context context, Intent intent) {
-      Bundle data = (Bundle) intent.getExtras().clone();
-      data.putString("action", intent.getAction());
-      try {
-        mParent.eventPost("sl4a", JsonBuilder.build(data).toString(), mEnQueue);
-      } catch (JSONException e) {
-        // TODO Auto-generated catch block
-        e.printStackTrace();
-      }
-    }
-
-  }
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/EventServer.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/EventServer.java
deleted file mode 100644
index 74a9f98b..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/EventServer.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Copyright (C) 2001 Naranjo Manuel Francisco <manuel@aircable.net>
- *
- * 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.
- */
-package org.qpython.qsl4a.qsl4a.facade;
-
-import org.qpython.qsl4a.qsl4a.Log;
-import org.qpython.qsl4a.qsl4a.SimpleServer;
-import org.qpython.qsl4a.qsl4a.event.Event;
-import org.qpython.qsl4a.qsl4a.jsonrpc.JsonBuilder;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.net.InetSocketAddress;
-import java.net.Socket;
-import java.util.Vector;
-import java.util.concurrent.CountDownLatch;
-
-import org.json.JSONException;
-
-/**
- * An Event Forwarding server that forwards events from the rpc queue in realtime to listener
- * clients.
- * 
- * @author Manuel Naranjo (manuel@aircable.net)
- * @see com.googlecode.android_scripting.SimpleServer
- */
-public class EventServer extends SimpleServer implements EventFacade.EventObserver {
-  private static final Vector<Listener> mListeners = new Vector<Listener>();
-  private InetSocketAddress address = null;
-
-  public EventServer() {
-    this(0);
-  }
-
-  public EventServer(int port) {
-    address = startAllInterfaces(port);
-  }
-
-  public InetSocketAddress getAddress() {
-    return address;
-  }
-
-  @Override
-  public void shutdown() {
-    onEventReceived(new Event("sl4a", "{\"shutdown\": \"event-server\"}"));
-    for (Listener listener : mListeners) {
-      mListeners.remove(listener);
-      listener.lock.countDown();
-    }
-    super.shutdown();
-  }
-
-  @Override
-  protected void handleConnection(Socket socket) throws IOException {
-    Listener l = new Listener(socket);
-    Log.v("Adding EventServer listener " + socket.getPort());
-    mListeners.add(l);
-    // we are running in the socket accept thread
-    // wait until the event dispatcher gets us the events
-    // or we die, what ever happens first
-    try {
-      l.lock.await();
-    } catch (InterruptedException e) {
-      e.printStackTrace();
-    }
-    try {
-      l.sock.close();
-    } catch (IOException e) {
-      e.printStackTrace();
-    }
-    Log.v("Ending EventServer listener " + socket.getPort());
-  }
-
-  @Override
-  public void onEventReceived(Event event) {
-    Object result = null;
-    try {
-      result = JsonBuilder.build(event);
-    } catch (JSONException e) {
-      return;
-    }
-
-    Log.v("EventServer dispatching " + result);
-
-    for (Listener listener : mListeners) {
-      if (!listener.out.checkError()) {
-        listener.out.write(result + "\n");
-        listener.out.flush();
-      } else {
-        // let the socket accept thread we're done
-        mListeners.remove(listener);
-        listener.lock.countDown();
-      }
-    }
-  }
-
-  private class Listener {
-    private Socket sock;
-    private PrintWriter out;
-    private CountDownLatch lock = new CountDownLatch(1);
-
-    public Listener(Socket l) throws IOException {
-      sock = l;
-      out = new PrintWriter(l.getOutputStream(), true);
-    }
-  }
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/EyesFreeFacade.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/EyesFreeFacade.java
deleted file mode 100644
index 4436bf51..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/EyesFreeFacade.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (C) 2009 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.
- */
-
-package org.qpython.qsl4a.qsl4a.facade;
-
-import android.app.Service;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-
-
-import org.qpython.qsl4a.qsl4a.jsonrpc.RpcReceiver;
-import org.qpython.qsl4a.qsl4a.rpc.Rpc;
-import org.qpython.qsl4a.qsl4a.rpc.RpcParameter;
-
-import java.util.List;
-
-/**
- * Provides Text To Speech services for API 3 or less.
- */
-
-public class EyesFreeFacade extends RpcReceiver {
-
-  private final Service mService;
-  private final PackageManager mPackageManager;
-
-  public EyesFreeFacade(FacadeManager manager) {
-    super(manager);
-    mService = manager.getService();
-    mPackageManager = mService.getPackageManager();
-  }
-
-  @Rpc(description = "Speaks the provided message via TTS.")
-  public void ttsSpeak(@RpcParameter(name = "message") String message) {
-    Intent intent = new Intent("com.google.tts.makeBagel");
-    intent.putExtra("message", message);
-    intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-    List<ResolveInfo> infos = mPackageManager.queryIntentActivities(intent, 0);
-    if (infos.size() > 0) {
-      mService.startActivity(intent);
-    } else {
-      throw new RuntimeException("Eyes-Free is not installed.");
-    }
-  }
-
-  @Override
-  public void shutdown() {
-  }
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/FacadeConfiguration.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/FacadeConfiguration.java
deleted file mode 100644
index 25a8a2cf..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/FacadeConfiguration.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
- * Copyright (C) 2010 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.
- */
-
-package org.qpython.qsl4a.qsl4a.facade;
-
-import com.google.common.collect.Maps;
-import org.qpython.qsl4a.qsl4a.Log;
-import org.qpython.qsl4a.qsl4a.facade.ui.UiFacade;
-import org.qpython.qsl4a.qsl4a.jsonrpc.RpcReceiver;
-import org.qpython.qsl4a.qsl4a.rpc.MethodDescriptor;
-import org.qpython.qsl4a.qsl4a.rpc.RpcDeprecated;
-import org.qpython.qsl4a.qsl4a.rpc.RpcMinSdk;
-import org.qpython.qsl4a.qsl4a.rpc.RpcStartEvent;
-import org.qpython.qsl4a.qsl4a.rpc.RpcStopEvent;
-
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.SortedMap;
-import java.util.TreeMap;
-
-/**
- * Encapsulates the list of supported facades and their construction.
- * 
- * @author Damon Kohler (damonkohler@gmail.com)
- * @author Igor Karp (igor.v.karp@gmail.com)
- */
-@SuppressWarnings("deprecation")
-public class FacadeConfiguration {
-  private final static Set<Class<? extends RpcReceiver>> sFacadeClassList;
-  private final static SortedMap<String, MethodDescriptor> sRpcs =
-      new TreeMap<String, MethodDescriptor>();
-
-  private static int sSdkLevel;
-
-  static {
-
-    if (android.os.Build.VERSION.SDK == null) {
-      sSdkLevel = 8; // For documentation purposes.
-    } else {
-      try {
-        sSdkLevel = Integer.parseInt(android.os.Build.VERSION.SDK);
-      } catch (NumberFormatException e) {
-        Log.e(e);
-      }
-    }
-
-    sFacadeClassList = new HashSet<Class<? extends RpcReceiver>>();
-    sFacadeClassList.add(AndroidFacade.class);
-    sFacadeClassList.add(ApplicationManagerFacade.class);
-    sFacadeClassList.add(CameraFacade.class);
-    sFacadeClassList.add(CommonIntentsFacade.class);
-    sFacadeClassList.add(ContactsFacade.class);
-    sFacadeClassList.add(EventFacade.class);
-    sFacadeClassList.add(LocationFacade.class);
-    sFacadeClassList.add(PhoneFacade.class);
-    sFacadeClassList.add(MediaRecorderFacade.class);
-    sFacadeClassList.add(SensorManagerFacade.class);
-    sFacadeClassList.add(SettingsFacade.class);
-    sFacadeClassList.add(SmsFacade.class);
-    sFacadeClassList.add(SpeechRecognitionFacade.class);
-    sFacadeClassList.add(ToneGeneratorFacade.class);
-    sFacadeClassList.add(WakeLockFacade.class);
-    sFacadeClassList.add(WifiFacade.class);
-    sFacadeClassList.add(UiFacade.class);
-    sFacadeClassList.add(BatteryManagerFacade.class);
-    sFacadeClassList.add(ActivityResultFacade.class);
-    sFacadeClassList.add(MediaPlayerFacade.class);
-    sFacadeClassList.add(PreferencesFacade.class);
-    sFacadeClassList.add(QPyInterfaceFacade.class);
-
-    if (sSdkLevel >= 4) {
-      sFacadeClassList.add(TextToSpeechFacade.class);
-    } else {
-      sFacadeClassList.add(EyesFreeFacade.class);
-    }
-
-    if (sSdkLevel >= 5) {
-      sFacadeClassList.add(BluetoothFacade.class);
-    }
-
-    if (sSdkLevel >= 7) {
-      sFacadeClassList.add(SignalStrengthFacade.class);
-    }
-
-    if (sSdkLevel >= 8) {
-      sFacadeClassList.add(WebCamFacade.class);
-    }
-
-    for (Class<? extends RpcReceiver> recieverClass : sFacadeClassList) {
-      for (MethodDescriptor rpcMethod : MethodDescriptor.collectFrom(recieverClass)) {
-        sRpcs.put(rpcMethod.getName(), rpcMethod);
-      }
-    }
-  }
-
-  private FacadeConfiguration() {
-    // Utility class.
-  }
-
-  public static int getSdkLevel() {
-    return sSdkLevel;
-  }
-
-  /** Returns a list of {@link MethodDescriptor} objects for all facades. */
-  public static List<MethodDescriptor> collectMethodDescriptors() {
-    return new ArrayList<MethodDescriptor>(sRpcs.values());
-  }
-
-  /**
-   * Returns a list of not deprecated {@link MethodDescriptor} objects for facades supported by the
-   * current SDK version.
-   */
-  public static List<MethodDescriptor> collectSupportedMethodDescriptors() {
-    List<MethodDescriptor> list = new ArrayList<MethodDescriptor>();
-    for (MethodDescriptor descriptor : sRpcs.values()) {
-      Method method = descriptor.getMethod();
-      if (method.isAnnotationPresent(RpcDeprecated.class)) {
-        continue;
-      } else if (method.isAnnotationPresent(RpcMinSdk.class)) {
-        int requiredSdkLevel = method.getAnnotation(RpcMinSdk.class).value();
-        if (sSdkLevel < requiredSdkLevel) {
-          continue;
-        }
-      }
-      list.add(descriptor);
-    }
-    return list;
-  }
-
-  public static Map<String, MethodDescriptor> collectStartEventMethodDescriptors() {
-    Map<String, MethodDescriptor> map = Maps.newHashMap();
-    for (MethodDescriptor descriptor : sRpcs.values()) {
-      Method method = descriptor.getMethod();
-      if (method.isAnnotationPresent(RpcStartEvent.class)) {
-        String eventName = method.getAnnotation(RpcStartEvent.class).value();
-        if (map.containsKey(eventName)) {
-          throw new RuntimeException("Duplicate start event method descriptor found.");
-        }
-        map.put(eventName, descriptor);
-      }
-    }
-    return map;
-  }
-
-  public static Map<String, MethodDescriptor> collectStopEventMethodDescriptors() {
-    Map<String, MethodDescriptor> map = Maps.newHashMap();
-    for (MethodDescriptor descriptor : sRpcs.values()) {
-      Method method = descriptor.getMethod();
-      if (method.isAnnotationPresent(RpcStopEvent.class)) {
-        String eventName = method.getAnnotation(RpcStopEvent.class).value();
-        if (map.containsKey(eventName)) {
-          throw new RuntimeException("Duplicate stop event method descriptor found.");
-        }
-        map.put(eventName, descriptor);
-      }
-    }
-    return map;
-  }
-
-  /** Returns a method by name. */
-  public static MethodDescriptor getMethodDescriptor(String name) {
-    return sRpcs.get(name);
-  }
-
-  public static Collection<Class<? extends RpcReceiver>> getFacadeClasses() {
-    return sFacadeClassList;
-  }
-}
\ No newline at end of file
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/FacadeManager.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/FacadeManager.java
deleted file mode 100644
index 10872df9..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/FacadeManager.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package org.qpython.qsl4a.qsl4a.facade;
-
-import android.app.Service;
-import android.content.Intent;
-
-import org.qpython.qsl4a.qsl4a.Log;
-import org.qpython.qsl4a.qsl4a.exception.Sl4aException;
-import org.qpython.qsl4a.qsl4a.jsonrpc.RpcReceiver;
-import org.qpython.qsl4a.qsl4a.jsonrpc.RpcReceiverManager;
-import org.qpython.qsl4a.qsl4a.rpc.RpcDeprecated;
-import org.qpython.qsl4a.qsl4a.rpc.RpcMinSdk;
-
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.Collection;
-
-public class FacadeManager extends RpcReceiverManager {
-
-  private final Service mService;
-  private final Intent mIntent;
-  private int mSdkLevel;
-
-  public FacadeManager(int sdkLevel, Service service, Intent intent,
-      Collection<Class<? extends RpcReceiver>> classList) {
-    super(classList);
-    mSdkLevel = sdkLevel;
-    mService = service;
-    mIntent = intent;
-  }
-
-  public int getSdkLevel() {
-    return mSdkLevel;
-  }
-
-  public Service getService() {
-    return mService;
-  }
-
-  public Intent getIntent() {
-    return mIntent;
-  }
-
-  @Override
-  public Object invoke(Class<? extends RpcReceiver> clazz, Method method, Object[] args)
-      throws Exception {
-    try {
-      if (method.isAnnotationPresent(RpcDeprecated.class)) {
-        String replacedBy = method.getAnnotation(RpcDeprecated.class).value();
-        String title = method.getName() + " is deprecated";
-        Log.notify(mService, title, title, String.format("Please use %s instead.", replacedBy));
-      } else if (method.isAnnotationPresent(RpcMinSdk.class)) {
-        int requiredSdkLevel = method.getAnnotation(RpcMinSdk.class).value();
-        if (mSdkLevel < requiredSdkLevel) {
-          throw new Sl4aException(String.format("%s requires API level %d, current level is %d",
-              method.getName(), requiredSdkLevel, mSdkLevel));
-        }
-      }
-      return super.invoke(clazz, method, args);
-    } catch (InvocationTargetException e) {
-      if (e.getCause() instanceof SecurityException) {
-        Log.notify(mService, "RPC invoke failed...", mService.getPackageName(), e.getCause()
-            .getMessage());
-      }
-      throw e;
-    }
-  }
-
-  public AndroidFacade.Resources getAndroidFacadeResources() {
-    return new AndroidFacade.Resources() {
-      @Override
-      public int getLogo48() {
-        // TODO(Alexey): As an alternative, ask application for resource ids.
-        String packageName = mService.getApplication().getPackageName();
-        return mService.getResources().getIdentifier("script_logo_48", "drawable", packageName);
-      }
-    };
-  }
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/FacadeManagerFactory.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/FacadeManagerFactory.java
deleted file mode 100644
index 1b378722..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/FacadeManagerFactory.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package org.qpython.qsl4a.qsl4a.facade;
-
-import android.app.Service;
-import android.content.Intent;
-
-
-import org.qpython.qsl4a.qsl4a.jsonrpc.RpcReceiver;
-import org.qpython.qsl4a.qsl4a.jsonrpc.RpcReceiverManager;
-import org.qpython.qsl4a.qsl4a.jsonrpc.RpcReceiverManagerFactory;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-public class FacadeManagerFactory implements RpcReceiverManagerFactory {
-
-  private final int mSdkLevel;
-  private final Service mService;
-  private final Intent mIntent;
-  private final Collection<Class<? extends RpcReceiver>> mClassList;
-  private final List<RpcReceiverManager> mFacadeManagers;
-
-  public FacadeManagerFactory(int sdkLevel, Service service, Intent intent,
-      Collection<Class<? extends RpcReceiver>> classList) {
-    mSdkLevel = sdkLevel;
-    mService = service;
-    mIntent = intent;
-    mClassList = classList;
-    mFacadeManagers = new ArrayList<RpcReceiverManager>();
-  }
-
-  public FacadeManager create() {
-    FacadeManager facadeManager = new FacadeManager(mSdkLevel, mService, mIntent, mClassList);
-    mFacadeManagers.add(facadeManager);
-    return facadeManager;
-  }
-
-  @Override
-  public List<RpcReceiverManager> getRpcReceiverManagers() {
-    return mFacadeManagers;
-  }
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/JpegProvider.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/JpegProvider.java
deleted file mode 100644
index 25915531..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/JpegProvider.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.qpython.qsl4a.qsl4a.facade;
-
-interface JpegProvider {
-  public byte[] getJpeg();
-}
\ No newline at end of file
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/LocationFacade.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/LocationFacade.java
deleted file mode 100644
index d849a1ba..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/LocationFacade.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
- * Copyright (C) 2010 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.
- */
-
-package org.qpython.qsl4a.qsl4a.facade;
-
-import android.app.Service;
-import android.content.Context;
-import android.location.Address;
-import android.location.Geocoder;
-import android.location.Location;
-import android.location.LocationListener;
-import android.location.LocationManager;
-import android.os.Bundle;
-
-import com.google.common.collect.Maps;
-import org.qpython.qsl4a.qsl4a.jsonrpc.RpcReceiver;
-import org.qpython.qsl4a.qsl4a.rpc.Rpc;
-import org.qpython.qsl4a.qsl4a.rpc.RpcDefault;
-import org.qpython.qsl4a.qsl4a.rpc.RpcParameter;
-import org.qpython.qsl4a.qsl4a.rpc.RpcStartEvent;
-import org.qpython.qsl4a.qsl4a.rpc.RpcStopEvent;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-
-/**
- * This facade exposes the LocationManager related functionality.<br>
- * <br>
- * <b>Overview</b><br>
- * Once activated by 'startLocating' the LocationFacade attempts to return location data collected
- * via GPS or the cell network. If neither are available the last known location may be retrieved.
- * If both are available the format of the returned data is:<br>
- * {u'network': {u'altitude': 0, u'provider': u'network', u'longitude': -0.38509020000000002,
- * u'time': 1297079691231L, u'latitude': 52.410557300000001, u'speed': 0, u'accuracy': 75}, u'gps':
- * {u'altitude': 51, u'provider': u'gps', u'longitude': -0.38537094593048096, u'time':
- * 1297079709000L, u'latitude': 52.41076922416687, u'speed': 0, u'accuracy': 24}}<br>
- * If neither are available {} is returned. <br>
- * Example (python):<br>
- * 
- * <pre>
- * import android, time
- * droid = android.Android()
- * droid.startLocating()
- * time.sleep(15)
- * loc = droid.readLocation().result
- * if loc = {}:
- *   loc = getLastKnownLocation().result
- * if loc != {}:
- *   try:
- *     n = loc['gps']
- *   except KeyError:
- *     n = loc['network'] 
- *   la = n['latitude'] 
- *   lo = n['longitude']
- *   address = droid.geocode(la, lo).result
- * droid.stopLocating()
- * </pre>
- * 
- * The address format is:<br>
- * [{u'thoroughfare': u'Some Street', u'locality': u'Some Town', u'sub_admin_area': u'Some Borough',
- * u'admin_area': u'Some City', u'feature_name': u'House Numbers', u'country_code': u'GB',
- * u'country_name': u'United Kingdom', u'postal_code': u'ST1 1'}]
- * 
- * @author Damon Kohler (damonkohler@gmail.com)
- * @author Felix Arends (felix.arends@gmail.com)
- */
-public class LocationFacade extends RpcReceiver {
-  private final EventFacade mEventFacade;
-  private final Service mService;
-  private final Map<String, Location> mLocationUpdates;
-  private final LocationManager mLocationManager;
-  private final Geocoder mGeocoder;
-
-  private final LocationListener mLocationListener = new LocationListener() {
-    @Override
-    public synchronized void onLocationChanged(Location location) {
-      mLocationUpdates.put(location.getProvider(), location);
-      Map<String, Location> copy = Maps.newHashMap();
-      for (Entry<String, Location> entry : mLocationUpdates.entrySet()) {
-        copy.put(entry.getKey(), entry.getValue());
-      }
-      mEventFacade.postEvent("location", copy);
-    }
-
-    @Override
-    public void onProviderDisabled(String provider) {
-    }
-
-    @Override
-    public void onProviderEnabled(String provider) {
-    }
-
-    @Override
-    public void onStatusChanged(String provider, int status, Bundle extras) {
-    }
-  };
-
-  public LocationFacade(FacadeManager manager) {
-    super(manager);
-    mService = manager.getService();
-    mEventFacade = manager.getReceiver(EventFacade.class);
-    mGeocoder = new Geocoder(mService);
-    mLocationManager = (LocationManager) mService.getSystemService(Context.LOCATION_SERVICE);
-    mLocationUpdates = new HashMap<String, Location>();
-  }
-
-  @Override
-  public void shutdown() {
-    stopLocating();
-  }
-
-  @Rpc(description = "Returns availables providers on the phone")
-  public List<String> locationProviders() {
-    return mLocationManager.getAllProviders();
-  }
-
-  @Rpc(description = "Ask if provider is enabled")
-  public boolean locationProviderEnabled(
-      @RpcParameter(name = "provider", description = "Name of location provider") String provider) {
-    return mLocationManager.isProviderEnabled(provider);
-  }
-
-  @Rpc(description = "Starts collecting location data.")
-  @RpcStartEvent("location")
-  public void startLocating(
-      @RpcParameter(name = "minDistance", description = "minimum time between updates in milliseconds") @RpcDefault("60000") Integer minUpdateTime,
-      @RpcParameter(name = "minUpdateDistance", description = "minimum distance between updates in meters") @RpcDefault("30") Integer minUpdateDistance) {
-    for (String provider : mLocationManager.getAllProviders()) {
-      mLocationManager.requestLocationUpdates(provider, minUpdateTime, minUpdateDistance,
-          mLocationListener, mService.getMainLooper());
-    }
-  }
-
-  @Rpc(description = "Returns the current location as indicated by all available providers.", returns = "A map of location information by provider.")
-  public Map<String, Location> readLocation() {
-    return mLocationUpdates;
-  }
-
-  @Rpc(description = "Stops collecting location data.")
-  @RpcStopEvent("location")
-  public synchronized void stopLocating() {
-    mLocationManager.removeUpdates(mLocationListener);
-    mLocationUpdates.clear();
-  }
-
-  @Rpc(description = "Returns the last known location of the device.", returns = "A map of location information by provider.")
-  public Map<String, Location> getLastKnownLocation() {
-    Map<String, Location> location = new HashMap<String, Location>();
-    for (String provider : mLocationManager.getAllProviders()) {
-      location.put(provider, mLocationManager.getLastKnownLocation(provider));
-    }
-    return location;
-  }
-
-  @Rpc(description = "Returns a list of addresses for the given latitude and longitude.", returns = "A list of addresses.")
-  public List<Address> geocode(
-      @RpcParameter(name = "latitude") Double latitude,
-      @RpcParameter(name = "longitude") Double longitude,
-      @RpcParameter(name = "maxResults", description = "maximum number of results") @RpcDefault("1") Integer maxResults)
-      throws IOException {
-    return mGeocoder.getFromLocation(latitude, longitude, maxResults);
-  }
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/MediaPlayerFacade.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/MediaPlayerFacade.java
deleted file mode 100644
index ec2d762f..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/MediaPlayerFacade.java
+++ /dev/null
@@ -1,246 +0,0 @@
-package org.qpython.qsl4a.qsl4a.facade;
-
-import android.app.Service;
-import android.media.MediaPlayer;
-import android.net.Uri;
-
-
-import org.qpython.qsl4a.qsl4a.jsonrpc.RpcReceiver;
-import org.qpython.qsl4a.qsl4a.rpc.Rpc;
-import org.qpython.qsl4a.qsl4a.rpc.RpcDefault;
-import org.qpython.qsl4a.qsl4a.rpc.RpcParameter;
-
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Map;
-import java.util.Set;
-import java.util.Map.Entry;
-
-/**
- * This facade exposes basic mediaPlayer functionality.
- * 
- * <br>
- * <br>
- * <b>Usage Notes:</b><br>
- * mediaPlayerFacade maintains a list of media streams, identified by a user supplied tag. If the
- * tag is null or blank, this tag defaults to "default"<br>
- * Basic operation is: mediaPlayOpen("file:///sdcard/MP3/sample.mp3","mytag",true)<br>
- * This will look for a media file at /sdcard/MP3/sample.mp3. Other urls should work. If the file
- * exists and is playable, this will return a true otherwise it will return a false.
- * 
- * <br>
- * If play=true, then the media file will play immediately, otherwise it will wait for a
- * {@link #mediaPlayStart mediaPlayerStart} command.
- * 
- * <br>
- * When done with the resource, use {@link #mediaPlayClose mediaPlayClose}
- * 
- * <br>
- * You can get information about the loaded media with {@link #mediaPlayInfo mediaPlayInfo} This
- * returns a map with the following elements:
- * <ul>
- * <li>"tag" - user supplied tag identifying this mediaPlayer.
- * <li>"loaded" - true if loaded, false if not. If false, no other elements are returned.
- * <li>"duration" - length of the media in milliseconds.
- * <li>"position" - current position of playback in milliseconds. Controlled by
- * {@link #mediaPlaySeek mediaPlaySeek}
- * <li>"isplaying" - shows whether media is playing. Controlled by {@link #mediaPlayPause
- * mediaPlayPause} and {@link #mediaPlayStart mediaPlayStart}
- * <li>"url" - the url used to open this media.
- * <li>"looping" - whether media will loop. Controlled by {@link #mediaPlaySetLooping
- * mediaPlaySetLooping}
- * </ul>
- * <br>
- * You can use {@link #mediaPlayList mediaPlayList} to get a list of the loaded tags. <br>
- * {@link #mediaIsPlaying mediaIsPlaying} will return true if the media is playing.<br>
- * 
- * <b>Events:</b><br>
- * A playing media will throw a <b>"media"</b> event on completion.
- * 
- * NB: In remote mode, a media file will continue playing after the script has finished unless an
- * explicit {@link #mediaPlayClose mediaPlayClose} event is called.
- * 
- * @author Robbie Matthews (rjmatthews62@gmail.com)
- */
-
-public class MediaPlayerFacade extends RpcReceiver implements MediaPlayer.OnCompletionListener {
-
-  private final Service mService;
-  static private final Map<String, MediaPlayer> mPlayers = new Hashtable<String, MediaPlayer>();
-  static private final Map<String, String> mUrls = new Hashtable<String, String>();
-
-  private final EventFacade mEventFacade;
-
-  public MediaPlayerFacade(FacadeManager manager) {
-    super(manager);
-    mService = manager.getService();
-    mEventFacade = manager.getReceiver(EventFacade.class);
-  }
-
-  private String getDefault(String tag) {
-    return (tag == null || tag.equals("")) ? "default" : tag;
-  }
-
-  private MediaPlayer getPlayer(String tag) {
-    tag = getDefault(tag);
-    return mPlayers.get(tag);
-  }
-
-  private String getUrl(String tag) {
-    tag = getDefault(tag);
-    return mUrls.get(tag);
-  }
-
-  private void putMp(String tag, MediaPlayer player, String url) {
-    tag = getDefault(tag);
-    mPlayers.put(tag, player);
-    mUrls.put(tag, url);
-  }
-
-  private void removeMp(String tag) {
-    tag = getDefault(tag);
-    MediaPlayer player = mPlayers.get(tag);
-    if (player != null) {
-      player.stop();
-      player.release();
-    }
-    mPlayers.remove(tag);
-    mUrls.remove(tag);
-  }
-
-  @Rpc(description = "Open a media file", returns = "true if play successful")
-  public synchronized boolean mediaPlay(
-      @RpcParameter(name = "url", description = "url of media resource") String url,
-      @RpcParameter(name = "tag", description = "string identifying resource") @RpcDefault(value = "default") String tag,
-      @RpcParameter(name = "play", description = "start playing immediately") @RpcDefault(value = "true") Boolean play) {
-    removeMp(tag);
-    MediaPlayer player = getPlayer(tag);
-    player = MediaPlayer.create(mService, Uri.parse(url));
-    if (player != null) {
-      putMp(tag, player, url);
-      player.setOnCompletionListener(this);
-      if (play) {
-        player.start();
-      }
-    }
-    return player != null;
-  }
-
-  @Rpc(description = "pause playing media file", returns = "true if successful")
-  public synchronized boolean mediaPlayPause(
-      @RpcParameter(name = "tag", description = "string identifying resource") @RpcDefault(value = "default") String tag) {
-    MediaPlayer player = getPlayer(tag);
-    if (player == null) {
-      return false;
-    }
-    player.pause();
-    return true;
-  }
-
-  @Rpc(description = "start playing media file", returns = "true if successful")
-  public synchronized boolean mediaPlayStart(
-      @RpcParameter(name = "tag", description = "string identifying resource") @RpcDefault(value = "default") String tag) {
-    MediaPlayer player = getPlayer(tag);
-    if (player == null) {
-      return false;
-    }
-    player.start();
-    return mediaIsPlaying(tag);
-  }
-
-  @Rpc(description = "Close media file", returns = "true if successful")
-  public synchronized boolean mediaPlayClose(
-      @RpcParameter(name = "tag", description = "string identifying resource") @RpcDefault(value = "default") String tag) {
-    removeMp(tag);
-    return true;
-  }
-
-  @Rpc(description = "Checks if media file is playing.", returns = "true if playing")
-  public synchronized boolean mediaIsPlaying(
-      @RpcParameter(name = "tag", description = "string identifying resource") @RpcDefault(value = "default") String tag) {
-    MediaPlayer player = getPlayer(tag);
-    return (player == null) ? false : player.isPlaying();
-  }
-
-  @Rpc(description = "Information on current media", returns = "Media Information")
-  public synchronized Map<String, Object> mediaPlayInfo(
-      @RpcParameter(name = "tag", description = "string identifying resource") @RpcDefault(value = "default") String tag) {
-    Map<String, Object> result = new HashMap<String, Object>();
-    MediaPlayer player = getPlayer(tag);
-    result.put("tag", getDefault(tag));
-    if (player == null) {
-      result.put("loaded", false);
-    } else {
-      result.put("loaded", true);
-      result.put("duration", player.getDuration());
-      result.put("position", player.getCurrentPosition());
-      result.put("isplaying", player.isPlaying());
-      result.put("url", getUrl(tag));
-      result.put("looping", player.isLooping());
-    }
-    return result;
-  }
-
-  @Rpc(description = "Lists currently loaded media", returns = "List of Media Tags")
-  public Set<String> mediaPlayList() {
-    return mPlayers.keySet();
-  }
-
-  @Rpc(description = "Set Looping", returns = "True if successful")
-  public synchronized boolean mediaPlaySetLooping(
-      @RpcParameter(name = "enabled") @RpcDefault(value = "true") Boolean enabled,
-      @RpcParameter(name = "tag", description = "string identifying resource") @RpcDefault(value = "default") String tag) {
-    MediaPlayer player = getPlayer(tag);
-    if (player == null) {
-      return false;
-    }
-    player.setLooping(enabled);
-    return true;
-  }
-
-  @Rpc(description = "Seek To Position", returns = "New Position (in ms)")
-  public synchronized int mediaPlaySeek(
-      @RpcParameter(name = "msec", description = "Position in millseconds") Integer msec,
-      @RpcParameter(name = "tag", description = "string identifying resource") @RpcDefault(value = "default") String tag) {
-    MediaPlayer player = getPlayer(tag);
-    if (player == null) {
-      return 0;
-    }
-    player.seekTo(msec);
-    return player.getCurrentPosition();
-  }
-
-  @Override
-  public synchronized void shutdown() {
-    for (String key : mPlayers.keySet()) {
-      MediaPlayer player = mPlayers.get(key);
-      if (player != null) {
-        player.stop();
-        player.release();
-        player = null;
-      }
-    }
-    mPlayers.clear();
-    mUrls.clear();
-  }
-
-  @Override
-  public void onCompletion(MediaPlayer player) {
-    String tag = getTag(player);
-    if (tag != null) {
-      Map<String, Object> data = new HashMap<String, Object>();
-      data.put("action", "complete");
-      data.put("tag", tag);
-      mEventFacade.postEvent("media", data);
-    }
-  }
-
-  private String getTag(MediaPlayer player) {
-    for (Entry<String, MediaPlayer> m : mPlayers.entrySet()) {
-      if (m.getValue() == player) {
-        return m.getKey();
-      }
-    }
-    return null;
-  }
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/MediaRecorderFacade.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/MediaRecorderFacade.java
deleted file mode 100644
index d09e7bb0..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/MediaRecorderFacade.java
+++ /dev/null
@@ -1,285 +0,0 @@
-/*
- * Copyright (C) 2009 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.
- */
-
-package org.qpython.qsl4a.qsl4a.facade;
-
-import android.app.Service;
-import android.content.Intent;
-import android.media.MediaRecorder;
-import android.net.Uri;
-import android.provider.MediaStore;
-import android.view.SurfaceHolder;
-import android.view.SurfaceHolder.Callback;
-import android.view.SurfaceView;
-import android.view.WindowManager;
-
-import org.qpython.qsl4a.QSL4APP;
-import org.qpython.qsl4a.qsl4a.FutureActivityTaskExecutor;
-import org.qpython.qsl4a.qsl4a.Log;
-
-
-import java.io.File;
-import java.io.IOException;
-import java.lang.reflect.Field;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
-import org.qpython.qsl4a.qsl4a.future.FutureActivityTask;
-import org.qpython.qsl4a.qsl4a.jsonrpc.RpcReceiver;
-import org.qpython.qsl4a.qsl4a.rpc.Rpc;
-import org.qpython.qsl4a.qsl4a.rpc.RpcDefault;
-import org.qpython.qsl4a.qsl4a.rpc.RpcOptional;
-import org.qpython.qsl4a.qsl4a.rpc.RpcParameter;
-
-/**
- * A facade for recording media.
- * 
- * Guidance notes: Use e.g. '/sdcard/file.ext' for your media destination file. A file extension of
- * mpg will use the default settings for format and codec (often h263 which won't work with common
- * PC media players). A file extension of mp4 or 3gp will use the appropriate format with the (more
- * common) h264 codec. A video player such as QQPlayer (from the android market) plays both codecs
- * and uses the composition matrix (embedded in the video file) to correct for image rotation. Many
- * PC based media players ignore this matrix. Standard video sizes may be specified.
- * 
- * @author Felix Arends (felix.arends@gmail.com)
- * @author Damon Kohler (damonkohler@gmail.com)
- * @author John Karwatzki (jokar49@gmail.com)
- */
-public class MediaRecorderFacade extends RpcReceiver {
-
-  private final MediaRecorder mMediaRecorder = new MediaRecorder();
-  private final Service mService;
-
-  public MediaRecorderFacade(FacadeManager manager) {
-    super(manager);
-    mService = manager.getService();
-  }
-
-  @Rpc(description = "Records audio from the microphone and saves it to the given location.")
-  public void recorderStartMicrophone(@RpcParameter(name = "targetPath") String targetPath)
-      throws IOException {
-    startAudioRecording(targetPath, MediaRecorder.AudioSource.MIC);
-  }
-
-  @Rpc(description = "Records video from the camera and saves it to the given location. "
-      + "\nDuration specifies the maximum duration of the recording session. "
-      + "\nIf duration is 0 this method will return and the recording will only be stopped "
-      + "\nwhen recorderStop is called or when a scripts exits. "
-      + "\nOtherwise it will block for the time period equal to the duration argument."
-      + "\nvideoSize: 0=160x120, 1=320x240, 2=352x288, 3=640x480, 4=800x480.")
-  public void recorderStartVideo(@RpcParameter(name = "targetPath") String targetPath,
-      @RpcParameter(name = "duration") @RpcDefault("0") Integer duration,
-      @RpcParameter(name = "videoSize") @RpcDefault("1") Integer videoSize) throws Exception {
-    int ms = convertSecondsToMilliseconds(duration);
-    startVideoRecording(new File(targetPath), ms, videoSize);
-  }
-
-  private void startVideoRecording(File file, int milliseconds, int videoSize) throws Exception {
-    mMediaRecorder.setVideoSource(MediaRecorder.VideoSource.CAMERA);
-
-    int audioSource = MediaRecorder.AudioSource.MIC;
-    try {
-      Field source = Class.forName("android.media.MediaRecorder$AudioSource").getField("CAMCORDER");
-      source.getInt(null);
-    } catch (Exception e) {
-      Log.e(e);
-    }
-    int xSize;
-    int ySize;
-    switch (videoSize) {
-    case 0:
-      xSize = 160;
-      ySize = 120;
-      break;
-    case 1:
-      xSize = 320;
-      ySize = 240;
-      break;
-    case 2:
-      xSize = 352;
-      ySize = 288;
-      break;
-    case 3:
-      xSize = 640;
-      ySize = 480;
-      break;
-    case 4:
-      xSize = 800;
-      ySize = 480;
-      break;
-    default:
-      xSize = 320;
-      ySize = 240;
-      break;
-    }
-
-    mMediaRecorder.setAudioSource(audioSource);
-    String extension = file.toString().split("\\.")[1];
-    if (extension.equals("mp4")) {
-      mMediaRecorder.setOutputFormat(MediaRecorder.OutputFormat.MPEG_4);
-      mMediaRecorder.setAudioEncoder(MediaRecorder.AudioEncoder.AMR_NB);
-      mMediaRecorder.setVideoSize(xSize, ySize);
-      mMediaRecorder.setVideoEncoder(MediaRecorder.VideoEncoder.H264);
-    } else if (extension.equals("3gp")) {
-      mMediaRecorder.setOutputFormat(MediaRecorder.OutputFormat.THREE_GPP);
-      mMediaRecorder.setAudioEncoder(MediaRecorder.AudioEncoder.AMR_NB);
-      mMediaRecorder.setVideoSize(xSize, ySize);
-      mMediaRecorder.setVideoEncoder(MediaRecorder.VideoEncoder.H264);
-    } else {
-
-      mMediaRecorder.setOutputFormat(MediaRecorder.OutputFormat.DEFAULT);
-      mMediaRecorder.setAudioEncoder(MediaRecorder.AudioEncoder.DEFAULT);
-      mMediaRecorder.setVideoSize(xSize, ySize);
-      mMediaRecorder.setVideoEncoder(MediaRecorder.VideoEncoder.DEFAULT);
-    }
-
-    mMediaRecorder.setOutputFile(file.getAbsolutePath());
-    if (milliseconds > 0) {
-      mMediaRecorder.setMaxDuration(milliseconds);
-    }
-    FutureActivityTask<Exception> prepTask = prepare();
-    mMediaRecorder.start();
-    if (milliseconds > 0) {
-      new CountDownLatch(1).await(milliseconds, TimeUnit.MILLISECONDS);
-    }
-    prepTask.finish();
-  }
-
-  @Rpc(description = "Records video (and optionally audio) from the camera and saves it to the given location. "
-      + "\nDuration specifies the maximum duration of the recording session. "
-      + "\nIf duration is not provided this method will return immediately and the recording will only be stopped "
-      + "\nwhen recorderStop is called or when a scripts exits. "
-      + "\nOtherwise it will block for the time period equal to the duration argument.")
-  public void recorderCaptureVideo(@RpcParameter(name = "targetPath") String targetPath,
-      @RpcParameter(name = "duration") @RpcOptional Integer duration,
-      @RpcParameter(name = "recordAudio") @RpcDefault("true") Boolean recordAudio) throws Exception {
-    int ms = convertSecondsToMilliseconds(duration);
-    startVideoRecording(new File(targetPath), ms, recordAudio);
-  }
-
-  private void startVideoRecording(File file, int milliseconds, boolean withAudio) throws Exception {
-    mMediaRecorder.setVideoSource(MediaRecorder.VideoSource.CAMERA);
-    if (withAudio) {
-      int audioSource = MediaRecorder.AudioSource.MIC;
-      try {
-        Field source =
-            Class.forName("android.media.MediaRecorder$AudioSource").getField("CAMCORDER");
-        audioSource = source.getInt(null);
-      } catch (Exception e) {
-        Log.e(e);
-      }
-      mMediaRecorder.setAudioSource(audioSource);
-      mMediaRecorder.setOutputFormat(MediaRecorder.OutputFormat.DEFAULT);
-      mMediaRecorder.setAudioEncoder(MediaRecorder.AudioEncoder.DEFAULT);
-    } else {
-      mMediaRecorder.setOutputFormat(MediaRecorder.OutputFormat.DEFAULT);
-    }
-    mMediaRecorder.setVideoEncoder(MediaRecorder.VideoEncoder.DEFAULT);
-    mMediaRecorder.setOutputFile(file.getAbsolutePath());
-    if (milliseconds > 0) {
-      mMediaRecorder.setMaxDuration(milliseconds);
-    }
-    FutureActivityTask<Exception> prepTask = prepare();
-    mMediaRecorder.start();
-    if (milliseconds > 0) {
-      new CountDownLatch(1).await(milliseconds, TimeUnit.MILLISECONDS);
-    }
-    prepTask.finish();
-  }
-
-  private void startAudioRecording(String targetPath, int source) throws IOException {
-    mMediaRecorder.setAudioSource(source);
-    mMediaRecorder.setOutputFormat(MediaRecorder.OutputFormat.DEFAULT);
-    mMediaRecorder.setAudioEncoder(MediaRecorder.AudioEncoder.DEFAULT);
-    mMediaRecorder.setOutputFile(targetPath);
-    mMediaRecorder.prepare();
-    mMediaRecorder.start();
-  }
-
-  @Rpc(description = "Stops a previously started recording.")
-  public void recorderStop() {
-    mMediaRecorder.stop();
-    mMediaRecorder.reset();
-  }
-
-  @Rpc(description = "Starts the video capture application to record a video and saves it to the specified path.")
-  public void startInteractiveVideoRecording(@RpcParameter(name = "path") final String path) {
-    Intent intent = new Intent(MediaStore.ACTION_VIDEO_CAPTURE);
-    File file = new File(path);
-    intent.putExtra(MediaStore.EXTRA_OUTPUT, Uri.fromFile(file));
-    AndroidFacade facade = mManager.getReceiver(AndroidFacade.class);
-    facade.startActivityForResult(intent);
-  }
-
-  @Override
-  public void shutdown() {
-    mMediaRecorder.release();
-  }
-
-  // TODO(damonkohler): This shares a lot of code with the CameraFacade. It's probably worth moving
-  // it there.
-  private FutureActivityTask<Exception> prepare() throws Exception {
-    FutureActivityTask<Exception> task = new FutureActivityTask<Exception>() {
-      @SuppressWarnings("deprecation")
-	@Override
-      public void onCreate() {
-        super.onCreate();
-        final SurfaceView view = new SurfaceView(getActivity());
-        getActivity().setContentView(view);
-        getActivity().getWindow().setSoftInputMode(
-            WindowManager.LayoutParams.SOFT_INPUT_STATE_UNCHANGED);
-        view.getHolder().setType(SurfaceHolder.SURFACE_TYPE_PUSH_BUFFERS);
-        view.getHolder().addCallback(new Callback() {
-          @Override
-          public void surfaceDestroyed(SurfaceHolder holder) {
-          }
-
-          @Override
-          public void surfaceCreated(SurfaceHolder holder) {
-            try {
-              mMediaRecorder.setPreviewDisplay(view.getHolder().getSurface());
-              mMediaRecorder.prepare();
-              setResult(null);
-            } catch (IOException e) {
-              setResult(e);
-            }
-          }
-
-          @Override
-          public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) {
-          }
-        });
-      }
-    };
-
-    FutureActivityTaskExecutor taskExecutor =
-        ((QSL4APP) mService.getApplication()).getTaskExecutor();
-    taskExecutor.execute(task);
-
-    Exception e = task.getResult();
-    if (e != null) {
-      throw e;
-    }
-    return task;
-  }
-
-  private int convertSecondsToMilliseconds(Integer seconds) {
-    if (seconds == null) {
-      return 0;
-    }
-    return (int) (seconds * 1000L);
-  }
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/MjpegServer.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/MjpegServer.java
deleted file mode 100644
index 1fe29f57..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/MjpegServer.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (C) 2010 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.
- */
-
-package org.qpython.qsl4a.qsl4a.facade;
-
-import java.io.OutputStream;
-import java.net.Socket;
-
-import org.qpython.qsl4a.qsl4a.SimpleServer;
-
-class MjpegServer extends SimpleServer {
-
-  private final JpegProvider mProvider;
-
-  public MjpegServer(JpegProvider provider) {
-    mProvider = provider;
-  }
-
-  @Override
-  protected void handleConnection(Socket socket) throws Exception {
-    byte[] data = mProvider.getJpeg();
-    if (data == null) {
-      return;
-    }
-    OutputStream outputStream = socket.getOutputStream();
-    outputStream.write((
-        "HTTP/1.0 200 OK\r\n" +
-        "Server: SL4A\r\n" +
-        "Connection: close\r\n" +
-        "Max-Age: 0\r\n" +
-        "Expires: 0\r\n" +
-        "Cache-Control: no-cache, private\r\n" + 
-        "Pragma: no-cache\r\n" + 
-        "Content-Type: multipart/x-mixed-replace; boundary=--BoundaryString\r\n\r\n").getBytes());
-    while (true) {
-      data = mProvider.getJpeg();
-      if (data == null) {
-        return;
-      }
-      outputStream.write("--BoundaryString\r\n".getBytes());
-      outputStream.write("Content-type: image/jpg\r\n".getBytes());
-      outputStream.write(("Content-Length: " + data.length + "\r\n\r\n").getBytes());
-      outputStream.write(data);
-      outputStream.write("\r\n\r\n".getBytes());
-      outputStream.flush();
-    }
-  }
-}
\ No newline at end of file
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/PhoneFacade.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/PhoneFacade.java
deleted file mode 100644
index d509722e..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/PhoneFacade.java
+++ /dev/null
@@ -1,287 +0,0 @@
-/*
- * Copyright (C) 2010 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.
- */
-
-package org.qpython.qsl4a.qsl4a.facade;
-
-import android.app.Service;
-import android.content.ContentResolver;
-import android.content.Context;
-import android.content.Intent;
-import android.database.Cursor;
-import android.net.Uri;
-import android.os.Bundle;
-import android.provider.Contacts.PhonesColumns;
-import android.telephony.CellLocation;
-import android.telephony.NeighboringCellInfo;
-import android.telephony.PhoneStateListener;
-import android.telephony.TelephonyManager;
-
-import org.qpython.qsl4a.qsl4a.MainThread;
-import org.qpython.qsl4a.qsl4a.jsonrpc.RpcReceiver;
-import org.qpython.qsl4a.qsl4a.rpc.Rpc;
-import org.qpython.qsl4a.qsl4a.rpc.RpcParameter;
-import org.qpython.qsl4a.qsl4a.rpc.RpcStartEvent;
-import org.qpython.qsl4a.qsl4a.rpc.RpcStopEvent;
-
-import java.io.UnsupportedEncodingException;
-import java.lang.reflect.Field;
-import java.net.URLEncoder;
-import java.util.List;
-import java.util.concurrent.Callable;
-
-/**
- * Exposes TelephonyManager functionality.
- *
- * @author Damon Kohler (damonkohler@gmail.com)
- * @author Felix Arends (felix.arends@gmail.com)
- */
-@SuppressWarnings("deprecation")
-public class PhoneFacade extends RpcReceiver {
-
-    private final AndroidFacade mAndroidFacade;
-    private final EventFacade mEventFacade;
-    private final TelephonyManager mTelephonyManager;
-    private final Bundle mPhoneState;
-    private final Service mService;
-    private PhoneStateListener mPhoneStateListener;
-
-    public PhoneFacade(FacadeManager manager) {
-        super(manager);
-        mService = manager.getService();
-        mTelephonyManager = (TelephonyManager) mService.getSystemService(Context.TELEPHONY_SERVICE);
-        mAndroidFacade = manager.getReceiver(AndroidFacade.class);
-        mEventFacade = manager.getReceiver(EventFacade.class);
-        mPhoneState = new Bundle();
-        mPhoneStateListener = MainThread.run(mService, new Callable<PhoneStateListener>() {
-            @Override
-            public PhoneStateListener call() throws Exception {
-                return new PhoneStateListener() {
-                    @Override
-                    public void onCallStateChanged(int state, String incomingNumber) {
-                        mPhoneState.putString("incomingNumber", incomingNumber);
-                        switch (state) {
-                            case TelephonyManager.CALL_STATE_IDLE:
-                                mPhoneState.putString("state", "idle");
-                                break;
-                            case TelephonyManager.CALL_STATE_OFFHOOK:
-                                mPhoneState.putString("state", "offhook");
-                                break;
-                            case TelephonyManager.CALL_STATE_RINGING:
-                                mPhoneState.putString("state", "ringing");
-                                break;
-                        }
-                        mEventFacade.postEvent("phone", mPhoneState.clone());
-                    }
-                };
-            }
-        });
-    }
-
-    @Override
-    public void shutdown() {
-        stopTrackingPhoneState();
-    }
-
-    @Rpc(description = "Starts tracking phone state.")
-    @RpcStartEvent("phone")
-    public void startTrackingPhoneState() {
-        mTelephonyManager.listen(mPhoneStateListener, PhoneStateListener.LISTEN_CALL_STATE);
-    }
-
-    @Rpc(description = "Returns the current phone state and incoming number.", returns = "A Map of \"state\" and \"incomingNumber\"")
-    public Bundle readPhoneState() {
-        return mPhoneState;
-    }
-
-    @Rpc(description = "Stops tracking phone state.")
-    @RpcStopEvent("phone")
-    public void stopTrackingPhoneState() {
-        mTelephonyManager.listen(mPhoneStateListener, PhoneStateListener.LISTEN_NONE);
-    }
-
-    @Rpc(description = "Calls a contact/phone number by URI.")
-    public void phoneCall(@RpcParameter(name = "uri") final String uriString) throws Exception {
-        Uri uri = Uri.parse(uriString);
-        if (uri.getScheme().equals("content")) {
-            String phoneNumberColumn = PhonesColumns.NUMBER;
-            String selectWhere = null;
-            if ((FacadeManager.class.cast(mManager)).getSdkLevel() >= 5) {
-                Class<?> contactsContract_Data_class =
-                        Class.forName("android.provider.ContactsContract$Data");
-                Field RAW_CONTACT_ID_field = contactsContract_Data_class.getField("RAW_CONTACT_ID");
-                selectWhere = RAW_CONTACT_ID_field.get(null).toString() + "=" + uri.getLastPathSegment();
-                Field CONTENT_URI_field = contactsContract_Data_class.getField("CONTENT_URI");
-                uri = Uri.parse(CONTENT_URI_field.get(null).toString());
-                Class<?> ContactsContract_CommonDataKinds_Phone_class =
-                        Class.forName("android.provider.ContactsContract$CommonDataKinds$Phone");
-                Field NUMBER_field = ContactsContract_CommonDataKinds_Phone_class.getField("NUMBER");
-                phoneNumberColumn = NUMBER_field.get(null).toString();
-            }
-            ContentResolver resolver = mService.getContentResolver();
-            Cursor c = resolver.query(uri, new String[]{phoneNumberColumn}, selectWhere, null, null);
-            String number = "";
-            if (c.moveToFirst()) {
-                number = c.getString(c.getColumnIndexOrThrow(phoneNumberColumn));
-            }
-            c.close();
-            phoneCallNumber(number);
-        } else {
-            mAndroidFacade.startActivity(Intent.ACTION_CALL, uriString, null, null, null, null, null);
-        }
-    }
-
-    @Rpc(description = "Calls a phone number.")
-    public void phoneCallNumber(@RpcParameter(name = "phone number") final String number)
-            throws Exception {
-        phoneCall("tel:" + URLEncoder.encode(number, "ASCII"));
-    }
-
-    @Rpc(description = "Dials a contact/phone number by URI.")
-    public void phoneDial(@RpcParameter(name = "uri") final String uri) throws Exception {
-        mAndroidFacade.startActivity(Intent.ACTION_DIAL, uri, null, null, null, null, null);
-    }
-
-    @Rpc(description = "Dials a phone number.")
-    public void phoneDialNumber(@RpcParameter(name = "phone number") final String number)
-            throws Exception, UnsupportedEncodingException {
-        phoneDial("tel:" + URLEncoder.encode(number, "ASCII"));
-    }
-
-    @Rpc(description = "Returns the current cell location.")
-    public CellLocation getCellLocation() {
-        return mTelephonyManager.getCellLocation();
-    }
-
-    @Rpc(description = "Returns the numeric name (MCC+MNC) of current registered operator.")
-    public String getNetworkOperator() {
-        return mTelephonyManager.getNetworkOperator();
-    }
-
-    @Rpc(description = "Returns the alphabetic name of current registered operator.")
-    public String getNetworkOperatorName() {
-        return mTelephonyManager.getNetworkOperatorName();
-    }
-
-    @Rpc(description = "Returns a the radio technology (network type) currently in use on the device.")
-    public String getNetworkType() {
-        // TODO(damonkohler): API level 5 has many more types.
-        switch (mTelephonyManager.getNetworkType()) {
-            case TelephonyManager.NETWORK_TYPE_EDGE:
-                return "edge";
-            case TelephonyManager.NETWORK_TYPE_GPRS:
-                return "gprs";
-            case TelephonyManager.NETWORK_TYPE_UMTS:
-                return "umts";
-            case TelephonyManager.NETWORK_TYPE_UNKNOWN:
-                return "unknown";
-            default:
-                return null;
-        }
-    }
-
-    @Rpc(description = "Returns the device phone type.")
-    public String getPhoneType() {
-        // TODO(damonkohler): API level 4 includes CDMA.
-        switch (mTelephonyManager.getPhoneType()) {
-            case TelephonyManager.PHONE_TYPE_GSM:
-                return "gsm";
-            case TelephonyManager.PHONE_TYPE_NONE:
-                return "none";
-            default:
-                return null;
-        }
-    }
-
-    @Rpc(description = "Returns the ISO country code equivalent for the SIM provider's country code.")
-    public String getSimCountryIso() {
-        return mTelephonyManager.getSimCountryIso();
-    }
-
-    @Rpc(description = "Returns the MCC+MNC (mobile country code + mobile network code) of the provider of the SIM. 5 or 6 decimal digits.")
-    public String getSimOperator() {
-        return mTelephonyManager.getSimOperator();
-    }
-
-    @Rpc(description = "Returns the Service Provider Name (SPN).")
-    public String getSimOperatorName() {
-        return mTelephonyManager.getSimOperatorName();
-    }
-
-    @Rpc(description = "Returns the serial number of the SIM, if applicable. Return null if it is unavailable.")
-    public String getSimSerialNumber() {
-        return mTelephonyManager.getSimSerialNumber();
-    }
-
-    @Rpc(description = "Returns the state of the device SIM card.")
-    public String getSimState() {
-        switch (mTelephonyManager.getSimState()) {
-            case TelephonyManager.SIM_STATE_UNKNOWN:
-                return "uknown";
-            case TelephonyManager.SIM_STATE_ABSENT:
-                return "absent";
-            case TelephonyManager.SIM_STATE_PIN_REQUIRED:
-                return "pin_required";
-            case TelephonyManager.SIM_STATE_PUK_REQUIRED:
-                return "puk_required";
-            case TelephonyManager.SIM_STATE_NETWORK_LOCKED:
-                return "network_locked";
-            case TelephonyManager.SIM_STATE_READY:
-                return "ready";
-            default:
-                return null;
-        }
-    }
-
-    @Rpc(description = "Returns the unique subscriber ID, for example, the IMSI for a GSM phone. Return null if it is unavailable.")
-    public String getSubscriberId() {
-        return mTelephonyManager.getSubscriberId();
-    }
-
-    @Rpc(description = "Retrieves the alphabetic identifier associated with the voice mail number.")
-    public String getVoiceMailAlphaTag() {
-        return mTelephonyManager.getVoiceMailAlphaTag();
-    }
-
-    @Rpc(description = "Returns the voice mail number. Return null if it is unavailable.")
-    public String getVoiceMailNumber() {
-        return mTelephonyManager.getVoiceMailNumber();
-    }
-
-    @Rpc(description = "Returns true if the device is considered roaming on the current network, for GSM purposes.")
-    public Boolean checkNetworkRoaming() {
-        return mTelephonyManager.isNetworkRoaming();
-    }
-
-    @Rpc(description = "Returns the unique device ID, for example, the IMEI for GSM and the MEID for CDMA phones. Return null if device ID is not available.")
-    public String getDeviceId() {
-        return mTelephonyManager.getDeviceId();
-    }
-
-    @Rpc(description = "Returns the software version number for the device, for example, the IMEI/SV for GSM phones. Return null if the software version is not available.")
-    public String getDeviceSoftwareVersion() {
-        return mTelephonyManager.getDeviceSoftwareVersion();
-    }
-
-    @Rpc(description = "Returns the phone number string for line 1, for example, the MSISDN for a GSM phone. Return null if it is unavailable.")
-    public String getLine1Number() {
-        return mTelephonyManager.getLine1Number();
-    }
-
-    @Rpc(description = "Returns the neighboring cell information of the device.")
-    public List<NeighboringCellInfo> getNeighboringCellInfo() {
-        return mTelephonyManager.getNeighboringCellInfo();
-    }
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/PreferencesFacade.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/PreferencesFacade.java
deleted file mode 100644
index 7af2d65f..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/PreferencesFacade.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package org.qpython.qsl4a.qsl4a.facade;
-
-import android.app.Service;
-import android.content.SharedPreferences;
-import android.content.SharedPreferences.Editor;
-import android.preference.PreferenceManager;
-
-import org.qpython.qsl4a.qsl4a.jsonrpc.RpcReceiver;
-import org.qpython.qsl4a.qsl4a.rpc.Rpc;
-import org.qpython.qsl4a.qsl4a.rpc.RpcOptional;
-import org.qpython.qsl4a.qsl4a.rpc.RpcParameter;
-
-import java.io.IOException;
-import java.util.Map;
-
-/**
- * This facade allows access to the Preferences interface.
- * 
- * <br>
- * <b>Notes:</b> <br>
- * <b>filename</b> - Filename indicates which preference file to refer to. If no filename is
- * supplied (the default) then the SharedPreferences uses is the default for the SL4A application.<br>
- * <b>prefPutValue</b> - uses "MODE_PRIVATE" when writing to preferences. Save values to the default
- * shared preferences is explicitly disallowed.<br>
- * <br>
- * See <a
- * href=http://developer.android.com/reference/java/util/prefs/Preferences.html>Preferences</a> and
- * <a href=http://developer.android.com/guide/topics/data/data-storage.html#pref>Shared
- * Preferences</a> in the android documentation on how preferences work.
- * 
- * @author Robbie Matthews (rjmatthews62@gmail.com)
- */
-
-public class PreferencesFacade extends RpcReceiver {
-
-  private Service mService;
-
-  public PreferencesFacade(FacadeManager manager) {
-    super(manager);
-    mService = manager.getService();
-  }
-
-  @Rpc(description = "Read a value from shared preferences")
-  public Object prefGetValue(
-      @RpcParameter(name = "key") String key,
-      @RpcParameter(name = "filename", description = "Desired preferences file. If not defined, uses the default Shared Preferences.") @RpcOptional String filename) {
-    SharedPreferences p = getPref(filename);
-    return p.getAll().get(key);
-  }
-
-  @Rpc(description = "Write a value to shared preferences")
-  public void prefPutValue(
-      @RpcParameter(name = "key") String key,
-      @RpcParameter(name = "value") Object value,
-      @RpcParameter(name = "filename", description = "Desired preferences file. If not defined, uses the default Shared Preferences.") @RpcOptional String filename)
-      throws IOException {
-    if (filename == null || filename.equals("")) {
-      throw new IOException("Can't write to default preferences.");
-    }
-    SharedPreferences p = getPref(filename);
-    Editor e = p.edit();
-    if (value instanceof Boolean) {
-      e.putBoolean(key, (Boolean) value);
-    } else if (value instanceof Long) {
-      e.putLong(key, (Long) value);
-    } else if (value instanceof Integer) {
-      e.putLong(key, (Integer) value);
-    } else if (value instanceof Float) {
-      e.putFloat(key, (Float) value);
-    } else if (value instanceof Double) { // TODO: Not sure if this is a good idea
-      e.putFloat(key, ((Double) value).floatValue());
-    } else {
-      e.putString(key, value.toString());
-    }
-    e.commit();
-  }
-
-  @Rpc(description = "Get list of Shared Preference Values", returns = "Map of key,value")
-  public Map<String, ?> prefGetAll(
-      @RpcParameter(name = "filename", description = "Desired preferences file. If not defined, uses the default Shared Preferences.") @RpcOptional String filename) {
-    return getPref(filename).getAll();
-  }
-
-  private SharedPreferences getPref(String filename) {
-    if (filename == null || filename.equals("")) {
-      return PreferenceManager.getDefaultSharedPreferences(mService);
-    }
-    return mService.getSharedPreferences(filename, 0);
-
-  }
-
-  @Override
-  public void shutdown() {
-
-  }
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/QPyInterfaceFacade.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/QPyInterfaceFacade.java
deleted file mode 100644
index b41ecb9d..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/QPyInterfaceFacade.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package org.qpython.qsl4a.qsl4a.facade;
-
-import android.app.Service;
-import android.content.Intent;
-import android.os.Bundle;
-
-import org.qpython.qsl4a.qsl4a.jsonrpc.RpcReceiver;
-import org.qpython.qsl4a.qsl4a.rpc.Rpc;
-import org.qpython.qsl4a.qsl4a.rpc.RpcOptional;
-import org.qpython.qsl4a.qsl4a.rpc.RpcParameter;
-
-
-/**
- * Wifi functions.
- */
-public class QPyInterfaceFacade extends RpcReceiver {
-    private final Service mService;
-
-    public QPyInterfaceFacade(FacadeManager manager) {
-        super(manager);
-        mService = manager.getService();
-
-    }
-
-    @Override
-    public void shutdown() {
-        // TODO Auto-generated method stub
-    }
-
-    @Rpc(description = "Execute QPython script throught SL4A", returns = "True if the operation succeeded.")
-    public Boolean executeQPy(@RpcParameter(name = "QPython script path") @RpcOptional String path) {
-
-        String extPlgPlusName = "org.qpython.qpy";
-
-        //if (NUtil.checkAppInstalledByName(mService.getApplicationContext(), extPlgPlusName)) {
-        Intent intent = new Intent();
-        intent.setClassName(extPlgPlusName, extPlgPlusName + ".MPyApi");
-        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        intent.setAction(extPlgPlusName + ".action.MPyApi");
-
-        Bundle mBundle = new Bundle();
-        mBundle.putString("app", "app");
-        mBundle.putString("act", "onPyApi");
-        mBundle.putString("flag", "SL4A");
-        mBundle.putString("param", "fileapi");
-        mBundle.putString("pyfile", path);
-
-        intent.putExtras(mBundle);
-
-        mService.getApplicationContext().startActivity(intent);
-
-        //}
-
-        return true;
-    }
-
-}
\ No newline at end of file
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/SensorManagerFacade.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/SensorManagerFacade.java
deleted file mode 100644
index 38f2b93f..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/SensorManagerFacade.java
+++ /dev/null
@@ -1,497 +0,0 @@
-/*
- * Copyright (C) 2010 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.
- */
-
-package org.qpython.qsl4a.qsl4a.facade;
-
-import android.content.Context;
-import android.hardware.Sensor;
-import android.hardware.SensorEvent;
-import android.hardware.SensorEventListener;
-import android.hardware.SensorManager;
-import android.os.Bundle;
-
-
-import org.qpython.qsl4a.qsl4a.jsonrpc.RpcReceiver;
-import org.qpython.qsl4a.qsl4a.rpc.Rpc;
-import org.qpython.qsl4a.qsl4a.rpc.RpcDefault;
-import org.qpython.qsl4a.qsl4a.rpc.RpcDeprecated;
-import org.qpython.qsl4a.qsl4a.rpc.RpcParameter;
-import org.qpython.qsl4a.qsl4a.rpc.RpcStartEvent;
-import org.qpython.qsl4a.qsl4a.rpc.RpcStopEvent;
-
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * Exposes the SensorManager related functionality. <br>
- * <br>
- * <b>Guidance notes</b> <br>
- * For reasons of economy the sensors on smart phones are usually low cost and, therefore, low
- * accuracy (usually represented by 10 bit data). The floating point data values obtained from
- * sensor readings have up to 16 decimal places, the majority of which are noise. On many phones the
- * accelerometer is limited (by the phone manufacturer) to a maximum reading of 2g. The magnetometer
- * (which also provides orientation readings) is strongly affected by the presence of ferrous metals
- * and can give large errors in vehicles, on board ship etc.
- * 
- * Following a startSensingTimed(A,B) api call sensor events are entered into the Event Queue (see
- * EventFacade). For the A parameter: 1 = All Sensors, 2 = Accelerometer, 3 = Magnetometer and 4 =
- * Light. The B parameter is the minimum delay between recordings in milliseconds. To avoid
- * duplicate readings the minimum delay should be 20 milliseconds. The light sensor will probably be
- * much slower (taking about 1 second to register a change in light level). Note that if the light
- * level is constant no sensor events will be registered by the light sensor.
- * 
- * Following a startSensingThreshold(A,B,C) api call sensor events greater than a given threshold
- * are entered into the Event Queue. For the A parameter: 1 = Orientation, 2 = Accelerometer, 3 =
- * Magnetometer and 4 = Light. The B parameter is the integer value of the required threshold level.
- * For orientation sensing the integer threshold value is in milliradians. Since orientation events
- * can exceed the threshold value for long periods only crossing and return events are recorded. The
- * C parameter is the required axis (XYZ) of the sensor: 0 = No axis, 1 = X, 2 = Y, 3 = X+Y, 4 = Z,
- * 5= X+Z, 6 = Y+Z, 7 = X+Y+Z. For orientation X = azimuth, Y = pitch and Z = roll. <br>
- * 
- * <br>
- * <b>Example (python)</b>
- * 
- * <pre>
- * import android, time
- * droid = android.Android()
- * droid.startSensingTimed(1, 250)
- * time.sleep(1)
- * s1 = droid.readSensors().result
- * s2 = droid.sensorsGetAccuracy().result
- * s3 = droid.sensorsGetLight().result
- * s4 = droid.sensorsReadAccelerometer().result
- * s5 = droid.sensorsReadMagnetometer().result
- * s6 = droid.sensorsReadOrientation().result
- * droid.stopSensing()
- * </pre>
- * 
- * Returns:<br>
- * s1 = {u'accuracy': 3, u'pitch': -0.47323511242866517, u'xmag': 1.75, u'azimuth':
- * -0.26701245009899138, u'zforce': 8.4718560000000007, u'yforce': 4.2495484000000001, u'time':
- * 1297160391.2820001, u'ymag': -8.9375, u'zmag': -41.0625, u'roll': -0.031366908922791481,
- * u'xforce': 0.23154590999999999}<br>
- * s2 = 3 (Highest accuracy)<br>
- * s3 = None ---(not available on many phones)<br>
- * s4 = [0.23154590999999999, 4.2495484000000001, 8.4718560000000007] ----(x, y, z accelerations)<br>
- * s5 = [1.75, -8.9375, -41.0625] -----(x, y, z magnetic readings)<br>
- * s6 = [-0.26701245009899138, -0.47323511242866517, -0.031366908922791481] ---(azimuth, pitch, roll
- * in radians)<br>
- * 
- * @author Damon Kohler (damonkohler@gmail.com)
- * @author Felix Arends (felix.arends@gmail.com)
- * @author Alexey Reznichenko (alexey.reznichenko@gmail.com)
- * @author Robbie Mathews (rjmatthews62@gmail.com)
- * @author John Karwatzki (jokar49@gmail.com)
- */
-public class SensorManagerFacade extends RpcReceiver {
-  private final EventFacade mEventFacade;
-  private final SensorManager mSensorManager;
-
-  private volatile Bundle mSensorReadings;
-
-  private volatile Integer mAccuracy;
-  private volatile Integer mSensorNumber;
-  private volatile Integer mXAxis = 0;
-  private volatile Integer mYAxis = 0;
-  private volatile Integer mZAxis = 0;
-  private volatile Integer mThreshing = 0;
-  private volatile Integer mThreshOrientation = 0;
-  private volatile Integer mXCrossed = 0;
-  private volatile Integer mYCrossed = 0;
-  private volatile Integer mZCrossed = 0;
-
-  private volatile Float mThreshold;
-  private volatile Float mXForce;
-  private volatile Float mYForce;
-  private volatile Float mZForce;
-
-  private volatile Float mXMag;
-  private volatile Float mYMag;
-  private volatile Float mZMag;
-
-  private volatile Float mLight;
-
-  private volatile Double mAzimuth;
-  private volatile Double mPitch;
-  private volatile Double mRoll;
-
-  private volatile Long mLastTime;
-  private volatile Long mDelayTime;
-
-  private SensorEventListener mSensorListener;
-
-  public SensorManagerFacade(FacadeManager manager) {
-    super(manager);
-    mEventFacade = manager.getReceiver(EventFacade.class);
-    mSensorManager = (SensorManager) manager.getService().getSystemService(Context.SENSOR_SERVICE);
-  }
-
-  @Rpc(description = "Starts recording sensor data to be available for polling.")
-  @RpcStartEvent("sensors")
-  public void startSensingTimed(
-      @RpcParameter(name = "sensorNumber", description = "1 = All, 2 = Accelerometer, 3 = Magnetometer and 4 = Light") Integer sensorNumber,
-      @RpcParameter(name = "delayTime", description = "Minimum time between readings in milliseconds") Integer delayTime) {
-    mSensorNumber = sensorNumber;
-    if (delayTime < 20) {
-      delayTime = 20;
-    }
-    mDelayTime = (long) (delayTime);
-    mLastTime = System.currentTimeMillis();
-    if (mSensorListener == null) {
-      mSensorListener = new SensorValuesCollector();
-      mSensorReadings = new Bundle();
-      switch (mSensorNumber) {
-      case 1:
-        for (Sensor sensor : mSensorManager.getSensorList(Sensor.TYPE_ALL)) {
-          mSensorManager.registerListener(mSensorListener, sensor,
-              SensorManager.SENSOR_DELAY_FASTEST);
-        }
-        break;
-      case 2:
-        for (Sensor sensor : mSensorManager.getSensorList(Sensor.TYPE_ACCELEROMETER)) {
-          mSensorManager.registerListener(mSensorListener, sensor,
-              SensorManager.SENSOR_DELAY_FASTEST);
-        }
-        break;
-      case 3:
-        for (Sensor sensor : mSensorManager.getSensorList(Sensor.TYPE_MAGNETIC_FIELD)) {
-          mSensorManager.registerListener(mSensorListener, sensor,
-              SensorManager.SENSOR_DELAY_FASTEST);
-        }
-        break;
-      case 4:
-        for (Sensor sensor : mSensorManager.getSensorList(Sensor.TYPE_LIGHT)) {
-          mSensorManager.registerListener(mSensorListener, sensor,
-              SensorManager.SENSOR_DELAY_FASTEST);
-        }
-      }
-    }
-  }
-
-  @Rpc(description = "Records to the Event Queue sensor data exceeding a chosen threshold.")
-  @RpcStartEvent("threshold")
-  public void startSensingThreshold(
-
-      @RpcParameter(name = "sensorNumber", description = "1 = Orientation, 2 = Accelerometer, 3 = Magnetometer and 4 = Light") Integer sensorNumber,
-      @RpcParameter(name = "threshold", description = "Threshold level for chosen sensor (integer)") Integer threshold,
-      @RpcParameter(name = "axis", description = "0 = No axis, 1 = X, 2 = Y, 3 = X+Y, 4 = Z, 5= X+Z, 6 = Y+Z, 7 = X+Y+Z") Integer axis) {
-    mSensorNumber = sensorNumber;
-    mXAxis = axis & 1;
-    mYAxis = axis & 2;
-    mZAxis = axis & 4;
-    if (mSensorNumber == 1) {
-      mThreshing = 0;
-      mThreshOrientation = 1;
-      mThreshold = ((float) threshold) / ((float) 1000);
-    } else {
-      mThreshing = 1;
-      mThreshold = (float) threshold;
-    }
-    startSensingTimed(mSensorNumber, 20);
-  }
-
-  @Rpc(description = "Returns the most recently recorded sensor data.")
-  public Bundle readSensors() {
-    if (mSensorReadings == null) {
-      return null;
-    }
-    synchronized (mSensorReadings) {
-      return new Bundle(mSensorReadings);
-    }
-  }
-
-  @Rpc(description = "Stops collecting sensor data.")
-  @RpcStopEvent("sensors")
-  public void stopSensing() {
-    mSensorManager.unregisterListener(mSensorListener);
-    mSensorListener = null;
-    mSensorReadings = null;
-    mThreshing = 0;
-    mThreshOrientation = 0;
-  }
-
-  @Rpc(description = "Returns the most recently received accuracy value.")
-  public Integer sensorsGetAccuracy() {
-    return mAccuracy;
-  }
-
-  @Rpc(description = "Returns the most recently received light value.")
-  public Float sensorsGetLight() {
-    return mLight;
-  }
-
-  @Rpc(description = "Returns the most recently received accelerometer values.", returns = "a List of Floats [(acceleration on the) X axis, Y axis, Z axis].")
-  public List<Float> sensorsReadAccelerometer() {
-    synchronized (mSensorReadings) {
-      return Arrays.asList(mXForce, mYForce, mZForce);
-    }
-  }
-
-  @Rpc(description = "Returns the most recently received magnetic field values.", returns = "a List of Floats [(magnetic field value for) X axis, Y axis, Z axis].")
-  public List<Float> sensorsReadMagnetometer() {
-    synchronized (mSensorReadings) {
-      return Arrays.asList(mXMag, mYMag, mZMag);
-    }
-  }
-
-  @Rpc(description = "Returns the most recently received orientation values.", returns = "a List of Doubles [azimuth, pitch, roll].")
-  public List<Double> sensorsReadOrientation() {
-    synchronized (mSensorReadings) {
-      return Arrays.asList(mAzimuth, mPitch, mRoll);
-    }
-  }
-
-  @Rpc(description = "Starts recording sensor data to be available for polling.")
-  @RpcDeprecated(value = "startSensingTimed or startSensingThreshhold", release = "4")
-  public void startSensing(
-      @RpcParameter(name = "sampleSize", description = "number of samples for calculating average readings") @RpcDefault("5") Integer sampleSize) {
-    if (mSensorListener == null) {
-      startSensingTimed(1, 220);
-    }
-  }
-
-  @Override
-  public void shutdown() {
-    stopSensing();
-  }
-
-  private class SensorValuesCollector implements SensorEventListener {
-    private final static int MATRIX_SIZE = 9;
-
-    private final RollingAverage mmAzimuth;
-    private final RollingAverage mmPitch;
-    private final RollingAverage mmRoll;
-
-    private float[] mmGeomagneticValues;
-    private float[] mmGravityValues;
-    private float[] mmR;
-    private float[] mmOrientation;
-
-    public SensorValuesCollector() {
-      mmAzimuth = new RollingAverage();
-      mmPitch = new RollingAverage();
-      mmRoll = new RollingAverage();
-    }
-
-    private void postEvent() {
-      mSensorReadings.putDouble("time", System.currentTimeMillis() / 1000.0);
-      mEventFacade.postEvent("sensors", mSensorReadings.clone());
-    }
-
-    @Override
-    public void onAccuracyChanged(Sensor sensor, int accuracy) {
-      if (mSensorReadings == null) {
-        return;
-      }
-      synchronized (mSensorReadings) {
-        mSensorReadings.putInt("accuracy", accuracy);
-        mAccuracy = accuracy;
-
-      }
-    }
-
-    @Override
-    public void onSensorChanged(SensorEvent event) {
-      if (mSensorReadings == null) {
-        return;
-      }
-      synchronized (mSensorReadings) {
-        switch (event.sensor.getType()) {
-        case Sensor.TYPE_ACCELEROMETER:
-          mXForce = event.values[0];
-          mYForce = event.values[1];
-          mZForce = event.values[2];
-          if (mThreshing == 0) {
-            mSensorReadings.putFloat("xforce", mXForce);
-            mSensorReadings.putFloat("yforce", mYForce);
-            mSensorReadings.putFloat("zforce", mZForce);
-            if ((mSensorNumber == 2) && (System.currentTimeMillis() > (mDelayTime + mLastTime))) {
-              mLastTime = System.currentTimeMillis();
-              postEvent();
-            }
-          }
-          if ((mThreshing == 1) && (mSensorNumber == 2)) {
-            if ((Math.abs(mXForce) > mThreshold) && (mXAxis == 1)) {
-              mSensorReadings.putFloat("xforce", mXForce);
-              postEvent();
-            }
-
-            if ((Math.abs(mYForce) > mThreshold) && (mYAxis == 2)) {
-              mSensorReadings.putFloat("yforce", mYForce);
-              postEvent();
-            }
-
-            if ((Math.abs(mZForce) > mThreshold) && (mZAxis == 4)) {
-              mSensorReadings.putFloat("zforce", mZForce);
-              postEvent();
-            }
-          }
-
-          mmGravityValues = event.values.clone();
-          break;
-        case Sensor.TYPE_MAGNETIC_FIELD:
-          mXMag = event.values[0];
-          mYMag = event.values[1];
-          mZMag = event.values[2];
-          if (mThreshing == 0) {
-            mSensorReadings.putFloat("xMag", mXMag);
-            mSensorReadings.putFloat("yMag", mYMag);
-            mSensorReadings.putFloat("zMag", mZMag);
-            if ((mSensorNumber == 3) && (System.currentTimeMillis() > (mDelayTime + mLastTime))) {
-              mLastTime = System.currentTimeMillis();
-              postEvent();
-            }
-          }
-          if ((mThreshing == 1) && (mSensorNumber == 3)) {
-            if ((Math.abs(mXMag) > mThreshold) && (mXAxis == 1)) {
-              mSensorReadings.putFloat("xforce", mXMag);
-              postEvent();
-            }
-            if ((Math.abs(mYMag) > mThreshold) && (mYAxis == 2)) {
-              mSensorReadings.putFloat("yforce", mYMag);
-              postEvent();
-            }
-            if ((Math.abs(mZMag) > mThreshold) && (mZAxis == 4)) {
-              mSensorReadings.putFloat("zforce", mZMag);
-              postEvent();
-            }
-          }
-          mmGeomagneticValues = event.values.clone();
-          break;
-        case Sensor.TYPE_LIGHT:
-          mLight = event.values[0];
-          if (mThreshing == 0) {
-            mSensorReadings.putFloat("light", mLight);
-            if ((mSensorNumber == 4) && (System.currentTimeMillis() > (mDelayTime + mLastTime))) {
-              mLastTime = System.currentTimeMillis();
-              postEvent();
-            }
-          }
-          if ((mThreshing == 1) && (mSensorNumber == 4)) {
-            if (mLight > mThreshold) {
-              mSensorReadings.putFloat("light", mLight);
-              postEvent();
-            }
-          }
-          break;
-
-        }
-        if (mSensorNumber == 1) {
-          if (mmGeomagneticValues != null && mmGravityValues != null) {
-            if (mmR == null) {
-              mmR = new float[MATRIX_SIZE];
-            }
-            if (SensorManager.getRotationMatrix(mmR, null, mmGravityValues, mmGeomagneticValues)) {
-              if (mmOrientation == null) {
-                mmOrientation = new float[3];
-              }
-              SensorManager.getOrientation(mmR, mmOrientation);
-              mmAzimuth.add(mmOrientation[0]);
-              mmPitch.add(mmOrientation[1]);
-              mmRoll.add(mmOrientation[2]);
-
-              mAzimuth = mmAzimuth.get();
-              mPitch = mmPitch.get();
-              mRoll = mmRoll.get();
-              if (mThreshOrientation == 0) {
-                mSensorReadings.putDouble("azimuth", mAzimuth);
-                mSensorReadings.putDouble("pitch", mPitch);
-                mSensorReadings.putDouble("roll", mRoll);
-                if ((mSensorNumber == 1) && (System.currentTimeMillis() > (mDelayTime + mLastTime))) {
-                  mLastTime = System.currentTimeMillis();
-                  postEvent();
-                }
-              }
-              if ((mThreshOrientation == 1) && (mSensorNumber == 1)) {
-                if ((mXAxis == 1) && (mXCrossed == 0)) {
-                  if (Math.abs(mAzimuth) > ((double) mThreshold)) {
-                    mSensorReadings.putDouble("azimuth", mAzimuth);
-                    postEvent();
-                    mXCrossed = 1;
-                  }
-                }
-                if ((mXAxis == 1) && (mXCrossed == 1)) {
-                  if (Math.abs(mAzimuth) < ((double) mThreshold)) {
-                    mSensorReadings.putDouble("azimuth", mAzimuth);
-                    postEvent();
-                    mXCrossed = 0;
-                  }
-                }
-                if ((mYAxis == 2) && (mYCrossed == 0)) {
-                  if (Math.abs(mPitch) > ((double) mThreshold)) {
-                    mSensorReadings.putDouble("pitch", mPitch);
-                    postEvent();
-                    mYCrossed = 1;
-                  }
-                }
-                if ((mYAxis == 2) && (mYCrossed == 1)) {
-                  if (Math.abs(mPitch) < ((double) mThreshold)) {
-                    mSensorReadings.putDouble("pitch", mPitch);
-                    postEvent();
-                    mYCrossed = 0;
-                  }
-                }
-                if ((mZAxis == 4) && (mZCrossed == 0)) {
-                  if (Math.abs(mRoll) > ((double) mThreshold)) {
-                    mSensorReadings.putDouble("roll", mRoll);
-                    postEvent();
-                    mZCrossed = 1;
-                  }
-                }
-                if ((mZAxis == 4) && (mZCrossed == 1)) {
-                  if (Math.abs(mRoll) < ((double) mThreshold)) {
-                    mSensorReadings.putDouble("roll", mRoll);
-                    postEvent();
-                    mZCrossed = 0;
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-
-  static class RollingAverage {
-    private final int mmSampleSize;
-    private final double mmData[];
-    private int mmIndex = 0;
-    private boolean mmFilled = false;
-    private double mmSum = 0.0;
-
-    public RollingAverage() {
-      mmSampleSize = 5;
-      mmData = new double[mmSampleSize];
-    }
-
-    public void add(double value) {
-      mmSum -= mmData[mmIndex];
-      mmData[mmIndex] = value;
-      mmSum += mmData[mmIndex];
-      ++mmIndex;
-      mmIndex %= mmSampleSize;
-      mmFilled = (!mmFilled) ? mmIndex == 0 : mmFilled;
-    }
-
-    public double get() throws IllegalStateException {
-      if (!mmFilled && mmIndex == 0) {
-        throw new IllegalStateException("No values to average.");
-      }
-      return (mmFilled) ? (mmSum / mmSampleSize) : (mmSum / mmIndex);
-    }
-  }
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/SettingsFacade.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/SettingsFacade.java
deleted file mode 100644
index cc27163e..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/SettingsFacade.java
+++ /dev/null
@@ -1,233 +0,0 @@
-/*
- * Copyright (C) 2009 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.
- */
-
-package org.qpython.qsl4a.qsl4a.facade;
-
-import android.app.Service;
-
-import android.content.Context;
-import android.content.Intent;
-import android.media.AudioManager;
-import android.os.PowerManager;
-import android.provider.Settings.SettingNotFoundException;
-import android.view.WindowManager;
-
-import org.qpython.qsl4a.QSL4APP;
-import org.qpython.qsl4a.qsl4a.FutureActivityTaskExecutor;
-import org.qpython.qsl4a.qsl4a.Log;
-
-import java.lang.reflect.Method;
-
-import org.qpython.qsl4a.qsl4a.future.FutureActivityTask;
-import org.qpython.qsl4a.qsl4a.jsonrpc.RpcReceiver;
-import org.qpython.qsl4a.qsl4a.rpc.Rpc;
-import org.qpython.qsl4a.qsl4a.rpc.RpcOptional;
-import org.qpython.qsl4a.qsl4a.rpc.RpcParameter;
-
-/**
- * Exposes phone settings functionality.
- * 
- * @author Frank Spychalski (frank.spychalski@gmail.com)
- */
-public class SettingsFacade extends RpcReceiver {
-
-  public static int AIRPLANE_MODE_OFF = 0;
-  public static int AIRPLANE_MODE_ON = 1;
-
-  private final Service mService;
-  private final AudioManager mAudio;
-  private final PowerManager mPower;
-
-  /**
-   * Creates a new SettingsFacade.
-   * 
-   * @param service
-   *          is the {@link Context} the APIs will run under
-   */
-  public SettingsFacade(FacadeManager manager) {
-    super(manager);
-    mService = manager.getService();
-    mAudio = (AudioManager) mService.getSystemService(Context.AUDIO_SERVICE);
-    mPower = (PowerManager) mService.getSystemService(Context.POWER_SERVICE);
-  }
-
-  @Rpc(description = "Sets the screen timeout to this number of seconds.", returns = "The original screen timeout.")
-  public Integer setScreenTimeout(@RpcParameter(name = "value") Integer value) {
-    Integer oldValue = getScreenTimeout();
-    android.provider.Settings.System.putInt(mService.getContentResolver(),
-        android.provider.Settings.System.SCREEN_OFF_TIMEOUT, value * 1000);
-    return oldValue;
-  }
-
-  @Rpc(description = "Returns the current screen timeout in seconds.", returns = "the current screen timeout in seconds.")
-  public Integer getScreenTimeout() {
-    try {
-      return android.provider.Settings.System.getInt(mService.getContentResolver(),
-          android.provider.Settings.System.SCREEN_OFF_TIMEOUT) / 1000;
-    } catch (SettingNotFoundException e) {
-      return 0;
-    }
-  }
-
-  @SuppressWarnings("deprecation")
-@Rpc(description = "Checks the airplane mode setting.", returns = "True if airplane mode is enabled.")
-  public Boolean checkAirplaneMode() {
-    try {
-      return android.provider.Settings.System.getInt(mService.getContentResolver(),
-          android.provider.Settings.System.AIRPLANE_MODE_ON) == AIRPLANE_MODE_ON;
-    } catch (SettingNotFoundException e) {
-      return false;
-    }
-  }
-
-  @SuppressWarnings("deprecation")
-@Rpc(description = "Toggles airplane mode on and off.", returns = "True if airplane mode is enabled.")
-  public Boolean toggleAirplaneMode(@RpcParameter(name = "enabled") @RpcOptional Boolean enabled) {
-    if (enabled == null) {
-      enabled = !checkAirplaneMode();
-    }
-    android.provider.Settings.System.putInt(mService.getContentResolver(),
-        android.provider.Settings.System.AIRPLANE_MODE_ON, enabled ? AIRPLANE_MODE_ON
-            : AIRPLANE_MODE_OFF);
-    Intent intent = new Intent(Intent.ACTION_AIRPLANE_MODE_CHANGED);
-    intent.putExtra("state", enabled);
-    mService.sendBroadcast(intent);
-    return enabled;
-  }
-
-  @Rpc(description = "Checks the ringer silent mode setting.", returns = "True if ringer silent mode is enabled.")
-  public Boolean checkRingerSilentMode() {
-    return mAudio.getRingerMode() == AudioManager.RINGER_MODE_SILENT;
-  }
-
-  @Rpc(description = "Toggles ringer silent mode on and off.", returns = "True if ringer silent mode is enabled.")
-  public Boolean toggleRingerSilentMode(@RpcParameter(name = "enabled") @RpcOptional Boolean enabled) {
-    if (enabled == null) {
-      enabled = !checkRingerSilentMode();
-    }
-    mAudio.setRingerMode(enabled ? AudioManager.RINGER_MODE_SILENT
-        : AudioManager.RINGER_MODE_NORMAL);
-    return enabled;
-  }
-
-  @SuppressWarnings("deprecation")
-@Rpc(description = "Toggles vibrate mode on and off. If ringer=true then set Ringer setting, else set Notification setting", returns = "True if vibrate mode is enabled.")
-  public Boolean toggleVibrateMode(@RpcParameter(name = "enabled") @RpcOptional Boolean enabled,
-      @RpcParameter(name = "ringer") @RpcOptional Boolean ringer) {
-    int atype = ringer ? AudioManager.VIBRATE_TYPE_RINGER : AudioManager.VIBRATE_TYPE_NOTIFICATION;
-    int asetting = enabled ? AudioManager.VIBRATE_SETTING_ON : AudioManager.VIBRATE_SETTING_OFF;
-    mAudio.setVibrateSetting(atype, asetting);
-    return enabled;
-  }
-
-  @SuppressWarnings("deprecation")
-@Rpc(description = "Checks Vibration setting. If ringer=true then query Ringer setting, else query Notification setting", returns = "True if vibrate mode is enabled.")
-  public Boolean getVibrateMode(@RpcParameter(name = "ringer") @RpcOptional Boolean ringer) {
-    int atype = ringer ? AudioManager.VIBRATE_TYPE_RINGER : AudioManager.VIBRATE_TYPE_NOTIFICATION;
-    return mAudio.shouldVibrate(atype);
-  }
-
-  @Rpc(description = "Returns the maximum ringer volume.")
-  public int getMaxRingerVolume() {
-    return mAudio.getStreamMaxVolume(AudioManager.STREAM_RING);
-  }
-
-  @Rpc(description = "Returns the current ringer volume.")
-  public int getRingerVolume() {
-    return mAudio.getStreamVolume(AudioManager.STREAM_RING);
-  }
-
-  @Rpc(description = "Sets the ringer volume.")
-  public void setRingerVolume(@RpcParameter(name = "volume") Integer volume) {
-    mAudio.setStreamVolume(AudioManager.STREAM_RING, volume, 0);
-  }
-
-  @Rpc(description = "Returns the maximum media volume.")
-  public int getMaxMediaVolume() {
-    return mAudio.getStreamMaxVolume(AudioManager.STREAM_MUSIC);
-  }
-
-  @Rpc(description = "Returns the current media volume.")
-  public int getMediaVolume() {
-    return mAudio.getStreamVolume(AudioManager.STREAM_MUSIC);
-  }
-
-  @Rpc(description = "Sets the media volume.")
-  public void setMediaVolume(@RpcParameter(name = "volume") Integer volume) {
-    mAudio.setStreamVolume(AudioManager.STREAM_MUSIC, volume, 0);
-  }
-
-  @Rpc(description = "Returns the screen backlight brightness.", returns = "the current screen brightness between 0 and 255")
-  public Integer getScreenBrightness() {
-    try {
-      return android.provider.Settings.System.getInt(mService.getContentResolver(),
-          android.provider.Settings.System.SCREEN_BRIGHTNESS);
-    } catch (SettingNotFoundException e) {
-      return 0;
-    }
-  }
-
-  @Rpc(description = "Sets the the screen backlight brightness.", returns = "the original screen brightness.")
-  public Integer setScreenBrightness(
-      @RpcParameter(name = "value", description = "brightness value between 0 and 255") Integer value) {
-    if (value < 0) {
-      value = 0;
-    } else if (value > 255) {
-      value = 255;
-    }
-    final int brightness = value;
-    Integer oldValue = getScreenBrightness();
-    android.provider.Settings.System.putInt(mService.getContentResolver(),
-        android.provider.Settings.System.SCREEN_BRIGHTNESS, brightness);
-
-    FutureActivityTask<Object> task = new FutureActivityTask<Object>() {
-      @Override
-      public void onCreate() {
-        super.onCreate();
-        WindowManager.LayoutParams lp = getActivity().getWindow().getAttributes();
-        lp.screenBrightness = brightness * 1.0f / 255;
-        getActivity().getWindow().setAttributes(lp);
-        setResult(null);
-        finish();
-      }
-    };
-
-    FutureActivityTaskExecutor taskExecutor =
-        ((QSL4APP) mService.getApplication()).getTaskExecutor();
-    taskExecutor.execute(task);
-
-    return oldValue;
-  }
-
-  @Rpc(description = "Checks if the screen is on or off (requires API level 7).", returns = "True if the screen is currently on.")
-  public Boolean checkScreenOn() throws Exception {
-    Class<?> powerManagerClass = mPower.getClass();
-    Boolean result = null;
-    try {
-      Method isScreenOn = powerManagerClass.getMethod("isScreenOn");
-      result = (Boolean) isScreenOn.invoke(mPower);
-    } catch (Exception e) {
-      Log.e(e);
-      throw new UnsupportedOperationException("This feature is only available after Eclair.");
-    }
-    return result;
-  }
-
-  @Override
-  public void shutdown() {
-    // Nothing to do yet.
-  }
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/SignalStrengthFacade.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/SignalStrengthFacade.java
deleted file mode 100644
index 915454d4..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/SignalStrengthFacade.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package org.qpython.qsl4a.qsl4a.facade;
-
-import android.app.Service;
-import android.content.Context;
-import android.os.Bundle;
-import android.telephony.PhoneStateListener;
-import android.telephony.SignalStrength;
-import android.telephony.TelephonyManager;
-
-import org.qpython.qsl4a.qsl4a.MainThread;
-import org.qpython.qsl4a.qsl4a.jsonrpc.RpcReceiver;
-import org.qpython.qsl4a.qsl4a.rpc.Rpc;
-import org.qpython.qsl4a.qsl4a.rpc.RpcMinSdk;
-import org.qpython.qsl4a.qsl4a.rpc.RpcStartEvent;
-import org.qpython.qsl4a.qsl4a.rpc.RpcStopEvent;
-
-import java.util.concurrent.Callable;
-
-/**
- * Exposes SignalStrength functionality.
- * 
- * @author Joerg Zieren (joerg.zieren@gmail.com)
- */
-@RpcMinSdk(7)
-public class SignalStrengthFacade extends RpcReceiver {
-  private final Service mService;
-  private final TelephonyManager mTelephonyManager;
-  private final EventFacade mEventFacade;
-  private final PhoneStateListener mPhoneStateListener;
-  private Bundle mSignalStrengths;
-
-  public SignalStrengthFacade(FacadeManager manager) {
-    super(manager);
-    mService = manager.getService();
-    mEventFacade = manager.getReceiver(EventFacade.class);
-    mTelephonyManager =
-        (TelephonyManager) manager.getService().getSystemService(Context.TELEPHONY_SERVICE);
-    mPhoneStateListener = MainThread.run(mService, new Callable<PhoneStateListener>() {
-      @Override
-      public PhoneStateListener call() throws Exception {
-        return new PhoneStateListener() {
-          @Override
-          public void onSignalStrengthsChanged(SignalStrength signalStrength) {
-            mSignalStrengths = new Bundle();
-            mSignalStrengths.putInt("gsm_signal_strength", signalStrength.getGsmSignalStrength());
-            mSignalStrengths.putInt("gsm_bit_error_rate", signalStrength.getGsmBitErrorRate());
-            mSignalStrengths.putInt("cdma_dbm", signalStrength.getCdmaDbm());
-            mSignalStrengths.putInt("cdma_ecio", signalStrength.getCdmaEcio());
-            mSignalStrengths.putInt("evdo_dbm", signalStrength.getEvdoDbm());
-            mSignalStrengths.putInt("evdo_ecio", signalStrength.getEvdoEcio());
-            mEventFacade.postEvent("signal_strengths", mSignalStrengths.clone());
-          }
-        };
-      }
-    });
-  }
-
-  @Rpc(description = "Starts tracking signal strengths.")
-  @RpcStartEvent("signal_strengths")
-  public void startTrackingSignalStrengths() {
-    mTelephonyManager.listen(mPhoneStateListener, PhoneStateListener.LISTEN_SIGNAL_STRENGTHS);
-  }
-
-  @Rpc(description = "Returns the current signal strengths.", returns = "A map of \"gsm_signal_strength\"")
-  public Bundle readSignalStrengths() {
-    return mSignalStrengths;
-  }
-
-  @Rpc(description = "Stops tracking signal strength.")
-  @RpcStopEvent("signal_strengths")
-  public void stopTrackingSignalStrengths() {
-    mTelephonyManager.listen(mPhoneStateListener, PhoneStateListener.LISTEN_NONE);
-  }
-
-  @Override
-  public void shutdown() {
-    stopTrackingSignalStrengths();
-  }
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/SmsFacade.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/SmsFacade.java
deleted file mode 100644
index e1c53b0f..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/SmsFacade.java
+++ /dev/null
@@ -1,222 +0,0 @@
-/*
- * Copyright (C) 2010 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.
- */
-
-package org.qpython.qsl4a.qsl4a.facade;
-
-import android.app.Service;
-import android.content.ContentResolver;
-import android.content.ContentUris;
-import android.content.ContentValues;
-import android.database.Cursor;
-import android.net.Uri;
-import android.telephony.gsm.SmsManager;
-
-import org.qpython.qsl4a.qsl4a.Log;
-import org.qpython.qsl4a.qsl4a.jsonrpc.RpcReceiver;
-import org.qpython.qsl4a.qsl4a.rpc.Rpc;
-import org.qpython.qsl4a.qsl4a.rpc.RpcDefault;
-import org.qpython.qsl4a.qsl4a.rpc.RpcOptional;
-import org.qpython.qsl4a.qsl4a.rpc.RpcParameter;
-
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-/**
- * Provides access to SMS related functionality.
- * 
- * @author MeanEYE.rcf (meaneye.rcf@gmail.com)
- */
-@SuppressWarnings("deprecation")
-public class SmsFacade extends RpcReceiver {
-
-  private final Service mService;
-  private final ContentResolver mContentResolver;
-  private final SmsManager mSms;
-
-  public SmsFacade(FacadeManager manager) {
-    super(manager);
-    mService = manager.getService();
-    mContentResolver = mService.getContentResolver();
-    mSms = SmsManager.getDefault();
-  }
-
-  String buildSelectionClause(boolean unreadOnly) {
-    if (unreadOnly) {
-      return "read = 0";
-    }
-    return "";
-  }
-
-  private Uri buildFolderUri(String folder) {
-    Uri.Builder builder = Uri.parse("content://sms").buildUpon();
-    builder.appendPath(folder);
-    Uri uri = builder.build();
-    Log.v("Built SMS URI: " + uri);
-    return uri;
-  }
-
-  private Uri buildMessageUri(Integer id) {
-    Uri.Builder builder = Uri.parse("content://sms").buildUpon();
-    ContentUris.appendId(builder, id);
-    Uri uri = builder.build();
-    return uri;
-  }
-
-  @Rpc(description = "Sends an SMS.")
-  public void smsSend(
-      @RpcParameter(name = "destinationAddress", description = "typically a phone number") String destinationAddress,
-      @RpcParameter(name = "text") String text) {
-    mSms.sendTextMessage(destinationAddress, null, text, null, null);
-  }
-
-  @Rpc(description = "Returns the number of messages.")
-  public Integer smsGetMessageCount(@RpcParameter(name = "unreadOnly") Boolean unreadOnly,
-      @RpcParameter(name = "folder") @RpcDefault("inbox") String folder) {
-    Uri uri = buildFolderUri(folder);
-    Integer result = 0;
-    String selection = buildSelectionClause(unreadOnly);
-    Cursor cursor = mContentResolver.query(uri, null, selection, null, null);
-    if (cursor != null) {
-      result = cursor.getCount();
-      cursor.close();
-    } else {
-      result = 0;
-    }
-    return result;
-  }
-
-  @Rpc(description = "Returns a List of all message IDs.")
-  public List<Integer> smsGetMessageIds(@RpcParameter(name = "unreadOnly") Boolean unreadOnly,
-      @RpcParameter(name = "folder") @RpcDefault("inbox") String folder) {
-    Uri uri = buildFolderUri(folder);
-    List<Integer> result = new ArrayList<Integer>();
-    String selection = buildSelectionClause(unreadOnly);
-    String[] columns = { "_id" };
-    Cursor cursor = mContentResolver.query(uri, columns, selection, null, null);
-    while (cursor != null && cursor.moveToNext()) {
-      result.add(cursor.getInt(0));
-    }
-    cursor.close();
-    return result;
-  }
-
-  @Rpc(description = "Returns a List of all messages.", returns = "a List of messages as Maps")
-  public List<JSONObject> smsGetMessages(@RpcParameter(name = "unreadOnly") Boolean unreadOnly,
-      @RpcParameter(name = "folder") @RpcDefault("inbox") String folder,
-      @RpcParameter(name = "attributes") @RpcOptional JSONArray attributes) throws JSONException {
-    List<JSONObject> result = new ArrayList<JSONObject>();
-    Uri uri = buildFolderUri(folder);
-    String selection = buildSelectionClause(unreadOnly);
-    String[] columns;
-    if (attributes == null || attributes.length() == 0) {
-      // In case no attributes are specified we set the default ones.
-      columns = new String[] { "_id", "address", "date", "body", "read" };
-    } else {
-      // Convert selected attributes list into usable string list.
-      columns = new String[attributes.length()];
-      for (int i = 0; i < attributes.length(); i++) {
-        columns[i] = attributes.getString(i);
-      }
-    }
-    Cursor cursor = mContentResolver.query(uri, columns, selection, null, null);
-    while (cursor != null && cursor.moveToNext()) {
-      JSONObject message = new JSONObject();
-      for (int i = 0; i < columns.length; i++) {
-        message.put(columns[i], cursor.getString(i));
-      }
-      result.add(message);
-    }
-    cursor.close();
-    return result;
-  }
-
-  @Rpc(description = "Returns message attributes.")
-  public JSONObject smsGetMessageById(
-      @RpcParameter(name = "id", description = "message ID") Integer id,
-      @RpcParameter(name = "attributes") @RpcOptional JSONArray attributes) throws JSONException {
-    JSONObject result = new JSONObject();
-    Uri uri = buildMessageUri(id);
-    String[] columns;
-    if (attributes == null || attributes.length() == 0) {
-      // In case no attributes are specified we set the default ones.
-      columns = new String[] { "_id", "address", "date", "body", "read" };
-    } else {
-      // Convert selected attributes list into usable string list.
-      columns = new String[attributes.length()];
-      for (int i = 0; i < attributes.length(); i++) {
-        columns[i] = attributes.getString(i);
-      }
-    }
-    Cursor cursor = mContentResolver.query(uri, columns, null, null, null);
-    if (cursor != null) {
-      cursor.moveToFirst();
-      for (int i = 0; i < columns.length; i++) {
-        result.put(columns[i], cursor.getString(i));
-      }
-      cursor.close();
-    } else {
-      result = null;
-    }
-    return result;
-  }
-
-  @Rpc(description = "Returns a List of all possible message attributes.")
-  public List<String> smsGetAttributes() {
-    List<String> result = new ArrayList<String>();
-    Cursor cursor = mContentResolver.query(Uri.parse("content://sms"), null, null, null, null);
-    if (cursor != null) {
-      String[] columns = cursor.getColumnNames();
-      for (int i = 0; i < columns.length; i++) {
-        result.add(columns[i]);
-      }
-      cursor.close();
-    } else {
-      result = null;
-    }
-    return result;
-  }
-
-  @Rpc(description = "Deletes a message.", returns = "True if the message was deleted")
-  public Boolean smsDeleteMessage(@RpcParameter(name = "id") Integer id) {
-    Uri uri = buildMessageUri(id);
-    Boolean result = false;
-    result = mContentResolver.delete(uri, null, null) > 0;
-    return result;
-  }
-
-  @Rpc(description = "Marks messages as read.", returns = "number of messages marked read")
-  public Integer smsMarkMessageRead(
-      @RpcParameter(name = "ids", description = "List of message IDs to mark as read.") JSONArray ids,
-      @RpcParameter(name = "read") Boolean read) throws JSONException {
-    Integer result = 0;
-    ContentValues values = new ContentValues();
-    values.put("read", read);
-    for (int i = 0; i < ids.length(); i++) {
-      Uri uri = buildMessageUri(ids.getInt(i));
-      result += mContentResolver.update(uri, values, null, null);
-    }
-    return result;
-  }
-
-  @Override
-  public void shutdown() {
-  }
-}
\ No newline at end of file
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/SpeechRecognitionFacade.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/SpeechRecognitionFacade.java
deleted file mode 100644
index e7b2f2f6..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/SpeechRecognitionFacade.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright (C) 2009 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.
- */
-
-package org.qpython.qsl4a.qsl4a.facade;
-
-import android.content.Intent;
-import android.speech.RecognizerIntent;
-
-
-import org.qpython.qsl4a.qsl4a.jsonrpc.RpcReceiver;
-import org.qpython.qsl4a.qsl4a.rpc.Rpc;
-import org.qpython.qsl4a.qsl4a.rpc.RpcOptional;
-import org.qpython.qsl4a.qsl4a.rpc.RpcParameter;
-
-import java.util.ArrayList;
-
-/**
- * A facade containing RPC implementations related to the speech-to-text functionality of Android.
- * 
- * @author Felix Arends (felix.arends@gmail.com)
- * 
- */
-public class SpeechRecognitionFacade extends RpcReceiver {
-  private final AndroidFacade mAndroidFacade;
-
-  /**
-   * @param activityLauncher
-   *          a helper object that launches activities in a blocking manner
-   */
-  public SpeechRecognitionFacade(FacadeManager manager) {
-    super(manager);
-    mAndroidFacade = manager.getReceiver(AndroidFacade.class);
-  }
-
-  @Rpc(description = "Recognizes user's speech and returns the most likely result.", returns = "An empty string in case the speech cannot be recongnized.")
-  public String recognizeSpeech(
-      @RpcParameter(name = "prompt", description = "text prompt to show to the user when asking them to speak") @RpcOptional final String prompt,
-      @RpcParameter(name = "language", description = "language override to inform the recognizer that it should expect speech in a language different than the one set in the java.util.Locale.getDefault()") @RpcOptional final String language,
-      @RpcParameter(name = "languageModel", description = "informs the recognizer which speech model to prefer (see android.speech.RecognizeIntent)") @RpcOptional final String languageModel) {
-    final Intent recognitionIntent =
-        new Intent(android.speech.RecognizerIntent.ACTION_RECOGNIZE_SPEECH);
-
-    // Setup intent parameters (if provided).
-    if (language != null) {
-      recognitionIntent.putExtra(RecognizerIntent.EXTRA_LANGUAGE, "");
-    }
-    if (languageModel != null) {
-      recognitionIntent.putExtra(RecognizerIntent.EXTRA_LANGUAGE_MODEL, "");
-    }
-    if (prompt != null) {
-      recognitionIntent.putExtra(RecognizerIntent.EXTRA_PROMPT, "");
-    }
-
-    // Run the activity an retrieve the result.
-    final Intent data = mAndroidFacade.startActivityForResult(recognitionIntent);
-
-    if (data.hasExtra(android.speech.RecognizerIntent.EXTRA_RESULTS)) {
-      // The result consists of an array-list containing one entry for each
-      // possible result. The most likely result is the first entry.
-      ArrayList<String> results =
-          data.getStringArrayListExtra(android.speech.RecognizerIntent.EXTRA_RESULTS);
-      return results.get(0);
-    }
-
-    return "";
-  }
-
-  @Override
-  public void shutdown() {
-  }
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/TextToSpeechFacade.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/TextToSpeechFacade.java
deleted file mode 100644
index 147b4559..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/TextToSpeechFacade.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright (C) 2009 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.
- */
-
-package org.qpython.qsl4a.qsl4a.facade;
-
-import android.os.SystemClock;
-import android.speech.tts.TextToSpeech;
-import android.speech.tts.TextToSpeech.OnInitListener;
-
-
-import org.qpython.qsl4a.qsl4a.jsonrpc.RpcReceiver;
-import org.qpython.qsl4a.qsl4a.rpc.Rpc;
-import org.qpython.qsl4a.qsl4a.rpc.RpcMinSdk;
-import org.qpython.qsl4a.qsl4a.rpc.RpcParameter;
-
-import java.util.concurrent.CountDownLatch;
-
-/**
- * Provides Text To Speech services for API 4 or more.
- */
-
-@RpcMinSdk(4)
-public class TextToSpeechFacade extends RpcReceiver {
-
-  private final TextToSpeech mTts;
-  private final CountDownLatch mOnInitLock;
-
-  public TextToSpeechFacade(FacadeManager manager) {
-    super(manager);
-    mOnInitLock = new CountDownLatch(1);
-    mTts = new TextToSpeech(manager.getService(), new OnInitListener() {
-      @Override
-      public void onInit(int arg0) {
-        mOnInitLock.countDown();
-      }
-    });
-  }
-
-  @Override
-  public void shutdown() {
-    while (mTts.isSpeaking()) {
-      SystemClock.sleep(100);
-    }
-    mTts.shutdown();
-  }
-
-  @Rpc(description = "Speaks the provided message via TTS.")
-  public void ttsSpeak(@RpcParameter(name = "message") String message) throws InterruptedException {
-    mOnInitLock.await();
-    if (message != null) {
-      mTts.speak(message, TextToSpeech.QUEUE_ADD, null);
-    }
-  }
-
-  @Rpc(description = "Returns True if speech is currently in progress.")
-  public Boolean ttsIsSpeaking() throws InterruptedException {
-    mOnInitLock.await();
-    return mTts.isSpeaking();
-  }
-
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/ToneGeneratorFacade.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/ToneGeneratorFacade.java
deleted file mode 100644
index 5e185a41..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/ToneGeneratorFacade.java
+++ /dev/null
@@ -1,93 +0,0 @@
-package org.qpython.qsl4a.qsl4a.facade;
-
-import android.media.AudioManager;
-import android.media.ToneGenerator;
-
-import org.qpython.qsl4a.qsl4a.jsonrpc.RpcReceiver;
-import org.qpython.qsl4a.qsl4a.rpc.Rpc;
-import org.qpython.qsl4a.qsl4a.rpc.RpcDefault;
-import org.qpython.qsl4a.qsl4a.rpc.RpcParameter;
-
-
-/**
- * Generate DTMF tones.
- * 
- */
-public class ToneGeneratorFacade extends RpcReceiver {
-
-  private final ToneGenerator mToneGenerator;
-
-  public ToneGeneratorFacade(FacadeManager manager) {
-    super(manager);
-    mToneGenerator = new ToneGenerator(AudioManager.STREAM_MUSIC, 100);
-  }
-
-  @Rpc(description = "Generate DTMF tones for the given phone number.")
-  public void generateDtmfTones(
-      @RpcParameter(name = "phoneNumber") String phoneNumber,
-      @RpcParameter(name = "toneDuration", description = "duration of each tone in milliseconds") @RpcDefault("100") Integer toneDuration)
-      throws InterruptedException {
-    try {
-      for (int i = 0; i < phoneNumber.length(); i++) {
-        switch (phoneNumber.charAt(i)) {
-        case '0':
-          mToneGenerator.startTone(ToneGenerator.TONE_DTMF_0);
-          Thread.sleep(toneDuration);
-          break;
-        case '1':
-          mToneGenerator.startTone(ToneGenerator.TONE_DTMF_1);
-          Thread.sleep(toneDuration);
-          break;
-        case '2':
-          mToneGenerator.startTone(ToneGenerator.TONE_DTMF_2);
-          Thread.sleep(toneDuration);
-          break;
-        case '3':
-          mToneGenerator.startTone(ToneGenerator.TONE_DTMF_3);
-          Thread.sleep(toneDuration);
-          break;
-        case '4':
-          mToneGenerator.startTone(ToneGenerator.TONE_DTMF_4);
-          Thread.sleep(toneDuration);
-          break;
-        case '5':
-          mToneGenerator.startTone(ToneGenerator.TONE_DTMF_5);
-          Thread.sleep(toneDuration);
-          break;
-        case '6':
-          mToneGenerator.startTone(ToneGenerator.TONE_DTMF_6);
-          Thread.sleep(toneDuration);
-          break;
-        case '7':
-          mToneGenerator.startTone(ToneGenerator.TONE_DTMF_7);
-          Thread.sleep(toneDuration);
-          break;
-        case '8':
-          mToneGenerator.startTone(ToneGenerator.TONE_DTMF_8);
-          Thread.sleep(toneDuration);
-          break;
-        case '9':
-          mToneGenerator.startTone(ToneGenerator.TONE_DTMF_9);
-          Thread.sleep(toneDuration);
-          break;
-        case '*':
-          mToneGenerator.startTone(ToneGenerator.TONE_DTMF_S);
-          Thread.sleep(toneDuration);
-          break;
-        case '#':
-          mToneGenerator.startTone(ToneGenerator.TONE_DTMF_P);
-          Thread.sleep(toneDuration);
-          break;
-        default:
-          throw new RuntimeException("Cannot generate tone for '" + phoneNumber.charAt(i) + "'");
-        }
-      }
-    } finally {
-      mToneGenerator.stopTone();
-    }
-  }
-
-  @Override
-  public void shutdown() {
-  }
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/WakeLockFacade.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/WakeLockFacade.java
deleted file mode 100644
index a0a52ffa..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/WakeLockFacade.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * Copyright (C) 2010 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.
- */
-
-package org.qpython.qsl4a.qsl4a.facade;
-
-import android.annotation.SuppressLint;
-import android.app.Service;
-import android.content.Context;
-import android.os.PowerManager;
-import android.os.PowerManager.WakeLock;
-
-
-import org.qpython.qsl4a.qsl4a.jsonrpc.RpcReceiver;
-import org.qpython.qsl4a.qsl4a.rpc.Rpc;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Map.Entry;
-
-/**
- * A facade exposing some of the functionality of the PowerManager, in particular wake locks.
- * 
- * @author Felix Arends (felixarends@gmail.com)
- * @author Damon Kohler (damonkohler@gmail.com)
- */
-public class WakeLockFacade extends RpcReceiver {
-
-  private final static String WAKE_LOCK_TAG =
-      "com.googlecode.android_scripting.facade.PowerManagerFacade";
-
-  private enum WakeLockType {
-    FULL, PARTIAL, BRIGHT, DIM
-  }
-
-  private class WakeLockManager {
-    private final PowerManager mmPowerManager;
-    private final Map<WakeLockType, WakeLock> mmLocks = new HashMap<WakeLockType, WakeLock>();
-
-    @SuppressWarnings("deprecation")
-	public WakeLockManager(Service service) {
-      mmPowerManager = (PowerManager) service.getSystemService(Context.POWER_SERVICE);
-      addWakeLock(WakeLockType.PARTIAL, PowerManager.PARTIAL_WAKE_LOCK);
-      addWakeLock(WakeLockType.FULL, PowerManager.FULL_WAKE_LOCK | PowerManager.ON_AFTER_RELEASE);
-      addWakeLock(WakeLockType.BRIGHT, PowerManager.SCREEN_BRIGHT_WAKE_LOCK
-          | PowerManager.ON_AFTER_RELEASE);
-      addWakeLock(WakeLockType.DIM, PowerManager.SCREEN_DIM_WAKE_LOCK
-          | PowerManager.ON_AFTER_RELEASE);
-    }
-
-    private void addWakeLock(WakeLockType type, int flags) {
-      WakeLock full = mmPowerManager.newWakeLock(flags, WAKE_LOCK_TAG);
-      full.setReferenceCounted(false);
-      mmLocks.put(type, full);
-    }
-
-    @SuppressLint("Wakelock")
-	public void acquire(WakeLockType type) {
-      mmLocks.get(type).acquire();
-      for (Entry<WakeLockType, WakeLock> entry : mmLocks.entrySet()) {
-        if (entry.getKey() != type) {
-          entry.getValue().release();
-        }
-      }
-    }
-
-    public void release() {
-      for (Entry<WakeLockType, WakeLock> entry : mmLocks.entrySet()) {
-        entry.getValue().release();
-      }
-    }
-  }
-
-  private final WakeLockManager mManager;
-
-  public WakeLockFacade(FacadeManager manager) {
-    super(manager);
-    mManager = new WakeLockManager(manager.getService());
-  }
-
-  @Rpc(description = "Acquires a full wake lock (CPU on, screen bright, keyboard bright).")
-  public void wakeLockAcquireFull() {
-    mManager.acquire(WakeLockType.FULL);
-  }
-
-  @Rpc(description = "Acquires a partial wake lock (CPU on).")
-  public void wakeLockAcquirePartial() {
-    mManager.acquire(WakeLockType.PARTIAL);
-  }
-
-  @Rpc(description = "Acquires a bright wake lock (CPU on, screen bright).")
-  public void wakeLockAcquireBright() {
-    mManager.acquire(WakeLockType.BRIGHT);
-  }
-
-  @Rpc(description = "Acquires a dim wake lock (CPU on, screen dim).")
-  public void wakeLockAcquireDim() {
-    mManager.acquire(WakeLockType.DIM);
-  }
-
-  @Rpc(description = "Releases the wake lock.")
-  public void wakeLockRelease() {
-    mManager.release();
-  }
-
-  @Override
-  public void shutdown() {
-    wakeLockRelease();
-  }
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/WebCamFacade.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/WebCamFacade.java
deleted file mode 100644
index 67bc3c6a..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/WebCamFacade.java
+++ /dev/null
@@ -1,394 +0,0 @@
-/*
- * Copyright (C) 2010 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.
- */
-
-package org.qpython.qsl4a.qsl4a.facade;
-
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.net.InetSocketAddress;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.Executor;
-
-import android.annotation.SuppressLint;
-import android.annotation.TargetApi;
-import android.app.Service;
-import android.graphics.ImageFormat;
-import android.graphics.Rect;
-import android.graphics.YuvImage;
-import android.hardware.Camera;
-import android.hardware.Camera.Parameters;
-import android.hardware.Camera.PreviewCallback;
-import android.hardware.Camera.Size;
-import android.os.Build;
-import android.util.Base64;
-import android.view.SurfaceHolder;
-import android.view.SurfaceView;
-import android.view.WindowManager;
-import android.view.SurfaceHolder.Callback;
-
-import org.qpython.qsl4a.QSL4APP;
-import org.qpython.qsl4a.qsl4a.FutureActivityTaskExecutor;
-import org.qpython.qsl4a.qsl4a.Log;
-import org.qpython.qsl4a.qsl4a.SingleThreadExecutor;
-import org.qpython.qsl4a.qsl4a.SimpleServer.SimpleServerObserver;
-
-
-import org.qpython.qsl4a.qsl4a.future.FutureActivityTask;
-import org.qpython.qsl4a.qsl4a.jsonrpc.RpcReceiver;
-import org.qpython.qsl4a.qsl4a.rpc.Rpc;
-import org.qpython.qsl4a.qsl4a.rpc.RpcDefault;
-import org.qpython.qsl4a.qsl4a.rpc.RpcMinSdk;
-import org.qpython.qsl4a.qsl4a.rpc.RpcOptional;
-import org.qpython.qsl4a.qsl4a.rpc.RpcParameter;
-
-/**
- * Manages access to camera streaming.
- * <br>
- * <h3>Usage Notes</h3>
- * <br><b>webCamStart</b> and <b>webCamStop</b> are used to start and stop an Mpeg stream on a given port. <b>webcamAdjustQuality</b> is used to ajust the quality of the streaming video.
- * <br><b>cameraStartPreview</b> is used to get access to the camera preview screen. It will generate "preview" events as images become available.
- * <br>The preview has two modes: data or file. If you pass a non-blank, writable file path to the <b>cameraStartPreview</b> it will store jpg images in that folder. 
- * It is up to the caller to clean up these files after the fact. If no file element is provided, 
- * the event will include the image data as a base64 encoded string. 
- * <h3>Event details</h3>
- * <br>The data element of the preview event will be a map, with the following elements defined.
- * <ul>
- * <li><b>format</b> - currently always "jpeg"
- * <li><b>width</b> - image width (in pixels)
- * <li><b>height</b> - image height (in pixels)
- * <li><b>quality</b> - JPEG quality. Number from 1-100
- * <li><b>filename</b> - Name of file where image was saved. Only relevant if filepath defined.
- * <li><b>error</b> - included if there was an IOException saving file, ie, disk full or path write protected.
- * <li><b>encoding</b> - Data encoding. If filepath defined, will be "file" otherwise "base64"
- * <li><b>data</b> - Base64 encoded image data.
- * </ul>
- *<br>Note that "filename", "error" and "data" are mutual exclusive.
- *<br>
- *<br>The webcam and preview modes use the same resources, so you can't use them both at the same time. Stop one mode before starting the other.
- *
- * @author Damon Kohler (damonkohler@gmail.com) (probably)
- * @author Robbie Matthews (rjmatthews62@gmail.com)
- *
- */
-@RpcMinSdk(8)
-public class WebCamFacade extends RpcReceiver {
-
-  private final Service mService;
-  private final Executor mJpegCompressionExecutor = new SingleThreadExecutor();
-  private final ByteArrayOutputStream mJpegCompressionBuffer = new ByteArrayOutputStream();
-
-  private volatile byte[] mJpegData;
-
-  private CountDownLatch mJpegDataReady;
-  private boolean mStreaming;
-  private int mPreviewHeight;
-  private int mPreviewWidth;
-  private int mJpegQuality;
-
-  private MjpegServer mJpegServer;
-  private FutureActivityTask<SurfaceHolder> mPreviewTask;
-  private Camera mCamera;
-  private Parameters mParameters;
-  private final EventFacade mEventFacade;
-  private boolean mPreview;
-  private File mDest;
-  
-  private final PreviewCallback mPreviewCallback = new PreviewCallback() {
-    @Override
-    public void onPreviewFrame(final byte[] data, final Camera camera) {
-      mJpegCompressionExecutor.execute(new Runnable() {
-        @Override
-        public void run() {
-          mJpegData = compressYuvToJpeg(data);
-          mJpegDataReady.countDown();
-          if (mStreaming) {
-            camera.setOneShotPreviewCallback(mPreviewCallback);
-          }
-        }
-      });
-    }
-  };
-
-  private final PreviewCallback mPreviewEvent = new PreviewCallback() {
-    @Override
-    public void onPreviewFrame(final byte[] data, final Camera camera) {
-      mJpegCompressionExecutor.execute(new Runnable() {
-        @SuppressLint("NewApi")
-		@Override
-        public void run() {
-          mJpegData = compressYuvToJpeg(data);
-          Map<String,Object> map = new HashMap<String, Object>(); 
-          map.put("format", "jpeg");
-          map.put("width", mPreviewWidth);
-          map.put("height", mPreviewHeight);
-          map.put("quality", mJpegQuality);
-          if (mDest!=null) {
-            try {
-              File dest=File.createTempFile("prv",".jpg",mDest);
-              OutputStream output = new FileOutputStream(dest);
-              output.write(mJpegData);
-              output.close();
-              map.put("encoding","file");
-              map.put("filename",dest.toString());
-            } catch (IOException e) {
-              map.put("error", e.toString());
-            }
-          }
-          else {
-            map.put("encoding","Base64");
-            map.put("data", Base64.encodeToString(mJpegData, Base64.DEFAULT));
-          }
-          mEventFacade.postEvent("preview", map);
-          if (mPreview) {
-            camera.setOneShotPreviewCallback(mPreviewEvent);
-          }
-        }
-      });
-    }
-  };
-  
-  public WebCamFacade(FacadeManager manager) {
-    super(manager);
-    mService = manager.getService();
-    mJpegDataReady = new CountDownLatch(1);
-    mEventFacade = manager.getReceiver(EventFacade.class);
-  }
-
-  @SuppressLint("NewApi")
-@TargetApi(Build.VERSION_CODES.FROYO)
-private byte[] compressYuvToJpeg(final byte[] yuvData) {
-    mJpegCompressionBuffer.reset();
-    YuvImage yuvImage =
-        new YuvImage(yuvData, ImageFormat.NV21, mPreviewWidth, mPreviewHeight, null);
-    yuvImage.compressToJpeg(new Rect(0, 0, mPreviewWidth, mPreviewHeight), mJpegQuality,
-        mJpegCompressionBuffer);
-    return mJpegCompressionBuffer.toByteArray();
-  }
-
-  @Rpc(description = "Starts an MJPEG stream and returns a Tuple of address and port for the stream.")
-  public InetSocketAddress webcamStart(
-      @RpcParameter(name = "resolutionLevel", description = "increasing this number provides higher resolution") @RpcDefault("0") Integer resolutionLevel,
-      @RpcParameter(name = "jpegQuality", description = "a number from 0-100") @RpcDefault("20") Integer jpegQuality,
-      @RpcParameter(name = "port", description = "If port is specified, the webcam service will bind to port, otherwise it will pick any available port.") @RpcDefault("0") Integer port)
-      throws Exception {
-    try {
-      openCamera(resolutionLevel, jpegQuality);
-      return startServer(port);
-    } catch (Exception e) {
-      webcamStop();
-      throw e;
-    }
-  }
-
-  private InetSocketAddress startServer(Integer port) {
-    mJpegServer = new MjpegServer(new JpegProvider() {
-      @Override
-      public byte[] getJpeg() {
-        try {
-          mJpegDataReady.await();
-        } catch (InterruptedException e) {
-          Log.e(e);
-        }
-        return mJpegData;
-      }
-    });
-    mJpegServer.addObserver(new SimpleServerObserver() {
-      @Override
-      public void onDisconnect() {
-        if (mJpegServer.getNumberOfConnections() == 0 && mStreaming) {
-          stopStream();
-        }
-      }
-
-      @Override
-      public void onConnect() {
-        if (!mStreaming) {
-          startStream();
-        }
-      }
-    });
-    return mJpegServer.startPublic(port);
-  }
-
-  private void stopServer() {
-    if (mJpegServer != null) {
-      mJpegServer.shutdown();
-      mJpegServer = null;
-    }
-  }
-
-  @Rpc(description = "Adjusts the quality of the webcam stream while it is running.")
-  public void webcamAdjustQuality(
-      @RpcParameter(name = "resolutionLevel", description = "increasing this number provides higher resolution") @RpcDefault("0") Integer resolutionLevel,
-      @RpcParameter(name = "jpegQuality", description = "a number from 0-100") @RpcDefault("20") Integer jpegQuality)
-      throws Exception {
-    if (mStreaming == false) {
-      throw new IllegalStateException("Webcam not streaming.");
-    }
-    stopStream();
-    releaseCamera();
-    openCamera(resolutionLevel, jpegQuality);
-    startStream();
-  }
-
-  private void openCamera(Integer resolutionLevel, Integer jpegQuality) throws IOException,
-      InterruptedException {
-    mCamera = Camera.open();
-    mParameters = mCamera.getParameters();
-    mParameters.setPictureFormat(ImageFormat.JPEG);
-    mParameters.setPreviewFormat(ImageFormat.JPEG);
-    List<Size> supportedPreviewSizes = mParameters.getSupportedPreviewSizes();
-    Collections.sort(supportedPreviewSizes, new Comparator<Size>() {
-      @Override
-      public int compare(Size o1, Size o2) {
-        return o1.width - o2.width;
-      }
-    });
-    Size previewSize =
-        supportedPreviewSizes.get(Math.min(resolutionLevel, supportedPreviewSizes.size() - 1));
-    mPreviewHeight = previewSize.height;
-    mPreviewWidth = previewSize.width;
-    mParameters.setPreviewSize(mPreviewWidth, mPreviewHeight);
-    mJpegQuality = Math.min(Math.max(jpegQuality, 0), 100);
-    mCamera.setParameters(mParameters);
-    // TODO(damonkohler): Rotate image based on orientation.
-    mPreviewTask = createPreviewTask();
-    mCamera.startPreview();
-  }
-
-  private void startStream() {
-    mStreaming = true;
-    mCamera.setOneShotPreviewCallback(mPreviewCallback);
-  }
-
-  private void stopStream() {
-    mJpegDataReady = new CountDownLatch(1);
-    mStreaming = false;
-    if (mPreviewTask != null) {
-      mPreviewTask.finish();
-      mPreviewTask = null;
-    }
-  }
-
-  private void releaseCamera() {
-    if (mCamera != null) {
-      mCamera.release();
-      mCamera = null;
-    }
-    mParameters = null;
-  }
-
-  @Rpc(description = "Stops the webcam stream.")
-  public void webcamStop() {
-    stopServer();
-    stopStream();
-    releaseCamera();
-  }
-
-  private FutureActivityTask<SurfaceHolder> createPreviewTask() throws IOException,
-      InterruptedException {
-    FutureActivityTask<SurfaceHolder> task = new FutureActivityTask<SurfaceHolder>() {
-      @SuppressWarnings("deprecation")
-	@Override
-      public void onCreate() {
-        super.onCreate();
-        final SurfaceView view = new SurfaceView(getActivity());
-        getActivity().setContentView(view);
-        getActivity().getWindow().setSoftInputMode(
-            WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN);
-        view.getHolder().setType(SurfaceHolder.SURFACE_TYPE_PUSH_BUFFERS);
-        view.getHolder().addCallback(new Callback() {
-          @Override
-          public void surfaceDestroyed(SurfaceHolder holder) {
-          }
-
-          @Override
-          public void surfaceCreated(SurfaceHolder holder) {
-            setResult(view.getHolder());
-          }
-
-          @Override
-          public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) {
-          }
-        });
-      }
-    };
-    FutureActivityTaskExecutor taskExecutor =
-        ((QSL4APP) mService.getApplication()).getTaskExecutor();
-    taskExecutor.execute(task);
-    mCamera.setPreviewDisplay(task.getResult());
-    return task;
-  }
-
-  @Rpc(description = "Start Preview Mode. Throws 'preview' events.",returns="True if successful")
-  public boolean cameraStartPreview(
-          @RpcParameter(name = "resolutionLevel", description = "increasing this number provides higher resolution") @RpcDefault("0") Integer resolutionLevel,
-          @RpcParameter(name = "jpegQuality", description = "a number from 0-100") @RpcDefault("20") Integer jpegQuality,
-          @RpcParameter(name = "filepath", description = "Path to store jpeg files.") @RpcOptional String filepath)
-      throws InterruptedException {
-    mDest=null;
-    if (filepath!=null && (filepath.length()>0)) {
-      mDest = new File(filepath);
-      if (!mDest.exists()) mDest.mkdirs();
-      if (!(mDest.isDirectory() && mDest.canWrite())) {
-        return false;
-      }
-    }
-      
-    try {
-      openCamera(resolutionLevel, jpegQuality);
-    } catch (IOException e) {
-      Log.e(e);
-      return false;
-    }
-    startPreview();
-    return true;
-  }
-
-  @Rpc(description = "Stop the preview mode.")
-  public void cameraStopPreview() {
-    stopPreview();
-  }
-
-  private void startPreview() {
-    mPreview = true;
-    mCamera.setOneShotPreviewCallback(mPreviewEvent);
-  }
-  
-  private void stopPreview() {
-    mPreview = false;
-    if (mPreviewTask!=null)
-    {
-      mPreviewTask.finish();
-      mPreviewTask=null;
-    }
-    releaseCamera();
-  }
-
-  @Override
-  public void shutdown() {
-    mPreview=false;
-    webcamStop();
-  }
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/WifiFacade.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/WifiFacade.java
deleted file mode 100644
index 5dc3df74..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/WifiFacade.java
+++ /dev/null
@@ -1,108 +0,0 @@
-package org.qpython.qsl4a.qsl4a.facade;
-
-import android.app.Service;
-import android.content.Context;
-import android.net.wifi.ScanResult;
-import android.net.wifi.WifiInfo;
-import android.net.wifi.WifiManager;
-import android.net.wifi.WifiManager.WifiLock;
-
-
-import org.qpython.qsl4a.qsl4a.jsonrpc.RpcReceiver;
-import org.qpython.qsl4a.qsl4a.rpc.Rpc;
-import org.qpython.qsl4a.qsl4a.rpc.RpcOptional;
-import org.qpython.qsl4a.qsl4a.rpc.RpcParameter;
-
-import java.util.List;
-
-/**
- * Wifi functions.
- * 
- */
-public class WifiFacade extends RpcReceiver {
-
-  private final Service mService;
-  private final WifiManager mWifi;
-  private WifiLock mLock;
-
-  public WifiFacade(FacadeManager manager) {
-    super(manager);
-    mService = manager.getService();
-    mWifi = (WifiManager) mService.getSystemService(Context.WIFI_SERVICE);
-    mLock = null;
-  }
-
-  private void makeLock(int wifiMode) {
-    if (mLock == null) {
-      mLock = mWifi.createWifiLock(wifiMode, "sl4a");
-      mLock.acquire();
-    }
-  }
-
-  @Rpc(description = "Returns the list of access points found during the most recent Wifi scan.")
-  public List<ScanResult> wifiGetScanResults() {
-    return mWifi.getScanResults();
-  }
-
-  @Rpc(description = "Acquires a full Wifi lock.")
-  public void wifiLockAcquireFull() {
-    makeLock(WifiManager.WIFI_MODE_FULL);
-  }
-
-  @Rpc(description = "Acquires a scan only Wifi lock.")
-  public void wifiLockAcquireScanOnly() {
-    makeLock(WifiManager.WIFI_MODE_SCAN_ONLY);
-  }
-
-  @Rpc(description = "Releases a previously acquired Wifi lock.")
-  public void wifiLockRelease() {
-    if (mLock != null) {
-      mLock.release();
-      mLock = null;
-    }
-  }
-
-  @Rpc(description = "Starts a scan for Wifi access points.", returns = "True if the scan was initiated successfully.")
-  public Boolean wifiStartScan() {
-    return mWifi.startScan();
-  }
-
-  @Rpc(description = "Checks Wifi state.", returns = "True if Wifi is enabled.")
-  public Boolean checkWifiState() {
-    return mWifi.getWifiState() == WifiManager.WIFI_STATE_ENABLED;
-  }
-
-  @Rpc(description = "Toggle Wifi on and off.", returns = "True if Wifi is enabled.")
-  public Boolean toggleWifiState(@RpcParameter(name = "enabled") @RpcOptional Boolean enabled) {
-    if (enabled == null) {
-      enabled = !checkWifiState();
-    }
-    mWifi.setWifiEnabled(enabled);
-    return enabled;
-  }
-
-  @Rpc(description = "Disconnects from the currently active access point.", returns = "True if the operation succeeded.")
-  public Boolean wifiDisconnect() {
-    return mWifi.disconnect();
-  }
-
-  @Rpc(description = "Returns information about the currently active access point.")
-  public WifiInfo wifiGetConnectionInfo() {
-    return mWifi.getConnectionInfo();
-  }
-
-  @Rpc(description = "Reassociates with the currently active access point.", returns = "True if the operation succeeded.")
-  public Boolean wifiReassociate() {
-    return mWifi.reassociate();
-  }
-
-  @Rpc(description = "Reconnects to the currently active access point.", returns = "True if the operation succeeded.")
-  public Boolean wifiReconnect() {
-    return mWifi.reconnect();
-  }
-
-  @Override
-  public void shutdown() {
-    wifiLockRelease();
-  }
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/ui/AlertDialogTask.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/ui/AlertDialogTask.java
deleted file mode 100644
index 7ed82ebc..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/ui/AlertDialogTask.java
+++ /dev/null
@@ -1,296 +0,0 @@
-/*
- * Copyright (C) 2010 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.
- */
-
-package org.qpython.qsl4a.qsl4a.facade.ui;
-
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.app.AlertDialog.Builder;
-import android.content.DialogInterface;
-import android.text.method.PasswordTransformationMethod;
-import android.widget.EditText;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeSet;
-
-/**
- * Wrapper class for alert dialog running in separate thread.
- * 
- * @author MeanEYE.rcf (meaneye.rcf@gmail.com)
- */
-class AlertDialogTask extends DialogTask {
-
-  private final String mTitle;
-  private final String mMessage;
-
-  private final List<String> mItems;
-  private final Set<Integer> mSelectedItems;
-  private final Map<String, Object> mResultMap;
-  private InputType mInputType;
-  private int mEditInputType = 0;
-
-  private String mPositiveButtonText;
-  private String mNegativeButtonText;
-  private String mNeutralButtonText;
-
-  private EditText mEditText;
-  private String mDefaultText;
-
-  private enum InputType {
-    DEFAULT, MENU, SINGLE_CHOICE, MULTI_CHOICE, PLAIN_TEXT, PASSWORD;
-  }
-
-  public AlertDialogTask(String title, String message) {
-    mTitle = title;
-    mMessage = message;
-    mInputType = InputType.DEFAULT;
-    mItems = new ArrayList<String>();
-    mSelectedItems = new TreeSet<Integer>();
-    mResultMap = new HashMap<String, Object>();
-  }
-
-  public void setPositiveButtonText(String text) {
-    mPositiveButtonText = text;
-  }
-
-  public void setNegativeButtonText(String text) {
-    mNegativeButtonText = text;
-  }
-
-  public void setNeutralButtonText(String text) {
-    mNeutralButtonText = text;
-  }
-
-  /**
-   * Set list items.
-   * 
-   * @param items
-   */
-  public void setItems(JSONArray items) {
-    mItems.clear();
-    for (int i = 0; i < items.length(); i++) {
-      try {
-        mItems.add(items.getString(i));
-      } catch (JSONException e) {
-        throw new RuntimeException(e);
-      }
-    }
-    mInputType = InputType.MENU;
-  }
-
-  /**
-   * Set single choice items.
-   * 
-   * @param items
-   *          a list of items as {@link String}s to display
-   * @param selected
-   *          the index of the item that is selected by default
-   */
-  public void setSingleChoiceItems(JSONArray items, int selected) {
-    setItems(items);
-    mSelectedItems.clear();
-    mSelectedItems.add(selected);
-    mInputType = InputType.SINGLE_CHOICE;
-  }
-
-  /**
-   * Set multi choice items.
-   * 
-   * @param items
-   *          a list of items as {@link String}s to display
-   * @param selected
-   *          a list of indices for items that should be selected by default
-   * @throws JSONException
-   */
-  public void setMultiChoiceItems(JSONArray items, JSONArray selected) throws JSONException {
-    setItems(items);
-    mSelectedItems.clear();
-    if (selected != null) {
-      for (int i = 0; i < selected.length(); i++) {
-        mSelectedItems.add(selected.getInt(i));
-      }
-    }
-    mInputType = InputType.MULTI_CHOICE;
-  }
-
-  /**
-   * Returns the list of selected items.
-   */
-  public Set<Integer> getSelectedItems() {
-    return mSelectedItems;
-  }
-
-  public void setTextInput(String defaultText) {
-    mDefaultText = defaultText;
-    mInputType = InputType.PLAIN_TEXT;
-    setEditInputType("text");
-  }
-
-  public void setEditInputType(String editInputType) {
-    String[] list = editInputType.split("\\|");
-    Map<String, Integer> types = ViewInflater.getInputTypes();
-    mEditInputType = 0;
-    for (String flag : list) {
-      Integer v = types.get(flag.trim());
-      if (v != null) {
-        mEditInputType |= v;
-      }
-    }
-    if (mEditInputType == 0) {
-      mEditInputType = android.text.InputType.TYPE_CLASS_TEXT;
-    }
-  }
-
-  public void setPasswordInput() {
-    mInputType = InputType.PASSWORD;
-  }
-
-  @Override
-  public void onCreate() {
-    super.onCreate();
-    AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
-    if (mTitle != null) {
-      builder.setTitle(mTitle);
-    }
-    // Can't display both a message and items. We'll elect to show the items instead.
-    if (mMessage != null && mItems.isEmpty()) {
-      builder.setMessage(mMessage);
-    }
-    switch (mInputType) {
-    // Add single choice menu items to dialog.
-    case SINGLE_CHOICE:
-      builder.setSingleChoiceItems(getItemsAsCharSequenceArray(), mSelectedItems.iterator().next(),
-          new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialog, int item) {
-              mSelectedItems.clear();
-              mSelectedItems.add(item);
-            }
-          });
-      break;
-    // Add multiple choice items to the dialog.
-    case MULTI_CHOICE:
-      boolean[] selectedItems = new boolean[mItems.size()];
-      for (int i : mSelectedItems) {
-        selectedItems[i] = true;
-      }
-      builder.setMultiChoiceItems(getItemsAsCharSequenceArray(), selectedItems,
-          new DialogInterface.OnMultiChoiceClickListener() {
-            @Override
-            public void onClick(DialogInterface dialog, int item, boolean isChecked) {
-              if (isChecked) {
-                mSelectedItems.add(item);
-              } else {
-                mSelectedItems.remove(item);
-              }
-            }
-          });
-      break;
-    // Add standard, menu-like, items to dialog.
-    case MENU:
-      builder.setItems(getItemsAsCharSequenceArray(), new DialogInterface.OnClickListener() {
-        public void onClick(DialogInterface dialog, int item) {
-          Map<String, Integer> result = new HashMap<String, Integer>();
-          result.put("item", item);
-          dismissDialog();
-          setResult(result);
-        }
-      });
-      break;
-    case PLAIN_TEXT:
-      mEditText = new EditText(getActivity());
-      if (mDefaultText != null) {
-        mEditText.setText(mDefaultText);
-      }
-      mEditText.setInputType(mEditInputType);
-      builder.setView(mEditText);
-      break;
-    case PASSWORD:
-      mEditText = new EditText(getActivity());
-      mEditText.setInputType(android.text.InputType.TYPE_TEXT_VARIATION_PASSWORD);
-      mEditText.setTransformationMethod(new PasswordTransformationMethod());
-      builder.setView(mEditText);
-      break;
-    default:
-      // No input type specified.
-    }
-    configureButtons(builder, getActivity());
-    addOnCancelListener(builder, getActivity());
-
-    mDialog = builder.show();
-    mShowLatch.countDown();
-  }
-
-  private CharSequence[] getItemsAsCharSequenceArray() {
-    return mItems.toArray(new CharSequence[mItems.size()]);
-  }
-
-  private Builder addOnCancelListener(final AlertDialog.Builder builder, final Activity activity) {
-    return builder.setOnCancelListener(new DialogInterface.OnCancelListener() {
-      @Override
-      public void onCancel(DialogInterface dialog) {
-        mResultMap.put("canceled", true);
-        setResult();
-      }
-    });
-  }
-
-  private void configureButtons(final AlertDialog.Builder builder, final Activity activity) {
-    DialogInterface.OnClickListener buttonListener = new DialogInterface.OnClickListener() {
-      @Override
-      public void onClick(DialogInterface dialog, int which) {
-        switch (which) {
-        case DialogInterface.BUTTON_POSITIVE:
-          mResultMap.put("which", "positive");
-          break;
-        case DialogInterface.BUTTON_NEGATIVE:
-          mResultMap.put("which", "negative");
-          break;
-        case DialogInterface.BUTTON_NEUTRAL:
-          mResultMap.put("which", "neutral");
-
-          break;
-        }
-        setResult();
-      }
-    };
-    if (mNegativeButtonText != null) {
-      builder.setNegativeButton(mNegativeButtonText, buttonListener);
-    }
-    if (mPositiveButtonText != null) {
-      builder.setPositiveButton(mPositiveButtonText, buttonListener);
-    }
-    if (mNeutralButtonText != null) {
-      builder.setNeutralButton(mNeutralButtonText, buttonListener);
-    }
-  }
-
-  private void setResult() {
-    dismissDialog();
-    if (mInputType == InputType.PLAIN_TEXT || mInputType == InputType.PASSWORD) {
-      mResultMap.put("value", mEditText.getText().toString());
-    }
-    setResult(mResultMap);
-  }
-
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/ui/DatePickerDialogTask.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/ui/DatePickerDialogTask.java
deleted file mode 100644
index 2b027523..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/ui/DatePickerDialogTask.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright (C) 2010 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.
- */
-
-package org.qpython.qsl4a.qsl4a.facade.ui;
-
-import android.app.DatePickerDialog;
-import android.content.DialogInterface;
-import android.util.AndroidRuntimeException;
-import android.widget.DatePicker;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-/**
- * Wrapper class for date picker dialog running in separate thread.
- * 
- * @author MeanEYE.rcf (meaneye.rcf@gmail.com)
- */
-public class DatePickerDialogTask extends DialogTask {
-  public static int mYear;
-  public static int mMonth;
-  public static int mDay;
-
-  public DatePickerDialogTask(int year, int month, int day) {
-    mYear = year;
-    mMonth = month - 1;
-    mDay = day;
-  }
-
-  @Override
-  public void onCreate() {
-    super.onCreate();
-    mDialog = new DatePickerDialog(getActivity(), new DatePickerDialog.OnDateSetListener() {
-      @Override
-      public void onDateSet(DatePicker view, int year, int month, int day) {
-        JSONObject result = new JSONObject();
-        try {
-          result.put("which", "positive");
-          result.put("year", year);
-          result.put("month", month + 1);
-          result.put("day", day);
-          setResult(result);
-        } catch (JSONException e) {
-          throw new AndroidRuntimeException(e);
-        }
-      }
-    }, mYear, mMonth, mDay);
-    mDialog.setOnCancelListener(new DialogInterface.OnCancelListener() {
-      @Override
-      public void onCancel(DialogInterface view) {
-        JSONObject result = new JSONObject();
-        try {
-          result.put("which", "neutral");
-          result.put("year", mYear);
-          result.put("month", mMonth + 1);
-          result.put("day", mDay);
-          setResult(result);
-        } catch (JSONException e) {
-          throw new AndroidRuntimeException(e);
-        }
-      }
-    });
-    mDialog.setOnDismissListener(new DialogInterface.OnDismissListener() {
-      @Override
-      public void onDismiss(DialogInterface dialog) {
-        JSONObject result = new JSONObject();
-        try {
-          result.put("which", "negative");
-          result.put("year", mYear);
-          result.put("month", mMonth + 1);
-          result.put("day", mDay);
-          setResult(result);
-        } catch (JSONException e) {
-          throw new AndroidRuntimeException(e);
-        }
-      }
-    });
-    mDialog.show();
-    mShowLatch.countDown();
-  }
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/ui/DialogTask.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/ui/DialogTask.java
deleted file mode 100644
index 4285c647..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/ui/DialogTask.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright (C) 2010 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.
- */
-
-package org.qpython.qsl4a.qsl4a.facade.ui;
-
-import android.app.Dialog;
-
-import org.qpython.qsl4a.qsl4a.facade.EventFacade;
-import org.qpython.qsl4a.qsl4a.future.FutureActivityTask;
-
-import java.util.concurrent.CountDownLatch;
-
-abstract class DialogTask extends FutureActivityTask<Object> {
-
-  protected Dialog mDialog;
-  private EventFacade mEventFacade;
-
-  public EventFacade getEventFacade() {
-    return mEventFacade;
-  }
-
-  public void setEventFacade(EventFacade mEventFacade) {
-    this.mEventFacade = mEventFacade;
-  }
-
-  @Override
-  protected void setResult(Object object) {
-    super.setResult(object);
-    EventFacade eventFacade = getEventFacade();
-    if (eventFacade != null) {
-      eventFacade.postEvent("dialog", object);
-    }
-  }
-
-  protected final CountDownLatch mShowLatch = new CountDownLatch(1);
-
-  /**
-   * Returns the wrapped {@link Dialog}.
-   */
-  public Dialog getDialog() {
-    return mDialog;
-  }
-
-  /**
-   * Dismiss the {@link Dialog} and close {@link Sl4aActivity}.
-   */
-  public void dismissDialog() {
-    if (mDialog != null) {
-      mDialog.dismiss();
-      finish();
-    }
-    mDialog = null;
-  }
-
-  /**
-   * Returns the {@link CountDownLatch} that is counted down when the dialog is shown.
-   */
-  public CountDownLatch getShowLatch() {
-    return mShowLatch;
-  }
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/ui/FullScreenTask.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/ui/FullScreenTask.java
deleted file mode 100644
index 8e0af1c6..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/ui/FullScreenTask.java
+++ /dev/null
@@ -1,238 +0,0 @@
-package org.qpython.qsl4a.qsl4a.facade.ui;
-
-import android.os.Handler;
-import android.view.KeyEvent;
-import android.view.Menu;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.ViewGroup.LayoutParams;
-import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemClickListener;
-import android.widget.Button;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-import org.qpython.qsl4a.qsl4a.facade.EventFacade;
-import org.qpython.qsl4a.qsl4a.future.FutureActivityTask;
-
-
-import java.io.StringReader;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.CountDownLatch;
-
-import org.json.JSONArray;
-import org.xmlpull.v1.XmlPullParser;
-
-public class FullScreenTask extends FutureActivityTask<Object> implements OnClickListener,
-    OnItemClickListener {
-  private EventFacade mEventFacade;
-  private UiFacade mUiFacade;
-  public View mView = null;
-  protected ViewInflater mInflater = new ViewInflater();
-  protected String mLayout;
-  protected final CountDownLatch mShowLatch = new CountDownLatch(1);
-  protected Handler mHandler = null;
-  private List<Integer> mOverrideKeys;
-
-  public FullScreenTask(String layout) {
-    super();
-    mLayout = layout;
-  }
-
-  @Override
-  public void onCreate() {
-    // super.onCreate();
-    if (mHandler == null) {
-      mHandler = new Handler();
-    }
-    mInflater.getErrors().clear();
-    try {
-      if (mView == null) {
-        StringReader sr = new StringReader(mLayout);
-        XmlPullParser xml = ViewInflater.getXml(sr);
-        mView = mInflater.inflate(getActivity(), xml);
-      }
-    } catch (Exception e) {
-      mInflater.getErrors().add(e.toString());
-      mView = defaultView();
-//      mInflater.setIdList(R.id.class);
-    }
-    getActivity().setContentView(mView);
-    getActivity().setTitle("SL4A Title");
-    mInflater.setClickListener(mView, this, this);
-    mShowLatch.countDown();
-  }
-
-  @Override
-  public void onDestroy() {
-    mEventFacade.postEvent("screen", "destroy");
-    super.onDestroy();
-  }
-
-  /** default view in case of errors */
-  @SuppressWarnings("deprecation")
-protected View defaultView() {
-    LinearLayout result = new LinearLayout(getActivity());
-    result.setOrientation(LinearLayout.VERTICAL);
-    TextView text = new TextView(getActivity());
-    text.setText("Sample Layout");
-    result.addView(text, LayoutParams.FILL_PARENT, LayoutParams.WRAP_CONTENT);
-    Button b = new Button(getActivity());
-    b.setText("OK");
-    result.addView(b, LayoutParams.FILL_PARENT, LayoutParams.WRAP_CONTENT);
-    return result;
-  }
-
-  public EventFacade getEventFacade() {
-    return mEventFacade;
-  }
-
-  public void setEventFacade(EventFacade eventFacade) {
-    mEventFacade = eventFacade;
-  }
-
-  public void setUiFacade(UiFacade uiFacade) {
-    mUiFacade = uiFacade;
-  }
-
-  public CountDownLatch getShowLatch() {
-    return mShowLatch;
-  }
-
-  public Map<String, Map<String, String>> getViewAsMap() {
-    return mInflater.getViewAsMap(mView);
-  }
-
-  private View getViewByName(String idName) {
-    View result = null;
-    int id = mInflater.getId(idName);
-    if (id != 0) {
-      result = mView.findViewById(id);
-    }
-    return result;
-  }
-
-  public Map<String, String> getViewDetail(String idName) {
-    Map<String, String> result = new HashMap<String, String>();
-    result.put("error", "id not found (" + idName + ")");
-    View v = getViewByName(idName);
-    if (v != null) {
-      result = mInflater.getViewInfo(v);
-    }
-    return result;
-  }
-
-  public String setViewProperty(String idName, String property, String value) {
-    View v = getViewByName(idName);
-    mInflater.getErrors().clear();
-    if (v != null) {
-      SetProperty p = new SetProperty(v, property, value);
-      mHandler.post(p);
-      try {
-        p.mLatch.await();
-      } catch (InterruptedException e) {
-        mInflater.getErrors().add(e.toString());
-      }
-    } else {
-      return "View " + idName + " not found.";
-    }
-    if (mInflater.getErrors().size() == 0) {
-      return "OK";
-    }
-    return mInflater.getErrors().get(0);
-  }
-
-  public String setList(String id, JSONArray items) {
-    View v = getViewByName(id);
-    mInflater.getErrors().clear();
-    if (v != null) {
-      SetList p = new SetList(v, items);
-      mHandler.post(p);
-      try {
-        p.mLatch.await();
-      } catch (InterruptedException e) {
-        mInflater.getErrors().add(e.toString());
-      }
-    } else {
-      return "View " + id + " not found.";
-    }
-    if (mInflater.getErrors().size() == 0) {
-      return "OK";
-    }
-    return mInflater.getErrors().get(0);
-  }
-
-  @Override
-  public void onClick(View view) {
-    mEventFacade.postEvent("click", mInflater.getViewInfo(view));
-  }
-
-  private class SetProperty implements Runnable {
-    View mView;
-    String mProperty;
-    String mValue;
-    CountDownLatch mLatch = new CountDownLatch(1);
-
-    SetProperty(View view, String property, String value) {
-      mView = view;
-      mProperty = property;
-      mValue = value;
-    }
-
-    @Override
-    public void run() {
-      // TODO Auto-generated method stub
-      mInflater.setProperty(mView, mProperty, mValue);
-      mView.invalidate();
-      mLatch.countDown();
-    }
-  }
-
-  private class SetList implements Runnable {
-    View mView;
-    JSONArray mItems;
-    CountDownLatch mLatch = new CountDownLatch(1);
-
-    SetList(View view, JSONArray items) {
-      mView = view;
-      mItems = items;
-      mView.invalidate();
-      mLatch.countDown();
-    }
-
-    @Override
-    public void run() {
-      mInflater.setListAdapter(mView, mItems);
-    }
-  }
-
-  @Override
-  public boolean onKeyDown(int keyCode, KeyEvent event) {
-    Map<String, String> data = new HashMap<String, String>();
-    data.put("key", String.valueOf(keyCode));
-    data.put("action", String.valueOf(event.getAction()));
-    mEventFacade.postEvent("key", data);
-    boolean overrideKey =
-        (keyCode == KeyEvent.KEYCODE_BACK)
-            || (mOverrideKeys == null ? false : mOverrideKeys.contains(keyCode));
-    return overrideKey;
-  }
-
-  @Override
-  public boolean onPrepareOptionsMenu(Menu menu) {
-    return mUiFacade.onPrepareOptionsMenu(menu);
-  }
-
-  @Override
-  public void onItemClick(AdapterView<?> aview, View aitem, int position, long id) {
-    Map<String, String> data = mInflater.getViewInfo(aview);
-    data.put("position", String.valueOf(position));
-    mEventFacade.postEvent("itemclick", data);
-  }
-
-  public void setOverrideKeys(List<Integer> overrideKeys) {
-    mOverrideKeys = overrideKeys;
-  }
-
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/ui/NFCBeamTask.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/ui/NFCBeamTask.java
deleted file mode 100644
index b95c128f..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/ui/NFCBeamTask.java
+++ /dev/null
@@ -1,636 +0,0 @@
-/*
- * Copyright (C) 2010 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.
- */
-
-package org.qpython.qsl4a.qsl4a.facade.ui;
-
-import java.nio.charset.Charset;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeSet;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-
-import android.annotation.SuppressLint;
-import android.annotation.TargetApi;
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.app.PendingIntent;
-import android.app.AlertDialog.Builder;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.content.IntentFilter.MalformedMimeTypeException;
-import android.nfc.NdefMessage;
-import android.nfc.NdefRecord;
-import android.nfc.NfcAdapter;
-import android.nfc.NfcAdapter.CreateNdefMessageCallback;
-import android.nfc.NfcAdapter.OnNdefPushCompleteCallback;
-import android.nfc.NfcEvent;
-import android.os.Build;
-import android.os.Handler;
-import android.os.Message;
-import android.os.Parcelable;
-import android.text.method.PasswordTransformationMethod;
-import android.util.Log;
-import android.view.KeyEvent;
-import android.widget.EditText;
-import android.widget.Toast;
-
-import org.qpython.qsl4a.qsl4a.activity.FutureActivity;
-
-/**
- * Wrapper class for progress dialog running in separate thread
- * 
- * @author MeanEYE.rcf (meaneye.rcf@gmail.com)
- */
-class NFCBeamTask extends DialogTask implements CreateNdefMessageCallback, OnNdefPushCompleteCallback {
-
-	  private final String TAG = "NFCBeamTask";
-	  private final String mTitle;
-	  private final String mMessage;
-
-	  private final List<String> mItems;
-	  private final Set<Integer> mSelectedItems;
-	  private final Map<String, Object> mResultMap;
-	  private InputType mInputType;
-	  private int mEditInputType = 0;
-
-	  private String mPositiveButtonText;
-	  private String mNegativeButtonText;
-	  private String mNeutralButtonText;
-
-	  private EditText mEditText;
-	  private String mDefaultText;
-
-	  private int beamStat=0;
-	  private enum InputType {
-	    DEFAULT, MENU, SINGLE_CHOICE, MULTI_CHOICE, PLAIN_TEXT, PASSWORD;
-	  }
-
-	  public NFCBeamTask(String title, String message) {
-	    mTitle = title;
-	    mMessage = message;
-	    mInputType = InputType.DEFAULT;
-	    mItems = new ArrayList<String>();
-	    mSelectedItems = new TreeSet<Integer>();
-	    mResultMap = new HashMap<String, Object>();
-	  }
-
-	  public void setPositiveButtonText(String text) {
-	    mPositiveButtonText = text;
-	  }
-
-	  public void setNegativeButtonText(String text) {
-	    mNegativeButtonText = text;
-	  }
-
-	  public void setNeutralButtonText(String text) {
-	    mNeutralButtonText = text;
-	  }
-
-	  /**
-	   * Set list items.
-	   * 
-	   * @param items
-	   */
-	  public void setItems(JSONArray items) {
-	    mItems.clear();
-	    for (int i = 0; i < items.length(); i++) {
-	      try {
-	        mItems.add(items.getString(i));
-	      } catch (JSONException e) {
-	        throw new RuntimeException(e);
-	      }
-	    }
-	    mInputType = InputType.MENU;
-	  }
-
-	  /**
-	   * Set single choice items.
-	   * 
-	   * @param items
-	   *          a list of items as {@link String}s to display
-	   * @param selected
-	   *          the index of the item that is selected by default
-	   */
-	  public void setSingleChoiceItems(JSONArray items, int selected) {
-	    setItems(items);
-	    mSelectedItems.clear();
-	    mSelectedItems.add(selected);
-	    mInputType = InputType.SINGLE_CHOICE;
-	  }
-
-	  /**
-	   * Set multi choice items.
-	   * 
-	   * @param items
-	   *          a list of items as {@link String}s to display
-	   * @param selected
-	   *          a list of indices for items that should be selected by default
-	   * @throws JSONException
-	   */
-	  public void setMultiChoiceItems(JSONArray items, JSONArray selected) throws JSONException {
-	    setItems(items);
-	    mSelectedItems.clear();
-	    if (selected != null) {
-	      for (int i = 0; i < selected.length(); i++) {
-	        mSelectedItems.add(selected.getInt(i));
-	      }
-	    }
-	    mInputType = InputType.MULTI_CHOICE;
-	  }
-
-	  /**
-	   * Returns the list of selected items.
-	   */
-	  public Set<Integer> getSelectedItems() {
-	    return mSelectedItems;
-	  }
-
-	  public void setTextInput(String defaultText) {
-	    mDefaultText = defaultText;
-	    mInputType = InputType.PLAIN_TEXT;
-	    setEditInputType("text");
-	  }
-
-	  public void setEditInputType(String editInputType) {
-	    String[] list = editInputType.split("\\|");
-	    Map<String, Integer> types = ViewInflater.getInputTypes();
-	    mEditInputType = 0;
-	    for (String flag : list) {
-	      Integer v = types.get(flag.trim());
-	      if (v != null) {
-	        mEditInputType |= v;
-	      }
-	    }
-	    if (mEditInputType == 0) {
-	      mEditInputType = android.text.InputType.TYPE_CLASS_TEXT;
-	    }
-	  }
-
-	  public void setPasswordInput() {
-	    mInputType = InputType.PASSWORD;
-	  }
-
-  
-	NfcAdapter _nfcAdapter;
-	private PendingIntent _nfcPendingIntent;
-	IntentFilter[] _readTagFilters;
-    //protected _WBase WBase;
-    protected int dialogIndex;
-
-    private String content = "QPython NFC";
-    
-    @SuppressLint("NewApi")
-	public boolean initNFCBeam() {
-    	Log.d(TAG, "initNFCBeam");
-    	mhandler = new Handler() {
-    		@Override
-    		public void handleMessage(Message msg) {
-    			//Toast.makeText(getActivity().getApplicationContext(), "Master has sent content", Toast.LENGTH_SHORT).show();
-    			
-    			setResult("master","ok");
-    		}
-    	};
-    	
-//    	WBase = new _WBase(getActivity().getApplicationContext(), getActivity());
-    	dialogIndex = 1;
-
-    	_nfcAdapter = NfcAdapter.getDefaultAdapter(getActivity().getApplicationContext());
-	
-    	if (_nfcAdapter == null) {
-			Toast.makeText(getActivity().getApplicationContext(), "NFC is not available, please upgrade your mobile", Toast.LENGTH_SHORT).show();
-
-    		/*WBase.setTxtDialogParam(R.drawable.alert_dialog_icon,
-				"NFC is not available, please update your mobile",
-				new OnClickListener() {
-					@Override
-					public void onClick(DialogInterface arg0, int arg1) {
-					}
-			});
-    		getActivity().showDialog(_WBase.DIALOG_NOTIFY_MESSAGE + dialogIndex);
-    		dialogIndex++;*/
-    	} else {
-
-			if (!_nfcAdapter.isEnabled()) {
-				Toast.makeText(getActivity().getApplicationContext(), "NFC is closed, please enable it with beam", Toast.LENGTH_SHORT).show();
-
-/*				WBase.setTxtDialogParam(R.drawable.alert_dialog_icon,
-						"NFC is closed, please enable it with beam",
-						new OnClickListener() {
-							@Override
-							public void onClick(DialogInterface arg0, int arg1) {
-								getActivity().startActivity(new Intent(
-										Settings.ACTION_NFC_SETTINGS));
-							}
-						});
-				getActivity().showDialog(_WBase.DIALOG_NOTIFY_MESSAGE + dialogIndex);
-				dialogIndex++;*/
-			} else {
-				launchNFC();
-				return true;
-			}
-    	}
-    	return false;
-    }
-    
-    public void setBeamType(int stat) {
-    	beamStat = stat;
-    }
-    @SuppressLint("NewApi")
-	public void launchNFC() {
-    	Log.d(TAG, "launchNFC:"+beamStat);
-    	if (beamStat == 0) {
-			_nfcAdapter.setNdefPushMessageCallback(this, getActivity());
-			_nfcAdapter.setOnNdefPushCompleteCallback(this, getActivity());
-
-			// start NFC Connection
-			/*_nfcPendingIntent = PendingIntent.getActivity(getActivity().getApplicationContext(), 0,
-					new Intent(getActivity().getApplicationContext(), FutureActivity.class)
-							.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP), 0);
-
-			IntentFilter ndefDetected = new IntentFilter(
-					NfcAdapter.ACTION_NDEF_DISCOVERED);
-			try {
-				ndefDetected.addDataType("application/com.hipipal.qpy.nfc");
-			} catch (MalformedMimeTypeException e) {
-				throw new RuntimeException("Could not add MIME type.", e);
-			}
-
-			_readTagFilters = new IntentFilter[] { ndefDetected };*/
-    	} else if (beamStat == 1) {
-			//_nfcAdapter.setNdefPushMessageCallback(this, getActivity());
-			//_nfcAdapter.setOnNdefPushCompleteCallback(this, getActivity());
-
-			// start NFC Connection
-			_nfcPendingIntent = PendingIntent.getActivity(getActivity().getApplicationContext(), 0,
-					new Intent(getActivity().getApplicationContext(), FutureActivity.class)
-							.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP), 0);
-
-			IntentFilter ndefDetected = new IntentFilter(
-					NfcAdapter.ACTION_NDEF_DISCOVERED);
-			try {
-				ndefDetected.addDataType("application/com.hipipal.qpy.nfc");
-			} catch (MalformedMimeTypeException e) {
-				throw new RuntimeException("Could not add MIME type.", e);
-			}
-
-			_readTagFilters = new IntentFilter[] { ndefDetected };
-    	}
-    }
-    
-
-    @TargetApi(Build.VERSION_CODES.GINGERBREAD)
-    @SuppressLint("NewApi")
-    @Override
-    public void onCreate() {
-    	super.onCreate();
-    	if (initNFCBeam()) {
-
-		    AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
-		    if (mTitle != null) {
-		      builder.setTitle(mTitle);
-		    }
-		    // Can't display both a message and items. We'll elect to show the items instead.
-		    if (mMessage != null && mItems.isEmpty()) {
-		      builder.setMessage(mMessage);
-		    }
-		    switch (mInputType) {
-		    // Add single choice menu items to dialog.
-		    case SINGLE_CHOICE:
-		      builder.setSingleChoiceItems(getItemsAsCharSequenceArray(), mSelectedItems.iterator().next(),
-		          new DialogInterface.OnClickListener() {
-		            @Override
-		            public void onClick(DialogInterface dialog, int item) {
-		              mSelectedItems.clear();
-		              mSelectedItems.add(item);
-		            }
-		          });
-		      break;
-		    // Add multiple choice items to the dialog.
-		    case MULTI_CHOICE:
-		      boolean[] selectedItems = new boolean[mItems.size()];
-		      for (int i : mSelectedItems) {
-		        selectedItems[i] = true;
-		      }
-		      builder.setMultiChoiceItems(getItemsAsCharSequenceArray(), selectedItems,
-		          new DialogInterface.OnMultiChoiceClickListener() {
-		            @Override
-		            public void onClick(DialogInterface dialog, int item, boolean isChecked) {
-		              if (isChecked) {
-		                mSelectedItems.add(item);
-		              } else {
-		                mSelectedItems.remove(item);
-		              }
-		            }
-		          });
-		      break;
-		    // Add standard, menu-like, items to dialog.
-		    case MENU:
-		      builder.setItems(getItemsAsCharSequenceArray(), new DialogInterface.OnClickListener() {
-		        public void onClick(DialogInterface dialog, int item) {
-		          Map<String, Integer> result = new HashMap<String, Integer>();
-		          result.put("item", item);
-		          dismissDialog();
-		          setResult(result);
-		        }
-		      });
-		      break;
-		    case PLAIN_TEXT:
-		      mEditText = new EditText(getActivity());
-		      if (mDefaultText != null) {
-		        mEditText.setText(mDefaultText);
-		      }
-		      mEditText.setInputType(mEditInputType);
-		      builder.setView(mEditText);
-		      break;
-		    case PASSWORD:
-		      mEditText = new EditText(getActivity());
-		      mEditText.setInputType(android.text.InputType.TYPE_TEXT_VARIATION_PASSWORD);
-		      mEditText.setTransformationMethod(new PasswordTransformationMethod());
-		      builder.setView(mEditText);
-		      break;
-		    default:
-		      // No input type specified.
-		    }
-		    configureButtons(builder, getActivity());
-		    addOnCancelListener(builder, getActivity());
-		    mDialog = builder.show();
-		    mShowLatch.countDown();
-    	} else {
-    		
-    	}
-  	}
-    
-    private CharSequence[] getItemsAsCharSequenceArray() {
-        return mItems.toArray(new CharSequence[mItems.size()]);
-      }
-
-      private Builder addOnCancelListener(final AlertDialog.Builder builder, final Activity activity) {
-        return builder.setOnCancelListener(new DialogInterface.OnCancelListener() {
-          @Override
-          public void onCancel(DialogInterface dialog) {
-            mResultMap.put("canceled", true);
-            setResult("self","canceled");
-          }
-        });
-      }
-
-      private void configureButtons(final AlertDialog.Builder builder, final Activity activity) {
-        DialogInterface.OnClickListener buttonListener = new DialogInterface.OnClickListener() {
-          @Override
-          public void onClick(DialogInterface dialog, int which) {
-            switch (which) {
-            case DialogInterface.BUTTON_POSITIVE:
-              mResultMap.put("which", "positive");
-              break;
-            case DialogInterface.BUTTON_NEGATIVE:
-              mResultMap.put("which", "negative");
-              break;
-            case DialogInterface.BUTTON_NEUTRAL:
-              mResultMap.put("which", "neutral");
-
-              break;
-            }
-            setResult("self","ok");
-          }
-        };
-        if (mNegativeButtonText != null) {
-          builder.setNegativeButton(mNegativeButtonText, buttonListener);
-        }
-        if (mPositiveButtonText != null) {
-          builder.setPositiveButton(mPositiveButtonText, buttonListener);
-        }
-        if (mNeutralButtonText != null) {
-          builder.setNeutralButton(mNeutralButtonText, buttonListener);
-        }
-      }
-
-      private void setResult(String ms, String stat) {
-        dismissDialog();
-        String msg = "";
-        if (mInputType == InputType.PLAIN_TEXT || mInputType == InputType.PASSWORD) {
-        	msg = mEditText.getText().toString();
-        } else {
-        	msg = content;
-        }
-        Log.d(TAG, "setResult:"+mResultMap);
-        JSONObject ret2 = new JSONObject();
-        try {
-			ret2.put("role", ms);
-	        ret2.put("stat", stat);
-	        ret2.put("message", msg);
-	        mResultMap.put("value", ret2.toString());
-
-		} catch (JSONException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-
-        setResult(mResultMap);
-      }
-
-	@SuppressLint("NewApi")
-	@Override
-	public void onPause() {
-		Log.d(TAG, "onPause");
-
-		super.onPause();
-		if (_nfcAdapter!=null && beamStat==1) {
-			_nfcAdapter.disableForegroundDispatch(getActivity());
-		}
-	}
-
-	@SuppressLint("NewApi")
-	public void onResume() {
-		Log.d(TAG, "onResume");
-		super.onResume();
-		if (_nfcAdapter!=null && beamStat==1) {
-			recvMsg();
-
-			_nfcAdapter.enableForegroundDispatch(getActivity(), _nfcPendingIntent, _readTagFilters, null);
-		}
-	}
-
-	@SuppressLint("NewApi")
-	public void recvMsg() {
-		Log.d(TAG, "recvMsg");
-		if (_nfcAdapter == null) {
-
-			Toast.makeText(getActivity().getApplicationContext(), "NFC is not available, please upgrade your mobile", Toast.LENGTH_SHORT).show();
-
-			/*WBase.setTxtDialogParam(R.drawable.alert_dialog_icon,
-					"NFC is not available, please update your mobile",
-					new OnClickListener() {
-						@Override
-						public void onClick(DialogInterface arg0, int arg1) {
-						}
-					});
-			getActivity().showDialog(_WBase.DIALOG_NOTIFY_MESSAGE + dialogIndex);
-			dialogIndex++;*/
-		} else {
-
-			if (!_nfcAdapter.isEnabled()) {
-				Toast.makeText(getActivity().getApplicationContext(), "NFC is closed, please enable it with beam", Toast.LENGTH_SHORT).show();
-
-				/*WBase.setTxtDialogParam(R.drawable.alert_dialog_icon,
-						"NFC is closed, please enable it with beam",
-						new OnClickListener() {
-							@Override
-							public void onClick(DialogInterface arg0, int arg1) {
-								startActivity(new Intent(
-										Settings.ACTION_NFC_SETTINGS));
-							}
-						});
-				getActivity().showDialog(_WBase.DIALOG_NOTIFY_MESSAGE + dialogIndex);
-				dialogIndex++;*/
-			} else {
-				// OK
-				if (getActivity().getIntent().getAction() != null) {
-
-					if (getActivity().getIntent().getAction().equals(
-							NfcAdapter.ACTION_NDEF_DISCOVERED)) {
-						NdefMessage[] msgs = getNdefMessagesFromIntent(getActivity().getIntent());
-						NdefRecord record = msgs[0].getRecords()[0];
-						byte[] payload = record.getPayload();
-
-						String payloadString = new String(payload);
-
-						//Toast.makeText(getActivity().getApplicationContext(), payloadString, Toast.LENGTH_SHORT).show();
-						
-						this.content = payloadString;
-		    			setResult("slave","ok");
-
-					} else {
-
-					}
-				}
-
-				_nfcAdapter.enableForegroundDispatch(getActivity(), _nfcPendingIntent, _readTagFilters, null);
-
-			}
-		}
-	}
-	
-	@SuppressLint("NewApi")
-	NdefMessage[] getNdefMessagesFromIntent(Intent intent) {
-		// Parse the intent
-		NdefMessage[] msgs = null;
-		String action = intent.getAction();
-		if (action.equals(NfcAdapter.ACTION_TAG_DISCOVERED)
-				|| action.equals(NfcAdapter.ACTION_NDEF_DISCOVERED)) {
-			Parcelable[] rawMsgs = intent
-					.getParcelableArrayExtra(NfcAdapter.EXTRA_NDEF_MESSAGES);
-			if (rawMsgs != null) {
-				msgs = new NdefMessage[rawMsgs.length];
-				for (int i = 0; i < rawMsgs.length; i++) {
-					msgs[i] = (NdefMessage) rawMsgs[i];
-				}
-
-			} else {
-				// Unknown tag type
-				byte[] empty = new byte[] {};
-				NdefRecord record = new NdefRecord(NdefRecord.TNF_UNKNOWN,
-						empty, empty, empty);
-				NdefMessage msg = new NdefMessage(new NdefRecord[] { record });
-				msgs = new NdefMessage[] { msg };
-			}
-
-		} else {
-			Log.e(TAG, "Unknown intent.");
-			finish();
-		}
-		return msgs;
-	}
-
-	@SuppressLint("NewApi")
-	@Override
-	public void onNewIntent(Intent intent) {
-		Log.d(TAG, "onNewIntent");
-
-		if (intent.getAction().equals(NfcAdapter.ACTION_NDEF_DISCOVERED)) {
-			NdefMessage[] msgs = getNdefMessagesFromIntent(intent);
-			NdefRecord record = msgs[0].getRecords()[0];
-			byte[] payload = record.getPayload();
-
-			String payloadString = new String(payload);
-
-			//Toast.makeText(getActivity().getApplicationContext(), payloadString, Toast.LENGTH_SHORT).show();
-			
-			this.content = payloadString;
-			setResult("slave","ok");
-
-
-		} else if (intent.getAction().equals(NfcAdapter.ACTION_TAG_DISCOVERED)) {
-			Toast.makeText(getActivity().getApplicationContext(), "This NFC tag has no NDEF data.",
-					Toast.LENGTH_LONG).show();
-		}
-	}
-
-	/*public String getResult() {
-		return content;
-	}*/
-
-	public void setContent(String content) {
-		this.content = content;
-	}
-	Handler mhandler;
-
-	
-	@SuppressLint("NewApi")
-	@Override
-	public void onNdefPushComplete(NfcEvent arg0) {
-		Log.d(TAG, "onNdefPushComplete");
-		//Toast.makeText(getActivity().getApplicationContext(), "Master", Toast.LENGTH_SHORT).show();
-
-		mhandler.sendEmptyMessage(0);
-	}
-
-	@SuppressLint("NewApi")
-	@Override
-	public NdefMessage createNdefMessage(NfcEvent arg0) {
-		String data;
-		if (mEditText!=null) {
-			data = mEditText.getText().toString();
-		} else {
-			data = content;
-		}
-	
-		String mimeType = "application/com.hipipal.qpy.nfc";
-	
-		byte[] mimeBytes = mimeType.getBytes(Charset.forName("UTF-8"));
-		byte[] dataBytes = data.getBytes(Charset.forName("UTF-8"));
-		byte[] id = new byte[0];
-	
-		NdefRecord record = new NdefRecord(NdefRecord.TNF_MIME_MEDIA,
-				mimeBytes, id, dataBytes);
-	
-		NdefMessage message = new NdefMessage(new NdefRecord[] { record });
-	
-		return message;
-	}
-	
-	  public boolean onKeyDown(int keyCode, KeyEvent event) {
-		  getActivity().finish();
-		  return true;
-	  }
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/ui/ProgressDialogTask.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/ui/ProgressDialogTask.java
deleted file mode 100644
index 8019f573..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/ui/ProgressDialogTask.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (C) 2010 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.
- */
-
-package org.qpython.qsl4a.qsl4a.facade.ui;
-
-import android.app.ProgressDialog;
-
-/**
- * Wrapper class for progress dialog running in separate thread
- * 
- * @author MeanEYE.rcf (meaneye.rcf@gmail.com)
- */
-class ProgressDialogTask extends DialogTask {
-
-  private final int mStyle;
-  private final int mMax;
-  private final String mTitle;
-  private final String mMessage;
-  private final Boolean mCancelable;
-
-  public ProgressDialogTask(int style, int max, String title, String message, boolean cancelable) {
-    mStyle = style;
-    mMax = max;
-    mTitle = title;
-    mMessage = message;
-    mCancelable = cancelable;
-  }
-
-  @Override
-  public void onCreate() {
-    super.onCreate();
-    mDialog = new ProgressDialog(getActivity());
-    ((ProgressDialog) mDialog).setProgressStyle(mStyle);
-    ((ProgressDialog) mDialog).setMax(mMax);
-    mDialog.setCancelable(mCancelable);
-    mDialog.setTitle(mTitle);
-    ((ProgressDialog) mDialog).setMessage(mMessage);
-    mDialog.show();
-    mShowLatch.countDown();
-  }
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/ui/SeekBarDialogTask.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/ui/SeekBarDialogTask.java
deleted file mode 100644
index 35712107..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/ui/SeekBarDialogTask.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
- * Copyright (C) 2010 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.
- */
-
-package org.qpython.qsl4a.qsl4a.facade.ui;
-
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.app.AlertDialog.Builder;
-import android.content.DialogInterface;
-import android.util.AndroidRuntimeException;
-import android.widget.SeekBar;
-
-import org.qpython.qsl4a.qsl4a.Log;
-import org.qpython.qsl4a.qsl4a.facade.EventFacade;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-/**
- * Wrapper class for dialog box with seek bar.
- * 
- * @author MeanEYE.rcf (meaneye.rcf@gmail.com)
- */
-public class SeekBarDialogTask extends DialogTask {
-
-  private SeekBar mSeekBar;
-  private final int mProgress;
-  private final int mMax;
-  private final String mTitle;
-  private final String mMessage;
-  private String mPositiveButtonText;
-  private String mNegativeButtonText;
-
-  public SeekBarDialogTask(int progress, int max, String title, String message) {
-    mProgress = progress;
-    mMax = max;
-    mTitle = title;
-    mMessage = message;
-  }
-
-  public void setPositiveButtonText(String text) {
-    mPositiveButtonText = text;
-  }
-
-  public void setNegativeButtonText(String text) {
-    mNegativeButtonText = text;
-  }
-
-  @Override
-  public void onCreate() {
-    super.onCreate();
-    mSeekBar = new SeekBar(getActivity());
-    mSeekBar.setMax(mMax);
-    mSeekBar.setProgress(mProgress);
-    mSeekBar.setPadding(10, 0, 10, 3);
-    mSeekBar.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
-
-      @Override
-      public void onStopTrackingTouch(SeekBar arg0) {
-      }
-
-      @Override
-      public void onStartTrackingTouch(SeekBar arg0) {
-      }
-
-      @Override
-      public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
-        EventFacade eventFacade = getEventFacade();
-        if (eventFacade != null) {
-          JSONObject result = new JSONObject();
-          try {
-            result.put("which", "seekbar");
-            result.put("progress", mSeekBar.getProgress());
-            result.put("fromuser", fromUser);
-            eventFacade.postEvent("dialog", result);
-          } catch (JSONException e) {
-            Log.e(e);
-          }
-        }
-      }
-    });
-
-    AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
-    if (mTitle != null) {
-      builder.setTitle(mTitle);
-    }
-    if (mMessage != null) {
-      builder.setMessage(mMessage);
-    }
-    builder.setView(mSeekBar);
-    configureButtons(builder, getActivity());
-    addOnCancelListener(builder, getActivity());
-    mDialog = builder.show();
-    mShowLatch.countDown();
-  }
-
-  private Builder addOnCancelListener(final AlertDialog.Builder builder, final Activity activity) {
-    return builder.setOnCancelListener(new DialogInterface.OnCancelListener() {
-      @Override
-      public void onCancel(DialogInterface dialog) {
-        JSONObject result = new JSONObject();
-        try {
-          result.put("canceled", true);
-          result.put("progress", mSeekBar.getProgress());
-        } catch (JSONException e) {
-          Log.e(e);
-        }
-        dismissDialog();
-        setResult(result);
-      }
-    });
-  }
-
-  private void configureButtons(final AlertDialog.Builder builder, final Activity activity) {
-    DialogInterface.OnClickListener buttonListener = new DialogInterface.OnClickListener() {
-      @Override
-      public void onClick(DialogInterface dialog, int which) {
-        JSONObject result = new JSONObject();
-        switch (which) {
-        case DialogInterface.BUTTON_POSITIVE:
-          try {
-            result.put("which", "positive");
-            result.put("progress", mSeekBar.getProgress());
-          } catch (JSONException e) {
-            throw new AndroidRuntimeException(e);
-          }
-          break;
-        case DialogInterface.BUTTON_NEGATIVE:
-          try {
-            result.put("which", "negative");
-            result.put("progress", mSeekBar.getProgress());
-          } catch (JSONException e) {
-            throw new AndroidRuntimeException(e);
-          }
-          break;
-        }
-        dismissDialog();
-        setResult(result);
-      }
-    };
-    if (mNegativeButtonText != null) {
-      builder.setNegativeButton(mNegativeButtonText, buttonListener);
-    }
-    if (mPositiveButtonText != null) {
-      builder.setPositiveButton(mPositiveButtonText, buttonListener);
-    }
-  }
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/ui/TimePickerDialogTask.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/ui/TimePickerDialogTask.java
deleted file mode 100644
index 621d70bf..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/ui/TimePickerDialogTask.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright (C) 2010 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.
- */
-
-package org.qpython.qsl4a.qsl4a.facade.ui;
-
-import android.app.TimePickerDialog;
-import android.content.DialogInterface;
-import android.util.AndroidRuntimeException;
-import android.widget.TimePicker;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-/**
- * Wrapper class for time picker dialog running in separate thread.
- * 
- * @author MeanEYE.rcf (meaneye.rcf@gmail.com)
- */
-public class TimePickerDialogTask extends DialogTask {
-  private final int mHour;
-  private final int mMinute;
-  private final boolean mIs24Hour;
-
-  public TimePickerDialogTask(int hour, int minute, boolean is24hour) {
-    mHour = hour;
-    mMinute = minute;
-    mIs24Hour = is24hour;
-  }
-
-  @Override
-  public void onCreate() {
-    super.onCreate();
-    mDialog = new TimePickerDialog(getActivity(), new TimePickerDialog.OnTimeSetListener() {
-      @Override
-      public void onTimeSet(TimePicker view, int hour, int minute) {
-        JSONObject result = new JSONObject();
-        try {
-          result.put("which", "positive");
-          result.put("hour", hour);
-          result.put("minute", minute);
-          setResult(result);
-        } catch (JSONException e) {
-          throw new AndroidRuntimeException(e);
-        }
-      }
-    }, mHour, mMinute, mIs24Hour);
-    mDialog.setOnCancelListener(new DialogInterface.OnCancelListener() {
-      @Override
-      public void onCancel(DialogInterface view) {
-        JSONObject result = new JSONObject();
-        try {
-          result.put("which", "neutral");
-          result.put("hour", mHour);
-          result.put("minute", mMinute);
-          setResult(result);
-        } catch (JSONException e) {
-          throw new AndroidRuntimeException(e);
-        }
-      }
-    });
-    mDialog.setOnDismissListener(new DialogInterface.OnDismissListener() {
-      @Override
-      public void onDismiss(DialogInterface dialog) {
-        JSONObject result = new JSONObject();
-        try {
-          result.put("which", "negative");
-          result.put("hour", mHour);
-          result.put("minute", mMinute);
-          setResult(result);
-        } catch (JSONException e) {
-          throw new AndroidRuntimeException(e);
-        }
-      }
-    });
-    mDialog.show();
-    mShowLatch.countDown();
-  }
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/ui/UiFacade.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/ui/UiFacade.java
deleted file mode 100644
index e59e4605..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/ui/UiFacade.java
+++ /dev/null
@@ -1,772 +0,0 @@
-/*
- * Copyright (C) 2010 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.
- */
-
-package org.qpython.qsl4a.qsl4a.facade.ui;
-
-import android.app.ProgressDialog;
-import android.app.Service;
-import android.util.AndroidRuntimeException;
-import android.util.Log;
-import android.view.ContextMenu;
-import android.view.ContextMenu.ContextMenuInfo;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-
-import org.qpython.qsl4a.QSL4APP;
-import org.qpython.qsl4a.qsl4a.FileUtils;
-import org.qpython.qsl4a.qsl4a.FutureActivityTaskExecutor;
-import org.qpython.qsl4a.qsl4a.facade.EventFacade;
-import org.qpython.qsl4a.qsl4a.facade.FacadeManager;
-
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.qpython.qsl4a.qsl4a.interpreter.html.HtmlActivityTask;
-import org.qpython.qsl4a.qsl4a.interpreter.html.HtmlInterpreter;
-import org.qpython.qsl4a.qsl4a.jsonrpc.RpcReceiver;
-import org.qpython.qsl4a.qsl4a.rpc.RpcDefault;
-import org.qpython.qsl4a.qsl4a.rpc.RpcOptional;
-
-import org.qpython.qsl4a.qsl4a.rpc.Rpc;
-import org.qpython.qsl4a.qsl4a.rpc.RpcParameter;
-
-/**
- * User Interface Facade. <br>
- * <br>
- * <b>Usage Notes</b><br>
- * <br>
- * The UI facade provides access to a selection of dialog boxes for general user interaction, and
- * also hosts the {@link #webViewShow} call which allows interactive use of html pages.<br>
- * The general use of the dialog functions is as follows:<br>
- * <ol>
- * <li>Create a dialog using one of the following calls:
- * <ul>
- * <li>{@link #dialogCreateInput}
- * <li>{@link #dialogCreateAlert}
- * <li>{@link #dialogCreateDatePicker}
- * <li>{@link #dialogCreateHorizontalProgress}
- * <li>{@link #dialogCreatePassword}
- * <li>{@link #dialogCreateSeekBar}
- * <li>{@link #dialogCreateSpinnerProgress}
- * </ul>
- * <li>Set additional features to your dialog
- * <ul>
- * <li>{@link #dialogSetItems} Set a list of items. Used like a menu.
- * <li>{@link #dialogSetMultiChoiceItems} Set a multichoice list of items.
- * <li>{@link #dialogSetSingleChoiceItems} Set a single choice list of items.
- * <li>{@link #dialogSetPositiveButtonText}
- * <li>{@link #dialogSetNeutralButtonText}
- * <li>{@link #dialogSetNegativeButtonText}
- * <li>{@link #dialogSetMaxProgress} Set max progress for your progress bar.
- * </ul>
- * <li>Display the dialog using {@link #dialogShow}
- * <li>Update dialog information if needed
- * <ul>
- * <li>{@link #dialogSetCurrentProgress}
- * </ul>
- * <li>Get the results
- * <ul>
- * <li>Using {@link #dialogGetResponse}, which will wait until the user performs an action to close
- * the dialog box, or
- * <li>Use eventPoll to wait for a "dialog" event.
- * <li>You can find out which list items were selected using {@link #dialogGetSelectedItems}, which
- * returns an array of numeric indices to your list. For a single choice list, there will only ever
- * be one of these.
- * </ul>
- * <li>Once done, use {@link #dialogDismiss} to remove the dialog.
- * </ol>
- * <br>
- * You can also manipulate menu options. The menu options are available for both {@link #dialogShow}
- * and {@link #fullShow}.
- * <ul>
- * <li>{@link #clearOptionsMenu}
- * <li>{@link #addOptionsMenuItem}
- * </ul>
- * <br>
- * <b>Some notes:</b><br>
- * Not every dialogSet function is relevant to every dialog type, ie, dialogSetMaxProgress obviously
- * only applies to dialogs created with a progress bar. Also, an Alert Dialog may have a message or
- * items, not both. If you set both, items will take priority.<br>
- * In addition to the above functions, {@link #dialogGetInput} and {@link #dialogGetPassword} are
- * convenience functions that create, display and return the relevant dialogs in one call.<br>
- * There is only ever one instance of a dialog. Any dialogCreate call will cause the existing dialog
- * to be destroyed.
- * 
- * @author MeanEYE.rcf (meaneye.rcf@gmail.com)
- */
-public class UiFacade extends RpcReceiver {
-  // This value should not be used for menu groups outside this class.
-  private static final int MENU_GROUP_ID = Integer.MAX_VALUE;
-
-  private final Service mService;
-  private final FutureActivityTaskExecutor mTaskQueue;
-  private DialogTask mDialogTask;
-  private FullScreenTask mFullScreenTask;
-
-  private final List<UiMenuItem> mContextMenuItems;
-  private final List<UiMenuItem> mOptionsMenuItems;
-  private final AtomicBoolean mMenuUpdated;
-
-  private final EventFacade mEventFacade;
-  private List<Integer> mOverrideKeys = Collections.synchronizedList(new ArrayList<Integer>());
-
-  private final String TAG = "UiFacade";
-  public UiFacade(FacadeManager manager) {
-    super(manager);
-    mService = manager.getService();
-    mTaskQueue = ((QSL4APP) mService.getApplication()).getTaskExecutor();
-    mContextMenuItems = new CopyOnWriteArrayList<UiMenuItem>();
-    mOptionsMenuItems = new CopyOnWriteArrayList<UiMenuItem>();
-    mEventFacade = manager.getReceiver(EventFacade.class);
-    mMenuUpdated = new AtomicBoolean(false);
-  }
-
-  /**
-   * For inputType, see <a
-   * href="http://developer.android.com/reference/android/R.styleable.html#TextView_inputType"
-   * >InputTypes</a>. Some useful ones are text, number, and textUri. Multiple flags can be
-   * supplied, seperated by "|", ie: "textUri|textAutoComplete"
-   */
-  @Rpc(description = "Create a text input dialog.")
-  public void dialogCreateInput(
-      @RpcParameter(name = "title", description = "title of the input box") @RpcDefault("Value") final String title,
-      @RpcParameter(name = "message", description = "message to display above the input box") @RpcDefault("Please enter value:") final String message,
-      @RpcParameter(name = "defaultText", description = "text to insert into the input box") @RpcOptional final String text,
-      @RpcParameter(name = "inputType", description = "type of input data, ie number or text") @RpcOptional final String inputType)
-      throws InterruptedException {
-    dialogDismiss();
-    mDialogTask = new AlertDialogTask(title, message);
-    ((AlertDialogTask) mDialogTask).setTextInput(text);
-    if (inputType != null) {
-      ((AlertDialogTask) mDialogTask).setEditInputType(inputType);
-    }
-  }
-
-  @Rpc(description = "Create a password input dialog.")
-  public void dialogCreatePassword(
-      @RpcParameter(name = "title", description = "title of the input box") @RpcDefault("Password") final String title,
-      @RpcParameter(name = "message", description = "message to display above the input box") @RpcDefault("Please enter password:") final String message) {
-    dialogDismiss();
-    mDialogTask = new AlertDialogTask(title, message);
-    ((AlertDialogTask) mDialogTask).setPasswordInput();
-  }
-
-  /**
-   * The result is the user's input, or None (null) if cancel was hit. <br>
-   * Example (python)
-   * 
-   * <pre>
-   * import android
-   * droid=android.Android()
-   * 
-   * print droid.dialogGetInput("Title","Message","Default").result
-   * </pre>
-   * 
-   */
-  @SuppressWarnings("unchecked")
-  @Rpc(description = "Queries the user for a text input.")
-  public String dialogGetInput(
-      @RpcParameter(name = "title", description = "title of the input box") @RpcDefault("Value") final String title,
-      @RpcParameter(name = "message", description = "message to display above the input box") @RpcDefault("Please enter value:") final String message,
-      @RpcParameter(name = "defaultText", description = "text to insert into the input box") @RpcOptional final String text)
-      throws InterruptedException {
-    dialogCreateInput(title, message, text, "text");
-    dialogSetNegativeButtonText("Cancel");
-    dialogSetPositiveButtonText("Ok");
-    dialogShow();
-    Map<String, Object> response = (Map<String, Object>) dialogGetResponse();
-    if ("positive".equals(response.get("which"))) {
-      return (String) response.get("value");
-    } else {
-      return null;
-    }
-  }
-
-  @SuppressWarnings("unchecked")
-  @Rpc(description = "Queries the user for a password.")
-  public String dialogGetPassword(
-      @RpcParameter(name = "title", description = "title of the password box") @RpcDefault("Password") final String title,
-      @RpcParameter(name = "message", description = "message to display above the input box") @RpcDefault("Please enter password:") final String message)
-      throws InterruptedException {
-    dialogCreatePassword(title, message);
-    dialogSetNegativeButtonText("Cancel");
-    dialogSetPositiveButtonText("Ok");
-    dialogShow();
-    Map<String, Object> response = (Map<String, Object>) dialogGetResponse();
-    if ("positive".equals(response.get("which"))) {
-      return (String) response.get("value");
-    } else {
-      return null;
-    }
-  }
-  
-  
-  
-  
-  @Rpc(description = "Create a qpython beam master.")
-  public String dialogCreateNFCBeamMaster(
-	      @RpcParameter(name = "title", description = "title of the input box") @RpcDefault("QPython BEAM With NFC") final String title,
-	      @RpcParameter(name = "message", description = "message to display above the input box") @RpcDefault("Input message and Beam") final String message,
-	      @RpcParameter(name = "inputType", description = "type of input data, ie number or text") @RpcOptional final String inputType)
-	      throws InterruptedException {
-	    dialogDismiss();
-	    mDialogTask = new NFCBeamTask(title, message);
-	    ((NFCBeamTask) mDialogTask).setBeamType(0);
-
-	    ((NFCBeamTask) mDialogTask).setTextInput("");
-	    if (inputType != null) {
-	      ((NFCBeamTask) mDialogTask).setEditInputType(inputType);
-	    }
-	    
-	    //dialogSetNegativeButtonText("Cancel");
-	    //dialogSetPositiveButtonText("QBeam");
-	    dialogShow();
-	    Map<String, Object> response = (Map<String, Object>) dialogGetResponse();
-	    //if ("positive".equals(response.get("which"))) {
-	      return (String) response.get("value");
-	    //} else {
-	    //  return null;
-	    //}
-	  }
-  
-  @Rpc(description = "Create a qpython beam master to send directory message.")
-  public String NFCBeamMessage(
-	      @RpcParameter(name = "content", description = "message you want to sent") @RpcDefault("Message you want to beam") final String content,
-		  @RpcParameter(name = "title", description = "title of the input box") @RpcDefault("QPython Beam With NFC") final String title,
-	      @RpcParameter(name = "message", description = "message to display above the input box") @RpcDefault("Beam Message") final String message)
-	      throws InterruptedException {
-	    dialogDismiss();
-	    mDialogTask = new NFCBeamTask(title, message);
-	    ((NFCBeamTask) mDialogTask).setContent(content);
-	    ((NFCBeamTask) mDialogTask).setBeamType(0);
-
-	    //((NFCBeamTask) mDialogTask).setTextInput("");
-	    
-	    //dialogSetNegativeButtonText("Cancel");
-	    //dialogSetPositiveButtonText("QBeam");
-	    dialogShow();
-	    Map<String, Object> response = (Map<String, Object>) dialogGetResponse();
-	    Log.d(TAG, "NFCBeamMessage:"+response.get("value"));
-	    //if ("positive".equals(response.get("which"))) {
-	      return (String) response.get("value");
-	    //} else {
-	    //  return null;
-	    //}
-	  }
-
-  @Rpc(description = "Create a qpython beam slave.")
-  public String dialogCreateNFCBeamSlave(
-	      @RpcParameter(name = "title", description = "title of the input box") @RpcDefault("QPython Beam With NFC") final String title,
-	      @RpcParameter(name = "message", description = "message to display above the input box") @RpcDefault("Wait for beam message") final String message)
-	      throws InterruptedException {
-	    dialogDismiss();
-	    mDialogTask = new NFCBeamTask(title, message);
-	    ((NFCBeamTask) mDialogTask).setBeamType(1);
-	    //((NFCBeamTask) mDialogTask).setTextInput("");
-	    
-	    //dialogSetNegativeButtonText("Cancel");
-	    //dialogSetPositiveButtonText("QBeam");
-	    dialogShow();
-	    Map<String, Object> response = (Map<String, Object>) dialogGetResponse();
-	    //if ("positive".equals(response.get("which"))) {
-	      return (String) response.get("value");
-	    //} else {
-	    //  return null;
-	    //}
-	  }
-  
-
-
-  /*public void dialogCreateNFCBeam(@RpcParameter(name = "title") @RpcOptional String title,
-      @RpcParameter(name = "message") @RpcOptional String message) {
-    dialogDismiss(); // Dismiss any existing dialog.
-    mDialogTask = new NFCBeamTask(title, message);
-  }*/
-
-  
-  @Rpc(description = "Create a spinner progress dialog.")
-  public void dialogCreateSpinnerProgress(@RpcParameter(name = "title") @RpcOptional String title,
-      @RpcParameter(name = "message") @RpcOptional String message,
-      @RpcParameter(name = "maximum progress") @RpcDefault("100") Integer max) {
-    dialogDismiss(); // Dismiss any existing dialog.
-    mDialogTask = new ProgressDialogTask(ProgressDialog.STYLE_SPINNER, max, title, message, true);
-  }
-
-  @Rpc(description = "Create a horizontal progress dialog.")
-  public void dialogCreateHorizontalProgress(
-      @RpcParameter(name = "title") @RpcOptional String title,
-      @RpcParameter(name = "message") @RpcOptional String message,
-      @RpcParameter(name = "maximum progress") @RpcDefault("100") Integer max) {
-    dialogDismiss(); // Dismiss any existing dialog.
-    mDialogTask =
-        new ProgressDialogTask(ProgressDialog.STYLE_HORIZONTAL, max, title, message, true);
-  }
-
-  /**
-   * <b>Example (python)</b>
-   * 
-   * <pre>
-   *   import android
-   *   droid=android.Android()
-   *   droid.dialogCreateAlert("I like swords.","Do you like swords?")
-   *   droid.dialogSetPositiveButtonText("Yes")
-   *   droid.dialogSetNegativeButtonText("No")
-   *   droid.dialogShow()
-   *   response=droid.dialogGetResponse().result
-   *   droid.dialogDismiss()
-   *   if response.has_key("which"):
-   *     result=response["which"]
-   *     if result=="positive":
-   *       print "Yay! I like swords too!"
-   *     elif result=="negative":
-   *       print "Oh. How sad."
-   *   elif response.has_key("canceled"): # Yes, I know it's mispelled.
-   *     print "You can't even make up your mind?"
-   *   else:
-   *     print "Unknown response=",response
-   * 
-   *   print "Done"
-   * </pre>
-   */
-  @Rpc(description = "Create alert dialog.")
-  public void dialogCreateAlert(@RpcParameter(name = "title") @RpcOptional String title,
-      @RpcParameter(name = "message") @RpcOptional String message) {
-    dialogDismiss(); // Dismiss any existing dialog.
-    mDialogTask = new AlertDialogTask(title, message);
-  }
-
-  /**
-   * Will produce "dialog" events on change, containing:
-   * <ul>
-   * <li>"progress" - Position chosen, between 0 and max
-   * <li>"which" = "seekbar"
-   * <li>"fromuser" = true/false change is from user input
-   * </ul>
-   * Response will contain a "progress" element.
-   */
-  @Rpc(description = "Create seek bar dialog.")
-  public void dialogCreateSeekBar(
-      @RpcParameter(name = "starting value") @RpcDefault("50") Integer progress,
-      @RpcParameter(name = "maximum value") @RpcDefault("100") Integer max,
-      @RpcParameter(name = "title") String title, @RpcParameter(name = "message") String message) {
-    dialogDismiss(); // Dismiss any existing dialog.
-    mDialogTask = new SeekBarDialogTask(progress, max, title, message);
-  }
-
-  @Rpc(description = "Create time picker dialog.")
-  public void dialogCreateTimePicker(
-      @RpcParameter(name = "hour") @RpcDefault("0") Integer hour,
-      @RpcParameter(name = "minute") @RpcDefault("0") Integer minute,
-      @RpcParameter(name = "is24hour", description = "Use 24 hour clock") @RpcDefault("false") Boolean is24hour) {
-    dialogDismiss(); // Dismiss any existing dialog.
-    mDialogTask = new TimePickerDialogTask(hour, minute, is24hour);
-  }
-
-  @Rpc(description = "Create date picker dialog.")
-  public void dialogCreateDatePicker(@RpcParameter(name = "year") @RpcDefault("1970") Integer year,
-      @RpcParameter(name = "month") @RpcDefault("1") Integer month,
-      @RpcParameter(name = "day") @RpcDefault("1") Integer day) {
-    dialogDismiss(); // Dismiss any existing dialog.
-    mDialogTask = new DatePickerDialogTask(year, month, day);
-  }
-
-  @Rpc(description = "Dismiss dialog.")
-  public void dialogDismiss() {
-    if (mDialogTask != null) {
-      mDialogTask.dismissDialog();
-      mDialogTask = null;
-    }
-  }
-
-  @Rpc(description = "Show dialog.")
-  public void dialogShow() throws InterruptedException {
-    if (mDialogTask != null && mDialogTask.getDialog() == null) {
-      mDialogTask.setEventFacade(mEventFacade);
-      mTaskQueue.execute(mDialogTask);
-      mDialogTask.getShowLatch().await();
-    } else {
-      throw new RuntimeException("No dialog to show.");
-    }
-  }
-
-  @Rpc(description = "Set progress dialog current value.")
-  public void dialogSetCurrentProgress(@RpcParameter(name = "current") Integer current) {
-    if (mDialogTask != null && mDialogTask instanceof ProgressDialogTask) {
-      ((ProgressDialog) mDialogTask.getDialog()).setProgress(current);
-    } else {
-      throw new RuntimeException("No valid dialog to assign value to.");
-    }
-  }
-
-  @Rpc(description = "Set progress dialog maximum value.")
-  public void dialogSetMaxProgress(@RpcParameter(name = "max") Integer max) {
-    if (mDialogTask != null && mDialogTask instanceof ProgressDialogTask) {
-      ((ProgressDialog) mDialogTask.getDialog()).setMax(max);
-    } else {
-      throw new RuntimeException("No valid dialog to set maximum value of.");
-    }
-  }
-
-  @Rpc(description = "Set alert dialog positive button text.")
-  public void dialogSetPositiveButtonText(@RpcParameter(name = "text") String text) {
-    if (mDialogTask != null && mDialogTask instanceof AlertDialogTask) {
-      ((AlertDialogTask) mDialogTask).setPositiveButtonText(text);
-    } else if (mDialogTask != null && mDialogTask instanceof NFCBeamTask) {
-        ((NFCBeamTask) mDialogTask).setPositiveButtonText(text);
-
-    } else if (mDialogTask != null && mDialogTask instanceof SeekBarDialogTask) {
-      ((SeekBarDialogTask) mDialogTask).setPositiveButtonText(text);
-    } else {
-      throw new AndroidRuntimeException("No dialog to add button to.");
-    }
-  }
-
-  @Rpc(description = "Set alert dialog button text.")
-  public void dialogSetNegativeButtonText(@RpcParameter(name = "text") String text) {
-    if (mDialogTask != null && mDialogTask instanceof AlertDialogTask) {
-      ((AlertDialogTask) mDialogTask).setNegativeButtonText(text);
-    } else if (mDialogTask != null && mDialogTask instanceof NFCBeamTask) {
-          ((NFCBeamTask) mDialogTask).setNegativeButtonText(text);
-
-    } else if (mDialogTask != null && mDialogTask instanceof SeekBarDialogTask) {
-      ((SeekBarDialogTask) mDialogTask).setNegativeButtonText(text);
-    } else {
-      throw new AndroidRuntimeException("No dialog to add button to.");
-    }
-  }
-
-  @Rpc(description = "Set alert dialog button text.")
-  public void dialogSetNeutralButtonText(@RpcParameter(name = "text") String text) {
-    if (mDialogTask != null && mDialogTask instanceof AlertDialogTask) {
-      ((AlertDialogTask) mDialogTask).setNeutralButtonText(text);
-    } else {
-      throw new AndroidRuntimeException("No dialog to add button to.");
-    }
-  }
-
-  // TODO(damonkohler): Make RPC layer translate between JSONArray and List<Object>.
-  /**
-   * This effectively creates list of options. Clicking on an item will immediately return an "item"
-   * element, which is the index of the selected item.
-   */
-  @Rpc(description = "Set alert dialog list items.")
-  public void dialogSetItems(@RpcParameter(name = "items") JSONArray items) {
-    if (mDialogTask != null && mDialogTask instanceof AlertDialogTask) {
-      ((AlertDialogTask) mDialogTask).setItems(items);
-    } else {
-      throw new AndroidRuntimeException("No dialog to add list to.");
-    }
-  }
-
-  /**
-   * This creates a list of radio buttons. You can select one item out of the list. A response will
-   * not be returned until the dialog is closed, either with the Cancel key or a button
-   * (positive/negative/neutral). Use {@link #dialogGetSelectedItems()} to find out what was
-   * selected.
-   */
-  @Rpc(description = "Set dialog single choice items and selected item.")
-  public void dialogSetSingleChoiceItems(
-      @RpcParameter(name = "items") JSONArray items,
-      @RpcParameter(name = "selected", description = "selected item index") @RpcDefault("0") Integer selected) {
-    if (mDialogTask != null && mDialogTask instanceof AlertDialogTask) {
-      ((AlertDialogTask) mDialogTask).setSingleChoiceItems(items, selected);
-    } else {
-      throw new AndroidRuntimeException("No dialog to add list to.");
-    }
-  }
-
-  /**
-   * This creates a list of check boxes. You can select multiple items out of the list. A response
-   * will not be returned until the dialog is closed, either with the Cancel key or a button
-   * (positive/negative/neutral). Use {@link #dialogGetSelectedItems()} to find out what was
-   * selected.
-   */
-
-  @Rpc(description = "Set dialog multiple choice items and selection.")
-  public void dialogSetMultiChoiceItems(
-      @RpcParameter(name = "items") JSONArray items,
-      @RpcParameter(name = "selected", description = "list of selected items") @RpcOptional JSONArray selected)
-      throws JSONException {
-    if (mDialogTask != null && mDialogTask instanceof AlertDialogTask) {
-      ((AlertDialogTask) mDialogTask).setMultiChoiceItems(items, selected);
-    } else {
-      throw new AndroidRuntimeException("No dialog to add list to.");
-    }
-  }
-
-  @Rpc(description = "Returns dialog response.")
-  public Object dialogGetResponse() {
-    try {
-      return mDialogTask.getResult();
-    } catch (Exception e) {
-      throw new AndroidRuntimeException(e);
-    }
-  }
-
-  @Rpc(description = "This method provides list of items user selected.", returns = "Selected items")
-  public Set<Integer> dialogGetSelectedItems() {
-    if (mDialogTask != null && mDialogTask instanceof AlertDialogTask) {
-      return ((AlertDialogTask) mDialogTask).getSelectedItems();
-    } else {
-      throw new AndroidRuntimeException("No dialog to add list to.");
-    }
-  }
-
-  /**
-   * See <a href=http://code.google.com/p/android-scripting/wiki/UsingWebView>wiki page</a> for more
-   * detail.
-   */
-  @Rpc(description = "Display a WebView with the given URL.")
-  public void webViewShow(
-      @RpcParameter(name = "url") String url,
-      @RpcParameter(name = "wait", description = "block until the user exits the WebView") @RpcOptional Boolean wait)
-      throws IOException {
-    String jsonSrc = FileUtils.readFromAssetsFile(mService, HtmlInterpreter.JSON_FILE);
-    String AndroidJsSrc = FileUtils.readFromAssetsFile(mService, HtmlInterpreter.ANDROID_JS_FILE);
-    HtmlActivityTask task = new HtmlActivityTask(mManager, AndroidJsSrc, jsonSrc, url, false);
-    mTaskQueue.execute(task);
-    if (wait != null && wait) {
-      try {
-        task.getResult();
-      } catch (InterruptedException e) {
-        throw new RuntimeException(e);
-      }
-    }
-  }
-
-  /**
-   * Context menus are used primarily with {@link #webViewShow}
-   */
-  @Rpc(description = "Adds a new item to context menu.")
-  public void addContextMenuItem(
-      @RpcParameter(name = "label", description = "label for this menu item") String label,
-      @RpcParameter(name = "event", description = "event that will be generated on menu item click") String event,
-      @RpcParameter(name = "eventData") @RpcOptional Object data) {
-    mContextMenuItems.add(new UiMenuItem(label, event, data, null));
-  }
-
-  /**
-   * <b>Example (python)</b>
-   * 
-   * <pre>
-   * import android
-   * droid=android.Android()
-   * 
-   * droid.addOptionsMenuItem("Silly","silly",None,"star_on")
-   * droid.addOptionsMenuItem("Sensible","sensible","I bet.","star_off")
-   * droid.addOptionsMenuItem("Off","off",None,"ic_menu_revert")
-   * 
-   * print "Hit menu to see extra options."
-   * print "Will timeout in 10 seconds if you hit nothing."
-   * 
-   * while True: # Wait for events from the menu.
-   *   response=droid.eventWait(10000).result
-   *   if response==None:
-   *     break
-   *   print response
-   *   if response["name"]=="off":
-   *     break
-   * print "And done."
-   * 
-   * </pre>
-   */
-  @Rpc(description = "Adds a new item to options menu.")
-  public void addOptionsMenuItem(
-      @RpcParameter(name = "label", description = "label for this menu item") String label,
-      @RpcParameter(name = "event", description = "event that will be generated on menu item click") String event,
-      @RpcParameter(name = "eventData") @RpcOptional Object data,
-      @RpcParameter(name = "iconName", description = "Android system menu icon, see http://developer.android.com/reference/android/R.drawable.html") @RpcOptional String iconName) {
-    mOptionsMenuItems.add(new UiMenuItem(label, event, data, iconName));
-    mMenuUpdated.set(true);
-  }
-
-  @Rpc(description = "Removes all items previously added to context menu.")
-  public void clearContextMenu() {
-    mContextMenuItems.clear();
-  }
-
-  @Rpc(description = "Removes all items previously added to options menu.")
-  public void clearOptionsMenu() {
-    mOptionsMenuItems.clear();
-    mMenuUpdated.set(true);
-  }
-
-  public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) {
-    for (UiMenuItem item : mContextMenuItems) {
-      MenuItem menuItem = menu.add(item.mmTitle);
-      menuItem.setOnMenuItemClickListener(item.mmListener);
-    }
-  }
-
-  public boolean onPrepareOptionsMenu(Menu menu) {
-    if (mMenuUpdated.getAndSet(false)) {
-      menu.removeGroup(MENU_GROUP_ID);
-      for (UiMenuItem item : mOptionsMenuItems) {
-        MenuItem menuItem = menu.add(MENU_GROUP_ID, Menu.NONE, Menu.NONE, item.mmTitle);
-        if (item.mmIcon != null) {
-          menuItem.setIcon(mService.getResources()
-              .getIdentifier(item.mmIcon, "drawable", "android"));
-        }
-        menuItem.setOnMenuItemClickListener(item.mmListener);
-      }
-      return true;
-    }
-    return true;
-  }
-
-  /**
-   * See <a href=http://code.google.com/p/android-scripting/wiki/FullScreenUI>wiki page</a> for more
-   * detail.
-   */
-  @Rpc(description = "Show Full Screen.")
-  public List<String> fullShow(
-      @RpcParameter(name = "layout", description = "String containing View layout") String layout)
-      throws InterruptedException {
-    if (mFullScreenTask != null) {
-      fullDismiss();
-    }
-    mFullScreenTask = new FullScreenTask(layout);
-    mFullScreenTask.setEventFacade(mEventFacade);
-    mFullScreenTask.setUiFacade(this);
-    mFullScreenTask.setOverrideKeys(mOverrideKeys);
-    mTaskQueue.execute(mFullScreenTask);
-    mFullScreenTask.getShowLatch().await();
-    return mFullScreenTask.mInflater.getErrors();
-  }
-
-  @Rpc(description = "Dismiss Full Screen.")
-  public void fullDismiss() {
-    if (mFullScreenTask != null) {
-      mFullScreenTask.finish();
-      mFullScreenTask = null;
-    }
-  }
-
-  @Rpc(description = "Get Fullscreen Properties")
-  public Map<String, Map<String, String>> fullQuery() {
-    if (mFullScreenTask == null) {
-      throw new RuntimeException("No screen displayed.");
-    }
-    return mFullScreenTask.getViewAsMap();
-  }
-
-  @Rpc(description = "Get fullscreen properties for a specific widget")
-  public Map<String, String> fullQueryDetail(
-      @RpcParameter(name = "id", description = "id of layout widget") String id) {
-    if (mFullScreenTask == null) {
-      throw new RuntimeException("No screen displayed.");
-    }
-    return mFullScreenTask.getViewDetail(id);
-  }
-
-  @Rpc(description = "Set fullscreen widget property")
-  public String fullSetProperty(
-      @RpcParameter(name = "id", description = "id of layout widget") String id,
-      @RpcParameter(name = "property", description = "name of property to set") String property,
-      @RpcParameter(name = "value", description = "value to set property to") String value) {
-    if (mFullScreenTask == null) {
-      throw new RuntimeException("No screen displayed.");
-    }
-    return mFullScreenTask.setViewProperty(id, property, value);
-  }
-
-  @Rpc(description = "Attach a list to a fullscreen widget")
-  public String fullSetList(
-      @RpcParameter(name = "id", description = "id of layout widget") String id,
-      @RpcParameter(name = "list", description = "List to set") JSONArray items) {
-    if (mFullScreenTask == null) {
-      throw new RuntimeException("No screen displayed.");
-    }
-    return mFullScreenTask.setList(id, items);
-  }
-
-  /**
-   * This will override the default behaviour of keys while in the fullscreen mode. ie:
-   * 
-   * <pre>
-   *   droid.fullKeyOverride([24,25],True)
-   * </pre>
-   * 
-   * This will override the default behaviour of the volume keys (codes 24 and 25) so that they do
-   * not actually adjust the volume. <br>
-   * Returns a list of currently overridden keycodes.
-   */
-  @Rpc(description = "Override default key actions")
-  public JSONArray fullKeyOverride(
-      @RpcParameter(name = "keycodes", description = "List of keycodes to override") JSONArray keycodes,
-      @RpcParameter(name = "enable", description = "Turn overriding or off") @RpcDefault(value = "true") Boolean enable)
-      throws JSONException {
-    for (int i = 0; i < keycodes.length(); i++) {
-      int value = (int) keycodes.getLong(i);
-      if (value > 0) {
-        if (enable) {
-          if (!mOverrideKeys.contains(value)) {
-            mOverrideKeys.add(value);
-          }
-        } else {
-          int index = mOverrideKeys.indexOf(value);
-          if (index >= 0) {
-            mOverrideKeys.remove(index);
-          }
-        }
-      }
-    }
-    if (mFullScreenTask != null) {
-      mFullScreenTask.setOverrideKeys(mOverrideKeys);
-    }
-    return new JSONArray(mOverrideKeys);
-  }
-
-  @Override
-  public void shutdown() {
-    fullDismiss();
-    HtmlActivityTask.shutdown();
-  }
-
-  private class UiMenuItem {
-
-    private final String mmTitle;
-    private final String mmEvent;
-    private final Object mmEventData;
-    private final String mmIcon;
-    private final MenuItem.OnMenuItemClickListener mmListener;
-
-    public UiMenuItem(String title, String event, Object data, String icon) {
-      mmTitle = title;
-      mmEvent = event;
-      mmEventData = data;
-      mmIcon = icon;
-      mmListener = new MenuItem.OnMenuItemClickListener() {
-        @Override
-        public boolean onMenuItemClick(MenuItem item) {
-          // TODO(damonkohler): Does mmEventData need to be cloned somehow?
-          mEventFacade.postEvent(mmEvent, mmEventData);
-          return true;
-        }
-      };
-    }
-  }
-}
\ No newline at end of file
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/ui/ViewInflater.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/ui/ViewInflater.java
deleted file mode 100644
index b56e14d5..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/ui/ViewInflater.java
+++ /dev/null
@@ -1,1009 +0,0 @@
-package org.qpython.qsl4a.qsl4a.facade.ui;
-
-import android.annotation.SuppressLint;
-import android.app.Activity;
-import android.content.Context;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.Typeface;
-import android.graphics.drawable.BitmapDrawable;
-import android.graphics.drawable.Drawable;
-import android.net.Uri;
-import android.text.InputType;
-import android.text.method.DigitsKeyListener;
-import android.util.DisplayMetrics;
-import android.view.Gravity;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.ViewGroup.LayoutParams;
-import android.view.ViewGroup.MarginLayoutParams;
-import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemClickListener;
-import android.widget.ArrayAdapter;
-import android.widget.ListAdapter;
-import android.widget.RelativeLayout;
-import android.widget.Spinner;
-import android.widget.SpinnerAdapter;
-import android.widget.TableLayout;
-import android.widget.TextView;
-
-import org.qpython.qsl4a.qsl4a.Log;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.Reader;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-
-import org.json.JSONArray;
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-import org.xmlpull.v1.XmlPullParserFactory;
-
-public class ViewInflater {
-  private static XmlPullParserFactory mFactory;
-  public static final String ANDROID = "http://schemas.android.com/apk/res/android";
-  public static final int BASESEQ = 0x7f0f0000;
-  private int mNextSeq = BASESEQ;
-  private final Map<String, Integer> mIdList = new HashMap<String, Integer>();
-  private final List<String> mErrors = new ArrayList<String>();
-  private Context mContext;
-  private DisplayMetrics mMetrics;
-  private static final Map<String, Integer> mInputTypes = new HashMap<String, Integer>();
-  public static final Map<String, String> mColorNames = new HashMap<String, String>();
-  public static final Map<String, Integer> mRelative = new HashMap<String, Integer>();
-  static {
-    mColorNames.put("aliceblue", "#f0f8ff");
-    mColorNames.put("antiquewhite", "#faebd7");
-    mColorNames.put("aqua", "#00ffff");
-    mColorNames.put("aquamarine", "#7fffd4");
-    mColorNames.put("azure", "#f0ffff");
-    mColorNames.put("beige", "#f5f5dc");
-    mColorNames.put("bisque", "#ffe4c4");
-    mColorNames.put("black", "#000000");
-    mColorNames.put("blanchedalmond", "#ffebcd");
-    mColorNames.put("blue", "#0000ff");
-    mColorNames.put("blueviolet", "#8a2be2");
-    mColorNames.put("brown", "#a52a2a");
-    mColorNames.put("burlywood", "#deb887");
-    mColorNames.put("cadetblue", "#5f9ea0");
-    mColorNames.put("chartreuse", "#7fff00");
-    mColorNames.put("chocolate", "#d2691e");
-    mColorNames.put("coral", "#ff7f50");
-    mColorNames.put("cornflowerblue", "#6495ed");
-    mColorNames.put("cornsilk", "#fff8dc");
-    mColorNames.put("crimson", "#dc143c");
-    mColorNames.put("cyan", "#00ffff");
-    mColorNames.put("darkblue", "#00008b");
-    mColorNames.put("darkcyan", "#008b8b");
-    mColorNames.put("darkgoldenrod", "#b8860b");
-    mColorNames.put("darkgray", "#a9a9a9");
-    mColorNames.put("darkgrey", "#a9a9a9");
-    mColorNames.put("darkgreen", "#006400");
-    mColorNames.put("darkkhaki", "#bdb76b");
-    mColorNames.put("darkmagenta", "#8b008b");
-    mColorNames.put("darkolivegreen", "#556b2f");
-    mColorNames.put("darkorange", "#ff8c00");
-    mColorNames.put("darkorchid", "#9932cc");
-    mColorNames.put("darkred", "#8b0000");
-    mColorNames.put("darksalmon", "#e9967a");
-    mColorNames.put("darkseagreen", "#8fbc8f");
-    mColorNames.put("darkslateblue", "#483d8b");
-    mColorNames.put("darkslategray", "#2f4f4f");
-    mColorNames.put("darkslategrey", "#2f4f4f");
-    mColorNames.put("darkturquoise", "#00ced1");
-    mColorNames.put("darkviolet", "#9400d3");
-    mColorNames.put("deeppink", "#ff1493");
-    mColorNames.put("deepskyblue", "#00bfff");
-    mColorNames.put("dimgray", "#696969");
-    mColorNames.put("dimgrey", "#696969");
-    mColorNames.put("dodgerblue", "#1e90ff");
-    mColorNames.put("firebrick", "#b22222");
-    mColorNames.put("floralwhite", "#fffaf0");
-    mColorNames.put("forestgreen", "#228b22");
-    mColorNames.put("fuchsia", "#ff00ff");
-    mColorNames.put("gainsboro", "#dcdcdc");
-    mColorNames.put("ghostwhite", "#f8f8ff");
-    mColorNames.put("gold", "#ffd700");
-    mColorNames.put("goldenrod", "#daa520");
-    mColorNames.put("gray", "#808080");
-    mColorNames.put("grey", "#808080");
-    mColorNames.put("green", "#008000");
-    mColorNames.put("greenyellow", "#adff2f");
-    mColorNames.put("honeydew", "#f0fff0");
-    mColorNames.put("hotpink", "#ff69b4");
-    mColorNames.put("indianred ", "#cd5c5c");
-    mColorNames.put("indigo ", "#4b0082");
-    mColorNames.put("ivory", "#fffff0");
-    mColorNames.put("khaki", "#f0e68c");
-    mColorNames.put("lavender", "#e6e6fa");
-    mColorNames.put("lavenderblush", "#fff0f5");
-    mColorNames.put("lawngreen", "#7cfc00");
-    mColorNames.put("lemonchiffon", "#fffacd");
-    mColorNames.put("lightblue", "#add8e6");
-    mColorNames.put("lightcoral", "#f08080");
-    mColorNames.put("lightcyan", "#e0ffff");
-    mColorNames.put("lightgoldenrodyellow", "#fafad2");
-    mColorNames.put("lightgray", "#d3d3d3");
-    mColorNames.put("lightgrey", "#d3d3d3");
-    mColorNames.put("lightgreen", "#90ee90");
-    mColorNames.put("lightpink", "#ffb6c1");
-    mColorNames.put("lightsalmon", "#ffa07a");
-    mColorNames.put("lightseagreen", "#20b2aa");
-    mColorNames.put("lightskyblue", "#87cefa");
-    mColorNames.put("lightslategray", "#778899");
-    mColorNames.put("lightslategrey", "#778899");
-    mColorNames.put("lightsteelblue", "#b0c4de");
-    mColorNames.put("lightyellow", "#ffffe0");
-    mColorNames.put("lime", "#00ff00");
-    mColorNames.put("limegreen", "#32cd32");
-    mColorNames.put("linen", "#faf0e6");
-    mColorNames.put("magenta", "#ff00ff");
-    mColorNames.put("maroon", "#800000");
-    mColorNames.put("mediumaquamarine", "#66cdaa");
-    mColorNames.put("mediumblue", "#0000cd");
-    mColorNames.put("mediumorchid", "#ba55d3");
-    mColorNames.put("mediumpurple", "#9370d8");
-    mColorNames.put("mediumseagreen", "#3cb371");
-    mColorNames.put("mediumslateblue", "#7b68ee");
-    mColorNames.put("mediumspringgreen", "#00fa9a");
-    mColorNames.put("mediumturquoise", "#48d1cc");
-    mColorNames.put("mediumvioletred", "#c71585");
-    mColorNames.put("midnightblue", "#191970");
-    mColorNames.put("mintcream", "#f5fffa");
-    mColorNames.put("mistyrose", "#ffe4e1");
-    mColorNames.put("moccasin", "#ffe4b5");
-    mColorNames.put("navajowhite", "#ffdead");
-    mColorNames.put("navy", "#000080");
-    mColorNames.put("oldlace", "#fdf5e6");
-    mColorNames.put("olive", "#808000");
-    mColorNames.put("olivedrab", "#6b8e23");
-    mColorNames.put("orange", "#ffa500");
-    mColorNames.put("orangered", "#ff4500");
-    mColorNames.put("orchid", "#da70d6");
-    mColorNames.put("palegoldenrod", "#eee8aa");
-    mColorNames.put("palegreen", "#98fb98");
-    mColorNames.put("paleturquoise", "#afeeee");
-    mColorNames.put("palevioletred", "#d87093");
-    mColorNames.put("papayawhip", "#ffefd5");
-    mColorNames.put("peachpuff", "#ffdab9");
-    mColorNames.put("peru", "#cd853f");
-    mColorNames.put("pink", "#ffc0cb");
-    mColorNames.put("plum", "#dda0dd");
-    mColorNames.put("powderblue", "#b0e0e6");
-    mColorNames.put("purple", "#800080");
-    mColorNames.put("red", "#ff0000");
-    mColorNames.put("rosybrown", "#bc8f8f");
-    mColorNames.put("royalblue", "#4169e1");
-    mColorNames.put("saddlebrown", "#8b4513");
-    mColorNames.put("salmon", "#fa8072");
-    mColorNames.put("sandybrown", "#f4a460");
-    mColorNames.put("seagreen", "#2e8b57");
-    mColorNames.put("seashell", "#fff5ee");
-    mColorNames.put("sienna", "#a0522d");
-    mColorNames.put("silver", "#c0c0c0");
-    mColorNames.put("skyblue", "#87ceeb");
-    mColorNames.put("slateblue", "#6a5acd");
-    mColorNames.put("slategray", "#708090");
-    mColorNames.put("slategrey", "#708090");
-    mColorNames.put("snow", "#fffafa");
-    mColorNames.put("springgreen", "#00ff7f");
-    mColorNames.put("steelblue", "#4682b4");
-    mColorNames.put("tan", "#d2b48c");
-    mColorNames.put("teal", "#008080");
-    mColorNames.put("thistle", "#d8bfd8");
-    mColorNames.put("tomato", "#ff6347");
-    mColorNames.put("turquoise", "#40e0d0");
-    mColorNames.put("violet", "#ee82ee");
-    mColorNames.put("wheat", "#f5deb3");
-    mColorNames.put("white", "#ffffff");
-    mColorNames.put("whitesmoke", "#f5f5f5");
-    mColorNames.put("yellow", "#ffff00");
-    mColorNames.put("yellowgreen", "#9acd32");
-
-    mRelative.put("above", RelativeLayout.ABOVE);
-    mRelative.put("alignBaseline", RelativeLayout.ALIGN_BASELINE);
-    mRelative.put("alignBottom", RelativeLayout.ALIGN_BOTTOM);
-    mRelative.put("alignLeft", RelativeLayout.ALIGN_LEFT);
-    mRelative.put("alignParentBottom", RelativeLayout.ALIGN_PARENT_BOTTOM);
-    mRelative.put("alignParentLeft", RelativeLayout.ALIGN_PARENT_LEFT);
-    mRelative.put("alignParentRight", RelativeLayout.ALIGN_PARENT_RIGHT);
-    mRelative.put("alignParentTop", RelativeLayout.ALIGN_PARENT_TOP);
-    mRelative.put("alignRight", RelativeLayout.ALIGN_PARENT_RIGHT);
-    mRelative.put("alignTop", RelativeLayout.ALIGN_TOP);
-    // mRelative.put("alignWithParentIfMissing",RelativeLayout.); // No idea what this translates
-    // to.
-    mRelative.put("below", RelativeLayout.BELOW);
-    mRelative.put("centerHorizontal", RelativeLayout.CENTER_HORIZONTAL);
-    mRelative.put("centerInParent", RelativeLayout.CENTER_IN_PARENT);
-    mRelative.put("centerVertical", RelativeLayout.CENTER_VERTICAL);
-    mRelative.put("toLeftOf", RelativeLayout.LEFT_OF);
-    mRelative.put("toRightOf", RelativeLayout.RIGHT_OF);
-  }
-
-  public static XmlPullParserFactory getFactory() throws XmlPullParserException {
-    if (mFactory == null) {
-      mFactory = XmlPullParserFactory.newInstance();
-      mFactory.setNamespaceAware(true);
-    }
-    return mFactory;
-  }
-
-  public static XmlPullParser getXml() throws XmlPullParserException {
-    return getFactory().newPullParser();
-  }
-
-  public static XmlPullParser getXml(InputStream is) throws XmlPullParserException {
-    XmlPullParser xml = getXml();
-    xml.setInput(is, null);
-    return xml;
-  }
-
-  public static XmlPullParser getXml(Reader ir) throws XmlPullParserException {
-    XmlPullParser xml = getXml();
-    xml.setInput(ir);
-    return xml;
-  }
-
-  public View inflate(Activity context, XmlPullParser xml) throws XmlPullParserException,
-      IOException, IllegalArgumentException, IllegalAccessException, InvocationTargetException {
-    int event;
-    mContext = context;
-    mErrors.clear();
-    mMetrics = new DisplayMetrics();
-    context.getWindowManager().getDefaultDisplay().getMetrics(mMetrics);
-    do {
-      event = xml.next();
-      if (event == XmlPullParser.END_DOCUMENT) {
-        return null;
-      }
-    } while (event != XmlPullParser.START_TAG);
-    View view = inflateView(context, xml, null);
-    return view;
-  }
-
-  private void addln(Object msg) {
-    Log.d(msg.toString());
-  }
-
-  @SuppressWarnings("rawtypes")
-  public void setClickListener(View v, android.view.View.OnClickListener listener,
-      OnItemClickListener itemListener) {
-    if (v.isClickable()) {
-
-      if (v instanceof AdapterView) {
-        try {
-          ((AdapterView) v).setOnItemClickListener(itemListener);
-        } catch (RuntimeException e) {
-          // Ignore this, not all controls support OnItemClickListener
-        }
-      }
-      try {
-        v.setOnClickListener(listener);
-      } catch (RuntimeException e) {
-        // And not all controls support OnClickListener.
-      }
-    }
-    if (v instanceof ViewGroup) {
-      ViewGroup vg = (ViewGroup) v;
-      for (int i = 0; i < vg.getChildCount(); i++) {
-        setClickListener(vg.getChildAt(i), listener, itemListener);
-      }
-    }
-  }
-
-  private View inflateView(Context context, XmlPullParser xml, ViewGroup root)
-      throws IllegalArgumentException, IllegalAccessException, InvocationTargetException,
-      XmlPullParserException, IOException {
-    View view = buildView(context, xml, root);
-    if (view == null) {
-      return view;
-    }
-    int event;
-    while ((event = xml.next()) != XmlPullParser.END_DOCUMENT) {
-      switch (event) {
-      case XmlPullParser.START_TAG:
-        if (view == null || view instanceof ViewGroup) {
-          inflateView(context, xml, (ViewGroup) view);
-        } else {
-          skipTag(xml); // Not really a view, probably, skip it.
-        }
-        break;
-      case XmlPullParser.END_TAG:
-        return view;
-      }
-    }
-    return view;
-  }
-
-  private void skipTag(XmlPullParser xml) throws XmlPullParserException, IOException {
-    int depth = xml.getDepth();
-    int event;
-    while ((event = xml.next()) != XmlPullParser.END_DOCUMENT) {
-      if (event == XmlPullParser.END_TAG && xml.getDepth() <= depth) {
-        break;
-      }
-    }
-  }
-
-  private View buildView(Context context, XmlPullParser xml, ViewGroup root)
-      throws IllegalArgumentException, IllegalAccessException, InvocationTargetException {
-    View view = viewClass(context, xml.getName());
-    if (view != null) {
-      getLayoutParams(view, root); // Make quite sure every view has a layout param.
-      for (int i = 0; i < xml.getAttributeCount(); i++) {
-        String ns = xml.getAttributeNamespace(i);
-        String attr = xml.getAttributeName(i);
-        if (ANDROID.equals(ns)) {
-          setProperty(view, root, attr, xml.getAttributeValue(i));
-        }
-      }
-      if (root != null) {
-        root.addView(view);
-      }
-    }
-
-    return view;
-  }
-
-  @SuppressWarnings("deprecation")
-private int getLayoutValue(String value) {
-    if (value == null) {
-      return 0;
-    }
-    if (value.equals("match_parent")) {
-      return LayoutParams.FILL_PARENT;
-    }
-    if (value.equals("wrap_content")) {
-      return LayoutParams.WRAP_CONTENT;
-    }
-    if (value.equals("fill_parent")) {
-      return LayoutParams.FILL_PARENT;
-    }
-    return (int) getFontSize(value);
-  }
-
-  private float getFontSize(String value) {
-    int i;
-    float size;
-    String unit = "px";
-    for (i = 0; i < value.length(); i++) {
-      char c = value.charAt(i);
-      if (!(Character.isDigit(c) || c == '.')) {
-        break;
-      }
-    }
-    size = Float.parseFloat(value.substring(0, i));
-    if (i < value.length()) {
-      unit = value.substring(i).trim();
-    }
-    if (unit.equals("px")) {
-      return size;
-    }
-    if (unit.equals("sp")) {
-      return mMetrics.scaledDensity * size;
-    }
-    if (unit.equals("dp") || unit.equals("dip")) {
-      return mMetrics.density * size;
-    }
-    float inches = mMetrics.ydpi * size;
-    if (unit.equals("in")) {
-      return inches;
-    }
-    if (unit.equals("pt")) {
-      return inches / 72;
-    }
-    if (unit.equals("mm")) {
-      return (float) (inches / 2.54);
-    }
-    return 0;
-  }
-
-  private int calcId(String value) {
-    if (value == null) {
-      return 0;
-    }
-    if (value.startsWith("@+id/")) {
-      return tryGetId(value.substring(5));
-    }
-    if (value.startsWith("@id/")) {
-      return tryGetId(value.substring(4));
-    }
-    try {
-      return Integer.parseInt(value);
-    } catch (NumberFormatException e) {
-      return 0;
-    }
-  }
-
-  @SuppressLint("UseValueOf")
-private int tryGetId(String value) {
-    Integer id = mIdList.get(value);
-    if (id == null) {
-      id = new Integer(mNextSeq++);
-      mIdList.put(value, id);
-    }
-    return id;
-  }
-
-  private LayoutParams getLayoutParams(View view, ViewGroup root) {
-    LayoutParams result = view.getLayoutParams();
-    if (result == null) {
-      result = createLayoutParams(root);
-      view.setLayoutParams(result);
-    }
-    return result;
-  }
-
-  private LayoutParams createLayoutParams(ViewGroup root) {
-    LayoutParams result = null;
-    if (root != null) {
-      try {
-        String lookfor = root.getClass().getName() + "$LayoutParams";
-        addln(lookfor);
-        Class<? extends LayoutParams> clazz = Class.forName(lookfor).asSubclass(LayoutParams.class);
-        if (clazz != null) {
-          Constructor<? extends LayoutParams> ct = clazz.getConstructor(int.class, int.class);
-          result = ct.newInstance(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT);
-        }
-      } catch (Exception e) {
-        result = null;
-      }
-    }
-    if (result == null) {
-      result = new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT);
-    }
-    return result;
-  }
-
-  public void setProperty(View view, String attr, String value) {
-    try {
-      setProperty(view, (ViewGroup) view.getParent(), attr, value);
-    } catch (Exception e) {
-      mErrors.add(e.toString());
-    }
-  }
-
-  private void setProperty(View view, ViewGroup root, String attr, String value)
-      throws IllegalArgumentException, IllegalAccessException, InvocationTargetException {
-    addln(attr + ":" + value);
-    if (attr.startsWith("layout_")) {
-      setLayoutProperty(view, root, attr, value);
-    } else if (attr.equals("id")) {
-      view.setId(calcId(value));
-    } else if (attr.equals("gravity")) {
-      setInteger(view, attr, getInteger(Gravity.class, value));
-    } else if (attr.equals("width") || attr.equals("height")) {
-      setInteger(view, attr, (int) getFontSize(value));
-    } else if (attr.equals("inputType")) {
-      setInteger(view, attr, getInteger(InputType.class, value));
-    } else if (attr.equals("background")) {
-      setBackground(view, value);
-    } else if (attr.equals("digits") && view instanceof TextView) {
-      ((TextView) view).setKeyListener(DigitsKeyListener.getInstance(value));
-    } else if (attr.startsWith("nextFocus")) {
-      setInteger(view, attr + "Id", calcId(value));
-    } else if (attr.equals("padding")) {
-      int size = (int) getFontSize(value);
-      view.setPadding(size, size, size, size);
-    } else if (attr.equals("stretchColumns")) {
-      setStretchColumns(view, value);
-    } else if (attr.equals("textSize")) {
-      setFloat(view, attr, getFontSize(value));
-    } else if (attr.equals("textColor")) {
-      setInteger(view, attr, getColor(value));
-    } else if (attr.equals("textHighlightColor")) {
-      setInteger(view, "HighlightColor", getColor(value));
-    } else if (attr.equals("textColorHint")) {
-      setInteger(view, "LinkTextColor", getColor(value));
-    } else if (attr.equals("textStyle")) {
-      TextView textview = (TextView) view;
-      int style = getInteger(Typeface.class, value);
-      if (style == 0) {
-        textview.setTypeface(Typeface.DEFAULT);
-      } else {
-        textview.setTypeface(textview.getTypeface(), style);
-      }
-    } else if (attr.equals("typeface")) {
-      TextView textview = (TextView) view;
-      int style = textview.getTypeface().getStyle();
-      textview.setTypeface(Typeface.create(value, style));
-    } else if (attr.equals("src")) {
-      setImage(view, value);
-    } else {
-      setDynamicProperty(view, attr, value);
-    }
-  }
-
-  private void setStretchColumns(View view, String value) {
-    TableLayout table = (TableLayout) view;
-    String[] values = value.split(",");
-    for (String column : values) {
-      table.setColumnStretchable(Integer.parseInt(column), true);
-    }
-  }
-
-  private void setLayoutProperty(View view, ViewGroup root, String attr, String value) {
-    LayoutParams layout = getLayoutParams(view, root);
-    String layoutAttr = attr.substring(7);
-    if (layoutAttr.equals("width")) {
-      layout.width = getLayoutValue(value);
-    } else if (layoutAttr.equals("height")) {
-      layout.height = getLayoutValue(value);
-    } else if (layoutAttr.equals("gravity")) {
-      setIntegerField(layout, "gravity", getInteger(Gravity.class, value));
-    } else {
-      if (layoutAttr.startsWith("margin") && layout instanceof MarginLayoutParams) {
-        int size = (int) getFontSize(value);
-        MarginLayoutParams margins = (MarginLayoutParams) layout;
-        if (layoutAttr.equals("marginBottom")) {
-          margins.bottomMargin = size;
-        } else if (layoutAttr.equals("marginTop")) {
-          margins.topMargin = size;
-        } else if (layoutAttr.equals("marginLeft")) {
-          margins.leftMargin = size;
-        } else if (layoutAttr.equals("marginRight")) {
-          margins.rightMargin = size;
-        }
-      } else if (layout instanceof RelativeLayout.LayoutParams) {
-        int anchor = calcId(value);
-        if (anchor == 0) {
-          anchor = getInteger(RelativeLayout.class, value);
-        }
-        int rule = mRelative.get(layoutAttr);
-        ((RelativeLayout.LayoutParams) layout).addRule(rule, anchor);
-      } else {
-        setIntegerField(layout, layoutAttr, getInteger(layout.getClass(), value));
-      }
-    }
-  }
-
-  @SuppressWarnings("deprecation")
-private void setBackground(View view, String value) {
-    if (value.startsWith("#")) {
-      view.setBackgroundColor(getColor(value));
-    } else if (value.startsWith("@")) {
-      setInteger(view, "backgroundResource", getInteger(view, value));
-    } else {
-      view.setBackgroundDrawable(getDrawable(value));
-    }
-  }
-
-  @SuppressWarnings("deprecation")
-private Drawable getDrawable(String value) {
-    try {
-      Uri uri = Uri.parse(value);
-      if ("file".equals(uri.getScheme())) {
-        BitmapDrawable bd = new BitmapDrawable(uri.getPath());
-        return bd;
-      }
-    } catch (Exception e) {
-      mErrors.add("failed to load drawable " + value);
-    }
-    return null;
-  }
-
-  private void setImage(View view, String value) {
-    if (value.startsWith("@")) {
-      setInteger(view, "imageResource", getInteger(view, value));
-    } else {
-      try {
-        Uri uri = Uri.parse(value);
-        if ("file".equals(uri.getScheme())) {
-          Bitmap bm = BitmapFactory.decodeFile(uri.getPath());
-          Method method = view.getClass().getMethod("setImageBitmap", Bitmap.class);
-          method.invoke(view, bm);
-        } else {
-          mErrors.add("Only 'file' currently supported for images");
-        }
-      } catch (Exception e) {
-        mErrors.add("failed to set image " + value);
-      }
-    }
-  }
-
-  private void setIntegerField(Object target, String fieldName, int value) {
-    try {
-      Field f = target.getClass().getField(fieldName);
-      f.setInt(target, value);
-    } catch (Exception e) {
-      mErrors.add("set field)" + fieldName + " failed. " + e.toString());
-    }
-  }
-
-  /** Expand single digit color to 2 digits. */
-  private int expandColor(String colorValue) {
-    return Integer.parseInt(colorValue + colorValue, 16);
-  }
-
-  @SuppressLint("DefaultLocale")
-private int getColor(String value) {
-    int a = 0xff, r = 0, g = 0, b = 0;
-    if (value.startsWith("#")) {
-      try {
-        value = value.substring(1);
-        if (value.length() == 4) {
-          a = expandColor(value.substring(0, 1));
-          value = value.substring(1);
-        }
-        if (value.length() == 3) {
-          r = expandColor(value.substring(0, 1));
-          g = expandColor(value.substring(1, 2));
-          b = expandColor(value.substring(2, 3));
-        } else {
-          if (value.length() == 8) {
-            a = Integer.parseInt(value.substring(0, 2), 16);
-            value = value.substring(2);
-          }
-          if (value.length() == 6) {
-            r = Integer.parseInt(value.substring(0, 2), 16);
-            g = Integer.parseInt(value.substring(2, 4), 16);
-            b = Integer.parseInt(value.substring(4, 6), 16);
-          }
-        }
-        long result = (a << 24) | (r << 16) | (g << 8) | b;
-        return (int) result;
-      } catch (Exception e) {
-      }
-    } else if (mColorNames.containsKey(value.toLowerCase())) {
-      return getColor(mColorNames.get(value.toLowerCase()));
-    }
-    mErrors.add("Unknown color " + value);
-    return 0;
-  }
-
-  private int getInputType(String value) {
-    int result = 0;
-    Integer v = getInputTypes().get(value);
-    if (v == null) {
-      mErrors.add("Unkown input type " + value);
-    } else {
-      result = v;
-    }
-    return result;
-  }
-
-  private void setInteger(View view, String attr, int value) {
-    String name = "set" + PCase(attr);
-    Method m;
-    try {
-      if ((m = tryMethod(view, name, Context.class, int.class)) != null) {
-        m.invoke(view, mContext, value);
-      } else if ((m = tryMethod(view, name, int.class)) != null) {
-        m.invoke(view, value);
-      }
-    } catch (Exception e) {
-      addln(name + ":" + value + ":" + e.toString());
-    }
-
-  }
-
-  private void setFloat(View view, String attr, float value) {
-    String name = "set" + PCase(attr);
-    Method m;
-    try {
-      if ((m = tryMethod(view, name, Context.class, float.class)) != null) {
-        m.invoke(view, mContext, value);
-      } else if ((m = tryMethod(view, name, float.class)) != null) {
-        m.invoke(view, value);
-      }
-    } catch (Exception e) {
-      addln(name + ":" + value + ":" + e.toString());
-    }
-
-  }
-
-  private void setDynamicProperty(View view, String attr, String value)
-      throws IllegalArgumentException, IllegalAccessException, InvocationTargetException {
-    String name = "set" + PCase(attr);
-    try {
-      Method m = tryMethod(view, name, CharSequence.class);
-      if (m != null) {
-        m.invoke(view, value);
-      } else if ((m = tryMethod(view, name, Context.class, int.class)) != null) {
-        m.invoke(view, mContext, getInteger(view, value));
-      } else if ((m = tryMethod(view, name, int.class)) != null) {
-        m.invoke(view, getInteger(view, value));
-      } else if ((m = tryMethod(view, name, float.class)) != null) {
-        m.invoke(view, Float.parseFloat(value));
-      } else if ((m = tryMethod(view, name, boolean.class)) != null) {
-        m.invoke(view, Boolean.parseBoolean(value));
-      } else if ((m = tryMethod(view, name, Object.class)) != null) {
-        m.invoke(view, value);
-      } else {
-        mErrors.add(view.getClass().getSimpleName() + ":" + attr + " Property not found.");
-      }
-    } catch (Exception e) {
-      addln(name + ":" + value + ":" + e.toString());
-      mErrors.add(name + ":" + value + ":" + e.toString());
-    }
-  }
-
-  @SuppressLint("DefaultLocale")
-private String PCase(String s) {
-    if (s == null) {
-      return null;
-    }
-    if (s.length() > 0) {
-      return s.substring(0, 1).toUpperCase() + s.substring(1);
-    }
-    return "";
-  }
-
-  private Method tryMethod(Object o, String name, Class<?>... parameters) {
-    Method result;
-    try {
-      result = o.getClass().getMethod(name, parameters);
-    } catch (Exception e) {
-      result = null;
-    }
-    return result;
-  }
-
-  @SuppressLint("DefaultLocale")
-public String camelCase(String s) {
-    if (s == null) {
-      return "";
-    } else if (s.length() < 2) {
-      return s.toUpperCase();
-    } else {
-      return s.substring(0, 1).toUpperCase() + s.substring(1).toLowerCase();
-    }
-  }
-
-  @SuppressLint("DefaultLocale")
-private Integer getInteger(Class<?> clazz, String value) {
-    Integer result = null;
-    if (value.contains("|")) {
-      int work = 0;
-      for (String s : value.split("\\|")) {
-        work |= getInteger(clazz, s);
-      }
-      result = work;
-    } else {
-      if (value.startsWith("?")) {
-        result = parseTheme(value);
-      } else if (value.startsWith("@")) {
-        result = parseTheme(value);
-      } else if (value.startsWith("0x")) {
-        try {
-          result = (int) Long.parseLong(value.substring(2), 16);
-        } catch (NumberFormatException e) {
-          result = 0;
-        }
-      } else {
-        try {
-          result = Integer.parseInt(value);
-        } catch (NumberFormatException e) {
-          if (clazz == InputType.class) {
-            return getInputType(value);
-          }
-          try {
-            Field f = clazz.getField(value.toUpperCase());
-            result = f.getInt(null);
-          } catch (Exception ex) {
-            mErrors.add("Unknown value: " + value);
-            result = 0;
-          }
-        }
-      }
-    }
-    return result;
-  }
-
-  private Integer getInteger(View view, String value) {
-    return getInteger(view.getClass(), value);
-  }
-
-  private Integer parseTheme(String value) {
-    int result;
-    try {
-      String query = "";
-      int i;
-      value = value.substring(1); // skip past "?"
-      i = value.indexOf(":");
-      if (i >= 0) {
-        query = value.substring(0, i) + ".";
-        value = value.substring(i + 1);
-      }
-      query += "R";
-      i = value.indexOf("/");
-      if (i >= 0) {
-        query += "$" + value.substring(0, i);
-        value = value.substring(i + 1);
-      }
-      Class<?> clazz = Class.forName(query);
-      Field f = clazz.getField(value);
-      result = f.getInt(null);
-    } catch (Exception e) {
-      result = 0;
-    }
-    return result;
-  }
-
-  private View viewClass(Context context, String name) {
-    View result = null;
-    result = viewClassTry(context, "android.view." + name);
-    if (result == null) {
-      result = viewClassTry(context, "android.widget." + name);
-    }
-    if (result == null) {
-      result = viewClassTry(context, name);
-    }
-    return result;
-  }
-
-  private View viewClassTry(Context context, String name) {
-    View result = null;
-    try {
-      Class<? extends View> viewclass = Class.forName(name).asSubclass(View.class);
-      if (viewclass != null) {
-        Constructor<? extends View> ct = viewclass.getConstructor(Context.class);
-        result = ct.newInstance(context);
-      }
-    } catch (Exception e) {
-    }
-    return result;
-
-  }
-
-  public Map<String, Integer> getIdList() {
-    return mIdList;
-  }
-
-  public List<String> getErrors() {
-    return mErrors;
-  }
-
-  public String getIdName(int id) {
-    for (String key : mIdList.keySet()) {
-      if (mIdList.get(key) == id) {
-        return key;
-      }
-    }
-    return null;
-  }
-
-  public int getId(String name) {
-    return mIdList.get(name);
-  }
-
-  public Map<String, Map<String, String>> getViewAsMap(View v) {
-    Map<String, Map<String, String>> result = new HashMap<String, Map<String, String>>();
-    for (Entry<String, Integer> entry : mIdList.entrySet()) {
-      View tmp = v.findViewById(entry.getValue());
-      if (tmp != null) {
-        result.put(entry.getKey(), getViewInfo(tmp));
-      }
-    }
-    return result;
-  }
-
-  public Map<String, String> getViewInfo(View v) {
-    Map<String, String> result = new HashMap<String, String>();
-    if (v.getId() != 0) {
-      result.put("id", getIdName(v.getId()));
-    }
-    result.put("type", v.getClass().getSimpleName());
-    addProperty(v, "text", result);
-    addProperty(v, "visibility", result);
-    addProperty(v, "checked", result);
-    addProperty(v, "tag", result);
-    addProperty(v, "selectedItemPosition", result);
-    addProperty(v, "progress", result);
-    return result;
-  }
-
-  private void addProperty(View v, String attr, Map<String, String> dest) {
-    String result = getProperty(v, attr);
-    if (result != null) {
-      dest.put(attr, result);
-    }
-  }
-
-  private String getProperty(View v, String attr) {
-    String name = PCase(attr);
-    Method m = tryMethod(v, "get" + name);
-    if (m == null) {
-      m = tryMethod(v, "is" + name);
-    }
-    String result = null;
-    if (m != null) {
-      try {
-        Object o = m.invoke(v);
-        if (o != null) {
-          result = o.toString();
-        }
-      } catch (Exception e) {
-        result = null;
-      }
-    }
-    return result;
-  }
-
-  public static Map<String, Integer> getInputTypes() {
-    if (mInputTypes.size() == 0) {
-      mInputTypes.put("none", 0x00000000);
-      mInputTypes.put("text", 0x00000001);
-      mInputTypes.put("textCapCharacters", 0x00001001);
-      mInputTypes.put("textCapWords", 0x00002001);
-      mInputTypes.put("textCapSentences", 0x00004001);
-      mInputTypes.put("textAutoCorrect", 0x00008001);
-      mInputTypes.put("textAutoComplete", 0x00010001);
-      mInputTypes.put("textMultiLine", 0x00020001);
-      mInputTypes.put("textImeMultiLine", 0x00040001);
-      mInputTypes.put("textNoSuggestions", 0x00080001);
-      mInputTypes.put("textUri", 0x00000011);
-      mInputTypes.put("textEmailAddress", 0x00000021);
-      mInputTypes.put("textEmailSubject", 0x00000031);
-      mInputTypes.put("textShortMessage", 0x00000041);
-      mInputTypes.put("textLongMessage", 0x00000051);
-      mInputTypes.put("textPersonName", 0x00000061);
-      mInputTypes.put("textPostalAddress", 0x00000071);
-      mInputTypes.put("textPassword", 0x00000081);
-      mInputTypes.put("textVisiblePassword", 0x00000091);
-      mInputTypes.put("textWebEditText", 0x000000a1);
-      mInputTypes.put("textFilter", 0x000000b1);
-      mInputTypes.put("textPhonetic", 0x000000c1);
-      mInputTypes.put("textWebEmailAddress", 0x000000d1);
-      mInputTypes.put("textWebPassword", 0x000000e1);
-      mInputTypes.put("number", 0x00000002);
-      mInputTypes.put("numberSigned", 0x00001002);
-      mInputTypes.put("numberDecimal", 0x00002002);
-      mInputTypes.put("numberPassword", 0x00000012);
-      mInputTypes.put("phone", 0x00000003);
-      mInputTypes.put("datetime", 0x00000004);
-      mInputTypes.put("date", 0x00000014);
-      mInputTypes.put("time", 0x00000024);
-    }
-    return mInputTypes;
-  }
-
-  /** Query class (typically R.id) to extract id names */
-  public void setIdList(Class<?> idClass) {
-    mIdList.clear();
-    for (Field f : idClass.getDeclaredFields()) {
-      try {
-        String name = f.getName();
-        int value = f.getInt(null);
-        mIdList.put(name, value);
-      } catch (Exception e) {
-        // Ignore
-      }
-    }
-  }
-
-  public void setListAdapter(View view, JSONArray items) {
-    List<String> list = new ArrayList<String>();
-    try {
-      for (int i = 0; i < items.length(); i++) {
-        list.add(items.get(i).toString());
-      }
-      ArrayAdapter<String> adapter;
-      if (view instanceof Spinner) {
-        adapter =
-            new ArrayAdapter<String>(mContext, android.R.layout.simple_spinner_item,
-                android.R.id.text1, list);
-      } else {
-        adapter =
-            new ArrayAdapter<String>(mContext, android.R.layout.simple_list_item_1,
-                android.R.id.text1, list);
-      }
-      adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
-      Method m = tryMethod(view, "setAdapter", SpinnerAdapter.class);
-      if (m == null) {
-        m = view.getClass().getMethod("setAdapter", ListAdapter.class);
-      }
-      m.invoke(view, adapter);
-    } catch (Exception e) {
-      mErrors.add("failed to load list " + e.getMessage());
-    }
-  }
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/future/FutureActivityTask.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/future/FutureActivityTask.java
deleted file mode 100644
index 698544fe..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/future/FutureActivityTask.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Copyright (C) 2010 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.
- */
-
-package org.qpython.qsl4a.qsl4a.future;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.util.Log;
-import android.view.ContextMenu;
-import android.view.ContextMenu.ContextMenuInfo;
-import android.view.KeyEvent;
-import android.view.Menu;
-import android.view.View;
-import android.view.Window;
-
-/**
- * Encapsulates an {@link Activity} and a {@link FutureObject}.
- * 
- * @author Damon Kohler (damonkohler@gmail.com)
- */
-public abstract class FutureActivityTask<T> {
-
-	final private String TAG = "FutureActivityTask";
-	private final FutureResult<T> mResult = new FutureResult<T>();
-	private Activity mActivity;
-
-	public void setActivity(Activity activity) {
-		mActivity = activity;
-	}
-
-	public Activity getActivity() {
-		return mActivity;
-	}
-
-	public void onCreate() {
-		Log.d(TAG, "onCreate");
-		mActivity.getWindow().requestFeature(Window.FEATURE_NO_TITLE);
-	}
-
-  public void onStart() {
-		Log.d(TAG, "onStart");
-
-  }
-
-  public void onResume() {
-		Log.d(TAG, "onResume");
-
-  }
-
-  public void onPause() {
-		Log.d(TAG, "onPause");
-
-  }
-
-  public void onStop() {
-		Log.d(TAG, "onStop");
-
-  }
-
-  public void onDestroy() {
-		Log.d(TAG, "onDestroy");
-
-  }
-
-  public void onNewIntent(Intent intent) {
-  }
-  public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) {
-  }
-
-  public boolean onPrepareOptionsMenu(Menu menu) {
-    return false;
-  }
-
-  public void onActivityResult(int requestCode, int resultCode, Intent data) {
-  }
-
-  protected void setResult(T result) {
-    mResult.set(result);
-  }
-
-  public T getResult() throws InterruptedException {
-    return mResult.get();
-  }
-
-  public void finish() {
-    mActivity.finish();
-  }
-
-  public void startActivity(Intent intent) {
-    mActivity.startActivity(intent);
-  }
-
-  public void startActivityForResult(Intent intent, int requestCode) {
-    mActivity.startActivityForResult(intent, requestCode);
-  }
-
-  public boolean onKeyDown(int keyCode, KeyEvent event) {
-    // Placeholder.
-    return false;
-  }
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/future/FutureResult.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/future/FutureResult.java
deleted file mode 100644
index 4cf5ec40..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/future/FutureResult.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (C) 2010 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.
- */
-
-package org.qpython.qsl4a.qsl4a.future;
-
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-
-/**
- * FutureResult represents an eventual execution result for asynchronous operations.
- * 
- * @author Damon Kohler (damonkohler@gmail.com)
- */
-public class FutureResult<T> implements Future<T> {
-
-  private final CountDownLatch mLatch = new CountDownLatch(1);
-  private volatile T mResult;
-
-  public void set(T result) {
-    mResult = result;
-    mLatch.countDown();
-  }
-
-  @Override
-  public boolean cancel(boolean mayInterruptIfRunning) {
-    return false;
-  }
-
-  @Override
-  public T get() throws InterruptedException {
-    mLatch.await();
-    return mResult;
-  }
-
-  @Override
-  public T get(long timeout, TimeUnit unit) throws InterruptedException {
-    mLatch.await(timeout, unit);
-    return mResult;
-  }
-
-  @Override
-  public boolean isCancelled() {
-    return false;
-  }
-
-  @Override
-  public boolean isDone() {
-    return mResult != null;
-  }
-
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/interpreter/ExternalClassLoader.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/interpreter/ExternalClassLoader.java
deleted file mode 100644
index d1687e72..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/interpreter/ExternalClassLoader.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.qpython.qsl4a.qsl4a.interpreter;
-
-import org.qpython.qsl4a.qsl4a.StringUtils;
-
-import dalvik.system.DexClassLoader;
-
-import java.util.Collection;
-
-public class ExternalClassLoader {
-
-  public Object load(Collection<String> dexPaths, Collection<String> nativePaths, String className)
-      throws Exception {
-    String dexOutputDir = "/sdcard/dexoutput";
-    String joinedDexPaths = StringUtils.join(dexPaths, ":");
-    String joinedNativeLibPaths = nativePaths != null ? StringUtils.join(nativePaths, ":") : null;
-    DexClassLoader loader =
-        new DexClassLoader(joinedDexPaths, dexOutputDir, joinedNativeLibPaths, this.getClass()
-            .getClassLoader());
-    Class<?> classToLoad = Class.forName(className, true, loader);
-    return classToLoad.newInstance();
-  }
-}
\ No newline at end of file
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/interpreter/InProcessInterpreter.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/interpreter/InProcessInterpreter.java
deleted file mode 100644
index e0c4be17..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/interpreter/InProcessInterpreter.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.qpython.qsl4a.qsl4a.interpreter;
-
-import java.io.FileDescriptor;
-
-public interface InProcessInterpreter {
-  public FileDescriptor getStdOut();
-
-  public FileDescriptor getStdIn();
-
-  public boolean runInteractive();
-
-  public void runScript(String filename);
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/interpreter/Interpreter.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/interpreter/Interpreter.java
deleted file mode 100644
index d3d31409..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/interpreter/Interpreter.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
- * Copyright (C) 2010 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.
- */
-
-package org.qpython.qsl4a.qsl4a.interpreter;
-
-import org.qpython.qsl4a.qsl4a.language.Language;
-import org.qpython.qsl4a.qsl4a.language.SupportedLanguages;
-import org.qpython.qsl4a.qsl4a.rpc.MethodDescriptor;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Combines all the execution-related specs of a particular interpreter installed in the system.
- * This class is instantiated through a map received from a concrete InterpreterProfider.
- * 
- * @author Damon Kohler (damonkohler@gmail.com)
- * @author Alexey Reznichenko (alexey.reznichenko@gmail.com)
- */
-public class Interpreter implements InterpreterPropertyNames {
-
-  private String mExtension;
-  private String mName;
-  private String mNiceName;
-  private String mInteractiveCommand;
-  private String mScriptExecutionCommand;
-  private File mBinary;
-  private boolean mHasInteractiveMode;
-  private final List<String> mArguments;
-  private final Map<String, String> mEnvironment;
-  private Language mLanguage;
-
-  public Interpreter() {
-    mArguments = new ArrayList<String>();
-    mEnvironment = new HashMap<String, String>();
-  }
-
-  public static Interpreter buildFromMaps(Map<String, String> data,
-      Map<String, String> environment_variables, Map<String, String> arguments) {
-    String extension = data.get(EXTENSION);
-    String name = data.get(NAME);
-    String niceName = data.get(NICE_NAME);
-    String binary = data.get(BINARY);
-    String interactiveCommand = data.get(INTERACTIVE_COMMAND);
-    String scriptCommand = data.get(SCRIPT_COMMAND);
-    Boolean hasInteractiveMode;
-    if (data.containsKey(HAS_INTERACTIVE_MODE)) {
-      hasInteractiveMode = Boolean.parseBoolean(data.get(HAS_INTERACTIVE_MODE));
-    } else {
-      // Default to true so that older interpreter APKs that don't have this value define still
-      // work.
-      hasInteractiveMode = true;
-    }
-    Interpreter interpreter = new Interpreter();
-    interpreter.setName(name);
-    interpreter.setNiceName(niceName);
-    interpreter.setExtension(extension);
-    interpreter.setBinary(new File(binary));
-    interpreter.setInteractiveCommand(interactiveCommand);
-    interpreter.setScriptCommand(scriptCommand);
-    interpreter.setHasInteractiveMode(hasInteractiveMode);
-    interpreter.setLanguage(SupportedLanguages.getLanguageByExtension(extension));
-    interpreter.putAllEnvironmentVariables(environment_variables);
-    interpreter.addAllArguments(arguments.values());
-    return interpreter;
-  }
-
-  // TODO(damonkohler): This should take a List<String> since order is important.
-  private void addAllArguments(Collection<String> arguments) {
-    mArguments.addAll(arguments);
-  }
-
-  List<String> getArguments() {
-    return mArguments;
-  }
-
-  private void putAllEnvironmentVariables(Map<String, String> environmentVariables) {
-    mEnvironment.putAll(environmentVariables);
-  }
-
-  public Map<String, String> getEnvironmentVariables() {
-    return mEnvironment;
-  }
-
-  protected void setScriptCommand(String executeParameters) {
-    mScriptExecutionCommand = executeParameters;
-  }
-
-  public String getScriptCommand() {
-    return mScriptExecutionCommand;
-  }
-
-  protected void setInteractiveCommand(String interactiveCommand) {
-    mInteractiveCommand = interactiveCommand;
-  }
-
-  public String getInteractiveCommand() {
-    return mInteractiveCommand;
-  }
-
-  protected void setBinary(File binary) {
-    if (!binary.exists()) {
-      throw new RuntimeException("Binary " + binary + " does not exist!");
-    }
-    mBinary = binary;
-  }
-
-  public File getBinary() {
-    return mBinary;
-  }
-
-  protected void setExtension(String extension) {
-    mExtension = extension;
-  }
-
-  protected void setHasInteractiveMode(boolean hasInteractiveMode) {
-    mHasInteractiveMode = hasInteractiveMode;
-  }
-
-  public boolean hasInteractiveMode() {
-    return mHasInteractiveMode;
-  }
-
-  public String getExtension() {
-    return mExtension;
-  }
-
-  protected void setName(String name) {
-    mName = name;
-  }
-
-  public String getName() {
-    return mName;
-  }
-
-  protected void setNiceName(String niceName) {
-    mNiceName = niceName;
-  }
-
-  public String getNiceName() {
-    return mNiceName;
-  }
-
-  public String getContentTemplate() {
-    return mLanguage.getContentTemplate();
-  }
-
-  protected void setLanguage(Language language) {
-    mLanguage = language;
-  }
-
-  public Language getLanguage() {
-    return mLanguage;
-  }
-
-  public String getRpcText(String content, MethodDescriptor rpc, String[] values) {
-    return mLanguage.getRpcText(content, rpc, values);
-  }
-
-  public boolean isInstalled() {
-    return mBinary.exists();
-  }
-
-  public boolean isUninstallable() {
-    return true;
-  }
-}
\ No newline at end of file
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/interpreter/InterpreterConfiguration.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/interpreter/InterpreterConfiguration.java
deleted file mode 100644
index 52a6d46d..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/interpreter/InterpreterConfiguration.java
+++ /dev/null
@@ -1,323 +0,0 @@
-/*
- * Copyright (C) 2009 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.
- */
-
-package org.qpython.qsl4a.qsl4a.interpreter;
-
-import android.content.BroadcastReceiver;
-import android.content.ContentResolver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.ProviderInfo;
-import android.content.pm.ResolveInfo;
-import android.content.pm.PackageManager.NameNotFoundException;
-import android.database.Cursor;
-import android.net.Uri;
-
-import org.qpython.qsl4a.qsl4a.Log;
-import org.qpython.qsl4a.qsl4a.SingleThreadExecutor;
-import org.qpython.qsl4a.qsl4a.interpreter.html.HtmlInterpreter;
-import org.qpython.qsl4a.qsl4a.interpreter.shell.ShellInterpreter;
-
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.CopyOnWriteArraySet;
-import java.util.concurrent.ExecutorService;
-
-/**
- * Manages and provides access to the set of available interpreters.
- * 
- * @author Damon Kohler (damonkohler@gmail.com)
- */
-public class InterpreterConfiguration {
-
-  private final InterpreterListener mListener;
-  private final Set<Interpreter> mInterpreterSet;
-  private final Set<ConfigurationObserver> mObserverSet;
-  private final Context mContext;
-  private volatile boolean mIsDiscoveryComplete = false;
-
-  public interface ConfigurationObserver {
-    public void onConfigurationChanged();
-  }
-
-  private class InterpreterListener extends BroadcastReceiver {
-    private final PackageManager mmPackageManager;
-    private final ContentResolver mmResolver;
-    private final ExecutorService mmExecutor;
-    private final Map<String, Interpreter> mmDiscoveredInterpreters;
-
-    private InterpreterListener(Context context) {
-      mmPackageManager = context.getPackageManager();
-      mmResolver = context.getContentResolver();
-      mmExecutor = new SingleThreadExecutor();
-      mmDiscoveredInterpreters = new HashMap<String, Interpreter>();
-    }
-
-    private void discoverForType(final String mime) {
-      mmExecutor.execute(new Runnable() {
-        @Override
-        public void run() {
-          Intent intent = new Intent(InterpreterConstants.ACTION_DISCOVER_INTERPRETERS);
-          intent.addCategory(Intent.CATEGORY_LAUNCHER);
-          intent.setType(mime);
-          List<ResolveInfo> resolveInfos = mmPackageManager.queryIntentActivities(intent, 0);
-          for (ResolveInfo info : resolveInfos) {
-            addInterpreter(info.activityInfo.packageName);
-          }
-          mIsDiscoveryComplete = true;
-          notifyConfigurationObservers();
-        }
-      });
-    }
-
-    private void discoverAll() {
-      mmExecutor.execute(new Runnable() {
-        @Override
-        public void run() {
-          Intent intent = new Intent(InterpreterConstants.ACTION_DISCOVER_INTERPRETERS);
-          intent.addCategory(Intent.CATEGORY_LAUNCHER);
-          intent.setType(InterpreterConstants.MIME + "*");
-          List<ResolveInfo> resolveInfos = mmPackageManager.queryIntentActivities(intent, 0);
-          for (ResolveInfo info : resolveInfos) {
-            addInterpreter(info.activityInfo.packageName);
-          }
-          mIsDiscoveryComplete = true;
-          notifyConfigurationObservers();
-        }
-      });
-    }
-
-    private void notifyConfigurationObservers() {
-      for (ConfigurationObserver observer : mObserverSet) {
-        observer.onConfigurationChanged();
-      }
-    }
-
-    private void addInterpreter(final String packageName) {
-      if (mmDiscoveredInterpreters.containsKey(packageName)) {
-        return;
-      }
-      Interpreter discoveredInterpreter = buildInterpreter(packageName);
-      if (discoveredInterpreter == null) {
-        return;
-      }
-      mmDiscoveredInterpreters.put(packageName, discoveredInterpreter);
-      mInterpreterSet.add(discoveredInterpreter);
-      Log.v("Interpreter discovered: " + packageName + "\nBinary: "
-          + discoveredInterpreter.getBinary());
-    }
-
-    private void remove(final String packageName) {
-      if (!mmDiscoveredInterpreters.containsKey(packageName)) {
-        return;
-      }
-      mmExecutor.execute(new Runnable() {
-        @Override
-        public void run() {
-          Interpreter interpreter = mmDiscoveredInterpreters.get(packageName);
-          if (interpreter == null) {
-            Log.v("Interpreter for " + packageName + " not installed.");
-            return;
-          }
-          mInterpreterSet.remove(interpreter);
-          mmDiscoveredInterpreters.remove(packageName);
-          notifyConfigurationObservers();
-        }
-      });
-    }
-
-    // We require that there's only one interpreter provider per APK.
-    private Interpreter buildInterpreter(String packageName) {
-      PackageInfo packInfo;
-      try {
-        packInfo = mmPackageManager.getPackageInfo(packageName, PackageManager.GET_PROVIDERS);
-      } catch (NameNotFoundException e) {
-        throw new RuntimeException("Package '" + packageName + "' not found.");
-      }
-      ProviderInfo provider = packInfo.providers[0];
-
-      Map<String, String> interpreterMap =
-          getMap(provider, InterpreterConstants.PROVIDER_PROPERTIES);
-      if (interpreterMap == null) {
-        Log.e("Null interpreter map for: " + packageName);
-        return null;
-      }
-      Map<String, String> environmentMap =
-          getMap(provider, InterpreterConstants.PROVIDER_ENVIRONMENT_VARIABLES);
-      if (environmentMap == null) {
-        throw new RuntimeException("Null environment map for: " + packageName);
-      }
-      Map<String, String> argumentsMap = getMap(provider, InterpreterConstants.PROVIDER_ARGUMENTS);
-      if (argumentsMap == null) {
-        throw new RuntimeException("Null arguments map for: " + packageName);
-      }
-      return Interpreter.buildFromMaps(interpreterMap, environmentMap, argumentsMap);
-    }
-
-    private Map<String, String> getMap(ProviderInfo provider, String name) {
-      Uri uri = Uri.parse("content://" + provider.authority + "/" + name);
-      Cursor cursor = mmResolver.query(uri, null, null, null, null);
-      if (cursor == null) {
-        return null;
-      }
-      cursor.moveToFirst();
-      // Use LinkedHashMap so that order is maintained (important for position CLI arguments).
-      Map<String, String> map = new LinkedHashMap<String, String>();
-      for (int i = 0; i < cursor.getColumnCount(); i++) {
-        map.put(cursor.getColumnName(i), cursor.getString(i));
-      }
-      return map;
-    }
-
-    @Override
-    public void onReceive(Context context, Intent intent) {
-      final String action = intent.getAction();
-      final String packageName = intent.getData().getSchemeSpecificPart();
-      if (action.equals(InterpreterConstants.ACTION_INTERPRETER_ADDED)) {
-        mmExecutor.execute(new Runnable() {
-          @Override
-          public void run() {
-            addInterpreter(packageName);
-            notifyConfigurationObservers();
-          }
-        });
-      } else if (action.equals(InterpreterConstants.ACTION_INTERPRETER_REMOVED)
-          || action.equals(Intent.ACTION_PACKAGE_REMOVED)
-          || action.equals(Intent.ACTION_PACKAGE_REPLACED)
-          || action.equals(Intent.ACTION_PACKAGE_DATA_CLEARED)) {
-        remove(packageName);
-      }
-    }
-
-  }
-
-  public InterpreterConfiguration(Context context) {
-    mContext = context;
-    mInterpreterSet = new CopyOnWriteArraySet<Interpreter>();
-    mInterpreterSet.add(new ShellInterpreter());
-    try {
-      mInterpreterSet.add(new HtmlInterpreter(mContext));
-    } catch (IOException e) {
-      Log.e("Failed to instantiate HtmlInterpreter.", e);
-    }
-    mObserverSet = new CopyOnWriteArraySet<ConfigurationObserver>();
-    IntentFilter filter = new IntentFilter();
-    filter.addAction(InterpreterConstants.ACTION_INTERPRETER_ADDED);
-    filter.addAction(InterpreterConstants.ACTION_INTERPRETER_REMOVED);
-    filter.addAction(Intent.ACTION_PACKAGE_DATA_CLEARED);
-    filter.addAction(Intent.ACTION_PACKAGE_REMOVED);
-    filter.addAction(Intent.ACTION_PACKAGE_REPLACED);
-    filter.addDataScheme("package");
-    mListener = new InterpreterListener(mContext);
-    mContext.registerReceiver(mListener, filter);
-  }
-
-  public void startDiscovering() {
-    mListener.discoverAll();
-  }
-
-  public void startDiscovering(String mime) {
-    mListener.discoverForType(mime);
-  }
-
-  public boolean isDiscoveryComplete() {
-    return mIsDiscoveryComplete;
-  }
-
-  public void registerObserver(ConfigurationObserver observer) {
-    if (observer != null) {
-      mObserverSet.add(observer);
-    }
-  }
-
-  public void unregisterObserver(ConfigurationObserver observer) {
-    if (observer != null) {
-      mObserverSet.remove(observer);
-    }
-  }
-
-  /**
-   * Returns the list of all known interpreters.
-   */
-  public List<? extends Interpreter> getSupportedInterpreters() {
-    return new ArrayList<Interpreter>(mInterpreterSet);
-  }
-
-  /**
-   * Returns the list of all installed interpreters.
-   */
-  public List<Interpreter> getInstalledInterpreters() {
-    List<Interpreter> interpreters = new ArrayList<Interpreter>();
-    for (Interpreter i : mInterpreterSet) {
-      if (i.isInstalled()) {
-        interpreters.add(i);
-      }
-    }
-    return interpreters;
-  }
-
-  /**
-   * Returns the list of interpreters that support interactive mode execution.
-   */
-  public List<Interpreter> getInteractiveInterpreters() {
-    List<Interpreter> interpreters = new ArrayList<Interpreter>();
-    for (Interpreter i : mInterpreterSet) {
-      if (i.isInstalled() && i.hasInteractiveMode()) {
-        interpreters.add(i);
-      }
-    }
-    return interpreters;
-  }
-
-  /**
-   * Returns the interpreter matching the provided name or null if no interpreter was found.
-   */
-  public Interpreter getInterpreterByName(String interpreterName) {
-    for (Interpreter i : mInterpreterSet) {
-      if (i.getName().equals(interpreterName)) {
-        return i;
-      }
-    }
-    return null;
-  }
-
-  /**
-   * Returns the correct interpreter for the provided script name based on the script's extension or
-   * null if no interpreter was found.
-   */
-  public Interpreter getInterpreterForScript(String scriptName) {
-    int dotIndex = scriptName.lastIndexOf('.');
-    if (dotIndex == -1) {
-      return null;
-    }
-    String ext = scriptName.substring(dotIndex);
-    for (Interpreter i : mInterpreterSet) {
-      if (i.getExtension().equals(ext)) {
-        return i;
-      }
-    }
-    return null;
-  }
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/interpreter/InterpreterConstants.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/interpreter/InterpreterConstants.java
deleted file mode 100644
index 27b0aadc..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/interpreter/InterpreterConstants.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (C) 2010 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.
- */
-
-package org.qpython.qsl4a.qsl4a.interpreter;
-
-import android.os.Environment;
-
-/**
- * A collection of constants required for installation/removal of an interpreter.
- * 
- * @author Damon Kohler (damonkohler@gmail.com)
- * @author Alexey Reznichenko (alexey.reznichenko@gmail.com)
- */
-public interface InterpreterConstants {
-
-  public static final String SDCARD_ROOT =
-      Environment.getExternalStorageDirectory().getAbsolutePath() + "/";
-
-  public static final String SDCARD_SL4A_ROOT = SDCARD_ROOT + "sl4a/";
-
-  public static final String SCRIPTS_ROOT = SDCARD_SL4A_ROOT + "scripts/";
-
-  public static final String SDCARD_SL4A_DOC = SDCARD_SL4A_ROOT + "doc/";
-
-  public static final String SL4A_DALVIK_CACHE_ROOT = "/dalvik-cache/";
-
-  public static final String INTERPRETER_EXTRAS_ROOT = "/extras/";
-
-  // Interpreters discovery mechanism.
-  public static final String ACTION_DISCOVER_INTERPRETERS =
-      "com.googlecode.android_scripting.DISCOVER_INTERPRETERS";
-
-  // Interpreters broadcasts.
-  public static final String ACTION_INTERPRETER_ADDED =
-      "com.googlecode.android_scripting.INTERPRETER_ADDED";
-  public static final String ACTION_INTERPRETER_REMOVED =
-      "com.googlecode.android_scripting.INTERPRETER_REMOVED";
-
-  // Interpreter content provider.
-  public static final String PROVIDER_PROPERTIES = "com.googlecode.android_scripting.base";
-  public static final String PROVIDER_ENVIRONMENT_VARIABLES =
-      "com.googlecode.android_scripting.env";
-  public static final String PROVIDER_ARGUMENTS = "com.googlecode.android_scripting.args";
-
-  public static final String INSTALLED_PREFERENCE_KEY = "SL4A.interpreter.installed";
-
-  public static final String MIME = "script/";
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/interpreter/InterpreterDescriptor.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/interpreter/InterpreterDescriptor.java
deleted file mode 100644
index 9ddc34cb..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/interpreter/InterpreterDescriptor.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * Copyright (C) 2010 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.
- */
-
-package org.qpython.qsl4a.qsl4a.interpreter;
-
-import android.content.Context;
-
-import java.io.File;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Provides interpreter-specific info for execution/installation/removal purposes.
- * 
- * @author Alexey Reznichenko (alexey.reznichenko@gmail.com)
- */
-public interface InterpreterDescriptor {
-
-  /**
-   * Returns unique name of the interpreter.
-   */
-  public String getName();
-
-  /**
-   * Returns display name of the interpreter.
-   */
-  public String getNiceName();
-
-  /**
-   * Returns supported script-file extension.
-   */
-  public String getExtension();
-
-  /**
-   * Returns interpreter version number.
-   */
-  public int getVersion();
-
-  /**
-   * Returns the binary as a File object. Context is the InterpreterProvider's {@link Context} and
-   * is provided to find the interpreter installation directory.
-   */
-  public File getBinary(Context context);
-
-  /**
-   * Returns execution parameters in case when script name is not provided (when interpreter is
-   * started in a shell mode);
-   */
-  public String getInteractiveCommand(Context context);
-
-  /**
-   * Returns command line arguments to execute a with a given script (format string with one
-   * argument).
-   */
-  public String getScriptCommand(Context context);
-
-  /**
-   * Returns an array of command line arguments required to execute the interpreter (it's essential
-   * that the order in the array is consistent with order of arguments in the command line).
-   */
-  public List<String> getArguments(Context context);
-
-  /**
-   * Should return a map of environment variables names and their values (or null if interpreter
-   * does not require any environment variables).
-   */
-  public Map<String, String> getEnvironmentVariables(Context context);
-
-  /**
-   * Returns true if interpreter has an archive.
-   */
-  public boolean hasInterpreterArchive();
-
-  /**
-   * Returns true if interpreter has an extras archive.
-   */
-  public boolean hasExtrasArchive();
-
-  /**
-   * Returns true if interpreter comes with a scripts archive.
-   */
-  public boolean hasScriptsArchive();
-
-  /**
-   * Returns file name of the interpreter archive.
-   */
-  public String getInterpreterArchiveName();
-
-  /**
-   * Returns file name of the extras archive.
-   */
-  public String getExtrasArchiveName();
-
-  /**
-   * Returns file name of the scripts archive.
-   */
-  public String getScriptsArchiveName();
-
-  /**
-   * Returns URL location of the interpreter archive.
-   */
-  public String getInterpreterArchiveUrl();
-
-  /**
-   * Returns URL location of the scripts archive.
-   */
-  public String getScriptsArchiveUrl();
-
-  /**
-   * Returns URL location of the extras archive.
-   */
-  public String getExtrasArchiveUrl();
-
-  /**
-   * Returns true if interpreter can be executed in interactive mode.
-   */
-  public boolean hasInteractiveMode();
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/interpreter/InterpreterProcess.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/interpreter/InterpreterProcess.java
deleted file mode 100644
index c3c631b4..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/interpreter/InterpreterProcess.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * Copyright (C) 2009 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.
- */
-
-package org.qpython.qsl4a.qsl4a.interpreter;
-
-import org.qpython.qsl4a.qsl4a.Analytics;
-import org.qpython.qsl4a.qsl4a.AndroidProxy;
-import org.qpython.qsl4a.qsl4a.Log;
-import org.qpython.qsl4a.qsl4a.Process;
-import org.qpython.qsl4a.qsl4a.SimpleServer;
-import org.qpython.qsl4a.qsl4a.jsonrpc.RpcReceiverManagerFactory;
-
-import java.net.InetSocketAddress;
-import java.net.SocketException;
-import java.net.UnknownHostException;
-
-/**
- * This is a skeletal implementation of an interpreter process.
- * 
- * @author Damon Kohler (damonkohler@gmail.com)
- */
-public class InterpreterProcess extends Process {
-
-  private final AndroidProxy mProxy;
-  private final Interpreter mInterpreter;
-  private String mCommand;
-
-  /**
-   * Creates a new {@link InterpreterProcess}.
-   * 
-   * @param launchScript
-   *          the absolute path to a script that should be launched with the interpreter
-   * @param port
-   *          the port that the AndroidProxy is listening on
-   */
-  public InterpreterProcess(Interpreter interpreter, AndroidProxy proxy) {
-    mProxy = proxy;
-    mInterpreter = interpreter;
-
-    setBinary(interpreter.getBinary());
-    setName(interpreter.getNiceName());
-    setCommand(interpreter.getInteractiveCommand());
-    addAllArguments(interpreter.getArguments());
-    putAllEnvironmentVariables(System.getenv());
-    putEnvironmentVariable("AP_HOST", getHost());
-    putEnvironmentVariable("AP_PORT", Integer.toString(getPort()));
-    if (proxy.getSecret() != null) {
-      putEnvironmentVariable("AP_HANDSHAKE", getSecret());
-    }
-    putAllEnvironmentVariables(interpreter.getEnvironmentVariables());
-  }
-
-  protected void setCommand(String command) {
-    mCommand = command;
-  }
-
-  public Interpreter getInterpreter() {
-    return mInterpreter;
-  }
-
-  public String getHost() {
-    String result = mProxy.getAddress().getHostName();
-    if (result.equals("0.0.0.0")) { // Wildcard.
-      try {
-        return SimpleServer.getPublicInetAddress().getHostName();
-      } catch (UnknownHostException e) {
-        Log.i("public address", e);
-        e.printStackTrace();
-      } catch (SocketException e) {
-        Log.i("public address", e);
-      }
-    }
-    return result;
-  }
-
-  public int getPort() {
-    return mProxy.getAddress().getPort();
-  }
-
-  public InetSocketAddress getAddress() {
-    return mProxy.getAddress();
-  }
-
-  public String getSecret() {
-    return mProxy.getSecret();
-  }
-
-  public RpcReceiverManagerFactory getRpcReceiverManagerFactory() {
-    return mProxy.getRpcReceiverManagerFactory();
-  }
-
-  @Override
-  public void start(final Runnable shutdownHook) {
-    Analytics.track(mInterpreter.getName());
-    // NOTE(damonkohler): String.isEmpty() doesn't work on Cupcake.
-    if (!mCommand.equals("")) {
-      addArgument(mCommand);
-    }
-    super.start(shutdownHook);
-  }
-
-  @Override
-  public void kill() {
-    super.kill();
-    mProxy.shutdown();
-  }
-
-  @Override
-  public String getWorkingDirectory() {
-    return InterpreterConstants.SDCARD_SL4A_ROOT;
-  }
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/interpreter/InterpreterPropertyNames.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/interpreter/InterpreterPropertyNames.java
deleted file mode 100644
index 33010ff9..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/interpreter/InterpreterPropertyNames.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (C) 2010 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.
- */
-
-package org.qpython.qsl4a.qsl4a.interpreter;
-
-/**
- * A collection of {@link String} keys for querying an InterpreterProvider.
- * 
- * @author Alexey Reznichenko (alexey.reznichenko@gmail.com)
- */
-public interface InterpreterPropertyNames {
-
-  /**
-   * Unique name of the interpreter.
-   */
-  public static final String NAME = "name";
-
-  /**
-   * Display name of the interpreter.
-   */
-  public static final String NICE_NAME = "niceName";
-
-  /**
-   * Supported script file extension.
-   */
-  public static final String EXTENSION = "extension";
-
-  /**
-   * Absolute path of the interpreter executable.
-   */
-  public static final String BINARY = "binary";
-
-  /**
-   * Final argument to interpreter binary when running the interpreter interactively.
-   */
-  public static final String INTERACTIVE_COMMAND = "interactiveCommand";
-
-  /**
-   * Final argument to interpreter binary when running a script.
-   */
-  public static final String SCRIPT_COMMAND = "scriptCommand";
-
-  /**
-   * Interpreter interactive mode flag.
-   */
-  public static final String HAS_INTERACTIVE_MODE = "hasInteractiveMode";
-
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/interpreter/InterpreterUtils.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/interpreter/InterpreterUtils.java
deleted file mode 100644
index 47804f99..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/interpreter/InterpreterUtils.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2010 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.
- */
-
-package org.qpython.qsl4a.qsl4a.interpreter;
-
-import android.content.Context;
-
-import java.io.File;
-
-public class InterpreterUtils {
-
-  private InterpreterUtils() {
-    // Utility class
-  }
-
-  public static File getInterpreterRoot(Context context) {
-    return context.getFilesDir();
-  }
-
-  public static File getInterpreterRoot(Context context, String interpreterName) {
-    return new File(getInterpreterRoot(context), interpreterName);
-  }
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/interpreter/MyInterpreter.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/interpreter/MyInterpreter.java
deleted file mode 100644
index 59fdb53b..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/interpreter/MyInterpreter.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2010 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.
- */
-
-package org.qpython.qsl4a.qsl4a.interpreter;
-
-import java.util.List;
-
-/**
- * Wrapper for the Interpreter class.
- * 
- * Workaround for the default access modifier on the getArguments() method
- * in the Interpreter class
- */
-public class MyInterpreter {
-	private Interpreter interpreter;
-
-	public MyInterpreter(Interpreter interpreter){
-		this.interpreter = interpreter;
-	}
-
-	public Interpreter getInterpreter() {
-		return this.interpreter;
-	}
-
-	public List<String> getArguments() {
-		return interpreter.getArguments();
-	}
-}
\ No newline at end of file
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/interpreter/html/HtmlActivityTask.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/interpreter/html/HtmlActivityTask.java
deleted file mode 100644
index 198f2271..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/interpreter/html/HtmlActivityTask.java
+++ /dev/null
@@ -1,384 +0,0 @@
-/*
- * Copyright (C) 2010 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.
- */
-
-package org.qpython.qsl4a.qsl4a.interpreter.html;
-
-import android.annotation.SuppressLint;
-import android.app.Activity;
-import android.content.res.Resources;
-import android.graphics.Bitmap;
-import android.graphics.drawable.BitmapDrawable;
-import android.net.Uri;
-import android.view.ContextMenu;
-import android.view.ContextMenu.ContextMenuInfo;
-import android.view.Menu;
-import android.view.View;
-import android.view.Window;
-import android.webkit.JsPromptResult;
-import android.webkit.JsResult;
-import android.webkit.WebChromeClient;
-import android.webkit.WebView;
-import android.webkit.WebViewClient;
-
-import org.qpython.qsl4a.qsl4a.FileUtils;
-import org.qpython.qsl4a.qsl4a.Log;
-import org.qpython.qsl4a.qsl4a.SingleThreadExecutor;
-import org.qpython.qsl4a.qsl4a.event.Event;
-import org.qpython.qsl4a.qsl4a.facade.EventFacade;
-import org.qpython.qsl4a.qsl4a.facade.ui.UiFacade;
-import org.qpython.qsl4a.qsl4a.future.FutureActivityTask;
-import org.qpython.qsl4a.qsl4a.interpreter.InterpreterConstants;
-import org.qpython.qsl4a.qsl4a.jsonrpc.JsonBuilder;
-import org.qpython.qsl4a.qsl4a.jsonrpc.JsonRpcResult;
-import org.qpython.qsl4a.qsl4a.jsonrpc.RpcReceiver;
-import org.qpython.qsl4a.qsl4a.jsonrpc.RpcReceiverManager;
-import org.qpython.qsl4a.qsl4a.rpc.MethodDescriptor;
-import org.qpython.qsl4a.qsl4a.rpc.RpcError;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ExecutorService;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-/**
- * @author Alexey Reznichenko (alexey.reznichenko@gmail.com)
- */
-public class HtmlActivityTask extends FutureActivityTask<Void> {
-
-  private static final String HTTP = "http";
-  private static final String ANDROID_PROTOTYPE_JS =
-      "Android.prototype.%1$s = function(var_args) { "
-          + "return this._call(\"%1$s\", Array.prototype.slice.call(arguments)); };";
-
-  private static final String PREFIX = "file://";
-  private static final String BASE_URL = PREFIX + InterpreterConstants.SCRIPTS_ROOT;
-
-  private final RpcReceiverManager mReceiverManager;
-  private final String mJsonSource;
-  private final String mAndroidJsSource;
-  private final String mAPIWrapperSource;
-  private final String mUrl;
-  private final JavaScriptWrapper mWrapper;
-  private final HtmlEventObserver mObserver;
-  private final UiFacade mUiFacade;
-  private ChromeClient mChromeClient;
-  private WebView mView;
-  private MyWebViewClient mWebViewClient;
-  private static HtmlActivityTask reference;
-  private boolean mDestroyManager;
-
-  public HtmlActivityTask(RpcReceiverManager manager, String androidJsSource, String jsonSource,
-      String url, boolean destroyManager) {
-    reference = this;
-    mReceiverManager = manager;
-    mJsonSource = jsonSource;
-    mAndroidJsSource = androidJsSource;
-    mAPIWrapperSource = generateAPIWrapper();
-    mWrapper = new JavaScriptWrapper();
-    mObserver = new HtmlEventObserver();
-    mReceiverManager.getReceiver(EventFacade.class).addGlobalEventObserver(mObserver);
-    mUiFacade = mReceiverManager.getReceiver(UiFacade.class);
-    mUrl = url;
-    mDestroyManager = destroyManager;
-  }
-
-  public RpcReceiverManager getRpcReceiverManager() {
-    return mReceiverManager;
-  }
-
-  /*
-   * New WebviewClient
-   */
-  private class MyWebViewClient extends WebViewClient {
-    @Override
-    public boolean shouldOverrideUrlLoading(WebView view, String url) {
-      /*
-       * if (Uri.parse(url).getHost().equals("www.example.com")) { // This is my web site, so do not
-       * override; let my WebView load the page return false; } // Otherwise, the link is not for a
-       * page on my site, so launch another Activity that handles URLs Intent intent = new
-       * Intent(Intent.ACTION_VIEW, Uri.parse(url)); startActivity(intent);
-       */
-      if (!HTTP.equals(Uri.parse(url).getScheme())) {
-        String source = null;
-        try {
-          source = FileUtils.readToString(new File(Uri.parse(url).getPath()));
-        } catch (IOException e) {
-          throw new RuntimeException(e);
-        }
-        source =
-            "<script>" + mJsonSource + "</script>" + "<script>" + mAndroidJsSource + "</script>"
-                + "<script>" + mAPIWrapperSource + "</script>" + source;
-        mView.loadDataWithBaseURL(BASE_URL, source, "text/html", "utf-8", null);
-      } else {
-        mView.loadUrl(url);
-      }
-      return true;
-    }
-  }
-
-  @SuppressLint("SetJavaScriptEnabled")
-@Override
-  public void onCreate() {
-    mView = new WebView(getActivity());
-    mView.setId(1);
-    mView.getSettings().setJavaScriptEnabled(true);
-    mView.addJavascriptInterface(mWrapper, "_rpc_wrapper");
-    mView.addJavascriptInterface(new Object() {
-
-      @SuppressWarnings("unused")
-      public void register(String event, int id) {
-        mObserver.register(event, id);
-      }
-    }, "_callback_wrapper");
-
-    getActivity().setContentView(mView);
-    mView.setOnCreateContextMenuListener(getActivity());
-    mChromeClient = new ChromeClient(getActivity());
-    mWebViewClient = new MyWebViewClient();
-    mView.setWebChromeClient(mChromeClient);
-    mView.setWebViewClient(mWebViewClient);
-    mView.loadUrl("javascript:" + mJsonSource);
-    mView.loadUrl("javascript:" + mAndroidJsSource);
-    mView.loadUrl("javascript:" + mAPIWrapperSource);
-    load();
-  }
-
-  private void load() {
-    if (!HTTP.equals(Uri.parse(mUrl).getScheme())) {
-      String source = null;
-      try {
-        source = FileUtils.readToString(new File(Uri.parse(mUrl).getPath()));
-      } catch (IOException e) {
-        throw new RuntimeException(e);
-      }
-      mView.loadDataWithBaseURL(BASE_URL, source, "text/html", "utf-8", null);
-    } else {
-      mView.loadUrl(mUrl);
-    }
-  }
-
-  @Override
-  public void onDestroy() {
-    mReceiverManager.getReceiver(EventFacade.class).removeEventObserver(mObserver);
-    if (mDestroyManager) {
-      mReceiverManager.shutdown();
-    }
-    mView.destroy();
-    mView = null;
-    reference = null;
-    setResult(null);
-  }
-
-  public static void shutdown() {
-    if (HtmlActivityTask.reference != null) {
-      HtmlActivityTask.reference.finish();
-    }
-  }
-
-  @Override
-  public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) {
-    mUiFacade.onCreateContextMenu(menu, v, menuInfo);
-  }
-
-  @Override
-  public boolean onPrepareOptionsMenu(Menu menu) {
-    return mUiFacade.onPrepareOptionsMenu(menu);
-  }
-
-  private String generateAPIWrapper() {
-    StringBuilder wrapper = new StringBuilder();
-    for (Class<? extends RpcReceiver> clazz : mReceiverManager.getRpcReceiverClasses()) {
-      for (MethodDescriptor rpc : MethodDescriptor.collectFrom(clazz)) {
-        wrapper.append(String.format(ANDROID_PROTOTYPE_JS, rpc.getName()));
-      }
-    }
-    return wrapper.toString();
-  }
-
-  private class JavaScriptWrapper {
-    @SuppressWarnings("unused")
-    public String call(String data) throws JSONException {
-      Log.v("Received: " + data);
-      JSONObject request = new JSONObject(data);
-      int id = request.getInt("id");
-      String method = request.getString("method");
-      JSONArray params = request.getJSONArray("params");
-      MethodDescriptor rpc = mReceiverManager.getMethodDescriptor(method);
-      if (rpc == null) {
-        return JsonRpcResult.error(id, new RpcError("Unknown RPC.")).toString();
-      }
-      try {
-        return JsonRpcResult.result(id, rpc.invoke(mReceiverManager, params)).toString();
-      } catch (Throwable t) {
-        Log.e("Invocation error.", t);
-        return JsonRpcResult.error(id, t).toString();
-      }
-    }
-
-    @SuppressWarnings("unused")
-    public void dismiss() {
-      Activity parent = getActivity();
-      parent.finish();
-    }
-  }
-
-  private class HtmlEventObserver implements EventFacade.EventObserver {
-    private Map<String, Set<Integer>> mEventMap = new HashMap<String, Set<Integer>>();
-
-    public void register(String eventName, Integer id) {
-      if (mEventMap.containsKey(eventName)) {
-        mEventMap.get(eventName).add(id);
-      } else {
-        Set<Integer> idSet = new HashSet<Integer>();
-        idSet.add(id);
-        mEventMap.put(eventName, idSet);
-      }
-    }
-
-    @Override
-    public void onEventReceived(Event event) {
-      final JSONObject json = new JSONObject();
-      try {
-        json.put("data", JsonBuilder.build(event.getData()));
-      } catch (JSONException e) {
-        Log.e(e);
-      }
-      if (mEventMap.containsKey(event.getName())) {
-        for (final Integer id : mEventMap.get(event.getName())) {
-          getActivity().runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-              mView.loadUrl(String.format("javascript:droid._callback(%d, %s);", id, json));
-            }
-          });
-        }
-      }
-    }
-
-    @SuppressWarnings("unused")
-    public void dismiss() {
-      Activity parent = getActivity();
-      parent.finish();
-    }
-  }
-
-  private class ChromeClient extends WebChromeClient {
-    private final static String JS_TITLE = "JavaScript Dialog";
-
-    private final Activity mActivity;
-    private final Resources mResources;
-    private final ExecutorService mmExecutor;
-
-    public ChromeClient(Activity activity) {
-      mActivity = activity;
-      mResources = mActivity.getResources();
-      mmExecutor = new SingleThreadExecutor();
-    }
-
-    @Override
-    public void onReceivedTitle(WebView view, String title) {
-      mActivity.setTitle(title);
-    }
-
-    @SuppressWarnings("deprecation")
-	@Override
-    public void onReceivedIcon(WebView view, Bitmap icon) {
-      mActivity.getWindow().requestFeature(Window.FEATURE_RIGHT_ICON);
-      mActivity.getWindow().setFeatureDrawable(Window.FEATURE_RIGHT_ICON, new BitmapDrawable(icon));
-    }
-
-    @Override
-    public boolean onJsAlert(WebView view, String url, String message, final JsResult result) {
-      final UiFacade uiFacade = mReceiverManager.getReceiver(UiFacade.class);
-      uiFacade.dialogCreateAlert(JS_TITLE, message);
-      uiFacade.dialogSetPositiveButtonText(mResources.getString(android.R.string.ok));
-
-      mmExecutor.execute(new Runnable() {
-
-        @Override
-        public void run() {
-          try {
-            uiFacade.dialogShow();
-          } catch (InterruptedException e) {
-            throw new RuntimeException(e);
-          }
-          uiFacade.dialogGetResponse();
-          result.confirm();
-        }
-      });
-      return true;
-    }
-
-    @SuppressWarnings("unchecked")
-    @Override
-    public boolean onJsConfirm(WebView view, String url, String message, final JsResult result) {
-      final UiFacade uiFacade = mReceiverManager.getReceiver(UiFacade.class);
-      uiFacade.dialogCreateAlert(JS_TITLE, message);
-      uiFacade.dialogSetPositiveButtonText(mResources.getString(android.R.string.ok));
-      uiFacade.dialogSetNegativeButtonText(mResources.getString(android.R.string.cancel));
-
-      mmExecutor.execute(new Runnable() {
-
-        @Override
-        public void run() {
-          try {
-            uiFacade.dialogShow();
-          } catch (InterruptedException e) {
-            throw new RuntimeException(e);
-          }
-          Map<String, Object> mResultMap = (Map<String, Object>) uiFacade.dialogGetResponse();
-          if ("positive".equals(mResultMap.get("which"))) {
-            result.confirm();
-          } else {
-            result.cancel();
-          }
-        }
-      });
-
-      return true;
-    }
-
-    @Override
-    public boolean onJsPrompt(WebView view, String url, final String message,
-        final String defaultValue, final JsPromptResult result) {
-      final UiFacade uiFacade = mReceiverManager.getReceiver(UiFacade.class);
-      mmExecutor.execute(new Runnable() {
-        @Override
-        public void run() {
-          String value = null;
-          try {
-            value = uiFacade.dialogGetInput(JS_TITLE, message, defaultValue);
-          } catch (InterruptedException e) {
-            throw new RuntimeException(e);
-          }
-          if (value != null) {
-            result.confirm(value);
-          } else {
-            result.cancel();
-          }
-        }
-      });
-      return true;
-    }
-  }
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/interpreter/html/HtmlInterpreter.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/interpreter/html/HtmlInterpreter.java
deleted file mode 100644
index bee8a86e..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/interpreter/html/HtmlInterpreter.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright (C) 2010 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.
- */
-
-package org.qpython.qsl4a.qsl4a.interpreter.html;
-
-import android.content.Context;
-
-import org.qpython.qsl4a.qsl4a.FileUtils;
-import org.qpython.qsl4a.qsl4a.interpreter.Interpreter;
-import org.qpython.qsl4a.qsl4a.language.HtmlLanguage;
-
-import java.io.IOException;
-
-public class HtmlInterpreter extends Interpreter {
-
-  public static final String HTML = "html";
-  public static final String HTML_EXTENSION = ".html";
-
-  public static final String JSON_FILE = "json2.js";
-  public static final String ANDROID_JS_FILE = "android.js";
-  public static final String HTML_NICE_NAME = "HTML and JavaScript";
-
-  private final String mJson;
-  private final String mAndroidJs;
-
-  public HtmlInterpreter(Context context) throws IOException {
-    setExtension(HTML_EXTENSION);
-    setName(HTML);
-    setNiceName(HTML_NICE_NAME);
-    setInteractiveCommand("");
-    setScriptCommand("%s");
-    setLanguage(new HtmlLanguage());
-    setHasInteractiveMode(false);
-    mJson = FileUtils.readFromAssetsFile(context, JSON_FILE);
-    mAndroidJs = FileUtils.readFromAssetsFile(context, ANDROID_JS_FILE);
-  }
-
-  public boolean hasInterpreterArchive() {
-    return false;
-  }
-
-  public boolean hasExtrasArchive() {
-    return false;
-  }
-
-  public boolean hasScriptsArchive() {
-    return false;
-  }
-
-  public int getVersion() {
-    return 0;
-  }
-
-  @Override
-  public boolean isUninstallable() {
-    return false;
-  }
-
-  @Override
-  public boolean isInstalled() {
-    return true;
-  }
-
-  public String getJsonSource() {
-    return mJson;
-  }
-
-  public String getAndroidJsSource() {
-    return mAndroidJs;
-  }
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/interpreter/shell/ShellInterpreter.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/interpreter/shell/ShellInterpreter.java
deleted file mode 100644
index 4fb3877c..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/interpreter/shell/ShellInterpreter.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (C) 2009 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.
- */
-
-package org.qpython.qsl4a.qsl4a.interpreter.shell;
-
-import org.qpython.qsl4a.qsl4a.interpreter.Interpreter;
-import org.qpython.qsl4a.qsl4a.language.ShellLanguage;
-
-import java.io.File;
-
-/**
- * Represents the shell.
- * 
- * @author Damon Kohler (damonkohler@gmail.com)
- */
-public class ShellInterpreter extends Interpreter {
-  private final static String SHELL_BIN = "/system/bin/sh";
-
-  public ShellInterpreter() {
-    setExtension(".sh");
-    setName("sh");
-    setNiceName("Shell");
-    setBinary(new File(SHELL_BIN));
-    setInteractiveCommand("");
-    setScriptCommand("%s");
-    setLanguage(new ShellLanguage());
-    setHasInteractiveMode(true);
-  }
-
-  public boolean hasInterpreterArchive() {
-    return false;
-  }
-
-  public boolean hasExtrasArchive() {
-    return false;
-  }
-
-  public boolean hasScriptsArchive() {
-    return false;
-  }
-
-  public int getVersion() {
-    return 0;
-  }
-
-  @Override
-  public boolean isUninstallable() {
-    return false;
-  }
-
-  @Override
-  public boolean isInstalled() {
-    return true;
-  }
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/jsonrpc/JsonBuilder.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/jsonrpc/JsonBuilder.java
deleted file mode 100644
index 9d019441..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/jsonrpc/JsonBuilder.java
+++ /dev/null
@@ -1,301 +0,0 @@
-/*
- * Copyright (C) 2010 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.
- */
-
-package org.qpython.qsl4a.qsl4a.jsonrpc;
-
-import android.content.ComponentName;
-import android.content.Intent;
-import android.location.Address;
-import android.location.Location;
-import android.net.wifi.ScanResult;
-import android.net.wifi.WifiInfo;
-import android.os.Bundle;
-import android.telephony.CellLocation;
-import android.telephony.NeighboringCellInfo;
-import android.telephony.gsm.GsmCellLocation;
-
-import org.qpython.qsl4a.codec.Base64Codec;
-import org.qpython.qsl4a.qsl4a.event.Event;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.net.InetSocketAddress;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-
-public class JsonBuilder {
-
-    private JsonBuilder() {
-        // This is a utility class.
-    }
-
-    @SuppressWarnings("unchecked")
-    public static Object build(Object data) throws JSONException {
-        if (data == null) {
-            return JSONObject.NULL;
-        }
-        if (data instanceof Integer) {
-            return data;
-        }
-        if (data instanceof Float) {
-            return data;
-        }
-        if (data instanceof Double) {
-            return data;
-        }
-        if (data instanceof Long) {
-            return data;
-        }
-        if (data instanceof String) {
-            return data;
-        }
-        if (data instanceof Boolean) {
-            return data;
-        }
-        if (data instanceof JSONObject) {
-            return data;
-        }
-        if (data instanceof JSONArray) {
-            return data;
-        }
-        if (data instanceof Set<?>) {
-            List<Object> items = new ArrayList<Object>((Set<?>) data);
-            return buildJsonList(items);
-        }
-        if (data instanceof List<?>) {
-            return buildJsonList((List<?>) data);
-        }
-        if (data instanceof Address) {
-            return buildJsonAddress((Address) data);
-        }
-        if (data instanceof Location) {
-            return buildJsonLocation((Location) data);
-        }
-        if (data instanceof Bundle) {
-            return buildJsonBundle((Bundle) data);
-        }
-        if (data instanceof Intent) {
-            return buildJsonIntent((Intent) data);
-        }
-        if (data instanceof Event) {
-            return buildJsonEvent((Event) data);
-        }
-        if (data instanceof Map<?, ?>) {
-            // TODO(damonkohler): I would like to make this a checked cast if possible.
-            return buildJsonMap((Map<String, ?>) data);
-        }
-        if (data instanceof ScanResult) {
-            return buildJsonScanResult((ScanResult) data);
-        }
-        if (data instanceof CellLocation) {
-            return buildJsonCellLocation((CellLocation) data);
-        }
-        if (data instanceof WifiInfo) {
-            return buildJsonWifiInfo((WifiInfo) data);
-        }
-        if (data instanceof NeighboringCellInfo) {
-            return buildNeighboringCellInfo((NeighboringCellInfo) data);
-        }
-        if (data instanceof InetSocketAddress) {
-            return buildInetSocketAddress((InetSocketAddress) data);
-        }
-        if (data instanceof byte[]) {
-            return Base64Codec.encodeBase64((byte[]) data);
-        }
-        if (data instanceof Object[]) {
-            return buildJSONArray((Object[]) data);
-        }
-        return data.toString();
-        // throw new JSONException("Failed to build JSON result. " + data.getClass().getName());
-    }
-
-    private static JSONArray buildJSONArray(Object[] data) throws JSONException {
-        JSONArray result = new JSONArray();
-        for (Object o : data) {
-            result.put(build(o));
-        }
-        return result;
-    }
-
-    private static Object buildInetSocketAddress(InetSocketAddress data) {
-        JSONArray address = new JSONArray();
-        address.put(data.getHostName());
-        address.put(data.getPort());
-        return address;
-    }
-
-    private static <T> JSONArray buildJsonList(final List<T> list) throws JSONException {
-        JSONArray result = new JSONArray();
-        for (T item : list) {
-            result.put(build(item));
-        }
-        return result;
-    }
-
-    private static JSONObject buildJsonAddress(Address address) throws JSONException {
-        JSONObject result = new JSONObject();
-        result.put("admin_area", address.getAdminArea());
-        result.put("country_code", address.getCountryCode());
-        result.put("country_name", address.getCountryName());
-        result.put("feature_name", address.getFeatureName());
-        result.put("phone", address.getPhone());
-        result.put("locality", address.getLocality());
-        result.put("postal_code", address.getPostalCode());
-        result.put("sub_admin_area", address.getSubAdminArea());
-        result.put("thoroughfare", address.getThoroughfare());
-        result.put("url", address.getUrl());
-        return result;
-    }
-
-    private static JSONObject buildJsonLocation(Location location) throws JSONException {
-        JSONObject result = new JSONObject();
-        result.put("altitude", location.getAltitude());
-        result.put("latitude", location.getLatitude());
-        result.put("longitude", location.getLongitude());
-        result.put("time", location.getTime());
-        result.put("accuracy", location.getAccuracy());
-        result.put("speed", location.getSpeed());
-        result.put("provider", location.getProvider());
-        result.put("bearing", location.getBearing());
-        return result;
-    }
-
-    private static JSONObject buildJsonBundle(Bundle bundle) throws JSONException {
-        JSONObject result = new JSONObject();
-        for (String key : bundle.keySet()) {
-            result.put(key, build(bundle.get(key)));
-        }
-        return result;
-    }
-
-    private static JSONObject buildJsonIntent(Intent data) throws JSONException {
-        JSONObject result = new JSONObject();
-        result.put("data", data.getDataString());
-        result.put("type", data.getType());
-        result.put("extras", build(data.getExtras()));
-        result.put("categories", build(data.getCategories()));
-        result.put("action", data.getAction());
-        ComponentName component = data.getComponent();
-        if (component != null) {
-            result.put("packagename", component.getPackageName());
-            result.put("classname", component.getClassName());
-        }
-        result.put("flags", data.getFlags());
-        return result;
-    }
-
-    private static JSONObject buildJsonEvent(Event event) throws JSONException {
-        JSONObject result = new JSONObject();
-        result.put("name", event.getName());
-        result.put("data", build(event.getData()));
-        result.put("time", event.getCreationTime());
-        return result;
-    }
-
-    private static JSONObject buildJsonMap(Map<String, ?> map) throws JSONException {
-        JSONObject result = new JSONObject();
-        for (Entry<String, ?> entry : map.entrySet()) {
-            result.put(entry.getKey(), build(entry.getValue()));
-        }
-        return result;
-    }
-
-    private static JSONObject buildJsonScanResult(ScanResult scanResult) throws JSONException {
-        JSONObject result = new JSONObject();
-        result.put("bssid", scanResult.BSSID);
-        result.put("ssid", scanResult.SSID);
-        result.put("frequency", scanResult.frequency);
-        result.put("level", scanResult.level);
-        result.put("capabilities", scanResult.capabilities);
-        return result;
-    }
-
-    private static JSONObject buildJsonCellLocation(CellLocation cellLocation) throws JSONException {
-        JSONObject result = new JSONObject();
-        if (cellLocation instanceof GsmCellLocation) {
-            GsmCellLocation location = (GsmCellLocation) cellLocation;
-            result.put("lac", location.getLac());
-            result.put("cid", location.getCid());
-        }
-        // TODO(damonkohler): Add support for CdmaCellLocation. Not supported until API level 5.
-        return result;
-    }
-
-    private static JSONObject buildJsonWifiInfo(WifiInfo data) throws JSONException {
-        JSONObject result = new JSONObject();
-        result.put("hidden_ssid", data.getHiddenSSID());
-        result.put("ip_address", data.getIpAddress());
-        result.put("link_speed", data.getLinkSpeed());
-        result.put("network_id", data.getNetworkId());
-        result.put("rssi", data.getRssi());
-        result.put("bssid", data.getBSSID());
-        result.put("mac_address", data.getMacAddress());
-        result.put("ssid", data.getSSID());
-        String supplicantState = "";
-        switch (data.getSupplicantState()) {
-            case ASSOCIATED:
-                supplicantState = "associated";
-                break;
-            case ASSOCIATING:
-                supplicantState = "associating";
-                break;
-            case COMPLETED:
-                supplicantState = "completed";
-                break;
-            case DISCONNECTED:
-                supplicantState = "disconnected";
-                break;
-            case DORMANT:
-                supplicantState = "dormant";
-                break;
-            case FOUR_WAY_HANDSHAKE:
-                supplicantState = "four_way_handshake";
-                break;
-            case GROUP_HANDSHAKE:
-                supplicantState = "group_handshake";
-                break;
-            case INACTIVE:
-                supplicantState = "inactive";
-                break;
-            case INVALID:
-                supplicantState = "invalid";
-                break;
-            case SCANNING:
-                supplicantState = "scanning";
-                break;
-            case UNINITIALIZED:
-                supplicantState = "uninitialized";
-                break;
-            default:
-                supplicantState = null;
-        }
-        result.put("supplicant_state", build(supplicantState));
-        return result;
-    }
-
-    private static JSONObject buildNeighboringCellInfo(NeighboringCellInfo data) throws JSONException {
-        // TODO(damonkohler): Additional information available at API level 5.
-        JSONObject result = new JSONObject();
-        result.put("cid", data.getCid());
-        result.put("rssi", data.getRssi());
-        return result;
-    }
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/jsonrpc/JsonRpcResult.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/jsonrpc/JsonRpcResult.java
deleted file mode 100644
index f049de90..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/jsonrpc/JsonRpcResult.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (C) 2009 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.
- */
-
-package org.qpython.qsl4a.qsl4a.jsonrpc;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-/**
- * Represents a JSON RPC result.
- * 
- * @see http://json-rpc.org/wiki/specification
- * 
- * @author Damon Kohler (damonkohler@gmail.com)
- */
-public class JsonRpcResult {
-
-  private JsonRpcResult() {
-    // Utility class.
-  }
-
-  public static JSONObject empty(int id) throws JSONException {
-    JSONObject json = new JSONObject();
-    json.put("id", id);
-    json.put("result", JSONObject.NULL);
-    json.put("error", JSONObject.NULL);
-    return json;
-  }
-
-  public static JSONObject result(int id, Object data) throws JSONException {
-    JSONObject json = new JSONObject();
-    json.put("id", id);
-    json.put("result", JsonBuilder.build(data));
-    json.put("error", JSONObject.NULL);
-    return json;
-  }
-
-  public static JSONObject error(int id, Throwable t) throws JSONException {
-    JSONObject json = new JSONObject();
-    json.put("id", id);
-    json.put("result", JSONObject.NULL);
-    json.put("error", t.toString());
-    return json;
-  }
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/jsonrpc/JsonRpcServer.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/jsonrpc/JsonRpcServer.java
deleted file mode 100644
index a1198ff5..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/jsonrpc/JsonRpcServer.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Copyright (C) 2009 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.
- */
-
-package org.qpython.qsl4a.qsl4a.jsonrpc;
-
-import org.qpython.qsl4a.qsl4a.Log;
-import org.qpython.qsl4a.qsl4a.SimpleServer;
-import org.qpython.qsl4a.qsl4a.rpc.MethodDescriptor;
-import org.qpython.qsl4a.qsl4a.rpc.RpcError;
-
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.io.PrintWriter;
-import java.net.Socket;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-/**
- * A JSON RPC server that forwards RPC calls to a specified receiver object.
- * 
- * @author Damon Kohler (damonkohler@gmail.com)
- */
-public class JsonRpcServer extends SimpleServer {
-
-  private final RpcReceiverManagerFactory mRpcReceiverManagerFactory;
-  private final String mHandshake;
-
-  /**
-   * Construct a {@link JsonRpcServer} connected to the provided {@link RpcReceiverManager}.
-   * 
-   * @param managerFactory
-   *          the {@link RpcReceiverManager} to register with the server
-   * @param handshake
-   *          the secret handshake required for authorization to use this server
-   */
-  public JsonRpcServer(RpcReceiverManagerFactory managerFactory, String handshake) {
-    mHandshake = handshake;
-    mRpcReceiverManagerFactory = managerFactory;
-  }
-
-  @Override
-  public void shutdown() {
-    super.shutdown();
-    // Notify all RPC receiving objects. They may have to clean up some of their state.
-    for (RpcReceiverManager manager : mRpcReceiverManagerFactory.getRpcReceiverManagers()) {
-      manager.shutdown();
-    }
-  }
-
-  @Override
-  protected void handleConnection(Socket socket) throws Exception {
-    RpcReceiverManager receiverManager = mRpcReceiverManagerFactory.create();
-    BufferedReader reader =
-        new BufferedReader(new InputStreamReader(socket.getInputStream()), 8192);
-    PrintWriter writer = new PrintWriter(socket.getOutputStream(), true);
-    boolean passedAuthentication = false;
-    String data;
-    while ((data = reader.readLine()) != null) {
-      Log.v("Received: " + data);
-      JSONObject request = new JSONObject(data);
-      int id = request.getInt("id");
-      String method = request.getString("method");
-      JSONArray params = request.getJSONArray("params");
-
-      // First RPC must be _authenticate if a handshake was specified.
-      if (!passedAuthentication && mHandshake != null) {
-        if (!checkHandshake(method, params)) {
-          SecurityException exception = new SecurityException("Authentication failed!");
-          send(writer, JsonRpcResult.error(id, exception));
-          shutdown();
-          throw exception;
-        }
-        passedAuthentication = true;
-        send(writer, JsonRpcResult.result(id, true));
-        continue;
-      }
-
-      MethodDescriptor rpc = receiverManager.getMethodDescriptor(method);
-      if (rpc == null) {
-        send(writer, JsonRpcResult.error(id, new RpcError("Unknown RPC.")));
-        continue;
-      }
-      try {
-        send(writer, JsonRpcResult.result(id, rpc.invoke(receiverManager, params)));
-      } catch (Throwable t) {
-        Log.e("Invocation error.", t);
-        send(writer, JsonRpcResult.error(id, t));
-      }
-    }
-  }
-
-  private boolean checkHandshake(String method, JSONArray params) throws JSONException {
-    if (!method.equals("_authenticate") || !mHandshake.equals(params.getString(0))) {
-      return false;
-    }
-    return true;
-  }
-
-  private void send(PrintWriter writer, JSONObject result) {
-    writer.write(result + "\n");
-    writer.flush();
-    Log.v("Sent: " + result);
-  }
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/jsonrpc/RpcReceiver.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/jsonrpc/RpcReceiver.java
deleted file mode 100644
index 0b56d5d3..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/jsonrpc/RpcReceiver.java
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2010 Google Inc. All Rights Reserved.
-
-package org.qpython.qsl4a.qsl4a.jsonrpc;
-
-public abstract class RpcReceiver {
-
-  protected final RpcReceiverManager mManager;
-
-  public RpcReceiver(RpcReceiverManager manager) {
-    // To make reflection easier, we ensures that all the subclasses agree on this common
-    // constructor.
-    mManager = manager;
-  }
-
-  /** Invoked when the receiver is shut down. */
-  public abstract void shutdown();
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/jsonrpc/RpcReceiverManager.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/jsonrpc/RpcReceiverManager.java
deleted file mode 100644
index 5ad52663..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/jsonrpc/RpcReceiverManager.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright (C) 2010 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.
- */
-
-package org.qpython.qsl4a.qsl4a.jsonrpc;
-
-import org.qpython.qsl4a.qsl4a.Log;
-import org.qpython.qsl4a.qsl4a.rpc.MethodDescriptor;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-
-public abstract class RpcReceiverManager {
-
-  private final Map<Class<? extends RpcReceiver>, RpcReceiver> mReceivers;
-
-  /**
-   * A map of strings to known RPCs.
-   */
-  private final Map<String, MethodDescriptor> mKnownRpcs = new HashMap<String, MethodDescriptor>();
-
-  public RpcReceiverManager(Collection<Class<? extends RpcReceiver>> classList) {
-    mReceivers = new HashMap<Class<? extends RpcReceiver>, RpcReceiver>();
-    for (Class<? extends RpcReceiver> receiverClass : classList) {
-      mReceivers.put(receiverClass, null);
-      Collection<MethodDescriptor> methodList = MethodDescriptor.collectFrom(receiverClass);
-      for (MethodDescriptor m : methodList) {
-        if (mKnownRpcs.containsKey(m.getName())) {
-          // We already know an RPC of the same name. We don't catch this anywhere because this is a
-          // programming error.
-          throw new RuntimeException("An RPC with the name " + m.getName() + " is already known.");
-        }
-        mKnownRpcs.put(m.getName(), m);
-      }
-    }
-  }
-
-  public Collection<Class<? extends RpcReceiver>> getRpcReceiverClasses() {
-    return mReceivers.keySet();
-  }
-
-  private RpcReceiver get(Class<? extends RpcReceiver> clazz) {
-    RpcReceiver object = mReceivers.get(clazz);
-    if (object != null) {
-      return object;
-    }
-
-    Constructor<? extends RpcReceiver> constructor;
-    try {
-      constructor = clazz.getConstructor(getClass());
-      object = constructor.newInstance(this);
-      mReceivers.put(clazz, object);
-    } catch (Exception e) {
-      Log.e(e);
-    }
-
-    return object;
-  }
-
-  public <T extends RpcReceiver> T getReceiver(Class<T> clazz) {
-    RpcReceiver receiver = get(clazz);
-    return clazz.cast(receiver);
-  }
-
-  public MethodDescriptor getMethodDescriptor(String methodName) {
-    return mKnownRpcs.get(methodName);
-  }
-
-  public Object invoke(Class<? extends RpcReceiver> clazz, Method method, Object[] args)
-      throws Exception {
-    RpcReceiver object = get(clazz);
-    return method.invoke(object, args);
-  }
-
-  public void shutdown() {
-    for (RpcReceiver receiver : mReceivers.values()) {
-      if (receiver != null) {
-        receiver.shutdown();
-      }
-    }
-  }
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/jsonrpc/RpcReceiverManagerFactory.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/jsonrpc/RpcReceiverManagerFactory.java
deleted file mode 100644
index 486a006d..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/jsonrpc/RpcReceiverManagerFactory.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2010 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.
- */
-
-package org.qpython.qsl4a.qsl4a.jsonrpc;
-
-import java.util.List;
-
-public interface RpcReceiverManagerFactory {
-  public RpcReceiverManager create();
-
-  public List<RpcReceiverManager> getRpcReceiverManagers();
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/language/BeanShellLanguage.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/language/BeanShellLanguage.java
deleted file mode 100644
index 10d1c7f3..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/language/BeanShellLanguage.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright (C) 2010 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.
- */
-
-package org.qpython.qsl4a.qsl4a.language;
-
-
-import org.qpython.qsl4a.qsl4a.rpc.ParameterDescriptor;
-
-/**
- * Represents the BeanShell programming language.
- * 
- * @author igor.v.karp@gmail.com (Igor Karp)
- */
-public class BeanShellLanguage extends Language {
-
-  @Override
-  protected String getImportStatement() {
-    // FIXME(igor.v.karp): this is interpreter specific
-    return "source(\"/sdcard/com.googlecode.bshforandroid/extras/bsh/android.bsh\");\n";
-  }
-
-  @Override
-  protected String getRpcReceiverDeclaration(String rpcReceiver) {
-    return rpcReceiver + " = Android();\n";
-  }
-
-  @Override
-  protected String getMethodCallText(String receiver, String method,
-      ParameterDescriptor[] parameters) {
-    StringBuilder result =
-        new StringBuilder().append(getApplyReceiverText(receiver)).append(getApplyOperatorText())
-            .append(method);
-    if (parameters.length > 0) {
-      result.append(getLeftParametersText());
-    } else {
-      result.append(getQuote());
-    }
-    String separator = "";
-    for (ParameterDescriptor parameter : parameters) {
-      result.append(separator).append(getValueText(parameter));
-      separator = getParameterSeparator();
-    }
-    result.append(getRightParametersText());
-
-    return result.toString();
-  }
-
-  @Override
-  protected String getApplyOperatorText() {
-    return ".call(\"";
-  }
-
-  @Override
-  protected String getLeftParametersText() {
-    return "\", ";
-  }
-
-  @Override
-  protected String getRightParametersText() {
-    return ")";
-  }
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/language/HtmlLanguage.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/language/HtmlLanguage.java
deleted file mode 100644
index 93e5649a..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/language/HtmlLanguage.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (C) 2010 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.
- */
-
-package org.qpython.qsl4a.qsl4a.language;
-
-
-import org.qpython.qsl4a.qsl4a.rpc.ParameterDescriptor;
-
-public class HtmlLanguage extends Language {
-
-  /** Returns the Android package import statement. */
-  @Override
-  protected String getImportStatement() {
-    return "<html>\n<head>\n<script>";
-  }
-
-  @Override
-  protected String getRpcReceiverDeclaration(String rpcReceiver) {
-    return String.format("var %s = new Android();\n</script>\n</head>\n<body>\n\n</body>\n</html>",
-        rpcReceiver);
-  }
-
-  @Override
-  protected String getMethodCallText(String receiver, String method,
-      ParameterDescriptor[] parameters) {
-    StringBuilder result =
-        new StringBuilder().append(getApplyReceiverText(receiver)).append(getApplyOperatorText())
-            .append(method);
-    if (parameters.length > 0) {
-      result.append(getLeftParametersText());
-    } else {
-      result.append(getQuote());
-    }
-    String separator = "";
-    for (ParameterDescriptor parameter : parameters) {
-      result.append(separator).append(getValueText(parameter));
-      separator = getParameterSeparator();
-    }
-    result.append(getRightParametersText());
-
-    return result.toString();
-  }
-
-  @Override
-  protected String getApplyOperatorText() {
-    return ".call('";
-  }
-
-  @Override
-  protected String getLeftParametersText() {
-    return "', ";
-  }
-
-  @Override
-  protected String getRightParametersText() {
-    return ")";
-  }
-
-  @Override
-  protected String getQuote() {
-    return "'";
-  }
-
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/language/JavaScriptLanguage.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/language/JavaScriptLanguage.java
deleted file mode 100644
index 52f669b6..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/language/JavaScriptLanguage.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2010 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.
- */
-
-package org.qpython.qsl4a.qsl4a.language;
-
-/**
- * Represents the JavaScript programming language.
- * 
- * @author igor.v.karp@gmail.com (Igor Karp)
- */
-public class JavaScriptLanguage extends Language {
-
-  @Override
-  protected String getImportStatement() {
-    // FIXME(igor.v.karp): this is interpreter specific
-    return "load(\"/sdcard/com.googlecode.rhinoforandroid/extras/rhino/android.js\");\n";
-  }
-
-  @Override
-  protected String getRpcReceiverDeclaration(String rpcReceiver) {
-    return "var " + rpcReceiver + " = Android();\n";
-  }
-
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/language/Language.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/language/Language.java
deleted file mode 100644
index 1805b9ab..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/language/Language.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
- * Copyright (C) 2010 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.
- */
-
-package org.qpython.qsl4a.qsl4a.language;
-
-
-import org.qpython.qsl4a.qsl4a.rpc.MethodDescriptor;
-import org.qpython.qsl4a.qsl4a.rpc.ParameterDescriptor;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Represents the programming language supported by the SL4A.
- * 
- * @author igor.v.karp@gmail.com (Igor Karp)
- */
-public class Language {
-
-  private final static Map<Character, String> AUTO_CLOSE_MAP = buildAutoCloseMap('[', "[]", '{',
-      "{}", '(', "()", '\'', "''", '"', "\"\"");
-
-  /** Returns the initial template for newly created script. */
-  public String getContentTemplate() {
-    StringBuilder content = new StringBuilder(getImportStatement());
-    if (content.length() != 0) {
-      content.append('\n');
-    }
-    content.append(getRpcReceiverDeclaration(getDefaultRpcReceiver()));
-    return content.toString();
-  }
-
-  /** Returns the Android package import statement. */
-  protected String getImportStatement() {
-    return "";
-  }
-
-  /** Returns the RPC receiver declaration. */
-  protected String getRpcReceiverDeclaration(String rpcReceiver) {
-    return "";
-  }
-
-  /** Returns the default RPC receiver name. */
-  protected String getDefaultRpcReceiver() {
-    return "droid";
-  }
-
-  /**
-   * Returns the string containing opening and closing tokens if the input is an opening token.
-   * Returns {@code null} otherwise.
-   */
-  public String autoClose(char token) {
-    return AUTO_CLOSE_MAP.get(token);
-  }
-
-  /** Returns the RPC call text with given parameter values. */
-  public final String getRpcText(String content, MethodDescriptor rpc, String[] values) {
-    return getMethodCallText(getRpcReceiverName(content), rpc.getName(),
-        rpc.getParameterValues(values));
-  }
-
-  /** Returns the RPC receiver found in the given script. */
-  protected String getRpcReceiverName(String content) {
-    return getDefaultRpcReceiver();
-  }
-
-  /** Returns the method call text in the language. */
-  protected String getMethodCallText(String receiver, String method,
-      ParameterDescriptor[] parameters) {
-    StringBuilder result =
-        new StringBuilder().append(getApplyReceiverText(receiver)).append(getApplyOperatorText())
-            .append(method).append(getLeftParametersText());
-    String separator = "";
-    for (ParameterDescriptor parameter : parameters) {
-      result.append(separator).append(getValueText(parameter));
-      separator = getParameterSeparator();
-    }
-    result.append(getRightParametersText());
-
-    return result.toString();
-  }
-
-  /** Returns the apply receiver text. */
-  protected String getApplyReceiverText(String receiver) {
-    return receiver;
-  }
-
-  /** Returns the apply operator text. */
-  protected String getApplyOperatorText() {
-    return ".";
-  }
-
-  /** Returns the text to the left of the parameters. */
-  protected String getLeftParametersText() {
-    return "(";
-  }
-
-  /** Returns the text to the right of the parameters. */
-  protected String getRightParametersText() {
-    return ")";
-  }
-
-  /** Returns the parameter separator text. */
-  protected String getParameterSeparator() {
-    return ", ";
-  }
-
-  /** Returns the text of the quotation. */
-  protected String getQuote() {
-    return "\"";
-  }
-
-  /** Returns the text of the {@code null} value. */
-  protected String getNull() {
-    return "null";
-  }
-
-  /** Returns the text of the {{@code true} value. */
-  protected String getTrue() {
-    return "true";
-  }
-
-  /** Returns the text of the false value. */
-  protected String getFalse() {
-    return "false";
-  }
-
-  /** Returns the parameter value suitable for code generation. */
-  protected String getValueText(ParameterDescriptor parameter) {
-    if (parameter.getValue() == null) {
-      return getNullValueText();
-    } else if (parameter.getType().equals(String.class)) {
-      return getStringValueText(parameter.getValue());
-    } else if (parameter.getType().equals(Boolean.class)) {
-      return getBooleanValueText(parameter.getValue());
-    } else {
-      return parameter.getValue();
-    }
-  }
-
-  /** Returns the null value suitable for code generation. */
-  private String getNullValueText() {
-    return getNull();
-  }
-
-  /** Returns the string parameter value suitable for code generation. */
-  protected String getStringValueText(String value) {
-    // TODO(igorkarp): do not quote expressions once they could be detected.
-    return getQuote() + value + getQuote();
-  }
-
-  /** Returns the boolean parameter value suitable for code generation. */
-  protected String getBooleanValueText(String value) {
-    if (value.equals(Boolean.TRUE.toString())) {
-      return getTrue();
-    } else if (value.equals(Boolean.FALSE.toString())) {
-      return getFalse();
-    } else {
-      // If it is neither true nor false it is must be an expression.
-      return value;
-    }
-  }
-
-  private static Map<Character, String> buildAutoCloseMap(char c1, String s1, char c2, String s2,
-      char c3, String s3, char c4, String s4, char c5, String s5) {
-    Map<Character, String> map = new HashMap<Character, String>(5);
-    map.put(c1, s1);
-    map.put(c2, s2);
-    map.put(c3, s3);
-    map.put(c4, s4);
-    map.put(c5, s5);
-    return map;
-  }
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/language/LuaLanguage.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/language/LuaLanguage.java
deleted file mode 100644
index 4d98eb01..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/language/LuaLanguage.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2010 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.
- */
-
-package org.qpython.qsl4a.qsl4a.language;
-
-/**
- * Represents the Lua programming language.
- * 
- * @author igor.v.karp@gmail.com (Igor Karp)
- */
-public class LuaLanguage extends Language {
-
-  @Override
-  protected String getImportStatement() {
-    return "require \"android\"\n";
-  }
-
-  @Override
-  protected String getDefaultRpcReceiver() {
-    return "android";
-  }
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/language/PerlLanguage.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/language/PerlLanguage.java
deleted file mode 100644
index 6dfc02c1..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/language/PerlLanguage.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2010 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.
- */
-
-package org.qpython.qsl4a.qsl4a.language;
-
-/**
- * Represents the Perl programming language.
- * 
- * @author igor.v.karp@gmail.com (Igor Karp)
- */
-public class PerlLanguage extends Language {
-
-  @Override
-  protected String getImportStatement() {
-    return "use Android;\n";
-  }
-
-  @Override
-  protected String getRpcReceiverDeclaration(String rpcReceiver) {
-    return "my " + rpcReceiver + " = Android->new();\n";
-  }
-
-  @Override
-  protected String getDefaultRpcReceiver() {
-    return "$droid";
-  }
-
-  @Override
-  protected String getApplyOperatorText() {
-    return "->";
-  }
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/language/PhpLanguage.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/language/PhpLanguage.java
deleted file mode 100644
index cbce8e04..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/language/PhpLanguage.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2010 Irontec SL
- *
- * 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.
- */
-
-package org.qpython.qsl4a.qsl4a.language;
-
-/**
- * Represents the PHP programming language.
- * 
- * @author ivan@irontec.com (Ivan Mosquera Paulo)
- */
-public class PhpLanguage extends Language {
-
-  @Override
-  protected String getImportStatement() {
-    return "<?php\n\nrequire_once(\"Android.php\");";
-
-  }
-
-  @Override
-  protected String getRpcReceiverDeclaration(String rpcReceiver) {
-    return rpcReceiver + " = new Android();\n";
-  }
-
-  @Override
-  protected String getDefaultRpcReceiver() {
-    return "$droid";
-  }
-
-  @Override
-  protected String getApplyOperatorText() {
-    return "->";
-  }
-
-  @Override
-  protected String getQuote() {
-    return "'";
-  }
-
-}
\ No newline at end of file
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/language/PythonLanguage.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/language/PythonLanguage.java
deleted file mode 100644
index a1c75de6..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/language/PythonLanguage.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (C) 2010 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.
- */
-
-package org.qpython.qsl4a.qsl4a.language;
-
-/**
- * Represents the Python programming language.
- * 
- * @author igor.v.karp@gmail.com (Igor Karp)
- */
-public class PythonLanguage extends Language {
-
-  @Override
-  protected String getImportStatement() {
-    return "import android\n";
-  }
-
-  @Override
-  protected String getRpcReceiverDeclaration(String rpcReceiver) {
-    return rpcReceiver + " = android.Android()\n";
-  }
-
-  @Override
-  protected String getQuote() {
-    return "'";
-  }
-
-  @Override
-  protected String getNull() {
-    return "None";
-  }
-
-  @Override
-  protected String getTrue() {
-    return "True";
-  }
-
-  @Override
-  protected String getFalse() {
-    return "False";
-  }
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/language/RubyLanguage.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/language/RubyLanguage.java
deleted file mode 100644
index d1edb10e..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/language/RubyLanguage.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2010 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.
- */
-
-package org.qpython.qsl4a.qsl4a.language;
-
-/**
- * Represents the Ruby programming language.
- * 
- * @author igor.v.karp@gmail.com (Igor Karp)
- */
-public class RubyLanguage extends Language {
-
-  @Override
-  protected String getImportStatement() {
-    return "require \"android\";\n";
-  }
-
-  @Override
-  protected String getRpcReceiverDeclaration(String rpcReceiver) {
-    return rpcReceiver + " = Droid.new\n";
-  }
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/language/ShellLanguage.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/language/ShellLanguage.java
deleted file mode 100644
index 47b8d0cf..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/language/ShellLanguage.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2010 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.
- */
-
-package org.qpython.qsl4a.qsl4a.language;
-
-/**
- * Represents the Shell programming language.
- * 
- * @author igor.v.karp@gmail.com (Igor Karp)
- */
-public class ShellLanguage extends Language {
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/language/SleepLanguage.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/language/SleepLanguage.java
deleted file mode 100644
index 718b7520..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/language/SleepLanguage.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2010 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.
- */
-
-package org.qpython.qsl4a.qsl4a.language;
-
-/**
- * Represents the Sleep programming language.
- * 
- * @author tomcatalbino@gmail.com
- */
-public class SleepLanguage extends Language {
-
-  @Override
-  protected String getImportStatement() {
-    return "import com.googlecode.rpc.*;\n";
-  }
-
-  @Override
-  protected String getRpcReceiverDeclaration(String rpcReceiver) {
-    return rpcReceiver + " = [new Android];\n";
-  }
-
-  @Override
-  protected String getDefaultRpcReceiver() {
-    return "$droid";
-  }
-
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/language/SquirrelLanguage.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/language/SquirrelLanguage.java
deleted file mode 100644
index 732b71a4..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/language/SquirrelLanguage.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (C) 2010 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.
- */
-
-package org.qpython.qsl4a.qsl4a.language;
-
-/**
- * Represents the Squirrel programming language, by Alberto Demichelis
- * this file adapted by Andy Tai, atai@atai.org
- * based on the Python version by
- * @author igor.v.karp@gmail.com (Igor Karp)
- */
-public class SquirrelLanguage extends Language {
-
-  @Override
-  protected String getImportStatement() {
-    /* initialization code */
-    return "";
-  }
-
-  @Override
-  protected String getRpcReceiverDeclaration(String rpcReceiver) {
-    return rpcReceiver + " <- Android();\n";
-  }
-
-  @Override
-  protected String getQuote() {
-    return "\"";
-  }
-
-  @Override
-  protected String getNull() {
-    return "null";
-  }
-
-  @Override
-  protected String getTrue() {
-    return "true";
-  }
-
-  @Override
-  protected String getFalse() {
-    return "false";
-  }
-}
-
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/language/SupportedLanguages.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/language/SupportedLanguages.java
deleted file mode 100644
index 02ba1c3c..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/language/SupportedLanguages.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package org.qpython.qsl4a.qsl4a.language;
-
-import org.qpython.qsl4a.qsl4a.Log;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class SupportedLanguages {
-
-  private static enum KnownLanguage {
-    // SHELL(".sh", ShellLanguage.class), // We don't really support Shell language
-    HTML(".html", HtmlLanguage.class), BEANSHELL(".bsh", BeanShellLanguage.class), JAVASCRIPT(
-        ".js", JavaScriptLanguage.class), LUA(".lua", LuaLanguage.class), PERL(".pl",
-        PerlLanguage.class), PYTHON(".py", PythonLanguage.class), RUBY(".rb", RubyLanguage.class),
-    TCL(".tcl", TclLanguage.class), PHP(".php", PhpLanguage.class), SLEEP(".sl",
-        SleepLanguage.class), SQUIRREL(".nut", SquirrelLanguage.class);
-
-    private final String mmExtension;
-    private final Class<? extends Language> mmClass;
-
-    private KnownLanguage(String ext, Class<? extends Language> clazz) {
-      mmExtension = ext;
-      mmClass = clazz;
-    }
-
-    private String getExtension() {
-      return mmExtension;
-    }
-
-    private Class<? extends Language> getLanguageClass() {
-      return mmClass;
-    }
-  }
-
-  private static Map<String, Class<? extends Language>> sSupportedLanguages;
-
-  static {
-    sSupportedLanguages = new HashMap<String, Class<? extends Language>>();
-    for (KnownLanguage language : KnownLanguage.values()) {
-      sSupportedLanguages.put(language.getExtension(), language.getLanguageClass());
-    }
-  }
-
-  public static Language getLanguageByExtension(String extension) {
-    extension = extension.toLowerCase();
-    if (!extension.startsWith(".")) {
-      throw new RuntimeException("Extension does not start with a dot: " + extension);
-    }
-    Language lang = null;
-
-    Class<? extends Language> clazz = sSupportedLanguages.get(extension);
-    if (clazz == null) {
-      clazz = Language.class; // revert to default language.
-    }
-    if (clazz != null) {
-      try {
-        lang = clazz.newInstance();
-      } catch (IllegalAccessException e) {
-        Log.e(e);
-      } catch (InstantiationException e) {
-        Log.e(e);
-      }
-    }
-    return lang;
-  }
-
-  public static boolean checkLanguageSupported(String name) {
-    String extension = name.toLowerCase();
-    int index = extension.lastIndexOf('.');
-    if (index < 0) {
-      extension = "." + extension;
-    } else if (index > 0) {
-      extension = extension.substring(index);
-    }
-    return sSupportedLanguages.containsKey(extension);
-  }
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/language/TclLanguage.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/language/TclLanguage.java
deleted file mode 100644
index d17c65da..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/language/TclLanguage.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (C) 2010 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.
- */
-
-package org.qpython.qsl4a.qsl4a.language;
-
-/**
- * Represents the Tcl programming language.
- * 
- * @author igor.v.karp@gmail.com (Igor Karp)
- */
-public class TclLanguage extends Language {
-
-  @Override
-  protected String getImportStatement() {
-    return "package require android\n";
-  }
-
-  @Override
-  protected String getRpcReceiverDeclaration(String rpcReceiver) {
-    return "set " + rpcReceiver + " [android new]\n";
-  }
-
-  @Override
-  protected String getApplyReceiverText(String receiver) {
-    return "$" + receiver;
-  }
-
-  @Override
-  protected String getApplyOperatorText() {
-    return " ";
-  }
-
-  @Override
-  protected String getLeftParametersText() {
-    return " ";
-  }
-
-  @Override
-  protected String getRightParametersText() {
-    return "";
-  }
-
-  @Override
-  protected String getParameterSeparator() {
-    return " ";
-  }
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/rpc/Converter.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/rpc/Converter.java
deleted file mode 100644
index 606cae9e..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/rpc/Converter.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (C) 2010 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.
- */
-
-package org.qpython.qsl4a.qsl4a.rpc;
-
-/**
- * A converter can take a String and turn it into an instance of type T (the type parameter to the
- * converter).
- * 
- * @author igor.v.karp@gmail.com (Igor Karp)
- */
-public interface Converter<T> {
-
-  /** Convert a string into type T. */
-  T convert(String value);
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/rpc/MethodDescriptor.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/rpc/MethodDescriptor.java
deleted file mode 100644
index 72fb2637..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/rpc/MethodDescriptor.java
+++ /dev/null
@@ -1,511 +0,0 @@
-/*
- * Copyright (C) 2010 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.
- */
-
-package org.qpython.qsl4a.qsl4a.rpc;
-
-import android.content.Intent;
-import android.net.Uri;
-
-import org.qpython.qsl4a.qsl4a.Analytics;
-import org.qpython.qsl4a.qsl4a.facade.AndroidFacade;
-import org.qpython.qsl4a.qsl4a.jsonrpc.RpcReceiver;
-import org.qpython.qsl4a.qsl4a.jsonrpc.RpcReceiverManager;
-import org.qpython.qsl4a.qsl4a.util.VisibleForTesting;
-
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-/**
- * An adapter that wraps {@code Method}.
- * 
- * @author igor.v.karp@gmail.com (Igor Karp)
- */
-public final class MethodDescriptor {
-  private static final Map<Class<?>, Converter<?>> sConverters = populateConverters();
-
-  private final Method mMethod;
-  private final Class<? extends RpcReceiver> mClass;
-
-  public MethodDescriptor(Class<? extends RpcReceiver> clazz, Method method) {
-    mClass = clazz;
-    mMethod = method;
-  }
-
-  @Override
-  public String toString() {
-    return mMethod.getDeclaringClass().getCanonicalName() + "." + mMethod.getName();
-  }
-
-  /** Collects all methods with {@code RPC} annotation from given class. */
-  public static Collection<MethodDescriptor> collectFrom(Class<? extends RpcReceiver> clazz) {
-    List<MethodDescriptor> descriptors = new ArrayList<MethodDescriptor>();
-    for (Method method : clazz.getMethods()) {
-      if (method.isAnnotationPresent(Rpc.class)) {
-        descriptors.add(new MethodDescriptor(clazz, method));
-      }
-    }
-    return descriptors;
-  }
-
-  /**
-   * Invokes the call that belongs to this object with the given parameters. Wraps the response
-   * (possibly an exception) in a JSONObject.
-   * 
-   * @param parameters
-   *          {@code JSONArray} containing the parameters
-   * @return result
-   * @throws Throwable
-   */
-  public Object invoke(RpcReceiverManager manager, final JSONArray parameters) throws Throwable {
-    // Issue track call first in case of failure.
-    Analytics.track("api", getName());
-
-    final Type[] parameterTypes = getGenericParameterTypes();
-    final Object[] args = new Object[parameterTypes.length];
-    final Annotation annotations[][] = getParameterAnnotations();
-
-    if (parameters.length() > args.length) {
-      throw new RpcError("Too many parameters specified.");
-    }
-
-    for (int i = 0; i < args.length; i++) {
-      final Type parameterType = parameterTypes[i];
-      if (i < parameters.length()) {
-        args[i] = convertParameter(parameters, i, parameterType);
-      } else if (MethodDescriptor.hasDefaultValue(annotations[i])) {
-        args[i] = MethodDescriptor.getDefaultValue(parameterType, annotations[i]);
-      } else {
-        throw new RpcError("Argument " + (i + 1) + " is not present");
-      }
-    }
-
-    Object result = null;
-    try {
-      result = manager.invoke(mClass, mMethod, args);
-    } catch (Throwable t) {
-      throw t.getCause();
-    }
-    return result;
-  }
-
-  /**
-   * Converts a parameter from JSON into a Java Object.
-   * 
-   * @return TODO
-   */
-  // TODO(damonkohler): This signature is a bit weird (auto-refactored). The obvious alternative
-  // would be to work on one supplied parameter and return the converted parameter. However, that's
-  // problematic because you lose the ability to call the getXXX methods on the JSON array.
-  @VisibleForTesting
-  static Object convertParameter(final JSONArray parameters, int index, Type type)
-      throws JSONException, RpcError {
-    try {
-      // We must handle null and numbers explicitly because we cannot magically cast them. We
-      // also need to convert implicitly from numbers to bools.
-      if (parameters.isNull(index)) {
-        return null;
-      } else if (type == Boolean.class) {
-        try {
-          return parameters.getBoolean(index);
-        } catch (JSONException e) {
-          return new Boolean(parameters.getInt(index) != 0);
-        }
-      } else if (type == Long.class) {
-        return parameters.getLong(index);
-      } else if (type == Double.class) {
-        return parameters.getDouble(index);
-      } else if (type == Integer.class) {
-        return parameters.getInt(index);
-      } else if (type == Intent.class) {
-        return buildIntent(parameters.getJSONObject(index));
-      } else {
-        // Magically cast the parameter to the right Java type.
-        return ((Class<?>) type).cast(parameters.get(index));
-      }
-    } catch (ClassCastException e) {
-      throw new RpcError("Argument " + (index + 1) + " should be of type "
-          + ((Class<?>) type).getSimpleName() + ".");
-    }
-  }
-
-  public static Object buildIntent(JSONObject jsonObject) throws JSONException {
-    Intent intent = new Intent();
-    if (jsonObject.has("action")) {
-      intent.setAction(jsonObject.getString("action"));
-    }
-    if (jsonObject.has("data") && jsonObject.has("type")) {
-      intent.setDataAndType(Uri.parse(jsonObject.optString("data", null)),
-          jsonObject.optString("type", null));
-    } else if (jsonObject.has("data")) {
-      intent.setData(Uri.parse(jsonObject.optString("data", null)));
-    } else if (jsonObject.has("type")) {
-      intent.setType(jsonObject.optString("type", null));
-    }
-    if (jsonObject.has("packagename") && jsonObject.has("classname")) {
-      intent.setClassName(jsonObject.getString("packagename"), jsonObject.getString("classname"));
-    }
-    if (jsonObject.has("flags")) {
-      intent.setFlags(jsonObject.getInt("flags"));
-    }
-    if (!jsonObject.isNull("extras")) {
-      AndroidFacade.putExtrasFromJsonObject(jsonObject.getJSONObject("extras"), intent);
-    }
-    if (!jsonObject.isNull("categories")) {
-      JSONArray categories = jsonObject.getJSONArray("categories");
-      for (int i = 0; i < categories.length(); i++) {
-        intent.addCategory(categories.getString(i));
-      }
-    }
-    return intent;
-  }
-
-  public Method getMethod() {
-    return mMethod;
-  }
-
-  public Class<? extends RpcReceiver> getDeclaringClass() {
-    return mClass;
-  }
-
-  public String getName() {
-    if (mMethod.isAnnotationPresent(RpcName.class)) {
-      return mMethod.getAnnotation(RpcName.class).name();
-    }
-    return mMethod.getName();
-  }
-
-  public Type[] getGenericParameterTypes() {
-    return mMethod.getGenericParameterTypes();
-  }
-
-  public Annotation[][] getParameterAnnotations() {
-    return mMethod.getParameterAnnotations();
-  }
-
-  /**
-   * Returns a human-readable help text for this RPC, based on annotations in the source code.
-   * 
-   * @return derived help string
-   */
-  public String getHelp() {
-    StringBuilder helpBuilder = new StringBuilder();
-    Rpc rpcAnnotation = mMethod.getAnnotation(Rpc.class);
-
-    helpBuilder.append(mMethod.getName());
-    helpBuilder.append("(");
-    final Class<?>[] parameterTypes = mMethod.getParameterTypes();
-    final Type[] genericParameterTypes = mMethod.getGenericParameterTypes();
-    final Annotation[][] annotations = mMethod.getParameterAnnotations();
-    for (int i = 0; i < parameterTypes.length; i++) {
-      if (i == 0) {
-        helpBuilder.append("\n  ");
-      } else {
-        helpBuilder.append(",\n  ");
-      }
-
-      helpBuilder.append(getHelpForParameter(genericParameterTypes[i], annotations[i]));
-    }
-    helpBuilder.append(")\n\n");
-    helpBuilder.append(rpcAnnotation.description());
-    if (!rpcAnnotation.returns().equals("")) {
-      helpBuilder.append("\n");
-      helpBuilder.append("\nReturns:\n  ");
-      helpBuilder.append(rpcAnnotation.returns());
-    }
-
-    if (mMethod.isAnnotationPresent(RpcStartEvent.class)) {
-      String eventName = mMethod.getAnnotation(RpcStartEvent.class).value();
-      helpBuilder.append(String.format("\n\nGenerates \"%s\" events.", eventName));
-    }
-
-    if (mMethod.isAnnotationPresent(RpcDeprecated.class)) {
-      String replacedBy = mMethod.getAnnotation(RpcDeprecated.class).value();
-      String release = mMethod.getAnnotation(RpcDeprecated.class).release();
-      helpBuilder.append(String.format("\n\nDeprecated in %s! Please use %s instead.", release,
-          replacedBy));
-    }
-
-    return helpBuilder.toString();
-  }
-
-  /**
-   * Returns the help string for one particular parameter. This respects optional parameters.
-   * 
-   * @param parameterType
-   *          (generic) type of the parameter
-   * @param annotations
-   *          annotations of the parameter, may be null
-   * @return string describing the parameter based on source code annotations
-   */
-  private static String getHelpForParameter(Type parameterType, Annotation[] annotations) {
-    StringBuilder result = new StringBuilder();
-
-    appendTypeName(result, parameterType);
-    result.append(" ");
-    result.append(getName(annotations));
-    if (hasDefaultValue(annotations)) {
-      result.append("[optional");
-      if (hasExplicitDefaultValue(annotations)) {
-        result.append(", default " + getDefaultValue(parameterType, annotations));
-      }
-      result.append("]");
-    }
-
-    String description = getDescription(annotations);
-    if (description.length() > 0) {
-      result.append(": ");
-      result.append(description);
-    }
-
-    return result.toString();
-  }
-
-  /**
-   * Appends the name of the given type to the {@link StringBuilder}.
-   * 
-   * @param builder
-   *          string builder to append to
-   * @param type
-   *          type whose name to append
-   */
-  private static void appendTypeName(final StringBuilder builder, final Type type) {
-    if (type instanceof Class<?>) {
-      builder.append(((Class<?>) type).getSimpleName());
-    } else {
-      ParameterizedType parametrizedType = (ParameterizedType) type;
-      builder.append(((Class<?>) parametrizedType.getRawType()).getSimpleName());
-      builder.append("<");
-
-      Type[] arguments = parametrizedType.getActualTypeArguments();
-      for (int i = 0; i < arguments.length; i++) {
-        if (i > 0) {
-          builder.append(", ");
-        }
-        appendTypeName(builder, arguments[i]);
-      }
-      builder.append(">");
-    }
-  }
-
-  /**
-   * Returns parameter descriptors suitable for the RPC call text representation.
-   * 
-   * <p>
-   * Uses parameter value, default value or name, whatever is available first.
-   * 
-   * @return an array of parameter descriptors
-   */
-  public ParameterDescriptor[] getParameterValues(String[] values) {
-    Type[] parameterTypes = mMethod.getGenericParameterTypes();
-    Annotation[][] parametersAnnotations = mMethod.getParameterAnnotations();
-    ParameterDescriptor[] parameters = new ParameterDescriptor[parametersAnnotations.length];
-    for (int index = 0; index < parameters.length; index++) {
-      String value;
-      if (index < values.length) {
-        value = values[index];
-      } else if (hasDefaultValue(parametersAnnotations[index])) {
-        Object defaultValue = getDefaultValue(parameterTypes[index], parametersAnnotations[index]);
-        if (defaultValue == null) {
-          value = null;
-        } else {
-          value = String.valueOf(defaultValue);
-        }
-      } else {
-        value = getName(parametersAnnotations[index]);
-      }
-      parameters[index] = new ParameterDescriptor(value, parameterTypes[index]);
-    }
-    return parameters;
-  }
-
-  /**
-   * Returns parameter hints.
-   * 
-   * @return an array of parameter hints
-   */
-  public String[] getParameterHints() {
-    Annotation[][] parametersAnnotations = mMethod.getParameterAnnotations();
-    String[] hints = new String[parametersAnnotations.length];
-    for (int index = 0; index < hints.length; index++) {
-      String name = getName(parametersAnnotations[index]);
-      String description = getDescription(parametersAnnotations[index]);
-      String hint = "No paramenter description.";
-      if (!name.equals("") && !description.equals("")) {
-        hint = name + ": " + description;
-      } else if (!name.equals("")) {
-        hint = name;
-      } else if (!description.equals("")) {
-        hint = description;
-      }
-      hints[index] = hint;
-    }
-    return hints;
-  }
-
-  /**
-   * Extracts the formal parameter name from an annotation.
-   * 
-   * @param annotations
-   *          the annotations of the parameter
-   * @return the formal name of the parameter
-   */
-  private static String getName(Annotation[] annotations) {
-    for (Annotation a : annotations) {
-      if (a instanceof RpcParameter) {
-        return ((RpcParameter) a).name();
-      }
-    }
-    throw new IllegalStateException("No parameter name");
-  }
-
-  /**
-   * Extracts the parameter description from its annotations.
-   * 
-   * @param annotations
-   *          the annotations of the parameter
-   * @return the description of the parameter
-   */
-  private static String getDescription(Annotation[] annotations) {
-    for (Annotation a : annotations) {
-      if (a instanceof RpcParameter) {
-        return ((RpcParameter) a).description();
-      }
-    }
-    throw new IllegalStateException("No parameter description");
-  }
-
-  /**
-   * Returns the default value for a specific parameter.
-   * 
-   * @param parameterType
-   *          parameterType
-   * @param annotations
-   *          annotations of the parameter
-   */
-  public static Object getDefaultValue(Type parameterType, Annotation[] annotations) {
-    for (Annotation a : annotations) {
-      if (a instanceof RpcDefault) {
-        RpcDefault defaultAnnotation = (RpcDefault) a;
-        Converter<?> converter = converterFor(parameterType, defaultAnnotation.converter());
-        return converter.convert(defaultAnnotation.value());
-      } else if (a instanceof RpcOptional) {
-        return null;
-      }
-    }
-    throw new IllegalStateException("No default value for " + parameterType);
-  }
-
-  @SuppressWarnings("rawtypes")
-  private static Converter<?> converterFor(Type parameterType,
-      Class<? extends Converter> converterClass) {
-    if (converterClass == Converter.class) {
-      Converter<?> converter = sConverters.get(parameterType);
-      if (converter == null) {
-        throw new IllegalArgumentException("No predefined converter found for " + parameterType);
-      }
-      return converter;
-    }
-    try {
-      Constructor<?> constructor = converterClass.getConstructor(new Class<?>[0]);
-      return (Converter<?>) constructor.newInstance(new Object[0]);
-    } catch (Exception e) {
-      throw new IllegalArgumentException("Cannot create converter from "
-          + converterClass.getCanonicalName());
-    }
-  }
-
-  /**
-   * Determines whether or not this parameter has default value.
-   * 
-   * @param annotations
-   *          annotations of the parameter
-   */
-  public static boolean hasDefaultValue(Annotation[] annotations) {
-    for (Annotation a : annotations) {
-      if (a instanceof RpcDefault || a instanceof RpcOptional) {
-        return true;
-      }
-    }
-    return false;
-  }
-
-  /**
-   * Returns whether the default value is specified for a specific parameter.
-   * 
-   * @param annotations
-   *          annotations of the parameter
-   */
-  @VisibleForTesting
-  static boolean hasExplicitDefaultValue(Annotation[] annotations) {
-    for (Annotation a : annotations) {
-      if (a instanceof RpcDefault) {
-        return true;
-      }
-    }
-    return false;
-  }
-
-  /** Returns the converters for {@code String}, {@code Integer} and {@code Boolean}. */
-  private static Map<Class<?>, Converter<?>> populateConverters() {
-    Map<Class<?>, Converter<?>> converters = new HashMap<Class<?>, Converter<?>>();
-    converters.put(String.class, new Converter<String>() {
-      @Override
-      public String convert(String value) {
-        return value;
-      }
-    });
-    converters.put(Integer.class, new Converter<Integer>() {
-      @Override
-      public Integer convert(String input) {
-        try {
-          return Integer.decode(input);
-        } catch (NumberFormatException e) {
-          throw new IllegalArgumentException("'" + input + "' is not an integer");
-        }
-      }
-    });
-    converters.put(Boolean.class, new Converter<Boolean>() {
-      @Override
-      public Boolean convert(String input) {
-        if (input == null) {
-          return null;
-        }
-        input = input.toLowerCase();
-        if (input.equals("true")) {
-          return Boolean.TRUE;
-        }
-        if (input.equals("false")) {
-          return Boolean.FALSE;
-        }
-        throw new IllegalArgumentException("'" + input + "' is not a boolean");
-      }
-    });
-    return converters;
-  }
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/rpc/ParameterDescriptor.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/rpc/ParameterDescriptor.java
deleted file mode 100644
index 2f92fbec..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/rpc/ParameterDescriptor.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2010 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.
- */
-
-package org.qpython.qsl4a.qsl4a.rpc;
-
-import java.lang.reflect.Type;
-
-/**
- * RPC parameter description.
- * 
- * @author igor.v.karp@gmail.com (Igor Karp)
- */
-public final class ParameterDescriptor {
-  private final String value;
-  private final Type type;
-
-  public ParameterDescriptor(String value, Type type) {
-    this.value = value;
-    this.type = type;
-  }
-
-  public String getValue() {
-    return value;
-  }
-
-  public Type getType() {
-    return type;
-  }
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/rpc/Rpc.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/rpc/Rpc.java
deleted file mode 100644
index b7ba7b37..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/rpc/Rpc.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2009 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.
- */
-
-package org.qpython.qsl4a.qsl4a.rpc;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * The {@link Rpc} annotation is used to annotate server-side implementations of RPCs. It describes
- * meta-information (currently a brief documentation of the function), and marks a function as the
- * implementation of an RPC.
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.METHOD)
-@Documented
-public @interface Rpc {
-  /**
-   * Returns brief description of the function. Should be limited to one or two sentences.
-   */
-  String description();
-
-  /**
-   * Gives a brief description of the functions return value (and the underlying data structure).
-   */
-  String returns() default "";
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/rpc/RpcDefault.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/rpc/RpcDefault.java
deleted file mode 100644
index 99115dc5..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/rpc/RpcDefault.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2010 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.
- */
-
-package org.qpython.qsl4a.qsl4a.rpc;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Use this annotation to mark an RPC parameter that have a default value.
- * 
- * @author igor.v.karp@gmail.com (Igor Karp)
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.PARAMETER)
-@Documented
-public @interface RpcDefault {
-  /** The default value of the RPC parameter. */
-  public String value();
-
-  @SuppressWarnings("rawtypes")
-  public Class<? extends Converter> converter() default Converter.class;
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/rpc/RpcDeprecated.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/rpc/RpcDeprecated.java
deleted file mode 100644
index e3364d40..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/rpc/RpcDeprecated.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2010 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.
- */
-
-package org.qpython.qsl4a.qsl4a.rpc;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Use this annotation to mark RPC method as deprecated.
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.METHOD)
-@Documented
-public @interface RpcDeprecated {
-  /** The method that replaced this one. */
-  public String value();
-
-  /** Release of SL4A when deprecation occurred. */
-  public String release() default "r4";
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/rpc/RpcError.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/rpc/RpcError.java
deleted file mode 100644
index 6f128b3d..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/rpc/RpcError.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (C) 2010 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.
- */
-
-package org.qpython.qsl4a.qsl4a.rpc;
-
-@SuppressWarnings("serial")
-public class RpcError extends Exception {
-
-  public RpcError(String message) {
-    super(message);
-  }
-
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/rpc/RpcMinSdk.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/rpc/RpcMinSdk.java
deleted file mode 100644
index dae50e5f..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/rpc/RpcMinSdk.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (C) 2010 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.
- */
-
-package org.qpython.qsl4a.qsl4a.rpc;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-/**
- * Use this annotation to specify minimum SDK level (if higher than 3).
- * 
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-public @interface RpcMinSdk {
-  /** Minimum SDK Level. */
-  public int value();
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/rpc/RpcName.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/rpc/RpcName.java
deleted file mode 100644
index 1085bda9..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/rpc/RpcName.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2010 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.
- */
-
-package org.qpython.qsl4a.qsl4a.rpc;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Use this annotation to mark an RPC parameter that have a default value.
- * 
- * @author igor.v.karp@gmail.com (Igor Karp)
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.METHOD)
-@Documented
-public @interface RpcName {
-  /** The default value of the RPC parameter. */
-  public String name();
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/rpc/RpcOptional.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/rpc/RpcOptional.java
deleted file mode 100644
index 761db2b5..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/rpc/RpcOptional.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2010 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.
- */
-
-package org.qpython.qsl4a.qsl4a.rpc;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Use this annotation to mark RPC parameter as optional.
- * 
- * <p>
- * The parameter marked as optional has no explicit default value. {@code null} is used as default
- * value.
- * 
- * @author igor.v.karp@gmail.com (Igor Karp)
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.PARAMETER)
-@Documented
-public @interface RpcOptional {
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/rpc/RpcParameter.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/rpc/RpcParameter.java
deleted file mode 100644
index 14922275..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/rpc/RpcParameter.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2009 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.
- */
-
-package org.qpython.qsl4a.qsl4a.rpc;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * An annotation that is used to document the parameters of an RPC.
- * 
- * @author Felix Arends (felix.arends@gmail.com)
- * 
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.PARAMETER)
-@Documented
-public @interface RpcParameter {
-  /**
-   * The name of the formal parameter. This should be in agreement with the java code.
-   */
-  public String name();
-
-  /**
-   * Description of the RPC. This should be a short descriptive statement without a full stop, such
-   * as 'disables the WiFi mode'.
-   */
-  public String description() default "";
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/rpc/RpcStartEvent.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/rpc/RpcStartEvent.java
deleted file mode 100644
index 59128a51..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/rpc/RpcStartEvent.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2010 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.
- */
-
-package org.qpython.qsl4a.qsl4a.rpc;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Use this annotation to mark an RPC as one that starts generating events.
- * 
- * @author damonkohler@gmail.com (Damon Kohler)
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.METHOD)
-@Documented
-public @interface RpcStartEvent {
-  /** The name of the event that is generated. */
-  public String value();
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/rpc/RpcStopEvent.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/rpc/RpcStopEvent.java
deleted file mode 100644
index 63b3f6d8..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/rpc/RpcStopEvent.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2010 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.
- */
-
-package org.qpython.qsl4a.qsl4a.rpc;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Use this annotation to mark an RPC as one that stops generating events.
- * 
- * @author damonkohler@gmail.com (Damon Kohler)
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.METHOD)
-@Documented
-public @interface RpcStopEvent {
-  /** The name of the event that stops being generated. */
-  public String value();
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/trigger/EventGenerationControllingObserver.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/trigger/EventGenerationControllingObserver.java
deleted file mode 100644
index b28f1241..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/trigger/EventGenerationControllingObserver.java
+++ /dev/null
@@ -1,88 +0,0 @@
-package org.qpython.qsl4a.qsl4a.trigger;
-
-import com.google.common.collect.Maps;
-import org.qpython.qsl4a.qsl4a.facade.FacadeConfiguration;
-import org.qpython.qsl4a.qsl4a.facade.FacadeManager;
-import org.qpython.qsl4a.qsl4a.rpc.MethodDescriptor;
-
-import java.util.Map;
-
-import org.json.JSONArray;
-
-/**
- * A {@link TriggerRepository.TriggerRepositoryObserver} that starts and stops the monitoring of events depending on
- * whether or not triggers for the event exist.
- * 
- * @author Felix Arends (felix.arends@gmail.com)
- */
-public class EventGenerationControllingObserver implements TriggerRepository.TriggerRepositoryObserver {
-  private final FacadeManager mFacadeManager;
-  private final Map<String, MethodDescriptor> mStartEventGeneratingMethodDescriptors;
-  private final Map<String, MethodDescriptor> mStopEventGeneratingMethodDescriptors;
-  private final Map<String, Integer> mEventTriggerRefCounts = Maps.newHashMap();
-
-  /**
-   * Creates a new StartEventMonitoringObserver for the given trigger repository.
-   * 
-   * @param facadeManager
-   * @param triggerRepository
-   */
-  public EventGenerationControllingObserver(FacadeManager facadeManager) {
-    mFacadeManager = facadeManager;
-    mStartEventGeneratingMethodDescriptors =
-        FacadeConfiguration.collectStartEventMethodDescriptors();
-    mStopEventGeneratingMethodDescriptors = FacadeConfiguration.collectStopEventMethodDescriptors();
-  }
-
-  private synchronized int incrementAndGetRefCount(String eventName) {
-    int refCount =
-        (mEventTriggerRefCounts.containsKey(eventName)) ? mEventTriggerRefCounts.get(eventName) : 0;
-    refCount++;
-    mEventTriggerRefCounts.put(eventName, refCount);
-    return refCount;
-  }
-
-  private synchronized int decrementAndGetRefCount(String eventName) {
-    int refCount =
-        (mEventTriggerRefCounts.containsKey(eventName)) ? mEventTriggerRefCounts.get(eventName) : 0;
-    refCount--;
-    mEventTriggerRefCounts.put(eventName, refCount);
-    return refCount;
-  }
-
-  @Override
-  public synchronized void onPut(Trigger trigger) {
-    // If we're not already monitoring the events corresponding to this trigger, do so.
-    if (incrementAndGetRefCount(trigger.getEventName()) == 1) {
-      startMonitoring(trigger.getEventName());
-    }
-  }
-
-  @Override
-  public synchronized void onRemove(Trigger trigger) {
-    // If there are no more triggers listening to this event, then we need to stop monitoring.
-    if (decrementAndGetRefCount(trigger.getEventName()) == 1) {
-      stopMonitoring(trigger.getEventName());
-    }
-  }
-
-  private void startMonitoring(String eventName) {
-    MethodDescriptor startEventGeneratingMethod =
-        mStartEventGeneratingMethodDescriptors.get(eventName);
-    try {
-      startEventGeneratingMethod.invoke(mFacadeManager, new JSONArray());
-    } catch (Throwable t) {
-      throw new RuntimeException(t);
-    }
-  }
-
-  private void stopMonitoring(String eventName) {
-    MethodDescriptor stopEventGeneratingMethod =
-        mStopEventGeneratingMethodDescriptors.get(eventName);
-    try {
-      stopEventGeneratingMethod.invoke(mFacadeManager, new JSONArray());
-    } catch (Throwable t) {
-      throw new RuntimeException(t);
-    }
-  }
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/trigger/ScriptTrigger.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/trigger/ScriptTrigger.java
deleted file mode 100644
index 9e6bc045..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/trigger/ScriptTrigger.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package org.qpython.qsl4a.qsl4a.trigger;
-
-import android.content.Context;
-import android.content.Intent;
-
-import org.qpython.qsl4a.qsl4a.IntentBuilders;
-import org.qpython.qsl4a.qsl4a.event.Event;
-
-import java.io.File;
-
-/**
- * A trigger implementation that launches a given script when the event occurs.
- * 
- * @author Felix Arends (felix.arends@gmail.com)
- */
-public class ScriptTrigger implements Trigger {
-  private static final long serialVersionUID = 1804599219214041409L;
-  private final File mScript;
-  private final String mEventName;
-
-  public ScriptTrigger(String eventName, File script) {
-    mEventName = eventName;
-    mScript = script;
-  }
-
-  @Override
-  public void handleEvent(Event event, Context context) {
-    Intent intent = IntentBuilders.buildStartInBackgroundIntent(mScript);
-    // This is required since the script is being started from the TriggerService.
-    intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-    context.startActivity(intent);
-  }
-
-  @Override
-  public String getEventName() {
-    return mEventName;
-  }
-
-  public File getScript() {
-    return mScript;
-  }
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/trigger/Trigger.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/trigger/Trigger.java
deleted file mode 100644
index 8760a320..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/trigger/Trigger.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2010 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.
- */
-
-package org.qpython.qsl4a.qsl4a.trigger;
-
-import android.content.Context;
-
-
-import org.qpython.qsl4a.qsl4a.event.Event;
-
-import java.io.Serializable;
-
-/**
- * Interface implemented by objects listening to events on the event queue inside of the
- * {@link SerivceManager}.
- * 
- * @author Felix Arends (felix.arends@gmail.com)
- */
-public interface Trigger extends Serializable {
-  /**
-   * Handles an event from the event queue.
-   * 
-   * @param event
-   *          Event to handle
-   * @param context
-   *          TODO
-   */
-  void handleEvent(Event event, Context context);
-
-  /**
-   * Returns the event name that this {@link Trigger} is interested in.
-   */
-  // TODO(damonkohler): This could be removed by maintaining a reverse mapping from Trigger to event
-  // name in the TriggerRespository.
-  String getEventName();
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/trigger/TriggerRepository.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/trigger/TriggerRepository.java
deleted file mode 100644
index 84fb72b3..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/trigger/TriggerRepository.java
+++ /dev/null
@@ -1,205 +0,0 @@
-/*
- * Copyright (C) 2010 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.
- */
-
-package org.qpython.qsl4a.qsl4a.trigger;
-
-import android.content.Context;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.preference.PreferenceManager;
-
-import com.google.common.collect.ArrayListMultimap;
-import com.google.common.collect.Multimap;
-import com.google.common.collect.Multimaps;
-
-import org.qpython.qsl4a.codec.Base64Codec;
-import org.qpython.qsl4a.qsl4a.IntentBuilders;
-import org.qpython.qsl4a.qsl4a.Log;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.util.Map.Entry;
-import java.util.concurrent.CopyOnWriteArrayList;
-
-
-/**
- * A repository maintaining all currently scheduled triggers. This includes, for example, alarms or
- * observers of arriving text messages etc. This class is responsible for serializing the list of
- * triggers to the shared preferences store, and retrieving it from there.
- * 
- * @author Felix Arends (felix.arends@gmail.com)
- * @author Damon Kohler (damonkohler@gmail.com)
- */
-public class TriggerRepository {
-  /**
-   * The list of triggers is serialized to the shared preferences entry with this name.
-   */
-  private static final String TRIGGERS_PREF_KEY = "TRIGGERS";
-
-  private final SharedPreferences mPreferences;
-  private final Context mContext;
-
-  /**
-   * An interface for objects that are notified when a trigger is added to the repository.
-   */
-  public interface TriggerRepositoryObserver {
-    /**
-     * Invoked just before the trigger is added to the repository.
-     * 
-     * @param trigger
-     *          The trigger about to be added to the repository.
-     */
-    void onPut(Trigger trigger);
-
-    /**
-     * Invoked just after the trigger has been removed from the repository.
-     * 
-     * @param trigger
-     *          The trigger that has just been removed from the repository.
-     */
-    void onRemove(Trigger trigger);
-  }
-
-  private final Multimap<String, Trigger> mTriggers;
-  private final CopyOnWriteArrayList<TriggerRepositoryObserver> mTriggerObservers =
-      new CopyOnWriteArrayList<TriggerRepositoryObserver>();
-
-  public TriggerRepository(Context context) {
-    mContext = context;
-    mPreferences = PreferenceManager.getDefaultSharedPreferences(context);
-    String triggers = mPreferences.getString(TRIGGERS_PREF_KEY, null);
-    mTriggers = deserializeTriggersFromString(triggers);
-  }
-
-  /** Returns a list of all triggers. The list is unmodifiable. */
-  public synchronized Multimap<String, Trigger> getAllTriggers() {
-    return Multimaps.unmodifiableMultimap(mTriggers);
-  }
-
-  /**
-   * Adds a new trigger to the repository.
-   * 
-   * @param trigger
-   *          the {@link Trigger} to add
-   */
-  public synchronized void put(Trigger trigger) {
-    notifyOnAdd(trigger);
-    mTriggers.put(trigger.getEventName(), trigger);
-    storeTriggers();
-    ensureTriggerServiceRunning();
-  }
-
-  /** Removes a specific {@link Trigger}. */
-  public synchronized void remove(final Trigger trigger) {
-    mTriggers.get(trigger.getEventName()).remove(trigger);
-    storeTriggers();
-    notifyOnRemove(trigger);
-  }
-
-  /** Ensures that the {@link TriggerService} is running */
-  private void ensureTriggerServiceRunning() {
-    Intent startTriggerServiceIntent = IntentBuilders.buildTriggerServiceIntent();
-    mContext.startService(startTriggerServiceIntent);
-  }
-
-  /** Notify all {@link TriggerRepositoryObserver}s that a {@link Trigger} was added. */
-  private void notifyOnAdd(Trigger trigger) {
-    for (TriggerRepositoryObserver observer : mTriggerObservers) {
-      observer.onPut(trigger);
-    }
-  }
-
-  /** Notify all {@link TriggerRepositoryObserver}s that a {@link Trigger} was removed. */
-  private void notifyOnRemove(Trigger trigger) {
-    for (TriggerRepositoryObserver observer : mTriggerObservers) {
-      observer.onRemove(trigger);
-    }
-  }
-
-  /** Writes the list of triggers to the shared preferences. */
-  private synchronized void storeTriggers() {
-    SharedPreferences.Editor editor = mPreferences.edit();
-    final String triggerValue = serializeTriggersToString(mTriggers);
-    if (triggerValue != null) {
-      editor.putString(TRIGGERS_PREF_KEY, triggerValue);
-    }
-    editor.commit();
-  }
-
-  /** Deserializes the {@link Multimap} of {@link Trigger}s from a base 64 encoded string. */
-  @SuppressWarnings("unchecked")
-  private Multimap<String, Trigger> deserializeTriggersFromString(String triggers) {
-    if (triggers == null) {
-      return ArrayListMultimap.<String, Trigger> create();
-    }
-    try {
-      final ByteArrayInputStream inputStream =
-          new ByteArrayInputStream(Base64Codec.decodeBase64(triggers.getBytes()));
-      final ObjectInputStream objectInputStream = new ObjectInputStream(inputStream);
-      return (Multimap<String, Trigger>) objectInputStream.readObject();
-    } catch (Exception e) {
-      Log.e(e);
-    }
-    return ArrayListMultimap.<String, Trigger> create();
-  }
-
-  /** Serializes the list of triggers to a Base64 encoded string. */
-  private String serializeTriggersToString(Multimap<String, Trigger> triggers) {
-    try {
-      final ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-      final ObjectOutputStream objectOutputStream = new ObjectOutputStream(outputStream);
-      objectOutputStream.writeObject(triggers);
-      return new String(Base64Codec.encodeBase64(outputStream.toByteArray()));
-    } catch (IOException e) {
-      Log.e(e);
-      return null;
-    }
-  }
-
-  /** Returns {@code true} iff the list of triggers is empty. */
-  public synchronized boolean isEmpty() {
-    return mTriggers.isEmpty();
-  }
-
-  /** Adds a {@link TriggerRepositoryObserver}. */
-  public void addObserver(TriggerRepositoryObserver observer) {
-    mTriggerObservers.add(observer);
-  }
-
-  /**
-   * Adds the given {@link TriggerRepositoryObserver} and invokes
-   * {@link TriggerRepositoryObserver#onPut} for all existing triggers.
-   * 
-   * @param observer
-   *          The observer to add.
-   */
-  public synchronized void bootstrapObserver(TriggerRepositoryObserver observer) {
-    addObserver(observer);
-    for (Entry<String, Trigger> trigger : mTriggers.entries()) {
-      observer.onPut(trigger.getValue());
-    }
-  }
-
-  /**
-   * Removes a {@link TriggerRepositoryObserver}.
-   */
-  public void removeObserver(TriggerRepositoryObserver observer) {
-    mTriggerObservers.remove(observer);
-  }
-}
\ No newline at end of file
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/util/SPFUtils.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/util/SPFUtils.java
deleted file mode 100644
index 17909904..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/util/SPFUtils.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package org.qpython.qsl4a.qsl4a.util;
-
-import android.content.Context;
-import android.content.SharedPreferences;
-
-import java.util.UUID;
-
-/**
- * Created by yhc on 16/8/25.
- */
-public class SPFUtils {
-    public static String getExtConf(Context context) {
-        return getSP(context, "config.ext");
-    }
-
-    public static String getUserNoId(Context context) {
-        String usernoid = getSP(context, "user.usernoid");
-        if (usernoid.equals("")) {
-            // TODO
-            //UUID uuid  =  UUID.randomUUID();
-            usernoid = UUID.randomUUID().toString();
-            setSP(context, "user.usernoid", usernoid);
-        }
-
-        return usernoid;
-    }
-
-    public static String getSP(Context context, String key)	{
-        String val;
-        SharedPreferences obj = context.getSharedPreferences("qpyspf",0);
-        val = obj.getString(key,"");
-        return val;
-    }
-    public static void setSP(Context context, String key,String val) {
-        SharedPreferences obj = context.getSharedPreferences("qpyspf",0);
-        SharedPreferences.Editor wobj;
-        wobj = obj.edit();
-        wobj.putString(key, val);
-        wobj.commit();
-    }
-
-}
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/util/VisibleForTesting.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/util/VisibleForTesting.java
deleted file mode 100644
index 3fcf89c3..00000000
--- a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/util/VisibleForTesting.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (C) 2010 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.
- */
-
-package org.qpython.qsl4a.qsl4a.util;
-
-/**
- * An annotation that indicates that the visibility of a type or member has been relaxed from
- * private to package to make the code testable.
- * 
- * @author igor.v.karp@gmail.com (Igor Karp)
- */
-// TODO(igor.v.karp): Consider replacing this annotation by one from Guava or GCL
-public @interface VisibleForTesting {
-}
diff --git a/qpysl4a/src/main/res/drawable/nav_menu_bg.xml b/qpysl4a/src/main/res/drawable/nav_menu_bg.xml
deleted file mode 100644
index 6c08193e..00000000
--- a/qpysl4a/src/main/res/drawable/nav_menu_bg.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android"></selector>
\ No newline at end of file
diff --git a/qpysl4a/src/main/res/drawable/toolbar_button_bg.xml b/qpysl4a/src/main/res/drawable/toolbar_button_bg.xml
deleted file mode 100644
index 4e716595..00000000
--- a/qpysl4a/src/main/res/drawable/toolbar_button_bg.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_pressed="true">
-        <shape>
-            <solid android:color="@color/colorPrimaryDark" />
-        </shape>
-    </item>
-
-    <item>
-        <shape>
-            <solid android:color="@color/colorPrimary" />
-        </shape>
-    </item>
-
-</selector>
\ No newline at end of file
diff --git a/qpysl4a/src/main/res/raw/beep.ogg b/qpysl4a/src/main/res/raw/beep.ogg
deleted file mode 100644
index 14199476..00000000
Binary files a/qpysl4a/src/main/res/raw/beep.ogg and /dev/null differ
diff --git a/qpysl4a/src/main/res/raw/pymain.py b/qpysl4a/src/main/res/raw/pymain.py
deleted file mode 100644
index b89f2b94..00000000
--- a/qpysl4a/src/main/res/raw/pymain.py
+++ /dev/null
@@ -1,6 +0,0 @@
-#qpy:http://zuowuxuxi.com/s/sample.py
-import android
-
-print("Hello, QPython !")
-droid = android.Android()
-droid.makeToast("Hello, QPython !")
diff --git a/qpysl4a/src/main/res/values/colors.xml b/qpysl4a/src/main/res/values/colors.xml
deleted file mode 100644
index 150bf800..00000000
--- a/qpysl4a/src/main/res/values/colors.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="colorPrimary">#313131</color>
-    <color name="colorPrimaryDark">#313131</color>
-    <color name="colorAccent">#FF4081</color>
-    <color name="white">#ffffff</color>
-    <color name="gray">#FF707070</color>
-
-
-    <color name="ripple_normal">#CACCCB</color>
-    <color name="ripple_dark">#B0B2B1</color>
-    <color name="divider_light">#e0e0e0</color>
-    <color name="text_dark">#333333</color>
-
-    <color name="background_grey">#efeff4</color>
-    <color name="divider">#e3e3e8</color>
-
-
-    <color name="scrollbar_track">#85cccccc</color>
-    <color name="colorControlHighlight">@color/ripple_material_light</color>
-    <color name="ripple_material_light">#40000000</color>
-    <color name="tool_layout_bg">#F4F4F4</color>
-    <color name="main_menu_bg">#f0f2f5f8</color>
-
-    <color name="gary">#30ac93</color>
-
-</resources>
diff --git a/qpysl4a/src/main/res/values/strings.xml b/qpysl4a/src/main/res/values/strings.xml
deleted file mode 100644
index 3c541c7e..00000000
--- a/qpysl4a/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="app_name">QSL4A</string>
-</resources>
\ No newline at end of file
diff --git a/qpysl4a/src/main/res/values/styles.xml b/qpysl4a/src/main/res/values/styles.xml
deleted file mode 100644
index 2bb4b3ab..00000000
--- a/qpysl4a/src/main/res/values/styles.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<resources>
-
-    <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
-        <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
-        <item name="android:textColorPrimary">@color/white</item>
-        <item name="colorControlNormal">@color/white</item>
-        <item name="selectableItemBackground">@drawable/toolbar_button_bg</item>
-        <item name="android:textAppearanceSmallPopupMenu">@style/popupMenuTextAppearanceSmall</item>
-        <item name="android:textAppearanceLargePopupMenu">@style/popupMenuTextAppearanceLarge</item>
-    </style>
-
-    <style name="popupMenuTextAppearanceSmall" parent="@style/TextAppearance.AppCompat.Light.Widget.PopupMenu.Small">
-        <item name="android:textColor">@android:color/black</item>
-    </style>
-
-    <style name="popupMenuTextAppearanceLarge" parent="@style/TextAppearance.AppCompat.Light.Widget.PopupMenu.Large">
-        <item name="android:textColor">@android:color/black</item>
-    </style>
-
-
-    <style name="DefaultBlueToolbar" parent="@style/ThemeOverlay.AppCompat.Light">
-        <item name="actionOverflowMenuStyle">@style/OverflowMenuStyle</item>
-    </style>
-
-    <style name="nav_menu_style" parent="@style/ThemeOverlay.AppCompat.ActionBar">
-        <item name="selectableItemBackground">@drawable/nav_menu_bg</item>
-    </style>
-
-    <style name="OverflowMenuStyle" parent="Widget.AppCompat.Light.PopupMenu.Overflow">
-        <item name="overlapAnchor">false</item>
-        <item name="android:dropDownWidth">wrap_content</item>
-        <item name="android:paddingRight">5dp</item>
-        <item name="android:popupBackground">@color/white</item>
-        <item name="colorControlNormal">@color/white</item>
-    </style>
-
-    <style name="ConsoleTheme" parent="@android:style/Theme.Light">
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
-        <item name="android:windowNoTitle">true</item>
-        <item name="android:windowFrame">@null</item>
-        <item name="android:windowContentOverlay">@null</item>
-    </style>
-
-
-    <!--style name="WebViewTheme" parent="FinestWebViewTheme.Light">
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/white</item>
-        <item name="android:textColorPrimary">@color/white</item>
-        <item name="android:textColorSecondary">@color/white</item>
-        <item name="windowActionModeOverlay">true</item>
-    </style-->
-
-
-    <!-- Base application theme. -->
-    <style name="DownActivityTheme" parent="AppTheme">
-        <!-- Customize your theme here. -->
-
-        <item name="selectableItemBackground">@drawable/nav_menu_bg</item>
-    </style>
-
-
-    <style name="EditorSettingTheme" parent="AppTheme">
-        <item name="android:textColorPrimary">@color/text_dark</item>
-    </style>
-
-    <style name="ItemMenuTheme">
-        <item name="android:layout_width">wrap_content</item>
-        <item name="android:layout_height">match_parent</item>
-        <item name="android:gravity">center</item>
-        <item name="android:paddingLeft">16dp</item>
-        <item name="android:paddingRight">16dp</item>
-        <item name="android:textColor">@color/white</item>
-        <item name="android:textSize">15sp</item>
-    </style>
-
-</resources>
diff --git a/qpython-docs/CNAME b/qpython-docs/CNAME
deleted file mode 100644
index 4632497e..00000000
--- a/qpython-docs/CNAME
+++ /dev/null
@@ -1 +0,0 @@
-www.qpython.org
diff --git a/qpython-docs/Makefile b/qpython-docs/Makefile
deleted file mode 100644
index 37eab44d..00000000
--- a/qpython-docs/Makefile
+++ /dev/null
@@ -1,225 +0,0 @@
-# Makefile for Sphinx documentation
-#
-
-# You can set these variables from the command line.
-SPHINXOPTS    =
-SPHINXBUILD   = sphinx-build
-PAPER         =
-BUILDDIR      = build
-
-# Internal variables.
-PAPEROPT_a4     = -D latex_paper_size=a4
-PAPEROPT_letter = -D latex_paper_size=letter
-ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source
-# the i18n builder cannot share the environment and doctrees with the others
-I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source
-
-.PHONY: help
-help:
-	@echo "Please use \`make <target>' where <target> is one of"
-	@echo "  html       to make standalone HTML files"
-	@echo "  dirhtml    to make HTML files named index.html in directories"
-	@echo "  singlehtml to make a single large HTML file"
-	@echo "  pickle     to make pickle files"
-	@echo "  json       to make JSON files"
-	@echo "  htmlhelp   to make HTML files and a HTML help project"
-	@echo "  qthelp     to make HTML files and a qthelp project"
-	@echo "  applehelp  to make an Apple Help Book"
-	@echo "  devhelp    to make HTML files and a Devhelp project"
-	@echo "  epub       to make an epub"
-	@echo "  epub3      to make an epub3"
-	@echo "  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
-	@echo "  latexpdf   to make LaTeX files and run them through pdflatex"
-	@echo "  latexpdfja to make LaTeX files and run them through platex/dvipdfmx"
-	@echo "  text       to make text files"
-	@echo "  man        to make manual pages"
-	@echo "  texinfo    to make Texinfo files"
-	@echo "  info       to make Texinfo files and run them through makeinfo"
-	@echo "  gettext    to make PO message catalogs"
-	@echo "  changes    to make an overview of all changed/added/deprecated items"
-	@echo "  xml        to make Docutils-native XML files"
-	@echo "  pseudoxml  to make pseudoxml-XML files for display purposes"
-	@echo "  linkcheck  to check all external links for integrity"
-	@echo "  doctest    to run all doctests embedded in the documentation (if enabled)"
-	@echo "  coverage   to run coverage check of the documentation (if enabled)"
-	@echo "  dummy      to check syntax errors of document sources"
-
-.PHONY: clean
-clean:
-	rm -rf $(BUILDDIR)/*
-
-.PHONY: html
-html:
-	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
-	@echo
-	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html"
-
-.PHONY: dirhtml
-dirhtml:
-	$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
-	@echo
-	@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
-
-.PHONY: singlehtml
-singlehtml:
-	$(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
-	@echo
-	@echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."
-
-.PHONY: pickle
-pickle:
-	$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
-	@echo
-	@echo "Build finished; now you can process the pickle files."
-
-.PHONY: json
-json:
-	$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
-	@echo
-	@echo "Build finished; now you can process the JSON files."
-
-.PHONY: htmlhelp
-htmlhelp:
-	$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
-	@echo
-	@echo "Build finished; now you can run HTML Help Workshop with the" \
-	      ".hhp project file in $(BUILDDIR)/htmlhelp."
-
-.PHONY: qthelp
-qthelp:
-	$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
-	@echo
-	@echo "Build finished; now you can run "qcollectiongenerator" with the" \
-	      ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
-	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/QPython.qhcp"
-	@echo "To view the help file:"
-	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/QPython.qhc"
-
-.PHONY: applehelp
-applehelp:
-	$(SPHINXBUILD) -b applehelp $(ALLSPHINXOPTS) $(BUILDDIR)/applehelp
-	@echo
-	@echo "Build finished. The help book is in $(BUILDDIR)/applehelp."
-	@echo "N.B. You won't be able to view it unless you put it in" \
-	      "~/Library/Documentation/Help or install it in your application" \
-	      "bundle."
-
-.PHONY: devhelp
-devhelp:
-	$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
-	@echo
-	@echo "Build finished."
-	@echo "To view the help file:"
-	@echo "# mkdir -p $$HOME/.local/share/devhelp/QPython"
-	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/QPython"
-	@echo "# devhelp"
-
-.PHONY: epub
-epub:
-	$(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
-	@echo
-	@echo "Build finished. The epub file is in $(BUILDDIR)/epub."
-
-.PHONY: epub3
-epub3:
-	$(SPHINXBUILD) -b epub3 $(ALLSPHINXOPTS) $(BUILDDIR)/epub3
-	@echo
-	@echo "Build finished. The epub3 file is in $(BUILDDIR)/epub3."
-
-.PHONY: latex
-latex:
-	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
-	@echo
-	@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
-	@echo "Run \`make' in that directory to run these through (pdf)latex" \
-	      "(use \`make latexpdf' here to do that automatically)."
-
-.PHONY: latexpdf
-latexpdf:
-	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
-	@echo "Running LaTeX files through pdflatex..."
-	$(MAKE) -C $(BUILDDIR)/latex all-pdf
-	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
-
-.PHONY: latexpdfja
-latexpdfja:
-	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
-	@echo "Running LaTeX files through platex and dvipdfmx..."
-	$(MAKE) -C $(BUILDDIR)/latex all-pdf-ja
-	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
-
-.PHONY: text
-text:
-	$(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
-	@echo
-	@echo "Build finished. The text files are in $(BUILDDIR)/text."
-
-.PHONY: man
-man:
-	$(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
-	@echo
-	@echo "Build finished. The manual pages are in $(BUILDDIR)/man."
-
-.PHONY: texinfo
-texinfo:
-	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
-	@echo
-	@echo "Build finished. The Texinfo files are in $(BUILDDIR)/texinfo."
-	@echo "Run \`make' in that directory to run these through makeinfo" \
-	      "(use \`make info' here to do that automatically)."
-
-.PHONY: info
-info:
-	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
-	@echo "Running Texinfo files through makeinfo..."
-	make -C $(BUILDDIR)/texinfo info
-	@echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo."
-
-.PHONY: gettext
-gettext:
-	$(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) $(BUILDDIR)/locale
-	@echo
-	@echo "Build finished. The message catalogs are in $(BUILDDIR)/locale."
-
-.PHONY: changes
-changes:
-	$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
-	@echo
-	@echo "The overview file is in $(BUILDDIR)/changes."
-
-.PHONY: linkcheck
-linkcheck:
-	$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
-	@echo
-	@echo "Link check complete; look for any errors in the above output " \
-	      "or in $(BUILDDIR)/linkcheck/output.txt."
-
-.PHONY: doctest
-doctest:
-	$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
-	@echo "Testing of doctests in the sources finished, look at the " \
-	      "results in $(BUILDDIR)/doctest/output.txt."
-
-.PHONY: coverage
-coverage:
-	$(SPHINXBUILD) -b coverage $(ALLSPHINXOPTS) $(BUILDDIR)/coverage
-	@echo "Testing of coverage in the sources finished, look at the " \
-	      "results in $(BUILDDIR)/coverage/python.txt."
-
-.PHONY: xml
-xml:
-	$(SPHINXBUILD) -b xml $(ALLSPHINXOPTS) $(BUILDDIR)/xml
-	@echo
-	@echo "Build finished. The XML files are in $(BUILDDIR)/xml."
-
-.PHONY: pseudoxml
-pseudoxml:
-	$(SPHINXBUILD) -b pseudoxml $(ALLSPHINXOPTS) $(BUILDDIR)/pseudoxml
-	@echo
-	@echo "Build finished. The pseudo-XML files are in $(BUILDDIR)/pseudoxml."
-
-.PHONY: dummy
-dummy:
-	$(SPHINXBUILD) -b dummy $(ALLSPHINXOPTS) $(BUILDDIR)/dummy
-	@echo
-	@echo "Build finished. Dummy builder generates no files."
diff --git a/qpython-docs/add-analytics.py b/qpython-docs/add-analytics.py
deleted file mode 100644
index 021d9b7d..00000000
--- a/qpython-docs/add-analytics.py
+++ /dev/null
@@ -1,10 +0,0 @@
-import sys,os
-with open(sys.argv[1], 'r') as f, open('/tmp/qpydoc.tmp', 'wb') as g, open(os.path.dirname(os.path.abspath(__file__))+'/extra.txt','r') as e:
-    pth = sys.argv[1][1:]
-    extra = "".join(e.readlines()).replace("{{PTH}}",pth)
-    g.write('\n'.join(
-        filter(lambda s: len(s),
-               map(lambda s:
-                       ('',extra+"<hr/>")[s=='<div role="contentinfo">']+s,
-                   map(str.strip, f.readlines())))))
-os.rename('/tmp/qpydoc.tmp', sys.argv[1])
diff --git a/qpython-docs/build.sh b/qpython-docs/build.sh
deleted file mode 100755
index 679e35bd..00000000
--- a/qpython-docs/build.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-rm -fr ../docs
-make html
-
-#mv static static
-#mv sources sources
-
-cd build/html && find . -name "*.html" -exec python ../../add-analytics.py {} \; && find . -name "*.html" -exec sed -i -e 's/_static/static/g;s/_images/images/g' {} \; && find . -name "*-e" -exec rm {} \; && mv _static static && mv _images  images
-
-cd ../.. && mv build/html  ../docs && cp CNAME ../docs  && cp -r quick-start ../docs && cp favicon.ico  ../docs && cp index.html ../docs
diff --git a/qpython-docs/extra.txt b/qpython-docs/extra.txt
deleted file mode 100644
index 90a31b06..00000000
--- a/qpython-docs/extra.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-<script>(function(d, s, id) {
-  var js, fjs = d.getElementsByTagName(s)[0];
-  if (d.getElementById(id)) return;
-  js = d.createElement(s); js.id = id;
-  js.src = "//connect.facebook.net/en_US/sdk.js#xfbml=1&version=v2.8&appId=1680815145503311";
-  fjs.parentNode.insertBefore(js, fjs);
-}(document, 'script', 'facebook-jssdk'));</script>
-
-<div class="fb-comments" data-href="http://qpython.org{{PTH}}" data-numposts="10"></div>
-
-<script>
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-
-  ga('create', 'UA-36070037-1', 'auto');
-  ga('send', 'pageview');
-
-</script>
diff --git a/qpython-docs/favicon.ico b/qpython-docs/favicon.ico
deleted file mode 100644
index 5650a967..00000000
Binary files a/qpython-docs/favicon.ico and /dev/null differ
diff --git a/qpython-docs/img_banner-1.jpg b/qpython-docs/img_banner-1.jpg
deleted file mode 100644
index 35179f4e..00000000
Binary files a/qpython-docs/img_banner-1.jpg and /dev/null differ
diff --git a/qpython-docs/img_banner-1@2x.jpg b/qpython-docs/img_banner-1@2x.jpg
deleted file mode 100644
index e17b703a..00000000
Binary files a/qpython-docs/img_banner-1@2x.jpg and /dev/null differ
diff --git a/qpython-docs/index.html b/qpython-docs/index.html
deleted file mode 100755
index 1361441d..00000000
--- a/qpython-docs/index.html
+++ /dev/null
@@ -1,171 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-        <title>QPython -  Best Mobile Python IDE</title>
-        <meta charset="utf-8">
-        <meta name="keywords" content="QPython,Best Mobile Python IDE,python,qpython文档"/>
-        <meta name="description" content="QPython,Best Mobile Python IDE,python,qpython文档"/>
-    <link href="http://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet">
-    <script src="http://cdn.bootcss.com/jquery/3.2.1/jquery.min.js"></script>
-    <script src="http://cdn.bootcss.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
-    <meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
-    <link rel="stylesheet" type="text/css" href="static/qpython_theme.css">
-</head>
-<body>
-	<header>
-		<div class="col-lg-offset-2 col-lg-8 col-md-offset-2 col-md-8 col-sm-offset-2 col-sm-8 index-header">
-
-			<div class="navbar-header">
-				<button type="button" class="navbar-toggle" data-toggle="collapse"
-						data-target="#example-navbar-collapse">
-					<span class="sr-only">切换导航</span>
-					<span class="icon-bar"></span>
-					<span class="icon-bar"></span>
-					<span class="icon-bar"></span>
-				</button>
-				<a href="/index.html" class="logo"><img src="static/img_logo.png"></a>
-			</div>
-
-			<ul class="header-title collapse navbar-collapse" id="example-navbar-collapse">
-				<li class="header-phone-selected">
-					<a href="/index.html" class="header-selected">Home</a>
-					<!-- <span class="header-title-selected"></span> -->
-				</li>
-				<li>
-					<a href="/document.html">Guide</a>
-				</li>
-				<li>
-					<a target="_blank" href="https://github.com/qpython-android/qpython">Github</a>
-				</li>
-			</ul>
-			<div class="search-box hidden-xs">
-				<form action="/search.html">
-					<input type="search" name="q" placeholder="keyword">
-					<input type="hidden" name="check_keywords" value="yes" />
-            					<input type="hidden" name="area" value="default" />
-					<button><img src="static/ic_search.png"></button>
-				</form>
-			</div>
-		</div>
-	</header>
-
-	<main class="index-main">
-		<div class="row index-main-pic clear-margin">
-			<div class="col-lg-offset-2 col-lg-8 col-md-offset-2 col-md-8 col-sm-offset-2 col-sm-8">
-				<img src="static/img_banner-1@2x.jpg" class="img-responsive hidden-xs">
-				<img src="static/img_banner-1.jpg" class="img-responsive visible-xs">
-			</div>
-			<div class="col-lg-2 col-md-2 col-sm-2"></div>
-		</div>
-
-		<div class="row index-content">
-			<div class="col-lg-offset-2 col-lg-8 col-md-offset-2 col-md-8 col-sm-offset-2 col-sm-8">
-				<h2 class="h2"><span class="index-tag"></span>Welcome to read the QPython guide!</h2>
-				<div class="index-content-text">
-					QPython is a script engine that runs Python on android devices. lt lets your android device run Python scripts and projects. lt contains the Python interpreter,console,editor,and the SL4A Libray for Android. lt’s Python on Android!
-				</div>
-				<ul class="index-shop-logo-ul">
-					<li style="text-align: center;" class="visible-xs">
-						<a target="_brank" href="https://play.google.com/store/apps/details?id=org.qpython.qpy
-"><img class="index-shop-img" src="static/ic_googleplay_2x.png"></a>
-					</li>
-					<li style="text-align: center;" class="visible-xs">
-						<a target="_brank" href="https://play.google.com/store/apps/details?id=org.qpython.qpy3
-"><img class="index-shop-img" src="static/ic_googleplay_3_2x.png"></a>		
-					</li>
-				</ul>
-			</div>
-		</div>
-	</main>
-
-	<div class="index-more">
-		<div class="row clear-margin">
-			<div class="col-lg-offset-2 col-lg-8 col-md-offset-2 col-md-8 col-sm-offset-2 col-sm-8">
-				<ul class="row">
-					<li class="col-sm-4 index-more-li">
-						<div class="index-more-item">
-							<h4><img src="static/ic_new@2x.png" width="19px"> What’s NEW</h4>
-							<p>QPython project include the QPython and QPython3 applications.</p>
-							<p>QPython application is using the Python 2.7.2, and QPyton application is using the Python 3.2.2.</p>
-							<p>QPython’s newest version is 1.3.(Released on 2017/3/20),QPython3’s newest ……</p>
-						</div>
-					</li>
-					<li class="col-sm-4 index-more-li">
-						<div class="index-more-item">
-							<h4><img src="static/ic_community@2x.png" width="19px"> QPython communities</h4>
-							<p>There are many active QPython communities where you could meet the QPython users like you </p>
-							<ul>
-								<li>　•　Join Facebook community</li>
-								<li>　•　Join Google group</li>
-								<li>　•　Join Gitter chat</li>
-								<li>　•　Join G+ community(For QPython testers)</li>
-								<li>　•　QPython on Stackoverflow</li>
-							</ul>
-						</div>
-					</li>
-					<li class="col-sm-4 index-more-li">
-						<div class="index-more-item">
-							<h4><img src="static/ic_support@2x.png" width="19px"> Support</h4>
-							<p>We are happy to hear feedback from you, but sometimes some bugs or features demand may not be implented soon for we lack resources.</p>
-							<p>We are happy to hear feedback from you, but sometimes some bugs or features demand may not be implented soon for we lack resources.</p>
-						</div>
-					</li>
-				</ul>
-			</div>
-		</div>
-		<div class="row index-faq clear-margin">
-			<div class="col-sm-offset-2 col-sm-8">
-				<ul>
-					<li class="index-faq-li col-sm-4 hidden-xs">
-						<a href="http://www.facebook.com/qpython" target="_brank"><img class="index-link-logo" src="static/ic_facebook.png" width="44px"></a>
-						<a href="http://www.twitter.com/qpython" target="_brank"><img class="index-link-logo" src="static/ic_twitter.png" width="44px"></a>
-					</li>
-					<li class="index-faq-li col-sm-4">
-						<img src="static/ic_faq@2x.png">
-						<span class="span-faq">FAQ</span>
-						<p class="p-faq">
-							<a href="/en/faq.html">How to run qpython script from other terminals ?</a>
-						</p>
-					</li>
-					<li class="index-faq-li col-sm-4 hidden-xs">
-						<!-- <div style="text-align: right;">
-							<img class="index-shop-img" src="static/ic_appstore_2x.png">
-						</div> -->
-						<div style="text-align: right;">
-							<a target="_brank" href="https://play.google.com/store/apps/details?id=org.qpython.qpy
-"><img class="index-shop-img" src="static/ic_googleplay_2x.png"></a>		
-						</div>
-						<div style="text-align: right;">
-							<a target="_brank" href="https://play.google.com/store/apps/details?id=org.qpython.qpy3
-"><img class="index-shop-img" src="static/ic_googleplay_3_2x.png"></a>		
-						</div>
-					</li>
-				</ul>
-			</div>
-		</div>
-	</div>
-	<footer>
-		<div class="col-sm-offset-2 col-sm-6 footer-div1">
-			<div class="footer-block-item">
-				<span class="footer-item1">Built with Sphinx using a theme provid by QPython.</span>
-				<span class="footer-item2 visible-xs">Copyight 2017, QPython.</span>
-			</div>
-		</div>
-		<div class="col-sm-2 footer-div2">
-			<a href="/index.html" class="pull-right"><img src="static/img_logo.png"></a>
-		</div>
-	</footer>
-</body>
-</html>
-
-<script>
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-
-  ga('create', 'UA-36070037-1', 'auto');
-  ga('send', 'pageview');
-
-</script>
-
diff --git a/qpython-docs/media/logo32x32.png b/qpython-docs/media/logo32x32.png
deleted file mode 100644
index 05280509..00000000
Binary files a/qpython-docs/media/logo32x32.png and /dev/null differ
diff --git a/qpython-docs/quick-start/index.html b/qpython-docs/quick-start/index.html
deleted file mode 100644
index 19b2bad9..00000000
--- a/qpython-docs/quick-start/index.html
+++ /dev/null
@@ -1,189 +0,0 @@
-<!DOCTYPE html>
-<!--[if IE 6]>
-<html id="ie6" lang="en-US">
-<![endif]-->
-<!--[if IE 7]>
-<html id="ie7" lang="en-US">
-<![endif]-->
-<!--[if IE 8]>
-<html id="ie8" lang="en-US">
-<![endif]-->
-<!--[if !(IE 6) | !(IE 7) | !(IE 8)  ]><!-->
-<html lang="en-US">
-<!--<![endif]-->
-<head>
-<meta charset="UTF-8" />
-<meta name="viewport" content="width=device-width" />
-<title>Quick Start | QPyPI</title>
-<link rel="profile" href="http://gmpg.org/xfn/11" />
-<link rel="stylesheet" type="text/css" media="all" href="http://qpython.com/qrcode/wp-content/themes/twentyeleven/style.css" />
-<script type='text/javascript' src='http://code.jquery.com/jquery-1.8.3.min.js'></script>
-<style type="text/css">.recentcomments a{display:inline !important;padding:0 !important;margin:0 !important;}
-button {
-padding: 10px 16px;
-font-size: 18px;
-line-height: 1.33;
-border-radius: 6px;
-color: #ffffff;
-background-color: #5cb85c;
-border-color: #4cae4c;
-display: inline-block;
-padding: 6px 12px;
-margin-bottom: 0;
-font-size: 14px;
-font-weight: normal;
-line-height: 1.428571429;
-text-align: center;
-white-space: nowrap;
-vertical-align: middle;
-cursor: pointer;
-background-image: none;
-border: 1px solid transparent;
-border-radius: 4px;
--webkit-user-select: none;
--moz-user-select: none;
--ms-user-select: none;
--o-user-select: none;
-user-select: none;
-
-}
-</style>
-</head>
-
-<body class="page page-id-472 page-template-default single-author singular one-column content" style='background:white'>
-<div id="page" class="hfeed">
-    <header id="branding" role="banner" style='border-top:0px'>
-            <nav id="access" role="navigation">
-                <div class="menu"></div>
-            </nav><!-- #access -->
-    </header><!-- #branding -->
-
-    <div id="main" style='padding-top:0px'>
-        <div id="primary">
-            <div id="content" role="main">
-
-                <article id="post-472" class="post-472 page type-page status-publish hentry">
-                    <header class="entry-header"><h1 class="entry-title">Quick Start</h1></header><!-- .entry-header -->
-                    <div class="entry-content" style='padding:0px'>
-                    <div>
-<h2>A hands-on introduction to Python for beginning programmers</h2>
-<p>If you are a new guy to QPython, you should watch the tutorial video and just follow the steps to learn how to run script with QPython
-</p>
-<div style='text-align:center'><button style="display:inline" type="submit" value="" class="btn_c" id="step5-btn">Watch Tutorial</button></div>
-</div>
-<div style="padding-top:30px">
-<h2>Running with Console</h2>
-<p>Running QPython&#8217;s simple script with console model</p>
-<pre style="box-shadow:inset 0 1px 1px rgba(0,0,0,0.1);border:1px solid #ddd" id="step1-code">#qpy:2
-#qpy:console
-#qpy:http://qpython.com/s/qpy-sample.py
-
-class Calculator(object):
-    #define class to simulate a simple calculator
-    def __init__ (self):
-        #start with zero
-        self.current = 0
-    def add(self, amount):
-        #add number to current
-        self.current += amount
-    def getCurrent(self):
-        return self.current
-
-myBuddy = Calculator() # make myBuddy into a Calculator object
-myBuddy.add(2) #use myBuddy's new add method derived from the Calculator class
-print(myBuddy.getCurrent()) #print myBuddy's current instance variable
-
-</pre>
-<div style='text-align:center'><button style="display:inline" type="submit" value="" class="btn_c" id="step1-btn">Copy to editor to run</button></div>
-</div>
-<div style="padding-top:30px">
-<h2>Running with Kivy</h2>
-<p>Running QPython&#8217;s script with GUI model ( Kivy library )</p>
-<pre style="box-shadow:inset 0 1px 1px rgba(0,0,0,0.1);border:1px solid #ddd" id="step2-code">#qpy:2
-#qpy:kivy
-#qpy:http://qpython.com/s/qpy-guisample.py
-
-from kivy.app import App
-from kivy.uix.button import Button
-
-class TestApp(App):
-    def build(self):
-        # display a button with the text : Hello QPython 
-        return Button(text='Hello QPython')
-
-TestApp().run()
-</pre>
-<div style='text-align:center'><button style="display:inline" type="submit" value="Copy to editor to run" class="btn_c" id="step2-btn">Copy to editor to run</button></div>
-</div>
-<div style="padding-top:30px">
-<h2>Running as Web App ( QPython needs >= 0.9.7.x )</h2>
-<p>Running Web App with QPython</p>
-<pre style="box-shadow:inset 0 1px 1px rgba(0,0,0,0.1);border:1px solid #ddd" id="step6-code">#qpy:2
-#qpy:webapp:Hello Qpython
-#qpy://localhost:8080/hello
-"""
-This is a sample for qpython webapp
-"""
-from bottle import route, run
-
-@route('/hello')
-def hello():
-    return "Hello World!"
-
-run(host='localhost', port=8080)</pre>
-<div style='text-align:center'><button style="display:inline" type="submit" value="Copy to editor to run" class="btn_c" id="step6-btn">Copy to editor to run</button></div>
-</div>
-
-<div style='padding:20px'></div>
-<script>
-var milib;
-if (milib==undefined) {
-var milib = function(){
-};
-milib.qeditor = function(str){
-alert('please open it with QPython browser')
-};
-milib.a8playVideoFromGW= function(url){
-window.open(url)
-};
-milib.qpylibinstall = function(cat,url,target){
-window.open(url)
-};
-milib.gotoIfPay = function(url, packageId, packageUrl){
-window.open(url)
-};
-} else {
-}
-$(document).ready(function() {
-$('#step1-btn').click(function(e){
-milib.qeditor($('#step1-code').html())
-});
-$('#step2-btn').click(function(e){
-milib.qeditor($('#step2-code').html())
-});
-$('#step6-btn').click(function(e){
-milib.qeditor($('#step6-code').html())
-});
-$('#step3-btn').click(function(e){
-location.href='http://packages.qpython.org'
-});
-$('#step4-btn').click(function(e){
-location.href='http://wiki.qpython.org'
-});
-$('#step5-btn').click(function(e){
-milib.openUrl("https://m.youtube.com/results?q=python+programming&#038;sm=3");
-//milib.a8playVideoFromGW('http://www.youtube.com/watch?v=72RKMMyLxS8')
-//milib.a8playVideoFromGW('http://www.youtube.com/watch?v=N-ae8Q_7iCA')
-});
-});
-</script></p>
-                    </div><!-- .entry-content -->
-                    <footer class="entry-meta"></footer><!-- .entry-meta -->
-                </article><!-- #post-472 -->
-                <div id="comments"></div><!-- #comments -->
-            </div><!-- #content -->
-        </div><!-- #primary -->
-    </div><!-- #main -->
-</div><!-- #page -->
-</body>
-</html>
diff --git a/qpython-docs/source/_static/1.png b/qpython-docs/source/_static/1.png
deleted file mode 100644
index a539f0e8..00000000
Binary files a/qpython-docs/source/_static/1.png and /dev/null differ
diff --git a/qpython-docs/source/_static/2.png b/qpython-docs/source/_static/2.png
deleted file mode 100644
index dd65bc6c..00000000
Binary files a/qpython-docs/source/_static/2.png and /dev/null differ
diff --git a/qpython-docs/source/_static/3.png b/qpython-docs/source/_static/3.png
deleted file mode 100644
index cb9bbea5..00000000
Binary files a/qpython-docs/source/_static/3.png and /dev/null differ
diff --git a/qpython-docs/source/_static/bestpython.png b/qpython-docs/source/_static/bestpython.png
deleted file mode 100755
index 59940ff3..00000000
Binary files a/qpython-docs/source/_static/bestpython.png and /dev/null differ
diff --git a/qpython-docs/source/_static/guide_extend_pic1.png b/qpython-docs/source/_static/guide_extend_pic1.png
deleted file mode 100644
index fae7de0e..00000000
Binary files a/qpython-docs/source/_static/guide_extend_pic1.png and /dev/null differ
diff --git a/qpython-docs/source/_static/guide_extend_pic2.png b/qpython-docs/source/_static/guide_extend_pic2.png
deleted file mode 100644
index bcff8648..00000000
Binary files a/qpython-docs/source/_static/guide_extend_pic2.png and /dev/null differ
diff --git a/qpython-docs/source/_static/guide_helloworld_pic1.png b/qpython-docs/source/_static/guide_helloworld_pic1.png
deleted file mode 100644
index 712e9864..00000000
Binary files a/qpython-docs/source/_static/guide_helloworld_pic1.png and /dev/null differ
diff --git a/qpython-docs/source/_static/guide_howtostart_pic1.png b/qpython-docs/source/_static/guide_howtostart_pic1.png
deleted file mode 100644
index 54c666a7..00000000
Binary files a/qpython-docs/source/_static/guide_howtostart_pic1.png and /dev/null differ
diff --git a/qpython-docs/source/_static/guide_howtostart_pic2.png b/qpython-docs/source/_static/guide_howtostart_pic2.png
deleted file mode 100644
index 296a5150..00000000
Binary files a/qpython-docs/source/_static/guide_howtostart_pic2.png and /dev/null differ
diff --git a/qpython-docs/source/_static/guide_howtostart_pic3.png b/qpython-docs/source/_static/guide_howtostart_pic3.png
deleted file mode 100644
index f7caf8c7..00000000
Binary files a/qpython-docs/source/_static/guide_howtostart_pic3.png and /dev/null differ
diff --git a/qpython-docs/source/_static/guide_howtostart_pic4.png b/qpython-docs/source/_static/guide_howtostart_pic4.png
deleted file mode 100644
index 6d2b2fc3..00000000
Binary files a/qpython-docs/source/_static/guide_howtostart_pic4.png and /dev/null differ
diff --git a/qpython-docs/source/_static/guide_howtostart_pic5.png b/qpython-docs/source/_static/guide_howtostart_pic5.png
deleted file mode 100644
index 9e30aed4..00000000
Binary files a/qpython-docs/source/_static/guide_howtostart_pic5.png and /dev/null differ
diff --git a/qpython-docs/source/_static/guide_ide_qedit4web.png b/qpython-docs/source/_static/guide_ide_qedit4web.png
deleted file mode 100755
index 09f2ccb3..00000000
Binary files a/qpython-docs/source/_static/guide_ide_qedit4web.png and /dev/null differ
diff --git a/qpython-docs/source/_static/guide_ide_qedit4web_choose.png b/qpython-docs/source/_static/guide_ide_qedit4web_choose.png
deleted file mode 100644
index 6f3edfd3..00000000
Binary files a/qpython-docs/source/_static/guide_ide_qedit4web_choose.png and /dev/null differ
diff --git a/qpython-docs/source/_static/guide_ide_qedit4web_develop.png b/qpython-docs/source/_static/guide_ide_qedit4web_develop.png
deleted file mode 100644
index 0fde32ce..00000000
Binary files a/qpython-docs/source/_static/guide_ide_qedit4web_develop.png and /dev/null differ
diff --git a/qpython-docs/source/_static/guide_program_pic1.png b/qpython-docs/source/_static/guide_program_pic1.png
deleted file mode 100644
index 4cdf975c..00000000
Binary files a/qpython-docs/source/_static/guide_program_pic1.png and /dev/null differ
diff --git a/qpython-docs/source/_static/sl4a.jpg b/qpython-docs/source/_static/sl4a.jpg
deleted file mode 100644
index cf451532..00000000
Binary files a/qpython-docs/source/_static/sl4a.jpg and /dev/null differ
diff --git a/qpython-docs/source/_static/taskerplugin-for-qpython.png b/qpython-docs/source/_static/taskerplugin-for-qpython.png
deleted file mode 100644
index c78414f5..00000000
Binary files a/qpython-docs/source/_static/taskerplugin-for-qpython.png and /dev/null differ
diff --git a/qpython-docs/source/conf.py b/qpython-docs/source/conf.py
deleted file mode 100644
index f1146845..00000000
--- a/qpython-docs/source/conf.py
+++ /dev/null
@@ -1,338 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# QPython documentation build configuration file, created by
-# sphinx-quickstart on Fri Apr  7 15:07:35 2017.
-#
-# This file is execfile()d with the current directory set to its
-# containing dir.
-#
-# Note that not all possible configuration values are present in this
-# autogenerated file.
-#
-# All configuration values have a default; values that are commented out
-# serve to show the default.
-
-# If extensions (or modules to document with autodoc) are in another directory,
-# add these directories to sys.path here. If the directory is relative to the
-# documentation root, use os.path.abspath to make it absolute, like shown here.
-#
-import os
-import sys
-sys.path.insert(0, os.path.abspath('.'))
-try:
-    import qpython_theme
-except:
-    print('please install qpython_theme')
-
-    sys.exit(1)
-
-# -- General configuration ------------------------------------------------
-
-# If your documentation needs a minimal Sphinx version, state it here.
-#
-# needs_sphinx = '1.0'
-
-# Add any Sphinx extension module names here, as strings. They can be
-# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
-# ones.
-extensions = []
-
-# Add any paths that contain templates here, relative to this directory.
-templates_path = ['_templates']
-
-# The suffix(es) of source filenames.
-# You can specify multiple suffix as a list of string:
-#
-# source_suffix = ['.rst', '.md']
-source_suffix = '.rst'
-
-# The encoding of source files.
-#
-# source_encoding = 'utf-8-sig'
-
-# The master toctree document.
-master_doc = 'document'
-
-# General information about the project.
-project = u'QPython'
-copyright = u'2017, QPython'
-author = u'QPython'
-
-# The version info for the project you're documenting, acts as replacement for
-# |version| and |release|, also used in various other places throughout the
-# built documents.
-#
-# The short X.Y version.
-version = u'0.9'
-# The full version, including alpha/beta/rc tags.
-release = u'0.9'
-
-# The language for content autogenerated by Sphinx. Refer to documentation
-# for a list of supported languages.
-#
-# This is also used if you do content translation via gettext catalogs.
-# Usually you set "language" from the command line for these cases.
-language = None
-
-# There are two options for replacing |today|: either, you set today to some
-# non-false value, then it is used:
-#
-# today = ''
-#
-# Else, today_fmt is used as the format for a strftime call.
-#
-# today_fmt = '%B %d, %Y'
-
-# List of patterns, relative to source directory, that match files and
-# directories to ignore when looking for source files.
-# This patterns also effect to html_static_path and html_extra_path
-exclude_patterns = []
-
-# The reST default role (used for this markup: `text`) to use for all
-# documents.
-#
-# default_role = None
-
-# If true, '()' will be appended to :func: etc. cross-reference text.
-#
-# add_function_parentheses = True
-
-# If true, the current module name will be prepended to all description
-# unit titles (such as .. function::).
-#
-# add_module_names = True
-
-# If true, sectionauthor and moduleauthor directives will be shown in the
-# output. They are ignored by default.
-#
-# show_authors = False
-
-# The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
-
-# A list of ignored prefixes for module index sorting.
-# modindex_common_prefix = []
-
-# If true, keep warnings as "system message" paragraphs in the built documents.
-# keep_warnings = False
-
-# If true, `todo` and `todoList` produce output, else they produce nothing.
-todo_include_todos = False
-
-
-# -- Options for HTML output ----------------------------------------------
-
-# The theme to use for HTML and HTML Help pages.  See the documentation for
-# a list of builtin themes.
-#
-html_theme = 'qpython_theme'
-
-# Theme options are theme-specific and customize the look and feel of a theme
-# further.  For a list of options available for each theme, see the
-# documentation.
-#
-# html_theme_options = {}
-
-# Add any paths that contain custom themes here, relative to this directory.
-html_theme_path = [qpython_theme.theme_path]
-
-# The name for this set of Sphinx documents.
-# "<project> v<release> documentation" by default.
-#
-# html_title = u'QPython v0.9'
-
-# A shorter title for the navigation bar.  Default is the same as html_title.
-#
-# html_short_title = None
-
-# The name of an image file (relative to this directory) to place at the top
-# of the sidebar.
-#
-# html_logo = None
-
-# The name of an image file (relative to this directory) to use as a favicon of
-# the docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
-# pixels large.
-#
-# html_favicon = None
-
-# Add any paths that contain custom static files (such as style sheets) here,
-# relative to this directory. They are copied after the builtin static files,
-# so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
-
-# Add any extra paths that contain custom files (such as robots.txt or
-# .htaccess) here, relative to this directory. These files are copied
-# directly to the root of the documentation.
-#
-# html_extra_path = []
-
-# If not None, a 'Last updated on:' timestamp is inserted at every page
-# bottom, using the given strftime format.
-# The empty string is equivalent to '%b %d, %Y'.
-#
-# html_last_updated_fmt = None
-
-# If true, SmartyPants will be used to convert quotes and dashes to
-# typographically correct entities.
-#
-# html_use_smartypants = True
-
-# Custom sidebar templates, maps document names to template names.
-#
-#html_sidebars = {}
-
-# Additional templates that should be rendered to pages, maps page names to
-# template names.
-#
-# html_additional_pages = {}
-
-# If false, no module index is generated.
-#
-# html_domain_indices = True
-
-# If false, no index is generated.
-#
-# html_use_index = True
-
-# If true, the index is split into individual pages for each letter.
-#
-# html_split_index = False
-
-# If true, links to the reST sources are added to the pages.
-#
-# html_show_sourcelink = True
-
-# If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
-#
-# html_show_sphinx = True
-
-# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
-#
-# html_show_copyright = True
-
-# If true, an OpenSearch description file will be output, and all pages will
-# contain a <link> tag referring to it.  The value of this option must be the
-# base URL from which the finished HTML is served.
-#
-# html_use_opensearch = ''
-
-# This is the file name suffix for HTML files (e.g. ".xhtml").
-# html_file_suffix = None
-
-# Language to be used for generating the HTML full-text search index.
-# Sphinx supports the following languages:
-#   'da', 'de', 'en', 'es', 'fi', 'fr', 'hu', 'it', 'ja'
-#   'nl', 'no', 'pt', 'ro', 'ru', 'sv', 'tr', 'zh'
-#
-# html_search_language = 'en'
-
-# A dictionary with options for the search language support, empty by default.
-# 'ja' uses this config value.
-# 'zh' user can custom change `jieba` dictionary path.
-#
-# html_search_options = {'type': 'default'}
-
-# The name of a javascript file (relative to the configuration directory) that
-# implements a search results scorer. If empty, the default will be used.
-#
-# html_search_scorer = 'scorer.js'
-
-# Output file base name for HTML help builder.
-htmlhelp_basename = 'QPythondoc'
-
-# -- Options for LaTeX output ---------------------------------------------
-
-latex_elements = {
-     # The paper size ('letterpaper' or 'a4paper').
-     #
-     # 'papersize': 'letterpaper',
-
-     # The font size ('10pt', '11pt' or '12pt').
-     #
-     # 'pointsize': '10pt',
-
-     # Additional stuff for the LaTeX preamble.
-     #
-     # 'preamble': '',
-
-     # Latex figure (float) alignment
-     #
-     # 'figure_align': 'htbp',
-}
-
-# Grouping the document tree into LaTeX files. List of tuples
-# (source start file, target name, title,
-#  author, documentclass [howto, manual, or own class]).
-latex_documents = [
-    (master_doc, 'QPython.tex', u'QPython User Guide',
-     u'River', 'manual'),
-]
-
-# The name of an image file (relative to this directory) to place at the top of
-# the title page.
-#
-# latex_logo = None
-
-# For "manual" documents, if this is true, then toplevel headings are parts,
-# not chapters.
-#
-# latex_use_parts = False
-
-# If true, show page references after internal links.
-#
-# latex_show_pagerefs = False
-
-# If true, show URL addresses after external links.
-#
-# latex_show_urls = False
-
-# Documents to append as an appendix to all manuals.
-#
-# latex_appendices = []
-
-# If false, no module index is generated.
-#
-# latex_domain_indices = True
-
-
-# -- Options for manual page output ---------------------------------------
-
-# One entry per manual page. List of tuples
-# (source start file, name, description, authors, manual section).
-man_pages = [
-    (master_doc, 'qpython', u'QPython Documentation',
-     [author], 1)
-]
-
-# If true, show URL addresses after external links.
-#
-# man_show_urls = False
-
-
-# -- Options for Texinfo output -------------------------------------------
-
-# Grouping the document tree into Texinfo files. List of tuples
-# (source start file, target name, title, author,
-#  dir menu entry, description, category)
-texinfo_documents = [
-    (master_doc, 'QPython', u'QPython User Guide',
-     author, 'QPython', 'One line description of project.',
-     'Miscellaneous'),
-]
-
-# Documents to append as an appendix to all manuals.
-#
-# texinfo_appendices = []
-
-# If false, no module index is generated.
-#
-# texinfo_domain_indices = True
-
-# How to display URL addresses: 'footnote', 'no', or 'inline'.
-#
-# texinfo_show_urls = 'footnote'
-
-# If true, do not generate a @detailmenu in the "Top" node's menu.
-#
-# texinfo_no_detailmenu = False
diff --git a/qpython-docs/source/document.rst b/qpython-docs/source/document.rst
deleted file mode 100644
index 7ef4e7ee..00000000
--- a/qpython-docs/source/document.rst
+++ /dev/null
@@ -1,111 +0,0 @@
-.. QPython documentation master file, created by
-   sphinx-quickstart on Fri Apr  7 15:07:35 2017.
-   You can adapt this file completely to your liking, but it should at least
-   contain the root `toctree` directive.
-
-.. image:: _static/bestpython.png
-
-
-Welcome to read the QPython guide!
-=============================================
-
-QPython is a script engine that runs Python on android devices. It lets your android device run Python scripts and projects. It contains the Python interpreter, console, editor, and the SL4A Library for Android. It’s Python on Android!
-
-
-QPython has several millions users in the world already, it's a great project for programming users, welcome to join us for contributing to this project NOW.
-
-
-What's NEW
-------------------------
-QPython project include the `QPython <https://play.google.com/store/apps/details?id=org.qpython.qpy>`_ and `QPython3 <https://play.google.com/store/apps/details?id=org.qpython.qpy3>`_ applications.
-
-QPython application is using the **Python 2.7.2** , and QPython application is using the  **Python 3.2.2** .
-
-
-QPython's newest version is 1.3.2 (Released on 2017/5/12) , QPython3's newest version is 1.0.2 (Released on 2017/3/29), New versions include many amazing features, please upgrade to the newest version as soon from google play, amazon appstore etc.
-
-
-Thanks these guys who are contributing
-----------------------------------------
-They are pushing on the QPython project moving forward.
-
-.. image:: https://avatars0.githubusercontent.com/u/3059527?v=3&s=60
-   :target: https://github.com/riverfor
-   :alt: River is the project's organizer and the current online QPython's author.
-
-.. image:: https://avatars0.githubusercontent.com/u/10812534?v=3&s=60
-   :target: https://github.com/pollyfat
-   :alt: Mae is a beautiful and talented girl developer who is good at python & android programming.
-
-.. image:: https://avatars0.githubusercontent.com/u/22494?v=3&s=60
-   :target: https://github.com/ZoomQuiet
-   :alt: Zoom.Quiet is a knowledgeable guy who is famous in many opensource communities.
-
-.. image:: https://avatars3.githubusercontent.com/u/10219741?v=3&s=60
-   :target: https://github.com/mathiasluo
-   :alt: MathiasLuo is a android geek developer
-
-.. image:: https://avatars2.githubusercontent.com/u/25975283?v=3&s=60
-   :target: https://github.com/liyuanrui
-   :alt: liyuanrui is a Chinese geek
-
-.. image:: https://avatars3.githubusercontent.com/u/5159173?v=3&s=60
-   :target: https://github.com/kylelk
-   :alt: Kyle kersey is a US geek
-
-
-Do you want to join the great QPython team ? You could `Ask qustions on twitter <https://twitter.com/qpython>`_ or `email us <mailto:support@qpython.org>`_.
-And you could `fork us on github <https://github.com/qpython-android/qpython>`_ and send pull request.
-
-
-QPython Communities
-----------------------
-**There are many active QPython communities where you could meet the QPython users like you**
-
-* `Join Facebook community <https://www.facebook.com/groups/qpython>`_
-* `Join Google group <https://groups.google.com/forum/#!forum/qpython>`_
-* `Join Gitter chat <https://gitter.com/qpython-android/qpython>`_
-* `Join G+ community(For QPython testers) <https://plus.google.com/communities/111759148772865961493>`_
-* `QPython on Stackoverflow <http://stackoverflow.com/questions/tagged/qpython>`_
-
-**And you could talk to us through social network**
-
-* `Like us on facebook <https://www.facebook.com/QPython>`_
-* `Follow us on twitter <https://twitter.com/qpython>`_
-
-* `Report issue <https://github.com/qpython-android/qpython/issues>`_
-* `Email us <mailto:support@qpython.org>`_
-
-
-**It's the official QPython Users & Contributors' Guide, please follow these steps for using and contributing.**
-
-Support
--------------
-We are happy to hear feedback from you,  but sometimes some bugs or features demand may not be implemented soon for we lack resources.
-
-So if you have any issue need the core developer team to solve with higher priority, you could try the `bountysource service <https://www.bountysource.com/>`_.
-
-
-
-Now, let's GO
----------------
-.. toctree::
-   :maxdepth: 2
-
-   en/guide
-
-Others
----------------
-.. toctree::
-   :maxdepth: 2
-
-   en/faq
-
-
-For Chinese users
--------------------
-.. toctree::
-   :maxdepth: 2
-
-   zhindex
-
diff --git a/qpython-docs/source/en/faq.rst b/qpython-docs/source/en/faq.rst
deleted file mode 100644
index a891d3dd..00000000
--- a/qpython-docs/source/en/faq.rst
+++ /dev/null
@@ -1,26 +0,0 @@
-FAQ
-====
-
-
-**How to run qpython script from other terminals ?**
-
--  You could "share to" qpython from 3rd apps.
-
-- You need to root the android device first, then soure the env vars  (Just like the qpython wiki link you mentioned) and execute the /data/data/org.qpython.qpy/bin/python or /data/data/org.qpython.qpy/bin/python-android5 (for android 5 above)
-
-
-`Case sample <http://stackoverflow.com/questions/32110131/how-to-run-android-qpython-script-from-cmd-droidedit-terminal>`_
-
-
-
-**Support pygame ?**
-
-Even you could import pygame in QPython, but QPython doesn't support pygame now.
-
-We will consider to support it later, please follow us on facebook to get it's progress.
-
-
-`Case sample <http://stackoverflow.com/questions/30489732/qpythonpygame-segmentation-fault>`_
-
-
-
diff --git a/qpython-docs/source/en/guide.rst b/qpython-docs/source/en/guide.rst
deleted file mode 100644
index e13917ea..00000000
--- a/qpython-docs/source/en/guide.rst
+++ /dev/null
@@ -1,47 +0,0 @@
-Getting started
-==========================
-How to start quickly ? Just follow the following steps:
-
-.. toctree::
-   :maxdepth: 2
-
-   guide_howtostart
-   guide_helloworld
-
-
-Programming Guide
-========================
-
-If you you want to know more about how to program through qpython, just follow these steps:
-
-
-.. toctree::
-   :maxdepth: 2
-
-   guide_program
-   guide_ide
-   guide_libraries
-   guide_extend
-
-
-**QPython project is not only a powerful Python engine for android, but is a active technology community also.**
-
-Developers' Guide
-=======================
-QPython developers' goal is pushing out a great Python for android.
-
-.. toctree::
-   :maxdepth: 2
-
-   guide_developers
-
-
-Contributors' Guide
-========================
-
-Welcome to join QPython contributors team, you are not just a user, but a creator of QPython.
-
-.. toctree::
-   :maxdepth: 2
-
-   guide_contributors
diff --git a/qpython-docs/source/en/guide_androidhelpers.rst b/qpython-docs/source/en/guide_androidhelpers.rst
deleted file mode 100644
index 1dd97265..00000000
--- a/qpython-docs/source/en/guide_androidhelpers.rst
+++ /dev/null
@@ -1,2035 +0,0 @@
-The Scripting Layer for Android (abridged as SL4A, and previously named Android Scripting Environment or ASE) is a library that allows the creation and running of scripts written in various scripting languages directly on Android devices. QPython start to extend the SL4A project and integrate it.
-
-
-.. image:: ../_static/sl4a.jpg
-
-There are many SL4A APIs, if you found any issue, please `report an issue <https://github.com/qpython-android/qpython/issues>`_.
-
-AndroidFacade
-===============
-
-Clipboard APIs
-----------------
-.. py:function:: setClipboard(text)
-
-   Put text in the clipboard
-
-   :param str text: text
-
-.. py:function:: getClipboard(text)
-
-   Read text from the clipboard
-
-   :return: The text in the clipboard
-
-
-::
-
-    sample code to show setClipboard/getClipboard
-
-
-Intent & startActivity APIs
-----------------------------------
-.. py:function:: makeIntent(action, uri, type, extras, categories, packagename, classname, flags)
-
-   Starts an activity and returns the result
-
-   :param str action: action
-   :param str uri(Optional): uri
-   :param str type(Optional): MIME type/subtype of the URI
-   :param object extras(Optional): a Map of extras to add to the Intent
-   :param list categories(Optional): a List of categories to add to the Intent
-   :param str packagename(Optional): name of package. If used, requires classname to be useful
-   :param str classname(Optional): name of class. If used, requires packagename to be useful
-   :param int flags(Optional): Intent flags
-
-   :return: An object representing an Intent
-
-
-::
-
-    sample code to show makeIntent
-
-
-.. py:function:: getIntent()
-
-   Returns the intent that launched the script
-
-::
-
-    sample code to show getIntent
-
-
-.. py:function:: startActivityForResult(action, uri, type, extras, packagename, classname)
-
-   Starts an activity and returns the result
-
-   :param str action: action
-   :param str uri(Optional): uri
-   :param str type(Optional): MIME type/subtype of the URI
-   :param object extras(Optional): a Map of extras to add to the Intent
-   :param str packagename(Optional): name of package. If used, requires classname to be useful
-   :param str classname(Optional): name of class. If used, requires packagename to be useful
-
-   :return: A Map representation of the result Intent
-
-
-::
-
-    sample code to show startActivityForResult
-
-
-.. py:function:: startActivityForResultIntent(intent)
-
-   Starts an activity and returns the result
-
-   :param Intent intent: Intent in the format as returned from makeIntent
-
-   :return: A Map representation of the result Intent
-
-
-::
-
-    sample code to show startActivityForResultIntent
-
-.. py:function:: startActivityIntent(intent, wait)
-
-   Starts an activity
-
-   :param Intent intent: Intent in the format as returned from makeIntent
-   :param bool wait(Optional): block until the user exits the started activity
-
-::
-
-    sample code to show startActivityIntent
-
-
-.. py:function:: startActivity(action, uri, type, extras, wait, packagename, classname)
-
-   Starts an activity
-
-   :param str action: action
-   :param str uri(Optional): uri
-   :param str type(Optional): MIME type/subtype of the URI
-   :param object extras(Optional): a Map of extras to add to the Intent
-   :param bool wait(Optional): block until the user exits the started activity
-   :param str packagename(Optional): name of package. If used, requires classname to be useful
-   :param str classname(Optional): name of class. If used, requires packagename to be useful
-
-::
-
-    sample code to show startActivityForResultIntent
-
-
-SendBroadcast APIs
--------------------
-.. py:function:: sendBroadcast(action, uri, type, extras, packagename, classname)
-
-   Send a broadcast
-
-   :param str action: action
-   :param str uri(Optional): uri
-   :param str type(Optional): MIME type/subtype of the URI
-   :param object extras(Optional): a Map of extras to add to the Intent
-   :param str packagename(Optional): name of package. If used, requires classname to be useful
-   :param str classname(Optional): name of class. If used, requires packagename to be useful
-
-
-::
-
-    sample code to show sendBroadcast
-
-.. py:function:: sendBroadcastIntent(intent)
-
-   Send a broadcast
-
-   :param Intent intent: Intent in the format as returned from makeIntent
-
-::
-
-    sample code to show sendBroadcastIntent
-
-
-Vibrate
-----------
-.. py:function:: vibrate(intent)
-
-   Vibrates the phone or a specified duration in milliseconds
-
-   :param int duration: duration in milliseconds
-
-::
-
-    sample code to show vibrate
-
-
-NetworkStatus
----------------
-.. py:function:: getNetworkStatus()
-
-   Returns the status of network connection
-
-::
-
-    sample code to show getNetworkStatus
-
-PackageVersion APIs
-------------------------------
-.. py:function:: requiredVersion(requiredVersion)
-
-   Checks if version of QPython SL4A is greater than or equal to the specified version
-
-   :param int requiredVersion: requiredVersion
-
-   :return: true or false
-
-
-.. py:function:: getPackageVersionCode(packageName)
-
-   Returns package version code
-
-   :param str packageName: packageName
-
-   :return: Package version code
-
-.. py:function:: getPackageVersion(packageName)
-
-   Returns package version name
-
-   :param str packageName: packageName
-
-   :return: Package version name
-
-
-::
-
-    sample code to show getPackageVersionCode & getPackageVersion
-
-
-System APIs
---------------------------------
-.. py:function:: getConstants(classname)
-
-   Get list of constants (static final fields) for a class
-
-   :param str classname: classname
-
-   :return: list
-
-::
-
-    sample code to show getConstants
-
-.. py:function:: environment()
-
-   A map of various useful environment details
-
-   :return: environment map object includes id, display, offset, TZ, SDK, download, appcache, availblocks, blocksize, blockcount, sdcard
-
-::
-
-    sample code to show environment
-
-.. py:function:: log(message)
-
-   Writes message to logcat
-
-   :param str message: message
-
-::
-
-    sample code to show log
-
-
-SendEmail
-----------
-.. py:function:: sendEmail(to, subject, body, attachmentUri)
-
-   Launches an activity that sends an e-mail message to a given recipient
-
-   :param str to: A comma separated list of recipients
-   :param str subject: subject
-   :param str body: mail body
-   :param str attachmentUri(Optional): message
-
-::
-
-    sample code to show sendEmail
-
-
-Toast, getInput, getPassword, notify APIs
-------------------------------------------------
-.. py:function:: makeToast(message)
-
-   Displays a short-duration Toast notification
-
-   :param str message: message
-
-::
-
-    sample code to show makeToast
-
-.. py:function:: getInput(title, message)
-
-   Queries the user for a text input
-
-   :param str title: title of the input box
-   :param str message: message to display above the input box
-
-::
-
-    sample code to show getInput
-
-.. py:function:: getPassword(title, message)
-
-   Queries the user for a password
-
-   :param str title: title of the input box
-   :param str message: message to display above the input box
-
-::
-
-    sample code to show getPassword
-
-.. py:function:: notify(title, message, url)
-
-   Displays a notification that will be canceled when the user clicks on it
-
-   :param str title: title
-   :param str message: message 
-   :param str url(optional): url 
-
-::
-    import androidhelper
-    droid = androidhelper.Android()
-    droid.notify('Hello','QPython','http://qpython.org') # you could set the 3rd parameter None also
-
-
-
-ApplicationManagerFacade
-=========================
-
-Manager APIs
--------------
-
-.. py:function:: getLaunchableApplications()
-
-   Returns a list of all launchable application class names
-
-   :return: map object
-
-::
-
-    sample code to show getLaunchableApplications
-
-
-.. py:function:: launch(classname)
-
-   Start activity with the given class name
-
-   :param str classname: classname 
-
-::
-
-    sample code to show launch
-
-.. py:function:: getRunningPackages()
-
-   Returns a list of packages running activities or services
-
-   :return: List of packages running activities
-
-::
-
-    sample code to show getRunningPackages
-
-.. py:function:: forceStopPackage(packageName)
-
-   Force stops a package
-
-   :param str packageName: packageName
-
-::
-
-    sample code to show forceStopPackage
-
-
-CameraFacade
-=========================
-
-.. py:function:: cameraCapturePicture(targetPath)
-
-   Take a picture and save it to the specified path
-
-   :return: A map of Booleans autoFocus and takePicture where True indicates success
-
-.. py:function:: cameraInteractiveCapturePicture(targetPath)
-
-   Starts the image capture application to take a picture and saves it to the specified path
-
-CommonIntentsFacade
-=========================
-
-Barcode
-----------
-.. py:function:: scanBarcode()
-
-   Starts the barcode scanner
-
-   :return: A Map representation of the result Intent
-
-View APIs
-----------
-.. py:function:: pick(uri)
-
-   Display content to be picked by URI (e.g. contacts)
-
-   :return: A map of result values
-
-.. py:function:: view(uri, type, extras)
-
-   Start activity with view action by URI (i.e. browser, contacts, etc.)
-
-.. py:function:: viewMap(query)
-
-   Opens a map search for query (e.g. pizza, 123 My Street)
-
-.. py:function:: viewContacts()
-
-   Opens the list of contacts
-
-.. py:function:: viewHtml(path)
-
-   Opens the browser to display a local HTML file
-
-.. py:function:: search(query)
-
-   Starts a search for the given query
-
-ContactsFacade
-=========================
-
-.. py:function:: pickContact()
-
-   Displays a list of contacts to pick from
-
-   :return: A map of result values
-
-.. py:function:: pickPhone()
-
-   Displays a list of phone numbers to pick from
-
-   :return: The selected phone number
-
-.. py:function:: contactsGetAttributes()
-
-   Returns a List of all possible attributes for contacts
-
-   :return: a List of contacts as Maps
-
-.. py:function:: contactsGetIds()
-
-   Returns a List of all contact IDs
-
-.. py:function:: contactsGet(attributes)
-
-   Returns a List of all contacts
-
-.. py:function:: contactsGetById(id)
-
-   Returns contacts by ID
-
-.. py:function:: contactsGetCount()
-
-   Returns the number of contacts
-
-.. py:function:: queryContent(uri, attributes, selection, selectionArgs, order)
-
-   Content Resolver Query
-
-   :return: result of query as Maps
-
-.. py:function:: queryAttributes(uri)
-
-   Content Resolver Query Attributes
-
-   :return: a list of available columns for a given content uri
-
-EventFacade
-=========================
-
-.. py:function:: eventClearBuffer()
-
-   Clears all events from the event buffer
-
-.. py:function:: eventRegisterForBroadcast(category, enqueue)
-
-   Registers a listener for a new broadcast signal
-
-.. py:function:: eventUnregisterForBroadcast(category)
-
-   Stop listening for a broadcast signal
-
-.. py:function:: eventGetBrodcastCategories()
-
-   Lists all the broadcast signals we are listening for
-
-.. py:function:: eventPoll(number_of_events)
-
-   Returns and removes the oldest n events (i.e. location or sensor update, etc.) from the event buffer
-
-   :return: A List of Maps of event properties
-
-.. py:function:: eventWaitFor(eventName, timeout)
-
-   Blocks until an event with the supplied name occurs. The returned event is not removed from the buffer
-
-   :return: Map of event properties
-
-.. py:function:: eventWait(timeout)
-
-   Blocks until an event occurs. The returned event is removed from the buffer
-
-   :return: Map of event properties
-
-.. py:function:: eventPost(name, data, enqueue)
-
-   Post an event to the event queue
-
-.. py:function:: rpcPostEvent(name, data)
-
-   Post an event to the event queue
-
-.. py:function:: receiveEvent()
-
-   Returns and removes the oldest event (i.e. location or sensor update, etc.) from the event buffer
-
-   :return: Map of event properties
-
-.. py:function:: waitForEvent(eventName, timeout)
-
-   Blocks until an event with the supplied name occurs. The returned event is not removed from the buffer
-
-   :return: Map of event properties
-
-.. py:function:: startEventDispatcher(port)
-
-   Opens up a socket where you can read for events posted
-
-.. py:function:: stopEventDispatcher()
-
-   Stops the event server, you can't read in the port anymore
-
-LocationFacade
-=========================
-
-Providers APIs
------------------
-
-.. py:function:: locationProviders()
-
-   Returns availables providers on the phone
-
-.. py:function:: locationProviderEnabled(provider)
-
-   Ask if provider is enabled
-
-Location APIs
------------------
-.. py:function:: startLocating(minDistance, minUpdateDistance)
-
-   Starts collecting location data
-
-.. py:function:: readLocation()
-
-   Returns the current location as indicated by all available providers
-
-   :return: A map of location information by provider
-
-.. py:function:: stopLocating()
-
-   Stops collecting location data
-
-.. py:function:: getLastKnownLocation()
-
-   Returns the last known location of the device
-
-   :return: A map of location information by provider
-
-*sample code*
-::
-
-    Droid = androidhelper.Android()
-    location = Droid.getLastKnownLocation().result
-    location = location.get('network', location.get('gps'))
-
-
-GEO
------------
-.. py:function:: geocode(latitude, longitude, maxResults)
-
-   Returns a list of addresses for the given latitude and longitude
-
-   :return: A list of addresses
-
-PhoneFacade
-=========================
-
-PhoneStat APIs
-----------------
-
-.. py:function:: startTrackingPhoneState()
-
-   Starts tracking phone state
-
-.. py:function:: readPhoneState()
-
-   Returns the current phone state and incoming number
-
-   :return: A Map of "state" and "incomingNumber"
-
-.. py:function:: stopTrackingPhoneState()
-
-   Stops tracking phone state
-
-
-Call & Dia APIs
-----------------
-
-.. py:function:: phoneCall(uri)
-
-   Calls a contact/phone number by URI
-
-.. py:function:: phoneCallNumber(number)
-
-   Calls a phone number
-
-.. py:function:: phoneDial(uri)
-
-   Dials a contact/phone number by URI
-
-.. py:function:: phoneDialNumber(number)
-
-   Dials a phone number
-
-
-
-Get information APIs
-------------------------
-.. py:function:: getCellLocation()
-
-   Returns the current cell location
-
-.. py:function:: getNetworkOperator()
-
-   Returns the numeric name (MCC+MNC) of current registered operator
-
-.. py:function:: getNetworkOperatorName()
-
-   Returns the alphabetic name of current registered operator
-
-.. py:function:: getNetworkType()
-
-   Returns a the radio technology (network type) currently in use on the device
-
-.. py:function:: getPhoneType()
-
-   Returns the device phone type
-
-.. py:function:: getSimCountryIso()
-
-   Returns the ISO country code equivalent for the SIM provider's country code
-
-.. py:function:: getSimOperator()
-
-   Returns the MCC+MNC (mobile country code + mobile network code) of the provider of the SIM. 5 or 6 decimal digits
-
-.. py:function:: getSimOperatorName()
-
-   Returns the Service Provider Name (SPN)
-
-.. py:function:: getSimSerialNumber()
-
-   Returns the serial number of the SIM, if applicable. Return null if it is unavailable
-
-.. py:function:: getSimState()
-
-   Returns the state of the device SIM card
-
-.. py:function:: getSubscriberId()
-
-   Returns the unique subscriber ID, for example, the IMSI for a GSM phone. Return null if it is unavailable
-
-.. py:function:: getVoiceMailAlphaTag()
-
-   Retrieves the alphabetic identifier associated with the voice mail number
-
-.. py:function:: getVoiceMailNumber()
-
-   Returns the voice mail number. Return null if it is unavailable
-
-.. py:function:: checkNetworkRoaming()
-
-   Returns true if the device is considered roaming on the current network, for GSM purposes
-
-.. py:function:: getDeviceId()
-
-   Returns the unique device ID, for example, the IMEI for GSM and the MEID for CDMA phones. Return null if device ID is not available
-
-.. py:function:: getDeviceSoftwareVersion()
-
-   Returns the software version number for the device, for example, the IMEI/SV for GSM phones. Return null if the software version is not available
-
-.. py:function:: getLine1Number()
-
-   Returns the phone number string for line 1, for example, the MSISDN for a GSM phone. Return null if it is unavailable
-
-.. py:function:: getNeighboringCellInfo()
-
-   Returns the neighboring cell information of the device
-
-MediaRecorderFacade
-=========================
-
-
-Audio
---------
-
-.. py:function:: recorderStartMicrophone(targetPath)
-
-   Records audio from the microphone and saves it to the given location
-
-Video APIs
------------
-
-.. py:function:: recorderStartVideo(targetPath, duration, videoSize)
-
-   Records video from the camera and saves it to the given location.
-   Duration specifies the maximum duration of the recording session.
-   If duration is 0 this method will return and the recording will only be stopped
-   when recorderStop is called or when a scripts exits.
-   Otherwise it will block for the time period equal to the duration argument.
-   videoSize: 0=160x120, 1=320x240, 2=352x288, 3=640x480, 4=800x480.
-
-
-.. py:function:: recorderCaptureVideo(targetPath, duration, recordAudio)
-
-   Records video (and optionally audio) from the camera and saves it to the given location.
-   Duration specifies the maximum duration of the recording session.
-   If duration is not provided this method will return immediately and the recording will only be stopped
-   when recorderStop is called or when a scripts exits.
-   Otherwise it will block for the time period equal to the duration argument.
-
-.. py:function:: startInteractiveVideoRecording(path)
-
-   Starts the video capture application to record a video and saves it to the specified path
-
-
-Stop
---------
-.. py:function:: recorderStop()
-
-   Stops a previously started recording
-
-
-SensorManagerFacade
-=========================
-
-Start & Stop
--------------
-.. py:function:: startSensingTimed(sensorNumber, delayTime)
-
-   Starts recording sensor data to be available for polling
-
-.. py:function:: startSensingThreshold(ensorNumber, threshold, axis)
-
-   Records to the Event Queue sensor data exceeding a chosen threshold
-
-.. py:function:: startSensing(sampleSize)
-
-   Starts recording sensor data to be available for polling
-
-.. py:function:: stopSensing()
-
-   Stops collecting sensor data
-
-Read data APIs
----------------
-.. py:function:: readSensors()
-
-   Returns the most recently recorded sensor data
-
-.. py:function:: sensorsGetAccuracy()
-
-   Returns the most recently received accuracy value
-
-.. py:function:: sensorsGetLight()
-
-   Returns the most recently received light value
-
-.. py:function:: sensorsReadAccelerometer()
-
-   Returns the most recently received accelerometer values
-
-   :return: a List of Floats [(acceleration on the) X axis, Y axis, Z axis]
-
-.. py:function:: sensorsReadMagnetometer()
-
-   Returns the most recently received magnetic field values
-
-   :return: a List of Floats [(magnetic field value for) X axis, Y axis, Z axis]
-
-.. py:function:: sensorsReadOrientation()
-
-   Returns the most recently received orientation values
-
-   :return: a List of Doubles [azimuth, pitch, roll]
-
-*sample code*
-::
-
-    Droid = androidhelper.Android()
-    Droid.startSensingTimed(1, 250)
-    sensor = Droid.sensorsReadOrientation().result
-    Droid.stopSensing()
-
-
-SettingsFacade
-=========================
-
-Screen
-----------
-
-.. py:function:: setScreenTimeout(value)
-
-   Sets the screen timeout to this number of seconds
-
-   :return: The original screen timeout
-
-.. py:function:: getScreenTimeout()
-
-   Gets the screen timeout
-
-   :return: the current screen timeout in seconds
-
-AirplanerMode
----------------------
-
-.. py:function:: checkAirplaneMode()
-
-   Checks the airplane mode setting
-
-   :return: True if airplane mode is enabled
-
-.. py:function:: toggleAirplaneMode(enabled)
-
-   Toggles airplane mode on and off
-
-   :return: True if airplane mode is enabled
-
-Ringer Silent Mode
----------------------
-
-.. py:function:: checkRingerSilentMode()
-
-   Checks the ringer silent mode setting
-
-   :return: True if ringer silent mode is enabled
-
-.. py:function:: toggleRingerSilentMode(enabled)
-
-   Toggles ringer silent mode on and off
-
-   :return: True if ringer silent mode is enabled
-
-Vibrate Mode
----------------------
-
-.. py:function:: toggleVibrateMode(enabled)
-
-   Toggles vibrate mode on and off. If ringer=true then set Ringer setting, else set Notification setting
-
-   :return: True if vibrate mode is enabled
-
-.. py:function:: getVibrateMode(ringer)
-
-   Checks Vibration setting. If ringer=true then query Ringer setting, else query Notification setting
-
-   :return: True if vibrate mode is enabled
-
-Ringer & Media Volume
----------------------
-
-.. py:function:: getMaxRingerVolume()
-
-   Returns the maximum ringer volume
-
-.. py:function:: getRingerVolume()
-
-   Returns the current ringer volume
-
-.. py:function:: setRingerVolume(volume)
-
-   Sets the ringer volume
-
-.. py:function:: getMaxMediaVolume()
-
-   Returns the maximum media volume
-
-.. py:function:: getMediaVolume()
-
-   Returns the current media volume
-
-.. py:function:: setMediaVolume(volume)
-
-   Sets the media volume
-
-Screen Brightness
----------------------
-
-.. py:function:: getScreenBrightness()
-
-   Returns the screen backlight brightness
-
-   :return: the current screen brightness between 0 and 255
-
-.. py:function:: setScreenBrightness(value)
-
-   Sets the the screen backlight brightness
-
-   :return: the original screen brightness
-
-.. py:function:: checkScreenOn()
-
-   Checks if the screen is on or off (requires API level 7)
-
-   :return: True if the screen is currently on
-
-
-SmsFacade
-=========================
-
-.. py:function:: smsSend(destinationAddress, text)
-
-   Sends an SMS
-
-   :param str destinationAddress: typically a phone number
-   :param str text:
-
-.. py:function:: smsGetMessageCount(unreadOnly, folder)
-
-   Returns the number of messages
-
-   :param bool unreadOnly: typically a phone number
-   :param str folder(optional): default "inbox"
-
-.. py:function:: smsGetMessageIds(unreadOnly, folder)
-
-   Returns a List of all message IDs
-
-   :param bool unreadOnly: typically a phone number
-   :param str folder(optional): default "inbox"
-
-.. py:function:: smsGetMessages(unreadOnly, folder, attributes)
-
-   Returns a List of all messages
-
-   :param bool unreadOnly: typically a phone number
-   :param str folder: default "inbox"
-   :param list attributes(optional): attributes
-
-   :return: a List of messages as Maps
-
-.. py:function:: smsGetMessageById(id, attributes)
-
-   Returns message attributes
-
-   :param int id: message ID
-   :param list attributes(optional): attributes
-
-   :return: a List of messages as Maps
-
-.. py:function:: smsGetAttributes()
-
-   Returns a List of all possible message attributes
-
-.. py:function:: smsDeleteMessage(id)
-
-   Deletes a message
-
-   :param int id: message ID
-
-   :return: True if the message was deleted
-
-.. py:function:: smsMarkMessageRead(ids, read)
-
-   Marks messages as read
-
-   :param list ids: List of message IDs to mark as read
-   :param bool read:  true or false
-
-   :return: number of messages marked read
-
-SpeechRecognitionFacade
-=========================
-
-.. py:function:: recognizeSpeech(prompt, language, languageModel)
-
-   Recognizes user's speech and returns the most likely result
-
-   :param str prompt(optional): text prompt to show to the user when asking them to speak
-   :param str language(optional): language override to inform the recognizer that it should expect speech in a language different than the one set in the java.util.Locale.getDefault()
-   :param str languageModel(optional): informs the recognizer which speech model to prefer (see android.speech.RecognizeIntent)
-
-   :return: An empty string in case the speech cannot be recongnized
-
-
-ToneGeneratorFacade
-=========================
-
-.. py:function:: generateDtmfTones(phoneNumber, toneDuration)
-
-   Generate DTMF tones for the given phone number
-
-   :param str phoneNumber: phone number
-   :param int toneDuration(optional): default 100, duration of each tone in milliseconds
-
-
-WakeLockFacade
-=========================
-
-.. py:function:: wakeLockAcquireFull()
-
-   Acquires a full wake lock (CPU on, screen bright, keyboard bright)
-
-.. py:function:: wakeLockAcquirePartial()
-
-   Acquires a partial wake lock (CPU on)
-
-.. py:function:: wakeLockAcquireBright()
-
-   Acquires a bright wake lock (CPU on, screen bright)
-
-.. py:function:: wakeLockAcquireDim()
-
-   Acquires a dim wake lock (CPU on, screen dim)
-
-.. py:function:: wakeLockRelease()
-
-   Releases the wake lock
-
-WifiFacade
-=========================
-
-.. py:function:: wifiGetScanResults()
-
-   Returns the list of access points found during the most recent Wifi scan
-
-.. py:function:: wifiLockAcquireFull()
-
-   Acquires a full Wifi lock
-
-.. py:function:: wifiLockAcquireScanOnly()
-
-   Acquires a scan only Wifi lock
-
-.. py:function:: wifiLockRelease()
-
-   Releases a previously acquired Wifi lock
-
-.. py:function:: wifiStartScan()
-
-   Starts a scan for Wifi access points
-
-   :return: True if the scan was initiated successfully
-
-.. py:function:: checkWifiState()
-
-   Checks Wifi state
-
-   :return: True if Wifi is enabled
-
-.. py:function:: toggleWifiState(enabled)
-
-   Toggle Wifi on and off
-
-   :param bool enabled(optional): enabled
-
-   :return: True if Wifi is enabled
-
-.. py:function:: wifiDisconnect()
-
-   Disconnects from the currently active access point
-
-   :return: True if the operation succeeded
-
-.. py:function:: wifiGetConnectionInfo()
-
-   Returns information about the currently active access point
-
-.. py:function:: wifiReassociate()
-
-   Returns information about the currently active access point
-
-   :return: True if the operation succeeded
-
-.. py:function:: wifiReconnect()
-
-   Reconnects to the currently active access point
-
-   :return: True if the operation succeeded
-
-
-BatteryManagerFacade
-=========================
-
-.. py:function:: readBatteryData()
-
-   Returns the most recently recorded battery data
-
-.. py:function:: batteryStartMonitoring()
-
-   Starts tracking battery state
-
-.. py:function:: batteryStopMonitoring()
-
-   Stops tracking battery state
-
-.. py:function:: batteryGetStatus()
-
-   Returns  the most recently received battery status data:
-   1 - unknown;
-   2 - charging;
-   3 - discharging;
-   4 - not charging;
-   5 - full
-
-.. py:function:: batteryGetHealth()
-
-   Returns the most recently received battery health data:
-   1 - unknown;
-   2 - good;
-   3 - overheat;
-   4 - dead;
-   5 - over voltage;
-   6 - unspecified failure
-
-.. py:function:: batteryGetPlugType()
-
-   Returns the most recently received plug type data:
-   -1 - unknown
-   0 - unplugged
-   1 - power source is an AC charger
-   2 - power source is a USB port
-
-
-.. py:function:: batteryCheckPresent()
-
-   Returns the most recently received battery presence data
-
-.. py:function:: batteryGetLevel()
-
-   Returns the most recently received battery level (percentage)
-
-.. py:function:: batteryGetVoltage()
-
-   Returns the most recently received battery voltage
-
-.. py:function:: batteryGetTemperature()
-
-   Returns the most recently received battery temperature
-
-.. py:function:: batteryGetTechnology()
-
-   Returns the most recently received battery technology data
-
-
-ActivityResultFacade
-=========================
-
-.. py:function:: setResultBoolean(resultCode, resultValue)
-
-   Sets the result of a script execution. Whenever the script APK is called via startActivityForResult(),
-   the resulting intent will contain SCRIPT_RESULT extra with the given value
-
-   :param int resultCode:
-   :param byte resultValue:
-
-
-.. py:function:: setResultByte(resultCode, resultValue)
-
-   Sets the result of a script execution. Whenever the script APK is called via startActivityForResult(),
-   the resulting intent will contain SCRIPT_RESULT extra with the given value
-
-   :param int resultCode:
-   :param byte resultValue:
-
-.. py:function:: setResultShort(resultCode, resultValue)
-
-   Sets the result of a script execution. Whenever the script APK is called via startActivityForResult(),
-   the resulting intent will contain SCRIPT_RESULT extra with the given value
-
-   :param int resultCode:
-   :param byte resultValue:
-
-.. py:function:: setResultChar(resultCode, resultValue)
-
-   Sets the result of a script execution. Whenever the script APK is called via startActivityForResult(),
-   the resulting intent will contain SCRIPT_RESULT extra with the given value
-
-   :param int resultCode:
-   :param byte resultValue:
-
-
-.. py:function:: setResultInteger(resultCode, resultValue)
-
-   Sets the result of a script execution. Whenever the script APK is called via startActivityForResult(),
-   the resulting intent will contain SCRIPT_RESULT extra with the given value
-
-   :param int resultCode:
-   :param byte resultValue:
-
-.. py:function:: setResultLong(resultCode, resultValue)
-
-   Sets the result of a script execution. Whenever the script APK is called via startActivityForResult(),
-   the resulting intent will contain SCRIPT_RESULT extra with the given value
-
-   :param int resultCode:
-   :param byte resultValue:
-
-.. py:function:: setResultFloat(resultCode, resultValue)
-
-   Sets the result of a script execution. Whenever the script APK is called via startActivityForResult(),
-   the resulting intent will contain SCRIPT_RESULT extra with the given value
-
-   :param int resultCode:
-   :param byte resultValue:
-
-.. py:function:: setResultDouble(resultCode, resultValue)
-
-   Sets the result of a script execution. Whenever the script APK is called via startActivityForResult(),
-   the resulting intent will contain SCRIPT_RESULT extra with the given value
-
-   :param int resultCode:
-   :param byte resultValue:
-
-.. py:function:: setResultString(resultCode, resultValue)
-
-   Sets the result of a script execution. Whenever the script APK is called via startActivityForResult(),
-   the resulting intent will contain SCRIPT_RESULT extra with the given value
-
-   :param int resultCode:
-   :param byte resultValue:
-
-.. py:function:: setResultBooleanArray(resultCode, resultValue)
-
-   Sets the result of a script execution. Whenever the script APK is called via startActivityForResult(),
-   the resulting intent will contain SCRIPT_RESULT extra with the given value
-
-   :param int resultCode:
-   :param byte resultValue:
-
-.. py:function:: setResultByteArray(resultCode, resultValue)
-
-   Sets the result of a script execution. Whenever the script APK is called via startActivityForResult(),
-   the resulting intent will contain SCRIPT_RESULT extra with the given value
-
-   :param int resultCode:
-   :param byte resultValue:
-
-.. py:function:: setResultShortArray(resultCode, resultValue)
-
-   Sets the result of a script execution. Whenever the script APK is called via startActivityForResult(),
-   the resulting intent will contain SCRIPT_RESULT extra with the given value
-
-   :param int resultCode:
-   :param byte resultValue:
-
-.. py:function:: setResultCharArray(resultCode, resultValue)
-
-   Sets the result of a script execution. Whenever the script APK is called via startActivityForResult(),
-   the resulting intent will contain SCRIPT_RESULT extra with the given value
-
-   :param int resultCode:
-   :param byte resultValue:
-
-.. py:function:: setResultIntegerArray(resultCode, resultValue)
-
-   Sets the result of a script execution. Whenever the script APK is called via startActivityForResult(),
-   the resulting intent will contain SCRIPT_RESULT extra with the given value
-
-   :param int resultCode:
-   :param byte resultValue:
-
-.. py:function:: setResultLongArray(resultCode, resultValue)
-
-   Sets the result of a script execution. Whenever the script APK is called via startActivityForResult(),
-   the resulting intent will contain SCRIPT_RESULT extra with the given value
-
-   :param int resultCode:
-   :param byte resultValue:
-
-.. py:function:: setResultFloatArray(resultCode, resultValue)
-
-   Sets the result of a script execution. Whenever the script APK is called via startActivityForResult(),
-   the resulting intent will contain SCRIPT_RESULT extra with the given value
-
-   :param int resultCode:
-   :param byte resultValue:
-
-.. py:function:: setResultDoubleArray(resultCode, resultValue)
-
-   Sets the result of a script execution. Whenever the script APK is called via startActivityForResult(),
-   the resulting intent will contain SCRIPT_RESULT extra with the given value
-
-   :param int resultCode:
-   :param byte resultValue:
-
-.. py:function:: setResultStringArray(resultCode, resultValue)
-
-   Sets the result of a script execution. Whenever the script APK is called via startActivityForResult(),
-   the resulting intent will contain SCRIPT_RESULT extra with the given value
-
-   :param int resultCode:
-   :param byte resultValue:
-
-.. py:function:: setResultSerializable(resultCode, resultValue)
-
-   Sets the result of a script execution. Whenever the script APK is called via startActivityForResult(),
-   the resulting intent will contain SCRIPT_RESULT extra with the given value
-
-   :param int resultCode:
-   :param byte resultValue:
-
-
-MediaPlayerFacade
-=========================
-
-Control
------------------
-.. py:function:: mediaPlay(url, tag, play)
-
-   Open a media file
-
-   :param str url: url of media resource
-   :param str tag(optional): string identifying resource (default=default)
-   :param bool play(optional): start playing immediately
-
-   :return: true if play successful
-
-.. py:function:: mediaPlayPause(tag)
-
-   pause playing media file
-
-   :param str tag: string identifying resource (default=default)
-
-   :return: true if successful
-
-.. py:function:: mediaPlayStart(tag)
-
-   start playing media file
-
-   :param str tag: string identifying resource (default=default)
-
-   :return: true if successful
-
-.. py:function:: mediaPlayClose(tag)
-
-   Close media file
-
-   :param str tag: string identifying resource (default=default)
-
-   :return: true if successful
-
-.. py:function:: mediaIsPlaying(tag)
-
-   Checks if media file is playing
-
-   :param str tag: string identifying resource (default=default)
-
-   :return: true if successful
-
-
-.. py:function:: mediaPlaySetLooping(enabled, tag)
-
-   Set Looping
-
-   :param bool enabled: default true
-   :param str tag: string identifying resource (default=default)
-
-   :return: True if successful
-
-.. py:function:: mediaPlaySeek(msec, tag)
-
-   Seek To Position
-
-   :param int msec: default true
-   :param str tag: string identifying resource (default=default)
-
-   :return: New Position (in ms)
-
-Get Information
------------------
-.. py:function:: mediaPlayInfo(tag)
-
-   Information on current media
-
-   :param str tag: string identifying resource (default=default)
-
-   :return: Media Information
-
-.. py:function:: mediaPlayList()
-
-   Lists currently loaded media
-
-   :return: List of Media Tags
-
-
-PreferencesFacade
-=========================
-
-.. py:function:: prefGetValue(key, filename)
-
-   Read a value from shared preferences
-
-   :param str key: key
-   :param str filename(optional): Desired preferences file. If not defined, uses the default Shared Preferences.
-
-
-.. py:function:: prefPutValue(key, value, filename)
-
-   Write a value to shared preferences
-
-   :param str key: key
-   :param str value: value
-   :param str filename(optional): Desired preferences file. If not defined, uses the default Shared Preferences.
-
-.. py:function:: prefGetAll(filename)
-
-   Get list of Shared Preference Values
-
-   :param str filename(optional): Desired preferences file. If not defined, uses the default Shared Preferences.
-
-
-QPyInterfaceFacade
-=========================
-
-.. py:function:: executeQPy(script)
-
-   Execute a qpython script by absolute path
-
-   :param str script: The absolute path of the qpython script
-
-   :return: bool
-
-
-TextToSpeechFacade
-=========================
-
-.. py:function:: ttsSpeak(message)
-
-   Speaks the provided message via TTS
-
-   :param str message: message
-
-.. py:function:: ttsIsSpeaking()
-
-   Returns True if speech is currently in progress
-
-EyesFreeFacade
-=========================
-
-.. py:function:: ttsSpeak(message)
-
-   Speaks the provided message via TTS
-
-   :param str message: message
-
-
-BluetoothFacade
-=========================
-
-.. py:function:: bluetoothActiveConnections()
-
-   Returns active Bluetooth connections
-
-
-.. py:function:: bluetoothWriteBinary(base64, connID)
-
-   Send bytes over the currently open Bluetooth connection
-
-   :param str base64: A base64 encoded String of the bytes to be sent
-   :param str connID(optional): Connection id
-
-.. py:function:: bluetoothReadBinary(bufferSize, connID)
-
-   Read up to bufferSize bytes and return a chunked, base64 encoded string
-
-   :param int bufferSize: default 4096
-   :param str connID(optional): Connection id
-
-.. py:function:: bluetoothConnect(uuid, address)
-
-   Connect to a device over Bluetooth. Blocks until the connection is established or fails
-
-   :param str uuid: The UUID passed here must match the UUID used by the server device
-   :param str address(optional): The user will be presented with a list of discovered devices to choose from if an address is not provided
-
-   :return: True if the connection was established successfully
-
-.. py:function:: bluetoothAccept(uuid, timeout)
-
-   Listens for and accepts a Bluetooth connection. Blocks until the connection is established or fails
-
-   :param str uuid: The UUID passed here must match the UUID used by the server device
-   :param int timeout: How long to wait for a new connection, 0 is wait for ever (default=0)
-
-.. py:function:: bluetoothMakeDiscoverable(duration)
-
-   Requests that the device be discoverable for Bluetooth connections
-
-   :param int duration: period of time, in seconds, during which the device should be discoverable (default=300)
-
-.. py:function:: bluetoothWrite(ascii, connID)
-
-   Sends ASCII characters over the currently open Bluetooth connection
-
-   :param str ascii: text
-   :param str connID: Connection id
-
-.. py:function:: bluetoothReadReady(connID)
-
-   Sends ASCII characters over the currently open Bluetooth connection
-
-   :param str ascii: text
-   :param str connID: Connection id
-
-.. py:function:: bluetoothRead(bufferSize, connID)
-
-   Read up to bufferSize ASCII characters
-
-   :param int bufferSize: default=4096
-   :param str connID(optional): Connection id
-
-.. py:function:: bluetoothReadLine(connID)
-
-   Read the next line
-
-   :param str connID(optional): Connection id
-
-.. py:function:: bluetoothGetRemoteDeviceName(address)
-
-   Queries a remote device for it's name or null if it can't be resolved
-
-   :param str address: Bluetooth Address For Target Device
-
-.. py:function:: bluetoothGetLocalName()
-
-   Gets the Bluetooth Visible device name
-
-.. py:function:: bluetoothSetLocalName(name)
-
-   Sets the Bluetooth Visible device name, returns True on success
-
-   :param str name: New local name
-
-.. py:function:: bluetoothGetScanMode()
-
-   Gets the scan mode for the local dongle.
-   Return values:
-   -1 when Bluetooth is disabled.
-   0 if non discoverable and non connectable.
-   1 connectable non discoverable.
-   3 connectable and discoverable.
-
-.. py:function:: bluetoothGetConnectedDeviceName(connID)
-
-   Returns the name of the connected device
-
-   :param str connID: Connection id
-
-.. py:function:: checkBluetoothState()
-
-   Checks Bluetooth state
-
-   :return: True if Bluetooth is enabled
-
-.. py:function:: toggleBluetoothState(enabled, prompt)
-
-   Toggle Bluetooth on and off
-
-   :param bool enabled:
-   :param str prompt: Prompt the user to confirm changing the Bluetooth state, default=true
-
-   :return: True if Bluetooth is enabled
-
-.. py:function:: bluetoothStop(connID)
-
-   Stops Bluetooth connection
-
-   :param str connID: Connection id
-
-.. py:function:: bluetoothGetLocalAddress()
-
-   Returns the hardware address of the local Bluetooth adapter
-
-.. py:function:: bluetoothDiscoveryStart()
-
-   Start the remote device discovery process
-
-   :return: true on success, false on error
-
-.. py:function:: bluetoothDiscoveryCancel()
-
-   Cancel the current device discovery process
-
-   :return: true on success, false on error
-
-.. py:function:: bluetoothIsDiscovering()
-
-   Return true if the local Bluetooth adapter is currently in the device discovery process
-
-
-SignalStrengthFacade
-=========================
-.. py:function:: startTrackingSignalStrengths()
-
-   Starts tracking signal strengths
-
-.. py:function:: readSignalStrengths()
-
-   Returns the current signal strengths
-
-   :return: A map of gsm_signal_strength
-
-.. py:function:: stopTrackingSignalStrengths()
-
-   Stops tracking signal strength
-
-
-WebCamFacade
-=========================
-
-.. py:function:: webcamStart(resolutionLevel, jpegQuality, port)
-
-   Starts an MJPEG stream and returns a Tuple of address and port for the stream
-
-   :param int resolutionLevel: increasing this number provides higher resolution (default=0)
-   :param int jpegQuality: a number from 0-10 (default=20)
-   :param int port: If port is specified, the webcam service will bind to port, otherwise it will pick any available port (default=0)
-
-.. py:function:: webcamAdjustQuality(resolutionLevel, jpegQuality)
-
-   Adjusts the quality of the webcam stream while it is running
-
-   :param int resolutionLevel: increasing this number provides higher resolution (default=0)
-   :param int jpegQuality: a number from 0-10 (default=20)
-
-.. py:function:: cameraStartPreview(resolutionLevel, jpegQuality, filepath)
-
-   Start Preview Mode. Throws 'preview' events
-
-   :param int resolutionLevel: increasing this number provides higher resolution (default=0)
-   :param int jpegQuality: a number from 0-10 (default=20)
-   :param str filepath: Path to store jpeg files
-
-   :return: True if successful
-
-.. py:function:: cameraStopPreview()
-
-   Stop the preview mode
-
-
-UiFacade
-=========================
-
-Dialog
---------
-.. py:function:: dialogCreateInput(title, message, defaultText, inputType)
-
-   Create a text input dialog
-
-   :param str title: title of the input box
-   :param str message: message to display above the input box
-   :param str defaultText(optional): text to insert into the input box
-   :param str inputType(optional): type of input data, ie number or text
-
-.. py:function:: dialogCreatePassword(title, message)
-
-   Create a password input dialog
-
-   :param str title: title of the input box
-   :param str message: message to display above the input box
-
-.. py:function:: dialogGetInput(title, message, defaultText)
-
-   Create a password input dialog
-
-   :param str title: title of the input box
-   :param str message: message to display above the input box
-   :param str defaultText(optional): text to insert into the input box
-
-.. py:function:: dialogGetPassword(title, message)
-
-   Queries the user for a password
-
-   :param str title: title of the password box
-   :param str message: message to display above the input box
-
-.. py:function:: dialogCreateSeekBar(start, maximum, title)
-
-   Create seek bar dialog
-
-   :param int start: default=50
-   :param int maximum: default=100
-   :param int title: title
-
-.. py:function:: dialogCreateTimePicker(hour, minute, is24hour)
-
-   Create time picker dialog
-
-   :param int hour: default=0
-   :param int miute: default=0
-   :param bool is24hour: default=false
-
-.. py:function:: dialogCreateDatePicker(year, month, day)
-
-   Create date picker dialog
-
-   :param int year: default=1970
-   :param int month: default=1
-   :param int day: default=1
-
-
-NFC
--------------
-**Data structs**
-*QPython NFC json result*
-::
-
-    {
-    "role": <role>, # could be self/master/slave
-    "stat": <stat>, # could be ok / fail / cancl
-    "message": <message get> 
-    }
-
-**APIs**
-
-.. py:function:: dialogCreateNFCBeamMaster(title, message, inputType)
-
-   Create a dialog where you could create a qpython beam master
-
-   :param str title: title of the input box
-   :param str message: message to display above the input box
-   :param str inputType(optional): type of input data, ie number or text
-
-.. py:function:: NFCBeamMessage(content, title, message)
-
-   Create a dialog where you could create a qpython beam master
-
-   :param str content: message you want to sent
-   :param str title: title of the input box
-   :param str message: message to display above the input box
-   :param str inputType(optional): type of input data, ie number or text
-
-.. py:function:: dialogCreateNFCBeamSlave(title, message)
-
-   Create a qpython beam slave
-
-   :param str title: title of the input box
-   :param str message: message to display above the input box
-
-Progress
---------------
-.. py:function:: dialogCreateSpinnerProgress(message, maximumProgress)
-
-   Create a spinner progress dialog
-
-   :param str message(optional): message
-   :param int maximunProgress(optional): dfault=100
-
-.. py:function:: dialogSetCurrentProgress(current)
-
-   Set progress dialog current value
-
-   :param int current: current
-
-.. py:function:: dialogSetMaxProgress(max)
-
-   Set progress dialog maximum value
-
-   :param int max: max
-
-
-.. py:function:: dialogCreateHorizontalProgress(title, message, maximumProgress)
-
-   Create a horizontal progress dialog
-
-   :param str title(optional): title
-   :param str message(optional): message
-   :param int maximunProgress(optional): dfault=100
-
-
-Alert
-----------
-.. py:function:: dialogCreateAlert(title, message)
-
-   Create alert dialog
-
-   :param str title(optional): title
-   :param str message(optional): message
-   :param int maximunProgress(optional): dfault=100
-
-
-Dialog Control
----------------
-.. py:function:: dialogSetPositiveButtonText(text)
-
-   Set alert dialog positive button text
-
-   :param str text: text
-
-.. py:function:: dialogSetNegativeButtonText(text)
-
-   Set alert dialog negative button text
-
-   :param str text: text
-
-.. py:function:: dialogSetNeutralButtonText(text)
-
-   Set alert dialog button text
-
-   :param str text: text
-
-.. py:function:: dialogSetItems(items)
-
-   Set alert dialog list items
-
-   :param list items: items
-
-.. py:function:: dialogSetSingleChoiceItems(items, selected)
-
-   Set alert dialog list items
-
-   :param list items: items
-   :param int selected: selected item index (default=0)
-
-.. py:function:: dialogSetMultiChoiceItems(items, selected)
-
-   Set dialog multiple choice items and selection
-
-   :param list items: items
-   :param int selected: selected item index (default=0)
-
-.. py:function:: addContextMenuItem(label, event, eventData)
-
-   Adds a new item to context menu
-
-   :param str label: label for this menu item
-   :param str event: event that will be generated on menu item click
-   :param object eventData: event object
-
-.. py:function:: addOptionsMenuItem(label, event, eventData, iconName)
-
-   Adds a new item to context menu
-
-   :param str label: label for this menu item
-   :param str event: event that will be generated on menu item click
-   :param object eventData: event object
-   :param str iconName: Android system menu icon, see http://developer.android.com/reference/android/R.drawable.html
-
-.. py:function:: dialogGetResponse()
-
-   Returns dialog response
-
-.. py:function:: dialogGetSelectedItems()
-
-   This method provides list of items user selected
-
-.. py:function:: dialogDismiss()
-
-   Dismiss dialog
-
-.. py:function:: dialogShow()
-
-   Show dialog
-
-
-Layout
----------
-.. py:function:: fullShow(layout)
-
-   Show Full Screen
-
-   :param string layout: String containing View layout
-
-.. py:function:: fullDismiss()
-
-   Dismiss Full Screen
-
-.. py:function:: fullQuery()
-
-   Get Fullscreen Properties
-
-.. py:function:: fullQueryDetail(id)
-
-   Get fullscreen properties for a specific widget
-
-   :param str id: id of layout widget
-
-.. py:function:: fullSetProperty(id)
-
-   Set fullscreen widget property
-
-   :param str id: id of layout widget
-   :param str property: name of property to set
-   :param str value: value to set property to
-
-.. py:function:: fullSetList(id, list)
-
-   Attach a list to a fullscreen widget
-
-   :param str id: id of layout widget
-   :param list list: List to set
-
-.. py:function:: fullKeyOverride(keycodes, enable)
-
-   Override default key actions
-
-   :param str keycodes: id of layout widget
-   :param bool enable: List to set (default=true)
-
-
-
-WebView
------------
-.. py:function:: webViewShow()
-
-   Display a WebView with the given URL
-
-   :param str url: url
-   :param bool wait(optional): block until the user exits the WebView
-
-USB Host Serial Facade
-======================
-
-*QPython 1.3.1+ and QPython3 1.0.3+ contains this feature*
-
-SL4A Facade for USB Serial devices by Android USB Host API.
-
-
-It control the USB-Serial like devices
-from Andoroid which has USB Host Controller .
-
-The sample
-`demonstration is also available at youtube video <http://www.youtube.com/watch?v=EJ7qiGXaI74>`_
-
-
-Requirements
--------------
-* Android device which has USB Host controller (and enabled in that firmware).
-* Android 4.0 (API14) or later.
-* USB Serial devices (see [Status](#Status)).
-* USB Serial devices were not handled by Android kernel.
-
-  > I heard some android phone handle USB Serial devices
-  > make /dev/ttyUSB0 in kernel level.
-  > In this case, Android does not be able to handle the device
-  > from OS level.
-
-  please check Android Applications be able to grab the target USB Devices,
-  such as `USB Device Info <https://play.google.com/store/apps/details?id=aws.apps.usbDeviceEnumerator>`_.
-
-Status
----------------
-* probably work with USB CDC, like FTDI, Arduino or else.
-
-* 2012/09/10: work with 78K0F0730 device (new RL78) with Tragi BIOS board.
-
-  `M78K0F0730 <http://www.marutsu.co.jp/shohin_55296/>`_
-
-* 2012/09/24: work with some pl2303 devcies.
-
-Author
--------
-This facade developped by `Kuri65536 <https://bitbucket.org/kuri65536/usbhostserialfacade>`_
-you can see the commit log in it.
-
-
-APIs
---------
-.. py:function:: usbserialGetDeviceList()
-
-   Returns USB devices reported by USB Host API.
-
-   :return: Returns "Map of id and string information Map<String, String>
-
-
-.. py:function:: usbserialDisconnect(connID)
-
-   Disconnect all USB-device
-
-   :param str connID: connection ID
-
-.. py:function:: usbserialActiveConnections()
-
-   Returns active USB-device connections.
-
-   :return: Returns "Active USB-device connections by Map UUID vs device-name."
-
-
-.. py:function:: usbserialWriteBinary(base64, connID)
-
-   Send bytes over the currently open USB Serial connection.
-
-   :param str base64:
-   :param str connId:
-
-.. py:function:: usbserialReadBinary(bufferSize, connID)
-
-   Read up to bufferSize bytes and return a chunked, base64 encoded string
-
-   :param int bufferSize:
-   :param str connId:
-
-.. py:function:: usbserialConnect(hash, options)
-
-   Connect to a device with USB-Host. request the connection and exit
-
-   :param str hash:
-   :param str options:
-
-   :return: Returns messages the request status
-
-.. py:function:: usbserialHostEnable()
-
-   Requests that the host be enable for USB Serial connections.
-
-   :return: True if the USB Device is accesible
-
-.. py:function:: usbserialWrite(String ascii, String connID)
-
-   Sends ASCII characters over the currently open USB Serial connection
-
-   :param str ascii:
-   :param str connID:
-
-.. py:function:: usbserialReadReady(connID)
-
-   :param str connID:
-
-   :return: True if the next read is guaranteed not to block
-
-
-.. py:function:: usbserialRead(connID, bufferSize)
-
-   Read up to bufferSize ASCII characters.
-
-   :param str connID:
-   :param int bufferSize:
-
-.. py:function:: usbserialGetDeviceName(connID)
-
-   Queries a remote device for it's name or null if it can't be resolved
-
-   :param str connID:
diff --git a/qpython-docs/source/en/guide_contributors.rst b/qpython-docs/source/en/guide_contributors.rst
deleted file mode 100644
index 4de51a61..00000000
--- a/qpython-docs/source/en/guide_contributors.rst
+++ /dev/null
@@ -1,40 +0,0 @@
-Welcome contribute
-===============================
-Thanks for supporting this project, QPython is a greate project, and we hope you join us to help with make it more greater.  
-
-Please send email to us(support at qpython.org) to introduce youself briefly, and which part do you want to contribute.
-
-Then we will consider to invite you to join the qpython-collaborator group.
-
-How to help with test
-========================
-
-.. toctree::
-   :maxdepth: 2
-
-   guide_contributors_test
-
-How to contribute documentation
-================================
-
-How to translate
-================================
-
-
-How to launch a local QPython users community
-================================================================
-
-How to organise a local qpython user sharing event
-----------------------------------------
-
-How to became the developer member
-====================================
-
-How to develop qpython built-in programs
-----------------------------------------
-
-How to sponsor QPython project
-====================================
-
-
-More detail coming soon...
diff --git a/qpython-docs/source/en/guide_contributors_test.rst b/qpython-docs/source/en/guide_contributors_test.rst
deleted file mode 100644
index 84c8d78c..00000000
--- a/qpython-docs/source/en/guide_contributors_test.rst
+++ /dev/null
@@ -1,33 +0,0 @@
-QPython is keeping develop! 
-If you are interested about what we are doing and want to make some contribution, follow this guide to make this project better!
-
-
-Join the tester community
---------------------------
-We create a G+ community where you could report bugs or offer suggestions -> `QPython tester G+ community(For QPython testers) <https://plus.google.com/communities/111759148772865961493>`_
-
-Join us now!
-
-.. image:: ../_static/1.png
-   :scale: 50 %
-
-
-Become a tester
-----------------
-After join the tester community, you could become a tester!
-Click this and become a tester ->  `I'm ready for test <https://play.google.com/apps/testing/org.qpython.qpy>`_
-
-.. image:: ../_static/2.png
-
-Report or suggest
--------------------
-If you find out any bugs or have any cool idea about QPython, please let us know about it.
-You could write down your suggestion or bug report on the community.
-
-.. image:: ../_static/3.png
-
-
-
-Feedback
----------
-Send your feedback to QPython using the contact information: support@qptyhon.org
\ No newline at end of file
diff --git a/qpython-docs/source/en/guide_developers.rst b/qpython-docs/source/en/guide_developers.rst
deleted file mode 100644
index 22a7d2b3..00000000
--- a/qpython-docs/source/en/guide_developers.rst
+++ /dev/null
@@ -1,75 +0,0 @@
-Android
-==============================
-Android part offers the common Python user interaction functions, like console, editor, file browsing, QRCode reader etc.
-
-
-Console
----------
-
-
-Editor
------------
-
-
-File browsing
-------------
-
-
-QRCode reader
-------------------------
-
-
-QSL4A
-==============================
-QSL4A is the folk of SL4A for QPython, which allows users being able to program with Python script for android.
-
-
-QPython Core
-==============================
-Besides Python core, QPython core offer three types programming mode also.
-
-Python 2.x
------------
-
-Python 3.x
------------
-
-Console program
----------------
-
-Kivy program
-------------
-
-WebApp program
---------------
-
-
-
-Pip and libraries
-==============================
-Pip and libraries offer great expansion ability for QPython.
-
-Pip
----------
-
-Libraries
-----------
-
-
-Quick tools
-==============================
-Quick tools offers better guide for using QPython well for different users.
-
-QPython API
-------------
-
-FTP
---------
-
-
-QPY.IO (Enterprise service)
-==============================
-It's a enterprise service which aim at offering quick android development delivery with QPython.
-
-It's QPython's maintainers' main paid service, but not a opensource project.
-
diff --git a/qpython-docs/source/en/guide_extend.rst b/qpython-docs/source/en/guide_extend.rst
deleted file mode 100644
index bda077ed..00000000
--- a/qpython-docs/source/en/guide_extend.rst
+++ /dev/null
@@ -1,131 +0,0 @@
-QPython Open API 
-=====================================================
-QPython has an open activity which allow you run qpython from outside.
-
-The MPyAPI's definition seems like the following:
-
-::
-
-        <activity 
-            android:name="org.qpython.qpylib.MPyApi"
-            android:label="@string/qpy_run_with_share"
-            android:screenOrientation="user"
-            android:configChanges="orientation|keyboardHidden"
-            android:exported="true">
-            <intent-filter>
-                <action android:name="org.qpython.qpylib.action.MPyApi" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-                <data android:scheme="http" />
-                <data android:scheme="https" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.SEND"/>
-                <category android:name="android.intent.category.DEFAULT"/>
-                <data android:mimeType="text/plain"/>
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.SEND"/>
-                <category android:name="android.intent.category.DEFAULT"/>
-                <data android:mimeType="image/*"/>
-            </intent-filter>
-        </activity>
-
-
-**So, with it's help, you could:**
-
-Share some content to QPython's scripts
----------------------------------------------
-You could choose some content in some app, and share to qpython's script, then you could handle the content with the **sys.argv[2]**
-
-`Watch the demo video on YouTube <https://www.youtube.com/watch?v=2Y50Yir8TWg>`_
-
-
-Run QPython's script from your own application
-------------------------------------------------------
-
-You can call QPython to run some script or python code in your application by call this activity, like the following sample:
-
-::
-
-    // code sample shows how to call qpython API
-    String extPlgPlusName = "org.qpython.qpy";          // QPython package name
-    Intent intent = new Intent();
-    intent.setClassName(extPlgPlusName, "org.qpython.qpylib.MPyApi");
-    intent.setAction(extPlgPlusName + ".action.MPyApi");
-
-    Bundle mBundle = new Bundle();
-    mBundle.putString("app", "myappid");
-    mBundle.putString("act", "onPyApi");
-    mBundle.putString("flag", "onQPyExec"); // any String flag you may use in your context
-    mBundle.putString("param", "");         // param String param you may use in your context
-
-    /*
-    * The Python code we will run
-    */
-    String code = "import androidhelper\n" +
-                "droid = androidhelper.Android()\n" +
-                "line = droid.dialogGetInput()\n" +
-                "s = 'Hello %s' % line.result\n" +
-                "droid.makeToast(s)\n"
-
-    mBundle.putString("pycode", code);
-    intent.putExtras(mBundle);
-    startActivityForResult(intent, SCRIPT_EXEC_PY);
-    ...
-
-
-
-    // And you can handle the qpython callabck result in onActivityResult
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        if (requestCode == SCRIPT_EXEC_PY) {
-            if (data!=null) {
-                Bundle bundle = data.getExtras();
-                String flag = bundle.getString("flag");
-                String param = bundle.getString("param");
-                String result = bundle.getString("result"); // Result your Pycode generate
-                Toast.makeText(this, "onQPyExec: return ("+result+")", Toast.LENGTH_SHORT).show();
-            } else {
-                Toast.makeText(this, "onQPyExec: data is null", Toast.LENGTH_SHORT).show();
-
-            }
-        }
-    }
-
-
-`Checkout the full project from github <https://github.com/qpython-android/app-call-qpython-api>`_
-
-And there is `a production application - QPython Plugin for Tasker <https://play.google.com/store/apps/details?id=com.qpython.tasker2>`_
-
-QPython Online Service
-=====================================================
-
-Now the QPython online service only open for QPython, not QPython3.
-
-
-QPypi
----------------------------------------------------------
-Can I install some packages which required pre-compiled ?
-Sure, you could install some pre-compiled packages from QPypi, you could find it through "Libraries" on dashboard.
-
-
-.. image:: ../_static/guide_extend_pic2.png
-
-If you couldn't found the package here, you could send email to river@qpython.org .
-
-QPY.IO
----------------------------------------------------
-Can I build an independent APK from QPython script?
-
-Sure you can. now the service is **in BETA**, it's a challenging thing. We will publish it as a online service, for we want to let the development process is simple, you don't need to own the development environment set up when you want to build a application.
-
-
-.. image:: ../_static/guide_extend_pic1.png
-
-If you want to try it out or have some business proposal, please contact with us by sending email to river@qpython.org .
diff --git a/qpython-docs/source/en/guide_helloworld.rst b/qpython-docs/source/en/guide_helloworld.rst
deleted file mode 100644
index d07001f6..00000000
--- a/qpython-docs/source/en/guide_helloworld.rst
+++ /dev/null
@@ -1,121 +0,0 @@
-Writing "Hello World"
-========================
-
-
-Hello world
-----------------
-.. image:: ../_static/guide_helloworld_pic1.png
-   :alt: hello world
-
-Well, after you became a bit more familiar with QPython, let's create our first program in QPython. Obviously, it will be `helloworld.py`. ;)
-
-Start QPython, open editor and enter the following code:
-
-::
-
-    import androidhelper
-    droid = androidhelper.Android()
-    droid.makeToast('Hello, Username!')
-
-No wonder, it's just similar to any other hello-world program. When executed, it just shows pop-up message on the screen (see screenshot on the top). Anyway, it's a good example of QPython program.
-
-SL4A library
-------------
-
-It begins with *import androidhelper* — the most useful module in QPython, which encapsulates almost all interface with Android, available in Python. Any script developed in QPython starts with this statement (at least if it claims to communicate with user). Read more about Python library `here <http://docs.python.org/2.7/library/intro.html>`_ and import statement `here <http://docs.python.org/2.7/reference/simple_stmts.html#import>`_
-
-By the way, if you're going to make your script compatible with SL4A, you should replace the first line with the following code (and use `android` instead `androidhelper` further in the program):
-
-::
-
-    try:
-        import androidhelper as android
-    except ImportError:
-        import android
-
-Ok, next we're creating an object `droid` (actually a class), it is necessary to call RPC functions in order to communicate with Android.
-
-And the last line of our code calls such function, `droid.makeToast()`, which shows a small pop-up message (a "toast") on the screen.
-
-Well, let's add some more functionality. Let it ask the user name and greet them.
-
-More samples
----------------
-We can display a simple dialog box with the title, prompt, edit field and buttons **Ok** and **Cancel** using `dialogGetInput` call. Replace the last line of your code and save it as `hello1.py`:
-
-::
-
-    import androidhelper
-    droid = androidhelper.Android()
-    respond = droid.dialogGetInput("Hello", "What is your name?")
-
-Well, I think it should return any respond, any user reaction. That's why I wrote `respond = ...`. But what the call actually returns? Let's check. Just add `print` statement after the last line:
-
-::
-
-    import androidhelper
-    droid = androidhelper.Android()
-    respond = droid.dialogGetInput("Hello", "What is your name?")
-    print respond
-
-Then save and run it... 
-
-Oops! Nothing printed? Don't worry. Just pull notification bar and you will see "QPython Program Output: hello1.py" — tap it!
-
-
-As you can see, `droid.dialogGetInput()` returns a JSON object with three fields. We need only one — `result` which contains an actual input from user.
-
-Let's add script's reaction:
-
-::
-
-    import androidhelper
-    droid = androidhelper.Android()
-    respond = droid.dialogGetInput("Hello", "What is your name?")
-    print respond
-    message = 'Hello, %s!' % respond.result
-    droid.makeToast(message)
-
-Last two lines (1) format the message and (2) show the message to the user in the toast. See `Python docs <http://docs.python.org/2.7/tutorial/inputoutput.html?highlight=format%20operator#old-string-formatting>`_ if you still don't know what `%` means.
-
-Wow! It works! ;)
-
-Now I'm going to add a bit of logic there. Think: what happen if the user clicks **Cancel** button, or clicks **Ok** leaving the input field blank?
-
-You can play with the program checking what contains `respond` variable in every case.
-
-First of all, I want to put text entered by user to a separate variable: `name = respond.result`. Then I'm going to check it, and if it contains any real text, it will be considered as a name and will be used in greeting. Otherwise another message will be shown. Replace fifth line `message = 'Hello, %s!' % respond.result` with the following code:
-
-::
-
-    name = respond.result
-    if name:
-        message = 'Hello, %s!' % name
-    else:
-        message = "Hey! And you're not very polite, %Username%!"
-
-Use **<** and **>** buttons on the toolbar to indent/unindent lines in if-statement (or just use space/backspace keys). You can read more about indentation in Python `here <http://docs.python.org/2.7/tutorial/introduction.html?highlight=indent#first-steps-towards-programming>`_; if-statement described `here <http://docs.python.org/2.7/tutorial/controlflow.html#if-statements>`_.
-
-First of all, we put user input to the variable `name`. Then we check does `name` contain anything? In case the user left the line blank and clicked **Ok**, the return value is empty string `''`. In case of **Cancel** button pressed, the return value is `None`. Both are treated as false in if-statement. So, only if `name` contans anything meaninful, then-statement is executed and greeting "Hello, ...!" shown. In case of empty input the user will see "Hey! And you're not very polite, %Username%!" message.
-
-Ok, here is the whole program:
-
-::
-
-    import androidhelper
-    droid = androidhelper.Android()
-    respond = droid.dialogGetInput("Hello", "What is your name?")
-    print respond
-    name = respond.result
-    if name:
-        message = 'Hello, %s!' % name
-    else:
-        message = "Hey! And you're not very polite, %Username%!"
-    droid.makeToast(message)
-
-
-`Thanks dmych offer the first draft in his blog <http://onetimeblog.logdown.com/posts/2014/01/23/first-program-in-qpython>`_
-
-
-
-
diff --git a/qpython-docs/source/en/guide_howtostart.rst b/qpython-docs/source/en/guide_howtostart.rst
deleted file mode 100644
index 8575d63e..00000000
--- a/qpython-docs/source/en/guide_howtostart.rst
+++ /dev/null
@@ -1,133 +0,0 @@
-
-
-QPython: How To Start
-========================
-Now, I will introduce the QPython's features through it's interfaces.
-
-1. Dashboard
-------------------
-
-.. image:: ../_static/guide_howtostart_pic1.png
-   :alt: QPython start
-
-
-After you installed QPython, start it in the usual way by tapping its icon in the menu. Screenshot on the top of this post shows what you should see when QPython just started. 
-
-**Start button**
-
-By tapping the big button with Python logo in the center of the screen you can 
-
-**Launch your local script or project**
-
-*Get script from QR code* (funny brand new way to share and distribute your code, you can create QRCode through `QPython's QRCode generator <http://qpython.com/#qrcode>`_
-
-Now you can install many 3rd libaries ( pure python libraries mainly ) through pip_console.py script.
-
-If you want QPython to run some script of project when you click the start button, you can make it by setting default program in setting activity.
-
-
-**Developer kit dashboard**
-
-If you swipe to the left instead of tapping, you will see another (second) main screen of QPython *(Pic. 2)*. As for me, it is much more useful and comfortable for developer.
-
-.. image:: ../_static/guide_howtostart_pic2.png
-   :alt: QPython develop dashboard
-
-
-Tools available here:
-
-* **Console** — yes, it's regular Python console, feel free to comunicate with interpreter directly
-* **Editor** — QPython has a nice text editor integrated with the rest, you can write code and run it without leaving the application
-* **My QPython** — here you can find your scripts and projects
-* **System** — maintain libraries and components: install and uninstall them
-* **Package Index** opens the page `QPyPI <http://qpypi.qpython.org/>`_ in browser allowing to install packages listed there
-* **Community** leads to `QPython.org <http://qpython.org/>`_ page. Feel free to join or ask&answer questions in the QPython community.
-
-By long clicking on the console or editor, you have chance to create the shortcut on desktop which allow you enter console or editor directly.
-
-Next, let's see the console and the editor. 
-
-2. Console and editor
--------------------------
-
-.. image:: ../_static/guide_howtostart_pic3.png
-   :alt: QPython console
-
-
-As I said before, there is an ordinary Python console. Many people usually use it to explore objects' properties, consult about syntax and test their ideas. You can type your commands directly and Python interpreter will execute them. You can open additional consoles by tapping the plus button (1) and usedrop-down list on the upper left corner to switch between consoles (2). To close the console just tap the close button (3).
-
-.. image:: ../_static/guide_howtostart_pic4.png
-   :alt: QPython notification
-
-
-Please note, there will be notification in the notification bar unless you explicitly close the console and you always can reach the open console by tapping the notification. 
-
-
-
-.. image:: ../_static/guide_howtostart_pic5.png
-   :alt: QPython editor
-
-
-The editor allows you obviously (hello Cap!) enter and modify text. Here you can develop your scripts, save them and execute. The editor supports Python syntax highlighting and shows line numbers (there is no ability to go to the line by number though). *(above picture)*
-
-When typing, you can easily control indentation level (which is critical for Python code) using two buttons on the toolbar (1). Next buttons on the toolbar are **Save** and **Save As** (2), then goes **Run** (3), **Undo**, **Search**, **Recent Files** and **Settings** buttons. Also there are two buttons on the top: **Open** and **New** (5).
-
-When saving, don't forget to add `.py` estension to the file name since the editor don't do it for you.
-
-3. Programs
---------------------
-You can find the scripts or projects in My QPython. My QPython contains the scripts and Projects. 
-
-By long clicking on script or project, you have chance to create the shortcut for the script or project. Once you have created the shortcuts on desktop, you can directly run the script or project from desktop.
-
-
-**Scripts**
-Scripts : A single script. The scripts are in the  /sdcard/com.hipipal.qpyplus/scripts directory.
-If you want your script could be found in My QPython, please upload it to this directory.
-
-When you click the script, you can choose the following actions:
-
-- Run : Run the script
-- Open : Edit the script with built-in editor
-- Rename : Rename the script
-- Delete : Delete the script
-
-**Projects**
-Projects : A directory which should contain the main.py as the project's default launch script, and you can put other dependency 3rd libraries or resources in the same directory, if you want your project could be found in My QPython, please upload them into this directory.
-
-When you click on the project, you can choose the following actions:
-
-- Run : run the project
-- Open : use it to explore project's resources
-- Rename : Rename the project
-- Delete : Delete the project
-
-4. Libraries 
---------------
-
-By installing 3rd libraries, you can extend your qpython's programming ability quickly. There are some ways to install libraries.
-
-**QPypi**
-
-You can install some pre-built libraries from QPypi, like numpy etc.
-
-**Pip console**
-
-You can install most pure python libraries through pip console.
-
-
-Besides the two ways above, you could copy libraries into the /sdcard/qpython/lib/python2.7/site-packages in your device.
-
-
-*Notice:*
-Some libraries mixed with c/c++ files could not be install through pip console for the android lacks the compiler environment, you could ask help from qpython developer team.
-
-
-5. Community
---------------
-It will redirect to the QPython.org, including somthe source of this documentation, and there are some qpython user communities' link, many questions of qpython usage or programming could be asked in the community.
-
-
-
-
-`Thanks dmych offer the first draft in his blog <http://onetimeblog.logdown.com/posts/2014/01/22/qpython-how-to-start>`_
diff --git a/qpython-docs/source/en/guide_ide.rst b/qpython-docs/source/en/guide_ide.rst
deleted file mode 100644
index 45865c81..00000000
--- a/qpython-docs/source/en/guide_ide.rst
+++ /dev/null
@@ -1,49 +0,0 @@
-Use the best way for developing
-===================================================
-
-
-Develop from QEditor
-----------------------------------------
-QEditor is the QPython's built-in editor, which supports Python / HTML syntax highlight.
-
-
-**QEditor's main features**
-
-* Edit / View plain text file, like Python, Lua, HTML, Javascript and so on
-
-* Edit and run Python script & Python syntax highlight
-
-* Edit and run Shell script
-
-* Preview HTML with built-in HTML browser
-
-* Search by keyword, code snippets, code share
-
-You could run the QPython script directly when you develop from QEditor, so when you are moving it's the most convient way for QPython develop.
-
-
-Develop from browser
---------------------------------------
-QPython has a built-in script which is **qedit4web.py**, you could see it when you click the start button and choose  "Run local script".
-After run it, you could see the result.
-
-.. image:: ../_static/guide_ide_qedit4web.png
-   :alt: QPython qedit4web
-
-Then, you could access the url from your PC/Laptop's browser for developing, just like the below pics.
-
-.. image:: ../_static/guide_ide_qedit4web_choose.png
-   :alt: QPython qedit4web choose project or file
-
-*After choose some project or script, you could start to develop*
-
-.. image:: ../_static/guide_ide_qedit4web_develop.png
-   :alt: QPython qedit4web
-
-
-With it's help, you could write from browser and run from your android phone. It is very convenient.
-
-
-Develop from your computer
---------------------------
-Besides the above ways, you could develop the script with your way, then upload to your phone and run with QPython also.
diff --git a/qpython-docs/source/en/guide_libraries.rst b/qpython-docs/source/en/guide_libraries.rst
deleted file mode 100644
index e4bb3ef2..00000000
--- a/qpython-docs/source/en/guide_libraries.rst
+++ /dev/null
@@ -1,292 +0,0 @@
-QPython built-in Libraries
-==========================
-QPython is using the Python 2.7.2 and it support most Python stardard libraries. And you could see their documentation through Python documentation.
-
-QPython dynload libraries 
---------------------------------------------------------------
-Just like Python, QPython contains python built-in .so libraries.
-
-Usually, you don't need to  import them manually, they were used in stardard libraries, and could be imported automatically.
-
-* _codecs_cn.so
-* _codecs_hk.so
-* _codecs_iso2022.so
-* _codecs_jp.so
-* _codecs_kr.so
-* _codecs_tw.so
-* _csv.so
-* _ctypes.so
-* _ctypes_test.so
-* _hashlib.so
-* _heapq.so
-* _hotshot.so
-* _io.so
-* _json.so
-* _lsprof.so
-* _multibytecodec.so
-* _sqlite3.so
-* _ssl.so
-* _testcapi.so
-* audioop.so
-* future_builtins.so
-* grp.so
-* mmap.so
-* resource.so
-* syslog.so
-* termios.so
-* unicodedata.so
-
-QPython stardard libraries
----------------------------
-The following libraries are the stardard QPython libraries which are the same as Python:
-
-- `BaseHTTPServer.py <https://docs.python.org/2/library/basehttpserver.html>`_
-- `binhex.py <https://docs.python.org/2/library/binhex.html>`_
-- `fnmatch.py <https://docs.python.org/2/library/fnmatch.html>`_
-- mhlib.py
-- quopri.py
-- sysconfig.py
-- Bastion.py
-- bisect.py
-- formatter.py
-- mimetools.py
-- random.py
-- tabnanny.py
-- CGIHTTPServer.py
-- bsddb
-- fpformat.py
-- mimetypes.py
-- re.py
-- tarfile.py
-- ConfigParser.py
-- cProfile.py
-- fractions.py
-- mimify.py
-- repr.py
-- telnetlib.py
-- Cookie.py
-- calendar.py
-- ftplib.py
-- modulefinder.py
-- rexec.py
-- tempfile.py
-- DocXMLRPCServer.py
-- cgi.py
-- functools.py
-- multifile.py
-- rfc822.py
-- textwrap.py
-- HTMLParser.py
-- cgitb.py
-- genericpath.py
-- mutex.py
-- rlcompleter.py
-- this.py
-- chunk.py
-- getopt.py
-- netrc.py
-- robotparser.py
-- threading.py
-- MimeWriter.py
-- cmd.py
-- getpass.py
-- new.py
-- runpy.py
-- timeit.py
-- Queue.py
-- code.py
-- gettext.py
-- nntplib.py
-- sched.py
-- toaiff.py
-- SimpleHTTPServer.py
-- codecs.py
-- glob.py
-- ntpath.py
-- sets.py
-- token.py
-- SimpleXMLRPCServer.py
-- codeop.py
-- gzip.py
-- nturl2path.py
-- sgmllib.py
-- tokenize.py
-- SocketServer.py
-- collections.py
-- hashlib.py
-- numbers.py
-- sha.py
-- trace.py
-- StringIO.py
-- colorsys.py
-- heapq.py
-- opcode.py
-- shelve.py
-- traceback.py
-- UserDict.py
-- commands.py
-- hmac.py
-- optparse.py
-- shlex.py
-- tty.py
-- UserList.py
-- compileall.py
-- hotshot
-- os.py
-- shutil.py
-- types.py
-- UserString.py
-- compiler
-- htmlentitydefs.py
-- os2emxpath.py
-- site.py
-- unittest
-- _LWPCookieJar.py
-- config
-- htmllib.py
-- smtpd.py
-- urllib.py
-- _MozillaCookieJar.py
-- contextlib.py
-- httplib.py
-- pdb.py
-- smtplib.py
-- urllib2.py
-- __future__.py
-- cookielib.py
-- ihooks.py
-- pickle.py
-- sndhdr.py
-- urlparse.py
-- __phello__.foo.py
-- copy.py
-- imaplib.py
-- pickletools.py
-- socket.py
-- user.py
-- _abcoll.py
-- copy_reg.py
-- imghdr.py
-- pipes.py
-- sqlite3
-- uu.py
-- _pyio.py
-- csv.py
-- importlib
-- pkgutil.py
-- sre.py
-- uuid.py
-- _strptime.py
-- ctypes
-- imputil.py
-- plat-linux4
-- sre_compile.py
-- warnings.py
-- _threading_local.py
-- dbhash.py
-- inspect.py
-- platform.py
-- sre_constants.py
-- wave.py
-- _weakrefset.py
-- decimal.py
-- io.py
-- plistlib.py
-- sre_parse.py
-- weakref.py
-- abc.py
-- difflib.py
-- json
-- popen2.py
-- ssl.py
-- webbrowser.py
-- aifc.py
-- dircache.py
-- keyword.py
-- poplib.py
-- stat.py
-- whichdb.py
-- antigravity.py
-- dis.py
-- lib-tk
-- posixfile.py
-- statvfs.py
-- wsgiref
-- anydbm.py
-- distutils
-- linecache.py
-- posixpath.py
-- string.py
-- argparse.py
-- doctest.py
-- locale.py
-- pprint.py
-- stringold.py
-- xdrlib.py
-- ast.py
-- dumbdbm.py
-- logging
-- profile.py
-- stringprep.py
-- xml
-- asynchat.py
-- dummy_thread.py
-- macpath.py
-- pstats.py
-- struct.py
-- xmllib.py
-- asyncore.py
-- dummy_threading.py
-- macurl2path.py
-- pty.py
-- subprocess.py
-- xmlrpclib.py
-- atexit.py
-- email
-- mailbox.py
-- py_compile.py
-- sunau.py
-- zipfile.py
-- audiodev.py
-- encodings
-- mailcap.py
-- pyclbr.py
-- sunaudio.py
-- base64.py
-- filecmp.py
-- markupbase.py
-- pydoc.py
-- symbol.py
-- bdb.py
-- fileinput.py
-- md5.py
-- pydoc_data
-- symtable.py
-
-
-
-Python 3rd Libraries
-==========================
-
-- `BeautifulSoup.py(3) <https://www.crummy.com/software/BeautifulSoup/bs3/documentation.html>`_
-- pkg_resources.py
-- androidhelper
-- plyer
-- `bottle.py <http://bottlepy.org/docs/dev/>`_
-- qpy.py
-- qpythoninit.py
-- setuptools
-- `pip <https://pypi.python.org/pypi/pip/>`_
-
-
-Androidhelper APIs
-========================
-To simplify QPython SL4A development in IDEs with a
-"hepler" class derived from the default Android class containing
-SL4A facade functions & API documentation
-
-
-.. toctree::
-   :maxdepth: 2
-
-   guide_androidhelpers
diff --git a/qpython-docs/source/en/guide_program.rst b/qpython-docs/source/en/guide_program.rst
deleted file mode 100644
index 07962d77..00000000
--- a/qpython-docs/source/en/guide_program.rst
+++ /dev/null
@@ -1,191 +0,0 @@
-QPython's main features
-====================================
-
-**With QPython, you could build android applications with android application and script language now.**
-
-
-Why should I choose QPython
-------------------------
-The smartphone is becomming people's essential information & technical assitant, so an flexiable script engine could help people complete most jobs efficiently without complex development.
-
-QPython offer **an amazing developing experience**, with it's help, you could implement the program easily without complex installing IDE, compiling, package progress etc.
-
-QPython's main features
--------------------------
-You can do most jobs through QPython just like the way that Python does on PC/Laptop.
-
-
-**Libraries**
-
-- QPython supports most stardard Python libraries.
-
-- QPython supports many 3rd Python libraries which implemented with pure Python code.
-
-- QPython supports some Python libraries mixed with C/C++ code which pre-compiled by QPython develop team.
-
-- QPython allows you put on the libraries by yourself.
-
-Besides these, QPython offers some extra features which Python doesn't offer, Like:
-
-- Android APIs Access(Like SMS, GPS, NFC, BLUETOOTH etc)
-
-*Why QPython require so many permissions?*
-
-QPython need these permissions to access Android's API.
-
-
-**Runtime modes**
-
-QPython supports several runtime modes for android.
-
-**Console mode**
-
-It's the default runtime mode in QPython, it's very common in PC/laptop.
-
-
-**Kivy mode**
-
-QPython supports `Kivy <http://kivy.org>`_ as the GUI programming solution.
-
-
-Kivy is an open source Python library for rapid development of applications that make use of innovative user interfaces, such as multi-touch apps.
-
-Your device should support opengl2.0 for supporting kivy mode.
-
-By insert into the following header in your script, you can let your script run with kivy mode.
-
-::
-
-    #qpy:kivy
-
-
-*An kivy program in QPython sample*
-
-::
-
-    #qpy:kivy
-    from kivy.app import App
-    from kivy.uix.button import Button
-
-    class TestApp(App):
-        def build(self):
-            return Button(text='Hello World')
-
-    TestApp().run()
-
-
-If your library require the opengl driver, you shoule declare the kivy mode header in your script, like the jnius.
-
-*NOTE: QPython3 didn't support kivy mode yet, we have plan to support it in the future*
-
-**WebApp mode**
-
-We recommend you implement WebApp with QPython for it offer the easy to accomplish UI and Take advantage of Python's fast programming strong point.
-
-WebApp will start a webview in front, and run a python web service background. 
-You could use *bottle*(QPython built-in library) to implement the web service, or you could install *django* / *flask* framework also.
-
-
-By insert into the following header in your script, you can let your script run with webapp mode.
-
-::
-
-    #qpy:webapp:<app title>
-    #qpy:<fullscreen or remove this line>
-    #qpy://<ip:port:path>
-
-For example
-
-::
-
-    #qpy:webapp:Hello QPython
-    #qpy://localhost:8080/hello
-
-
-The previous should start a webview which should load the *http://localhost:8080/hello* as the default page, and the webview will keep the titlebar which title is "Hello QPython", if you add the *#qpy:fullscreen* it will hide the titlebar.
-
-
-::
-
-    #qpy:webapp:Hello Qpython
-    #qpy://127.0.0.1:8080/
-    """
-    This is a sample for qpython webapp
-    """
-
-    from bottle import Bottle, ServerAdapter
-    from bottle import run, debug, route, error, static_file, template
-
-
-    ######### QPYTHON WEB SERVER ###############
-
-    class MyWSGIRefServer(ServerAdapter):
-        server = None
-
-        def run(self, handler):
-            from wsgiref.simple_server import make_server, WSGIRequestHandler
-            if self.quiet:
-                class QuietHandler(WSGIRequestHandler):
-                    def log_request(*args, **kw): pass
-                self.options['handler_class'] = QuietHandler
-            self.server = make_server(self.host, self.port, handler, **self.options)
-            self.server.serve_forever()
-
-        def stop(self):
-            #sys.stderr.close()
-            import threading 
-            threading.Thread(target=self.server.shutdown).start() 
-            #self.server.shutdown()
-            self.server.server_close() #<--- alternative but causes bad fd exception
-            print "# qpyhttpd stop"
-
-
-    ######### BUILT-IN ROUTERS ###############
-    @route('/__exit', method=['GET','HEAD'])
-    def __exit():
-        global server
-        server.stop()
-
-    @route('/assets/<filepath:path>')
-    def server_static(filepath):
-        return static_file(filepath, root='/sdcard')
-
-
-    ######### WEBAPP ROUTERS ###############
-    @route('/')
-    def home():
-        return template('<h1>Hello {{name}} !</h1>'+ \
-        '<a href="/assets/qpython/projects/WebApp Sample/main.py">View source</a>',name='QPython')
-
-
-    ######### WEBAPP ROUTERS ###############
-    app = Bottle()
-    app.route('/', method='GET')(home)
-    app.route('/__exit', method=['GET','HEAD'])(__exit)
-    app.route('/assets/<filepath:path>', method='GET')(server_static)
-
-    try:
-        server = MyWSGIRefServer(host="127.0.0.1", port="8080")
-        app.run(server=server,reloader=False)
-    except Exception,ex:
-        print "Exception: %s" % repr(ex)
-
-
-If you want the webapp could be close when you exit the webview, you have to define the *@route('/__exit', method=['GET','HEAD'])* method , for the qpython will request the *http://localhost:8080/__exit* when you exit the webview. So you can release other resource in this function.
-
-.. image:: ../_static/guide_program_pic1.png
-   :alt: QPython WebApp Sample 
-
-*Running screenshot*
-
-
-In the other part of the code, you could implement a webserver whish serve on localhost:8080 and make the URL /hello implement as your webapp's homepage.
-
-
-**Q mode**
-
-If you don't want the QPython display some UI, pelase try to use the QScript mode, it could run a script background, just insert the following header into your script:
-
-::
-
-    #qpy:qpyapp
diff --git a/qpython-docs/source/qpython_theme/__init__.py b/qpython-docs/source/qpython_theme/__init__.py
deleted file mode 100644
index 1928849e..00000000
--- a/qpython-docs/source/qpython_theme/__init__.py
+++ /dev/null
@@ -1,7 +0,0 @@
-#/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-import os.path
-
-pkg_dir = os.path.abspath(os.path.dirname(__file__))
-theme_path = os.path.split(pkg_dir)[0]
diff --git a/qpython-docs/source/qpython_theme/__init__.pyc b/qpython-docs/source/qpython_theme/__init__.pyc
deleted file mode 100644
index 2c1fe5fe..00000000
Binary files a/qpython-docs/source/qpython_theme/__init__.pyc and /dev/null differ
diff --git a/qpython-docs/source/qpython_theme/layout.html b/qpython-docs/source/qpython_theme/layout.html
deleted file mode 100644
index 39d68584..00000000
--- a/qpython-docs/source/qpython_theme/layout.html
+++ /dev/null
@@ -1,156 +0,0 @@
-{% extends "basic/layout.html" %}
-
-{%- block doctype -%}
-<!DOCTYPE html>
-<html>
-{%- endblock -%}
-
-{%- block extrahead %}
-    <meta charset="UTF-8">
-    {%- if not embedded and docstitle %}
-      {%- set titlesuffix = " &#8212; "|safe + docstitle|e %}
-    {%- else %}
-      {%- set titlesuffix = "" %}
-    {%- endif %}
-    <link href="http://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet">
-    <script src="http://cdn.bootcss.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
-    <meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
-{% endblock %}
-
-{%- block header %}
-  <div class="header doc-header">
-      <div class="col-lg-offset-2 col-lg-8 col-md-offset-2 col-md-8 col-sm-offset-2 col-sm-8  index-header">
-
-        <div class="navbar-header">
-          <button type="button" class="navbar-toggle" data-toggle="collapse"
-              data-target="#example-navbar-collapse">
-            <span class="sr-only">切换导航</span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-          </button>
-          <a href="/index.html" class="logo"><img src="{{ pathto('_static/img_logo.png', 1) }}"></a>
-        </div>
-
-        <ul class="header-title hidden-xs">
-          <li class="header-phone-selected">
-            <a href="/index.html">Home</a>
-          </li>
-          <li>
-            <a href="/document.html" class="header-selected">Guide</a>
-            <span class="header-title-selected"></span>
-          </li>
-	  <li>
-              <a target="_blank" href="https://github.com/qpython-android/qpython">Github</a>
-          </li>
-        </ul>
-        {%- block sidebarsearch %}
-        <div class="search-box hidden-xs">
-          <form action="{{ pathto('search') }}">
-            <input type="search" name="q" placeholder="keyword">
-            <input type="hidden" name="check_keywords" value="yes" />
-            <input type="hidden" name="area" value="default" />
-            <button><img src="{{ pathto('_static/ic_search.png', 1) }}"></button>
-          </form>
-        </div>
-        {%- endblock %}
-      </div>
-    </div>
-{% endblock %}
-
-{% block content %}
-<div class="row doc-content">
-    <div class="content-main col-sm-offset-2 col-sm-8">
-          <div class="content-wrapper col-sm-4">
-              <div class="left-menu">
-                  <div class="doc-title hidden-xs">QPthon</div>
-                  <div class="sidebar  collapse navbar-collapse"  id="example-navbar-collapse">
-                    {% block menu %}
-                    {% if 'singlehtml' not in builder %}
-                        {% set global_toc = toctree(maxdepth=3) %}
-                      {% endif %}
-                      {% if global_toc %}
-                        {{ global_toc }}
-                    {% else %}
-                      <!-- Local TOC -->
-                      <div class="local-toc">{{ toc }}</div>
-                    {% endif %}
-                    {% endblock %}
-                    {%- block search %}
-                      <div class="search-phone visible-xs">
-                        <form action="{{ pathto('search') }}">
-                          <input type="search" name="q" placeholder="keyword">
-                          <input type="hidden" name="check_keywords" value="yes" />
-                          <input type="hidden" name="area" value="default" />
-                          <button><img src="{{ pathto('_static/ic_search.png', 1) }}"></button>
-                        </form>
-                      </div>
-                      {%- endblock %}
-                  </div>
-              </div>
-          </div>
-          <div class="content col-sm-8">
-            <div class="document">
-            {% block breadcrumbs %}
-            <ul class="crumbs">
-               <li><a href="{{ pathto(master_doc) }}">{{ _('Guide') }}</a> &raquo;</li>
-                {% for doc in parents %}
-                  <li><a href="{{ doc.link|e }}">{{ doc.title }}</a> &raquo;</li>
-                {% endfor %}
-                <li>{{ title }}</li>
-            </ul>
-            {% endblock %}
-              {%- block document %}
-                {{ super() }}
-              {%- endblock %}
-            </div>
-            <div class="fb-comments" data-href="http://qpython.org{{PTH}}" data-numposts="10"></div>
-          </div>
-        </div>
-        <div class="col-sm-2"></div>
-    </div>
-
-{% endblock %}
-
-{%- block footer %}
-<footer id="footer">
-    <div class="col-sm-offset-2 col-sm-6 footer-div1">
-      <div class="footer-block-item">
-        <span class="footer-item1">Built with Sphinx using a theme provid by QPython.</span>
-        <span class="footer-item2 visible-xs">
-          {%- if show_copyright %}
-            {%- if hasdoc('copyright') %}
-              {% trans path=pathto('copyright'), copyright=copyright|e %}&#169; <a href="{{ path }}">Copyright</a> {{ copyright }}.{% endtrans %}
-            {%- else %}
-              {% trans copyright=copyright|e %}&#169; Copyright {{ copyright }}.{% endtrans %}
-            {%- endif %}
-          {%- endif %}
-        </span>
-      </div>
-    </div>
-    <div class="col-sm-2 footer-div2">
-      <a href="/index.html" class="pull-right"><img src="{{ pathto('_static/img_logo.png', 1) }}"></a>
-    </div>
-  </footer>
-  <script type="text/javascript">
-  $('.fb-comments').attr('data-href', (window.location.href.split('#')[0]).split('?')[0])
-
-  (function(d, s, id) {
-      var js, fjs = d.getElementsByTagName(s)[0];
-      if (d.getElementById(id)) return;
-      js = d.createElement(s); js.id = id;
-      js.src = "//connect.facebook.net/en_US/sdk.js#xfbml=1&version=v2.8&appId=1680815145503311";
-      fjs.parentNode.insertBefore(js, fjs);
-    }(document, 'script', 'facebook-jssdk'));
-
-    $(function(){
-      if ($('#footer')[0].offsetTop < $(window).height()){
-        $('#footer').addClass('to-bottom')
-      }
-    })
-  </script>
-{%- endblock %}
-
-{% block relbar1 %}{% endblock %}
-{% block relbar2 %}{% endblock %}
-
diff --git a/qpython-docs/source/qpython_theme/static/ic_appstore@2x.png b/qpython-docs/source/qpython_theme/static/ic_appstore@2x.png
deleted file mode 100755
index d70ade36..00000000
Binary files a/qpython-docs/source/qpython_theme/static/ic_appstore@2x.png and /dev/null differ
diff --git a/qpython-docs/source/qpython_theme/static/ic_appstore_2x.png b/qpython-docs/source/qpython_theme/static/ic_appstore_2x.png
deleted file mode 100755
index 1582c40d..00000000
Binary files a/qpython-docs/source/qpython_theme/static/ic_appstore_2x.png and /dev/null differ
diff --git a/qpython-docs/source/qpython_theme/static/ic_community@2x.png b/qpython-docs/source/qpython_theme/static/ic_community@2x.png
deleted file mode 100755
index 6984f28f..00000000
Binary files a/qpython-docs/source/qpython_theme/static/ic_community@2x.png and /dev/null differ
diff --git a/qpython-docs/source/qpython_theme/static/ic_facebook.png b/qpython-docs/source/qpython_theme/static/ic_facebook.png
deleted file mode 100755
index 027c863e..00000000
Binary files a/qpython-docs/source/qpython_theme/static/ic_facebook.png and /dev/null differ
diff --git a/qpython-docs/source/qpython_theme/static/ic_faq@2x.png b/qpython-docs/source/qpython_theme/static/ic_faq@2x.png
deleted file mode 100755
index 1f89df68..00000000
Binary files a/qpython-docs/source/qpython_theme/static/ic_faq@2x.png and /dev/null differ
diff --git a/qpython-docs/source/qpython_theme/static/ic_googleplay@2x.png b/qpython-docs/source/qpython_theme/static/ic_googleplay@2x.png
deleted file mode 100755
index 3b46dd00..00000000
Binary files a/qpython-docs/source/qpython_theme/static/ic_googleplay@2x.png and /dev/null differ
diff --git a/qpython-docs/source/qpython_theme/static/ic_googleplay_2x.png b/qpython-docs/source/qpython_theme/static/ic_googleplay_2x.png
deleted file mode 100755
index 1e62373c..00000000
Binary files a/qpython-docs/source/qpython_theme/static/ic_googleplay_2x.png and /dev/null differ
diff --git a/qpython-docs/source/qpython_theme/static/ic_googleplay_3_2x.png b/qpython-docs/source/qpython_theme/static/ic_googleplay_3_2x.png
deleted file mode 100755
index c5086adf..00000000
Binary files a/qpython-docs/source/qpython_theme/static/ic_googleplay_3_2x.png and /dev/null differ
diff --git a/qpython-docs/source/qpython_theme/static/ic_new@2x.png b/qpython-docs/source/qpython_theme/static/ic_new@2x.png
deleted file mode 100755
index 215bb040..00000000
Binary files a/qpython-docs/source/qpython_theme/static/ic_new@2x.png and /dev/null differ
diff --git a/qpython-docs/source/qpython_theme/static/ic_search.png b/qpython-docs/source/qpython_theme/static/ic_search.png
deleted file mode 100755
index 0b6623ad..00000000
Binary files a/qpython-docs/source/qpython_theme/static/ic_search.png and /dev/null differ
diff --git a/qpython-docs/source/qpython_theme/static/ic_support@2x.png b/qpython-docs/source/qpython_theme/static/ic_support@2x.png
deleted file mode 100755
index c06804c9..00000000
Binary files a/qpython-docs/source/qpython_theme/static/ic_support@2x.png and /dev/null differ
diff --git a/qpython-docs/source/qpython_theme/static/ic_twitter.png b/qpython-docs/source/qpython_theme/static/ic_twitter.png
deleted file mode 100755
index 8dcf2eeb..00000000
Binary files a/qpython-docs/source/qpython_theme/static/ic_twitter.png and /dev/null differ
diff --git a/qpython-docs/source/qpython_theme/static/img_background.png b/qpython-docs/source/qpython_theme/static/img_background.png
deleted file mode 100755
index f2009093..00000000
Binary files a/qpython-docs/source/qpython_theme/static/img_background.png and /dev/null differ
diff --git a/qpython-docs/source/qpython_theme/static/img_banner-1.jpg b/qpython-docs/source/qpython_theme/static/img_banner-1.jpg
deleted file mode 100644
index 35179f4e..00000000
Binary files a/qpython-docs/source/qpython_theme/static/img_banner-1.jpg and /dev/null differ
diff --git a/qpython-docs/source/qpython_theme/static/img_banner-1.png b/qpython-docs/source/qpython_theme/static/img_banner-1.png
deleted file mode 100755
index 1be1cf32..00000000
Binary files a/qpython-docs/source/qpython_theme/static/img_banner-1.png and /dev/null differ
diff --git a/qpython-docs/source/qpython_theme/static/img_banner-1@2x.jpg b/qpython-docs/source/qpython_theme/static/img_banner-1@2x.jpg
deleted file mode 100644
index e17b703a..00000000
Binary files a/qpython-docs/source/qpython_theme/static/img_banner-1@2x.jpg and /dev/null differ
diff --git a/qpython-docs/source/qpython_theme/static/img_banner-1@2x.png b/qpython-docs/source/qpython_theme/static/img_banner-1@2x.png
deleted file mode 100755
index 0942fe79..00000000
Binary files a/qpython-docs/source/qpython_theme/static/img_banner-1@2x.png and /dev/null differ
diff --git a/qpython-docs/source/qpython_theme/static/img_logo.png b/qpython-docs/source/qpython_theme/static/img_logo.png
deleted file mode 100755
index 1fdedce6..00000000
Binary files a/qpython-docs/source/qpython_theme/static/img_logo.png and /dev/null differ
diff --git a/qpython-docs/source/qpython_theme/static/qpython_theme.css b/qpython-docs/source/qpython_theme/static/qpython_theme.css
deleted file mode 100755
index 60b5bd4b..00000000
--- a/qpython-docs/source/qpython_theme/static/qpython_theme.css
+++ /dev/null
@@ -1,577 +0,0 @@
-html { overflow-x: hidden; overflow-y: auto; }
-* {
-	margin: 0;
-	padding: 0;
-}
-li {
-	list-style: none;
-}
-a {
-	text-decoration: none;
-}
-.headerlink {
-	opacity: 0.1;
-}
-.crumbs li{
-	display: inline;
-}
-.index-more {
-	background-color: #efefef;
-	padding-top: 40px;
-}
-.index-more-item {
-	background: #FFFEFE;
-	border-radius: 3px;
-	padding: 15px 22px;
-}
-.index-more-item h4 {
-	font-family: Roboto-Condensed;
-	font-size: 20px;
-	color: #000000;
-	letter-spacing: 0.43px;
-}
-.index-more-item p {
-	font-family: Roboto-Light;
-	font-size: 14px;
-	color: #4A4A4A;
-	letter-spacing: 0;
-	line-height: 20px;
-}
-.p-faq {
-	margin-top: 20px;
-	font-family: Roboto-Light;
-	font-size: 12.7px;
-	color: #4A4A4A;
-	letter-spacing: 0.27px;
-}
-
-@media screen and (min-width: 768px) {
-	header {
-		height: 250px;
-		background-color: #000;
-		background: url('img_background.png') no-repeat;
-		background-size: cover;
-		font-family: Roboto-Thin;
-	}
-	header * {
-		display: inline-block;
-	}
-	.header {
-		background-color:  #000;
-		height: 80px;
-	}
-	.index-header {
-		display: flex;
-	    justify-content: space-between;
-	    -moz-justify-content: space-between;
-	    -webkit-justify-content: space-between;
-	    align-items: center;
-	}
-	.logo {
-		margin-left: -25px;
-	}
-	.header-title {
-		text-align: center;
-	}
-	.header-title li{
-		display: inline;
-		font-family: Roboto-Thin;
-		font-size: 16px;
-		margin-right: 25px;
-		position: relative;
-	}
-	.header-title li:last-child {
-		margin-right: 0;
-	}
-	.header-title li a {
-		color: #8a8787;
-	}
-	.header-title li .header-selected {
-		color:  #fff;
-	}
-	.header-title .header-title-selected {
-		width: 6px;
-		height: 6px;
-		display: block;
-		background: #49B300;
-		position: absolute;
-		left: 50%;
-		bottom: -15px;
-		border-radius: 50%;
-	}
-	.search-box {
-		position: relative;
-		margin-right: 4%;
-	}
-	.search-box input {
-		border: 0;
-		border-bottom: 1px solid #FFFFFF;
-		background-color: transparent;
-		font-size: 14px;
-		color: #fff;
-		width: 120px;
-	}
-	.search-box button{
-		background-color: transparent;
-		border: 0;
-	}
-	.search-box button {
-		position: absolute;
-		top: -3px;
-		right: 2px;
-	}
-	.index-main-pic {
-		margin-top: -150px;
-	}
-	.index-main-pic {
-		margin-top: -150px;
-	}
-	.clear-margin {
-		margin-left: 10px;
-		margin-right: 10px;
-	}
-	.index-content {
-		margin-top: 50px;
-	}
-	.index-content h2 {
-		font-size: 36px;
-		color: #4A4A4A;
-		letter-spacing: 0.07px;
-		margin-bottom: 30px;
-	}
-	.index-tag {
-		display: inline-block;
-		background: #FFDE00;
-		width: 30px;
-		height: 30px;
-		margin-right: 10px;
-		margin-top: 5px;
-	}
-	.index-content-text {
-		font-size: 20px;
-		color: #000000;
-		letter-spacing: 0.01px;
-		line-height: 30px;
-		margin-bottom: 40px;
-	}
-	.index-more-item {
-		background: #FFFEFE;
-		border-radius: 3px;
-		padding: 10px 20px;
-	}
-	.index-more .index-more-li {
-		padding-left: 10px;
-		padding-right: 10px;
-	}
-	.index-more-item {
-		min-height: 350px;
-	}
-	.index-faq {
-		margin-top: 60px;
-		padding-bottom: 40px;
-	}
-	.index-faq-li {
-		padding-left: 0;
-		padding-right: 0;
-	}
-	.index-faq-li > img {
-		width: 30px;
-	}
-	.index-link-logo {
-		margin-right: 35px;
-		margin-top: 20px;
-	}
-	.span-faq {
-		font-size: 25.65px;
-		color: #000000;
-		letter-spacing: 0.55px;
-		vertical-align: middle;
-	}
-	.index-shop-img {
-		height: 40px;
-		margin-bottom: 10px;
-		border-radius: 5px;
-		border:1px solid #ccc;
-	}
-	footer {
-		min-height: 80px;
-		background-color: #2F2F2F;
-		font-size: 18px;
-		color: #FFFFFF;
-		letter-spacing: 0.11px;
-	}
-	.footer-block-item {
-		color: #fff;
-		margin-top: 25px;
-		font-family: Roboto-Thin;
-	}
-}
-
-@media screen and (min-width: 992px) {
-	header {
-		height: 350px;
-	}
-	.index-main-pic {
-		margin-top: -220px;
-	}
-	.index-more-item {
-		min-height: 320px;
-	}
-}
-
-@media screen and (min-width: 1200px) {
-	header {
-		height: 482px;
-	}
-	.index-main-pic {
-		margin-top: -300px;
-	}
-	.index-more-item {
-		min-height: 270px;
-	}
-}
-
-@media screen and (max-width: 767px) {
-	header {
-		min-height: 70px;
-		background-color: #000;
-		font-family: Roboto-Thin;
-	}
-	.index-header {
-		padding: 0;
-	}
-	.logo img {
-		height: 50px;
-		margin: 10px 18px;
-	}
-	.header-title li {
-		text-align: center;
-		line-height: 35px;
-	}
-	.index-header .navbar-header {
-		border-bottom: 1px solid #555;
-	}
-	.header-title li a {
-		color: #fff;
-	}
-	.navbar-header button {
-		margin-top: 20px;
-	}
-	.navbar-toggle .icon-bar {
-		background-color: #fff;
-	}
-	.header-phone-selected {
-		background-color: #555;
-	}
-	.index-main-pic img {
-		width: 100%;
-	}
-	.index-content h2{
-		font-family: Roboto-Condensed;
-		font-size: 15.75px;
-		color: #000000;
-		letter-spacing: 0.03px;
-		font-weight: 600;
-	}
-	.index-content > div {
-		margin: 35px;
-		margin-bottom: 20px;
-		text-align: center;
-	}
-	.index-content-text {
-		font-family: Roboto-Light;
-		font-size: 10px;
-		color: #000000;
-		letter-spacing: 0;
-		line-height: 20px;
-		margin-top: 10px;
-	}
-	.index-shop-img {
-		height: 40px;
-		margin-bottom: 15px;
-	}
-	.index-shop-logo-ul {
-		margin-top: 30px;
-		margin-bottom:20px;
-	}
-	.index-more-li {
-		margin: 0 30px 30px 30px;
-	}
-	.index-faq-li {
-		margin: 0 30px 30px 30px;
-	}
-	.span-faq {
-		font-family: Roboto-Condensed;
-		font-size: 22px;
-		color: #000000;
-		letter-spacing: 0.47px;
-		vertical-align: middle;
-	}
-	.index-faq-li > img {
-		width: 22px;
-	}
-
-	footer {
-		padding: 25px;
-		background-color: #000;
-		color: #fff;
-		position: relative;
-	}
-	.footer-item1 {
-		font-family: Roboto-Light;
-		font-size: 11px;
-		letter-spacing: 0.07px;
-		line-height: 18px;
-		width: 70%;
-	}
-	.footer-item2 {
-		font-family: .PingFangSC-Regular;
-		font-size: 11px;
-		letter-spacing: 0.46px;
-		line-height: 30px;
-	}
-	.footer-div1 {
-		width: 70%;
-	}
-	.footer-div2 {
-		position: absolute !important;
-		bottom: 30px;
-		right: 30px;
-	}
-	.footer-div2 img {
-		width: 57px;
-	}
-}
-
-
-/************doc css****************/
-@media screen and (min-width: 768px) {
-	#example-navbar-collapse {
-		overflow-y: auto !important;
-	}
-	.doc-content {
-		margin-top: 80px;
-	}
-	.doc-header {
-		position: fixed;
-		top: 0;
-		height: 80px;
-		width: 100%;
-		z-index: 10;
-	}
-	.crumbs {
-		height: 55px;
-		font-family: Roboto-Light;
-		font-size: 17px;
-		color: #4A4A4A;
-		margin-top: 30px;
-		border-bottom:  1px solid #BEBCBF;;
-	}
-	.doc-title {
-		font-family: Roboto-Condensed;
-		font-size: 25px;
-		color: #333333;
-		height: 45px;
-		margin-top: 20px;
-	}
-	.toctree-l1>a{
-		font-family: Roboto-Thin;
-		font-size: 16px;
-		color: #4A4A4A;
-	}
-	.toctree-l1 {
-		margin-top: 20px;
-	}
-	.toctree-l1 > ul {
-		margin-left: 1.8em;
-	}
-	.toctree-l2 > a {
-		font-family: Roboto-Light;
-		font-size: 14px;
-		color: #4A4A4A;
-	}
-	.toctree-l2{
-		margin-top: 20px;
-		margin-bottom: 20px;
-	}
-
-	.toctree-l2 > ul {
-		margin-left: 1.8em;
-	}
-	.toctree-l3 > a {
-		font-family: Roboto-Regular;
-		font-size: 12px;
-		color: #737373;
-	}
-	.toctree-l3{
-		margin-top: 15px;
-		margin-bottom: 15px;
-	}
-	.body h1,.body h2,.body h3,.body h4,.body h5,.body  h6 {
-		margin-bottom: 20px;
-	}
-	.left-menu {
-		position: fixed;
-		width: 18%;
-	}
-	.sidebar {
-		max-height: 500px;
-		overflow-x: hidden; 
-		overflow-y: auto;
-	}
-	.to-bottom {
-		position: fixed;
-		bottom: 0;
-		width: 100%;
-	}
-}
-
-@media screen and (max-width: 767px) {
-	#thanks-these-guys-who-are-contributing .image-reference img{
-		margin: 0;
-	}
-	.doc-header {
-		background-color: #000;
-	}
-	.sidebar {
-		background-color: #000;
-	}
-	.sidebar a {
-		color: #fff;
-	}
-	.content-main {
-		padding-left: 0 !important;
-		padding-right:  0 !important; 
-	}
-	.toctree-l1>a{
-		font-family: Roboto-Thin;
-		font-size: 20px;
-		font-weight: 600;
-	}
-	.toctree-l1 {
-		margin-top: 10px;
-	}
-	.toctree-l2 > a {
-		font-family: Roboto-Bold;
-		font-size: 16px;
-	}
-	.toctree-l2{
-		margin-top: 12px;
-		margin-bottom: 12px;
-	}
-	.toctree-l3 > a {
-		font-family: Roboto-Regular;
-		font-size: 14px;
-	}
-	.toctree-l3{
-		margin-top: 10px;
-		margin-bottom: 10px;
-	}
-	.toctree-l2 ul>li:last-child {
-		margin-bottom: 25px;
-	}
-	.search-phone {
-		position: relative;
-		margin-right: 4%;
-		margin-top: 25px;
-		margin-bottom: 25px;
-	}
-	.search-phone input {
-		border: 0;
-		border-bottom: 1px solid #eee;
-		background-color: transparent;
-		font-size: 14px;
-		color: #fff;
-		width: 100%;
-	}
-	.search-phone button{
-		background-color: transparent;
-		border: 0;
-	}
-	.search-phone button {
-		position: absolute;
-		top: -3px;
-		right: 2px;
-	}
-	.sidebar {
-		padding-left: 35px !important;
-	}
-	.left-menu {
-		margin: -15px;
-		/*margin-bottom: 15px;*/
-	}
-	.doc-content {
-		padding: 15px;
-	}
-	/*.doc-content {
-		margin-top: 80px;
-		padding: 15px;
-	}
-	.doc-header {
-		position: fixed;
-		top: 0;
-		height: 70px;
-		width: 100%;
-		z-index: 10;
-	}
-	html {
-		background-color: #000;
-	}
-	body {
-		background-color: #fff;
-	}
-	.document {
-		padding-top: 20px;
-	}*/
-	.crumbs {
-		margin-top: 20px;
-	}
-}
-
-	.body h1 {
-		font-family: Roboto-Bold;
-		font-size: 22px;
-		color: #4A4A4A;
-		font-weight: 600;
-	}
-	.body h2 {
-		font-family: Roboto-Bold;
-		font-size: 18px;
-		color: #4A4A4A;
-		font-weight: 600;
-	}
-	.body img {
-		max-width: 100%;
-		margin: 15px auto;
-	}
-	.body p {
-		line-height: 25px;
-	}
-	.simple li{
-		line-height: 25px;
-		margin-bottom: 10px;
-		letter-spacing: 0.5px;
-	}
-	.simple  {
-		margin-left: 1.8em;
-	}
-	.search {
-		margin-bottom: 80px;
-	}
-	.search li {
-	    	padding: 20px 0;
-	    	border-bottom: 1px solid #ccc;
-	}
-	.highlight {
-	    	background: #EFEFEF !important;
-	    	color: #93A1A1;
-	}
-	.highlight pre {
-	    	padding: 1em;
-	}
-	.highlight .p {
-	    	color: #93A1A1;
-	}
-	.highlight span {
-	    	line-height: 24px;
-	}
diff --git a/qpython-docs/source/qpython_theme/theme.conf b/qpython-docs/source/qpython_theme/theme.conf
deleted file mode 100644
index cc7cc7ca..00000000
--- a/qpython-docs/source/qpython_theme/theme.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-[theme]
-inherit = basic
-stylesheet = qpython_theme.css
-pygments_style = none
diff --git a/qpython-docs/source/zh/contributorshowto.rst b/qpython-docs/source/zh/contributorshowto.rst
deleted file mode 100644
index da17ec1e..00000000
--- a/qpython-docs/source/zh/contributorshowto.rst
+++ /dev/null
@@ -1,36 +0,0 @@
-
-QPython文档体系说明
----------------------
-
-QPython 文档体系分为 英文／中文 两部分，我们努力保持两种语言对应内容的准确和同步，其中内容其中又分为
-
-* 快速开始 （使用上的帮助）
-
-* 编程指南 （主要是用QPython来进行编程和开发的指南）
-
-* QPython黑客指南 （深入折腾的指导）
-
-* 贡献者指南 （QPython贡献者指南，分为在QPython team内的，和以外的）
-
-
-如何提交文档
--------------------------------
-文档非常重要，我们用sphinx来组织文档，并且文档会通过github page功能直接推到qpython.org网站中
-在想要贡献QPython文档之前仔细阅读我们的指南
-
-* git clone http://github.com/qpython-android/qpython
-
-* 进入到 项目的qpython-docs目录中
-
-* 按照sphinx规则编辑source中的文件即可
-
-* 最后cd到qpython-docs中并运行build.sh
-
-* 打开浏览器打开本地文件检查，
-
-* 如果检查无问题则可以提交，然后浏览qpython.org即可看到最新的更新
-
-
-如何提交翻译
--------------------------------
-QPython是一个支持多语言的应用，你可以通过以下方式来提交对应国家的翻译
diff --git a/qpython-docs/source/zh/howtostart.rst b/qpython-docs/source/zh/howtostart.rst
deleted file mode 100644
index 8a1ed07f..00000000
--- a/qpython-docs/source/zh/howtostart.rst
+++ /dev/null
@@ -1,28 +0,0 @@
-快速开始
-=========
-
-* `QPython － 使用说明 <http://wiki.qpython.org/zh/doc/how-to-start>`_
-* `QPython － 快速开始 <http://wiki.qpython.org/zh/quick-start>`_
-* `“你好，世界！” <http://wiki.qpython.org/zh/doc/hello-world>`_
-
-编程指南
-============
-
-* `QPython － 开发 WEB APP <http://wiki.qpython.org/zh/webapp/sample>`_
-* `QPython － Bottle 快速了解 <http://wiki.qpython.org/zh/webapp/bottle>`_
-
-QPython黑客指南
-=================
-
-* `QPython － 编程向导 <http://wiki.qpython.org/zh/doc/program_guide/>`_
-* `QPython 黑客 <http://wiki.qpython.org/zh/diveinto/>`_
-
-贡献者指南
-=================
-欢迎加入 QPython 团队
-
-.. toctree::
-   :maxdepth: 2
-
-   contributorshowto
-
diff --git a/qpython-docs/source/zh/quickstart.rst b/qpython-docs/source/zh/quickstart.rst
deleted file mode 100644
index eb41fb3b..00000000
--- a/qpython-docs/source/zh/quickstart.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-���ٿ�ʼ
-========
-
diff --git a/qpython-docs/source/zhindex.rst b/qpython-docs/source/zhindex.rst
deleted file mode 100644
index 6006633f..00000000
--- a/qpython-docs/source/zhindex.rst
+++ /dev/null
@@ -1,33 +0,0 @@
-中文用户向导
-=============================================
-
-欢迎 ！
-------------------------------
-QPython/QPython3 的最新版本1.3.2(QPython), 1.0.2(QPython3) 已经发布，它包含了许多惊艳的特性，请从应用市场安装
-
-
-QPython 起步
-------------------------
-.. toctree::
-   :maxdepth: 2
-
-   zh/howtostart
-
-
-更多链接
-------------------------------
-* `常见问题 <http://wiki.qpython.org/zh/faq/>`_
-* `在百度贴吧里讨论 <http://tieba.baidu.com/f?ie=utf-8&kw=qpython>`_
-* `在微博问我们问题 <http://weibo.com/qpython>`_
-* `给我们发邮件 <mailto:support@qpython.org>`_
-* `报告问题 <https://github.com/qpython-android/qpython/issues>`_
-
-QPython 用户开发组
-------------------------------
-* 请加入 `QPython 用户开发者组 <https://groups.google.com/forum/?hl=en#!forum/qpython>`_ 来和全世界的 QPython 用户一块来玩转QPython。
-* 加入QPython QQ组（Q群：540717901）来和中国活跃的QPython 用户一起玩转 QPython
-
-如何贡献
----------
-想成为 QPython 的贡献者么？请 `给我们发邮件 <mailto:support@qpython.org>`_
-
diff --git a/qpython/.gitignore b/qpython/.gitignore
deleted file mode 100644
index 796b96d1..00000000
--- a/qpython/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
diff --git a/qpython/build.gradle b/qpython/build.gradle
index 3329e08c..738e1a9e 100644
--- a/qpython/build.gradle
+++ b/qpython/build.gradle
@@ -1,87 +1,218 @@
-apply plugin: 'com.android.application'
-apply plugin: 'me.tatarka.retrolambda'
-apply plugin: 'com.jakewharton.butterknife'
-apply plugin: 'realm-android'
-
-android {
-    compileSdkVersion 23
-    buildToolsVersion '25.0.0'
-    defaultConfig {
-        applicationId "org.qpython.qpy.alpha"
-        minSdkVersion 15
-        targetSdkVersion 23
-        versionCode 1
-        versionName "1.0"
-
-        ndk {
-            moduleName "libjackpal-androidterm5"
-            ldLibs "log"
-        }
-
-        multiDexEnabled true
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
-        }
-    }
-
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-
-    dataBinding {
-        enabled = true
-    }
-
-    sourceSets {
-        main {
-            jniLibs.srcDirs = ['libs']
-        }
-    }
-}
-
-
-configurations {
-    all*.exclude group: 'commons-logging', module: 'commons-logging'
-}
-
-
-dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    compile project(':termemulator')
-    compile project(':termexec')
-    compile project(':qpypluginman')
-    compile project(':qpysdk')
-
-    debugCompile project(path: ':qpysl4a', configuration: 'libraryDebug')
-    releaseCompile project(path: ':qpysl4a', configuration: 'libraryRelease')
-
-    compile 'com.umeng.analytics:analytics:latest.integration'
-    compile 'com.jakewharton:butterknife:8.5.1'
-    annotationProcessor 'com.jakewharton:butterknife-compiler:8.5.1'
-    compile 'com.android.support:appcompat-v7:23.4.0'
-    compile 'com.android.support:design:23.4.0'
-    compile 'de.hdodenhof:circleimageview:2.0.0'
-    compile 'com.thefinestartist:finestwebview:1.2.7'
-    compile 'me.zhanghai.android.materialprogressbar:library:1.1.4'
-    compile 'org.apmem.tools:layouts:1.9@aar'
-    compile 'com.azeesoft.lib.colorpicker:colorpicker:1.0.8@aar'
-    compile 'com.googlecode.juniversalchardet:juniversalchardet:1.0.3'
-    compile('com.github.afollestad.material-dialogs:commons:0.8.5.6') { transitive = true }
-    compile 'com.daimajia.numberprogressbar:library:1.2@aar'
-    compile 'io.reactivex:rxandroid:1.2.1'
-    compile 'io.reactivex:rxjava:1.1.8'
-    compile 'com.google.code.gson:gson:2.6.2'
-    compile 'org.litepal.android:core:1.3.1'
-    compile 'com.android.support:support-annotations:23.4.0'
-    compile 'org.greenrobot:eventbus:3.0.0'
-    compile 'com.android.support:cardview-v7:23.4.0'
-    compile 'me.dm7.barcodescanner:zxing:1.9'
-    compile 'com.android.support:multidex:1.0.1'
-    //compile 'com.squareup.okhttp3:okhttp:3.4.1'
-    compile 'com.loopj.android:android-async-http:1.4.9'
-}
\ No newline at end of file
+apply plugin: 'com.android.application'
+apply plugin: 'com.jakewharton.butterknife'
+apply plugin: 'realm-android'
+
+//获取系统时间
+def releaseTime() {
+    return new Date().format("yyyy-MM-dd", TimeZone.getTimeZone("UTC"))
+}
+
+android {
+    compileSdkVersion rootProject.ext.compileSdkVersion
+    buildToolsVersion rootProject.ext.buildToolsVersion
+    flavorDimensions "default"
+    defaultConfig {
+        minSdkVersion rootProject.ext.minSdkVersion
+        targetSdkVersion rootProject.ext.targetSdkVersion
+        versionCode 304
+        versionName "3.0.0"
+        multiDexEnabled true
+        vectorDrawables.useSupportLibrary = true
+
+        ndk {
+            abiFilters 'armeabi-v7a',"arm64-v8a"
+
+        }
+
+        sourceSets {
+            main {
+                jniLibs.srcDirs = ['libs']
+
+            }
+        }
+    }
+
+    signingConfigs {
+        release {
+            keyAlias 'zuowuxuxi'
+            keyPassword 'myxiake1q'
+            storeFile file('qpython.key')
+            storePassword 'myxiake1q'
+            v1SigningEnabled true
+            v2SigningEnabled false
+        }
+
+        debug {
+            storeFile file("../debug.keystore")
+        }
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            shrinkResources false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+
+            signingConfig signingConfigs.release
+
+            //修改生成的包名
+            applicationVariants.all { variant ->
+                variant.outputs.each { output ->
+                    def outputFile = output.outputFile
+                    if (outputFile != null && outputFile.name.endsWith('.apk')) {
+                        def fileName = "qpython_os_${releaseTime()}_${variant.productFlavors[0].name}.apk"
+                        output.outputFileName = fileName
+                    }
+                }
+            }
+        }
+
+        debug {
+            signingConfig signingConfigs.release
+        }
+
+    }
+
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    dataBinding {
+        enabled = true
+    }
+    lintOptions {
+        disable 'MissingTranslation'
+        abortOnError false
+    }
+
+    //为了解决部分第三方库重复打包了META-INF的问题
+    packagingOptions {
+        exclude 'META-INF/LICENSE.txt'
+        exclude 'META-INF/NOTICE.txt'
+    }
+
+    //设置渠道
+    productFlavors {
+
+        ol {
+//            resValue "string", "app_name", "Qpython"
+            applicationId "org.qpython.qpy"
+        }
+        os {
+//            resValue "string", "app_name", "Qpython"
+            applicationId "org.qpython.qpy"
+        }
+        od {
+//            resValue "string", "app_name", "Qpython"
+            applicationId "org.qpython.qpy"
+        }
+        op {
+//            resValue "string", "app_name", "QpythonL"
+            applicationId "com.hipipal.qpyplus"
+        }
+        oh {
+//            resValue "string", "app_name", "QpythonL"
+            applicationId "com.hipipal.qpyplus"
+        }
+
+    }
+
+    repositories {
+        flatDir {
+            dirs 'libs'
+        }
+    }
+
+
+//    dexOptions {
+//        incremental =true
+//    }
+
+}
+
+configurations {
+    all*.exclude group: 'commons-logging', module: 'commons-logging'
+}
+
+dependencies {
+    //api rootProject.ext.libButterknife
+    //annotationProcessor rootProject.ext.libButterknifeCompiler
+
+    api fileTree(include: ['*.jar'], dir: 'libs')
+    api fileTree(include: ['*.so'], dir: 'libs')
+
+    api project(':termemulator')
+    api project(':termexec')
+    api project(':qpypluginman')
+    api project(':qpysdk')
+
+    api files('libs/markdown4j.jar')
+    //api files('libs/android-async-http-1.4.8.aar')
+    //api 'com.loopj.android:android-async-http:1.4.8'
+
+    api('com.github.afollestad.material-dialogs:commons:0.8.5.6') { transitive = true }
+
+    api 'me.zhanghai.android.materialprogressbar:library:1.1.4'
+    api 'org.apmem.tools:layouts:1.9@aar'
+    api 'com.azeesoft.lib.colorpicker:colorpicker:1.0.8@aar'
+    api 'com.googlecode.juniversalchardet:juniversalchardet:1.0.3'
+    api 'com.daimajia.numberprogressbar:library:1.2@aar'
+    api 'org.litepal.android:core:1.3.1'
+    api 'me.dm7.barcodescanner:zxing:1.9'
+    api 'com.android.support:multidex:1.0.1'
+
+    api rootProject.ext.libOkHttp3
+    api rootProject.ext.libOkHttp3Log
+
+    api 'com.squareup.okio:okio:1.9.0'
+    api 'com.google.code.gson:gson:2.7'
+    api 'com.yanzhenjie:recyclerview-swipe:1.1.3'
+
+    api rootProject.ext.libRxAndroid
+    api rootProject.ext.libRxJava
+
+    api rootProject.ext.libSupportCardView
+    api rootProject.ext.libSupportPreference
+
+    osApi rootProject.ext.firebaseCore
+    osApi rootProject.ext.firebaseMsg
+    osApi rootProject.ext.firebaseAuth
+    osApi rootProject.ext.firebaseDatabase
+    osApi rootProject.ext.googlePlayServiceAuth
+
+    olApi rootProject.ext.firebaseCore
+    olApi rootProject.ext.firebaseMsg
+    olApi rootProject.ext.firebaseAuth
+    olApi rootProject.ext.firebaseDatabase
+    olApi rootProject.ext.googlePlayServiceAuth
+
+    api rootProject.ext.retrofit
+    api rootProject.ext.retrofitCoverterGson
+    api rootProject.ext.retrofitAdapterRxjava
+
+    api 'com.android.support.constraint:constraint-layout:1.0.2'
+
+    //    微信
+    opApi('com.tencent.mm.opensdk:wechat-sdk-android-with-mta:1.4.0') {
+        exclude group: 'com.android.support:support-v4'
+    }
+    //    友盟统计
+    opApi('com.umeng.analytics:analytics:6.1.2') {
+        exclude group: 'com.android.support:support-v4'
+    }
+
+    ohApi('com.tencent.mm.opensdk:wechat-sdk-android-with-mta:1.4.0') {
+        exclude group: 'com.android.support:support-v4'
+    }
+    //    友盟统计
+    ohApi('com.umeng.analytics:analytics:6.1.2') {
+        exclude group: 'com.android.support:support-v4'
+    }
+
+
+    api 'com.youth.banner:banner:1.4.10'
+}
+
+apply plugin: 'com.google.gms.google-services'
\ No newline at end of file
diff --git a/qpython/google-services.json b/qpython/google-services.json
new file mode 100644
index 00000000..dcb69ca8
--- /dev/null
+++ b/qpython/google-services.json
@@ -0,0 +1,68 @@
+{
+  "project_info": {
+    "project_number": "955258715976",
+    "firebase_url": "https://qpython-316a3.firebaseio.com",
+    "project_id": "qpython-316a3",
+    "storage_bucket": "qpython-316a3.appspot.com"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:955258715976:android:4fd6edc2d9a8f5a8",
+        "android_client_info": {
+          "package_name": "org.qpython.qpy"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "955258715976-griocs2ml4pm168gggtrrvqv8m6aftvs.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "org.qpython.qpy",
+            "certificate_hash": "45fd6098019a37d98403063602f6852ca21fb867"
+          }
+        },
+        {
+          "client_id": "955258715976-i6t5usa0tjg8favq17lsfaj885l4lilv.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyB7W6_FKMJO13hQ2HKhMopGQvemjjuDv4c"
+        }
+      ],
+      "services": {
+        "analytics_service": {
+          "status": 1
+        },
+        "appinvite_service": {
+          "status": 2,
+          "other_platform_oauth_client": [
+            {
+              "client_id": "955258715976-i6t5usa0tjg8favq17lsfaj885l4lilv.apps.googleusercontent.com",
+              "client_type": 3
+            }
+          ]
+        },
+        "ads_service": {
+          "status": 2
+        }
+      }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:955258715976:android:4fd6edc2d9a8f5a8",
+        "android_client_info": {
+          "package_name": "com.hipipal.qpyplus"
+        }
+      },
+      "api_key": [
+        {
+          "current_key": "AIzaSyB7W6_FKMJO13hQ2HKhMopGQvemjjuDv4c"
+        }
+      ]
+    }
+  ],
+  "configuration_version": "1"
+}
\ No newline at end of file
diff --git a/qpython/gradle/wrapper/gradle-wrapper.jar b/qpython/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 00000000..13372aef
Binary files /dev/null and b/qpython/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/qpython/gradlew b/qpython/gradlew
new file mode 100644
index 00000000..9d82f789
--- /dev/null
+++ b/qpython/gradlew
@@ -0,0 +1,160 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+    echo "$*"
+}
+
+die ( ) {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+esac
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+    JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
diff --git a/qpython/gradlew.bat b/qpython/gradlew.bat
new file mode 100644
index 00000000..8a0b282a
--- /dev/null
+++ b/qpython/gradlew.bat
@@ -0,0 +1,90 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/qpython/libs/android-async-http-1.4.8.aar b/qpython/libs/android-async-http-1.4.8.aar
new file mode 100644
index 00000000..41776363
Binary files /dev/null and b/qpython/libs/android-async-http-1.4.8.aar differ
diff --git a/qpython/libs/arm64-v8a/libapplication.so b/qpython/libs/arm64-v8a/libapplication.so
deleted file mode 100755
index 2c0b1cc9..00000000
Binary files a/qpython/libs/arm64-v8a/libapplication.so and /dev/null differ
diff --git a/qpython/libs/arm64-v8a/libjpush217.so b/qpython/libs/arm64-v8a/libjpush217.so
deleted file mode 100644
index de6d111d..00000000
Binary files a/qpython/libs/arm64-v8a/libjpush217.so and /dev/null differ
diff --git a/qpython/libs/arm64-v8a/libpymodules.so b/qpython/libs/arm64-v8a/libpymodules.so
deleted file mode 100755
index 31d27ea0..00000000
Binary files a/qpython/libs/arm64-v8a/libpymodules.so and /dev/null differ
diff --git a/qpython/libs/arm64-v8a/libpython2.7.so b/qpython/libs/arm64-v8a/libpython2.7.so
deleted file mode 100755
index 74238437..00000000
Binary files a/qpython/libs/arm64-v8a/libpython2.7.so and /dev/null differ
diff --git a/qpython/libs/arm64-v8a/libsdl.so b/qpython/libs/arm64-v8a/libsdl.so
deleted file mode 100755
index 1a3e9f09..00000000
Binary files a/qpython/libs/arm64-v8a/libsdl.so and /dev/null differ
diff --git a/qpython/libs/arm64-v8a/libsdl_image.so b/qpython/libs/arm64-v8a/libsdl_image.so
deleted file mode 100755
index 2f929d3a..00000000
Binary files a/qpython/libs/arm64-v8a/libsdl_image.so and /dev/null differ
diff --git a/qpython/libs/arm64-v8a/libsdl_main.so b/qpython/libs/arm64-v8a/libsdl_main.so
deleted file mode 100755
index ba3f186f..00000000
Binary files a/qpython/libs/arm64-v8a/libsdl_main.so and /dev/null differ
diff --git a/qpython/libs/arm64-v8a/libsdl_mixer.so b/qpython/libs/arm64-v8a/libsdl_mixer.so
deleted file mode 100755
index 0bafee72..00000000
Binary files a/qpython/libs/arm64-v8a/libsdl_mixer.so and /dev/null differ
diff --git a/qpython/libs/arm64-v8a/libsdl_ttf.so b/qpython/libs/arm64-v8a/libsdl_ttf.so
deleted file mode 100755
index 1cceb593..00000000
Binary files a/qpython/libs/arm64-v8a/libsdl_ttf.so and /dev/null differ
diff --git a/qpython/libs/arm64-v8a/libsqlite3.so b/qpython/libs/arm64-v8a/libsqlite3.so
deleted file mode 100755
index e4113195..00000000
Binary files a/qpython/libs/arm64-v8a/libsqlite3.so and /dev/null differ
diff --git a/qpython/libs/armeabi-v7a/libapplication.so b/qpython/libs/armeabi-v7a/libapplication.so
deleted file mode 100755
index 2c0b1cc9..00000000
Binary files a/qpython/libs/armeabi-v7a/libapplication.so and /dev/null differ
diff --git a/qpython/libs/armeabi-v7a/libjpush217.so b/qpython/libs/armeabi-v7a/libjpush217.so
deleted file mode 100644
index d47565c4..00000000
Binary files a/qpython/libs/armeabi-v7a/libjpush217.so and /dev/null differ
diff --git a/qpython/libs/armeabi-v7a/libpymodules.so b/qpython/libs/armeabi-v7a/libpymodules.so
deleted file mode 100755
index 31d27ea0..00000000
Binary files a/qpython/libs/armeabi-v7a/libpymodules.so and /dev/null differ
diff --git a/qpython/libs/armeabi-v7a/libpython2.7.so b/qpython/libs/armeabi-v7a/libpython2.7.so
deleted file mode 100755
index 74238437..00000000
Binary files a/qpython/libs/armeabi-v7a/libpython2.7.so and /dev/null differ
diff --git a/qpython/libs/armeabi-v7a/libsdl.so b/qpython/libs/armeabi-v7a/libsdl.so
deleted file mode 100755
index 1a3e9f09..00000000
Binary files a/qpython/libs/armeabi-v7a/libsdl.so and /dev/null differ
diff --git a/qpython/libs/armeabi-v7a/libsdl_image.so b/qpython/libs/armeabi-v7a/libsdl_image.so
deleted file mode 100755
index 2f929d3a..00000000
Binary files a/qpython/libs/armeabi-v7a/libsdl_image.so and /dev/null differ
diff --git a/qpython/libs/armeabi-v7a/libsdl_main.so b/qpython/libs/armeabi-v7a/libsdl_main.so
deleted file mode 100755
index ba3f186f..00000000
Binary files a/qpython/libs/armeabi-v7a/libsdl_main.so and /dev/null differ
diff --git a/qpython/libs/armeabi-v7a/libsdl_mixer.so b/qpython/libs/armeabi-v7a/libsdl_mixer.so
deleted file mode 100755
index 0bafee72..00000000
Binary files a/qpython/libs/armeabi-v7a/libsdl_mixer.so and /dev/null differ
diff --git a/qpython/libs/armeabi-v7a/libsdl_ttf.so b/qpython/libs/armeabi-v7a/libsdl_ttf.so
deleted file mode 100755
index 1cceb593..00000000
Binary files a/qpython/libs/armeabi-v7a/libsdl_ttf.so and /dev/null differ
diff --git a/qpython/libs/armeabi-v7a/libsqlite3.so b/qpython/libs/armeabi-v7a/libsqlite3.so
deleted file mode 100755
index e4113195..00000000
Binary files a/qpython/libs/armeabi-v7a/libsqlite3.so and /dev/null differ
diff --git a/qpython/libs/armeabi/libapplication.so b/qpython/libs/armeabi/libapplication.so
deleted file mode 100755
index 2c0b1cc9..00000000
Binary files a/qpython/libs/armeabi/libapplication.so and /dev/null differ
diff --git a/qpython/libs/armeabi/libjpush217.so b/qpython/libs/armeabi/libjpush217.so
deleted file mode 100644
index 34d56e71..00000000
Binary files a/qpython/libs/armeabi/libjpush217.so and /dev/null differ
diff --git a/qpython/libs/armeabi/libpymodules.so b/qpython/libs/armeabi/libpymodules.so
deleted file mode 100755
index 31d27ea0..00000000
Binary files a/qpython/libs/armeabi/libpymodules.so and /dev/null differ
diff --git a/qpython/libs/armeabi/libpython2.7.so b/qpython/libs/armeabi/libpython2.7.so
deleted file mode 100755
index 74238437..00000000
Binary files a/qpython/libs/armeabi/libpython2.7.so and /dev/null differ
diff --git a/qpython/libs/armeabi/libsdl.so b/qpython/libs/armeabi/libsdl.so
deleted file mode 100755
index 1a3e9f09..00000000
Binary files a/qpython/libs/armeabi/libsdl.so and /dev/null differ
diff --git a/qpython/libs/armeabi/libsdl_image.so b/qpython/libs/armeabi/libsdl_image.so
deleted file mode 100755
index 2f929d3a..00000000
Binary files a/qpython/libs/armeabi/libsdl_image.so and /dev/null differ
diff --git a/qpython/libs/armeabi/libsdl_main.so b/qpython/libs/armeabi/libsdl_main.so
deleted file mode 100755
index ba3f186f..00000000
Binary files a/qpython/libs/armeabi/libsdl_main.so and /dev/null differ
diff --git a/qpython/libs/armeabi/libsdl_mixer.so b/qpython/libs/armeabi/libsdl_mixer.so
deleted file mode 100755
index 0bafee72..00000000
Binary files a/qpython/libs/armeabi/libsdl_mixer.so and /dev/null differ
diff --git a/qpython/libs/armeabi/libsdl_ttf.so b/qpython/libs/armeabi/libsdl_ttf.so
deleted file mode 100755
index 1cceb593..00000000
Binary files a/qpython/libs/armeabi/libsdl_ttf.so and /dev/null differ
diff --git a/qpython/libs/armeabi/libsqlite3.so b/qpython/libs/armeabi/libsqlite3.so
deleted file mode 100755
index e4113195..00000000
Binary files a/qpython/libs/armeabi/libsqlite3.so and /dev/null differ
diff --git a/qpython/libs/jpush-android-2.1.7.jar b/qpython/libs/jpush-android-2.1.7.jar
deleted file mode 100644
index dc17b809..00000000
Binary files a/qpython/libs/jpush-android-2.1.7.jar and /dev/null differ
diff --git a/qpython/libs/markdown4j.jar b/qpython/libs/markdown4j.jar
new file mode 100644
index 00000000..65030fa0
Binary files /dev/null and b/qpython/libs/markdown4j.jar differ
diff --git a/qpython/proguard-rules.pro b/qpython/proguard-rules.pro
index bce53e2e..0a213a26 100644
--- a/qpython/proguard-rules.pro
+++ b/qpython/proguard-rules.pro
@@ -13,5 +13,233 @@
 # and specify the fully qualified class name to the JavaScript interface
 # class:
 #-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
+#   public org.qpython.qpy.main.event.Bean
 #}
+-keepattributes SourceFile,LineNumberTable
+-renamesourcefileattribute SourceFile
+
+# Platform calls Class.forName on types which do not exist on Android to determine platform.
+-dontnote retrofit2.Platform
+# Platform used when running on Java 8 VMs. Will not be used at runtime.
+-dontwarn retrofit2.Platform$Java8
+# Retain generic type information for use by reflection by converters and adapters.
+-keepattributes Signature
+# Retain declared checked exceptions for use by a Proxy instance.
+-keepattributes Exceptions
+-dontwarn rx.**
+-dontwarn okio.**
+-keep class org.apache.http.** { *; }
+-dontwarn org.apache.http.**
+-dontwarn java.lang.invoke.**
+-keep class com.google.**
+-dontwarn com.google.**
+# EventBus 3.0
+-keep class de.greenrobot.event.** { *; }
+-keep class * {
+    @de.greenrobot.event.* <methods>;
+}
+-keepattributes *Annotation*
+-keepclassmembers class ** {
+    @org.greenrobot.eventbus.Subscribe <methods>;
+}
+-keep enum org.greenrobot.eventbus.ThreadMode { *; }
+
+-dontpreverify
+
+#-keep class * extends junit.framework.TestCase
+#-keepclassmembers class * extends junit.framework.TestCase { *; }
+
+# android
+-repackageclasses ''
+-allowaccessmodification
+-optimizations !code/simplification/arithmetic
+#
+## retrace
+#-renamesourcefileattribute SourceFile
+#-keepattributes SourceFile,LineNumberTable
+#
+#-keep public class * extends android.app.Activity
+#-keep public class * extends android.app.Application
+#-keep public class * extends android.app.Service
+#-keep public class * extends android.content.BroadcastReceiver
+#-keep public class * extends android.content.ContentProvider
+#
+#-keep public class * extends android.view.View {
+#    public <init>(android.content.Context);
+#    public <init>(android.content.Context, android.util.AttributeSet);
+#    public <init>(android.content.Context, android.util.AttributeSet, int);
+#    public void set*(...);
+#}
+#
+#-keepclasseswithmembers class * {
+#    public <init>(android.content.Context, android.util.AttributeSet);
+#}
+#
+#-keepclasseswithmembers class * {
+#    public <init>(android.content.Context, android.util.AttributeSet, int);
+#}
+#
+#-keepclassmembers class * extends android.content.Context {
+#    public void *(android.view.View);
+#    public void *(android.view.MenuItem);
+#}
+#
+#-keepclassmembers class * implements android.os.Parcelable {
+#    static ** CREATOR;
+#}
+#
+#-keepclassmembers class **.R$* {
+#    public static <fields>;
+#}
+#
+#-keepclassmembers class * {
+#    @android.webkit.JavascriptInterface <methods>;
+#}
+
+
+# gms
+-keep public class com.google.android.gms.**
+-dontwarn com.google.android.gms.**
+
+# OkHttp
+-dontwarn okio.**
+
+# rx
+-dontwarn sun.misc.Unsafe
+-keep class rx.schedulers.Schedulers {
+    public static <methods>;
+}
+-keep class rx.schedulers.ImmediateScheduler {
+    public <methods>;
+}
+-keep class rx.schedulers.TestScheduler {
+    public <methods>;
+}
+-keep class rx.schedulers.Schedulers {
+    public static ** test();
+}
+-keepclassmembers class rx.internal.util.unsafe.*ArrayQueue*Field* {
+    long producerIndex;
+    long consumerIndex;
+}
+-keepclassmembers class rx.internal.util.unsafe.BaseLinkedQueueProducerNodeRef {
+    long producerNode;
+    long consumerNode;
+}
+
+
+## databinding
+-keep class android.databinding.** { *; }
+-keepnames class * implements java.io.Serializable
+-keepclassmembers class * implements java.io.Serializable {
+    static final long serialVersionUID;
+    private static final java.io.ObjectStreamField[] serialPersistentFields;
+    !static !transient <fields>;
+    private void writeObject(java.io.ObjectOutputStream);
+    private void readObject(java.io.ObjectInputStream);
+    java.lang.Object writeReplace();
+    java.lang.Object readResolve();
+}
+-keepattributes *Annotation*
+-keepattributes javax.xml.bind.annotation.*
+-keepattributes javax.annotation.processing.*
+-keepclassmembers class * extends java.lang.Enum { *; }
+-keepclasseswithmembernames class android.**
+-keepclasseswithmembernames interface android.**
+-libraryjars  <java.home>/lib/rt.jar
+-libraryjars  <java.home>/lib/jce.jar
+
+##---------------Begin: proguard configuration for Gson  ----------
+# Gson uses generic type information stored in a class file when working with fields. Proguard
+# removes such information by default, so configure it to keep all of it.
+#-keepattributes Signature
+
+# For using GSON @Expose annotation
+#-keepattributes *Annotation*
+
+# Gson specific classes
+-keep class sun.misc.Unsafe { *; }
+#-keep class com.google.gson.stream.** { *; }
+
+# Application classes that will be serialized/deserialized over Gson
+-keep class com.google.gson.examples.android.model.** { *; }
+
+# Prevent proguard from stripping interface information from TypeAdapterFactory,
+# JsonSerializer, JsonDeserializer instances (so they can be used in @JsonAdapter)
+-keep class * implements com.google.gson.TypeAdapterFactory
+-keep class * implements com.google.gson.JsonSerializer
+-keep class * implements com.google.gson.JsonDeserializer
+-keep class org.qpython.qpy.main.server.model.** {*;}
+##---------------End: proguard configuration for Gson  ----------
+
+##---------------Begin: proguard configuration for SL4A  ----------
+-keep class org.qpython.sl4a.** {*;}
+##---------------End: proguard configuration for SL4A  ----------
+
+# leancloud
+-keepattributes Signature
+-dontwarn com.jcraft.jzlib.**
+-keep class com.jcraft.jzlib.**  { *;}
+
+-dontwarn sun.misc.**
+-keep class sun.misc.** { *;}
+
+-dontwarn com.alibaba.fastjson.**
+-keep class com.alibaba.fastjson.** { *;}
+
+-dontwarn sun.security.**
+-keep class sun.security.** { *; }
+
+-dontwarn com.google.**
+-keep class com.google.** { *;}
+
+-dontwarn com.avos.**
+-keep class com.avos.** { *;}
+
+-keep public class android.net.http.SslError
+-keep public class android.webkit.WebViewClient
+
+-dontwarn android.webkit.WebView
+-dontwarn android.net.http.SslError
+-dontwarn android.webkit.WebViewClient
+
+-dontwarn android.support.**
+
+-dontwarn org.apache.**
+-keep class org.apache.** { *;}
+
+-dontwarn org.jivesoftware.smack.**
+-keep class org.jivesoftware.smack.** { *;}
+
+-dontwarn com.loopj.**
+-keep class com.loopj.** { *;}
+
+-dontwarn com.squareup.okhttp.**
+-keep class com.squareup.okhttp.** { *;}
+-keep interface com.squareup.okhttp.** { *; }
+
+-dontwarn okio.**
+
+-dontwarn org.xbill.**
+-keep class org.xbill.** { *;}
+
+-keepattributes *Annotation*
+
+#wx
+-keep class com.tencent.mm.sdk.** {
+   *;
+}
+
+#umeng
+-keepclassmembers class * {
+   public <init> (org.json.JSONObject);
+}
+
+-keep public class org.qpython.qpy.R$*{
+public static final int *;
+}
+
+-keepclassmembers enum * {
+    public static **[] values();
+    public static ** valueOf(java.lang.String);
+}
\ No newline at end of file
diff --git a/qpython/release/cn/release/output.json b/qpython/release/cn/release/output.json
new file mode 100644
index 00000000..47944358
--- /dev/null
+++ b/qpython/release/cn/release/output.json
@@ -0,0 +1 @@
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":241},"path":"Qpython_2018-02-28_cn.apk","properties":{"packageId":"com.hipipal.qpyplus","split":"","minSdkVersion":"14"}}]
\ No newline at end of file
diff --git a/qpython/release/output.json b/qpython/release/output.json
new file mode 100644
index 00000000..bd56657f
--- /dev/null
+++ b/qpython/release/output.json
@@ -0,0 +1 @@
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":229},"path":"qpython-release.apk","properties":{"packageId":"org.qpython.qpy","split":"","minSdkVersion":"14"}}]
\ No newline at end of file
diff --git a/qpython/src/main/AndroidManifest.xml b/qpython/src/main/AndroidManifest.xml
index 913954fe..db2647f9 100644
--- a/qpython/src/main/AndroidManifest.xml
+++ b/qpython/src/main/AndroidManifest.xml
@@ -1,314 +1,376 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.qpython.qpy">
-
-
-    <uses-feature
-        android:name="android.hardware.touchscreen"
-        android:required="false" />
-
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.ACCESS_SUPERUSER" />
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
-    <uses-permission android:name="com.android.browser.permission.READ_HISTORY_BOOKMARKS" />
-    <uses-permission android:name="com.android.browser.permission.WRITE_HISTORY_BOOKMARKS" />
-    <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
-    <uses-permission android:name="com.android.launcher.permission.UNINSTALL_SHORTCUT" />
-    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-    <uses-permission android:name="android.permission.CAMERA" />
-    <uses-permission android:name="android.permission.FLASHLIGHT" />
-    <uses-permission android:name="android.permission.VIBRATE" />
-    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
-    <uses-permission android:name="${applicationId}.permission.JPUSH_MESSAGE" />
-    <uses-permission android:name="android.permission.RECEIVE_USER_PRESENT" />
-    <uses-permission android:name="android.permission.WRITE_SETTINGS" />
-    <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
-
-    <permission
-        android:name="${applicationId}.permission.JPUSH_MESSAGE"
-        android:protectionLevel="signature" />
-
-    <permission
-        android:name="jackpal.androidterm.permission.RUN_SCRIPT"
-        android:description="@string/permdesc_run_script"
-        android:label="@string/perm_run_script"
-        android:permissionGroup="android.permission-group.SYSTEM_TOOLS"
-        android:protectionLevel="dangerous" />
-    <permission
-        android:name="jackpal.androidterm.permission.APPEND_TO_PATH"
-        android:description="@string/permdesc_append_to_path"
-        android:label="@string/perm_append_to_path"
-        android:permissionGroup="android.permission-group.SYSTEM_TOOLS"
-        android:protectionLevel="dangerous" />
-    <permission
-        android:name="jackpal.androidterm.permission.PREPEND_TO_PATH"
-        android:description="@string/permdesc_prepend_to_path"
-        android:label="@string/perm_prepend_to_path"
-        android:permissionGroup="android.permission-group.SYSTEM_TOOLS"
-        android:protectionLevel="dangerous" />
-
-    <application
-        android:name="org.qpython.qpy.main.app.App"
-        android:allowBackup="true"
-        android:hardwareAccelerated="true"
-        android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
-        android:largeHeap="true"
-        android:supportsRtl="true"
-        android:theme="@style/AppTheme">
-
-
-        <meta-data
-            android:name="UMENG_APPKEY"
-            android:value="57a3047867e58e7784000569" />
-        <meta-data
-            android:name="UMENG_CHANNEL"
-            android:value="TEST" />
-
-        <!-- Required  . Enable it you can get statistics data with channel -->
-        <meta-data
-            android:name="JPUSH_CHANNEL"
-            android:value="developer-default" />
-        <meta-data
-            android:name="JPUSH_APPKEY"
-            android:value="6ba31f352b4bd435fa56f8e2" /> <!--  </>值来自开发者平台取得的AppKey-->
-
-        <service android:name="org.qpython.qsl4a.QPyScriptService" />
-        <activity android:name="org.renpy.android.PythonActivity"
-            android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|screenLayout|fontScale|uiMode"
-            android:launchMode="singleTask"
-            android:process=":python"
-            android:screenOrientation="user"
-            android:windowSoftInputMode="stateAlwaysHidden">
-        </activity>
-
-        <activity android:name="org.qpython.qpy.main.activity.HomeMainActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-        <activity android:name="org.qpython.qpy.main.activity.QWebViewActivity" />
-
-
-        <activity android:name="org.qpython.qpy.main.activity.AboutActivity" />
-
-        <activity
-            android:name="org.qpython.qpy.console.TermActivity"
-            android:theme="@style/ConsoleTheme" />
-
-        <activity-alias
-            android:name="TermInternal"
-            android:exported="false"
-            android:targetActivity="org.qpython.qpy.console.TermActivity"
-            android:theme="@style/ConsoleTheme">
-            <intent-filter>
-                <action android:name="jackpal.androidterm.private.OPEN_NEW_WINDOW" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="jackpal.androidterm.private.SWITCH_WINDOW" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity-alias>
-        <activity
-            android:name="org.qpython.qpy.console.RemoteInterface"
-            android:excludeFromRecents="true"
-            android:theme="@style/ConsoleTheme">
-            <intent-filter>
-                <action android:name="jackpal.androidterm.OPEN_NEW_WINDOW" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
-        <activity-alias
-            android:name="TermHere"
-            android:exported="true"
-            android:label="@string/activity_term_here_title"
-            android:targetActivity="org.qpython.qpy.console.RemoteInterface"
-            android:theme="@style/ConsoleTheme">
-            <intent-filter>
-                <action android:name="android.intent.action.SEND" />
-                <data android:mimeType="*/*" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity-alias>
-        <activity android:name="org.qpython.qsl4a.qsl4a.activity.FutureActivity"
-            android:label="QSL4A FutureActivity"
-            android:theme="@style/AppTheme">
-            <intent-filter>
-                <action android:name="android.nfc.action.NDEF_DISCOVERED" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="application/com.hipipal.qpy.nfc" />
-            </intent-filter>
-        </activity>
-
-        <activity
-            android:name="org.qpython.qpy.console.RunScript"
-            android:excludeFromRecents="true"
-            android:permission="jackpal.androidterm.permission.RUN_SCRIPT"
-            android:theme="@style/ConsoleTheme">
-            <intent-filter>
-                <action android:name="jackpal.androidterm.RUN_SCRIPT" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
-        <activity
-            android:name="org.qpython.qpy.console.RunShortcut"
-            android:excludeFromRecents="true"
-            android:theme="@style/ConsoleTheme">
-            <intent-filter>
-                <action android:name="jackpal.androidterm.RUN_SHORTCUT" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
-        <activity
-            android:name="org.qpython.qpy.console.TermPreferences"
-            android:label="@string/preferences"
-            android:theme="@style/ConsoleTheme" />
-        <activity
-            android:name="org.qpython.qpy.console.WindowList"
-            android:label="@string/window_list"
-            android:theme="@style/ConsoleTheme" />
-
-
-        <activity
-            android:name="org.qpython.qpy.console.shortcuts.AddShortcut"
-            android:configChanges="orientation|keyboard|keyboardHidden"
-            android:label="@string/activity_shortcut_create"
-            android:launchMode="singleTop"
-            android:theme="@android:style/Theme.Translucent.NoTitleBar">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.CREATE_SHORTCUT" />
-            </intent-filter>
-            <intent-filter>
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="text/*" />
-            </intent-filter>
-        </activity>
-        <activity
-            android:name="org.qpython.qpy.console.shortcuts.FSNavigator"
-            android:configChanges="orientation|keyboardHidden"
-            android:exported="true"
-            android:label="@string/addshortcut_button_find_command"
-            android:launchMode="singleTop"
-            android:theme="@style/ConsoleTheme">
-            <intent-filter>
-                <action android:name="android.intent.action.PICK" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.GET_CONTENT" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.OPENABLE" />
-
-                <data android:mimeType="*/*" />
-            </intent-filter>
-        </activity>
-
-        <activity
-            android:name="com.thefinestartist.finestwebview.FinestWebViewActivity"
-            android:configChanges="keyboardHidden|orientation|screenSize"
-            android:screenOrientation="sensor"
-            android:theme="@style/WebViewTheme" />
-
-
-        <activity android:name="org.qpython.qpy.plugin.activity.PluginManagerActivity" />
-        <activity android:name="org.qpython.qpy.plugin.activity.LocalPluginInstallActivity" />
-
-
-        <!--zxing-->
-        <activity android:name="org.qpython.qpy.main.activity.QrCodeActivity" />
-
-        <!--SERVICE-->
-        <service android:name="org.qpython.qpy.console.TermService">
-            <intent-filter>
-                <action android:name="jackpal.androidterm.action.START_TERM.v1" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </service>
-
-        <!-- Rich push 核心功能 since 2.0.6-->
-        <activity
-            android:name="cn.jpush.android.ui.PopWinActivity"
-            android:exported="false"
-            android:theme="@style/MyDialogStyle"></activity>
-
-        <!-- Required SDK核心功能-->
-        <activity
-            android:name="cn.jpush.android.ui.PushActivity"
-            android:configChanges="orientation|keyboardHidden"
-            android:exported="false"
-            android:theme="@android:style/Theme.NoTitleBar">
-            <intent-filter>
-                <action android:name="cn.jpush.android.ui.PushActivity" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="${applicationId}" />
-            </intent-filter>
-        </activity>
-        <!-- Required  SDK核心功能-->
-        <service
-            android:name="cn.jpush.android.service.DownloadService"
-            android:enabled="true"
-            android:exported="false"></service>
-
-
-        <!-- Required SDK 核心功能-->
-        <!-- 可配置android:process参数将PushService放在其他进程中 -->
-        <service
-            android:name="cn.jpush.android.service.PushService"
-            android:enabled="true"
-            android:exported="false">
-            <intent-filter>
-                <action android:name="cn.jpush.android.intent.REGISTER" />
-                <action android:name="cn.jpush.android.intent.REPORT" />
-                <action android:name="cn.jpush.android.intent.PushService" />
-                <action android:name="cn.jpush.android.intent.PUSH_TIME" />
-            </intent-filter>
-        </service>
-
-
-        <!-- Required SDK核心功能-->
-        <receiver
-            android:name="cn.jpush.android.service.PushReceiver"
-            android:enabled="true"
-            android:exported="false">
-            <intent-filter android:priority="1000">
-                <action android:name="cn.jpush.android.intent.NOTIFICATION_RECEIVED_PROXY" />   <!--Required  显示通知栏 -->
-                <category android:name="${applicationId}" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.USER_PRESENT" />
-                <action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
-            </intent-filter>
-            <!-- Optional -->
-            <intent-filter>
-                <action android:name="android.intent.action.PACKAGE_ADDED" />
-                <action android:name="android.intent.action.PACKAGE_REMOVED" />
-
-                <data android:scheme="package" />
-            </intent-filter>
-
-        </receiver>
-
-        <!-- Required SDK核心功能-->
-        <receiver
-            android:name="cn.jpush.android.service.AlarmReceiver"
-            android:exported="false" />
-
-    </application>
-
-    <meta-data
-        android:name="com.sec.android.support.multiwindow"
-        android:value="true"></meta-data>
-
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          xmlns:tools="http://schemas.android.com/tools"
+          package="org.qpython.qpy">
+
+    <uses-feature
+        android:name="android.hardware.touchscreen"
+        android:required="false"/>
+
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+    <uses-permission android:name="android.permission.CAMERA"/>
+    <uses-permission android:name="android.permission.FLASHLIGHT"/>
+    <uses-permission android:name="android.permission.VIBRATE" />
+    <uses-permission android:name="android.permission.RECEIVE_USER_PRESENT" />
+    <uses-permission android:name="com.android.vending.BILLING"/>
+    <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
+    <uses-permission android:name="com.android.launcher.permission.UNINSTALL_SHORTCUT" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_MEDIA_STORAGE" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.BLUETOOTH" />
+    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
+    <uses-permission android:name="android.permission.NFC" />
+    <uses-permission android:name="android.permission.RECORD_AUDIO" />
+    <uses-permission android:name="android.permission.ACCESS_NOTIFICATION_POLICY" />
+    <uses-permission android:name="android.permission.KILL_BACKGROUND_PROCESSES"/>
+    <uses-permission android:name="net.dinglisch.android.tasker.PERMISSION_RUN_TASKS" />
+
+    <uses-feature android:name="android.hardware.microphone" android:required="false"/>
+    <uses-feature android:name="android.hardware.telephony" android:required="false"/>
+    <uses-feature android:name="android.hardware.camera" android:required="false"/>
+    <uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
+    <uses-feature android:name="android.hardware.camera.flash" android:required="false"/>
+    <uses-feature android:name="android.hardware.screen.landscape" android:required="false"/>
+    <uses-feature android:name="android.hardware.wifi" android:required="false"/>
+    <uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
+    <uses-feature android:name="android.hardware.location.gps" android:required="false"/>
+    <uses-feature android:name="android.hardware.location.network" android:required="false"/>
+    <uses-feature android:name="android.hardware.bluetooth" android:required="false"/>
+
+    <uses-feature android:glEsVersion="0x00020000" android:required="false"/>
+
+    <application
+        android:networkSecurityConfig="@xml/network_security_config"
+        android:name="org.qpython.qpy.main.app.App"
+        android:allowBackup="true"
+        android:hardwareAccelerated="true"
+        android:icon="@drawable/ic_launcher"
+        android:label="@string/app_name"
+        android:largeHeap="true"
+        android:supportsRtl="true"
+        android:theme="@style/AppTheme">
+        <uses-library android:name="org.apache.http.legacy" android:required="false"/>
+
+        <meta-data
+            android:name="com.google.firebase.messaging.default_notification_icon"
+            android:resource="@drawable/img_home_logo"/>
+
+        <service android:name=".main.service.QPyService"/>
+        <service android:name="org.qpython.qsl4a.QPyScriptService"/>
+        <service android:name=".main.service.FTPServerService"/>
+        <activity
+            android:name=".main.activity.SignInActivity"
+            android:launchMode="singleTask"/>
+        <activity
+            android:name="org.renpy.android.PythonSDLActivity"
+            android:hardwareAccelerated="true"
+            android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|screenLayout|fontScale|uiMode|orientation"
+            android:launchMode="singleTask"
+            android:process=":python"
+            android:screenOrientation="user"
+            android:theme="@style/AppTheme"
+            android:windowSoftInputMode="stateAlwaysHidden">
+        </activity>
+
+        <activity
+            android:name="org.qpython.qpylib.MPyApi"
+            android:exported="true"
+            android:theme="@style/Theme.AppCompat"/>
+
+        <service
+            android:name="org.qpython.qpylib.MPyService"
+            android:exported="true"
+            tools:ignore="ExportedService"/>
+
+        <activity
+            android:name=".main.activity.SplashActivity"
+            android:theme="@style/FullscreenTheme"
+            >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
+        </activity>
+
+        <activity
+            android:name="org.qpython.qpy.main.activity.HomeMainActivity"
+            android:launchMode="singleTask">
+            <meta-data
+                android:name="android.app.shortcuts"
+                android:resource="@xml/shortcuts"/>
+        </activity>
+
+        <activity
+            android:name="org.qpython.qpy.main.activity.QWebViewActivity"
+            android:label="@string/browser">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW"/>
+
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.BROWSABLE"/>
+
+                <data android:mimeType="text/plain"/>
+                <data android:mimeType="image/*"/>
+                <data
+                    android:host="course"
+                    android:path="/"
+                    android:scheme="qpython"/>
+            </intent-filter>
+
+            <!-- Used to handle Chrome then menu then share.-->
+            <intent-filter>
+                <action android:name="android.intent.action.SEND"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <data android:mimeType="text/plain"/>
+                <data android:mimeType="image/*"/>
+            </intent-filter>
+        </activity>
+        <activity
+            android:name=".main.activity.CourseActivity"
+            android:configChanges="orientation|screenSize"/>
+        <activity android:name=".main.activity.CourseIndexActivity"/>
+        <activity android:name=".main.activity.GistEditActivity"/>
+        <activity android:name=".main.activity.CodeDetailActivity"/>
+        <activity android:name=".main.activity.CodeShareActivity"/>
+        <activity android:name=".main.activity.UserActivity"/>
+        <activity
+            android:name="org.qpython.qpy.main.activity.SettingActivity"
+            android:theme="@style/AppTheme"/>
+        <activity
+            android:name="org.qpython.qpy.console.TermActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:theme="@style/AppTheme"/>
+        <activity
+            android:name=".main.activity.LogActivity"
+            android:theme="@style/AppTheme"/>
+        <activity
+            android:name=".texteditor.EditorActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:exported="true"
+            android:label="@string/editor">
+            <intent-filter>
+                <!--<action android:name="android.intent.action.SEND"/>-->
+                <action android:name="android.intent.action.VIEW"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:mimeType="text/*"/>
+                <data android:scheme="file"/>
+            </intent-filter>
+
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="content"/>
+                <data android:host="*"/>
+                <data android:mimeType="*/*"/>
+                <data android:pathPattern=".*\\.txt"/>
+                <data android:pathPattern=".*\\.html"/>
+                <data android:pathPattern=".*\\.css"/>
+                <data android:pathPattern=".*\\.js"/>
+                <data android:pathPattern=".*\\.md"/>
+                <data android:pathPattern=".*\\.php"/>
+                <data android:pathPattern=".*\\.py"/>
+            </intent-filter>
+        </activity>
+
+        <activity
+            android:name="org.qpython.qpy.texteditor.TedLocalActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar"/>
+        <activity
+            android:name="org.qpython.qpy.texteditor.TedSettingsActivity"
+            android:theme="@style/SettingTheme"
+            android:windowSoftInputMode="stateHidden"/>
+        <activity
+            android:name="org.qpython.qpy.texteditor.TedFontActivity"
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar"/>
+
+        <activity
+            android:name=".main.activity.LibActivity"
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar">
+            <intent-filter>
+                <action android:name="org.qpython.qpy.OPEN_AIPY_FRAGMENT"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity>
+
+        <activity
+            android:name=".main.activity.AboutActivity"/>
+
+        <activity
+            android:name=".main.activity.AppListActivity"
+            android:exported="true"
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar">
+        </activity>
+        <activity
+            android:name="org.swiftp.gui.ServerPreferenceActivity"
+            android:label="Preferences"/>
+        <activity android:name=".texteditor.MFTPSettingActivity"/>
+        <activity android:name=".main.activity.PurchaseActivity"/>
+
+        <activity-alias
+            android:name="TermInternal"
+            android:exported="false"
+            android:targetActivity="org.qpython.qpy.console.TermActivity"
+            android:theme="@style/ConsoleTheme">
+            <intent-filter>
+                <action android:name="jackpal.androidterm.private.OPEN_NEW_WINDOW"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+            <intent-filter>
+                <action android:name="jackpal.androidterm.private.SWITCH_WINDOW"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity-alias>
+        <activity
+            android:name="org.qpython.qpy.console.RemoteInterface"
+            android:excludeFromRecents="true"
+            android:theme="@style/ConsoleTheme">
+            <intent-filter>
+                <action android:name="jackpal.androidterm.OPEN_NEW_WINDOW"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity>
+        <activity-alias
+            android:name="TermHere"
+            android:exported="true"
+            android:label="@string/activity_term_here_title"
+            android:targetActivity="org.qpython.qpy.console.RemoteInterface"
+            android:theme="@style/ConsoleTheme">
+        </activity-alias>
+
+        <activity
+            android:name="org.qpython.qsl4a.qsl4a.activity.FutureActivity"
+            android:label="QSL4A FutureActivity"
+            android:theme="@style/AppTheme">
+            <intent-filter>
+                <action android:name="android.nfc.action.NDEF_DISCOVERED"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <data android:mimeType="application/com.hipipal.qpy.nfc"/>
+            </intent-filter>
+        </activity>
+
+        <activity
+            android:name="org.qpython.qpy.console.RunScript"
+            android:excludeFromRecents="true"
+            android:permission="jackpal.androidterm.permission.RUN_SCRIPT"
+            android:theme="@style/ConsoleTheme">
+            <intent-filter>
+                <action android:name="jackpal.androidterm.RUN_SCRIPT"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity>
+        <activity
+            android:name="org.qpython.qpy.console.RunShortcut"
+            android:excludeFromRecents="true"
+            android:theme="@style/ConsoleTheme">
+            <intent-filter>
+                <action android:name="jackpal.androidterm.RUN_SHORTCUT"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity>
+        <activity
+            android:name="org.qpython.qpy.console.TermPreferences"
+            android:label="@string/preferences"
+            android:theme="@style/ConsoleTheme"/>
+        <activity
+            android:name="org.qpython.qpy.console.WindowList"
+            android:label="@string/window_list"
+            android:theme="@style/ConsoleTheme"/>
+        <activity
+            android:name="org.qpython.qpy.console.shortcuts.AddShortcut"
+            android:configChanges="orientation|keyboard|keyboardHidden"
+            android:label="@string/activity_shortcut_create"
+            android:launchMode="singleTop"
+            android:theme="@style/Theme.AppCompat">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.CREATE_SHORTCUT"/>
+            </intent-filter>
+            <intent-filter>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <data android:mimeType="text/*"/>
+            </intent-filter>
+        </activity>
+        <activity
+            android:name="org.qpython.qpy.console.shortcuts.FSNavigator"
+            android:configChanges="orientation|keyboardHidden"
+            android:exported="true"
+            android:label="@string/addshortcut_button_find_command"
+            android:launchMode="singleTop"
+            android:theme="@style/ConsoleTheme">
+            <intent-filter>
+                <action android:name="android.intent.action.PICK"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.GET_CONTENT"/>
+
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.OPENABLE"/>
+
+                <data android:mimeType="*/*"/>
+            </intent-filter>
+        </activity>
+
+        <activity android:name="org.qpython.qpy.plugin.activity.PluginManagerActivity"/>
+        <activity android:name="org.qpython.qpy.plugin.activity.LocalPluginInstallActivity"/>
+
+        <!--zxing-->
+        <activity android:name="org.qpython.qpy.main.activity.QrCodeActivity"/>
+        <activity
+            android:name=".main.activity.GistActivity"
+            android:configChanges="orientation"
+            android:launchMode="singleTask"/>
+        <activity
+            android:name=".main.activity.GistDetailActivity"
+            android:configChanges="orientation"/>
+        <activity
+            android:name=".main.activity.MyGistActivity"
+            android:configChanges="orientation"/>
+        <!--SERVICE-->
+        <service android:name="org.qpython.qpy.console.TermService"
+                 tools:ignore="ExportedService">
+            <intent-filter>
+                <action android:name="jackpal.androidterm.action.START_TERM.v1"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </service>
+
+        <activity android:name=".main.activity.CourseIndexFundingActivity"/>
+        <activity android:name=".main.activity.FundingPurchaseActivity"/>
+        <activity
+            android:name=".main.activity.NotebookActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:launchMode="singleTask"
+            android:windowSoftInputMode="adjustResize"
+            android:exported="true">
+            <intent-filter >
+                <action android:name="android.intent.action.VIEW"/>
+            </intent-filter>
+        </activity>
+        <activity
+            android:name=".main.activity.NotebookListActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"/>
+
+        <receiver android:name="org.qpython.qpy.main.receiver.BootBroadcastReceiver" />
+    </application>
+
+    <meta-data
+        android:name="com.sec.android.support.multiwindow"
+        android:value="true"/>
+
 </manifest>
\ No newline at end of file
diff --git a/qpython/src/main/aidl/com/android/vending/billing/IInAppBillingService.aidl b/qpython/src/main/aidl/com/android/vending/billing/IInAppBillingService.aidl
new file mode 100644
index 00000000..0f2bcae3
--- /dev/null
+++ b/qpython/src/main/aidl/com/android/vending/billing/IInAppBillingService.aidl
@@ -0,0 +1,281 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * 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.
+ */
+
+package com.android.vending.billing;
+
+import android.os.Bundle;
+
+/**
+ * InAppBillingService is the service that provides in-app billing version 3 and beyond.
+ * This service provides the following features:
+ * 1. Provides a new API to get details of in-app items published for the app including
+ *    price, type, title and description.
+ * 2. The purchase flow is synchronous and purchase information is available immediately
+ *    after it completes.
+ * 3. Purchase information of in-app purchases is maintained within the Google Play system
+ *    till the purchase is consumed.
+ * 4. An API to consume a purchase of an inapp item. All purchases of one-time
+ *    in-app items are consumable and thereafter can be purchased again.
+ * 5. An API to get current purchases of the user immediately. This will not contain any
+ *    consumed purchases.
+ *
+ * All calls will give a response code with the following possible values
+ * RESULT_OK = 0 - success
+ * RESULT_USER_CANCELED = 1 - User pressed back or canceled a dialog
+ * RESULT_SERVICE_UNAVAILABLE = 2 - The network connection is down
+ * RESULT_BILLING_UNAVAILABLE = 3 - This billing API version is not supported for the type requested
+ * RESULT_ITEM_UNAVAILABLE = 4 - Requested SKU is not available for purchase
+ * RESULT_DEVELOPER_ERROR = 5 - Invalid arguments provided to the API
+ * RESULT_ERROR = 6 - Fatal error during the API action
+ * RESULT_ITEM_ALREADY_OWNED = 7 - Failure to purchase since item is already owned
+ * RESULT_ITEM_NOT_OWNED = 8 - Failure to consume since item is not owned
+ */
+interface IInAppBillingService {
+    /**
+     * Checks support for the requested billing API version, package and in-app type.
+     * Minimum API version supported by this interface is 3.
+     * @param apiVersion billing API version that the app is using
+     * @param packageName the package name of the calling app
+     * @param type type of the in-app item being purchased ("inapp" for one-time purchases
+     *        and "subs" for subscriptions)
+     * @return RESULT_OK(0) on success and appropriate response code on failures.
+     */
+    int isBillingSupported(int apiVersion, String packageName, String type);
+
+    /**
+     * Provides details of a list of SKUs
+     * Given a list of SKUs of a valid type in the skusBundle, this returns a bundle
+     * with a list JSON strings containing the productId, price, title and description.
+     * This API can be called with a maximum of 20 SKUs.
+     * @param apiVersion billing API version that the app is using
+     * @param packageName the package name of the calling app
+     * @param type of the in-app items ("inapp" for one-time purchases
+     *        and "subs" for subscriptions)
+     * @param skusBundle bundle containing a StringArrayList of SKUs with key "ITEM_ID_LIST"
+     * @return Bundle containing the following key-value pairs
+     *         "RESPONSE_CODE" with int value, RESULT_OK(0) if success, appropriate response codes
+     *                         on failures.
+     *         "DETAILS_LIST" with a StringArrayList containing purchase information
+     *                        in JSON format similar to:
+     *                        '{ "productId" : "exampleSku",
+     *                           "type" : "inapp",
+     *                           "price" : "$5.00",
+     *                           "price_currency": "USD",
+     *                           "price_amount_micros": 5000000,
+     *                           "title : "Example Title",
+     *                           "description" : "This is an example description" }'
+     */
+    Bundle getSkuDetails(int apiVersion, String packageName, String type, in Bundle skusBundle);
+
+    /**
+     * Returns a pending intent to launch the purchase flow for an in-app item by providing a SKU,
+     * the type, a unique purchase token and an optional developer payload.
+     * @param apiVersion billing API version that the app is using
+     * @param packageName package name of the calling app
+     * @param sku the SKU of the in-app item as published in the developer console
+     * @param type of the in-app item being purchased ("inapp" for one-time purchases
+     *        and "subs" for subscriptions)
+     * @param developerPayload optional argument to be sent back with the purchase information
+     * @return Bundle containing the following key-value pairs
+     *         "RESPONSE_CODE" with int value, RESULT_OK(0) if success, appropriate response codes
+     *                         on failures.
+     *         "BUY_INTENT" - PendingIntent to start the purchase flow
+     *
+     * The Pending intent should be launched with startIntentSenderForResult. When purchase flow
+     * has completed, the onActivityResult() will give a resultCode of OK or CANCELED.
+     * If the purchase is successful, the result data will contain the following key-value pairs
+     *         "RESPONSE_CODE" with int value, RESULT_OK(0) if success, appropriate response
+     *                         codes on failures.
+     *         "INAPP_PURCHASE_DATA" - String in JSON format similar to
+     *                                 '{"orderId":"12999763169054705758.1371079406387615",
+     *                                   "packageName":"com.example.app",
+     *                                   "productId":"exampleSku",
+     *                                   "purchaseTime":1345678900000,
+     *                                   "purchaseToken" : "122333444455555",
+     *                                   "developerPayload":"example developer payload" }'
+     *         "INAPP_DATA_SIGNATURE" - String containing the signature of the purchase data that
+     *                                  was signed with the private key of the developer
+     */
+    Bundle getBuyIntent(int apiVersion, String packageName, String sku, String type,
+        String developerPayload);
+
+    /**
+     * Returns the current SKUs owned by the user of the type and package name specified along with
+     * purchase information and a signature of the data to be validated.
+     * This will return all SKUs that have been purchased in V3 and managed items purchased using
+     * V1 and V2 that have not been consumed.
+     * @param apiVersion billing API version that the app is using
+     * @param packageName package name of the calling app
+     * @param type of the in-app items being requested ("inapp" for one-time purchases
+     *        and "subs" for subscriptions)
+     * @param continuationToken to be set as null for the first call, if the number of owned
+     *        skus are too many, a continuationToken is returned in the response bundle.
+     *        This method can be called again with the continuation token to get the next set of
+     *        owned skus.
+     * @return Bundle containing the following key-value pairs
+     *         "RESPONSE_CODE" with int value, RESULT_OK(0) if success, appropriate response codes
+                               on failures.
+     *         "INAPP_PURCHASE_ITEM_LIST" - StringArrayList containing the list of SKUs
+     *         "INAPP_PURCHASE_DATA_LIST" - StringArrayList containing the purchase information
+     *         "INAPP_DATA_SIGNATURE_LIST"- StringArrayList containing the signatures
+     *                                      of the purchase information
+     *         "INAPP_CONTINUATION_TOKEN" - String containing a continuation token for the
+     *                                      next set of in-app purchases. Only set if the
+     *                                      user has more owned skus than the current list.
+     */
+    Bundle getPurchases(int apiVersion, String packageName, String type, String continuationToken);
+
+    /**
+     * Consume the last purchase of the given SKU. This will result in this item being removed
+     * from all subsequent responses to getPurchases() and allow re-purchase of this item.
+     * @param apiVersion billing API version that the app is using
+     * @param packageName package name of the calling app
+     * @param purchaseToken token in the purchase information JSON that identifies the purchase
+     *        to be consumed
+     * @return RESULT_OK(0) if consumption succeeded, appropriate response codes on failures.
+     */
+    int consumePurchase(int apiVersion, String packageName, String purchaseToken);
+
+    /**
+     * This API is currently under development.
+     */
+    int stub(int apiVersion, String packageName, String type);
+
+    /**
+     * Returns a pending intent to launch the purchase flow for upgrading or downgrading a
+     * subscription. The existing owned SKU(s) should be provided along with the new SKU that
+     * the user is upgrading or downgrading to.
+     * @param apiVersion billing API version that the app is using, must be 5 or later
+     * @param packageName package name of the calling app
+     * @param oldSkus the SKU(s) that the user is upgrading or downgrading from,
+     *        if null or empty this method will behave like {@link #getBuyIntent}
+     * @param newSku the SKU that the user is upgrading or downgrading to
+     * @param type of the item being purchased, currently must be "subs"
+     * @param developerPayload optional argument to be sent back with the purchase information
+     * @return Bundle containing the following key-value pairs
+     *         "RESPONSE_CODE" with int value, RESULT_OK(0) if success, appropriate response codes
+     *                         on failures.
+     *         "BUY_INTENT" - PendingIntent to start the purchase flow
+     *
+     * The Pending intent should be launched with startIntentSenderForResult. When purchase flow
+     * has completed, the onActivityResult() will give a resultCode of OK or CANCELED.
+     * If the purchase is successful, the result data will contain the following key-value pairs
+     *         "RESPONSE_CODE" with int value, RESULT_OK(0) if success, appropriate response
+     *                         codes on failures.
+     *         "INAPP_PURCHASE_DATA" - String in JSON format similar to
+     *                                 '{"orderId":"12999763169054705758.1371079406387615",
+     *                                   "packageName":"com.example.app",
+     *                                   "productId":"exampleSku",
+     *                                   "purchaseTime":1345678900000,
+     *                                   "purchaseToken" : "122333444455555",
+     *                                   "developerPayload":"example developer payload" }'
+     *         "INAPP_DATA_SIGNATURE" - String containing the signature of the purchase data that
+     *                                  was signed with the private key of the developer
+     */
+    Bundle getBuyIntentToReplaceSkus(int apiVersion, String packageName,
+        in List<String> oldSkus, String newSku, String type, String developerPayload);
+
+    /**
+     * Returns a pending intent to launch the purchase flow for an in-app item. This method is
+     * a variant of the {@link #getBuyIntent} method and takes an additional {@code extraParams}
+     * parameter. This parameter is a Bundle of optional keys and values that affect the
+     * operation of the method.
+     * @param apiVersion billing API version that the app is using, must be 6 or later
+     * @param packageName package name of the calling app
+     * @param sku the SKU of the in-app item as published in the developer console
+     * @param type of the in-app item being purchased ("inapp" for one-time purchases
+     *        and "subs" for subscriptions)
+     * @param developerPayload optional argument to be sent back with the purchase information
+     * @extraParams a Bundle with the following optional keys:
+     *        "skusToReplace" - List<String> - an optional list of SKUs that the user is
+     *                          upgrading or downgrading from.
+     *                          Pass this field if the purchase is upgrading or downgrading
+     *                          existing subscriptions.
+     *                          The specified SKUs are replaced with the SKUs that the user is
+     *                          purchasing. Google Play replaces the specified SKUs at the start of
+     *                          the next billing cycle.
+     * "replaceSkusProration" - Boolean - whether the user should be credited for any unused
+     *                          subscription time on the SKUs they are upgrading or downgrading.
+     *                          If you set this field to true, Google Play swaps out the old SKUs
+     *                          and credits the user with the unused value of their subscription
+     *                          time on a pro-rated basis.
+     *                          Google Play applies this credit to the new subscription, and does
+     *                          not begin billing the user for the new subscription until after
+     *                          the credit is used up.
+     *                          If you set this field to false, the user does not receive credit for
+     *                          any unused subscription time and the recurrence date does not
+     *                          change.
+     *                          Default value is true. Ignored if you do not pass skusToReplace.
+     *            "accountId" - String - an optional obfuscated string that is uniquely
+     *                          associated with the user's account in your app.
+     *                          If you pass this value, Google Play can use it to detect irregular
+     *                          activity, such as many devices making purchases on the same
+     *                          account in a short period of time.
+     *                          Do not use the developer ID or the user's Google ID for this field.
+     *                          In addition, this field should not contain the user's ID in
+     *                          cleartext.
+     *                          We recommend that you use a one-way hash to generate a string from
+     *                          the user's ID, and store the hashed string in this field.
+     *                   "vr" - Boolean - an optional flag indicating whether the returned intent
+     *                          should start a VR purchase flow. The apiVersion must also be 7 or
+     *                          later to use this flag.
+     */
+    Bundle getBuyIntentExtraParams(int apiVersion, String packageName, String sku,
+        String type, String developerPayload, in Bundle extraParams);
+
+    /**
+     * Returns the most recent purchase made by the user for each SKU, even if that purchase is
+     * expired, canceled, or consumed.
+     * @param apiVersion billing API version that the app is using, must be 6 or later
+     * @param packageName package name of the calling app
+     * @param type of the in-app items being requested ("inapp" for one-time purchases
+     *        and "subs" for subscriptions)
+     * @param continuationToken to be set as null for the first call, if the number of owned
+     *        skus is too large, a continuationToken is returned in the response bundle.
+     *        This method can be called again with the continuation token to get the next set of
+     *        owned skus.
+     * @param extraParams a Bundle with extra params that would be appended into http request
+     *        query string. Not used at this moment. Reserved for future functionality.
+     * @return Bundle containing the following key-value pairs
+     *         "RESPONSE_CODE" with int value: RESULT_OK(0) if success,
+     *         {@link IabHelper#BILLING_RESPONSE_RESULT_*} response codes on failures.
+     *
+     *         "INAPP_PURCHASE_ITEM_LIST" - ArrayList<String> containing the list of SKUs
+     *         "INAPP_PURCHASE_DATA_LIST" - ArrayList<String> containing the purchase information
+     *         "INAPP_DATA_SIGNATURE_LIST"- ArrayList<String> containing the signatures
+     *                                      of the purchase information
+     *         "INAPP_CONTINUATION_TOKEN" - String containing a continuation token for the
+     *                                      next set of in-app purchases. Only set if the
+     *                                      user has more owned skus than the current list.
+     */
+    Bundle getPurchaseHistory(int apiVersion, String packageName, String type,
+        String continuationToken, in Bundle extraParams);
+
+    /**
+    * This method is a variant of {@link #isBillingSupported}} that takes an additional
+    * {@code extraParams} parameter.
+    * @param apiVersion billing API version that the app is using, must be 7 or later
+    * @param packageName package name of the calling app
+    * @param type of the in-app item being purchased ("inapp" for one-time purchases and "subs"
+    *        for subscriptions)
+    * @param extraParams a Bundle with the following optional keys:
+    *        "vr" - Boolean - an optional flag to indicate whether {link #getBuyIntentExtraParams}
+    *               supports returning a VR purchase flow.
+    * @return RESULT_OK(0) on success and appropriate response code on failures.
+    */
+    int isBillingSupportedExtraParams(int apiVersion, String packageName, String type,
+        in Bundle extraParams);
+}
diff --git a/qpython/src/main/assets/Apache_License b/qpython/src/main/assets/Apache_License
new file mode 100644
index 00000000..8e911f15
--- /dev/null
+++ b/qpython/src/main/assets/Apache_License
@@ -0,0 +1,15 @@
+"""
+Copyright [yyyy] [name of copyright owner]
+
+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.
+"""
\ No newline at end of file
diff --git a/qpysdk/src/main/assets/QPy_ConsoleApp b/qpython/src/main/assets/QPy_ConsoleApp
similarity index 90%
rename from qpysdk/src/main/assets/QPy_ConsoleApp
rename to qpython/src/main/assets/QPy_ConsoleApp
index a56f28b6..d878d640 100644
--- a/qpysdk/src/main/assets/QPy_ConsoleApp
+++ b/qpython/src/main/assets/QPy_ConsoleApp
@@ -1,5 +1,4 @@
 #-*-coding:utf8;-*-
-#qpy:2
 #qpy:console
 
 print "This is console module"
diff --git a/qpython/src/main/assets/QPy_PygameApp b/qpython/src/main/assets/QPy_PygameApp
new file mode 100644
index 00000000..8e6ef873
--- /dev/null
+++ b/qpython/src/main/assets/QPy_PygameApp
@@ -0,0 +1,24 @@
+#-*-coding:utf8;-*-
+#qpy:pygame
+
+import sys
+import pygame
+from pygame.locals import *
+
+pygame.init()
+# Resolution is ignored on Android
+surface = pygame.display.set_mode((640, 480))
+# Only one built in font is available on Android
+myfont = pygame.font.SysFont("DejaVuSans", 64)
+label = myfont.render("Hello, QPython!", 1, (255, 255, 255))
+clock = pygame.time.Clock()
+
+while True:
+    for ev in pygame.event.get():
+        if ev.type == QUIT:
+            pygame.quit()
+    # Framelimiter
+    clock.tick(60)
+    surface.fill((0, 0, 0))
+    surface.blit(label, (0, 0))
+    pygame.display.flip()
diff --git a/qpython/src/main/assets/QPy_SL4AApp b/qpython/src/main/assets/QPy_SL4AApp
new file mode 100644
index 00000000..e6b595d0
--- /dev/null
+++ b/qpython/src/main/assets/QPy_SL4AApp
@@ -0,0 +1,109 @@
+#qpy:quiet
+#-*-coding:utf8;-*-
+"""
+This is a sample project which use SL4A UI Framework,
+There is another Sample project: https://github.com/qpython-android/qpy-calcount
+"""
+import qpy
+import androidhelper
+try:
+    import urllib.request as ur
+except:
+    import urllib as ur
+from qsl4ahelper.fullscreenwrapper2 import *
+
+droid = androidhelper.Android()
+
+class MainScreen(Layout):
+    def __init__(self):
+        super(MainScreen,self).__init__(str("""<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+	android:layout_width="fill_parent"
+	android:layout_height="fill_parent"
+	android:background="#ff0E4200"
+	android:orientation="vertical"
+	xmlns:android="http://schemas.android.com/apk/res/android">
+	<ImageView
+		android:id="@+id/logo"
+		android:layout_width="fill_parent"
+		android:layout_height="0px"
+		android:layout_weight="10"
+	/>
+	<LinearLayout
+		android:layout_width="fill_parent"
+		android:layout_height="0px"
+		android:orientation="horizontal"
+		android:layout_weight="20">
+
+		<TextView
+			android:layout_width="fill_parent"
+			android:layout_height="fill_parent"
+			android:textSize="8dp"
+			android:text="Hello, QPython"
+			android:textColor="#ffffffff"
+			android:layout_weight="1"
+			android:gravity="center"
+		/>
+    </LinearLayout>
+
+	<ListView
+		android:id="@+id/data_list"
+		android:layout_width="fill_parent"
+		android:layout_height="0px"
+		android:layout_weight="55"/>
+
+	<LinearLayout
+		android:layout_width="fill_parent"
+		android:layout_height="0px"
+		android:orientation="horizontal"
+		android:layout_weight="8">
+		<Button
+			android:layout_width="fill_parent"
+			android:layout_height="fill_parent"
+			android:text="Load"
+			android:id="@+id/but_load"
+			android:textSize="8dp"
+			android:background="#ffEFC802"
+			android:textColor="#ffffffff"
+			android:layout_weight="1"
+			android:gravity="center"/>
+		<Button
+			android:layout_width="fill_parent"
+			android:layout_height="fill_parent"
+			android:text="Exit"
+			android:id="@+id/but_exit"
+			android:textSize="8dp"
+			android:background="#ff06AF00"
+			android:textColor="#ffffffff"
+			android:layout_weight="1"
+			android:gravity="center"/>
+	</LinearLayout>
+</LinearLayout>
+"""),"SL4AApp")
+
+    def on_show(self):
+        self.views.but_exit.add_event(click_EventHandler(self.views.but_exit, self.exit))
+        self.views.but_load.add_event(click_EventHandler(self.views.but_load, self.load))
+
+        pass
+
+    def on_close(self):
+        pass
+
+    def load(self, view, dummy):
+        droid = FullScreenWrapper2App.get_android_instance()
+        droid.makeToast("Load")
+
+        saved_logo = qpy.tmp+"/qpy.logo"
+        ur.urlretrieve("https://www.qpython.org/static/img_logo.png", saved_logo)
+        self.views.logo.src = "file://"+saved_logo
+
+    def exit(self, view, dummy):
+        droid = FullScreenWrapper2App.get_android_instance()
+        droid.makeToast("Exit")
+        FullScreenWrapper2App.close_layout()
+
+if __name__ == '__main__':
+    FullScreenWrapper2App.initialize(droid)
+    FullScreenWrapper2App.show_layout(MainScreen())
+    FullScreenWrapper2App.eventloop()
diff --git a/qpython/src/main/assets/QPy_WebApp b/qpython/src/main/assets/QPy_WebApp
new file mode 100644
index 00000000..86f447e9
--- /dev/null
+++ b/qpython/src/main/assets/QPy_WebApp
@@ -0,0 +1,53 @@
+#qpy:webapp:Hello Qpython
+#qpy://127.0.0.1:8080/
+"""
+This is a sample for qpython webapp
+"""
+from bottle import Bottle, ServerAdapter
+from bottle import run, debug, route, error, static_file, template
+
+######### QPYTHON WEB SERVER ###############
+class MyWSGIRefServer(ServerAdapter):
+    server = None
+    def run(self, handler):
+        from wsgiref.simple_server import make_server, WSGIRequestHandler
+        if self.quiet:
+            class QuietHandler(WSGIRequestHandler):
+                def log_request(*args, **kw): pass
+            self.options['handler_class'] = QuietHandler
+        self.server = make_server(self.host, self.port, handler, **self.options)
+        self.server.serve_forever()
+
+    def stop(self):
+        import threading
+        threading.Thread(target=self.server.shutdown).start()
+        self.server.server_close()
+
+######### BUILT-IN ROUTERS ###############
+@route('/__exit', method=['GET','HEAD'])
+def __exit():
+    global server
+    server.stop()
+
+@route('/assets/<filepath:path>')
+def server_static(filepath):
+    return static_file(filepath, root='/sdcard')
+
+
+######### WEBAPP ROUTERS WRITE YOUR CODE BELOW###############
+@route('/')
+def home():
+    return template('<h1>Hello {{name}} !</h1><a href="/assets/qpython/projects/WebAppSample/main.py">View code</a><br /><br /> <a href="http://edu.qpython.org/qpython-webapp/index.html">>> About QPython Web App</a>',name='QPython')
+
+######### WEBAPP ROUTERS ###############
+app = Bottle()
+app.route('/', method='GET')(home)
+app.route('/__exit', method=['GET','HEAD'])(__exit)
+app.route('/assets/<filepath:path>', method='GET')(server_static)
+
+try:
+    server = MyWSGIRefServer(host="127.0.0.1", port="8080")
+    app.run(server=server,reloader=False)
+except Exception,ex:
+    errs = "Exception: %s" % repr(ex)
+    print(errs)
diff --git a/qpython/src/main/assets/The_MIT_License b/qpython/src/main/assets/The_MIT_License
new file mode 100644
index 00000000..758aec2b
--- /dev/null
+++ b/qpython/src/main/assets/The_MIT_License
@@ -0,0 +1,23 @@
+"""
+The MIT License (MIT)
+
+Copyright (c) <year> <copyright holders>
+
+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.
+"""
\ No newline at end of file
diff --git a/qpython/src/main/assets/Untitled.ipynb b/qpython/src/main/assets/Untitled.ipynb
new file mode 100644
index 00000000..7d650b22
--- /dev/null
+++ b/qpython/src/main/assets/Untitled.ipynb
@@ -0,0 +1,14 @@
+{
+ "cells": [
+  {
+   "cell_type": "code",
+   "execution_count": 1,
+   "metadata": {},
+   "outputs": [],
+   "source": []
+  }
+ ],
+ "metadata": {},
+  "nbformat": 4,
+  "nbformat_minor": 2
+}
diff --git a/qpython/src/main/assets/ipynb.mp3 b/qpython/src/main/assets/ipynb.mp3
new file mode 100644
index 00000000..82ab6e18
Binary files /dev/null and b/qpython/src/main/assets/ipynb.mp3 differ
diff --git a/qpython/src/main/assets/notebook3.mp3 b/qpython/src/main/assets/notebook3.mp3
new file mode 100644
index 00000000..5f1e2e9d
Binary files /dev/null and b/qpython/src/main/assets/notebook3.mp3 differ
diff --git a/qpython/src/main/assets/private1.mp3 b/qpython/src/main/assets/private1.mp3
new file mode 100644
index 00000000..04bcab83
Binary files /dev/null and b/qpython/src/main/assets/private1.mp3 differ
diff --git a/qpython/src/main/assets/private2.mp3 b/qpython/src/main/assets/private2.mp3
new file mode 100644
index 00000000..19447780
Binary files /dev/null and b/qpython/src/main/assets/private2.mp3 differ
diff --git a/qpython/src/main/assets/private3.mp3 b/qpython/src/main/assets/private3.mp3
new file mode 100644
index 00000000..ea8d4793
Binary files /dev/null and b/qpython/src/main/assets/private3.mp3 differ
diff --git a/qpython/src/main/assets/private31.mp3 b/qpython/src/main/assets/private31.mp3
new file mode 100644
index 00000000..8602504a
Binary files /dev/null and b/qpython/src/main/assets/private31.mp3 differ
diff --git a/qpython/src/main/assets/private32.mp3 b/qpython/src/main/assets/private32.mp3
new file mode 100644
index 00000000..01d7727a
Binary files /dev/null and b/qpython/src/main/assets/private32.mp3 differ
diff --git a/qpython/src/main/assets/private33.mp3 b/qpython/src/main/assets/private33.mp3
new file mode 100644
index 00000000..81a47e3e
Binary files /dev/null and b/qpython/src/main/assets/private33.mp3 differ
diff --git a/qpysdk/src/main/assets/public.mp3 b/qpython/src/main/assets/public.mp3
similarity index 100%
rename from qpysdk/src/main/assets/public.mp3
rename to qpython/src/main/assets/public.mp3
diff --git a/qpython/src/main/assets/public3.mp3 b/qpython/src/main/assets/public3.mp3
new file mode 100644
index 00000000..fd02b4b4
Binary files /dev/null and b/qpython/src/main/assets/public3.mp3 differ
diff --git a/qpython/src/main/assets/syntax/actionscript.xml b/qpython/src/main/assets/syntax/actionscript.xml
deleted file mode 100644
index 53eea007..00000000
--- a/qpython/src/main/assets/syntax/actionscript.xml
+++ /dev/null
@@ -1,832 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!--
-	ActionScript mode by Ben Glazer <ben@enspire.com>
-	Adapted from JavaScript mode by Andre Kaplan
-	Updated for Flash MX 2004 by Nahuel Foronda <www.asfusion.com>
--->
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="indentOpenBrackets" VALUE="{" />
-		<PROPERTY NAME="indentCloseBrackets" VALUE="}" />
-		<!-- the ; hack is there so that stuff like if(bob) fred();
-		     does not indent the next line -->
-		<PROPERTY NAME="indentPrevLine" VALUE="\s*(if|while)\s*(|else|case|default:)[^;]*|for\s*\(.*)" />
-		<!-- set this to 'true' if you want to use GNU coding style -->
-		<PROPERTY NAME="doubleBracketIndent" VALUE="false" />
-		<PROPERTY NAME="commentStart" VALUE="/*" />
-		<PROPERTY NAME="commentEnd" VALUE="*/" />
-		<PROPERTY NAME="lineComment" VALUE="//" />
-		<PROPERTY NAME="wordBreakChars" VALUE=",+-=&lt;&gt;/?^&amp;*" />
-	</PROPS>
-
-	<RULES ESCAPE="\" IGNORE_CASE="FALSE" HIGHLIGHT_DIGITS="TRUE">
-		<!-- whitespace: (space and tab) -->
-		<SPAN TYPE="COMMENT1">
-			<BEGIN>/*</BEGIN>
-			<END>*/</END>
-		</SPAN>
-
-		<SPAN TYPE="LITERAL1" NO_LINE_BREAK="TRUE">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-
-		<SPAN TYPE="LITERAL1" NO_LINE_BREAK="TRUE">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-
-		<MARK_PREVIOUS TYPE="FUNCTION" MATCH_TYPE="CONTEXT">(</MARK_PREVIOUS>
-
-		<EOL_SPAN TYPE="COMMENT1">//</EOL_SPAN>
-		<SEQ TYPE="NULL">)</SEQ>
-		<SEQ TYPE="NULL">(</SEQ>
-
-		<SEQ TYPE="OPERATOR">=</SEQ>
-		<SEQ TYPE="OPERATOR">!</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;=</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;=</SEQ>
-		<SEQ TYPE="OPERATOR">+</SEQ>
-		<SEQ TYPE="OPERATOR">-</SEQ>
-		<SEQ TYPE="OPERATOR">/</SEQ>
-		<SEQ TYPE="OPERATOR">*</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;</SEQ>
-		<SEQ TYPE="OPERATOR">%</SEQ>
-		<SEQ TYPE="OPERATOR">&amp;</SEQ>
-		<SEQ TYPE="OPERATOR">|</SEQ>
-		<SEQ TYPE="OPERATOR">^</SEQ>
-		<SEQ TYPE="OPERATOR">~</SEQ>
-		<SEQ TYPE="OPERATOR">.</SEQ>
-		<SEQ TYPE="OPERATOR">}</SEQ>
-		<SEQ TYPE="OPERATOR">{</SEQ>
-		<SEQ TYPE="OPERATOR">,</SEQ>
-		<SEQ TYPE="OPERATOR">;</SEQ>
-		<SEQ TYPE="OPERATOR">]</SEQ>
-		<SEQ TYPE="OPERATOR">[</SEQ>
-		<SEQ TYPE="OPERATOR">?</SEQ>
-		<MARK_PREVIOUS TYPE="LABEL" MATCH_TYPE="CONTEXT"
-			AT_LINE_START="TRUE">:</MARK_PREVIOUS>
-		<SEQ TYPE="OPERATOR">:</SEQ>
-
-		<KEYWORDS>
-			<!-- ActionScript's reserved words (see AS:TDG p.332) -->
-			<KEYWORD1>add</KEYWORD1>   <!-- deprecated -->
-			<KEYWORD1>and</KEYWORD1>   <!-- deprecated -->
-			<KEYWORD1>break</KEYWORD1>
-			<KEYWORD1>continue</KEYWORD1>
-			<KEYWORD1>delete</KEYWORD1>
-			<KEYWORD1>do</KEYWORD1>
-			<KEYWORD1>else</KEYWORD1>
-			<KEYWORD1>eq</KEYWORD1>   <!-- deprecated -->
-			<KEYWORD1>for</KEYWORD1>
-			<KEYWORD1>function</KEYWORD1>
-			<KEYWORD1>ge</KEYWORD1>   <!-- deprecated -->
-			<KEYWORD1>gt</KEYWORD1>   <!-- deprecated -->
-			<KEYWORD1>if</KEYWORD1>
-			<KEYWORD1>ifFrameLoaded</KEYWORD1>   <!-- deprecated -->
-			<KEYWORD1>in</KEYWORD1>
-			<KEYWORD1>le</KEYWORD1>   <!-- deprecated -->
-			<KEYWORD1>lt</KEYWORD1>   <!-- deprecated -->
-			<KEYWORD1>ne</KEYWORD1>   <!-- deprecated -->
-			<KEYWORD1>new</KEYWORD1>
-			<KEYWORD1>not</KEYWORD1>   <!-- deprecated -->
-			<KEYWORD1>on</KEYWORD1>
-			<KEYWORD1>onClipEvent</KEYWORD1>
-			<KEYWORD1>or</KEYWORD1>   <!-- deprecated -->
-			<KEYWORD1>return</KEYWORD1>
-			<LITERAL2>this</LITERAL2>
-			<KEYWORD1>tellTarget</KEYWORD1>   <!-- deprecated -->
-			<KEYWORD1>typeof</KEYWORD1>
-			<KEYWORD1>var</KEYWORD1>
-			<KEYWORD3>void</KEYWORD3>
-			<KEYWORD1>while</KEYWORD1>
-			<KEYWORD1>with</KEYWORD1>
-
-			<KEYWORD2>Bindable</KEYWORD2>
-			<!-- Built-in objects (good idea not to use these names!)-->
-			<KEYWORD3>Array</KEYWORD3>
-			<KEYWORD3>Boolean</KEYWORD3>
-			<KEYWORD3>Color</KEYWORD3>
-			<KEYWORD3>Date</KEYWORD3>
-			<KEYWORD3>Function</KEYWORD3>
-			<KEYWORD3>Key</KEYWORD3>
-			<KEYWORD3>MovieClip</KEYWORD3>
-			<KEYWORD3>Sprite</KEYWORD3>
-			<KEYWORD3>Math</KEYWORD3>
-			<KEYWORD3>Mouse</KEYWORD3>
-			<KEYWORD3>Number</KEYWORD3>
-			<KEYWORD3>uint</KEYWORD3>
-			<KEYWORD3>Object</KEYWORD3>
-			<KEYWORD3>Selection</KEYWORD3>
-			<KEYWORD3>Sound</KEYWORD3>
-			<KEYWORD3>String</KEYWORD3>
-			<KEYWORD3>XML</KEYWORD3>
-			<KEYWORD3>XMLNode</KEYWORD3>
-			<KEYWORD3>XMLSocket</KEYWORD3>
-
-			<!-- Literals -->
-			<LITERAL2>NaN</LITERAL2>
-			<LITERAL2>Infinity</LITERAL2>
-			<LITERAL2>false</LITERAL2>
-			<LITERAL2>null</LITERAL2>
-			<LITERAL2>true</LITERAL2>
-			<LITERAL2>undefined</LITERAL2>
-
-			<!-- Global functions -->
-			<LITERAL2>Boolean</LITERAL2>
-			<LITERAL2>call</LITERAL2>
-			<LITERAL2>Date</LITERAL2>
-			<LITERAL2>escape</LITERAL2>
-			<LITERAL2>eval</LITERAL2>
-			<LITERAL2>fscommand</LITERAL2>
-			<LITERAL2>getProperty</LITERAL2>
-			<LITERAL2>getTimer</LITERAL2>
-			<LITERAL2>getURL</LITERAL2>
-			<LITERAL2>getVersion</LITERAL2>
-			<LITERAL2>gotoAndPlay</LITERAL2>
-			<LITERAL2>gotoAndStop</LITERAL2>
-			<LITERAL2>#include</LITERAL2>
-			<LITERAL2>int</LITERAL2>   <!-- deprecated -->
-			<LITERAL2>isFinite</LITERAL2>
-			<LITERAL2>isNaN</LITERAL2>
-			<LITERAL2>loadMovie</LITERAL2>
-			<LITERAL2>loadMovieNum</LITERAL2>
-			<LITERAL2>loadVariables</LITERAL2>
-			<LITERAL2>loadVariablesNum</LITERAL2>
-			<LITERAL2>maxscroll</LITERAL2>
-			<LITERAL2>newline</LITERAL2>
-			<LITERAL2>nextFrame</LITERAL2>
-			<LITERAL2>nextScene</LITERAL2>
-			<LITERAL2>Number</LITERAL2>
-			<LITERAL2>parseFloat</LITERAL2>
-			<LITERAL2>parseInt</LITERAL2>
-			<LITERAL2>play</LITERAL2>
-			<LITERAL2>prevFrame</LITERAL2>
-			<LITERAL2>prevScene</LITERAL2>
-			<LITERAL2>print</LITERAL2>
-			<LITERAL2>printAsBitmap</LITERAL2>
-			<LITERAL2>printAsBitmapNum</LITERAL2>
-			<LITERAL2>printNum</LITERAL2>
-			<LITERAL2>random</LITERAL2>   <!-- deprecated -->
-			<LITERAL2>removeMovieClip</LITERAL2>
-			<LITERAL2>scroll</LITERAL2>
-			<LITERAL2>setProperty</LITERAL2>
-			<LITERAL2>startDrag</LITERAL2>
-			<LITERAL2>stop</LITERAL2>
-			<LITERAL2>stopAllSounds</LITERAL2>
-			<LITERAL2>stopDrag</LITERAL2>
-			<LITERAL2>String</LITERAL2>
-			<LITERAL2>targetPath</LITERAL2>
-			<LITERAL2>tellTarget</LITERAL2>   <!-- deprecated -->
-			<LITERAL2>toggleHighQuality</LITERAL2>   <!-- deprecated -->
-			<LITERAL2>trace</LITERAL2>
-			<LITERAL2>unescape</LITERAL2>
-			<LITERAL2>unloadMovie</LITERAL2>
-			<LITERAL2>unloadMovieNum</LITERAL2>
-			<LITERAL2>updateAfterEvent</LITERAL2>
-
-			 <!-- Start Update -->
-			<LITERAL2>prototype</LITERAL2>
-			<LITERAL2>clearInterval</LITERAL2>
-			<LITERAL2>getVersion</LITERAL2>
-			<LITERAL2>length</LITERAL2>
-			<LITERAL2>__proto__</LITERAL2>
-			<LITERAL2>__constructor__</LITERAL2>
-			<LITERAL2>ASSetPropFlags</LITERAL2>
-			<LITERAL2>setInterval</LITERAL2>
-			<LITERAL2>setI</LITERAL2>
-			<KEYWORD3>MMExecute</KEYWORD3>
-			
-			 <!-- MovieCLip methods-->
-			<LITERAL2>attachMovie</LITERAL2>
-			<LITERAL2>createEmptyMovieClip</LITERAL2>
-			<LITERAL2>createTextField</LITERAL2>
-			<LITERAL2>duplicateMovieClip</LITERAL2>
-			<LITERAL2>getBounds</LITERAL2>
-			<LITERAL2>getBytesLoaded</LITERAL2>
-			<LITERAL2>getBytesTotal</LITERAL2>
-			<LITERAL2>getDepth</LITERAL2>
-			<LITERAL2>globalToLocal</LITERAL2>
-			<LITERAL2>hitTest</LITERAL2>
-			<LITERAL2>localToGlobal</LITERAL2>
-			<LITERAL2>setMask</LITERAL2>
-			<LITERAL2>swapDepths</LITERAL2>
-			<LITERAL2>attachAudio</LITERAL2>
-			<LITERAL2>getInstanceAtDepth</LITERAL2>
-			<LITERAL2>getNextHighestDepth</LITERAL2>
-			<LITERAL2>getSWFVersion</LITERAL2>
-			<LITERAL2>getTextSnapshot</LITERAL2>
-			<LITERAL2>getSWFVersion</LITERAL2>
-			<LITERAL2>getSWFVersion</LITERAL2>
-			
-			<!-- MovieCLip drawing methods  -->
-			<LITERAL2>beginFill</LITERAL2>
-			<LITERAL2>beginGradientFill</LITERAL2>
-			<LITERAL2>clear</LITERAL2>
-			<LITERAL2>curveTo</LITERAL2>
-			<LITERAL2>endFill</LITERAL2>
-			<LITERAL2>lineStyle</LITERAL2>
-			<LITERAL2>lineTo</LITERAL2>
-			<LITERAL2>moveTo</LITERAL2>
-			
-			<!-- MovieCLip properties  -->
-			<LITERAL2>enabled</LITERAL2>
-			<LITERAL2>focusEnabled</LITERAL2>
-			<LITERAL2>hitArea</LITERAL2>
-			<LITERAL2>tabChildren</LITERAL2>
-			<LITERAL2>tabEnabled</LITERAL2>
-			<LITERAL2>tabIndex</LITERAL2>
-			<LITERAL2>trackAsMenu</LITERAL2>
-			<LITERAL2>menu</LITERAL2>
-			<LITERAL2>useHandCursor</LITERAL2>
-			
-			<!-- MovieCLip Events  -->
-			<LITERAL2>onData</LITERAL2>
-			<LITERAL2>onDragOut</LITERAL2>
-			<LITERAL2>onDragOver</LITERAL2>
-			<LITERAL2>onEnterFrame</LITERAL2>
-			<LITERAL2>onKeyDown</LITERAL2>
-			<LITERAL2>onKeyUp</LITERAL2>
-			<LITERAL2>onKillFocus</LITERAL2>
-			<LITERAL2>onLoad</LITERAL2>
-			<LITERAL2>onMouseDown</LITERAL2>
-			<LITERAL2>onMouseMove</LITERAL2>
-			<LITERAL2>onMouseUp</LITERAL2>
-			<LITERAL2>onPress</LITERAL2>
-			<LITERAL2>onRelease</LITERAL2>
-			<LITERAL2>onReleaseOutside</LITERAL2>
-			<LITERAL2>onRollOut</LITERAL2>
-			<LITERAL2>onRollOver</LITERAL2>
-			<LITERAL2>onSetFocus</LITERAL2>
-			<LITERAL2>onUnload</LITERAL2>
-			
-			<!-- MovieClipLoader class -->
-			<LITERAL2>MovieClipLoader</LITERAL2>
-			<LITERAL2>getProgress</LITERAL2>
-			<LITERAL2>loadClip</LITERAL2>
-			<LITERAL2>onLoadComplete</LITERAL2>
-			<LITERAL2>onLoadError</LITERAL2>
-			<LITERAL2>onLoadInit</LITERAL2>
-			<LITERAL2>onLoadProgress</LITERAL2>
-			<LITERAL2>onLoadStart</LITERAL2>
-			<LITERAL2>unloadClip</LITERAL2>
-			
-			<!-- PrintJob class -->
-			<LITERAL2>PrintJob</LITERAL2>
-			<LITERAL2>addPage</LITERAL2>
-			
-			<!-- Camera class -->
-			<LITERAL2>Camera</LITERAL2>
-			<LITERAL2>activityLevel</LITERAL2>
-			<LITERAL2>bandwidth</LITERAL2>
-			<LITERAL2>currentFps</LITERAL2>
-			<LITERAL2>fps</LITERAL2>
-			<LITERAL2>index</LITERAL2>
-			<LITERAL2>motionLevel</LITERAL2>
-			<LITERAL2>motionTimeOut</LITERAL2>
-			<LITERAL2>muted</LITERAL2>
-			<LITERAL2>name</LITERAL2>
-			<LITERAL2>names</LITERAL2>
-			<LITERAL2>onActivity</LITERAL2>
-			<LITERAL2>onStatus</LITERAL2>
-			<LITERAL2>quality</LITERAL2>
-			<LITERAL2>setMode</LITERAL2>
-			<LITERAL2>setMotionLevel</LITERAL2>
-			<LITERAL2>setQuality</LITERAL2>
-			
-			<!-- Microphone class -->
-			<LITERAL2>Microphone</LITERAL2>
-			<LITERAL2>gain</LITERAL2>
-			<LITERAL2>rate</LITERAL2>
-			<LITERAL2>setGain</LITERAL2>
-			<LITERAL2>setRate</LITERAL2>
-			<LITERAL2>setSilenceLevel</LITERAL2>
-			<LITERAL2>setUseEchoSuppression</LITERAL2>
-			<LITERAL2>silenceLevel</LITERAL2>
-			<LITERAL2>silenceTimeout</LITERAL2>
-			<LITERAL2>useEchoSuppression</LITERAL2>
-			
-			<!-- ContextMenu Class -->
-			<LITERAL2>ContextMenu</LITERAL2>
-			<LITERAL2>builtInItems</LITERAL2>
-			<LITERAL2>copy</LITERAL2>
-			<LITERAL2>customItems</LITERAL2>
-			<LITERAL2>hideBuiltInItems</LITERAL2>
-			<LITERAL2>onSelect</LITERAL2>
-			<LITERAL2>caption</LITERAL2>
-			<LITERAL2>ContextMenuItem</LITERAL2>
-			<LITERAL2>separatorBefore</LITERAL2>
-			<LITERAL2>visible</LITERAL2>
-			
-			<!-- Error class -->
-			<LITERAL2>Error</LITERAL2>
-			<LITERAL2>visible</LITERAL2>
-			<LITERAL2>message</LITERAL2>
-			
-			<!-- operators grenn-->
-			<KEYWORD1>instanceof</KEYWORD1>
-			<KEYWORD1>#endinitclip</KEYWORD1>
-			<KEYWORD1>#initclip</KEYWORD1>
-			
-			<!-- properties -->
-			<LITERAL2>_alpha</LITERAL2>
-			<LITERAL2>_currentframe</LITERAL2>
-			<LITERAL2>_droptarget</LITERAL2>
-			<LITERAL2>_focusrect</LITERAL2>
-			<LITERAL2>_framesloaded</LITERAL2>
-			<LITERAL2>_height</LITERAL2>
-			<LITERAL2>_name</LITERAL2>
-			<LITERAL2>_quality</LITERAL2>
-			<LITERAL2>_rotation</LITERAL2>
-			<LITERAL2>_soundbuftime</LITERAL2>
-			<LITERAL2>_target</LITERAL2>
-			<LITERAL2>_totalframes</LITERAL2>
-			<LITERAL2>_url</LITERAL2>
-			<LITERAL2>_visible</LITERAL2>
-			<LITERAL2>_width</LITERAL2>
-			<LITERAL2>_x</LITERAL2>
-			<LITERAL2>_xmouse</LITERAL2>
-			<LITERAL2>_xscale</LITERAL2>
-			<LITERAL2>_y</LITERAL2>
-			<LITERAL2>_ymouse</LITERAL2>
-			<LITERAL2>_yscale</LITERAL2>
-			<LITERAL2>_parent</LITERAL2>
-			<LITERAL2>_root</LITERAL2>
-			<LITERAL2>_level</LITERAL2>
-			<LITERAL2>_lockroot</LITERAL2>
-			<LITERAL2>_accProps</LITERAL2>
-			
-			
-			<!-- Array -->
-			<LITERAL2>sortOn</LITERAL2>
-			<LITERAL2>toString</LITERAL2>
-			<LITERAL2>splice</LITERAL2>
-			<LITERAL2>sort</LITERAL2>
-			<LITERAL2>slice</LITERAL2>
-			<LITERAL2>shift</LITERAL2>
-			<LITERAL2>reverse</LITERAL2>
-			<LITERAL2>push</LITERAL2>
-			<LITERAL2>join</LITERAL2>
-			<LITERAL2>pop</LITERAL2>
-			<LITERAL2>concat</LITERAL2>
-			<LITERAL2>unshift</LITERAL2>
-			
-			<!-- Arguments -->
-			<LITERAL2>arguments</LITERAL2>
-			<LITERAL2>callee</LITERAL2>
-			<LITERAL2>caller</LITERAL2>
-			<LITERAL2>valueOf</LITERAL2>
-			
-			<!-- Date Class -->
-			<LITERAL2>getDate</LITERAL2>
-			<LITERAL2>getDay</LITERAL2>
-			<LITERAL2>getFullYear</LITERAL2>
-			<LITERAL2>getHours</LITERAL2>
-			<LITERAL2>getMilliseconds</LITERAL2>
-			<LITERAL2>getMinutes</LITERAL2>
-			<LITERAL2>getMonth</LITERAL2>
-			<LITERAL2>getSeconds</LITERAL2>
-			<LITERAL2>getTime</LITERAL2>
-			<LITERAL2>getTimezoneOffset</LITERAL2>
-			<LITERAL2>getUTCDate</LITERAL2>
-			<LITERAL2>getUTCDay</LITERAL2>
-			<LITERAL2>getUTCFullYear</LITERAL2>
-			<LITERAL2>getUTCHours</LITERAL2>
-			<LITERAL2>getUTCMilliseconds</LITERAL2>
-			<LITERAL2>getUTCMinutes</LITERAL2>
-			<LITERAL2>getUTCMonth</LITERAL2>
-			<LITERAL2>getUTCSeconds</LITERAL2>
-			<LITERAL2>getYear</LITERAL2>
-			<LITERAL2>setDate</LITERAL2>
-			<LITERAL2>setFullYear</LITERAL2>
-			<LITERAL2>setHours</LITERAL2>
-			<LITERAL2>setMilliseconds</LITERAL2>
-			<LITERAL2>setMinutes</LITERAL2>
-			<LITERAL2>setMonth</LITERAL2>
-			<LITERAL2>setSeconds</LITERAL2>
-			<LITERAL2>setTime</LITERAL2>
-			<LITERAL2>setUTCDate</LITERAL2>
-			<LITERAL2>setUTCFullYear</LITERAL2>
-			<LITERAL2>setUTCHours</LITERAL2>
-			<LITERAL2>setUTCMilliseconds</LITERAL2>
-			<LITERAL2>setUTCMinutes</LITERAL2>
-			<LITERAL2>setUTCMonth</LITERAL2>
-			<LITERAL2>setUTCSeconds</LITERAL2>
-			<LITERAL2>setYear</LITERAL2>
-			<LITERAL2>UTC</LITERAL2>
-			
-			<!-- Function -->
-			<LITERAL2>_global</LITERAL2>
-			<LITERAL2>apply</LITERAL2>
-			
-			<!--  Math Class -->
-			<LITERAL2>abs</LITERAL2>
-			<LITERAL2>acos</LITERAL2>
-			<LITERAL2>asin</LITERAL2>
-			<LITERAL2>atan</LITERAL2>
-			<LITERAL2>atan2</LITERAL2>
-			<LITERAL2>ceil</LITERAL2>
-			<LITERAL2>cos</LITERAL2>
-			<LITERAL2>exp</LITERAL2>
-			<LITERAL2>floor</LITERAL2>
-			<LITERAL2>log</LITERAL2>
-			<LITERAL2>max</LITERAL2>
-			<LITERAL2>min</LITERAL2>
-			<LITERAL2>pow</LITERAL2>
-			<LITERAL2>round</LITERAL2>
-			<LITERAL2>sin</LITERAL2>
-			<LITERAL2>sqrt</LITERAL2>
-			<LITERAL2>tan</LITERAL2>
-			
-			<LITERAL2>E</LITERAL2>
-			<LITERAL2>LN2</LITERAL2>
-			<LITERAL2>LN10</LITERAL2>
-			<LITERAL2>LOG2E</LITERAL2>
-			<LITERAL2>LOG10E</LITERAL2>
-			<LITERAL2>PI</LITERAL2>
-			<LITERAL2>SQRT1_2</LITERAL2>
-			<LITERAL2>SQRT2</LITERAL2>
-			
-			<!-- Number -->
-			<LITERAL2>MAX_VALUE</LITERAL2>
-			<LITERAL2>MIN_VALUE</LITERAL2>
-			<LITERAL2>NEGATIVE_INFINITY</LITERAL2>
-			<LITERAL2>POSITIVE_INFINITY</LITERAL2>
-			
-			<!-- Object -->
-			<LITERAL2>addProperty</LITERAL2>
-			<LITERAL2>registerClass</LITERAL2>
-			<LITERAL2>unwatch</LITERAL2>
-			<LITERAL2>watch</LITERAL2>
-			
-			<!-- String -->
-			<LITERAL2>charAt</LITERAL2>
-			<LITERAL2>charCodeAt</LITERAL2>
-			<LITERAL2>fromCharCode</LITERAL2>
-			<LITERAL2>lastIndexOf</LITERAL2>
-			<LITERAL2>indexOf</LITERAL2>
-			<LITERAL2>split</LITERAL2>
-			<LITERAL2>substr</LITERAL2>
-			<LITERAL2>substring</LITERAL2>
-			<LITERAL2>toLowerCase</LITERAL2>
-			<LITERAL2>toUpperCase</LITERAL2>
-			
-			<!-- Accessibility -->
-			<LITERAL2>Accessibility</LITERAL2>
-			<LITERAL2>isActive</LITERAL2>
-			<LITERAL2>updateProperties</LITERAL2>
-			              
-			
-			<!-- System capabilities Class-->
-			<LITERAL2>System</LITERAL2>
-			<LITERAL2>capabilities</LITERAL2>
-			<LITERAL2>exactSettings</LITERAL2>
-			<LITERAL2>setClipboard</LITERAL2>
-			<LITERAL2>showSettings</LITERAL2>
-			<LITERAL2>useCodepage</LITERAL2>
-			<LITERAL2>avHardwareDisable</LITERAL2>
-			<LITERAL2>hasAccessibility</LITERAL2>
-			<LITERAL2>hasAudio</LITERAL2>
-			<LITERAL2>hasAudioEncoder</LITERAL2>
-			<LITERAL2>hasMP3</LITERAL2>
-			<LITERAL2>hasVideoEncoder</LITERAL2>
-			<LITERAL2>pixelAspectRatio</LITERAL2>
-			<LITERAL2>screenColor</LITERAL2>
-			<LITERAL2>screenDPI</LITERAL2>
-			<LITERAL2>screenResolutionX</LITERAL2>
-			<LITERAL2>screenResolutionY</LITERAL2>
-			<LITERAL2>hasEmbeddedVideo</LITERAL2>
-			<LITERAL2>hasPrinting</LITERAL2>
-			<LITERAL2>hasScreenBroadcast</LITERAL2>
-			<LITERAL2>hasScreenPlayback</LITERAL2>
-			<LITERAL2>hasStreamingAudio</LITERAL2>
-			<LITERAL2>hasStreamingVideo</LITERAL2>
-			<LITERAL2>isDebugger</LITERAL2>
-			<LITERAL2>language</LITERAL2>
-			<LITERAL2>manufacturer</LITERAL2>
-			<LITERAL2>os</LITERAL2>
-			<LITERAL2>playerType</LITERAL2>
-			<LITERAL2>serverString</LITERAL2>
-			<LITERAL2>localFileReadDisable</LITERAL2>
-			<LITERAL2>version</LITERAL2>
-			<!-- System security Class -->
-			<LITERAL2>security</LITERAL2>
-			
-			<!-- Color Class -->
-			<LITERAL2>getRGB</LITERAL2>
-			<LITERAL2>getTransform</LITERAL2>
-			<LITERAL2>setRGB</LITERAL2>
-			<LITERAL2>setTransform</LITERAL2>
-			
-			<!-- Key Class -->
-			<LITERAL2>addListener</LITERAL2>
-			<LITERAL2>getAscii</LITERAL2>
-			<LITERAL2>isDown</LITERAL2>
-			<LITERAL2>getCode</LITERAL2>
-			<LITERAL2>isToggled</LITERAL2>
-			<LITERAL2>removeListener</LITERAL2>
-			<LITERAL2>BACKSPACE</LITERAL2>
-			<LITERAL2>CAPSLOCK</LITERAL2>
-			<LITERAL2>CONTROL</LITERAL2>
-			<LITERAL2>DELETEKEY</LITERAL2>
-			<LITERAL2>DOWN</LITERAL2>
-			<LITERAL2>END</LITERAL2>
-			<LITERAL2>ENTER</LITERAL2>
-			<LITERAL2>ESCAPE</LITERAL2>
-			<LITERAL2>HOME</LITERAL2>
-			<LITERAL2>INSERT</LITERAL2>
-			<LITERAL2>LEFT</LITERAL2>
-			<LITERAL2>PGDN</LITERAL2>
-			<LITERAL2>PGUP</LITERAL2>
-			<LITERAL2>SHIFT</LITERAL2>
-			<LITERAL2>RIGHT</LITERAL2>
-			<LITERAL2>SPACE</LITERAL2>
-			<LITERAL2>TAB</LITERAL2>
-			<LITERAL2>UP</LITERAL2>
-			
-			<!-- Mouse -->
-			<LITERAL2>hide</LITERAL2>
-			<LITERAL2>show</LITERAL2>
-			<LITERAL2>onMouseWheel</LITERAL2>
-			
-			<!-- Selection Class-->
-			<LITERAL2>getBeginIndex</LITERAL2>
-			<LITERAL2>getCaretIndex</LITERAL2>
-			<LITERAL2>getEndIndex</LITERAL2>
-			<LITERAL2>getFocus</LITERAL2>
-			<LITERAL2>setFocus</LITERAL2>
-			<LITERAL2>setSelection</LITERAL2>
-			
-			<!-- SharedObject Class-->
-			<LITERAL2>SharedObject</LITERAL2>
-			<LITERAL2>data</LITERAL2>
-			<LITERAL2>flush</LITERAL2>
-			<LITERAL2>getLocal</LITERAL2>
-			<LITERAL2>getSize</LITERAL2>
-			
-			<!-- Sound Class -->
-			<LITERAL2>attachSound</LITERAL2>
-			<LITERAL2>getVolume</LITERAL2>
-			<LITERAL2>loadSound</LITERAL2>
-			<LITERAL2>setPan</LITERAL2>
-			<LITERAL2>getPan</LITERAL2>
-			<LITERAL2>setVolume</LITERAL2>
-			<LITERAL2>start</LITERAL2>
-			<LITERAL2>duration</LITERAL2>
-			<LITERAL2>position</LITERAL2>
-			<LITERAL2>onSoundComplete</LITERAL2>
-			<LITERAL2>id3</LITERAL2>
-			<LITERAL2>onID3</LITERAL2>
-			
-			<!-- Video Class -->
-			<LITERAL2>Video</LITERAL2>
-			<LITERAL2>deblocking</LITERAL2>
-			<LITERAL2>smoothing</LITERAL2>
-			
-			<!--  Stage Class -->
-			<LITERAL2>Stage</LITERAL2>
-			<LITERAL2>align</LITERAL2>
-			<LITERAL2>height</LITERAL2>
-			<LITERAL2>scaleMode</LITERAL2>
-			<LITERAL2>showMenu</LITERAL2>
-			<LITERAL2>width</LITERAL2>
-			<LITERAL2>onResize</LITERAL2>
-			
-			<!-- TextField Class -->
-			<LITERAL2>getFontList</LITERAL2>
-			<LITERAL2>getNewTextFormat</LITERAL2>
-			<LITERAL2>getTextFormat</LITERAL2>
-			<LITERAL2>removeTextField</LITERAL2>
-			<LITERAL2>replaceSel</LITERAL2>
-			<LITERAL2>setNewTextFormat</LITERAL2>
-			<LITERAL2>setTextFormat</LITERAL2>
-			<LITERAL2>autoSize</LITERAL2>
-			<LITERAL2>background</LITERAL2>
-			<LITERAL2>backgroundColor</LITERAL2>
-			<LITERAL2>border</LITERAL2>
-			<LITERAL2>borderColor</LITERAL2>
-			<LITERAL2>bottomScroll</LITERAL2>
-			<LITERAL2>embedFonts</LITERAL2>
-			<LITERAL2>hscroll</LITERAL2>
-			<LITERAL2>html</LITERAL2>
-			<LITERAL2>htmlText</LITERAL2>
-			<LITERAL2>maxChars</LITERAL2>
-			<LITERAL2>maxhscroll</LITERAL2>
-			<LITERAL2>multiline</LITERAL2>
-			<LITERAL2>password</LITERAL2>
-			<LITERAL2>restrict</LITERAL2>
-			<LITERAL2>selectable</LITERAL2>
-			<LITERAL2>text</LITERAL2>
-			<LITERAL2>textColor</LITERAL2>
-			<LITERAL2>textHeight</LITERAL2>
-			<LITERAL2>textWidth</LITERAL2>
-			<LITERAL2>type</LITERAL2>
-			<LITERAL2>variable</LITERAL2>
-			<LITERAL2>wordWrap</LITERAL2>
-			<LITERAL2>onChanged</LITERAL2>
-			<LITERAL2>onScroller</LITERAL2>
-			<LITERAL2>TextField</LITERAL2>
-			<LITERAL2>mouseWheelEnabled</LITERAL2>
-			<LITERAL2>replaceText</LITERAL2>
-			
-			<!-- StyleSheet Class -->
-			<LITERAL2>StyleSheet</LITERAL2>
-			<LITERAL2>getStyle</LITERAL2>
-			<LITERAL2>getStyleNames</LITERAL2>
-			<LITERAL2>parseCSS</LITERAL2>
-			<LITERAL2>setStyle</LITERAL2>
-			<LITERAL2>styleSheet</LITERAL2>
-			
-			<!-- TextFormat Class -->
-			<LITERAL2>TextFormat</LITERAL2>
-			<LITERAL2>getTextExtent</LITERAL2>
-			<LITERAL2>blockIndent</LITERAL2>
-			<LITERAL2>bold</LITERAL2>
-			<LITERAL2>bullet</LITERAL2>
-			<LITERAL2>color</LITERAL2>
-			<LITERAL2>font</LITERAL2>
-			<LITERAL2>indent</LITERAL2>
-			<LITERAL2>italic</LITERAL2>
-			<LITERAL2>leading</LITERAL2>
-			<LITERAL2>leftMargin</LITERAL2>
-			<LITERAL2>rightMargin</LITERAL2>
-			<LITERAL2>size</LITERAL2>
-			<LITERAL2>tabStops</LITERAL2>
-			<LITERAL2>target</LITERAL2>
-			<LITERAL2>underline</LITERAL2>
-			<LITERAL2>url</LITERAL2>
-			
-			<!-- TextSnapshot object -->
-			<LITERAL2>TextSnapshot</LITERAL2>
-			<LITERAL2>findText</LITERAL2>
-			<LITERAL2>getCount</LITERAL2>
-			<LITERAL2>getSelected</LITERAL2>
-			<LITERAL2>getSelectedText</LITERAL2>
-			<LITERAL2>hitTestTextNearPos</LITERAL2>
-			<LITERAL2>getText</LITERAL2>
-			<LITERAL2>setSelectColor</LITERAL2>
-			<LITERAL2>setSelected</LITERAL2>
-			
-			<!-- LoadVars Class-->
-			<LITERAL2>LoadVars</LITERAL2>
-			<LITERAL2>load</LITERAL2>
-			<LITERAL2>send</LITERAL2>
-			<LITERAL2>sendAndLoad</LITERAL2>
-			<LITERAL2>contentType</LITERAL2>
-			<LITERAL2>loaded</LITERAL2>
-			<LITERAL2>addRequestHeader</LITERAL2>
-			
-			<!-- LocalConnection Class-->
-			<LITERAL2>LocalConnection</LITERAL2>
-			<LITERAL2>allowDomain</LITERAL2>
-			<LITERAL2>allowInsecureDomain</LITERAL2>
-			<LITERAL2>domain</LITERAL2>
-			
-			<!-- XML Class -->
-			<LITERAL2>appendChild</LITERAL2>
-			<LITERAL2>cloneNode</LITERAL2>
-			<LITERAL2>createElement</LITERAL2>
-			<LITERAL2>createTextNode</LITERAL2>
-			<LITERAL2>hasChildNodes</LITERAL2>
-			<LITERAL2>insertBefore</LITERAL2>
-			<LITERAL2>parseXML</LITERAL2>
-			<LITERAL2>removeNode</LITERAL2>
-			<LITERAL2>attributes</LITERAL2>
-			<LITERAL2>childNodes</LITERAL2>
-			<LITERAL2>docTypeDecl</LITERAL2>
-			<LITERAL2>firstChild</LITERAL2>
-			<LITERAL2>ignoreWhite</LITERAL2>
-			<LITERAL2>lastChild</LITERAL2>
-			<LITERAL2>nextSibling</LITERAL2>
-			<LITERAL2>nodeName</LITERAL2>
-			<LITERAL2>nodeType</LITERAL2>
-			<LITERAL2>nodeValue</LITERAL2>
-			<LITERAL2>parentNode</LITERAL2>
-			<LITERAL2>previousSibling</LITERAL2>
-			<LITERAL2>status</LITERAL2>
-			<LITERAL2>xmlDecl</LITERAL2>
-			<LITERAL2>close</LITERAL2>
-			<LITERAL2>connect</LITERAL2>
-			<LITERAL2>onClose</LITERAL2>
-			<LITERAL2>onConnect</LITERAL2>
-			<LITERAL2>onXML</LITERAL2>
-			
-			<!-- CustomActions Class -->
-			<LITERAL2>CustomActions</LITERAL2>
-			<LITERAL2>onUpdate</LITERAL2>
-			<LITERAL2>uninstall</LITERAL2>
-			<LITERAL2>list</LITERAL2>
-			<LITERAL2>install</LITERAL2>
-			<LITERAL2>get</LITERAL2>
-			
-			<!-- NetConnection Class -->
-			<LITERAL2>NetConnection</LITERAL2>
-			
-			<!-- NetStream Class-->
-			<LITERAL2>NetStream</LITERAL2>
-			<LITERAL2>bufferLength</LITERAL2>
-			<LITERAL2>bufferTime</LITERAL2>
-			<LITERAL2>bytesLoaded</LITERAL2>
-			<LITERAL2>bytesTotal</LITERAL2>
-			<LITERAL2>pause</LITERAL2>
-			<LITERAL2>seek</LITERAL2>
-			<LITERAL2>setBufferTime</LITERAL2>
-			<LITERAL2>time</LITERAL2>
-			
-			<!-- RecordSet Class -->
-			<LITERAL2>DataGlue</LITERAL2>
-			<LITERAL2>bindFormatFunction</LITERAL2>
-			<LITERAL2>bindFormatStrings</LITERAL2>
-			<LITERAL2>getDebugConfig</LITERAL2>
-			<LITERAL2>getDebugID</LITERAL2>
-			<LITERAL2>getService</LITERAL2>
-			<LITERAL2>setCredentials</LITERAL2>
-			<LITERAL2>setDebugID</LITERAL2>
-			<LITERAL2>getDebug</LITERAL2>
-			<LITERAL2>setDebug</LITERAL2>
-			<LITERAL2>createGatewayConnection</LITERAL2>
-			<LITERAL2>NetServices</LITERAL2>
-			<LITERAL2>setDefaultGatewayURL</LITERAL2>
-			<LITERAL2>addItem</LITERAL2>
-			<LITERAL2>addItemAt</LITERAL2>
-			<LITERAL2>addView</LITERAL2>
-			<LITERAL2>filter</LITERAL2>
-			<LITERAL2>getColumnNames</LITERAL2>
-			<LITERAL2>getItemAt</LITERAL2>
-			<LITERAL2>getLength</LITERAL2>
-			<LITERAL2>getNumberAvailable</LITERAL2>
-			<LITERAL2>isFullyPopulated</LITERAL2>
-			<LITERAL2>isLocal</LITERAL2>
-			<LITERAL2>removeAll</LITERAL2>
-			<LITERAL2>removeItemAt</LITERAL2>
-			<LITERAL2>replaceItemAt</LITERAL2>
-			<LITERAL2>setDeliveryMode</LITERAL2>
-			<LITERAL2>setField</LITERAL2>
-			<LITERAL2>sortItemsBy</LITERAL2>
-			
-			<!-- deprecated-->
-			<KEYWORD2>chr</KEYWORD2>
-			<KEYWORD2>mbchr</KEYWORD2>
-			<KEYWORD2>mblength</KEYWORD2>
-			<KEYWORD2>mbord</KEYWORD2>
-			<KEYWORD2>mbsubstring</KEYWORD2>
-			<KEYWORD2>ord</KEYWORD2>
-			<KEYWORD2>_highquality</KEYWORD2>
-			
-			<!-- END-->
-			
-			<!--ECMAScript keywords-->
-			<!-- Reserved for future use 
-				(some are already used in some Javascript Engines) 
-			-->
-			<KEYWORD1>abstract</KEYWORD1>
-			<KEYWORD3>boolean</KEYWORD3>
-			<KEYWORD3>byte</KEYWORD3>
-			<KEYWORD1>case</KEYWORD1>
-			<KEYWORD1>catch</KEYWORD1>
-			<KEYWORD3>char</KEYWORD3>
-			<KEYWORD1>class</KEYWORD1>
-			<KEYWORD1>const</KEYWORD1>
-			<KEYWORD1>debugger</KEYWORD1>
-			<KEYWORD1>default</KEYWORD1>
-
-			<KEYWORD3>double</KEYWORD3>
-			<KEYWORD1>enum</KEYWORD1>
-			<KEYWORD2>export</KEYWORD2>
-			<KEYWORD1>extends</KEYWORD1>
-			<KEYWORD1>final</KEYWORD1>
-			<KEYWORD1>finally</KEYWORD1>
-			<KEYWORD3>float</KEYWORD3>
-			<KEYWORD1>goto</KEYWORD1>
-			<KEYWORD1>implements</KEYWORD1>
-
-			<KEYWORD2>import</KEYWORD2>
-			<KEYWORD1>instanceof</KEYWORD1>
-			<KEYWORD3>int</KEYWORD3>
-			<KEYWORD1>interface</KEYWORD1>
-			<KEYWORD3>long</KEYWORD3>
-			<KEYWORD1>native</KEYWORD1>
-			<KEYWORD2>package</KEYWORD2>
-			<KEYWORD1>private</KEYWORD1>
-			<KEYWORD1>Void</KEYWORD1>
-			<KEYWORD1>protected</KEYWORD1>
-			<KEYWORD1>public</KEYWORD1>
-			<KEYWORD1>dynamic</KEYWORD1>
-			<KEYWORD1>override</KEYWORD1>
-
-			<KEYWORD3>short</KEYWORD3>
-			<KEYWORD1>static</KEYWORD1>
-			<LITERAL2>super</LITERAL2>
-			<KEYWORD1>switch</KEYWORD1>
-			<KEYWORD1>synchronized</KEYWORD1>
-			<KEYWORD1>throw</KEYWORD1>
-			<KEYWORD1>throws</KEYWORD1>
-			<KEYWORD1>transient</KEYWORD1>
-			<KEYWORD1>try</KEYWORD1>
-			<KEYWORD1>volatile</KEYWORD1>
-		</KEYWORDS>
-	</RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/ada.xml b/qpython/src/main/assets/syntax/ada.xml
deleted file mode 100644
index 6e44c178..00000000
--- a/qpython/src/main/assets/syntax/ada.xml
+++ /dev/null
@@ -1,350 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!--
-
-This is a jedit mode file for Ada programming language.
-Copyright (C) 2012 Peter C. Chapin (pchapin@sf)
-
-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 2
-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, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
--->
-
-<!-- TODO: Support based literals as numeric literals: 16#FF#
-           Support numeric literals with an exponent: 1.0e2, 1e2. -->
-
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="lineComment" VALUE="--" />
-        <PROPERTY NAME="indentNextLines"
-            VALUE=".*(begin|declare|do|else|elsif|exception|generic|is|loop|private|record|select|tagged|then|with|=>|:=)\s*(--.*)?$"/>
-        <PROPERTY NAME="unindentThisLine"
-            VALUE="^\s*end\b.*;"/>
-        <PROPERTY NAME="unindentNextLines"
-            VALUE="^\s*end\b.*;"/>
-        <PROPERTY NAME="electricKeys" VALUE=";"/>
-	</PROPS>
-
-	<RULES IGNORE_CASE="TRUE" HIGHLIGHT_DIGITS="TRUE">
-		<!-- SPARK annotation comments. -->
-		<EOL_SPAN TYPE="COMMENT2">--#</EOL_SPAN>
-		<!-- Normal comments. -->
-		<EOL_SPAN TYPE="COMMENT1">--</EOL_SPAN>
-
-		<SPAN TYPE="LITERAL1" NO_LINE_BREAK="TRUE">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-		
-        <!-- Operators and Related -->
-		<SEQ TYPE="OPERATOR">)</SEQ>
-		<SEQ TYPE="OPERATOR">(</SEQ>
-		<SEQ TYPE="OPERATOR">..</SEQ>
-		<SEQ TYPE="OPERATOR">.all</SEQ>
-		<SEQ TYPE="OPERATOR">:=</SEQ>
-		<SEQ TYPE="OPERATOR">/=</SEQ>
-		<SEQ TYPE="OPERATOR">=&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">=</SEQ>
-		<SEQ TYPE="NULL">&lt;&gt;</SEQ>
-		<SEQ TYPE="LABEL">&lt;&lt;</SEQ>
-		<SEQ TYPE="LABEL">&gt;&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;=</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;=</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;</SEQ>
-		<SEQ TYPE="OPERATOR">&amp;</SEQ>
-		<SEQ TYPE="OPERATOR">+</SEQ>
-		<SEQ TYPE="OPERATOR">-</SEQ>
-		<SEQ TYPE="OPERATOR">/</SEQ>
-		<SEQ TYPE="OPERATOR">**</SEQ>
-		<SEQ TYPE="OPERATOR">*</SEQ>
-
-		<!-- Predefined Attributes -->
-		<!-- From Section K.2 "Language-Defined Attributes" in the Ada Reference Manual. -->
-		<SEQ TYPE="KEYWORD3">'access</SEQ>
-		<SEQ TYPE="KEYWORD3">'address</SEQ>
-		<SEQ TYPE="KEYWORD3">'adjacent</SEQ>
-		<SEQ TYPE="KEYWORD3">'aft</SEQ>
-		<SEQ TYPE="KEYWORD3">'alignment</SEQ>
-		<SEQ TYPE="KEYWORD3">'base</SEQ>
-		<SEQ TYPE="KEYWORD3">'bit_order</SEQ>
-		<SEQ TYPE="KEYWORD3">'body_version</SEQ>
-		<SEQ TYPE="KEYWORD3">'callable</SEQ>
-		<SEQ TYPE="KEYWORD3">'caller</SEQ>
-		<SEQ TYPE="KEYWORD3">'ceiling</SEQ>
-		<SEQ TYPE="KEYWORD3">'class</SEQ>
-		<SEQ TYPE="KEYWORD3">'component_size</SEQ>
-		<SEQ TYPE="KEYWORD3">'compose</SEQ>
-		<SEQ TYPE="KEYWORD3">'constrained</SEQ>
-		<SEQ TYPE="KEYWORD3">'copy_size</SEQ>
-		<SEQ TYPE="KEYWORD3">'count</SEQ>
-		<SEQ TYPE="KEYWORD3">'definite</SEQ>
-		<SEQ TYPE="KEYWORD3">'delta</SEQ>
-		<SEQ TYPE="KEYWORD3">'denorm</SEQ>
-		<SEQ TYPE="KEYWORD3">'digits</SEQ>
-		<SEQ TYPE="KEYWORD3">'exponent</SEQ>
-		<SEQ TYPE="KEYWORD3">'external_tag</SEQ>
-		<SEQ TYPE="KEYWORD3">'first</SEQ>
-		<SEQ TYPE="KEYWORD3">'first_bit</SEQ>
-		<SEQ TYPE="KEYWORD3">'floor</SEQ>
-		<SEQ TYPE="KEYWORD3">'fore</SEQ>
-		<SEQ TYPE="KEYWORD3">'fraction</SEQ>
-		<SEQ TYPE="KEYWORD3">'has_same_storage</SEQ>
-		<SEQ TYPE="KEYWORD3">'identity</SEQ>
-		<SEQ TYPE="KEYWORD3">'image</SEQ>
-		<SEQ TYPE="KEYWORD3">'class'input</SEQ>
-		<SEQ TYPE="KEYWORD3">'input</SEQ>
-		<SEQ TYPE="KEYWORD3">'last</SEQ>
-		<SEQ TYPE="KEYWORD3">'last_bit</SEQ>
-		<SEQ TYPE="KEYWORD3">'leading_part</SEQ>
-		<SEQ TYPE="KEYWORD3">'length</SEQ>
-		<SEQ TYPE="KEYWORD3">'machine</SEQ>
-		<SEQ TYPE="KEYWORD3">'machine_emax</SEQ>
-		<SEQ TYPE="KEYWORD3">'machine_emin</SEQ>
-		<SEQ TYPE="KEYWORD3">'machine_mantissa</SEQ>
-		<SEQ TYPE="KEYWORD3">'machine_overflows</SEQ>
-		<SEQ TYPE="KEYWORD3">'machine_radix</SEQ>
-        <SEQ TYPE="KEYWORD3">'machine_rounding</SEQ>
-		<SEQ TYPE="KEYWORD3">'machine_rounds</SEQ>
-		<SEQ TYPE="KEYWORD3">'max</SEQ>
-		<SEQ TYPE="KEYWORD3">'max_alignment_for_allocation</SEQ>
-		<SEQ TYPE="KEYWORD3">'max_size_in_storage_elements</SEQ>
-		<SEQ TYPE="KEYWORD3">'min</SEQ>
-		<SEQ TYPE="KEYWORD3">'mod</SEQ>
-		<SEQ TYPE="KEYWORD3">'model</SEQ>
-		<SEQ TYPE="KEYWORD3">'model_emin</SEQ>
-		<SEQ TYPE="KEYWORD3">'model_epsilon</SEQ>
-		<SEQ TYPE="KEYWORD3">'model_mantissa</SEQ>
-		<SEQ TYPE="KEYWORD3">'model_small</SEQ>
-		<SEQ TYPE="KEYWORD3">'modulus</SEQ>
-		<SEQ TYPE="KEYWORD3">'old</SEQ>
-		<SEQ TYPE="KEYWORD3">'class'output</SEQ>
-		<SEQ TYPE="KEYWORD3">'output</SEQ>
-		<SEQ TYPE="KEYWORD3">'overlaps_storage</SEQ>
-		<SEQ TYPE="KEYWORD3">'partition_id</SEQ>
-		<SEQ TYPE="KEYWORD3">'pos</SEQ>
-		<SEQ TYPE="KEYWORD3">'position</SEQ>
-		<SEQ TYPE="KEYWORD3">'pred</SEQ>
-		<SEQ TYPE="KEYWORD3">'priority</SEQ>
-		<SEQ TYPE="KEYWORD3">'range</SEQ>
-		<SEQ TYPE="KEYWORD3">'class'read</SEQ>
-		<SEQ TYPE="KEYWORD3">'read</SEQ>
-		<SEQ TYPE="KEYWORD3">'remainder</SEQ>
-		<SEQ TYPE="KEYWORD3">'result</SEQ>
-		<SEQ TYPE="KEYWORD3">'round</SEQ>
-		<SEQ TYPE="KEYWORD3">'rounding</SEQ>
-		<SEQ TYPE="KEYWORD3">'safe_first</SEQ>
-		<SEQ TYPE="KEYWORD3">'safe_last</SEQ>
-		<SEQ TYPE="KEYWORD3">'scale</SEQ>
-		<SEQ TYPE="KEYWORD3">'scaling</SEQ>
-		<SEQ TYPE="KEYWORD3">'signed_zeros</SEQ>
-		<SEQ TYPE="KEYWORD3">'size</SEQ>
-		<SEQ TYPE="KEYWORD3">'small</SEQ>
-		<SEQ TYPE="KEYWORD3">'storage_pool</SEQ>
-		<SEQ TYPE="KEYWORD3">'storage_size</SEQ>
-        <SEQ TYPE="KEYWORD3">'stream_size</SEQ>
-		<SEQ TYPE="KEYWORD3">'succ</SEQ>
-		<SEQ TYPE="KEYWORD3">'tag</SEQ>
-		<SEQ TYPE="KEYWORD3">'terminated</SEQ>
-		<SEQ TYPE="KEYWORD3">'truncation</SEQ>
-		<SEQ TYPE="KEYWORD3">'unbiased_rounding</SEQ>
-		<SEQ TYPE="KEYWORD3">'unchecked_access</SEQ>
-		<SEQ TYPE="KEYWORD3">'val</SEQ>
-		<SEQ TYPE="KEYWORD3">'valid</SEQ>
-		<SEQ TYPE="KEYWORD3">'value</SEQ>
-		<SEQ TYPE="KEYWORD3">'version</SEQ>
-		<SEQ TYPE="KEYWORD3">'wide_image</SEQ>
-		<SEQ TYPE="KEYWORD3">'wide_value</SEQ>
-		<SEQ TYPE="KEYWORD3">'wide_width</SEQ>
-		<SEQ TYPE="KEYWORD3">'width</SEQ>
-        <SEQ TYPE="KEYWORD3">'wide_wide_image</SEQ>
-        <SEQ TYPE="KEYWORD3">'wide_wide_value</SEQ>
-        <SEQ TYPE="KEYWORD3">'wide_wide_width</SEQ>
-		<SEQ TYPE="KEYWORD3">'class'write</SEQ>
-		<SEQ TYPE="KEYWORD3">'write</SEQ>
-        
-        <!-- Predefined Pragmas -->
-        <!-- From Annex L of the Ada Reference Manual. -->
-        <!-- One problem with this definition is that it requires exactly one
-             space between the pragma keyword and the name of the pragma. -->
-        <SEQ TYPE="KEYWORD3">pragma all_calls_remote</SEQ>
-        <SEQ TYPE="KEYWORD3">pragma assert</SEQ>
-        <SEQ TYPE="KEYWORD3">pragma assertion_policy</SEQ>
-        <SEQ TYPE="KEYWORD3">pragma asynchronous</SEQ>
-        <SEQ TYPE="KEYWORD3">pragma atomic</SEQ>
-        <SEQ TYPE="KEYWORD3">pragma atomic_components</SEQ>
-        <SEQ TYPE="KEYWORD3">pragma attach_handler</SEQ>
-        <SEQ TYPE="KEYWORD3">pragma controlled</SEQ>
-        <SEQ TYPE="KEYWORD3">pragma convention</SEQ>
-        <SEQ TYPE="KEYWORD3">pragma cpu</SEQ>
-        <SEQ TYPE="KEYWORD3">pragma default_storage_pool</SEQ>
-        <SEQ TYPE="KEYWORD3">pragma detect_blocking</SEQ>
-        <SEQ TYPE="KEYWORD3">pragma discard_names</SEQ>
-        <SEQ TYPE="KEYWORD3">pragma dispatching_domain</SEQ>
-        <SEQ TYPE="KEYWORD3">pragma elaborate</SEQ>
-        <SEQ TYPE="KEYWORD3">pragma elaborate_all</SEQ>
-        <SEQ TYPE="KEYWORD3">pragma elaborate_body</SEQ>
-        <SEQ TYPE="KEYWORD3">pragma export</SEQ>
-        <SEQ TYPE="KEYWORD3">pragma import</SEQ>
-        <SEQ TYPE="KEYWORD3">pragma independent</SEQ>
-        <SEQ TYPE="KEYWORD3">pragam independent_components</SEQ>
-        <SEQ TYPE="KEYWORD3">pragma inline</SEQ>
-        <SEQ TYPE="KEYWORD3">pragma inspection_point</SEQ>
-        <SEQ TYPE="KEYWORD3">pragma interrupt_handler</SEQ>
-        <SEQ TYPE="KEYWORD3">pragma interrupt_priority</SEQ>
-        <SEQ TYPE="KEYWORD3">pragma linker_options</SEQ>
-        <SEQ TYPE="KEYWORD3">pragma list</SEQ>
-        <SEQ TYPE="KEYWORD3">pragma locking_policy</SEQ>
-        <SEQ TYPE="KEYWORD3">pragma no_return</SEQ>
-        <SEQ TYPE="KEYWORD3">pragma normalize_scalars</SEQ>
-        <SEQ TYPE="KEYWORD3">pragma optimize</SEQ>
-        <SEQ TYPE="KEYWORD3">pragma pack</SEQ>
-        <SEQ TYPE="KEYWORD3">pragma page</SEQ>
-        <SEQ TYPE="KEYWORD3">pragma partition_elaboration_policy</SEQ>
-        <SEQ TYPE="KEYWORD3">pragma preelaborate_initialization</SEQ>
-        <SEQ TYPE="KEYWORD3">pragma preelaborate</SEQ>
-        <SEQ TYPE="KEYWORD3">pragma priority</SEQ>
-        <SEQ TYPE="KEYWORD3">pragma priority_specific_dispatching</SEQ>
-        <SEQ TYPE="KEYWORD3">pragma profile</SEQ>
-        <SEQ TYPE="KEYWORD3">pragma pure</SEQ>
-        <SEQ TYPE="KEYWORD3">pragma queuing_policy</SEQ>
-        <SEQ TYPE="KEYWORD3">pragma relative_deadline</SEQ>
-        <SEQ TYPE="KEYWORD3">pragma remote_call_interface</SEQ>
-        <SEQ TYPE="KEYWORD3">pragma remote_types</SEQ>
-        <SEQ TYPE="KEYWORD3">pragma restrictions</SEQ>
-        <SEQ TYPE="KEYWORD3">pragma reviewable</SEQ>
-        <SEQ TYPE="KEYWORD3">pragma shared_passive</SEQ>
-        <SEQ TYPE="KEYWORD3">pragma storage_size</SEQ>
-        <SEQ TYPE="KEYWORD3">pragma suppress</SEQ>
-        <SEQ TYPE="KEYWORD3">pragma task_dispatching_policy</SEQ>
-        <SEQ TYPE="KEYWORD3">pragma unchecked_union</SEQ>
-        <SEQ TYPE="KEYWORD3">pragma unsuppress</SEQ>
-        <SEQ TYPE="KEYWORD3">pragma volatile</SEQ>
-        <SEQ TYPE="KEYWORD3">pragma volatile_components</SEQ>
-
-		<SPAN TYPE="LITERAL1" NO_LINE_BREAK="TRUE">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-
-		<KEYWORDS>
-			<!-- Reserved words -->
-            <!-- The first three are special. Coloring them differently makes it
-                 easier to locate subprograms in the file. -->
-			<KEYWORD1>entry</KEYWORD1>
-			<KEYWORD1>function</KEYWORD1>
-			<KEYWORD1>procedure</KEYWORD1>
-
-			<KEYWORD2>abort</KEYWORD2>
-			<KEYWORD2>abs</KEYWORD2>
-			<KEYWORD2>abstract</KEYWORD2>
-			<KEYWORD2>accept</KEYWORD2>
-			<KEYWORD2>access</KEYWORD2>
-			<KEYWORD2>aliased</KEYWORD2>
-			<KEYWORD2>all</KEYWORD2>
-			<KEYWORD2>and</KEYWORD2>
-			<KEYWORD2>array</KEYWORD2>
-			<KEYWORD2>at</KEYWORD2>
-			<KEYWORD2>begin</KEYWORD2>
-			<KEYWORD2>body</KEYWORD2>
-			<KEYWORD2>case</KEYWORD2>
-			<KEYWORD2>constant</KEYWORD2>
-			<KEYWORD2>declare</KEYWORD2>
-			<KEYWORD2>delay</KEYWORD2>
-			<KEYWORD2>delta</KEYWORD2>
-			<KEYWORD2>digits</KEYWORD2>
-			<KEYWORD2>do</KEYWORD2>
-			<KEYWORD2>else</KEYWORD2>
-			<KEYWORD2>elsif</KEYWORD2>
-			<KEYWORD2>end</KEYWORD2>
-			<KEYWORD2>exception</KEYWORD2>
-			<KEYWORD2>exit</KEYWORD2>
-			<KEYWORD2>for</KEYWORD2>
-            <KEYWORD2>generic</KEYWORD2>
-			<KEYWORD2>goto</KEYWORD2>
-			<KEYWORD2>if</KEYWORD2>
-			<KEYWORD2>in</KEYWORD2>
-            <KEYWORD2>interface</KEYWORD2>
-			<KEYWORD2>is</KEYWORD2>
-			<KEYWORD2>limited</KEYWORD2>
-			<KEYWORD2>loop</KEYWORD2>
-			<KEYWORD2>mod</KEYWORD2>
-			<KEYWORD2>new</KEYWORD2>
-			<KEYWORD2>not</KEYWORD2>
-            <KEYWORD2>null</KEYWORD2>  <!-- This is also used as an access value. -->
-            <KEYWORD2>of</KEYWORD2>
-			<KEYWORD2>or</KEYWORD2>
-			<KEYWORD2>others</KEYWORD2>
-			<KEYWORD2>out</KEYWORD2>
-            <KEYWORD2>overriding</KEYWORD2>
-			<KEYWORD2>package</KEYWORD2>
-			<KEYWORD3>pragma</KEYWORD3>  <!-- Special case -->
-			<KEYWORD2>private</KEYWORD2>
-			<KEYWORD2>protected</KEYWORD2>
-			<KEYWORD2>raise</KEYWORD2>
-			<KEYWORD2>range</KEYWORD2>
-			<KEYWORD2>record</KEYWORD2>
-			<KEYWORD2>rem</KEYWORD2>
-			<KEYWORD2>renames</KEYWORD2>
-			<KEYWORD2>requeue</KEYWORD2>
-			<KEYWORD2>return</KEYWORD2>
-            <KEYWORD2>reverse</KEYWORD2>
-			<KEYWORD2>select</KEYWORD2>
-			<KEYWORD2>separate</KEYWORD2>
-			<KEYWORD2>some</KEYWORD2>
-			<KEYWORD2>subtype</KEYWORD2>
-            <KEYWORD2>synchronized</KEYWORD2>
-			<KEYWORD2>tagged</KEYWORD2>
-			<KEYWORD2>task</KEYWORD2>
-			<KEYWORD2>terminate</KEYWORD2>
-			<KEYWORD2>then</KEYWORD2>
-			<KEYWORD2>type</KEYWORD2>
-			<KEYWORD2>until</KEYWORD2>
-			<KEYWORD2>use</KEYWORD2>
-			<KEYWORD2>when</KEYWORD2>
-			<KEYWORD2>while</KEYWORD2>
-			<KEYWORD2>with</KEYWORD2>
-			<KEYWORD2>xor</KEYWORD2>
-
-			<!-- Literals -->
-			<LITERAL1>false</LITERAL1>
-			<LITERAL1>true</LITERAL1>
-            
-			<!-- Pre-defined types (in package Standard). -->
-			<LITERAL2>address</LITERAL2>
-			<LITERAL2>boolean</LITERAL2>
-			<LITERAL2>character</LITERAL2>
-			<LITERAL2>duration</LITERAL2>
-			<LITERAL2>float</LITERAL2>
-			<LITERAL2>integer</LITERAL2>
-			<LITERAL2>latin_1</LITERAL2>
-			<LITERAL2>natural</LITERAL2>
-			<LITERAL2>positive</LITERAL2>
-			<LITERAL2>string</LITERAL2>
-			<LITERAL2>time</LITERAL2>
-            <LITERAL2>wide_character</LITERAL2>
-            <LITERAL2>wide_wide_character</LITERAL2>
-            <LITERAL2>wide_string</LITERAL2>
-            <LITERAL2>wide_wide_string</LITERAL2>
-
-      <!-- Pre-defined exceptions (in package Standard). -->
-      <LITERAL2>constraint_error</LITERAL2>
-      <LITERAL2>program_error</LITERAL2>
-      <LITERAL2>storage_error</LITERAL2>
-      <LITERAL2>tasking_error</LITERAL2>
-
-		</KEYWORDS>
-	</RULES>
-</MODE>
-
diff --git a/qpython/src/main/assets/syntax/ada95.xml b/qpython/src/main/assets/syntax/ada95.xml
deleted file mode 100644
index 85cc10fd..00000000
--- a/qpython/src/main/assets/syntax/ada95.xml
+++ /dev/null
@@ -1,224 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="lineComment" VALUE="--" />
-	</PROPS>
-
-	<RULES IGNORE_CASE="TRUE" HIGHLIGHT_DIGITS="TRUE">
-		<!-- Normal comments. -->
-		<EOL_SPAN TYPE="COMMENT1">--</EOL_SPAN>
-
-		<SPAN TYPE="LITERAL1" NO_LINE_BREAK="TRUE">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-		
-		<SEQ TYPE="OPERATOR">)</SEQ>
-		<SEQ TYPE="OPERATOR">(</SEQ>
-		<SEQ TYPE="OPERATOR">..</SEQ>
-		<SEQ TYPE="OPERATOR">.all</SEQ>
-		<SEQ TYPE="OPERATOR">:=</SEQ>
-		<SEQ TYPE="OPERATOR">/=</SEQ>
-		<SEQ TYPE="OPERATOR">=&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">=</SEQ>
-		<SEQ TYPE="NULL">&lt;&gt;</SEQ>
-		<SEQ TYPE="LABEL">&lt;&lt;</SEQ>
-		<SEQ TYPE="LABEL">&gt;&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;=</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;=</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;</SEQ>
-		<SEQ TYPE="OPERATOR">&amp;</SEQ>
-		<SEQ TYPE="OPERATOR">+</SEQ>
-		<SEQ TYPE="OPERATOR">-</SEQ>
-		<SEQ TYPE="OPERATOR">/</SEQ>
-		<SEQ TYPE="OPERATOR">**</SEQ>
-		<SEQ TYPE="OPERATOR">*</SEQ>
-
-		<SEQ TYPE="KEYWORD3">'access</SEQ>
-		<SEQ TYPE="KEYWORD3">'address</SEQ>
-		<SEQ TYPE="KEYWORD3">'adjacent</SEQ>
-		<SEQ TYPE="KEYWORD3">'aft</SEQ>
-		<SEQ TYPE="KEYWORD3">'alignment</SEQ>
-		<SEQ TYPE="KEYWORD3">'base</SEQ>
-		<SEQ TYPE="KEYWORD3">'bit_order</SEQ>
-		<SEQ TYPE="KEYWORD3">'body_version</SEQ>
-		<SEQ TYPE="KEYWORD3">'callable</SEQ>
-		<SEQ TYPE="KEYWORD3">'caller</SEQ>
-		<SEQ TYPE="KEYWORD3">'ceiling</SEQ>
-		<SEQ TYPE="KEYWORD3">'class</SEQ>
-		<SEQ TYPE="KEYWORD3">'component_size</SEQ>
-		<SEQ TYPE="KEYWORD3">'composed</SEQ>
-		<SEQ TYPE="KEYWORD3">'constrained</SEQ>
-		<SEQ TYPE="KEYWORD3">'copy_size</SEQ>
-		<SEQ TYPE="KEYWORD3">'count</SEQ>
-		<SEQ TYPE="KEYWORD3">'definite</SEQ>
-		<SEQ TYPE="KEYWORD3">'delta</SEQ>
-		<SEQ TYPE="KEYWORD3">'denorm</SEQ>
-		<SEQ TYPE="KEYWORD3">'digits</SEQ>
-		<SEQ TYPE="KEYWORD3">'exponent</SEQ>
-		<SEQ TYPE="KEYWORD3">'external_tag</SEQ>
-		<SEQ TYPE="KEYWORD3">'first</SEQ>
-		<SEQ TYPE="KEYWORD3">'first_bit</SEQ>
-		<SEQ TYPE="KEYWORD3">'floor</SEQ>
-		<SEQ TYPE="KEYWORD3">'fore</SEQ>
-		<SEQ TYPE="KEYWORD3">'fraction</SEQ>
-		<SEQ TYPE="KEYWORD3">'genetic</SEQ>
-		<SEQ TYPE="KEYWORD3">'identity</SEQ>
-		<SEQ TYPE="KEYWORD3">'image</SEQ>
-		<SEQ TYPE="KEYWORD3">'input</SEQ>
-		<SEQ TYPE="KEYWORD3">'last</SEQ>
-		<SEQ TYPE="KEYWORD3">'last_bit</SEQ>
-		<SEQ TYPE="KEYWORD3">'leading_part</SEQ>
-		<SEQ TYPE="KEYWORD3">'length</SEQ>
-		<SEQ TYPE="KEYWORD3">'machine</SEQ>
-		<SEQ TYPE="KEYWORD3">'machine_emax</SEQ>
-		<SEQ TYPE="KEYWORD3">'machine_emin</SEQ>
-		<SEQ TYPE="KEYWORD3">'machine_mantissa</SEQ>
-		<SEQ TYPE="KEYWORD3">'machine_overflows</SEQ>
-		<SEQ TYPE="KEYWORD3">'machine_radix</SEQ>
-		<SEQ TYPE="KEYWORD3">'machine_rounds</SEQ>
-		<SEQ TYPE="KEYWORD3">'max</SEQ>
-		<SEQ TYPE="KEYWORD3">'max_size_in_storage_elements</SEQ>
-		<SEQ TYPE="KEYWORD3">'min</SEQ>
-		<SEQ TYPE="KEYWORD3">'model</SEQ>
-		<SEQ TYPE="KEYWORD3">'model_emin</SEQ>
-		<SEQ TYPE="KEYWORD3">'model_epsilon</SEQ>
-		<SEQ TYPE="KEYWORD3">'model_mantissa</SEQ>
-		<SEQ TYPE="KEYWORD3">'model_small</SEQ>
-		<SEQ TYPE="KEYWORD3">'modulus</SEQ>
-		<SEQ TYPE="KEYWORD3">'output</SEQ>
-		<SEQ TYPE="KEYWORD3">'partition_id</SEQ>
-		<SEQ TYPE="KEYWORD3">'pos</SEQ>
-		<SEQ TYPE="KEYWORD3">'position</SEQ>
-		<SEQ TYPE="KEYWORD3">'pred</SEQ>
-		<SEQ TYPE="KEYWORD3">'range</SEQ>
-		<SEQ TYPE="KEYWORD3">'read</SEQ>
-		<SEQ TYPE="KEYWORD3">'remainder</SEQ>
-		<SEQ TYPE="KEYWORD3">'round</SEQ>
-		<SEQ TYPE="KEYWORD3">'rounding</SEQ>
-		<SEQ TYPE="KEYWORD3">'safe_first</SEQ>
-		<SEQ TYPE="KEYWORD3">'safe_last</SEQ>
-		<SEQ TYPE="KEYWORD3">'scale</SEQ>
-		<SEQ TYPE="KEYWORD3">'scaling</SEQ>
-		<SEQ TYPE="KEYWORD3">'signed_zeros</SEQ>
-		<SEQ TYPE="KEYWORD3">'size</SEQ>
-		<SEQ TYPE="KEYWORD3">'small</SEQ>
-		<SEQ TYPE="KEYWORD3">'storage_pool</SEQ>
-		<SEQ TYPE="KEYWORD3">'storage_size</SEQ>
-		<SEQ TYPE="KEYWORD3">'succ</SEQ>
-		<SEQ TYPE="KEYWORD3">'tag</SEQ>
-		<SEQ TYPE="KEYWORD3">'terminated</SEQ>
-		<SEQ TYPE="KEYWORD3">'truncation</SEQ>
-		<SEQ TYPE="KEYWORD3">'unbiased_rounding</SEQ>
-		<SEQ TYPE="KEYWORD3">'unchecked_access</SEQ>
-		<SEQ TYPE="KEYWORD3">'val</SEQ>
-		<SEQ TYPE="KEYWORD3">'valid</SEQ>
-		<SEQ TYPE="KEYWORD3">'value</SEQ>
-		<SEQ TYPE="KEYWORD3">'version</SEQ>
-		<SEQ TYPE="KEYWORD3">'wide_image</SEQ>
-		<SEQ TYPE="KEYWORD3">'wide_value</SEQ>
-		<SEQ TYPE="KEYWORD3">'wide_width</SEQ>
-		<SEQ TYPE="KEYWORD3">'width</SEQ>
-		<SEQ TYPE="KEYWORD3">'write</SEQ>
-
-		<SPAN TYPE="LITERAL1" NO_LINE_BREAK="TRUE">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-
-		<KEYWORDS>
-			<!-- Reserved words -->
-			<KEYWORD1>entry</KEYWORD1>
-			<KEYWORD1>function</KEYWORD1>
-			<KEYWORD1>procedure</KEYWORD1>
-
-			<KEYWORD2>abort</KEYWORD2>
-			<KEYWORD2>abs</KEYWORD2>
-			<KEYWORD2>abstract</KEYWORD2>
-			<KEYWORD2>accept</KEYWORD2>
-			<KEYWORD2>access</KEYWORD2>
-			<KEYWORD2>aliased</KEYWORD2>
-			<KEYWORD2>all</KEYWORD2>
-			<KEYWORD2>and</KEYWORD2>
-			<KEYWORD2>array</KEYWORD2>
-			<KEYWORD2>at</KEYWORD2>
-			<KEYWORD2>begin</KEYWORD2>
-			<KEYWORD2>body</KEYWORD2>
-			<KEYWORD2>case</KEYWORD2>
-			<KEYWORD2>constant</KEYWORD2>
-			<KEYWORD2>declare</KEYWORD2>
-			<KEYWORD2>delay</KEYWORD2>
-			<KEYWORD2>delta</KEYWORD2>
-			<KEYWORD2>digits</KEYWORD2>
-			<KEYWORD2>do</KEYWORD2>
-			<KEYWORD2>else</KEYWORD2>
-			<KEYWORD2>elsif</KEYWORD2>
-			<KEYWORD2>end</KEYWORD2>
-			<KEYWORD2>exception</KEYWORD2>
-			<KEYWORD2>exit</KEYWORD2>
-			<KEYWORD2>for</KEYWORD2>
-			<KEYWORD2>goto</KEYWORD2>
-			<KEYWORD2>if</KEYWORD2>
-			<KEYWORD2>in</KEYWORD2>
-			<KEYWORD2>is</KEYWORD2>
-			<KEYWORD2>limited</KEYWORD2>
-			<KEYWORD2>loop</KEYWORD2>
-			<KEYWORD2>mod</KEYWORD2>
-			<KEYWORD2>new</KEYWORD2>
-			<KEYWORD2>not</KEYWORD2>
-			<KEYWORD2>or</KEYWORD2>
-			<KEYWORD2>others</KEYWORD2>
-			<KEYWORD2>out</KEYWORD2>
-			<KEYWORD2>package</KEYWORD2>
-			<KEYWORD2>pragma</KEYWORD2>
-			<KEYWORD2>private</KEYWORD2>
-			<KEYWORD2>protected</KEYWORD2>
-			<KEYWORD2>raise</KEYWORD2>
-			<KEYWORD2>range</KEYWORD2>
-			<KEYWORD2>record</KEYWORD2>
-			<KEYWORD2>rem</KEYWORD2>
-			<KEYWORD2>renames</KEYWORD2>
-			<KEYWORD2>requeue</KEYWORD2>
-			<KEYWORD2>return</KEYWORD2>
-			<KEYWORD2>select</KEYWORD2>
-			<KEYWORD2>separate</KEYWORD2>
-			<KEYWORD2>string</KEYWORD2>
-			<KEYWORD2>subtype</KEYWORD2>
-			<KEYWORD2>tagged</KEYWORD2>
-			<KEYWORD2>task</KEYWORD2>
-			<KEYWORD2>terminate</KEYWORD2>
-			<KEYWORD2>then</KEYWORD2>
-			<KEYWORD2>type</KEYWORD2>
-			<KEYWORD2>until</KEYWORD2>
-			<KEYWORD2>use</KEYWORD2>
-			<KEYWORD2>when</KEYWORD2>
-			<KEYWORD2>while</KEYWORD2>
-			<KEYWORD2>with</KEYWORD2>
-			<KEYWORD2>xor</KEYWORD2>
-
-			<!-- Attributes -->
-
-			<!-- Common Pre-defined Types -->
-			<LITERAL2>address</LITERAL2>
-			<LITERAL2>boolean</LITERAL2>
-			<LITERAL2>character</LITERAL2>
-			<LITERAL2>duration</LITERAL2>
-			<LITERAL2>float</LITERAL2>
-			<LITERAL2>integer</LITERAL2>
-			<LITERAL2>latin_1</LITERAL2>
-			<LITERAL2>natural</LITERAL2>
-			<LITERAL2>positive</LITERAL2>
-			<LITERAL2>string</LITERAL2>
-			<LITERAL2>time</LITERAL2>
-
-			<!-- Literals -->
-			<LITERAL1>false</LITERAL1>
-			<LITERAL1>null</LITERAL1>
-			<LITERAL1>true</LITERAL1>
-		</KEYWORDS>
-	</RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/ans_forth94.xml b/qpython/src/main/assets/syntax/ans_forth94.xml
deleted file mode 100644
index 1dc39b62..00000000
--- a/qpython/src/main/assets/syntax/ans_forth94.xml
+++ /dev/null
@@ -1,586 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!--
-
-    ANS Forth 94 Syntax Highlighting Mode File for jEdit.
-    
-    Copyright (C) 2014, Mark Corbin (mark@dibsco.co.uk)
-
-
-    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
-
--->
-
-<!--
-
-Token Usage:
-
-COMMENT1        Range and line comments.
-COMMENT2        Tasks (FIXME TODO NOTE and XXX).
-DIGIT           All numbers (single, double and floating point).
-FUNCTION        Word definitions and references.
-INVALID         Obsolete Forth keywords (all ANS wordsets).
-KEYWORD1        Forth Keywords (all ANS wordsets).
-KEYWORD2        Variables.
-LITERAL1        Strings.
-LITERAL2        Character literals.
-LITERAL3        Constants.
-
--->
-
-<!--
-
-Recommended catalog file entry:
-
-<MODE NAME="ans-forth94"        FILE="ans_forth94.xml"
-                                FILE_NAME_GLOB="*.4th" />
-
--->
-
-<MODE>
-  <PROPS>
-    <PROPERTY NAME="commentStart" VALUE="(" />
-    <PROPERTY NAME="commentEnd" VALUE=")" />
-    <PROPERTY NAME="lineComment" VALUE="\" />
-
-    <PROPERTY NAME="indentNextLines" VALUE="((^|\s+)(:|begin|case|else)($|\s+.*))|((^|.*\s+)(do|\?do|of|if)($|\s+.*))" />
-    <PROPERTY NAME="unindentThisLine" VALUE="(^|\s+)(;|again|repeat|until|endcase|else|loop|\+loop|endof|then)($|\s+.*)" />
-    <PROPERTY NAME="unindentNextLines" VALUE="(^|\s+)(;|again|repeat|until|endcase|else|loop|\+loop|endof|then)($|\s+.*)" />
-    <PROPERTY NAME="electricKeys" VALUE=";eflnopt" />
-  </PROPS>
-
-  <RULES IGNORE_CASE="TRUE"
-         NO_WORD_SEP="!£$%^&amp;#&apos;~|\(){}*+,-./_=@:;&lt;&gt;&quot;?[]"
-         HIGHLIGHT_DIGITS="TRUE"
-         DIGIT_RE="((^|\s+)([-]?[0-9]+)($|\s+))|((^|\s+)([-]?[0-9]+[.][0-9]*)($|\s+))|((^|\s+)(([+]|[-])?([0-9]+[.]?[0-9]*)(E|e)([+]|[-])?([0-9]*))($|\s+))">
-
-    <!-- Line Comments. -->
-    <EOL_SPAN_REGEXP TYPE="KEYWORD1"
-                     AT_WORD_START="TRUE"
-                     DELEGATE="LINE-COMMENT">\\($|\s+)</EOL_SPAN_REGEXP>
-
-    <!-- Range Comments. -->
-    <SPAN_REGEXP TYPE="KEYWORD1"
-                 AT_WORD_START="TRUE"
-                 DELEGATE="RANGE-COMMENT">
-      <BEGIN>\(($|\s+)</BEGIN>
-      <END REGEXP="TRUE">(?=\))</END>
-    </SPAN_REGEXP>
-
-    <!-- Quoted Strings. -->
-    <SPAN_REGEXP TYPE="KEYWORD1"
-                 AT_WORD_START="TRUE"
-                 DELEGATE="STRING">
-      <BEGIN>([.]&quot;|ABORT&quot;|S&quot;|C&quot;)($|\s+)</BEGIN>
-      <END REGEXP="TRUE">(?=&quot;)</END>
-    </SPAN_REGEXP>
-
-    <!-- Parsed Strings. -->
-    <SPAN_REGEXP TYPE="KEYWORD1" 
-                 AT_WORD_START="TRUE"
-                 NO_LINE_BREAK="TRUE"
-                 DELEGATE="STRING">
-      <BEGIN>(WORD|PARSE)($|\s+)</BEGIN>
-      <END REGEXP="TRUE">\s+</END>
-    </SPAN_REGEXP>
-
-    <!-- Display Strings. -->
-    <SPAN_REGEXP TYPE="KEYWORD1"
-                 AT_WORD_START="TRUE"
-                 DELEGATE="STRING">
-      <BEGIN>[.]\(($|\s+)</BEGIN>
-      <END REGEXP="TRUE">(?=\))</END>
-    </SPAN_REGEXP>
-
-    <!-- Character Literals. -->
-    <SPAN_REGEXP TYPE="KEYWORD1"
-                    AT_WORD_START="TRUE"
-                    NO_LINE_BREAK="TRUE"
-                    DELEGATE="LITERAL">
-      <BEGIN>(CHAR|\[CHAR\])($|\s+)</BEGIN>
-      <END REGEXP="TRUE">\s+</END>
-    </SPAN_REGEXP>
-
-    <!-- Word Definitions and References. -->
-    <SPAN_REGEXP TYPE="KEYWORD1"
-                    AT_WORD_START="TRUE"
-                    NO_LINE_BREAK="TRUE"
-                    DELEGATE="WORD">
-      <BEGIN>(:|'|CREATE|POSTPONE|MARKER|\[COMPILE\]|CODE|SEE)($|\s+)</BEGIN>
-      <END REGEXP="TRUE">\s+</END>
-    </SPAN_REGEXP>
-
-    <!-- Obsolete Keywords. -->
-    <SPAN_REGEXP TYPE="INVALID"
-                    AT_WORD_START="TRUE"
-                    NO_LINE_BREAK="TRUE"
-                    DELEGATE="WORD">
-      <BEGIN>FORGET($|\s+)</BEGIN>
-      <END REGEXP="TRUE">\s+</END>
-    </SPAN_REGEXP>
-
-    <!-- Variables. -->
-    <SPAN_REGEXP TYPE="KEYWORD1"
-                    AT_WORD_START="TRUE"
-                    NO_LINE_BREAK="TRUE"
-                    DELEGATE="VARIABLE">
-      <BEGIN>(VARIABLE|TO|VALUE|2VARIABLE|FVARIABLE)($|\s+)</BEGIN>
-      <END REGEXP="TRUE">\s+</END>
-    </SPAN_REGEXP>
-
-    <!-- Local Variables. -->
-    <SPAN_REGEXP TYPE="KEYWORD1"
-                    AT_WORD_START="TRUE"
-                    NO_LINE_BREAK="TRUE"
-                    DELEGATE="VARIABLE">
-      <BEGIN>(LOCALS\|)($|\s+)</BEGIN>
-      <END REGEXP="TRUE">(?=\|)</END>
-    </SPAN_REGEXP>
-
-    <!-- Constants. -->
-    <SPAN_REGEXP TYPE="KEYWORD1"
-                    AT_WORD_START="TRUE"
-                    NO_LINE_BREAK="TRUE"
-                    DELEGATE="CONSTANT">
-      <BEGIN>(CONSTANT|2CONSTANT|FCONSTANT)($|\s+)</BEGIN>
-      <END REGEXP="TRUE">\s+</END>
-    </SPAN_REGEXP>
-
-    <KEYWORDS>
-      <!-- Core Keywords -->
-      <KEYWORD1>!</KEYWORD1>
-      <KEYWORD1>#</KEYWORD1>
-      <KEYWORD1>#&gt;</KEYWORD1> <!-- #> -->
-      <KEYWORD1>#S</KEYWORD1>
-      <KEYWORD1>&apos;</KEYWORD1> <!-- ' -->
-      <KEYWORD1>(</KEYWORD1>
-      <KEYWORD1>)</KEYWORD1> <!-- Added to delimit range comments. -->
-      <KEYWORD1>*</KEYWORD1>
-      <KEYWORD1>*/</KEYWORD1>
-      <KEYWORD1>*/MOD</KEYWORD1>
-      <KEYWORD1>+</KEYWORD1>
-      <KEYWORD1>+!</KEYWORD1>
-      <KEYWORD1>+LOOP</KEYWORD1>
-      <KEYWORD1>,</KEYWORD1>
-      <KEYWORD1>-</KEYWORD1>
-      <KEYWORD1>.</KEYWORD1>
-      <KEYWORD1>.&quot;</KEYWORD1> <!-- ." -->
-      <KEYWORD1>&quot;</KEYWORD1> <!-- Added to delimit strings. -->
-      <KEYWORD1>/</KEYWORD1>
-      <KEYWORD1>/MOD</KEYWORD1>
-      <KEYWORD1>0&lt;</KEYWORD1> <!-- 0< -->
-      <KEYWORD1>0=</KEYWORD1>
-      <KEYWORD1>1+</KEYWORD1>
-      <KEYWORD1>1-</KEYWORD1>
-      <KEYWORD1>2!</KEYWORD1>
-      <KEYWORD1>2*</KEYWORD1>
-      <KEYWORD1>2/</KEYWORD1>
-      <KEYWORD1>2@</KEYWORD1>
-      <KEYWORD1>2DROP</KEYWORD1>
-      <KEYWORD1>2DUP</KEYWORD1>
-      <KEYWORD1>2OVER</KEYWORD1>
-      <KEYWORD1>2SWAP</KEYWORD1>
-      <KEYWORD1>:</KEYWORD1>
-      <KEYWORD1>;</KEYWORD1>
-      <KEYWORD1>&lt;</KEYWORD1> <!-- < -->
-      <KEYWORD1>&lt;#</KEYWORD1> <!-- <# -->
-      <KEYWORD1>=</KEYWORD1>
-      <KEYWORD1>&gt;</KEYWORD1> <!-- > -->
-      <KEYWORD1>&gt;BODY</KEYWORD1> <!-- >BODY -->
-      <KEYWORD1>&gt;IN</KEYWORD1> <!-- >IN -->
-      <KEYWORD1>&gt;NUMBER</KEYWORD1> <!-- >NUMBER -->
-      <KEYWORD1>&gt;R</KEYWORD1> <!-- >R -->
-      <KEYWORD1>?DUP</KEYWORD1>
-      <KEYWORD1>@</KEYWORD1>
-      <KEYWORD1>ABORT</KEYWORD1>
-      <KEYWORD1>ABORT&quot;</KEYWORD1> <!-- ABORT" -->
-      <KEYWORD1>ABS</KEYWORD1>
-      <KEYWORD1>ACCEPT</KEYWORD1>
-      <KEYWORD1>ALIGN</KEYWORD1>
-      <KEYWORD1>ALIGNED</KEYWORD1>
-      <KEYWORD1>ALLOT</KEYWORD1>
-      <KEYWORD1>AND</KEYWORD1>
-      <KEYWORD1>BASE</KEYWORD1>
-      <KEYWORD1>BEGIN</KEYWORD1>
-      <KEYWORD1>BL</KEYWORD1>
-      <KEYWORD1>C!</KEYWORD1>
-      <KEYWORD1>C,</KEYWORD1>
-      <KEYWORD1>C@</KEYWORD1>
-      <KEYWORD1>CELL+</KEYWORD1>
-      <KEYWORD1>CELLS</KEYWORD1>
-      <KEYWORD1>CHAR</KEYWORD1>
-      <KEYWORD1>CHAR+</KEYWORD1>
-      <KEYWORD1>CHARS</KEYWORD1>
-      <KEYWORD1>CONSTANT</KEYWORD1>
-      <KEYWORD1>COUNT</KEYWORD1>
-      <KEYWORD1>CR</KEYWORD1>
-      <KEYWORD1>CREATE</KEYWORD1>
-      <KEYWORD1>DECIMAL</KEYWORD1>
-      <KEYWORD1>DEPTH</KEYWORD1>
-      <KEYWORD1>DO</KEYWORD1>
-      <KEYWORD1>DOES&gt;</KEYWORD1> <!-- DOES> -->
-      <KEYWORD1>DROP</KEYWORD1>
-      <KEYWORD1>DUP</KEYWORD1>
-      <KEYWORD1>ELSE</KEYWORD1>
-      <KEYWORD1>EMIT</KEYWORD1>
-      <KEYWORD1>ENVIRONMENT?</KEYWORD1>
-      <KEYWORD1>EVALUATE</KEYWORD1>
-      <KEYWORD1>EXECUTE</KEYWORD1>
-      <KEYWORD1>EXIT</KEYWORD1>
-      <KEYWORD1>FILL</KEYWORD1>
-      <KEYWORD1>FIND</KEYWORD1>
-      <KEYWORD1>FM/MOD</KEYWORD1>
-      <KEYWORD1>HERE</KEYWORD1>
-      <KEYWORD1>HOLD</KEYWORD1>
-      <KEYWORD1>I</KEYWORD1>
-      <KEYWORD1>IF</KEYWORD1>
-      <KEYWORD1>IMMEDIATE</KEYWORD1>
-      <KEYWORD1>INVERT</KEYWORD1>
-      <KEYWORD1>J</KEYWORD1>
-      <KEYWORD1>KEY</KEYWORD1>
-      <KEYWORD1>LEAVE</KEYWORD1>
-      <KEYWORD1>LITERAL</KEYWORD1>
-      <KEYWORD1>LOOP</KEYWORD1>
-      <KEYWORD1>LSHIFT</KEYWORD1>
-      <KEYWORD1>M*</KEYWORD1>
-      <KEYWORD1>MAX</KEYWORD1>
-      <KEYWORD1>MIN</KEYWORD1>
-      <KEYWORD1>MOD</KEYWORD1>
-      <KEYWORD1>MOVE</KEYWORD1>
-      <KEYWORD1>NEGATE</KEYWORD1>
-      <KEYWORD1>OR</KEYWORD1>
-      <KEYWORD1>OVER</KEYWORD1>
-      <KEYWORD1>POSTPONE</KEYWORD1>
-      <KEYWORD1>QUIT</KEYWORD1>
-      <KEYWORD1>R&gt;</KEYWORD1> <!-- R> -->
-      <KEYWORD1>R@</KEYWORD1>
-      <KEYWORD1>RECURSE</KEYWORD1>
-      <KEYWORD1>REPEAT</KEYWORD1>
-      <KEYWORD1>ROT</KEYWORD1>
-      <KEYWORD1>RSHIFT</KEYWORD1>
-      <KEYWORD1>S&quot;</KEYWORD1> <!-- S" -->
-      <KEYWORD1>S&gt;D</KEYWORD1> <!-- S>D -->
-      <KEYWORD1>SIGN</KEYWORD1>
-      <KEYWORD1>SM/REM</KEYWORD1>
-      <KEYWORD1>SOURCE</KEYWORD1>
-      <KEYWORD1>SPACE</KEYWORD1>
-      <KEYWORD1>SPACES</KEYWORD1>
-      <KEYWORD1>STATE</KEYWORD1>
-      <KEYWORD1>SWAP</KEYWORD1>
-      <KEYWORD1>THEN</KEYWORD1>
-      <KEYWORD1>TYPE</KEYWORD1>
-      <KEYWORD1>U.</KEYWORD1>
-      <KEYWORD1>U&lt;</KEYWORD1> <!-- U< -->
-      <KEYWORD1>UM*</KEYWORD1>
-      <KEYWORD1>UM/MOD</KEYWORD1>
-      <KEYWORD1>UNLOOP</KEYWORD1>
-      <KEYWORD1>UNTIL</KEYWORD1>
-      <KEYWORD1>VARIABLE</KEYWORD1>
-      <KEYWORD1>WHILE</KEYWORD1>
-      <KEYWORD1>WORD</KEYWORD1>
-      <KEYWORD1>XOR</KEYWORD1>
-      <KEYWORD1>[</KEYWORD1>
-      <KEYWORD1>[&apos;]</KEYWORD1> <!-- ['] -->
-      <KEYWORD1>[CHAR]</KEYWORD1>
-      <KEYWORD1>]</KEYWORD1>
-      <!-- Core Extension Keywords -->
-      <KEYWORD1>.(</KEYWORD1>
-      <KEYWORD1>.R</KEYWORD1>
-      <KEYWORD1>0&lt;&gt;</KEYWORD1> <!-- 0<> -->
-      <KEYWORD1>0&gt;</KEYWORD1> <!-- 0> -->
-      <KEYWORD1>2&gt;R</KEYWORD1> <!-- 2>R -->
-      <KEYWORD1>2R&gt;</KEYWORD1> <!-- 2R> -->
-      <KEYWORD1>2R@</KEYWORD1>
-      <KEYWORD1>:NONAME</KEYWORD1>
-      <KEYWORD1>&lt;&gt;</KEYWORD1> <!-- <> -->
-      <KEYWORD1>?DO</KEYWORD1>
-      <KEYWORD1>AGAIN</KEYWORD1>
-      <KEYWORD1>C&quot;</KEYWORD1> <!-- C" -->
-      <KEYWORD1>CASE</KEYWORD1>
-      <KEYWORD1>COMPILE,</KEYWORD1>
-      <KEYWORD1>ENDCASE</KEYWORD1>
-      <KEYWORD1>ENDOF</KEYWORD1>
-      <KEYWORD1>ERASE</KEYWORD1>
-      <KEYWORD1>FALSE</KEYWORD1>
-      <KEYWORD1>HEX</KEYWORD1>
-      <KEYWORD1>MARKER</KEYWORD1>
-      <KEYWORD1>NIP</KEYWORD1>
-      <KEYWORD1>OF</KEYWORD1>
-      <KEYWORD1>PAD</KEYWORD1>
-      <KEYWORD1>PARSE</KEYWORD1>
-      <KEYWORD1>PICK</KEYWORD1>
-      <KEYWORD1>REFILL</KEYWORD1>
-      <KEYWORD1>RESTORE-INPUT</KEYWORD1>
-      <KEYWORD1>ROLL</KEYWORD1>
-      <KEYWORD1>SAVE-INPUT</KEYWORD1>
-      <KEYWORD1>SOURCE-ID</KEYWORD1>
-      <KEYWORD1>TO</KEYWORD1>
-      <KEYWORD1>TRUE</KEYWORD1>
-      <KEYWORD1>TUCK</KEYWORD1>
-      <KEYWORD1>U.R</KEYWORD1>
-      <KEYWORD1>U&gt;</KEYWORD1> <!-- U> -->
-      <KEYWORD1>UNUSED</KEYWORD1>
-      <KEYWORD1>VALUE</KEYWORD1>
-      <KEYWORD1>WITHIN</KEYWORD1>
-      <KEYWORD1>[COMPILE]</KEYWORD1>
-      <KEYWORD1>\</KEYWORD1>
-      <!-- Obsolete Core Extension Keywords -->
-      <INVALID>#TIB</INVALID>
-      <INVALID>CONVERT</INVALID>
-      <INVALID>EXPECT</INVALID>
-      <INVALID>QUERY</INVALID>
-      <INVALID>SPAN</INVALID>
-      <INVALID>TIB</INVALID>
-      <!-- Block Keywords -->
-      <KEYWORD1>BLK</KEYWORD1>
-      <KEYWORD1>BLOCK</KEYWORD1>
-      <KEYWORD1>BUFFER</KEYWORD1>
-      <KEYWORD1>EVALUATE</KEYWORD1>
-      <KEYWORD1>FLUSH</KEYWORD1>
-      <KEYWORD1>LOAD</KEYWORD1>
-      <KEYWORD1>SAVE-BUFFERS</KEYWORD1>
-      <KEYWORD1>UPDATE</KEYWORD1>
-      <!-- Block Extension Keywords -->
-      <KEYWORD1>EMPTY-BUFFERS</KEYWORD1>
-      <KEYWORD1>LIST</KEYWORD1>
-      <KEYWORD1>REFILL</KEYWORD1>
-      <KEYWORD1>SCR</KEYWORD1>
-      <KEYWORD1>THRU</KEYWORD1>
-      <KEYWORD1>\</KEYWORD1>
-      <!-- Double Keywords -->
-      <KEYWORD1>2CONSTANT</KEYWORD1>
-      <KEYWORD1>2LITERAL</KEYWORD1>
-      <KEYWORD1>2VARIABLE</KEYWORD1>
-      <KEYWORD1>D+</KEYWORD1>
-      <KEYWORD1>D-</KEYWORD1>
-      <KEYWORD1>D.</KEYWORD1>
-      <KEYWORD1>D.R</KEYWORD1>
-      <KEYWORD1>D0&lt;</KEYWORD1> <!-- D0< -->
-      <KEYWORD1>D0=</KEYWORD1>
-      <KEYWORD1>D2*</KEYWORD1>
-      <KEYWORD1>D2/</KEYWORD1>
-      <KEYWORD1>D&lt;</KEYWORD1> <!-- D< -->
-      <KEYWORD1>D=</KEYWORD1>
-      <KEYWORD1>D&gt;S</KEYWORD1> <!-- D>S -->
-      <KEYWORD1>DABS</KEYWORD1>
-      <KEYWORD1>DMAX</KEYWORD1>
-      <KEYWORD1>DMIN</KEYWORD1>
-      <KEYWORD1>DNEGATE</KEYWORD1>
-      <KEYWORD1>M*/</KEYWORD1>
-      <KEYWORD1>M+</KEYWORD1>
-      <!-- Double Extension Keywords -->
-      <KEYWORD1>2ROT</KEYWORD1>
-      <KEYWORD1>DU&lt;</KEYWORD1> <!-- DU< -->
-      <!-- Exception Keywords -->
-      <KEYWORD1>CATCH</KEYWORD1>
-      <KEYWORD1>THROW</KEYWORD1>
-      <!-- Exception Extension Keywords -->
-      <KEYWORD1>ABORT</KEYWORD1>
-      <KEYWORD1>ABORT&quot;</KEYWORD1> <!-- ABORT" -->
-      <!-- Facility Keywords -->
-      <KEYWORD1>AT-XY</KEYWORD1>
-      <KEYWORD1>KEY?</KEYWORD1>
-      <KEYWORD1>PAGE</KEYWORD1>
-      <!-- Facility Extension Keywords -->
-      <KEYWORD1>EKEY</KEYWORD1>
-      <KEYWORD1>EKEY&gt;CHAR</KEYWORD1> <!-- EKEY>CHAR -->
-      <KEYWORD1>EKEY?</KEYWORD1>
-      <KEYWORD1>EMIT?</KEYWORD1>
-      <KEYWORD1>MS</KEYWORD1>
-      <KEYWORD1>TIME&amp;DATE</KEYWORD1> <!-- TIME&DATE -->
-      <!-- File Keywords -->
-      <KEYWORD1>(</KEYWORD1>
-      <KEYWORD1>BIN</KEYWORD1>
-      <KEYWORD1>CLOSE-FILE</KEYWORD1>
-      <KEYWORD1>CREATE-FILE</KEYWORD1>
-      <KEYWORD1>DELETE-FILE</KEYWORD1>
-      <KEYWORD1>FILE-POSITION</KEYWORD1>
-      <KEYWORD1>FILE-SIZE</KEYWORD1>
-      <KEYWORD1>INCLUDE-FILE</KEYWORD1>
-      <KEYWORD1>INCLUDED</KEYWORD1>
-      <KEYWORD1>OPEN-FILE</KEYWORD1>
-      <KEYWORD1>R/O</KEYWORD1>
-      <KEYWORD1>R/W</KEYWORD1>
-      <KEYWORD1>READ-FILE</KEYWORD1>
-      <KEYWORD1>READ-LINE</KEYWORD1>
-      <KEYWORD1>REPOSITION-FILE</KEYWORD1>
-      <KEYWORD1>RESIZE-FILE</KEYWORD1>
-      <KEYWORD1>S&quot;</KEYWORD1> <!-- S" -->
-      <KEYWORD1>SOURCE-ID</KEYWORD1>
-      <KEYWORD1>W/O</KEYWORD1>
-      <KEYWORD1>WRITE-FILE</KEYWORD1>
-      <KEYWORD1>WRITE-LINE</KEYWORD1>
-      <!-- File Extension Keywords -->
-      <KEYWORD1>FILE-STATUS</KEYWORD1>
-      <KEYWORD1>FLUSH-FILE</KEYWORD1>
-      <KEYWORD1>REFILL</KEYWORD1>
-      <KEYWORD1>RENAME-FILE</KEYWORD1>
-      <!-- Floating Keywords -->
-      <KEYWORD1>&gt;FLOAT</KEYWORD1> <!-- >FLOAT -->
-      <KEYWORD1>D&gt;F</KEYWORD1> <!-- D>F -->
-      <KEYWORD1>F!</KEYWORD1>
-      <KEYWORD1>F*</KEYWORD1>
-      <KEYWORD1>F+</KEYWORD1>
-      <KEYWORD1>F-</KEYWORD1>
-      <KEYWORD1>F/</KEYWORD1>
-      <KEYWORD1>F0&lt;</KEYWORD1> <!-- F0< -->
-      <KEYWORD1>F0=</KEYWORD1>
-      <KEYWORD1>F&lt;</KEYWORD1> <!-- F< -->
-      <KEYWORD1>F&gt;D</KEYWORD1> <!-- F>D -->
-      <KEYWORD1>F@</KEYWORD1>
-      <KEYWORD1>FALIGN</KEYWORD1>
-      <KEYWORD1>FALIGNED</KEYWORD1>
-      <KEYWORD1>FCONSTANT</KEYWORD1>
-      <KEYWORD1>FDEPTH</KEYWORD1>
-      <KEYWORD1>FDROP</KEYWORD1>
-      <KEYWORD1>FDUP</KEYWORD1>
-      <KEYWORD1>FLITERAL</KEYWORD1>
-      <KEYWORD1>FLOAT+</KEYWORD1>
-      <KEYWORD1>FLOATS</KEYWORD1>
-      <KEYWORD1>FLOOR</KEYWORD1>
-      <KEYWORD1>FMAX</KEYWORD1>
-      <KEYWORD1>FMIN</KEYWORD1>
-      <KEYWORD1>FNEGATE</KEYWORD1>
-      <KEYWORD1>FOVER</KEYWORD1>
-      <KEYWORD1>FROT</KEYWORD1>
-      <KEYWORD1>FROUND</KEYWORD1>
-      <KEYWORD1>FSWAP</KEYWORD1>
-      <KEYWORD1>FVARIABLE</KEYWORD1>
-      <KEYWORD1>REPRESENT</KEYWORD1>
-      <!-- Floating Extension Keywords -->
-      <KEYWORD1>DF!</KEYWORD1>
-      <KEYWORD1>DF@</KEYWORD1>
-      <KEYWORD1>DFALIGN</KEYWORD1>
-      <KEYWORD1>DFALIGNED</KEYWORD1>
-      <KEYWORD1>DFLOAT+</KEYWORD1>
-      <KEYWORD1>DFLOATS</KEYWORD1>
-      <KEYWORD1>F**</KEYWORD1>
-      <KEYWORD1>F.</KEYWORD1>
-      <KEYWORD1>FABS</KEYWORD1>
-      <KEYWORD1>FACOS</KEYWORD1>
-      <KEYWORD1>FACOSH</KEYWORD1>
-      <KEYWORD1>FALOG</KEYWORD1>
-      <KEYWORD1>FASIN</KEYWORD1>
-      <KEYWORD1>FASINH</KEYWORD1>
-      <KEYWORD1>FATAN</KEYWORD1>
-      <KEYWORD1>FATAN2</KEYWORD1>
-      <KEYWORD1>FATANH</KEYWORD1>
-      <KEYWORD1>FCOS</KEYWORD1>
-      <KEYWORD1>FCOSH</KEYWORD1>
-      <KEYWORD1>FE.</KEYWORD1>
-      <KEYWORD1>FEXP</KEYWORD1>
-      <KEYWORD1>FEXPM1</KEYWORD1>
-      <KEYWORD1>FLN</KEYWORD1>
-      <KEYWORD1>FLNP1</KEYWORD1>
-      <KEYWORD1>FLOG</KEYWORD1>
-      <KEYWORD1>FS.</KEYWORD1>
-      <KEYWORD1>FSIN</KEYWORD1>
-      <KEYWORD1>FSINCOS</KEYWORD1>
-      <KEYWORD1>FSINH</KEYWORD1>
-      <KEYWORD1>FSQRT</KEYWORD1>
-      <KEYWORD1>FTAN</KEYWORD1>
-      <KEYWORD1>FTANH</KEYWORD1>
-      <KEYWORD1>F~</KEYWORD1>
-      <KEYWORD1>PRECISION</KEYWORD1>
-      <KEYWORD1>SET-PRECISION</KEYWORD1>
-      <KEYWORD1>SF!</KEYWORD1>
-      <KEYWORD1>SF@</KEYWORD1>
-      <KEYWORD1>SFALIGN</KEYWORD1>
-      <KEYWORD1>SFALIGNED</KEYWORD1>
-      <KEYWORD1>SFLOAT+</KEYWORD1>
-      <KEYWORD1>SFLOATS</KEYWORD1>
-      <!-- Local Keywords -->
-      <KEYWORD1>(LOCAL)</KEYWORD1>
-      <KEYWORD1>TO</KEYWORD1>
-      <!-- Local Extension Keywords -->
-      <KEYWORD1>LOCALS|</KEYWORD1>
-      <KEYWORD1>|</KEYWORD1> <!-- Added to delimit local variables. -->
-      <!-- Memory Keywords -->
-      <KEYWORD1>ALLOCATE</KEYWORD1>
-      <KEYWORD1>FREE</KEYWORD1>
-      <KEYWORD1>RESIZE</KEYWORD1>
-      <!-- Tools Keywords -->
-      <KEYWORD1>.S</KEYWORD1>
-      <KEYWORD1>?</KEYWORD1>
-      <KEYWORD1>DUMP</KEYWORD1>
-      <KEYWORD1>SEE</KEYWORD1>
-      <KEYWORD1>WORDS</KEYWORD1>
-      <!-- Tools Extension Keywords -->
-      <KEYWORD1>;CODE</KEYWORD1>
-      <KEYWORD1>AHEAD</KEYWORD1>
-      <KEYWORD1>ASSEMBLER</KEYWORD1>
-      <KEYWORD1>BYE</KEYWORD1>
-      <KEYWORD1>CODE</KEYWORD1>
-      <KEYWORD1>CS-PICK</KEYWORD1>
-      <KEYWORD1>CS-ROLL</KEYWORD1>
-      <KEYWORD1>EDITOR</KEYWORD1>
-      <KEYWORD1>STATE</KEYWORD1>
-      <KEYWORD1>[ELSE]</KEYWORD1>
-      <KEYWORD1>[IF]</KEYWORD1>
-      <KEYWORD1>[THEN]</KEYWORD1>
-      <!-- Obsolete Tools Extension Keywords -->
-      <INVALID>FORGET</INVALID>
-      <!-- Search Keywords -->
-      <KEYWORD1>DEFINITIONS</KEYWORD1>
-      <KEYWORD1>FIND</KEYWORD1>
-      <KEYWORD1>FORTH-WORDLIST</KEYWORD1>
-      <KEYWORD1>GET-CURRENT</KEYWORD1>
-      <KEYWORD1>GET-ORDER</KEYWORD1>
-      <KEYWORD1>SEARCH-WORDLIST</KEYWORD1>
-      <KEYWORD1>SET-CURRENT</KEYWORD1>
-      <KEYWORD1>SET-ORDER</KEYWORD1>
-      <KEYWORD1>WORDLIST</KEYWORD1>
-      <!-- Search Extension Keywords -->
-      <KEYWORD1>ALSO</KEYWORD1>
-      <KEYWORD1>FORTH</KEYWORD1>
-      <KEYWORD1>ONLY</KEYWORD1>
-      <KEYWORD1>ORDER</KEYWORD1>
-      <KEYWORD1>PREVIOUS</KEYWORD1>
-      <!-- String Keywords -->
-      <KEYWORD1>-TRAILING</KEYWORD1>
-      <KEYWORD1>/STRING</KEYWORD1>
-      <KEYWORD1>BLANK</KEYWORD1>
-      <KEYWORD1>CMOVE</KEYWORD1>
-      <KEYWORD1>CMOVE&gt;</KEYWORD1> <!-- CMOVE> -->
-      <KEYWORD1>COMPARE</KEYWORD1>
-      <KEYWORD1>SEARCH</KEYWORD1>
-      <KEYWORD1>SLITERAL</KEYWORD1>
-    </KEYWORDS>
-  </RULES>
-
-  <RULES SET="RANGE-COMMENT" IGNORE_CASE="TRUE" DEFAULT="COMMENT1" HIGHLIGHT_DIGITS="FALSE">
-    <IMPORT DELEGATE="IN-COMMENT" />
-  </RULES>
-
-  <RULES SET="LINE-COMMENT" IGNORE_CASE="TRUE" DEFAULT="COMMENT1" HIGHLIGHT_DIGITS="FALSE">
-    <IMPORT DELEGATE="IN-COMMENT" />
-  </RULES>
-
-  <RULES SET="IN-COMMENT" IGNORE_CASE="TRUE" HIGHLIGHT_DIGITS="FALSE">
-    <SEQ_REGEXP TYPE="COMMENT2">(FIXME|TODO|NOTE|XXX)(:|$|\s+)</SEQ_REGEXP>
-  </RULES>
-
-  <RULES SET="STRING" IGNORE_CASE="TRUE" DEFAULT="LITERAL1" HIGHLIGHT_DIGITS="FALSE" />
-
-  <RULES SET="LITERAL" IGNORE_CASE="TRUE" DEFAULT="LITERAL2" HIGHLIGHT_DIGITS="FALSE" />
-
-  <RULES SET="WORD" IGNORE_CASE="TRUE" DEFAULT="FUNCTION" HIGHLIGHT_DIGITS="FALSE" />
-
-  <RULES SET="VARIABLE" IGNORE_CASE="TRUE" DEFAULT="KEYWORD2" HIGHLIGHT_DIGITS="FALSE" />
-
-  <RULES SET="CONSTANT" IGNORE_CASE="TRUE" DEFAULT="LITERAL3" HIGHLIGHT_DIGITS="FALSE" />
-</MODE>
diff --git a/qpython/src/main/assets/syntax/ant.xml b/qpython/src/main/assets/syntax/ant.xml
deleted file mode 100644
index 53e9ed1c..00000000
--- a/qpython/src/main/assets/syntax/ant.xml
+++ /dev/null
@@ -1,346 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="commentStart" VALUE="&lt;!--" />
-		<PROPERTY NAME="commentEnd" VALUE="--&gt;" />
-	</PROPS>
-	<!-- {{{ MAIN -->
-	<RULES>
-		<SPAN TYPE="MARKUP" DELEGATE="SQL">
-			<BEGIN>&lt;transaction</BEGIN>
-			<END>&lt;/transaction&gt;</END>
-		</SPAN>
-		
-		<!-- ant variables -->
-		<SPAN TYPE="KEYWORD3">
-			<BEGIN>${</BEGIN>
-			<END>}</END>
-		</SPAN>
-		
-		<!-- SGML comment -->
-		<SPAN TYPE="COMMENT1">
-			<BEGIN>&lt;!--</BEGIN>
-			<END>--&gt;</END>
-		</SPAN>
-
-		<!-- DTD Entity declarations -->
-		<SPAN TYPE="KEYWORD2" DELEGATE="ENTITY-TAGS">
-			<BEGIN>&lt;!ENTITY</BEGIN>
-			<END>&gt;</END>
-		</SPAN>
-
-		<!-- CDATA sections -->
-		<SPAN TYPE="KEYWORD2" DELEGATE="CDATA">
-			<BEGIN>&lt;![CDATA[</BEGIN>
-			<END>]]&gt;</END>
-		</SPAN>
-
-		<!-- DTD instructions -->
-		<SPAN TYPE="KEYWORD2" DELEGATE="DTD-TAGS">
-			<BEGIN>&lt;!</BEGIN>
-			<END>&gt;</END>
-		</SPAN>
-
-		<!-- PI directives -->
-		<SPAN TYPE="KEYWORD3">
-			<BEGIN>&lt;?</BEGIN>
-			<END>&gt;</END>
-		</SPAN>
-
-		<!-- markup tags -->
-		<SPAN TYPE="MARKUP" DELEGATE="TAGS">
-			<BEGIN>&lt;</BEGIN>
-			<END>&gt;</END>
-		</SPAN>
-
-		<!-- SGML entities -->
-		<SPAN TYPE="LITERAL2" NO_WORD_BREAK="TRUE">
-			<BEGIN>&amp;</BEGIN>
-			<END>;</END>
-		</SPAN>
-	</RULES>
-	<!-- }}} -->
-	
-	<!-- {{{ TAGS -->
-	<RULES SET="TAGS" DEFAULT="MARKUP" NO_WORD_SEP="-_">
-		<!-- SGML comment -->
-		<SPAN TYPE="COMMENT1">
-			<BEGIN>&lt;!--</BEGIN>
-			<END>--&gt;</END>
-		</SPAN>
-
-		<SPAN TYPE="LITERAL1" DELEGATE="STRING">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-
-		<SPAN TYPE="LITERAL1" DELEGATE="STRING">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-
-		<SEQ TYPE="MARKUP" DELEGATE="STRING">"</SEQ>
-
-		<SEQ TYPE="MARKUP" DELEGATE="ant::MAIN">/></SEQ>
-		<MARK_PREVIOUS TYPE="LABEL">:</MARK_PREVIOUS>
-		<SEQ TYPE="OPERATOR">:</SEQ>
-		<KEYWORDS>
-			<KEYWORD1>target</KEYWORD1>
-			
-			<KEYWORD2>project</KEYWORD2>
-			
-			<KEYWORD3>description</KEYWORD3>
-			<KEYWORD3>loadfile</KEYWORD3>
-			<KEYWORD3>loadproperties</KEYWORD3>
-			<KEYWORD3>property</KEYWORD3>
-			<KEYWORD3>xmlproperty</KEYWORD3>
-			
-			<KEYWORD4>fileset</KEYWORD4>
-			<KEYWORD4>filelist</KEYWORD4>
-			<KEYWORD4>include</KEYWORD4>
-			<KEYWORD4>exclude</KEYWORD4>
-			<KEYWORD4>filter</KEYWORD4>
-			<KEYWORD4>filterchain</KEYWORD4>
-			<KEYWORD4>path</KEYWORD4>
-			<KEYWORD4>pathelement</KEYWORD4>
-			<KEYWORD4>classpath</KEYWORD4>
-         
-         <!-- condition subelements -->
-         <KEYWORD4>istrue</KEYWORD4>
-			
-			<OPERATOR>equals</OPERATOR>
-			<OPERATOR>and</OPERATOR>
-			<OPERATOR>or</OPERATOR>
-			<OPERATOR>not</OPERATOR>
-			<OPERATOR>=</OPERATOR>
-			
-			<!-- basic file tasks -->
-			<FUNCTION>chmod</FUNCTION>
-			<FUNCTION>checksum</FUNCTION>
-			<FUNCTION>concat</FUNCTION>
-			<FUNCTION>copy</FUNCTION>
-			<FUNCTION>delete</FUNCTION>
-			<FUNCTION>echo</FUNCTION>
-			<FUNCTION>exec</FUNCTION>
-			<FUNCTION>import</FUNCTION>
-			<FUNCTION>input</FUNCTION>
-			<FUNCTION>mkdir</FUNCTION>
-			<FUNCTION>move</FUNCTION>
-			<FUNCTION>patch</FUNCTION>
-			<FUNCTION>tempfile</FUNCTION>
-			<FUNCTION>touch</FUNCTION>
-			
-			<!-- java specific tasks -->
-			<FUNCTION>java</FUNCTION>
-			<FUNCTION>javac</FUNCTION>
-			<FUNCTION>javadoc</FUNCTION>
-			<FUNCTION>junit</FUNCTION>
-			<FUNCTION>rmic</FUNCTION>
-			<FUNCTION>signjar</FUNCTION>
-			
-			<!-- archive tasks -->
-			<FUNCTION>bzip2</FUNCTION>
-			<FUNCTION>bunzip2</FUNCTION>
-			<FUNCTION>ear</FUNCTION>
-			<FUNCTION>gzip</FUNCTION>
-			<FUNCTION>gunzip</FUNCTION>
-			<FUNCTION>jar</FUNCTION>
-			<FUNCTION>unjar</FUNCTION>
-			<FUNCTION>manifest</FUNCTION>
-			<FUNCTION>tar</FUNCTION>
-			<FUNCTION>untar</FUNCTION>
-			<FUNCTION>war</FUNCTION>
-			<FUNCTION>unwar</FUNCTION>
-			<FUNCTION>zip</FUNCTION>
-			<FUNCTION>unzip</FUNCTION>
-			
-			<!-- execution tasks -->
-			<FUNCTION>ant</FUNCTION>
-			<FUNCTION>antcall</FUNCTION>
-			<FUNCTION>apply</FUNCTION>
-			<FUNCTION>dependset</FUNCTION>
-			<FUNCTION>fail</FUNCTION>
-			<FUNCTION>parallel</FUNCTION>
-			<FUNCTION>sequential</FUNCTION>
-			<FUNCTION>sleep</FUNCTION>
-			<FUNCTION>waitfor</FUNCTION>
-			
-			<!-- misc tasks -->
-			<FUNCTION>antstructure</FUNCTION>
-			<FUNCTION>available</FUNCTION>
-         <FUNCTION>condition</FUNCTION>
-			<FUNCTION>cvs</FUNCTION>
-			<FUNCTION>cvschangelog</FUNCTION>
-			<FUNCTION>cvspass</FUNCTION>
-			<FUNCTION>cvstagdiff</FUNCTION>
-			<FUNCTION>get</FUNCTION>
-			<FUNCTION>mail</FUNCTION>
-			<FUNCTION>replace</FUNCTION>
-			<FUNCTION>sql</FUNCTION>
-			<FUNCTION>style</FUNCTION>
-			<FUNCTION>taskdef</FUNCTION>
-			<FUNCTION>tstamp</FUNCTION>
-			<FUNCTION>typedef</FUNCTION>
-			<FUNCTION>xslt</FUNCTION>
-         
-         <!-- antelope tasks -->
-			<FUNCTION>assert</FUNCTION>
-			<FUNCTION>call</FUNCTION>
-			<FUNCTION>else</FUNCTION>
-			<FUNCTION>find</FUNCTION>
-			<FUNCTION>grep</FUNCTION>
-			<FUNCTION>if</FUNCTION>
-			<FUNCTION>new</FUNCTION>
-			<FUNCTION>post</FUNCTION>
-			<FUNCTION>repeat</FUNCTION>
-			<FUNCTION>suite</FUNCTION>
-			<FUNCTION>testcase</FUNCTION>
-			<FUNCTION>unset</FUNCTION>
-			<FUNCTION>var</FUNCTION>
-			
-			<!-- deprecated tasks -->
-			<INVALID>copydir</INVALID>
-			<INVALID>copyfile</INVALID>
-			<INVALID>deltree</INVALID>
-			<INVALID>execOn</INVALID>
-			<INVALID>javadoc2</INVALID>
-			<INVALID>rename</INVALID>
-		</KEYWORDS>
-	</RULES>
-	<!-- }}} -->
-	
-	<!-- {{{ DTD-TAGS -->
-	<RULES SET="DTD-TAGS" DEFAULT="KEYWORD2" IGNORE_CASE="FALSE">
-		<!-- SGML comment -->
-		<SPAN TYPE="COMMENT1">
-			<BEGIN>&lt;!--</BEGIN>
-			<END>--&gt;</END>
-		</SPAN>
-
-		<!-- SGML comment -->
-		<SPAN TYPE="COMMENT1">
-			<BEGIN>--</BEGIN>
-			<END>--</END>
-		</SPAN>
-
-		<!-- Parameter entities -->
-		<SPAN TYPE="LITERAL2" NO_WORD_BREAK="TRUE">
-			<BEGIN>%</BEGIN>
-			<END>;</END>
-		</SPAN>
-
-		<SPAN TYPE="LITERAL1">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-
-		<SPAN TYPE="LITERAL1">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-
-		<!-- This appears in some SGML documents -->
-		<SPAN TYPE="KEYWORD2" DELEGATE="MAIN">
-			<BEGIN>[</BEGIN>
-			<END>]</END>
-		</SPAN>
-
-		<SEQ TYPE="OPERATOR">(</SEQ>
-		<SEQ TYPE="OPERATOR">)</SEQ>
-		<SEQ TYPE="OPERATOR">|</SEQ>
-		<SEQ TYPE="OPERATOR">?</SEQ>
-		<SEQ TYPE="OPERATOR">*</SEQ>
-		<SEQ TYPE="OPERATOR">+</SEQ>
-		<SEQ TYPE="OPERATOR">,</SEQ>
-
-		<KEYWORDS>
-			<KEYWORD1>CDATA</KEYWORD1>
-			<KEYWORD1>EMPTY</KEYWORD1>
-			<KEYWORD1>INCLUDE</KEYWORD1>
-			<KEYWORD1>IGNORE</KEYWORD1>
-			<KEYWORD1>NDATA</KEYWORD1>
-			<KEYWORD1>#IMPLIED</KEYWORD1>
-			<KEYWORD1>#PCDATA</KEYWORD1>
-			<KEYWORD1>#REQUIRED</KEYWORD1>
-		</KEYWORDS>
-	</RULES>
-	<!-- }}} -->
-	
-	<!-- {{{ ENTITY-TAGS -->
-	<RULES SET="ENTITY-TAGS" DEFAULT="KEYWORD2">
-		<!-- SGML comment -->
-		<SPAN TYPE="COMMENT1">
-			<BEGIN>&lt;!--</BEGIN>
-			<END>--&gt;</END>
-		</SPAN>
-
-		<!-- SGML comment -->
-		<SPAN TYPE="COMMENT1">
-			<BEGIN>--</BEGIN>
-			<END>--</END>
-		</SPAN>
-
-		<SPAN TYPE="LITERAL1">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-
-		<SPAN TYPE="LITERAL1">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-
-		<SEQ TYPE="OPERATOR">=</SEQ>
-
-		<SEQ TYPE="OPERATOR">%</SEQ>
-
-		<KEYWORDS>
-			<KEYWORD1>SYSTEM</KEYWORD1>
-		</KEYWORDS>
-	</RULES>
-	<!-- }}} -->
-	
-	<!-- {{{ CDATA -->
-	<RULES SET="CDATA" DEFAULT="COMMENT2">
-		<!-- no rules -->
-	</RULES>
-	<!-- }}} -->
-	
-	<!-- {{{ STRING -->
-	<RULES SET="STRING" DEFAULT="LITERAL1">
-		<!-- ant property -->
-		<SPAN TYPE="KEYWORD3">
-			<BEGIN>${</BEGIN>
-			<END>}</END>
-		</SPAN>
-
-		<SPAN TYPE="LITERAL2" NO_WORD_BREAK="TRUE">
-			<BEGIN>&amp;</BEGIN>
-			<END>;</END>
-		</SPAN>
-		<KEYWORDS>
-			<LITERAL2>true</LITERAL2>
-			<LITERAL2>yes</LITERAL2>
-			<LITERAL2>false</LITERAL2>
-		</KEYWORDS>
-	</RULES>
-	<!-- }}} -->
-	
-	<RULES SET="SQL" DEFAULT="MARKUP">
-		<SEQ TYPE="MARKUP" DELEGATE="MAIN">/&gt;</SEQ>
-		<!--
-      <SEQ TYPE="MARKUP" DELEGATE="MySQL::MAIN">&gt;</SEQ>
-      -->
-		<!-- handle <transaction src="..."> properly -->
-		<SEQ TYPE="MARKUP" DELEGATE="BACK_TO_XML"> </SEQ>
-	</RULES>
-	
-	<RULES SET="BACK_TO_XML" DEFAULT="MARKUP">
-		<SEQ TYPE="MARKUP" DELEGATE="ant::TAGS">&gt;</SEQ>
-	</RULES>
-</MODE>
-
- 	  	 
diff --git a/qpython/src/main/assets/syntax/antlr.xml b/qpython/src/main/assets/syntax/antlr.xml
deleted file mode 100644
index fbac3554..00000000
--- a/qpython/src/main/assets/syntax/antlr.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!--
-        This mode file describes the ANTLR syntax definition language.
-        It is derived from and tested with the ANTLR syntax rules specified in
-        antlr.g included with the ANTLR distribution.
-        
-        Portions of this file from java.xml.
-        
-        Author: Brant Gurganus <brantgurga@users.sourceforge.net>
--->
-<MODE>
-        <PROPS>
-                <PROPERTY NAME="commentStart" VALUE="/*" />
-                <PROPERTY NAME="commentEnd" VALUE="*/" />
-                <PROPERTY NAME="lineComment" VALUE="//" />
-                <PROPERTY NAME="wordBreakChars" VALUE="" />
-        </PROPS>
-        <RULES>
-		<SPAN TYPE="COMMENT2" DELEGATE="java::JAVADOC">
-			<BEGIN>/**</BEGIN>
-			<END>*/</END>
-		</SPAN>
-                <SPAN TYPE="COMMENT1">
-                        <BEGIN>/*</BEGIN>
-                        <END>*/</END>
-                </SPAN>
-                <EOL_SPAN TYPE="COMMENT1">//</EOL_SPAN>
-                <SPAN TYPE="LITERAL1" ESCAPE="\">
-                        <BEGIN>"</BEGIN>
-                        <END>"</END>
-                </SPAN>
-                <SPAN TYPE="LITERAL1" ESCAPE="\">
-                        <BEGIN>'</BEGIN>
-                        <END>'</END>
-                </SPAN>
-                <SEQ TYPE="OPERATOR">|</SEQ>
-                <SEQ TYPE="OPERATOR">:</SEQ>
-                <KEYWORDS>
-                        <KEYWORD3>header</KEYWORD3>
-                        <KEYWORD3>options</KEYWORD3>
-                        <KEYWORD3>tokens</KEYWORD3>
-                        <KEYWORD1>abstract</KEYWORD1>
-			<KEYWORD1>break</KEYWORD1>
-			<KEYWORD1>case</KEYWORD1>
-			<KEYWORD1>catch</KEYWORD1>
-			<KEYWORD1>continue</KEYWORD1>
-			<KEYWORD1>default</KEYWORD1>
-			<KEYWORD1>do</KEYWORD1>
-			<KEYWORD1>else</KEYWORD1>
-			<KEYWORD1>extends</KEYWORD1>
-			<KEYWORD1>final</KEYWORD1>
-			<KEYWORD1>finally</KEYWORD1>
-			<KEYWORD1>for</KEYWORD1>
-			<KEYWORD1>if</KEYWORD1>
-			<KEYWORD1>implements</KEYWORD1>
-			<KEYWORD1>instanceof</KEYWORD1>
-			<KEYWORD1>native</KEYWORD1>
-			<KEYWORD1>new</KEYWORD1>
-			<KEYWORD1>private</KEYWORD1>
-			<KEYWORD1>protected</KEYWORD1>
-			<KEYWORD1>public</KEYWORD1>
-			<KEYWORD1>return</KEYWORD1>
-			<KEYWORD1>static</KEYWORD1>
-			<KEYWORD1>switch</KEYWORD1>
-			<KEYWORD1>synchronized</KEYWORD1>
-			<KEYWORD1>throw</KEYWORD1>
-			<KEYWORD1>throws</KEYWORD1>
-			<KEYWORD1>transient</KEYWORD1>
-			<KEYWORD1>try</KEYWORD1>
-			<KEYWORD1>volatile</KEYWORD1>
-			<KEYWORD1>while</KEYWORD1>
-			<KEYWORD1>package</KEYWORD1>
-			<KEYWORD1>import</KEYWORD1>
-
-			<KEYWORD2>boolean</KEYWORD2>
-			<KEYWORD2>byte</KEYWORD2>
-			<KEYWORD2>char</KEYWORD2>
-			<KEYWORD2>class</KEYWORD2>
-			<KEYWORD2>double</KEYWORD2>
-			<KEYWORD2>float</KEYWORD2>
-			<KEYWORD2>int</KEYWORD2>
-			<KEYWORD2>interface</KEYWORD2>
-			<KEYWORD2>long</KEYWORD2>
-			<KEYWORD2>short</KEYWORD2>
-			<KEYWORD2>void</KEYWORD2>
-
-			<FUNCTION>assert</FUNCTION>
-			<KEYWORD1>strictfp</KEYWORD1>
-
-			<LITERAL2>false</LITERAL2>
-			<LITERAL2>null</LITERAL2>
-			<LITERAL2>super</LITERAL2>
-			<LITERAL2>this</LITERAL2>
-			<LITERAL2>true</LITERAL2>
-
-			<INVALID>goto</INVALID>
-			<INVALID>const</INVALID>
-                </KEYWORDS>
-	</RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/antlr4.xml b/qpython/src/main/assets/syntax/antlr4.xml
deleted file mode 100644
index 08e47c9d..00000000
--- a/qpython/src/main/assets/syntax/antlr4.xml
+++ /dev/null
@@ -1,131 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE MODE SYSTEM "xmode.dtd"><!--  -->
-
-
-<!--
-    This mode file describes the ANTLR 4 syntax definition language as
-    described in the book "The Definitive ANTLR 4 Reference" by Terrence Parr.
--->
-<MODE>
-    <PROPS>
-        <PROPERTY NAME="commentStart" VALUE="/*" />
-        <PROPERTY NAME="commentEnd" VALUE="*/" />
-        <PROPERTY NAME="lineComment" VALUE="//" />
-        <PROPERTY NAME="wordBreakChars" VALUE="" />
-    </PROPS>
-    <RULES IGNORE_CASE="FALSE"
-		HIGHLIGHT_DIGITS="TRUE"
-		DIGIT_RE="(0[lL]?|[1-9]\d{0,9}(\d{0,9}[lL])?|0[xX]\p{XDigit}{1,8}(\p{XDigit}{0,8}[lL])?|0[0-7]{1,11}([0-7]{0,11}[lL])?|([0-9]+\.[0-9]*|\.[0-9]+)([eE][+-]?[0-9]+)?[fFdD]?|[0-9]+([eE][+-]?[0-9]+[fFdD]?|([eE][+-]?[0-9]+)?[fFdD]))">
-        
-        <!-- Antlr comments are the same as java comments -->
-        <SPAN TYPE="COMMENT2" DELEGATE="java::JAVADOC">
-            <BEGIN>/**</BEGIN>
-            <END>*/</END>
-        </SPAN>
-        <SPAN TYPE="COMMENT1">
-            <BEGIN>/*</BEGIN>
-            <END>*/</END>
-        </SPAN>
-        <EOL_SPAN TYPE="COMMENT1">//</EOL_SPAN>
-
-        <!-- string literal -->
-        <SPAN TYPE="LITERAL1" ESCAPE="\" NO_LINE_BREAK="TRUE">
-            <BEGIN>'</BEGIN>
-            <END>'</END>
-        </SPAN>
-
-        <!-- rule 'operators' -->
-        <SEQ TYPE="OPERATOR">|</SEQ>
-        <SEQ TYPE="OPERATOR">:</SEQ>
-		<SEQ TYPE="OPERATOR">}</SEQ>
-		<SEQ TYPE="OPERATOR">{</SEQ>
-
-        <!-- rule action -->
-        <MARK_FOLLOWING TYPE="KEYWORD4">@</MARK_FOLLOWING>
-        
-        <!-- lexer rules -->
-        <SEQ_REGEXP HASH_CHARS="ABCDEFGHIJKLMNOPQRSTUVWXYZ" AT_LINE_START="TRUE"
- 		   TYPE="KEYWORD2">[A-Z][a-zA-Z_]+</SEQ_REGEXP>
- 
-        <!-- parser rules -->
-        <SEQ_REGEXP HASH_CHARS="abcdefghijklmnopqrstuvwxyz" AT_LINE_START="TRUE"
- 		   TYPE="KEYWORD2">[a-z][a-zA-Z_]+</SEQ_REGEXP>
- 
-        
-        <KEYWORDS>
-            <KEYWORD1>catch</KEYWORD1>
-            <KEYWORD1>finally</KEYWORD1>
-            <KEYWORD1>fragment</KEYWORD1>
-            <KEYWORD1>grammar</KEYWORD1>
-            <KEYWORD1>import</KEYWORD1>
-            <KEYWORD1>lexer</KEYWORD1>
-            <KEYWORD1>locals</KEYWORD1>
-            <KEYWORD1>mode</KEYWORD1>
-            <KEYWORD1>options</KEYWORD1>
-            <KEYWORD1>parser</KEYWORD1>
-            <KEYWORD1>private</KEYWORD1>
-            <KEYWORD1>protected</KEYWORD1>
-            <KEYWORD1>public</KEYWORD1>
-            <KEYWORD1>returns</KEYWORD1>
-            <KEYWORD1>throws</KEYWORD1>
-            <KEYWORD4>tokens</KEYWORD4>
-
-            <!-- the following are not Antlr keywords, but since Antlr actions
-            include java keywords, these are useful. These are copied from
-            the java mode file. -->
-			<KEYWORD1>assert</KEYWORD1>
-			<KEYWORD1>break</KEYWORD1>
-			<KEYWORD1>case</KEYWORD1>
-			<KEYWORD1>continue</KEYWORD1>
-			<KEYWORD1>default</KEYWORD1>
-			<KEYWORD1>do</KEYWORD1>
-			<KEYWORD1>else</KEYWORD1>
-			<KEYWORD1>for</KEYWORD1>
-			<KEYWORD1>if</KEYWORD1>
-			<KEYWORD1>instanceof</KEYWORD1>
-			<KEYWORD1>new</KEYWORD1>
-			<KEYWORD1>return</KEYWORD1>
-			<KEYWORD1>strictfp</KEYWORD1>
-			<KEYWORD1>switch</KEYWORD1>
-			<KEYWORD1>throw</KEYWORD1>
-			<KEYWORD1>try</KEYWORD1>
-			<KEYWORD1>while</KEYWORD1>
-
-			<KEYWORD2>abstract</KEYWORD2>
-			<KEYWORD2>enum</KEYWORD2>
-			<KEYWORD2>extends</KEYWORD2>
-			<KEYWORD2>final</KEYWORD2>
-			<KEYWORD2>implements</KEYWORD2>
-			<KEYWORD2>import</KEYWORD2> 
-			<KEYWORD2>native</KEYWORD2>
-			<KEYWORD2>package</KEYWORD2>
-			<KEYWORD2>static</KEYWORD2>
-			<KEYWORD2>synchronized</KEYWORD2>
-			<KEYWORD2>throws</KEYWORD2>
-			<KEYWORD2>transient</KEYWORD2>
-			<KEYWORD2>volatile</KEYWORD2>
-			<KEYWORD3>void</KEYWORD3>
-
-			<KEYWORD3>boolean</KEYWORD3>
-			<KEYWORD3>byte</KEYWORD3>
-			<KEYWORD3>char</KEYWORD3>
-			<KEYWORD3>class</KEYWORD3>
-			<KEYWORD3>double</KEYWORD3>
-			<KEYWORD3>float</KEYWORD3>
-			<KEYWORD3>int</KEYWORD3>
-			<KEYWORD3>interface</KEYWORD3>
-			<KEYWORD3>long</KEYWORD3>
-			<KEYWORD3>short</KEYWORD3>
-
-			<LITERAL2>false</LITERAL2>
-			<LITERAL2>null</LITERAL2>
-			<LITERAL2>super</LITERAL2>
-			<LITERAL2>this</LITERAL2>
-			<LITERAL2>true</LITERAL2>
-
-            <INVALID>goto</INVALID>
-            <INVALID>const</INVALID>
-        </KEYWORDS>
-    </RULES>
-    
-</MODE>
diff --git a/qpython/src/main/assets/syntax/apacheconf.xml b/qpython/src/main/assets/syntax/apacheconf.xml
deleted file mode 100644
index 290c1704..00000000
--- a/qpython/src/main/assets/syntax/apacheconf.xml
+++ /dev/null
@@ -1,1007 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="lineComment" VALUE="#" />
-		<PROPERTY NAME="noWordSep" VALUE="-" />
-	</PROPS>
-	<RULES HIGHLIGHT_DIGITS="FALSE" IGNORE_CASE="TRUE">
-
-		<EOL_SPAN TYPE="COMMENT1">#</EOL_SPAN>
-
-		<SPAN TYPE="LITERAL1" ESCAPE="\" NO_LINE_BREAK="TRUE">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-
-		<SPAN_REGEXP HASH_CHAR="&lt;VirtualHost" TYPE="MARKUP" DELEGATE="VHOST">
-			<BEGIN><![CDATA[<(VirtualHost)[^>]*>]]></BEGIN>
-			<END><![CDATA[</$1>]]></END>
-		</SPAN_REGEXP>
-
-		<SPAN_REGEXP HASH_CHAR="&lt;" TYPE="MARKUP" DELEGATE="DIRECTIVE">
-			<BEGIN><![CDATA[<(\w+)[^>]*>]]></BEGIN>
-			<END><![CDATA[</$1>]]></END>
-		</SPAN_REGEXP>
-
-		<KEYWORDS>
-			<KEYWORD1>AcceptMutex</KEYWORD1>
-			<KEYWORD1>AcceptPathInfo</KEYWORD1>
-			<KEYWORD1>AccessFileName</KEYWORD1>
-			<KEYWORD1>Action</KEYWORD1>
-			<KEYWORD1>AddAlt</KEYWORD1>
-			<KEYWORD1>AddAltByEncoding</KEYWORD1>
-			<KEYWORD1>AddAltByType</KEYWORD1>
-			<KEYWORD1>AddCharset</KEYWORD1>
-			<KEYWORD1>AddDefaultCharset</KEYWORD1>
-			<KEYWORD1>AddDescription</KEYWORD1>
-			<KEYWORD1>AddEncoding</KEYWORD1>
-			<KEYWORD1>AddHandler</KEYWORD1>
-			<KEYWORD1>AddIcon</KEYWORD1>
-			<KEYWORD1>AddIconByEncoding</KEYWORD1>
-			<KEYWORD1>AddIconByType</KEYWORD1>
-			<KEYWORD1>AddInputFilter</KEYWORD1>
-			<KEYWORD1>AddLanguage</KEYWORD1>
-			<KEYWORD1>AddModuleInfo</KEYWORD1>
-			<KEYWORD1>AddOutputFilter</KEYWORD1>
-			<KEYWORD1>AddOutputFilterByType</KEYWORD1>
-			<KEYWORD1>AddType</KEYWORD1>
-			<KEYWORD1>Alias</KEYWORD1>
-			<KEYWORD1>AliasMatch</KEYWORD1>
-			<KEYWORD1>AllowCONNECT</KEYWORD1>
-			<KEYWORD1>AllowEncodedSlashes</KEYWORD1>
-			<KEYWORD1>AuthDigestNcCheck</KEYWORD1>
-			<KEYWORD1>AuthDigestShmemSize</KEYWORD1>
-			<KEYWORD1>AuthLDAPCharsetConfig</KEYWORD1>
-			<KEYWORD1>BS2000Account</KEYWORD1>
-			<KEYWORD1>BrowserMatch</KEYWORD1>
-			<KEYWORD1>BrowserMatchNoCase</KEYWORD1>
-			<KEYWORD1>CacheDefaultExpire</KEYWORD1>
-			<KEYWORD1>CacheDirLength</KEYWORD1>
-			<KEYWORD1>CacheDirLevels</KEYWORD1>
-			<KEYWORD1>CacheDisable</KEYWORD1>
-			<KEYWORD1>CacheEnable</KEYWORD1>
-			<KEYWORD1>CacheExpiryCheck</KEYWORD1>
-			<KEYWORD1>CacheFile</KEYWORD1>
-			<KEYWORD1>CacheForceCompletion</KEYWORD1>
-			<KEYWORD1>CacheGcClean</KEYWORD1>
-			<KEYWORD1>CacheGcDaily</KEYWORD1>
-			<KEYWORD1>CacheGcInterval</KEYWORD1>
-			<KEYWORD1>CacheGcMemUsage</KEYWORD1>
-			<KEYWORD1>CacheGcUnused</KEYWORD1>
-			<KEYWORD1>CacheIgnoreCacheControl</KEYWORD1>
-			<KEYWORD1>CacheIgnoreNoLastMod</KEYWORD1>
-			<KEYWORD1>CacheLastModifiedFactor</KEYWORD1>
-			<KEYWORD1>CacheMaxExpire</KEYWORD1>
-			<KEYWORD1>CacheMaxFileSize</KEYWORD1>
-			<KEYWORD1>CacheMinFileSize</KEYWORD1>
-			<KEYWORD1>CacheNegotiatedDocs</KEYWORD1>
-			<KEYWORD1>CacheRoot</KEYWORD1>
-			<KEYWORD1>CacheSize</KEYWORD1>
-			<KEYWORD1>CacheTimeMargin</KEYWORD1>
-			<KEYWORD1>CharsetDefault</KEYWORD1>
-			<KEYWORD1>CharsetOptions</KEYWORD1>
-			<KEYWORD1>CharsetSourceEnc</KEYWORD1>
-			<KEYWORD1>CheckSpelling</KEYWORD1>
-			<KEYWORD1>ChildPerUserID</KEYWORD1>
-			<KEYWORD1>ContentDigest</KEYWORD1>
-			<KEYWORD1>CookieDomain</KEYWORD1>
-			<KEYWORD1>CookieExpires</KEYWORD1>
-			<KEYWORD1>CookieLog</KEYWORD1>
-			<KEYWORD1>CookieName</KEYWORD1>
-			<KEYWORD1>CookieStyle</KEYWORD1>
-			<KEYWORD1>CookieTracking</KEYWORD1>
-			<KEYWORD1>CoreDumpDirectory</KEYWORD1>
-			<KEYWORD1>CustomLog</KEYWORD1>
-			<KEYWORD1>DavDepthInfinity</KEYWORD1>
-			<KEYWORD1>DavLockDB</KEYWORD1>
-			<KEYWORD1>DavMinTimeout</KEYWORD1>
-			<KEYWORD1>DefaultIcon</KEYWORD1>
-			<KEYWORD1>DefaultLanguage</KEYWORD1>
-			<KEYWORD1>DefaultType</KEYWORD1>
-			<KEYWORD1>DeflateBufferSize</KEYWORD1>
-			<KEYWORD1>DeflateCompressionLevel</KEYWORD1>
-			<KEYWORD1>DeflateFilterNote</KEYWORD1>
-			<KEYWORD1>DeflateMemLevel</KEYWORD1>
-			<KEYWORD1>DeflateWindowSize</KEYWORD1>
-			<KEYWORD1>DirectoryIndex</KEYWORD1>
-			<KEYWORD1>DirectorySlash</KEYWORD1>
-			<KEYWORD1>DocumentRoot</KEYWORD1>
-			<KEYWORD1>EnableExceptionHook</KEYWORD1>
-			<KEYWORD1>EnableMMAP</KEYWORD1>
-			<KEYWORD1>EnableSendfile</KEYWORD1>
-			<KEYWORD1>ErrorDocument</KEYWORD1>
-			<KEYWORD1>ErrorLog</KEYWORD1>
-			<KEYWORD1>Example</KEYWORD1>
-			<KEYWORD1>ExpiresActive</KEYWORD1>
-			<KEYWORD1>ExpiresByType</KEYWORD1>
-			<KEYWORD1>ExpiresDefault</KEYWORD1>
-			<KEYWORD1>ExtFilterDefine</KEYWORD1>
-			<KEYWORD1>ExtendedStatus</KEYWORD1>
-			<KEYWORD1>FileETag</KEYWORD1>
-			<KEYWORD1>ForceLanguagePriority</KEYWORD1>
-			<KEYWORD1>ForensicLog</KEYWORD1>
-			<KEYWORD1>Group</KEYWORD1>
-			<KEYWORD1>Header</KEYWORD1>
-			<KEYWORD1>HeaderName</KEYWORD1>
-			<KEYWORD1>HostnameLookups</KEYWORD1>
-			<KEYWORD1>ISAPIAppendLogToErrors</KEYWORD1>
-			<KEYWORD1>ISAPIAppendLogToQuery</KEYWORD1>
-			<KEYWORD1>ISAPICacheFile</KEYWORD1>
-			<KEYWORD1>ISAPIFakeAsync</KEYWORD1>
-			<KEYWORD1>ISAPILogNotSupported</KEYWORD1>
-			<KEYWORD1>ISAPIReadAheadBuffer</KEYWORD1>
-			<KEYWORD1>IdentityCheck</KEYWORD1>
-			<KEYWORD1>ImapBase</KEYWORD1>
-			<KEYWORD1>ImapDefault</KEYWORD1>
-			<KEYWORD1>ImapMenu</KEYWORD1>
-			<KEYWORD1>Include</KEYWORD1>
-			<KEYWORD1>IndexIgnore</KEYWORD1>
-			<KEYWORD1>IndexOptions</KEYWORD1>
-			<KEYWORD1>IndexOrderDefault</KEYWORD1>
-			<KEYWORD1>KeepAlive</KEYWORD1>
-			<KEYWORD1>KeepAliveTimeout</KEYWORD1>
-			<KEYWORD1>LDAPCacheEntries</KEYWORD1>
-			<KEYWORD1>LDAPCacheTTL</KEYWORD1>
-			<KEYWORD1>LDAPOpCacheEntries</KEYWORD1>
-			<KEYWORD1>LDAPOpCacheTTL</KEYWORD1>
-			<KEYWORD1>LDAPSharedCacheFile</KEYWORD1>
-			<KEYWORD1>LDAPSharedCacheSize</KEYWORD1>
-			<KEYWORD1>LDAPTrustedCA</KEYWORD1>
-			<KEYWORD1>LDAPTrustedCAType</KEYWORD1>
-			<KEYWORD1>LanguagePriority</KEYWORD1>
-			<KEYWORD1>LimitInternalRecursion</KEYWORD1>
-			<KEYWORD1>LimitRequestBody</KEYWORD1>
-			<KEYWORD1>LimitRequestFields</KEYWORD1>
-			<KEYWORD1>LimitRequestFieldsize</KEYWORD1>
-			<KEYWORD1>LimitRequestLine</KEYWORD1>
-			<KEYWORD1>LimitXMLRequestBody</KEYWORD1>
-			<KEYWORD1>Listen</KEYWORD1>
-			<KEYWORD1>ListenBacklog</KEYWORD1>
-			<KEYWORD1>LoadFile</KEYWORD1>
-			<KEYWORD1>LoadModule</KEYWORD1>
-			<KEYWORD1>LockFile</KEYWORD1>
-			<KEYWORD1>LogFormat</KEYWORD1>
-			<KEYWORD1>LogLevel</KEYWORD1>
-			<KEYWORD1>MCacheMaxObjectCount</KEYWORD1>
-			<KEYWORD1>MCacheMaxObjectSize</KEYWORD1>
-			<KEYWORD1>MCacheMaxStreamingBuffer</KEYWORD1>
-			<KEYWORD1>MCacheMinObjectSize</KEYWORD1>
-			<KEYWORD1>MCacheRemovalAlgorithm</KEYWORD1>
-			<KEYWORD1>MCacheSize</KEYWORD1>
-			<KEYWORD1>MMapFile</KEYWORD1>
-			<KEYWORD1>MaxClients</KEYWORD1>
-			<KEYWORD1>MaxKeepAliveRequests</KEYWORD1>
-			<KEYWORD1>MaxMemFree</KEYWORD1>
-			<KEYWORD1>MaxRequestsPerChild</KEYWORD1>
-			<KEYWORD1>MaxRequestsPerThread</KEYWORD1>
-			<KEYWORD1>MaxSpareServers</KEYWORD1>
-			<KEYWORD1>MaxSpareThreads</KEYWORD1>
-			<KEYWORD1>MaxThreads</KEYWORD1>
-			<KEYWORD1>MaxThreadsPerChild</KEYWORD1>
-			<KEYWORD1>MetaDir</KEYWORD1>
-			<KEYWORD1>MetaFiles</KEYWORD1>
-			<KEYWORD1>MetaSuffix</KEYWORD1>
-			<KEYWORD1>MimeMagicFile</KEYWORD1>
-			<KEYWORD1>MinSpareServers</KEYWORD1>
-			<KEYWORD1>MinSpareThreads</KEYWORD1>
-			<KEYWORD1>MultiviewsMatch</KEYWORD1>
-			<KEYWORD1>NWSSLTrustedCerts</KEYWORD1>
-			<KEYWORD1>NWSSLUpgradeable</KEYWORD1>
-			<KEYWORD1>NameVirtualHost</KEYWORD1>
-			<KEYWORD1>NoProxy</KEYWORD1>
-			<KEYWORD1>NumServers</KEYWORD1>
-			<KEYWORD1>Options</KEYWORD1>
-			<KEYWORD1>PassEnv</KEYWORD1>
-			<KEYWORD1>PidFile</KEYWORD1>
-			<KEYWORD1>ProtocolEcho</KEYWORD1>
-			<KEYWORD1>ProxyBadHeader</KEYWORD1>
-			<KEYWORD1>ProxyBlock</KEYWORD1>
-			<KEYWORD1>ProxyDomain</KEYWORD1>
-			<KEYWORD1>ProxyErrorOverride</KEYWORD1>
-			<KEYWORD1>ProxyIOBufferSize</KEYWORD1>
-			<KEYWORD1>ProxyMaxForwards</KEYWORD1>
-			<KEYWORD1>ProxyPass</KEYWORD1>
-			<KEYWORD1>ProxyPassReverse</KEYWORD1>
-			<KEYWORD1>ProxyPreserveHost</KEYWORD1>
-			<KEYWORD1>ProxyReceiveBufferSize</KEYWORD1>
-			<KEYWORD1>ProxyRemote</KEYWORD1>
-			<KEYWORD1>ProxyRemoteMatch</KEYWORD1>
-			<KEYWORD1>ProxyRequests</KEYWORD1>
-			<KEYWORD1>ProxyTimeout</KEYWORD1>
-			<KEYWORD1>ProxyVia</KEYWORD1>
-			<KEYWORD1>RLimitCPU</KEYWORD1>
-			<KEYWORD1>RLimitMEM</KEYWORD1>
-			<KEYWORD1>RLimitNPROC</KEYWORD1>
-			<KEYWORD1>ReadmeName</KEYWORD1>
-			<KEYWORD1>Redirect</KEYWORD1>
-			<KEYWORD1>RedirectMatch</KEYWORD1>
-			<KEYWORD1>RedirectPermanent</KEYWORD1>
-			<KEYWORD1>RedirectTemp</KEYWORD1>
-			<KEYWORD1>RequestHeader</KEYWORD1>
-			<KEYWORD1>RewriteBase</KEYWORD1>
-			<KEYWORD1>RewriteCond</KEYWORD1>
-			<KEYWORD1>RewriteEngine</KEYWORD1>
-			<KEYWORD1>RewriteLock</KEYWORD1>
-			<KEYWORD1>RewriteLog</KEYWORD1>
-			<KEYWORD1>RewriteLogLevel</KEYWORD1>
-			<KEYWORD1>RewriteMap</KEYWORD1>
-			<KEYWORD1>RewriteOptions</KEYWORD1>
-			<KEYWORD1>RewriteRule</KEYWORD1>
-			<KEYWORD1>SSIEndTag</KEYWORD1>
-			<KEYWORD1>SSIErrorMsg</KEYWORD1>
-			<KEYWORD1>SSIStartTag</KEYWORD1>
-			<KEYWORD1>SSITimeFormat</KEYWORD1>
-			<KEYWORD1>SSIUndefinedEcho</KEYWORD1>
-			<KEYWORD1>SSLCACertificateFile</KEYWORD1>
-			<KEYWORD1>SSLCACertificatePath</KEYWORD1>
-			<KEYWORD1>SSLCARevocationFile</KEYWORD1>
-			<KEYWORD1>SSLCARevocationPath</KEYWORD1>
-			<KEYWORD1>SSLCertificateChainFile</KEYWORD1>
-			<KEYWORD1>SSLCertificateFile</KEYWORD1>
-			<KEYWORD1>SSLCertificateKeyFile</KEYWORD1>
-			<KEYWORD1>SSLCipherSuite</KEYWORD1>
-			<KEYWORD1>SSLEngine</KEYWORD1>
-			<KEYWORD1>SSLMutex</KEYWORD1>
-			<KEYWORD1>SSLOptions</KEYWORD1>
-			<KEYWORD1>SSLPassPhraseDialog</KEYWORD1>
-			<KEYWORD1>SSLProtocol</KEYWORD1>
-			<KEYWORD1>SSLProxyCACertificateFile</KEYWORD1>
-			<KEYWORD1>SSLProxyCACertificatePath</KEYWORD1>
-			<KEYWORD1>SSLProxyCARevocationFile</KEYWORD1>
-			<KEYWORD1>SSLProxyCARevocationPath</KEYWORD1>
-			<KEYWORD1>SSLProxyCipherSuite</KEYWORD1>
-			<KEYWORD1>SSLProxyEngine</KEYWORD1>
-			<KEYWORD1>SSLProxyMachineCertificateFile</KEYWORD1>
-			<KEYWORD1>SSLProxyMachineCertificatePath</KEYWORD1>
-			<KEYWORD1>SSLProxyProtocol</KEYWORD1>
-			<KEYWORD1>SSLProxyVerify</KEYWORD1>
-			<KEYWORD1>SSLProxyVerifyDepth</KEYWORD1>
-			<KEYWORD1>SSLRandomSeed</KEYWORD1>
-			<KEYWORD1>SSLSessionCache</KEYWORD1>
-			<KEYWORD1>SSLSessionCacheTimeout</KEYWORD1>
-			<KEYWORD1>SSLVerifyClient</KEYWORD1>
-			<KEYWORD1>SSLVerifyDepth</KEYWORD1>
-			<KEYWORD1>ScoreBoardFile</KEYWORD1>
-			<KEYWORD1>Script</KEYWORD1>
-			<KEYWORD1>ScriptAlias</KEYWORD1>
-			<KEYWORD1>ScriptAliasMatch</KEYWORD1>
-			<KEYWORD1>ScriptInterpreterSource</KEYWORD1>
-			<KEYWORD1>ScriptLog</KEYWORD1>
-			<KEYWORD1>ScriptLogBuffer</KEYWORD1>
-			<KEYWORD1>ScriptLogLength</KEYWORD1>
-			<KEYWORD1>ScriptSock</KEYWORD1>
-			<KEYWORD1>SecureListen</KEYWORD1>
-			<KEYWORD1>SendBufferSize</KEYWORD1>
-			<KEYWORD1>ServerAdmin</KEYWORD1>
-			<KEYWORD1>ServerLimit</KEYWORD1>
-			<KEYWORD1>ServerName</KEYWORD1>
-			<KEYWORD1>ServerRoot</KEYWORD1>
-			<KEYWORD1>ServerSignature</KEYWORD1>
-			<KEYWORD1>ServerTokens</KEYWORD1>
-			<KEYWORD1>SetEnv</KEYWORD1>
-			<KEYWORD1>SetEnvIf</KEYWORD1>
-			<KEYWORD1>SetEnvIfNoCase</KEYWORD1>
-			<KEYWORD1>SetHandler</KEYWORD1>
-			<KEYWORD1>SetInputFilter</KEYWORD1>
-			<KEYWORD1>SetOutputFilter</KEYWORD1>
-			<KEYWORD1>StartServers</KEYWORD1>
-			<KEYWORD1>StartThreads</KEYWORD1>
-			<KEYWORD1>SuexecUserGroup</KEYWORD1>
-			<KEYWORD1>ThreadLimit</KEYWORD1>
-			<KEYWORD1>ThreadStackSize</KEYWORD1>
-			<KEYWORD1>ThreadsPerChild</KEYWORD1>
-			<KEYWORD1>TimeOut</KEYWORD1>
-			<KEYWORD1>TransferLog</KEYWORD1>
-			<KEYWORD1>TypesConfig</KEYWORD1>
-			<KEYWORD1>UnsetEnv</KEYWORD1>
-			<KEYWORD1>UseCanonicalName</KEYWORD1>
-			<KEYWORD1>User</KEYWORD1>
-			<KEYWORD1>UserDir</KEYWORD1>
-			<KEYWORD1>VirtualDocumentRoot</KEYWORD1>
-			<KEYWORD1>VirtualDocumentRootIP</KEYWORD1>
-			<KEYWORD1>VirtualScriptAlias</KEYWORD1>
-			<KEYWORD1>VirtualScriptAliasIP</KEYWORD1>
-			<KEYWORD1>Win32DisableAcceptEx</KEYWORD1>
-			<KEYWORD1>XBitHack</KEYWORD1>
-
-			<!-- Apache 1.x -->
-			<KEYWORD4>AddModule</KEYWORD4>
-			<KEYWORD4>ClearModuleList</KEYWORD4>
-			<KEYWORD4>ServerType</KEYWORD4>
-			<KEYWORD4>Port</KEYWORD4>
-
-			<LITERAL2>Off</LITERAL2>
-			<LITERAL2>On</LITERAL2>
-			<LITERAL2>None</LITERAL2>
-		</KEYWORDS>
-	</RULES>
-
-	<RULES SET="DIRECTIVE" DEFAULT="NULL" IGNORE_CASE="TRUE">
-
-		<EOL_SPAN TYPE="COMMENT2">#</EOL_SPAN>
-
-		<SPAN TYPE="LITERAL1" ESCAPE="\" NO_LINE_BREAK="TRUE">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-
-		<SPAN_REGEXP HASH_CHAR="&lt;VirtualHost" TYPE="MARKUP" DELEGATE="VHOST">
-			<BEGIN><![CDATA[<(VirtualHost)[^>]*>]]></BEGIN>
-			<END><![CDATA[</$1>]]></END>
-		</SPAN_REGEXP>
-
-		<SPAN_REGEXP HASH_CHAR="&lt;" TYPE="MARKUP" DELEGATE="DIRECTIVE">
-			<BEGIN><![CDATA[<(\w+)[^>]*>]]></BEGIN>
-			<END><![CDATA[</$1>]]></END>
-		</SPAN_REGEXP>
-
-		<KEYWORDS>
-
-			<KEYWORD2>AcceptMutex</KEYWORD2>
-			<KEYWORD2>AcceptPathInfo</KEYWORD2>
-			<KEYWORD2>AccessFileName</KEYWORD2>
-			<KEYWORD2>Action</KEYWORD2>
-			<KEYWORD2>AddAlt</KEYWORD2>
-			<KEYWORD2>AddAltByEncoding</KEYWORD2>
-			<KEYWORD2>AddAltByType</KEYWORD2>
-			<KEYWORD2>AddCharset</KEYWORD2>
-			<KEYWORD2>AddDefaultCharset</KEYWORD2>
-			<KEYWORD2>AddDescription</KEYWORD2>
-			<KEYWORD2>AddEncoding</KEYWORD2>
-			<KEYWORD2>AddHandler</KEYWORD2>
-			<KEYWORD2>AddIcon</KEYWORD2>
-			<KEYWORD2>AddIconByEncoding</KEYWORD2>
-			<KEYWORD2>AddIconByType</KEYWORD2>
-			<KEYWORD2>AddInputFilter</KEYWORD2>
-			<KEYWORD2>AddLanguage</KEYWORD2>
-			<KEYWORD2>AddModuleInfo</KEYWORD2>
-			<KEYWORD2>AddOutputFilter</KEYWORD2>
-			<KEYWORD2>AddOutputFilterByType</KEYWORD2>
-			<KEYWORD2>AddType</KEYWORD2>
-			<KEYWORD2>Alias</KEYWORD2>
-			<KEYWORD2>AliasMatch</KEYWORD2>
-			<KEYWORD2>Allow</KEYWORD2>
-			<KEYWORD2>AllowCONNECT</KEYWORD2>
-			<KEYWORD2>AllowEncodedSlashes</KEYWORD2>
-			<KEYWORD2>AllowOverride</KEYWORD2>
-			<KEYWORD2>Anonymous</KEYWORD2>
-			<KEYWORD2>Anonymous_Authoritative</KEYWORD2>
-			<KEYWORD2>Anonymous_LogEmail</KEYWORD2>
-			<KEYWORD2>Anonymous_MustGiveEmail</KEYWORD2>
-			<KEYWORD2>Anonymous_NoUserID</KEYWORD2>
-			<KEYWORD2>Anonymous_VerifyEmail</KEYWORD2>
-			<KEYWORD2>AuthAuthoritative</KEYWORD2>
-			<KEYWORD2>AuthDBMAuthoritative</KEYWORD2>
-			<KEYWORD2>AuthDBMGroupFile</KEYWORD2>
-			<KEYWORD2>AuthDBMType</KEYWORD2>
-			<KEYWORD2>AuthDBMUserFile</KEYWORD2>
-			<KEYWORD2>AuthDigestAlgorithm</KEYWORD2>
-			<KEYWORD2>AuthDigestDomain</KEYWORD2>
-			<KEYWORD2>AuthDigestFile</KEYWORD2>
-			<KEYWORD2>AuthDigestGroupFile</KEYWORD2>
-			<KEYWORD2>AuthDigestNcCheck</KEYWORD2>
-			<KEYWORD2>AuthDigestNonceFormat</KEYWORD2>
-			<KEYWORD2>AuthDigestNonceLifetime</KEYWORD2>
-			<KEYWORD2>AuthDigestQop</KEYWORD2>
-			<KEYWORD2>AuthDigestShmemSize</KEYWORD2>
-			<KEYWORD2>AuthGroupFile</KEYWORD2>
-			<KEYWORD2>AuthLDAPAuthoritative</KEYWORD2>
-			<KEYWORD2>AuthLDAPBindDN</KEYWORD2>
-			<KEYWORD2>AuthLDAPBindPassword</KEYWORD2>
-			<KEYWORD2>AuthLDAPCharsetConfig</KEYWORD2>
-			<KEYWORD2>AuthLDAPCompareDNOnServer</KEYWORD2>
-			<KEYWORD2>AuthLDAPDereferenceAliases</KEYWORD2>
-			<KEYWORD2>AuthLDAPEnabled</KEYWORD2>
-			<KEYWORD2>AuthLDAPFrontPageHack</KEYWORD2>
-			<KEYWORD2>AuthLDAPGroupAttribute</KEYWORD2>
-			<KEYWORD2>AuthLDAPGroupAttributeIsDN</KEYWORD2>
-			<KEYWORD2>AuthLDAPRemoteUserIsDN</KEYWORD2>
-			<KEYWORD2>AuthLDAPUrl</KEYWORD2>
-			<KEYWORD2>AuthName</KEYWORD2>
-			<KEYWORD2>AuthType</KEYWORD2>
-			<KEYWORD2>AuthUserFile</KEYWORD2>
-			<KEYWORD2>BS2000Account</KEYWORD2>
-			<KEYWORD2>BrowserMatch</KEYWORD2>
-			<KEYWORD2>BrowserMatchNoCase</KEYWORD2>
-			<KEYWORD2>CGIMapExtension</KEYWORD2>
-			<KEYWORD2>CacheDefaultExpire</KEYWORD2>
-			<KEYWORD2>CacheDirLength</KEYWORD2>
-			<KEYWORD2>CacheDirLevels</KEYWORD2>
-			<KEYWORD2>CacheDisable</KEYWORD2>
-			<KEYWORD2>CacheEnable</KEYWORD2>
-			<KEYWORD2>CacheExpiryCheck</KEYWORD2>
-			<KEYWORD2>CacheFile</KEYWORD2>
-			<KEYWORD2>CacheForceCompletion</KEYWORD2>
-			<KEYWORD2>CacheGcClean</KEYWORD2>
-			<KEYWORD2>CacheGcDaily</KEYWORD2>
-			<KEYWORD2>CacheGcInterval</KEYWORD2>
-			<KEYWORD2>CacheGcMemUsage</KEYWORD2>
-			<KEYWORD2>CacheGcUnused</KEYWORD2>
-			<KEYWORD2>CacheIgnoreCacheControl</KEYWORD2>
-			<KEYWORD2>CacheIgnoreNoLastMod</KEYWORD2>
-			<KEYWORD2>CacheLastModifiedFactor</KEYWORD2>
-			<KEYWORD2>CacheMaxExpire</KEYWORD2>
-			<KEYWORD2>CacheMaxFileSize</KEYWORD2>
-			<KEYWORD2>CacheMinFileSize</KEYWORD2>
-			<KEYWORD2>CacheNegotiatedDocs</KEYWORD2>
-			<KEYWORD2>CacheRoot</KEYWORD2>
-			<KEYWORD2>CacheSize</KEYWORD2>
-			<KEYWORD2>CacheTimeMargin</KEYWORD2>
-			<KEYWORD2>CharsetDefault</KEYWORD2>
-			<KEYWORD2>CharsetOptions</KEYWORD2>
-			<KEYWORD2>CharsetSourceEnc</KEYWORD2>
-			<KEYWORD2>CheckSpelling</KEYWORD2>
-			<KEYWORD2>ChildPerUserID</KEYWORD2>
-			<KEYWORD2>ContentDigest</KEYWORD2>
-			<KEYWORD2>CookieDomain</KEYWORD2>
-			<KEYWORD2>CookieExpires</KEYWORD2>
-			<KEYWORD2>CookieLog</KEYWORD2>
-			<KEYWORD2>CookieName</KEYWORD2>
-			<KEYWORD2>CookieStyle</KEYWORD2>
-			<KEYWORD2>CookieTracking</KEYWORD2>
-			<KEYWORD2>CoreDumpDirectory</KEYWORD2>
-			<KEYWORD2>CustomLog</KEYWORD2>
-			<KEYWORD2>Dav</KEYWORD2>
-			<KEYWORD2>DavDepthInfinity</KEYWORD2>
-			<KEYWORD2>DavLockDB</KEYWORD2>
-			<KEYWORD2>DavMinTimeout</KEYWORD2>
-			<KEYWORD2>DefaultIcon</KEYWORD2>
-			<KEYWORD2>DefaultLanguage</KEYWORD2>
-			<KEYWORD2>DefaultType</KEYWORD2>
-			<KEYWORD2>DeflateBufferSize</KEYWORD2>
-			<KEYWORD2>DeflateCompressionLevel</KEYWORD2>
-			<KEYWORD2>DeflateFilterNote</KEYWORD2>
-			<KEYWORD2>DeflateMemLevel</KEYWORD2>
-			<KEYWORD2>DeflateWindowSize</KEYWORD2>
-			<KEYWORD2>Deny</KEYWORD2>
-			<KEYWORD2>DirectoryIndex</KEYWORD2>
-			<KEYWORD1>DirectorySlash</KEYWORD1>
-			<KEYWORD2>DocumentRoot</KEYWORD2>
-			<KEYWORD2>EnableMMAP</KEYWORD2>
-			<KEYWORD2>EnableSendfile</KEYWORD2>
-			<KEYWORD2>ErrorDocument</KEYWORD2>
-			<KEYWORD2>ErrorLog</KEYWORD2>
-			<KEYWORD2>Example</KEYWORD2>
-			<KEYWORD2>ExpiresActive</KEYWORD2>
-			<KEYWORD2>ExpiresByType</KEYWORD2>
-			<KEYWORD2>ExpiresDefault</KEYWORD2>
-			<KEYWORD2>ExtFilterDefine</KEYWORD2>
-			<KEYWORD2>ExtFilterOptions</KEYWORD2>
-			<KEYWORD2>ExtendedStatus</KEYWORD2>
-			<KEYWORD2>FileETag</KEYWORD2>
-			<KEYWORD2>ForceLanguagePriority</KEYWORD2>
-			<KEYWORD2>ForceType</KEYWORD2>
-			<KEYWORD2>Group</KEYWORD2>
-			<KEYWORD2>Header</KEYWORD2>
-			<KEYWORD2>HeaderName</KEYWORD2>
-			<KEYWORD2>HostnameLookups</KEYWORD2>
-			<KEYWORD2>ISAPIAppendLogToErrors</KEYWORD2>
-			<KEYWORD2>ISAPIAppendLogToQuery</KEYWORD2>
-			<KEYWORD2>ISAPICacheFile</KEYWORD2>
-			<KEYWORD2>ISAPIFakeAsync</KEYWORD2>
-			<KEYWORD2>ISAPILogNotSupported</KEYWORD2>
-			<KEYWORD2>ISAPIReadAheadBuffer</KEYWORD2>
-			<KEYWORD2>IdentityCheck</KEYWORD2>
-			<KEYWORD2>ImapBase</KEYWORD2>
-			<KEYWORD2>ImapDefault</KEYWORD2>
-			<KEYWORD2>ImapMenu</KEYWORD2>
-			<KEYWORD2>Include</KEYWORD2>
-			<KEYWORD2>IndexIgnore</KEYWORD2>
-			<KEYWORD2>IndexOptions</KEYWORD2>
-			<KEYWORD2>IndexOrderDefault</KEYWORD2>
-			<KEYWORD2>KeepAlive</KEYWORD2>
-			<KEYWORD2>KeepAliveTimeout</KEYWORD2>
-			<KEYWORD2>LDAPCacheEntries</KEYWORD2>
-			<KEYWORD2>LDAPCacheTTL</KEYWORD2>
-			<KEYWORD2>LDAPOpCacheEntries</KEYWORD2>
-			<KEYWORD2>LDAPOpCacheTTL</KEYWORD2>
-			<KEYWORD2>LDAPSharedCacheSize</KEYWORD2>
-			<KEYWORD2>LDAPTrustedCA</KEYWORD2>
-			<KEYWORD2>LDAPTrustedCAType</KEYWORD2>
-			<KEYWORD2>LanguagePriority</KEYWORD2>
-			<KEYWORD2>LimitInternalRecursion</KEYWORD2>
-			<KEYWORD2>LimitRequestBody</KEYWORD2>
-			<KEYWORD2>LimitRequestFields</KEYWORD2>
-			<KEYWORD2>LimitRequestFieldsize</KEYWORD2>
-			<KEYWORD2>LimitRequestLine</KEYWORD2>
-			<KEYWORD2>LimitXMLRequestBody</KEYWORD2>
-			<KEYWORD2>Listen</KEYWORD2>
-			<KEYWORD2>ListenBacklog</KEYWORD2>
-			<KEYWORD2>LoadFile</KEYWORD2>
-			<KEYWORD2>LoadModule</KEYWORD2>
-			<KEYWORD2>LockFile</KEYWORD2>
-			<KEYWORD2>LogFormat</KEYWORD2>
-			<KEYWORD2>LogLevel</KEYWORD2>
-			<KEYWORD2>MCacheMaxObjectCount</KEYWORD2>
-			<KEYWORD2>MCacheMaxObjectSize</KEYWORD2>
-			<KEYWORD2>MCacheMaxStreamingBuffer</KEYWORD2>
-			<KEYWORD2>MCacheMinObjectSize</KEYWORD2>
-			<KEYWORD2>MCacheRemovalAlgorithm</KEYWORD2>
-			<KEYWORD2>MCacheSize</KEYWORD2>
-			<KEYWORD2>MMapFile</KEYWORD2>
-			<KEYWORD2>MaxClients</KEYWORD2>
-			<KEYWORD2>MaxKeepAliveRequests</KEYWORD2>
-			<KEYWORD2>MaxMemFree</KEYWORD2>
-			<KEYWORD2>MaxRequestsPerChild</KEYWORD2>
-			<KEYWORD2>MaxRequestsPerThread</KEYWORD2>
-			<KEYWORD2>MaxSpareServers</KEYWORD2>
-			<KEYWORD2>MaxSpareThreads</KEYWORD2>
-			<KEYWORD2>MaxThreads</KEYWORD2>
-			<KEYWORD2>MaxThreadsPerChild</KEYWORD2>
-			<KEYWORD2>MetaDir</KEYWORD2>
-			<KEYWORD2>MetaFiles</KEYWORD2>
-			<KEYWORD2>MetaSuffix</KEYWORD2>
-			<KEYWORD2>MimeMagicFile</KEYWORD2>
-			<KEYWORD2>MinSpareServers</KEYWORD2>
-			<KEYWORD2>MinSpareThreads</KEYWORD2>
-			<KEYWORD2>ModMimeUsePathInfo</KEYWORD2>
-			<KEYWORD2>MultiviewsMatch</KEYWORD2>
-			<KEYWORD2>NWSSLTrustedCerts</KEYWORD2>
-			<KEYWORD2>NameVirtualHost</KEYWORD2>
-			<KEYWORD2>NoProxy</KEYWORD2>
-			<KEYWORD2>NumServers</KEYWORD2>
-			<KEYWORD2>Options</KEYWORD2>
-			<KEYWORD2>Order</KEYWORD2>
-			<KEYWORD2>PassEnv</KEYWORD2>
-			<KEYWORD2>PidFile</KEYWORD2>
-			<KEYWORD2>ProtocolEcho</KEYWORD2>
-			<KEYWORD2>ProxyBadHeader</KEYWORD2>
-			<KEYWORD2>ProxyBlock</KEYWORD2>
-			<KEYWORD2>ProxyDomain</KEYWORD2>
-			<KEYWORD2>ProxyErrorOverride</KEYWORD2>
-			<KEYWORD2>ProxyIOBufferSize</KEYWORD2>
-			<KEYWORD2>ProxyMaxForwards</KEYWORD2>
-			<KEYWORD2>ProxyPass</KEYWORD2>
-			<KEYWORD2>ProxyPassReverse</KEYWORD2>
-			<KEYWORD2>ProxyPreserveHost</KEYWORD2>
-			<KEYWORD2>ProxyReceiveBufferSize</KEYWORD2>
-			<KEYWORD2>ProxyRemote</KEYWORD2>
-			<KEYWORD2>ProxyRemoteMatch</KEYWORD2>
-			<KEYWORD2>ProxyRequests</KEYWORD2>
-			<KEYWORD2>ProxyTimeout</KEYWORD2>
-			<KEYWORD2>ProxyVia</KEYWORD2>
-			<KEYWORD2>RLimitCPU</KEYWORD2>
-			<KEYWORD2>RLimitMEM</KEYWORD2>
-			<KEYWORD2>RLimitNPROC</KEYWORD2>
-			<KEYWORD2>ReadmeName</KEYWORD2>
-			<KEYWORD2>Redirect</KEYWORD2>
-			<KEYWORD2>RedirectMatch</KEYWORD2>
-			<KEYWORD2>RedirectPermanent</KEYWORD2>
-			<KEYWORD2>RedirectTemp</KEYWORD2>
-			<KEYWORD2>RemoveCharset</KEYWORD2>
-			<KEYWORD2>RemoveEncoding</KEYWORD2>
-			<KEYWORD2>RemoveHandler</KEYWORD2>
-			<KEYWORD2>RemoveInputFilter</KEYWORD2>
-			<KEYWORD2>RemoveLanguage</KEYWORD2>
-			<KEYWORD2>RemoveOutputFilter</KEYWORD2>
-			<KEYWORD2>RemoveType</KEYWORD2>
-			<KEYWORD2>RequestHeader</KEYWORD2>
-			<KEYWORD2>Require</KEYWORD2>
-			<KEYWORD2>RewriteBase</KEYWORD2>
-			<KEYWORD2>RewriteCond</KEYWORD2>
-			<KEYWORD2>RewriteEngine</KEYWORD2>
-			<KEYWORD2>RewriteLock</KEYWORD2>
-			<KEYWORD2>RewriteLog</KEYWORD2>
-			<KEYWORD2>RewriteLogLevel</KEYWORD2>
-			<KEYWORD2>RewriteMap</KEYWORD2>
-			<KEYWORD2>RewriteOptions</KEYWORD2>
-			<KEYWORD2>RewriteRule</KEYWORD2>
-			<KEYWORD2>SSIEndTag</KEYWORD2>
-			<KEYWORD2>SSIErrorMsg</KEYWORD2>
-			<KEYWORD2>SSIStartTag</KEYWORD2>
-			<KEYWORD2>SSITimeFormat</KEYWORD2>
-			<KEYWORD2>SSIUndefinedEcho</KEYWORD2>
-			<KEYWORD2>SSLCACertificateFile</KEYWORD2>
-			<KEYWORD2>SSLCACertificatePath</KEYWORD2>
-			<KEYWORD2>SSLCARevocationFile</KEYWORD2>
-			<KEYWORD2>SSLCARevocationPath</KEYWORD2>
-			<KEYWORD2>SSLCertificateChainFile</KEYWORD2>
-			<KEYWORD2>SSLCertificateFile</KEYWORD2>
-			<KEYWORD2>SSLCertificateKeyFile</KEYWORD2>
-			<KEYWORD2>SSLCipherSuite</KEYWORD2>
-			<KEYWORD2>SSLEngine</KEYWORD2>
-			<KEYWORD2>SSLMutex</KEYWORD2>
-			<KEYWORD2>SSLOptions</KEYWORD2>
-			<KEYWORD2>SSLPassPhraseDialog</KEYWORD2>
-			<KEYWORD2>SSLProtocol</KEYWORD2>
-			<KEYWORD2>SSLProxyCACertificateFile</KEYWORD2>
-			<KEYWORD2>SSLProxyCACertificatePath</KEYWORD2>
-			<KEYWORD2>SSLProxyCARevocationFile</KEYWORD2>
-			<KEYWORD2>SSLProxyCARevocationPath</KEYWORD2>
-			<KEYWORD2>SSLProxyCipherSuite</KEYWORD2>
-			<KEYWORD2>SSLProxyEngine</KEYWORD2>
-			<KEYWORD2>SSLProxyMachineCertificateFile</KEYWORD2>
-			<KEYWORD2>SSLProxyMachineCertificatePath</KEYWORD2>
-			<KEYWORD2>SSLProxyProtocol</KEYWORD2>
-			<KEYWORD2>SSLProxyVerify</KEYWORD2>
-			<KEYWORD2>SSLProxyVerifyDepth</KEYWORD2>
-			<KEYWORD2>SSLRandomSeed</KEYWORD2>
-			<KEYWORD2>SSLRequire</KEYWORD2>
-			<KEYWORD2>SSLRequireSSL</KEYWORD2>
-			<KEYWORD2>SSLSessionCache</KEYWORD2>
-			<KEYWORD2>SSLSessionCacheTimeout</KEYWORD2>
-			<KEYWORD2>SSLVerifyClient</KEYWORD2>
-			<KEYWORD2>SSLVerifyDepth</KEYWORD2>
-			<KEYWORD2>Satisfy</KEYWORD2>
-			<KEYWORD2>ScoreBoardFile</KEYWORD2>
-			<KEYWORD2>Script</KEYWORD2>
-			<KEYWORD2>ScriptAlias</KEYWORD2>
-			<KEYWORD2>ScriptAliasMatch</KEYWORD2>
-			<KEYWORD2>ScriptInterpreterSource</KEYWORD2>
-			<KEYWORD2>ScriptLog</KEYWORD2>
-			<KEYWORD2>ScriptLogBuffer</KEYWORD2>
-			<KEYWORD2>ScriptLogLength</KEYWORD2>
-			<KEYWORD2>ScriptSock</KEYWORD2>
-			<KEYWORD2>SecureListen</KEYWORD2>
-			<KEYWORD2>SendBufferSize</KEYWORD2>
-			<KEYWORD2>ServerAdmin</KEYWORD2>
-			<KEYWORD2>ServerLimit</KEYWORD2>
-			<KEYWORD2>ServerName</KEYWORD2>
-			<KEYWORD2>ServerRoot</KEYWORD2>
-			<KEYWORD2>ServerSignature</KEYWORD2>
-			<KEYWORD2>ServerTokens</KEYWORD2>
-			<KEYWORD2>SetEnv</KEYWORD2>
-			<KEYWORD2>SetEnvIf</KEYWORD2>
-			<KEYWORD2>SetEnvIfNoCase</KEYWORD2>
-			<KEYWORD2>SetHandler</KEYWORD2>
-			<KEYWORD2>SetInputFilter</KEYWORD2>
-			<KEYWORD2>SetOutputFilter</KEYWORD2>
-			<KEYWORD2>StartServers</KEYWORD2>
-			<KEYWORD2>StartThreads</KEYWORD2>
-			<KEYWORD2>SuexecUserGroup</KEYWORD2>
-			<KEYWORD2>ThreadLimit</KEYWORD2>
-			<KEYWORD2>ThreadStackSize</KEYWORD2>
-			<KEYWORD2>ThreadsPerChild</KEYWORD2>
-			<KEYWORD2>TimeOut</KEYWORD2>
-			<KEYWORD2>TransferLog</KEYWORD2>
-			<KEYWORD2>TypesConfig</KEYWORD2>
-			<KEYWORD2>UnsetEnv</KEYWORD2>
-			<KEYWORD2>UseCanonicalName</KEYWORD2>
-			<KEYWORD2>User</KEYWORD2>
-			<KEYWORD2>UserDir</KEYWORD2>
-			<KEYWORD2>VirtualDocumentRoot</KEYWORD2>
-			<KEYWORD2>VirtualDocumentRootIP</KEYWORD2>
-			<KEYWORD2>VirtualScriptAlias</KEYWORD2>
-			<KEYWORD2>VirtualScriptAliasIP</KEYWORD2>
-			<KEYWORD2>XBitHack</KEYWORD2>
-
-			<!-- Apache 1.x -->
-			<KEYWORD4>AddModule</KEYWORD4>
-			<KEYWORD4>ClearModuleList</KEYWORD4>
-
-			<!-- Subversion directives -->
-			<KEYWORD3>SVNPath</KEYWORD3>
-			<KEYWORD3>SVNParentPath</KEYWORD3>
-			<KEYWORD3>SVNIndexXSLT</KEYWORD3>
-
-			<!-- mod_python directives -->
-			<KEYWORD3>PythonHandler</KEYWORD3>
-			<KEYWORD3>PythonDebug</KEYWORD3>
-
-			<LITERAL2>All</LITERAL2>
-			<LITERAL2>ExecCGI</LITERAL2>
-			<LITERAL2>FollowSymLinks</LITERAL2>
-			<LITERAL2>Includes</LITERAL2>
-			<LITERAL2>IncludesNOEXEC</LITERAL2>
-			<LITERAL2>Indexes</LITERAL2>
-			<LITERAL2>MultiViews</LITERAL2>
-			<LITERAL2>None</LITERAL2>
-			<LITERAL2>Off</LITERAL2>
-			<LITERAL2>On</LITERAL2>
-			<LITERAL2>SymLinksIfOwnerMatch</LITERAL2>
-			<LITERAL2>from</LITERAL2>
-		</KEYWORDS>
-	</RULES>
-
-	<RULES SET="VHOST" DEFAULT="NULL" IGNORE_CASE="TRUE">
-
-		<EOL_SPAN TYPE="COMMENT2">#</EOL_SPAN>
-
-		<SPAN_REGEXP HASH_CHAR="&lt;" TYPE="MARKUP" DELEGATE="DIRECTIVE">
-			<BEGIN><![CDATA[<(\w+)[^>]*>]]></BEGIN>
-			<END><![CDATA[</$1>]]></END>
-		</SPAN_REGEXP>
-
-		<SPAN TYPE="LITERAL1" ESCAPE="\" NO_LINE_BREAK="TRUE">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-
-		<KEYWORDS>
-			<KEYWORD2>AcceptMutex</KEYWORD2>
-			<KEYWORD2>AcceptPathInfo</KEYWORD2>
-			<KEYWORD2>AccessFileName</KEYWORD2>
-			<KEYWORD2>Action</KEYWORD2>
-			<KEYWORD2>AddAlt</KEYWORD2>
-			<KEYWORD2>AddAltByEncoding</KEYWORD2>
-			<KEYWORD2>AddAltByType</KEYWORD2>
-			<KEYWORD2>AddCharset</KEYWORD2>
-			<KEYWORD2>AddDefaultCharset</KEYWORD2>
-			<KEYWORD2>AddDescription</KEYWORD2>
-			<KEYWORD2>AddEncoding</KEYWORD2>
-			<KEYWORD2>AddHandler</KEYWORD2>
-			<KEYWORD2>AddIcon</KEYWORD2>
-			<KEYWORD2>AddIconByEncoding</KEYWORD2>
-			<KEYWORD2>AddIconByType</KEYWORD2>
-			<KEYWORD2>AddInputFilter</KEYWORD2>
-			<KEYWORD2>AddLanguage</KEYWORD2>
-			<KEYWORD2>AddModuleInfo</KEYWORD2>
-			<KEYWORD2>AddOutputFilter</KEYWORD2>
-			<KEYWORD2>AddOutputFilterByType</KEYWORD2>
-			<KEYWORD2>AddType</KEYWORD2>
-			<KEYWORD2>Alias</KEYWORD2>
-			<KEYWORD2>AliasMatch</KEYWORD2>
-			<KEYWORD2>AllowCONNECT</KEYWORD2>
-			<KEYWORD2>AllowEncodedSlashes</KEYWORD2>
-			<KEYWORD2>AssignUserID</KEYWORD2>
-			<KEYWORD2>AuthDigestNcCheck</KEYWORD2>
-			<KEYWORD2>AuthDigestShmemSize</KEYWORD2>
-			<KEYWORD2>AuthLDAPCharsetConfig</KEYWORD2>
-			<KEYWORD2>BS2000Account</KEYWORD2>
-			<KEYWORD2>BrowserMatch</KEYWORD2>
-			<KEYWORD2>BrowserMatchNoCase</KEYWORD2>
-			<KEYWORD2>CacheDefaultExpire</KEYWORD2>
-			<KEYWORD2>CacheDirLength</KEYWORD2>
-			<KEYWORD2>CacheDirLevels</KEYWORD2>
-			<KEYWORD2>CacheDisable</KEYWORD2>
-			<KEYWORD2>CacheEnable</KEYWORD2>
-			<KEYWORD2>CacheExpiryCheck</KEYWORD2>
-			<KEYWORD2>CacheFile</KEYWORD2>
-			<KEYWORD2>CacheForceCompletion</KEYWORD2>
-			<KEYWORD2>CacheGcClean</KEYWORD2>
-			<KEYWORD2>CacheGcDaily</KEYWORD2>
-			<KEYWORD2>CacheGcInterval</KEYWORD2>
-			<KEYWORD2>CacheGcMemUsage</KEYWORD2>
-			<KEYWORD2>CacheGcUnused</KEYWORD2>
-			<KEYWORD2>CacheIgnoreCacheControl</KEYWORD2>
-			<KEYWORD2>CacheIgnoreNoLastMod</KEYWORD2>
-			<KEYWORD2>CacheLastModifiedFactor</KEYWORD2>
-			<KEYWORD2>CacheMaxExpire</KEYWORD2>
-			<KEYWORD2>CacheMaxFileSize</KEYWORD2>
-			<KEYWORD2>CacheMinFileSize</KEYWORD2>
-			<KEYWORD2>CacheNegotiatedDocs</KEYWORD2>
-			<KEYWORD2>CacheRoot</KEYWORD2>
-			<KEYWORD2>CacheSize</KEYWORD2>
-			<KEYWORD2>CacheTimeMargin</KEYWORD2>
-			<KEYWORD2>CharsetDefault</KEYWORD2>
-			<KEYWORD2>CharsetOptions</KEYWORD2>
-			<KEYWORD2>CharsetSourceEnc</KEYWORD2>
-			<KEYWORD2>CheckSpelling</KEYWORD2>
-			<KEYWORD2>ChildPerUserID</KEYWORD2>
-			<KEYWORD2>ContentDigest</KEYWORD2>
-			<KEYWORD2>CookieDomain</KEYWORD2>
-			<KEYWORD2>CookieExpires</KEYWORD2>
-			<KEYWORD2>CookieLog</KEYWORD2>
-			<KEYWORD2>CookieName</KEYWORD2>
-			<KEYWORD2>CookieStyle</KEYWORD2>
-			<KEYWORD2>CookieTracking</KEYWORD2>
-			<KEYWORD2>CoreDumpDirectory</KEYWORD2>
-			<KEYWORD2>CustomLog</KEYWORD2>
-			<KEYWORD2>DavDepthInfinity</KEYWORD2>
-			<KEYWORD2>DavLockDB</KEYWORD2>
-			<KEYWORD2>DavMinTimeout</KEYWORD2>
-			<KEYWORD2>DefaultIcon</KEYWORD2>
-			<KEYWORD2>DefaultLanguage</KEYWORD2>
-			<KEYWORD2>DefaultType</KEYWORD2>
-			<KEYWORD2>DeflateBufferSize</KEYWORD2>
-			<KEYWORD2>DeflateCompressionLevel</KEYWORD2>
-			<KEYWORD2>DeflateFilterNote</KEYWORD2>
-			<KEYWORD2>DeflateMemLevel</KEYWORD2>
-			<KEYWORD2>DeflateWindowSize</KEYWORD2>
-			<KEYWORD2>DirectoryIndex</KEYWORD2>
-			<KEYWORD1>DirectorySlash</KEYWORD1>
-			<KEYWORD2>DocumentRoot</KEYWORD2>
-			<KEYWORD2>EnableMMAP</KEYWORD2>
-			<KEYWORD2>EnableSendfile</KEYWORD2>
-			<KEYWORD2>ErrorDocument</KEYWORD2>
-			<KEYWORD2>ErrorLog</KEYWORD2>
-			<KEYWORD2>Example</KEYWORD2>
-			<KEYWORD2>ExpiresActive</KEYWORD2>
-			<KEYWORD2>ExpiresByType</KEYWORD2>
-			<KEYWORD2>ExpiresDefault</KEYWORD2>
-			<KEYWORD2>ExtFilterDefine</KEYWORD2>
-			<KEYWORD2>ExtendedStatus</KEYWORD2>
-			<KEYWORD2>FileETag</KEYWORD2>
-			<KEYWORD2>ForceLanguagePriority</KEYWORD2>
-			<KEYWORD2>ForensicLog</KEYWORD2>
-			<KEYWORD2>Group</KEYWORD2>
-			<KEYWORD2>Header</KEYWORD2>
-			<KEYWORD2>HeaderName</KEYWORD2>
-			<KEYWORD2>HostnameLookups</KEYWORD2>
-			<KEYWORD2>ISAPIAppendLogToErrors</KEYWORD2>
-			<KEYWORD2>ISAPIAppendLogToQuery</KEYWORD2>
-			<KEYWORD2>ISAPICacheFile</KEYWORD2>
-			<KEYWORD2>ISAPIFakeAsync</KEYWORD2>
-			<KEYWORD2>ISAPILogNotSupported</KEYWORD2>
-			<KEYWORD2>ISAPIReadAheadBuffer</KEYWORD2>
-			<KEYWORD2>IdentityCheck</KEYWORD2>
-			<KEYWORD2>ImapBase</KEYWORD2>
-			<KEYWORD2>ImapDefault</KEYWORD2>
-			<KEYWORD2>ImapMenu</KEYWORD2>
-			<KEYWORD2>Include</KEYWORD2>
-			<KEYWORD2>IndexIgnore</KEYWORD2>
-			<KEYWORD2>IndexOptions</KEYWORD2>
-			<KEYWORD2>IndexOrderDefault</KEYWORD2>
-			<KEYWORD2>JkMount</KEYWORD2>
-			<KEYWORD2>KeepAlive</KEYWORD2>
-			<KEYWORD2>KeepAliveTimeout</KEYWORD2>
-			<KEYWORD2>LDAPCacheEntries</KEYWORD2>
-			<KEYWORD2>LDAPCacheTTL</KEYWORD2>
-			<KEYWORD2>LDAPOpCacheEntries</KEYWORD2>
-			<KEYWORD2>LDAPOpCacheTTL</KEYWORD2>
-			<KEYWORD2>LDAPSharedCacheSize</KEYWORD2>
-			<KEYWORD2>LDAPTrustedCA</KEYWORD2>
-			<KEYWORD2>LDAPTrustedCAType</KEYWORD2>
-			<KEYWORD2>LanguagePriority</KEYWORD2>
-			<KEYWORD2>LimitInternalRecursion</KEYWORD2>
-			<KEYWORD2>LimitRequestBody</KEYWORD2>
-			<KEYWORD2>LimitRequestFields</KEYWORD2>
-			<KEYWORD2>LimitRequestFieldsize</KEYWORD2>
-			<KEYWORD2>LimitRequestLine</KEYWORD2>
-			<KEYWORD2>LimitXMLRequestBody</KEYWORD2>
-			<KEYWORD2>Listen</KEYWORD2>
-			<KEYWORD2>ListenBacklog</KEYWORD2>
-			<KEYWORD2>LoadFile</KEYWORD2>
-			<KEYWORD2>LoadModule</KEYWORD2>
-			<KEYWORD2>LockFile</KEYWORD2>
-			<KEYWORD2>LogFormat</KEYWORD2>
-			<KEYWORD2>LogLevel</KEYWORD2>
-			<KEYWORD2>MCacheMaxObjectCount</KEYWORD2>
-			<KEYWORD2>MCacheMaxObjectSize</KEYWORD2>
-			<KEYWORD2>MCacheMaxStreamingBuffer</KEYWORD2>
-			<KEYWORD2>MCacheMinObjectSize</KEYWORD2>
-			<KEYWORD2>MCacheRemovalAlgorithm</KEYWORD2>
-			<KEYWORD2>MCacheSize</KEYWORD2>
-			<KEYWORD2>MMapFile</KEYWORD2>
-			<KEYWORD2>MaxClients</KEYWORD2>
-			<KEYWORD2>MaxKeepAliveRequests</KEYWORD2>
-			<KEYWORD2>MaxMemFree</KEYWORD2>
-			<KEYWORD2>MaxRequestsPerChild</KEYWORD2>
-			<KEYWORD2>MaxRequestsPerThread</KEYWORD2>
-			<KEYWORD2>MaxSpareServers</KEYWORD2>
-			<KEYWORD2>MaxSpareThreads</KEYWORD2>
-			<KEYWORD2>MaxThreads</KEYWORD2>
-			<KEYWORD2>MaxThreadsPerChild</KEYWORD2>
-			<KEYWORD2>MetaDir</KEYWORD2>
-			<KEYWORD2>MetaFiles</KEYWORD2>
-			<KEYWORD2>MetaSuffix</KEYWORD2>
-			<KEYWORD2>MimeMagicFile</KEYWORD2>
-			<KEYWORD2>MinSpareServers</KEYWORD2>
-			<KEYWORD2>MinSpareThreads</KEYWORD2>
-			<KEYWORD2>MultiviewsMatch</KEYWORD2>
-			<KEYWORD2>NWSSLTrustedCerts</KEYWORD2>
-			<KEYWORD2>NameVirtualHost</KEYWORD2>
-			<KEYWORD2>NoProxy</KEYWORD2>
-			<KEYWORD2>NumServers</KEYWORD2>
-			<KEYWORD2>Options</KEYWORD2>
-			<KEYWORD2>PassEnv</KEYWORD2>
-			<KEYWORD2>PidFile</KEYWORD2>
-			<KEYWORD2>ProtocolEcho</KEYWORD2>
-			<KEYWORD2>ProxyBadHeader</KEYWORD2>
-			<KEYWORD2>ProxyBlock</KEYWORD2>
-			<KEYWORD2>ProxyDomain</KEYWORD2>
-			<KEYWORD2>ProxyErrorOverride</KEYWORD2>
-			<KEYWORD2>ProxyIOBufferSize</KEYWORD2>
-			<KEYWORD2>ProxyMaxForwards</KEYWORD2>
-			<KEYWORD2>ProxyPass</KEYWORD2>
-			<KEYWORD2>ProxyPassReverse</KEYWORD2>
-			<KEYWORD2>ProxyPreserveHost</KEYWORD2>
-			<KEYWORD2>ProxyReceiveBufferSize</KEYWORD2>
-			<KEYWORD2>ProxyRemote</KEYWORD2>
-			<KEYWORD2>ProxyRemoteMatch</KEYWORD2>
-			<KEYWORD2>ProxyRequests</KEYWORD2>
-			<KEYWORD2>ProxyTimeout</KEYWORD2>
-			<KEYWORD2>ProxyVia</KEYWORD2>
-			<KEYWORD2>RLimitCPU</KEYWORD2>
-			<KEYWORD2>RLimitMEM</KEYWORD2>
-			<KEYWORD2>RLimitNPROC</KEYWORD2>
-			<KEYWORD2>ReadmeName</KEYWORD2>
-			<KEYWORD2>Redirect</KEYWORD2>
-			<KEYWORD2>RedirectMatch</KEYWORD2>
-			<KEYWORD2>RedirectPermanent</KEYWORD2>
-			<KEYWORD2>RedirectTemp</KEYWORD2>
-			<KEYWORD2>RemoveCharset</KEYWORD2>
-			<KEYWORD2>RemoveEncoding</KEYWORD2>
-			<KEYWORD2>RemoveHandler</KEYWORD2>
-			<KEYWORD2>RemoveInputFilter</KEYWORD2>
-			<KEYWORD2>RemoveLanguage</KEYWORD2>
-			<KEYWORD2>RemoveOutputFilter</KEYWORD2>
-			<KEYWORD2>RemoveType</KEYWORD2>
-			<KEYWORD2>RequestHeader</KEYWORD2>
-			<KEYWORD2>RewriteBase</KEYWORD2>
-			<KEYWORD2>RewriteCond</KEYWORD2>
-			<KEYWORD2>RewriteEngine</KEYWORD2>
-			<KEYWORD2>RewriteLock</KEYWORD2>
-			<KEYWORD2>RewriteLog</KEYWORD2>
-			<KEYWORD2>RewriteLogLevel</KEYWORD2>
-			<KEYWORD2>RewriteMap</KEYWORD2>
-			<KEYWORD2>RewriteOptions</KEYWORD2>
-			<KEYWORD2>RewriteRule</KEYWORD2>
-			<KEYWORD2>SSIEndTag</KEYWORD2>
-			<KEYWORD2>SSIErrorMsg</KEYWORD2>
-			<KEYWORD2>SSIStartTag</KEYWORD2>
-			<KEYWORD2>SSITimeFormat</KEYWORD2>
-			<KEYWORD2>SSIUndefinedEcho</KEYWORD2>
-			<KEYWORD2>SSLCACertificateFile</KEYWORD2>
-			<KEYWORD2>SSLCACertificatePath</KEYWORD2>
-			<KEYWORD2>SSLCARevocationFile</KEYWORD2>
-			<KEYWORD2>SSLCARevocationPath</KEYWORD2>
-			<KEYWORD2>SSLCertificateChainFile</KEYWORD2>
-			<KEYWORD2>SSLCertificateFile</KEYWORD2>
-			<KEYWORD2>SSLCertificateKeyFile</KEYWORD2>
-			<KEYWORD2>SSLCipherSuite</KEYWORD2>
-			<KEYWORD2>SSLEngine</KEYWORD2>
-			<KEYWORD2>SSLMutex</KEYWORD2>
-			<KEYWORD2>SSLOptions</KEYWORD2>
-			<KEYWORD2>SSLPassPhraseDialog</KEYWORD2>
-			<KEYWORD2>SSLProtocol</KEYWORD2>
-			<KEYWORD2>SSLProxyCACertificateFile</KEYWORD2>
-			<KEYWORD2>SSLProxyCACertificatePath</KEYWORD2>
-			<KEYWORD2>SSLProxyCARevocationFile</KEYWORD2>
-			<KEYWORD2>SSLProxyCARevocationPath</KEYWORD2>
-			<KEYWORD2>SSLProxyCipherSuite</KEYWORD2>
-			<KEYWORD2>SSLProxyEngine</KEYWORD2>
-			<KEYWORD2>SSLProxyMachineCertificateFile</KEYWORD2>
-			<KEYWORD2>SSLProxyMachineCertificatePath</KEYWORD2>
-			<KEYWORD2>SSLProxyProtocol</KEYWORD2>
-			<KEYWORD2>SSLProxyVerify</KEYWORD2>
-			<KEYWORD2>SSLProxyVerifyDepth</KEYWORD2>
-			<KEYWORD2>SSLRandomSeed</KEYWORD2>
-			<KEYWORD2>SSLSessionCache</KEYWORD2>
-			<KEYWORD2>SSLSessionCacheTimeout</KEYWORD2>
-			<KEYWORD2>SSLVerifyClient</KEYWORD2>
-			<KEYWORD2>SSLVerifyDepth</KEYWORD2>
-			<KEYWORD2>ScoreBoardFile</KEYWORD2>
-			<KEYWORD2>Script</KEYWORD2>
-			<KEYWORD2>ScriptAlias</KEYWORD2>
-			<KEYWORD2>ScriptAliasMatch</KEYWORD2>
-			<KEYWORD2>ScriptInterpreterSource</KEYWORD2>
-			<KEYWORD2>ScriptLog</KEYWORD2>
-			<KEYWORD2>ScriptLogBuffer</KEYWORD2>
-			<KEYWORD2>ScriptLogLength</KEYWORD2>
-			<KEYWORD2>ScriptSock</KEYWORD2>
-			<KEYWORD2>SecureListen</KEYWORD2>
-			<KEYWORD2>SendBufferSize</KEYWORD2>
-			<KEYWORD2>ServerAdmin</KEYWORD2>
-			<KEYWORD2>ServerAlias</KEYWORD2>
-			<KEYWORD2>ServerLimit</KEYWORD2>
-			<KEYWORD2>ServerName</KEYWORD2>
-			<KEYWORD2>ServerPath</KEYWORD2>
-			<KEYWORD2>ServerRoot</KEYWORD2>
-			<KEYWORD2>ServerSignature</KEYWORD2>
-			<KEYWORD2>ServerTokens</KEYWORD2>
-			<KEYWORD2>SetEnv</KEYWORD2>
-			<KEYWORD2>SetEnvIf</KEYWORD2>
-			<KEYWORD2>SetEnvIfNoCase</KEYWORD2>
-			<KEYWORD2>SetHandler</KEYWORD2>
-			<KEYWORD2>SetInputFilter</KEYWORD2>
-			<KEYWORD2>SetOutputFilter</KEYWORD2>
-			<KEYWORD2>StartServers</KEYWORD2>
-			<KEYWORD2>StartThreads</KEYWORD2>
-			<KEYWORD2>SuexecUserGroup</KEYWORD2>
-			<KEYWORD2>ThreadLimit</KEYWORD2>
-			<KEYWORD2>ThreadStackSize</KEYWORD2>
-			<KEYWORD2>ThreadsPerChild</KEYWORD2>
-			<KEYWORD2>TimeOut</KEYWORD2>
-			<KEYWORD2>TransferLog</KEYWORD2>
-			<KEYWORD2>TypesConfig</KEYWORD2>
-			<KEYWORD2>UnsetEnv</KEYWORD2>
-			<KEYWORD2>UseCanonicalName</KEYWORD2>
-			<KEYWORD2>User</KEYWORD2>
-			<KEYWORD2>UserDir</KEYWORD2>
-			<KEYWORD2>VirtualDocumentRoot</KEYWORD2>
-			<KEYWORD2>VirtualDocumentRootIP</KEYWORD2>
-			<KEYWORD2>VirtualScriptAlias</KEYWORD2>
-			<KEYWORD2>VirtualScriptAliasIP</KEYWORD2>
-			<KEYWORD2>XBitHack</KEYWORD2>
-
-			<LITERAL2>Off</LITERAL2>
-			<LITERAL2>On</LITERAL2>
-			<LITERAL2>None</LITERAL2>
-		</KEYWORDS>
-	</RULES>
-</MODE>
-
diff --git a/qpython/src/main/assets/syntax/apdl.xml b/qpython/src/main/assets/syntax/apdl.xml
deleted file mode 100644
index 213a532e..00000000
--- a/qpython/src/main/assets/syntax/apdl.xml
+++ /dev/null
@@ -1,7536 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!-- 	
-
-	Version 0.9.8 - generated by Randolf Mock on 11/22/2003 
-	Randolf.Mock@siemens.com
-	
-	<KEYWORD1>: ANSYS commands
-	<KEYWORD2>: abbreviated *get commands
-	<KEYWORD3>: ANSYS command options
-	
--->
-
-<!-- The keywords and functions defined here are those of ANSYS 5.7 -->
-
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="lineComment" VALUE="!" />
-	</PROPS>
-	<RULES IGNORE_CASE="TRUE" HIGHLIGHT_DIGITS="TRUE">
-
-		<!-- labels - eg :test -->
-		<EOL_SPAN TYPE="LABEL" AT_LINE_START="TRUE">:</EOL_SPAN>
-
-		<!-- comments -->
-		<EOL_SPAN TYPE="COMMENT1">!</EOL_SPAN>
-
-		<!-- literals -->
-		<SPAN TYPE="LITERAL1" NO_LINE_BREAK="TRUE">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-	
-<!-- Special treatment of the ANSYS commands
-     beginning with a '/' or '*' character --> 
-
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">*ABBR</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">*ABB</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">*AFUN</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">*AFU</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">*ASK</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">*CFCLOS</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">*CFC</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">*CFOPEN</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">*CFO</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">*CFWRITE</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">*CFW</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">*CREATE</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">*CRE</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">*CYCLE</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">*CYC</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">*DEL</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">*DIM</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">*DO</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">*ELSEIF</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">*ELSE</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">*ENDDO</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">*ENDIF</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">*END</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">*EVAL</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">*EVA</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">*EXIT</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">*EXI</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">*GET</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">*GO</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">*IF</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">*LIST</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">*LIS</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">*MFOURI</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">*MFO</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">*MFUN</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">*MFU</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">*MOONEY</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">*MOO</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">*MOPER</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">*MOP</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">*MSG</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">*REPEAT</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">*REP</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">*SET</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">*STATUS</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">*STA</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">*TREAD</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">*TRE</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">*ULIB</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">*ULI</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">*USE</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">*VABS</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">*VAB</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">*VCOL</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">*VCO</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">*VCUM</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">*VCU</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">*VEDIT</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">*VED</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">*VFACT</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">*VFA</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">*VFILL</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">*VFI</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">*VFUN</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">*VFU</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">*VGET</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">*VGE</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">*VITRP</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">*VIT</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">*VLEN</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">*VLE</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">*VMASK</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">*VMA</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">*VOPER</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">*VOP</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">*VPLOT</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">*VPL</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">*VPUT</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">*VPU</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">*VREAD</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">*VRE</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">*VSCFUN</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">*VSC</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">*VSTAT</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">*VST</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">*VWRITE</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">*VWR</SEQ>
-		
-		
-
-
-		
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/ANFILE</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/ANF</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/ANGLE</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/ANG</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/ANNOT</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/ANN</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/ANUM</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/ANU</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/ASSIGN</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/ASS</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/AUTO</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/AUT</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/AUX15</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/AUX2</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/AUX</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/AXLAB</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/AXL</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/BATCH</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/BAT</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/CLABEL</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/CLA</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/CLEAR</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/CLE</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/CLOG</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/CLO</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/CMAP</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/CMA</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/COLOR</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/COL</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/COM</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/CONFIG</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/CONTOUR</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/CON</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/COPY</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/COP</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/CPLANE</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/CPL</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/CTYPE</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/CTY</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/CVAL</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/CVA</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/DELETE</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/DEL</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/DEVDISP</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/DEVICE</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/DEV</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/DIST</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/DIS</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/DSCALE</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/DSC</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/DV3D</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/DV3</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/EDGE</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/EDG</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/EFACET</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/EFA</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/EOF</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/ERASE</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/ERA</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/ESHAPE</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/ESH</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/EXIT</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/EXI</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/EXPAND</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/EXP</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/FACET</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/FAC</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/FDELE</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/FDE</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/FILNAME</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/FIL</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/FOCUS</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/FOC</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/FORMAT</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/FOR</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/FTYPE</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/FTY</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/GCMD</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/GCM</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/GCOLUMN</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/GCO</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/GFILE</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/GFI</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/GFORMAT</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/GFO</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/GLINE</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/GLI</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/GMARKER</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/GMA</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/GOLIST</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/GOL</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/GOPR</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/GOP</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/GO</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/GRAPHICS</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/GRA</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/GRESUME</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/GRE</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/GRID</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/GRI</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/GROPT</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/GRO</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/GRTYP</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/GRT</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/GSAVE</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/GSA</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/GST</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/GTHK</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/GTH</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/GTYPE</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/GTY</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/HEADER</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/HEA</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/INPUT</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/INP</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/LARC</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/LAR</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/LIGHT</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/LIG</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/LINE</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/LIN</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/LSPEC</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/LSP</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/LSYMBOL</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/LSY</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/MENU</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/MEN</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/MPLIB</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/MPL</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/MREP</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/MRE</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/MSTART</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/MST</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/NERR</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/NER</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/NOERASE</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/NOE</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/NOLIST</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/NOL</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/NOPR</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/NOP</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/NORMAL</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/NOR</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/NUMBER</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/NUM</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/OPT</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/OUTPUT</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/OUt</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/PAGE</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/PAG</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/PBC</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/PBF</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/PCIRCLE</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/PCI</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/PCOPY</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/PCO</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/PLOPTS</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/PLO</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/PMACRO</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/PMA</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/PMETH</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/PME</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/PMORE</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/PMO</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/PNUM</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/PNU</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/POLYGON</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/POL</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/POST26</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/POST1</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/POS</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/PREP7</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/PRE</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/PSEARCH</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/PSE</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/PSF</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/PSPEC</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/PSP</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/PSTATUS</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/PST</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/PSYMB</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/PSY</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/PWEDGE</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/PWE</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/QUIT</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/QUI</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/RATIO</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/RAT</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/RENAME</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/REN</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/REPLOT</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/REP</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/RESET</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/RES</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/RGB</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/RUNST</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/RUN</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/SECLIB</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/SEC</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/SEG</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/SHADE</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/SHA</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/SHOWDISP</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/SHOW</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/SHO</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/SHRINK</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/SHR</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/SOLU</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/SOL</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/SSCALE</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/SSC</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/STATUS</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/STA</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/STITLE</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/STI</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/SYP</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/SYS</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/TITLE</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/TIT</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/TLABEL</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/TLA</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/TRIAD</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/TRI</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/TRLCY</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/TRL</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/TSPEC</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/TSP</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/TYPE</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/TYP</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/UCMD</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/UCM</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/UIS</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/UI</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/UNITS</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/UNI</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/USER</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/USE</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/VCONE</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/VCO</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/VIEW</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/VIE</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/VSCALE</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/VSC</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/VUP</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/WAIT</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/WAI</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/WINDOW</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/WIN</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/XRANGE</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/XRA</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/YRANGE</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/YRA</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/ZOOM</SEQ>
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">/ZOO</SEQ>
-
-
-
-		<SEQ TYPE="OPERATOR">+</SEQ>
-		<SEQ TYPE="OPERATOR">-</SEQ>
-		<SEQ TYPE="OPERATOR">$</SEQ>
-		<SEQ TYPE="OPERATOR">=</SEQ>
-		<SEQ TYPE="OPERATOR">(</SEQ>
-		<SEQ TYPE="OPERATOR">)</SEQ>
-		<SEQ TYPE="OPERATOR">,</SEQ>
-		<SEQ TYPE="NULL">;</SEQ>
-		<SEQ TYPE="OPERATOR">*</SEQ>
-		<SEQ TYPE="OPERATOR">/</SEQ>
-
-		<!-- *msg command: variable formats -->
-		<SEQ TYPE="KEYWORD2">%C</SEQ>		<!-- alphamuneric format -->
-		<SEQ TYPE="KEYWORD2">%G</SEQ>		<!-- double precision format -->
-		<SEQ TYPE="KEYWORD2">%I</SEQ>		<!-- integer format -->
-		<SEQ TYPE="KEYWORD2">%/</SEQ>		<!-- line break -->
-		
-		<!-- variables -->
-		<SPAN TYPE="FUNCTION" NO_LINE_BREAK="TRUE">
-			<BEGIN>%</BEGIN>
-			<END>%</END>
-		</SPAN>
-
-		<KEYWORDS>
-
-<!--		ANSYS Commands (incl. abbreviated version)	-->
-
-			<KEYWORD1>A</KEYWORD1>
-			<KEYWORD1>AADD</KEYWORD1>
-			<KEYWORD1>AADD</KEYWORD1>
-			<KEYWORD1>AATT</KEYWORD1>
-			<KEYWORD1>AATT</KEYWORD1>
-			<KEYWORD1>ABBR</KEYWORD1>
-			<KEYWORD1>ABBRES</KEYWORD1>
-			<KEYWORD1>ABBS</KEYWORD1>
-			<KEYWORD1>ABBSAV</KEYWORD1>
-			<KEYWORD1>ABS</KEYWORD1>
-			<KEYWORD1>ACCA</KEYWORD1>
-			<KEYWORD1>ACCAT</KEYWORD1>
-			<KEYWORD1>ACEL</KEYWORD1>
-			<KEYWORD1>ACEL</KEYWORD1>
-			<KEYWORD1>ACLE</KEYWORD1>
-			<KEYWORD1>ACLEAR</KEYWORD1>
-			<KEYWORD1>ADAP</KEYWORD1>
-			<KEYWORD1>ADAPT</KEYWORD1>
-			<KEYWORD1>ADD</KEYWORD1>
-			<KEYWORD1>ADDA</KEYWORD1>
-			<KEYWORD1>ADDAM</KEYWORD1>
-			<KEYWORD1>ADEL</KEYWORD1>
-			<KEYWORD1>ADELE</KEYWORD1>
-			<KEYWORD1>ADGL</KEYWORD1>
-			<KEYWORD1>ADGL</KEYWORD1>
-			<KEYWORD1>ADRA</KEYWORD1>
-			<KEYWORD1>ADRAG</KEYWORD1>
-			<KEYWORD1>AFIL</KEYWORD1>
-			<KEYWORD1>AFILLT</KEYWORD1>
-			<KEYWORD1>AFLI</KEYWORD1>
-			<KEYWORD1>AFLIST</KEYWORD1>
-			<KEYWORD1>AFSU</KEYWORD1>
-			<KEYWORD1>AFSURF</KEYWORD1>
-			<KEYWORD1>AGEN</KEYWORD1>
-			<KEYWORD1>AGEN</KEYWORD1>
-			<KEYWORD1>AGLU</KEYWORD1>
-			<KEYWORD1>AGLUE</KEYWORD1>
-			<KEYWORD1>AINA</KEYWORD1>
-			<KEYWORD1>AINA</KEYWORD1>
-			<KEYWORD1>AINP</KEYWORD1>
-			<KEYWORD1>AINP</KEYWORD1>
-			<KEYWORD1>AINV</KEYWORD1>
-			<KEYWORD1>AINV</KEYWORD1>
-			<KEYWORD1>AL</KEYWORD1>
-			<KEYWORD1>ALIS</KEYWORD1>
-			<KEYWORD1>ALIST</KEYWORD1>
-			<KEYWORD1>ALLS</KEYWORD1>
-			<KEYWORD1>ALLSEL</KEYWORD1>
-			<KEYWORD1>ALPF</KEYWORD1>
-			<KEYWORD1>ALPFILL</KEYWORD1>
-			<KEYWORD1>ALPH</KEYWORD1>
-			<KEYWORD1>ALPHAD</KEYWORD1>
-			<KEYWORD1>AMAP</KEYWORD1>
-			<KEYWORD1>AMAP</KEYWORD1>
-			<KEYWORD1>AMES</KEYWORD1>
-			<KEYWORD1>AMESH</KEYWORD1>
-			<KEYWORD1>ANCN</KEYWORD1>
-			<KEYWORD1>ANCNTR</KEYWORD1>
-			<KEYWORD1>ANCU</KEYWORD1>
-			<KEYWORD1>ANCUT</KEYWORD1>
-			<KEYWORD1>ANDA</KEYWORD1>
-			<KEYWORD1>ANDATA</KEYWORD1>
-			<KEYWORD1>ANDS</KEYWORD1>
-			<KEYWORD1>ANDSCL</KEYWORD1>
-			<KEYWORD1>ANDY</KEYWORD1>
-			<KEYWORD1>ANDYNA</KEYWORD1>
-			<KEYWORD1>ANFL</KEYWORD1>
-			<KEYWORD1>ANFLOW</KEYWORD1>
-			<KEYWORD1>ANIM</KEYWORD1>
-			<KEYWORD1>ANIM</KEYWORD1>
-			<KEYWORD1>ANIS</KEYWORD1>
-			<KEYWORD1>ANISOS</KEYWORD1>
-			<KEYWORD1>ANMO</KEYWORD1>
-			<KEYWORD1>ANMODE</KEYWORD1>
-			<KEYWORD1>ANOR</KEYWORD1>
-			<KEYWORD1>ANORM</KEYWORD1>
-			<KEYWORD1>ANTI</KEYWORD1>
-			<KEYWORD1>ANTIME</KEYWORD1>
-			<KEYWORD1>ANTY</KEYWORD1>
-			<KEYWORD1>ANTYPE</KEYWORD1>
-			<KEYWORD1>AOFF</KEYWORD1>
-			<KEYWORD1>AOFFST</KEYWORD1>
-			<KEYWORD1>AOVL</KEYWORD1>
-			<KEYWORD1>AOVLAP</KEYWORD1>
-			<KEYWORD1>APLO</KEYWORD1>
-			<KEYWORD1>APLOT</KEYWORD1>
-			<KEYWORD1>APPE</KEYWORD1>
-			<KEYWORD1>APPEND</KEYWORD1>
-			<KEYWORD1>APTN</KEYWORD1>
-			<KEYWORD1>APTN</KEYWORD1>
-			<KEYWORD1>ARCL</KEYWORD1>
-			<KEYWORD1>ARCLEN</KEYWORD1>
-			<KEYWORD1>ARCO</KEYWORD1>
-			<KEYWORD1>ARCOLLAPSE</KEYWORD1>
-			<KEYWORD1>ARCT</KEYWORD1>
-			<KEYWORD1>ARCTRM</KEYWORD1>
-			<KEYWORD1>ARDE</KEYWORD1>
-			<KEYWORD1>ARDETACH</KEYWORD1>
-			<KEYWORD1>AREA</KEYWORD1>
-			<KEYWORD1>AREAS</KEYWORD1>
-			<KEYWORD1>AREF</KEYWORD1>
-			<KEYWORD1>AREFINE</KEYWORD1>
-			<KEYWORD1>AREV</KEYWORD1>
-			<KEYWORD1>AREVERSE</KEYWORD1>
-			<KEYWORD1>ARFI</KEYWORD1>
-			<KEYWORD1>ARFILL</KEYWORD1>
-			<KEYWORD1>ARME</KEYWORD1>
-			<KEYWORD1>ARMERGE</KEYWORD1>
-			<KEYWORD1>AROT</KEYWORD1>
-			<KEYWORD1>AROTAT</KEYWORD1>
-			<KEYWORD1>ARSC</KEYWORD1>
-			<KEYWORD1>ARSCALE</KEYWORD1>
-			<KEYWORD1>ARSP</KEYWORD1>
-			<KEYWORD1>ARSPLIT</KEYWORD1>
-			<KEYWORD1>ARSY</KEYWORD1>
-			<KEYWORD1>ARSYM</KEYWORD1>
-			<KEYWORD1>ASBA</KEYWORD1>
-			<KEYWORD1>ASBA</KEYWORD1>
-			<KEYWORD1>ASBL</KEYWORD1>
-			<KEYWORD1>ASBL</KEYWORD1>
-			<KEYWORD1>ASBV</KEYWORD1>
-			<KEYWORD1>ASBV</KEYWORD1>
-			<KEYWORD1>ASBW</KEYWORD1>
-			<KEYWORD1>ASBW</KEYWORD1>
-			<KEYWORD1>ASEL</KEYWORD1>
-			<KEYWORD1>ASEL</KEYWORD1>
-			<KEYWORD1>ASKI</KEYWORD1>
-			<KEYWORD1>ASKIN</KEYWORD1>
-			<KEYWORD1>ASLL</KEYWORD1>
-			<KEYWORD1>ASLL</KEYWORD1>
-			<KEYWORD1>ASLV</KEYWORD1>
-			<KEYWORD1>ASLV</KEYWORD1>
-			<KEYWORD1>ASUB</KEYWORD1>
-			<KEYWORD1>ASUB</KEYWORD1>
-			<KEYWORD1>ASUM</KEYWORD1>
-			<KEYWORD1>ASUM</KEYWORD1>
-			<KEYWORD1>ATAN</KEYWORD1>
-			<KEYWORD1>ATAN</KEYWORD1>
-			<KEYWORD1>ATRA</KEYWORD1>
-			<KEYWORD1>ATRAN</KEYWORD1>
-			<KEYWORD1>ATYP</KEYWORD1>
-			<KEYWORD1>ATYPE</KEYWORD1>
-			<KEYWORD1>AUTO</KEYWORD1>
-			<KEYWORD1>AUTOTS</KEYWORD1>
-			<KEYWORD1>AVPR</KEYWORD1>
-			<KEYWORD1>AVPRIN</KEYWORD1>
-			<KEYWORD1>AVRE</KEYWORD1>
-			<KEYWORD1>AVRES</KEYWORD1>
-			<KEYWORD1>BELL</KEYWORD1>
-			<KEYWORD1>BELLOW</KEYWORD1>
-			<KEYWORD1>BEND</KEYWORD1>
-			<KEYWORD1>BEND</KEYWORD1>
-			<KEYWORD1>BETA</KEYWORD1>
-			<KEYWORD1>BETAD</KEYWORD1>
-			<KEYWORD1>BF</KEYWORD1>
-			<KEYWORD1>BFA</KEYWORD1>
-			<KEYWORD1>BFAD</KEYWORD1>
-			<KEYWORD1>BFADELE</KEYWORD1>
-			<KEYWORD1>BFAL</KEYWORD1>
-			<KEYWORD1>BFALIST</KEYWORD1>
-			<KEYWORD1>BFCU</KEYWORD1>
-			<KEYWORD1>BFCUM</KEYWORD1>
-			<KEYWORD1>BFDE</KEYWORD1>
-			<KEYWORD1>BFDELE</KEYWORD1>
-			<KEYWORD1>BFE</KEYWORD1>
-			<KEYWORD1>BFEC</KEYWORD1>
-			<KEYWORD1>BFECUM</KEYWORD1>
-			<KEYWORD1>BFED</KEYWORD1>
-			<KEYWORD1>BFEDELE</KEYWORD1>
-			<KEYWORD1>BFEL</KEYWORD1>
-			<KEYWORD1>BFELIST</KEYWORD1>
-			<KEYWORD1>BFES</KEYWORD1>
-			<KEYWORD1>BFESCAL</KEYWORD1>
-			<KEYWORD1>BFIN</KEYWORD1>
-			<KEYWORD1>BFINT</KEYWORD1>
-			<KEYWORD1>BFK</KEYWORD1>
-			<KEYWORD1>BFKD</KEYWORD1>
-			<KEYWORD1>BFKDELE</KEYWORD1>
-			<KEYWORD1>BFKL</KEYWORD1>
-			<KEYWORD1>BFKLIST</KEYWORD1>
-			<KEYWORD1>BFL</KEYWORD1>
-			<KEYWORD1>BFLD</KEYWORD1>
-			<KEYWORD1>BFLDELE</KEYWORD1>
-			<KEYWORD1>BFLI</KEYWORD1>
-			<KEYWORD1>BFLIST</KEYWORD1>
-			<KEYWORD1>BFLL</KEYWORD1>
-			<KEYWORD1>BFLLIST</KEYWORD1>
-			<KEYWORD1>BFSC</KEYWORD1>
-			<KEYWORD1>BFSCALE</KEYWORD1>
-			<KEYWORD1>BFTR</KEYWORD1>
-			<KEYWORD1>BFTRAN</KEYWORD1>
-			<KEYWORD1>BFUN</KEYWORD1>
-			<KEYWORD1>BFUNIF</KEYWORD1>
-			<KEYWORD1>BFV</KEYWORD1>
-			<KEYWORD1>BFVD</KEYWORD1>
-			<KEYWORD1>BFVDELE</KEYWORD1>
-			<KEYWORD1>BFVL</KEYWORD1>
-			<KEYWORD1>BFVLIST</KEYWORD1>
-			<KEYWORD1>BIOO</KEYWORD1>
-			<KEYWORD1>BIOOPT</KEYWORD1>
-			<KEYWORD1>BIOT</KEYWORD1>
-			<KEYWORD1>BIOT</KEYWORD1>
-			<KEYWORD1>BLC4</KEYWORD1>
-			<KEYWORD1>BLC4</KEYWORD1>
-			<KEYWORD1>BLC5</KEYWORD1>
-			<KEYWORD1>BLC5</KEYWORD1>
-			<KEYWORD1>BLOC</KEYWORD1>
-			<KEYWORD1>BLOCK</KEYWORD1>
-			<KEYWORD1>BOOL</KEYWORD1>
-			<KEYWORD1>BOOL</KEYWORD1>
-			<KEYWORD1>BOPT</KEYWORD1>
-			<KEYWORD1>BOPTN</KEYWORD1>
-			<KEYWORD1>BRAN</KEYWORD1>
-			<KEYWORD1>BRANCH</KEYWORD1>
-			<KEYWORD1>BSPL</KEYWORD1>
-			<KEYWORD1>BSPLIN</KEYWORD1>
-			<KEYWORD1>BTOL</KEYWORD1>
-			<KEYWORD1>BTOL</KEYWORD1>
-			<KEYWORD1>BUCO</KEYWORD1>
-			<KEYWORD1>BUCOPT</KEYWORD1>
-			<KEYWORD1>CALC</KEYWORD1>
-			<KEYWORD1>CALC</KEYWORD1>
-			<KEYWORD1>CBDO</KEYWORD1>
-			<KEYWORD1>CBDOF</KEYWORD1>
-			<KEYWORD1>CDRE</KEYWORD1>
-			<KEYWORD1>CDREAD</KEYWORD1>
-			<KEYWORD1>CDWR</KEYWORD1>
-			<KEYWORD1>CDWRITE</KEYWORD1>
-			<KEYWORD1>CE</KEYWORD1>
-			<KEYWORD1>CECM</KEYWORD1>
-			<KEYWORD1>CECMOD</KEYWORD1>
-			<KEYWORD1>CECY</KEYWORD1>
-			<KEYWORD1>CECYC</KEYWORD1>
-			<KEYWORD1>CEDE</KEYWORD1>
-			<KEYWORD1>CEDELE</KEYWORD1>
-			<KEYWORD1>CEIN</KEYWORD1>
-			<KEYWORD1>CEINTF</KEYWORD1>
-			<KEYWORD1>CELI</KEYWORD1>
-			<KEYWORD1>CELIST</KEYWORD1>
-			<KEYWORD1>CENT</KEYWORD1>
-			<KEYWORD1>CENTER</KEYWORD1>
-			<KEYWORD1>CEQN</KEYWORD1>
-			<KEYWORD1>CEQN</KEYWORD1>
-			<KEYWORD1>CERI</KEYWORD1>
-			<KEYWORD1>CERIG</KEYWORD1>
-			<KEYWORD1>CESG</KEYWORD1>
-			<KEYWORD1>CESGEN</KEYWORD1>
-			<KEYWORD1>CFAC</KEYWORD1>
-			<KEYWORD1>CFACT</KEYWORD1>
-			<KEYWORD1>CGLO</KEYWORD1>
-			<KEYWORD1>CGLOC</KEYWORD1>
-			<KEYWORD1>CGOM</KEYWORD1>
-			<KEYWORD1>CGOMGA</KEYWORD1>
-			<KEYWORD1>CHEC</KEYWORD1>
-			<KEYWORD1>CHECK</KEYWORD1>
-			<KEYWORD1>CHKM</KEYWORD1>
-			<KEYWORD1>CHKMSH</KEYWORD1>
-			<KEYWORD1>CIRC</KEYWORD1>
-			<KEYWORD1>CIRCLE</KEYWORD1>
-			<KEYWORD1>CLOC</KEYWORD1>
-			<KEYWORD1>CLOCAL</KEYWORD1>
-			<KEYWORD1>CLOG</KEYWORD1>
-			<KEYWORD1>CLOG</KEYWORD1>
-			<KEYWORD1>CLRM</KEYWORD1>
-			<KEYWORD1>CLRMSHLN</KEYWORD1>
-			<KEYWORD1>CM</KEYWORD1>
-			<KEYWORD1>CMDE</KEYWORD1>
-			<KEYWORD1>CMDELE</KEYWORD1>
-			<KEYWORD1>CMED</KEYWORD1>
-			<KEYWORD1>CMEDIT</KEYWORD1>
-			<KEYWORD1>CMGR</KEYWORD1>
-			<KEYWORD1>CMGRP</KEYWORD1>
-			<KEYWORD1>CMLI</KEYWORD1>
-			<KEYWORD1>CMLIST</KEYWORD1>
-			<KEYWORD1>CMPL</KEYWORD1>
-			<KEYWORD1>CMPLOT</KEYWORD1>
-			<KEYWORD1>CMSE</KEYWORD1>
-			<KEYWORD1>CMSEL</KEYWORD1>
-			<KEYWORD1>CNVT</KEYWORD1>
-			<KEYWORD1>CNVTOL</KEYWORD1>
-			<KEYWORD1>CON4</KEYWORD1>
-			<KEYWORD1>CON4</KEYWORD1>
-			<KEYWORD1>CONE</KEYWORD1>
-			<KEYWORD1>CONE</KEYWORD1>
-			<KEYWORD1>CONJ</KEYWORD1>
-			<KEYWORD1>CONJUG</KEYWORD1>
-			<KEYWORD1>COUP</KEYWORD1>
-			<KEYWORD1>COUPLE</KEYWORD1>
-			<KEYWORD1>COVA</KEYWORD1>
-			<KEYWORD1>COVAL</KEYWORD1>
-			<KEYWORD1>CP</KEYWORD1>
-			<KEYWORD1>CPDE</KEYWORD1>
-			<KEYWORD1>CPDELE</KEYWORD1>
-			<KEYWORD1>CPIN</KEYWORD1>
-			<KEYWORD1>CPINTF</KEYWORD1>
-			<KEYWORD1>CPLG</KEYWORD1>
-			<KEYWORD1>CPLGEN</KEYWORD1>
-			<KEYWORD1>CPLI</KEYWORD1>
-			<KEYWORD1>CPLIST</KEYWORD1>
-			<KEYWORD1>CPNG</KEYWORD1>
-			<KEYWORD1>CPNGEN</KEYWORD1>
-			<KEYWORD1>CPSG</KEYWORD1>
-			<KEYWORD1>CPSGEN</KEYWORD1>
-			<KEYWORD1>CQC</KEYWORD1>
-			<KEYWORD1>CRPL</KEYWORD1>
-			<KEYWORD1>CRPLIM</KEYWORD1>
-			<KEYWORD1>CS</KEYWORD1>
-			<KEYWORD1>CSCI</KEYWORD1>
-			<KEYWORD1>CSCIR</KEYWORD1>
-			<KEYWORD1>CSDE</KEYWORD1>
-			<KEYWORD1>CSDELE</KEYWORD1>
-			<KEYWORD1>CSKP</KEYWORD1>
-			<KEYWORD1>CSKP</KEYWORD1>
-			<KEYWORD1>CSLI</KEYWORD1>
-			<KEYWORD1>CSLIST</KEYWORD1>
-			<KEYWORD1>CSWP</KEYWORD1>
-			<KEYWORD1>CSWPLA</KEYWORD1>
-			<KEYWORD1>CSYS</KEYWORD1>
-			<KEYWORD1>CSYS</KEYWORD1>
-			<KEYWORD1>CURR2D</KEYWORD1>
-			<KEYWORD1>CURR</KEYWORD1>
-			<KEYWORD1>CUTC</KEYWORD1>
-			<KEYWORD1>CUTCONTROL</KEYWORD1>
-			<KEYWORD1>CVAR</KEYWORD1>
-			<KEYWORD1>CVAR</KEYWORD1>
-			<KEYWORD1>CYCG</KEYWORD1>
-			<KEYWORD1>CYCGEN</KEYWORD1>
-			<KEYWORD1>CYCS</KEYWORD1>
-			<KEYWORD1>CYCSOL</KEYWORD1>
-			<KEYWORD1>CYL4</KEYWORD1>
-			<KEYWORD1>CYL4</KEYWORD1>
-			<KEYWORD1>CYL5</KEYWORD1>
-			<KEYWORD1>CYL5</KEYWORD1>
-			<KEYWORD1>CYLI</KEYWORD1>
-			<KEYWORD1>CYLIND</KEYWORD1>
-			<KEYWORD1>D</KEYWORD1>
-			<KEYWORD1>DA</KEYWORD1>
-			<KEYWORD1>DADE</KEYWORD1>
-			<KEYWORD1>DADELE</KEYWORD1>
-			<KEYWORD1>DALI</KEYWORD1>
-			<KEYWORD1>DALIST</KEYWORD1>
-			<KEYWORD1>DATA</KEYWORD1>
-			<KEYWORD1>DATA</KEYWORD1>
-			<KEYWORD1>DATA</KEYWORD1>
-			<KEYWORD1>DATADEF</KEYWORD1>
-			<KEYWORD1>DCGO</KEYWORD1>
-			<KEYWORD1>DCGOMG</KEYWORD1>
-			<KEYWORD1>DCUM</KEYWORD1>
-			<KEYWORD1>DCUM</KEYWORD1>
-			<KEYWORD1>DDEL</KEYWORD1>
-			<KEYWORD1>DDELE</KEYWORD1>
-			<KEYWORD1>DEAC</KEYWORD1>
-			<KEYWORD1>DEACT</KEYWORD1>
-			<KEYWORD1>DEFI</KEYWORD1>
-			<KEYWORD1>DEFINE</KEYWORD1>
-			<KEYWORD1>DELT</KEYWORD1>
-			<KEYWORD1>DELTIM</KEYWORD1>
-			<KEYWORD1>DERI</KEYWORD1>
-			<KEYWORD1>DERIV</KEYWORD1>
-			<KEYWORD1>DESI</KEYWORD1>
-			<KEYWORD1>DESIZE</KEYWORD1>
-			<KEYWORD1>DESO</KEYWORD1>
-			<KEYWORD1>DESOL</KEYWORD1>
-			<KEYWORD1>DETA</KEYWORD1>
-			<KEYWORD1>DETAB</KEYWORD1>
-			<KEYWORD1>DIG</KEYWORD1>
-			<KEYWORD1>DIGI</KEYWORD1>
-			<KEYWORD1>DIGIT</KEYWORD1>
-			<KEYWORD1>DISP</KEYWORD1>
-			<KEYWORD1>DISPLAY</KEYWORD1>
-			<KEYWORD1>DK</KEYWORD1>
-			<KEYWORD1>DKDE</KEYWORD1>
-			<KEYWORD1>DKDELE</KEYWORD1>
-			<KEYWORD1>DKLI</KEYWORD1>
-			<KEYWORD1>DKLIST</KEYWORD1>
-			<KEYWORD1>DL</KEYWORD1>
-			<KEYWORD1>DLDE</KEYWORD1>
-			<KEYWORD1>DLDELE</KEYWORD1>
-			<KEYWORD1>DLIS</KEYWORD1>
-			<KEYWORD1>DLIST</KEYWORD1>
-			<KEYWORD1>DLLI</KEYWORD1>
-			<KEYWORD1>DLLIST</KEYWORD1>
-			<KEYWORD1>DMOV</KEYWORD1>
-			<KEYWORD1>DMOVE</KEYWORD1>
-			<KEYWORD1>DMPR</KEYWORD1>
-			<KEYWORD1>DMPRAT</KEYWORD1>
-			<KEYWORD1>DNSO</KEYWORD1>
-			<KEYWORD1>DNSOL</KEYWORD1>
-			<KEYWORD1>DOF</KEYWORD1>
-			<KEYWORD1>DOFS</KEYWORD1>
-			<KEYWORD1>DOFSEL</KEYWORD1>
-			<KEYWORD1>DOME</KEYWORD1>
-			<KEYWORD1>DOMEGA</KEYWORD1>
-			<KEYWORD1>DSCA</KEYWORD1>
-			<KEYWORD1>DSCALE</KEYWORD1>
-			<KEYWORD1>DSET</KEYWORD1>
-			<KEYWORD1>DSET</KEYWORD1>
-			<KEYWORD1>DSUM</KEYWORD1>
-			<KEYWORD1>DSUM</KEYWORD1>
-			<KEYWORD1>DSUR</KEYWORD1>
-			<KEYWORD1>DSURF</KEYWORD1>
-			<KEYWORD1>DSYM</KEYWORD1>
-			<KEYWORD1>DSYM</KEYWORD1>
-			<KEYWORD1>DSYS</KEYWORD1>
-			<KEYWORD1>DSYS</KEYWORD1>
-			<KEYWORD1>DTRA</KEYWORD1>
-			<KEYWORD1>DTRAN</KEYWORD1>
-			<KEYWORD1>DUMP</KEYWORD1>
-			<KEYWORD1>DUMP</KEYWORD1>
-			<KEYWORD1>DYNO</KEYWORD1>
-			<KEYWORD1>DYNOPT</KEYWORD1>
-			<KEYWORD1>E</KEYWORD1>
-			<KEYWORD1>EALI</KEYWORD1>
-			<KEYWORD1>EALIVE</KEYWORD1>
-			<KEYWORD1>EDBO</KEYWORD1>
-			<KEYWORD1>EDBOUND</KEYWORD1>
-			<KEYWORD1>EDBV</KEYWORD1>
-			<KEYWORD1>EDBVIS</KEYWORD1>
-			<KEYWORD1>EDCD</KEYWORD1>
-			<KEYWORD1>EDCDELE</KEYWORD1>
-			<KEYWORD1>EDCG</KEYWORD1>
-			<KEYWORD1>EDCGEN</KEYWORD1>
-			<KEYWORD1>EDCL</KEYWORD1>
-			<KEYWORD1>EDCLIST</KEYWORD1>
-			<KEYWORD1>EDCO</KEYWORD1>
-			<KEYWORD1>EDCONTACT</KEYWORD1>
-			<KEYWORD1>EDCP</KEYWORD1>
-			<KEYWORD1>EDCPU</KEYWORD1>
-			<KEYWORD1>EDCR</KEYWORD1>
-			<KEYWORD1>EDCRB</KEYWORD1>
-			<KEYWORD1>EDCS</KEYWORD1>
-			<KEYWORD1>EDCSC</KEYWORD1>
-			<KEYWORD1>EDCT</KEYWORD1>
-			<KEYWORD1>EDCTS</KEYWORD1>
-			<KEYWORD1>EDCU</KEYWORD1>
-			<KEYWORD1>EDCURVE</KEYWORD1>
-			<KEYWORD1>EDDA</KEYWORD1>
-			<KEYWORD1>EDDAMP</KEYWORD1>
-			<KEYWORD1>EDDR</KEYWORD1>
-			<KEYWORD1>EDDRELAX</KEYWORD1>
-			<KEYWORD1>EDEL</KEYWORD1>
-			<KEYWORD1>EDELE</KEYWORD1>
-			<KEYWORD1>EDEN</KEYWORD1>
-			<KEYWORD1>EDENERGY</KEYWORD1>
-			<KEYWORD1>EDFP</KEYWORD1>
-			<KEYWORD1>EDFPLOT</KEYWORD1>
-			<KEYWORD1>EDHG</KEYWORD1>
-			<KEYWORD1>EDHGLS</KEYWORD1>
-			<KEYWORD1>EDHI</KEYWORD1>
-			<KEYWORD1>EDHIST</KEYWORD1>
-			<KEYWORD1>EDHT</KEYWORD1>
-			<KEYWORD1>EDHTIME</KEYWORD1>
-			<KEYWORD1>EDIN</KEYWORD1>
-			<KEYWORD1>EDINT</KEYWORD1>
-			<KEYWORD1>EDIV</KEYWORD1>
-			<KEYWORD1>EDIVELO</KEYWORD1>
-			<KEYWORD1>EDLC</KEYWORD1>
-			<KEYWORD1>EDLCS</KEYWORD1>
-			<KEYWORD1>EDLD</KEYWORD1>
-			<KEYWORD1>EDLDPLOT</KEYWORD1>
-			<KEYWORD1>EDLO</KEYWORD1>
-			<KEYWORD1>EDLOAD</KEYWORD1>
-			<KEYWORD1>EDMP</KEYWORD1>
-			<KEYWORD1>EDMP</KEYWORD1>
-			<KEYWORD1>EDND</KEYWORD1>
-			<KEYWORD1>EDNDTSD</KEYWORD1>
-			<KEYWORD1>EDNR</KEYWORD1>
-			<KEYWORD1>EDNROT</KEYWORD1>
-			<KEYWORD1>EDOP</KEYWORD1>
-			<KEYWORD1>EDOPT</KEYWORD1>
-			<KEYWORD1>EDOU</KEYWORD1>
-			<KEYWORD1>EDOUT</KEYWORD1>
-			<KEYWORD1>EDRE</KEYWORD1>
-			<KEYWORD1>EDREAD</KEYWORD1>
-			<KEYWORD1>EDRS</KEYWORD1>
-			<KEYWORD1>EDRST</KEYWORD1>
-			<KEYWORD1>EDSH</KEYWORD1>
-			<KEYWORD1>EDSHELL</KEYWORD1>
-			<KEYWORD1>EDSO</KEYWORD1>
-			<KEYWORD1>EDSOLV</KEYWORD1>
-			<KEYWORD1>EDST</KEYWORD1>
-			<KEYWORD1>EDSTART</KEYWORD1>
-			<KEYWORD1>EDWE</KEYWORD1>
-			<KEYWORD1>EDWELD</KEYWORD1>
-			<KEYWORD1>EDWR</KEYWORD1>
-			<KEYWORD1>EDWRITE</KEYWORD1>
-			<KEYWORD1>EGEN</KEYWORD1>
-			<KEYWORD1>EGEN</KEYWORD1>
-			<KEYWORD1>EINT</KEYWORD1>
-			<KEYWORD1>EINTF</KEYWORD1>
-			<KEYWORD1>EKIL</KEYWORD1>
-			<KEYWORD1>EKILL</KEYWORD1>
-			<KEYWORD1>ELEM</KEYWORD1>
-			<KEYWORD1>ELEM</KEYWORD1>
-			<KEYWORD1>ELIS</KEYWORD1>
-			<KEYWORD1>ELIST</KEYWORD1>
-			<KEYWORD1>EMAG</KEYWORD1>
-			<KEYWORD1>EMAGERR</KEYWORD1>
-			<KEYWORD1>EMF</KEYWORD1>
-			<KEYWORD1>EMID</KEYWORD1>
-			<KEYWORD1>EMID</KEYWORD1>
-			<KEYWORD1>EMIS</KEYWORD1>
-			<KEYWORD1>EMIS</KEYWORD1>
-			<KEYWORD1>EMOD</KEYWORD1>
-			<KEYWORD1>EMODIF</KEYWORD1>
-			<KEYWORD1>EMOR</KEYWORD1>
-			<KEYWORD1>EMORE</KEYWORD1>
-			<KEYWORD1>EMSY</KEYWORD1>
-			<KEYWORD1>EMSYM</KEYWORD1>
-			<KEYWORD1>EMUN</KEYWORD1>
-			<KEYWORD1>EMUNIT</KEYWORD1>
-			<KEYWORD1>EN</KEYWORD1>
-			<KEYWORD1>ENGE</KEYWORD1>
-			<KEYWORD1>ENGEN</KEYWORD1>
-			<KEYWORD1>ENOR</KEYWORD1>
-			<KEYWORD1>ENORM</KEYWORD1>
-			<KEYWORD1>ENSY</KEYWORD1>
-			<KEYWORD1>ENSYM</KEYWORD1>
-			<KEYWORD1>EPLO</KEYWORD1>
-			<KEYWORD1>EPLOT</KEYWORD1>
-			<KEYWORD1>EQSL</KEYWORD1>
-			<KEYWORD1>EQSLV</KEYWORD1>
-			<KEYWORD1>ERAS</KEYWORD1>
-			<KEYWORD1>ERASE</KEYWORD1>
-			<KEYWORD1>EREA</KEYWORD1>
-			<KEYWORD1>EREAD</KEYWORD1>
-			<KEYWORD1>EREF</KEYWORD1>
-			<KEYWORD1>EREFINE</KEYWORD1>
-			<KEYWORD1>ERES</KEYWORD1>
-			<KEYWORD1>ERESX</KEYWORD1>
-			<KEYWORD1>ERNO</KEYWORD1>
-			<KEYWORD1>ERNORM</KEYWORD1>
-			<KEYWORD1>ERRA</KEYWORD1>
-			<KEYWORD1>ERRANG</KEYWORD1>
-			<KEYWORD1>ESEL</KEYWORD1>
-			<KEYWORD1>ESEL</KEYWORD1>
-			<KEYWORD1>ESIZ</KEYWORD1>
-			<KEYWORD1>ESIZE</KEYWORD1>
-			<KEYWORD1>ESLA</KEYWORD1>
-			<KEYWORD1>ESLA</KEYWORD1>
-			<KEYWORD1>ESLL</KEYWORD1>
-			<KEYWORD1>ESLL</KEYWORD1>
-			<KEYWORD1>ESLN</KEYWORD1>
-			<KEYWORD1>ESLN</KEYWORD1>
-			<KEYWORD1>ESLV</KEYWORD1>
-			<KEYWORD1>ESLV</KEYWORD1>
-			<KEYWORD1>ESOL</KEYWORD1>
-			<KEYWORD1>ESOL</KEYWORD1>
-			<KEYWORD1>ESOR</KEYWORD1>
-			<KEYWORD1>ESORT</KEYWORD1>
-			<KEYWORD1>ESTI</KEYWORD1>
-			<KEYWORD1>ESTIF</KEYWORD1>
-			<KEYWORD1>ESUR</KEYWORD1>
-			<KEYWORD1>ESURF</KEYWORD1>
-			<KEYWORD1>ESYM</KEYWORD1>
-			<KEYWORD1>ESYM</KEYWORD1>
-			<KEYWORD1>ESYS</KEYWORD1>
-			<KEYWORD1>ESYS</KEYWORD1>
-			<KEYWORD1>ET</KEYWORD1>
-			<KEYWORD1>ETAB</KEYWORD1>
-			<KEYWORD1>ETABLE</KEYWORD1>
-			<KEYWORD1>ETCH</KEYWORD1>
-			<KEYWORD1>ETCHG</KEYWORD1>
-			<KEYWORD1>ETDE</KEYWORD1>
-			<KEYWORD1>ETDELE</KEYWORD1>
-			<KEYWORD1>ETLI</KEYWORD1>
-			<KEYWORD1>ETLIST</KEYWORD1>
-			<KEYWORD1>ETYP</KEYWORD1>
-			<KEYWORD1>ETYPE</KEYWORD1>
-			<KEYWORD1>EUSO</KEYWORD1>
-			<KEYWORD1>EUSORT</KEYWORD1>
-			<KEYWORD1>EWRI</KEYWORD1>
-			<KEYWORD1>EWRITE</KEYWORD1>
-			<KEYWORD1>EXP</KEYWORD1>
-			<KEYWORD1>EXPA</KEYWORD1>
-			<KEYWORD1>EXPA</KEYWORD1>
-			<KEYWORD1>EXPAND</KEYWORD1>
-			<KEYWORD1>EXPASS</KEYWORD1>
-			<KEYWORD1>EXPS</KEYWORD1>
-			<KEYWORD1>EXPSOL</KEYWORD1>
-			<KEYWORD1>EXTO</KEYWORD1>
-			<KEYWORD1>EXTOPT</KEYWORD1>
-			<KEYWORD1>EXTR</KEYWORD1>
-			<KEYWORD1>EXTREM</KEYWORD1>
-			<KEYWORD1>FATI</KEYWORD1>
-			<KEYWORD1>FATIGUE</KEYWORD1>
-			<KEYWORD1>FCUM</KEYWORD1>
-			<KEYWORD1>FCUM</KEYWORD1>
-			<KEYWORD1>FDEL</KEYWORD1>
-			<KEYWORD1>FDELE</KEYWORD1>
-			<KEYWORD1>FE</KEYWORD1>
-			<KEYWORD1>FEBO</KEYWORD1>
-			<KEYWORD1>FEBODY</KEYWORD1>
-			<KEYWORD1>FECO</KEYWORD1>
-			<KEYWORD1>FECONS</KEYWORD1>
-			<KEYWORD1>FEFO</KEYWORD1>
-			<KEYWORD1>FEFOR</KEYWORD1>
-			<KEYWORD1>FELI</KEYWORD1>
-			<KEYWORD1>FELIST</KEYWORD1>
-			<KEYWORD1>FESU</KEYWORD1>
-			<KEYWORD1>FESURF</KEYWORD1>
-			<KEYWORD1>FILE</KEYWORD1>
-			<KEYWORD1>FILE</KEYWORD1>
-			<KEYWORD1>FILE</KEYWORD1>
-			<KEYWORD1>FILE</KEYWORD1>
-			<KEYWORD1>FILEAUX2</KEYWORD1>
-			<KEYWORD1>FILEDISP</KEYWORD1>
-			<KEYWORD1>FILL</KEYWORD1>
-			<KEYWORD1>FILL</KEYWORD1>
-			<KEYWORD1>FILL</KEYWORD1>
-			<KEYWORD1>FILLDATA</KEYWORD1>
-			<KEYWORD1>FINI</KEYWORD1>
-			<KEYWORD1>FINISH</KEYWORD1>
-			<KEYWORD1>FITE</KEYWORD1>
-			<KEYWORD1>FITEM</KEYWORD1>
-			<KEYWORD1>FK</KEYWORD1>
-			<KEYWORD1>FKDE</KEYWORD1>
-			<KEYWORD1>FKDELE</KEYWORD1>
-			<KEYWORD1>FKLI</KEYWORD1>
-			<KEYWORD1>FKLIST</KEYWORD1>
-			<KEYWORD1>FL</KEYWORD1>
-			<KEYWORD1>FLAN</KEYWORD1>
-			<KEYWORD1>FLANGE</KEYWORD1>
-			<KEYWORD1>FLDA</KEYWORD1>
-			<KEYWORD1>FLDATA</KEYWORD1>
-			<KEYWORD1>FLDATA10</KEYWORD1>
-			<KEYWORD1>FLDATA11</KEYWORD1>
-			<KEYWORD1>FLDATA12</KEYWORD1>
-			<KEYWORD1>FLDATA13</KEYWORD1>
-			<KEYWORD1>FLDATA14</KEYWORD1>
-			<KEYWORD1>FLDATA15</KEYWORD1>
-			<KEYWORD1>FLDATA16</KEYWORD1>
-			<KEYWORD1>FLDATA17</KEYWORD1>
-			<KEYWORD1>FLDATA18</KEYWORD1>
-			<KEYWORD1>FLDATA19</KEYWORD1>
-			<KEYWORD1>FLDATA1</KEYWORD1>
-			<KEYWORD1>FLDATA20</KEYWORD1>
-			<KEYWORD1>FLDATA20A</KEYWORD1>
-			<KEYWORD1>FLDATA21</KEYWORD1>
-			<KEYWORD1>FLDATA22</KEYWORD1>
-			<KEYWORD1>FLDATA23</KEYWORD1>
-			<KEYWORD1>FLDATA24</KEYWORD1>
-			<KEYWORD1>FLDATA24A</KEYWORD1>
-			<KEYWORD1>FLDATA24B</KEYWORD1>
-			<KEYWORD1>FLDATA24C</KEYWORD1>
-			<KEYWORD1>FLDATA24D</KEYWORD1>
-			<KEYWORD1>FLDATA25</KEYWORD1>
-			<KEYWORD1>FLDATA26</KEYWORD1>
-			<KEYWORD1>FLDATA27</KEYWORD1>
-			<KEYWORD1>FLDATA28</KEYWORD1>
-			<KEYWORD1>FLDATA29</KEYWORD1>
-			<KEYWORD1>FLDATA2</KEYWORD1>
-			<KEYWORD1>FLDATA30</KEYWORD1>
-			<KEYWORD1>FLDATA31</KEYWORD1>
-			<KEYWORD1>FLDATA32</KEYWORD1>
-			<KEYWORD1>FLDATA33</KEYWORD1>
-			<KEYWORD1>FLDATA37</KEYWORD1>
-			<KEYWORD1>FLDATA3</KEYWORD1>
-			<KEYWORD1>FLDATA4</KEYWORD1>
-			<KEYWORD1>FLDATA4A</KEYWORD1>
-			<KEYWORD1>FLDATA5</KEYWORD1>
-			<KEYWORD1>FLDATA6</KEYWORD1>
-			<KEYWORD1>FLDATA7</KEYWORD1>
-			<KEYWORD1>FLDATA8</KEYWORD1>
-			<KEYWORD1>FLDATA9</KEYWORD1>
-			<KEYWORD1>FLDATA</KEYWORD1>
-			<KEYWORD1>FLIS</KEYWORD1>
-			<KEYWORD1>FLIST</KEYWORD1>
-			<KEYWORD1>FLLI</KEYWORD1>
-			<KEYWORD1>FLLIST</KEYWORD1>
-			<KEYWORD1>FLOC</KEYWORD1>
-			<KEYWORD1>FLOCHECK</KEYWORD1>
-			<KEYWORD1>FLOT</KEYWORD1>
-			<KEYWORD1>FLOTRAN</KEYWORD1>
-			<KEYWORD1>FLRE</KEYWORD1>
-			<KEYWORD1>FLREAD</KEYWORD1>
-			<KEYWORD1>FLST</KEYWORD1>
-			<KEYWORD1>FLST</KEYWORD1>
-			<KEYWORD1>FLUX</KEYWORD1>
-			<KEYWORD1>FLUXV</KEYWORD1>
-			<KEYWORD1>FMAG</KEYWORD1>
-			<KEYWORD1>FMAG</KEYWORD1>
-			<KEYWORD1>FMAGBC</KEYWORD1>
-			<KEYWORD1>FMAGSUM</KEYWORD1>
-			<KEYWORD1>FOR2</KEYWORD1>
-			<KEYWORD1>FOR2D</KEYWORD1>
-			<KEYWORD1>FORC</KEYWORD1>
-			<KEYWORD1>FORCE</KEYWORD1>
-			<KEYWORD1>FORM</KEYWORD1>
-			<KEYWORD1>FORM</KEYWORD1>
-			<KEYWORD1>FP</KEYWORD1>
-			<KEYWORD1>FPLI</KEYWORD1>
-			<KEYWORD1>FPLIST</KEYWORD1>
-			<KEYWORD1>FREQ</KEYWORD1>
-			<KEYWORD1>FREQ</KEYWORD1>
-			<KEYWORD1>FS</KEYWORD1>
-			<KEYWORD1>FSCA</KEYWORD1>
-			<KEYWORD1>FSCALE</KEYWORD1>
-			<KEYWORD1>FSDE</KEYWORD1>
-			<KEYWORD1>FSDELE</KEYWORD1>
-			<KEYWORD1>FSLI</KEYWORD1>
-			<KEYWORD1>FSLIST</KEYWORD1>
-			<KEYWORD1>FSNO</KEYWORD1>
-			<KEYWORD1>FSNODE</KEYWORD1>
-			<KEYWORD1>FSPL</KEYWORD1>
-			<KEYWORD1>FSPLOT</KEYWORD1>
-			<KEYWORD1>FSSE</KEYWORD1>
-			<KEYWORD1>FSSECT</KEYWORD1>
-			<KEYWORD1>FSUM</KEYWORD1>
-			<KEYWORD1>FSUM</KEYWORD1>
-			<KEYWORD1>FTCA</KEYWORD1>
-			<KEYWORD1>FTCALC</KEYWORD1>
-			<KEYWORD1>FTRA</KEYWORD1>
-			<KEYWORD1>FTRAN</KEYWORD1>
-			<KEYWORD1>FTSI</KEYWORD1>
-			<KEYWORD1>FTSIZE</KEYWORD1>
-			<KEYWORD1>FTWR</KEYWORD1>
-			<KEYWORD1>FTWRITE</KEYWORD1>
-			<KEYWORD1>FVME</KEYWORD1>
-			<KEYWORD1>FVMESH</KEYWORD1>
-			<KEYWORD1>GAP</KEYWORD1>
-			<KEYWORD1>GAPF</KEYWORD1>
-			<KEYWORD1>GAPFINISH</KEYWORD1>
-			<KEYWORD1>GAPL</KEYWORD1>
-			<KEYWORD1>GAPLIST</KEYWORD1>
-			<KEYWORD1>GAPM</KEYWORD1>
-			<KEYWORD1>GAPMERGE</KEYWORD1>
-			<KEYWORD1>GAPO</KEYWORD1>
-			<KEYWORD1>GAPOPT</KEYWORD1>
-			<KEYWORD1>GAPP</KEYWORD1>
-			<KEYWORD1>GAPPLOT</KEYWORD1>
-			<KEYWORD1>GAUG</KEYWORD1>
-			<KEYWORD1>GAUGE</KEYWORD1>
-			<KEYWORD1>GCGE</KEYWORD1>
-			<KEYWORD1>GCGEN</KEYWORD1>
-			<KEYWORD1>GENO</KEYWORD1>
-			<KEYWORD1>GENOPT</KEYWORD1>
-			<KEYWORD1>GEOM</KEYWORD1>
-			<KEYWORD1>GEOM</KEYWORD1>
-			<KEYWORD1>GEOM</KEYWORD1>
-			<KEYWORD1>GEOMETRY</KEYWORD1>
-			<KEYWORD1>GP</KEYWORD1>
-			<KEYWORD1>GPDE</KEYWORD1>
-			<KEYWORD1>GPDELE</KEYWORD1>
-			<KEYWORD1>GPLI</KEYWORD1>
-			<KEYWORD1>GPLIST</KEYWORD1>
-			<KEYWORD1>GPLO</KEYWORD1>
-			<KEYWORD1>GPLOT</KEYWORD1>
-			<KEYWORD1>GRP</KEYWORD1>
-			<KEYWORD1>GSUM</KEYWORD1>
-			<KEYWORD1>GSUM</KEYWORD1>
-			<KEYWORD1>HARF</KEYWORD1>
-			<KEYWORD1>HARFRQ</KEYWORD1>
-			<KEYWORD1>HELP</KEYWORD1>
-			<KEYWORD1>HELP</KEYWORD1>
-			<KEYWORD1>HELP</KEYWORD1>
-			<KEYWORD1>HELPDISP</KEYWORD1>
-			<KEYWORD1>HFSW</KEYWORD1>
-			<KEYWORD1>HFSWEEP</KEYWORD1>
-			<KEYWORD1>HMAG</KEYWORD1>
-			<KEYWORD1>HMAGSOLV</KEYWORD1>
-			<KEYWORD1>HPGL</KEYWORD1>
-			<KEYWORD1>HPGL</KEYWORD1>
-			<KEYWORD1>HPTC</KEYWORD1>
-			<KEYWORD1>HPTCREATE</KEYWORD1>
-			<KEYWORD1>HPTD</KEYWORD1>
-			<KEYWORD1>HPTDELETE</KEYWORD1>
-			<KEYWORD1>HRCP</KEYWORD1>
-			<KEYWORD1>HRCPLX</KEYWORD1>
-			<KEYWORD1>HREX</KEYWORD1>
-			<KEYWORD1>HREXP</KEYWORD1>
-			<KEYWORD1>HROP</KEYWORD1>
-			<KEYWORD1>HROPT</KEYWORD1>
-			<KEYWORD1>HROU</KEYWORD1>
-			<KEYWORD1>HROUT</KEYWORD1>
-			<KEYWORD1>IC</KEYWORD1>
-			<KEYWORD1>ICDE</KEYWORD1>
-			<KEYWORD1>ICDELE</KEYWORD1>
-			<KEYWORD1>ICLI</KEYWORD1>
-			<KEYWORD1>ICLIST</KEYWORD1>
-			<KEYWORD1>IGES</KEYWORD1>
-			<KEYWORD1>IGES</KEYWORD1>
-			<KEYWORD1>IGESIN</KEYWORD1>
-			<KEYWORD1>IGESOUT</KEYWORD1>
-			<KEYWORD1>IMAG</KEYWORD1>
-			<KEYWORD1>IMAGIN</KEYWORD1>
-			<KEYWORD1>IMME</KEYWORD1>
-			<KEYWORD1>IMMED</KEYWORD1>
-			<KEYWORD1>IMPD</KEYWORD1>
-			<KEYWORD1>IMPD</KEYWORD1>
-			<KEYWORD1>INRE</KEYWORD1>
-			<KEYWORD1>INRES</KEYWORD1>
-			<KEYWORD1>INRT</KEYWORD1>
-			<KEYWORD1>INRTIA</KEYWORD1>
-			<KEYWORD1>INT1</KEYWORD1>
-			<KEYWORD1>INT1</KEYWORD1>
-			<KEYWORD1>INTS</KEYWORD1>
-			<KEYWORD1>INTSRF</KEYWORD1>
-			<KEYWORD1>IOPT</KEYWORD1>
-			<KEYWORD1>IOPTN</KEYWORD1>
-			<KEYWORD1>IRLF</KEYWORD1>
-			<KEYWORD1>IRLF</KEYWORD1>
-			<KEYWORD1>IRLI</KEYWORD1>
-			<KEYWORD1>IRLIST</KEYWORD1>
-			<KEYWORD1>K</KEYWORD1>
-			<KEYWORD1>KATT</KEYWORD1>
-			<KEYWORD1>KATT</KEYWORD1>
-			<KEYWORD1>KBC</KEYWORD1>
-			<KEYWORD1>KBET</KEYWORD1>
-			<KEYWORD1>KBETW</KEYWORD1>
-			<KEYWORD1>KCAL</KEYWORD1>
-			<KEYWORD1>KCALC</KEYWORD1>
-			<KEYWORD1>KCEN</KEYWORD1>
-			<KEYWORD1>KCENTER</KEYWORD1>
-			<KEYWORD1>KCLE</KEYWORD1>
-			<KEYWORD1>KCLEAR</KEYWORD1>
-			<KEYWORD1>KDEL</KEYWORD1>
-			<KEYWORD1>KDELE</KEYWORD1>
-			<KEYWORD1>KDIS</KEYWORD1>
-			<KEYWORD1>KDIST</KEYWORD1>
-			<KEYWORD1>KESI</KEYWORD1>
-			<KEYWORD1>KESIZE</KEYWORD1>
-			<KEYWORD1>KEYO</KEYWORD1>
-			<KEYWORD1>KEYOPT</KEYWORD1>
-			<KEYWORD1>KEYP</KEYWORD1>
-			<KEYWORD1>KEYPTS</KEYWORD1>
-			<KEYWORD1>KEYW</KEYWORD1>
-			<KEYWORD1>KEYW</KEYWORD1>
-			<KEYWORD1>KFIL</KEYWORD1>
-			<KEYWORD1>KFILL</KEYWORD1>
-			<KEYWORD1>KGEN</KEYWORD1>
-			<KEYWORD1>KGEN</KEYWORD1>
-			<KEYWORD1>KL</KEYWORD1>
-			<KEYWORD1>KLIS</KEYWORD1>
-			<KEYWORD1>KLIST</KEYWORD1>
-			<KEYWORD1>KMES</KEYWORD1>
-			<KEYWORD1>KMESH</KEYWORD1>
-			<KEYWORD1>KMOD</KEYWORD1>
-			<KEYWORD1>KMODIF</KEYWORD1>
-			<KEYWORD1>KMOV</KEYWORD1>
-			<KEYWORD1>KMOVE</KEYWORD1>
-			<KEYWORD1>KNOD</KEYWORD1>
-			<KEYWORD1>KNODE</KEYWORD1>
-			<KEYWORD1>KPLO</KEYWORD1>
-			<KEYWORD1>KPLOT</KEYWORD1>
-			<KEYWORD1>KPSC</KEYWORD1>
-			<KEYWORD1>KPSCALE</KEYWORD1>
-			<KEYWORD1>KREF</KEYWORD1>
-			<KEYWORD1>KREFINE</KEYWORD1>
-			<KEYWORD1>KSCA</KEYWORD1>
-			<KEYWORD1>KSCALE</KEYWORD1>
-			<KEYWORD1>KSCO</KEYWORD1>
-			<KEYWORD1>KSCON</KEYWORD1>
-			<KEYWORD1>KSEL</KEYWORD1>
-			<KEYWORD1>KSEL</KEYWORD1>
-			<KEYWORD1>KSLL</KEYWORD1>
-			<KEYWORD1>KSLL</KEYWORD1>
-			<KEYWORD1>KSLN</KEYWORD1>
-			<KEYWORD1>KSLN</KEYWORD1>
-			<KEYWORD1>KSUM</KEYWORD1>
-			<KEYWORD1>KSUM</KEYWORD1>
-			<KEYWORD1>KSYM</KEYWORD1>
-			<KEYWORD1>KSYMM</KEYWORD1>
-			<KEYWORD1>KTRA</KEYWORD1>
-			<KEYWORD1>KTRAN</KEYWORD1>
-			<KEYWORD1>KUSE</KEYWORD1>
-			<KEYWORD1>KUSE</KEYWORD1>
-			<KEYWORD1>KWPA</KEYWORD1>
-			<KEYWORD1>KWPAVE</KEYWORD1>
-			<KEYWORD1>KWPL</KEYWORD1>
-			<KEYWORD1>KWPLAN</KEYWORD1>
-			<KEYWORD1>L2AN</KEYWORD1>
-			<KEYWORD1>L2ANG</KEYWORD1>
-			<KEYWORD1>L2TA</KEYWORD1>
-			<KEYWORD1>L2TAN</KEYWORD1>
-			<KEYWORD1>L</KEYWORD1>
-			<KEYWORD1>LANG</KEYWORD1>
-			<KEYWORD1>LANG</KEYWORD1>
-			<KEYWORD1>LARC</KEYWORD1>
-			<KEYWORD1>LARC</KEYWORD1>
-			<KEYWORD1>LARE</KEYWORD1>
-			<KEYWORD1>LAREA</KEYWORD1>
-			<KEYWORD1>LARG</KEYWORD1>
-			<KEYWORD1>LARGE</KEYWORD1>
-			<KEYWORD1>LATT</KEYWORD1>
-			<KEYWORD1>LATT</KEYWORD1>
-			<KEYWORD1>LAYE</KEYWORD1>
-			<KEYWORD1>LAYE</KEYWORD1>
-			<KEYWORD1>LAYER</KEYWORD1>
-			<KEYWORD1>LAYERP26</KEYWORD1>
-			<KEYWORD1>LAYL</KEYWORD1>
-			<KEYWORD1>LAYLIST</KEYWORD1>
-			<KEYWORD1>LAYP</KEYWORD1>
-			<KEYWORD1>LAYPLOT</KEYWORD1>
-			<KEYWORD1>LCAB</KEYWORD1>
-			<KEYWORD1>LCABS</KEYWORD1>
-			<KEYWORD1>LCAS</KEYWORD1>
-			<KEYWORD1>LCASE</KEYWORD1>
-			<KEYWORD1>LCCA</KEYWORD1>
-			<KEYWORD1>LCCA</KEYWORD1>
-			<KEYWORD1>LCCALC</KEYWORD1>
-			<KEYWORD1>LCCAT</KEYWORD1>
-			<KEYWORD1>LCDE</KEYWORD1>
-			<KEYWORD1>LCDEF</KEYWORD1>
-			<KEYWORD1>LCFA</KEYWORD1>
-			<KEYWORD1>LCFACT</KEYWORD1>
-			<KEYWORD1>LCFI</KEYWORD1>
-			<KEYWORD1>LCFILE</KEYWORD1>
-			<KEYWORD1>LCLE</KEYWORD1>
-			<KEYWORD1>LCLEAR</KEYWORD1>
-			<KEYWORD1>LCOM</KEYWORD1>
-			<KEYWORD1>LCOMB</KEYWORD1>
-			<KEYWORD1>LCOP</KEYWORD1>
-			<KEYWORD1>LCOPER</KEYWORD1>
-			<KEYWORD1>LCSE</KEYWORD1>
-			<KEYWORD1>LCSEL</KEYWORD1>
-			<KEYWORD1>LCSL</KEYWORD1>
-			<KEYWORD1>LCSL</KEYWORD1>
-			<KEYWORD1>LCSU</KEYWORD1>
-			<KEYWORD1>LCSUM</KEYWORD1>
-			<KEYWORD1>LCWR</KEYWORD1>
-			<KEYWORD1>LCWRITE</KEYWORD1>
-			<KEYWORD1>LCZE</KEYWORD1>
-			<KEYWORD1>LCZERO</KEYWORD1>
-			<KEYWORD1>LDEL</KEYWORD1>
-			<KEYWORD1>LDELE</KEYWORD1>
-			<KEYWORD1>LDIV</KEYWORD1>
-			<KEYWORD1>LDIV</KEYWORD1>
-			<KEYWORD1>LDRA</KEYWORD1>
-			<KEYWORD1>LDRAG</KEYWORD1>
-			<KEYWORD1>LDRE</KEYWORD1>
-			<KEYWORD1>LDREAD</KEYWORD1>
-			<KEYWORD1>LESI</KEYWORD1>
-			<KEYWORD1>LESIZE</KEYWORD1>
-			<KEYWORD1>LEXT</KEYWORD1>
-			<KEYWORD1>LEXTND</KEYWORD1>
-			<KEYWORD1>LFIL</KEYWORD1>
-			<KEYWORD1>LFILLT</KEYWORD1>
-			<KEYWORD1>LFSU</KEYWORD1>
-			<KEYWORD1>LFSURF</KEYWORD1>
-			<KEYWORD1>LGEN</KEYWORD1>
-			<KEYWORD1>LGEN</KEYWORD1>
-			<KEYWORD1>LGLU</KEYWORD1>
-			<KEYWORD1>LGLUE</KEYWORD1>
-			<KEYWORD1>LGWR</KEYWORD1>
-			<KEYWORD1>LGWRITE</KEYWORD1>
-			<KEYWORD1>LINA</KEYWORD1>
-			<KEYWORD1>LINA</KEYWORD1>
-			<KEYWORD1>LINE</KEYWORD1>
-			<KEYWORD1>LINE</KEYWORD1>
-			<KEYWORD1>LINE</KEYWORD1>
-			<KEYWORD1>LINES</KEYWORD1>
-			<KEYWORD1>LINL</KEYWORD1>
-			<KEYWORD1>LINL</KEYWORD1>
-			<KEYWORD1>LINP</KEYWORD1>
-			<KEYWORD1>LINP</KEYWORD1>
-			<KEYWORD1>LINV</KEYWORD1>
-			<KEYWORD1>LINV</KEYWORD1>
-			<KEYWORD1>LLIS</KEYWORD1>
-			<KEYWORD1>LLIST</KEYWORD1>
-			<KEYWORD1>LMAT</KEYWORD1>
-			<KEYWORD1>LMATRIX</KEYWORD1>
-			<KEYWORD1>LMES</KEYWORD1>
-			<KEYWORD1>LMESH</KEYWORD1>
-			<KEYWORD1>LNCO</KEYWORD1>
-			<KEYWORD1>LNCOLLAPSE</KEYWORD1>
-			<KEYWORD1>LNDE</KEYWORD1>
-			<KEYWORD1>LNDETACH</KEYWORD1>
-			<KEYWORD1>LNFI</KEYWORD1>
-			<KEYWORD1>LNFILL</KEYWORD1>
-			<KEYWORD1>LNME</KEYWORD1>
-			<KEYWORD1>LNMERGE</KEYWORD1>
-			<KEYWORD1>LNSP</KEYWORD1>
-			<KEYWORD1>LNSPLIT</KEYWORD1>
-			<KEYWORD1>LNSR</KEYWORD1>
-			<KEYWORD1>LNSRCH</KEYWORD1>
-			<KEYWORD1>LOCA</KEYWORD1>
-			<KEYWORD1>LOCAL</KEYWORD1>
-			<KEYWORD1>LOVL</KEYWORD1>
-			<KEYWORD1>LOVLAP</KEYWORD1>
-			<KEYWORD1>LPLO</KEYWORD1>
-			<KEYWORD1>LPLOT</KEYWORD1>
-			<KEYWORD1>LPTN</KEYWORD1>
-			<KEYWORD1>LPTN</KEYWORD1>
-			<KEYWORD1>LREF</KEYWORD1>
-			<KEYWORD1>LREFINE</KEYWORD1>
-			<KEYWORD1>LREV</KEYWORD1>
-			<KEYWORD1>LREVERSE</KEYWORD1>
-			<KEYWORD1>LROT</KEYWORD1>
-			<KEYWORD1>LROTAT</KEYWORD1>
-			<KEYWORD1>LSBA</KEYWORD1>
-			<KEYWORD1>LSBA</KEYWORD1>
-			<KEYWORD1>LSBL</KEYWORD1>
-			<KEYWORD1>LSBL</KEYWORD1>
-			<KEYWORD1>LSBV</KEYWORD1>
-			<KEYWORD1>LSBV</KEYWORD1>
-			<KEYWORD1>LSBW</KEYWORD1>
-			<KEYWORD1>LSBW</KEYWORD1>
-			<KEYWORD1>LSCL</KEYWORD1>
-			<KEYWORD1>LSCLEAR</KEYWORD1>
-			<KEYWORD1>LSDE</KEYWORD1>
-			<KEYWORD1>LSDELE</KEYWORD1>
-			<KEYWORD1>LSEL</KEYWORD1>
-			<KEYWORD1>LSEL</KEYWORD1>
-			<KEYWORD1>LSLA</KEYWORD1>
-			<KEYWORD1>LSLA</KEYWORD1>
-			<KEYWORD1>LSLK</KEYWORD1>
-			<KEYWORD1>LSLK</KEYWORD1>
-			<KEYWORD1>LSOP</KEYWORD1>
-			<KEYWORD1>LSOPER</KEYWORD1>
-			<KEYWORD1>LSRE</KEYWORD1>
-			<KEYWORD1>LSREAD</KEYWORD1>
-			<KEYWORD1>LSSC</KEYWORD1>
-			<KEYWORD1>LSSCALE</KEYWORD1>
-			<KEYWORD1>LSSO</KEYWORD1>
-			<KEYWORD1>LSSOLVE</KEYWORD1>
-			<KEYWORD1>LSTR</KEYWORD1>
-			<KEYWORD1>LSTR</KEYWORD1>
-			<KEYWORD1>LSUM</KEYWORD1>
-			<KEYWORD1>LSUM</KEYWORD1>
-			<KEYWORD1>LSWR</KEYWORD1>
-			<KEYWORD1>LSWRITE</KEYWORD1>
-			<KEYWORD1>LSYM</KEYWORD1>
-			<KEYWORD1>LSYMM</KEYWORD1>
-			<KEYWORD1>LTAN</KEYWORD1>
-			<KEYWORD1>LTAN</KEYWORD1>
-			<KEYWORD1>LTRA</KEYWORD1>
-			<KEYWORD1>LTRAN</KEYWORD1>
-			<KEYWORD1>LUMP</KEYWORD1>
-			<KEYWORD1>LUMPM</KEYWORD1>
-			<KEYWORD1>LVSC</KEYWORD1>
-			<KEYWORD1>LVSCALE</KEYWORD1>
-			<KEYWORD1>LWPL</KEYWORD1>
-			<KEYWORD1>LWPLAN</KEYWORD1>
-			<KEYWORD1>M</KEYWORD1>
-			<KEYWORD1>MAGO</KEYWORD1>
-			<KEYWORD1>MAGOPT</KEYWORD1>
-			<KEYWORD1>MAGS</KEYWORD1>
-			<KEYWORD1>MAGSOLV</KEYWORD1>
-			<KEYWORD1>MAST</KEYWORD1>
-			<KEYWORD1>MASTER</KEYWORD1>
-			<KEYWORD1>MAT</KEYWORD1>
-			<KEYWORD1>MATE</KEYWORD1>
-			<KEYWORD1>MATER</KEYWORD1>
-			<KEYWORD1>MDAM</KEYWORD1>
-			<KEYWORD1>MDAMP</KEYWORD1>
-			<KEYWORD1>MDEL</KEYWORD1>
-			<KEYWORD1>MDELE</KEYWORD1>
-			<KEYWORD1>MESH</KEYWORD1>
-			<KEYWORD1>MESHING</KEYWORD1>
-			<KEYWORD1>MGEN</KEYWORD1>
-			<KEYWORD1>MGEN</KEYWORD1>
-			<KEYWORD1>MITE</KEYWORD1>
-			<KEYWORD1>MITER</KEYWORD1>
-			<KEYWORD1>MLIS</KEYWORD1>
-			<KEYWORD1>MLIST</KEYWORD1>
-			<KEYWORD1>MMF</KEYWORD1>
-			<KEYWORD1>MODE</KEYWORD1>
-			<KEYWORD1>MODE</KEYWORD1>
-			<KEYWORD1>MODM</KEYWORD1>
-			<KEYWORD1>MODMSH</KEYWORD1>
-			<KEYWORD1>MODO</KEYWORD1>
-			<KEYWORD1>MODOPT</KEYWORD1>
-			<KEYWORD1>MONI</KEYWORD1>
-			<KEYWORD1>MONITOR</KEYWORD1>
-			<KEYWORD1>MOPT</KEYWORD1>
-			<KEYWORD1>MOPT</KEYWORD1>
-			<KEYWORD1>MOVE</KEYWORD1>
-			<KEYWORD1>MOVE</KEYWORD1>
-			<KEYWORD1>MP</KEYWORD1>
-			<KEYWORD1>MPAM</KEYWORD1>
-			<KEYWORD1>MPAMOD</KEYWORD1>
-			<KEYWORD1>MPCH</KEYWORD1>
-			<KEYWORD1>MPCHG</KEYWORD1>
-			<KEYWORD1>MPDA</KEYWORD1>
-			<KEYWORD1>MPDATA</KEYWORD1>
-			<KEYWORD1>MPDE</KEYWORD1>
-			<KEYWORD1>MPDELE</KEYWORD1>
-			<KEYWORD1>MPDR</KEYWORD1>
-			<KEYWORD1>MPDRES</KEYWORD1>
-			<KEYWORD1>MPLI</KEYWORD1>
-			<KEYWORD1>MPLIST</KEYWORD1>
-			<KEYWORD1>MPMO</KEYWORD1>
-			<KEYWORD1>MPMOD</KEYWORD1>
-			<KEYWORD1>MPPL</KEYWORD1>
-			<KEYWORD1>MPPLOT</KEYWORD1>
-			<KEYWORD1>MPRE</KEYWORD1>
-			<KEYWORD1>MPREAD</KEYWORD1>
-			<KEYWORD1>MPRI</KEYWORD1>
-			<KEYWORD1>MPRINT</KEYWORD1>
-			<KEYWORD1>MPTE</KEYWORD1>
-			<KEYWORD1>MPTEMP</KEYWORD1>
-			<KEYWORD1>MPTG</KEYWORD1>
-			<KEYWORD1>MPTGEN</KEYWORD1>
-			<KEYWORD1>MPTR</KEYWORD1>
-			<KEYWORD1>MPTRES</KEYWORD1>
-			<KEYWORD1>MPUN</KEYWORD1>
-			<KEYWORD1>MPUNDO</KEYWORD1>
-			<KEYWORD1>MPWR</KEYWORD1>
-			<KEYWORD1>MPWRITE</KEYWORD1>
-			<KEYWORD1>MSAD</KEYWORD1>
-			<KEYWORD1>MSADV</KEYWORD1>
-			<KEYWORD1>MSCA</KEYWORD1>
-			<KEYWORD1>MSCAP</KEYWORD1>
-			<KEYWORD1>MSDA</KEYWORD1>
-			<KEYWORD1>MSDATA</KEYWORD1>
-			<KEYWORD1>MSHA</KEYWORD1>
-			<KEYWORD1>MSHAPE</KEYWORD1>
-			<KEYWORD1>MSHK</KEYWORD1>
-			<KEYWORD1>MSHKEY</KEYWORD1>
-			<KEYWORD1>MSHM</KEYWORD1>
-			<KEYWORD1>MSHMID</KEYWORD1>
-			<KEYWORD1>MSHP</KEYWORD1>
-			<KEYWORD1>MSHPATTERN</KEYWORD1>
-			<KEYWORD1>MSME</KEYWORD1>
-			<KEYWORD1>MSMETH</KEYWORD1>
-			<KEYWORD1>MSNO</KEYWORD1>
-			<KEYWORD1>MSNOMF</KEYWORD1>
-			<KEYWORD1>MSPR</KEYWORD1>
-			<KEYWORD1>MSPROP</KEYWORD1>
-			<KEYWORD1>MSQU</KEYWORD1>
-			<KEYWORD1>MSQUAD</KEYWORD1>
-			<KEYWORD1>MSRE</KEYWORD1>
-			<KEYWORD1>MSRELAX</KEYWORD1>
-			<KEYWORD1>MSSO</KEYWORD1>
-			<KEYWORD1>MSSOLU</KEYWORD1>
-			<KEYWORD1>MSSP</KEYWORD1>
-			<KEYWORD1>MSSPEC</KEYWORD1>
-			<KEYWORD1>MSTE</KEYWORD1>
-			<KEYWORD1>MSTERM</KEYWORD1>
-			<KEYWORD1>MSVA</KEYWORD1>
-			<KEYWORD1>MSVARY</KEYWORD1>
-			<KEYWORD1>MXPA</KEYWORD1>
-			<KEYWORD1>MXPAND</KEYWORD1>
-			<KEYWORD1>N</KEYWORD1>
-			<KEYWORD1>NANG</KEYWORD1>
-			<KEYWORD1>NANG</KEYWORD1>
-			<KEYWORD1>NCNV</KEYWORD1>
-			<KEYWORD1>NCNV</KEYWORD1>
-			<KEYWORD1>NDEL</KEYWORD1>
-			<KEYWORD1>NDELE</KEYWORD1>
-			<KEYWORD1>NDIS</KEYWORD1>
-			<KEYWORD1>NDIST</KEYWORD1>
-			<KEYWORD1>NEQI</KEYWORD1>
-			<KEYWORD1>NEQIT</KEYWORD1>
-			<KEYWORD1>NFOR</KEYWORD1>
-			<KEYWORD1>NFORCE</KEYWORD1>
-			<KEYWORD1>NGEN</KEYWORD1>
-			<KEYWORD1>NGEN</KEYWORD1>
-			<KEYWORD1>NKPT</KEYWORD1>
-			<KEYWORD1>NKPT</KEYWORD1>
-			<KEYWORD1>NLGE</KEYWORD1>
-			<KEYWORD1>NLGEOM</KEYWORD1>
-			<KEYWORD1>NLIS</KEYWORD1>
-			<KEYWORD1>NLIST</KEYWORD1>
-			<KEYWORD1>NLOG</KEYWORD1>
-			<KEYWORD1>NLOG</KEYWORD1>
-			<KEYWORD1>NLOP</KEYWORD1>
-			<KEYWORD1>NLOPT</KEYWORD1>
-			<KEYWORD1>NMOD</KEYWORD1>
-			<KEYWORD1>NMODIF</KEYWORD1>
-			<KEYWORD1>NOCO</KEYWORD1>
-			<KEYWORD1>NOCOLOR</KEYWORD1>
-			<KEYWORD1>NODE</KEYWORD1>
-			<KEYWORD1>NODES</KEYWORD1>
-			<KEYWORD1>NOOR</KEYWORD1>
-			<KEYWORD1>NOORDER</KEYWORD1>
-			<KEYWORD1>NPLO</KEYWORD1>
-			<KEYWORD1>NPLOT</KEYWORD1>
-			<KEYWORD1>NPRI</KEYWORD1>
-			<KEYWORD1>NPRINT</KEYWORD1>
-			<KEYWORD1>NREA</KEYWORD1>
-			<KEYWORD1>NREAD</KEYWORD1>
-			<KEYWORD1>NREF</KEYWORD1>
-			<KEYWORD1>NREFINE</KEYWORD1>
-			<KEYWORD1>NRLS</KEYWORD1>
-			<KEYWORD1>NRLSUM</KEYWORD1>
-			<KEYWORD1>NROP</KEYWORD1>
-			<KEYWORD1>NROPT</KEYWORD1>
-			<KEYWORD1>NROT</KEYWORD1>
-			<KEYWORD1>NROTAT</KEYWORD1>
-			<KEYWORD1>NRRA</KEYWORD1>
-			<KEYWORD1>NRRANG</KEYWORD1>
-			<KEYWORD1>NSCA</KEYWORD1>
-			<KEYWORD1>NSCALE</KEYWORD1>
-			<KEYWORD1>NSEL</KEYWORD1>
-			<KEYWORD1>NSEL</KEYWORD1>
-			<KEYWORD1>NSLA</KEYWORD1>
-			<KEYWORD1>NSLA</KEYWORD1>
-			<KEYWORD1>NSLE</KEYWORD1>
-			<KEYWORD1>NSLE</KEYWORD1>
-			<KEYWORD1>NSLK</KEYWORD1>
-			<KEYWORD1>NSLK</KEYWORD1>
-			<KEYWORD1>NSLL</KEYWORD1>
-			<KEYWORD1>NSLL</KEYWORD1>
-			<KEYWORD1>NSLV</KEYWORD1>
-			<KEYWORD1>NSLV</KEYWORD1>
-			<KEYWORD1>NSOL</KEYWORD1>
-			<KEYWORD1>NSOL</KEYWORD1>
-			<KEYWORD1>NSOR</KEYWORD1>
-			<KEYWORD1>NSORT</KEYWORD1>
-			<KEYWORD1>NSTO</KEYWORD1>
-			<KEYWORD1>NSTORE</KEYWORD1>
-			<KEYWORD1>NSUB</KEYWORD1>
-			<KEYWORD1>NSUBST</KEYWORD1>
-			<KEYWORD1>NSVR</KEYWORD1>
-			<KEYWORD1>NSVR</KEYWORD1>
-			<KEYWORD1>NSYM</KEYWORD1>
-			<KEYWORD1>NSYM</KEYWORD1>
-			<KEYWORD1>NUMC</KEYWORD1>
-			<KEYWORD1>NUMCMP</KEYWORD1>
-			<KEYWORD1>NUME</KEYWORD1>
-			<KEYWORD1>NUMEXP</KEYWORD1>
-			<KEYWORD1>NUMM</KEYWORD1>
-			<KEYWORD1>NUMMRG</KEYWORD1>
-			<KEYWORD1>NUMO</KEYWORD1>
-			<KEYWORD1>NUMOFF</KEYWORD1>
-			<KEYWORD1>NUMS</KEYWORD1>
-			<KEYWORD1>NUMSTR</KEYWORD1>
-			<KEYWORD1>NUMV</KEYWORD1>
-			<KEYWORD1>NUMVAR</KEYWORD1>
-			<KEYWORD1>NUSO</KEYWORD1>
-			<KEYWORD1>NUSORT</KEYWORD1>
-			<KEYWORD1>NWPA</KEYWORD1>
-			<KEYWORD1>NWPAVE</KEYWORD1>
-			<KEYWORD1>NWPL</KEYWORD1>
-			<KEYWORD1>NWPLAN</KEYWORD1>
-			<KEYWORD1>NWRI</KEYWORD1>
-			<KEYWORD1>NWRITE</KEYWORD1>
-			<KEYWORD1>nx</KEYWORD1>
-			<KEYWORD1>ny</KEYWORD1>
-			<KEYWORD1>nz</KEYWORD1>
-			<KEYWORD1>OMEG</KEYWORD1>
-			<KEYWORD1>OMEGA</KEYWORD1>
-			<KEYWORD1>OPAD</KEYWORD1>
-			<KEYWORD1>OPADD</KEYWORD1>
-			<KEYWORD1>OPAN</KEYWORD1>
-			<KEYWORD1>OPANL</KEYWORD1>
-			<KEYWORD1>OPCL</KEYWORD1>
-			<KEYWORD1>OPCLR</KEYWORD1>
-			<KEYWORD1>OPDA</KEYWORD1>
-			<KEYWORD1>OPDATA</KEYWORD1>
-			<KEYWORD1>OPDE</KEYWORD1>
-			<KEYWORD1>OPDEL</KEYWORD1>
-			<KEYWORD1>OPEQ</KEYWORD1>
-			<KEYWORD1>OPEQN</KEYWORD1>
-			<KEYWORD1>OPER</KEYWORD1>
-			<KEYWORD1>OPERATE</KEYWORD1>
-			<KEYWORD1>OPEX</KEYWORD1>
-			<KEYWORD1>OPEXE</KEYWORD1>
-			<KEYWORD1>OPFA</KEYWORD1>
-			<KEYWORD1>OPFACT</KEYWORD1>
-			<KEYWORD1>OPFR</KEYWORD1>
-			<KEYWORD1>OPFRST</KEYWORD1>
-			<KEYWORD1>OPGR</KEYWORD1>
-			<KEYWORD1>OPGRAD</KEYWORD1>
-			<KEYWORD1>OPKE</KEYWORD1>
-			<KEYWORD1>OPKEEP</KEYWORD1>
-			<KEYWORD1>OPLF</KEYWORD1>
-			<KEYWORD1>OPLFA</KEYWORD1>
-			<KEYWORD1>OPLG</KEYWORD1>
-			<KEYWORD1>OPLGR</KEYWORD1>
-			<KEYWORD1>OPLI</KEYWORD1>
-			<KEYWORD1>OPLIST</KEYWORD1>
-			<KEYWORD1>OPLO</KEYWORD1>
-			<KEYWORD1>OPLOOP</KEYWORD1>
-			<KEYWORD1>OPLS</KEYWORD1>
-			<KEYWORD1>OPLSW</KEYWORD1>
-			<KEYWORD1>OPMA</KEYWORD1>
-			<KEYWORD1>OPMAKE</KEYWORD1>
-			<KEYWORD1>OPNC</KEYWORD1>
-			<KEYWORD1>OPNCONTROL</KEYWORD1>
-			<KEYWORD1>OPPR</KEYWORD1>
-			<KEYWORD1>OPPRNT</KEYWORD1>
-			<KEYWORD1>OPRA</KEYWORD1>
-			<KEYWORD1>OPRAND</KEYWORD1>
-			<KEYWORD1>OPRE</KEYWORD1>
-			<KEYWORD1>OPRESU</KEYWORD1>
-			<KEYWORD1>OPRF</KEYWORD1>
-			<KEYWORD1>OPRFA</KEYWORD1>
-			<KEYWORD1>OPRG</KEYWORD1>
-			<KEYWORD1>OPRGR</KEYWORD1>
-			<KEYWORD1>OPRS</KEYWORD1>
-			<KEYWORD1>OPRSW</KEYWORD1>
-			<KEYWORD1>OPSA</KEYWORD1>
-			<KEYWORD1>OPSAVE</KEYWORD1>
-			<KEYWORD1>OPSE</KEYWORD1>
-			<KEYWORD1>OPSEL</KEYWORD1>
-			<KEYWORD1>OPSU</KEYWORD1>
-			<KEYWORD1>OPSUBP</KEYWORD1>
-			<KEYWORD1>OPSW</KEYWORD1>
-			<KEYWORD1>OPSWEEP</KEYWORD1>
-			<KEYWORD1>OPTY</KEYWORD1>
-			<KEYWORD1>OPTYPE</KEYWORD1>
-			<KEYWORD1>OPUS</KEYWORD1>
-			<KEYWORD1>OPUSER</KEYWORD1>
-			<KEYWORD1>OPVA</KEYWORD1>
-			<KEYWORD1>OPVAR</KEYWORD1>
-			<KEYWORD1>OUTO</KEYWORD1>
-			<KEYWORD1>OUTOPT</KEYWORD1>
-			<KEYWORD1>OUTP</KEYWORD1>
-			<KEYWORD1>OUTPR</KEYWORD1>
-			<KEYWORD1>OUTR</KEYWORD1>
-			<KEYWORD1>OUTRES</KEYWORD1>
-			<KEYWORD1>PADE</KEYWORD1>
-			<KEYWORD1>PADELE</KEYWORD1>
-			<KEYWORD1>PAGE</KEYWORD1>
-			<KEYWORD1>PAGET</KEYWORD1>
-			<KEYWORD1>PAPU</KEYWORD1>
-			<KEYWORD1>PAPUT</KEYWORD1>
-			<KEYWORD1>PARE</KEYWORD1>
-			<KEYWORD1>PARESU</KEYWORD1>
-			<KEYWORD1>PARR</KEYWORD1>
-			<KEYWORD1>PARRES</KEYWORD1>
-			<KEYWORD1>PARS</KEYWORD1>
-			<KEYWORD1>PARSAV</KEYWORD1>
-			<KEYWORD1>PASA</KEYWORD1>
-			<KEYWORD1>PASAVE</KEYWORD1>
-			<KEYWORD1>PATH</KEYWORD1>
-			<KEYWORD1>PATH</KEYWORD1>
-			<KEYWORD1>PCAL</KEYWORD1>
-			<KEYWORD1>PCALC</KEYWORD1>
-			<KEYWORD1>PCIR</KEYWORD1>
-			<KEYWORD1>PCIRC</KEYWORD1>
-			<KEYWORD1>PCON</KEYWORD1>
-			<KEYWORD1>PCONV</KEYWORD1>
-			<KEYWORD1>PCOR</KEYWORD1>
-			<KEYWORD1>PCORRO</KEYWORD1>
-			<KEYWORD1>PCRO</KEYWORD1>
-			<KEYWORD1>PCROSS</KEYWORD1>
-			<KEYWORD1>PDEF</KEYWORD1>
-			<KEYWORD1>PDEF</KEYWORD1>
-			<KEYWORD1>PDOT</KEYWORD1>
-			<KEYWORD1>PDOT</KEYWORD1>
-			<KEYWORD1>PDRA</KEYWORD1>
-			<KEYWORD1>PDRAG</KEYWORD1>
-			<KEYWORD1>PERB</KEYWORD1>
-			<KEYWORD1>PERBC2D</KEYWORD1>
-			<KEYWORD1>PEXC</KEYWORD1>
-			<KEYWORD1>PEXCLUDE</KEYWORD1>
-			<KEYWORD1>PFAC</KEYWORD1>
-			<KEYWORD1>PFACT</KEYWORD1>
-			<KEYWORD1>PFLU</KEYWORD1>
-			<KEYWORD1>PFLUID</KEYWORD1>
-			<KEYWORD1>PGAP</KEYWORD1>
-			<KEYWORD1>PGAP</KEYWORD1>
-			<KEYWORD1>PHYS</KEYWORD1>
-			<KEYWORD1>PHYSICS</KEYWORD1>
-			<KEYWORD1>PINC</KEYWORD1>
-			<KEYWORD1>PINCLUDE</KEYWORD1>
-			<KEYWORD1>PINS</KEYWORD1>
-			<KEYWORD1>PINSUL</KEYWORD1>
-			<KEYWORD1>PIPE</KEYWORD1>
-			<KEYWORD1>PIPE</KEYWORD1>
-			<KEYWORD1>PIVC</KEYWORD1>
-			<KEYWORD1>PIVCHECK</KEYWORD1>
-			<KEYWORD1>PLAN</KEYWORD1>
-			<KEYWORD1>PLANEWAVE</KEYWORD1>
-			<KEYWORD1>PLCO</KEYWORD1>
-			<KEYWORD1>PLCONV</KEYWORD1>
-			<KEYWORD1>PLCP</KEYWORD1>
-			<KEYWORD1>PLCPLX</KEYWORD1>
-			<KEYWORD1>PLCR</KEYWORD1>
-			<KEYWORD1>PLCRACK</KEYWORD1>
-			<KEYWORD1>PLDI</KEYWORD1>
-			<KEYWORD1>PLDISP</KEYWORD1>
-			<KEYWORD1>PLES</KEYWORD1>
-			<KEYWORD1>PLESOL</KEYWORD1>
-			<KEYWORD1>PLET</KEYWORD1>
-			<KEYWORD1>PLETAB</KEYWORD1>
-			<KEYWORD1>PLF2</KEYWORD1>
-			<KEYWORD1>PLF2D</KEYWORD1>
-			<KEYWORD1>PLLS</KEYWORD1>
-			<KEYWORD1>PLLS</KEYWORD1>
-			<KEYWORD1>PLNS</KEYWORD1>
-			<KEYWORD1>PLNSOL</KEYWORD1>
-			<KEYWORD1>PLOT</KEYWORD1>
-			<KEYWORD1>PLOT</KEYWORD1>
-			<KEYWORD1>PLOT</KEYWORD1>
-			<KEYWORD1>PLOTTING</KEYWORD1>
-			<KEYWORD1>PLPA</KEYWORD1>
-			<KEYWORD1>PLPA</KEYWORD1>
-			<KEYWORD1>PLPAGM</KEYWORD1>
-			<KEYWORD1>PLPATH</KEYWORD1>
-			<KEYWORD1>PLSE</KEYWORD1>
-			<KEYWORD1>PLSECT</KEYWORD1>
-			<KEYWORD1>PLTI</KEYWORD1>
-			<KEYWORD1>PLTIME</KEYWORD1>
-			<KEYWORD1>PLTR</KEYWORD1>
-			<KEYWORD1>PLTRAC</KEYWORD1>
-			<KEYWORD1>PLVA</KEYWORD1>
-			<KEYWORD1>PLVA</KEYWORD1>
-			<KEYWORD1>PLVAR</KEYWORD1>
-			<KEYWORD1>PLVAROPT</KEYWORD1>
-			<KEYWORD1>PLVE</KEYWORD1>
-			<KEYWORD1>PLVECT</KEYWORD1>
-			<KEYWORD1>PMAP</KEYWORD1>
-			<KEYWORD1>PMAP</KEYWORD1>
-			<KEYWORD1>PMET</KEYWORD1>
-			<KEYWORD1>PMETH</KEYWORD1>
-			<KEYWORD1>PMGT</KEYWORD1>
-			<KEYWORD1>PMGTRAN</KEYWORD1>
-			<KEYWORD1>PMOP</KEYWORD1>
-			<KEYWORD1>PMOPTS</KEYWORD1>
-			<KEYWORD1>POIN</KEYWORD1>
-			<KEYWORD1>POINT</KEYWORD1>
-			<KEYWORD1>POLY</KEYWORD1>
-			<KEYWORD1>POLY</KEYWORD1>
-			<KEYWORD1>POPT</KEYWORD1>
-			<KEYWORD1>POPT</KEYWORD1>
-			<KEYWORD1>PORT</KEYWORD1>
-			<KEYWORD1>PORTOPT</KEYWORD1>
-			<KEYWORD1>POWE</KEYWORD1>
-			<KEYWORD1>POWERH</KEYWORD1>
-			<KEYWORD1>PPAT</KEYWORD1>
-			<KEYWORD1>PPATH</KEYWORD1>
-			<KEYWORD1>PPLO</KEYWORD1>
-			<KEYWORD1>PPLOT</KEYWORD1>
-			<KEYWORD1>PPRA</KEYWORD1>
-			<KEYWORD1>PPRANGE</KEYWORD1>
-			<KEYWORD1>PPRE</KEYWORD1>
-			<KEYWORD1>PPRES</KEYWORD1>
-			<KEYWORD1>PRAN</KEYWORD1>
-			<KEYWORD1>PRANGE</KEYWORD1>
-			<KEYWORD1>PRCO</KEYWORD1>
-			<KEYWORD1>PRCONV</KEYWORD1>
-			<KEYWORD1>PRCP</KEYWORD1>
-			<KEYWORD1>PRCPLX</KEYWORD1>
-			<KEYWORD1>PREC</KEYWORD1>
-			<KEYWORD1>PRECISION</KEYWORD1>
-			<KEYWORD1>PRED</KEYWORD1>
-			<KEYWORD1>PRED</KEYWORD1>
-			<KEYWORD1>PRER</KEYWORD1>
-			<KEYWORD1>PRERR</KEYWORD1>
-			<KEYWORD1>PRES</KEYWORD1>
-			<KEYWORD1>PRESOL</KEYWORD1>
-			<KEYWORD1>PRET</KEYWORD1>
-			<KEYWORD1>PRETAB</KEYWORD1>
-			<KEYWORD1>PRI2</KEYWORD1>
-			<KEYWORD1>PRI2</KEYWORD1>
-			<KEYWORD1>PRIM</KEYWORD1>
-			<KEYWORD1>PRIM</KEYWORD1>
-			<KEYWORD1>PRIN</KEYWORD1>
-			<KEYWORD1>PRINT</KEYWORD1>
-			<KEYWORD1>PRIS</KEYWORD1>
-			<KEYWORD1>PRISM</KEYWORD1>
-			<KEYWORD1>PRIT</KEYWORD1>
-			<KEYWORD1>PRITER</KEYWORD1>
-			<KEYWORD1>PRNL</KEYWORD1>
-			<KEYWORD1>PRNLD</KEYWORD1>
-			<KEYWORD1>PRNS</KEYWORD1>
-			<KEYWORD1>PRNSOL</KEYWORD1>
-			<KEYWORD1>PROD</KEYWORD1>
-			<KEYWORD1>PROD</KEYWORD1>
-			<KEYWORD1>PRPA</KEYWORD1>
-			<KEYWORD1>PRPATH</KEYWORD1>
-			<KEYWORD1>PRRF</KEYWORD1>
-			<KEYWORD1>PRRFOR</KEYWORD1>
-			<KEYWORD1>PRRS</KEYWORD1>
-			<KEYWORD1>PRRSOL</KEYWORD1>
-			<KEYWORD1>PRSE</KEYWORD1>
-			<KEYWORD1>PRSECT</KEYWORD1>
-			<KEYWORD1>PRSS</KEYWORD1>
-			<KEYWORD1>PRSSOL</KEYWORD1>
-			<KEYWORD1>PRTI</KEYWORD1>
-			<KEYWORD1>PRTIME</KEYWORD1>
-			<KEYWORD1>PRVA</KEYWORD1>
-			<KEYWORD1>PRVA</KEYWORD1>
-			<KEYWORD1>PRVAR</KEYWORD1>
-			<KEYWORD1>PRVAROPT</KEYWORD1>
-			<KEYWORD1>PRVE</KEYWORD1>
-			<KEYWORD1>PRVECT</KEYWORD1>
-			<KEYWORD1>PSCR</KEYWORD1>
-			<KEYWORD1>PSCR</KEYWORD1>
-			<KEYWORD1>PSDC</KEYWORD1>
-			<KEYWORD1>PSDCOM</KEYWORD1>
-			<KEYWORD1>PSDF</KEYWORD1>
-			<KEYWORD1>PSDFRQ</KEYWORD1>
-			<KEYWORD1>PSDR</KEYWORD1>
-			<KEYWORD1>PSDRES</KEYWORD1>
-			<KEYWORD1>PSDS</KEYWORD1>
-			<KEYWORD1>PSDSPL</KEYWORD1>
-			<KEYWORD1>PSDU</KEYWORD1>
-			<KEYWORD1>PSDUNIT</KEYWORD1>
-			<KEYWORD1>PSDV</KEYWORD1>
-			<KEYWORD1>PSDVAL</KEYWORD1>
-			<KEYWORD1>PSDW</KEYWORD1>
-			<KEYWORD1>PSDWAV</KEYWORD1>
-			<KEYWORD1>PSEL</KEYWORD1>
-			<KEYWORD1>PSEL</KEYWORD1>
-			<KEYWORD1>PSOL</KEYWORD1>
-			<KEYWORD1>PSOLVE</KEYWORD1>
-			<KEYWORD1>PSPE</KEYWORD1>
-			<KEYWORD1>PSPEC</KEYWORD1>
-			<KEYWORD1>PSPR</KEYWORD1>
-			<KEYWORD1>PSPRNG</KEYWORD1>
-			<KEYWORD1>PSTR</KEYWORD1>
-			<KEYWORD1>PSTRES</KEYWORD1>
-			<KEYWORD1>PTEM</KEYWORD1>
-			<KEYWORD1>PTEMP</KEYWORD1>
-			<KEYWORD1>PTXY</KEYWORD1>
-			<KEYWORD1>PTXY</KEYWORD1>
-			<KEYWORD1>PUNI</KEYWORD1>
-			<KEYWORD1>PUNIT</KEYWORD1>
-			<KEYWORD1>PVEC</KEYWORD1>
-			<KEYWORD1>PVECT</KEYWORD1>
-			<KEYWORD1>QDVA</KEYWORD1>
-			<KEYWORD1>QDVAL</KEYWORD1>
-			<KEYWORD1>QFAC</KEYWORD1>
-			<KEYWORD1>QFACT</KEYWORD1>
-			<KEYWORD1>QUAD</KEYWORD1>
-			<KEYWORD1>QUAD</KEYWORD1>
-			<KEYWORD1>QUOT</KEYWORD1>
-			<KEYWORD1>QUOT</KEYWORD1>
-			<KEYWORD1>R</KEYWORD1>
-			<KEYWORD1>RACE</KEYWORD1>
-			<KEYWORD1>RACE</KEYWORD1>
-			<KEYWORD1>RALL</KEYWORD1>
-			<KEYWORD1>RALL</KEYWORD1>
-			<KEYWORD1>RAPP</KEYWORD1>
-			<KEYWORD1>RAPPND</KEYWORD1>
-			<KEYWORD1>RBE3</KEYWORD1>
-			<KEYWORD1>RBE3</KEYWORD1>
-			<KEYWORD1>RCON</KEYWORD1>
-			<KEYWORD1>RCON</KEYWORD1>
-			<KEYWORD1>RDEL</KEYWORD1>
-			<KEYWORD1>RDELE</KEYWORD1>
-			<KEYWORD1>REAL</KEYWORD1>
-			<KEYWORD1>REAL</KEYWORD1>
-			<KEYWORD1>REAL</KEYWORD1>
-			<KEYWORD1>REALVAR</KEYWORD1>
-			<KEYWORD1>RECT</KEYWORD1>
-			<KEYWORD1>RECTNG</KEYWORD1>
-			<KEYWORD1>REDU</KEYWORD1>
-			<KEYWORD1>REDUCE</KEYWORD1>
-			<KEYWORD1>REFL</KEYWORD1>
-			<KEYWORD1>REFLCOEF</KEYWORD1>
-			<KEYWORD1>REOR</KEYWORD1>
-			<KEYWORD1>REORDER</KEYWORD1>
-			<KEYWORD1>RESE</KEYWORD1>
-			<KEYWORD1>RESET</KEYWORD1>
-			<KEYWORD1>RESP</KEYWORD1>
-			<KEYWORD1>RESP</KEYWORD1>
-			<KEYWORD1>RESU</KEYWORD1>
-			<KEYWORD1>RESUME</KEYWORD1>
-			<KEYWORD1>REXP</KEYWORD1>
-			<KEYWORD1>REXPORT</KEYWORD1>
-			<KEYWORD1>RFIL</KEYWORD1>
-			<KEYWORD1>RFILSZ</KEYWORD1>
-			<KEYWORD1>RFOR</KEYWORD1>
-			<KEYWORD1>RFORCE</KEYWORD1>
-			<KEYWORD1>RIGI</KEYWORD1>
-			<KEYWORD1>RIGID</KEYWORD1>
-			<KEYWORD1>RIMP</KEYWORD1>
-			<KEYWORD1>RIMPORT</KEYWORD1>
-			<KEYWORD1>RITE</KEYWORD1>
-			<KEYWORD1>RITER</KEYWORD1>
-			<KEYWORD1>RLIS</KEYWORD1>
-			<KEYWORD1>RLIST</KEYWORD1>
-			<KEYWORD1>RMEM</KEYWORD1>
-			<KEYWORD1>RMEMRY</KEYWORD1>
-			<KEYWORD1>RMOD</KEYWORD1>
-			<KEYWORD1>RMODIF</KEYWORD1>
-			<KEYWORD1>RMOR</KEYWORD1>
-			<KEYWORD1>RMORE</KEYWORD1>
-			<KEYWORD1>ROCK</KEYWORD1>
-			<KEYWORD1>ROCK</KEYWORD1>
-			<KEYWORD1>RPOL</KEYWORD1>
-			<KEYWORD1>RPOLY</KEYWORD1>
-			<KEYWORD1>RPR4</KEYWORD1>
-			<KEYWORD1>RPR4</KEYWORD1>
-			<KEYWORD1>RPRI</KEYWORD1>
-			<KEYWORD1>RPRISM</KEYWORD1>
-			<KEYWORD1>RPSD</KEYWORD1>
-			<KEYWORD1>RPSD</KEYWORD1>
-			<KEYWORD1>RSPE</KEYWORD1>
-			<KEYWORD1>RSPEED</KEYWORD1>
-			<KEYWORD1>RSTA</KEYWORD1>
-			<KEYWORD1>RSTAT</KEYWORD1>
-			<KEYWORD1>RSYS</KEYWORD1>
-			<KEYWORD1>RSYS</KEYWORD1>
-			<KEYWORD1>RTIM</KEYWORD1>
-			<KEYWORD1>RTIMST</KEYWORD1>
-			<KEYWORD1>RUN</KEYWORD1>
-			<KEYWORD1>RWFR</KEYWORD1>
-			<KEYWORD1>RWFRNT</KEYWORD1>
-			<KEYWORD1>SABS</KEYWORD1>
-			<KEYWORD1>SABS</KEYWORD1>
-			<KEYWORD1>SADD</KEYWORD1>
-			<KEYWORD1>SADD</KEYWORD1>
-			<KEYWORD1>SALL</KEYWORD1>
-			<KEYWORD1>SALLOW</KEYWORD1>
-			<KEYWORD1>SARP</KEYWORD1>
-			<KEYWORD1>SARPLOT</KEYWORD1>
-			<KEYWORD1>SAVE</KEYWORD1>
-			<KEYWORD1>SAVE</KEYWORD1>
-			<KEYWORD1>SBCL</KEYWORD1>
-			<KEYWORD1>SBCLIST</KEYWORD1>
-			<KEYWORD1>SBCT</KEYWORD1>
-			<KEYWORD1>SBCTRAN</KEYWORD1>
-			<KEYWORD1>SDEL</KEYWORD1>
-			<KEYWORD1>SDELETE</KEYWORD1>
-			<KEYWORD1>SE</KEYWORD1>
-			<KEYWORD1>SECD</KEYWORD1>
-			<KEYWORD1>SECDATA</KEYWORD1>
-			<KEYWORD1>SECN</KEYWORD1>
-			<KEYWORD1>SECNUM</KEYWORD1>
-			<KEYWORD1>SECO</KEYWORD1>
-			<KEYWORD1>SECOFFSET</KEYWORD1>
-			<KEYWORD1>SECP</KEYWORD1>
-			<KEYWORD1>SECPLOT</KEYWORD1>
-			<KEYWORD1>SECR</KEYWORD1>
-			<KEYWORD1>SECREAD</KEYWORD1>
-			<KEYWORD1>SECT</KEYWORD1>
-			<KEYWORD1>SECTYPE</KEYWORD1>
-			<KEYWORD1>SECW</KEYWORD1>
-			<KEYWORD1>SECWRITE</KEYWORD1>
-			<KEYWORD1>SED</KEYWORD1>
-			<KEYWORD1>SEDL</KEYWORD1>
-			<KEYWORD1>SEDLIST</KEYWORD1>
-			<KEYWORD1>SEEX</KEYWORD1>
-			<KEYWORD1>SEEXP</KEYWORD1>
-			<KEYWORD1>SELI</KEYWORD1>
-			<KEYWORD1>SELIST</KEYWORD1>
-			<KEYWORD1>SELM</KEYWORD1>
-			<KEYWORD1>SELM</KEYWORD1>
-			<KEYWORD1>SENE</KEYWORD1>
-			<KEYWORD1>SENERGY</KEYWORD1>
-			<KEYWORD1>SEOP</KEYWORD1>
-			<KEYWORD1>SEOPT</KEYWORD1>
-			<KEYWORD1>SESY</KEYWORD1>
-			<KEYWORD1>SESYMM</KEYWORD1>
-			<KEYWORD1>SET</KEYWORD1>
-			<KEYWORD1>SETR</KEYWORD1>
-			<KEYWORD1>SETRAN</KEYWORD1>
-			<KEYWORD1>SEXP</KEYWORD1>
-			<KEYWORD1>SEXP</KEYWORD1>
-			<KEYWORD1>SF</KEYWORD1>
-			<KEYWORD1>SFA</KEYWORD1>
-			<KEYWORD1>SFAC</KEYWORD1>
-			<KEYWORD1>SFACT</KEYWORD1>
-			<KEYWORD1>SFAD</KEYWORD1>
-			<KEYWORD1>SFADELE</KEYWORD1>
-			<KEYWORD1>SFAL</KEYWORD1>
-			<KEYWORD1>SFALIST</KEYWORD1>
-			<KEYWORD1>SFBE</KEYWORD1>
-			<KEYWORD1>SFBEAM</KEYWORD1>
-			<KEYWORD1>SFCA</KEYWORD1>
-			<KEYWORD1>SFCALC</KEYWORD1>
-			<KEYWORD1>SFCU</KEYWORD1>
-			<KEYWORD1>SFCUM</KEYWORD1>
-			<KEYWORD1>SFDE</KEYWORD1>
-			<KEYWORD1>SFDELE</KEYWORD1>
-			<KEYWORD1>SFE</KEYWORD1>
-			<KEYWORD1>SFED</KEYWORD1>
-			<KEYWORD1>SFEDELE</KEYWORD1>
-			<KEYWORD1>SFEL</KEYWORD1>
-			<KEYWORD1>SFELIST</KEYWORD1>
-			<KEYWORD1>SFFU</KEYWORD1>
-			<KEYWORD1>SFFUN</KEYWORD1>
-			<KEYWORD1>SFGR</KEYWORD1>
-			<KEYWORD1>SFGRAD</KEYWORD1>
-			<KEYWORD1>SFL</KEYWORD1>
-			<KEYWORD1>SFLD</KEYWORD1>
-			<KEYWORD1>SFLDELE</KEYWORD1>
-			<KEYWORD1>SFLI</KEYWORD1>
-			<KEYWORD1>SFLIST</KEYWORD1>
-			<KEYWORD1>SFLL</KEYWORD1>
-			<KEYWORD1>SFLLIST</KEYWORD1>
-			<KEYWORD1>SFSC</KEYWORD1>
-			<KEYWORD1>SFSCALE</KEYWORD1>
-			<KEYWORD1>SFTR</KEYWORD1>
-			<KEYWORD1>SFTRAN</KEYWORD1>
-			<KEYWORD1>SHEL</KEYWORD1>
-			<KEYWORD1>SHELL</KEYWORD1>
-			<KEYWORD1>SHPP</KEYWORD1>
-			<KEYWORD1>SHPP</KEYWORD1>
-			<KEYWORD1>SLIS</KEYWORD1>
-			<KEYWORD1>SLIST</KEYWORD1>
-			<KEYWORD1>SLPP</KEYWORD1>
-			<KEYWORD1>SLPPLOT</KEYWORD1>
-			<KEYWORD1>SLSP</KEYWORD1>
-			<KEYWORD1>SLSPLOT</KEYWORD1>
-			<KEYWORD1>SMAL</KEYWORD1>
-			<KEYWORD1>SMALL</KEYWORD1>
-			<KEYWORD1>SMAX</KEYWORD1>
-			<KEYWORD1>SMAX</KEYWORD1>
-			<KEYWORD1>SMBO</KEYWORD1>
-			<KEYWORD1>SMBODY</KEYWORD1>
-			<KEYWORD1>SMCO</KEYWORD1>
-			<KEYWORD1>SMCONS</KEYWORD1>
-			<KEYWORD1>SMFO</KEYWORD1>
-			<KEYWORD1>SMFOR</KEYWORD1>
-			<KEYWORD1>SMIN</KEYWORD1>
-			<KEYWORD1>SMIN</KEYWORD1>
-			<KEYWORD1>SMRT</KEYWORD1>
-			<KEYWORD1>SMRTSIZE</KEYWORD1>
-			<KEYWORD1>SMSU</KEYWORD1>
-			<KEYWORD1>SMSURF</KEYWORD1>
-			<KEYWORD1>SMUL</KEYWORD1>
-			<KEYWORD1>SMULT</KEYWORD1>
-			<KEYWORD1>SOLC</KEYWORD1>
-			<KEYWORD1>SOLCONTROL</KEYWORD1>
-			<KEYWORD1>SOLU</KEYWORD1>
-			<KEYWORD1>SOLU</KEYWORD1>
-			<KEYWORD1>SOLU</KEYWORD1>
-			<KEYWORD1>SOLUOPT</KEYWORD1>
-			<KEYWORD1>SOLV</KEYWORD1>
-			<KEYWORD1>SOLVE</KEYWORD1>
-			<KEYWORD1>SORT</KEYWORD1>
-			<KEYWORD1>SORT</KEYWORD1>
-			<KEYWORD1>SOUR</KEYWORD1>
-			<KEYWORD1>SOURCE</KEYWORD1>
-			<KEYWORD1>SPAC</KEYWORD1>
-			<KEYWORD1>SPACE</KEYWORD1>
-			<KEYWORD1>SPAR</KEYWORD1>
-			<KEYWORD1>SPARM</KEYWORD1>
-			<KEYWORD1>SPEC</KEYWORD1>
-			<KEYWORD1>SPEC</KEYWORD1>
-			<KEYWORD1>SPH4</KEYWORD1>
-			<KEYWORD1>SPH4</KEYWORD1>
-			<KEYWORD1>SPH5</KEYWORD1>
-			<KEYWORD1>SPH5</KEYWORD1>
-			<KEYWORD1>SPHE</KEYWORD1>
-			<KEYWORD1>SPHERE</KEYWORD1>
-			<KEYWORD1>SPLI</KEYWORD1>
-			<KEYWORD1>SPLINE</KEYWORD1>
-			<KEYWORD1>SPOI</KEYWORD1>
-			<KEYWORD1>SPOINT</KEYWORD1>
-			<KEYWORD1>SPOP</KEYWORD1>
-			<KEYWORD1>SPOPT</KEYWORD1>
-			<KEYWORD1>SPRE</KEYWORD1>
-			<KEYWORD1>SPREAD</KEYWORD1>
-			<KEYWORD1>SPTO</KEYWORD1>
-			<KEYWORD1>SPTOPT</KEYWORD1>
-			<KEYWORD1>SQRT</KEYWORD1>
-			<KEYWORD1>SQRT</KEYWORD1>
-			<KEYWORD1>SRCS</KEYWORD1>
-			<KEYWORD1>SRCS</KEYWORD1>
-			<KEYWORD1>SRSS</KEYWORD1>
-			<KEYWORD1>SRSS</KEYWORD1>
-			<KEYWORD1>SSLN</KEYWORD1>
-			<KEYWORD1>SSLN</KEYWORD1>
-			<KEYWORD1>SSTI</KEYWORD1>
-			<KEYWORD1>SSTIF</KEYWORD1>
-			<KEYWORD1>SSUM</KEYWORD1>
-			<KEYWORD1>SSUM</KEYWORD1>
-			<KEYWORD1>STAT</KEYWORD1>
-			<KEYWORD1>STAT</KEYWORD1>
-			<KEYWORD1>STEF</KEYWORD1>
-			<KEYWORD1>STEF</KEYWORD1>
-			<KEYWORD1>STOR</KEYWORD1>
-			<KEYWORD1>STORE</KEYWORD1>
-			<KEYWORD1>SUBO</KEYWORD1>
-			<KEYWORD1>SUBOPT</KEYWORD1>
-			<KEYWORD1>SUBS</KEYWORD1>
-			<KEYWORD1>SUBSET</KEYWORD1>
-			<KEYWORD1>SUMT</KEYWORD1>
-			<KEYWORD1>SUMTYPE</KEYWORD1>
-			<KEYWORD1>SV</KEYWORD1>
-			<KEYWORD1>SVTY</KEYWORD1>
-			<KEYWORD1>SVTYP</KEYWORD1>
-			<KEYWORD1>TALL</KEYWORD1>
-			<KEYWORD1>TALLOW</KEYWORD1>
-			<KEYWORD1>TB</KEYWORD1>
-			<KEYWORD1>TBCO</KEYWORD1>
-			<KEYWORD1>TBCOPY</KEYWORD1>
-			<KEYWORD1>TBDA</KEYWORD1>
-			<KEYWORD1>TBDATA</KEYWORD1>
-			<KEYWORD1>TBDE</KEYWORD1>
-			<KEYWORD1>TBDELE</KEYWORD1>
-			<KEYWORD1>TBLE</KEYWORD1>
-			<KEYWORD1>TBLE</KEYWORD1>
-			<KEYWORD1>TBLI</KEYWORD1>
-			<KEYWORD1>TBLIST</KEYWORD1>
-			<KEYWORD1>TBMO</KEYWORD1>
-			<KEYWORD1>TBMODIF</KEYWORD1>
-			<KEYWORD1>TBPL</KEYWORD1>
-			<KEYWORD1>TBPLOT</KEYWORD1>
-			<KEYWORD1>TBPT</KEYWORD1>
-			<KEYWORD1>TBPT</KEYWORD1>
-			<KEYWORD1>TBTE</KEYWORD1>
-			<KEYWORD1>TBTEMP</KEYWORD1>
-			<KEYWORD1>TCHG</KEYWORD1>
-			<KEYWORD1>TCHG</KEYWORD1>
-			<KEYWORD1>TEE</KEYWORD1>
-			<KEYWORD1>TERM</KEYWORD1>
-			<KEYWORD1>TERM</KEYWORD1>
-			<KEYWORD1>TIME</KEYWORD1>
-			<KEYWORD1>TIME</KEYWORD1>
-			<KEYWORD1>TIME</KEYWORD1>
-			<KEYWORD1>TIMERANGE</KEYWORD1>
-			<KEYWORD1>TIMI</KEYWORD1>
-			<KEYWORD1>TIMINT</KEYWORD1>
-			<KEYWORD1>TIMP</KEYWORD1>
-			<KEYWORD1>TIMP</KEYWORD1>
-			<KEYWORD1>TINT</KEYWORD1>
-			<KEYWORD1>TINTP</KEYWORD1>
-			<KEYWORD1>TOFF</KEYWORD1>
-			<KEYWORD1>TOFFST</KEYWORD1>
-			<KEYWORD1>TOPD</KEYWORD1>
-			<KEYWORD1>TOPDEF</KEYWORD1>
-			<KEYWORD1>TOPE</KEYWORD1>
-			<KEYWORD1>TOPEXE</KEYWORD1>
-			<KEYWORD1>TOPI</KEYWORD1>
-			<KEYWORD1>TOPITER</KEYWORD1>
-			<KEYWORD1>TORQ2D</KEYWORD1>
-			<KEYWORD1>TORQ</KEYWORD1>
-			<KEYWORD1>TORQ</KEYWORD1>
-			<KEYWORD1>TORQ</KEYWORD1>
-			<KEYWORD1>TORQC2D</KEYWORD1>
-			<KEYWORD1>TORQSUM</KEYWORD1>
-			<KEYWORD1>TORU</KEYWORD1>
-			<KEYWORD1>TORUS</KEYWORD1>
-			<KEYWORD1>TOTA</KEYWORD1>
-			<KEYWORD1>TOTAL</KEYWORD1>
-			<KEYWORD1>TRAN</KEYWORD1>
-			<KEYWORD1>TRAN</KEYWORD1>
-			<KEYWORD1>TRANS</KEYWORD1>
-			<KEYWORD1>TRANSFER</KEYWORD1>
-			<KEYWORD1>TREF</KEYWORD1>
-			<KEYWORD1>TREF</KEYWORD1>
-			<KEYWORD1>TRNO</KEYWORD1>
-			<KEYWORD1>TRNOPT</KEYWORD1>
-			<KEYWORD1>TRPD</KEYWORD1>
-			<KEYWORD1>TRPDEL</KEYWORD1>
-			<KEYWORD1>TRPL</KEYWORD1>
-			<KEYWORD1>TRPLIS</KEYWORD1>
-			<KEYWORD1>TRPO</KEYWORD1>
-			<KEYWORD1>TRPOIN</KEYWORD1>
-			<KEYWORD1>TRTI</KEYWORD1>
-			<KEYWORD1>TRTIME</KEYWORD1>
-			<KEYWORD1>TSHA</KEYWORD1>
-			<KEYWORD1>TSHAP</KEYWORD1>
-			<KEYWORD1>TSRE</KEYWORD1>
-			<KEYWORD1>TSRES</KEYWORD1>
-			<KEYWORD1>TUNI</KEYWORD1>
-			<KEYWORD1>TUNIF</KEYWORD1>
-			<KEYWORD1>TVAR</KEYWORD1>
-			<KEYWORD1>TVAR</KEYWORD1>
-			<KEYWORD1>TYPE</KEYWORD1>
-			<KEYWORD1>TYPE</KEYWORD1>
-			<KEYWORD1>UIMP</KEYWORD1>
-			<KEYWORD1>UIMP</KEYWORD1>
-			<KEYWORD1>UPCO</KEYWORD1>
-			<KEYWORD1>UPCOORD</KEYWORD1>
-			<KEYWORD1>UPGE</KEYWORD1>
-			<KEYWORD1>UPGEOM</KEYWORD1>
-			<KEYWORD1>USRC</KEYWORD1>
-			<KEYWORD1>USRCAL</KEYWORD1>
-			<KEYWORD1>V</KEYWORD1>
-			<KEYWORD1>VA</KEYWORD1>
-			<KEYWORD1>VADD</KEYWORD1>
-			<KEYWORD1>VADD</KEYWORD1>
-			<KEYWORD1>VALV</KEYWORD1>
-			<KEYWORD1>VALVE</KEYWORD1>
-			<KEYWORD1>VARD</KEYWORD1>
-			<KEYWORD1>VARDEL</KEYWORD1>
-			<KEYWORD1>VARN</KEYWORD1>
-			<KEYWORD1>VARNAM</KEYWORD1>
-			<KEYWORD1>VATT</KEYWORD1>
-			<KEYWORD1>VATT</KEYWORD1>
-			<KEYWORD1>VCLE</KEYWORD1>
-			<KEYWORD1>VCLEAR</KEYWORD1>
-			<KEYWORD1>VCRO</KEYWORD1>
-			<KEYWORD1>VCROSS</KEYWORD1>
-			<KEYWORD1>VCVF</KEYWORD1>
-			<KEYWORD1>VCVFILL</KEYWORD1>
-			<KEYWORD1>VDDA</KEYWORD1>
-			<KEYWORD1>VDDAM</KEYWORD1>
-			<KEYWORD1>VDEL</KEYWORD1>
-			<KEYWORD1>VDELE</KEYWORD1>
-			<KEYWORD1>VDGL</KEYWORD1>
-			<KEYWORD1>VDGL</KEYWORD1>
-			<KEYWORD1>VDOT</KEYWORD1>
-			<KEYWORD1>VDOT</KEYWORD1>
-			<KEYWORD1>VDRA</KEYWORD1>
-			<KEYWORD1>VDRAG</KEYWORD1>
-			<KEYWORD1>VEXT</KEYWORD1>
-			<KEYWORD1>VEXT</KEYWORD1>
-			<KEYWORD1>VGEN</KEYWORD1>
-			<KEYWORD1>VGEN</KEYWORD1>
-			<KEYWORD1>VGET</KEYWORD1>
-			<KEYWORD1>VGET</KEYWORD1>
-			<KEYWORD1>VGLU</KEYWORD1>
-			<KEYWORD1>VGLUE</KEYWORD1>
-			<KEYWORD1>VIMP</KEYWORD1>
-			<KEYWORD1>VIMP</KEYWORD1>
-			<KEYWORD1>VINP</KEYWORD1>
-			<KEYWORD1>VINP</KEYWORD1>
-			<KEYWORD1>VINV</KEYWORD1>
-			<KEYWORD1>VINV</KEYWORD1>
-			<KEYWORD1>VLIS</KEYWORD1>
-			<KEYWORD1>VLIST</KEYWORD1>
-			<KEYWORD1>VLSC</KEYWORD1>
-			<KEYWORD1>VLSCALE</KEYWORD1>
-			<KEYWORD1>VMES</KEYWORD1>
-			<KEYWORD1>VMESH</KEYWORD1>
-			<KEYWORD1>VOFF</KEYWORD1>
-			<KEYWORD1>VOFFST</KEYWORD1>
-			<KEYWORD1>VOLU</KEYWORD1>
-			<KEYWORD1>VOLUMES</KEYWORD1>
-			<KEYWORD1>VOVL</KEYWORD1>
-			<KEYWORD1>VOVLAP</KEYWORD1>
-			<KEYWORD1>VPLO</KEYWORD1>
-			<KEYWORD1>VPLOT</KEYWORD1>
-			<KEYWORD1>VPTN</KEYWORD1>
-			<KEYWORD1>VPTN</KEYWORD1>
-			<KEYWORD1>VPUT</KEYWORD1>
-			<KEYWORD1>VPUT</KEYWORD1>
-			<KEYWORD1>VROT</KEYWORD1>
-			<KEYWORD1>VROTAT</KEYWORD1>
-			<KEYWORD1>VSBA</KEYWORD1>
-			<KEYWORD1>VSBA</KEYWORD1>
-			<KEYWORD1>VSBV</KEYWORD1>
-			<KEYWORD1>VSBV</KEYWORD1>
-			<KEYWORD1>VSBW</KEYWORD1>
-			<KEYWORD1>VSBW</KEYWORD1>
-			<KEYWORD1>VSEL</KEYWORD1>
-			<KEYWORD1>VSEL</KEYWORD1>
-			<KEYWORD1>VSLA</KEYWORD1>
-			<KEYWORD1>VSLA</KEYWORD1>
-			<KEYWORD1>VSUM</KEYWORD1>
-			<KEYWORD1>VSUM</KEYWORD1>
-			<KEYWORD1>VSWE</KEYWORD1>
-			<KEYWORD1>VSWEEP</KEYWORD1>
-			<KEYWORD1>VSYM</KEYWORD1>
-			<KEYWORD1>VSYMM</KEYWORD1>
-			<KEYWORD1>VTRA</KEYWORD1>
-			<KEYWORD1>VTRAN</KEYWORD1>
-			<KEYWORD1>VTYP</KEYWORD1>
-			<KEYWORD1>VTYPE</KEYWORD1>
-			<KEYWORD1>WAVE</KEYWORD1>
-			<KEYWORD1>WAVES</KEYWORD1>
-			<KEYWORD1>WERA</KEYWORD1>
-			<KEYWORD1>WERASE</KEYWORD1>
-			<KEYWORD1>WFRO</KEYWORD1>
-			<KEYWORD1>WFRONT</KEYWORD1>
-			<KEYWORD1>WMOR</KEYWORD1>
-			<KEYWORD1>WMORE</KEYWORD1>
-			<KEYWORD1>WPAV</KEYWORD1>
-			<KEYWORD1>WPAVE</KEYWORD1>
-			<KEYWORD1>WPCS</KEYWORD1>
-			<KEYWORD1>WPCSYS</KEYWORD1>
-			<KEYWORD1>WPLA</KEYWORD1>
-			<KEYWORD1>WPLANE</KEYWORD1>
-			<KEYWORD1>WPOF</KEYWORD1>
-			<KEYWORD1>WPOFFS</KEYWORD1>
-			<KEYWORD1>WPRO</KEYWORD1>
-			<KEYWORD1>WPROTA</KEYWORD1>
-			<KEYWORD1>WPST</KEYWORD1>
-			<KEYWORD1>WPSTYL</KEYWORD1>
-			<KEYWORD1>WRIT</KEYWORD1>
-			<KEYWORD1>WRITE</KEYWORD1>
-			<KEYWORD1>WSOR</KEYWORD1>
-			<KEYWORD1>WSORT</KEYWORD1>
-			<KEYWORD1>WSTA</KEYWORD1>
-			<KEYWORD1>WSTART</KEYWORD1>
-			<KEYWORD1>XVAR</KEYWORD1>
-			<KEYWORD1>XVAR</KEYWORD1>
-			<KEYWORD1>XVAROPT</KEYWORD1>
-
-<!--		Material properties (short notation)	-->			
-
-			<KEYWORD1>ex</KEYWORD1>
-			<KEYWORD1>ey</KEYWORD1>
-			<KEYWORD1>ez</KEYWORD1>
-			<KEYWORD1>nuxy</KEYWORD1>
-			<KEYWORD1>nuxz</KEYWORD1>
-			<KEYWORD1>nuyz</KEYWORD1>
-			<KEYWORD1>gxy</KEYWORD1>
-			<KEYWORD1>gxz</KEYWORD1>
-			<KEYWORD1>gyz</KEYWORD1>
-			<KEYWORD1>alpx</KEYWORD1>
-			<KEYWORD1>alpy</KEYWORD1>
-			<KEYWORD1>alpz</KEYWORD1>
-			<KEYWORD1>kxx</KEYWORD1>
-			<KEYWORD1>kyy</KEYWORD1>
-			<KEYWORD1>kzz</KEYWORD1>
-			<KEYWORD1>dens</KEYWORD1>
-			<KEYWORD1>damp</KEYWORD1>
-			<KEYWORD1>mu</KEYWORD1>
-			<KEYWORD1>prxy</KEYWORD1>
-
-<!--		*get functions (abbreviated)	-->			
-
-			<KEYWORD2>ANGLEK</KEYWORD2>
-			<KEYWORD2>ANGLEN</KEYWORD2>
-			<KEYWORD2>AREAKP</KEYWORD2>
-			<KEYWORD2>AREAND</KEYWORD2>
-			<KEYWORD2>ARFACE</KEYWORD2>
-			<KEYWORD2>ARNEXT</KEYWORD2>
-			<KEYWORD2>ARNODE</KEYWORD2>
-			<KEYWORD2>AX</KEYWORD2>
-			<KEYWORD2>AY</KEYWORD2>
-			<KEYWORD2>AZ</KEYWORD2>
-			<KEYWORD2>CENTRX</KEYWORD2>
-			<KEYWORD2>CENTRY</KEYWORD2>
-			<KEYWORD2>CENTRZ</KEYWORD2>
-			<KEYWORD2>DISTEN</KEYWORD2>
-			<KEYWORD2>DISTKP</KEYWORD2>
-			<KEYWORD2>DISTND</KEYWORD2>
-			<KEYWORD2>ELADJ</KEYWORD2>
-			<KEYWORD2>ELNEXT</KEYWORD2>
-			<KEYWORD2>ENDS</KEYWORD2>
-			<KEYWORD2>ENEARN</KEYWORD2>
-			<KEYWORD2>ENEXTN</KEYWORD2>
-			<KEYWORD2>ENKE</KEYWORD2>
-			<KEYWORD2>KNEAR</KEYWORD2>
-			<KEYWORD2>KP</KEYWORD2>
-			<KEYWORD2>KPNEXT</KEYWORD2>
-			<KEYWORD2>KX</KEYWORD2>
-			<KEYWORD2>KY</KEYWORD2>
-			<KEYWORD2>KZ</KEYWORD2>
-			<KEYWORD2>LOC</KEYWORD2>
-			<KEYWORD2>LSNEXT</KEYWORD2>
-			<KEYWORD2>LSX</KEYWORD2>
-			<KEYWORD2>LSY</KEYWORD2>
-			<KEYWORD2>LSZ</KEYWORD2>
-			<KEYWORD2>LX</KEYWORD2>
-			<KEYWORD2>LY</KEYWORD2>
-			<KEYWORD2>LZ</KEYWORD2>
-			<KEYWORD2>MAG</KEYWORD2>
-			<KEYWORD2>NDFACE</KEYWORD2>
-			<KEYWORD2>NDNEXT</KEYWORD2>
-			<KEYWORD2>NELEM</KEYWORD2>
-			<KEYWORD2>NMFACE</KEYWORD2>
-			<KEYWORD2>NNEAR</KEYWORD2>
-			<KEYWORD2>NODE</KEYWORD2>
-			<KEYWORD2>NORMKX</KEYWORD2>
-			<KEYWORD2>NORMKY</KEYWORD2>
-			<KEYWORD2>NORMKZ</KEYWORD2>
-			<KEYWORD2>NORMNX</KEYWORD2>
-			<KEYWORD2>NORMNY</KEYWORD2>
-			<KEYWORD2>NORMNZ</KEYWORD2>
-			<KEYWORD2>NX</KEYWORD2>
-			<KEYWORD2>NY</KEYWORD2>
-			<KEYWORD2>NZ</KEYWORD2>
-			<KEYWORD2>PRES</KEYWORD2>
-			<KEYWORD2>ROTX</KEYWORD2>
-			<KEYWORD2>ROTY</KEYWORD2>
-			<KEYWORD2>ROTZ</KEYWORD2>
-			<KEYWORD2>TEMP</KEYWORD2>
-			<KEYWORD2>UX</KEYWORD2>
-			<KEYWORD2>UY</KEYWORD2>
-			<KEYWORD2>UZ</KEYWORD2>
-			<KEYWORD2>VLNEXT</KEYWORD2>
-			<KEYWORD2>VOLT</KEYWORD2>
-			<KEYWORD2>VX</KEYWORD2>
-			<KEYWORD2>VY</KEYWORD2>
-			<KEYWORD2>VZ</KEYWORD2>
-
-			<!-- [Keywords 3] -->
-			<!-- command option labels -->
-
-			<!-- AADD command -->
-			<KEYWORD3>all</KEYWORD3>
-
-			<!-- *ABBRES command -->
-			<KEYWORD3>new</KEYWORD3>
-			<KEYWORD3>change</KEYWORD3>
-
-			<!-- *AFUN command -->
-			<KEYWORD3>rad</KEYWORD3>
-			<KEYWORD3>deg</KEYWORD3>
-
-			<!-- ALIST command -->
-			<KEYWORD3>hpt</KEYWORD3>
-
-			<!-- ALLSEL command -->
-			<KEYWORD3>all</KEYWORD3>
-			<KEYWORD3>below</KEYWORD3>
-			<KEYWORD3>volu</KEYWORD3>
-			<KEYWORD3>area</KEYWORD3>
-			<KEYWORD3>line</KEYWORD3>
-			<KEYWORD3>kp</KEYWORD3>
-			<KEYWORD3>elem</KEYWORD3>
-			<KEYWORD3>node</KEYWORD3>
-
-			<!-- /ANFILE command -->
-			<KEYWORD3>,save</KEYWORD3>
-			<KEYWORD3>resume</KEYWORD3>
-
-			<!-- /ANNOT command -->
-			<KEYWORD3>off</KEYWORD3>
-			<KEYWORD3>on</KEYWORD3>
-			<KEYWORD3>dele</KEYWORD3>
-			<KEYWORD3>,save</KEYWORD3>
-			<KEYWORD3>scale</KEYWORD3>
-			<KEYWORD3>xorig</KEYWORD3>
-			<KEYWORD3>yorig</KEYWORD3>
-			<KEYWORD3>snap</KEYWORD3>
-			<KEYWORD3>stat</KEYWORD3>
-			<KEYWORD3>defa</KEYWORD3>
-			<KEYWORD3>refr</KEYWORD3>
-
-			<!-- ANTYPE command -->
-			<KEYWORD3>static</KEYWORD3>
-			<KEYWORD3>buckle</KEYWORD3>
-			<KEYWORD3>modal</KEYWORD3>
-			<KEYWORD3>harmic</KEYWORD3>
-			<KEYWORD3>trans</KEYWORD3>
-			<KEYWORD3>substr</KEYWORD3>
-			<KEYWORD3>spectr</KEYWORD3>
-			<KEYWORD3>new</KEYWORD3>
-			<KEYWORD3>rest</KEYWORD3>
-
-			<!-- APLOT command -->
-			<KEYWORD3>dege</KEYWORD3>
-
-			<!-- APPEND command -->
-			<KEYWORD3>first</KEYWORD3>
-			<KEYWORD3>next</KEYWORD3>
-			<KEYWORD3>last</KEYWORD3>
-			<KEYWORD3>near</KEYWORD3>
-			<KEYWORD3>list</KEYWORD3>
-			<KEYWORD3>velo</KEYWORD3>
-			<KEYWORD3>acel</KEYWORD3>
-
-			<!-- ARCTRM command -->
-			<KEYWORD3>off</KEYWORD3>
-			<KEYWORD3>,l</KEYWORD3>
-			<KEYWORD3>u</KEYWORD3>
-
-			<!-- AREFINE command -->
-			<KEYWORD3>off</KEYWORD3>
-			<KEYWORD3>smooth</KEYWORD3>
-			<KEYWORD3>clean</KEYWORD3>
-			<KEYWORD3>on</KEYWORD3>
-			<KEYWORD3>off</KEYWORD3>
-
-			<!-- ARSPLIT command -->
-			<KEYWORD3>tight</KEYWORD3>
-
-			<!--ARSYM command -->
-			<KEYWORD3>x</KEYWORD3>
-			<KEYWORD3>y</KEYWORD3>
-			<KEYWORD3>z</KEYWORD3>
-
-			<!--ASBA, ASBL, ASBV, ASBW commands -->
-			<KEYWORD3>sepo</KEYWORD3>
-			<KEYWORD3>delete</KEYWORD3>
-			<KEYWORD3>keep</KEYWORD3>
-
-			<!-- ASEL command -->
-			<KEYWORD3>s</KEYWORD3>
-			<KEYWORD3>,r</KEYWORD3>
-			<KEYWORD3>,a</KEYWORD3>
-			<KEYWORD3>u</KEYWORD3>
-			<KEYWORD3>all</KEYWORD3>
-			<KEYWORD3>none</KEYWORD3>
-			<KEYWORD3>inve</KEYWORD3>
-			<KEYWORD3>stat</KEYWORD3>
-			<KEYWORD3>area</KEYWORD3>
-			<KEYWORD3>ext</KEYWORD3>
-			<KEYWORD3>loc</KEYWORD3>
-			<KEYWORD3>x</KEYWORD3>
-			<KEYWORD3>y</KEYWORD3>
-			<KEYWORD3>z</KEYWORD3>
-			<KEYWORD3>hpt</KEYWORD3>
-			<KEYWORD3>,mat</KEYWORD3>
-			<KEYWORD3>,type</KEYWORD3>
-			<KEYWORD3>,real</KEYWORD3>
-			<KEYWORD3>,esys</KEYWORD3>
-			<KEYWORD3>acca</KEYWORD3>
-
-			<!-- ASLL, ASLV commands -->
-			<KEYWORD3>s</KEYWORD3>
-			<KEYWORD3>,r</KEYWORD3>
-			<KEYWORD3>,a</KEYWORD3>
-			<KEYWORD3>u</KEYWORD3>
-
-			<!-- /ASSIGN command -->
-			<KEYWORD3>emat</KEYWORD3>
-			<KEYWORD3>esav</KEYWORD3>
-			<KEYWORD3>full</KEYWORD3>
-			<KEYWORD3>redm</KEYWORD3>
-			<KEYWORD3>mode</KEYWORD3>
-			<KEYWORD3>rdsp</KEYWORD3>
-			<KEYWORD3>rfrq</KEYWORD3>
-			<KEYWORD3>tri</KEYWORD3>
-			<KEYWORD3>rst</KEYWORD3>
-			<KEYWORD3>rth</KEYWORD3>
-			<KEYWORD3>rmg</KEYWORD3>
-			<KEYWORD3>erot</KEYWORD3>
-			<KEYWORD3>osav</KEYWORD3>
-			<KEYWORD3>rfl</KEYWORD3>
-			<KEYWORD3>seld</KEYWORD3>
-
-			<!-- ASUM command -->
-			<KEYWORD3>default</KEYWORD3>
-			<KEYWORD3>fine</KEYWORD3>
-
-			<!-- AUTOTS command -->
-			<KEYWORD3>off</KEYWORD3>
-			<KEYWORD3>on</KEYWORD3>
-
-			<!-- /AXLAB command -->
-			<KEYWORD3>x</KEYWORD3>
-			<KEYWORD3>y</KEYWORD3>
-
-			<!-- /BATCH command -->
-			<KEYWORD3>list</KEYWORD3>
-
-			<!-- /BEND command -->
-			<KEYWORD3>lr</KEYWORD3>
-			<KEYWORD3>sr</KEYWORD3>
-
-			<!-- BF, BFA, BFADELE, BFALIST, BFCUM, BFDELE, BFE, BFECUM, BFEDELE, BFELIST, BFESCAL -->
-			<!-- BFK, BFKDELE, BFKLIST, BFL, BFLDELE, BFLIST, BFLLIST, BFSCALE, BFUNIF, BFV, -->
-			<!-- BFVDELE, BFVLIST commands -->
-			<KEYWORD3>temp</KEYWORD3>
-			<KEYWORD3>flue</KEYWORD3>
-			<KEYWORD3>hgen</KEYWORD3>
-			<KEYWORD3>js</KEYWORD3>
-			<KEYWORD3>vltg</KEYWORD3>
-			<KEYWORD3>mvdi</KEYWORD3>
-			<KEYWORD3>chrgd</KEYWORD3>
-			<KEYWORD3>forc</KEYWORD3>
-			<KEYWORD3>repl</KEYWORD3>
-			<KEYWORD3>add</KEYWORD3>
-			<KEYWORD3>igno</KEYWORD3>
-			<KEYWORD3>stat</KEYWORD3>
-
-			<!-- BIOT command -->
-			<KEYWORD3>new</KEYWORD3>
-			<KEYWORD3>sum</KEYWORD3>
-
-			<!-- BOPTN command -->
-			<KEYWORD3>defa</KEYWORD3>
-			<KEYWORD3>stat</KEYWORD3>
-			<KEYWORD3>keep</KEYWORD3>
-			<KEYWORD3>nwarn</KEYWORD3>
-			<KEYWORD3>version</KEYWORD3>
-			<KEYWORD3>no</KEYWORD3>
-			<KEYWORD3>yes</KEYWORD3>
-			<KEYWORD3>rv52</KEYWORD3>
-			<KEYWORD3>rv51</KEYWORD3>
-
-			<!-- BUCOPT command -->
-			<KEYWORD3>subsp</KEYWORD3>
-			<KEYWORD3>lanb</KEYWORD3>
-			<KEYWORD3>reduc</KEYWORD3>
-
-			<!-- CDREAD, CDWRITE commands -->
-			<KEYWORD3>all</KEYWORD3>
-			<KEYWORD3>db</KEYWORD3>
-			<KEYWORD3>solid</KEYWORD3>
-			<KEYWORD3>comb</KEYWORD3>
-			<KEYWORD3>geom</KEYWORD3>
-			<KEYWORD3>cm</KEYWORD3>
-			<KEYWORD3>,mat</KEYWORD3>
-			<KEYWORD3>load</KEYWORD3>
-			<KEYWORD3>blocked</KEYWORD3>
-			<KEYWORD3>unblocked</KEYWORD3>
-
-			<!-- CELIST command -->
-			<KEYWORD3>any</KEYWORD3>
-			<KEYWORD3>all</KEYWORD3>
-
-			<!-- CERIG command -->
-			<KEYWORD3>all</KEYWORD3>
-			<KEYWORD3>uxyz</KEYWORD3>
-			<KEYWORD3>rxyz</KEYWORD3>
-			<KEYWORD3>ux</KEYWORD3>
-			<KEYWORD3>uy</KEYWORD3>
-			<KEYWORD3>uz</KEYWORD3>
-			<KEYWORD3>rotx</KEYWORD3>
-			<KEYWORD3>roty</KEYWORD3>
-			<KEYWORD3>rotz</KEYWORD3>
-
-			<!-- CFOPEN command -->
-			<KEYWORD3>append</KEYWORD3>
-
-			<!-- CHECK command -->
-			<KEYWORD3>,esel</KEYWORD3>
-			<KEYWORD3>warn</KEYWORD3>
-			<KEYWORD3>err</KEYWORD3>
-
-			<!-- CLEAR command -->
-			<KEYWORD3>start</KEYWORD3>
-			<KEYWORD3>nostart</KEYWORD3>
-
-			<!-- CLOCAL, CS, CSKP, CSWPLA commands -->
-			<KEYWORD3>cart</KEYWORD3>
-			<KEYWORD3>cylin</KEYWORD3>
-			<KEYWORD3>sphe</KEYWORD3>
-			<KEYWORD3>toro</KEYWORD3>
-
-			<!-- CM command -->
-			<KEYWORD3>volu</KEYWORD3>
-			<KEYWORD3>area</KEYWORD3>
-			<KEYWORD3>line</KEYWORD3>
-			<KEYWORD3>kp</KEYWORD3>
-			<KEYWORD3>elem</KEYWORD3>
-			<KEYWORD3>node</KEYWORD3>
-
-			<!-- CMAP command -->
-			<KEYWORD3>create</KEYWORD3>
-
-			<!-- CMEDIT command -->
-			<KEYWORD3>add</KEYWORD3>
-			<KEYWORD3>dele</KEYWORD3>
-
-			<!-- CMPLOT command -->
-			<KEYWORD3>,n</KEYWORD3>
-			<KEYWORD3>p</KEYWORD3>
-
-			<!-- CMSEL command -->
-			<KEYWORD3>s</KEYWORD3>
-			<KEYWORD3>,r</KEYWORD3>
-			<KEYWORD3>,a</KEYWORD3>
-			<KEYWORD3>u</KEYWORD3>
-			<KEYWORD3>all</KEYWORD3>
-			<KEYWORD3>none</KEYWORD3>
-
-			<!-- CNVTOL command -->
-			<KEYWORD3>stat</KEYWORD3>
-			<KEYWORD3>u</KEYWORD3>
-			<KEYWORD3>rot</KEYWORD3>
-			<KEYWORD3>,f</KEYWORD3>
-			<KEYWORD3>,m</KEYWORD3>
-			<KEYWORD3>temp</KEYWORD3>
-			<KEYWORD3>heat</KEYWORD3>
-			<KEYWORD3>pres</KEYWORD3>
-			<KEYWORD3>v</KEYWORD3>
-			<KEYWORD3>flow</KEYWORD3>
-			<KEYWORD3>vf</KEYWORD3>
-			<KEYWORD3>volt</KEYWORD3>
-			<KEYWORD3>emf</KEYWORD3>
-			<KEYWORD3>curr</KEYWORD3>
-			<KEYWORD3>amps</KEYWORD3>
-			<KEYWORD3>curt</KEYWORD3>
-			<KEYWORD3>mag</KEYWORD3>
-			<KEYWORD3>,a</KEYWORD3>
-			<KEYWORD3>flux</KEYWORD3>
-			<KEYWORD3>csg</KEYWORD3>
-			<KEYWORD3>vltg</KEYWORD3>
-
-			<!-- COLOR command -->
-			<KEYWORD3>axes</KEYWORD3>
-			<KEYWORD3>axnum</KEYWORD3>
-			<KEYWORD3>num</KEYWORD3>
-			<KEYWORD3>outl</KEYWORD3>
-			<KEYWORD3>elem</KEYWORD3>
-			<KEYWORD3>line</KEYWORD3>
-			<KEYWORD3>area</KEYWORD3>
-			<KEYWORD3>volu</KEYWORD3>
-			<KEYWORD3>isurf</KEYWORD3>
-			<KEYWORD3>wbak</KEYWORD3>
-			<KEYWORD3>u</KEYWORD3>
-			<KEYWORD3>rot</KEYWORD3>
-			<KEYWORD3>temp</KEYWORD3>
-			<KEYWORD3>pres</KEYWORD3>
-			<KEYWORD3>v</KEYWORD3>
-			<KEYWORD3>enke</KEYWORD3>
-			<KEYWORD3>ends</KEYWORD3>
-			<KEYWORD3>sp01</KEYWORD3>
-			<KEYWORD3>sp02</KEYWORD3>
-			<KEYWORD3>sp03</KEYWORD3>
-			<KEYWORD3>sp04</KEYWORD3>
-			<KEYWORD3>sp05</KEYWORD3>
-			<KEYWORD3>sp06</KEYWORD3>
-			<KEYWORD3>volt</KEYWORD3>
-			<KEYWORD3>mag</KEYWORD3>
-			<KEYWORD3>,a</KEYWORD3>
-			<KEYWORD3>emf</KEYWORD3>
-			<KEYWORD3>curr</KEYWORD3>
-			<KEYWORD3>,f</KEYWORD3>
-			<KEYWORD3>,m</KEYWORD3>
-			<KEYWORD3>heat</KEYWORD3>
-			<KEYWORD3>flow</KEYWORD3>
-			<KEYWORD3>vf</KEYWORD3>
-			<KEYWORD3>amps</KEYWORD3>
-			<KEYWORD3>flux</KEYWORD3>
-			<KEYWORD3>csg</KEYWORD3>
-			<KEYWORD3>curt</KEYWORD3>
-			<KEYWORD3>vltg</KEYWORD3>
-			<KEYWORD3>mast</KEYWORD3>
-			<KEYWORD3>,cp</KEYWORD3>
-			<KEYWORD3>,ce</KEYWORD3>
-			<KEYWORD3>nfor</KEYWORD3>
-			<KEYWORD3>nmom</KEYWORD3>
-			<KEYWORD3>rfor</KEYWORD3>
-			<KEYWORD3>rmom</KEYWORD3>
-			<KEYWORD3>path</KEYWORD3>
-			<KEYWORD3>grbak</KEYWORD3>
-			<KEYWORD3>grid</KEYWORD3>
-			<KEYWORD3>axlab</KEYWORD3>
-			<KEYWORD3>curve</KEYWORD3>
-			<KEYWORD3>cm</KEYWORD3>
-			<KEYWORD3>cntr</KEYWORD3>
-			<KEYWORD3>smax</KEYWORD3>
-			<KEYWORD3>smin</KEYWORD3>
-			<KEYWORD3>mred</KEYWORD3>
-			<KEYWORD3>cblu</KEYWORD3>
-			<KEYWORD3>ygre</KEYWORD3>
-			<KEYWORD3>dgra</KEYWORD3>
-			<KEYWORD3>mage</KEYWORD3>
-			<KEYWORD3>cyan</KEYWORD3>
-			<KEYWORD3>yell</KEYWORD3>
-			<KEYWORD3>lgra</KEYWORD3>
-			<KEYWORD3>bmag</KEYWORD3>
-			<KEYWORD3>gcya</KEYWORD3>
-			<KEYWORD3>oran</KEYWORD3>
-			<KEYWORD3>whit</KEYWORD3>
-			<KEYWORD3>blue</KEYWORD3>
-			<KEYWORD3>gree</KEYWORD3>
-			<KEYWORD3>red</KEYWORD3>
-			<KEYWORD3>blac</KEYWORD3>
-
-			<!-- CONFIG command -->
-			<KEYWORD3>nres</KEYWORD3>
-			<KEYWORD3>nbuf</KEYWORD3>
-			<KEYWORD3>nproc</KEYWORD3>
-			<KEYWORD3>locfl</KEYWORD3>
-			<KEYWORD3>szbio</KEYWORD3>
-			<KEYWORD3>ncont</KEYWORD3>
-			<KEYWORD3>order</KEYWORD3>
-			<KEYWORD3>fsplit</KEYWORD3>
-			<KEYWORD3>mxnd</KEYWORD3>
-			<KEYWORD3>mxel</KEYWORD3>
-			<KEYWORD3>mxkp</KEYWORD3>
-			<KEYWORD3>mxls</KEYWORD3>
-			<KEYWORD3>mxar</KEYWORD3>
-			<KEYWORD3>mxvl</KEYWORD3>
-			<KEYWORD3>mxrl</KEYWORD3>
-			<KEYWORD3>mxcp</KEYWORD3>
-			<KEYWORD3>mxce</KEYWORD3>
-			<KEYWORD3>nlcontrol</KEYWORD3>
-
-			<!-- CP command -->
-			<KEYWORD3>high</KEYWORD3>
-			<KEYWORD3>next</KEYWORD3>
-
-			<!-- CPDELE, CPLIST commands -->
-			<KEYWORD3>any</KEYWORD3>
-			<KEYWORD3>all</KEYWORD3>
-
-			<!-- CPINTF, D, DA, DADELE, DDELE, DK, DL, DLDELE, DOF, DOFSEL, FKLIST commands -->
-			<KEYWORD3>all</KEYWORD3>
-			<KEYWORD3>ux</KEYWORD3>
-			<KEYWORD3>uy</KEYWORD3>
-			<KEYWORD3>uz</KEYWORD3>
-			<KEYWORD3>rotx</KEYWORD3>
-			<KEYWORD3>roty</KEYWORD3>
-			<KEYWORD3>rotz</KEYWORD3>
-			<KEYWORD3>temp</KEYWORD3>
-			<KEYWORD3>pres</KEYWORD3>
-			<KEYWORD3>vx</KEYWORD3>
-			<KEYWORD3>vy</KEYWORD3>
-			<KEYWORD3>vz</KEYWORD3>
-			<KEYWORD3>volt</KEYWORD3>
-			<KEYWORD3>emf</KEYWORD3>
-			<KEYWORD3>curr</KEYWORD3>
-			<KEYWORD3>mag</KEYWORD3>
-			<KEYWORD3>ax</KEYWORD3>
-			<KEYWORD3>ay</KEYWORD3>
-			<KEYWORD3>az</KEYWORD3>
-			<KEYWORD3>enke</KEYWORD3>
-			<KEYWORD3>ends</KEYWORD3>
-			<KEYWORD3>sp01</KEYWORD3>
-			<KEYWORD3>sp02</KEYWORD3>
-			<KEYWORD3>sp03</KEYWORD3>
-			<KEYWORD3>sp04</KEYWORD3>
-			<KEYWORD3>sp05</KEYWORD3>
-			<KEYWORD3>sp06</KEYWORD3>
-			<KEYWORD3>p</KEYWORD3>
-			<KEYWORD3>symm</KEYWORD3>
-			<KEYWORD3>asym</KEYWORD3>
-			<KEYWORD3>delete</KEYWORD3>
-			<KEYWORD3>s</KEYWORD3>
-			<KEYWORD3>,a</KEYWORD3>
-			<KEYWORD3>u</KEYWORD3>
-			<KEYWORD3>stat</KEYWORD3>
-			<KEYWORD3>rot</KEYWORD3>
-			<KEYWORD3>disp</KEYWORD3>
-			<KEYWORD3>v</KEYWORD3>
-			<KEYWORD3>en</KEYWORD3>
-			<KEYWORD3>fx</KEYWORD3>
-			<KEYWORD3>fy</KEYWORD3>
-			<KEYWORD3>fz</KEYWORD3>
-			<KEYWORD3>,f</KEYWORD3>
-			<KEYWORD3>mx</KEYWORD3>
-			<KEYWORD3>my</KEYWORD3>
-			<KEYWORD3>mz</KEYWORD3>
-			<KEYWORD3>,m</KEYWORD3>
-			<KEYWORD3>forc</KEYWORD3>
-			<KEYWORD3>heat</KEYWORD3>
-			<KEYWORD3>flow</KEYWORD3>
-			<KEYWORD3>amps</KEYWORD3>
-			<KEYWORD3>chrg</KEYWORD3>
-			<KEYWORD3>flux</KEYWORD3>
-			<KEYWORD3>csgx</KEYWORD3>
-			<KEYWORD3>csgy</KEYWORD3>
-			<KEYWORD3>csgz</KEYWORD3>
-			<KEYWORD3>csg</KEYWORD3>
-
-			<!-- CQC command -->
-			<KEYWORD3>disp</KEYWORD3>
-			<KEYWORD3>velo</KEYWORD3>
-			<KEYWORD3>acel</KEYWORD3>
-
-			<!-- CSDELE, CSLIST commands -->
-			<KEYWORD3>all</KEYWORD3>
-
-			<!-- CUTCONTROL command -->
-			<KEYWORD3>plslimit</KEYWORD3>
-			<KEYWORD3>crplimit</KEYWORD3>
-			<KEYWORD3>dsplimit</KEYWORD3>
-			<KEYWORD3>npoint</KEYWORD3>
-			<KEYWORD3>noiterpredict</KEYWORD3>
-
-			<!-- DCUM command -->
-			<KEYWORD3>repl</KEYWORD3>
-			<KEYWORD3>add</KEYWORD3>
-			<KEYWORD3>igno</KEYWORD3>
-
-			<!-- DEL command -->
-			<KEYWORD3>all</KEYWORD3>
-			<KEYWORD3>_prm</KEYWORD3>
-
-			<!-- DELTIM command -->
-			<KEYWORD3>off</KEYWORD3>
-			<KEYWORD3>on</KEYWORD3>
-
-			<!-- DESIZE command -->
-			<KEYWORD3>defa</KEYWORD3>
-			<KEYWORD3>stat</KEYWORD3>
-			<KEYWORD3>off</KEYWORD3>
-			<KEYWORD3>on</KEYWORD3>
-
-			<!-- DESOL, DNSOL commands -->
-			<KEYWORD3>all</KEYWORD3>
-			<KEYWORD3>p</KEYWORD3>
-			<KEYWORD3>s</KEYWORD3>
-			<KEYWORD3>x</KEYWORD3>
-			<KEYWORD3>y</KEYWORD3>
-			<KEYWORD3>z</KEYWORD3>
-			<KEYWORD3>xy</KEYWORD3>
-			<KEYWORD3>yz</KEYWORD3>
-			<KEYWORD3>zx</KEYWORD3>
-			<KEYWORD3>epel</KEYWORD3>
-			<KEYWORD3>eppl</KEYWORD3>
-			<KEYWORD3>epcr</KEYWORD3>
-			<KEYWORD3>epth</KEYWORD3>
-			<KEYWORD3>epsw</KEYWORD3>
-			<KEYWORD3>nl</KEYWORD3>
-			<KEYWORD3>sepl</KEYWORD3>
-			<KEYWORD3>srat</KEYWORD3>
-			<KEYWORD3>hpres</KEYWORD3>
-			<KEYWORD3>epeq</KEYWORD3>
-			<KEYWORD3>psv</KEYWORD3>
-			<KEYWORD3>plwk</KEYWORD3>
-			<KEYWORD3>tg</KEYWORD3>
-			<KEYWORD3>tf</KEYWORD3>
-			<KEYWORD3>pg</KEYWORD3>
-			<KEYWORD3>ef</KEYWORD3>
-			<KEYWORD3>,d</KEYWORD3>
-			<KEYWORD3>h</KEYWORD3>
-			<KEYWORD3>b</KEYWORD3>
-			<KEYWORD3>fmag</KEYWORD3>
-			<KEYWORD3>,f</KEYWORD3>
-			<KEYWORD3>,m</KEYWORD3>
-			<KEYWORD3>heat</KEYWORD3>
-			<KEYWORD3>flow</KEYWORD3>
-			<KEYWORD3>amps</KEYWORD3>
-			<KEYWORD3>flux</KEYWORD3>
-			<KEYWORD3>vf</KEYWORD3>
-			<KEYWORD3>csg</KEYWORD3>
-			<KEYWORD3>u</KEYWORD3>
-			<KEYWORD3>rot</KEYWORD3>
-			<KEYWORD3>temp</KEYWORD3>
-			<KEYWORD3>pres</KEYWORD3>
-			<KEYWORD3>volt</KEYWORD3>
-			<KEYWORD3>mag</KEYWORD3>
-			<KEYWORD3>v</KEYWORD3>
-			<KEYWORD3>,a</KEYWORD3>
-			<KEYWORD3>enke</KEYWORD3>
-			<KEYWORD3>ends</KEYWORD3>
-			<KEYWORD3>s</KEYWORD3>
-			<KEYWORD3>int</KEYWORD3>
-			<KEYWORD3>eqv</KEYWORD3>
-			<KEYWORD3>sum</KEYWORD3>
-			<KEYWORD3>ttot</KEYWORD3>
-			<KEYWORD3>hflu</KEYWORD3>
-			<KEYWORD3>hflm</KEYWORD3>
-			<KEYWORD3>cond</KEYWORD3>
-			<KEYWORD3>pcoe</KEYWORD3>
-			<KEYWORD3>ptot</KEYWORD3>
-			<KEYWORD3>mach</KEYWORD3>
-			<KEYWORD3>strm</KEYWORD3>
-			<KEYWORD3>dens</KEYWORD3>
-			<KEYWORD3>visc</KEYWORD3>
-			<KEYWORD3>evis</KEYWORD3>
-			<KEYWORD3>cmuv</KEYWORD3>
-			<KEYWORD3>econ</KEYWORD3>
-			<KEYWORD3>yplu</KEYWORD3>
-			<KEYWORD3>tauw</KEYWORD3>
-
-			<!-- DEVDISP command -->
-			<KEYWORD3>dither</KEYWORD3>
-			<KEYWORD3>font</KEYWORD3>
-			<KEYWORD3>text</KEYWORD3>
-			<KEYWORD3>off</KEYWORD3>
-			<KEYWORD3>on</KEYWORD3>
-
-			<!-- DEVICE command -->
-			<KEYWORD3>vector</KEYWORD3>
-			<KEYWORD3>dither</KEYWORD3>
-			<KEYWORD3>anim</KEYWORD3>
-			<KEYWORD3>font</KEYWORD3>
-			<KEYWORD3>text</KEYWORD3>
-			<KEYWORD3>off</KEYWORD3>
-			<KEYWORD3>on</KEYWORD3>
-
-			<!-- DIM command -->
-			<KEYWORD3>array</KEYWORD3>
-			<KEYWORD3>char</KEYWORD3>
-			<KEYWORD3>table</KEYWORD3>
-			<KEYWORD3>time</KEYWORD3>
-			<KEYWORD3>x</KEYWORD3>
-			<KEYWORD3>y</KEYWORD3>
-			<KEYWORD3>z</KEYWORD3>
-			<KEYWORD3>temp</KEYWORD3>
-			<KEYWORD3>velocity</KEYWORD3>
-			<KEYWORD3>pressure</KEYWORD3>
-
-			<!-- /DSCALE command -->
-			<KEYWORD3>auto</KEYWORD3>
-			<KEYWORD3>off</KEYWORD3>
-			<KEYWORD3>user</KEYWORD3>
-
-			<!-- DSUM command -->
-			<KEYWORD3>disp</KEYWORD3>
-			<KEYWORD3>velo</KEYWORD3>
-			<KEYWORD3>acel</KEYWORD3>
-
-			<!-- DSYM command -->
-			<KEYWORD3>symm</KEYWORD3>
-			<KEYWORD3>asym</KEYWORD3>
-			<KEYWORD3>x</KEYWORD3>
-			<KEYWORD3>y</KEYWORD3>
-			<KEYWORD3>z</KEYWORD3>
-
-			<!-- DUMP command -->
-			<KEYWORD3>head</KEYWORD3>
-			<KEYWORD3>all</KEYWORD3>
-
-			<!-- /DV3D command -->
-			<KEYWORD3>anim</KEYWORD3>
-			<KEYWORD3>dgen</KEYWORD3>
-			<KEYWORD3>dlist</KEYWORD3>
-
-			<!-- EDBOUND command -->
-			<KEYWORD3>add</KEYWORD3>
-			<KEYWORD3>dele</KEYWORD3>
-			<KEYWORD3>list</KEYWORD3>
-			<KEYWORD3>slide</KEYWORD3>
-			<KEYWORD3>cycl</KEYWORD3>
-
-			<!-- EDCDELE, EDCGEN commands -->
-			<KEYWORD3>ants</KEYWORD3>
-			<KEYWORD3>assc</KEYWORD3>
-			<KEYWORD3>asts</KEYWORD3>
-			<KEYWORD3>drawbead</KEYWORD3>
-			<KEYWORD3>ents</KEYWORD3>
-			<KEYWORD3>ess</KEYWORD3>
-			<KEYWORD3>ests</KEYWORD3>
-			<KEYWORD3>nts</KEYWORD3>
-			<KEYWORD3>osts</KEYWORD3>
-			<KEYWORD3>rntr</KEYWORD3>
-			<KEYWORD3>rotr</KEYWORD3>
-			<KEYWORD3>se</KEYWORD3>
-			<KEYWORD3>ss</KEYWORD3>
-			<KEYWORD3>sts</KEYWORD3>
-			<KEYWORD3>tdns</KEYWORD3>
-			<KEYWORD3>tdss</KEYWORD3>
-			<KEYWORD3>tnts</KEYWORD3>
-			<KEYWORD3>tsts</KEYWORD3>
-
-			<!-- EDCRB, EDCURVE, EDLCS commands -->
-			<KEYWORD3>add</KEYWORD3>
-			<KEYWORD3>dele</KEYWORD3>
-			<KEYWORD3>list</KEYWORD3>
-
-			<!-- EDCSC command -->
-			<KEYWORD3>off</KEYWORD3>
-			<KEYWORD3>on</KEYWORD3>
-
-			<!-- EDDAMP command -->
-			<KEYWORD3>all</KEYWORD3>
-
-			<!-- EDDRELAX command -->
-			<KEYWORD3>ansys</KEYWORD3>
-			<KEYWORD3>dyna</KEYWORD3>
-
-			<!-- EDELE command -->
-			<KEYWORD3>all</KEYWORD3>
-			<KEYWORD3>p</KEYWORD3>
-
-			<!-- EDENERGY, EDFPLOT commands -->
-			<KEYWORD3>off</KEYWORD3>
-			<KEYWORD3>on</KEYWORD3>
-
-			<!-- EDHIST, EDIVELO commands -->
-			<KEYWORD3>list</KEYWORD3>
-			<KEYWORD3>dele</KEYWORD3>
-
-			<!-- EDLDPLOT, EDLOAD command -->
-			<KEYWORD3>fx</KEYWORD3>
-			<KEYWORD3>fy</KEYWORD3>
-			<KEYWORD3>fz</KEYWORD3>
-			<KEYWORD3>mx</KEYWORD3>
-			<KEYWORD3>my</KEYWORD3>
-			<KEYWORD3>mz</KEYWORD3>
-			<KEYWORD3>ux</KEYWORD3>
-			<KEYWORD3>uy</KEYWORD3>
-			<KEYWORD3>uz</KEYWORD3>
-			<KEYWORD3>rotx</KEYWORD3>
-			<KEYWORD3>roty</KEYWORD3>
-			<KEYWORD3>rotz</KEYWORD3>
-			<KEYWORD3>vx</KEYWORD3>
-			<KEYWORD3>vy</KEYWORD3>
-			<KEYWORD3>vz</KEYWORD3>
-			<KEYWORD3>ax</KEYWORD3>
-			<KEYWORD3>ay</KEYWORD3>
-			<KEYWORD3>az</KEYWORD3>
-			<KEYWORD3>aclx</KEYWORD3>
-			<KEYWORD3>acly</KEYWORD3>
-			<KEYWORD3>aclz</KEYWORD3>
-			<KEYWORD3>omgx</KEYWORD3>
-			<KEYWORD3>omgy</KEYWORD3>
-			<KEYWORD3>omgz</KEYWORD3>
-			<KEYWORD3>press</KEYWORD3>
-			<KEYWORD3>rbux</KEYWORD3>
-			<KEYWORD3>rbuy</KEYWORD3>
-			<KEYWORD3>rbuz</KEYWORD3>
-			<KEYWORD3>rbrx</KEYWORD3>
-			<KEYWORD3>rbry</KEYWORD3>
-			<KEYWORD3>rbrz</KEYWORD3>
-			<KEYWORD3>rbvx</KEYWORD3>
-			<KEYWORD3>rbvy</KEYWORD3>
-			<KEYWORD3>rbvz</KEYWORD3>
-			<KEYWORD3>rbfx</KEYWORD3>
-			<KEYWORD3>rbfy</KEYWORD3>
-			<KEYWORD3>rbfz</KEYWORD3>
-			<KEYWORD3>rbmx</KEYWORD3>
-			<KEYWORD3>rbmy</KEYWORD3>
-			<KEYWORD3>rbmz</KEYWORD3>
-			<KEYWORD3>add</KEYWORD3>
-			<KEYWORD3>dele</KEYWORD3>
-			<KEYWORD3>list</KEYWORD3>
-
-			<!-- EDMP command -->
-			<KEYWORD3>hgls</KEYWORD3>
-			<KEYWORD3>rigid</KEYWORD3>
-			<KEYWORD3>cable</KEYWORD3>
-			<KEYWORD3>ortho</KEYWORD3>
-
-			<!-- EDNROT, EDOPT commands -->
-			<KEYWORD3>add</KEYWORD3>
-			<KEYWORD3>dele</KEYWORD3>
-			<KEYWORD3>list</KEYWORD3>
-			<KEYWORD3>all</KEYWORD3>
-			<KEYWORD3>ux</KEYWORD3>
-			<KEYWORD3>uy</KEYWORD3>
-			<KEYWORD3>uz</KEYWORD3>
-			<KEYWORD3>rotx</KEYWORD3>
-			<KEYWORD3>roty</KEYWORD3>
-			<KEYWORD3>rotz</KEYWORD3>
-			<KEYWORD3>ansys</KEYWORD3>
-			<KEYWORD3>taurus</KEYWORD3>
-			<KEYWORD3>both</KEYWORD3>
-
-			<!-- EDOUT, EDREAD commands -->
-			<KEYWORD3>glstat</KEYWORD3>
-			<KEYWORD3>bndout</KEYWORD3>
-			<KEYWORD3>rwforc</KEYWORD3>
-			<KEYWORD3>deforc</KEYWORD3>
-			<KEYWORD3>,matsum</KEYWORD3>
-			<KEYWORD3>ncforc</KEYWORD3>
-			<KEYWORD3>rcforc</KEYWORD3>
-			<KEYWORD3>defgeo</KEYWORD3>
-			<KEYWORD3>spcforc</KEYWORD3>
-			<KEYWORD3>swforc</KEYWORD3>
-			<KEYWORD3>rbdout</KEYWORD3>
-			<KEYWORD3>gceout</KEYWORD3>
-			<KEYWORD3>sleout</KEYWORD3>
-			<KEYWORD3>jntforc</KEYWORD3>
-			<KEYWORD3>nodout</KEYWORD3>
-			<KEYWORD3>elout</KEYWORD3>
-
-			<!-- EDWELD command -->
-			<KEYWORD3>add</KEYWORD3>
-			<KEYWORD3>dele</KEYWORD3>
-			<KEYWORD3>list</KEYWORD3>
-
-			<!-- EDWRITE command -->
-			<KEYWORD3>ansys</KEYWORD3>
-			<KEYWORD3>taurus</KEYWORD3>
-			<KEYWORD3>both</KEYWORD3>
-			<KEYWORD3>pcreate</KEYWORD3>
-			<KEYWORD3>pupdate</KEYWORD3>
-			<KEYWORD3>plist</KEYWORD3>
-
-			<!-- EKILL, ELIST commands -->
-			<KEYWORD3>all</KEYWORD3>
-			<KEYWORD3>p</KEYWORD3>
-
-			<!-- *ELSEIF command -->
-			<KEYWORD3>eq</KEYWORD3>
-			<KEYWORD3>ne</KEYWORD3>
-			<KEYWORD3>lt</KEYWORD3>
-			<KEYWORD3>gt</KEYWORD3>
-			<KEYWORD3>le</KEYWORD3>
-			<KEYWORD3>ge</KEYWORD3>
-			<KEYWORD3>ablt</KEYWORD3>
-			<KEYWORD3>abgt</KEYWORD3>
-
-			<!-- EMID command -->
-			<KEYWORD3>add</KEYWORD3>
-			<KEYWORD3>remove</KEYWORD3>
-			<KEYWORD3>all</KEYWORD3>
-			<KEYWORD3>either</KEYWORD3>
-			<KEYWORD3>both</KEYWORD3>
-
-			<!-- EMODIF command -->
-			<KEYWORD3>p</KEYWORD3>
-			<KEYWORD3>all</KEYWORD3>
-			<KEYWORD3>,mat</KEYWORD3>
-			<KEYWORD3>,type</KEYWORD3>
-			<KEYWORD3>,real</KEYWORD3>
-			<KEYWORD3>,esys</KEYWORD3>
-			<KEYWORD3>secnum</KEYWORD3>
-
-			<!-- EMORE, EN commands -->
-			<KEYWORD3>p</KEYWORD3>
-
-			<!-- EMUNIT command -->
-			<KEYWORD3>mks</KEYWORD3>
-			<KEYWORD3>muzro</KEYWORD3>
-			<KEYWORD3>epzro</KEYWORD3>
-
-			<!-- ENGEN, ENORM, ENSYM commands -->
-			<KEYWORD3>all</KEYWORD3>
-			<KEYWORD3>p</KEYWORD3>
-
-			<!-- EQSLV command -->
-			<KEYWORD3>front</KEYWORD3>
-			<KEYWORD3>sparse</KEYWORD3>
-			<KEYWORD3>jcg</KEYWORD3>
-			<KEYWORD3>jcgout</KEYWORD3>
-			<KEYWORD3>iccg</KEYWORD3>
-			<KEYWORD3>pcg</KEYWORD3>
-			<KEYWORD3>pcgout</KEYWORD3>
-			<KEYWORD3>iter</KEYWORD3>
-
-			<!-- EREFINE command -->
-			<KEYWORD3>all</KEYWORD3>
-			<KEYWORD3>p</KEYWORD3>
-			<KEYWORD3>off</KEYWORD3>
-			<KEYWORD3>smooth</KEYWORD3>
-			<KEYWORD3>clean</KEYWORD3>
-			<KEYWORD3>on</KEYWORD3>
-
-			<!-- ERESX command -->
-			<KEYWORD3>defa</KEYWORD3>
-			<KEYWORD3>yes</KEYWORD3>
-			<KEYWORD3>no</KEYWORD3>
-
-			<!-- ERNORM command -->
-			<KEYWORD3>on</KEYWORD3>
-			<KEYWORD3>off</KEYWORD3>
-
-			<!-- ESEL command -->
-			<KEYWORD3>s</KEYWORD3>
-			<KEYWORD3>,r</KEYWORD3>
-			<KEYWORD3>,a</KEYWORD3>
-			<KEYWORD3>u</KEYWORD3>
-			<KEYWORD3>all</KEYWORD3>
-			<KEYWORD3>none</KEYWORD3>
-			<KEYWORD3>inve</KEYWORD3>
-			<KEYWORD3>stat</KEYWORD3>
-			<KEYWORD3>p</KEYWORD3>
-			<KEYWORD3>elem</KEYWORD3>
-			<KEYWORD3>adj</KEYWORD3>
-			<KEYWORD3>,type</KEYWORD3>
-			<KEYWORD3>ename</KEYWORD3>
-			<KEYWORD3>,mat</KEYWORD3>
-			<KEYWORD3>,real</KEYWORD3>
-			<KEYWORD3>,esys</KEYWORD3>
-			<KEYWORD3>live</KEYWORD3>
-			<KEYWORD3>layer</KEYWORD3>
-			<KEYWORD3>sec</KEYWORD3>
-			<KEYWORD3>pinc</KEYWORD3>
-			<KEYWORD3>pexc</KEYWORD3>
-			<KEYWORD3>sfe</KEYWORD3>
-			<KEYWORD3>pres</KEYWORD3>
-			<KEYWORD3>conv</KEYWORD3>
-			<KEYWORD3>hflux</KEYWORD3>
-			<KEYWORD3>fsi</KEYWORD3>
-			<KEYWORD3>impd</KEYWORD3>
-			<KEYWORD3>shld</KEYWORD3>
-			<KEYWORD3>mxwf</KEYWORD3>
-			<KEYWORD3>chrgs</KEYWORD3>
-			<KEYWORD3>inf</KEYWORD3>
-			<KEYWORD3>bfe</KEYWORD3>
-			<KEYWORD3>temp</KEYWORD3>
-			<KEYWORD3>flue</KEYWORD3>
-			<KEYWORD3>hgen</KEYWORD3>
-			<KEYWORD3>js</KEYWORD3>
-			<KEYWORD3>mvdi</KEYWORD3>
-			<KEYWORD3>chrgd</KEYWORD3>
-			<KEYWORD3>etab</KEYWORD3>
-
-			<!-- ESLA, ESLL, ESLN, ESLV commands -->
-			<KEYWORD3>s</KEYWORD3>
-			<KEYWORD3>,r</KEYWORD3>
-			<KEYWORD3>,a</KEYWORD3>
-			<KEYWORD3>u</KEYWORD3>
-			<KEYWORD3>all</KEYWORD3>
-			<KEYWORD3>active</KEYWORD3>
-			<KEYWORD3>inactive</KEYWORD3>
-			<KEYWORD3>corner</KEYWORD3>
-			<KEYWORD3>mid</KEYWORD3>
-
-			<!-- ESOL command -->
-			<KEYWORD3>p</KEYWORD3>
-			<KEYWORD3>s</KEYWORD3>
-			<KEYWORD3>x</KEYWORD3>
-			<KEYWORD3>y</KEYWORD3>
-			<KEYWORD3>z</KEYWORD3>
-			<KEYWORD3>xy</KEYWORD3>
-			<KEYWORD3>yz</KEYWORD3>
-			<KEYWORD3>zx</KEYWORD3>
-			<KEYWORD3>int</KEYWORD3>
-			<KEYWORD3>eqv</KEYWORD3>
-			<KEYWORD3>epel</KEYWORD3>
-			<KEYWORD3>eppl</KEYWORD3>
-			<KEYWORD3>epcr</KEYWORD3>
-			<KEYWORD3>epth</KEYWORD3>
-			<KEYWORD3>nl</KEYWORD3>
-			<KEYWORD3>sepl</KEYWORD3>
-			<KEYWORD3>srat</KEYWORD3>
-			<KEYWORD3>hpres</KEYWORD3>
-			<KEYWORD3>epeq</KEYWORD3>
-			<KEYWORD3>psv</KEYWORD3>
-			<KEYWORD3>plwk</KEYWORD3>
-			<KEYWORD3>cont</KEYWORD3>
-			<KEYWORD3>stat</KEYWORD3>
-			<KEYWORD3>pene</KEYWORD3>
-			<KEYWORD3>pres</KEYWORD3>
-			<KEYWORD3>sfric</KEYWORD3>
-			<KEYWORD3>stot</KEYWORD3>
-			<KEYWORD3>slide</KEYWORD3>
-			<KEYWORD3>tg</KEYWORD3>
-			<KEYWORD3>sum</KEYWORD3>
-			<KEYWORD3>tf</KEYWORD3>
-			<KEYWORD3>pg</KEYWORD3>
-			<KEYWORD3>ef</KEYWORD3>
-			<KEYWORD3>,d</KEYWORD3>
-			<KEYWORD3>h</KEYWORD3>
-			<KEYWORD3>b</KEYWORD3>
-			<KEYWORD3>fmag</KEYWORD3>
-			<KEYWORD3>,f</KEYWORD3>
-			<KEYWORD3>,m</KEYWORD3>
-			<KEYWORD3>heat</KEYWORD3>
-			<KEYWORD3>flow</KEYWORD3>
-			<KEYWORD3>amps</KEYWORD3>
-			<KEYWORD3>flux</KEYWORD3>
-			<KEYWORD3>vf</KEYWORD3>
-			<KEYWORD3>csg</KEYWORD3>
-			<KEYWORD3>sene</KEYWORD3>
-			<KEYWORD3>kene</KEYWORD3>
-			<KEYWORD3>jheat</KEYWORD3>
-			<KEYWORD3>js</KEYWORD3>
-			<KEYWORD3>jt</KEYWORD3>
-			<KEYWORD3>mre</KEYWORD3>
-			<KEYWORD3>volu</KEYWORD3>
-			<KEYWORD3>bfe</KEYWORD3>
-			<KEYWORD3>temp</KEYWORD3>
-
-			<!-- ESORT command -->
-			<KEYWORD3>etab</KEYWORD3>
-
-			<!-- ESURF command -->
-			<KEYWORD3>top</KEYWORD3>
-			<KEYWORD3>bottom</KEYWORD3>
-			<KEYWORD3>reverse</KEYWORD3>
-			<KEYWORD3>tri</KEYWORD3>
-
-			<!-- ESYM command -->
-			<KEYWORD3>all</KEYWORD3>
-			<KEYWORD3>p</KEYWORD3>
-
-			<!-- ETABLE command -->
-			<KEYWORD3>refl</KEYWORD3>
-			<KEYWORD3>stat</KEYWORD3>
-			<KEYWORD3>eras</KEYWORD3>
-			<KEYWORD3>u</KEYWORD3>
-			<KEYWORD3>x</KEYWORD3>
-			<KEYWORD3>y</KEYWORD3>
-			<KEYWORD3>z</KEYWORD3>
-			<KEYWORD3>rot</KEYWORD3>
-			<KEYWORD3>temp</KEYWORD3>
-			<KEYWORD3>pres</KEYWORD3>
-			<KEYWORD3>volt</KEYWORD3>
-			<KEYWORD3>mag</KEYWORD3>
-			<KEYWORD3>v</KEYWORD3>
-			<KEYWORD3>,a</KEYWORD3>
-			<KEYWORD3>curr</KEYWORD3>
-			<KEYWORD3>emf</KEYWORD3>
-			<KEYWORD3>enke</KEYWORD3>
-			<KEYWORD3>ends</KEYWORD3>
-			<KEYWORD3>sp01</KEYWORD3>
-			<KEYWORD3>sp02</KEYWORD3>
-			<KEYWORD3>sp03</KEYWORD3>
-			<KEYWORD3>sp04</KEYWORD3>
-			<KEYWORD3>sp05</KEYWORD3>
-			<KEYWORD3>sp06</KEYWORD3>
-			<KEYWORD3>ttot</KEYWORD3>
-			<KEYWORD3>hflu</KEYWORD3>
-			<KEYWORD3>hflm</KEYWORD3>
-			<KEYWORD3>cond</KEYWORD3>
-			<KEYWORD3>pcoe</KEYWORD3>
-			<KEYWORD3>ptot</KEYWORD3>
-			<KEYWORD3>mach</KEYWORD3>
-			<KEYWORD3>strm</KEYWORD3>
-			<KEYWORD3>dens</KEYWORD3>
-			<KEYWORD3>visc</KEYWORD3>
-			<KEYWORD3>evis</KEYWORD3>
-			<KEYWORD3>econ</KEYWORD3>
-			<KEYWORD3>yplu</KEYWORD3>
-			<KEYWORD3>tauw</KEYWORD3>
-			<KEYWORD3>lmd1</KEYWORD3>
-			<KEYWORD3>lmd2</KEYWORD3>
-			<KEYWORD3>lmd3</KEYWORD3>
-			<KEYWORD3>lmd4</KEYWORD3>
-			<KEYWORD3>lmd5</KEYWORD3>
-			<KEYWORD3>lmd6</KEYWORD3>
-			<KEYWORD3>emd1</KEYWORD3>
-			<KEYWORD3>emd2</KEYWORD3>
-			<KEYWORD3>emd3</KEYWORD3>
-			<KEYWORD3>emd4</KEYWORD3>
-			<KEYWORD3>emd5</KEYWORD3>
-			<KEYWORD3>emd6</KEYWORD3>
-			<KEYWORD3>s</KEYWORD3>
-			<KEYWORD3>xy</KEYWORD3>
-			<KEYWORD3>yz</KEYWORD3>
-			<KEYWORD3>zx</KEYWORD3>
-			<KEYWORD3>int</KEYWORD3>
-			<KEYWORD3>eqv</KEYWORD3>
-			<KEYWORD3>epto</KEYWORD3>
-			<KEYWORD3>epel</KEYWORD3>
-			<KEYWORD3>eppl</KEYWORD3>
-			<KEYWORD3>epcr</KEYWORD3>
-			<KEYWORD3>epth</KEYWORD3>
-			<KEYWORD3>epsw</KEYWORD3>
-			<KEYWORD3>nl</KEYWORD3>
-			<KEYWORD3>sepl</KEYWORD3>
-			<KEYWORD3>srat</KEYWORD3>
-			<KEYWORD3>hpres</KEYWORD3>
-			<KEYWORD3>epeq</KEYWORD3>
-			<KEYWORD3>psv</KEYWORD3>
-			<KEYWORD3>plwk</KEYWORD3>
-			<KEYWORD3>tg</KEYWORD3>
-			<KEYWORD3>sum</KEYWORD3>
-			<KEYWORD3>tf</KEYWORD3>
-			<KEYWORD3>pg</KEYWORD3>
-			<KEYWORD3>ef</KEYWORD3>
-			<KEYWORD3>,d</KEYWORD3>
-			<KEYWORD3>h</KEYWORD3>
-			<KEYWORD3>b</KEYWORD3>
-			<KEYWORD3>fmag</KEYWORD3>
-			<KEYWORD3>serr</KEYWORD3>
-			<KEYWORD3>sdsg</KEYWORD3>
-			<KEYWORD3>terr</KEYWORD3>
-			<KEYWORD3>tdsg</KEYWORD3>
-			<KEYWORD3>,f</KEYWORD3>
-			<KEYWORD3>,m</KEYWORD3>
-			<KEYWORD3>heat</KEYWORD3>
-			<KEYWORD3>flow</KEYWORD3>
-			<KEYWORD3>amps</KEYWORD3>
-			<KEYWORD3>flux</KEYWORD3>
-			<KEYWORD3>vf</KEYWORD3>
-			<KEYWORD3>csg</KEYWORD3>
-			<KEYWORD3>sene</KEYWORD3>
-			<KEYWORD3>aene</KEYWORD3>
-			<KEYWORD3>tene</KEYWORD3>
-			<KEYWORD3>kene</KEYWORD3>
-			<KEYWORD3>jheat</KEYWORD3>
-			<KEYWORD3>js</KEYWORD3>
-			<KEYWORD3>jt</KEYWORD3>
-			<KEYWORD3>mre</KEYWORD3>
-			<KEYWORD3>volu</KEYWORD3>
-			<KEYWORD3>cent</KEYWORD3>
-			<KEYWORD3>bfe</KEYWORD3>
-			<KEYWORD3>smisc</KEYWORD3>
-			<KEYWORD3>nmisc</KEYWORD3>
-			<KEYWORD3>surf</KEYWORD3>
-			<KEYWORD3>cont</KEYWORD3>
-			<KEYWORD3>stat</KEYWORD3>
-			<KEYWORD3>pene</KEYWORD3>
-			<KEYWORD3>sfric</KEYWORD3>
-			<KEYWORD3>stot</KEYWORD3>
-			<KEYWORD3>slide</KEYWORD3>
-			<KEYWORD3>gap</KEYWORD3>
-			<KEYWORD3>topo</KEYWORD3>
-
-			<!-- ETCHG command -->
-			<KEYWORD3>eti</KEYWORD3>
-			<KEYWORD3>ite</KEYWORD3>
-			<KEYWORD3>tts</KEYWORD3>
-			<KEYWORD3>stt</KEYWORD3>
-			<KEYWORD3>mtt</KEYWORD3>
-			<KEYWORD3>fts</KEYWORD3>
-			<KEYWORD3>ets</KEYWORD3>
-
-			<!-- ETDELE, ETLIST commands -->
-			<KEYWORD3>all</KEYWORD3>
-
-			<!-- EWRITE command -->
-			<KEYWORD3>elem</KEYWORD3>
-			<KEYWORD3>short</KEYWORD3>
-			<KEYWORD3>long1</KEYWORD3>
-
-			<!-- /EXIT command -->
-			<KEYWORD3>model</KEYWORD3>
-			<KEYWORD3>solu</KEYWORD3>
-			<KEYWORD3>all</KEYWORD3>
-			<KEYWORD3>nosave</KEYWORD3>
-
-			<!-- /EXPAND command -->
-			<KEYWORD3>rect</KEYWORD3>
-			<KEYWORD3>polar</KEYWORD3>
-			<KEYWORD3>modal</KEYWORD3>
-			<KEYWORD3>full</KEYWORD3>
-			<KEYWORD3>half</KEYWORD3>
-
-			<!-- EXPASS command -->
-			<KEYWORD3>off</KEYWORD3>
-			<KEYWORD3>on</KEYWORD3>
-
-			<!-- EXPSOL command -->
-			<KEYWORD3>yes</KEYWORD3>
-			<KEYWORD3>no</KEYWORD3>
-
-			<!-- EXTOPT command -->
-			<KEYWORD3>on</KEYWORD3>
-			<KEYWORD3>off</KEYWORD3>
-			<KEYWORD3>stat</KEYWORD3>
-			<KEYWORD3>attr</KEYWORD3>
-			<KEYWORD3>esize</KEYWORD3>
-			<KEYWORD3>aclear</KEYWORD3>
-
-			<!-- F, FDELE, FK, FKDELE commands -->
-			<KEYWORD3>all</KEYWORD3>
-			<KEYWORD3>p</KEYWORD3>
-			<KEYWORD3>fx</KEYWORD3>
-			<KEYWORD3>fy</KEYWORD3>
-			<KEYWORD3>fz</KEYWORD3>
-			<KEYWORD3>mx</KEYWORD3>
-			<KEYWORD3>my</KEYWORD3>
-			<KEYWORD3>mz</KEYWORD3>
-			<KEYWORD3>heat</KEYWORD3>
-			<KEYWORD3>flow</KEYWORD3>
-			<KEYWORD3>amps</KEYWORD3>
-			<KEYWORD3>chrg</KEYWORD3>
-			<KEYWORD3>flux</KEYWORD3>
-			<KEYWORD3>csgx</KEYWORD3>
-			<KEYWORD3>csgy</KEYWORD3>
-			<KEYWORD3>csgz</KEYWORD3>
-
-			<!-- /FACET command -->
-			<KEYWORD3>fine</KEYWORD3>
-			<KEYWORD3>norml</KEYWORD3>
-			<KEYWORD3>wire</KEYWORD3>
-
-			<!-- FCUM command -->
-			<KEYWORD3>repl</KEYWORD3>
-			<KEYWORD3>add</KEYWORD3>
-			<KEYWORD3>igno</KEYWORD3>
-			<KEYWORD3>stat</KEYWORD3>
-
-			<!-- /FDELE command -->
-			<KEYWORD3>emat</KEYWORD3>
-			<KEYWORD3>esav</KEYWORD3>
-			<KEYWORD3>full</KEYWORD3>
-			<KEYWORD3>sub</KEYWORD3>
-			<KEYWORD3>mode</KEYWORD3>
-			<KEYWORD3>tri</KEYWORD3>
-			<KEYWORD3>dsub</KEYWORD3>
-			<KEYWORD3>usub</KEYWORD3>
-			<KEYWORD3>osav</KEYWORD3>
-			<KEYWORD3>seld</KEYWORD3>
-			<KEYWORD3>keep</KEYWORD3>
-			<KEYWORD3>dele</KEYWORD3>
-
-			<!-- FELIST command -->
-			<KEYWORD3>all</KEYWORD3>
-
-			<!-- FILL command -->
-			<KEYWORD3>p</KEYWORD3>
-
-			<!-- FLDATA1 command -->
-			<KEYWORD3>solu</KEYWORD3>
-			<KEYWORD3>flow</KEYWORD3>
-			<KEYWORD3>turb</KEYWORD3>
-			<KEYWORD3>temp</KEYWORD3>
-			<KEYWORD3>comp</KEYWORD3>
-			<KEYWORD3>swrl</KEYWORD3>
-			<KEYWORD3>tran</KEYWORD3>
-			<KEYWORD3>spec</KEYWORD3>
-			<KEYWORD3>true</KEYWORD3>
-			<KEYWORD3>t</KEYWORD3>
-			<KEYWORD3>false</KEYWORD3>
-			<KEYWORD3>,f</KEYWORD3>
-
-			<!-- FLDATA2 command -->
-			<KEYWORD3>iter</KEYWORD3>
-			<KEYWORD3>exec</KEYWORD3>
-			<KEYWORD3>appe</KEYWORD3>
-			<KEYWORD3>over</KEYWORD3>
-
-			<!-- FLDATA3 command -->
-			<KEYWORD3>term</KEYWORD3>
-			<KEYWORD3>pres</KEYWORD3>
-			<KEYWORD3>temp</KEYWORD3>
-			<KEYWORD3>vx</KEYWORD3>
-			<KEYWORD3>vy</KEYWORD3>
-			<KEYWORD3>vz</KEYWORD3>
-			<KEYWORD3>enke</KEYWORD3>
-			<KEYWORD3>ends</KEYWORD3>
-
-			<!-- FLDATA4 command -->
-			<KEYWORD3>time</KEYWORD3>
-			<KEYWORD3>step</KEYWORD3>
-			<KEYWORD3>istep</KEYWORD3>
-			<KEYWORD3>bc</KEYWORD3>
-			<KEYWORD3>numb</KEYWORD3>
-			<KEYWORD3>glob</KEYWORD3>
-			<KEYWORD3>tend</KEYWORD3>
-			<KEYWORD3>appe</KEYWORD3>
-			<KEYWORD3>sumf</KEYWORD3>
-			<KEYWORD3>over</KEYWORD3>
-			<KEYWORD3>pres</KEYWORD3>
-			<KEYWORD3>temp</KEYWORD3>
-			<KEYWORD3>vx</KEYWORD3>
-			<KEYWORD3>vy</KEYWORD3>
-			<KEYWORD3>vz</KEYWORD3>
-			<KEYWORD3>enke</KEYWORD3>
-			<KEYWORD3>ends</KEYWORD3>
-
-			<!-- FLDATA4A command -->
-			<KEYWORD3>step</KEYWORD3>
-			<KEYWORD3>appe</KEYWORD3>
-			<KEYWORD3>sumf</KEYWORD3>
-			<KEYWORD3>over</KEYWORD3>
-
-			<!-- FLDATA5 command -->
-			<KEYWORD3>outp</KEYWORD3>
-			<KEYWORD3>sumf</KEYWORD3>
-			<KEYWORD3>debg</KEYWORD3>
-			<KEYWORD3>resi</KEYWORD3>
-			<KEYWORD3>dens</KEYWORD3>
-			<KEYWORD3>visc</KEYWORD3>
-			<KEYWORD3>cond</KEYWORD3>
-			<KEYWORD3>evis</KEYWORD3>
-			<KEYWORD3>econ</KEYWORD3>
-			<KEYWORD3>ttot</KEYWORD3>
-			<KEYWORD3>hflu</KEYWORD3>
-			<KEYWORD3>hflm</KEYWORD3>
-			<KEYWORD3>spht</KEYWORD3>
-			<KEYWORD3>strm</KEYWORD3>
-			<KEYWORD3>mach</KEYWORD3>
-			<KEYWORD3>ptot</KEYWORD3>
-			<KEYWORD3>pcoe</KEYWORD3>
-			<KEYWORD3>yplu</KEYWORD3>
-			<KEYWORD3>tauw</KEYWORD3>
-			<KEYWORD3>lmd</KEYWORD3>
-			<KEYWORD3>emd</KEYWORD3>
-
-			<!-- FLDATA6 command -->
-			<KEYWORD3>conv</KEYWORD3>
-			<KEYWORD3>outp</KEYWORD3>
-			<KEYWORD3>iter</KEYWORD3>
-			<KEYWORD3>land</KEYWORD3>
-			<KEYWORD3>bloc</KEYWORD3>
-			<KEYWORD3>bnow</KEYWORD3>
-
-			<!-- FLDATA7 command -->
-			<KEYWORD3>prot</KEYWORD3>
-			<KEYWORD3>dens</KEYWORD3>
-			<KEYWORD3>visc</KEYWORD3>
-			<KEYWORD3>cond</KEYWORD3>
-			<KEYWORD3>spht</KEYWORD3>
-			<KEYWORD3>constant</KEYWORD3>
-			<KEYWORD3>liquid</KEYWORD3>
-			<KEYWORD3>table</KEYWORD3>
-			<KEYWORD3>powl</KEYWORD3>
-			<KEYWORD3>carr</KEYWORD3>
-			<KEYWORD3>bing</KEYWORD3>
-			<KEYWORD3>usrv</KEYWORD3>
-			<KEYWORD3>air</KEYWORD3>
-			<KEYWORD3>air_b</KEYWORD3>
-			<KEYWORD3>air-si</KEYWORD3>
-			<KEYWORD3>air-si_b</KEYWORD3>
-			<KEYWORD3>air-cm</KEYWORD3>
-			<KEYWORD3>air-cm_b</KEYWORD3>
-			<KEYWORD3>air-mm</KEYWORD3>
-			<KEYWORD3>air-mm_b</KEYWORD3>
-			<KEYWORD3>air-ft</KEYWORD3>
-			<KEYWORD3>air-ft_b</KEYWORD3>
-			<KEYWORD3>air-in</KEYWORD3>
-			<KEYWORD3>air-in_b</KEYWORD3>
-			<KEYWORD3>cmix</KEYWORD3>
-			<KEYWORD3>user</KEYWORD3>
-
-			<!-- FLDATA8 command -->
-			<KEYWORD3>nomi</KEYWORD3>
-			<KEYWORD3>dens</KEYWORD3>
-			<KEYWORD3>visc</KEYWORD3>
-			<KEYWORD3>cond</KEYWORD3>
-			<KEYWORD3>spht</KEYWORD3>
-
-			<!-- FLDATA9 command -->
-			<KEYWORD3>cof1</KEYWORD3>
-			<KEYWORD3>dens</KEYWORD3>
-			<KEYWORD3>visc</KEYWORD3>
-			<KEYWORD3>cond</KEYWORD3>
-			<KEYWORD3>spht</KEYWORD3>
-
-			<!-- FLDATA10 command -->
-			<KEYWORD3>cof2</KEYWORD3>
-			<KEYWORD3>dens</KEYWORD3>
-			<KEYWORD3>visc</KEYWORD3>
-			<KEYWORD3>cond</KEYWORD3>
-			<KEYWORD3>spht</KEYWORD3>
-
-			<!-- FLDATA11 command -->
-			<KEYWORD3>cof3</KEYWORD3>
-			<KEYWORD3>dens</KEYWORD3>
-			<KEYWORD3>visc</KEYWORD3>
-			<KEYWORD3>cond</KEYWORD3>
-			<KEYWORD3>spht</KEYWORD3>
-
-			<!-- FLDATA12 command -->
-			<KEYWORD3>prop</KEYWORD3>
-			<KEYWORD3>ivis</KEYWORD3>
-			<KEYWORD3>ufrq</KEYWORD3>
-
-			<!-- FLDATA13 command -->
-			<KEYWORD3>vary</KEYWORD3>
-			<KEYWORD3>dens</KEYWORD3>
-			<KEYWORD3>visc</KEYWORD3>
-			<KEYWORD3>cond</KEYWORD3>
-			<KEYWORD3>spht</KEYWORD3>
-			<KEYWORD3>t</KEYWORD3>
-			<KEYWORD3>,f</KEYWORD3>
-
-			<!-- FLDATA14 command -->
-			<KEYWORD3>temp</KEYWORD3>
-			<KEYWORD3>nomi</KEYWORD3>
-			<KEYWORD3>bulk</KEYWORD3>
-			<KEYWORD3>ttot</KEYWORD3>
-
-			<!-- FLDATA15 command -->
-			<KEYWORD3>pres</KEYWORD3>
-			<KEYWORD3>refe</KEYWORD3>
-
-			<!-- FLDATA16 command -->
-			<KEYWORD3>bulk</KEYWORD3>
-			<KEYWORD3>beta</KEYWORD3>
-
-			<!-- FLDATA17 command -->
-			<KEYWORD3>gamm</KEYWORD3>
-			<KEYWORD3>comp</KEYWORD3>
-
-			<!-- FLDATA18 command -->
-			<KEYWORD3>meth</KEYWORD3>
-			<KEYWORD3>pres</KEYWORD3>
-			<KEYWORD3>temp</KEYWORD3>
-			<KEYWORD3>vx</KEYWORD3>
-			<KEYWORD3>vy</KEYWORD3>
-			<KEYWORD3>vz</KEYWORD3>
-			<KEYWORD3>enke</KEYWORD3>
-			<KEYWORD3>ends</KEYWORD3>
-
-			<!-- FLDATA19 command -->
-			<KEYWORD3>tdma</KEYWORD3>
-			<KEYWORD3>pres</KEYWORD3>
-			<KEYWORD3>temp</KEYWORD3>
-			<KEYWORD3>vx</KEYWORD3>
-			<KEYWORD3>vy</KEYWORD3>
-			<KEYWORD3>vz</KEYWORD3>
-			<KEYWORD3>enke</KEYWORD3>
-			<KEYWORD3>ends</KEYWORD3>
-
-			<!-- FLDATA20 command -->
-			<KEYWORD3>srch</KEYWORD3>
-			<KEYWORD3>pres</KEYWORD3>
-			<KEYWORD3>temp</KEYWORD3>
-			<KEYWORD3>vx</KEYWORD3>
-			<KEYWORD3>vy</KEYWORD3>
-			<KEYWORD3>vz</KEYWORD3>
-			<KEYWORD3>enke</KEYWORD3>
-			<KEYWORD3>ends</KEYWORD3>
-
-			<!-- FLDATA20A command -->
-			<KEYWORD3>pgmr</KEYWORD3>
-			<KEYWORD3>fill</KEYWORD3>
-			<KEYWORD3>modp</KEYWORD3>
-
-			<!-- FLDATA21 command -->
-			<KEYWORD3>conv</KEYWORD3>
-			<KEYWORD3>pres</KEYWORD3>
-			<KEYWORD3>temp</KEYWORD3>
-			<KEYWORD3>vx</KEYWORD3>
-			<KEYWORD3>vy</KEYWORD3>
-			<KEYWORD3>vz</KEYWORD3>
-			<KEYWORD3>enke</KEYWORD3>
-			<KEYWORD3>ends</KEYWORD3>
-
-			<!-- FLDATA22 command -->
-			<KEYWORD3>maxi</KEYWORD3>
-			<KEYWORD3>pres</KEYWORD3>
-			<KEYWORD3>temp</KEYWORD3>
-			<KEYWORD3>vx</KEYWORD3>
-			<KEYWORD3>vy</KEYWORD3>
-			<KEYWORD3>vz</KEYWORD3>
-			<KEYWORD3>enke</KEYWORD3>
-			<KEYWORD3>ends</KEYWORD3>
-
-			<!-- FLDATA23 command -->
-			<KEYWORD3>delt</KEYWORD3>
-			<KEYWORD3>pres</KEYWORD3>
-			<KEYWORD3>temp</KEYWORD3>
-			<KEYWORD3>vx</KEYWORD3>
-			<KEYWORD3>vy</KEYWORD3>
-			<KEYWORD3>vz</KEYWORD3>
-			<KEYWORD3>enke</KEYWORD3>
-			<KEYWORD3>ends</KEYWORD3>
-
-			<!-- FLDATA24 command -->
-			<KEYWORD3>turb</KEYWORD3>
-			<KEYWORD3>modl</KEYWORD3>
-			<KEYWORD3>rati</KEYWORD3>
-			<KEYWORD3>inin</KEYWORD3>
-			<KEYWORD3>insf</KEYWORD3>
-			<KEYWORD3>sctk</KEYWORD3>
-			<KEYWORD3>sctd</KEYWORD3>
-			<KEYWORD3>cmu</KEYWORD3>
-			<KEYWORD3>c1</KEYWORD3>
-			<KEYWORD3>c2</KEYWORD3>
-			<KEYWORD3>buc3</KEYWORD3>
-			<KEYWORD3>buc4</KEYWORD3>
-			<KEYWORD3>beta</KEYWORD3>
-			<KEYWORD3>kapp</KEYWORD3>
-			<KEYWORD3>ewll</KEYWORD3>
-			<KEYWORD3>wall</KEYWORD3>
-			<KEYWORD3>vand</KEYWORD3>
-			<KEYWORD3>tran</KEYWORD3>
-			<KEYWORD3>zels</KEYWORD3>
-
-			<!-- FLDATA24A command -->
-			<KEYWORD3>rngt</KEYWORD3>
-			<KEYWORD3>sctk</KEYWORD3>
-			<KEYWORD3>sctd</KEYWORD3>
-			<KEYWORD3>cmu</KEYWORD3>
-			<KEYWORD3>c1</KEYWORD3>
-			<KEYWORD3>c2</KEYWORD3>
-			<KEYWORD3>beta</KEYWORD3>
-			<KEYWORD3>etai</KEYWORD3>
-
-			<!-- FLDATA24B command -->
-			<KEYWORD3>nket</KEYWORD3>
-			<KEYWORD3>sctk</KEYWORD3>
-			<KEYWORD3>sctd</KEYWORD3>
-			<KEYWORD3>c2</KEYWORD3>
-			<KEYWORD3>c1mx</KEYWORD3>
-
-			<!-- FLDATA24C command -->
-			<KEYWORD3>girt</KEYWORD3>
-			<KEYWORD3>sctk</KEYWORD3>
-			<KEYWORD3>sctd</KEYWORD3>
-			<KEYWORD3>g0</KEYWORD3>
-			<KEYWORD3>g1</KEYWORD3>
-			<KEYWORD3>g2</KEYWORD3>
-			<KEYWORD3>g3</KEYWORD3>
-			<KEYWORD3>g4</KEYWORD3>
-
-			<!-- FLDATA24D command -->
-			<KEYWORD3>szlt</KEYWORD3>
-			<KEYWORD3>sctk</KEYWORD3>
-			<KEYWORD3>sctd</KEYWORD3>
-			<KEYWORD3>szl1</KEYWORD3>
-			<KEYWORD3>szl2</KEYWORD3>
-			<KEYWORD3>szl3</KEYWORD3>
-
-			<!-- FLDATA25 command -->
-			<KEYWORD3>relx</KEYWORD3>
-			<KEYWORD3>vx</KEYWORD3>
-			<KEYWORD3>vy</KEYWORD3>
-			<KEYWORD3>vz</KEYWORD3>
-			<KEYWORD3>pres</KEYWORD3>
-			<KEYWORD3>temp</KEYWORD3>
-			<KEYWORD3>enke</KEYWORD3>
-			<KEYWORD3>ends</KEYWORD3>
-			<KEYWORD3>evis</KEYWORD3>
-			<KEYWORD3>econ</KEYWORD3>
-			<KEYWORD3>dens</KEYWORD3>
-			<KEYWORD3>visc</KEYWORD3>
-			<KEYWORD3>cond</KEYWORD3>
-			<KEYWORD3>spht</KEYWORD3>
-
-			<!-- FLDATA26 command -->
-			<KEYWORD3>stab</KEYWORD3>
-			<KEYWORD3>turb</KEYWORD3>
-			<KEYWORD3>mome</KEYWORD3>
-			<KEYWORD3>pres</KEYWORD3>
-			<KEYWORD3>temp</KEYWORD3>
-			<KEYWORD3>visc</KEYWORD3>
-
-			<!-- FLDATA27 command -->
-			<KEYWORD3>prin</KEYWORD3>
-			<KEYWORD3>vx</KEYWORD3>
-			<KEYWORD3>vy</KEYWORD3>
-			<KEYWORD3>vz</KEYWORD3>
-			<KEYWORD3>pres</KEYWORD3>
-			<KEYWORD3>temp</KEYWORD3>
-			<KEYWORD3>enke</KEYWORD3>
-			<KEYWORD3>ends</KEYWORD3>
-			<KEYWORD3>dens</KEYWORD3>
-			<KEYWORD3>visc</KEYWORD3>
-			<KEYWORD3>cond</KEYWORD3>
-			<KEYWORD3>spht</KEYWORD3>
-			<KEYWORD3>evis</KEYWORD3>
-			<KEYWORD3>econ</KEYWORD3>
-
-			<!-- FLDATA28 command -->
-			<KEYWORD3>modr</KEYWORD3>
-			<KEYWORD3>vx</KEYWORD3>
-			<KEYWORD3>vy</KEYWORD3>
-			<KEYWORD3>vz</KEYWORD3>
-			<KEYWORD3>pres</KEYWORD3>
-			<KEYWORD3>temp</KEYWORD3>
-			<KEYWORD3>enke</KEYWORD3>
-			<KEYWORD3>ends</KEYWORD3>
-			<KEYWORD3>dens</KEYWORD3>
-			<KEYWORD3>visc</KEYWORD3>
-			<KEYWORD3>cond</KEYWORD3>
-			<KEYWORD3>spht</KEYWORD3>
-			<KEYWORD3>evis</KEYWORD3>
-			<KEYWORD3>econ</KEYWORD3>
-			<KEYWORD3>ttot</KEYWORD3>
-			<KEYWORD3>t</KEYWORD3>
-			<KEYWORD3>,f</KEYWORD3>
-
-			<!-- FLDATA29 command -->
-			<KEYWORD3>modv</KEYWORD3>
-			<KEYWORD3>vx</KEYWORD3>
-			<KEYWORD3>vy</KEYWORD3>
-			<KEYWORD3>vz</KEYWORD3>
-			<KEYWORD3>sp01</KEYWORD3>
-			<KEYWORD3>sp02</KEYWORD3>
-			<KEYWORD3>sp03</KEYWORD3>
-			<KEYWORD3>sp04</KEYWORD3>
-			<KEYWORD3>sp05</KEYWORD3>
-			<KEYWORD3>sp06</KEYWORD3>
-			<KEYWORD3>pres</KEYWORD3>
-			<KEYWORD3>temp</KEYWORD3>
-			<KEYWORD3>enke</KEYWORD3>
-			<KEYWORD3>ends</KEYWORD3>
-			<KEYWORD3>dens</KEYWORD3>
-			<KEYWORD3>visc</KEYWORD3>
-			<KEYWORD3>cond</KEYWORD3>
-			<KEYWORD3>spht</KEYWORD3>
-			<KEYWORD3>evis</KEYWORD3>
-			<KEYWORD3>econ</KEYWORD3>
-			<KEYWORD3>ttot</KEYWORD3>
-			<KEYWORD3>lmd</KEYWORD3>
-			<KEYWORD3>emd</KEYWORD3>
-
-			<!-- FLDATA30 command -->
-			<KEYWORD3>quad</KEYWORD3>
-			<KEYWORD3>momd</KEYWORD3>
-			<KEYWORD3>moms</KEYWORD3>
-			<KEYWORD3>prsd</KEYWORD3>
-			<KEYWORD3>prss</KEYWORD3>
-			<KEYWORD3>thrd</KEYWORD3>
-			<KEYWORD3>thrs</KEYWORD3>
-			<KEYWORD3>trbd</KEYWORD3>
-			<KEYWORD3>trbs</KEYWORD3>
-
-			<!-- FLDATA31 command -->
-			<KEYWORD3>capp</KEYWORD3>
-			<KEYWORD3>velo</KEYWORD3>
-			<KEYWORD3>temp</KEYWORD3>
-			<KEYWORD3>pres</KEYWORD3>
-			<KEYWORD3>umin</KEYWORD3>
-			<KEYWORD3>umax</KEYWORD3>
-			<KEYWORD3>vmin</KEYWORD3>
-			<KEYWORD3>vmax</KEYWORD3>
-			<KEYWORD3>wmin</KEYWORD3>
-			<KEYWORD3>wmax</KEYWORD3>
-			<KEYWORD3>tmin</KEYWORD3>
-			<KEYWORD3>tmax</KEYWORD3>
-			<KEYWORD3>pmin</KEYWORD3>
-			<KEYWORD3>pmax</KEYWORD3>
-
-			<!-- FLDATA32 command -->
-			<KEYWORD3>rest</KEYWORD3>
-			<KEYWORD3>nset</KEYWORD3>
-			<KEYWORD3>iter</KEYWORD3>
-			<KEYWORD3>lstp</KEYWORD3>
-			<KEYWORD3>time</KEYWORD3>
-			<KEYWORD3>rfil</KEYWORD3>
-			<KEYWORD3>wfil</KEYWORD3>
-			<KEYWORD3>over</KEYWORD3>
-			<KEYWORD3>clear</KEYWORD3>
-
-			<!-- FLDATA33 command -->
-			<KEYWORD3>advm</KEYWORD3>
-			<KEYWORD3>mome</KEYWORD3>
-			<KEYWORD3>turb</KEYWORD3>
-			<KEYWORD3>pres</KEYWORD3>
-			<KEYWORD3>temp</KEYWORD3>
-			<KEYWORD3>msu</KEYWORD3>
-			<KEYWORD3>supg</KEYWORD3>
-
-			<!-- FLIST command -->
-			<KEYWORD3>all</KEYWORD3>
-			<KEYWORD3>p</KEYWORD3>
-
-			<!-- FLLIST command -->
-			<KEYWORD3>all</KEYWORD3>
-
-			<!-- FLST command -->
-			<KEYWORD3>noor</KEYWORD3>
-			<KEYWORD3>order</KEYWORD3>
-
-			<!-- /FOCUS command -->
-			<KEYWORD3>all</KEYWORD3>
-			<KEYWORD3>auto</KEYWORD3>
-			<KEYWORD3>user</KEYWORD3>
-
-			<!-- FORCE command -->
-			<KEYWORD3>total</KEYWORD3>
-			<KEYWORD3>static</KEYWORD3>
-			<KEYWORD3>damp</KEYWORD3>
-			<KEYWORD3>inert</KEYWORD3>
-
-			<!-- FORM command -->
-			<KEYWORD3>reco</KEYWORD3>
-			<KEYWORD3>ten</KEYWORD3>
-			<KEYWORD3>long</KEYWORD3>
-
-			<!-- /FORMAT command -->
-			<KEYWORD3>g</KEYWORD3>
-			<KEYWORD3>,f</KEYWORD3>
-			<KEYWORD3>e</KEYWORD3>
-
-			<!-- FP command -->
-			<KEYWORD3>all</KEYWORD3>
-
-			<!-- FSLIST command -->
-			<KEYWORD3>all</KEYWORD3>
-
-			<!-- FSUM command -->
-			<KEYWORD3>rsys</KEYWORD3>
-
-			<!-- /FTYPE command -->
-			<KEYWORD3>emat</KEYWORD3>
-			<KEYWORD3>esav</KEYWORD3>
-			<KEYWORD3>full</KEYWORD3>
-			<KEYWORD3>redm</KEYWORD3>
-			<KEYWORD3>sub</KEYWORD3>
-			<KEYWORD3>mode</KEYWORD3>
-			<KEYWORD3>tri</KEYWORD3>
-			<KEYWORD3>dsub</KEYWORD3>
-			<KEYWORD3>usub</KEYWORD3>
-			<KEYWORD3>erot</KEYWORD3>
-			<KEYWORD3>osav</KEYWORD3>
-			<KEYWORD3>seld</KEYWORD3>
-			<KEYWORD3>all</KEYWORD3>
-			<KEYWORD3>ext</KEYWORD3>
-			<KEYWORD3>int</KEYWORD3>
-
-			<!-- GAPLIST command -->
-			<KEYWORD3>open</KEYWORD3>
-			<KEYWORD3>closed</KEYWORD3>
-
-			<!-- GAPMERGE command -->
-			<KEYWORD3>toler</KEYWORD3>
-			<KEYWORD3>iter</KEYWORD3>
-
-			<!-- GAPOPT command -->
-			<KEYWORD3>toler</KEYWORD3>
-			<KEYWORD3>oesele</KEYWORD3>
-			<KEYWORD3>merge</KEYWORD3>
-			<KEYWORD3>remain</KEYWORD3>
-
-			<!-- GAPPLOT command -->
-			<KEYWORD3>open</KEYWORD3>
-			<KEYWORD3>closed</KEYWORD3>
-			<KEYWORD3>all</KEYWORD3>
-
-			<!-- GAUGE command -->
-			<KEYWORD3>tree</KEYWORD3>
-			<KEYWORD3>off</KEYWORD3>
-
-			<!-- GCGEN command -->
-			<KEYWORD3>tri</KEYWORD3>
-			<KEYWORD3>bot</KEYWORD3>
-
-			<!-- /GCMD command -->
-			<KEYWORD3>all</KEYWORD3>
-
-			<!-- *GET command -->
-			<KEYWORD3>active</KEYWORD3>
-			<KEYWORD3>int</KEYWORD3>
-			<KEYWORD3>imme</KEYWORD3>
-			<KEYWORD3>menu</KEYWORD3>
-			<KEYWORD3>prkey</KEYWORD3>
-			<KEYWORD3>units</KEYWORD3>
-			<KEYWORD3>rout</KEYWORD3>
-			<KEYWORD3>time</KEYWORD3>
-			<KEYWORD3>wall</KEYWORD3>
-			<KEYWORD3>cpu</KEYWORD3>
-			<KEYWORD3>dbase</KEYWORD3>
-			<KEYWORD3>ldate</KEYWORD3>
-			<KEYWORD3>dbase</KEYWORD3>
-			<KEYWORD3>ltime</KEYWORD3>
-			<KEYWORD3>rev</KEYWORD3>
-			<KEYWORD3>title</KEYWORD3>
-			<KEYWORD3>jobnam</KEYWORD3>
-
-			<KEYWORD3>parm</KEYWORD3>
-			<KEYWORD3>max</KEYWORD3>
-			<KEYWORD3>basic</KEYWORD3>
-			<KEYWORD3>loc</KEYWORD3>
-			<KEYWORD3>,type</KEYWORD3>
-			<KEYWORD3>dim</KEYWORD3>
-			<KEYWORD3>x</KEYWORD3>
-			<KEYWORD3>y</KEYWORD3>
-			<KEYWORD3>z</KEYWORD3>
-
-			<KEYWORD3>cmd</KEYWORD3>
-			<KEYWORD3>stat</KEYWORD3>
-			<KEYWORD3>nargs</KEYWORD3>
-			<KEYWORD3>field</KEYWORD3>
-
-			<KEYWORD3>comp</KEYWORD3>
-			<KEYWORD3>ncomp</KEYWORD3>
-			<KEYWORD3>name</KEYWORD3>
-			<KEYWORD3>,type</KEYWORD3>
-			<KEYWORD3>nscomp</KEYWORD3>
-			<KEYWORD3>sname</KEYWORD3>
-
-			<KEYWORD3>graph</KEYWORD3>
-			<KEYWORD3>active</KEYWORD3>
-			<KEYWORD3>angle</KEYWORD3>
-			<KEYWORD3>contour</KEYWORD3>
-			<KEYWORD3>dist</KEYWORD3>
-			<KEYWORD3>dscale</KEYWORD3>
-			<KEYWORD3>dmult</KEYWORD3>
-			<KEYWORD3>edge</KEYWORD3>
-			<KEYWORD3>focus</KEYWORD3>
-			<KEYWORD3>gline</KEYWORD3>
-			<KEYWORD3>mode</KEYWORD3>
-			<KEYWORD3>normal</KEYWORD3>
-			<KEYWORD3>range</KEYWORD3>
-			<KEYWORD3>xmin</KEYWORD3>
-			<KEYWORD3>ymin</KEYWORD3>
-			<KEYWORD3>xmax</KEYWORD3>
-			<KEYWORD3>ymax</KEYWORD3>
-			<KEYWORD3>ratio</KEYWORD3>
-			<KEYWORD3>sscale</KEYWORD3>
-			<KEYWORD3>smult</KEYWORD3>
-			<KEYWORD3>,type</KEYWORD3>
-			<KEYWORD3>vcone</KEYWORD3>
-			<KEYWORD3>view</KEYWORD3>
-			<KEYWORD3>vscale</KEYWORD3>
-			<KEYWORD3>vratio</KEYWORD3>
-			<KEYWORD3>display</KEYWORD3>
-			<KEYWORD3>erase</KEYWORD3>
-			<KEYWORD3>ndist</KEYWORD3>
-			<KEYWORD3>number</KEYWORD3>
-			<KEYWORD3>plopts</KEYWORD3>
-			<KEYWORD3>seg</KEYWORD3>
-			<KEYWORD3>shrink</KEYWORD3>
-
-			<KEYWORD3>active</KEYWORD3>
-			<KEYWORD3>,csys</KEYWORD3>
-			<KEYWORD3>,dsys</KEYWORD3>
-			<KEYWORD3>,mat</KEYWORD3>
-			<KEYWORD3>,type</KEYWORD3>
-			<KEYWORD3>,real</KEYWORD3>
-			<KEYWORD3>,esys</KEYWORD3>
-			<KEYWORD3>,cp</KEYWORD3>
-			<KEYWORD3>,ce</KEYWORD3>
-			<KEYWORD3>wfront</KEYWORD3>
-			<KEYWORD3>max</KEYWORD3>
-			<KEYWORD3>rms</KEYWORD3>
-
-			<KEYWORD3>cdsy</KEYWORD3>
-			<KEYWORD3>loc</KEYWORD3>
-			<KEYWORD3>ang</KEYWORD3>
-			<KEYWORD3>xy</KEYWORD3>
-			<KEYWORD3>yz</KEYWORD3>
-			<KEYWORD3>zx</KEYWORD3>
-			<KEYWORD3>attr</KEYWORD3>
-
-			<KEYWORD3>node</KEYWORD3>
-			<KEYWORD3>loc</KEYWORD3>
-			<KEYWORD3>,nsel</KEYWORD3>
-			<KEYWORD3>nxth</KEYWORD3>
-			<KEYWORD3>nxtl</KEYWORD3>
-			<KEYWORD3>,f</KEYWORD3>
-			<KEYWORD3>fx</KEYWORD3>
-			<KEYWORD3>mx</KEYWORD3>
-			<KEYWORD3>csgx</KEYWORD3>
-			<KEYWORD3>,d</KEYWORD3>
-			<KEYWORD3>ux</KEYWORD3>
-			<KEYWORD3>rotx</KEYWORD3>
-			<KEYWORD3>vx</KEYWORD3>
-			<KEYWORD3>ax</KEYWORD3>
-			<KEYWORD3>hgen</KEYWORD3>
-			<KEYWORD3>num</KEYWORD3>
-			<KEYWORD3>max</KEYWORD3>
-			<KEYWORD3>min</KEYWORD3>
-			<KEYWORD3>count</KEYWORD3>
-			<KEYWORD3>mxloc</KEYWORD3>
-			<KEYWORD3>mnloc</KEYWORD3>
-
-			<KEYWORD3>elem</KEYWORD3>
-			<KEYWORD3>cent</KEYWORD3>
-			<KEYWORD3>adj</KEYWORD3>
-			<KEYWORD3>attr</KEYWORD3>
-			<KEYWORD3>leng</KEYWORD3>
-			<KEYWORD3>lproj</KEYWORD3>
-			<KEYWORD3>area</KEYWORD3>
-			<KEYWORD3>aproj</KEYWORD3>
-			<KEYWORD3>volu</KEYWORD3>
-			<KEYWORD3>,esel</KEYWORD3>
-			<KEYWORD3>nxth</KEYWORD3>
-			<KEYWORD3>nxtl</KEYWORD3>
-			<KEYWORD3>hgen</KEYWORD3>
-			<KEYWORD3>hcoe</KEYWORD3>
-			<KEYWORD3>tbulk</KEYWORD3>
-			<KEYWORD3>pres</KEYWORD3>
-			<KEYWORD3>shpar</KEYWORD3>
-			<KEYWORD3>angd</KEYWORD3>
-			<KEYWORD3>aspe</KEYWORD3>
-			<KEYWORD3>jacr</KEYWORD3>
-			<KEYWORD3>maxa</KEYWORD3>
-			<KEYWORD3>para</KEYWORD3>
-			<KEYWORD3>warp</KEYWORD3>
-			<KEYWORD3>num</KEYWORD3>
-			<KEYWORD3>,ksel</KEYWORD3>
-			<KEYWORD3>nxth</KEYWORD3>
-			<KEYWORD3>nxtl</KEYWORD3>
-			<KEYWORD3>div</KEYWORD3>
-
-			<KEYWORD3>kp</KEYWORD3>
-			<KEYWORD3>ior</KEYWORD3>
-			<KEYWORD3>imc</KEYWORD3>
-			<KEYWORD3>irp</KEYWORD3>
-			<KEYWORD3>ixv</KEYWORD3>
-			<KEYWORD3>iyv</KEYWORD3>
-			<KEYWORD3>izv</KEYWORD3>
-			<KEYWORD3>nrelm</KEYWORD3>
-
-			<KEYWORD3>line</KEYWORD3>
-			<KEYWORD3>,lsel</KEYWORD3>
-
-			<KEYWORD3>area</KEYWORD3>
-			<KEYWORD3>,asel</KEYWORD3>
-			<KEYWORD3>loop</KEYWORD3>
-
-			<KEYWORD3>volu</KEYWORD3>
-			<KEYWORD3>,vsel</KEYWORD3>
-			<KEYWORD3>shell</KEYWORD3>
-
-			<KEYWORD3>etyp</KEYWORD3>
-
-			<KEYWORD3>rcon</KEYWORD3>
-
-			<KEYWORD3>ex</KEYWORD3>
-			<KEYWORD3>alpx</KEYWORD3>
-			<KEYWORD3>reft</KEYWORD3>
-			<KEYWORD3>prxy</KEYWORD3>
-			<KEYWORD3>nuxy</KEYWORD3>
-			<KEYWORD3>gxy</KEYWORD3>
-			<KEYWORD3>damp</KEYWORD3>
-			<KEYWORD3>mu</KEYWORD3>
-			<KEYWORD3>dnes</KEYWORD3>
-			<KEYWORD3>c</KEYWORD3>
-			<KEYWORD3>enth</KEYWORD3>
-			<KEYWORD3>kxx</KEYWORD3>
-			<KEYWORD3>hf</KEYWORD3>
-			<KEYWORD3>emis</KEYWORD3>
-			<KEYWORD3>qrate</KEYWORD3>
-			<KEYWORD3>visc</KEYWORD3>
-			<KEYWORD3>sonc</KEYWORD3>
-			<KEYWORD3>rsvx</KEYWORD3>
-			<KEYWORD3>perx</KEYWORD3>
-			<KEYWORD3>murx</KEYWORD3>
-			<KEYWORD3>mgxx</KEYWORD3>
-			<KEYWORD3>lsst</KEYWORD3>
-			<KEYWORD3>temp</KEYWORD3>
-
-			<KEYWORD3>fldata</KEYWORD3>
-			<KEYWORD3>flow</KEYWORD3>
-			<KEYWORD3>turb</KEYWORD3>
-			<KEYWORD3>temp</KEYWORD3>
-			<KEYWORD3>comp</KEYWORD3>
-			<KEYWORD3>swrl</KEYWORD3>
-			<KEYWORD3>tran</KEYWORD3>
-			<KEYWORD3>spec</KEYWORD3>
-			<KEYWORD3>exec</KEYWORD3>
-			<KEYWORD3>appe</KEYWORD3>
-			<KEYWORD3>over</KEYWORD3>
-			<KEYWORD3>pres</KEYWORD3>
-			<KEYWORD3>temp</KEYWORD3>
-			<KEYWORD3>vx</KEYWORD3>
-			<KEYWORD3>vy</KEYWORD3>
-			<KEYWORD3>vz</KEYWORD3>
-			<KEYWORD3>enke</KEYWORD3>
-			<KEYWORD3>ends</KEYWORD3>
-			<KEYWORD3>step</KEYWORD3>
-			<KEYWORD3>istep</KEYWORD3>
-			<KEYWORD3>bc</KEYWORD3>
-			<KEYWORD3>numb</KEYWORD3>
-			<KEYWORD3>glob</KEYWORD3>
-			<KEYWORD3>tend</KEYWORD3>
-			<KEYWORD3>appe</KEYWORD3>
-			<KEYWORD3>sumf</KEYWORD3>
-			<KEYWORD3>over</KEYWORD3>
-			<KEYWORD3>sumf</KEYWORD3>
-			<KEYWORD3>debg</KEYWORD3>
-			<KEYWORD3>resi</KEYWORD3>
-			<KEYWORD3>dens</KEYWORD3>
-			<KEYWORD3>visc</KEYWORD3>
-			<KEYWORD3>cond</KEYWORD3>
-			<KEYWORD3>evis</KEYWORD3>
-			<KEYWORD3>econ</KEYWORD3>
-			<KEYWORD3>ttot</KEYWORD3>
-			<KEYWORD3>hflu</KEYWORD3>
-			<KEYWORD3>hflm</KEYWORD3>
-			<KEYWORD3>spht</KEYWORD3>
-			<KEYWORD3>strm</KEYWORD3>
-			<KEYWORD3>mach</KEYWORD3>
-			<KEYWORD3>ptot</KEYWORD3>
-			<KEYWORD3>pcoe</KEYWORD3>
-			<KEYWORD3>yplu</KEYWORD3>
-			<KEYWORD3>tauw</KEYWORD3>
-			<KEYWORD3>lmd</KEYWORD3>
-			<KEYWORD3>emd</KEYWORD3>
-			<KEYWORD3>outp</KEYWORD3>
-			<KEYWORD3>iter</KEYWORD3>
-			<KEYWORD3>dens</KEYWORD3>
-			<KEYWORD3>visc</KEYWORD3>
-			<KEYWORD3>cond</KEYWORD3>
-			<KEYWORD3>ivis</KEYWORD3>
-			<KEYWORD3>ufrq</KEYWORD3>
-			<KEYWORD3>nomi</KEYWORD3>
-			<KEYWORD3>bulk</KEYWORD3>
-			<KEYWORD3>ttot</KEYWORD3>
-			<KEYWORD3>refe</KEYWORD3>
-			<KEYWORD3>beta</KEYWORD3>
-			<KEYWORD3>comp</KEYWORD3>
-			<KEYWORD3>fill</KEYWORD3>
-			<KEYWORD3>modp</KEYWORD3>
-			<KEYWORD3>modl</KEYWORD3>
-			<KEYWORD3>rati</KEYWORD3>
-			<KEYWORD3>inin</KEYWORD3>
-			<KEYWORD3>insf</KEYWORD3>
-			<KEYWORD3>sctk</KEYWORD3>
-			<KEYWORD3>sctd</KEYWORD3>
-			<KEYWORD3>cmu</KEYWORD3>
-			<KEYWORD3>c1</KEYWORD3>
-			<KEYWORD3>c2</KEYWORD3>
-			<KEYWORD3>buc3</KEYWORD3>
-			<KEYWORD3>buc4</KEYWORD3>
-			<KEYWORD3>beta</KEYWORD3>
-			<KEYWORD3>kapp</KEYWORD3>
-			<KEYWORD3>ewll</KEYWORD3>
-			<KEYWORD3>wall</KEYWORD3>
-			<KEYWORD3>vand</KEYWORD3>
-			<KEYWORD3>tran</KEYWORD3>
-			<KEYWORD3>zels</KEYWORD3>
-			<KEYWORD3>sctk</KEYWORD3>
-			<KEYWORD3>sctd</KEYWORD3>
-			<KEYWORD3>cmu</KEYWORD3>
-			<KEYWORD3>c1</KEYWORD3>
-			<KEYWORD3>c2</KEYWORD3>
-			<KEYWORD3>etai</KEYWORD3>
-			<KEYWORD3>c1mx</KEYWORD3>
-			<KEYWORD3>g0</KEYWORD3>
-			<KEYWORD3>g1</KEYWORD3>
-			<KEYWORD3>g2</KEYWORD3>
-			<KEYWORD3>g3</KEYWORD3>
-			<KEYWORD3>g4</KEYWORD3>
-			<KEYWORD3>szl1</KEYWORD3>
-			<KEYWORD3>szl2</KEYWORD3>
-			<KEYWORD3>szl3</KEYWORD3>
-			<KEYWORD3>evis</KEYWORD3>
-			<KEYWORD3>econ</KEYWORD3>
-			<KEYWORD3>mome</KEYWORD3>
-			<KEYWORD3>sp01</KEYWORD3>
-			<KEYWORD3>sp02</KEYWORD3>
-			<KEYWORD3>sp03</KEYWORD3>
-			<KEYWORD3>sp04</KEYWORD3>
-			<KEYWORD3>sp05</KEYWORD3>
-			<KEYWORD3>sp06</KEYWORD3>
-			<KEYWORD3>momd</KEYWORD3>
-			<KEYWORD3>moms</KEYWORD3>
-			<KEYWORD3>prsd</KEYWORD3>
-			<KEYWORD3>prss</KEYWORD3>
-			<KEYWORD3>thrd</KEYWORD3>
-			<KEYWORD3>thrs</KEYWORD3>
-			<KEYWORD3>trbd</KEYWORD3>
-			<KEYWORD3>trbs</KEYWORD3>
-			<KEYWORD3>velo</KEYWORD3>
-			<KEYWORD3>umin</KEYWORD3>
-			<KEYWORD3>umax</KEYWORD3>
-			<KEYWORD3>vmin</KEYWORD3>
-			<KEYWORD3>vmax</KEYWORD3>
-			<KEYWORD3>wmin</KEYWORD3>
-			<KEYWORD3>wmax</KEYWORD3>
-			<KEYWORD3>tmin</KEYWORD3>
-			<KEYWORD3>tmax</KEYWORD3>
-			<KEYWORD3>pmin</KEYWORD3>
-			<KEYWORD3>pmax</KEYWORD3>
-			<KEYWORD3>nset</KEYWORD3>
-			<KEYWORD3>iter</KEYWORD3>
-			<KEYWORD3>lstp</KEYWORD3>
-			<KEYWORD3>time</KEYWORD3>
-			<KEYWORD3>rfil</KEYWORD3>
-			<KEYWORD3>wfil</KEYWORD3>
-			<KEYWORD3>over</KEYWORD3>
-			<KEYWORD3>clear</KEYWORD3>
-
-			<KEYWORD3>msdata</KEYWORD3>
-			<KEYWORD3>spec</KEYWORD3>
-			<KEYWORD3>ugas</KEYWORD3>
-
-			<KEYWORD3>msprop</KEYWORD3>
-			<KEYWORD3>cond</KEYWORD3>
-			<KEYWORD3>mdif</KEYWORD3>
-			<KEYWORD3>spht</KEYWORD3>
-			<KEYWORD3>nomi</KEYWORD3>
-			<KEYWORD3>cof1</KEYWORD3>
-			<KEYWORD3>cof2</KEYWORD3>
-			<KEYWORD3>cof3</KEYWORD3>
-
-			<KEYWORD3>msspec</KEYWORD3>
-			<KEYWORD3>name</KEYWORD3>
-			<KEYWORD3>molw</KEYWORD3>
-			<KEYWORD3>schm</KEYWORD3>
-
-			<KEYWORD3>msrelax</KEYWORD3>
-			<KEYWORD3>conc</KEYWORD3>
-			<KEYWORD3>emdi</KEYWORD3>
-			<KEYWORD3>stab</KEYWORD3>
-
-			<KEYWORD3>mssolu</KEYWORD3>
-			<KEYWORD3>nswe</KEYWORD3>
-			<KEYWORD3>maxi</KEYWORD3>
-			<KEYWORD3>nsrc</KEYWORD3>
-			<KEYWORD3>conv</KEYWORD3>
-			<KEYWORD3>delt</KEYWORD3>
-
-			<KEYWORD3>msmeth</KEYWORD3>
-
-			<KEYWORD3>mscap</KEYWORD3>
-			<KEYWORD3>key</KEYWORD3>
-			<KEYWORD3>upp</KEYWORD3>
-			<KEYWORD3>low</KEYWORD3>
-
-			<KEYWORD3>msvary</KEYWORD3>
-
-			<KEYWORD3>msnomf</KEYWORD3>
-
-			<KEYWORD3>active</KEYWORD3>
-			<KEYWORD3>anty</KEYWORD3>
-			<KEYWORD3>solu</KEYWORD3>
-			<KEYWORD3>dtime</KEYWORD3>
-			<KEYWORD3>ncmls</KEYWORD3>
-			<KEYWORD3>ncmss</KEYWORD3>
-			<KEYWORD3>eqit</KEYWORD3>
-			<KEYWORD3>ncmit</KEYWORD3>
-			<KEYWORD3>cnvg</KEYWORD3>
-			<KEYWORD3>mxdvl</KEYWORD3>
-			<KEYWORD3>resfrq</KEYWORD3>
-			<KEYWORD3>reseig</KEYWORD3>
-			<KEYWORD3>dsprm</KEYWORD3>
-			<KEYWORD3>focv</KEYWORD3>
-			<KEYWORD3>mocv</KEYWORD3>
-			<KEYWORD3>hfcv</KEYWORD3>
-			<KEYWORD3>mfcv</KEYWORD3>
-			<KEYWORD3>cscv</KEYWORD3>
-			<KEYWORD3>cucv</KEYWORD3>
-			<KEYWORD3>ffcv</KEYWORD3>
-			<KEYWORD3>dicv</KEYWORD3>
-			<KEYWORD3>rocv</KEYWORD3>
-			<KEYWORD3>tecv</KEYWORD3>
-			<KEYWORD3>vmcv</KEYWORD3>
-			<KEYWORD3>smcv</KEYWORD3>
-			<KEYWORD3>vocv</KEYWORD3>
-			<KEYWORD3>prcv</KEYWORD3>
-			<KEYWORD3>vecv</KEYWORD3>
-			<KEYWORD3>nc48</KEYWORD3>
-			<KEYWORD3>nc49</KEYWORD3>
-			<KEYWORD3>crprat</KEYWORD3>
-			<KEYWORD3>psinc</KEYWORD3>
-
-			<KEYWORD3>elem</KEYWORD3>
-			<KEYWORD3>mtot</KEYWORD3>
-			<KEYWORD3>mc</KEYWORD3>
-			<KEYWORD3>ior</KEYWORD3>
-			<KEYWORD3>imc</KEYWORD3>
-			<KEYWORD3>fmc</KEYWORD3>
-			<KEYWORD3>mmor</KEYWORD3>
-			<KEYWORD3>mmmc</KEYWORD3>
-
-			<KEYWORD3>mode</KEYWORD3>
-			<KEYWORD3>freq</KEYWORD3>
-			<KEYWORD3>pfact</KEYWORD3>
-			<KEYWORD3>mcoef</KEYWORD3>
-			<KEYWORD3>damp</KEYWORD3>
-
-			<KEYWORD3>active</KEYWORD3>
-			<KEYWORD3>,set</KEYWORD3>
-			<KEYWORD3>lstp</KEYWORD3>
-			<KEYWORD3>sbst</KEYWORD3>
-			<KEYWORD3>time</KEYWORD3>
-			<KEYWORD3>rsys</KEYWORD3>
-
-			<KEYWORD3>node</KEYWORD3>
-			<KEYWORD3>u</KEYWORD3>
-			<KEYWORD3>sum</KEYWORD3>
-			<KEYWORD3>rot</KEYWORD3>
-			<KEYWORD3>ntemp</KEYWORD3>
-			<KEYWORD3>volt</KEYWORD3>
-			<KEYWORD3>mag</KEYWORD3>
-			<KEYWORD3>v</KEYWORD3>
-			<KEYWORD3>,a</KEYWORD3>
-			<KEYWORD3>curr</KEYWORD3>
-			<KEYWORD3>emf</KEYWORD3>
-			<KEYWORD3>rf</KEYWORD3>
-			<KEYWORD3>fx</KEYWORD3>
-			<KEYWORD3>fy</KEYWORD3>
-			<KEYWORD3>fz</KEYWORD3>
-			<KEYWORD3>mx</KEYWORD3>
-			<KEYWORD3>my</KEYWORD3>
-			<KEYWORD3>mz</KEYWORD3>
-			<KEYWORD3>s</KEYWORD3>
-			<KEYWORD3>int</KEYWORD3>
-			<KEYWORD3>eqv</KEYWORD3>
-			<KEYWORD3>epto</KEYWORD3>
-			<KEYWORD3>epel</KEYWORD3>
-			<KEYWORD3>eppl</KEYWORD3>
-			<KEYWORD3>epcr</KEYWORD3>
-			<KEYWORD3>epth</KEYWORD3>
-			<KEYWORD3>epsw</KEYWORD3>
-			<KEYWORD3>nl</KEYWORD3>
-			<KEYWORD3>sepl</KEYWORD3>
-			<KEYWORD3>srat</KEYWORD3>
-			<KEYWORD3>hpres</KEYWORD3>
-			<KEYWORD3>epeq</KEYWORD3>
-			<KEYWORD3>psv</KEYWORD3>
-			<KEYWORD3>plwk</KEYWORD3>
-			<KEYWORD3>tg</KEYWORD3>
-			<KEYWORD3>tf</KEYWORD3>
-			<KEYWORD3>pg</KEYWORD3>
-			<KEYWORD3>ef</KEYWORD3>
-			<KEYWORD3>,d</KEYWORD3>
-			<KEYWORD3>h</KEYWORD3>
-			<KEYWORD3>b</KEYWORD3>
-			<KEYWORD3>fmag</KEYWORD3>
-			<KEYWORD3>hs</KEYWORD3>
-			<KEYWORD3>bfe</KEYWORD3>
-			<KEYWORD3>ttot</KEYWORD3>
-			<KEYWORD3>hflu</KEYWORD3>
-			<KEYWORD3>hflm</KEYWORD3>
-			<KEYWORD3>conc</KEYWORD3>
-			<KEYWORD3>pcoe</KEYWORD3>
-			<KEYWORD3>ptot</KEYWORD3>
-			<KEYWORD3>mach</KEYWORD3>
-			<KEYWORD3>strm</KEYWORD3>
-			<KEYWORD3>evis</KEYWORD3>
-			<KEYWORD3>cmuv</KEYWORD3>
-			<KEYWORD3>econ</KEYWORD3>
-			<KEYWORD3>yplu</KEYWORD3>
-			<KEYWORD3>tauw</KEYWORD3>
-
-			<KEYWORD3>elem</KEYWORD3>
-			<KEYWORD3>serr</KEYWORD3>
-			<KEYWORD3>sdsg</KEYWORD3>
-			<KEYWORD3>terr</KEYWORD3>
-			<KEYWORD3>tdsg</KEYWORD3>
-			<KEYWORD3>sene</KEYWORD3>
-			<KEYWORD3>tene</KEYWORD3>
-			<KEYWORD3>kene</KEYWORD3>
-			<KEYWORD3>jheat</KEYWORD3>
-			<KEYWORD3>js</KEYWORD3>
-			<KEYWORD3>volu</KEYWORD3>
-			<KEYWORD3>etab</KEYWORD3>
-			<KEYWORD3>smisc</KEYWORD3>
-			<KEYWORD3>nmisc</KEYWORD3>
-
-			<KEYWORD3>etab</KEYWORD3>
-			<KEYWORD3>ncol</KEYWORD3>
-			<KEYWORD3>nleng</KEYWORD3>
-
-			<KEYWORD3>sort</KEYWORD3>
-			<KEYWORD3>max</KEYWORD3>
-			<KEYWORD3>min</KEYWORD3>
-			<KEYWORD3>imax</KEYWORD3>
-			<KEYWORD3>imin</KEYWORD3>
-
-			<KEYWORD3>ssum</KEYWORD3>
-			<KEYWORD3>item</KEYWORD3>
-
-			<KEYWORD3>fsum</KEYWORD3>
-
-			<KEYWORD3>path</KEYWORD3>
-			<KEYWORD3>last</KEYWORD3>
-			<KEYWORD3>nval</KEYWORD3>
-
-			<KEYWORD3>kcalc</KEYWORD3>
-			<KEYWORD3>k</KEYWORD3>
-
-			<KEYWORD3>intsrf</KEYWORD3>
-
-			<KEYWORD3>plnsol</KEYWORD3>
-			<KEYWORD3>bmax</KEYWORD3>
-			<KEYWORD3>bmin</KEYWORD3>
-
-			<KEYWORD3>prerr</KEYWORD3>
-			<KEYWORD3>sepc</KEYWORD3>
-			<KEYWORD3>tepc</KEYWORD3>
-			<KEYWORD3>sersm</KEYWORD3>
-			<KEYWORD3>tersm</KEYWORD3>
-			<KEYWORD3>sensm</KEYWORD3>
-			<KEYWORD3>tensm</KEYWORD3>
-
-			<KEYWORD3>section</KEYWORD3>
-			<KEYWORD3>inside</KEYWORD3>
-			<KEYWORD3>sx</KEYWORD3>
-			<KEYWORD3>sy</KEYWORD3>
-			<KEYWORD3>sz</KEYWORD3>
-			<KEYWORD3>sxxy</KEYWORD3>
-			<KEYWORD3>syz</KEYWORD3>
-			<KEYWORD3>szx</KEYWORD3>
-			<KEYWORD3>center</KEYWORD3>
-			<KEYWORD3>outside</KEYWORD3>
-
-			<KEYWORD3>vari</KEYWORD3>
-			<KEYWORD3>extrem</KEYWORD3>
-			<KEYWORD3>vmax</KEYWORD3>
-			<KEYWORD3>tmax</KEYWORD3>
-			<KEYWORD3>vmin</KEYWORD3>
-			<KEYWORD3>tmin</KEYWORD3>
-			<KEYWORD3>vlast</KEYWORD3>
-			<KEYWORD3>tlast</KEYWORD3>
-			<KEYWORD3>cvar</KEYWORD3>
-			<KEYWORD3>rtime</KEYWORD3>
-			<KEYWORD3>itime</KEYWORD3>
-			<KEYWORD3>t</KEYWORD3>
-			<KEYWORD3>rset</KEYWORD3>
-			<KEYWORD3>iset</KEYWORD3>
-			<KEYWORD3>nsets</KEYWORD3>
-
-			<KEYWORD3>opt</KEYWORD3>
-			<KEYWORD3>total</KEYWORD3>
-			<KEYWORD3>feas</KEYWORD3>
-			<KEYWORD3>term</KEYWORD3>
-			<KEYWORD3>best</KEYWORD3>
-
-			<KEYWORD3>topo</KEYWORD3>
-			<KEYWORD3>act</KEYWORD3>
-			<KEYWORD3>conv</KEYWORD3>
-			<KEYWORD3>comp</KEYWORD3>
-			<KEYWORD3>porv</KEYWORD3>
-			<KEYWORD3>loads</KEYWORD3>
-
-			<KEYWORD3>runst</KEYWORD3>
-			<KEYWORD3>rspeed</KEYWORD3>
-			<KEYWORD3>mips</KEYWORD3>
-			<KEYWORD3>smflop</KEYWORD3>
-			<KEYWORD3>vmflop</KEYWORD3>
-			<KEYWORD3>rfilsz</KEYWORD3>
-			<KEYWORD3>emat</KEYWORD3>
-			<KEYWORD3>erot</KEYWORD3>
-			<KEYWORD3>esav</KEYWORD3>
-			<KEYWORD3>full</KEYWORD3>
-			<KEYWORD3>mode</KEYWORD3>
-			<KEYWORD3>rdsp</KEYWORD3>
-			<KEYWORD3>redm</KEYWORD3>
-			<KEYWORD3>rfrq</KEYWORD3>
-			<KEYWORD3>rgeom</KEYWORD3>
-			<KEYWORD3>rst</KEYWORD3>
-			<KEYWORD3>tri</KEYWORD3>
-			<KEYWORD3>rtimst</KEYWORD3>
-			<KEYWORD3>tfirst</KEYWORD3>
-			<KEYWORD3>titer</KEYWORD3>
-			<KEYWORD3>eqprep</KEYWORD3>
-			<KEYWORD3>,solve</KEYWORD3>
-			<KEYWORD3>bsub</KEYWORD3>
-			<KEYWORD3>eigen</KEYWORD3>
-			<KEYWORD3>elform</KEYWORD3>
-			<KEYWORD3>elstrs</KEYWORD3>
-			<KEYWORD3>nelm</KEYWORD3>
-			<KEYWORD3>rmemry</KEYWORD3>
-			<KEYWORD3>wsreq</KEYWORD3>
-			<KEYWORD3>wsavail</KEYWORD3>
-			<KEYWORD3>dbpsize</KEYWORD3>
-			<KEYWORD3>dbpdisk</KEYWORD3>
-			<KEYWORD3>dbpmem</KEYWORD3>
-			<KEYWORD3>dbsize</KEYWORD3>
-			<KEYWORD3>dbmem</KEYWORD3>
-			<KEYWORD3>scrsize</KEYWORD3>
-			<KEYWORD3>scravail</KEYWORD3>
-			<KEYWORD3>iomem</KEYWORD3>
-			<KEYWORD3>iopsiz</KEYWORD3>
-			<KEYWORD3>iobuf</KEYWORD3>
-			<KEYWORD3>rwfrnt</KEYWORD3>
-			<KEYWORD3>rms</KEYWORD3>
-			<KEYWORD3>mean</KEYWORD3>
-
-			<KEYWORD3>,nsel</KEYWORD3>
-			<KEYWORD3>,esel</KEYWORD3>
-			<KEYWORD3>,ksel</KEYWORD3>
-			<KEYWORD3>,lsel</KEYWORD3>
-			<KEYWORD3>,asel</KEYWORD3>
-			<KEYWORD3>,vsel</KEYWORD3>
-			<KEYWORD3>ndnext</KEYWORD3>
-			<KEYWORD3>elnext</KEYWORD3>
-			<KEYWORD3>kpnext</KEYWORD3>
-			<KEYWORD3>lsnext</KEYWORD3>
-			<KEYWORD3>arnext</KEYWORD3>
-			<KEYWORD3>vlnext</KEYWORD3>
-			<KEYWORD3>centrx</KEYWORD3>
-			<KEYWORD3>centry</KEYWORD3>
-			<KEYWORD3>centrz</KEYWORD3>
-			<KEYWORD3>nx</KEYWORD3>
-			<KEYWORD3>ny</KEYWORD3>
-			<KEYWORD3>nz</KEYWORD3>
-			<KEYWORD3>kx</KEYWORD3>
-			<KEYWORD3>ky</KEYWORD3>
-			<KEYWORD3>kz</KEYWORD3>
-			<KEYWORD3>lx</KEYWORD3>
-			<KEYWORD3>ly</KEYWORD3>
-			<KEYWORD3>lz</KEYWORD3>
-			<KEYWORD3>lsx</KEYWORD3>
-			<KEYWORD3>lsy</KEYWORD3>
-			<KEYWORD3>lsz</KEYWORD3>
-			<KEYWORD3>node</KEYWORD3>
-			<KEYWORD3>kp</KEYWORD3>
-			<KEYWORD3>distnd</KEYWORD3>
-			<KEYWORD3>distkp</KEYWORD3>
-			<KEYWORD3>disten</KEYWORD3>
-			<KEYWORD3>anglen</KEYWORD3>
-			<KEYWORD3>anglek</KEYWORD3>
-			<KEYWORD3>nnear</KEYWORD3>
-			<KEYWORD3>knear</KEYWORD3>
-			<KEYWORD3>enearn</KEYWORD3>
-			<KEYWORD3>areand</KEYWORD3>
-			<KEYWORD3>areakp</KEYWORD3>
-			<KEYWORD3>arnode</KEYWORD3>
-			<KEYWORD3>normnx</KEYWORD3>
-			<KEYWORD3>normny</KEYWORD3>
-			<KEYWORD3>normnz</KEYWORD3>
-			<KEYWORD3>normkx</KEYWORD3>
-			<KEYWORD3>normky</KEYWORD3>
-			<KEYWORD3>normkz</KEYWORD3>
-			<KEYWORD3>enextn</KEYWORD3>
-			<KEYWORD3>nelem</KEYWORD3>
-			<KEYWORD3>eladj</KEYWORD3>
-			<KEYWORD3>ndface</KEYWORD3>
-			<KEYWORD3>nmface</KEYWORD3>
-			<KEYWORD3>arface</KEYWORD3>
-			<KEYWORD3>ux</KEYWORD3>
-			<KEYWORD3>uy</KEYWORD3>
-			<KEYWORD3>uz</KEYWORD3>
-			<KEYWORD3>rotx</KEYWORD3>
-			<KEYWORD3>roty</KEYWORD3>
-			<KEYWORD3>rotz</KEYWORD3>
-			<KEYWORD3>temp</KEYWORD3>
-			<KEYWORD3>pres</KEYWORD3>
-			<KEYWORD3>vx</KEYWORD3>
-			<KEYWORD3>vy</KEYWORD3>
-			<KEYWORD3>vz</KEYWORD3>
-			<KEYWORD3>enke</KEYWORD3>
-			<KEYWORD3>ends</KEYWORD3>
-			<KEYWORD3>volt</KEYWORD3>
-			<KEYWORD3>mag</KEYWORD3>
-			<KEYWORD3>ax</KEYWORD3>
-			<KEYWORD3>ay</KEYWORD3>
-			<KEYWORD3>az</KEYWORD3>
-
-			<!-- /GFORMAT command -->
-			<KEYWORD3>g</KEYWORD3>
-			<KEYWORD3>,f</KEYWORD3>
-			<KEYWORD3>e</KEYWORD3>
-
-			<!-- /GLINE command -->
-			<KEYWORD3>all</KEYWORD3>
-
-			<!-- *GO command -->
-			<KEYWORD3>stop</KEYWORD3>
-
-			<!-- GP command -->
-			<KEYWORD3>p</KEYWORD3>
-			<KEYWORD3>fx</KEYWORD3>
-			<KEYWORD3>fy</KEYWORD3>
-			<KEYWORD3>fz</KEYWORD3>
-			<KEYWORD3>mx</KEYWORD3>
-			<KEYWORD3>my</KEYWORD3>
-			<KEYWORD3>mz</KEYWORD3>
-
-			<!-- GPLIST command -->
-			<KEYWORD3>all</KEYWORD3>
-
-			<!-- /GRAPHICS command -->
-			<KEYWORD3>full</KEYWORD3>
-			<KEYWORD3>power</KEYWORD3>
-
-			<!-- /GROPT command -->
-			<KEYWORD3>axdv</KEYWORD3>
-			<KEYWORD3>axnm</KEYWORD3>
-			<KEYWORD3>axnsc</KEYWORD3>
-			<KEYWORD3>ascal</KEYWORD3>
-			<KEYWORD3>logx</KEYWORD3>
-			<KEYWORD3>logy</KEYWORD3>
-			<KEYWORD3>fill</KEYWORD3>
-			<KEYWORD3>cgrid</KEYWORD3>
-			<KEYWORD3>dig1</KEYWORD3>
-			<KEYWORD3>dig2</KEYWORD3>
-			<KEYWORD3>view</KEYWORD3>
-			<KEYWORD3>revx</KEYWORD3>
-			<KEYWORD3>revy</KEYWORD3>
-			<KEYWORD3>divx</KEYWORD3>
-			<KEYWORD3>divy</KEYWORD3>
-			<KEYWORD3>ltyp</KEYWORD3>
-			<KEYWORD3>off</KEYWORD3>
-			<KEYWORD3>on</KEYWORD3>
-			<KEYWORD3>front</KEYWORD3>
-
-			<!-- GRP command -->
-			<KEYWORD3>disp</KEYWORD3>
-			<KEYWORD3>velo</KEYWORD3>
-			<KEYWORD3>acel</KEYWORD3>
-
-			<!-- /GST command -->
-			<KEYWORD3>on</KEYWORD3>
-			<KEYWORD3>off</KEYWORD3>
-
-			<!-- /GTHK command -->
-			<KEYWORD3>axis</KEYWORD3>
-			<KEYWORD3>grid</KEYWORD3>
-			<KEYWORD3>curve</KEYWORD3>
-
-			<!-- /GTYPE command -->
-			<KEYWORD3>all</KEYWORD3>
-			<KEYWORD3>node</KEYWORD3>
-			<KEYWORD3>elem</KEYWORD3>
-			<KEYWORD3>keyp</KEYWORD3>
-			<KEYWORD3>line</KEYWORD3>
-			<KEYWORD3>area</KEYWORD3>
-			<KEYWORD3>volu</KEYWORD3>
-			<KEYWORD3>grph</KEYWORD3>
-
-			<!-- /HEADER command -->
-			<KEYWORD3>on</KEYWORD3>
-			<KEYWORD3>off</KEYWORD3>
-
-			<!-- HPGL command -->
-			<KEYWORD3>model</KEYWORD3>
-			<KEYWORD3>paper</KEYWORD3>
-			<KEYWORD3>color</KEYWORD3>
-			<KEYWORD3>direct</KEYWORD3>
-
-			<!-- HPTCREATE command -->
-			<KEYWORD3>line</KEYWORD3>
-			<KEYWORD3>area</KEYWORD3>
-			<KEYWORD3>coord</KEYWORD3>
-			<KEYWORD3>ratio</KEYWORD3>
-
-			<!-- HPTDELETE command -->
-			<KEYWORD3>all</KEYWORD3>
-			<KEYWORD3>p</KEYWORD3>
-
-			<!-- HREXP command -->
-			<KEYWORD3>all</KEYWORD3>
-
-			<!-- HROPT command -->
-			<KEYWORD3>full</KEYWORD3>
-			<KEYWORD3>reduc</KEYWORD3>
-			<KEYWORD3>msup</KEYWORD3>
-
-			<!-- HROUT command -->
-			<KEYWORD3>on</KEYWORD3>
-			<KEYWORD3>off</KEYWORD3>
-
-			<!-- IC command -->
-			<KEYWORD3>all</KEYWORD3>
-			<KEYWORD3>p</KEYWORD3>
-			<KEYWORD3>ux</KEYWORD3>
-			<KEYWORD3>uy</KEYWORD3>
-			<KEYWORD3>uz</KEYWORD3>
-			<KEYWORD3>rotx</KEYWORD3>
-			<KEYWORD3>roty</KEYWORD3>
-			<KEYWORD3>rotz</KEYWORD3>
-			<KEYWORD3>temp</KEYWORD3>
-			<KEYWORD3>pres</KEYWORD3>
-			<KEYWORD3>vx</KEYWORD3>
-			<KEYWORD3>vy</KEYWORD3>
-			<KEYWORD3>vz</KEYWORD3>
-			<KEYWORD3>enke</KEYWORD3>
-			<KEYWORD3>ends</KEYWORD3>
-			<KEYWORD3>sp01</KEYWORD3>
-			<KEYWORD3>so02</KEYWORD3>
-			<KEYWORD3>sp03</KEYWORD3>
-			<KEYWORD3>sp04</KEYWORD3>
-			<KEYWORD3>sp05</KEYWORD3>
-			<KEYWORD3>sp06</KEYWORD3>
-			<KEYWORD3>volt</KEYWORD3>
-			<KEYWORD3>mag</KEYWORD3>
-			<KEYWORD3>ax</KEYWORD3>
-			<KEYWORD3>ay</KEYWORD3>
-			<KEYWORD3>az</KEYWORD3>
-
-			<!-- ICLIST command -->
-			<KEYWORD3>all</KEYWORD3>
-			<KEYWORD3>p</KEYWORD3>
-			<KEYWORD3>disp</KEYWORD3>
-			<KEYWORD3>velo</KEYWORD3>
-
-			<!-- *IF command -->
-			<KEYWORD3>eq</KEYWORD3>
-			<KEYWORD3>ne</KEYWORD3>
-			<KEYWORD3>lt</KEYWORD3>
-			<KEYWORD3>gt</KEYWORD3>
-			<KEYWORD3>le</KEYWORD3>
-			<KEYWORD3>ge</KEYWORD3>
-			<KEYWORD3>ablt</KEYWORD3>
-			<KEYWORD3>abgt</KEYWORD3>
-			<KEYWORD3>stop</KEYWORD3>
-			<KEYWORD3>exit</KEYWORD3>
-			<KEYWORD3>cycle</KEYWORD3>
-			<KEYWORD3>then</KEYWORD3>
-
-			<!-- INRES command -->
-			<KEYWORD3>all</KEYWORD3>
-			<KEYWORD3>basic</KEYWORD3>
-			<KEYWORD3>nsol</KEYWORD3>
-			<KEYWORD3>rsol</KEYWORD3>
-			<KEYWORD3>esol</KEYWORD3>
-			<KEYWORD3>nload</KEYWORD3>
-			<KEYWORD3>strs</KEYWORD3>
-			<KEYWORD3>epel</KEYWORD3>
-			<KEYWORD3>epth</KEYWORD3>
-			<KEYWORD3>eppl</KEYWORD3>
-			<KEYWORD3>epcr</KEYWORD3>
-			<KEYWORD3>fgrad</KEYWORD3>
-			<KEYWORD3>fflux</KEYWORD3>
-			<KEYWORD3>misc</KEYWORD3>
-
-			<!-- INTSRF command -->
-			<KEYWORD3>pres</KEYWORD3>
-
-			<!-- IOPTN command -->
-			<KEYWORD3>stat</KEYWORD3>
-			<KEYWORD3>defa</KEYWORD3>
-			<KEYWORD3>merg</KEYWORD3>
-			<KEYWORD3>yes</KEYWORD3>
-			<KEYWORD3>no</KEYWORD3>
-			<KEYWORD3>solid</KEYWORD3>
-			<KEYWORD3>gtoler</KEYWORD3>
-			<KEYWORD3>file</KEYWORD3>
-			<KEYWORD3>iges</KEYWORD3>
-			<KEYWORD3>stat</KEYWORD3>
-			<KEYWORD3>small</KEYWORD3>
-
-			<!-- K command -->
-			<KEYWORD3>p</KEYWORD3>
-
-			<!-- KBETW command -->
-			<KEYWORD3>p</KEYWORD3>
-			<KEYWORD3>ratio</KEYWORD3>
-			<KEYWORD3>dist</KEYWORD3>
-
-			<!-- KCENTER command -->
-			<KEYWORD3>p</KEYWORD3>
-			<KEYWORD3>kp</KEYWORD3>
-			<KEYWORD3>line</KEYWORD3>
-
-			<!-- KCLEAR, KDELE, KDIST, KESIZE, KFILL, KGEN, KL, KLIST, KMESH, KMODIF, -->
-			<!-- KMOVE, KNODE, KPLOT, KPSCALE, KSCALE, KSCON commands -->
-			<KEYWORD3>all</KEYWORD3>
-			<KEYWORD3>p</KEYWORD3>
-			<KEYWORD3>coord</KEYWORD3>
-			<KEYWORD3>hpt</KEYWORD3>
-			<KEYWORD3>stat</KEYWORD3>
-
-			<!-- KREFINE command -->
-			<KEYWORD3>all</KEYWORD3>
-			<KEYWORD3>p</KEYWORD3>
-			<KEYWORD3>off</KEYWORD3>
-			<KEYWORD3>smooth</KEYWORD3>
-			<KEYWORD3>clean</KEYWORD3>
-			<KEYWORD3>on</KEYWORD3>
-			<KEYWORD3>off</KEYWORD3>
-
-			<!-- KSEL command -->
-			<KEYWORD3>s</KEYWORD3>
-			<KEYWORD3>,r</KEYWORD3>
-			<KEYWORD3>,a</KEYWORD3>
-			<KEYWORD3>u</KEYWORD3>
-			<KEYWORD3>all</KEYWORD3>
-			<KEYWORD3>none</KEYWORD3>
-			<KEYWORD3>inve</KEYWORD3>
-			<KEYWORD3>stat</KEYWORD3>
-			<KEYWORD3>p</KEYWORD3>
-			<KEYWORD3>,mat</KEYWORD3>
-			<KEYWORD3>,type</KEYWORD3>
-			<KEYWORD3>,real</KEYWORD3>
-			<KEYWORD3>,esys</KEYWORD3>
-			<KEYWORD3>all</KEYWORD3>
-			<KEYWORD3>kp</KEYWORD3>
-			<KEYWORD3>ext</KEYWORD3>
-			<KEYWORD3>hpt</KEYWORD3>
-			<KEYWORD3>loc</KEYWORD3>
-			<KEYWORD3>x</KEYWORD3>
-			<KEYWORD3>y</KEYWORD3>
-			<KEYWORD3>z</KEYWORD3>
-
-			<!-- KSLL, KSLN commands -->
-			<KEYWORD3>s</KEYWORD3>
-			<KEYWORD3>,r</KEYWORD3>
-			<KEYWORD3>,a</KEYWORD3>
-			<KEYWORD3>u</KEYWORD3>
-
-			<!-- KSYMM, KTRAN, KWPAVE, KWPLAN commands -->
-			<KEYWORD3>all</KEYWORD3>
-			<KEYWORD3>p</KEYWORD3>
-			<KEYWORD3>x</KEYWORD3>
-			<KEYWORD3>y</KEYWORD3>
-			<KEYWORD3>z</KEYWORD3>
-
-			<!-- L, L2ANG, L2TAN, LANG, LARC, LAREA commands -->
-			<KEYWORD3>p</KEYWORD3>
-
-			<!-- LAYER, LAYERP26 commands -->
-			<KEYWORD3>fcmax</KEYWORD3>
-
-			<!-- LAYLIST, LCABS, LCCAT, LCFACT, LCLEAR, LCOMB, LCSL, LCSUM, LDELE, -->
-			<!-- LDIV, LDRAG, LESIZE, LEXTND, LFILLT, LGEN, LGLUE, /LIGHT, LINA, -->
-			<!-- LINL, LINP, LINV, LMESH, LNFILL, LNMERGE, LOVLAP, LPLOT, LPTN, -->
-			<!-- LREVERSE, LROTAT, LSSCALE, LSTR commands -->
-			<KEYWORD3>all</KEYWORD3>
-			<KEYWORD3>p</KEYWORD3>
-
-			<!-- LCDEF command -->
-			<KEYWORD3>erase</KEYWORD3>
-			<KEYWORD3>stat</KEYWORD3>
-			<KEYWORD3>all</KEYWORD3>
-
-			<!-- LCOPER command -->
-			<KEYWORD3>zero</KEYWORD3>
-			<KEYWORD3>squa</KEYWORD3>
-			<KEYWORD3>sqrt</KEYWORD3>
-			<KEYWORD3>lprin</KEYWORD3>
-			<KEYWORD3>add</KEYWORD3>
-			<KEYWORD3>sub</KEYWORD3>
-			<KEYWORD3>srss</KEYWORD3>
-			<KEYWORD3>min</KEYWORD3>
-			<KEYWORD3>max</KEYWORD3>
-			<KEYWORD3>abmn</KEYWORD3>
-			<KEYWORD3>abmx</KEYWORD3>
-			<KEYWORD3>all</KEYWORD3>
-			<KEYWORD3>mult</KEYWORD3>
-
-			<!-- LCSEL command -->
-			<KEYWORD3>s</KEYWORD3>
-			<KEYWORD3>,r</KEYWORD3>
-			<KEYWORD3>,a</KEYWORD3>
-			<KEYWORD3>u</KEYWORD3>
-			<KEYWORD3>all</KEYWORD3>
-			<KEYWORD3>none</KEYWORD3>
-			<KEYWORD3>inve</KEYWORD3>
-			<KEYWORD3>stat</KEYWORD3>
-
-			<!-- LDREAD command -->
-			<KEYWORD3>temp</KEYWORD3>
-			<KEYWORD3>forc</KEYWORD3>
-			<KEYWORD3>hgen</KEYWORD3>
-			<KEYWORD3>hflu</KEYWORD3>
-			<KEYWORD3>ehflu</KEYWORD3>
-			<KEYWORD3>js</KEYWORD3>
-			<KEYWORD3>pres</KEYWORD3>
-			<KEYWORD3>reac</KEYWORD3>
-			<KEYWORD3>hflm</KEYWORD3>
-			<KEYWORD3>last</KEYWORD3>
-
-			<!-- LGWRITE command -->
-			<KEYWORD3>none</KEYWORD3>
-			<KEYWORD3>comment</KEYWORD3>
-			<KEYWORD3>remove</KEYWORD3>
-
-			<!-- LLIST command -->
-			<KEYWORD3>radius</KEYWORD3>
-			<KEYWORD3>layer</KEYWORD3>
-			<KEYWORD3>hpt</KEYWORD3>
-			<KEYWORD3>orient</KEYWORD3>
-
-			<!-- LNSEARCH command -->
-			<KEYWORD3>off</KEYWORD3>
-			<KEYWORD3>on</KEYWORD3>
-			<KEYWORD3>auto</KEYWORD3>
-
-			<!-- LOCAL command -->
-			<KEYWORD3>cart</KEYWORD3>
-			<KEYWORD3>cylin</KEYWORD3>
-			<KEYWORD3>sphe</KEYWORD3>
-			<KEYWORD3>toro</KEYWORD3>
-
-			<!-- LREFINE command -->
-			<KEYWORD3>all</KEYWORD3>
-			<KEYWORD3>p</KEYWORD3>
-			<KEYWORD3>off</KEYWORD3>
-			<KEYWORD3>smooth</KEYWORD3>
-			<KEYWORD3>clean</KEYWORD3>
-			<KEYWORD3>on</KEYWORD3>
-
-			<!-- LSBA, LSBL, LSBV, LSBW commands -->
-			<KEYWORD3>p</KEYWORD3>
-			<KEYWORD3>all</KEYWORD3>
-			<KEYWORD3>sepo</KEYWORD3>
-			<KEYWORD3>delete</KEYWORD3>
-			<KEYWORD3>keep</KEYWORD3>
-
-			<!-- LSCLEAR command -->
-			<KEYWORD3>solid</KEYWORD3>
-			<KEYWORD3>fe</KEYWORD3>
-			<KEYWORD3>iner</KEYWORD3>
-			<KEYWORD3>lfact</KEYWORD3>
-			<KEYWORD3>lsopt</KEYWORD3>
-			<KEYWORD3>all</KEYWORD3>
-
-			<!-- LSEL command -->
-			<KEYWORD3>s</KEYWORD3>
-			<KEYWORD3>,r</KEYWORD3>
-			<KEYWORD3>,a</KEYWORD3>
-			<KEYWORD3>u</KEYWORD3>
-			<KEYWORD3>all</KEYWORD3>
-			<KEYWORD3>none</KEYWORD3>
-			<KEYWORD3>inve</KEYWORD3>
-			<KEYWORD3>stat</KEYWORD3>
-			<KEYWORD3>p</KEYWORD3>
-			<KEYWORD3>line</KEYWORD3>
-			<KEYWORD3>ext</KEYWORD3>
-			<KEYWORD3>loc</KEYWORD3>
-			<KEYWORD3>x</KEYWORD3>
-			<KEYWORD3>y</KEYWORD3>
-			<KEYWORD3>z</KEYWORD3>
-			<KEYWORD3>tan1</KEYWORD3>
-			<KEYWORD3>tan2</KEYWORD3>
-			<KEYWORD3>ndiv</KEYWORD3>
-			<KEYWORD3>space</KEYWORD3>
-			<KEYWORD3>,mat</KEYWORD3>
-			<KEYWORD3>,type</KEYWORD3>
-			<KEYWORD3>,real</KEYWORD3>
-			<KEYWORD3>,esys</KEYWORD3>
-			<KEYWORD3>sec</KEYWORD3>
-			<KEYWORD3>lenght</KEYWORD3>
-			<KEYWORD3>radius</KEYWORD3>
-			<KEYWORD3>hpt</KEYWORD3>
-			<KEYWORD3>lcca</KEYWORD3>
-
-			<!-- LSLA, LSLK commands -->
-			<KEYWORD3>s</KEYWORD3>
-			<KEYWORD3>,r</KEYWORD3>
-			<KEYWORD3>,a</KEYWORD3>
-			<KEYWORD3>u</KEYWORD3>
-
-			<!-- LSREAD, LSWRITE commands -->
-			<KEYWORD3>stat</KEYWORD3>
-			<KEYWORD3>init</KEYWORD3>
-
-			<!-- LSYMM, LTAN, LTRAN, LWPLAN commands -->
-			<KEYWORD3>x</KEYWORD3>
-			<KEYWORD3>y</KEYWORD3>
-			<KEYWORD3>z</KEYWORD3>
-			<KEYWORD3>all</KEYWORD3>
-			<KEYWORD3>p</KEYWORD3>
-
-			<!-- LUMPM command -->
-			<KEYWORD3>off</KEYWORD3>
-			<KEYWORD3>on</KEYWORD3>
-
-			<!-- M, MONITOR commands -->
-			<KEYWORD3>all</KEYWORD3>
-			<KEYWORD3>p</KEYWORD3>
-			<KEYWORD3>ux</KEYWORD3>
-			<KEYWORD3>uy</KEYWORD3>
-			<KEYWORD3>uz</KEYWORD3>
-			<KEYWORD3>rotx</KEYWORD3>
-			<KEYWORD3>roty</KEYWORD3>
-			<KEYWORD3>rotz</KEYWORD3>
-			<KEYWORD3>temp</KEYWORD3>
-			<KEYWORD3>fx</KEYWORD3>
-			<KEYWORD3>fy</KEYWORD3>
-			<KEYWORD3>fz</KEYWORD3>
-			<KEYWORD3>mx</KEYWORD3>
-			<KEYWORD3>my</KEYWORD3>
-			<KEYWORD3>mz</KEYWORD3>
-			<KEYWORD3>heat</KEYWORD3>
-
-			<!-- MDELE, MGEN, MLIST commands -->
-			<KEYWORD3>all</KEYWORD3>
-			<KEYWORD3>p</KEYWORD3>
-
-			<!-- /MENU command -->
-			<KEYWORD3>on</KEYWORD3>
-			<KEYWORD3>grph</KEYWORD3>
-
-			<!-- *MFOURI command -->
-			<KEYWORD3>fit</KEYWORD3>
-			<KEYWORD3>eval</KEYWORD3>
-
-			<!-- *MFUN command -->
-			<KEYWORD3>copy</KEYWORD3>
-			<KEYWORD3>tran</KEYWORD3>
-
-			<!-- MODMSH command -->
-			<KEYWORD3>stat</KEYWORD3>
-			<KEYWORD3>nocheck</KEYWORD3>
-			<KEYWORD3>check</KEYWORD3>
-			<KEYWORD3>detach</KEYWORD3>
-
-			<!-- MODOPT command -->
-			<KEYWORD3>subsp</KEYWORD3>
-			<KEYWORD3>lanb</KEYWORD3>
-			<KEYWORD3>reduc</KEYWORD3>
-			<KEYWORD3>unsym</KEYWORD3>
-			<KEYWORD3>damp</KEYWORD3>
-			<KEYWORD3>off</KEYWORD3>
-			<KEYWORD3>on</KEYWORD3>
-
-			<!-- *MOPER command -->
-			<KEYWORD3>mult</KEYWORD3>
-			<KEYWORD3>solv</KEYWORD3>
-			<KEYWORD3>sort</KEYWORD3>
-			<KEYWORD3>covar</KEYWORD3>
-			<KEYWORD3>corr</KEYWORD3>
-
-			<!-- MOPT command -->
-			<KEYWORD3>expnd</KEYWORD3>
-			<KEYWORD3>tetexpnd</KEYWORD3>
-			<KEYWORD3>trans</KEYWORD3>
-			<KEYWORD3>iesz</KEYWORD3>
-			<KEYWORD3>amesh</KEYWORD3>
-			<KEYWORD3>default</KEYWORD3>
-			<KEYWORD3>main</KEYWORD3>
-			<KEYWORD3>alternate</KEYWORD3>
-			<KEYWORD3>alt2</KEYWORD3>
-			<KEYWORD3>qmesh</KEYWORD3>
-			<KEYWORD3>vmesh</KEYWORD3>
-			<KEYWORD3>split</KEYWORD3>
-			<KEYWORD3>lsmo</KEYWORD3>
-			<KEYWORD3>clear</KEYWORD3>
-			<KEYWORD3>pyra</KEYWORD3>
-			<KEYWORD3>timp</KEYWORD3>
-			<KEYWORD3>stat</KEYWORD3>
-			<KEYWORD3>defa</KEYWORD3>
-
-			<!-- MOVE command -->
-			<KEYWORD3>p</KEYWORD3>
-
-			<!-- MP, MPDATA commands -->
-			<KEYWORD3>ex</KEYWORD3>
-			<KEYWORD3>ey</KEYWORD3>
-			<KEYWORD3>ez</KEYWORD3>
-			<KEYWORD3>alpx</KEYWORD3>
-			<KEYWORD3>alpy</KEYWORD3>
-			<KEYWORD3>alpz</KEYWORD3>
-			<KEYWORD3>reft</KEYWORD3>
-			<KEYWORD3>prxy</KEYWORD3>
-			<KEYWORD3>pryz</KEYWORD3>
-			<KEYWORD3>prxz</KEYWORD3>
-			<KEYWORD3>nuxy</KEYWORD3>
-			<KEYWORD3>nuyz</KEYWORD3>
-			<KEYWORD3>nuzx</KEYWORD3>
-			<KEYWORD3>gxy</KEYWORD3>
-			<KEYWORD3>gyz</KEYWORD3>
-			<KEYWORD3>gxz</KEYWORD3>
-			<KEYWORD3>damp</KEYWORD3>
-			<KEYWORD3>mu</KEYWORD3>
-			<KEYWORD3>dens</KEYWORD3>
-			<KEYWORD3>c</KEYWORD3>
-			<KEYWORD3>enth</KEYWORD3>
-			<KEYWORD3>kxx</KEYWORD3>
-			<KEYWORD3>kyy</KEYWORD3>
-			<KEYWORD3>kzz</KEYWORD3>
-			<KEYWORD3>hf</KEYWORD3>
-			<KEYWORD3>emis</KEYWORD3>
-			<KEYWORD3>qrate</KEYWORD3>
-			<KEYWORD3>visc</KEYWORD3>
-			<KEYWORD3>sonc</KEYWORD3>
-			<KEYWORD3>rsvx</KEYWORD3>
-			<KEYWORD3>rsvy</KEYWORD3>
-			<KEYWORD3>rsvz</KEYWORD3>
-			<KEYWORD3>perx</KEYWORD3>
-			<KEYWORD3>pery</KEYWORD3>
-			<KEYWORD3>perz</KEYWORD3>
-			<KEYWORD3>murx</KEYWORD3>
-			<KEYWORD3>mury</KEYWORD3>
-			<KEYWORD3>murz</KEYWORD3>
-			<KEYWORD3>mgxx</KEYWORD3>
-			<KEYWORD3>mgyy</KEYWORD3>
-			<KEYWORD3>mgzz</KEYWORD3>
-			<KEYWORD3>lsst</KEYWORD3>
-
-			<!-- MPCHG, MPDELE commands -->
-			<KEYWORD3>all</KEYWORD3>
-
-			<!-- /MPLIB command -->
-			<KEYWORD3>read</KEYWORD3>
-			<KEYWORD3>write</KEYWORD3>
-			<KEYWORD3>stat</KEYWORD3>
-
-			<!-- MPLIST command -->
-			<KEYWORD3>all</KEYWORD3>
-			<KEYWORD3>evlt</KEYWORD3>
-
-			<!-- MSADV command -->
-			<KEYWORD3>msu</KEYWORD3>
-			<KEYWORD3>supg</KEYWORD3>
-
-			<!-- MSCAP command -->
-			<KEYWORD3>off</KEYWORD3>
-			<KEYWORD3>on</KEYWORD3>
-
-			<!-- *MSG command -->
-			<KEYWORD3>info</KEYWORD3>
-			<KEYWORD3>note</KEYWORD3>
-			<KEYWORD3>warn</KEYWORD3>
-			<KEYWORD3>error</KEYWORD3>
-			<KEYWORD3>fatal</KEYWORD3>
-			<KEYWORD3>ui</KEYWORD3>
-
-			<!-- MSHAPE command -->
-			<KEYWORD3>2d</KEYWORD3>
-			<KEYWORD3>3d</KEYWORD3>
-
-			<!-- MSPROP command -->
-			<KEYWORD3>dens</KEYWORD3>
-			<KEYWORD3>visc</KEYWORD3>
-			<KEYWORD3>cond</KEYWORD3>
-			<KEYWORD3>mdif</KEYWORD3>
-			<KEYWORD3>spht</KEYWORD3>
-			<KEYWORD3>constant</KEYWORD3>
-			<KEYWORD3>liquid</KEYWORD3>
-			<KEYWORD3>gas</KEYWORD3>
-
-			<!-- /MSTART command -->
-			<KEYWORD3>main</KEYWORD3>
-			<KEYWORD3>input</KEYWORD3>
-			<KEYWORD3>grph</KEYWORD3>
-			<KEYWORD3>tool</KEYWORD3>
-			<KEYWORD3>zoom</KEYWORD3>
-			<KEYWORD3>work</KEYWORD3>
-			<KEYWORD3>wpset</KEYWORD3>
-			<KEYWORD3>abbr</KEYWORD3>
-			<KEYWORD3>parm</KEYWORD3>
-			<KEYWORD3>sele</KEYWORD3>
-			<KEYWORD3>anno</KEYWORD3>
-			<KEYWORD3>hard</KEYWORD3>
-			<KEYWORD3>help</KEYWORD3>
-			<KEYWORD3>off</KEYWORD3>
-			<KEYWORD3>on</KEYWORD3>
-
-			<!-- MSVARY command -->
-			<KEYWORD3>dens</KEYWORD3>
-			<KEYWORD3>visc</KEYWORD3>
-			<KEYWORD3>cond</KEYWORD3>
-			<KEYWORD3>mdif</KEYWORD3>
-			<KEYWORD3>off</KEYWORD3>
-			<KEYWORD3>on</KEYWORD3>
-
-			<!-- MXPAND command -->
-			<KEYWORD3>no</KEYWORD3>
-			<KEYWORD3>yes</KEYWORD3>
-
-			<!-- N, NDELE, NDIST, NGEN, NKPT commands -->
-			<KEYWORD3>all</KEYWORD3>
-			<KEYWORD3>p</KEYWORD3>
-
-			<!-- NLGEOM, NOORDER commands -->
-			<KEYWORD3>off</KEYWORD3>
-			<KEYWORD3>on</KEYWORD3>
-
-			<!-- NLIST, NMODIF commands -->
-			<KEYWORD3>all</KEYWORD3>
-			<KEYWORD3>p</KEYWORD3>
-			<KEYWORD3>coord</KEYWORD3>
-
-			<!-- NREFINE, NROTAT, NSCALE commands -->
-			<KEYWORD3>all</KEYWORD3>
-			<KEYWORD3>p</KEYWORD3>
-			<KEYWORD3>off</KEYWORD3>
-			<KEYWORD3>smooth</KEYWORD3>
-			<KEYWORD3>clean</KEYWORD3>
-			<KEYWORD3>on</KEYWORD3>
-
-			<!-- NRLSUM command -->
-			<KEYWORD3>disp</KEYWORD3>
-			<KEYWORD3>velo</KEYWORD3>
-			<KEYWORD3>acel</KEYWORD3>
-
-			<!-- NROPT command -->
-			<KEYWORD3>auto</KEYWORD3>
-			<KEYWORD3>full</KEYWORD3>
-			<KEYWORD3>modi</KEYWORD3>
-			<KEYWORD3>init</KEYWORD3>
-			<KEYWORD3>on</KEYWORD3>
-			<KEYWORD3>off</KEYWORD3>
-
-			<!-- NSEL, NSOL, NSORT commands -->
-			<KEYWORD3>s</KEYWORD3>
-			<KEYWORD3>,r</KEYWORD3>
-			<KEYWORD3>,a</KEYWORD3>
-			<KEYWORD3>u</KEYWORD3>
-			<KEYWORD3>all</KEYWORD3>
-			<KEYWORD3>none</KEYWORD3>
-			<KEYWORD3>inve</KEYWORD3>
-			<KEYWORD3>stat</KEYWORD3>
-			<KEYWORD3>node</KEYWORD3>
-			<KEYWORD3>ext</KEYWORD3>
-			<KEYWORD3>loc</KEYWORD3>
-			<KEYWORD3>x</KEYWORD3>
-			<KEYWORD3>y</KEYWORD3>
-			<KEYWORD3>z</KEYWORD3>
-			<KEYWORD3>ang</KEYWORD3>
-			<KEYWORD3>xy</KEYWORD3>
-			<KEYWORD3>yz</KEYWORD3>
-			<KEYWORD3>zx</KEYWORD3>
-			<KEYWORD3>,m</KEYWORD3>
-			<KEYWORD3>,cp</KEYWORD3>
-			<KEYWORD3>,ce</KEYWORD3>
-			<KEYWORD3>,d</KEYWORD3>
-			<KEYWORD3>u</KEYWORD3>
-			<KEYWORD3>ux</KEYWORD3>
-			<KEYWORD3>uy</KEYWORD3>
-			<KEYWORD3>uz</KEYWORD3>
-			<KEYWORD3>rot</KEYWORD3>
-			<KEYWORD3>rotx</KEYWORD3>
-			<KEYWORD3>roty</KEYWORD3>
-			<KEYWORD3>rotz</KEYWORD3>
-			<KEYWORD3>temp</KEYWORD3>
-			<KEYWORD3>pres</KEYWORD3>
-			<KEYWORD3>volt</KEYWORD3>
-			<KEYWORD3>mag</KEYWORD3>
-			<KEYWORD3>v</KEYWORD3>
-			<KEYWORD3>vx</KEYWORD3>
-			<KEYWORD3>vy</KEYWORD3>
-			<KEYWORD3>vz</KEYWORD3>
-			<KEYWORD3>,a</KEYWORD3>
-			<KEYWORD3>ax</KEYWORD3>
-			<KEYWORD3>ay</KEYWORD3>
-			<KEYWORD3>az</KEYWORD3>
-			<KEYWORD3>curr</KEYWORD3>
-			<KEYWORD3>emf</KEYWORD3>
-			<KEYWORD3>enke</KEYWORD3>
-			<KEYWORD3>ends</KEYWORD3>
-			<KEYWORD3>,f</KEYWORD3>
-			<KEYWORD3>fx</KEYWORD3>
-			<KEYWORD3>fy</KEYWORD3>
-			<KEYWORD3>fz</KEYWORD3>
-			<KEYWORD3>,m</KEYWORD3>
-			<KEYWORD3>mx</KEYWORD3>
-			<KEYWORD3>my</KEYWORD3>
-			<KEYWORD3>mz</KEYWORD3>
-			<KEYWORD3>heat</KEYWORD3>
-			<KEYWORD3>flow</KEYWORD3>
-			<KEYWORD3>amps</KEYWORD3>
-			<KEYWORD3>flux</KEYWORD3>
-			<KEYWORD3>csg</KEYWORD3>
-			<KEYWORD3>csgx</KEYWORD3>
-			<KEYWORD3>csgy</KEYWORD3>
-			<KEYWORD3>csgz</KEYWORD3>
-			<KEYWORD3>chrg</KEYWORD3>
-			<KEYWORD3>chrgd</KEYWORD3>
-			<KEYWORD3>,bf</KEYWORD3>
-			<KEYWORD3>temp</KEYWORD3>
-			<KEYWORD3>flue</KEYWORD3>
-			<KEYWORD3>hgen</KEYWORD3>
-			<KEYWORD3>js</KEYWORD3>
-			<KEYWORD3>jsx</KEYWORD3>
-			<KEYWORD3>jsy</KEYWORD3>
-			<KEYWORD3>jsz</KEYWORD3>
-			<KEYWORD3>mvdi</KEYWORD3>
-			<KEYWORD3>int</KEYWORD3>
-			<KEYWORD3>eqv</KEYWORD3>
-			<KEYWORD3>epto</KEYWORD3>
-			<KEYWORD3>epel</KEYWORD3>
-			<KEYWORD3>eppl</KEYWORD3>
-			<KEYWORD3>epcr</KEYWORD3>
-			<KEYWORD3>epth</KEYWORD3>
-			<KEYWORD3>epsw</KEYWORD3>
-			<KEYWORD3>nl</KEYWORD3>
-			<KEYWORD3>sepl</KEYWORD3>
-			<KEYWORD3>srat</KEYWORD3>
-			<KEYWORD3>hpres</KEYWORD3>
-			<KEYWORD3>epeq</KEYWORD3>
-			<KEYWORD3>psv</KEYWORD3>
-			<KEYWORD3>plwk</KEYWORD3>
-			<KEYWORD3>cont</KEYWORD3>
-			<KEYWORD3>pene</KEYWORD3>
-			<KEYWORD3>sfric</KEYWORD3>
-			<KEYWORD3>stot</KEYWORD3>
-			<KEYWORD3>slide</KEYWORD3>
-			<KEYWORD3>tg</KEYWORD3>
-			<KEYWORD3>tf</KEYWORD3>
-			<KEYWORD3>pg</KEYWORD3>
-			<KEYWORD3>ef</KEYWORD3>
-			<KEYWORD3>,d</KEYWORD3>
-			<KEYWORD3>h</KEYWORD3>
-			<KEYWORD3>b</KEYWORD3>
-			<KEYWORD3>fmag</KEYWORD3>
-			<KEYWORD3>topo</KEYWORD3>
-			<KEYWORD3>ttot</KEYWORD3>
-			<KEYWORD3>hflu</KEYWORD3>
-			<KEYWORD3>hflm</KEYWORD3>
-			<KEYWORD3>cond</KEYWORD3>
-			<KEYWORD3>pcoe</KEYWORD3>
-			<KEYWORD3>ptot</KEYWORD3>
-			<KEYWORD3>mach</KEYWORD3>
-			<KEYWORD3>strm</KEYWORD3>
-			<KEYWORD3>dens</KEYWORD3>
-			<KEYWORD3>visc</KEYWORD3>
-			<KEYWORD3>evis</KEYWORD3>
-			<KEYWORD3>cmuv</KEYWORD3>
-			<KEYWORD3>econ</KEYWORD3>
-			<KEYWORD3>yplu</KEYWORD3>
-			<KEYWORD3>tauw</KEYWORD3>
-
-			<!-- NSLA, NSLE, NSLK, NSLL, NSLV commands -->
-			<KEYWORD3>s</KEYWORD3>
-			<KEYWORD3>,r</KEYWORD3>
-			<KEYWORD3>,a</KEYWORD3>
-			<KEYWORD3>u</KEYWORD3>
-			<KEYWORD3>all</KEYWORD3>
-			<KEYWORD3>active</KEYWORD3>
-			<KEYWORD3>inactive</KEYWORD3>
-			<KEYWORD3>corner</KEYWORD3>
-			<KEYWORD3>mid</KEYWORD3>
-
-			<!-- NSUBST command -->
-			<KEYWORD3>off</KEYWORD3>
-			<KEYWORD3>on</KEYWORD3>
-
-			<!-- NSYM command -->
-			<KEYWORD3>x</KEYWORD3>
-			<KEYWORD3>y</KEYWORD3>
-			<KEYWORD3>z</KEYWORD3>
-			<KEYWORD3>all</KEYWORD3>
-			<KEYWORD3>p</KEYWORD3>
-
-			<!-- NUMCMP, NUMMRG, NUMOFF, NUMSTR commands -->
-			<KEYWORD3>node</KEYWORD3>
-			<KEYWORD3>elem</KEYWORD3>
-			<KEYWORD3>kp</KEYWORD3>
-			<KEYWORD3>line</KEYWORD3>
-			<KEYWORD3>area</KEYWORD3>
-			<KEYWORD3>volu</KEYWORD3>
-			<KEYWORD3>,mat</KEYWORD3>
-			<KEYWORD3>,type</KEYWORD3>
-			<KEYWORD3>,real</KEYWORD3>
-			<KEYWORD3>,cp</KEYWORD3>
-			<KEYWORD3>,ce</KEYWORD3>
-			<KEYWORD3>all</KEYWORD3>
-			<KEYWORD3>low</KEYWORD3>
-			<KEYWORD3>high</KEYWORD3>
-			<KEYWORD3>,csys</KEYWORD3>
-			<KEYWORD3>defa</KEYWORD3>
-
-			<!-- NUMEXP command -->
-			<KEYWORD3>yes</KEYWORD3>
-			<KEYWORD3>no</KEYWORD3>
-
-			<!-- NWPLAN command -->
-			<KEYWORD3>p</KEYWORD3>
-
-			<!-- OPDEL, OPLIST, OPRFA, OPRGR, OPRSW commands -->
-			<KEYWORD3>all</KEYWORD3>
-
-			<!-- OPFACT command -->
-			<KEYWORD3>full</KEYWORD3>
-
-			<!-- OPGRAD, OPSWEEP commands -->
-			<KEYWORD3>best</KEYWORD3>
-			<KEYWORD3>last</KEYWORD3>
-			<KEYWORD3>,n</KEYWORD3>
-
-			<!-- OPKEEP commmand -->
-			<KEYWORD3>off</KEYWORD3>
-			<KEYWORD3>on</KEYWORD3>
-
-			<!-- OPLFA command -->
-			<KEYWORD3>main</KEYWORD3>
-			<KEYWORD3>2fac</KEYWORD3>
-			<KEYWORD3>3fac</KEYWORD3>
-
-			<!-- OPLOOP command -->
-			<KEYWORD3>top</KEYWORD3>
-			<KEYWORD3>prep</KEYWORD3>
-			<KEYWORD3>ignore</KEYWORD3>
-			<KEYWORD3>process</KEYWORD3>
-			<KEYWORD3>scalar</KEYWORD3>
-			<KEYWORD3>all</KEYWORD3>
-
-			<!-- OPNCONTROL command -->
-			<KEYWORD3>temp</KEYWORD3>
-
-			<!-- OPPRNT command -->
-			<KEYWORD3>off</KEYWORD3>
-			<KEYWORD3>on</KEYWORD3>
-			<KEYWORD3>full</KEYWORD3>
-
-			<!-- OPTYPE command -->
-			<KEYWORD3>subp</KEYWORD3>
-			<KEYWORD3>first</KEYWORD3>
-			<KEYWORD3>rand</KEYWORD3>
-			<KEYWORD3>run</KEYWORD3>
-			<KEYWORD3>fact</KEYWORD3>
-			<KEYWORD3>grad</KEYWORD3>
-			<KEYWORD3>sweep</KEYWORD3>
-			<KEYWORD3>user</KEYWORD3>
-
-			<!-- OPVAR command -->
-			<KEYWORD3>dv</KEYWORD3>
-			<KEYWORD3>sv</KEYWORD3>
-			<KEYWORD3>obj</KEYWORD3>
-			<KEYWORD3>del</KEYWORD3>
-
-			<!-- OUTPR command -->
-			<KEYWORD3>basic</KEYWORD3>
-			<KEYWORD3>nsol</KEYWORD3>
-			<KEYWORD3>rsol</KEYWORD3>
-			<KEYWORD3>esol</KEYWORD3>
-			<KEYWORD3>nload</KEYWORD3>
-			<KEYWORD3>veng</KEYWORD3>
-			<KEYWORD3>all</KEYWORD3>
-			<KEYWORD3>none</KEYWORD3>
-			<KEYWORD3>last</KEYWORD3>
-			<KEYWORD3>stat</KEYWORD3>
-			<KEYWORD3>erase</KEYWORD3>
-
-			<!-- /OUTPUT command -->
-			<KEYWORD3>term</KEYWORD3>
-			<KEYWORD3>append</KEYWORD3>
-
-			<!-- OUTRES command -->
-			<KEYWORD3>all</KEYWORD3>
-			<KEYWORD3>basic</KEYWORD3>
-			<KEYWORD3>nsol</KEYWORD3>
-			<KEYWORD3>rsol</KEYWORD3>
-			<KEYWORD3>esol</KEYWORD3>
-			<KEYWORD3>nload</KEYWORD3>
-			<KEYWORD3>strs</KEYWORD3>
-			<KEYWORD3>epel</KEYWORD3>
-			<KEYWORD3>epth</KEYWORD3>
-			<KEYWORD3>eppl</KEYWORD3>
-			<KEYWORD3>epcr</KEYWORD3>
-			<KEYWORD3>fgrad</KEYWORD3>
-			<KEYWORD3>fflux</KEYWORD3>
-			<KEYWORD3>misc</KEYWORD3>
-			<KEYWORD3>none</KEYWORD3>
-			<KEYWORD3>all</KEYWORD3>
-			<KEYWORD3>last</KEYWORD3>
-
-			<!-- PADELE command -->
-			<KEYWORD3>all</KEYWORD3>
-			<KEYWORD3>name</KEYWORD3>
-
-			<!-- PAGET, PAPUT commands -->
-			<KEYWORD3>points</KEYWORD3>
-			<KEYWORD3>table</KEYWORD3>
-			<KEYWORD3>label</KEYWORD3>
-
-			<!-- PARESU command -->
-			<KEYWORD3>all</KEYWORD3>
-			<KEYWORD3>path</KEYWORD3>
-
-			<!-- PARRES command -->
-			<KEYWORD3>new</KEYWORD3>
-			<KEYWORD3>change</KEYWORD3>
-
-			<!-- PARSAV command -->
-			<KEYWORD3>scalar</KEYWORD3>
-			<KEYWORD3>all</KEYWORD3>
-
-			<!-- PASAVE command -->
-			<KEYWORD3>s</KEYWORD3>
-			<KEYWORD3>all</KEYWORD3>
-
-			<!-- /PBC command -->
-			<KEYWORD3>u</KEYWORD3>
-			<KEYWORD3>ux</KEYWORD3>
-			<KEYWORD3>uy</KEYWORD3>
-			<KEYWORD3>uz</KEYWORD3>
-			<KEYWORD3>rot</KEYWORD3>
-			<KEYWORD3>rotx</KEYWORD3>
-			<KEYWORD3>roty</KEYWORD3>
-			<KEYWORD3>rotz</KEYWORD3>
-			<KEYWORD3>temp</KEYWORD3>
-			<KEYWORD3>pres</KEYWORD3>
-			<KEYWORD3>v</KEYWORD3>
-			<KEYWORD3>vx</KEYWORD3>
-			<KEYWORD3>vy</KEYWORD3>
-			<KEYWORD3>vz</KEYWORD3>
-			<KEYWORD3>sp01</KEYWORD3>
-			<KEYWORD3>sp02</KEYWORD3>
-			<KEYWORD3>sp03</KEYWORD3>
-			<KEYWORD3>sp04</KEYWORD3>
-			<KEYWORD3>sp05</KEYWORD3>
-			<KEYWORD3>sp06</KEYWORD3>
-			<KEYWORD3>enke</KEYWORD3>
-			<KEYWORD3>ends</KEYWORD3>
-			<KEYWORD3>volt</KEYWORD3>
-			<KEYWORD3>mag</KEYWORD3>
-			<KEYWORD3>,a</KEYWORD3>
-			<KEYWORD3>chrg</KEYWORD3>
-			<KEYWORD3>,f</KEYWORD3>
-			<KEYWORD3>forc</KEYWORD3>
-			<KEYWORD3>fx</KEYWORD3>
-			<KEYWORD3>fy</KEYWORD3>
-			<KEYWORD3>fz</KEYWORD3>
-			<KEYWORD3>,m</KEYWORD3>
-			<KEYWORD3>mome</KEYWORD3>
-			<KEYWORD3>mx</KEYWORD3>
-			<KEYWORD3>my</KEYWORD3>
-			<KEYWORD3>mz</KEYWORD3>
-			<KEYWORD3>heat</KEYWORD3>
-			<KEYWORD3>flow</KEYWORD3>
-			<KEYWORD3>amps</KEYWORD3>
-			<KEYWORD3>flux</KEYWORD3>
-			<KEYWORD3>csg</KEYWORD3>
-			<KEYWORD3>mast</KEYWORD3>
-			<KEYWORD3>,cp</KEYWORD3>
-			<KEYWORD3>,ce</KEYWORD3>
-			<KEYWORD3>nfor</KEYWORD3>
-			<KEYWORD3>nmom</KEYWORD3>
-			<KEYWORD3>rfor</KEYWORD3>
-			<KEYWORD3>rmom</KEYWORD3>
-			<KEYWORD3>path</KEYWORD3>
-			<KEYWORD3>acel</KEYWORD3>
-			<KEYWORD3>acelx</KEYWORD3>
-			<KEYWORD3>acely</KEYWORD3>
-			<KEYWORD3>acelz</KEYWORD3>
-			<KEYWORD3>omeg</KEYWORD3>
-			<KEYWORD3>omegx</KEYWORD3>
-			<KEYWORD3>omegy</KEYWORD3>
-			<KEYWORD3>omegz</KEYWORD3>
-			<KEYWORD3>all</KEYWORD3>
-
-			<!-- /PBF command -->
-			<KEYWORD3>temp</KEYWORD3>
-			<KEYWORD3>flue</KEYWORD3>
-			<KEYWORD3>hgen</KEYWORD3>
-			<KEYWORD3>js</KEYWORD3>
-			<KEYWORD3>jsx</KEYWORD3>
-			<KEYWORD3>jsy</KEYWORD3>
-			<KEYWORD3>jsz</KEYWORD3>
-			<KEYWORD3>phase</KEYWORD3>
-			<KEYWORD3>mvdi</KEYWORD3>
-			<KEYWORD3>chrgd</KEYWORD3>
-			<KEYWORD3>vltg</KEYWORD3>
-			<KEYWORD3>forc</KEYWORD3>
-
-			<!-- PCALC command -->
-			<KEYWORD3>add</KEYWORD3>
-			<KEYWORD3>mult</KEYWORD3>
-			<KEYWORD3>div</KEYWORD3>
-			<KEYWORD3>exp</KEYWORD3>
-			<KEYWORD3>deri</KEYWORD3>
-			<KEYWORD3>intg</KEYWORD3>
-			<KEYWORD3>sin</KEYWORD3>
-			<KEYWORD3>cos</KEYWORD3>
-			<KEYWORD3>asin</KEYWORD3>
-			<KEYWORD3>acos</KEYWORD3>
-			<KEYWORD3>log</KEYWORD3>
-
-			<!-- PCONV command -->
-			<KEYWORD3>stat</KEYWORD3>
-			<KEYWORD3>erase</KEYWORD3>
-			<KEYWORD3>dele</KEYWORD3>
-			<KEYWORD3>se</KEYWORD3>
-			<KEYWORD3>s</KEYWORD3>
-			<KEYWORD3>epel</KEYWORD3>
-			<KEYWORD3>u</KEYWORD3>
-			<KEYWORD3>rot</KEYWORD3>
-			<KEYWORD3>eqv</KEYWORD3>
-			<KEYWORD3>sum</KEYWORD3>
-			<KEYWORD3>p</KEYWORD3>
-			<KEYWORD3>top</KEYWORD3>
-			<KEYWORD3>mid</KEYWORD3>
-			<KEYWORD3>bot</KEYWORD3>
-			<KEYWORD3>x</KEYWORD3>
-			<KEYWORD3>y</KEYWORD3>
-			<KEYWORD3>z</KEYWORD3>
-			<KEYWORD3>xy</KEYWORD3>
-			<KEYWORD3>yz</KEYWORD3>
-			<KEYWORD3>xz</KEYWORD3>
-			<KEYWORD3>int</KEYWORD3>
-
-			<!-- /PCOPY command -->
-			<KEYWORD3>now</KEYWORD3>
-
-			<!-- PDEF command -->
-			<KEYWORD3>avg</KEYWORD3>
-			<KEYWORD3>noav</KEYWORD3>
-			<KEYWORD3>u</KEYWORD3>
-			<KEYWORD3>x</KEYWORD3>
-			<KEYWORD3>y</KEYWORD3>
-			<KEYWORD3>z</KEYWORD3>
-			<KEYWORD3>sum</KEYWORD3>
-			<KEYWORD3>rot</KEYWORD3>
-			<KEYWORD3>temp</KEYWORD3>
-			<KEYWORD3>pres</KEYWORD3>
-			<KEYWORD3>volt</KEYWORD3>
-			<KEYWORD3>mag</KEYWORD3>
-			<KEYWORD3>v</KEYWORD3>
-			<KEYWORD3>,a</KEYWORD3>
-			<KEYWORD3>curr</KEYWORD3>
-			<KEYWORD3>emf</KEYWORD3>
-			<KEYWORD3>enke</KEYWORD3>
-			<KEYWORD3>ends</KEYWORD3>
-			<KEYWORD3>xy</KEYWORD3>
-			<KEYWORD3>yz</KEYWORD3>
-			<KEYWORD3>xz</KEYWORD3>
-			<KEYWORD3>eqv</KEYWORD3>
-			<KEYWORD3>epto</KEYWORD3>
-			<KEYWORD3>epel</KEYWORD3>
-			<KEYWORD3>eppl</KEYWORD3>
-			<KEYWORD3>epcr</KEYWORD3>
-			<KEYWORD3>epth</KEYWORD3>
-			<KEYWORD3>epsw</KEYWORD3>
-			<KEYWORD3>nl</KEYWORD3>
-			<KEYWORD3>sepl</KEYWORD3>
-			<KEYWORD3>srat</KEYWORD3>
-			<KEYWORD3>hpres</KEYWORD3>
-			<KEYWORD3>epeq</KEYWORD3>
-			<KEYWORD3>psv</KEYWORD3>
-			<KEYWORD3>plwk</KEYWORD3>
-			<KEYWORD3>tg</KEYWORD3>
-			<KEYWORD3>tf</KEYWORD3>
-			<KEYWORD3>pg</KEYWORD3>
-			<KEYWORD3>ef</KEYWORD3>
-			<KEYWORD3>,d</KEYWORD3>
-			<KEYWORD3>h</KEYWORD3>
-			<KEYWORD3>b</KEYWORD3>
-			<KEYWORD3>fmag</KEYWORD3>
-			<KEYWORD3>etab</KEYWORD3>
-			<KEYWORD3>bfe</KEYWORD3>
-			<KEYWORD3>ttot</KEYWORD3>
-			<KEYWORD3>hflu</KEYWORD3>
-			<KEYWORD3>hflm</KEYWORD3>
-			<KEYWORD3>cond</KEYWORD3>
-			<KEYWORD3>pcoe</KEYWORD3>
-			<KEYWORD3>ptot</KEYWORD3>
-			<KEYWORD3>mach</KEYWORD3>
-			<KEYWORD3>strm</KEYWORD3>
-			<KEYWORD3>dens</KEYWORD3>
-			<KEYWORD3>visc</KEYWORD3>
-			<KEYWORD3>evis</KEYWORD3>
-			<KEYWORD3>cmuv</KEYWORD3>
-			<KEYWORD3>econ</KEYWORD3>
-			<KEYWORD3>yplu</KEYWORD3>
-			<KEYWORD3>tauw</KEYWORD3>
-			<KEYWORD3>spht</KEYWORD3>
-
-			<!-- PDRAG command -->
-			<KEYWORD3>x</KEYWORD3>
-			<KEYWORD3>y</KEYWORD3>
-			<KEYWORD3>z</KEYWORD3>
-
-			<!-- PEXCLUDE command -->
-			<KEYWORD3>all</KEYWORD3>
-			<KEYWORD3>stat</KEYWORD3>
-			<KEYWORD3>p</KEYWORD3>
-
-			<!-- PFACT command -->
-			<KEYWORD3>base</KEYWORD3>
-			<KEYWORD3>node</KEYWORD3>
-			<KEYWORD3>wave</KEYWORD3>
-			<KEYWORD3>spat</KEYWORD3>
-
-			<!-- PHYSICS command -->
-			<KEYWORD3>write</KEYWORD3>
-			<KEYWORD3>read</KEYWORD3>
-			<KEYWORD3>list</KEYWORD3>
-			<KEYWORD3>delete</KEYWORD3>
-			<KEYWORD3>clear</KEYWORD3>
-			<KEYWORD3>status</KEYWORD3>
-
-			<!-- PINCLUDE command -->
-			<KEYWORD3>all</KEYWORD3>
-			<KEYWORD3>stat</KEYWORD3>
-			<KEYWORD3>p</KEYWORD3>
-
-			<!-- PIVCHECK command -->
-			<KEYWORD3>on</KEYWORD3>
-			<KEYWORD3>off</KEYWORD3>
-
-			<!-- PLCONV command -->
-			<KEYWORD3>all</KEYWORD3>
-			<KEYWORD3>se</KEYWORD3>
-			<KEYWORD3>s</KEYWORD3>
-			<KEYWORD3>epel</KEYWORD3>
-			<KEYWORD3>u</KEYWORD3>
-			<KEYWORD3>rot</KEYWORD3>
-			<KEYWORD3>top</KEYWORD3>
-			<KEYWORD3>mid</KEYWORD3>
-			<KEYWORD3>bot</KEYWORD3>
-			<KEYWORD3>xy</KEYWORD3>
-			<KEYWORD3>yz</KEYWORD3>
-			<KEYWORD3>xz</KEYWORD3>
-			<KEYWORD3>int</KEYWORD3>
-			<KEYWORD3>eqv</KEYWORD3>
-			<KEYWORD3>epel</KEYWORD3>
-			<KEYWORD3>u</KEYWORD3>
-			<KEYWORD3>rot</KEYWORD3>
-
-			<!-- PLESOL command -->
-			<KEYWORD3>s</KEYWORD3>
-			<KEYWORD3>x</KEYWORD3>
-			<KEYWORD3>y</KEYWORD3>
-			<KEYWORD3>z</KEYWORD3>
-			<KEYWORD3>xy</KEYWORD3>
-			<KEYWORD3>yz</KEYWORD3>
-			<KEYWORD3>xz</KEYWORD3>
-			<KEYWORD3>int</KEYWORD3>
-			<KEYWORD3>eqv</KEYWORD3>
-			<KEYWORD3>epto</KEYWORD3>
-			<KEYWORD3>epel</KEYWORD3>
-			<KEYWORD3>eppl</KEYWORD3>
-			<KEYWORD3>epcr</KEYWORD3>
-			<KEYWORD3>epth</KEYWORD3>
-			<KEYWORD3>epsw</KEYWORD3>
-			<KEYWORD3>nl</KEYWORD3>
-			<KEYWORD3>sepl</KEYWORD3>
-			<KEYWORD3>srat</KEYWORD3>
-			<KEYWORD3>hpres</KEYWORD3>
-			<KEYWORD3>epeq</KEYWORD3>
-			<KEYWORD3>psv</KEYWORD3>
-			<KEYWORD3>plwk</KEYWORD3>
-			<KEYWORD3>cont</KEYWORD3>
-			<KEYWORD3>stat</KEYWORD3>
-			<KEYWORD3>pene</KEYWORD3>
-			<KEYWORD3>pres</KEYWORD3>
-			<KEYWORD3>sfric</KEYWORD3>
-			<KEYWORD3>stot</KEYWORD3>
-			<KEYWORD3>slide</KEYWORD3>
-			<KEYWORD3>gap</KEYWORD3>
-			<KEYWORD3>tg</KEYWORD3>
-			<KEYWORD3>tf</KEYWORD3>
-			<KEYWORD3>pg</KEYWORD3>
-			<KEYWORD3>ef</KEYWORD3>
-			<KEYWORD3>,d</KEYWORD3>
-			<KEYWORD3>h</KEYWORD3>
-			<KEYWORD3>b</KEYWORD3>
-			<KEYWORD3>fmag</KEYWORD3>
-			<KEYWORD3>serr</KEYWORD3>
-			<KEYWORD3>sdsg</KEYWORD3>
-			<KEYWORD3>terr</KEYWORD3>
-			<KEYWORD3>tdsg</KEYWORD3>
-			<KEYWORD3>,f</KEYWORD3>
-			<KEYWORD3>,m</KEYWORD3>
-			<KEYWORD3>heat</KEYWORD3>
-			<KEYWORD3>flow</KEYWORD3>
-			<KEYWORD3>amps</KEYWORD3>
-			<KEYWORD3>flux</KEYWORD3>
-			<KEYWORD3>vf</KEYWORD3>
-			<KEYWORD3>csg</KEYWORD3>
-			<KEYWORD3>sene</KEYWORD3>
-			<KEYWORD3>tene</KEYWORD3>
-			<KEYWORD3>kene</KEYWORD3>
-			<KEYWORD3>jheat</KEYWORD3>
-			<KEYWORD3>js</KEYWORD3>
-			<KEYWORD3>jt</KEYWORD3>
-			<KEYWORD3>mre</KEYWORD3>
-			<KEYWORD3>volu</KEYWORD3>
-			<KEYWORD3>cent</KEYWORD3>
-			<KEYWORD3>bfe</KEYWORD3>
-			<KEYWORD3>temp</KEYWORD3>
-			<KEYWORD3>smisc</KEYWORD3>
-			<KEYWORD3>nmisc</KEYWORD3>
-			<KEYWORD3>topo</KEYWORD3>
-
-			<!-- PLETAB command -->
-			<KEYWORD3>noav</KEYWORD3>
-			<KEYWORD3>avg</KEYWORD3>
-
-			<!-- PLNSOL command -->
-			<KEYWORD3>u</KEYWORD3>
-			<KEYWORD3>x</KEYWORD3>
-			<KEYWORD3>y</KEYWORD3>
-			<KEYWORD3>z</KEYWORD3>
-			<KEYWORD3>sum</KEYWORD3>
-			<KEYWORD3>rot</KEYWORD3>
-			<KEYWORD3>temp</KEYWORD3>
-			<KEYWORD3>pres</KEYWORD3>
-			<KEYWORD3>volt</KEYWORD3>
-			<KEYWORD3>mag</KEYWORD3>
-			<KEYWORD3>v</KEYWORD3>
-			<KEYWORD3>y</KEYWORD3>
-			<KEYWORD3>enke</KEYWORD3>
-			<KEYWORD3>ends</KEYWORD3>
-			<KEYWORD3>sp01</KEYWORD3>
-			<KEYWORD3>sp02</KEYWORD3>
-			<KEYWORD3>sp03</KEYWORD3>
-			<KEYWORD3>sp04</KEYWORD3>
-			<KEYWORD3>sp05</KEYWORD3>
-			<KEYWORD3>sp06</KEYWORD3>
-			<KEYWORD3>s</KEYWORD3>
-			<KEYWORD3>int</KEYWORD3>
-			<KEYWORD3>eqv</KEYWORD3>
-			<KEYWORD3>epto</KEYWORD3>
-			<KEYWORD3>xy</KEYWORD3>
-			<KEYWORD3>yz</KEYWORD3>
-			<KEYWORD3>xz</KEYWORD3>
-			<KEYWORD3>epel</KEYWORD3>
-			<KEYWORD3>eppl</KEYWORD3>
-			<KEYWORD3>epcr</KEYWORD3>
-			<KEYWORD3>epth</KEYWORD3>
-			<KEYWORD3>epsw</KEYWORD3>
-			<KEYWORD3>nl</KEYWORD3>
-			<KEYWORD3>sepl</KEYWORD3>
-			<KEYWORD3>srat</KEYWORD3>
-			<KEYWORD3>hpres</KEYWORD3>
-			<KEYWORD3>epeq</KEYWORD3>
-			<KEYWORD3>psv</KEYWORD3>
-			<KEYWORD3>plwk</KEYWORD3>
-			<KEYWORD3>cont</KEYWORD3>
-			<KEYWORD3>stat</KEYWORD3>
-			<KEYWORD3>pene</KEYWORD3>
-			<KEYWORD3>pres</KEYWORD3>
-			<KEYWORD3>sfric</KEYWORD3>
-			<KEYWORD3>stot</KEYWORD3>
-			<KEYWORD3>slide</KEYWORD3>
-			<KEYWORD3>gap</KEYWORD3>
-			<KEYWORD3>tg</KEYWORD3>
-			<KEYWORD3>tf</KEYWORD3>
-			<KEYWORD3>pg</KEYWORD3>
-			<KEYWORD3>ef</KEYWORD3>
-			<KEYWORD3>,d</KEYWORD3>
-			<KEYWORD3>h</KEYWORD3>
-			<KEYWORD3>b</KEYWORD3>
-			<KEYWORD3>fmag</KEYWORD3>
-			<KEYWORD3>bfe</KEYWORD3>
-			<KEYWORD3>temp</KEYWORD3>
-			<KEYWORD3>topo</KEYWORD3>
-			<KEYWORD3>ttot</KEYWORD3>
-			<KEYWORD3>hflu</KEYWORD3>
-			<KEYWORD3>hflm</KEYWORD3>
-			<KEYWORD3>cond</KEYWORD3>
-			<KEYWORD3>pcoe</KEYWORD3>
-			<KEYWORD3>ptot</KEYWORD3>
-			<KEYWORD3>mach</KEYWORD3>
-			<KEYWORD3>strm</KEYWORD3>
-			<KEYWORD3>dens</KEYWORD3>
-			<KEYWORD3>visc</KEYWORD3>
-			<KEYWORD3>spht</KEYWORD3>
-			<KEYWORD3>evis</KEYWORD3>
-			<KEYWORD3>cmuv</KEYWORD3>
-			<KEYWORD3>econ</KEYWORD3>
-			<KEYWORD3>yplu</KEYWORD3>
-			<KEYWORD3>tauw</KEYWORD3>
-			<KEYWORD3>lmd1</KEYWORD3>
-			<KEYWORD3>lmd2</KEYWORD3>
-			<KEYWORD3>lmd3</KEYWORD3>
-			<KEYWORD3>lmd4</KEYWORD3>
-			<KEYWORD3>lmd5</KEYWORD3>
-			<KEYWORD3>lmd6</KEYWORD3>
-			<KEYWORD3>emd1</KEYWORD3>
-			<KEYWORD3>emd2</KEYWORD3>
-			<KEYWORD3>emd3</KEYWORD3>
-			<KEYWORD3>emd4</KEYWORD3>
-			<KEYWORD3>emd5</KEYWORD3>
-			<KEYWORD3>emd6</KEYWORD3>
-
-			<!-- /PLOPTS command -->
-			<KEYWORD3>leg1</KEYWORD3>
-			<KEYWORD3>leg2</KEYWORD3>
-			<KEYWORD3>info</KEYWORD3>
-			<KEYWORD3>frame</KEYWORD3>
-			<KEYWORD3>title</KEYWORD3>
-			<KEYWORD3>minm</KEYWORD3>
-			<KEYWORD3>logo</KEYWORD3>
-			<KEYWORD3>wins</KEYWORD3>
-			<KEYWORD3>wp</KEYWORD3>
-			<KEYWORD3>off</KEYWORD3>
-			<KEYWORD3>on</KEYWORD3>
-			<KEYWORD3>auto</KEYWORD3>
-
-			<!-- PLOT command -->
-			<KEYWORD3>all</KEYWORD3>
-
-			<!-- PLPAGM command -->
-			<KEYWORD3>node</KEYWORD3>
-
-			<!-- PLPATH command -->
-			<KEYWORD3>xg</KEYWORD3>
-			<KEYWORD3>yg</KEYWORD3>
-			<KEYWORD3>zg</KEYWORD3>
-			<KEYWORD3>s</KEYWORD3>
-
-			<!-- PLSECT command -->
-			<KEYWORD3>s</KEYWORD3>
-			<KEYWORD3>x</KEYWORD3>
-			<KEYWORD3>y</KEYWORD3>
-			<KEYWORD3>z</KEYWORD3>
-			<KEYWORD3>xy</KEYWORD3>
-			<KEYWORD3>yz</KEYWORD3>
-			<KEYWORD3>xz</KEYWORD3>
-			<KEYWORD3>int</KEYWORD3>
-			<KEYWORD3>eqv</KEYWORD3>
-
-			<!-- PLTRAC command -->
-			<KEYWORD3>fluid</KEYWORD3>
-			<KEYWORD3>elec</KEYWORD3>
-			<KEYWORD3>magn</KEYWORD3>
-			<KEYWORD3>temp</KEYWORD3>
-			<KEYWORD3>pres</KEYWORD3>
-			<KEYWORD3>v</KEYWORD3>
-			<KEYWORD3>x</KEYWORD3>
-			<KEYWORD3>y</KEYWORD3>
-			<KEYWORD3>z</KEYWORD3>
-			<KEYWORD3>sum</KEYWORD3>
-			<KEYWORD3>enke</KEYWORD3>
-			<KEYWORD3>ends</KEYWORD3>
-			<KEYWORD3>ttot</KEYWORD3>
-			<KEYWORD3>cond</KEYWORD3>
-			<KEYWORD3>pcoe</KEYWORD3>
-			<KEYWORD3>ptot</KEYWORD3>
-			<KEYWORD3>mach</KEYWORD3>
-			<KEYWORD3>strm</KEYWORD3>
-			<KEYWORD3>dens</KEYWORD3>
-			<KEYWORD3>visc</KEYWORD3>
-			<KEYWORD3>spht</KEYWORD3>
-			<KEYWORD3>evis</KEYWORD3>
-			<KEYWORD3>cmuv</KEYWORD3>
-			<KEYWORD3>econ</KEYWORD3>
-			<KEYWORD3>volt</KEYWORD3>
-
-			<!-- PLVECT command -->
-			<KEYWORD3>rast</KEYWORD3>
-			<KEYWORD3>vect</KEYWORD3>
-			<KEYWORD3>elem</KEYWORD3>
-			<KEYWORD3>node</KEYWORD3>
-			<KEYWORD3>off</KEYWORD3>
-			<KEYWORD3>on</KEYWORD3>
-			<KEYWORD3>u</KEYWORD3>
-			<KEYWORD3>rot</KEYWORD3>
-			<KEYWORD3>v</KEYWORD3>
-			<KEYWORD3>,a</KEYWORD3>
-			<KEYWORD3>s</KEYWORD3>
-			<KEYWORD3>epto</KEYWORD3>
-			<KEYWORD3>epel</KEYWORD3>
-			<KEYWORD3>eppl</KEYWORD3>
-			<KEYWORD3>epcr</KEYWORD3>
-			<KEYWORD3>epth</KEYWORD3>
-			<KEYWORD3>tg</KEYWORD3>
-			<KEYWORD3>tf</KEYWORD3>
-			<KEYWORD3>pg</KEYWORD3>
-			<KEYWORD3>ef</KEYWORD3>
-			<KEYWORD3>,d</KEYWORD3>
-			<KEYWORD3>h</KEYWORD3>
-			<KEYWORD3>b</KEYWORD3>
-			<KEYWORD3>fmag</KEYWORD3>
-			<KEYWORD3>js</KEYWORD3>
-			<KEYWORD3>jt</KEYWORD3>
-
-			<!-- PMAP command -->
-			<KEYWORD3>uniform</KEYWORD3>
-			<KEYWORD3>accurate</KEYWORD3>
-
-			<!-- /PMETH command -->
-			<KEYWORD3>on</KEYWORD3>
-			<KEYWORD3>off</KEYWORD3>
-			<KEYWORD3>stat</KEYWORD3>
-
-			<!-- /PNUM command -->
-			<KEYWORD3>node</KEYWORD3>
-			<KEYWORD3>elem</KEYWORD3>
-			<KEYWORD3>,mat</KEYWORD3>
-			<KEYWORD3>,type</KEYWORD3>
-			<KEYWORD3>,real</KEYWORD3>
-			<KEYWORD3>,esys</KEYWORD3>
-			<KEYWORD3>loc</KEYWORD3>
-			<KEYWORD3>kp</KEYWORD3>
-			<KEYWORD3>line</KEYWORD3>
-			<KEYWORD3>area</KEYWORD3>
-			<KEYWORD3>volu</KEYWORD3>
-			<KEYWORD3>sval</KEYWORD3>
-			<KEYWORD3>tabnam</KEYWORD3>
-			<KEYWORD3>off</KEYWORD3>
-			<KEYWORD3>on</KEYWORD3>
-
-			<!-- POPT command -->
-			<KEYWORD3>b31.1</KEYWORD3>
-			<KEYWORD3>nc</KEYWORD3>
-
-			<!-- PORTOPT command -->
-			<KEYWORD3>coax</KEYWORD3>
-			<KEYWORD3>te10</KEYWORD3>
-			<KEYWORD3>te11circ</KEYWORD3>
-			<KEYWORD3>tm01circ</KEYWORD3>
-
-			<!-- PPATH command -->
-			<KEYWORD3>pick</KEYWORD3>
-
-			<!-- PRED command -->
-			<KEYWORD3>off</KEYWORD3>
-			<KEYWORD3>on</KEYWORD3>
-
-			<!-- PRESOL command -->
-			<KEYWORD3>s</KEYWORD3>
-			<KEYWORD3>epto</KEYWORD3>
-			<KEYWORD3>epel</KEYWORD3>
-			<KEYWORD3>eppl</KEYWORD3>
-			<KEYWORD3>epcr</KEYWORD3>
-			<KEYWORD3>epsw</KEYWORD3>
-			<KEYWORD3>nl</KEYWORD3>
-			<KEYWORD3>cont</KEYWORD3>
-			<KEYWORD3>tg</KEYWORD3>
-			<KEYWORD3>tf</KEYWORD3>
-			<KEYWORD3>pg</KEYWORD3>
-			<KEYWORD3>ef</KEYWORD3>
-			<KEYWORD3>,d</KEYWORD3>
-			<KEYWORD3>h</KEYWORD3>
-			<KEYWORD3>b</KEYWORD3>
-			<KEYWORD3>fmag</KEYWORD3>
-			<KEYWORD3>,f</KEYWORD3>
-			<KEYWORD3>,m</KEYWORD3>
-			<KEYWORD3>heat</KEYWORD3>
-			<KEYWORD3>flow</KEYWORD3>
-			<KEYWORD3>amps</KEYWORD3>
-			<KEYWORD3>flux</KEYWORD3>
-			<KEYWORD3>vf</KEYWORD3>
-			<KEYWORD3>csg</KEYWORD3>
-			<KEYWORD3>forc</KEYWORD3>
-			<KEYWORD3>bfe</KEYWORD3>
-			<KEYWORD3>elem</KEYWORD3>
-			<KEYWORD3>serr</KEYWORD3>
-			<KEYWORD3>sdsg</KEYWORD3>
-			<KEYWORD3>terr</KEYWORD3>
-			<KEYWORD3>tdsg</KEYWORD3>
-			<KEYWORD3>sene</KEYWORD3>
-			<KEYWORD3>tene</KEYWORD3>
-			<KEYWORD3>kene</KEYWORD3>
-			<KEYWORD3>jheat</KEYWORD3>
-			<KEYWORD3>js</KEYWORD3>
-			<KEYWORD3>jt</KEYWORD3>
-			<KEYWORD3>mre</KEYWORD3>
-			<KEYWORD3>volu</KEYWORD3>
-			<KEYWORD3>cent</KEYWORD3>
-			<KEYWORD3>smisc</KEYWORD3>
-			<KEYWORD3>nmisc</KEYWORD3>
-			<KEYWORD3>topo</KEYWORD3>
-
-			<!-- PRNLD, PRRFOR, PRRSOL commands -->
-			<KEYWORD3>fx</KEYWORD3>
-			<KEYWORD3>fy</KEYWORD3>
-			<KEYWORD3>fz</KEYWORD3>
-			<KEYWORD3>,f</KEYWORD3>
-			<KEYWORD3>mx</KEYWORD3>
-			<KEYWORD3>ym</KEYWORD3>
-			<KEYWORD3>mz</KEYWORD3>
-			<KEYWORD3>,m</KEYWORD3>
-			<KEYWORD3>heat</KEYWORD3>
-			<KEYWORD3>flow</KEYWORD3>
-			<KEYWORD3>vfx</KEYWORD3>
-			<KEYWORD3>vfy</KEYWORD3>
-			<KEYWORD3>vfz</KEYWORD3>
-			<KEYWORD3>vf</KEYWORD3>
-			<KEYWORD3>amps</KEYWORD3>
-			<KEYWORD3>curt</KEYWORD3>
-			<KEYWORD3>vltg</KEYWORD3>
-			<KEYWORD3>flux</KEYWORD3>
-			<KEYWORD3>csgx</KEYWORD3>
-			<KEYWORD3>csgy</KEYWORD3>
-			<KEYWORD3>csgz</KEYWORD3>
-			<KEYWORD3>csg</KEYWORD3>
-
-			<!-- PRNSOL, PRSSOL commands -->
-			<KEYWORD3>u</KEYWORD3>
-			<KEYWORD3>x</KEYWORD3>
-			<KEYWORD3>y</KEYWORD3>
-			<KEYWORD3>z</KEYWORD3>
-			<KEYWORD3>comp</KEYWORD3>
-			<KEYWORD3>rot</KEYWORD3>
-			<KEYWORD3>temp</KEYWORD3>
-			<KEYWORD3>pres</KEYWORD3>
-			<KEYWORD3>volt</KEYWORD3>
-			<KEYWORD3>mag</KEYWORD3>
-			<KEYWORD3>v</KEYWORD3>
-			<KEYWORD3>,a</KEYWORD3>
-			<KEYWORD3>curr</KEYWORD3>
-			<KEYWORD3>emf</KEYWORD3>
-			<KEYWORD3>enke</KEYWORD3>
-			<KEYWORD3>ends</KEYWORD3>
-			<KEYWORD3>sp01</KEYWORD3>
-			<KEYWORD3>sp02</KEYWORD3>
-			<KEYWORD3>sp03</KEYWORD3>
-			<KEYWORD3>sp04</KEYWORD3>
-			<KEYWORD3>sp05</KEYWORD3>
-			<KEYWORD3>sp06</KEYWORD3>
-			<KEYWORD3>dof</KEYWORD3>
-
-			<KEYWORD3>s</KEYWORD3>
-			<KEYWORD3>comp</KEYWORD3>
-			<KEYWORD3>prin</KEYWORD3>
-			<KEYWORD3>epto</KEYWORD3>
-			<KEYWORD3>epel</KEYWORD3>
-			<KEYWORD3>eppl</KEYWORD3>
-			<KEYWORD3>epcr</KEYWORD3>
-			<KEYWORD3>epth</KEYWORD3>
-			<KEYWORD3>epsw</KEYWORD3>
-			<KEYWORD3>nl</KEYWORD3>
-			<KEYWORD3>cont</KEYWORD3>
-			<KEYWORD3>tg</KEYWORD3>
-			<KEYWORD3>tf</KEYWORD3>
-			<KEYWORD3>pg</KEYWORD3>
-			<KEYWORD3>ef</KEYWORD3>
-			<KEYWORD3>,d</KEYWORD3>
-			<KEYWORD3>h</KEYWORD3>
-			<KEYWORD3>b</KEYWORD3>
-			<KEYWORD3>fmag</KEYWORD3>
-			<KEYWORD3>bfe</KEYWORD3>
-			<KEYWORD3>topo</KEYWORD3>
-
-			<KEYWORD3>ttot</KEYWORD3>
-			<KEYWORD3>hflu</KEYWORD3>
-			<KEYWORD3>hflm</KEYWORD3>
-			<KEYWORD3>cond</KEYWORD3>
-			<KEYWORD3>pcoe</KEYWORD3>
-			<KEYWORD3>ptot</KEYWORD3>
-			<KEYWORD3>mach</KEYWORD3>
-			<KEYWORD3>strm</KEYWORD3>
-			<KEYWORD3>dens</KEYWORD3>
-			<KEYWORD3>visc</KEYWORD3>
-			<KEYWORD3>spht</KEYWORD3>
-			<KEYWORD3>evis</KEYWORD3>
-			<KEYWORD3>cmuv</KEYWORD3>
-			<KEYWORD3>econ</KEYWORD3>
-			<KEYWORD3>yplu</KEYWORD3>
-			<KEYWORD3>tauw</KEYWORD3>
-			<KEYWORD3>lmd</KEYWORD3>
-			<KEYWORD3>emd</KEYWORD3>
-
-			<!-- PRVECT command -->
-			<KEYWORD3>u</KEYWORD3>
-			<KEYWORD3>rot</KEYWORD3>
-			<KEYWORD3>v</KEYWORD3>
-			<KEYWORD3>,a</KEYWORD3>
-			<KEYWORD3>s</KEYWORD3>
-			<KEYWORD3>epto</KEYWORD3>
-			<KEYWORD3>epel</KEYWORD3>
-			<KEYWORD3>eppl</KEYWORD3>
-			<KEYWORD3>epcr</KEYWORD3>
-			<KEYWORD3>epth</KEYWORD3>
-			<KEYWORD3>tg</KEYWORD3>
-			<KEYWORD3>tf</KEYWORD3>
-			<KEYWORD3>pg</KEYWORD3>
-			<KEYWORD3>ef</KEYWORD3>
-			<KEYWORD3>,d</KEYWORD3>
-			<KEYWORD3>h</KEYWORD3>
-			<KEYWORD3>b</KEYWORD3>
-			<KEYWORD3>fmag</KEYWORD3>
-			<KEYWORD3>js</KEYWORD3>
-			<KEYWORD3>jt</KEYWORD3>
-
-			<!-- PSCR command -->
-			<KEYWORD3>cmap</KEYWORD3>
-			<KEYWORD3>lwid</KEYWORD3>
-			<KEYWORD3>color</KEYWORD3>
-			<KEYWORD3>tranx</KEYWORD3>
-			<KEYWORD3>trany</KEYWORD3>
-			<KEYWORD3>rotate</KEYWORD3>
-			<KEYWORD3>scale</KEYWORD3>
-			<KEYWORD3>tiff</KEYWORD3>
-			<KEYWORD3>epsi</KEYWORD3>
-
-			<!-- PSDRES command -->
-			<KEYWORD3>disp</KEYWORD3>
-			<KEYWORD3>velo</KEYWORD3>
-			<KEYWORD3>acel</KEYWORD3>
-			<KEYWORD3>rel</KEYWORD3>
-			<KEYWORD3>abs</KEYWORD3>
-			<KEYWORD3>off</KEYWORD3>
-
-			<!-- PSDUNIT command -->
-			<KEYWORD3>disp</KEYWORD3>
-			<KEYWORD3>velo</KEYWORD3>
-			<KEYWORD3>acel</KEYWORD3>
-			<KEYWORD3>accg</KEYWORD3>
-			<KEYWORD3>forc</KEYWORD3>
-			<KEYWORD3>pres</KEYWORD3>
-
-			<!-- /PSEARCH command -->
-			<KEYWORD3>off</KEYWORD3>
-
-			<!-- PSEL command -->
-			<KEYWORD3>s</KEYWORD3>
-			<KEYWORD3>,r</KEYWORD3>
-			<KEYWORD3>,a</KEYWORD3>
-			<KEYWORD3>u</KEYWORD3>
-			<KEYWORD3>all</KEYWORD3>
-			<KEYWORD3>none</KEYWORD3>
-			<KEYWORD3>inv</KEYWORD3>
-
-			<!-- /PSF command -->
-			<KEYWORD3>pres</KEYWORD3>
-			<KEYWORD3>norm</KEYWORD3>
-			<KEYWORD3>tanx</KEYWORD3>
-			<KEYWORD3>tany</KEYWORD3>
-			<KEYWORD3>conv</KEYWORD3>
-			<KEYWORD3>hcoef</KEYWORD3>
-			<KEYWORD3>tbulk</KEYWORD3>
-			<KEYWORD3>rad</KEYWORD3>
-			<KEYWORD3>emis</KEYWORD3>
-			<KEYWORD3>tamb</KEYWORD3>
-			<KEYWORD3>hflux</KEYWORD3>
-			<KEYWORD3>fsi</KEYWORD3>
-			<KEYWORD3>impd</KEYWORD3>
-			<KEYWORD3>shld</KEYWORD3>
-			<KEYWORD3>cond</KEYWORD3>
-			<KEYWORD3>mur</KEYWORD3>
-			<KEYWORD3>mxwf</KEYWORD3>
-			<KEYWORD3>inf</KEYWORD3>
-			<KEYWORD3>chrgs</KEYWORD3>
-			<KEYWORD3>mci</KEYWORD3>
-
-			<!-- PSOLVE command -->
-			<KEYWORD3>cgsol</KEYWORD3>
-			<KEYWORD3>eigdamp</KEYWORD3>
-			<KEYWORD3>eigexp</KEYWORD3>
-			<KEYWORD3>eigfull</KEYWORD3>
-			<KEYWORD3>eigreduc</KEYWORD3>
-			<KEYWORD3>eigunsym</KEYWORD3>
-			<KEYWORD3>elform</KEYWORD3>
-			<KEYWORD3>elprep</KEYWORD3>
-			<KEYWORD3>redwrite</KEYWORD3>
-			<KEYWORD3>triang</KEYWORD3>
-
-			<!-- PSPRNG command -->
-			<KEYWORD3>tran</KEYWORD3>
-			<KEYWORD3>rot</KEYWORD3>
-
-			<!-- PSTRES command -->
-			<KEYWORD3>off</KEYWORD3>
-			<KEYWORD3>on</KEYWORD3>
-
-			<!-- /PSYMB command -->
-			<KEYWORD3>cs</KEYWORD3>
-			<KEYWORD3>ndir</KEYWORD3>
-			<KEYWORD3>,esys</KEYWORD3>
-			<KEYWORD3>ldir</KEYWORD3>
-			<KEYWORD3>layr</KEYWORD3>
-			<KEYWORD3>pcon</KEYWORD3>
-			<KEYWORD3>econ</KEYWORD3>
-			<KEYWORD3>dot</KEYWORD3>
-			<KEYWORD3>xnod</KEYWORD3>
-			<KEYWORD3>defa</KEYWORD3>
-			<KEYWORD3>stat</KEYWORD3>
-
-			<!-- PTEMP command -->
-			<KEYWORD3>none</KEYWORD3>
-
-			<!-- PTXY command -->
-			<KEYWORD3>stat</KEYWORD3>
-			<KEYWORD3>dele</KEYWORD3>
-
-			<!-- PUNIT command -->
-			<KEYWORD3>ftin</KEYWORD3>
-			<KEYWORD3>metric</KEYWORD3>
-
-			<!-- PVECT command -->
-			<KEYWORD3>norm</KEYWORD3>
-			<KEYWORD3>tang</KEYWORD3>
-			<KEYWORD3>radi</KEYWORD3>
-
-			<!-- QUAD command -->
-			<KEYWORD3>p</KEYWORD3>
-
-			<!-- /RATIO command -->
-			<KEYWORD3>all</KEYWORD3>
-
-			<!-- RBE3 command -->
-			<KEYWORD3>ux</KEYWORD3>
-			<KEYWORD3>uy</KEYWORD3>
-			<KEYWORD3>uz</KEYWORD3>
-			<KEYWORD3>rotx</KEYWORD3>
-			<KEYWORD3>roty</KEYWORD3>
-			<KEYWORD3>rotz</KEYWORD3>
-			<KEYWORD3>uxyz</KEYWORD3>
-			<KEYWORD3>rxyz</KEYWORD3>
-			<KEYWORD3>all</KEYWORD3>
-
-			<!-- RDELE command -->
-			<KEYWORD3>all</KEYWORD3>
-
-			<!-- /REPLOT command -->
-			<KEYWORD3>resize</KEYWORD3>
-			<KEYWORD3>fast</KEYWORD3>
-
-			<!-- REXPORT command -->
-			<KEYWORD3>off</KEYWORD3>
-			<KEYWORD3>dyna</KEYWORD3>
-
-			<!-- RFORCE command -->
-			<KEYWORD3>p</KEYWORD3>
-			<KEYWORD3>,f</KEYWORD3>
-			<KEYWORD3>x</KEYWORD3>
-			<KEYWORD3>y</KEYWORD3>
-			<KEYWORD3>z</KEYWORD3>
-			<KEYWORD3>,m</KEYWORD3>
-			<KEYWORD3>heat</KEYWORD3>
-			<KEYWORD3>flow</KEYWORD3>
-			<KEYWORD3>amps</KEYWORD3>
-			<KEYWORD3>flux</KEYWORD3>
-			<KEYWORD3>vf</KEYWORD3>
-			<KEYWORD3>csg</KEYWORD3>
-			<KEYWORD3>vltg</KEYWORD3>
-			<KEYWORD3>durt</KEYWORD3>
-
-			<!-- /RGB command -->
-			<KEYWORD3>index</KEYWORD3>
-			<KEYWORD3>cntr</KEYWORD3>
-
-			<!-- RIGID command -->
-			<KEYWORD3>all</KEYWORD3>
-			<KEYWORD3>ux</KEYWORD3>
-			<KEYWORD3>uy</KEYWORD3>
-			<KEYWORD3>uz</KEYWORD3>
-			<KEYWORD3>rotx</KEYWORD3>
-			<KEYWORD3>roty</KEYWORD3>
-			<KEYWORD3>rotz</KEYWORD3>
-			<KEYWORD3>none</KEYWORD3>
-			<KEYWORD3>all</KEYWORD3>
-
-			<!-- RIMPORT command -->
-			<KEYWORD3>off</KEYWORD3>
-			<KEYWORD3>dyna</KEYWORD3>
-			<KEYWORD3>elem</KEYWORD3>
-			<KEYWORD3>stress</KEYWORD3>
-
-			<!-- RLIST command -->
-			<KEYWORD3>all</KEYWORD3>
-
-			<!-- RSYS command -->
-			<KEYWORD3>solu</KEYWORD3>
-
-			<!-- SARPLOT command -->
-			<KEYWORD3>factor</KEYWORD3>
-			<KEYWORD3>area</KEYWORD3>
-			<KEYWORD3>narrow</KEYWORD3>
-
-			<!-- /SECLIB command -->
-			<KEYWORD3>read</KEYWORD3>
-			<KEYWORD3>status</KEYWORD3>
-
-			<!-- SECOFFSET command -->
-			<KEYWORD3>cent</KEYWORD3>
-			<KEYWORD3>shrc</KEYWORD3>
-			<KEYWORD3>origin</KEYWORD3>
-			<KEYWORD3>user</KEYWORD3>
-
-			<!-- SECREAD, SECWRITE commands -->
-			<KEYWORD3>library</KEYWORD3>
-			<KEYWORD3>mesh</KEYWORD3>
-
-			<!-- SECTYPE command -->
-			<KEYWORD3>beam</KEYWORD3>
-			<KEYWORD3>rect</KEYWORD3>
-			<KEYWORD3>quad</KEYWORD3>
-			<KEYWORD3>csolid</KEYWORD3>
-			<KEYWORD3>ctube</KEYWORD3>
-			<KEYWORD3>chan</KEYWORD3>
-			<KEYWORD3>i</KEYWORD3>
-			<KEYWORD3>z</KEYWORD3>
-			<KEYWORD3>,l</KEYWORD3>
-			<KEYWORD3>t</KEYWORD3>
-			<KEYWORD3>hats</KEYWORD3>
-			<KEYWORD3>hrec</KEYWORD3>
-			<KEYWORD3>asec</KEYWORD3>
-			<KEYWORD3>mesh</KEYWORD3>
-
-			<!-- SEDLIST command -->
-			<KEYWORD3>all</KEYWORD3>
-
-			<!-- SEEXP command -->
-			<KEYWORD3>off</KEYWORD3>
-			<KEYWORD3>on</KEYWORD3>
-
-			<!-- /SEG command -->
-			<KEYWORD3>singl</KEYWORD3>
-			<KEYWORD3>multi</KEYWORD3>
-			<KEYWORD3>delet</KEYWORD3>
-			<KEYWORD3>off</KEYWORD3>
-			<KEYWORD3>stat</KEYWORD3>
-			<KEYWORD3>pc</KEYWORD3>
-
-			<!-- SESYMM command -->
-			<KEYWORD3>x</KEYWORD3>
-			<KEYWORD3>y</KEYWORD3>
-			<KEYWORD3>z</KEYWORD3>
-
-			<!-- *SET command -->
-
-			<!-- SET command -->
-			<KEYWORD3>first</KEYWORD3>
-			<KEYWORD3>last</KEYWORD3>
-			<KEYWORD3>next</KEYWORD3>
-			<KEYWORD3>near</KEYWORD3>
-			<KEYWORD3>list</KEYWORD3>
-			<KEYWORD3>none</KEYWORD3>
-
-			<!-- SF command -->
-			<KEYWORD3>all</KEYWORD3>
-			<KEYWORD3>p</KEYWORD3>
-			<KEYWORD3>pres</KEYWORD3>
-			<KEYWORD3>conv</KEYWORD3>
-			<KEYWORD3>hflux</KEYWORD3>
-			<KEYWORD3>rad</KEYWORD3>
-			<KEYWORD3>fsi</KEYWORD3>
-			<KEYWORD3>impd</KEYWORD3>
-			<KEYWORD3>ptot</KEYWORD3>
-			<KEYWORD3>mxwf</KEYWORD3>
-			<KEYWORD3>mci</KEYWORD3>
-			<KEYWORD3>chrgs</KEYWORD3>
-			<KEYWORD3>inf</KEYWORD3>
-			<KEYWORD3>port</KEYWORD3>
-			<KEYWORD3>shld</KEYWORD3>
-
-			<!-- SFA command -->
-			<KEYWORD3>all</KEYWORD3>
-			<KEYWORD3>p</KEYWORD3>
-			<KEYWORD3>pres</KEYWORD3>
-			<KEYWORD3>conv</KEYWORD3>
-			<KEYWORD3>hflux</KEYWORD3>
-			<KEYWORD3>rad</KEYWORD3>
-			<KEYWORD3>fsi</KEYWORD3>
-			<KEYWORD3>impd</KEYWORD3>
-			<KEYWORD3>mxwf</KEYWORD3>
-			<KEYWORD3>mci</KEYWORD3>
-			<KEYWORD3>mxwf</KEYWORD3>
-			<KEYWORD3>chrgs</KEYWORD3>
-			<KEYWORD3>inf</KEYWORD3>
-			<KEYWORD3>port</KEYWORD3>
-			<KEYWORD3>shld</KEYWORD3>
-
-			<!-- SFACT command -->
-			<KEYWORD3>,sf</KEYWORD3>
-			<KEYWORD3>ms</KEYWORD3>
-
-			<!-- SFADELE, SFALIST, SFBEAM commands -->
-			<KEYWORD3>all</KEYWORD3>
-			<KEYWORD3>p</KEYWORD3>
-
-			<!-- SFCUM command -->
-			<KEYWORD3>all</KEYWORD3>
-			<KEYWORD3>pres</KEYWORD3>
-			<KEYWORD3>conv</KEYWORD3>
-			<KEYWORD3>hflux</KEYWORD3>
-			<KEYWORD3>selv</KEYWORD3>
-			<KEYWORD3>chrgs</KEYWORD3>
-			<KEYWORD3>mxwf</KEYWORD3>
-			<KEYWORD3>inf</KEYWORD3>
-			<KEYWORD3>repl</KEYWORD3>
-			<KEYWORD3>add</KEYWORD3>
-			<KEYWORD3>igno</KEYWORD3>
-			<KEYWORD3>stat</KEYWORD3>
-
-			<!-- SFDELE command -->
-			<KEYWORD3>all</KEYWORD3>
-			<KEYWORD3>p</KEYWORD3>
-			<KEYWORD3>pres</KEYWORD3>
-			<KEYWORD3>conv</KEYWORD3>
-			<KEYWORD3>hflux</KEYWORD3>
-			<KEYWORD3>rad</KEYWORD3>
-			<KEYWORD3>mxwf</KEYWORD3>
-			<KEYWORD3>chrgs</KEYWORD3>
-			<KEYWORD3>mci</KEYWORD3>
-			<KEYWORD3>inf</KEYWORD3>
-			<KEYWORD3>selv</KEYWORD3>
-			<KEYWORD3>fsi</KEYWORD3>
-			<KEYWORD3>impd</KEYWORD3>
-			<KEYWORD3>port</KEYWORD3>
-			<KEYWORD3>shld</KEYWORD3>
-
-			<!-- SFE, SFEDELE, SFELIST commands -->
-			<KEYWORD3>all</KEYWORD3>
-			<KEYWORD3>p</KEYWORD3>
-			<KEYWORD3>pres</KEYWORD3>
-			<KEYWORD3>conv</KEYWORD3>
-			<KEYWORD3>hflux</KEYWORD3>
-			<KEYWORD3>rad</KEYWORD3>
-			<KEYWORD3>mxwf</KEYWORD3>
-			<KEYWORD3>chrgs</KEYWORD3>
-			<KEYWORD3>mci</KEYWORD3>
-			<KEYWORD3>inf</KEYWORD3>
-			<KEYWORD3>selv</KEYWORD3>
-			<KEYWORD3>fsi</KEYWORD3>
-			<KEYWORD3>impd</KEYWORD3>
-			<KEYWORD3>port</KEYWORD3>
-			<KEYWORD3>shld</KEYWORD3>
-
-			<!-- SFFUN, SFGRAD commands -->
-			<KEYWORD3>pres</KEYWORD3>
-			<KEYWORD3>conv</KEYWORD3>
-			<KEYWORD3>hflux</KEYWORD3>
-			<KEYWORD3>chrgs</KEYWORD3>
-			<KEYWORD3>status</KEYWORD3>
-			<KEYWORD3>x</KEYWORD3>
-			<KEYWORD3>y</KEYWORD3>
-			<KEYWORD3>z</KEYWORD3>
-
-			<!-- SFL, SFLDELE, SFLIST, SFLLIST, SFSCALE commands -->
-			<KEYWORD3>all</KEYWORD3>
-			<KEYWORD3>p</KEYWORD3>
-			<KEYWORD3>pres</KEYWORD3>
-			<KEYWORD3>conv</KEYWORD3>
-			<KEYWORD3>hflux</KEYWORD3>
-			<KEYWORD3>rad</KEYWORD3>
-			<KEYWORD3>fsi</KEYWORD3>
-			<KEYWORD3>impd</KEYWORD3>
-			<KEYWORD3>mci</KEYWORD3>
-			<KEYWORD3>mxwf</KEYWORD3>
-			<KEYWORD3>chrgs</KEYWORD3>
-			<KEYWORD3>inf</KEYWORD3>
-			<KEYWORD3>port</KEYWORD3>
-			<KEYWORD3>shdl</KEYWORD3>
-			<KEYWORD3>selv</KEYWORD3>
-
-			<!-- /SHADE command -->
-			<KEYWORD3>facet</KEYWORD3>
-			<KEYWORD3>gouraud</KEYWORD3>
-			<KEYWORD3>phong</KEYWORD3>
-
-			<!-- SHELL command -->
-			<KEYWORD3>top</KEYWORD3>
-			<KEYWORD3>mid</KEYWORD3>
-			<KEYWORD3>bot</KEYWORD3>
-
-			<!-- /SHOW command -->
-			<KEYWORD3>term</KEYWORD3>
-			<KEYWORD3>file</KEYWORD3>
-			<KEYWORD3>off</KEYWORD3>
-			<KEYWORD3>pscr</KEYWORD3>
-			<KEYWORD3>hpgl</KEYWORD3>
-			<KEYWORD3>hpgl2</KEYWORD3>
-			<KEYWORD3>vrml</KEYWORD3>
-
-			<!-- /SHOWDISP command -->
-			<KEYWORD3>hpgl</KEYWORD3>
-			<KEYWORD3>hpgl2</KEYWORD3>
-			<KEYWORD3>interleaf</KEYWORD3>
-			<KEYWORD3>postscript</KEYWORD3>
-			<KEYWORD3>dump</KEYWORD3>
-
-			<!-- SHPP command -->
-			<KEYWORD3>on</KEYWORD3>
-			<KEYWORD3>warn</KEYWORD3>
-			<KEYWORD3>off</KEYWORD3>
-			<KEYWORD3>silent</KEYWORD3>
-			<KEYWORD3>status</KEYWORD3>
-			<KEYWORD3>summary</KEYWORD3>
-			<KEYWORD3>default</KEYWORD3>
-			<KEYWORD3>object</KEYWORD3>
-			<KEYWORD3>modify</KEYWORD3>
-			<KEYWORD3>angd</KEYWORD3>
-			<KEYWORD3>aspect</KEYWORD3>
-			<KEYWORD3>paral</KEYWORD3>
-			<KEYWORD3>maxang</KEYWORD3>
-			<KEYWORD3>jacrat</KEYWORD3>
-			<KEYWORD3>warp</KEYWORD3>
-			<KEYWORD3>all</KEYWORD3>
-			<KEYWORD3>yes</KEYWORD3>
-			<KEYWORD3>no</KEYWORD3>
-
-			<!-- SLPPLOT, SLSPLOT commands -->
-			<KEYWORD3>factor</KEYWORD3>
-			<KEYWORD3>radius</KEYWORD3>
-			<KEYWORD3>length</KEYWORD3>
-
-			<!-- SMRTSIZE command -->
-			<KEYWORD3>stat</KEYWORD3>
-			<KEYWORD3>defa</KEYWORD3>
-			<KEYWORD3>off</KEYWORD3>
-			<KEYWORD3>on</KEYWORD3>
-
-			<!-- SOLCONTROL command -->
-			<KEYWORD3>on</KEYWORD3>
-			<KEYWORD3>off</KEYWORD3>
-
-			<!-- SOLU command -->
-			<KEYWORD3>allf</KEYWORD3>
-			<KEYWORD3>aldlf</KEYWORD3>
-			<KEYWORD3>arcl</KEYWORD3>
-			<KEYWORD3>cnvg</KEYWORD3>
-			<KEYWORD3>crprat</KEYWORD3>
-			<KEYWORD3>cscv</KEYWORD3>
-			<KEYWORD3>cucv</KEYWORD3>
-			<KEYWORD3>dicv</KEYWORD3>
-			<KEYWORD3>dsprm</KEYWORD3>
-			<KEYWORD3>dtime</KEYWORD3>
-			<KEYWORD3>eqit</KEYWORD3>
-			<KEYWORD3>ffcv</KEYWORD3>
-			<KEYWORD3>focv</KEYWORD3>
-			<KEYWORD3>hfcv</KEYWORD3>
-			<KEYWORD3>nc48</KEYWORD3>
-			<KEYWORD3>nc49</KEYWORD3>
-			<KEYWORD3>ncmit</KEYWORD3>
-			<KEYWORD3>ncmls</KEYWORD3>
-			<KEYWORD3>ncmss</KEYWORD3>
-			<KEYWORD3>mfcv</KEYWORD3>
-			<KEYWORD3>mocv</KEYWORD3>
-			<KEYWORD3>mxdvl</KEYWORD3>
-			<KEYWORD3>prcv</KEYWORD3>
-			<KEYWORD3>psinc</KEYWORD3>
-			<KEYWORD3>resfrq</KEYWORD3>
-			<KEYWORD3>reseig</KEYWORD3>
-			<KEYWORD3>rocv</KEYWORD3>
-			<KEYWORD3>smcv</KEYWORD3>
-			<KEYWORD3>tecv</KEYWORD3>
-			<KEYWORD3>vecv</KEYWORD3>
-			<KEYWORD3>vocv</KEYWORD3>
-			<KEYWORD3>vmcv</KEYWORD3>
-
-			<!-- SPOPT command -->
-			<KEYWORD3>sprs</KEYWORD3>
-			<KEYWORD3>mprs</KEYWORD3>
-			<KEYWORD3>ddam</KEYWORD3>
-			<KEYWORD3>psd</KEYWORD3>
-			<KEYWORD3>no</KEYWORD3>
-			<KEYWORD3>yes</KEYWORD3>
-
-			<!-- SRSS command -->
-			<KEYWORD3>disp</KEYWORD3>
-			<KEYWORD3>velo</KEYWORD3>
-			<KEYWORD3>acel</KEYWORD3>
-
-			<!-- /SSCALE command -->
-			<KEYWORD3>all</KEYWORD3>
-
-			<!-- SSTIF command -->
-			<KEYWORD3>off</KEYWORD3>
-			<KEYWORD3>on</KEYWORD3>
-
-			<!-- *STATUS command -->
-			<KEYWORD3>argx</KEYWORD3>
-
-			<!-- /STATUS command -->
-			<KEYWORD3>all</KEYWORD3>
-			<KEYWORD3>title</KEYWORD3>
-			<KEYWORD3>units</KEYWORD3>
-			<KEYWORD3>mem</KEYWORD3>
-			<KEYWORD3>db</KEYWORD3>
-			<KEYWORD3>config</KEYWORD3>
-			<KEYWORD3>global</KEYWORD3>
-			<KEYWORD3>solu</KEYWORD3>
-			<KEYWORD3>phys</KEYWORD3>
-
-			<!-- STORE command -->
-			<KEYWORD3>merge</KEYWORD3>
-			<KEYWORD3>new</KEYWORD3>
-			<KEYWORD3>appen</KEYWORD3>
-			<KEYWORD3>alloc</KEYWORD3>
-			<KEYWORD3>psd</KEYWORD3>
-
-			<!-- SUBOPT command -->
-			<KEYWORD3>all</KEYWORD3>
-			<KEYWORD3>part</KEYWORD3>
-			<KEYWORD3>none</KEYWORD3>
-
-			<!-- SUBSET command -->
-			<KEYWORD3>first</KEYWORD3>
-			<KEYWORD3>last</KEYWORD3>
-			<KEYWORD3>next</KEYWORD3>
-			<KEYWORD3>near</KEYWORD3>
-			<KEYWORD3>list</KEYWORD3>
-			<KEYWORD3>velo</KEYWORD3>
-			<KEYWORD3>acel</KEYWORD3>
-
-			<!-- SUMTYPE command -->
-			<KEYWORD3>comp</KEYWORD3>
-			<KEYWORD3>prin</KEYWORD3>
-
-			<!-- TB command -->
-			<KEYWORD3>bkin</KEYWORD3>
-			<KEYWORD3>mkin</KEYWORD3>
-			<KEYWORD3>miso</KEYWORD3>
-			<KEYWORD3>biso</KEYWORD3>
-			<KEYWORD3>aniso</KEYWORD3>
-			<KEYWORD3>dp</KEYWORD3>
-			<KEYWORD3>melas</KEYWORD3>
-			<KEYWORD3>user</KEYWORD3>
-			<KEYWORD3>kinh</KEYWORD3>
-			<KEYWORD3>anand</KEYWORD3>
-			<KEYWORD3>creep</KEYWORD3>
-			<KEYWORD3>swell</KEYWORD3>
-			<KEYWORD3>bh</KEYWORD3>
-			<KEYWORD3>piez</KEYWORD3>
-			<KEYWORD3>fail</KEYWORD3>
-			<KEYWORD3>mooney</KEYWORD3>
-			<KEYWORD3>water</KEYWORD3>
-			<KEYWORD3>anel</KEYWORD3>
-			<KEYWORD3>concr</KEYWORD3>
-			<KEYWORD3>hflm</KEYWORD3>
-			<KEYWORD3>fcon</KEYWORD3>
-			<KEYWORD3>pflow</KEYWORD3>
-			<KEYWORD3>evisc</KEYWORD3>
-			<KEYWORD3>plaw</KEYWORD3>
-			<KEYWORD3>foam</KEYWORD3>
-			<KEYWORD3>honey</KEYWORD3>
-			<KEYWORD3>comp</KEYWORD3>
-			<KEYWORD3>nl</KEYWORD3>
-			<KEYWORD3>eos</KEYWORD3>
-
-			<!-- TBDELE, TBLIST commands -->
-			<KEYWORD3>all</KEYWORD3>
-
-			<!-- TBPLOT command -->
-			<KEYWORD3>mkin</KEYWORD3>
-			<KEYWORD3>kinh</KEYWORD3>
-			<KEYWORD3>melas</KEYWORD3>
-			<KEYWORD3>miso</KEYWORD3>
-			<KEYWORD3>bkin</KEYWORD3>
-			<KEYWORD3>biso</KEYWORD3>
-			<KEYWORD3>bh</KEYWORD3>
-			<KEYWORD3>nb</KEYWORD3>
-			<KEYWORD3>mh</KEYWORD3>
-			<KEYWORD3>sbh</KEYWORD3>
-			<KEYWORD3>snb</KEYWORD3>
-			<KEYWORD3>smh</KEYWORD3>
-
-			<!-- TBPT command -->
-			<KEYWORD3>defi</KEYWORD3>
-			<KEYWORD3>dele</KEYWORD3>
-
-			<!-- TEE command -->
-			<KEYWORD3>wt</KEYWORD3>
-			<KEYWORD3>uft</KEYWORD3>
-
-			<!-- TERM command -->
-			<KEYWORD3>copy</KEYWORD3>
-			<KEYWORD3>loop</KEYWORD3>
-			<KEYWORD3>noprom</KEYWORD3>
-
-			<!-- TIMINT command -->
-			<KEYWORD3>off</KEYWORD3>
-			<KEYWORD3>on</KEYWORD3>
-			<KEYWORD3>all</KEYWORD3>
-			<KEYWORD3>struc</KEYWORD3>
-			<KEYWORD3>therm</KEYWORD3>
-			<KEYWORD3>elect</KEYWORD3>
-			<KEYWORD3>mag</KEYWORD3>
-			<KEYWORD3>fluid</KEYWORD3>
-
-			<!-- TIMP command -->
-			<KEYWORD3>all</KEYWORD3>
-			<KEYWORD3>p</KEYWORD3>
-
-			<!-- TRANSFER command -->
-			<KEYWORD3>all</KEYWORD3>
-			<KEYWORD3>p</KEYWORD3>
-
-			<!-- /TRIAD command -->
-			<KEYWORD3>orig</KEYWORD3>
-			<KEYWORD3>off</KEYWORD3>
-			<KEYWORD3>lbot</KEYWORD3>
-			<KEYWORD3>rbot</KEYWORD3>
-			<KEYWORD3>ltop</KEYWORD3>
-			<KEYWORD3>rtop</KEYWORD3>
-
-			<!-- /TRLCY command -->
-			<KEYWORD3>elem</KEYWORD3>
-			<KEYWORD3>area</KEYWORD3>
-			<KEYWORD3>volu</KEYWORD3>
-			<KEYWORD3>isurf</KEYWORD3>
-			<KEYWORD3>cm</KEYWORD3>
-			<KEYWORD3>curve</KEYWORD3>
-
-			<!-- TRNOPT command -->
-			<KEYWORD3>full</KEYWORD3>
-			<KEYWORD3>reduc</KEYWORD3>
-			<KEYWORD3>msup</KEYWORD3>
-			<KEYWORD3>damp</KEYWORD3>
-			<KEYWORD3>nodamp</KEYWORD3>
-
-			<!-- TRPDEL, TRPLIS, TRPOIN commands -->
-			<KEYWORD3>all</KEYWORD3>
-			<KEYWORD3>p</KEYWORD3>
-
-			<!-- TSHAP command -->
-			<KEYWORD3>iine</KEYWORD3>
-			<KEYWORD3>line</KEYWORD3>
-			<KEYWORD3>para</KEYWORD3>
-			<KEYWORD3>arc</KEYWORD3>
-			<KEYWORD3>carc</KEYWORD3>
-			<KEYWORD3>circ</KEYWORD3>
-			<KEYWORD3>tria</KEYWORD3>
-			<KEYWORD3>tri6</KEYWORD3>
-			<KEYWORD3>quad</KEYWORD3>
-			<KEYWORD3>qua8</KEYWORD3>
-			<KEYWORD3>cyli</KEYWORD3>
-			<KEYWORD3>cone</KEYWORD3>
-			<KEYWORD3>sphe</KEYWORD3>
-			<KEYWORD3>pilo</KEYWORD3>
-
-			<!-- /TYPE command -->
-			<KEYWORD3>basic</KEYWORD3>
-			<KEYWORD3>sect</KEYWORD3>
-			<KEYWORD3>hidc</KEYWORD3>
-			<KEYWORD3>hidd</KEYWORD3>
-			<KEYWORD3>hidp</KEYWORD3>
-			<KEYWORD3>cap</KEYWORD3>
-			<KEYWORD3>zbuf</KEYWORD3>
-			<KEYWORD3>zcap</KEYWORD3>
-			<KEYWORD3>zqsl</KEYWORD3>
-			<KEYWORD3>hqsl</KEYWORD3>
-
-			<!-- /UI command -->
-			<KEYWORD3>help</KEYWORD3>
-			<KEYWORD3>view</KEYWORD3>
-			<KEYWORD3>wpse</KEYWORD3>
-			<KEYWORD3>wpvi</KEYWORD3>
-			<KEYWORD3>result</KEYWORD3>
-			<KEYWORD3>query</KEYWORD3>
-			<KEYWORD3>copy</KEYWORD3>
-			<KEYWORD3>anno</KEYWORD3>
-			<KEYWORD3>select</KEYWORD3>
-			<KEYWORD3>,nsel</KEYWORD3>
-			<KEYWORD3>,esel</KEYWORD3>
-			<KEYWORD3>,ksel</KEYWORD3>
-			<KEYWORD3>,lsel</KEYWORD3>
-			<KEYWORD3>,asel</KEYWORD3>
-			<KEYWORD3>,vsel</KEYWORD3>
-			<KEYWORD3>refresh</KEYWORD3>
-			<KEYWORD3>s</KEYWORD3>
-			<KEYWORD3>,r</KEYWORD3>
-			<KEYWORD3>,a</KEYWORD3>
-			<KEYWORD3>u</KEYWORD3>
-			<KEYWORD3>node</KEYWORD3>
-			<KEYWORD3>element</KEYWORD3>
-			<KEYWORD3>grid</KEYWORD3>
-			<KEYWORD3>format</KEYWORD3>
-			<KEYWORD3>pscr</KEYWORD3>
-			<KEYWORD3>tiff</KEYWORD3>
-			<KEYWORD3>epsi</KEYWORD3>
-			<KEYWORD3>bmp</KEYWORD3>
-			<KEYWORD3>wmf</KEYWORD3>
-			<KEYWORD3>emf</KEYWORD3>
-			<KEYWORD3>screen</KEYWORD3>
-			<KEYWORD3>full</KEYWORD3>
-			<KEYWORD3>graph</KEYWORD3>
-			<KEYWORD3>color</KEYWORD3>
-			<KEYWORD3>mono</KEYWORD3>
-			<KEYWORD3>grey</KEYWORD3>
-			<KEYWORD3>krev</KEYWORD3>
-			<KEYWORD3>norm</KEYWORD3>
-			<KEYWORD3>reverse</KEYWORD3>
-			<KEYWORD3>orient</KEYWORD3>
-			<KEYWORD3>landscape</KEYWORD3>
-			<KEYWORD3>portrait</KEYWORD3>
-			<KEYWORD3>compress</KEYWORD3>
-			<KEYWORD3>yes</KEYWORD3>
-			<KEYWORD3>no</KEYWORD3>
-
-			<!-- /UIS command -->
-			<KEYWORD3>msgpop</KEYWORD3>
-			<KEYWORD3>replot</KEYWORD3>
-			<KEYWORD3>abort</KEYWORD3>
-			<KEYWORD3>dyna</KEYWORD3>
-			<KEYWORD3>pick</KEYWORD3>
-			<KEYWORD3>on</KEYWORD3>
-			<KEYWORD3>off</KEYWORD3>
-			<KEYWORD3>stat</KEYWORD3>
-			<KEYWORD3>defa</KEYWORD3>
-
-			<!-- /UNITS command -->
-			<KEYWORD3>user</KEYWORD3>
-			<KEYWORD3>si</KEYWORD3>
-			<KEYWORD3>cgs</KEYWORD3>
-			<KEYWORD3>bft</KEYWORD3>
-			<KEYWORD3>bin</KEYWORD3>
-
-			<!-- UPCOORD command -->
-			<KEYWORD3>off</KEYWORD3>
-			<KEYWORD3>on</KEYWORD3>
-
-			<!-- /USER command -->
-			<KEYWORD3>all</KEYWORD3>
-
-			<!-- USRCAL command -->
-			<KEYWORD3>usrefl</KEYWORD3>
-			<KEYWORD3>userfl</KEYWORD3>
-			<KEYWORD3>usercv</KEYWORD3>
-			<KEYWORD3>userpr</KEYWORD3>
-			<KEYWORD3>userfx</KEYWORD3>
-			<KEYWORD3>userch</KEYWORD3>
-			<KEYWORD3>userfd</KEYWORD3>
-			<KEYWORD3>userou</KEYWORD3>
-			<KEYWORD3>usermc</KEYWORD3>
-			<KEYWORD3>usolbeg</KEYWORD3>
-			<KEYWORD3>uldbeg</KEYWORD3>
-			<KEYWORD3>ussbeg</KEYWORD3>
-			<KEYWORD3>uitbeg</KEYWORD3>
-			<KEYWORD3>uitfin</KEYWORD3>
-			<KEYWORD3>ussfin</KEYWORD3>
-			<KEYWORD3>uldfin</KEYWORD3>
-			<KEYWORD3>usolfin</KEYWORD3>
-			<KEYWORD3>uanbeg</KEYWORD3>
-			<KEYWORD3>uanfin</KEYWORD3>
-			<KEYWORD3>uelmatx</KEYWORD3>
-
-			<!-- VA, VADD, VCLEAR, /VCONE, VCVFILL, VDELE, VDGL, VDRAG, VEXT commands -->
-			<KEYWORD3>all</KEYWORD3>
-			<KEYWORD3>p</KEYWORD3>
-
-			<!-- *VFILL command -->
-			<KEYWORD3>data</KEYWORD3>
-			<KEYWORD3>ramp</KEYWORD3>
-			<KEYWORD3>rand</KEYWORD3>
-			<KEYWORD3>gdis</KEYWORD3>
-			<KEYWORD3>tria</KEYWORD3>
-			<KEYWORD3>beta</KEYWORD3>
-			<KEYWORD3>gamm</KEYWORD3>
-
-			<!-- *VFUN command -->
-			<KEYWORD3>acos</KEYWORD3>
-			<KEYWORD3>asin</KEYWORD3>
-			<KEYWORD3>asort</KEYWORD3>
-			<KEYWORD3>atan</KEYWORD3>
-			<KEYWORD3>comp</KEYWORD3>
-			<KEYWORD3>copy</KEYWORD3>
-			<KEYWORD3>cos</KEYWORD3>
-			<KEYWORD3>cosh</KEYWORD3>
-			<KEYWORD3>dircos</KEYWORD3>
-			<KEYWORD3>dsort</KEYWORD3>
-			<KEYWORD3>euler</KEYWORD3>
-			<KEYWORD3>exp</KEYWORD3>
-			<KEYWORD3>expa</KEYWORD3>
-			<KEYWORD3>log</KEYWORD3>
-			<KEYWORD3>log10</KEYWORD3>
-			<KEYWORD3>nint</KEYWORD3>
-			<KEYWORD3>not</KEYWORD3>
-			<KEYWORD3>pwr</KEYWORD3>
-			<KEYWORD3>sin</KEYWORD3>
-			<KEYWORD3>sinh</KEYWORD3>
-			<KEYWORD3>sqrt</KEYWORD3>
-			<KEYWORD3>tan</KEYWORD3>
-			<KEYWORD3>tanh</KEYWORD3>
-			<KEYWORD3>tang</KEYWORD3>
-			<KEYWORD3>norm</KEYWORD3>
-			<KEYWORD3>local</KEYWORD3>
-			<KEYWORD3>global</KEYWORD3>
-
-			<!-- VGEN command -->
-			<KEYWORD3>all</KEYWORD3>
-			<KEYWORD3>p</KEYWORD3>
-
-			<!-- *VGET command -->
-			<KEYWORD3>node</KEYWORD3>
-			<KEYWORD3>loc</KEYWORD3>
-			<KEYWORD3>x</KEYWORD3>
-			<KEYWORD3>y</KEYWORD3>
-			<KEYWORD3>z</KEYWORD3>
-			<KEYWORD3>ang</KEYWORD3>
-			<KEYWORD3>xy</KEYWORD3>
-			<KEYWORD3>yz</KEYWORD3>
-			<KEYWORD3>zx</KEYWORD3>
-			<KEYWORD3>,nsel</KEYWORD3>
-
-			<KEYWORD3>elem</KEYWORD3>
-			<KEYWORD3>cent</KEYWORD3>
-			<KEYWORD3>adj</KEYWORD3>
-			<KEYWORD3>attr</KEYWORD3>
-			<KEYWORD3>geom</KEYWORD3>
-			<KEYWORD3>,esel</KEYWORD3>
-			<KEYWORD3>shpar</KEYWORD3>
-
-			<KEYWORD3>kp</KEYWORD3>
-			<KEYWORD3>div</KEYWORD3>
-			<KEYWORD3>,ksel</KEYWORD3>
-
-			<KEYWORD3>line</KEYWORD3>
-			<KEYWORD3>leng</KEYWORD3>
-			<KEYWORD3>,lsel</KEYWORD3>
-
-			<KEYWORD3>area</KEYWORD3>
-			<KEYWORD3>loop</KEYWORD3>
-			<KEYWORD3>,asel</KEYWORD3>
-
-			<KEYWORD3>volu</KEYWORD3>
-			<KEYWORD3>shell</KEYWORD3>
-			<KEYWORD3>volu</KEYWORD3>
-			<KEYWORD3>,vsel</KEYWORD3>
-
-			<KEYWORD3>cdsy</KEYWORD3>
-
-			<KEYWORD3>rcon</KEYWORD3>
-			<KEYWORD3>const</KEYWORD3>
-
-			<KEYWORD3>const</KEYWORD3>
-			<KEYWORD3>bkin</KEYWORD3>
-			<KEYWORD3>mkin</KEYWORD3>
-			<KEYWORD3>miso</KEYWORD3>
-			<KEYWORD3>biso</KEYWORD3>
-			<KEYWORD3>aniso</KEYWORD3>
-			<KEYWORD3>dp</KEYWORD3>
-			<KEYWORD3>melas</KEYWORD3>
-			<KEYWORD3>user</KEYWORD3>
-			<KEYWORD3>kinh</KEYWORD3>
-			<KEYWORD3>anand</KEYWORD3>
-			<KEYWORD3>creep</KEYWORD3>
-			<KEYWORD3>swell</KEYWORD3>
-			<KEYWORD3>bh</KEYWORD3>
-			<KEYWORD3>piez</KEYWORD3>
-			<KEYWORD3>fail</KEYWORD3>
-			<KEYWORD3>mooney</KEYWORD3>
-			<KEYWORD3>water</KEYWORD3>
-			<KEYWORD3>anel</KEYWORD3>
-			<KEYWORD3>concr</KEYWORD3>
-			<KEYWORD3>hflm</KEYWORD3>
-			<KEYWORD3>fcon</KEYWORD3>
-			<KEYWORD3>pflow</KEYWORD3>
-			<KEYWORD3>evisc</KEYWORD3>
-			<KEYWORD3>plaw</KEYWORD3>
-			<KEYWORD3>foam</KEYWORD3>
-			<KEYWORD3>honey</KEYWORD3>
-			<KEYWORD3>comp</KEYWORD3>
-			<KEYWORD3>nl</KEYWORD3>
-			<KEYWORD3>eos</KEYWORD3>
-
-			<KEYWORD3>u</KEYWORD3>
-			<KEYWORD3>rot</KEYWORD3>
-			<KEYWORD3>temp</KEYWORD3>
-			<KEYWORD3>pres</KEYWORD3>
-			<KEYWORD3>volt</KEYWORD3>
-			<KEYWORD3>mag</KEYWORD3>
-			<KEYWORD3>v</KEYWORD3>
-			<KEYWORD3>,a</KEYWORD3>
-			<KEYWORD3>curr</KEYWORD3>
-			<KEYWORD3>emf</KEYWORD3>
-			<KEYWORD3>enke</KEYWORD3>
-			<KEYWORD3>ends</KEYWORD3>
-
-			<KEYWORD3>s</KEYWORD3>
-			<KEYWORD3>int</KEYWORD3>
-			<KEYWORD3>eqv</KEYWORD3>
-			<KEYWORD3>epto</KEYWORD3>
-			<KEYWORD3>epel</KEYWORD3>
-			<KEYWORD3>eppl</KEYWORD3>
-			<KEYWORD3>epcr</KEYWORD3>
-			<KEYWORD3>epth</KEYWORD3>
-			<KEYWORD3>epsw</KEYWORD3>
-
-			<KEYWORD3>nl</KEYWORD3>
-			<KEYWORD3>sepl</KEYWORD3>
-			<KEYWORD3>srat</KEYWORD3>
-			<KEYWORD3>hpres</KEYWORD3>
-			<KEYWORD3>epeq</KEYWORD3>
-			<KEYWORD3>psv</KEYWORD3>
-			<KEYWORD3>plwk</KEYWORD3>
-			<KEYWORD3>hs</KEYWORD3>
-			<KEYWORD3>bfe</KEYWORD3>
-			<KEYWORD3>tg</KEYWORD3>
-			<KEYWORD3>tf</KEYWORD3>
-			<KEYWORD3>pg</KEYWORD3>
-			<KEYWORD3>ef</KEYWORD3>
-			<KEYWORD3>,d</KEYWORD3>
-			<KEYWORD3>h</KEYWORD3>
-			<KEYWORD3>b</KEYWORD3>
-			<KEYWORD3>fmag</KEYWORD3>
-
-			<KEYWORD3>ttot</KEYWORD3>
-			<KEYWORD3>hflu</KEYWORD3>
-			<KEYWORD3>hflm</KEYWORD3>
-			<KEYWORD3>cond</KEYWORD3>
-			<KEYWORD3>pcoe</KEYWORD3>
-			<KEYWORD3>ptot</KEYWORD3>
-			<KEYWORD3>mach</KEYWORD3>
-			<KEYWORD3>strm</KEYWORD3>
-			<KEYWORD3>dens</KEYWORD3>
-			<KEYWORD3>visc</KEYWORD3>
-			<KEYWORD3>evis</KEYWORD3>
-			<KEYWORD3>econ</KEYWORD3>
-			<KEYWORD3>yplu</KEYWORD3>
-			<KEYWORD3>tauw</KEYWORD3>
-
-			<KEYWORD3>etab</KEYWORD3>
-
-			<!-- VGLUE, VIMP, VINP, VINV, VLIST, VLSCALE, VMESH, VOFFST commands -->
-			<KEYWORD3>all</KEYWORD3>
-			<KEYWORD3>p</KEYWORD3>
-
-			<!-- /VIEW command -->
-			<KEYWORD3>all</KEYWORD3>
-			<KEYWORD3>wp</KEYWORD3>
-
-			<!-- *VOPER command -->
-			<KEYWORD3>add</KEYWORD3>
-			<KEYWORD3>sub</KEYWORD3>
-			<KEYWORD3>mult</KEYWORD3>
-			<KEYWORD3>div</KEYWORD3>
-			<KEYWORD3>min</KEYWORD3>
-			<KEYWORD3>max</KEYWORD3>
-			<KEYWORD3>lt</KEYWORD3>
-			<KEYWORD3>le</KEYWORD3>
-			<KEYWORD3>eq</KEYWORD3>
-			<KEYWORD3>ne</KEYWORD3>
-			<KEYWORD3>ge</KEYWORD3>
-			<KEYWORD3>gt</KEYWORD3>
-			<KEYWORD3>der1</KEYWORD3>
-			<KEYWORD3>der2</KEYWORD3>
-			<KEYWORD3>int1</KEYWORD3>
-			<KEYWORD3>int2</KEYWORD3>
-			<KEYWORD3>dot</KEYWORD3>
-			<KEYWORD3>cross</KEYWORD3>
-			<KEYWORD3>gath</KEYWORD3>
-			<KEYWORD3>scat</KEYWORD3>
-
-			<!-- VOVLAP, VPTN commands -->
-			<KEYWORD3>all</KEYWORD3>
-			<KEYWORD3>p</KEYWORD3>
-
-			<!-- VPLOT command -->
-			<KEYWORD3>all</KEYWORD3>
-			<KEYWORD3>dege</KEYWORD3>
-
-			<!-- *VPUT command -->
-			<KEYWORD3>node</KEYWORD3>
-			<KEYWORD3>u</KEYWORD3>
-			<KEYWORD3>x</KEYWORD3>
-			<KEYWORD3>y</KEYWORD3>
-			<KEYWORD3>z</KEYWORD3>
-			<KEYWORD3>rot</KEYWORD3>
-			<KEYWORD3>temp</KEYWORD3>
-			<KEYWORD3>pres</KEYWORD3>
-			<KEYWORD3>volt</KEYWORD3>
-			<KEYWORD3>mag</KEYWORD3>
-			<KEYWORD3>v</KEYWORD3>
-			<KEYWORD3>,a</KEYWORD3>
-			<KEYWORD3>curr</KEYWORD3>
-			<KEYWORD3>emf</KEYWORD3>
-			<KEYWORD3>enke</KEYWORD3>
-			<KEYWORD3>ends</KEYWORD3>
-			<KEYWORD3>s</KEYWORD3>
-			<KEYWORD3>xy</KEYWORD3>
-			<KEYWORD3>yz</KEYWORD3>
-			<KEYWORD3>xz</KEYWORD3>
-			<KEYWORD3>int</KEYWORD3>
-			<KEYWORD3>eqv</KEYWORD3>
-			<KEYWORD3>epto</KEYWORD3>
-			<KEYWORD3>epel</KEYWORD3>
-			<KEYWORD3>eppl</KEYWORD3>
-			<KEYWORD3>epcr</KEYWORD3>
-			<KEYWORD3>epth</KEYWORD3>
-			<KEYWORD3>epsw</KEYWORD3>
-			<KEYWORD3>nl</KEYWORD3>
-			<KEYWORD3>sepl</KEYWORD3>
-			<KEYWORD3>srat</KEYWORD3>
-			<KEYWORD3>hpres</KEYWORD3>
-			<KEYWORD3>epeq</KEYWORD3>
-			<KEYWORD3>psv</KEYWORD3>
-			<KEYWORD3>plwk</KEYWORD3>
-			<KEYWORD3>tg</KEYWORD3>
-			<KEYWORD3>tf</KEYWORD3>
-			<KEYWORD3>pg</KEYWORD3>
-			<KEYWORD3>ef</KEYWORD3>
-			<KEYWORD3>,d</KEYWORD3>
-			<KEYWORD3>h</KEYWORD3>
-			<KEYWORD3>b</KEYWORD3>
-			<KEYWORD3>fmag</KEYWORD3>
-			<KEYWORD3>ttot</KEYWORD3>
-			<KEYWORD3>hflu</KEYWORD3>
-			<KEYWORD3>hflm</KEYWORD3>
-			<KEYWORD3>cond</KEYWORD3>
-			<KEYWORD3>pcoe</KEYWORD3>
-			<KEYWORD3>ptot</KEYWORD3>
-			<KEYWORD3>mach</KEYWORD3>
-			<KEYWORD3>strm</KEYWORD3>
-			<KEYWORD3>dens</KEYWORD3>
-			<KEYWORD3>visc</KEYWORD3>
-			<KEYWORD3>evis</KEYWORD3>
-			<KEYWORD3>econ</KEYWORD3>
-			<KEYWORD3>yplu</KEYWORD3>
-			<KEYWORD3>tauw</KEYWORD3>
-
-			<KEYWORD3>elem</KEYWORD3>
-			<KEYWORD3>etab</KEYWORD3>
-
-			<!-- VROTAT command -->
-			<KEYWORD3>all</KEYWORD3>
-			<KEYWORD3>p</KEYWORD3>
-
-			<!-- VSBA, VSBV, VSBW commands -->
-			<KEYWORD3>all</KEYWORD3>
-			<KEYWORD3>p</KEYWORD3>
-			<KEYWORD3>sepo</KEYWORD3>
-			<KEYWORD3>delete</KEYWORD3>
-			<KEYWORD3>keep</KEYWORD3>
-
-			<!-- *VSCFUN command -->
-			<KEYWORD3>max</KEYWORD3>
-			<KEYWORD3>min</KEYWORD3>
-			<KEYWORD3>lmax</KEYWORD3>
-			<KEYWORD3>lmin</KEYWORD3>
-			<KEYWORD3>first</KEYWORD3>
-			<KEYWORD3>last</KEYWORD3>
-			<KEYWORD3>sum</KEYWORD3>
-			<KEYWORD3>medi</KEYWORD3>
-			<KEYWORD3>mean</KEYWORD3>
-			<KEYWORD3>vari</KEYWORD3>
-			<KEYWORD3>stdv</KEYWORD3>
-			<KEYWORD3>rms</KEYWORD3>
-			<KEYWORD3>num</KEYWORD3>
-
-			<!-- VSEL, VSLA commands -->
-			<KEYWORD3>s</KEYWORD3>
-			<KEYWORD3>,r</KEYWORD3>
-			<KEYWORD3>,a</KEYWORD3>
-			<KEYWORD3>u</KEYWORD3>
-			<KEYWORD3>all</KEYWORD3>
-			<KEYWORD3>none</KEYWORD3>
-			<KEYWORD3>inve</KEYWORD3>
-			<KEYWORD3>stat</KEYWORD3>
-			<KEYWORD3>p</KEYWORD3>
-			<KEYWORD3>volu</KEYWORD3>
-			<KEYWORD3>loc</KEYWORD3>
-			<KEYWORD3>x</KEYWORD3>
-			<KEYWORD3>y</KEYWORD3>
-			<KEYWORD3>z</KEYWORD3>
-			<KEYWORD3>,mat</KEYWORD3>
-			<KEYWORD3>,type</KEYWORD3>
-			<KEYWORD3>,real</KEYWORD3>
-			<KEYWORD3>,esys</KEYWORD3>
-
-			<!-- VSUM command -->
-			<KEYWORD3>default</KEYWORD3>
-			<KEYWORD3>fine</KEYWORD3>
-
-			<!-- VSWEEP command -->
-			<KEYWORD3>p</KEYWORD3>
-
-			<!-- VSYMM, VTRAN, /VUP commands -->
-			<KEYWORD3>x</KEYWORD3>
-			<KEYWORD3>y</KEYWORD3>
-			<KEYWORD3>z</KEYWORD3>
-			<KEYWORD3>all</KEYWORD3>
-			<KEYWORD3>p</KEYWORD3>
-			<KEYWORD3>-x</KEYWORD3>
-			<KEYWORD3>-y</KEYWORD3>
-			<KEYWORD3>-z</KEYWORD3>
-
-			<!-- WAVES command -->
-			<KEYWORD3>max</KEYWORD3>
-			<KEYWORD3>rms</KEYWORD3>
-
-			<!-- /WINDOW command -->
-			<KEYWORD3>off</KEYWORD3>
-			<KEYWORD3>on</KEYWORD3>
-			<KEYWORD3>full</KEYWORD3>
-			<KEYWORD3>left</KEYWORD3>
-			<KEYWORD3>righ</KEYWORD3>
-			<KEYWORD3>top</KEYWORD3>
-			<KEYWORD3>bot</KEYWORD3>
-			<KEYWORD3>ltop</KEYWORD3>
-			<KEYWORD3>lbot</KEYWORD3>
-			<KEYWORD3>rtop</KEYWORD3>
-			<KEYWORD3>rbot</KEYWORD3>
-			<KEYWORD3>squa</KEYWORD3>
-			<KEYWORD3>dele</KEYWORD3>
-
-			<!-- WPAVE command -->
-			<KEYWORD3>p</KEYWORD3>
-
-			<!-- WSORT command -->
-			<KEYWORD3>x</KEYWORD3>
-			<KEYWORD3>y</KEYWORD3>
-			<KEYWORD3>z</KEYWORD3>
-			<KEYWORD3>all</KEYWORD3>
-			<KEYWORD3>max</KEYWORD3>
-			<KEYWORD3>rms</KEYWORD3>
-
-			<!-- WSTART command -->
-			<KEYWORD3>all</KEYWORD3>
-
-			<!-- /YRANGE command -->
-			<KEYWORD3>all</KEYWORD3>
-
-			<!-- /ZOOM command -->
-			<KEYWORD3>off</KEYWORD3>
-			<KEYWORD3>back</KEYWORD3>
-			<KEYWORD3>scrn</KEYWORD3>
-			<KEYWORD3>rect</KEYWORD3>
-			
-		</KEYWORDS>
-	</RULES>
-</MODE>
-
diff --git a/qpython/src/main/assets/syntax/applescript.xml b/qpython/src/main/assets/syntax/applescript.xml
deleted file mode 100644
index edb1e009..00000000
--- a/qpython/src/main/assets/syntax/applescript.xml
+++ /dev/null
@@ -1,280 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!-- AppleScript mode by Kris Kopicki (21/8/2002) -->
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="doubleBracketIndent" VALUE="false" />
-		<PROPERTY NAME="commentStart" VALUE="(*" />
-		<PROPERTY NAME="commentEnd" VALUE="*)" />
-		<PROPERTY NAME="lineComment" VALUE="--" />
-		<PROPERTY NAME="wordBreakChars" VALUE=",+-=&lt;&gt;/?^&amp;*" />
-	</PROPS>
-	<RULES IGNORE_CASE="TRUE" HIGHLIGHT_DIGITS="TRUE">
-
-		<SPAN TYPE="COMMENT1">
-			<BEGIN>(*</BEGIN>
-			<END>*)</END>
-		</SPAN>
-		<EOL_SPAN TYPE="COMMENT1">--</EOL_SPAN>
-
-		<SPAN TYPE="LITERAL1" ESCAPE="\" NO_LINE_BREAK="TRUE">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-		<SPAN TYPE="LITERAL1" ESCAPE="\" NO_LINE_BREAK="TRUE">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-
-		<SEQ TYPE="OPERATOR">(</SEQ>
-		<SEQ TYPE="OPERATOR">)</SEQ>
-		<SEQ TYPE="OPERATOR">+</SEQ>
-		<SEQ TYPE="OPERATOR">-</SEQ>
-		<SEQ TYPE="OPERATOR">^</SEQ>
-		<SEQ TYPE="OPERATOR">*</SEQ>
-		<SEQ TYPE="OPERATOR">/</SEQ>
-		<SEQ TYPE="OPERATOR">&amp;</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;=</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;=</SEQ>
-		<SEQ TYPE="OPERATOR">=</SEQ>
-		<SEQ TYPE="OPERATOR">­</SEQ>
-
-	<!-- Constants -->
-		<SEQ_REGEXP
-			TYPE="LITERAL2"
-			HASH_CHAR="application"
-			AT_WORD_START="TRUE"
-		>application[\t\s]+responses</SEQ_REGEXP>
-		<SEQ_REGEXP
-			TYPE="LITERAL2"
-			HASH_CHAR="current"
-			AT_WORD_START="TRUE"
-		>current[\t\s]+application</SEQ_REGEXP>
-		<SEQ_REGEXP
-			TYPE="LITERAL2"
-			HASH_CHAR="white"
-			AT_WORD_START="TRUE"
-		>white[\t\s]+space</SEQ_REGEXP>
-
-		<!-- Text Styles -->
-		<SEQ_REGEXP
-			TYPE="LITERAL2"
-			HASH_CHAR="all"
-		>all[\t\s]+caps</SEQ_REGEXP>
-		<SEQ_REGEXP
-			TYPE="LITERAL2"
-			HASH_CHAR="all"
-			AT_WORD_START="TRUE"
-		>all[\t\s]+lowercase</SEQ_REGEXP>
-		<SEQ_REGEXP
-			TYPE="LITERAL2"
-			HASH_CHAR="small"
-			AT_WORD_START="TRUE"
-		>small[\t\s]+caps</SEQ_REGEXP>
-
-	<!-- Predefined Variables -->
-		<SEQ_REGEXP
-			TYPE="KEYWORD3"
-			HASH_CHAR="missing"
-			AT_WORD_START="TRUE"
-		>missing[\t\s]+value</SEQ_REGEXP>
-
-		<KEYWORDS>
-		<!-- Keywords -->
-			<KEYWORD1>script</KEYWORD1>
-			<KEYWORD1>property</KEYWORD1>
-			<KEYWORD1>prop</KEYWORD1>
-			<KEYWORD1>end</KEYWORD1>
-			<KEYWORD1>copy</KEYWORD1>
-			<KEYWORD1>to</KEYWORD1>
-			<KEYWORD1>set</KEYWORD1>
-			<KEYWORD1>global</KEYWORD1>
-			<KEYWORD1>local</KEYWORD1>
-			<KEYWORD1>on</KEYWORD1>
-			<KEYWORD1>to</KEYWORD1>
-			<KEYWORD1>of</KEYWORD1>
-			<KEYWORD1>in</KEYWORD1>
-			<KEYWORD1>given</KEYWORD1>
-			<KEYWORD1>with</KEYWORD1>
-			<KEYWORD1>without</KEYWORD1>
-			<KEYWORD1>return</KEYWORD1>
-			<KEYWORD1>continue</KEYWORD1>
-			<KEYWORD1>tell</KEYWORD1>
-			<KEYWORD1>if</KEYWORD1>
-			<KEYWORD1>then</KEYWORD1>
-			<KEYWORD1>else</KEYWORD1>
-			<KEYWORD1>repeat</KEYWORD1>
-			<KEYWORD1>times</KEYWORD1>
-			<KEYWORD1>while</KEYWORD1>
-			<KEYWORD1>until</KEYWORD1>
-			<KEYWORD1>from</KEYWORD1>
-			<KEYWORD1>exit</KEYWORD1>
-			<KEYWORD1>try</KEYWORD1>
-			<KEYWORD1>error</KEYWORD1>
-			<KEYWORD1>considering</KEYWORD1>
-			<KEYWORD1>ignoring</KEYWORD1>
-			<KEYWORD1>timeout</KEYWORD1>
-			<KEYWORD1>transaction</KEYWORD1>
-			<KEYWORD1>my</KEYWORD1>
-			<KEYWORD1>get</KEYWORD1>
-			<KEYWORD1>put</KEYWORD1>
-			<KEYWORD1>into</KEYWORD1>
-			<KEYWORD1>is</KEYWORD1>
-
-		<!-- References -->
-			<KEYWORD2>each</KEYWORD2>
-			<KEYWORD2>some</KEYWORD2>
-			<KEYWORD2>every</KEYWORD2>
-			<KEYWORD2>whose</KEYWORD2>
-			<KEYWORD2>where</KEYWORD2>
-			<KEYWORD2>id</KEYWORD2>
-			<KEYWORD2>index</KEYWORD2>
-			<KEYWORD2>first</KEYWORD2>
-			<KEYWORD2>second</KEYWORD2>
-			<KEYWORD2>third</KEYWORD2>
-			<KEYWORD2>fourth</KEYWORD2>
-			<KEYWORD2>fifth</KEYWORD2>
-			<KEYWORD2>sixth</KEYWORD2>
-			<KEYWORD2>seventh</KEYWORD2>
-			<KEYWORD2>eighth</KEYWORD2>
-			<KEYWORD2>ninth</KEYWORD2>
-			<KEYWORD2>tenth</KEYWORD2>
-			<KEYWORD2>last</KEYWORD2>
-			<KEYWORD2>front</KEYWORD2>
-			<KEYWORD2>back</KEYWORD2>
-			<KEYWORD2>st</KEYWORD2>
-			<KEYWORD2>nd</KEYWORD2>
-			<KEYWORD2>rd</KEYWORD2>
-			<KEYWORD2>th</KEYWORD2>
-			<KEYWORD2>middle</KEYWORD2>
-			<KEYWORD2>named</KEYWORD2>
-			<KEYWORD2>through</KEYWORD2>
-			<KEYWORD2>thru</KEYWORD2>
-			<KEYWORD2>before</KEYWORD2>
-			<KEYWORD2>after</KEYWORD2>
-			<KEYWORD2>beginning</KEYWORD2>
-			<KEYWORD2>the</KEYWORD2>
-
-		<!-- Commands -->
-			<KEYWORD3>close</KEYWORD3>
-			<KEYWORD3>copy</KEYWORD3>
-			<KEYWORD3>count</KEYWORD3>
-			<KEYWORD3>delete</KEYWORD3>
-			<KEYWORD3>duplicate</KEYWORD3>
-			<KEYWORD3>exists</KEYWORD3>
-			<KEYWORD3>launch</KEYWORD3>
-			<KEYWORD3>make</KEYWORD3>
-			<KEYWORD3>move</KEYWORD3>
-			<KEYWORD3>open</KEYWORD3>
-			<KEYWORD3>print</KEYWORD3>
-			<KEYWORD3>quit</KEYWORD3>
-			<KEYWORD3>reopen</KEYWORD3>
-			<KEYWORD3>run</KEYWORD3>
-			<KEYWORD3>save</KEYWORD3>
-			<KEYWORD3>saving</KEYWORD3>
-
-		<!-- Predefined Variables -->
-			<LITERAL2>it</LITERAL2>
-			<LITERAL2>me</LITERAL2>
-			<LITERAL2>version</LITERAL2>
-			<LITERAL2>pi</LITERAL2>
-			<LITERAL2>result</LITERAL2>
-			<LITERAL2>space</LITERAL2>
-			<LITERAL2>tab</LITERAL2>
-			<LITERAL2>anything</LITERAL2>
-
-		<!-- Constants -->
-			<LITERAL2>case</LITERAL2>
-			<LITERAL2>diacriticals</LITERAL2>
-			<LITERAL2>expansion</LITERAL2>
-			<LITERAL2>hyphens</LITERAL2>
-			<LITERAL2>punctuation</LITERAL2>
-
-			<!-- Text Styles -->
-			<LITERAL2>bold</LITERAL2>
-			<LITERAL2>condensed</LITERAL2>
-			<LITERAL2>expanded</LITERAL2>
-			<LITERAL2>hidden</LITERAL2>
-			<LITERAL2>italic</LITERAL2>
-			<LITERAL2>outline</LITERAL2>
-			<LITERAL2>plain</LITERAL2>
-			<LITERAL2>shadow</LITERAL2>
-			<LITERAL2>strikethrough</LITERAL2>
-			<LITERAL2>subscript</LITERAL2>
-			<LITERAL2>superscript</LITERAL2>
-			<LITERAL2>underline</LITERAL2>
-
-			<!-- Save options -->
-			<LITERAL2>ask</LITERAL2>
-			<LITERAL2>no</LITERAL2>
-			<LITERAL2>yes</LITERAL2>
-
-			<!-- Booleans -->
-			<LITERAL2>false</LITERAL2>
-			<LITERAL2>true</LITERAL2>
-
-			<!-- Date & Time -->
-			<LITERAL2>weekday</LITERAL2>
-			<LITERAL2>monday</LITERAL2>
-			<LITERAL2>mon</LITERAL2>
-			<LITERAL2>tuesday</LITERAL2>
-			<LITERAL2>tue</LITERAL2>
-			<LITERAL2>wednesday</LITERAL2>
-			<LITERAL2>wed</LITERAL2>
-			<LITERAL2>thursday</LITERAL2>
-			<LITERAL2>thu</LITERAL2>
-			<LITERAL2>friday</LITERAL2>
-			<LITERAL2>fri</LITERAL2>
-			<LITERAL2>saturday</LITERAL2>
-			<LITERAL2>sat</LITERAL2>
-			<LITERAL2>sunday</LITERAL2>
-			<LITERAL2>sun</LITERAL2>
-
-			<LITERAL2>month</LITERAL2>
-			<LITERAL2>january</LITERAL2>
-			<LITERAL2>jan</LITERAL2>
-			<LITERAL2>february</LITERAL2>
-			<LITERAL2>feb</LITERAL2>
-			<LITERAL2>march</LITERAL2>
-			<LITERAL2>mar</LITERAL2>
-			<LITERAL2>april</LITERAL2>
-			<LITERAL2>apr</LITERAL2>
-			<LITERAL2>may</LITERAL2>
-			<LITERAL2>june</LITERAL2>
-			<LITERAL2>jun</LITERAL2>
-			<LITERAL2>july</LITERAL2>
-			<LITERAL2>jul</LITERAL2>
-			<LITERAL2>august</LITERAL2>
-			<LITERAL2>aug</LITERAL2>
-			<LITERAL2>september</LITERAL2>
-			<LITERAL2>sep</LITERAL2>
-			<LITERAL2>october</LITERAL2>
-			<LITERAL2>oct</LITERAL2>
-			<LITERAL2>november</LITERAL2>
-			<LITERAL2>nov</LITERAL2>
-			<LITERAL2>december</LITERAL2>
-			<LITERAL2>dec</LITERAL2>
-
-			<LITERAL2>minutes</LITERAL2>
-			<LITERAL2>hours</LITERAL2>
-			<LITERAL2>days</LITERAL2>
-			<LITERAL2>weeks</LITERAL2>
-
-		<!-- Operators -->
-			<OPERATOR>div</OPERATOR>
-			<OPERATOR>mod</OPERATOR>
-			<OPERATOR>and</OPERATOR>
-			<OPERATOR>not</OPERATOR>
-			<OPERATOR>or</OPERATOR>
-			<OPERATOR>as</OPERATOR>
-			<OPERATOR>contains</OPERATOR>
-			<OPERATOR>equal</OPERATOR>
-			<OPERATOR>equals</OPERATOR>
-			<OPERATOR>isn't</OPERATOR>
-		</KEYWORDS>
-	</RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/asp.xml b/qpython/src/main/assets/syntax/asp.xml
deleted file mode 100644
index 9bb08a59..00000000
--- a/qpython/src/main/assets/syntax/asp.xml
+++ /dev/null
@@ -1,518 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!-- ASP mode by Andre Kaplan
-	 Updated by Simon Ruggier	-->
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="commentStart" VALUE="&lt;!--" />
-		<PROPERTY NAME="commentEnd" VALUE="--&gt;" />
-	</PROPS>
-
-	<RULES IGNORE_CASE="TRUE">
-		<SEQ TYPE="MARKUP" DELEGATE="ASPVB">&lt;%@LANGUAGE="VBSCRIPT"%</SEQ>
-		<SEQ TYPE="MARKUP" DELEGATE="ASPJS">&lt;%@LANGUAGE="JSCRIPT"%</SEQ>
-		<SEQ TYPE="MARKUP" DELEGATE="ASPJS">&lt;%@LANGUAGE="JAVASCRIPT"%</SEQ>
-		<SEQ TYPE="MARKUP" DELEGATE="ASPPL">&lt;%@LANGUAGE="PERLSCRIPT"%</SEQ>
-
-		<!-- Inlined server-side VBScript -->
-		<SPAN TYPE="MARKUP" DELEGATE="vbscript::MAIN">
-			<BEGIN>&lt;%</BEGIN>
-			<END>%&gt;</END>
-		</SPAN>
-
-		<!-- Server-side VBScript -->
-		<SPAN TYPE="MARKUP" DELEGATE="vbscript::MAIN">
-			<BEGIN>&lt;script language="vbscript" runat="server"&gt;</BEGIN>
-			<END>&lt;/script&gt;</END>
-		</SPAN>
-
-		<!-- Server-side Javascript -->
-		<SPAN TYPE="MARKUP" DELEGATE="javascript::MAIN">
-			<BEGIN>&lt;script language="jscript" runat="server"&gt;</BEGIN>
-			<END>&lt;/script&gt;</END>
-		</SPAN>
-
-		<SPAN TYPE="MARKUP" DELEGATE="javascript::MAIN">
-			<BEGIN>&lt;script language="javascript" runat="server"&gt;</BEGIN>
-			<END>&lt;/script&gt;</END>
-		</SPAN>
-
-		<!-- Server-side PerlScript -->
-		<SPAN TYPE="MARKUP" DELEGATE="perl::MAIN">
-			<BEGIN>&lt;script language="perlscript" runat="server"&gt;</BEGIN>
-			<END>&lt;/script&gt;</END>
-		</SPAN>
-
-		<!-- Client-side javascript -->
-		<SPAN TYPE="MARKUP" DELEGATE="ASPVB_CSJS">
-			<BEGIN>&lt;script language="jscript"&gt;</BEGIN>
-			<END>&lt;/script&gt;</END>
-		</SPAN>
-
-		<SPAN TYPE="MARKUP" DELEGATE="ASPVB_CSJS">
-			<BEGIN>&lt;script language="javascript"&gt;</BEGIN>
-			<END>&lt;/script&gt;</END>
-		</SPAN>
-
-		<SPAN TYPE="MARKUP" DELEGATE="ASPVB_CSJS">
-			<BEGIN>&lt;script&gt;</BEGIN>
-			<END>&lt;/script&gt;</END>
-		</SPAN>
-
-		<!-- Server-Side include -->
-		<SPAN TYPE="MARKUP">
-			<BEGIN>&lt;!--#</BEGIN>
-			<END>--&gt;</END>
-		</SPAN>
-
-		<!-- SGML comment -->
-		<SPAN TYPE="COMMENT1" DELEGATE="ASPVB_SGML">
-			<BEGIN>&lt;!--</BEGIN>
-			<END>--&gt;</END>
-		</SPAN>
-
-		<!-- stylesheet -->
-		<SPAN TYPE="MARKUP" DELEGATE="ASPVB_STYLE">
-			<BEGIN>&lt;STYLE&gt;</BEGIN>
-			<END>&lt;/STYLE&gt;</END>
-		</SPAN>
-
-		<!-- markup tags -->
-		<SPAN TYPE="MARKUP" DELEGATE="ASPVB_TAGS">
-			<BEGIN>&lt;</BEGIN>
-			<END>&gt;</END>
-		</SPAN>
-
-		<!-- SGML entities -->
-		<SPAN TYPE="LITERAL2" NO_WORD_BREAK="TRUE">
-			<BEGIN>&amp;</BEGIN>
-			<END>;</END>
-		</SPAN>
-	</RULES>
-
-	<!-- ******************************************************************
-	     ASP with VBScript as default script engine
-	     ****************************************************************** -->
-	<RULES SET="ASPVB" IGNORE_CASE="TRUE">
-		<!-- Inlined server-side VBScript -->
-		<SPAN TYPE="MARKUP" DELEGATE="vbscript::MAIN">
-			<BEGIN>&lt;%</BEGIN>
-			<END>%&gt;</END>
-		</SPAN>
-
-		<!-- Server-side VBScript -->
-		<SPAN TYPE="MARKUP" DELEGATE="vbscript::MAIN">
-			<BEGIN>&lt;script language="vbscript" runat="server"&gt;</BEGIN>
-			<END>&lt;/script&gt;</END>
-		</SPAN>
-
-		<!-- Server-side Javascript -->
-		<SPAN TYPE="MARKUP" DELEGATE="javascript::MAIN">
-			<BEGIN>&lt;script language="jscript" runat="server"&gt;</BEGIN>
-			<END>&lt;/script&gt;</END>
-		</SPAN>
-
-		<SPAN TYPE="MARKUP" DELEGATE="javascript::MAIN">
-			<BEGIN>&lt;script language="javascript" runat="server"&gt;</BEGIN>
-			<END>&lt;/script&gt;</END>
-		</SPAN>
-
-		<!-- Server-side PerlScript -->
-		<SPAN TYPE="MARKUP" DELEGATE="perl::MAIN">
-			<BEGIN>&lt;script language="perlscript" runat="server"&gt;</BEGIN>
-			<END>&lt;/script&gt;</END>
-		</SPAN>
-
-		<!-- Client-side javascript -->
-		<SPAN TYPE="MARKUP" DELEGATE="ASPVB_CSJS">
-			<BEGIN>&lt;script language="jscript"</BEGIN>
-			<END>&lt;/script&gt;</END>
-		</SPAN>
-
-		<SPAN TYPE="MARKUP" DELEGATE="ASPVB_CSJS">
-			<BEGIN>&lt;script language="javascript"</BEGIN>
-			<END>&lt;/script&gt;</END>
-		</SPAN>
-
-		<SPAN TYPE="MARKUP" DELEGATE="ASPVB_CSJS">
-			<BEGIN>&lt;script&gt;</BEGIN>
-			<END>&lt;/script&gt;</END>
-		</SPAN>
-
-		<!-- Server-Side include -->
-		<SPAN TYPE="MARKUP">
-			<BEGIN>&lt;!--#</BEGIN>
-			<END>--&gt;</END>
-		</SPAN>
-
-		<!-- SGML comment -->
-		<SPAN TYPE="COMMENT1" DELEGATE="ASPVB_SGML">
-			<BEGIN>&lt;!--</BEGIN>
-			<END>--&gt;</END>
-		</SPAN>
-
-		<!-- stylesheet -->
-		<SPAN TYPE="MARKUP" DELEGATE="ASPVB_STYLE">
-			<BEGIN>&lt;STYLE&gt;</BEGIN>
-			<END>&lt;/STYLE&gt;</END>
-		</SPAN>
-
-		<!-- markup tags -->
-		<SPAN TYPE="MARKUP" DELEGATE="ASPVB_TAGS">
-			<BEGIN>&lt;/</BEGIN>
-			<END>&gt;</END>
-		</SPAN>
-
-		<SPAN TYPE="MARKUP" DELEGATE="ASPVB_TAGS">
-			<BEGIN>&lt;</BEGIN>
-			<END>&gt;</END>
-		</SPAN>
-
-		<!-- SGML entities -->
-		<SPAN TYPE="LITERAL2" NO_WORD_BREAK="TRUE">
-			<BEGIN>&amp;</BEGIN>
-			<END>;</END>
-		</SPAN>
-	</RULES>
-
-	<!-- ******************************************************************
-	     ASP with JScript as default script engine
-	     ****************************************************************** -->
-	<RULES SET="ASPJS" IGNORE_CASE="TRUE">
-		<!-- Inlined server-side Javascript -->
-		<SPAN TYPE="MARKUP" DELEGATE="javascript::MAIN">
-			<BEGIN>&lt;%</BEGIN>
-			<END>%&gt;</END>
-		</SPAN>
-
-		<!-- Server-side VBScript -->
-		<SPAN TYPE="MARKUP" DELEGATE="vbscript::MAIN">
-			<BEGIN>&lt;script language="vbscript" runat="server"&gt;</BEGIN>
-			<END>&lt;/script&gt;</END>
-		</SPAN>
-
-		<!-- Server-side Javascript -->
-		<SPAN TYPE="MARKUP" DELEGATE="javascript::MAIN">
-			<BEGIN>&lt;script language="jscript" runat="server"&gt;</BEGIN>
-			<END>&lt;/script&gt;</END>
-		</SPAN>
-
-		<SPAN TYPE="MARKUP" DELEGATE="javascript::MAIN">
-			<BEGIN>&lt;script language="javascript" runat="server"&gt;</BEGIN>
-			<END>&lt;/script&gt;</END>
-		</SPAN>
-
-		<!-- Server-side PerlScript -->
-		<SPAN TYPE="MARKUP" DELEGATE="perl::MAIN">
-			<BEGIN>&lt;script language="perlscript" runat="server"&gt;</BEGIN>
-			<END>&lt;/script&gt;</END>
-		</SPAN>
-
-		<!-- Client-side javascript -->
-		<SPAN TYPE="MARKUP" DELEGATE="ASPJS_CSJS">
-			<BEGIN>&lt;script language="jscript"</BEGIN>
-			<END>&lt;/script&gt;</END>
-		</SPAN>
-
-		<SPAN TYPE="MARKUP" DELEGATE="ASPJS_CSJS">
-			<BEGIN>&lt;script language="javascript"</BEGIN>
-			<END>&lt;/script&gt;</END>
-		</SPAN>
-
-		<SPAN TYPE="MARKUP" DELEGATE="ASPJS_CSJS">
-			<BEGIN>&lt;script&gt;</BEGIN>
-			<END>&lt;/script&gt;</END>
-		</SPAN>
-
-		<!-- Server-Side include -->
-		<SPAN TYPE="MARKUP">
-			<BEGIN>&lt;!--#</BEGIN>
-			<END>--&gt;</END>
-		</SPAN>
-
-		<!-- SGML comment -->
-		<SPAN TYPE="COMMENT1" DELEGATE="ASPJS_SGML">
-			<BEGIN>&lt;!--</BEGIN>
-			<END>--&gt;</END>
-		</SPAN>
-
-		<!-- stylesheet -->
-		<SPAN TYPE="MARKUP" DELEGATE="ASPJS_STYLE">
-			<BEGIN>&lt;STYLE&gt;</BEGIN>
-			<END>&lt;/STYLE&gt;</END>
-		</SPAN>
-
-		<!-- markup tags -->
-		<SPAN TYPE="MARKUP" DELEGATE="ASPJS_TAGS">
-			<BEGIN>&lt;/</BEGIN>
-			<END>&gt;</END>
-		</SPAN>
-
-		<SPAN TYPE="MARKUP" DELEGATE="ASPJS_TAGS">
-			<BEGIN>&lt;</BEGIN>
-			<END>&gt;</END>
-		</SPAN>
-
-		<!-- SGML entities -->
-		<SPAN TYPE="LITERAL2" NO_WORD_BREAK="TRUE">
-			<BEGIN>&amp;</BEGIN>
-			<END>;</END>
-		</SPAN>
-	</RULES>
-
-	<!-- ******************************************************************
-	     ASP with PerlScript as default script engine
-	     ****************************************************************** -->
-	<RULES SET="ASPPL" IGNORE_CASE="TRUE">
-		<!-- Inlined server-side Perlscript -->
-		<SPAN TYPE="MARKUP" DELEGATE="perl::MAIN">
-			<BEGIN>&lt;%</BEGIN>
-			<END>%&gt;</END>
-		</SPAN>
-
-		<!-- Server-side VBScript -->
-		<SPAN TYPE="MARKUP" DELEGATE="vbscript::MAIN">
-			<BEGIN>&lt;script language="vbscript" runat="server"&gt;</BEGIN>
-			<END>&lt;/script&gt;</END>
-		</SPAN>
-
-		<!-- Server-side Javascript -->
-		<SPAN TYPE="MARKUP" DELEGATE="javascript::MAIN">
-			<BEGIN>&lt;script language="jscript" runat="server"&gt;</BEGIN>
-			<END>&lt;/script&gt;</END>
-		</SPAN>
-
-		<SPAN TYPE="MARKUP" DELEGATE="javascript::MAIN">
-			<BEGIN>&lt;script language="javascript" runat="server"</BEGIN>
-			<END>&lt;/script&gt;</END>
-		</SPAN>
-
-		<!-- Server-side PerlScript -->
-		<SPAN TYPE="MARKUP" DELEGATE="perl::MAIN">
-			<BEGIN>&lt;script language="perlscript" runat="server"&gt;</BEGIN>
-			<END>&lt;/script&gt;</END>
-		</SPAN>
-
-		<!-- Client-side javascript -->
-		<SPAN TYPE="MARKUP" DELEGATE="ASPPL_CSJS">
-			<BEGIN>&lt;script language="jscript"</BEGIN>
-			<END>&lt;/script&gt;</END>
-		</SPAN>
-
-		<SPAN TYPE="MARKUP" DELEGATE="ASPPL_CSJS">
-			<BEGIN>&lt;script language="javascript"</BEGIN>
-			<END>&lt;/script&gt;</END>
-		</SPAN>
-
-		<SPAN TYPE="MARKUP" DELEGATE="ASPPL_CSJS">
-			<BEGIN>&lt;script&gt;</BEGIN>
-			<END>&lt;/script&gt;</END>
-		</SPAN>
-
-		<!-- Server-Side include -->
-		<SPAN TYPE="MARKUP">
-			<BEGIN>&lt;!--#</BEGIN>
-			<END>--&gt;</END>
-		</SPAN>
-
-		<!-- SGML comment -->
-		<SPAN TYPE="COMMENT1" DELEGATE="ASPPL_SGML">
-			<BEGIN>&lt;!--</BEGIN>
-			<END>--&gt;</END>
-		</SPAN>
-
-		<!-- stylesheet -->
-		<SPAN TYPE="MARKUP" DELEGATE="ASPPL_STYLE">
-			<BEGIN>&lt;STYLE&gt;</BEGIN>
-			<END>&lt;/STYLE&gt;</END>
-		</SPAN>
-
-		<!-- markup tags -->
-		<SPAN TYPE="MARKUP" DELEGATE="ASPPL_TAGS">
-			<BEGIN>&lt;/</BEGIN>
-			<END>&gt;</END>
-		</SPAN>
-
-		<SPAN TYPE="MARKUP" DELEGATE="ASPPL_TAGS">
-			<BEGIN>&lt;</BEGIN>
-			<END>&gt;</END>
-		</SPAN>
-
-		<!-- SGML entities -->
-		<SPAN TYPE="LITERAL2" NO_WORD_BREAK="TRUE">
-			<BEGIN>&amp;</BEGIN>
-			<END>;</END>
-		</SPAN>
-	</RULES>
-
-	<!-- ******************************************************************
-	     HTML Tags
-	     ****************************************************************** -->
-	<RULES SET="ASPVB_TAGS" DEFAULT="MARKUP">
-		<!-- Server-side VBScript -->
-		<SPAN TYPE="MARKUP" DELEGATE="vbscript::MAIN">
-			<BEGIN>&lt;%</BEGIN>
-			<END>%&gt;</END>
-		</SPAN>
-
-		<SPAN TYPE="LITERAL1" DELEGATE ="ASPVB_LIT1">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-
-		<SPAN TYPE="LITERAL1" DELEGATE ="ASPVB_LIT1">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-
-		<SEQ TYPE="OPERATOR">=</SEQ>		
-	</RULES>
-
-	<RULES SET="ASPVB_LIT1" DEFAULT="LITERAL1">
-		<!-- Server-side VBScript -->
-		<SPAN TYPE="MARKUP" DELEGATE="vbscript::MAIN">
-			<BEGIN>&lt;%</BEGIN>
-			<END>%&gt;</END>
-		</SPAN>
-	</RULES>
-
-	<RULES SET="ASPJS_TAGS" DEFAULT="MARKUP">
-		<!-- Server-side JavaScript -->
-		<SPAN TYPE="MARKUP" DELEGATE="javascript::MAIN">
-			<BEGIN>&lt;%</BEGIN>
-			<END>%&gt;</END>
-		</SPAN>
-
-		<SPAN TYPE="LITERAL1" DELEGATE ="ASPJS_LIT1">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-
-		<SPAN TYPE="LITERAL1" DELEGATE ="ASPJS_LIT1">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-
-		<SEQ TYPE="OPERATOR">=</SEQ>		
-	</RULES>
-	
-	<RULES SET="ASPJS_LIT1" DEFAULT="LITERAL1">
-		<!-- Server-side JavaScript -->
-		<SPAN TYPE="MARKUP" DELEGATE="javascript::MAIN">
-			<BEGIN>&lt;%</BEGIN>
-			<END>%&gt;</END>
-		</SPAN>
-	</RULES>
-
-	<RULES SET="ASPPL_TAGS" DEFAULT="MARKUP">
-		<!-- Server-side PerlScript -->
-		<SPAN TYPE="MARKUP" DELEGATE="perl::MAIN">
-			<BEGIN>&lt;%</BEGIN>
-			<END>%&gt;</END>
-		</SPAN>
-
-		<SPAN TYPE="LITERAL1" DELEGATE ="ASPPL_LIT1">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-
-		<SPAN TYPE="LITERAL1" DELEGATE ="ASPPL_LIT1">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-
-		<SEQ TYPE="OPERATOR">=</SEQ>		
-	</RULES>
-
-	<RULES SET="ASPPL_LIT1" DEFAULT="LITERAL1">
-		<!-- Server-side PerlScript -->
-		<SPAN TYPE="MARKUP" DELEGATE="perl::MAIN">
-			<BEGIN>&lt;%</BEGIN>
-			<END>%&gt;</END>
-		</SPAN>
-	</RULES>
-	
-	<!-- These three rules sets handle server side scripts being mixed into client side javascript -->
-	<RULES SET="ASPVB_CSJS">
-		<!-- Server-side VBScript -->
-		<SPAN TYPE="MARKUP" DELEGATE="vbscript::MAIN">
-			<BEGIN>&lt;%</BEGIN>
-			<END>%&gt;</END>
-		</SPAN>
-		<IMPORT DELEGATE="javascript::MAIN"/>
-	</RULES>
-	
-	<RULES SET="ASPJS_CSJS">
-		<!-- Server-side JavaScript -->
-		<SPAN TYPE="MARKUP" DELEGATE="javascript::MAIN">
-			<BEGIN>&lt;%</BEGIN>
-			<END>%&gt;</END>
-		</SPAN>
-		<IMPORT DELEGATE="javascript::MAIN"/>
-	</RULES>
-
-	<RULES SET="ASPPL_CSJS">
-		<!-- Server-side PerlScript -->
-		<SPAN TYPE="MARKUP" DELEGATE="perl::MAIN">
-			<BEGIN>&lt;%</BEGIN>
-			<END>%&gt;</END>
-		</SPAN>
-		<IMPORT DELEGATE="javascript::MAIN"/>
-	</RULES>
-	
-	<!-- These three rules sets handle server side scripts being mixed into stylesheets -->
-	<RULES SET="ASPVB_STYLE">
-		<!-- Server-side VBScript -->
-		<SPAN TYPE="MARKUP" DELEGATE="vbscript::MAIN">
-			<BEGIN>&lt;%</BEGIN>
-			<END>%&gt;</END>
-		</SPAN>
-		<IMPORT DELEGATE="css::MAIN"/>
-	</RULES>
-	
-	<RULES SET="ASPJS_STYLE">
-		<!-- Server-side JavaScript -->
-		<SPAN TYPE="MARKUP" DELEGATE="javascript::MAIN">
-			<BEGIN>&lt;%</BEGIN>
-			<END>%&gt;</END>
-		</SPAN>
-		<IMPORT DELEGATE="css::MAIN"/>
-	</RULES>
-
-	<RULES SET="ASPPL_STYLE">
-		<!-- Server-side PerlScript -->
-		<SPAN TYPE="MARKUP" DELEGATE="perl::MAIN">
-			<BEGIN>&lt;%</BEGIN>
-			<END>%&gt;</END>
-		</SPAN>
-		<IMPORT DELEGATE="css::MAIN"/>
-	</RULES>
-
-	<!-- These three rules sets handle server side scripts being mixed into SGML Comments -->
-	<RULES SET="ASPVB_SGML" DEFAULT="COMMENT1">
-		<!-- Server-side VBScript -->
-		<SPAN TYPE="MARKUP" DELEGATE="vbscript::MAIN">
-			<BEGIN>&lt;%</BEGIN>
-			<END>%&gt;</END>
-		</SPAN>
-	</RULES>
-
-	<RULES SET="ASPJS_SGML" DEFAULT="COMMENT1">
-		<!-- Server-side JavaScript -->
-		<SPAN TYPE="MARKUP" DELEGATE="javascript::MAIN">
-			<BEGIN>&lt;%</BEGIN>
-			<END>%&gt;</END>
-		</SPAN>
-	</RULES>
-
-	<RULES SET="ASPPL_SGML" DEFAULT="COMMENT1">
-		<!-- Server-side PerlScript -->
-		<SPAN TYPE="MARKUP" DELEGATE="perl::MAIN">
-			<BEGIN>&lt;%</BEGIN>
-			<END>%&gt;</END>
-		</SPAN>
-	</RULES>
-</MODE>
-
diff --git a/qpython/src/main/assets/syntax/aspect_j.xml b/qpython/src/main/assets/syntax/aspect_j.xml
deleted file mode 100644
index 7695d3ef..00000000
--- a/qpython/src/main/assets/syntax/aspect_j.xml
+++ /dev/null
@@ -1,167 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<MODE>
-        <PROPS>
-                <PROPERTY NAME="indentOpenBrackets" VALUE="{" />
-                <PROPERTY NAME="indentCloseBrackets" VALUE="}" />
-                <PROPERTY NAME="indentPrevLine"
-                        VALUE="\s*(((if|while)\s*\(|else\s*|else\s+if\s*\(|for\s*\(.*\))[^{;]*)" />
-                <!-- set this to 'true' if you want to use GNU coding style -->
-                <PROPERTY NAME="doubleBracketIndent" VALUE="false" />
-                <PROPERTY NAME="commentStart" VALUE="/*" />
-                <PROPERTY NAME="commentEnd" VALUE="*/" />
-                <PROPERTY NAME="lineComment" VALUE="//" />
-                <PROPERTY NAME="wordBreakChars" VALUE=",+-=&lt;&gt;/?^&amp;*" />
-        </PROPS>
-        <RULES IGNORE_CASE="FALSE"
-                HIGHLIGHT_DIGITS="TRUE"
-                DIGIT_RE="(0x)?[\p{XDigit}]+[lLdDfF]?">
-
-                <!-- Silly comment -->
-                <SEQ TYPE="COMMENT1">/**/</SEQ>
-
-                <!-- Javadoc comment -->
-                <SPAN TYPE="COMMENT3" DELEGATE="java::JAVADOC">
-                        <BEGIN>/**</BEGIN>
-                        <END>*/</END>
-                </SPAN>
-
-                <!-- Java comment (C style) -->
-                <SPAN TYPE="COMMENT1">
-                        <BEGIN>/*</BEGIN>
-                        <END>*/</END>
-                </SPAN>
-
-                <SPAN TYPE="LITERAL1" ESCAPE="\" NO_LINE_BREAK="TRUE">
-                        <BEGIN>"</BEGIN>
-                        <END>"</END>
-                </SPAN>
-                <SPAN TYPE="LITERAL1" ESCAPE="\" NO_LINE_BREAK="TRUE">
-                        <BEGIN>'</BEGIN>
-                        <END>'</END>
-                </SPAN>
-
-                <EOL_SPAN TYPE="COMMENT2">//</EOL_SPAN>
-
-                <SEQ TYPE="OPERATOR">=</SEQ>
-                <SEQ TYPE="OPERATOR">!</SEQ>
-                <SEQ TYPE="OPERATOR">&gt;=</SEQ>
-                <SEQ TYPE="OPERATOR">&lt;=</SEQ>
-                <SEQ TYPE="OPERATOR">+</SEQ>
-                <SEQ TYPE="OPERATOR">-</SEQ>
-                <SEQ TYPE="OPERATOR">/</SEQ>
-
-                <!-- workaround to stop "*" from being colorized
-                     in import statements. -->
-                <SEQ TYPE="NULL">.*</SEQ>
-
-                <SEQ TYPE="OPERATOR">*</SEQ>
-                <SEQ TYPE="OPERATOR">&gt;</SEQ>
-                <SEQ TYPE="OPERATOR">&lt;</SEQ>
-                <SEQ TYPE="OPERATOR">%</SEQ>
-                <SEQ TYPE="OPERATOR">&amp;</SEQ>
-                <SEQ TYPE="OPERATOR">|</SEQ>
-                <SEQ TYPE="OPERATOR">^</SEQ>
-                <SEQ TYPE="OPERATOR">~</SEQ>
-                <SEQ TYPE="OPERATOR">}</SEQ>
-                <SEQ TYPE="OPERATOR">{</SEQ>
-                <MARK_PREVIOUS TYPE="LABEL" MATCH_TYPE="OPERATOR"
-                        AT_WHITESPACE_END="TRUE">:</MARK_PREVIOUS>
-
-                <!-- Function calls -->
-                <MARK_PREVIOUS TYPE="FUNCTION" MATCH_TYPE="OPERATOR">(</MARK_PREVIOUS>
-				<SEQ TYPE="OPERATOR">)</SEQ>
-
-                <KEYWORDS>
-                        <KEYWORD1>abstract</KEYWORD1>
-						<KEYWORD1>break</KEYWORD1>
-						<KEYWORD1>case</KEYWORD1>
-						<KEYWORD1>catch</KEYWORD1>
-						<KEYWORD1>continue</KEYWORD1>
-						<KEYWORD1>default</KEYWORD1>
-						<KEYWORD1>do</KEYWORD1>
-						<KEYWORD1>else</KEYWORD1>
-						<KEYWORD1>extends</KEYWORD1>
-						<KEYWORD1>final</KEYWORD1>
-						<KEYWORD1>finally</KEYWORD1>
-						<KEYWORD1>for</KEYWORD1>
-						<KEYWORD1>if</KEYWORD1>
-						<KEYWORD1>implements</KEYWORD1>
-						<KEYWORD1>instanceof</KEYWORD1>
-						<KEYWORD1>native</KEYWORD1>
-						<KEYWORD1>new</KEYWORD1>
-						<KEYWORD1>private</KEYWORD1>
-						<KEYWORD1>protected</KEYWORD1>
-						<KEYWORD1>public</KEYWORD1>
-						<KEYWORD1>return</KEYWORD1>
-						<KEYWORD1>static</KEYWORD1>
-						<KEYWORD1>switch</KEYWORD1>
-						<KEYWORD1>synchronized</KEYWORD1>
-						<KEYWORD1>throw</KEYWORD1>
-						<KEYWORD1>throws</KEYWORD1>
-						<KEYWORD1>transient</KEYWORD1>
-						<KEYWORD1>try</KEYWORD1>
-						<KEYWORD1>volatile</KEYWORD1>
-						<KEYWORD1>while</KEYWORD1>
-
-						<KEYWORD2>package</KEYWORD2>
-						<KEYWORD2>import</KEYWORD2>
-
-						<KEYWORD3>boolean</KEYWORD3>
-						<KEYWORD3>byte</KEYWORD3>
-						<KEYWORD3>char</KEYWORD3>
-						<KEYWORD3>class</KEYWORD3>
-						<KEYWORD3>double</KEYWORD3>
-						<KEYWORD3>float</KEYWORD3>
-						<KEYWORD3>int</KEYWORD3>
-						<KEYWORD3>interface</KEYWORD3>
-						<KEYWORD3>long</KEYWORD3>
-						<KEYWORD3>short</KEYWORD3>
-						<KEYWORD3>void</KEYWORD3>
-
-						<FUNCTION>assert</FUNCTION>
-						<KEYWORD1>strictfp</KEYWORD1>
-
-						<LITERAL2>false</LITERAL2>
-						<LITERAL2>null</LITERAL2>
-						<LITERAL2>super</LITERAL2>
-						<LITERAL2>this</LITERAL2>
-						<LITERAL2>true</LITERAL2>
-
-						<INVALID>goto</INVALID>
-						<INVALID>const</INVALID>
-
-                        <KEYWORD4>args</KEYWORD4>
-                        <KEYWORD4>percflow</KEYWORD4>
-                        <KEYWORD4>get</KEYWORD4>
-                        <KEYWORD4>set</KEYWORD4>
-                        <KEYWORD4>preinitialization</KEYWORD4>
-                        <KEYWORD4>handler</KEYWORD4>
-                        <KEYWORD4>adviceexecution</KEYWORD4>
-                        <KEYWORD4>cflow</KEYWORD4>
-                        <KEYWORD4>target</KEYWORD4>
-                        <KEYWORD4>cflowbelow</KEYWORD4>
-                        <KEYWORD4>withincode</KEYWORD4>
-                        <KEYWORD4>declare</KEYWORD4>
-                        <KEYWORD4>precedence</KEYWORD4>
-                        <KEYWORD4>issingleton</KEYWORD4>
-                        <KEYWORD4>perthis</KEYWORD4>
-                        <KEYWORD4>pertarget</KEYWORD4>
-                        <KEYWORD4>privileged</KEYWORD4>
-                        <KEYWORD4>after</KEYWORD4>
-                        <KEYWORD4>around</KEYWORD4>
-                        <KEYWORD4>aspect</KEYWORD4>
-                        <KEYWORD4>before</KEYWORD4>
-                        <KEYWORD4>call</KEYWORD4>
-                        <KEYWORD4>execution</KEYWORD4>
-                        <KEYWORD4>initialization</KEYWORD4>
-                        <KEYWORD4>pointcut</KEYWORD4>
-                        <KEYWORD4>proceed</KEYWORD4>
-                        <KEYWORD4>staticinitialization</KEYWORD4>
-                        <KEYWORD4>within</KEYWORD4>
-                        <KEYWORD4>..</KEYWORD4>
-                </KEYWORDS>
-        </RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/assembly_agc.xml b/qpython/src/main/assets/syntax/assembly_agc.xml
deleted file mode 100644
index ce43b0fe..00000000
--- a/qpython/src/main/assets/syntax/assembly_agc.xml
+++ /dev/null
@@ -1,439 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!-- Apollo Guidance Computer (AGC) Assembly mode by Jim Lawton (jim DOT lawton AT gmail DOT com). -->
-
-<MODE>
-
-	<PROPS>
-		<PROPERTY NAME="lineComment" VALUE="#"/>
-		<PROPERTY NAME="contextInsensitive" VALUE="true"/>
-	</PROPS>
-
-	<RULES HIGHLIGHT_DIGITS="TRUE" IGNORE_CASE="TRUE">
-		<!-- Comments -->
-		<EOL_SPAN TYPE="COMMENT2">##</EOL_SPAN>
-		<EOL_SPAN TYPE="COMMENT1">#</EOL_SPAN>
-
-		<!-- Labels -->
-		<SEQ_REGEXP HASH_CHARS="ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890+-/*=()?'.&amp;" AT_LINE_START="TRUE"
-			    TYPE="LABEL">[0-9A-Z+-/*=()?'.&amp;]+
-		</SEQ_REGEXP>
-		<!-- +/- Pseudo-labels (comments really) -->
-		<SEQ_REGEXP HASH_CHARS=" +-" AT_LINE_START="TRUE" TYPE="COMMENT3">[0-9+-]+</SEQ_REGEXP>
-
-		<!-- Octal numbers (default). -->
-		<SEQ_REGEXP HASH_CHARS="+-01234567" AT_WORD_START="TRUE" TYPE="DIGIT">[+-]*[0-7]+[ \t]</SEQ_REGEXP>
-		<SEQ_REGEXP HASH_CHARS="+-01234567" AT_WORD_START="TRUE" TYPE="DIGIT">[+-]*[0-7]+$</SEQ_REGEXP>
-		<SEQ_REGEXP HASH_CHARS="+-01234567" AT_WORD_START="TRUE" TYPE="DIGIT">[+-]*[0-7]+[,$]</SEQ_REGEXP>
-		<!-- Decimal numbers specified by trailing D. -->
-		<SEQ_REGEXP HASH_CHARS="+-0123456789" AT_WORD_START="TRUE" TYPE="DIGIT">[+-]*[0-9]+D[ \t]</SEQ_REGEXP>
-		<SEQ_REGEXP HASH_CHARS="+-0123456789" AT_WORD_START="TRUE" TYPE="DIGIT">[+-]*[0-9]+D$</SEQ_REGEXP>
-		<SEQ_REGEXP HASH_CHARS="+-0123456789" AT_WORD_START="TRUE" TYPE="DIGIT">[+-]*[0-9]+D[,$]</SEQ_REGEXP>
-
-		<!-- Binary Operators -->
-		<SEQ TYPE="OPERATOR">+</SEQ>
-		<SEQ TYPE="OPERATOR">-</SEQ>
-
-		<KEYWORDS>
-			<!-- Block I Registers -->
-			<KEYWORD3>D</KEYWORD3>
-			<KEYWORD3>Z</KEYWORD3>
-			<KEYWORD3>N</KEYWORD3>
-			<KEYWORD3>SL</KEYWORD3>
-			<KEYWORD3>BI</KEYWORD3>
-			<KEYWORD3>EDH</KEYWORD3>
-			<KEYWORD3>CLHP</KEYWORD3>
-			<KEYWORD3>HP</KEYWORD3>
-			<KEYWORD3>LP</KEYWORD3>
-			<KEYWORD3>ZI</KEYWORD3>
-			<KEYWORD3>IN0</KEYWORD3>
-			<KEYWORD3>IN1</KEYWORD3>
-			<KEYWORD3>IN2</KEYWORD3>
-			<KEYWORD3>IN3</KEYWORD3>
-			<KEYWORD3>IN4</KEYWORD3>
-			<KEYWORD3>IN5</KEYWORD3>
-			<KEYWORD3>OUT0</KEYWORD3>
-			<KEYWORD3>OUT1</KEYWORD3>
-			<KEYWORD3>OUT2</KEYWORD3>
-			<KEYWORD3>OUT3</KEYWORD3>
-			<KEYWORD3>OUT4</KEYWORD3>
-			<KEYWORD3>RIP</KEYWORD3>
-
-			<!-- Block II Registers -->
-			<KEYWORD3>A</KEYWORD3>
-			<KEYWORD3>L</KEYWORD3>
-			<KEYWORD3>Q</KEYWORD3>
-			<KEYWORD3>EB</KEYWORD3>
-			<KEYWORD3>FB</KEYWORD3>
-			<KEYWORD3>Z</KEYWORD3>
-			<KEYWORD3>BB</KEYWORD3>
-			<KEYWORD3>ARUPT</KEYWORD3>
-			<KEYWORD3>LRUPT</KEYWORD3>
-			<KEYWORD3>QRUPT</KEYWORD3>
-			<KEYWORD3>ZRUPT</KEYWORD3>
-			<KEYWORD3>BBRUPT</KEYWORD3>
-			<KEYWORD3>BRUPT</KEYWORD3>
-			<KEYWORD3>CYR</KEYWORD3>
-			<KEYWORD3>SR</KEYWORD3>
-			<KEYWORD3>CYL</KEYWORD3>
-			<KEYWORD3>EDOP</KEYWORD3>
-
-			<!-- Block I Directives -->
-			<FUNCTION>-CADR</FUNCTION>
-			<FUNCTION>XCADR</FUNCTION>
-
-			<!-- Block II Directives -->
-			<FUNCTION>=</FUNCTION>
-			<FUNCTION>=MINUS</FUNCTION>
-			<FUNCTION>=ECADR</FUNCTION>
-			<FUNCTION>-2CADR</FUNCTION>
-			<FUNCTION>-GENADR</FUNCTION>
-			<FUNCTION>2BCADR</FUNCTION>
-			<FUNCTION>2CADR</FUNCTION>
-			<FUNCTION>2DEC</FUNCTION>
-			<FUNCTION>2DEC*</FUNCTION>
-			<FUNCTION>2FCADR</FUNCTION>
-			<FUNCTION>2OCT</FUNCTION>
-			<FUNCTION>ADRES</FUNCTION>
-			<FUNCTION>BANK</FUNCTION>
-			<FUNCTION>BBCON</FUNCTION>
-			<FUNCTION>BBCON*</FUNCTION>
-			<FUNCTION>BLOCK</FUNCTION>
-			<FUNCTION>BNKSUM</FUNCTION>
-			<FUNCTION>CADR</FUNCTION>
-			<FUNCTION>CHECK=</FUNCTION>
-			<FUNCTION>COUNT</FUNCTION>
-			<FUNCTION>COUNT*</FUNCTION>
-			<FUNCTION>DEC</FUNCTION>
-			<FUNCTION>DEC*</FUNCTION>
-			<FUNCTION>EBANK=</FUNCTION>
-			<FUNCTION>ECADR</FUNCTION>
-			<FUNCTION>EQUALS</FUNCTION>
-			<FUNCTION>ERASE</FUNCTION>
-			<FUNCTION>FCADR</FUNCTION>
-			<FUNCTION>GENADR</FUNCTION>
-			<FUNCTION>MEMORY</FUNCTION>
-			<FUNCTION>MM</FUNCTION>
-			<FUNCTION>NV</FUNCTION>
-			<FUNCTION>OCT</FUNCTION>
-			<FUNCTION>OCTAL</FUNCTION>
-			<FUNCTION>REMADR</FUNCTION>
-			<FUNCTION>SBANK=</FUNCTION>
-			<FUNCTION>SETLOC</FUNCTION>
-			<FUNCTION>SUBRO</FUNCTION>
-			<FUNCTION>VN</FUNCTION>
-
-			<!-- Block II Downlink Directives -->
-			<FUNCTION>-1DNADR</FUNCTION>
-			<FUNCTION>-2DNADR</FUNCTION>
-			<FUNCTION>-3DNADR</FUNCTION>
-			<FUNCTION>-4DNADR</FUNCTION>
-			<FUNCTION>-5DNADR</FUNCTION>
-			<FUNCTION>-6DNADR</FUNCTION>
-			<FUNCTION>-DNCHAN</FUNCTION>
-			<FUNCTION>-DNPTR</FUNCTION>
-			<FUNCTION>1DNADR</FUNCTION>
-			<FUNCTION>2DNADR</FUNCTION>
-			<FUNCTION>3DNADR</FUNCTION>
-			<FUNCTION>4DNADR</FUNCTION>
-			<FUNCTION>5DNADR</FUNCTION>
-			<FUNCTION>6DNADR</FUNCTION>
-			<FUNCTION>DNCHAN</FUNCTION>
-			<FUNCTION>DNPTR</FUNCTION>
-
-			<!-- Block I Opcodes -->
-			<KEYWORD1>OVIND</KEYWORD1>
-			<KEYWORD1>XAQ</KEYWORD1>
-
-			<!-- Block II Opcodes -->
-			<KEYWORD1>-CCS</KEYWORD1>
-			<KEYWORD1>AD</KEYWORD1>
-			<KEYWORD1>ADS</KEYWORD1>
-			<KEYWORD1>AUG</KEYWORD1>
-			<KEYWORD1>BZF</KEYWORD1>
-			<KEYWORD1>BZMF</KEYWORD1>
-			<KEYWORD1>CA</KEYWORD1>
-			<KEYWORD1>CAE</KEYWORD1>
-			<KEYWORD1>CAF</KEYWORD1>
-			<KEYWORD1>CCS</KEYWORD1>
-			<KEYWORD1>COM</KEYWORD1>
-			<KEYWORD1>CS</KEYWORD1>
-			<KEYWORD1>DAS</KEYWORD1>
-			<KEYWORD1>DCA</KEYWORD1>
-			<KEYWORD1>DCOM</KEYWORD1>
-			<KEYWORD1>DCS</KEYWORD1>
-			<KEYWORD1>DDOUBL</KEYWORD1>
-			<KEYWORD1>DIM</KEYWORD1>
-			<KEYWORD1>DOUBLE</KEYWORD1>
-			<KEYWORD1>DTCB</KEYWORD1>
-			<KEYWORD1>DTCF</KEYWORD1>
-			<KEYWORD1>DV</KEYWORD1>
-			<KEYWORD1>DXCH</KEYWORD1>
-			<KEYWORD1>EDRUPT</KEYWORD1>
-			<KEYWORD1>EXTEND</KEYWORD1>
-			<KEYWORD1>INCR</KEYWORD1>
-			<KEYWORD1>INDEX</KEYWORD1>
-			<KEYWORD1>INHINT</KEYWORD1>
-			<KEYWORD1>LXCH</KEYWORD1>
-			<KEYWORD1>MASK</KEYWORD1>
-			<KEYWORD1>MP</KEYWORD1>
-			<KEYWORD1>MSU</KEYWORD1>
-			<KEYWORD1>NDX</KEYWORD1>
-			<KEYWORD1>NOOP</KEYWORD1>
-			<KEYWORD1>OVSK</KEYWORD1>
-			<KEYWORD1>QXCH</KEYWORD1>
-			<KEYWORD1>RAND</KEYWORD1>
-			<KEYWORD1>READ</KEYWORD1>
-			<KEYWORD1>RELINT</KEYWORD1>
-			<KEYWORD1>RESUME</KEYWORD1>
-			<KEYWORD1>RETURN</KEYWORD1>
-			<KEYWORD1>ROR</KEYWORD1>
-			<KEYWORD1>RXOR</KEYWORD1>
-			<KEYWORD1>SQUARE</KEYWORD1>
-			<KEYWORD1>SU</KEYWORD1>
-			<KEYWORD1>TC</KEYWORD1>
-			<KEYWORD1>TCR</KEYWORD1>
-			<KEYWORD1>TCAA</KEYWORD1>
-			<KEYWORD1>TCF</KEYWORD1>
-			<KEYWORD1>TS</KEYWORD1>
-			<KEYWORD1>WAND</KEYWORD1>
-			<KEYWORD1>WOR</KEYWORD1>
-			<KEYWORD1>WRITE</KEYWORD1>
-			<KEYWORD1>XCH</KEYWORD1>
-			<KEYWORD1>XLQ</KEYWORD1>
-			<KEYWORD1>XXALQ</KEYWORD1>
-			<KEYWORD1>ZL</KEYWORD1>
-			<KEYWORD1>ZQ</KEYWORD1>
-
-			<!-- Block I Interpreter Opcodes -->
-			<KEYWORD2>ABS*</KEYWORD2>
-			<KEYWORD2>AST,1</KEYWORD2>
-			<KEYWORD2>AST,2</KEYWORD2>
-			<KEYWORD2>BOVF</KEYWORD2>
-			<KEYWORD2>COMP</KEYWORD2>
-			<KEYWORD2>COMP*</KEYWORD2>
-			<KEYWORD2>COS*</KEYWORD2>
-			<KEYWORD2>CROSS</KEYWORD2>
-			<KEYWORD2>DBSU</KEYWORD2>
-			<KEYWORD2>DMOVE</KEYWORD2>
-			<KEYWORD2>DMOVE*</KEYWORD2>
-			<KEYWORD2>DTS</KEYWORD2>
-			<KEYWORD2>ITC</KEYWORD2>
-			<KEYWORD2>ITC*</KEYWORD2>
-			<KEYWORD2>ITCI</KEYWORD2>
-			<KEYWORD2>ITCQ</KEYWORD2>
-			<KEYWORD2>LOAD</KEYWORD2>
-			<KEYWORD2>LODON</KEYWORD2>
-			<KEYWORD2>NOLOD</KEYWORD2>
-			<KEYWORD2>SHIFTL</KEYWORD2>
-			<KEYWORD2>SHIFTR</KEYWORD2>
-			<KEYWORD2>SMOVE</KEYWORD2>
-			<KEYWORD2>SMOVE*</KEYWORD2>
-			<KEYWORD2>SQUARE</KEYWORD2>
-			<KEYWORD2>STZ</KEYWORD2>
-			<KEYWORD2>SWITCH</KEYWORD2>
-			<KEYWORD2>TEST</KEYWORD2>
-			<KEYWORD2>TMOVE</KEYWORD2>
-			<KEYWORD2>TRAD</KEYWORD2>
-			<KEYWORD2>TSLC</KEYWORD2>
-			<KEYWORD2>TSLT</KEYWORD2>
-			<KEYWORD2>TSLT*</KEYWORD2>
-			<KEYWORD2>TSRT</KEYWORD2>
-			<KEYWORD2>TSRT*</KEYWORD2>
-			<KEYWORD2>TSU</KEYWORD2>
-			<KEYWORD2>TTS</KEYWORD2>
-			<KEYWORD2>VMOVE</KEYWORD2>
-			<KEYWORD2>VMOVE*</KEYWORD2>
-			<KEYWORD2>VSLT</KEYWORD2>
-			<KEYWORD2>VSLT*</KEYWORD2>
-			<KEYWORD2>VSQ</KEYWORD2>
-			<KEYWORD2>VSRT</KEYWORD2>
-			<KEYWORD2>VSRT*</KEYWORD2>
-			<KEYWORD2>VTS</KEYWORD2>
-
-			<!-- Block II Interpreter Opcodes -->
-			<KEYWORD2>ABS</KEYWORD2>
-			<KEYWORD2>ABVAL</KEYWORD2>
-			<KEYWORD2>ACOS</KEYWORD2>
-			<KEYWORD2>ARCCOS</KEYWORD2>
-			<KEYWORD2>ARCSIN</KEYWORD2>
-			<KEYWORD2>ASIN</KEYWORD2>
-			<KEYWORD2>AXC,1</KEYWORD2>
-			<KEYWORD2>AXC,2</KEYWORD2>
-			<KEYWORD2>AXT,1</KEYWORD2>
-			<KEYWORD2>AXT,2</KEYWORD2>
-			<KEYWORD2>BDDV</KEYWORD2>
-			<KEYWORD2>BDDV*</KEYWORD2>
-			<KEYWORD2>BDSU</KEYWORD2>
-			<KEYWORD2>BDSU*</KEYWORD2>
-			<KEYWORD2>BHIZ</KEYWORD2>
-			<KEYWORD2>BMN</KEYWORD2>
-			<KEYWORD2>BOFCLR</KEYWORD2>
-			<KEYWORD2>BOF</KEYWORD2>
-			<KEYWORD2>BOFF</KEYWORD2>
-			<KEYWORD2>BOFINV</KEYWORD2>
-			<KEYWORD2>BOFSET</KEYWORD2>
-			<KEYWORD2>BON</KEYWORD2>
-			<KEYWORD2>BONCLR</KEYWORD2>
-			<KEYWORD2>BONINV</KEYWORD2>
-			<KEYWORD2>BONSET</KEYWORD2>
-			<KEYWORD2>BOV</KEYWORD2>
-			<KEYWORD2>BOVB</KEYWORD2>
-			<KEYWORD2>BPL</KEYWORD2>
-			<KEYWORD2>BVSU</KEYWORD2>
-			<KEYWORD2>BVSU*</KEYWORD2>
-			<KEYWORD2>BZE</KEYWORD2>
-			<KEYWORD2>CALL</KEYWORD2>
-			<KEYWORD2>CALRB</KEYWORD2>
-			<KEYWORD2>CCALL</KEYWORD2>
-			<KEYWORD2>CCALL*</KEYWORD2>
-			<KEYWORD2>CGOTO</KEYWORD2>
-			<KEYWORD2>CGOTO*</KEYWORD2>
-			<KEYWORD2>CLEAR</KEYWORD2>
-			<KEYWORD2>CLR</KEYWORD2>
-			<KEYWORD2>CLRGO</KEYWORD2>
-			<KEYWORD2>COS</KEYWORD2>
-			<KEYWORD2>COSINE</KEYWORD2>
-			<KEYWORD2>DAD</KEYWORD2>
-			<KEYWORD2>DAD*</KEYWORD2>
-			<KEYWORD2>DCOMP</KEYWORD2>
-			<KEYWORD2>DDV</KEYWORD2>
-			<KEYWORD2>DDV*</KEYWORD2>
-			<KEYWORD2>DLOAD</KEYWORD2>
-			<KEYWORD2>DLOAD*</KEYWORD2>
-			<KEYWORD2>DMP</KEYWORD2>
-			<KEYWORD2>DMP*</KEYWORD2>
-			<KEYWORD2>DMPR</KEYWORD2>
-			<KEYWORD2>DMPR*</KEYWORD2>
-			<KEYWORD2>DOT</KEYWORD2>
-			<KEYWORD2>DOT*</KEYWORD2>
-			<KEYWORD2>DSQ</KEYWORD2>
-			<KEYWORD2>DSU</KEYWORD2>
-			<KEYWORD2>DSU*</KEYWORD2>
-			<KEYWORD2>EXIT</KEYWORD2>
-			<KEYWORD2>GOTO</KEYWORD2>
-			<KEYWORD2>INCR,1</KEYWORD2>
-			<KEYWORD2>INCR,2</KEYWORD2>
-			<KEYWORD2>INVERT</KEYWORD2>
-			<KEYWORD2>INVGO</KEYWORD2>
-			<KEYWORD2>ITA</KEYWORD2>
-			<KEYWORD2>LXA,1</KEYWORD2>
-			<KEYWORD2>LXA,2</KEYWORD2>
-			<KEYWORD2>LXC,1</KEYWORD2>
-			<KEYWORD2>LXC,2</KEYWORD2>
-			<KEYWORD2>MXV</KEYWORD2>
-			<KEYWORD2>MXV*</KEYWORD2>
-			<KEYWORD2>NORM</KEYWORD2>
-			<KEYWORD2>NORM*</KEYWORD2>
-			<KEYWORD2>PDDL</KEYWORD2>
-			<KEYWORD2>PDDL*</KEYWORD2>
-			<KEYWORD2>PDVL</KEYWORD2>
-			<KEYWORD2>PDVL*</KEYWORD2>
-			<KEYWORD2>PUSH</KEYWORD2>
-			<KEYWORD2>ROUND</KEYWORD2>
-			<KEYWORD2>RTB</KEYWORD2>
-			<KEYWORD2>RVQ</KEYWORD2>
-			<KEYWORD2>SET</KEYWORD2>
-			<KEYWORD2>SETGO</KEYWORD2>
-			<KEYWORD2>SETPD</KEYWORD2>
-			<KEYWORD2>SIGN</KEYWORD2>
-			<KEYWORD2>SIGN*</KEYWORD2>
-			<KEYWORD2>SIN</KEYWORD2>
-			<KEYWORD2>SINE</KEYWORD2>
-			<KEYWORD2>SL1</KEYWORD2>
-			<KEYWORD2>SL1R</KEYWORD2>
-			<KEYWORD2>SL2</KEYWORD2>
-			<KEYWORD2>SL2R</KEYWORD2>
-			<KEYWORD2>SL3</KEYWORD2>
-			<KEYWORD2>SL3R</KEYWORD2>
-			<KEYWORD2>SL4</KEYWORD2>
-			<KEYWORD2>SL4R</KEYWORD2>
-			<KEYWORD2>SL</KEYWORD2>
-			<KEYWORD2>SL*</KEYWORD2>
-			<KEYWORD2>SLOAD</KEYWORD2>
-			<KEYWORD2>SLOAD*</KEYWORD2>
-			<KEYWORD2>SLR</KEYWORD2>
-			<KEYWORD2>SLR*</KEYWORD2>
-			<KEYWORD2>SQRT</KEYWORD2>
-			<KEYWORD2>SR1</KEYWORD2>
-			<KEYWORD2>SR1R</KEYWORD2>
-			<KEYWORD2>SR2</KEYWORD2>
-			<KEYWORD2>SR2R</KEYWORD2>
-			<KEYWORD2>SR3</KEYWORD2>
-			<KEYWORD2>SR3R</KEYWORD2>
-			<KEYWORD2>SR4</KEYWORD2>
-			<KEYWORD2>SR4R</KEYWORD2>
-			<KEYWORD2>SR</KEYWORD2>
-			<KEYWORD2>SR*</KEYWORD2>
-			<KEYWORD2>SRR</KEYWORD2>
-			<KEYWORD2>SRR*</KEYWORD2>
-			<KEYWORD2>SSP</KEYWORD2>
-			<KEYWORD2>SSP*</KEYWORD2>
-			<KEYWORD2>STADR</KEYWORD2>
-			<KEYWORD2>STCALL</KEYWORD2>
-			<KEYWORD2>STODL</KEYWORD2>
-			<KEYWORD2>STODL*</KEYWORD2>
-			<KEYWORD2>STORE</KEYWORD2>
-			<KEYWORD2>STOVL</KEYWORD2>
-			<KEYWORD2>STOVL*</KEYWORD2>
-			<KEYWORD2>STQ</KEYWORD2>
-			<KEYWORD2>SXA,1</KEYWORD2>
-			<KEYWORD2>SXA,2</KEYWORD2>
-			<KEYWORD2>TAD</KEYWORD2>
-			<KEYWORD2>TAD*</KEYWORD2>
-			<KEYWORD2>TIX,1</KEYWORD2>
-			<KEYWORD2>TIX,2</KEYWORD2>
-			<KEYWORD2>TLOAD</KEYWORD2>
-			<KEYWORD2>TLOAD*</KEYWORD2>
-			<KEYWORD2>UNIT</KEYWORD2>
-			<KEYWORD2>UNIT*</KEYWORD2>
-			<KEYWORD2>V/SC</KEYWORD2>
-			<KEYWORD2>V/SC*</KEYWORD2>
-			<KEYWORD2>VAD</KEYWORD2>
-			<KEYWORD2>VAD*</KEYWORD2>
-			<KEYWORD2>VCOMP</KEYWORD2>
-			<KEYWORD2>VDEF</KEYWORD2>
-			<KEYWORD2>VLOAD</KEYWORD2>
-			<KEYWORD2>VLOAD*</KEYWORD2>
-			<KEYWORD2>VPROJ</KEYWORD2>
-			<KEYWORD2>VPROJ*</KEYWORD2>
-			<KEYWORD2>VSL</KEYWORD2>
-			<KEYWORD2>VSL*</KEYWORD2>
-			<KEYWORD2>VSL1</KEYWORD2>
-			<KEYWORD2>VSL2</KEYWORD2>
-			<KEYWORD2>VSL3</KEYWORD2>
-			<KEYWORD2>VSL4</KEYWORD2>
-			<KEYWORD2>VSL5</KEYWORD2>
-			<KEYWORD2>VSL6</KEYWORD2>
-			<KEYWORD2>VSL7</KEYWORD2>
-			<KEYWORD2>VSL8</KEYWORD2>
-			<KEYWORD2>VSQ</KEYWORD2>
-			<KEYWORD2>VSR</KEYWORD2>
-			<KEYWORD2>VSR*</KEYWORD2>
-			<KEYWORD2>VSR1</KEYWORD2>
-			<KEYWORD2>VSR2</KEYWORD2>
-			<KEYWORD2>VSR3</KEYWORD2>
-			<KEYWORD2>VSR4</KEYWORD2>
-			<KEYWORD2>VSR5</KEYWORD2>
-			<KEYWORD2>VSR6</KEYWORD2>
-			<KEYWORD2>VSR7</KEYWORD2>
-			<KEYWORD2>VSR8</KEYWORD2>
-			<KEYWORD2>VSU</KEYWORD2>
-			<KEYWORD2>VSU*</KEYWORD2>
-			<KEYWORD2>VXM</KEYWORD2>
-			<KEYWORD2>VXM*</KEYWORD2>
-			<KEYWORD2>VXSC</KEYWORD2>
-			<KEYWORD2>VXSC*</KEYWORD2>
-			<KEYWORD2>VXV</KEYWORD2>
-			<KEYWORD2>VXV*</KEYWORD2>
-			<KEYWORD2>XAD,1</KEYWORD2>
-			<KEYWORD2>XAD,2</KEYWORD2>
-			<KEYWORD2>XCHX,1</KEYWORD2>
-			<KEYWORD2>XCHX,2</KEYWORD2>
-			<KEYWORD2>XSU,1</KEYWORD2>
-			<KEYWORD2>XSU,2</KEYWORD2>
-		</KEYWORDS>
-	</RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/assembly_ags.xml b/qpython/src/main/assets/syntax/assembly_ags.xml
deleted file mode 100644
index 361720e2..00000000
--- a/qpython/src/main/assets/syntax/assembly_ags.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!-- Apollo Guidance Computer (AGC) Assembly mode by Jim Lawton (jim DOT lawton AT gmail DOT com). -->
-
-<MODE>
-
-	<PROPS>
-		<PROPERTY NAME="lineComment" VALUE="#" />
-		<PROPERTY NAME="contextInsensitive" VALUE="true"/>
-	</PROPS>
-
-	<RULES HIGHLIGHT_DIGITS="TRUE" IGNORE_CASE="TRUE">
-		<EOL_SPAN TYPE="COMMENT2">##</EOL_SPAN>
-		<EOL_SPAN TYPE="COMMENT1">#</EOL_SPAN>
-
-		<MARK_PREVIOUS TYPE="LABEL" MATCH_TYPE="OPERATOR"
-			AT_LINE_START="TRUE">&#09;</MARK_PREVIOUS>
-
-		<!-- Binary Operators -->
-		<SEQ TYPE="OPERATOR">+</SEQ>
-		<SEQ TYPE="OPERATOR">-</SEQ>
-
-		<KEYWORDS>
-			<!-- Directives -->
-			<FUNCTION>ORG</FUNCTION> 
-			<FUNCTION>BSS</FUNCTION> 
-			<FUNCTION>BES</FUNCTION> 
-			<FUNCTION>SYN</FUNCTION> 
-			<FUNCTION>EQU</FUNCTION> 
-			<FUNCTION>DEFINE</FUNCTION> 
-			<FUNCTION>DEC</FUNCTION> 
-			<FUNCTION>OCT</FUNCTION> 
-			<FUNCTION>END</FUNCTION>
-
-			<!-- Registers -->
-			<KEYWORD3>A</KEYWORD3>
-			<KEYWORD3>Q</KEYWORD3>
-			<KEYWORD3>INDEX</KEYWORD3>
-
-			<!-- Opcodes -->
-			<KEYWORD1>ABS</KEYWORD1>
-			<KEYWORD1>ADD</KEYWORD1> 
-			<KEYWORD1>ADZ</KEYWORD1> 
-			<KEYWORD1>ALS</KEYWORD1> 
-			<KEYWORD1>AXT</KEYWORD1> 
-			<KEYWORD1>CLA</KEYWORD1> 
-			<KEYWORD1>CLZ</KEYWORD1> 
-			<KEYWORD1>COM</KEYWORD1> 
-			<KEYWORD1>DLY</KEYWORD1> 
-			<KEYWORD1>DVP</KEYWORD1> 
-			<KEYWORD1>INP</KEYWORD1> 
-			<KEYWORD1>LDQ</KEYWORD1> 
-			<KEYWORD1>LLS</KEYWORD1> 
-			<KEYWORD1>LRS</KEYWORD1> 
-			<KEYWORD1>MPR</KEYWORD1> 
-			<KEYWORD1>MPY</KEYWORD1> 
-			<KEYWORD1>MPZ</KEYWORD1> 
-			<KEYWORD1>OUT</KEYWORD1>
-			<KEYWORD1>STO</KEYWORD1> 
-			<KEYWORD1>STQ</KEYWORD1> 
-			<KEYWORD1>SUB</KEYWORD1> 
-			<KEYWORD1>SUZ</KEYWORD1> 
-			<KEYWORD1>TIX</KEYWORD1> 
-			<KEYWORD1>TMI</KEYWORD1> 
-			<KEYWORD1>TOV</KEYWORD1> 
-			<KEYWORD1>TRA</KEYWORD1> 
-			<KEYWORD1>TSQ</KEYWORD1> 
-
-		</KEYWORDS>
-	</RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/assembly_m68k.xml b/qpython/src/main/assets/syntax/assembly_m68k.xml
deleted file mode 100644
index cabe3f02..00000000
--- a/qpython/src/main/assets/syntax/assembly_m68k.xml
+++ /dev/null
@@ -1,509 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!--
-	M68000 Assembly mode by Igor Lesik (curoles@yahoo.com)
-	version 0.2 (July 24, 2006)
-	TODO: i)add missing size qualifiers, ii)add Xcc like instructions
--->
-
-<MODE>
-
-	<PROPS>
-		<PROPERTY NAME="lineComment" VALUE=";" />
-		<PROPERTY NAME="contextInsensitive" VALUE="true"/>
-	</PROPS>
-
-	<RULES IGNORE_CASE="TRUE" HIGHLIGHT_DIGITS="TRUE" DIGIT_RE="(0x\p{XDigit}+|\d+)">
-
-		<EOL_SPAN TYPE="COMMENT1">;</EOL_SPAN>
-		<EOL_SPAN TYPE="COMMENT2">*</EOL_SPAN>
-
-		<SPAN TYPE="LITERAL1" NO_LINE_BREAK="TRUE">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-
-		<SPAN TYPE="LITERAL1" NO_LINE_BREAK="TRUE">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-
-
-
-		<MARK_FOLLOWING TYPE="KEYWORD2" AT_LINE_START="TRUE">$</MARK_FOLLOWING>
-
-		<MARK_PREVIOUS TYPE="LABEL" MATCH_TYPE="OPERATOR"
-			AT_LINE_START="TRUE">:</MARK_PREVIOUS>
-
-		<SEQ TYPE="NULL">,</SEQ>
-		<SEQ TYPE="NULL">:</SEQ>
-		<SEQ TYPE="NULL">(</SEQ>
-		<SEQ TYPE="NULL">)</SEQ>
-		<SEQ TYPE="NULL">]</SEQ>
-		<SEQ TYPE="NULL">[</SEQ>
-		<SEQ TYPE="NULL">$</SEQ>
-
-		<SEQ TYPE="OPERATOR">+</SEQ>
-		<SEQ TYPE="OPERATOR">-</SEQ>
-		<SEQ TYPE="OPERATOR">/</SEQ>
-		<SEQ TYPE="OPERATOR">*</SEQ>
-		<SEQ TYPE="OPERATOR">%</SEQ>
-
-		<SEQ TYPE="OPERATOR">|</SEQ>
-		<SEQ TYPE="OPERATOR">^</SEQ>
-		<SEQ TYPE="OPERATOR">&amp;</SEQ>
-		<SEQ TYPE="OPERATOR">~</SEQ>
-		<SEQ TYPE="OPERATOR">!</SEQ>
-
-		<SEQ TYPE="OPERATOR">=</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;</SEQ>
-
-		<KEYWORDS>
-
-			<!-- ************************* REGISTERS ********************************* -->
-			<!-- For sake of commonality with existing asm86 mode we use Keyword3 for registers-->
-
-			<!-- General-purpose data registers -->
-			<KEYWORD3>D0</KEYWORD3>
-			<KEYWORD3>D1</KEYWORD3>
-			<KEYWORD3>D2</KEYWORD3>
-			<KEYWORD3>D3</KEYWORD3>
-			<KEYWORD3>D4</KEYWORD3>
-			<KEYWORD3>D5</KEYWORD3>
-			<KEYWORD3>D6</KEYWORD3>
-			<KEYWORD3>D7</KEYWORD3>
-
-			<!-- Address registers -->
-			<KEYWORD3>A0</KEYWORD3>
-			<KEYWORD3>A1</KEYWORD3>
-			<KEYWORD3>A2</KEYWORD3>
-			<KEYWORD3>A3</KEYWORD3>
-			<KEYWORD3>A4</KEYWORD3>
-			<KEYWORD3>A5</KEYWORD3>
-			<KEYWORD3>A6</KEYWORD3>
-			<KEYWORD3>A7</KEYWORD3>
-
-			<!-- Floating-point data registers -->
-			<KEYWORD3>FP0</KEYWORD3>
-			<KEYWORD3>FP1</KEYWORD3>
-			<KEYWORD3>FP2</KEYWORD3>
-			<KEYWORD3>FP3</KEYWORD3>
-			<KEYWORD3>FP4</KEYWORD3>
-			<KEYWORD3>FP5</KEYWORD3>
-			<KEYWORD3>FP6</KEYWORD3>
-			<KEYWORD3>FP7</KEYWORD3>
-
-			<KEYWORD3>SP</KEYWORD3>
-			<KEYWORD3>CCR</KEYWORD3>
-
-			<!-- ************************** DIRECTIVES ********************************** -->
-
-			<!-- Assembler directives give instructions to the assembler (not the 68000 chip which will execute
-			your program) on how to assemble your program.
-			These directives may be grouped into the following categories.-->
-
-			<!-- Miscellaneous  -->
-			<KEYWORD1>OPT</KEYWORD1>
-			<KEYWORD1>INCLUDE</KEYWORD1>
-			<KEYWORD1>FAIL</KEYWORD1>
-			<KEYWORD1>END</KEYWORD1>
-			<KEYWORD1>REG</KEYWORD1>
-
-			<!-- Listing Control -->
-			<KEYWORD1>PAGE</KEYWORD1>
-			<KEYWORD1>LIST</KEYWORD1>
-			<KEYWORD1>NOLIST</KEYWORD1>
-			<KEYWORD1>SPC</KEYWORD1>
-			<KEYWORD1>TTL</KEYWORD1>
-
-			<!-- Section Control -->
-			<KEYWORD1>ORG</KEYWORD1>
-
-			<!-- Symbol Definition  -->
-			<KEYWORD1>EQU</KEYWORD1>
-			<KEYWORD1>SET</KEYWORD1>
-
-			<!-- Data Definition -->
-			<KEYWORD1>DS</KEYWORD1>
-			<KEYWORD1>DC</KEYWORD1>
-
-			<!-- Structured Programming Constructs -->
-			<KEYWORD1>FOR</KEYWORD1>
-			<KEYWORD1>ENDF</KEYWORD1>
-			<KEYWORD1>IF</KEYWORD1>
-			<KEYWORD1>THEN</KEYWORD1>
-			<KEYWORD1>ELSE</KEYWORD1>
-			<KEYWORD1>ENDI</KEYWORD1>
-			<KEYWORD1>REPEAT</KEYWORD1>
-			<KEYWORD1>UNTIL</KEYWORD1>
-			<KEYWORD1>WHILE</KEYWORD1>
-			<KEYWORD1>DO</KEYWORD1>
-			<KEYWORD1>ENDW</KEYWORD1>
-
-			<KEYWORD1>MACRO</KEYWORD1>
-
-
-			<!-- *************************** INSTRUCTIONS **************************************** -->
-			<FUNCTION>ABCD</FUNCTION>
-			<FUNCTION>ADD</FUNCTION>
-				<FUNCTION>ADD.B</FUNCTION>
-				<FUNCTION>ADD.W</FUNCTION>
-				<FUNCTION>ADD.L</FUNCTION>
-			<FUNCTION>ADDA</FUNCTION>
-				<FUNCTION>ADDA.W</FUNCTION>
-				<FUNCTION>ADDA.L</FUNCTION>
-			<FUNCTION>ADDI</FUNCTION>
-				<FUNCTION>ADDI.B</FUNCTION>
-				<FUNCTION>ADDI.W</FUNCTION>
-				<FUNCTION>ADDI.L</FUNCTION>
-			<FUNCTION>ADDQ</FUNCTION>
-				<FUNCTION>ADDQ.B</FUNCTION>
-				<FUNCTION>ADDQ.W</FUNCTION>
-				<FUNCTION>ADDQ.L</FUNCTION>
-			<FUNCTION>ADDX</FUNCTION>
-				<FUNCTION>ADDX.B</FUNCTION>
-				<FUNCTION>ADDX.W</FUNCTION>
-				<FUNCTION>ADDX.L</FUNCTION>
-			<FUNCTION>AND</FUNCTION>
-				<FUNCTION>AND.B</FUNCTION>
-				<FUNCTION>AND.W</FUNCTION>
-				<FUNCTION>AND.L</FUNCTION>
-			<FUNCTION>ANDI</FUNCTION>
-				<FUNCTION>ANDI.B</FUNCTION>
-				<FUNCTION>ANDI.W</FUNCTION>
-				<FUNCTION>ANDI.L</FUNCTION>
-			<FUNCTION>ASL</FUNCTION>
-				<FUNCTION>ASL.B</FUNCTION>
-				<FUNCTION>ASL.W</FUNCTION>
-				<FUNCTION>ASL.L</FUNCTION>
-			<FUNCTION>ASR</FUNCTION>
-				<FUNCTION>ASR.B</FUNCTION>
-				<FUNCTION>ASR.W</FUNCTION>
-				<FUNCTION>ASR.L</FUNCTION>
-			<!-- Bcc -->
-				<FUNCTION>BCC</FUNCTION>
-				<FUNCTION>BCS</FUNCTION>
-				<FUNCTION>BEQ</FUNCTION>
-				<FUNCTION>BGE</FUNCTION>
-				<FUNCTION>BGT</FUNCTION>
-				<FUNCTION>BHI</FUNCTION>
-				<FUNCTION>BLE</FUNCTION>
-				<FUNCTION>BLS</FUNCTION>
-				<FUNCTION>BLT</FUNCTION>
-				<FUNCTION>BMI</FUNCTION>
-				<FUNCTION>BNE</FUNCTION>
-				<FUNCTION>BPL</FUNCTION>
-				<FUNCTION>BVC</FUNCTION>
-				<FUNCTION>BVS</FUNCTION>
-			<FUNCTION>BCHG</FUNCTION>
-			<FUNCTION>BCLR</FUNCTION>
-			<FUNCTION>BFCHG</FUNCTION>
-			<FUNCTION>BFCLR</FUNCTION>
-			<FUNCTION>BFEXTS</FUNCTION>
-			<FUNCTION>BFEXTU</FUNCTION>
-			<FUNCTION>BFFF0</FUNCTION>
-			<FUNCTION>BFINS</FUNCTION>
-			<FUNCTION>BFSET</FUNCTION>
-			<FUNCTION>BFTST</FUNCTION>
-			<FUNCTION>BGND</FUNCTION>
-			<FUNCTION>BKPT</FUNCTION>
-			<FUNCTION>BRA</FUNCTION>
-			<FUNCTION>BSET</FUNCTION>
-			<FUNCTION>BSR</FUNCTION>
-			<FUNCTION>BTST</FUNCTION>
-			<FUNCTION>CALLM</FUNCTION>
-			<FUNCTION>CAS</FUNCTION>
-			<FUNCTION>CAS2</FUNCTION>
-			<FUNCTION>CHK</FUNCTION>
-			<FUNCTION>CHK2</FUNCTION>
-			<FUNCTION>CINV</FUNCTION>
-			<FUNCTION>CLR</FUNCTION>
-				<FUNCTION>CLR.B</FUNCTION>
-				<FUNCTION>CLR.W</FUNCTION>
-				<FUNCTION>CLR.L</FUNCTION>
-			<FUNCTION>CMP</FUNCTION>
-				<FUNCTION>CMP.B</FUNCTION>
-				<FUNCTION>CMP.W</FUNCTION>
-				<FUNCTION>CMP.L</FUNCTION>
-			<FUNCTION>CMPA</FUNCTION>
-				<FUNCTION>CMPA.W</FUNCTION>
-				<FUNCTION>CMPA.L</FUNCTION>
-			<FUNCTION>CMPI</FUNCTION>
-				<FUNCTION>CMPI.B</FUNCTION>
-				<FUNCTION>CMPI.W</FUNCTION>
-				<FUNCTION>CMPI.L</FUNCTION>
-			<FUNCTION>CMPM</FUNCTION>
-				<FUNCTION>CMPM.B</FUNCTION>
-				<FUNCTION>CMPM.W</FUNCTION>
-				<FUNCTION>CMPM.L</FUNCTION>
-			<FUNCTION>CMP2</FUNCTION>
-				<FUNCTION>CMP2.B</FUNCTION>
-				<FUNCTION>CMP2.W</FUNCTION>
-				<FUNCTION>CMP2.L</FUNCTION>
-			<!-- FUNCTION>cpBcc</FUNCTION>
-			<FUNCTION>cpDBcc</FUNCTION>
-			<FUNCTION>cpGEN</FUNCTION>
-			<FUNCTION>cpRESTORE</FUNCTION>
-			<FUNCTION>cpSAVE</FUNCTION>
-			<FUNCTION>cpScc</FUNCTION>
-			<FUNCTION>cpTRAPcc</FUNCTION -->
-			<FUNCTION>CPUSH</FUNCTION>
-			<!-- DBcc -->
-				<FUNCTION>DBCC</FUNCTION>
-				<FUNCTION>DBCS</FUNCTION>
-				<FUNCTION>DBEQ</FUNCTION>
-				<FUNCTION>DBGE</FUNCTION>
-				<FUNCTION>DBGT</FUNCTION>
-				<FUNCTION>DBHI</FUNCTION>
-				<FUNCTION>DBLE</FUNCTION>
-				<FUNCTION>DBLS</FUNCTION>
-				<FUNCTION>DBLT</FUNCTION>
-				<FUNCTION>DBMI</FUNCTION>
-				<FUNCTION>DBNE</FUNCTION>
-				<FUNCTION>DBPL</FUNCTION>
-				<FUNCTION>DBVC</FUNCTION>
-				<FUNCTION>DBVS</FUNCTION>
-
-			<FUNCTION>DIVS</FUNCTION>
-			<FUNCTION>DIVSL</FUNCTION>
-			<FUNCTION>DIVU</FUNCTION>
-			<FUNCTION>DIVUL</FUNCTION>
-			<FUNCTION>EOR</FUNCTION>
-				<FUNCTION>EOR.B</FUNCTION>
-				<FUNCTION>EOR.W</FUNCTION>
-				<FUNCTION>EOR.L</FUNCTION>
-			<FUNCTION>EORI</FUNCTION>
-				<FUNCTION>EORI.B</FUNCTION>
-				<FUNCTION>EORI.W</FUNCTION>
-				<FUNCTION>EORI.L</FUNCTION>
-			<FUNCTION>EXG</FUNCTION>
-			<FUNCTION>EXT</FUNCTION>
-			<FUNCTION>EXTB</FUNCTION>
-			<FUNCTION>FABS</FUNCTION>
-			<FUNCTION>FSABS</FUNCTION>
-			<FUNCTION>FDABS</FUNCTION>
-			<FUNCTION>FACOS</FUNCTION>
-			<FUNCTION>FADD</FUNCTION>
-			<FUNCTION>FSADD</FUNCTION>
-			<FUNCTION>FDADD</FUNCTION>
-			<FUNCTION>FASIN</FUNCTION>
-			<FUNCTION>FATAN</FUNCTION>
-			<FUNCTION>FATANH</FUNCTION>
-			<!--FUNCTION>FBcc</FUNCTION-->
-			<FUNCTION>FCMP</FUNCTION>
-			<FUNCTION>FCOS</FUNCTION>
-			<FUNCTION>FCOSH</FUNCTION>
-			<!--FUNCTION>FDBcc</FUNCTION-->
-			<FUNCTION>FDIV</FUNCTION>
-			<FUNCTION>FSDIV</FUNCTION>
-			<FUNCTION>FDDIV</FUNCTION>
-			<FUNCTION>FETOX</FUNCTION>
-			<FUNCTION>FETOXM1</FUNCTION>
-			<FUNCTION>FGETEXP</FUNCTION>
-			<FUNCTION>FGETMAN</FUNCTION>
-			<FUNCTION>FINT</FUNCTION>
-			<FUNCTION>FINTRZ</FUNCTION>
-			<FUNCTION>FLOG10</FUNCTION>
-			<FUNCTION>FLOG2</FUNCTION>
-			<FUNCTION>FLOGN</FUNCTION>
-			<FUNCTION>FLOGNP1</FUNCTION>
-			<FUNCTION>FMOD</FUNCTION>
-			<FUNCTION>FMOVE</FUNCTION>
-			<FUNCTION>FSMOVE</FUNCTION>
-			<FUNCTION>FDMOVE</FUNCTION>
-			<FUNCTION>FMOVECR</FUNCTION>
-			<FUNCTION>FMOVEM</FUNCTION>
-			<FUNCTION>FMUL</FUNCTION>
-			<FUNCTION>FSMUL</FUNCTION>
-			<FUNCTION>FDMUL</FUNCTION>
-			<FUNCTION>FNEG</FUNCTION>
-			<FUNCTION>FSNEG</FUNCTION>
-			<FUNCTION>FDNEG</FUNCTION>
-			<FUNCTION>FNOP</FUNCTION>
-			<FUNCTION>FREM</FUNCTION>
-			<FUNCTION>FRESTORE</FUNCTION>
-			<FUNCTION>FSAVE</FUNCTION>
-			<FUNCTION>FSCALE</FUNCTION>
-			<!--FUNCTION>FScc</FUNCTION-->
-			<FUNCTION>FSGLMUL</FUNCTION>
-			<FUNCTION>FSIN</FUNCTION>
-			<FUNCTION>FSINCOS</FUNCTION>
-			<FUNCTION>FSINH</FUNCTION>
-			<FUNCTION>FSQRT</FUNCTION>
-			<FUNCTION>FSSQRT</FUNCTION>
-			<FUNCTION>FDSQRT</FUNCTION>
-			<FUNCTION>FSUB</FUNCTION>
-			<FUNCTION>FSSUB</FUNCTION>
-			<FUNCTION>FDSUB</FUNCTION>
-			<FUNCTION>FTAN</FUNCTION>
-			<FUNCTION>FTANH</FUNCTION>
-			<FUNCTION>FTENTOX</FUNCTION>
-			<!--FUNCTION>FTRAPcc</FUNCTION-->
-			<FUNCTION>FTST</FUNCTION>
-			<FUNCTION>FTWOTOX</FUNCTION>
-			<FUNCTION>ILLEGAL</FUNCTION>
-			<FUNCTION>JMP</FUNCTION>
-			<FUNCTION>JSR</FUNCTION>
-			<FUNCTION>LEA</FUNCTION>
-			<FUNCTION>LINK</FUNCTION>
-			<FUNCTION>LPSTOP</FUNCTION>
-			<FUNCTION>LSL</FUNCTION>
-				<FUNCTION>LSL.B</FUNCTION>
-				<FUNCTION>LSL.W</FUNCTION>
-				<FUNCTION>LSL.L</FUNCTION>
-			<FUNCTION>LSR</FUNCTION>
-				<FUNCTION>LSR.B</FUNCTION>
-				<FUNCTION>LSR.W</FUNCTION>
-				<FUNCTION>LSR.L</FUNCTION>
-			<FUNCTION>MOVE</FUNCTION>
-				<FUNCTION>MOVE.B</FUNCTION>
-				<FUNCTION>MOVE.W</FUNCTION>
-				<FUNCTION>MOVE.L</FUNCTION>
-			<FUNCTION>MOVEA</FUNCTION>
-				<FUNCTION>MOVEA.W</FUNCTION>
-				<FUNCTION>MOVEA.L</FUNCTION>
-			<FUNCTION>MOVE16</FUNCTION>
-			<FUNCTION>MOVEC</FUNCTION>
-			<FUNCTION>MOVEM</FUNCTION>
-			<FUNCTION>MOVEP</FUNCTION>
-			<FUNCTION>MOVEQ</FUNCTION>
-			<FUNCTION>MOVES</FUNCTION>
-			<FUNCTION>MULS</FUNCTION>
-			<FUNCTION>MULU</FUNCTION>
-			<FUNCTION>NBCD</FUNCTION>
-			<FUNCTION>NEG</FUNCTION>
-				<FUNCTION>NEG.B</FUNCTION>
-				<FUNCTION>NEG.W</FUNCTION>
-				<FUNCTION>NEG.L</FUNCTION>
-			<FUNCTION>NEGX</FUNCTION>
-				<FUNCTION>NEGX.B</FUNCTION>
-				<FUNCTION>NEGX.W</FUNCTION>
-				<FUNCTION>NEGX.L</FUNCTION>
-			<FUNCTION>NOP</FUNCTION>
-			<FUNCTION>NOT</FUNCTION>
-				<FUNCTION>NOT.B</FUNCTION>
-				<FUNCTION>NOT.W</FUNCTION>
-				<FUNCTION>NOT.L</FUNCTION>
-			<FUNCTION>OR</FUNCTION>
-				<FUNCTION>OR.B</FUNCTION>
-				<FUNCTION>OR.W</FUNCTION>
-				<FUNCTION>OR.L</FUNCTION>
-			<FUNCTION>ORI</FUNCTION>
-				<FUNCTION>ORI.B</FUNCTION>
-				<FUNCTION>ORI.W</FUNCTION>
-				<FUNCTION>ORI.L</FUNCTION>
-			<FUNCTION>PACK</FUNCTION>
-			<!--FUNCTION>PBcc</FUNCTION-->
-			<!--FUNCTION>PDBcc</FUNCTION-->
-			<FUNCTION>PEA</FUNCTION>
-			<FUNCTION>PFLUSH</FUNCTION>
-			<FUNCTION>PFLUSHA</FUNCTION>
-			<FUNCTION>PFLUSHR</FUNCTION>
-			<FUNCTION>PFLUSHS</FUNCTION>
-			<FUNCTION>PLOAD</FUNCTION>
-			<FUNCTION>PMOVE</FUNCTION>
-			<FUNCTION>PRESTORE</FUNCTION>
-			<FUNCTION>PSAVE</FUNCTION>
-			<!--FUNCTION>PScc</FUNCTION-->
-			<FUNCTION>PTEST</FUNCTION>
-			<!--FUNCTION>PTRAPcc</FUNCTION-->
-			<FUNCTION>PVALID</FUNCTION>
-			<FUNCTION>RESET</FUNCTION>
-			<FUNCTION>ROL</FUNCTION>
-				<FUNCTION>ROL.B</FUNCTION>
-				<FUNCTION>ROL.W</FUNCTION>
-				<FUNCTION>ROL.L</FUNCTION>
-			<FUNCTION>ROR</FUNCTION>
-				<FUNCTION>ROR.B</FUNCTION>
-				<FUNCTION>ROR.W</FUNCTION>
-				<FUNCTION>ROR.L</FUNCTION>
-			<FUNCTION>ROXL</FUNCTION>
-				<FUNCTION>ROXL.B</FUNCTION>
-				<FUNCTION>ROXL.W</FUNCTION>
-				<FUNCTION>ROXL.L</FUNCTION>
-			<FUNCTION>ROXR</FUNCTION>
-				<FUNCTION>ROXR.B</FUNCTION>
-				<FUNCTION>ROXR.W</FUNCTION>
-				<FUNCTION>ROXR.L</FUNCTION>
-			<FUNCTION>RTD</FUNCTION>
-			<FUNCTION>RTE</FUNCTION>
-			<FUNCTION>RTM</FUNCTION>
-			<FUNCTION>RTR</FUNCTION>
-			<FUNCTION>RTS</FUNCTION>
-			<FUNCTION>SBCD</FUNCTION>
-			<!--Scc-->
-				<FUNCTION>SCC</FUNCTION>
-				<FUNCTION>SCS</FUNCTION>
-				<FUNCTION>SEQ</FUNCTION>
-				<FUNCTION>SF</FUNCTION>
-				<FUNCTION>SGE</FUNCTION>
-				<FUNCTION>SGT</FUNCTION>
-				<FUNCTION>SHI</FUNCTION>
-				<FUNCTION>SLE</FUNCTION>
-				<FUNCTION>SLS</FUNCTION>
-				<FUNCTION>SLT</FUNCTION>
-				<FUNCTION>SMI</FUNCTION>
-				<FUNCTION>SNE</FUNCTION>
-				<FUNCTION>SPL</FUNCTION>
-				<FUNCTION>ST</FUNCTION>
-				<FUNCTION>SVC</FUNCTION>
-				<FUNCTION>SVS</FUNCTION>
-
-			<FUNCTION>STOP</FUNCTION>
-			<FUNCTION>SUB</FUNCTION>
-				<FUNCTION>SUB.B</FUNCTION>
-				<FUNCTION>SUB.W</FUNCTION>
-				<FUNCTION>SUB.L</FUNCTION>
-			<FUNCTION>SUBA</FUNCTION>
-			<FUNCTION>SUBI</FUNCTION>
-				<FUNCTION>SUBI.B</FUNCTION>
-				<FUNCTION>SUBI.W</FUNCTION>
-				<FUNCTION>SUBI.L</FUNCTION>
-			<FUNCTION>SUBQ</FUNCTION>
-				<FUNCTION>SUBQ.B</FUNCTION>
-				<FUNCTION>SUBQ.W</FUNCTION>
-				<FUNCTION>SUBQ.L</FUNCTION>
-			<FUNCTION>SUBX</FUNCTION>
-				<FUNCTION>SUBX.B</FUNCTION>
-				<FUNCTION>SUBX.W</FUNCTION>
-				<FUNCTION>SUBX.L</FUNCTION>
-			<FUNCTION>SWAP</FUNCTION>
-			<FUNCTION>TAS</FUNCTION>
-			<FUNCTION>TBLS</FUNCTION>
-			<FUNCTION>TBLSN</FUNCTION>
-			<FUNCTION>TBLU</FUNCTION>
-			<FUNCTION>TBLUN</FUNCTION>
-			<FUNCTION>TRAP</FUNCTION>
-			<!--TRAPcc-->
-				<FUNCTION>TRAPCC</FUNCTION>
-				<FUNCTION>TRAPCS</FUNCTION>
-				<FUNCTION>TRAPEQ</FUNCTION>
-				<FUNCTION>TRAPF</FUNCTION>
-				<FUNCTION>TRAPGE</FUNCTION>
-				<FUNCTION>TRAPGT</FUNCTION>
-				<FUNCTION>TRAPHI</FUNCTION>
-				<FUNCTION>TRAPLE</FUNCTION>
-				<FUNCTION>TRAPLS</FUNCTION>
-				<FUNCTION>TRAPLT</FUNCTION>
-				<FUNCTION>TRAPMI</FUNCTION>
-				<FUNCTION>TRAPNE</FUNCTION>
-				<FUNCTION>TRAPPL</FUNCTION>
-				<FUNCTION>TRAPT</FUNCTION>
-				<FUNCTION>TRAPVC</FUNCTION>
-				<FUNCTION>TRAPVS</FUNCTION>
-
-			<FUNCTION>TRAPV</FUNCTION>
-			<FUNCTION>TST</FUNCTION>
-				<FUNCTION>TST.B</FUNCTION>
-				<FUNCTION>TST.W</FUNCTION>
-				<FUNCTION>TST.L</FUNCTION>
-			<FUNCTION>UNLK</FUNCTION>
-			<FUNCTION>UNPK</FUNCTION>
-
-
-		</KEYWORDS>
-	</RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/assembly_macro32.xml b/qpython/src/main/assets/syntax/assembly_macro32.xml
deleted file mode 100644
index 891c4975..00000000
--- a/qpython/src/main/assets/syntax/assembly_macro32.xml
+++ /dev/null
@@ -1,578 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!--
-  VAX Macro32 Assembly mode by Mark Wickens (m.wickens@rhodium-consulting.com)
-	based on
-	x86 Assembly mode by Kristian Ovaska (kristian.ovaska@helsinki.fi)
--->
-
-<MODE>
-
-	<PROPS>
-		<PROPERTY NAME="lineComment" VALUE=";" />
-		<PROPERTY NAME="contextInsensitive" VALUE="true"/>
-	</PROPS>
-
-	<RULES HIGHLIGHT_DIGITS="TRUE" IGNORE_CASE="TRUE">
-		<EOL_SPAN TYPE="COMMENT1">;</EOL_SPAN>
-
-		<SPAN TYPE="LITERAL1" NO_LINE_BREAK="TRUE">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-
-		<SPAN TYPE="LITERAL1" NO_LINE_BREAK="TRUE">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-
-		<!-- NASM: label inside a macro -->
-		<MARK_FOLLOWING TYPE="LABEL" MATCH_TYPE="OPERATOR"
-			AT_LINE_START="TRUE">%%</MARK_FOLLOWING>
-
-		<MARK_FOLLOWING TYPE="KEYWORD2" AT_LINE_START="TRUE">%</MARK_FOLLOWING>
-
-		<MARK_PREVIOUS TYPE="LABEL" MATCH_TYPE="OPERATOR"
-			AT_LINE_START="TRUE">:</MARK_PREVIOUS>
-
-		<!-- Unary Operators -->
-		<SEQ TYPE="OPERATOR">B^</SEQ>
-		<SEQ TYPE="OPERATOR">D^</SEQ>
-		<SEQ TYPE="OPERATOR">O^</SEQ>
-		<SEQ TYPE="OPERATOR">X^</SEQ>
-		<SEQ TYPE="OPERATOR">A^</SEQ>
-		<SEQ TYPE="OPERATOR">M^</SEQ>
-		<SEQ TYPE="OPERATOR">F^</SEQ>
-		<SEQ TYPE="OPERATOR">C^</SEQ>
-		<SEQ TYPE="OPERATOR">L^</SEQ>
-		<SEQ TYPE="OPERATOR">G^</SEQ>
-		<SEQ TYPE="OPERATOR">^</SEQ>
-
-		<!-- Binary Operators -->
-		<SEQ TYPE="OPERATOR">+</SEQ>
-		<SEQ TYPE="OPERATOR">-</SEQ>
-		<SEQ TYPE="OPERATOR">/</SEQ>
-		<SEQ TYPE="OPERATOR">*</SEQ>
-		<SEQ TYPE="OPERATOR">@</SEQ>
-		<SEQ TYPE="OPERATOR">#</SEQ>
-		<SEQ TYPE="OPERATOR">&amp;</SEQ>
-		<SEQ TYPE="OPERATOR">!</SEQ>
-		<SEQ TYPE="OPERATOR">\</SEQ>
-
-		<KEYWORDS>
-			<!-- Directives -->
-			<KEYWORD1>.ADDRESS</KEYWORD1>
-			<KEYWORD1>.ALIGN</KEYWORD1>
-			<KEYWORD1>.ALIGN</KEYWORD1>
-			<KEYWORD1>.ASCIC</KEYWORD1>
-			<KEYWORD1>.ASCID</KEYWORD1>
-			<KEYWORD1>.ASCII</KEYWORD1>
-			<KEYWORD1>.ASCIZ</KEYWORD1>
-			<KEYWORD1>.BLKA</KEYWORD1>
-			<KEYWORD1>.BLKB</KEYWORD1>
-			<KEYWORD1>.BLKD</KEYWORD1>
-			<KEYWORD1>.BLKF</KEYWORD1>
-			<KEYWORD1>.BLKG</KEYWORD1>
-			<KEYWORD1>.BLKH</KEYWORD1>
-			<KEYWORD1>.BLKL</KEYWORD1>
-			<KEYWORD1>.BLKO</KEYWORD1>
-			<KEYWORD1>.BLKQ</KEYWORD1>
-			<KEYWORD1>.BLKW</KEYWORD1>
-			<KEYWORD1>.BYTE</KEYWORD1>
-			<KEYWORD1>.CROSS</KEYWORD1>
-			<KEYWORD1>.CROSS</KEYWORD1>
-			<KEYWORD1>.DEBUG</KEYWORD1>
-			<KEYWORD1>.DEFAULT</KEYWORD1>
-			<KEYWORD1>.D_FLOATING</KEYWORD1>
-			<KEYWORD1>.DISABLE</KEYWORD1>
-			<KEYWORD1>.DOUBLE</KEYWORD1>
-			<KEYWORD1>.DSABL</KEYWORD1>
-			<KEYWORD1>.ENABL</KEYWORD1>
-			<KEYWORD1>.ENABLE</KEYWORD1>
-			<KEYWORD1>.END</KEYWORD1>
-			<KEYWORD1>.ENDC</KEYWORD1>
-			<KEYWORD1>.ENDM</KEYWORD1>
-			<KEYWORD1>.ENDR</KEYWORD1>
-			<KEYWORD1>.ENTRY</KEYWORD1>
-			<KEYWORD1>.ERROR</KEYWORD1>
-			<KEYWORD1>.EVEN</KEYWORD1>
-			<KEYWORD1>.EXTERNAL</KEYWORD1>
-			<KEYWORD1>.EXTRN</KEYWORD1>
-			<KEYWORD1>.F_FLOATING</KEYWORD1>
-			<KEYWORD1>.FLOAT</KEYWORD1>
-			<KEYWORD1>.G_FLOATING</KEYWORD1>
-			<KEYWORD1>.GLOBAL</KEYWORD1>
-			<KEYWORD1>.GLOBL</KEYWORD1>
-			<KEYWORD1>.H_FLOATING</KEYWORD1>
-			<KEYWORD1>.IDENT</KEYWORD1>
-			<KEYWORD1>.IF</KEYWORD1>
-			<KEYWORD1>.IFF</KEYWORD1>
-			<KEYWORD1>.IF_FALSE</KEYWORD1>
-			<KEYWORD1>.IFT</KEYWORD1>
-			<KEYWORD1>.IFTF</KEYWORD1>
-			<KEYWORD1>.IF_TRUE</KEYWORD1>
-			<KEYWORD1>.IF_TRUE_FALSE</KEYWORD1>
-			<KEYWORD1>.IIF</KEYWORD1>
-			<KEYWORD1>.IRP</KEYWORD1>
-			<KEYWORD1>.IRPC</KEYWORD1>
-			<KEYWORD1>.LIBRARY</KEYWORD1>
-			<KEYWORD1>.LINK</KEYWORD1>
-			<KEYWORD1>.LIST</KEYWORD1>
-			<KEYWORD1>.LONG</KEYWORD1>
-			<KEYWORD1>.MACRO</KEYWORD1>
-			<KEYWORD1>.MASK</KEYWORD1>
-			<KEYWORD1>.MCALL</KEYWORD1>
-			<KEYWORD1>.MDELETE</KEYWORD1>
-			<KEYWORD1>.MEXIT</KEYWORD1>
-			<KEYWORD1>.NARG</KEYWORD1>
-			<KEYWORD1>.NCHR</KEYWORD1>
-			<KEYWORD1>.NLIST</KEYWORD1>
-			<KEYWORD1>.NOCROSS</KEYWORD1>
-			<KEYWORD1>.NOCROSS</KEYWORD1>
-			<KEYWORD1>.NOSHOW</KEYWORD1>
-			<KEYWORD1>.NOSHOW</KEYWORD1>
-			<KEYWORD1>.NTYPE</KEYWORD1>
-			<KEYWORD1>.OCTA</KEYWORD1>
-			<KEYWORD1>.OCTA</KEYWORD1>
-			<KEYWORD1>.ODD</KEYWORD1>
-			<KEYWORD1>.OPDEF</KEYWORD1>
-			<KEYWORD1>.PACKED</KEYWORD1>
-			<KEYWORD1>.PAGE</KEYWORD1>
-			<KEYWORD1>.PRINT</KEYWORD1>
-			<KEYWORD1>.PSECT</KEYWORD1>
-			<KEYWORD1>.PSECT</KEYWORD1>
-			<KEYWORD1>.QUAD</KEYWORD1>
-			<KEYWORD1>.QUAD</KEYWORD1>
-			<KEYWORD1>.REF1</KEYWORD1>
-			<KEYWORD1>.REF2</KEYWORD1>
-			<KEYWORD1>.REF4</KEYWORD1>
-			<KEYWORD1>.REF8</KEYWORD1>
-			<KEYWORD1>.REF16</KEYWORD1>
-			<KEYWORD1>.REPEAT</KEYWORD1>
-			<KEYWORD1>.REPT</KEYWORD1>
-			<KEYWORD1>.RESTORE</KEYWORD1>
-			<KEYWORD1>.RESTORE_PSECT</KEYWORD1>
-			<KEYWORD1>.SAVE</KEYWORD1>
-			<KEYWORD1>.SAVE_PSECT</KEYWORD1>
-			<KEYWORD1>.SBTTL</KEYWORD1>
-			<KEYWORD1>.SHOW</KEYWORD1>
-			<KEYWORD1>.SHOW</KEYWORD1>
-			<KEYWORD1>.SIGNED_BYTE</KEYWORD1>
-			<KEYWORD1>.SIGNED_WORD</KEYWORD1>
-			<KEYWORD1>.SUBTITLE</KEYWORD1>
-			<KEYWORD1>.TITLE</KEYWORD1>
-			<KEYWORD1>.TRANSFER</KEYWORD1>
-			<KEYWORD1>.WARN</KEYWORD1>
-			<KEYWORD1>.WEAK</KEYWORD1>
-			<KEYWORD1>.WORD</KEYWORD1>
-
-			<!-- Registers -->
-			<KEYWORD3>R0</KEYWORD3>
-			<KEYWORD3>R1</KEYWORD3>
-			<KEYWORD3>R2</KEYWORD3>
-			<KEYWORD3>R3</KEYWORD3>
-			<KEYWORD3>R4</KEYWORD3>
-			<KEYWORD3>R5</KEYWORD3>
-			<KEYWORD3>R6</KEYWORD3>
-			<KEYWORD3>R7</KEYWORD3>
-			<KEYWORD3>R8</KEYWORD3>
-			<KEYWORD3>R9</KEYWORD3>
-			<KEYWORD3>R10</KEYWORD3>
-			<KEYWORD3>R11</KEYWORD3>
-			<KEYWORD3>R12</KEYWORD3>
-			<KEYWORD3>AP</KEYWORD3>
-			<KEYWORD3>FP</KEYWORD3>
-			<KEYWORD3>SP</KEYWORD3>
-			<KEYWORD3>PC</KEYWORD3>
-
-			<!-- Instructions -->
-			<FUNCTION>ACBB</FUNCTION>
-			<FUNCTION>ACBD</FUNCTION>
-			<FUNCTION>ACBF</FUNCTION>
-			<FUNCTION>ACBG</FUNCTION>
-			<FUNCTION>ACBH</FUNCTION>
-			<FUNCTION>ACBL</FUNCTION>
-			<FUNCTION>ACBW</FUNCTION>
-			<FUNCTION>ADAWI</FUNCTION>
-			<FUNCTION>ADDB2</FUNCTION>
-			<FUNCTION>ADDB3</FUNCTION>
-			<FUNCTION>ADDD2</FUNCTION>
-			<FUNCTION>ADDD3</FUNCTION>
-			<FUNCTION>ADDF2</FUNCTION>
-			<FUNCTION>ADDF3</FUNCTION>
-			<FUNCTION>ADDG2</FUNCTION>
-			<FUNCTION>ADDG3</FUNCTION>
-			<FUNCTION>ADDH2</FUNCTION>
-			<FUNCTION>ADDH3</FUNCTION>
-			<FUNCTION>ADDL2</FUNCTION>
-			<FUNCTION>ADDL3</FUNCTION>
-			<FUNCTION>ADDP4</FUNCTION>
-			<FUNCTION>ADDP6</FUNCTION>
-			<FUNCTION>ADDW2</FUNCTION>
-			<FUNCTION>ADDW3</FUNCTION>
-			<FUNCTION>ADWC</FUNCTION>
-			<FUNCTION>AOBLEQ</FUNCTION>
-			<FUNCTION>AOBLSS</FUNCTION>
-			<FUNCTION>ASHL</FUNCTION>
-			<FUNCTION>ASHP</FUNCTION>
-			<FUNCTION>ASHQ</FUNCTION>
-			<FUNCTION>BBC</FUNCTION>
-			<FUNCTION>BBCC</FUNCTION>
-			<FUNCTION>BBCCI</FUNCTION>
-			<FUNCTION>BBCS</FUNCTION>
-			<FUNCTION>BBS</FUNCTION>
-			<FUNCTION>BBSC</FUNCTION>
-			<FUNCTION>BBSS</FUNCTION>
-			<FUNCTION>BBSSI</FUNCTION>
-			<FUNCTION>BCC</FUNCTION>
-			<FUNCTION>BCS</FUNCTION>
-			<FUNCTION>BEQL</FUNCTION>
-			<FUNCTION>BEQLU</FUNCTION>
-			<FUNCTION>BGEQ</FUNCTION>
-			<FUNCTION>BGEQU</FUNCTION>
-			<FUNCTION>BGTR</FUNCTION>
-			<FUNCTION>BGTRU</FUNCTION>
-			<FUNCTION>BICB2</FUNCTION>
-			<FUNCTION>BICB3</FUNCTION>
-			<FUNCTION>BICL2</FUNCTION>
-			<FUNCTION>BICL3</FUNCTION>
-			<FUNCTION>BICPSW</FUNCTION>
-			<FUNCTION>BICW2</FUNCTION>
-			<FUNCTION>BICW3</FUNCTION>
-			<FUNCTION>BISB2</FUNCTION>
-			<FUNCTION>BISB3</FUNCTION>
-			<FUNCTION>BISL2</FUNCTION>
-			<FUNCTION>BISL3</FUNCTION>
-			<FUNCTION>BISPSW</FUNCTION>
-			<FUNCTION>BISW2</FUNCTION>
-			<FUNCTION>BISW3</FUNCTION>
-			<FUNCTION>BITB</FUNCTION>
-			<FUNCTION>BITL</FUNCTION>
-			<FUNCTION>BITW</FUNCTION>
-			<FUNCTION>BLBC</FUNCTION>
-			<FUNCTION>BLBS</FUNCTION>
-			<FUNCTION>BLEQ</FUNCTION>
-			<FUNCTION>BLEQU</FUNCTION>
-			<FUNCTION>BLSS</FUNCTION>
-			<FUNCTION>BLSSU</FUNCTION>
-			<FUNCTION>BNEQ</FUNCTION>
-			<FUNCTION>BNEQU</FUNCTION>
-			<FUNCTION>BPT</FUNCTION>
-			<FUNCTION>BRB</FUNCTION>
-			<FUNCTION>BRW</FUNCTION>
-			<FUNCTION>BSBB</FUNCTION>
-			<FUNCTION>BSBW</FUNCTION>
-			<FUNCTION>BVC</FUNCTION>
-			<FUNCTION>BVS</FUNCTION>
-			<FUNCTION>CALLG</FUNCTION>
-			<FUNCTION>CALLS</FUNCTION>
-			<FUNCTION>CASEB</FUNCTION>
-			<FUNCTION>CASEL</FUNCTION>
-			<FUNCTION>CASEW</FUNCTION>
-			<FUNCTION>CHME</FUNCTION>
-			<FUNCTION>CHMK</FUNCTION>
-			<FUNCTION>CHMS</FUNCTION>
-			<FUNCTION>CHMU</FUNCTION>
-			<FUNCTION>CLRB</FUNCTION>
-			<FUNCTION>CLRD</FUNCTION>
-			<FUNCTION>CLRF</FUNCTION>
-			<FUNCTION>CLRG</FUNCTION>
-			<FUNCTION>CLRH</FUNCTION>
-			<FUNCTION>CLRL</FUNCTION>
-			<FUNCTION>CLRO</FUNCTION>
-			<FUNCTION>CLRQ</FUNCTION>
-			<FUNCTION>CLRW</FUNCTION>
-			<FUNCTION>CMPB</FUNCTION>
-			<FUNCTION>CMPC3</FUNCTION>
-			<FUNCTION>CMPC5</FUNCTION>
-			<FUNCTION>CMPD</FUNCTION>
-			<FUNCTION>CMPF</FUNCTION>
-			<FUNCTION>CMPG</FUNCTION>
-			<FUNCTION>CMPH</FUNCTION>
-			<FUNCTION>CMPL</FUNCTION>
-			<FUNCTION>CMPP3</FUNCTION>
-			<FUNCTION>CMPP4</FUNCTION>
-			<FUNCTION>CMPV</FUNCTION>
-			<FUNCTION>CMPW</FUNCTION>
-			<FUNCTION>CMPZV</FUNCTION>
-			<FUNCTION>CRC</FUNCTION>
-			<FUNCTION>CVTBD</FUNCTION>
-			<FUNCTION>CVTBF</FUNCTION>
-			<FUNCTION>CVTBG</FUNCTION>
-			<FUNCTION>CVTBH</FUNCTION>
-			<FUNCTION>CVTBL</FUNCTION>
-			<FUNCTION>CVTBW</FUNCTION>
-			<FUNCTION>CVTDB</FUNCTION>
-			<FUNCTION>CVTDF</FUNCTION>
-			<FUNCTION>CVTDH</FUNCTION>
-			<FUNCTION>CVTDL</FUNCTION>
-			<FUNCTION>CVTDW</FUNCTION>
-			<FUNCTION>CVTFB</FUNCTION>
-			<FUNCTION>CVTFD</FUNCTION>
-			<FUNCTION>CVTFG</FUNCTION>
-			<FUNCTION>CVTFH</FUNCTION>
-			<FUNCTION>CVTFL</FUNCTION>
-			<FUNCTION>CVTFW</FUNCTION>
-			<FUNCTION>CVTGB</FUNCTION>
-			<FUNCTION>CVTGF</FUNCTION>
-			<FUNCTION>CVTGH</FUNCTION>
-			<FUNCTION>CVTGL</FUNCTION>
-			<FUNCTION>CVTGW</FUNCTION>
-			<FUNCTION>CVTHB</FUNCTION>
-			<FUNCTION>CVTHD</FUNCTION>
-			<FUNCTION>CVTHF</FUNCTION>
-			<FUNCTION>CVTHG</FUNCTION>
-			<FUNCTION>CVTHL</FUNCTION>
-			<FUNCTION>CVTHW</FUNCTION>
-			<FUNCTION>CVTLB</FUNCTION>
-			<FUNCTION>CVTLD</FUNCTION>
-			<FUNCTION>CVTLF</FUNCTION>
-			<FUNCTION>CVTLG</FUNCTION>
-			<FUNCTION>CVTLH</FUNCTION>
-			<FUNCTION>CVTLP</FUNCTION>
-			<FUNCTION>CVTLW</FUNCTION>
-			<FUNCTION>CVTPL</FUNCTION>
-			<FUNCTION>CVTPS</FUNCTION>
-			<FUNCTION>CVTPT</FUNCTION>
-			<FUNCTION>CVTRDL</FUNCTION>
-			<FUNCTION>CVTRFL</FUNCTION>
-			<FUNCTION>CVTRGL</FUNCTION>
-			<FUNCTION>CVTRHL</FUNCTION>
-			<FUNCTION>CVTSP</FUNCTION>
-			<FUNCTION>CVTTP</FUNCTION>
-			<FUNCTION>CVTWB</FUNCTION>
-			<FUNCTION>CVTWD</FUNCTION>
-			<FUNCTION>CVTWF</FUNCTION>
-			<FUNCTION>CVTWG</FUNCTION>
-			<FUNCTION>CVTWH</FUNCTION>
-			<FUNCTION>CVTWL</FUNCTION>
-			<FUNCTION>DECB</FUNCTION>
-			<FUNCTION>DECL</FUNCTION>
-			<FUNCTION>DECW</FUNCTION>
-			<FUNCTION>DIVB2</FUNCTION>
-			<FUNCTION>DIVB3</FUNCTION>
-			<FUNCTION>DIVD2</FUNCTION>
-			<FUNCTION>DIVD3</FUNCTION>
-			<FUNCTION>DIVF2</FUNCTION>
-			<FUNCTION>DIVF3</FUNCTION>
-			<FUNCTION>DIVG2</FUNCTION>
-			<FUNCTION>DIVG3</FUNCTION>
-			<FUNCTION>DIVH2</FUNCTION>
-			<FUNCTION>DIVH3</FUNCTION>
-			<FUNCTION>DIVL2</FUNCTION>
-			<FUNCTION>DIVL3</FUNCTION>
-			<FUNCTION>DIVP</FUNCTION>
-			<FUNCTION>DIVW2</FUNCTION>
-			<FUNCTION>DIVW3</FUNCTION>
-			<FUNCTION>EDITPC</FUNCTION>
-			<FUNCTION>EDIV</FUNCTION>
-			<FUNCTION>EMODD</FUNCTION>
-			<FUNCTION>EMODF</FUNCTION>
-			<FUNCTION>EMODG</FUNCTION>
-			<FUNCTION>EMODH</FUNCTION>
-			<FUNCTION>EMUL</FUNCTION>
-			<FUNCTION>EXTV</FUNCTION>
-			<FUNCTION>EXTZV</FUNCTION>
-			<FUNCTION>FFC</FUNCTION>
-			<FUNCTION>FFS</FUNCTION>
-			<FUNCTION>HALT</FUNCTION>
-			<FUNCTION>INCB</FUNCTION>
-			<FUNCTION>INCL</FUNCTION>
-			<FUNCTION>INCW</FUNCTION>
-			<FUNCTION>INDEX</FUNCTION>
-			<FUNCTION>INSQHI</FUNCTION>
-			<FUNCTION>INSQTI</FUNCTION>
-			<FUNCTION>INSQUE</FUNCTION>
-			<FUNCTION>INSV</FUNCTION>
-			<FUNCTION>IOTA</FUNCTION>
-			<FUNCTION>JMP</FUNCTION>
-			<FUNCTION>JSB</FUNCTION>
-			<FUNCTION>LDPCTX</FUNCTION>
-			<FUNCTION>LOCC</FUNCTION>
-			<FUNCTION>MATCHC</FUNCTION>
-			<FUNCTION>MCOMB</FUNCTION>
-			<FUNCTION>MCOML</FUNCTION>
-			<FUNCTION>MCOMW</FUNCTION>
-			<FUNCTION>MFPR</FUNCTION>
-			<FUNCTION>MFVP</FUNCTION>
-			<FUNCTION>MNEGB</FUNCTION>
-			<FUNCTION>MNEGD</FUNCTION>
-			<FUNCTION>MNEGF</FUNCTION>
-			<FUNCTION>MNEGG</FUNCTION>
-			<FUNCTION>MNEGH</FUNCTION>
-			<FUNCTION>MNEGL</FUNCTION>
-			<FUNCTION>MNEGW</FUNCTION>
-			<FUNCTION>MOVAB</FUNCTION>
-			<FUNCTION>MOVAD</FUNCTION>
-			<FUNCTION>MOVAF</FUNCTION>
-			<FUNCTION>MOVAG</FUNCTION>
-			<FUNCTION>MOVAH</FUNCTION>
-			<FUNCTION>MOVAL</FUNCTION>
-			<FUNCTION>MOVAO</FUNCTION>
-			<FUNCTION>MOVAQ</FUNCTION>
-			<FUNCTION>MOVAW</FUNCTION>
-			<FUNCTION>MOVB</FUNCTION>
-			<FUNCTION>MOVC3</FUNCTION>
-			<FUNCTION>MOVC5</FUNCTION>
-			<FUNCTION>MOVD</FUNCTION>
-			<FUNCTION>MOVF</FUNCTION>
-			<FUNCTION>MOVG</FUNCTION>
-			<FUNCTION>MOVH</FUNCTION>
-			<FUNCTION>MOVL</FUNCTION>
-			<FUNCTION>MOVO</FUNCTION>
-			<FUNCTION>MOVP</FUNCTION>
-			<FUNCTION>MOVPSL</FUNCTION>
-			<FUNCTION>MOVQ</FUNCTION>
-			<FUNCTION>MOVTC</FUNCTION>
-			<FUNCTION>MOVTUC</FUNCTION>
-			<FUNCTION>MOVW</FUNCTION>
-			<FUNCTION>MOVZBL</FUNCTION>
-			<FUNCTION>MOVZBW</FUNCTION>
-			<FUNCTION>MOVZWL</FUNCTION>
-			<FUNCTION>MTPR</FUNCTION>
-			<FUNCTION>MTVP</FUNCTION>
-			<FUNCTION>MULB2</FUNCTION>
-			<FUNCTION>MULB3</FUNCTION>
-			<FUNCTION>MULD2</FUNCTION>
-			<FUNCTION>MULD3</FUNCTION>
-			<FUNCTION>MULF2</FUNCTION>
-			<FUNCTION>MULF3</FUNCTION>
-			<FUNCTION>MULG2</FUNCTION>
-			<FUNCTION>MULG3</FUNCTION>
-			<FUNCTION>MULH2</FUNCTION>
-			<FUNCTION>MULH3</FUNCTION>
-			<FUNCTION>MULL2</FUNCTION>
-			<FUNCTION>MULL3</FUNCTION>
-			<FUNCTION>MULP</FUNCTION>
-			<FUNCTION>MULW2</FUNCTION>
-			<FUNCTION>MULW3</FUNCTION>
-			<FUNCTION>NOP</FUNCTION>
-			<FUNCTION>POLYD</FUNCTION>
-			<FUNCTION>POLYF</FUNCTION>
-			<FUNCTION>POLYG</FUNCTION>
-			<FUNCTION>POLYH</FUNCTION>
-			<FUNCTION>POPR</FUNCTION>
-			<FUNCTION>PROBER</FUNCTION>
-			<FUNCTION>PROBEW</FUNCTION>
-			<FUNCTION>PUSHAB</FUNCTION>
-			<FUNCTION>PUSHABL</FUNCTION>
-			<FUNCTION>PUSHAL</FUNCTION>
-			<FUNCTION>PUSHAD</FUNCTION>
-			<FUNCTION>PUSHAF</FUNCTION>
-			<FUNCTION>PUSHAG</FUNCTION>
-			<FUNCTION>PUSHAH</FUNCTION>
-			<FUNCTION>PUSHAL</FUNCTION>
-			<FUNCTION>PUSHAO</FUNCTION>
-			<FUNCTION>PUSHAQ</FUNCTION>
-			<FUNCTION>PUSHAW</FUNCTION>
-			<FUNCTION>PUSHL</FUNCTION>
-			<FUNCTION>PUSHR</FUNCTION>
-			<FUNCTION>REI</FUNCTION>
-			<FUNCTION>REMQHI</FUNCTION>
-			<FUNCTION>REMQTI</FUNCTION>
-			<FUNCTION>REMQUE</FUNCTION>
-			<FUNCTION>RET</FUNCTION>
-			<FUNCTION>ROTL</FUNCTION>
-			<FUNCTION>RSB</FUNCTION>
-			<FUNCTION>SBWC</FUNCTION>
-			<FUNCTION>SCANC</FUNCTION>
-			<FUNCTION>SKPC</FUNCTION>
-			<FUNCTION>SOBGEQ</FUNCTION>
-			<FUNCTION>SOBGTR</FUNCTION>
-			<FUNCTION>SPANC</FUNCTION>
-			<FUNCTION>SUBB2</FUNCTION>
-			<FUNCTION>SUBB3</FUNCTION>
-			<FUNCTION>SUBD2</FUNCTION>
-			<FUNCTION>SUBD3</FUNCTION>
-			<FUNCTION>SUBF2</FUNCTION>
-			<FUNCTION>SUBF3</FUNCTION>
-			<FUNCTION>SUBG2</FUNCTION>
-			<FUNCTION>SUBG3</FUNCTION>
-			<FUNCTION>SUBH2</FUNCTION>
-			<FUNCTION>SUBH3</FUNCTION>
-			<FUNCTION>SUBL2</FUNCTION>
-			<FUNCTION>SUBL3</FUNCTION>
-			<FUNCTION>SUBP4</FUNCTION>
-			<FUNCTION>SUBP6</FUNCTION>
-			<FUNCTION>SUBW2</FUNCTION>
-			<FUNCTION>SUBW3</FUNCTION>
-			<FUNCTION>SVPCTX</FUNCTION>
-			<FUNCTION>TSTB</FUNCTION>
-			<FUNCTION>TSTD</FUNCTION>
-			<FUNCTION>TSTF</FUNCTION>
-			<FUNCTION>TSTG</FUNCTION>
-			<FUNCTION>TSTH</FUNCTION>
-			<FUNCTION>TSTL</FUNCTION>
-			<FUNCTION>TSTW</FUNCTION>
-			<FUNCTION>VGATHL</FUNCTION>
-			<FUNCTION>VGATHQ</FUNCTION>
-			<FUNCTION>VLDL</FUNCTION>
-			<FUNCTION>VLDQ</FUNCTION>
-			<FUNCTION>VSADDD</FUNCTION>
-			<FUNCTION>VSADDF</FUNCTION>
-			<FUNCTION>VSADDG</FUNCTION>
-			<FUNCTION>VSADDL</FUNCTION>
-			<FUNCTION>VSBICL</FUNCTION>
-			<FUNCTION>VSBISL</FUNCTION>
-			<FUNCTION>VSCATL</FUNCTION>
-			<FUNCTION>VSCATQ</FUNCTION>
-			<FUNCTION>VSCMPD</FUNCTION>
-			<FUNCTION>VSCMPF</FUNCTION>
-			<FUNCTION>VSCMPG</FUNCTION>
-			<FUNCTION>VSCMPL</FUNCTION>
-			<FUNCTION>VSDIVD</FUNCTION>
-			<FUNCTION>VSDIVF</FUNCTION>
-			<FUNCTION>VSDIVG</FUNCTION>
-			<FUNCTION>VSMERGE</FUNCTION>
-			<FUNCTION>VSMULD</FUNCTION>
-			<FUNCTION>VSMULF</FUNCTION>
-			<FUNCTION>VSMULG</FUNCTION>
-			<FUNCTION>VSMULL</FUNCTION>
-			<FUNCTION>VSSLLL</FUNCTION>
-			<FUNCTION>VSSRLL</FUNCTION>
-			<FUNCTION>VSSUBD</FUNCTION>
-			<FUNCTION>VSSUBF</FUNCTION>
-			<FUNCTION>VSSUBG</FUNCTION>
-			<FUNCTION>VSSUBL</FUNCTION>
-			<FUNCTION>VSTL</FUNCTION>
-			<FUNCTION>VSTQ</FUNCTION>
-			<FUNCTION>VSXORL</FUNCTION>
-			<FUNCTION>VSYNC</FUNCTION>
-			<FUNCTION>VVADDD</FUNCTION>
-			<FUNCTION>VVADDF</FUNCTION>
-			<FUNCTION>VVADDG</FUNCTION>
-			<FUNCTION>VVADDL</FUNCTION>
-			<FUNCTION>VVBICL</FUNCTION>
-			<FUNCTION>VVBISL</FUNCTION>
-			<FUNCTION>VVCMPD</FUNCTION>
-			<FUNCTION>VVCMPF</FUNCTION>
-			<FUNCTION>VVCMPG</FUNCTION>
-			<FUNCTION>VVCMPL</FUNCTION>
-			<FUNCTION>VVCVT</FUNCTION>
-			<FUNCTION>VVDIVD</FUNCTION>
-			<FUNCTION>VVDIVF</FUNCTION>
-			<FUNCTION>VVDIVG</FUNCTION>
-			<FUNCTION>VVMERGE</FUNCTION>
-			<FUNCTION>VVMULD</FUNCTION>
-			<FUNCTION>VVMULF</FUNCTION>
-			<FUNCTION>VVMULG</FUNCTION>
-			<FUNCTION>VVMULL</FUNCTION>
-			<FUNCTION>VVSLLL</FUNCTION>
-			<FUNCTION>VVSRLL</FUNCTION>
-			<FUNCTION>VVSUBD</FUNCTION>
-			<FUNCTION>VVSUBF</FUNCTION>
-			<FUNCTION>VVSUBG</FUNCTION>
-			<FUNCTION>VVSUBL</FUNCTION>
-			<FUNCTION>VVXORL</FUNCTION>
-			<FUNCTION>XFC</FUNCTION>
-			<FUNCTION>XORB2</FUNCTION>
-			<FUNCTION>XORB3</FUNCTION>
-			<FUNCTION>XORL2</FUNCTION>
-			<FUNCTION>XORL3</FUNCTION>
-			<FUNCTION>XORW2</FUNCTION>
-			<FUNCTION>XORW3</FUNCTION>
-		</KEYWORDS>
-	</RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/assembly_mcs51.xml b/qpython/src/main/assets/syntax/assembly_mcs51.xml
deleted file mode 100644
index 7ce87352..00000000
--- a/qpython/src/main/assets/syntax/assembly_mcs51.xml
+++ /dev/null
@@ -1,238 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!--
-	MCS51 Assembly mode by Mirco Bova (mirco.bova@libero.it)
-
-	- KEIL syntax
--->
-
-<MODE>
-
-	<PROPS>
-		<PROPERTY NAME="lineComment" VALUE=";" />
-		<PROPERTY NAME="contextInsensitive" VALUE="true"/>
-	</PROPS>
-
-	<RULES HIGHLIGHT_DIGITS="TRUE" IGNORE_CASE="TRUE">
-		<EOL_SPAN TYPE="COMMENT1">;</EOL_SPAN>
-
-		<SPAN TYPE="LITERAL1" NO_LINE_BREAK="TRUE">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-
-		<SPAN TYPE="LITERAL1" NO_LINE_BREAK="TRUE">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-
-		<!-- NASM: label inside a macro -->
-		<MARK_FOLLOWING TYPE="LABEL" MATCH_TYPE="OPERATOR"
-			AT_LINE_START="TRUE">%%</MARK_FOLLOWING>
-
-		<MARK_FOLLOWING TYPE="KEYWORD2" AT_LINE_START="TRUE">$</MARK_FOLLOWING>
-
-		<MARK_PREVIOUS TYPE="LABEL" MATCH_TYPE="OPERATOR"
-			AT_LINE_START="TRUE">:</MARK_PREVIOUS>
-
-		<SEQ TYPE="NULL">,</SEQ>
-		<SEQ TYPE="NULL">:</SEQ>
-		<SEQ TYPE="NULL">(</SEQ>
-		<SEQ TYPE="NULL">)</SEQ>
-		<SEQ TYPE="NULL">]</SEQ>
-		<SEQ TYPE="NULL">[</SEQ>
-		<SEQ TYPE="NULL">$</SEQ>
-
-		<SEQ TYPE="OPERATOR">+</SEQ>
-		<SEQ TYPE="OPERATOR">-</SEQ>
-		<SEQ TYPE="OPERATOR">/</SEQ>
-		<SEQ TYPE="OPERATOR">*</SEQ>
-		<SEQ TYPE="OPERATOR">%</SEQ>
-
-		<SEQ TYPE="OPERATOR">|</SEQ>
-		<SEQ TYPE="OPERATOR">^</SEQ>
-		<SEQ TYPE="OPERATOR">&amp;</SEQ>
-		<SEQ TYPE="OPERATOR">~</SEQ>
-		<SEQ TYPE="OPERATOR">!</SEQ>
-
-		<SEQ TYPE="OPERATOR">=</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;</SEQ>
-
-		<KEYWORDS>
-			<KEYWORD1>MOD</KEYWORD1>
-			<KEYWORD1>SHR</KEYWORD1>
-			<KEYWORD1>SHL</KEYWORD1>
-			<KEYWORD1>NOT</KEYWORD1>
-			<KEYWORD1>AND</KEYWORD1>
-			<KEYWORD1>OR</KEYWORD1>
-			<KEYWORD1>XOR</KEYWORD1>
-			<KEYWORD1>HIGH</KEYWORD1>
-			<KEYWORD1>LOW</KEYWORD1>
-			<KEYWORD1>LT</KEYWORD1>
-			<KEYWORD1>LE</KEYWORD1>
-			<KEYWORD1>NE</KEYWORD1>
-			<KEYWORD1>EQ</KEYWORD1>
-			<KEYWORD1>GE</KEYWORD1>
-			<KEYWORD1>GT</KEYWORD1>
-			<KEYWORD1>DPTR</KEYWORD1>
-			<KEYWORD1>PC</KEYWORD1>
-			<KEYWORD1>EQU</KEYWORD1>
-			<KEYWORD1>SET</KEYWORD1>
-			<KEYWORD1>NUMBER</KEYWORD1>
-			<KEYWORD1>CSEG</KEYWORD1>
-			<KEYWORD1>XSEG</KEYWORD1>
-			<KEYWORD1>DSEG</KEYWORD1>
-			<KEYWORD1>ISEG</KEYWORD1>
-			<KEYWORD1>BSEG</KEYWORD1>
-			<KEYWORD1>RSEG</KEYWORD1>
-			<KEYWORD1>NUL</KEYWORD1>
-			<KEYWORD1>DB</KEYWORD1>
-			<KEYWORD1>DW</KEYWORD1>
-			<KEYWORD1>DWR</KEYWORD1>
-			<KEYWORD1>DS</KEYWORD1>
-			<KEYWORD1>DBIT</KEYWORD1>
-			<KEYWORD1>ORG</KEYWORD1>
-			<KEYWORD1>USING</KEYWORD1>
-			<KEYWORD1>END</KEYWORD1>
-			<KEYWORD1>NAME</KEYWORD1>
-			<KEYWORD1>PUBLIC</KEYWORD1>
-			<KEYWORD1>EXTRN</KEYWORD1>
-			<KEYWORD1>SEGMENT</KEYWORD1>
-			<KEYWORD1>UNIT</KEYWORD1>
-			<KEYWORD1>BITADDRESSABLE</KEYWORD1>
-			<KEYWORD1>INPAGE</KEYWORD1>
-			<KEYWORD1>INBLOCK</KEYWORD1>
-			<KEYWORD1>PAGE</KEYWORD1>
-			<KEYWORD1>OVERLAYABLE</KEYWORD1>
-			<KEYWORD1>AT</KEYWORD1>
-			<KEYWORD1>STACKLEN</KEYWORD1>
-			<KEYWORD1>SBIT</KEYWORD1>
-			<KEYWORD1>SFR</KEYWORD1>
-			<KEYWORD1>SFR16</KEYWORD1>
-			<KEYWORD1>__ERROR__</KEYWORD1>
-			<KEYWORD1>ACALL</KEYWORD1>
-			<KEYWORD1>ADD</KEYWORD1>
-			<KEYWORD1>ADDC</KEYWORD1>
-			<KEYWORD1>AJMP</KEYWORD1>
-			<KEYWORD1>ANL</KEYWORD1>
-			<KEYWORD1>CALL</KEYWORD1>
-			<KEYWORD1>CJNE</KEYWORD1>
-			<KEYWORD1>CLR</KEYWORD1>
-			<KEYWORD1>CPL</KEYWORD1>
-			<KEYWORD1>DA</KEYWORD1>
-			<KEYWORD1>DEC</KEYWORD1>
-			<KEYWORD1>DIV</KEYWORD1>
-			<KEYWORD1>DJNZ</KEYWORD1>
-			<KEYWORD1>INC</KEYWORD1>
-			<KEYWORD1>JB</KEYWORD1>
-			<KEYWORD1>JBC</KEYWORD1>
-			<KEYWORD1>JC</KEYWORD1>
-			<KEYWORD1>JMP</KEYWORD1>
-			<KEYWORD1>JNB</KEYWORD1>
-			<KEYWORD1>JNC</KEYWORD1>
-			<KEYWORD1>JNZ</KEYWORD1>
-			<KEYWORD1>JZ</KEYWORD1>
-			<KEYWORD1>LCALL</KEYWORD1>
-			<KEYWORD1>LJMP</KEYWORD1>
-			<KEYWORD1>MOV</KEYWORD1>
-			<KEYWORD1>MOVC</KEYWORD1>
-			<KEYWORD1>MOVX</KEYWORD1>
-			<KEYWORD1>MUL</KEYWORD1>
-			<KEYWORD1>NOP</KEYWORD1>
-			<KEYWORD1>ORL</KEYWORD1>
-			<KEYWORD1>POP</KEYWORD1>
-			<KEYWORD1>PUSH</KEYWORD1>
-			<KEYWORD1>RET</KEYWORD1>
-			<KEYWORD1>RETI</KEYWORD1>
-			<KEYWORD1>RL</KEYWORD1>
-			<KEYWORD1>RLC</KEYWORD1>
-			<KEYWORD1>RR</KEYWORD1>
-			<KEYWORD1>RRC</KEYWORD1>
-			<KEYWORD1>SETB</KEYWORD1>
-			<KEYWORD1>SJMP</KEYWORD1>
-			<KEYWORD1>SUBB</KEYWORD1>
-			<KEYWORD1>SWAP</KEYWORD1>
-			<KEYWORD1>XCH</KEYWORD1>
-			<KEYWORD1>XCHD</KEYWORD1>
-			<KEYWORD1>XRL</KEYWORD1>
-			<KEYWORD1>IF</KEYWORD1>
-			<KEYWORD1>ELSEIF</KEYWORD1>
-			<KEYWORD1>ELSE</KEYWORD1>
-			<KEYWORD1>ENDIF</KEYWORD1>
-			<KEYWORD1>MACRO</KEYWORD1>
-			<KEYWORD1>REPT</KEYWORD1>
-			<KEYWORD1>IRP</KEYWORD1>
-			<KEYWORD1>IRPC</KEYWORD1>
-			<KEYWORD1>ENDM</KEYWORD1>
-			<KEYWORD1>EXITM</KEYWORD1>
-			<KEYWORD1>LOCAL</KEYWORD1>
-			<KEYWORD1>DPTX</KEYWORD1>
-			<KEYWORD1>DPTN</KEYWORD1>
-			<KEYWORD1>DPTR8</KEYWORD1>
-			<KEYWORD1>DPTR16</KEYWORD1>
-			<KEYWORD1>WR0</KEYWORD1>
-			<KEYWORD1>WR2</KEYWORD1>
-			<KEYWORD1>WR4</KEYWORD1>
-			<KEYWORD1>WR6</KEYWORD1>
-			<KEYWORD1>DR0</KEYWORD1>
-			<KEYWORD1>DR4</KEYWORD1>
-			<KEYWORD1>RJC</KEYWORD1>
-			<KEYWORD1>RJNC</KEYWORD1>
-			<KEYWORD1>RJZ</KEYWORD1>
-			<KEYWORD1>RJNZ</KEYWORD1>
-			<KEYWORD1>JMPI</KEYWORD1>
-			<KEYWORD1>MOVB</KEYWORD1>
-			<KEYWORD1>PUSHA</KEYWORD1>
-			<KEYWORD1>POPA</KEYWORD1>
-			<KEYWORD1>SUB</KEYWORD1>
-			<KEYWORD1>ADDM</KEYWORD1>
-			<KEYWORD1>SUBM</KEYWORD1>
-			<KEYWORD1>SLEEP</KEYWORD1>
-			<KEYWORD1>SYNC</KEYWORD1>
-			<KEYWORD1>DEFINE</KEYWORD1>
-			<KEYWORD1>SUBSTR</KEYWORD1>
-			<KEYWORD1>THEN</KEYWORD1>
-			<KEYWORD1>LEN</KEYWORD1>
-			<KEYWORD1>EQS</KEYWORD1>
-			<KEYWORD1>IF</KEYWORD1>
-			<KEYWORD1>FI</KEYWORD1>
-
-			<KEYWORD2>$IF</KEYWORD2>
-			<KEYWORD2>$ELSEIF</KEYWORD2>
-			<KEYWORD2>$ELSE</KEYWORD2>
-			<KEYWORD2>$ENDIF</KEYWORD2>
-			<KEYWORD2>$MOD167</KEYWORD2>
-			<KEYWORD2>$CASE</KEYWORD2>
-			<KEYWORD2>$SEGMENTED</KEYWORD2>
-			<KEYWORD2>$INCLUDE</KEYWORD2>
-
-			<!-- memory types -->
-			<KEYWORD2>CODE</KEYWORD2>
-			<KEYWORD2>XDATA</KEYWORD2>
-			<KEYWORD2>DATA</KEYWORD2>
-			<KEYWORD2>IDATA</KEYWORD2>
-			<KEYWORD2>BIT</KEYWORD2>
-
-			<!-- Registers -->
-			<KEYWORD3>R0</KEYWORD3>
-			<KEYWORD3>R1</KEYWORD3>
-			<KEYWORD3>R2</KEYWORD3>
-			<KEYWORD3>R3</KEYWORD3>
-			<KEYWORD3>R4</KEYWORD3>
-			<KEYWORD3>R5</KEYWORD3>
-			<KEYWORD3>R6</KEYWORD3>
-			<KEYWORD3>R7</KEYWORD3>
-
-			<KEYWORD3>SP</KEYWORD3>
-			<KEYWORD3>A</KEYWORD3>
-			<KEYWORD3>C</KEYWORD3>
-			<KEYWORD3>AB</KEYWORD3>
-
-			<!-- Instructions -->
-
-		</KEYWORDS>
-	</RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/assembly_parrot.xml b/qpython/src/main/assets/syntax/assembly_parrot.xml
deleted file mode 100644
index 709f3f72..00000000
--- a/qpython/src/main/assets/syntax/assembly_parrot.xml
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<MODE>
-        <PROPS>
-                <PROPERTY NAME="lineComment" VALUE="#" />
-		<PROPERTY NAME="contextInsensitive" VALUE="true"/>
-        </PROPS>
-        <RULES IGNORE_CASE="FALSE"
-                HIGHLIGHT_DIGITS="TRUE"
-                DIGIT_RE="(0x[\p{XDigit}]+|[\p{Digit}]+)"
-        >
-
-                <SPAN TYPE="LITERAL1" NO_LINE_BREAK="TRUE">
-                        <BEGIN>"</BEGIN>
-                        <END>"</END>
-                </SPAN>
-
-                <EOL_SPAN TYPE="COMMENT1">#</EOL_SPAN>
-
-                <MARK_PREVIOUS TYPE="LABEL" MATCH_TYPE="OPERATOR"
-                                AT_LINE_START="TRUE">:</MARK_PREVIOUS>
-
-                <SEQ TYPE="OPERATOR">,</SEQ>
-
-                <SEQ_REGEXP TYPE="LITERAL2"
-                        HASH_CHARS="ISNP"
-                        AT_WORD_START="TRUE"
-                >[ISNP]\d{1,2}</SEQ_REGEXP>
-
-                <KEYWORDS>
-                        <KEYWORD1>abs</KEYWORD1>
-                        <KEYWORD1>acos</KEYWORD1>
-                        <KEYWORD1>add</KEYWORD1>
-                        <KEYWORD1>and</KEYWORD1>
-                        <KEYWORD1>asec</KEYWORD1>
-                        <KEYWORD1>asin</KEYWORD1>
-                        <KEYWORD1>atan</KEYWORD1>
-                        <KEYWORD1>bounds</KEYWORD1>
-                        <KEYWORD1>branch</KEYWORD1>
-                        <KEYWORD1>bsr</KEYWORD1>
-                        <KEYWORD1>chopm</KEYWORD1>
-                        <KEYWORD1>cleari</KEYWORD1>
-                        <KEYWORD1>clearn</KEYWORD1>
-                        <KEYWORD1>clearp</KEYWORD1>
-                        <KEYWORD1>clears</KEYWORD1>
-                        <KEYWORD1>clone</KEYWORD1>
-                        <KEYWORD1>close</KEYWORD1>
-                        <KEYWORD1>cmod</KEYWORD1>
-                        <KEYWORD1>concat</KEYWORD1>
-                        <KEYWORD1>cos</KEYWORD1>
-                        <KEYWORD1>cosh</KEYWORD1>
-                        <KEYWORD1>debug</KEYWORD1>
-                        <KEYWORD1>dec</KEYWORD1>
-                        <KEYWORD1>div</KEYWORD1>
-                        <KEYWORD1>end</KEYWORD1>
-                        <KEYWORD1>entrytype</KEYWORD1>
-                        <KEYWORD1>eq</KEYWORD1>
-                        <KEYWORD1>err</KEYWORD1>
-                        <KEYWORD1>exp</KEYWORD1>
-                        <KEYWORD1>find_global</KEYWORD1>
-                        <KEYWORD1>find_type</KEYWORD1>
-                        <KEYWORD1>ge</KEYWORD1>
-                        <KEYWORD1>getfile</KEYWORD1>
-                        <KEYWORD1>getline</KEYWORD1>
-                        <KEYWORD1>getpackage</KEYWORD1>
-                        <KEYWORD1>gt</KEYWORD1>
-                        <KEYWORD1>if</KEYWORD1>
-                        <KEYWORD1>inc</KEYWORD1>
-                        <KEYWORD1>index</KEYWORD1>
-                        <KEYWORD1>jsr</KEYWORD1>
-                        <KEYWORD1>jump</KEYWORD1>
-                        <KEYWORD1>le</KEYWORD1>
-                        <KEYWORD1>length</KEYWORD1>
-                        <KEYWORD1>ln</KEYWORD1>
-                        <KEYWORD1>log2</KEYWORD1>
-                        <KEYWORD1>log10</KEYWORD1>
-                        <KEYWORD1>lt</KEYWORD1>
-                        <KEYWORD1>mod</KEYWORD1>
-                        <KEYWORD1>mul</KEYWORD1>
-                        <KEYWORD1>ne</KEYWORD1>
-                        <KEYWORD1>new</KEYWORD1>
-                        <KEYWORD1>newinterp</KEYWORD1>
-                        <KEYWORD1>noop</KEYWORD1>
-                        <KEYWORD1>not</KEYWORD1>
-                        <KEYWORD1>not</KEYWORD1>
-                        <KEYWORD1>open</KEYWORD1>
-                        <KEYWORD1>or</KEYWORD1>
-                        <KEYWORD1>ord</KEYWORD1>
-                        <KEYWORD1>pack</KEYWORD1>
-                        <KEYWORD1>pop</KEYWORD1>
-                        <KEYWORD1>popi</KEYWORD1>
-                        <KEYWORD1>popn</KEYWORD1>
-                        <KEYWORD1>popp</KEYWORD1>
-                        <KEYWORD1>pops</KEYWORD1>
-                        <KEYWORD1>pow</KEYWORD1>
-                        <KEYWORD1>print</KEYWORD1>
-                        <KEYWORD1>profile</KEYWORD1>
-                        <KEYWORD1>push</KEYWORD1>
-                        <KEYWORD1>pushi</KEYWORD1>
-                        <KEYWORD1>pushn</KEYWORD1>
-                        <KEYWORD1>pushp</KEYWORD1>
-                        <KEYWORD1>pushs</KEYWORD1>
-                        <KEYWORD1>read</KEYWORD1>
-                        <KEYWORD1>readline</KEYWORD1>
-                        <KEYWORD1>repeat</KEYWORD1>
-                        <KEYWORD1>restore</KEYWORD1>
-                        <KEYWORD1>ret</KEYWORD1>
-                        <KEYWORD1>rotate_up</KEYWORD1>
-                        <KEYWORD1>runinterp</KEYWORD1>
-                        <KEYWORD1>save</KEYWORD1>
-                        <KEYWORD1>sec</KEYWORD1>
-                        <KEYWORD1>sech</KEYWORD1>
-                        <KEYWORD1>set</KEYWORD1>
-                        <KEYWORD1>set_keyed</KEYWORD1>
-                        <KEYWORD1>setfile</KEYWORD1>
-                        <KEYWORD1>setline</KEYWORD1>
-                        <KEYWORD1>setpackage</KEYWORD1>
-                        <KEYWORD1>shl</KEYWORD1>
-                        <KEYWORD1>shr</KEYWORD1>
-                        <KEYWORD1>sin</KEYWORD1>
-                        <KEYWORD1>sinh</KEYWORD1>
-                        <KEYWORD1>sleep</KEYWORD1>
-                        <KEYWORD1>sub</KEYWORD1>
-                        <KEYWORD1>substr</KEYWORD1>
-                        <KEYWORD1>tan</KEYWORD1>
-                        <KEYWORD1>tanh</KEYWORD1>
-                        <KEYWORD1>time</KEYWORD1>
-                        <KEYWORD1>trace</KEYWORD1>
-                        <KEYWORD1>typeof</KEYWORD1>
-                        <KEYWORD1>unless</KEYWORD1>
-                        <KEYWORD1>warningsoff</KEYWORD1>
-                        <KEYWORD1>warningson</KEYWORD1>
-                        <KEYWORD1>write</KEYWORD1>
-                        <KEYWORD1>xor</KEYWORD1>
-                </KEYWORDS>
-        </RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/assembly_r2000.xml b/qpython/src/main/assets/syntax/assembly_r2000.xml
deleted file mode 100644
index 444c295e..00000000
--- a/qpython/src/main/assets/syntax/assembly_r2000.xml
+++ /dev/null
@@ -1,260 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!-- MIPS/SPIM Assembly Mode from
-	Marc Rummel marc.rummel@stud.uni-karlsruhe.de
-	SIPM Homepage: http://www.cs.wisc.edu/~larus/spim.html
--->
-
-<MODE>
-
-	<PROPS>
-		<PROPERTY NAME="blockComment" VALUE="#" />
-		<PROPERTY NAME="wordBreakChars" VALUE=",()" />
-		<PROPERTY NAME="contextInsensitive" VALUE="true"/>
-	</PROPS>
-
-	<RULES HIGHLIGHT_DIGITS="TRUE" IGNORE_CASE="TRUE">
-		<!-- Comment -->
-		<EOL_SPAN TYPE="COMMENT1">#</EOL_SPAN>
-
-		<!-- Strings -->
-		<SPAN TYPE="LITERAL1" NO_LINE_BREAK="TRUE">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-
-		<SPAN TYPE="LITERAL1" ESCAPE="\" NO_LINE_BREAK="TRUE">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-
-		<!-- Labels -->
-		<MARK_PREVIOUS TYPE="LABEL" AT_LINE_START="TRUE">:</MARK_PREVIOUS>
-
-		<!-- Assembler directives -->
-		<KEYWORDS>
-			<KEYWORD1>.align</KEYWORD1>
-			<KEYWORD1>.ascii</KEYWORD1>
-			<KEYWORD1>.asciiz</KEYWORD1>
-			<KEYWORD1>.byte</KEYWORD1>
-			<KEYWORD1>.data</KEYWORD1>
-			<KEYWORD1>.double</KEYWORD1>
-			<KEYWORD1>.extern</KEYWORD1>
-			<KEYWORD1>.float</KEYWORD1>
-			<KEYWORD1>.globl</KEYWORD1>
-			<KEYWORD1>.half</KEYWORD1>
-			<KEYWORD1>.kdata</KEYWORD1>
-			<KEYWORD1>.ktext</KEYWORD1>
-			<KEYWORD1>.space</KEYWORD1>
-			<KEYWORD1>.text</KEYWORD1>
-			<KEYWORD1>.word</KEYWORD1>
-
-		<!-- MIPS/SPIM Operations -->
-			<FUNCTION>add</FUNCTION>
-			<FUNCTION>addi</FUNCTION>
-			<FUNCTION>addu</FUNCTION>
-			<FUNCTION>addiu</FUNCTION>
-			<FUNCTION>and</FUNCTION>
-			<FUNCTION>andi</FUNCTION>
-			<FUNCTION>div</FUNCTION>
-			<FUNCTION>divu</FUNCTION>
-			<FUNCTION>mul</FUNCTION>
-			<FUNCTION>mulo</FUNCTION>
-			<FUNCTION>mulou</FUNCTION>
-			<FUNCTION>mult</FUNCTION>
-			<FUNCTION>multu</FUNCTION>
-			<FUNCTION>neg</FUNCTION>
-			<FUNCTION>negu</FUNCTION>
-			<FUNCTION>nor</FUNCTION>
-			<FUNCTION>not</FUNCTION>
-			<FUNCTION>or</FUNCTION>
-			<FUNCTION>ori</FUNCTION>
-			<FUNCTION>rem</FUNCTION>
-			<FUNCTION>remu</FUNCTION>
-			<FUNCTION>rol</FUNCTION>
-			<FUNCTION>ror</FUNCTION>
-			<FUNCTION>sll</FUNCTION>
-			<FUNCTION>sllv</FUNCTION>
-			<FUNCTION>sra</FUNCTION>
-			<FUNCTION>srav</FUNCTION>
-			<FUNCTION>srl</FUNCTION>
-			<FUNCTION>srlv</FUNCTION>
-			<FUNCTION>sub</FUNCTION>
-			<FUNCTION>subu</FUNCTION>
-			<FUNCTION>xor</FUNCTION>
-			<FUNCTION>xori</FUNCTION>
-			<FUNCTION>li</FUNCTION>
-			<FUNCTION>lui</FUNCTION>
-			<FUNCTION>seq</FUNCTION>
-			<FUNCTION>sge</FUNCTION>
-			<FUNCTION>sgt</FUNCTION>
-			<FUNCTION>sgtu</FUNCTION>
-			<FUNCTION>sle</FUNCTION>
-			<FUNCTION>sleu</FUNCTION>
-			<FUNCTION>slt</FUNCTION>
-			<FUNCTION>slti</FUNCTION>
-			<FUNCTION>sltu</FUNCTION>
-			<FUNCTION>sltiu</FUNCTION>
-			<FUNCTION>sne</FUNCTION>
-			<FUNCTION>b</FUNCTION>
-			<FUNCTION>bczt</FUNCTION>
-			<FUNCTION>bczf</FUNCTION>
-			<FUNCTION>beq</FUNCTION>
-			<FUNCTION>beqz</FUNCTION>
-			<FUNCTION>bge</FUNCTION>
-			<FUNCTION>bgeu</FUNCTION>
-			<FUNCTION>bgez</FUNCTION>
-			<FUNCTION>bgezal</FUNCTION>
-			<FUNCTION>bgt</FUNCTION>
-			<FUNCTION>bgtu</FUNCTION>
-			<FUNCTION>bgtz</FUNCTION>
-			<FUNCTION>ble</FUNCTION>
-			<FUNCTION>bleu</FUNCTION>
-			<FUNCTION>blez</FUNCTION>
-			<FUNCTION>bgezal</FUNCTION>
-			<FUNCTION>bltzal</FUNCTION>
-			<FUNCTION>blt</FUNCTION>
-			<FUNCTION>bltu</FUNCTION>
-			<FUNCTION>bltz</FUNCTION>
-			<FUNCTION>bne</FUNCTION>
-			<FUNCTION>bnez</FUNCTION>
-			<FUNCTION>j</FUNCTION>
-			<FUNCTION>jal</FUNCTION>
-			<FUNCTION>jalr</FUNCTION>
-			<FUNCTION>jr</FUNCTION>
-			<FUNCTION>la</FUNCTION>
-			<FUNCTION>lb</FUNCTION>
-			<FUNCTION>blu</FUNCTION>
-			<FUNCTION>lh</FUNCTION>
-			<FUNCTION>lhu</FUNCTION>
-			<FUNCTION>lw</FUNCTION>
-			<FUNCTION>lwcz</FUNCTION>
-			<FUNCTION>lwl</FUNCTION>
-			<FUNCTION>lwr</FUNCTION>
-			<FUNCTION>ulh</FUNCTION>
-			<FUNCTION>ulhu</FUNCTION>
-			<FUNCTION>ulw</FUNCTION>
-			<FUNCTION>sb</FUNCTION>
-			<FUNCTION>sd</FUNCTION>
-			<FUNCTION>sh</FUNCTION>
-			<FUNCTION>sw</FUNCTION>
-			<FUNCTION>swcz</FUNCTION>
-			<FUNCTION>swl</FUNCTION>
-			<FUNCTION>swr</FUNCTION>
-			<FUNCTION>ush</FUNCTION>
-			<FUNCTION>usw</FUNCTION>
-			<FUNCTION>move</FUNCTION>
-			<FUNCTION>mfhi</FUNCTION>
-			<FUNCTION>mflo</FUNCTION>
-			<FUNCTION>mthi</FUNCTION>
-			<FUNCTION>mtlo</FUNCTION>
-			<FUNCTION>mfcz</FUNCTION>
-			<FUNCTION>mfc1.d</FUNCTION>
-			<FUNCTION>mtcz</FUNCTION>
-			<FUNCTION>abs.d</FUNCTION>
-			<FUNCTION>abs.s</FUNCTION>
-			<FUNCTION>add.d</FUNCTION>
-			<FUNCTION>add.s</FUNCTION>
-			<FUNCTION>c.eq.d</FUNCTION>
-			<FUNCTION>c.eq.s</FUNCTION>
-			<FUNCTION>c.le.d</FUNCTION>
-			<FUNCTION>c.le.s</FUNCTION>
-			<FUNCTION>c.lt.d</FUNCTION>
-			<FUNCTION>c.lt.s</FUNCTION>
-			<FUNCTION>cvt.d.s</FUNCTION>
-			<FUNCTION>cbt.d.w</FUNCTION>
-			<FUNCTION>cvt.s.d</FUNCTION>
-			<FUNCTION>cvt.s.w</FUNCTION>
-			<FUNCTION>cvt.w.d</FUNCTION>
-			<FUNCTION>cvt.w.s</FUNCTION>
-			<FUNCTION>div.d</FUNCTION>
-			<FUNCTION>div.s</FUNCTION>
-			<FUNCTION>l.d</FUNCTION>
-			<FUNCTION>l.s</FUNCTION>
-			<FUNCTION>mov.d</FUNCTION>
-			<FUNCTION>mov.s</FUNCTION>
-			<FUNCTION>mul.d</FUNCTION>
-			<FUNCTION>mul.s</FUNCTION>
-			<FUNCTION>neg.d</FUNCTION>
-			<FUNCTION>neg.s</FUNCTION>
-			<FUNCTION>s.d</FUNCTION>
-			<FUNCTION>s.s</FUNCTION>
-			<FUNCTION>sub.d</FUNCTION>
-			<FUNCTION>sub.s</FUNCTION>
-			<FUNCTION>rfe</FUNCTION>
-			<FUNCTION>syscall</FUNCTION>
-			<FUNCTION>break</FUNCTION>
-			<FUNCTION>nop</FUNCTION>
-
-		<!-- Integer Registers -->
-			<KEYWORD2>$zero</KEYWORD2>
-			<KEYWORD2>$at</KEYWORD2>
-			<KEYWORD2>$v0</KEYWORD2>
-			<KEYWORD2>$v1</KEYWORD2>
-			<KEYWORD2>$a0</KEYWORD2>
-			<KEYWORD2>$a1</KEYWORD2>
-			<KEYWORD2>$a2</KEYWORD2>
-			<KEYWORD2>$a3</KEYWORD2>
-            <KEYWORD2>$t0</KEYWORD2>
-			<KEYWORD2>$t1</KEYWORD2>
-			<KEYWORD2>$t2</KEYWORD2>
-			<KEYWORD2>$t3</KEYWORD2>
-			<KEYWORD2>$t4</KEYWORD2>
-			<KEYWORD2>$t5</KEYWORD2>
-			<KEYWORD2>$t6</KEYWORD2>
-			<KEYWORD2>$t7</KEYWORD2>
-			<KEYWORD2>$s0</KEYWORD2>
-			<KEYWORD2>$s1</KEYWORD2>
-			<KEYWORD2>$s2</KEYWORD2>
-			<KEYWORD2>$s3</KEYWORD2>
-			<KEYWORD2>$s4</KEYWORD2>
-			<KEYWORD2>$s5</KEYWORD2>
-			<KEYWORD2>$s6</KEYWORD2>
-			<KEYWORD2>$s7</KEYWORD2>
-			<KEYWORD2>$t8</KEYWORD2>
-			<KEYWORD2>$t9</KEYWORD2>
-			<KEYWORD2>$k0</KEYWORD2>
-			<KEYWORD2>$k1</KEYWORD2>
-            <KEYWORD2>$gp</KEYWORD2>
-			<KEYWORD2>$sp</KEYWORD2>
-			<KEYWORD2>$fp</KEYWORD2>
-			<KEYWORD2>$ra</KEYWORD2>
-
-		<!-- Floating Point Registers -->
-			<KEYWORD3>$f0</KEYWORD3>
-			<KEYWORD3>$f1</KEYWORD3>
-			<KEYWORD3>$f2</KEYWORD3>
-			<KEYWORD3>$f3</KEYWORD3>
-			<KEYWORD3>$f4</KEYWORD3>
-			<KEYWORD3>$f5</KEYWORD3>
-			<KEYWORD3>$f6</KEYWORD3>
-			<KEYWORD3>$f7</KEYWORD3>
-			<KEYWORD3>$f8</KEYWORD3>
-			<KEYWORD3>$f9</KEYWORD3>
-			<KEYWORD3>$f10</KEYWORD3>
-			<KEYWORD3>$f11</KEYWORD3>
-			<KEYWORD3>$f12</KEYWORD3>
-			<KEYWORD3>$f13</KEYWORD3>
-			<KEYWORD3>$f14</KEYWORD3>
-			<KEYWORD3>$f15</KEYWORD3>
-			<KEYWORD3>$f16</KEYWORD3>
-			<KEYWORD3>$f17</KEYWORD3>
-			<KEYWORD3>$f18</KEYWORD3>
-			<KEYWORD3>$f19</KEYWORD3>
-			<KEYWORD3>$f20</KEYWORD3>
-			<KEYWORD3>$f21</KEYWORD3>
-			<KEYWORD3>$f22</KEYWORD3>
-			<KEYWORD3>$f23</KEYWORD3>
-			<KEYWORD3>$f24</KEYWORD3>
-			<KEYWORD3>$f25</KEYWORD3>
-			<KEYWORD3>$f26</KEYWORD3>
-			<KEYWORD3>$f27</KEYWORD3>
-			<KEYWORD3>$f28</KEYWORD3>
-			<KEYWORD3>$f29</KEYWORD3>
-			<KEYWORD3>$f30</KEYWORD3>
-			<KEYWORD3>$f31</KEYWORD3>
-		</KEYWORDS>
-	</RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/assembly_x86.xml b/qpython/src/main/assets/syntax/assembly_x86.xml
deleted file mode 100644
index 606169f0..00000000
--- a/qpython/src/main/assets/syntax/assembly_x86.xml
+++ /dev/null
@@ -1,865 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!--
-	x86 Assembly mode by Kristian Ovaska (kristian.ovaska@helsinki.fi)
-
-	- Intel syntax
-	- Instructions and registers of Pentium III/Athlon
-	  (including FPU, MMX, 3DNow! and SSE)
-	- Full NASM 0.98 & MASM 6.15 keyword support, partial TASM support
--->
-
-<MODE>
-
-	<PROPS>
-		<PROPERTY NAME="lineComment" VALUE=";" />
-		<PROPERTY NAME="contextInsensitive" VALUE="true"/>
-	</PROPS>
-
-	<RULES HIGHLIGHT_DIGITS="TRUE" IGNORE_CASE="TRUE"
-         DIGIT_RE="(0x)?[\p{Digit}a-fA-F_]+[hHdD]?">
-		<EOL_SPAN TYPE="COMMENT1">;</EOL_SPAN>
-
-		<SPAN TYPE="LITERAL1" NO_LINE_BREAK="TRUE">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-
-		<SPAN TYPE="LITERAL1" NO_LINE_BREAK="TRUE">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-
-		<!-- NASM: label inside a macro -->
-		<MARK_FOLLOWING TYPE="LABEL" MATCH_TYPE="OPERATOR"
-			AT_LINE_START="TRUE">%%</MARK_FOLLOWING>
-
-		<MARK_FOLLOWING TYPE="KEYWORD2" AT_LINE_START="TRUE">%</MARK_FOLLOWING>
-
-		<MARK_PREVIOUS TYPE="LABEL" MATCH_TYPE="OPERATOR"
-			AT_LINE_START="TRUE">:</MARK_PREVIOUS>
-
-		<SEQ TYPE="OPERATOR">+</SEQ>
-		<SEQ TYPE="OPERATOR">-</SEQ>
-		<SEQ TYPE="OPERATOR">/</SEQ>
-		<SEQ TYPE="OPERATOR">*</SEQ>
-		<SEQ TYPE="OPERATOR">%</SEQ>
-
-		<SEQ TYPE="OPERATOR">|</SEQ>
-		<SEQ TYPE="OPERATOR">^</SEQ>
-		<SEQ TYPE="OPERATOR">&amp;</SEQ>
-		<SEQ TYPE="OPERATOR">~</SEQ>
-		<SEQ TYPE="OPERATOR">!</SEQ>
-
-		<SEQ TYPE="OPERATOR">=</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;</SEQ>
-
-		<KEYWORDS>
-			<KEYWORD1>.186</KEYWORD1>
-			<KEYWORD1>.286</KEYWORD1>
-			<KEYWORD1>.286P</KEYWORD1>
-			<KEYWORD1>.287</KEYWORD1>
-			<KEYWORD1>.386</KEYWORD1>
-			<KEYWORD1>.386P</KEYWORD1>
-			<KEYWORD1>.387</KEYWORD1>
-			<KEYWORD1>.486</KEYWORD1>
-			<KEYWORD1>.486P</KEYWORD1>
-			<KEYWORD1>.586</KEYWORD1>
-			<KEYWORD1>.586P</KEYWORD1>
-			<KEYWORD1>.686</KEYWORD1>
-			<KEYWORD1>.686P</KEYWORD1>
-			<KEYWORD1>.8086</KEYWORD1>
-			<KEYWORD1>.8087</KEYWORD1>
-			<KEYWORD1>.ALPHA</KEYWORD1>
-			<KEYWORD1>.BREAK</KEYWORD1>
-			<KEYWORD1>.BSS</KEYWORD1>
-			<KEYWORD1>.CODE</KEYWORD1>
-			<KEYWORD1>.CONST</KEYWORD1>
-			<KEYWORD1>.CONTINUE</KEYWORD1>
-			<KEYWORD1>.CREF</KEYWORD1>
-			<KEYWORD1>.DATA</KEYWORD1>
-			<KEYWORD1>.DATA?</KEYWORD1>
-			<KEYWORD1>.DOSSEG</KEYWORD1>
-			<KEYWORD1>.ELSE</KEYWORD1>
-			<KEYWORD1>.ELSEIF</KEYWORD1>
-			<KEYWORD1>.ENDIF</KEYWORD1>
-			<KEYWORD1>.ENDW</KEYWORD1>
-			<KEYWORD1>.ERR</KEYWORD1>
-			<KEYWORD1>.ERR1</KEYWORD1>
-			<KEYWORD1>.ERR2</KEYWORD1>
-			<KEYWORD1>.ERRB</KEYWORD1>
-			<KEYWORD1>.ERRDEF</KEYWORD1>
-			<KEYWORD1>.ERRDIF</KEYWORD1>
-			<KEYWORD1>.ERRDIFI</KEYWORD1>
-			<KEYWORD1>.ERRE</KEYWORD1>
-			<KEYWORD1>.ERRIDN</KEYWORD1>
-			<KEYWORD1>.ERRIDNI</KEYWORD1>
-			<KEYWORD1>.ERRNB</KEYWORD1>
-			<KEYWORD1>.ERRNDEF</KEYWORD1>
-			<KEYWORD1>.ERRNZ</KEYWORD1>
-			<KEYWORD1>.EXIT</KEYWORD1>
-			<KEYWORD1>.FARDATA</KEYWORD1>
-			<KEYWORD1>.FARDATA?</KEYWORD1>
-			<KEYWORD1>.IF</KEYWORD1>
-			<KEYWORD1>.K3D</KEYWORD1>
-			<KEYWORD1>.LALL</KEYWORD1>
-			<KEYWORD1>.LFCOND</KEYWORD1>
-			<KEYWORD1>.LIST</KEYWORD1>
-			<KEYWORD1>.LISTALL</KEYWORD1>
-			<KEYWORD1>.LISTIF</KEYWORD1>
-			<KEYWORD1>.LISTMACRO</KEYWORD1>
-			<KEYWORD1>.LISTMACROALL</KEYWORD1>
-			<KEYWORD1>.MMX</KEYWORD1>
-			<KEYWORD1>.MODEL</KEYWORD1>
-			<KEYWORD1>.MSFLOAT</KEYWORD1>
-			<KEYWORD1>.NO87</KEYWORD1>
-			<KEYWORD1>.NOCREF</KEYWORD1>
-			<KEYWORD1>.NOLIST</KEYWORD1>
-			<KEYWORD1>.NOLISTIF</KEYWORD1>
-			<KEYWORD1>.NOLISTMACRO</KEYWORD1>
-			<KEYWORD1>.RADIX</KEYWORD1>
-			<KEYWORD1>.REPEAT</KEYWORD1>
-			<KEYWORD1>.SALL</KEYWORD1>
-			<KEYWORD1>.SEQ</KEYWORD1>
-			<KEYWORD1>.SFCOND</KEYWORD1>
-			<KEYWORD1>.STACK</KEYWORD1>
-			<KEYWORD1>.STARTUP</KEYWORD1>
-			<KEYWORD1>.TEXT</KEYWORD1>
-			<KEYWORD1>.TFCOND</KEYWORD1>
-			<KEYWORD1>.UNTIL</KEYWORD1>
-			<KEYWORD1>.UNTILCXZ</KEYWORD1>
-			<KEYWORD1>.WHILE</KEYWORD1>
-			<KEYWORD1>.XALL</KEYWORD1>
-			<KEYWORD1>.XCREF</KEYWORD1>
-			<KEYWORD1>.XLIST</KEYWORD1>
-			<KEYWORD1>.XMM</KEYWORD1>
-			<KEYWORD1>__FILE__</KEYWORD1>
-			<KEYWORD1>__LINE__</KEYWORD1>
-			<KEYWORD1>A16</KEYWORD1>
-			<KEYWORD1>A32</KEYWORD1>
-			<KEYWORD1>ADDR</KEYWORD1>
-			<KEYWORD1>ALIGN</KEYWORD1>
-			<KEYWORD1>ALIGNB</KEYWORD1>
-			<KEYWORD1>ASSUME</KEYWORD1>
-			<KEYWORD1>BITS</KEYWORD1>
-			<KEYWORD1>CARRY?</KEYWORD1>
-			<KEYWORD1>CATSTR</KEYWORD1>
-			<KEYWORD1>CODESEG</KEYWORD1>
-			<KEYWORD1>COMM</KEYWORD1>
-			<KEYWORD1>COMMENT</KEYWORD1>
-			<KEYWORD1>COMMON</KEYWORD1>
-			<KEYWORD1>DATASEG</KEYWORD1>
-			<KEYWORD1>DOSSEG</KEYWORD1>
-			<KEYWORD1>ECHO</KEYWORD1>
-			<KEYWORD1>ELSE</KEYWORD1>
-			<KEYWORD1>ELSEIF</KEYWORD1>
-			<KEYWORD1>ELSEIF1</KEYWORD1>
-			<KEYWORD1>ELSEIF2</KEYWORD1>
-			<KEYWORD1>ELSEIFB</KEYWORD1>
-			<KEYWORD1>ELSEIFDEF</KEYWORD1>
-			<KEYWORD1>ELSEIFE</KEYWORD1>
-			<KEYWORD1>ELSEIFIDN</KEYWORD1>
-			<KEYWORD1>ELSEIFNB</KEYWORD1>
-			<KEYWORD1>ELSEIFNDEF</KEYWORD1>
-			<KEYWORD1>END</KEYWORD1>
-			<KEYWORD1>ENDIF</KEYWORD1>
-			<KEYWORD1>ENDM</KEYWORD1>
-			<KEYWORD1>ENDP</KEYWORD1>
-			<KEYWORD1>ENDS</KEYWORD1>
-			<KEYWORD1>ENDSTRUC</KEYWORD1>
-			<KEYWORD1>EVEN</KEYWORD1>
-			<KEYWORD1>EXITM</KEYWORD1>
-			<KEYWORD1>EXPORT</KEYWORD1>
-			<KEYWORD1>EXTERN</KEYWORD1>
-			<KEYWORD1>EXTERNDEF</KEYWORD1>
-			<KEYWORD1>EXTRN</KEYWORD1>
-			<KEYWORD1>FAR</KEYWORD1>
-			<KEYWORD1>FOR</KEYWORD1>
-			<KEYWORD1>FORC</KEYWORD1>
-			<KEYWORD1>GLOBAL</KEYWORD1>
-			<KEYWORD1>GOTO</KEYWORD1>
-			<KEYWORD1>GROUP</KEYWORD1>
-			<KEYWORD1>HIGH</KEYWORD1>
-			<KEYWORD1>HIGHWORD</KEYWORD1>
-			<KEYWORD1>IEND</KEYWORD1>
-			<KEYWORD1>IF</KEYWORD1>
-			<KEYWORD1>IF1</KEYWORD1>
-			<KEYWORD1>IF2</KEYWORD1>
-			<KEYWORD1>IFB</KEYWORD1>
-			<KEYWORD1>IFDEF</KEYWORD1>
-			<KEYWORD1>IFDIF</KEYWORD1>
-			<KEYWORD1>IFDIFI</KEYWORD1>
-			<KEYWORD1>IFE</KEYWORD1>
-			<KEYWORD1>IFIDN</KEYWORD1>
-			<KEYWORD1>IFIDNI</KEYWORD1>
-			<KEYWORD1>IFNB</KEYWORD1>
-			<KEYWORD1>IFNDEF</KEYWORD1>
-			<KEYWORD1>IMPORT</KEYWORD1>
-			<KEYWORD1>INCBIN</KEYWORD1>
-			<KEYWORD1>INCLUDE</KEYWORD1>
-			<KEYWORD1>INCLUDELIB</KEYWORD1>
-			<KEYWORD1>INSTR</KEYWORD1>
-			<KEYWORD1>INVOKE</KEYWORD1>
-			<KEYWORD1>IRP</KEYWORD1>
-			<KEYWORD1>IRPC</KEYWORD1>
-			<KEYWORD1>ISTRUC</KEYWORD1>
-			<KEYWORD1>LABEL</KEYWORD1>
-			<KEYWORD1>LENGTH</KEYWORD1>
-			<KEYWORD1>LENGTHOF</KEYWORD1>
-			<KEYWORD1>LOCAL</KEYWORD1>
-			<KEYWORD1>LOW</KEYWORD1>
-			<KEYWORD1>LOWWORD</KEYWORD1>
-			<KEYWORD1>LROFFSET</KEYWORD1>
-			<KEYWORD1>MACRO</KEYWORD1>
-			<KEYWORD1>NAME</KEYWORD1>
-			<KEYWORD1>NEAR</KEYWORD1>
-			<KEYWORD1>NOSPLIT</KEYWORD1>
-			<KEYWORD1>O16</KEYWORD1>
-			<KEYWORD1>O32</KEYWORD1>
-			<KEYWORD1>OFFSET</KEYWORD1>
-			<KEYWORD1>OPATTR</KEYWORD1>
-			<KEYWORD1>OPTION</KEYWORD1>
-			<KEYWORD1>ORG</KEYWORD1>
-			<KEYWORD1>OVERFLOW?</KEYWORD1>
-			<KEYWORD1>PAGE</KEYWORD1>
-			<KEYWORD1>PARITY?</KEYWORD1>
-			<KEYWORD1>POPCONTEXT</KEYWORD1>
-			<KEYWORD1>PRIVATE</KEYWORD1>
-			<KEYWORD1>PROC</KEYWORD1>
-			<KEYWORD1>PROTO</KEYWORD1>
-			<KEYWORD1>PTR</KEYWORD1>
-			<KEYWORD1>PUBLIC</KEYWORD1>
-			<KEYWORD1>PURGE</KEYWORD1>
-			<KEYWORD1>PUSHCONTEXT</KEYWORD1>
-			<KEYWORD1>RECORD</KEYWORD1>
-			<KEYWORD1>REPEAT</KEYWORD1>
-			<KEYWORD1>REPT</KEYWORD1>
-			<KEYWORD1>SECTION</KEYWORD1>
-			<KEYWORD1>SEG</KEYWORD1>
-			<KEYWORD1>SEGMENT</KEYWORD1>
-			<KEYWORD1>SHORT</KEYWORD1>
-			<KEYWORD1>SIGN?</KEYWORD1>
-			<KEYWORD1>SIZE</KEYWORD1>
-			<KEYWORD1>SIZEOF</KEYWORD1>
-			<KEYWORD1>SIZESTR</KEYWORD1>
-			<KEYWORD1>STACK</KEYWORD1>
-			<KEYWORD1>STRUC</KEYWORD1>
-			<KEYWORD1>STRUCT</KEYWORD1>
-			<KEYWORD1>SUBSTR</KEYWORD1>
-			<KEYWORD1>SUBTITLE</KEYWORD1>
-			<KEYWORD1>SUBTTL</KEYWORD1>
-			<KEYWORD1>THIS</KEYWORD1>
-			<KEYWORD1>TITLE</KEYWORD1>
-			<KEYWORD1>TYPE</KEYWORD1>
-			<KEYWORD1>TYPEDEF</KEYWORD1>
-			<KEYWORD1>UNION</KEYWORD1>
-			<KEYWORD1>USE16</KEYWORD1>
-			<KEYWORD1>USE32</KEYWORD1>
-			<KEYWORD1>USES</KEYWORD1>
-			<KEYWORD1>WHILE</KEYWORD1>
-			<KEYWORD1>WRT</KEYWORD1>
-			<KEYWORD1>ZERO?</KEYWORD1>
-
-			<KEYWORD2>DB</KEYWORD2>
-			<KEYWORD2>DW</KEYWORD2>
-			<KEYWORD2>DD</KEYWORD2>
-			<KEYWORD2>DF</KEYWORD2>
-			<KEYWORD2>DQ</KEYWORD2>
-			<KEYWORD2>DT</KEYWORD2>
-			<KEYWORD2>RESB</KEYWORD2>
-			<KEYWORD2>RESW</KEYWORD2>
-			<KEYWORD2>RESD</KEYWORD2>
-			<KEYWORD2>RESQ</KEYWORD2>
-			<KEYWORD2>REST</KEYWORD2>
-			<KEYWORD2>EQU</KEYWORD2>
-			<KEYWORD2>TEXTEQU</KEYWORD2>
-			<KEYWORD2>TIMES</KEYWORD2>
-			<KEYWORD2>DUP</KEYWORD2>
-
-			<KEYWORD2>BYTE</KEYWORD2>
-			<KEYWORD2>WORD</KEYWORD2>
-			<KEYWORD2>DWORD</KEYWORD2>
-			<KEYWORD2>FWORD</KEYWORD2>
-			<KEYWORD2>QWORD</KEYWORD2>
-			<KEYWORD2>TBYTE</KEYWORD2>
-			<KEYWORD2>SBYTE</KEYWORD2>
-			<KEYWORD2>TWORD</KEYWORD2>
-			<KEYWORD2>SWORD</KEYWORD2>
-			<KEYWORD2>SDWORD</KEYWORD2>
-			<KEYWORD2>REAL4</KEYWORD2>
-			<KEYWORD2>REAL8</KEYWORD2>
-			<KEYWORD2>REAL10</KEYWORD2>
-
-			<!-- Registers -->
-			<KEYWORD3>AL</KEYWORD3>
-			<KEYWORD3>BL</KEYWORD3>
-			<KEYWORD3>CL</KEYWORD3>
-			<KEYWORD3>DL</KEYWORD3>
-			<KEYWORD3>AH</KEYWORD3>
-			<KEYWORD3>BH</KEYWORD3>
-			<KEYWORD3>CH</KEYWORD3>
-			<KEYWORD3>DH</KEYWORD3>
-			<KEYWORD3>AX</KEYWORD3>
-			<KEYWORD3>BX</KEYWORD3>
-			<KEYWORD3>CX</KEYWORD3>
-			<KEYWORD3>DX</KEYWORD3>
-			<KEYWORD3>SI</KEYWORD3>
-			<KEYWORD3>DI</KEYWORD3>
-			<KEYWORD3>SP</KEYWORD3>
-			<KEYWORD3>BP</KEYWORD3>
-			<KEYWORD3>EAX</KEYWORD3>
-			<KEYWORD3>EBX</KEYWORD3>
-			<KEYWORD3>ECX</KEYWORD3>
-			<KEYWORD3>EDX</KEYWORD3>
-			<KEYWORD3>ESI</KEYWORD3>
-			<KEYWORD3>EDI</KEYWORD3>
-			<KEYWORD3>ESP</KEYWORD3>
-			<KEYWORD3>EBP</KEYWORD3>
-			<KEYWORD3>CS</KEYWORD3>
-			<KEYWORD3>DS</KEYWORD3>
-			<KEYWORD3>SS</KEYWORD3>
-			<KEYWORD3>ES</KEYWORD3>
-			<KEYWORD3>FS</KEYWORD3>
-			<KEYWORD3>GS</KEYWORD3>
-			<KEYWORD3>ST</KEYWORD3>
-			<KEYWORD3>ST0</KEYWORD3>
-			<KEYWORD3>ST1</KEYWORD3>
-			<KEYWORD3>ST2</KEYWORD3>
-			<KEYWORD3>ST3</KEYWORD3>
-			<KEYWORD3>ST4</KEYWORD3>
-			<KEYWORD3>ST5</KEYWORD3>
-			<KEYWORD3>ST6</KEYWORD3>
-			<KEYWORD3>ST7</KEYWORD3>
-			<KEYWORD3>MM0</KEYWORD3>
-			<KEYWORD3>MM1</KEYWORD3>
-			<KEYWORD3>MM2</KEYWORD3>
-			<KEYWORD3>MM3</KEYWORD3>
-			<KEYWORD3>MM4</KEYWORD3>
-			<KEYWORD3>MM5</KEYWORD3>
-			<KEYWORD3>MM6</KEYWORD3>
-			<KEYWORD3>MM7</KEYWORD3>
-			<KEYWORD3>XMM0</KEYWORD3>
-			<KEYWORD3>XMM1</KEYWORD3>
-			<KEYWORD3>XMM2</KEYWORD3>
-			<KEYWORD3>XMM3</KEYWORD3>
-			<KEYWORD3>XMM4</KEYWORD3>
-			<KEYWORD3>XMM5</KEYWORD3>
-			<KEYWORD3>XMM6</KEYWORD3>
-			<KEYWORD3>XMM7</KEYWORD3>
-			<KEYWORD3>CR0</KEYWORD3>
-			<KEYWORD3>CR2</KEYWORD3>
-			<KEYWORD3>CR3</KEYWORD3>
-			<KEYWORD3>CR4</KEYWORD3>
-			<KEYWORD3>DR0</KEYWORD3>
-			<KEYWORD3>DR1</KEYWORD3>
-			<KEYWORD3>DR2</KEYWORD3>
-			<KEYWORD3>DR3</KEYWORD3>
-			<KEYWORD3>DR4</KEYWORD3>
-			<KEYWORD3>DR5</KEYWORD3>
-			<KEYWORD3>DR6</KEYWORD3>
-			<KEYWORD3>DR7</KEYWORD3>
-			<KEYWORD3>TR3</KEYWORD3>
-			<KEYWORD3>TR4</KEYWORD3>
-			<KEYWORD3>TR5</KEYWORD3>
-			<KEYWORD3>TR6</KEYWORD3>
-			<KEYWORD3>TR7</KEYWORD3>
-
-			<!-- Instructions: Pentium III/MMX/SSE -->
-			<FUNCTION>AAA</FUNCTION>
-			<FUNCTION>AAD</FUNCTION>
-			<FUNCTION>AAM</FUNCTION>
-			<FUNCTION>AAS</FUNCTION>
-			<FUNCTION>ADC</FUNCTION>
-			<FUNCTION>ADD</FUNCTION>
-			<FUNCTION>ADDPS</FUNCTION>
-			<FUNCTION>ADDSS</FUNCTION>
-			<FUNCTION>AND</FUNCTION>
-			<FUNCTION>ANDNPS</FUNCTION>
-			<FUNCTION>ANDPS</FUNCTION>
-			<FUNCTION>ARPL</FUNCTION>
-			<FUNCTION>BOUND</FUNCTION>
-			<FUNCTION>BSF</FUNCTION>
-			<FUNCTION>BSR</FUNCTION>
-			<FUNCTION>BSWAP</FUNCTION>
-			<FUNCTION>BT</FUNCTION>
-			<FUNCTION>BTC</FUNCTION>
-			<FUNCTION>BTR</FUNCTION>
-			<FUNCTION>BTS</FUNCTION>
-			<FUNCTION>CALL</FUNCTION>
-			<FUNCTION>CBW</FUNCTION>
-			<FUNCTION>CDQ</FUNCTION>
-			<FUNCTION>CLC</FUNCTION>
-			<FUNCTION>CLD</FUNCTION>
-			<FUNCTION>CLI</FUNCTION>
-			<FUNCTION>CLTS</FUNCTION>
-			<FUNCTION>CMC</FUNCTION>
-			<FUNCTION>CMOVA</FUNCTION>
-			<FUNCTION>CMOVAE</FUNCTION>
-			<FUNCTION>CMOVB</FUNCTION>
-			<FUNCTION>CMOVBE</FUNCTION>
-			<FUNCTION>CMOVC</FUNCTION>
-			<FUNCTION>CMOVE</FUNCTION>
-			<FUNCTION>CMOVG</FUNCTION>
-			<FUNCTION>CMOVGE</FUNCTION>
-			<FUNCTION>CMOVL</FUNCTION>
-			<FUNCTION>CMOVLE</FUNCTION>
-			<FUNCTION>CMOVNA</FUNCTION>
-			<FUNCTION>CMOVNAE</FUNCTION>
-			<FUNCTION>CMOVNB</FUNCTION>
-			<FUNCTION>CMOVNBE</FUNCTION>
-			<FUNCTION>CMOVNC</FUNCTION>
-			<FUNCTION>CMOVNE</FUNCTION>
-			<FUNCTION>CMOVNG</FUNCTION>
-			<FUNCTION>CMOVNGE</FUNCTION>
-			<FUNCTION>CMOVNL</FUNCTION>
-			<FUNCTION>CMOVNLE</FUNCTION>
-			<FUNCTION>CMOVNO</FUNCTION>
-			<FUNCTION>CMOVNP</FUNCTION>
-			<FUNCTION>CMOVNS</FUNCTION>
-			<FUNCTION>CMOVNZ</FUNCTION>
-			<FUNCTION>CMOVO</FUNCTION>
-			<FUNCTION>CMOVP</FUNCTION>
-			<FUNCTION>CMOVPE</FUNCTION>
-			<FUNCTION>CMOVPO</FUNCTION>
-			<FUNCTION>CMOVS</FUNCTION>
-			<FUNCTION>CMOVZ</FUNCTION>
-			<FUNCTION>CMP</FUNCTION>
-			<FUNCTION>CMPPS</FUNCTION>
-			<FUNCTION>CMPS</FUNCTION>
-			<FUNCTION>CMPSB</FUNCTION>
-			<FUNCTION>CMPSD</FUNCTION>
-			<FUNCTION>CMPSS</FUNCTION>
-			<FUNCTION>CMPSW</FUNCTION>
-			<FUNCTION>CMPXCHG</FUNCTION>
-			<FUNCTION>CMPXCHGB</FUNCTION>
-			<FUNCTION>COMISS</FUNCTION>
-			<FUNCTION>CPUID</FUNCTION>
-			<FUNCTION>CWD</FUNCTION>
-			<FUNCTION>CWDE</FUNCTION>
-			<FUNCTION>CVTPI2PS</FUNCTION>
-			<FUNCTION>CVTPS2PI</FUNCTION>
-			<FUNCTION>CVTSI2SS</FUNCTION>
-			<FUNCTION>CVTSS2SI</FUNCTION>
-			<FUNCTION>CVTTPS2PI</FUNCTION>
-			<FUNCTION>CVTTSS2SI</FUNCTION>
-			<FUNCTION>DAA</FUNCTION>
-			<FUNCTION>DAS</FUNCTION>
-			<FUNCTION>DEC</FUNCTION>
-			<FUNCTION>DIV</FUNCTION>
-			<FUNCTION>DIVPS</FUNCTION>
-			<FUNCTION>DIVSS</FUNCTION>
-			<FUNCTION>EMMS</FUNCTION>
-			<FUNCTION>ENTER</FUNCTION>
-			<FUNCTION>F2XM1</FUNCTION>
-			<FUNCTION>FABS</FUNCTION>
-			<FUNCTION>FADD</FUNCTION>
-			<FUNCTION>FADDP</FUNCTION>
-			<FUNCTION>FBLD</FUNCTION>
-			<FUNCTION>FBSTP</FUNCTION>
-			<FUNCTION>FCHS</FUNCTION>
-			<FUNCTION>FCLEX</FUNCTION>
-			<FUNCTION>FCMOVB</FUNCTION>
-			<FUNCTION>FCMOVBE</FUNCTION>
-			<FUNCTION>FCMOVE</FUNCTION>
-			<FUNCTION>FCMOVNB</FUNCTION>
-			<FUNCTION>FCMOVNBE</FUNCTION>
-			<FUNCTION>FCMOVNE</FUNCTION>
-			<FUNCTION>FCMOVNU</FUNCTION>
-			<FUNCTION>FCMOVU</FUNCTION>
-			<FUNCTION>FCOM</FUNCTION>
-			<FUNCTION>FCOMI</FUNCTION>
-			<FUNCTION>FCOMIP</FUNCTION>
-			<FUNCTION>FCOMP</FUNCTION>
-			<FUNCTION>FCOMPP</FUNCTION>
-			<FUNCTION>FCOS</FUNCTION>
-			<FUNCTION>FDECSTP</FUNCTION>
-			<FUNCTION>FDIV</FUNCTION>
-			<FUNCTION>FDIVP</FUNCTION>
-			<FUNCTION>FDIVR</FUNCTION>
-			<FUNCTION>FDIVRP</FUNCTION>
-			<FUNCTION>FFREE</FUNCTION>
-			<FUNCTION>FIADD</FUNCTION>
-			<FUNCTION>FICOM</FUNCTION>
-			<FUNCTION>FICOMP</FUNCTION>
-			<FUNCTION>FIDIV</FUNCTION>
-			<FUNCTION>FIDIVR</FUNCTION>
-			<FUNCTION>FILD</FUNCTION>
-			<FUNCTION>FIMUL</FUNCTION>
-			<FUNCTION>FINCSTP</FUNCTION>
-			<FUNCTION>FINIT</FUNCTION>
-			<FUNCTION>FIST</FUNCTION>
-			<FUNCTION>FISTP</FUNCTION>
-			<FUNCTION>FISUB</FUNCTION>
-			<FUNCTION>FISUBR</FUNCTION>
-			<FUNCTION>FLD1</FUNCTION>
-			<FUNCTION>FLDCW</FUNCTION>
-			<FUNCTION>FLDENV</FUNCTION>
-			<FUNCTION>FLDL2E</FUNCTION>
-			<FUNCTION>FLDL2T</FUNCTION>
-			<FUNCTION>FLDLG2</FUNCTION>
-			<FUNCTION>FLDLN2</FUNCTION>
-			<FUNCTION>FLDPI</FUNCTION>
-			<FUNCTION>FLDZ</FUNCTION>
-			<FUNCTION>FMUL</FUNCTION>
-			<FUNCTION>FMULP</FUNCTION>
-			<FUNCTION>FNCLEX</FUNCTION>
-			<FUNCTION>FNINIT</FUNCTION>
-			<FUNCTION>FNOP</FUNCTION>
-			<FUNCTION>FNSAVE</FUNCTION>
-			<FUNCTION>FNSTCW</FUNCTION>
-			<FUNCTION>FNSTENV</FUNCTION>
-			<FUNCTION>FNSTSW</FUNCTION>
-			<FUNCTION>FPATAN</FUNCTION>
-			<FUNCTION>FPREM</FUNCTION>
-			<FUNCTION>FPREMI</FUNCTION>
-			<FUNCTION>FPTAN</FUNCTION>
-			<FUNCTION>FRNDINT</FUNCTION>
-			<FUNCTION>FRSTOR</FUNCTION>
-			<FUNCTION>FSAVE</FUNCTION>
-			<FUNCTION>FSCALE</FUNCTION>
-			<FUNCTION>FSIN</FUNCTION>
-			<FUNCTION>FSINCOS</FUNCTION>
-			<FUNCTION>FSQRT</FUNCTION>
-			<FUNCTION>FST</FUNCTION>
-			<FUNCTION>FSTCW</FUNCTION>
-			<FUNCTION>FSTENV</FUNCTION>
-			<FUNCTION>FSTP</FUNCTION>
-			<FUNCTION>FSTSW</FUNCTION>
-			<FUNCTION>FSUB</FUNCTION>
-			<FUNCTION>FSUBP</FUNCTION>
-			<FUNCTION>FSUBR</FUNCTION>
-			<FUNCTION>FSUBRP</FUNCTION>
-			<FUNCTION>FTST</FUNCTION>
-			<FUNCTION>FUCOM</FUNCTION>
-			<FUNCTION>FUCOMI</FUNCTION>
-			<FUNCTION>FUCOMIP</FUNCTION>
-			<FUNCTION>FUCOMP</FUNCTION>
-			<FUNCTION>FUCOMPP</FUNCTION>
-			<FUNCTION>FWAIT</FUNCTION>
-			<FUNCTION>FXAM</FUNCTION>
-			<FUNCTION>FXCH</FUNCTION>
-			<FUNCTION>FXRSTOR</FUNCTION>
-			<FUNCTION>FXSAVE</FUNCTION>
-			<FUNCTION>FXTRACT</FUNCTION>
-			<FUNCTION>FYL2X</FUNCTION>
-			<FUNCTION>FYL2XP1</FUNCTION>
-			<FUNCTION>HLT</FUNCTION>
-			<FUNCTION>IDIV</FUNCTION>
-			<FUNCTION>IMUL</FUNCTION>
-			<FUNCTION>IN</FUNCTION>
-			<FUNCTION>INC</FUNCTION>
-			<FUNCTION>INS</FUNCTION>
-			<FUNCTION>INSB</FUNCTION>
-			<FUNCTION>INSD</FUNCTION>
-			<FUNCTION>INSW</FUNCTION>
-			<FUNCTION>INT</FUNCTION>
-			<FUNCTION>INTO</FUNCTION>
-			<FUNCTION>INVD</FUNCTION>
-			<FUNCTION>INVLPG</FUNCTION>
-			<FUNCTION>IRET</FUNCTION>
-			<FUNCTION>JA</FUNCTION>
-			<FUNCTION>JAE</FUNCTION>
-			<FUNCTION>JB</FUNCTION>
-			<FUNCTION>JBE</FUNCTION>
-			<FUNCTION>JC</FUNCTION>
-			<FUNCTION>JCXZ</FUNCTION>
-			<FUNCTION>JE</FUNCTION>
-			<FUNCTION>JECXZ</FUNCTION>
-			<FUNCTION>JG</FUNCTION>
-			<FUNCTION>JGE</FUNCTION>
-			<FUNCTION>JL</FUNCTION>
-			<FUNCTION>JLE</FUNCTION>
-			<FUNCTION>JMP</FUNCTION>
-			<FUNCTION>JNA</FUNCTION>
-			<FUNCTION>JNAE</FUNCTION>
-			<FUNCTION>JNB</FUNCTION>
-			<FUNCTION>JNBE</FUNCTION>
-			<FUNCTION>JNC</FUNCTION>
-			<FUNCTION>JNE</FUNCTION>
-			<FUNCTION>JNG</FUNCTION>
-			<FUNCTION>JNGE</FUNCTION>
-			<FUNCTION>JNL</FUNCTION>
-			<FUNCTION>JNLE</FUNCTION>
-			<FUNCTION>JNO</FUNCTION>
-			<FUNCTION>JNP</FUNCTION>
-			<FUNCTION>JNS</FUNCTION>
-			<FUNCTION>JNZ</FUNCTION>
-			<FUNCTION>JO</FUNCTION>
-			<FUNCTION>JP</FUNCTION>
-			<FUNCTION>JPE</FUNCTION>
-			<FUNCTION>JPO</FUNCTION>
-			<FUNCTION>JS</FUNCTION>
-			<FUNCTION>JZ</FUNCTION>
-			<FUNCTION>LAHF</FUNCTION>
-			<FUNCTION>LAR</FUNCTION>
-			<FUNCTION>LDMXCSR</FUNCTION>
-			<FUNCTION>LDS</FUNCTION>
-			<FUNCTION>LEA</FUNCTION>
-			<FUNCTION>LEAVE</FUNCTION>
-			<FUNCTION>LES</FUNCTION>
-			<FUNCTION>LFS</FUNCTION>
-			<FUNCTION>LGDT</FUNCTION>
-			<FUNCTION>LGS</FUNCTION>
-			<FUNCTION>LIDT</FUNCTION>
-			<FUNCTION>LLDT</FUNCTION>
-			<FUNCTION>LMSW</FUNCTION>
-			<FUNCTION>LOCK</FUNCTION>
-			<FUNCTION>LODS</FUNCTION>
-			<FUNCTION>LODSB</FUNCTION>
-			<FUNCTION>LODSD</FUNCTION>
-			<FUNCTION>LODSW</FUNCTION>
-			<FUNCTION>LOOP</FUNCTION>
-			<FUNCTION>LOOPE</FUNCTION>
-			<FUNCTION>LOOPNE</FUNCTION>
-			<FUNCTION>LOOPNZ</FUNCTION>
-			<FUNCTION>LOOPZ</FUNCTION>
-			<FUNCTION>LSL</FUNCTION>
-			<FUNCTION>LSS</FUNCTION>
-			<FUNCTION>LTR</FUNCTION>
-			<FUNCTION>MASKMOVQ</FUNCTION>
-			<FUNCTION>MAXPS</FUNCTION>
-			<FUNCTION>MAXSS</FUNCTION>
-			<FUNCTION>MINPS</FUNCTION>
-			<FUNCTION>MINSS</FUNCTION>
-			<FUNCTION>MOV</FUNCTION>
-			<FUNCTION>MOVAPS</FUNCTION>
-			<FUNCTION>MOVD</FUNCTION>
-			<FUNCTION>MOVHLPS</FUNCTION>
-			<FUNCTION>MOVHPS</FUNCTION>
-			<FUNCTION>MOVLHPS</FUNCTION>
-			<FUNCTION>MOVLPS</FUNCTION>
-			<FUNCTION>MOVMSKPS</FUNCTION>
-			<FUNCTION>MOVNTPS</FUNCTION>
-			<FUNCTION>MOVNTQ</FUNCTION>
-			<FUNCTION>MOVQ</FUNCTION>
-			<FUNCTION>MOVS</FUNCTION>
-			<FUNCTION>MOVSB</FUNCTION>
-			<FUNCTION>MOVSD</FUNCTION>
-			<FUNCTION>MOVSS</FUNCTION>
-			<FUNCTION>MOVSW</FUNCTION>
-			<FUNCTION>MOVSX</FUNCTION>
-			<FUNCTION>MOVUPS</FUNCTION>
-			<FUNCTION>MOVZX</FUNCTION>
-			<FUNCTION>MUL</FUNCTION>
-			<FUNCTION>MULPS</FUNCTION>
-			<FUNCTION>MULSS</FUNCTION>
-			<FUNCTION>NEG</FUNCTION>
-			<FUNCTION>NOP</FUNCTION>
-			<FUNCTION>NOT</FUNCTION>
-			<FUNCTION>OR</FUNCTION>
-			<FUNCTION>ORPS</FUNCTION>
-			<FUNCTION>OUT</FUNCTION>
-			<FUNCTION>OUTS</FUNCTION>
-			<FUNCTION>OUTSB</FUNCTION>
-			<FUNCTION>OUTSD</FUNCTION>
-			<FUNCTION>OUTSW</FUNCTION>
-			<FUNCTION>PACKSSDW</FUNCTION>
-			<FUNCTION>PACKSSWB</FUNCTION>
-			<FUNCTION>PACKUSWB</FUNCTION>
-			<FUNCTION>PADDB</FUNCTION>
-			<FUNCTION>PADDD</FUNCTION>
-			<FUNCTION>PADDSB</FUNCTION>
-			<FUNCTION>PADDSW</FUNCTION>
-			<FUNCTION>PADDUSB</FUNCTION>
-			<FUNCTION>PADDUSW</FUNCTION>
-			<FUNCTION>PADDW</FUNCTION>
-			<FUNCTION>PAND</FUNCTION>
-			<FUNCTION>PANDN</FUNCTION>
-			<FUNCTION>PAVGB</FUNCTION>
-			<FUNCTION>PAVGW</FUNCTION>
-			<FUNCTION>PCMPEQB</FUNCTION>
-			<FUNCTION>PCMPEQD</FUNCTION>
-			<FUNCTION>PCMPEQW</FUNCTION>
-			<FUNCTION>PCMPGTB</FUNCTION>
-			<FUNCTION>PCMPGTD</FUNCTION>
-			<FUNCTION>PCMPGTW</FUNCTION>
-			<FUNCTION>PEXTRW</FUNCTION>
-			<FUNCTION>PINSRW</FUNCTION>
-			<FUNCTION>PMADDWD</FUNCTION>
-			<FUNCTION>PMAXSW</FUNCTION>
-			<FUNCTION>PMAXUB</FUNCTION>
-			<FUNCTION>PMINSW</FUNCTION>
-			<FUNCTION>PMINUB</FUNCTION>
-			<FUNCTION>PMOVMSKB</FUNCTION>
-			<FUNCTION>PMULHUW</FUNCTION>
-			<FUNCTION>PMULHW</FUNCTION>
-			<FUNCTION>PMULLW</FUNCTION>
-			<FUNCTION>POP</FUNCTION>
-			<FUNCTION>POPA</FUNCTION>
-			<FUNCTION>POPAD</FUNCTION>
-			<FUNCTION>POPAW</FUNCTION>
-			<FUNCTION>POPF</FUNCTION>
-			<FUNCTION>POPFD</FUNCTION>
-			<FUNCTION>POPFW</FUNCTION>
-			<FUNCTION>POR</FUNCTION>
-			<FUNCTION>PREFETCH</FUNCTION>
-			<FUNCTION>PSADBW</FUNCTION>
-			<FUNCTION>PSHUFW</FUNCTION>
-			<FUNCTION>PSLLD</FUNCTION>
-			<FUNCTION>PSLLQ</FUNCTION>
-			<FUNCTION>PSLLW</FUNCTION>
-			<FUNCTION>PSRAD</FUNCTION>
-			<FUNCTION>PSRAW</FUNCTION>
-			<FUNCTION>PSRLD</FUNCTION>
-			<FUNCTION>PSRLQ</FUNCTION>
-			<FUNCTION>PSRLW</FUNCTION>
-			<FUNCTION>PSUBB</FUNCTION>
-			<FUNCTION>PSUBD</FUNCTION>
-			<FUNCTION>PSUBSB</FUNCTION>
-			<FUNCTION>PSUBSW</FUNCTION>
-			<FUNCTION>PSUBUSB</FUNCTION>
-			<FUNCTION>PSUBUSW</FUNCTION>
-			<FUNCTION>PSUBW</FUNCTION>
-			<FUNCTION>PUNPCKHBW</FUNCTION>
-			<FUNCTION>PUNPCKHDQ</FUNCTION>
-			<FUNCTION>PUNPCKHWD</FUNCTION>
-			<FUNCTION>PUNPCKLBW</FUNCTION>
-			<FUNCTION>PUNPCKLDQ</FUNCTION>
-			<FUNCTION>PUNPCKLWD</FUNCTION>
-			<FUNCTION>PUSH</FUNCTION>
-			<FUNCTION>PUSHA</FUNCTION>
-			<FUNCTION>PUSHAD</FUNCTION>
-			<FUNCTION>PUSHAW</FUNCTION>
-			<FUNCTION>PUSHF</FUNCTION>
-			<FUNCTION>PUSHFD</FUNCTION>
-			<FUNCTION>PUSHFW</FUNCTION>
-			<FUNCTION>PXOR</FUNCTION>
-			<FUNCTION>RCL</FUNCTION>
-			<FUNCTION>RCR</FUNCTION>
-			<FUNCTION>RDMSR</FUNCTION>
-			<FUNCTION>RDPMC</FUNCTION>
-			<FUNCTION>RDTSC</FUNCTION>
-			<FUNCTION>REP</FUNCTION>
-			<FUNCTION>REPE</FUNCTION>
-			<FUNCTION>REPNE</FUNCTION>
-			<FUNCTION>REPNZ</FUNCTION>
-			<FUNCTION>REPZ</FUNCTION>
-			<FUNCTION>RET</FUNCTION>
-			<FUNCTION>RETF</FUNCTION>
-			<FUNCTION>RETN</FUNCTION>
-			<FUNCTION>ROL</FUNCTION>
-			<FUNCTION>ROR</FUNCTION>
-			<FUNCTION>RSM</FUNCTION>
-			<FUNCTION>SAHF</FUNCTION>
-			<FUNCTION>SAL</FUNCTION>
-			<FUNCTION>SAR</FUNCTION>
-			<FUNCTION>SBB</FUNCTION>
-			<FUNCTION>SCAS</FUNCTION>
-			<FUNCTION>SCASB</FUNCTION>
-			<FUNCTION>SCASD</FUNCTION>
-			<FUNCTION>SCASW</FUNCTION>
-			<FUNCTION>SETA</FUNCTION>
-			<FUNCTION>SETAE</FUNCTION>
-			<FUNCTION>SETB</FUNCTION>
-			<FUNCTION>SETBE</FUNCTION>
-			<FUNCTION>SETC</FUNCTION>
-			<FUNCTION>SETE</FUNCTION>
-			<FUNCTION>SETG</FUNCTION>
-			<FUNCTION>SETGE</FUNCTION>
-			<FUNCTION>SETL</FUNCTION>
-			<FUNCTION>SETLE</FUNCTION>
-			<FUNCTION>SETNA</FUNCTION>
-			<FUNCTION>SETNAE</FUNCTION>
-			<FUNCTION>SETNB</FUNCTION>
-			<FUNCTION>SETNBE</FUNCTION>
-			<FUNCTION>SETNC</FUNCTION>
-			<FUNCTION>SETNE</FUNCTION>
-			<FUNCTION>SETNG</FUNCTION>
-			<FUNCTION>SETNGE</FUNCTION>
-			<FUNCTION>SETNL</FUNCTION>
-			<FUNCTION>SETNLE</FUNCTION>
-			<FUNCTION>SETNO</FUNCTION>
-			<FUNCTION>SETNP</FUNCTION>
-			<FUNCTION>SETNS</FUNCTION>
-			<FUNCTION>SETNZ</FUNCTION>
-			<FUNCTION>SETO</FUNCTION>
-			<FUNCTION>SETP</FUNCTION>
-			<FUNCTION>SETPE</FUNCTION>
-			<FUNCTION>SETPO</FUNCTION>
-			<FUNCTION>SETS</FUNCTION>
-			<FUNCTION>SETZ</FUNCTION>
-			<FUNCTION>SFENCE</FUNCTION>
-			<FUNCTION>SGDT</FUNCTION>
-			<FUNCTION>SHL</FUNCTION>
-			<FUNCTION>SHLD</FUNCTION>
-			<FUNCTION>SHR</FUNCTION>
-			<FUNCTION>SHRD</FUNCTION>
-			<FUNCTION>SHUFPS</FUNCTION>
-			<FUNCTION>SIDT</FUNCTION>
-			<FUNCTION>SLDT</FUNCTION>
-			<FUNCTION>SMSW</FUNCTION>
-			<FUNCTION>SQRTPS</FUNCTION>
-			<FUNCTION>SQRTSS</FUNCTION>
-			<FUNCTION>STC</FUNCTION>
-			<FUNCTION>STD</FUNCTION>
-			<FUNCTION>STI</FUNCTION>
-			<FUNCTION>STMXCSR</FUNCTION>
-			<FUNCTION>STOS</FUNCTION>
-			<FUNCTION>STOSB</FUNCTION>
-			<FUNCTION>STOSD</FUNCTION>
-			<FUNCTION>STOSW</FUNCTION>
-			<FUNCTION>STR</FUNCTION>
-			<FUNCTION>SUB</FUNCTION>
-			<FUNCTION>SUBPS</FUNCTION>
-			<FUNCTION>SUBSS</FUNCTION>
-			<FUNCTION>SYSENTER</FUNCTION>
-			<FUNCTION>SYSEXIT</FUNCTION>
-			<FUNCTION>TEST</FUNCTION>
-			<FUNCTION>UB2</FUNCTION>
-			<FUNCTION>UCOMISS</FUNCTION>
-			<FUNCTION>UNPCKHPS</FUNCTION>
-			<FUNCTION>UNPCKLPS</FUNCTION>
-			<FUNCTION>WAIT</FUNCTION>
-			<FUNCTION>WBINVD</FUNCTION>
-			<FUNCTION>VERR</FUNCTION>
-			<FUNCTION>VERW</FUNCTION>
-			<FUNCTION>WRMSR</FUNCTION>
-			<FUNCTION>XADD</FUNCTION>
-			<FUNCTION>XCHG</FUNCTION>
-			<FUNCTION>XLAT</FUNCTION>
-			<FUNCTION>XLATB</FUNCTION>
-			<FUNCTION>XOR</FUNCTION>
-			<FUNCTION>XORPS</FUNCTION>
-
-			<!-- Instructions: 3DNow! -->
-			<FUNCTION>FEMMS</FUNCTION>
-			<FUNCTION>PAVGUSB</FUNCTION>
-			<FUNCTION>PF2ID</FUNCTION>
-			<FUNCTION>PFACC</FUNCTION>
-			<FUNCTION>PFADD</FUNCTION>
-			<FUNCTION>PFCMPEQ</FUNCTION>
-			<FUNCTION>PFCMPGE</FUNCTION>
-			<FUNCTION>PFCMPGT</FUNCTION>
-			<FUNCTION>PFMAX</FUNCTION>
-			<FUNCTION>PFMIN</FUNCTION>
-			<FUNCTION>PFMUL</FUNCTION>
-			<FUNCTION>PFRCP</FUNCTION>
-			<FUNCTION>PFRCPIT1</FUNCTION>
-			<FUNCTION>PFRCPIT2</FUNCTION>
-			<FUNCTION>PFRSQIT1</FUNCTION>
-			<FUNCTION>PFRSQRT</FUNCTION>
-			<FUNCTION>PFSUB</FUNCTION>
-			<FUNCTION>PFSUBR</FUNCTION>
-			<FUNCTION>PI2FD</FUNCTION>
-			<FUNCTION>PMULHRW</FUNCTION>
-			<FUNCTION>PREFETCHW</FUNCTION>
-
-			<!-- Instructions: 3DNow! (Athlon extensions) -->
-			<FUNCTION>PF2IW</FUNCTION>
-			<FUNCTION>PFNACC</FUNCTION>
-			<FUNCTION>PFPNACC</FUNCTION>
-			<FUNCTION>PI2FW</FUNCTION>
-			<FUNCTION>PSWAPD</FUNCTION>
-
-			<!-- Instructions: MMX (Athlon extensions) -->
-			<FUNCTION>PREFETCHNTA</FUNCTION>
-			<FUNCTION>PREFETCHT0</FUNCTION>
-			<FUNCTION>PREFETCHT1</FUNCTION>
-			<FUNCTION>PREFETCHT2</FUNCTION>
-
-		</KEYWORDS>
-	</RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/avro.xml b/qpython/src/main/assets/syntax/avro.xml
deleted file mode 100644
index cc26aeac..00000000
--- a/qpython/src/main/assets/syntax/avro.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0"?>
-<!-- http://avro.apache.org/ -->
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="commentStart" VALUE="/*" />
-		<PROPERTY NAME="commentEnd" VALUE="*/" />
-		<PROPERTY NAME="lineComment" VALUE="//" />
-		<PROPERTY NAME="wordBreakChars" VALUE=",=;*" />
-
-		<!-- Auto indent -->
-		<PROPERTY NAME="indentOpenBrackets" VALUE="{" />
-		<PROPERTY NAME="indentCloseBrackets" VALUE="}" />
-		<PROPERTY NAME="unalignedOpenBrackets" VALUE="(" />
-		<PROPERTY NAME="unalignedCloseBrackets" VALUE=")" />
-	</PROPS>
-
-	<RULES IGNORE_CASE="FALSE"
-	       HIGHLIGHT_DIGITS="TRUE"
-	       DIGIT_RE="(0[lL]?|[1-9]\d{0,9}(\d{0,9}[lL])?|0[xX]\p{XDigit}{1,8}(\p{XDigit}{0,8}[lL])?|0[0-7]{1,11}([0-7]{0,11}[lL])?|([0-9]+\.[0-9]*|\.[0-9]+)([eE][+-]?[0-9]+)?[fFdD]?|[0-9]+([eE][+-]?[0-9]+[fFdD]?|([eE][+-]?[0-9]+)?[fFdD]))">
-
-		<!-- Silly comment -->
-		<SEQ TYPE="COMMENT1">/**/</SEQ>
-
-		<!-- C/C++ style comment -->
-		<SPAN TYPE="COMMENT1">
-			<BEGIN>/*</BEGIN>
-			<END>*/</END>
-		</SPAN>
-
-		<EOL_SPAN TYPE="COMMENT2">//</EOL_SPAN>
-
-		<!-- Strings -->
-		<SPAN TYPE="LITERAL1" ESCAPE="\" NO_LINE_BREAK="TRUE">
-			<BEGIN>&quot;</BEGIN>
-			<END>&quot;</END>
-		</SPAN>
-
-		<!-- Annotations -->
-		<MARK_FOLLOWING TYPE="KEYWORD4">@</MARK_FOLLOWING>
-
-		<!-- Functions -->
-		<MARK_PREVIOUS TYPE="FUNCTION" MATCH_TYPE="OPERATOR">(</MARK_PREVIOUS>
-		<SEQ TYPE="OPERATOR">)</SEQ>
-
-		<!-- Operators / others. -->
-		<SEQ TYPE="OPERATOR">)</SEQ>
-		<SEQ TYPE="OPERATOR">(</SEQ>
-		<SEQ TYPE="OPERATOR">}</SEQ>
-		<SEQ TYPE="OPERATOR">{</SEQ>
-		<SEQ TYPE="OPERATOR">[</SEQ>
-		<SEQ TYPE="OPERATOR">]</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;</SEQ>
-
-		<!-- Reserved word escaping. -->
-		<SPAN TYPE="NULL" NO_LINE_BREAK="TRUE">
-			<BEGIN>`</BEGIN>
-			<END>`</END>
-		</SPAN>
-
-		<!-- Import statements. -->
-		<SEQ TYPE="KEYWORD2">import idl</SEQ>
-		<SEQ TYPE="KEYWORD2">import protocol</SEQ>
-		<SEQ TYPE="KEYWORD2">import schema</SEQ>
-
-		<KEYWORDS>
-			<KEYWORD2>throws</KEYWORD2>
-			<KEYWORD2>oneway</KEYWORD2>
-
-			<!-- Types. -->
-			<KEYWORD3>array</KEYWORD3>
-			<KEYWORD3>boolean</KEYWORD3>
-			<KEYWORD3>bytes</KEYWORD3>
-			<KEYWORD3>double</KEYWORD3>
-			<KEYWORD3>enum</KEYWORD3>
-			<KEYWORD3>error</KEYWORD3>
-			<KEYWORD3>fixed</KEYWORD3>
-			<KEYWORD3>float</KEYWORD3>
-			<KEYWORD3>int</KEYWORD3>
-			<KEYWORD3>long</KEYWORD3>
-			<KEYWORD2>map</KEYWORD2>
-			<KEYWORD3>protocol</KEYWORD3>
-			<KEYWORD3>record</KEYWORD3>
-			<KEYWORD3>string</KEYWORD3>
-			<KEYWORD3>union</KEYWORD3>
-			<KEYWORD3>void</KEYWORD3>
-
-			<!-- Constants. -->
-			<KEYWORD4>null</KEYWORD4>
-			<KEYWORD4>true</KEYWORD4>
-			<KEYWORD4>false</KEYWORD4>
-		</KEYWORDS>
-	</RULES>
-
-</MODE>
-
diff --git a/qpython/src/main/assets/syntax/awk.xml b/qpython/src/main/assets/syntax/awk.xml
deleted file mode 100644
index e6851422..00000000
--- a/qpython/src/main/assets/syntax/awk.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!-- AWK mode, by Matthias M. Schneider -->
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="indentOpenBrackets" VALUE="{" />
-		<PROPERTY NAME="indentCloseBrackets" VALUE="}" />
-		<PROPERTY NAME="lineComment" VALUE="#" />
-		<PROPERTY NAME="wordBreakChars" VALUE=",+-=&lt;&gt;/?^&amp;*" />
-		<PROPERTY NAME="contextInsensitive" VALUE="true"/>
-	</PROPS>
-	<RULES IGNORE_CASE="FALSE" HIGHLIGHT_DIGITS="TRUE">
-		<SPAN TYPE="LITERAL1" ESCAPE="\" NO_LINE_BREAK="TRUE">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-		<SPAN TYPE="LITERAL1" ESCAPE="\" NO_LINE_BREAK="TRUE">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-
-		<EOL_SPAN TYPE="COMMENT1">#</EOL_SPAN>
-		<SEQ TYPE="OPERATOR">=</SEQ>
-		<SEQ TYPE="OPERATOR">!</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;=</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;=</SEQ>
-		<SEQ TYPE="OPERATOR">+</SEQ>
-		<SEQ TYPE="OPERATOR">-</SEQ>
-		<SEQ TYPE="OPERATOR">/</SEQ>
-		<SEQ TYPE="OPERATOR">*</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;</SEQ>
-		<SEQ TYPE="OPERATOR">%</SEQ>
-		<SEQ TYPE="OPERATOR">&amp;</SEQ>
-		<SEQ TYPE="OPERATOR">|</SEQ>
-		<SEQ TYPE="OPERATOR">^</SEQ>
-		<SEQ TYPE="OPERATOR">~</SEQ>
-		<SEQ TYPE="OPERATOR">}</SEQ>
-		<SEQ TYPE="OPERATOR">{</SEQ>
-		<MARK_PREVIOUS AT_WHITESPACE_END="TRUE"
-			MATCH_TYPE="OPERATOR"
-			TYPE="LABEL">:</MARK_PREVIOUS>
-
-		<KEYWORDS>
-			<KEYWORD1>break</KEYWORD1>
-			<KEYWORD1>close</KEYWORD1>
-			<KEYWORD1>continue</KEYWORD1>
-			<KEYWORD1>delete</KEYWORD1>
-			<KEYWORD1>do</KEYWORD1>
-			<KEYWORD1>else</KEYWORD1>
-			<KEYWORD1>exit</KEYWORD1>
-			<KEYWORD1>fflush</KEYWORD1>
-			<KEYWORD1>for</KEYWORD1>
-			<KEYWORD1>huge</KEYWORD1>
-			<KEYWORD1>if</KEYWORD1>
-			<KEYWORD1>in</KEYWORD1>
-			<KEYWORD1>function</KEYWORD1>
-			<KEYWORD1>next</KEYWORD1>
-			<KEYWORD1>nextfile</KEYWORD1>
-			<KEYWORD1>print</KEYWORD1>
-			<KEYWORD1>printf</KEYWORD1>
-			<KEYWORD1>return</KEYWORD1>
-			<KEYWORD1>while</KEYWORD1>
-
-			<KEYWORD2>atan2</KEYWORD2>
-			<KEYWORD2>cos</KEYWORD2>
-			<KEYWORD2>exp</KEYWORD2>
-			<KEYWORD2>gensub</KEYWORD2>
-			<KEYWORD2>getline</KEYWORD2>
-			<KEYWORD2>gsub</KEYWORD2>
-			<KEYWORD2>index</KEYWORD2>
-			<KEYWORD2>int</KEYWORD2>
-			<KEYWORD2>length</KEYWORD2>
-			<KEYWORD2>log</KEYWORD2>
-			<KEYWORD2>match</KEYWORD2>
-			<KEYWORD2>rand</KEYWORD2>
-			<KEYWORD2>sin</KEYWORD2>
-			<KEYWORD2>split</KEYWORD2>
-			<KEYWORD2>sprintf</KEYWORD2>
-			<KEYWORD2>sqrt</KEYWORD2>
-			<KEYWORD2>srand</KEYWORD2>
-			<KEYWORD2>sub</KEYWORD2>
-			<KEYWORD2>substr</KEYWORD2>
-			<KEYWORD2>system</KEYWORD2>
-			<KEYWORD2>tolower</KEYWORD2>
-			<KEYWORD2>toupper</KEYWORD2>
-
-			<KEYWORD3>BEGIN</KEYWORD3>
-			<KEYWORD3>END</KEYWORD3>
-			<KEYWORD3>$0</KEYWORD3>
-			<KEYWORD3>ARGC</KEYWORD3>
-			<KEYWORD3>ARGIND</KEYWORD3>
-			<KEYWORD3>ARGV</KEYWORD3>
-			<KEYWORD3>CONVFMT</KEYWORD3>
-			<KEYWORD3>ENVIRON</KEYWORD3>
-			<KEYWORD3>ERRNO</KEYWORD3>
-			<KEYWORD3>FIELDSWIDTH</KEYWORD3>
-			<KEYWORD3>FILENAME</KEYWORD3>
-			<KEYWORD3>FNR</KEYWORD3>
-			<KEYWORD3>FS</KEYWORD3>
-			<KEYWORD3>IGNORECASE</KEYWORD3>
-			<KEYWORD3>NF</KEYWORD3>
-			<KEYWORD3>NR</KEYWORD3>
-			<KEYWORD3>OFMT</KEYWORD3>
-			<KEYWORD3>OFS</KEYWORD3>
-			<KEYWORD3>ORS</KEYWORD3>
-			<KEYWORD3>RLENGTH</KEYWORD3>
-			<KEYWORD3>RS</KEYWORD3>
-			<KEYWORD3>RSTART</KEYWORD3>
-			<KEYWORD3>RT</KEYWORD3>
-			<KEYWORD3>SUBSEP</KEYWORD3>
-		</KEYWORDS>
-	</RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/b.xml b/qpython/src/main/assets/syntax/b.xml
deleted file mode 100644
index 15ecfb29..00000000
--- a/qpython/src/main/assets/syntax/b.xml
+++ /dev/null
@@ -1,203 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="indentNextLine" VALUE="\s*(((ANY|ASSERT|CASE|CHOICE|IF|LET|PRE|SELECT|VAR|WHILE|WHEN)\s*\(|ELSE|ELSEIF|EITHER|OR|VARIANT|INVARIANT)[^;]*|for\s*\(.*)" />
-		<PROPERTY NAME="commentStart" VALUE="/*" />
-		<PROPERTY NAME="commentEnd" VALUE="*/" />
-		<PROPERTY NAME="lineComment" VALUE="//" />
-	</PROPS>
-	<RULES IGNORE_CASE="FALSE" HIGHLIGHT_DIGITS="TRUE">
-		<!-- B style comment -->
-		<SPAN TYPE="COMMENT3">
-			<BEGIN>/*?</BEGIN>
-			<END>?*/</END>
-		</SPAN>
-
-		<SPAN TYPE="COMMENT1">
-			<BEGIN>/*</BEGIN>
-			<END>*/</END>
-		</SPAN>
-
-		<SPAN TYPE="LITERAL1" ESCAPE="\" NO_LINE_BREAK="TRUE">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-		<SPAN TYPE="LITERAL1" ESCAPE="\" NO_LINE_BREAK="TRUE">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-
-
-		<EOL_SPAN TYPE="COMMENT2">//</EOL_SPAN>
-		<SEQ TYPE="OPERATOR">!</SEQ>
-		<SEQ TYPE="OPERATOR">#</SEQ>
-		<SEQ TYPE="OPERATOR">$0</SEQ>
-		<SEQ TYPE="OPERATOR">%</SEQ>
-		<SEQ TYPE="OPERATOR">=</SEQ>
-		<!-- pour le & -->
-		<SEQ TYPE="OPERATOR">&amp;</SEQ>
-		<!-- pour le < et  > -->
-		<SEQ TYPE="OPERATOR">&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;</SEQ>
-
-		<SEQ TYPE="OPERATOR">*</SEQ>
-
-		<SEQ TYPE="OPERATOR">+</SEQ>
-		<SEQ TYPE="OPERATOR">/</SEQ>
-		<SEQ TYPE="OPERATOR">\</SEQ>
-		<SEQ TYPE="OPERATOR">~</SEQ>
-		<SEQ TYPE="OPERATOR">:</SEQ>
-		<SEQ TYPE="OPERATOR">;</SEQ>
-		<SEQ TYPE="OPERATOR">|</SEQ>
-		<SEQ TYPE="OPERATOR">-</SEQ>
-
-		<SEQ TYPE="OPERATOR">^</SEQ>
-
-		<SEQ TYPE="OPERATOR">.</SEQ>
-		<SEQ TYPE="OPERATOR">,</SEQ>
-		<SEQ TYPE="OPERATOR">(</SEQ>
-		<SEQ TYPE="OPERATOR">)</SEQ>
-		<SEQ TYPE="OPERATOR">}</SEQ>
-		<SEQ TYPE="OPERATOR">{</SEQ>
-		<SEQ TYPE="OPERATOR">]</SEQ>
-		<SEQ TYPE="OPERATOR">[</SEQ>
-
-		<KEYWORDS>
-
-			<!-- clauses -->
-			<KEYWORD2>ABSTRACT_CONSTANTS</KEYWORD2>
-			<KEYWORD2>ABSTRACT_VARIABLES</KEYWORD2>
-			<KEYWORD2>CONCRETE_CONSTANTS</KEYWORD2>
-			<KEYWORD2>CONCRETE_VARIABLES</KEYWORD2>
-			<KEYWORD2>CONSTANTS</KEYWORD2>
-			<KEYWORD2>VARIABLES</KEYWORD2>
-			<KEYWORD2>ASSERTIONS</KEYWORD2>
-			<KEYWORD2>CONSTRAINTS</KEYWORD2>
-			<KEYWORD2>DEFINITIONS</KEYWORD2>
-			<KEYWORD2>EXTENDS</KEYWORD2>
-			<KEYWORD2>IMPLEMENTATION</KEYWORD2>
-			<KEYWORD2>IMPORTS</KEYWORD2>
-			<KEYWORD2>INCLUDES</KEYWORD2>
-			<KEYWORD2>INITIALISATION</KEYWORD2>
-			<KEYWORD2>INVARIANT</KEYWORD2>
-			<KEYWORD2>LOCAL_OPERATIONS</KEYWORD2>
-			<KEYWORD2>MACHINE</KEYWORD2>
-			<KEYWORD2>OPERATIONS</KEYWORD2>
-			<KEYWORD2>PROMOTES</KEYWORD2>
-			<KEYWORD2>PROPERTIES</KEYWORD2>
-			<KEYWORD2>REFINES</KEYWORD2>
-			<KEYWORD2>REFINEMENT</KEYWORD2>
-			<KEYWORD2>SEES</KEYWORD2>
-			<KEYWORD2>SETS</KEYWORD2>
-			<KEYWORD2>USES</KEYWORD2>
-			<KEYWORD2>VALUES</KEYWORD2>
-
-
-			<!-- substitutions -->
-			<KEYWORD2>ANY</KEYWORD2>
-			<KEYWORD2>ASSERT</KEYWORD2>
-			<KEYWORD2>BE</KEYWORD2>
-			<KEYWORD2>BEGIN</KEYWORD2>
-			<KEYWORD2>CASE</KEYWORD2>
-			<KEYWORD2>CHOICE</KEYWORD2>
-			<KEYWORD2>DO</KEYWORD2>
-			<KEYWORD2>EITHER</KEYWORD2>
-			<KEYWORD2>ELSE</KEYWORD2>
-			<KEYWORD2>ELSIF</KEYWORD2>
-			<!-- voir pour le end -->
-			<KEYWORD2>END</KEYWORD2>
-			<KEYWORD2>IF</KEYWORD2>
-			<KEYWORD2>IN</KEYWORD2>
-			<KEYWORD2>LET</KEYWORD2>
-			<KEYWORD2>OF</KEYWORD2>
-			<KEYWORD2>OR</KEYWORD2>
-			<KEYWORD2>PRE</KEYWORD2>
-			<KEYWORD2>SELECT</KEYWORD2>
-			<KEYWORD2>THEN</KEYWORD2>
-			<KEYWORD2>VAR</KEYWORD2>
-			<KEYWORD2>VARIANT</KEYWORD2>
-			<KEYWORD2>WHEN</KEYWORD2>
-			<KEYWORD2>WHERE</KEYWORD2>
-			<KEYWORD2>WHILE</KEYWORD2>
-
-
-			<KEYWORD3>FIN</KEYWORD3>
-			<KEYWORD3>FIN1</KEYWORD3>
-			<KEYWORD3>INT</KEYWORD3>
-			<KEYWORD3>INTEGER</KEYWORD3>
-			<KEYWORD3>INTER</KEYWORD3>
-			<KEYWORD3>MAXINT</KEYWORD3>
-			<KEYWORD3>MININT</KEYWORD3>
-			<KEYWORD3>NAT</KEYWORD3>
-			<KEYWORD3>NAT1</KEYWORD3>
-			<KEYWORD3>NATURAL</KEYWORD3>
-			<KEYWORD3>NATURAL1</KEYWORD3>
-			<KEYWORD3>PI</KEYWORD3>
-			<KEYWORD3>POW</KEYWORD3>
-			<KEYWORD3>POW1</KEYWORD3>
-			<KEYWORD3>SIGMA</KEYWORD3>
-			<KEYWORD3>UNION</KEYWORD3>
-
-			<FUNCTION>arity</FUNCTION>
-			<FUNCTION>bin</FUNCTION>
-			<FUNCTION>bool</FUNCTION>
-			<FUNCTION>btree</FUNCTION>
-			<FUNCTION>card</FUNCTION>
-			<FUNCTION>closure</FUNCTION>
-			<FUNCTION>closure1</FUNCTION>
-			<FUNCTION>conc</FUNCTION>
-			<FUNCTION>const</FUNCTION>
-			<FUNCTION>dom</FUNCTION>
-			<FUNCTION>father</FUNCTION>
-			<FUNCTION>first</FUNCTION>
-			<FUNCTION>fnc</FUNCTION>
-			<FUNCTION>front</FUNCTION>
-			<FUNCTION>id</FUNCTION>
-			<FUNCTION>infix</FUNCTION>
-			<FUNCTION>inter</FUNCTION>
-			<FUNCTION>iseq</FUNCTION>
-			<FUNCTION>iseq1</FUNCTION>
-			<FUNCTION>iterate</FUNCTION>
-			<FUNCTION>last</FUNCTION>
-			<FUNCTION>left</FUNCTION>
-			<FUNCTION>max</FUNCTION>
-			<FUNCTION>min</FUNCTION>
-			<FUNCTION>mirror</FUNCTION>
-			<FUNCTION>mod</FUNCTION>
-			<FUNCTION>not</FUNCTION>
-			<FUNCTION>or</FUNCTION>
-			<FUNCTION>perm</FUNCTION>
-			<FUNCTION>postfix</FUNCTION>
-			<FUNCTION>pred</FUNCTION>
-			<FUNCTION>prefix</FUNCTION>
-			<FUNCTION>prj1</FUNCTION>
-			<FUNCTION>prj2</FUNCTION>
-			<FUNCTION>r~</FUNCTION>
-			<FUNCTION>ran</FUNCTION>
-			<FUNCTION>rank</FUNCTION>
-			<FUNCTION>rec</FUNCTION>
-			<FUNCTION>rel</FUNCTION>
-			<FUNCTION>rev</FUNCTION>
-			<FUNCTION>right</FUNCTION>
-			<FUNCTION>seq</FUNCTION>
-			<FUNCTION>seq1</FUNCTION>
-			<FUNCTION>size</FUNCTION>
-			<FUNCTION>sizet</FUNCTION>
-			<FUNCTION>skip</FUNCTION>
-			<FUNCTION>son</FUNCTION>
-			<FUNCTION>sons</FUNCTION>
-			<FUNCTION>struct</FUNCTION>
-			<FUNCTION>subtree</FUNCTION>
-			<FUNCTION>succ</FUNCTION>
-			<FUNCTION>tail</FUNCTION>
-			<FUNCTION>top</FUNCTION>
-			<FUNCTION>tree</FUNCTION>
-			<FUNCTION>union</FUNCTION>
-
-		</KEYWORDS>
-
-	</RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/batch.xml b/qpython/src/main/assets/syntax/batch.xml
deleted file mode 100644
index ca137042..00000000
--- a/qpython/src/main/assets/syntax/batch.xml
+++ /dev/null
@@ -1,172 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!--
-	09-10-2003 - Mirco Bova
-	Added some new batch commands using win2K help as reference.
-
-	04-12-2001 - Mirco Bova
-	this file is based on the original JEdit batch.xml mode.
-	The main upgrade consisting in adding the standard MS-DOS
-	commands as keywords and functions:
-	- keywords =		internal shell commands;
-	-	functions =		standard MS-DOS commands (.exe or .com in DOS or
-									windows\command directory).
-
-	Minor enhancements by Alex Jacoby on 28-feb-2003
--->
-
-<!-- The keywords and functions here defined are those of MS-DOS 6.22,
-		 plus a few as of Windows XP.
- -->
-
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="lineComment" VALUE="rem" />
-		<PROPERTY NAME="indentOpenBrackets" VALUE="(" />
-		<PROPERTY NAME="indentCloseBrackets" VALUE=")" />
-	</PROPS>
-	<RULES IGNORE_CASE="TRUE" HIGHLIGHT_DIGITS="FALSE">
-		<!-- 'echo off' statements -->
-		<SEQ TYPE="KEYWORD3">@</SEQ>
-
-		<SEQ TYPE="OPERATOR">+</SEQ>
-		<SEQ TYPE="OPERATOR">|</SEQ>
-		<SEQ TYPE="OPERATOR">&amp;</SEQ>
-		<SEQ TYPE="OPERATOR">!</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;</SEQ>
-
-		<!-- labels - eg ":test" or "goto :test" -->
-		<MARK_FOLLOWING AT_WORD_START="TRUE" TYPE="LABEL">:</MARK_FOLLOWING>
-
-		<!-- comments -->
-		<EOL_SPAN_REGEXP AT_WHITESPACE_END="TRUE" HASH_CHAR="REM" TYPE="COMMENT1">REM\s</EOL_SPAN_REGEXP>
-
-		<!-- literals -->
-		<SPAN TYPE="LITERAL1" NO_LINE_BREAK="TRUE">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-
-		<!-- variables -->
-		<SEQ TYPE="KEYWORD2">%0</SEQ>
-		<SEQ TYPE="KEYWORD2">%1</SEQ>
-		<SEQ TYPE="KEYWORD2">%2</SEQ>
-		<SEQ TYPE="KEYWORD2">%3</SEQ>
-		<SEQ TYPE="KEYWORD2">%4</SEQ>
-		<SEQ TYPE="KEYWORD2">%5</SEQ>
-		<SEQ TYPE="KEYWORD2">%6</SEQ>
-		<SEQ TYPE="KEYWORD2">%7</SEQ>
-		<SEQ TYPE="KEYWORD2">%8</SEQ>
-		<SEQ TYPE="KEYWORD2">%9</SEQ>
-		<!-- for-loop variable (one char after %%) -->
-		<SEQ_REGEXP TYPE="KEYWORD2"
-					HASH_CHAR="%%"
-					AT_WORD_START="TRUE"
-					>%%[\p{Alpha}]</SEQ_REGEXP>
-		<SPAN TYPE="KEYWORD2" NO_LINE_BREAK="TRUE">
-			<BEGIN>%</BEGIN>
-			<END>%</END>
-		</SPAN>
-
-		<KEYWORDS>
-			<!-- KEYWORD1 are internal MS-DOS shell commands -->
-			<KEYWORD1>cd</KEYWORD1>
-			<KEYWORD1>chdir</KEYWORD1>
-			<KEYWORD1>md</KEYWORD1>
-			<KEYWORD1>mkdir</KEYWORD1>
-
-			<KEYWORD1>cls</KEYWORD1>
-
-			<KEYWORD1>for</KEYWORD1>
-			<KEYWORD1>if</KEYWORD1>
-
-			<KEYWORD1>echo</KEYWORD1>
-			<KEYWORD1>echo.</KEYWORD1>
-
-			<KEYWORD1>move</KEYWORD1>
-			<KEYWORD1>copy</KEYWORD1>
-			<KEYWORD1>move</KEYWORD1>
-			<KEYWORD1>ren</KEYWORD1>
-			<KEYWORD1>del</KEYWORD1>
-			<KEYWORD1>set</KEYWORD1>
-
-			<!-- new KEYWORDS from Win2K help -->
-			<KEYWORD1>call</KEYWORD1>
-			<KEYWORD1>exit</KEYWORD1>
-			<KEYWORD1>setlocal</KEYWORD1>
-			<KEYWORD1>shift</KEYWORD1>
-			<KEYWORD1>endlocal</KEYWORD1>
-			<KEYWORD1>pause</KEYWORD1>
-
-			<!-- KEYWORD2 are commands options -->
-
-			<KEYWORD2>defined</KEYWORD2>
-			<KEYWORD2>exist</KEYWORD2>
-			<KEYWORD2>errorlevel</KEYWORD2>
-
-			<!-- new KEYWORD options from Win2K help -->
-			<KEYWORD2>else</KEYWORD2>
-
-			<KEYWORD2>in</KEYWORD2>
-			<KEYWORD2>do</KEYWORD2>
-
-			<KEYWORD2>NUL</KEYWORD2>
-			<KEYWORD2>AUX</KEYWORD2>
-			<KEYWORD2>PRN</KEYWORD2>
-
-			<KEYWORD1>not</KEYWORD1>
-
-			<!-- goto is a special case we want to distinguish it -->
-			<KEYWORD3>goto</KEYWORD3>
-
-			<!-- FUNCTION are standard MS-DOS commands -->
-			<!-- (those you find as stand-alone .exe or .com) in win95 %windows_root%\command folder -->
-			<FUNCTION>APPEND</FUNCTION>
-			<FUNCTION>ATTRIB</FUNCTION>
-			<FUNCTION>CHKDSK</FUNCTION>
-			<FUNCTION>CHOICE</FUNCTION>
-			<FUNCTION>DEBUG</FUNCTION>
-			<FUNCTION>DEFRAG</FUNCTION>
-			<FUNCTION>DELTREE</FUNCTION>
-			<FUNCTION>DISKCOMP</FUNCTION>
-			<FUNCTION>DISKCOPY</FUNCTION>
-			<FUNCTION>DOSKEY</FUNCTION>
-			<FUNCTION>DRVSPACE</FUNCTION>
-			<FUNCTION>EMM386</FUNCTION>
-			<FUNCTION>EXPAND</FUNCTION>
-			<FUNCTION>FASTOPEN</FUNCTION>
-			<FUNCTION>FC</FUNCTION>
-			<FUNCTION>FDISK</FUNCTION>
-			<FUNCTION>FIND</FUNCTION>
-			<FUNCTION>FORMAT</FUNCTION>
-			<FUNCTION>GRAPHICS</FUNCTION>
-			<FUNCTION>KEYB</FUNCTION>
-			<FUNCTION>LABEL</FUNCTION>
-			<FUNCTION>LOADFIX</FUNCTION>
-			<FUNCTION>MEM</FUNCTION>
-			<FUNCTION>MODE</FUNCTION>
-			<FUNCTION>MORE</FUNCTION>
-			<FUNCTION>MOVE</FUNCTION>
-			<FUNCTION>MSCDEX</FUNCTION>
-			<FUNCTION>NLSFUNC</FUNCTION>
-			<FUNCTION>POWER</FUNCTION>
-			<FUNCTION>PRINT</FUNCTION>
-			<FUNCTION>RD</FUNCTION>
-			<FUNCTION>REPLACE</FUNCTION>
-			<FUNCTION>RESTORE</FUNCTION>
-			<FUNCTION>SETVER</FUNCTION>
-			<FUNCTION>SHARE</FUNCTION>
-			<FUNCTION>SORT</FUNCTION>
-			<FUNCTION>SUBST</FUNCTION>
-			<FUNCTION>SYS</FUNCTION>
-			<FUNCTION>TREE</FUNCTION>
-			<FUNCTION>UNDELETE</FUNCTION>
-			<FUNCTION>UNFORMAT</FUNCTION>
-			<FUNCTION>VSAFE</FUNCTION>
-			<FUNCTION>XCOPY</FUNCTION>
-		</KEYWORDS>
-	</RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/bbj.xml b/qpython/src/main/assets/syntax/bbj.xml
deleted file mode 100644
index 1b85ebbd..00000000
--- a/qpython/src/main/assets/syntax/bbj.xml
+++ /dev/null
@@ -1,308 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="commentStart" VALUE="/*" />
-		<PROPERTY NAME="commentEnd" VALUE="*/" />
-		<PROPERTY NAME="wordBreakChars" VALUE=",+-=&lt;&gt;/?^&amp;*" />
-	</PROPS>
-	<RULES IGNORE_CASE="TRUE" HIGHLIGHT_DIGITS="TRUE">
-		<!-- enhancement if using some preprocessor -->
-		<SPAN TYPE="COMMENT1">
-			<BEGIN>/*</BEGIN>
-			<END>*/</END>
-		</SPAN>
-		<SPAN TYPE="LITERAL1" ESCAPE="\" NO_LINE_BREAK="TRUE">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-
-		<EOL_SPAN TYPE="COMMENT2">//</EOL_SPAN>
-		<EOL_SPAN TYPE="COMMENT2">REM </EOL_SPAN>
-
-		<SEQ TYPE="OPERATOR">=</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;=</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;=</SEQ>
-		<SEQ TYPE="OPERATOR">+</SEQ>
-		<SEQ TYPE="OPERATOR">-</SEQ>
-		<SEQ TYPE="OPERATOR">/</SEQ>
-		<SEQ TYPE="OPERATOR">*</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">^</SEQ>
-		<SEQ TYPE="OPERATOR"> and </SEQ>
-		<SEQ TYPE="OPERATOR"> or </SEQ>
-
-		<MARK_PREVIOUS TYPE="LABEL" MATCH_TYPE="OPERATOR" AT_LINE_START="TRUE">:</MARK_PREVIOUS>
-		<MARK_PREVIOUS TYPE="FUNCTION" MATCH_TYPE="OPERATOR">(</MARK_PREVIOUS>
-		<SEQ TYPE="OPERATOR">)</SEQ>
-
-		<KEYWORDS>
-			<KEYWORD1>ABS</KEYWORD1>
-			<KEYWORD1>ADJN</KEYWORD1>
-			<KEYWORD1>ARGC</KEYWORD1>
-			<KEYWORD1>ARGV</KEYWORD1>
-			<KEYWORD1>ASC</KEYWORD1>
-			<KEYWORD1>ATH</KEYWORD1>
-			<KEYWORD1>ATN</KEYWORD1>
-			<KEYWORD1>BACKGROUND</KEYWORD1>
-			<KEYWORD1>BIN</KEYWORD1>
-			<KEYWORD1>BSZ</KEYWORD1>
-			<KEYWORD1>CALLBACK</KEYWORD1>
-			<KEYWORD1>CHANOPT</KEYWORD1>
-			<KEYWORD1>CHR</KEYWORD1>
-			<KEYWORD1>CLIPCLEAR</KEYWORD1>
-			<KEYWORD1>CLIPFROMFILE</KEYWORD1>
-			<KEYWORD1>CLIPFROMSTR</KEYWORD1>
-			<KEYWORD1>CLIPISFORMAT</KEYWORD1>
-			<KEYWORD1>CLIPLOCK</KEYWORD1>
-			<KEYWORD1>CLIPREGFORMAT</KEYWORD1>
-			<KEYWORD1>CLIPTOFILE</KEYWORD1>
-			<KEYWORD1>CLIPTOSTR</KEYWORD1>
-			<KEYWORD1>CLIPUNLOCK</KEYWORD1>
-			<KEYWORD1>COS</KEYWORD1>
-			<KEYWORD1>CPL</KEYWORD1>
-			<KEYWORD1>CRC</KEYWORD1>
-			<KEYWORD1>CRC16</KEYWORD1>
-			<KEYWORD1>CTRL</KEYWORD1>
-			<KEYWORD1>CVS</KEYWORD1>
-			<KEYWORD1>CVT</KEYWORD1>
-			<KEYWORD1>DATE</KEYWORD1>
-			<KEYWORD1>DEC</KEYWORD1>
-			<KEYWORD1>DIMS</KEYWORD1>
-			<KEYWORD1>DSK</KEYWORD1>
-			<KEYWORD1>DSZ</KEYWORD1>
-			<KEYWORD1>EPT</KEYWORD1>
-			<KEYWORD1>ERRMES</KEYWORD1>
-			<KEYWORD1>FATTR</KEYWORD1>
-			<KEYWORD1>FBIN</KEYWORD1>
-			<KEYWORD1>FDEC</KEYWORD1>
-			<KEYWORD1>FIELD</KEYWORD1>
-			<KEYWORD1>FILEOPT</KEYWORD1>
-			<KEYWORD1>FILL</KEYWORD1>
-			<KEYWORD1>FLOATINGPOINT</KEYWORD1>
-			<KEYWORD1>FPT</KEYWORD1>
-			<KEYWORD1>GAP</KEYWORD1>
-			<KEYWORD1>HSA</KEYWORD1>
-			<KEYWORD1>HSH</KEYWORD1>
-			<KEYWORD1>HTA</KEYWORD1>
-			<KEYWORD1>IMP</KEYWORD1>
-			<KEYWORD1>INFO</KEYWORD1>
-			<KEYWORD1>INT</KEYWORD1>
-			<KEYWORD1>JUL</KEYWORD1>
-			<KEYWORD1>LCHECKIN</KEYWORD1>
-			<KEYWORD1>LCHECKOUT</KEYWORD1>
-			<KEYWORD1>LEN</KEYWORD1>
-			<KEYWORD1>LINFO</KEYWORD1>
-			<KEYWORD1>LOG</KEYWORD1>
-			<KEYWORD1>LRC</KEYWORD1>
-			<KEYWORD1>LST</KEYWORD1>
-			<KEYWORD1>MASK</KEYWORD1>
-			<KEYWORD1>MAX</KEYWORD1>
-			<KEYWORD1>MENUINFO</KEYWORD1>
-			<KEYWORD1>MIN</KEYWORD1>
-			<KEYWORD1>MOD</KEYWORD1>
-			<KEYWORD1>MSGBOX</KEYWORD1>
-			<KEYWORD1>NEVAL</KEYWORD1>
-			<KEYWORD1>NFIELD</KEYWORD1>
-			<KEYWORD1>NOTICE</KEYWORD1>
-			<KEYWORD1>NOTICETPL</KEYWORD1>
-			<KEYWORD1>NUM</KEYWORD1>
-			<KEYWORD1>PAD</KEYWORD1>
-			<KEYWORD1>PCK</KEYWORD1>
-			<KEYWORD1>PGM</KEYWORD1>
-			<KEYWORD1>POS</KEYWORD1>
-			<KEYWORD1>PROCESS_EVENTS</KEYWORD1>
-			<KEYWORD1>PROGRAM</KEYWORD1>
-			<KEYWORD1>PSZ</KEYWORD1>
-			<KEYWORD1>PUB</KEYWORD1>
-			<KEYWORD1>REMOVE_CALLBACK</KEYWORD1>
-			<KEYWORD1>RESERVE</KEYWORD1>
-			<KEYWORD1>RND</KEYWORD1>
-			<KEYWORD1>ROUND</KEYWORD1>
-			<KEYWORD1>SCALL</KEYWORD1>
-			<KEYWORD1>SENDMSG</KEYWORD1>
-			<KEYWORD1>SEVAL</KEYWORD1>
-			<KEYWORD1>SGN</KEYWORD1>
-			<KEYWORD1>SIN</KEYWORD1>
-			<KEYWORD1>SQR</KEYWORD1>
-			<KEYWORD1>SSORT</KEYWORD1>
-			<KEYWORD1>SSZ</KEYWORD1>
-			<KEYWORD1>STBL</KEYWORD1>
-			<KEYWORD1>STR</KEYWORD1>
-			<KEYWORD1>SWAP</KEYWORD1>
-			<KEYWORD1>SYS</KEYWORD1>
-			<KEYWORD1>TCB</KEYWORD1>
-			<KEYWORD1>TMPL</KEYWORD1>
-			<KEYWORD1>TSK</KEYWORD1>
-			<KEYWORD1>UPK</KEYWORD1>
-			<KEYWORD1>WINFIRST</KEYWORD1>
-			<KEYWORD1>WININFO</KEYWORD1>
-			<KEYWORD1>WINNEXT</KEYWORD1>
-
-			<KEYWORD2>CHDIR</KEYWORD2>
-			<KEYWORD2>CISAM</KEYWORD2>
-			<KEYWORD2>CLOSE</KEYWORD2>
-			<KEYWORD2>CONTINUE</KEYWORD2>
-			<KEYWORD2>DIRECT</KEYWORD2>
-			<KEYWORD2>DIR</KEYWORD2>
-			<KEYWORD2>DISABLE</KEYWORD2>
-			<KEYWORD2>DOM</KEYWORD2>
-			<KEYWORD2>DUMP</KEYWORD2>
-			<KEYWORD2>ENABLE</KEYWORD2>
-			<KEYWORD2>END</KEYWORD2>
-			<KEYWORD2>ENDTRACE</KEYWORD2>
-			<KEYWORD2>ERASE</KEYWORD2>
-			<KEYWORD2>EXTRACT</KEYWORD2>
-			<KEYWORD2>FID</KEYWORD2>
-			<KEYWORD2>FILE</KEYWORD2>
-			<KEYWORD2>FIN</KEYWORD2>
-			<KEYWORD2>FIND</KEYWORD2>
-			<KEYWORD2>FROM</KEYWORD2>
-			<KEYWORD2>IND</KEYWORD2>
-			<KEYWORD2>INDEXED</KEYWORD2>
-			<KEYWORD2>INPUT</KEYWORD2>
-			<KEYWORD2>INPUTE</KEYWORD2>
-			<KEYWORD2>INPUTN</KEYWORD2>
-			<KEYWORD2>IOL</KEYWORD2>
-			<KEYWORD2>IOLIST</KEYWORD2>
-			<KEYWORD2>KEY</KEYWORD2>
-			<KEYWORD2>KEYF</KEYWORD2>
-			<KEYWORD2>KEYL</KEYWORD2>
-			<KEYWORD2>KEYN</KEYWORD2>
-			<KEYWORD2>KEYP</KEYWORD2>
-			<KEYWORD2>KGEN</KEYWORD2>
-			<KEYWORD2>KNUM</KEYWORD2>
-			<KEYWORD2>LIST</KEYWORD2>
-			<KEYWORD2>LOAD</KEYWORD2>
-			<KEYWORD2>LOCK</KEYWORD2>
-			<KEYWORD2>MERGE</KEYWORD2>
-			<KEYWORD2>MKDIR</KEYWORD2>
-			<KEYWORD2>MKEYED</KEYWORD2>
-			<KEYWORD2>OPEN</KEYWORD2>
-			<KEYWORD2>PREFIX</KEYWORD2>
-			<KEYWORD2>PRINT</KEYWORD2>
-			<KEYWORD2>READ_RESOURCE</KEYWORD2>
-			<KEYWORD2>READ</KEYWORD2>
-			<KEYWORD2>RECORD</KEYWORD2>
-			<KEYWORD2>REMOVE</KEYWORD2>
-			<KEYWORD2>RENAME</KEYWORD2>
-			<KEYWORD2>RESCLOSE</KEYWORD2>
-			<KEYWORD2>RESFIRST</KEYWORD2>
-			<KEYWORD2>RESGET</KEYWORD2>
-			<KEYWORD2>RESINFO</KEYWORD2>
-			<KEYWORD2>RESNEXT</KEYWORD2>
-			<KEYWORD2>RESOPEN</KEYWORD2>
-			<KEYWORD2>REV</KEYWORD2>
-			<KEYWORD2>RMDIR</KEYWORD2>
-			<KEYWORD2>SAVE</KEYWORD2>
-			<KEYWORD2>SELECT</KEYWORD2>
-			<KEYWORD2>SERIAL</KEYWORD2>
-			<KEYWORD2>SETDAY</KEYWORD2>
-			<KEYWORD2>SETDRIVE</KEYWORD2>
-			<KEYWORD2>SETTRACE</KEYWORD2>
-			<KEYWORD2>SIZ</KEYWORD2>
-			<KEYWORD2>SORT</KEYWORD2>
-			<KEYWORD2>SQLCHN</KEYWORD2>
-			<KEYWORD2>SQLCLOSE</KEYWORD2>
-			<KEYWORD2>SQLERR</KEYWORD2>
-			<KEYWORD2>SQLEXEC</KEYWORD2>
-			<KEYWORD2>SQLFETCH</KEYWORD2>
-			<KEYWORD2>SQLLIST</KEYWORD2>
-			<KEYWORD2>SQLOPEN</KEYWORD2>
-			<KEYWORD2>SQLPREP</KEYWORD2>
-			<KEYWORD2>SQLSET</KEYWORD2>
-			<KEYWORD2>SQLTABLES</KEYWORD2>
-			<KEYWORD2>SQLTMPL</KEYWORD2>
-			<KEYWORD2>SQLUNT</KEYWORD2>
-			<KEYWORD2>STRING</KEYWORD2>
-			<KEYWORD2>TABLE</KEYWORD2>
-			<KEYWORD2>TBL</KEYWORD2>
-			<KEYWORD2>TIM</KEYWORD2>
-			<KEYWORD2>UNLOCK</KEYWORD2>
-			<KEYWORD2>WHERE</KEYWORD2>
-			<KEYWORD2>WRITE</KEYWORD2>
-			<KEYWORD2>XFID</KEYWORD2>
-			<KEYWORD2>XFILE</KEYWORD2>
-			<KEYWORD2>XFIN</KEYWORD2>
-
-			<KEYWORD3>ADDR</KEYWORD3>
-			<KEYWORD3>ALL</KEYWORD3>
-			<KEYWORD3>AUTO</KEYWORD3>
-			<KEYWORD3>BEGIN</KEYWORD3>
-			<KEYWORD3>BREAK</KEYWORD3>
-			<KEYWORD3>CALL</KEYWORD3>
-			<KEYWORD3>CASE</KEYWORD3>
-			<KEYWORD3>CHN</KEYWORD3>
-			<KEYWORD3>CLEAR</KEYWORD3>
-			<KEYWORD3>CTL</KEYWORD3>
-			<KEYWORD3>DATA</KEYWORD3>
-			<KEYWORD3>DAY</KEYWORD3>
-			<KEYWORD3>DEF</KEYWORD3>
-			<KEYWORD3>DEFAULT</KEYWORD3>
-			<KEYWORD3>DEFEND</KEYWORD3>
-			<KEYWORD3>DELETE</KEYWORD3>
-			<KEYWORD3>DIM</KEYWORD3>
-			<KEYWORD3>DREAD</KEYWORD3>
-			<KEYWORD3>DROP</KEYWORD3>
-			<KEYWORD3>EDIT</KEYWORD3>
-			<KEYWORD3>ELSE</KEYWORD3>
-			<KEYWORD3>ENDIF</KEYWORD3>
-			<KEYWORD3>ENTER</KEYWORD3>
-			<KEYWORD3>ERR</KEYWORD3>
-			<KEYWORD3>ESCAPE</KEYWORD3>
-			<KEYWORD3>ESCOFF</KEYWORD3>
-			<KEYWORD3>ESCON</KEYWORD3>
-			<KEYWORD3>EXECUTE</KEYWORD3>
-			<KEYWORD3>EXIT</KEYWORD3>
-			<KEYWORD3>EXITTO</KEYWORD3>
-			<KEYWORD3>FI</KEYWORD3>
-			<KEYWORD3>FOR</KEYWORD3>
-			<KEYWORD3>GOSUB</KEYWORD3>
-			<KEYWORD3>GOTO</KEYWORD3>
-			<KEYWORD3>IF</KEYWORD3>
-			<KEYWORD3>IFF</KEYWORD3>
-			<KEYWORD3>INITFILE</KEYWORD3>
-			<KEYWORD3>IOR</KEYWORD3>
-			<KEYWORD3>LET</KEYWORD3>
-			<KEYWORD3>NEXT</KEYWORD3>
-			<KEYWORD3>NOT</KEYWORD3>
-			<KEYWORD3>ON</KEYWORD3>
-			<KEYWORD3>OPTS</KEYWORD3>
-			<KEYWORD3>OR</KEYWORD3>
-			<KEYWORD3>PFX</KEYWORD3>
-			<KEYWORD3>PRECISION</KEYWORD3>
-			<KEYWORD3>RELEASE</KEYWORD3>
-			<KEYWORD3>RENUM</KEYWORD3>
-			<KEYWORD3>REPEAT</KEYWORD3>
-			<KEYWORD3>RESET</KEYWORD3>
-			<KEYWORD3>RESTORE</KEYWORD3>
-			<KEYWORD3>RETRY</KEYWORD3>
-			<KEYWORD3>RETURN</KEYWORD3>
-			<KEYWORD3>RUN</KEYWORD3>
-			<KEYWORD3>SET_CASE_SENSITIVE_OFF</KEYWORD3>
-			<KEYWORD3>SET_CASE_SENSITIVE_ON</KEYWORD3>
-			<KEYWORD3>SETERR</KEYWORD3>
-			<KEYWORD3>SETESC</KEYWORD3>
-			<KEYWORD3>SETOPTS</KEYWORD3>
-			<KEYWORD3>SETTIME</KEYWORD3>
-			<KEYWORD3>SSN</KEYWORD3>
-			<KEYWORD3>START</KEYWORD3>
-			<KEYWORD3>STEP</KEYWORD3>
-			<KEYWORD3>STOP</KEYWORD3>
-			<KEYWORD3>SWEND</KEYWORD3>
-			<KEYWORD3>SWITCH</KEYWORD3>
-			<KEYWORD3>THEN</KEYWORD3>
-			<KEYWORD3>TO</KEYWORD3>
-			<KEYWORD3>UNT</KEYWORD3>
-			<KEYWORD3>UNTIL</KEYWORD3>
-			<KEYWORD3>WAIT</KEYWORD3>
-			<KEYWORD3>WEND</KEYWORD3>
-			<KEYWORD3>WHILE</KEYWORD3>
-			<KEYWORD3>XOR</KEYWORD3>
-		</KEYWORDS>
-	</RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/bcel.xml b/qpython/src/main/assets/syntax/bcel.xml
deleted file mode 100644
index b336f638..00000000
--- a/qpython/src/main/assets/syntax/bcel.xml
+++ /dev/null
@@ -1,320 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!--
-    Java bytecode mode. Used by Andre Kaplan's JavaInsight plugin.
--->
-
-<MODE>
-    <PROPS>
-        <PROPERTY NAME="commentStart" VALUE="/*" />
-        <PROPERTY NAME="commentEnd" VALUE="*/" />
-        <PROPERTY NAME="lineComment" VALUE="//" />
-    </PROPS>
-
-
-    <RULES HIGHLIGHT_DIGITS="TRUE">
-        <!-- Silly comment -->
-        <SEQ TYPE="COMMENT1">/**/</SEQ>
-
-        <!-- Javadoc comment -->
-        <SPAN TYPE="COMMENT3" DELEGATE="java::JAVADOC">
-            <BEGIN>/**</BEGIN>
-            <END>*/</END>
-        </SPAN>
-
-        <!-- Java comment (C style) -->
-        <SPAN TYPE="COMMENT1">
-            <BEGIN>/*</BEGIN>
-            <END>*/</END>
-        </SPAN>
-
-        <EOL_SPAN TYPE="COMMENT2">//</EOL_SPAN>
-
-        <SPAN TYPE="LITERAL1" NO_LINE_BREAK="TRUE">
-            <BEGIN>'</BEGIN>
-            <END>'</END>
-        </SPAN>
-
-        <SPAN TYPE="LITERAL1" NO_LINE_BREAK="TRUE">
-            <BEGIN>"</BEGIN>
-            <END>"</END>
-        </SPAN>
-
-        <MARK_FOLLOWING TYPE="KEYWORD2" AT_LINE_START="FALSE">%</MARK_FOLLOWING>
-        <MARK_FOLLOWING TYPE="KEYWORD2" AT_LINE_START="FALSE">#</MARK_FOLLOWING>
-
-        <MARK_PREVIOUS TYPE="LABEL" MATCH_TYPE="OPERATOR"
-            AT_LINE_START="TRUE">:</MARK_PREVIOUS>
-
-        <SEQ TYPE="OPERATOR">&gt;</SEQ>
-        <SEQ TYPE="OPERATOR">&lt;</SEQ>
-
-        <KEYWORDS>
-            <!-- Some java keywords -->
-            <KEYWORD1>abstract</KEYWORD1>
-            <!-- <KEYWORD1>break</KEYWORD1> -->
-            <!-- <KEYWORD1>case</KEYWORD1> -->
-            <!-- <KEYWORD1>catch</KEYWORD1> -->
-            <!-- <KEYWORD1>continue</KEYWORD1> -->
-            <!-- <KEYWORD1>default</KEYWORD1> -->
-            <!-- <KEYWORD1>do</KEYWORD1> -->
-            <!-- <KEYWORD1>else</KEYWORD1> -->
-            <KEYWORD1>extends</KEYWORD1>
-            <KEYWORD1>final</KEYWORD1>
-            <!-- <KEYWORD1>finally</KEYWORD1> -->
-            <!-- <KEYWORD1>for</KEYWORD1> -->
-            <!-- <KEYWORD1>if</KEYWORD1> -->
-            <KEYWORD1>implements</KEYWORD1>
-            <!-- <KEYWORD1>instanceof</KEYWORD1> -->
-            <KEYWORD1>native</KEYWORD1>
-            <!-- <KEYWORD1>new</KEYWORD1> -->
-            <KEYWORD1>private</KEYWORD1>
-            <KEYWORD1>protected</KEYWORD1>
-            <KEYWORD1>public</KEYWORD1>
-            <!-- <KEYWORD1>return</KEYWORD1> -->
-            <KEYWORD1>static</KEYWORD1>
-            <!-- <KEYWORD1>switch</KEYWORD1> -->
-            <KEYWORD1>synchronized</KEYWORD1>
-            <KEYWORD1>throw</KEYWORD1>
-            <KEYWORD1>throws</KEYWORD1>
-            <KEYWORD1>transient</KEYWORD1>
-            <!-- <KEYWORD1>try</KEYWORD1> -->
-            <KEYWORD1>volatile</KEYWORD1>
-            <!-- <KEYWORD1>while</KEYWORD1> -->
-
-            <!-- <KEYWORD2>package</KEYWORD2> -->
-            <!-- <KEYWORD2>import</KEYWORD2> -->
-
-            <KEYWORD3>boolean</KEYWORD3>
-            <KEYWORD3>byte</KEYWORD3>
-            <KEYWORD3>char</KEYWORD3>
-            <KEYWORD3>class</KEYWORD3>
-            <KEYWORD3>double</KEYWORD3>
-            <KEYWORD3>float</KEYWORD3>
-            <KEYWORD3>int</KEYWORD3>
-            <KEYWORD3>interface</KEYWORD3>
-            <KEYWORD3>long</KEYWORD3>
-            <KEYWORD3>short</KEYWORD3>
-            <KEYWORD3>void</KEYWORD3>
-
-            <!-- <LITERAL2>false</LITERAL2> -->
-            <!-- <LITERAL2>null</LITERAL2> -->
-            <!-- <LITERAL2>super</LITERAL2> -->
-            <!-- <LITERAL2>this</LITERAL2> -->
-            <!-- <LITERAL2>true</LITERAL2> -->
-
-            <KEYWORD1>clinit</KEYWORD1>
-            <KEYWORD1>init</KEYWORD1>
-
-            <!-- 00 (0x00) --><KEYWORD1>nop</KEYWORD1>
-            <!-- 01 (0x01) --><KEYWORD1>aconst_null</KEYWORD1>
-            <!-- 02 (0x02) --><KEYWORD1>iconst_m1</KEYWORD1>
-            <!-- 03 (0x03) --><KEYWORD1>iconst_0</KEYWORD1>
-            <!-- 04 (0x04) --><KEYWORD1>iconst_1</KEYWORD1>
-            <!-- 05 (0x05) --><KEYWORD1>iconst_2</KEYWORD1>
-            <!-- 06 (0x06) --><KEYWORD1>iconst_3</KEYWORD1>
-            <!-- 07 (0x07) --><KEYWORD1>iconst_4</KEYWORD1>
-            <!-- 08 (0x08) --><KEYWORD1>iconst_5</KEYWORD1>
-            <!-- 09 (0x09) --><KEYWORD1>lconst_0</KEYWORD1>
-            <!-- 10 (0x0a) --><KEYWORD1>lconst_1</KEYWORD1>
-            <!-- 11 (0x0b) --><KEYWORD1>fconst_0</KEYWORD1>
-            <!-- 12 (0x0c) --><KEYWORD1>fconst_1</KEYWORD1>
-            <!-- 13 (0x0d) --><KEYWORD1>fconst_2</KEYWORD1>
-            <!-- 14 (0x0e) --><KEYWORD1>dconst_0</KEYWORD1>
-            <!-- 15 (0x0f) --><KEYWORD1>dconst_1</KEYWORD1>
-            <!-- 16 (0x10) --><KEYWORD1>bipush</KEYWORD1>
-            <!-- 17 (0x11) --><KEYWORD1>sipush</KEYWORD1>
-            <!-- 18 (0x12) --><KEYWORD1>ldc</KEYWORD1>
-            <!-- 19 (0x13) --><KEYWORD1>ldc_w</KEYWORD1>
-            <!-- 20 (0x14) --><KEYWORD1>ldc2_w</KEYWORD1>
-            <!-- 21 (0x15) --><KEYWORD1>iload</KEYWORD1>
-            <!-- 22 (0x16) --><KEYWORD1>lload</KEYWORD1>
-            <!-- 23 (0x17) --><KEYWORD1>fload</KEYWORD1>
-            <!-- 24 (0x18) --><KEYWORD1>dload</KEYWORD1>
-            <!-- 25 (0x19) --><KEYWORD1>aload</KEYWORD1>
-            <!-- 26 (0x1a) --><KEYWORD1>iload_0</KEYWORD1>
-            <!-- 27 (0x1b) --><KEYWORD1>iload_1</KEYWORD1>
-            <!-- 28 (0x1c) --><KEYWORD1>iload_2</KEYWORD1>
-            <!-- 29 (0x1d) --><KEYWORD1>iload_3</KEYWORD1>
-            <!-- 30 (0x1e) --><KEYWORD1>lload_0</KEYWORD1>
-            <!-- 31 (0x1f) --><KEYWORD1>lload_1</KEYWORD1>
-            <!-- 32 (0x20) --><KEYWORD1>lload_2</KEYWORD1>
-            <!-- 33 (0x21) --><KEYWORD1>lload_3</KEYWORD1>
-            <!-- 34 (0x22) --><KEYWORD1>fload_0</KEYWORD1>
-            <!-- 35 (0x23) --><KEYWORD1>fload_1</KEYWORD1>
-            <!-- 36 (0x24) --><KEYWORD1>fload_2</KEYWORD1>
-            <!-- 37 (0x25) --><KEYWORD1>fload_3</KEYWORD1>
-            <!-- 38 (0x26) --><KEYWORD1>dload_0</KEYWORD1>
-            <!-- 39 (0x27) --><KEYWORD1>dload_1</KEYWORD1>
-            <!-- 40 (0x28) --><KEYWORD1>dload_2</KEYWORD1>
-            <!-- 41 (0x29) --><KEYWORD1>dload_3</KEYWORD1>
-            <!-- 42 (0x2a) --><KEYWORD1>aload_0</KEYWORD1>
-            <!-- 43 (0x2b) --><KEYWORD1>aload_1</KEYWORD1>
-            <!-- 44 (0x2c) --><KEYWORD1>aload_2</KEYWORD1>
-            <!-- 45 (0x2d) --><KEYWORD1>aload_3</KEYWORD1>
-            <!-- 46 (0x2e) --><KEYWORD1>iaload</KEYWORD1>
-            <!-- 47 (0x2f) --><KEYWORD1>laload</KEYWORD1>
-            <!-- 48 (0x30) --><KEYWORD1>faload</KEYWORD1>
-            <!-- 49 (0x31) --><KEYWORD1>daload</KEYWORD1>
-            <!-- 50 (0x32) --><KEYWORD1>aaload</KEYWORD1>
-            <!-- 51 (0x33) --><KEYWORD1>baload</KEYWORD1>
-            <!-- 52 (0x34) --><KEYWORD1>caload</KEYWORD1>
-            <!-- 53 (0x35) --><KEYWORD1>saload</KEYWORD1>
-            <!-- 54 (0x36) --><KEYWORD1>istore</KEYWORD1>
-            <!-- 55 (0x37) --><KEYWORD1>lstore</KEYWORD1>
-            <!-- 56 (0x38) --><KEYWORD1>fstore</KEYWORD1>
-            <!-- 57 (0x39) --><KEYWORD1>dstore</KEYWORD1>
-            <!-- 58 (0x3a) --><KEYWORD1>astore</KEYWORD1>
-            <!-- 59 (0x3b) --><KEYWORD1>istore_0</KEYWORD1>
-            <!-- 60 (0x3c) --><KEYWORD1>istore_1</KEYWORD1>
-            <!-- 61 (0x3d) --><KEYWORD1>istore_2</KEYWORD1>
-            <!-- 62 (0x3e) --><KEYWORD1>istore_3</KEYWORD1>
-            <!-- 63 (0x3f) --><KEYWORD1>lstore_0</KEYWORD1>
-            <!-- 64 (0x40) --><KEYWORD1>lstore_1</KEYWORD1>
-            <!-- 65 (0x41) --><KEYWORD1>lstore_2</KEYWORD1>
-            <!-- 66 (0x42) --><KEYWORD1>lstore_3</KEYWORD1>
-            <!-- 67 (0x43) --><KEYWORD1>fstore_0</KEYWORD1>
-            <!-- 68 (0x44) --><KEYWORD1>fstore_1</KEYWORD1>
-            <!-- 69 (0x45) --><KEYWORD1>fstore_2</KEYWORD1>
-            <!-- 70 (0x46) --><KEYWORD1>fstore_3</KEYWORD1>
-            <!-- 71 (0x47) --><KEYWORD1>dstore_0</KEYWORD1>
-            <!-- 72 (0x48) --><KEYWORD1>dstore_1</KEYWORD1>
-            <!-- 73 (0x49) --><KEYWORD1>dstore_2</KEYWORD1>
-            <!-- 74 (0x4a) --><KEYWORD1>dstore_3</KEYWORD1>
-            <!-- 75 (0x4b) --><KEYWORD1>astore_0</KEYWORD1>
-            <!-- 76 (0x4c) --><KEYWORD1>astore_1</KEYWORD1>
-            <!-- 77 (0x4d) --><KEYWORD1>astore_2</KEYWORD1>
-            <!-- 78 (0x4e) --><KEYWORD1>astore_3</KEYWORD1>
-            <!-- 79 (0x4f) --><KEYWORD1>iastore</KEYWORD1>
-            <!-- 80 (0x50) --><KEYWORD1>lastore</KEYWORD1>
-            <!-- 81 (0x51) --><KEYWORD1>fastore</KEYWORD1>
-            <!-- 82 (0x52) --><KEYWORD1>dastore</KEYWORD1>
-            <!-- 83 (0x53) --><KEYWORD1>aastore</KEYWORD1>
-            <!-- 84 (0x54) --><KEYWORD1>bastore</KEYWORD1>
-            <!-- 85 (0x55) --><KEYWORD1>castore</KEYWORD1>
-            <!-- 86 (0x56) --><KEYWORD1>sastore</KEYWORD1>
-            <!-- 87 (0x57) --><KEYWORD1>pop</KEYWORD1>
-            <!-- 88 (0x58) --><KEYWORD1>pop2</KEYWORD1>
-            <!-- 089 (0x59) --><KEYWORD1>dup</KEYWORD1>
-            <!-- 090 (0x5a) --><KEYWORD1>dup_x1</KEYWORD1>
-            <!-- 091 (0x5b) --><KEYWORD1>dup_x2</KEYWORD1>
-            <!-- 092 (0x5c) --><KEYWORD1>dup2</KEYWORD1>
-            <!-- 093 (0x5d) --><KEYWORD1>dup2_x1</KEYWORD1>
-            <!-- 094 (0x5e) --><KEYWORD1>dup2_x2</KEYWORD1>
-            <!-- 095 (0x5f) --><KEYWORD1>swap</KEYWORD1>
-            <!-- 096 (0x60) --><KEYWORD1>iadd</KEYWORD1>
-            <!-- 097 (0x61) --><KEYWORD1>ladd</KEYWORD1>
-            <!-- 098 (0x62) --><KEYWORD1>fadd</KEYWORD1>
-            <!-- 099 (0x63) --><KEYWORD1>dadd</KEYWORD1>
-            <!-- 100 (0x64) --><KEYWORD1>isub</KEYWORD1>
-            <!-- 101 (0x65) --><KEYWORD1>lsub</KEYWORD1>
-            <!-- 102 (0x66) --><KEYWORD1>fsub</KEYWORD1>
-            <!-- 103 (0x67) --><KEYWORD1>dsub</KEYWORD1>
-            <!-- 104 (0x68) --><KEYWORD1>imul</KEYWORD1>
-            <!-- 105 (0x69) --><KEYWORD1>lmul</KEYWORD1>
-            <!-- 106 (0x6a) --><KEYWORD1>fmul</KEYWORD1>
-            <!-- 107 (0x6b) --><KEYWORD1>dmul</KEYWORD1>
-            <!-- 108 (0x6c) --><KEYWORD1>idiv</KEYWORD1>
-            <!-- 109 (0x6d) --><KEYWORD1>ldiv</KEYWORD1>
-            <!-- 110 (0x6e) --><KEYWORD1>fdiv</KEYWORD1>
-            <!-- 111 (0x6f) --><KEYWORD1>ddiv</KEYWORD1>
-            <!-- 112 (0x70) --><KEYWORD1>irem</KEYWORD1>
-            <!-- 113 (0x71) --><KEYWORD1>lrem</KEYWORD1>
-            <!-- 114 (0x72) --><KEYWORD1>frem</KEYWORD1>
-            <!-- 115 (0x73) --><KEYWORD1>drem</KEYWORD1>
-            <!-- 116 (0x74) --><KEYWORD1>ineg</KEYWORD1>
-            <!-- 117 (0x75) --><KEYWORD1>lneg</KEYWORD1>
-            <!-- 118 (0x76) --><KEYWORD1>fneg</KEYWORD1>
-            <!-- 119 (0x77) --><KEYWORD1>dneg</KEYWORD1>
-            <!-- 120 (0x78) --><KEYWORD1>ishl</KEYWORD1>
-            <!-- 121 (0x79) --><KEYWORD1>lshl</KEYWORD1>
-            <!-- 122 (0x7a) --><KEYWORD1>ishr</KEYWORD1>
-            <!-- 123 (0x7b) --><KEYWORD1>lshr</KEYWORD1>
-            <!-- 124 (0x7c) --><KEYWORD1>iushr</KEYWORD1>
-            <!-- 125 (0x7d) --><KEYWORD1>lushr</KEYWORD1>
-            <!-- 126 (0x7e) --><KEYWORD1>iand</KEYWORD1>
-            <!-- 127 (0x7f) --><KEYWORD1>land</KEYWORD1>
-            <!-- 128 (0x80) --><KEYWORD1>ior</KEYWORD1>
-            <!-- 129 (0x81) --><KEYWORD1>lor</KEYWORD1>
-            <!-- 130 (0x82) --><KEYWORD1>ixor</KEYWORD1>
-            <!-- 131 (0x83) --><KEYWORD1>lxor</KEYWORD1>
-            <!-- 132 (0x84) --><KEYWORD1>iinc</KEYWORD1>
-            <!-- 133 (0x85) --><KEYWORD1>i2l</KEYWORD1>
-            <!-- 134 (0x86) --><KEYWORD1>i2f</KEYWORD1>
-            <!-- 135 (0x87) --><KEYWORD1>i2d</KEYWORD1>
-            <!-- 136 (0x88) --><KEYWORD1>l2i</KEYWORD1>
-            <!-- 137 (0x89) --><KEYWORD1>l2f</KEYWORD1>
-            <!-- 138 (0x8a) --><KEYWORD1>l2d</KEYWORD1>
-            <!-- 139 (0x8b) --><KEYWORD1>f2i</KEYWORD1>
-            <!-- 140 (0x8c) --><KEYWORD1>f2l</KEYWORD1>
-            <!-- 141 (0x8d) --><KEYWORD1>f2d</KEYWORD1>
-            <!-- 142 (0x8e) --><KEYWORD1>d2i</KEYWORD1>
-            <!-- 143 (0x8f) --><KEYWORD1>d2l</KEYWORD1>
-            <!-- 144 (0x90) --><KEYWORD1>d2f</KEYWORD1>
-            <!-- 145 (0x91) --><KEYWORD1>i2b</KEYWORD1>
-            <!-- 146 (0x92) --><KEYWORD1>i2c</KEYWORD1>
-            <!-- 147 (0x93) --><KEYWORD1>i2s</KEYWORD1>
-            <!-- 148 (0x94) --><KEYWORD1>lcmp</KEYWORD1>
-            <!-- 149 (0x95) --><KEYWORD1>fcmpl</KEYWORD1>
-            <!-- 150 (0x96) --><KEYWORD1>fcmpg</KEYWORD1>
-            <!-- 151 (0x97) --><KEYWORD1>dcmpl</KEYWORD1>
-            <!-- 152 (0x98) --><KEYWORD1>dcmpg</KEYWORD1>
-            <!-- 153 (0x99) --><KEYWORD1>ifeq</KEYWORD1>
-            <!-- 154 (0x9a) --><KEYWORD1>ifne</KEYWORD1>
-            <!-- 155 (0x9b) --><KEYWORD1>iflt</KEYWORD1>
-            <!-- 156 (0x9c) --><KEYWORD1>ifge</KEYWORD1>
-            <!-- 157 (0x9d) --><KEYWORD1>ifgt</KEYWORD1>
-            <!-- 158 (0x9e) --><KEYWORD1>ifle</KEYWORD1>
-            <!-- 159 (0x9f) --><KEYWORD1>if_icmpeq</KEYWORD1>
-            <!-- 160 (0xa0) --><KEYWORD1>if_icmpne</KEYWORD1>
-            <!-- 161 (0xa1) --><KEYWORD1>if_icmplt</KEYWORD1>
-            <!-- 162 (0xa2) --><KEYWORD1>if_icmpge</KEYWORD1>
-            <!-- 163 (0xa3) --><KEYWORD1>if_icmpgt</KEYWORD1>
-            <!-- 164 (0xa4) --><KEYWORD1>if_icmple</KEYWORD1>
-            <!-- 165 (0xa5) --><KEYWORD1>if_acmpeq</KEYWORD1>
-            <!-- 166 (0xa6) --><KEYWORD1>if_acmpne</KEYWORD1>
-            <!-- 167 (0xa7) --><KEYWORD1>goto</KEYWORD1>
-            <!-- 168 (0xa8) --><KEYWORD1>jsr</KEYWORD1>
-            <!-- 169 (0xa9) --><KEYWORD1>ret</KEYWORD1>
-            <!-- 170 (0xaa) --><KEYWORD1>tableswitch</KEYWORD1>
-            <!-- 171 (0xab) --><KEYWORD1>lookupswitch</KEYWORD1>
-            <!-- 172 (0xac) --><KEYWORD1>ireturn</KEYWORD1>
-            <!-- 173 (0xad) --><KEYWORD1>lreturn</KEYWORD1>
-            <!-- 174 (0xae) --><KEYWORD1>freturn</KEYWORD1>
-            <!-- 175 (0xaf) --><KEYWORD1>dreturn</KEYWORD1>
-            <!-- 176 (0xb0) --><KEYWORD1>areturn</KEYWORD1>
-            <!-- 177 (0xb1) --><KEYWORD1>return</KEYWORD1>
-            <!-- 178 (0xb2) --><KEYWORD1>getstatic</KEYWORD1>
-            <!-- 179 (0xb3) --><KEYWORD1>putstatic</KEYWORD1>
-            <!-- 180 (0xb4) --><KEYWORD1>getfield</KEYWORD1>
-            <!-- 181 (0xb5) --><KEYWORD1>putfield</KEYWORD1>
-            <!-- 182 (0xb6) --><KEYWORD1>invokevirtual</KEYWORD1>
-            <!-- 183 (0xb7) --><KEYWORD1>invokespecial</KEYWORD1>
-            <!-- 184 (0xb8) --><KEYWORD1>invokestatic</KEYWORD1>
-            <!-- 185 (0xb9) --><KEYWORD1>invokeinterface</KEYWORD1>
-            <!-- 186 (0xba) --><!-- xxxunusedxxx -->
-            <!-- 187 (0xbb) --><KEYWORD1>new</KEYWORD1>
-            <!-- 188 (0xbc) --><KEYWORD1>newarray</KEYWORD1>
-            <!-- 189 (0xbd) --><KEYWORD1>anewarray</KEYWORD1>
-            <!-- 190 (0xbe) --><KEYWORD1>arraylength</KEYWORD1>
-            <!-- 191 (0xbf) --><KEYWORD1>athrow</KEYWORD1>
-            <!-- 192 (0xc0) --><KEYWORD1>checkcast</KEYWORD1>
-            <!-- 193 (0xc1) --><KEYWORD1>instanceof</KEYWORD1>
-            <!-- 194 (0xc2) --><KEYWORD1>monitorenter</KEYWORD1>
-            <!-- 195 (0xc3) --><KEYWORD1>monitorexit</KEYWORD1>
-            <!-- 196 (0xc4) --><KEYWORD1>wide</KEYWORD1>
-            <!-- 197 (0xc5) --><KEYWORD1>multianewarray</KEYWORD1>
-            <!-- 198 (0xc6) --><KEYWORD1>ifnull</KEYWORD1>
-            <!-- 199 (0xc7) --><KEYWORD1>ifnonnull</KEYWORD1>
-            <!-- 200 (0xc8) --><KEYWORD1>goto_w</KEYWORD1>
-            <!-- 201 (0xc9) --><KEYWORD1>jsr_w</KEYWORD1>
-
-            <!-- Reserved opcodes: -->
-            <!-- 202 (0xca) --><KEYWORD1>breakpoint</KEYWORD1>
-            <!-- 254 (0xfe) --><KEYWORD1>impdep1</KEYWORD1>
-            <!-- 255 (0xff) --><KEYWORD1>impdep2</KEYWORD1>
-        </KEYWORDS>
-    </RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/bibtex.xml b/qpython/src/main/assets/syntax/bibtex.xml
deleted file mode 100644
index d850dd1f..00000000
--- a/qpython/src/main/assets/syntax/bibtex.xml
+++ /dev/null
@@ -1,960 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!--  BibTeX mode, by Thomas Alspaugh alspaugh@ics.uci.edu, 2004Mar25  v1.1  -->
-<!--  Catalog entry (suggested)
-<MODE NAME="BibTeX"		FILE="bibtex.xml"
-				FILE_NAME_GLOB="*.bib" />
-  -->
-<!--
-      This BibTeX mode highlights the fields for each entry type to distinguish
-      required, optional, or other fields from Lamport.  
-      I have added several commonly-accepted fields (highlighted in yet another
-      color);  these are
-
-        abstract
-        annotation
-        day
-        keywords
-        lccn
-        location
-        references
-        url
-
-      The month name abbreviations are highlighted (jan, feb, mar, ...).
-      Escaped quotes (as in {\"o}) are treated correctly.
-      Text may be quoted "" or braced {} and may contain \{\}.
-      Entries may be braced {} or parenthesized ().
-      @strings are highlighted correctly.
-      .
-      Comments and suggestions are welcome.
-      Enjoy!
-  -->
-<!--  Things BibTeX mode does not do:
-        - highlight keys, which must appear after the { or ( 
-          and match [a-zA-Z0-9.:;?!`'()[\]\-/*@]+
-  -->
-<!--  Use of token types:
-        COMMENT1   % comments
-        FUNCTION   entries
-        KEYWORD1   additional fields
-        KEYWORD2   Lamport fields neither required nor optional
-        KEYWORD3   Lamport fields optional
-        KEYWORD4   Lamport fields required
-        LITERAL1   "text", months, unquoted numbers
-        LITERAL2   {text}
-        LITERAL3  \{text\}
-        OPERATOR   = ,
-  -->
-<!--  bibtex.xml is generated automatically from a summary of Lamport 
-      "LaTeX : A document preparation system : User guide and reference manual",
-      1994 (LaTeX2e) edition, appendix B, using a Perl scripts.  -->
-
-<MODE>
-  <PROPS>
-    <PROPERTY NAME="lineComment" VALUE="%"/>
-  </PROPS>
-
-  <RULES IGNORE_CASE="TRUE">
-    <EOL_SPAN TYPE="COMMENT1">%</EOL_SPAN>
-    
-    <!-- Entry types.  Each entry type has its own ruleset. -->
-    <!-- entry: FUNCTION -->
-    <SPAN TYPE="FUNCTION" DELEGATE="article"      ><BEGIN>@article{</BEGIN><END>}</END></SPAN>
-    <SPAN TYPE="FUNCTION" DELEGATE="article"      ><BEGIN>@article(</BEGIN><END>)</END></SPAN>
-    <SPAN TYPE="FUNCTION" DELEGATE="book"         ><BEGIN>@book{</BEGIN><END>}</END></SPAN>
-    <SPAN TYPE="FUNCTION" DELEGATE="book"         ><BEGIN>@book(</BEGIN><END>)</END></SPAN>
-    <SPAN TYPE="FUNCTION" DELEGATE="booklet"      ><BEGIN>@booklet{</BEGIN><END>}</END></SPAN>
-    <SPAN TYPE="FUNCTION" DELEGATE="booklet"      ><BEGIN>@booklet(</BEGIN><END>)</END></SPAN>
-    <SPAN TYPE="FUNCTION" DELEGATE="conference"   ><BEGIN>@conference{</BEGIN><END>}</END></SPAN>
-    <SPAN TYPE="FUNCTION" DELEGATE="conference"   ><BEGIN>@conference(</BEGIN><END>)</END></SPAN>
-    <SPAN TYPE="FUNCTION" DELEGATE="inbook"       ><BEGIN>@inbook{</BEGIN><END>}</END></SPAN>
-    <SPAN TYPE="FUNCTION" DELEGATE="inbook"       ><BEGIN>@inbook(</BEGIN><END>)</END></SPAN>
-    <SPAN TYPE="FUNCTION" DELEGATE="incollection" ><BEGIN>@incollection{</BEGIN><END>}</END></SPAN>
-    <SPAN TYPE="FUNCTION" DELEGATE="incollection" ><BEGIN>@incollection(</BEGIN><END>)</END></SPAN>
-    <SPAN TYPE="FUNCTION" DELEGATE="inproceedings"><BEGIN>@inproceedings{</BEGIN><END>}</END></SPAN>
-    <SPAN TYPE="FUNCTION" DELEGATE="inproceedings"><BEGIN>@inproceedings(</BEGIN><END>)</END></SPAN>
-    <SPAN TYPE="FUNCTION" DELEGATE="manual"       ><BEGIN>@manual{</BEGIN><END>}</END></SPAN>
-    <SPAN TYPE="FUNCTION" DELEGATE="manual"       ><BEGIN>@manual(</BEGIN><END>)</END></SPAN>
-    <SPAN TYPE="FUNCTION" DELEGATE="mastersthesis"><BEGIN>@mastersthesis{</BEGIN><END>}</END></SPAN>
-    <SPAN TYPE="FUNCTION" DELEGATE="mastersthesis"><BEGIN>@mastersthesis(</BEGIN><END>)</END></SPAN>
-    <SPAN TYPE="FUNCTION" DELEGATE="misc"         ><BEGIN>@misc{</BEGIN><END>}</END></SPAN>
-    <SPAN TYPE="FUNCTION" DELEGATE="misc"         ><BEGIN>@misc(</BEGIN><END>)</END></SPAN>
-    <SPAN TYPE="FUNCTION" DELEGATE="phdthesis"    ><BEGIN>@phdthesis{</BEGIN><END>}</END></SPAN>
-    <SPAN TYPE="FUNCTION" DELEGATE="phdthesis"    ><BEGIN>@phdthesis(</BEGIN><END>)</END></SPAN>
-    <SPAN TYPE="FUNCTION" DELEGATE="proceedings"  ><BEGIN>@proceedings{</BEGIN><END>}</END></SPAN>
-    <SPAN TYPE="FUNCTION" DELEGATE="proceedings"  ><BEGIN>@proceedings(</BEGIN><END>)</END></SPAN>
-    <SPAN TYPE="FUNCTION" DELEGATE="techreport"   ><BEGIN>@techreport{</BEGIN><END>}</END></SPAN>
-    <SPAN TYPE="FUNCTION" DELEGATE="techreport"   ><BEGIN>@techreport(</BEGIN><END>)</END></SPAN>
-    <SPAN TYPE="FUNCTION" DELEGATE="unpublished"  ><BEGIN>@unpublished{</BEGIN><END>}</END></SPAN>
-    <SPAN TYPE="FUNCTION" DELEGATE="unpublished"  ><BEGIN>@unpublished(</BEGIN><END>)</END></SPAN>
-    <SPAN TYPE="FUNCTION" DELEGATE="string"       ><BEGIN>@string{</BEGIN><END>}</END></SPAN>
-    <SPAN TYPE="FUNCTION" DELEGATE="string"       ><BEGIN>@string(</BEGIN><END>)</END></SPAN>
-    
-  </RULES>
-
-<RULES SET="article">
-    <SPAN TYPE="LITERAL1" DELEGATE="textquoted" NO_LINE_BREAK="FALSE"><BEGIN>"</BEGIN><END>"</END></SPAN>
-    <SPAN TYPE="LITERAL2" DELEGATE="textbraced" NO_LINE_BREAK="FALSE"><BEGIN>{</BEGIN><END>}</END></SPAN>
-    <SEQ TYPE="OPERATOR">=</SEQ>
-    <SEQ TYPE="OPERATOR">,</SEQ>
-    <SEQ_REGEXP TYPE="LITERAL1" HASH_CHARS="123456789" AT_WORD_START="TRUE">[1-9][0-9]*</SEQ_REGEXP>
-    <KEYWORDS>
-      <!-- required -->
-      <KEYWORD4>author</KEYWORD4>
-      <KEYWORD4>journal</KEYWORD4>
-      <KEYWORD4>title</KEYWORD4>
-      <KEYWORD4>year</KEYWORD4>
-      <!-- optional -->
-      <KEYWORD3>month</KEYWORD3>
-      <KEYWORD3>note</KEYWORD3>
-      <KEYWORD3>number</KEYWORD3>
-      <KEYWORD3>pages</KEYWORD3>
-      <KEYWORD3>volume</KEYWORD3>
-      <!-- others -->
-      <KEYWORD2>address</KEYWORD2>
-      <KEYWORD2>annote</KEYWORD2>
-      <KEYWORD2>booktitle</KEYWORD2>
-      <KEYWORD2>chapter</KEYWORD2>
-      <KEYWORD2>crossref</KEYWORD2>
-      <KEYWORD2>edition</KEYWORD2>
-      <KEYWORD2>editor</KEYWORD2>
-      <KEYWORD2>howpublished</KEYWORD2>
-      <KEYWORD2>institution</KEYWORD2>
-      <KEYWORD2>key</KEYWORD2>
-      <KEYWORD2>organization</KEYWORD2>
-      <KEYWORD2>publisher</KEYWORD2>
-      <KEYWORD2>school</KEYWORD2>
-      <KEYWORD2>series</KEYWORD2>
-      <KEYWORD2>type</KEYWORD2>
-      <!-- not in Lamport but widely accepted -->
-      <KEYWORD1>abstract</KEYWORD1>
-      <KEYWORD1>annotation</KEYWORD1>
-      <KEYWORD1>day</KEYWORD1>
-      <KEYWORD1>keywords</KEYWORD1>
-      <KEYWORD1>lccn</KEYWORD1>
-      <KEYWORD1>location</KEYWORD1>
-      <KEYWORD1>references</KEYWORD1>
-      <KEYWORD1>url</KEYWORD1>
-      <!-- total: 32 fields -->
-      <LITERAL1>jan</LITERAL1>
-      <LITERAL1>feb</LITERAL1>
-      <LITERAL1>mar</LITERAL1>
-      <LITERAL1>apr</LITERAL1>
-      <LITERAL1>may</LITERAL1>
-      <LITERAL1>jun</LITERAL1>
-      <LITERAL1>jul</LITERAL1>
-      <LITERAL1>aug</LITERAL1>
-      <LITERAL1>sep</LITERAL1>
-      <LITERAL1>oct</LITERAL1>
-      <LITERAL1>nov</LITERAL1>
-      <LITERAL1>dec</LITERAL1>
-    </KEYWORDS>
-  </RULES>
-
-
-<RULES SET="book">
-    <SPAN TYPE="LITERAL1" DELEGATE="textquoted" NO_LINE_BREAK="FALSE"><BEGIN>"</BEGIN><END>"</END></SPAN>
-    <SPAN TYPE="LITERAL2" DELEGATE="textbraced" NO_LINE_BREAK="FALSE"><BEGIN>{</BEGIN><END>}</END></SPAN>
-    <SEQ TYPE="OPERATOR">=</SEQ>
-    <SEQ TYPE="OPERATOR">,</SEQ>
-    <SEQ_REGEXP TYPE="LITERAL1" HASH_CHARS="123456789" AT_WORD_START="TRUE">[1-9][0-9]*</SEQ_REGEXP>
-    <KEYWORDS>
-      <!-- required -->
-      <KEYWORD4>author</KEYWORD4>
-      <KEYWORD4>editor</KEYWORD4>
-      <KEYWORD4>publisher</KEYWORD4>
-      <KEYWORD4>title</KEYWORD4>
-      <KEYWORD4>year</KEYWORD4>
-      <!-- optional -->
-      <KEYWORD3>address</KEYWORD3>
-      <KEYWORD3>edition</KEYWORD3>
-      <KEYWORD3>month</KEYWORD3>
-      <KEYWORD3>note</KEYWORD3>
-      <KEYWORD3>number</KEYWORD3>
-      <KEYWORD3>series</KEYWORD3>
-      <KEYWORD3>volume</KEYWORD3>
-      <!-- others -->
-      <KEYWORD2>annote</KEYWORD2>
-      <KEYWORD2>booktitle</KEYWORD2>
-      <KEYWORD2>chapter</KEYWORD2>
-      <KEYWORD2>crossref</KEYWORD2>
-      <KEYWORD2>howpublished</KEYWORD2>
-      <KEYWORD2>institution</KEYWORD2>
-      <KEYWORD2>journal</KEYWORD2>
-      <KEYWORD2>key</KEYWORD2>
-      <KEYWORD2>organization</KEYWORD2>
-      <KEYWORD2>pages</KEYWORD2>
-      <KEYWORD2>school</KEYWORD2>
-      <KEYWORD2>type</KEYWORD2>
-      <!-- not in Lamport but widely accepted -->
-      <KEYWORD1>abstract</KEYWORD1>
-      <KEYWORD1>annotation</KEYWORD1>
-      <KEYWORD1>day</KEYWORD1>
-      <KEYWORD1>keywords</KEYWORD1>
-      <KEYWORD1>lccn</KEYWORD1>
-      <KEYWORD1>location</KEYWORD1>
-      <KEYWORD1>references</KEYWORD1>
-      <KEYWORD1>url</KEYWORD1>
-      <!-- total: 32 fields -->
-      <LITERAL1>jan</LITERAL1>
-      <LITERAL1>feb</LITERAL1>
-      <LITERAL1>mar</LITERAL1>
-      <LITERAL1>apr</LITERAL1>
-      <LITERAL1>may</LITERAL1>
-      <LITERAL1>jun</LITERAL1>
-      <LITERAL1>jul</LITERAL1>
-      <LITERAL1>aug</LITERAL1>
-      <LITERAL1>sep</LITERAL1>
-      <LITERAL1>oct</LITERAL1>
-      <LITERAL1>nov</LITERAL1>
-      <LITERAL1>dec</LITERAL1>
-    </KEYWORDS>
-  </RULES>
-
-
-<RULES SET="booklet">
-    <SPAN TYPE="LITERAL1" DELEGATE="textquoted" NO_LINE_BREAK="FALSE"><BEGIN>"</BEGIN><END>"</END></SPAN>
-    <SPAN TYPE="LITERAL2" DELEGATE="textbraced" NO_LINE_BREAK="FALSE"><BEGIN>{</BEGIN><END>}</END></SPAN>
-    <SEQ TYPE="OPERATOR">=</SEQ>
-    <SEQ TYPE="OPERATOR">,</SEQ>
-    <SEQ_REGEXP TYPE="LITERAL1" HASH_CHARS="123456789" AT_WORD_START="TRUE">[1-9][0-9]*</SEQ_REGEXP>
-    <KEYWORDS>
-      <!-- required -->
-      <KEYWORD4>title</KEYWORD4>
-      <!-- optional -->
-      <KEYWORD3>address</KEYWORD3>
-      <KEYWORD3>author</KEYWORD3>
-      <KEYWORD3>howpublished</KEYWORD3>
-      <KEYWORD3>month</KEYWORD3>
-      <KEYWORD3>note</KEYWORD3>
-      <KEYWORD3>year</KEYWORD3>
-      <!-- others -->
-      <KEYWORD2>annote</KEYWORD2>
-      <KEYWORD2>booktitle</KEYWORD2>
-      <KEYWORD2>chapter</KEYWORD2>
-      <KEYWORD2>crossref</KEYWORD2>
-      <KEYWORD2>edition</KEYWORD2>
-      <KEYWORD2>editor</KEYWORD2>
-      <KEYWORD2>institution</KEYWORD2>
-      <KEYWORD2>journal</KEYWORD2>
-      <KEYWORD2>key</KEYWORD2>
-      <KEYWORD2>number</KEYWORD2>
-      <KEYWORD2>organization</KEYWORD2>
-      <KEYWORD2>pages</KEYWORD2>
-      <KEYWORD2>publisher</KEYWORD2>
-      <KEYWORD2>school</KEYWORD2>
-      <KEYWORD2>series</KEYWORD2>
-      <KEYWORD2>type</KEYWORD2>
-      <KEYWORD2>volume</KEYWORD2>
-      <!-- not in Lamport but widely accepted -->
-      <KEYWORD1>abstract</KEYWORD1>
-      <KEYWORD1>annotation</KEYWORD1>
-      <KEYWORD1>day</KEYWORD1>
-      <KEYWORD1>keywords</KEYWORD1>
-      <KEYWORD1>lccn</KEYWORD1>
-      <KEYWORD1>location</KEYWORD1>
-      <KEYWORD1>references</KEYWORD1>
-      <KEYWORD1>url</KEYWORD1>
-      <!-- total: 32 fields -->
-      <LITERAL1>jan</LITERAL1>
-      <LITERAL1>feb</LITERAL1>
-      <LITERAL1>mar</LITERAL1>
-      <LITERAL1>apr</LITERAL1>
-      <LITERAL1>may</LITERAL1>
-      <LITERAL1>jun</LITERAL1>
-      <LITERAL1>jul</LITERAL1>
-      <LITERAL1>aug</LITERAL1>
-      <LITERAL1>sep</LITERAL1>
-      <LITERAL1>oct</LITERAL1>
-      <LITERAL1>nov</LITERAL1>
-      <LITERAL1>dec</LITERAL1>
-    </KEYWORDS>
-  </RULES>
-
-
-<RULES SET="conference">
-    <SPAN TYPE="LITERAL1" DELEGATE="textquoted" NO_LINE_BREAK="FALSE"><BEGIN>"</BEGIN><END>"</END></SPAN>
-    <SPAN TYPE="LITERAL2" DELEGATE="textbraced" NO_LINE_BREAK="FALSE"><BEGIN>{</BEGIN><END>}</END></SPAN>
-    <SEQ TYPE="OPERATOR">=</SEQ>
-    <SEQ TYPE="OPERATOR">,</SEQ>
-    <SEQ_REGEXP TYPE="LITERAL1" HASH_CHARS="123456789" AT_WORD_START="TRUE">[1-9][0-9]*</SEQ_REGEXP>
-    <KEYWORDS>
-      <!-- required -->
-      <KEYWORD4>author</KEYWORD4>
-      <KEYWORD4>booktitle</KEYWORD4>
-      <KEYWORD4>title</KEYWORD4>
-      <KEYWORD4>year</KEYWORD4>
-      <!-- optional -->
-      <KEYWORD3>address</KEYWORD3>
-      <KEYWORD3>editor</KEYWORD3>
-      <KEYWORD3>month</KEYWORD3>
-      <KEYWORD3>note</KEYWORD3>
-      <KEYWORD3>number</KEYWORD3>
-      <KEYWORD3>organization</KEYWORD3>
-      <KEYWORD3>pages</KEYWORD3>
-      <KEYWORD3>publisher</KEYWORD3>
-      <KEYWORD3>series</KEYWORD3>
-      <KEYWORD3>volume</KEYWORD3>
-      <!-- others -->
-      <KEYWORD2>annote</KEYWORD2>
-      <KEYWORD2>chapter</KEYWORD2>
-      <KEYWORD2>crossref</KEYWORD2>
-      <KEYWORD2>edition</KEYWORD2>
-      <KEYWORD2>howpublished</KEYWORD2>
-      <KEYWORD2>institution</KEYWORD2>
-      <KEYWORD2>journal</KEYWORD2>
-      <KEYWORD2>key</KEYWORD2>
-      <KEYWORD2>school</KEYWORD2>
-      <KEYWORD2>type</KEYWORD2>
-      <!-- not in Lamport but widely accepted -->
-      <KEYWORD1>abstract</KEYWORD1>
-      <KEYWORD1>annotation</KEYWORD1>
-      <KEYWORD1>day</KEYWORD1>
-      <KEYWORD1>keywords</KEYWORD1>
-      <KEYWORD1>lccn</KEYWORD1>
-      <KEYWORD1>location</KEYWORD1>
-      <KEYWORD1>references</KEYWORD1>
-      <KEYWORD1>url</KEYWORD1>
-      <!-- total: 32 fields -->
-      <LITERAL1>jan</LITERAL1>
-      <LITERAL1>feb</LITERAL1>
-      <LITERAL1>mar</LITERAL1>
-      <LITERAL1>apr</LITERAL1>
-      <LITERAL1>may</LITERAL1>
-      <LITERAL1>jun</LITERAL1>
-      <LITERAL1>jul</LITERAL1>
-      <LITERAL1>aug</LITERAL1>
-      <LITERAL1>sep</LITERAL1>
-      <LITERAL1>oct</LITERAL1>
-      <LITERAL1>nov</LITERAL1>
-      <LITERAL1>dec</LITERAL1>
-    </KEYWORDS>
-  </RULES>
-
-
-<RULES SET="inbook">
-    <SPAN TYPE="LITERAL1" DELEGATE="textquoted" NO_LINE_BREAK="FALSE"><BEGIN>"</BEGIN><END>"</END></SPAN>
-    <SPAN TYPE="LITERAL2" DELEGATE="textbraced" NO_LINE_BREAK="FALSE"><BEGIN>{</BEGIN><END>}</END></SPAN>
-    <SEQ TYPE="OPERATOR">=</SEQ>
-    <SEQ TYPE="OPERATOR">,</SEQ>
-    <SEQ_REGEXP TYPE="LITERAL1" HASH_CHARS="123456789" AT_WORD_START="TRUE">[1-9][0-9]*</SEQ_REGEXP>
-    <KEYWORDS>
-      <!-- required -->
-      <KEYWORD4>author</KEYWORD4>
-      <KEYWORD4>chapter</KEYWORD4>
-      <KEYWORD4>editor</KEYWORD4>
-      <KEYWORD4>pages</KEYWORD4>
-      <KEYWORD4>publisher</KEYWORD4>
-      <KEYWORD4>title</KEYWORD4>
-      <KEYWORD4>year</KEYWORD4>
-      <!-- optional -->
-      <KEYWORD3>address</KEYWORD3>
-      <KEYWORD3>edition</KEYWORD3>
-      <KEYWORD3>month</KEYWORD3>
-      <KEYWORD3>note</KEYWORD3>
-      <KEYWORD3>number</KEYWORD3>
-      <KEYWORD3>series</KEYWORD3>
-      <KEYWORD3>type</KEYWORD3>
-      <KEYWORD3>volume</KEYWORD3>
-      <!-- others -->
-      <KEYWORD2>annote</KEYWORD2>
-      <KEYWORD2>booktitle</KEYWORD2>
-      <KEYWORD2>crossref</KEYWORD2>
-      <KEYWORD2>howpublished</KEYWORD2>
-      <KEYWORD2>institution</KEYWORD2>
-      <KEYWORD2>journal</KEYWORD2>
-      <KEYWORD2>key</KEYWORD2>
-      <KEYWORD2>organization</KEYWORD2>
-      <KEYWORD2>school</KEYWORD2>
-      <!-- not in Lamport but widely accepted -->
-      <KEYWORD1>abstract</KEYWORD1>
-      <KEYWORD1>annotation</KEYWORD1>
-      <KEYWORD1>day</KEYWORD1>
-      <KEYWORD1>keywords</KEYWORD1>
-      <KEYWORD1>lccn</KEYWORD1>
-      <KEYWORD1>location</KEYWORD1>
-      <KEYWORD1>references</KEYWORD1>
-      <KEYWORD1>url</KEYWORD1>
-      <!-- total: 32 fields -->
-      <LITERAL1>jan</LITERAL1>
-      <LITERAL1>feb</LITERAL1>
-      <LITERAL1>mar</LITERAL1>
-      <LITERAL1>apr</LITERAL1>
-      <LITERAL1>may</LITERAL1>
-      <LITERAL1>jun</LITERAL1>
-      <LITERAL1>jul</LITERAL1>
-      <LITERAL1>aug</LITERAL1>
-      <LITERAL1>sep</LITERAL1>
-      <LITERAL1>oct</LITERAL1>
-      <LITERAL1>nov</LITERAL1>
-      <LITERAL1>dec</LITERAL1>
-    </KEYWORDS>
-  </RULES>
-
-
-<RULES SET="incollection">
-    <SPAN TYPE="LITERAL1" DELEGATE="textquoted" NO_LINE_BREAK="FALSE"><BEGIN>"</BEGIN><END>"</END></SPAN>
-    <SPAN TYPE="LITERAL2" DELEGATE="textbraced" NO_LINE_BREAK="FALSE"><BEGIN>{</BEGIN><END>}</END></SPAN>
-    <SEQ TYPE="OPERATOR">=</SEQ>
-    <SEQ TYPE="OPERATOR">,</SEQ>
-    <SEQ_REGEXP TYPE="LITERAL1" HASH_CHARS="123456789" AT_WORD_START="TRUE">[1-9][0-9]*</SEQ_REGEXP>
-    <KEYWORDS>
-      <!-- required -->
-      <KEYWORD4>author</KEYWORD4>
-      <KEYWORD4>booktitle</KEYWORD4>
-      <KEYWORD4>publisher</KEYWORD4>
-      <KEYWORD4>title</KEYWORD4>
-      <KEYWORD4>year</KEYWORD4>
-      <!-- optional -->
-      <KEYWORD3>address</KEYWORD3>
-      <KEYWORD3>chapter</KEYWORD3>
-      <KEYWORD3>edition</KEYWORD3>
-      <KEYWORD3>editor</KEYWORD3>
-      <KEYWORD3>month</KEYWORD3>
-      <KEYWORD3>note</KEYWORD3>
-      <KEYWORD3>number</KEYWORD3>
-      <KEYWORD3>pages</KEYWORD3>
-      <KEYWORD3>series</KEYWORD3>
-      <KEYWORD3>type</KEYWORD3>
-      <KEYWORD3>volume</KEYWORD3>
-      <!-- others -->
-      <KEYWORD2>annote</KEYWORD2>
-      <KEYWORD2>crossref</KEYWORD2>
-      <KEYWORD2>howpublished</KEYWORD2>
-      <KEYWORD2>institution</KEYWORD2>
-      <KEYWORD2>journal</KEYWORD2>
-      <KEYWORD2>key</KEYWORD2>
-      <KEYWORD2>organization</KEYWORD2>
-      <KEYWORD2>school</KEYWORD2>
-      <!-- not in Lamport but widely accepted -->
-      <KEYWORD1>abstract</KEYWORD1>
-      <KEYWORD1>annotation</KEYWORD1>
-      <KEYWORD1>day</KEYWORD1>
-      <KEYWORD1>keywords</KEYWORD1>
-      <KEYWORD1>lccn</KEYWORD1>
-      <KEYWORD1>location</KEYWORD1>
-      <KEYWORD1>references</KEYWORD1>
-      <KEYWORD1>url</KEYWORD1>
-      <!-- total: 32 fields -->
-      <LITERAL1>jan</LITERAL1>
-      <LITERAL1>feb</LITERAL1>
-      <LITERAL1>mar</LITERAL1>
-      <LITERAL1>apr</LITERAL1>
-      <LITERAL1>may</LITERAL1>
-      <LITERAL1>jun</LITERAL1>
-      <LITERAL1>jul</LITERAL1>
-      <LITERAL1>aug</LITERAL1>
-      <LITERAL1>sep</LITERAL1>
-      <LITERAL1>oct</LITERAL1>
-      <LITERAL1>nov</LITERAL1>
-      <LITERAL1>dec</LITERAL1>
-    </KEYWORDS>
-  </RULES>
-
-
-<RULES SET="inproceedings">
-    <SPAN TYPE="LITERAL1" DELEGATE="textquoted" NO_LINE_BREAK="FALSE"><BEGIN>"</BEGIN><END>"</END></SPAN>
-    <SPAN TYPE="LITERAL2" DELEGATE="textbraced" NO_LINE_BREAK="FALSE"><BEGIN>{</BEGIN><END>}</END></SPAN>
-    <SEQ TYPE="OPERATOR">=</SEQ>
-    <SEQ TYPE="OPERATOR">,</SEQ>
-    <SEQ_REGEXP TYPE="LITERAL1" HASH_CHARS="123456789" AT_WORD_START="TRUE">[1-9][0-9]*</SEQ_REGEXP>
-    <KEYWORDS>
-      <!-- required -->
-      <KEYWORD4>author</KEYWORD4>
-      <KEYWORD4>booktitle</KEYWORD4>
-      <KEYWORD4>title</KEYWORD4>
-      <KEYWORD4>year</KEYWORD4>
-      <!-- optional -->
-      <KEYWORD3>address</KEYWORD3>
-      <KEYWORD3>editor</KEYWORD3>
-      <KEYWORD3>month</KEYWORD3>
-      <KEYWORD3>note</KEYWORD3>
-      <KEYWORD3>number</KEYWORD3>
-      <KEYWORD3>organization</KEYWORD3>
-      <KEYWORD3>pages</KEYWORD3>
-      <KEYWORD3>publisher</KEYWORD3>
-      <KEYWORD3>series</KEYWORD3>
-      <KEYWORD3>volume</KEYWORD3>
-      <!-- others -->
-      <KEYWORD2>annote</KEYWORD2>
-      <KEYWORD2>chapter</KEYWORD2>
-      <KEYWORD2>crossref</KEYWORD2>
-      <KEYWORD2>edition</KEYWORD2>
-      <KEYWORD2>howpublished</KEYWORD2>
-      <KEYWORD2>institution</KEYWORD2>
-      <KEYWORD2>journal</KEYWORD2>
-      <KEYWORD2>key</KEYWORD2>
-      <KEYWORD2>school</KEYWORD2>
-      <KEYWORD2>type</KEYWORD2>
-      <!-- not in Lamport but widely accepted -->
-      <KEYWORD1>abstract</KEYWORD1>
-      <KEYWORD1>annotation</KEYWORD1>
-      <KEYWORD1>day</KEYWORD1>
-      <KEYWORD1>keywords</KEYWORD1>
-      <KEYWORD1>lccn</KEYWORD1>
-      <KEYWORD1>location</KEYWORD1>
-      <KEYWORD1>references</KEYWORD1>
-      <KEYWORD1>url</KEYWORD1>
-      <!-- total: 32 fields -->
-      <LITERAL1>jan</LITERAL1>
-      <LITERAL1>feb</LITERAL1>
-      <LITERAL1>mar</LITERAL1>
-      <LITERAL1>apr</LITERAL1>
-      <LITERAL1>may</LITERAL1>
-      <LITERAL1>jun</LITERAL1>
-      <LITERAL1>jul</LITERAL1>
-      <LITERAL1>aug</LITERAL1>
-      <LITERAL1>sep</LITERAL1>
-      <LITERAL1>oct</LITERAL1>
-      <LITERAL1>nov</LITERAL1>
-      <LITERAL1>dec</LITERAL1>
-    </KEYWORDS>
-  </RULES>
-
-
-<RULES SET="manual">
-    <SPAN TYPE="LITERAL1" DELEGATE="textquoted" NO_LINE_BREAK="FALSE"><BEGIN>"</BEGIN><END>"</END></SPAN>
-    <SPAN TYPE="LITERAL2" DELEGATE="textbraced" NO_LINE_BREAK="FALSE"><BEGIN>{</BEGIN><END>}</END></SPAN>
-    <SEQ TYPE="OPERATOR">=</SEQ>
-    <SEQ TYPE="OPERATOR">,</SEQ>
-    <SEQ_REGEXP TYPE="LITERAL1" HASH_CHARS="123456789" AT_WORD_START="TRUE">[1-9][0-9]*</SEQ_REGEXP>
-    <KEYWORDS>
-      <!-- required -->
-      <KEYWORD4>title</KEYWORD4>
-      <!-- optional -->
-      <KEYWORD3>address</KEYWORD3>
-      <KEYWORD3>author</KEYWORD3>
-      <KEYWORD3>edition</KEYWORD3>
-      <KEYWORD3>month</KEYWORD3>
-      <KEYWORD3>note</KEYWORD3>
-      <KEYWORD3>organization</KEYWORD3>
-      <KEYWORD3>year</KEYWORD3>
-      <!-- others -->
-      <KEYWORD2>annote</KEYWORD2>
-      <KEYWORD2>booktitle</KEYWORD2>
-      <KEYWORD2>chapter</KEYWORD2>
-      <KEYWORD2>crossref</KEYWORD2>
-      <KEYWORD2>editor</KEYWORD2>
-      <KEYWORD2>howpublished</KEYWORD2>
-      <KEYWORD2>institution</KEYWORD2>
-      <KEYWORD2>journal</KEYWORD2>
-      <KEYWORD2>key</KEYWORD2>
-      <KEYWORD2>number</KEYWORD2>
-      <KEYWORD2>pages</KEYWORD2>
-      <KEYWORD2>publisher</KEYWORD2>
-      <KEYWORD2>school</KEYWORD2>
-      <KEYWORD2>series</KEYWORD2>
-      <KEYWORD2>type</KEYWORD2>
-      <KEYWORD2>volume</KEYWORD2>
-      <!-- not in Lamport but widely accepted -->
-      <KEYWORD1>abstract</KEYWORD1>
-      <KEYWORD1>annotation</KEYWORD1>
-      <KEYWORD1>day</KEYWORD1>
-      <KEYWORD1>keywords</KEYWORD1>
-      <KEYWORD1>lccn</KEYWORD1>
-      <KEYWORD1>location</KEYWORD1>
-      <KEYWORD1>references</KEYWORD1>
-      <KEYWORD1>url</KEYWORD1>
-      <!-- total: 32 fields -->
-      <LITERAL1>jan</LITERAL1>
-      <LITERAL1>feb</LITERAL1>
-      <LITERAL1>mar</LITERAL1>
-      <LITERAL1>apr</LITERAL1>
-      <LITERAL1>may</LITERAL1>
-      <LITERAL1>jun</LITERAL1>
-      <LITERAL1>jul</LITERAL1>
-      <LITERAL1>aug</LITERAL1>
-      <LITERAL1>sep</LITERAL1>
-      <LITERAL1>oct</LITERAL1>
-      <LITERAL1>nov</LITERAL1>
-      <LITERAL1>dec</LITERAL1>
-    </KEYWORDS>
-  </RULES>
-
-
-<RULES SET="mastersthesis">
-    <SPAN TYPE="LITERAL1" DELEGATE="textquoted" NO_LINE_BREAK="FALSE"><BEGIN>"</BEGIN><END>"</END></SPAN>
-    <SPAN TYPE="LITERAL2" DELEGATE="textbraced" NO_LINE_BREAK="FALSE"><BEGIN>{</BEGIN><END>}</END></SPAN>
-    <SEQ TYPE="OPERATOR">=</SEQ>
-    <SEQ TYPE="OPERATOR">,</SEQ>
-    <SEQ_REGEXP TYPE="LITERAL1" HASH_CHARS="123456789" AT_WORD_START="TRUE">[1-9][0-9]*</SEQ_REGEXP>
-    <KEYWORDS>
-      <!-- required -->
-      <KEYWORD4>author</KEYWORD4>
-      <KEYWORD4>school</KEYWORD4>
-      <KEYWORD4>title</KEYWORD4>
-      <KEYWORD4>year</KEYWORD4>
-      <!-- optional -->
-      <KEYWORD3>address</KEYWORD3>
-      <KEYWORD3>month</KEYWORD3>
-      <KEYWORD3>note</KEYWORD3>
-      <KEYWORD3>type</KEYWORD3>
-      <!-- others -->
-      <KEYWORD2>annote</KEYWORD2>
-      <KEYWORD2>booktitle</KEYWORD2>
-      <KEYWORD2>chapter</KEYWORD2>
-      <KEYWORD2>crossref</KEYWORD2>
-      <KEYWORD2>edition</KEYWORD2>
-      <KEYWORD2>editor</KEYWORD2>
-      <KEYWORD2>howpublished</KEYWORD2>
-      <KEYWORD2>institution</KEYWORD2>
-      <KEYWORD2>journal</KEYWORD2>
-      <KEYWORD2>key</KEYWORD2>
-      <KEYWORD2>number</KEYWORD2>
-      <KEYWORD2>organization</KEYWORD2>
-      <KEYWORD2>pages</KEYWORD2>
-      <KEYWORD2>publisher</KEYWORD2>
-      <KEYWORD2>series</KEYWORD2>
-      <KEYWORD2>volume</KEYWORD2>
-      <!-- not in Lamport but widely accepted -->
-      <KEYWORD1>abstract</KEYWORD1>
-      <KEYWORD1>annotation</KEYWORD1>
-      <KEYWORD1>day</KEYWORD1>
-      <KEYWORD1>keywords</KEYWORD1>
-      <KEYWORD1>lccn</KEYWORD1>
-      <KEYWORD1>location</KEYWORD1>
-      <KEYWORD1>references</KEYWORD1>
-      <KEYWORD1>url</KEYWORD1>
-      <!-- total: 32 fields -->
-      <LITERAL1>jan</LITERAL1>
-      <LITERAL1>feb</LITERAL1>
-      <LITERAL1>mar</LITERAL1>
-      <LITERAL1>apr</LITERAL1>
-      <LITERAL1>may</LITERAL1>
-      <LITERAL1>jun</LITERAL1>
-      <LITERAL1>jul</LITERAL1>
-      <LITERAL1>aug</LITERAL1>
-      <LITERAL1>sep</LITERAL1>
-      <LITERAL1>oct</LITERAL1>
-      <LITERAL1>nov</LITERAL1>
-      <LITERAL1>dec</LITERAL1>
-    </KEYWORDS>
-  </RULES>
-
-
-<RULES SET="misc">
-    <SPAN TYPE="LITERAL1" DELEGATE="textquoted" NO_LINE_BREAK="FALSE"><BEGIN>"</BEGIN><END>"</END></SPAN>
-    <SPAN TYPE="LITERAL2" DELEGATE="textbraced" NO_LINE_BREAK="FALSE"><BEGIN>{</BEGIN><END>}</END></SPAN>
-    <SEQ TYPE="OPERATOR">=</SEQ>
-    <SEQ TYPE="OPERATOR">,</SEQ>
-    <SEQ_REGEXP TYPE="LITERAL1" HASH_CHARS="123456789" AT_WORD_START="TRUE">[1-9][0-9]*</SEQ_REGEXP>
-    <KEYWORDS>
-      <!-- required -->
-      <!-- optional -->
-      <KEYWORD3>author</KEYWORD3>
-      <KEYWORD3>howpublished</KEYWORD3>
-      <KEYWORD3>month</KEYWORD3>
-      <KEYWORD3>note</KEYWORD3>
-      <KEYWORD3>title</KEYWORD3>
-      <KEYWORD3>year</KEYWORD3>
-      <!-- others -->
-      <KEYWORD2>address</KEYWORD2>
-      <KEYWORD2>annote</KEYWORD2>
-      <KEYWORD2>booktitle</KEYWORD2>
-      <KEYWORD2>chapter</KEYWORD2>
-      <KEYWORD2>crossref</KEYWORD2>
-      <KEYWORD2>edition</KEYWORD2>
-      <KEYWORD2>editor</KEYWORD2>
-      <KEYWORD2>institution</KEYWORD2>
-      <KEYWORD2>journal</KEYWORD2>
-      <KEYWORD2>key</KEYWORD2>
-      <KEYWORD2>number</KEYWORD2>
-      <KEYWORD2>organization</KEYWORD2>
-      <KEYWORD2>pages</KEYWORD2>
-      <KEYWORD2>publisher</KEYWORD2>
-      <KEYWORD2>school</KEYWORD2>
-      <KEYWORD2>series</KEYWORD2>
-      <KEYWORD2>type</KEYWORD2>
-      <KEYWORD2>volume</KEYWORD2>
-      <!-- not in Lamport but widely accepted -->
-      <KEYWORD1>abstract</KEYWORD1>
-      <KEYWORD1>annotation</KEYWORD1>
-      <KEYWORD1>day</KEYWORD1>
-      <KEYWORD1>keywords</KEYWORD1>
-      <KEYWORD1>lccn</KEYWORD1>
-      <KEYWORD1>location</KEYWORD1>
-      <KEYWORD1>references</KEYWORD1>
-      <KEYWORD1>url</KEYWORD1>
-      <!-- total: 32 fields -->
-      <LITERAL1>jan</LITERAL1>
-      <LITERAL1>feb</LITERAL1>
-      <LITERAL1>mar</LITERAL1>
-      <LITERAL1>apr</LITERAL1>
-      <LITERAL1>may</LITERAL1>
-      <LITERAL1>jun</LITERAL1>
-      <LITERAL1>jul</LITERAL1>
-      <LITERAL1>aug</LITERAL1>
-      <LITERAL1>sep</LITERAL1>
-      <LITERAL1>oct</LITERAL1>
-      <LITERAL1>nov</LITERAL1>
-      <LITERAL1>dec</LITERAL1>
-    </KEYWORDS>
-  </RULES>
-
-
-<RULES SET="phdthesis">
-    <SPAN TYPE="LITERAL1" DELEGATE="textquoted" NO_LINE_BREAK="FALSE"><BEGIN>"</BEGIN><END>"</END></SPAN>
-    <SPAN TYPE="LITERAL2" DELEGATE="textbraced" NO_LINE_BREAK="FALSE"><BEGIN>{</BEGIN><END>}</END></SPAN>
-    <SEQ TYPE="OPERATOR">=</SEQ>
-    <SEQ TYPE="OPERATOR">,</SEQ>
-    <SEQ_REGEXP TYPE="LITERAL1" HASH_CHARS="123456789" AT_WORD_START="TRUE">[1-9][0-9]*</SEQ_REGEXP>
-    <KEYWORDS>
-      <!-- required -->
-      <KEYWORD4>author</KEYWORD4>
-      <KEYWORD4>school</KEYWORD4>
-      <KEYWORD4>title</KEYWORD4>
-      <KEYWORD4>year</KEYWORD4>
-      <!-- optional -->
-      <KEYWORD3>address</KEYWORD3>
-      <KEYWORD3>month</KEYWORD3>
-      <KEYWORD3>note</KEYWORD3>
-      <KEYWORD3>type</KEYWORD3>
-      <!-- others -->
-      <KEYWORD2>annote</KEYWORD2>
-      <KEYWORD2>booktitle</KEYWORD2>
-      <KEYWORD2>chapter</KEYWORD2>
-      <KEYWORD2>crossref</KEYWORD2>
-      <KEYWORD2>edition</KEYWORD2>
-      <KEYWORD2>editor</KEYWORD2>
-      <KEYWORD2>howpublished</KEYWORD2>
-      <KEYWORD2>institution</KEYWORD2>
-      <KEYWORD2>journal</KEYWORD2>
-      <KEYWORD2>key</KEYWORD2>
-      <KEYWORD2>number</KEYWORD2>
-      <KEYWORD2>organization</KEYWORD2>
-      <KEYWORD2>pages</KEYWORD2>
-      <KEYWORD2>publisher</KEYWORD2>
-      <KEYWORD2>series</KEYWORD2>
-      <KEYWORD2>volume</KEYWORD2>
-      <!-- not in Lamport but widely accepted -->
-      <KEYWORD1>abstract</KEYWORD1>
-      <KEYWORD1>annotation</KEYWORD1>
-      <KEYWORD1>day</KEYWORD1>
-      <KEYWORD1>keywords</KEYWORD1>
-      <KEYWORD1>lccn</KEYWORD1>
-      <KEYWORD1>location</KEYWORD1>
-      <KEYWORD1>references</KEYWORD1>
-      <KEYWORD1>url</KEYWORD1>
-      <!-- total: 32 fields -->
-      <LITERAL1>jan</LITERAL1>
-      <LITERAL1>feb</LITERAL1>
-      <LITERAL1>mar</LITERAL1>
-      <LITERAL1>apr</LITERAL1>
-      <LITERAL1>may</LITERAL1>
-      <LITERAL1>jun</LITERAL1>
-      <LITERAL1>jul</LITERAL1>
-      <LITERAL1>aug</LITERAL1>
-      <LITERAL1>sep</LITERAL1>
-      <LITERAL1>oct</LITERAL1>
-      <LITERAL1>nov</LITERAL1>
-      <LITERAL1>dec</LITERAL1>
-    </KEYWORDS>
-  </RULES>
-
-
-<RULES SET="proceedings">
-    <SPAN TYPE="LITERAL1" DELEGATE="textquoted" NO_LINE_BREAK="FALSE"><BEGIN>"</BEGIN><END>"</END></SPAN>
-    <SPAN TYPE="LITERAL2" DELEGATE="textbraced" NO_LINE_BREAK="FALSE"><BEGIN>{</BEGIN><END>}</END></SPAN>
-    <SEQ TYPE="OPERATOR">=</SEQ>
-    <SEQ TYPE="OPERATOR">,</SEQ>
-    <SEQ_REGEXP TYPE="LITERAL1" HASH_CHARS="123456789" AT_WORD_START="TRUE">[1-9][0-9]*</SEQ_REGEXP>
-    <KEYWORDS>
-      <!-- required -->
-      <KEYWORD4>title</KEYWORD4>
-      <KEYWORD4>year</KEYWORD4>
-      <!-- optional -->
-      <KEYWORD3>address</KEYWORD3>
-      <KEYWORD3>editor</KEYWORD3>
-      <KEYWORD3>month</KEYWORD3>
-      <KEYWORD3>note</KEYWORD3>
-      <KEYWORD3>number</KEYWORD3>
-      <KEYWORD3>organization</KEYWORD3>
-      <KEYWORD3>publisher</KEYWORD3>
-      <KEYWORD3>series</KEYWORD3>
-      <KEYWORD3>volume</KEYWORD3>
-      <!-- others -->
-      <KEYWORD2>annote</KEYWORD2>
-      <KEYWORD2>author</KEYWORD2>
-      <KEYWORD2>booktitle</KEYWORD2>
-      <KEYWORD2>chapter</KEYWORD2>
-      <KEYWORD2>crossref</KEYWORD2>
-      <KEYWORD2>edition</KEYWORD2>
-      <KEYWORD2>howpublished</KEYWORD2>
-      <KEYWORD2>institution</KEYWORD2>
-      <KEYWORD2>journal</KEYWORD2>
-      <KEYWORD2>key</KEYWORD2>
-      <KEYWORD2>pages</KEYWORD2>
-      <KEYWORD2>school</KEYWORD2>
-      <KEYWORD2>type</KEYWORD2>
-      <!-- not in Lamport but widely accepted -->
-      <KEYWORD1>abstract</KEYWORD1>
-      <KEYWORD1>annotation</KEYWORD1>
-      <KEYWORD1>day</KEYWORD1>
-      <KEYWORD1>keywords</KEYWORD1>
-      <KEYWORD1>lccn</KEYWORD1>
-      <KEYWORD1>location</KEYWORD1>
-      <KEYWORD1>references</KEYWORD1>
-      <KEYWORD1>url</KEYWORD1>
-      <!-- total: 32 fields -->
-      <LITERAL1>jan</LITERAL1>
-      <LITERAL1>feb</LITERAL1>
-      <LITERAL1>mar</LITERAL1>
-      <LITERAL1>apr</LITERAL1>
-      <LITERAL1>may</LITERAL1>
-      <LITERAL1>jun</LITERAL1>
-      <LITERAL1>jul</LITERAL1>
-      <LITERAL1>aug</LITERAL1>
-      <LITERAL1>sep</LITERAL1>
-      <LITERAL1>oct</LITERAL1>
-      <LITERAL1>nov</LITERAL1>
-      <LITERAL1>dec</LITERAL1>
-    </KEYWORDS>
-  </RULES>
-
-
-<RULES SET="techreport">
-    <SPAN TYPE="LITERAL1" DELEGATE="textquoted" NO_LINE_BREAK="FALSE"><BEGIN>"</BEGIN><END>"</END></SPAN>
-    <SPAN TYPE="LITERAL2" DELEGATE="textbraced" NO_LINE_BREAK="FALSE"><BEGIN>{</BEGIN><END>}</END></SPAN>
-    <SEQ TYPE="OPERATOR">=</SEQ>
-    <SEQ TYPE="OPERATOR">,</SEQ>
-    <SEQ_REGEXP TYPE="LITERAL1" HASH_CHARS="123456789" AT_WORD_START="TRUE">[1-9][0-9]*</SEQ_REGEXP>
-    <KEYWORDS>
-      <!-- required -->
-      <KEYWORD4>author</KEYWORD4>
-      <KEYWORD4>institution</KEYWORD4>
-      <KEYWORD4>title</KEYWORD4>
-      <KEYWORD4>year</KEYWORD4>
-      <!-- optional -->
-      <KEYWORD3>address</KEYWORD3>
-      <KEYWORD3>month</KEYWORD3>
-      <KEYWORD3>note</KEYWORD3>
-      <KEYWORD3>number</KEYWORD3>
-      <KEYWORD3>type</KEYWORD3>
-      <!-- others -->
-      <KEYWORD2>annote</KEYWORD2>
-      <KEYWORD2>booktitle</KEYWORD2>
-      <KEYWORD2>chapter</KEYWORD2>
-      <KEYWORD2>crossref</KEYWORD2>
-      <KEYWORD2>edition</KEYWORD2>
-      <KEYWORD2>editor</KEYWORD2>
-      <KEYWORD2>howpublished</KEYWORD2>
-      <KEYWORD2>journal</KEYWORD2>
-      <KEYWORD2>key</KEYWORD2>
-      <KEYWORD2>organization</KEYWORD2>
-      <KEYWORD2>pages</KEYWORD2>
-      <KEYWORD2>publisher</KEYWORD2>
-      <KEYWORD2>school</KEYWORD2>
-      <KEYWORD2>series</KEYWORD2>
-      <KEYWORD2>volume</KEYWORD2>
-      <!-- not in Lamport but widely accepted -->
-      <KEYWORD1>abstract</KEYWORD1>
-      <KEYWORD1>annotation</KEYWORD1>
-      <KEYWORD1>day</KEYWORD1>
-      <KEYWORD1>keywords</KEYWORD1>
-      <KEYWORD1>lccn</KEYWORD1>
-      <KEYWORD1>location</KEYWORD1>
-      <KEYWORD1>references</KEYWORD1>
-      <KEYWORD1>url</KEYWORD1>
-      <!-- total: 32 fields -->
-      <LITERAL1>jan</LITERAL1>
-      <LITERAL1>feb</LITERAL1>
-      <LITERAL1>mar</LITERAL1>
-      <LITERAL1>apr</LITERAL1>
-      <LITERAL1>may</LITERAL1>
-      <LITERAL1>jun</LITERAL1>
-      <LITERAL1>jul</LITERAL1>
-      <LITERAL1>aug</LITERAL1>
-      <LITERAL1>sep</LITERAL1>
-      <LITERAL1>oct</LITERAL1>
-      <LITERAL1>nov</LITERAL1>
-      <LITERAL1>dec</LITERAL1>
-    </KEYWORDS>
-  </RULES>
-
-
-<RULES SET="unpublished">
-    <SPAN TYPE="LITERAL1" DELEGATE="textquoted" NO_LINE_BREAK="FALSE"><BEGIN>"</BEGIN><END>"</END></SPAN>
-    <SPAN TYPE="LITERAL2" DELEGATE="textbraced" NO_LINE_BREAK="FALSE"><BEGIN>{</BEGIN><END>}</END></SPAN>
-    <SEQ TYPE="OPERATOR">=</SEQ>
-    <SEQ TYPE="OPERATOR">,</SEQ>
-    <SEQ_REGEXP TYPE="LITERAL1" HASH_CHARS="123456789" AT_WORD_START="TRUE">[1-9][0-9]*</SEQ_REGEXP>
-    <KEYWORDS>
-      <!-- required -->
-      <KEYWORD4>author</KEYWORD4>
-      <KEYWORD4>note</KEYWORD4>
-      <KEYWORD4>title</KEYWORD4>
-      <!-- optional -->
-      <KEYWORD3>month</KEYWORD3>
-      <KEYWORD3>year</KEYWORD3>
-      <!-- others -->
-      <KEYWORD2>address</KEYWORD2>
-      <KEYWORD2>annote</KEYWORD2>
-      <KEYWORD2>booktitle</KEYWORD2>
-      <KEYWORD2>chapter</KEYWORD2>
-      <KEYWORD2>crossref</KEYWORD2>
-      <KEYWORD2>edition</KEYWORD2>
-      <KEYWORD2>editor</KEYWORD2>
-      <KEYWORD2>howpublished</KEYWORD2>
-      <KEYWORD2>institution</KEYWORD2>
-      <KEYWORD2>journal</KEYWORD2>
-      <KEYWORD2>key</KEYWORD2>
-      <KEYWORD2>number</KEYWORD2>
-      <KEYWORD2>organization</KEYWORD2>
-      <KEYWORD2>pages</KEYWORD2>
-      <KEYWORD2>publisher</KEYWORD2>
-      <KEYWORD2>school</KEYWORD2>
-      <KEYWORD2>series</KEYWORD2>
-      <KEYWORD2>type</KEYWORD2>
-      <KEYWORD2>volume</KEYWORD2>
-      <!-- not in Lamport but widely accepted -->
-      <KEYWORD1>abstract</KEYWORD1>
-      <KEYWORD1>annotation</KEYWORD1>
-      <KEYWORD1>day</KEYWORD1>
-      <KEYWORD1>keywords</KEYWORD1>
-      <KEYWORD1>lccn</KEYWORD1>
-      <KEYWORD1>location</KEYWORD1>
-      <KEYWORD1>references</KEYWORD1>
-      <KEYWORD1>url</KEYWORD1>
-      <!-- total: 32 fields -->
-      <LITERAL1>jan</LITERAL1>
-      <LITERAL1>feb</LITERAL1>
-      <LITERAL1>mar</LITERAL1>
-      <LITERAL1>apr</LITERAL1>
-      <LITERAL1>may</LITERAL1>
-      <LITERAL1>jun</LITERAL1>
-      <LITERAL1>jul</LITERAL1>
-      <LITERAL1>aug</LITERAL1>
-      <LITERAL1>sep</LITERAL1>
-      <LITERAL1>oct</LITERAL1>
-      <LITERAL1>nov</LITERAL1>
-      <LITERAL1>dec</LITERAL1>
-    </KEYWORDS>
-  </RULES>
-
-
-  <RULES SET="textbraced" DEFAULT="LITERAL2">
-    <SPAN TYPE="LITERAL3" NO_LINE_BREAK="FALSE"><BEGIN>\{</BEGIN><END>\}</END></SPAN>
-    <SPAN TYPE="LITERAL2" DELEGATE="textbraced" NO_LINE_BREAK="FALSE"><BEGIN>{</BEGIN><END>}</END></SPAN>
-    <SPAN TYPE="LITERAL1" DELEGATE="textquoted" NO_LINE_BREAK="FALSE"><BEGIN>"</BEGIN><END>"</END></SPAN>
-    <SEQ  TYPE="LITERAL3">\"</SEQ>
-  </RULES>
-
-  <RULES SET="textquoted" DEFAULT="LITERAL1">
-    <SPAN TYPE="LITERAL3" NO_LINE_BREAK="FALSE"><BEGIN>\{</BEGIN><END>\}</END></SPAN>
-    <SPAN TYPE="LITERAL2" DELEGATE="textbraced" NO_LINE_BREAK="FALSE"><BEGIN>{</BEGIN><END>}</END></SPAN>
-    <SEQ  TYPE="LITERAL3">\"</SEQ>
-  </RULES>
-
-  <RULES SET="string" DEFAULT="LITERAL1">
-    <SPAN TYPE="LITERAL1" DELEGATE="textquoted" NO_LINE_BREAK="FALSE"><BEGIN>"</BEGIN><END>"</END></SPAN>
-    <SPAN TYPE="LITERAL2" DELEGATE="textbraced" NO_LINE_BREAK="FALSE"><BEGIN>{</BEGIN><END>}</END></SPAN>
-    <SPAN TYPE="LITERAL3" NO_LINE_BREAK="FALSE"><BEGIN>\{</BEGIN><END>\}</END></SPAN>
-    <SEQ TYPE="OPERATOR">=</SEQ>
-    <SEQ TYPE="OPERATOR">,</SEQ>
-    <SEQ TYPE="LITERAL3">\"</SEQ>
-  </RULES>
-
-</MODE>
-
diff --git a/qpython/src/main/assets/syntax/binsource_agc.xml b/qpython/src/main/assets/syntax/binsource_agc.xml
deleted file mode 100644
index 4ee07882..00000000
--- a/qpython/src/main/assets/syntax/binsource_agc.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!-- Apollo Guidance Computer (AGC) executable binary source mode by Jim Lawton (jim DOT lawton AT gmail DOT com). -->
-
-<MODE>
-
-    <PROPS>
-        <PROPERTY NAME="lineComment" VALUE=";" />
-    </PROPS>
-
-    <RULES HIGHLIGHT_DIGITS="TRUE" IGNORE_CASE="TRUE">
-        <!-- Comments -->
-        <EOL_SPAN TYPE="COMMENT2">;</EOL_SPAN>
-
-        <!-- Octal numbers (default). -->
-        <SEQ_REGEXP HASH_CHARS="+-01234567" AT_WORD_START="TRUE" TYPE="DIGIT">[+-]*[0-7]+[ \t]</SEQ_REGEXP>
-        <SEQ_REGEXP HASH_CHARS="+-01234567" AT_WORD_START="TRUE" TYPE="DIGIT">[+-]*[0-7]+$</SEQ_REGEXP>
-        <SEQ_REGEXP HASH_CHARS="+-01234567" AT_WORD_START="TRUE" TYPE="DIGIT">[+-]*[0-7]+[,$]</SEQ_REGEXP>
-
-        <KEYWORDS>
-            <!-- Directives -->
-            <FUNCTION>BANK</FUNCTION>
-        </KEYWORDS>
-    </RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/c.xml b/qpython/src/main/assets/syntax/c.xml
deleted file mode 100644
index c003efab..00000000
--- a/qpython/src/main/assets/syntax/c.xml
+++ /dev/null
@@ -1,409 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!-- This is based on ISO C++ Standard, 2003 and ISO C Standard, 1999.
-     The C++ keywords have been removed from this mode file, though. -->
-<MODE>
-    <PROPS>
-        <PROPERTY NAME="commentStart" VALUE="/*" />
-        <PROPERTY NAME="commentEnd" VALUE="*/" />
-        <PROPERTY NAME="lineComment" VALUE="//" />
-        <PROPERTY NAME="wordBreakChars" VALUE=",+-=&lt;&gt;/?^&amp;*" />
-
-        <!-- Auto indent -->
-        <PROPERTY NAME="indentOpenBrackets" VALUE="{" />
-        <PROPERTY NAME="indentCloseBrackets" VALUE="}" />
-        <PROPERTY NAME="unalignedOpenBrackets" VALUE="(" />
-        <PROPERTY NAME="unalignedCloseBrackets" VALUE=")" />
-        <PROPERTY NAME="indentNextLine"
-            VALUE="(?!^\s*(#|//)).*(\b(if|while|for)\s*\(.*\)|\b(else|do)\b)[^{;]*$" />
-        <PROPERTY NAME="unindentThisLine"
-            VALUE="^\s*((case\b.*|[\p{Alpha}_][\p{Alnum}_]*)\s*:(?!:)).*$" />
-        <PROPERTY NAME="electricKeys" VALUE=":" />
-    </PROPS>
-
-    <RULES
-        IGNORE_CASE="FALSE"
-        HIGHLIGHT_DIGITS="TRUE" DIGIT_RE="[0-9][0-9a-zA-Z]*">
-        <EOL_SPAN TYPE="KEYWORD2" AT_WHITESPACE_END="TRUE" DELEGATE="CPP">#</EOL_SPAN>
-
-        <IMPORT DELEGATE="LEX"/>
-        <IMPORT DELEGATE="CORE"/>
-    </RULES>
-
-    <RULES SET="LEX" IGNORE_CASE="FALSE">
-		<IMPORT DELEGATE="COMMENTS" />
-		<IMPORT DELEGATE="C_LEXER" />
-	</RULES>
-
-    <!-- Comments, Trigraph, Alternate-Tokens -->
-    <RULES SET="C_LEXER"
-        IGNORE_CASE="FALSE"
-        HIGHLIGHT_DIGITS="TRUE" DIGIT_RE="[0-9][0-9a-zA-Z]*">
-
-        <SPAN TYPE="LITERAL1" NO_LINE_BREAK="TRUE" ESCAPE="\">
-            <BEGIN>L"</BEGIN>
-            <END>"</END>
-        </SPAN>
-        <SPAN TYPE="LITERAL1" NO_LINE_BREAK="TRUE" ESCAPE="\">
-            <BEGIN>"</BEGIN>
-            <END>"</END>
-        </SPAN>
-        <SPAN TYPE="LITERAL1" NO_LINE_BREAK="TRUE" ESCAPE="\">
-            <BEGIN>L'</BEGIN>
-            <END>'</END>
-        </SPAN>
-        <SPAN TYPE="LITERAL1" NO_LINE_BREAK="TRUE" ESCAPE="\">
-            <BEGIN>'</BEGIN>
-            <END>'</END>
-        </SPAN>
-
-        <!-- Trigraphs -->
-        <SEQ TYPE="LITERAL4">??(</SEQ>
-        <SEQ TYPE="LITERAL4">??/</SEQ>
-        <SEQ TYPE="LITERAL4">??)</SEQ>
-        <SEQ TYPE="LITERAL4">??'</SEQ>
-        <SEQ TYPE="LITERAL4">??&lt;</SEQ>
-        <SEQ TYPE="LITERAL4">??!</SEQ>
-        <SEQ TYPE="LITERAL4">??&gt;</SEQ>
-        <SEQ TYPE="LITERAL4">??-</SEQ>
-        <SEQ TYPE="LITERAL4">??=</SEQ>
-
-        <!-- Alternate tokens -->
-        <SEQ TYPE="LITERAL4">&lt;:</SEQ>
-        <SEQ TYPE="LITERAL4">:&gt;</SEQ>
-        <SEQ TYPE="LITERAL4">&lt;%</SEQ>
-        <SEQ TYPE="LITERAL4">%&gt;</SEQ>
-        <SEQ TYPE="LITERAL4">%:</SEQ>
-
-        <!-- Labels.
-            This is a part of core language syntax, but must be here
-            because it can't work after SEQ for ':'. -->
-        <MARK_PREVIOUS AT_WHITESPACE_END="TRUE"
-            MATCH_TYPE="OPERATOR"
-            TYPE="LABEL">:</MARK_PREVIOUS>
-
-        <!-- Function-like macro or function calls.
-            This can't work after SEQ for '('. -->
-        <MARK_PREVIOUS
-            TYPE="FUNCTION"
-            MATCH_TYPE="OPERATOR">(</MARK_PREVIOUS>
-
-        <SEQ TYPE="OPERATOR">=</SEQ>
-        <SEQ TYPE="OPERATOR">!</SEQ>
-        <SEQ TYPE="OPERATOR">+</SEQ>
-        <SEQ TYPE="OPERATOR">-</SEQ>
-        <SEQ TYPE="OPERATOR">/</SEQ>
-        <SEQ TYPE="OPERATOR">*</SEQ>
-        <SEQ TYPE="OPERATOR">&gt;</SEQ>
-        <SEQ TYPE="OPERATOR">&lt;</SEQ>
-        <SEQ TYPE="OPERATOR">%</SEQ>
-        <SEQ TYPE="OPERATOR">&amp;</SEQ>
-        <SEQ TYPE="OPERATOR">|</SEQ>
-        <SEQ TYPE="OPERATOR">^</SEQ>
-        <SEQ TYPE="OPERATOR">~</SEQ>
-        <SEQ TYPE="OPERATOR">?</SEQ>
-        <SEQ TYPE="OPERATOR">:</SEQ>
-        <SEQ TYPE="OPERATOR">.</SEQ>
-        <SEQ TYPE="OPERATOR">,</SEQ>
-        <SEQ TYPE="OPERATOR">[</SEQ>
-        <SEQ TYPE="OPERATOR">]</SEQ>
-        <SEQ TYPE="OPERATOR">)</SEQ>
-        <SEQ TYPE="OPERATOR">}</SEQ>
-        <SEQ TYPE="OPERATOR">{</SEQ>
-        <SEQ TYPE="OPERATOR">;</SEQ>
-
-        <KEYWORDS>
-            <!-- Predefined macro names from ISO C++ Standard 2003 -->
-            <LITERAL2>__DATE__</LITERAL2>
-            <LITERAL2>__FILE__</LITERAL2>
-            <LITERAL2>__LINE__</LITERAL2>
-            <LITERAL2>__STDC_HOSTED__</LITERAL2>
-            <LITERAL2>__STDC_ISO_10646__</LITERAL2>
-            <LITERAL2>__STDC_VERSION__</LITERAL2>
-            <LITERAL2>__STDC__</LITERAL2>
-            <LITERAL2>__TIME__</LITERAL2>
-            <LITERAL2>__cplusplus</LITERAL2>
-            <!-- Standard library macro names from ISO C++ Standard 2003 -->
-            <!-- Hilight these to indicate accidental use of them
-                in user source. They may be valid, but should cause
-                future conflicts. -->
-            <LITERAL2>BUFSIZ</LITERAL2>
-            <LITERAL2>CLOCKS_PER_SEC</LITERAL2>
-            <LITERAL2>EDOM</LITERAL2>
-            <LITERAL2>EILSEQ</LITERAL2>
-            <LITERAL2>EOF</LITERAL2>
-            <LITERAL2>ERANGE</LITERAL2>
-            <LITERAL2>EXIT_FAILURE</LITERAL2>
-            <LITERAL2>EXIT_SUCCESS</LITERAL2>
-            <LITERAL2>FILENAME_MAX</LITERAL2>
-            <LITERAL2>FOPEN_MAX</LITERAL2>
-            <LITERAL2>HUGE_VAL</LITERAL2>
-            <LITERAL2>LC_ALL</LITERAL2>
-            <LITERAL2>LC_COLLATE</LITERAL2>
-            <LITERAL2>LC_CTYPE</LITERAL2>
-            <LITERAL2>LC_MONETARY</LITERAL2>
-            <LITERAL2>LC_NUMERIC</LITERAL2>
-            <LITERAL2>LC_TIME</LITERAL2>
-            <LITERAL2>L_tmpnam</LITERAL2>
-            <LITERAL2>MB_CUR_MAX</LITERAL2>
-            <LITERAL2>NULL</LITERAL2>
-            <LITERAL2>RAND_MAX</LITERAL2>
-            <LITERAL2>SEEK_CUR</LITERAL2>
-            <LITERAL2>SEEK_END</LITERAL2>
-            <LITERAL2>SEEK_SET</LITERAL2>
-            <LITERAL2>SIGABRT</LITERAL2>
-            <LITERAL2>SIGFPE</LITERAL2>
-            <LITERAL2>SIGILL</LITERAL2>
-            <LITERAL2>SIGINT</LITERAL2>
-            <LITERAL2>SIGSEGV</LITERAL2>
-            <LITERAL2>SIGTERM</LITERAL2>
-            <LITERAL2>SIG_DFL</LITERAL2>
-            <LITERAL2>SIG_ERR</LITERAL2>
-            <LITERAL2>SIG_IGN</LITERAL2>
-            <LITERAL2>TMP_MAX</LITERAL2>
-            <LITERAL2>WCHAR_MAX</LITERAL2>
-            <LITERAL2>WCHAR_MIN</LITERAL2>
-            <LITERAL2>WEOF</LITERAL2>
-            <LITERAL2>_IOFBF</LITERAL2>
-            <LITERAL2>_IOLBF</LITERAL2>
-            <LITERAL2>_IONBF</LITERAL2>
-            <LITERAL2>assert</LITERAL2>
-            <LITERAL2>errno</LITERAL2>
-            <LITERAL2>offsetof</LITERAL2>
-            <LITERAL2>setjmp</LITERAL2>
-            <LITERAL2>stderr</LITERAL2>
-            <LITERAL2>stdin</LITERAL2>
-            <LITERAL2>stdout</LITERAL2>
-            <LITERAL2>va_arg</LITERAL2>
-            <LITERAL2>va_end</LITERAL2>
-            <LITERAL2>va_start</LITERAL2>
-            <!-- Standard C library values from ISO C++ Standard 2003 -->
-            <!-- These are not explicitly defined as macro. But they like
-                to be due to compatibility with C library implementation.
-                So, treat them like standard library macro names. -->
-            <LITERAL2>CHAR_BIT</LITERAL2>
-            <LITERAL2>CHAR_MAX</LITERAL2>
-            <LITERAL2>CHAR_MIN</LITERAL2>
-            <LITERAL2>DBL_DIG</LITERAL2>
-            <LITERAL2>DBL_EPSILON</LITERAL2>
-            <LITERAL2>DBL_MANT_DIG</LITERAL2>
-            <LITERAL2>DBL_MAX</LITERAL2>
-            <LITERAL2>DBL_MAX_10_EXP</LITERAL2>
-            <LITERAL2>DBL_MAX_EXP</LITERAL2>
-            <LITERAL2>DBL_MIN</LITERAL2>
-            <LITERAL2>DBL_MIN_10_EXP</LITERAL2>
-            <LITERAL2>DBL_MIN_EXP</LITERAL2>
-            <LITERAL2>FLT_DIG</LITERAL2>
-            <LITERAL2>FLT_EPSILON</LITERAL2>
-            <LITERAL2>FLT_MANT_DIG</LITERAL2>
-            <LITERAL2>FLT_MAX</LITERAL2>
-            <LITERAL2>FLT_MAX_10_EXP</LITERAL2>
-            <LITERAL2>FLT_MAX_EXP</LITERAL2>
-            <LITERAL2>FLT_MIN</LITERAL2>
-            <LITERAL2>FLT_MIN_10_EXP</LITERAL2>
-            <LITERAL2>FLT_MIN_EXP</LITERAL2>
-            <LITERAL2>FLT_RADIX</LITERAL2>
-            <LITERAL2>FLT_ROUNDS</LITERAL2>
-            <LITERAL2>INT_MAX</LITERAL2>
-            <LITERAL2>INT_MIN</LITERAL2>
-            <LITERAL2>LDBL_DIG</LITERAL2>
-            <LITERAL2>LDBL_EPSILON</LITERAL2>
-            <LITERAL2>LDBL_MANT_DIG</LITERAL2>
-            <LITERAL2>LDBL_MAX</LITERAL2>
-            <LITERAL2>LDBL_MAX_10_EXP</LITERAL2>
-            <LITERAL2>LDBL_MAX_EXP</LITERAL2>
-            <LITERAL2>LDBL_MIN</LITERAL2>
-            <LITERAL2>LDBL_MIN_10_EXP</LITERAL2>
-            <LITERAL2>LDBL_MIN_EXP</LITERAL2>
-            <LITERAL2>LONG_MAX</LITERAL2>
-            <LITERAL2>LONG_MIN</LITERAL2>
-            <LITERAL2>MB_LEN_MAX</LITERAL2>
-            <LITERAL2>SCHAR_MAX</LITERAL2>
-            <LITERAL2>SCHAR_MIN</LITERAL2>
-            <LITERAL2>SHRT_MAX</LITERAL2>
-            <LITERAL2>SHRT_MIN</LITERAL2>
-            <LITERAL2>UCHAR_MAX</LITERAL2>
-            <LITERAL2>UINT_MAX</LITERAL2>
-            <LITERAL2>ULONG_MAX</LITERAL2>
-            <LITERAL2>USRT_MAX</LITERAL2>
-            <!-- Alternative representations of some operators
-                from ISO C++ Standard 2003 -->
-            <!-- These are separated from CORE because they are
-                available in the constant expressions after
-                #if and #elif preprocessor directives. -->
-            <KEYWORD3>and</KEYWORD3>
-            <KEYWORD3>and_eq</KEYWORD3>
-            <KEYWORD3>bitand</KEYWORD3>
-            <KEYWORD3>bitor</KEYWORD3>
-            <KEYWORD3>compl</KEYWORD3>
-            <KEYWORD3>not</KEYWORD3>
-            <KEYWORD3>not_eq</KEYWORD3>
-            <KEYWORD3>or</KEYWORD3>
-            <KEYWORD3>or_eq</KEYWORD3>
-            <KEYWORD3>xor</KEYWORD3>
-            <KEYWORD3>xor_eq</KEYWORD3>
-        </KEYWORDS>
-    </RULES>
-
-    <!-- Core language -->
-    <RULES SET="CORE"
-        IGNORE_CASE="FALSE"
-        HIGHLIGHT_DIGITS="TRUE" DIGIT_RE="[0-9][0-9a-zA-Z]*">
-        <KEYWORDS>
-            <!-- Types -->
-            <KEYWORD3>bool</KEYWORD3>
-            <KEYWORD3>char</KEYWORD3>
-            <KEYWORD3>double</KEYWORD3>
-            <KEYWORD3>enum</KEYWORD3>
-            <KEYWORD3>float</KEYWORD3>
-            <KEYWORD3>int</KEYWORD3>
-            <KEYWORD3>long</KEYWORD3>
-            <KEYWORD3>short</KEYWORD3>
-            <KEYWORD3>signed</KEYWORD3>
-            <KEYWORD3>struct</KEYWORD3>
-            <KEYWORD3>union</KEYWORD3>
-            <KEYWORD3>unsigned</KEYWORD3>
-            <!-- Keywords from ISO C++ Standard 2003 -->
-            <KEYWORD2>asm</KEYWORD2>
-            <KEYWORD1>auto</KEYWORD1>
-            <KEYWORD1>break</KEYWORD1>
-            <KEYWORD1>case</KEYWORD1>
-            <KEYWORD1>const</KEYWORD1>
-            <KEYWORD1>continue</KEYWORD1>
-            <KEYWORD1>default</KEYWORD1>
-            <KEYWORD1>do</KEYWORD1>
-            <KEYWORD1>else</KEYWORD1>
-            <KEYWORD2>extern</KEYWORD2>
-            <LITERAL2>false</LITERAL2>
-            <KEYWORD1>for</KEYWORD1>
-            <KEYWORD1>goto</KEYWORD1>
-            <KEYWORD1>if</KEYWORD1>
-            <KEYWORD1>inline</KEYWORD1>
-            <KEYWORD1>register</KEYWORD1>
-            <KEYWORD1>return</KEYWORD1>
-            <KEYWORD1>sizeof</KEYWORD1>
-            <KEYWORD1>static</KEYWORD1>
-            <KEYWORD1>switch</KEYWORD1>
-            <LITERAL2>true</LITERAL2>
-            <KEYWORD3>typedef</KEYWORD3>
-            <KEYWORD1>void</KEYWORD1>
-            <KEYWORD1>volatile</KEYWORD1>
-            <KEYWORD1>while</KEYWORD1>
-            <!-- Additional keywords from ISO C Standard(C99) -->
-            <KEYWORD3>restrict</KEYWORD3>
-            <KEYWORD3>_Bool</KEYWORD3>
-            <KEYWORD3>_Complex</KEYWORD3>
-            <KEYWORD3>_Pragma</KEYWORD3>
-            <KEYWORD3>_Imaginary</KEYWORD3>
-        </KEYWORDS>
-    </RULES>
-
-	<!-- Different comment styles. -->
-	<RULES SET="COMMENTS">
-        <!-- Doxygen comment, Javadoc style -->
-        <SEQ TYPE="COMMENT1">/**/</SEQ>
-        <SPAN TYPE="COMMENT3" DELEGATE="doxygen::DOXYGEN">
-            <BEGIN>/**&lt;</BEGIN>
-            <END>*/</END>
-        </SPAN>
-        <SPAN TYPE="COMMENT3" DELEGATE="doxygen::DOXYGEN">
-            <BEGIN>/**</BEGIN>
-            <END>*/</END>
-        </SPAN>
-        <EOL_SPAN TYPE="COMMENT3" DELEGATE="doxygen::DOXYGEN">///&lt;</EOL_SPAN>
-        <EOL_SPAN TYPE="COMMENT3" DELEGATE="doxygen::DOXYGEN">///</EOL_SPAN>
-
-        <!-- Doxygen comment, Qt style -->
-        <SPAN TYPE="COMMENT3" DELEGATE="doxygen::DOXYGEN">
-            <BEGIN>/*!&lt;</BEGIN>
-            <END>*/</END>
-        </SPAN>
-        <SPAN TYPE="COMMENT3" DELEGATE="doxygen::DOXYGEN">
-            <BEGIN>/*!</BEGIN>
-            <END>*/</END>
-        </SPAN>
-        <EOL_SPAN TYPE="COMMENT3" DELEGATE="doxygen::DOXYGEN">//!&lt;</EOL_SPAN>
-        <EOL_SPAN TYPE="COMMENT3" DELEGATE="doxygen::DOXYGEN">//!</EOL_SPAN>
-
-        <!-- C style comment -->
-        <SPAN TYPE="COMMENT1">
-            <BEGIN>/*</BEGIN>
-            <END>*/</END>
-        </SPAN>
-        <EOL_SPAN TYPE="COMMENT1">//</EOL_SPAN>
-	</RULES>
-
-    <!-- Preprocessor specific rules -->
-    <RULES SET="CPP"
-        IGNORE_CASE="FALSE"
-        HIGHLIGHT_DIGITS="TRUE" DIGIT_RE="[0-9][0-9a-zA-Z]*">
-
-        <EOL_SPAN_REGEXP HASH_CHAR="include" TYPE="MARKUP" DELEGATE="INCLUDE">include\b</EOL_SPAN_REGEXP>
-        <EOL_SPAN_REGEXP HASH_CHAR="define" TYPE="MARKUP" DELEGATE="DEFINE">define\b</EOL_SPAN_REGEXP>
-        <EOL_SPAN_REGEXP HASH_CHAR="endif" TYPE="MARKUP" DELEGATE="LEX">endif\b</EOL_SPAN_REGEXP>
-        <EOL_SPAN_REGEXP HASH_CHAR="elif" TYPE="MARKUP" DELEGATE="CONDITION">elif\b</EOL_SPAN_REGEXP>
-        <EOL_SPAN_REGEXP HASH_CHAR="if" TYPE="MARKUP" DELEGATE="CONDITION">if\b</EOL_SPAN_REGEXP>
-
-        <IMPORT DELEGATE="LEX"/>
-
-        <!-- Directives -->
-        <KEYWORDS>
-            <MARKUP>ifdef</MARKUP>
-            <MARKUP>ifndef</MARKUP>
-            <MARKUP>else</MARKUP>
-            <MARKUP>error</MARKUP>
-            <MARKUP>line</MARKUP>
-            <MARKUP>pragma</MARKUP>
-            <MARKUP>undef</MARKUP>
-            <MARKUP>warning</MARKUP>
-        </KEYWORDS>
-    </RULES>
-
-    <!-- After #include directive -->
-    <!-- "\"s are not escaped. -->
-    <RULES SET="INCLUDE"
-        IGNORE_CASE="FALSE"
-        HIGHLIGHT_DIGITS="TRUE" DIGIT_RE="[0-9][0-9a-zA-Z]*">
-        <SPAN TYPE="LITERAL1" NO_LINE_BREAK="TRUE">
-            <BEGIN>&lt;</BEGIN>
-            <END>&gt;</END>
-        </SPAN>
-        <SPAN TYPE="LITERAL1" NO_LINE_BREAK="TRUE">
-            <BEGIN>"</BEGIN>
-            <END>"</END>
-        </SPAN>
-        <IMPORT DELEGATE="LEX"/>
-    </RULES>
-
-    <!-- After #define directive -->
-    <!-- Almost same as the normal code,
-        except two additional operators # and ##. -->
-    <RULES SET="DEFINE"
-        IGNORE_CASE="FALSE"
-        HIGHLIGHT_DIGITS="TRUE" DIGIT_RE="[0-9][0-9a-zA-Z]*">
-        <SEQ TYPE="OPERATOR">#</SEQ>
-        <IMPORT DELEGATE="LEX"/>
-        <IMPORT DELEGATE="CORE"/>
-    </RULES>
-
-    <!-- After #if or #elif directive -->
-    <!-- All constant expressions and a special operator
-        'defined' is available. But the core language elements
-        (such as operator 'sizeof', type casting, etc...) are not. -->
-    <RULES SET="CONDITION"
-        IGNORE_CASE="FALSE"
-        HIGHLIGHT_DIGITS="TRUE" DIGIT_RE="[0-9][0-9a-zA-Z]*">
-        <IMPORT DELEGATE="LEX"/>
-        <KEYWORDS>
-            <KEYWORD2>defined</KEYWORD2>
-            <!-- Both true and false are specially permitted by
-                ISO C++ Standard 2003 16.1p4 -->
-            <KEYWORD2>true</KEYWORD2>
-            <KEYWORD2>false</KEYWORD2>
-        </KEYWORDS>
-    </RULES>
-
-</MODE>
-
diff --git a/qpython/src/main/assets/syntax/cfscript.xml b/qpython/src/main/assets/syntax/cfscript.xml
deleted file mode 100644
index 47bc7368..00000000
--- a/qpython/src/main/assets/syntax/cfscript.xml
+++ /dev/null
@@ -1,693 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="commentStart" VALUE="/*" />
-		<PROPERTY NAME="commentEnd" VALUE="*/" />
-		<PROPERTY NAME="lineComment" VALUE="//" />
-		<PROPERTY NAME="wordBreakChars" VALUE=",+-=&lt;&gt;/?^&amp;*" />
-		
-		<!-- Auto indent -->
-		<PROPERTY NAME="indentOpenBrackets" VALUE="{[" />
-		<PROPERTY NAME="indentCloseBrackets" VALUE="]}" />
-		<PROPERTY NAME="unalignedOpenBrackets" VALUE="(" />
-		<PROPERTY NAME="unalignedCloseBrackets" VALUE=")" />
-		<PROPERTY NAME="indentNextLine"
-			VALUE="\s*(((if|while)\s*\(|else\s*|else\s+if\s*\(|for\s*\(.*\))[^{;]*)" />
-		<PROPERTY NAME="unindentThisLine"
-			VALUE="^.*(default:\s*|case.*:.*)$" />
-		<PROPERTY NAME="electricKeys" VALUE=":" />
-	</PROPS>
-	<RULES IGNORE_CASE="TRUE" HIGHLIGHT_DIGITS="TRUE" DIGIT_RE="(0x[\p{XDigit}]+[lL]?|[\p{Digit}]+(e[\p{Digit}]*)?[lLdDfF]?)">
-		<SPAN TYPE="COMMENT3" DELEGATE="CFDOC">
-			<BEGIN>/**</BEGIN>
-			<END>*/</END>
-		</SPAN>
-		<SPAN TYPE="COMMENT1">
-			<BEGIN>/*</BEGIN>
-			<END>*/</END>
-		</SPAN>
-		<EOL_SPAN TYPE="COMMENT2">//</EOL_SPAN>
-		
-		
-		<SPAN TYPE="LITERAL1" NO_LINE_BREAK="TRUE" ESCAPE="\">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-
-		<SPAN TYPE="LITERAL1" NO_LINE_BREAK="TRUE" ESCAPE="\">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-		
-		<MARK_PREVIOUS TYPE="FUNCTION" MATCH_TYPE="OPERATOR">(</MARK_PREVIOUS>
-		<SEQ TYPE="OPERATOR">)</SEQ>
-		
-		<SEQ TYPE="OPERATOR">=</SEQ>
-		<SEQ TYPE="OPERATOR">!</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;=</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;=</SEQ>
-		<SEQ TYPE="OPERATOR">+</SEQ>
-		<SEQ TYPE="OPERATOR">-</SEQ>
-		<SEQ TYPE="OPERATOR">/</SEQ>
-		<SEQ TYPE="OPERATOR">*</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;</SEQ>
-		<SEQ TYPE="OPERATOR">%</SEQ>
-		<SEQ TYPE="OPERATOR">&amp;</SEQ>
-		<SEQ TYPE="OPERATOR">|</SEQ>
-		<SEQ TYPE="OPERATOR">^</SEQ>
-		<SEQ TYPE="OPERATOR">~</SEQ>
-		<SEQ TYPE="OPERATOR">.</SEQ>
-		<SEQ TYPE="OPERATOR">}</SEQ>
-		<SEQ TYPE="OPERATOR">{</SEQ>
-		<SEQ TYPE="OPERATOR">,</SEQ>
-		<SEQ TYPE="OPERATOR">;</SEQ>
-		<SEQ TYPE="OPERATOR">]</SEQ>
-		<SEQ TYPE="OPERATOR">[</SEQ>
-		<SEQ TYPE="OPERATOR">?</SEQ>
-		<MARK_PREVIOUS AT_WHITESPACE_END="TRUE"
-			MATCH_TYPE="OPERATOR"
-			TYPE="LABEL">:</MARK_PREVIOUS>
-		<SEQ TYPE="OPERATOR">:</SEQ>
-		
-		<KEYWORDS>
-			<!-- common keywords -->
-			<KEYWORD1>break</KEYWORD1>
-			<KEYWORD1>case</KEYWORD1>
-			<KEYWORD1>catch</KEYWORD1>
-			<KEYWORD1>continue</KEYWORD1>
-			<KEYWORD1>delete</KEYWORD1>
-			<KEYWORD1>do</KEYWORD1>
-			<KEYWORD1>else</KEYWORD1>
-			<KEYWORD1>exit</KEYWORD1>
-			<KEYWORD1>finally</KEYWORD1>
-			<KEYWORD1>for</KEYWORD1>
-			<KEYWORD1>function</KEYWORD1>
-			<KEYWORD1>if</KEYWORD1>
-			<KEYWORD1>in</KEYWORD1>
-			<KEYWORD1>new</KEYWORD1>
-			<KEYWORD1>pageencoding</KEYWORD1>
-			<KEYWORD1>rethrow</KEYWORD1>
-			<KEYWORD1>return</KEYWORD1>
-			<KEYWORD1>savecontent</KEYWORD1>
-			<KEYWORD1>switch</KEYWORD1>
-			<KEYWORD1>thread</KEYWORD1>
-			<KEYWORD1>throw</KEYWORD1>
-			<KEYWORD1>transaction</KEYWORD1>
-			<KEYWORD1>try</KEYWORD1>
-			<KEYWORD1>typeof</KEYWORD1>
-			<KEYWORD1>var</KEYWORD1>
-			<KEYWORD1>while</KEYWORD1>
-			<KEYWORD1>with</KEYWORD1>
-			
-			<!-- context literals -->
-			<LITERAL2>this</LITERAL2>
-			<LITERAL2>super</LITERAL2>
-			
-			<!-- value literals -->
-			<LITERAL2>false</LITERAL2>
-			<LITERAL2>true</LITERAL2>
-			<LITERAL2>yes</LITERAL2>
-			<LITERAL2>no</LITERAL2>
-			
-			<!-- CF Types -->
-			<KEYWORD3>boolean</KEYWORD3>
-			<KEYWORD3>struct</KEYWORD3>
-			<KEYWORD3>string</KEYWORD3>
-			<KEYWORD3>numeric</KEYWORD3>
-			<KEYWORD3>array</KEYWORD3>
-			<KEYWORD3>any</KEYWORD3>
-			<KEYWORD3>query</KEYWORD3>
-			<KEYWORD3>mail</KEYWORD3>
-			<KEYWORD3>void</KEYWORD3>
-			
-			<!-- component related -->
-			<KEYWORD3>component</KEYWORD3>
-			<KEYWORD1>implements</KEYWORD1>
-			<KEYWORD1>interface</KEYWORD1>
-			<KEYWORD1>extends</KEYWORD1>
-			<KEYWORD1>include</KEYWORD1>
-			<KEYWORD1>import</KEYWORD1>
-			
-			<!-- access types -->
-			<KEYWORD1>private</KEYWORD1>
-			<KEYWORD1>protected</KEYWORD1>
-			<KEYWORD1>public</KEYWORD1>
-			<KEYWORD1>remote</KEYWORD1>
-			<KEYWORD1>required</KEYWORD1>
-			
-			<KEYWORD1>property</KEYWORD1>
-			
-			<!-- All functions -->
-			<FUNCTION>ACos</FUNCTION>
-			<FUNCTION>ASin</FUNCTION>
-			<FUNCTION>Abort</FUNCTION>
-			<FUNCTION>Abs</FUNCTION>
-			<FUNCTION>AddSOAPRequestHeader</FUNCTION>
-			<FUNCTION>AddSOAPResponseHeader</FUNCTION>
-			<FUNCTION>AjaxLink</FUNCTION>
-			<FUNCTION>AjaxOnLoad</FUNCTION>
-			<FUNCTION>ApplicationStop</FUNCTION>
-			<FUNCTION>ArrayAppend</FUNCTION>
-			<FUNCTION>ArrayAvg</FUNCTION>
-			<FUNCTION>ArrayClear</FUNCTION>
-			<FUNCTION>ArrayContains</FUNCTION>
-			<FUNCTION>ArrayDelete</FUNCTION>
-			<FUNCTION>ArrayDeleteAt</FUNCTION>
-			<FUNCTION>ArrayFind</FUNCTION>
-			<FUNCTION>ArrayFindNoCase</FUNCTION>
-			<FUNCTION>ArrayInsertAt</FUNCTION>
-			<FUNCTION>ArrayIsDefined</FUNCTION>
-			<FUNCTION>ArrayIsEmpty</FUNCTION>
-			<FUNCTION>ArrayLen</FUNCTION>
-			<FUNCTION>ArrayMax</FUNCTION>
-			<FUNCTION>ArrayMin</FUNCTION>
-			<FUNCTION>ArrayNew</FUNCTION>
-			<FUNCTION>ArrayPrepend</FUNCTION>
-			<FUNCTION>ArrayResize</FUNCTION>
-			<FUNCTION>ArraySet</FUNCTION>
-			<FUNCTION>ArraySort</FUNCTION>
-			<FUNCTION>ArraySum</FUNCTION>
-			<FUNCTION>ArraySwap</FUNCTION>
-			<FUNCTION>ArrayToList</FUNCTION>
-			<FUNCTION>Asc</FUNCTION>
-			<FUNCTION>Atn</FUNCTION>
-			<FUNCTION>BinaryDecode</FUNCTION>
-			<FUNCTION>BinaryEncode</FUNCTION>
-			<FUNCTION>BitAnd</FUNCTION>
-			<FUNCTION>BitMaskClear</FUNCTION>
-			<FUNCTION>BitMaskRead</FUNCTION>
-			<FUNCTION>BitMaskSet</FUNCTION>
-			<FUNCTION>BitNot</FUNCTION>
-			<FUNCTION>BitOr</FUNCTION>
-			<FUNCTION>BitSHLN</FUNCTION>
-			<FUNCTION>BitSHRN</FUNCTION>
-			<FUNCTION>BitXor</FUNCTION>
-			<FUNCTION>CJustify</FUNCTION>
-			<FUNCTION>CacheGet</FUNCTION>
-			<FUNCTION>CacheGetAllIds</FUNCTION>
-			<FUNCTION>CacheGetMetadata</FUNCTION>
-			<FUNCTION>CacheGetProperties</FUNCTION>
-			<FUNCTION>CacheGetSession</FUNCTION>
-			<FUNCTION>CachePut</FUNCTION>
-			<FUNCTION>CacheRemove</FUNCTION>
-			<FUNCTION>CacheSetProperties</FUNCTION>
-			<!--FUNCTION>Catch</FUNCTION-->
-			<FUNCTION>Ceiling</FUNCTION>
-			<FUNCTION>CharsetDecode</FUNCTION>
-			<FUNCTION>CharsetEncode</FUNCTION>
-			<FUNCTION>Chr</FUNCTION>
-			<FUNCTION>Compare</FUNCTION>
-			<FUNCTION>CompareNoCase</FUNCTION>
-			<FUNCTION>Cos</FUNCTION>
-			<FUNCTION>CreateDate</FUNCTION>
-			<FUNCTION>CreateDateTime</FUNCTION>
-			<FUNCTION>CreateODBCDate</FUNCTION>
-			<FUNCTION>CreateODBCDateTime</FUNCTION>
-			<FUNCTION>CreateODBCTime</FUNCTION>
-			<FUNCTION>CreateObject</FUNCTION>
-			<FUNCTION>CreateTime</FUNCTION>
-			<FUNCTION>CreateTimeSpan</FUNCTION>
-			<FUNCTION>CreateUUID</FUNCTION>
-			<FUNCTION>DE</FUNCTION>
-			<FUNCTION>DateAdd</FUNCTION>
-			<FUNCTION>DateCompare</FUNCTION>
-			<FUNCTION>DateConvert</FUNCTION>
-			<FUNCTION>DateDiff</FUNCTION>
-			<FUNCTION>DateFormat</FUNCTION>
-			<FUNCTION>DatePart</FUNCTION>
-			<FUNCTION>Day</FUNCTION>
-			<FUNCTION>DayOfWeek</FUNCTION>
-			<FUNCTION>DayOfWeekAsString</FUNCTION>
-			<FUNCTION>DayOfYear</FUNCTION>
-			<FUNCTION>DaysInMonth</FUNCTION>
-			<FUNCTION>DaysInYear</FUNCTION>
-			<FUNCTION>DecimalFormat</FUNCTION>
-			<FUNCTION>DecrementValue</FUNCTION>
-			<FUNCTION>Decrypt</FUNCTION>
-			<FUNCTION>DecryptBinary</FUNCTION>
-			<FUNCTION>DeleteClientVariable</FUNCTION>
-			<FUNCTION>DeserializeJSON</FUNCTION>
-			<FUNCTION>DirectoryCreate</FUNCTION>
-			<FUNCTION>DirectoryDelete</FUNCTION>
-			<FUNCTION>DirectoryExists</FUNCTION>
-			<FUNCTION>DirectoryList</FUNCTION>
-			<FUNCTION>DirectoryRename</FUNCTION>
-			<FUNCTION>DollarFormat</FUNCTION>
-			<FUNCTION>DotNetToCFType</FUNCTION>
-			<FUNCTION>Duplicate</FUNCTION>
-			<FUNCTION>Encrypt</FUNCTION>
-			<FUNCTION>EncryptBinary</FUNCTION>
-			<FUNCTION>EntityDelete</FUNCTION>
-			<FUNCTION>EntityLoad</FUNCTION>
-			<FUNCTION>EntityLoadByExample</FUNCTION>
-			<FUNCTION>EntityLoadByPK</FUNCTION>
-			<FUNCTION>EntityMerge</FUNCTION>
-			<FUNCTION>EntityNew</FUNCTION>
-			<FUNCTION>EntityReload</FUNCTION>
-			<FUNCTION>EntitySave</FUNCTION>
-			<FUNCTION>EntitytoQuery</FUNCTION>
-			<FUNCTION>Evaluate</FUNCTION>
-			<FUNCTION>Exp</FUNCTION>
-			<FUNCTION>ExpandPath</FUNCTION>
-			<FUNCTION>FileClose</FUNCTION>
-			<FUNCTION>FileCopy</FUNCTION>
-			<FUNCTION>FileDelete</FUNCTION>
-			<FUNCTION>FileExists</FUNCTION>
-			<FUNCTION>FileIsEOF</FUNCTION>
-			<FUNCTION>FileMove</FUNCTION>
-			<FUNCTION>FileOpen</FUNCTION>
-			<FUNCTION>FileRead</FUNCTION>
-			<FUNCTION>FileReadBinary</FUNCTION>
-			<FUNCTION>FileReadLine</FUNCTION>
-			<FUNCTION>FileSeek</FUNCTION>
-			<FUNCTION>FileSetAccessMode</FUNCTION>
-			<FUNCTION>FileSetAttribute</FUNCTION>
-			<FUNCTION>FileSetLastModified</FUNCTION>
-			<FUNCTION>FileSkipBytes</FUNCTION>
-			<FUNCTION>FileUpload</FUNCTION>
-			<FUNCTION>FileUploadAll</FUNCTION>
-			<FUNCTION>FileWrite</FUNCTION>
-			<FUNCTION>Find</FUNCTION>
-			<FUNCTION>FindNoCase</FUNCTION>
-			<FUNCTION>FindOneOf</FUNCTION>
-			<FUNCTION>FirstDayOfMonth</FUNCTION>
-			<FUNCTION>Fix</FUNCTION>
-			<FUNCTION>FormatBaseN</FUNCTION>
-			<FUNCTION>GenerateSecretKey</FUNCTION>
-			<FUNCTION>GetAuthUser</FUNCTION>
-			<FUNCTION>GetBaseTagData</FUNCTION>
-			<FUNCTION>GetBaseTagList</FUNCTION>
-			<FUNCTION>GetBaseTemplatePath</FUNCTION>
-			<FUNCTION>GetClientVariablesList</FUNCTION>
-			<FUNCTION>GetComponentMetaData</FUNCTION>
-			<FUNCTION>GetContextRoot</FUNCTION>
-			<FUNCTION>GetCurrentTemplatePath</FUNCTION>
-			<FUNCTION>GetDirectoryFromPath</FUNCTION>
-			<FUNCTION>GetEncoding</FUNCTION>
-			<FUNCTION>GetException</FUNCTION>
-			<FUNCTION>GetFileFromPath</FUNCTION>
-			<FUNCTION>GetFileInfo</FUNCTION>
-			<FUNCTION>GetFunctionCalledName</FUNCTION>
-			<FUNCTION>GetFunctionList</FUNCTION>
-			<FUNCTION>GetGatewayHelper</FUNCTION>
-			<FUNCTION>GetHttpRequestData</FUNCTION>
-			<FUNCTION>GetHttpTimeString</FUNCTION>
-			<FUNCTION>GetLocalHostIP</FUNCTION>
-			<FUNCTION>GetLocale</FUNCTION>
-			<FUNCTION>GetLocaleDisplayName</FUNCTION>
-			<FUNCTION>GetMetaData</FUNCTION>
-			<FUNCTION>GetMetricData</FUNCTION>
-			<FUNCTION>GetPageContext</FUNCTION>
-			<FUNCTION>GetPrinterInfo</FUNCTION>
-			<FUNCTION>GetProfileSections</FUNCTION>
-			<FUNCTION>GetProfileString</FUNCTION>
-			<FUNCTION>GetReadableImageFormats</FUNCTION>
-			<FUNCTION>GetSOAPRequest</FUNCTION>
-			<FUNCTION>GetSOAPRequestHeader</FUNCTION>
-			<FUNCTION>GetSOAPResponse</FUNCTION>
-			<FUNCTION>GetSOAPResponseHeader</FUNCTION>
-			<FUNCTION>GetTempDirectory</FUNCTION>
-			<FUNCTION>GetTempFile</FUNCTION>
-			<FUNCTION>GetTemplatePath</FUNCTION>
-			<FUNCTION>GetTickCount</FUNCTION>
-			<FUNCTION>GetTimeZoneInfo</FUNCTION>
-			<FUNCTION>GetToken</FUNCTION>
-			<FUNCTION>GetUserRoles</FUNCTION>
-			<FUNCTION>GetWriteableImageFormats</FUNCTION>
-			<FUNCTION>HTMLCodeFormat</FUNCTION>
-			<FUNCTION>HTMLEditFormat</FUNCTION>
-			<FUNCTION>Hash</FUNCTION>
-			<FUNCTION>Hour</FUNCTION>
-			<FUNCTION>IIf</FUNCTION>
-			<FUNCTION>ImageAddBorder</FUNCTION>
-			<FUNCTION>ImageBlur</FUNCTION>
-			<FUNCTION>ImageClearRect</FUNCTION>
-			<FUNCTION>ImageCopy</FUNCTION>
-			<FUNCTION>ImageCrop</FUNCTION>
-			<FUNCTION>ImageDrawArc</FUNCTION>
-			<FUNCTION>ImageDrawBeveledRect</FUNCTION>
-			<FUNCTION>ImageDrawCubicCurve</FUNCTION>
-			<FUNCTION>ImageDrawLine</FUNCTION>
-			<FUNCTION>ImageDrawLines</FUNCTION>
-			<FUNCTION>ImageDrawOval</FUNCTION>
-			<FUNCTION>ImageDrawPoint</FUNCTION>
-			<FUNCTION>ImageDrawQuadraticCurve</FUNCTION>
-			<FUNCTION>ImageDrawRect</FUNCTION>
-			<FUNCTION>ImageDrawRoundRect</FUNCTION>
-			<FUNCTION>ImageDrawText</FUNCTION>
-			<FUNCTION>ImageFlip</FUNCTION>
-			<FUNCTION>ImageGetBlob</FUNCTION>
-			<FUNCTION>ImageGetBufferedImage</FUNCTION>
-			<FUNCTION>ImageGetEXIFTag</FUNCTION>
-			<FUNCTION>ImageGetHeight</FUNCTION>
-			<FUNCTION>ImageGetIPTCTag</FUNCTION>
-			<FUNCTION>ImageGetWidth</FUNCTION>
-			<FUNCTION>ImageGrayscale</FUNCTION>
-			<FUNCTION>ImageInfo</FUNCTION>
-			<FUNCTION>ImageNegative</FUNCTION>
-			<FUNCTION>ImageNew</FUNCTION>
-			<FUNCTION>ImageOverlay</FUNCTION>
-			<FUNCTION>ImagePaste</FUNCTION>
-			<FUNCTION>ImageRead</FUNCTION>
-			<FUNCTION>ImageReadBase64</FUNCTION>
-			<FUNCTION>ImageResize</FUNCTION>
-			<FUNCTION>ImageRotate</FUNCTION>
-			<FUNCTION>ImageRotateDrawingAxis</FUNCTION>
-			<FUNCTION>ImageScaleToFit</FUNCTION>
-			<FUNCTION>ImageSetAntialiasing</FUNCTION>
-			<FUNCTION>ImageSetBackgroundColor</FUNCTION>
-			<FUNCTION>ImageSetDrawingColor</FUNCTION>
-			<FUNCTION>ImageSetDrawingStroke</FUNCTION>
-			<FUNCTION>ImageSetDrawingTransparency</FUNCTION>
-			<FUNCTION>ImageSharpen</FUNCTION>
-			<FUNCTION>ImageShear</FUNCTION>
-			<FUNCTION>ImageShearDrawingAxis</FUNCTION>
-			<FUNCTION>ImageTranslate</FUNCTION>
-			<FUNCTION>ImageTranslateDrawingAxis</FUNCTION>
-			<FUNCTION>ImageWrite</FUNCTION>
-			<FUNCTION>ImageWriteBase64</FUNCTION>
-			<FUNCTION>ImageXORDrawingMode</FUNCTION>
-			<FUNCTION>IncrementValue</FUNCTION>
-			<FUNCTION>InputBaseN</FUNCTION>
-			<FUNCTION>Insert</FUNCTION>
-			<FUNCTION>Int</FUNCTION>
-			<FUNCTION>IsArray</FUNCTION>
-			<FUNCTION>IsBinary</FUNCTION>
-			<FUNCTION>IsBoolean</FUNCTION>
-			<FUNCTION>IsCustomFunction</FUNCTION>
-			<FUNCTION>IsDDX</FUNCTION>
-			<FUNCTION>IsDate</FUNCTION>
-			<FUNCTION>IsDebugMode</FUNCTION>
-			<FUNCTION>IsDefined</FUNCTION>
-			<FUNCTION>IsImage</FUNCTION>
-			<FUNCTION>IsImageFile</FUNCTION>
-			<FUNCTION>IsInstanceOf</FUNCTION>
-			<FUNCTION>IsJSON</FUNCTION>
-			<FUNCTION>IsK2ServerABroker</FUNCTION>
-			<FUNCTION>IsK2ServerDocCountExceeded</FUNCTION>
-			<FUNCTION>IsK2ServerOnline</FUNCTION>
-			<FUNCTION>IsLeapYear</FUNCTION>
-			<FUNCTION>IsLocalHost</FUNCTION>
-			<FUNCTION>IsNull</FUNCTION>
-			<FUNCTION>IsNumeric</FUNCTION>
-			<FUNCTION>IsNumericDate</FUNCTION>
-			<FUNCTION>IsObject</FUNCTION>
-			<FUNCTION>IsPDFFile</FUNCTION>
-			<FUNCTION>IsPDFObject</FUNCTION>
-			<FUNCTION>IsQuery</FUNCTION>
-			<FUNCTION>IsSOAPRequest</FUNCTION>
-			<FUNCTION>IsSimpleValue</FUNCTION>
-			<FUNCTION>IsStruct</FUNCTION>
-			<FUNCTION>IsUserInAnyRole</FUNCTION>
-			<FUNCTION>IsUserInRole</FUNCTION>
-			<FUNCTION>IsUserLoggedIn</FUNCTION>
-			<FUNCTION>IsValid</FUNCTION>
-			<FUNCTION>IsWDDX</FUNCTION>
-			<FUNCTION>IsXML</FUNCTION>
-			<FUNCTION>IsXmlAttribute</FUNCTION>
-			<FUNCTION>IsXmlDoc</FUNCTION>
-			<FUNCTION>IsXmlElem</FUNCTION>
-			<FUNCTION>IsXmlNode</FUNCTION>
-			<FUNCTION>IsXmlRoot</FUNCTION>
-			<FUNCTION>JSStringFormat</FUNCTION>
-			<FUNCTION>JavaCast</FUNCTION>
-			<FUNCTION>LCase</FUNCTION>
-			<FUNCTION>LJustify</FUNCTION>
-			<FUNCTION>LSCurrencyFormat</FUNCTION>
-			<FUNCTION>LSDateFormat</FUNCTION>
-			<FUNCTION>LSEuroCurrencyFormat</FUNCTION>
-			<FUNCTION>LSIsCurrency</FUNCTION>
-			<FUNCTION>LSIsDate</FUNCTION>
-			<FUNCTION>LSIsNumeric</FUNCTION>
-			<FUNCTION>LSNumberFormat</FUNCTION>
-			<FUNCTION>LSParseCurrency</FUNCTION>
-			<FUNCTION>LSParseDateTime</FUNCTION>
-			<FUNCTION>LSParseEuroCurrency</FUNCTION>
-			<FUNCTION>LSParseNumber</FUNCTION>
-			<FUNCTION>LSTimeFormat</FUNCTION>
-			<FUNCTION>LTrim</FUNCTION>
-			<FUNCTION>Left</FUNCTION>
-			<FUNCTION>Len</FUNCTION>
-			<FUNCTION>ListAppend</FUNCTION>
-			<FUNCTION>ListChangeDelims</FUNCTION>
-			<FUNCTION>ListContains</FUNCTION>
-			<FUNCTION>ListContainsNoCase</FUNCTION>
-			<FUNCTION>ListDeleteAt</FUNCTION>
-			<FUNCTION>ListFind</FUNCTION>
-			<FUNCTION>ListFindNoCase</FUNCTION>
-			<FUNCTION>ListFirst</FUNCTION>
-			<FUNCTION>ListGetAt</FUNCTION>
-			<FUNCTION>ListInsertAt</FUNCTION>
-			<FUNCTION>ListLast</FUNCTION>
-			<FUNCTION>ListLen</FUNCTION>
-			<FUNCTION>ListPrepend</FUNCTION>
-			<FUNCTION>ListQualify</FUNCTION>
-			<FUNCTION>ListRest</FUNCTION>
-			<FUNCTION>ListSetAt</FUNCTION>
-			<FUNCTION>ListSort</FUNCTION>
-			<FUNCTION>ListToArray</FUNCTION>
-			<FUNCTION>ListValueCount</FUNCTION>
-			<FUNCTION>ListValueCountNoCase</FUNCTION>
-			<FUNCTION>Location</FUNCTION>
-			<FUNCTION>Log</FUNCTION>
-			<FUNCTION>Log10</FUNCTION>
-			<FUNCTION>Max</FUNCTION>
-			<FUNCTION>Mid</FUNCTION>
-			<FUNCTION>Min</FUNCTION>
-			<FUNCTION>Minute</FUNCTION>
-			<FUNCTION>Month</FUNCTION>
-			<FUNCTION>MonthAsString</FUNCTION>
-			<FUNCTION>Now</FUNCTION>
-			<FUNCTION>NumberFormat</FUNCTION>
-			<FUNCTION>ORMClearSession</FUNCTION>
-			<FUNCTION>ORMCloseSession</FUNCTION>
-			<FUNCTION>ORMEvictCollection</FUNCTION>
-			<FUNCTION>ORMEvictEntity</FUNCTION>
-			<FUNCTION>ORMEvictQueries</FUNCTION>
-			<FUNCTION>ORMExecuteQuery</FUNCTION>
-			<FUNCTION>ORMFlush</FUNCTION>
-			<FUNCTION>ORMGetSession</FUNCTION>
-			<FUNCTION>ORMGetSessionFactory</FUNCTION>
-			<FUNCTION>ORMReload</FUNCTION>
-			<FUNCTION>ObjectEquals</FUNCTION>
-			<FUNCTION>ObjectLoad</FUNCTION>
-			<FUNCTION>ObjectSave</FUNCTION>
-			<FUNCTION>ParagraphFormat</FUNCTION>
-			<FUNCTION>ParseDateTime</FUNCTION>
-			<FUNCTION>Pi</FUNCTION>
-			<FUNCTION>PrecisionEvaluate</FUNCTION>
-			<FUNCTION>PreserveSingleQuotes</FUNCTION>
-			<FUNCTION>Quarter</FUNCTION>
-			<FUNCTION>QueryAddColumn</FUNCTION>
-			<FUNCTION>QueryAddRow</FUNCTION>
-			<FUNCTION>QueryConvertForGrid</FUNCTION>
-			<FUNCTION>QueryNew</FUNCTION>
-			<FUNCTION>QuerySetCell</FUNCTION>
-			<FUNCTION>QuotedValueList</FUNCTION>
-			<FUNCTION>REFind</FUNCTION>
-			<FUNCTION>REFindNoCase</FUNCTION>
-			<FUNCTION>REMatch</FUNCTION>
-			<FUNCTION>REMatchNoCase</FUNCTION>
-			<FUNCTION>REReplace</FUNCTION>
-			<FUNCTION>REReplaceNoCase</FUNCTION>
-			<FUNCTION>RJustify</FUNCTION>
-			<FUNCTION>RTrim</FUNCTION>
-			<FUNCTION>Rand</FUNCTION>
-			<FUNCTION>RandRange</FUNCTION>
-			<FUNCTION>Randomize</FUNCTION>
-			<FUNCTION>ReleaseComObject</FUNCTION>
-			<FUNCTION>RemoveChars</FUNCTION>
-			<FUNCTION>RepeatString</FUNCTION>
-			<FUNCTION>Replace</FUNCTION>
-			<FUNCTION>ReplaceList</FUNCTION>
-			<FUNCTION>ReplaceNoCase</FUNCTION>
-			<FUNCTION>Reverse</FUNCTION>
-			<FUNCTION>Right</FUNCTION>
-			<FUNCTION>Round</FUNCTION>
-			<FUNCTION>Second</FUNCTION>
-			<FUNCTION>SendGatewayMessage</FUNCTION>
-			<FUNCTION>SerializeJSON</FUNCTION>
-			<FUNCTION>SetLocale</FUNCTION>
-			<FUNCTION>SetProfileString</FUNCTION>
-			<FUNCTION>SetVariable</FUNCTION>
-			<FUNCTION>Sgn</FUNCTION>
-			<FUNCTION>Sin</FUNCTION>
-			<FUNCTION>Sleep</FUNCTION>
-			<FUNCTION>SpanExcluding</FUNCTION>
-			<FUNCTION>SpanIncluding</FUNCTION>
-			<FUNCTION>SpreadsheetAddColumn</FUNCTION>
-			<FUNCTION>SpreadsheetAddFreezePane</FUNCTION>
-			<FUNCTION>SpreadsheetAddImage</FUNCTION>
-			<FUNCTION>SpreadsheetAddInfo</FUNCTION>
-			<FUNCTION>SpreadsheetAddRow</FUNCTION>
-			<FUNCTION>SpreadsheetAddRows</FUNCTION>
-			<FUNCTION>SpreadsheetAddSplitPane</FUNCTION>
-			<FUNCTION>SpreadsheetCreateSheet</FUNCTION>
-			<FUNCTION>SpreadsheetDeleteColumn</FUNCTION>
-			<FUNCTION>SpreadsheetDeleteColumns</FUNCTION>
-			<FUNCTION>SpreadsheetDeleteRow</FUNCTION>
-			<FUNCTION>SpreadsheetDeleteRows</FUNCTION>
-			<FUNCTION>SpreadsheetFormatCell</FUNCTION>
-			<FUNCTION>SpreadsheetFormatCellRange</FUNCTION>
-			<FUNCTION>SpreadsheetFormatColumn</FUNCTION>
-			<FUNCTION>SpreadsheetFormatColumns</FUNCTION>
-			<FUNCTION>SpreadsheetFormatRow</FUNCTION>
-			<FUNCTION>SpreadsheetFormatRows</FUNCTION>
-			<FUNCTION>SpreadsheetGetCellComment</FUNCTION>
-			<FUNCTION>SpreadsheetGetCellFormula</FUNCTION>
-			<FUNCTION>SpreadsheetGetCellValue</FUNCTION>
-			<FUNCTION>SpreadsheetInfo</FUNCTION>
-			<FUNCTION>SpreadsheetMergeCells</FUNCTION>
-			<FUNCTION>SpreadsheetNew</FUNCTION>
-			<FUNCTION>SpreadsheetRead</FUNCTION>
-			<FUNCTION>SpreadsheetReadBinary</FUNCTION>
-			<FUNCTION>SpreadsheetRemoveSheet</FUNCTION>
-			<FUNCTION>SpreadsheetSetActiveSheet</FUNCTION>
-			<FUNCTION>SpreadsheetSetActiveSheetNumber</FUNCTION>
-			<FUNCTION>SpreadsheetSetCellComment</FUNCTION>
-			<FUNCTION>SpreadsheetSetCellFormula</FUNCTION>
-			<FUNCTION>SpreadsheetSetCellValue</FUNCTION>
-			<FUNCTION>SpreadsheetSetColumnWidth</FUNCTION>
-			<FUNCTION>SpreadsheetSetFooter</FUNCTION>
-			<FUNCTION>SpreadsheetSetHeader</FUNCTION>
-			<FUNCTION>SpreadsheetSetRowHeight</FUNCTION>
-			<FUNCTION>SpreadsheetShiftColumns</FUNCTION>
-			<FUNCTION>SpreadsheetShiftRows</FUNCTION>
-			<FUNCTION>SpreadsheetWrite</FUNCTION>
-			<FUNCTION>Sqr</FUNCTION>
-			<FUNCTION>StripCR</FUNCTION>
-			<FUNCTION>StructAppend</FUNCTION>
-			<FUNCTION>StructClear</FUNCTION>
-			<FUNCTION>StructCopy</FUNCTION>
-			<FUNCTION>StructCount</FUNCTION>
-			<FUNCTION>StructDelete</FUNCTION>
-			<FUNCTION>StructFind</FUNCTION>
-			<FUNCTION>StructFindKey</FUNCTION>
-			<FUNCTION>StructFindValue</FUNCTION>
-			<FUNCTION>StructGet</FUNCTION>
-			<FUNCTION>StructInsert</FUNCTION>
-			<FUNCTION>StructIsEmpty</FUNCTION>
-			<FUNCTION>StructKeyArray</FUNCTION>
-			<FUNCTION>StructKeyExists</FUNCTION>
-			<FUNCTION>StructKeyList</FUNCTION>
-			<FUNCTION>StructNew</FUNCTION>
-			<FUNCTION>StructSort</FUNCTION>
-			<FUNCTION>StructUpdate</FUNCTION>
-			<FUNCTION>Tan</FUNCTION>
-			<!---FUNCTION>Throw</FUNCTION-->
-			<FUNCTION>TimeFormat</FUNCTION>
-			<FUNCTION>ToBase64</FUNCTION>
-			<FUNCTION>ToBinary</FUNCTION>
-			<FUNCTION>ToScript</FUNCTION>
-			<FUNCTION>ToString</FUNCTION>
-			<FUNCTION>Trace</FUNCTION>
-			<!--FUNCTION>Try</FUNCTION-->
-			<FUNCTION>TransactionCommit</FUNCTION>
-			<FUNCTION>TransactionRollback</FUNCTION>
-			<FUNCTION>TransactionSetSavePoint</FUNCTION>
-			<FUNCTION>Trim</FUNCTION>
-			<FUNCTION>UCase</FUNCTION>
-			<FUNCTION>URLDecode</FUNCTION>
-			<FUNCTION>URLEncodedFormat</FUNCTION>
-			<FUNCTION>URLSessionFormat</FUNCTION>
-			<FUNCTION>Val</FUNCTION>
-			<FUNCTION>ValueList</FUNCTION>
-			<FUNCTION>VerifyClient</FUNCTION>
-			<FUNCTION>Week</FUNCTION>
-			<FUNCTION>Wrap</FUNCTION>
-			<FUNCTION>WriteDump</FUNCTION>
-			<FUNCTION>WriteLog</FUNCTION>
-			<FUNCTION>WriteOutput</FUNCTION>
-			<FUNCTION>XmlChildPos</FUNCTION>
-			<FUNCTION>XmlElemNew</FUNCTION>
-			<FUNCTION>XmlFormat</FUNCTION>
-			<FUNCTION>XmlGetNodeType</FUNCTION>
-			<FUNCTION>XmlNew</FUNCTION>
-			<FUNCTION>XmlParse</FUNCTION>
-			<FUNCTION>XmlSearch</FUNCTION>
-			<FUNCTION>XmlTransform</FUNCTION>
-			<FUNCTION>XmlValidate</FUNCTION>
-			<FUNCTION>Year</FUNCTION>
-			<FUNCTION>YesNoFormat</FUNCTION>
-			
-			<!-- Scopes -->
-			<KEYWORD2>Variables</KEYWORD2>
-			<KEYWORD2>Arguments</KEYWORD2>
-			<KEYWORD2>Request</KEYWORD2>
-			<KEYWORD2>Session</KEYWORD2>
-			<KEYWORD2>Local</KEYWORD2>
-			<KEYWORD2>Form</KEYWORD2>
-			<KEYWORD2>CGI</KEYWORD2>
-			<KEYWORD2>URL</KEYWORD2>
-			<KEYWORD2>Attributes</KEYWORD2>
-			<KEYWORD2>Application</KEYWORD2>
-			<KEYWORD2>Cookie</KEYWORD2>
-			
-			
-			<!-- ColdFusion Operators -->
-			<OPERATOR>IS</OPERATOR>
-			<OPERATOR>EQ</OPERATOR><OPERATOR>EQUAL</OPERATOR>
-			<OPERATOR>EQV</OPERATOR>
-			<OPERATOR>NEQ</OPERATOR><OPERATOR>IS NOT</OPERATOR><OPERATOR>NOT EQUAL</OPERATOR>
-			<OPERATOR>GT</OPERATOR><OPERATOR>GREATER THAN</OPERATOR>
-			<OPERATOR>GTE</OPERATOR><OPERATOR>GE</OPERATOR>
-			<OPERATOR>LT</OPERATOR><OPERATOR>LESS THAN</OPERATOR>
-			<OPERATOR>LTE</OPERATOR><OPERATOR>LE</OPERATOR>
-	
-			<OPERATOR>LESS</OPERATOR>
-			<OPERATOR>GREATER</OPERATOR>
-			<OPERATOR>THAN</OPERATOR>
-			
-			<OPERATOR>CONTAINS</OPERATOR>
-			<OPERATOR>DOES NOT CONTAIN</OPERATOR>
-			
-			<OPERATOR>AND</OPERATOR>
-			<OPERATOR>IMP</OPERATOR>
-			<OPERATOR>OR</OPERATOR>
-			<OPERATOR>NOT</OPERATOR>
-			<OPERATOR>XOR</OPERATOR>
-		</KEYWORDS>
-	</RULES>
-	
-	<RULES SET="CFDOC" DEFAULT="COMMENT3" IGNORE_CASE="TRUE">
-		<MARK_FOLLOWING TYPE="LITERAL3">@</MARK_FOLLOWING>
-		
-		<KEYWORDS>
-			<LITERAL1>@hint</LITERAL1>
-			<LITERAL1>@displayname</LITERAL1>
-			<LITERAL1>@output</LITERAL1>
-			<LITERAL1>@access</LITERAL1>
-			<LITERAL1>@accessors</LITERAL1>
-			<LITERAL1>@returntype</LITERAL1>
-			<LITERAL1>@roles</LITERAL1>
-			<LITERAL1>@default</LITERAL1>
-			<LITERAL1>@required</LITERAL1>
-			<LITERAL1>@extends</LITERAL1>
-			<LITERAL1>@implements</LITERAL1>
-			
-			<!-- entity related -->
-			<LITERAL2>@update</LITERAL2>
-			<LITERAL2>@insert</LITERAL2>
-			<LITERAL2>@formula</LITERAL2>
-			<LITERAL2>@dbdefault</LITERAL2>
-			<LITERAL2>@persistent</LITERAL2>
-			<LITERAL2>@optimisticlock</LITERAL2>
-			<LITERAL2>@unique</LITERAL2>
-			<LITERAL2>@uniquekey</LITERAL2>
-			<LITERAL2>@sqltype</LITERAL2>
-			<LITERAL2>@generator</LITERAL2>
-			<LITERAL2>@generated</LITERAL2>
-			<LITERAL2>@notnull</LITERAL2>
-			<LITERAL2>@length</LITERAL2>
-			<LITERAL2>@scale</LITERAL2>
-			<LITERAL2>@precision</LITERAL2>
-			<LITERAL2>@fieldtype</LITERAL2>
-			<LITERAL2>@ormtype</LITERAL2>
-			<LITERAL2>@column</LITERAL2>
-		</KEYWORDS>
-		
-		
-	</RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/chill.xml b/qpython/src/main/assets/syntax/chill.xml
deleted file mode 100644
index fc17d4ac..00000000
--- a/qpython/src/main/assets/syntax/chill.xml
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!-- CHILL mode by Rudolf Widmann (Rudi.Widmann@web.de)
-     CHILL = "CCITT High Level Programming Language" used for telecommunication programming
-     Pascal was used as reference.
-     Keywords   = KEYWORD1
-     Directives = KEYWORD2.
-     Everything else as is-->
-<MODE>
-    <PROPS>
-        <PROPERTY NAME="commentStart" VALUE="/*" />
-        <PROPERTY NAME="commentEnd" VALUE="*/" />
-    </PROPS>
-
-    <RULES IGNORE_CASE="FALSE" HIGHLIGHT_DIGITS="TRUE">
-
-        <!-- Compiler directives. -->
-        <SPAN TYPE="COMMENT2">
-            <BEGIN>&lt;&gt;</BEGIN>
-            <END>&lt;&gt;</END>
-        </SPAN>
-        <!-- Normal comments. -->
-        <SPAN TYPE="COMMENT1">
-            <BEGIN>/*</BEGIN>
-            <END>*/</END>
-        </SPAN>
-
-        <SPAN TYPE="LITERAL1" NO_LINE_BREAK="TRUE">
-            <BEGIN>'</BEGIN>
-            <END>'</END>
-        </SPAN>
-        <SPAN TYPE="LITERAL1" NO_LINE_BREAK="TRUE">
-            <BEGIN>H'</BEGIN>
-            <END>;</END>
-        </SPAN>
-
-        <SEQ TYPE="OPERATOR">)</SEQ>
-        <SEQ TYPE="OPERATOR">(</SEQ>
-        <SEQ TYPE="OPERATOR">]</SEQ>
-        <SEQ TYPE="OPERATOR">[</SEQ>
-        <SEQ TYPE="OPERATOR">+</SEQ>
-        <SEQ TYPE="OPERATOR">-</SEQ>
-        <SEQ TYPE="OPERATOR">/</SEQ>
-        <SEQ TYPE="OPERATOR">*</SEQ>
-        <SEQ TYPE="OPERATOR">.</SEQ>
-        <SEQ TYPE="OPERATOR">,</SEQ>
-        <SEQ TYPE="OPERATOR">;</SEQ>
-        <SEQ TYPE="OPERATOR">^</SEQ>
-        <SEQ TYPE="OPERATOR">@</SEQ>
-        <SEQ TYPE="OPERATOR">:=</SEQ>
-        <SEQ TYPE="OPERATOR">:</SEQ>
-        <SEQ TYPE="OPERATOR">=</SEQ>
-        <SEQ TYPE="OPERATOR">/=</SEQ>
-        <SEQ TYPE="OPERATOR">&gt;</SEQ>
-        <SEQ TYPE="OPERATOR">&lt;</SEQ>
-        <SEQ TYPE="OPERATOR">&gt;=</SEQ>
-        <SEQ TYPE="OPERATOR">&lt;=</SEQ>
-
-        <KEYWORDS>
-            <!-- Reserved words -->
-            <KEYWORD1>AND</KEYWORD1>
-            <KEYWORD1>BEGIN</KEYWORD1>
-            <KEYWORD1>CASE</KEYWORD1>
-            <KEYWORD1>DIV</KEYWORD1>
-            <KEYWORD1>DO</KEYWORD1>
-            <KEYWORD1>ELSE</KEYWORD1>
-            <KEYWORD1>ELSIF</KEYWORD1>
-            <KEYWORD1>END</KEYWORD1>
-            <KEYWORD1>ESAC</KEYWORD1>
-            <KEYWORD1>EXIT</KEYWORD1>
-            <KEYWORD1>FI</KEYWORD1>
-            <KEYWORD1>FOR</KEYWORD1>
-            <KEYWORD1>GOTO</KEYWORD1>
-            <KEYWORD1>IF</KEYWORD1>
-            <KEYWORD1>IN</KEYWORD1>
-            <KEYWORD1>MOD</KEYWORD1>
-            <KEYWORD1>NOT</KEYWORD1>
-            <KEYWORD1>OD</KEYWORD1>
-            <KEYWORD1>OF</KEYWORD1>
-            <KEYWORD1>ON</KEYWORD1>
-            <KEYWORD1>OR</KEYWORD1>
-            <KEYWORD1>OUT</KEYWORD1>
-            <KEYWORD1>RESULT</KEYWORD1>
-            <KEYWORD1>RETURN</KEYWORD1>
-            <KEYWORD1>THEN</KEYWORD1>
-            <KEYWORD1>THEN</KEYWORD1>
-            <KEYWORD1>TO</KEYWORD1>
-            <KEYWORD1>UNTIL</KEYWORD1>
-            <KEYWORD1>USES</KEYWORD1>
-            <KEYWORD1>WHILE</KEYWORD1>
-            <KEYWORD1>WITH</KEYWORD1>
-            <KEYWORD1>XOR</KEYWORD1>
-            <!-- DEFINITIONS. -->
-            <KEYWORD2>ARRAY</KEYWORD2>
-            <KEYWORD2>DCL</KEYWORD2>
-            <KEYWORD2>GRANT</KEYWORD2>
-            <KEYWORD2>LABEL</KEYWORD2>
-            <KEYWORD2>MODULE</KEYWORD2>
-            <KEYWORD2>NEWMODE</KEYWORD2>
-            <KEYWORD2>PROC</KEYWORD2>
-            <KEYWORD2>POWERSET</KEYWORD2>
-            <KEYWORD2>SEIZE</KEYWORD2>
-            <KEYWORD2>SET</KEYWORD2>
-            <KEYWORD2>STRUCT</KEYWORD2>
-            <KEYWORD2>SYN</KEYWORD2>
-            <KEYWORD2>SYNMODE</KEYWORD2>
-            <KEYWORD2>TYPE</KEYWORD2>
-            <KEYWORD2>PACK</KEYWORD2>
-            <!-- ORDINAL TYPES. -->
-            <KEYWORD3>BIN</KEYWORD3>
-            <KEYWORD3>CHAR</KEYWORD3>
-            <KEYWORD3>INT</KEYWORD3>
-            <KEYWORD3>RANGE</KEYWORD3>
-            <!-- BOOLEAN TYPES. -->
-            <KEYWORD3>BOOL</KEYWORD3>
-            <!-- UNTYPED POINTER. -->
-            <KEYWORD3>PTR</KEYWORD3>
-            <KEYWORD3>REF</KEYWORD3>
-            
-            <LABEL>MODULE_DESCRIPTION_HEADER</LABEL>
-            <LABEL>PATCH_INFOS</LABEL>
-            <LABEL>LIO_INFOS</LABEL>
-            <LABEL>SWSG_INFOS</LABEL>
-            <LABEL>MSG_XREF</LABEL>            
-            <LABEL>EJECT</LABEL>            
-
-            <LITERAL2>FALSE</LITERAL2>
-            <LITERAL2>NULL</LITERAL2>
-            <LITERAL2>TRUE</LITERAL2>
-        </KEYWORDS>
-    </RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/cil.xml b/qpython/src/main/assets/syntax/cil.xml
deleted file mode 100644
index cf03d2e4..00000000
--- a/qpython/src/main/assets/syntax/cil.xml
+++ /dev/null
@@ -1,385 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!--
-	.NET CIL by Cullen Linn (linnc@cs.arizona.edu)
-    (pg102 or 198 of PartitionII)
--->
-
-<MODE>
-
-	<PROPS>
-		<PROPERTY NAME="indentOpenBrackets" VALUE="{" />
-		<PROPERTY NAME="indentCloseBrackets" VALUE="}" />
-		<PROPERTY NAME="commentStart" VALUE="/*" />
-		<PROPERTY NAME="commentEnd" VALUE="*/" />
-		<PROPERTY NAME="lineComment" VALUE="//" />
-		<PROPERTY NAME="wordBreakChars" VALUE=",+\\" />
-	</PROPS>
-
-	<RULES HIGHLIGHT_DIGITS="TRUE" IGNORE_CASE="TRUE">
-
-		<SPAN TYPE="LITERAL1" NO_LINE_BREAK="TRUE">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-
-        <EOL_SPAN TYPE="COMMENT2">//</EOL_SPAN>
-
-        <MARK_PREVIOUS TYPE="FUNCTION" MATCH_TYPE="OPERATOR">(</MARK_PREVIOUS>
-		<SEQ TYPE="OPERATOR">)</SEQ>
-
-		<SPAN TYPE="LITERAL1" NO_LINE_BREAK="TRUE">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-
-		<MARK_PREVIOUS TYPE="LABEL" MATCH_TYPE="OPERATOR" AT_LINE_START="TRUE">:</MARK_PREVIOUS>
-
-		<KEYWORDS>
-        <KEYWORD1>public</KEYWORD1>
-            <KEYWORD1>private</KEYWORD1>
-            <KEYWORD1>family</KEYWORD1>
-            <KEYWORD1>assembly</KEYWORD1>
-            <KEYWORD1>famandassem</KEYWORD1>
-            <KEYWORD1>famorassem</KEYWORD1>
-            <KEYWORD1>autochar</KEYWORD1>
-            <KEYWORD1>abstract</KEYWORD1>
-            <KEYWORD1>ansi</KEYWORD1>
-            <KEYWORD1>beforefieldinit</KEYWORD1>
-            <KEYWORD1>explicit</KEYWORD1>
-            <KEYWORD1>interface</KEYWORD1>
-            <KEYWORD1>nested</KEYWORD1>
-            <KEYWORD1>rtspecialname</KEYWORD1>
-            <KEYWORD1>sealed</KEYWORD1>
-            <KEYWORD1>sequential</KEYWORD1>
-            <KEYWORD1>serializable</KEYWORD1>
-            <KEYWORD1>specialname</KEYWORD1>
-            <KEYWORD1>unicode</KEYWORD1>
-            <KEYWORD1>final</KEYWORD1>
-            <KEYWORD1>hidebysig</KEYWORD1>
-            <KEYWORD1>newslot</KEYWORD1>
-            <KEYWORD1>pinvokeimpl</KEYWORD1>
-            <KEYWORD1>static</KEYWORD1>
-            <KEYWORD1>virtual</KEYWORD1>
-            <KEYWORD1>cil</KEYWORD1>
-            <KEYWORD1>forwardref</KEYWORD1>
-            <KEYWORD1>internalcall</KEYWORD1>
-            <KEYWORD1>managed</KEYWORD1>
-            <KEYWORD1>native</KEYWORD1>
-            <KEYWORD1>noinlining</KEYWORD1>
-            <KEYWORD1>runtime</KEYWORD1>
-            <KEYWORD1>synchronized</KEYWORD1>
-            <KEYWORD1>unmanaged</KEYWORD1>
-            <KEYWORD1>typedref</KEYWORD1>
-            <KEYWORD1>cdecl</KEYWORD1>
-            <KEYWORD1>fastcall</KEYWORD1>
-            <KEYWORD1>stdcall</KEYWORD1>
-            <KEYWORD1>thiscall</KEYWORD1>
-            <KEYWORD1>platformapi</KEYWORD1>
-            <KEYWORD1>initonly</KEYWORD1>
-            <KEYWORD1>literal</KEYWORD1>
-            <KEYWORD1>marshal</KEYWORD1>
-            <KEYWORD1>notserialized</KEYWORD1>
-            <KEYWORD1>addon</KEYWORD1>
-            <KEYWORD1>removeon</KEYWORD1>
-            <KEYWORD1>catch</KEYWORD1>
-            <KEYWORD1>fault</KEYWORD1>
-            <KEYWORD1>filter</KEYWORD1>
-            <KEYWORD1>handler</KEYWORD1>
-
-            <!--Assembly Directives (Meta-Data)-->
-            <KEYWORD2>.assembly</KEYWORD2>
-            <KEYWORD2>.assembly extern</KEYWORD2>
-            <KEYWORD2>.class</KEYWORD2>
-            <KEYWORD2>.class extern</KEYWORD2>
-            <KEYWORD2>.field</KEYWORD2>
-            <KEYWORD2>.method</KEYWORD2>
-            <KEYWORD2>.property</KEYWORD2>
-            <KEYWORD2>.get</KEYWORD2>
-            <KEYWORD2>.set</KEYWORD2>
-            <KEYWORD2>.other</KEYWORD2>
-            <KEYWORD2>.ctor</KEYWORD2>
-            <KEYWORD2>.corflags</KEYWORD2>
-            <KEYWORD2>.custom</KEYWORD2>
-            <KEYWORD2>.data</KEYWORD2>
-            <KEYWORD2>.file</KEYWORD2>
-            <KEYWORD2>.mresource</KEYWORD2>
-            <KEYWORD2>.module</KEYWORD2>
-            <KEYWORD2>.module extern</KEYWORD2>
-            <KEYWORD2>.subsystem</KEYWORD2>
-            <KEYWORD2>.vtfixup</KEYWORD2>
-            <KEYWORD2>.publickeytoken</KEYWORD2>
-            <KEYWORD2>.ver</KEYWORD2>
-            <KEYWORD2>.hash algorithm</KEYWORD2>
-            <KEYWORD2>.culture</KEYWORD2>
-            <KEYWORD2>.namespace</KEYWORD2>
-            <KEYWORD2>.event</KEYWORD2>
-            <KEYWORD2>.fire</KEYWORD2>
-            <KEYWORD2>.override</KEYWORD2>
-            <KEYWORD2>.try</KEYWORD2>
-            <KEYWORD2>.catch</KEYWORD2>
-            <KEYWORD2>.finally</KEYWORD2>
-            <KEYWORD2>.locals</KEYWORD2>
-            <KEYWORD2>.maxstack</KEYWORD2>
-            <KEYWORD2>.entrypoint</KEYWORD2>
-            <KEYWORD2>.pack</KEYWORD2>
-            <KEYWORD2>.size</KEYWORD2>
-
-            <!--Implementation Specific Metadata-->
-            <KEYWORD2>.file alignment</KEYWORD2>
-            <KEYWORD2>.imagebase</KEYWORD2>
-            <KEYWORD2>.language</KEYWORD2>
-            <KEYWORD2>.namespace</KEYWORD2>
-
-
-            <KEYWORD3>string</KEYWORD3>
-            <KEYWORD3>object</KEYWORD3>
-            <KEYWORD3>bool</KEYWORD3>
-            <KEYWORD3>true</KEYWORD3>
-            <KEYWORD3>false</KEYWORD3>
-            <KEYWORD3>bytearray</KEYWORD3>
-            <KEYWORD3>char</KEYWORD3>
-            <KEYWORD3>float32</KEYWORD3>
-            <KEYWORD3>float64</KEYWORD3>
-            <KEYWORD3>int8</KEYWORD3>
-            <KEYWORD3>int16</KEYWORD3>
-            <KEYWORD3>int32</KEYWORD3>
-            <KEYWORD3>int64</KEYWORD3>
-            <KEYWORD3>nullref</KEYWORD3>
-
-
-            <OPERATOR>&amp;</OPERATOR>
-            <OPERATOR>*</OPERATOR>
-            <OPERATOR>}</OPERATOR>
-            <OPERATOR>{</OPERATOR>
-
-            <!--arithmetic opcodes-->
-            <FUNCTION>add</FUNCTION>
-            <FUNCTION>add.ovf</FUNCTION>
-            <FUNCTION>add.ovf.un</FUNCTION>
-            <FUNCTION>div</FUNCTION>
-            <FUNCTION>div.un</FUNCTION>
-            <FUNCTION>mul</FUNCTION>
-            <FUNCTION>mul.ovf</FUNCTION>
-            <FUNCTION>mul.ovf.un</FUNCTION>
-            <FUNCTION>sub</FUNCTION>
-            <FUNCTION>sub.ovf</FUNCTION>
-            <FUNCTION>sub.ovf.un</FUNCTION>
-
-            <!--logical-->
-            <FUNCTION>and</FUNCTION>
-            <FUNCTION>not</FUNCTION>
-            <FUNCTION>or</FUNCTION>
-            <FUNCTION>xor</FUNCTION>
-
-            <!--Branches-->
-            <FUNCTION>beq</FUNCTION>
-            <FUNCTION>beq.s</FUNCTION>
-            <FUNCTION>bge</FUNCTION>
-            <FUNCTION>bge.s</FUNCTION>
-            <FUNCTION>bge.un</FUNCTION>
-            <FUNCTION>bge.un.s</FUNCTION>
-            <FUNCTION>bgt</FUNCTION>
-            <FUNCTION>bgt.s</FUNCTION>
-            <FUNCTION>bgt.un</FUNCTION>
-            <FUNCTION>bgt.un.s</FUNCTION>
-            <FUNCTION>ble</FUNCTION>
-            <FUNCTION>ble.s</FUNCTION>
-            <FUNCTION>ble.un</FUNCTION>
-            <FUNCTION>ble.un.s</FUNCTION>
-            <FUNCTION>blt</FUNCTION>
-            <FUNCTION>blt.s</FUNCTION>
-            <FUNCTION>blt.un</FUNCTION>
-            <FUNCTION>blt.un.s</FUNCTION>
-            <FUNCTION>bne.un</FUNCTION>
-            <FUNCTION>bne.un.s</FUNCTION>
-            <FUNCTION>br</FUNCTION>
-            <FUNCTION>brfalse</FUNCTION>
-            <FUNCTION>brfalse.s</FUNCTION>
-            <FUNCTION>brtrue</FUNCTION>
-            <FUNCTION>brtrue.s</FUNCTION>
-            <FUNCTION>br.s</FUNCTION>
-
-            <!--Conversions-->
-            <FUNCTION>conv.i</FUNCTION>
-            <FUNCTION>conv.i1</FUNCTION>
-            <FUNCTION>conv.i2</FUNCTION>
-            <FUNCTION>conv.i4</FUNCTION>
-            <FUNCTION>conv.i8</FUNCTION>
-            <FUNCTION>conv.ovf.i</FUNCTION>
-            <FUNCTION>conv.ovf.i1</FUNCTION>
-            <FUNCTION>conv.ovf.i1.un</FUNCTION>
-            <FUNCTION>conv.ovf.i2</FUNCTION>
-            <FUNCTION>conv.ovf.i2.un</FUNCTION>
-            <FUNCTION>conv.ovf.i4</FUNCTION>
-            <FUNCTION>conv.ovf.i4.un</FUNCTION>
-            <FUNCTION>conv.ovf.i8</FUNCTION>
-            <FUNCTION>conv.ovf.i8.un</FUNCTION>
-            <FUNCTION>conv.ovf.i.un</FUNCTION>
-            <FUNCTION>conv.ovf.u</FUNCTION>
-            <FUNCTION>conv.ovf.u1</FUNCTION>
-            <FUNCTION>conv.ovf.u1.un</FUNCTION>
-            <FUNCTION>conv.ovf.u2</FUNCTION>
-            <FUNCTION>conv.ovf.u2.un</FUNCTION>
-            <FUNCTION>conv.ovf.u4</FUNCTION>
-            <FUNCTION>conv.ovf.u4.un</FUNCTION>
-            <FUNCTION>conv.ovf.u8</FUNCTION>
-            <FUNCTION>conv.ovf.u8.un</FUNCTION>
-            <FUNCTION>conv.ovf.u.un</FUNCTION>
-            <FUNCTION>conv.r4</FUNCTION>
-            <FUNCTION>conv.r8</FUNCTION>
-            <FUNCTION>conv.r.un</FUNCTION>
-            <FUNCTION>conv.u</FUNCTION>
-            <FUNCTION>conv.u1</FUNCTION>
-            <FUNCTION>conv.u2</FUNCTION>
-            <FUNCTION>conv.u4</FUNCTION>
-            <FUNCTION>conv.u8</FUNCTION>
-
-            <!--Loads and Stores-->
-            <FUNCTION>ldarg</FUNCTION>
-            <FUNCTION>ldarga</FUNCTION>
-            <FUNCTION>ldarga.s</FUNCTION>
-            <FUNCTION>ldarg.0</FUNCTION>
-            <FUNCTION>ldarg.1</FUNCTION>
-            <FUNCTION>ldarg.2</FUNCTION>
-            <FUNCTION>ldarg.3</FUNCTION>
-            <FUNCTION>ldarg.s</FUNCTION>
-            <FUNCTION>ldc.i4</FUNCTION>
-            <FUNCTION>ldc.i4.0</FUNCTION>
-            <FUNCTION>ldc.i4.1</FUNCTION>
-            <FUNCTION>ldc.i4.2</FUNCTION>
-            <FUNCTION>ldc.i4.3</FUNCTION>
-            <FUNCTION>ldc.i4.4</FUNCTION>
-            <FUNCTION>ldc.i4.5</FUNCTION>
-            <FUNCTION>ldc.i4.6</FUNCTION>
-            <FUNCTION>ldc.i4.7</FUNCTION>
-            <FUNCTION>ldc.i4.8</FUNCTION>
-            <FUNCTION>ldc.i4.m1</FUNCTION>
-            <FUNCTION>ldc.i4.s</FUNCTION>
-            <FUNCTION>ldc.i8</FUNCTION>
-            <FUNCTION>ldc.r4</FUNCTION>
-            <FUNCTION>ldc.r8</FUNCTION>
-            <FUNCTION>ldelema</FUNCTION>
-            <FUNCTION>ldelem.i</FUNCTION>
-            <FUNCTION>ldelem.i1</FUNCTION>
-            <FUNCTION>ldelem.i2</FUNCTION>
-            <FUNCTION>ldelem.i4</FUNCTION>
-            <FUNCTION>ldelem.i8</FUNCTION>
-            <FUNCTION>ldelem.r4</FUNCTION>
-            <FUNCTION>ldelem.r8</FUNCTION>
-            <FUNCTION>ldelem.ref</FUNCTION>
-            <FUNCTION>ldelem.u1</FUNCTION>
-            <FUNCTION>ldelem.u2</FUNCTION>
-            <FUNCTION>ldelem.u4</FUNCTION>
-            <FUNCTION>ldfld</FUNCTION>
-            <FUNCTION>ldflda</FUNCTION>
-            <FUNCTION>ldftn</FUNCTION>
-            <FUNCTION>ldind.i</FUNCTION>
-            <FUNCTION>ldind.i1</FUNCTION>
-            <FUNCTION>ldind.i2</FUNCTION>
-            <FUNCTION>ldind.i4</FUNCTION>
-            <FUNCTION>ldind.i8</FUNCTION>
-            <FUNCTION>ldind.r4</FUNCTION>
-            <FUNCTION>ldind.r8</FUNCTION>
-            <FUNCTION>ldind.ref</FUNCTION>
-            <FUNCTION>ldind.u1</FUNCTION>
-            <FUNCTION>ldind.u2</FUNCTION>
-            <FUNCTION>ldind.u4</FUNCTION>
-            <FUNCTION>ldlen</FUNCTION>
-            <FUNCTION>ldloc</FUNCTION>
-            <FUNCTION>ldloca</FUNCTION>
-            <FUNCTION>ldloca.s</FUNCTION>
-            <FUNCTION>ldloc.0</FUNCTION>
-            <FUNCTION>ldloc.1</FUNCTION>
-            <FUNCTION>ldloc.2</FUNCTION>
-            <FUNCTION>ldloc.3</FUNCTION>
-            <FUNCTION>ldloc.s</FUNCTION>
-            <FUNCTION>ldnull</FUNCTION>
-            <FUNCTION>ldobj</FUNCTION>
-            <FUNCTION>ldsfld</FUNCTION>
-            <FUNCTION>ldsflda</FUNCTION>
-            <FUNCTION>ldstr</FUNCTION>
-            <FUNCTION>ldtoken</FUNCTION>
-            <FUNCTION>ldvirtftn</FUNCTION>
-            <FUNCTION>starg</FUNCTION>
-            <FUNCTION>starg.s</FUNCTION>
-            <FUNCTION>stelem.i</FUNCTION>
-            <FUNCTION>stelem.i1</FUNCTION>
-            <FUNCTION>stelem.i2</FUNCTION>
-            <FUNCTION>stelem.i4</FUNCTION>
-            <FUNCTION>stelem.i8</FUNCTION>
-            <FUNCTION>stelem.r4</FUNCTION>
-            <FUNCTION>stelem.r8</FUNCTION>
-            <FUNCTION>stelem.ref</FUNCTION>
-            <FUNCTION>stfld</FUNCTION>
-            <FUNCTION>stind.i</FUNCTION>
-            <FUNCTION>stind.i1</FUNCTION>
-            <FUNCTION>stind.i2</FUNCTION>
-            <FUNCTION>stind.i4</FUNCTION>
-            <FUNCTION>stind.i8</FUNCTION>
-            <FUNCTION>stind.r4</FUNCTION>
-            <FUNCTION>stind.r8</FUNCTION>
-            <FUNCTION>stind.ref</FUNCTION>
-            <FUNCTION>stloc</FUNCTION>
-            <FUNCTION>stloc.0</FUNCTION>
-            <FUNCTION>stloc.1</FUNCTION>
-            <FUNCTION>stloc.2</FUNCTION>
-            <FUNCTION>stloc.3</FUNCTION>
-            <FUNCTION>stloc.s</FUNCTION>
-            <FUNCTION>stobj</FUNCTION>
-            <FUNCTION>stsfld</FUNCTION>
-
-            <FUNCTION>call</FUNCTION>
-            <FUNCTION>calli</FUNCTION>
-            <FUNCTION>callvirt</FUNCTION>
-            <FUNCTION>castclass</FUNCTION>
-            <FUNCTION>ceq</FUNCTION>
-            <FUNCTION>cgt</FUNCTION>
-            <FUNCTION>cgt.un</FUNCTION>
-            <FUNCTION>ckfinite</FUNCTION>
-            <FUNCTION>clt</FUNCTION>
-            <FUNCTION>clt.un</FUNCTION>
-            <FUNCTION>cpblk</FUNCTION>
-            <FUNCTION>cpobj</FUNCTION>
-
-            <FUNCTION>initblk</FUNCTION>
-            <FUNCTION>initobj</FUNCTION>
-            <FUNCTION>newarr</FUNCTION>
-            <FUNCTION>newobj</FUNCTION>
-
-            <FUNCTION>dup</FUNCTION>
-            <FUNCTION>endfilter</FUNCTION>
-            <FUNCTION>isinst</FUNCTION>
-            <FUNCTION>box</FUNCTION>
-            <FUNCTION>unbox</FUNCTION>
-            <FUNCTION>arglist</FUNCTION>
-            <FUNCTION>break</FUNCTION>
-            <FUNCTION>jmp</FUNCTION>
-            <FUNCTION>ret</FUNCTION>
-            <FUNCTION>leave</FUNCTION>
-            <FUNCTION>leave.s</FUNCTION>
-            <FUNCTION>localloc</FUNCTION>
-            <FUNCTION>mkrefany</FUNCTION>
-            <FUNCTION>neg</FUNCTION>
-            <FUNCTION>switch</FUNCTION>
-            <FUNCTION>nop</FUNCTION>
-            <FUNCTION>pop</FUNCTION>
-            <FUNCTION>refanytype</FUNCTION>
-            <FUNCTION>refanyval</FUNCTION>
-            <FUNCTION>rem</FUNCTION>
-            <FUNCTION>rem.un</FUNCTION>
-            <FUNCTION>throw</FUNCTION>
-            <FUNCTION>rethrow</FUNCTION>
-            <FUNCTION>endfinally</FUNCTION>
-            <FUNCTION>shl</FUNCTION>
-            <FUNCTION>shr</FUNCTION>
-            <FUNCTION>shr.un</FUNCTION>
-            <FUNCTION>sizeof</FUNCTION>
-            <FUNCTION>tailcall</FUNCTION>
-            <FUNCTION>unaligned</FUNCTION>
-            <FUNCTION>volatile</FUNCTION>
-		</KEYWORDS>
-	</RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/clips.xml b/qpython/src/main/assets/syntax/clips.xml
deleted file mode 100644
index 0a2591d3..00000000
--- a/qpython/src/main/assets/syntax/clips.xml
+++ /dev/null
@@ -1,434 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!--	jEdit CLIPS syntax file
-
-	written by	Orhan Alkan
-	version		1.0
-	created on	30 June 2007
-	last revised	01 July 2007
--->
-
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="lineComment" VALUE=";" />
-
-	<PROPERTY NAME="indentNextLine"
-			VALUE="\s*(((if|while)\s*\(|else\s*|else\s+if\s*\(|for\s*\(.*\))[^{;]*)" />
-	</PROPS>
-	<RULES IGNORE_CASE="FALSE" HIGHLIGHT_DIGITS="TRUE" DIGIT_RE="(0[lL]?|[1-9]\d{0,9}(\d{0,9}[lL])?|0[xX]\p{XDigit}{1,8}(\p{XDigit}{0,8}[lL])?|0[0-7]{1,11}([0-7]{0,11}[lL])?|([0-9]+\.[0-9]*|\.[0-9]+)([eE][+-]?[0-9]+)?[fFdD]?|[0-9]+([eE][+-]?[0-9]+[fFdD]?|([eE][+-]?[0-9]+)?[fFdD]))">
-
-		<!-- Comments -->
-		<EOL_SPAN TYPE="COMMENT1">;</EOL_SPAN>
-
-		<!-- String literals -->
-		<SPAN TYPE="LITERAL1" ESCAPE="\" NO_LINE_BREAK="TRUE">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-		<SPAN TYPE="LITERAL1" ESCAPE="\" NO_LINE_BREAK="TRUE">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-
-		<!-- List literals -->
-		<SPAN TYPE="LITERAL2" NO_LINE_BREAK="TRUE">
-			<BEGIN>[</BEGIN>
-			<END>]</END>
-		</SPAN>
-
-		<!-- Operators -->
-		<SEQ TYPE="OPERATOR">=></SEQ>
-		<SEQ TYPE="OPERATOR">?</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;&lt;</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;=</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;=</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;-</SEQ>
-		<SEQ TYPE="OPERATOR">+</SEQ>
-		<SEQ TYPE="OPERATOR">-</SEQ>
-		<SEQ TYPE="OPERATOR">*</SEQ>
-		<SEQ TYPE="OPERATOR">/</SEQ>
-		<SEQ TYPE="OPERATOR">=</SEQ>
-		<SEQ TYPE="OPERATOR">**</SEQ>
-		<SEQ TYPE="OPERATOR">~</SEQ>
-		<SEQ TYPE="OPERATOR">\</SEQ>
-		<SEQ TYPE="OPERATOR">|</SEQ>
-		<SEQ TYPE="OPERATOR">&amp;</SEQ>
-		<SEQ TYPE="OPERATOR">:</SEQ>
-		<SEQ TYPE="OPERATOR">$</SEQ>
-
-		<!-- Parentheses -->
-		<SEQ TYPE="MARKUP">(</SEQ>
-		<SEQ TYPE="MARKUP">)</SEQ>
-		<SEQ TYPE="MARKUP">[</SEQ>
-		<SEQ TYPE="MARKUP">]</SEQ>
-		<SEQ TYPE="NULL">{</SEQ>
-		<SEQ TYPE="NULL">}</SEQ>
-
-		<KEYWORDS>
-
-			<KEYWORD1>deffacts</KEYWORD1>
-			<KEYWORD1>deftemplate</KEYWORD1>
-			<KEYWORD1>defglobal</KEYWORD1>
-			<KEYWORD1>defrule</KEYWORD1>
-			<KEYWORD1>deffunction</KEYWORD1>
-			<KEYWORD1>defgeneric</KEYWORD1>
-			<KEYWORD1>defmethod</KEYWORD1>
-			<KEYWORD1>defclass</KEYWORD1>
-			<KEYWORD1>definstance</KEYWORD1>
-			<KEYWORD1>defmessage</KEYWORD1>
-			<KEYWORD1>defmodule</KEYWORD1>
-			<KEYWORD1>deffacts-module</KEYWORD1>
-			<KEYWORD1>deffunction-module</KEYWORD1>
-			<KEYWORD1>defgeneric-module</KEYWORD1>
-			<KEYWORD1>defglobal-module</KEYWORD1>
-			<KEYWORD1>definstances-module</KEYWORD1>
-			<KEYWORD1>slot</KEYWORD1>
-			<KEYWORD1>multislot</KEYWORD1>
-			<KEYWORD1>default</KEYWORD1>
-			<KEYWORD1>default-dynamic</KEYWORD1>
-			<KEYWORD1>declare</KEYWORD1>
-			<KEYWORD1>salience</KEYWORD1>
-			<KEYWORD1>auto-focus</KEYWORD1>
-			<KEYWORD1>object</KEYWORD1>
-			<KEYWORD1>is-a</KEYWORD1>
-			<KEYWORD1>pattern-match</KEYWORD1>
-			<KEYWORD1>single-slot</KEYWORD1>
-			<KEYWORD1>reactive</KEYWORD1>
-			<KEYWORD1>non-reactive</KEYWORD1>
-			<KEYWORD1>storage</KEYWORD1>
-			<KEYWORD1>local</KEYWORD1>
-			<KEYWORD1>shared</KEYWORD1>
-			<KEYWORD1>access</KEYWORD1>
-			<KEYWORD1>read-write</KEYWORD1>
-			<KEYWORD1>read-only</KEYWORD1>
-			<KEYWORD1>initialize-only</KEYWORD1>
-			<KEYWORD1>propagation</KEYWORD1>
-			<KEYWORD1>inherit</KEYWORD1>
-			<KEYWORD1>non-inherit</KEYWORD1>
-			<KEYWORD1>source</KEYWORD1>
-			<KEYWORD1>exclusive</KEYWORD1>
-			<KEYWORD1>composite</KEYWORD1>
-			<KEYWORD1>visibility</KEYWORD1>
-			<KEYWORD1>private</KEYWORD1>
-			<KEYWORD1>public</KEYWORD1>
-			<KEYWORD1>create-accessor</KEYWORD1>
-			<KEYWORD1>?NONE</KEYWORD1>
-			<KEYWORD1>read</KEYWORD1>
-			<KEYWORD1>write</KEYWORD1>
-			<KEYWORD1>?DEFAULT</KEYWORD1>
-			<KEYWORD1>primary</KEYWORD1>
-			<KEYWORD1>around</KEYWORD1>
-			<KEYWORD1>before</KEYWORD1>
-			<KEYWORD1>after</KEYWORD1>
-			<KEYWORD1>import</KEYWORD1>
-			<KEYWORD1>export</KEYWORD1>
-			<KEYWORD1>?ALL</KEYWORD1>
-			<KEYWORD1>type</KEYWORD1>
-			<KEYWORD1>allowed-symbols</KEYWORD1>
-			<KEYWORD1>allowed-strings</KEYWORD1>
-			<KEYWORD1>allowed-lexemes</KEYWORD1>
-			<KEYWORD1>allowed-integers</KEYWORD1>
-			<KEYWORD1>allowed-floats</KEYWORD1>
-			<KEYWORD1>allowed-numbers</KEYWORD1>
-			<KEYWORD1>allowed-instance-names</KEYWORD1>
-			<KEYWORD1>allowed-values</KEYWORD1>
-			<KEYWORD1>?VARIABLE</KEYWORD1>
-
-			<KEYWORD2>if</KEYWORD2>
-			<KEYWORD2>while</KEYWORD2>
-			<KEYWORD2>then</KEYWORD2>
-			<KEYWORD2>else</KEYWORD2>
-			<KEYWORD2>or</KEYWORD2>
-			<KEYWORD2>and</KEYWORD2>
-			<KEYWORD2>eq</KEYWORD2>
-			<KEYWORD2>evenp</KEYWORD2>
-			<KEYWORD2>floatp</KEYWORD2>
-			<KEYWORD2>integerp</KEYWORD2>
-			<KEYWORD2>lexemep</KEYWORD2>
-			<KEYWORD2>multifieldp</KEYWORD2>
-			<KEYWORD2>neq</KEYWORD2>
-			<KEYWORD2>not</KEYWORD2>
-			<KEYWORD2>numberp</KEYWORD2>
-			<KEYWORD2>oddp</KEYWORD2>
-			<KEYWORD2>pointerp</KEYWORD2>
-			<KEYWORD2>stringp</KEYWORD2>
-			<KEYWORD2>symbolp</KEYWORD2>
-			<KEYWORD2>switch</KEYWORD2>
-			<KEYWORD2>while</KEYWORD2>
-
-			<KEYWORD3>assert</KEYWORD3>
-			<KEYWORD3>bind</KEYWORD3>
-			<KEYWORD3>class-abstractp</KEYWORD3>
-			<KEYWORD3>class-existp</KEYWORD3>
-			<KEYWORD3>class-subclasses</KEYWORD3>
-			<KEYWORD3>class-superclasses</KEYWORD3>
-			<KEYWORD3>defclass-module</KEYWORD3>
-			<KEYWORD3>describe-classes</KEYWORD3>
-			<KEYWORD3>get-class-defaults-mode</KEYWORD3>
-			<KEYWORD3>get-defclass-list</KEYWORD3>
-			<KEYWORD3>agenda</KEYWORD3>
-			<KEYWORD3>list-defclasses</KEYWORD3>
-			<KEYWORD3>ppdefclass</KEYWORD3>
-			<KEYWORD3>set-class-defaults-mode</KEYWORD3>
-			<KEYWORD3>slot-allowed-values</KEYWORD3>
-			<KEYWORD3>slot-cardinality</KEYWORD3>
-			<KEYWORD3>slot-default-value</KEYWORD3>
-			<KEYWORD3>slot-direct-accessp</KEYWORD3>
-			<KEYWORD3>slot-existp</KEYWORD3>
-			<KEYWORD3>slot-facest</KEYWORD3>
-			<KEYWORD3>slot-initablep</KEYWORD3>
-			<KEYWORD3>slot-publicp</KEYWORD3>
-			<KEYWORD3>slot-range</KEYWORD3>
-			<KEYWORD3>slot-sources</KEYWORD3>
-			<KEYWORD3>slot-types</KEYWORD3>
-			<KEYWORD3>slot-writablep</KEYWORD3>
-			<KEYWORD3>subsclassp</KEYWORD3>
-			<KEYWORD3>undefclass</KEYWORD3>
-			<KEYWORD3>get-deffacts-list</KEYWORD3>
-			<KEYWORD3>list-deffacts</KEYWORD3>
-			<KEYWORD3>ppdeffacts</KEYWORD3>
-			<KEYWORD3>undeffacts</KEYWORD3>
-			<KEYWORD3>get-deffunction-list</KEYWORD3>
-			<KEYWORD3>list-deffunction</KEYWORD3>
-			<KEYWORD3>ppdeffunction</KEYWORD3>
-			<KEYWORD3>undeffunction</KEYWORD3>
-			<KEYWORD3>get-defgeneric-list</KEYWORD3>
-			<KEYWORD3>list-defgenerics</KEYWORD3>
-			<KEYWORD3>ppdefgeneric</KEYWORD3>
-			<KEYWORD3>preview-generic</KEYWORD3>
-			<KEYWORD3>type</KEYWORD3>
-			<KEYWORD3>undefgeneric</KEYWORD3>
-			<KEYWORD3>get-defglobal-list</KEYWORD3>
-			<KEYWORD3>get-reset-globals</KEYWORD3>
-			<KEYWORD3>list-defglobals</KEYWORD3>
-			<KEYWORD3>ppdefglobal</KEYWORD3>
-			<KEYWORD3>set-reset-globals</KEYWORD3>
-			<KEYWORD3>undefglobal</KEYWORD3>
-			<KEYWORD3>get-definstances-list</KEYWORD3>
-			<KEYWORD3>list-definstances</KEYWORD3>
-			<KEYWORD3>ppdefinstances</KEYWORD3>
-			<KEYWORD3>undefinstances</KEYWORD3>
-			<KEYWORD3>call-next-handler</KEYWORD3>
-			<KEYWORD3>get-defmessage-handler</KEYWORD3>
-			<KEYWORD3>list-defmessage-handlers</KEYWORD3>
-			<KEYWORD3>message-handler-existp</KEYWORD3>
-			<KEYWORD3>handler-type</KEYWORD3>
-			<KEYWORD3>next-handlerp</KEYWORD3>
-			<KEYWORD3>override-next-handler</KEYWORD3>
-			<KEYWORD3>ppdefmessage-handler</KEYWORD3>
-			<KEYWORD3>undefmessage-handler</KEYWORD3>
-			<KEYWORD3>call-next-method</KEYWORD3>
-			<KEYWORD3>call-specific-method</KEYWORD3>
-			<KEYWORD3>get-defmethod-list</KEYWORD3>
-			<KEYWORD3>get-method-restrictions</KEYWORD3>
-			<KEYWORD3>list-defmethods</KEYWORD3>
-			<KEYWORD3>next-methodp</KEYWORD3>
-			<KEYWORD3>override-next-method</KEYWORD3>
-			<KEYWORD3>undefmethod</KEYWORD3>
-			<KEYWORD3>preview-generic</KEYWORD3>
-			<KEYWORD3>get-current-module</KEYWORD3>
-			<KEYWORD3>get-defmodule-list</KEYWORD3>
-			<KEYWORD3>list-defmodules</KEYWORD3>
-			<KEYWORD3>ppdefmodules</KEYWORD3>
-			<KEYWORD3>set-current-module</KEYWORD3>
-			<KEYWORD3>defrule-module</KEYWORD3>
-			<KEYWORD3>get-defrule-list</KEYWORD3>
-			<KEYWORD3>get-incremental-reset</KEYWORD3>
-			<KEYWORD3>list-defrules</KEYWORD3>
-			<KEYWORD3>matches</KEYWORD3>
-			<KEYWORD3>ppdefrule</KEYWORD3>
-			<KEYWORD3>refresh</KEYWORD3>
-			<KEYWORD3>remove-break</KEYWORD3>
-			<KEYWORD3>set-break</KEYWORD3>
-			<KEYWORD3>set-incremental-reset</KEYWORD3>
-			<KEYWORD3>show-breaks</KEYWORD3>
-			<KEYWORD3>undefrule</KEYWORD3>
-			<KEYWORD3>deftemplate-module</KEYWORD3>
-			<KEYWORD3>get-deftemaplate-list</KEYWORD3>
-			<KEYWORD3>list-deftemplates</KEYWORD3>
-			<KEYWORD3>ppdeftemplate</KEYWORD3>
-			<KEYWORD3>undeftemplate</KEYWORD3>
-			<KEYWORD3>apropos</KEYWORD3>
-			<KEYWORD3>bacth</KEYWORD3>
-			<KEYWORD3>batch*</KEYWORD3>
-			<KEYWORD3>bload</KEYWORD3>
-			<KEYWORD3>bsave</KEYWORD3>
-			<KEYWORD3>clear</KEYWORD3>
-			<KEYWORD3>exit</KEYWORD3>
-			<KEYWORD3>get-auto-float-dividend</KEYWORD3>
-			<KEYWORD3>get-dynamic-constraints-checking</KEYWORD3>
-			<KEYWORD3>get-static-constraints-checking</KEYWORD3>
-			<KEYWORD3>load</KEYWORD3>
-			<KEYWORD3>load*</KEYWORD3>
-			<KEYWORD3>options</KEYWORD3>
-			<KEYWORD3>reset</KEYWORD3>
-			<KEYWORD3>save</KEYWORD3>
-			<KEYWORD3>set-auto-float-dividend</KEYWORD3>
-			<KEYWORD3>set-dynamic-constriants-checking</KEYWORD3>
-			<KEYWORD3>set-static-constriants-checking</KEYWORD3>
-			<KEYWORD3>system</KEYWORD3>
-			<KEYWORD3>assert-string</KEYWORD3>
-			<KEYWORD3>dependencies</KEYWORD3>
-			<KEYWORD3>dependents</KEYWORD3>
-			<KEYWORD3>duplicate</KEYWORD3>
-			<KEYWORD3>facts</KEYWORD3>
-			<KEYWORD3>fact-existp</KEYWORD3>
-			<KEYWORD3>fact-index</KEYWORD3>
-			<KEYWORD3>fact-relation</KEYWORD3>
-			<KEYWORD3>fact-slot-names</KEYWORD3>
-			<KEYWORD3>fact-slot-value</KEYWORD3>
-			<KEYWORD3>get-fact-duplication</KEYWORD3>
-			<KEYWORD3>get-fact-list</KEYWORD3>
-			<KEYWORD3>load-facts</KEYWORD3>
-			<KEYWORD3>modify</KEYWORD3>
-			<KEYWORD3>retract</KEYWORD3>
-			<KEYWORD3>save-facts</KEYWORD3>
-			<KEYWORD3>set-fact-duplication</KEYWORD3>
-			<KEYWORD3>any-instancep</KEYWORD3>
-			<KEYWORD3>class</KEYWORD3>
-			<KEYWORD3>delayed-do-for-all-instances</KEYWORD3>
-			<KEYWORD3>delete-instance</KEYWORD3>
-			<KEYWORD3>direct-slot-delete$</KEYWORD3>
-			<KEYWORD3>direct-slot-insert$</KEYWORD3>
-			<KEYWORD3>direct-slot-replace$</KEYWORD3>
-			<KEYWORD3>do-for-instance</KEYWORD3>
-			<KEYWORD3>do-for-all-instances</KEYWORD3>
-			<KEYWORD3>dynamic-get</KEYWORD3>
-			<KEYWORD3>dynamic-put</KEYWORD3>
-			<KEYWORD3>find-instance</KEYWORD3>
-			<KEYWORD3>find-all-instances</KEYWORD3>
-			<KEYWORD3>init-slot</KEYWORD3>
-			<KEYWORD3>instance-address</KEYWORD3>
-			<KEYWORD3>instance-addressp</KEYWORD3>
-			<KEYWORD3>instance-existp</KEYWORD3>
-			<KEYWORD3>instance-name</KEYWORD3>
-			<KEYWORD3>instance-namep</KEYWORD3>
-			<KEYWORD3>instance-name-to-symbol</KEYWORD3>
-			<KEYWORD3>instancep</KEYWORD3>
-			<KEYWORD3>instances</KEYWORD3>
-			<KEYWORD3>load-instances</KEYWORD3>
-			<KEYWORD3>make-intance</KEYWORD3>
-			<KEYWORD3>ppinstance</KEYWORD3>
-			<KEYWORD3>restore-instances</KEYWORD3>
-			<KEYWORD3>save-instances</KEYWORD3>
-			<KEYWORD3>send</KEYWORD3>
-			<KEYWORD3>slot-delete$</KEYWORD3>
-			<KEYWORD3>slot-insert$</KEYWORD3>
-			<KEYWORD3>slot-replace$</KEYWORD3>
-			<KEYWORD3>symbol-to-instance-name</KEYWORD3>
-			<KEYWORD3>unmake-instance</KEYWORD3>
-			<KEYWORD3>create$</KEYWORD3>
-			<KEYWORD3>delete$</KEYWORD3>
-			<KEYWORD3>delete-member$</KEYWORD3>
-			<KEYWORD3>explode$</KEYWORD3>
-			<KEYWORD3>first$</KEYWORD3>
-			<KEYWORD3>implode$</KEYWORD3>
-			<KEYWORD3>insert$</KEYWORD3>
-			<KEYWORD3>length$</KEYWORD3>
-			<KEYWORD3>member$</KEYWORD3>
-			<KEYWORD3>nth$</KEYWORD3>
-			<KEYWORD3>replace$</KEYWORD3>
-			<KEYWORD3>rest$</KEYWORD3>
-			<KEYWORD3>subseq$</KEYWORD3>
-			<KEYWORD3>subsetp</KEYWORD3>
-			<KEYWORD3>break</KEYWORD3>
-			<KEYWORD3>loop-for-count</KEYWORD3>
-			<KEYWORD3>progn</KEYWORD3>
-			<KEYWORD3>progn$</KEYWORD3>
-			<KEYWORD3>return</KEYWORD3>
-			<KEYWORD3>get-profile-percent-threshold</KEYWORD3>
-			<KEYWORD3>profile-contructs</KEYWORD3>
-			<KEYWORD3>profile-info</KEYWORD3>
-			<KEYWORD3>profile-reset</KEYWORD3>
-			<KEYWORD3>set-profile-percent-threshold</KEYWORD3>
-			<KEYWORD3>expand$</KEYWORD3>
-			<KEYWORD3>get-sequence-operator-recognition</KEYWORD3>
-			<KEYWORD3>aet-sequence-operator-recognition</KEYWORD3>
-			<KEYWORD3>build</KEYWORD3>
-			<KEYWORD3>check-syntax</KEYWORD3>
-			<KEYWORD3>eval</KEYWORD3>
-			<KEYWORD3>lowcase</KEYWORD3>
-			<KEYWORD3>str-cat</KEYWORD3>
-			<KEYWORD3>str-compare</KEYWORD3>
-			<KEYWORD3>str-index</KEYWORD3>
-			<KEYWORD3>str-length</KEYWORD3>
-			<KEYWORD3>string-to-field</KEYWORD3>
-			<KEYWORD3>sub-string</KEYWORD3>
-			<KEYWORD3>sym-cat</KEYWORD3>
-			<KEYWORD3>upcase</KEYWORD3>
-			<KEYWORD3>fetch</KEYWORD3>
-			<KEYWORD3>print-region</KEYWORD3>
-			<KEYWORD3>toss</KEYWORD3>
-
-			<KEYWORD4>abs</KEYWORD4>
-			<KEYWORD4>div</KEYWORD4>
-			<KEYWORD4>float</KEYWORD4>
-			<KEYWORD4>integer</KEYWORD4>
-			<KEYWORD4>max</KEYWORD4>
-			<KEYWORD4>min</KEYWORD4>
-			<KEYWORD4>deg-grad</KEYWORD4>
-			<KEYWORD4>deg-rad</KEYWORD4>
-			<KEYWORD4>exp</KEYWORD4>
-			<KEYWORD4>grad-deg</KEYWORD4>
-			<KEYWORD4>log</KEYWORD4>
-			<KEYWORD4>log10</KEYWORD4>
-			<KEYWORD4>mod</KEYWORD4>
-			<KEYWORD4>pi</KEYWORD4>
-			<KEYWORD4>rad-deg</KEYWORD4>
-			<KEYWORD4>round</KEYWORD4>
-			<KEYWORD4>sqrt</KEYWORD4>
-			<KEYWORD4>close</KEYWORD4>
-			<KEYWORD4>format</KEYWORD4>
-			<KEYWORD4>open</KEYWORD4>
-			<KEYWORD4>printout</KEYWORD4>
-			<KEYWORD4>read</KEYWORD4>
-			<KEYWORD4>readline</KEYWORD4>
-			<KEYWORD4>remove</KEYWORD4>
-			<KEYWORD4>rename</KEYWORD4>
-			<KEYWORD4>conserve-mem</KEYWORD4>
-			<KEYWORD4>mem-used</KEYWORD4>
-			<KEYWORD4>mem-requests</KEYWORD4>
-			<KEYWORD4>release-mem</KEYWORD4>
-			<KEYWORD4>funcall</KEYWORD4>
-			<KEYWORD4>gensym</KEYWORD4>
-			<KEYWORD4>gemsym*</KEYWORD4>
-			<KEYWORD4>get-function-restriction</KEYWORD4>
-			<KEYWORD4>length</KEYWORD4>
-			<KEYWORD4>random</KEYWORD4>
-			<KEYWORD4>seed</KEYWORD4>
-			<KEYWORD4>setgen</KEYWORD4>
-			<KEYWORD4>sort</KEYWORD4>
-			<KEYWORD4>time</KEYWORD4>
-			<KEYWORD4>timer</KEYWORD4>
-			<KEYWORD4>acos</KEYWORD4>
-			<KEYWORD4>acosh</KEYWORD4>
-			<KEYWORD4>acot</KEYWORD4>
-			<KEYWORD4>acoth</KEYWORD4>
-			<KEYWORD4>acsc</KEYWORD4>
-			<KEYWORD4>acsch</KEYWORD4>
-			<KEYWORD4>asec</KEYWORD4>
-			<KEYWORD4>asin</KEYWORD4>
-			<KEYWORD4>asinh</KEYWORD4>
-			<KEYWORD4>atan</KEYWORD4>
-			<KEYWORD4>atanh</KEYWORD4>
-			<KEYWORD4>cos</KEYWORD4>
-			<KEYWORD4>cosh</KEYWORD4>
-			<KEYWORD4>cot</KEYWORD4>
-			<KEYWORD4>coth</KEYWORD4>
-			<KEYWORD4>csc</KEYWORD4>
-			<KEYWORD4>sec</KEYWORD4>
-			<KEYWORD4>sech</KEYWORD4>
-			<KEYWORD4>sin</KEYWORD4>
-			<KEYWORD4>sinh</KEYWORD4>
-			<KEYWORD4>tan</KEYWORD4>
-			<KEYWORD4>tanh</KEYWORD4>
-
-		</KEYWORDS>
-
-	</RULES>
-
-</MODE>
diff --git a/qpython/src/main/assets/syntax/clojure.xml b/qpython/src/main/assets/syntax/clojure.xml
deleted file mode 100644
index a043b5ee..00000000
--- a/qpython/src/main/assets/syntax/clojure.xml
+++ /dev/null
@@ -1,1132 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!--
-    This file is partially based on lisp.xml and mostly in
-    the documentation found at: http://clojure.org/
-
-    Why are you looking at this file?
-      Do the symbols handled by this file seem out of date?
-      Want to do something about it?
-      Do you know Clojure?
-      Do you use linux?
-        (or are you knowledgeable enought to translate to your os?)
-
-    Verify file coverage of Clojure namespace symbols using code in:
-      misc/clojure
-    in the standard jEdit source tree. See misc/clojure/README.txt for details.
-
-    author: dsm 2008-10-24 0.1
-    author: mma 2015-03-29 0.2
--->
-
-<MODE>
-    <PROPS>
-        <PROPERTY NAME="lineComment" VALUE=";" />
-        <PROPERTY NAME="noWordSep" VALUE=".*+!-_?/" />
-        <PROPERTY NAME="unalignedOpenBrackets" VALUE="(" />
-        <PROPERTY NAME="unalignedCloseBrackets" VALUE=")" />
-        <PROPERTY NAME="multipleBracketIndent" VALUE="true" />
-    </PROPS>
-
-    <RULES  IGNORE_CASE="FALSE"
-                HIGHLIGHT_DIGITS="TRUE"
-        NO_WORD_SEP=".*+!-_?/"
-        DIGIT_RE="([0-9]+)|(([0-9]*\.[0-9]+)M?)|([0-9]+/[0-9]+)">
-        <!-- S-exps / lists.
-             Quoted first so as to not break the normal ones.
-             This is highly repetitive, there must be a better way
-        -->
-        <SPAN TYPE="KEYWORD4" DELEGATE="MAIN">
-            <BEGIN>*</BEGIN>
-            <END>*</END>
-        </SPAN>
-        <SPAN TYPE="MARKUP" DELEGATE="MAIN">
-            <BEGIN>#^(</BEGIN>
-            <END>)</END>
-        </SPAN>
-        <SPAN TYPE="LITERAL3" DELEGATE="MAIN">
-            <BEGIN>@(</BEGIN>
-            <END>)</END>
-        </SPAN>
-        <SPAN TYPE="LITERAL3" DELEGATE="MAIN">
-            <BEGIN>^(</BEGIN>
-            <END>)</END>
-        </SPAN>
-        <SPAN TYPE="LITERAL3" DELEGATE="MAIN">
-            <BEGIN>`(</BEGIN>
-            <END>)</END>
-        </SPAN>
-        <SPAN TYPE="LITERAL3" DELEGATE="MAIN">
-            <BEGIN>&apos;(</BEGIN>
-            <END>)</END>
-        </SPAN>
-        <SPAN TYPE="COMMENT3" DELEGATE="MAIN">
-            <BEGIN>#_(</BEGIN>
-            <END>)</END>
-        </SPAN>
-        <SPAN TYPE="KEYWORD1" DELEGATE="MAIN">
-            <BEGIN>#(</BEGIN>
-            <END>)</END>
-        </SPAN>
-        <SPAN TYPE="MARKUP" DELEGATE="MAIN">
-            <BEGIN>(</BEGIN>
-            <END>)</END>
-        </SPAN>
-
-        <!-- Vectors -->
-        <SPAN TYPE="MARKUP" DELEGATE="MAIN">
-            <BEGIN>#^[</BEGIN>
-            <END>]</END>
-        </SPAN>
-        <SPAN TYPE="LITERAL3" DELEGATE="MAIN">
-            <BEGIN>@[</BEGIN>
-            <END>]</END>
-        </SPAN>
-        <SPAN TYPE="LITERAL3" DELEGATE="MAIN">
-            <BEGIN>^[</BEGIN>
-            <END>]</END>
-        </SPAN>
-        <SPAN TYPE="LITERAL3" DELEGATE="MAIN">
-            <BEGIN>&apos;[</BEGIN>
-            <END>]</END>
-        </SPAN>
-        <SPAN TYPE="LABEL" DELEGATE="MAIN">
-            <BEGIN>[</BEGIN>
-            <END>]</END>
-        </SPAN>
-
-        <!-- Maps -->
-        <SPAN TYPE="MARKUP" DELEGATE="MAIN">
-            <BEGIN>#^{</BEGIN>
-            <END>}</END>
-        </SPAN>
-        <SPAN TYPE="LITERAL3" DELEGATE="MAIN">
-            <BEGIN>@{</BEGIN>
-            <END>}</END>
-        </SPAN>
-        <SPAN TYPE="LITERAL3" DELEGATE="MAIN">
-            <BEGIN>^{</BEGIN>
-            <END>}</END>
-        </SPAN>
-        <SPAN TYPE="LITERAL3" DELEGATE="MAIN">
-            <BEGIN>&apos;{</BEGIN>
-            <END>}</END>
-        </SPAN>
-        <SPAN TYPE="LABEL" DELEGATE="MAIN">
-            <BEGIN>{</BEGIN>
-            <END>}</END>
-        </SPAN>
-
-        <!-- Sets -->
-        <SPAN TYPE="MARKUP" DELEGATE="MAIN">
-            <BEGIN>#^#{</BEGIN>
-            <END>}</END>
-        </SPAN>
-        <SPAN TYPE="LITERAL3" DELEGATE="MAIN">
-            <BEGIN>@#{</BEGIN>
-            <END>}</END>
-        </SPAN>
-        <SPAN TYPE="LITERAL3" DELEGATE="MAIN">
-            <BEGIN>^#{</BEGIN>
-            <END>}</END>
-        </SPAN>
-        <SPAN TYPE="LITERAL3" DELEGATE="MAIN">
-            <BEGIN>&apos;#{</BEGIN>
-            <END>}</END>
-        </SPAN>
-        <SPAN TYPE="LABEL" DELEGATE="MAIN">
-            <BEGIN>#{</BEGIN>
-            <END>}</END>
-        </SPAN>
-
-        <!-- Quoted symbols -->
-        <SEQ AT_WORD_START="TRUE" TYPE="KEYWORD2">#&apos;</SEQ>
-        <MARK_FOLLOWING
-            AT_WORD_START="TRUE"
-            TYPE="LITERAL3">&apos;</MARK_FOLLOWING>
-        <!-- Meta symbols -->
-        <MARK_FOLLOWING
-            AT_WORD_START="TRUE"
-            TYPE="LABEL">^</MARK_FOLLOWING>
-        <!-- Deref symbols -->
-        <MARK_FOLLOWING
-            AT_WORD_START="TRUE"
-            TYPE="LABEL">@</MARK_FOLLOWING>
-        <!-- java interop -->
-        <MARK_FOLLOWING
-            AT_WORD_START="TRUE"
-            TYPE="LITERAL3">.</MARK_FOLLOWING>
-        <!-- Metadata -->
-        <MARK_FOLLOWING
-            AT_WORD_START="TRUE"
-            TYPE="MARKUP">#^</MARK_FOLLOWING>
-
-            <!-- Based on convention discussed here:
-                     http://www.gigamonkeys.com/book/syntax-and-semantics.html -->
-            <EOL_SPAN TYPE="COMMENT4">;;;;</EOL_SPAN>
-            <EOL_SPAN TYPE="COMMENT3">;;;</EOL_SPAN>
-            <EOL_SPAN TYPE="COMMENT2">;;</EOL_SPAN>
-            <EOL_SPAN TYPE="COMMENT1">;</EOL_SPAN>
-
-            <SPAN TYPE="LITERAL2" DELEGATE="REGEXPS" ESCAPE="\">
-                <BEGIN>#&quot;</BEGIN>
-                <END>&quot;</END>
-            </SPAN>
-
-            <SPAN TYPE="LITERAL1" DELEGATE="STRINGS" ESCAPE="\">
-                <BEGIN>&quot;</BEGIN>
-                <END>&quot;</END>
-            </SPAN>
-
-        <!-- Character literals -->
-        <SEQ_REGEXP
-            HASH_CHAR="\"
-            AT_WORD_START="TRUE"
-            TYPE="LITERAL2">\\(.|newline|space|tab)</SEQ_REGEXP>
-
-        <!-- The &apos;.&apos; special form -->
-        <SEQ AT_WORD_START="TRUE" TYPE="LITERAL4">.</SEQ>
-
-        <!-- Namespace separators -->
-        <!-- <MARK_PREVIOUS
-                TYPE="LITERAL4"
-                MATCH_TYPE="CONTEXT">/</MARK_PREVIOUS>
-        <MARK_PREVIOUS
-                TYPE="LITERAL4"
-                MATCH_TYPE="CONTEXT">.</MARK_PREVIOUS> -->
-
-        <!-- KEYWORD4: All keywords -->
-        <MARK_FOLLOWING
-            AT_WORD_START="TRUE"
-            TYPE="KEYWORD4">:</MARK_FOLLOWING>
-
-        <KEYWORDS>
-            <!--
-                    KEYWORD1:  Definitions and binding.
-              -->
-
-            <KEYWORD1>assert</KEYWORD1>
-
-            <KEYWORD1>binding</KEYWORD1>
-
-            <KEYWORD1>bound-fn</KEYWORD1>
-            <KEYWORD1>bound-fn*</KEYWORD1>
-
-            <KEYWORD1>comment</KEYWORD1>
-
-            <KEYWORD1>compile</KEYWORD1>
-            <KEYWORD1>gen-class</KEYWORD1>
-            <KEYWORD1>gen-interface</KEYWORD1>
-
-            <KEYWORD1>declare</KEYWORD1>
-
-            <KEYWORD1>def</KEYWORD1>
-            <KEYWORD1>definline</KEYWORD1>
-            <KEYWORD1>definterceptor</KEYWORD1>
-            <KEYWORD1>definterceptorfn</KEYWORD1>
-            <KEYWORD1>definterface</KEYWORD1>
-            <KEYWORD1>defmacro</KEYWORD1>
-            <KEYWORD1>defmethod</KEYWORD1>
-            <KEYWORD1>defmulti</KEYWORD1>
-            <KEYWORD1>defn</KEYWORD1>
-            <KEYWORD1>defn-</KEYWORD1>
-            <KEYWORD1>defon-request</KEYWORD1>
-            <KEYWORD1>defonce</KEYWORD1>
-            <KEYWORD1>defprotocol</KEYWORD1>
-            <KEYWORD1>defrecord</KEYWORD1>
-            <KEYWORD1>defstruct</KEYWORD1>
-            <KEYWORD1>deftest</KEYWORD1>
-            <KEYWORD1>deftest-</KEYWORD1>
-            <KEYWORD1>deftype</KEYWORD1>
-            <KEYWORD1>extend</KEYWORD1>
-            <KEYWORD1>extenders</KEYWORD1>
-            <KEYWORD1>extend-protocol</KEYWORD1>
-            <KEYWORD1>extend-type</KEYWORD1>
-            <KEYWORD1>get-method</KEYWORD1>
-            <KEYWORD1>methods</KEYWORD1>
-            <KEYWORD1>prefers</KEYWORD1>
-            <KEYWORD1>prefer-method</KEYWORD1>
-            <KEYWORD1>remove-all-methods</KEYWORD1>
-            <KEYWORD1>remove-method</KEYWORD1>
-
-            <KEYWORD1>eval</KEYWORD1>
-
-            <KEYWORD1>fn</KEYWORD1>
-            <KEYWORD1>partial</KEYWORD1>
-
-            <KEYWORD1>ns</KEYWORD1>
-            <KEYWORD1>import</KEYWORD1>
-            <KEYWORD1>intern</KEYWORD1>
-            <KEYWORD1>loaded-libs</KEYWORD1>
-            <KEYWORD1>refer</KEYWORD1>
-            <KEYWORD1>refer-clojure</KEYWORD1>
-            <KEYWORD1>reify</KEYWORD1>
-            <KEYWORD1>require</KEYWORD1>
-            <KEYWORD1>the-ns</KEYWORD1>
-            <KEYWORD1>use</KEYWORD1>
-
-            <KEYWORD1>all-ns</KEYWORD1>
-            <KEYWORD1>alias</KEYWORD1>
-            <KEYWORD1>create-ns</KEYWORD1>
-            <KEYWORD1>find-keyword</KEYWORD1>
-            <KEYWORD1>find-ns</KEYWORD1>
-            <KEYWORD1>in-ns</KEYWORD1>
-            <KEYWORD1>ns-name</KEYWORD1>
-            <KEYWORD1>ns-map</KEYWORD1>
-            <KEYWORD1>ns-aliases</KEYWORD1>
-            <KEYWORD1>ns-interns</KEYWORD1>
-            <KEYWORD1>ns-publics</KEYWORD1>
-            <KEYWORD1>ns-imports</KEYWORD1>
-            <KEYWORD1>ns-refers</KEYWORD1>
-            <KEYWORD1>ns-resolve</KEYWORD1>
-            <KEYWORD1>ns-unmap</KEYWORD1>
-            <KEYWORD1>ns-unalias</KEYWORD1>
-            <KEYWORD1>remove-ns</KEYWORD1>
-
-            <!--
-                    KEYWORD2:  Flow control
-              -->
-
-            <KEYWORD2>case</KEYWORD2>
-
-            <KEYWORD2>cond</KEYWORD2>
-            <KEYWORD2>condp</KEYWORD2>
-            <KEYWORD2>cond-&gt;</KEYWORD2>
-            <KEYWORD2>cond-&gt;&gt;</KEYWORD2>
-
-            <KEYWORD2>destructure</KEYWORD2>
-
-            <KEYWORD2>do</KEYWORD2>
-            <KEYWORD2>doall</KEYWORD2>
-            <KEYWORD2>dorun</KEYWORD2>
-            <KEYWORD2>doseq</KEYWORD2>
-            <KEYWORD2>dosync</KEYWORD2>
-            <KEYWORD2>dotimes</KEYWORD2>
-            <KEYWORD2>doto</KEYWORD2>
-
-            <KEYWORD2>for</KEYWORD2>
-
-            <KEYWORD2>if</KEYWORD2>
-            <KEYWORD2>if-let</KEYWORD2>
-            <KEYWORD2>if-not</KEYWORD2>
-            <KEYWORD2>if-some</KEYWORD2>
-
-            <KEYWORD2>let</KEYWORD2>
-            <KEYWORD2>letfn</KEYWORD2>
-
-            <KEYWORD2>loop</KEYWORD2>
-            <KEYWORD2>recur</KEYWORD2>
-
-            <KEYWORD2>sync</KEYWORD2>
-
-            <KEYWORD2>trampoline</KEYWORD2>
-
-            <KEYWORD2>try</KEYWORD2>
-            <KEYWORD2>catch</KEYWORD2>
-            <KEYWORD2>finally</KEYWORD2>
-            <KEYWORD2>throw</KEYWORD2>
-
-            <KEYWORD2>while</KEYWORD2>
-
-            <KEYWORD2>when</KEYWORD2>
-            <KEYWORD2>when-first</KEYWORD2>
-            <KEYWORD2>when-let</KEYWORD2>
-            <KEYWORD2>when-not</KEYWORD2>
-            <KEYWORD2>when-some</KEYWORD2>
-
-            <!--
-                    KEYWORD3:  Core functions and macros
-              -->
-
-            <KEYWORD3>alter</KEYWORD3>
-            <KEYWORD3>alter-meta!</KEYWORD3>
-            <KEYWORD3>alter-var-root</KEYWORD3>
-            <KEYWORD3>commute</KEYWORD3>
-            <KEYWORD3>compare-and-set!</KEYWORD3>
-            <KEYWORD3>ensure</KEYWORD3>
-            <KEYWORD3>ref</KEYWORD3>
-            <KEYWORD3>ref-history-count</KEYWORD3>
-            <KEYWORD3>ref-max-history</KEYWORD3>
-            <KEYWORD3>ref-min-history</KEYWORD3>
-            <KEYWORD3>ref-set</KEYWORD3>
-            <KEYWORD3>reset!</KEYWORD3>
-            <KEYWORD3>reset-meta!</KEYWORD3>
-            <KEYWORD3>set!</KEYWORD3>
-            <KEYWORD3>swap!</KEYWORD3>
-
-            <KEYWORD3>agent</KEYWORD3>
-            <KEYWORD3>agent-error</KEYWORD3>
-            <KEYWORD3>agent-errors</KEYWORD3>
-            <KEYWORD3>add-watch</KEYWORD3>
-            <KEYWORD3>await</KEYWORD3>
-            <KEYWORD3>await-for</KEYWORD3>
-            <KEYWORD3>clear-agent-errors</KEYWORD3>
-            <KEYWORD3>error-handler</KEYWORD3>
-            <KEYWORD3>error-mode</KEYWORD3>
-            <KEYWORD3>get-validator</KEYWORD3>
-            <KEYWORD3>release-pending-sends</KEYWORD3>
-            <KEYWORD3>remove-watch</KEYWORD3>
-            <KEYWORD3>restart-agent</KEYWORD3>
-            <KEYWORD3>send</KEYWORD3>
-            <KEYWORD3>send-off</KEYWORD3>
-            <KEYWORD3>send-via</KEYWORD3>
-            <KEYWORD3>set-agent-send-executor!</KEYWORD3>
-            <KEYWORD3>set-agent-send-off-executor!</KEYWORD3>
-            <KEYWORD3>set-error-handler!</KEYWORD3>
-            <KEYWORD3>set-error-mode!</KEYWORD3>
-            <KEYWORD3>set-validator!</KEYWORD3>
-            <KEYWORD3>shutdown-agents</KEYWORD3>
-
-            <KEYWORD3>future</KEYWORD3>
-            <KEYWORD3>future-call</KEYWORD3>
-            <KEYWORD3>future-cancel</KEYWORD3>
-            <KEYWORD3>deliver</KEYWORD3>
-            <KEYWORD3>deref</KEYWORD3>
-            <KEYWORD3>locking</KEYWORD3>
-            <KEYWORD3>pcalls</KEYWORD3>
-            <KEYWORD3>pmap</KEYWORD3>
-            <KEYWORD3>promise</KEYWORD3>
-
-            <KEYWORD3>delay</KEYWORD3>
-            <KEYWORD3>force</KEYWORD3>
-
-            <KEYWORD3>amap</KEYWORD3>
-            <KEYWORD3>map</KEYWORD3>
-            <KEYWORD3>mapcat</KEYWORD3>
-            <KEYWORD3>mapv</KEYWORD3>
-            <KEYWORD3>map-indexed</KEYWORD3>
-            <KEYWORD3>filter</KEYWORD3>
-            <KEYWORD3>filterv</KEYWORD3>
-            <KEYWORD3>sort</KEYWORD3>
-            <KEYWORD3>sort-by</KEYWORD3>
-
-            <KEYWORD3>get-thread-bindings</KEYWORD3>
-
-            <KEYWORD3>gensym</KEYWORD3>
-
-            <KEYWORD3>memoize</KEYWORD3>
-
-            <KEYWORD3>meta</KEYWORD3>
-            <KEYWORD3>vary-meta</KEYWORD3>
-
-            <KEYWORD3>name</KEYWORD3>
-            <KEYWORD3>namespace</KEYWORD3>
-            <KEYWORD3>resolve</KEYWORD3>
-
-            <KEYWORD3>quote</KEYWORD3>
-            <KEYWORD3>unquote</KEYWORD3>
-            <KEYWORD3>unquote-splicing</KEYWORD3>
-
-            <KEYWORD3>var</KEYWORD3>
-            <KEYWORD3>find-var</KEYWORD3>
-            <KEYWORD3>var-get</KEYWORD3>
-            <KEYWORD3>var-set</KEYWORD3>
-
-            <!-- Types and allocators -->
-            <KEYWORD3>empty</KEYWORD3>
-            <KEYWORD3>new</KEYWORD3>
-            <KEYWORD3>array-map</KEYWORD3>
-            <KEYWORD3>atom</KEYWORD3>
-            <KEYWORD3>bigdec</KEYWORD3>
-            <KEYWORD3>bigint</KEYWORD3>
-            <KEYWORD3>biginteger</KEYWORD3>
-            <KEYWORD3>boolean</KEYWORD3>
-            <KEYWORD3>boolean-array</KEYWORD3>
-            <KEYWORD3>booleans</KEYWORD3>
-            <KEYWORD3>byte</KEYWORD3>
-            <KEYWORD3>byte-array</KEYWORD3>
-            <KEYWORD3>bytes</KEYWORD3>
-            <KEYWORD3>cast</KEYWORD3>
-            <KEYWORD3>char</KEYWORD3>
-            <KEYWORD3>char-array</KEYWORD3>
-            <KEYWORD3>chars</KEYWORD3>
-            <KEYWORD3>construct-proxy</KEYWORD3>
-            <KEYWORD3>create-struct</KEYWORD3>
-            <KEYWORD3>denominator</KEYWORD3>
-            <KEYWORD3>double</KEYWORD3>
-            <KEYWORD3>double-array</KEYWORD3>
-            <KEYWORD3>doubles</KEYWORD3>
-            <KEYWORD3>enumeration-seq</KEYWORD3>
-            <KEYWORD3>float</KEYWORD3>
-            <KEYWORD3>float-array</KEYWORD3>
-            <KEYWORD3>floats</KEYWORD3>
-            <KEYWORD3>get-proxy-class</KEYWORD3>
-            <KEYWORD3>hash</KEYWORD3>
-            <KEYWORD3>hash-combine</KEYWORD3>
-            <KEYWORD3>hash-map</KEYWORD3>
-            <KEYWORD3>hash-ordered-coll</KEYWORD3>
-            <KEYWORD3>hash-set</KEYWORD3>
-            <KEYWORD3>hash-unordered-coll</KEYWORD3>
-            <KEYWORD3>init-proxy</KEYWORD3>
-            <KEYWORD3>int</KEYWORD3>
-            <KEYWORD3>int-array</KEYWORD3>
-            <KEYWORD3>interpose</KEYWORD3>
-            <KEYWORD3>ints</KEYWORD3>
-            <KEYWORD3>list</KEYWORD3>
-            <KEYWORD3>list*</KEYWORD3>
-            <KEYWORD3>long</KEYWORD3>
-            <KEYWORD3>long-array</KEYWORD3>
-            <KEYWORD3>longs</KEYWORD3>
-            <KEYWORD3>make-array</KEYWORD3>
-            <KEYWORD3>num</KEYWORD3>
-            <KEYWORD3>numerator</KEYWORD3>
-            <KEYWORD3>partition</KEYWORD3>
-            <KEYWORD3>partition-all</KEYWORD3>
-            <KEYWORD3>partition-by</KEYWORD3>
-            <KEYWORD3>proxy</KEYWORD3>
-            <KEYWORD3>proxy-call-with-super</KEYWORD3>
-            <KEYWORD3>proxy-mappings</KEYWORD3>
-            <KEYWORD3>proxy-name</KEYWORD3>
-            <KEYWORD3>proxy-super</KEYWORD3>
-            <KEYWORD3>rationalize</KEYWORD3>
-            <KEYWORD3>seq</KEYWORD3>
-            <KEYWORD3>seque</KEYWORD3>
-            <KEYWORD3>sequence</KEYWORD3>
-            <KEYWORD3>set</KEYWORD3>
-            <KEYWORD3>short</KEYWORD3>
-            <KEYWORD3>short-array</KEYWORD3>
-            <KEYWORD3>shorts</KEYWORD3>
-            <KEYWORD3>sorted-map</KEYWORD3>
-            <KEYWORD3>sorted-map-by</KEYWORD3>
-            <KEYWORD3>sorted-set</KEYWORD3>
-            <KEYWORD3>sorted-set-by</KEYWORD3>
-            <KEYWORD3>struct</KEYWORD3>
-            <KEYWORD3>struct-map</KEYWORD3>
-            <KEYWORD3>str</KEYWORD3>
-            <KEYWORD3>symbol</KEYWORD3>
-            <KEYWORD3>tree-seq</KEYWORD3>
-            <KEYWORD3>type</KEYWORD3>
-            <KEYWORD3>update-proxy</KEYWORD3>
-            <KEYWORD3>vec</KEYWORD3>
-            <KEYWORD3>vector</KEYWORD3>
-            <KEYWORD3>vector-of</KEYWORD3>
-            <KEYWORD3>xml-seq</KEYWORD3>
-
-            <!-- Java Interop -->
-            <KEYWORD3>.</KEYWORD3>
-            <KEYWORD3>..</KEYWORD3>
-            <KEYWORD3>aclone</KEYWORD3>
-            <KEYWORD3>ancestors</KEYWORD3>
-            <KEYWORD3>bases</KEYWORD3>
-            <KEYWORD3>bean</KEYWORD3>
-            <KEYWORD3>class</KEYWORD3>
-            <KEYWORD3>derive</KEYWORD3>
-            <KEYWORD3>descendants</KEYWORD3>
-            <KEYWORD3>file-seq</KEYWORD3>
-            <KEYWORD3>iterator-seq</KEYWORD3>
-            <KEYWORD3>make-hierarchy</KEYWORD3>
-            <KEYWORD3>namespace-munge</KEYWORD3>
-            <KEYWORD3>object-array</KEYWORD3>
-            <KEYWORD3>parents</KEYWORD3>
-            <KEYWORD3>primitives-classnames</KEYWORD3>
-            <KEYWORD3>supers</KEYWORD3>
-            <KEYWORD3>underive</KEYWORD3>
-
-            <KEYWORD3>memfn</KEYWORD3>
-
-            <!-- Evaluation -->
-            <KEYWORD3>apply</KEYWORD3>
-            <KEYWORD3>eval</KEYWORD3>
-            <KEYWORD3>load</KEYWORD3>
-            <KEYWORD3>load-file</KEYWORD3>
-            <KEYWORD3>load-reader</KEYWORD3>
-            <KEYWORD3>load-string</KEYWORD3>
-            <KEYWORD3>read</KEYWORD3>
-            <KEYWORD3>read-line</KEYWORD3>
-            <KEYWORD3>read-string</KEYWORD3>
-
-            <!-- with- forms -->
-            <KEYWORD3>with-bindings</KEYWORD3>
-            <KEYWORD3>with-bindings*</KEYWORD3>
-            <KEYWORD3>with-in-str</KEYWORD3>
-            <KEYWORD3>with-loading-context</KEYWORD3>
-            <KEYWORD3>with-local-vars</KEYWORD3>
-            <KEYWORD3>with-meta</KEYWORD3>
-            <KEYWORD3>with-open</KEYWORD3>
-            <KEYWORD3>with-out-str</KEYWORD3>
-            <KEYWORD3>with-precision</KEYWORD3>
-            <KEYWORD3>with-redefs</KEYWORD3>
-            <KEYWORD3>with-redefs-fn</KEYWORD3>
-            <KEYWORD3>with-test</KEYWORD3>
-            <KEYWORD3>with-test-out</KEYWORD3>
-
-            <KEYWORD3>aset-boolean</KEYWORD3>
-            <KEYWORD3>aset-byte</KEYWORD3>
-            <KEYWORD3>aset-char</KEYWORD3>
-            <KEYWORD3>aset-double</KEYWORD3>
-            <KEYWORD3>aset-float</KEYWORD3>
-            <KEYWORD3>aset-int</KEYWORD3>
-            <KEYWORD3>aset-long</KEYWORD3>
-            <KEYWORD3>aset-short</KEYWORD3>
-
-            <KEYWORD3>char-escape-string</KEYWORD3>
-            <KEYWORD3>char-name-string</KEYWORD3>
-
-            <KEYWORD3>clojure-version</KEYWORD3>
-
-            <KEYWORD3>compare</KEYWORD3>
-            <KEYWORD3>complement</KEYWORD3>
-
-            <KEYWORD3>default-data-readers</KEYWORD3>
-
-            <KEYWORD3>every-pred</KEYWORD3>
-            <KEYWORD3>juxt</KEYWORD3>
-
-            <KEYWORD3>ex-data</KEYWORD3>
-            <KEYWORD3>ex-info</KEYWORD3>
-
-            <KEYWORD3>identity</KEYWORD3>
-
-            <KEYWORD3>keyword</KEYWORD3>
-
-            <KEYWORD3>line-seq</KEYWORD3>
-
-            <KEYWORD3>macroexpand-1</KEYWORD3>
-            <KEYWORD3>macroexpand</KEYWORD3>
-
-            <KEYWORD3>parse</KEYWORD3>
-
-            <!-- Printing -->
-            <KEYWORD3>pr</KEYWORD3>
-            <KEYWORD3>prn</KEYWORD3>
-            <KEYWORD3>print</KEYWORD3>
-            <KEYWORD3>printf</KEYWORD3>
-            <KEYWORD3>println</KEYWORD3>
-            <KEYWORD3>pr-str</KEYWORD3>
-            <KEYWORD3>prn-str</KEYWORD3>
-            <KEYWORD3>print-dup</KEYWORD3>
-            <KEYWORD3>print-str</KEYWORD3>
-            <KEYWORD3>println-str</KEYWORD3>
-            <KEYWORD3>flush</KEYWORD3>
-            <KEYWORD3>format</KEYWORD3>
-            <KEYWORD3>io!</KEYWORD3>
-            <KEYWORD3>newline</KEYWORD3>
-
-            <KEYWORD3>rand</KEYWORD3>
-            <KEYWORD3>rand-int</KEYWORD3>
-            <KEYWORD3>rand-nth</KEYWORD3>
-
-            <!-- regular expressions -->
-            <KEYWORD3>re-find</KEYWORD3>
-            <KEYWORD3>re-groups</KEYWORD3>
-            <KEYWORD3>re-matcher</KEYWORD3>
-            <KEYWORD3>re-matches</KEYWORD3>
-            <KEYWORD3>re-pattern</KEYWORD3>
-            <KEYWORD3>re-seq</KEYWORD3>
-
-            <KEYWORD3>slurp</KEYWORD3>
-            <KEYWORD3>spit</KEYWORD3>
-
-            <KEYWORD3>test</KEYWORD3>
-
-            <KEYWORD3>time</KEYWORD3>
-
-            <KEYWORD3>transient</KEYWORD3>
-            <KEYWORD3>assoc!</KEYWORD3>
-            <KEYWORD3>conj!</KEYWORD3>
-            <KEYWORD3>disj!</KEYWORD3>
-            <KEYWORD3>dissoc!</KEYWORD3>
-            <KEYWORD3>persistent!</KEYWORD3>
-            <KEYWORD3>pop!</KEYWORD3>
-
-            <!-- Collections -->
-            <KEYWORD3>accessor</KEYWORD3>
-            <KEYWORD3>aget</KEYWORD3>
-            <KEYWORD3>alength</KEYWORD3>
-            <KEYWORD3>areduce</KEYWORD3>
-            <KEYWORD3>aset</KEYWORD3>
-            <KEYWORD3>assoc</KEYWORD3>
-            <KEYWORD3>assoc-in</KEYWORD3>
-            <KEYWORD3>butlast</KEYWORD3>
-            <KEYWORD3>comp</KEYWORD3>
-            <KEYWORD3>comparator</KEYWORD3>
-            <KEYWORD3>concat</KEYWORD3>
-            <KEYWORD3>conj</KEYWORD3>
-            <KEYWORD3>cons</KEYWORD3>
-            <KEYWORD3>constantly</KEYWORD3>
-            <KEYWORD3>count</KEYWORD3>
-            <KEYWORD3>cycle</KEYWORD3>
-            <KEYWORD3>disj</KEYWORD3>
-            <KEYWORD3>dissoc</KEYWORD3>
-            <KEYWORD3>distinct</KEYWORD3>
-            <KEYWORD3>drop</KEYWORD3>
-            <KEYWORD3>drop-last</KEYWORD3>
-            <KEYWORD3>drop-while</KEYWORD3>
-            <KEYWORD3>ffirst</KEYWORD3>
-            <KEYWORD3>find</KEYWORD3>
-            <KEYWORD3>first</KEYWORD3>
-            <KEYWORD3>flatten</KEYWORD3>
-            <KEYWORD3>fnext</KEYWORD3>
-            <KEYWORD3>fnil</KEYWORD3>
-            <KEYWORD3>frequencies</KEYWORD3>
-            <KEYWORD3>frest</KEYWORD3>
-            <KEYWORD3>get</KEYWORD3>
-            <KEYWORD3>get-in</KEYWORD3>
-            <KEYWORD3>group-by</KEYWORD3>
-            <KEYWORD3>interleave</KEYWORD3>
-            <KEYWORD3>into</KEYWORD3>
-            <KEYWORD3>into-array</KEYWORD3>
-            <KEYWORD3>iterate</KEYWORD3>
-            <KEYWORD3>key</KEYWORD3>
-            <KEYWORD3>keep</KEYWORD3>
-            <KEYWORD3>keep-indexed</KEYWORD3>
-            <KEYWORD3>keys</KEYWORD3>
-            <KEYWORD3>last</KEYWORD3>
-            <KEYWORD3>lazy-cat</KEYWORD3>
-            <KEYWORD3>lazy-cons</KEYWORD3>
-            <KEYWORD3>lazy-seq</KEYWORD3>
-            <KEYWORD3>max</KEYWORD3>
-            <KEYWORD3>max-key</KEYWORD3>
-            <KEYWORD3>merge</KEYWORD3>
-            <KEYWORD3>merge-with</KEYWORD3>
-            <KEYWORD3>min</KEYWORD3>
-            <KEYWORD3>min-key</KEYWORD3>
-            <KEYWORD3>mix-collection-hash</KEYWORD3>
-            <KEYWORD3>munge</KEYWORD3>
-            <KEYWORD3>next</KEYWORD3>
-            <KEYWORD3>nfirst</KEYWORD3>
-            <KEYWORD3>nnext</KEYWORD3>
-            <KEYWORD3>nth</KEYWORD3>
-            <KEYWORD3>nthnext</KEYWORD3>
-            <KEYWORD3>nthrest</KEYWORD3>
-            <KEYWORD3>peek</KEYWORD3>
-            <KEYWORD3>pop</KEYWORD3>
-            <KEYWORD3>put</KEYWORD3>
-            <KEYWORD3>pvalues</KEYWORD3>
-            <KEYWORD3>range</KEYWORD3>
-            <KEYWORD3>reduce</KEYWORD3>
-            <KEYWORD3>reduced</KEYWORD3>
-            <KEYWORD3>reduce-kv</KEYWORD3>
-            <KEYWORD3>reductions</KEYWORD3>
-            <KEYWORD3>remove</KEYWORD3>
-            <KEYWORD3>repeat</KEYWORD3>
-            <KEYWORD3>repeatedly</KEYWORD3>
-            <KEYWORD3>replace</KEYWORD3>
-            <KEYWORD3>replicate</KEYWORD3>
-            <KEYWORD3>rest</KEYWORD3>
-            <KEYWORD3>reverse</KEYWORD3>
-            <KEYWORD3>rfirst</KEYWORD3>
-            <KEYWORD3>rrest</KEYWORD3>
-            <KEYWORD3>rseq</KEYWORD3>
-            <KEYWORD3>rsubseq</KEYWORD3>
-            <KEYWORD3>second</KEYWORD3>
-            <KEYWORD3>select-keys</KEYWORD3>
-            <KEYWORD3>shuffle</KEYWORD3>
-            <KEYWORD3>some</KEYWORD3>
-            <KEYWORD3>some-&gt;</KEYWORD3>
-            <KEYWORD3>some-&gt;&gt;</KEYWORD3>
-            <KEYWORD3>some-fn</KEYWORD3>
-            <KEYWORD3>split-at</KEYWORD3>
-            <KEYWORD3>split-with</KEYWORD3>
-            <KEYWORD3>subs</KEYWORD3>
-            <KEYWORD3>subseq</KEYWORD3>
-            <KEYWORD3>subvec</KEYWORD3>
-            <KEYWORD3>take</KEYWORD3>
-            <KEYWORD3>take-last</KEYWORD3>
-            <KEYWORD3>take-nth</KEYWORD3>
-            <KEYWORD3>take-while</KEYWORD3>
-            <KEYWORD3>to-array</KEYWORD3>
-            <KEYWORD3>to-array-2d</KEYWORD3>
-            <KEYWORD3>update-in</KEYWORD3>
-            <KEYWORD3>val</KEYWORD3>
-            <KEYWORD3>vals</KEYWORD3>
-
-            <!-- SQL functions -->
-            <KEYWORD3>resultset-seq</KEYWORD3>
-
-            <KEYWORD3>zipmap</KEYWORD3>
-
-            <!--
-                    KEYWORD4:  Core variables
-                               (and keywords, per MARK_FOLLOWING above)
-              -->
-
-            <!-- Special symbols -->
-            <KEYWORD4>&amp;</KEYWORD4>
-
-            <KEYWORD4>*1</KEYWORD4>
-            <KEYWORD4>*2</KEYWORD4>
-            <KEYWORD4>*3</KEYWORD4>
-
-            <KEYWORD4>*agent*</KEYWORD4>
-
-            <KEYWORD4>*clojure-version*</KEYWORD4>
-            <KEYWORD4>*command-line-args*</KEYWORD4>
-            <KEYWORD4>*compile-files*</KEYWORD4>
-            <KEYWORD4>*compile-path*</KEYWORD4>
-            <KEYWORD4>*compiler-options*</KEYWORD4>
-
-            <KEYWORD4>*data-readers*</KEYWORD4>
-            <KEYWORD4>*default-data-reader-fn*</KEYWORD4>
-
-            <KEYWORD4>*e</KEYWORD4>
-
-            <KEYWORD4>*file*</KEYWORD4>
-
-            <KEYWORD4>*flush-on-newline*</KEYWORD4>
-
-            <KEYWORD4>*err*</KEYWORD4>
-            <KEYWORD4>*in*</KEYWORD4>
-            <KEYWORD4>*out*</KEYWORD4>
-
-            <KEYWORD4>*ns*</KEYWORD4>
-
-            <KEYWORD4>*open-url-script*</KEYWORD4>
-
-            <KEYWORD4>*print-base*</KEYWORD4>
-            <KEYWORD4>*print-dup*</KEYWORD4>
-            <KEYWORD4>*print-length*</KEYWORD4>
-            <KEYWORD4>*print-level*</KEYWORD4>
-            <KEYWORD4>*print-miser-width*</KEYWORD4>
-            <KEYWORD4>*print-meta*</KEYWORD4>
-            <KEYWORD4>*print-pprint-dispatch*</KEYWORD4>
-            <KEYWORD4>*print-pretty*</KEYWORD4>
-            <KEYWORD4>*print-radix*</KEYWORD4>
-            <KEYWORD4>*print-readably*</KEYWORD4>
-            <KEYWORD4>*print-right-margin*</KEYWORD4>
-            <KEYWORD4>*print-suppress-namespaces*</KEYWORD4>
-
-            <KEYWORD4>*read-eval*</KEYWORD4>
-
-            <KEYWORD4>*unchecked-math*</KEYWORD4>
-
-            <KEYWORD4>*warn-on-reflection*</KEYWORD4>
-
-            <!-- clojure.xml -->
-            <KEYWORD4>*current*</KEYWORD4>
-            <KEYWORD4>*sb*</KEYWORD4>
-            <KEYWORD4>*stack*</KEYWORD4>
-            <KEYWORD4>*state*</KEYWORD4>
-
-            <!--
-                    FUNCTION:  Functions outside of the core.
-              -->
-
-            <!-- clojure.core (seemed overkill for KEYWORD3 or OPERATOR) -->
-            <FUNCTION>unchecked-add</FUNCTION>
-            <FUNCTION>unchecked-add-int</FUNCTION>
-            <FUNCTION>unchecked-byte</FUNCTION>
-            <FUNCTION>unchecked-char</FUNCTION>
-            <FUNCTION>unchecked-dec</FUNCTION>
-            <FUNCTION>unchecked-dec-int</FUNCTION>
-            <FUNCTION>unchecked-divide-int</FUNCTION>
-            <FUNCTION>unchecked-double</FUNCTION>
-            <FUNCTION>unchecked-float</FUNCTION>
-            <FUNCTION>unchecked-inc</FUNCTION>
-            <FUNCTION>unchecked-inc-int</FUNCTION>
-            <FUNCTION>unchecked-int</FUNCTION>
-            <FUNCTION>unchecked-long</FUNCTION>
-            <FUNCTION>unchecked-multiply</FUNCTION>
-            <FUNCTION>unchecked-negate</FUNCTION>
-            <FUNCTION>unchecked-negate-int</FUNCTION>
-            <FUNCTION>unchecked-remainder-int</FUNCTION>
-            <FUNCTION>unchecked-short</FUNCTION>
-            <FUNCTION>unchecked-subtract</FUNCTION>
-            <FUNCTION>unchecked-subtract-int</FUNCTION>
-            <FUNCTION>unsigned-bit-shift-right</FUNCTION>
-
-            <!-- clojure.data.browse -->
-            <FUNCTION>browse-url</FUNCTION>
-
-            <!-- clojure.data -->
-            <FUNCTION>diff</FUNCTION>
-            <FUNCTION>diff-similar</FUNCTION>
-
-            <!-- clojure.instant -->
-            <FUNCTION>parse-timestamp</FUNCTION>
-            <FUNCTION>read-instant-calendar</FUNCTION>
-            <FUNCTION>read-instant-date</FUNCTION>
-            <FUNCTION>read-instant-timestamp</FUNCTION>
-            <FUNCTION>validated</FUNCTION>
-
-            <!-- clojure.java.io -->
-            <FUNCTION>as-file</FUNCTION>
-            <FUNCTION>as-relative-path</FUNCTION>
-            <FUNCTION>as-url</FUNCTION>
-            <FUNCTION>copy</FUNCTION>
-            <FUNCTION>delete-file</FUNCTION>
-            <FUNCTION>file</FUNCTION>
-            <FUNCTION>input-stream</FUNCTION>
-            <FUNCTION>output-stream</FUNCTION>
-            <FUNCTION>make-input-stream</FUNCTION>
-            <FUNCTION>make-output-stream</FUNCTION>
-            <FUNCTION>make-parents</FUNCTION>
-            <FUNCTION>make-reader</FUNCTION>
-            <FUNCTION>make-writer</FUNCTION>
-            <FUNCTION>reader</FUNCTION>
-            <FUNCTION>resource</FUNCTION>
-            <FUNCTION>writer</FUNCTION>
-
-            <!-- clojure.pprint -->
-            <FUNCTION>cl-format</FUNCTION>
-            <FUNCTION>code-dispatch</FUNCTION>
-            <FUNCTION>formatter</FUNCTION>
-            <FUNCTION>formatter-out</FUNCTION>
-            <FUNCTION>fresh-line</FUNCTION>
-            <FUNCTION>get-pretty-writer</FUNCTION>
-            <FUNCTION>pp</FUNCTION>
-            <FUNCTION>pprint</FUNCTION>
-            <FUNCTION>pprint-indent</FUNCTION>
-            <FUNCTION>pprint-logical-block</FUNCTION>
-            <FUNCTION>pprint-newline</FUNCTION>
-            <FUNCTION>pprint-tab</FUNCTION>
-            <FUNCTION>print-length-loop</FUNCTION>
-            <FUNCTION>print-table</FUNCTION>
-            <FUNCTION>set-pprint-dispatch</FUNCTION>
-            <FUNCTION>simple-dispatch</FUNCTION>
-            <FUNCTION>with-pprint-dispatch</FUNCTION>
-            <FUNCTION>write</FUNCTION>
-            <FUNCTION>write-out </FUNCTION>
-
-            <!-- clojure.set -->
-            <FUNCTION>difference</FUNCTION>
-            <FUNCTION>index</FUNCTION>
-            <FUNCTION>intersection</FUNCTION>
-            <FUNCTION>join</FUNCTION>
-            <FUNCTION>map-invert</FUNCTION>
-            <FUNCTION>project</FUNCTION>
-            <FUNCTION>rename</FUNCTION>
-            <FUNCTION>rename-keys</FUNCTION>
-            <FUNCTION>select</FUNCTION>
-            <FUNCTION>union</FUNCTION>
-
-            <!-- clojure.stacktrace -->
-            <FUNCTION>e</FUNCTION>
-            <FUNCTION>print-cause-trace</FUNCTION>
-            <FUNCTION>print-stack-trace</FUNCTION>
-            <FUNCTION>print-throwable</FUNCTION>
-            <FUNCTION>print-trace-element</FUNCTION>
-            <FUNCTION>root-cause</FUNCTION>
-
-            <!-- clojure.string -->
-            <FUNCTION>capitalize</FUNCTION>
-            <FUNCTION>escape</FUNCTION>
-            <FUNCTION>join</FUNCTION>
-            <FUNCTION>lower-case</FUNCTION>
-            <FUNCTION>re-quote-replacement</FUNCTION>
-            <FUNCTION>replace-first</FUNCTION>
-            <FUNCTION>split</FUNCTION>
-            <FUNCTION>split-lines</FUNCTION>
-            <FUNCTION>trim</FUNCTION>
-            <FUNCTION>trim-newline</FUNCTION>
-            <FUNCTION>triml</FUNCTION>
-            <FUNCTION>trimr</FUNCTION>
-            <FUNCTION>upper-case</FUNCTION>
-
-            <!-- clojure.test -->
-            <FUNCTION>are</FUNCTION>
-            <FUNCTION>assert-any</FUNCTION>
-            <FUNCTION>assert-expr</FUNCTION>
-            <FUNCTION>assert-predicate</FUNCTION>
-            <FUNCTION>compose-fixtures</FUNCTION>
-            <FUNCTION>is</FUNCTION>
-            <FUNCTION>join-fixtures</FUNCTION>
-            <FUNCTION>testing</FUNCTION>
-            <FUNCTION>try-expr</FUNCTION>
-            <FUNCTION>use-fixtures</FUNCTION>
-
-            <!-- clojure.walk -->
-            <FUNCTION>keywordize-keys</FUNCTION>
-            <FUNCTION>macroexpand-all</FUNCTION>
-            <FUNCTION>postwalk</FUNCTION>
-            <FUNCTION>postwalk-demo</FUNCTION>
-            <FUNCTION>postwalk-replace</FUNCTION>
-            <FUNCTION>prewalk</FUNCTION>
-            <FUNCTION>prewalk-demo</FUNCTION>
-            <FUNCTION>prewalk-replace</FUNCTION>
-            <FUNCTION>stringify-keys</FUNCTION>
-            <FUNCTION>walk</FUNCTION>
-
-            <!-- clojure.xml -->
-            <FUNCTION>attrs</FUNCTION>
-            <FUNCTION>content</FUNCTION>
-            <FUNCTION>content-handler</FUNCTION>
-            <FUNCTION>element</FUNCTION>
-            <FUNCTION>emit</FUNCTION>
-            <FUNCTION>emit-element</FUNCTION>
-            <FUNCTION>parse</FUNCTION>
-            <FUNCTION>startparse-sax</FUNCTION>
-            <FUNCTION>tag</FUNCTION>
-
-            <!-- clojure.zip -->
-            <FUNCTION>append-child</FUNCTION>
-            <FUNCTION>children</FUNCTION>
-            <FUNCTION>down</FUNCTION>
-            <FUNCTION>edit</FUNCTION>
-            <FUNCTION>insert-child</FUNCTION>
-            <FUNCTION>insert-left</FUNCTION>
-            <FUNCTION>insert-right</FUNCTION>
-            <FUNCTION>left</FUNCTION>
-            <FUNCTION>leftmost</FUNCTION>
-            <FUNCTION>lefts</FUNCTION>
-            <FUNCTION>make-node</FUNCTION>
-            <FUNCTION>next</FUNCTION>
-            <FUNCTION>node</FUNCTION>
-            <FUNCTION>path</FUNCTION>
-            <FUNCTION>prev</FUNCTION>
-            <FUNCTION>remove</FUNCTION>
-            <FUNCTION>replace</FUNCTION>
-            <FUNCTION>right</FUNCTION>
-            <FUNCTION>rightmost</FUNCTION>
-            <FUNCTION>rights</FUNCTION>
-            <FUNCTION>root</FUNCTION>
-            <FUNCTION>seq-zip</FUNCTION>
-            <FUNCTION>up</FUNCTION>
-            <FUNCTION>vector-zip</FUNCTION>
-            <FUNCTION>xml-zip</FUNCTION>
-            <FUNCTION>zipper</FUNCTION>
-
-            <!--
-                    LITERAL3: Predicates
-             -->
-
-            <!-- Predicates -->
-            <LITERAL3>associative?</LITERAL3>
-            <LITERAL3>atom?</LITERAL3>
-            <LITERAL3>blank?</LITERAL3>
-            <LITERAL3>bound?</LITERAL3>
-            <LITERAL3>branch?</LITERAL3>
-            <LITERAL3>char?</LITERAL3>
-            <LITERAL3>class?</LITERAL3>
-            <LITERAL3>contains?</LITERAL3>
-            <LITERAL3>counted?</LITERAL3>
-            <LITERAL3>decimal?</LITERAL3>
-            <LITERAL3>delay?</LITERAL3>
-            <LITERAL3>distinct?</LITERAL3>
-            <LITERAL3>empty?</LITERAL3>
-            <LITERAL3>end?</LITERAL3>
-            <LITERAL3>even?</LITERAL3>
-            <LITERAL3>every?</LITERAL3>
-            <LITERAL3>false?</LITERAL3>
-            <LITERAL3>float?</LITERAL3>
-            <LITERAL3>fn?</LITERAL3>
-            <LITERAL3>function?</LITERAL3>
-            <LITERAL3>future?</LITERAL3>
-            <LITERAL3>future-cancelled?</LITERAL3>
-            <LITERAL3>future-done?</LITERAL3>
-            <LITERAL3>extends?</LITERAL3>
-            <LITERAL3>identical?</LITERAL3>
-            <LITERAL3>ifn?</LITERAL3>
-            <LITERAL3>instance?</LITERAL3>
-            <LITERAL3>integer?</LITERAL3>
-            <LITERAL3>isa?</LITERAL3>
-            <LITERAL3>keyword?</LITERAL3>
-            <LITERAL3>list?</LITERAL3>
-            <LITERAL3>map?</LITERAL3>
-            <LITERAL3>neg?</LITERAL3>
-            <LITERAL3>nil?</LITERAL3>
-            <LITERAL3>not-any?</LITERAL3>
-            <LITERAL3>not-empty</LITERAL3>
-            <LITERAL3>not-every?</LITERAL3>
-            <LITERAL3>number?</LITERAL3>
-            <LITERAL3>odd?</LITERAL3>
-            <LITERAL3>pos?</LITERAL3>
-            <LITERAL3>ratio?</LITERAL3>
-            <LITERAL3>rational?</LITERAL3>
-            <LITERAL3>realized?</LITERAL3>
-            <LITERAL3>record?</LITERAL3>
-            <LITERAL3>reduced?</LITERAL3>
-            <LITERAL3>reversible?</LITERAL3>
-            <LITERAL3>satisfies?</LITERAL3>
-            <LITERAL3>seq?</LITERAL3>
-            <LITERAL3>sequential?</LITERAL3>
-            <LITERAL3>set?</LITERAL3>
-            <LITERAL3>some?</LITERAL3>
-            <LITERAL3>sorted?</LITERAL3>
-            <LITERAL3>string?</LITERAL3>
-            <LITERAL3>subset?</LITERAL3>
-            <LITERAL3>successful?</LITERAL3>
-            <LITERAL3>superset?</LITERAL3>
-            <LITERAL3>symbol?</LITERAL3>
-            <LITERAL3>true?</LITERAL3>
-            <LITERAL3>var?</LITERAL3>
-            <LITERAL3>vector?</LITERAL3>
-            <LITERAL3>zero?</LITERAL3>
-
-            <!-- also quot which matches ' symbol defined above as LITERAL3 -->
-            <LITERAL3>quot</LITERAL3>
-
-            <!--
-                    LITERAL4: Simple literals
-             -->
-
-            <LITERAL4>nil</LITERAL4>
-
-            <LITERAL4>true</LITERAL4>
-            <LITERAL4>false</LITERAL4>
-
-            <!--
-                    OPERATOR: Operators
-             -->
-
-            <OPERATOR>+</OPERATOR>
-            <OPERATOR>+'</OPERATOR>
-            <OPERATOR>-</OPERATOR>
-            <OPERATOR>-'</OPERATOR>
-            <OPERATOR>=</OPERATOR>
-            <OPERATOR>==</OPERATOR>
-            <OPERATOR>as-&gt;</OPERATOR>
-            <OPERATOR>-&gt;</OPERATOR>
-            <OPERATOR>-&gt;&gt;</OPERATOR>
-            <OPERATOR>&gt;=</OPERATOR>
-            <OPERATOR>&gt;</OPERATOR>
-            <OPERATOR>&lt;=</OPERATOR>
-            <OPERATOR>&lt;</OPERATOR>
-            <OPERATOR>/</OPERATOR>
-            <OPERATOR>*</OPERATOR>
-            <OPERATOR>*'</OPERATOR>
-            <OPERATOR>%</OPERATOR>
-            <OPERATOR>and</OPERATOR>
-            <OPERATOR>or</OPERATOR>
-            <OPERATOR>inc</OPERATOR>
-            <OPERATOR>inc'</OPERATOR>
-            <OPERATOR>dec</OPERATOR>
-            <OPERATOR>dec'</OPERATOR>
-            <OPERATOR>mod</OPERATOR>
-            <OPERATOR>not</OPERATOR>
-            <OPERATOR>not=</OPERATOR>
-            <OPERATOR>rem</OPERATOR>
-            <OPERATOR>bit-and</OPERATOR>
-            <OPERATOR>bit-and-not</OPERATOR>
-            <OPERATOR>bit-clear</OPERATOR>
-            <OPERATOR>bit-flip</OPERATOR>
-            <OPERATOR>bit-or</OPERATOR>
-            <OPERATOR>bit-not</OPERATOR>
-            <OPERATOR>bit-set</OPERATOR>
-            <OPERATOR>bit-shift-right</OPERATOR>
-            <OPERATOR>bit-shift-left</OPERATOR>
-            <OPERATOR>bit-test</OPERATOR>
-            <OPERATOR>bit-xor</OPERATOR>
-        </KEYWORDS>
-    </RULES>
-
-    <RULES  SET="STRINGS"
-            HIGHLIGHT_DIGITS="FALSE"
-            DEFAULT="LITERAL1"
-            IGNORE_CASE="TRUE">
-        <SEQ_REGEXP
-            HASH_CHAR="\"
-            AT_WORD_START="FALSE"
-            TYPE="LABEL">\\.</SEQ_REGEXP>
-        <KEYWORDS>
-            <INVALID>&quot;</INVALID>
-        </KEYWORDS>
-    </RULES>
-
-    <RULES  SET="REGEXPS"
-            HIGHLIGHT_DIGITS="FALSE"
-            DEFAULT="LITERAL1"
-            IGNORE_CASE="TRUE">
-        <!-- TODO: Put actual regexp syntax hilighting -->
-        <SEQ_REGEXP
-            HASH_CHAR="\"
-            AT_WORD_START="FALSE"
-            TYPE="LABEL">\\.</SEQ_REGEXP>
-        <KEYWORDS>
-            <INVALID>&quot;</INVALID>
-        </KEYWORDS>
-    </RULES>
-</MODE>
-
diff --git a/qpython/src/main/assets/syntax/cmake.xml b/qpython/src/main/assets/syntax/cmake.xml
deleted file mode 100644
index 75956ef2..00000000
--- a/qpython/src/main/assets/syntax/cmake.xml
+++ /dev/null
@@ -1,186 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-<!--
-jEdit Syntax Mode for cmake
-Last change:  2008-07-05
-Author:       Bernhard Walle <bernhard.walle@gmx.de>
-
-<MODE NAME="cmake" FILE="cmake.xml" FILE_NAME_GLOB="CMakeLists.txt"/>
-
-see http://jedit.org/users-guide/installing-modes.html
--->
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="lineComment" VALUE="#"/>
-
-		<PROPERTY NAME="indentSize" VALUE="4"/>
-		<PROPERTY NAME="firstlineGlob" VALUE=""/>
-		<PROPERTY NAME="wrap" VALUE="none"/>
-		<PROPERTY NAME="noTabs" VALUE="false"/>
-		<PROPERTY NAME="tabSize" VALUE="8"/>
-		<PROPERTY NAME="maxLineLen" VALUE="0"/>
-		<PROPERTY NAME="noWordSep" VALUE="_"/>
-		<PROPERTY NAME="folding" VALUE="none"/>
-		<PROPERTY NAME="customSettings" VALUE="true"/>
-		<PROPERTY NAME="deepIndent" VALUE="false"/>
-		<PROPERTY NAME="collapseFolds" VALUE="1000"/>
-	</PROPS>
-	<RULES IGNORE_CASE="TRUE" HIGHLIGHT_DIGITS="TRUE">
-
-    <!-- Comments -->
-    <EOL_SPAN TYPE="COMMENT1">#</EOL_SPAN>
-
-    <!-- variables -->
-    <SPAN TYPE="KEYWORD2" NO_LINE_BREAK="TRUE">
-      <BEGIN>${</BEGIN>
-      <END>}</END>
-    </SPAN>
-    <MARK_FOLLOWING TYPE="KEYWORD2">$</MARK_FOLLOWING>
-
-    <!-- string literals -->
-		<SPAN TYPE="LITERAL1" DELEGATE="LITERAL">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-
-    <!-- Function calls -->
-		<MARK_PREVIOUS TYPE="FUNCTION" MATCH_TYPE="OPERATOR">(</MARK_PREVIOUS>
-		<SEQ TYPE="OPERATOR">)</SEQ>
-
-    <KEYWORDS>
-      <!-- operators -->
-      <OPERATOR>AND</OPERATOR>
-      <OPERATOR>BOOL</OPERATOR>
-      <OPERATOR>CACHE</OPERATOR>
-      <OPERATOR>COMMAND</OPERATOR>
-      <OPERATOR>DEFINED</OPERATOR>
-      <OPERATOR>DOC</OPERATOR>
-      <OPERATOR>EQUAL</OPERATOR>
-      <OPERATOR>EXISTS</OPERATOR>
-      <OPERATOR>FALSE</OPERATOR>
-      <OPERATOR>GREATER</OPERATOR>
-      <OPERATOR>INTERNAL</OPERATOR>
-      <OPERATOR>LESS</OPERATOR>
-      <OPERATOR>MATCHES</OPERATOR>
-      <OPERATOR>NAME</OPERATOR>
-      <OPERATOR>NAMES</OPERATOR>
-      <OPERATOR>NAME_WE</OPERATOR>
-      <OPERATOR>NOT</OPERATOR>
-      <OPERATOR>OFF</OPERATOR>
-      <OPERATOR>ON</OPERATOR>
-      <OPERATOR>OR</OPERATOR>
-      <OPERATOR>PATH</OPERATOR>
-      <OPERATOR>PATHS</OPERATOR>
-      <OPERATOR>PROGRAM</OPERATOR>
-      <OPERATOR>STREQUAL</OPERATOR>
-      <OPERATOR>STRGREATER</OPERATOR>
-      <OPERATOR>STRING</OPERATOR>
-      <OPERATOR>STRLESS</OPERATOR>
-      <OPERATOR>TRUE</OPERATOR>
-
-      <!-- conditionals -->
-      <KEYWORD4>FOREACH</KEYWORD4>
-      <KEYWORD4>ELSE</KEYWORD4>
-      <KEYWORD4>ELSEIF</KEYWORD4>
-      <KEYWORD4>IF</KEYWORD4>
-      <KEYWORD4>MACRO</KEYWORD4>
-      <KEYWORD4>ENDIF</KEYWORD4>
-      <KEYWORD4>ENDWHILE</KEYWORD4>
-      <KEYWORD4>ENDFOREACH</KEYWORD4>
-      <KEYWORD4>ENDMACRO</KEYWORD4>
-      <KEYWORD4>WHILE</KEYWORD4>
-
-      <!-- default function names -->
-      <KEYWORD2>ADD_CUSTOM_COMMAND</KEYWORD2>
-      <KEYWORD2>ADD_CUSTOM_TARGET</KEYWORD2>
-      <KEYWORD2>ADD_DEFINITIONS</KEYWORD2>
-      <KEYWORD2>ADD_DEPENDENCIES</KEYWORD2>
-      <KEYWORD2>ADD_EXECUTABLE</KEYWORD2>
-      <KEYWORD2>ADD_LIBRARY</KEYWORD2>
-      <KEYWORD2>ADD_SUBDIRECTORY</KEYWORD2>
-      <KEYWORD2>ADD_TEST</KEYWORD2>
-      <KEYWORD2>AUX_SOURCE_DIRECTORY</KEYWORD2>
-      <KEYWORD2>BUILD_COMMAND</KEYWORD2>
-      <KEYWORD2>BUILD_NAME</KEYWORD2>
-      <KEYWORD2>CMAKE_MINIMUM_REQUIRED</KEYWORD2>
-      <KEYWORD2>CONFIGURE_FILE</KEYWORD2>
-      <KEYWORD2>CREATE_TEST_SOURCELIST</KEYWORD2>
-      <KEYWORD2>ENABLE_LANGUAGE</KEYWORD2>
-      <KEYWORD2>ENABLE_TESTING</KEYWORD2>
-      <KEYWORD2>EXEC_PROGRAM</KEYWORD2>
-      <KEYWORD2>EXECUTE_PROCESS</KEYWORD2>
-      <KEYWORD2>EXPORT_LIBRARY_DEPENDENCIES</KEYWORD2>
-      <KEYWORD2>FILE</KEYWORD2>
-      <KEYWORD2>FIND_FILE</KEYWORD2>
-      <KEYWORD2>FIND_LIBRARY</KEYWORD2>
-      <KEYWORD2>FIND_PACKAGE</KEYWORD2>
-      <KEYWORD2>FIND_PATH</KEYWORD2>
-      <KEYWORD2>FIND_PROGRAM</KEYWORD2>
-      <KEYWORD2>FLTK_WRAP_UI</KEYWORD2>
-      <KEYWORD2>GET_CMAKE_PROPERTY</KEYWORD2>
-      <KEYWORD2>GET_DIRECTORY_PROPERTY</KEYWORD2>
-      <KEYWORD2>GET_FILENAME_COMPONENT</KEYWORD2>
-      <KEYWORD2>GET_SOURCE_FILE_PROPERTY</KEYWORD2>
-      <KEYWORD2>GET_TARGET_PROPERTY</KEYWORD2>
-      <KEYWORD2>GET_TEST_PROPERTY</KEYWORD2>
-      <KEYWORD2>INCLUDE</KEYWORD2>
-      <KEYWORD2>INCLUDE_DIRECTORIES</KEYWORD2>
-      <KEYWORD2>INCLUDE_EXTERNAL_MSPROJECT</KEYWORD2>
-      <KEYWORD2>INCLUDE_REGULAR_EXPRESSION</KEYWORD2>
-      <KEYWORD2>INSTALL</KEYWORD2>
-      <KEYWORD2>INSTALL_FILES</KEYWORD2>
-      <KEYWORD2>INSTALL_PROGRAMS</KEYWORD2>
-      <KEYWORD2>INSTALL_TARGETS</KEYWORD2>
-      <KEYWORD2>LINK_DIRECTORIES</KEYWORD2>
-      <KEYWORD2>LINK_LIBRARIES</KEYWORD2>
-      <KEYWORD2>LIST</KEYWORD2>
-      <KEYWORD2>LOAD_CACHE</KEYWORD2>
-      <KEYWORD2>LOAD_COMMAND</KEYWORD2>
-      <KEYWORD2>MAKE_DIRECTORY</KEYWORD2>
-      <KEYWORD2>MARK_AS_ADVANCED</KEYWORD2>
-      <KEYWORD2>MATH</KEYWORD2>
-      <KEYWORD2>MESSAGE</KEYWORD2>
-      <KEYWORD2>OPTION</KEYWORD2>
-      <KEYWORD2>OUTPUT_REQUIRED_FILES</KEYWORD2>
-      <KEYWORD2>PROJECT</KEYWORD2>
-      <KEYWORD2>QT_WRAP_CPP</KEYWORD2>
-      <KEYWORD2>QT_WRAP_UI</KEYWORD2>
-      <KEYWORD2>REMOVE</KEYWORD2>
-      <KEYWORD2>REMOVE_DEFINITIONS</KEYWORD2>
-      <KEYWORD2>SEPARATE_ARGUMENTS</KEYWORD2>
-      <KEYWORD2>SET</KEYWORD2>
-      <KEYWORD2>SET_DIRECTORY_PROPERTIES</KEYWORD2>
-      <KEYWORD2>SET_SOURCE_FILES_PROPERTIES</KEYWORD2>
-      <KEYWORD2>SET_TARGET_PROPERTIES</KEYWORD2>
-      <KEYWORD2>SET_TESTS_PROPERTIES</KEYWORD2>
-      <KEYWORD2>SITE_NAME</KEYWORD2>
-      <KEYWORD2>SOURCE_GROUP</KEYWORD2>
-      <KEYWORD2>STRING</KEYWORD2>
-      <KEYWORD2>SUBDIR_DEPENDS</KEYWORD2>
-      <KEYWORD2>SUBDIRS</KEYWORD2>
-      <KEYWORD2>TARGET_LINK_LIBRARIES</KEYWORD2>
-      <KEYWORD2>TRY_COMPILE</KEYWORD2>
-      <KEYWORD2>TRY_RUN</KEYWORD2>
-      <KEYWORD2>USE_MANGLED_MESA</KEYWORD2>
-      <KEYWORD2>UTILITY_SOURCE</KEYWORD2>
-      <KEYWORD2>VARIABLE_REQUIRES</KEYWORD2>
-      <KEYWORD2>VTK_MAKE_INSTANTIATOR</KEYWORD2>
-      <KEYWORD2>VTK_WRAP_JAVA</KEYWORD2>
-      <KEYWORD2>VTK_WRAP_PYTHON</KEYWORD2>
-      <KEYWORD2>VTK_WRAP_TCL</KEYWORD2>
-      <KEYWORD2>WRITE_FILE</KEYWORD2>
-    </KEYWORDS>
-
-	</RULES>
-  <RULES SET="LITERAL" DEFAULT="LITERAL1" ESCAPE="\">
-    <!-- Variables -->
-    <SPAN TYPE="KEYWORD2" NO_LINE_BREAK="TRUE">
-      <BEGIN>${</BEGIN>
-      <END>}</END>
-    </SPAN>
-    <MARK_FOLLOWING TYPE="KEYWORD2">$</MARK_FOLLOWING>
-  </RULES>
-
-</MODE>
-
-
diff --git a/qpython/src/main/assets/syntax/cobol.xml b/qpython/src/main/assets/syntax/cobol.xml
deleted file mode 100644
index 1fe9fab8..00000000
--- a/qpython/src/main/assets/syntax/cobol.xml
+++ /dev/null
@@ -1,1057 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE MODE SYSTEM "xmode.dtd"><!-- COBOL mode, by Matthias M. Schneider, edit by M. Roehner
-
- Change   Utilities - GlobalOptions... :jEdit:SyntaxHighlighting - COMMENT4:bgColor
- (or insert in  properties:
-  view.style.comment4=color\:\#cc6600 bgColor\:\#f0f0f0
- )
- for "downlighting" comment columns
-
-Feature (bug?-):
- - If a line is longer then 72 characters, only the commentary columns are downlighted.
- - Can be disabled by deleting <IMPORT DELEGATE="CT2"/>.
--->
-
-
-<MODE>
- <PROPS>
-<!--  <PROPERTY NAME="view.style.comment4" VALUE="color\:\#804000 bgColor\:\#f0f0f0" />
--->
-
-  <PROPERTY NAME="wordBreakChars" VALUE=",+_=&lt;&gt;/?^&amp;*" />
-
-  <!-- Auto indent experimental-->
-<!--
-  <PROPERTY NAME="indentNextLine" VALUE="^.{6}[^\*/][ \t]*(\b(if|perform|search)\b.*)$" />
-  <PROPERTY NAME="unindentThisLine" VALUE="^.{6}[^\*/][ \t]*(\b(end\-if|end\-perform|end\-search)\b.*)$" />
-  <PROPERTY NAME="doubleBracketIndent" VALUE="true" />
-  <PROPERTY NAME="lineUpClosingBracket" VALUE="true" />
--->
- </PROPS>
-
-
- <RULES IGNORE_CASE="TRUE" HIGHLIGHT_DIGITS="TRUE">
-  <IMPORT DELEGATE="CT1"/>
-  <IMPORT DELEGATE="CT2"/>
-<!-- <IMPORT DELEGATE="CT2"/> -->
-  <IMPORT DELEGATE="LEX"/>
- </RULES>
-
- <RULES SET="CT1" IGNORE_CASE="TRUE">
-  <SEQ_REGEXP TYPE="COMMENT4" AT_LINE_START="TRUE" >.{6}[D\- ]</SEQ_REGEXP>
-  <EOL_SPAN_REGEXP TYPE="INVALID" AT_LINE_START="TRUE" >.{6}[^/*]</EOL_SPAN_REGEXP>
-  <EOL_SPAN_REGEXP DELEGATE="CTL" AT_LINE_START="TRUE" MATCH_TYPE="RULE" >(?=.{6}[*/])</EOL_SPAN_REGEXP>
-  <SEQ_REGEXP TYPE="COMMENT4" AT_LINE_START="TRUE" >.{1,6}</SEQ_REGEXP>
- </RULES> <!-- SET="CT1" -->
-
-
- <RULES SET="CTL">
-<!--
-  <SEQ_REGEXP TYPE="COMMENT4" AT_LINE_START="TRUE" >.{6}</SEQ_REGEXP>
-  <EOL_SPAN_REGEXP TYPE="COMMENT1" MATCH_TYPE="CONTEXT"
-  >.{6}</EOL_SPAN_REGEXP>
-not working -->
-  <EOL_SPAN_REGEXP TYPE="COMMENT4" MATCH_TYPE="CONTEXT"
-  >.{5}</EOL_SPAN_REGEXP>
- </RULES> <!-- SET="CTL" -->
-
-
- <RULES SET="CT2" IGNORE_CASE="TRUE">
-  <EOL_SPAN_REGEXP TYPE="COMMENT4" MATCH_TYPE="CONTEXT">(.{65})</EOL_SPAN_REGEXP>
- </RULES> <!-- SET="CT2" -->
-
-
-<!-- -->
- <RULES SET="LEX" IGNORE_CASE="TRUE">
-  <SPAN TYPE="LITERAL2" ESCAPE="\" NO_LINE_BREAK="TRUE">
-   <BEGIN>x"</BEGIN>
-   <END>"</END>
-  </SPAN>
-  <SPAN TYPE="LITERAL1" ESCAPE="\" NO_LINE_BREAK="TRUE">
-   <BEGIN>"</BEGIN>
-   <END>"</END>
-  </SPAN>
-  <SPAN TYPE="LITERAL1" ESCAPE="\" NO_LINE_BREAK="TRUE">
-   <BEGIN>'</BEGIN>
-   <END>'</END>
-  </SPAN>
-
-  <SEQ_REGEXP TYPE="OPERATOR"> &lt; </SEQ_REGEXP>
-  <SEQ_REGEXP TYPE="OPERATOR"> &lt;= </SEQ_REGEXP>
-  <SEQ_REGEXP TYPE="OPERATOR"> &gt; </SEQ_REGEXP>
-  <SEQ_REGEXP TYPE="OPERATOR"> &gt;= </SEQ_REGEXP>
-  <SEQ_REGEXP TYPE="OPERATOR"> \+ </SEQ_REGEXP>
-  <SEQ_REGEXP TYPE="OPERATOR"> - </SEQ_REGEXP>
-  <SEQ_REGEXP TYPE="OPERATOR"> / </SEQ_REGEXP>
-  <SEQ_REGEXP TYPE="OPERATOR"> \* </SEQ_REGEXP>
-  <SEQ_REGEXP TYPE="OPERATOR"> \*\* </SEQ_REGEXP>
-  <SEQ_REGEXP TYPE="OPERATOR"> % </SEQ_REGEXP>
-  <SEQ_REGEXP TYPE="OPERATOR"> &amp; </SEQ_REGEXP>
-  <SEQ_REGEXP TYPE="OPERATOR"> \| </SEQ_REGEXP>
-  <SEQ_REGEXP TYPE="OPERATOR"> \^ </SEQ_REGEXP>
-  <SEQ_REGEXP TYPE="OPERATOR"> ~ </SEQ_REGEXP>
-
-  <SPAN TYPE="COMMENT2" NO_LINE_BREAK="FALSE">
-   <BEGIN>EXEC SQL</BEGIN>
-   <END>END-EXEC</END>
-  </SPAN>
-
-  <KEYWORDS>
-   <KEYWORD1>ACCEPT</KEYWORD1>
-   <KEYWORD1>ACCESS</KEYWORD1>
-   <KEYWORD1>ACTUAL</KEYWORD1>
-   <KEYWORD1>ADD</KEYWORD1>
-   <KEYWORD1>ADDRESS</KEYWORD1>
-   <KEYWORD1>ADVANCING</KEYWORD1>
-   <KEYWORD1>AFTER</KEYWORD1>
-   <KEYWORD1>ALL</KEYWORD1>
-   <KEYWORD1>ALPHABET</KEYWORD1>
-   <KEYWORD1>ALPHABETIC</KEYWORD1>
-   <KEYWORD1>ALPHABETIC-LOWER</KEYWORD1>
-   <KEYWORD1>ALPHABETIC-UPPER</KEYWORD1>
-   <KEYWORD1>ALPHANUMERIC</KEYWORD1>
-   <KEYWORD1>ALPHANUMERIC-EDITED</KEYWORD1>
-   <KEYWORD1>ALSO</KEYWORD1>
-   <KEYWORD1>ALTER</KEYWORD1>
-   <KEYWORD1>ALTERNATE</KEYWORD1>
-   <KEYWORD1>AND</KEYWORD1>
-   <KEYWORD1>ANY</KEYWORD1>
-   <KEYWORD1>API</KEYWORD1>
-   <KEYWORD1>APPLY</KEYWORD1>
-   <KEYWORD1>ARE</KEYWORD1>
-   <KEYWORD1>AREA</KEYWORD1>
-   <KEYWORD1>AREAS</KEYWORD1>
-   <KEYWORD1>ASCENDING</KEYWORD1>
-   <KEYWORD1>ASSIGN</KEYWORD1>
-   <KEYWORD1>AT</KEYWORD1>
-   <KEYWORD1>AUTHOR</KEYWORD1>
-   <KEYWORD1>AUTO</KEYWORD1>
-   <KEYWORD1>AUTO-SKIP</KEYWORD1>
-   <KEYWORD1>AUTOMATIC</KEYWORD1>
-
-   <KEYWORD1>BACKGROUND-COLOR</KEYWORD1>
-   <KEYWORD1>BACKGROUND-COLOUR</KEYWORD1>
-   <KEYWORD1>BACKWARD</KEYWORD1>
-   <KEYWORD1>BASIS</KEYWORD1>
-   <KEYWORD1>BEEP</KEYWORD1>
-   <KEYWORD1>BEFORE</KEYWORD1>
-   <KEYWORD1>BEGINNING</KEYWORD1>
-   <KEYWORD1>BELL</KEYWORD1>
-   <KEYWORD1>BINARY</KEYWORD1>
-   <KEYWORD1>BLANK</KEYWORD1>
-   <KEYWORD1>BLINK</KEYWORD1>
-   <KEYWORD1>BLOCK</KEYWORD1>
-   <KEYWORD1>BOTTOM</KEYWORD1>
-   <KEYWORD1>BY</KEYWORD1>
-
-   <KEYWORD1>C01</KEYWORD1>
-   <KEYWORD1>C02</KEYWORD1>
-   <KEYWORD1>C03</KEYWORD1>
-   <KEYWORD1>C04</KEYWORD1>
-   <KEYWORD1>C05</KEYWORD1>
-   <KEYWORD1>C06</KEYWORD1>
-   <KEYWORD1>C07</KEYWORD1>
-   <KEYWORD1>C08</KEYWORD1>
-   <KEYWORD1>C09</KEYWORD1>
-   <KEYWORD1>C10</KEYWORD1>
-   <KEYWORD1>C11</KEYWORD1>
-   <KEYWORD1>C12</KEYWORD1>
-   <KEYWORD1>CALL</KEYWORD1>
-   <KEYWORD1>CALL-CONVENTION</KEYWORD1>
-   <KEYWORD1>CANCEL</KEYWORD1>
-   <KEYWORD1>CBL</KEYWORD1>
-   <KEYWORD1>CD</KEYWORD1>
-   <KEYWORD1>CF</KEYWORD1>
-   <KEYWORD1>CH</KEYWORD1>
-   <KEYWORD1>CHAIN</KEYWORD1>
-   <KEYWORD1>CHAINING</KEYWORD1>
-   <KEYWORD1>CHANGED</KEYWORD1>
-   <KEYWORD1>CHARACTER</KEYWORD1>
-   <KEYWORD1>CHARACTERS</KEYWORD1>
-   <KEYWORD1>CLASS</KEYWORD1>
-   <KEYWORD1>CLOCK-UNITS</KEYWORD1>
-   <KEYWORD1>CLOSE</KEYWORD1>
-   <KEYWORD1>COBOL</KEYWORD1>
-   <KEYWORD1>CODE</KEYWORD1>
-   <KEYWORD1>CODE-SET</KEYWORD1>
-   <KEYWORD1>COL</KEYWORD1>
-   <KEYWORD1>COLLATING</KEYWORD1>
-   <KEYWORD1>COLUMN</KEYWORD1>
-   <KEYWORD1>COM-REG</KEYWORD1>
-   <KEYWORD1>COMMA</KEYWORD1>
-   <KEYWORD1>COMMIT</KEYWORD1>
-   <KEYWORD1>COMMON</KEYWORD1>
-   <KEYWORD1>COMMUNICATION</KEYWORD1>
-   <KEYWORD1>COMP</KEYWORD1>
-   <KEYWORD1>COMP-0</KEYWORD1>
-   <KEYWORD1>COMP-1</KEYWORD1>
-   <KEYWORD1>COMP-2</KEYWORD1>
-   <KEYWORD1>COMP-3</KEYWORD1>
-   <KEYWORD1>COMP-4</KEYWORD1>
-   <KEYWORD1>COMP-5</KEYWORD1>
-   <KEYWORD1>COMP-6</KEYWORD1>
-   <KEYWORD1>COMP-X</KEYWORD1>
-   <KEYWORD1>COMPUTATIONAL</KEYWORD1>
-   <KEYWORD1>COMPUTATIONAL-0</KEYWORD1>
-   <KEYWORD1>COMPUTATIONAL-1</KEYWORD1>
-   <KEYWORD1>COMPUTATIONAL-2</KEYWORD1>
-   <KEYWORD1>COMPUTATIONAL-3</KEYWORD1>
-   <KEYWORD1>COMPUTATIONAL-4</KEYWORD1>
-   <KEYWORD1>COMPUTATIONAL-5</KEYWORD1>
-   <KEYWORD1>COMPUTATIONAL-6</KEYWORD1>
-   <KEYWORD1>COMPUTATIONAL-X</KEYWORD1>
-   <KEYWORD1>COMPUTE</KEYWORD1>
-   <KEYWORD1>CONFIGURATION</KEYWORD1>
-   <KEYWORD1>CONSOLE</KEYWORD1>
-   <KEYWORD1>CONTAINS</KEYWORD1>
-   <KEYWORD1>CONTENT</KEYWORD1>
-   <KEYWORD1>CONTINUE</KEYWORD1>
-   <KEYWORD1>CONTROL</KEYWORD1>
-   <KEYWORD1>CONTROLS</KEYWORD1>
-   <KEYWORD1>CONVERTING</KEYWORD1>
-   <KEYWORD1>COPY</KEYWORD1>
-   <KEYWORD1>CORE-INDEX</KEYWORD1>
-   <KEYWORD1>CORR</KEYWORD1>
-   <KEYWORD1>CORRESPONDING</KEYWORD1>
-   <KEYWORD1>COUNT</KEYWORD1>
-   <KEYWORD1>CRT</KEYWORD1>
-   <KEYWORD1>CRT-UNDER</KEYWORD1>
-   <KEYWORD1>CURRENCY</KEYWORD1>
-   <KEYWORD1>CURRENT-DATE</KEYWORD1>
-   <KEYWORD1>CURSOR</KEYWORD1>
-   <KEYWORD1>CYCLE</KEYWORD1>
-   <KEYWORD1>CYL-INDEX</KEYWORD1>
-   <KEYWORD1>CYL-OVERFLOW</KEYWORD1>
-
-   <KEYWORD1>DATA</KEYWORD1>
-   <KEYWORD1>DATE</KEYWORD1>
-   <KEYWORD1>DATE-COMPILED</KEYWORD1>
-   <KEYWORD1>DATE-WRITTEN</KEYWORD1>
-   <KEYWORD1>DAY</KEYWORD1>
-   <KEYWORD1>DAY-OF-WEEK</KEYWORD1>
-   <KEYWORD1>DBCS</KEYWORD1>
-   <KEYWORD1>DE</KEYWORD1>
-   <KEYWORD1>DEBUG</KEYWORD1>
-   <KEYWORD1>DEBUG-CONTENTS</KEYWORD1>
-   <KEYWORD1>DEBUG-ITEM</KEYWORD1>
-   <KEYWORD1>DEBUG-LINE</KEYWORD1>
-   <KEYWORD1>DEBUG-NAME</KEYWORD1>
-   <KEYWORD1>DEBUG-SUB-1</KEYWORD1>
-   <KEYWORD1>DEBUG-SUB-2</KEYWORD1>
-   <KEYWORD1>DEBUG-SUB-3</KEYWORD1>
-   <KEYWORD1>DEBUGGING</KEYWORD1>
-   <KEYWORD1>DECIMAL-POINT</KEYWORD1>
-   <KEYWORD1>DECLARATIVES</KEYWORD1>
-   <KEYWORD1>DELETE</KEYWORD1>
-   <KEYWORD1>DELIMITED</KEYWORD1>
-   <KEYWORD1>DELIMITER</KEYWORD1>
-   <KEYWORD1>DEPENDING</KEYWORD1>
-   <KEYWORD1>DESCENDING</KEYWORD1>
-   <KEYWORD1>DESTINATION</KEYWORD1>
-   <KEYWORD1>DETAIL</KEYWORD1>
-   <KEYWORD1>DISABLE</KEYWORD1>
-   <KEYWORD1>DISK</KEYWORD1>
-   <KEYWORD1>DISP</KEYWORD1>
-   <KEYWORD1>DISPLAY</KEYWORD1>
-   <KEYWORD1>DISPLAY-1</KEYWORD1>
-   <KEYWORD1>DISPLAY-ST</KEYWORD1>
-   <KEYWORD1>DIVIDE</KEYWORD1>
-   <KEYWORD1>DIVISION</KEYWORD1>
-   <KEYWORD1>DOWN</KEYWORD1>
-   <KEYWORD1>DUPLICATES</KEYWORD1>
-   <KEYWORD1>DYNAMIC</KEYWORD1>
-
-   <KEYWORD1>ECHO</KEYWORD1>
-   <KEYWORD1>EGCS</KEYWORD1>
-   <KEYWORD1>EGI</KEYWORD1>
-   <KEYWORD1>EJECT</KEYWORD1>
-   <KEYWORD1>ELSE</KEYWORD1>
-   <KEYWORD1>EMI</KEYWORD1>
-   <KEYWORD1>EMPTY-CHECK</KEYWORD1>
-   <KEYWORD1>ENABLE</KEYWORD1>
-   <KEYWORD1>END</KEYWORD1>
-   <KEYWORD1>END-ACCEPT</KEYWORD1>
-   <KEYWORD1>END-ADD</KEYWORD1>
-   <KEYWORD1>END-CALL</KEYWORD1>
-   <KEYWORD1>END-CHAIN</KEYWORD1>
-   <KEYWORD1>END-COMPUTE</KEYWORD1>
-   <KEYWORD1>END-DELETE</KEYWORD1>
-   <KEYWORD1>END-DISPLAY</KEYWORD1>
-   <KEYWORD1>END-DIVIDE</KEYWORD1>
-   <KEYWORD1>END-EVALUATE</KEYWORD1>
-   <KEYWORD1>END-IF</KEYWORD1>
-   <KEYWORD1>END-INVOKE</KEYWORD1>
-   <KEYWORD1>END-MULTIPLY</KEYWORD1>
-   <KEYWORD1>END-OF-PAGE</KEYWORD1>
-   <KEYWORD1>END-PERFORM</KEYWORD1>
-   <KEYWORD1>END-READ</KEYWORD1>
-   <KEYWORD1>END-RECEIVE</KEYWORD1>
-   <KEYWORD1>END-RETURN</KEYWORD1>
-   <KEYWORD1>END-REWRITE</KEYWORD1>
-   <KEYWORD1>END-SEARCH</KEYWORD1>
-   <KEYWORD1>END-START</KEYWORD1>
-   <KEYWORD1>END-STRING</KEYWORD1>
-   <KEYWORD1>END-SUBTRACT</KEYWORD1>
-   <KEYWORD1>END-UNSTRING</KEYWORD1>
-   <KEYWORD1>END-WRITE</KEYWORD1>
-   <KEYWORD1>ENDING</KEYWORD1>
-   <KEYWORD1>ENTER</KEYWORD1>
-   <KEYWORD1>ENTRY</KEYWORD1>
-   <KEYWORD1>ENVIRONMENT</KEYWORD1>
-   <KEYWORD1>EOL</KEYWORD1>
-   <KEYWORD1>EOP</KEYWORD1>
-   <KEYWORD1>EOS</KEYWORD1>
-   <KEYWORD1>EQUAL</KEYWORD1>
-   <KEYWORD1>EQUALS</KEYWORD1>
-   <KEYWORD1>ERASE</KEYWORD1>
-   <KEYWORD1>ERROR</KEYWORD1>
-   <KEYWORD1>ESCAPE</KEYWORD1>
-   <KEYWORD1>ESI</KEYWORD1>
-   <KEYWORD1>EVALUATE</KEYWORD1>
-   <KEYWORD1>EVERY</KEYWORD1>
-   <KEYWORD1>EXAMINE</KEYWORD1>
-   <KEYWORD1>EXCEEDS</KEYWORD1>
-   <KEYWORD1>EXCEPTION</KEYWORD1>
-   <KEYWORD1>EXCESS-3</KEYWORD1>
-   <KEYWORD1>EXCLUSIVE</KEYWORD1>
-   <KEYWORD1>EXEC</KEYWORD1>
-   <KEYWORD1>EXECUTE</KEYWORD1>
-   <KEYWORD1>EXHIBIT</KEYWORD1>
-   <KEYWORD1>EXIT</KEYWORD1>
-   <KEYWORD1>EXTEND</KEYWORD1>
-   <KEYWORD1>EXTENDED-SEARCH</KEYWORD1>
-   <KEYWORD1>EXTERNAL</KEYWORD1>
-
-   <KEYWORD1>FACTORY</KEYWORD1>
-   <KEYWORD1>FALSE</KEYWORD1>
-   <KEYWORD1>FD</KEYWORD1>
-   <KEYWORD1>FH-FCD</KEYWORD1>
-   <KEYWORD1>FH-KEYDEF</KEYWORD1>
-   <KEYWORD1>FILE</KEYWORD1>
-   <KEYWORD1>FILE-CONTROL</KEYWORD1>
-   <KEYWORD1>FILE-ID</KEYWORD1>
-   <KEYWORD1>FILE-LIMIT</KEYWORD1>
-   <KEYWORD1>FILE-LIMITS</KEYWORD1>
-   <KEYWORD1>FILLER</KEYWORD1>
-   <KEYWORD1>FINAL</KEYWORD1>
-   <KEYWORD1>FIRST</KEYWORD1>
-   <KEYWORD1>FIXED</KEYWORD1>
-   <KEYWORD1>FOOTING</KEYWORD1>
-   <KEYWORD1>FOR</KEYWORD1>
-   <KEYWORD1>FOREGROUND-COLOR</KEYWORD1>
-   <KEYWORD1>FOREGROUND-COLOUR</KEYWORD1>
-   <KEYWORD1>FROM</KEYWORD1>
-   <KEYWORD1>FULL</KEYWORD1>
-   <KEYWORD1>FUNCTION</KEYWORD1>
-
-   <KEYWORD1>GENERATE</KEYWORD1>
-   <KEYWORD1>GIVING</KEYWORD1>
-   <KEYWORD1>GLOBAL</KEYWORD1>
-   <KEYWORD1>GO</KEYWORD1>
-   <KEYWORD1>GOBACK</KEYWORD1>
-   <KEYWORD1>GREATER</KEYWORD1>
-   <KEYWORD1>GRID</KEYWORD1>
-   <KEYWORD1>GROUP</KEYWORD1>
-
-   <KEYWORD1>HEADING</KEYWORD1>
-   <KEYWORD1>HIGH</KEYWORD1>
-   <KEYWORD1>HIGH-VALUE</KEYWORD1>
-   <KEYWORD1>HIGH-VALUES</KEYWORD1>
-   <KEYWORD1>HIGHLIGHT</KEYWORD1>
-
-   <KEYWORD1>I-O</KEYWORD1>
-   <KEYWORD1>I-O-CONTROL</KEYWORD1>
-   <KEYWORD1>ID</KEYWORD1>
-   <KEYWORD1>IDENTIFICATION</KEYWORD1>
-   <KEYWORD1>IF</KEYWORD1>
-   <KEYWORD1>IGNORE</KEYWORD1>
-   <KEYWORD1>IN</KEYWORD1>
-   <KEYWORD1>INDEX</KEYWORD1>
-   <KEYWORD1>INDEXED</KEYWORD1>
-   <KEYWORD1>INDICATE</KEYWORD1>
-   <KEYWORD1>INHERITING</KEYWORD1>
-   <KEYWORD1>INITIAL</KEYWORD1>
-   <KEYWORD1>INITIALIZE</KEYWORD1>
-   <KEYWORD1>INITIATE</KEYWORD1>
-   <KEYWORD1>INPUT</KEYWORD1>
-   <KEYWORD1>INPUT-OUTPUT</KEYWORD1>
-   <KEYWORD1>INSERT</KEYWORD1>
-   <KEYWORD1>INSPECT</KEYWORD1>
-   <KEYWORD1>INSTALLATION</KEYWORD1>
-   <KEYWORD1>INTO</KEYWORD1>
-   <KEYWORD1>INVALID</KEYWORD1>
-   <KEYWORD1>INVOKE</KEYWORD1>
-   <KEYWORD1>IS</KEYWORD1>
-
-   <KEYWORD1>JAPANESE</KEYWORD1>
-   <KEYWORD1>JUST</KEYWORD1>
-   <KEYWORD1>JUSTIFIED</KEYWORD1>
-
-   <KEYWORD1>KANJI</KEYWORD1>
-   <KEYWORD1>KEPT</KEYWORD1>
-   <KEYWORD1>KEY</KEYWORD1>
-   <KEYWORD1>KEYBOARD</KEYWORD1>
-
-   <KEYWORD1>LABEL</KEYWORD1>
-   <KEYWORD1>LAST</KEYWORD1>
-   <KEYWORD1>LEADING</KEYWORD1>
-   <KEYWORD1>LEAVE</KEYWORD1>
-   <KEYWORD1>LEFT</KEYWORD1>
-   <KEYWORD1>LEFT-JUSTIFY</KEYWORD1>
-   <KEYWORD1>LEFTLINE</KEYWORD1>
-   <KEYWORD1>LENGTH</KEYWORD1>
-   <KEYWORD1>LENGTH-CHECK</KEYWORD1>
-   <KEYWORD1>LESS</KEYWORD1>
-   <KEYWORD1>LIMIT</KEYWORD1>
-   <KEYWORD1>LIMITS</KEYWORD1>
-   <KEYWORD1>LIN</KEYWORD1>
-   <KEYWORD1>LINAGE</KEYWORD1>
-   <KEYWORD1>LINAGE-COUNTER</KEYWORD1>
-   <KEYWORD1>LINE</KEYWORD1>
-   <KEYWORD1>LINE-COUNTER</KEYWORD1>
-   <KEYWORD1>LINES</KEYWORD1>
-   <KEYWORD1>LINKAGE</KEYWORD1>
-   <KEYWORD1>LOCAL-STORAGE</KEYWORD1>
-   <KEYWORD1>LOCK</KEYWORD1>
-   <KEYWORD1>LOCKING</KEYWORD1>
-   <KEYWORD1>LOW</KEYWORD1>
-   <KEYWORD1>LOW-VALUE</KEYWORD1>
-   <KEYWORD1>LOW-VALUES</KEYWORD1>
-   <KEYWORD1>LOWER</KEYWORD1>
-   <KEYWORD1>LOWLIGHT</KEYWORD1>
-
-   <KEYWORD1>MANUAL</KEYWORD1>
-   <KEYWORD1>MASTER-INDEX</KEYWORD1>
-   <KEYWORD1>MEMORY</KEYWORD1>
-   <KEYWORD1>MERGE</KEYWORD1>
-   <KEYWORD1>MESSAGE</KEYWORD1>
-   <KEYWORD1>METHOD</KEYWORD1>
-   <KEYWORD1>MODE</KEYWORD1>
-   <KEYWORD1>MODULES</KEYWORD1>
-   <KEYWORD1>MORE-LABELS</KEYWORD1>
-   <KEYWORD1>MOVE</KEYWORD1>
-   <KEYWORD1>MULTIPLE</KEYWORD1>
-   <KEYWORD1>MULTIPLY</KEYWORD1>
-
-   <KEYWORD1>NAME</KEYWORD1>
-   <KEYWORD1>NAMED</KEYWORD1>
-   <KEYWORD1>NATIONAL</KEYWORD1>
-   <KEYWORD1>NATIONAL-EDITED</KEYWORD1>
-   <KEYWORD1>NATIVE</KEYWORD1>
-   <KEYWORD1>NCHAR</KEYWORD1>
-   <KEYWORD1>NEGATIVE</KEYWORD1>
-   <KEYWORD1>NEXT</KEYWORD1>
-   <KEYWORD1>NO</KEYWORD1>
-   <KEYWORD1>NO-ECHO</KEYWORD1>
-   <KEYWORD1>NOMINAL</KEYWORD1>
-   <KEYWORD1>NOT</KEYWORD1>
-   <KEYWORD1>NOTE</KEYWORD1>
-   <KEYWORD1>NSTD-REELS</KEYWORD1>
-   <KEYWORD1>NULL</KEYWORD1>
-   <KEYWORD1>NULLS</KEYWORD1>
-   <KEYWORD1>NUMBER</KEYWORD1>
-   <KEYWORD1>NUMERIC</KEYWORD1>
-   <KEYWORD1>NUMERIC-EDITED</KEYWORD1>
-
-   <KEYWORD1>OBJECT</KEYWORD1>
-   <KEYWORD1>OBJECT-COMPUTER</KEYWORD1>
-   <KEYWORD1>OBJECT-STORAGE</KEYWORD1>
-   <KEYWORD1>OCCURS</KEYWORD1>
-   <KEYWORD1>OF</KEYWORD1>
-   <KEYWORD1>OFF</KEYWORD1>
-   <KEYWORD1>OMITTED</KEYWORD1>
-   <KEYWORD1>ON</KEYWORD1>
-   <KEYWORD1>OOSTACKPTR</KEYWORD1>
-   <KEYWORD1>OPEN</KEYWORD1>
-   <KEYWORD1>OPTIONAL</KEYWORD1>
-   <KEYWORD1>OR</KEYWORD1>
-   <KEYWORD1>ORDER</KEYWORD1>
-   <KEYWORD1>ORGANIZATION</KEYWORD1>
-   <KEYWORD1>OTHER</KEYWORD1>
-   <KEYWORD1>OTHERWISE</KEYWORD1>
-   <KEYWORD1>OUTPUT</KEYWORD1>
-   <KEYWORD1>OVERFLOW</KEYWORD1>
-   <KEYWORD1>OVERLINE</KEYWORD1>
-
-   <KEYWORD1>PACKED-DECIMAL</KEYWORD1>
-   <KEYWORD1>PADDING</KEYWORD1>
-   <KEYWORD1>PAGE</KEYWORD1>
-   <KEYWORD1>PAGE-COUNTER</KEYWORD1>
-   <KEYWORD1>PARAGRAPH</KEYWORD1>
-   <KEYWORD1>PASSWORD</KEYWORD1>
-   <KEYWORD1>PERFORM</KEYWORD1>
-   <KEYWORD1>PF</KEYWORD1>
-   <KEYWORD1>PH</KEYWORD1>
-   <KEYWORD1>PIC</KEYWORD1>
-   <KEYWORD1>PICTURE</KEYWORD1>
-   <KEYWORD1>PLUS</KEYWORD1>
-   <KEYWORD1>POINTER</KEYWORD1>
-   <KEYWORD1>POS</KEYWORD1>
-   <KEYWORD1>POSITION</KEYWORD1>
-   <KEYWORD1>POSITIONING</KEYWORD1>
-   <KEYWORD1>POSITIVE</KEYWORD1>
-   <KEYWORD1>PREVIOUS</KEYWORD1>
-   <KEYWORD1>PRINT</KEYWORD1>
-   <KEYWORD1>PRINT-SWITCH</KEYWORD1>
-   <KEYWORD1>PRINTER</KEYWORD1>
-   <KEYWORD1>PRINTER-1</KEYWORD1>
-   <KEYWORD1>PRINTING</KEYWORD1>
-   <KEYWORD1>PRIVATE</KEYWORD1>
-   <KEYWORD1>PROCEDURE</KEYWORD1>
-   <KEYWORD1>PROCEDURE-POINTER</KEYWORD1>
-   <KEYWORD1>PROCEDURES</KEYWORD1>
-   <KEYWORD1>PROCEED</KEYWORD1>
-   <KEYWORD1>PROCESSING</KEYWORD1>
-   <KEYWORD1>PROGRAM</KEYWORD1>
-   <KEYWORD1>PROGRAM-ID</KEYWORD1>
-   <KEYWORD1>PROMPT</KEYWORD1>
-   <KEYWORD1>PROTECTED</KEYWORD1>
-   <KEYWORD1>PUBLIC</KEYWORD1>
-   <KEYWORD1>PURGE</KEYWORD1>
-
-   <KEYWORD1>QUEUE</KEYWORD1>
-   <KEYWORD1>QUOTE</KEYWORD1>
-   <KEYWORD1>QUOTES</KEYWORD1>
-
-   <KEYWORD1>RANDOM</KEYWORD1>
-   <KEYWORD1>RANGE</KEYWORD1>
-   <KEYWORD1>RD</KEYWORD1>
-   <KEYWORD1>READ</KEYWORD1>
-   <KEYWORD1>READY</KEYWORD1>
-   <KEYWORD1>RECEIVE</KEYWORD1>
-   <KEYWORD1>RECORD</KEYWORD1>
-   <KEYWORD1>RECORD-OVERFLOW</KEYWORD1>
-   <KEYWORD1>RECORDING</KEYWORD1>
-   <KEYWORD1>RECORDS</KEYWORD1>
-   <KEYWORD1>REDEFINES</KEYWORD1>
-   <KEYWORD1>REEL</KEYWORD1>
-   <KEYWORD1>REFERENCE</KEYWORD1>
-   <KEYWORD1>REFERENCES</KEYWORD1>
-   <KEYWORD1>RELATIVE</KEYWORD1>
-   <KEYWORD1>RELEASE</KEYWORD1>
-   <KEYWORD1>RELOAD</KEYWORD1>
-   <KEYWORD1>REMAINDER</KEYWORD1>
-   <KEYWORD1>REMARKS</KEYWORD1>
-   <KEYWORD1>REMOVAL</KEYWORD1>
-   <KEYWORD1>RENAMES</KEYWORD1>
-   <KEYWORD1>REORG-CRITERIA</KEYWORD1>
-   <KEYWORD1>REPLACE</KEYWORD1>
-   <KEYWORD1>REPLACING</KEYWORD1>
-   <KEYWORD1>REPORT</KEYWORD1>
-   <KEYWORD1>REPORTING</KEYWORD1>
-   <KEYWORD1>REPORTS</KEYWORD1>
-   <KEYWORD1>REQUIRED</KEYWORD1>
-   <KEYWORD1>REREAD</KEYWORD1>
-   <KEYWORD1>RERUN</KEYWORD1>
-   <KEYWORD1>RESERVE</KEYWORD1>
-   <KEYWORD1>RESET</KEYWORD1>
-   <KEYWORD1>RETURN</KEYWORD1>
-   <KEYWORD1>RETURN-CODE</KEYWORD1>
-   <KEYWORD1>RETURNING</KEYWORD1>
-   <KEYWORD1>REVERSE</KEYWORD1>
-   <KEYWORD1>REVERSE-VIDEO</KEYWORD1>
-   <KEYWORD1>REVERSED</KEYWORD1>
-   <KEYWORD1>REWIND</KEYWORD1>
-   <KEYWORD1>REWRITE</KEYWORD1>
-   <KEYWORD1>RF</KEYWORD1>
-   <KEYWORD1>RH</KEYWORD1>
-   <KEYWORD1>RIGHT</KEYWORD1>
-   <KEYWORD1>RIGHT-JUSTIFY</KEYWORD1>
-   <KEYWORD1>ROLLBACK</KEYWORD1>
-   <KEYWORD1>ROUNDED</KEYWORD1>
-   <KEYWORD1>RUN</KEYWORD1>
-
-   <KEYWORD1>S01</KEYWORD1>
-   <KEYWORD1>S02</KEYWORD1>
-   <KEYWORD1>S03</KEYWORD1>
-   <KEYWORD1>S04</KEYWORD1>
-   <KEYWORD1>S05</KEYWORD1>
-   <KEYWORD1>SAME</KEYWORD1>
-   <KEYWORD1>SCREEN</KEYWORD1>
-   <KEYWORD1>SD</KEYWORD1>
-   <KEYWORD1>SEARCH</KEYWORD1>
-   <KEYWORD1>SECTION</KEYWORD1>
-   <KEYWORD1>SECURE</KEYWORD1>
-   <KEYWORD1>SECURITY</KEYWORD1>
-   <KEYWORD1>SEEK</KEYWORD1>
-   <KEYWORD1>SEGMENT</KEYWORD1>
-   <KEYWORD1>SEGMENT-LIMIT</KEYWORD1>
-   <KEYWORD1>SELECT</KEYWORD1>
-   <KEYWORD1>SELECTIVE</KEYWORD1>
-   <KEYWORD1>SEND</KEYWORD1>
-   <KEYWORD1>SENTENCE</KEYWORD1>
-   <KEYWORD1>SEPARATE</KEYWORD1>
-   <KEYWORD1>SEQUENCE</KEYWORD1>
-   <KEYWORD1>SEQUENTIAL</KEYWORD1>
-   <KEYWORD1>SERVICE</KEYWORD1>
-   <KEYWORD1>SET</KEYWORD1>
-   <KEYWORD1>SHIFT-IN</KEYWORD1>
-   <KEYWORD1>SHIFT-OUT</KEYWORD1>
-   <KEYWORD1>SIGN</KEYWORD1>
-   <KEYWORD1>SIZE</KEYWORD1>
-   <KEYWORD1>SKIP1</KEYWORD1>
-   <KEYWORD1>SKIP2</KEYWORD1>
-   <KEYWORD1>SKIP3</KEYWORD1>
-   <KEYWORD1>SORT</KEYWORD1>
-   <KEYWORD1>SORT-CONTROL</KEYWORD1>
-   <KEYWORD1>SORT-CORE-SIZE</KEYWORD1>
-   <KEYWORD1>SORT-FILE-SIZE</KEYWORD1>
-   <KEYWORD1>SORT-MERGE</KEYWORD1>
-   <KEYWORD1>SORT-MESSAGE</KEYWORD1>
-   <KEYWORD1>SORT-MODE-SIZE</KEYWORD1>
-   <KEYWORD1>SORT-OPTION</KEYWORD1>
-   <KEYWORD1>SORT-RETURN</KEYWORD1>
-   <KEYWORD1>SOURCE</KEYWORD1>
-   <KEYWORD1>SOURCE-COMPUTER</KEYWORD1>
-   <KEYWORD1>SPACE</KEYWORD1>
-   <KEYWORD1>SPACE-FILL</KEYWORD1>
-   <KEYWORD1>SPACES</KEYWORD1>
-   <KEYWORD1>SPECIAL-NAMES</KEYWORD1>
-   <KEYWORD1>STANDARD</KEYWORD1>
-   <KEYWORD1>STANDARD-1</KEYWORD1>
-   <KEYWORD1>STANDARD-2</KEYWORD1>
-   <KEYWORD1>START</KEYWORD1>
-   <KEYWORD1>STATUS</KEYWORD1>
-   <KEYWORD1>STOP</KEYWORD1>
-   <KEYWORD1>STORE</KEYWORD1>
-   <KEYWORD1>STRING</KEYWORD1>
-   <KEYWORD1>SUB-QUEUE-1</KEYWORD1>
-   <KEYWORD1>SUB-QUEUE-2</KEYWORD1>
-   <KEYWORD1>SUB-QUEUE-3</KEYWORD1>
-   <KEYWORD1>SUBTRACT</KEYWORD1>
-   <KEYWORD1>SUM</KEYWORD1>
-   <KEYWORD1>SUPER</KEYWORD1>
-   <KEYWORD1>SUPPRESS</KEYWORD1>
-   <KEYWORD1>SYMBOLIC</KEYWORD1>
-   <KEYWORD1>SYNC</KEYWORD1>
-   <KEYWORD1>SYNCHRONIZED</KEYWORD1>
-   <KEYWORD1>SYSIN</KEYWORD1>
-   <KEYWORD1>SYSIPT</KEYWORD1>
-   <KEYWORD1>SYSLST</KEYWORD1>
-   <KEYWORD1>SYSOUT</KEYWORD1>
-   <KEYWORD1>SYSPCH</KEYWORD1>
-   <KEYWORD1>SYSPUNCH</KEYWORD1>
-
-   <KEYWORD1>TAB</KEYWORD1>
-   <KEYWORD1>TABLE</KEYWORD1>
-   <KEYWORD1>TALLY</KEYWORD1>
-   <KEYWORD1>TALLYING</KEYWORD1>
-   <KEYWORD1>TAPE</KEYWORD1>
-   <KEYWORD1>TERMINAL</KEYWORD1>
-   <KEYWORD1>TERMINATE</KEYWORD1>
-   <KEYWORD1>TEST</KEYWORD1>
-   <KEYWORD1>TEXT</KEYWORD1>
-   <KEYWORD1>THAN</KEYWORD1>
-   <KEYWORD1>THEN</KEYWORD1>
-   <KEYWORD1>THROUGH</KEYWORD1>
-   <KEYWORD1>THRU</KEYWORD1>
-   <KEYWORD1>TIME</KEYWORD1>
-   <KEYWORD1>TIME-OF-DAY</KEYWORD1>
-   <KEYWORD1>TIME-OUT</KEYWORD1>
-   <KEYWORD1>TIMEOUT</KEYWORD1>
-   <KEYWORD1>TIMES</KEYWORD1>
-   <KEYWORD1>TITLE</KEYWORD1>
-   <KEYWORD1>TO</KEYWORD1>
-   <KEYWORD1>TOP</KEYWORD1>
-   <KEYWORD1>TOTALED</KEYWORD1>
-   <KEYWORD1>TOTALING</KEYWORD1>
-   <KEYWORD1>TRACE</KEYWORD1>
-   <KEYWORD1>TRACK-AREA</KEYWORD1>
-   <KEYWORD1>TRACK-LIMIT</KEYWORD1>
-   <KEYWORD1>TRACKS</KEYWORD1>
-   <KEYWORD1>TRAILING</KEYWORD1>
-   <KEYWORD1>TRAILING-SIGN</KEYWORD1>
-   <KEYWORD1>TRANSFORM</KEYWORD1>
-   <KEYWORD1>TRUE</KEYWORD1>
-   <KEYWORD1>TYPE</KEYWORD1>
-   <KEYWORD1>TYPEDEF</KEYWORD1>
-
-   <KEYWORD1>UNDERLINE</KEYWORD1>
-   <KEYWORD1>UNEQUAL</KEYWORD1>
-   <KEYWORD1>UNIT</KEYWORD1>
-   <KEYWORD1>UNLOCK</KEYWORD1>
-   <KEYWORD1>UNSTRING</KEYWORD1>
-   <KEYWORD1>UNTIL</KEYWORD1>
-   <KEYWORD1>UP</KEYWORD1>
-   <KEYWORD1>UPDATE</KEYWORD1>
-   <KEYWORD1>UPON</KEYWORD1>
-   <KEYWORD1>UPPER</KEYWORD1>
-   <KEYWORD1>UPSI-0</KEYWORD1>
-   <KEYWORD1>UPSI-1</KEYWORD1>
-   <KEYWORD1>UPSI-2</KEYWORD1>
-   <KEYWORD1>UPSI-3</KEYWORD1>
-   <KEYWORD1>UPSI-4</KEYWORD1>
-   <KEYWORD1>UPSI-5</KEYWORD1>
-   <KEYWORD1>UPSI-6</KEYWORD1>
-   <KEYWORD1>UPSI-7</KEYWORD1>
-   <KEYWORD1>USAGE</KEYWORD1>
-   <KEYWORD1>USE</KEYWORD1>
-   <KEYWORD1>USER</KEYWORD1>
-   <KEYWORD1>USING</KEYWORD1>
-
-   <KEYWORD1>VALUE</KEYWORD1>
-   <KEYWORD1>VALUES</KEYWORD1>
-   <KEYWORD1>VARIABLE</KEYWORD1>
-   <KEYWORD1>VARYING</KEYWORD1>
-
-   <KEYWORD1>WAIT</KEYWORD1>
-   <KEYWORD1>WHEN</KEYWORD1>
-   <KEYWORD1>WHEN-COMPILED</KEYWORD1>
-   <KEYWORD1>WITH</KEYWORD1>
-   <KEYWORD1>WORDS</KEYWORD1>
-   <KEYWORD1>WORKING-STORAGE</KEYWORD1>
-   <KEYWORD1>WRITE</KEYWORD1>
-   <KEYWORD1>WRITE-ONLY</KEYWORD1>
-   <KEYWORD1>WRITE-VERIFY</KEYWORD1>
-
-   <KEYWORD1>ZERO</KEYWORD1>
-   <KEYWORD1>ZERO-FILL</KEYWORD1>
-   <KEYWORD1>ZEROES</KEYWORD1>
-   <KEYWORD1>ZEROS</KEYWORD1>
-
-   <KEYWORD2>ACOS</KEYWORD2>
-   <KEYWORD2>ANNUITY</KEYWORD2>
-   <KEYWORD2>ASIN</KEYWORD2>
-   <KEYWORD2>ATAN</KEYWORD2>
-   <KEYWORD2>CHAR</KEYWORD2>
-   <KEYWORD2>COS</KEYWORD2>
-   <KEYWORD2>CURRENT-DATE</KEYWORD2>
-   <KEYWORD2>DATE-OF-INTEGER</KEYWORD2>
-   <KEYWORD2>DAY-OF-INTEGER</KEYWORD2>
-   <KEYWORD2>FACTORIAL</KEYWORD2>
-   <KEYWORD2>INTEGER</KEYWORD2>
-   <KEYWORD2>INTEGER-OF-DATE</KEYWORD2>
-   <KEYWORD2>INTEGER-OF-DAY</KEYWORD2>
-   <KEYWORD2>INTEGER-PART</KEYWORD2>
-   <!-- <KEYWORD2>LENGTH</KEYWORD2> -->
-   <KEYWORD2>LOG</KEYWORD2>
-   <KEYWORD2>LOG10</KEYWORD2>
-   <KEYWORD2>LOWER-CASE</KEYWORD2>
-   <KEYWORD2>MAX</KEYWORD2>
-   <KEYWORD2>MEAN</KEYWORD2>
-   <KEYWORD2>MEDIAN</KEYWORD2>
-   <KEYWORD2>MIDRANGE</KEYWORD2>
-   <KEYWORD2>MIN</KEYWORD2>
-   <KEYWORD2>MOD</KEYWORD2>
-   <KEYWORD2>NUMVAL</KEYWORD2>
-   <KEYWORD2>NUMVAL-C</KEYWORD2>
-   <KEYWORD2>ORD</KEYWORD2>
-   <KEYWORD2>ORD-MAX</KEYWORD2>
-   <KEYWORD2>ORD-MIN</KEYWORD2>
-   <KEYWORD2>PRESENT-VALUE</KEYWORD2>
-   <KEYWORD2>RANDOM</KEYWORD2>
-   <KEYWORD2>RANGE</KEYWORD2>
-   <KEYWORD2>REM</KEYWORD2>
-   <KEYWORD2>REVERSE</KEYWORD2>
-   <KEYWORD2>SIN</KEYWORD2>
-   <KEYWORD2>SQRT</KEYWORD2>
-   <KEYWORD2>STANDARD-DEVIATION</KEYWORD2>
-   <KEYWORD2>SUM</KEYWORD2>
-   <KEYWORD2>TAN</KEYWORD2>
-   <KEYWORD2>UPPER-CASE</KEYWORD2>
-   <KEYWORD2>VARIANCE</KEYWORD2>
-   <KEYWORD2>WHEN-COMPILED</KEYWORD2>
-
-   <!-- Oracle/SQL - Reserved Words
-   <KEYWORD3>ACCESS</KEYWORD3>
-   <KEYWORD3>ADD</KEYWORD3>
-   <KEYWORD3>ALL</KEYWORD3>
-   <KEYWORD3>ALTER</KEYWORD3>
-   <KEYWORD3>AND</KEYWORD3>
-   <KEYWORD3>ANY</KEYWORD3>
-   <KEYWORD3>ARRAYLEN</KEYWORD3>
-   <KEYWORD3>AS</KEYWORD3>
-   <KEYWORD3>ASC</KEYWORD3>
-   <KEYWORD3>AUDIT</KEYWORD3>
-   <KEYWORD3>BETWEEN</KEYWORD3>
-   <KEYWORD3>BY</KEYWORD3>
-   <KEYWORD3>CHAR</KEYWORD3>
-   <KEYWORD3>CHECK</KEYWORD3>
-   <KEYWORD3>CLUSTER</KEYWORD3>
-   <KEYWORD3>COLUMN</KEYWORD3>
-   <KEYWORD3>COMMENT</KEYWORD3>
-   <KEYWORD3>COMPRESS</KEYWORD3>
-   <KEYWORD3>CONNECT</KEYWORD3>
-   <KEYWORD3>CREATE</KEYWORD3>
-   <KEYWORD3>CURRENT</KEYWORD3>
-   <KEYWORD3>DATE</KEYWORD3>
-   <KEYWORD3>DECIMAL</KEYWORD3>
-   <KEYWORD3>DEFAULT</KEYWORD3>
-   <KEYWORD3>DELETE</KEYWORD3>
-   <KEYWORD3>DESC</KEYWORD3>
-   <KEYWORD3>DISTINCT</KEYWORD3>
-   <KEYWORD3>DROP</KEYWORD3>
-   <KEYWORD3>ELSE</KEYWORD3>
-   <KEYWORD3>EXCLUSIVE</KEYWORD3>
-   <KEYWORD3>EXEC</KEYWORD3>
-   <KEYWORD3>END-EXEC</KEYWORD3>
-   <KEYWORD3>EXISTS</KEYWORD3>
-   <KEYWORD3>FILE</KEYWORD3>
-   <KEYWORD3>FLOAT</KEYWORD3>
-   <KEYWORD3>FOR</KEYWORD3>
-   <KEYWORD3>FROM</KEYWORD3>
-   <KEYWORD3>GRANT</KEYWORD3>
-   <KEYWORD3>GROUP</KEYWORD3>
-   <KEYWORD3>HAVING</KEYWORD3>
-   <KEYWORD3>IDENTIFIED</KEYWORD3>
-   <KEYWORD3>IMMEDIATE</KEYWORD3>
-   <KEYWORD3>IN</KEYWORD3>
-   <KEYWORD3>INCREMENT</KEYWORD3>
-   <KEYWORD3>INDEX</KEYWORD3>
-   <KEYWORD3>INITIAL</KEYWORD3>
-   <KEYWORD3>INSERT</KEYWORD3>
-   <KEYWORD3>INTEGER</KEYWORD3>
-   <KEYWORD3>INTERSECT</KEYWORD3>
-   <KEYWORD3>INTO</KEYWORD3>
-   <KEYWORD3>IS</KEYWORD3>
-   <KEYWORD3>LEVEL</KEYWORD3>
-   <KEYWORD3>LIKE</KEYWORD3>
-   <KEYWORD3>LOCK</KEYWORD3>
-   <KEYWORD3>LONG</KEYWORD3>
-   <KEYWORD3>MAXEXTENTS</KEYWORD3>
-   <KEYWORD3>MINUS</KEYWORD3>
-   <KEYWORD3>MODE</KEYWORD3>
-   <KEYWORD3>MODIFY</KEYWORD3>
-   <KEYWORD3>NOAUDIT</KEYWORD3>
-   <KEYWORD3>NOCOMPRESS</KEYWORD3>
-   <KEYWORD3>NOT</KEYWORD3>
-   <KEYWORD3>NOTFOUND</KEYWORD3>
-   <KEYWORD3>NOWAIT</KEYWORD3>
-   <KEYWORD3>NULL</KEYWORD3>
-   <KEYWORD3>NUMBER</KEYWORD3>
-   <KEYWORD3>OF</KEYWORD3>
-   <KEYWORD3>OFFLINE</KEYWORD3>
-   <KEYWORD3>ON</KEYWORD3>
-   <KEYWORD3>ONLINE</KEYWORD3>
-   <KEYWORD3>OPTION</KEYWORD3>
-   <KEYWORD3>OR</KEYWORD3>
-   <KEYWORD3>ORDER</KEYWORD3>
-   <KEYWORD3>PCTFREE</KEYWORD3>
-   <KEYWORD3>PRIOR</KEYWORD3>
-   <KEYWORD3>PRIVILEGES</KEYWORD3>
-   <KEYWORD3>PUBLIC</KEYWORD3>
-   <KEYWORD3>RAW</KEYWORD3>
-   <KEYWORD3>RENAME</KEYWORD3>
-   <KEYWORD3>RESOURCE</KEYWORD3>
-   <KEYWORD3>REVOKE</KEYWORD3>
-   <KEYWORD3>ROW</KEYWORD3>
-   <KEYWORD3>ROWID</KEYWORD3>
-   <KEYWORD3>ROWLABEL</KEYWORD3>
-   <KEYWORD3>ROWNUM</KEYWORD3>
-   <KEYWORD3>ROWS</KEYWORD3>
-   <KEYWORD3>START</KEYWORD3>
-   <KEYWORD3>SELECT</KEYWORD3>
-   <KEYWORD3>SESSION</KEYWORD3>
-   <KEYWORD3>SET</KEYWORD3>
-   <KEYWORD3>SHARE</KEYWORD3>
-   <KEYWORD3>SIZE</KEYWORD3>
-   <KEYWORD3>SMALLINT</KEYWORD3>
-   <KEYWORD3>SQLBUF</KEYWORD3>
-   <KEYWORD3>SUCCESSFUL</KEYWORD3>
-   <KEYWORD3>SYNONYM</KEYWORD3>
-   <KEYWORD3>SYSDATE</KEYWORD3>
-   <KEYWORD3>TABLE</KEYWORD3>
-   <KEYWORD3>THEN</KEYWORD3>
-   <KEYWORD3>TO</KEYWORD3>
-   <KEYWORD3>TRIGGER</KEYWORD3>
-   <KEYWORD3>UID</KEYWORD3>
-   <KEYWORD3>UNION</KEYWORD3>
-   <KEYWORD3>UNIQUE</KEYWORD3>
-   <KEYWORD3>UPDATE</KEYWORD3>
-   <KEYWORD3>USER</KEYWORD3>
-   <KEYWORD3>VALIDATE</KEYWORD3>
-   <KEYWORD3>VALUES</KEYWORD3>
-   <KEYWORD3>VARCHAR</KEYWORD3>
-   <KEYWORD3>VARCHAR2</KEYWORD3>
-   <KEYWORD3>VIEW</KEYWORD3>
-   <KEYWORD3>WHENEVER</KEYWORD3>
-   <KEYWORD3>WHERE</KEYWORD3>
-   <KEYWORD3>WITH</KEYWORD3>
-   -->
-
-   <!-- Oracle/SQL - Keywords
-   <KEYWORD3>ADMIN</KEYWORD3>
-   <KEYWORD3>AFTER</KEYWORD3>
-   <KEYWORD3>ALLOCATE</KEYWORD3>
-   <KEYWORD3>ANALYZE</KEYWORD3>
-   <KEYWORD3>ARCHIVE</KEYWORD3>
-   <KEYWORD3>ARCHIVELOG</KEYWORD3>
-   <KEYWORD3>AUTHORIZATION</KEYWORD3>
-   <KEYWORD3>AVG</KEYWORD3>
-   <KEYWORD3>BACKUP</KEYWORD3>
-   <KEYWORD3>BEGIN</KEYWORD3>
-   <KEYWORD3>BECOME</KEYWORD3>
-   <KEYWORD3>BEFORE</KEYWORD3>
-   <KEYWORD3>BLOCK</KEYWORD3>
-   <KEYWORD3>BODY</KEYWORD3>
-   <KEYWORD3>CACHE</KEYWORD3>
-   <KEYWORD3>CANCEL</KEYWORD3>
-   <KEYWORD3>CASCADE</KEYWORD3>
-   <KEYWORD3>CHANGE</KEYWORD3>
-   <KEYWORD3>CHARACTER</KEYWORD3>
-   <KEYWORD3>CHECKPOINT</KEYWORD3>
-   <KEYWORD3>CLOSE</KEYWORD3>
-   <KEYWORD3>COBOL</KEYWORD3>
-   <KEYWORD3>COMMIT</KEYWORD3>
-   <KEYWORD3>COMPILE</KEYWORD3>
-   <KEYWORD3>CONSTRAINT</KEYWORD3>
-   <KEYWORD3>CONSTRAINTS</KEYWORD3>
-   <KEYWORD3>CONTENTS</KEYWORD3>
-   <KEYWORD3>CONTINUE</KEYWORD3>
-   <KEYWORD3>CONTROLFILE</KEYWORD3>
-   <KEYWORD3>COUNT</KEYWORD3>
-   <KEYWORD3>DBA</KEYWORD3>
-   <KEYWORD3>CURSOR</KEYWORD3>
-   <KEYWORD3>CYCLE</KEYWORD3>
-   <KEYWORD3>DATABASE</KEYWORD3>
-   <KEYWORD3>DATAFILE</KEYWORD3>
-   <KEYWORD3>DEC</KEYWORD3>
-   <KEYWORD3>DECLARE</KEYWORD3>
-   <KEYWORD3>DISABLE</KEYWORD3>
-   <KEYWORD3>DISMOUNT</KEYWORD3>
-   <KEYWORD3>DOUBLE</KEYWORD3>
-   <KEYWORD3>DUMP</KEYWORD3>
-   <KEYWORD3>EACH</KEYWORD3>
-   <KEYWORD3>ENABLE</KEYWORD3>
-   <KEYWORD3>END</KEYWORD3>
-   <KEYWORD3>ESCAPE</KEYWORD3>
-   <KEYWORD3>EVENTS</KEYWORD3>
-   <KEYWORD3>EXCEPT</KEYWORD3>
-   <KEYWORD3>EXCEPTIONS</KEYWORD3>
-   <KEYWORD3>EXEC</KEYWORD3>
-   <KEYWORD3>EXPLAIN</KEYWORD3>
-   <KEYWORD3>EXECUTE</KEYWORD3>
-   <KEYWORD3>EXTENT</KEYWORD3>
-   <KEYWORD3>EXTERNALLY</KEYWORD3>
-   <KEYWORD3>FETCH</KEYWORD3>
-   <KEYWORD3>FLUSH</KEYWORD3>
-   <KEYWORD3>FREELIST</KEYWORD3>
-   <KEYWORD3>FREELISTS</KEYWORD3>
-   <KEYWORD3>FORCE</KEYWORD3>
-   <KEYWORD3>FOREIGN</KEYWORD3>
-   <KEYWORD3>FORTRAN</KEYWORD3>
-   <KEYWORD3>FOUND</KEYWORD3>
-   <KEYWORD3>FUNCTION</KEYWORD3>
-   <KEYWORD3>GO</KEYWORD3>
-   <KEYWORD3>GOTO</KEYWORD3>
-   <KEYWORD3>GROUPS</KEYWORD3>
-   <KEYWORD3>INCLUDING</KEYWORD3>
-   <KEYWORD3>INDICATOR</KEYWORD3>
-   <KEYWORD3>INITRANS</KEYWORD3>
-   <KEYWORD3>INSTANCE</KEYWORD3>
-   <KEYWORD3>INT</KEYWORD3>
-   <KEYWORD3>KEY</KEYWORD3>
-   <KEYWORD3>LANGUAGE</KEYWORD3>
-   <KEYWORD3>LAYER</KEYWORD3>
-   <KEYWORD3>LINK</KEYWORD3>
-   <KEYWORD3>LISTS</KEYWORD3>
-   <KEYWORD3>LOGFILE</KEYWORD3>
-   <KEYWORD3>MANAGE</KEYWORD3>
-   <KEYWORD3>MANUAL</KEYWORD3>
-   <KEYWORD3>MAX</KEYWORD3>
-   <KEYWORD3>MAXDATAFILES</KEYWORD3>
-   <KEYWORD3>MAXINSTANCES</KEYWORD3>
-   <KEYWORD3>MAXLOGFILES</KEYWORD3>
-   <KEYWORD3>MAXLOGHISTORY</KEYWORD3>
-   <KEYWORD3>MAXLOGMEMBERS</KEYWORD3>
-   <KEYWORD3>MAXTRANS</KEYWORD3>
-   <KEYWORD3>MAXVALUE</KEYWORD3>
-   <KEYWORD3>MIN</KEYWORD3>
-   <KEYWORD3>MINEXTENTS</KEYWORD3>
-   <KEYWORD3>MINVALUE</KEYWORD3>
-   <KEYWORD3>MODULE</KEYWORD3>
-   <KEYWORD3>MOUNT</KEYWORD3>
-   <KEYWORD3>NEXT</KEYWORD3>
-   <KEYWORD3>NEW</KEYWORD3>
-   <KEYWORD3>NOARCHIVELOG</KEYWORD3>
-   <KEYWORD3>NOCACHE</KEYWORD3>
-   <KEYWORD3>NOCYCLE</KEYWORD3>
-   <KEYWORD3>NOMAXVALUE</KEYWORD3>
-   <KEYWORD3>NOMINVALUE</KEYWORD3>
-   <KEYWORD3>NONE</KEYWORD3>
-   <KEYWORD3>NOORDER</KEYWORD3>
-   <KEYWORD3>NORESETLOGS</KEYWORD3>
-   <KEYWORD3>NORMAL</KEYWORD3>
-   <KEYWORD3>NOSORT</KEYWORD3>
-   <KEYWORD3>NUMERIC</KEYWORD3>
-   <KEYWORD3>OFF</KEYWORD3>
-   <KEYWORD3>OLD</KEYWORD3>
-   <KEYWORD3>ONLY</KEYWORD3>
-   <KEYWORD3>OPEN</KEYWORD3>
-   <KEYWORD3>OPTIMAL</KEYWORD3>
-   <KEYWORD3>OWN</KEYWORD3>
-   <KEYWORD3>PACKAGE</KEYWORD3>
-   <KEYWORD3>PARALLEL</KEYWORD3>
-   <KEYWORD3>PCTINCREASE</KEYWORD3>
-   <KEYWORD3>PCTUSED</KEYWORD3>
-   <KEYWORD3>PLAN</KEYWORD3>
-   <KEYWORD3>PLI</KEYWORD3>
-   <KEYWORD3>PRECISION</KEYWORD3>
-   <KEYWORD3>PRIMARY</KEYWORD3>
-   <KEYWORD3>PRIVATE</KEYWORD3>
-   <KEYWORD3>PROCEDURE</KEYWORD3>
-   <KEYWORD3>PROFILE</KEYWORD3>
-   <KEYWORD3>QUOTA</KEYWORD3>
-   <KEYWORD3>READ</KEYWORD3>
-   <KEYWORD3>REAL</KEYWORD3>
-   <KEYWORD3>RECOVER</KEYWORD3>
-   <KEYWORD3>REFERENCES</KEYWORD3>
-   <KEYWORD3>REFERENCING</KEYWORD3>
-   <KEYWORD3>RESETLOGS</KEYWORD3>
-   <KEYWORD3>RESTRICTED</KEYWORD3>
-   <KEYWORD3>REUSE</KEYWORD3>
-   <KEYWORD3>ROLE</KEYWORD3>
-   <KEYWORD3>ROLES</KEYWORD3>
-   <KEYWORD3>ROLLBACK</KEYWORD3>
-   <KEYWORD3>SAVEPOINT</KEYWORD3>
-   <KEYWORD3>SCHEMA</KEYWORD3>
-   <KEYWORD3>SCN</KEYWORD3>
-   <KEYWORD3>SECTION</KEYWORD3>
-   <KEYWORD3>SEGMENT</KEYWORD3>
-   <KEYWORD3>SEQUENCE</KEYWORD3>
-   <KEYWORD3>SHARED</KEYWORD3>
-   <KEYWORD3>SNAPSHOT</KEYWORD3>
-   <KEYWORD3>SOME</KEYWORD3>
-   <KEYWORD3>SORT</KEYWORD3>
-   <KEYWORD3>SQL</KEYWORD3>
-   <KEYWORD3>SQLCODE</KEYWORD3>
-   <KEYWORD3>SQLERROR</KEYWORD3>
-   <KEYWORD3>SQLSTATE</KEYWORD3>
-   <KEYWORD3>STATEMENT_ID</KEYWORD3>
-   <KEYWORD3>STATISTICS</KEYWORD3>
-   <KEYWORD3>STOP</KEYWORD3>
-   <KEYWORD3>STORAGE</KEYWORD3>
-   <KEYWORD3>SUM</KEYWORD3>
-   <KEYWORD3>SWITCH</KEYWORD3>
-   <KEYWORD3>SYSTEM</KEYWORD3>
-   <KEYWORD3>TABLES</KEYWORD3>
-   <KEYWORD3>TABLESPACE</KEYWORD3>
-   <KEYWORD3>TEMPORARY</KEYWORD3>
-   <KEYWORD3>THREAD</KEYWORD3>
-   <KEYWORD3>TIME</KEYWORD3>
-   <KEYWORD3>TRACING</KEYWORD3>
-   <KEYWORD3>TRANSACTION</KEYWORD3>
-   <KEYWORD3>TRIGGERS</KEYWORD3>
-   <KEYWORD3>TRUNCATE</KEYWORD3>
-   <KEYWORD3>UNDER</KEYWORD3>
-   <KEYWORD3>UNLIMITED</KEYWORD3>
-   <KEYWORD3>UNTIL</KEYWORD3>
-   <KEYWORD3>USE</KEYWORD3>
-   <KEYWORD3>USING</KEYWORD3>
-   <KEYWORD3>WHEN</KEYWORD3>
-   <KEYWORD3>WRITE</KEYWORD3>
-   <KEYWORD3>WORK</KEYWORD3>
-   -->
-
-   <LITERAL2>[COPY-PREFIX]</LITERAL2>
-   <LITERAL2>[COUNT]</LITERAL2>
-   <LITERAL2>[DISPLAY]</LITERAL2>
-   <LITERAL2>[EXECUTE]</LITERAL2>
-   <LITERAL2>[PG]</LITERAL2>
-   <LITERAL2>[PREFIX]</LITERAL2>
-   <LITERAL2>[PROGRAM]</LITERAL2>
-   <LITERAL2>[SPECIAL-PREFIX]</LITERAL2>
-   <LITERAL2>[TESTCASE]</LITERAL2>
-  </KEYWORDS>
- </RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/coffeescript.xml b/qpython/src/main/assets/syntax/coffeescript.xml
deleted file mode 100644
index 275f6a46..00000000
--- a/qpython/src/main/assets/syntax/coffeescript.xml
+++ /dev/null
@@ -1,208 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!-- CoffeeScript mode by Dennis Hotson, Balazs Toth, Marc Häfner
-
-Beta
-
-TODO:
-- reconsider (un)indentation rules for brackets
--->
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="commentStart" VALUE="###" />
-		<PROPERTY NAME="commentEnd" VALUE="###" />
-		<PROPERTY NAME="lineComment" VALUE="#" />
-		<PROPERTY NAME="wordBreakChars" VALUE=",+-=&lt;&gt;/?^&amp;*" />
-
-		<!-- Auto indent -->
-		<PROPERTY NAME="indentNextLines"
-			VALUE="((\s*|.*\s+)([\-=]&gt;|[\+\-\*/%\\&lt;&gt;=\!&amp;\|\^~]|(.*:|&lt;&lt;|&gt;&gt;|&gt;&gt;&gt;|\+=|\-=|\*=|/=|%=|&lt;=|&gt;=|==|===|\!=|\!==|is|isnt|not|and|or|&amp;&amp;|\|\||of|in|loop))|\s*(if|else|try|catch|finally|class|while|until|for)(\s*|\s+.*))\s*" />
-
-		<PROPERTY NAME="unindentThisLine"  VALUE="^\s*(else|catch|finally)(\s*|\s+.*)$" />
-		<PROPERTY NAME="unindentNextLines" VALUE="^\s*(else|catch|finally)(\s*|\s+.*)$" />
-
-		<!-- Props regarding brackets generally do not play well with CoffeScript -->
-
-		<!-- Triggers reindentation on character input.
-		TODO: reconsider the use of this one, including "ehy" -->
-		<!-- PROPERTY NAME="electricKeys" VALUE="}])" /-->
-
-		<!-- Originally designed for Python, does not work correctly with CS -->
-		<!-- PROPERTY NAME="ignoreWhitespace" VALUE="false" /-->
-	</PROPS>
-
-	<RULES
-		IGNORE_CASE="FALSE"
-		HIGHLIGHT_DIGITS="TRUE"
-		NO_WORD_SEP="$_"
-		DIGIT_RE="(0b[01]+)|(0o[0-7]+)|(0x\p{XDigit}+)|(\d*\.?\d+(e[+-]?\d+)?)">
-
-		<SPAN_REGEXP TYPE="COMMENT2" HASH_CHARS="###">
-			<BEGIN>###(?!#)</BEGIN>
-			<END REGEXP="TRUE">#{3,}</END>
-		</SPAN_REGEXP>
-		<EOL_SPAN TYPE="COMMENT1">#</EOL_SPAN>
-
-		<SPAN TYPE="LITERAL1" NO_LINE_BREAK="FALSE" ESCAPE="\" DELEGATE="doubleQuoteLiteral">
-			<BEGIN>"""</BEGIN>
-			<END>"""</END>
-		</SPAN>
-
-		<SPAN TYPE="LITERAL2" NO_LINE_BREAK="FALSE" ESCAPE="\">
-			<BEGIN>'''</BEGIN>
-			<END>'''</END>
-		</SPAN>
-
-		<SPAN TYPE="LITERAL1" NO_LINE_BREAK="FALSE" ESCAPE="\" DELEGATE="doubleQuoteLiteral">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-
-		<SPAN TYPE="LITERAL2" NO_LINE_BREAK="FALSE" ESCAPE="\">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-
-		<SPAN TYPE="LITERAL1" DELEGATE="javascript::MAIN">
-			<BEGIN>`</BEGIN>
-			<END>`</END>
-		</SPAN>
-
-		<!-- Heregexps -->
-		<SPAN TYPE="MARKUP" DELEGATE="hereRegexp" ESCAPE="\">
-			<BEGIN>///</BEGIN>
-			<END>///</END>
-		</SPAN>
-		<!-- Javascript-style regexps -->
-		<SPAN_REGEXP TYPE="MARKUP" HASH_CHAR="/" AT_WORD_START="TRUE" NO_LINE_BREAK="TRUE" ESCAPE="\">
-		    <BEGIN>/(?![\s=*])</BEGIN>
-		    <END REGEXP="TRUE">/[igmy]{0,4}</END>
-		</SPAN_REGEXP>
-
-		<MARK_PREVIOUS TYPE="FUNCTION" MATCH_TYPE="OPERATOR">(</MARK_PREVIOUS>
-		<!-- Seems to be equivalent to
-		SEQ_REGEXP TYPE="FUNCTION">([a-zA-Z\$_](\w|\$)*)(?=\s*\()</SEQ_REGEXP -->
-
-		<SEQ TYPE="OPERATOR">)</SEQ>
-		<SEQ TYPE="OPERATOR">{</SEQ>
-		<SEQ TYPE="OPERATOR">}</SEQ>
-		<SEQ TYPE="OPERATOR">[</SEQ>
-		<SEQ TYPE="OPERATOR">]</SEQ>
-		<SEQ TYPE="OPERATOR">.</SEQ>
-
-		<SEQ TYPE="OPERATOR">+</SEQ>
-		<SEQ TYPE="OPERATOR">/</SEQ>
-		<SEQ TYPE="OPERATOR">*</SEQ>
-		<SEQ TYPE="OPERATOR">&amp;</SEQ>
-		<SEQ TYPE="OPERATOR">|</SEQ>
-		<SEQ TYPE="OPERATOR">\</SEQ>
-		<SEQ TYPE="OPERATOR">-</SEQ>
-		<SEQ TYPE="OPERATOR">%</SEQ>
-		<SEQ TYPE="OPERATOR">=</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">:</SEQ>
-		<SEQ TYPE="OPERATOR">!</SEQ>
-		<SEQ TYPE="OPERATOR">;</SEQ>
-		<SEQ TYPE="OPERATOR">^</SEQ>
-		<SEQ TYPE="OPERATOR">~</SEQ>
-		<SEQ TYPE="OPERATOR">?</SEQ>
-
-		<SEQ_REGEXP TYPE="KEYWORD3">@([\p{L}\p{Nl}\$_][\p{L}\p{Nl}\p{Nd}\$_]*)</SEQ_REGEXP>
-		<SEQ_REGEXP TYPE="KEYWORD4">([\p{L}\p{Nl}\$_][\p{L}\p{Nl}\p{Nd}\$_]*)(?=\s*(?:[:\.]|\?\.))</SEQ_REGEXP>
-		<SEQ_REGEXP TYPE="KEYWORD1" AT_WORD_START="TRUE" HASH_CHARS="for ">for\s+own(?![\p{L}\p{Nl}\p{Nd}\$_])</SEQ_REGEXP>
-
-		<KEYWORDS>
-			<KEYWORD3>this</KEYWORD3>
-			<KEYWORD3>super</KEYWORD3>
-
-			<KEYWORD1>if</KEYWORD1>
-			<KEYWORD1>else</KEYWORD1>
-			<KEYWORD1>new</KEYWORD1>
-			<KEYWORD1>return</KEYWORD1>
-			<KEYWORD1>try</KEYWORD1>
-			<KEYWORD1>catch</KEYWORD1>
-			<KEYWORD1>finally</KEYWORD1>
-			<KEYWORD1>throw</KEYWORD1>
-			<KEYWORD1>break</KEYWORD1>
-			<KEYWORD1>continue</KEYWORD1>
-			<KEYWORD1>for</KEYWORD1>
-			<KEYWORD1>in</KEYWORD1>
-			<KEYWORD1>while</KEYWORD1>
-			<KEYWORD1>loop</KEYWORD1>
-			<KEYWORD1>delete</KEYWORD1>
-			<KEYWORD1>instanceof</KEYWORD1>
-			<KEYWORD1>typeof</KEYWORD1>
-			<KEYWORD1>switch</KEYWORD1>
-			<KEYWORD1>extends</KEYWORD1>
-			<KEYWORD1>class</KEYWORD1>
-			<KEYWORD1>constructor</KEYWORD1>
-			<KEYWORD1>do</KEYWORD1>
-			<KEYWORD1>then</KEYWORD1>
-			<KEYWORD1>unless</KEYWORD1>
-			<KEYWORD1>until</KEYWORD1>
-			<KEYWORD1>of</KEYWORD1>
-			<KEYWORD1>by</KEYWORD1>
-			<KEYWORD1>when</KEYWORD1>
-
-			<KEYWORD1>and</KEYWORD1>
-			<KEYWORD1>or</KEYWORD1>
-			<KEYWORD1>not</KEYWORD1>
-			<KEYWORD1>is</KEYWORD1>
-			<KEYWORD1>isnt</KEYWORD1>
-
-			<KEYWORD3>prototype</KEYWORD3>
-			<KEYWORD3>Array</KEYWORD3>
-			<KEYWORD3>Boolean</KEYWORD3>
-			<KEYWORD3>Date</KEYWORD3>
-			<KEYWORD3>Function</KEYWORD3>
-			<KEYWORD3>Global</KEYWORD3>
-			<KEYWORD3>Math</KEYWORD3>
-			<KEYWORD3>Number</KEYWORD3>
-			<KEYWORD3>Object</KEYWORD3>
-			<KEYWORD3>RegExp</KEYWORD3><!-- Not ECMA -->
-			<KEYWORD3>String</KEYWORD3>
-
-			<!-- Literals -->
-			<LITERAL2>undefined</LITERAL2>
-			<LITERAL2>false</LITERAL2>
-			<LITERAL2>null</LITERAL2>
-			<LITERAL2>true</LITERAL2>
-			<LITERAL2>yes</LITERAL2>
-			<LITERAL2>no</LITERAL2>
-			<LITERAL2>on</LITERAL2>
-			<LITERAL2>off</LITERAL2>
-			<LITERAL2>NaN</LITERAL2>
-			<LITERAL2>Infinity</LITERAL2>
-
-			<!-- Global functions -->
-			<LITERAL2>eval</LITERAL2>
-			<LITERAL2>parseInt</LITERAL2>
-			<LITERAL2>parseFloat</LITERAL2>
-			<LITERAL2>escape</LITERAL2>
-			<LITERAL2>unescape</LITERAL2>
-			<LITERAL2>isNaN</LITERAL2>
-			<LITERAL2>isFinite</LITERAL2>
-		</KEYWORDS>
-	</RULES>
-
-	<!-- Delegate contents of #{} expression in double quotes to MAIN so that
-	     it will be syntax highlighted as well -->
-	<RULES DEFAULT="LITERAL1" SET="doubleQuoteLiteral" ESCAPE="\">
-		<SPAN DELEGATE="MAIN" TYPE="OPERATOR">
-			<BEGIN>#{</BEGIN>
-			<END>}</END>
-		</SPAN>
-	</RULES>
-
-	<!-- Comments and #{} interpolation in heregexes -->
-	<RULES DEFAULT="MARKUP" SET="hereRegexp" ESCAPE="\">
-		<SPAN DELEGATE="MAIN" TYPE="OPERATOR">
-			<BEGIN>#{</BEGIN>
-			<END>}</END>
-		</SPAN>
-		<EOL_SPAN TYPE="COMMENT1">#</EOL_SPAN>
-	</RULES>
-
-</MODE>
\ No newline at end of file
diff --git a/qpython/src/main/assets/syntax/coldfusion.xml b/qpython/src/main/assets/syntax/coldfusion.xml
deleted file mode 100644
index 1ff81d75..00000000
--- a/qpython/src/main/assets/syntax/coldfusion.xml
+++ /dev/null
@@ -1,651 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="commentStart" VALUE="&lt;!--" />
-		<PROPERTY NAME="commentEnd" VALUE="--&gt;" />
-	</PROPS>
-
-	<RULES IGNORE_CASE="TRUE" HIGHLIGHT_DIGITS="TRUE">
-		<!-- CFML comment -->
-		<SPAN TYPE="COMMENT4">
-			<BEGIN>&lt;!---</BEGIN>
-			<END>---&gt;</END>
-		</SPAN>
-
-		<!-- CFSCRIPT multi-line comment -->
-		<SPAN TYPE="COMMENT1">
-			<BEGIN>/*</BEGIN>
-			<END>*/</END>
-		</SPAN>
-
-		<!-- CFSCRIPT single-line comment -->
-		<EOL_SPAN TYPE="COMMENT2">//</EOL_SPAN>
-
-		<!-- SGML comment -->
-		<SPAN TYPE="COMMENT3">
-			<BEGIN>&lt;!--</BEGIN>
-			<END>--&gt;</END>
-		</SPAN>
-		
-		<!-- CFScript -->
-		<SPAN TYPE="KEYWORD3" DELEGATE="cfscript::MAIN">
-			<BEGIN>&lt;CFSCRIPT</BEGIN>
-			<END>&lt;/CFSCRIPT&gt;</END>
-		</SPAN>
-		
-		<!-- query -->
-		<SPAN TYPE="KEYWORD3" DELEGATE="CFQUERY">
-			<BEGIN>&lt;CFQUERY</BEGIN>
-			<END>/CFQUERY&gt;</END>
-		</SPAN>
-		
-		<!-- CFML markup start tags -->
-		<SPAN TYPE="KEYWORD3" DELEGATE="CFTAGS">
-			<BEGIN>&lt;CF</BEGIN>
-			<END>&gt;</END>
-		</SPAN>
-
-		<!-- CFML markup end tags -->
-		<SPAN TYPE="KEYWORD3" DELEGATE="CFTAGS">
-			<BEGIN>&lt;/CF</BEGIN>
-			<END>&gt;</END>
-		</SPAN>
-
-		<!-- JavaScript -->
-		<SPAN TYPE="MARKUP" DELEGATE="html::JAVASCRIPT">
-			<BEGIN>&lt;SCRIPT</BEGIN>
-			<END>&lt;/SCRIPT&gt;</END>
-		</SPAN>
-
-		<!-- stylesheet -->
-		<SPAN TYPE="MARKUP" DELEGATE="html::CSS">
-			<BEGIN>&lt;STYLE</BEGIN>
-			<END>&lt;/STYLE&gt;</END>
-		</SPAN>
-		
-		<!-- markup tags -->
-		<SPAN TYPE="MARKUP" DELEGATE="TAGS">
-			<BEGIN>&lt;</BEGIN>
-			<END>&gt;</END>
-		</SPAN>
-
-		<!-- SGML entities -->
-		<SPAN TYPE="LITERAL2" NO_WORD_BREAK="TRUE">
-			<BEGIN>&amp;</BEGIN>
-			<END>;</END>
-		</SPAN>
-	</RULES>
-
-	<RULES SET="TAGS" DEFAULT="MARKUP" IGNORE_CASE="TRUE" HIGHLIGHT_DIGITS="TRUE">
-		<SPAN TYPE="LITERAL1">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-		<SPAN TYPE="LITERAL1">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-
-		<SEQ TYPE="OPERATOR">=</SEQ>
-		
-		<!-- CFML markup start tags -->
-		<SPAN TYPE="KEYWORD3" DELEGATE="CFTAGS">
-			<BEGIN>&lt;CF</BEGIN>
-			<END>&gt;</END>
-		</SPAN>
-
-		<!-- CFML markup end tags -->
-		<SPAN TYPE="KEYWORD3" DELEGATE="CFTAGS">
-			<BEGIN>&lt;/CF</BEGIN>
-			<END>&gt;</END>
-		</SPAN>
-	</RULES>
-	
-	<RULES SET="CFQUERY" DEFAULT="KEYWORD3" IGNORE_CASE="TRUE" HIGHLIGHT_DIGITS="TRUE">
-		<!-- attributes inside cfquery tag -->
-		<SPAN TYPE="LITERAL1">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-		<SPAN TYPE="LITERAL1">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-		<SEQ TYPE="OPERATOR">=</SEQ>
-		
-		<!-- cf logic inside query (like <cfqueryparam.../> -->
-		<SPAN_REGEXP TYPE="KEYWORD3" DELEGATE="CFTAGS" HASH_CHARS="&lt;CF">
-			<BEGIN>&lt;CF</BEGIN>
-			<END>&gt;</END>
-		</SPAN_REGEXP>
-		
-		<!-- ending cf tag in query (like </cfif> ) -->
-		<SPAN_REGEXP TYPE="KEYWORD3" DELEGATE="CFTAGS" HASH_CHARS="&lt;/CF">
-			<BEGIN>&lt;/CF</BEGIN>
-			<END>&gt;</END>
-		</SPAN_REGEXP>
-		
-		<!-- the actual SQL, delegate -->
-		<SPAN TYPE="MARKUP" DELEGATE="transact-sql::MAIN">
-			<BEGIN>&gt;</BEGIN>
-			<END>&lt;</END>
-		</SPAN>
-	</RULES>
-	
-	<RULES SET="CFTAGS" DEFAULT="KEYWORD3">
-		<SPAN TYPE="LITERAL1">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-		<SPAN TYPE="LITERAL1">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-
-		<SEQ TYPE="OPERATOR">=</SEQ>
-		<SEQ TYPE="KEYWORD3">##</SEQ>
-
-		<SPAN TYPE="LITERAL2">
-			<BEGIN>#</BEGIN>
-			<END>#</END>
-		</SPAN>
-		
-		<!-- Allow arbitrary CFScript in CFSET tags (buggy) -->
-		<!--SPAN TYPE="KEYWORD3" DELEGATE="cfscript::MAIN">
-			<BEGIN>SET </BEGIN>
-			<END>&gt;</END>
-		</SPAN-->
-		
-		<KEYWORDS>
-			<KEYWORD2>ACos</KEYWORD2>
-			<KEYWORD2>ASin</KEYWORD2>
-			<KEYWORD2>Abort</KEYWORD2>
-			<KEYWORD2>Abs</KEYWORD2>
-			<KEYWORD2>AddSOAPRequestHeader</KEYWORD2>
-			<KEYWORD2>AddSOAPResponseHeader</KEYWORD2>
-			<KEYWORD2>AjaxLink</KEYWORD2>
-			<KEYWORD2>AjaxOnLoad</KEYWORD2>
-			<KEYWORD2>ApplicationStop</KEYWORD2>
-			<KEYWORD2>ArrayAppend</KEYWORD2>
-			<KEYWORD2>ArrayAvg</KEYWORD2>
-			<KEYWORD2>ArrayClear</KEYWORD2>
-			<KEYWORD2>ArrayContains</KEYWORD2>
-			<KEYWORD2>ArrayDelete</KEYWORD2>
-			<KEYWORD2>ArrayDeleteAt</KEYWORD2>
-			<KEYWORD2>ArrayFind</KEYWORD2>
-			<KEYWORD2>ArrayFindNoCase</KEYWORD2>
-			<KEYWORD2>ArrayInsertAt</KEYWORD2>
-			<KEYWORD2>ArrayIsDefined</KEYWORD2>
-			<KEYWORD2>ArrayIsEmpty</KEYWORD2>
-			<KEYWORD2>ArrayLen</KEYWORD2>
-			<KEYWORD2>ArrayMax</KEYWORD2>
-			<KEYWORD2>ArrayMin</KEYWORD2>
-			<KEYWORD2>ArrayNew</KEYWORD2>
-			<KEYWORD2>ArrayPrepend</KEYWORD2>
-			<KEYWORD2>ArrayResize</KEYWORD2>
-			<KEYWORD2>ArraySet</KEYWORD2>
-			<KEYWORD2>ArraySort</KEYWORD2>
-			<KEYWORD2>ArraySum</KEYWORD2>
-			<KEYWORD2>ArraySwap</KEYWORD2>
-			<KEYWORD2>ArrayToList</KEYWORD2>
-			<KEYWORD2>Asc</KEYWORD2>
-			<KEYWORD2>Atn</KEYWORD2>
-			<KEYWORD2>BinaryDecode</KEYWORD2>
-			<KEYWORD2>BinaryEncode</KEYWORD2>
-			<KEYWORD2>BitAnd</KEYWORD2>
-			<KEYWORD2>BitMaskClear</KEYWORD2>
-			<KEYWORD2>BitMaskRead</KEYWORD2>
-			<KEYWORD2>BitMaskSet</KEYWORD2>
-			<KEYWORD2>BitNot</KEYWORD2>
-			<KEYWORD2>BitOr</KEYWORD2>
-			<KEYWORD2>BitSHLN</KEYWORD2>
-			<KEYWORD2>BitSHRN</KEYWORD2>
-			<KEYWORD2>BitXor</KEYWORD2>
-			<KEYWORD2>CJustify</KEYWORD2>
-			<KEYWORD2>CacheGet</KEYWORD2>
-			<KEYWORD2>CacheGetAllIds</KEYWORD2>
-			<KEYWORD2>CacheGetMetadata</KEYWORD2>
-			<KEYWORD2>CacheGetProperties</KEYWORD2>
-			<KEYWORD2>CacheGetSession</KEYWORD2>
-			<KEYWORD2>CachePut</KEYWORD2>
-			<KEYWORD2>CacheRemove</KEYWORD2>
-			<KEYWORD2>CacheSetProperties</KEYWORD2>
-			<KEYWORD2>Ceiling</KEYWORD2>
-			<KEYWORD2>CharsetDecode</KEYWORD2>
-			<KEYWORD2>CharsetEncode</KEYWORD2>
-			<KEYWORD2>Chr</KEYWORD2>
-			<KEYWORD2>Compare</KEYWORD2>
-			<KEYWORD2>CompareNoCase</KEYWORD2>
-			<KEYWORD2>Cos</KEYWORD2>
-			<KEYWORD2>CreateDate</KEYWORD2>
-			<KEYWORD2>CreateDateTime</KEYWORD2>
-			<KEYWORD2>CreateODBCDate</KEYWORD2>
-			<KEYWORD2>CreateODBCDateTime</KEYWORD2>
-			<KEYWORD2>CreateODBCTime</KEYWORD2>
-			<KEYWORD2>CreateObject</KEYWORD2>
-			<KEYWORD2>CreateTime</KEYWORD2>
-			<KEYWORD2>CreateTimeSpan</KEYWORD2>
-			<KEYWORD2>CreateUUID</KEYWORD2>
-			<KEYWORD2>DE</KEYWORD2>
-			<KEYWORD2>DateAdd</KEYWORD2>
-			<KEYWORD2>DateCompare</KEYWORD2>
-			<KEYWORD2>DateConvert</KEYWORD2>
-			<KEYWORD2>DateDiff</KEYWORD2>
-			<KEYWORD2>DateFormat</KEYWORD2>
-			<KEYWORD2>DatePart</KEYWORD2>
-			<KEYWORD2>Day</KEYWORD2>
-			<KEYWORD2>DayOfWeek</KEYWORD2>
-			<KEYWORD2>DayOfWeekAsString</KEYWORD2>
-			<KEYWORD2>DayOfYear</KEYWORD2>
-			<KEYWORD2>DaysInMonth</KEYWORD2>
-			<KEYWORD2>DaysInYear</KEYWORD2>
-			<KEYWORD2>DecimalFormat</KEYWORD2>
-			<KEYWORD2>DecrementValue</KEYWORD2>
-			<KEYWORD2>Decrypt</KEYWORD2>
-			<KEYWORD2>DecryptBinary</KEYWORD2>
-			<KEYWORD2>DeleteClientVariable</KEYWORD2>
-			<KEYWORD2>DeserializeJSON</KEYWORD2>
-			<KEYWORD2>DirectoryCreate</KEYWORD2>
-			<KEYWORD2>DirectoryDelete</KEYWORD2>
-			<KEYWORD2>DirectoryExists</KEYWORD2>
-			<KEYWORD2>DirectoryList</KEYWORD2>
-			<KEYWORD2>DirectoryRename</KEYWORD2>
-			<KEYWORD2>DollarFormat</KEYWORD2>
-			<KEYWORD2>DotNetToCFType</KEYWORD2>
-			<KEYWORD2>Duplicate</KEYWORD2>
-			<KEYWORD2>Encrypt</KEYWORD2>
-			<KEYWORD2>EncryptBinary</KEYWORD2>
-			<KEYWORD2>EntityDelete</KEYWORD2>
-			<KEYWORD2>EntityLoad</KEYWORD2>
-			<KEYWORD2>EntityLoadByExample</KEYWORD2>
-			<KEYWORD2>EntityLoadByPK</KEYWORD2>
-			<KEYWORD2>EntityMerge</KEYWORD2>
-			<KEYWORD2>EntityNew</KEYWORD2>
-			<KEYWORD2>EntityReload</KEYWORD2>
-			<KEYWORD2>EntitySave</KEYWORD2>
-			<KEYWORD2>EntitytoQuery</KEYWORD2>
-			<KEYWORD2>Evaluate</KEYWORD2>
-			<KEYWORD2>Exp</KEYWORD2>
-			<KEYWORD2>ExpandPath</KEYWORD2>
-			<KEYWORD2>FileClose</KEYWORD2>
-			<KEYWORD2>FileCopy</KEYWORD2>
-			<KEYWORD2>FileDelete</KEYWORD2>
-			<KEYWORD2>FileExists</KEYWORD2>
-			<KEYWORD2>FileIsEOF</KEYWORD2>
-			<KEYWORD2>FileMove</KEYWORD2>
-			<KEYWORD2>FileOpen</KEYWORD2>
-			<KEYWORD2>FileRead</KEYWORD2>
-			<KEYWORD2>FileReadBinary</KEYWORD2>
-			<KEYWORD2>FileReadLine</KEYWORD2>
-			<KEYWORD2>FileSeek</KEYWORD2>
-			<KEYWORD2>FileSetAccessMode</KEYWORD2>
-			<KEYWORD2>FileSetAttribute</KEYWORD2>
-			<KEYWORD2>FileSetLastModified</KEYWORD2>
-			<KEYWORD2>FileSkipBytes</KEYWORD2>
-			<KEYWORD2>FileUpload</KEYWORD2>
-			<KEYWORD2>FileUploadAll</KEYWORD2>
-			<KEYWORD2>FileWrite</KEYWORD2>
-			<KEYWORD2>Find</KEYWORD2>
-			<KEYWORD2>FindNoCase</KEYWORD2>
-			<KEYWORD2>FindOneOf</KEYWORD2>
-			<KEYWORD2>FirstDayOfMonth</KEYWORD2>
-			<KEYWORD2>Fix</KEYWORD2>
-			<KEYWORD2>FormatBaseN</KEYWORD2>
-			<KEYWORD2>GenerateSecretKey</KEYWORD2>
-			<KEYWORD2>GetAuthUser</KEYWORD2>
-			<KEYWORD2>GetBaseTagData</KEYWORD2>
-			<KEYWORD2>GetBaseTagList</KEYWORD2>
-			<KEYWORD2>GetBaseTemplatePath</KEYWORD2>
-			<KEYWORD2>GetClientVariablesList</KEYWORD2>
-			<KEYWORD2>GetComponentMetaData</KEYWORD2>
-			<KEYWORD2>GetContextRoot</KEYWORD2>
-			<KEYWORD2>GetCurrentTemplatePath</KEYWORD2>
-			<KEYWORD2>GetDirectoryFromPath</KEYWORD2>
-			<KEYWORD2>GetEncoding</KEYWORD2>
-			<KEYWORD2>GetException</KEYWORD2>
-			<KEYWORD2>GetFileFromPath</KEYWORD2>
-			<KEYWORD2>GetFileInfo</KEYWORD2>
-			<KEYWORD2>GetFunctionCalledName</KEYWORD2>
-			<KEYWORD2>GetFunctionList</KEYWORD2>
-			<KEYWORD2>GetGatewayHelper</KEYWORD2>
-			<KEYWORD2>GetHttpRequestData</KEYWORD2>
-			<KEYWORD2>GetHttpTimeString</KEYWORD2>
-			<KEYWORD2>GetLocalHostIP</KEYWORD2>
-			<KEYWORD2>GetLocale</KEYWORD2>
-			<KEYWORD2>GetLocaleDisplayName</KEYWORD2>
-			<KEYWORD2>GetMetaData</KEYWORD2>
-			<KEYWORD2>GetMetricData</KEYWORD2>
-			<KEYWORD2>GetPageContext</KEYWORD2>
-			<KEYWORD2>GetPrinterInfo</KEYWORD2>
-			<KEYWORD2>GetProfileSections</KEYWORD2>
-			<KEYWORD2>GetProfileString</KEYWORD2>
-			<KEYWORD2>GetReadableImageFormats</KEYWORD2>
-			<KEYWORD2>GetSOAPRequest</KEYWORD2>
-			<KEYWORD2>GetSOAPRequestHeader</KEYWORD2>
-			<KEYWORD2>GetSOAPResponse</KEYWORD2>
-			<KEYWORD2>GetSOAPResponseHeader</KEYWORD2>
-			<KEYWORD2>GetTempDirectory</KEYWORD2>
-			<KEYWORD2>GetTempFile</KEYWORD2>
-			<KEYWORD2>GetTemplatePath</KEYWORD2>
-			<KEYWORD2>GetTickCount</KEYWORD2>
-			<KEYWORD2>GetTimeZoneInfo</KEYWORD2>
-			<KEYWORD2>GetToken</KEYWORD2>
-			<KEYWORD2>GetUserRoles</KEYWORD2>
-			<KEYWORD2>GetWriteableImageFormats</KEYWORD2>
-			<KEYWORD2>HTMLCodeFormat</KEYWORD2>
-			<KEYWORD2>HTMLEditFormat</KEYWORD2>
-			<KEYWORD2>Hash</KEYWORD2>
-			<KEYWORD2>Hour</KEYWORD2>
-			<KEYWORD2>IIf</KEYWORD2>
-			<KEYWORD2>ImageAddBorder</KEYWORD2>
-			<KEYWORD2>ImageBlur</KEYWORD2>
-			<KEYWORD2>ImageClearRect</KEYWORD2>
-			<KEYWORD2>ImageCopy</KEYWORD2>
-			<KEYWORD2>ImageCrop</KEYWORD2>
-			<KEYWORD2>ImageDrawArc</KEYWORD2>
-			<KEYWORD2>ImageDrawBeveledRect</KEYWORD2>
-			<KEYWORD2>ImageDrawCubicCurve</KEYWORD2>
-			<KEYWORD2>ImageDrawLine</KEYWORD2>
-			<KEYWORD2>ImageDrawLines</KEYWORD2>
-			<KEYWORD2>ImageDrawOval</KEYWORD2>
-			<KEYWORD2>ImageDrawPoint</KEYWORD2>
-			<KEYWORD2>ImageDrawQuadraticCurve</KEYWORD2>
-			<KEYWORD2>ImageDrawRect</KEYWORD2>
-			<KEYWORD2>ImageDrawRoundRect</KEYWORD2>
-			<KEYWORD2>ImageDrawText</KEYWORD2>
-			<KEYWORD2>ImageFlip</KEYWORD2>
-			<KEYWORD2>ImageGetBlob</KEYWORD2>
-			<KEYWORD2>ImageGetBufferedImage</KEYWORD2>
-			<KEYWORD2>ImageGetEXIFTag</KEYWORD2>
-			<KEYWORD2>ImageGetHeight</KEYWORD2>
-			<KEYWORD2>ImageGetIPTCTag</KEYWORD2>
-			<KEYWORD2>ImageGetWidth</KEYWORD2>
-			<KEYWORD2>ImageGrayscale</KEYWORD2>
-			<KEYWORD2>ImageInfo</KEYWORD2>
-			<KEYWORD2>ImageNegative</KEYWORD2>
-			<KEYWORD2>ImageNew</KEYWORD2>
-			<KEYWORD2>ImageOverlay</KEYWORD2>
-			<KEYWORD2>ImagePaste</KEYWORD2>
-			<KEYWORD2>ImageRead</KEYWORD2>
-			<KEYWORD2>ImageReadBase64</KEYWORD2>
-			<KEYWORD2>ImageResize</KEYWORD2>
-			<KEYWORD2>ImageRotate</KEYWORD2>
-			<KEYWORD2>ImageRotateDrawingAxis</KEYWORD2>
-			<KEYWORD2>ImageScaleToFit</KEYWORD2>
-			<KEYWORD2>ImageSetAntialiasing</KEYWORD2>
-			<KEYWORD2>ImageSetBackgroundColor</KEYWORD2>
-			<KEYWORD2>ImageSetDrawingColor</KEYWORD2>
-			<KEYWORD2>ImageSetDrawingStroke</KEYWORD2>
-			<KEYWORD2>ImageSetDrawingTransparency</KEYWORD2>
-			<KEYWORD2>ImageSharpen</KEYWORD2>
-			<KEYWORD2>ImageShear</KEYWORD2>
-			<KEYWORD2>ImageShearDrawingAxis</KEYWORD2>
-			<KEYWORD2>ImageTranslate</KEYWORD2>
-			<KEYWORD2>ImageTranslateDrawingAxis</KEYWORD2>
-			<KEYWORD2>ImageWrite</KEYWORD2>
-			<KEYWORD2>ImageWriteBase64</KEYWORD2>
-			<KEYWORD2>ImageXORDrawingMode</KEYWORD2>
-			<KEYWORD2>IncrementValue</KEYWORD2>
-			<KEYWORD2>InputBaseN</KEYWORD2>
-			<KEYWORD2>Insert</KEYWORD2>
-			<KEYWORD2>Int</KEYWORD2>
-			<KEYWORD2>IsArray</KEYWORD2>
-			<KEYWORD2>IsBinary</KEYWORD2>
-			<KEYWORD2>IsBoolean</KEYWORD2>
-			<KEYWORD2>IsCustomFunction</KEYWORD2>
-			<KEYWORD2>IsDDX</KEYWORD2>
-			<KEYWORD2>IsDate</KEYWORD2>
-			<KEYWORD2>IsDebugMode</KEYWORD2>
-			<KEYWORD2>IsDefined</KEYWORD2>
-			<KEYWORD2>IsImage</KEYWORD2>
-			<KEYWORD2>IsImageFile</KEYWORD2>
-			<KEYWORD2>IsInstanceOf</KEYWORD2>
-			<KEYWORD2>IsJSON</KEYWORD2>
-			<KEYWORD2>IsK2ServerABroker</KEYWORD2>
-			<KEYWORD2>IsK2ServerDocCountExceeded</KEYWORD2>
-			<KEYWORD2>IsK2ServerOnline</KEYWORD2>
-			<KEYWORD2>IsLeapYear</KEYWORD2>
-			<KEYWORD2>IsLocalHost</KEYWORD2>
-			<KEYWORD2>IsNull</KEYWORD2>
-			<KEYWORD2>IsNumeric</KEYWORD2>
-			<KEYWORD2>IsNumericDate</KEYWORD2>
-			<KEYWORD2>IsObject</KEYWORD2>
-			<KEYWORD2>IsPDFFile</KEYWORD2>
-			<KEYWORD2>IsPDFObject</KEYWORD2>
-			<KEYWORD2>IsQuery</KEYWORD2>
-			<KEYWORD2>IsSOAPRequest</KEYWORD2>
-			<KEYWORD2>IsSimpleValue</KEYWORD2>
-			<KEYWORD2>IsStruct</KEYWORD2>
-			<KEYWORD2>IsUserInAnyRole</KEYWORD2>
-			<KEYWORD2>IsUserInRole</KEYWORD2>
-			<KEYWORD2>IsUserLoggedIn</KEYWORD2>
-			<KEYWORD2>IsValid</KEYWORD2>
-			<KEYWORD2>IsWDDX</KEYWORD2>
-			<KEYWORD2>IsXML</KEYWORD2>
-			<KEYWORD2>IsXmlAttribute</KEYWORD2>
-			<KEYWORD2>IsXmlDoc</KEYWORD2>
-			<KEYWORD2>IsXmlElem</KEYWORD2>
-			<KEYWORD2>IsXmlNode</KEYWORD2>
-			<KEYWORD2>IsXmlRoot</KEYWORD2>
-			<KEYWORD2>JSStringFormat</KEYWORD2>
-			<KEYWORD2>JavaCast</KEYWORD2>
-			<KEYWORD2>LCase</KEYWORD2>
-			<KEYWORD2>LJustify</KEYWORD2>
-			<KEYWORD2>LSCurrencyFormat</KEYWORD2>
-			<KEYWORD2>LSDateFormat</KEYWORD2>
-			<KEYWORD2>LSEuroCurrencyFormat</KEYWORD2>
-			<KEYWORD2>LSIsCurrency</KEYWORD2>
-			<KEYWORD2>LSIsDate</KEYWORD2>
-			<KEYWORD2>LSIsNumeric</KEYWORD2>
-			<KEYWORD2>LSNumberFormat</KEYWORD2>
-			<KEYWORD2>LSParseCurrency</KEYWORD2>
-			<KEYWORD2>LSParseDateTime</KEYWORD2>
-			<KEYWORD2>LSParseEuroCurrency</KEYWORD2>
-			<KEYWORD2>LSParseNumber</KEYWORD2>
-			<KEYWORD2>LSTimeFormat</KEYWORD2>
-			<KEYWORD2>LTrim</KEYWORD2>
-			<KEYWORD2>Left</KEYWORD2>
-			<KEYWORD2>Len</KEYWORD2>
-			<KEYWORD2>ListAppend</KEYWORD2>
-			<KEYWORD2>ListChangeDelims</KEYWORD2>
-			<KEYWORD2>ListContains</KEYWORD2>
-			<KEYWORD2>ListContainsNoCase</KEYWORD2>
-			<KEYWORD2>ListDeleteAt</KEYWORD2>
-			<KEYWORD2>ListFind</KEYWORD2>
-			<KEYWORD2>ListFindNoCase</KEYWORD2>
-			<KEYWORD2>ListFirst</KEYWORD2>
-			<KEYWORD2>ListGetAt</KEYWORD2>
-			<KEYWORD2>ListInsertAt</KEYWORD2>
-			<KEYWORD2>ListLast</KEYWORD2>
-			<KEYWORD2>ListLen</KEYWORD2>
-			<KEYWORD2>ListPrepend</KEYWORD2>
-			<KEYWORD2>ListQualify</KEYWORD2>
-			<KEYWORD2>ListRest</KEYWORD2>
-			<KEYWORD2>ListSetAt</KEYWORD2>
-			<KEYWORD2>ListSort</KEYWORD2>
-			<KEYWORD2>ListToArray</KEYWORD2>
-			<KEYWORD2>ListValueCount</KEYWORD2>
-			<KEYWORD2>ListValueCountNoCase</KEYWORD2>
-			<KEYWORD2>Location</KEYWORD2>
-			<KEYWORD2>Log</KEYWORD2>
-			<KEYWORD2>Log10</KEYWORD2>
-			<KEYWORD2>Max</KEYWORD2>
-			<KEYWORD2>Mid</KEYWORD2>
-			<KEYWORD2>Min</KEYWORD2>
-			<KEYWORD2>Minute</KEYWORD2>
-			<KEYWORD2>Month</KEYWORD2>
-			<KEYWORD2>MonthAsString</KEYWORD2>
-			<KEYWORD2>Now</KEYWORD2>
-			<KEYWORD2>NumberFormat</KEYWORD2>
-			<KEYWORD2>ORMClearSession</KEYWORD2>
-			<KEYWORD2>ORMCloseSession</KEYWORD2>
-			<KEYWORD2>ORMEvictCollection</KEYWORD2>
-			<KEYWORD2>ORMEvictEntity</KEYWORD2>
-			<KEYWORD2>ORMEvictQueries</KEYWORD2>
-			<KEYWORD2>ORMExecuteQuery</KEYWORD2>
-			<KEYWORD2>ORMFlush</KEYWORD2>
-			<KEYWORD2>ORMGetSession</KEYWORD2>
-			<KEYWORD2>ORMGetSessionFactory</KEYWORD2>
-			<KEYWORD2>ORMReload</KEYWORD2>
-			<KEYWORD2>ObjectEquals</KEYWORD2>
-			<KEYWORD2>ObjectLoad</KEYWORD2>
-			<KEYWORD2>ObjectSave</KEYWORD2>
-			<KEYWORD2>ParagraphFormat</KEYWORD2>
-			<KEYWORD2>ParseDateTime</KEYWORD2>
-			<KEYWORD2>Pi</KEYWORD2>
-			<KEYWORD2>PrecisionEvaluate</KEYWORD2>
-			<KEYWORD2>PreserveSingleQuotes</KEYWORD2>
-			<KEYWORD2>Quarter</KEYWORD2>
-			<KEYWORD2>QueryAddColumn</KEYWORD2>
-			<KEYWORD2>QueryAddRow</KEYWORD2>
-			<KEYWORD2>QueryConvertForGrid</KEYWORD2>
-			<KEYWORD2>QueryNew</KEYWORD2>
-			<KEYWORD2>QuerySetCell</KEYWORD2>
-			<KEYWORD2>QuotedValueList</KEYWORD2>
-			<KEYWORD2>REFind</KEYWORD2>
-			<KEYWORD2>REFindNoCase</KEYWORD2>
-			<KEYWORD2>REMatch</KEYWORD2>
-			<KEYWORD2>REMatchNoCase</KEYWORD2>
-			<KEYWORD2>REReplace</KEYWORD2>
-			<KEYWORD2>REReplaceNoCase</KEYWORD2>
-			<KEYWORD2>RJustify</KEYWORD2>
-			<KEYWORD2>RTrim</KEYWORD2>
-			<KEYWORD2>Rand</KEYWORD2>
-			<KEYWORD2>RandRange</KEYWORD2>
-			<KEYWORD2>Randomize</KEYWORD2>
-			<KEYWORD2>ReleaseComObject</KEYWORD2>
-			<KEYWORD2>RemoveChars</KEYWORD2>
-			<KEYWORD2>RepeatString</KEYWORD2>
-			<KEYWORD2>Replace</KEYWORD2>
-			<KEYWORD2>ReplaceList</KEYWORD2>
-			<KEYWORD2>ReplaceNoCase</KEYWORD2>
-			<KEYWORD2>Reverse</KEYWORD2>
-			<KEYWORD2>Right</KEYWORD2>
-			<KEYWORD2>Round</KEYWORD2>
-			<KEYWORD2>Second</KEYWORD2>
-			<KEYWORD2>SendGatewayMessage</KEYWORD2>
-			<KEYWORD2>SerializeJSON</KEYWORD2>
-			<KEYWORD2>SetLocale</KEYWORD2>
-			<KEYWORD2>SetProfileString</KEYWORD2>
-			<KEYWORD2>SetVariable</KEYWORD2>
-			<KEYWORD2>Sgn</KEYWORD2>
-			<KEYWORD2>Sin</KEYWORD2>
-			<KEYWORD2>Sleep</KEYWORD2>
-			<KEYWORD2>SpanExcluding</KEYWORD2>
-			<KEYWORD2>SpanIncluding</KEYWORD2>
-			<KEYWORD2>SpreadsheetAddColumn</KEYWORD2>
-			<KEYWORD2>SpreadsheetAddFreezePane</KEYWORD2>
-			<KEYWORD2>SpreadsheetAddImage</KEYWORD2>
-			<KEYWORD2>SpreadsheetAddInfo</KEYWORD2>
-			<KEYWORD2>SpreadsheetAddRow</KEYWORD2>
-			<KEYWORD2>SpreadsheetAddRows</KEYWORD2>
-			<KEYWORD2>SpreadsheetAddSplitPane</KEYWORD2>
-			<KEYWORD2>SpreadsheetCreateSheet</KEYWORD2>
-			<KEYWORD2>SpreadsheetDeleteColumn</KEYWORD2>
-			<KEYWORD2>SpreadsheetDeleteColumns</KEYWORD2>
-			<KEYWORD2>SpreadsheetDeleteRow</KEYWORD2>
-			<KEYWORD2>SpreadsheetDeleteRows</KEYWORD2>
-			<KEYWORD2>SpreadsheetFormatCell</KEYWORD2>
-			<KEYWORD2>SpreadsheetFormatCellRange</KEYWORD2>
-			<KEYWORD2>SpreadsheetFormatColumn</KEYWORD2>
-			<KEYWORD2>SpreadsheetFormatColumns</KEYWORD2>
-			<KEYWORD2>SpreadsheetFormatRow</KEYWORD2>
-			<KEYWORD2>SpreadsheetFormatRows</KEYWORD2>
-			<KEYWORD2>SpreadsheetGetCellComment</KEYWORD2>
-			<KEYWORD2>SpreadsheetGetCellFormula</KEYWORD2>
-			<KEYWORD2>SpreadsheetGetCellValue</KEYWORD2>
-			<KEYWORD2>SpreadsheetInfo</KEYWORD2>
-			<KEYWORD2>SpreadsheetMergeCells</KEYWORD2>
-			<KEYWORD2>SpreadsheetNew</KEYWORD2>
-			<KEYWORD2>SpreadsheetRead</KEYWORD2>
-			<KEYWORD2>SpreadsheetReadBinary</KEYWORD2>
-			<KEYWORD2>SpreadsheetRemoveSheet</KEYWORD2>
-			<KEYWORD2>SpreadsheetSetActiveSheet</KEYWORD2>
-			<KEYWORD2>SpreadsheetSetActiveSheetNumber</KEYWORD2>
-			<KEYWORD2>SpreadsheetSetCellComment</KEYWORD2>
-			<KEYWORD2>SpreadsheetSetCellFormula</KEYWORD2>
-			<KEYWORD2>SpreadsheetSetCellValue</KEYWORD2>
-			<KEYWORD2>SpreadsheetSetColumnWidth</KEYWORD2>
-			<KEYWORD2>SpreadsheetSetFooter</KEYWORD2>
-			<KEYWORD2>SpreadsheetSetHeader</KEYWORD2>
-			<KEYWORD2>SpreadsheetSetRowHeight</KEYWORD2>
-			<KEYWORD2>SpreadsheetShiftColumns</KEYWORD2>
-			<KEYWORD2>SpreadsheetShiftRows</KEYWORD2>
-			<KEYWORD2>SpreadsheetWrite</KEYWORD2>
-			<KEYWORD2>Sqr</KEYWORD2>
-			<KEYWORD2>StripCR</KEYWORD2>
-			<KEYWORD2>StructAppend</KEYWORD2>
-			<KEYWORD2>StructClear</KEYWORD2>
-			<KEYWORD2>StructCopy</KEYWORD2>
-			<KEYWORD2>StructCount</KEYWORD2>
-			<KEYWORD2>StructDelete</KEYWORD2>
-			<KEYWORD2>StructFind</KEYWORD2>
-			<KEYWORD2>StructFindKey</KEYWORD2>
-			<KEYWORD2>StructFindValue</KEYWORD2>
-			<KEYWORD2>StructGet</KEYWORD2>
-			<KEYWORD2>StructInsert</KEYWORD2>
-			<KEYWORD2>StructIsEmpty</KEYWORD2>
-			<KEYWORD2>StructKeyArray</KEYWORD2>
-			<KEYWORD2>StructKeyExists</KEYWORD2>
-			<KEYWORD2>StructKeyList</KEYWORD2>
-			<KEYWORD2>StructNew</KEYWORD2>
-			<KEYWORD2>StructSort</KEYWORD2>
-			<KEYWORD2>StructUpdate</KEYWORD2>
-			<KEYWORD2>Tan</KEYWORD2>
-			<KEYWORD2>Throw</KEYWORD2>
-			<KEYWORD2>TimeFormat</KEYWORD2>
-			<KEYWORD2>ToBase64</KEYWORD2>
-			<KEYWORD2>ToBinary</KEYWORD2>
-			<KEYWORD2>ToScript</KEYWORD2>
-			<KEYWORD2>ToString</KEYWORD2>
-			<KEYWORD2>Trace</KEYWORD2>
-			<KEYWORD2>TransactionCommit</KEYWORD2>
-			<KEYWORD2>TransactionRollback</KEYWORD2>
-			<KEYWORD2>TransactionSetSavePoint</KEYWORD2>
-			<KEYWORD2>Trim</KEYWORD2>
-			<KEYWORD2>UCase</KEYWORD2>
-			<KEYWORD2>URLDecode</KEYWORD2>
-			<KEYWORD2>URLEncodedFormat</KEYWORD2>
-			<KEYWORD2>URLSessionFormat</KEYWORD2>
-			<KEYWORD2>Val</KEYWORD2>
-			<KEYWORD2>ValueList</KEYWORD2>
-			<KEYWORD2>VerifyClient</KEYWORD2>
-			<KEYWORD2>Week</KEYWORD2>
-			<KEYWORD2>Wrap</KEYWORD2>
-			<KEYWORD2>WriteDump</KEYWORD2>
-			<KEYWORD2>WriteLog</KEYWORD2>
-			<KEYWORD2>WriteOutput</KEYWORD2>
-			<KEYWORD2>XmlChildPos</KEYWORD2>
-			<KEYWORD2>XmlElemNew</KEYWORD2>
-			<KEYWORD2>XmlFormat</KEYWORD2>
-			<KEYWORD2>XmlGetNodeType</KEYWORD2>
-			<KEYWORD2>XmlNew</KEYWORD2>
-			<KEYWORD2>XmlParse</KEYWORD2>
-			<KEYWORD2>XmlSearch</KEYWORD2>
-			<KEYWORD2>XmlTransform</KEYWORD2>
-			<KEYWORD2>XmlValidate</KEYWORD2>
-			<KEYWORD2>Year</KEYWORD2>
-			<KEYWORD2>YesNoFormat</KEYWORD2>
-
-			<OPERATOR>IS</OPERATOR>
-			<OPERATOR>EQ</OPERATOR>
-			<OPERATOR>NEQ</OPERATOR>
-			<OPERATOR>GT</OPERATOR>
-			<OPERATOR>GTE</OPERATOR>
-			<OPERATOR>LT</OPERATOR>
-			<OPERATOR>LTE</OPERATOR>
-
-			<OPERATOR>LESS</OPERATOR>
-			<OPERATOR>GREATER</OPERATOR>
-			<OPERATOR>THAN</OPERATOR>
-
-			<OPERATOR>AND</OPERATOR>
-			<OPERATOR>OR</OPERATOR>
-			<OPERATOR>NOT</OPERATOR>
-			<OPERATOR>XOR</OPERATOR>
-		</KEYWORDS>
-	</RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/cplexlp.xml b/qpython/src/main/assets/syntax/cplexlp.xml
deleted file mode 100644
index 94dc65c5..00000000
--- a/qpython/src/main/assets/syntax/cplexlp.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!-- CPlex LP mode, by Kevin Hunter of NCSU (kmhunte@) for jEdit 4.5+ -->
-<!-- Finding an LP specification has proved difficult; the best I could do -->
-<!-- was borrow a copy of the ILOG CPLEX 10.1 User's Manual from a friend. -->
-
-<!-- For the curious reading this file: one doesn't generally create LP -->
-<!-- files by hand, but uses the output of another program (usually for -->
-<!-- debugging purposes).  Consequently, I've not include any frills, -->
-<!-- like auto indent, etc. -->
-
-<MODE>
-	<PROPS>
-		<PROPERTY NAME='wordBreakChars' VALUE='+-/*^=&lt;&gt;\' />
-	</PROPS>
-
-	<RULES
-		IGNORE_CASE='TRUE'
-		HIGHLIGHT_DIGITS='TRUE' DIGIT_RE='\d+(?:\.\d+)?|\d+(?:\.\d+)?e\d+'>
-
-		<EOL_SPAN TYPE='COMMENT1'>\</EOL_SPAN>
-
-		<SEQ TYPE='OPERATOR'>&gt;=</SEQ>
-		<SEQ TYPE='OPERATOR'>=&gt;</SEQ>
-		<SEQ TYPE='OPERATOR'>&gt;</SEQ>
-		<SEQ TYPE='OPERATOR'>&lt;=</SEQ>
-		<SEQ TYPE='OPERATOR'>=&lt;</SEQ>
-		<SEQ TYPE='OPERATOR'>&lt;</SEQ>
-		<SEQ TYPE='OPERATOR'>:</SEQ>
-		<SEQ TYPE='OPERATOR'>=</SEQ>
-		<SEQ TYPE='OPERATOR'>+</SEQ>
-		<SEQ TYPE='OPERATOR'>-</SEQ>
-		<SEQ TYPE='OPERATOR'>*</SEQ>
-		<SEQ TYPE='OPERATOR'>/</SEQ>
-
-		<KEYWORDS>
-			<KEYWORD1>maximize</KEYWORD1>
-			<KEYWORD1>maximum</KEYWORD1>
-			<KEYWORD1>minimize</KEYWORD1>
-			<KEYWORD1>minimum</KEYWORD1>
-			<KEYWORD1>min</KEYWORD1>
-			<KEYWORD1>max</KEYWORD1>
-
-			<!-- <KEYWORD1>subject to</KEYWORD1> jEdit apparently cannot -->
-			<!-- <KEYWORD1>Subject To</KEYWORD1> handle a space in this -->
-			<!-- <KEYWORD1>such that</KEYWORD1>  style of KEYWORD. -->
-			<KEYWORD1>s.t.</KEYWORD1>
-			<KEYWORD1>st.</KEYWORD1>
-			<KEYWORD1>st</KEYWORD1>
-			<KEYWORD1>end</KEYWORD1>
-
-			<KEYWORD1>bounds</KEYWORD1>
-			<KEYWORD1>bound</KEYWORD1>
-
-			<KEYWORD1>generals</KEYWORD1>
-			<KEYWORD1>general</KEYWORD1>
-			<KEYWORD1>gen</KEYWORD1>
-
-			<KEYWORD1>integers</KEYWORD1>
-			<KEYWORD1>integer</KEYWORD1>
-			<KEYWORD1>int</KEYWORD1>
-
-			<KEYWORD1>binaries</KEYWORD1>
-			<KEYWORD1>binary</KEYWORD1>
-			<KEYWORD1>bin</KEYWORD1>
-
-			<SEQ AT_LINE_START='FALSE' TYPE='KEYWORD3'>infinity</SEQ>
-			<SEQ AT_LINE_START='FALSE' TYPE='KEYWORD3'>inf</SEQ>
-			<SEQ AT_LINE_START='FALSE' TYPE='KEYWORD3'>free</SEQ>
-		</KEYWORDS>
-
-		<SEQ TYPE='KEYWORD1'>subject to</SEQ>
-		<SEQ TYPE='KEYWORD1'>such that</SEQ>
-
-		<!-- objective function and constraint labels -->
-		<SEQ_REGEXP AT_LINE_START='TRUE' TYPE='LABEL' HASH_CHARS='ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz_'>[A-z_ ][\w(),]+(?=:)</SEQ_REGEXP>
-
-		<!-- Variables. -->
-		<!-- It's unfortunate for CPlex LP format that jEdit neight has a -->
-		<!-- token type of VARIABLE, nor lets the mode file define it's own, -->
-		<!-- like Vim. Oh well; arbitrarily pick a KEYWORD. -->
-		<SEQ_REGEXP AT_WORD_START='TRUE' AT_LINE_START='FALSE' TYPE='KEYWORD2' HASH_CHARS='ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz_'>[A-z_][\w!"#$%&amp;()/,.;?@_`'{}|~]*</SEQ_REGEXP>
-	</RULES>
-</MODE>
\ No newline at end of file
diff --git a/qpython/src/main/assets/syntax/cplusplus.xml b/qpython/src/main/assets/syntax/cplusplus.xml
deleted file mode 100644
index 978cbaaf..00000000
--- a/qpython/src/main/assets/syntax/cplusplus.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!-- Extension of c.xml to add C++ specific syntax. -->
-<!-- With some Qt keywords added -->
-<MODE>
-    <PROPS>
-        <PROPERTY NAME="commentStart" VALUE="/*" />
-        <PROPERTY NAME="commentEnd" VALUE="*/" />
-        <PROPERTY NAME="lineComment" VALUE="//" />
-        <PROPERTY NAME="wordBreakChars" VALUE=",+-=&lt;&gt;/?^&amp;*" />
-
-        <!-- Auto indent -->
-        <PROPERTY NAME="indentOpenBrackets" VALUE="{" />
-        <PROPERTY NAME="indentCloseBrackets" VALUE="}" />
-        <PROPERTY NAME="unalignedOpenBrackets" VALUE="(" />
-        <PROPERTY NAME="unalignedCloseBrackets" VALUE=")" />
-        <PROPERTY NAME="indentNextLine"
-            VALUE="(?!^\s*(#|//)).*(\b(if|while|for)\s*\(.*\)|\b(else|do)\b)[^{;]*$" />
-        <PROPERTY NAME="unindentThisLine"
-            VALUE="^\s*((.*case\b.*|[\p{Alpha}_][\p{Alnum}_]*)\s*(slots)?:(?!:)).*$" />
-        <PROPERTY NAME="electricKeys" VALUE=":" />
-    </PROPS>
-
-    <RULES
-        IGNORE_CASE="FALSE"
-        HIGHLIGHT_DIGITS="TRUE" DIGIT_RE="[0-9][0-9a-zA-Z]*">
-        <EOL_SPAN TYPE="KEYWORD2" AT_WHITESPACE_END="TRUE" DELEGATE="CPP">#</EOL_SPAN>
-
-        <IMPORT DELEGATE="LEX"/>
-        <IMPORT DELEGATE="CORE"/>
-    </RULES>
-
-    <!-- Core C++ language -->
-    <RULES SET="LEX"
-        IGNORE_CASE="FALSE"
-        HIGHLIGHT_DIGITS="TRUE" DIGIT_RE="[0-9][0-9a-zA-Z]*">
-
-        <!-- A hack not to mark namespace qualification like "std::"
-            as labels. -->
-        <SEQ TYPE="OPERATOR">::</SEQ>
-
-        <IMPORT DELEGATE="c::LEX"/>
-    </RULES>
-
-    <!-- Core C++ language -->
-    <RULES SET="CORE"
-        IGNORE_CASE="FALSE"
-        HIGHLIGHT_DIGITS="TRUE" DIGIT_RE="[0-9][0-9a-zA-Z]*">
-
-        <IMPORT DELEGATE="c::CORE"/>
-
-        <KEYWORDS>
-            <KEYWORD3>catch</KEYWORD3>
-            <KEYWORD3>class</KEYWORD3>
-            <KEYWORD3>const_cast</KEYWORD3>
-            <KEYWORD1>delete</KEYWORD1>
-            <KEYWORD3>dynamic_cast</KEYWORD3>
-            <KEYWORD1>explicit</KEYWORD1>
-            <KEYWORD2>export</KEYWORD2>
-            <KEYWORD1>friend</KEYWORD1>
-            <KEYWORD3>mutable</KEYWORD3>
-            <KEYWORD2>namespace</KEYWORD2>
-            <KEYWORD1>new</KEYWORD1>
-            <KEYWORD3>operator</KEYWORD3>
-            <KEYWORD1>private</KEYWORD1>
-            <KEYWORD1>protected</KEYWORD1>
-            <KEYWORD1>public</KEYWORD1>
-            <KEYWORD1>signals</KEYWORD1>
-            <KEYWORD1>slots</KEYWORD1>
-            <KEYWORD3>reinterpret_cast</KEYWORD3>
-            <KEYWORD3>static_assert</KEYWORD3>
-            <KEYWORD3>static_cast</KEYWORD3>
-            <KEYWORD3>template</KEYWORD3>
-            <LITERAL2>this</LITERAL2>
-            <KEYWORD1>throw</KEYWORD1>
-            <KEYWORD1>try</KEYWORD1>
-            <KEYWORD3>typeid</KEYWORD3>
-            <KEYWORD3>typename</KEYWORD3>
-            <KEYWORD2>using</KEYWORD2>
-            <KEYWORD1>virtual</KEYWORD1>
-
-        </KEYWORDS>
-    </RULES>
-
-    <!-- Preprocessor specific rules -->
-    <RULES SET="CPP"
-        IGNORE_CASE="FALSE"
-        HIGHLIGHT_DIGITS="TRUE" DIGIT_RE="[0-9][0-9a-zA-Z]*">
-
-        <EOL_SPAN_REGEXP HASH_CHAR="include" TYPE="MARKUP" DELEGATE="c::INCLUDE">include\b</EOL_SPAN_REGEXP>
-        <EOL_SPAN_REGEXP HASH_CHAR="define" TYPE="MARKUP" DELEGATE="DEFINE">define\b</EOL_SPAN_REGEXP>
-        <EOL_SPAN_REGEXP HASH_CHAR="endif" TYPE="MARKUP" DELEGATE="c::LEX">endif\b</EOL_SPAN_REGEXP>
-        <EOL_SPAN_REGEXP HASH_CHAR="elif" TYPE="MARKUP" DELEGATE="c::CONDITION">elif\b</EOL_SPAN_REGEXP>
-        <EOL_SPAN_REGEXP HASH_CHAR="if" TYPE="MARKUP" DELEGATE="c::CONDITION">if\b</EOL_SPAN_REGEXP>
-
-        <IMPORT DELEGATE="LEX"/>
-
-        <!-- Directives -->
-        <KEYWORDS>
-            <MARKUP>ifdef</MARKUP>
-            <MARKUP>ifndef</MARKUP>
-            <MARKUP>else</MARKUP>
-            <MARKUP>error</MARKUP>
-            <MARKUP>line</MARKUP>
-            <MARKUP>pragma</MARKUP>
-            <MARKUP>undef</MARKUP>
-            <MARKUP>warning</MARKUP>
-        </KEYWORDS>
-    </RULES>
-
-    <!-- After #define directive -->
-    <!-- Almost same as the normal code,
-        except two additional operators # and ##. -->
-    <RULES SET="DEFINE"
-        IGNORE_CASE="FALSE"
-        HIGHLIGHT_DIGITS="TRUE" DIGIT_RE="[0-9][0-9a-zA-Z]*">
-        <SEQ TYPE="OPERATOR">#</SEQ>
-        <IMPORT DELEGATE="LEX"/>
-        <IMPORT DELEGATE="CORE"/>
-    </RULES>
-
-</MODE>
-
diff --git a/qpython/src/main/assets/syntax/csharp.xml b/qpython/src/main/assets/syntax/csharp.xml
deleted file mode 100644
index 7341d7c9..00000000
--- a/qpython/src/main/assets/syntax/csharp.xml
+++ /dev/null
@@ -1,196 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="commentStart" VALUE="/*" />
-		<PROPERTY NAME="commentEnd" VALUE="*/" />
-		<PROPERTY NAME="lineComment" VALUE="//" />
-
-		<!-- Auto indent -->
-		<PROPERTY NAME="indentOpenBrackets" VALUE="{" />
-		<PROPERTY NAME="indentCloseBrackets" VALUE="}" />
-		<PROPERTY NAME="unalignedOpenBrackets" VALUE="(" />
-		<PROPERTY NAME="unalignedCloseBrackets" VALUE=")" />
-		<PROPERTY NAME="indentNextLine"
-			VALUE="\s*(((if|while)\s*\(|else\s*|else\s+if\s*\(|for\s*\(.*\))[^{;]*)" />
-		<PROPERTY NAME="unindentThisLine"
-			VALUE="^.*(default:\s*|case.*:.*)$" />
-		<PROPERTY NAME="electricKeys" VALUE=":" />
-	</PROPS>
-	<RULES IGNORE_CASE="FALSE"
-		HIGHLIGHT_DIGITS="TRUE"
-		DIGIT_RE="(0x[\p{XDigit}]+[lL]?|[\p{Digit}]+(e[\p{Digit}]*)?[lLdDfF]?)">
-
-		<SPAN TYPE="COMMENT1">
-			<BEGIN>/*</BEGIN>
-			<END>*/</END>
-		</SPAN>
-
-		<!-- DocComments may have XML in them -->
-		<EOL_SPAN TYPE="COMMENT3" DELEGATE="DOC_COMMENT">///</EOL_SPAN>
-
-		<EOL_SPAN TYPE="COMMENT2">//</EOL_SPAN>
-
-		<!-- verbatim strings -->
-		<SPAN TYPE="LITERAL3" NO_LINE_BREAK="FALSE">
-			<BEGIN>@"</BEGIN>
-			<END>"</END>
-		</SPAN>
-
-		<SPAN TYPE="LITERAL1" ESCAPE="\" NO_LINE_BREAK="TRUE">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-
-		<SPAN TYPE="LITERAL1" ESCAPE="\" NO_LINE_BREAK="TRUE">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-
-		<EOL_SPAN TYPE="KEYWORD2">#if</EOL_SPAN>
-		<EOL_SPAN TYPE="KEYWORD2">#else</EOL_SPAN>
-		<EOL_SPAN TYPE="KEYWORD2">#elif</EOL_SPAN>
-		<EOL_SPAN TYPE="KEYWORD2">#endif</EOL_SPAN>
-		<EOL_SPAN TYPE="KEYWORD2">#define</EOL_SPAN>
-		<EOL_SPAN TYPE="KEYWORD2">#undef</EOL_SPAN>
-		<EOL_SPAN TYPE="KEYWORD2">#warning</EOL_SPAN>
-		<EOL_SPAN TYPE="KEYWORD2">#error</EOL_SPAN>
-		<EOL_SPAN TYPE="KEYWORD2">#line</EOL_SPAN>
-		<EOL_SPAN TYPE="KEYWORD2">#region</EOL_SPAN>
-		<EOL_SPAN TYPE="KEYWORD2">#endregion</EOL_SPAN>
-
-		<SEQ TYPE="OPERATOR">~</SEQ>
-		<SEQ TYPE="OPERATOR">!</SEQ>
-		<SEQ TYPE="OPERATOR">:</SEQ>
-		<SEQ TYPE="OPERATOR">;</SEQ>
-		<SEQ TYPE="OPERATOR">{</SEQ>
-		<SEQ TYPE="OPERATOR">}</SEQ>
-		<SEQ TYPE="OPERATOR">,</SEQ>
-		<SEQ TYPE="OPERATOR">.</SEQ>
-		<SEQ TYPE="OPERATOR">!</SEQ>
-		<SEQ TYPE="OPERATOR">[</SEQ>
-		<SEQ TYPE="OPERATOR">]</SEQ>
-		<SEQ TYPE="OPERATOR">+</SEQ>
-		<SEQ TYPE="OPERATOR">-</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;</SEQ>
-		<SEQ TYPE="OPERATOR">=</SEQ>
-		<SEQ TYPE="OPERATOR">*</SEQ>
-		<SEQ TYPE="OPERATOR">/</SEQ>
-		<SEQ TYPE="OPERATOR">\</SEQ>
-		<SEQ TYPE="OPERATOR">^</SEQ>
-		<SEQ TYPE="OPERATOR">|</SEQ>
-		<SEQ TYPE="OPERATOR">&amp;</SEQ>
-		<SEQ TYPE="OPERATOR">%</SEQ>
-		<SEQ TYPE="OPERATOR">?</SEQ>
-
-		<MARK_PREVIOUS TYPE="FUNCTION" MATCH_TYPE="OPERATOR">(</MARK_PREVIOUS>
-		<SEQ TYPE="OPERATOR">)</SEQ>
-
-		<KEYWORDS>
-			<KEYWORD1>abstract</KEYWORD1>
-			<KEYWORD1>alias</KEYWORD1>
-			<KEYWORD1>as</KEYWORD1>
-			<KEYWORD1>base</KEYWORD1>
-			<KEYWORD1>break</KEYWORD1>
-			<KEYWORD1>case</KEYWORD1>
-			<KEYWORD1>catch</KEYWORD1>
-			<KEYWORD1>checked</KEYWORD1>
-			<KEYWORD1>const</KEYWORD1>
-			<KEYWORD1>continue</KEYWORD1>
-			<KEYWORD1>decimal</KEYWORD1>
-			<KEYWORD1>default</KEYWORD1>
-			<KEYWORD1>delegate</KEYWORD1>
-			<KEYWORD1>do</KEYWORD1>
-			<KEYWORD1>else</KEYWORD1>
-			<KEYWORD1>explicit</KEYWORD1>
-			<KEYWORD1>extern</KEYWORD1>
-			<KEYWORD1>finally</KEYWORD1>
-			<KEYWORD1>fixed</KEYWORD1>
-			<KEYWORD1>for</KEYWORD1>
-			<KEYWORD1>foreach</KEYWORD1>
-			<KEYWORD1>from</KEYWORD1>
-			<KEYWORD1>goto</KEYWORD1>
-			<KEYWORD1>if</KEYWORD1>
-			<KEYWORD1>implicit</KEYWORD1>
-			<KEYWORD1>in</KEYWORD1>
-			<KEYWORD1>internal</KEYWORD1>
-			<KEYWORD1>is</KEYWORD1>
-			<KEYWORD1>lock</KEYWORD1>
-			<KEYWORD1>new</KEYWORD1>
-			<KEYWORD1>operator</KEYWORD1>
-			<KEYWORD1>out</KEYWORD1>
-			<KEYWORD1>override</KEYWORD1>
-			<KEYWORD1>params</KEYWORD1>
-			<KEYWORD1>partial</KEYWORD1>
-			<KEYWORD1>private</KEYWORD1>
-			<KEYWORD1>protected</KEYWORD1>
-			<KEYWORD1>public</KEYWORD1>
-			<KEYWORD1>readonly</KEYWORD1>
-			<KEYWORD1>ref</KEYWORD1>
-			<KEYWORD1>return</KEYWORD1>
-			<KEYWORD1>sealed</KEYWORD1>
-			<KEYWORD1>select</KEYWORD1>
-			<KEYWORD1>sizeof</KEYWORD1>
-			<KEYWORD1>stackalloc</KEYWORD1>
-			<KEYWORD1>static</KEYWORD1>
-			<KEYWORD1>switch</KEYWORD1>
-			<KEYWORD1>throw</KEYWORD1>
-			<KEYWORD1>try</KEYWORD1>
-			<KEYWORD1>typeof</KEYWORD1>
-			<KEYWORD1>unchecked</KEYWORD1>
-			<KEYWORD1>unsafe</KEYWORD1>
-			<KEYWORD1>virtual</KEYWORD1>
-			<KEYWORD1>while</KEYWORD1>
-			<KEYWORD1>where</KEYWORD1>
-			<KEYWORD1>yield</KEYWORD1>
-
-			<KEYWORD2>using</KEYWORD2>
-			<KEYWORD2>namespace</KEYWORD2>
-
-			<KEYWORD3>bool</KEYWORD3>
-			<KEYWORD3>byte</KEYWORD3>
-			<KEYWORD3>char</KEYWORD3>
-			<KEYWORD3>class</KEYWORD3>
-			<KEYWORD3>double</KEYWORD3>
-			<KEYWORD3>dynamic</KEYWORD3>
-			<KEYWORD3>enum</KEYWORD3>
-			<KEYWORD3>event</KEYWORD3>
-			<KEYWORD3>float</KEYWORD3>
-			<KEYWORD3>int</KEYWORD3>
-			<KEYWORD3>interface</KEYWORD3>
-			<KEYWORD3>long</KEYWORD3>
-			<KEYWORD3>object</KEYWORD3>
-			<KEYWORD3>sbyte</KEYWORD3>
-			<KEYWORD3>short</KEYWORD3>
-			<KEYWORD3>string</KEYWORD3>
-			<KEYWORD3>struct</KEYWORD3>
-			<KEYWORD3>uint</KEYWORD3>
-			<KEYWORD3>ulong</KEYWORD3>
-			<KEYWORD3>ushort</KEYWORD3>
-			<KEYWORD3>var</KEYWORD3>
-			<KEYWORD3>void</KEYWORD3>
-
-			<LITERAL2>false</LITERAL2>
-			<LITERAL2>null</LITERAL2>
-			<LITERAL2>this</LITERAL2>
-			<LITERAL2>true</LITERAL2>
-		</KEYWORDS>
-	</RULES>
-
-	<RULES SET="DOC_COMMENT" DEFAULT="COMMENT3" IGNORE_CASE="TRUE">
-		<!-- XML comments -->
-		<SPAN TYPE="COMMENT1">
-			<BEGIN>&lt;--</BEGIN>
-			<END>--&gt;</END>
-		</SPAN>
-		<!-- XML tags -->
-		<SPAN TYPE="MARKUP" DELEGATE="xml::TAGS">
-			<BEGIN>&lt;</BEGIN>
-			<END>&gt;</END>
-		</SPAN>
-	</RULES>
-</MODE>
-
diff --git a/qpython/src/main/assets/syntax/css.xml b/qpython/src/main/assets/syntax/css.xml
index b202735d..b219a193 100644
--- a/qpython/src/main/assets/syntax/css.xml
+++ b/qpython/src/main/assets/syntax/css.xml
@@ -12,9 +12,9 @@
 		<PROPERTY NAME="noWordSep" VALUE="_" />
 	</PROPS>
 
-	<RULES IGNORE_CASE="TRUE"
+	<RULES DIGIT_RE="-?\d+(\.\d+)?(pt|pc|in|mm|cm|em|ex|px|ms|s|%|)"
 		HIGHLIGHT_DIGITS="TRUE"
-		DIGIT_RE="-?\d+(\.\d+)?(pt|pc|in|mm|cm|em|ex|px|ms|s|%|)"
+		IGNORE_CASE="TRUE"
 		NO_WORD_SEP="-_%">
 
 		<!-- classes: -->
@@ -26,11 +26,11 @@
 
 		<!-- TODO: selectors, see http://www.w3.org/TR/REC-CSS2/selector.html -->
 
-		<SEQ TYPE="OPERATOR" DELEGATE="PSEUDO">:</SEQ>
+		<SEQ DELEGATE="PSEUDO" TYPE="OPERATOR">:</SEQ>
 		<SEQ TYPE="OPERATOR">,</SEQ>
 
 		<!-- property blocks: -->
-		<SPAN TYPE="OPERATOR" DELEGATE="PROPERTIES">
+		<SPAN DELEGATE="PROPERTIES" TYPE="OPERATOR">
 			<BEGIN>{</BEGIN>
 			<END>}</END>
 		</SPAN>
@@ -43,10 +43,10 @@
 	<!-- Pseudo classes like ":active" -->
 	<RULES SET="PSEUDO">
 		<!-- Delegate back: -->
-		<SEQ TYPE="NULL" DELEGATE="MAIN"> </SEQ>
-		<SEQ TYPE="OPERATOR" DELEGATE="MAIN">,</SEQ>
+		<SEQ DELEGATE="MAIN" TYPE="NULL"> </SEQ>
+		<SEQ DELEGATE="MAIN" TYPE="OPERATOR">,</SEQ>
 
-		<SEQ TYPE="OPERATOR" DELEGATE="PROPERTIES">{</SEQ>
+		<SEQ DELEGATE="PROPERTIES" TYPE="OPERATOR">{</SEQ>
 
 		<SPAN_REGEXP HASH_CHAR="lang" TYPE="KEYWORD4">
 			<BEGIN>lang\s*\(</BEGIN>
@@ -64,8 +64,8 @@
 		<KEYWORDS>
 			<KEYWORD4>after</KEYWORD4>
 			<KEYWORD4>before</KEYWORD4>
-			<KEYWORD4>first-child</KEYWORD4>
-			<KEYWORD4>last-child</KEYWORD4>
+			<KEYWORD4>first-childList</KEYWORD4>
+			<KEYWORD4>last-childList</KEYWORD4>
 			<KEYWORD4>link</KEYWORD4>
 			<KEYWORD4>visited</KEYWORD4>
 			<KEYWORD4>active</KEYWORD4>
@@ -75,11 +75,11 @@
 	</RULES>
 
 	<!-- Properties: -->
-	<RULES SET="PROPERTIES" ESCAPE="\">
+	<RULES ESCAPE="\" SET="PROPERTIES">
 		<!-- Delegate back -->
-		<SEQ TYPE="OPERATOR" DELEGATE="MAIN">}</SEQ>
+		<SEQ DELEGATE="MAIN" TYPE="OPERATOR">}</SEQ>
 
-		<SEQ TYPE="OPERATOR" DELEGATE="PROP_VALUE">:</SEQ>
+		<SEQ DELEGATE="PROP_VALUE" TYPE="OPERATOR">:</SEQ>
 
 		<IMPORT DELEGATE="GLOBAL" />
 
@@ -313,7 +313,7 @@
 			<INVALID>border-image-outset</INVALID> 					
 			<INVALID>border-image-repeat</INVALID> 					
 			<INVALID>border-image-slice</INVALID> 					
-			<INVALID>border-image-source</INVALID> 					
+			<INVALID>border-image-code</INVALID>
 			<INVALID>border-image-width</INVALID>
 			<INVALID>box-decoration-break</INVALID>
 			<INVALID>box-flex-group</INVALID> 					
@@ -402,12 +402,12 @@
 
 
 	<!-- Values: -->
-	<RULES SET="PROP_VALUE"
+	<RULES DIGIT_RE="-?\d+(\.\d+)?(pt|pc|in|mm|cm|em|ex|px|ms|s|%|)"
 		HIGHLIGHT_DIGITS="TRUE"
-		DIGIT_RE="-?\d+(\.\d+)?(pt|pc|in|mm|cm|em|ex|px|ms|s|%|)"
-		NO_WORD_SEP="-_%">
+		NO_WORD_SEP="-_%"
+		SET="PROP_VALUE">
 
-		<SPAN_REGEXP TYPE="LITERAL1" ESCAPE="\" HASH_CHARS="&quot;'">
+		<SPAN_REGEXP ESCAPE="\" HASH_CHARS="&quot;'" TYPE="LITERAL1">
 			<BEGIN>(["'])</BEGIN>
 			<END>$1</END>
 		</SPAN_REGEXP>
@@ -415,19 +415,19 @@
 		<!-- "functions" -->
 
 		<!-- url without quotes -->
-		<SPAN_REGEXP TYPE="LITERAL1" MATCH_TYPE="KEYWORD1" HASH_CHAR="url(" ESCAPE="\">
+		<SPAN_REGEXP ESCAPE="\" HASH_CHAR="url(" MATCH_TYPE="KEYWORD1" TYPE="LITERAL1">
 			<BEGIN>url\((?=\s*[^"'])</BEGIN>
 			<END>)</END>
 		</SPAN_REGEXP>
 
 		<!-- proprietary IE function: -->
-		<SPAN_REGEXP TYPE="FUNCTION" DELEGATE="javascript::MAIN" HASH_CHAR="expression">
+		<SPAN_REGEXP DELEGATE="javascript::MAIN" HASH_CHAR="expression" TYPE="FUNCTION">
 			<BEGIN>expression\s*\(</BEGIN>
 			<END>)</END>
 		</SPAN_REGEXP>
 
 		<!-- all other functions -->
-		<SPAN_REGEXP TYPE="KEYWORD1" DELEGATE="PROP_VALUE">
+		<SPAN_REGEXP DELEGATE="PROP_VALUE" TYPE="KEYWORD1">
 			<BEGIN>[\w-]+\(</BEGIN>
 			<END>)</END>
 		</SPAN_REGEXP>
@@ -437,8 +437,8 @@
 		<SEQ_REGEXP HASH_CHAR="!" TYPE="KEYWORD2">!\s*important</SEQ_REGEXP>
 
 		<!-- Delegate back: -->
-		<SEQ TYPE="OPERATOR" DELEGATE="PROPERTIES">;</SEQ>
-		<SEQ TYPE="INVALID" DELEGATE="MAIN">}</SEQ> <!-- end properties block, but it's invalid -->
+		<SEQ DELEGATE="PROPERTIES" TYPE="OPERATOR">;</SEQ>
+		<SEQ DELEGATE="MAIN" TYPE="INVALID">}</SEQ> <!-- end properties block, but it's invalid -->
 
 		<IMPORT DELEGATE="GLOBAL" />
 
@@ -911,7 +911,7 @@
 	<RULES SET="GLOBAL">
 		<SEQ TYPE="OPERATOR">:</SEQ>
 		<SEQ TYPE="NULL">;</SEQ>
-		<SPAN TYPE="NULL" ESCAPE="\">
+		<SPAN ESCAPE="\" TYPE="NULL">
 			<BEGIN>(</BEGIN>
 			<END>)</END>
 		</SPAN>
diff --git a/qpython/src/main/assets/syntax/csv.xml b/qpython/src/main/assets/syntax/csv.xml
deleted file mode 100644
index 0ce4e127..00000000
--- a/qpython/src/main/assets/syntax/csv.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!--
-
-Author: Jaco de Groot
-Version: 2.2 20070213
-
-Comma Separated Values specification used for this mode:
-
-A file containing table data where the fields are sperated by commas. Fields
-containing commas (,) or newlines must be quoted (surrounded by quotes (")).
-Quotes in quoted fields must be escaped with two quotes.
-
-Highlighted are:
-- Even columns
-- Commas seperating values
-- Quotes surrounding values
-- Escaped quotes are highlighted.
-
-It is also possible that semicolons are used instead of commas. Therefor the
-first rules check if the first separator found is a comma or a semicolon and
-then switch to the comma or semicolon rules.
-
--->
-
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="contextInsensitive" VALUE="true"/>
-	</PROPS>
-	<!-- Switch rules -->
-
-	<RULES>
-		<SEQ TYPE="MARKUP" DELEGATE="ODD_QUOTED" AT_LINE_START="TRUE">"</SEQ>
-		<SEQ TYPE="MARKUP" DELEGATE="COMMA_EVEN_QUOTED">,"</SEQ>
-		<SEQ TYPE="MARKUP" DELEGATE="SEMICOLON_EVEN_QUOTED">;"</SEQ>
-		<EOL_SPAN_REGEXP TYPE="MARKUP" HASH_CHAR="," DELEGATE="COMMA_LAST_COLUMN">,(?=[^,]*$)</EOL_SPAN_REGEXP>
-		<EOL_SPAN_REGEXP TYPE="MARKUP" HASH_CHAR=";" DELEGATE="SEMICOLON_LAST_COLUMN">;(?=[^;]*$)
-		</EOL_SPAN_REGEXP>
-		<SEQ TYPE="MARKUP" DELEGATE="COMMA_EVEN">,</SEQ>
-		<SEQ TYPE="MARKUP" DELEGATE="SEMICOLON_EVEN">;</SEQ>
-	</RULES>
-
-	<RULES SET="ODD_QUOTED">
-		<SEQ TYPE="MARKUP" DELEGATE="ODD_QUOTED">""</SEQ>
-		<SEQ_REGEXP TYPE="MARKUP" HASH_CHAR="&quot;" DELEGATE="COMMA_MAIN">"(?=,[^"][^,]*$)</SEQ_REGEXP>
-		<SEQ_REGEXP TYPE="MARKUP" HASH_CHAR="&quot;" DELEGATE="SEMICOLON_MAIN">"(?=;[^"][^;]*$)</SEQ_REGEXP>
-		<SEQ TYPE="MARKUP" DELEGATE="COMMA_EVEN_QUOTED">","</SEQ>
-		<SEQ TYPE="MARKUP" DELEGATE="SEMICOLON_EVEN_QUOTED">";"</SEQ>
-		<SEQ_REGEXP TYPE="MARKUP" HASH_CHAR="&quot;," DELEGATE="COMMA_MAIN">",$</SEQ_REGEXP>
-		<SEQ_REGEXP TYPE="MARKUP" HASH_CHAR="&quot;;" DELEGATE="SEMICOLON_MAIN">";$</SEQ_REGEXP>
-		<SEQ TYPE="MARKUP" DELEGATE="COMMA_EVEN">",</SEQ>
-		<SEQ TYPE="MARKUP" DELEGATE="SEMICOLON_EVEN">";</SEQ>
-		<SEQ_REGEXP TYPE="MARKUP" HASH_CHAR="&quot;" DELEGATE="MAIN">"$</SEQ_REGEXP>
-		<SEQ TYPE="MARKUP" DELEGATE="EVEN">"</SEQ>
-	</RULES>
-
-	<RULES DEFAULT="COMMENT1" SET="EVEN">
-		<SEQ TYPE="MARKUP" DELEGATE="COMMA_ODD_QUOTED">,"</SEQ>
-		<SEQ TYPE="MARKUP" DELEGATE="SEMICOLON_ODD_QUOTED">;"</SEQ>
-		<SEQ TYPE="MARKUP" DELEGATE="COMMA_MAIN">,</SEQ>
-		<SEQ TYPE="MARKUP" DELEGATE="SEMICOLON_MAIN">;</SEQ>
-	</RULES>
-
-	<RULES DEFAULT="COMMENT1" SET="EVEN_QUOTED">
-		<SEQ TYPE="MARKUP" DELEGATE="EVEN_QUOTED">""</SEQ>
-		<SEQ TYPE="MARKUP" DELEGATE="COMMA_ODD_QUOTED">","</SEQ>
-		<SEQ TYPE="MARKUP" DELEGATE="SEMICOLON_ODD_QUOTED">";"</SEQ>
-		<SEQ TYPE="MARKUP" DELEGATE="COMMA_MAIN">",</SEQ>
-		<SEQ TYPE="MARKUP" DELEGATE="SEMICOLON_MAIN">";</SEQ>
-		<SEQ TYPE="MARKUP" DELEGATE="MAIN">"</SEQ>
-	</RULES>
-
-	<!-- Comma rules -->
-
-	<RULES SET="COMMA_MAIN">
-		<SEQ TYPE="MARKUP" DELEGATE="COMMA_ODD_QUOTED" AT_LINE_START="TRUE">"</SEQ>
-		<SEQ TYPE="MARKUP" DELEGATE="COMMA_EVEN_QUOTED">,"</SEQ>
-		<EOL_SPAN_REGEXP TYPE="MARKUP" HASH_CHAR="," DELEGATE="COMMA_LAST_COLUMN">,(?=[^,]*$)</EOL_SPAN_REGEXP>
-		<SEQ TYPE="MARKUP" DELEGATE="COMMA_EVEN">,</SEQ>
-	</RULES>
-
-	<RULES SET="COMMA_ODD_QUOTED">
-		<SEQ TYPE="MARKUP" DELEGATE="COMMA_ODD_QUOTED">""</SEQ>
-		<SEQ_REGEXP TYPE="MARKUP" HASH_CHAR="&quot;" DELEGATE="COMMA_MAIN">"(?=,[^"][^,]*$)</SEQ_REGEXP>
-		<SEQ TYPE="MARKUP" DELEGATE="COMMA_EVEN_QUOTED">","</SEQ>
-		<SEQ_REGEXP TYPE="MARKUP" HASH_CHAR="&quot;," DELEGATE="COMMA_MAIN">",$</SEQ_REGEXP>
-		<SEQ TYPE="MARKUP" DELEGATE="COMMA_EVEN">",</SEQ>
-		<SEQ_REGEXP TYPE="MARKUP" HASH_CHAR="&quot;" DELEGATE="COMMA_MAIN">"$</SEQ_REGEXP>
-		<SEQ TYPE="MARKUP" DELEGATE="COMMA_EVEN">"</SEQ>
-	</RULES>
-
-	<RULES SET="COMMA_EVEN" DEFAULT="COMMENT1">
-		<SEQ TYPE="MARKUP" DELEGATE="COMMA_ODD_QUOTED">,"</SEQ>
-		<SEQ TYPE="MARKUP" DELEGATE="COMMA_MAIN">,</SEQ>
-	</RULES>
-
-	<RULES SET="COMMA_EVEN_QUOTED" DEFAULT="COMMENT1">
-		<SEQ TYPE="MARKUP" DELEGATE="COMMA_EVEN_QUOTED">""</SEQ>
-		<SEQ TYPE="MARKUP" DELEGATE="COMMA_ODD_QUOTED">","</SEQ>
-		<SEQ TYPE="MARKUP" DELEGATE="COMMA_MAIN">",</SEQ>
-		<SEQ TYPE="MARKUP" DELEGATE="COMMA_MAIN">"</SEQ>
-	</RULES>
-
-	<RULES SET="COMMA_LAST_COLUMN" DEFAULT="COMMENT1">
-	</RULES>
-
-	<!-- Semicolon rules -->
-
-	<RULES SET="SEMICOLON_MAIN">
-		<SEQ TYPE="MARKUP" DELEGATE="SEMICOLON_ODD_QUOTED" AT_LINE_START="TRUE">"</SEQ>
-		<SEQ TYPE="MARKUP" DELEGATE="SEMICOLON_EVEN_QUOTED">;"</SEQ>
-		<EOL_SPAN_REGEXP TYPE="MARKUP" HASH_CHAR=";" DELEGATE="SEMICOLON_LAST_COLUMN">;(?=[^;]*$)
-		</EOL_SPAN_REGEXP>
-		<SEQ TYPE="MARKUP" DELEGATE="SEMICOLON_EVEN">;</SEQ>
-	</RULES>
-
-	<RULES SET="SEMICOLON_ODD_QUOTED">
-		<SEQ TYPE="MARKUP" DELEGATE="SEMICOLON_ODD_QUOTED">""</SEQ>
-		<SEQ_REGEXP TYPE="MARKUP" HASH_CHAR="&quot;" DELEGATE="SEMICOLON_MAIN">"(?=;[^"][^;]*$)</SEQ_REGEXP>
-		<SEQ TYPE="MARKUP" DELEGATE="SEMICOLON_EVEN_QUOTED">";"</SEQ>
-		<SEQ_REGEXP TYPE="MARKUP" HASH_CHAR="&quot;;" DELEGATE="SEMICOLON_MAIN">";$</SEQ_REGEXP>
-		<SEQ TYPE="MARKUP" DELEGATE="SEMICOLON_EVEN">";</SEQ>
-		<SEQ_REGEXP TYPE="MARKUP" HASH_CHAR="&quot;" DELEGATE="SEMICOLON_MAIN">"$</SEQ_REGEXP>
-		<SEQ TYPE="MARKUP" DELEGATE="SEMICOLON_EVEN">"</SEQ>
-	</RULES>
-
-	<RULES SET="SEMICOLON_EVEN" DEFAULT="COMMENT1">
-		<SEQ TYPE="MARKUP" DELEGATE="SEMICOLON_ODD_QUOTED">;"</SEQ>
-		<SEQ TYPE="MARKUP" DELEGATE="SEMICOLON_MAIN">;</SEQ>
-	</RULES>
-
-	<RULES SET="SEMICOLON_EVEN_QUOTED" DEFAULT="COMMENT1">
-		<SEQ TYPE="MARKUP" DELEGATE="SEMICOLON_EVEN_QUOTED">""</SEQ>
-		<SEQ TYPE="MARKUP" DELEGATE="SEMICOLON_ODD_QUOTED">";"</SEQ>
-		<SEQ TYPE="MARKUP" DELEGATE="SEMICOLON_MAIN">";</SEQ>
-		<SEQ TYPE="MARKUP" DELEGATE="SEMICOLON_MAIN">"</SEQ>
-	</RULES>
-
-	<RULES SET="SEMICOLON_LAST_COLUMN" DEFAULT="COMMENT1">
-	</RULES>
-
-</MODE>
diff --git a/qpython/src/main/assets/syntax/cvs_commit.xml b/qpython/src/main/assets/syntax/cvs_commit.xml
deleted file mode 100644
index 1b1bd50d..00000000
--- a/qpython/src/main/assets/syntax/cvs_commit.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!--
-<MODE NAME="cvs-commit"		FILE="cvs_commit.xml"
-				FILE_NAME_GLOB="cvs*.tmp"/>
--->
-
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="contextInsensitive" VALUE="true"/>
-	</PROPS>
-	<RULES IGNORE_CASE="TRUE" HIGHLIGHT_DIGITS="FALSE">
-		<EOL_SPAN TYPE="COMMENT1" 
-			DELEGATE="CHANGED" 
-			AT_LINE_START="TRUE"
-		>CVS:</EOL_SPAN>
-	</RULES>
-	<RULES SET="CHANGED" DEFAULT="COMMENT2">
-		<SEQ TYPE="COMMENT1" AT_LINE_START="TRUE">CVS:</SEQ>
-		<SEQ TYPE="KEYWORD1">Committing in</SEQ>
-		<SEQ TYPE="KEYWORD1">Added Files:</SEQ>
-		<SEQ TYPE="KEYWORD1">Modified Files:</SEQ>
-		<SEQ TYPE="KEYWORD1">Removed Files:</SEQ>
-	</RULES>
-</MODE>
-
diff --git a/qpython/src/main/assets/syntax/d.xml b/qpython/src/main/assets/syntax/d.xml
deleted file mode 100644
index c2547d95..00000000
--- a/qpython/src/main/assets/syntax/d.xml
+++ /dev/null
@@ -1,228 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<MODE>
-    <PROPS>
-        <PROPERTY NAME="commentStart" VALUE="/*" />
-        <PROPERTY NAME="commentEnd" VALUE="*/" />
-        <PROPERTY NAME="lineComment" VALUE="//" />
-        <PROPERTY NAME="wordBreakChars" VALUE=",+-=&lt;&gt;/?^&amp;*" />
-
-	<!-- Auto indent -->
-	<PROPERTY NAME="indentOpenBrackets" VALUE="{" />
-	<PROPERTY NAME="indentCloseBrackets" VALUE="}" />
-	<PROPERTY NAME="unalignedOpenBrackets" VALUE="(" />
-	<PROPERTY NAME="unalignedCloseBrackets" VALUE=")" />
-	<PROPERTY NAME="indentNextLine"
-		VALUE="\s*(((if|while)\s*\(|else\s*|else\s+if\s*\(|for\s*\(.*\))[^{;]*)" />
-	<PROPERTY NAME="unindentThisLine"
-		VALUE="^.*(default:\s*|case.*:.*)$" />
-	<PROPERTY NAME="electricKeys" VALUE=":" />
-    </PROPS>
-
-    <RULES IGNORE_CASE="FALSE"
-        HIGHLIGHT_DIGITS="TRUE"
-        DIGIT_RE="(0x[0-9a-fA-F_]+[uUlL]?|[0-9_]+(e[0-9_]*)?[uUlLdDfF]?)">
-
-        <!-- Silly comment -->
-        <SEQ TYPE="COMMENT1">/**/</SEQ>
-
-        <!-- Doxygen comment, Javadoc style -->
-        <SPAN TYPE="COMMENT3" DELEGATE="doxygen::DOXYGEN">
-            <BEGIN>/**</BEGIN>
-            <END>*/</END>
-        </SPAN>
-
-        <!-- Doxygen comment, Qt style -->
-        <SPAN TYPE="COMMENT3" DELEGATE="doxygen::DOXYGEN">
-            <BEGIN>/*!</BEGIN>
-            <END>*/</END>
-        </SPAN>
-
-        <!-- C style comment -->
-        <SPAN TYPE="COMMENT1">
-            <BEGIN>/*</BEGIN>
-            <END>*/</END>
-        </SPAN>
-
-        <!-- Nested comment -->
-        <SPAN TYPE="COMMENT1" DELEGATE="NESTED_COMMENT">
-            <BEGIN>/+</BEGIN>
-            <END>+/</END>
-        </SPAN>
-
-        <EOL_SPAN TYPE="COMMENT2">//</EOL_SPAN>
-
-        <!-- Wysiwyg string literal -->
-        <SPAN TYPE="LITERAL1" NO_LINE_BREAK="TRUE">
-            <BEGIN>r"</BEGIN>
-            <END>"</END>
-        </SPAN>
-        <!-- Alternate Wysiwyg string literal -->
-        <SPAN TYPE="LITERAL1" ESCAPE="\" NO_LINE_BREAK="TRUE">
-            <BEGIN>`</BEGIN>
-            <END>`</END>
-        </SPAN>
-        <!-- Doublequoted string literal -->
-        <SPAN TYPE="LITERAL1" ESCAPE="\" NO_LINE_BREAK="TRUE">
-            <BEGIN>"</BEGIN>
-            <END>"</END>
-        </SPAN>
-        <!-- Hex string literal -->
-        <SPAN TYPE="LITERAL1" ESCAPE="\" NO_LINE_BREAK="TRUE">
-            <BEGIN>x"</BEGIN>
-            <END>"</END>
-        </SPAN>
-        <!-- Character literal -->
-        <SPAN TYPE="LITERAL1" ESCAPE="\" NO_LINE_BREAK="TRUE">
-            <BEGIN>'</BEGIN>
-            <END>'</END>
-        </SPAN>
-
-        <SEQ TYPE="OPERATOR">=</SEQ>
-        <SEQ TYPE="OPERATOR">!</SEQ>
-        <SEQ TYPE="OPERATOR">&gt;=</SEQ>
-        <SEQ TYPE="OPERATOR">&lt;=</SEQ>
-        <SEQ TYPE="OPERATOR">+</SEQ>
-        <SEQ TYPE="OPERATOR">-</SEQ>
-        <SEQ TYPE="OPERATOR">/</SEQ>
-
-        <SEQ TYPE="OPERATOR">*</SEQ>
-        <SEQ TYPE="OPERATOR">&gt;</SEQ>
-        <SEQ TYPE="OPERATOR">&lt;</SEQ>
-        <SEQ TYPE="OPERATOR">%</SEQ>
-        <SEQ TYPE="OPERATOR">&amp;</SEQ>
-        <SEQ TYPE="OPERATOR">|</SEQ>
-        <SEQ TYPE="OPERATOR">^</SEQ>
-        <SEQ TYPE="OPERATOR">~</SEQ>
-        <SEQ TYPE="OPERATOR">}</SEQ>
-        <SEQ TYPE="OPERATOR">{</SEQ>
-
-        <MARK_PREVIOUS TYPE="LABEL" MATCH_TYPE="OPERATOR"
-            AT_WHITESPACE_END="TRUE">:</MARK_PREVIOUS>
-
-        <!-- Function calls -->
-        <MARK_PREVIOUS TYPE="FUNCTION" MATCH_TYPE="OPERATOR">(</MARK_PREVIOUS>
-		<SEQ TYPE="OPERATOR">)</SEQ>
-
-        <!-- Annotation types -->
-        <MARK_FOLLOWING TYPE="KEYWORD4">@</MARK_FOLLOWING>
-
-        <KEYWORDS>
-            <KEYWORD2>abstract</KEYWORD2>
-            <KEYWORD4>alias</KEYWORD4> 
-            <KEYWORD4>align</KEYWORD4> 
-            <KEYWORD4>asm</KEYWORD4> 
-            <KEYWORD4>assert</KEYWORD4> 
-            <KEYWORD3>auto</KEYWORD3> 
-            <KEYWORD1>body</KEYWORD1> 
-            <KEYWORD3>bool</KEYWORD3> 
-            <KEYWORD1>break</KEYWORD1> 
-            <KEYWORD3>byte</KEYWORD3> 
-            <KEYWORD1>case</KEYWORD1> 
-            <KEYWORD4>cast</KEYWORD4> 
-            <KEYWORD1>catch</KEYWORD1> 
-            <KEYWORD3>cdouble</KEYWORD3> 
-            <KEYWORD3>cent</KEYWORD3> 
-            <KEYWORD3>cfloat</KEYWORD3> 
-            <KEYWORD3>char</KEYWORD3> 
-            <KEYWORD1>class</KEYWORD1> 
-            <KEYWORD2>const</KEYWORD2> 
-            <KEYWORD1>continue</KEYWORD1> 
-            <KEYWORD3>creal</KEYWORD3> 
-            <KEYWORD3>dchar</KEYWORD3> 
-            <KEYWORD1>debug</KEYWORD1> 
-            <KEYWORD1>default</KEYWORD1> 
-            <KEYWORD4>delegate</KEYWORD4> 
-            <KEYWORD4>delete</KEYWORD4>
-            <KEYWORD2>deprecated</KEYWORD2> 
-            <KEYWORD1>do</KEYWORD1> 
-            <KEYWORD3>double</KEYWORD3> 
-            <KEYWORD1>else</KEYWORD1> 
-            <KEYWORD3>enum</KEYWORD3> 
-            <KEYWORD4>export</KEYWORD4> 
-            <KEYWORD2>extern</KEYWORD2> 
-            <LITERAL1>false</LITERAL1> 
-            <KEYWORD2>final</KEYWORD2> 
-            <KEYWORD1>finally</KEYWORD1> 
-            <KEYWORD3>float</KEYWORD3> 
-            <KEYWORD1>for</KEYWORD1> 
-            <KEYWORD1>foreach</KEYWORD1> 
-            <KEYWORD1>foreach_reverse</KEYWORD1> 
-            <KEYWORD4>function</KEYWORD4> 
-            <KEYWORD1>goto</KEYWORD1> 
-            <KEYWORD3>idouble</KEYWORD3> 
-            <KEYWORD1>if</KEYWORD1> 
-            <KEYWORD3>ifloat</KEYWORD3> 
-            <KEYWORD2>immutable</KEYWORD2> 
-            <KEYWORD4>import</KEYWORD4> 
-            <KEYWORD2>in</KEYWORD2> 
-            <KEYWORD2>inout</KEYWORD2> 
-            <KEYWORD3>int</KEYWORD3> 
-            <KEYWORD3>interface</KEYWORD3> 
-            <KEYWORD4>invariant</KEYWORD4> 
-            <KEYWORD3>ireal</KEYWORD3> 
-            <KEYWORD4>is</KEYWORD4> 
-            <KEYWORD2>lazy</KEYWORD2> 
-            <KEYWORD3>long</KEYWORD3>
-            <INVALID>macro</INVALID> 
-            <KEYWORD4>mixin</KEYWORD4> 
-            <KEYWORD4>module</KEYWORD4> 
-            <KEYWORD4>new</KEYWORD4> 
-            <KEYWORD2>nothrow</KEYWORD2> 
-            <LITERAL1>null</LITERAL1> 
-            <KEYWORD2>out</KEYWORD2> 
-            <KEYWORD2>override</KEYWORD2>
-            <KEYWORD4>package</KEYWORD4> 
-            <KEYWORD4>pragma</KEYWORD4> 
-            <KEYWORD2>private</KEYWORD2> 
-            <KEYWORD2>protected</KEYWORD2> 
-            <KEYWORD2>public</KEYWORD2> 
-            <KEYWORD2>pure</KEYWORD2> 
-            <KEYWORD3>real</KEYWORD3> 
-            <KEYWORD2>ref</KEYWORD2> 
-            <KEYWORD1>return</KEYWORD1> 
-            <KEYWORD1>scope</KEYWORD1> 
-            <KEYWORD2>shared</KEYWORD2> 
-            <KEYWORD3>short</KEYWORD3> 
-            <KEYWORD2>static</KEYWORD2> 
-            <KEYWORD3>struct</KEYWORD3> 
-            <KEYWORD4>super</KEYWORD4> 
-            <KEYWORD1>switch</KEYWORD1> 
-            <KEYWORD2>synchronized</KEYWORD2> 
-            <KEYWORD4>template</KEYWORD4> 
-            <LITERAL1>this</LITERAL1> 
-            <KEYWORD1>throw</KEYWORD1> 
-            <LITERAL1>true</LITERAL1> 
-            <KEYWORD1>try</KEYWORD1> 
-            <KEYWORD4>typedef</KEYWORD4> 
-            <KEYWORD4>typeid</KEYWORD4> 
-            <KEYWORD4>typeof</KEYWORD4> 
-            <KEYWORD3>ubyte</KEYWORD3> 
-            <KEYWORD3>ucent</KEYWORD3> 
-            <KEYWORD3>uint</KEYWORD3> 
-            <KEYWORD3>ulong</KEYWORD3> 
-            <KEYWORD3>union</KEYWORD3> 
-            <KEYWORD1>unittest</KEYWORD1> 
-            <KEYWORD3>ushort</KEYWORD3> 
-            <KEYWORD1>version</KEYWORD1> 
-            <KEYWORD3>void</KEYWORD3> 
-            <KEYWORD2>volatile</KEYWORD2> 
-            <KEYWORD3>wchar</KEYWORD3> 
-            <KEYWORD1>while</KEYWORD1> 
-            <KEYWORD1>with</KEYWORD1> 
-            <KEYWORD1>__FILE__</KEYWORD1> 
-            <KEYWORD1>__LINE__</KEYWORD1> 
-            <KEYWORD2>__gshared</KEYWORD2> 
-            <KEYWORD1>__thread</KEYWORD1> 
-            <KEYWORD1>__traits</KEYWORD1>
-        </KEYWORDS>
-    </RULES>
-    <RULES SET="NESTED_COMMENT" DEFAULT="COMMENT1">
-        <SPAN TYPE="COMMENT1" DELEGATE="NESTED_COMMENT">
-            <BEGIN>/+</BEGIN>
-            <END>+/</END>
-        </SPAN>
-    </RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/dart.xml b/qpython/src/main/assets/syntax/dart.xml
deleted file mode 100644
index b555bb4a..00000000
--- a/qpython/src/main/assets/syntax/dart.xml
+++ /dev/null
@@ -1,276 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!-- Dart mode by Chris Sullins
-This is a jedit mode file for Dart programming language.
-Copyright (C) 2012 Chris Sullins, based on javascript mode by Andre Kaplan
-
-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 2
-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, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
--->
-
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="commentStart" VALUE="/*" />
-		<PROPERTY NAME="commentEnd" VALUE="*/" />
-		<PROPERTY NAME="lineComment" VALUE="//" />
-		<PROPERTY NAME="wordBreakChars" VALUE=",+-=&lt;&gt;/?^&amp;*" />
-		
-		<!-- Auto indent -->
-		<PROPERTY NAME="indentOpenBrackets" VALUE="{[" />
-		<PROPERTY NAME="indentCloseBrackets" VALUE="]}" />
-		<PROPERTY NAME="unalignedOpenBrackets" VALUE="(" />
-		<PROPERTY NAME="unalignedCloseBrackets" VALUE=")" />
-		<PROPERTY NAME="indentNextLine"
-			VALUE="\s*(((if|while)\s*\(|else\s*|else\s+if\s*\(|for\s*\(.*\))[^{;]*)" />
-		<PROPERTY NAME="unindentThisLine"
-			VALUE="^.*(default:\s*|case.*:.*)$" />
-		<PROPERTY NAME="electricKeys" VALUE=":" />
-	</PROPS>
-	
-	<!-- DART string literal where variables get parsed -->
-	<RULES SET="DART_LITERAL1" DEFAULT="LITERAL1" ESCAPE="\">
-		<!-- expressions in curly braces ("${foo}") -->
-		<SPAN_REGEXP HASH_CHAR="$" TYPE="LITERAL4" DELEGATE="DART_EXPRESSION">
-			<BEGIN>\$\{</BEGIN>
-			<END>}</END>
-		</SPAN_REGEXP>
-		
-		<SEQ_REGEXP HASH_CHAR="$" TYPE="LITERAL4">\$[_a-zA-Z][_a-zA-Z0-9]*</SEQ_REGEXP>
-	</RULES>
-	
-	<RULES SET="DART_EXPRESSION"
-		HIGHLIGHT_DIGITS="TRUE"
-		DIGIT_RE="(0x[\p{XDigit}]+[lL]?|[\p{Digit}]+(e[\p{Digit}]*)?[lLdDfF]?)">
-		
-		<SPAN TYPE="COMMENT3">
-			<BEGIN>/**</BEGIN>
-			<END>*/</END>
-		</SPAN>
-		
-		<SPAN TYPE="COMMENT1">
-			<BEGIN>/*</BEGIN>
-			<END>*/</END>
-		</SPAN>
-		
-		<SPAN TYPE="LITERAL1">
-			<BEGIN>@"""</BEGIN>
-			<END>"""</END>
-		</SPAN>
-		
-		<SPAN TYPE="LITERAL1">
-			<BEGIN>@'''</BEGIN>
-			<END>'''</END>
-		</SPAN>
-		
-		<SPAN TYPE="LITERAL1" NO_LINE_BREAK="TRUE" ESCAPE="\">
-			<BEGIN>@"</BEGIN>
-			<END>"</END>
-		</SPAN>
-		
-		<SPAN TYPE="LITERAL1" NO_LINE_BREAK="TRUE" ESCAPE="\">
-			<BEGIN>@'</BEGIN>
-			<END>'</END>
-		</SPAN>
-		
-		<SPAN TYPE="LITERAL1" DELEGATE="DART_LITERAL1">
-			<BEGIN>"""</BEGIN>
-			<END>"""</END>
-		</SPAN>
-		
-		<SPAN TYPE="LITERAL1" DELEGATE="DART_LITERAL1">
-			<BEGIN>'''</BEGIN>
-			<END>'''</END>
-		</SPAN>
-		
-		<SPAN TYPE="LITERAL1" NO_LINE_BREAK="TRUE" ESCAPE="\" DELEGATE="DART_LITERAL1">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-		
-		<SPAN TYPE="LITERAL1" NO_LINE_BREAK="TRUE" ESCAPE="\" DELEGATE="DART_LITERAL1">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-		
-		<SEQ TYPE="OPERATOR">=</SEQ>
-		<SEQ TYPE="OPERATOR">!</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;=</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;=</SEQ>
-		<SEQ TYPE="OPERATOR">+</SEQ>
-		<SEQ TYPE="OPERATOR">-</SEQ>
-		<SEQ TYPE="OPERATOR">/</SEQ>
-		<SEQ TYPE="OPERATOR">*</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;</SEQ>
-		<SEQ TYPE="OPERATOR">%</SEQ>
-		<SEQ TYPE="OPERATOR">&amp;</SEQ>
-		<SEQ TYPE="OPERATOR">|</SEQ>
-		<SEQ TYPE="OPERATOR">^</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;&lt;</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;&gt;&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">~/</SEQ>
-		
-		<SEQ TYPE="OPERATOR">.</SEQ>
-		<SEQ TYPE="OPERATOR">;</SEQ>
-		<SEQ TYPE="OPERATOR">]</SEQ>
-		<SEQ TYPE="OPERATOR">[</SEQ>
-		<SEQ TYPE="OPERATOR">}</SEQ>
-		<SEQ TYPE="OPERATOR">{</SEQ>
-		
-		<MARK_PREVIOUS TYPE="FUNCTION" MATCH_TYPE="OPERATOR">(</MARK_PREVIOUS>
-		<SEQ TYPE="OPERATOR">)</SEQ>
-		
-		<KEYWORDS>
-			<!-- literals -->
-			<LITERAL2>null</LITERAL2>
-			<LITERAL2>true</LITERAL2>
-			<LITERAL2>false</LITERAL2>
-			
-			<!-- types -->
-			<KEYWORD3>bool</KEYWORD3>
-			<KEYWORD3>int</KEYWORD3>
-			<KEYWORD3>double</KEYWORD3>
-			<KEYWORD3>num</KEYWORD3>
-			<KEYWORD3>void</KEYWORD3>
-			
-			<!-- stdlib types -->
-			<!-- comment out for consistency with user-defined types -->
-			<KEYWORD4>AssertionError</KEYWORD4>
-			<KEYWORD4>Clock</KEYWORD4>
-			<KEYWORD4>Collection</KEYWORD4>
-			<KEYWORD4>Comparable</KEYWORD4>
-			<KEYWORD4>Date</KEYWORD4>
-			<KEYWORD4>Dispatcher</KEYWORD4>
-			<KEYWORD4>Duration</KEYWORD4>
-			<KEYWORD4>Expect</KEYWORD4>
-			<KEYWORD4>FallThroughError</KEYWORD4>
-			<KEYWORD4>Function</KEYWORD4>
-			<KEYWORD4>HashMap</KEYWORD4>
-			<KEYWORD4>HashSet</KEYWORD4>
-			<KEYWORD4>Hashable</KEYWORD4>
-			<KEYWORD4>Isolate</KEYWORD4>
-			<KEYWORD4>Iterable</KEYWORD4>
-			<KEYWORD4>Iterator</KEYWORD4>
-			<KEYWORD4>LinkedHashMap</KEYWORD4>
-			<KEYWORD4>List</KEYWORD4>
-			<KEYWORD4>Map</KEYWORD4>
-			<KEYWORD4>Match</KEYWORD4>
-			<KEYWORD4>Math</KEYWORD4>
-			<KEYWORD4>Object</KEYWORD4>
-			<KEYWORD4>Pattern</KEYWORD4>
-			<KEYWORD4>Promise</KEYWORD4>
-			<KEYWORD4>Proxy</KEYWORD4>
-			<KEYWORD4>Queue</KEYWORD4>
-			<KEYWORD4>ReceivePort</KEYWORD4>
-			<KEYWORD4>RegExp</KEYWORD4>
-			<KEYWORD4>SendPort</KEYWORD4>
-			<KEYWORD4>Set</KEYWORD4>
-			<KEYWORD4>StopWatch</KEYWORD4>
-			<KEYWORD4>String</KEYWORD4>
-			<KEYWORD4>StringBuffer</KEYWORD4>
-			<KEYWORD4>Strings</KEYWORD4>
-			<KEYWORD4>TimeZone</KEYWORD4>
-			<KEYWORD4>TypeError</KEYWORD4>
-			
-			<!-- stdlib exceptions -->
-			<KEYWORD4>BadNumberFormatException</KEYWORD4>
-			<KEYWORD4>ClosureArgumentMismatchException</KEYWORD4>
-			<KEYWORD4>EmptyQueueException</KEYWORD4>
-			<KEYWORD4>Exception</KEYWORD4>
-			<KEYWORD4>ExpectException</KEYWORD4>
-			<KEYWORD4>IllegalAccessException</KEYWORD4>
-			<KEYWORD4>IllegalArgumentException</KEYWORD4>
-			<KEYWORD4>IllegalJSRegExpException</KEYWORD4>
-			<KEYWORD4>IndexOutOfRangeException</KEYWORD4>
-			<KEYWORD4>IntegerDivisionByZeroException</KEYWORD4>
-			<KEYWORD4>NoMoreElementsException</KEYWORD4>
-			<KEYWORD4>NoSuchMethodException</KEYWORD4>
-			<KEYWORD4>NotImplementedException</KEYWORD4>
-			<KEYWORD4>NullPointerException</KEYWORD4>
-			<KEYWORD4>ObjectNotClosureException</KEYWORD4>
-			<KEYWORD4>OutOfMemoryException</KEYWORD4>
-			<KEYWORD4>StackOverflowException</KEYWORD4>
-			<KEYWORD4>UnsupportedOperationException</KEYWORD4>
-			<KEYWORD4>WrongArgumentCountException</KEYWORD4>
-			
-			<KEYWORD1>is</KEYWORD1>
-			<KEYWORD1>implements</KEYWORD1>
-			
-			<KEYWORD1>const</KEYWORD1>
-			<KEYWORD1>new</KEYWORD1>
-			<LITERAL2>this</LITERAL2>
-			<LITERAL2>super</LITERAL2>
-		</KEYWORDS>
-	</RULES>
-	
-	<RULES
-		HIGHLIGHT_DIGITS="TRUE"
-		DIGIT_RE="(0x[\p{XDigit}]+[lL]?|[\p{Digit}]+(e[\p{Digit}]*)?[lLdDfF]?)"
-		IGNORE_CASE="FALSE">
-		
-		<SEQ TYPE="COMMENT2">//--&gt;</SEQ>
-		<EOL_SPAN TYPE="COMMENT2">//</EOL_SPAN>
-		
-		<EOL_SPAN TYPE="KEYWORD2">#!</EOL_SPAN>
-		<SEQ TYPE="KEYWORD2">#library</SEQ>
-		<SEQ TYPE="KEYWORD2">#import</SEQ>
-		<SEQ TYPE="KEYWORD2">#source</SEQ>
-		<SEQ TYPE="KEYWORD2">#resource</SEQ>
-		
-		<KEYWORDS>
-			<!-- general keywords -->
-			<KEYWORD1>abstract</KEYWORD1>
-			<KEYWORD1>assert</KEYWORD1>
-			<KEYWORD1>class</KEYWORD1>
-			<KEYWORD1>extends</KEYWORD1>
-			<KEYWORD1>factory</KEYWORD1>
-			<KEYWORD1>get</KEYWORD1>
-			<KEYWORD1>import</KEYWORD1>
-			<KEYWORD1>interface</KEYWORD1>
-			<KEYWORD1>library</KEYWORD1>
-			<KEYWORD1>negate</KEYWORD1>
-			<KEYWORD1>operator</KEYWORD1>
-			<KEYWORD1>set</KEYWORD1>
-			<KEYWORD1>source</KEYWORD1>
-			<KEYWORD1>static</KEYWORD1>
-			<KEYWORD1>typedef</KEYWORD1>
-			
-			<!-- control keywords -->
-			<KEYWORD1>var</KEYWORD1>
-			<KEYWORD1>final</KEYWORD1>
-			<KEYWORD1>if</KEYWORD1>
-			<KEYWORD1>else</KEYWORD1>
-			<KEYWORD1>for</KEYWORD1>
-			<KEYWORD1>in</KEYWORD1>
-			<KEYWORD1>while</KEYWORD1>
-			<KEYWORD1>do</KEYWORD1>
-			<KEYWORD1>switch</KEYWORD1>
-			<KEYWORD1>case</KEYWORD1>
-			<KEYWORD1>default</KEYWORD1>
-			<KEYWORD1>in</KEYWORD1>
-			<KEYWORD1>try</KEYWORD1>
-			<KEYWORD1>catch</KEYWORD1>
-			<KEYWORD1>finally</KEYWORD1>
-			<KEYWORD1>return</KEYWORD1>
-			<KEYWORD1>break</KEYWORD1>
-			<KEYWORD1>continue</KEYWORD1>
-			<KEYWORD1>throw</KEYWORD1>
-			<KEYWORD1>assert</KEYWORD1>
-		</KEYWORDS>
-		
-		<IMPORT DELEGATE="DART_EXPRESSION" />
-	</RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/django.xml b/qpython/src/main/assets/syntax/django.xml
deleted file mode 100644
index 71211853..00000000
--- a/qpython/src/main/assets/syntax/django.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0"?>
-<!--
-Original author Ollie Rutherfurd
-
-Django 1.2 templates edit mode
-<http://docs.djangoproject.com/en/dev/topics/templates/>
-
-Updated 2010-09-10 by Jakub Roztocil <jakub@webkitchen.cz>
-* Added missing filters, tags, operators, etc.
-* Higlight Django syntax inside tags and attributes
-* Higlight CSS (and to some extent also Django tags) inside <style>
-* Higlight JavaScript inside <script>
-
-CSS & JS integration and tag highlighting inspired by the PHP mode.
-
--->
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="commentStart" VALUE="{% comment %}" />
-		<PROPERTY NAME="commentEnd" VALUE="{% endcomment %}" />
-	</PROPS>
-
-	<RULES IGNORE_CASE="TRUE">
-		<IMPORT DELEGATE="html::MAIN"/>
-		<IMPORT DELEGATE="DJANGO" />
-
-		<!-- JavaScript -->
-		<SPAN TYPE="MARKUP" DELEGATE="JAVASCRIPT_OPENTAG">
-			<BEGIN>&lt;SCRIPT</BEGIN>
-			<END>&lt;/SCRIPT&gt;</END>
-		</SPAN>
-
-		<!-- CSS -->
-		<SPAN TYPE="MARKUP" DELEGATE="CSS_OPENTAG">
-			<BEGIN>&lt;STYLE</BEGIN>
-			<END>&lt;/STYLE&gt;</END>
-		</SPAN>
-
-		<!-- TAGS -->
-		<SEQ_REGEXP HASH_CHAR="&lt;" TYPE="MARKUP" DELEGATE="TAGS">&lt;/?\w+</SEQ_REGEXP>
-	</RULES>
-
-	<RULES SET="DJANGO">
-		<SPAN TYPE="COMMENT3">
-			<BEGIN>{% comment %}</BEGIN>
-			<END>{% endcomment %}</END>
-		</SPAN>
-		<SPAN TYPE="KEYWORD3" DELEGATE="DJANGO_BLOCK">
-			<BEGIN>{%</BEGIN>
-			<END>%}</END>
-		</SPAN>
-		<SPAN TYPE="KEYWORD3" DELEGATE="DJANGO_VARIABLE">
-			<BEGIN>{{</BEGIN>
-			<END>}}</END>
-		</SPAN>
-	</RULES>
-
-	<!-- Javascript -->
-	<RULES SET="JAVASCRIPT_OPENTAG" DEFAULT="MARKUP">
-		<SEQ TYPE="MARKUP" DELEGATE="JAVASCRIPT">&gt;</SEQ>
-		<IMPORT DELEGATE="TAGS"/> <!-- handle Django in <script> tag -->
-		<IMPORT DELEGATE="html::TAGS" /> <!-- handle e.g. 'style="width:1px"' -->
-	</RULES>
-	<RULES SET="JAVASCRIPT" DEFAULT="MARKUP" ESCAPE="\">
-		<IMPORT DELEGATE="TO_LITERAL+DJANGO"/>
-		<IMPORT DELEGATE="DJANGO"/>
-		<IMPORT DELEGATE="javascript::MAIN"/>
-	</RULES>
-
-	<!-- CSS -->
-	<RULES SET="CSS_OPENTAG" DEFAULT="MARKUP">
-		<SEQ TYPE="MARKUP" DELEGATE="CSS">&gt;</SEQ>
-		<IMPORT DELEGATE="TO_LITERAL+DJANGO"/>
-	</RULES>
-	<RULES SET="CSS" DEFAULT="MARKUP">
-		<PROPS>
-			<PROPERTY NAME="lineComment" VALUE="" />
-		</PROPS>
-		<IMPORT DELEGATE="TO_LITERAL+DJANGO"/>
-		<IMPORT DELEGATE="DJANGO"/>
-		<IMPORT DELEGATE="css::MAIN"/>
-	</RULES>
-
-	<!-- Inside tags and attributes -->
-	<RULES SET="TAGS" DEFAULT="MARKUP">
-		<IMPORT DELEGATE="TO_LITERAL+DJANGO" />
-		<IMPORT DELEGATE="html::TAGS" /><!-- handle e.g. 'style="width:1px"' -->
-		<SEQ TYPE="MARKUP" DELEGATE="MAIN">&gt;</SEQ>
-	</RULES>
-
-	<RULES SET="TO_LITERAL+DJANGO">
-		<SPAN TYPE="LITERAL1" DELEGATE="LITERAL1+DJANGO">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-		<SPAN TYPE="LITERAL1" DELEGATE="LITERAL1+DJANGO">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-		<IMPORT DELEGATE="DJANGO"/>
-	</RULES>
-
-	<!-- LITERAL1 + Django syntax (eg. attribute values) -->
-	<RULES SET="LITERAL1+DJANGO" DEFAULT="LITERAL1">
-		<IMPORT DELEGATE="DJANGO"/>
-	</RULES>
-
-
-
-	<RULES SET="DJANGO_VARIABLE" DEFAULT="LITERAL4">
-		<IMPORT DELEGATE="DJANGO_CORE"/>
-	</RULES>
-
-	<RULES SET="DJANGO_BLOCK" DEFAULT="LITERAL4">
-		<IMPORT DELEGATE="DJANGO_CORE"/>
-		<KEYWORDS>
-
-			<OPERATOR>==</OPERATOR>
-			<OPERATOR>!=</OPERATOR>
-			<OPERATOR>&lt;</OPERATOR>
-			<OPERATOR>&gt;</OPERATOR>
-			<OPERATOR>&lt;=</OPERATOR>
-			<OPERATOR>&gt;=</OPERATOR>
-
-			<KEYWORD1>in</KEYWORD1>
-			<KEYWORD1>not</KEYWORD1>
-			<KEYWORD1>and</KEYWORD1>
-			<KEYWORD1>or</KEYWORD1>
-			<KEYWORD1>as</KEYWORD1>
-
-			<!--
-			Tags
-			<http://docs.djangoproject.com/en/1.2/ref/templates/builtins/#built-in-tag-reference>
-			-->
-			<KEYWORD1>cache</KEYWORD1>
-			<KEYWORD1>endcache</KEYWORD1>
-			<KEYWORD1>autoescape</KEYWORD1>
-			<KEYWORD1>block</KEYWORD1>
-			<KEYWORD1>endblock</KEYWORD1>
-			<KEYWORD1>csrf_token</KEYWORD1>
-			<KEYWORD1>cycle</KEYWORD1>
-			<KEYWORD1>debug</KEYWORD1>
-			<KEYWORD1>extends</KEYWORD1>
-			<KEYWORD1>filter</KEYWORD1>
-			<KEYWORD1>endfilter</KEYWORD1>
-			<KEYWORD1>firstof</KEYWORD1>
-			<KEYWORD1>if</KEYWORD1>
-			<KEYWORD1>else</KEYWORD1>
-			<KEYWORD1>endif</KEYWORD1>
-			<KEYWORD1>for</KEYWORD1>
-			<KEYWORD1>endfor</KEYWORD1>
-			<KEYWORD1>empty</KEYWORD1>
-			<KEYWORD1>endifchanged</KEYWORD1>
-			<KEYWORD1>endifequal</KEYWORD1>
-			<KEYWORD1>ifnotequal</KEYWORD1>
-			<KEYWORD1>endifnotequal</KEYWORD1>
-			<KEYWORD1>include</KEYWORD1>
-			<KEYWORD1>load</KEYWORD1>
-			<KEYWORD1>now</KEYWORD1>
-			<KEYWORD1>regroup</KEYWORD1>
-			<KEYWORD1>spaceless</KEYWORD1>
-			<KEYWORD1>endspaceless</KEYWORD1>
-			<KEYWORD1>ssi</KEYWORD1>
-			<KEYWORD1>templatetag</KEYWORD1>
-			<KEYWORD1>url</KEYWORD1>
-			<KEYWORD1>widthratio</KEYWORD1>
-			<KEYWORD1>with</KEYWORD1>
-			<KEYWORD1>endwith</KEYWORD1>
-			<KEYWORD1>trans</KEYWORD1>
-			<KEYWORD1>blocktrans</KEYWORD1>
-			<KEYWORD1>endblocktrans</KEYWORD1>
-
-		</KEYWORDS>
-	</RULES>
-
-	<RULES SET="DJANGO_CORE">
-		<SPAN TYPE="LITERAL2">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-		<SPAN TYPE="LITERAL2">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-		<SEQ TYPE="OPERATOR">:</SEQ>
-		<SEQ TYPE="OPERATOR">,</SEQ>
-		<SEQ TYPE="OPERATOR">|</SEQ>
-		<KEYWORDS>
-
-			<!--
-			{% templatetag %} arguments
-			<http://docs.djangoproject.com/en/1.2/ref/templates/builtins/#templatetag>
-			-->
-			<LITERAL3>Argument</LITERAL3>
-			<LITERAL3>openblock</LITERAL3>
-			<LITERAL3>closeblock</LITERAL3>
-			<LITERAL3>openvariable</LITERAL3>
-			<LITERAL3>closevariable</LITERAL3>
-			<LITERAL3>openbrace</LITERAL3>
-			<LITERAL3>closebrace</LITERAL3>
-			<LITERAL3>opencomment</LITERAL3>
-			<LITERAL3>closecomment</LITERAL3>
-
-			<!--
-			Filters
-			http://docs.djangoproject.com/en/1.2/ref/templates/builtins/#built-in-filter-reference
-			-->
-			<FUNCTION>add</FUNCTION>
-			<FUNCTION>addslashes</FUNCTION>
-			<FUNCTION>capfirst</FUNCTION>
-			<FUNCTION>center</FUNCTION>
-			<FUNCTION>cut</FUNCTION>
-			<FUNCTION>date</FUNCTION>
-			<FUNCTION>default</FUNCTION>
-			<FUNCTION>default_if_none</FUNCTION>
-			<FUNCTION>dictsort</FUNCTION>
-			<FUNCTION>dictsortreversed</FUNCTION>
-			<FUNCTION>divisibleby</FUNCTION>
-			<FUNCTION>escape</FUNCTION>
-			<FUNCTION>escapejs</FUNCTION>
-			<FUNCTION>filesizeformat</FUNCTION>
-			<FUNCTION>first</FUNCTION>
-			<FUNCTION>fix_ampersands</FUNCTION>
-			<FUNCTION>floatformat</FUNCTION>
-			<FUNCTION>force_escape</FUNCTION>
-			<FUNCTION>get_digit</FUNCTION>
-			<FUNCTION>iriencode</FUNCTION>
-			<FUNCTION>join</FUNCTION>
-			<FUNCTION>last</FUNCTION>
-			<FUNCTION>length</FUNCTION>
-			<FUNCTION>length_is</FUNCTION>
-			<FUNCTION>linebreaks</FUNCTION>
-			<FUNCTION>linebreaksbr</FUNCTION>
-			<FUNCTION>linenumbers</FUNCTION>
-			<FUNCTION>ljust</FUNCTION>
-			<FUNCTION>lower</FUNCTION>
-			<FUNCTION>make_list</FUNCTION>
-			<FUNCTION>phone2numeric</FUNCTION>
-			<FUNCTION>pluralize</FUNCTION>
-			<FUNCTION>pprint</FUNCTION>
-			<FUNCTION>random</FUNCTION>
-			<FUNCTION>removetags</FUNCTION>
-			<FUNCTION>rjust</FUNCTION>
-			<FUNCTION>safe</FUNCTION>
-			<FUNCTION>safeseq</FUNCTION>
-			<FUNCTION>slice</FUNCTION>
-			<FUNCTION>slugify</FUNCTION>
-			<FUNCTION>stringformat</FUNCTION>
-			<FUNCTION>striptags</FUNCTION>
-			<FUNCTION>time</FUNCTION>
-			<FUNCTION>timesince</FUNCTION>
-			<FUNCTION>timeuntil</FUNCTION>
-			<FUNCTION>title</FUNCTION>
-			<FUNCTION>truncatewords</FUNCTION>
-			<FUNCTION>truncatewords_html</FUNCTION>
-			<FUNCTION>unordered_list</FUNCTION>
-			<FUNCTION>upper</FUNCTION>
-			<FUNCTION>urlencode</FUNCTION>
-			<FUNCTION>urlize</FUNCTION>
-			<FUNCTION>urlizetrunc</FUNCTION>
-			<FUNCTION>wordcount</FUNCTION>
-			<FUNCTION>wordwrap</FUNCTION>
-			<FUNCTION>yesno</FUNCTION>
-
-		</KEYWORDS>
-	</RULES>
-
-</MODE>
diff --git a/qpython/src/main/assets/syntax/dot.xml b/qpython/src/main/assets/syntax/dot.xml
deleted file mode 100644
index a9f161e4..00000000
--- a/qpython/src/main/assets/syntax/dot.xml
+++ /dev/null
@@ -1,624 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!-- DOT mode, by Kevin Hunter of caktusgroup.com (kevin@) for jEdit 4.3 -->
-<!-- This is based on the grammar defined at
-     http://graphviz.org/doc/info/lang.html -->
-
-<MODE>
-	<PROPS>
-		<PROPERTY NAME='commentStart'   VALUE='/*' />
-		<PROPERTY NAME='commentEnd'     VALUE='*/' />
-		<PROPERTY NAME='wordBreakChars' VALUE=',+-=&lt;&gt;/?^&amp;*' />
-
-		<!-- Auto indent -->
-		<PROPERTY NAME='indentOpenBrackets'     VALUE='[{' />
-		<PROPERTY NAME='indentCloseBrackets'    VALUE=']}' />
-		<PROPERTY NAME='unalignedOpenBrackets'  VALUE='(' />
-		<PROPERTY NAME='unalignedCloseBrackets' VALUE=')' />
-		<PROPERTY NAME='indentNextLine'
-		    VALUE='(?!^\s*(#|//|/\*)).*((sub|di|)graph|node|edge)\s+([\[{&lt;]).*'
-			/>
-	</PROPS>
-
-	<RULES
-		IGNORE_CASE="FALSE"
-		HIGHLIGHT_DIGITS="TRUE" DIGIT_RE="[0-9][0-9a-zA-Z]*">
-
-		<IMPORT DELEGATE='DOT_LEXER' />
-		<IMPORT DELEGATE='KEYWORDS' />
-	</RULES>
-
-	<RULES SET='DOT_LEXER'
-		IGNORE_CASE='FALSE'
-		HIGHLIGHT_DIGITS='TRUE' DIGIT_RE='[0-9][0-9a-zA-Z]*'>
-
-		<EOL_SPAN TYPE='COMMENT1'>#</EOL_SPAN>
-		<EOL_SPAN TYPE='COMMENT2'>//</EOL_SPAN>
-		<SPAN_REGEXP TYPE='COMMENT3' MATCH_TYPE='COMMENT3' NO_LINE_BREAK='FALSE'>
-			<BEGIN>/\*</BEGIN>
-			<END>*/</END>
-		</SPAN_REGEXP>
-
-		<SEQ TYPE='OPERATOR'>-&gt;</SEQ>
-		<SEQ TYPE='OPERATOR'>[</SEQ>
-		<SEQ TYPE='OPERATOR'>]</SEQ>
-		<SEQ TYPE='OPERATOR'>)</SEQ>
-		<SEQ TYPE='OPERATOR'>}</SEQ>
-		<SEQ TYPE='OPERATOR'>{</SEQ>
-		<SEQ TYPE='OPERATOR'>;</SEQ>
-		<SEQ TYPE='OPERATOR'>=</SEQ>
-
-		<SPAN TYPE='KEYWORD3' ESCAPE='\' DELEGATE='url::MAIN'>
-			<BEGIN>URL="</BEGIN>
-			<END>"</END>
-		</SPAN>
-		<!-- Dot does not use single quotes as delimiters. -->
-		<SPAN TYPE='LITERAL1' ESCAPE='\'>
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-		<SPAN DELEGATE='html::MAIN'>
-			<BEGIN>&lt;</BEGIN>
-			<END>&gt;</END>
-		</SPAN>
-	</RULES>
-
-	<RULES SET='KEYWORDS' IGNORE_CASE='TRUE'>
-		<KEYWORDS>
-			<KEYWORD1>graph</KEYWORD1>
-			<KEYWORD1>subgraph</KEYWORD1>
-			<KEYWORD1>digraph</KEYWORD1>
-			<KEYWORD1>node</KEYWORD1>
-			<KEYWORD1>edge</KEYWORD1>
-
-			<KEYWORD2>strict</KEYWORD2>
-
-			<!-- Node attributes -->
-			<KEYWORD3>URL</KEYWORD3>
-			<KEYWORD3>label</KEYWORD3>
-			<KEYWORD3>shape</KEYWORD3>
-			<KEYWORD3>style</KEYWORD3>
-			<KEYWORD3>type</KEYWORD3>
-			<KEYWORD3>rank</KEYWORD3>
-			<KEYWORD3>tailport</KEYWORD3>
-			<KEYWORD3>headport</KEYWORD3>
-
-			<!-- Node ranks -->
-			<KEYWORD4>same</KEYWORD4>
-
-			<!-- Node shapes -->
-			<KEYWORD4>box</KEYWORD4>
-			<KEYWORD4>polygon</KEYWORD4>
-			<KEYWORD4>ellipse</KEYWORD4>
-			<KEYWORD4>point</KEYWORD4>
-			<KEYWORD4>egg</KEYWORD4>
-			<KEYWORD4>triangle</KEYWORD4>
-			<KEYWORD4>diamond</KEYWORD4>
-			<KEYWORD4>trapezium</KEYWORD4>
-			<KEYWORD4>parallelogram</KEYWORD4>
-			<KEYWORD4>hexagon</KEYWORD4>
-			<KEYWORD4>octagon</KEYWORD4>
-			<KEYWORD4>doublecircle</KEYWORD4>
-			<KEYWORD4>tripleoctagon</KEYWORD4>
-			<KEYWORD4>invtriangle</KEYWORD4>
-			<KEYWORD4>invtrapezium</KEYWORD4>
-
-			<!-- Edge pointer shapes (arrow heads) -->
-			<KEYWORD4>normal</KEYWORD4>
-			<KEYWORD4>dot</KEYWORD4>
-			<KEYWORD4>odot</KEYWORD4>
-			<KEYWORD4>inv</KEYWORD4>
-			<KEYWORD4>invdot</KEYWORD4>
-			<KEYWORD4>invodot</KEYWORD4>
-			<KEYWORD4>none</KEYWORD4>
-
-			<!-- Colors -->
-
-			<!-- Whites -->
-			<KEYWORD4>antiquewhite1</KEYWORD4>
-			<KEYWORD4>antiquewhite2</KEYWORD4>
-			<KEYWORD4>antiquewhite3</KEYWORD4>
-			<KEYWORD4>antiquewhite4</KEYWORD4>
-			<KEYWORD4>azure1</KEYWORD4>
-			<KEYWORD4>azure2</KEYWORD4>
-			<KEYWORD4>azure3</KEYWORD4>
-			<KEYWORD4>azure4</KEYWORD4>
-			<KEYWORD4>bisque1</KEYWORD4>
-			<KEYWORD4>bisque2</KEYWORD4>
-			<KEYWORD4>bisque3</KEYWORD4>
-			<KEYWORD4>bisque4</KEYWORD4>
-			<KEYWORD4>blanchedalmond</KEYWORD4>
-			<KEYWORD4>cornsilk1</KEYWORD4>
-			<KEYWORD4>cornsilk2</KEYWORD4>
-			<KEYWORD4>cornsilk3</KEYWORD4>
-			<KEYWORD4>cornsilk4</KEYWORD4>
-			<KEYWORD4>floralwhite</KEYWORD4>
-			<KEYWORD4>gainsboro</KEYWORD4>
-			<KEYWORD4>ghostwhite</KEYWORD4>
-			<KEYWORD4>honeydew1</KEYWORD4>
-			<KEYWORD4>honeydew2</KEYWORD4>
-			<KEYWORD4>honeydew3</KEYWORD4>
-			<KEYWORD4>honeydew4</KEYWORD4>
-			<KEYWORD4>ivory1</KEYWORD4>
-			<KEYWORD4>ivory2</KEYWORD4>
-			<KEYWORD4>ivory3</KEYWORD4>
-			<KEYWORD4>ivory4</KEYWORD4>
-			<KEYWORD4>lavender</KEYWORD4>
-			<KEYWORD4>lavenderblush1</KEYWORD4>
-			<KEYWORD4>lavenderblush2</KEYWORD4>
-			<KEYWORD4>lavenderblush3</KEYWORD4>
-			<KEYWORD4>lavenderblush4</KEYWORD4>
-			<KEYWORD4>lemonchiffon1</KEYWORD4>
-			<KEYWORD4>lemonchiffon2</KEYWORD4>
-			<KEYWORD4>lemonchiffon3</KEYWORD4>
-			<KEYWORD4>lemonchiffon4</KEYWORD4>
-			<KEYWORD4>linen</KEYWORD4>
-			<KEYWORD4>mintcream</KEYWORD4>
-			<KEYWORD4>mistyrose1</KEYWORD4>
-			<KEYWORD4>mistyrose2</KEYWORD4>
-			<KEYWORD4>mistyrose3</KEYWORD4>
-			<KEYWORD4>mistyrose4</KEYWORD4>
-			<KEYWORD4>moccasin</KEYWORD4>
-			<KEYWORD4>navajowhite1</KEYWORD4>
-			<KEYWORD4>navajowhite2</KEYWORD4>
-			<KEYWORD4>navajowhite3</KEYWORD4>
-			<KEYWORD4>navajowhite4</KEYWORD4>
-			<KEYWORD4>oldlace</KEYWORD4>
-			<KEYWORD4>papayawhip</KEYWORD4>
-			<KEYWORD4>peachpuff1</KEYWORD4>
-			<KEYWORD4>peachpuff2</KEYWORD4>
-			<KEYWORD4>peachpuff3</KEYWORD4>
-			<KEYWORD4>peachpuff4</KEYWORD4>
-			<KEYWORD4>seashell1</KEYWORD4>
-			<KEYWORD4>seashell2</KEYWORD4>
-			<KEYWORD4>seashell3</KEYWORD4>
-			<KEYWORD4>seashell4</KEYWORD4>
-			<KEYWORD4>snow1</KEYWORD4>
-			<KEYWORD4>snow2</KEYWORD4>
-			<KEYWORD4>snow3</KEYWORD4>
-			<KEYWORD4>snow4</KEYWORD4>
-			<KEYWORD4>thistle1</KEYWORD4>
-			<KEYWORD4>thistle2</KEYWORD4>
-			<KEYWORD4>thistle3</KEYWORD4>
-			<KEYWORD4>thistle4</KEYWORD4>
-			<KEYWORD4>wheat1</KEYWORD4>
-			<KEYWORD4>wheat2</KEYWORD4>
-			<KEYWORD4>wheat3</KEYWORD4>
-			<KEYWORD4>wheat4</KEYWORD4>
-			<KEYWORD4>white</KEYWORD4>
-			<KEYWORD4>whitesmoke</KEYWORD4>
-
-			<!-- Reds -->
-			<KEYWORD4>coral1</KEYWORD4>
-			<KEYWORD4>coral2</KEYWORD4>
-			<KEYWORD4>coral3</KEYWORD4>
-			<KEYWORD4>coral4</KEYWORD4>
-			<KEYWORD4>crimson</KEYWORD4>
-			<KEYWORD4>darksalmon</KEYWORD4>
-			<KEYWORD4>deeppink1</KEYWORD4>
-			<KEYWORD4>deeppink2</KEYWORD4>
-			<KEYWORD4>deeppink3</KEYWORD4>
-			<KEYWORD4>deeppink4</KEYWORD4>
-			<KEYWORD4>firebrick1</KEYWORD4>
-			<KEYWORD4>firebrick2</KEYWORD4>
-			<KEYWORD4>firebrick3</KEYWORD4>
-			<KEYWORD4>firebrick4</KEYWORD4>
-			<KEYWORD4>hotpink1</KEYWORD4>
-			<KEYWORD4>hotpink2</KEYWORD4>
-			<KEYWORD4>hotpink3</KEYWORD4>
-			<KEYWORD4>hotpink4</KEYWORD4>
-			<KEYWORD4>indianred1</KEYWORD4>
-			<KEYWORD4>indianred2</KEYWORD4>
-			<KEYWORD4>indianred3</KEYWORD4>
-			<KEYWORD4>indianred4</KEYWORD4>
-			<KEYWORD4>lightpink1</KEYWORD4>
-			<KEYWORD4>lightpink2</KEYWORD4>
-			<KEYWORD4>lightpink3</KEYWORD4>
-			<KEYWORD4>lightpink4</KEYWORD4>
-			<KEYWORD4>lightsalmon1</KEYWORD4>
-			<KEYWORD4>lightsalmon2</KEYWORD4>
-			<KEYWORD4>lightsalmon3</KEYWORD4>
-			<KEYWORD4>lightsalmon4</KEYWORD4>
-			<KEYWORD4>maroon1</KEYWORD4>
-			<KEYWORD4>maroon2</KEYWORD4>
-			<KEYWORD4>maroon3</KEYWORD4>
-			<KEYWORD4>maroon4</KEYWORD4>
-			<KEYWORD4>mediumvioletred</KEYWORD4>
-			<KEYWORD4>orangered1</KEYWORD4>
-			<KEYWORD4>orangered2</KEYWORD4>
-			<KEYWORD4>orangered3</KEYWORD4>
-			<KEYWORD4>orangered4</KEYWORD4>
-			<KEYWORD4>palevioletred1</KEYWORD4>
-			<KEYWORD4>palevioletred2</KEYWORD4>
-			<KEYWORD4>palevioletred3</KEYWORD4>
-			<KEYWORD4>palevioletred4</KEYWORD4>
-			<KEYWORD4>pink1</KEYWORD4>
-			<KEYWORD4>pink2</KEYWORD4>
-			<KEYWORD4>pink3</KEYWORD4>
-			<KEYWORD4>pink4</KEYWORD4>
-			<KEYWORD4>red1</KEYWORD4>
-			<KEYWORD4>red2</KEYWORD4>
-			<KEYWORD4>red3</KEYWORD4>
-			<KEYWORD4>red4</KEYWORD4>
-			<KEYWORD4>salmon1</KEYWORD4>
-			<KEYWORD4>salmon2</KEYWORD4>
-			<KEYWORD4>salmon3</KEYWORD4>
-			<KEYWORD4>salmon4</KEYWORD4>
-			<KEYWORD4>tomato1</KEYWORD4>
-			<KEYWORD4>tomato2</KEYWORD4>
-			<KEYWORD4>tomato3</KEYWORD4>
-			<KEYWORD4>tomato4</KEYWORD4>
-			<KEYWORD4>violetred1</KEYWORD4>
-			<KEYWORD4>violetred2</KEYWORD4>
-			<KEYWORD4>violetred3</KEYWORD4>
-			<KEYWORD4>violetred4</KEYWORD4>
-
-			<!-- Yellows -->
-			<KEYWORD4>darkgoldenrod1</KEYWORD4>
-			<KEYWORD4>darkgoldenrod2</KEYWORD4>
-			<KEYWORD4>darkgoldenrod3</KEYWORD4>
-			<KEYWORD4>darkgoldenrod4</KEYWORD4>
-			<KEYWORD4>gold1</KEYWORD4>
-			<KEYWORD4>gold2</KEYWORD4>
-			<KEYWORD4>gold3</KEYWORD4>
-			<KEYWORD4>gold4</KEYWORD4>
-			<KEYWORD4>goldenrod1</KEYWORD4>
-			<KEYWORD4>goldenrod2</KEYWORD4>
-			<KEYWORD4>goldenrod3</KEYWORD4>
-			<KEYWORD4>goldenrod4</KEYWORD4>
-			<KEYWORD4>greenyellow</KEYWORD4>
-			<KEYWORD4>lightgoldenrod1</KEYWORD4>
-			<KEYWORD4>lightgoldenrod2</KEYWORD4>
-			<KEYWORD4>lightgoldenrod3</KEYWORD4>
-			<KEYWORD4>lightgoldenrod4</KEYWORD4>
-			<KEYWORD4>lightgoldenrodyellow</KEYWORD4>
-			<KEYWORD4>lightyellow1</KEYWORD4>
-			<KEYWORD4>lightyellow2</KEYWORD4>
-			<KEYWORD4>lightyellow3</KEYWORD4>
-			<KEYWORD4>lightyellow4</KEYWORD4>
-			<KEYWORD4>palegoldenrod</KEYWORD4>
-			<KEYWORD4>yellow1</KEYWORD4>
-			<KEYWORD4>yellow2</KEYWORD4>
-			<KEYWORD4>yellow3</KEYWORD4>
-			<KEYWORD4>yellow4</KEYWORD4>
-			<KEYWORD4>yellowgreen</KEYWORD4>
-
-			<!-- Magentas -->
-			<KEYWORD4>blueviolet</KEYWORD4>
-			<KEYWORD4>darkorchid1</KEYWORD4>
-			<KEYWORD4>darkorchid2</KEYWORD4>
-			<KEYWORD4>darkorchid3</KEYWORD4>
-			<KEYWORD4>darkorchid4</KEYWORD4>
-			<KEYWORD4>darkviolet</KEYWORD4>
-			<KEYWORD4>magenta1</KEYWORD4>
-			<KEYWORD4>magenta2</KEYWORD4>
-			<KEYWORD4>magenta3</KEYWORD4>
-			<KEYWORD4>magenta4</KEYWORD4>
-			<KEYWORD4>mediumorchid1</KEYWORD4>
-			<KEYWORD4>mediumorchid2</KEYWORD4>
-			<KEYWORD4>mediumorchid3</KEYWORD4>
-			<KEYWORD4>mediumorchid4</KEYWORD4>
-			<KEYWORD4>mediumpurple1</KEYWORD4>
-			<KEYWORD4>mediumpurple2</KEYWORD4>
-			<KEYWORD4>mediumpurple3</KEYWORD4>
-			<KEYWORD4>mediumpurple4</KEYWORD4>
-			<KEYWORD4>mediumvioletred</KEYWORD4>
-			<KEYWORD4>orchid1</KEYWORD4>
-			<KEYWORD4>orchid2</KEYWORD4>
-			<KEYWORD4>orchid3</KEYWORD4>
-			<KEYWORD4>orchid4</KEYWORD4>
-			<KEYWORD4>palevioletred1</KEYWORD4>
-			<KEYWORD4>palevioletred2</KEYWORD4>
-			<KEYWORD4>palevioletred3</KEYWORD4>
-			<KEYWORD4>palevioletred4</KEYWORD4>
-			<KEYWORD4>plum1</KEYWORD4>
-			<KEYWORD4>plum2</KEYWORD4>
-			<KEYWORD4>plum3</KEYWORD4>
-			<KEYWORD4>plum4</KEYWORD4>
-			<KEYWORD4>purple1</KEYWORD4>
-			<KEYWORD4>purple2</KEYWORD4>
-			<KEYWORD4>purple3</KEYWORD4>
-			<KEYWORD4>purple4</KEYWORD4>
-			<KEYWORD4>violet</KEYWORD4>
-			<KEYWORD4>violetred1</KEYWORD4>
-			<KEYWORD4>violetred2</KEYWORD4>
-			<KEYWORD4>violetred3</KEYWORD4>
-			<KEYWORD4>violetred4</KEYWORD4>
-
-			<!-- Blues -->
-			<KEYWORD4>aliceblue</KEYWORD4>
-			<KEYWORD4>blue1</KEYWORD4>
-			<KEYWORD4>blue2</KEYWORD4>
-			<KEYWORD4>blue3</KEYWORD4>
-			<KEYWORD4>blue4</KEYWORD4>
-			<KEYWORD4>blueviolet</KEYWORD4>
-			<KEYWORD4>cadetblue1</KEYWORD4>
-			<KEYWORD4>cadetblue2</KEYWORD4>
-			<KEYWORD4>cadetblue3</KEYWORD4>
-			<KEYWORD4>cadetblue4</KEYWORD4>
-			<KEYWORD4>cornflowerblue</KEYWORD4>
-			<KEYWORD4>darkslateblue</KEYWORD4>
-			<KEYWORD4>deepskyblue1</KEYWORD4>
-			<KEYWORD4>deepskyblue2</KEYWORD4>
-			<KEYWORD4>deepskyblue3</KEYWORD4>
-			<KEYWORD4>deepskyblue4</KEYWORD4>
-			<KEYWORD4>dodgerblue1</KEYWORD4>
-			<KEYWORD4>dodgerblue2</KEYWORD4>
-			<KEYWORD4>dodgerblue3</KEYWORD4>
-			<KEYWORD4>dodgerblue4</KEYWORD4>
-			<KEYWORD4>indigo</KEYWORD4>
-			<KEYWORD4>lightblue1</KEYWORD4>
-			<KEYWORD4>lightblue2</KEYWORD4>
-			<KEYWORD4>lightblue3</KEYWORD4>
-			<KEYWORD4>lightblue4</KEYWORD4>
-			<KEYWORD4>lightskyblue1</KEYWORD4>
-			<KEYWORD4>lightskyblue2</KEYWORD4>
-			<KEYWORD4>lightskyblue3</KEYWORD4>
-			<KEYWORD4>lightskyblue4</KEYWORD4>
-			<KEYWORD4>lightslateblue1</KEYWORD4>
-			<KEYWORD4>lightslateblue2</KEYWORD4>
-			<KEYWORD4>lightslateblue3</KEYWORD4>
-			<KEYWORD4>lightslateblue4</KEYWORD4>
-			<KEYWORD4>mediumblue</KEYWORD4>
-			<KEYWORD4>mediumslateblue</KEYWORD4>
-			<KEYWORD4>midnightblue</KEYWORD4>
-			<KEYWORD4>navy</KEYWORD4>
-			<KEYWORD4>navyblue</KEYWORD4>
-			<KEYWORD4>powderblue</KEYWORD4>
-			<KEYWORD4>royalblue1</KEYWORD4>
-			<KEYWORD4>royalblue2</KEYWORD4>
-			<KEYWORD4>royalblue3</KEYWORD4>
-			<KEYWORD4>royalblue4</KEYWORD4>
-			<KEYWORD4>skyblue1</KEYWORD4>
-			<KEYWORD4>skyblue2</KEYWORD4>
-			<KEYWORD4>skyblue3</KEYWORD4>
-			<KEYWORD4>skyblue4</KEYWORD4>
-			<KEYWORD4>slateblue1</KEYWORD4>
-			<KEYWORD4>slateblue2</KEYWORD4>
-			<KEYWORD4>slateblue3</KEYWORD4>
-			<KEYWORD4>slateblue4</KEYWORD4>
-			<KEYWORD4>steelblue1</KEYWORD4>
-			<KEYWORD4>steelblue2</KEYWORD4>
-			<KEYWORD4>steelblue3</KEYWORD4>
-			<KEYWORD4>steelblue4</KEYWORD4>
-
-			<!-- Greens -->
-			<KEYWORD4>chartreuse1</KEYWORD4>
-			<KEYWORD4>chartreuse2</KEYWORD4>
-			<KEYWORD4>chartreuse3</KEYWORD4>
-			<KEYWORD4>chartreuse4</KEYWORD4>
-			<KEYWORD4>darkgreen</KEYWORD4>
-			<KEYWORD4>darkolivegreen1</KEYWORD4>
-			<KEYWORD4>darkolivegreen2</KEYWORD4>
-			<KEYWORD4>darkolivegreen3</KEYWORD4>
-			<KEYWORD4>darkolivegreen4</KEYWORD4>
-			<KEYWORD4>darkseagreen1</KEYWORD4>
-			<KEYWORD4>darkseagreen2</KEYWORD4>
-			<KEYWORD4>darkseagreen3</KEYWORD4>
-			<KEYWORD4>darkseagreen4</KEYWORD4>
-			<KEYWORD4>forestgreen</KEYWORD4>
-			<KEYWORD4>green1</KEYWORD4>
-			<KEYWORD4>green2</KEYWORD4>
-			<KEYWORD4>green3</KEYWORD4>
-			<KEYWORD4>green4</KEYWORD4>
-			<KEYWORD4>greenyellow</KEYWORD4>
-			<KEYWORD4>lawngreen</KEYWORD4>
-			<KEYWORD4>lightseagreen</KEYWORD4>
-			<KEYWORD4>limegreen</KEYWORD4>
-			<KEYWORD4>mediumseagreen</KEYWORD4>
-			<KEYWORD4>mediumspringgreen</KEYWORD4>
-			<KEYWORD4>mintcream</KEYWORD4>
-			<KEYWORD4>olivedrab1</KEYWORD4>
-			<KEYWORD4>olivedrab2</KEYWORD4>
-			<KEYWORD4>olivedrab3</KEYWORD4>
-			<KEYWORD4>olivedrab4</KEYWORD4>
-			<KEYWORD4>palegreen1</KEYWORD4>
-			<KEYWORD4>palegreen2</KEYWORD4>
-			<KEYWORD4>palegreen3</KEYWORD4>
-			<KEYWORD4>palegreen4</KEYWORD4>
-			<KEYWORD4>seagreen1</KEYWORD4>
-			<KEYWORD4>seagreen2</KEYWORD4>
-			<KEYWORD4>seagreen3</KEYWORD4>
-			<KEYWORD4>seagreen4</KEYWORD4>
-			<KEYWORD4>springgreen1</KEYWORD4>
-			<KEYWORD4>springgreen2</KEYWORD4>
-			<KEYWORD4>springgreen3</KEYWORD4>
-			<KEYWORD4>springgreen4</KEYWORD4>
-			<KEYWORD4>yellowgreen</KEYWORD4>
-
-			<!-- Browns -->
-			<KEYWORD4>beige</KEYWORD4>
-			<KEYWORD4>brown1</KEYWORD4>
-			<KEYWORD4>brown2</KEYWORD4>
-			<KEYWORD4>brown3</KEYWORD4>
-			<KEYWORD4>brown4</KEYWORD4>
-			<KEYWORD4>burlywood1</KEYWORD4>
-			<KEYWORD4>burlywood2</KEYWORD4>
-			<KEYWORD4>burlywood3</KEYWORD4>
-			<KEYWORD4>burlywood4</KEYWORD4>
-			<KEYWORD4>chocolate1</KEYWORD4>
-			<KEYWORD4>chocolate2</KEYWORD4>
-			<KEYWORD4>chocolate3</KEYWORD4>
-			<KEYWORD4>chocolate4</KEYWORD4>
-			<KEYWORD4>darkkhaki</KEYWORD4>
-			<KEYWORD4>khaki1</KEYWORD4>
-			<KEYWORD4>khaki2</KEYWORD4>
-			<KEYWORD4>khaki3</KEYWORD4>
-			<KEYWORD4>khaki4</KEYWORD4>
-			<KEYWORD4>peru</KEYWORD4>
-			<KEYWORD4>rosybrown1</KEYWORD4>
-			<KEYWORD4>rosybrown2</KEYWORD4>
-			<KEYWORD4>rosybrown3</KEYWORD4>
-			<KEYWORD4>rosybrown4</KEYWORD4>
-			<KEYWORD4>saddlebrown</KEYWORD4>
-			<KEYWORD4>sandybrown</KEYWORD4>
-			<KEYWORD4>sienna1</KEYWORD4>
-			<KEYWORD4>sienna2</KEYWORD4>
-			<KEYWORD4>sienna3</KEYWORD4>
-			<KEYWORD4>sienna4</KEYWORD4>
-			<KEYWORD4>tan1</KEYWORD4>
-			<KEYWORD4>tan2</KEYWORD4>
-			<KEYWORD4>tan3</KEYWORD4>
-			<KEYWORD4>tan4</KEYWORD4>
-
-			<!-- Greys -->
-			<KEYWORD4>darkslategray1</KEYWORD4>
-			<KEYWORD4>darkslategray2</KEYWORD4>
-			<KEYWORD4>darkslategray3</KEYWORD4>
-			<KEYWORD4>darkslategray4</KEYWORD4>
-			<KEYWORD4>dimgray</KEYWORD4>
-			<KEYWORD4>gray</KEYWORD4>
-			<KEYWORD4>gray0</KEYWORD4>
-			<KEYWORD4>gray1</KEYWORD4>
-			<KEYWORD4>gray2</KEYWORD4>
-			<KEYWORD4>gray3</KEYWORD4>
-			<KEYWORD4>gray4</KEYWORD4>
-			<KEYWORD4>gray5</KEYWORD4>
-			<KEYWORD4>gray6</KEYWORD4>
-			<KEYWORD4>gray7</KEYWORD4>
-			<KEYWORD4>gray8</KEYWORD4>
-			<KEYWORD4>gray9</KEYWORD4>
-			<KEYWORD4>gray10</KEYWORD4>
-			<KEYWORD4>gray11</KEYWORD4>
-			<KEYWORD4>gray12</KEYWORD4>
-			<KEYWORD4>gray13</KEYWORD4>
-			<KEYWORD4>gray14</KEYWORD4>
-			<KEYWORD4>gray15</KEYWORD4>
-			<KEYWORD4>gray16</KEYWORD4>
-			<KEYWORD4>gray17</KEYWORD4>
-			<KEYWORD4>gray18</KEYWORD4>
-			<KEYWORD4>gray19</KEYWORD4>
-			<KEYWORD4>gray20</KEYWORD4>
-			<KEYWORD4>gray21</KEYWORD4>
-			<KEYWORD4>gray22</KEYWORD4>
-			<KEYWORD4>gray23</KEYWORD4>
-			<KEYWORD4>gray24</KEYWORD4>
-			<KEYWORD4>gray25</KEYWORD4>
-			<KEYWORD4>gray26</KEYWORD4>
-			<KEYWORD4>gray27</KEYWORD4>
-			<KEYWORD4>gray28</KEYWORD4>
-			<KEYWORD4>gray29</KEYWORD4>
-			<KEYWORD4>gray30</KEYWORD4>
-			<KEYWORD4>gray31</KEYWORD4>
-			<KEYWORD4>gray32</KEYWORD4>
-			<KEYWORD4>gray33</KEYWORD4>
-			<KEYWORD4>gray34</KEYWORD4>
-			<KEYWORD4>gray35</KEYWORD4>
-			<KEYWORD4>gray36</KEYWORD4>
-			<KEYWORD4>gray37</KEYWORD4>
-			<KEYWORD4>gray38</KEYWORD4>
-			<KEYWORD4>gray39</KEYWORD4>
-			<KEYWORD4>gray40</KEYWORD4>
-			<KEYWORD4>gray41</KEYWORD4>
-			<KEYWORD4>gray42</KEYWORD4>
-			<KEYWORD4>gray43</KEYWORD4>
-			<KEYWORD4>gray44</KEYWORD4>
-			<KEYWORD4>gray45</KEYWORD4>
-			<KEYWORD4>gray46</KEYWORD4>
-			<KEYWORD4>gray47</KEYWORD4>
-			<KEYWORD4>gray48</KEYWORD4>
-			<KEYWORD4>gray49</KEYWORD4>
-			<KEYWORD4>gray50</KEYWORD4>
-			<KEYWORD4>gray51</KEYWORD4>
-			<KEYWORD4>gray52</KEYWORD4>
-			<KEYWORD4>gray53</KEYWORD4>
-			<KEYWORD4>gray54</KEYWORD4>
-			<KEYWORD4>gray55</KEYWORD4>
-			<KEYWORD4>gray56</KEYWORD4>
-			<KEYWORD4>gray57</KEYWORD4>
-			<KEYWORD4>gray58</KEYWORD4>
-			<KEYWORD4>gray59</KEYWORD4>
-			<KEYWORD4>gray60</KEYWORD4>
-			<KEYWORD4>gray61</KEYWORD4>
-			<KEYWORD4>gray62</KEYWORD4>
-			<KEYWORD4>gray63</KEYWORD4>
-			<KEYWORD4>gray64</KEYWORD4>
-			<KEYWORD4>gray65</KEYWORD4>
-			<KEYWORD4>gray66</KEYWORD4>
-			<KEYWORD4>gray67</KEYWORD4>
-			<KEYWORD4>gray68</KEYWORD4>
-			<KEYWORD4>gray69</KEYWORD4>
-			<KEYWORD4>gray70</KEYWORD4>
-			<KEYWORD4>gray71</KEYWORD4>
-			<KEYWORD4>gray72</KEYWORD4>
-			<KEYWORD4>gray73</KEYWORD4>
-			<KEYWORD4>gray74</KEYWORD4>
-			<KEYWORD4>gray75</KEYWORD4>
-			<KEYWORD4>gray76</KEYWORD4>
-			<KEYWORD4>gray77</KEYWORD4>
-			<KEYWORD4>gray78</KEYWORD4>
-			<KEYWORD4>gray79</KEYWORD4>
-			<KEYWORD4>gray80</KEYWORD4>
-			<KEYWORD4>gray81</KEYWORD4>
-			<KEYWORD4>gray82</KEYWORD4>
-			<KEYWORD4>gray83</KEYWORD4>
-			<KEYWORD4>gray84</KEYWORD4>
-			<KEYWORD4>gray85</KEYWORD4>
-			<KEYWORD4>gray86</KEYWORD4>
-			<KEYWORD4>gray87</KEYWORD4>
-			<KEYWORD4>gray88</KEYWORD4>
-			<KEYWORD4>gray89</KEYWORD4>
-			<KEYWORD4>gray90</KEYWORD4>
-			<KEYWORD4>gray91</KEYWORD4>
-			<KEYWORD4>gray92</KEYWORD4>
-			<KEYWORD4>gray93</KEYWORD4>
-			<KEYWORD4>gray94</KEYWORD4>
-			<KEYWORD4>gray95</KEYWORD4>
-			<KEYWORD4>gray96</KEYWORD4>
-			<KEYWORD4>gray97</KEYWORD4>
-			<KEYWORD4>gray98</KEYWORD4>
-			<KEYWORD4>gray99</KEYWORD4>
-			<KEYWORD4>gray100</KEYWORD4>
-			<KEYWORD4>lightgray</KEYWORD4>
-			<KEYWORD4>lightslategray</KEYWORD4>
-			<KEYWORD4>slategray1</KEYWORD4>
-			<KEYWORD4>slategray2</KEYWORD4>
-			<KEYWORD4>slategray3</KEYWORD4>
-			<KEYWORD4>slategray4</KEYWORD4>
-
-			<!-- Cyans -->
-			<KEYWORD4>aquamarine1</KEYWORD4>
-			<KEYWORD4>aquamarine2</KEYWORD4>
-			<KEYWORD4>aquamarine3</KEYWORD4>
-			<KEYWORD4>aquamarine4</KEYWORD4>
-			<KEYWORD4>cyan1</KEYWORD4>
-			<KEYWORD4>cyan2</KEYWORD4>
-			<KEYWORD4>cyan3</KEYWORD4>
-			<KEYWORD4>cyan4</KEYWORD4>
-			<KEYWORD4>darkturquoise</KEYWORD4>
-			<KEYWORD4>lightcyan1</KEYWORD4>
-			<KEYWORD4>lightcyan2</KEYWORD4>
-			<KEYWORD4>lightcyan3</KEYWORD4>
-			<KEYWORD4>lightcyan4</KEYWORD4>
-			<KEYWORD4>mediumaquamarine</KEYWORD4>
-			<KEYWORD4>mediumturquoise</KEYWORD4>
-			<KEYWORD4>paleturquoise1</KEYWORD4>
-			<KEYWORD4>paleturquoise2</KEYWORD4>
-			<KEYWORD4>paleturquoise3</KEYWORD4>
-			<KEYWORD4>paleturquoise4</KEYWORD4>
-			<KEYWORD4>turquoise1</KEYWORD4>
-			<KEYWORD4>turquoise2</KEYWORD4>
-			<KEYWORD4>turquoise3</KEYWORD4>
-			<KEYWORD4>turquoise4</KEYWORD4>
-
-			<!-- Oranges -->
-			<KEYWORD4>darkorange1</KEYWORD4>
-			<KEYWORD4>darkorange2</KEYWORD4>
-			<KEYWORD4>darkorange3</KEYWORD4>
-			<KEYWORD4>darkorange4</KEYWORD4>
-			<KEYWORD4>orange1</KEYWORD4>
-			<KEYWORD4>orange2</KEYWORD4>
-			<KEYWORD4>orange3</KEYWORD4>
-			<KEYWORD4>orange4</KEYWORD4>
-			<KEYWORD4>orangered1</KEYWORD4>
-			<KEYWORD4>orangered2</KEYWORD4>
-			<KEYWORD4>orangered3</KEYWORD4>
-			<KEYWORD4>orangered4</KEYWORD4>
-
-			<!-- Blacks -->
-			<KEYWORD4>black</KEYWORD4>
-		</KEYWORDS>
-	</RULES>
-</MODE>
- 	  	 
diff --git a/qpython/src/main/assets/syntax/doxygen.xml b/qpython/src/main/assets/syntax/doxygen.xml
deleted file mode 100644
index 72d44caa..00000000
--- a/qpython/src/main/assets/syntax/doxygen.xml
+++ /dev/null
@@ -1,361 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<MODE>
-    <PROPS>
-        <PROPERTY NAME="lineComment" VALUE="#" />
-    </PROPS>
-    <!-- just in case someone wonders just like me, what this set of rules is for,
-         it's actually for doxygen configuration files, a sample of which can
-         be found here http://www.stack.nl/~dimitri/doxygen/config.html#cfg_extract_static
-      -->
-    <RULES IGNORE_CASE="FALSE" HIGHLIGHT_DIGITS="TRUE">
-        <!-- Comment -->
-        <EOL_SPAN TYPE="COMMENT1">#</EOL_SPAN>
-
-        <MARK_PREVIOUS TYPE="KEYWORD1"
-            AT_LINE_START="TRUE" MATCH_TYPE="OPERATOR">=</MARK_PREVIOUS>
-        <MARK_PREVIOUS TYPE="KEYWORD1"
-            AT_LINE_START="TRUE" MATCH_TYPE="OPERATOR">+=</MARK_PREVIOUS>
-
-        <!-- Literals -->
-        <SPAN TYPE="LITERAL1" ESCAPE="\" NO_LINE_BREAK="TRUE">
-            <BEGIN>"</BEGIN>
-            <END>"</END>
-        </SPAN>
-        <SPAN TYPE="LITERAL1" ESCAPE="\" NO_LINE_BREAK="TRUE">
-            <BEGIN>'</BEGIN>
-            <END>'</END>
-        </SPAN>
-        <SPAN TYPE="LITERAL1" ESCAPE="\" NO_LINE_BREAK="TRUE">
-            <BEGIN>`</BEGIN>
-            <END>`</END>
-        </SPAN>
-        <KEYWORDS>
-            <KEYWORD2>YES</KEYWORD2>
-            <KEYWORD3>NO</KEYWORD3>
-        </KEYWORDS>
-    </RULES>
-
-    <!-- this rule set is used as a delegate in c and d modes -->
-    <RULES SET="DOXYGEN" DEFAULT="COMMENT3" IGNORE_CASE="TRUE">
-        <!-- so that *@param is highlighted -->
-        <SEQ TYPE="COMMENT3">*</SEQ>
-
-        <!-- quoted strings -->
-        <SPAN TYPE="LITERAL1" ESCAPE="\" NO_LINE_BREAK="TRUE">
-            <BEGIN>"</BEGIN>
-            <END>"</END>
-        </SPAN>
-
-        <!-- HTML comments -->
-        <SPAN TYPE="COMMENT1">
-            <BEGIN>&lt;!--</BEGIN>
-            <END>--&gt;</END>
-        </SPAN>
-
-        <!-- Doxygen allows this -->
-        <SEQ TYPE="COMMENT3">&lt;&lt;</SEQ>
-        <SEQ TYPE="COMMENT3">&lt;=</SEQ>
-        <SEQ TYPE="COMMENT3">&lt; </SEQ>
-
-        <!-- HTML tags -->
-        <SPAN TYPE="MARKUP" DELEGATE="xml::TAGS"
-            NO_LINE_BREAK="TRUE">
-            <BEGIN>&lt;</BEGIN>
-            <END>&gt;</END>
-        </SPAN>
-
-        <KEYWORDS>
-            <LABEL>\a</LABEL>
-            <LABEL>\addindex</LABEL>
-            <LABEL>\addtogroup</LABEL>
-            <LABEL>\anchor</LABEL>
-            <LABEL>\arg</LABEL>
-            <LABEL>\attention</LABEL>
-            <LABEL>\author</LABEL>
-            <LABEL>\b</LABEL>
-            <LABEL>\brief</LABEL>
-            <LABEL>\bug</LABEL>
-            <LABEL>\c</LABEL>
-            <LABEL>\callgraph</LABEL>
-            <LABEL>\callergraph</LABEL>
-            <LABEL>\category</LABEL>
-            <LABEL>\class</LABEL>
-            <LABEL>\code</LABEL>
-            <LABEL>\cond</LABEL>
-            <LABEL>\copybrief</LABEL>
-            <LABEL>\copydetails</LABEL>
-            <LABEL>\copydoc</LABEL>
-            <LABEL>\date</LABEL>
-            <LABEL>\def</LABEL>
-            <LABEL>\defgroup</LABEL>
-            <LABEL>\deprecated</LABEL>
-            <LABEL>\details</LABEL>
-            <LABEL>\dir</LABEL>
-            <LABEL>\dontinclude</LABEL>
-            <LABEL>\dot</LABEL>
-            <LABEL>\dotfile</LABEL>
-            <LABEL>\e</LABEL>
-            <LABEL>\else</LABEL>
-            <LABEL>\elseif</LABEL>
-            <LABEL>\em</LABEL>
-            <LABEL>\endcode</LABEL>
-            <LABEL>\endcond</LABEL>
-            <LABEL>\enddot</LABEL>
-            <LABEL>\endhtmlonly</LABEL>
-            <LABEL>\endif</LABEL>
-            <LABEL>\endlatexonly</LABEL>
-            <LABEL>\endlink</LABEL>
-            <LABEL>\endmanonly</LABEL>
-            <LABEL>\endmsc</LABEL>
-            <LABEL>\endverbatim</LABEL>
-            <LABEL>\endxmlonly</LABEL>
-            <LABEL>\enum</LABEL>
-            <LABEL>\example</LABEL>
-            <LABEL>\exception</LABEL>
-            <LABEL>\extends</LABEL>
-            <LABEL>\f$</LABEL>
-            <LABEL>\f[</LABEL>
-            <LABEL>\f]</LABEL>
-            <LABEL>\f{</LABEL>
-            <LABEL>\f}</LABEL>
-            <LABEL>\file</LABEL>
-            <LABEL>\fn</LABEL>
-            <LABEL>\headerfile</LABEL>
-            <LABEL>\hideinitializer</LABEL>
-            <LABEL>\htmlinclude</LABEL>
-            <LABEL>\htmlonly</LABEL>
-            <LABEL>\if</LABEL>
-            <LABEL>\ifnot</LABEL>
-            <LABEL>\image</LABEL>
-            <LABEL>\implements</LABEL>
-            <LABEL>\include</LABEL>
-            <LABEL>\includelineno</LABEL>
-            <LABEL>\ingroup</LABEL>
-            <LABEL>\internal</LABEL>
-            <LABEL>\invariant</LABEL>
-            <LABEL>\interface</LABEL>
-            <LABEL>\latexonly</LABEL>
-            <LABEL>\li</LABEL>
-            <LABEL>\line</LABEL>
-            <LABEL>\link</LABEL>
-            <LABEL>\mainpage</LABEL>
-            <LABEL>\manonly</LABEL>
-            <LABEL>\memberof</LABEL>
-            <LABEL>\msc</LABEL>
-            <LABEL>\n</LABEL>
-            <LABEL>\name</LABEL>
-            <LABEL>\namespace</LABEL>
-            <LABEL>\nosubgrouping</LABEL>
-            <LABEL>\note</LABEL>
-            <LABEL>\overload</LABEL>
-            <LABEL>\p</LABEL>
-            <LABEL>\package</LABEL>
-            <LABEL>\page</LABEL>
-            <LABEL>\par</LABEL>
-            <LABEL>\paragraph</LABEL>
-            <LABEL>\param</LABEL>
-            <LABEL>\param[in]</LABEL>
-            <LABEL>\param[out]</LABEL>
-            <LABEL>\param[in,out]</LABEL>
-            <LABEL>\post</LABEL>
-            <LABEL>\pre</LABEL>
-            <LABEL>\private</LABEL>
-            <LABEL>\privatesection</LABEL>
-            <LABEL>\property</LABEL>
-            <LABEL>\protected</LABEL>
-            <LABEL>\protectedsection</LABEL>
-            <LABEL>\protocol</LABEL>
-            <LABEL>\public</LABEL>
-            <LABEL>\publicsection</LABEL>
-            <LABEL>\ref</LABEL>
-            <LABEL>\relates</LABEL>
-            <LABEL>\relatesalso</LABEL>
-            <LABEL>\remarks</LABEL>
-            <LABEL>\return</LABEL>
-            <LABEL>\retval</LABEL>
-            <LABEL>\sa</LABEL>
-            <LABEL>\section</LABEL>
-            <LABEL>\see</LABEL>
-            <LABEL>\showinitializer</LABEL>
-            <LABEL>\since</LABEL>
-            <LABEL>\skip</LABEL>
-            <LABEL>\skipline</LABEL>
-            <LABEL>\struct</LABEL>
-            <LABEL>\subpage</LABEL>
-            <LABEL>\subsection</LABEL>
-            <LABEL>\subsubsection</LABEL>
-            <LABEL>\test</LABEL>
-            <LABEL>\throw</LABEL>
-            <LABEL>\todo</LABEL>
-            <LABEL>\tparam</LABEL>
-            <LABEL>\typedef</LABEL>
-            <LABEL>\union</LABEL>
-            <LABEL>\until</LABEL>
-            <LABEL>\var</LABEL>
-            <LABEL>\verbatim</LABEL>
-            <LABEL>\verbinclude</LABEL>
-            <LABEL>\version</LABEL>
-            <LABEL>\warning</LABEL>
-            <LABEL>\weakgroup</LABEL>
-            <LABEL>\xmlonly</LABEL>
-            <LABEL>\xrefitem</LABEL>
-            <LABEL>\$</LABEL>
-            <LABEL>\@</LABEL>
-            <LABEL>\\</LABEL>
-            <LABEL>\&amp;</LABEL>
-            <LABEL>\~</LABEL>
-            <LABEL>\&lt;</LABEL>
-            <LABEL>\&gt;</LABEL>
-            <LABEL>\#</LABEL>
-            <LABEL>\%</LABEL>
-            <LABEL>\"</LABEL>
-            <LABEL>@a</LABEL>
-            <LABEL>@addindex</LABEL>
-            <LABEL>@addtogroup</LABEL>
-            <LABEL>@anchor</LABEL>
-            <LABEL>@arg</LABEL>
-            <LABEL>@attention</LABEL>
-            <LABEL>@author</LABEL>
-            <LABEL>@b</LABEL>
-            <LABEL>@brief</LABEL>
-            <LABEL>@bug</LABEL>
-            <LABEL>@c</LABEL>
-            <LABEL>@callgraph</LABEL>
-            <LABEL>@callergraph</LABEL>
-            <LABEL>@category</LABEL>
-            <LABEL>@class</LABEL>
-            <LABEL>@code</LABEL>
-            <LABEL>@cond</LABEL>
-            <LABEL>@copybrief</LABEL>
-            <LABEL>@copydetails</LABEL>
-            <LABEL>@copydoc</LABEL>
-            <LABEL>@date</LABEL>
-            <LABEL>@def</LABEL>
-            <LABEL>@defgroup</LABEL>
-            <LABEL>@deprecated</LABEL>
-            <LABEL>@details</LABEL>
-            <LABEL>@dir</LABEL>
-            <LABEL>@dontinclude</LABEL>
-            <LABEL>@dot</LABEL>
-            <LABEL>@dotfile</LABEL>
-            <LABEL>@e</LABEL>
-            <LABEL>@else</LABEL>
-            <LABEL>@elseif</LABEL>
-            <LABEL>@em</LABEL>
-            <LABEL>@endcode</LABEL>
-            <LABEL>@endcond</LABEL>
-            <LABEL>@enddot</LABEL>
-            <LABEL>@endhtmlonly</LABEL>
-            <LABEL>@endif</LABEL>
-            <LABEL>@endlatexonly</LABEL>
-            <LABEL>@endlink</LABEL>
-            <LABEL>@endmanonly</LABEL>
-            <LABEL>@endmsc</LABEL>
-            <LABEL>@endverbatim</LABEL>
-            <LABEL>@endxmlonly</LABEL>
-            <LABEL>@enum</LABEL>
-            <LABEL>@example</LABEL>
-            <LABEL>@exception</LABEL>
-            <LABEL>@extends</LABEL>
-            <LABEL>@f$</LABEL>
-            <LABEL>@f[</LABEL>
-            <LABEL>@f]</LABEL>
-            <LABEL>@f{</LABEL>
-            <LABEL>@f}</LABEL>
-            <LABEL>@file</LABEL>
-            <LABEL>@fn</LABEL>
-            <LABEL>@headerfile</LABEL>
-            <LABEL>@hideinitializer</LABEL>
-            <LABEL>@htmlinclude</LABEL>
-            <LABEL>@htmlonly</LABEL>
-            <LABEL>@if</LABEL>
-            <LABEL>@ifnot</LABEL>
-            <LABEL>@image</LABEL>
-            <LABEL>@implements</LABEL>
-            <LABEL>@include</LABEL>
-            <LABEL>@includelineno</LABEL>
-            <LABEL>@ingroup</LABEL>
-            <LABEL>@internal</LABEL>
-            <LABEL>@invariant</LABEL>
-            <LABEL>@interface</LABEL>
-            <LABEL>@latexonly</LABEL>
-            <LABEL>@li</LABEL>
-            <LABEL>@line</LABEL>
-            <LABEL>@link</LABEL>
-            <LABEL>@mainpage</LABEL>
-            <LABEL>@manonly</LABEL>
-            <LABEL>@memberof</LABEL>
-            <LABEL>@msc</LABEL>
-            <LABEL>@n</LABEL>
-            <LABEL>@name</LABEL>
-            <LABEL>@namespace</LABEL>
-            <LABEL>@nosubgrouping</LABEL>
-            <LABEL>@note</LABEL>
-            <LABEL>@overload</LABEL>
-            <LABEL>@p</LABEL>
-            <LABEL>@package</LABEL>
-            <LABEL>@page</LABEL>
-            <LABEL>@par</LABEL>
-            <LABEL>@paragraph</LABEL>
-            <LABEL>@param</LABEL>
-            <LABEL>@param[in]</LABEL>
-            <LABEL>@param[out]</LABEL>
-            <LABEL>@param[in,out]</LABEL>
-            <LABEL>@post</LABEL>
-            <LABEL>@pre</LABEL>
-            <LABEL>@private</LABEL>
-            <LABEL>@privatesection</LABEL>
-            <LABEL>@property</LABEL>
-            <LABEL>@protected</LABEL>
-            <LABEL>@protectedsection</LABEL>
-            <LABEL>@protocol</LABEL>
-            <LABEL>@public</LABEL>
-            <LABEL>@publicsection</LABEL>
-            <LABEL>@ref</LABEL>
-            <LABEL>@relates</LABEL>
-            <LABEL>@relatesalso</LABEL>
-            <LABEL>@remarks</LABEL>
-            <LABEL>@return</LABEL>
-            <LABEL>@retval</LABEL>
-            <LABEL>@sa</LABEL>
-            <LABEL>@section</LABEL>
-            <LABEL>@see</LABEL>
-            <LABEL>@showinitializer</LABEL>
-            <LABEL>@since</LABEL>
-            <LABEL>@skip</LABEL>
-            <LABEL>@skipline</LABEL>
-            <LABEL>@struct</LABEL>
-            <LABEL>@subpage</LABEL>
-            <LABEL>@subsection</LABEL>
-            <LABEL>@subsubsection</LABEL>
-            <LABEL>@test</LABEL>
-            <LABEL>@throw</LABEL>
-            <LABEL>@todo</LABEL>
-            <LABEL>@tparam</LABEL>
-            <LABEL>@typedef</LABEL>
-            <LABEL>@union</LABEL>
-            <LABEL>@until</LABEL>
-            <LABEL>@var</LABEL>
-            <LABEL>@verbatim</LABEL>
-            <LABEL>@verbinclude</LABEL>
-            <LABEL>@version</LABEL>
-            <LABEL>@warning</LABEL>
-            <LABEL>@weakgroup</LABEL>
-            <LABEL>@xmlonly</LABEL>
-            <LABEL>@xrefitem</LABEL>
-            <LABEL>@$</LABEL>
-            <LABEL>@@</LABEL>
-            <LABEL>@\</LABEL>
-            <LABEL>@&amp;</LABEL>
-            <LABEL>@~</LABEL>
-            <LABEL>@&lt;</LABEL>
-            <LABEL>@&gt;</LABEL>
-            <LABEL>@#</LABEL>
-            <LABEL>@%</LABEL>
-        </KEYWORDS>
-    </RULES>
-
-</MODE>
diff --git a/qpython/src/main/assets/syntax/dsssl.xml b/qpython/src/main/assets/syntax/dsssl.xml
deleted file mode 100644
index 22dc3189..00000000
--- a/qpython/src/main/assets/syntax/dsssl.xml
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!-- DSSSL is the Document Style Semantics Specification Language,
-     used by the Jade SGML documentation generation tool -->
-
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="commentStart" VALUE="&lt;!--" />
-		<PROPERTY NAME="commentEnd" VALUE="--&gt;" />
-		<PROPERTY NAME="lineComment" VALUE=";" />
-	</PROPS>
-	<RULES IGNORE_CASE="FALSE" HIGHLIGHT_DIGITS="TRUE">
-		<!-- EOL comment -->
-		<EOL_SPAN TYPE="COMMENT1">;</EOL_SPAN>
-
-		<!-- SGML comment -->
-		<SPAN TYPE="COMMENT1">
-			<BEGIN>&lt;!--</BEGIN>
-			<END>--&gt;</END>
-		</SPAN>
-
-		<!-- LISP stuff -->
-		<SEQ TYPE="NULL">'(</SEQ>
-
-		<MARK_FOLLOWING TYPE="LITERAL1">'</MARK_FOLLOWING>
-
-		<SPAN TYPE="LITERAL1">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-
-		<!-- DSSSL stuff -->
-		<SPAN TYPE="KEYWORD2" NO_LINE_BREAK="TRUE">
-			<BEGIN>$</BEGIN>
-			<END>$</END>
-		</SPAN>
-
-		<SPAN TYPE="KEYWORD2" NO_LINE_BREAK="TRUE">
-			<BEGIN>%</BEGIN>
-			<END>%</END>
-		</SPAN>
-
-		<MARK_FOLLOWING TYPE="LITERAL2">#</MARK_FOLLOWING>
-
-		<!-- DTD Entity declarations -->
-		<SPAN TYPE="KEYWORD2" DELEGATE="xml::ENTITY-TAGS">
-			<BEGIN>&lt;!ENTITY</BEGIN>
-			<END>&gt;</END>
-		</SPAN>
-
-		<!-- CDATA sections -->
-		<SPAN TYPE="KEYWORD2" DELEGATE="xml::CDATA">
-			<BEGIN>&lt;![CDATA[</BEGIN>
-			<END>]]&gt;</END>
-		</SPAN>
-
-		<!-- DTD instructions -->
-		<SPAN TYPE="KEYWORD2" DELEGATE="xml::DTD-TAGS">
-			<BEGIN>&lt;!</BEGIN>
-			<END>&gt;</END>
-		</SPAN>
-
-		<!-- markup tags -->
-		<SEQ TYPE="NULL">&lt;=</SEQ>
-
-		<SPAN TYPE="MARKUP" DELEGATE="xml::TAGS">
-			<BEGIN>&lt;/style-specification</BEGIN>
-			<END>&gt;</END>
-		</SPAN>
-
-		<SPAN TYPE="MARKUP" DELEGATE="xml::TAGS">
-			<BEGIN>&lt;/style-sheet</BEGIN>
-			<END>&gt;</END>
-		</SPAN>
-
-		<SPAN TYPE="MARKUP" DELEGATE="xml::TAGS">
-			<BEGIN>&lt;style-specification</BEGIN>
-			<END>&gt;</END>
-		</SPAN>
-
-		<SPAN TYPE="MARKUP" DELEGATE="xml::TAGS">
-			<BEGIN>&lt;external-specification</BEGIN>
-			<END>&gt;</END>
-		</SPAN>
-
-		<SPAN TYPE="MARKUP" DELEGATE="xml::TAGS">
-			<BEGIN>&lt;style-sheet</BEGIN>
-			<END>&gt;</END>
-		</SPAN>
-
-		<!-- SGML entities -->
-		<SPAN TYPE="LITERAL2" NO_WORD_BREAK="TRUE">
-			<BEGIN>&amp;</BEGIN>
-			<END>;</END>
-		</SPAN>
-
-		<KEYWORDS>
-			<KEYWORD1>and</KEYWORD1>
-			<KEYWORD1>cond</KEYWORD1>
-			<KEYWORD1>define</KEYWORD1>
-			<KEYWORD1>else</KEYWORD1>
-			<KEYWORD1>lambda</KEYWORD1>
-			<KEYWORD1>or</KEYWORD1>
-			<KEYWORD1>quote</KEYWORD1>
-			<KEYWORD1>if</KEYWORD1>
-			<KEYWORD1>let</KEYWORD1>
-			<KEYWORD1>let*</KEYWORD1>
-			<KEYWORD1>loop</KEYWORD1>
-			<KEYWORD1>not</KEYWORD1>
-			<KEYWORD1>list</KEYWORD1>
-			<KEYWORD1>append</KEYWORD1>
-			<KEYWORD1>children</KEYWORD1>
-			<KEYWORD1>normalize</KEYWORD1>
-
-			<KEYWORD2>car</KEYWORD2>
-			<KEYWORD2>cdr</KEYWORD2>
-			<KEYWORD2>cons</KEYWORD2>
-			<KEYWORD2>node-list-first</KEYWORD2>
-			<KEYWORD2>node-list-rest</KEYWORD2>
-
-			<KEYWORD3>eq?</KEYWORD3>
-			<KEYWORD3>null?</KEYWORD3>
-			<KEYWORD3>pair?</KEYWORD3>
-			<KEYWORD3>zero?</KEYWORD3>
-			<KEYWORD3>equal?</KEYWORD3>
-			<KEYWORD3>node-list-empty?</KEYWORD3>
-
-			<FUNCTION>external-procedure</FUNCTION>
-			<FUNCTION>root</FUNCTION>
-			<FUNCTION>make</FUNCTION>
-			<FUNCTION>process-children</FUNCTION>
-			<FUNCTION>current-node</FUNCTION>
-			<FUNCTION>node</FUNCTION>
-			<FUNCTION>empty-sosofo</FUNCTION>
-			<FUNCTION>default</FUNCTION>
-			<FUNCTION>attribute-string</FUNCTION>
-			<FUNCTION>select-elements</FUNCTION>
-			<FUNCTION>with-mode</FUNCTION>
-			<FUNCTION>literal</FUNCTION>
-			<FUNCTION>process-node-list</FUNCTION>
-			<FUNCTION>element</FUNCTION>
-			<FUNCTION>mode</FUNCTION>
-			<FUNCTION>gi</FUNCTION>
-			<FUNCTION>sosofo-append</FUNCTION>
-			<FUNCTION>sequence</FUNCTION>
-
-			<LABEL>attributes:</LABEL>
-			<LABEL>gi:</LABEL>
-		</KEYWORDS>
-	</RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/eiffel.xml b/qpython/src/main/assets/syntax/eiffel.xml
deleted file mode 100644
index ab1e9b95..00000000
--- a/qpython/src/main/assets/syntax/eiffel.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!-- Eiffel mode, by Slava Pestov. Based on EiffelTokenMarker by
-     Artur Biesiadowski -->
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="lineComment" VALUE="--" />
-		<PROPERTY NAME="contextInsensitive" VALUE="true"/>
-	</PROPS>
-	<RULES IGNORE_CASE="TRUE" HIGHLIGHT_DIGITS="TRUE">
-		<!-- Comment -->
-		<EOL_SPAN TYPE="COMMENT1">--</EOL_SPAN>
-
-		<!-- Standard literals -->
-		<SPAN TYPE="LITERAL1" ESCAPE="\" NO_LINE_BREAK="TRUE">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-		<SPAN TYPE="LITERAL1" ESCAPE="\" NO_LINE_BREAK="TRUE">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-
-		<!-- some of these should be marked OPERATOR -->
-		<!-- <SEQ TYPE="NULL">)</SEQ>
-		<SEQ TYPE="NULL">(</SEQ>
-		<SEQ TYPE="NULL">=</SEQ>
-		<SEQ TYPE="NULL">!</SEQ>
-		<SEQ TYPE="NULL">&gt;=</SEQ>
-		<SEQ TYPE="NULL">&lt;=</SEQ>
-		<SEQ TYPE="NULL">+</SEQ>
-		<SEQ TYPE="NULL">-</SEQ>
-		<SEQ TYPE="NULL">/</SEQ>
-		<SEQ TYPE="NULL">*</SEQ>
-		<SEQ TYPE="NULL">&gt;</SEQ>
-		<SEQ TYPE="NULL">&lt;</SEQ>
-		<SEQ TYPE="NULL">%</SEQ>
-		<SEQ TYPE="NULL">&amp;</SEQ>
-		<SEQ TYPE="NULL">|</SEQ>
-		<SEQ TYPE="NULL">^</SEQ>
-		<SEQ TYPE="NULL">~</SEQ>
-		<SEQ TYPE="NULL">}</SEQ>
-		<SEQ TYPE="NULL">{</SEQ>
-		<SEQ TYPE="NULL">.</SEQ>
-		<SEQ TYPE="NULL">,</SEQ>
-		<SEQ TYPE="NULL">;</SEQ>
-		<SEQ TYPE="NULL">]</SEQ>
-		<SEQ TYPE="NULL">[</SEQ>
-		<SEQ TYPE="NULL">?</SEQ>
-		<SEQ TYPE="NULL">:</SEQ> -->
-
-		<KEYWORDS>
-			<KEYWORD1>alias</KEYWORD1>
-			<KEYWORD1>all</KEYWORD1>
-			<KEYWORD1>and</KEYWORD1>
-			<KEYWORD1>as</KEYWORD1>
-			<KEYWORD1>check</KEYWORD1>
-			<KEYWORD1>class</KEYWORD1>
-			<KEYWORD1>creation</KEYWORD1>
-			<KEYWORD1>debug</KEYWORD1>
-			<KEYWORD1>deferred</KEYWORD1>
-			<KEYWORD1>do</KEYWORD1>
-			<KEYWORD1>else</KEYWORD1>
-			<KEYWORD1>elseif</KEYWORD1>
-			<KEYWORD1>end</KEYWORD1>
-			<KEYWORD1>ensure</KEYWORD1>
-			<KEYWORD1>expanded</KEYWORD1>
-			<KEYWORD1>export</KEYWORD1>
-			<KEYWORD1>external</KEYWORD1>
-			<KEYWORD1>feature</KEYWORD1>
-			<KEYWORD1>from</KEYWORD1>
-			<KEYWORD1>frozen</KEYWORD1>
-			<KEYWORD1>if</KEYWORD1>
-			<KEYWORD1>implies</KEYWORD1>
-			<KEYWORD1>indexing</KEYWORD1>
-			<KEYWORD1>infix</KEYWORD1>
-			<KEYWORD1>inherit</KEYWORD1>
-			<KEYWORD1>inspect</KEYWORD1>
-			<KEYWORD1>invariant</KEYWORD1>
-			<KEYWORD1>is</KEYWORD1>
-			<KEYWORD1>like</KEYWORD1>
-			<KEYWORD1>local</KEYWORD1>
-			<KEYWORD1>loop</KEYWORD1>
-			<KEYWORD1>not</KEYWORD1>
-			<KEYWORD1>obsolete</KEYWORD1>
-			<KEYWORD1>old</KEYWORD1>
-			<KEYWORD1>once</KEYWORD1>
-			<KEYWORD1>or</KEYWORD1>
-			<KEYWORD1>prefix</KEYWORD1>
-			<KEYWORD1>redefine</KEYWORD1>
-			<KEYWORD1>rename</KEYWORD1>
-			<KEYWORD1>require</KEYWORD1>
-			<KEYWORD1>rescue</KEYWORD1>
-			<KEYWORD1>retry</KEYWORD1>
-			<KEYWORD1>select</KEYWORD1>
-			<KEYWORD1>separate</KEYWORD1>
-			<KEYWORD1>then</KEYWORD1>
-			<KEYWORD1>undefine</KEYWORD1>
-			<KEYWORD1>until</KEYWORD1>
-			<KEYWORD1>variant</KEYWORD1>
-			<KEYWORD1>when</KEYWORD1>
-			<KEYWORD1>xor</KEYWORD1>
-
-			<LITERAL2>current</LITERAL2>
-			<LITERAL2>false</LITERAL2>
-			<LITERAL2>precursor</LITERAL2>
-			<LITERAL2>result</LITERAL2>
-			<LITERAL2>strip</LITERAL2>
-			<LITERAL2>true</LITERAL2>
-			<LITERAL2>unique</LITERAL2>
-			<LITERAL2>void</LITERAL2>
-		</KEYWORDS>
-	</RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/embperl.xml b/qpython/src/main/assets/syntax/embperl.xml
deleted file mode 100644
index 4e0a586a..00000000
--- a/qpython/src/main/assets/syntax/embperl.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!--
-catalog entry:
-
-<MODE NAME="embperl"		FILE="embperl.xml"
-				FILE_NAME_GLOB="*.epl"/>
-
-sidekick parser entry:
-mode.embperl.sidekick.parser=html
-
-xml completion entry:
-mode.embperl.xml.completion-info=jeditresource:/XML.jar!/xml/completion/html-complete.xml
--->
-
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="commentStart" VALUE="&lt;!--" />
-		<PROPERTY NAME="commentEnd" VALUE="--&gt;" />
-	</PROPS>
-	<RULES IGNORE_CASE="TRUE" HIGHLIGHT_DIGITS="FALSE">
-		<SPAN TYPE="COMMENT2">
-			<BEGIN>[#</BEGIN>
-			<END>#]</END>
-		</SPAN>
-		<!-- output result -->
-		<SPAN DELEGATE="perl::MAIN" TYPE="LITERAL3">
-			<BEGIN>[+</BEGIN>
-			<END>+]</END>
-		</SPAN>
-		<!-- execute code -->
-		<SPAN DELEGATE="perl::MAIN" TYPE="LITERAL3">
-			<BEGIN>[-</BEGIN>
-			<END>-]</END>
-		</SPAN>
-		<!-- control flow -->
-		<SPAN DELEGATE="perl::MAIN" TYPE="LITERAL3">
-			<BEGIN>[$</BEGIN>
-			<END>$]</END>
-		</SPAN>
-		<!-- execute once -->
-		<SPAN DELEGATE="perl::MAIN" TYPE="LITERAL3">
-			<BEGIN>[!</BEGIN>
-			<END>!]</END>
-		</SPAN>
-		<IMPORT DELEGATE="html::MAIN"/>
-	</RULES>
-</MODE>
-
diff --git a/qpython/src/main/assets/syntax/erlang.xml b/qpython/src/main/assets/syntax/erlang.xml
deleted file mode 100644
index f215a3f7..00000000
--- a/qpython/src/main/assets/syntax/erlang.xml
+++ /dev/null
@@ -1,284 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="lineComment" VALUE="%"/>
-	</PROPS>
-
-	<RULES IGNORE_CASE="FALSE" HIGHLIGHT_DIGITS="TRUE">
-		<EOL_SPAN TYPE="COMMENT1">%</EOL_SPAN>
-
-		<SPAN TYPE="LITERAL1" ESCAPE="\" NO_LINE_BREAK="FALSE">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-
-		<SPAN TYPE="LITERAL1" ESCAPE="\" NO_LINE_BREAK="TRUE">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-
-		<MARK_PREVIOUS TYPE="FUNCTION" MATCH_TYPE="OPERATOR">(</MARK_PREVIOUS>
-		<SEQ TYPE="OPERATOR">)</SEQ>
-
-		<MARK_PREVIOUS TYPE="LITERAL2" MATCH_TYPE="OPERATOR">:</MARK_PREVIOUS>
-
-		<SEQ_REGEXP HASH_CHAR="$"
-			TYPE="LITERAL3"
-			AT_WORD_START="TRUE"
-		>\$(\\.|.)</SEQ_REGEXP>
-
-		<SEQ_REGEXP HASH_CHAR="?"
-			TYPE="LABEL"
-			AT_WORD_START="TRUE"
-		>\?\w*</SEQ_REGEXP>
-
-		<SEQ TYPE="LITERAL3">badarg</SEQ>
-		<SEQ TYPE="LITERAL3">infinity</SEQ>
-		<SEQ TYPE="LITERAL3">undefined</SEQ>
-		<SEQ TYPE="LITERAL3">nocookie</SEQ>
-		<SEQ TYPE="LITERAL3">false</SEQ>
-		<SEQ TYPE="LITERAL3">true</SEQ>
-
-		<SEQ TYPE="OPERATOR">-&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;-</SEQ>
-		<SEQ TYPE="OPERATOR">.</SEQ>
-		<SEQ TYPE="OPERATOR">;</SEQ>
-		<SEQ TYPE="OPERATOR">=</SEQ>
-		<SEQ TYPE="OPERATOR">/</SEQ>
-		<SEQ TYPE="OPERATOR">|</SEQ>
-		<SEQ TYPE="OPERATOR">#</SEQ>
-		<SEQ TYPE="OPERATOR">+</SEQ>
-		<SEQ TYPE="OPERATOR">*</SEQ>
-		<!--
-		<SEQ TYPE="OPERATOR">(</SEQ>
-		<SEQ TYPE="OPERATOR">)</SEQ>
-		-->
-		<SEQ TYPE="OPERATOR">:</SEQ>
-		<SEQ TYPE="OPERATOR">{</SEQ>
-		<SEQ TYPE="OPERATOR">}</SEQ>
-		<SEQ TYPE="OPERATOR">[</SEQ>
-		<SEQ TYPE="OPERATOR">]</SEQ>
-		<SEQ TYPE="OPERATOR">,</SEQ>
-		<SEQ TYPE="OPERATOR">?</SEQ>
-		<SEQ TYPE="OPERATOR">!</SEQ>
-
-		<!-- div -->
-		<SEQ_REGEXP HASH_CHAR="div"
-			TYPE="OPERATOR"
-			AT_WORD_START="TRUE"
-		>\bdiv\b</SEQ_REGEXP>
-		<!-- rem -->
-		<SEQ_REGEXP HASH_CHAR="rem"
-			TYPE="OPERATOR"
-			AT_WORD_START="TRUE"
-		>\brem\b</SEQ_REGEXP>
-		<!-- or -->
-		<SEQ_REGEXP HASH_CHAR="or"
-			TYPE="OPERATOR"
-			AT_WORD_START="TRUE"
-		>\bor\b</SEQ_REGEXP>
-		<!-- xor -->
-		<SEQ_REGEXP HASH_CHAR="xor"
-			TYPE="OPERATOR"
-			AT_WORD_START="TRUE"
-		>\bxor\b</SEQ_REGEXP>
-		<!-- bor -->
-		<SEQ_REGEXP HASH_CHAR="bor"
-			TYPE="OPERATOR"
-			AT_WORD_START="TRUE"
-		>\bbor\b</SEQ_REGEXP>
-		<!-- bxor -->
-		<SEQ_REGEXP HASH_CHAR="bxor"
-			TYPE="OPERATOR"
-			AT_WORD_START="TRUE"
-		>\bbxor\b</SEQ_REGEXP>
-		<!-- bsl -->
-		<SEQ_REGEXP HASH_CHAR="bsl"
-			TYPE="OPERATOR"
-			AT_WORD_START="TRUE"
-		>\bbsl\b</SEQ_REGEXP>
-		<!-- bsr -->
-		<SEQ_REGEXP HASH_CHAR="bsr"
-			TYPE="OPERATOR"
-			AT_WORD_START="TRUE"
-		>\bbsr\b</SEQ_REGEXP>
-		<!-- and -->
-		<SEQ_REGEXP HASH_CHAR="and"
-			TYPE="OPERATOR"
-			AT_WORD_START="TRUE"
-		>\band\b</SEQ_REGEXP>
-		<!-- band -->
-		<SEQ_REGEXP HASH_CHAR="band"
-			TYPE="OPERATOR"
-			AT_WORD_START="TRUE"
-		>\bband\b</SEQ_REGEXP>
-		<!-- not -->
-		<SEQ_REGEXP HASH_CHAR="not"
-			TYPE="OPERATOR"
-			AT_WORD_START="TRUE"
-		>\bnot\b</SEQ_REGEXP>
-		<!-- bnot -->
-		<SEQ_REGEXP HASH_CHAR="bnot"
-			TYPE="OPERATOR"
-			AT_WORD_START="TRUE"
-		>\bbnot\b</SEQ_REGEXP>
-		<!-- andalso -->
-		<SEQ_REGEXP HASH_CHAR="andalso"
-			TYPE="OPERATOR"
-			AT_WORD_START="TRUE"
-		>\bandalso\b</SEQ_REGEXP>
-		<!-- orelse -->
-		<SEQ_REGEXP HASH_CHAR="orelse"
-			TYPE="OPERATOR"
-			AT_WORD_START="TRUE"
-		>\borelse\b</SEQ_REGEXP>
-
-		<KEYWORDS>
-			<!-- keywords -->
-			<KEYWORD1>after</KEYWORD1>
-			<KEYWORD1>begin</KEYWORD1>
-			<KEYWORD1>case</KEYWORD1>
-			<KEYWORD1>catch</KEYWORD1>
-			<KEYWORD1>cond</KEYWORD1>
-			<KEYWORD1>end</KEYWORD1>
-			<KEYWORD1>fun</KEYWORD1>
-			<KEYWORD1>if</KEYWORD1>
-			<KEYWORD1>let</KEYWORD1>
-			<KEYWORD1>of</KEYWORD1>
-			<KEYWORD1>query</KEYWORD1>
-			<KEYWORD1>receive</KEYWORD1>
-			<KEYWORD1>when</KEYWORD1>
-			<KEYWORD1>try</KEYWORD1>
-
-			<!-- built-in-functions BIFs -->
-			<KEYWORD2>abs</KEYWORD2>
-			<KEYWORD2>alive</KEYWORD2>
-			<KEYWORD2>apply</KEYWORD2>
-			<KEYWORD2>atom_to_list</KEYWORD2>
-			<KEYWORD2>binary_to_list</KEYWORD2>
-			<KEYWORD2>binary_to_term</KEYWORD2>
-			<KEYWORD2>concat_binary</KEYWORD2>
-			<KEYWORD2>date</KEYWORD2>
-			<KEYWORD2>disconnect_node</KEYWORD2>
-			<KEYWORD2>element</KEYWORD2>
-			<KEYWORD2>erase</KEYWORD2>
-			<KEYWORD2>exit</KEYWORD2>
-			<KEYWORD2>float</KEYWORD2>
-			<KEYWORD2>float_to_list</KEYWORD2>
-			<KEYWORD2>get</KEYWORD2>
-			<KEYWORD2>get_keys</KEYWORD2>
-			<KEYWORD2>group_leader</KEYWORD2>
-			<KEYWORD2>halt</KEYWORD2>
-			<KEYWORD2>hd</KEYWORD2>
-			<KEYWORD2>integer_to_list</KEYWORD2>
-			<KEYWORD2>is_alive</KEYWORD2>
-			<KEYWORD2>length</KEYWORD2>
-			<KEYWORD2>link</KEYWORD2>
-			<KEYWORD2>list_to_atom</KEYWORD2>
-			<KEYWORD2>list_to_binary</KEYWORD2>
-			<KEYWORD2>list_to_float</KEYWORD2>
-			<KEYWORD2>list_to_integer</KEYWORD2>
-			<KEYWORD2>list_to_pid</KEYWORD2>
-			<KEYWORD2>list_to_tuple</KEYWORD2>
-			<KEYWORD2>load_module</KEYWORD2>
-			<KEYWORD2>make_ref</KEYWORD2>
-			<KEYWORD2>monitor_node</KEYWORD2>
-			<KEYWORD2>node</KEYWORD2>
-			<KEYWORD2>nodes</KEYWORD2>
-			<KEYWORD2>now</KEYWORD2>
-			<KEYWORD2>open_port</KEYWORD2>
-			<KEYWORD2>pid_to_list</KEYWORD2>
-			<KEYWORD2>process_flag</KEYWORD2>
-			<KEYWORD2>process_info</KEYWORD2>
-			<KEYWORD2>process</KEYWORD2>
-			<KEYWORD2>put</KEYWORD2>
-			<KEYWORD2>register</KEYWORD2>
-			<KEYWORD2>registered</KEYWORD2>
-			<KEYWORD2>round</KEYWORD2>
-			<KEYWORD2>self</KEYWORD2>
-			<KEYWORD2>setelement</KEYWORD2>
-			<KEYWORD2>size</KEYWORD2>
-			<KEYWORD2>spawn</KEYWORD2>
-			<KEYWORD2>spawn_link</KEYWORD2>
-			<KEYWORD2>split_binary</KEYWORD2>
-			<KEYWORD2>statistics</KEYWORD2>
-			<KEYWORD2>term_to_binary</KEYWORD2>
-			<KEYWORD2>throw</KEYWORD2>
-			<KEYWORD2>time</KEYWORD2>
-			<KEYWORD2>tl</KEYWORD2>
-			<KEYWORD2>trunc</KEYWORD2>
-			<KEYWORD2>tuple_to_list</KEYWORD2>
-			<KEYWORD2>unlink</KEYWORD2>
-			<KEYWORD2>unregister</KEYWORD2>
-			<KEYWORD2>whereis</KEYWORD2>
-
-			<!-- other BIFs -->
-			<KEYWORD2>atom</KEYWORD2>
-			<KEYWORD2>binary</KEYWORD2>
-			<KEYWORD2>constant</KEYWORD2>
-			<KEYWORD2>function</KEYWORD2>
-			<KEYWORD2>integer</KEYWORD2>
-			<KEYWORD2>list</KEYWORD2>
-			<KEYWORD2>number</KEYWORD2>
-			<KEYWORD2>pid</KEYWORD2>
-			<KEYWORD2>ports</KEYWORD2>
-			<KEYWORD2>port_close</KEYWORD2>
-			<KEYWORD2>port_info</KEYWORD2>
-			<KEYWORD2>reference</KEYWORD2>
-			<KEYWORD2>record</KEYWORD2>
-
-			<!-- erlang:BIFs -->
-			<KEYWORD2>check_process_code</KEYWORD2>
-			<KEYWORD2>delete_module</KEYWORD2>
-			<KEYWORD2>get_cookie</KEYWORD2>
-			<KEYWORD2>hash</KEYWORD2>
-			<KEYWORD2>math</KEYWORD2>
-			<KEYWORD2>module_loaded</KEYWORD2>
-			<KEYWORD2>preloaded</KEYWORD2>
-			<KEYWORD2>processes</KEYWORD2>
-			<KEYWORD2>purge_module</KEYWORD2>
-			<KEYWORD2>set_cookie</KEYWORD2>
-			<KEYWORD2>set_node</KEYWORD2>
-
-			<!-- math functions -->
-			<KEYWORD2>acos</KEYWORD2>
-			<KEYWORD2>asin</KEYWORD2>
-			<KEYWORD2>atan</KEYWORD2>
-			<KEYWORD2>atan2</KEYWORD2>
-			<KEYWORD2>cos</KEYWORD2>
-			<KEYWORD2>cosh</KEYWORD2>
-			<KEYWORD2>exp</KEYWORD2>
-			<KEYWORD2>log</KEYWORD2>
-			<KEYWORD2>log10</KEYWORD2>
-			<KEYWORD2>pi</KEYWORD2>
-			<KEYWORD2>pow</KEYWORD2>
-			<KEYWORD2>power</KEYWORD2>
-			<KEYWORD2>sin</KEYWORD2>
-			<KEYWORD2>sinh</KEYWORD2>
-			<KEYWORD2>sqrt</KEYWORD2>
-			<KEYWORD2>tan</KEYWORD2>
-			<KEYWORD2>tanh</KEYWORD2>
-
-			<!-- directives -->
-			<KEYWORD3>-behaviour</KEYWORD3>
-			<KEYWORD3>-compile</KEYWORD3>
-			<KEYWORD3>-define</KEYWORD3>
-			<KEYWORD3>-else</KEYWORD3>
-			<KEYWORD3>-endif</KEYWORD3>
-			<KEYWORD3>-export</KEYWORD3>
-			<KEYWORD3>-file</KEYWORD3>
-			<KEYWORD3>-ifdef</KEYWORD3>
-			<KEYWORD3>-ifndef</KEYWORD3>
-			<KEYWORD3>-import</KEYWORD3>
-			<KEYWORD3>-include</KEYWORD3>
-			<KEYWORD3>-include_lib</KEYWORD3>
-			<KEYWORD3>-module</KEYWORD3>
-			<KEYWORD3>-record</KEYWORD3>
-			<KEYWORD3>-undef</KEYWORD3>
-		</KEYWORDS>
-
-	</RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/factor.xml b/qpython/src/main/assets/syntax/factor.xml
deleted file mode 100644
index 5598edd5..00000000
--- a/qpython/src/main/assets/syntax/factor.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="indentOpenBrackets" VALUE="[{"/>
-		<PROPERTY NAME="indentCloseBrackets" VALUE="]}"/>
-		<PROPERTY NAME="indentNextLines" VALUE="^(:|M:|C:|PREDICATE:)[^;]*"/>
-		<PROPERTY NAME="unindentNextLines" VALUE="^.*;.*$"/>
-		<PROPERTY NAME="doubleBracketIndent" VALUE="true"/>
-		<PROPERTY NAME="commentStart" VALUE="("/>
-		<PROPERTY NAME="commentEnd" VALUE=")"/>
-		<PROPERTY NAME="lineComment" VALUE="!"/>
-		<PROPERTY NAME="noWordSep" VALUE="+-*=&gt;&lt;;.?/'()%,_|"/>
-	</PROPS>
-	<RULES IGNORE_CASE="FALSE" NO_WORD_SEP="+-*=&gt;&lt;;.?/'()%,_"
-		HIGHLIGHT_DIGITS="TRUE" DIGIT_RE="-?\d+([./]\d+)?">
-		<EOL_SPAN TYPE="COMMENT2" AT_WORD_START="TRUE"
-			DELEGATE="COMMENT">#! </EOL_SPAN>
-		<EOL_SPAN TYPE="COMMENT1" AT_WORD_START="TRUE"
-			DELEGATE="COMMENT">! </EOL_SPAN>
-
-		<!-- parsing words -->
-		<SEQ_REGEXP TYPE="MARKUP"
-			HASH_CHAR="\"
-			AT_WORD_START="TRUE">\\\s+(\S+)</SEQ_REGEXP>
-		<SEQ_REGEXP TYPE="MARKUP"
-			HASH_CHAR=":"
-			AT_WORD_START="TRUE">:\s+(\S+)</SEQ_REGEXP>
-		<SEQ_REGEXP TYPE="MARKUP"
-			HASH_CHAR="IN:"
-			AT_WORD_START="TRUE">IN:\s+(\S+)</SEQ_REGEXP>
-		<SEQ_REGEXP TYPE="MARKUP"
-			HASH_CHAR="USE:"
-			AT_WORD_START="TRUE">USE:\s+(\S+)</SEQ_REGEXP>
-		<SEQ_REGEXP TYPE="LITERAL2"
-			HASH_CHAR="CHAR:"
-			AT_WORD_START="TRUE">CHAR:\s+(\S+)</SEQ_REGEXP>
-		<SEQ_REGEXP TYPE="LITERAL2"
-			HASH_CHAR="BIN:"
-			AT_WORD_START="TRUE">BIN:\s+(\S+)</SEQ_REGEXP>
-		<SEQ_REGEXP TYPE="LITERAL2"
-			HASH_CHAR="OCT:"
-			AT_WORD_START="TRUE">OCT:\s+(\S+)</SEQ_REGEXP>
-		<SEQ_REGEXP TYPE="LITERAL2"
-			HASH_CHAR="HEX:"
-			AT_WORD_START="TRUE">HEX:\s+(\S+)</SEQ_REGEXP>
-
-		<SPAN TYPE="COMMENT3" DELEGATE="STACK_EFFECT" NO_LINE_BREAK="TRUE">
-			<BEGIN>\s+( </BEGIN>
-			<END>)</END>
-		</SPAN>
-		<SPAN TYPE="LITERAL1" ESCAPE="\" NO_LINE_BREAK="TRUE"
-			DELEGATE="LITERAL">
-			<BEGIN>SBUF" </BEGIN>
-			<END>"</END>
-		</SPAN>
-		<SPAN TYPE="LITERAL1" ESCAPE="\" NO_LINE_BREAK="TRUE"
-			DELEGATE="LITERAL">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-		<SPAN TYPE="MARKUP" DELEGATE="USING">
-			<BEGIN>USING: </BEGIN>
-			<END>;</END>
-		</SPAN>
-
-		<SEQ TYPE="OPERATOR">[</SEQ>
-		<SEQ TYPE="OPERATOR">]</SEQ>
-		<SEQ TYPE="OPERATOR">{</SEQ>
-		<SEQ TYPE="OPERATOR">}</SEQ>
-
-		<KEYWORDS>
-			<KEYWORD1>&gt;r</KEYWORD1>
-			<KEYWORD1>r&gt;</KEYWORD1>
-
-			<MARKUP>;</MARKUP>
-
-			<LITERAL3>t</LITERAL3>
-			<LITERAL4>f</LITERAL4>
-
-			<COMMENT2>#!</COMMENT2>
-			<COMMENT1>!</COMMENT1>
-		</KEYWORDS>
-	</RULES>
-
-	<RULES SET="STACK_EFFECT" DEFAULT="COMMENT4">
-		<SEQ TYPE="COMMENT3">--</SEQ>
-	</RULES>
-
-	<RULES SET="LITERAL" DEFAULT="LITERAL1">
-	</RULES>
-
-	<RULES SET="COMMENT" DEFAULT="COMMENT1">
-	</RULES>
-
-	<RULES SET="USING" DEFAULT="LITERAL2">
-	</RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/fhtml.xml b/qpython/src/main/assets/syntax/fhtml.xml
deleted file mode 100644
index 759ce579..00000000
--- a/qpython/src/main/assets/syntax/fhtml.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!-- fhtml (factor+html) mode -->
-
-<MODE>
-        <PROPS>
-                <PROPERTY NAME="commentStart" VALUE="&lt;!--" />
-                <PROPERTY NAME="commentEnd" VALUE="--&gt;" />
-                <PROPERTY NAME="commentStart" VALUE="&lt;%#" />
-                <PROPERTY NAME="commentEnd" VALUE="%&gt;" />
-                <PROPERTY NAME="tabSize" VALUE="4" />
-                <PROPERTY NAME="noTabs" VALUE="true" />
-        </PROPS>
-        <RULES IGNORE_CASE="TRUE">
-                <SPAN TYPE="MARKUP" DELEGATE="factor::MAIN">
-                        <BEGIN>&lt;%</BEGIN>
-                        <END>%&gt;</END>
-                </SPAN>
-
-                <IMPORT DELEGATE="html::MAIN" />
-        </RULES>
-</MODE>
-
diff --git a/qpython/src/main/assets/syntax/forth.xml b/qpython/src/main/assets/syntax/forth.xml
deleted file mode 100644
index b9d76bd3..00000000
--- a/qpython/src/main/assets/syntax/forth.xml
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!-- RetroForth is one of the nicest Forth implementations, so we
-support that one. You can extend this to your own Forth's vocabulary
-easily. -->
-
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="indentNextLines" VALUE="^:[^;]*" />
-		<PROPERTY NAME="unindentNextLines" VALUE="^.*;$" />
-		<PROPERTY NAME="commentStart" VALUE="(" />
-		<PROPERTY NAME="commentEnd" VALUE=")" />
-		<PROPERTY NAME="lineComment" VALUE="|" />
-		<PROPERTY NAME="noWordSep" VALUE="+-*=&gt;&lt;;.?/'()%,_|$" />
-	</PROPS>
-	<RULES IGNORE_CASE="FALSE"
-		NO_WORD_SEP="+-*=&gt;&lt;;.?/'&quot;()%,_$"
-		HIGHLIGHT_DIGITS="TRUE"
-		DIGIT_RE="|-?\d+([./]\d+)?">
-
-		<EOL_SPAN TYPE="COMMENT1" AT_WORD_START="TRUE">| </EOL_SPAN>
-
-		<MARK_FOLLOWING TYPE="DIGIT" AT_WORD_START="TRUE">$</MARK_FOLLOWING>
-		<MARK_FOLLOWING TYPE="LITERAL3" AT_WORD_START="TRUE">'</MARK_FOLLOWING>
-
-		<!-- parsing words -->
-		<SEQ_REGEXP TYPE="MARKUP"
-			HASH_CHAR=":"
-			AT_WORD_START="TRUE">:\s+(\S+)</SEQ_REGEXP>
-
-		<SPAN TYPE="COMMENT3" DELEGATE="STACK_EFFECT">
-			<BEGIN>( </BEGIN>
-			<END>)</END>
-		</SPAN>
-
-		<SPAN TYPE="LITERAL1" NO_LINE_BREAK="TRUE"
-			AT_WORD_START="TRUE">
-			<BEGIN>s"</BEGIN>
-			<END>"</END>
-		</SPAN>
-
-		<SPAN TYPE="LITERAL2" NO_LINE_BREAK="TRUE"
-			AT_WORD_START="TRUE">
-			<BEGIN>."</BEGIN>
-			<END>"</END>
-		</SPAN>
-
-		<SPAN TYPE="LITERAL3" NO_LINE_BREAK="TRUE"
-			AT_WORD_START="TRUE">
-			<BEGIN>f"</BEGIN>
-			<END>"</END>
-		</SPAN>
-
-		<SPAN TYPE="LITERAL3" NO_LINE_BREAK="TRUE"
-			AT_WORD_START="TRUE">
-			<BEGIN>m"</BEGIN>
-			<END>"</END>
-		</SPAN>
-
-		<SPAN TYPE="LITERAL4" NO_LINE_BREAK="TRUE"
-			AT_WORD_START="TRUE">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-
-		<KEYWORDS>
-			<MARKUP>;</MARKUP>
-			<MARKUP>;;</MARKUP>
-			<MARKUP>0;</MARKUP>
-
-			<KEYWORD1>swap</KEYWORD1>
-			<KEYWORD1>drop</KEYWORD1>
-			<KEYWORD1>dup</KEYWORD1>
-			<KEYWORD1>nip</KEYWORD1>
-			<KEYWORD1>over</KEYWORD1>
-			<KEYWORD1>rot</KEYWORD1>
-			<KEYWORD1>-rot</KEYWORD1>
-			<KEYWORD1>2dup</KEYWORD1>
-			<KEYWORD1>2drop</KEYWORD1>
-			<KEYWORD1>2over</KEYWORD1>
-			<KEYWORD1>2swap</KEYWORD1>
-			<KEYWORD1>&gt;r</KEYWORD1>
-			<KEYWORD1>r&gt;</KEYWORD1>
-
-			<KEYWORD2>and</KEYWORD2>
-			<KEYWORD2>or</KEYWORD2>
-			<KEYWORD2>xor</KEYWORD2>
-			<KEYWORD2>&gt;&gt;</KEYWORD2>
-			<KEYWORD2>&lt;&lt;</KEYWORD2>
-			<KEYWORD2>not</KEYWORD2>
-			<KEYWORD2>+</KEYWORD2>
-			<KEYWORD2>*</KEYWORD2>
-			<KEYWORD2>negate</KEYWORD2>
-			<KEYWORD2>-</KEYWORD2>
-			<KEYWORD2>/</KEYWORD2>
-			<KEYWORD2>mod</KEYWORD2>
-			<KEYWORD2>/mod</KEYWORD2>
-			<KEYWORD2>*/</KEYWORD2>
-			<KEYWORD2>1+</KEYWORD2>
-			<KEYWORD2>1-</KEYWORD2>
-			<KEYWORD2>base</KEYWORD2>
-			<KEYWORD2>hex</KEYWORD2>
-			<KEYWORD2>decimal</KEYWORD2>
-			<KEYWORD2>binary</KEYWORD2>
-			<KEYWORD2>octal</KEYWORD2>
-
-			<KEYWORD3>@</KEYWORD3>
-			<KEYWORD3>!</KEYWORD3>
-			<KEYWORD3>c@</KEYWORD3>
-			<KEYWORD3>c!</KEYWORD3>
-			<KEYWORD3>+!</KEYWORD3>
-			<KEYWORD3>cell+</KEYWORD3>
-			<KEYWORD3>cells</KEYWORD3>
-			<KEYWORD3>char+</KEYWORD3>
-			<KEYWORD3>chars</KEYWORD3>
-
-			<KEYWORD4>[</KEYWORD4>
-			<KEYWORD4>]</KEYWORD4>
-			<KEYWORD4>create</KEYWORD4>
-			<KEYWORD4>does&gt;</KEYWORD4>
-			<KEYWORD4>variable</KEYWORD4>
-			<KEYWORD4>variable,</KEYWORD4>
-			<KEYWORD4>literal</KEYWORD4>
-			<KEYWORD4>last</KEYWORD4>
-			<KEYWORD4>1,</KEYWORD4>
-			<KEYWORD4>2,</KEYWORD4>
-			<KEYWORD4>3,</KEYWORD4>
-			<KEYWORD4>,</KEYWORD4>
-			<KEYWORD4>here</KEYWORD4>
-			<KEYWORD4>allot</KEYWORD4>
-			<KEYWORD4>parse</KEYWORD4>
-			<KEYWORD4>find</KEYWORD4>
-			<KEYWORD4>compile</KEYWORD4>
-
-			<OPERATOR>if</OPERATOR>
-			<OPERATOR>=if</OPERATOR>
-			<OPERATOR>&lt;if</OPERATOR>
-			<OPERATOR>&gt;if</OPERATOR>
-			<OPERATOR>&lt;&gt;if</OPERATOR>
-			<OPERATOR>then</OPERATOR>
-			<OPERATOR>repeat</OPERATOR>
-			<OPERATOR>until</OPERATOR>
-
-			<OPERATOR>forth</OPERATOR>
-			<OPERATOR>macro</OPERATOR>
-		</KEYWORDS>
-	</RULES>
-
-	<RULES SET="STACK_EFFECT" DEFAULT="COMMENT4">
-		<SEQ TYPE="COMMENT3">--</SEQ>
-	</RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/fortran.xml b/qpython/src/main/assets/syntax/fortran.xml
deleted file mode 100644
index 2aa20533..00000000
--- a/qpython/src/main/assets/syntax/fortran.xml
+++ /dev/null
@@ -1,252 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-<!--  FORTRAN edit mode
-      Version 1.3
-      2007-06-21
-      suitable for jEdit 4.2final and jEdit 4.3pre9
--->
-<!-- This is a mode for FORTRAN source files.  In general, this supports
-common features of the F90 specification.  This may however contain some
-platform or vendor specific keywords (in paticular COMPAQ(Digital) FORTRAN).
--->
-<!-- Suggested catalog file entry:
-
-<MODE NAME="FORTRAN"		FILE="FORTRAN.xml"
-				FILE_NAME_GLOB="*.{f,for,fort,f77,f90}" />
- -->
-<MODE>
-    <PROPS>
-         <!-- To get the line comment inserted correctly at line start:
-              use the "toggle-line-comment"-action of TextTools plugin 
-              with the active option "Insert line comments at start of line" -->
-         <PROPERTY NAME="lineComment"    VALUE="C" />
-         
-         <PROPERTY NAME="wordBreakChars" VALUE=",+-=&lt;&gt;/?^&amp;*" />
-         <!--<PROPERTY NAME="indentNextLine" VALUE="\s*((if\s*\(.*\)\s*then|else\s*|do\s*)*)" />-->
-         <PROPERTY NAME="indentNextLines" VALUE="\s*((if\s*\(.*\)\s*then|else\s*|do\s*)*)" />
-    </PROPS>
-
-    <RULES IGNORE_CASE="TRUE" HIGHLIGHT_DIGITS="FALSE">
-<!-- In fixed form, column 72 is the last column parsed, unless the
-\extend_source option is invoked -->
-    <!-- TERMINATE AT_CHAR="72" / -->
-
-<!-- comment either !, C, or * can be used as a comment in the first column
-in either free or fixed form FORTRAN-->
-<EOL_SPAN TYPE="COMMENT1" AT_LINE_START="TRUE">C</EOL_SPAN>
-<EOL_SPAN TYPE="COMMENT1" AT_LINE_START="TRUE">!</EOL_SPAN>
-<EOL_SPAN TYPE="COMMENT1" AT_LINE_START="TRUE">*</EOL_SPAN>
-<EOL_SPAN TYPE="COMMENT1">!</EOL_SPAN>
-<EOL_SPAN TYPE="COMMENT2" AT_LINE_START="TRUE">D</EOL_SPAN>
-
-		<SPAN TYPE="LITERAL1" NO_LINE_BREAK="FALSE">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-		<SPAN TYPE="LITERAL1" NO_LINE_BREAK="FALSE">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-
-<!-- Highlighted Operators -->
-		<SEQ TYPE="OPERATOR">&lt;=</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;=</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;</SEQ>
-		<SEQ TYPE="OPERATOR">&amp;</SEQ>
-		<SEQ TYPE="OPERATOR">/=</SEQ>
-		<SEQ TYPE="OPERATOR">==</SEQ>
-		<SEQ TYPE="OPERATOR">.lt.</SEQ>
-		<SEQ TYPE="OPERATOR">.gt.</SEQ>
-		<SEQ TYPE="OPERATOR">.eq.</SEQ>
-		<SEQ TYPE="OPERATOR">.ne.</SEQ>
-		<SEQ TYPE="OPERATOR">.le.</SEQ>
-		<SEQ TYPE="OPERATOR">.ge.</SEQ>
-		<SEQ TYPE="OPERATOR">.AND.</SEQ>
-		<SEQ TYPE="OPERATOR">.OR.</SEQ>
-
-<KEYWORDS>
-<!-- unclassified keywords -->
-<KEYWORD1>INCLUDE</KEYWORD1>
-<!-- Program units and calling them -->
-<KEYWORD1>PROGRAM</KEYWORD1>
-<KEYWORD1>MODULE</KEYWORD1>
-<KEYWORD1>SUBROUTINE</KEYWORD1>
-<KEYWORD1>FUNCTION</KEYWORD1>
-<KEYWORD1>CONTAINS</KEYWORD1>
-<KEYWORD1>USE</KEYWORD1>
-<KEYWORD1>CALL</KEYWORD1>
-<KEYWORD1>RETURN</KEYWORD1>
-<!-- data types, declaration, and allocation keywords -->
-<KEYWORD1>IMPLICIT</KEYWORD1>
-<KEYWORD1>EXPLICIT</KEYWORD1>
-<KEYWORD1>NONE</KEYWORD1>
-<KEYWORD1>DATA</KEYWORD1>
-<KEYWORD1>PARAMETER</KEYWORD1>
-<KEYWORD1>ALLOCATE</KEYWORD1>
-<KEYWORD1>ALLOCATABLE</KEYWORD1>
-<KEYWORD1>ALLOCATED</KEYWORD1>
-<KEYWORD1>DEALLOCATE</KEYWORD1>
-<KEYWORD1>INTEGER</KEYWORD1>
-<KEYWORD1>REAL</KEYWORD1>
-<KEYWORD1>DOUBLE</KEYWORD1>
-<KEYWORD1>PRECISION</KEYWORD1>
-<KEYWORD1>COMPLEX</KEYWORD1>
-<KEYWORD1>LOGICAL</KEYWORD1>
-<KEYWORD1>CHARACTER</KEYWORD1>
-<KEYWORD1>DIMENSION</KEYWORD1>
-<KEYWORD1>KIND</KEYWORD1>
-<!-- FORTRAN Statements -->
-<KEYWORD1>CASE</KEYWORD1>
-<KEYWORD1>SELECT</KEYWORD1>
-<KEYWORD1>DEFAULT</KEYWORD1>
-<KEYWORD1>CONTINUE</KEYWORD1>
-<KEYWORD1>CYCLE</KEYWORD1>
-<KEYWORD1>DO</KEYWORD1>
-<KEYWORD1>WHILE</KEYWORD1>
-<KEYWORD1>ELSE</KEYWORD1>
-<KEYWORD1>IF</KEYWORD1>
-<KEYWORD1>ELSEIF</KEYWORD1>
-<KEYWORD1>THEN</KEYWORD1>
-<KEYWORD1>ELSEWHERE</KEYWORD1>
-<KEYWORD1>END</KEYWORD1>
-<KEYWORD1>ENDIF</KEYWORD1>
-<KEYWORD1>ENDDO</KEYWORD1>
-<KEYWORD1>FORALL</KEYWORD1>
-<KEYWORD1>WHERE</KEYWORD1>
-<KEYWORD1>EXIT</KEYWORD1>
-<KEYWORD1>GOTO</KEYWORD1>
-<KEYWORD1>PAUSE</KEYWORD1>
-<KEYWORD1>STOP</KEYWORD1>
-<!-- i/o keywords -->
-<KEYWORD1>BACKSPACE</KEYWORD1>
-<KEYWORD1>CLOSE</KEYWORD1>
-<KEYWORD1>ENDFILE</KEYWORD1>
-<KEYWORD1>INQUIRE</KEYWORD1>
-<KEYWORD1>OPEN</KEYWORD1>
-<KEYWORD1>PRINT</KEYWORD1>
-<KEYWORD1>READ</KEYWORD1>
-<KEYWORD1>REWIND</KEYWORD1>
-<KEYWORD1>WRITE</KEYWORD1>
-<KEYWORD1>FORMAT</KEYWORD1>
-<!-- Type conversion and utility functions -->
-<KEYWORD1>AIMAG</KEYWORD1>
-<KEYWORD1>AINT</KEYWORD1>
-<KEYWORD1>AMAX0</KEYWORD1>
-<KEYWORD1>AMIN0</KEYWORD1>
-<KEYWORD1>ANINT</KEYWORD1>
-<KEYWORD1>CEILING</KEYWORD1>
-<KEYWORD1>CMPLX</KEYWORD1>
-<KEYWORD1>CONJG</KEYWORD1>
-<KEYWORD1>DBLE</KEYWORD1>
-<KEYWORD1>DCMPLX</KEYWORD1>
-<KEYWORD1>DFLOAT</KEYWORD1>
-<KEYWORD1>DIM</KEYWORD1>
-<KEYWORD1>DPROD</KEYWORD1>
-<KEYWORD1>FLOAT</KEYWORD1>
-<KEYWORD1>FLOOR</KEYWORD1>
-<KEYWORD1>IFIX</KEYWORD1>
-<KEYWORD1>IMAG</KEYWORD1>
-<KEYWORD1>INT</KEYWORD1>
-<KEYWORD1>LOGICAL</KEYWORD1>
-<KEYWORD1>MODULO</KEYWORD1>
-<KEYWORD1>NINT</KEYWORD1>
-<KEYWORD1>REAL</KEYWORD1>
-<KEYWORD1>SIGN</KEYWORD1>
-<KEYWORD1>SNGL</KEYWORD1>
-<KEYWORD1>TRANSFER</KEYWORD1>
-<KEYWORD1>ZEXT</KEYWORD1>
-<!-- More Functions -->
-<KEYWORD1>ABS</KEYWORD1>
-<KEYWORD1>ACOS</KEYWORD1>
-<KEYWORD1>AIMAG</KEYWORD1>
-<KEYWORD1>AINT</KEYWORD1>
-<KEYWORD1>ALOG</KEYWORD1>
-<KEYWORD1>ALOG10</KEYWORD1>
-<KEYWORD1>AMAX0</KEYWORD1>
-<KEYWORD1>AMAX1</KEYWORD1>
-<KEYWORD1>AMIN0</KEYWORD1>
-<KEYWORD1>AMIN1</KEYWORD1>
-<KEYWORD1>AMOD</KEYWORD1>
-<KEYWORD1>ANINT</KEYWORD1>
-<KEYWORD1>ASIN</KEYWORD1>
-<KEYWORD1>ATAN</KEYWORD1>
-<KEYWORD1>ATAN2</KEYWORD1>
-<KEYWORD1>CABS</KEYWORD1>
-<KEYWORD1>CCOS</KEYWORD1>
-<KEYWORD1>CHAR</KEYWORD1>
-<KEYWORD1>CLOG</KEYWORD1>
-<KEYWORD1>CMPLX</KEYWORD1>
-<KEYWORD1>CONJG</KEYWORD1>
-<KEYWORD1>COS</KEYWORD1>
-<KEYWORD1>COSH</KEYWORD1>
-<KEYWORD1>CSIN</KEYWORD1>
-<KEYWORD1>CSQRT</KEYWORD1>
-<KEYWORD1>DABS</KEYWORD1>
-<KEYWORD1>DACOS</KEYWORD1>
-<KEYWORD1>DASIN</KEYWORD1>
-<KEYWORD1>DATAN</KEYWORD1>
-<KEYWORD1>DATAN2</KEYWORD1>
-<KEYWORD1>DBLE</KEYWORD1>
-<KEYWORD1>DCOS</KEYWORD1>
-<KEYWORD1>DCOSH</KEYWORD1>
-<KEYWORD1>DDIM</KEYWORD1>
-<KEYWORD1>DEXP</KEYWORD1>
-<KEYWORD1>DIM</KEYWORD1>
-<KEYWORD1>DINT</KEYWORD1>
-<KEYWORD1>DLOG</KEYWORD1>
-<KEYWORD1>DLOG10</KEYWORD1>
-<KEYWORD1>DMAX1</KEYWORD1>
-<KEYWORD1>DMIN1</KEYWORD1>
-<KEYWORD1>DMOD</KEYWORD1>
-<KEYWORD1>DNINT</KEYWORD1>
-<KEYWORD1>DPROD</KEYWORD1>
-<KEYWORD1>DREAL</KEYWORD1>
-<KEYWORD1>DSIGN</KEYWORD1>
-<KEYWORD1>DSIN</KEYWORD1>
-<KEYWORD1>DSINH</KEYWORD1>
-<KEYWORD1>DSQRT</KEYWORD1>
-<KEYWORD1>DTAN</KEYWORD1>
-<KEYWORD1>DTANH</KEYWORD1>
-<KEYWORD1>EXP</KEYWORD1>
-<KEYWORD1>FLOAT</KEYWORD1>
-<KEYWORD1>IABS</KEYWORD1>
-<KEYWORD1>ICHAR</KEYWORD1>
-<KEYWORD1>IDIM</KEYWORD1>
-<KEYWORD1>IDINT</KEYWORD1>
-<KEYWORD1>IDNINT</KEYWORD1>
-<KEYWORD1>IFIX</KEYWORD1>
-<KEYWORD1>INDEX</KEYWORD1>
-<KEYWORD1>INT</KEYWORD1>
-<KEYWORD1>ISIGN</KEYWORD1>
-<KEYWORD1>LEN</KEYWORD1>
-<KEYWORD1>LGE</KEYWORD1>
-<KEYWORD1>LGT</KEYWORD1>
-<KEYWORD1>LLE</KEYWORD1>
-<KEYWORD1>LLT</KEYWORD1>
-<KEYWORD1>LOG</KEYWORD1>
-<KEYWORD1>LOG10</KEYWORD1>
-<KEYWORD1>MAX</KEYWORD1>
-<KEYWORD1>MAX0</KEYWORD1>
-<KEYWORD1>MAX1</KEYWORD1>
-<KEYWORD1>MIN</KEYWORD1>
-<KEYWORD1>MIN0</KEYWORD1>
-<KEYWORD1>MIN1</KEYWORD1>
-<KEYWORD1>MOD</KEYWORD1>
-<KEYWORD1>NINT</KEYWORD1>
-<KEYWORD1>REAL</KEYWORD1>
-<KEYWORD1>SIGN</KEYWORD1>
-<KEYWORD1>SIN</KEYWORD1>
-<KEYWORD1>SINH</KEYWORD1>
-<KEYWORD1>SNGL</KEYWORD1>
-<KEYWORD1>SQRT</KEYWORD1>
-<KEYWORD1>TAN</KEYWORD1>
-<KEYWORD1>TANH</KEYWORD1>
-<!-- logical values -->
-<KEYWORD1>.false.</KEYWORD1>
-<KEYWORD1>.true.</KEYWORD1>
-
-</KEYWORDS>
-    </RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/fortran90.xml b/qpython/src/main/assets/syntax/fortran90.xml
deleted file mode 100644
index 0a435f47..00000000
--- a/qpython/src/main/assets/syntax/fortran90.xml
+++ /dev/null
@@ -1,237 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-<!--  FORTRAN90 edit mode
-      Version 0.1
-      2008-12-08
-      suitable for jEdit 4.2final and jEdit 4.3pre16
--->
-<!-- This is a mode for FORTRAN 90/95 and newer, free-form source files.
-In general, this supports common features of the F90 specification.
--->
-<!-- Suggested catalog file entry:
-
-<MODE NAME="fortran90"		FILE="fortran90.xml"
-				FILE_NAME_GLOB="*.{f90,f95,f03}" />
- -->
-<MODE>
-    <PROPS>
-         <PROPERTY NAME="wordBreakChars" VALUE=",+-=&lt;&gt;/?^&amp;*" />
-         <PROPERTY NAME="indentNextLines" VALUE="\s*((if\s*\(.*\)\s*then|else\s*|do\s*)*)" />
-    </PROPS>
-
-    <RULES IGNORE_CASE="TRUE" HIGHLIGHT_DIGITS="FALSE">
-
-<!-- comments started by ! in free-form fortran-->
-<EOL_SPAN TYPE="COMMENT1">!</EOL_SPAN>
-
-		<SPAN TYPE="LITERAL1" NO_LINE_BREAK="FALSE">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-		<SPAN TYPE="LITERAL1" NO_LINE_BREAK="FALSE">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-
-<!-- Highlighted Operators -->
-		<SEQ TYPE="OPERATOR">&lt;=</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;=</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;</SEQ>
-		<SEQ TYPE="OPERATOR">&amp;</SEQ>
-		<SEQ TYPE="OPERATOR">/=</SEQ>
-		<SEQ TYPE="OPERATOR">==</SEQ>
-		<SEQ TYPE="OPERATOR">.lt.</SEQ>
-		<SEQ TYPE="OPERATOR">.gt.</SEQ>
-		<SEQ TYPE="OPERATOR">.eq.</SEQ>
-		<SEQ TYPE="OPERATOR">.ne.</SEQ>
-		<SEQ TYPE="OPERATOR">.le.</SEQ>
-		<SEQ TYPE="OPERATOR">.ge.</SEQ>
-		<SEQ TYPE="OPERATOR">.AND.</SEQ>
-		<SEQ TYPE="OPERATOR">.OR.</SEQ>
-
-<KEYWORDS>
-<!-- unclassified keywords -->
-<KEYWORD1>INCLUDE</KEYWORD1>
-<!-- Program units and calling them -->
-<KEYWORD1>PROGRAM</KEYWORD1>
-<KEYWORD1>MODULE</KEYWORD1>
-<KEYWORD1>SUBROUTINE</KEYWORD1>
-<KEYWORD1>FUNCTION</KEYWORD1>
-<KEYWORD1>CONTAINS</KEYWORD1>
-<KEYWORD1>USE</KEYWORD1>
-<KEYWORD1>CALL</KEYWORD1>
-<KEYWORD1>RETURN</KEYWORD1>
-<!-- data types, declaration, and allocation keywords -->
-<KEYWORD1>IMPLICIT</KEYWORD1>
-<KEYWORD1>EXPLICIT</KEYWORD1>
-<KEYWORD1>NONE</KEYWORD1>
-<KEYWORD1>DATA</KEYWORD1>
-<KEYWORD1>PARAMETER</KEYWORD1>
-<KEYWORD1>ALLOCATE</KEYWORD1>
-<KEYWORD1>ALLOCATABLE</KEYWORD1>
-<KEYWORD1>ALLOCATED</KEYWORD1>
-<KEYWORD1>DEALLOCATE</KEYWORD1>
-<KEYWORD1>INTEGER</KEYWORD1>
-<KEYWORD1>REAL</KEYWORD1>
-<KEYWORD1>DOUBLE</KEYWORD1>
-<KEYWORD1>PRECISION</KEYWORD1>
-<KEYWORD1>COMPLEX</KEYWORD1>
-<KEYWORD1>LOGICAL</KEYWORD1>
-<KEYWORD1>CHARACTER</KEYWORD1>
-<KEYWORD1>DIMENSION</KEYWORD1>
-<KEYWORD1>KIND</KEYWORD1>
-<!-- FORTRAN Statements -->
-<KEYWORD1>CASE</KEYWORD1>
-<KEYWORD1>SELECT</KEYWORD1>
-<KEYWORD1>DEFAULT</KEYWORD1>
-<KEYWORD1>CONTINUE</KEYWORD1>
-<KEYWORD1>CYCLE</KEYWORD1>
-<KEYWORD1>DO</KEYWORD1>
-<KEYWORD1>WHILE</KEYWORD1>
-<KEYWORD1>ELSE</KEYWORD1>
-<KEYWORD1>IF</KEYWORD1>
-<KEYWORD1>ELSEIF</KEYWORD1>
-<KEYWORD1>THEN</KEYWORD1>
-<KEYWORD1>ELSEWHERE</KEYWORD1>
-<KEYWORD1>END</KEYWORD1>
-<KEYWORD1>ENDIF</KEYWORD1>
-<KEYWORD1>ENDDO</KEYWORD1>
-<KEYWORD1>FORALL</KEYWORD1>
-<KEYWORD1>WHERE</KEYWORD1>
-<KEYWORD1>EXIT</KEYWORD1>
-<KEYWORD1>GOTO</KEYWORD1>
-<KEYWORD1>PAUSE</KEYWORD1>
-<KEYWORD1>STOP</KEYWORD1>
-<!-- i/o keywords -->
-<KEYWORD1>BACKSPACE</KEYWORD1>
-<KEYWORD1>CLOSE</KEYWORD1>
-<KEYWORD1>ENDFILE</KEYWORD1>
-<KEYWORD1>INQUIRE</KEYWORD1>
-<KEYWORD1>OPEN</KEYWORD1>
-<KEYWORD1>PRINT</KEYWORD1>
-<KEYWORD1>READ</KEYWORD1>
-<KEYWORD1>REWIND</KEYWORD1>
-<KEYWORD1>WRITE</KEYWORD1>
-<KEYWORD1>FORMAT</KEYWORD1>
-<!-- Type conversion and utility functions -->
-<KEYWORD1>AIMAG</KEYWORD1>
-<KEYWORD1>AINT</KEYWORD1>
-<KEYWORD1>AMAX0</KEYWORD1>
-<KEYWORD1>AMIN0</KEYWORD1>
-<KEYWORD1>ANINT</KEYWORD1>
-<KEYWORD1>CEILING</KEYWORD1>
-<KEYWORD1>CMPLX</KEYWORD1>
-<KEYWORD1>CONJG</KEYWORD1>
-<KEYWORD1>DBLE</KEYWORD1>
-<KEYWORD1>DCMPLX</KEYWORD1>
-<KEYWORD1>DFLOAT</KEYWORD1>
-<KEYWORD1>DIM</KEYWORD1>
-<KEYWORD1>DPROD</KEYWORD1>
-<KEYWORD1>FLOAT</KEYWORD1>
-<KEYWORD1>FLOOR</KEYWORD1>
-<KEYWORD1>IFIX</KEYWORD1>
-<KEYWORD1>IMAG</KEYWORD1>
-<KEYWORD1>INT</KEYWORD1>
-<KEYWORD1>LOGICAL</KEYWORD1>
-<KEYWORD1>MODULO</KEYWORD1>
-<KEYWORD1>NINT</KEYWORD1>
-<KEYWORD1>REAL</KEYWORD1>
-<KEYWORD1>SIGN</KEYWORD1>
-<KEYWORD1>SNGL</KEYWORD1>
-<KEYWORD1>TRANSFER</KEYWORD1>
-<KEYWORD1>ZEXT</KEYWORD1>
-<!-- More Functions -->
-<KEYWORD1>ABS</KEYWORD1>
-<KEYWORD1>ACOS</KEYWORD1>
-<KEYWORD1>AIMAG</KEYWORD1>
-<KEYWORD1>AINT</KEYWORD1>
-<KEYWORD1>ALOG</KEYWORD1>
-<KEYWORD1>ALOG10</KEYWORD1>
-<KEYWORD1>AMAX0</KEYWORD1>
-<KEYWORD1>AMAX1</KEYWORD1>
-<KEYWORD1>AMIN0</KEYWORD1>
-<KEYWORD1>AMIN1</KEYWORD1>
-<KEYWORD1>AMOD</KEYWORD1>
-<KEYWORD1>ANINT</KEYWORD1>
-<KEYWORD1>ASIN</KEYWORD1>
-<KEYWORD1>ATAN</KEYWORD1>
-<KEYWORD1>ATAN2</KEYWORD1>
-<KEYWORD1>CABS</KEYWORD1>
-<KEYWORD1>CCOS</KEYWORD1>
-<KEYWORD1>CHAR</KEYWORD1>
-<KEYWORD1>CLOG</KEYWORD1>
-<KEYWORD1>CMPLX</KEYWORD1>
-<KEYWORD1>CONJG</KEYWORD1>
-<KEYWORD1>COS</KEYWORD1>
-<KEYWORD1>COSH</KEYWORD1>
-<KEYWORD1>CSIN</KEYWORD1>
-<KEYWORD1>CSQRT</KEYWORD1>
-<KEYWORD1>DABS</KEYWORD1>
-<KEYWORD1>DACOS</KEYWORD1>
-<KEYWORD1>DASIN</KEYWORD1>
-<KEYWORD1>DATAN</KEYWORD1>
-<KEYWORD1>DATAN2</KEYWORD1>
-<KEYWORD1>DBLE</KEYWORD1>
-<KEYWORD1>DCOS</KEYWORD1>
-<KEYWORD1>DCOSH</KEYWORD1>
-<KEYWORD1>DDIM</KEYWORD1>
-<KEYWORD1>DEXP</KEYWORD1>
-<KEYWORD1>DIM</KEYWORD1>
-<KEYWORD1>DINT</KEYWORD1>
-<KEYWORD1>DLOG</KEYWORD1>
-<KEYWORD1>DLOG10</KEYWORD1>
-<KEYWORD1>DMAX1</KEYWORD1>
-<KEYWORD1>DMIN1</KEYWORD1>
-<KEYWORD1>DMOD</KEYWORD1>
-<KEYWORD1>DNINT</KEYWORD1>
-<KEYWORD1>DPROD</KEYWORD1>
-<KEYWORD1>DREAL</KEYWORD1>
-<KEYWORD1>DSIGN</KEYWORD1>
-<KEYWORD1>DSIN</KEYWORD1>
-<KEYWORD1>DSINH</KEYWORD1>
-<KEYWORD1>DSQRT</KEYWORD1>
-<KEYWORD1>DTAN</KEYWORD1>
-<KEYWORD1>DTANH</KEYWORD1>
-<KEYWORD1>EXP</KEYWORD1>
-<KEYWORD1>FLOAT</KEYWORD1>
-<KEYWORD1>IABS</KEYWORD1>
-<KEYWORD1>ICHAR</KEYWORD1>
-<KEYWORD1>IDIM</KEYWORD1>
-<KEYWORD1>IDINT</KEYWORD1>
-<KEYWORD1>IDNINT</KEYWORD1>
-<KEYWORD1>IFIX</KEYWORD1>
-<KEYWORD1>INDEX</KEYWORD1>
-<KEYWORD1>INT</KEYWORD1>
-<KEYWORD1>ISIGN</KEYWORD1>
-<KEYWORD1>LEN</KEYWORD1>
-<KEYWORD1>LGE</KEYWORD1>
-<KEYWORD1>LGT</KEYWORD1>
-<KEYWORD1>LLE</KEYWORD1>
-<KEYWORD1>LLT</KEYWORD1>
-<KEYWORD1>LOG</KEYWORD1>
-<KEYWORD1>LOG10</KEYWORD1>
-<KEYWORD1>MAX</KEYWORD1>
-<KEYWORD1>MAX0</KEYWORD1>
-<KEYWORD1>MAX1</KEYWORD1>
-<KEYWORD1>MIN</KEYWORD1>
-<KEYWORD1>MIN0</KEYWORD1>
-<KEYWORD1>MIN1</KEYWORD1>
-<KEYWORD1>MOD</KEYWORD1>
-<KEYWORD1>NINT</KEYWORD1>
-<KEYWORD1>REAL</KEYWORD1>
-<KEYWORD1>SIGN</KEYWORD1>
-<KEYWORD1>SIN</KEYWORD1>
-<KEYWORD1>SINH</KEYWORD1>
-<KEYWORD1>SNGL</KEYWORD1>
-<KEYWORD1>SQRT</KEYWORD1>
-<KEYWORD1>TAN</KEYWORD1>
-<KEYWORD1>TANH</KEYWORD1>
-<!-- logical values -->
-<KEYWORD1>.false.</KEYWORD1>
-<KEYWORD1>.true.</KEYWORD1>
-
-</KEYWORDS>
-    </RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/foxpro.xml b/qpython/src/main/assets/syntax/foxpro.xml
deleted file mode 100644
index 236588dc..00000000
--- a/qpython/src/main/assets/syntax/foxpro.xml
+++ /dev/null
@@ -1,1859 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<MODE>
-	<!-- Created by Matthew J. Price (Matt@SoWaky.com) -->
-	<PROPS>
-		<PROPERTY NAME="blockComment" VALUE="&amp;&amp;" />
-		<!-- Auto indent -->
-		<PROPERTY NAME="indentNextLine"
-			VALUE="\s*(((if|do\swhile|do\scase|try)\s*\(|else\s*|elseif\s*\|case|catch(|for\s*\(.*\))[^{;]*)" />
-
-		<PROPERTY NAME="lineComment" VALUE="&amp;&amp;" />
-		<PROPERTY NAME="contextInsensitive" VALUE="true"/>
-	</PROPS>
-
-	<RULES IGNORE_CASE="TRUE" HIGHLIGHT_DIGITS="TRUE">
-		<!-- String Literals -->
-		<SPAN TYPE="LITERAL1" NO_LINE_BREAK="TRUE">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-		<SPAN TYPE="LITERAL1" NO_LINE_BREAK="TRUE">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-
-		<!-- conditional compilation -->
-		<EOL_SPAN TYPE="KEYWORD2">#if</EOL_SPAN>
-		<EOL_SPAN TYPE="KEYWORD2">#else</EOL_SPAN>
-		<EOL_SPAN TYPE="KEYWORD2">#end</EOL_SPAN>
-		<EOL_SPAN TYPE="KEYWORD2">#define</EOL_SPAN>
-		<EOL_SPAN TYPE="KEYWORD2">#include</EOL_SPAN>
-		<EOL_SPAN TYPE="KEYWORD2">#Elif</EOL_SPAN>
-		<EOL_SPAN TYPE="KEYWORD2">#Else</EOL_SPAN>
-		<EOL_SPAN TYPE="KEYWORD2">#Endif</EOL_SPAN>
-		<EOL_SPAN TYPE="KEYWORD2">#If</EOL_SPAN>
-		<EOL_SPAN TYPE="KEYWORD2">#Itsexpression</EOL_SPAN>
-		<EOL_SPAN TYPE="KEYWORD2">#Readclauses</EOL_SPAN>
-		<EOL_SPAN TYPE="KEYWORD2">#Region</EOL_SPAN>
-		<EOL_SPAN TYPE="KEYWORD2">#Section</EOL_SPAN>
-		<EOL_SPAN TYPE="KEYWORD2">#Undef</EOL_SPAN>
-		<EOL_SPAN TYPE="KEYWORD2">#Wname</EOL_SPAN>
-
-		<!-- Comments -->
-		<EOL_SPAN TYPE="COMMENT1" AT_LINE_START="FALSE">&amp;&amp;</EOL_SPAN>
-		<EOL_SPAN TYPE="COMMENT1" AT_WHITESPACE_END="TRUE">*</EOL_SPAN>
-
-		<!-- Comparison operators -->
-		<SEQ TYPE="OPERATOR">&lt;</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;=</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;=</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">=</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">.</SEQ>
-		<!-- See in keywords: is -->
-
-		<!-- Arithmetic operators -->
-		<SEQ TYPE="OPERATOR">+</SEQ>
-		<SEQ TYPE="OPERATOR">-</SEQ>
-		<SEQ TYPE="OPERATOR">*</SEQ>
-		<SEQ TYPE="OPERATOR">/</SEQ>
-		<SEQ TYPE="OPERATOR">\</SEQ>
-		<!-- See in keywords: mod -->
-		<SEQ TYPE="OPERATOR">^</SEQ>
-
-		<!-- Concatenation operators -->
-		<SEQ TYPE="OPERATOR">+</SEQ>
-
-		<!-- Logical operators -->
-		<!-- See in keywords: and, or, not, xor, eqv -->
-
-		<!-- EOL Continuation -->
-		<!-- <SEQ TYPE="NULL">_</SEQ>-->
-		<!-- Instruction separator -->
-		<MARK_PREVIOUS TYPE="LABEL" MATCH_TYPE="OPERATOR"
-			AT_LINE_START="TRUE">:</MARK_PREVIOUS>
-
-		<KEYWORDS>
-			<FUNCTION>Function</FUNCTION>
-			<FUNCTION>Procedure</FUNCTION>
-			<FUNCTION>EndFunc</FUNCTION>
-			<FUNCTION>EndProc</FUNCTION>
-
-			<!-- Conditional Statements -->
-			<KEYWORD3>if</KEYWORD3>
-			<KEYWORD3>then</KEYWORD3>
-			<KEYWORD3>else</KEYWORD3>
-			<KEYWORD3>elseif</KEYWORD3>
-			<KEYWORD3>select</KEYWORD3>
-			<KEYWORD3>case</KEYWORD3>
-
-			<!-- Loop Statements -->
-			<!-- For..Next -->
-			<KEYWORD3>for</KEYWORD3>
-			<KEYWORD3>to</KEYWORD3>
-			<KEYWORD3>step</KEYWORD3>
-			<KEYWORD3>next</KEYWORD3>
-			<!-- For Each..Next -->
-			<KEYWORD3>each</KEYWORD3>
-			<KEYWORD3>in</KEYWORD3>
-			<!-- Do..Loop -->
-			<KEYWORD3>do</KEYWORD3>
-			<KEYWORD3>while</KEYWORD3>
-			<KEYWORD3>until</KEYWORD3>
-			<KEYWORD3>loop</KEYWORD3>
-			<!-- While..Wend -->
-			<KEYWORD3>wend</KEYWORD3>
-
-			<!-- Closing, Exit Statements -->
-			<KEYWORD3>exit</KEYWORD3>
-			<KEYWORD3>end</KEYWORD3>
-			<KEYWORD3>endif</KEYWORD3>
-
-			<!-- Methods, Functions, Class, Properties, Variables -->
-			<KEYWORD3>class</KEYWORD3>
-			<KEYWORD3>property</KEYWORD3>
-			<KEYWORD3>get</KEYWORD3>
-			<KEYWORD3>let</KEYWORD3>
-			<KEYWORD3>set</KEYWORD3>
-
-			<!-- Parameters passing -->
-			<KEYWORD3>byval</KEYWORD3>
-			<KEYWORD3>byref</KEYWORD3>
-
-			<!-- Declaration -->
-			<KEYWORD3>const</KEYWORD3>
-			<KEYWORD3>dim</KEYWORD3>
-			<KEYWORD3>redim</KEYWORD3>
-			<KEYWORD3>preserve</KEYWORD3>
-			<KEYWORD3>as</KEYWORD3>
-
-			<!-- Object Assignement/Instantiation -->
-			<KEYWORD3>set</KEYWORD3>
-			<KEYWORD3>with</KEYWORD3>
-			<KEYWORD3>new</KEYWORD3>
-
-			<!-- Visibility -->
-			<KEYWORD3>public</KEYWORD3>
-			<KEYWORD3>default</KEYWORD3>
-			<KEYWORD3>private</KEYWORD3>
-
-			<!-- Comments -->
-			<KEYWORD3>rem</KEYWORD3>
-
-			<!-- Function Call - Dynamic Evaluation -->
-			<KEYWORD3>call</KEYWORD3>
-			<KEYWORD3>execute</KEYWORD3>
-			<KEYWORD3>eval</KEYWORD3>
-
-			<!-- Miscellaneous -->
-			<KEYWORD3>on</KEYWORD3>
-			<KEYWORD3>error</KEYWORD3>
-			<KEYWORD3>goto</KEYWORD3>
-			<KEYWORD3>resume</KEYWORD3>
-			<KEYWORD3>option</KEYWORD3>
-			<KEYWORD3>explicit</KEYWORD3>
-			<KEYWORD3>erase</KEYWORD3>
-			<KEYWORD3>randomize</KEYWORD3>
-
-			<!-- Operators -->
-			<!-- Comparison operators -->
-			<OPERATOR>is</OPERATOR>
-			<!-- Arithmetic operators -->
-			<OPERATOR>mod</OPERATOR>
-			<!-- Logical operators -->
-			<OPERATOR>and</OPERATOR>
-			<OPERATOR>or</OPERATOR>
-			<OPERATOR>not</OPERATOR>
-			<OPERATOR>xor</OPERATOR>
-			<OPERATOR>imp</OPERATOR>
-			<OPERATOR>?</OPERATOR>
-
-			<!-- Datatypes Constants/Literals -->
-			<KEYWORD3>false</KEYWORD3>
-			<KEYWORD3>true</KEYWORD3>
-			<KEYWORD3>empty</KEYWORD3>
-			<KEYWORD3>nothing</KEYWORD3>
-			<KEYWORD3>null</KEYWORD3>
-
-			<!-- FoxPro's Methods -->
-			<KEYWORD3>Activate</KEYWORD3>
-			<KEYWORD3>ActivateCell</KEYWORD3>
-			<KEYWORD3>AddColumn</KEYWORD3>
-			<KEYWORD3>AddItem</KEYWORD3>
-			<KEYWORD3>AddListItem</KEYWORD3>
-			<KEYWORD3>AddObject</KEYWORD3>
-			<KEYWORD3>AfterCloseTables</KEYWORD3>
-			<KEYWORD3>AfterDock</KEYWORD3>
-			<KEYWORD3>AfterRowColChange</KEYWORD3>
-			<KEYWORD3>BeforeDock</KEYWORD3>
-			<KEYWORD3>BeforeOpenTables</KEYWORD3>
-			<KEYWORD3>BeforeRowColChange</KEYWORD3>
-			<KEYWORD3>Box</KEYWORD3>
-			<KEYWORD3>Circle</KEYWORD3>
-			<KEYWORD3>Clear</KEYWORD3>
-			<KEYWORD3>Click</KEYWORD3>
-			<KEYWORD3>CloneObject</KEYWORD3>
-			<KEYWORD3>CloseEditor</KEYWORD3>
-			<KEYWORD3>CloseTables</KEYWORD3>
-			<KEYWORD3>Cls</KEYWORD3>
-			<KEYWORD3>DblClick</KEYWORD3>
-			<KEYWORD3>Deactivate</KEYWORD3>
-			<KEYWORD3>Delete</KEYWORD3>
-			<KEYWORD3>DeleteColumn</KEYWORD3>
-			<KEYWORD3>Deleted</KEYWORD3>
-			<KEYWORD3>Destroy</KEYWORD3>
-			<KEYWORD3>Dock</KEYWORD3>
-			<KEYWORD3>DoScroll</KEYWORD3>
-			<KEYWORD3>DoVerb</KEYWORD3>
-			<KEYWORD3>DownClick</KEYWORD3>
-			<KEYWORD3>Drag</KEYWORD3>
-			<KEYWORD3>DragDrop</KEYWORD3>
-			<KEYWORD3>DragOver</KEYWORD3>
-			<KEYWORD3>Draw</KEYWORD3>
-			<KEYWORD3>DropDown</KEYWORD3>
-			<KEYWORD3>Error</KEYWORD3>
-			<KEYWORD3>ErrorMessage</KEYWORD3>
-			<KEYWORD3>FormatChange</KEYWORD3>
-			<KEYWORD3>GotFocus</KEYWORD3>
-			<KEYWORD3>Hide</KEYWORD3>
-			<KEYWORD3>IndexToItemId</KEYWORD3>
-			<KEYWORD3>Init</KEYWORD3>
-			<KEYWORD3>InteractiveChange</KEYWORD3>
-			<KEYWORD3>ItemIdToIndex</KEYWORD3>
-			<KEYWORD3>KeyPress</KEYWORD3>
-			<KEYWORD3>Line</KEYWORD3>
-			<KEYWORD3>Load</KEYWORD3>
-			<KEYWORD3>LostFocus</KEYWORD3>
-			<KEYWORD3>Message</KEYWORD3>
-			<KEYWORD3>MouseDown</KEYWORD3>
-			<KEYWORD3>MouseMove</KEYWORD3>
-			<KEYWORD3>MouseUp</KEYWORD3>
-			<KEYWORD3>Move</KEYWORD3>
-			<KEYWORD3>Moved</KEYWORD3>
-			<KEYWORD3>OpenEditor</KEYWORD3>
-			<KEYWORD3>OpenTables</KEYWORD3>
-			<KEYWORD3>Paint</KEYWORD3>
-			<KEYWORD3>Point</KEYWORD3>
-			<KEYWORD3>Print</KEYWORD3>
-			<KEYWORD3>ProgrammaticChange</KEYWORD3>
-			<KEYWORD3>PSet</KEYWORD3>
-			<KEYWORD3>QueryUnload</KEYWORD3>
-			<KEYWORD3>RangeHigh</KEYWORD3>
-			<KEYWORD3>RangeLow</KEYWORD3>
-			<KEYWORD3>ReadActivate</KEYWORD3>
-			<KEYWORD3>ReadDeactivate</KEYWORD3>
-			<KEYWORD3>ReadExpression</KEYWORD3>
-			<KEYWORD3>ReadMethod</KEYWORD3>
-			<KEYWORD3>ReadShow</KEYWORD3>
-			<KEYWORD3>ReadValid</KEYWORD3>
-			<KEYWORD3>ReadWhen</KEYWORD3>
-			<KEYWORD3>Refresh</KEYWORD3>
-			<KEYWORD3>Release</KEYWORD3>
-			<KEYWORD3>RemoveItem</KEYWORD3>
-			<KEYWORD3>RemoveListItem</KEYWORD3>
-			<KEYWORD3>RemoveObject</KEYWORD3>
-			<KEYWORD3>Requery</KEYWORD3>
-			<KEYWORD3>Reset</KEYWORD3>
-			<KEYWORD3>Resize</KEYWORD3>
-			<KEYWORD3>RightClick</KEYWORD3>
-			<KEYWORD3>SaveAs</KEYWORD3>
-			<KEYWORD3>SaveAsClass</KEYWORD3>
-			<KEYWORD3>Scrolled</KEYWORD3>
-			<KEYWORD3>SetAll</KEYWORD3>
-			<KEYWORD3>SetFocus</KEYWORD3>
-			<KEYWORD3>Show</KEYWORD3>
-			<KEYWORD3>TextHeight</KEYWORD3>
-			<KEYWORD3>TextWidth</KEYWORD3>
-			<KEYWORD3>Timer</KEYWORD3>
-			<KEYWORD3>UIEnable</KEYWORD3>
-			<KEYWORD3>UnDock</KEYWORD3>
-			<KEYWORD3>Unload</KEYWORD3>
-			<KEYWORD3>UpClick</KEYWORD3>
-			<KEYWORD3>Valid</KEYWORD3>
-			<KEYWORD3>When</KEYWORD3>
-			<KEYWORD3>WriteExpression</KEYWORD3>
-			<KEYWORD3>WriteMethod</KEYWORD3>
-			<KEYWORD3>ZOrder</KEYWORD3>
-			<KEYWORD3>DataToClip</KEYWORD3>
-			<KEYWORD3>DoCmd</KEYWORD3>
-			<KEYWORD3>MiddleClick</KEYWORD3>
-			<KEYWORD3>MouseWheel</KEYWORD3>
-			<KEYWORD3>RequestData</KEYWORD3>
-			<KEYWORD3>SetVar</KEYWORD3>
-			<KEYWORD3>ShowWhatsThis</KEYWORD3>
-			<KEYWORD3>WhatsThisMode</KEYWORD3>
-			<KEYWORD3>AddProperty</KEYWORD3>
-			<KEYWORD3>NewObject</KEYWORD3>
-			<KEYWORD3>CommandTargetExec</KEYWORD3>
-			<KEYWORD3>CommandTargetQueryStas</KEYWORD3>
-			<KEYWORD3>ContainerRelease</KEYWORD3>
-			<KEYWORD3>EnterFocus</KEYWORD3>
-			<KEYWORD3>ExitFocus</KEYWORD3>
-			<KEYWORD3>HideDoc</KEYWORD3>
-			<KEYWORD3>Run</KEYWORD3>
-			<KEYWORD3>ShowDoc</KEYWORD3>
-			<KEYWORD3>ClearData</KEYWORD3>
-			<KEYWORD3>GetData</KEYWORD3>
-			<KEYWORD3>GetFormat</KEYWORD3>
-			<KEYWORD3>SetData</KEYWORD3>
-			<KEYWORD3>SetFormat</KEYWORD3>
-			<KEYWORD3>OLECompleteDrag</KEYWORD3>
-			<KEYWORD3>OLEGiveFeedback</KEYWORD3>
-			<KEYWORD3>OLESetData</KEYWORD3>
-			<KEYWORD3>OLEStartDrag</KEYWORD3>
-			<KEYWORD3>OLEDrag</KEYWORD3>
-			<KEYWORD3>OLEDragDrop</KEYWORD3>
-			<KEYWORD3>OLEDragOver</KEYWORD3>
-			<KEYWORD3>SetMain</KEYWORD3>
-			<KEYWORD3>AfterBuild</KEYWORD3>
-			<KEYWORD3>BeforeBuild</KEYWORD3>
-			<KEYWORD3>QueryAddFile</KEYWORD3>
-			<KEYWORD3>QueryModifyFile</KEYWORD3>
-			<KEYWORD3>QueryRemoveFile</KEYWORD3>
-			<KEYWORD3>QueryRunFile</KEYWORD3>
-			<KEYWORD3>Add</KEYWORD3>
-			<KEYWORD3>AddToSCC</KEYWORD3>
-			<KEYWORD3>CheckIn</KEYWORD3>
-			<KEYWORD3>CheckOut</KEYWORD3>
-			<KEYWORD3>GetLatestVersion</KEYWORD3>
-			<KEYWORD3>RemoveFromSCC</KEYWORD3>
-			<KEYWORD3>UndoCheckOut</KEYWORD3>
-			<KEYWORD3>Modify</KEYWORD3>
-
-			<!-- FoxPro's Properties -->
-			<KEYWORD3>Accelerate</KEYWORD3>
-			<KEYWORD3>ActiveColumn</KEYWORD3>
-			<KEYWORD3>ActiveControl</KEYWORD3>
-			<KEYWORD3>ActiveForm</KEYWORD3>
-			<KEYWORD3>ActiveObjectId</KEYWORD3>
-			<KEYWORD3>ActivePage</KEYWORD3>
-			<KEYWORD3>ActiveRow</KEYWORD3>
-			<KEYWORD3>Alias</KEYWORD3>
-			<KEYWORD3>Alignment</KEYWORD3>
-			<KEYWORD3>AllowResize</KEYWORD3>
-			<KEYWORD3>AllowTabs</KEYWORD3>
-			<KEYWORD3>AlwaysOnTop</KEYWORD3>
-			<KEYWORD3>ATGetColors</KEYWORD3>
-			<KEYWORD3>ATListColors</KEYWORD3>
-			<KEYWORD3>AutoActivate</KEYWORD3>
-			<KEYWORD3>AutoCenter</KEYWORD3>
-			<KEYWORD3>AutoCloseTables</KEYWORD3>
-			<KEYWORD3>AutoOpenTables</KEYWORD3>
-			<KEYWORD3>AutoRelease</KEYWORD3>
-			<KEYWORD3>AutoSize</KEYWORD3>
-			<KEYWORD3>AvailNum</KEYWORD3>
-			<KEYWORD3>BackColor</KEYWORD3>
-			<KEYWORD3>BackStyle</KEYWORD3>
-			<KEYWORD3>BaseClass</KEYWORD3>
-			<KEYWORD3>BorderColor</KEYWORD3>
-			<KEYWORD3>BorderStyle</KEYWORD3>
-			<KEYWORD3>BorderWidth</KEYWORD3>
-			<KEYWORD3>Bound</KEYWORD3>
-			<KEYWORD3>BoundColumn</KEYWORD3>
-			<KEYWORD3>BrowseAlignment</KEYWORD3>
-			<KEYWORD3>BrowseCellMarg</KEYWORD3>
-			<KEYWORD3>BrowseDestWidth</KEYWORD3>
-			<KEYWORD3>BufferMode</KEYWORD3>
-			<KEYWORD3>BufferModeOverride</KEYWORD3>
-			<KEYWORD3>ButtonCount</KEYWORD3>
-			<KEYWORD3>ButtonIndex</KEYWORD3>
-			<KEYWORD3>Buttons</KEYWORD3>
-			<KEYWORD3>CanAccelerate</KEYWORD3>
-			<KEYWORD3>Cancel</KEYWORD3>
-			<KEYWORD3>CanGetFocus</KEYWORD3>
-			<KEYWORD3>CanLoseFocus</KEYWORD3>
-			<KEYWORD3>Caption</KEYWORD3>
-			<KEYWORD3>ChildAlias</KEYWORD3>
-			<KEYWORD3>ChildOrder</KEYWORD3>
-			<KEYWORD3>Class</KEYWORD3>
-			<KEYWORD3>ClassLibrary</KEYWORD3>
-			<KEYWORD3>ClipControls</KEYWORD3>
-			<KEYWORD3>ClipRect</KEYWORD3>
-			<KEYWORD3>Closable</KEYWORD3>
-			<KEYWORD3>ColorScheme</KEYWORD3>
-			<KEYWORD3>ColorSource</KEYWORD3>
-			<KEYWORD3>ColumnCount</KEYWORD3>
-			<KEYWORD3>ColumnHeaders</KEYWORD3>
-			<KEYWORD3>ColumnLines</KEYWORD3>
-			<KEYWORD3>ColumnOrder</KEYWORD3>
-			<KEYWORD3>Columns</KEYWORD3>
-			<KEYWORD3>ColumnWidths</KEYWORD3>
-			<KEYWORD3>Comment</KEYWORD3>
-			<KEYWORD3>ControlBox</KEYWORD3>
-			<KEYWORD3>ControlCount</KEYWORD3>
-			<KEYWORD3>ControlIndex</KEYWORD3>
-			<KEYWORD3>Controls</KEYWORD3>
-			<KEYWORD3>ControlSource</KEYWORD3>
-			<KEYWORD3>CurrentControl</KEYWORD3>
-			<KEYWORD3>CurrentX</KEYWORD3>
-			<KEYWORD3>CurrentY</KEYWORD3>
-			<KEYWORD3>CursorSource</KEYWORD3>
-			<KEYWORD3>Curvature</KEYWORD3>
-			<KEYWORD3>Database</KEYWORD3>
-			<KEYWORD3>DataSession</KEYWORD3>
-			<KEYWORD3>DataSessionId</KEYWORD3>
-			<KEYWORD3>DataSourceObj</KEYWORD3>
-			<KEYWORD3>DataType</KEYWORD3>
-			<KEYWORD3>Default</KEYWORD3>
-			<KEYWORD3>DefButton</KEYWORD3>
-			<KEYWORD3>DefButtonOrig</KEYWORD3>
-			<KEYWORD3>DefHeight</KEYWORD3>
-			<KEYWORD3>DefineWindows</KEYWORD3>
-			<KEYWORD3>DefLeft</KEYWORD3>
-			<KEYWORD3>DefTop</KEYWORD3>
-			<KEYWORD3>DefWidth</KEYWORD3>
-			<KEYWORD3>DeleteMark</KEYWORD3>
-			<KEYWORD3>Desktop</KEYWORD3>
-			<KEYWORD3>Dirty</KEYWORD3>
-			<KEYWORD3>DisabledBackColor</KEYWORD3>
-			<KEYWORD3>DisabledByEOF</KEYWORD3>
-			<KEYWORD3>DisabledForeColor</KEYWORD3>
-			<KEYWORD3>DisabledItemBackColor</KEYWORD3>
-			<KEYWORD3>DisabledItemForeColor</KEYWORD3>
-			<KEYWORD3>DisabledPicture</KEYWORD3>
-			<KEYWORD3>DisplayValue</KEYWORD3>
-			<KEYWORD3>DispPageHeight</KEYWORD3>
-			<KEYWORD3>DispPageWidth</KEYWORD3>
-			<KEYWORD3>Docked</KEYWORD3>
-			<KEYWORD3>DockPosition</KEYWORD3>
-			<KEYWORD3>DoCreate</KEYWORD3>
-			<KEYWORD3>DocumentFile</KEYWORD3>
-			<KEYWORD3>DownPicture</KEYWORD3>
-			<KEYWORD3>DragIcon</KEYWORD3>
-			<KEYWORD3>DragMode</KEYWORD3>
-			<KEYWORD3>DragState</KEYWORD3>
-			<KEYWORD3>DrawMode</KEYWORD3>
-			<KEYWORD3>DrawStyle</KEYWORD3>
-			<KEYWORD3>DrawWidth</KEYWORD3>
-			<KEYWORD3>DynamicAlignment</KEYWORD3>
-			<KEYWORD3>DynamicBackColor</KEYWORD3>
-			<KEYWORD3>DynamicCurrentControl</KEYWORD3>
-			<KEYWORD3>DynamicFontBold</KEYWORD3>
-			<KEYWORD3>DynamicFontItalic</KEYWORD3>
-			<KEYWORD3>DynamicFontName</KEYWORD3>
-			<KEYWORD3>DynamicFontOutline</KEYWORD3>
-			<KEYWORD3>DynamicFontShadow</KEYWORD3>
-			<KEYWORD3>DynamicFontSize</KEYWORD3>
-			<KEYWORD3>DynamicFontStrikethru</KEYWORD3>
-			<KEYWORD3>DynamicFontUnderline</KEYWORD3>
-			<KEYWORD3>DynamicForeColor</KEYWORD3>
-			<KEYWORD3>EditFlags</KEYWORD3>
-			<KEYWORD3>Enabled</KEYWORD3>
-			<KEYWORD3>EnabledByReadLock</KEYWORD3>
-			<KEYWORD3>EnvLevel</KEYWORD3>
-			<KEYWORD3>ErasePage</KEYWORD3>
-			<KEYWORD3>FillColor</KEYWORD3>
-			<KEYWORD3>FillStyle</KEYWORD3>
-			<KEYWORD3>Filter</KEYWORD3>
-			<KEYWORD3>FirstElement</KEYWORD3>
-			<KEYWORD3>FontBold</KEYWORD3>
-			<KEYWORD3>FontItalic</KEYWORD3>
-			<KEYWORD3>FontName</KEYWORD3>
-			<KEYWORD3>FontOutline</KEYWORD3>
-			<KEYWORD3>FontShadow</KEYWORD3>
-			<KEYWORD3>FontSize</KEYWORD3>
-			<KEYWORD3>FontStrikethru</KEYWORD3>
-			<KEYWORD3>FontUnderline</KEYWORD3>
-			<KEYWORD3>ForceFocus</KEYWORD3>
-			<KEYWORD3>ForeColor</KEYWORD3>
-			<KEYWORD3>Format</KEYWORD3>
-			<KEYWORD3>FormCount</KEYWORD3>
-			<KEYWORD3>FormIndex</KEYWORD3>
-			<KEYWORD3>FormPageCount</KEYWORD3>
-			<KEYWORD3>FormPageIndex</KEYWORD3>
-			<KEYWORD3>Forms</KEYWORD3>
-			<KEYWORD3>FoxFont</KEYWORD3>
-			<KEYWORD3>GoFirst</KEYWORD3>
-			<KEYWORD3>GoLast</KEYWORD3>
-			<KEYWORD3>GridLineColor</KEYWORD3>
-			<KEYWORD3>GridLines</KEYWORD3>
-			<KEYWORD3>GridLineWidth</KEYWORD3>
-			<KEYWORD3>HalfHeightCaption</KEYWORD3>
-			<KEYWORD3>HasClip</KEYWORD3>
-			<KEYWORD3>HeaderGap</KEYWORD3>
-			<KEYWORD3>HeaderHeight</KEYWORD3>
-			<KEYWORD3>Height</KEYWORD3>
-			<KEYWORD3>HelpContextID</KEYWORD3>
-			<KEYWORD3>HideSelection</KEYWORD3>
-			<KEYWORD3>Highlight</KEYWORD3>
-			<KEYWORD3>HostName</KEYWORD3>
-			<KEYWORD3>HotKey</KEYWORD3>
-			<KEYWORD3>HPROJ</KEYWORD3>
-			<KEYWORD3>HWnd</KEYWORD3>
-			<KEYWORD3>Icon</KEYWORD3>
-			<KEYWORD3>IgnoreInsert</KEYWORD3>
-			<KEYWORD3>Increment</KEYWORD3>
-			<KEYWORD3>IncrementalSearch</KEYWORD3>
-			<KEYWORD3>InitialSelectedAlias</KEYWORD3>
-			<KEYWORD3>InputMask</KEYWORD3>
-			<KEYWORD3>InResize</KEYWORD3>
-			<KEYWORD3>Interval</KEYWORD3>
-			<KEYWORD3>ItemBackColor</KEYWORD3>
-			<KEYWORD3>ItemData</KEYWORD3>
-			<KEYWORD3>ItemForeColor</KEYWORD3>
-			<KEYWORD3>ItemIDData</KEYWORD3>
-			<KEYWORD3>JustReadLocked</KEYWORD3>
-			<KEYWORD3>KeyboardHighValue</KEYWORD3>
-			<KEYWORD3>KeyboardLowValue</KEYWORD3>
-			<KEYWORD3>KeyPreview</KEYWORD3>
-			<KEYWORD3>Left</KEYWORD3>
-			<KEYWORD3>LeftColumn</KEYWORD3>
-			<KEYWORD3>LineSlant</KEYWORD3>
-			<KEYWORD3>LinkMaster</KEYWORD3>
-			<KEYWORD3>List</KEYWORD3>
-			<KEYWORD3>ListCount</KEYWORD3>
-			<KEYWORD3>ListIndex</KEYWORD3>
-			<KEYWORD3>ListItem</KEYWORD3>
-			<KEYWORD3>ListItemId</KEYWORD3>
-			<KEYWORD3>LockDataSource</KEYWORD3>
-			<KEYWORD3>LockScreen</KEYWORD3>
-			<KEYWORD3>Margin</KEYWORD3>
-			<KEYWORD3>MaxButton</KEYWORD3>
-			<KEYWORD3>MaxHeight</KEYWORD3>
-			<KEYWORD3>MaxLeft</KEYWORD3>
-			<KEYWORD3>MaxLength</KEYWORD3>
-			<KEYWORD3>MaxTop</KEYWORD3>
-			<KEYWORD3>MaxWidth</KEYWORD3>
-			<KEYWORD3>MDIForm</KEYWORD3>
-			<KEYWORD3>MemoWindow</KEYWORD3>
-			<KEYWORD3>MinButton</KEYWORD3>
-			<KEYWORD3>MinHeight</KEYWORD3>
-			<KEYWORD3>MinWidth</KEYWORD3>
-			<KEYWORD3>MousePointer</KEYWORD3>
-			<KEYWORD3>Movable</KEYWORD3>
-			<KEYWORD3>MoverBars</KEYWORD3>
-			<KEYWORD3>MultiSelect</KEYWORD3>
-			<KEYWORD3>Name</KEYWORD3>
-			<KEYWORD3>NapTime</KEYWORD3>
-			<KEYWORD3>NewIndex</KEYWORD3>
-			<KEYWORD3>NewItemId</KEYWORD3>
-			<KEYWORD3>NoDataOnLoad</KEYWORD3>
-			<KEYWORD3>NoDefine</KEYWORD3>
-			<KEYWORD3>NotifyContainer</KEYWORD3>
-			<KEYWORD3>NumberOfElements</KEYWORD3>
-			<KEYWORD3>OleClass</KEYWORD3>
-			<KEYWORD3>OleClassId</KEYWORD3>
-			<KEYWORD3>OleControlContainer</KEYWORD3>
-			<KEYWORD3>OleIDispatchIncoming</KEYWORD3>
-			<KEYWORD3>OleIDispatchOutgoing</KEYWORD3>
-			<KEYWORD3>OleIDispInValue</KEYWORD3>
-			<KEYWORD3>OleIDispOutValue</KEYWORD3>
-			<KEYWORD3>OLETypeAllowed</KEYWORD3>
-			<KEYWORD3>OneToMany</KEYWORD3>
-			<KEYWORD3>OnResize</KEYWORD3>
-			<KEYWORD3>OpenWindow</KEYWORD3>
-			<KEYWORD3>PageCount</KEYWORD3>
-			<KEYWORD3>PageHeight</KEYWORD3>
-			<KEYWORD3>PageOrder</KEYWORD3>
-			<KEYWORD3>Pages</KEYWORD3>
-			<KEYWORD3>PageWidth</KEYWORD3>
-			<KEYWORD3>Panel</KEYWORD3>
-			<KEYWORD3>PanelLink</KEYWORD3>
-			<KEYWORD3>Parent</KEYWORD3>
-			<KEYWORD3>ParentAlias</KEYWORD3>
-			<KEYWORD3>ParentClass</KEYWORD3>
-			<KEYWORD3>Partition</KEYWORD3>
-			<KEYWORD3>PasswordChar</KEYWORD3>
-			<KEYWORD3>Picture</KEYWORD3>
-			<KEYWORD3>ReadColors</KEYWORD3>
-			<KEYWORD3>ReadCycle</KEYWORD3>
-			<KEYWORD3>ReadFiller</KEYWORD3>
-			<KEYWORD3>ReadLock</KEYWORD3>
-			<KEYWORD3>ReadMouse</KEYWORD3>
-			<KEYWORD3>ReadOnly</KEYWORD3>
-			<KEYWORD3>ReadSave</KEYWORD3>
-			<KEYWORD3>ReadSize</KEYWORD3>
-			<KEYWORD3>ReadTimeout</KEYWORD3>
-			<KEYWORD3>RecordMark</KEYWORD3>
-			<KEYWORD3>RecordSource</KEYWORD3>
-			<KEYWORD3>RecordSourceType</KEYWORD3>
-			<KEYWORD3>Rect</KEYWORD3>
-			<KEYWORD3>RelationalExpr</KEYWORD3>
-			<KEYWORD3>RelativeColumn</KEYWORD3>
-			<KEYWORD3>RelativeRow</KEYWORD3>
-			<KEYWORD3>ReleaseErase</KEYWORD3>
-			<KEYWORD3>ReleaseType</KEYWORD3>
-			<KEYWORD3>ReleaseWindows</KEYWORD3>
-			<KEYWORD3>Resizable</KEYWORD3>
-			<KEYWORD3>RowHeight</KEYWORD3>
-			<KEYWORD3>RowSource</KEYWORD3>
-			<KEYWORD3>RowSourceType</KEYWORD3>
-			<KEYWORD3>ScaleMode</KEYWORD3>
-			<KEYWORD3>ScrollBars</KEYWORD3>
-			<KEYWORD3>Selected</KEYWORD3>
-			<KEYWORD3>SelectedBackColor</KEYWORD3>
-			<KEYWORD3>SelectedForeColor</KEYWORD3>
-			<KEYWORD3>SelectedID</KEYWORD3>
-			<KEYWORD3>SelectedItemBackColor</KEYWORD3>
-			<KEYWORD3>SelectedItemForeColor</KEYWORD3>
-			<KEYWORD3>SelectOnEntry</KEYWORD3>
-			<KEYWORD3>SelfEdit</KEYWORD3>
-			<KEYWORD3>SelLength</KEYWORD3>
-			<KEYWORD3>SelStart</KEYWORD3>
-			<KEYWORD3>SelText</KEYWORD3>
-			<KEYWORD3>ShowTips</KEYWORD3>
-			<KEYWORD3>Sizable</KEYWORD3>
-			<KEYWORD3>Skip</KEYWORD3>
-			<KEYWORD3>SkipForm</KEYWORD3>
-			<KEYWORD3>Sorted</KEYWORD3>
-			<KEYWORD3>SourceType</KEYWORD3>
-			<KEYWORD3>Sparse</KEYWORD3>
-			<KEYWORD3>SpecialEffect</KEYWORD3>
-			<KEYWORD3>SpinnerHighValue</KEYWORD3>
-			<KEYWORD3>SpinnerLowValue</KEYWORD3>
-			<KEYWORD3>StatusBarText</KEYWORD3>
-			<KEYWORD3>Stretch</KEYWORD3>
-			<KEYWORD3>Style</KEYWORD3>
-			<KEYWORD3>SystemRefCount</KEYWORD3>
-			<KEYWORD3>Tabhit</KEYWORD3>
-			<KEYWORD3>TabIndex</KEYWORD3>
-			<KEYWORD3>Tabs</KEYWORD3>
-			<KEYWORD3>TabStop</KEYWORD3>
-			<KEYWORD3>TabStretch</KEYWORD3>
-			<KEYWORD3>Tag</KEYWORD3>
-			<KEYWORD3>TerminateRead</KEYWORD3>
-			<KEYWORD3>ToolTipText</KEYWORD3>
-			<KEYWORD3>Top</KEYWORD3>
-			<KEYWORD3>TopIndex</KEYWORD3>
-			<KEYWORD3>TopItemId</KEYWORD3>
-			<KEYWORD3>UnlockDataSource</KEYWORD3>
-			<KEYWORD3>Value</KEYWORD3>
-			<KEYWORD3>ValueDirty</KEYWORD3>
-			<KEYWORD3>View</KEYWORD3>
-			<KEYWORD3>Visible</KEYWORD3>
-			<KEYWORD3>WasActive</KEYWORD3>
-			<KEYWORD3>WasOpen</KEYWORD3>
-			<KEYWORD3>Width</KEYWORD3>
-			<KEYWORD3>WindowList</KEYWORD3>
-			<KEYWORD3>WindowNTIList</KEYWORD3>
-			<KEYWORD3>WindowState</KEYWORD3>
-			<KEYWORD3>WindowType</KEYWORD3>
-			<KEYWORD3>WordWrap</KEYWORD3>
-			<KEYWORD3>ZOrderSet</KEYWORD3>
-			<KEYWORD3>AllowAddNew</KEYWORD3>
-			<KEYWORD3>AllowHeaderSizing</KEYWORD3>
-			<KEYWORD3>AllowRowSizing</KEYWORD3>
-			<KEYWORD3>Application</KEYWORD3>
-			<KEYWORD3>AutoVerbMenu</KEYWORD3>
-			<KEYWORD3>AutoYield</KEYWORD3>
-			<KEYWORD3>BoundTo</KEYWORD3>
-			<KEYWORD3>DateFormat</KEYWORD3>
-			<KEYWORD3>DateMark</KEYWORD3>
-			<KEYWORD3>DefaultFilePath</KEYWORD3>
-			<KEYWORD3>FullName</KEYWORD3>
-			<KEYWORD3>Hours</KEYWORD3>
-			<KEYWORD3>IMEMode</KEYWORD3>
-			<KEYWORD3>IntegralHeight</KEYWORD3>
-			<KEYWORD3>ItemTips</KEYWORD3>
-			<KEYWORD3>MouseIcon</KEYWORD3>
-			<KEYWORD3>NullDisplay</KEYWORD3>
-			<KEYWORD3>OLERequestPendingTimou</KEYWORD3>
-			<KEYWORD3>OLEServerBusyRaiseErro</KEYWORD3>
-			<KEYWORD3>OLEServerBusyTimout</KEYWORD3>
-			<KEYWORD3>OpenViews</KEYWORD3>
-			<KEYWORD3>RightToLeft</KEYWORD3>
-			<KEYWORD3>SDIForm</KEYWORD3>
-			<KEYWORD3>ShowWindow</KEYWORD3>
-			<KEYWORD3>SplitBar</KEYWORD3>
-			<KEYWORD3>StrictDateEntry</KEYWORD3>
-			<KEYWORD3>TabStyle</KEYWORD3>
-			<KEYWORD3>WhatsThisButton</KEYWORD3>
-			<KEYWORD3>WhatsThisHelp</KEYWORD3>
-			<KEYWORD3>WhatsThisHelpID</KEYWORD3>
-			<KEYWORD3>DisplayCount</KEYWORD3>
-			<KEYWORD3>ContinuousScroll</KEYWORD3>
-			<KEYWORD3>HscrollSmallChange</KEYWORD3>
-			<KEYWORD3>TitleBar</KEYWORD3>
-			<KEYWORD3>VscrollSmallChange</KEYWORD3>
-			<KEYWORD3>ViewPortTop</KEYWORD3>
-			<KEYWORD3>ViewPortLeft</KEYWORD3>
-			<KEYWORD3>ViewPortHeight</KEYWORD3>
-			<KEYWORD3>ViewPortWidth</KEYWORD3>
-			<KEYWORD3>SetViewPort</KEYWORD3>
-			<KEYWORD3>Scrolled</KEYWORD3>
-			<KEYWORD3>StartMode</KEYWORD3>
-			<KEYWORD3>ServerName</KEYWORD3>
-			<KEYWORD3>OLEDragMode</KEYWORD3>
-			<KEYWORD3>OLEDragPicture</KEYWORD3>
-			<KEYWORD3>OLEDropEffects</KEYWORD3>
-			<KEYWORD3>OLEDropHasData</KEYWORD3>
-			<KEYWORD3>OLEDropMode</KEYWORD3>
-			<KEYWORD3>ActiveProject</KEYWORD3>
-			<KEYWORD3>Projects</KEYWORD3>
-			<KEYWORD3>AutoIncrement</KEYWORD3>
-			<KEYWORD3>BuildDateTime</KEYWORD3>
-			<KEYWORD3>Debug</KEYWORD3>
-			<KEYWORD3>Encrypted</KEYWORD3>
-			<KEYWORD3>Files</KEYWORD3>
-			<KEYWORD3>HomeDir</KEYWORD3>
-			<KEYWORD3>MainClass</KEYWORD3>
-			<KEYWORD3>MainFile</KEYWORD3>
-			<KEYWORD3>ProjectHookClass</KEYWORD3>
-			<KEYWORD3>ProjectHookLibrary</KEYWORD3>
-			<KEYWORD3>SCCProvider</KEYWORD3>
-			<KEYWORD3>ServerHelpFile</KEYWORD3>
-			<KEYWORD3>ServerProject</KEYWORD3>
-			<KEYWORD3>TypeLibCLSID</KEYWORD3>
-			<KEYWORD3>TypeLibDesc</KEYWORD3>
-			<KEYWORD3>TypeLibName</KEYWORD3>
-			<KEYWORD3>VersionComments</KEYWORD3>
-			<KEYWORD3>VersionCompany</KEYWORD3>
-			<KEYWORD3>VersionCopyright</KEYWORD3>
-			<KEYWORD3>VersionDescription</KEYWORD3>
-			<KEYWORD3>VersionNumber</KEYWORD3>
-			<KEYWORD3>VersionProduct</KEYWORD3>
-			<KEYWORD3>VersionTrademarks</KEYWORD3>
-			<KEYWORD3>Item</KEYWORD3>
-			<KEYWORD3>CodePage</KEYWORD3>
-			<KEYWORD3>Description</KEYWORD3>
-			<KEYWORD3>FileClass</KEYWORD3>
-			<KEYWORD3>FileClassLibrary</KEYWORD3>
-			<KEYWORD3>LastModified</KEYWORD3>
-			<KEYWORD3>SCCStatus</KEYWORD3>
-			<KEYWORD3>CLSID</KEYWORD3>
-			<KEYWORD3>Instancing</KEYWORD3>
-			<KEYWORD3>ProgID</KEYWORD3>
-			<KEYWORD3>ServerClass</KEYWORD3>
-			<KEYWORD3>ServerClassLibrary</KEYWORD3>
-			<KEYWORD3>ThreadID</KEYWORD3>
-			<KEYWORD3>ProcessID</KEYWORD3>
-			<KEYWORD3>AddLineFeeds</KEYWORD3>
-
-			<!-- Other FoxPro's Keywords -->
-			<KEYWORD3>MULTILOCKS</KEYWORD3>
-			<KEYWORD3>FULLPATH</KEYWORD3>
-			<KEYWORD3>UNIQUE</KEYWORD3>
-			<KEYWORD3>CLASSLIB</KEYWORD3>
-			<KEYWORD3>LIBRARY</KEYWORD3>
-			<KEYWORD3>structure</KEYWORD3>
-			<KEYWORD3>last</KEYWORD3>
-			<KEYWORD3>production</KEYWORD3>
-			<KEYWORD3>path</KEYWORD3>
-			<KEYWORD3>date</KEYWORD3>
-			<KEYWORD3>datetime</KEYWORD3>
-			<KEYWORD3>rest</KEYWORD3>
-			<KEYWORD3>fields</KEYWORD3>
-			<KEYWORD3>array</KEYWORD3>
-			<KEYWORD3>free</KEYWORD3>
-			<KEYWORD3>structure</KEYWORD3>
-			<KEYWORD3>ASCENDING</KEYWORD3>
-			<KEYWORD3>window</KEYWORD3>
-			<KEYWORD3>nowait</KEYWORD3>
-			<KEYWORD3>between</KEYWORD3>
-			<KEYWORD3>dbf</KEYWORD3>
-			<KEYWORD3>noconsole</KEYWORD3>
-			<KEYWORD3>dif</KEYWORD3>
-			<KEYWORD3>xls</KEYWORD3>
-			<KEYWORD3>csv</KEYWORD3>
-			<KEYWORD3>delimited</KEYWORD3>
-			<KEYWORD3>right</KEYWORD3>
-			<KEYWORD3>decimal</KEYWORD3>
-			<KEYWORD3>additive</KEYWORD3>
-			<KEYWORD3>between</KEYWORD3>
-			<KEYWORD3>noupdate</KEYWORD3>
-
-			<KEYWORD3>Abs</KEYWORD3>
-			<KEYWORD3>Accept</KEYWORD3>
-			<KEYWORD3>Access</KEYWORD3>
-			<KEYWORD3>Aclass</KEYWORD3>
-			<KEYWORD3>Acopy</KEYWORD3>
-			<KEYWORD3>Acos</KEYWORD3>
-			<KEYWORD3>Adatabases</KEYWORD3>
-			<KEYWORD3>Adbobjects</KEYWORD3>
-			<KEYWORD3>Add</KEYWORD3>
-			<KEYWORD3>Addrelationtoenv</KEYWORD3>
-			<KEYWORD3>Addtabletoenv</KEYWORD3>
-			<KEYWORD3>Adel</KEYWORD3>
-			<KEYWORD3>Adir</KEYWORD3>
-			<KEYWORD3>Aelement</KEYWORD3>
-			<KEYWORD3>Aerror</KEYWORD3>
-			<KEYWORD3>Afields</KEYWORD3>
-			<KEYWORD3>Afont</KEYWORD3>
-			<KEYWORD3>Again</KEYWORD3>
-			<KEYWORD3>Ains</KEYWORD3>
-			<KEYWORD3>Ainstance</KEYWORD3>
-			<KEYWORD3>Alen</KEYWORD3>
-			<KEYWORD3>All</KEYWORD3>
-			<KEYWORD3>Alltrim</KEYWORD3>
-			<KEYWORD3>Alter</KEYWORD3>
-			<KEYWORD3>Amembers</KEYWORD3>
-			<KEYWORD3>Ansitooem</KEYWORD3>
-			<KEYWORD3>Append</KEYWORD3>
-			<KEYWORD3>Aprinters</KEYWORD3>
-			<KEYWORD3>Ascan</KEYWORD3>
-			<KEYWORD3>Aselobj</KEYWORD3>
-			<KEYWORD3>Asin</KEYWORD3>
-			<KEYWORD3>Asort</KEYWORD3>
-			<KEYWORD3>Assist</KEYWORD3>
-			<KEYWORD3>Asubscript</KEYWORD3>
-			<KEYWORD3>Asynchronous</KEYWORD3>
-			<KEYWORD3>Atan</KEYWORD3>
-			<KEYWORD3>Atc</KEYWORD3>
-			<KEYWORD3>Atcline</KEYWORD3>
-			<KEYWORD3>Atline</KEYWORD3>
-			<KEYWORD3>Atn2</KEYWORD3>
-			<KEYWORD3>Aused</KEYWORD3>
-			<KEYWORD3>Autoform</KEYWORD3>
-			<KEYWORD3>Autoreport</KEYWORD3>
-			<KEYWORD3>Average</KEYWORD3>
-			<KEYWORD3>Bar</KEYWORD3>
-			<KEYWORD3>BatchMode</KEYWORD3>
-			<KEYWORD3>BatchUpdateCount</KEYWORD3>
-			<KEYWORD3>Begin</KEYWORD3>
-			<KEYWORD3>Bell</KEYWORD3>
-			<KEYWORD3>BellSound</KEYWORD3>
-			<KEYWORD3>Bitand</KEYWORD3>
-			<KEYWORD3>Bitclear</KEYWORD3>
-			<KEYWORD3>Bitlshift</KEYWORD3>
-			<KEYWORD3>Bitnot</KEYWORD3>
-			<KEYWORD3>Bitor</KEYWORD3>
-			<KEYWORD3>Bitrshift</KEYWORD3>
-			<KEYWORD3>Bitset</KEYWORD3>
-			<KEYWORD3>Bittest</KEYWORD3>
-			<KEYWORD3>Bitxor</KEYWORD3>
-			<KEYWORD3>Bof</KEYWORD3>
-			<KEYWORD3>Bottom</KEYWORD3>
-			<KEYWORD3>Browse</KEYWORD3>
-			<KEYWORD3>BrowseRefresh</KEYWORD3>
-			<KEYWORD3>Buffering</KEYWORD3>
-			<KEYWORD3>Build</KEYWORD3>
-			<KEYWORD3>BuilderLock</KEYWORD3>
-			<KEYWORD3>By</KEYWORD3>
-			<KEYWORD3>Calculate</KEYWORD3>
-			<KEYWORD3>Call</KEYWORD3>
-			<KEYWORD3>Capslock</KEYWORD3>
-			<KEYWORD3>Case</KEYWORD3>
-			<KEYWORD3>Cd</KEYWORD3>
-			<KEYWORD3>Cdow</KEYWORD3>
-			<KEYWORD3>Ceiling</KEYWORD3>
-			<KEYWORD3>Central</KEYWORD3>
-			<KEYWORD3>Century</KEYWORD3>
-			<KEYWORD3>Change</KEYWORD3>
-			<KEYWORD3>Char</KEYWORD3>
-			<KEYWORD3>Chdir</KEYWORD3>
-			<KEYWORD3>Checkbox</KEYWORD3>
-			<KEYWORD3>Chr</KEYWORD3>
-			<KEYWORD3>Chrsaw</KEYWORD3>
-			<KEYWORD3>Chrtran</KEYWORD3>
-			<KEYWORD3>Close</KEYWORD3>
-			<KEYWORD3>Cmonth</KEYWORD3>
-			<KEYWORD3>Cntbar</KEYWORD3>
-			<KEYWORD3>Cntpad</KEYWORD3>
-			<KEYWORD3>Col</KEYWORD3>
-			<KEYWORD3>Column</KEYWORD3>
-			<KEYWORD3>ComboBox</KEYWORD3>
-			<KEYWORD3>CommandButton</KEYWORD3>
-			<KEYWORD3>CommandGroup</KEYWORD3>
-			<KEYWORD3>Compile</KEYWORD3>
-			<KEYWORD3>Completed</KEYWORD3>
-			<KEYWORD3>Compobj</KEYWORD3>
-			<KEYWORD3>Compute</KEYWORD3>
-			<KEYWORD3>Concat</KEYWORD3>
-			<KEYWORD3>ConnectBusy</KEYWORD3>
-			<KEYWORD3>ConnectHandle</KEYWORD3>
-			<KEYWORD3>ConnectName</KEYWORD3>
-			<KEYWORD3>ConnectString</KEYWORD3>
-			<KEYWORD3>ConnectTimeOut</KEYWORD3>
-			<KEYWORD3>Container</KEYWORD3>
-			<KEYWORD3>Continue</KEYWORD3>
-			<KEYWORD3>Control</KEYWORD3>
-			<KEYWORD3>Copy</KEYWORD3>
-			<KEYWORD3>Cos</KEYWORD3>
-			<KEYWORD3>Cot</KEYWORD3>
-			<KEYWORD3>Count</KEYWORD3>
-			<KEYWORD3>Cpconvert</KEYWORD3>
-			<KEYWORD3>Cpcurrent</KEYWORD3>
-			<KEYWORD3>CPDialog</KEYWORD3>
-			<KEYWORD3>Cpdbf</KEYWORD3>
-			<KEYWORD3>Cpnotrans</KEYWORD3>
-			<KEYWORD3>Create</KEYWORD3>
-			<KEYWORD3>Createobject</KEYWORD3>
-			<KEYWORD3>CrsBuffering</KEYWORD3>
-			<KEYWORD3>CrsFetchMemo</KEYWORD3>
-			<KEYWORD3>CrsFetchSize</KEYWORD3>
-			<KEYWORD3>CrsMaxRows</KEYWORD3>
-			<KEYWORD3>CrsMethodUsed</KEYWORD3>
-			<KEYWORD3>CrsNumBatch</KEYWORD3>
-			<KEYWORD3>CrsShareConnection</KEYWORD3>
-			<KEYWORD3>CrsUseMemoSize</KEYWORD3>
-			<KEYWORD3>CrsWhereClause</KEYWORD3>
-			<KEYWORD3>Ctod</KEYWORD3>
-			<KEYWORD3>Ctot</KEYWORD3>
-			<KEYWORD3>Curdate</KEYWORD3>
-			<KEYWORD3>Curdir</KEYWORD3>
-			<KEYWORD3>CurrLeft</KEYWORD3>
-			<KEYWORD3>CurrSymbol</KEYWORD3>
-			<KEYWORD3>Cursor</KEYWORD3>
-			<KEYWORD3>Curtime</KEYWORD3>
-			<KEYWORD3>Curval</KEYWORD3>
-			<KEYWORD3>Custom</KEYWORD3>
-			<KEYWORD3>DataEnvironment</KEYWORD3>
-			<KEYWORD3>Databases</KEYWORD3>
-			<KEYWORD3>Datetime</KEYWORD3>
-			<KEYWORD3>Day</KEYWORD3>
-			<KEYWORD3>Dayname</KEYWORD3>
-			<KEYWORD3>Dayofmonth</KEYWORD3>
-			<KEYWORD3>Dayofweek</KEYWORD3>
-			<KEYWORD3>Dayofyear</KEYWORD3>
-			<KEYWORD3>Dbalias</KEYWORD3>
-			<KEYWORD3>Dbused</KEYWORD3>
-			<KEYWORD3>DB_BufLockRow</KEYWORD3>
-			<KEYWORD3>DB_BufLockTable</KEYWORD3>
-			<KEYWORD3>DB_BufOff</KEYWORD3>
-			<KEYWORD3>DB_BufOptRow</KEYWORD3>
-			<KEYWORD3>DB_BufOptTable</KEYWORD3>
-			<KEYWORD3>DB_Complette</KEYWORD3>
-			<KEYWORD3>DB_DeleteInsert</KEYWORD3>
-			<KEYWORD3>DB_KeyAndModified</KEYWORD3>
-			<KEYWORD3>DB_KeyAndTimestamp</KEYWORD3>
-			<KEYWORD3>DB_KeyAndUpdatable</KEYWORD3>
-			<KEYWORD3>DB_LocalSQL</KEYWORD3>
-			<KEYWORD3>DB_NoPrompt</KEYWORD3>
-			<KEYWORD3>DB_Prompt</KEYWORD3>
-			<KEYWORD3>DB_RemoteSQL</KEYWORD3>
-			<KEYWORD3>DB_TransAuto</KEYWORD3>
-			<KEYWORD3>DB_TransManual</KEYWORD3>
-			<KEYWORD3>DB_TransNone</KEYWORD3>
-			<KEYWORD3>DB_Update</KEYWORD3>
-			<KEYWORD3>Ddeaborttrans</KEYWORD3>
-			<KEYWORD3>Ddeadvise</KEYWORD3>
-			<KEYWORD3>Ddeenabled</KEYWORD3>
-			<KEYWORD3>Ddeexecute</KEYWORD3>
-			<KEYWORD3>Ddeinitiate</KEYWORD3>
-			<KEYWORD3>Ddelasterror</KEYWORD3>
-			<KEYWORD3>Ddepoke</KEYWORD3>
-			<KEYWORD3>Dderequest</KEYWORD3>
-			<KEYWORD3>Ddesetoption</KEYWORD3>
-			<KEYWORD3>Ddesetservice</KEYWORD3>
-			<KEYWORD3>Ddesettopic</KEYWORD3>
-			<KEYWORD3>Ddeterminate</KEYWORD3>
-			<KEYWORD3>Declare</KEYWORD3>
-			<KEYWORD3>DefaultValue</KEYWORD3>
-			<KEYWORD3>Define</KEYWORD3>
-			<KEYWORD3>Degrees</KEYWORD3>
-			<KEYWORD3>DeleteTrigger</KEYWORD3>
-			<KEYWORD3>Desc</KEYWORD3>
-			<KEYWORD3>Description</KEYWORD3>
-			<KEYWORD3>Difference</KEYWORD3>
-			<KEYWORD3>Dimension</KEYWORD3>
-			<KEYWORD3>Dir</KEYWORD3>
-			<KEYWORD3>Directory</KEYWORD3>
-			<KEYWORD3>Diskspace</KEYWORD3>
-			<KEYWORD3>Display</KEYWORD3>
-			<KEYWORD3>DispLogin</KEYWORD3>
-			<KEYWORD3>DispWarnings</KEYWORD3>
-			<KEYWORD3>Distinct</KEYWORD3>
-			<KEYWORD3>Dmy</KEYWORD3>
-			<KEYWORD3>Do</KEYWORD3>
-			<KEYWORD3>Doc</KEYWORD3>
-			<KEYWORD3>Dow</KEYWORD3>
-			<KEYWORD3>Drop</KEYWORD3>
-			<KEYWORD3>Dtoc</KEYWORD3>
-			<KEYWORD3>Dtor</KEYWORD3>
-			<KEYWORD3>Dtos</KEYWORD3>
-			<KEYWORD3>Dtot</KEYWORD3>
-			<KEYWORD3>Edit</KEYWORD3>
-			<KEYWORD3>EditBox</KEYWORD3>
-			<KEYWORD3>Eject</KEYWORD3>
-			<KEYWORD3>Elif</KEYWORD3>
-			<KEYWORD3>Else</KEYWORD3>
-			<KEYWORD3>Empty</KEYWORD3>
-			<KEYWORD3>End</KEYWORD3>
-			<KEYWORD3>Endcase</KEYWORD3>
-			<KEYWORD3>Enddefine</KEYWORD3>
-			<KEYWORD3>Enddo</KEYWORD3>
-			<KEYWORD3>Endfor</KEYWORD3>
-			<KEYWORD3>Endif</KEYWORD3>
-			<KEYWORD3>Endprintjob</KEYWORD3>
-			<KEYWORD3>Endscan</KEYWORD3>
-			<KEYWORD3>Endtext</KEYWORD3>
-			<KEYWORD3>Endwith</KEYWORD3>
-			<KEYWORD3>Eof</KEYWORD3>
-			<KEYWORD3>Erase</KEYWORD3>
-			<KEYWORD3>Evaluate</KEYWORD3>
-			<KEYWORD3>Exact</KEYWORD3>
-			<KEYWORD3>Exclusive</KEYWORD3>
-			<KEYWORD3>Exit</KEYWORD3>
-			<KEYWORD3>Exp</KEYWORD3>
-			<KEYWORD3>Export</KEYWORD3>
-			<KEYWORD3>External</KEYWORD3>
-			<KEYWORD3>Fchsize</KEYWORD3>
-			<KEYWORD3>Fclose</KEYWORD3>
-			<KEYWORD3>Fcount</KEYWORD3>
-			<KEYWORD3>Fcreate</KEYWORD3>
-			<KEYWORD3>Feof</KEYWORD3>
-			<KEYWORD3>Ferror</KEYWORD3>
-			<KEYWORD3>FetchMemo</KEYWORD3>
-			<KEYWORD3>FetchSize</KEYWORD3>
-			<KEYWORD3>Fflush</KEYWORD3>
-			<KEYWORD3>Fgets</KEYWORD3>
-			<KEYWORD3>File</KEYWORD3>
-			<KEYWORD3>Filer</KEYWORD3>
-			<KEYWORD3>Find</KEYWORD3>
-			<KEYWORD3>Fklabel</KEYWORD3>
-			<KEYWORD3>Fkmax</KEYWORD3>
-			<KEYWORD3>Fldlist</KEYWORD3>
-			<KEYWORD3>Flock</KEYWORD3>
-			<KEYWORD3>Floor</KEYWORD3>
-			<KEYWORD3>Flush</KEYWORD3>
-			<KEYWORD3>FontClass</KEYWORD3>
-			<KEYWORD3>Fontmetric</KEYWORD3>
-			<KEYWORD3>Fopen</KEYWORD3>
-			<KEYWORD3>For</KEYWORD3>
-			<KEYWORD3>Form</KEYWORD3>
-			<KEYWORD3>FormsClass</KEYWORD3>
-			<KEYWORD3>Formset</KEYWORD3>
-			<KEYWORD3>FormSetClass</KEYWORD3>
-			<KEYWORD3>FormSetLib</KEYWORD3>
-			<KEYWORD3>FormsLib</KEYWORD3>
-			<KEYWORD3>Found</KEYWORD3>
-			<KEYWORD3>Foxcode</KEYWORD3>
-			<KEYWORD3>Foxdoc</KEYWORD3>
-			<KEYWORD3>Foxgen</KEYWORD3>
-			<KEYWORD3>Foxgraph</KEYWORD3>
-			<KEYWORD3>FoxPro</KEYWORD3>
-			<KEYWORD3>Foxview</KEYWORD3>
-			<KEYWORD3>Fputs</KEYWORD3>
-			<KEYWORD3>Fread</KEYWORD3>
-			<KEYWORD3>From</KEYWORD3>
-			<KEYWORD3>Fseek</KEYWORD3>
-			<KEYWORD3>Fsize</KEYWORD3>
-			<KEYWORD3>Fv</KEYWORD3>
-			<KEYWORD3>Fwrite</KEYWORD3>
-			<KEYWORD3>Gather</KEYWORD3>
-			<KEYWORD3>General</KEYWORD3>
-			<KEYWORD3>Getbar</KEYWORD3>
-			<KEYWORD3>Getcolor</KEYWORD3>
-			<KEYWORD3>Getcp</KEYWORD3>
-			<KEYWORD3>Getdir</KEYWORD3>
-			<KEYWORD3>Getenv</KEYWORD3>
-			<KEYWORD3>Getexpr</KEYWORD3>
-			<KEYWORD3>Getfile</KEYWORD3>
-			<KEYWORD3>Getfldstate</KEYWORD3>
-			<KEYWORD3>Getfont</KEYWORD3>
-			<KEYWORD3>Getnextmodified</KEYWORD3>
-			<KEYWORD3>Getobject</KEYWORD3>
-			<KEYWORD3>Getpad</KEYWORD3>
-			<KEYWORD3>Getpict</KEYWORD3>
-			<KEYWORD3>Getprinter</KEYWORD3>
-			<KEYWORD3>Go</KEYWORD3>
-			<KEYWORD3>Gomonth</KEYWORD3>
-			<KEYWORD3>Goto</KEYWORD3>
-			<KEYWORD3>Graph</KEYWORD3>
-			<KEYWORD3>Grid</KEYWORD3>
-			<KEYWORD3>GridHorz</KEYWORD3>
-			<KEYWORD3>GridShow</KEYWORD3>
-			<KEYWORD3>GridShowPos</KEYWORD3>
-			<KEYWORD3>GridSnap</KEYWORD3>
-			<KEYWORD3>GridVert</KEYWORD3>
-			<KEYWORD3>Header</KEYWORD3>
-			<KEYWORD3>Help</KEYWORD3>
-			<KEYWORD3>HelpOn</KEYWORD3>
-			<KEYWORD3>HelpTo</KEYWORD3>
-			<KEYWORD3>Hour</KEYWORD3>
-			<KEYWORD3>IdleTimeOut</KEYWORD3>
-			<KEYWORD3>Idxcollate</KEYWORD3>
-			<KEYWORD3>If</KEYWORD3>
-			<KEYWORD3>Ifdef</KEYWORD3>
-			<KEYWORD3>Ifndef</KEYWORD3>
-			<KEYWORD3>Iif</KEYWORD3>
-			<KEYWORD3>Image</KEYWORD3>
-			<KEYWORD3>Import</KEYWORD3>
-			<KEYWORD3>Include</KEYWORD3>
-			<KEYWORD3>Indbc</KEYWORD3>
-			<KEYWORD3>Index</KEYWORD3>
-			<KEYWORD3>Inkey</KEYWORD3>
-			<KEYWORD3>Inlist</KEYWORD3>
-			<KEYWORD3>Input</KEYWORD3>
-			<KEYWORD3>Insert</KEYWORD3>
-			<KEYWORD3>InsertTrigger</KEYWORD3>
-			<KEYWORD3>Insmode</KEYWORD3>
-			<KEYWORD3>Into</KEYWORD3>
-			<KEYWORD3>Isalpha</KEYWORD3>
-			<KEYWORD3>Iscolor</KEYWORD3>
-			<KEYWORD3>Isdigit</KEYWORD3>
-			<KEYWORD3>Isexclusive</KEYWORD3>
-			<KEYWORD3>Islower</KEYWORD3>
-			<KEYWORD3>Isnull</KEYWORD3>
-			<KEYWORD3>Isreadonly</KEYWORD3>
-			<KEYWORD3>Isupper</KEYWORD3>
-			<KEYWORD3>Join</KEYWORD3>
-			<KEYWORD3>Keyboard</KEYWORD3>
-			<KEYWORD3>KeyField</KEYWORD3>
-			<KEYWORD3>KeyFieldList</KEYWORD3>
-			<KEYWORD3>Keymatch</KEYWORD3>
-			<KEYWORD3>Label</KEYWORD3>
-			<KEYWORD3>Lastkey</KEYWORD3>
-			<KEYWORD3>LastProject</KEYWORD3>
-			<KEYWORD3>Lcase</KEYWORD3>
-			<KEYWORD3>Len</KEYWORD3>
-			<KEYWORD3>Length</KEYWORD3>
-			<KEYWORD3>Lineno</KEYWORD3>
-			<KEYWORD3>ListBox</KEYWORD3>
-			<KEYWORD3>Local</KEYWORD3>
-			<KEYWORD3>Locate</KEYWORD3>
-			<KEYWORD3>Locfile</KEYWORD3>
-			<KEYWORD3>Log</KEYWORD3>
-			<KEYWORD3>Log10</KEYWORD3>
-			<KEYWORD3>Logout</KEYWORD3>
-			<KEYWORD3>Lookup</KEYWORD3>
-			<KEYWORD3>Loop</KEYWORD3>
-			<KEYWORD3>Lower</KEYWORD3>
-			<KEYWORD3>Lparameters</KEYWORD3>
-			<KEYWORD3>Ltrim</KEYWORD3>
-			<KEYWORD3>Lupdate</KEYWORD3>
-			<KEYWORD3>Mail</KEYWORD3>
-			<KEYWORD3>MaxRecords</KEYWORD3>
-			<KEYWORD3>Mcol</KEYWORD3>
-			<KEYWORD3>Md</KEYWORD3>
-			<KEYWORD3>Mdown</KEYWORD3>
-			<KEYWORD3>Mdx</KEYWORD3>
-			<KEYWORD3>Mdy</KEYWORD3>
-			<KEYWORD3>Memlines</KEYWORD3>
-			<KEYWORD3>Memo</KEYWORD3>
-			<KEYWORD3>Menu</KEYWORD3>
-			<KEYWORD3>Messagebox</KEYWORD3>
-			<KEYWORD3>Minute</KEYWORD3>
-			<KEYWORD3>Mkdir</KEYWORD3>
-			<KEYWORD3>Mline</KEYWORD3>
-			<KEYWORD3>Modify</KEYWORD3>
-			<KEYWORD3>Month</KEYWORD3>
-			<KEYWORD3>Monthname</KEYWORD3>
-			<KEYWORD3>Mouse</KEYWORD3>
-			<KEYWORD3>Mrkbar</KEYWORD3>
-			<KEYWORD3>Mrkpad</KEYWORD3>
-			<KEYWORD3>Mrow</KEYWORD3>
-			<KEYWORD3>Mton</KEYWORD3>
-			<KEYWORD3>Mwindow</KEYWORD3>
-			<KEYWORD3>Native</KEYWORD3>
-			<KEYWORD3>Ndx</KEYWORD3>
-			<KEYWORD3>Network</KEYWORD3>
-			<KEYWORD3>Next</KEYWORD3>
-			<KEYWORD3>Nodefault</KEYWORD3>
-			<KEYWORD3>Normalize</KEYWORD3>
-			<KEYWORD3>Note</KEYWORD3>
-			<KEYWORD3>Now</KEYWORD3>
-			<KEYWORD3>Ntom</KEYWORD3>
-			<KEYWORD3>NullString</KEYWORD3>
-			<KEYWORD3>Numlock</KEYWORD3>
-			<KEYWORD3>Nvl</KEYWORD3>
-			<KEYWORD3>Objnum</KEYWORD3>
-			<KEYWORD3>Objref</KEYWORD3>
-			<KEYWORD3>Objtoclient</KEYWORD3>
-			<KEYWORD3>Objvar</KEYWORD3>
-			<KEYWORD3>Occurs</KEYWORD3>
-			<KEYWORD3>ODBChdbc</KEYWORD3>
-			<KEYWORD3>ODBChstmt</KEYWORD3>
-			<KEYWORD3>Oemtoansi</KEYWORD3>
-			<KEYWORD3>Off</KEYWORD3>
-			<KEYWORD3>Oldval</KEYWORD3>
-			<KEYWORD3>OleBaseControl</KEYWORD3>
-			<KEYWORD3>OleBoundControl</KEYWORD3>
-			<KEYWORD3>OleClassIDispOut</KEYWORD3>
-			<KEYWORD3>OleControl</KEYWORD3>
-			<KEYWORD3>On</KEYWORD3>
-			<KEYWORD3>Open</KEYWORD3>
-			<KEYWORD3>OptionButton</KEYWORD3>
-			<KEYWORD3>OptionGroup</KEYWORD3>
-			<KEYWORD3>Oracle</KEYWORD3>
-			<KEYWORD3>Order</KEYWORD3>
-			<KEYWORD3>Os</KEYWORD3>
-			<KEYWORD3>Otherwise</KEYWORD3>
-			<KEYWORD3>Pack</KEYWORD3>
-			<KEYWORD3>PacketSize</KEYWORD3>
-			<KEYWORD3>Padc</KEYWORD3>
-			<KEYWORD3>Padl</KEYWORD3>
-			<KEYWORD3>Padr</KEYWORD3>
-			<KEYWORD3>Page</KEYWORD3>
-			<KEYWORD3>PageFrame</KEYWORD3>
-			<KEYWORD3>Parameters</KEYWORD3>
-			<KEYWORD3>Payment</KEYWORD3>
-			<KEYWORD3>Pcol</KEYWORD3>
-			<KEYWORD3>Percent</KEYWORD3>
-			<KEYWORD3>Pi</KEYWORD3>
-			<KEYWORD3>Pivot</KEYWORD3>
-			<KEYWORD3>Play</KEYWORD3>
-			<KEYWORD3>Pop</KEYWORD3>
-			<KEYWORD3>Power</KEYWORD3>
-			<KEYWORD3>PrimaryKey</KEYWORD3>
-			<KEYWORD3>Printjob</KEYWORD3>
-			<KEYWORD3>Printstatus</KEYWORD3>
-			<KEYWORD3>Private</KEYWORD3>
-			<KEYWORD3>Prmbar</KEYWORD3>
-			<KEYWORD3>Prmpad</KEYWORD3>
-			<KEYWORD3>Program</KEYWORD3>
-			<KEYWORD3>ProjectClick</KEYWORD3>
-			<KEYWORD3>Proper</KEYWORD3>
-			<KEYWORD3>Protected</KEYWORD3>
-			<KEYWORD3>Prow</KEYWORD3>
-			<KEYWORD3>Prtinfo</KEYWORD3>
-			<KEYWORD3>Public</KEYWORD3>
-			<KEYWORD3>Push</KEYWORD3>
-			<KEYWORD3>Putfile</KEYWORD3>
-			<KEYWORD3>Pv</KEYWORD3>
-			<KEYWORD3>Qpr</KEYWORD3>
-			<KEYWORD3>Quater</KEYWORD3>
-			<KEYWORD3>QueryTimeOut</KEYWORD3>
-			<KEYWORD3>Quit</KEYWORD3>
-			<KEYWORD3>Radians</KEYWORD3>
-			<KEYWORD3>Rand</KEYWORD3>
-			<KEYWORD3>Rat</KEYWORD3>
-			<KEYWORD3>Ratline</KEYWORD3>
-			<KEYWORD3>Rd</KEYWORD3>
-			<KEYWORD3>Rdlevel</KEYWORD3>
-			<KEYWORD3>Read</KEYWORD3>
-			<KEYWORD3>Readkey</KEYWORD3>
-			<KEYWORD3>Recall</KEYWORD3>
-			<KEYWORD3>Reccount</KEYWORD3>
-			<KEYWORD3>RecentlyUsedFiles</KEYWORD3>
-			<KEYWORD3>Recno</KEYWORD3>
-			<KEYWORD3>Recsize</KEYWORD3>
-			<KEYWORD3>RectClass</KEYWORD3>
-			<KEYWORD3>Regional</KEYWORD3>
-			<KEYWORD3>Reindex</KEYWORD3>
-			<KEYWORD3>RelatedChild</KEYWORD3>
-			<KEYWORD3>RelatedTable</KEYWORD3>
-			<KEYWORD3>RelatedTag</KEYWORD3>
-			<KEYWORD3>Relation</KEYWORD3>
-			<KEYWORD3>Remove</KEYWORD3>
-			<KEYWORD3>Rename</KEYWORD3>
-			<KEYWORD3>Repeat</KEYWORD3>
-			<KEYWORD3>Replace</KEYWORD3>
-			<KEYWORD3>Replicate</KEYWORD3>
-			<KEYWORD3>Report</KEYWORD3>
-			<KEYWORD3>Reprocess</KEYWORD3>
-			<KEYWORD3>ResHeight</KEYWORD3>
-			<KEYWORD3>ResourceOn</KEYWORD3>
-			<KEYWORD3>ResourceTo</KEYWORD3>
-			<KEYWORD3>Restore</KEYWORD3>
-			<KEYWORD3>Resume</KEYWORD3>
-			<KEYWORD3>ResWidth</KEYWORD3>
-			<KEYWORD3>Retry</KEYWORD3>
-			<KEYWORD3>Return</KEYWORD3>
-			<KEYWORD3>Rgbscheme</KEYWORD3>
-			<KEYWORD3>Rlock</KEYWORD3>
-			<KEYWORD3>Rmdir</KEYWORD3>
-			<KEYWORD3>Rollback</KEYWORD3>
-			<KEYWORD3>Round</KEYWORD3>
-			<KEYWORD3>Rtod</KEYWORD3>
-			<KEYWORD3>Rtrim</KEYWORD3>
-			<KEYWORD3>RuleExpression</KEYWORD3>
-			<KEYWORD3>RuleText</KEYWORD3>
-			<KEYWORD3>Run</KEYWORD3>
-			<KEYWORD3>Runscript</KEYWORD3>
-			<KEYWORD3>Rview</KEYWORD3>
-			<KEYWORD3>Save</KEYWORD3>
-			<KEYWORD3>Safety</KEYWORD3>
-			<KEYWORD3>ScaleUnits</KEYWORD3>
-			<KEYWORD3>Scan</KEYWORD3>
-			<KEYWORD3>Scatter</KEYWORD3>
-			<KEYWORD3>Scols</KEYWORD3>
-			<KEYWORD3>Scroll</KEYWORD3>
-			<KEYWORD3>Sec</KEYWORD3>
-			<KEYWORD3>Second</KEYWORD3>
-			<KEYWORD3>Seek</KEYWORD3>
-			<KEYWORD3>Select</KEYWORD3>
-			<KEYWORD3>SendUpdates</KEYWORD3>
-			<KEYWORD3>Separator</KEYWORD3>
-			<KEYWORD3>Set</KEYWORD3>
-			<KEYWORD3>SetDefault</KEYWORD3>
-			<KEYWORD3>Setfldstate</KEYWORD3>
-			<KEYWORD3>Setup</KEYWORD3>
-			<KEYWORD3>Shape</KEYWORD3>
-			<KEYWORD3>Shared</KEYWORD3>
-			<KEYWORD3>ShareConnection</KEYWORD3>
-			<KEYWORD3>ShowOLEControls</KEYWORD3>
-			<KEYWORD3>ShowOLEInsertable</KEYWORD3>
-			<KEYWORD3>ShowVCXs</KEYWORD3>
-			<KEYWORD3>Sign</KEYWORD3>
-			<KEYWORD3>Sin</KEYWORD3>
-			<KEYWORD3>Size</KEYWORD3>
-			<KEYWORD3>Skpbar</KEYWORD3>
-			<KEYWORD3>Skppad</KEYWORD3>
-			<KEYWORD3>Sort</KEYWORD3>
-			<KEYWORD3>Soundex</KEYWORD3>
-			<KEYWORD3>SourceName</KEYWORD3>
-			<KEYWORD3>Spinner</KEYWORD3>
-			<KEYWORD3>SQLAsynchronous</KEYWORD3>
-			<KEYWORD3>SQLBatchMode</KEYWORD3>
-			<KEYWORD3>Sqlcommit</KEYWORD3>
-			<KEYWORD3>SQLConnectTimeOut</KEYWORD3>
-			<KEYWORD3>SQLDispLogin</KEYWORD3>
-			<KEYWORD3>SQLDispWarnings</KEYWORD3>
-			<KEYWORD3>SQLIdleTimeOut</KEYWORD3>
-			<KEYWORD3>Sqll</KEYWORD3>
-			<KEYWORD3>SQLQueryTimeOut</KEYWORD3>
-			<KEYWORD3>Sqlrollback</KEYWORD3>
-			<KEYWORD3>Sqlstringconnect</KEYWORD3>
-			<KEYWORD3>SQLTransactions</KEYWORD3>
-			<KEYWORD3>SQLWaitTime</KEYWORD3>
-			<KEYWORD3>Sqrt</KEYWORD3>
-			<KEYWORD3>Srows</KEYWORD3>
-			<KEYWORD3>StatusBar</KEYWORD3>
-			<KEYWORD3>Status</KEYWORD3>
-			<KEYWORD3>Store</KEYWORD3>
-			<KEYWORD3>Str</KEYWORD3>
-			<KEYWORD3>Strtran</KEYWORD3>
-			<KEYWORD3>Stuff</KEYWORD3>
-			<KEYWORD3>Substr</KEYWORD3>
-			<KEYWORD3>Substring</KEYWORD3>
-			<KEYWORD3>Sum</KEYWORD3>
-			<KEYWORD3>Suspend</KEYWORD3>
-			<KEYWORD3>Sys</KEYWORD3>
-			<KEYWORD3>Sysmetric</KEYWORD3>
-			<KEYWORD3>Table</KEYWORD3>
-			<KEYWORD3>TableRefresh</KEYWORD3>
-			<KEYWORD3>Tablerevert</KEYWORD3>
-			<KEYWORD3>Tableupdate</KEYWORD3>
-			<KEYWORD3>TabOrdering</KEYWORD3>
-			<KEYWORD3>Talk</KEYWORD3>
-			<KEYWORD3>Tan</KEYWORD3>
-			<KEYWORD3>Target</KEYWORD3>
-			<KEYWORD3>Text</KEYWORD3>
-			<KEYWORD3>TextBox</KEYWORD3>
-			<KEYWORD3>Timestamp</KEYWORD3>
-			<KEYWORD3>Timestampdiff</KEYWORD3>
-			<KEYWORD3>To</KEYWORD3>
-			<KEYWORD3>Toolbar</KEYWORD3>
-			<KEYWORD3>Total</KEYWORD3>
-			<KEYWORD3>Transaction</KEYWORD3>
-			<KEYWORD3>Transform</KEYWORD3>
-			<KEYWORD3>Trim</KEYWORD3>
-			<KEYWORD3>Truncate</KEYWORD3>
-			<KEYWORD3>Ttoc</KEYWORD3>
-			<KEYWORD3>Ttod</KEYWORD3>
-			<KEYWORD3>Txnlevel</KEYWORD3>
-			<KEYWORD3>Txtwidth</KEYWORD3>
-			<KEYWORD3>Type</KEYWORD3>
-			<KEYWORD3>Ucase</KEYWORD3>
-			<KEYWORD3>Undefine</KEYWORD3>
-			<KEYWORD3>Unlock</KEYWORD3>
-			<KEYWORD3>Unpack</KEYWORD3>
-			<KEYWORD3>Updatable</KEYWORD3>
-			<KEYWORD3>UpdatableFieldList</KEYWORD3>
-			<KEYWORD3>Update</KEYWORD3>
-			<KEYWORD3>Updated</KEYWORD3>
-			<KEYWORD3>UpdateName</KEYWORD3>
-			<KEYWORD3>UpdateNameList</KEYWORD3>
-			<KEYWORD3>UpdateTrigger</KEYWORD3>
-			<KEYWORD3>UpdateType</KEYWORD3>
-			<KEYWORD3>Upper</KEYWORD3>
-			<KEYWORD3>Upsizing</KEYWORD3>
-			<KEYWORD3>Use</KEYWORD3>
-			<KEYWORD3>Used</KEYWORD3>
-			<KEYWORD3>UseMemoSize</KEYWORD3>
-			<KEYWORD3>Val</KEYWORD3>
-			<KEYWORD3>Validate</KEYWORD3>
-			<KEYWORD3>Values</KEYWORD3>
-			<KEYWORD3>Varread</KEYWORD3>
-			<KEYWORD3>Version</KEYWORD3>
-			<KEYWORD3>Wait</KEYWORD3>
-			<KEYWORD3>WaitTime</KEYWORD3>
-			<KEYWORD3>Wborder</KEYWORD3>
-			<KEYWORD3>Wchild</KEYWORD3>
-			<KEYWORD3>Wcols</KEYWORD3>
-			<KEYWORD3>Week</KEYWORD3>
-			<KEYWORD3>Wexist</KEYWORD3>
-			<KEYWORD3>Wfont</KEYWORD3>
-			<KEYWORD3>Where</KEYWORD3>
-			<KEYWORD3>WhereType</KEYWORD3>
-			<KEYWORD3>While</KEYWORD3>
-			<KEYWORD3>Windcmd</KEYWORD3>
-			<KEYWORD3>Windhelp</KEYWORD3>
-			<KEYWORD3>Windmemo</KEYWORD3>
-			<KEYWORD3>Windmenu</KEYWORD3>
-			<KEYWORD3>Windmodify</KEYWORD3>
-			<KEYWORD3>Windquery</KEYWORD3>
-			<KEYWORD3>Windscreen</KEYWORD3>
-			<KEYWORD3>Windsnip</KEYWORD3>
-			<KEYWORD3>Windstproc</KEYWORD3>
-			<KEYWORD3>With</KEYWORD3>
-			<KEYWORD3>WizardPrompt</KEYWORD3>
-			<KEYWORD3>Wlast</KEYWORD3>
-			<KEYWORD3>Wlcol</KEYWORD3>
-			<KEYWORD3>Wlrow</KEYWORD3>
-			<KEYWORD3>Wmaximum</KEYWORD3>
-			<KEYWORD3>Wminimum</KEYWORD3>
-			<KEYWORD3>Wontop</KEYWORD3>
-			<KEYWORD3>Woutput</KEYWORD3>
-			<KEYWORD3>Wparent</KEYWORD3>
-			<KEYWORD3>Wread</KEYWORD3>
-			<KEYWORD3>Wrows</KEYWORD3>
-			<KEYWORD3>Wtitle</KEYWORD3>
-			<KEYWORD3>Wvisible</KEYWORD3>
-			<KEYWORD3>Year</KEYWORD3>
-			<KEYWORD3>Zap</KEYWORD3>
-			<KEYWORD3>[</KEYWORD3>
-			<KEYWORD3>]</KEYWORD3>
-			<KEYWORD3>^</KEYWORD3>
-			<KEYWORD3>_Alignment</KEYWORD3>
-			<KEYWORD3>_Asciicols</KEYWORD3>
-			<KEYWORD3>_Asciirows</KEYWORD3>
-			<KEYWORD3>_Assist</KEYWORD3>
-			<KEYWORD3>_Beautify</KEYWORD3>
-			<KEYWORD3>_Box</KEYWORD3>
-			<KEYWORD3>_Browser</KEYWORD3>
-			<KEYWORD3>_Builder</KEYWORD3>
-			<KEYWORD3>_Calcmem</KEYWORD3>
-			<KEYWORD3>_Calcvalue</KEYWORD3>
-			<KEYWORD3>_Cliptext</KEYWORD3>
-			<KEYWORD3>_Converter</KEYWORD3>
-			<KEYWORD3>_Curobj</KEYWORD3>
-			<KEYWORD3>_Dblclick</KEYWORD3>
-			<KEYWORD3>_Diarydate</KEYWORD3>
-			<KEYWORD3>_Dos</KEYWORD3>
-			<KEYWORD3>_Foxdoc</KEYWORD3>
-			<KEYWORD3>_Foxgraph</KEYWORD3>
-			<KEYWORD3>_Gengraph</KEYWORD3>
-			<KEYWORD3>_Genmenu</KEYWORD3>
-			<KEYWORD3>_Genpd</KEYWORD3>
-			<KEYWORD3>_Genscrn</KEYWORD3>
-			<KEYWORD3>_Genxtab</KEYWORD3>
-			<KEYWORD3>_Indent</KEYWORD3>
-			<KEYWORD3>_Lmargin</KEYWORD3>
-			<KEYWORD3>_Mac</KEYWORD3>
-			<KEYWORD3>_Mbrowse</KEYWORD3>
-			<KEYWORD3>_Mbr_appnd</KEYWORD3>
-			<KEYWORD3>_Mbr_cpart</KEYWORD3>
-			<KEYWORD3>_Mbr_delet</KEYWORD3>
-			<KEYWORD3>_Mbr_font</KEYWORD3>
-			<KEYWORD3>_Mbr_goto</KEYWORD3>
-			<KEYWORD3>_Mbr_grid</KEYWORD3>
-			<KEYWORD3>_Mbr_link</KEYWORD3>
-			<KEYWORD3>_Mbr_mode</KEYWORD3>
-			<KEYWORD3>_Mbr_mvfld</KEYWORD3>
-			<KEYWORD3>_Mbr_mvprt</KEYWORD3>
-			<KEYWORD3>_Mbr_seek</KEYWORD3>
-			<KEYWORD3>_Mbr_sp100</KEYWORD3>
-			<KEYWORD3>_Mbr_sp200</KEYWORD3>
-			<KEYWORD3>_Mbr_szfld</KEYWORD3>
-			<KEYWORD3>_Mdata</KEYWORD3>
-			<KEYWORD3>_Mda_appnd</KEYWORD3>
-			<KEYWORD3>_Mda_avg</KEYWORD3>
-			<KEYWORD3>_Mda_brow</KEYWORD3>
-			<KEYWORD3>_Mda_calc</KEYWORD3>
-			<KEYWORD3>_Mda_copy</KEYWORD3>
-			<KEYWORD3>_Mda_count</KEYWORD3>
-			<KEYWORD3>_Mda_label</KEYWORD3>
-			<KEYWORD3>_Mda_pack</KEYWORD3>
-			<KEYWORD3>_Mda_reprt</KEYWORD3>
-			<KEYWORD3>_Mda_rindx</KEYWORD3>
-			<KEYWORD3>_Mda_setup</KEYWORD3>
-			<KEYWORD3>_Mda_sort</KEYWORD3>
-			<KEYWORD3>_Mda_sp100</KEYWORD3>
-			<KEYWORD3>_Mda_sp200</KEYWORD3>
-			<KEYWORD3>_Mda_sp300</KEYWORD3>
-			<KEYWORD3>_Mda_sum</KEYWORD3>
-			<KEYWORD3>_Mda_total</KEYWORD3>
-			<KEYWORD3>_Mdiary</KEYWORD3>
-			<KEYWORD3>_Medit</KEYWORD3>
-			<KEYWORD3>_Med_clear</KEYWORD3>
-			<KEYWORD3>_Med_copy</KEYWORD3>
-			<KEYWORD3>_Med_cut</KEYWORD3>
-			<KEYWORD3>_Med_cvtst</KEYWORD3>
-			<KEYWORD3>_Med_find</KEYWORD3>
-			<KEYWORD3>_Med_finda</KEYWORD3>
-			<KEYWORD3>_Med_goto</KEYWORD3>
-			<KEYWORD3>_Med_insob</KEYWORD3>
-			<KEYWORD3>_Med_link</KEYWORD3>
-			<KEYWORD3>_Med_obj</KEYWORD3>
-			<KEYWORD3>_Med_paste</KEYWORD3>
-			<KEYWORD3>_Med_pref</KEYWORD3>
-			<KEYWORD3>_Med_pstlk</KEYWORD3>
-			<KEYWORD3>_Med_redo</KEYWORD3>
-			<KEYWORD3>_Med_repl</KEYWORD3>
-			<KEYWORD3>_Med_repla</KEYWORD3>
-			<KEYWORD3>_Med_slcta</KEYWORD3>
-			<KEYWORD3>_Med_sp100</KEYWORD3>
-			<KEYWORD3>_Med_sp200</KEYWORD3>
-			<KEYWORD3>_Med_sp300</KEYWORD3>
-			<KEYWORD3>_Med_sp400</KEYWORD3>
-			<KEYWORD3>_Med_sp500</KEYWORD3>
-			<KEYWORD3>_Med_undo</KEYWORD3>
-			<KEYWORD3>_Mfile</KEYWORD3>
-			<KEYWORD3>_Mfiler</KEYWORD3>
-			<KEYWORD3>_Mfirst</KEYWORD3>
-			<KEYWORD3>_Mfi_clall</KEYWORD3>
-			<KEYWORD3>_Mfi_close</KEYWORD3>
-			<KEYWORD3>_Mfi_export</KEYWORD3>
-			<KEYWORD3>_Mfi_import</KEYWORD3>
-			<KEYWORD3>_Mfi_new</KEYWORD3>
-			<KEYWORD3>_Mfi_open</KEYWORD3>
-			<KEYWORD3>_Mfi_pgset</KEYWORD3>
-			<KEYWORD3>_Mfi_prevu</KEYWORD3>
-			<KEYWORD3>_Mfi_print</KEYWORD3>
-			<KEYWORD3>_Mfi_quit</KEYWORD3>
-			<KEYWORD3>_Mfi_revrt</KEYWORD3>
-			<KEYWORD3>_Mfi_savas</KEYWORD3>
-			<KEYWORD3>_Mfi_save</KEYWORD3>
-			<KEYWORD3>_Mfi_send</KEYWORD3>
-			<KEYWORD3>_Mfi_setup</KEYWORD3>
-			<KEYWORD3>_Mfi_sp100</KEYWORD3>
-			<KEYWORD3>_Mfi_sp200</KEYWORD3>
-			<KEYWORD3>_Mfi_sp300</KEYWORD3>
-			<KEYWORD3>_Mfi_sp400</KEYWORD3>
-			<KEYWORD3>_Mlabel</KEYWORD3>
-			<KEYWORD3>_Mlast</KEYWORD3>
-			<KEYWORD3>_Mline</KEYWORD3>
-			<KEYWORD3>_Mmacro</KEYWORD3>
-			<KEYWORD3>_Mmbldr</KEYWORD3>
-			<KEYWORD3>_Mprog</KEYWORD3>
-			<KEYWORD3>_Mproj</KEYWORD3>
-			<KEYWORD3>_Mpr_beaut</KEYWORD3>
-			<KEYWORD3>_Mpr_cancl</KEYWORD3>
-			<KEYWORD3>_Mpr_compl</KEYWORD3>
-			<KEYWORD3>_Mpr_do</KEYWORD3>
-			<KEYWORD3>_Mpr_docum</KEYWORD3>
-			<KEYWORD3>_Mpr_formwz</KEYWORD3>
-			<KEYWORD3>_Mpr_gener</KEYWORD3>
-			<KEYWORD3>_Mpr_graph</KEYWORD3>
-			<KEYWORD3>_Mpr_resum</KEYWORD3>
-			<KEYWORD3>_Mpr_sp100</KEYWORD3>
-			<KEYWORD3>_Mpr_sp200</KEYWORD3>
-			<KEYWORD3>_Mpr_sp300</KEYWORD3>
-			<KEYWORD3>_Mpr_suspend</KEYWORD3>
-			<KEYWORD3>_Mrc_appnd</KEYWORD3>
-			<KEYWORD3>_Mrc_chnge</KEYWORD3>
-			<KEYWORD3>_Mrc_cont</KEYWORD3>
-			<KEYWORD3>_Mrc_delet</KEYWORD3>
-			<KEYWORD3>_Mrc_goto</KEYWORD3>
-			<KEYWORD3>_Mrc_locat</KEYWORD3>
-			<KEYWORD3>_Mrc_recal</KEYWORD3>
-			<KEYWORD3>_Mrc_repl</KEYWORD3>
-			<KEYWORD3>_Mrc_seek</KEYWORD3>
-			<KEYWORD3>_Mrc_sp100</KEYWORD3>
-			<KEYWORD3>_Mrc_sp200</KEYWORD3>
-			<KEYWORD3>_Mrecord</KEYWORD3>
-			<KEYWORD3>_Mreport</KEYWORD3>
-			<KEYWORD3>_Mrqbe</KEYWORD3>
-			<KEYWORD3>_Mscreen</KEYWORD3>
-			<KEYWORD3>_Msm_data</KEYWORD3>
-			<KEYWORD3>_Msm_edit</KEYWORD3>
-			<KEYWORD3>_Msm_file</KEYWORD3>
-			<KEYWORD3>_Msm_format</KEYWORD3>
-			<KEYWORD3>_Msm_prog</KEYWORD3>
-			<KEYWORD3>_Msm_recrd</KEYWORD3>
-			<KEYWORD3>_Msm_systm</KEYWORD3>
-			<KEYWORD3>_Msm_text</KEYWORD3>
-			<KEYWORD3>_Msm_tools</KEYWORD3>
-			<KEYWORD3>_Msm_view</KEYWORD3>
-			<KEYWORD3>_Msm_windo</KEYWORD3>
-			<KEYWORD3>_Mst_about</KEYWORD3>
-			<KEYWORD3>_Mst_ascii</KEYWORD3>
-			<KEYWORD3>_Mst_calcu</KEYWORD3>
-			<KEYWORD3>_Mst_captr</KEYWORD3>
-			<KEYWORD3>_Mst_dbase</KEYWORD3>
-			<KEYWORD3>_Mst_diary</KEYWORD3>
-			<KEYWORD3>_Mst_filer</KEYWORD3>
-			<KEYWORD3>_Mst_help</KEYWORD3>
-			<KEYWORD3>_Mst_hphow</KEYWORD3>
-			<KEYWORD3>_Mst_hpsch</KEYWORD3>
-			<KEYWORD3>_Mst_macro</KEYWORD3>
-			<KEYWORD3>_Mst_office</KEYWORD3>
-			<KEYWORD3>_Mst_puzzl</KEYWORD3>
-			<KEYWORD3>_Mst_sp100</KEYWORD3>
-			<KEYWORD3>_Mst_sp200</KEYWORD3>
-			<KEYWORD3>_Mst_sp300</KEYWORD3>
-			<KEYWORD3>_Mst_specl</KEYWORD3>
-			<KEYWORD3>_Msysmenu</KEYWORD3>
-			<KEYWORD3>_Msystem</KEYWORD3>
-			<KEYWORD3>_Mtable</KEYWORD3>
-			<KEYWORD3>_Mtb_appnd</KEYWORD3>
-			<KEYWORD3>_Mtb_cpart</KEYWORD3>
-			<KEYWORD3>_Mtb_delet</KEYWORD3>
-			<KEYWORD3>_Mtb_delrc</KEYWORD3>
-			<KEYWORD3>_Mtb_goto</KEYWORD3>
-			<KEYWORD3>_Mtb_link</KEYWORD3>
-			<KEYWORD3>_Mtb_mvfld</KEYWORD3>
-			<KEYWORD3>_Mtb_mvprt</KEYWORD3>
-			<KEYWORD3>_Mtb_props</KEYWORD3>
-			<KEYWORD3>_Mtb_recal</KEYWORD3>
-			<KEYWORD3>_Mtb_sp100</KEYWORD3>
-			<KEYWORD3>_Mtb_sp200</KEYWORD3>
-			<KEYWORD3>_Mtb_sp300</KEYWORD3>
-			<KEYWORD3>_Mtb_sp400</KEYWORD3>
-			<KEYWORD3>_Mtb_szfld</KEYWORD3>
-			<KEYWORD3>_Mwindow</KEYWORD3>
-			<KEYWORD3>_Mwizards</KEYWORD3>
-			<KEYWORD3>_Mwi_arran</KEYWORD3>
-			<KEYWORD3>_Mwi_clear</KEYWORD3>
-			<KEYWORD3>_Mwi_cmd</KEYWORD3>
-			<KEYWORD3>_Mwi_color</KEYWORD3>
-			<KEYWORD3>_Mwi_debug</KEYWORD3>
-			<KEYWORD3>_Mwi_hide</KEYWORD3>
-			<KEYWORD3>_Mwi_hidea</KEYWORD3>
-			<KEYWORD3>_Mwi_min</KEYWORD3>
-			<KEYWORD3>_Mwi_move</KEYWORD3>
-			<KEYWORD3>_Mwi_rotat</KEYWORD3>
-			<KEYWORD3>_Mwi_showa</KEYWORD3>
-			<KEYWORD3>_Mwi_size</KEYWORD3>
-			<KEYWORD3>_Mwi_sp100</KEYWORD3>
-			<KEYWORD3>_Mwi_sp200</KEYWORD3>
-			<KEYWORD3>_Mwi_toolb</KEYWORD3>
-			<KEYWORD3>_Mwi_trace</KEYWORD3>
-			<KEYWORD3>_Mwi_view</KEYWORD3>
-			<KEYWORD3>_Mwi_zoom</KEYWORD3>
-			<KEYWORD3>_Mwz_all</KEYWORD3>
-			<KEYWORD3>_Mwz_form</KEYWORD3>
-			<KEYWORD3>_Mwz_foxdoc</KEYWORD3>
-			<KEYWORD3>_Mwz_import</KEYWORD3>
-			<KEYWORD3>_Mwz_label</KEYWORD3>
-			<KEYWORD3>_Mwz_mail</KEYWORD3>
-			<KEYWORD3>_Mwz_pivot</KEYWORD3>
-			<KEYWORD3>_Mwz_query</KEYWORD3>
-			<KEYWORD3>_Mwz_reprt</KEYWORD3>
-			<KEYWORD3>_Mwz_setup</KEYWORD3>
-			<KEYWORD3>_Mwz_table</KEYWORD3>
-			<KEYWORD3>_Mwz_upsizing</KEYWORD3>
-			<KEYWORD3>_Netware</KEYWORD3>
-			<KEYWORD3>_Oracle</KEYWORD3>
-			<KEYWORD3>_Padvance</KEYWORD3>
-			<KEYWORD3>_Pageno</KEYWORD3>
-			<KEYWORD3>_Pbpage</KEYWORD3>
-			<KEYWORD3>_Pcolno</KEYWORD3>
-			<KEYWORD3>_Pcopies</KEYWORD3>
-			<KEYWORD3>_Pdparms</KEYWORD3>
-			<KEYWORD3>_Pdriver</KEYWORD3>
-			<KEYWORD3>_Pdsetup</KEYWORD3>
-			<KEYWORD3>_Pecode</KEYWORD3>
-			<KEYWORD3>_Peject</KEYWORD3>
-			<KEYWORD3>_Pepage</KEYWORD3>
-			<KEYWORD3>_Pform</KEYWORD3>
-			<KEYWORD3>_Plength</KEYWORD3>
-			<KEYWORD3>_Plineno</KEYWORD3>
-			<KEYWORD3>_Ploffset</KEYWORD3>
-			<KEYWORD3>_Ppitch</KEYWORD3>
-			<KEYWORD3>_Pquality</KEYWORD3>
-			<KEYWORD3>_Pretext</KEYWORD3>
-			<KEYWORD3>_Pscode</KEYWORD3>
-			<KEYWORD3>_Pspacing</KEYWORD3>
-			<KEYWORD3>_Pwait</KEYWORD3>
-			<KEYWORD3>_Rmargin</KEYWORD3>
-			<KEYWORD3>_Screen</KEYWORD3>
-			<KEYWORD3>_Shell</KEYWORD3>
-			<KEYWORD3>_Spellchk</KEYWORD3>
-			<KEYWORD3>_Sqlserver</KEYWORD3>
-			<KEYWORD3>_Startup</KEYWORD3>
-			<KEYWORD3>_Tabs</KEYWORD3>
-			<KEYWORD3>_Tally</KEYWORD3>
-			<KEYWORD3>_Text</KEYWORD3>
-			<KEYWORD3>_Throttle</KEYWORD3>
-			<KEYWORD3>_Transport</KEYWORD3>
-			<KEYWORD3>_Triggerlevel</KEYWORD3>
-			<KEYWORD3>_Unix</KEYWORD3>
-			<KEYWORD3>_Windows</KEYWORD3>
-			<KEYWORD3>_Wizard</KEYWORD3>
-			<KEYWORD3>_Wrap</KEYWORD3>
-			<KEYWORD3>French</KEYWORD3>
-			<KEYWORD3>German</KEYWORD3>
-			<KEYWORD3>Italian</KEYWORD3>
-			<KEYWORD3>Japan</KEYWORD3>
-			<KEYWORD3>Usa</KEYWORD3>
-			<KEYWORD3>Lparameter</KEYWORD3>
-			<KEYWORD3>This</KEYWORD3>
-			<KEYWORD3>Thisform</KEYWORD3>
-			<KEYWORD3>Thisformset</KEYWORD3>
-			<KEYWORD3>F</KEYWORD3>
-			<KEYWORD3>T</KEYWORD3>
-			<KEYWORD3>N</KEYWORD3>
-			<KEYWORD3>Y</KEYWORD3>
-			<KEYWORD3>OlePublic</KEYWORD3>
-			<KEYWORD3>Hidden</KEYWORD3>
-			<KEYWORD3>Each</KEYWORD3>
-			<KEYWORD3>DoEvents</KEYWORD3>
-			<KEYWORD3>Dll</KEYWORD3>
-			<KEYWORD3>Outer</KEYWORD3>
-			<KEYWORD3>At_c</KEYWORD3>
-			<KEYWORD3>Atcc</KEYWORD3>
-			<KEYWORD3>Ratc</KEYWORD3>
-			<KEYWORD3>Leftc</KEYWORD3>
-			<KEYWORD3>Rightc</KEYWORD3>
-			<KEYWORD3>Substrc</KEYWORD3>
-			<KEYWORD3>Stuffc</KEYWORD3>
-			<KEYWORD3>Lenc</KEYWORD3>
-			<KEYWORD3>Chrtranc</KEYWORD3>
-			<KEYWORD3>IsLeadByte</KEYWORD3>
-			<KEYWORD3>IMEStatus</KEYWORD3>
-			<KEYWORD3>Strconv</KEYWORD3>
-			<KEYWORD3>BinToC</KEYWORD3>
-			<KEYWORD3>CToBin</KEYWORD3>
-			<KEYWORD3>IsFLocked</KEYWORD3>
-			<KEYWORD3>IsRLocked</KEYWORD3>
-			<KEYWORD3>LoadPicture</KEYWORD3>
-			<KEYWORD3>SavePicture</KEYWORD3>
-			<KEYWORD3>Assert</KEYWORD3>
-			<KEYWORD3>DoDefault</KEYWORD3>
-			<KEYWORD3>_WebMenu</KEYWORD3>
-			<KEYWORD3>_scctext</KEYWORD3>
-			<KEYWORD3>_WebVFPHomePage</KEYWORD3>
-			<KEYWORD3>_WebVfpOnlineSupport</KEYWORD3>
-			<KEYWORD3>_WebDevOnly</KEYWORD3>
-			<KEYWORD3>_WebMsftHomePage</KEYWORD3>
-			<KEYWORD3>_Coverage</KEYWORD3>
-			<KEYWORD3>_vfp</KEYWORD3>
-			<KEYWORD3>Bintoc</KEYWORD3>
-			<KEYWORD3>Resources</KEYWORD3>
-			<KEYWORD3>Ctobin</KEYWORD3>
-			<KEYWORD3>Createoffline</KEYWORD3>
-			<KEYWORD3>Debugout</KEYWORD3>
-			<KEYWORD3>Doevents</KEYWORD3>
-			<KEYWORD3>Dropoffline</KEYWORD3>
-			<KEYWORD3>Each</KEYWORD3>
-			<KEYWORD3>Isflocked</KEYWORD3>
-			<KEYWORD3>Isrlocked</KEYWORD3>
-			<KEYWORD3>Loadpicture</KEYWORD3>
-			<KEYWORD3>Revertoffline</KEYWORD3>
-			<KEYWORD3>Savepicture</KEYWORD3>
-			<KEYWORD3>Asserts</KEYWORD3>
-			<KEYWORD3>Coverage</KEYWORD3>
-			<KEYWORD3>Eventtracking</KEYWORD3>
-			<KEYWORD3>DBGetProp</KEYWORD3>
-			<KEYWORD3>DBSetProp</KEYWORD3>
-			<KEYWORD3>CursorGetProp</KEYWORD3>
-			<KEYWORD3>CursorSetProp</KEYWORD3>
-			<KEYWORD3>Addbs</KEYWORD3>
-			<KEYWORD3>Agetclass</KEYWORD3>
-			<KEYWORD3>Agetfileversion</KEYWORD3>
-			<KEYWORD3>Alines</KEYWORD3>
-			<KEYWORD3>Amouseobj</KEYWORD3>
-			<KEYWORD3>Anetresources</KEYWORD3>
-			<KEYWORD3>Avcxclasses</KEYWORD3>
-			<KEYWORD3>Comclassinfo</KEYWORD3>
-			<KEYWORD3>Createobjectex</KEYWORD3>
-			<KEYWORD3>Defaultext</KEYWORD3>
-			<KEYWORD3>Drivetype</KEYWORD3>
-			<KEYWORD3>Filetostr</KEYWORD3>
-			<KEYWORD3>Forceext</KEYWORD3>
-			<KEYWORD3>Forcepath</KEYWORD3>
-			<KEYWORD3>Gethost</KEYWORD3>
-			<KEYWORD3>Indexseek</KEYWORD3>
-			<KEYWORD3>Ishosted</KEYWORD3>
-			<KEYWORD3>Justdrive</KEYWORD3>
-			<KEYWORD3>Justext</KEYWORD3>
-			<KEYWORD3>Justfname</KEYWORD3>
-			<KEYWORD3>Justpath</KEYWORD3>
-			<KEYWORD3>Juststem</KEYWORD3>
-			<KEYWORD3>Newobject</KEYWORD3>
-			<KEYWORD3>Olereturnerror</KEYWORD3>
-			<KEYWORD3>Strtofile</KEYWORD3>
-			<KEYWORD3>Vartype</KEYWORD3>
-			<KEYWORD3>_Coverage</KEYWORD3>
-			<KEYWORD3>_Gallery</KEYWORD3>
-			<KEYWORD3>_Genhtml</KEYWORD3>
-			<KEYWORD3>_Getexpr</KEYWORD3>
-			<KEYWORD3>_Include</KEYWORD3>
-			<KEYWORD3>_Runactivedoc</KEYWORD3>
-			<KEYWORD3>ProjectHook</KEYWORD3>
-			<KEYWORD3>ActiveDoc</KEYWORD3>
-			<KEYWORD3>HyperLink</KEYWORD3>
-			<KEYWORD3>Session</KEYWORD3>
-			<KEYWORD3>Mtdll</KEYWORD3>
-
-			<!-- New in Visual Foxpro 8.0 -->
-			<KEYWORD3>ADOCKTIP</KEYWORD3>
-			<KEYWORD3>ADirtip</KEYWORD3>
-			<KEYWORD3>ADockState</KEYWORD3>
-			<KEYWORD3>AEvents</KEYWORD3>
-			<KEYWORD3>AFONTTIP</KEYWORD3>
-			<KEYWORD3>ALanguage</KEYWORD3>
-			<KEYWORD3>AProcInfo</KEYWORD3>
-			<KEYWORD3>AStackInfo</KEYWORD3>
-			<KEYWORD3>ATagInfo</KEYWORD3>
-			<KEYWORD3>Adlls</KEYWORD3>
-			<KEYWORD3>Alentip</KEYWORD3>
-			<KEYWORD3>Amemberstip</KEYWORD3>
-			<KEYWORD3>Amemberstip2</KEYWORD3>
-			<KEYWORD3>Ascantip</KEYWORD3>
-			<KEYWORD3>Aselobjtip</KEYWORD3>
-			<KEYWORD3>Asessions</KEYWORD3>
-			<KEYWORD3>Asorttip</KEYWORD3>
-			<KEYWORD3>Asorttip2</KEYWORD3>
-			<KEYWORD3>BINDEVENTTIP</KEYWORD3>
-			<KEYWORD3>BindEvent</KEYWORD3>
-			<KEYWORD3>COMARRAYTIP</KEYWORD3>
-			<KEYWORD3>COMPROPTIP</KEYWORD3>
-			<KEYWORD3>Candidate</KEYWORD3>
-			<KEYWORD3>Cdx</KEYWORD3>
-			<KEYWORD3>ComArray</KEYWORD3>
-			<KEYWORD3>ComReturnError</KEYWORD3>
-			<KEYWORD3>Comprop</KEYWORD3>
-			<KEYWORD3>CreateBinary</KEYWORD3>
-			<KEYWORD3>CursorToXML</KEYWORD3>
-			<KEYWORD3>DIRTIP</KEYWORD3>
-			<KEYWORD3>Descending</KEYWORD3>
-			<KEYWORD3>DisplayPath</KEYWORD3>
-			<KEYWORD3>EditSource</KEYWORD3>
-			<KEYWORD3>EventHandler</KEYWORD3>
-			<KEYWORD3>Evl</KEYWORD3>
-			<KEYWORD3>ExecScript</KEYWORD3>
-			<KEYWORD3>FCREATETIP</KEYWORD3>
-			<KEYWORD3>FIELDTIP</KEYWORD3>
-			<KEYWORD3>FILETIP</KEYWORD3>
-			<KEYWORD3>FOPENTIP</KEYWORD3>
-			<KEYWORD3>FSEEKTIP</KEYWORD3>
-			<KEYWORD3>Fdate</KEYWORD3>
-			<KEYWORD3>Ftime</KEYWORD3>
-			<KEYWORD3>GetCursorAdapter</KEYWORD3>
-			<KEYWORD3>GetInterface</KEYWORD3>
-			<KEYWORD3>GetPem</KEYWORD3>
-			<KEYWORD3>GetWordCount</KEYWORD3>
-			<KEYWORD3>GetWordNum</KEYWORD3>
-			<KEYWORD3>InputBox</KEYWORD3>
-			<KEYWORD3>IsBlank</KEYWORD3>
-			<KEYWORD3>IsMouse</KEYWORD3>
-			<KEYWORD3>Like</KEYWORD3>
-			<KEYWORD3>Likec</KEYWORD3>
-			<KEYWORD3>Memory</KEYWORD3>
-			<KEYWORD3>Msgboxtip</KEYWORD3>
-			<KEYWORD3>Pcount</KEYWORD3>
-			<KEYWORD3>PemStatus</KEYWORD3>
-			<KEYWORD3>Popup</KEYWORD3>
-			<KEYWORD3>Quarter</KEYWORD3>
-			<KEYWORD3>RaiseEvent</KEYWORD3>
-			<KEYWORD3>RemoveProperty</KEYWORD3>
-			<KEYWORD3>SQLCancel</KEYWORD3>
-			<KEYWORD3>SQLColumns</KEYWORD3>
-			<KEYWORD3>SQLDisconnect</KEYWORD3>
-			<KEYWORD3>SQLExec</KEYWORD3>
-			<KEYWORD3>SQLGetProp</KEYWORD3>
-			<KEYWORD3>SQLMoreResults</KEYWORD3>
-			<KEYWORD3>SQLPrepare</KEYWORD3>
-			<KEYWORD3>SQLSetProp</KEYWORD3>
-			<KEYWORD3>SQLTables</KEYWORD3>
-			<KEYWORD3>STRTOFILETIP</KEYWORD3>
-			<KEYWORD3>Seconds</KEYWORD3>
-			<KEYWORD3>StrExTip</KEYWORD3>
-			<KEYWORD3>StrExtract</KEYWORD3>
-			<KEYWORD3>Strtrantip</KEYWORD3>
-			<KEYWORD3>Tagcount</KEYWORD3>
-			<KEYWORD3>Tagno</KEYWORD3>
-			<KEYWORD3>Textmerge</KEYWORD3>
-			<KEYWORD3>Try</KEYWORD3>
-			<KEYWORD3>UnBindEvents</KEYWORD3>
-			<KEYWORD3>WDockable</KEYWORD3>
-			<KEYWORD3>XMLTIP</KEYWORD3>
-			<KEYWORD3>XMLTIP2</KEYWORD3>
-			<KEYWORD3>XMLTIP3</KEYWORD3>
-			<KEYWORD3>XMLTIP4</KEYWORD3>
-			<KEYWORD3>XMLTIP5</KEYWORD3>
-			<KEYWORD3>XMLTIP6</KEYWORD3>
-			<KEYWORD3>XMLToCursor</KEYWORD3>
-			<KEYWORD3>XMLUpdategram</KEYWORD3>
-			<KEYWORD3>Blank</KEYWORD3>
-			<KEYWORD3>Catch</KEYWORD3>
-			<KEYWORD3>Dotip</KEYWORD3>
-			<KEYWORD3>EndTry</KEYWORD3>
-			<KEYWORD3>Finally</KEYWORD3>
-			<KEYWORD3>Implements</KEYWORD3>
-			<KEYWORD3>Opendatatip</KEYWORD3>
-			<KEYWORD3>Repltip</KEYWORD3>
-			<KEYWORD3>Throw</KEYWORD3>
-			<KEYWORD3>Usetip</KEYWORD3>
-
-		</KEYWORDS>
-	</RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/freemarker.xml b/qpython/src/main/assets/syntax/freemarker.xml
deleted file mode 100644
index d039bedd..00000000
--- a/qpython/src/main/assets/syntax/freemarker.xml
+++ /dev/null
@@ -1,204 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!-- A JEdit mode configuration file for FTL (FreeMarker Template Language)
-     Note that this version will only work with JEdit 4.1pre6 or later.
-     by Jonathan Revusky, revusky@users.sourceforge.net -->
-
-<MODE>
-  <RULES IGNORE_CASE="FALSE">
-
-    <!-- JavaScript -->
-    <SPAN TYPE="MARKUP" DELEGATE="html::JAVASCRIPT">
-    <BEGIN>&lt;script</BEGIN>
-    <END>&lt;/script&gt;</END>
-    </SPAN>
-    <SPAN TYPE="MARKUP" DELEGATE="html::JAVASCRIPT">
-    <BEGIN>&lt;Script</BEGIN>
-    <END>&lt;/Script&gt;</END>
-    </SPAN>
-    <SPAN TYPE="MARKUP" DELEGATE="html::JAVASCRIPT">
-    <BEGIN>&lt;SCRIPT</BEGIN>
-    <END>&lt;/SCRIPT&gt;</END>
-    </SPAN>
-
-    <!-- stylesheet -->
-    <SPAN TYPE="MARKUP" DELEGATE="html::CSS">
-    <BEGIN>&lt;style</BEGIN>
-    <END>&lt;/style&gt;</END>
-    </SPAN>
-    <SPAN TYPE="MARKUP" DELEGATE="html::CSS">
-    <BEGIN>&lt;Style</BEGIN>
-    <END>&lt;/Style&gt;</END>
-    </SPAN>
-    <SPAN TYPE="MARKUP" DELEGATE="html::CSS">
-    <BEGIN>&lt;STYLE</BEGIN>
-    <END>&lt;/STYLE&gt;</END>
-    </SPAN>
-
-    <!-- XML/HTML comment -->
-    <SPAN TYPE="COMMENT2" DELEGATE="xml::DTD-TAGS">
-    <BEGIN>&lt;!--</BEGIN>
-    <END>--&gt;</END>
-    </SPAN>
-
-    <!-- DTD instructions -->
-    <SPAN TYPE="KEYWORD2" DELEGATE="xml::DTD-TAGS">
-    <BEGIN>&lt;!</BEGIN>
-    <END>&gt;</END>
-    </SPAN>
-
-    <!-- FTL markup starts here. -->
-
-    <SPAN TYPE="KEYWORD1" DELEGATE="EXPRESSION">
-      <BEGIN>${</BEGIN>
-      <END>}</END>
-    </SPAN>
-
-    <SPAN TYPE="KEYWORD1" DELEGATE="EXPRESSION">
-      <BEGIN>#{</BEGIN>
-      <END>}</END>
-    </SPAN>
-
-    <SPAN_REGEXP TYPE="KEYWORD1" HASH_CHAR="&lt;#ftl" DELEGATE="EXPRESSION">
-      <BEGIN>&lt;#ftl\b</BEGIN>
-      <END>&gt;</END>
-    </SPAN_REGEXP>
-
-    <SPAN_REGEXP TYPE="KEYWORD1" DELEGATE="EXPRESSION" HASH_CHAR="&lt;">
-      <BEGIN>&lt;#?(if|elseif|switch|foreach|list|case|assign|local|global|setting|include|import|stop|escape|macro|function|transform|call|visit|recurse)(\s|/|$)</BEGIN>
-      <END>&gt;</END>
-    </SPAN_REGEXP>
-
-    <SEQ_REGEXP TYPE="KEYWORD1" HASH_CHAR="&lt;/"
-	>&lt;/#?(assign|local|global|if|switch|foreach|list|escape|macro|function|transform|compress|noescape)&gt;</SEQ_REGEXP>
-
-    <SPAN_REGEXP TYPE="KEYWORD1" DELEGATE="INVALID" HASH_CHAR="&lt;">
-      <BEGIN>&lt;#?(else|compress|noescape|default|break|flush|nested|t|rt|lt|return|recurse)\b</BEGIN>
-      <END>&gt;</END>
-    </SPAN_REGEXP>
-
-    <SPAN_REGEXP TYPE="KEYWORD1" DELEGATE="INVALID" HASH_CHAR="&lt;/@">
-      <BEGIN>&lt;/@(([_@\p{Alpha}][_@\p{Alnum}]*)(\.[_@\p{Alpha}][_@\p{Alnum}]*)*?)?</BEGIN>
-      <END>&gt;</END>
-    </SPAN_REGEXP>
-
-    <SPAN_REGEXP TYPE="KEYWORD1" DELEGATE="EXPRESSION" HASH_CHAR="&lt;@">
-      <BEGIN>&lt;@([_@\p{Alpha}][_@\p{Alnum}]*)(\.[_@\p{Alpha}][_@\p{Alnum}]*?)*</BEGIN>
-      <END>&gt;</END>
-    </SPAN_REGEXP>
-
-    <SPAN TYPE="COMMENT1">
-      <BEGIN>&lt;#--</BEGIN>
-      <END>--&gt;</END>
-    </SPAN>
-
-    <SEQ TYPE="KEYWORD1">&lt;stop&gt;</SEQ>
-     <SPAN TYPE="COMMENT1">
-    <BEGIN>&lt;comment&gt;</BEGIN>
-    <END>&lt;/comment&gt;</END>
-    </SPAN>
-    <SPAN TYPE="INVALID">
-      <BEGIN>&lt;#</BEGIN>
-      <END>&gt;</END>
-    </SPAN>
-    <SPAN TYPE="INVALID">
-      <BEGIN>&lt;/#</BEGIN>
-      <END>&gt;</END>
-    </SPAN>
-
-    <!-- non-FTL markup -->
-    <SPAN TYPE="MARKUP" DELEGATE="TAGS">
-    <BEGIN>&lt;</BEGIN>
-    <END>&gt;</END>
-    </SPAN>
-  </RULES>
-
-  <RULES SET="EXPRESSION"
-      DEFAULT="KEYWORD2"
-      HIGHLIGHT_DIGITS="TRUE"
-      IGNORE_CASE="FALSE"
-    >
-    <SPAN TYPE="COMMENT1">
-      <BEGIN>&lt;#--</BEGIN>
-      <END>--&gt;</END>
-    </SPAN>
-    <SPAN TYPE="COMMENT1">
-      <BEGIN>&lt;!--</BEGIN>
-      <END>--&gt;</END>
-    </SPAN>
-
-    <SPAN TYPE="LITERAL1" ESCAPE="\">
-    <BEGIN>"</BEGIN>
-    <END>"</END>
-    </SPAN>
-    <SPAN TYPE="OPERATOR" DELEGATE="EXPRESSION">
-      <BEGIN>(</BEGIN><END>)</END>
-    </SPAN>
-    <SEQ TYPE="OPERATOR">=</SEQ>
-    <SEQ TYPE="OPERATOR">!</SEQ>
-    <SEQ TYPE="OPERATOR">|</SEQ>
-    <SEQ TYPE="OPERATOR">&amp;</SEQ>
-    <SEQ TYPE="OPERATOR">&lt;</SEQ>
-    <SEQ TYPE="OPERATOR">&gt;</SEQ>
-    <SEQ TYPE="OPERATOR">*</SEQ>
-    <SEQ TYPE="OPERATOR">/</SEQ>
-    <SEQ TYPE="OPERATOR">-</SEQ>
-    <SEQ TYPE="OPERATOR">+</SEQ>
-    <SEQ TYPE="OPERATOR">%</SEQ>
-    <SEQ TYPE="OPERATOR">.</SEQ>
-    <SEQ TYPE="OPERATOR">:</SEQ>
-    <SEQ TYPE="OPERATOR">.</SEQ>
-    <SEQ TYPE="OPERATOR">.</SEQ>
-    <SEQ TYPE="OPERATOR">[</SEQ>
-    <SEQ TYPE="OPERATOR">]</SEQ>
-    <SEQ TYPE="OPERATOR">{</SEQ>
-    <SEQ TYPE="OPERATOR">}</SEQ>
-    <SEQ TYPE="OPERATOR">;</SEQ>
-    <!-- Builtins -->
-    <MARK_FOLLOWING TYPE="FUNCTION">?</MARK_FOLLOWING>
-    <KEYWORDS>
-      <KEYWORD1>true</KEYWORD1>
-      <KEYWORD1>false</KEYWORD1>
-      <KEYWORD1>as</KEYWORD1>
-      <KEYWORD1>in</KEYWORD1>
-      <KEYWORD1>using</KEYWORD1>
-      <OPERATOR>gt</OPERATOR>
-      <OPERATOR>gte</OPERATOR>
-      <OPERATOR>lt</OPERATOR>
-      <OPERATOR>lte</OPERATOR>
-    </KEYWORDS>
-  </RULES>
-
-  <RULES SET="TAGS" DEFAULT="MARKUP">
-    <SPAN TYPE="LITERAL1" DELEGATE="INQUOTE">
-    <BEGIN>"</BEGIN>
-    <END>"</END>
-    </SPAN>
-
-    <SPAN TYPE="LITERAL1" DELEGATE="INQUOTE">
-    <BEGIN>'</BEGIN>
-    <END>'</END>
-    </SPAN>
-
-    <SEQ TYPE="OPERATOR">=</SEQ>
-  </RULES>
-
-
-  <!-- a ruleset for when we are within a quoted string within an SGML tag
-       It can contain FTL interpolations -->
-  <RULES SET="INQUOTE" ESCAPE="\">
-    <SPAN TYPE="KEYWORD1" DELEGATE="EXPRESSION">
-    <BEGIN>${</BEGIN>
-    <END>}</END>
-    </SPAN>
-    <SPAN TYPE="KEYWORD1" DELEGATE="EXPRESSION">
-    <BEGIN>#{</BEGIN>
-    <END>}</END>
-    </SPAN>
-  </RULES>
-
-  <!-- empty ruleset to delegate to for spots where any non-whitespace is invalid -->
-  <RULES SET="INVALID" DEFAULT="INVALID" />
-</MODE>
diff --git a/qpython/src/main/assets/syntax/gcbasic.xml b/qpython/src/main/assets/syntax/gcbasic.xml
deleted file mode 100644
index 181d12e6..00000000
--- a/qpython/src/main/assets/syntax/gcbasic.xml
+++ /dev/null
@@ -1,894 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!-- Name:    gcbasic.xml    -->
-<!-- Version: 1.0 for jEdit 4.3 pre 15  -->
-<!-- Version: 17 August 2008 -->
-<!-- Title:   jEdit Syntax highlighting Mode file for GCBASIC -->
-<!-- Author:  Mark J. Twomey -->
-
-<!--
-Add a MODE entry in the catalog file for the following:
-   NAME="gcbasic" FILE="gcbasic.xml"
-   FILE_NAME_GLOB="*.{gc,gcb}"
-   FIRST_LINE_GLOB="{*GCBASIC*,*Great Cow BASIC*}"
-===================================================================
-
-Note 1: GCBASIC (Great Cow BASIC) is an open-source BASIC compiler for Microchip PIC microcontrollers.
-        For more information go here   http://gcbasic.sourceforge.net/
-
-Note 2: It will not unindent as you type.
-        However, if you do "Select All" (Ctrl-A), and then do "Indent Lines" (Ctrl-i),
-        then it fixes the indentation of the whole program. It works great!
--->
-
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="lineComment" VALUE="'" />
-      <PROPERTY NAME="ignoreWhitespace" VALUE="TRUE" />
-
-      <PROPERTY NAME="indentNextLines"   VALUE="^(SUB\s.*|FUNCTION\s.*|MACRO\s.*|\s+DO\s+.*|\s+DO$|DO\s+.*|DO$|\s*FOR\s.*|FOR\s.*|REPEAT\s.*|CASE\s.*|\s+IF\s+.*\s+THEN$|IF\s+.*\s+THEN$|\s+#ifdef\s+.*$|#ifdef\s+.*$)" />
-      <PROPERTY NAME="unindentThisLine"  VALUE="^(\s+END\s+SUB.*|END\s+SUB.*|\s+END\s+FUNCTION.*|END\s+FUNCTION.*|\s+END\s+MACRO.*|END\s+MACRO.*|\s+LOOP.*|LOOP.*|\s+NEXT.*|NEXT.*|\s+END\s+IF.*|END\s+IF.*|\s+#endif.*|#endif.*|\s+#endif|#endif)" />
-      <PROPERTY NAME="unindentNextLines" VALUE="^(\s+END\s+SUB|END\s+SUB|\s+END\s+SUB\s+|END\s+SUB\s+|\s+END\s+FUNCTION|END\s+FUNCTION|\s+END\s+FUNCTION\s+|END\s+FUNCTION\s+|\s+END\s+MACRO|END\s+MACRO|\s+END\s+MACRO\s+|END\s+MACRO\s+|\s+LOOP|LOOP|\s+LOOP\s+|LOOP\s+|\s+NEXT|NEXT|\s+NEXT\s+|NEXT\s+|\s+END\s+IF|END\s+IF|\s+END\s+IF\s+|END\s+IF\s+|\s+#endif|#endif|\s+#endif\s+|#endif\s+)" />
-	</PROPS>
-
-	<RULES ESCAPE="\" IGNORE_CASE="TRUE" HIGHLIGHT_DIGITS="TRUE">
-		<SPAN TYPE="LITERAL1" NO_LINE_BREAK="TRUE">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-
-      <!-- Comments -->
-		<EOL_SPAN TYPE="COMMENT4">'</EOL_SPAN>
-		<EOL_SPAN TYPE="COMMENT4">rem </EOL_SPAN>
-
- 		<!-- Arithmetic operators -->
-      <SEQ TYPE="OPERATOR">*</SEQ>
-		<SEQ TYPE="OPERATOR">/</SEQ>
-		<SEQ TYPE="OPERATOR">+</SEQ>
-		<SEQ TYPE="OPERATOR">-</SEQ>
-      <SEQ TYPE="OPERATOR">+=</SEQ>
-      <SEQ TYPE="OPERATOR">-=</SEQ>
-
-		<!-- Logical operators -->
-		<SEQ TYPE="OPERATOR">&amp;</SEQ>
-      <SEQ TYPE="OPERATOR">|</SEQ>
-      <SEQ TYPE="OPERATOR">!</SEQ>
-
-		<!-- Comparison operators -->
-      <SEQ TYPE="OPERATOR">=</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;&gt;</SEQ>
-      <SEQ TYPE="OPERATOR">&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;</SEQ>
-      <SEQ TYPE="OPERATOR">&gt;=</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;=</SEQ>
-
-		<KEYWORDS>
-         <!-- Compiler Directives -->
-         <KEYWORD3>#include</KEYWORD3>
-         <KEYWORD3>#define</KEYWORD3>
-         <KEYWORD3>#chip</KEYWORD3>
-         <KEYWORD3>#osc</KEYWORD3>
-         <KEYWORD3>#config</KEYWORD3>
-         <KEYWORD3>#IFDEF</KEYWORD3>
-         <KEYWORD3>#ENDIF</KEYWORD3>
-         <KEYWORD3>#SCRIPT</KEYWORD3>
-         <KEYWORD3>#ENDSCRIPT</KEYWORD3>
-         <KEYWORD3>#int</KEYWORD3>
-         <KEYWORD3>#startup</KEYWORD3>
-         <KEYWORD3>#RAM</KEYWORD3>
-         <KEYWORD3>#mem</KEYWORD3>
-
-         <!--  ====== CHIP DATA : START  ====== -->
-         <!-- [Ports] -->
-         <KEYWORD2>PORTA</KEYWORD2>
-         <KEYWORD2>PORTB</KEYWORD2>
-         <KEYWORD2>PORTC</KEYWORD2>
-         <KEYWORD2>PORTD</KEYWORD2>
-         <KEYWORD2>PORTE</KEYWORD2>
-         <KEYWORD2>PORTF</KEYWORD2>
-         <KEYWORD2>PORTG</KEYWORD2>
-         <KEYWORD2>PORTH</KEYWORD2>
-         <KEYWORD2>PORTI</KEYWORD2>
-         <KEYWORD2>PORTJ</KEYWORD2>
-
-         <!-- [ChipData] -->
-         <KEYWORD2>Prog</KEYWORD2>
-         <KEYWORD2>EEPROM</KEYWORD2>
-         <KEYWORD2>RAM</KEYWORD2>
-         <KEYWORD2>I/O</KEYWORD2>
-         <KEYWORD2>ADC</KEYWORD2>
-         <KEYWORD2>MaxMHz</KEYWORD2>
-         <KEYWORD2>IntOsc</KEYWORD2>
-         <KEYWORD2>Pins</KEYWORD2>
-         <KEYWORD2>Family</KEYWORD2>
-         <KEYWORD2>ConfigWords</KEYWORD2>
-         <KEYWORD2>PSP</KEYWORD2>
-         <KEYWORD2>MaxAddress</KEYWORD2>
-
-         <!-- [Interrupts] -->
-         <KEYWORD2>ADCReady</KEYWORD2>
-         <KEYWORD2>CCP1</KEYWORD2>
-         <KEYWORD2>CCP2</KEYWORD2>
-         <KEYWORD2>Comp1Change</KEYWORD2>
-         <KEYWORD2>Comp2Change</KEYWORD2>
-         <KEYWORD2>EEPROMReady</KEYWORD2>
-         <KEYWORD2>ExtInt0</KEYWORD2>
-         <KEYWORD2>LPWU</KEYWORD2>
-         <KEYWORD2>OscillatorFail</KEYWORD2>
-         <KEYWORD2>PORTBChange</KEYWORD2>
-         <KEYWORD2>SSP1Collision</KEYWORD2>
-         <KEYWORD2>SSP1Ready</KEYWORD2>
-         <KEYWORD2>Timer0Overflow</KEYWORD2>
-         <KEYWORD2>Timer1Overflow</KEYWORD2>
-         <KEYWORD2>Timer2Overflow</KEYWORD2>
-         <KEYWORD2>UsartRX1Ready</KEYWORD2>
-         <KEYWORD2>UsartTX1Ready</KEYWORD2>
-
-         <!-- [Registers] -->
-         <KEYWORD2>INDF</KEYWORD2>
-         <KEYWORD2>TMR0</KEYWORD2>
-         <KEYWORD2>PCL</KEYWORD2>
-         <KEYWORD2>STATUS</KEYWORD2>
-         <KEYWORD2>FSR</KEYWORD2>
-         <KEYWORD2>PCLATH</KEYWORD2>
-         <KEYWORD2>INTCON</KEYWORD2>
-         <KEYWORD2>PIR1</KEYWORD2>
-         <KEYWORD2>PIR2</KEYWORD2>
-         <KEYWORD2>TMR1L</KEYWORD2>
-         <KEYWORD2>TMR1H</KEYWORD2>
-         <KEYWORD2>T1CON</KEYWORD2>
-         <KEYWORD2>TMR2</KEYWORD2>
-         <KEYWORD2>T2CON</KEYWORD2>
-         <KEYWORD2>SSPBUF</KEYWORD2>
-         <KEYWORD2>SSPCON</KEYWORD2>
-         <KEYWORD2>CCPR1L</KEYWORD2>
-         <KEYWORD2>CCPR1H</KEYWORD2>
-         <KEYWORD2>CCP1CON</KEYWORD2>
-         <KEYWORD2>RCSTA</KEYWORD2>
-         <KEYWORD2>TXREG</KEYWORD2>
-         <KEYWORD2>RCREG</KEYWORD2>
-         <KEYWORD2>CCPR2L</KEYWORD2>
-         <KEYWORD2>CCPR2H</KEYWORD2>
-         <KEYWORD2>CCP2CON</KEYWORD2>
-         <KEYWORD2>ADRESH</KEYWORD2>
-         <KEYWORD2>ADCON0</KEYWORD2>
-         <KEYWORD2>OPTION_REG</KEYWORD2>
-         <KEYWORD2>TRISA</KEYWORD2>
-         <KEYWORD2>TRISB</KEYWORD2>
-         <KEYWORD2>TRISC</KEYWORD2>
-         <KEYWORD2>TRISD</KEYWORD2>
-         <KEYWORD2>TRISE</KEYWORD2>
-         <KEYWORD2>PIE1</KEYWORD2>
-         <KEYWORD2>PIE2</KEYWORD2>
-         <KEYWORD2>PCON</KEYWORD2>
-         <KEYWORD2>OSCCON</KEYWORD2>
-         <KEYWORD2>OSCTUNE</KEYWORD2>
-         <KEYWORD2>SSPCON2</KEYWORD2>
-         <KEYWORD2>PR2</KEYWORD2>
-         <KEYWORD2>SSPADD</KEYWORD2>
-         <KEYWORD2>SSPMSK</KEYWORD2>
-         <KEYWORD2>MSK</KEYWORD2>
-         <KEYWORD2>SSPSTAT</KEYWORD2>
-         <KEYWORD2>WPUB</KEYWORD2>
-         <KEYWORD2>IOCB</KEYWORD2>
-         <KEYWORD2>VRCON</KEYWORD2>
-         <KEYWORD2>TXSTA</KEYWORD2>
-         <KEYWORD2>SPBRG</KEYWORD2>
-         <KEYWORD2>SPBRGH</KEYWORD2>
-         <KEYWORD2>PWM1CON</KEYWORD2>
-         <KEYWORD2>ECCPAS</KEYWORD2>
-         <KEYWORD2>PSTRCON</KEYWORD2>
-         <KEYWORD2>ADRESL</KEYWORD2>
-         <KEYWORD2>ADCON1</KEYWORD2>
-         <KEYWORD2>WDTCON</KEYWORD2>
-         <KEYWORD2>CM1CON0</KEYWORD2>
-         <KEYWORD2>CM2CON0</KEYWORD2>
-         <KEYWORD2>CM2CON1</KEYWORD2>
-         <KEYWORD2>EEDATA</KEYWORD2>
-         <KEYWORD2>EEDAT</KEYWORD2>
-         <KEYWORD2>EEADR</KEYWORD2>
-         <KEYWORD2>EEDATH</KEYWORD2>
-         <KEYWORD2>EEADRH</KEYWORD2>
-         <KEYWORD2>SRCON</KEYWORD2>
-         <KEYWORD2>BAUDCTL</KEYWORD2>
-         <KEYWORD2>ANSEL</KEYWORD2>
-         <KEYWORD2>ANSELH</KEYWORD2>
-         <KEYWORD2>EECON1</KEYWORD2>
-         <KEYWORD2>EECON2</KEYWORD2>
-
-         <!-- [Bits] -->
-         <KEYWORD2>IRP</KEYWORD2>
-         <KEYWORD2>RP1</KEYWORD2>
-         <KEYWORD2>RP0</KEYWORD2>
-         <KEYWORD2>NOT_TO</KEYWORD2>
-         <KEYWORD2>NOT_PD</KEYWORD2>
-         <KEYWORD2>Z</KEYWORD2>
-         <KEYWORD2>DC</KEYWORD2>
-         <KEYWORD2>C</KEYWORD2>
-         <KEYWORD2>GIE</KEYWORD2>
-         <KEYWORD2>PEIE</KEYWORD2>
-         <KEYWORD2>T0IE</KEYWORD2>
-         <KEYWORD2>TMR0IE</KEYWORD2>
-         <KEYWORD2>INTE</KEYWORD2>
-         <KEYWORD2>RBIE</KEYWORD2>
-         <KEYWORD2>T0IF</KEYWORD2>
-         <KEYWORD2>TMR0IF</KEYWORD2>
-         <KEYWORD2>INTF</KEYWORD2>
-         <KEYWORD2>RBIF</KEYWORD2>
-         <KEYWORD2>ADIF</KEYWORD2>
-         <KEYWORD2>RCIF</KEYWORD2>
-         <KEYWORD2>TXIF</KEYWORD2>
-         <KEYWORD2>SSPIF</KEYWORD2>
-         <KEYWORD2>CCP1IF</KEYWORD2>
-         <KEYWORD2>TMR2IF</KEYWORD2>
-         <KEYWORD2>TMR1IF</KEYWORD2>
-         <KEYWORD2>OSFIF</KEYWORD2>
-         <KEYWORD2>C2IF</KEYWORD2>
-         <KEYWORD2>C1IF</KEYWORD2>
-         <KEYWORD2>EEIF</KEYWORD2>
-         <KEYWORD2>BCLIF</KEYWORD2>
-         <KEYWORD2>ULPWUIF</KEYWORD2>
-         <KEYWORD2>CCP2IF</KEYWORD2>
-         <KEYWORD2>T1GIV</KEYWORD2>
-         <KEYWORD2>TMR1GE</KEYWORD2>
-         <KEYWORD2>T1CKPS1</KEYWORD2>
-         <KEYWORD2>T1CKPS0</KEYWORD2>
-         <KEYWORD2>T1OSCEN</KEYWORD2>
-         <KEYWORD2>NOT_T1SYNC</KEYWORD2>
-         <KEYWORD2>T1INSYNC</KEYWORD2>
-         <KEYWORD2>T1SYNC</KEYWORD2>
-         <KEYWORD2>TMR1CS</KEYWORD2>
-         <KEYWORD2>TMR1ON</KEYWORD2>
-         <KEYWORD2>TOUTPS3</KEYWORD2>
-         <KEYWORD2>TOUTPS2</KEYWORD2>
-         <KEYWORD2>TOUTPS1</KEYWORD2>
-         <KEYWORD2>TOUTPS0</KEYWORD2>
-         <KEYWORD2>TMR2ON</KEYWORD2>
-         <KEYWORD2>T2CKPS1</KEYWORD2>
-         <KEYWORD2>T2CKPS0</KEYWORD2>
-         <KEYWORD2>WCOL</KEYWORD2>
-         <KEYWORD2>SSPOV</KEYWORD2>
-         <KEYWORD2>SSPEN</KEYWORD2>
-         <KEYWORD2>CKP</KEYWORD2>
-         <KEYWORD2>SSPM3</KEYWORD2>
-         <KEYWORD2>SSPM2</KEYWORD2>
-         <KEYWORD2>SSPM1</KEYWORD2>
-         <KEYWORD2>SSPM0</KEYWORD2>
-         <KEYWORD2>P1M1</KEYWORD2>
-         <KEYWORD2>P1M0</KEYWORD2>
-         <KEYWORD2>DC1B1</KEYWORD2>
-         <KEYWORD2>CCP1X</KEYWORD2>
-         <KEYWORD2>DC1B0</KEYWORD2>
-         <KEYWORD2>CCP1Y</KEYWORD2>
-         <KEYWORD2>CCP1M3</KEYWORD2>
-         <KEYWORD2>CCP1M2</KEYWORD2>
-         <KEYWORD2>CCP1M1</KEYWORD2>
-         <KEYWORD2>CCP1M0</KEYWORD2>
-         <KEYWORD2>SPEN</KEYWORD2>
-         <KEYWORD2>RX9</KEYWORD2>
-         <KEYWORD2>RC9</KEYWORD2>
-         <KEYWORD2>NOT_RC8</KEYWORD2>
-         <KEYWORD2>RC8_9</KEYWORD2>
-         <KEYWORD2>SREN</KEYWORD2>
-         <KEYWORD2>CREN</KEYWORD2>
-         <KEYWORD2>ADDEN</KEYWORD2>
-         <KEYWORD2>FERR</KEYWORD2>
-         <KEYWORD2>OERR</KEYWORD2>
-         <KEYWORD2>RX9D</KEYWORD2>
-         <KEYWORD2>RCD8</KEYWORD2>
-         <KEYWORD2>CCP2X</KEYWORD2>
-         <KEYWORD2>DC2B1</KEYWORD2>
-         <KEYWORD2>CCP2Y</KEYWORD2>
-         <KEYWORD2>DC2B0</KEYWORD2>
-         <KEYWORD2>CCP2M3</KEYWORD2>
-         <KEYWORD2>CCP2M2</KEYWORD2>
-         <KEYWORD2>CCP2M1</KEYWORD2>
-         <KEYWORD2>CCP2M0</KEYWORD2>
-         <KEYWORD2>ADCS1</KEYWORD2>
-         <KEYWORD2>ADCS0</KEYWORD2>
-         <KEYWORD2>CHS3</KEYWORD2>
-         <KEYWORD2>CHS2</KEYWORD2>
-         <KEYWORD2>CHS1</KEYWORD2>
-         <KEYWORD2>CHS0</KEYWORD2>
-         <KEYWORD2>GO</KEYWORD2>
-         <KEYWORD2>NOT_DONE</KEYWORD2>
-         <KEYWORD2>GO_DONE</KEYWORD2>
-         <KEYWORD2>ADON</KEYWORD2>
-         <KEYWORD2>NOT_RBPU</KEYWORD2>
-         <KEYWORD2>INTEDG</KEYWORD2>
-         <KEYWORD2>T0CS</KEYWORD2>
-         <KEYWORD2>T0SE</KEYWORD2>
-         <KEYWORD2>PSA</KEYWORD2>
-         <KEYWORD2>PS2</KEYWORD2>
-         <KEYWORD2>PS1</KEYWORD2>
-         <KEYWORD2>PS0</KEYWORD2>
-         <KEYWORD2>ADIE</KEYWORD2>
-         <KEYWORD2>RCIE</KEYWORD2>
-         <KEYWORD2>TXIE</KEYWORD2>
-         <KEYWORD2>SSPIE</KEYWORD2>
-         <KEYWORD2>CCP1IE</KEYWORD2>
-         <KEYWORD2>TMR2IE</KEYWORD2>
-         <KEYWORD2>TMR1IE</KEYWORD2>
-         <KEYWORD2>OSFIE</KEYWORD2>
-         <KEYWORD2>C2IE</KEYWORD2>
-         <KEYWORD2>C1IE</KEYWORD2>
-         <KEYWORD2>EEIE</KEYWORD2>
-         <KEYWORD2>BCLIE</KEYWORD2>
-         <KEYWORD2>ULPWUIE</KEYWORD2>
-         <KEYWORD2>CCP2IE</KEYWORD2>
-         <KEYWORD2>ULPWUE</KEYWORD2>
-         <KEYWORD2>SBOREN</KEYWORD2>
-         <KEYWORD2>NOT_POR</KEYWORD2>
-         <KEYWORD2>NOT_BO</KEYWORD2>
-         <KEYWORD2>NOT_BOR</KEYWORD2>
-         <KEYWORD2>IRCF2</KEYWORD2>
-         <KEYWORD2>IRCF1</KEYWORD2>
-         <KEYWORD2>IRCF0</KEYWORD2>
-         <KEYWORD2>OSTS</KEYWORD2>
-         <KEYWORD2>HTS</KEYWORD2>
-         <KEYWORD2>LTS</KEYWORD2>
-         <KEYWORD2>SCS</KEYWORD2>
-         <KEYWORD2>TUN4</KEYWORD2>
-         <KEYWORD2>TUN3</KEYWORD2>
-         <KEYWORD2>TUN2</KEYWORD2>
-         <KEYWORD2>TUN1</KEYWORD2>
-         <KEYWORD2>TUN0</KEYWORD2>
-         <KEYWORD2>GCEN</KEYWORD2>
-         <KEYWORD2>ACKSTAT</KEYWORD2>
-         <KEYWORD2>ACKDT</KEYWORD2>
-         <KEYWORD2>ACKEN</KEYWORD2>
-         <KEYWORD2>RCEN</KEYWORD2>
-         <KEYWORD2>PEN</KEYWORD2>
-         <KEYWORD2>RSEN</KEYWORD2>
-         <KEYWORD2>SEN</KEYWORD2>
-         <KEYWORD2>SMP</KEYWORD2>
-         <KEYWORD2>CKE</KEYWORD2>
-         <KEYWORD2>D</KEYWORD2>
-         <KEYWORD2>I2C_DATA</KEYWORD2>
-         <KEYWORD2>NOT_A</KEYWORD2>
-         <KEYWORD2>NOT_ADDRESS</KEYWORD2>
-         <KEYWORD2>D_A</KEYWORD2>
-         <KEYWORD2>DATA_ADDRESS</KEYWORD2>
-         <KEYWORD2>P</KEYWORD2>
-         <KEYWORD2>I2C_STOP</KEYWORD2>
-         <KEYWORD2>S</KEYWORD2>
-         <KEYWORD2>I2C_START</KEYWORD2>
-         <KEYWORD2>R</KEYWORD2>
-         <KEYWORD2>I2C_READ</KEYWORD2>
-         <KEYWORD2>NOT_W</KEYWORD2>
-         <KEYWORD2>NOT_WRITE</KEYWORD2>
-         <KEYWORD2>R_W</KEYWORD2>
-         <KEYWORD2>READ_WRITE</KEYWORD2>
-         <KEYWORD2>UA</KEYWORD2>
-         <KEYWORD2>BF</KEYWORD2>
-         <KEYWORD2>WPUB7</KEYWORD2>
-         <KEYWORD2>WPUB6</KEYWORD2>
-         <KEYWORD2>WPUB5</KEYWORD2>
-         <KEYWORD2>WPUB4</KEYWORD2>
-         <KEYWORD2>WPUB3</KEYWORD2>
-         <KEYWORD2>WPUB2</KEYWORD2>
-         <KEYWORD2>WPUB1</KEYWORD2>
-         <KEYWORD2>WPUB0</KEYWORD2>
-         <KEYWORD2>IOCB7</KEYWORD2>
-         <KEYWORD2>IOCB6</KEYWORD2>
-         <KEYWORD2>IOCB5</KEYWORD2>
-         <KEYWORD2>IOCB4</KEYWORD2>
-         <KEYWORD2>IOCB3</KEYWORD2>
-         <KEYWORD2>IOCB2</KEYWORD2>
-         <KEYWORD2>IOCB1</KEYWORD2>
-         <KEYWORD2>IOCB0</KEYWORD2>
-         <KEYWORD2>VREN</KEYWORD2>
-         <KEYWORD2>VROE</KEYWORD2>
-         <KEYWORD2>VRR</KEYWORD2>
-         <KEYWORD2>VRSS</KEYWORD2>
-         <KEYWORD2>VR3</KEYWORD2>
-         <KEYWORD2>VR2</KEYWORD2>
-         <KEYWORD2>VR1</KEYWORD2>
-         <KEYWORD2>VR0</KEYWORD2>
-         <KEYWORD2>CSRC</KEYWORD2>
-         <KEYWORD2>TX9</KEYWORD2>
-         <KEYWORD2>NOT_TX8</KEYWORD2>
-         <KEYWORD2>TX8_9</KEYWORD2>
-         <KEYWORD2>TXEN</KEYWORD2>
-         <KEYWORD2>SYNC</KEYWORD2>
-         <KEYWORD2>SENDB</KEYWORD2>
-         <KEYWORD2>BRGH</KEYWORD2>
-         <KEYWORD2>TRMT</KEYWORD2>
-         <KEYWORD2>TX9D</KEYWORD2>
-         <KEYWORD2>TXD8</KEYWORD2>
-         <KEYWORD2>BRG7</KEYWORD2>
-         <KEYWORD2>BRG6</KEYWORD2>
-         <KEYWORD2>BRG5</KEYWORD2>
-         <KEYWORD2>BRG4</KEYWORD2>
-         <KEYWORD2>BRG3</KEYWORD2>
-         <KEYWORD2>BRG2</KEYWORD2>
-         <KEYWORD2>BRG1</KEYWORD2>
-         <KEYWORD2>BRG0</KEYWORD2>
-         <KEYWORD2>BRG15</KEYWORD2>
-         <KEYWORD2>BRG14</KEYWORD2>
-         <KEYWORD2>BRG13</KEYWORD2>
-         <KEYWORD2>BRG12</KEYWORD2>
-         <KEYWORD2>BRG11</KEYWORD2>
-         <KEYWORD2>BRG10</KEYWORD2>
-         <KEYWORD2>BRG9</KEYWORD2>
-         <KEYWORD2>BRG8</KEYWORD2>
-         <KEYWORD2>PRSEN</KEYWORD2>
-         <KEYWORD2>PDC6</KEYWORD2>
-         <KEYWORD2>PDC5</KEYWORD2>
-         <KEYWORD2>PDC4</KEYWORD2>
-         <KEYWORD2>PDC3</KEYWORD2>
-         <KEYWORD2>PDC2</KEYWORD2>
-         <KEYWORD2>PDC1</KEYWORD2>
-         <KEYWORD2>PDC0</KEYWORD2>
-         <KEYWORD2>ECCPASE</KEYWORD2>
-         <KEYWORD2>ECCPAS2</KEYWORD2>
-         <KEYWORD2>ECCPAS1</KEYWORD2>
-         <KEYWORD2>ECCPAS0</KEYWORD2>
-         <KEYWORD2>PSSAC1</KEYWORD2>
-         <KEYWORD2>PSSAC0</KEYWORD2>
-         <KEYWORD2>PSSBD1</KEYWORD2>
-         <KEYWORD2>PSSBD0</KEYWORD2>
-         <KEYWORD2>STRSYNC</KEYWORD2>
-         <KEYWORD2>STRD</KEYWORD2>
-         <KEYWORD2>STRC</KEYWORD2>
-         <KEYWORD2>STRB</KEYWORD2>
-         <KEYWORD2>STRA</KEYWORD2>
-         <KEYWORD2>ADFM</KEYWORD2>
-         <KEYWORD2>VCFG1</KEYWORD2>
-         <KEYWORD2>VCFG0</KEYWORD2>
-         <KEYWORD2>WDTPS3</KEYWORD2>
-         <KEYWORD2>WDTPS2</KEYWORD2>
-         <KEYWORD2>WDTPS1</KEYWORD2>
-         <KEYWORD2>WDTPS0</KEYWORD2>
-         <KEYWORD2>SWDTEN</KEYWORD2>
-         <KEYWORD2>C1ON</KEYWORD2>
-         <KEYWORD2>C1OUT</KEYWORD2>
-         <KEYWORD2>C1OE</KEYWORD2>
-         <KEYWORD2>C1POL</KEYWORD2>
-         <KEYWORD2>C1R</KEYWORD2>
-         <KEYWORD2>C1CH1</KEYWORD2>
-         <KEYWORD2>C1CH0</KEYWORD2>
-         <KEYWORD2>C2ON</KEYWORD2>
-         <KEYWORD2>C2OUT</KEYWORD2>
-         <KEYWORD2>C2OE</KEYWORD2>
-         <KEYWORD2>C2POL</KEYWORD2>
-         <KEYWORD2>C2R</KEYWORD2>
-         <KEYWORD2>C2CH1</KEYWORD2>
-         <KEYWORD2>C2CH0</KEYWORD2>
-         <KEYWORD2>MC1OUT</KEYWORD2>
-         <KEYWORD2>MC2OUT</KEYWORD2>
-         <KEYWORD2>C1RSEL</KEYWORD2>
-         <KEYWORD2>C2RSEL</KEYWORD2>
-         <KEYWORD2>T1GSS</KEYWORD2>
-         <KEYWORD2>C2SYNC</KEYWORD2>
-         <KEYWORD2>SR0</KEYWORD2>
-         <KEYWORD2>SR1</KEYWORD2>
-         <KEYWORD2>C1SEN</KEYWORD2>
-         <KEYWORD2>C2REN</KEYWORD2>
-         <KEYWORD2>PULSS</KEYWORD2>
-         <KEYWORD2>PULSR</KEYWORD2>
-         <KEYWORD2>FVREN</KEYWORD2>
-         <KEYWORD2>ABDOVF</KEYWORD2>
-         <KEYWORD2>RCIDL</KEYWORD2>
-         <KEYWORD2>SCKP</KEYWORD2>
-         <KEYWORD2>BRG16</KEYWORD2>
-         <KEYWORD2>WUE</KEYWORD2>
-         <KEYWORD2>ABDEN</KEYWORD2>
-
-         <KEYWORD2>ANS0</KEYWORD2>
-         <KEYWORD2>ANS1</KEYWORD2>
-         <KEYWORD2>ANS2</KEYWORD2>
-         <KEYWORD2>ANS3</KEYWORD2>
-         <KEYWORD2>ANS4</KEYWORD2>
-         <KEYWORD2>ANS5</KEYWORD2>
-         <KEYWORD2>ANS6</KEYWORD2>
-         <KEYWORD2>ANS7</KEYWORD2>
-         <KEYWORD2>ANS8</KEYWORD2>
-         <KEYWORD2>ANS9</KEYWORD2>
-         <KEYWORD2>ANS10</KEYWORD2>
-         <KEYWORD2>ANS11</KEYWORD2>
-         <KEYWORD2>ANS12</KEYWORD2>
-         <KEYWORD2>ANS13</KEYWORD2>
-
-         <KEYWORD2>EEPGD</KEYWORD2>
-         <KEYWORD2>WRERR</KEYWORD2>
-         <KEYWORD2>WREN</KEYWORD2>
-         <KEYWORD2>WR</KEYWORD2>
-         <KEYWORD2>RD</KEYWORD2>
-
-         <!-- [Pins-DIP] -->
-         <KEYWORD2>RA0</KEYWORD2>
-         <KEYWORD2>RA1</KEYWORD2>
-         <KEYWORD2>RA2</KEYWORD2>
-         <KEYWORD2>RA3</KEYWORD2>
-         <KEYWORD2>RA4</KEYWORD2>
-         <KEYWORD2>RA5</KEYWORD2>
-         <KEYWORD2>RA6</KEYWORD2>
-         <KEYWORD2>RA7</KEYWORD2>
-
-         <KEYWORD2>RB0</KEYWORD2>
-         <KEYWORD2>RB1</KEYWORD2>
-         <KEYWORD2>RB2</KEYWORD2>
-         <KEYWORD2>RB3</KEYWORD2>
-         <KEYWORD2>RB4</KEYWORD2>
-         <KEYWORD2>RB5</KEYWORD2>
-         <KEYWORD2>RB6</KEYWORD2>
-         <KEYWORD2>RB7</KEYWORD2>
-
-         <KEYWORD2>RC0</KEYWORD2>
-         <KEYWORD2>RC1</KEYWORD2>
-         <KEYWORD2>RC2</KEYWORD2>
-         <KEYWORD2>RC3</KEYWORD2>
-         <KEYWORD2>RC4</KEYWORD2>
-         <KEYWORD2>RC5</KEYWORD2>
-         <KEYWORD2>RC6</KEYWORD2>
-         <KEYWORD2>RC7</KEYWORD2>
-
-         <KEYWORD2>RD0</KEYWORD2>
-         <KEYWORD2>RD1</KEYWORD2>
-         <KEYWORD2>RD2</KEYWORD2>
-         <KEYWORD2>RD3</KEYWORD2>
-         <KEYWORD2>RD4</KEYWORD2>
-         <KEYWORD2>RD5</KEYWORD2>
-         <KEYWORD2>RD6</KEYWORD2>
-         <KEYWORD2>RD7</KEYWORD2>
-
-         <KEYWORD2>RE0</KEYWORD2>
-         <KEYWORD2>RE1</KEYWORD2>
-         <KEYWORD2>RE2</KEYWORD2>
-         <KEYWORD2>RE3</KEYWORD2>
-         <KEYWORD2>RE4</KEYWORD2>
-         <KEYWORD2>RE5</KEYWORD2>
-         <KEYWORD2>RE6</KEYWORD2>
-         <KEYWORD2>RE7</KEYWORD2>
-
-         <KEYWORD2>RF0</KEYWORD2>
-         <KEYWORD2>RF1</KEYWORD2>
-         <KEYWORD2>RF2</KEYWORD2>
-         <KEYWORD2>RF3</KEYWORD2>
-         <KEYWORD2>RF4</KEYWORD2>
-         <KEYWORD2>RF5</KEYWORD2>
-         <KEYWORD2>RF6</KEYWORD2>
-         <KEYWORD2>RF7</KEYWORD2>
-
-         <KEYWORD2>RG0</KEYWORD2>
-         <KEYWORD2>RG1</KEYWORD2>
-         <KEYWORD2>RG2</KEYWORD2>
-         <KEYWORD2>RG3</KEYWORD2>
-         <KEYWORD2>RG4</KEYWORD2>
-         <KEYWORD2>RG5</KEYWORD2>
-         <KEYWORD2>RG6</KEYWORD2>
-         <KEYWORD2>RG7</KEYWORD2>
-
-         <KEYWORD2>RH0</KEYWORD2>
-         <KEYWORD2>RH1</KEYWORD2>
-         <KEYWORD2>RH2</KEYWORD2>
-         <KEYWORD2>RH3</KEYWORD2>
-         <KEYWORD2>RH4</KEYWORD2>
-         <KEYWORD2>RH5</KEYWORD2>
-         <KEYWORD2>RH6</KEYWORD2>
-         <KEYWORD2>RH7</KEYWORD2>
-
-         <KEYWORD2>RI0</KEYWORD2>
-         <KEYWORD2>RI1</KEYWORD2>
-         <KEYWORD2>RI2</KEYWORD2>
-         <KEYWORD2>RI3</KEYWORD2>
-         <KEYWORD2>RI4</KEYWORD2>
-         <KEYWORD2>RI5</KEYWORD2>
-         <KEYWORD2>RI6</KEYWORD2>
-         <KEYWORD2>RI7</KEYWORD2>
-
-         <KEYWORD2>RJ0</KEYWORD2>
-         <KEYWORD2>RJ1</KEYWORD2>
-         <KEYWORD2>RJ2</KEYWORD2>
-         <KEYWORD2>RJ3</KEYWORD2>
-         <KEYWORD2>RJ4</KEYWORD2>
-         <KEYWORD2>RJ5</KEYWORD2>
-         <KEYWORD2>RJ6</KEYWORD2>
-         <KEYWORD2>RJ7</KEYWORD2>
-
-         <KEYWORD2>AN0</KEYWORD2>
-         <KEYWORD2>AN1</KEYWORD2>
-         <KEYWORD2>AN2</KEYWORD2>
-         <KEYWORD2>AN3</KEYWORD2>
-         <KEYWORD2>AN4</KEYWORD2>
-         <KEYWORD2>AN5</KEYWORD2>
-         <KEYWORD2>AN6</KEYWORD2>
-         <KEYWORD2>AN7</KEYWORD2>
-         <KEYWORD2>AN8</KEYWORD2>
-         <KEYWORD2>AN9</KEYWORD2>
-         <KEYWORD2>AN0</KEYWORD2>
-         <KEYWORD2>AN11</KEYWORD2>
-         <KEYWORD2>AN12</KEYWORD2>
-         <KEYWORD2>AN13</KEYWORD2>
-         <KEYWORD2>AN14</KEYWORD2>
-         <KEYWORD2>AN15</KEYWORD2>
-         <KEYWORD2>AN16</KEYWORD2>
-         <KEYWORD2>AN17</KEYWORD2>
-         <KEYWORD2>AN18</KEYWORD2>
-         <KEYWORD2>AN19</KEYWORD2>
-
-         <KEYWORD2>MCLR</KEYWORD2>
-
-         <KEYWORD2>C1INP</KEYWORD2>
-         <KEYWORD2>C2INP</KEYWORD2>
-
-         <KEYWORD2>T1G</KEYWORD2>
-
-         <KEYWORD2>T1CKI</KEYWORD2>
-         <KEYWORD2>T0CKI</KEYWORD2>
-
-         <KEYWORD2>C1OUT</KEYWORD2>
-         <KEYWORD2>C2OUT</KEYWORD2>
-
-         <KEYWORD2>OSC1</KEYWORD2>
-         <KEYWORD2>OSC2</KEYWORD2>
-
-         <KEYWORD2>U1TX</KEYWORD2>
-         <KEYWORD2>U1RX</KEYWORD2>
-
-         <KEYWORD2>CCP1</KEYWORD2>
-         <KEYWORD2>CCP2</KEYWORD2>
-
-         <KEYWORD2>ECCPA</KEYWORD2>
-         <KEYWORD2>ECCPB</KEYWORD2>
-         <KEYWORD2>ECCPC</KEYWORD2>
-         <KEYWORD2>ECCPD</KEYWORD2>
-
-         <KEYWORD2>Vss</KEYWORD2>
-         <KEYWORD2>Vdd</KEYWORD2>
-         <KEYWORD2>Vss</KEYWORD2>
-         <KEYWORD2>Vdd</KEYWORD2>
-
-         <!-- [ConfigOps] -->
-         <KEYWORD2>DEBUG</KEYWORD2>
-         <KEYWORD2>LVP</KEYWORD2>
-         <KEYWORD2>FCMEN</KEYWORD2>
-         <KEYWORD2>IESO</KEYWORD2>
-         <KEYWORD2>BOR</KEYWORD2>
-         <KEYWORD2>CPD</KEYWORD2>
-         <KEYWORD2>CP</KEYWORD2>
-         <KEYWORD2>MCLRE</KEYWORD2>
-         <KEYWORD2>PWRTE</KEYWORD2>
-         <KEYWORD2>WDT</KEYWORD2>
-         <KEYWORD2>OSC</KEYWORD2>
-         <KEYWORD2>WRT</KEYWORD2>
-         <KEYWORD2>BORV</KEYWORD2>
-
-
-         <!-- [Config] -->
-         <KEYWORD2>DEBUG_ON</KEYWORD2>
-         <KEYWORD2>DEBUG_OFF</KEYWORD2>
-         <KEYWORD2>LVP_ON</KEYWORD2>
-         <KEYWORD2>LVP_OFF</KEYWORD2>
-         <KEYWORD2>FCMEN_ON</KEYWORD2>
-         <KEYWORD2>FCMEN_OFF</KEYWORD2>
-         <KEYWORD2>IESO_ON</KEYWORD2>
-         <KEYWORD2>IESO_OFF</KEYWORD2>
-         <KEYWORD2>BOR_ON</KEYWORD2>
-         <KEYWORD2>BOR_NSLEEP</KEYWORD2>
-         <KEYWORD2>BOR_SBODEN</KEYWORD2>
-         <KEYWORD2>BOR_OFF</KEYWORD2>
-         <KEYWORD2>CPD_ON</KEYWORD2>
-         <KEYWORD2>CPD_OFF</KEYWORD2>
-         <KEYWORD2>CP_ON</KEYWORD2>
-         <KEYWORD2>CP_OFF</KEYWORD2>
-         <KEYWORD2>MCLRE_ON</KEYWORD2>
-         <KEYWORD2>MCLRE_OFF</KEYWORD2>
-         <KEYWORD2>PWRTE_ON</KEYWORD2>
-         <KEYWORD2>PWRTE_OFF</KEYWORD2>
-         <KEYWORD2>WDT_ON</KEYWORD2>
-         <KEYWORD2>WDT_OFF</KEYWORD2>
-         <KEYWORD2>LP_OSC</KEYWORD2>
-         <KEYWORD2>XT_OSC</KEYWORD2>
-         <KEYWORD2>HS_OSC</KEYWORD2>
-         <KEYWORD2>EC_OSC</KEYWORD2>
-         <KEYWORD2>INTRC_OSC_NOCLKOUT</KEYWORD2>
-         <KEYWORD2>INTRC_OSC_CLKOUT</KEYWORD2>
-         <KEYWORD2>EXTRC_OSC_NOCLKOUT</KEYWORD2>
-         <KEYWORD2>EXTRC_OSC_CLKOUT</KEYWORD2>
-         <KEYWORD2>INTOSCIO</KEYWORD2>
-         <KEYWORD2>INTOSC</KEYWORD2>
-         <KEYWORD2>EXTRCIO</KEYWORD2>
-         <KEYWORD2>EXTRC</KEYWORD2>
-         <KEYWORD2>WRT_OFF</KEYWORD2>
-         <KEYWORD2>WRT_256</KEYWORD2>
-         <KEYWORD2>WRT_1FOURTH</KEYWORD2>
-         <KEYWORD2>WRT_HALF</KEYWORD2>
-         <KEYWORD2>BOR21V</KEYWORD2>
-         <KEYWORD2>BOR40V</KEYWORD2>
-
-
-         <!--  ====== CHIP DATA : END  ====== -->
-
-
-			<!-- Flow Control -->
-			<KEYWORD1>if</KEYWORD1>
-			<KEYWORD1>then</KEYWORD1>
-			<KEYWORD1>end</KEYWORD1>
-			<KEYWORD1>goto</KEYWORD1>
-			<KEYWORD1>gosub</KEYWORD1>
-			<KEYWORD1>return</KEYWORD1>
-
-			<!-- Loop Statements -->
-			<KEYWORD1>for</KEYWORD1>
-			<KEYWORD1>to</KEYWORD1>
-			<KEYWORD1>step</KEYWORD1>
-			<KEYWORD1>next</KEYWORD1>
-
-			<!-- Do..Loop -->
-			<KEYWORD1>do</KEYWORD1>
-			<KEYWORD1>while</KEYWORD1>
-			<KEYWORD1>until</KEYWORD1>
-			<KEYWORD1>loop</KEYWORD1>
-
-         <!-- Repeat..Loop -->
-			<KEYWORD1>repeat</KEYWORD1>
-
-         <!-- Select..Case -->
-			<KEYWORD1>select</KEYWORD1>
-         <KEYWORD1>case</KEYWORD1>
-
-         <!-- Call..Every -->
-			<KEYWORD1>call</KEYWORD1>
-         <KEYWORD1>every</KEYWORD1>
-
-			<!-- Closing, Exit Statements -->
-			<KEYWORD1>exit</KEYWORD1>
-			<KEYWORD1>end</KEYWORD1>
-
-			<!-- Methods, Functions, Class, Properties, Variables -->
-			<KEYWORD1>function</KEYWORD1>
-			<KEYWORD1>sub</KEYWORD1>
-         <KEYWORD1>macro</KEYWORD1>
-         <KEYWORD1>let</KEYWORD1>
-
-			<!-- Declaration -->
-			<KEYWORD1>dim</KEYWORD1>
-			<KEYWORD1>as</KEYWORD1>
-
-			<!-- Bitwise -->
-			<KEYWORD1>rotate</KEYWORD1>
-			<KEYWORD1>left</KEYWORD1>
-			<KEYWORD1>right</KEYWORD1>
-         <KEYWORD1>simple</KEYWORD1>
-         <KEYWORD1>set</KEYWORD1>
-
-			<!-- Comments -->
-			<KEYWORD1>rem</KEYWORD1>
-
-         <!-- RS 232 Commands -->
-         <KEYWORD1>InitSer </KEYWORD1>
-         <KEYWORD1>SerSend </KEYWORD1>
-         <KEYWORD1>SerReceive </KEYWORD1>
-         <KEYWORD1>SerPrint </KEYWORD1>
-
-         <!-- A/D Commands -->
-         <KEYWORD1>ReadAD </KEYWORD1>
-         <KEYWORD1>ADFormat </KEYWORD1>
-         <KEYWORD1>ADOff </KEYWORD1>
-
-         <!-- SPI/I2C Commands -->
-         <KEYWORD1>SPIMode </KEYWORD1>
-         <KEYWORD1>SPITransfer </KEYWORD1>
-
-         <!-- EEPROM Commands -->
-         <KEYWORD1>EPRead </KEYWORD1>
-         <KEYWORD1>EPWrite </KEYWORD1>
-         <KEYWORD1>ProgramWrite </KEYWORD1>
-         <KEYWORD1>ProgramRead </KEYWORD1>
-         <KEYWORD1>ProgramErase </KEYWORD1>
-
-         <!-- Hardware PWM Commands -->
-         <KEYWORD1>PWMOn </KEYWORD1>
-         <KEYWORD1>PWMOff </KEYWORD1>
-         <KEYWORD1>HPWM </KEYWORD1>
-
-         <!-- SRF04 Distance Sensor PWM Commands -->
-         <KEYWORD1>USDistance </KEYWORD1>
-
-         <!-- Sound PWM Commands -->
-         <KEYWORD1>Tone </KEYWORD1>
-
-         <!-- LCD Display Commands -->
-         <KEYWORD1>PRINT </KEYWORD1>
-         <KEYWORD1>LOCATE </KEYWORD1>
-         <KEYWORD1>PUT </KEYWORD1>
-         <KEYWORD1>CLS </KEYWORD1>
-         <KEYWORD1>LCDInt </KEYWORD1>
-         <KEYWORD1>LCDHex </KEYWORD1>
-         <KEYWORD1>LCDWord </KEYWORD1>
-
-         <!-- 7-Segment Display Commands -->
-         <KEYWORD1>DisplayValue </KEYWORD1>
-         <KEYWORD1>DisplayChar </KEYWORD1>
-
-         <!-- Keypad Commands -->
-         <KEYWORD1>KeypadRaw</KEYWORD1>
-         <KEYWORD1>KeypadData</KEYWORD1>
-
-         <!-- String handling Functions -->
-         <KEYWORD1>LEN </KEYWORD1>
-         <KEYWORD1>MID$ </KEYWORD1>
-
-         <!-- Timer Functions -->
-         <KEYWORD1>InitTimer0</KEYWORD1>
-         <KEYWORD1>InitTimer1</KEYWORD1>
-         <KEYWORD1>InitTimer2</KEYWORD1>
-         <KEYWORD1>ClearTimer</KEYWORD1>
-         <KEYWORD1>StartTimer</KEYWORD1>
-         <KEYWORD1>StopTimer</KEYWORD1>
-
-			<!-- Miscellaneous Commands/Functions -->
-			<KEYWORD1>WAIT</KEYWORD1>
-			<KEYWORD1>SLEEP</KEYWORD1>
-			<KEYWORD1>DIR</KEYWORD1>
-			<KEYWORD3>IN</KEYWORD3>
-			<KEYWORD3>OUT</KEYWORD3>
-			<KEYWORD1>PORT</KEYWORD1>
-			<KEYWORD1>PULSEOUT</KEYWORD1>
-			<KEYWORD1>POT</KEYWORD1>
-         <KEYWORD1>PWMOut</KEYWORD1>
-         <KEYWORD1>PEEK</KEYWORD1>
-         <KEYWORD1>POKE</KEYWORD1>
-         <KEYWORD1>Random</KEYWORD1>
-         <KEYWORD1>Swap</KEYWORD1>
-         <KEYWORD1>Swap4</KEYWORD1>
-         <KEYWORD1>Table</KEYWORD1>
-         <KEYWORD1>ReadTable</KEYWORD1>
-
-			<!-- Logical operators -->
-			<OPERATOR>and</OPERATOR>
-			<OPERATOR>or</OPERATOR>
-			<OPERATOR>not</OPERATOR>
-			<OPERATOR>xor</OPERATOR>
-
-			<!-- Datatypes Constants/Literals -->
-			<KEYWORD3>false</KEYWORD3>
-			<KEYWORD3>true</KEYWORD3>
-			<KEYWORD3>on</KEYWORD3>
-			<KEYWORD3>off</KEYWORD3>
-
-			<!-- Constants Time Units -->
-			<LITERAL2>us</LITERAL2>
-			<LITERAL2>10us</LITERAL2>
-			<LITERAL2>ms</LITERAL2>
-			<LITERAL2>10ms</LITERAL2>
-			<LITERAL2>s</LITERAL2>
-         <LITERAL2>sec</LITERAL2>
-			<LITERAL2>m</LITERAL2>
-			<LITERAL2>h</LITERAL2>
-
-			<!-- Data Types -->
-			<LITERAL2>bit</LITERAL2>
-			<LITERAL2>byte</LITERAL2>
-			<LITERAL2>word</LITERAL2>
-			<LITERAL2>float</LITERAL2>
-
-         <!-- Built-in #defines (used for #IFDEF) -->
-         <LITERAL2>ChipMHz</LITERAL2>
-         <LITERAL2>ChipName</LITERAL2>
-         <LITERAL2>ChipFamily</LITERAL2>
-         <LITERAL2>OSC</LITERAL2>
-         <LITERAL2>Var</LITERAL2>
-         <LITERAL2>NoVar</LITERAL2>
-         <LITERAL2>Bit</LITERAL2>
-         <LITERAL2>NoBit</LITERAL2>
-         <LITERAL2>AllOf</LITERAL2>
-         <LITERAL2>OneOf</LITERAL2>
-
-		</KEYWORDS>
-
-      <!-- Binary Numbers instead of single quote comments. For example b'00011011' -->
-      <SPAN TYPE="LITERAL1" >
-      <BEGIN>b'</BEGIN><END>'</END>
-      </SPAN>
-
-	</RULES>
-
-</MODE>
-
-
-
diff --git a/qpython/src/main/assets/syntax/gettext.xml b/qpython/src/main/assets/syntax/gettext.xml
deleted file mode 100644
index 857ec330..00000000
--- a/qpython/src/main/assets/syntax/gettext.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<MODE>
-<!--
-	** jEdit edit mode for gettext catalogs (.po/.pot extension)
-	** Use the ConfigurableFoldHandler plugin for optimal
-	** results. =)
--->
-	<PROPS>
-		<PROPERTY NAME="lineComment" VALUE="# " />
-	</PROPS>
-	<RULES IGNORE_CASE="TRUE" HIGHLIGHT_DIGITS="TRUE">
-		<!-- Comments -->
-		<EOL_SPAN TYPE="COMMENT2">#:</EOL_SPAN>
-		<EOL_SPAN TYPE="COMMENT1"># </EOL_SPAN>
-		<EOL_SPAN TYPE="COMMENT2">#.</EOL_SPAN>
-		<EOL_SPAN TYPE="COMMENT2">#~</EOL_SPAN>
-
-		<MARK_FOLLOWING TYPE="COMMENT2">#,</MARK_FOLLOWING>
-		<MARK_FOLLOWING TYPE="KEYWORD3">%</MARK_FOLLOWING>
-		<MARK_FOLLOWING TYPE="KEYWORD3">$</MARK_FOLLOWING>
-		<MARK_FOLLOWING TYPE="KEYWORD3">@</MARK_FOLLOWING>
-
-		<SPAN TYPE="LITERAL1" DELEGATE="QUOTED" >
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-
-		<!-- keywords -->
-		<KEYWORDS>
-			<KEYWORD1>msgid</KEYWORD1>
-			<KEYWORD1>msgid_plural</KEYWORD1>
-			<KEYWORD1>msgstr</KEYWORD1>
-			<KEYWORD2>fuzzy</KEYWORD2>
-<!--		** Ideally, we'd highlight the next msgstr differently
-			** whenever fuzzy is encountered, but this doesn't seem
-			** to be possible just yet.
--->
-			<KEYWORD2>c-format</KEYWORD2>
-			<KEYWORD2>no-c-format</KEYWORD2>
-		</KEYWORDS>
-
-	</RULES>
-
-	<RULES SET="QUOTED" DEFAULT="LITERAL1">
-		<SPAN TYPE="LITERAL2" NO_LINE_BREAK="TRUE">
-			<BEGIN>\"</BEGIN>
-			<END>\"</END>
-		</SPAN>
-
-		<MARK_FOLLOWING TYPE="KEYWORD3">%</MARK_FOLLOWING>
-		<MARK_FOLLOWING TYPE="KEYWORD3">$</MARK_FOLLOWING>
-		<MARK_FOLLOWING TYPE="KEYWORD3">@</MARK_FOLLOWING>
-	</RULES>
-
-</MODE>
diff --git a/qpython/src/main/assets/syntax/gnuplot.xml b/qpython/src/main/assets/syntax/gnuplot.xml
deleted file mode 100644
index 508116be..00000000
--- a/qpython/src/main/assets/syntax/gnuplot.xml
+++ /dev/null
@@ -1,270 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!-- COBOL mode, by Loren Charnley III -->
-
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="lineComment" VALUE="#" />
-	</PROPS>
-
-	<RULES IGNORE_CASE="FALSE">
-
-	<!-- Comments -->
-	<EOL_SPAN TYPE="COMMENT1">#</EOL_SPAN>
-
-	<!-- Literals -->
-	<SPAN TYPE="LITERAL1" ESCAPE="\">
-		<BEGIN>"</BEGIN>
-		<END>"</END>
-	</SPAN>
-	<SPAN TYPE="LITERAL2" ESCAPE="\">
-		<BEGIN>'</BEGIN>
-		<END>'</END>
-	</SPAN>
-
-	<SPAN TYPE="LITERAL2" ESCAPE="\" NO_LINE_BREAK="TRUE">
-		<BEGIN>[</BEGIN>
-		<END>]</END>
-  	</SPAN>
-
-	<SPAN TYPE="LITERAL2" ESCAPE="\" NO_LINE_BREAK="TRUE">
-		<BEGIN>{</BEGIN>
-		<END>}</END>
-  	</SPAN>
-
-	<!-- Operators -->
-	<SEQ TYPE="OPERATOR">-</SEQ>
-	<SEQ TYPE="OPERATOR">+</SEQ>
-	<SEQ TYPE="OPERATOR">~</SEQ>
-	<SEQ TYPE="OPERATOR">!</SEQ>
-	<SEQ TYPE="OPERATOR">$</SEQ>
-	<SEQ TYPE="OPERATOR">*</SEQ>
-	<SEQ TYPE="OPERATOR">%</SEQ>
-	<SEQ TYPE="OPERATOR">=</SEQ>
-	<SEQ TYPE="OPERATOR">&gt;</SEQ>
-	<SEQ TYPE="OPERATOR">&lt;</SEQ>
-	<SEQ TYPE="OPERATOR">&amp;</SEQ>
-	<SEQ TYPE="OPERATOR">&gt;=</SEQ>
-	<SEQ TYPE="OPERATOR">&lt;=</SEQ>
-	<SEQ TYPE="OPERATOR">|</SEQ>
-	<SEQ TYPE="OPERATOR">^</SEQ>
-	<SEQ TYPE="OPERATOR">?</SEQ>
-	<SEQ TYPE="OPERATOR">:</SEQ>
-
-	<!-- Function calls -->
-	<MARK_PREVIOUS TYPE="FUNCTION" MATCH_TYPE="OPERATOR">(</MARK_PREVIOUS>
-	<SEQ TYPE="OPERATOR">)</SEQ>
-
-
-	<!-- Keywords -->
-	<KEYWORDS>
-
-		<!-- GNUplot Commands -->
-		<KEYWORD1>cd</KEYWORD1>
-		<KEYWORD1>call</KEYWORD1>
-		<KEYWORD1>clear</KEYWORD1>
-		<KEYWORD1>exit</KEYWORD1>
-		<KEYWORD1>fit</KEYWORD1>
-		<KEYWORD1>help</KEYWORD1>
-		<KEYWORD1>history</KEYWORD1>
-		<KEYWORD1>if</KEYWORD1>
-		<KEYWORD1>load</KEYWORD1>
-		<KEYWORD1>pause</KEYWORD1>
-		<KEYWORD1>plot</KEYWORD1>
-			<KEYWORD1>using</KEYWORD1>
-			<KEYWORD1>with</KEYWORD1>
-			<KEYWORD1>index</KEYWORD1>
-			<KEYWORD1>every</KEYWORD1>
-			<KEYWORD1>smooth</KEYWORD1>
-			<KEYWORD1>thru</KEYWORD1>
-		<KEYWORD1>print</KEYWORD1>
-		<KEYWORD1>pwd</KEYWORD1>
-		<KEYWORD1>quit</KEYWORD1>
-		<KEYWORD1>replot</KEYWORD1>
-		<KEYWORD1>reread</KEYWORD1>
-		<KEYWORD1>reset</KEYWORD1>
-		<KEYWORD1>save</KEYWORD1>
-		<KEYWORD1>set</KEYWORD1>
-		<KEYWORD1>show</KEYWORD1>
-		<KEYWORD1>unset</KEYWORD1>
-		<KEYWORD1>shell</KEYWORD1>
-		<KEYWORD1>splot</KEYWORD1>
-		<KEYWORD1>system</KEYWORD1>
-		<KEYWORD1>test</KEYWORD1>
-		<KEYWORD1>unset</KEYWORD1>
-		<KEYWORD1>update</KEYWORD1>
-
-		<!-- GNUplot Functions -->
-		<KEYWORD2>abs</KEYWORD2>
-		<KEYWORD2>acos</KEYWORD2>
-		<KEYWORD2>acosh</KEYWORD2>
-		<KEYWORD2>arg</KEYWORD2>
-		<KEYWORD2>asin</KEYWORD2>
-		<KEYWORD2>asinh</KEYWORD2>
-		<KEYWORD2>atan</KEYWORD2>
-		<KEYWORD2>atan2</KEYWORD2>
-		<KEYWORD2>atanh</KEYWORD2>
-		<KEYWORD2>besj0</KEYWORD2>
-		<KEYWORD2>besj1</KEYWORD2>
-		<KEYWORD2>besy0</KEYWORD2>
-		<KEYWORD2>besy1</KEYWORD2>
-		<KEYWORD2>ceil</KEYWORD2>
-		<KEYWORD2>cos</KEYWORD2>
-		<KEYWORD2>cosh</KEYWORD2>
-		<KEYWORD2>erf</KEYWORD2>
-		<KEYWORD2>erfc</KEYWORD2>
-		<KEYWORD2>exp</KEYWORD2>
-		<KEYWORD2>floor</KEYWORD2>
-		<KEYWORD2>gamma</KEYWORD2>
-		<KEYWORD2>ibeta</KEYWORD2>
-		<KEYWORD2>inverf</KEYWORD2>
-		<KEYWORD2>igamma</KEYWORD2>
-		<KEYWORD2>imag</KEYWORD2>
-		<KEYWORD2>invnorm</KEYWORD2>
-		<KEYWORD2>int</KEYWORD2>
-		<KEYWORD2>lambertw</KEYWORD2>
-		<KEYWORD2>lgamma</KEYWORD2>
-		<KEYWORD2>log</KEYWORD2>
-		<KEYWORD2>log10</KEYWORD2>
-		<KEYWORD2>norm</KEYWORD2>
-		<KEYWORD2>rand</KEYWORD2>
-		<KEYWORD2>real</KEYWORD2>
-		<KEYWORD2>sgn</KEYWORD2>
-		<KEYWORD2>sin</KEYWORD2>
-		<KEYWORD2>sinh</KEYWORD2>
-		<KEYWORD2>sqrt</KEYWORD2>
-		<KEYWORD2>tan</KEYWORD2>
-		<KEYWORD2>tanh</KEYWORD2>
-		<KEYWORD2>column</KEYWORD2>
-		<KEYWORD2>defined</KEYWORD2>
-		<KEYWORD2>tm_hour</KEYWORD2>
-		<KEYWORD2>tm_mday</KEYWORD2>
-		<KEYWORD2>tm_min</KEYWORD2>
-		<KEYWORD2>tm_mon</KEYWORD2>
-		<KEYWORD2>tm_sec</KEYWORD2>
-		<KEYWORD2>tm_wday</KEYWORD2>
-		<KEYWORD2>tm_yday</KEYWORD2>
-		<KEYWORD2>tm_year</KEYWORD2>
-		<KEYWORD2>valid</KEYWORD2>
-
-		<!-- GNUplot Built-in Variables -->
-		<KEYWORD3>angles</KEYWORD3>
-		<KEYWORD3>arrow</KEYWORD3>
-		<KEYWORD3>autoscale</KEYWORD3>
-		<KEYWORD3>bars</KEYWORD3>
-		<KEYWORD3>bmargin</KEYWORD3>
-		<KEYWORD3>border</KEYWORD3>
-		<KEYWORD3>boxwidth</KEYWORD3>
-		<KEYWORD3>clabel</KEYWORD3>
-		<KEYWORD3>clip</KEYWORD3>
-		<KEYWORD3>cntrparam</KEYWORD3>
-		<KEYWORD3>colorbox</KEYWORD3>
-		<KEYWORD3>contour</KEYWORD3>
-		<KEYWORD3>datafile </KEYWORD3>
-		<KEYWORD3>decimalsign</KEYWORD3>
-		<KEYWORD3>dgrid3d</KEYWORD3>
-		<KEYWORD3>dummy</KEYWORD3>
-		<KEYWORD3>encoding</KEYWORD3>
-		<KEYWORD3>fit</KEYWORD3>
-		<KEYWORD3>fontpath</KEYWORD3>
-		<KEYWORD3>format</KEYWORD3>
-		<KEYWORD3>functions</KEYWORD3>
-		<KEYWORD3>function</KEYWORD3>
-		<KEYWORD3>grid</KEYWORD3>
-		<KEYWORD3>hidden3d</KEYWORD3>
-		<KEYWORD3>historysize</KEYWORD3>
-		<KEYWORD3>isosamples</KEYWORD3>
-		<KEYWORD3>key</KEYWORD3>
-		<KEYWORD3>label</KEYWORD3>
-		<KEYWORD3>lmargin</KEYWORD3>
-		<KEYWORD3>loadpath</KEYWORD3>
-		<KEYWORD3>locale</KEYWORD3>
-		<KEYWORD3>logscale</KEYWORD3>
-		<KEYWORD3>mapping</KEYWORD3>
-		<KEYWORD3>margin</KEYWORD3>
-		<KEYWORD3>mouse</KEYWORD3>
-		<KEYWORD3>multiplot</KEYWORD3>
-		<KEYWORD3>mx2tics</KEYWORD3>
-		<KEYWORD3>mxtics</KEYWORD3>
-		<KEYWORD3>my2tics</KEYWORD3>
-		<KEYWORD3>mytics</KEYWORD3>
-		<KEYWORD3>mztics</KEYWORD3>
-		<KEYWORD3>offsets</KEYWORD3>
-		<KEYWORD3>origin</KEYWORD3>
-		<KEYWORD3>output</KEYWORD3>
-		<KEYWORD3>parametric</KEYWORD3>
-		<KEYWORD3>plot</KEYWORD3>
-		<KEYWORD3>pm3d</KEYWORD3>
-		<KEYWORD3>palette</KEYWORD3>
-		<KEYWORD3>pointsize</KEYWORD3>
-		<KEYWORD3>polar</KEYWORD3>
-		<KEYWORD3>print</KEYWORD3>
-		<KEYWORD3>rmargin</KEYWORD3>
-		<KEYWORD3>rrange</KEYWORD3>
-		<KEYWORD3>samples</KEYWORD3>
-		<KEYWORD3>size</KEYWORD3>
-		<KEYWORD3>style</KEYWORD3>
-		<KEYWORD3>surface</KEYWORD3>
-		<KEYWORD3>terminal</KEYWORD3>
-		<KEYWORD3>tics</KEYWORD3>
-		<KEYWORD3>ticslevel</KEYWORD3>
-		<KEYWORD3>ticscale</KEYWORD3>
-		<KEYWORD3>timestamp</KEYWORD3>
-		<KEYWORD3>timefmt</KEYWORD3>
-		<KEYWORD3>title</KEYWORD3>
-		<KEYWORD3>tmargin</KEYWORD3>
-		<KEYWORD3>trange</KEYWORD3>
-		<KEYWORD3>urange</KEYWORD3>
-		<KEYWORD3>variables</KEYWORD3>
-		<KEYWORD3>version</KEYWORD3>
-		<KEYWORD3>view</KEYWORD3>
-		<KEYWORD3>vrange</KEYWORD3>
-		<KEYWORD3>x2data</KEYWORD3>
-		<KEYWORD3>x2dtics</KEYWORD3>
-		<KEYWORD3>x2label</KEYWORD3>
-		<KEYWORD3>x2mtics</KEYWORD3>
-		<KEYWORD3>x2range</KEYWORD3>
-		<KEYWORD3>x2tics</KEYWORD3>
-		<KEYWORD3>x2zeroaxis</KEYWORD3>
-		<KEYWORD3>xdata</KEYWORD3>
-		<KEYWORD3>xdtics</KEYWORD3>
-		<KEYWORD3>xlabel</KEYWORD3>
-		<KEYWORD3>xmtics</KEYWORD3>
-		<KEYWORD3>xrange</KEYWORD3>
-		<KEYWORD3>xtics</KEYWORD3>
-		<KEYWORD3>xzeroaxis</KEYWORD3>
-		<KEYWORD3>y2data</KEYWORD3>
-		<KEYWORD3>y2dtics</KEYWORD3>
-		<KEYWORD3>y2label</KEYWORD3>
-		<KEYWORD3>y2mtics</KEYWORD3>
-		<KEYWORD3>y2range</KEYWORD3>
-		<KEYWORD3>y2tics</KEYWORD3>
-		<KEYWORD3>y2zeroaxis</KEYWORD3>
-		<KEYWORD3>ydata</KEYWORD3>
-		<KEYWORD3>ydtics</KEYWORD3>
-		<KEYWORD3>ylabel</KEYWORD3>
-		<KEYWORD3>ymtics</KEYWORD3>
-		<KEYWORD3>yrange</KEYWORD3>
-		<KEYWORD3>ytics</KEYWORD3>
-		<KEYWORD3>yzeroaxis</KEYWORD3>
-		<KEYWORD3>zdata</KEYWORD3>
-		<KEYWORD3>zdtics</KEYWORD3>
-		<KEYWORD3>cbdata</KEYWORD3>
-		<KEYWORD3>cbdtics</KEYWORD3>
-		<KEYWORD3>zero</KEYWORD3>
-		<KEYWORD3>zeroaxis</KEYWORD3>
-		<KEYWORD3>zlabel</KEYWORD3>
-		<KEYWORD3>zmtics</KEYWORD3>
-		<KEYWORD3>zrange</KEYWORD3>
-		<KEYWORD3>ztics</KEYWORD3>
-		<KEYWORD3>cblabel</KEYWORD3>
-		<KEYWORD3>cbmtics</KEYWORD3>
-		<KEYWORD3>cbrange</KEYWORD3>
-		<KEYWORD3>cbtics</KEYWORD3>
-
-	</KEYWORDS>
-
-	</RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/go.xml b/qpython/src/main/assets/syntax/go.xml
deleted file mode 100644
index 0bd7c3bc..00000000
--- a/qpython/src/main/assets/syntax/go.xml
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-<!-- Original jEdit mode by Cedric Simon. Updated by Rodrigo Moraes. -->
-<MODE>
-  <PROPS>
-    <!-- comment -->
-    <PROPERTY NAME="commentStart" VALUE="/*" />
-    <PROPERTY NAME="commentEnd" VALUE="*/" />
-    <PROPERTY NAME="lineComment" VALUE="//" />
-    <PROPERTY NAME="wordBreakChars" VALUE=",+-=&lt;&gt;/?^&amp;*" />
-    <!-- indent -->
-    <PROPERTY NAME="indentOpenBrackets" VALUE="{" />
-    <PROPERTY NAME="indentCloseBrackets" VALUE="}" />
-    <PROPERTY NAME="unalignedOpenBrackets" VALUE="(" />
-    <PROPERTY NAME="unalignedCloseBrackets" VALUE=")" />
-    <PROPERTY NAME="indentNextLine"
-      VALUE="\s*(((if)\s*\(|else\s*|else\s+if\s*\(|for\s*\(.*\))[^{;]*)" />
-    <PROPERTY NAME="unindentThisLine"
-      VALUE="^.*(default:\s*|case.*:.*)$" />
-    <PROPERTY NAME="electricKeys" VALUE=":" />
-  </PROPS>
-
-  <RULES
-    IGNORE_CASE="FALSE"
-    HIGHLIGHT_DIGITS="TRUE"
-    DIGIT_RE="[0-9][0-9a-zA-Z]*">
-
-    <SPAN TYPE="COMMENT1">
-      <BEGIN>/*</BEGIN>
-      <END>*/</END>
-    </SPAN>
-
-    <EOL_SPAN TYPE="COMMENT1">//</EOL_SPAN>
-
-    <SPAN TYPE="LITERAL1" ESCAPE="\" NO_LINE_BREAK="TRUE">
-      <BEGIN>"</BEGIN>
-      <END>"</END>
-    </SPAN>
-    <SPAN TYPE="LITERAL1" ESCAPE="\" NO_LINE_BREAK="TRUE">
-      <BEGIN>'</BEGIN>
-      <END>'</END>
-    </SPAN>
-    <SPAN TYPE="LITERAL1" NO_LINE_BREAK="FALSE">
-      <BEGIN>`</BEGIN>
-      <END>`</END>
-    </SPAN>
-
-    <SEQ TYPE="OPERATOR">+</SEQ>
-    <SEQ TYPE="OPERATOR">-</SEQ>
-    <SEQ TYPE="OPERATOR">*</SEQ>
-    <SEQ TYPE="OPERATOR">/</SEQ>
-    <SEQ TYPE="OPERATOR">%</SEQ>
-    <SEQ TYPE="OPERATOR">&amp;</SEQ>
-    <SEQ TYPE="OPERATOR">|</SEQ>
-    <SEQ TYPE="OPERATOR">^</SEQ>
-    <SEQ TYPE="OPERATOR">&lt;&lt;</SEQ>
-    <SEQ TYPE="OPERATOR">&gt;&gt;</SEQ>
-    <SEQ TYPE="OPERATOR">&amp;^</SEQ>
-    <SEQ TYPE="OPERATOR">+=</SEQ>
-    <SEQ TYPE="OPERATOR">-=</SEQ>
-    <SEQ TYPE="OPERATOR">*=</SEQ>
-    <SEQ TYPE="OPERATOR">/=</SEQ>
-    <SEQ TYPE="OPERATOR">%=</SEQ>
-    <SEQ TYPE="OPERATOR">&amp;=</SEQ>
-    <SEQ TYPE="OPERATOR">|=</SEQ>
-    <SEQ TYPE="OPERATOR">^=</SEQ>
-    <SEQ TYPE="OPERATOR">&lt;&lt;=</SEQ>
-    <SEQ TYPE="OPERATOR">&gt;&gt;=</SEQ>
-    <SEQ TYPE="OPERATOR">&amp;^=</SEQ>
-    <SEQ TYPE="OPERATOR">&amp;&amp;</SEQ>
-    <SEQ TYPE="OPERATOR">||</SEQ>
-    <SEQ TYPE="OPERATOR">&lt;-</SEQ>
-    <SEQ TYPE="OPERATOR">++</SEQ>
-    <SEQ TYPE="OPERATOR">--</SEQ>
-    <SEQ TYPE="OPERATOR">==</SEQ>
-    <SEQ TYPE="OPERATOR">&lt;</SEQ>
-    <SEQ TYPE="OPERATOR">&gt;</SEQ>
-    <SEQ TYPE="OPERATOR">=</SEQ>
-    <SEQ TYPE="OPERATOR">!</SEQ>
-    <SEQ TYPE="OPERATOR">!=</SEQ>
-    <SEQ TYPE="OPERATOR">&lt;=</SEQ>
-    <SEQ TYPE="OPERATOR">&gt;=</SEQ>
-    <SEQ TYPE="OPERATOR">:=</SEQ>
-    <SEQ TYPE="OPERATOR">...</SEQ>
-    <SEQ TYPE="OPERATOR">(</SEQ>
-    <SEQ TYPE="OPERATOR">)</SEQ>
-    <SEQ TYPE="OPERATOR">[</SEQ>
-    <SEQ TYPE="OPERATOR">]</SEQ>
-    <SEQ TYPE="OPERATOR">{</SEQ>
-    <SEQ TYPE="OPERATOR">}</SEQ>
-    <SEQ TYPE="OPERATOR">,</SEQ>
-    <SEQ TYPE="OPERATOR">.</SEQ>
-    <SEQ TYPE="OPERATOR">;</SEQ>
-    <SEQ TYPE="OPERATOR">:</SEQ>
-
-    <KEYWORDS>
-      <!-- keywords: control flow -->
-      <KEYWORD1>break</KEYWORD1>
-      <KEYWORD1>case</KEYWORD1>
-      <KEYWORD1>continue</KEYWORD1>
-      <KEYWORD1>default</KEYWORD1>
-      <KEYWORD1>defer</KEYWORD1>
-      <KEYWORD1>else</KEYWORD1>
-      <KEYWORD1>fallthrough</KEYWORD1>
-      <KEYWORD1>for</KEYWORD1>
-      <KEYWORD1>go</KEYWORD1>
-      <KEYWORD1>goto</KEYWORD1>
-      <KEYWORD1>if</KEYWORD1>
-      <KEYWORD1>range</KEYWORD1>
-      <KEYWORD1>return</KEYWORD1>
-      <KEYWORD1>select</KEYWORD1>
-      <KEYWORD1>switch</KEYWORD1>
-      <!-- keywords: "declarations" (not really) -->
-      <KEYWORD1>chan</KEYWORD1>
-      <KEYWORD1>const</KEYWORD1>
-      <KEYWORD1>func</KEYWORD1>
-      <KEYWORD1>import</KEYWORD1>
-      <KEYWORD1>interface</KEYWORD1>
-      <KEYWORD1>map</KEYWORD1>
-      <KEYWORD1>package</KEYWORD1>
-      <KEYWORD1>struct</KEYWORD1>
-      <KEYWORD1>type</KEYWORD1>
-      <KEYWORD1>var</KEYWORD1>
-      <!-- types -->
-      <KEYWORD3>bool</KEYWORD3>
-      <KEYWORD3>byte</KEYWORD3>
-      <KEYWORD3>complex64</KEYWORD3>
-      <KEYWORD3>complex128</KEYWORD3>
-      <KEYWORD3>float32</KEYWORD3>
-      <KEYWORD3>float64</KEYWORD3>
-      <KEYWORD3>int8</KEYWORD3>
-      <KEYWORD3>int16</KEYWORD3>
-      <KEYWORD3>int32</KEYWORD3>
-      <KEYWORD3>int64</KEYWORD3>
-      <KEYWORD3>string</KEYWORD3>
-      <KEYWORD3>uint8</KEYWORD3>
-      <KEYWORD3>uint16</KEYWORD3>
-      <KEYWORD3>uint32</KEYWORD3>
-      <KEYWORD3>uint64</KEYWORD3>
-      <KEYWORD3>int</KEYWORD3>
-      <KEYWORD3>uint</KEYWORD3>
-      <KEYWORD3>uintptr</KEYWORD3>
-      <KEYWORD3>rune</KEYWORD3>
-      <!-- constants -->
-      <LITERAL2>true</LITERAL2>
-      <LITERAL2>false</LITERAL2>
-      <LITERAL2>iota</LITERAL2>
-      <LITERAL2>nil</LITERAL2>
-      <!-- functions -->
-      <FUNCTION>append</FUNCTION>
-      <FUNCTION>cap</FUNCTION>
-      <FUNCTION>close</FUNCTION>
-      <FUNCTION>complex</FUNCTION>
-      <FUNCTION>copy</FUNCTION>
-      <FUNCTION>imag</FUNCTION>
-      <FUNCTION>len</FUNCTION>
-      <FUNCTION>make</FUNCTION>
-      <FUNCTION>new</FUNCTION>
-      <FUNCTION>panic</FUNCTION>
-      <FUNCTION>real</FUNCTION>
-      <FUNCTION>recover</FUNCTION>
-      <FUNCTION>print</FUNCTION>
-      <FUNCTION>println</FUNCTION>
-    </KEYWORDS>
-
-  </RULES>
-
-</MODE>
-
diff --git a/qpython/src/main/assets/syntax/gradle.xml b/qpython/src/main/assets/syntax/gradle.xml
deleted file mode 100644
index 90a7df28..00000000
--- a/qpython/src/main/assets/syntax/gradle.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-<!--
-<MODE NAME="gradle"			FILE="gradle.xml"
-				FILE_NAME_GLOB="*.{gradle}"/>
--->
-<MODE>
-   <PROPS>
-      <PROPERTY NAME="commentStart" VALUE="/*" />
-      <PROPERTY NAME="commentEnd" VALUE="*/" />
-      <PROPERTY NAME="lineComment" VALUE="//" />
-      <PROPERTY NAME="indentOpenBrackets" VALUE="{" />
-      <PROPERTY NAME="indentCloseBrackets" VALUE="}" />
-      <PROPERTY NAME="indentNextLine" VALUE="\s*(((if|while)\s*\(|else\s*|else\s+if\s*\(|for\s*\(.*\))[^{;]*)" />
-   </PROPS>
-
-   <RULES HIGHLIGHT_DIGITS="TRUE" IGNORE_CASE="FALSE">
-      <IMPORT DELEGATE="groovy::MAIN"/>
-      
-      <MARK_PREVIOUS MATCH_TYPE="OPERATOR" TYPE="LABEL">:</MARK_PREVIOUS>
-      <MARK_PREVIOUS MATCH_TYPE="NULL" TYPE="FUNCTION"> {</MARK_PREVIOUS>
-
-      <SEQ TYPE="OPERATOR">:</SEQ>
-      <SEQ TYPE="OPERATOR">&lt;</SEQ>
-      
-      <KEYWORDS>
-         <FUNCTION>afterEvaluate</FUNCTION>
-         <FUNCTION>afterProject</FUNCTION>
-         <FUNCTION>afterTask</FUNCTION>
-         <FUNCTION>allProjects</FUNCTION>
-         <FUNCTION>apply</FUNCTION>
-         <FUNCTION>beforeTask</FUNCTION>
-         <FUNCTION>delete</FUNCTION>
-         <FUNCTION>doFirst</FUNCTION>
-         <FUNCTION>doLast</FUNCTION>
-         <FUNCTION>exclude</FUNCTION>
-         <FUNCTION>from</FUNCTION>
-         <FUNCTION>include</FUNCTION>
-         <FUNCTION>includeFlat</FUNCTION>
-         <FUNCTION>into</FUNCTION>
-         <FUNCTION>mavenRepo</FUNCTION>
-         <FUNCTION>onlyIf</FUNCTION>
-         <FUNCTION>task</FUNCTION>
-         <FUNCTION>whenReady</FUNCTION>
-         <FUNCTION>whenTaskAdded</FUNCTION>
-
-         <KEYWORD1>gradle</KEYWORD1>
-         <KEYWORD1>project</KEYWORD1>
-      </KEYWORDS>
-   </RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/groovy.xml b/qpython/src/main/assets/syntax/groovy.xml
deleted file mode 100644
index b51d02d4..00000000
--- a/qpython/src/main/assets/syntax/groovy.xml
+++ /dev/null
@@ -1,262 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!--
-<MODE NAME="groovy"			FILE="groovy.xml"
-				FILE_NAME_GLOB="*.{groovy,grv}"/>
--->
-
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="commentStart" VALUE="/*" />
-		<PROPERTY NAME="commentEnd" VALUE="*/" />
-		<PROPERTY NAME="lineComment" VALUE="//" />
-		<PROPERTY NAME="indentOpenBrackets" VALUE="{" />
-		<PROPERTY NAME="indentCloseBrackets" VALUE="}" />
-		<PROPERTY NAME="indentNextLine"
-			VALUE="\s*(((if|while)\s*\(|else\s*|else\s+if\s*\(|for\s*\(.*\))[^{;]*)" />
-	</PROPS>
-
-	<RULES HIGHLIGHT_DIGITS="TRUE" IGNORE_CASE="FALSE">
-		<!-- Silly comment -->
-		<SEQ TYPE="COMMENT1">/**/</SEQ>
-
-		<!-- Javadoc comment -->
-		<SPAN TYPE="COMMENT3" DELEGATE="GROOVYDOC">
-			<BEGIN>/**</BEGIN>
-			<END>*/</END>
-		</SPAN>
-
-		<!-- Java comment (C style) -->
-		<SPAN TYPE="COMMENT1">
-			<BEGIN>/*</BEGIN>
-			<END>*/</END>
-		</SPAN>
-
-		<SPAN TYPE="LITERAL1" DELEGATE="LITERAL">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-		<SPAN TYPE="LITERAL1" ESCAPE="\">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-
-		<!-- heredoc -->
-		<SPAN_REGEXP HASH_CHAR="&lt;&lt;&lt;" TYPE="LITERAL1" DELEGATE="LITERAL">
-			<BEGIN><![CDATA[<<<([\p{Alpha}_][\p{Alnum}_]*)\s*]]></BEGIN>
-			<END>$1</END>
-		</SPAN_REGEXP>
-
-		<SEQ TYPE="OPERATOR">=~</SEQ>
-		<SEQ TYPE="OPERATOR">=</SEQ>
-		<SEQ TYPE="OPERATOR">|</SEQ>
-		<SEQ TYPE="OPERATOR">!</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;=&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;=</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;=</SEQ>
-		<SEQ TYPE="OPERATOR">+</SEQ>
-		<SEQ TYPE="OPERATOR">-&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">-</SEQ>
-		<SEQ TYPE="OPERATOR">?</SEQ>
-		<SEQ TYPE="OPERATOR">&amp;</SEQ>
-
-		<!-- workaround to stop "*" from being colorized
-		     in import statements. -->
-		<SEQ TYPE="NULL">.*</SEQ>
-
-		<!-- Comments -->
-		<EOL_SPAN TYPE="COMMENT1">//</EOL_SPAN>
-
-		<!-- Function calls -->
-		<MARK_PREVIOUS TYPE="FUNCTION" MATCH_TYPE="OPERATOR">(</MARK_PREVIOUS>
-		<SEQ TYPE="OPERATOR">)</SEQ>
-
-		<KEYWORDS>
-			<KEYWORD1>abstract</KEYWORD1>
-			<KEYWORD1>break</KEYWORD1>
-			<KEYWORD1>case</KEYWORD1>
-			<KEYWORD1>catch</KEYWORD1>
-			<KEYWORD1>continue</KEYWORD1>
-			<KEYWORD1>default</KEYWORD1>
-			<KEYWORD1>do</KEYWORD1>
-			<KEYWORD1>else</KEYWORD1>
-			<KEYWORD1>extends</KEYWORD1>
-			<KEYWORD1>final</KEYWORD1>
-			<KEYWORD1>finally</KEYWORD1>
-			<KEYWORD1>for</KEYWORD1>
-			<KEYWORD1>if</KEYWORD1>
-			<KEYWORD1>implements</KEYWORD1>
-			<KEYWORD1>instanceof</KEYWORD1>
-			<KEYWORD1>native</KEYWORD1>
-			<KEYWORD1>new</KEYWORD1>
-			<KEYWORD1>private</KEYWORD1>
-			<KEYWORD1>protected</KEYWORD1>
-			<KEYWORD1>public</KEYWORD1>
-			<KEYWORD1>return</KEYWORD1>
-			<KEYWORD1>static</KEYWORD1>
-			<KEYWORD1>switch</KEYWORD1>
-			<KEYWORD1>synchronized</KEYWORD1>
-			<KEYWORD1>throw</KEYWORD1>
-			<KEYWORD1>throws</KEYWORD1>
-			<KEYWORD1>transient</KEYWORD1>
-			<KEYWORD1>try</KEYWORD1>
-			<KEYWORD1>volatile</KEYWORD1>
-			<KEYWORD1>while</KEYWORD1>
-
-			<KEYWORD1>strictfp</KEYWORD1>
-
-			<KEYWORD1>package</KEYWORD1>
-			<KEYWORD1>import</KEYWORD1>
-
-			<!-- groovy keywords -->
-			<KEYWORD2>as</KEYWORD2>
-			<KEYWORD2>assert</KEYWORD2>
-			<KEYWORD2>def</KEYWORD2>
-			<KEYWORD2>mixin</KEYWORD2>
-			<KEYWORD2>property</KEYWORD2>
-			<KEYWORD2>test</KEYWORD2>
-			<KEYWORD2>using</KEYWORD2>
-			<KEYWORD2>in</KEYWORD2>
-
-			<!-- types -->
-			<KEYWORD3>boolean</KEYWORD3>
-			<KEYWORD3>byte</KEYWORD3>
-			<KEYWORD3>char</KEYWORD3>
-			<KEYWORD3>class</KEYWORD3>
-			<KEYWORD3>double</KEYWORD3>
-			<KEYWORD3>float</KEYWORD3>
-			<KEYWORD3>int</KEYWORD3>
-			<KEYWORD3>interface</KEYWORD3>
-			<KEYWORD3>long</KEYWORD3>
-			<KEYWORD3>short</KEYWORD3>
-			<KEYWORD3>void</KEYWORD3>
-
-			<!-- Groovy JDK stuff -->
-			<KEYWORD4>abs</KEYWORD4>
-			<KEYWORD4>any</KEYWORD4>
-			<KEYWORD4>append</KEYWORD4>
-			<KEYWORD4>asList</KEYWORD4>
-			<KEYWORD4>asWritable</KEYWORD4>
-			<KEYWORD4>call</KEYWORD4>
-			<KEYWORD4>collect</KEYWORD4>
-			<KEYWORD4>compareTo</KEYWORD4>
-			<KEYWORD4>count</KEYWORD4>
-			<KEYWORD4>div</KEYWORD4>
-			<KEYWORD4>dump</KEYWORD4>
-			<KEYWORD4>each</KEYWORD4>
-			<KEYWORD4>eachByte</KEYWORD4>
-			<KEYWORD4>eachFile</KEYWORD4>
-			<KEYWORD4>eachLine</KEYWORD4>
-			<KEYWORD4>every</KEYWORD4>
-			<KEYWORD4>find</KEYWORD4>
-			<KEYWORD4>findAll</KEYWORD4>
-			<KEYWORD4>flatten</KEYWORD4>
-			<KEYWORD4>getAt</KEYWORD4>
-			<KEYWORD4>getErr</KEYWORD4>
-			<KEYWORD4>getIn</KEYWORD4>
-			<KEYWORD4>getOut</KEYWORD4>
-			<KEYWORD4>getText</KEYWORD4>
-			<KEYWORD4>grep</KEYWORD4>
-			<KEYWORD4>immutable</KEYWORD4>
-			<KEYWORD4>inject</KEYWORD4>
-			<KEYWORD4>inspect</KEYWORD4>
-			<KEYWORD4>intersect</KEYWORD4>
-			<KEYWORD4>invokeMethods</KEYWORD4>
-			<KEYWORD4>isCase</KEYWORD4>
-			<KEYWORD4>join</KEYWORD4>
-			<KEYWORD4>leftShift</KEYWORD4>
-			<KEYWORD4>minus</KEYWORD4>
-			<KEYWORD4>multiply</KEYWORD4>
-			<KEYWORD4>newInputStream</KEYWORD4>
-			<KEYWORD4>newOutputStream</KEYWORD4>
-			<KEYWORD4>newPrintWriter</KEYWORD4>
-			<KEYWORD4>newReader</KEYWORD4>
-			<KEYWORD4>newWriter</KEYWORD4>
-			<KEYWORD4>next</KEYWORD4>
-			<KEYWORD4>plus</KEYWORD4>
-			<KEYWORD4>pop</KEYWORD4>
-			<KEYWORD4>power</KEYWORD4>
-			<KEYWORD4>previous</KEYWORD4>
-			<KEYWORD4>print</KEYWORD4>
-			<KEYWORD4>println</KEYWORD4>
-			<KEYWORD4>push</KEYWORD4>
-			<KEYWORD4>putAt</KEYWORD4>
-			<KEYWORD4>read</KEYWORD4>
-			<KEYWORD4>readBytes</KEYWORD4>
-			<KEYWORD4>readLines</KEYWORD4>
-			<KEYWORD4>reverse</KEYWORD4>
-			<KEYWORD4>reverseEach</KEYWORD4>
-			<KEYWORD4>round</KEYWORD4>
-			<KEYWORD4>size</KEYWORD4>
-			<KEYWORD4>sort</KEYWORD4>
-			<KEYWORD4>splitEachLine</KEYWORD4>
-			<KEYWORD4>step</KEYWORD4>
-			<KEYWORD4>subMap</KEYWORD4>
-			<KEYWORD4>times</KEYWORD4>
-			<KEYWORD4>toInteger</KEYWORD4>
-			<KEYWORD4>toList</KEYWORD4>
-			<KEYWORD4>tokenize</KEYWORD4>
-			<KEYWORD4>upto</KEYWORD4>
-			<KEYWORD4>waitForOrKill</KEYWORD4>
-			<KEYWORD4>withPrintWriter</KEYWORD4>
-			<KEYWORD4>withReader</KEYWORD4>
-			<KEYWORD4>withStream</KEYWORD4>
-			<KEYWORD4>withWriter</KEYWORD4>
-			<KEYWORD4>withWriterAppend</KEYWORD4>
-			<KEYWORD4>write</KEYWORD4>
-			<KEYWORD4>writeLine</KEYWORD4>
-
-			<LITERAL2>false</LITERAL2>
-			<LITERAL2>null</LITERAL2>
-			<LITERAL2>super</LITERAL2>
-			<LITERAL2>this</LITERAL2>
-			<LITERAL2>true</LITERAL2>
-
-			<!-- this is specific to groovy, treat like `this`? -->
-			<LITERAL3>it</LITERAL3>
-
-			<INVALID>goto</INVALID>
-			<INVALID>const</INVALID>
-		</KEYWORDS>
-	</RULES>
-
-	<RULES SET="LITERAL" DEFAULT="LITERAL1" ESCAPE="\">
-		<!-- Variables -->
-		<SPAN TYPE="KEYWORD2" NO_LINE_BREAK="TRUE">
-			<BEGIN>${</BEGIN>
-			<END>}</END>
-		</SPAN>
-
-		<MARK_FOLLOWING TYPE="KEYWORD2">$</MARK_FOLLOWING>
-	</RULES>
-
-	<RULES SET="GROOVYDOC" DEFAULT="COMMENT3" IGNORE_CASE="TRUE">
-		<!-- so that @link{...} is highlighted -->
-		<SEQ TYPE="COMMENT3">{</SEQ>
-
-		<!-- so that *@param is highlighted -->
-		<SEQ TYPE="COMMENT3">*</SEQ>
-
-		<!-- HTML comments -->
-		<SPAN TYPE="COMMENT1">
-			<BEGIN>&lt;!--</BEGIN>
-			<END>--&gt;</END>
-		</SPAN>
-
-		<!-- Javadoc allows this -->
-		<SEQ TYPE="COMMENT3">&lt;&lt;</SEQ>
-		<SEQ TYPE="COMMENT3">&lt;=</SEQ>
-		<SEQ TYPE="COMMENT3">&lt; </SEQ>
-
-		<!-- HTML tags -->
-		<SPAN TYPE="MARKUP" DELEGATE="xml::TAGS"
-			NO_LINE_BREAK="TRUE">
-			<BEGIN>&lt;</BEGIN>
-			<END>&gt;</END>
-		</SPAN>
-
-		<MARK_FOLLOWING TYPE="LABEL">@</MARK_FOLLOWING>
-	</RULES>
-
-</MODE>
diff --git a/qpython/src/main/assets/syntax/haskell.xml b/qpython/src/main/assets/syntax/haskell.xml
deleted file mode 100644
index ff36920c..00000000
--- a/qpython/src/main/assets/syntax/haskell.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!--
-	Haskell mode by Stephen Blackheath
--->
-
-<MODE>
-
-	<PROPS>
-		<PROPERTY NAME="commentStart" VALUE="{-" />
-		<PROPERTY NAME="commentEnd" VALUE="-}" />
-		<PROPERTY NAME="lineComment" VALUE="--" />
-	</PROPS>
-
-	<RULES IGNORE_CASE="FALSE" HIGHLIGHT_DIGITS="FALSE">
-		<!-- Pragmas. -->
-		<SPAN TYPE="COMMENT2">
-			<BEGIN>{-#</BEGIN>
-			<END>#-}</END>
-		</SPAN>
-
-		<SPAN TYPE="COMMENT1">
-			<BEGIN>{-</BEGIN>
-			<END>-}</END>
-		</SPAN>
-
-		<EOL_SPAN TYPE="COMMENT1">--</EOL_SPAN>
-
-		<SPAN TYPE="LITERAL1" ESCAPE="\" NO_LINE_BREAK="TRUE">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-
-		<SPAN TYPE="LITERAL2" NO_WORD_BREAK="TRUE">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-
-                <!-- Reserved words. -->
-                <SEQ_REGEXP TYPE="KEYWORD1">case(?![a-z_A-Z0-9'])</SEQ_REGEXP>
-                <SEQ_REGEXP TYPE="KEYWORD1">class(?![a-z_A-Z0-9'])</SEQ_REGEXP>
-                <SEQ_REGEXP TYPE="KEYWORD1">data(?![a-z_A-Z0-9'])</SEQ_REGEXP>
-                <SEQ_REGEXP TYPE="KEYWORD1">default(?![a-z_A-Z0-9'])</SEQ_REGEXP>
-                <SEQ_REGEXP TYPE="KEYWORD1">deriving(?![a-z_A-Z0-9'])</SEQ_REGEXP>
-                <SEQ_REGEXP TYPE="KEYWORD1">do(?![a-z_A-Z0-9'])</SEQ_REGEXP>
-                <SEQ_REGEXP TYPE="KEYWORD1">else(?![a-z_A-Z0-9'])</SEQ_REGEXP>
-                <SEQ_REGEXP TYPE="KEYWORD1">if(?![a-z_A-Z0-9'])</SEQ_REGEXP>
-                <SEQ_REGEXP TYPE="KEYWORD1">import(?![a-z_A-Z0-9'])</SEQ_REGEXP>
-                <SEQ_REGEXP TYPE="KEYWORD1">in(?![a-z_A-Z0-9'])</SEQ_REGEXP>
-                <SEQ_REGEXP TYPE="KEYWORD1">infix(?![a-z_A-Z0-9'])</SEQ_REGEXP>
-                <SEQ_REGEXP TYPE="KEYWORD1">infixl(?![a-z_A-Z0-9'])</SEQ_REGEXP>
-                <SEQ_REGEXP TYPE="KEYWORD1">infixr(?![a-z_A-Z0-9'])</SEQ_REGEXP>
-                <SEQ_REGEXP TYPE="KEYWORD1">instance(?![a-z_A-Z0-9'])</SEQ_REGEXP>
-                <SEQ_REGEXP TYPE="KEYWORD1">let(?![a-z_A-Z0-9'])</SEQ_REGEXP>
-                <SEQ_REGEXP TYPE="KEYWORD1">module(?![a-z_A-Z0-9'])</SEQ_REGEXP>
-                <SEQ_REGEXP TYPE="KEYWORD1">newtype(?![a-z_A-Z0-9'])</SEQ_REGEXP>
-                <SEQ_REGEXP TYPE="KEYWORD1">of(?![a-z_A-Z0-9'])</SEQ_REGEXP>
-                <SEQ_REGEXP TYPE="KEYWORD1">then(?![a-z_A-Z0-9'])</SEQ_REGEXP>
-                <SEQ_REGEXP TYPE="KEYWORD1">type(?![a-z_A-Z0-9'])</SEQ_REGEXP>
-                <SEQ_REGEXP TYPE="KEYWORD1">where(?![a-z_A-Z0-9'])</SEQ_REGEXP>
-                <SEQ_REGEXP TYPE="KEYWORD1">_(?![a-z_A-Z0-9'])</SEQ_REGEXP>
-                <SEQ_REGEXP TYPE="KEYWORD1">as(?![a-z_A-Z0-9'])</SEQ_REGEXP>
-                <SEQ_REGEXP TYPE="KEYWORD1">qualified(?![a-z_A-Z0-9'])</SEQ_REGEXP>
-                <SEQ_REGEXP TYPE="KEYWORD1">hiding(?![a-z_A-Z0-9'])</SEQ_REGEXP>
-                <!-- Non-Haskell-98 keywords -->
-                <SEQ_REGEXP TYPE="KEYWORD1">foreign(?![a-z_A-Z0-9'])</SEQ_REGEXP>
-                <SEQ_REGEXP TYPE="KEYWORD1">family(?![a-z_A-Z0-9'])</SEQ_REGEXP>
-                <!-- GHC extension keywords -->
-                <SEQ_REGEXP TYPE="KEYWORD1">proc(?![a-z_A-Z0-9'])</SEQ_REGEXP>
-                <SEQ_REGEXP TYPE="KEYWORD1">rec(?![a-z_A-Z0-9'])</SEQ_REGEXP>
-                <SEQ_REGEXP TYPE="KEYWORD1">mdo(?![a-z_A-Z0-9'])</SEQ_REGEXP>
-
-                <SEQ_REGEXP TYPE="DIGIT">0[xXoO][0-9a-fA-F]+</SEQ_REGEXP>
-                <SEQ_REGEXP TYPE="DIGIT">[0-9]+(\.[0-9]+)?([eE][+-]?[0-9]+)?</SEQ_REGEXP>
-                
-                <!-- Reserved operators -->
-                <SEQ_REGEXP TYPE="KEYWORD4">\.\.(?![!#$%&amp;\*+\./&lt;=&gt;?@\\\^\|\-~:])</SEQ_REGEXP>
-                <SEQ_REGEXP TYPE="KEYWORD4">:(?![!#$%&amp;\*+\./&lt;=&gt;?@\\\^\|\-~:])</SEQ_REGEXP>
-                <SEQ_REGEXP TYPE="KEYWORD4">::(?![!#$%&amp;\*+\./&lt;=&gt;?@\\\^\|\-~:])</SEQ_REGEXP>
-                <SEQ_REGEXP TYPE="KEYWORD4">=(?![!#$%&amp;\*+\./&lt;=&gt;?@\\\^\|\-~:])</SEQ_REGEXP>
-                <SEQ TYPE="KEYWORD4">\</SEQ>
-                <SEQ_REGEXP TYPE="KEYWORD4">\|(?![!#$%&amp;\*+\./&lt;=&gt;?@\\\^\|\-~:])</SEQ_REGEXP>
-                <SEQ_REGEXP TYPE="KEYWORD4">&lt;-(?![!#$%&amp;\*+\./&lt;=&gt;?@\\\^\|\-~:])</SEQ_REGEXP>
-                <SEQ_REGEXP TYPE="KEYWORD4">-&gt;(?![!#$%&amp;\*+\./&lt;=&gt;?@\\\^\|\-~:])</SEQ_REGEXP>
-                <SEQ_REGEXP TYPE="KEYWORD4">@(?![!#$%&amp;\*+\./&lt;=&gt;?@\\\^\|\-~:])</SEQ_REGEXP>
-                <SEQ_REGEXP TYPE="KEYWORD4">~(?![!#$%&amp;\*+\./&lt;=&gt;?@\\\^\|\-~:])</SEQ_REGEXP>
-                <SEQ_REGEXP TYPE="KEYWORD4">=&gt;(?![!#$%&amp;\*+\./&lt;=&gt;?@\\\^\|\-~:])</SEQ_REGEXP>
-
-                <!-- GHC extension reserved operators -->
-                <SEQ_REGEXP TYPE="KEYWORD4">-(&lt;{1,2})(?![!#$%&amp;\*+\./&lt;=&gt;?@\\\^\|\-~:])</SEQ_REGEXP>
-
-                <!-- Normal operators, backquoted operators -->
-                <SEQ_REGEXP TYPE="OPERATOR">([A-Z][a-z_A-Z0-9']*\.)*[!#$%&amp;\*+\./&lt;=&gt;?@\\\^\|\-~][!#$%&amp;\*+\./&lt;=&gt;?@\\\^\|\-~:]*</SEQ_REGEXP>
-                <SEQ_REGEXP TYPE="OPERATOR">`([A-Z][a-z_A-Z0-9']*\.)*[a-z_][a-z_A-Z0-9']*`</SEQ_REGEXP>
-
-                <!-- variable/function (qualified or not) -->
-                <SEQ_REGEXP TYPE="NULL">([A-Z][a-z_A-Z0-9']*\.)*[a-z_][a-z_A-Z0-9']*</SEQ_REGEXP>
-                <!-- contructor/type (qualified or not) -->
-                <SEQ_REGEXP TYPE="KEYWORD2">[A-Z][a-z_A-Z0-9']*(\.[A-Z][a-z_A-Z0-9']*)*</SEQ_REGEXP>
-
-                <!-- Operators in parentheses appear like functions, but this
-                    doesn't match the special case of (..) used for imports -->
-                <SEQ_REGEXP TYPE="NULL">\(\s*([A-Z][a-z_A-Z0-9']*\.)*[!#$%&amp;\*+\./&lt;=&gt;?@\\\^\|\-~]\s*\)</SEQ_REGEXP>
-                <SEQ_REGEXP TYPE="NULL">\(\s*([A-Z][a-z_A-Z0-9']*\.)*[!#$%&amp;\*+\./&lt;=&gt;?@\\\^\|\-~][!#$%&amp;\*+/&lt;=&gt;?@\\\^\|\-~:][!#$%&amp;\*+\./&lt;=&gt;?@\\\^\|\-~:]*\s*\)</SEQ_REGEXP>
-                <SEQ_REGEXP TYPE="NULL">\(\s*([A-Z][a-z_A-Z0-9']*\.)*[!#$%&amp;\*+/&lt;=&gt;?@\\\^\|\-~][!#$%&amp;\*+\./&lt;=&gt;?@\\\^\|\-~:][!#$%&amp;\*+\./&lt;=&gt;?@\\\^\|\-~:]*\s*\)</SEQ_REGEXP>
-                <SEQ_REGEXP TYPE="NULL">\(\s*([A-Z][a-z_A-Z0-9']*\.)*[!#$%&amp;\*+\./&lt;=&gt;?@\\\^\|\-~][!#$%&amp;\*+\./&lt;=&gt;?@\\\^\|\-~:]{2,}\)</SEQ_REGEXP>
-
-                <!-- Infix constructors -->
-                <SEQ_REGEXP TYPE="KEYWORD2">([A-Z][a-z_A-Z0-9']*\.)*:[!#$%&amp;\*+\./&lt;=&gt;?@\\\^\|\-~:]*</SEQ_REGEXP>
-                <!-- Infix constructors in parentheses -->
-                <SEQ_REGEXP TYPE="KEYWORD2">\(\s*([A-Z][a-z_A-Z0-9']*\.)*:[!#$%&amp;\*+\./&lt;=&gt;?@\\\^\|\-~:]*\s*\)</SEQ_REGEXP>
-
-                <!-- (, including the specific case of (..) but excluding all other cases
-                    where it's an operator in parentheses -->
-                <SEQ_REGEXP TYPE="KEYWORD3">\((?!\s*([!#$%&amp;\*+\./&lt;=&gt;?@\\\^\|\-~]\s*\)|[!#$%&amp;\*+\./&lt;=&gt;?@\\\^\|\-~][!#$%&amp;\*+/&lt;=&gt;?@\\\^\|\-~:][!#$%&amp;\*+\./&lt;=&gt;?@\\\^\|\-~:]*\s*\)|[!#$%&amp;\*+/&lt;=&gt;?@\\\^\|\-~][!#$%&amp;\*+\./&lt;=&gt;?@\\\^\|\-~:][!#$%&amp;\*+\./&lt;=&gt;?@\\\^\|\-~:]*\s*\)|[!#$%&amp;\*+\./&lt;=&gt;?@\\\^\|\-~][!#$%&amp;\*+\./&lt;=&gt;?@\\\^\|\-~:]{2,}\s*\)))</SEQ_REGEXP>
-                <SEQ TYPE="KEYWORD3">)</SEQ>
-                <SEQ TYPE="KEYWORD3">,</SEQ>
-                <SEQ TYPE="KEYWORD3">[</SEQ>
-                <SEQ TYPE="KEYWORD3">]</SEQ>
-	</RULES>
-
-</MODE>
diff --git a/qpython/src/main/assets/syntax/haxe.xml b/qpython/src/main/assets/syntax/haxe.xml
deleted file mode 100644
index 4a8a79aa..00000000
--- a/qpython/src/main/assets/syntax/haxe.xml
+++ /dev/null
@@ -1,179 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!--
-  ~ jEdit - Programmer's Text Editor
-  ~ :tabSize=8:indentSize=8:noTabs=false:
-  ~ :folding=explicit:collapseFolds=1:
-  ~
-  ~ Copyright © 2010 jEdit contributors
-  ~
-  ~ 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 2
-  ~ of the License, or 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, write to the Free Software
-  ~ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-  -->
-
-<!--
-  This mode highlights the syntax of haXe, but unlike most modes,
-  it does not attempt to highlight standard API, except those core
-  types defined prior to any imports, e.g. the Bool class.
--->
-<MODE>
-  <PROPS>
-    <PROPERTY NAME="indentOpenBrackets" VALUE="{" />
-    <PROPERTY NAME="indentCloseBrackets" VALUE="}" />
-    <!-- the ; hack is there so that stuff like if(bob) fred();
-         does not indent the next line -->
-    <PROPERTY NAME="indentPrevLine"
-      VALUE="\s*(if|while)\s*(|else|case|default:)[^;]*|for\s*\(.*)" />
-    <!-- set this to 'true' if you want to use GNU coding style -->
-    <PROPERTY NAME="doubleBracketIndent" VALUE="false" />
-    <PROPERTY NAME="lineUpClosingBracket" VALUE="true" />
-    <PROPERTY NAME="commentStart" VALUE="/*" />
-    <PROPERTY NAME="commentEnd" VALUE="*/" />
-    <PROPERTY NAME="lineComment" VALUE="//" />
-    <PROPERTY NAME="wordBreakChars" VALUE="+-.,=&lt;&gt;/?^&amp;*" />
-  </PROPS>
-
-  <RULES ESCAPE="\\"
-         IGNORE_CASE="FALSE" HIGHLIGHT_DIGITS="TRUE"
-         DIGIT_RE="(0x[[:xdigit:]]+|[[:digit:]]+((E|e|)[[:digit:]]*)?)">
-    <!-- whitespace: (space and tab) -->
-    <SPAN TYPE="COMMENT1">
-      <BEGIN>/*</BEGIN>
-      <END>*/</END>
-    </SPAN>
-
-    <SPAN TYPE="LITERAL1" NO_LINE_BREAK="TRUE">
-      <BEGIN>"</BEGIN>
-      <END>"</END>
-    </SPAN>
-
-    <SPAN TYPE="LITERAL1" NO_LINE_BREAK="TRUE">
-      <BEGIN>'</BEGIN>
-      <END>'</END>
-    </SPAN>
-
-    <!-- Mark anything preceding ( as a function. -->
-    <MARK_PREVIOUS TYPE="FUNCTION" MATCH_TYPE="CONTEXT">(</MARK_PREVIOUS>
-    <!-- Sometimes I leave a space. -->
-    <MARK_PREVIOUS TYPE="FUNCTION" MATCH_TYPE="CONTEXT"> (</MARK_PREVIOUS>
-
-    <EOL_SPAN TYPE="COMMENT1">//</EOL_SPAN>
-                
-    <!-- Make preprocessor directive look like comment 3 -->
-    <EOL_SPAN TYPE="COMMENT3">#</EOL_SPAN>
-
-    <!-- Regular expression highlighting -->
-    <SEQ_REGEXP TYPE="MARKUP"
-                HASH_CHAR="~"
-                AT_WORD_START="TRUE"
-    >~([[:punct:]])(?:.*?[^\\])*?\1[sgiexom]*</SEQ_REGEXP>
-                
-    <SEQ TYPE="NULL">)</SEQ>
-    <SEQ TYPE="NULL">(</SEQ>
-
-    <SEQ TYPE="OPERATOR">=</SEQ>
-    <SEQ TYPE="OPERATOR">!</SEQ>
-    <SEQ TYPE="OPERATOR">+</SEQ>
-    <SEQ TYPE="OPERATOR">-</SEQ>
-    <SEQ TYPE="OPERATOR">/</SEQ>
-    <SEQ TYPE="OPERATOR">*</SEQ>
-    <SEQ TYPE="OPERATOR">&gt;</SEQ>
-    <SEQ TYPE="OPERATOR">&lt;</SEQ>
-    <SEQ TYPE="OPERATOR">%</SEQ>
-    <SEQ TYPE="OPERATOR">&amp;</SEQ>
-    <SEQ TYPE="OPERATOR">|</SEQ>
-    <SEQ TYPE="OPERATOR">^</SEQ>
-    <SEQ TYPE="OPERATOR">~</SEQ>
-    <SEQ TYPE="OPERATOR">.</SEQ>
-    <SEQ TYPE="OPERATOR">}</SEQ>
-    <SEQ TYPE="OPERATOR">{</SEQ>
-    <SEQ TYPE="OPERATOR">,</SEQ>
-    <SEQ TYPE="OPERATOR">;</SEQ>
-    <SEQ TYPE="OPERATOR">]</SEQ>
-    <SEQ TYPE="OPERATOR">[</SEQ>
-    <SEQ TYPE="OPERATOR">?</SEQ>
-    <SEQ TYPE="OPERATOR">:</SEQ>
-                
-    <KEYWORDS>
-                
-      <!-- haXe's flow control words -->
-      <KEYWORD1>break</KEYWORD1>
-      <KEYWORD1>case</KEYWORD1>
-      <KEYWORD1>catch</KEYWORD1>
-      <KEYWORD1>continue</KEYWORD1>
-      <KEYWORD1>default</KEYWORD1>
-      <KEYWORD1>never</KEYWORD1>
-      <KEYWORD1>do</KEYWORD1>
-      <KEYWORD1>else</KEYWORD1>
-      <KEYWORD1>for</KEYWORD1>
-      <KEYWORD1>if</KEYWORD1>
-      <KEYWORD1>in</KEYWORD1>
-      <KEYWORD1>return</KEYWORD1>
-      <KEYWORD1>switch</KEYWORD1>
-      <KEYWORD1>throw</KEYWORD1>
-      <KEYWORD1>try</KEYWORD1>
-      <KEYWORD1>while</KEYWORD1>
-
-      <!-- haXe's declarative words -->
-      <KEYWORD2>class</KEYWORD2>
-      <KEYWORD2>enum</KEYWORD2>
-      <KEYWORD2>extends</KEYWORD2>
-      <KEYWORD2>extern</KEYWORD2>
-      <KEYWORD2>function</KEYWORD2>
-      <KEYWORD2>implements</KEYWORD2>
-      <KEYWORD2>import</KEYWORD2>
-      <KEYWORD2>using</KEYWORD2>
-      <KEYWORD2>interface</KEYWORD2>
-      <KEYWORD2>inline</KEYWORD2>
-      <KEYWORD2>override</KEYWORD2>
-      <KEYWORD2>package</KEYWORD2>
-      <KEYWORD2>private</KEYWORD2>
-      <KEYWORD2>public</KEYWORD2>
-      <KEYWORD2>static</KEYWORD2>
-      <KEYWORD2>typedef</KEYWORD2>
-      <KEYWORD2>using</KEYWORD2>
-      <KEYWORD2>var</KEYWORD2>
-      <KEYWORD2>dynamic</KEYWORD2>
-
-      <!-- Built-in types -->
-      <KEYWORD3>ArrayAccess</KEYWORD3>
-      <KEYWORD3>Array</KEYWORD3>
-      <KEYWORD3>Bool</KEYWORD3>
-      <KEYWORD3>Dynamic</KEYWORD3>
-      <KEYWORD3>Float</KEYWORD3>
-      <KEYWORD3>Int</KEYWORD3>
-      <KEYWORD3>Iterator</KEYWORD3>
-      <KEYWORD3>Iterable</KEYWORD3>
-      <KEYWORD3>Null</KEYWORD3>
-      <KEYWORD3>Object</KEYWORD3>
-      <KEYWORD3>String</KEYWORD3>
-      <KEYWORD3>UInt</KEYWORD3>
-      <KEYWORD3>Void</KEYWORD3>
-
-      <!-- Special keywords -->
-      <LITERAL2>cast</LITERAL2>
-      <LITERAL2>new</LITERAL2>
-      <LITERAL2>super</LITERAL2>
-      <LITERAL2>this</LITERAL2>
-      <LITERAL2>trace</LITERAL2>
-      <LITERAL2>typeof</LITERAL2>
-      <LITERAL2>untyped</LITERAL2>
-      <!-- Literals -->
-      <LITERAL2>false</LITERAL2>
-      <LITERAL2>null</LITERAL2>
-      <LITERAL2>true</LITERAL2>
-      <LITERAL2>undefined</LITERAL2>
-    </KEYWORDS>
-  </RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/hex.xml b/qpython/src/main/assets/syntax/hex.xml
deleted file mode 100644
index ac93680b..00000000
--- a/qpython/src/main/assets/syntax/hex.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!--
-    Hex mode by Andre Kaplan.
-    To be used in conjunction with the Hex plugin.
--->
-
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="contextInsensitive" VALUE="true"/>
-	</PROPS>
-	<RULES DEFAULT="LITERAL1">
-
-		<MARK_PREVIOUS
-			TYPE="KEYWORD1"
-			AT_LINE_START="TRUE"
-			>:
-		</MARK_PREVIOUS>
-
-		<EOL_SPAN TYPE="KEYWORD2">;</EOL_SPAN>
-	</RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/hlsl.xml b/qpython/src/main/assets/syntax/hlsl.xml
deleted file mode 100644
index 036b0850..00000000
--- a/qpython/src/main/assets/syntax/hlsl.xml
+++ /dev/null
@@ -1,478 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<MODE>
-<!--
-DirectX FX Files Syntax Highlighting (Edit Mode) for jEdit
-Including: Preprocessor, HLSL and Shader Assembler up to shader version 3.0
-
-Author: Adam Sawicki
-- Homepage: http://regedit.gamedev.pl/
-- E-mail: sawickiap@poczta.onet.pl
-- IRC: #warsztat @ PolNet
-- Gadu-Gadu: 2272474
-
--->
-
-	<PROPS>
-		<PROPERTY NAME="commentStart" VALUE="/*" />
-		<PROPERTY NAME="commentEnd" VALUE="*/" />
-		<PROPERTY NAME="lineComment" VALUE="//" />
-		<PROPERTY NAME="wordBreakChars" VALUE=".,+-*/=&lt;&gt;?^&amp;[]{}" />
-
-		<!-- Auto indent -->
-		<PROPERTY NAME="indentOpenBrackets" VALUE="{" />
-		<PROPERTY NAME="indentCloseBrackets" VALUE="}" />
-		<PROPERTY NAME="indentNextLine" VALUE="\s*(((if|while)\s*\(|else\s*|else\s+if\s*\(|for\s*\(.*\))[^{;]*)" />
-		<PROPERTY NAME="doubleBracketIndent" VALUE="false" />
-		<PROPERTY NAME="lineUpClosingBracket" VALUE="true" />
-	</PROPS>
-
-	<RULES
-		IGNORE_CASE="FALSE"
-		HIGHLIGHT_DIGITS="TRUE"
-		DIGIT_RE="((0[xX][0-9a-fA-F]+|\d+)[uUIL]?|\d+([eE]\d*)?[hHfF]?)">
-
-		<!-- C style comment -->
-		<SPAN TYPE="COMMENT1">
-			<BEGIN>/*</BEGIN>
-			<END>*/</END>
-		</SPAN>
-
-		<SPAN TYPE="LITERAL1" ESCAPE="\" NO_LINE_BREAK="TRUE">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-		<SPAN TYPE="LITERAL1" ESCAPE="\" NO_LINE_BREAK="TRUE">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-
-		<!-- preprocessor statements -->
-		<SEQ TYPE="KEYWORD2">##</SEQ>
-		<SEQ TYPE="KEYWORD2">#@</SEQ>
-		<EOL_SPAN TYPE="KEYWORD2" DELEGATE="Preprocessor">#</EOL_SPAN>
-
-		<!-- asm -->
-		<SPAN AT_WORD_START="TRUE" EXCLUDE_MATCH="FALSE" TYPE="KEYWORD1" DELEGATE="Asm">
-			<BEGIN>asm</BEGIN>
-			<END>}</END>
-		</SPAN>
-		<SPAN AT_WORD_START="TRUE" EXCLUDE_MATCH="FALSE" TYPE="KEYWORD1" DELEGATE="Asm">
-			<BEGIN>ASM</BEGIN>
-			<END>}</END>
-		</SPAN>
-		<SPAN AT_WORD_START="TRUE" EXCLUDE_MATCH="FALSE" TYPE="KEYWORD1" DELEGATE="Asm">
-			<BEGIN>Asm</BEGIN>
-			<END>}</END>
-		</SPAN>
-		<SPAN AT_WORD_START="TRUE" EXCLUDE_MATCH="FALSE" TYPE="KEYWORD1" DELEGATE="Asm">
-			<BEGIN>asm_fragment</BEGIN>
-			<END>}</END>
-		</SPAN>
-
-		<!-- C style comment -->
-		<EOL_SPAN TYPE="COMMENT2">//</EOL_SPAN>
-
-		<!-- Operators - multi character -->
-		<SEQ TYPE="OPERATOR">++</SEQ>
-		<SEQ TYPE="OPERATOR">--</SEQ>
-		<SEQ TYPE="OPERATOR">&amp;&amp;</SEQ>
-		<SEQ TYPE="OPERATOR">||</SEQ>
-		<SEQ TYPE="OPERATOR">==</SEQ>
-		<SEQ TYPE="OPERATOR">::</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;&lt;</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;&lt;=</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;&gt;=</SEQ>
-		<SEQ TYPE="OPERATOR">...</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;=</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;=</SEQ>
-		<SEQ TYPE="OPERATOR">!=</SEQ>
-		<SEQ TYPE="OPERATOR">*=</SEQ>
-		<SEQ TYPE="OPERATOR">/=</SEQ>
-		<SEQ TYPE="OPERATOR">+=</SEQ>
-		<SEQ TYPE="OPERATOR">-=</SEQ>
-		<SEQ TYPE="OPERATOR">%=</SEQ>
-		<SEQ TYPE="OPERATOR">&amp;=</SEQ>
-		<SEQ TYPE="OPERATOR">|=</SEQ>
-		<SEQ TYPE="OPERATOR">^=</SEQ>
-		<SEQ TYPE="OPERATOR">-&gt;</SEQ>
-
-		<!-- Operators - single characters -->
-		<SEQ TYPE="OPERATOR">}</SEQ>
-		<SEQ TYPE="OPERATOR">{</SEQ>
-		<SEQ TYPE="OPERATOR">+</SEQ>
-		<SEQ TYPE="OPERATOR">-</SEQ>
-		<SEQ TYPE="OPERATOR">*</SEQ>
-		<SEQ TYPE="OPERATOR">/</SEQ>
-		<SEQ TYPE="OPERATOR">%</SEQ>
-		<SEQ TYPE="OPERATOR">=</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">!</SEQ>
-
-		<!-- Function calls -->
-		<MARK_PREVIOUS TYPE="FUNCTION" EXCLUDE_MATCH="TRUE">(</MARK_PREVIOUS>
-
-		<!-- Swizzle operator for vectors/scalars (a.xyzw OR b.rgba), matrices (c._m00_m01 OR d._11_12) indexing -->
-		<SEQ_REGEXP TYPE="OPERATOR" HASH_CHAR=".">.(([xyzw]{1,4})|([rgba]{1,4})|((_m[0123][0123])+)|((_[1234][1234])+))(?!\p{Alnum})</SEQ_REGEXP>
-
-		<!-- Atomic, but complex types -->
-		<SEQ_REGEXP TYPE="KEYWORD2" AT_WORD_START="TRUE" HASH_CHAR="bool">bool[1234](x[1234])?\b</SEQ_REGEXP>
-		<SEQ_REGEXP TYPE="KEYWORD2" AT_WORD_START="TRUE" HASH_CHAR="int">int[1234](x[1234])?\b</SEQ_REGEXP>
-		<SEQ_REGEXP TYPE="KEYWORD2" AT_WORD_START="TRUE" HASH_CHAR="half">half[1234](x[1234])?\b</SEQ_REGEXP>
-		<SEQ_REGEXP TYPE="KEYWORD2" AT_WORD_START="TRUE" HASH_CHAR="float">float[1234](x[1234])?\b</SEQ_REGEXP>
-		<SEQ_REGEXP TYPE="KEYWORD2" AT_WORD_START="TRUE" HASH_CHAR="double">double[1234](x[1234])?\b</SEQ_REGEXP>
-
-		<!-- Semantics -->
-		<SEQ_REGEXP TYPE="KEYWORD1" HASH_CHAR=":">:\s*(register\s*\(\w+(\s*\,\s*\w+\s*)?\)|\w+)</SEQ_REGEXP>
-
-		<KEYWORDS>
-			<!-- Control flow keywords -->
-			<KEYWORD1>discard</KEYWORD1>
-			<KEYWORD1>do</KEYWORD1>
-			<KEYWORD1>else</KEYWORD1>
-			<KEYWORD1>for</KEYWORD1>
-			<KEYWORD1>if</KEYWORD1>
-			<KEYWORD1>return</KEYWORD1>
-			<KEYWORD1>typedef</KEYWORD1>
-			<KEYWORD1>while</KEYWORD1>
-
-			<!-- Other keywords -->
-			<KEYWORD1>compile</KEYWORD1>
-			<KEYWORD1>compile_fragment</KEYWORD1>
-			<KEYWORD1>register</KEYWORD1>
-			<KEYWORD1>sampler_state</KEYWORD1>
-			<KEYWORD1>stateblock_state</KEYWORD1>
-			<KEYWORD1>technique</KEYWORD1>
-			<KEYWORD1>Technique</KEYWORD1>
-			<KEYWORD1>TECHNIQUE</KEYWORD1>
-			<KEYWORD1>pass</KEYWORD1>
-			<KEYWORD1>Pass</KEYWORD1>
-			<KEYWORD1>PASS</KEYWORD1>
-			<KEYWORD1>decl</KEYWORD1>
-			<KEYWORD1>Decl</KEYWORD1>
-			<KEYWORD1>DECL</KEYWORD1>
-
-			<!-- Atomic type keywords -->
-			<KEYWORD2>void</KEYWORD2>
-			<KEYWORD2>bool</KEYWORD2>
-			<KEYWORD2>int</KEYWORD2>
-			<KEYWORD2>half</KEYWORD2>
-			<KEYWORD2>float</KEYWORD2>
-			<KEYWORD2>double</KEYWORD2>
-			<KEYWORD2>vector</KEYWORD2>
-			<KEYWORD2>matrix</KEYWORD2>
-
-			<!-- Object type keywords -->
-			<KEYWORD3>string</KEYWORD3>
-			<KEYWORD3>texture</KEYWORD3>
-			<KEYWORD3>texture1D</KEYWORD3>
-			<KEYWORD3>texture2D</KEYWORD3>
-			<KEYWORD3>texture3D</KEYWORD3>
-			<KEYWORD3>textureCUBE</KEYWORD3>
-			<KEYWORD3>sampler</KEYWORD3>
-			<KEYWORD3>sampler1D</KEYWORD3>
-			<KEYWORD3>sampler2D</KEYWORD3>
-			<KEYWORD3>sampler3D</KEYWORD3>
-			<KEYWORD3>samplerCUBE</KEYWORD3>
-			<KEYWORD3>pixelfragment</KEYWORD3>
-			<KEYWORD3>vertexfragment</KEYWORD3>
-			<KEYWORD3>pixelshader</KEYWORD3>
-			<KEYWORD3>vertexshader</KEYWORD3>
-			<KEYWORD3>stateblock</KEYWORD3>
-			<KEYWORD3>struct</KEYWORD3>
-
-			<!-- Usage keywords -->
-			<KEYWORD4>static</KEYWORD4>
-			<KEYWORD4>uniform</KEYWORD4>
-			<KEYWORD4>extern</KEYWORD4>
-			<KEYWORD4>volatile</KEYWORD4>
-			<KEYWORD4>inline</KEYWORD4>
-			<KEYWORD4>shared</KEYWORD4>
-			<KEYWORD4>const</KEYWORD4>
-			<KEYWORD4>row_major</KEYWORD4>
-			<KEYWORD4>column_major</KEYWORD4>
-			<KEYWORD4>in</KEYWORD4>
-			<KEYWORD4>inout</KEYWORD4>
-			<KEYWORD4>out</KEYWORD4>
-
-			<!-- Literals -->
-			<LITERAL1>false</LITERAL1>
-			<LITERAL1>true</LITERAL1>
-			<LITERAL1>NULL</LITERAL1>
-
-			<!-- Intrinsic functions -->
-			<LITERAL2>abs</LITERAL2>
-			<LITERAL2>acos</LITERAL2>
-			<LITERAL2>all</LITERAL2>
-			<LITERAL2>any</LITERAL2>
-			<LITERAL2>asin</LITERAL2>
-			<LITERAL2>atan</LITERAL2>
-			<LITERAL2>atan2</LITERAL2>
-			<LITERAL2>ceil</LITERAL2>
-			<LITERAL2>clamp</LITERAL2>
-			<LITERAL2>clip</LITERAL2>
-			<LITERAL2>cos</LITERAL2>
-			<LITERAL2>cosh</LITERAL2>
-			<LITERAL2>cross</LITERAL2>
-			<LITERAL2>D3DCOLORtoUBYTE4</LITERAL2>
-			<LITERAL2>ddx</LITERAL2>
-			<LITERAL2>ddy</LITERAL2>
-			<LITERAL2>degrees</LITERAL2>
-			<LITERAL2>determinant</LITERAL2>
-			<LITERAL2>distance</LITERAL2>
-			<LITERAL2>dot</LITERAL2>
-			<LITERAL2>exp</LITERAL2>
-			<LITERAL2>exp2</LITERAL2>
-			<LITERAL2>faceforward</LITERAL2>
-			<LITERAL2>floor</LITERAL2>
-			<LITERAL2>fmod</LITERAL2>
-			<LITERAL2>frac</LITERAL2>
-			<LITERAL2>frexp</LITERAL2>
-			<LITERAL2>fwidth</LITERAL2>
-			<LITERAL2>isfinite</LITERAL2>
-			<LITERAL2>isinf</LITERAL2>
-			<LITERAL2>isnan</LITERAL2>
-			<LITERAL2>ldexp</LITERAL2>
-			<LITERAL2>length</LITERAL2>
-			<LITERAL2>lerp</LITERAL2>
-			<LITERAL2>lit</LITERAL2>
-			<LITERAL2>log</LITERAL2>
-			<LITERAL2>log10</LITERAL2>
-			<LITERAL2>log2</LITERAL2>
-			<LITERAL2>max</LITERAL2>
-			<LITERAL2>min</LITERAL2>
-			<LITERAL2>modf</LITERAL2>
-			<LITERAL2>mul</LITERAL2>
-			<LITERAL2>noise</LITERAL2>
-			<LITERAL2>normalize</LITERAL2>
-			<LITERAL2>pow</LITERAL2>
-			<LITERAL2>radians</LITERAL2>
-			<LITERAL2>reflect</LITERAL2>
-			<LITERAL2>refract</LITERAL2>
-			<LITERAL2>round</LITERAL2>
-			<LITERAL2>rsqrt</LITERAL2>
-			<LITERAL2>saturate</LITERAL2>
-			<LITERAL2>sign</LITERAL2>
-			<LITERAL2>sin</LITERAL2>
-			<LITERAL2>sincos</LITERAL2>
-			<LITERAL2>sinh</LITERAL2>
-			<LITERAL2>smoothstep</LITERAL2>
-			<LITERAL2>sqrt</LITERAL2>
-			<LITERAL2>step</LITERAL2>
-			<LITERAL2>tan</LITERAL2>
-			<LITERAL2>tanh</LITERAL2>
-			<LITERAL2>transpose</LITERAL2>
-
-			<!-- Intrinsic functions - sampling -->
-			<LITERAL3>tex1D</LITERAL3>
-			<LITERAL3>tex1Dgrad</LITERAL3>
-			<LITERAL3>tex1Dbias</LITERAL3>
-			<LITERAL3>tex1Dgrad</LITERAL3>
-			<LITERAL3>tex1Dlod</LITERAL3>
-			<LITERAL3>tex1Dproj</LITERAL3>
-			<LITERAL3>tex2D</LITERAL3>
-			<LITERAL3>tex2D</LITERAL3>
-			<LITERAL3>tex2Dbias</LITERAL3>
-			<LITERAL3>tex2Dgrad</LITERAL3>
-			<LITERAL3>tex2Dlod</LITERAL3>
-			<LITERAL3>tex2Dproj</LITERAL3>
-			<LITERAL3>tex3D</LITERAL3>
-			<LITERAL3>tex3D</LITERAL3>
-			<LITERAL3>tex3Dbias</LITERAL3>
-			<LITERAL3>tex3Dgrad</LITERAL3>
-			<LITERAL3>tex3Dlod</LITERAL3>
-			<LITERAL3>tex3Dproj</LITERAL3>
-			<LITERAL3>texCUBE</LITERAL3>
-			<LITERAL3>texCUBE</LITERAL3>
-			<LITERAL3>texCUBEbias</LITERAL3>
-			<LITERAL3>texCUBEgrad</LITERAL3>
-			<LITERAL3>texCUBElod</LITERAL3>
-			<LITERAL3>texCUBEproj</LITERAL3>
-
-			<!-- Reserved but unused words -->
-			<INVALID>auto</INVALID>
-			<INVALID>break</INVALID>
-			<INVALID>case</INVALID>
-			<INVALID>catch</INVALID>
-			<INVALID>char</INVALID>
-			<INVALID>class</INVALID>
-			<INVALID>const_cast</INVALID>
-			<INVALID>continue</INVALID>
-			<INVALID>default</INVALID>
-			<INVALID>delete</INVALID>
-			<INVALID>dynamic_cast</INVALID>
-			<INVALID>enum</INVALID>
-			<INVALID>explicit</INVALID>
-			<INVALID>friend</INVALID>
-			<INVALID>goto</INVALID>
-			<INVALID>long</INVALID>
-			<INVALID>mutable</INVALID>
-			<INVALID>namespace</INVALID>
-			<INVALID>new</INVALID>
-			<INVALID>operator</INVALID>
-			<INVALID>private</INVALID>
-			<INVALID>protected</INVALID>
-			<INVALID>public</INVALID>
-			<INVALID>reinterpret_cast</INVALID>
-			<INVALID>short</INVALID>
-			<INVALID>signed</INVALID>
-			<INVALID>sizeof</INVALID>
-			<INVALID>static_cast</INVALID>
-			<INVALID>switch</INVALID>
-			<INVALID>template</INVALID>
-			<INVALID>this</INVALID>
-			<INVALID>throw</INVALID>
-			<INVALID>try</INVALID>
-			<INVALID>typename</INVALID>
-			<INVALID>union</INVALID>
-			<INVALID>unsigned</INVALID>
-			<INVALID>using</INVALID>
-			<INVALID>virtual</INVALID>
-		</KEYWORDS>
-	</RULES>
-
-	<RULES SET="Include" DEFAULT="KEYWORD2" />
-
-	<RULES
-		SET="Preprocessor"
-		DEFAULT="KEYWORD2"
-		IGNORE_CASE="FALSE"
-		HIGHLIGHT_DIGITS="TRUE"
-		DIGIT_RE="((0x[[:xdigit:]]+|[[:digit:]]+)[uUIL]?|[[:digit:]]+([eE][[:digit:]]*)?[hHfF]?)">
-
-		<!-- C style comment -->
-		<SPAN TYPE="COMMENT1">
-			<BEGIN>/*</BEGIN>
-			<END>*/</END>
-		</SPAN>
-
-		<!-- this is a hack so that #include <net/if.h> does not get the if highlighted -->
-		<EOL_SPAN TYPE="MARKUP" DELEGATE="Include">include</EOL_SPAN>
-
-		<KEYWORDS>
-			<!-- Directives -->
-			<MARKUP>define</MARKUP>
-			<MARKUP>elif</MARKUP>
-			<MARKUP>else</MARKUP>
-			<MARKUP>endif</MARKUP>
-			<MARKUP>error</MARKUP>
-			<MARKUP>if</MARKUP>
-			<MARKUP>ifdef</MARKUP>
-			<MARKUP>ifndef</MARKUP>
-			<MARKUP>line</MARKUP>
-			<MARKUP>pragma</MARKUP>
-			<MARKUP>undef</MARKUP>
-
-			<!-- Other -->
-			<LITERAL1>pack_matrix</LITERAL1>
-			<LITERAL1>warning</LITERAL1>
-			<LITERAL1>def</LITERAL1>
-			<LITERAL1>defined</LITERAL1>
-			<LITERAL1>D3DX</LITERAL1>
-			<LITERAL1>D3DX_VERSION</LITERAL1>
-			<LITERAL1>DIRECT3D</LITERAL1>
-			<LITERAL1>DIRECT3D_VERSION</LITERAL1>
-			<LITERAL1>__FILE__</LITERAL1>
-			<LITERAL1>__LINE__</LITERAL1>
-		</KEYWORDS>
-	</RULES>
-
-	<RULES SET="Asm"
-		DEFAULT="NULL"
-		IGNORE_CASE="FALSE"
-		HIGHLIGHT_DIGITS="TRUE"
-		DIGIT_RE="((0x[[:xdigit:]]+|[[:digit:]]+)[uUIL]?|[[:digit:]]+([eE][[:digit:]]*)?[hHfF]?)">
-
-		<!-- Starting... -->
-		<SEQ TYPE="OPERATOR">{</SEQ>
-
-		<!-- Comments -->
-		<SPAN TYPE="COMMENT1">
-			<BEGIN>/*</BEGIN>
-			<END>*/</END>
-		</SPAN>
-		<EOL_SPAN TYPE="COMMENT2">//</EOL_SPAN>
-		<EOL_SPAN TYPE="COMMENT2">;</EOL_SPAN>
-
-		<!-- Operators -->
-		<SEQ TYPE="OPERATOR">+</SEQ>
-		<SEQ TYPE="OPERATOR">-</SEQ>
-		<SEQ TYPE="OPERATOR">,</SEQ>
-
-		<!-- Swizzle operator -->
-		<SEQ_REGEXP TYPE="OPERATOR" HASH_CHAR=".">.(([xyzw]{1,4}))</SEQ_REGEXP>
-
-		<!-- Instruction -->
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="FUNCTION" HASH_CHAR="abs">abs(_pp|_sat|_x2|_x4|_x8|_bx2|_d2|_d4|_d8)*\b</SEQ_REGEXP>
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="FUNCTION" HASH_CHAR="add">add(_pp|_sat|_x2|_x4|_x8|_bx2|_d2|_d4|_d8)*\b</SEQ_REGEXP>
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="FUNCTION" HASH_CHAR="bem">bem(_pp|_sat|_x2|_x4|_x8|_bx2|_d2|_d4|_d8)*\b</SEQ_REGEXP>
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="FUNCTION" HASH_CHAR="break_comp">break_comp(_pp|_sat|_x2|_x4|_x8|_bx2|_d2|_d4|_d8)*\b</SEQ_REGEXP>
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="FUNCTION" HASH_CHAR="breakp">breakp(_pp|_sat|_x2|_x4|_x8|_bx2|_d2|_d4|_d8)*\b</SEQ_REGEXP>
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="FUNCTION" HASH_CHAR="callnz">callnz(_pp|_sat|_x2|_x4|_x8|_bx2|_d2|_d4|_d8)*\b</SEQ_REGEXP>
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="FUNCTION" HASH_CHAR="cmp">cmp(_pp|_sat|_x2|_x4|_x8|_bx2|_d2|_d4|_d8)*\b</SEQ_REGEXP>
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="FUNCTION" HASH_CHAR="cnd">cnd(_pp|_sat|_x2|_x4|_x8|_bx2|_d2|_d4|_d8)*\b</SEQ_REGEXP>
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="FUNCTION" HASH_CHAR="crs">crs(_pp|_sat|_x2|_x4|_x8|_bx2|_d2|_d4|_d8)*\b</SEQ_REGEXP>
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="FUNCTION" HASH_CHAR="dp2add">dp2add(_pp|_sat|_x2|_x4|_x8|_bx2|_d2|_d4|_d8)*\b</SEQ_REGEXP>
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="FUNCTION" HASH_CHAR="dp3">dp3(_pp|_sat|_x2|_x4|_x8|_bx2|_d2|_d4|_d8)*\b</SEQ_REGEXP>
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="FUNCTION" HASH_CHAR="dp4">dp4(_pp|_sat|_x2|_x4|_x8|_bx2|_d2|_d4|_d8)*\b</SEQ_REGEXP>
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="FUNCTION" HASH_CHAR="dst">dst(_pp|_sat|_x2|_x4|_x8|_bx2|_d2|_d4|_d8)*\b</SEQ_REGEXP>
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="FUNCTION" HASH_CHAR="dsx">dsx(_pp|_sat|_x2|_x4|_x8|_bx2|_d2|_d4|_d8)*\b</SEQ_REGEXP>
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="FUNCTION" HASH_CHAR="dsy">dsy(_pp|_sat|_x2|_x4|_x8|_bx2|_d2|_d4|_d8)*\b</SEQ_REGEXP>
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="FUNCTION" HASH_CHAR="else">else(_pp|_sat|_x2|_x4|_x8|_bx2|_d2|_d4|_d8)*\b</SEQ_REGEXP>
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="FUNCTION" HASH_CHAR="endif">endif(_pp|_sat|_x2|_x4|_x8|_bx2|_d2|_d4|_d8)*\b</SEQ_REGEXP>
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="FUNCTION" HASH_CHAR="endloop">endloop(_pp|_sat|_x2|_x4|_x8|_bx2|_d2|_d4|_d8)*\b</SEQ_REGEXP>
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="FUNCTION" HASH_CHAR="endrep">endrep(_pp|_sat|_x2|_x4|_x8|_bx2|_d2|_d4|_d8)*\b</SEQ_REGEXP>
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="FUNCTION" HASH_CHAR="exp">exp(_pp|_sat|_x2|_x4|_x8|_bx2|_d2|_d4|_d8)*\b</SEQ_REGEXP>
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="FUNCTION" HASH_CHAR="frc">frc(_pp|_sat|_x2|_x4|_x8|_bx2|_d2|_d4|_d8)*\b</SEQ_REGEXP>
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="FUNCTION" HASH_CHAR="if">if(_pp|_sat|_x2|_x4|_x8|_bx2|_d2|_d4|_d8)*\b</SEQ_REGEXP>
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="FUNCTION" HASH_CHAR="label">label(_pp|_sat|_x2|_x4|_x8|_bx2|_d2|_d4|_d8)*\b</SEQ_REGEXP>
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="FUNCTION" HASH_CHAR="lit">lit(_pp|_sat|_x2|_x4|_x8|_bx2|_d2|_d4|_d8)*\b</SEQ_REGEXP>
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="FUNCTION" HASH_CHAR="logp">logp(_pp|_sat|_x2|_x4|_x8|_bx2|_d2|_d4|_d8)*\b</SEQ_REGEXP>
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="FUNCTION" HASH_CHAR="loop">loop(_pp|_sat|_x2|_x4|_x8|_bx2|_d2|_d4|_d8)*\b</SEQ_REGEXP>
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="FUNCTION" HASH_CHAR="lrp">lrp(_pp|_sat|_x2|_x4|_x8|_bx2|_d2|_d4|_d8)*\b</SEQ_REGEXP>
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="FUNCTION" HASH_CHAR="m3x2">m3x2(_pp|_sat|_x2|_x4|_x8|_bx2|_d2|_d4|_d8)*\b</SEQ_REGEXP>
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="FUNCTION" HASH_CHAR="m3x3">m3x3(_pp|_sat|_x2|_x4|_x8|_bx2|_d2|_d4|_d8)*\b</SEQ_REGEXP>
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="FUNCTION" HASH_CHAR="m3x4">m3x4(_pp|_sat|_x2|_x4|_x8|_bx2|_d2|_d4|_d8)*\b</SEQ_REGEXP>
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="FUNCTION" HASH_CHAR="m4x3">m4x3(_pp|_sat|_x2|_x4|_x8|_bx2|_d2|_d4|_d8)*\b</SEQ_REGEXP>
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="FUNCTION" HASH_CHAR="m4x4">m4x4(_pp|_sat|_x2|_x4|_x8|_bx2|_d2|_d4|_d8)*\b</SEQ_REGEXP>
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="FUNCTION" HASH_CHAR="mad">mad(_pp|_sat|_x2|_x4|_x8|_bx2|_d2|_d4|_d8)*\b</SEQ_REGEXP>
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="FUNCTION" HASH_CHAR="mov">mov(_pp|_sat|_x2|_x4|_x8|_bx2|_d2|_d4|_d8)*\b</SEQ_REGEXP>
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="FUNCTION" HASH_CHAR="max">max(_pp|_sat|_x2|_x4|_x8|_bx2|_d2|_d4|_d8)*\b</SEQ_REGEXP>
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="FUNCTION" HASH_CHAR="min">min(_pp|_sat|_x2|_x4|_x8|_bx2|_d2|_d4|_d8)*\b</SEQ_REGEXP>
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="FUNCTION" HASH_CHAR="mova">mova(_pp|_sat|_x2|_x4|_x8|_bx2|_d2|_d4|_d8)*\b</SEQ_REGEXP>
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="FUNCTION" HASH_CHAR="mul">mul(_pp|_sat|_x2|_x4|_x8|_bx2|_d2|_d4|_d8)*\b</SEQ_REGEXP>
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="FUNCTION" HASH_CHAR="nop">nop(_pp|_sat|_x2|_x4|_x8|_bx2|_d2|_d4|_d8)*\b</SEQ_REGEXP>
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="FUNCTION" HASH_CHAR="nrm">nrm(_pp|_sat|_x2|_x4|_x8|_bx2|_d2|_d4|_d8)*\b</SEQ_REGEXP>
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="FUNCTION" HASH_CHAR="phase">phase(_pp|_sat|_x2|_x4|_x8|_bx2|_d2|_d4|_d8)*\b</SEQ_REGEXP>
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="FUNCTION" HASH_CHAR="pow">pow(_pp|_sat|_x2|_x4|_x8|_bx2|_d2|_d4|_d8)*\b</SEQ_REGEXP>
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="FUNCTION" HASH_CHAR="rcp">rcp(_pp|_sat|_x2|_x4|_x8|_bx2|_d2|_d4|_d8)*\b</SEQ_REGEXP>
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="FUNCTION" HASH_CHAR="rep">rep(_pp|_sat|_x2|_x4|_x8|_bx2|_d2|_d4|_d8)*\b</SEQ_REGEXP>
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="FUNCTION" HASH_CHAR="ret">ret(_pp|_sat|_x2|_x4|_x8|_bx2|_d2|_d4|_d8)*\b</SEQ_REGEXP>
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="FUNCTION" HASH_CHAR="rsq">rsq(_pp|_sat|_x2|_x4|_x8|_bx2|_d2|_d4|_d8)*\b</SEQ_REGEXP>
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="FUNCTION" HASH_CHAR="setp_comp">setp_comp(_pp|_sat|_x2|_x4|_x8|_bx2|_d2|_d4|_d8)*\b</SEQ_REGEXP>
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="FUNCTION" HASH_CHAR="sge">sge(_pp|_sat|_x2|_x4|_x8|_bx2|_d2|_d4|_d8)*\b</SEQ_REGEXP>
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="FUNCTION" HASH_CHAR="sgn">sgn(_pp|_sat|_x2|_x4|_x8|_bx2|_d2|_d4|_d8)*\b</SEQ_REGEXP>
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="FUNCTION" HASH_CHAR="sincos">sincos(_pp|_sat|_x2|_x4|_x8|_bx2|_d2|_d4|_d8)*\b</SEQ_REGEXP>
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="FUNCTION" HASH_CHAR="slt">slt(_pp|_sat|_x2|_x4|_x8|_bx2|_d2|_d4|_d8)*\b</SEQ_REGEXP>
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="FUNCTION" HASH_CHAR="sub">sub(_pp|_sat|_x2|_x4|_x8|_bx2|_d2|_d4|_d8)*\b</SEQ_REGEXP>
-		<!-- (seen in preshader -->
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="FUNCTION" HASH_CHAR="neg">neg(_pp|_sat|_x2|_x4|_x8|_bx2|_d2|_d4|_d8)*\b</SEQ_REGEXP>
-
-		<!-- Texturing instruction -->
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2" HASH_CHAR="tex">tex\w*</SEQ_REGEXP>
-
-		<!-- Main instruction -->
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD1" HASH_CHAR="ps">ps\w*</SEQ_REGEXP>
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD1" HASH_CHAR="vs">vs\w*</SEQ_REGEXP>
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD1" HASH_CHAR="def">def\w*</SEQ_REGEXP>
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD1" HASH_CHAR="dcl">dcl\w*</SEQ_REGEXP>
-
-		<KEYWORDS>
-		</KEYWORDS>
-	</RULES>
-</MODE>
-
diff --git a/qpython/src/main/assets/syntax/htaccess.xml b/qpython/src/main/assets/syntax/htaccess.xml
deleted file mode 100644
index 3e547e92..00000000
--- a/qpython/src/main/assets/syntax/htaccess.xml
+++ /dev/null
@@ -1,568 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="lineComment" VALUE="#" />
-		<PROPERTY NAME="noWordSep" VALUE="-" />
-		<PROPERTY NAME="contextInsensitive" VALUE="true" />
-	</PROPS>
-	<RULES HIGHLIGHT_DIGITS="FALSE" IGNORE_CASE="TRUE">
-
-		<EOL_SPAN TYPE="COMMENT1">#</EOL_SPAN>
-
-		<SPAN TYPE="LITERAL1" ESCAPE="\" NO_LINE_BREAK="TRUE">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-
-		<SPAN_REGEXP HASH_CHAR="&lt;" TYPE="MARKUP" DELEGATE="DIRECTIVE">
-			<BEGIN><![CDATA[<(\w+)[^>]*>]]></BEGIN>
-			<END><![CDATA[</$1>]]></END>
-		</SPAN_REGEXP>
-
-		<KEYWORDS>
-
-			<KEYWORD1>AcceptPathInfo</KEYWORD1>
-			<KEYWORD1>Action</KEYWORD1>
-			<KEYWORD1>AddAlt</KEYWORD1>
-			<KEYWORD1>AddAltByEncoding</KEYWORD1>
-			<KEYWORD1>AddAltByType</KEYWORD1>
-			<KEYWORD1>AddCharset</KEYWORD1>
-			<KEYWORD1>AddDefaultCharset</KEYWORD1>
-			<KEYWORD1>AddDescription</KEYWORD1>
-			<KEYWORD1>AddEncoding</KEYWORD1>
-			<KEYWORD1>AddHandler</KEYWORD1>
-			<KEYWORD1>AddIcon</KEYWORD1>
-			<KEYWORD1>AddIconByEncoding</KEYWORD1>
-			<KEYWORD1>AddIconByType</KEYWORD1>
-			<KEYWORD1>AddInputFilter</KEYWORD1>
-			<KEYWORD1>AddLanguage</KEYWORD1>
-			<KEYWORD1>AddOutputFilter</KEYWORD1>
-			<KEYWORD1>AddOutputFilterByType</KEYWORD1>
-			<KEYWORD1>AddType</KEYWORD1>
-			<KEYWORD1>Allow</KEYWORD1>
-			<KEYWORD1>Anonymous</KEYWORD1>
-			<KEYWORD1>Anonymous_Authoritative</KEYWORD1>
-			<KEYWORD1>Anonymous_LogEmail</KEYWORD1>
-			<KEYWORD1>Anonymous_MustGiveEmail</KEYWORD1>
-			<KEYWORD1>Anonymous_NoUserID</KEYWORD1>
-			<KEYWORD1>Anonymous_VerifyEmail</KEYWORD1>
-			<KEYWORD1>AuthAuthoritative</KEYWORD1>
-			<KEYWORD1>AuthBasicAuthoritative</KEYWORD1>
-			<KEYWORD1>AuthBasicProvider</KEYWORD1>
-			<KEYWORD1>AuthDBMAuthoritative</KEYWORD1>
-			<KEYWORD1>AuthDBMGroupFile</KEYWORD1>
-			<KEYWORD1>AuthDBMType</KEYWORD1>
-			<KEYWORD1>AuthDBMUserFile</KEYWORD1>
-			<KEYWORD1>AuthDigestAlgorithm</KEYWORD1>
-			<KEYWORD1>AuthDigestDomain</KEYWORD1>
-			<KEYWORD1>AuthDigestFile</KEYWORD1>
-			<KEYWORD1>AuthDigestGroupFile</KEYWORD1>
-			<KEYWORD1>AuthDigestNonceFormat</KEYWORD1>
-			<KEYWORD1>AuthDigestNonceLifetime</KEYWORD1>
-			<KEYWORD1>AuthDigestQop</KEYWORD1>
-			<KEYWORD1>AuthGroupFile</KEYWORD1>
-			<KEYWORD1>AuthLDAPAuthoritative</KEYWORD1>
-			<KEYWORD1>AuthLDAPBindDN</KEYWORD1>
-			<KEYWORD1>AuthLDAPBindPassword</KEYWORD1>
-			<KEYWORD1>AuthLDAPCompareDNOnServer</KEYWORD1>
-			<KEYWORD1>AuthLDAPDereferenceAliases</KEYWORD1>
-			<KEYWORD1>AuthLDAPEnabled</KEYWORD1>
-			<KEYWORD1>AuthLDAPFrontPageHack</KEYWORD1>
-			<KEYWORD1>AuthLDAPGroupAttribute</KEYWORD1>
-			<KEYWORD1>AuthLDAPGroupAttributeIsDN</KEYWORD1>
-			<KEYWORD1>AuthLDAPRemoteUserIsDN</KEYWORD1>
-			<KEYWORD1>AuthLDAPUrl</KEYWORD1>
-			<KEYWORD1>AuthName</KEYWORD1>
-			<KEYWORD1>AuthType</KEYWORD1>
-			<KEYWORD1>AuthUserFile</KEYWORD1>
-			<KEYWORD1>BrowserMatch</KEYWORD1>
-			<KEYWORD1>BrowserMatchNoCase</KEYWORD1>
-			<KEYWORD1>CGIMapExtension</KEYWORD1>
-			<KEYWORD1>CharsetDefault</KEYWORD1>
-			<KEYWORD1>CharsetOptions</KEYWORD1>
-			<KEYWORD1>CharsetSourceEnc</KEYWORD1>
-			<KEYWORD1>CheckSpelling</KEYWORD1>
-			<KEYWORD1>ContentDigest</KEYWORD1>
-			<KEYWORD1>CookieDomain</KEYWORD1>
-			<KEYWORD1>CookieExpires</KEYWORD1>
-			<KEYWORD1>CookieName</KEYWORD1>
-			<KEYWORD1>CookieStyle</KEYWORD1>
-			<KEYWORD1>CookieTracking</KEYWORD1>
-			<KEYWORD1>DefaultIcon</KEYWORD1>
-			<KEYWORD1>DefaultLanguage</KEYWORD1>
-			<KEYWORD1>DefaultType</KEYWORD1>
-			<KEYWORD1>Deny</KEYWORD1>
-			<KEYWORD1>DirectoryIndex</KEYWORD1>
-			<KEYWORD1>DirectorySlash</KEYWORD1>
-			<KEYWORD1>EnableMMAP</KEYWORD1>
-			<KEYWORD1>EnableSendfile</KEYWORD1>
-			<KEYWORD1>ErrorDocument</KEYWORD1>
-			<KEYWORD1>Example</KEYWORD1>
-			<KEYWORD1>ExpiresActive</KEYWORD1>
-			<KEYWORD1>ExpiresByType</KEYWORD1>
-			<KEYWORD1>ExpiresDefault</KEYWORD1>
-			<KEYWORD1>FileETag</KEYWORD1>
-			<KEYWORD1>ForceLanguagePriority</KEYWORD1>
-			<KEYWORD1>ForceType</KEYWORD1>
-			<KEYWORD1>Header</KEYWORD1>
-			<KEYWORD1>HeaderName</KEYWORD1>
-			<KEYWORD1>ImapBase</KEYWORD1>
-			<KEYWORD1>ImapDefault</KEYWORD1>
-			<KEYWORD1>ImapMenu</KEYWORD1>
-			<KEYWORD1>IndexIgnore</KEYWORD1>
-			<KEYWORD1>IndexOptions</KEYWORD1>
-			<KEYWORD1>IndexOrderDefault</KEYWORD1>
-			<KEYWORD1>ISAPIAppendLogToErrors</KEYWORD1>
-			<KEYWORD1>ISAPIAppendLogToQuery</KEYWORD1>
-			<KEYWORD1>ISAPIFakeAsync</KEYWORD1>
-			<KEYWORD1>ISAPILogNotSupported</KEYWORD1>
-			<KEYWORD1>ISAPIReadAheadBuffer</KEYWORD1>
-			<KEYWORD1>LanguagePriority</KEYWORD1>
-			<KEYWORD1>LimitRequestBody</KEYWORD1>
-			<KEYWORD1>LimitXMLRequestBody</KEYWORD1>
-			<KEYWORD1>MetaDir</KEYWORD1>
-			<KEYWORD1>MetaFiles</KEYWORD1>
-			<KEYWORD1>MetaSuffix</KEYWORD1>
-			<KEYWORD1>MultiviewsMatch</KEYWORD1>
-			<KEYWORD1>Options</KEYWORD1>
-			<KEYWORD1>Order</KEYWORD1>
-			<KEYWORD1>PassEnv</KEYWORD1>
-			<KEYWORD1>ReadmeName</KEYWORD1>
-			<KEYWORD1>Redirect</KEYWORD1>
-			<KEYWORD1>RedirectMatch</KEYWORD1>
-			<KEYWORD1>RedirectPermanent</KEYWORD1>
-			<KEYWORD1>RedirectTemp</KEYWORD1>
-			<KEYWORD1>RemoveCharset</KEYWORD1>
-			<KEYWORD1>RemoveEncoding</KEYWORD1>
-			<KEYWORD1>RemoveHandler</KEYWORD1>
-			<KEYWORD1>RemoveInputFilter</KEYWORD1>
-			<KEYWORD1>RemoveLanguage</KEYWORD1>
-			<KEYWORD1>RemoveOutputFilter</KEYWORD1>
-			<KEYWORD1>RemoveType</KEYWORD1>
-			<KEYWORD1>RequestHeader</KEYWORD1>
-			<KEYWORD1>Require</KEYWORD1>
-			<KEYWORD1>RewriteBase</KEYWORD1>
-			<KEYWORD1>RewriteCond</KEYWORD1>
-			<KEYWORD1>RewriteEngine</KEYWORD1>
-			<KEYWORD1>RewriteOptions</KEYWORD1>
-			<KEYWORD1>RewriteRule</KEYWORD1>
-			<KEYWORD1>RLimitCPU</KEYWORD1>
-			<KEYWORD1>RLimitMEM</KEYWORD1>
-			<KEYWORD1>RLimitNPROC</KEYWORD1>
-			<KEYWORD1>Satisfy</KEYWORD1>
-			<KEYWORD1>ScriptInterpreterSource</KEYWORD1>
-			<KEYWORD1>ServerSignature</KEYWORD1>
-			<KEYWORD1>SetEnv</KEYWORD1>
-			<KEYWORD1>SetEnvIf</KEYWORD1>
-			<KEYWORD1>SetEnvIfNoCase</KEYWORD1>
-			<KEYWORD1>SetHandler</KEYWORD1>
-			<KEYWORD1>SetInputFilter</KEYWORD1>
-			<KEYWORD1>SetOutputFilter</KEYWORD1>
-			<KEYWORD1>SSIErrorMsg</KEYWORD1>
-			<KEYWORD1>SSITimeFormat</KEYWORD1>
-			<KEYWORD1>SSLCipherSuite</KEYWORD1>
-			<KEYWORD1>SSLOptions</KEYWORD1>
-			<KEYWORD1>SSLProxyCipherSuite</KEYWORD1>
-			<KEYWORD1>SSLProxyVerify</KEYWORD1>
-			<KEYWORD1>SSLProxyVerifyDepth</KEYWORD1>
-			<KEYWORD1>SSLRequire</KEYWORD1>
-			<KEYWORD1>SSLRequireSSL</KEYWORD1>
-			<KEYWORD1>SSLUserName</KEYWORD1>
-			<KEYWORD1>SSLVerifyClient</KEYWORD1>
-			<KEYWORD1>SSLVerifyDepth</KEYWORD1>
-			<KEYWORD1>UnsetEnv</KEYWORD1>
-			<KEYWORD1>XBitHack</KEYWORD1>
-
-			<LITERAL3>Basic</LITERAL3>
-			<LITERAL3>Digest</LITERAL3>
-			<LITERAL3>None</LITERAL3>
-			<LITERAL3>Off</LITERAL3>
-			<LITERAL3>On</LITERAL3>
-		</KEYWORDS>
-
-	</RULES>
-
-	<RULES SET="DIRECTIVE" DEFAULT="NULL" IGNORE_CASE="TRUE">
-
-		<EOL_SPAN TYPE="COMMENT2">#</EOL_SPAN>
-
-		<SPAN TYPE="LITERAL1" ESCAPE="\" NO_LINE_BREAK="TRUE">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-
-		<SPAN_REGEXP HASH_CHAR="&lt;" TYPE="MARKUP" DELEGATE="DIRECTIVE">
-			<BEGIN><![CDATA[<(\w+)[^>]*>]]></BEGIN>
-			<END><![CDATA[</$1>]]></END>
-		</SPAN_REGEXP>
-
-		<KEYWORDS>
-
-			<KEYWORD2>AcceptMutex</KEYWORD2>
-			<KEYWORD2>AcceptPathInfo</KEYWORD2>
-			<KEYWORD2>AccessFileName</KEYWORD2>
-			<KEYWORD2>Action</KEYWORD2>
-			<KEYWORD2>AddAlt</KEYWORD2>
-			<KEYWORD2>AddAltByEncoding</KEYWORD2>
-			<KEYWORD2>AddAltByType</KEYWORD2>
-			<KEYWORD2>AddCharset</KEYWORD2>
-			<KEYWORD2>AddDefaultCharset</KEYWORD2>
-			<KEYWORD2>AddDescription</KEYWORD2>
-			<KEYWORD2>AddEncoding</KEYWORD2>
-			<KEYWORD2>AddHandler</KEYWORD2>
-			<KEYWORD2>AddIcon</KEYWORD2>
-			<KEYWORD2>AddIconByEncoding</KEYWORD2>
-			<KEYWORD2>AddIconByType</KEYWORD2>
-			<KEYWORD2>AddInputFilter</KEYWORD2>
-			<KEYWORD2>AddLanguage</KEYWORD2>
-			<KEYWORD2>AddModuleInfo</KEYWORD2>
-			<KEYWORD2>AddOutputFilter</KEYWORD2>
-			<KEYWORD2>AddOutputFilterByType</KEYWORD2>
-			<KEYWORD2>AddType</KEYWORD2>
-			<KEYWORD2>Alias</KEYWORD2>
-			<KEYWORD2>AliasMatch</KEYWORD2>
-			<KEYWORD2>Allow</KEYWORD2>
-			<KEYWORD2>AllowCONNECT</KEYWORD2>
-			<KEYWORD2>AllowEncodedSlashes</KEYWORD2>
-			<KEYWORD2>AllowOverride</KEYWORD2>
-			<KEYWORD2>Anonymous</KEYWORD2>
-			<KEYWORD2>Anonymous_Authoritative</KEYWORD2>
-			<KEYWORD2>Anonymous_LogEmail</KEYWORD2>
-			<KEYWORD2>Anonymous_MustGiveEmail</KEYWORD2>
-			<KEYWORD2>Anonymous_NoUserID</KEYWORD2>
-			<KEYWORD2>Anonymous_VerifyEmail</KEYWORD2>
-			<KEYWORD2>AuthAuthoritative</KEYWORD2>
-			<KEYWORD2>AuthBasicAuthoritative</KEYWORD2>
-			<KEYWORD2>AuthBasicProvider</KEYWORD2>
-			<KEYWORD2>AuthDBMAuthoritative</KEYWORD2>
-			<KEYWORD2>AuthDBMGroupFile</KEYWORD2>
-			<KEYWORD2>AuthDBMType</KEYWORD2>
-			<KEYWORD2>AuthDBMUserFile</KEYWORD2>
-			<KEYWORD2>AuthDigestAlgorithm</KEYWORD2>
-			<KEYWORD2>AuthDigestDomain</KEYWORD2>
-			<KEYWORD2>AuthDigestFile</KEYWORD2>
-			<KEYWORD2>AuthDigestGroupFile</KEYWORD2>
-			<KEYWORD2>AuthDigestNcCheck</KEYWORD2>
-			<KEYWORD2>AuthDigestNonceFormat</KEYWORD2>
-			<KEYWORD2>AuthDigestNonceLifetime</KEYWORD2>
-			<KEYWORD2>AuthDigestQop</KEYWORD2>
-			<KEYWORD2>AuthDigestShmemSize</KEYWORD2>
-			<KEYWORD2>AuthGroupFile</KEYWORD2>
-			<KEYWORD2>AuthLDAPAuthoritative</KEYWORD2>
-			<KEYWORD2>AuthLDAPBindDN</KEYWORD2>
-			<KEYWORD2>AuthLDAPBindPassword</KEYWORD2>
-			<KEYWORD2>AuthLDAPCharsetConfig</KEYWORD2>
-			<KEYWORD2>AuthLDAPCompareDNOnServer</KEYWORD2>
-			<KEYWORD2>AuthLDAPDereferenceAliases</KEYWORD2>
-			<KEYWORD2>AuthLDAPEnabled</KEYWORD2>
-			<KEYWORD2>AuthLDAPFrontPageHack</KEYWORD2>
-			<KEYWORD2>AuthLDAPGroupAttribute</KEYWORD2>
-			<KEYWORD2>AuthLDAPGroupAttributeIsDN</KEYWORD2>
-			<KEYWORD2>AuthLDAPRemoteUserIsDN</KEYWORD2>
-			<KEYWORD2>AuthLDAPUrl</KEYWORD2>
-			<KEYWORD2>AuthName</KEYWORD2>
-			<KEYWORD2>AuthType</KEYWORD2>
-			<KEYWORD2>AuthUserFile</KEYWORD2>
-			<KEYWORD2>BS2000Account</KEYWORD2>
-			<KEYWORD2>BrowserMatch</KEYWORD2>
-			<KEYWORD2>BrowserMatchNoCase</KEYWORD2>
-			<KEYWORD2>CGIMapExtension</KEYWORD2>
-			<KEYWORD2>CacheDefaultExpire</KEYWORD2>
-			<KEYWORD2>CacheDirLength</KEYWORD2>
-			<KEYWORD2>CacheDirLevels</KEYWORD2>
-			<KEYWORD2>CacheDisable</KEYWORD2>
-			<KEYWORD2>CacheEnable</KEYWORD2>
-			<KEYWORD2>CacheExpiryCheck</KEYWORD2>
-			<KEYWORD2>CacheFile</KEYWORD2>
-			<KEYWORD2>CacheForceCompletion</KEYWORD2>
-			<KEYWORD2>CacheGcClean</KEYWORD2>
-			<KEYWORD2>CacheGcDaily</KEYWORD2>
-			<KEYWORD2>CacheGcInterval</KEYWORD2>
-			<KEYWORD2>CacheGcMemUsage</KEYWORD2>
-			<KEYWORD2>CacheGcUnused</KEYWORD2>
-			<KEYWORD2>CacheIgnoreCacheControl</KEYWORD2>
-			<KEYWORD2>CacheIgnoreNoLastMod</KEYWORD2>
-			<KEYWORD2>CacheLastModifiedFactor</KEYWORD2>
-			<KEYWORD2>CacheMaxExpire</KEYWORD2>
-			<KEYWORD2>CacheMaxFileSize</KEYWORD2>
-			<KEYWORD2>CacheMinFileSize</KEYWORD2>
-			<KEYWORD2>CacheNegotiatedDocs</KEYWORD2>
-			<KEYWORD2>CacheRoot</KEYWORD2>
-			<KEYWORD2>CacheSize</KEYWORD2>
-			<KEYWORD2>CacheTimeMargin</KEYWORD2>
-			<KEYWORD2>CharsetDefault</KEYWORD2>
-			<KEYWORD2>CharsetOptions</KEYWORD2>
-			<KEYWORD2>CharsetSourceEnc</KEYWORD2>
-			<KEYWORD2>CheckSpelling</KEYWORD2>
-			<KEYWORD2>ChildPerUserID</KEYWORD2>
-			<KEYWORD2>ContentDigest</KEYWORD2>
-			<KEYWORD2>CookieDomain</KEYWORD2>
-			<KEYWORD2>CookieExpires</KEYWORD2>
-			<KEYWORD2>CookieLog</KEYWORD2>
-			<KEYWORD2>CookieName</KEYWORD2>
-			<KEYWORD2>CookieStyle</KEYWORD2>
-			<KEYWORD2>CookieTracking</KEYWORD2>
-			<KEYWORD2>CoreDumpDirectory</KEYWORD2>
-			<KEYWORD2>CustomLog</KEYWORD2>
-			<KEYWORD2>Dav</KEYWORD2>
-			<KEYWORD2>DavDepthInfinity</KEYWORD2>
-			<KEYWORD2>DavLockDB</KEYWORD2>
-			<KEYWORD2>DavMinTimeout</KEYWORD2>
-			<KEYWORD2>DefaultIcon</KEYWORD2>
-			<KEYWORD2>DefaultLanguage</KEYWORD2>
-			<KEYWORD2>DefaultType</KEYWORD2>
-			<KEYWORD2>DeflateBufferSize</KEYWORD2>
-			<KEYWORD2>DeflateCompressionLevel</KEYWORD2>
-			<KEYWORD2>DeflateFilterNote</KEYWORD2>
-			<KEYWORD2>DeflateMemLevel</KEYWORD2>
-			<KEYWORD2>DeflateWindowSize</KEYWORD2>
-			<KEYWORD2>Deny</KEYWORD2>
-			<KEYWORD2>DirectoryIndex</KEYWORD2>
-			<KEYWORD1>DirectorySlash</KEYWORD1>
-			<KEYWORD2>DocumentRoot</KEYWORD2>
-			<KEYWORD2>EnableMMAP</KEYWORD2>
-			<KEYWORD2>EnableSendfile</KEYWORD2>
-			<KEYWORD2>ErrorDocument</KEYWORD2>
-			<KEYWORD2>ErrorLog</KEYWORD2>
-			<KEYWORD2>Example</KEYWORD2>
-			<KEYWORD2>ExpiresActive</KEYWORD2>
-			<KEYWORD2>ExpiresByType</KEYWORD2>
-			<KEYWORD2>ExpiresDefault</KEYWORD2>
-			<KEYWORD2>ExtFilterDefine</KEYWORD2>
-			<KEYWORD2>ExtFilterOptions</KEYWORD2>
-			<KEYWORD2>ExtendedStatus</KEYWORD2>
-			<KEYWORD2>FileETag</KEYWORD2>
-			<KEYWORD2>ForceLanguagePriority</KEYWORD2>
-			<KEYWORD2>ForceType</KEYWORD2>
-			<KEYWORD2>Group</KEYWORD2>
-			<KEYWORD2>Header</KEYWORD2>
-			<KEYWORD2>HeaderName</KEYWORD2>
-			<KEYWORD2>HostnameLookups</KEYWORD2>
-			<KEYWORD2>ISAPIAppendLogToErrors</KEYWORD2>
-			<KEYWORD2>ISAPIAppendLogToQuery</KEYWORD2>
-			<KEYWORD2>ISAPICacheFile</KEYWORD2>
-			<KEYWORD2>ISAPIFakeAsync</KEYWORD2>
-			<KEYWORD2>ISAPILogNotSupported</KEYWORD2>
-			<KEYWORD2>ISAPIReadAheadBuffer</KEYWORD2>
-			<KEYWORD2>IdentityCheck</KEYWORD2>
-			<KEYWORD2>ImapBase</KEYWORD2>
-			<KEYWORD2>ImapDefault</KEYWORD2>
-			<KEYWORD2>ImapMenu</KEYWORD2>
-			<KEYWORD2>Include</KEYWORD2>
-			<KEYWORD2>IndexIgnore</KEYWORD2>
-			<KEYWORD2>IndexOptions</KEYWORD2>
-			<KEYWORD2>IndexOrderDefault</KEYWORD2>
-			<KEYWORD2>KeepAlive</KEYWORD2>
-			<KEYWORD2>KeepAliveTimeout</KEYWORD2>
-			<KEYWORD2>LDAPCacheEntries</KEYWORD2>
-			<KEYWORD2>LDAPCacheTTL</KEYWORD2>
-			<KEYWORD2>LDAPOpCacheEntries</KEYWORD2>
-			<KEYWORD2>LDAPOpCacheTTL</KEYWORD2>
-			<KEYWORD2>LDAPSharedCacheSize</KEYWORD2>
-			<KEYWORD2>LDAPTrustedCA</KEYWORD2>
-			<KEYWORD2>LDAPTrustedCAType</KEYWORD2>
-			<KEYWORD2>LanguagePriority</KEYWORD2>
-			<KEYWORD2>LimitInternalRecursion</KEYWORD2>
-			<KEYWORD2>LimitRequestBody</KEYWORD2>
-			<KEYWORD2>LimitRequestFields</KEYWORD2>
-			<KEYWORD2>LimitRequestFieldsize</KEYWORD2>
-			<KEYWORD2>LimitRequestLine</KEYWORD2>
-			<KEYWORD2>LimitXMLRequestBody</KEYWORD2>
-			<KEYWORD2>Listen</KEYWORD2>
-			<KEYWORD2>ListenBacklog</KEYWORD2>
-			<KEYWORD2>LoadFile</KEYWORD2>
-			<KEYWORD2>LoadModule</KEYWORD2>
-			<KEYWORD2>LockFile</KEYWORD2>
-			<KEYWORD2>LogFormat</KEYWORD2>
-			<KEYWORD2>LogLevel</KEYWORD2>
-			<KEYWORD2>MCacheMaxObjectCount</KEYWORD2>
-			<KEYWORD2>MCacheMaxObjectSize</KEYWORD2>
-			<KEYWORD2>MCacheMaxStreamingBuffer</KEYWORD2>
-			<KEYWORD2>MCacheMinObjectSize</KEYWORD2>
-			<KEYWORD2>MCacheRemovalAlgorithm</KEYWORD2>
-			<KEYWORD2>MCacheSize</KEYWORD2>
-			<KEYWORD2>MMapFile</KEYWORD2>
-			<KEYWORD2>MaxClients</KEYWORD2>
-			<KEYWORD2>MaxKeepAliveRequests</KEYWORD2>
-			<KEYWORD2>MaxMemFree</KEYWORD2>
-			<KEYWORD2>MaxRequestsPerChild</KEYWORD2>
-			<KEYWORD2>MaxRequestsPerThread</KEYWORD2>
-			<KEYWORD2>MaxSpareServers</KEYWORD2>
-			<KEYWORD2>MaxSpareThreads</KEYWORD2>
-			<KEYWORD2>MaxThreads</KEYWORD2>
-			<KEYWORD2>MaxThreadsPerChild</KEYWORD2>
-			<KEYWORD2>MetaDir</KEYWORD2>
-			<KEYWORD2>MetaFiles</KEYWORD2>
-			<KEYWORD2>MetaSuffix</KEYWORD2>
-			<KEYWORD2>MimeMagicFile</KEYWORD2>
-			<KEYWORD2>MinSpareServers</KEYWORD2>
-			<KEYWORD2>MinSpareThreads</KEYWORD2>
-			<KEYWORD2>ModMimeUsePathInfo</KEYWORD2>
-			<KEYWORD2>MultiviewsMatch</KEYWORD2>
-			<KEYWORD2>NWSSLTrustedCerts</KEYWORD2>
-			<KEYWORD2>NameVirtualHost</KEYWORD2>
-			<KEYWORD2>NoProxy</KEYWORD2>
-			<KEYWORD2>NumServers</KEYWORD2>
-			<KEYWORD2>Options</KEYWORD2>
-			<KEYWORD2>Order</KEYWORD2>
-			<KEYWORD2>PassEnv</KEYWORD2>
-			<KEYWORD2>PidFile</KEYWORD2>
-			<KEYWORD2>ProtocolEcho</KEYWORD2>
-			<KEYWORD2>ProxyBadHeader</KEYWORD2>
-			<KEYWORD2>ProxyBlock</KEYWORD2>
-			<KEYWORD2>ProxyDomain</KEYWORD2>
-			<KEYWORD2>ProxyErrorOverride</KEYWORD2>
-			<KEYWORD2>ProxyIOBufferSize</KEYWORD2>
-			<KEYWORD2>ProxyMaxForwards</KEYWORD2>
-			<KEYWORD2>ProxyPass</KEYWORD2>
-			<KEYWORD2>ProxyPassReverse</KEYWORD2>
-			<KEYWORD2>ProxyPreserveHost</KEYWORD2>
-			<KEYWORD2>ProxyReceiveBufferSize</KEYWORD2>
-			<KEYWORD2>ProxyRemote</KEYWORD2>
-			<KEYWORD2>ProxyRemoteMatch</KEYWORD2>
-			<KEYWORD2>ProxyRequests</KEYWORD2>
-			<KEYWORD2>ProxyTimeout</KEYWORD2>
-			<KEYWORD2>ProxyVia</KEYWORD2>
-			<KEYWORD2>RLimitCPU</KEYWORD2>
-			<KEYWORD2>RLimitMEM</KEYWORD2>
-			<KEYWORD2>RLimitNPROC</KEYWORD2>
-			<KEYWORD2>ReadmeName</KEYWORD2>
-			<KEYWORD2>Redirect</KEYWORD2>
-			<KEYWORD2>RedirectMatch</KEYWORD2>
-			<KEYWORD2>RedirectPermanent</KEYWORD2>
-			<KEYWORD2>RedirectTemp</KEYWORD2>
-			<KEYWORD2>RemoveCharset</KEYWORD2>
-			<KEYWORD2>RemoveEncoding</KEYWORD2>
-			<KEYWORD2>RemoveHandler</KEYWORD2>
-			<KEYWORD2>RemoveInputFilter</KEYWORD2>
-			<KEYWORD2>RemoveLanguage</KEYWORD2>
-			<KEYWORD2>RemoveOutputFilter</KEYWORD2>
-			<KEYWORD2>RemoveType</KEYWORD2>
-			<KEYWORD2>RequestHeader</KEYWORD2>
-			<KEYWORD2>Require</KEYWORD2>
-			<KEYWORD2>RewriteBase</KEYWORD2>
-			<KEYWORD2>RewriteCond</KEYWORD2>
-			<KEYWORD2>RewriteEngine</KEYWORD2>
-			<KEYWORD2>RewriteLock</KEYWORD2>
-			<KEYWORD2>RewriteLog</KEYWORD2>
-			<KEYWORD2>RewriteLogLevel</KEYWORD2>
-			<KEYWORD2>RewriteMap</KEYWORD2>
-			<KEYWORD2>RewriteOptions</KEYWORD2>
-			<KEYWORD2>RewriteRule</KEYWORD2>
-			<KEYWORD2>SSIEndTag</KEYWORD2>
-			<KEYWORD2>SSIErrorMsg</KEYWORD2>
-			<KEYWORD2>SSIStartTag</KEYWORD2>
-			<KEYWORD2>SSITimeFormat</KEYWORD2>
-			<KEYWORD2>SSIUndefinedEcho</KEYWORD2>
-			<KEYWORD2>SSLCACertificateFile</KEYWORD2>
-			<KEYWORD2>SSLCACertificatePath</KEYWORD2>
-			<KEYWORD2>SSLCARevocationFile</KEYWORD2>
-			<KEYWORD2>SSLCARevocationPath</KEYWORD2>
-			<KEYWORD2>SSLCertificateChainFile</KEYWORD2>
-			<KEYWORD2>SSLCertificateFile</KEYWORD2>
-			<KEYWORD2>SSLCertificateKeyFile</KEYWORD2>
-			<KEYWORD2>SSLCipherSuite</KEYWORD2>
-			<KEYWORD2>SSLEngine</KEYWORD2>
-			<KEYWORD2>SSLMutex</KEYWORD2>
-			<KEYWORD2>SSLOptions</KEYWORD2>
-			<KEYWORD2>SSLPassPhraseDialog</KEYWORD2>
-			<KEYWORD2>SSLProtocol</KEYWORD2>
-			<KEYWORD2>SSLProxyCACertificateFile</KEYWORD2>
-			<KEYWORD2>SSLProxyCACertificatePath</KEYWORD2>
-			<KEYWORD2>SSLProxyCARevocationFile</KEYWORD2>
-			<KEYWORD2>SSLProxyCARevocationPath</KEYWORD2>
-			<KEYWORD2>SSLProxyCipherSuite</KEYWORD2>
-			<KEYWORD2>SSLProxyEngine</KEYWORD2>
-			<KEYWORD2>SSLProxyMachineCertificateFile</KEYWORD2>
-			<KEYWORD2>SSLProxyMachineCertificatePath</KEYWORD2>
-			<KEYWORD2>SSLProxyProtocol</KEYWORD2>
-			<KEYWORD2>SSLProxyVerify</KEYWORD2>
-			<KEYWORD2>SSLProxyVerifyDepth</KEYWORD2>
-			<KEYWORD2>SSLRandomSeed</KEYWORD2>
-			<KEYWORD2>SSLRequire</KEYWORD2>
-			<KEYWORD2>SSLRequireSSL</KEYWORD2>
-			<KEYWORD2>SSLSessionCache</KEYWORD2>
-			<KEYWORD2>SSLSessionCacheTimeout</KEYWORD2>
-			<KEYWORD2>SSLVerifyClient</KEYWORD2>
-			<KEYWORD2>SSLVerifyDepth</KEYWORD2>
-			<KEYWORD2>Satisfy</KEYWORD2>
-			<KEYWORD2>ScoreBoardFile</KEYWORD2>
-			<KEYWORD2>Script</KEYWORD2>
-			<KEYWORD2>ScriptAlias</KEYWORD2>
-			<KEYWORD2>ScriptAliasMatch</KEYWORD2>
-			<KEYWORD2>ScriptInterpreterSource</KEYWORD2>
-			<KEYWORD2>ScriptLog</KEYWORD2>
-			<KEYWORD2>ScriptLogBuffer</KEYWORD2>
-			<KEYWORD2>ScriptLogLength</KEYWORD2>
-			<KEYWORD2>ScriptSock</KEYWORD2>
-			<KEYWORD2>SecureListen</KEYWORD2>
-			<KEYWORD2>SendBufferSize</KEYWORD2>
-			<KEYWORD2>ServerAdmin</KEYWORD2>
-			<KEYWORD2>ServerLimit</KEYWORD2>
-			<KEYWORD2>ServerName</KEYWORD2>
-			<KEYWORD2>ServerRoot</KEYWORD2>
-			<KEYWORD2>ServerSignature</KEYWORD2>
-			<KEYWORD2>ServerTokens</KEYWORD2>
-			<KEYWORD2>SetEnv</KEYWORD2>
-			<KEYWORD2>SetEnvIf</KEYWORD2>
-			<KEYWORD2>SetEnvIfNoCase</KEYWORD2>
-			<KEYWORD2>SetHandler</KEYWORD2>
-			<KEYWORD2>SetInputFilter</KEYWORD2>
-			<KEYWORD2>SetOutputFilter</KEYWORD2>
-			<KEYWORD2>StartServers</KEYWORD2>
-			<KEYWORD2>StartThreads</KEYWORD2>
-			<KEYWORD2>SuexecUserGroup</KEYWORD2>
-			<KEYWORD2>ThreadLimit</KEYWORD2>
-			<KEYWORD2>ThreadStackSize</KEYWORD2>
-			<KEYWORD2>ThreadsPerChild</KEYWORD2>
-			<KEYWORD2>TimeOut</KEYWORD2>
-			<KEYWORD2>TransferLog</KEYWORD2>
-			<KEYWORD2>TypesConfig</KEYWORD2>
-			<KEYWORD2>UnsetEnv</KEYWORD2>
-			<KEYWORD2>UseCanonicalName</KEYWORD2>
-			<KEYWORD2>User</KEYWORD2>
-			<KEYWORD2>UserDir</KEYWORD2>
-			<KEYWORD2>VirtualDocumentRoot</KEYWORD2>
-			<KEYWORD2>VirtualDocumentRootIP</KEYWORD2>
-			<KEYWORD2>VirtualScriptAlias</KEYWORD2>
-			<KEYWORD2>VirtualScriptAliasIP</KEYWORD2>
-			<KEYWORD2>XBitHack</KEYWORD2>
-
-			<!-- Apache 1.x -->
-			<!-- using 4 for apache 1.x vs 2.x -->
-			<KEYWORD4>AddModule</KEYWORD4>
-			<KEYWORD4>ClearModuleList</KEYWORD4>
-
-			<!-- Subversion directives -->
-			<KEYWORD3>SVNPath</KEYWORD3>
-			<KEYWORD3>SVNParentPath</KEYWORD3>
-			<KEYWORD3>SVNIndexXSLT</KEYWORD3>
-
-			<!-- mod_python directives -->
-			<KEYWORD3>PythonHandler</KEYWORD3>
-			<KEYWORD3>PythonDebug</KEYWORD3>
-
-			<!-- mod_php -->
-			<KEYWORD3>php_value</KEYWORD3>
-			<!-- using 4 for apache 1.x vs 2.x -->
-			<KEYWORD4>php_flag</KEYWORD4>
-
-			<LITERAL2>All</LITERAL2>
-			<LITERAL2>ExecCGI</LITERAL2>
-			<LITERAL2>FollowSymLinks</LITERAL2>
-			<LITERAL2>Includes</LITERAL2>
-			<LITERAL2>IncludesNOEXEC</LITERAL2>
-			<LITERAL2>Indexes</LITERAL2>
-			<LITERAL2>MultiViews</LITERAL2>
-			<LITERAL2>None</LITERAL2>
-			<LITERAL2>Off</LITERAL2>
-			<LITERAL2>On</LITERAL2>
-			<LITERAL2>SymLinksIfOwnerMatch</LITERAL2>
-			<LITERAL2>from</LITERAL2>
-		</KEYWORDS>
-	</RULES>
-
-</MODE>
diff --git a/qpython/src/main/assets/syntax/html.xml b/qpython/src/main/assets/syntax/html.xml
index a418de51..c2396393 100644
--- a/qpython/src/main/assets/syntax/html.xml
+++ b/qpython/src/main/assets/syntax/html.xml
@@ -9,7 +9,7 @@
 	</PROPS>
 
 	<RULES IGNORE_CASE="TRUE">
-		<!-- SGML comment -->
+		<!-- Sfrom_contentment -->
 		<SPAN TYPE="COMMENT1">
 			<BEGIN>&lt;!--</BEGIN>
 			<END>--&gt;</END>
@@ -169,7 +169,7 @@
 			<KEYWORD1>section</KEYWORD1>
 			<KEYWORD1>select</KEYWORD1>
 			<KEYWORD1>small</KEYWORD1>
-			<KEYWORD1>source</KEYWORD1>
+			<KEYWORD1>code</KEYWORD1>
 			<KEYWORD1>span</KEYWORD1>
 			<KEYWORD1>strike</KEYWORD1>
 			<KEYWORD1>strong</KEYWORD1>
diff --git a/qpython/src/main/assets/syntax/hxml.xml b/qpython/src/main/assets/syntax/hxml.xml
deleted file mode 100644
index da8b77b2..00000000
--- a/qpython/src/main/assets/syntax/hxml.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!--
-  This mode highlights the syntax of haXe build file.
--->
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="lineComment" VALUE="#"/>
-		<PROPERTY NAME="contextInsensitive" VALUE="true"/>
-	</PROPS>
-
-	<RULES IGNORE_CASE="FALSE" HIGHLIGHT_DIGITS="TRUE">
-
-		<!-- Comment -->
-		<EOL_SPAN TYPE="COMMENT1">#</EOL_SPAN>
-
-		<KEYWORDS IGNORE_CASE="FALSE">
-
-			<!-- target keywords -->
-			<KEYWORD1>--next</KEYWORD1>
-			<KEYWORD1>-cpp</KEYWORD1>
-			<KEYWORD1>-js</KEYWORD1>
-			<KEYWORD1>-as3</KEYWORD1>
-			<KEYWORD1>-swf</KEYWORD1>
-			<KEYWORD1>-swf9</KEYWORD1>
-			<KEYWORD1>-neko</KEYWORD1>
-			<KEYWORD1>-php</KEYWORD1>
-			<KEYWORD1>-xml</KEYWORD1>
-
-			<!-- options -->
-			<KEYWORD2>-cp</KEYWORD2>
-			<KEYWORD2>-main</KEYWORD2>
-			<KEYWORD2>-lib</KEYWORD2>
-			<KEYWORD2>-D</KEYWORD2>
-			<KEYWORD2>-v</KEYWORD2>
-			<KEYWORD2>-debug</KEYWORD2>
-			<KEYWORD2>-swf-version</KEYWORD2>
-			<KEYWORD2>-swf-header</KEYWORD2>
-			<KEYWORD2>-swf-lib</KEYWORD2>
-			<KEYWORD2>-x</KEYWORD2>
-			<KEYWORD2>-resource</KEYWORD2>
-			<KEYWORD2>-exclude</KEYWORD2>
-			<KEYWORD2>-prompt</KEYWORD2>
-			<KEYWORD2>-cmd</KEYWORD2>
-
-			<!-- advanced options -->
-			<KEYWORD3>--flash-strict</KEYWORD3>
-			<KEYWORD3>--no-traces</KEYWORD3>
-			<KEYWORD3>--flash-use-stage</KEYWORD3>
-			<KEYWORD3>--neko-source</KEYWORD3>
-			<KEYWORD3>--gen-hx-classes</KEYWORD3>
-			<KEYWORD3>--display</KEYWORD3>
-			<KEYWORD3>--no-output</KEYWORD3>
-			<KEYWORD3>--times</KEYWORD3>
-			<KEYWORD3>--no-inline</KEYWORD3>
-			<KEYWORD3>--no-opt</KEYWORD3>
-			<KEYWORD3>--php-front</KEYWORD3>
-			<KEYWORD3>--js-namespace</KEYWORD3>
-			<KEYWORD3>--remap</KEYWORD3>
-
-		</KEYWORDS>
-	</RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/i4gl.xml b/qpython/src/main/assets/syntax/i4gl.xml
deleted file mode 100644
index 2f48b681..00000000
--- a/qpython/src/main/assets/syntax/i4gl.xml
+++ /dev/null
@@ -1,665 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!-- i4gl.xml -->
-<!-- Informix 4GL mode, by Jozsa Stefan, joozsa@flash.ro -->
-<!-- Based on 'reserved.Z' from www.iiug.org by J.Leffler -->
-
-<MODE>
-
-  <PROPS>
-    <PROPERTY NAME="commentStart" VALUE="{" />
-    <PROPERTY NAME="commentEnd" VALUE="}" />
-    <PROPERTY NAME="lineComment" VALUE="--" />
-    <PROPERTY NAME="noWordSep" VALUE="_" />
-    <PROPERTY NAME="wordBreakChars" VALUE=",+-=&lt;&gt;/?^&amp;*" />
-  </PROPS>
-
-  <RULES IGNORE_CASE="TRUE" HIGHLIGHT_DIGITS="TRUE">
-
-    <SPAN TYPE="LITERAL1" ESCAPE="\">
-      <BEGIN>'</BEGIN>
-      <END>'</END>
-     </SPAN>
-
-    <SPAN TYPE="LITERAL1" ESCAPE="\">
-      <BEGIN>"</BEGIN>
-       <END>"</END>
-     </SPAN>
-
-    <EOL_SPAN TYPE="COMMENT1">--</EOL_SPAN>
-    <EOL_SPAN TYPE="COMMENT1">#</EOL_SPAN>
-
-     <SPAN TYPE="COMMENT1">
-      <BEGIN>{</BEGIN>
-      <END>}</END>
-     </SPAN>
-
-    <SEQ TYPE="NULL">)</SEQ>
-    <!-- <SEQ TYPE="NULL">(</SEQ> -->
-    <SEQ TYPE="NULL">]</SEQ>
-    <SEQ TYPE="NULL">[</SEQ>
-    <SEQ TYPE="NULL">.</SEQ>
-    <SEQ TYPE="NULL">,</SEQ>
-    <SEQ TYPE="NULL">;</SEQ>
-    <SEQ TYPE="NULL">:</SEQ>
-    <SEQ TYPE="OPERATOR">=</SEQ>
-    <SEQ TYPE="OPERATOR">==</SEQ>
-    <SEQ TYPE="OPERATOR">!=</SEQ>
-    <SEQ TYPE="OPERATOR">&gt;=</SEQ>
-    <SEQ TYPE="OPERATOR">&lt;=</SEQ>
-    <SEQ TYPE="OPERATOR">&lt;&gt;</SEQ>
-    <SEQ TYPE="OPERATOR">&gt;</SEQ>
-    <SEQ TYPE="OPERATOR">&lt;</SEQ>
-    <SEQ TYPE="OPERATOR">+</SEQ>
-    <SEQ TYPE="OPERATOR">-</SEQ>
-    <SEQ TYPE="OPERATOR">/</SEQ>
-    <SEQ TYPE="OPERATOR">*</SEQ>
-    <SEQ TYPE="OPERATOR">||</SEQ>
-
-     <!-- Function calls -->
-    <MARK_PREVIOUS TYPE="FUNCTION" MATCH_TYPE="OPERATOR">(</MARK_PREVIOUS>
-	<SEQ TYPE="OPERATOR">)</SEQ>
-
-    <KEYWORDS>
-
-      <!-- 4GL Reserved Keywords. -->
-      <!-- Many keywords because SQL is embeded in 4GL -->
-      <KEYWORD1>ABORT</KEYWORD1>
-      <KEYWORD1>ABS</KEYWORD1>
-      <KEYWORD1>ABSOLUTE</KEYWORD1>
-      <KEYWORD1>ACCEPT</KEYWORD1>
-      <KEYWORD1>ACCESS</KEYWORD1>
-      <KEYWORD1>ACOS</KEYWORD1>
-      <KEYWORD1>ADA</KEYWORD1>
-      <KEYWORD1>ADD</KEYWORD1>
-      <KEYWORD1>AFTER</KEYWORD1>
-      <KEYWORD1>ALL</KEYWORD1>
-      <KEYWORD1>ALLOCATE</KEYWORD1>
-      <KEYWORD1>ALTER</KEYWORD1>
-      <KEYWORD1>AND</KEYWORD1>
-      <KEYWORD1>ANSI</KEYWORD1>
-      <KEYWORD1>ANY</KEYWORD1>
-      <KEYWORD1>APPEND</KEYWORD1>
-      <KEYWORD1>ARG_VAL</KEYWORD1>
-      <KEYWORD1>ARRAY</KEYWORD1>
-      <KEYWORD1>ARR_COUNT</KEYWORD1>
-      <KEYWORD1>ARR_CURR</KEYWORD1>
-      <KEYWORD1>AS</KEYWORD1>
-      <KEYWORD1>ASC</KEYWORD1>
-      <KEYWORD1>ASCENDING</KEYWORD1>
-      <KEYWORD1>ASCII</KEYWORD1>
-      <KEYWORD1>ASIN</KEYWORD1>
-      <KEYWORD1>AT</KEYWORD1>
-      <KEYWORD1>ATAN</KEYWORD1>
-      <KEYWORD1>ATAN2</KEYWORD1>
-      <KEYWORD1>ATTACH</KEYWORD1>
-      <KEYWORD1>ATTRIBUTE</KEYWORD1>
-      <KEYWORD1>ATTRIBUTES</KEYWORD1>
-      <KEYWORD1>AUDIT</KEYWORD1>
-      <KEYWORD1>AUTHORIZATION</KEYWORD1>
-      <KEYWORD1>AUTO</KEYWORD1>
-      <KEYWORD1>AUTONEXT</KEYWORD1>
-      <KEYWORD1>AVERAGE</KEYWORD1>
-      <KEYWORD1>AVG</KEYWORD1>
-      <KEYWORD1>BEFORE</KEYWORD1>
-      <KEYWORD1>BEGIN</KEYWORD1>
-      <KEYWORD1>BETWEEN</KEYWORD1>
-      <KEYWORD1>BLACK</KEYWORD1>
-      <KEYWORD1>BLINK</KEYWORD1>
-      <KEYWORD1>BLUE</KEYWORD1>
-      <KEYWORD1>BOLD</KEYWORD1>
-      <KEYWORD1>BORDER</KEYWORD1>
-      <KEYWORD1>BOTH</KEYWORD1>
-      <KEYWORD1>BOTTOM</KEYWORD1>
-      <KEYWORD1>BREAK</KEYWORD1>
-      <KEYWORD1>BUFFERED</KEYWORD1>
-      <KEYWORD1>BY</KEYWORD1>
-      <KEYWORD1>BYTE</KEYWORD1>
-      <KEYWORD1>CALL</KEYWORD1>
-      <KEYWORD1>CASCADE</KEYWORD1>
-      <KEYWORD1>CASE</KEYWORD1>
-      <KEYWORD1>CHAR</KEYWORD1>
-      <KEYWORD1>CHARACTER</KEYWORD1>
-      <KEYWORD1>CHARACTER_LENGTH</KEYWORD1>
-      <KEYWORD1>CHAR_LENGTH</KEYWORD1>
-      <KEYWORD1>CHECK</KEYWORD1>
-      <KEYWORD1>CLASS_ORIGIN</KEYWORD1>
-      <KEYWORD1>CLEAR</KEYWORD1>
-      <KEYWORD1>CLIPPED</KEYWORD1>
-      <KEYWORD1>CLOSE</KEYWORD1>
-      <KEYWORD1>CLUSTER</KEYWORD1>
-      <KEYWORD1>COBOL</KEYWORD1>
-      <KEYWORD1>COLOR</KEYWORD1>
-      <KEYWORD1>COLUMN</KEYWORD1>
-      <KEYWORD1>COLUMNS</KEYWORD1>
-      <KEYWORD1>COMMAND</KEYWORD1>
-      <KEYWORD1>COMMENT</KEYWORD1>
-      <KEYWORD1>COMMENTS</KEYWORD1>
-      <KEYWORD1>COMMIT</KEYWORD1>
-      <KEYWORD1>COMMITTED</KEYWORD1>
-      <KEYWORD1>COMPOSITES</KEYWORD1>
-      <KEYWORD1>COMPRESS</KEYWORD1>
-      <KEYWORD1>CONCURRENT</KEYWORD1>
-      <KEYWORD1>CONNECT</KEYWORD1>
-      <KEYWORD1>CONNECTION</KEYWORD1>
-      <KEYWORD1>CONNECTION_ALIAS</KEYWORD1>
-      <KEYWORD1>CONSTRAINED</KEYWORD1>
-      <KEYWORD1>CONSTRAINT</KEYWORD1>
-      <KEYWORD1>CONSTRAINTS</KEYWORD1>
-      <KEYWORD1>CONSTRUCT</KEYWORD1>
-      <KEYWORD1>CONTINUE</KEYWORD1>
-      <KEYWORD1>CONTROL</KEYWORD1>
-      <KEYWORD1>COS</KEYWORD1>
-      <KEYWORD1>COUNT</KEYWORD1>
-      <KEYWORD1>CREATE</KEYWORD1>
-      <KEYWORD1>CURRENT</KEYWORD1>
-      <KEYWORD1>CURSOR</KEYWORD1>
-      <KEYWORD1>CYAN</KEYWORD1>
-      <KEYWORD1>DATA</KEYWORD1>
-      <KEYWORD1>DATABASE</KEYWORD1>
-      <KEYWORD1>DATASKIP</KEYWORD1>
-      <KEYWORD1>DATE</KEYWORD1>
-      <KEYWORD1>DATETIME</KEYWORD1>
-      <KEYWORD1>DAY</KEYWORD1>
-      <KEYWORD1>DBA</KEYWORD1>
-      <KEYWORD1>DBINFO</KEYWORD1>
-      <KEYWORD1>DBSERVERNAME</KEYWORD1>
-      <KEYWORD1>DEALLOCATE</KEYWORD1>
-      <KEYWORD1>DEBUG</KEYWORD1>
-      <KEYWORD1>DEC</KEYWORD1>
-      <KEYWORD1>DECIMAL</KEYWORD1>
-      <KEYWORD1>DECLARE</KEYWORD1>
-      <KEYWORD1>DEFAULT</KEYWORD1>
-      <KEYWORD1>DEFAULTS</KEYWORD1>
-      <KEYWORD1>DEFER</KEYWORD1>
-      <KEYWORD1>DEFERRED</KEYWORD1>
-      <KEYWORD1>DEFINE</KEYWORD1>
-      <KEYWORD1>DELETE</KEYWORD1>
-      <KEYWORD1>DELIMITER</KEYWORD1>
-      <KEYWORD1>DELIMITERS</KEYWORD1>
-      <KEYWORD1>DESC</KEYWORD1>
-      <KEYWORD1>DESCENDING</KEYWORD1>
-      <KEYWORD1>DESCRIBE</KEYWORD1>
-      <KEYWORD1>DESCRIPTOR</KEYWORD1>
-      <KEYWORD1>DETACH</KEYWORD1>
-      <KEYWORD1>DIAGNOSTICS</KEYWORD1>
-      <KEYWORD1>DIM</KEYWORD1>
-      <KEYWORD1>DIRTY</KEYWORD1>
-      <KEYWORD1>DISABLED</KEYWORD1>
-      <KEYWORD1>DISCONNECT</KEYWORD1>
-      <KEYWORD1>DISPLAY</KEYWORD1>
-      <KEYWORD1>DISTINCT</KEYWORD1>
-      <KEYWORD1>DISTRIBUTIONS</KEYWORD1>
-      <KEYWORD1>DO</KEYWORD1>
-      <KEYWORD1>DORMANT</KEYWORD1>
-      <KEYWORD1>DOUBLE</KEYWORD1>
-      <KEYWORD1>DOWN</KEYWORD1>
-      <KEYWORD1>DOWNSHIFT</KEYWORD1>
-      <KEYWORD1>DROP</KEYWORD1>
-      <KEYWORD1>EACH</KEYWORD1>
-      <KEYWORD1>ELIF</KEYWORD1>
-      <KEYWORD1>ELSE</KEYWORD1>
-      <KEYWORD1>ENABLED</KEYWORD1>
-      <KEYWORD1>END</KEYWORD1>
-      <KEYWORD1>ENTRY</KEYWORD1>
-      <KEYWORD1>ERROR</KEYWORD1>
-      <KEYWORD1>ERRORLOG</KEYWORD1>
-      <KEYWORD1>ERR_GET</KEYWORD1>
-      <KEYWORD1>ERR_PRINT</KEYWORD1>
-      <KEYWORD1>ERR_QUIT</KEYWORD1>
-      <KEYWORD1>ESC</KEYWORD1>
-      <KEYWORD1>ESCAPE</KEYWORD1>
-      <KEYWORD1>EVERY</KEYWORD1>
-      <KEYWORD1>EXCEPTION</KEYWORD1>
-      <KEYWORD1>EXCLUSIVE</KEYWORD1>
-      <KEYWORD1>EXEC</KEYWORD1>
-      <KEYWORD1>EXECUTE</KEYWORD1>
-      <KEYWORD1>EXISTS</KEYWORD1>
-      <KEYWORD1>EXIT</KEYWORD1>
-      <KEYWORD1>EXP</KEYWORD1>
-      <KEYWORD1>EXPLAIN</KEYWORD1>
-      <KEYWORD1>EXPRESSION</KEYWORD1>
-      <KEYWORD1>EXTEND</KEYWORD1>
-      <KEYWORD1>EXTENT</KEYWORD1>
-      <KEYWORD1>EXTERN</KEYWORD1>
-      <KEYWORD1>EXTERNAL</KEYWORD1>
-      <KEYWORD1>F1</KEYWORD1>
-      <KEYWORD1>F10</KEYWORD1>
-      <KEYWORD1>F11</KEYWORD1>
-      <KEYWORD1>F12</KEYWORD1>
-      <KEYWORD1>F13</KEYWORD1>
-      <KEYWORD1>F14</KEYWORD1>
-      <KEYWORD1>F15</KEYWORD1>
-      <KEYWORD1>F16</KEYWORD1>
-      <KEYWORD1>F17</KEYWORD1>
-      <KEYWORD1>F18</KEYWORD1>
-      <KEYWORD1>F19</KEYWORD1>
-      <KEYWORD1>F2</KEYWORD1>
-      <KEYWORD1>F20</KEYWORD1>
-      <KEYWORD1>F21</KEYWORD1>
-      <KEYWORD1>F22</KEYWORD1>
-      <KEYWORD1>F23</KEYWORD1>
-      <KEYWORD1>F24</KEYWORD1>
-      <KEYWORD1>F25</KEYWORD1>
-      <KEYWORD1>F26</KEYWORD1>
-      <KEYWORD1>F27</KEYWORD1>
-      <KEYWORD1>F28</KEYWORD1>
-      <KEYWORD1>F29</KEYWORD1>
-      <KEYWORD1>F3</KEYWORD1>
-      <KEYWORD1>F30</KEYWORD1>
-      <KEYWORD1>F31</KEYWORD1>
-      <KEYWORD1>F32</KEYWORD1>
-      <KEYWORD1>F33</KEYWORD1>
-      <KEYWORD1>F34</KEYWORD1>
-      <KEYWORD1>F35</KEYWORD1>
-      <KEYWORD1>F36</KEYWORD1>
-      <KEYWORD1>F37</KEYWORD1>
-      <KEYWORD1>F38</KEYWORD1>
-      <KEYWORD1>F39</KEYWORD1>
-      <KEYWORD1>F4</KEYWORD1>
-      <KEYWORD1>F40</KEYWORD1>
-      <KEYWORD1>F41</KEYWORD1>
-      <KEYWORD1>F42</KEYWORD1>
-      <KEYWORD1>F43</KEYWORD1>
-      <KEYWORD1>F44</KEYWORD1>
-      <KEYWORD1>F45</KEYWORD1>
-      <KEYWORD1>F46</KEYWORD1>
-      <KEYWORD1>F47</KEYWORD1>
-      <KEYWORD1>F48</KEYWORD1>
-      <KEYWORD1>F49</KEYWORD1>
-      <KEYWORD1>F5</KEYWORD1>
-      <KEYWORD1>F50</KEYWORD1>
-      <KEYWORD1>F51</KEYWORD1>
-      <KEYWORD1>F52</KEYWORD1>
-      <KEYWORD1>F53</KEYWORD1>
-      <KEYWORD1>F54</KEYWORD1>
-      <KEYWORD1>F55</KEYWORD1>
-      <KEYWORD1>F56</KEYWORD1>
-      <KEYWORD1>F57</KEYWORD1>
-      <KEYWORD1>F58</KEYWORD1>
-      <KEYWORD1>F59</KEYWORD1>
-      <KEYWORD1>F6</KEYWORD1>
-      <KEYWORD1>F60</KEYWORD1>
-      <KEYWORD1>F61</KEYWORD1>
-      <KEYWORD1>F62</KEYWORD1>
-      <KEYWORD1>F63</KEYWORD1>
-      <KEYWORD1>F64</KEYWORD1>
-      <KEYWORD1>F7</KEYWORD1>
-      <KEYWORD1>F8</KEYWORD1>
-      <KEYWORD1>F9</KEYWORD1>
-      <KEYWORD1>FALSE</KEYWORD1>
-      <KEYWORD1>FETCH</KEYWORD1>
-      <KEYWORD1>FGL_GETENV</KEYWORD1>
-      <KEYWORD1>FGL_KEYVAL</KEYWORD1>
-      <KEYWORD1>FGL_LASTKEY</KEYWORD1>
-      <KEYWORD1>FIELD</KEYWORD1>
-      <KEYWORD1>FIELD_TOUCHED</KEYWORD1>
-      <KEYWORD1>FILE</KEYWORD1>
-      <KEYWORD1>FILLFACTOR</KEYWORD1>
-      <KEYWORD1>FILTERING</KEYWORD1>
-      <KEYWORD1>FINISH</KEYWORD1>
-      <KEYWORD1>FIRST</KEYWORD1>
-      <KEYWORD1>FLOAT</KEYWORD1>
-      <KEYWORD1>FLUSH</KEYWORD1>
-      <KEYWORD1>FOR</KEYWORD1>
-      <KEYWORD1>FOREACH</KEYWORD1>
-      <KEYWORD1>FOREIGN</KEYWORD1>
-      <KEYWORD1>FORM</KEYWORD1>
-      <KEYWORD1>FORMAT</KEYWORD1>
-      <KEYWORD1>FORMONLY</KEYWORD1>
-      <KEYWORD1>FORTRAN</KEYWORD1>
-      <KEYWORD1>FOUND</KEYWORD1>
-      <KEYWORD1>FRACTION</KEYWORD1>
-      <KEYWORD1>FRAGMENT</KEYWORD1>
-      <KEYWORD1>FREE</KEYWORD1>
-      <KEYWORD1>FROM</KEYWORD1>
-      <KEYWORD1>FUNCTION</KEYWORD1>
-      <KEYWORD1>GET_FLDBUF</KEYWORD1>
-      <KEYWORD1>GLOBAL</KEYWORD1>
-      <KEYWORD1>GLOBALS</KEYWORD1>
-      <KEYWORD1>GO</KEYWORD1>
-      <KEYWORD1>GOTO</KEYWORD1>
-      <KEYWORD1>GRANT</KEYWORD1>
-      <KEYWORD1>GREEN</KEYWORD1>
-      <KEYWORD1>GROUP</KEYWORD1>
-      <KEYWORD1>HAVING</KEYWORD1>
-      <KEYWORD1>HEADER</KEYWORD1>
-      <KEYWORD1>HELP</KEYWORD1>
-      <KEYWORD1>HEX</KEYWORD1>
-      <KEYWORD1>HIDE</KEYWORD1>
-      <KEYWORD1>HIGH</KEYWORD1>
-      <KEYWORD1>HOLD</KEYWORD1>
-      <KEYWORD1>HOUR</KEYWORD1>
-      <KEYWORD1>IDATA</KEYWORD1>
-      <KEYWORD1>IF</KEYWORD1>
-      <KEYWORD1>ILENGTH</KEYWORD1>
-      <KEYWORD1>IMMEDIATE</KEYWORD1>
-      <KEYWORD1>IN</KEYWORD1>
-      <KEYWORD1>INCLUDE</KEYWORD1>
-      <KEYWORD1>INDEX</KEYWORD1>
-      <KEYWORD1>INDEXES</KEYWORD1>
-      <KEYWORD1>INDICATOR</KEYWORD1>
-      <KEYWORD1>INFIELD</KEYWORD1>
-      <KEYWORD1>INIT</KEYWORD1>
-      <KEYWORD1>INITIALIZE</KEYWORD1>
-      <KEYWORD1>INPUT</KEYWORD1>
-      <KEYWORD1>INSERT</KEYWORD1>
-      <KEYWORD1>INSTRUCTIONS</KEYWORD1>
-      <KEYWORD1>INT</KEYWORD1>
-      <KEYWORD1>INTEGER</KEYWORD1>
-      <KEYWORD1>INTERRUPT</KEYWORD1>
-      <KEYWORD1>INTERVAL</KEYWORD1>
-      <KEYWORD1>INTO</KEYWORD1>
-      <KEYWORD1>INT_FLAG</KEYWORD1>
-      <KEYWORD1>INVISIBLE</KEYWORD1>
-      <KEYWORD1>IS</KEYWORD1>
-      <KEYWORD1>ISAM</KEYWORD1>
-      <KEYWORD1>ISOLATION</KEYWORD1>
-      <KEYWORD1>ITYPE</KEYWORD1>
-      <KEYWORD1>KEY</KEYWORD1>
-      <KEYWORD1>LABEL</KEYWORD1>
-      <KEYWORD1>LANGUAGE</KEYWORD1>
-      <KEYWORD1>LAST</KEYWORD1>
-      <KEYWORD1>LEADING</KEYWORD1>
-      <KEYWORD1>LEFT</KEYWORD1>
-      <KEYWORD1>LENGTH</KEYWORD1>
-      <KEYWORD1>LET</KEYWORD1>
-      <KEYWORD1>LIKE</KEYWORD1>
-      <KEYWORD1>LINE</KEYWORD1>
-      <KEYWORD1>LINENO</KEYWORD1>
-      <KEYWORD1>LINES</KEYWORD1>
-      <KEYWORD1>LOAD</KEYWORD1>
-      <KEYWORD1>LOCATE</KEYWORD1>
-      <KEYWORD1>LOCK</KEYWORD1>
-      <KEYWORD1>LOG</KEYWORD1>
-      <KEYWORD1>LOG10</KEYWORD1>
-      <KEYWORD1>LOGN</KEYWORD1>
-      <KEYWORD1>LONG</KEYWORD1>
-      <KEYWORD1>LOW</KEYWORD1>
-      <KEYWORD1>MAGENTA</KEYWORD1>
-      <KEYWORD1>MAIN</KEYWORD1>
-      <KEYWORD1>MARGIN</KEYWORD1>
-      <KEYWORD1>MATCHES</KEYWORD1>
-      <KEYWORD1>MAX</KEYWORD1>
-      <KEYWORD1>MDY</KEYWORD1>
-      <KEYWORD1>MEDIUM</KEYWORD1>
-      <KEYWORD1>MEMORY</KEYWORD1>
-      <KEYWORD1>MENU</KEYWORD1>
-      <KEYWORD1>MESSAGE</KEYWORD1>
-      <KEYWORD1>MESSAGE_LENGTH</KEYWORD1>
-      <KEYWORD1>MESSAGE_TEXT</KEYWORD1>
-      <KEYWORD1>MIN</KEYWORD1>
-      <KEYWORD1>MINUTE</KEYWORD1>
-      <KEYWORD1>MOD</KEYWORD1>
-      <KEYWORD1>MODE</KEYWORD1>
-      <KEYWORD1>MODIFY</KEYWORD1>
-      <KEYWORD1>MODULE</KEYWORD1>
-      <KEYWORD1>MONEY</KEYWORD1>
-      <KEYWORD1>MONTH</KEYWORD1>
-      <KEYWORD1>MORE</KEYWORD1>
-      <KEYWORD1>NAME</KEYWORD1>
-      <KEYWORD1>NCHAR</KEYWORD1>
-      <KEYWORD1>NEED</KEYWORD1>
-      <KEYWORD1>NEW</KEYWORD1>
-      <KEYWORD1>NEXT</KEYWORD1>
-      <KEYWORD1>NEXTPAGE</KEYWORD1>
-      <KEYWORD1>NO</KEYWORD1>
-      <KEYWORD1>NOCR</KEYWORD1>
-      <KEYWORD1>NOENTRY</KEYWORD1>
-      <KEYWORD1>NONE</KEYWORD1>
-      <KEYWORD1>NORMAL</KEYWORD1>
-      <KEYWORD1>NOT</KEYWORD1>
-      <KEYWORD1>NOTFOUND</KEYWORD1>
-      <KEYWORD1>NULL</KEYWORD1>
-      <KEYWORD1>NULLABLE</KEYWORD1>
-      <KEYWORD1>NUMBER</KEYWORD1>
-      <KEYWORD1>NUMERIC</KEYWORD1>
-      <KEYWORD1>NUM_ARGS</KEYWORD1>
-      <KEYWORD1>NVARCHAR</KEYWORD1>
-      <KEYWORD1>OCTET_LENGTH</KEYWORD1>
-      <KEYWORD1>OF</KEYWORD1>
-      <KEYWORD1>OFF</KEYWORD1>
-      <KEYWORD1>OLD</KEYWORD1>
-      <KEYWORD1>ON</KEYWORD1>
-      <KEYWORD1>ONLY</KEYWORD1>
-      <KEYWORD1>OPEN</KEYWORD1>
-      <KEYWORD1>OPTIMIZATION</KEYWORD1>
-      <KEYWORD1>OPTION</KEYWORD1>
-      <KEYWORD1>OPTIONS</KEYWORD1>
-      <KEYWORD1>OR</KEYWORD1>
-      <KEYWORD1>ORDER</KEYWORD1>
-      <KEYWORD1>OTHERWISE</KEYWORD1>
-      <KEYWORD1>OUTER</KEYWORD1>
-      <KEYWORD1>OUTPUT</KEYWORD1>
-      <KEYWORD1>PAGE</KEYWORD1>
-      <KEYWORD1>PAGENO</KEYWORD1>
-      <KEYWORD1>PASCAL</KEYWORD1>
-      <KEYWORD1>PAUSE</KEYWORD1>
-      <KEYWORD1>PDQPRIORITY</KEYWORD1>
-      <KEYWORD1>PERCENT</KEYWORD1>
-      <KEYWORD1>PICTURE</KEYWORD1>
-      <KEYWORD1>PIPE</KEYWORD1>
-      <KEYWORD1>PLI</KEYWORD1>
-      <KEYWORD1>POW</KEYWORD1>
-      <KEYWORD1>PRECISION</KEYWORD1>
-      <KEYWORD1>PREPARE</KEYWORD1>
-      <KEYWORD1>PREVIOUS</KEYWORD1>
-      <KEYWORD1>PREVPAGE</KEYWORD1>
-      <KEYWORD1>PRIMARY</KEYWORD1>
-      <KEYWORD1>PRINT</KEYWORD1>
-      <KEYWORD1>PRINTER</KEYWORD1>
-      <KEYWORD1>PRIOR</KEYWORD1>
-      <KEYWORD1>PRIVATE</KEYWORD1>
-      <KEYWORD1>PRIVILEGES</KEYWORD1>
-      <KEYWORD1>PROCEDURE</KEYWORD1>
-      <KEYWORD1>PROGRAM</KEYWORD1>
-      <KEYWORD1>PROMPT</KEYWORD1>
-      <KEYWORD1>PUBLIC</KEYWORD1>
-      <KEYWORD1>PUT</KEYWORD1>
-      <KEYWORD1>QUIT</KEYWORD1>
-      <KEYWORD1>QUIT_FLAG</KEYWORD1>
-      <KEYWORD1>RAISE</KEYWORD1>
-      <KEYWORD1>RANGE</KEYWORD1>
-      <KEYWORD1>READ</KEYWORD1>
-      <KEYWORD1>READONLY</KEYWORD1>
-      <KEYWORD1>REAL</KEYWORD1>
-      <KEYWORD1>RECORD</KEYWORD1>
-      <KEYWORD1>RECOVER</KEYWORD1>
-      <KEYWORD1>RED</KEYWORD1>
-      <KEYWORD1>REFERENCES</KEYWORD1>
-      <KEYWORD1>REFERENCING</KEYWORD1>
-      <KEYWORD1>REGISTER</KEYWORD1>
-      <KEYWORD1>RELATIVE</KEYWORD1>
-      <KEYWORD1>REMAINDER</KEYWORD1>
-      <KEYWORD1>REMOVE</KEYWORD1>
-      <KEYWORD1>RENAME</KEYWORD1>
-      <KEYWORD1>REOPTIMIZATION</KEYWORD1>
-      <KEYWORD1>REPEATABLE</KEYWORD1>
-      <KEYWORD1>REPORT</KEYWORD1>
-      <KEYWORD1>REQUIRED</KEYWORD1>
-      <KEYWORD1>RESOLUTION</KEYWORD1>
-      <KEYWORD1>RESOURCE</KEYWORD1>
-      <KEYWORD1>RESTRICT</KEYWORD1>
-      <KEYWORD1>RESUME</KEYWORD1>
-      <KEYWORD1>RETURN</KEYWORD1>
-      <KEYWORD1>RETURNED_SQLSTATE</KEYWORD1>
-      <KEYWORD1>RETURNING</KEYWORD1>
-      <KEYWORD1>REVERSE</KEYWORD1>
-      <KEYWORD1>REVOKE</KEYWORD1>
-      <KEYWORD1>RIGHT</KEYWORD1>
-      <KEYWORD1>ROBIN</KEYWORD1>
-      <KEYWORD1>ROLE</KEYWORD1>
-      <KEYWORD1>ROLLBACK</KEYWORD1>
-      <KEYWORD1>ROLLFORWARD</KEYWORD1>
-      <KEYWORD1>ROOT</KEYWORD1>
-      <KEYWORD1>ROUND</KEYWORD1>
-      <KEYWORD1>ROW</KEYWORD1>
-      <KEYWORD1>ROWID</KEYWORD1>
-      <KEYWORD1>ROWIDS</KEYWORD1>
-      <KEYWORD1>ROWS</KEYWORD1>
-      <KEYWORD1>ROW_COUNT</KEYWORD1>
-      <KEYWORD1>RUN</KEYWORD1>
-      <KEYWORD1>SCALE</KEYWORD1>
-      <KEYWORD1>SCHEMA</KEYWORD1>
-      <KEYWORD1>SCREEN</KEYWORD1>
-      <KEYWORD1>SCROLL</KEYWORD1>
-      <KEYWORD1>SCR_LINE</KEYWORD1>
-      <KEYWORD1>SECOND</KEYWORD1>
-      <KEYWORD1>SECTION</KEYWORD1>
-      <KEYWORD1>SELECT</KEYWORD1>
-      <KEYWORD1>SERIAL</KEYWORD1>
-      <KEYWORD1>SERIALIZABLE</KEYWORD1>
-      <KEYWORD1>SERVER_NAME</KEYWORD1>
-      <KEYWORD1>SESSION</KEYWORD1>
-      <KEYWORD1>SET</KEYWORD1>
-      <KEYWORD1>SET_COUNT</KEYWORD1>
-      <KEYWORD1>SHARE</KEYWORD1>
-      <KEYWORD1>SHORT</KEYWORD1>
-      <KEYWORD1>SHOW</KEYWORD1>
-      <KEYWORD1>SITENAME</KEYWORD1>
-      <KEYWORD1>SIZE</KEYWORD1>
-      <KEYWORD1>SIZEOF</KEYWORD1>
-      <KEYWORD1>SKIP</KEYWORD1>
-      <KEYWORD1>SLEEP</KEYWORD1>
-      <KEYWORD1>SMALLFLOAT</KEYWORD1>
-      <KEYWORD1>SMALLINT</KEYWORD1>
-      <KEYWORD1>SOME</KEYWORD1>
-      <KEYWORD1>SPACE</KEYWORD1>
-      <KEYWORD1>SPACES</KEYWORD1>
-      <KEYWORD1>SQL</KEYWORD1>
-      <KEYWORD1>SQLAWARN</KEYWORD1>
-      <KEYWORD1>SQLCA</KEYWORD1>
-      <KEYWORD1>SQLCODE</KEYWORD1>
-      <KEYWORD1>SQLERRD</KEYWORD1>
-      <KEYWORD1>SQLERRM</KEYWORD1>
-      <KEYWORD1>SQLERROR</KEYWORD1>
-      <KEYWORD1>SQLERRP</KEYWORD1>
-      <KEYWORD1>SQLSTATE</KEYWORD1>
-      <KEYWORD1>SQLWARNING</KEYWORD1>
-      <KEYWORD1>SQRT</KEYWORD1>
-      <KEYWORD1>STABILITY</KEYWORD1>
-      <KEYWORD1>START</KEYWORD1>
-      <KEYWORD1>STARTLOG</KEYWORD1>
-      <KEYWORD1>STATIC</KEYWORD1>
-      <KEYWORD1>STATISTICS</KEYWORD1>
-      <KEYWORD1>STATUS</KEYWORD1>
-      <KEYWORD1>STDEV</KEYWORD1>
-      <KEYWORD1>STEP</KEYWORD1>
-      <KEYWORD1>STOP</KEYWORD1>
-      <KEYWORD1>STRING</KEYWORD1>
-      <KEYWORD1>STRUCT</KEYWORD1>
-      <KEYWORD1>SUBCLASS_ORIGIN</KEYWORD1>
-      <KEYWORD1>SUM</KEYWORD1>
-      <KEYWORD1>SWITCH</KEYWORD1>
-      <KEYWORD1>SYNONYM</KEYWORD1>
-      <KEYWORD1>SYSTEM</KEYWORD1>
-      <KEYWORD1>SysBlobs</KEYWORD1>
-      <KEYWORD1>SysChecks</KEYWORD1>
-      <KEYWORD1>SysColAuth</KEYWORD1>
-      <KEYWORD1>SysColDepend</KEYWORD1>
-      <KEYWORD1>SysColumns</KEYWORD1>
-      <KEYWORD1>SysConstraints</KEYWORD1>
-      <KEYWORD1>SysDefaults</KEYWORD1>
-      <KEYWORD1>SysDepend</KEYWORD1>
-      <KEYWORD1>SysDistrib</KEYWORD1>
-      <KEYWORD1>SysFragAuth</KEYWORD1>
-      <KEYWORD1>SysFragments</KEYWORD1>
-      <KEYWORD1>SysIndexes</KEYWORD1>
-      <KEYWORD1>SysObjState</KEYWORD1>
-      <KEYWORD1>SysOpClstr</KEYWORD1>
-      <KEYWORD1>SysProcAuth</KEYWORD1>
-      <KEYWORD1>SysProcBody</KEYWORD1>
-      <KEYWORD1>SysProcPlan</KEYWORD1>
-      <KEYWORD1>SysProcedures</KEYWORD1>
-      <KEYWORD1>SysReferences</KEYWORD1>
-      <KEYWORD1>SysRoleAuth</KEYWORD1>
-      <KEYWORD1>SysSynTable</KEYWORD1>
-      <KEYWORD1>SysSynonyms</KEYWORD1>
-      <KEYWORD1>SysTabAuth</KEYWORD1>
-      <KEYWORD1>SysTables</KEYWORD1>
-      <KEYWORD1>SysTrigBody</KEYWORD1>
-      <KEYWORD1>SysTriggers</KEYWORD1>
-      <KEYWORD1>SysUsers</KEYWORD1>
-      <KEYWORD1>SysViews</KEYWORD1>
-      <KEYWORD1>SysViolations</KEYWORD1>
-      <KEYWORD1>TAB</KEYWORD1>
-      <KEYWORD1>TABLE</KEYWORD1>
-      <KEYWORD1>TABLES</KEYWORD1>
-      <KEYWORD1>TAN</KEYWORD1>
-      <KEYWORD1>TEMP</KEYWORD1>
-      <KEYWORD1>TEXT</KEYWORD1>
-      <KEYWORD1>THEN</KEYWORD1>
-      <KEYWORD1>THROUGH</KEYWORD1>
-      <KEYWORD1>THRU</KEYWORD1>
-      <KEYWORD1>TIME</KEYWORD1>
-      <KEYWORD1>TO</KEYWORD1>
-      <KEYWORD1>TODAY</KEYWORD1>
-      <KEYWORD1>TOP</KEYWORD1>
-      <KEYWORD1>TOTAL</KEYWORD1>
-      <KEYWORD1>TRACE</KEYWORD1>
-      <KEYWORD1>TRAILER</KEYWORD1>
-      <KEYWORD1>TRAILING</KEYWORD1>
-      <KEYWORD1>TRANSACTION</KEYWORD1>
-      <KEYWORD1>TRIGGER</KEYWORD1>
-      <KEYWORD1>TRIGGERS</KEYWORD1>
-      <KEYWORD1>TRIM</KEYWORD1>
-      <KEYWORD1>TRUE</KEYWORD1>
-      <KEYWORD1>TRUNC</KEYWORD1>
-      <KEYWORD1>TYPE</KEYWORD1>
-      <KEYWORD1>TYPEDEF</KEYWORD1>
-      <KEYWORD1>UNCOMMITTED</KEYWORD1>
-      <KEYWORD1>UNCONSTRAINED</KEYWORD1>
-      <KEYWORD1>UNDERLINE</KEYWORD1>
-      <KEYWORD1>UNION</KEYWORD1>
-      <KEYWORD1>UNIQUE</KEYWORD1>
-      <KEYWORD1>UNITS</KEYWORD1>
-      <KEYWORD1>UNLOAD</KEYWORD1>
-      <KEYWORD1>UNLOCK</KEYWORD1>
-      <KEYWORD1>UNSIGNED</KEYWORD1>
-      <KEYWORD1>UP</KEYWORD1>
-      <KEYWORD1>UPDATE</KEYWORD1>
-      <KEYWORD1>UPSHIFT</KEYWORD1>
-      <KEYWORD1>USER</KEYWORD1>
-      <KEYWORD1>USING</KEYWORD1>
-      <KEYWORD1>VALIDATE</KEYWORD1>
-      <KEYWORD1>VALUE</KEYWORD1>
-      <KEYWORD1>VALUES</KEYWORD1>
-      <KEYWORD1>VARCHAR</KEYWORD1>
-      <KEYWORD1>VARIABLES</KEYWORD1>
-      <KEYWORD1>VARIANCE</KEYWORD1>
-      <KEYWORD1>VARYING</KEYWORD1>
-      <KEYWORD1>VERIFY</KEYWORD1>
-      <KEYWORD1>VIEW</KEYWORD1>
-      <KEYWORD1>VIOLATIONS</KEYWORD1>
-      <KEYWORD1>WAIT</KEYWORD1>
-      <KEYWORD1>WAITING</KEYWORD1>
-      <KEYWORD1>WARNING</KEYWORD1>
-      <KEYWORD1>WEEKDAY</KEYWORD1>
-      <KEYWORD1>WHEN</KEYWORD1>
-      <KEYWORD1>WHENEVER</KEYWORD1>
-      <KEYWORD1>WHERE</KEYWORD1>
-      <KEYWORD1>WHILE</KEYWORD1>
-      <KEYWORD1>WHITE</KEYWORD1>
-      <KEYWORD1>WINDOW</KEYWORD1>
-      <KEYWORD1>WITH</KEYWORD1>
-      <KEYWORD1>WITHOUT</KEYWORD1>
-      <KEYWORD1>WORDWRAP</KEYWORD1>
-      <KEYWORD1>WORK</KEYWORD1>
-      <KEYWORD1>WRAP</KEYWORD1>
-      <KEYWORD1>WRITE</KEYWORD1>
-      <KEYWORD1>YEAR</KEYWORD1>
-      <KEYWORD1>YELLOW</KEYWORD1>
-      <KEYWORD1>ZEROFILL</KEYWORD1>
-
-
-      <!-- special, keywords/literals -->
-      <LITERAL2>FALSE</LITERAL2>
-      <LITERAL2>NULL</LITERAL2>
-      <LITERAL2>TRUE</LITERAL2>
-
-
-      </KEYWORDS>
-   </RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/ical.xml b/qpython/src/main/assets/syntax/ical.xml
deleted file mode 100644
index 5d6284f2..00000000
--- a/qpython/src/main/assets/syntax/ical.xml
+++ /dev/null
@@ -1,204 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!-- iCalendar mode by Victor Engmark <victor.engmark@gmail.com> -->
-
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="lineComment" VALUE="COMMENT"/>
-
-		<PROPERTY NAME="wordBreakChars" VALUE=",;:=+/?^*&amp;"/>
-
-		<!-- Indentation -->
-		<PROPERTY NAME="maxLineLen" VALUE="75"/>
-		<PROPERTY NAME="wrap" VALUE="hard"/>
-		<PROPERTY NAME="indentSize" VALUE="1"/>
-
-		<!-- Use single space instead of tabs -->
-		<PROPERTY NAME="noTabs" VALUE="1"/>
-		<PROPERTY NAME="tabSize" VALUE="1"/>
-	</PROPS>
-	
-	<!-- General rules -->
-	<RULES IGNORE_CASE="FALSE">
-		<SPAN AT_LINE_START="TRUE" DELEGATE="VCALENDAR" NO_LINE_BREAK="FALSE" MATCH_TYPE="KEYWORD1">
-			<BEGIN>BEGIN:VCALENDAR</BEGIN>
-			<END>END:VCALENDAR</END>
-		</SPAN>
-	</RULES>
-
-	<!-- Entire calendar -->
-	<RULES SET="VCALENDAR" IGNORE_CASE="FALSE">
-		<!-- Time zone settings -->
-		<SPAN AT_LINE_START="TRUE" DELEGATE="VTIMEZONE" NO_LINE_BREAK="FALSE" MATCH_TYPE="KEYWORD1">
-			<BEGIN>BEGIN:VTIMEZONE</BEGIN>
-			<END>END:VTIMEZONE</END>
-		</SPAN>
-
-		<!-- Event -->
-		<SPAN AT_LINE_START="TRUE" DELEGATE="VEVENT" NO_LINE_BREAK="FALSE" MATCH_TYPE="KEYWORD1">
-			<BEGIN>BEGIN:VEVENT</BEGIN>
-			<END>END:VEVENT</END>
-		</SPAN>
-
-		<!-- TODO (treated like event for now) -->
-		<SPAN AT_LINE_START="TRUE" DELEGATE="VEVENT" NO_LINE_BREAK="FALSE" MATCH_TYPE="KEYWORD1">
-			<BEGIN>BEGIN:VTODO</BEGIN>
-			<END>END:VTODO</END>
-		</SPAN>
-
-		<!-- Journal (treated like event for now) -->
-		<SPAN AT_LINE_START="TRUE" DELEGATE="VEVENT" NO_LINE_BREAK="FALSE" MATCH_TYPE="KEYWORD1">
-			<BEGIN>BEGIN:VJOURNAL</BEGIN>
-			<END>END:VJOURNAL</END>
-		</SPAN>
-
-		<KEYWORDS>
-			<KEYWORD2>CALSCALE</KEYWORD2>
-			<LITERAL2>GREGORIAN</LITERAL2>
-			<KEYWORD2>METHOD</KEYWORD2>
-			<KEYWORD2>PRODID</KEYWORD2>
-			<KEYWORD2>VERSION</KEYWORD2>
-			<LITERAL2>2.0</LITERAL2>
-		</KEYWORDS>
-	</RULES>
-
-	<!-- Time zone settings -->
-	<RULES SET="VTIMEZONE" IGNORE_CASE="FALSE">
-		<!-- Daylight savings settings -->
-		<SPAN AT_LINE_START="TRUE" DELEGATE="DAYLIGHT" NO_LINE_BREAK="FALSE" MATCH_TYPE="KEYWORD1">
-			<BEGIN>BEGIN:DAYLIGHT</BEGIN>
-			<END>END:DAYLIGHT</END>
-		</SPAN>
-
-		<!-- Time zone standard settings -->
-		<SPAN AT_LINE_START="TRUE" DELEGATE="STANDARD" NO_LINE_BREAK="FALSE" MATCH_TYPE="KEYWORD1">
-			<BEGIN>BEGIN:STANDARD</BEGIN>
-			<END>END:STANDARD</END>
-		</SPAN>
-
-		<IMPORT DELEGATE="CUSTOM_KEYWORDS"/>
-
-		<KEYWORDS>
-			<KEYWORD2>TZID</KEYWORD2>
-		</KEYWORDS>
-	</RULES>
-
-	<!-- Daylight savings settings -->
-	<RULES SET="DAYLIGHT" IGNORE_CASE="FALSE">
-		<IMPORT DELEGATE="VCALENDAR_KEYWORDS"/>
-		<IMPORT DELEGATE="VTIMEZONE_KEYWORDS"/>
-	</RULES>
-
-	<!-- Time zone standard settings -->
-	<RULES SET="STANDARD" IGNORE_CASE="FALSE">
-		<IMPORT DELEGATE="VCALENDAR_KEYWORDS"/>
-		<IMPORT DELEGATE="VTIMEZONE_KEYWORDS"/>
-	</RULES>
-	
-	<!-- Event -->
-	<RULES SET="VEVENT" IGNORE_CASE="FALSE">
-		<!-- Alarm -->
-		<SPAN AT_LINE_START="TRUE" DELEGATE="VALARM" NO_LINE_BREAK="FALSE" MATCH_TYPE="KEYWORD1">
-			<BEGIN>BEGIN:VALARM</BEGIN>
-			<END>END:VALARM</END>
-		</SPAN>
-
-		<IMPORT DELEGATE="VCALENDAR_KEYWORDS"/>
-		<IMPORT DELEGATE="CUSTOM_KEYWORDS"/>
-		<IMPORT DELEGATE="VEVENT_KEYWORDS"/>
-
-		<KEYWORDS>
-			<KEYWORD2>ATTENDEE</KEYWORD2>
-			<KEYWORD2>CATEGORIES</KEYWORD2>
-			<KEYWORD2>CLASS</KEYWORD2>
-			<LITERAL2>CONFIDENTIAL</LITERAL2>
-			<LITERAL2>PRIVATE</LITERAL2>
-			<LITERAL2>PUBLIC</LITERAL2>
-			<KEYWORD2>COMPLETED</KEYWORD2>
-			<KEYWORD2>CREATED</KEYWORD2>
-			<KEYWORD2>DESCRIPTION</KEYWORD2>
-			<KEYWORD2>DTEND</KEYWORD2>
-			<KEYWORD2>DTSTAMP</KEYWORD2>
-			<KEYWORD2>DTSTART</KEYWORD2>
-			<KEYWORD2>DUE</KEYWORD2>
-			<KEYWORD2>LAST-MODIFIED</KEYWORD2>
-			<KEYWORD2>LOCATION</KEYWORD2>
-			<KEYWORD2>PERCENT-COMPLETE</KEYWORD2>
-			<KEYWORD2>PRIORITY</KEYWORD2>
-			<KEYWORD2>RECURRENCE-ID</KEYWORD2>
-			<KEYWORD3>RSVP</KEYWORD3>
-			<LITERAL3>FALSE</LITERAL3>
-			<LITERAL3>TRUE</LITERAL3>
-			<KEYWORD2>SEQUENCE</KEYWORD2>
-			<KEYWORD2>STATUS</KEYWORD2>
-			<KEYWORD2>SUMMARY</KEYWORD2>
-			<KEYWORD2>TRANSP</KEYWORD2>
-			<LITERAL2>OPAQUE</LITERAL2>
-			<LITERAL2>TRANSPARENT</LITERAL2>
-			<KEYWORD2>UID</KEYWORD2>
-			<KEYWORD2>URL</KEYWORD2>
-			<KEYWORD3>TZID</KEYWORD3>
-		</KEYWORDS>
-	</RULES>
-
-	<!-- Alarm -->
-	<RULES SET="VALARM" IGNORE_CASE="FALSE">
-		<IMPORT DELEGATE="RIGHT"/>
-		<IMPORT DELEGATE="CUSTOM_KEYWORDS"/>
-		<IMPORT DELEGATE="VEVENT_KEYWORDS"/>
-
-		<KEYWORDS>
-			<KEYWORD2>ACTION</KEYWORD2>
-			<KEYWORD2>DESCRIPTION</KEYWORD2>
-			<KEYWORD2>TRIGGER</KEYWORD2>
-		</KEYWORDS>
-	</RULES>
-
-	<!-- Colon + right side text -->
-	<RULES SET="RIGHT" IGNORE_CASE="FALSE">
-		<EOL_SPAN AT_LINE_START="FALSE" MATCH_TYPE="OPERATOR" DELEGATE="RIGHT_TEXT">:</EOL_SPAN>
-	</RULES>
-
-	<!-- Right side of the colon -->
-	<RULES SET="RIGHT_TEXT" IGNORE_CASE="FALSE" DEFAULT="LITERAL4">
-	</RULES>
-
-	<RULES SET="VCALENDAR_KEYWORDS" IGNORE_CASE="FALSE">
-		<KEYWORDS>
-			<KEYWORD2>RRULE</KEYWORD2>
-			<KEYWORD4>BYDAY</KEYWORD4>
-			<KEYWORD4>BYMONTH</KEYWORD4>
-			<KEYWORD4>FREQ</KEYWORD4>
-			<KEYWORD4>INTERVAL</KEYWORD4>
-			<LITERAL4>YEARLY</LITERAL4>
-		</KEYWORDS>
-	</RULES>
-
-	<RULES SET="VTIMEZONE_KEYWORDS" IGNORE_CASE="FALSE">
-		<KEYWORDS>
-			<KEYWORD2>DTSTART</KEYWORD2>
-			<KEYWORD2>TZNAME</KEYWORD2>
-			<KEYWORD2>TZOFFSETFROM</KEYWORD2>
-			<KEYWORD2>TZOFFSETTO</KEYWORD2>
-		</KEYWORDS>
-	</RULES>
-
-	<RULES SET="VEVENT_KEYWORDS" IGNORE_CASE="FALSE">
-		<KEYWORDS>
-			<LITERAL2>CONFIRMED</LITERAL2>
-			<LITERAL2>PRIVATE</LITERAL2>
-			<KEYWORD3>VALUE</KEYWORD3>
-			<LITERAL3>DATE</LITERAL3>
-			<LITERAL3>DURATION</LITERAL3>
-		</KEYWORDS>
-	</RULES>
-
-	<!-- Custom keywords -->
-	<RULES SET="CUSTOM_KEYWORDS" IGNORE_CASE="FALSE">
-		<SEQ_REGEXP HASH_CHAR="X" AT_LINE_START="TRUE" TYPE="INVALID">X-[A-Za-z-]+</SEQ_REGEXP>
-	</RULES>
-</MODE>
-
- 	  	 
diff --git a/qpython/src/main/assets/syntax/icon.xml b/qpython/src/main/assets/syntax/icon.xml
deleted file mode 100644
index 078f58e9..00000000
--- a/qpython/src/main/assets/syntax/icon.xml
+++ /dev/null
@@ -1,199 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!-- Icon mode by Silas Smith (smiths@cs.arizona.edu) -->
-<!-- Updated 08/07/2003 -->
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="lineComment" VALUE="#" />
-		<PROPERTY NAME="indentOpenBrackets" VALUE="{" />
-		<PROPERTY NAME="indentCloseBrackets" VALUE="}" />
-		<PROPERTY NAME="wordBreakChars" VALUE="|.\\:,+-*/=?^!@%&lt;&gt;&amp;" />
-		<PROPERTY NAME="contextInsensitive" VALUE="true" />
-	</PROPS>
-	<RULES IGNORE_CASE="FALSE"
-	    HIGHLIGHT_DIGITS="TRUE"
-	    DIGIT_RE="(0x[\p{XDigit}]+[lL]?|[\p{Digit}]+(e[\p{Digit}]*)?[lLdDfF]?)">
-		<!-- comments -->
-		<EOL_SPAN TYPE="COMMENT1">#</EOL_SPAN>
-
-		<!-- string literals -->
-		<SPAN TYPE="LITERAL1" ESCAPE="\" NO_LINE_BREAK="TRUE">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-
-		<!-- cset literals -->
-		<SPAN TYPE="LITERAL2" ESCAPE="\" NO_LINE_BREAK="TRUE">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-
-		<SEQ TYPE="OPERATOR">~===</SEQ>
-		<SEQ TYPE="OPERATOR">===</SEQ>
-		<SEQ TYPE="OPERATOR">|||</SEQ> <!-- list concatenation -->
-
-		<!-- lexical operators -->
-		<SEQ TYPE="OPERATOR">&gt;&gt;=</SEQ> <!-- ">>=" -->
-		<SEQ TYPE="OPERATOR">&gt;&gt;</SEQ> <!-- ">>" -->
-		<SEQ TYPE="OPERATOR">&lt;&lt;=</SEQ> <!-- "<<=" -->
-		<SEQ TYPE="OPERATOR">&lt;&lt;</SEQ> <!-- "<<" -->
-		<SEQ TYPE="OPERATOR">~==</SEQ>
-		<SEQ TYPE="OPERATOR">==</SEQ>
-		<SEQ TYPE="OPERATOR">||</SEQ>
-
-		<!-- set operators -->
-		<SEQ TYPE="OPERATOR">++</SEQ> <!-- union -->
-		<SEQ TYPE="OPERATOR">**</SEQ> <!-- intersection -->
-		<SEQ TYPE="OPERATOR">--</SEQ> <!-- difference -->
-
-		<SEQ TYPE="OPERATOR">&lt;-&gt;</SEQ> <!-- "<->" -->
-		<SEQ TYPE="OPERATOR">&lt;-</SEQ> <!-- "<-" -->
-		<SEQ TYPE="OPERATOR">op:=</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;=</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;=</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">~=</SEQ>
-		<SEQ TYPE="OPERATOR">:=:</SEQ>
-		<SEQ TYPE="OPERATOR">:=</SEQ>
-		<SEQ TYPE="OPERATOR">-:</SEQ>
-		<SEQ TYPE="OPERATOR">+:</SEQ>
-
-		<SEQ TYPE="OPERATOR">~</SEQ>
-		<SEQ TYPE="OPERATOR">:</SEQ>
-		<SEQ TYPE="OPERATOR">!</SEQ>
-		<SEQ TYPE="OPERATOR">|</SEQ>
-		<SEQ TYPE="OPERATOR">&amp;</SEQ>
-		<SEQ TYPE="OPERATOR">not</SEQ>
-		<SEQ TYPE="OPERATOR">*</SEQ>
-		<SEQ TYPE="OPERATOR">?</SEQ>
-		<SEQ TYPE="OPERATOR">@</SEQ>
-
-		<!-- numerical operators -->
-				<!-- NOTE: '*' defined above -->
-		<SEQ TYPE="OPERATOR">^</SEQ>
-		<SEQ TYPE="OPERATOR">%</SEQ>
-		<SEQ TYPE="OPERATOR">-</SEQ>
-		<SEQ TYPE="OPERATOR">+</SEQ>
-		<SEQ TYPE="OPERATOR">=</SEQ>
-		<SEQ TYPE="OPERATOR">/</SEQ>
-
-		<!-- Function calls -->
-		<MARK_PREVIOUS TYPE="FUNCTION" MATCH_TYPE="OPERATOR">(</MARK_PREVIOUS>
-		<SEQ TYPE="OPERATOR">)</SEQ>
-
-		<KEYWORDS>
-			<KEYWORD1>by</KEYWORD1>
-			<KEYWORD1>case</KEYWORD1>
-			<KEYWORD1>create</KEYWORD1>
-			<KEYWORD1>default</KEYWORD1>
-			<KEYWORD1>do</KEYWORD1>
-			<KEYWORD1>else</KEYWORD1>
-			<KEYWORD1>every</KEYWORD1>
-			<KEYWORD1>if</KEYWORD1>
-			<KEYWORD1>initial</KEYWORD1>
-			<KEYWORD1>next</KEYWORD1>
-			<KEYWORD1>of</KEYWORD1>
-			<KEYWORD1>repeat</KEYWORD1>
-			<KEYWORD1>then</KEYWORD1>
-			<KEYWORD1>to</KEYWORD1>
-			<KEYWORD1>until</KEYWORD1>
-			<KEYWORD1>while</KEYWORD1>
-
-			<KEYWORD2>break</KEYWORD2>
-			<KEYWORD2>end</KEYWORD2>
-			<KEYWORD2>fail</KEYWORD2>
-			<KEYWORD2>global</KEYWORD2>
-			<KEYWORD2>invocable</KEYWORD2>
-			<KEYWORD2>link</KEYWORD2>
-			<KEYWORD2>local</KEYWORD2>
-			<KEYWORD2>procedure</KEYWORD2>
-			<KEYWORD2>record</KEYWORD2>
-			<KEYWORD2>return</KEYWORD2>
-			<KEYWORD2>static</KEYWORD2>
-			<KEYWORD2>suspend</KEYWORD2>
-
-			<KEYWORD3>&amp;allocated</KEYWORD3>
-			<KEYWORD3>&amp;ascii</KEYWORD3>
-			<KEYWORD3>&amp;clock</KEYWORD3>
-			<KEYWORD3>&amp;collections</KEYWORD3>
-			<KEYWORD3>&amp;cset</KEYWORD3>
-			<KEYWORD3>&amp;current</KEYWORD3>
-			<KEYWORD3>&amp;date</KEYWORD3>
-			<KEYWORD3>&amp;dateline</KEYWORD3>
-			<KEYWORD3>&amp;digits</KEYWORD3>
-			<KEYWORD3>&amp;dump</KEYWORD3>
-			<KEYWORD3>&amp;e</KEYWORD3>
-			<KEYWORD3>&amp;error</KEYWORD3>
-			<KEYWORD3>&amp;errornumber</KEYWORD3>
-			<KEYWORD3>&amp;errortext</KEYWORD3>
-			<KEYWORD3>&amp;errorvalue</KEYWORD3>
-			<KEYWORD3>&amp;errout</KEYWORD3>
-			<KEYWORD3>&amp;fail</KEYWORD3>
-			<KEYWORD3>&amp;features</KEYWORD3>
-			<KEYWORD3>&amp;file</KEYWORD3>
-			<KEYWORD3>&amp;host</KEYWORD3>
-			<KEYWORD3>&amp;input</KEYWORD3>
-			<KEYWORD3>&amp;lcase</KEYWORD3>
-			<KEYWORD3>&amp;letters</KEYWORD3>
-			<KEYWORD3>&amp;level</KEYWORD3>
-			<KEYWORD3>&amp;line</KEYWORD3>
-			<KEYWORD3>&amp;main</KEYWORD3>
-			<KEYWORD3>&amp;null</KEYWORD3>
-			<KEYWORD3>&amp;output</KEYWORD3>
-			<KEYWORD3>&amp;phi</KEYWORD3>
-			<KEYWORD3>&amp;pi</KEYWORD3>
-			<KEYWORD3>&amp;pos</KEYWORD3>
-			<KEYWORD3>&amp;progname</KEYWORD3>
-			<KEYWORD3>&amp;random</KEYWORD3>
-			<KEYWORD3>&amp;regions</KEYWORD3>
-			<KEYWORD3>&amp;source</KEYWORD3>
-			<KEYWORD3>&amp;storage</KEYWORD3>
-			<KEYWORD3>&amp;subject</KEYWORD3>
-			<KEYWORD3>&amp;time</KEYWORD3>
-			<KEYWORD3>&amp;trace</KEYWORD3>
-			<KEYWORD3>&amp;ucase</KEYWORD3>
-			<KEYWORD3>&amp;version</KEYWORD3>
-
-			<!-- preprocessor directives -->
-			<KEYWORD3>$define</KEYWORD3>
-			<KEYWORD3>$else</KEYWORD3>
-			<KEYWORD3>$endif</KEYWORD3>
-			<KEYWORD3>$error</KEYWORD3>
-			<KEYWORD3>$ifdef</KEYWORD3>
-			<KEYWORD3>$ifndef</KEYWORD3>
-			<KEYWORD3>$include</KEYWORD3>
-			<KEYWORD3>$line</KEYWORD3>
-			<KEYWORD3>$undef</KEYWORD3>
-
-			<!-- predefined prepocessor symbols -->
-			<KEYWORD3>_MACINTOSH</KEYWORD3>
-			<KEYWORD3>_MS_WINDOWS_NT</KEYWORD3>
-			<KEYWORD3>_MS_WINDOWS</KEYWORD3>
-			<KEYWORD3>_MSDOS_386</KEYWORD3>
-			<KEYWORD3>_MSDOS</KEYWORD3>
-			<KEYWORD3>_OS2</KEYWORD3>
-			<KEYWORD3>_PIPES</KEYWORD3>
-			<KEYWORD3>_PRESENTATION_MGR</KEYWORD3>
-			<KEYWORD3>_SYSTEM_FUNCTION</KEYWORD3>
-			<KEYWORD3>_UNIX</KEYWORD3>
-			<KEYWORD3>_VMS</KEYWORD3>
-			<KEYWORD3>_WINDOW_FUNCTIONS</KEYWORD3>
-			<KEYWORD3>_X_WINDOW_SYSTEM</KEYWORD3>
-
-			<KEYWORD4>co-expression</KEYWORD4>
-			<KEYWORD4>cset</KEYWORD4>
-			<KEYWORD4>file</KEYWORD4>
-			<KEYWORD4>integer</KEYWORD4>
-			<KEYWORD4>list</KEYWORD4>
-			<KEYWORD4>null</KEYWORD4>
-			<KEYWORD4>real</KEYWORD4>
-			<KEYWORD4>set</KEYWORD4>
-			<KEYWORD4>string</KEYWORD4>
-			<KEYWORD4>table</KEYWORD4>
-			<KEYWORD4>window</KEYWORD4>
-		</KEYWORDS>
-	</RULES>
-</MODE>
-
diff --git a/qpython/src/main/assets/syntax/idl.xml b/qpython/src/main/assets/syntax/idl.xml
deleted file mode 100644
index 3b9a5cca..00000000
--- a/qpython/src/main/assets/syntax/idl.xml
+++ /dev/null
@@ -1,158 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!-- IDL mode, by Slava Pestov
-     based on Java mode by Mike Dillon and IDLTokenMarker by Juha Lindfors -->
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="indentOpenBrackets" VALUE="{" />
-		<PROPERTY NAME="indentCloseBrackets" VALUE="}" />
-		<PROPERTY NAME="commentStart" VALUE="/*" />
-		<PROPERTY NAME="commentEnd" VALUE="*/" />
-		<PROPERTY NAME="boxComment" VALUE="*" />
-		<PROPERTY NAME="lineComment" VALUE="//" />
-	</PROPS>
-	<RULES IGNORE_CASE="FALSE">
-        <EOL_SPAN TYPE="KEYWORD2"
-				  AT_WHITESPACE_END="TRUE"
-				  DELEGATE="PREPROCESSOR">#</EOL_SPAN>
-		<IMPORT DELEGATE="LEX" />
-	</RULES>
-
-	<RULES SET="LEX" IGNORE_CASE="FALSE">
-
-		<IMPORT DELEGATE="c::COMMENTS" />
-
-		<SPAN TYPE="LITERAL1" ESCAPE="\" NO_LINE_BREAK="TRUE">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-		<SPAN TYPE="LITERAL1" ESCAPE="\" NO_LINE_BREAK="TRUE">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-
-		<EOL_SPAN TYPE="COMMENT2">//</EOL_SPAN>
-
-		<!-- some of these should be marked OPERATOR -->
-		<!--
-		<SEQ TYPE="NULL">!</SEQ>
-		<SEQ TYPE="NULL">&gt;=</SEQ>
-		<SEQ TYPE="NULL">&lt;=</SEQ>
-		<SEQ TYPE="NULL">+</SEQ>
-		<SEQ TYPE="NULL">-</SEQ>
-		<SEQ TYPE="NULL">/</SEQ>
-		<SEQ TYPE="NULL">*</SEQ>
-		<SEQ TYPE="NULL">%</SEQ>
-		<SEQ TYPE="NULL">&amp;</SEQ>
-		<SEQ TYPE="NULL">|</SEQ>
-		<SEQ TYPE="NULL">^</SEQ>
-		<SEQ TYPE="NULL">~</SEQ>
-		<SEQ TYPE="NULL">.</SEQ>
-		<SEQ TYPE="NULL">,</SEQ>
-		<SEQ TYPE="NULL">;</SEQ>
-		<SEQ TYPE="NULL">]</SEQ>
-		<SEQ TYPE="NULL">[</SEQ>
-		<SEQ TYPE="NULL">?</SEQ> -->
-
-		<SEQ TYPE="OPERATOR">}</SEQ>
-		<SEQ TYPE="OPERATOR">{</SEQ>
-		<SEQ TYPE="OPERATOR">:</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;</SEQ>
-		<SEQ TYPE="OPERATOR">=</SEQ>
-
-
-		<!-- Function calls -->
-		<MARK_PREVIOUS TYPE="FUNCTION" MATCH_TYPE="OPERATOR">(</MARK_PREVIOUS>
-		<SEQ TYPE="OPERATOR">)</SEQ>
-
-		<KEYWORDS>
-			<KEYWORD3>any</KEYWORD3>
-			<KEYWORD1>attribute</KEYWORD1>
-			<KEYWORD3>boolean</KEYWORD3>
-			<KEYWORD1>case</KEYWORD1>
-			<KEYWORD3>char</KEYWORD3>
-			<KEYWORD1>const</KEYWORD1>
-			<KEYWORD1>context</KEYWORD1>
-			<KEYWORD1>default</KEYWORD1>
-			<KEYWORD3>double</KEYWORD3>
-			<KEYWORD3>enum</KEYWORD3>
-			<KEYWORD1>exception</KEYWORD1>
-			<LITERAL2>FALSE</LITERAL2>
-			<KEYWORD1>fixed</KEYWORD1>
-			<KEYWORD3>float</KEYWORD3>
-			<KEYWORD1>in</KEYWORD1>
-			<KEYWORD1>inout</KEYWORD1>
-			<KEYWORD1>interface</KEYWORD1>
-			<KEYWORD3>long</KEYWORD3>
-			<KEYWORD1>module</KEYWORD1>
-			<KEYWORD3>Object</KEYWORD3>
-			<KEYWORD3>octet</KEYWORD3>
-			<KEYWORD1>oneway</KEYWORD1>
-			<KEYWORD1>out</KEYWORD1>
-			<KEYWORD1>raises</KEYWORD1>
-			<KEYWORD1>readonly</KEYWORD1>
-			<KEYWORD3>sequence</KEYWORD3>
-			<KEYWORD3>short</KEYWORD3>
-			<KEYWORD3>string</KEYWORD3>
-			<KEYWORD3>struct</KEYWORD3>
-			<KEYWORD1>switch</KEYWORD1>
-			<LITERAL2>TRUE</LITERAL2>
-			<KEYWORD3>typedef</KEYWORD3>
-			<KEYWORD3>unsigned</KEYWORD3>
-			<KEYWORD3>union</KEYWORD3>
-			<KEYWORD3>void</KEYWORD3>
-			<KEYWORD3>wchar</KEYWORD3>
-			<KEYWORD3>wstring</KEYWORD3>
-		</KEYWORDS>
-	</RULES>
-
-    <!-- Preprocessor specific rules. This is borrowed from the C mode,
-	     since the IDL spec says the preprocessor is compatible with the
-		 C++ standard. -->
-    <RULES SET="PREPROCESSOR"
-        IGNORE_CASE="FALSE"
-        HIGHLIGHT_DIGITS="TRUE" DIGIT_RE="[0-9][0-9a-zA-Z]*">
-
-        <EOL_SPAN_REGEXP HASH_CHAR="include" TYPE="MARKUP" DELEGATE="INCLUDE">include\b</EOL_SPAN_REGEXP>
-        <EOL_SPAN_REGEXP HASH_CHAR="define" TYPE="MARKUP" DELEGATE="DEFINE">define\b</EOL_SPAN_REGEXP>
-        <EOL_SPAN_REGEXP HASH_CHAR="endif" TYPE="MARKUP" DELEGATE="LEX">endif\b</EOL_SPAN_REGEXP>
-        <EOL_SPAN_REGEXP HASH_CHAR="elif" TYPE="MARKUP" DELEGATE="c::CONDITION">elif\b</EOL_SPAN_REGEXP>
-        <EOL_SPAN_REGEXP HASH_CHAR="if" TYPE="MARKUP" DELEGATE="c::CONDITION">if\b</EOL_SPAN_REGEXP>
-
-        <IMPORT DELEGATE="LEX"/>
-
-        <!-- Directives -->
-        <KEYWORDS>
-            <MARKUP>ifdef</MARKUP>
-            <MARKUP>ifndef</MARKUP>
-            <MARKUP>else</MARKUP>
-            <MARKUP>undef</MARKUP>
-            <MARKUP>warning</MARKUP>
-        </KEYWORDS>
-    </RULES>
-
-    <RULES SET="INCLUDE"
-        IGNORE_CASE="FALSE"
-        HIGHLIGHT_DIGITS="TRUE" DIGIT_RE="[0-9][0-9a-zA-Z]*">
-        <SPAN TYPE="LITERAL1" NO_LINE_BREAK="TRUE">
-            <BEGIN>&lt;</BEGIN>
-            <END>&gt;</END>
-        </SPAN>
-        <SPAN TYPE="LITERAL1" NO_LINE_BREAK="TRUE">
-            <BEGIN>"</BEGIN>
-            <END>"</END>
-        </SPAN>
-        <IMPORT DELEGATE="LEX"/>
-    </RULES>
-
-    <RULES SET="DEFINE"
-        IGNORE_CASE="FALSE"
-        HIGHLIGHT_DIGITS="TRUE" DIGIT_RE="[0-9][0-9a-zA-Z]*">
-        <SEQ TYPE="OPERATOR">#</SEQ>
-        <IMPORT DELEGATE="LEX"/>
-    </RULES>
-
-</MODE>
diff --git a/qpython/src/main/assets/syntax/inform.xml b/qpython/src/main/assets/syntax/inform.xml
deleted file mode 100644
index 6ad35d38..00000000
--- a/qpython/src/main/assets/syntax/inform.xml
+++ /dev/null
@@ -1,203 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<MODE>
-      <!-- Syntax highlighting mode for the Inform language. You can find out more about inform at
-           http://www.gnelson.demon.co.uk/inform.html
-           And an inform language guide at
-           http://www.gnelson.demon.co.uk/dman/index.html
-        -->
-    <PROPS>
-        <!--
-        <PROPERTY NAME="commentStart" VALUE="/*" />
-        <PROPERTY NAME="commentEnd" VALUE="*/" />
-        -->
-        <PROPERTY NAME="lineComment" VALUE="!" />
-        <PROPERTY NAME="wordBreakChars" VALUE=",+-=&lt;&gt;/?^&amp;*" />
-
-        <!-- Auto indent -->
-        <PROPERTY NAME="indentOpenBrackets" VALUE="{[" />
-        <PROPERTY NAME="indentCloseBrackets" VALUE="}]" />
-        <PROPERTY NAME="indentNextLine"
-            VALUE="\s*(((if|while)\s*\(|else\s*|else\s+if\s*\(|for\s*\(.*\))[^{;]*)" />
-        <!-- set this to 'true' if you want to use GNU coding style -->
-        <PROPERTY NAME="doubleBracketIndent" VALUE="false" />
-    </PROPS>
-
-    <RULES
-            IGNORE_CASE="FALSE"
-            HIGHLIGHT_DIGITS="TRUE"
-            DIGIT_RE="(\$[\p{XDigit}]|[\p{Digit}])">
-        <EOL_SPAN TYPE="COMMENT1">!</EOL_SPAN>
-
-        <!-- strings can span lines -->
-        <SPAN TYPE="LITERAL1" DELEGATE="InformInnerText">
-            <BEGIN>"</BEGIN>
-            <END>"</END>
-        </SPAN>
-        <SPAN TYPE="LITERAL2">
-            <BEGIN>'</BEGIN>
-            <END>'</END>
-        </SPAN>
-
-        <!-- preprocessor statements -->
-        <EOL_SPAN TYPE="KEYWORD2">#</EOL_SPAN>
-        <EOL_SPAN TYPE="COMMENT1">!</EOL_SPAN>
-
-        <!-- special sequences that require special highlighting -->
-        <SEQ TYPE="OPERATOR">=</SEQ>
-        <SEQ TYPE="OPERATOR">==</SEQ>
-        <SEQ TYPE="OPERATOR">&gt;=</SEQ>
-        <SEQ TYPE="OPERATOR">&lt;=</SEQ>
-        <SEQ TYPE="OPERATOR">~=</SEQ>
-        <SEQ TYPE="OPERATOR">+</SEQ>
-        <SEQ TYPE="OPERATOR">-</SEQ>
-        <SEQ TYPE="OPERATOR">$</SEQ>
-        <SEQ TYPE="OPERATOR">/</SEQ>
-        <SEQ TYPE="OPERATOR">*</SEQ>
-        <SEQ TYPE="OPERATOR">&gt;</SEQ>
-        <SEQ TYPE="OPERATOR">&lt;</SEQ>
-        <SEQ TYPE="OPERATOR">%</SEQ>
-        <SEQ TYPE="OPERATOR">&amp;</SEQ>
-        <SEQ TYPE="OPERATOR">|</SEQ>
-        <SEQ TYPE="OPERATOR">^</SEQ>
-        <SEQ TYPE="OPERATOR">~</SEQ>
-        <SEQ TYPE="OPERATOR">}</SEQ>
-        <SEQ TYPE="OPERATOR">{</SEQ>
-        <SEQ TYPE="OPERATOR">]</SEQ>
-        <SEQ TYPE="OPERATOR">[</SEQ>
-
-        <SEQ TYPE="OPERATOR">.&amp;</SEQ>
-        <SEQ TYPE="OPERATOR">.#</SEQ>
-        <SEQ TYPE="OPERATOR">--></SEQ>
-
-        <!-- Function calls -->
-        <MARK_PREVIOUS TYPE="FUNCTION" MATCH_TYPE="OPERATOR">(</MARK_PREVIOUS>
-		<SEQ TYPE="OPERATOR">)</SEQ>
-        <MARK_PREVIOUS TYPE="FUNCTION" MATCH_TYPE="OPERATOR">::</MARK_PREVIOUS>
-
-        <MARK_PREVIOUS AT_WHITESPACE_END="FALSE"
-            MATCH_TYPE="OPERATOR"
-            TYPE="LABEL">:</MARK_PREVIOUS>
-
-        <KEYWORDS>
-            <!-- operators -->
-            <KEYWORD1>has</KEYWORD1>
-            <KEYWORD1>hasnt</KEYWORD1>
-            <KEYWORD1>in</KEYWORD1>
-            <KEYWORD1>notin</KEYWORD1>
-            <KEYWORD1>ofclass</KEYWORD1>
-            <KEYWORD1>provides</KEYWORD1>
-            <KEYWORD1>or</KEYWORD1>
-
-            <!-- text-base conversion functions -->
-            <LITERAL2>char</LITERAL2>
-            <LITERAL2>string</LITERAL2>
-            <LITERAL2>address</LITERAL2>
-            <LITERAL2>name</LITERAL2>
-            <LITERAL2>a</LITERAL2>
-            <LITERAL2>an</LITERAL2>
-            <LITERAL2>the</LITERAL2>
-            <LITERAL2>The</LITERAL2>
-            <LITERAL2>property</LITERAL2>
-            <LITERAL2>object</LITERAL2>
-
-            <!-- language semantics -->
-            <KEYWORD1>break</KEYWORD1>
-            <KEYWORD1>continue</KEYWORD1>
-            <KEYWORD1>do</KEYWORD1>
-                <KEYWORD1>until</KEYWORD1>
-            <KEYWORD1>for</KEYWORD1>
-            <KEYWORD1>give</KEYWORD1>
-            <KEYWORD1>if</KEYWORD1>
-                <KEYWORD1>else</KEYWORD1>
-            <KEYWORD1>inversion</KEYWORD1>
-            <KEYWORD1>jump</KEYWORD1>
-            <KEYWORD1>move</KEYWORD1>
-                <KEYWORD2>to</KEYWORD2>
-            <KEYWORD1>objectloop</KEYWORD1>
-            <KEYWORD1>remove</KEYWORD1>
-            <KEYWORD1>return</KEYWORD1>
-            <KEYWORD1>rfalse</KEYWORD1>
-            <KEYWORD1>rtrue</KEYWORD1>
-            <KEYWORD1>string</KEYWORD1>
-            <KEYWORD1>switch</KEYWORD1>
-            <KEYWORD1>while</KEYWORD1>
-
-            <!-- class keyworks -->
-            <KEYWORD1>with</KEYWORD1>
-<!--			<KEYWORD1>has</KEYWORD1> -->
-
-            <!-- built-in functions -->
-            <FUNCTION>new_line</FUNCTION>
-            <FUNCTION>print</FUNCTION>
-            <FUNCTION>print_ret</FUNCTION>
-            <FUNCTION>box</FUNCTION>
-            <FUNCTION>font</FUNCTION>
-                <KEYWORD2>on</KEYWORD2>
-                <KEYWORD2>off</KEYWORD2>
-            <FUNCTION>quit</FUNCTION>
-            <FUNCTION>read</FUNCTION>
-            <FUNCTION>restore</FUNCTION>
-            <FUNCTION>save</FUNCTION>
-            <FUNCTION>spaces</FUNCTION>
-            <FUNCTION>style</FUNCTION>
-                <KEYWORD2>roman</KEYWORD2>
-                <KEYWORD2>bold</KEYWORD2>
-                <KEYWORD2>underline</KEYWORD2>
-                <KEYWORD2>reverse</KEYWORD2>
-                <KEYWORD2>fixed</KEYWORD2>
-            <FUNCTION>score</FUNCTION>
-            <FUNCTION>time</FUNCTION>
-
-            <!-- Top-level keyworks -->
-            <KEYWORD3>Abbreviate</KEYWORD3>
-            <KEYWORD3>Array</KEYWORD3>
-            <KEYWORD3>Attribute</KEYWORD3>
-            <KEYWORD3>Class</KEYWORD3>
-            <KEYWORD3>Constant</KEYWORD3>
-            <KEYWORD3>Default</KEYWORD3>
-            <KEYWORD3>End</KEYWORD3>
-            <KEYWORD3>Endif</KEYWORD3>
-            <KEYWORD3>Extend</KEYWORD3>
-            <KEYWORD3>Global</KEYWORD3>
-            <KEYWORD3>Ifdef</KEYWORD3>
-            <KEYWORD3>Ifndef</KEYWORD3>
-            <KEYWORD3>Ifnot</KEYWORD3>
-            <KEYWORD3>Iftrue</KEYWORD3>
-            <KEYWORD3>Iffalse</KEYWORD3>
-            <KEYWORD3>Import</KEYWORD3>
-            <KEYWORD3>Include</KEYWORD3>
-            <KEYWORD3>Link</KEYWORD3>
-            <KEYWORD3>Lowstring</KEYWORD3>
-            <KEYWORD3>Message</KEYWORD3>
-            <KEYWORD3>Object</KEYWORD3>
-            <KEYWORD3>Property</KEYWORD3>
-            <KEYWORD3>Replace</KEYWORD3>
-            <KEYWORD3>Serial</KEYWORD3>
-            <KEYWORD3>Switches</KEYWORD3>
-            <KEYWORD3>Statusline</KEYWORD3>
-            <KEYWORD3>System_file</KEYWORD3>
-            <KEYWORD3>Verb</KEYWORD3>
-            <KEYWORD3>private</KEYWORD3>
-
-            <LITERAL2>false</LITERAL2>
-            <LITERAL2>true</LITERAL2>
-            <LITERAL2>null</LITERAL2>
-            <LITERAL2>super</LITERAL2>
-            <LITERAL2>self</LITERAL2>
-
-            <INVALID>this</INVALID>
-        </KEYWORDS>
-    </RULES>
-    <RULES SET="InformInnerText" IGNORE_CASE="FALSE" DEFAULT="LITERAL1">
-        <SEQ TYPE="OPERATOR">^</SEQ>
-        <SEQ TYPE="OPERATOR">~</SEQ>
-        <SEQ TYPE="OPERATOR">@</SEQ>
-        <SEQ TYPE="OPERATOR">\</SEQ>
-
-        <!-- escaping the @ symbol -->
-        <SEQ TYPE="LITERAL2">@@</SEQ>
-    </RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/ini.xml b/qpython/src/main/assets/syntax/ini.xml
deleted file mode 100644
index 2573c554..00000000
--- a/qpython/src/main/assets/syntax/ini.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="lineComment" VALUE=";" />
-		<PROPERTY NAME="contextInsensitive" VALUE="true" />
-	</PROPS>
-	<RULES HIGHLIGHT_DIGITS="TRUE">
-		<SPAN TYPE="KEYWORD2" AT_LINE_START="TRUE">
-			<BEGIN>[</BEGIN>
-			<END>]</END>
-		</SPAN>
-		<EOL_SPAN TYPE="COMMENT1" AT_LINE_START="TRUE">;</EOL_SPAN>
-		<EOL_SPAN TYPE="COMMENT1" AT_LINE_START="TRUE">#</EOL_SPAN>
-
-		<MARK_PREVIOUS TYPE="KEYWORD1"
-			AT_LINE_START="TRUE" MATCH_TYPE="OPERATOR">=</MARK_PREVIOUS>
-	</RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/inno_setup.xml b/qpython/src/main/assets/syntax/inno_setup.xml
deleted file mode 100644
index 2967836d..00000000
--- a/qpython/src/main/assets/syntax/inno_setup.xml
+++ /dev/null
@@ -1,406 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="lineComment" VALUE=";" />
-	</PROPS>
-	<RULES HIGHLIGHT_DIGITS="FALSE">
-
-		<SEQ TYPE="KEYWORD2" AT_LINE_START="TRUE" DELEGATE="pascal::MAIN">[code]</SEQ>
-
-		<SEQ TYPE="KEYWORD2" AT_LINE_START="TRUE">[Setup]</SEQ>
-		<SEQ TYPE="KEYWORD2" AT_LINE_START="TRUE">[Types]</SEQ>
-		<SEQ TYPE="KEYWORD2" AT_LINE_START="TRUE">[Components]</SEQ>
-		<SEQ TYPE="KEYWORD2" AT_LINE_START="TRUE">[Tasks]</SEQ>
-		<SEQ TYPE="KEYWORD2" AT_LINE_START="TRUE">[Dirs]</SEQ>
-		<SEQ TYPE="KEYWORD2" AT_LINE_START="TRUE">[Files]</SEQ>
-		<SEQ TYPE="KEYWORD2" AT_LINE_START="TRUE">[Icons]</SEQ>
-		<SEQ TYPE="KEYWORD2" AT_LINE_START="TRUE">[INI]</SEQ>
-		<SEQ TYPE="KEYWORD2" AT_LINE_START="TRUE">[InstallDelete]</SEQ>
-		<SEQ TYPE="KEYWORD2" AT_LINE_START="TRUE">[Languages]</SEQ>
-		<SEQ TYPE="KEYWORD2" AT_LINE_START="TRUE">[Messages]</SEQ>
-		<SEQ TYPE="KEYWORD2" AT_LINE_START="TRUE">[CustomMessages]</SEQ>
-		<SEQ TYPE="KEYWORD2" AT_LINE_START="TRUE">[LangOptions]</SEQ>
-		<SEQ TYPE="KEYWORD2" AT_LINE_START="TRUE">[Registry]</SEQ>
-		<SEQ TYPE="KEYWORD2" AT_LINE_START="TRUE">[Run]</SEQ>
-		<SEQ TYPE="KEYWORD2" AT_LINE_START="TRUE">[UninstallRun]</SEQ>
-		<SEQ TYPE="KEYWORD2" AT_LINE_START="TRUE">[UninstallDelete]</SEQ>
-
-		<!-- pre-processor directives -->
-		<EOL_SPAN TYPE="LITERAL4" DELEGATE="DIRECTIVE">#define </EOL_SPAN>
-		<EOL_SPAN TYPE="LITERAL4" DELEGATE="DIRECTIVE">#dim </EOL_SPAN>
-		<EOL_SPAN TYPE="LITERAL4" DELEGATE="DIRECTIVE">#undef </EOL_SPAN>
-		<EOL_SPAN TYPE="LITERAL4" DELEGATE="DIRECTIVE">#include </EOL_SPAN>
-		<EOL_SPAN TYPE="LITERAL4" DELEGATE="DIRECTIVE">#emit </EOL_SPAN>
-		<EOL_SPAN TYPE="LITERAL4" DELEGATE="DIRECTIVE">#expr </EOL_SPAN>
-		<EOL_SPAN TYPE="LITERAL4" DELEGATE="DIRECTIVE">#insert </EOL_SPAN>
-		<EOL_SPAN TYPE="LITERAL4" DELEGATE="DIRECTIVE">#append </EOL_SPAN>
-		<EOL_SPAN TYPE="LITERAL4" DELEGATE="DIRECTIVE">#if </EOL_SPAN>
-		<EOL_SPAN TYPE="LITERAL4" DELEGATE="DIRECTIVE">#elif </EOL_SPAN>
-		<EOL_SPAN TYPE="LITERAL4" DELEGATE="DIRECTIVE">#else </EOL_SPAN>
-		<EOL_SPAN TYPE="LITERAL4" DELEGATE="DIRECTIVE">#endif</EOL_SPAN>
-		<EOL_SPAN TYPE="LITERAL4" DELEGATE="DIRECTIVE">#ifexist </EOL_SPAN>
-		<EOL_SPAN TYPE="LITERAL4" DELEGATE="DIRECTIVE">#ifnexist </EOL_SPAN>
-		<EOL_SPAN TYPE="LITERAL4" DELEGATE="DIRECTIVE">#ifdef </EOL_SPAN>
-		<EOL_SPAN TYPE="LITERAL4" DELEGATE="DIRECTIVE">#for </EOL_SPAN>
-		<EOL_SPAN TYPE="LITERAL4" DELEGATE="DIRECTIVE">#sub </EOL_SPAN>
-		<EOL_SPAN TYPE="LITERAL4" DELEGATE="DIRECTIVE">#endsub</EOL_SPAN>
-		<EOL_SPAN TYPE="LITERAL4" DELEGATE="DIRECTIVE">#pragma </EOL_SPAN>
-		<EOL_SPAN TYPE="LITERAL4" DELEGATE="DIRECTIVE">#error </EOL_SPAN>
-		<SPAN TYPE="LITERAL4">
-			<BEGIN>{#</BEGIN>
-			<END>}</END>
-		</SPAN>
-
-		<MARK_FOLLOWING TYPE="LITERAL2">%</MARK_FOLLOWING>
-
-		<SPAN TYPE="LITERAL1" DELEGATE="STRING">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-		<SPAN TYPE="LITERAL1" DELEGATE="STRING">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-		<!-- variable -->
-		<SPAN TYPE="KEYWORD3">
-			<BEGIN>{</BEGIN>
-			<END>}</END>
-		</SPAN>
-
-		<EOL_SPAN TYPE="COMMENT1" AT_LINE_START="TRUE">;</EOL_SPAN>
-		<EOL_SPAN TYPE="COMMENT1" AT_LINE_START="TRUE">#</EOL_SPAN>
-
-		<!--
-		<MARK_PREVIOUS TYPE="KEYWORD1"
-			AT_LINE_START="TRUE" MATCH_TYPE="CONTEXT"">=</MARK_PREVIOUS>
-		-->
-
-		<KEYWORDS>
-			<!-- [Setup] -->
-			<!-- compiler -->
-			<KEYWORD1>Compression</KEYWORD1>
-			<KEYWORD1>DiskClusterSize</KEYWORD1>
-			<KEYWORD1>DiskSliceSize</KEYWORD1>
-			<KEYWORD1>DiskSpanning</KEYWORD1>
-			<KEYWORD1>Encryption</KEYWORD1>
-			<KEYWORD1>InternalCompressLevel</KEYWORD1>
-			<KEYWORD1>MergeDuplicateFiles</KEYWORD1>
-			<KEYWORD1>OutputBaseFilename</KEYWORD1>
-			<KEYWORD1>OutputDir</KEYWORD1>
-			<KEYWORD1>ReserveBytes</KEYWORD1>
-			<KEYWORD1>SlicesPerDisk</KEYWORD1>
-			<KEYWORD1>SolidCompression</KEYWORD1>
-			<KEYWORD1>SourceDir</KEYWORD1>
-			<KEYWORD1>UseSetupLdr</KEYWORD1>
-			<KEYWORD1>VersionInfoCompany</KEYWORD1>
-			<KEYWORD1>VersionInfoDescription</KEYWORD1>
-			<KEYWORD1>VersionInfoTextVersion</KEYWORD1>
-			<KEYWORD1>VersionInfoVersion</KEYWORD1>
-			<!-- installer, functional -->
-			<KEYWORD1>AllowCancelDuringInstall</KEYWORD1>
-			<KEYWORD1>AllowNoIcons</KEYWORD1>
-			<KEYWORD1>AllowRootDirectory</KEYWORD1>
-			<KEYWORD1>AllowUNCPath</KEYWORD1>
-			<KEYWORD1>AlwaysRestart</KEYWORD1>
-			<KEYWORD1>AlwaysShowComponentsList</KEYWORD1>
-			<KEYWORD1>AlwaysShowDirOnReadyPage</KEYWORD1>
-			<KEYWORD1>AlwaysShowGroupOnReadyPage</KEYWORD1>
-			<KEYWORD1>AlwaysUsePersonalGroup</KEYWORD1>
-			<KEYWORD1>AppendDefaultDirName</KEYWORD1>
-			<KEYWORD1>AppendDefaultGroupName</KEYWORD1>
-			<KEYWORD1>AppComments</KEYWORD1>
-			<KEYWORD1>AppContact</KEYWORD1>
-			<KEYWORD1>AppId</KEYWORD1>
-			<KEYWORD1>AppModifyPath</KEYWORD1>
-			<KEYWORD1>AppMutex</KEYWORD1>
-			<KEYWORD1>AppName</KEYWORD1>
-			<KEYWORD1>AppPublisher</KEYWORD1>
-			<KEYWORD1>AppPublisherURL</KEYWORD1>
-			<KEYWORD1>AppReadmeFile</KEYWORD1>
-			<KEYWORD1>AppSupportURL</KEYWORD1>
-			<KEYWORD1>AppUpdatesURL</KEYWORD1>
-			<KEYWORD1>AppVersion</KEYWORD1>
-			<KEYWORD1>AppVerName</KEYWORD1>
-			<KEYWORD1>ChangesAssociations</KEYWORD1>
-			<KEYWORD1>CreateAppDir</KEYWORD1>
-			<KEYWORD1>CreateUninstallRegKey</KEYWORD1>
-			<KEYWORD1>DefaultDirName</KEYWORD1>
-			<KEYWORD1>DefaultGroupName</KEYWORD1>
-			<KEYWORD1>DefaultUserInfoName</KEYWORD1>
-			<KEYWORD1>DefaultUserInfoOrg</KEYWORD1>
-			<KEYWORD1>DefaultUserInfoSerial</KEYWORD1>
-			<KEYWORD1>DirExistsWarning</KEYWORD1>
-			<KEYWORD1>DisableDirPage</KEYWORD1>
-			<KEYWORD1>DisableFinishedPage</KEYWORD1>
-			<KEYWORD1>DisableProgramGroupPage</KEYWORD1>
-			<KEYWORD1>DisableReadyMemo</KEYWORD1>
-			<KEYWORD1>DisableReadyPage</KEYWORD1>
-			<KEYWORD1>DisableStartupPrompt</KEYWORD1>
-			<KEYWORD1>EnableDirDoesntExistWarning</KEYWORD1>
-			<KEYWORD1>ExtraDiskSpaceRequired</KEYWORD1>
-			<KEYWORD1>InfoAfterFile</KEYWORD1>
-			<KEYWORD1>InfoBeforeFile</KEYWORD1>
-			<KEYWORD1>LanguageDetectionMethod</KEYWORD1>
-			<KEYWORD1>LicenseFile</KEYWORD1>
-			<KEYWORD1>MinVersion</KEYWORD1>
-			<KEYWORD1>OnlyBelowVersion</KEYWORD1>
-			<KEYWORD1>Password</KEYWORD1>
-			<KEYWORD1>PrivilegesRequired</KEYWORD1>
-			<KEYWORD1>RestartIfNeededByRun</KEYWORD1>
-			<KEYWORD1>ShowLanguageDialog</KEYWORD1>
-			<KEYWORD1>TimeStampRounding</KEYWORD1>
-			<KEYWORD1>TimeStampsInUTC</KEYWORD1>
-			<KEYWORD1>TouchDate</KEYWORD1>
-			<KEYWORD1>TouchTime</KEYWORD1>
-			<KEYWORD1>Uninstallable</KEYWORD1>
-			<KEYWORD1>UninstallDisplayIcon</KEYWORD1>
-			<KEYWORD1>UninstallDisplayName</KEYWORD1>
-			<KEYWORD1>UninstallFilesDir</KEYWORD1>
-			<KEYWORD1>UninstallLogMode</KEYWORD1>
-			<KEYWORD1>UninstallRestartComputer</KEYWORD1>
-			<KEYWORD1>UpdateUninstallLogAppName</KEYWORD1>
-			<KEYWORD1>UsePreviousAppDir</KEYWORD1>
-			<KEYWORD1>UsePreviousGroup</KEYWORD1>
-			<KEYWORD1>UsePreviousSetupType</KEYWORD1>
-			<KEYWORD1>UsePreviousTasks</KEYWORD1>
-			<KEYWORD1>UsePreviousUserInfo</KEYWORD1>
-			<KEYWORD1>UserInfoPage</KEYWORD1>
-			<!-- installer, cosmetic -->
-			<KEYWORD1>AppCopyright</KEYWORD1>
-			<KEYWORD1>BackColor</KEYWORD1>
-			<KEYWORD1>BackColor2</KEYWORD1>
-			<KEYWORD1>BackColorDirection</KEYWORD1>
-			<KEYWORD1>BackSolid</KEYWORD1>
-			<KEYWORD1>FlatComponentsList</KEYWORD1>
-			<KEYWORD1>SetupIconFile</KEYWORD1>
-			<KEYWORD1>ShowComponentSizes</KEYWORD1>
-			<KEYWORD1>ShowTasksTreeLines</KEYWORD1>
-			<KEYWORD1>UninstallStyle</KEYWORD1>
-			<KEYWORD1>WindowShowCaption</KEYWORD1>
-			<KEYWORD1>WindowStartMaximized</KEYWORD1>
-			<KEYWORD1>WindowResizable</KEYWORD1>
-			<KEYWORD1>WindowVisible</KEYWORD1>
-			<KEYWORD1>WizardImageBackColor</KEYWORD1>
-			<KEYWORD1>WizardImageFile</KEYWORD1>
-			<KEYWORD1>WizardImageStretch</KEYWORD1>
-			<KEYWORD1>WizardSmallImageBackColor</KEYWORD1>
-			<KEYWORD1>WizardSmallImageFile</KEYWORD1>
-			<KEYWORD1>UninstallIconFile</KEYWORD1>
-
-			<!-- parameters -->
-			<KEYWORD4>AfterInstall</KEYWORD4>
-			<KEYWORD4>Attribs</KEYWORD4>
-			<KEYWORD4>BeforeInstall</KEYWORD4>
-			<KEYWORD4>Check</KEYWORD4>
-			<KEYWORD4>Comment</KEYWORD4>
-			<KEYWORD4>Components</KEYWORD4>
-			<KEYWORD4>CopyMode</KEYWORD4>
-			<KEYWORD4>Description</KEYWORD4>
-			<KEYWORD4>DestDir</KEYWORD4>
-			<KEYWORD4>DestName</KEYWORD4>
-			<KEYWORD4>Excludes</KEYWORD4>
-			<KEYWORD4>ExtraDiskSpaceRequired</KEYWORD4>
-			<KEYWORD4>Filename</KEYWORD4>
-			<KEYWORD4>Flags</KEYWORD4>
-			<KEYWORD4>FontInstall</KEYWORD4>
-			<KEYWORD4>GroupDescription</KEYWORD4>
-			<KEYWORD4>HotKey</KEYWORD4>
-			<KEYWORD4>IconFilename</KEYWORD4>
-			<KEYWORD4>IconIndex</KEYWORD4>
-			<KEYWORD4>InfoBeforeFile</KEYWORD4>
-			<KEYWORD4>InfoAfterFile</KEYWORD4>
-			<KEYWORD4>Key</KEYWORD4>
-			<!--<KEYWORD4>LicenseFile</KEYWORD4>-->
-			<KEYWORD4>MessagesFile</KEYWORD4>
-			<KEYWORD4>Name</KEYWORD4>
-			<KEYWORD4>Parameters</KEYWORD4>
-			<KEYWORD4>Permissions</KEYWORD4>
-			<KEYWORD4>Root</KEYWORD4>
-			<KEYWORD4>RunOnceId</KEYWORD4>
-			<KEYWORD4>Section</KEYWORD4>
-			<KEYWORD4>Source</KEYWORD4>
-			<KEYWORD4>StatusMsg</KEYWORD4>
-			<KEYWORD4>String</KEYWORD4>
-			<KEYWORD4>Subkey</KEYWORD4>
-			<KEYWORD4>Tasks</KEYWORD4>
-			<KEYWORD4>Type</KEYWORD4>
-			<KEYWORD4>Types</KEYWORD4>
-			<KEYWORD4>ValueType</KEYWORD4>
-			<KEYWORD4>ValueName</KEYWORD4>
-			<KEYWORD4>ValueData</KEYWORD4>
-			<KEYWORD4>WorkingDir</KEYWORD4>
-
-			<!-- flags -->
-			<LITERAL3>allowunsafefiles</LITERAL3>
-			<LITERAL3>checkedonce</LITERAL3>
-			<LITERAL3>closeonexit</LITERAL3>
-			<LITERAL3>compact</LITERAL3>
-			<LITERAL3>comparetimestamp</LITERAL3>
-			<LITERAL3>confirmoverwrite</LITERAL3>
-			<LITERAL3>createkeyifdoesntexist</LITERAL3>
-			<LITERAL3>createonlyiffileexists</LITERAL3>
-			<LITERAL3>createvalueifdoesntexist</LITERAL3>
-			<LITERAL3>deleteafterinstall</LITERAL3>
-			<LITERAL3>deletekey</LITERAL3>
-			<LITERAL3>deletevalue</LITERAL3>
-			<LITERAL3>desktopicon</LITERAL3>
-			<LITERAL3>dirifempty</LITERAL3>
-			<LITERAL3>disablenouninstallwarning</LITERAL3>
-			<LITERAL3>dontcloseonexit</LITERAL3>
-			<LITERAL3>dontcopy</LITERAL3>
-			<LITERAL3>dontcreatekey</LITERAL3>
-			<LITERAL3>dontinheritcheck</LITERAL3>
-			<LITERAL3>dontverifychecksum</LITERAL3>
-			<LITERAL3>exclusive</LITERAL3>
-			<LITERAL3>external</LITERAL3>
-			<LITERAL3>files</LITERAL3>
-			<LITERAL3>filesandordirs</LITERAL3>
-			<LITERAL3>fixed</LITERAL3>
-			<LITERAL3>fontisnttruetype</LITERAL3>
-			<LITERAL3>full</LITERAL3>
-			<LITERAL3>ignoreversion</LITERAL3>
-			<LITERAL3>iscustom</LITERAL3>
-			<LITERAL3>isreadme</LITERAL3>
-			<LITERAL3>hidden</LITERAL3>
-			<LITERAL3>hidewizard</LITERAL3>
-			<LITERAL3>modify</LITERAL3>
-			<LITERAL3>nocompression</LITERAL3>
-			<LITERAL3>noencryption</LITERAL3>
-			<LITERAL3>noerror</LITERAL3>
-			<LITERAL3>noregerror</LITERAL3>
-			<LITERAL3>nowait</LITERAL3>
-			<LITERAL3>onlyifdestfileexists</LITERAL3>
-			<LITERAL3>onlyifdoesntexist</LITERAL3>
-			<LITERAL3>overwritereadonly</LITERAL3>
-			<LITERAL3>postinstall</LITERAL3>
-			<LITERAL3>preservestringtype</LITERAL3>
-			<LITERAL3>promptifolder</LITERAL3>
-			<LITERAL3>quicklaunchicon</LITERAL3>
-			<LITERAL3>read</LITERAL3>
-			<LITERAL3>readonly</LITERAL3>
-			<LITERAL3>readexec</LITERAL3>
-			<LITERAL3>recursesubdirs</LITERAL3>
-			<LITERAL3>regserver</LITERAL3>
-			<LITERAL3>regtypelib</LITERAL3>
-			<LITERAL3>replacesameversion</LITERAL3>
-			<LITERAL3>restart</LITERAL3>
-			<LITERAL3>restartreplace</LITERAL3>
-			<LITERAL3>runhidden</LITERAL3>
-			<LITERAL3>runmaximized</LITERAL3>
-			<LITERAL3>runminimized</LITERAL3>
-			<LITERAL3>sharedfile</LITERAL3>
-			<LITERAL3>shellexec</LITERAL3>
-			<LITERAL3>skipifnotsilent</LITERAL3>
-			<LITERAL3>skipifsilent</LITERAL3>
-			<LITERAL3>skipifdoesntexist</LITERAL3>
-			<LITERAL3>skipifsourcedoesntexist</LITERAL3>
-			<LITERAL3>sortfilesbyextension</LITERAL3>
-			<LITERAL3>system</LITERAL3>
-			<LITERAL3>touch</LITERAL3>
-			<LITERAL3>unchecked</LITERAL3>
-			<LITERAL3>uninsalwaysuninstall</LITERAL3>
-			<LITERAL3>uninsclearvalue</LITERAL3>
-			<LITERAL3>uninsdeleteentry</LITERAL3>
-			<LITERAL3>uninsdeletekey</LITERAL3>
-			<LITERAL3>uninsdeletekeyifempty</LITERAL3>
-			<LITERAL3>uninsdeletesection</LITERAL3>
-			<LITERAL3>uninsdeletesectionifempty</LITERAL3>
-			<LITERAL3>uninsdeletevalue</LITERAL3>
-			<LITERAL3>uninsneveruninstall</LITERAL3>
-			<LITERAL3>uninsremovereadonly</LITERAL3>
-			<LITERAL3>uninsrestartdelete</LITERAL3>
-			<LITERAL3>useapppaths</LITERAL3>
-			<LITERAL3>waituntilidle</LITERAL3>
-
-			<!-- registry root keys -->
-			<LITERAL3>HKCR</LITERAL3>
-			<LITERAL3>HKCU</LITERAL3>
-			<LITERAL3>HKLM</LITERAL3>
-			<LITERAL3>HKU</LITERAL3>
-			<LITERAL3>HKCC</LITERAL3>
-
-			<!-- registry value types -->
-			<LITERAL3>none</LITERAL3>
-			<LITERAL3>string</LITERAL3>
-			<LITERAL3>expandsz</LITERAL3>
-			<LITERAL3>multisz</LITERAL3>
-			<LITERAL3>dword</LITERAL3>
-			<LITERAL3>binary</LITERAL3>
-		</KEYWORDS>
-	</RULES>
-
-	<RULES SET="STRING" DEFAULT="LITERAL1" IGNORE_CASE="TRUE">
-		<!-- pre-processor constant -->
-		<SPAN TYPE="LITERAL4">
-			<BEGIN>{#</BEGIN>
-			<END>}</END>
-		</SPAN>
-		<!-- constant -->
-		<SPAN TYPE="KEYWORD3" DELEGATE="CONSTANT">
-			<BEGIN>{</BEGIN>
-			<END>}</END>
-		</SPAN>
-	</RULES>
-
-	<RULES SET="CONSTANT" DEFAULT="KEYWORD3">
-		<MARK_FOLLOWING TYPE="FUNCTION" MATCH_TYPE="CONTEXT">code:</MARK_FOLLOWING>
-		<SEQ TYPE="OPERATOR">|</SEQ>
-	</RULES>
-
-	<!-- pre-processor directives -->
-	<RULES SET="DIRECTIVE" DEFAULT="LITERAL4" IGNORE_CASE="TRUE">
-		<EOL_SPAN TYPE="COMMENT1">;</EOL_SPAN>
-
-		<SPAN TYPE="COMMENT2">
-			<BEGIN>/*</BEGIN>
-			<END>*/</END>
-		</SPAN>
-
-		<SPAN TYPE="LITERAL1">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-
-		<!-- pre-processor defined functions -->
-		<KEYWORDS>
-			<FUNCTION>Defined</FUNCTION>
-			<FUNCTION>TypeOf</FUNCTION>
-			<FUNCTION>GetFileVersion</FUNCTION>
-			<FUNCTION>GetStringFileInfo</FUNCTION>
-			<FUNCTION>Int</FUNCTION>
-			<FUNCTION>Str</FUNCTION>
-			<FUNCTION>FileExists</FUNCTION>
-			<FUNCTION>FileSize</FUNCTION>
-			<FUNCTION>ReadIni</FUNCTION>
-			<FUNCTION>WriteIni</FUNCTION>
-			<FUNCTION>ReadReg</FUNCTION>
-			<FUNCTION>Exec</FUNCTION>
-			<FUNCTION>Copy</FUNCTION>
-			<FUNCTION>Pos</FUNCTION>
-			<FUNCTION>RPos</FUNCTION>
-			<FUNCTION>Len</FUNCTION>
-			<FUNCTION>SaveToFile</FUNCTION>
-			<FUNCTION>Find</FUNCTION>
-			<FUNCTION>SetupSetting</FUNCTION>
-			<FUNCTION>SetSetupSetting</FUNCTION>
-			<FUNCTION>LowerCase</FUNCTION>
-			<FUNCTION>EntryCount</FUNCTION>
-			<FUNCTION>GetEnv</FUNCTION>
-			<FUNCTION>DeleteFile</FUNCTION>
-			<FUNCTION>CopyFile</FUNCTION>
-			<FUNCTION>FindFirst</FUNCTION>
-			<FUNCTION>FindNext</FUNCTION>
-			<FUNCTION>FindClose</FUNCTION>
-			<FUNCTION>FindGetFileName</FUNCTION>
-			<FUNCTION>FileOpen</FUNCTION>
-			<FUNCTION>FileRead</FUNCTION>
-			<FUNCTION>FileReset</FUNCTION>
-			<FUNCTION>FileEof</FUNCTION>
-			<FUNCTION>FileClose</FUNCTION>
-		</KEYWORDS>
-	</RULES>
-</MODE>
-
diff --git a/qpython/src/main/assets/syntax/interlis.xml b/qpython/src/main/assets/syntax/interlis.xml
deleted file mode 100644
index 776aafe9..00000000
--- a/qpython/src/main/assets/syntax/interlis.xml
+++ /dev/null
@@ -1,262 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!-- INTERLIS mode (www.interlis.ch) by Claude Eisenhut (ce@eisenhutinformatik.ch). -->
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="commentStart" VALUE="/*" />
-		<PROPERTY NAME="commentEnd" VALUE="*/" />
-		<PROPERTY NAME="blockComment" VALUE="!!" />
-	</PROPS>
-
-	<RULES IGNORE_CASE="FALSE" HIGHLIGHT_DIGITS="FALSE">
-		<!-- Normal comments. -->
-		<SPAN TYPE="COMMENT1">
-			<BEGIN>/*</BEGIN>
-			<END>*/</END>
-		</SPAN>
-
-		<EOL_SPAN TYPE="COMMENT1">!!</EOL_SPAN>
-
-		<SPAN TYPE="LITERAL1" NO_LINE_BREAK="TRUE">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-
-		<!-- Explanations. -->
-		<SPAN TYPE="COMMENT2">
-			<BEGIN>//</BEGIN>
-			<END>//</END>
-		</SPAN>
-
-		<!-- INTERLIS 1 -->
-		<SEQ TYPE="OPERATOR">-&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;-</SEQ>
-		<SEQ TYPE="OPERATOR">..</SEQ>
-		<SEQ TYPE="OPERATOR">.</SEQ>
-		<SEQ TYPE="OPERATOR">,</SEQ>
-		<SEQ TYPE="OPERATOR">=</SEQ>
-		<SEQ TYPE="OPERATOR">;</SEQ>
-		<SEQ TYPE="OPERATOR">:</SEQ>
-		<SEQ TYPE="OPERATOR">*</SEQ>
-		<SEQ TYPE="OPERATOR">[</SEQ>
-		<SEQ TYPE="OPERATOR">]</SEQ>
-		<SEQ TYPE="OPERATOR">(</SEQ>
-		<SEQ TYPE="OPERATOR">)</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;</SEQ>
-		<!-- INTERLIS 2.1 -->
-		<SEQ TYPE="OPERATOR">!=</SEQ>
-		<SEQ TYPE="OPERATOR">#</SEQ>
-		<SEQ TYPE="OPERATOR">%</SEQ>
-		<SEQ TYPE="OPERATOR">(</SEQ>
-		<SEQ TYPE="OPERATOR">)</SEQ>
-		<SEQ TYPE="OPERATOR">*</SEQ>
-		<SEQ TYPE="OPERATOR">,</SEQ>
-		<SEQ TYPE="OPERATOR">--</SEQ>
-		<SEQ TYPE="OPERATOR">-&lt;#&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">-&lt;&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">-&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">.</SEQ>
-		<SEQ TYPE="OPERATOR">..</SEQ>
-		<SEQ TYPE="OPERATOR">/</SEQ>
-		<SEQ TYPE="OPERATOR">:</SEQ>
-		<SEQ TYPE="OPERATOR">:=</SEQ>
-		<SEQ TYPE="OPERATOR">;</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;=</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">=</SEQ>
-		<SEQ TYPE="OPERATOR">==</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;=</SEQ>
-		<SEQ TYPE="OPERATOR">[</SEQ>
-		<SEQ TYPE="OPERATOR">\</SEQ>
-		<SEQ TYPE="OPERATOR">]</SEQ>
-		<SEQ TYPE="OPERATOR">{</SEQ>
-		<SEQ TYPE="OPERATOR">}</SEQ>
-		<SEQ TYPE="OPERATOR">~</SEQ>
-		
-		<KEYWORDS>
-			<!-- INTERLIS 1 -->
-			<KEYWORD1>ANY</KEYWORD1>
-			<KEYWORD1>ARCS</KEYWORD1>
-			<KEYWORD1>AREA</KEYWORD1>
-			<KEYWORD1>BASE</KEYWORD1>
-			<KEYWORD1>BLANK</KEYWORD1>
-			<KEYWORD1>CODE</KEYWORD1>
-			<KEYWORD1>CONTINUE</KEYWORD1>
-			<KEYWORD1>CONTOUR</KEYWORD1>
-			<KEYWORD1>COORD2</KEYWORD1>
-			<KEYWORD1>COORD3</KEYWORD1>
-			<KEYWORD1>DATE</KEYWORD1>
-			<KEYWORD1>DEFAULT</KEYWORD1>
-			<KEYWORD1>DEGREES</KEYWORD1>
-			<KEYWORD1>DERIVATIVES</KEYWORD1>
-			<KEYWORD1>DIM1</KEYWORD1>
-			<KEYWORD1>DIM2</KEYWORD1>
-			<KEYWORD1>DOMAIN</KEYWORD1>
-			<KEYWORD1>END</KEYWORD1>
-			<KEYWORD1>FIX</KEYWORD1>
-			<KEYWORD1>FONT</KEYWORD1>
-			<KEYWORD1>FORMAT</KEYWORD1>
-			<KEYWORD1>FREE</KEYWORD1>
-			<KEYWORD1>GRADS</KEYWORD1>
-			<KEYWORD1>HALIGNMENT</KEYWORD1>
-			<KEYWORD1>I16</KEYWORD1>
-			<KEYWORD1>I32</KEYWORD1>
-			<KEYWORD1>IDENT</KEYWORD1>
-			<KEYWORD1>LINEATTR</KEYWORD1>
-			<KEYWORD1>LINESIZE</KEYWORD1>
-			<KEYWORD1>MODEL</KEYWORD1>
-			<KEYWORD1>NO</KEYWORD1>
-			<KEYWORD1>OPTIONAL</KEYWORD1>
-			<KEYWORD1>OVERLAPS</KEYWORD1>
-			<KEYWORD1>PERIPHERY</KEYWORD1>
-			<KEYWORD1>POLYLINE</KEYWORD1>
-			<KEYWORD1>RADIANS</KEYWORD1>
-			<KEYWORD1>STRAIGHTS</KEYWORD1>
-			<KEYWORD1>SURFACE</KEYWORD1>
-			<KEYWORD1>TABLE</KEYWORD1>
-			<KEYWORD1>TEXT</KEYWORD1>
-			<KEYWORD1>TID</KEYWORD1>
-			<KEYWORD1>TIDSIZE</KEYWORD1>
-			<KEYWORD1>TOPIC</KEYWORD1>
-			<KEYWORD1>TRANSFER</KEYWORD1>
-			<KEYWORD1>UNDEFINED</KEYWORD1>
-			<KEYWORD1>VALIGNMENT</KEYWORD1>
-			<KEYWORD1>VERTEX</KEYWORD1>
-			<KEYWORD1>VERTEXINFO</KEYWORD1>
-			<KEYWORD1>VIEW</KEYWORD1>
-			<KEYWORD1>WITH</KEYWORD1>
-			<KEYWORD1>WITHOUT</KEYWORD1>
-
-			<!-- INTERLIS 2.3 -->
-			<KEYWORD1>ABSTRACT</KEYWORD1>
-			<KEYWORD1>ACCORDING</KEYWORD1>
-			<KEYWORD1>AGGREGATES</KEYWORD1>
-			<KEYWORD1>AGGREGATION</KEYWORD1>
-			<KEYWORD1>ALL</KEYWORD1>
-			<KEYWORD1>AND</KEYWORD1>
-			<KEYWORD1>ANY</KEYWORD1>
-			<KEYWORD1>ANYCLASS</KEYWORD1>
-			<KEYWORD1>ANYSTRUCTURE</KEYWORD1>
-			<KEYWORD1>ARCS</KEYWORD1>
-			<KEYWORD1>AREA</KEYWORD1>
-			<KEYWORD1>AS</KEYWORD1>
-			<KEYWORD1>ASSOCIATION</KEYWORD1>
-			<KEYWORD1>AT</KEYWORD1>
-			<KEYWORD1>ATTRIBUTE</KEYWORD1>
-			<KEYWORD1>ATTRIBUTES</KEYWORD1>
-			<KEYWORD1>BAG</KEYWORD1>
-			<KEYWORD1>BASE</KEYWORD1>
-			<KEYWORD1>BASED</KEYWORD1>
-			<KEYWORD1>BASKET</KEYWORD1>
-			<KEYWORD1>BINARY</KEYWORD1>
-			<KEYWORD1>BLACKBOX</KEYWORD1>
-			<KEYWORD1>BOOLEAN</KEYWORD1>
-			<KEYWORD1>BY</KEYWORD1>
-			<KEYWORD1>CARDINALITY</KEYWORD1>
-			<KEYWORD1>CIRCULAR</KEYWORD1>
-			<KEYWORD1>CLASS</KEYWORD1>
-			<KEYWORD1>CLOCKWISE</KEYWORD1>
-			<KEYWORD1>CONSTRAINT</KEYWORD1>
-			<KEYWORD1>CONSTRAINTS</KEYWORD1>
-			<KEYWORD1>CONTINUE</KEYWORD1>
-			<KEYWORD1>CONTINUOUS</KEYWORD1>
-			<KEYWORD1>CONTRACTED</KEYWORD1>
-			<KEYWORD1>COORD</KEYWORD1>
-			<KEYWORD1>COUNTERCLOCKWISE</KEYWORD1>
-			<KEYWORD1>DEFINED</KEYWORD1>
-			<KEYWORD1>DEPENDS</KEYWORD1>
-			<KEYWORD1>DERIVED</KEYWORD1>
-			<KEYWORD1>DIRECTED</KEYWORD1>
-			<KEYWORD1>DOMAIN</KEYWORD1>
-			<KEYWORD1>END</KEYWORD1>
-			<KEYWORD1>ENUMTREEVAL</KEYWORD1>
-			<KEYWORD1>ENUMVAL</KEYWORD1>
-			<KEYWORD1>EQUAL</KEYWORD1>
-			<KEYWORD1>EXISTENCE</KEYWORD1>
-			<KEYWORD1>EXTENDED</KEYWORD1>
-			<KEYWORD1>EXTENDS</KEYWORD1>
-			<KEYWORD1>EXTERNAL</KEYWORD1>
-			<KEYWORD1>FINAL</KEYWORD1>
-			<KEYWORD1>FIRST</KEYWORD1>
-			<KEYWORD1>FORM</KEYWORD1>
-			<KEYWORD1>FROM</KEYWORD1>
-			<KEYWORD1>FUNCTION</KEYWORD1>
-			<KEYWORD1>GRAPHIC</KEYWORD1>
-			<KEYWORD1>HALIGNMENT</KEYWORD1>
-			<KEYWORD1>HIDING</KEYWORD1>
-			<KEYWORD1>IMPORTS</KEYWORD1>
-			<KEYWORD1>IN</KEYWORD1>
-			<KEYWORD1>INHERITANCE</KEYWORD1>
-			<KEYWORD1>INSPECTION</KEYWORD1>
-			<KEYWORD1>INTERLIS</KEYWORD1>
-			<KEYWORD1>JOIN</KEYWORD1>
-			<KEYWORD1>LAST</KEYWORD1>
-			<KEYWORD1>LINE</KEYWORD1>
-			<KEYWORD1>LIST</KEYWORD1>
-			<KEYWORD1>LNBASE</KEYWORD1>
-			<KEYWORD1>LOCAL</KEYWORD1>
-			<KEYWORD1>MANDATORY</KEYWORD1>
-			<KEYWORD1>METAOBJECT</KEYWORD1>
-			<KEYWORD1>MODEL</KEYWORD1>
-			<KEYWORD1>MTEXT</KEYWORD1>
-			<KEYWORD1>NAME</KEYWORD1>
-			<KEYWORD1>NOT</KEYWORD1>
-			<KEYWORD1>NO</KEYWORD1>
-			<KEYWORD1>NULL</KEYWORD1>
-			<KEYWORD1>NUMERIC</KEYWORD1>
-			<KEYWORD1>OBJECT</KEYWORD1>
-			<KEYWORD1>OF</KEYWORD1>
-			<KEYWORD1>OID</KEYWORD1>
-			<KEYWORD1>ON</KEYWORD1>
-			<KEYWORD1>OR</KEYWORD1>
-			<KEYWORD1>ORDERED</KEYWORD1>
-			<KEYWORD1>OTHERS</KEYWORD1>
-			<KEYWORD1>OVERLAPS</KEYWORD1>
-			<KEYWORD1>PARAMETER</KEYWORD1>
-			<KEYWORD1>PARENT</KEYWORD1>
-			<KEYWORD1>PI</KEYWORD1>
-			<KEYWORD1>POLYLINE</KEYWORD1>
-			<KEYWORD1>PROJECTION</KEYWORD1>
-			<KEYWORD1>REFERENCE</KEYWORD1>
-			<KEYWORD1>REFSYSTEM</KEYWORD1>
-			<KEYWORD1>REQUIRED</KEYWORD1>
-			<KEYWORD1>RESTRICTED</KEYWORD1>
-			<KEYWORD1>ROTATION</KEYWORD1>
-			<KEYWORD1>SET</KEYWORD1>
-			<KEYWORD1>SIGN</KEYWORD1>
-			<KEYWORD1>STRAIGHTS</KEYWORD1>
-			<KEYWORD1>STRUCTURE</KEYWORD1>
-			<KEYWORD1>SUBDIVISION</KEYWORD1>
-			<KEYWORD1>SURFACE</KEYWORD1>
-			<KEYWORD1>SYMBOLOGY</KEYWORD1>
-			<KEYWORD1>TEXT</KEYWORD1>
-			<KEYWORD1>THATAREA</KEYWORD1>
-			<KEYWORD1>THIS</KEYWORD1>
-			<KEYWORD1>THISAREA</KEYWORD1>
-			<KEYWORD1>TO</KEYWORD1>
-			<KEYWORD1>TOPIC</KEYWORD1>
-			<KEYWORD1>TRANSIENT</KEYWORD1>
-			<KEYWORD1>TRANSLATION</KEYWORD1>
-			<KEYWORD1>TYPE</KEYWORD1>
-			<KEYWORD1>UNDEFINED</KEYWORD1>
-			<KEYWORD1>UNION</KEYWORD1>
-			<KEYWORD1>UNIQUE</KEYWORD1>
-			<KEYWORD1>UNIT</KEYWORD1>
-			<KEYWORD1>UNQUALIFIED</KEYWORD1>
-			<KEYWORD1>URI</KEYWORD1>
-			<KEYWORD1>VALIGNMENT</KEYWORD1>
-			<KEYWORD1>VERSION</KEYWORD1>
-			<KEYWORD1>VERTEX</KEYWORD1>
-			<KEYWORD1>VIEW</KEYWORD1>
-			<KEYWORD1>WHEN</KEYWORD1>
-			<KEYWORD1>WHERE</KEYWORD1>
-			<KEYWORD1>WITH</KEYWORD1>
-			<KEYWORD1>WITHOUT</KEYWORD1>
-			
-		</KEYWORDS>
-	</RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/io.xml b/qpython/src/main/assets/syntax/io.xml
deleted file mode 100644
index ae0e39fa..00000000
--- a/qpython/src/main/assets/syntax/io.xml
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- @RisingSun//XML//1.0//EN________________________________________________
-
-	JEdit syntax mode for Io
-
-	..........................................................................
-
-	File name		:	io.xml
-	Description		:	JEdit syntax file for the Io programming language
-	Related links	:	<http://www.iolanguage.com>, <http://www.jedit.org>
-
-	..........................................................................
-	Author			:	Sébastien Pierre                  <spierre@type-z.org>
-	..........................................................................
-
-	Creation date	:	05-May-2003
-	Last revision	:	19-May-2003
-	Revision		:	1.1
-    History			:
-						19-May-2003 Added primitives highlighting.
-						05-May-2003 First release
-
-	.....................................................................  -->
-
-<!-- ________________________________________________________D O C T Y P E -->
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!-- ____________________________________________D O C U M E N T _ R O O T -->
-<MODE>
-
-	<!-- Properties_______________________________________________________ -->
-
-	<PROPS>
-		<PROPERTY NAME="commentStart" VALUE="/*" />
-		<PROPERTY NAME="commentStart" VALUE="*/" />
-		<PROPERTY NAME="lineComment" VALUE="#" />
-		<!-- FIXME: There may be a problem with this redefinition of
-		lineComment-->
-		<PROPERTY NAME="lineComment" VALUE="//" />
-		<PROPERTY NAME="indentOpenBrackets" VALUE="(" />
-		<PROPERTY NAME="indentCloseBrackets" VALUE=")" />
-	</PROPS>
-
-	<!-- Rules____________________________________________________________ -->
-
-	<RULES IGNORE_CASE="FALSE" HIGHLIGHT_DIGITS="TRUE">
-
-		<!-- Comments_____________________________________________________ -->
-
-		<!-- Shell-like comments -->
-		<EOL_SPAN TYPE="COMMENT1">#</EOL_SPAN>
-
-
-		<!-- C-like comments -->
-		<EOL_SPAN TYPE="COMMENT1">//</EOL_SPAN>
-		<SPAN TYPE="COMMENT1">
-			<BEGIN>/*</BEGIN>
-			<END>*/</END>
-		</SPAN>
-
-		<!-- Strings______________________________________________________ -->
-
-		<!-- Single quotes -->
-		<SPAN TYPE="LITERAL2" ESCAPE="\">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-
-		<!-- Triple quotes -->
-		<SPAN TYPE="LITERAL2" ESCAPE="\">
-			<BEGIN>"""</BEGIN>
-			<END>"""</END>
-		</SPAN>
-
-		<!-- Operatiors___________________________________________________ -->
-
-		<SEQ TYPE="OPERATOR">`</SEQ>
-		<SEQ TYPE="OPERATOR">~</SEQ>
-		<SEQ TYPE="OPERATOR">@</SEQ>
-		<SEQ TYPE="OPERATOR">@@</SEQ>
-		<SEQ TYPE="OPERATOR">$</SEQ>
-		<SEQ TYPE="OPERATOR">%</SEQ>
-		<SEQ TYPE="OPERATOR">^</SEQ>
-		<SEQ TYPE="OPERATOR">&amp;</SEQ>
-		<SEQ TYPE="OPERATOR">*</SEQ>
-		<SEQ TYPE="OPERATOR">-</SEQ>
-		<SEQ TYPE="OPERATOR">+</SEQ>
-		<SEQ TYPE="OPERATOR">/</SEQ>
-		<SEQ TYPE="OPERATOR">=</SEQ>
-		<SEQ TYPE="OPERATOR">{</SEQ>
-		<SEQ TYPE="OPERATOR">}</SEQ>
-		<SEQ TYPE="OPERATOR">[</SEQ>
-		<SEQ TYPE="OPERATOR">]</SEQ>
-		<SEQ TYPE="OPERATOR">|</SEQ>
-		<SEQ TYPE="OPERATOR">\</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;=</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;=</SEQ>
-		<SEQ TYPE="OPERATOR">?</SEQ>
-
-		<!-- Keywords_____________________________________________________ -->
-
-		<KEYWORDS>
-
-			<!-- Io primitives -->
-			<KEYWORD1>Block</KEYWORD1>
-			<KEYWORD1>Buffer</KEYWORD1>
-			<KEYWORD1>CFunction</KEYWORD1>
-			<KEYWORD1>Date</KEYWORD1>
-			<KEYWORD1>Duration</KEYWORD1>
-			<KEYWORD1>File</KEYWORD1>
-			<KEYWORD1>Future</KEYWORD1>
-			<KEYWORD1>List</KEYWORD1>
-			<KEYWORD1>LinkedList</KEYWORD1>
-			<KEYWORD1>Map</KEYWORD1>
-			<KEYWORD1>Nop</KEYWORD1>
-			<KEYWORD1>Message</KEYWORD1>
-			<KEYWORD1>Nil</KEYWORD1>
-			<KEYWORD1>Number</KEYWORD1>
-			<KEYWORD1>Object</KEYWORD1>
-			<KEYWORD1>String</KEYWORD1>
-			<KEYWORD1>WeakLink</KEYWORD1>
-
-			<!-- Io lambda-like primitives -->
-			<KEYWORD1>block</KEYWORD1>
-			<KEYWORD1>method</KEYWORD1>
-
-			<!--  Io control primitives -->
-			<KEYWORD2>while</KEYWORD2>
-			<KEYWORD2>foreach</KEYWORD2>
-			<KEYWORD2>if</KEYWORD2>
-			<KEYWORD2>else</KEYWORD2>
-			<KEYWORD2>do</KEYWORD2>
-
-			<!--  Io basic messages -->
-			<KEYWORD3>super</KEYWORD3>
-			<KEYWORD3>self</KEYWORD3>
-			<KEYWORD3>clone</KEYWORD3>
-			<KEYWORD3>proto</KEYWORD3>
-			<KEYWORD3>setSlot</KEYWORD3>
-			<KEYWORD3>hasSlot</KEYWORD3>
-			<KEYWORD3>type</KEYWORD3>
-			<KEYWORD3>write</KEYWORD3>
-			<KEYWORD3>print</KEYWORD3>
-			<KEYWORD3>forward</KEYWORD3>
-
-		</KEYWORDS>
-
-	</RULES>
-
-</MODE>
-
-<!-- EOF-UNIX/iso-8895-1__________________________@RisingSun//XML//1.0//EN -->
diff --git a/qpython/src/main/assets/syntax/jamon.xml b/qpython/src/main/assets/syntax/jamon.xml
deleted file mode 100644
index 6dd29ffd..00000000
--- a/qpython/src/main/assets/syntax/jamon.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!-- Mode file for Jamon templates. See http://www.jamon.org -->
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="commentStart" VALUE="&lt;%--" />
-		<PROPERTY NAME="commentEnd" VALUE="--%&gt;" />
-	</PROPS>
-	<RULES DEFAULT="LITERAL2">
-		<IMPORT DELEGATE="INLINE" />
-		<IMPORT DELEGATE="OVERRIDES" />
-		<IMPORT DELEGATE="html::MAIN"/>
-	</RULES>
-
-	<RULES SET="INLINE" DEFAULT="LITERAL2">
-		<SPAN_REGEXP HASH_CHAR="&lt;" MATCH_TYPE="OPERATOR" DELEGATE="java::MAIN">
-			<BEGIN>&lt;%(args|class|import|java|xargs)&gt;</BEGIN>
-			<END>&lt;/%$1&gt;</END>
-		</SPAN_REGEXP>
-		<SPAN_REGEXP HASH_CHAR="&lt;" MATCH_TYPE="OPERATOR" DELEGATE="java::MAIN">
-			<BEGIN>&lt;%(?:if|for|java)</BEGIN>
-			<END>%&gt;</END>
-		</SPAN_REGEXP>
-		<SEQ_REGEXP HASH_CHAR="&lt;" TYPE="OPERATOR">&lt;/%(?:if|for)&gt;</SEQ_REGEXP>
-		<SEQ TYPE="OPERATOR">&lt;%else&gt;</SEQ>
-
-		<SPAN_REGEXP HASH_CHAR="&lt;" MATCH_TYPE="OPERATOR" TYPE="KEYWORD2">
-			<BEGIN>&lt;%(?:abstract|def|doc|escape|extends|frag|method|override)</BEGIN>
-			<END>&gt;</END>
-		</SPAN_REGEXP>
-		<SPAN_REGEXP HASH_CHAR="&lt;" MATCH_TYPE="OPERATOR">
-			<BEGIN>&lt;/%(?:def|doc|frag|method|override)</BEGIN>
-			<END>&gt;</END>
-		</SPAN_REGEXP>
-
-		<SPAN TYPE="OPERATOR" DELEGATE="java::MAIN">
-			<BEGIN>&lt;%</BEGIN>
-			<END>%&gt;</END>
-		</SPAN>
-
-		<SPAN_REGEXP HASH_CHAR="&lt;" MATCH_TYPE="OPERATOR" DELEGATE="java::MAIN">
-			<BEGIN>&lt;&amp;\|?</BEGIN>
-			<END>&amp;&gt;</END>
-		</SPAN_REGEXP>
-		<SEQ TYPE="OPERATOR">&lt;/&amp;&gt;</SEQ>
-	</RULES>
-
-	<RULES SET="OVERRIDES" IGNORE_CASE="TRUE" DEFAULT="LITERAL2">
-		<!-- CSS -->
-		<SPAN TYPE="MARKUP" DELEGATE="CSS">
-			<BEGIN>&lt;style</BEGIN>
-			<END>&lt;/style&gt;</END>
-		</SPAN>
-
-		<!-- JavaScript -->
-		<SPAN_REGEXP TYPE="MARKUP" HASH_CHAR="&lt;" DELEGATE="JAVASCRIPT">
-			<BEGIN>&lt;(?i)(script)</BEGIN>
-			<END>&lt;/$1&gt;</END>
-		</SPAN_REGEXP>
-
-		<!-- HTML tags. -->
-		<SPAN TYPE="MARKUP" DELEGATE="TAGS">
-			<BEGIN>&lt;</BEGIN>
-			<END>&gt;</END>
-		</SPAN>
-	</RULES>
-
-	<RULES SET="JAVASCRIPT" DEFAULT="LITERAL1">
-		<SPAN TYPE="LITERAL1" NO_LINE_BREAK="TRUE" ESCAPE="\" DELEGATE="INLINE">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-		<IMPORT DELEGATE="INLINE" />
-		<IMPORT DELEGATE="javascript::MAIN" />
-	</RULES>
-
-	<RULES SET="CSS" DEFAULT="LITERAL1">
-		<SPAN TYPE="LITERAL1" NO_LINE_BREAK="TRUE" ESCAPE="\" DELEGATE="INLINE">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-		<IMPORT DELEGATE="INLINE" />
-		<IMPORT DELEGATE="css::MAIN" />
-	</RULES>
-
-	<!--
-	  This is a copy of above; IMPORT doesn't inherit DEFAULT and we need
-	  a different default depending on context.
-	-->
-	<RULES SET="INLINE_MARKUP" DEFAULT="LITERAL1">
-		<SPAN_REGEXP HASH_CHAR="&lt;" MATCH_TYPE="OPERATOR" TYPE="KEYWORD2">
-			<BEGIN>&lt;%(?:abstract|def|doc|escape|extends|frag|method|override)</BEGIN>
-			<END>&gt;</END>
-		</SPAN_REGEXP>
-		<SPAN_REGEXP HASH_CHAR="&lt;" MATCH_TYPE="OPERATOR">
-			<BEGIN>&lt;/%(?:def|doc|frag|method|override)</BEGIN>
-			<END>&gt;</END>
-		</SPAN_REGEXP>
-
-		<SPAN TYPE="OPERATOR" DELEGATE="java::MAIN">
-			<BEGIN>&lt;%</BEGIN>
-			<END>%&gt;</END>
-		</SPAN>
-
-		<SPAN_REGEXP HASH_CHAR="&lt;" MATCH_TYPE="OPERATOR" DELEGATE="java::MAIN">
-			<BEGIN>&lt;&amp;\|?</BEGIN>
-			<END>&amp;&gt;</END>
-		</SPAN_REGEXP>
-		<SEQ TYPE="OPERATOR">&lt;/&amp;&gt;</SEQ>
-	</RULES>
-
-	<RULES SET="TAGS" DEFAULT="MARKUP">
-		<SPAN TYPE="LITERAL1" DELEGATE="INLINE_MARKUP">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-		<IMPORT DELEGATE="INLINE_MARKUP" />
-		<IMPORT DELEGATE="html::TAGS" />
-	</RULES>
-
-</MODE>
-
diff --git a/qpython/src/main/assets/syntax/java.xml b/qpython/src/main/assets/syntax/java.xml
deleted file mode 100644
index dd3383d8..00000000
--- a/qpython/src/main/assets/syntax/java.xml
+++ /dev/null
@@ -1,314 +0,0 @@
-<?xml version="1.0"?>
-<!-- 
- * :tabSize=8:indentSize=8:noTabs=false:
- * :folding=explicit:collapseFolds=1:
--->
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="commentStart" VALUE="/*" />
-		<PROPERTY NAME="commentEnd" VALUE="*/" />
-		<PROPERTY NAME="lineComment" VALUE="//" />
-		<PROPERTY NAME="wordBreakChars" VALUE=",+-=&lt;&gt;/?^&amp;*" />
-
-		<!-- Auto indent -->
-		<PROPERTY NAME="indentOpenBrackets" VALUE="{" />
-		<PROPERTY NAME="indentCloseBrackets" VALUE="}" />
-		<PROPERTY NAME="unalignedOpenBrackets" VALUE="(" />
-		<PROPERTY NAME="unalignedCloseBrackets" VALUE=")" />
-		<PROPERTY NAME="indentNextLine"
-			VALUE="\s*(((if|while)\s*\(|else\s*|else\s+if\s*\(|for\s*\(.*\))[^{;]*)" />
-		<PROPERTY NAME="unindentThisLine"
-			VALUE="^.*(default:\s*|case.*:.*)$" />
-		<PROPERTY NAME="electricKeys" VALUE=":" />
-	</PROPS>
-	<RULES IGNORE_CASE="FALSE"
-		HIGHLIGHT_DIGITS="TRUE"
-		DIGIT_RE="(0[lL]?|[1-9]\d{0,9}(\d{0,9}[lL])?|0[xX]\p{XDigit}{1,8}(\p{XDigit}{0,8}[lL])?|0[0-7]{1,11}([0-7]{0,11}[lL])?|([0-9]+\.[0-9]*|\.[0-9]+)([eE][+-]?[0-9]+)?[fFdD]?|[0-9]+([eE][+-]?[0-9]+[fFdD]?|([eE][+-]?[0-9]+)?[fFdD]))">
-
-		<!-- Silly comment -->
-		<SEQ TYPE="COMMENT1">/**/</SEQ>
-
-		<!-- Javadoc comment -->
-		<SPAN TYPE="COMMENT3" DELEGATE="JAVADOC">
-			<BEGIN>/**</BEGIN>
-			<END>*/</END>
-		</SPAN>
-
-		<!-- Java comment (C style) -->
-		<SPAN TYPE="COMMENT1">
-			<BEGIN>/*</BEGIN>
-			<END>*/</END>
-		</SPAN>
-
-		<SPAN TYPE="LITERAL1" DELEGATE="DOUBLEQUOTE_LITERAL" NO_LINE_BREAK="TRUE">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-		<SPAN TYPE="LITERAL3" DELEGATE="SIMPLEQUOTE_LITERAL" NO_LINE_BREAK="TRUE">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-
-		<!-- end of line comment is defined this way rather than using an
-		EOL_SPAN because using an EOL_SPAN causes such comments in jsp
-		files to highlight incorrectly -->
-		<SEQ_REGEXP TYPE="COMMENT2">[/][/](.*?)$</SEQ_REGEXP>
-
-		<SEQ TYPE="OPERATOR">=</SEQ>
-		<SEQ TYPE="OPERATOR">!</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;=</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;=</SEQ>
-		<SEQ TYPE="OPERATOR">+</SEQ>
-		<SEQ TYPE="OPERATOR">-</SEQ>
-		
-		<!-- division operator is defined this way so that the '//' at the
-		start of single line comments within java scriptlets in jsp files 
-		are not parsed as operators. -->
-		<SEQ_REGEXP TYPE="OPERATOR">/(?![/])</SEQ_REGEXP>
-
-		<!-- workaround to stop "*" from being colorized
-		     in import statements. -->
-		<SEQ TYPE="NULL">.*</SEQ>
-
-		<SEQ TYPE="OPERATOR">*</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;</SEQ>
-		<SEQ TYPE="OPERATOR">%</SEQ>
-		<SEQ TYPE="OPERATOR">&amp;</SEQ>
-		<SEQ TYPE="OPERATOR">|</SEQ>
-		<SEQ TYPE="OPERATOR">^</SEQ>
-		<SEQ TYPE="OPERATOR">~</SEQ>
-		<SEQ TYPE="OPERATOR">}</SEQ>
-		<SEQ TYPE="OPERATOR">{</SEQ>
-		<MARK_PREVIOUS TYPE="LABEL" MATCH_TYPE="OPERATOR"
-			AT_WHITESPACE_END="TRUE">:</MARK_PREVIOUS>
-
-		<!-- Function calls -->
-		<MARK_PREVIOUS TYPE="FUNCTION" MATCH_TYPE="OPERATOR">(</MARK_PREVIOUS>
-		<SEQ TYPE="OPERATOR">)</SEQ>
-
-		<!-- Annotation types -->
-		<MARK_FOLLOWING TYPE="KEYWORD4">@</MARK_FOLLOWING>
-
-		<KEYWORDS>
-			<!--{{{ modifiers -->
-			<KEYWORD1>assert</KEYWORD1>
-			<KEYWORD1>break</KEYWORD1>
-			<KEYWORD1>case</KEYWORD1>
-			<KEYWORD1>catch</KEYWORD1>
-			<KEYWORD1>continue</KEYWORD1>
-			<KEYWORD1>default</KEYWORD1>
-			<KEYWORD1>do</KEYWORD1>
-			<KEYWORD1>else</KEYWORD1>
-			<KEYWORD1>finally</KEYWORD1>
-			<KEYWORD1>for</KEYWORD1>
-			<KEYWORD1>if</KEYWORD1>
-			<KEYWORD1>instanceof</KEYWORD1>
-			<KEYWORD1>new</KEYWORD1>
-			<KEYWORD1>return</KEYWORD1>
-			<KEYWORD1>strictfp</KEYWORD1>
-			<KEYWORD1>switch</KEYWORD1>
-			<KEYWORD1>throw</KEYWORD1>
-			<KEYWORD1>try</KEYWORD1>
-			<KEYWORD1>while</KEYWORD1>
-			<!--}}}-->
-
-			<!--{{{ structure keywords -->
-			<KEYWORD2>final</KEYWORD2>
-			<KEYWORD2>implements</KEYWORD2>
-			<KEYWORD2>native</KEYWORD2>
-			<KEYWORD2>private</KEYWORD2>
-			<KEYWORD2>protected</KEYWORD2>
-			<KEYWORD2>public</KEYWORD2>
-			<KEYWORD2>static</KEYWORD2>
-			<KEYWORD2>synchronized</KEYWORD2>
-			<KEYWORD2>throws</KEYWORD2>
-			<KEYWORD2>transient</KEYWORD2>
-			<KEYWORD2>volatile</KEYWORD2>
-			<KEYWORD2>abstract</KEYWORD2>
-			<KEYWORD2>extends</KEYWORD2>
-			<KEYWORD2>import</KEYWORD2> 
-			<KEYWORD2>package</KEYWORD2>
-			<KEYWORD2>enum</KEYWORD2>
-			<KEYWORD3>void</KEYWORD3>
-			<!--}}}-->
-
-			<!--{{{ types -->
-			<KEYWORD3>boolean</KEYWORD3>
-			<KEYWORD3>byte</KEYWORD3>
-			<KEYWORD3>char</KEYWORD3>
-			<KEYWORD3>class</KEYWORD3>
-			<KEYWORD3>double</KEYWORD3>
-			<KEYWORD3>float</KEYWORD3>
-			<KEYWORD3>int</KEYWORD3>
-			<KEYWORD3>interface</KEYWORD3>
-			<KEYWORD3>long</KEYWORD3>
-			<KEYWORD3>short</KEYWORD3>
-			<!--}}}-->
-
-			<!--{{{ literals -->
-			<LITERAL2>false</LITERAL2>
-			<LITERAL2>null</LITERAL2>
-			<LITERAL2>super</LITERAL2>
-			<LITERAL2>this</LITERAL2>
-			<LITERAL2>true</LITERAL2>
-			<!--}}}-->
-
-			<INVALID>goto</INVALID>
-			<INVALID>const</INVALID>
-		</KEYWORDS>
-	</RULES>
-
-	<!--{{{ DOUBLEQUOTE_LITERAL rule -->
-	<RULES SET="DOUBLEQUOTE_LITERAL" DEFAULT="LITERAL1" IGNORE_CASE="TRUE">
-		<SEQ TYPE="LITERAL4">\\</SEQ>
-		<SEQ TYPE="LITERAL4">\"</SEQ>
-		<SEQ TYPE="LITERAL4">\n</SEQ>
-		<SEQ TYPE="LITERAL4">\r</SEQ>
-		<SEQ TYPE="LITERAL4">\t</SEQ>
-		<SEQ_REGEXP HASH_CHAR="\u" TYPE="LITERAL4">\\u[a-f\d]{4}</SEQ_REGEXP>
-	</RULES> <!--}}}-->
-	
-	<!--{{{ SIMPLEUOTE_LITERAL rule -->
-	<RULES SET="SIMPLEQUOTE_LITERAL" DEFAULT="LITERAL3" IGNORE_CASE="TRUE">
-		<SEQ TYPE="LITERAL4">\\</SEQ>
-		<SEQ TYPE="LITERAL4">\'</SEQ>
-		<SEQ TYPE="LITERAL4">\n</SEQ>
-		<SEQ TYPE="LITERAL4">\r</SEQ>
-		<SEQ TYPE="LITERAL4">\t</SEQ>
-		<SEQ_REGEXP HASH_CHAR="\u" TYPE="LITERAL4">\\u[a-f\d]{4}</SEQ_REGEXP>
-	</RULES> <!--}}}-->
-
-	<!--{{{ JAVADOC rules -->
-	<RULES SET="JAVADOC" DEFAULT="COMMENT3" IGNORE_CASE="TRUE">
-
-		<!-- so that *@param is highlighted -->
-		<SEQ TYPE="COMMENT3">*</SEQ>
-
-		<!-- Javadoc ignores tags inside <pre> -->
-		<!-- XXX no it doesn't -->
-		<!-- SPAN TYPE="MARKUP" DELEGATE="JAVADOC_PRE">
-			<BEGIN>&lt;pre&gt;</BEGIN>
-			<END>&lt;/pre&gt;</END>
-		</SPAN -->
-
-		<!-- HTML comments -->
-		<SPAN TYPE="COMMENT1">
-			<BEGIN>&lt;!--</BEGIN>
-			<END>--&gt;</END>
-		</SPAN>
-
-		<!-- Javadoc allows this -->
-		<SEQ TYPE="COMMENT3">&lt;&lt;</SEQ>
-		<SEQ TYPE="COMMENT3">&lt;=</SEQ>
-		<SEQ TYPE="COMMENT3">&lt; </SEQ>
-
-		<!-- strings in quotes -->
-		<SPAN TYPE="LITERAL1" ESCAPE="\" NO_LINE_BREAK="TRUE">
-		<BEGIN>&quot;</BEGIN>
-		<END>&quot;</END>
-		</SPAN>
-
-		<!-- HTML tags -->
-		<SPAN TYPE="MARKUP" DELEGATE="xml::TAGS"
-			NO_LINE_BREAK="TRUE">
-			<BEGIN>&lt;</BEGIN>
-			<END>&gt;</END>
-		</SPAN>
-
-		<!-- so that @link{...} is highlighted -->
-		<!-- XXX: this is wrong, {@link ..} is correct, see below -->
-		<!--<SEQ TYPE="COMMENT3">{</SEQ>-->
-
-		<SPAN_REGEXP TYPE="LABEL" HASH_CHAR="{@" NO_WORD_BREAK="FALSE" DELEGATE="JAVADOC_PARAM">
-			<BEGIN>\{@(link|linkplain|docRoot|code|literal)\s</BEGIN>
-			<END>}</END>
-		</SPAN_REGEXP>
-
-		<!-- for the common usage of the cvs keyword $Id: java.xml 20772 2012-01-13 18:54:27Z kog13 $ -->
-		<SPAN_REGEXP TYPE="LABEL" HASH_CHAR="@version" NO_WORD_BREAK="FALSE" DELEGATE="JAVADOC_PARAM">
-			<BEGIN>@version\s+\$</BEGIN>
-			<END>$</END>
-		</SPAN_REGEXP>
-
-		<!-- This works only when you use the same whitespace before and after the param's name,
-			 eg. a tab before and after, but mixing space and tab won't work.
-			 The reason is that you can't enter a regexp in END, except for the backreference operator $n -->
-		<SPAN_REGEXP TYPE="LABEL" HASH_CHAR="@" NO_WORD_BREAK="FALSE" DELEGATE="JAVADOC_PARAM">
-			<BEGIN>@(?:param|throws|exception|serialField)(\s)</BEGIN>
-			<END>$1</END>
-		</SPAN_REGEXP>
-
-		<KEYWORDS>
-		<!-- Note: the labels in comments are handled by SPANs above -->
-
-		<!-- Official javadoc tags:
-			 http://download.oracle.com/javase/6/docs/technotes/tools/windows/javadoc.html#javadoctags -->
-			<LABEL>@author</LABEL>
-			<LABEL>@deprecated</LABEL>
-		<!--<LABEL>@docRoot</LABEL>-->
-		<!--<LABEL>@exception</LABEL>-->
-			<LABEL>{@inheritDoc}</LABEL>
-		<!--<LABEL>@link</LABEL>-->
-		<!--<LABEL>@linkplain</LABEL>-->
-		<!--<LABEL>@param</LABEL>-->
-			<LABEL>@return</LABEL>
-			<LABEL>@see</LABEL>
-			<LABEL>@serial</LABEL>
-			<LABEL>@serialData</LABEL>
-		<!--<LABEL>@serialField</LABEL>-->
-			<LABEL>@since</LABEL>
-		<!--<LABEL>@throws</LABEL>-->
-			<LABEL>{@value}</LABEL>
-			<LABEL>@version</LABEL>
-
-		<!-- new in 1.5 -->
-		<!--<LABEL>@code</LABEL>-->
-		<!--<LABEL>@literal</LABEL>-->
-
-		<!-- SUNs proposed tags:
-			 http://java.sun.com/j2se/javadoc/proposed-tags.html -->
-			<KEYWORD2>@category</KEYWORD2>
-			<KEYWORD2>@example</KEYWORD2>
-			<KEYWORD2>@exclude</KEYWORD2>
-			<KEYWORD2>@index</KEYWORD2>
-			<KEYWORD2>@internal</KEYWORD2>
-			<KEYWORD2>@obsolete</KEYWORD2>
-			<KEYWORD2>@threadsafety</KEYWORD2>
-			<KEYWORD2>@tutorial</KEYWORD2>
-			<KEYWORD2>@todo</KEYWORD2>
-
-		<!-- Custom tags -->
-			<KEYWORD4>@access</KEYWORD4>
-			<KEYWORD4>@beaninfo</KEYWORD4>
-			<KEYWORD4>@bon</KEYWORD4>
-			<KEYWORD4>@bug</KEYWORD4>
-			<KEYWORD4>@complexity</KEYWORD4>
-			<KEYWORD4>@design</KEYWORD4>
-			<KEYWORD4>@ensures</KEYWORD4>
-			<KEYWORD4>@equivalent</KEYWORD4>
-			<KEYWORD4>@generates</KEYWORD4>
-			<KEYWORD4>@guard</KEYWORD4>
-			<KEYWORD4>@hides</KEYWORD4>
-			<KEYWORD4>@history</KEYWORD4>
-			<KEYWORD4>@idea</KEYWORD4>
-			<KEYWORD4>@invariant</KEYWORD4>
-			<KEYWORD4>@modifies</KEYWORD4>
-			<KEYWORD4>@overrides</KEYWORD4>
-			<KEYWORD4>@post</KEYWORD4>
-			<KEYWORD4>@pre</KEYWORD4>
-			<KEYWORD4>@references</KEYWORD4>
-			<KEYWORD4>@requires</KEYWORD4>
-			<KEYWORD4>@review</KEYWORD4>
-			<KEYWORD4>@spec</KEYWORD4>
-			<KEYWORD4>@uses</KEYWORD4>
-			<KEYWORD4>@values</KEYWORD4>
-		</KEYWORDS>
-	</RULES> <!--}}}-->
-
-
-	<!-- just a dummy which makes use of the default token type COMMENT4 for highlighting the word after @param in javadoc -->
-	<RULES SET="JAVADOC_PARAM" DEFAULT="COMMENT4" IGNORE_CASE="TRUE" />
-</MODE>
diff --git a/qpython/src/main/assets/syntax/javacc.xml b/qpython/src/main/assets/syntax/javacc.xml
deleted file mode 100644
index 966ca02e..00000000
--- a/qpython/src/main/assets/syntax/javacc.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-<MODE>
-    <PROPS>
-        <PROPERTY NAME="commentStart" VALUE="/*" />
-        <PROPERTY NAME="commentEnd" VALUE="*/" />
-        <PROPERTY NAME="lineComment" VALUE="//" />
-        <PROPERTY NAME="wordBreakChars" VALUE=",+-=&lt;&gt;/?^&amp;*" />
-
-        <!-- Auto indent -->
-        <PROPERTY NAME="indentOpenBrackets" VALUE="{" />
-        <PROPERTY NAME="indentCloseBrackets" VALUE="}" />
-        <PROPERTY NAME="unalignedOpenBrackets" VALUE="(" />
-        <PROPERTY NAME="unalignedCloseBrackets" VALUE=")" />
-        <PROPERTY NAME="indentNextLine"
-            VALUE="\s*(((if|while)\s*\(|else\s+|else$|else\s+if\s*\(|for\s*\(.*\))[^{;]*)" />
-        <PROPERTY NAME="unindentThisLine"
-            VALUE="^.*(default:\s*|case.*:.*)$" />
-        <PROPERTY NAME="electricKeys" VALUE=":" />
-    </PROPS>
-    <RULES IGNORE_CASE="FALSE">
-        <IMPORT DELEGATE="java::MAIN"/>
-
-        <!-- regular expression definitions -->
-        <SEQ_REGEXP HASH_CHAR="&lt;" TYPE="KEYWORD2">&lt;[[:space:]]*\w+[[:space:]]*[:]</SEQ_REGEXP>
-
-        <!-- regular expression label(s) -->
-        <SEQ_REGEXP HASH_CHAR="&lt;" TYPE="KEYWORD2">&lt;[[:space:]]*\w+([[:space:]]*[,][[:space:]]*\w+[[:space:]]*)*[[:space:]]*&gt;</SEQ_REGEXP>
-
-        <!-- private regular expression labels -->
-        <SEQ_REGEXP HASH_CHAR="#" TYPE="KEYWORD2">[#]\w+[:]</SEQ_REGEXP>
-
-        <KEYWORDS>
-            <!-- javacc keywords -->
-            <KEYWORD1>EOF</KEYWORD1>
-            <KEYWORD1>IGNORE_CASE</KEYWORD1>
-            <KEYWORD1>JAVACODE</KEYWORD1>
-            <KEYWORD1>LOOKAHEAD</KEYWORD1>
-            <KEYWORD1>MORE</KEYWORD1>
-            <KEYWORD1>PARSER_BEGIN</KEYWORD1>
-            <KEYWORD1>PARSER_END</KEYWORD1>
-            <KEYWORD1>SKIP</KEYWORD1>
-            <KEYWORD1>SPECIAL_TOKEN</KEYWORD1>
-            <KEYWORD1>TOKEN</KEYWORD1>
-            <KEYWORD1>TOKEN_MGR_DECLS</KEYWORD1>
-            <KEYWORD1>options</KEYWORD1>
-        
-            <!-- javacc option keywords -->
-            <KEYWORD1>CHOICE_AMBIGUITY_CHECK</KEYWORD1>
-            <KEYWORD1>OTHER_AMBIGUITY_CHECK</KEYWORD1>
-            <KEYWORD1>STATIC</KEYWORD1>
-            <KEYWORD1>SUPPORT_CLASS_VISIBILITY_PUBLIC</KEYWORD1>
-            <KEYWORD1>DEBUG_PARSER</KEYWORD1>
-            <KEYWORD1>DEBUG_LOOKAHEAD</KEYWORD1>
-            <KEYWORD1>DEBUG_TOKEN_MANAGER</KEYWORD1>
-            <KEYWORD1>ERROR_REPORTING</KEYWORD1>
-            <KEYWORD1>JAVA_UNICODE_ESCAPE</KEYWORD1>
-            <KEYWORD1>UNICODE_INPUT</KEYWORD1>
-            <KEYWORD1>IGNORE_CASE</KEYWORD1>
-            <KEYWORD1>USER_TOKEN_MANAGER</KEYWORD1>
-            <KEYWORD1>USER_CHAR_STREAM</KEYWORD1>
-            <KEYWORD1>BUILD_PARSER</KEYWORD1>
-            <KEYWORD1>BUILD_TOKEN_MANAGER</KEYWORD1>
-            <KEYWORD1>TOKEN_EXTENDS</KEYWORD1>
-            <KEYWORD1>TOKEN_FACTORY</KEYWORD1>
-            <KEYWORD1>TOKEN_MANAGER_USES_PARSER</KEYWORD1>
-            <KEYWORD1>SANITY_CHECK</KEYWORD1>
-            <KEYWORD1>FORCE_LA_CHECK</KEYWORD1>
-            <KEYWORD1>COMMON_TOKEN_ACTION</KEYWORD1>
-            <KEYWORD1>CACHE_TOKENS</KEYWORD1>
-            <KEYWORD1>OUTPUT_DIRECTORY</KEYWORD1>
-
-            <!-- jjtree keywords -->
-            <KEYWORD1>BUILD_NODE_FILES</KEYWORD1>
-            <KEYWORD1>MULTI</KEYWORD1>
-            <KEYWORD1>NODE_DEFAULT_VOID</KEYWORD1>
-            <KEYWORD1>NODE_CLASS</KEYWORD1>
-            <KEYWORD1>NODE_FACTORY</KEYWORD1>
-            <KEYWORD1>NODE_PACKAGE</KEYWORD1>
-            <KEYWORD1>NODE_EXTENDS</KEYWORD1>
-            <KEYWORD1>NODE_PREFIX</KEYWORD1>
-            <KEYWORD1>NODE_SCOPE_HOOK</KEYWORD1>
-            <KEYWORD1>NODE_USES_PARSER</KEYWORD1>
-            <KEYWORD1>TRACK_TOKENS</KEYWORD1>
-            <KEYWORD1>STATIC</KEYWORD1>
-            <KEYWORD1>VISITOR</KEYWORD1>
-            <KEYWORD1>VISITOR_DATA_TYPE</KEYWORD1>
-            <KEYWORD1>VISITOR_RETURN_TYPE</KEYWORD1>
-            <KEYWORD1>VISITOR_EXCEPTION</KEYWORD1>
-            <KEYWORD1>JJTREE_OUTPUT_DIRECTORY</KEYWORD1>
-        
-            <!-- DEFAULT is the standard lexical state -->
-            <KEYWORD2>DEFAULT</KEYWORD2>
-        </KEYWORDS>
-
-    </RULES>
-</MODE>
-
diff --git a/qpython/src/main/assets/syntax/javafx.xml b/qpython/src/main/assets/syntax/javafx.xml
deleted file mode 100644
index bba69629..00000000
--- a/qpython/src/main/assets/syntax/javafx.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="indentOpenBrackets" VALUE="{" />
-		<PROPERTY NAME="indentCloseBrackets" VALUE="}" />
-	</PROPS>
-
-	<RULES IGNORE_CASE="FALSE"
-		HIGHLIGHT_DIGITS="TRUE"
-		DIGIT_RE="(0[lL]?|[1-9]\d{0,9}(\d{0,9}[lL])?|0[xX]\p{XDigit}{1,8}(\p{XDigit}{0,8}[lL])?|0[0-7]{1,11}([0-7]{0,11}[lL])?|([0-9]+\.[0-9]*|\.[0-9]+)([eE][+-]?[0-9]+)?[fFdD]?|[0-9]+([eE][+-]?[0-9]+[fFdD]?|([eE][+-]?[0-9]+)?[fFdD]))">
-		<!--{{{ Javadoc comment -->
-		<SPAN TYPE="COMMENT3" DELEGATE="java::JAVADOC">
-			<BEGIN>/**</BEGIN>
-			<END>*/</END>
-		</SPAN>
-		<!--}}}-->
-
-		<!-- {{{ Java comment (C style) -->
-		<SPAN TYPE="COMMENT1">
-			<BEGIN>/*</BEGIN>
-			<END>*/</END>
-		</SPAN>
-		<!--}}}-->
-		
-		<!--{{{ literal -->
-		<SPAN TYPE="LITERAL1" ESCAPE="\" NO_LINE_BREAK="TRUE">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-		<!--}}}-->
-
-		<SEQ TYPE="OPERATOR">=</SEQ>
-		<SEQ TYPE="OPERATOR">!</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;=</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;=</SEQ>
-		<SEQ TYPE="OPERATOR">+</SEQ>
-		<SEQ TYPE="OPERATOR">-</SEQ>
-		<SEQ TYPE="OPERATOR">/</SEQ>
-
-		<!-- workaround to stop "*" from being colorized
-		     in import statements. -->
-		<SEQ TYPE="NULL">.*</SEQ>
-
-		<SEQ TYPE="OPERATOR">*</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;</SEQ>
-		<SEQ TYPE="OPERATOR">%</SEQ>
-		<SEQ TYPE="OPERATOR">&amp;</SEQ>
-		<SEQ TYPE="OPERATOR">|</SEQ>
-		<SEQ TYPE="OPERATOR">^</SEQ>
-		<SEQ TYPE="OPERATOR">~</SEQ>
-		<SEQ TYPE="OPERATOR">}</SEQ>
-		<SEQ TYPE="OPERATOR">{</SEQ>
-		<MARK_PREVIOUS TYPE="LABEL" MATCH_TYPE="OPERATOR"
-			AT_WHITESPACE_END="TRUE">:</MARK_PREVIOUS>
-		
-		<KEYWORDS>
-			<KEYWORD1>and</KEYWORD1>
-			<KEYWORD1>if</KEYWORD1>
-			<KEYWORD1>else</KEYWORD1>
-			<KEYWORD1>extends</KEYWORD1>
-			<KEYWORD1>function</KEYWORD1>
-			<KEYWORD1>not</KEYWORD1>
-			<KEYWORD1>or</KEYWORD1>
-			<KEYWORD1>override</KEYWORD1>
-			<KEYWORD1>protected</KEYWORD1>
-			<KEYWORD1>public-init</KEYWORD1>
-			<KEYWORD1>public</KEYWORD1>
-			<KEYWORD1>return</KEYWORD1>
-		
-			<KEYWORD2>as</KEYWORD2>
-			<KEYWORD2>bind</KEYWORD2>
-			<KEYWORD2>def</KEYWORD2>
-			<KEYWORD2>import</KEYWORD2>
-			<KEYWORD2>package</KEYWORD2>
-			<KEYWORD2>var</KEYWORD2>
-			<KEYWORD2>var</KEYWORD2>
-			
-			<KEYWORD3>class</KEYWORD3>
-			
-			<LITERAL2>false</LITERAL2>
-			<LITERAL2>null</LITERAL2>
-			<LITERAL2>this</LITERAL2>
-			<LITERAL2>true</LITERAL2>
-		</KEYWORDS>
-	</RULES>
-</MODE>
-
diff --git a/qpython/src/main/assets/syntax/jcl.xml b/qpython/src/main/assets/syntax/jcl.xml
deleted file mode 100644
index c1bbede8..00000000
--- a/qpython/src/main/assets/syntax/jcl.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-<!--  
-      JCL edit mode by Bill McMilleon (bill@mcmilleon.com)
-      March 19, 2003
-
-      Suggested catalog file entry:
-
-      <MODE NAME="JCL"		FILE="JCL.xml"
-				FILE_NAME_GLOB="*.{jcl}" />
-
--->
- 
- 
-<MODE>
-
-    <PROPS>
-        <PROPERTY NAME="wordBreakChars" VALUE=",+-=&lt;&gt;/?^&amp;*" />
-    </PROPS>
-
-    
-    <RULES IGNORE_CASE="TRUE" HIGHLIGHT_DIGITS="FALSE">
-
-<!-- In fixed form, column 72 is the last column parsed, unless the
-\extend_source option is invoked -->
-    <!-- TERMINATE AT_CHAR="72" / -->
-
-
-    <EOL_SPAN AT_LINE_START="TRUE" TYPE="COMMENT1">//*</EOL_SPAN>
-
-		<SPAN TYPE="LITERAL1" NO_LINE_BREAK="FALSE">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-
-<!-- Highlighted Operators -->
-<SEQ TYPE="OPERATOR">=</SEQ>
-<SEQ TYPE="OPERATOR">&lt;</SEQ>
-<SEQ TYPE="OPERATOR">&gt;</SEQ>
-<SEQ TYPE="OPERATOR">&amp;</SEQ>
-<SEQ TYPE="OPERATOR">|</SEQ>
-<SEQ TYPE="OPERATOR">,</SEQ>
-
-<KEYWORDS>
-  <KEYWORD2>COMMAND</KEYWORD2>
-  <KEYWORD2>CNTL</KEYWORD2>
-  <KEYWORD2>DD</KEYWORD2>
-  <KEYWORD2>ENCNTL</KEYWORD2>
-  <KEYWORD2>EXEC</KEYWORD2>
-  <KEYWORD2>IF</KEYWORD2>
-  <KEYWORD2>THEN</KEYWORD2>
-  <KEYWORD2>ELSE</KEYWORD2>
-  <KEYWORD2>ENDIF</KEYWORD2>
-  <KEYWORD2>INCLUDE</KEYWORD2>
-  <KEYWORD2>JCLIB</KEYWORD2>
-  <KEYWORD2>JOB</KEYWORD2>
-  <KEYWORD2>MSG</KEYWORD2>
-  <KEYWORD2>OUTPUT</KEYWORD2>
-  <KEYWORD2>PEND</KEYWORD2>
-  <KEYWORD2>PROC</KEYWORD2>
-  <KEYWORD2>SET</KEYWORD2>
-  <KEYWORD2>XMIT</KEYWORD2>
-</KEYWORDS>
-
-    </RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/jflex.xml b/qpython/src/main/assets/syntax/jflex.xml
deleted file mode 100644
index d9e9897c..00000000
--- a/qpython/src/main/assets/syntax/jflex.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-<MODE>
-    <PROPS>
-        <PROPERTY NAME="commentStart" VALUE="/*" />
-        <PROPERTY NAME="commentEnd" VALUE="*/" />
-        <PROPERTY NAME="lineComment" VALUE="//" />
-        <PROPERTY NAME="wordBreakChars" VALUE=",+-=&lt;&gt;/?^&amp;*" />
-
-        <!-- Auto indent -->
-        <PROPERTY NAME="indentOpenBrackets" VALUE="{" />
-        <PROPERTY NAME="indentCloseBrackets" VALUE="}" />
-        <PROPERTY NAME="unalignedOpenBrackets" VALUE="(" />
-        <PROPERTY NAME="unalignedCloseBrackets" VALUE=")" />
-        <PROPERTY NAME="indentNextLine"
-            VALUE="\s*(((if|while)\s*\(|else\s*|else\s+if\s*\(|for\s*\(.*\))[^{;]*)" />
-        <PROPERTY NAME="unindentThisLine"
-            VALUE="^.*(default:\s*|case.*:.*)$" />
-        <PROPERTY NAME="electricKeys" VALUE=":" />
-    </PROPS>
-    <RULES IGNORE_CASE="FALSE">
-	<IMPORT DELEGATE="java::MAIN"/>
-	<SEQ TYPE="OPERATOR">%%</SEQ>
-	<SEQ TYPE="KEYWORD1">%class</SEQ>
-	<SEQ TYPE="KEYWORD1">%class</SEQ>
-	<SEQ TYPE="KEYWORD1">%implements</SEQ>
-	<SEQ TYPE="KEYWORD1">%extends</SEQ>
-	
-	<SEQ TYPE="KEYWORD1">%public</SEQ>
-	<SEQ TYPE="KEYWORD1">%abstract</SEQ>
-	<SEQ TYPE="KEYWORD1">%final</SEQ>
-	<SEQ TYPE="KEYWORD1">%apiprivate</SEQ>
-	
-	<SEQ TYPE="KEYWORD1">%unicode</SEQ>
-	<SEQ TYPE="KEYWORD1">%line</SEQ>
-	<SEQ TYPE="KEYWORD1">%char</SEQ>
-	<SEQ TYPE="KEYWORD1">%cup</SEQ>
-	<SEQ TYPE="KEYWORD1">%column</SEQ>
-	<SEQ TYPE="KEYWORD1">%standalone</SEQ>
-	<SEQ TYPE="KEYWORD1">ignorecase</SEQ>
-	<SEQ TYPE="KEYWORD1">%type</SEQ>
-	<SEQ TYPE="KEYWORD1">%debug</SEQ>
-	<SEQ TYPE="OPERATOR">%%</SEQ>
-
-	<SEQ_REGEXP HASH_CHAR="&lt;" TYPE="KEYWORD2">&lt;\w+&gt;</SEQ_REGEXP>
-    </RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/jhtml.xml b/qpython/src/main/assets/syntax/jhtml.xml
deleted file mode 100644
index 72d03bb7..00000000
--- a/qpython/src/main/assets/syntax/jhtml.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!--
-  JHTML mode by Will Sargent <wsargent@atg.com>
--->
-
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="commentStart" VALUE="&lt;!--" />
-		<PROPERTY NAME="commentEnd" VALUE="--&gt;" />
-				<!-- Indent droplets and oparams -->
-				<PROPERTY NAME="indentNextLines"
-				 VALUE="\s*(&lt;\s*(droplet|oparam))\s+.*" />
-				<!-- Sadly, there doesn't seem to be a way to
-					 undent when we see a /oparam> tag... -->
-	</PROPS>
-	<RULES IGNORE_CASE="TRUE">
-				<!-- Allow for Dynamo SSI -->
-				<SPAN TYPE="NULL">
-			<BEGIN>&lt;!--#</BEGIN>
-			<END>--&gt;</END>
-				</SPAN>
-
-		<!-- SGML comment -->
-		<SPAN TYPE="COMMENT1">
-			<BEGIN>&lt;!--</BEGIN>
-			<END>--&gt;</END>
-		</SPAN>
-
-		<!-- markup tags -->
-		<SPAN TYPE="MARKUP" DELEGATE="java::MAIN">
-			<BEGIN>`</BEGIN>
-			<END>`</END>
-		</SPAN>
-
-				<!-- Embedded Java -->
-		<SPAN TYPE="MARKUP" DELEGATE="java::MAIN">
-			<BEGIN>&lt;java&gt;</BEGIN>
-			<END>&lt;/java&gt;</END>
-		</SPAN>
-
-				<!-- Don't know how to do this correctly.
-				<SPAN TYPE="MARKUP" DELEGATE="java::MAIN">
-						<BEGIN>&lt;java type=</BEGIN>
-						<END>&lt;/java&gt;</END>
-				</SPAN>
-				-->
-
-		<!-- JavaScript -->
-		<SPAN TYPE="MARKUP" DELEGATE="html::JAVASCRIPT">
-			<BEGIN>&lt;SCRIPT</BEGIN>
-			<END>&lt;/SCRIPT&gt;</END>
-		</SPAN>
-
-		<!-- stylesheet -->
-		<SPAN TYPE="MARKUP" DELEGATE="html::CSS">
-			<BEGIN>&lt;STYLE</BEGIN>
-			<END>&lt;/STYLE&gt;</END>
-		</SPAN>
-
-		<!-- DTD instructions -->
-		<SPAN TYPE="KEYWORD2" DELEGATE="xml::DTD-TAGS">
-			<BEGIN>&lt;!</BEGIN>
-			<END>&gt;</END>
-		</SPAN>
-
-				<!-- All markup defaults to JHTML. -->
-		<SPAN TYPE="MARKUP" DELEGATE="JHTML">
-			<BEGIN>&lt;</BEGIN>
-			<END>&gt;</END>
-		</SPAN>
-
-		<!-- SGML entities -->
-		<SPAN TYPE="LITERAL2" NO_WORD_BREAK="TRUE">
-			<BEGIN>&amp;</BEGIN>
-			<END>;</END>
-		</SPAN>
-	</RULES>
-
-	<RULES SET="JHTML" DEFAULT="MARKUP">
-		<!-- SGML comment -->
-		<SPAN TYPE="COMMENT1">
-			<BEGIN>&lt;!--</BEGIN>
-			<END>--&gt;</END>
-		</SPAN>
-
-		<SPAN TYPE="LITERAL1" DELEGATE="ATTRVALUE">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-
-		<SPAN TYPE="LITERAL1" DELEGATE="ATTRVALUE">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-
-		<SEQ TYPE="MARKUP">/</SEQ>
-
-		<KEYWORDS>
-			<KEYWORD1>importbean</KEYWORD1>
-			<KEYWORD1>droplet</KEYWORD1>
-			<KEYWORD1>param</KEYWORD1>
-			<KEYWORD1>oparam</KEYWORD1>
-			<KEYWORD1>valueof</KEYWORD1>
-			<KEYWORD1>setvalue</KEYWORD1>
-			<KEYWORD1>servlet</KEYWORD1>
-			<KEYWORD2>bean</KEYWORD2>
-			<KEYWORD2>submitvalue</KEYWORD2>
-			<KEYWORD2>declareparam</KEYWORD2>
-			<KEYWORD2>synchronized</KEYWORD2>
-			<KEYWORD2>priority</KEYWORD2>
-
-			<!-- standard converters -->
-			<KEYWORD2>converter</KEYWORD2>
-			<KEYWORD2>date</KEYWORD2>
-			<KEYWORD2>number</KEYWORD2>
-			<KEYWORD2>required</KEYWORD2>
-			<KEYWORD2>nullable</KEYWORD2>
-			<KEYWORD2>currency</KEYWORD2>
-			<KEYWORD2>currencyConversion</KEYWORD2>
-			<KEYWORD2>euro</KEYWORD2>
-			<KEYWORD2>locale</KEYWORD2>
-			<KEYWORD2>symbol</KEYWORD2>
-
-			<!-- Can't use this because of image src... -->
-			<!-- <KEYWORD2>src</KEYWORD2> -->
-		</KEYWORDS>
-	</RULES>
-
-	<RULES SET="ATTRVALUE" DEFAULT="LITERAL1" HIGHLIGHT_DIGITS="TRUE">
-		<!-- backticks are java -->
-		<SPAN TYPE="MARKUP" DELEGATE="java::MAIN">
-			<BEGIN>`</BEGIN>
-			<END>`</END>
-		</SPAN>
-
-				<!-- Allow param: and bean: properties to be marked up -->
-				<SEQ TYPE="LABEL">param:</SEQ>
-				<SEQ TYPE="LABEL">bean:</SEQ>
-	</RULES>
-
-</MODE>
diff --git a/qpython/src/main/assets/syntax/jmk.xml b/qpython/src/main/assets/syntax/jmk.xml
deleted file mode 100644
index 56c22300..00000000
--- a/qpython/src/main/assets/syntax/jmk.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="lineComment" VALUE="#" />
-		<PROPERTY NAME="indentOpenBrackets" VALUE="{" />
-		<PROPERTY NAME="indentCloseBrackets" VALUE="}" />
-		<PROPERTY NAME="contextInsensitive" VALUE="true" />
-	</PROPS>
-	<RULES IGNORE_CASE="FALSE" HIGHLIGHT_DIGITS="TRUE">
-		<!-- Comment -->
-		<EOL_SPAN TYPE="COMMENT1">#</EOL_SPAN>
-
-		<!-- Literals -->
-		<SPAN TYPE="LITERAL1" ESCAPE="\" NO_LINE_BREAK="TRUE">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-		<SPAN TYPE="LITERAL1" ESCAPE="\" NO_LINE_BREAK="TRUE">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-
-		<!-- Brackets -->
-		<SEQ TYPE="OPERATOR">{</SEQ>
-		<SEQ TYPE="OPERATOR">}</SEQ>
-		<SEQ TYPE="OPERATOR">(</SEQ>
-		<SEQ TYPE="OPERATOR">)</SEQ>
-		<SEQ TYPE="OPERATOR">-</SEQ>
-		<SEQ TYPE="OPERATOR">=</SEQ>
-
-		<KEYWORDS>
-			<KEYWORD1>cat</KEYWORD1>
-			<KEYWORD1>copy</KEYWORD1>
-			<KEYWORD1>create</KEYWORD1>
-			<KEYWORD1>delall</KEYWORD1>
-			<KEYWORD1>delete</KEYWORD1>
-			<KEYWORD1>dirs</KEYWORD1>
-			<KEYWORD1>equal</KEYWORD1>
-			<KEYWORD1>else</KEYWORD1>
-			<KEYWORD1>end</KEYWORD1>
-			<KEYWORD1>exec</KEYWORD1>
-			<KEYWORD1>first</KEYWORD1>
-			<KEYWORD1>forname</KEYWORD1>
-			<KEYWORD1>function</KEYWORD1>
-			<KEYWORD1>getprop</KEYWORD1>
-			<KEYWORD1>glob</KEYWORD1>
-			<KEYWORD1>if</KEYWORD1>
-			<KEYWORD1>join</KEYWORD1>
-			<KEYWORD1>load</KEYWORD1>
-			<KEYWORD1>mkdir</KEYWORD1>
-			<KEYWORD1>mkdirs</KEYWORD1>
-			<KEYWORD1>note</KEYWORD1>
-			<KEYWORD1>patsubst</KEYWORD1>
-			<KEYWORD1>rename</KEYWORD1>
-			<KEYWORD1>rest</KEYWORD1>
-			<KEYWORD1>subst</KEYWORD1>
-			<KEYWORD1>then</KEYWORD1>
-			<KEYWORD2>@</KEYWORD2>
-			<KEYWORD2>?</KEYWORD2>
-			<KEYWORD2>&lt;</KEYWORD2>
-			<KEYWORD2>%</KEYWORD2>
-			<KEYWORD3>include</KEYWORD3>
-		</KEYWORDS>
-	</RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/jsp.xml b/qpython/src/main/assets/syntax/jsp.xml
deleted file mode 100644
index df8a384e..00000000
--- a/qpython/src/main/assets/syntax/jsp.xml
+++ /dev/null
@@ -1,264 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="commentStart" VALUE="&lt;%--" />
-		<PROPERTY NAME="commentEnd" VALUE="--%&gt;" />
-	</PROPS>
-	<RULES IGNORE_CASE="TRUE">
-		<!-- JSP comment -->
-		<SPAN TYPE="COMMENT2">
-			<BEGIN>&lt;%--</BEGIN>
-			<END>--%&gt;</END>
-		</SPAN>
-
-		<!-- JSP directive -->
-		<SPAN TYPE="KEYWORD1" DELEGATE="DIRECTIVES">
-			<BEGIN>&lt;%@</BEGIN>
-			<END>%&gt;</END>
-		</SPAN>
-		<SPAN TYPE="KEYWORD1" DELEGATE="DIRECTIVES">
-			<BEGIN>&lt;jsp:directive&gt;</BEGIN>
-			<END>&lt;/jsp:directive&gt;</END>
-		</SPAN>
-
-		<!-- JSP scriptlet expression -->
-		<SPAN TYPE="KEYWORD1" DELEGATE="java::MAIN">
-			<BEGIN>&lt;%=</BEGIN>
-			<END>%&gt;</END>
-		</SPAN>
-		<SPAN TYPE="KEYWORD1" DELEGATE="java::MAIN">
-			<BEGIN>&lt;jsp:expression&gt;</BEGIN>
-			<END>&lt;/jsp:expression&gt;</END>
-		</SPAN>
-
-		<!-- JSP scriptlet code block -->
-		<SPAN TYPE="KEYWORD1" DELEGATE="java::MAIN">
-			<BEGIN>&lt;%!</BEGIN>
-			<END>%&gt;</END>
-		</SPAN>
-		<SPAN TYPE="KEYWORD1" DELEGATE="java::MAIN">
-			<BEGIN>&lt;jsp:declaration&gt;</BEGIN>
-			<END>&lt;/jsp:declaration&gt;</END>
-		</SPAN>
-
-		<!-- JSP scriptlet -->
-		<SPAN TYPE="KEYWORD1" DELEGATE="JAVA">
-			<BEGIN>&lt;%</BEGIN>
-			<END>%&gt;</END>
-		</SPAN>
-		<SPAN TYPE="KEYWORD1" DELEGATE="java::MAIN">
-			<BEGIN>&lt;jsp:scriptlet&gt;</BEGIN>
-			<END>&lt;/jsp:scriptlet&gt;</END>
-		</SPAN>
-
-		<!-- SGML comment -->
-		<SPAN TYPE="COMMENT1" DELEGATE="COMMENT">
-			<BEGIN>&lt;!--</BEGIN>
-			<END>--&gt;</END>
-		</SPAN>
-
-		<!-- JavaScript -->
-		<SPAN TYPE="MARKUP" DELEGATE="html::JAVASCRIPT">
-			<BEGIN>&lt;SCRIPT</BEGIN>
-			<END>&lt;/SCRIPT&gt;</END>
-		</SPAN>
-
-		<!-- stylesheet -->
-		<SPAN TYPE="MARKUP" DELEGATE="html::CSS">
-			<BEGIN>&lt;STYLE</BEGIN>
-			<END>&lt;/STYLE&gt;</END>
-		</SPAN>
-
-		<!-- DTD instructions -->
-		<SPAN TYPE="KEYWORD2" DELEGATE="xml::DTD-TAGS">
-			<BEGIN>&lt;!</BEGIN>
-			<END>&gt;</END>
-		</SPAN>
-
-		<SPAN TYPE="MARKUP" DELEGATE="TAGS">
-			<BEGIN>&lt;</BEGIN>
-			<END>&gt;</END>
-		</SPAN>
-
-		<!-- SGML entities -->
-		<SPAN TYPE="LITERAL2" NO_WORD_BREAK="TRUE">
-			<BEGIN>&amp;</BEGIN>
-			<END>;</END>
-		</SPAN>
-
-		<SPAN TYPE="KEYWORD2" DELEGATE="EL">
-			<BEGIN>${</BEGIN>
-			<END>}</END>
-		</SPAN>
-
-	</RULES>
-	<RULES SET="COMMENT" DEFAULT="COMMENT1" IGNORE_CASE="TRUE">
-		<!-- JSP comment -->
-		<SPAN TYPE="COMMENT2">
-			<BEGIN>&lt;%--</BEGIN>
-			<END>--%&gt;</END>
-		</SPAN>
-
-		<!-- JSP scriptlet expression -->
-		<SPAN TYPE="KEYWORD1" DELEGATE="java::MAIN">
-			<BEGIN>&lt;%=</BEGIN>
-			<END>%&gt;</END>
-		</SPAN>
-
-		<!-- JSP scriptlet -->
-		<SPAN TYPE="KEYWORD1" DELEGATE="java::MAIN">
-			<BEGIN>&lt;%</BEGIN>
-			<END>%&gt;</END>
-		</SPAN>
-	</RULES>
-	<RULES SET="DIRECTIVES" DEFAULT="MARKUP">
-		<!-- JSP scriptlet expression -->
-		<SPAN TYPE="KEYWORD1" DELEGATE="java::MAIN">
-			<BEGIN>&lt;%=</BEGIN>
-			<END>%&gt;</END>
-		</SPAN>
-
-		<SPAN TYPE="LITERAL1" DELEGATE="ATTRVALUE">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-
-		<SPAN TYPE="LITERAL1" DELEGATE="ATTRVALUE">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-
-		<SEQ TYPE="MARKUP">/</SEQ>
-		<MARK_PREVIOUS TYPE="LABEL" MATCH_TYPE="OPERATOR">:</MARK_PREVIOUS>
-		<SEQ TYPE="OPERATOR">:</SEQ>
-
-		<KEYWORDS>
-			<KEYWORD1>taglib</KEYWORD1>
-			<KEYWORD1>include</KEYWORD1>
-			<KEYWORD1>page</KEYWORD1>
-			<KEYWORD1>tag</KEYWORD1>
-			<KEYWORD1>tagAttribute</KEYWORD1>
-			<KEYWORD1>tagVariable</KEYWORD1>
-
-			<KEYWORD2>language</KEYWORD2>
-			<KEYWORD2>session</KEYWORD2>
-			<KEYWORD2>contentType</KEYWORD2>
-			<KEYWORD2>charset</KEYWORD2>
-			<KEYWORD2>import</KEYWORD2>
-			<KEYWORD2>buffer</KEYWORD2>
-			<KEYWORD2>autoflush</KEYWORD2>
-			<KEYWORD2>isThreadSafe</KEYWORD2>
-			<KEYWORD2>info</KEYWORD2>
-			<KEYWORD2>errorPage</KEYWORD2>
-			<KEYWORD2>isErrorpage</KEYWORD2>
-			<KEYWORD2>extends</KEYWORD2>
-			<KEYWORD2>file</KEYWORD2>
-			<KEYWORD2>uri</KEYWORD2>
-			<KEYWORD2>prefix</KEYWORD2>
-			<KEYWORD2>method</KEYWORD2>
-			<KEYWORD2>name</KEYWORD2>
-			<KEYWORD2>default</KEYWORD2>
-			<KEYWORD2>required</KEYWORD2>
-			<KEYWORD2>rtexprvalue</KEYWORD2>
-			<KEYWORD2>id</KEYWORD2>
-			<KEYWORD2>type</KEYWORD2>
-			<KEYWORD2>scope</KEYWORD2>
-		</KEYWORDS>
-	</RULES>
-
-	<RULES SET="TAGS" DEFAULT="MARKUP">
-		<!-- JSP comment -->
-		<SPAN TYPE="COMMENT2">
-			<BEGIN>&lt;%--</BEGIN>
-			<END>--%&gt;</END>
-		</SPAN>
-
-		<!-- JSP scriptlet expression -->
-		<SPAN TYPE="KEYWORD1" DELEGATE="java::MAIN">
-			<BEGIN>&lt;%=</BEGIN>
-			<END>%&gt;</END>
-		</SPAN>
-
-		<SPAN TYPE="MARKUP" DELEGATE="CSS+JSP">
-			<BEGIN>style='</BEGIN>
-			<END>'</END>
-		</SPAN>
-
-		<SPAN TYPE="MARKUP" DELEGATE="CSS+JSP">
-			<BEGIN>style="</BEGIN>
-			<END>"</END>
-		</SPAN>
-
-		<SPAN TYPE="LITERAL1" DELEGATE="ATTRVALUE">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-
-		<SPAN TYPE="LITERAL1" DELEGATE="ATTRVALUE">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-
-		<SEQ TYPE="MARKUP">/</SEQ>
-		<MARK_FOLLOWING TYPE="FUNCTION" MATCH_TYPE="OPERATOR">:</MARK_FOLLOWING>
-		<SEQ TYPE="OPERATOR">:</SEQ>
-		
-		<IMPORT DELEGATE="html::TAGS"/>
-	</RULES>
-
-
-
-	<RULES SET="CSS+JSP" DEFAULT="LITERAL1">
-		<SPAN TYPE="KEYWORD2" DELEGATE="java::MAIN">
-			<BEGIN>&lt;%=</BEGIN>
-			<END>%&gt;</END>
-		</SPAN>
-		<SPAN TYPE="KEYWORD2" DELEGATE="EL">
-			<BEGIN>${</BEGIN>
-			<END>}</END>
-		</SPAN>
-		<IMPORT DELEGATE="css::MAIN"/>
-	</RULES>
-
-	<RULES SET="ATTRVALUE" DEFAULT="LITERAL1" ESCAPE="\">
-		<!-- JSP scriptlet expression -->
-		<SPAN TYPE="KEYWORD1" DELEGATE="java::MAIN">
-			<BEGIN>&lt;%=</BEGIN>
-			<END>%&gt;</END>
-		</SPAN>
-		<SPAN TYPE="KEYWORD2" DELEGATE="EL">
-			<BEGIN>${</BEGIN>
-			<END>}</END>
-		</SPAN>
-		<SEQ TYPE="LITERAL1" DELEGATE="JAVASCRIPT+JSP">javascript:</SEQ>
-	</RULES>
-
-
-	<RULES SET="JAVASCRIPT+JSP">
-		<!-- JSP scriptlet expression -->
-		<SPAN TYPE="KEYWORD2" DELEGATE="java::MAIN">
-			<BEGIN>&lt;%=</BEGIN>
-			<END>%&gt;</END>
-		</SPAN>
-		<SPAN TYPE="KEYWORD2" DELEGATE="EL">
-			<BEGIN>${</BEGIN>
-			<END>}</END>
-		</SPAN>
-		<IMPORT DELEGATE="javascript::MAIN"/>
-	</RULES>
-
-	<RULES SET="EL" HIGHLIGHT_DIGITS="TRUE" DIGIT_RE="(0[lL]?|[1-9]\d{0,9}(\d{0,9}[lL])?|0[xX]\p{XDigit}{1,8}(\p{XDigit}{0,8}[lL])?|0[0-7]{1,11}([0-7]{0,11}[lL])?|([0-9]+\.[0-9]*|\.[0-9]+)([eE][+-]?[0-9]+)?[fFdD]?|[0-9]+([eE][+-]?[0-9]+[fFdD]?|([eE][+-]?[0-9]+)?[fFdD]))">
-		<MARK_PREVIOUS TYPE="LABEL" MATCH_TYPE="OPERATOR">:</MARK_PREVIOUS>
-		<IMPORT DELEGATE="java::MAIN"/>
-	</RULES>
-	
-	<RULES SET="JAVA">
-		<SEQ_REGEXP TYPE="COMMENT2">[/][/](.*?)(?=[%][&gt;])</SEQ_REGEXP>
-		<IMPORT DELEGATE="java::MAIN"/>
-	</RULES>
-	
-</MODE>
-<!-- :noTabs=false: -->
\ No newline at end of file
diff --git a/qpython/src/main/assets/syntax/kotlin.xml b/qpython/src/main/assets/syntax/kotlin.xml
deleted file mode 100644
index 1f35fe64..00000000
--- a/qpython/src/main/assets/syntax/kotlin.xml
+++ /dev/null
@@ -1,168 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!-- Kotlin mode by Sergey Mashkov aka cy6erGn0m -->
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="commentStart" VALUE="/*" />
-		<PROPERTY NAME="commentEnd" VALUE="*/" />
-		<PROPERTY NAME="lineComment" VALUE="//" />
-		<PROPERTY NAME="wordBreakChars" VALUE=",+-=&lt;&gt;/?^&amp;*" />
-
-		<!-- Auto indent -->
-		<PROPERTY NAME="indentOpenBrackets" VALUE="{[" />
-		<PROPERTY NAME="indentCloseBrackets" VALUE="]}" />
-		<PROPERTY NAME="unalignedOpenBrackets" VALUE="(" />
-		<PROPERTY NAME="unalignedCloseBrackets" VALUE=")" />
-		<PROPERTY NAME="indentNextLine"
-			VALUE="\s*(((if|while)\s*\(|else\s*|else\s+if\s*\(|for\s*\(.*\))[^{;]*)" />
-		<PROPERTY NAME="unindentThisLine"
-			VALUE="^.*(else:\s*|when.*:.*)$" />
-	</PROPS>
-
-	<RULES
-		IGNORE_CASE="FALSE"
-		HIGHLIGHT_DIGITS="TRUE"
-		DIGIT_RE="(0x[\p{XDigit}]+[lL]?|[\p{Digit}]+(e[\p{Digit}]*)?[lLdDfF]?)">
-
-		<SPAN TYPE="COMMENT3">
-			<BEGIN>/**</BEGIN>
-			<END>*/</END>
-		</SPAN>
-
-		<SPAN TYPE="COMMENT1">
-			<BEGIN>/*</BEGIN>
-			<END>*/</END>
-		</SPAN>
-
-		<SPAN TYPE="LITERAL1" NO_LINE_BREAK="TRUE" ESCAPE="\">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-
-		<SPAN TYPE="LITERAL1" NO_LINE_BREAK="TRUE" ESCAPE="\">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-		
-		<SPAN TYPE="LITERAL1" NO_LINE_BREAK="FALSE" ESCAPE="\">
-			<BEGIN>"""</BEGIN>
-			<END>"""</END>
-		</SPAN>
-
-		<MARK_PREVIOUS TYPE="FUNCTION" MATCH_TYPE="OPERATOR">(</MARK_PREVIOUS>
-		<SEQ TYPE="OPERATOR">)</SEQ>
-
-		<SEQ TYPE="COMMENT2">//--&gt;</SEQ>
-		<EOL_SPAN TYPE="COMMENT2">//</EOL_SPAN>
-		<SEQ_REGEXP TYPE="MARKUP" HASH_CHAR="/" AT_WORD_START="TRUE">/[^\p{Blank}]*?/</SEQ_REGEXP>
-
-		<SEQ TYPE="COMMENT1">&lt;!--</SEQ>
-
-		<SEQ TYPE="OPERATOR">-&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">=</SEQ>
-		<SEQ TYPE="OPERATOR">!</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;=</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;=</SEQ>
-		<SEQ TYPE="OPERATOR">+</SEQ>
-		<SEQ TYPE="OPERATOR">-</SEQ>
-		<SEQ TYPE="OPERATOR">/</SEQ>
-		<SEQ TYPE="OPERATOR">*</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;</SEQ>
-		<SEQ TYPE="OPERATOR">%</SEQ>
-		<SEQ TYPE="OPERATOR">&amp;</SEQ>
-		<SEQ TYPE="OPERATOR">|</SEQ>
-		<SEQ TYPE="OPERATOR">^</SEQ>
-		<SEQ TYPE="OPERATOR">~</SEQ>
-		<SEQ TYPE="OPERATOR">.</SEQ>
-		<SEQ TYPE="OPERATOR">}</SEQ>
-		<SEQ TYPE="OPERATOR">{</SEQ>
-		<SEQ TYPE="OPERATOR">,</SEQ>
-		<SEQ TYPE="OPERATOR">;</SEQ>
-		<SEQ TYPE="OPERATOR">]</SEQ>
-		<SEQ TYPE="OPERATOR">::</SEQ>
-		<SEQ TYPE="OPERATOR">[</SEQ>
-		<SEQ TYPE="OPERATOR">?</SEQ>
-		<MARK_PREVIOUS AT_WHITESPACE_END="TRUE"
-			MATCH_TYPE="OPERATOR"
-			TYPE="LABEL">:</MARK_PREVIOUS>
-		<SEQ TYPE="OPERATOR">:</SEQ>
-
-		<KEYWORDS>
-			<KEYWORD1>break</KEYWORD1>
-			<KEYWORD1>continue</KEYWORD1>
-			<KEYWORD1>else</KEYWORD1>
-			<KEYWORD1>for</KEYWORD1>
-			<KEYWORD1>when</KEYWORD1>
-			<KEYWORD1>fun</KEYWORD1>
-			<KEYWORD1>if</KEYWORD1>
-			<KEYWORD1>return</KEYWORD1>
-			<LITERAL2>this</LITERAL2>
-			<KEYWORD1>vararg</KEYWORD1>
-			<KEYWORD1>var</KEYWORD1>
-			<KEYWORD1>val</KEYWORD1>
-			<KEYWORD1>by</KEYWORD1>
-			<KEYWORD1>while</KEYWORD1>
-			<KEYWORD1>class</KEYWORD1>
-			<KEYWORD1>companion</KEYWORD1>
-			<KEYWORD1>trait</KEYWORD1>
-			<KEYWORD1>object</KEYWORD1>
-			<KEYWORD1>abstract</KEYWORD1>
-			<KEYWORD1>override</KEYWORD1>
-			<KEYWORD2>open</KEYWORD2>
-			<KEYWORD2>attribute</KEYWORD2>
-			<KEYWORD2>inline</KEYWORD2>
-			<KEYWORD2>data</KEYWORD2>
-			<KEYWORD2>get</KEYWORD2>
-			<KEYWORD2>set</KEYWORD2>
-			
-			<KEYWORD3>Any</KEYWORD3>
-			<KEYWORD3>Boolean</KEYWORD3>
-			<KEYWORD3>Byte</KEYWORD3>
-			<KEYWORD3>Unit</KEYWORD3>
-			<KEYWORD3>String</KEYWORD3>
-			<KEYWORD3>Int</KEYWORD3>
-			<KEYWORD3>Short</KEYWORD3>
-			<KEYWORD3>Long</KEYWORD3>
-			<KEYWORD3>Double</KEYWORD3>
-			<KEYWORD3>Float</KEYWORD3>
-			<KEYWORD3>Char</KEYWORD3>
-			<KEYWORD3>Array</KEYWORD3>
-			
-			<KEYWORD1>catch</KEYWORD1>
-			<KEYWORD1>finally</KEYWORD1>
-
-			<KEYWORD1>do</KEYWORD1>
-			<KEYWORD1>enum</KEYWORD1>
-			<KEYWORD1>constructor</KEYWORD1>
-			<KEYWORD3>init</KEYWORD3>
-			<KEYWORD1>typealias</KEYWORD1>
-
-			<KEYWORD2>package</KEYWORD2>
-			<KEYWORD2>import</KEYWORD2>
-			<KEYWORD1>is</KEYWORD1>
-			<KEYWORD2>it</KEYWORD2>
-			<KEYWORD1>as</KEYWORD1>
-			<KEYWORD1>public</KEYWORD1>
-			<KEYWORD1>internal</KEYWORD1>
-			<KEYWORD1>protected</KEYWORD1>
-			<KEYWORD1>private</KEYWORD1>
-			<KEYWORD1>inner</KEYWORD1>
-			<KEYWORD1>super</KEYWORD1>
-
-			<KEYWORD1>throw</KEYWORD1>
-			<KEYWORD1>throws</KEYWORD1>
-			<KEYWORD1>transient</KEYWORD1>
-			<KEYWORD1>try</KEYWORD1>
-			<KEYWORD1>volatile</KEYWORD1>
-
-			<LITERAL2>null</LITERAL2>
-			<LITERAL2>false</LITERAL2>
-			<LITERAL2>true</LITERAL2>
-			
-			<KEYWORD1>in</KEYWORD1>
-			<KEYWORD1>out</KEYWORD1>
-		</KEYWORDS>
-	</RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/latex.xml b/qpython/src/main/assets/syntax/latex.xml
deleted file mode 100644
index 467b8d5c..00000000
--- a/qpython/src/main/assets/syntax/latex.xml
+++ /dev/null
@@ -1,245 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!-- jEdit LaTeX mode
-  written by: Michael Schlotter, m.schlotter@bath.ac.uk
-  latex.xml, v1.4.2, 26 November 2009
-  
-  Suggested catalog entry:
-  <MODE NAME="latex" FILE="latex.xml"
-    FILE_NAME_GLOB="*.{tex,ltx,latex,sty,cls}" />
--->
-
-<MODE>
-  <PROPS>
-    <!-- comments, word separators -->
-    <PROPERTY NAME="lineComment" VALUE="%" />
-    <PROPERTY NAME="wordBreakChars" VALUE="" />
-    <PROPERTY NAME="noWordSep" VALUE="\@_-:*&lt;&gt;" />
-    
-    <!-- indenting -->
-     
-    <PROPERTY NAME="deepIndent" VALUE="FALSE" />
-    <PROPERTY NAME="doubleBracketIndent" VALUE="FALSE" />
-    <PROPERTY NAME="lineUpClosingBrackets" VALUE="FALSE" />
-    <!-- Commented out due to # 3432974 
-    <PROPERTY NAME="indentOpenBrackets" VALUE="{[" />
-    <PROPERTY NAME="indentCloseBrackets" VALUE="]}" />
-    <PROPERTY NAME="indentNextLines" VALUE="^.*(\\begin\s*\{.*)$" />
-    <PROPERTY NAME="unindentThisLine" VALUE="^[ \t]*(\\item.*|\\end\s*\{.*)$" />
-    <PROPERTY NAME="unindentNextLines" VALUE="^.*(\\end\s*\{.*)$" />
-    <PROPERTY NAME="electricKeys"
-              VALUE="{abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" />
-    -->
-    <PROPERTY NAME="unalignedOpenBrackets" VALUE="(" />
-    <PROPERTY NAME="unalignedCloseBrackets" VALUE=")" />
-    
-    
-  </PROPS>
-  
-  <!-- default rules -->
-  <RULES
-    IGNORE_CASE="FALSE"
-    NO_WORD_SEP="@_-:*"
-    HIGHLIGHT_DIGITS="FALSE">
-    
-    <!-- \verb|sometext|; any delimeter except * can be used -->
-    <SPAN_REGEXP TYPE="KEYWORD2" DELEGATE="VerbatimRules"
-        HASH_CHAR="\" NO_LINE_BREAK="TRUE">
-      <BEGIN>.verb[\*]?([\p{Punct}&amp;&amp;[^*]])</BEGIN>
-      <END>$1</END>
-    </SPAN_REGEXP>
-    
-    <!-- verbatim environments -->
-    <SPAN TYPE="KEYWORD1" DELEGATE="VerbatimRules">
-      <BEGIN>\begin{verbatim*}</BEGIN><END>\end{verbatim*}</END>
-    </SPAN>
-    <SPAN TYPE="KEYWORD1" DELEGATE="VerbatimRules">
-      <BEGIN>\begin{verbatim}</BEGIN><END>\end{verbatim}</END>
-    </SPAN>
-    
-    <!-- mathematical environments, including AMS definitions -->
-    <SPAN TYPE="KEYWORD1" DELEGATE="MathRules">
-      <BEGIN>$$</BEGIN><END>$$</END>
-    </SPAN>
-    <SPAN TYPE="KEYWORD1" DELEGATE="MathRules">
-      <BEGIN>$</BEGIN><END>$</END>
-    </SPAN>
-    <SPAN TYPE="KEYWORD1" DELEGATE="MathRules">
-      <BEGIN>\(</BEGIN><END>\)</END>
-    </SPAN>
-    <SPAN TYPE="KEYWORD1" DELEGATE="MathRules">
-      <BEGIN>\[</BEGIN><END>\]</END>
-    </SPAN>
-    <SPAN TYPE="KEYWORD1" DELEGATE="MathRules">
-      <BEGIN>\begin{math}</BEGIN><END>\end{math}</END>
-    </SPAN>
-    <SPAN TYPE="KEYWORD1" DELEGATE="MathRules">
-      <BEGIN>\begin{displaymath}</BEGIN><END>\end{displaymath}</END>
-    </SPAN>
-    <SPAN TYPE="KEYWORD1" DELEGATE="MathRules">
-      <BEGIN>\begin{equation*}</BEGIN><END>\end{equation*}</END>
-    </SPAN>
-    <SPAN TYPE="KEYWORD1" DELEGATE="MathRules">
-      <BEGIN>\begin{equation}</BEGIN><END>\end{equation}</END>
-    </SPAN>
-    <SPAN TYPE="KEYWORD1" DELEGATE="MathRules">
-      <BEGIN>\begin{eqnarray*}</BEGIN><END>\end{eqnarray*}</END>
-    </SPAN>
-    <SPAN TYPE="KEYWORD1" DELEGATE="MathRules">
-      <BEGIN>\begin{eqnarray}</BEGIN><END>\end{eqnarray}</END>
-    </SPAN>
-    <SPAN TYPE="KEYWORD1" DELEGATE="MathRules">
-      <BEGIN>\begin{align*}</BEGIN><END>\end{align*}</END>
-    </SPAN>
-    <SPAN TYPE="KEYWORD1" DELEGATE="MathRules">
-      <BEGIN>\begin{align}</BEGIN><END>\end{align}</END>
-    </SPAN>
-    <SPAN TYPE="KEYWORD1" DELEGATE="MathRules">
-      <BEGIN>\begin{alignat*}</BEGIN><END>\end{alignat*}</END>
-    </SPAN>
-    <SPAN TYPE="KEYWORD1" DELEGATE="MathRules">
-      <BEGIN>\begin{alignat}</BEGIN><END>\end{alignat}</END>
-    </SPAN>
-    <SPAN TYPE="KEYWORD1" DELEGATE="MathRules">
-      <BEGIN>\begin{flalign*}</BEGIN><END>\end{flalign*}</END>
-    </SPAN>
-    <SPAN TYPE="KEYWORD1" DELEGATE="MathRules">
-      <BEGIN>\begin{flalign}</BEGIN><END>\end{flalign}</END>
-    </SPAN>
-    <SPAN TYPE="KEYWORD1" DELEGATE="MathRules">
-      <BEGIN>\begin{gather*}</BEGIN><END>\end{gather*}</END>
-    </SPAN>
-    <SPAN TYPE="KEYWORD1" DELEGATE="MathRules">
-      <BEGIN>\begin{gather}</BEGIN><END>\end{gather}</END>
-    </SPAN>
-    <SPAN TYPE="KEYWORD1" DELEGATE="MathRules">
-      <BEGIN>\begin{multline*}</BEGIN><END>\end{multline*}</END>
-    </SPAN>
-    <SPAN TYPE="KEYWORD1" DELEGATE="MathRules">
-      <BEGIN>\begin{multline}</BEGIN><END>\end{multline}</END>
-    </SPAN>
-    
-    <!-- labels - includes all commands ending with `ref' and `*ref' -->
-    <SPAN TYPE="KEYWORD4" DELEGATE="LabelRules" NO_LINE_BREAK="TRUE">
-      <BEGIN>\label{</BEGIN><END>}</END>
-    </SPAN>
-    <SPAN TYPE="KEYWORD4" DELEGATE="LabelRules" NO_LINE_BREAK="TRUE">
-      <BEGIN>\cite{</BEGIN><END>}</END>
-    </SPAN>
-    <SPAN TYPE="KEYWORD4" DELEGATE="LabelRules" NO_LINE_BREAK="TRUE">
-      <BEGIN>\hyperlink{</BEGIN><END>}</END>
-    </SPAN>
-    <SPAN TYPE="KEYWORD4" DELEGATE="LabelRules" NO_LINE_BREAK="TRUE">
-      <BEGIN>\hypertarget{</BEGIN><END>}</END>
-    </SPAN>
-    <SPAN TYPE="KEYWORD4" DELEGATE="LabelRules" NO_LINE_BREAK="TRUE">
-      <BEGIN>\url{</BEGIN><END>}</END>
-    </SPAN>
-    <SPAN_REGEXP TYPE="KEYWORD4" DELEGATE="LabelRules"
-        HASH_CHAR="\" NO_LINE_BREAK="TRUE">
-      <BEGIN>.[\p{Alnum}]*ref[\*]?\{</BEGIN>
-      <END>}</END>
-    </SPAN_REGEXP>
-    
-    <!-- escaped characters which are treated as normal text -->
-    <SEQ TYPE="NULL">\&amp;</SEQ>
-    <SEQ TYPE="NULL">\$</SEQ>
-    <SEQ TYPE="NULL">\%</SEQ>
-    <SEQ TYPE="NULL">\#</SEQ>
-    <SEQ TYPE="NULL">\_</SEQ>
-    <SEQ TYPE="NULL">\{</SEQ>
-    <SEQ TYPE="NULL">\}</SEQ>
-    
-    <!-- tabbing tokens (or accents, depending on environment) -->
-    <SEQ TYPE="KEYWORD2">\=</SEQ>
-    <SEQ TYPE="KEYWORD2">\&gt;</SEQ>
-    <SEQ TYPE="KEYWORD2">\&lt;</SEQ>
-    <SEQ TYPE="KEYWORD2">\+</SEQ>
-    <SEQ TYPE="KEYWORD2">\-</SEQ>
-    <SEQ TYPE="KEYWORD2">\'</SEQ>
-    <SEQ TYPE="KEYWORD2">\`</SEQ>
-    
-    <!-- more accents incl. those specific to tabbing environment -->
-    <SEQ TYPE="KEYWORD2">\^</SEQ>
-    <SEQ TYPE="KEYWORD2">\"</SEQ>
-    <SEQ TYPE="KEYWORD2">\~</SEQ>
-    <SEQ TYPE="KEYWORD2">\.</SEQ>
-    <SEQ TYPE="KEYWORD2">\a'</SEQ>
-    <SEQ TYPE="KEYWORD2">\a`</SEQ>
-    <SEQ TYPE="KEYWORD2">\a=</SEQ>
-    
-    <!-- special tokens: macro parameter, linebreak, alignment tab -->
-    <SEQ_REGEXP TYPE="DIGIT">#[1-9]</SEQ_REGEXP>
-    <SEQ TYPE="KEYWORD3">\\</SEQ>
-    <SEQ TYPE="KEYWORD3">&amp;</SEQ>
-    
-    <!-- comments -->
-    <SPAN TYPE="COMMENT2">
-      <BEGIN>\iffalse</BEGIN><END>\fi</END>
-    </SPAN>
-    <EOL_SPAN TYPE="COMMENT1">%</EOL_SPAN>
-    
-    <!-- quotes, including those defined by package `(n)german' -->
-    <SPAN_REGEXP TYPE="LITERAL1"><BEGIN>``</BEGIN><END REGEXP="TRUE">''|"</END></SPAN_REGEXP>
-    <SPAN TYPE="LITERAL1"><BEGIN>"`</BEGIN><END>"'</END></SPAN>
-    <SPAN TYPE="LITERAL1"><BEGIN>"&lt;</BEGIN><END>"&gt;</END></SPAN>
-    <SPAN TYPE="LITERAL1"><BEGIN>\glqq</BEGIN><END>\grqq</END></SPAN>
-    <SPAN TYPE="LITERAL1"><BEGIN>\glq</BEGIN><END>\grq</END></SPAN>
-    <SPAN TYPE="LITERAL1"><BEGIN>\flqq</BEGIN><END>\frqq</END></SPAN>
-    <SPAN TYPE="LITERAL1"><BEGIN>\flq</BEGIN><END>\frq</END></SPAN>
-    
-    <!-- environment delimeters: \begin{...} ... \end{...} -->
-    <SEQ_REGEXP HASH_CHAR="\" TYPE="KEYWORD1"
-      >(.begin\{([\p{Alnum}|@|\*]*)\})</SEQ_REGEXP>
-    <SEQ_REGEXP HASH_CHAR="\" TYPE="KEYWORD1"
-      >(.end\{([\p{Alnum}|@|\*]*)\})</SEQ_REGEXP>
-    
-    <!-- \... commands -->
-    <MARK_FOLLOWING TYPE="KEYWORD2">\</MARK_FOLLOWING>
-    
-    <!-- group delimeters -->
-    <SEQ TYPE="KEYWORD4">{</SEQ>
-    <SEQ TYPE="KEYWORD4">}</SEQ>
-    <SEQ TYPE="KEYWORD4">[</SEQ>
-    <SEQ TYPE="KEYWORD4">]</SEQ>
-  </RULES>
-  
-  <!-- math rules -->
-  <RULES
-    SET="MathRules"
-    DEFAULT="LITERAL2"
-    IGNORE_CASE="FALSE"
-    NO_WORD_SEP="@:"
-    HIGHLIGHT_DIGITS="FALSE">
-    
-    <!-- labels -->
-    <SPAN TYPE="KEYWORD4" DELEGATE="LabelRules" NO_LINE_BREAK="TRUE">
-      <BEGIN>\label{</BEGIN><END>}</END>
-    </SPAN>
-    
-    <!-- escaped characters which are treated as normal text -->
-    <SEQ TYPE="LITERAL2">\&amp;</SEQ>
-    <SEQ TYPE="LITERAL2">\$</SEQ>
-    <SEQ TYPE="LITERAL2">\%</SEQ>
-    
-    <!-- special tokens: macro parameter, linebreak, alignment tab -->
-    <SEQ_REGEXP TYPE="DIGIT">#[1-9]</SEQ_REGEXP>
-    <SEQ TYPE="KEYWORD3">\\</SEQ>
-    <SEQ TYPE="KEYWORD3">&amp;</SEQ>
-    
-    <!-- labels -->
-    <MARK_FOLLOWING TYPE="LABEL" MATCH_TYPE="KEYWORD4">\label{</MARK_FOLLOWING>
-    
-    <!-- comments -->
-    <EOL_SPAN TYPE="COMMENT1">%</EOL_SPAN>
-  </RULES>
-  
-  <!-- verbatim rules -->
-  <RULES SET="VerbatimRules" DEFAULT="LITERAL3" />
-  
-  <!-- label rules -->
-  <RULES SET="LabelRules" DEFAULT="LABEL" />
-
-</MODE>
-
diff --git a/qpython/src/main/assets/syntax/lex.xml b/qpython/src/main/assets/syntax/lex.xml
deleted file mode 100644
index 3595c7bd..00000000
--- a/qpython/src/main/assets/syntax/lex.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-<MODE>
-    <PROPS>
-        <PROPERTY NAME="commentStart" VALUE="/*" />
-        <PROPERTY NAME="commentEnd" VALUE="*/" />
-        <PROPERTY NAME="lineComment" VALUE="//" />
-        <PROPERTY NAME="wordBreakChars" VALUE=",+-=&lt;&gt;/?^&amp;*" />
-
-        <!-- Auto indent -->
-        <PROPERTY NAME="indentOpenBrackets" VALUE="{" />
-        <PROPERTY NAME="indentCloseBrackets" VALUE="}" />
-        <PROPERTY NAME="unalignedOpenBrackets" VALUE="(" />
-        <PROPERTY NAME="unalignedCloseBrackets" VALUE=")" />
-        <PROPERTY NAME="indentNextLine"
-            VALUE="\s*(((if|while)\s*\(|else\s*|else\s+if\s*\(|for\s*\(.*\))[^{;]*)" />
-        <PROPERTY NAME="unindentThisLine"
-            VALUE="^.*(default:\s*|case.*:.*)$" />
-        <PROPERTY NAME="electricKeys" VALUE=":" />
-    </PROPS>
-    <RULES IGNORE_CASE="FALSE">
-	<IMPORT DELEGATE="c::MAIN"/>
-	<SEQ TYPE="OPERATOR">%%</SEQ>
-	<SEQ TYPE="OPERATOR">%{</SEQ>
-	<SEQ TYPE="OPERATOR">}%</SEQ>
-	<SEQ TYPE="KEYWORD1">%option</SEQ>
-	<SEQ TYPE="KEYWORD1">%top</SEQ>
-	<SEQ TYPE="KEYWORD1">%x</SEQ>
-	<SEQ TYPE="KEYWORD4">ECHO</SEQ>
-	<SEQ TYPE="KEYWORD4">BEGIN</SEQ>
-	<SEQ TYPE="KEYWORD4">REJECT</SEQ>
-	
-	<SEQ TYPE="LITERAL2">YY_CURRENT_BUFFER</SEQ>
-	<SEQ TYPE="LITERAL2">YY_START</SEQ>
-	
-	<SEQ_REGEXP HASH_CHAR="&lt;" TYPE="KEYWORD2">&lt;\w+&gt;</SEQ_REGEXP>
-    </RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/lilypond.xml b/qpython/src/main/assets/syntax/lilypond.xml
deleted file mode 100644
index 6ae52952..00000000
--- a/qpython/src/main/assets/syntax/lilypond.xml
+++ /dev/null
@@ -1,2681 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!-- LilyPond (www.lilypond.org) mode by Bertalan Fodor <lilypondtool@organum.hu> & others at http://lily4jedit.sf.net
-	Requires jEdit 4.3pre6 or compatible
-Recommended jEdit/modes/catalog entry:
-	<MODE NAME="lilypond" FILE="lilypond.xml"
-	FILE_NAME_GLOB="*.{ly,ily}" />
-
--->
-
-<MODE>
-<PROPS>
-	<PROPERTY NAME="commentStart" VALUE="%{" />
-	<PROPERTY NAME="commentEnd" VALUE="%}" />
-	<PROPERTY NAME="lineComment" VALUE="%" />
-	<PROPERTY NAME="indentOpenBrackets" VALUE="{" />
-	<PROPERTY NAME="indentCloseBrackets" VALUE="}" />
-	<PROPERTY NAME="doubleBracketIndent" VALUE="false" />
-    <PROPERTY NAME="indentNextLines" VALUE=".*&lt;&lt;.*" />
-    <PROPERTY NAME="unindentThisLine" VALUE=".*&gt;&gt;.*" />
-    <PROPERTY NAME="unindentNextLines" VALUE=".*&gt;&gt;.*" />
-    <PROPERTY NAME="unindentThisLine" VALUE="(?!(.*&lt;&lt;)).*&gt;&gt;.*" />
-    <PROPERTY NAME="electricKeys" VALUE="&gt;" /> 
-	<PROPERTY NAME="wordBreakChars" VALUE="=" />
-</PROPS>
-
-<RULES IGNORE_CASE="FALSE" HIGHLIGHT_DIGITS="TRUE">
-
-	<SPAN TYPE="COMMENT2" NO_LINE_BREAK="FALSE">
-		<BEGIN>%{</BEGIN><END>%}</END>
-	</SPAN>
-	<EOL_SPAN TYPE="COMMENT1">%</EOL_SPAN>
-  <EOL_SPAN TYPE="COMMENT1">;</EOL_SPAN>
-
-	<SEQ TYPE="DIGIT">\breve</SEQ>
-	<SEQ TYPE="DIGIT">\longa</SEQ>
-	<SEQ TYPE="DIGIT">\maxima</SEQ>
-	<MARK_PREVIOUS TYPE="FUNCTION" AT_WHITESPACE_END="TRUE">=</MARK_PREVIOUS>
-	<MARK_PREVIOUS TYPE="FUNCTION" AT_WHITESPACE_END="TRUE"> =</MARK_PREVIOUS>
-	<SEQ TYPE="MARKUP">{</SEQ>
-	<SEQ TYPE="MARKUP">}</SEQ>
-	<SEQ TYPE="MARKUP">[</SEQ>
-	<SEQ TYPE="MARKUP">]</SEQ>
-	<SEQ TYPE="MARKUP">&lt;&lt;</SEQ>
-	<SEQ TYPE="MARKUP">&gt;&gt;</SEQ>
-	<SEQ TYPE="NULL">-&lt;</SEQ>
-	<SEQ TYPE="NULL">-&gt;</SEQ>
-	<SEQ TYPE="OPERATOR">&gt;</SEQ>
-	<SEQ TYPE="OPERATOR">&lt;</SEQ>
-	<SEQ TYPE="OPERATOR">|</SEQ>
-	<SEQ_REGEXP HASH_CHAR="&quot;"  TYPE = "LITERAL1">"(\\"|[^\\"]|\\)+"</SEQ_REGEXP>
-	<SPAN TYPE="LITERAL1"><BEGIN>"</BEGIN><END>"</END></SPAN>
-
-<!-- Less can be more: Notes are simple black.
-	Now digits are highlighted.
-	Octave jumps now are as highlighted as markup. -->
-
-	<!--octave-->
-	<SEQ TYPE="MARKUP">'</SEQ>
-	<SEQ TYPE="MARKUP">,</SEQ>
-
-	<!-- rests and skip -->
-
-	<SEQ_REGEXP TYPE="LITERAL4" AT_WORD_START="TRUE" HASH_CHARS="rRs">[rRs]\d*\b</SEQ_REGEXP>
-
-  <MARK_FOLLOWING TYPE="FUNCTION">ly:</MARK_FOLLOWING>
-  
-<!-- Generated part follows -->
-<!-- internal commands -->
-	<SEQ_REGEXP TYPE="KEYWORD1" HASH_CHAR="\override">\\override\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD1" HASH_CHAR="\version">\\version\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD1" HASH_CHAR="\include">\\include\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD1" HASH_CHAR="\invalid">\\invalid\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD1" HASH_CHAR="\addquote">\\addquote\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD1" HASH_CHAR="\alternative">\\alternative\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD1" HASH_CHAR="\book">\\book\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD1" HASH_CHAR="\~">\\~\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD1" HASH_CHAR="\mark">\\mark\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD1" HASH_CHAR="\default">\\default\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD1" HASH_CHAR="\key">\\key\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD1" HASH_CHAR="\skip">\\skip\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD1" HASH_CHAR="\octave">\\octave\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD1" HASH_CHAR="\partial">\\partial\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD1" HASH_CHAR="\time">\\time\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD1" HASH_CHAR="\change">\\change\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD1" HASH_CHAR="\consists">\\consists\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD1" HASH_CHAR="\remove">\\remove\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD1" HASH_CHAR="\accepts">\\accepts\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD1" HASH_CHAR="\defaultchild">\\defaultchild\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD1" HASH_CHAR="\denies">\\denies\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD1" HASH_CHAR="\alias">\\alias\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD1" HASH_CHAR="\type">\\type\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD1" HASH_CHAR="\description">\\description\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD1" HASH_CHAR="\name">\\name\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD1" HASH_CHAR="\context">\\context\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD1" HASH_CHAR="\grobdescriptions">\\grobdescriptions\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD1" HASH_CHAR="\markup">\\markup\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD1" HASH_CHAR="\header">\\header\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD1" HASH_CHAR="\notemode">\\notemode\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD1" HASH_CHAR="\drummode">\\drummode\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD1" HASH_CHAR="\figuremode">\\figuremode\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD1" HASH_CHAR="\chordmode">\\chordmode\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD1" HASH_CHAR="\lyricmode">\\lyricmode\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD1" HASH_CHAR="\drums">\\drums\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD1" HASH_CHAR="\figures">\\figures\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD1" HASH_CHAR="\chords">\\chords\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD1" HASH_CHAR="\lyrics">\\lyrics\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD1" HASH_CHAR="\once">\\once\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD1" HASH_CHAR="\revert">\\revert\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD1" HASH_CHAR="\set">\\set\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD1" HASH_CHAR="\unset">\\unset\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD1" HASH_CHAR="\addlyrics">\\addlyrics\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD1" HASH_CHAR="\objectid">\\objectid\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD1" HASH_CHAR="\with">\\with\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD1" HASH_CHAR="\rest">\\rest\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD1" HASH_CHAR="\paper">\\paper\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD1" HASH_CHAR="\midi">\\midi\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD1" HASH_CHAR="\layout">\\layout\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD1" HASH_CHAR="\new">\\new\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD1" HASH_CHAR="\times">\\times\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD1" HASH_CHAR="\transpose">\\transpose\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD1" HASH_CHAR="\tag">\\tag\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD1" HASH_CHAR="\relative">\\relative\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD1" HASH_CHAR="\renameinput">\\renameinput\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD1" HASH_CHAR="\repeat">\\repeat\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD1" HASH_CHAR="\lyricsto">\\lyricsto\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD1" HASH_CHAR="\score">\\score\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD1" HASH_CHAR="\sequential">\\sequential\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD1" HASH_CHAR="\simultaneous">\\simultaneous\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD1" HASH_CHAR="\longa">\\longa\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD1" HASH_CHAR="\breve">\\breve\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD1" HASH_CHAR="\maxima">\\maxima\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD1" HASH_CHAR="\tempo">\\tempo\b</SEQ_REGEXP>
-<!-- identifiers -->
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\AncientRemoveEmptyStaffContext">\\AncientRemoveEmptyStaffContext\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\RemoveEmptyRhythmicStaffContext">\\RemoveEmptyRhythmicStaffContext\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\RemoveEmptyStaffContext">\\RemoveEmptyStaffContext\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\accent">\\accent\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\aeolian">\\aeolian\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\afterGraceFraction">\\afterGraceFraction\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\aikenHeads">\\aikenHeads\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\arpeggio">\\arpeggio\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\arpeggioArrowDown">\\arpeggioArrowDown\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\arpeggioArrowUp">\\arpeggioArrowUp\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\arpeggioBracket">\\arpeggioBracket\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\arpeggioNormal">\\arpeggioNormal\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\arpeggioParenthesis">\\arpeggioParenthesis\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\autoBeamOff">\\autoBeamOff\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\autoBeamOn">\\autoBeamOn\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\balloonLengthOff">\\balloonLengthOff\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\balloonLengthOn">\\balloonLengthOn\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\bassFigureExtendersOff">\\bassFigureExtendersOff\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\bassFigureExtendersOn">\\bassFigureExtendersOn\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\bassFigureStaffAlignmentDown">\\bassFigureStaffAlignmentDown\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\bassFigureStaffAlignmentNeutral">\\bassFigureStaffAlignmentNeutral\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\bassFigureStaffAlignmentUp">\\bassFigureStaffAlignmentUp\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\between-system-padding">\\between-system-padding\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\between-system-space">\\between-system-space\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\bigger">\\bigger\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\blackTriangleMarkup">\\blackTriangleMarkup\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\bookTitleMarkup">\\bookTitleMarkup\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\bracketCloseSymbol">\\bracketCloseSymbol\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\bracketOpenSymbol">\\bracketOpenSymbol\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\break">\\break\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\breve">\\breve\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\cadenzaOff">\\cadenzaOff\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\cadenzaOn">\\cadenzaOn\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\center">\\center\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\chordmodifiers">\\chordmodifiers\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\cm">\\cm\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\coda">\\coda\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\compressFullBarRests">\\compressFullBarRests\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\cr">\\cr\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\cresc">\\cresc\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\crescHairpin">\\crescHairpin\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\crescTextCresc">\\crescTextCresc\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\decr">\\decr\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\defaultTimeSignature">\\defaultTimeSignature\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\dim">\\dim\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\dimHairpin">\\dimHairpin\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\dimTextDecr">\\dimTextDecr\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\dimTextDecresc">\\dimTextDecresc\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\dimTextDim">\\dimTextDim\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\dorian">\\dorian\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\dotsDown">\\dotsDown\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\dotsNeutral">\\dotsNeutral\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\dotsUp">\\dotsUp\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\down">\\down\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\downbow">\\downbow\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\downmordent">\\downmordent\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\downprall">\\downprall\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\drumPitchNames">\\drumPitchNames\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\dutchPitchnames">\\dutchPitchnames\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\dynamicDown">\\dynamicDown\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\dynamicNeutral">\\dynamicNeutral\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\dynamicUp">\\dynamicUp\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\easyHeadsOff">\\easyHeadsOff\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\easyHeadsOn">\\easyHeadsOn\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\endcr">\\endcr\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\endcresc">\\endcresc\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\enddecr">\\enddecr\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\enddim">\\enddim\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\endincipit">\\endincipit\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\escapedBiggerSymbol">\\escapedBiggerSymbol\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\escapedExclamationSymbol">\\escapedExclamationSymbol\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\escapedParenthesisCloseSymbol">\\escapedParenthesisCloseSymbol\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\escapedParenthesisOpenSymbol">\\escapedParenthesisOpenSymbol\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\escapedSmallerSymbol">\\escapedSmallerSymbol\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\espressivo">\\espressivo\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\evenHeaderMarkup">\\evenHeaderMarkup\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\expandFullBarRests">\\expandFullBarRests\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\f">\\f\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\fermata">\\fermata\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\fermataMarkup">\\fermataMarkup\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\ff">\\ff\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\fff">\\fff\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\ffff">\\ffff\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\first-page-number">\\first-page-number\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\flageolet">\\flageolet\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\fp">\\fp\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\frenchChords">\\frenchChords\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\fullJazzExceptions">\\fullJazzExceptions\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\fz">\\fz\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\germanChords">\\germanChords\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\glissando">\\glissando\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\harmonic">\\harmonic\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\hideNotes">\\hideNotes\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\hideStaffSwitch">\\hideStaffSwitch\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\huge">\\huge\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\ignatzekExceptionMusic">\\ignatzekExceptionMusic\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\ignatzekExceptions">\\ignatzekExceptions\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\improvisationOff">\\improvisationOff\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\improvisationOn">\\improvisationOn\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\in">\\in\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\instrument-definitions">\\instrument-definitions\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\ionian">\\ionian\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\italianChords">\\italianChords\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\laissezVibrer">\\laissezVibrer\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\large">\\large\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\left">\\left\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\lheel">\\lheel\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\lineprall">\\lineprall\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\locrian">\\locrian\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\longa">\\longa\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\longfermata">\\longfermata\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\ltoe">\\ltoe\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\lydian">\\lydian\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\major">\\major\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\marcato">\\marcato\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\maxima">\\maxima\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\melisma">\\melisma\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\melismaEnd">\\melismaEnd\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\mergeDifferentlyDottedOff">\\mergeDifferentlyDottedOff\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\mergeDifferentlyDottedOn">\\mergeDifferentlyDottedOn\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\mergeDifferentlyHeadedOff">\\mergeDifferentlyHeadedOff\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\mergeDifferentlyHeadedOn">\\mergeDifferentlyHeadedOn\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\mf">\\mf\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\midiDrumPitches">\\midiDrumPitches\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\minor">\\minor\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\mixolydian">\\mixolydian\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\mm">\\mm\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\mordent">\\mordent\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\mp">\\mp\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\newSpacingSection">\\newSpacingSection\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\noBeam">\\noBeam\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\noBreak">\\noBreak\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\normalsize">\\normalsize\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\numericTimeSignature">\\numericTimeSignature\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\oddFooterMarkup">\\oddFooterMarkup\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\oddHeaderMarkup">\\oddHeaderMarkup\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\oneVoice">\\oneVoice\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\open">\\open\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\output-scale">\\output-scale\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\p">\\p\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\page-limit-inter-system-space">\\page-limit-inter-system-space\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\page-top-space">\\page-top-space\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\parenthesisCloseSymbol">\\parenthesisCloseSymbol\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\parenthesisOpenSymbol">\\parenthesisOpenSymbol\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\partialJazzExceptions">\\partialJazzExceptions\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\partialJazzMusic">\\partialJazzMusic\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\phrasingSlurDashed">\\phrasingSlurDashed\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\phrasingSlurDotted">\\phrasingSlurDotted\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\phrasingSlurDown">\\phrasingSlurDown\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\phrasingSlurNeutral">\\phrasingSlurNeutral\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\phrasingSlurSolid">\\phrasingSlurSolid\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\phrasingSlurUp">\\phrasingSlurUp\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\phrygian">\\phrygian\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\pipeSymbol">\\pipeSymbol\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\pitchnames">\\pitchnames\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\portato">\\portato\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\pp">\\pp\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\ppp">\\ppp\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\pppp">\\pppp\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\ppppp">\\ppppp\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\prall">\\prall\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\pralldown">\\pralldown\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\prallmordent">\\prallmordent\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\prallprall">\\prallprall\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\prallup">\\prallup\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\predefinedFretboardsOff">\\predefinedFretboardsOff\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\predefinedFretboardsOn">\\predefinedFretboardsOn\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\print-first-page-number">\\print-first-page-number\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\print-page-number">\\print-page-number\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\pt">\\pt\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\ragged-bottom">\\ragged-bottom\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\ragged-last-bottom">\\ragged-last-bottom\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\repeatTie">\\repeatTie\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\reverseturn">\\reverseturn\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\rfz">\\rfz\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\rheel">\\rheel\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\right">\\right\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\rtoe">\\rtoe\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\sacredHarpHeads">\\sacredHarpHeads\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\scoreTitleMarkup">\\scoreTitleMarkup\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\segno">\\segno\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\semiGermanChords">\\semiGermanChords\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\setDefaultDurationToQuarter">\\setDefaultDurationToQuarter\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\sf">\\sf\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\sff">\\sff\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\sfp">\\sfp\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\sfz">\\sfz\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\shiftOff">\\shiftOff\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\shiftOn">\\shiftOn\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\shiftOnn">\\shiftOnn\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\shiftOnnn">\\shiftOnnn\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\shortfermata">\\shortfermata\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\showStaffSwitch">\\showStaffSwitch\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\signumcongruentiae">\\signumcongruentiae\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\slashSeparator">\\slashSeparator\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\slurDashed">\\slurDashed\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\slurDotted">\\slurDotted\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\slurDown">\\slurDown\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\slurNeutral">\\slurNeutral\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\slurSolid">\\slurSolid\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\slurUp">\\slurUp\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\small">\\small\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\smaller">\\smaller\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\sostenutoOff">\\sostenutoOff\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\sostenutoOn">\\sostenutoOn\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\sp">\\sp\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\spp">\\spp\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\staccatissimo">\\staccatissimo\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\staccato">\\staccato\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\start">\\start\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\startAcciaccaturaMusic">\\startAcciaccaturaMusic\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\startAppoggiaturaMusic">\\startAppoggiaturaMusic\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\startGraceMusic">\\startGraceMusic\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\startGroup">\\startGroup\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\startStaff">\\startStaff\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\startTextSpan">\\startTextSpan\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\startTrillSpan">\\startTrillSpan\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\stemDown">\\stemDown\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\stemNeutral">\\stemNeutral\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\stemUp">\\stemUp\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\stop">\\stop\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\stopAcciaccaturaMusic">\\stopAcciaccaturaMusic\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\stopAppoggiaturaMusic">\\stopAppoggiaturaMusic\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\stopGraceMusic">\\stopGraceMusic\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\stopGroup">\\stopGroup\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\stopStaff">\\stopStaff\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\stopTextSpan">\\stopTextSpan\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\stopTrillSpan">\\stopTrillSpan\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\stopped">\\stopped\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\sustainOff">\\sustainOff\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\sustainOn">\\sustainOn\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\tagline">\\tagline\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\teeny">\\teeny\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\tenuto">\\tenuto\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\textLengthOff">\\textLengthOff\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\textLengthOn">\\textLengthOn\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\textSpannerDown">\\textSpannerDown\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\textSpannerNeutral">\\textSpannerNeutral\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\textSpannerUp">\\textSpannerUp\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\thumb">\\thumb\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\tieDashed">\\tieDashed\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\tieDotted">\\tieDotted\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\tieDown">\\tieDown\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\tieNeutral">\\tieNeutral\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\tieSolid">\\tieSolid\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\tieUp">\\tieUp\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\tildeSymbol">\\tildeSymbol\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\tiny">\\tiny\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\tocItemMarkup">\\tocItemMarkup\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\tocTitleMarkup">\\tocTitleMarkup\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\treCorde">\\treCorde\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\trill">\\trill\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\tupletDown">\\tupletDown\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\tupletNeutral">\\tupletNeutral\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\tupletUp">\\tupletUp\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\turn">\\turn\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\unHideNotes">\\unHideNotes\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\unaCorda">\\unaCorda\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\unit">\\unit\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\up">\\up\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\upbow">\\upbow\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\upmordent">\\upmordent\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\upprall">\\upprall\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\varcoda">\\varcoda\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\verylongfermata">\\verylongfermata\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\voiceFour">\\voiceFour\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\voiceFourStyle">\\voiceFourStyle\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\voiceNeutralStyle">\\voiceNeutralStyle\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\voiceOne">\\voiceOne\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\voiceOneStyle">\\voiceOneStyle\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\voiceThree">\\voiceThree\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\voiceThreeStyle">\\voiceThreeStyle\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\voiceTwo">\\voiceTwo\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\voiceTwoStyle">\\voiceTwoStyle\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\whiteTriangleMarkup">\\whiteTriangleMarkup\b</SEQ_REGEXP>
-<!-- music functions -->
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\acciaccatura">\\acciaccatura\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\addChordShape">\\addChordShape\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\addInstrumentDefinition">\\addInstrumentDefinition\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\addQuote">\\addQuote\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\afterGrace">\\afterGrace\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\allowPageTurn">\\allowPageTurn\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\applyContext">\\applyContext\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\applyMusic">\\applyMusic\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\applyOutput">\\applyOutput\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\appoggiatura">\\appoggiatura\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\assertBeamQuant">\\assertBeamQuant\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\assertBeamSlope">\\assertBeamSlope\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\autochange">\\autochange\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\balloonGrobText">\\balloonGrobText\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\balloonText">\\balloonText\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\bar">\\bar\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\barNumberCheck">\\barNumberCheck\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\bendAfter">\\bendAfter\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\breathe">\\breathe\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\clef">\\clef\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\cueDuring">\\cueDuring\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\displayLilyMusic">\\displayLilyMusic\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\displayMusic">\\displayMusic\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\endSpanners">\\endSpanners\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\featherDurations">\\featherDurations\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\grace">\\grace\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\includePageLayoutFile">\\includePageLayoutFile\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\instrumentSwitch">\\instrumentSwitch\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\keepWithTag">\\keepWithTag\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\killCues">\\killCues\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\label">\\label\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\makeClusters">\\makeClusters\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\musicMap">\\musicMap\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\noPageBreak">\\noPageBreak\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\noPageTurn">\\noPageTurn\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\octaveCheck">\\octaveCheck\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\oldaddlyrics">\\oldaddlyrics\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\ottava">\\ottava\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\overrideProperty">\\overrideProperty\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\pageBreak">\\pageBreak\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\pageTurn">\\pageTurn\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\parallelMusic">\\parallelMusic\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\parenthesize">\\parenthesize\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\partcombine">\\partcombine\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\pitchedTrill">\\pitchedTrill\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\pointAndClickOff">\\pointAndClickOff\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\pointAndClickOn">\\pointAndClickOn\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\quoteDuring">\\quoteDuring\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\removeWithTag">\\removeWithTag\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\resetRelativeOctave">\\resetRelativeOctave\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\rightHandFinger">\\rightHandFinger\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\scaleDurations">\\scaleDurations\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\scoreTweak">\\scoreTweak\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\shiftDurations">\\shiftDurations\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\spacingTweaks">\\spacingTweaks\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\storePredefinedDiagram">\\storePredefinedDiagram\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\tag">\\tag\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\tocItem">\\tocItem\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\transposedCueDuring">\\transposedCueDuring\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\transposition">\\transposition\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\tweak">\\tweak\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\unfoldRepeats">\\unfoldRepeats\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="\withMusicProperty">\\withMusicProperty\b</SEQ_REGEXP>
-<!-- markup commands -->
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\abs-fontsize">\\abs-fontsize\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\arrow-head">\\arrow-head\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\backslashed-digit">\\backslashed-digit\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\beam">\\beam\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\bold">\\bold\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\box">\\box\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\bracket">\\bracket\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\caps">\\caps\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\center-align">\\center-align\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\center-column">\\center-column\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\char">\\char\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\circle">\\circle\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\column">\\column\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\combine">\\combine\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\concat">\\concat\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\dir-column">\\dir-column\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\doubleflat">\\doubleflat\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\doublesharp">\\doublesharp\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\draw-circle">\\draw-circle\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\draw-line">\\draw-line\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\dynamic">\\dynamic\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\epsfile">\\epsfile\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\fill-line">\\fill-line\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\filled-box">\\filled-box\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\finger">\\finger\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\flat">\\flat\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\fontCaps">\\fontCaps\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\fontsize">\\fontsize\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\fraction">\\fraction\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\fret-diagram">\\fret-diagram\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\fret-diagram-terse">\\fret-diagram-terse\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\fret-diagram-verbose">\\fret-diagram-verbose\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\fromproperty">\\fromproperty\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\general-align">\\general-align\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\halign">\\halign\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\harp-pedal">\\harp-pedal\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\hbracket">\\hbracket\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\hcenter-in">\\hcenter-in\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\hspace">\\hspace\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\huge">\\huge\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\italic">\\italic\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\justify">\\justify\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\justify-field">\\justify-field\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\justify-string">\\justify-string\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\large">\\large\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\larger">\\larger\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\left-align">\\left-align\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\left-column">\\left-column\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\line">\\line\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\lookup">\\lookup\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\lower">\\lower\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\magnify">\\magnify\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\markalphabet">\\markalphabet\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\markletter">\\markletter\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\medium">\\medium\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\musicglyph">\\musicglyph\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\natural">\\natural\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\normal-size-sub">\\normal-size-sub\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\normal-size-super">\\normal-size-super\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\normal-text">\\normal-text\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\normalsize">\\normalsize\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\note">\\note\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\note-by-number">\\note-by-number\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\null">\\null\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\number">\\number\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\on-the-fly">\\on-the-fly\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\override">\\override\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\pad-around">\\pad-around\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\pad-markup">\\pad-markup\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\pad-to-box">\\pad-to-box\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\pad-x">\\pad-x\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\page-ref">\\page-ref\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\postscript">\\postscript\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\put-adjacent">\\put-adjacent\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\raise">\\raise\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\right-align">\\right-align\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\right-column">\\right-column\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\roman">\\roman\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\rotate">\\rotate\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\rounded-box">\\rounded-box\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\sans">\\sans\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\score">\\score\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\semiflat">\\semiflat\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\semisharp">\\semisharp\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\sesquiflat">\\sesquiflat\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\sesquisharp">\\sesquisharp\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\sharp">\\sharp\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\simple">\\simple\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\slashed-digit">\\slashed-digit\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\small">\\small\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\smallCaps">\\smallCaps\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\smaller">\\smaller\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\stencil">\\stencil\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\strut">\\strut\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\sub">\\sub\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\super">\\super\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\teeny">\\teeny\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\text">\\text\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\tied-lyric">\\tied-lyric\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\tiny">\\tiny\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\translate">\\translate\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\translate-scaled">\\translate-scaled\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\transparent">\\transparent\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\triangle">\\triangle\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\typewriter">\\typewriter\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\underline">\\underline\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\upright">\\upright\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\vcenter">\\vcenter\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\verbatim-file">\\verbatim-file\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\whiteout">\\whiteout\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\with-color">\\with-color\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\with-dimensions">\\with-dimensions\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\with-url">\\with-url\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\wordwrap">\\wordwrap\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\wordwrap-field">\\wordwrap-field\b</SEQ_REGEXP>
-	<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="\wordwrap-string">\\wordwrap-string\b</SEQ_REGEXP>
-<MARK_FOLLOWING TYPE="FUNCTION">\</MARK_FOLLOWING>
-<KEYWORDS>
-	<KEYWORD2>Forbid_line_break_engraver</KEYWORD2>
-	<KEYWORD2>staff-symbol-referencer-interface</KEYWORD2>
-	<KEYWORD2>clef-interface</KEYWORD2>
-	<KEYWORD2>note-name-interface</KEYWORD2>
-	<KEYWORD2>lyric-extender-interface</KEYWORD2>
-	<KEYWORD2>mensural-ligature-interface</KEYWORD2>
-	<KEYWORD2>Multi_measure_rest_engraver</KEYWORD2>
-	<KEYWORD2>bass-figure-alignment-interface</KEYWORD2>
-	<KEYWORD2>Slur_engraver</KEYWORD2>
-	<KEYWORD2>Completion_heads_engraver</KEYWORD2>
-	<KEYWORD2>rhythmic-grob-interface</KEYWORD2>
-	<KEYWORD2>span-bar-interface</KEYWORD2>
-	<KEYWORD2>Drum_note_performer</KEYWORD2>
-	<KEYWORD2>InnerChoirStaff</KEYWORD2>
-	<KEYWORD2>Score</KEYWORD2>
-	<KEYWORD2>Bar_engraver</KEYWORD2>
-	<KEYWORD2>Breathing_sign_engraver</KEYWORD2>
-	<KEYWORD2>Staff</KEYWORD2>
-	<KEYWORD2>spanner-interface</KEYWORD2>
-	<KEYWORD2>Ligature_bracket_engraver</KEYWORD2>
-	<KEYWORD2>Chord_name_engraver</KEYWORD2>
-	<KEYWORD2>accidental-placement-interface</KEYWORD2>
-	<KEYWORD2>Span_arpeggio_engraver</KEYWORD2>
-	<KEYWORD2>MensuralVoice</KEYWORD2>
-	<KEYWORD2>Stanza_number_engraver</KEYWORD2>
-	<KEYWORD2>Grace_engraver</KEYWORD2>
-	<KEYWORD2>Grace_beam_engraver</KEYWORD2>
-	<KEYWORD2>script-interface</KEYWORD2>
-	<KEYWORD2>Time_signature_engraver</KEYWORD2>
-	<KEYWORD2>Stanza_number_align_engraver</KEYWORD2>
-	<KEYWORD2>GregorianTranscriptionStaff</KEYWORD2>
-	<KEYWORD2>Key_engraver</KEYWORD2>
-	<KEYWORD2>cluster-beacon-interface</KEYWORD2>
-	<KEYWORD2>TabVoice</KEYWORD2>
-	<KEYWORD2>Dynamic_engraver</KEYWORD2>
-	<KEYWORD2>rhythmic-head-interface</KEYWORD2>
-	<KEYWORD2>Repeat_acknowledge_engraver</KEYWORD2>
-	<KEYWORD2>dynamic-interface</KEYWORD2>
-	<KEYWORD2>volta-bracket-interface</KEYWORD2>
-	<KEYWORD2>bar-line-interface</KEYWORD2>
-	<KEYWORD2>piano-pedal-interface</KEYWORD2>
-	<KEYWORD2>font-interface</KEYWORD2>
-	<KEYWORD2>VaticanaVoice</KEYWORD2>
-	<KEYWORD2>staff-spacing-interface</KEYWORD2>
-	<KEYWORD2>tie-interface</KEYWORD2>
-	<KEYWORD2>Devnull</KEYWORD2>
-	<KEYWORD2>dynamic-text-spanner-interface</KEYWORD2>
-	<KEYWORD2>Script_row_engraver</KEYWORD2>
-	<KEYWORD2>Stem_engraver</KEYWORD2>
-	<KEYWORD2>grid-line-interface</KEYWORD2>
-	<KEYWORD2>grob-interface</KEYWORD2>
-	<KEYWORD2>custos-interface</KEYWORD2>
-	<KEYWORD2>Font_size_engraver</KEYWORD2>
-	<KEYWORD2>trill-pitch-accidental-interface</KEYWORD2>
-	<KEYWORD2>Clef_engraver</KEYWORD2>
-	<KEYWORD2>Text_engraver</KEYWORD2>
-	<KEYWORD2>dynamic-line-spanner-interface</KEYWORD2>
-	<KEYWORD2>Repeat_tie_engraver</KEYWORD2>
-	<KEYWORD2>tablature-interface</KEYWORD2>
-	<KEYWORD2>staff-symbol-interface</KEYWORD2>
-	<KEYWORD2>rest-collision-interface</KEYWORD2>
-	<KEYWORD2>Horizontal_bracket_engraver</KEYWORD2>
-	<KEYWORD2>accidental-suggestion-interface</KEYWORD2>
-	<KEYWORD2>Beam_performer</KEYWORD2>
-	<KEYWORD2>Lyric_performer</KEYWORD2>
-	<KEYWORD2>Piano_pedal_engraver</KEYWORD2>
-	<KEYWORD2>vaticana-ligature-interface</KEYWORD2>
-	<KEYWORD2>Tab_note_heads_engraver</KEYWORD2>
-	<KEYWORD2>text-interface</KEYWORD2>
-	<KEYWORD2>break-alignable-interface</KEYWORD2>
-	<KEYWORD2>lyric-hyphen-interface</KEYWORD2>
-	<KEYWORD2>grace-spacing-interface</KEYWORD2>
-	<KEYWORD2>note-column-interface</KEYWORD2>
-	<KEYWORD2>Vertical_align_engraver</KEYWORD2>
-	<KEYWORD2>break-aligned-interface</KEYWORD2>
-	<KEYWORD2>Staff_performer</KEYWORD2>
-	<KEYWORD2>Ledger_line_engraver</KEYWORD2>
-	<KEYWORD2>rest-interface</KEYWORD2>
-	<KEYWORD2>Fingering_engraver</KEYWORD2>
-	<KEYWORD2>figured-bass-continuation-interface</KEYWORD2>
-	<KEYWORD2>metronome-mark-interface</KEYWORD2>
-	<KEYWORD2>Key_performer</KEYWORD2>
-	<KEYWORD2>Separating_line_group_engraver</KEYWORD2>
-	<KEYWORD2>bend-after-interface</KEYWORD2>
-	<KEYWORD2>DrumStaff</KEYWORD2>
-	<KEYWORD2>unbreakable-spanner-interface</KEYWORD2>
-	<KEYWORD2>trill-spanner-interface</KEYWORD2>
-	<KEYWORD2>Grace_spacing_engraver</KEYWORD2>
-	<KEYWORD2>Ambitus_engraver</KEYWORD2>
-	<KEYWORD2>system-interface</KEYWORD2>
-	<KEYWORD2>Swallow_engraver</KEYWORD2>
-	<KEYWORD2>Cluster_spanner_engraver</KEYWORD2>
-	<KEYWORD2>fret-diagram-interface</KEYWORD2>
-	<KEYWORD2>gregorian-ligature-interface</KEYWORD2>
-	<KEYWORD2>dots-interface</KEYWORD2>
-	<KEYWORD2>percent-repeat-item-interface</KEYWORD2>
-	<KEYWORD2>Time_signature_performer</KEYWORD2>
-	<KEYWORD2>semi-tie-column-interface</KEYWORD2>
-	<KEYWORD2>spacing-spanner-interface</KEYWORD2>
-	<KEYWORD2>Staff_symbol_engraver</KEYWORD2>
-	<KEYWORD2>mark-interface</KEYWORD2>
-	<KEYWORD2>accidental-interface</KEYWORD2>
-	<KEYWORD2>Text_spanner_engraver</KEYWORD2>
-	<KEYWORD2>Swallow_performer</KEYWORD2>
-	<KEYWORD2>system-start-text-interface</KEYWORD2>
-	<KEYWORD2>Mensural_ligature_engraver</KEYWORD2>
-	<KEYWORD2>chord-name-interface</KEYWORD2>
-	<KEYWORD2>Lyric_engraver</KEYWORD2>
-	<KEYWORD2>Translator</KEYWORD2>
-	<KEYWORD2>script-column-interface</KEYWORD2>
-	<KEYWORD2>Instrument_switch_engraver</KEYWORD2>
-	<KEYWORD2>Grob_pq_engraver</KEYWORD2>
-	<KEYWORD2>Volta_engraver</KEYWORD2>
-	<KEYWORD2>breathing-sign-interface</KEYWORD2>
-	<KEYWORD2>Span_bar_engraver</KEYWORD2>
-	<KEYWORD2>Tab_harmonic_engraver</KEYWORD2>
-	<KEYWORD2>Note_performer</KEYWORD2>
-	<KEYWORD2>beam-interface</KEYWORD2>
-	<KEYWORD2>note-collision-interface</KEYWORD2>
-	<KEYWORD2>only-prebreak-interface</KEYWORD2>
-	<KEYWORD2>stroke-finger-interface</KEYWORD2>
-	<KEYWORD2>InnerStaffGroup</KEYWORD2>
-	<KEYWORD2>tie-column-interface</KEYWORD2>
-	<KEYWORD2>FretBoards</KEYWORD2>
-	<KEYWORD2>Tie_engraver</KEYWORD2>
-	<KEYWORD2>Laissez_vibrer_engraver</KEYWORD2>
-	<KEYWORD2>slur-interface</KEYWORD2>
-	<KEYWORD2>Custos_engraver</KEYWORD2>
-	<KEYWORD2>Note_swallow_translator</KEYWORD2>
-	<KEYWORD2>Rhythmic_column_engraver</KEYWORD2>
-	<KEYWORD2>Default_bar_line_engraver</KEYWORD2>
-	<KEYWORD2>note-spacing-interface</KEYWORD2>
-	<KEYWORD2>FiguredBass</KEYWORD2>
-	<KEYWORD2>vertically-spaceable-interface</KEYWORD2>
-	<KEYWORD2>GregorianTranscriptionVoice</KEYWORD2>
-	<KEYWORD2>stem-tremolo-interface</KEYWORD2>
-	<KEYWORD2>measure-grouping-interface</KEYWORD2>
-	<KEYWORD2>Spacing_engraver</KEYWORD2>
-	<KEYWORD2>side-position-interface</KEYWORD2>
-	<KEYWORD2>semi-tie-interface</KEYWORD2>
-	<KEYWORD2>lyric-syllable-interface</KEYWORD2>
-	<KEYWORD2>Engraver</KEYWORD2>
-	<KEYWORD2>Pitched_trill_engraver</KEYWORD2>
-	<KEYWORD2>ledger-line-spanner-interface</KEYWORD2>
-	<KEYWORD2>stem-interface</KEYWORD2>
-	<KEYWORD2>Extender_engraver</KEYWORD2>
-	<KEYWORD2>Pitch_squash_engraver</KEYWORD2>
-	<KEYWORD2>align-interface</KEYWORD2>
-	<KEYWORD2>ambitus-interface</KEYWORD2>
-	<KEYWORD2>Rest_swallow_translator</KEYWORD2>
-	<KEYWORD2>string-number-interface</KEYWORD2>
-	<KEYWORD2>self-alignment-interface</KEYWORD2>
-	<KEYWORD2>Rest_collision_engraver</KEYWORD2>
-	<KEYWORD2>hairpin-interface</KEYWORD2>
-	<KEYWORD2>NoteNames</KEYWORD2>
-	<KEYWORD2>Drum_notes_engraver</KEYWORD2>
-	<KEYWORD2>arpeggio-interface</KEYWORD2>
-	<KEYWORD2>Tweak_engraver</KEYWORD2>
-	<KEYWORD2>ledgered-interface</KEYWORD2>
-	<KEYWORD2>Global</KEYWORD2>
-	<KEYWORD2>StaffGroup</KEYWORD2>
-	<KEYWORD2>DrumVoice</KEYWORD2>
-	<KEYWORD2>Voice</KEYWORD2>
-	<KEYWORD2>GrandStaff</KEYWORD2>
-	<KEYWORD2>Staff_collecting_engraver</KEYWORD2>
-	<KEYWORD2>melody-spanner-interface</KEYWORD2>
-	<KEYWORD2>Hara_kiri_engraver</KEYWORD2>
-	<KEYWORD2>Figured_bass_position_engraver</KEYWORD2>
-	<KEYWORD2>Tempo_performer</KEYWORD2>
-	<KEYWORD2>New_dynamic_engraver</KEYWORD2>
-	<KEYWORD2>Measure_grouping_engraver</KEYWORD2>
-	<KEYWORD2>Hyphen_engraver</KEYWORD2>
-	<KEYWORD2>Skip_event_swallow_translator</KEYWORD2>
-	<KEYWORD2>Vaticana_ligature_engraver</KEYWORD2>
-	<KEYWORD2>text-script-interface</KEYWORD2>
-	<KEYWORD2>Tuplet_engraver</KEYWORD2>
-	<KEYWORD2>Slur_performer</KEYWORD2>
-	<KEYWORD2>spaceable-grob-interface</KEYWORD2>
-	<KEYWORD2>Tie_performer</KEYWORD2>
-	<KEYWORD2>Vertically_spaced_contexts_engraver</KEYWORD2>
-	<KEYWORD2>Trill_spanner_engraver</KEYWORD2>
-	<KEYWORD2>Spanner_break_forbid_engraver</KEYWORD2>
-	<KEYWORD2>CueVoice</KEYWORD2>
-	<KEYWORD2>ChoirStaff</KEYWORD2>
-	<KEYWORD2>Glissando_engraver</KEYWORD2>
-	<KEYWORD2>Balloon_engraver</KEYWORD2>
-	<KEYWORD2>separation-item-interface</KEYWORD2>
-	<KEYWORD2>Accidental_engraver</KEYWORD2>
-	<KEYWORD2>Output_property_engraver</KEYWORD2>
-	<KEYWORD2>hara-kiri-group-spanner-interface</KEYWORD2>
-	<KEYWORD2>piano-pedal-script-interface</KEYWORD2>
-	<KEYWORD2>system-start-delimiter-interface</KEYWORD2>
-	<KEYWORD2>multi-measure-rest-interface</KEYWORD2>
-	<KEYWORD2>Note_name_engraver</KEYWORD2>
-	<KEYWORD2>Note_spacing_engraver</KEYWORD2>
-	<KEYWORD2>Timing_translator</KEYWORD2>
-	<KEYWORD2>Mark_engraver</KEYWORD2>
-	<KEYWORD2>Control_track_performer</KEYWORD2>
-	<KEYWORD2>Part_combine_engraver</KEYWORD2>
-	<KEYWORD2>axis-group-interface</KEYWORD2>
-	<KEYWORD2>note-head-interface</KEYWORD2>
-	<KEYWORD2>horizontal-bracket-interface</KEYWORD2>
-	<KEYWORD2>PianoStaff</KEYWORD2>
-	<KEYWORD2>Slash_repeat_engraver</KEYWORD2>
-	<KEYWORD2>Page_turn_engraver</KEYWORD2>
-	<KEYWORD2>parentheses-interface</KEYWORD2>
-	<KEYWORD2>key-signature-interface</KEYWORD2>
-	<KEYWORD2>lyric-interface</KEYWORD2>
-	<KEYWORD2>grid-point-interface</KEYWORD2>
-	<KEYWORD2>item-interface</KEYWORD2>
-	<KEYWORD2>Ottava_spanner_engraver</KEYWORD2>
-	<KEYWORD2>Melody_engraver</KEYWORD2>
-	<KEYWORD2>Percent_repeat_engraver</KEYWORD2>
-	<KEYWORD2>tuplet-number-interface</KEYWORD2>
-	<KEYWORD2>Rest_engraver</KEYWORD2>
-	<KEYWORD2>stanza-number-interface</KEYWORD2>
-	<KEYWORD2>enclosing-bracket-interface</KEYWORD2>
-	<KEYWORD2>Break_align_engraver</KEYWORD2>
-	<KEYWORD2>Piano_pedal_performer</KEYWORD2>
-	<KEYWORD2>Paper_column_engraver</KEYWORD2>
-	<KEYWORD2>pitched-trill-interface</KEYWORD2>
-	<KEYWORD2>Grid_line_span_engraver</KEYWORD2>
-	<KEYWORD2>Lyrics</KEYWORD2>
-	<KEYWORD2>Instrument_name_engraver</KEYWORD2>
-	<KEYWORD2>line-interface</KEYWORD2>
-	<KEYWORD2>Bend_engraver</KEYWORD2>
-	<KEYWORD2>Arpeggio_engraver</KEYWORD2>
-	<KEYWORD2>key-cancellation-interface</KEYWORD2>
-	<KEYWORD2>Grid_point_engraver</KEYWORD2>
-	<KEYWORD2>Script_column_engraver</KEYWORD2>
-	<KEYWORD2>Note_head_line_engraver</KEYWORD2>
-	<KEYWORD2>spacing-options-interface</KEYWORD2>
-	<KEYWORD2>Dot_column_engraver</KEYWORD2>
-	<KEYWORD2>Chord_tremolo_engraver</KEYWORD2>
-	<KEYWORD2>bass-figure-interface</KEYWORD2>
-	<KEYWORD2>ottava-bracket-interface</KEYWORD2>
-	<KEYWORD2>Bar_number_engraver</KEYWORD2>
-	<KEYWORD2>Axis_group_engraver</KEYWORD2>
-	<KEYWORD2>tuplet-bracket-interface</KEYWORD2>
-	<KEYWORD2>Phrasing_slur_engraver</KEYWORD2>
-	<KEYWORD2>Dynamic_align_engraver</KEYWORD2>
-	<KEYWORD2>Piano_pedal_align_engraver</KEYWORD2>
-	<KEYWORD2>Collision_engraver</KEYWORD2>
-	<KEYWORD2>Dots_engraver</KEYWORD2>
-	<KEYWORD2>New_fingering_engraver</KEYWORD2>
-	<KEYWORD2>Figured_bass_engraver</KEYWORD2>
-	<KEYWORD2>dot-column-interface</KEYWORD2>
-	<KEYWORD2>multi-measure-interface</KEYWORD2>
-	<KEYWORD2>Fretboard_engraver</KEYWORD2>
-	<KEYWORD2>ligature-interface</KEYWORD2>
-	<KEYWORD2>instrument-specific-markup-interface</KEYWORD2>
-	<KEYWORD2>time-signature-interface</KEYWORD2>
-	<KEYWORD2>Metronome_mark_engraver</KEYWORD2>
-	<KEYWORD2>break-alignment-interface</KEYWORD2>
-	<KEYWORD2>Auto_beam_engraver</KEYWORD2>
-	<KEYWORD2>balloon-interface</KEYWORD2>
-	<KEYWORD2>VaticanaStaff</KEYWORD2>
-	<KEYWORD2>Script_engraver</KEYWORD2>
-	<KEYWORD2>System_start_delimiter_engraver</KEYWORD2>
-	<KEYWORD2>spacing-interface</KEYWORD2>
-	<KEYWORD2>ligature-bracket-interface</KEYWORD2>
-	<KEYWORD2>percent-repeat-interface</KEYWORD2>
-	<KEYWORD2>ChordNames</KEYWORD2>
-	<KEYWORD2>finger-interface</KEYWORD2>
-	<KEYWORD2>TabStaff</KEYWORD2>
-	<KEYWORD2>cluster-interface</KEYWORD2>
-	<KEYWORD2>Beam_engraver</KEYWORD2>
-	<KEYWORD2>RhythmicStaff</KEYWORD2>
-	<KEYWORD2>String_number_engraver</KEYWORD2>
-	<KEYWORD2>Dynamic_performer</KEYWORD2>
-	<KEYWORD2>piano-pedal-bracket-interface</KEYWORD2>
-	<KEYWORD2>Parenthesis_engraver</KEYWORD2>
-	<KEYWORD2>Tab_staff_symbol_engraver</KEYWORD2>
-	<KEYWORD2>paper-column-interface</KEYWORD2>
-	<KEYWORD2>Note_heads_engraver</KEYWORD2>
-	<KEYWORD2>MensuralStaff</KEYWORD2>
-	<KEYWORD2>line-spanner-interface</KEYWORD2>
-<!-- GUILE procedures -->
-<KEYWORD2>#:behaviour</KEYWORD2>
-<KEYWORD2>#:column</KEYWORD2>
-<KEYWORD2>#:condition</KEYWORD2>
-<KEYWORD2>#:depth</KEYWORD2>
-<KEYWORD2>#:exit-depth</KEYWORD2>
-<KEYWORD2>#:expression</KEYWORD2>
-<KEYWORD2>#:file-name</KEYWORD2>
-<KEYWORD2>#:file-regexp</KEYWORD2>
-<KEYWORD2>#:line</KEYWORD2>
-<KEYWORD2>#:procedure</KEYWORD2>
-<KEYWORD2>#:repeat-identical-behaviour</KEYWORD2>
-<KEYWORD2>#:single-shot</KEYWORD2>
-<KEYWORD2>#:skip-count</KEYWORD2>
-<KEYWORD2>$abs</KEYWORD2>
-<KEYWORD2>$acos</KEYWORD2>
-<KEYWORD2>$acosh</KEYWORD2>
-<KEYWORD2>$asin</KEYWORD2>
-<KEYWORD2>$asinh</KEYWORD2>
-<KEYWORD2>$atan</KEYWORD2>
-<KEYWORD2>$atan2</KEYWORD2>
-<KEYWORD2>$atanh</KEYWORD2>
-<KEYWORD2>$cos</KEYWORD2>
-<KEYWORD2>$cosh</KEYWORD2>
-<KEYWORD2>$exp</KEYWORD2>
-<KEYWORD2>$expt</KEYWORD2>
-<KEYWORD2>$log</KEYWORD2>
-<KEYWORD2>$sin</KEYWORD2>
-<KEYWORD2>$sinh</KEYWORD2>
-<KEYWORD2>$sqrt</KEYWORD2>
-<KEYWORD2>$tan</KEYWORD2>
-<KEYWORD2>$tanh</KEYWORD2>
-<KEYWORD2>%library-dir</KEYWORD2>
-<KEYWORD2>%make-void-port</KEYWORD2>
-<KEYWORD2>%package-data-dir</KEYWORD2>
-<KEYWORD2>%read-delimited!</KEYWORD2>
-<KEYWORD2>%read-line</KEYWORD2>
-<KEYWORD2>%search-load-path</KEYWORD2>
-<KEYWORD2>%site-dir</KEYWORD2>
-<KEYWORD2>,@</KEYWORD2>
-<KEYWORD2>-&gt;char-set</KEYWORD2>
-<KEYWORD2>1+</KEYWORD2>
-<KEYWORD2>1-</KEYWORD2>
-<KEYWORD2>&lt;apply-trap&gt;</KEYWORD2>
-<KEYWORD2>&lt;entry-trap&gt;</KEYWORD2>
-<KEYWORD2>&lt;exit-trap&gt;</KEYWORD2>
-<KEYWORD2>&lt;group&gt;-disable</KEYWORD2>
-<KEYWORD2>&lt;group&gt;-enable</KEYWORD2>
-<KEYWORD2>&lt;group&gt;-options</KEYWORD2>
-<KEYWORD2>&lt;group&gt;-set!</KEYWORD2>
-<KEYWORD2>&lt;location-trap&gt;</KEYWORD2>
-<KEYWORD2>&lt;procedure-trap&gt;</KEYWORD2>
-<KEYWORD2>&lt;source-trap&gt;</KEYWORD2>
-<KEYWORD2>&lt;step-trap&gt;</KEYWORD2>
-<KEYWORD2>&lt;trap&gt;</KEYWORD2>
-<KEYWORD2>abs</KEYWORD2>
-<KEYWORD2>accept</KEYWORD2>
-<KEYWORD2>access?</KEYWORD2>
-<KEYWORD2>acons</KEYWORD2>
-<KEYWORD2>acos</KEYWORD2>
-<KEYWORD2>acosh</KEYWORD2>
-<KEYWORD2>activate-readline</KEYWORD2>
-<KEYWORD2>add-duration</KEYWORD2>
-<KEYWORD2>add-duration!</KEYWORD2>
-<KEYWORD2>add-hook!</KEYWORD2>
-<KEYWORD2>alarm</KEYWORD2>
-<KEYWORD2>alist-&gt;hash-table</KEYWORD2>
-<KEYWORD2>alist-cons</KEYWORD2>
-<KEYWORD2>alist-copy</KEYWORD2>
-<KEYWORD2>alist-delete</KEYWORD2>
-<KEYWORD2>alist-delete!</KEYWORD2>
-<KEYWORD2>all-threads</KEYWORD2>
-<KEYWORD2>all-traps</KEYWORD2>
-<KEYWORD2>and</KEYWORD2>
-<KEYWORD2>and-let*</KEYWORD2>
-<KEYWORD2>angle</KEYWORD2>
-<KEYWORD2>any</KEYWORD2>
-<KEYWORD2>any-&gt;c32vector</KEYWORD2>
-<KEYWORD2>any-&gt;c64vector</KEYWORD2>
-<KEYWORD2>any-&gt;f32vector</KEYWORD2>
-<KEYWORD2>any-&gt;f64vector</KEYWORD2>
-<KEYWORD2>any-&gt;s16vector</KEYWORD2>
-<KEYWORD2>any-&gt;s32vector</KEYWORD2>
-<KEYWORD2>any-&gt;s64vector</KEYWORD2>
-<KEYWORD2>any-&gt;s8vector</KEYWORD2>
-<KEYWORD2>any-&gt;u16vector</KEYWORD2>
-<KEYWORD2>any-&gt;u32vector</KEYWORD2>
-<KEYWORD2>any-&gt;u64vector</KEYWORD2>
-<KEYWORD2>any-&gt;u8vector</KEYWORD2>
-<KEYWORD2>any-bits-set?</KEYWORD2>
-<KEYWORD2>append</KEYWORD2>
-<KEYWORD2>append!</KEYWORD2>
-<KEYWORD2>append-map</KEYWORD2>
-<KEYWORD2>append-map!</KEYWORD2>
-<KEYWORD2>append-reverse</KEYWORD2>
-<KEYWORD2>append-reverse!</KEYWORD2>
-<KEYWORD2>apply</KEYWORD2>
-<KEYWORD2>apply:nconc2last</KEYWORD2>
-<KEYWORD2>apropos-completion-function</KEYWORD2>
-<KEYWORD2>args-fold</KEYWORD2>
-<KEYWORD2>arithmetic-shift</KEYWORD2>
-<KEYWORD2>array-&gt;list</KEYWORD2>
-<KEYWORD2>array-contents</KEYWORD2>
-<KEYWORD2>array-copy!</KEYWORD2>
-<KEYWORD2>array-copy-in-order!</KEYWORD2>
-<KEYWORD2>array-dimensions</KEYWORD2>
-<KEYWORD2>array-equal?</KEYWORD2>
-<KEYWORD2>array-fill!</KEYWORD2>
-<KEYWORD2>array-for-each</KEYWORD2>
-<KEYWORD2>array-in-bounds?</KEYWORD2>
-<KEYWORD2>array-index-map!</KEYWORD2>
-<KEYWORD2>array-map!</KEYWORD2>
-<KEYWORD2>array-map-in-order!</KEYWORD2>
-<KEYWORD2>array-rank</KEYWORD2>
-<KEYWORD2>array-ref</KEYWORD2>
-<KEYWORD2>array-set!</KEYWORD2>
-<KEYWORD2>array-shape</KEYWORD2>
-<KEYWORD2>array-type</KEYWORD2>
-<KEYWORD2>array?</KEYWORD2>
-<KEYWORD2>ash</KEYWORD2>
-<KEYWORD2>asin</KEYWORD2>
-<KEYWORD2>asinh</KEYWORD2>
-<KEYWORD2>assoc</KEYWORD2>
-<KEYWORD2>assoc</KEYWORD2>
-<KEYWORD2>assoc-ref</KEYWORD2>
-<KEYWORD2>assoc-remove!</KEYWORD2>
-<KEYWORD2>assoc-set!</KEYWORD2>
-<KEYWORD2>assq</KEYWORD2>
-<KEYWORD2>assq-ref</KEYWORD2>
-<KEYWORD2>assq-remove!</KEYWORD2>
-<KEYWORD2>assq-set!</KEYWORD2>
-<KEYWORD2>assv</KEYWORD2>
-<KEYWORD2>assv-ref</KEYWORD2>
-<KEYWORD2>assv-remove!</KEYWORD2>
-<KEYWORD2>assv-set!</KEYWORD2>
-<KEYWORD2>async</KEYWORD2>
-<KEYWORD2>async-mark</KEYWORD2>
-<KEYWORD2>atan</KEYWORD2>
-<KEYWORD2>atanh</KEYWORD2>
-<KEYWORD2>backtrace</KEYWORD2>
-<KEYWORD2>backtrace</KEYWORD2>
-<KEYWORD2>basename</KEYWORD2>
-<KEYWORD2>begin</KEYWORD2>
-<KEYWORD2>begin-thread</KEYWORD2>
-<KEYWORD2>bind</KEYWORD2>
-<KEYWORD2>bind-textdomain-codeset</KEYWORD2>
-<KEYWORD2>bindtextdomain</KEYWORD2>
-<KEYWORD2>bit-count</KEYWORD2>
-<KEYWORD2>bit-count</KEYWORD2>
-<KEYWORD2>bit-count*</KEYWORD2>
-<KEYWORD2>bit-extract</KEYWORD2>
-<KEYWORD2>bit-field</KEYWORD2>
-<KEYWORD2>bit-invert!</KEYWORD2>
-<KEYWORD2>bit-position</KEYWORD2>
-<KEYWORD2>bit-set*!</KEYWORD2>
-<KEYWORD2>bit-set?</KEYWORD2>
-<KEYWORD2>bitvector</KEYWORD2>
-<KEYWORD2>bitvector-&gt;list</KEYWORD2>
-<KEYWORD2>bitvector-fill!</KEYWORD2>
-<KEYWORD2>bitvector-length</KEYWORD2>
-<KEYWORD2>bitvector-ref</KEYWORD2>
-<KEYWORD2>bitvector-set!</KEYWORD2>
-<KEYWORD2>bitvector?</KEYWORD2>
-<KEYWORD2>bitwise-and</KEYWORD2>
-<KEYWORD2>bitwise-if</KEYWORD2>
-<KEYWORD2>bitwise-ior</KEYWORD2>
-<KEYWORD2>bitwise-merge</KEYWORD2>
-<KEYWORD2>bitwise-not</KEYWORD2>
-<KEYWORD2>bitwise-xor</KEYWORD2>
-<KEYWORD2>boolean?</KEYWORD2>
-<KEYWORD2>booleans-&gt;integer</KEYWORD2>
-<KEYWORD2>break</KEYWORD2>
-<KEYWORD2>break</KEYWORD2>
-<KEYWORD2>break!</KEYWORD2>
-<KEYWORD2>broadcast-condition-variable</KEYWORD2>
-<KEYWORD2>bt</KEYWORD2>
-<KEYWORD2>c32vector</KEYWORD2>
-<KEYWORD2>c32vector-&gt;list</KEYWORD2>
-<KEYWORD2>c32vector-length</KEYWORD2>
-<KEYWORD2>c32vector-ref</KEYWORD2>
-<KEYWORD2>c32vector-set!</KEYWORD2>
-<KEYWORD2>c32vector?</KEYWORD2>
-<KEYWORD2>c64vector</KEYWORD2>
-<KEYWORD2>c64vector-&gt;list</KEYWORD2>
-<KEYWORD2>c64vector-length</KEYWORD2>
-<KEYWORD2>c64vector-ref</KEYWORD2>
-<KEYWORD2>c64vector-set!</KEYWORD2>
-<KEYWORD2>c64vector?</KEYWORD2>
-<KEYWORD2>caaaar</KEYWORD2>
-<KEYWORD2>caaadr</KEYWORD2>
-<KEYWORD2>caaar</KEYWORD2>
-<KEYWORD2>caadar</KEYWORD2>
-<KEYWORD2>caaddr</KEYWORD2>
-<KEYWORD2>caadr</KEYWORD2>
-<KEYWORD2>caar</KEYWORD2>
-<KEYWORD2>cadaar</KEYWORD2>
-<KEYWORD2>cadadr</KEYWORD2>
-<KEYWORD2>cadar</KEYWORD2>
-<KEYWORD2>caddar</KEYWORD2>
-<KEYWORD2>cadddr</KEYWORD2>
-<KEYWORD2>caddr</KEYWORD2>
-<KEYWORD2>cadr</KEYWORD2>
-<KEYWORD2>call-with-blocked-asyncs</KEYWORD2>
-<KEYWORD2>call-with-current-continuation</KEYWORD2>
-<KEYWORD2>call-with-input-file</KEYWORD2>
-<KEYWORD2>call-with-input-string</KEYWORD2>
-<KEYWORD2>call-with-new-thread</KEYWORD2>
-<KEYWORD2>call-with-output-file</KEYWORD2>
-<KEYWORD2>call-with-output-string</KEYWORD2>
-<KEYWORD2>call-with-unblocked-asyncs</KEYWORD2>
-<KEYWORD2>call-with-values</KEYWORD2>
-<KEYWORD2>call/cc</KEYWORD2>
-<KEYWORD2>car</KEYWORD2>
-<KEYWORD2>car+cdr</KEYWORD2>
-<KEYWORD2>case</KEYWORD2>
-<KEYWORD2>case-lambda</KEYWORD2>
-<KEYWORD2>catch</KEYWORD2>
-<KEYWORD2>cd</KEYWORD2>
-<KEYWORD2>cdaaar</KEYWORD2>
-<KEYWORD2>cdaadr</KEYWORD2>
-<KEYWORD2>cdaar</KEYWORD2>
-<KEYWORD2>cdadar</KEYWORD2>
-<KEYWORD2>cdaddr</KEYWORD2>
-<KEYWORD2>cdadr</KEYWORD2>
-<KEYWORD2>cdar</KEYWORD2>
-<KEYWORD2>cddaar</KEYWORD2>
-<KEYWORD2>cddadr</KEYWORD2>
-<KEYWORD2>cddar</KEYWORD2>
-<KEYWORD2>cdddar</KEYWORD2>
-<KEYWORD2>cddddr</KEYWORD2>
-<KEYWORD2>cdddr</KEYWORD2>
-<KEYWORD2>cddr</KEYWORD2>
-<KEYWORD2>cdr</KEYWORD2>
-<KEYWORD2>ceiling</KEYWORD2>
-<KEYWORD2>char-&gt;integer</KEYWORD2>
-<KEYWORD2>char-alphabetic?</KEYWORD2>
-<KEYWORD2>char-ci&lt;=?</KEYWORD2>
-<KEYWORD2>char-ci&lt;?</KEYWORD2>
-<KEYWORD2>char-ci=?</KEYWORD2>
-<KEYWORD2>char-ci&gt;=?</KEYWORD2>
-<KEYWORD2>char-ci&gt;?</KEYWORD2>
-<KEYWORD2>char-downcase</KEYWORD2>
-<KEYWORD2>char-is-both?</KEYWORD2>
-<KEYWORD2>char-lower-case?</KEYWORD2>
-<KEYWORD2>char-numeric?</KEYWORD2>
-<KEYWORD2>char-ready?</KEYWORD2>
-<KEYWORD2>char-set</KEYWORD2>
-<KEYWORD2>char-set-&gt;list</KEYWORD2>
-<KEYWORD2>char-set-&gt;string</KEYWORD2>
-<KEYWORD2>char-set-adjoin</KEYWORD2>
-<KEYWORD2>char-set-adjoin!</KEYWORD2>
-<KEYWORD2>char-set-any</KEYWORD2>
-<KEYWORD2>char-set-complement</KEYWORD2>
-<KEYWORD2>char-set-complement!</KEYWORD2>
-<KEYWORD2>char-set-contains?</KEYWORD2>
-<KEYWORD2>char-set-copy</KEYWORD2>
-<KEYWORD2>char-set-count</KEYWORD2>
-<KEYWORD2>char-set-cursor</KEYWORD2>
-<KEYWORD2>char-set-cursor-next</KEYWORD2>
-<KEYWORD2>char-set-delete</KEYWORD2>
-<KEYWORD2>char-set-delete!</KEYWORD2>
-<KEYWORD2>char-set-diff+intersection</KEYWORD2>
-<KEYWORD2>char-set-diff+intersection!</KEYWORD2>
-<KEYWORD2>char-set-difference</KEYWORD2>
-<KEYWORD2>char-set-difference!</KEYWORD2>
-<KEYWORD2>char-set-every</KEYWORD2>
-<KEYWORD2>char-set-filter</KEYWORD2>
-<KEYWORD2>char-set-filter!</KEYWORD2>
-<KEYWORD2>char-set-fold</KEYWORD2>
-<KEYWORD2>char-set-for-each</KEYWORD2>
-<KEYWORD2>char-set-hash</KEYWORD2>
-<KEYWORD2>char-set-intersection</KEYWORD2>
-<KEYWORD2>char-set-intersection!</KEYWORD2>
-<KEYWORD2>char-set-map</KEYWORD2>
-<KEYWORD2>char-set-ref</KEYWORD2>
-<KEYWORD2>char-set-size</KEYWORD2>
-<KEYWORD2>char-set-unfold</KEYWORD2>
-<KEYWORD2>char-set-unfold!</KEYWORD2>
-<KEYWORD2>char-set-union</KEYWORD2>
-<KEYWORD2>char-set-union!</KEYWORD2>
-<KEYWORD2>char-set-xor</KEYWORD2>
-<KEYWORD2>char-set-xor!</KEYWORD2>
-<KEYWORD2>char-set&lt;=</KEYWORD2>
-<KEYWORD2>char-set=</KEYWORD2>
-<KEYWORD2>char-set?</KEYWORD2>
-<KEYWORD2>char-upcase</KEYWORD2>
-<KEYWORD2>char-upper-case?</KEYWORD2>
-<KEYWORD2>char-whitespace?</KEYWORD2>
-<KEYWORD2>char&lt;=?</KEYWORD2>
-<KEYWORD2>char&lt;?</KEYWORD2>
-<KEYWORD2>char=?</KEYWORD2>
-<KEYWORD2>char&gt;=?</KEYWORD2>
-<KEYWORD2>char&gt;?</KEYWORD2>
-<KEYWORD2>char?</KEYWORD2>
-<KEYWORD2>chdir</KEYWORD2>
-<KEYWORD2>chmod</KEYWORD2>
-<KEYWORD2>chown</KEYWORD2>
-<KEYWORD2>chroot</KEYWORD2>
-<KEYWORD2>circular-list</KEYWORD2>
-<KEYWORD2>circular-list?</KEYWORD2>
-<KEYWORD2>close</KEYWORD2>
-<KEYWORD2>close-fdes</KEYWORD2>
-<KEYWORD2>close-input-port</KEYWORD2>
-<KEYWORD2>close-output-port</KEYWORD2>
-<KEYWORD2>close-pipe</KEYWORD2>
-<KEYWORD2>close-port</KEYWORD2>
-<KEYWORD2>closedir</KEYWORD2>
-<KEYWORD2>closure?</KEYWORD2>
-<KEYWORD2>command-line</KEYWORD2>
-<KEYWORD2>complex?</KEYWORD2>
-<KEYWORD2>concatenate</KEYWORD2>
-<KEYWORD2>concatenate!</KEYWORD2>
-<KEYWORD2>cond</KEYWORD2>
-<KEYWORD2>cond-expand</KEYWORD2>
-<KEYWORD2>condition</KEYWORD2>
-<KEYWORD2>condition-has-type?</KEYWORD2>
-<KEYWORD2>condition-message</KEYWORD2>
-<KEYWORD2>condition-ref</KEYWORD2>
-<KEYWORD2>condition-type?</KEYWORD2>
-<KEYWORD2>connect</KEYWORD2>
-<KEYWORD2>cons</KEYWORD2>
-<KEYWORD2>cons*</KEYWORD2>
-<KEYWORD2>cons-source</KEYWORD2>
-<KEYWORD2>continue</KEYWORD2>
-<KEYWORD2>continue</KEYWORD2>
-<KEYWORD2>copy-bit</KEYWORD2>
-<KEYWORD2>copy-bit-field</KEYWORD2>
-<KEYWORD2>copy-file</KEYWORD2>
-<KEYWORD2>copy-random-state</KEYWORD2>
-<KEYWORD2>copy-time</KEYWORD2>
-<KEYWORD2>copy-tree</KEYWORD2>
-<KEYWORD2>cos</KEYWORD2>
-<KEYWORD2>cosh</KEYWORD2>
-<KEYWORD2>count</KEYWORD2>
-<KEYWORD2>crypt</KEYWORD2>
-<KEYWORD2>ctermid</KEYWORD2>
-<KEYWORD2>current-date</KEYWORD2>
-<KEYWORD2>current-dynamic-state</KEYWORD2>
-<KEYWORD2>current-error-port</KEYWORD2>
-<KEYWORD2>current-error-port</KEYWORD2>
-<KEYWORD2>current-input-port</KEYWORD2>
-<KEYWORD2>current-input-port</KEYWORD2>
-<KEYWORD2>current-julian-day</KEYWORD2>
-<KEYWORD2>current-load-port</KEYWORD2>
-<KEYWORD2>current-modified-julian-day</KEYWORD2>
-<KEYWORD2>current-module</KEYWORD2>
-<KEYWORD2>current-output-port</KEYWORD2>
-<KEYWORD2>current-output-port</KEYWORD2>
-<KEYWORD2>current-thread</KEYWORD2>
-<KEYWORD2>current-time</KEYWORD2>
-<KEYWORD2>current-time</KEYWORD2>
-<KEYWORD2>cuserid</KEYWORD2>
-<KEYWORD2>cut</KEYWORD2>
-<KEYWORD2>cute</KEYWORD2>
-<KEYWORD2>date-&gt;julian-day</KEYWORD2>
-<KEYWORD2>date-&gt;modified-julian-day</KEYWORD2>
-<KEYWORD2>date-&gt;string</KEYWORD2>
-<KEYWORD2>date-&gt;time-monotonic</KEYWORD2>
-<KEYWORD2>date-&gt;time-tai</KEYWORD2>
-<KEYWORD2>date-&gt;time-utc</KEYWORD2>
-<KEYWORD2>date-day</KEYWORD2>
-<KEYWORD2>date-hour</KEYWORD2>
-<KEYWORD2>date-minute</KEYWORD2>
-<KEYWORD2>date-month</KEYWORD2>
-<KEYWORD2>date-nanosecond</KEYWORD2>
-<KEYWORD2>date-second</KEYWORD2>
-<KEYWORD2>date-week-day</KEYWORD2>
-<KEYWORD2>date-week-number</KEYWORD2>
-<KEYWORD2>date-year</KEYWORD2>
-<KEYWORD2>date-year-day</KEYWORD2>
-<KEYWORD2>date-zone-offset</KEYWORD2>
-<KEYWORD2>date?</KEYWORD2>
-<KEYWORD2>debug</KEYWORD2>
-<KEYWORD2>debug-disable</KEYWORD2>
-<KEYWORD2>debug-enable</KEYWORD2>
-<KEYWORD2>debug-object?</KEYWORD2>
-<KEYWORD2>debug-options</KEYWORD2>
-<KEYWORD2>debug-options-interface</KEYWORD2>
-<KEYWORD2>debug-set!</KEYWORD2>
-<KEYWORD2>debug-trap</KEYWORD2>
-<KEYWORD2>default-duplicate-binding-handler</KEYWORD2>
-<KEYWORD2>define</KEYWORD2>
-<KEYWORD2>define*</KEYWORD2>
-<KEYWORD2>define*-public</KEYWORD2>
-<KEYWORD2>define-condition-type</KEYWORD2>
-<KEYWORD2>define-macro</KEYWORD2>
-<KEYWORD2>define-module</KEYWORD2>
-<KEYWORD2>define-public</KEYWORD2>
-<KEYWORD2>define-reader-ctor</KEYWORD2>
-<KEYWORD2>define-record-type</KEYWORD2>
-<KEYWORD2>defined?</KEYWORD2>
-<KEYWORD2>defmacro</KEYWORD2>
-<KEYWORD2>defmacro*</KEYWORD2>
-<KEYWORD2>defmacro*-public</KEYWORD2>
-<KEYWORD2>delay</KEYWORD2>
-<KEYWORD2>delete</KEYWORD2>
-<KEYWORD2>delete</KEYWORD2>
-<KEYWORD2>delete!</KEYWORD2>
-<KEYWORD2>delete!</KEYWORD2>
-<KEYWORD2>delete-duplicates</KEYWORD2>
-<KEYWORD2>delete-duplicates!</KEYWORD2>
-<KEYWORD2>delete-file</KEYWORD2>
-<KEYWORD2>delete1!</KEYWORD2>
-<KEYWORD2>delq</KEYWORD2>
-<KEYWORD2>delq!</KEYWORD2>
-<KEYWORD2>delq1!</KEYWORD2>
-<KEYWORD2>delv</KEYWORD2>
-<KEYWORD2>delv!</KEYWORD2>
-<KEYWORD2>delv1!</KEYWORD2>
-<KEYWORD2>denominator</KEYWORD2>
-<KEYWORD2>deq!</KEYWORD2>
-<KEYWORD2>directory-stream?</KEYWORD2>
-<KEYWORD2>dirname</KEYWORD2>
-<KEYWORD2>display</KEYWORD2>
-<KEYWORD2>display-application</KEYWORD2>
-<KEYWORD2>display-backtrace</KEYWORD2>
-<KEYWORD2>display-error</KEYWORD2>
-<!--  KEYWORD2>do</KEYWORD2 -->
-<KEYWORD2>dotted-list?</KEYWORD2>
-<KEYWORD2>doubly-weak-hash-table?</KEYWORD2>
-<KEYWORD2>down</KEYWORD2>
-<KEYWORD2>drain-input</KEYWORD2>
-<KEYWORD2>drop</KEYWORD2>
-<KEYWORD2>drop-right</KEYWORD2>
-<KEYWORD2>drop-right!</KEYWORD2>
-<KEYWORD2>drop-while</KEYWORD2>
-<KEYWORD2>dup</KEYWORD2>
-<KEYWORD2>dup-&gt;fdes</KEYWORD2>
-<KEYWORD2>dup-&gt;inport</KEYWORD2>
-<KEYWORD2>dup-&gt;outport</KEYWORD2>
-<KEYWORD2>dup-&gt;port</KEYWORD2>
-<KEYWORD2>dup2</KEYWORD2>
-<KEYWORD2>duplicate-port</KEYWORD2>
-<KEYWORD2>dynamic-args-call</KEYWORD2>
-<KEYWORD2>dynamic-call</KEYWORD2>
-<KEYWORD2>dynamic-func</KEYWORD2>
-<KEYWORD2>dynamic-link</KEYWORD2>
-<KEYWORD2>dynamic-object?</KEYWORD2>
-<KEYWORD2>dynamic-state?</KEYWORD2>
-<KEYWORD2>dynamic-unlink</KEYWORD2>
-<KEYWORD2>dynamic-wind</KEYWORD2>
-<KEYWORD2>effective-version</KEYWORD2>
-<KEYWORD2>eighth</KEYWORD2>
-<KEYWORD2>enclose-array</KEYWORD2>
-<KEYWORD2>end-of-char-set?</KEYWORD2>
-<KEYWORD2>endgrent</KEYWORD2>
-<KEYWORD2>endhostent</KEYWORD2>
-<KEYWORD2>endnetent</KEYWORD2>
-<KEYWORD2>endprotoent</KEYWORD2>
-<KEYWORD2>endpwent</KEYWORD2>
-<KEYWORD2>endservent</KEYWORD2>
-<KEYWORD2>enq!</KEYWORD2>
-<KEYWORD2>entity?</KEYWORD2>
-<KEYWORD2>environ</KEYWORD2>
-<KEYWORD2>eof-object?</KEYWORD2>
-<KEYWORD2>eq?</KEYWORD2>
-<KEYWORD2>equal?</KEYWORD2>
-<KEYWORD2>eqv?</KEYWORD2>
-<KEYWORD2>error</KEYWORD2>
-<KEYWORD2>error?</KEYWORD2>
-<KEYWORD2>eval</KEYWORD2>
-<KEYWORD2>eval-disable</KEYWORD2>
-<KEYWORD2>eval-enable</KEYWORD2>
-<KEYWORD2>eval-options</KEYWORD2>
-<KEYWORD2>eval-options-interface</KEYWORD2>
-<KEYWORD2>eval-options-interface</KEYWORD2>
-<KEYWORD2>eval-set!</KEYWORD2>
-<KEYWORD2>eval-string</KEYWORD2>
-<KEYWORD2>evaluate</KEYWORD2>
-<KEYWORD2>evaluator-traps-interface</KEYWORD2>
-<KEYWORD2>evaluator-traps-interface</KEYWORD2>
-<KEYWORD2>even?</KEYWORD2>
-<KEYWORD2>every</KEYWORD2>
-<KEYWORD2>exact-&gt;inexact</KEYWORD2>
-<KEYWORD2>exact?</KEYWORD2>
-<KEYWORD2>execl</KEYWORD2>
-<KEYWORD2>execle</KEYWORD2>
-<KEYWORD2>execlp</KEYWORD2>
-<KEYWORD2>exp</KEYWORD2>
-<KEYWORD2>expect</KEYWORD2>
-<KEYWORD2>expect-strings</KEYWORD2>
-<KEYWORD2>export</KEYWORD2>
-<KEYWORD2>expt</KEYWORD2>
-<KEYWORD2>extract-condition</KEYWORD2>
-<KEYWORD2>f32vector</KEYWORD2>
-<KEYWORD2>f32vector-&gt;list</KEYWORD2>
-<KEYWORD2>f32vector-length</KEYWORD2>
-<KEYWORD2>f32vector-ref</KEYWORD2>
-<KEYWORD2>f32vector-set!</KEYWORD2>
-<KEYWORD2>f32vector?</KEYWORD2>
-<KEYWORD2>f64vector</KEYWORD2>
-<KEYWORD2>f64vector-&gt;list</KEYWORD2>
-<KEYWORD2>f64vector-length</KEYWORD2>
-<KEYWORD2>f64vector-ref</KEYWORD2>
-<KEYWORD2>f64vector-set!</KEYWORD2>
-<KEYWORD2>f64vector?</KEYWORD2>
-<KEYWORD2>false-if-exception</KEYWORD2>
-<KEYWORD2>fchmod</KEYWORD2>
-<KEYWORD2>fchown</KEYWORD2>
-<KEYWORD2>fcntl</KEYWORD2>
-<KEYWORD2>fdes-&gt;inport</KEYWORD2>
-<KEYWORD2>fdes-&gt;outport</KEYWORD2>
-<KEYWORD2>fdes-&gt;ports</KEYWORD2>
-<KEYWORD2>fdopen</KEYWORD2>
-<KEYWORD2>feature?</KEYWORD2>
-<KEYWORD2>fflush</KEYWORD2>
-<KEYWORD2>fifth</KEYWORD2>
-<KEYWORD2>file-exists?</KEYWORD2>
-<KEYWORD2>file-port?</KEYWORD2>
-<KEYWORD2>filename-completion-function</KEYWORD2>
-<KEYWORD2>fileno</KEYWORD2>
-<KEYWORD2>filter</KEYWORD2>
-<KEYWORD2>filter!</KEYWORD2>
-<KEYWORD2>filter-map</KEYWORD2>
-<KEYWORD2>find</KEYWORD2>
-<KEYWORD2>find-tail</KEYWORD2>
-<KEYWORD2>finish</KEYWORD2>
-<KEYWORD2>first</KEYWORD2>
-<KEYWORD2>first-set-bit</KEYWORD2>
-<KEYWORD2>flock</KEYWORD2>
-<KEYWORD2>floor</KEYWORD2>
-<KEYWORD2>fluid-ref</KEYWORD2>
-<KEYWORD2>fluid-set!</KEYWORD2>
-<KEYWORD2>fluid?</KEYWORD2>
-<KEYWORD2>flush-all-ports</KEYWORD2>
-<KEYWORD2>fn</KEYWORD2>
-<KEYWORD2>fold</KEYWORD2>
-<KEYWORD2>fold-matches</KEYWORD2>
-<KEYWORD2>fold-right</KEYWORD2>
-<KEYWORD2>for-each</KEYWORD2>
-<KEYWORD2>for-each</KEYWORD2>
-<KEYWORD2>force</KEYWORD2>
-<KEYWORD2>force-output</KEYWORD2>
-<KEYWORD2>format</KEYWORD2>
-<KEYWORD2>fourth</KEYWORD2>
-<KEYWORD2>frame</KEYWORD2>
-<KEYWORD2>frame-arguments</KEYWORD2>
-<KEYWORD2>frame-evaluating-args?</KEYWORD2>
-<KEYWORD2>frame-next</KEYWORD2>
-<KEYWORD2>frame-number</KEYWORD2>
-<KEYWORD2>frame-overflow?</KEYWORD2>
-<KEYWORD2>frame-previous</KEYWORD2>
-<KEYWORD2>frame-procedure</KEYWORD2>
-<KEYWORD2>frame-procedure?</KEYWORD2>
-<KEYWORD2>frame-real?</KEYWORD2>
-<KEYWORD2>frame-source</KEYWORD2>
-<KEYWORD2>frame?</KEYWORD2>
-<KEYWORD2>fstat</KEYWORD2>
-<KEYWORD2>fsync</KEYWORD2>
-<KEYWORD2>ftell</KEYWORD2>
-<KEYWORD2>ftruncate</KEYWORD2>
-<KEYWORD2>ftw</KEYWORD2>
-<KEYWORD2>gc</KEYWORD2>
-<KEYWORD2>gc-live-object-stats</KEYWORD2>
-<KEYWORD2>gc-stats</KEYWORD2>
-<KEYWORD2>gcd</KEYWORD2>
-<KEYWORD2>gds-apropos</KEYWORD2>
-<KEYWORD2>gds-complete-symbol</KEYWORD2>
-<KEYWORD2>gds-debug-trap</KEYWORD2>
-<KEYWORD2>gds-down</KEYWORD2>
-<KEYWORD2>gds-eval-defun</KEYWORD2>
-<KEYWORD2>gds-eval-expression</KEYWORD2>
-<KEYWORD2>gds-eval-last-sexp</KEYWORD2>
-<KEYWORD2>gds-eval-region</KEYWORD2>
-<KEYWORD2>gds-evaluate</KEYWORD2>
-<KEYWORD2>gds-frame-args</KEYWORD2>
-<KEYWORD2>gds-frame-info</KEYWORD2>
-<KEYWORD2>gds-go</KEYWORD2>
-<KEYWORD2>gds-help-symbol</KEYWORD2>
-<KEYWORD2>gds-proc-source</KEYWORD2>
-<KEYWORD2>gds-select-stack-frame</KEYWORD2>
-<KEYWORD2>gds-step-file</KEYWORD2>
-<KEYWORD2>gds-step-into</KEYWORD2>
-<KEYWORD2>gds-step-over</KEYWORD2>
-<KEYWORD2>gds-up</KEYWORD2>
-<KEYWORD2>generalized-vector-&gt;list</KEYWORD2>
-<KEYWORD2>generalized-vector-length</KEYWORD2>
-<KEYWORD2>generalized-vector-ref</KEYWORD2>
-<KEYWORD2>generalized-vector-set!</KEYWORD2>
-<KEYWORD2>generalized-vector?</KEYWORD2>
-<KEYWORD2>gensym</KEYWORD2>
-<KEYWORD2>get-internal-real-time</KEYWORD2>
-<KEYWORD2>get-internal-run-time</KEYWORD2>
-<KEYWORD2>get-output-string</KEYWORD2>
-<KEYWORD2>get-print-state</KEYWORD2>
-<KEYWORD2>get-trap</KEYWORD2>
-<KEYWORD2>getcwd</KEYWORD2>
-<KEYWORD2>getegid</KEYWORD2>
-<KEYWORD2>getenv</KEYWORD2>
-<KEYWORD2>geteuid</KEYWORD2>
-<KEYWORD2>getgid</KEYWORD2>
-<KEYWORD2>getgr</KEYWORD2>
-<KEYWORD2>getgrent</KEYWORD2>
-<KEYWORD2>getgrgid</KEYWORD2>
-<KEYWORD2>getgrnam</KEYWORD2>
-<KEYWORD2>getgroups</KEYWORD2>
-<KEYWORD2>gethost</KEYWORD2>
-<KEYWORD2>gethostbyaddr</KEYWORD2>
-<KEYWORD2>gethostbyname</KEYWORD2>
-<KEYWORD2>gethostent</KEYWORD2>
-<KEYWORD2>gethostname</KEYWORD2>
-<KEYWORD2>getitimer</KEYWORD2>
-<KEYWORD2>getlogin</KEYWORD2>
-<KEYWORD2>getnet</KEYWORD2>
-<KEYWORD2>getnetbyaddr</KEYWORD2>
-<KEYWORD2>getnetbyname</KEYWORD2>
-<KEYWORD2>getnetent</KEYWORD2>
-<KEYWORD2>getopt-long</KEYWORD2>
-<KEYWORD2>getpass</KEYWORD2>
-<KEYWORD2>getpeername</KEYWORD2>
-<KEYWORD2>getpgrp</KEYWORD2>
-<KEYWORD2>getpid</KEYWORD2>
-<KEYWORD2>getppid</KEYWORD2>
-<KEYWORD2>getpriority</KEYWORD2>
-<KEYWORD2>getproto</KEYWORD2>
-<KEYWORD2>getprotobyname</KEYWORD2>
-<KEYWORD2>getprotobynumber</KEYWORD2>
-<KEYWORD2>getprotoent</KEYWORD2>
-<KEYWORD2>getpw</KEYWORD2>
-<KEYWORD2>getpwent</KEYWORD2>
-<KEYWORD2>getpwnam</KEYWORD2>
-<KEYWORD2>getpwuid</KEYWORD2>
-<KEYWORD2>getserv</KEYWORD2>
-<KEYWORD2>getservbyname</KEYWORD2>
-<KEYWORD2>getservbyport</KEYWORD2>
-<KEYWORD2>getservent</KEYWORD2>
-<KEYWORD2>getsockname</KEYWORD2>
-<KEYWORD2>getsockopt</KEYWORD2>
-<KEYWORD2>getter-with-setter</KEYWORD2>
-<KEYWORD2>gettext</KEYWORD2>
-<KEYWORD2>gettimeofday</KEYWORD2>
-<KEYWORD2>getuid</KEYWORD2>
-<KEYWORD2>GH_ALLOW_INTS</KEYWORD2>
-<KEYWORD2>gh_append</KEYWORD2>
-<KEYWORD2>gh_append2</KEYWORD2>
-<KEYWORD2>gh_append3</KEYWORD2>
-<KEYWORD2>gh_append4</KEYWORD2>
-<KEYWORD2>gh_apply</KEYWORD2>
-<KEYWORD2>gh_assoc</KEYWORD2>
-<KEYWORD2>gh_assq</KEYWORD2>
-<KEYWORD2>gh_assv</KEYWORD2>
-<KEYWORD2>gh_bool2scm</KEYWORD2>
-<KEYWORD2>gh_boolean_p</KEYWORD2>
-<KEYWORD2>gh_c</KEYWORD2>
-<KEYWORD2>gh_call0</KEYWORD2>
-<KEYWORD2>gh_call1</KEYWORD2>
-<KEYWORD2>gh_call2</KEYWORD2>
-<KEYWORD2>gh_call3</KEYWORD2>
-<KEYWORD2>gh_car</KEYWORD2>
-<KEYWORD2>gh_catch</KEYWORD2>
-<KEYWORD2>gh_cdr</KEYWORD2>
-<KEYWORD2>gh_char2scm</KEYWORD2>
-<KEYWORD2>gh_char_p</KEYWORD2>
-<KEYWORD2>gh_chars2byvect</KEYWORD2>
-<KEYWORD2>gh_cons</KEYWORD2>
-<KEYWORD2>GH_DEFER_INTS</KEYWORD2>
-<KEYWORD2>gh_define</KEYWORD2>
-<KEYWORD2>gh_double2scm</KEYWORD2>
-<KEYWORD2>gh_doubles2dvect</KEYWORD2>
-<KEYWORD2>gh_doubles2scm</KEYWORD2>
-<KEYWORD2>gh_enter</KEYWORD2>
-<KEYWORD2>gh_eq_p</KEYWORD2>
-<KEYWORD2>gh_equal_p</KEYWORD2>
-<KEYWORD2>gh_eqv_p</KEYWORD2>
-<KEYWORD2>gh_eval_file</KEYWORD2>
-<KEYWORD2>gh_eval_str</KEYWORD2>
-<KEYWORD2>gh_exact_p</KEYWORD2>
-<KEYWORD2>gh_floats2fvect</KEYWORD2>
-<KEYWORD2>gh_get_substr</KEYWORD2>
-<KEYWORD2>gh_inexact_p</KEYWORD2>
-<KEYWORD2>gh_ints2scm</KEYWORD2>
-<KEYWORD2>gh_is_eq</KEYWORD2>
-<KEYWORD2>gh_is_equal</KEYWORD2>
-<KEYWORD2>gh_is_eqv</KEYWORD2>
-<KEYWORD2>gh_length</KEYWORD2>
-<KEYWORD2>gh_list</KEYWORD2>
-<KEYWORD2>gh_list_p</KEYWORD2>
-<KEYWORD2>gh_list_ref</KEYWORD2>
-<KEYWORD2>gh_list_tail</KEYWORD2>
-<KEYWORD2>gh_list_to_vector</KEYWORD2>
-<KEYWORD2>gh_load</KEYWORD2>
-<KEYWORD2>gh_long2scm</KEYWORD2>
-<KEYWORD2>gh_longs2ivect</KEYWORD2>
-<KEYWORD2>gh_make_vector</KEYWORD2>
-<KEYWORD2>gh_member</KEYWORD2>
-<KEYWORD2>gh_memq</KEYWORD2>
-<KEYWORD2>gh_memv</KEYWORD2>
-<KEYWORD2>gh_new_procedure</KEYWORD2>
-<KEYWORD2>gh_null_p</KEYWORD2>
-<KEYWORD2>gh_obj_length</KEYWORD2>
-<KEYWORD2>gh_pair_p</KEYWORD2>
-<KEYWORD2>gh_procedure_p</KEYWORD2>
-<KEYWORD2>gh_repl</KEYWORD2>
-<KEYWORD2>gh_reverse</KEYWORD2>
-<KEYWORD2>gh_scm2bool</KEYWORD2>
-<KEYWORD2>gh_scm2char</KEYWORD2>
-<KEYWORD2>gh_scm2chars</KEYWORD2>
-<KEYWORD2>gh_scm2double</KEYWORD2>
-<KEYWORD2>gh_scm2doubles</KEYWORD2>
-<KEYWORD2>gh_scm2floats</KEYWORD2>
-<KEYWORD2>gh_scm2long</KEYWORD2>
-<KEYWORD2>gh_scm2longs</KEYWORD2>
-<KEYWORD2>gh_scm2newstr</KEYWORD2>
-<KEYWORD2>gh_scm2shorts</KEYWORD2>
-<KEYWORD2>gh_scm2ulong</KEYWORD2>
-<KEYWORD2>gh_set_car_x</KEYWORD2>
-<KEYWORD2>gh_set_cdr_x</KEYWORD2>
-<KEYWORD2>gh_set_substr</KEYWORD2>
-<KEYWORD2>gh_shorts2svect</KEYWORD2>
-<KEYWORD2>gh_str02scm</KEYWORD2>
-<KEYWORD2>gh_str2scm</KEYWORD2>
-<KEYWORD2>gh_string_equal_p</KEYWORD2>
-<KEYWORD2>gh_symbol2newstr</KEYWORD2>
-<KEYWORD2>gh_symbol2scm</KEYWORD2>
-<KEYWORD2>gh_symbol_p</KEYWORD2>
-<KEYWORD2>gh_throw</KEYWORD2>
-<KEYWORD2>gh_ulong2scm</KEYWORD2>
-<KEYWORD2>gh_ulongs2uvect</KEYWORD2>
-<KEYWORD2>gh_vector</KEYWORD2>
-<KEYWORD2>gh_vector_length</KEYWORD2>
-<KEYWORD2>gh_vector_p</KEYWORD2>
-<KEYWORD2>gh_vector_ref</KEYWORD2>
-<KEYWORD2>gh_vector_set</KEYWORD2>
-<KEYWORD2>gmtime</KEYWORD2>
-<KEYWORD2>group:gid</KEYWORD2>
-<KEYWORD2>group:mem</KEYWORD2>
-<KEYWORD2>group:name</KEYWORD2>
-<KEYWORD2>group:passwd</KEYWORD2>
-<KEYWORD2>GUILE_CHECK_RETVAL</KEYWORD2>
-<KEYWORD2>GUILE_FLAGS</KEYWORD2>
-<KEYWORD2>GUILE_MODULE_AVAILABLE</KEYWORD2>
-<KEYWORD2>GUILE_MODULE_CHECK</KEYWORD2>
-<KEYWORD2>GUILE_MODULE_EXPORTS</KEYWORD2>
-<KEYWORD2>GUILE_MODULE_REQUIRED</KEYWORD2>
-<KEYWORD2>GUILE_MODULE_REQUIRED_EXPORT</KEYWORD2>
-<KEYWORD2>GUILE_PROGS</KEYWORD2>
-<KEYWORD2>GUILE_SITE_DIR</KEYWORD2>
-<KEYWORD2>hash</KEYWORD2>
-<KEYWORD2>hash</KEYWORD2>
-<KEYWORD2>hash-by-identity</KEYWORD2>
-<KEYWORD2>hash-clear!</KEYWORD2>
-<KEYWORD2>hash-create-handle!</KEYWORD2>
-<KEYWORD2>hash-fold</KEYWORD2>
-<KEYWORD2>hash-for-each</KEYWORD2>
-<KEYWORD2>hash-for-each-handle</KEYWORD2>
-<KEYWORD2>hash-get-handle</KEYWORD2>
-<KEYWORD2>hash-map-&gt;list</KEYWORD2>
-<KEYWORD2>hash-ref</KEYWORD2>
-<KEYWORD2>hash-remove!</KEYWORD2>
-<KEYWORD2>hash-set!</KEYWORD2>
-<KEYWORD2>hash-table-&gt;alist</KEYWORD2>
-<KEYWORD2>hash-table-delete!</KEYWORD2>
-<KEYWORD2>hash-table-equivalence-function</KEYWORD2>
-<KEYWORD2>hash-table-exists?</KEYWORD2>
-<KEYWORD2>hash-table-fold</KEYWORD2>
-<KEYWORD2>hash-table-hash-function</KEYWORD2>
-<KEYWORD2>hash-table-keys</KEYWORD2>
-<KEYWORD2>hash-table-ref</KEYWORD2>
-<KEYWORD2>hash-table-ref/default</KEYWORD2>
-<KEYWORD2>hash-table-set!</KEYWORD2>
-<KEYWORD2>hash-table-size</KEYWORD2>
-<KEYWORD2>hash-table-update!</KEYWORD2>
-<KEYWORD2>hash-table-update!/default</KEYWORD2>
-<KEYWORD2>hash-table-values</KEYWORD2>
-<KEYWORD2>hash-table-walk</KEYWORD2>
-<KEYWORD2>hash-table?</KEYWORD2>
-<KEYWORD2>hashq</KEYWORD2>
-<KEYWORD2>hashq-create-handle!</KEYWORD2>
-<KEYWORD2>hashq-get-handle</KEYWORD2>
-<KEYWORD2>hashq-ref</KEYWORD2>
-<KEYWORD2>hashq-remove!</KEYWORD2>
-<KEYWORD2>hashq-set!</KEYWORD2>
-<KEYWORD2>hashv</KEYWORD2>
-<KEYWORD2>hashv-create-handle!</KEYWORD2>
-<KEYWORD2>hashv-get-handle</KEYWORD2>
-<KEYWORD2>hashv-ref</KEYWORD2>
-<KEYWORD2>hashv-remove!</KEYWORD2>
-<KEYWORD2>hashv-set!</KEYWORD2>
-<KEYWORD2>hashx-create-handle!</KEYWORD2>
-<KEYWORD2>hashx-get-handle</KEYWORD2>
-<KEYWORD2>hashx-ref</KEYWORD2>
-<KEYWORD2>hashx-remove!</KEYWORD2>
-<KEYWORD2>hashx-set!</KEYWORD2>
-<KEYWORD2>hook-&gt;list</KEYWORD2>
-<KEYWORD2>hook-empty?</KEYWORD2>
-<KEYWORD2>hook?</KEYWORD2>
-<KEYWORD2>hostent:addr-list</KEYWORD2>
-<KEYWORD2>hostent:addrtype</KEYWORD2>
-<KEYWORD2>hostent:aliases</KEYWORD2>
-<KEYWORD2>hostent:length</KEYWORD2>
-<KEYWORD2>hostent:name</KEYWORD2>
-<KEYWORD2>htonl</KEYWORD2>
-<KEYWORD2>htons</KEYWORD2>
-<KEYWORD2>if</KEYWORD2>
-<KEYWORD2>imag-part</KEYWORD2>
-<KEYWORD2>inet-aton</KEYWORD2>
-<KEYWORD2>inet-lnaof</KEYWORD2>
-<KEYWORD2>inet-makeaddr</KEYWORD2>
-<KEYWORD2>inet-netof</KEYWORD2>
-<KEYWORD2>inet-ntoa</KEYWORD2>
-<KEYWORD2>inet-ntop</KEYWORD2>
-<KEYWORD2>inet-pton</KEYWORD2>
-<KEYWORD2>inexact-&gt;exact</KEYWORD2>
-<KEYWORD2>inexact?</KEYWORD2>
-<KEYWORD2>inf</KEYWORD2>
-<KEYWORD2>inf?</KEYWORD2>
-<KEYWORD2>info args</KEYWORD2>
-<KEYWORD2>info frame</KEYWORD2>
-<KEYWORD2>input-port?</KEYWORD2>
-<KEYWORD2>install-trap</KEYWORD2>
-<KEYWORD2>integer-&gt;char</KEYWORD2>
-<KEYWORD2>integer-&gt;list</KEYWORD2>
-<KEYWORD2>integer-expt</KEYWORD2>
-<KEYWORD2>integer-length</KEYWORD2>
-<KEYWORD2>integer?</KEYWORD2>
-<KEYWORD2>interaction-environment</KEYWORD2>
-<KEYWORD2>iota</KEYWORD2>
-<KEYWORD2>isatty?</KEYWORD2>
-<KEYWORD2>join-thread</KEYWORD2>
-<KEYWORD2>julian-day-&gt;date</KEYWORD2>
-<KEYWORD2>julian-day-&gt;time-monotonic</KEYWORD2>
-<KEYWORD2>julian-day-&gt;time-tai</KEYWORD2>
-<KEYWORD2>julian-day-&gt;time-utc</KEYWORD2>
-<KEYWORD2>key</KEYWORD2>
-<KEYWORD2>keyword-&gt;string</KEYWORD2>
-<KEYWORD2>keyword-&gt;symbol</KEYWORD2>
-<KEYWORD2>keyword?</KEYWORD2>
-<KEYWORD2>keyword?</KEYWORD2>
-<KEYWORD2>kill</KEYWORD2>
-<KEYWORD2>lambda</KEYWORD2>
-<KEYWORD2>lambda*</KEYWORD2>
-<KEYWORD2>last</KEYWORD2>
-<KEYWORD2>last-pair</KEYWORD2>
-<KEYWORD2>last-stack-frame</KEYWORD2>
-<KEYWORD2>lazy-catch</KEYWORD2>
-<KEYWORD2>lchown</KEYWORD2>
-<KEYWORD2>lcm</KEYWORD2>
-<KEYWORD2>length</KEYWORD2>
-<KEYWORD2>length+</KEYWORD2>
-<KEYWORD2>let</KEYWORD2>
-<KEYWORD2>let*</KEYWORD2>
-<KEYWORD2>let*-values</KEYWORD2>
-<KEYWORD2>let-keywords</KEYWORD2>
-<KEYWORD2>let-keywords*</KEYWORD2>
-<KEYWORD2>let-optional</KEYWORD2>
-<KEYWORD2>let-optional*</KEYWORD2>
-<KEYWORD2>let-values</KEYWORD2>
-<KEYWORD2>letpar</KEYWORD2>
-<KEYWORD2>letrec</KEYWORD2>
-<KEYWORD2>link</KEYWORD2>
-<KEYWORD2>list</KEYWORD2>
-<KEYWORD2>list-&gt;array</KEYWORD2>
-<KEYWORD2>list-&gt;bitvector</KEYWORD2>
-<KEYWORD2>list-&gt;c32vector</KEYWORD2>
-<KEYWORD2>list-&gt;c64vector</KEYWORD2>
-<KEYWORD2>list-&gt;char-set</KEYWORD2>
-<KEYWORD2>list-&gt;char-set!</KEYWORD2>
-<KEYWORD2>list-&gt;f32vector</KEYWORD2>
-<KEYWORD2>list-&gt;f64vector</KEYWORD2>
-<KEYWORD2>list-&gt;integer</KEYWORD2>
-<KEYWORD2>list-&gt;s16vector</KEYWORD2>
-<KEYWORD2>list-&gt;s32vector</KEYWORD2>
-<KEYWORD2>list-&gt;s64vector</KEYWORD2>
-<KEYWORD2>list-&gt;s8vector</KEYWORD2>
-<KEYWORD2>list-&gt;stream</KEYWORD2>
-<KEYWORD2>list-&gt;string</KEYWORD2>
-<KEYWORD2>list-&gt;typed-array</KEYWORD2>
-<KEYWORD2>list-&gt;u16vector</KEYWORD2>
-<KEYWORD2>list-&gt;u32vector</KEYWORD2>
-<KEYWORD2>list-&gt;u64vector</KEYWORD2>
-<KEYWORD2>list-&gt;u8vector</KEYWORD2>
-<KEYWORD2>list-&gt;vector</KEYWORD2>
-<KEYWORD2>list-&gt;weak-vector</KEYWORD2>
-<KEYWORD2>list-cdr-ref</KEYWORD2>
-<KEYWORD2>list-cdr-set!</KEYWORD2>
-<KEYWORD2>list-copy</KEYWORD2>
-<KEYWORD2>list-copy</KEYWORD2>
-<KEYWORD2>list-head</KEYWORD2>
-<KEYWORD2>list-index</KEYWORD2>
-<KEYWORD2>list-matches</KEYWORD2>
-<KEYWORD2>list-ref</KEYWORD2>
-<KEYWORD2>list-set!</KEYWORD2>
-<KEYWORD2>list-tabulate</KEYWORD2>
-<KEYWORD2>list-tail</KEYWORD2>
-<KEYWORD2>list-traps</KEYWORD2>
-<KEYWORD2>list=</KEYWORD2>
-<KEYWORD2>list?</KEYWORD2>
-<KEYWORD2>listen</KEYWORD2>
-<KEYWORD2>load</KEYWORD2>
-<KEYWORD2>load-extension</KEYWORD2>
-<KEYWORD2>load-from-path</KEYWORD2>
-<KEYWORD2>local-eval</KEYWORD2>
-<KEYWORD2>localtime</KEYWORD2>
-<KEYWORD2>lock-mutex</KEYWORD2>
-<KEYWORD2>log</KEYWORD2>
-<KEYWORD2>log10</KEYWORD2>
-<KEYWORD2>log2-binary-factors</KEYWORD2>
-<KEYWORD2>logand</KEYWORD2>
-<KEYWORD2>logbit?</KEYWORD2>
-<KEYWORD2>logcount</KEYWORD2>
-<KEYWORD2>logior</KEYWORD2>
-<KEYWORD2>lognot</KEYWORD2>
-<KEYWORD2>logtest</KEYWORD2>
-<KEYWORD2>logxor</KEYWORD2>
-<KEYWORD2>lset-adjoin</KEYWORD2>
-<KEYWORD2>lset-diff+intersection</KEYWORD2>
-<KEYWORD2>lset-diff+intersection!</KEYWORD2>
-<KEYWORD2>lset-difference</KEYWORD2>
-<KEYWORD2>lset-difference!</KEYWORD2>
-<KEYWORD2>lset-intersection</KEYWORD2>
-<KEYWORD2>lset-intersection!</KEYWORD2>
-<KEYWORD2>lset-union</KEYWORD2>
-<KEYWORD2>lset-union!</KEYWORD2>
-<KEYWORD2>lset-xor</KEYWORD2>
-<KEYWORD2>lset-xor!</KEYWORD2>
-<KEYWORD2>lset&lt;=</KEYWORD2>
-<KEYWORD2>lset=</KEYWORD2>
-<KEYWORD2>lstat</KEYWORD2>
-<KEYWORD2>macro-name</KEYWORD2>
-<KEYWORD2>macro-transformer</KEYWORD2>
-<KEYWORD2>macro-type</KEYWORD2>
-<KEYWORD2>macro?</KEYWORD2>
-<KEYWORD2>magnitude</KEYWORD2>
-<KEYWORD2>main_prog</KEYWORD2>
-<KEYWORD2>major-version</KEYWORD2>
-<KEYWORD2>make-arbiter</KEYWORD2>
-<KEYWORD2>make-array</KEYWORD2>
-<KEYWORD2>make-bitvector</KEYWORD2>
-<KEYWORD2>make-buffered-input-port</KEYWORD2>
-<KEYWORD2>make-c32vector</KEYWORD2>
-<KEYWORD2>make-c64vector</KEYWORD2>
-<KEYWORD2>make-class-object</KEYWORD2>
-<KEYWORD2>make-completion-function</KEYWORD2>
-<KEYWORD2>make-compound-condition</KEYWORD2>
-<KEYWORD2>make-condition</KEYWORD2>
-<KEYWORD2>make-condition-type</KEYWORD2>
-<KEYWORD2>make-condition-variable</KEYWORD2>
-<KEYWORD2>make-date</KEYWORD2>
-<KEYWORD2>make-doubly-weak-hash-table</KEYWORD2>
-<KEYWORD2>make-dynamic-state</KEYWORD2>
-<KEYWORD2>make-f32vector</KEYWORD2>
-<KEYWORD2>make-f64vector</KEYWORD2>
-<KEYWORD2>make-fluid</KEYWORD2>
-<KEYWORD2>make-guardian</KEYWORD2>
-<KEYWORD2>make-hash-table</KEYWORD2>
-<KEYWORD2>make-hash-table</KEYWORD2>
-<KEYWORD2>make-hook</KEYWORD2>
-<KEYWORD2>make-line-buffered-input-port</KEYWORD2>
-<KEYWORD2>make-list</KEYWORD2>
-<KEYWORD2>make-mutex</KEYWORD2>
-<KEYWORD2>make-object-property</KEYWORD2>
-<KEYWORD2>make-parameter</KEYWORD2>
-<KEYWORD2>make-polar</KEYWORD2>
-<KEYWORD2>make-procedure-with-setter</KEYWORD2>
-<KEYWORD2>make-q</KEYWORD2>
-<KEYWORD2>make-record-type</KEYWORD2>
-<KEYWORD2>make-rectangular</KEYWORD2>
-<KEYWORD2>make-recursive-mutex</KEYWORD2>
-<KEYWORD2>make-regexp</KEYWORD2>
-<KEYWORD2>make-s16vector</KEYWORD2>
-<KEYWORD2>make-s32vector</KEYWORD2>
-<KEYWORD2>make-s64vector</KEYWORD2>
-<KEYWORD2>make-s8vector</KEYWORD2>
-<KEYWORD2>make-shared-array</KEYWORD2>
-<KEYWORD2>make-socket-address</KEYWORD2>
-<KEYWORD2>make-soft-port</KEYWORD2>
-<KEYWORD2>make-stack</KEYWORD2>
-<KEYWORD2>make-stream</KEYWORD2>
-<KEYWORD2>make-string</KEYWORD2>
-<KEYWORD2>make-struct</KEYWORD2>
-<KEYWORD2>make-struct-layout</KEYWORD2>
-<KEYWORD2>make-subclass-object</KEYWORD2>
-<KEYWORD2>make-symbol</KEYWORD2>
-<KEYWORD2>make-thread</KEYWORD2>
-<KEYWORD2>make-time</KEYWORD2>
-<KEYWORD2>make-typed-array</KEYWORD2>
-<KEYWORD2>make-u16vector</KEYWORD2>
-<KEYWORD2>make-u32vector</KEYWORD2>
-<KEYWORD2>make-u64vector</KEYWORD2>
-<KEYWORD2>make-u8vector</KEYWORD2>
-<KEYWORD2>make-undefined-variable</KEYWORD2>
-<KEYWORD2>make-variable</KEYWORD2>
-<KEYWORD2>make-vector</KEYWORD2>
-<KEYWORD2>make-vtable</KEYWORD2>
-<KEYWORD2>make-vtable-vtable</KEYWORD2>
-<KEYWORD2>make-weak-key-hash-table</KEYWORD2>
-<KEYWORD2>make-weak-value-hash-table</KEYWORD2>
-<KEYWORD2>make-weak-vector</KEYWORD2>
-<KEYWORD2>malloc-stats</KEYWORD2>
-<KEYWORD2>map</KEYWORD2>
-<KEYWORD2>map</KEYWORD2>
-<KEYWORD2>map!</KEYWORD2>
-<KEYWORD2>map-in-order</KEYWORD2>
-<KEYWORD2>match:count</KEYWORD2>
-<KEYWORD2>match:end</KEYWORD2>
-<KEYWORD2>match:prefix</KEYWORD2>
-<KEYWORD2>match:start</KEYWORD2>
-<KEYWORD2>match:string</KEYWORD2>
-<KEYWORD2>match:substring</KEYWORD2>
-<KEYWORD2>match:suffix</KEYWORD2>
-<KEYWORD2>max</KEYWORD2>
-<KEYWORD2>member</KEYWORD2>
-<KEYWORD2>member</KEYWORD2>
-<KEYWORD2>memoized-environment</KEYWORD2>
-<KEYWORD2>memoized?</KEYWORD2>
-<KEYWORD2>memq</KEYWORD2>
-<KEYWORD2>memv</KEYWORD2>
-<KEYWORD2>merge</KEYWORD2>
-<KEYWORD2>merge!</KEYWORD2>
-<KEYWORD2>message-condition?</KEYWORD2>
-<KEYWORD2>micro-version</KEYWORD2>
-<KEYWORD2>min</KEYWORD2>
-<KEYWORD2>minor-version</KEYWORD2>
-<KEYWORD2>mkdir</KEYWORD2>
-<KEYWORD2>mknod</KEYWORD2>
-<KEYWORD2>mkstemp!</KEYWORD2>
-<KEYWORD2>mktime</KEYWORD2>
-<KEYWORD2>modified-julian-day-&gt;date</KEYWORD2>
-<KEYWORD2>modified-julian-day-&gt;time-monotonic</KEYWORD2>
-<KEYWORD2>modified-julian-day-&gt;time-tai</KEYWORD2>
-<KEYWORD2>modified-julian-day-&gt;time-utc</KEYWORD2>
-<KEYWORD2>module-use!</KEYWORD2>
-<KEYWORD2>modulo</KEYWORD2>
-<KEYWORD2>modulo-expt</KEYWORD2>
-<KEYWORD2>monitor</KEYWORD2>
-<KEYWORD2>move-&gt;fdes</KEYWORD2>
-<KEYWORD2>n-for-each-par-map</KEYWORD2>
-<KEYWORD2>n-par-for-each</KEYWORD2>
-<KEYWORD2>n-par-map</KEYWORD2>
-<KEYWORD2>nan</KEYWORD2>
-<KEYWORD2>nan?</KEYWORD2>
-<KEYWORD2>negative?</KEYWORD2>
-<KEYWORD2>netent:addrtype</KEYWORD2>
-<KEYWORD2>netent:aliases</KEYWORD2>
-<KEYWORD2>netent:name</KEYWORD2>
-<KEYWORD2>netent:net</KEYWORD2>
-<KEYWORD2>newline</KEYWORD2>
-<KEYWORD2>next</KEYWORD2>
-<KEYWORD2>nftw</KEYWORD2>
-<KEYWORD2>ngettext</KEYWORD2>
-<KEYWORD2>nice</KEYWORD2>
-<KEYWORD2>nil-car</KEYWORD2>
-<KEYWORD2>nil-cdr</KEYWORD2>
-<KEYWORD2>nil-cons</KEYWORD2>
-<KEYWORD2>nil-eq</KEYWORD2>
-<KEYWORD2>ninth</KEYWORD2>
-<KEYWORD2>not</KEYWORD2>
-<KEYWORD2>not-pair?</KEYWORD2>
-<KEYWORD2>ntohl</KEYWORD2>
-<KEYWORD2>ntohs</KEYWORD2>
-<KEYWORD2>null</KEYWORD2>
-<KEYWORD2>null-environment</KEYWORD2>
-<KEYWORD2>null-list?</KEYWORD2>
-<KEYWORD2>null?</KEYWORD2>
-<KEYWORD2>number-&gt;string</KEYWORD2>
-<KEYWORD2>number?</KEYWORD2>
-<KEYWORD2>numerator</KEYWORD2>
-<KEYWORD2>object-&gt;string</KEYWORD2>
-<KEYWORD2>object-properties</KEYWORD2>
-<KEYWORD2>object-property</KEYWORD2>
-<KEYWORD2>odd?</KEYWORD2>
-<KEYWORD2>open</KEYWORD2>
-<KEYWORD2>open-fdes</KEYWORD2>
-<KEYWORD2>open-file</KEYWORD2>
-<KEYWORD2>open-input-file</KEYWORD2>
-<KEYWORD2>open-input-output-pipe</KEYWORD2>
-<KEYWORD2>open-input-pipe</KEYWORD2>
-<KEYWORD2>open-input-string</KEYWORD2>
-<KEYWORD2>open-output-file</KEYWORD2>
-<KEYWORD2>open-output-pipe</KEYWORD2>
-<KEYWORD2>open-output-string</KEYWORD2>
-<KEYWORD2>open-pipe</KEYWORD2>
-<KEYWORD2>open-pipe*</KEYWORD2>
-<KEYWORD2>opendir</KEYWORD2>
-<KEYWORD2>operator?</KEYWORD2>
-<KEYWORD2>option</KEYWORD2>
-<KEYWORD2>option-names</KEYWORD2>
-<KEYWORD2>option-optional-arg?</KEYWORD2>
-<KEYWORD2>option-processor</KEYWORD2>
-<KEYWORD2>option-ref</KEYWORD2>
-<KEYWORD2>option-required-arg?</KEYWORD2>
-<KEYWORD2>or</KEYWORD2>
-<KEYWORD2>output-port?</KEYWORD2>
-<KEYWORD2>pair-fold</KEYWORD2>
-<KEYWORD2>pair-fold-right</KEYWORD2>
-<KEYWORD2>pair-for-each</KEYWORD2>
-<KEYWORD2>pair?</KEYWORD2>
-<KEYWORD2>par-for-each</KEYWORD2>
-<KEYWORD2>par-map</KEYWORD2>
-<KEYWORD2>parallel</KEYWORD2>
-<KEYWORD2>parameterize</KEYWORD2>
-<KEYWORD2>parse-path</KEYWORD2>
-<KEYWORD2>partition</KEYWORD2>
-<KEYWORD2>partition!</KEYWORD2>
-<KEYWORD2>passwd:dir</KEYWORD2>
-<KEYWORD2>passwd:gecos</KEYWORD2>
-<KEYWORD2>passwd:gid</KEYWORD2>
-<KEYWORD2>passwd:name</KEYWORD2>
-<KEYWORD2>passwd:passwd</KEYWORD2>
-<KEYWORD2>passwd:shell</KEYWORD2>
-<KEYWORD2>passwd:uid</KEYWORD2>
-<KEYWORD2>pause</KEYWORD2>
-<KEYWORD2>pclose</KEYWORD2>
-<KEYWORD2>peek-char</KEYWORD2>
-<KEYWORD2>pipe</KEYWORD2>
-<KEYWORD2>PKG_CHECK_MODULES</KEYWORD2>
-<KEYWORD2>popen</KEYWORD2>
-<KEYWORD2>port-&gt;fdes</KEYWORD2>
-<KEYWORD2>port-&gt;stream</KEYWORD2>
-<KEYWORD2>port-closed?</KEYWORD2>
-<KEYWORD2>port-column</KEYWORD2>
-<KEYWORD2>port-filename</KEYWORD2>
-<KEYWORD2>port-for-each</KEYWORD2>
-<KEYWORD2>port-line</KEYWORD2>
-<KEYWORD2>port-mode</KEYWORD2>
-<KEYWORD2>port-mode</KEYWORD2>
-<KEYWORD2>port-revealed</KEYWORD2>
-<KEYWORD2>port-with-print-state</KEYWORD2>
-<KEYWORD2>port?</KEYWORD2>
-<KEYWORD2>position</KEYWORD2>
-<KEYWORD2>positive?</KEYWORD2>
-<KEYWORD2>pretty-print</KEYWORD2>
-<KEYWORD2>primitive-_exit</KEYWORD2>
-<KEYWORD2>primitive-eval</KEYWORD2>
-<KEYWORD2>primitive-exit</KEYWORD2>
-<KEYWORD2>primitive-fork</KEYWORD2>
-<KEYWORD2>primitive-load</KEYWORD2>
-<KEYWORD2>primitive-load-path</KEYWORD2>
-<KEYWORD2>primitive-make-property</KEYWORD2>
-<KEYWORD2>primitive-move-&gt;fdes</KEYWORD2>
-<KEYWORD2>primitive-property-del!</KEYWORD2>
-<KEYWORD2>primitive-property-ref</KEYWORD2>
-<KEYWORD2>primitive-property-set!</KEYWORD2>
-<KEYWORD2>print-disable</KEYWORD2>
-<KEYWORD2>print-enable</KEYWORD2>
-<KEYWORD2>print-options</KEYWORD2>
-<KEYWORD2>print-options-interface</KEYWORD2>
-<KEYWORD2>print-options-interface</KEYWORD2>
-<KEYWORD2>print-set!</KEYWORD2>
-<KEYWORD2>procedure</KEYWORD2>
-<KEYWORD2>procedure-&gt;macro</KEYWORD2>
-<KEYWORD2>procedure-&gt;memoizing-macro</KEYWORD2>
-<KEYWORD2>procedure-&gt;syntax</KEYWORD2>
-<KEYWORD2>procedure-documentation</KEYWORD2>
-<KEYWORD2>procedure-environment</KEYWORD2>
-<KEYWORD2>procedure-name</KEYWORD2>
-<KEYWORD2>procedure-properties</KEYWORD2>
-<KEYWORD2>procedure-property</KEYWORD2>
-<KEYWORD2>procedure-source</KEYWORD2>
-<KEYWORD2>procedure-with-setter?</KEYWORD2>
-<KEYWORD2>procedure?</KEYWORD2>
-<KEYWORD2>program-arguments</KEYWORD2>
-<KEYWORD2>promise?</KEYWORD2>
-<KEYWORD2>proper-list?</KEYWORD2>
-<KEYWORD2>protoent:aliases</KEYWORD2>
-<KEYWORD2>protoent:name</KEYWORD2>
-<KEYWORD2>protoent:proto</KEYWORD2>
-<KEYWORD2>provide</KEYWORD2>
-<KEYWORD2>provided?</KEYWORD2>
-<KEYWORD2>PTR2SCM</KEYWORD2>
-<KEYWORD2>putenv</KEYWORD2>
-<KEYWORD2>pwd</KEYWORD2>
-<KEYWORD2>q-empty-check</KEYWORD2>
-<KEYWORD2>q-empty?</KEYWORD2>
-<KEYWORD2>q-front</KEYWORD2>
-<KEYWORD2>q-length</KEYWORD2>
-<KEYWORD2>q-pop!</KEYWORD2>
-<KEYWORD2>q-push!</KEYWORD2>
-<KEYWORD2>q-rear</KEYWORD2>
-<KEYWORD2>q-remove!</KEYWORD2>
-<KEYWORD2>q?</KEYWORD2>
-<KEYWORD2>quasiquote</KEYWORD2>
-<KEYWORD2>quit</KEYWORD2>
-<KEYWORD2>quote</KEYWORD2>
-<KEYWORD2>quotient</KEYWORD2>
-<KEYWORD2>raise</KEYWORD2>
-<KEYWORD2>random</KEYWORD2>
-<KEYWORD2>random:exp</KEYWORD2>
-<KEYWORD2>random:hollow-sphere!</KEYWORD2>
-<KEYWORD2>random:normal</KEYWORD2>
-<KEYWORD2>random:normal-vector!</KEYWORD2>
-<KEYWORD2>random:solid-sphere!</KEYWORD2>
-<KEYWORD2>random:uniform</KEYWORD2>
-<KEYWORD2>rational?</KEYWORD2>
-<KEYWORD2>rationalize</KEYWORD2>
-<KEYWORD2>re-export</KEYWORD2>
-<KEYWORD2>read</KEYWORD2>
-<KEYWORD2>read-char</KEYWORD2>
-<KEYWORD2>read-delimited</KEYWORD2>
-<KEYWORD2>read-delimited!</KEYWORD2>
-<KEYWORD2>read-disable</KEYWORD2>
-<KEYWORD2>read-disable</KEYWORD2>
-<KEYWORD2>read-enable</KEYWORD2>
-<KEYWORD2>read-enable</KEYWORD2>
-<KEYWORD2>read-hash-extend</KEYWORD2>
-<KEYWORD2>read-line</KEYWORD2>
-<KEYWORD2>read-line!</KEYWORD2>
-<KEYWORD2>read-options</KEYWORD2>
-<KEYWORD2>read-options</KEYWORD2>
-<KEYWORD2>read-options-interface</KEYWORD2>
-<KEYWORD2>read-options-interface</KEYWORD2>
-<KEYWORD2>read-set!</KEYWORD2>
-<KEYWORD2>read-set!</KEYWORD2>
-<KEYWORD2>read-string!/partial</KEYWORD2>
-<KEYWORD2>readdir</KEYWORD2>
-<KEYWORD2>readline</KEYWORD2>
-<KEYWORD2>readline-disable</KEYWORD2>
-<KEYWORD2>readline-enable</KEYWORD2>
-<KEYWORD2>readline-options</KEYWORD2>
-<KEYWORD2>readline-port</KEYWORD2>
-<KEYWORD2>readline-set!</KEYWORD2>
-<KEYWORD2>readlink</KEYWORD2>
-<KEYWORD2>real-part</KEYWORD2>
-<KEYWORD2>real?</KEYWORD2>
-<KEYWORD2>rec</KEYWORD2>
-<KEYWORD2>receive</KEYWORD2>
-<KEYWORD2>record-accessor</KEYWORD2>
-<KEYWORD2>record-constructor</KEYWORD2>
-<KEYWORD2>record-modifier</KEYWORD2>
-<KEYWORD2>record-predicate</KEYWORD2>
-<KEYWORD2>record-type-descriptor</KEYWORD2>
-<KEYWORD2>record-type-fields</KEYWORD2>
-<KEYWORD2>record-type-name</KEYWORD2>
-<KEYWORD2>record?</KEYWORD2>
-<KEYWORD2>recv!</KEYWORD2>
-<KEYWORD2>recvfrom!</KEYWORD2>
-<KEYWORD2>redirect-port</KEYWORD2>
-<KEYWORD2>reduce</KEYWORD2>
-<KEYWORD2>reduce-right</KEYWORD2>
-<KEYWORD2>regexp-exec</KEYWORD2>
-<KEYWORD2>regexp-match?</KEYWORD2>
-<KEYWORD2>regexp-quote</KEYWORD2>
-<KEYWORD2>regexp-substitute</KEYWORD2>
-<KEYWORD2>regexp-substitute/global</KEYWORD2>
-<KEYWORD2>regexp?</KEYWORD2>
-<KEYWORD2>release-arbiter</KEYWORD2>
-<KEYWORD2>release-port-handle</KEYWORD2>
-<KEYWORD2>remainder</KEYWORD2>
-<KEYWORD2>remove</KEYWORD2>
-<KEYWORD2>remove!</KEYWORD2>
-<KEYWORD2>remove-hook!</KEYWORD2>
-<KEYWORD2>rename</KEYWORD2>
-<KEYWORD2>rename-file</KEYWORD2>
-<KEYWORD2>require</KEYWORD2>
-<KEYWORD2>require-extension</KEYWORD2>
-<KEYWORD2>reset-hook!</KEYWORD2>
-<KEYWORD2>resolve-interface</KEYWORD2>
-<KEYWORD2>resolve-module</KEYWORD2>
-<KEYWORD2>restore-signals</KEYWORD2>
-<KEYWORD2>restricted-vector-sort!</KEYWORD2>
-<KEYWORD2>reverse</KEYWORD2>
-<KEYWORD2>reverse!</KEYWORD2>
-<KEYWORD2>reverse-bit-field</KEYWORD2>
-<KEYWORD2>reverse-list-&gt;string</KEYWORD2>
-<KEYWORD2>rewinddir</KEYWORD2>
-<KEYWORD2>rmdir</KEYWORD2>
-<KEYWORD2>rotate-bit-field</KEYWORD2>
-<KEYWORD2>round</KEYWORD2>
-<KEYWORD2>run-asyncs</KEYWORD2>
-<KEYWORD2>run-hook</KEYWORD2>
-<KEYWORD2>s16vector</KEYWORD2>
-<KEYWORD2>s16vector-&gt;list</KEYWORD2>
-<KEYWORD2>s16vector-length</KEYWORD2>
-<KEYWORD2>s16vector-ref</KEYWORD2>
-<KEYWORD2>s16vector-set!</KEYWORD2>
-<KEYWORD2>s16vector?</KEYWORD2>
-<KEYWORD2>s32vector</KEYWORD2>
-<KEYWORD2>s32vector-&gt;list</KEYWORD2>
-<KEYWORD2>s32vector-length</KEYWORD2>
-<KEYWORD2>s32vector-ref</KEYWORD2>
-<KEYWORD2>s32vector-set!</KEYWORD2>
-<KEYWORD2>s32vector?</KEYWORD2>
-<KEYWORD2>s64vector</KEYWORD2>
-<KEYWORD2>s64vector-&gt;list</KEYWORD2>
-<KEYWORD2>s64vector-length</KEYWORD2>
-<KEYWORD2>s64vector-ref</KEYWORD2>
-<KEYWORD2>s64vector-set!</KEYWORD2>
-<KEYWORD2>s64vector?</KEYWORD2>
-<KEYWORD2>s8vector</KEYWORD2>
-<KEYWORD2>s8vector-&gt;list</KEYWORD2>
-<KEYWORD2>s8vector-length</KEYWORD2>
-<KEYWORD2>s8vector-ref</KEYWORD2>
-<KEYWORD2>s8vector-set!</KEYWORD2>
-<KEYWORD2>s8vector?</KEYWORD2>
-<KEYWORD2>save-module-excursion</KEYWORD2>
-<KEYWORD2>scheme-report-environment</KEYWORD2>
-<KEYWORD2>search-path</KEYWORD2>
-<KEYWORD2>second</KEYWORD2>
-<KEYWORD2>seed-&gt;random-state</KEYWORD2>
-<KEYWORD2>seek</KEYWORD2>
-<KEYWORD2>select</KEYWORD2>
-<KEYWORD2>send</KEYWORD2>
-<KEYWORD2>sendto</KEYWORD2>
-<KEYWORD2>serious-condition?</KEYWORD2>
-<KEYWORD2>servent:aliases</KEYWORD2>
-<KEYWORD2>servent:name</KEYWORD2>
-<KEYWORD2>servent:port</KEYWORD2>
-<KEYWORD2>servent:proto</KEYWORD2>
-<KEYWORD2>set-buffered-input-continuation?!</KEYWORD2>
-<KEYWORD2>set-car!</KEYWORD2>
-<KEYWORD2>set-cdr!</KEYWORD2>
-<KEYWORD2>set-current-dynamic-state</KEYWORD2>
-<KEYWORD2>set-current-error-port</KEYWORD2>
-<KEYWORD2>set-current-input-port</KEYWORD2>
-<KEYWORD2>set-current-module</KEYWORD2>
-<KEYWORD2>set-current-output-port</KEYWORD2>
-<KEYWORD2>set-object-procedure!</KEYWORD2>
-<KEYWORD2>set-object-properties!</KEYWORD2>
-<KEYWORD2>set-object-property!</KEYWORD2>
-<KEYWORD2>set-port-column!</KEYWORD2>
-<KEYWORD2>set-port-filename!</KEYWORD2>
-<KEYWORD2>set-port-line!</KEYWORD2>
-<KEYWORD2>set-port-revealed!</KEYWORD2>
-<KEYWORD2>set-procedure-properties!</KEYWORD2>
-<KEYWORD2>set-procedure-property!</KEYWORD2>
-<KEYWORD2>set-program-arguments</KEYWORD2>
-<KEYWORD2>set-readline-input-port!</KEYWORD2>
-<KEYWORD2>set-readline-output-port!</KEYWORD2>
-<KEYWORD2>set-readline-prompt!</KEYWORD2>
-<KEYWORD2>set-source-properties!</KEYWORD2>
-<KEYWORD2>set-source-property!</KEYWORD2>
-<KEYWORD2>set-struct-vtable-name!</KEYWORD2>
-<KEYWORD2>set-symbol-property!</KEYWORD2>
-<KEYWORD2>set-time-nanosecond!</KEYWORD2>
-<KEYWORD2>set-time-second!</KEYWORD2>
-<KEYWORD2>set-time-type!</KEYWORD2>
-<KEYWORD2>set-tm:gmtoff</KEYWORD2>
-<KEYWORD2>set-tm:hour</KEYWORD2>
-<KEYWORD2>set-tm:isdst</KEYWORD2>
-<KEYWORD2>set-tm:mday</KEYWORD2>
-<KEYWORD2>set-tm:min</KEYWORD2>
-<KEYWORD2>set-tm:mon</KEYWORD2>
-<KEYWORD2>set-tm:sec</KEYWORD2>
-<KEYWORD2>set-tm:wday</KEYWORD2>
-<KEYWORD2>set-tm:yday</KEYWORD2>
-<KEYWORD2>set-tm:year</KEYWORD2>
-<KEYWORD2>set-tm:zone</KEYWORD2>
-<KEYWORD2>set-trace-layout</KEYWORD2>
-<KEYWORD2>set!</KEYWORD2>
-<KEYWORD2>setegid</KEYWORD2>
-<KEYWORD2>setenv</KEYWORD2>
-<KEYWORD2>seteuid</KEYWORD2>
-<KEYWORD2>setgid</KEYWORD2>
-<KEYWORD2>setgr</KEYWORD2>
-<KEYWORD2>setgrent</KEYWORD2>
-<KEYWORD2>setgroups</KEYWORD2>
-<KEYWORD2>sethost</KEYWORD2>
-<KEYWORD2>sethostent</KEYWORD2>
-<KEYWORD2>sethostname</KEYWORD2>
-<KEYWORD2>setitimer</KEYWORD2>
-<KEYWORD2>setlocale</KEYWORD2>
-<KEYWORD2>setnet</KEYWORD2>
-<KEYWORD2>setnetent</KEYWORD2>
-<KEYWORD2>setpgid</KEYWORD2>
-<KEYWORD2>setpriority</KEYWORD2>
-<KEYWORD2>setproto</KEYWORD2>
-<KEYWORD2>setprotoent</KEYWORD2>
-<KEYWORD2>setpw</KEYWORD2>
-<KEYWORD2>setpwent</KEYWORD2>
-<KEYWORD2>setserv</KEYWORD2>
-<KEYWORD2>setservent</KEYWORD2>
-<KEYWORD2>setsid</KEYWORD2>
-<KEYWORD2>setsockopt</KEYWORD2>
-<KEYWORD2>setter</KEYWORD2>
-<KEYWORD2>setuid</KEYWORD2>
-<KEYWORD2>setvbuf</KEYWORD2>
-<KEYWORD2>seventh</KEYWORD2>
-<KEYWORD2>shared-array-increments</KEYWORD2>
-<KEYWORD2>shared-array-offset</KEYWORD2>
-<KEYWORD2>shared-array-root</KEYWORD2>
-<KEYWORD2>shutdown</KEYWORD2>
-<KEYWORD2>sigaction</KEYWORD2>
-<KEYWORD2>signal-condition-variable</KEYWORD2>
-<KEYWORD2>simple-format</KEYWORD2>
-<KEYWORD2>sin</KEYWORD2>
-<KEYWORD2>sinh</KEYWORD2>
-<KEYWORD2>sixth</KEYWORD2>
-<KEYWORD2>sleep</KEYWORD2>
-<KEYWORD2>sloppy-assoc</KEYWORD2>
-<KEYWORD2>sloppy-assq</KEYWORD2>
-<KEYWORD2>sloppy-assv</KEYWORD2>
-<KEYWORD2>sockaddr:addr</KEYWORD2>
-<KEYWORD2>sockaddr:fam</KEYWORD2>
-<KEYWORD2>sockaddr:flowinfo</KEYWORD2>
-<KEYWORD2>sockaddr:path</KEYWORD2>
-<KEYWORD2>sockaddr:port</KEYWORD2>
-<KEYWORD2>sockaddr:scopeid</KEYWORD2>
-<KEYWORD2>socket</KEYWORD2>
-<KEYWORD2>socketpair</KEYWORD2>
-<KEYWORD2>sort</KEYWORD2>
-<KEYWORD2>sort!</KEYWORD2>
-<KEYWORD2>sort-list</KEYWORD2>
-<KEYWORD2>sort-list!</KEYWORD2>
-<KEYWORD2>sorted?</KEYWORD2>
-<KEYWORD2>source-properties</KEYWORD2>
-<KEYWORD2>source-property</KEYWORD2>
-<KEYWORD2>span</KEYWORD2>
-<KEYWORD2>span!</KEYWORD2>
-<KEYWORD2>split-at</KEYWORD2>
-<KEYWORD2>split-at!</KEYWORD2>
-<KEYWORD2>sqrt</KEYWORD2>
-<KEYWORD2>stable-sort</KEYWORD2>
-<KEYWORD2>stable-sort!</KEYWORD2>
-<KEYWORD2>stack-id</KEYWORD2>
-<KEYWORD2>stack-length</KEYWORD2>
-<KEYWORD2>stack-ref</KEYWORD2>
-<KEYWORD2>stack?</KEYWORD2>
-<KEYWORD2>start-stack</KEYWORD2>
-<KEYWORD2>stat</KEYWORD2>
-<KEYWORD2>stat:atime</KEYWORD2>
-<KEYWORD2>stat:blksize</KEYWORD2>
-<KEYWORD2>stat:blocks</KEYWORD2>
-<KEYWORD2>stat:ctime</KEYWORD2>
-<KEYWORD2>stat:dev</KEYWORD2>
-<KEYWORD2>stat:gid</KEYWORD2>
-<KEYWORD2>stat:ino</KEYWORD2>
-<KEYWORD2>stat:mode</KEYWORD2>
-<KEYWORD2>stat:mtime</KEYWORD2>
-<KEYWORD2>stat:nlink</KEYWORD2>
-<KEYWORD2>stat:perms</KEYWORD2>
-<KEYWORD2>stat:rdev</KEYWORD2>
-<KEYWORD2>stat:size</KEYWORD2>
-<KEYWORD2>stat:type</KEYWORD2>
-<KEYWORD2>stat:uid</KEYWORD2>
-<KEYWORD2>status:exit-val</KEYWORD2>
-<KEYWORD2>status:stop-sig</KEYWORD2>
-<KEYWORD2>status:term-sig</KEYWORD2>
-<KEYWORD2>step</KEYWORD2>
-<KEYWORD2>stream-&gt;list</KEYWORD2>
-<KEYWORD2>stream-&gt;list&amp;length</KEYWORD2>
-<KEYWORD2>stream-&gt;reversed-list</KEYWORD2>
-<KEYWORD2>stream-&gt;reversed-list&amp;length</KEYWORD2>
-<KEYWORD2>stream-&gt;vector</KEYWORD2>
-<KEYWORD2>stream-car</KEYWORD2>
-<KEYWORD2>stream-cdr</KEYWORD2>
-<KEYWORD2>stream-fold</KEYWORD2>
-<KEYWORD2>stream-for-each</KEYWORD2>
-<KEYWORD2>stream-map</KEYWORD2>
-<KEYWORD2>stream-null?</KEYWORD2>
-<KEYWORD2>strerror</KEYWORD2>
-<KEYWORD2>strftime</KEYWORD2>
-<KEYWORD2>string</KEYWORD2>
-<KEYWORD2>string-&gt;char-set</KEYWORD2>
-<KEYWORD2>string-&gt;char-set!</KEYWORD2>
-<KEYWORD2>string-&gt;date</KEYWORD2>
-<KEYWORD2>string-&gt;keyword</KEYWORD2>
-<KEYWORD2>string-&gt;list</KEYWORD2>
-<KEYWORD2>string-&gt;number</KEYWORD2>
-<KEYWORD2>string-&gt;symbol</KEYWORD2>
-<KEYWORD2>string-any</KEYWORD2>
-<KEYWORD2>string-append</KEYWORD2>
-<KEYWORD2>string-append/shared</KEYWORD2>
-<KEYWORD2>string-capitalize</KEYWORD2>
-<KEYWORD2>string-capitalize!</KEYWORD2>
-<KEYWORD2>string-ci-&gt;symbol</KEYWORD2>
-<KEYWORD2>string-ci-hash</KEYWORD2>
-<KEYWORD2>string-ci&lt;</KEYWORD2>
-<KEYWORD2>string-ci&lt;=</KEYWORD2>
-<KEYWORD2>string-ci&lt;=?</KEYWORD2>
-<KEYWORD2>string-ci&lt;&gt;</KEYWORD2>
-<KEYWORD2>string-ci&lt;?</KEYWORD2>
-<KEYWORD2>string-ci=</KEYWORD2>
-<KEYWORD2>string-ci=?</KEYWORD2>
-<KEYWORD2>string-ci&gt;</KEYWORD2>
-<KEYWORD2>string-ci&gt;=</KEYWORD2>
-<KEYWORD2>string-ci&gt;=?</KEYWORD2>
-<KEYWORD2>string-ci&gt;?</KEYWORD2>
-<KEYWORD2>string-compare</KEYWORD2>
-<KEYWORD2>string-compare-ci</KEYWORD2>
-<KEYWORD2>string-concatenate</KEYWORD2>
-<KEYWORD2>string-concatenate-reverse</KEYWORD2>
-<KEYWORD2>string-concatenate-reverse/shared</KEYWORD2>
-<KEYWORD2>string-concatenate/shared</KEYWORD2>
-<KEYWORD2>string-contains</KEYWORD2>
-<KEYWORD2>string-contains-ci</KEYWORD2>
-<KEYWORD2>string-copy</KEYWORD2>
-<KEYWORD2>string-copy!</KEYWORD2>
-<KEYWORD2>string-count</KEYWORD2>
-<KEYWORD2>string-delete</KEYWORD2>
-<KEYWORD2>string-downcase</KEYWORD2>
-<KEYWORD2>string-downcase!</KEYWORD2>
-<KEYWORD2>string-drop</KEYWORD2>
-<KEYWORD2>string-drop-right</KEYWORD2>
-<KEYWORD2>string-every</KEYWORD2>
-<KEYWORD2>string-fill!</KEYWORD2>
-<KEYWORD2>string-filter</KEYWORD2>
-<KEYWORD2>string-fold</KEYWORD2>
-<KEYWORD2>string-fold-right</KEYWORD2>
-<KEYWORD2>string-for-each</KEYWORD2>
-<KEYWORD2>string-for-each-index</KEYWORD2>
-<KEYWORD2>string-hash</KEYWORD2>
-<KEYWORD2>string-hash</KEYWORD2>
-<KEYWORD2>string-hash-ci</KEYWORD2>
-<KEYWORD2>string-index</KEYWORD2>
-<KEYWORD2>string-index-right</KEYWORD2>
-<KEYWORD2>string-join</KEYWORD2>
-<KEYWORD2>string-length</KEYWORD2>
-<KEYWORD2>string-map</KEYWORD2>
-<KEYWORD2>string-map!</KEYWORD2>
-<KEYWORD2>string-match</KEYWORD2>
-<KEYWORD2>string-null?</KEYWORD2>
-<KEYWORD2>string-pad</KEYWORD2>
-<KEYWORD2>string-pad-right</KEYWORD2>
-<KEYWORD2>string-prefix-ci?</KEYWORD2>
-<KEYWORD2>string-prefix-length</KEYWORD2>
-<KEYWORD2>string-prefix-length-ci</KEYWORD2>
-<KEYWORD2>string-prefix?</KEYWORD2>
-<KEYWORD2>string-ref</KEYWORD2>
-<KEYWORD2>string-replace</KEYWORD2>
-<KEYWORD2>string-reverse</KEYWORD2>
-<KEYWORD2>string-reverse!</KEYWORD2>
-<KEYWORD2>string-rindex</KEYWORD2>
-<KEYWORD2>string-set!</KEYWORD2>
-<KEYWORD2>string-skip</KEYWORD2>
-<KEYWORD2>string-skip-right</KEYWORD2>
-<KEYWORD2>string-split</KEYWORD2>
-<KEYWORD2>string-suffix-ci?</KEYWORD2>
-<KEYWORD2>string-suffix-length</KEYWORD2>
-<KEYWORD2>string-suffix-length-ci</KEYWORD2>
-<KEYWORD2>string-suffix?</KEYWORD2>
-<KEYWORD2>string-tabulate</KEYWORD2>
-<KEYWORD2>string-take</KEYWORD2>
-<KEYWORD2>string-take-right</KEYWORD2>
-<KEYWORD2>string-titlecase</KEYWORD2>
-<KEYWORD2>string-titlecase!</KEYWORD2>
-<KEYWORD2>string-tokenize</KEYWORD2>
-<KEYWORD2>string-trim</KEYWORD2>
-<KEYWORD2>string-trim-both</KEYWORD2>
-<KEYWORD2>string-trim-right</KEYWORD2>
-<KEYWORD2>string-unfold</KEYWORD2>
-<KEYWORD2>string-unfold-right</KEYWORD2>
-<KEYWORD2>string-upcase</KEYWORD2>
-<KEYWORD2>string-upcase!</KEYWORD2>
-<KEYWORD2>string-xcopy!</KEYWORD2>
-<KEYWORD2>string&lt;</KEYWORD2>
-<KEYWORD2>string&lt;=</KEYWORD2>
-<KEYWORD2>string&lt;=?</KEYWORD2>
-<KEYWORD2>string&lt;&gt;></KEYWORD2>
-<KEYWORD2>string&lt;?</KEYWORD2>
-<KEYWORD2>string=</KEYWORD2>
-<KEYWORD2>string=?</KEYWORD2>
-<KEYWORD2>string&gt;</KEYWORD2>
-<KEYWORD2>string&gt;=</KEYWORD2>
-<KEYWORD2>string&gt;=?</KEYWORD2>
-<KEYWORD2>string&gt;?</KEYWORD2>
-<KEYWORD2>string?</KEYWORD2>
-<KEYWORD2>strptime</KEYWORD2>
-<KEYWORD2>struct-ref</KEYWORD2>
-<KEYWORD2>struct-set!</KEYWORD2>
-<KEYWORD2>struct-vtable</KEYWORD2>
-<KEYWORD2>struct-vtable-name</KEYWORD2>
-<KEYWORD2>struct-vtable-tag</KEYWORD2>
-<KEYWORD2>struct-vtable?</KEYWORD2>
-<KEYWORD2>struct?</KEYWORD2>
-<KEYWORD2>substring</KEYWORD2>
-<KEYWORD2>substring-fill!</KEYWORD2>
-<KEYWORD2>substring-move!</KEYWORD2>
-<KEYWORD2>substring/copy</KEYWORD2>
-<KEYWORD2>substring/read-only</KEYWORD2>
-<KEYWORD2>substring/shared</KEYWORD2>
-<KEYWORD2>subtract-duration</KEYWORD2>
-<KEYWORD2>subtract-duration!</KEYWORD2>
-<KEYWORD2>symbol-&gt;keyword</KEYWORD2>
-<KEYWORD2>symbol-&gt;string</KEYWORD2>
-<KEYWORD2>symbol-fref</KEYWORD2>
-<KEYWORD2>symbol-fset!</KEYWORD2>
-<KEYWORD2>symbol-hash</KEYWORD2>
-<KEYWORD2>symbol-interned?</KEYWORD2>
-<KEYWORD2>symbol-pref</KEYWORD2>
-<KEYWORD2>symbol-prefix-proc</KEYWORD2>
-<KEYWORD2>symbol-property</KEYWORD2>
-<KEYWORD2>symbol-property-remove!</KEYWORD2>
-<KEYWORD2>symbol-pset!</KEYWORD2>
-<KEYWORD2>symbol?</KEYWORD2>
-<KEYWORD2>symlink</KEYWORD2>
-<KEYWORD2>sync</KEYWORD2>
-<KEYWORD2>sync-q!</KEYWORD2>
-<KEYWORD2>system</KEYWORD2>
-<KEYWORD2>system*</KEYWORD2>
-<KEYWORD2>system-async-mark</KEYWORD2>
-<KEYWORD2>system-error-errno</KEYWORD2>
-<KEYWORD2>take</KEYWORD2>
-<KEYWORD2>take!</KEYWORD2>
-<KEYWORD2>take-right</KEYWORD2>
-<KEYWORD2>take-while</KEYWORD2>
-<KEYWORD2>take-while!</KEYWORD2>
-<KEYWORD2>tan</KEYWORD2>
-<KEYWORD2>tanh</KEYWORD2>
-<KEYWORD2>tc:depth</KEYWORD2>
-<KEYWORD2>tc:frame</KEYWORD2>
-<KEYWORD2>tc:real-depth</KEYWORD2>
-<KEYWORD2>tc:return-value</KEYWORD2>
-<KEYWORD2>tc:stack</KEYWORD2>
-<KEYWORD2>tc:type</KEYWORD2>
-<KEYWORD2>tcgetpgrp</KEYWORD2>
-<KEYWORD2>tcsetpgrp</KEYWORD2>
-<KEYWORD2>tenth</KEYWORD2>
-<KEYWORD2>textdomain</KEYWORD2>
-<KEYWORD2>third</KEYWORD2>
-<KEYWORD2>thread-exited?</KEYWORD2>
-<KEYWORD2>throw</KEYWORD2>
-<KEYWORD2>thunk?</KEYWORD2>
-<KEYWORD2>time-difference</KEYWORD2>
-<KEYWORD2>time-difference!</KEYWORD2>
-<KEYWORD2>time-monotonic-&gt;date</KEYWORD2>
-<KEYWORD2>time-monotonic-&gt;time-tai</KEYWORD2>
-<KEYWORD2>time-monotonic-&gt;time-tai!</KEYWORD2>
-<KEYWORD2>time-monotonic-&gt;time-utc</KEYWORD2>
-<KEYWORD2>time-monotonic-&gt;time-utc!</KEYWORD2>
-<KEYWORD2>time-nanosecond</KEYWORD2>
-<KEYWORD2>time-resolution</KEYWORD2>
-<KEYWORD2>time-second</KEYWORD2>
-<KEYWORD2>time-tai-&gt;date</KEYWORD2>
-<KEYWORD2>time-tai-&gt;julian-day</KEYWORD2>
-<KEYWORD2>time-tai-&gt;modified-julian-day</KEYWORD2>
-<KEYWORD2>time-tai-&gt;time-monotonic</KEYWORD2>
-<KEYWORD2>time-tai-&gt;time-monotonic!</KEYWORD2>
-<KEYWORD2>time-tai-&gt;time-utc</KEYWORD2>
-<KEYWORD2>time-tai-&gt;time-utc!</KEYWORD2>
-<KEYWORD2>time-type</KEYWORD2>
-<KEYWORD2>time-utc-&gt;date</KEYWORD2>
-<KEYWORD2>time-utc-&gt;julian-day</KEYWORD2>
-<KEYWORD2>time-utc-&gt;modified-julian-day</KEYWORD2>
-<KEYWORD2>time-utc-&gt;time-monotonic</KEYWORD2>
-<KEYWORD2>time-utc-&gt;time-monotonic!</KEYWORD2>
-<KEYWORD2>time-utc-&gt;time-tai</KEYWORD2>
-<KEYWORD2>time-utc-&gt;time-tai!</KEYWORD2>
-<KEYWORD2>time&lt;=?</KEYWORD2>
-<KEYWORD2>time&lt;?</KEYWORD2>
-<KEYWORD2>time=?</KEYWORD2>
-<KEYWORD2>time&gt;=?</KEYWORD2>
-<KEYWORD2>time&gt;?</KEYWORD2>
-<KEYWORD2>time?</KEYWORD2>
-<KEYWORD2>times</KEYWORD2>
-<KEYWORD2>tm:gmtoff</KEYWORD2>
-<KEYWORD2>tm:hour</KEYWORD2>
-<KEYWORD2>tm:isdst</KEYWORD2>
-<KEYWORD2>tm:mday</KEYWORD2>
-<KEYWORD2>tm:min</KEYWORD2>
-<KEYWORD2>tm:mon</KEYWORD2>
-<KEYWORD2>tm:sec</KEYWORD2>
-<KEYWORD2>tm:wday</KEYWORD2>
-<KEYWORD2>tm:yday</KEYWORD2>
-<KEYWORD2>tm:year</KEYWORD2>
-<KEYWORD2>tm:zone</KEYWORD2>
-<KEYWORD2>tmpnam</KEYWORD2>
-<KEYWORD2>tms:clock</KEYWORD2>
-<KEYWORD2>tms:cstime</KEYWORD2>
-<KEYWORD2>tms:cutime</KEYWORD2>
-<KEYWORD2>tms:stime</KEYWORD2>
-<KEYWORD2>tms:utime</KEYWORD2>
-<KEYWORD2>trace</KEYWORD2>
-<KEYWORD2>trace-at-exit</KEYWORD2>
-<KEYWORD2>trace-port</KEYWORD2>
-<KEYWORD2>trace-trap</KEYWORD2>
-<KEYWORD2>trace-until-exit</KEYWORD2>
-<KEYWORD2>trace/info</KEYWORD2>
-<KEYWORD2>trace/pid</KEYWORD2>
-<KEYWORD2>trace/real?</KEYWORD2>
-<KEYWORD2>trace/source</KEYWORD2>
-<KEYWORD2>trace/source-column</KEYWORD2>
-<KEYWORD2>trace/source-file-name</KEYWORD2>
-<KEYWORD2>trace/source-line</KEYWORD2>
-<KEYWORD2>trace/stack</KEYWORD2>
-<KEYWORD2>trace/stack-depth</KEYWORD2>
-<KEYWORD2>trace/stack-id</KEYWORD2>
-<KEYWORD2>trace/stack-real-depth</KEYWORD2>
-<KEYWORD2>trace/type</KEYWORD2>
-<KEYWORD2>transpose-array</KEYWORD2>
-<KEYWORD2>trap-disable</KEYWORD2>
-<KEYWORD2>trap-disable</KEYWORD2>
-<KEYWORD2>trap-enable</KEYWORD2>
-<KEYWORD2>trap-enable</KEYWORD2>
-<KEYWORD2>trap-here</KEYWORD2>
-<KEYWORD2>trap-set!</KEYWORD2>
-<KEYWORD2>trap-set!</KEYWORD2>
-<KEYWORD2>traps</KEYWORD2>
-<KEYWORD2>traps</KEYWORD2>
-<KEYWORD2>truncate</KEYWORD2>
-<KEYWORD2>truncate</KEYWORD2>
-<KEYWORD2>truncate-file</KEYWORD2>
-<KEYWORD2>try-arbiter</KEYWORD2>
-<KEYWORD2>try-mutex</KEYWORD2>
-<KEYWORD2>ttyname</KEYWORD2>
-<KEYWORD2>typed-array?</KEYWORD2>
-<KEYWORD2>tzset</KEYWORD2>
-<KEYWORD2>u16vector</KEYWORD2>
-<KEYWORD2>u16vector-&gt;list</KEYWORD2>
-<KEYWORD2>u16vector-length</KEYWORD2>
-<KEYWORD2>u16vector-ref</KEYWORD2>
-<KEYWORD2>u16vector-set!</KEYWORD2>
-<KEYWORD2>u16vector?</KEYWORD2>
-<KEYWORD2>u32vector</KEYWORD2>
-<KEYWORD2>u32vector-&gt;list</KEYWORD2>
-<KEYWORD2>u32vector-length</KEYWORD2>
-<KEYWORD2>u32vector-ref</KEYWORD2>
-<KEYWORD2>u32vector-set!</KEYWORD2>
-<KEYWORD2>u32vector?</KEYWORD2>
-<KEYWORD2>u64vector</KEYWORD2>
-<KEYWORD2>u64vector-&gt;list</KEYWORD2>
-<KEYWORD2>u64vector-length</KEYWORD2>
-<KEYWORD2>u64vector-ref</KEYWORD2>
-<KEYWORD2>u64vector-set!</KEYWORD2>
-<KEYWORD2>u64vector?</KEYWORD2>
-<KEYWORD2>u8vector</KEYWORD2>
-<KEYWORD2>u8vector-&gt;list</KEYWORD2>
-<KEYWORD2>u8vector-length</KEYWORD2>
-<KEYWORD2>u8vector-ref</KEYWORD2>
-<KEYWORD2>u8vector-set!</KEYWORD2>
-<KEYWORD2>u8vector?</KEYWORD2>
-<KEYWORD2>ucs-range-&gt;char-set</KEYWORD2>
-<KEYWORD2>ucs-range-&gt;char-set!</KEYWORD2>
-<KEYWORD2>umask</KEYWORD2>
-<KEYWORD2>uname</KEYWORD2>
-<KEYWORD2>unfold</KEYWORD2>
-<KEYWORD2>unfold-right</KEYWORD2>
-<KEYWORD2>uniform-array-read!</KEYWORD2>
-<KEYWORD2>uniform-array-write</KEYWORD2>
-<KEYWORD2>uniform-vector-&gt;list</KEYWORD2>
-<KEYWORD2>uniform-vector-length</KEYWORD2>
-<KEYWORD2>uniform-vector-read!</KEYWORD2>
-<KEYWORD2>uniform-vector-ref</KEYWORD2>
-<KEYWORD2>uniform-vector-set!</KEYWORD2>
-<KEYWORD2>uniform-vector-write</KEYWORD2>
-<KEYWORD2>uniform-vector?</KEYWORD2>
-<KEYWORD2>uninstall-trap</KEYWORD2>
-<KEYWORD2>unlink</KEYWORD2>
-<KEYWORD2>unlock-mutex</KEYWORD2>
-<KEYWORD2>unmemoize</KEYWORD2>
-<KEYWORD2>unquote</KEYWORD2>
-<KEYWORD2>unquote-splicing</KEYWORD2>
-<KEYWORD2>unread-char</KEYWORD2>
-<KEYWORD2>unread-char</KEYWORD2>
-<KEYWORD2>unread-string</KEYWORD2>
-<KEYWORD2>unread-string</KEYWORD2>
-<KEYWORD2>unsetenv</KEYWORD2>
-<KEYWORD2>untrace</KEYWORD2>
-<KEYWORD2>unzip1</KEYWORD2>
-<KEYWORD2>unzip2</KEYWORD2>
-<KEYWORD2>unzip3</KEYWORD2>
-<KEYWORD2>unzip4</KEYWORD2>
-<KEYWORD2>unzip5</KEYWORD2>
-<KEYWORD2>up</KEYWORD2>
-<KEYWORD2>use-modules</KEYWORD2>
-<KEYWORD2>use-syntax</KEYWORD2>
-<KEYWORD2>usleep</KEYWORD2>
-<KEYWORD2>utime</KEYWORD2>
-<KEYWORD2>utsname:machine</KEYWORD2>
-<KEYWORD2>utsname:nodename</KEYWORD2>
-<KEYWORD2>utsname:release</KEYWORD2>
-<KEYWORD2>utsname:sysname</KEYWORD2>
-<KEYWORD2>utsname:version</KEYWORD2>
-<KEYWORD2>values</KEYWORD2>
-<KEYWORD2>variable-bound?</KEYWORD2>
-<KEYWORD2>variable-ref</KEYWORD2>
-<KEYWORD2>variable-set!</KEYWORD2>
-<KEYWORD2>variable?</KEYWORD2>
-<KEYWORD2>vector</KEYWORD2>
-<KEYWORD2>vector-&gt;list</KEYWORD2>
-<KEYWORD2>vector-&gt;stream</KEYWORD2>
-<KEYWORD2>vector-copy</KEYWORD2>
-<KEYWORD2>vector-fill!</KEYWORD2>
-<KEYWORD2>vector-length</KEYWORD2>
-<KEYWORD2>vector-move-left!</KEYWORD2>
-<KEYWORD2>vector-move-right!</KEYWORD2>
-<KEYWORD2>vector-ref</KEYWORD2>
-<KEYWORD2>vector-set!</KEYWORD2>
-<KEYWORD2>vector?</KEYWORD2>
-<KEYWORD2>version</KEYWORD2>
-<!-- <KEYWORD2>void *</KEYWORD2> -->
-<KEYWORD2>wait-condition-variable</KEYWORD2>
-<KEYWORD2>waitpid</KEYWORD2>
-<KEYWORD2>weak-key-hash-table?</KEYWORD2>
-<KEYWORD2>weak-value-hash-table?</KEYWORD2>
-<KEYWORD2>weak-vector</KEYWORD2>
-<KEYWORD2>weak-vector?</KEYWORD2>
-<KEYWORD2>where</KEYWORD2>
-<KEYWORD2>while</KEYWORD2>
-<KEYWORD2>with-continuation-barrier</KEYWORD2>
-<KEYWORD2>with-dynamic-state</KEYWORD2>
-<KEYWORD2>with-error-to-file</KEYWORD2>
-<KEYWORD2>with-fluid*</KEYWORD2>
-<KEYWORD2>with-fluids</KEYWORD2>
-<KEYWORD2>with-fluids*</KEYWORD2>
-<KEYWORD2>with-input-from-file</KEYWORD2>
-<KEYWORD2>with-input-from-string</KEYWORD2>
-<KEYWORD2>with-mutex</KEYWORD2>
-<KEYWORD2>with-output-to-file</KEYWORD2>
-<KEYWORD2>with-output-to-string</KEYWORD2>
-<KEYWORD2>with-parameters*</KEYWORD2>
-<KEYWORD2>with-readline-completion-function</KEYWORD2>
-<KEYWORD2>with-throw-handler</KEYWORD2>
-<KEYWORD2>with-traps</KEYWORD2>
-<KEYWORD2>write</KEYWORD2>
-<KEYWORD2>write-char</KEYWORD2>
-<KEYWORD2>write-line</KEYWORD2>
-<KEYWORD2>write-string/partial</KEYWORD2>
-<KEYWORD2>xcons</KEYWORD2>
-<KEYWORD2>xsubstring</KEYWORD2>
-<KEYWORD2>yield</KEYWORD2>
-<KEYWORD2>zero?</KEYWORD2>
-<KEYWORD2>zip</KEYWORD2>
-
-<LITERAL2>#t</LITERAL2>
-<LITERAL2>#f</LITERAL2>
-</KEYWORDS>
-<!-- Generated part ended -->
-
-</RULES>
-
-</MODE> 
diff --git a/qpython/src/main/assets/syntax/lisp.xml b/qpython/src/main/assets/syntax/lisp.xml
deleted file mode 100644
index 24ba20a9..00000000
--- a/qpython/src/main/assets/syntax/lisp.xml
+++ /dev/null
@@ -1,1037 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="commentStart" VALUE="#| " />
-		<PROPERTY NAME="commentEnd" VALUE=" |#" />
-		<PROPERTY NAME="lineComment" VALUE=";" />
-		<PROPERTY NAME="noWordSep" VALUE="_-+?:" />
-		<PROPERTY NAME="unalignedOpenBrackets" VALUE="(" />
-		<PROPERTY NAME="unalignedCloseBrackets" VALUE=")" />
-		<PROPERTY NAME="multipleBracketIndent" VALUE="true" />
-	</PROPS>
-
-	<RULES IGNORE_CASE="FALSE"
-		HIGHLIGHT_DIGITS="TRUE"
-		NO_WORD_SEP="_-+?:"
-		DIGIT_RE="-?\d+([./]\d+)?"
-	>
-
-		<SPAN TYPE="COMMENT1">
-			<BEGIN>#|</BEGIN>
-			<END>|#</END>
-		</SPAN>
-
-		<SEQ TYPE="NULL">'(</SEQ>
-
-		<MARK_FOLLOWING TYPE="LITERAL1">'</MARK_FOLLOWING>
-
-		<MARK_FOLLOWING AT_WORD_START="TRUE" TYPE="KEYWORD4">&amp;</MARK_FOLLOWING>
-
-		<SEQ TYPE="OPERATOR">`</SEQ>
-		<SEQ TYPE="OPERATOR">@</SEQ>
-		<SEQ TYPE="OPERATOR">%</SEQ>
-
-		<!--
-		Based on convention discussed here:
-			http://www.gigamonkeys.com/book/syntax-and-semantics.html
-		-->
-		<EOL_SPAN TYPE="COMMENT4">;;;;</EOL_SPAN>
-		<EOL_SPAN TYPE="COMMENT3">;;;</EOL_SPAN>
-		<EOL_SPAN TYPE="COMMENT2">;;</EOL_SPAN>
-		<EOL_SPAN TYPE="COMMENT1">;</EOL_SPAN>
-
-		<SPAN TYPE="LITERAL1" ESCAPE="\">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-
-		<!--
-			keywords from j
-				(http://armedbear-j.sourceforge.net/)
-                        Duplicates removed; KEYWORD1 and KEYWORD2
-                          better aligned with Emacs Lisp mode
-                        Missing Common Lisp symbols added; now 970 symbols total
-                        2004-01-22  dsh
-		-->
-		<KEYWORDS>
-			<KEYWORD1>defclass</KEYWORD1>
-			<KEYWORD1>defconstant</KEYWORD1>
-			<KEYWORD1>defgeneric</KEYWORD1>
-			<KEYWORD1>define-compiler-macro</KEYWORD1>
-			<KEYWORD1>define-condition</KEYWORD1>
-			<KEYWORD1>define-method-combination</KEYWORD1>
-			<KEYWORD1>define-modify-macro</KEYWORD1>
-			<KEYWORD1>define-setf-expander</KEYWORD1>
-			<KEYWORD1>define-symbol-macro</KEYWORD1>
-			<KEYWORD1>defmacro</KEYWORD1>
-			<KEYWORD1>defmethod</KEYWORD1>
-			<KEYWORD1>defpackage</KEYWORD1>
-			<KEYWORD1>defparameter</KEYWORD1>
-			<KEYWORD1>defsetf</KEYWORD1>
-			<KEYWORD1>defstruct</KEYWORD1>
-			<KEYWORD1>deftype</KEYWORD1>
-			<KEYWORD1>defun</KEYWORD1>
-			<KEYWORD1>defvar</KEYWORD1>
-
-			<KEYWORD2>abort</KEYWORD2>
-			<KEYWORD2>assert</KEYWORD2>
-			<KEYWORD2>block</KEYWORD2>
-			<KEYWORD2>break</KEYWORD2>
-			<KEYWORD2>case</KEYWORD2>
-			<KEYWORD2>catch</KEYWORD2>
-			<KEYWORD2>ccase</KEYWORD2>
-			<KEYWORD2>cerror</KEYWORD2>
-			<KEYWORD2>cond</KEYWORD2>
-			<KEYWORD2>ctypecase</KEYWORD2>
-			<KEYWORD2>declaim</KEYWORD2>
-			<KEYWORD2>declare</KEYWORD2>
-			<KEYWORD2>do</KEYWORD2>
-			<KEYWORD2>do*</KEYWORD2>
-			<KEYWORD2>do-all-symbols</KEYWORD2>
-			<KEYWORD2>do-external-symbols</KEYWORD2>
-			<KEYWORD2>do-symbols</KEYWORD2>
-			<KEYWORD2>dolist</KEYWORD2>
-			<KEYWORD2>dotimes</KEYWORD2>
-			<KEYWORD2>ecase</KEYWORD2>
-			<KEYWORD2>error</KEYWORD2>
-			<KEYWORD2>etypecase</KEYWORD2>
-			<KEYWORD2>eval-when</KEYWORD2>
-			<KEYWORD2>flet</KEYWORD2>
-			<KEYWORD2>handler-bind</KEYWORD2>
-			<KEYWORD2>handler-case</KEYWORD2>
-			<KEYWORD2>if</KEYWORD2>
-			<KEYWORD2>ignore-errors</KEYWORD2>
-			<KEYWORD2>in-package</KEYWORD2>
-			<KEYWORD2>labels</KEYWORD2>
-			<KEYWORD2>lambda</KEYWORD2>
-			<KEYWORD2>let</KEYWORD2>
-			<KEYWORD2>let*</KEYWORD2>
-			<KEYWORD2>locally</KEYWORD2>
-			<KEYWORD2>loop</KEYWORD2>
-			<KEYWORD2>macrolet</KEYWORD2>
-			<KEYWORD2>multiple-value-bind</KEYWORD2>
-			<KEYWORD2>proclaim</KEYWORD2>
-			<KEYWORD2>prog</KEYWORD2>
-			<KEYWORD2>prog*</KEYWORD2>
-			<KEYWORD2>prog1</KEYWORD2>
-			<KEYWORD2>prog2</KEYWORD2>
-			<KEYWORD2>progn</KEYWORD2>
-			<KEYWORD2>progv</KEYWORD2>
-			<KEYWORD2>provide</KEYWORD2>
-			<KEYWORD2>require</KEYWORD2>
-			<KEYWORD2>restart-bind</KEYWORD2>
-			<KEYWORD2>restart-case</KEYWORD2>
-			<KEYWORD2>restart-name</KEYWORD2>
-			<KEYWORD2>return</KEYWORD2>
-			<KEYWORD2>return-from</KEYWORD2>
-			<KEYWORD2>signal</KEYWORD2>
-			<KEYWORD2>symbol-macrolet</KEYWORD2>
-			<KEYWORD2>tagbody</KEYWORD2>
-			<KEYWORD2>the</KEYWORD2>
-			<KEYWORD2>throw</KEYWORD2>
-			<KEYWORD2>typecase</KEYWORD2>
-			<KEYWORD2>unless</KEYWORD2>
-			<KEYWORD2>unwind-protect</KEYWORD2>
-			<KEYWORD2>when</KEYWORD2>
-			<KEYWORD2>with-accessors</KEYWORD2>
-			<KEYWORD2>with-compilation-unit</KEYWORD2>
-			<KEYWORD2>with-condition-restarts</KEYWORD2>
-			<KEYWORD2>with-hash-table-iterator</KEYWORD2>
-			<KEYWORD2>with-input-from-string</KEYWORD2>
-			<KEYWORD2>with-open-file</KEYWORD2>
-			<KEYWORD2>with-open-stream</KEYWORD2>
-			<KEYWORD2>with-output-to-string</KEYWORD2>
-			<KEYWORD2>with-package-iterator</KEYWORD2>
-			<KEYWORD2>with-simple-restart</KEYWORD2>
-			<KEYWORD2>with-slots</KEYWORD2>
-			<KEYWORD2>with-standard-io-syntax</KEYWORD2>
-
-			<KEYWORD3>*</KEYWORD3>
-			<KEYWORD3>**</KEYWORD3>
-			<KEYWORD3>***</KEYWORD3>
-			<KEYWORD3>*break-on-signals*</KEYWORD3>
-			<KEYWORD3>*compile-file-pathname*</KEYWORD3>
-			<KEYWORD3>*compile-file-truename*</KEYWORD3>
-			<KEYWORD3>*compile-print*</KEYWORD3>
-			<KEYWORD3>*compile-verbose*</KEYWORD3>
-			<KEYWORD3>*debug-io*</KEYWORD3>
-			<KEYWORD3>*debugger-hook*</KEYWORD3>
-			<KEYWORD3>*default-pathname-defaults*</KEYWORD3>
-			<KEYWORD3>*error-output*</KEYWORD3>
-			<KEYWORD3>*features*</KEYWORD3>
-			<KEYWORD3>*gensym-counter*</KEYWORD3>
-			<KEYWORD3>*load-pathname*</KEYWORD3>
-			<KEYWORD3>*load-print*</KEYWORD3>
-			<KEYWORD3>*load-truename*</KEYWORD3>
-			<KEYWORD3>*load-verbose*</KEYWORD3>
-			<KEYWORD3>*macroexpand-hook*</KEYWORD3>
-			<KEYWORD3>*modules*</KEYWORD3>
-			<KEYWORD3>*package*</KEYWORD3>
-			<KEYWORD3>*print-array*</KEYWORD3>
-			<KEYWORD3>*print-base*</KEYWORD3>
-			<KEYWORD3>*print-case*</KEYWORD3>
-			<KEYWORD3>*print-circle*</KEYWORD3>
-			<KEYWORD3>*print-escape*</KEYWORD3>
-			<KEYWORD3>*print-gensym*</KEYWORD3>
-			<KEYWORD3>*print-length*</KEYWORD3>
-			<KEYWORD3>*print-level*</KEYWORD3>
-			<KEYWORD3>*print-lines*</KEYWORD3>
-			<KEYWORD3>*print-miser-width*</KEYWORD3>
-			<KEYWORD3>*print-pprint-dispatch*</KEYWORD3>
-			<KEYWORD3>*print-pretty*</KEYWORD3>
-			<KEYWORD3>*print-radix*</KEYWORD3>
-			<KEYWORD3>*print-readably*</KEYWORD3>
-			<KEYWORD3>*print-right-margin*</KEYWORD3>
-			<KEYWORD3>*query-io*</KEYWORD3>
-			<KEYWORD3>*random-state*</KEYWORD3>
-			<KEYWORD3>*read-base*</KEYWORD3>
-			<KEYWORD3>*read-default-float-format*</KEYWORD3>
-			<KEYWORD3>*read-eval*</KEYWORD3>
-			<KEYWORD3>*read-suppress*</KEYWORD3>
-			<KEYWORD3>*readtable*</KEYWORD3>
-			<KEYWORD3>*standard-input*</KEYWORD3>
-			<KEYWORD3>*standard-output*</KEYWORD3>
-			<KEYWORD3>*terminal-io*</KEYWORD3>
-			<KEYWORD3>*trace-output*</KEYWORD3>
-			<KEYWORD3>+</KEYWORD3>
-			<KEYWORD3>++</KEYWORD3>
-			<KEYWORD3>+++</KEYWORD3>
-			<KEYWORD3>-</KEYWORD3>
-			<KEYWORD3>/</KEYWORD3>
-			<KEYWORD3>//</KEYWORD3>
-			<KEYWORD3>///</KEYWORD3>
-			<KEYWORD3>/=</KEYWORD3>
-			<KEYWORD3>1+</KEYWORD3>
-			<KEYWORD3>1-</KEYWORD3>
-			<KEYWORD3>&lt;</KEYWORD3>
-			<KEYWORD3>&lt;=</KEYWORD3>
-			<KEYWORD3>=</KEYWORD3>
-			<KEYWORD3>&gt;</KEYWORD3>
-			<KEYWORD3>&gt;=</KEYWORD3>
-			<KEYWORD3>abs</KEYWORD3>
-			<KEYWORD3>acons</KEYWORD3>
-			<KEYWORD3>acos</KEYWORD3>
-			<KEYWORD3>acosh</KEYWORD3>
-			<KEYWORD3>add-method</KEYWORD3>
-			<KEYWORD3>adjoin</KEYWORD3>
-			<KEYWORD3>adjust-array</KEYWORD3>
-			<KEYWORD3>adjustable-array-p</KEYWORD3>
-			<KEYWORD3>allocate-instance</KEYWORD3>
-			<KEYWORD3>alpha-char-p</KEYWORD3>
-			<KEYWORD3>alphanumericp</KEYWORD3>
-			<KEYWORD3>and</KEYWORD3>
-			<KEYWORD3>append</KEYWORD3>
-			<KEYWORD3>apply</KEYWORD3>
-			<KEYWORD3>apropos</KEYWORD3>
-			<KEYWORD3>apropos-list</KEYWORD3>
-			<KEYWORD3>aref</KEYWORD3>
-			<KEYWORD3>arithmetic-error</KEYWORD3>
-			<KEYWORD3>arithmetic-error-operands</KEYWORD3>
-			<KEYWORD3>arithmetic-error-operation</KEYWORD3>
-			<KEYWORD3>array</KEYWORD3>
-			<KEYWORD3>array-dimension</KEYWORD3>
-			<KEYWORD3>array-dimension-limit</KEYWORD3>
-			<KEYWORD3>array-dimensions</KEYWORD3>
-			<KEYWORD3>array-displacement</KEYWORD3>
-			<KEYWORD3>array-element-type</KEYWORD3>
-			<KEYWORD3>array-has-fill-pointer-p</KEYWORD3>
-			<KEYWORD3>array-in-bounds-p</KEYWORD3>
-			<KEYWORD3>array-rank</KEYWORD3>
-			<KEYWORD3>array-rank-limit</KEYWORD3>
-			<KEYWORD3>array-row-major-index</KEYWORD3>
-			<KEYWORD3>array-total-size</KEYWORD3>
-			<KEYWORD3>array-total-size-limit</KEYWORD3>
-			<KEYWORD3>arrayp</KEYWORD3>
-			<KEYWORD3>ash</KEYWORD3>
-			<KEYWORD3>asin</KEYWORD3>
-			<KEYWORD3>asinh</KEYWORD3>
-			<KEYWORD3>assoc</KEYWORD3>
-			<KEYWORD3>assoc-if</KEYWORD3>
-			<KEYWORD3>assoc-if-not</KEYWORD3>
-			<KEYWORD3>atan</KEYWORD3>
-			<KEYWORD3>atanh</KEYWORD3>
-			<KEYWORD3>atom</KEYWORD3>
-			<KEYWORD3>base-char</KEYWORD3>
-			<KEYWORD3>base-string</KEYWORD3>
-			<KEYWORD3>bignum</KEYWORD3>
-			<KEYWORD3>bit</KEYWORD3>
-			<KEYWORD3>bit-and</KEYWORD3>
-			<KEYWORD3>bit-andc1</KEYWORD3>
-			<KEYWORD3>bit-andc2</KEYWORD3>
-			<KEYWORD3>bit-eqv</KEYWORD3>
-			<KEYWORD3>bit-ior</KEYWORD3>
-			<KEYWORD3>bit-nand</KEYWORD3>
-			<KEYWORD3>bit-nor</KEYWORD3>
-			<KEYWORD3>bit-not</KEYWORD3>
-			<KEYWORD3>bit-orc1</KEYWORD3>
-			<KEYWORD3>bit-orc2</KEYWORD3>
-			<KEYWORD3>bit-vector</KEYWORD3>
-			<KEYWORD3>bit-vector-p</KEYWORD3>
-			<KEYWORD3>bit-xor</KEYWORD3>
-			<KEYWORD3>boole</KEYWORD3>
-			<KEYWORD3>boole-1</KEYWORD3>
-			<KEYWORD3>boole-2</KEYWORD3>
-			<KEYWORD3>boole-and</KEYWORD3>
-			<KEYWORD3>boole-andc1</KEYWORD3>
-			<KEYWORD3>boole-andc2</KEYWORD3>
-			<KEYWORD3>boole-c1</KEYWORD3>
-			<KEYWORD3>boole-c2</KEYWORD3>
-			<KEYWORD3>boole-clr</KEYWORD3>
-			<KEYWORD3>boole-eqv</KEYWORD3>
-			<KEYWORD3>boole-ior</KEYWORD3>
-			<KEYWORD3>boole-nand</KEYWORD3>
-			<KEYWORD3>boole-nor</KEYWORD3>
-			<KEYWORD3>boole-orc1</KEYWORD3>
-			<KEYWORD3>boole-orc2</KEYWORD3>
-			<KEYWORD3>boole-set</KEYWORD3>
-			<KEYWORD3>boole-xor</KEYWORD3>
-			<KEYWORD3>boolean</KEYWORD3>
-			<KEYWORD3>both-case-p</KEYWORD3>
-			<KEYWORD3>boundp</KEYWORD3>
-			<KEYWORD3>broadcast-stream</KEYWORD3>
-			<KEYWORD3>broadcast-stream-streams</KEYWORD3>
-			<KEYWORD3>built-in-class</KEYWORD3>
-			<KEYWORD3>butlast</KEYWORD3>
-			<KEYWORD3>byte</KEYWORD3>
-			<KEYWORD3>byte-position</KEYWORD3>
-			<KEYWORD3>byte-size</KEYWORD3>
-			<KEYWORD3>caaaar</KEYWORD3>
-			<KEYWORD3>caaadr</KEYWORD3>
-			<KEYWORD3>caaar</KEYWORD3>
-			<KEYWORD3>caadar</KEYWORD3>
-			<KEYWORD3>caaddr</KEYWORD3>
-			<KEYWORD3>caadr</KEYWORD3>
-			<KEYWORD3>caar</KEYWORD3>
-			<KEYWORD3>cadaar</KEYWORD3>
-			<KEYWORD3>cadadr</KEYWORD3>
-			<KEYWORD3>cadar</KEYWORD3>
-			<KEYWORD3>caddar</KEYWORD3>
-			<KEYWORD3>cadddr</KEYWORD3>
-			<KEYWORD3>caddr</KEYWORD3>
-			<KEYWORD3>cadr</KEYWORD3>
-			<KEYWORD3>call-arguments-limit</KEYWORD3>
-			<KEYWORD3>call-method</KEYWORD3>
-			<KEYWORD3>call-next-method</KEYWORD3>
-			<KEYWORD3>car</KEYWORD3>
-			<KEYWORD3>cdaaar</KEYWORD3>
-			<KEYWORD3>cdaadr</KEYWORD3>
-			<KEYWORD3>cdaar</KEYWORD3>
-			<KEYWORD3>cdadar</KEYWORD3>
-			<KEYWORD3>cdaddr</KEYWORD3>
-			<KEYWORD3>cdadr</KEYWORD3>
-			<KEYWORD3>cdar</KEYWORD3>
-			<KEYWORD3>cddaar</KEYWORD3>
-			<KEYWORD3>cddadr</KEYWORD3>
-			<KEYWORD3>cddar</KEYWORD3>
-			<KEYWORD3>cdddar</KEYWORD3>
-			<KEYWORD3>cddddr</KEYWORD3>
-			<KEYWORD3>cdddr</KEYWORD3>
-			<KEYWORD3>cddr</KEYWORD3>
-			<KEYWORD3>cdr</KEYWORD3>
-			<KEYWORD3>ceiling</KEYWORD3>
-			<KEYWORD3>cell-error</KEYWORD3>
-			<KEYWORD3>cell-error-name</KEYWORD3>
-			<KEYWORD3>change-class</KEYWORD3>
-			<KEYWORD3>char</KEYWORD3>
-			<KEYWORD3>char-code</KEYWORD3>
-			<KEYWORD3>char-code-limit</KEYWORD3>
-			<KEYWORD3>char-downcase</KEYWORD3>
-			<KEYWORD3>char-equal</KEYWORD3>
-			<KEYWORD3>char-greaterp</KEYWORD3>
-			<KEYWORD3>char-int</KEYWORD3>
-			<KEYWORD3>char-lessp</KEYWORD3>
-			<KEYWORD3>char-name</KEYWORD3>
-			<KEYWORD3>char-not-equal</KEYWORD3>
-			<KEYWORD3>char-not-greaterp</KEYWORD3>
-			<KEYWORD3>char-not-lessp</KEYWORD3>
-			<KEYWORD3>char-upcase</KEYWORD3>
-			<KEYWORD3>char/=</KEYWORD3>
-			<KEYWORD3>char&gt;</KEYWORD3>
-			<KEYWORD3>char&gt;=</KEYWORD3>
-			<KEYWORD3>char&lt;</KEYWORD3>
-			<KEYWORD3>char&lt;=</KEYWORD3>
-			<KEYWORD3>char=</KEYWORD3>
-			<KEYWORD3>character</KEYWORD3>
-			<KEYWORD3>characterp</KEYWORD3>
-			<KEYWORD3>check-type</KEYWORD3>
-			<KEYWORD3>cis</KEYWORD3>
-			<KEYWORD3>class</KEYWORD3>
-			<KEYWORD3>class-name</KEYWORD3>
-			<KEYWORD3>class-of</KEYWORD3>
-			<KEYWORD3>clear-input</KEYWORD3>
-			<KEYWORD3>clear-output</KEYWORD3>
-			<KEYWORD3>close</KEYWORD3>
-			<KEYWORD3>clrhash</KEYWORD3>
-			<KEYWORD3>code-char</KEYWORD3>
-			<KEYWORD3>coerce</KEYWORD3>
-			<KEYWORD3>compilation-speed</KEYWORD3>
-			<KEYWORD3>compile</KEYWORD3>
-			<KEYWORD3>compile-file</KEYWORD3>
-			<KEYWORD3>compile-file-pathname</KEYWORD3>
-			<KEYWORD3>compiled-function</KEYWORD3>
-			<KEYWORD3>compiled-function-p</KEYWORD3>
-			<KEYWORD3>compiler-macro</KEYWORD3>
-			<KEYWORD3>compiler-macro-function</KEYWORD3>
-			<KEYWORD3>complement</KEYWORD3>
-			<KEYWORD3>complex</KEYWORD3>
-			<KEYWORD3>complexp</KEYWORD3>
-			<KEYWORD3>compute-applicable-methods</KEYWORD3>
-			<KEYWORD3>compute-restarts</KEYWORD3>
-			<KEYWORD3>concatenate</KEYWORD3>
-			<KEYWORD3>concatenated-stream</KEYWORD3>
-			<KEYWORD3>concatenated-stream-streams</KEYWORD3>
-			<KEYWORD3>condition</KEYWORD3>
-			<KEYWORD3>conjugate</KEYWORD3>
-			<KEYWORD3>cons</KEYWORD3>
-			<KEYWORD3>consp</KEYWORD3>
-			<KEYWORD3>constantly</KEYWORD3>
-			<KEYWORD3>constantp</KEYWORD3>
-			<KEYWORD3>continue</KEYWORD3>
-			<KEYWORD3>control-error</KEYWORD3>
-			<KEYWORD3>copy-alist</KEYWORD3>
-			<KEYWORD3>copy-list</KEYWORD3>
-			<KEYWORD3>copy-pprint-dispatch</KEYWORD3>
-			<KEYWORD3>copy-readtable</KEYWORD3>
-			<KEYWORD3>copy-seq</KEYWORD3>
-			<KEYWORD3>copy-structure</KEYWORD3>
-			<KEYWORD3>copy-symbol</KEYWORD3>
-			<KEYWORD3>copy-tree</KEYWORD3>
-			<KEYWORD3>cos</KEYWORD3>
-			<KEYWORD3>cosh</KEYWORD3>
-			<KEYWORD3>count</KEYWORD3>
-			<KEYWORD3>count-if</KEYWORD3>
-			<KEYWORD3>count-if-not</KEYWORD3>
-			<KEYWORD3>debug</KEYWORD3>
-			<KEYWORD3>decf</KEYWORD3>
-			<KEYWORD3>declaration</KEYWORD3>
-			<KEYWORD3>decode-float</KEYWORD3>
-			<KEYWORD3>decode-universal-time</KEYWORD3>
-			<KEYWORD3>delete</KEYWORD3>
-			<KEYWORD3>delete-duplicates</KEYWORD3>
-			<KEYWORD3>delete-file</KEYWORD3>
-			<KEYWORD3>delete-if</KEYWORD3>
-			<KEYWORD3>delete-if-not</KEYWORD3>
-			<KEYWORD3>delete-package</KEYWORD3>
-			<KEYWORD3>denominator</KEYWORD3>
-			<KEYWORD3>deposit-field</KEYWORD3>
-			<KEYWORD3>describe</KEYWORD3>
-			<KEYWORD3>describe-object</KEYWORD3>
-			<KEYWORD3>destructuring-bind</KEYWORD3>
-			<KEYWORD3>digit-char</KEYWORD3>
-			<KEYWORD3>digit-char-p</KEYWORD3>
-			<KEYWORD3>directory</KEYWORD3>
-			<KEYWORD3>directory-namestring</KEYWORD3>
-			<KEYWORD3>disassemble</KEYWORD3>
-			<KEYWORD3>division-by-zero</KEYWORD3>
-			<KEYWORD3>documentation</KEYWORD3>
-			<KEYWORD3>double-float</KEYWORD3>
-			<KEYWORD3>double-float-epsilon</KEYWORD3>
-			<KEYWORD3>double-float-negative-epsilon</KEYWORD3>
-			<KEYWORD3>dpb</KEYWORD3>
-			<KEYWORD3>dribble</KEYWORD3>
-			<KEYWORD3>dynamic-extent</KEYWORD3>
-			<KEYWORD3>echo-stream</KEYWORD3>
-			<KEYWORD3>echo-stream-input-stream</KEYWORD3>
-			<KEYWORD3>echo-stream-output-stream</KEYWORD3>
-			<KEYWORD3>ed</KEYWORD3>
-			<KEYWORD3>eighth</KEYWORD3>
-			<KEYWORD3>elt</KEYWORD3>
-			<KEYWORD3>encode-universal-time</KEYWORD3>
-			<KEYWORD3>end-of-file</KEYWORD3>
-			<KEYWORD3>endp</KEYWORD3>
-			<KEYWORD3>enough-namestring</KEYWORD3>
-			<KEYWORD3>ensure-directories-exist</KEYWORD3>
-			<KEYWORD3>ensure-generic-function</KEYWORD3>
-			<KEYWORD3>eq</KEYWORD3>
-			<KEYWORD3>eql</KEYWORD3>
-			<KEYWORD3>equal</KEYWORD3>
-			<KEYWORD3>equalp</KEYWORD3>
-			<KEYWORD3>eval</KEYWORD3>
-			<KEYWORD3>evenp</KEYWORD3>
-			<KEYWORD3>every</KEYWORD3>
-			<KEYWORD3>exp</KEYWORD3>
-			<KEYWORD3>export</KEYWORD3>
-			<KEYWORD3>expt</KEYWORD3>
-			<KEYWORD3>extended-char</KEYWORD3>
-			<KEYWORD3>fboundp</KEYWORD3>
-			<KEYWORD3>fceiling</KEYWORD3>
-			<KEYWORD3>fdefinition</KEYWORD3>
-			<KEYWORD3>ffloor</KEYWORD3>
-			<KEYWORD3>fifth</KEYWORD3>
-			<KEYWORD3>file-author</KEYWORD3>
-			<KEYWORD3>file-error</KEYWORD3>
-			<KEYWORD3>file-error-pathname</KEYWORD3>
-			<KEYWORD3>file-length</KEYWORD3>
-			<KEYWORD3>file-namestring</KEYWORD3>
-			<KEYWORD3>file-position</KEYWORD3>
-			<KEYWORD3>file-stream</KEYWORD3>
-			<KEYWORD3>file-string-length</KEYWORD3>
-			<KEYWORD3>file-write-date</KEYWORD3>
-			<KEYWORD3>fill</KEYWORD3>
-			<KEYWORD3>fill-pointer</KEYWORD3>
-			<KEYWORD3>find</KEYWORD3>
-			<KEYWORD3>find-all-symbols</KEYWORD3>
-			<KEYWORD3>find-class</KEYWORD3>
-			<KEYWORD3>find-if</KEYWORD3>
-			<KEYWORD3>find-if-not</KEYWORD3>
-			<KEYWORD3>find-method</KEYWORD3>
-			<KEYWORD3>find-package</KEYWORD3>
-			<KEYWORD3>find-restart</KEYWORD3>
-			<KEYWORD3>find-symbol</KEYWORD3>
-			<KEYWORD3>finish-output</KEYWORD3>
-			<KEYWORD3>first</KEYWORD3>
-			<KEYWORD3>fixnum</KEYWORD3>
-			<KEYWORD3>float</KEYWORD3>
-			<KEYWORD3>float-digits</KEYWORD3>
-			<KEYWORD3>float-precision</KEYWORD3>
-			<KEYWORD3>float-radix</KEYWORD3>
-			<KEYWORD3>float-sign</KEYWORD3>
-			<KEYWORD3>floating-point-inexact</KEYWORD3>
-			<KEYWORD3>floating-point-invalid-operation</KEYWORD3>
-			<KEYWORD3>floating-point-overflow</KEYWORD3>
-			<KEYWORD3>floating-point-underflow</KEYWORD3>
-			<KEYWORD3>floatp</KEYWORD3>
-			<KEYWORD3>floor</KEYWORD3>
-			<KEYWORD3>fmakunbound</KEYWORD3>
-			<KEYWORD3>force-output</KEYWORD3>
-			<KEYWORD3>format</KEYWORD3>
-			<KEYWORD3>formatter</KEYWORD3>
-			<KEYWORD3>fourth</KEYWORD3>
-			<KEYWORD3>fresh-line</KEYWORD3>
-			<KEYWORD3>fround</KEYWORD3>
-			<KEYWORD3>ftruncate</KEYWORD3>
-			<KEYWORD3>ftype</KEYWORD3>
-			<KEYWORD3>funcall</KEYWORD3>
-			<KEYWORD3>function</KEYWORD3>
-			<KEYWORD3>function-keywords</KEYWORD3>
-			<KEYWORD3>function-lambda-expression</KEYWORD3>
-			<KEYWORD3>functionp</KEYWORD3>
-			<KEYWORD3>gcd</KEYWORD3>
-			<KEYWORD3>generic-function</KEYWORD3>
-			<KEYWORD3>gensym</KEYWORD3>
-			<KEYWORD3>gentemp</KEYWORD3>
-			<KEYWORD3>get</KEYWORD3>
-			<KEYWORD3>get-decoded-time</KEYWORD3>
-			<KEYWORD3>get-dispatch-macro-character</KEYWORD3>
-			<KEYWORD3>get-internal-real-time</KEYWORD3>
-			<KEYWORD3>get-internal-run-time</KEYWORD3>
-			<KEYWORD3>get-macro-character</KEYWORD3>
-			<KEYWORD3>get-output-stream-string</KEYWORD3>
-			<KEYWORD3>get-properties</KEYWORD3>
-			<KEYWORD3>get-setf-expansion</KEYWORD3>
-			<KEYWORD3>get-universal-time</KEYWORD3>
-			<KEYWORD3>getf</KEYWORD3>
-			<KEYWORD3>gethash</KEYWORD3>
-			<KEYWORD3>go</KEYWORD3>
-			<KEYWORD3>graphic-char-p</KEYWORD3>
-			<KEYWORD3>hash-table</KEYWORD3>
-			<KEYWORD3>hash-table-count</KEYWORD3>
-			<KEYWORD3>hash-table-p</KEYWORD3>
-			<KEYWORD3>hash-table-rehash-size</KEYWORD3>
-			<KEYWORD3>hash-table-rehash-threshold</KEYWORD3>
-			<KEYWORD3>hash-table-size</KEYWORD3>
-			<KEYWORD3>hash-table-test</KEYWORD3>
-			<KEYWORD3>host-namestring</KEYWORD3>
-			<KEYWORD3>identity</KEYWORD3>
-			<KEYWORD3>ignorable</KEYWORD3>
-			<KEYWORD3>ignore</KEYWORD3>
-			<KEYWORD3>imagpart</KEYWORD3>
-			<KEYWORD3>import</KEYWORD3>
-			<KEYWORD3>incf</KEYWORD3>
-			<KEYWORD3>initialize-instance</KEYWORD3>
-			<KEYWORD3>inline</KEYWORD3>
-			<KEYWORD3>input-stream-p</KEYWORD3>
-			<KEYWORD3>inspect</KEYWORD3>
-			<KEYWORD3>integer</KEYWORD3>
-			<KEYWORD3>integer-decode-float</KEYWORD3>
-			<KEYWORD3>integer-length</KEYWORD3>
-			<KEYWORD3>integerp</KEYWORD3>
-			<KEYWORD3>interactive-stream-p</KEYWORD3>
-			<KEYWORD3>intern</KEYWORD3>
-			<KEYWORD3>internal-time-units-per-second</KEYWORD3>
-			<KEYWORD3>intersection</KEYWORD3>
-			<KEYWORD3>invalid-method-error</KEYWORD3>
-			<KEYWORD3>invoke-debugger</KEYWORD3>
-			<KEYWORD3>invoke-restart</KEYWORD3>
-			<KEYWORD3>invoke-restart-interactively</KEYWORD3>
-			<KEYWORD3>isqrt</KEYWORD3>
-			<KEYWORD3>keyword</KEYWORD3>
-			<KEYWORD3>keywordp</KEYWORD3>
-			<KEYWORD3>lambda-list-keywords</KEYWORD3>
-			<KEYWORD3>lambda-parameters-limit</KEYWORD3>
-			<KEYWORD3>last</KEYWORD3>
-			<KEYWORD3>lcm</KEYWORD3>
-			<KEYWORD3>ldb</KEYWORD3>
-			<KEYWORD3>ldb-test</KEYWORD3>
-			<KEYWORD3>ldiff</KEYWORD3>
-			<KEYWORD3>least-negative-double-float</KEYWORD3>
-			<KEYWORD3>least-negative-long-float</KEYWORD3>
-			<KEYWORD3>least-negative-normalized-double-float</KEYWORD3>
-			<KEYWORD3>least-negative-normalized-long-float</KEYWORD3>
-			<KEYWORD3>least-negative-normalized-short-float</KEYWORD3>
-			<KEYWORD3>least-negative-normalized-single-float</KEYWORD3>
-			<KEYWORD3>least-negative-short-float</KEYWORD3>
-			<KEYWORD3>least-negative-single-float</KEYWORD3>
-			<KEYWORD3>least-positive-double-float</KEYWORD3>
-			<KEYWORD3>least-positive-long-float</KEYWORD3>
-			<KEYWORD3>least-positive-normalized-double-float</KEYWORD3>
-			<KEYWORD3>least-positive-normalized-long-float</KEYWORD3>
-			<KEYWORD3>least-positive-normalized-short-float</KEYWORD3>
-			<KEYWORD3>least-positive-normalized-single-float</KEYWORD3>
-			<KEYWORD3>least-positive-short-float</KEYWORD3>
-			<KEYWORD3>least-positive-single-float</KEYWORD3>
-			<KEYWORD3>length</KEYWORD3>
-			<KEYWORD3>lisp-implementation-type</KEYWORD3>
-			<KEYWORD3>lisp-implementation-version</KEYWORD3>
-			<KEYWORD3>list</KEYWORD3>
-			<KEYWORD3>list*</KEYWORD3>
-			<KEYWORD3>list-all-packages</KEYWORD3>
-			<KEYWORD3>list-length</KEYWORD3>
-			<KEYWORD3>listen</KEYWORD3>
-			<KEYWORD3>listp</KEYWORD3>
-			<KEYWORD3>load</KEYWORD3>
-			<KEYWORD3>load-logical-pathname-translations</KEYWORD3>
-			<KEYWORD3>load-time-value</KEYWORD3>
-			<KEYWORD3>log</KEYWORD3>
-			<KEYWORD3>logand</KEYWORD3>
-			<KEYWORD3>logandc1</KEYWORD3>
-			<KEYWORD3>logandc2</KEYWORD3>
-			<KEYWORD3>logbitp</KEYWORD3>
-			<KEYWORD3>logcount</KEYWORD3>
-			<KEYWORD3>logeqv</KEYWORD3>
-			<KEYWORD3>logical-pathname</KEYWORD3>
-			<KEYWORD3>logical-pathname-translations</KEYWORD3>
-			<KEYWORD3>logior</KEYWORD3>
-			<KEYWORD3>lognand</KEYWORD3>
-			<KEYWORD3>lognor</KEYWORD3>
-			<KEYWORD3>lognot</KEYWORD3>
-			<KEYWORD3>logorc1</KEYWORD3>
-			<KEYWORD3>logorc2</KEYWORD3>
-			<KEYWORD3>logtest</KEYWORD3>
-			<KEYWORD3>logxor</KEYWORD3>
-			<KEYWORD3>long-float</KEYWORD3>
-			<KEYWORD3>long-float-epsilon</KEYWORD3>
-			<KEYWORD3>long-float-negative-epsilon</KEYWORD3>
-			<KEYWORD3>long-site-name</KEYWORD3>
-			<KEYWORD3>loop-finish</KEYWORD3>
-			<KEYWORD3>lower-case-p</KEYWORD3>
-			<KEYWORD3>machine-instance</KEYWORD3>
-			<KEYWORD3>machine-type</KEYWORD3>
-			<KEYWORD3>machine-version</KEYWORD3>
-			<KEYWORD3>macro-function</KEYWORD3>
-			<KEYWORD3>macroexpand</KEYWORD3>
-			<KEYWORD3>macroexpand-1</KEYWORD3>
-			<KEYWORD3>make-array</KEYWORD3>
-			<KEYWORD3>make-broadcast-stream</KEYWORD3>
-			<KEYWORD3>make-concatenated-stream</KEYWORD3>
-			<KEYWORD3>make-condition</KEYWORD3>
-			<KEYWORD3>make-dispatch-macro-character</KEYWORD3>
-			<KEYWORD3>make-echo-stream</KEYWORD3>
-			<KEYWORD3>make-hash-table</KEYWORD3>
-			<KEYWORD3>make-instance</KEYWORD3>
-			<KEYWORD3>make-instances-obsolete</KEYWORD3>
-			<KEYWORD3>make-list</KEYWORD3>
-			<KEYWORD3>make-load-form</KEYWORD3>
-			<KEYWORD3>make-load-form-saving-slots</KEYWORD3>
-			<KEYWORD3>make-method</KEYWORD3>
-			<KEYWORD3>make-package</KEYWORD3>
-			<KEYWORD3>make-pathname</KEYWORD3>
-			<KEYWORD3>make-random-state</KEYWORD3>
-			<KEYWORD3>make-sequence</KEYWORD3>
-			<KEYWORD3>make-string</KEYWORD3>
-			<KEYWORD3>make-string-input-stream</KEYWORD3>
-			<KEYWORD3>make-string-output-stream</KEYWORD3>
-			<KEYWORD3>make-symbol</KEYWORD3>
-			<KEYWORD3>make-synonym-stream</KEYWORD3>
-			<KEYWORD3>make-two-way-stream</KEYWORD3>
-			<KEYWORD3>makunbound</KEYWORD3>
-			<KEYWORD3>map</KEYWORD3>
-			<KEYWORD3>map-into</KEYWORD3>
-			<KEYWORD3>mapc</KEYWORD3>
-			<KEYWORD3>mapcan</KEYWORD3>
-			<KEYWORD3>mapcar</KEYWORD3>
-			<KEYWORD3>mapcon</KEYWORD3>
-			<KEYWORD3>maphash</KEYWORD3>
-			<KEYWORD3>mapl</KEYWORD3>
-			<KEYWORD3>maplist</KEYWORD3>
-			<KEYWORD3>mask-field</KEYWORD3>
-			<KEYWORD3>max</KEYWORD3>
-			<KEYWORD3>member</KEYWORD3>
-			<KEYWORD3>member-if</KEYWORD3>
-			<KEYWORD3>member-if-not</KEYWORD3>
-			<KEYWORD3>merge</KEYWORD3>
-			<KEYWORD3>merge-pathnames</KEYWORD3>
-			<KEYWORD3>method</KEYWORD3>
-			<KEYWORD3>method-combination</KEYWORD3>
-			<KEYWORD3>method-combination-error</KEYWORD3>
-			<KEYWORD3>method-qualifiers</KEYWORD3>
-			<KEYWORD3>min</KEYWORD3>
-			<KEYWORD3>minusp</KEYWORD3>
-			<KEYWORD3>mismatch</KEYWORD3>
-			<KEYWORD3>mod</KEYWORD3>
-			<KEYWORD3>most-negative-double-float</KEYWORD3>
-			<KEYWORD3>most-negative-fixnum</KEYWORD3>
-			<KEYWORD3>most-negative-long-float</KEYWORD3>
-			<KEYWORD3>most-negative-short-float</KEYWORD3>
-			<KEYWORD3>most-negative-single-float</KEYWORD3>
-			<KEYWORD3>most-positive-double-float</KEYWORD3>
-			<KEYWORD3>most-positive-fixnum</KEYWORD3>
-			<KEYWORD3>most-positive-long-float</KEYWORD3>
-			<KEYWORD3>most-positive-short-float</KEYWORD3>
-			<KEYWORD3>most-positive-single-float</KEYWORD3>
-			<KEYWORD3>muffle-warning</KEYWORD3>
-			<KEYWORD3>multiple-value-call</KEYWORD3>
-			<KEYWORD3>multiple-value-list</KEYWORD3>
-			<KEYWORD3>multiple-value-prog1</KEYWORD3>
-			<KEYWORD3>multiple-value-setq</KEYWORD3>
-			<KEYWORD3>multiple-values-limit</KEYWORD3>
-			<KEYWORD3>name-char</KEYWORD3>
-			<KEYWORD3>namestring</KEYWORD3>
-			<KEYWORD3>nbutlast</KEYWORD3>
-			<KEYWORD3>nconc</KEYWORD3>
-			<KEYWORD3>next-method-p</KEYWORD3>
-			<KEYWORD3>nintersection</KEYWORD3>
-			<KEYWORD3>ninth</KEYWORD3>
-			<KEYWORD3>no-applicable-method</KEYWORD3>
-			<KEYWORD3>no-next-method</KEYWORD3>
-			<KEYWORD3>not</KEYWORD3>
-			<KEYWORD3>notany</KEYWORD3>
-			<KEYWORD3>notevery</KEYWORD3>
-			<KEYWORD3>notinline</KEYWORD3>
-			<KEYWORD3>nreconc</KEYWORD3>
-			<KEYWORD3>nreverse</KEYWORD3>
-			<KEYWORD3>nset-difference</KEYWORD3>
-			<KEYWORD3>nset-exclusive-or</KEYWORD3>
-			<KEYWORD3>nstring-capitalize</KEYWORD3>
-			<KEYWORD3>nstring-downcase</KEYWORD3>
-			<KEYWORD3>nstring-upcase</KEYWORD3>
-			<KEYWORD3>nsublis</KEYWORD3>
-			<KEYWORD3>nsubst</KEYWORD3>
-			<KEYWORD3>nsubst-if</KEYWORD3>
-			<KEYWORD3>nsubst-if-not</KEYWORD3>
-			<KEYWORD3>nsubstitute</KEYWORD3>
-			<KEYWORD3>nsubstitute-if</KEYWORD3>
-			<KEYWORD3>nsubstitute-if-not</KEYWORD3>
-			<KEYWORD3>nth</KEYWORD3>
-			<KEYWORD3>nth-value</KEYWORD3>
-			<KEYWORD3>nthcdr</KEYWORD3>
-			<KEYWORD3>null</KEYWORD3>
-			<KEYWORD3>number</KEYWORD3>
-			<KEYWORD3>numberp</KEYWORD3>
-			<KEYWORD3>numerator</KEYWORD3>
-			<KEYWORD3>nunion</KEYWORD3>
-			<KEYWORD3>oddp</KEYWORD3>
-			<KEYWORD3>open</KEYWORD3>
-			<KEYWORD3>open-stream-p</KEYWORD3>
-			<KEYWORD3>optimize</KEYWORD3>
-			<KEYWORD3>or</KEYWORD3>
-			<KEYWORD3>otherwise</KEYWORD3>
-			<KEYWORD3>output-stream-p</KEYWORD3>
-			<KEYWORD3>package</KEYWORD3>
-			<KEYWORD3>package-error</KEYWORD3>
-			<KEYWORD3>package-error-package</KEYWORD3>
-			<KEYWORD3>package-name</KEYWORD3>
-			<KEYWORD3>package-nicknames</KEYWORD3>
-			<KEYWORD3>package-shadowing-symbols</KEYWORD3>
-			<KEYWORD3>package-use-list</KEYWORD3>
-			<KEYWORD3>package-used-by-list</KEYWORD3>
-			<KEYWORD3>packagep</KEYWORD3>
-			<KEYWORD3>pairlis</KEYWORD3>
-			<KEYWORD3>parse-error</KEYWORD3>
-			<KEYWORD3>parse-integer</KEYWORD3>
-			<KEYWORD3>parse-namestring</KEYWORD3>
-			<KEYWORD3>pathname</KEYWORD3>
-			<KEYWORD3>pathname-device</KEYWORD3>
-			<KEYWORD3>pathname-directory</KEYWORD3>
-			<KEYWORD3>pathname-host</KEYWORD3>
-			<KEYWORD3>pathname-match-p</KEYWORD3>
-			<KEYWORD3>pathname-name</KEYWORD3>
-			<KEYWORD3>pathname-type</KEYWORD3>
-			<KEYWORD3>pathname-version</KEYWORD3>
-			<KEYWORD3>pathnamep</KEYWORD3>
-			<KEYWORD3>peek-char</KEYWORD3>
-			<KEYWORD3>phase</KEYWORD3>
-			<KEYWORD3>pi</KEYWORD3>
-			<KEYWORD3>plusp</KEYWORD3>
-			<KEYWORD3>pop</KEYWORD3>
-			<KEYWORD3>position</KEYWORD3>
-			<KEYWORD3>position-if</KEYWORD3>
-			<KEYWORD3>position-if-not</KEYWORD3>
-			<KEYWORD3>pprint</KEYWORD3>
-			<KEYWORD3>pprint-dispatch</KEYWORD3>
-			<KEYWORD3>pprint-exit-if-list-exhausted</KEYWORD3>
-			<KEYWORD3>pprint-fill</KEYWORD3>
-			<KEYWORD3>pprint-indent</KEYWORD3>
-			<KEYWORD3>pprint-linear</KEYWORD3>
-			<KEYWORD3>pprint-logical-block</KEYWORD3>
-			<KEYWORD3>pprint-newline</KEYWORD3>
-			<KEYWORD3>pprint-pop</KEYWORD3>
-			<KEYWORD3>pprint-tab</KEYWORD3>
-			<KEYWORD3>pprint-tabular</KEYWORD3>
-			<KEYWORD3>prin1</KEYWORD3>
-			<KEYWORD3>prin1-to-string</KEYWORD3>
-			<KEYWORD3>princ</KEYWORD3>
-			<KEYWORD3>princ-to-string</KEYWORD3>
-			<KEYWORD3>print</KEYWORD3>
-			<KEYWORD3>print-not-readable</KEYWORD3>
-			<KEYWORD3>print-not-readable-object</KEYWORD3>
-			<KEYWORD3>print-object</KEYWORD3>
-			<KEYWORD3>print-unreadable-object</KEYWORD3>
-			<KEYWORD3>probe-file</KEYWORD3>
-			<KEYWORD3>program-error</KEYWORD3>
-			<KEYWORD3>psetf</KEYWORD3>
-			<KEYWORD3>psetq</KEYWORD3>
-			<KEYWORD3>push</KEYWORD3>
-			<KEYWORD3>pushnew</KEYWORD3>
-			<KEYWORD3>quote</KEYWORD3>
-			<KEYWORD3>random</KEYWORD3>
-			<KEYWORD3>random-state</KEYWORD3>
-			<KEYWORD3>random-state-p</KEYWORD3>
-			<KEYWORD3>rassoc</KEYWORD3>
-			<KEYWORD3>rassoc-if</KEYWORD3>
-			<KEYWORD3>rassoc-if-not</KEYWORD3>
-			<KEYWORD3>ratio</KEYWORD3>
-			<KEYWORD3>rational</KEYWORD3>
-			<KEYWORD3>rationalize</KEYWORD3>
-			<KEYWORD3>rationalp</KEYWORD3>
-			<KEYWORD3>read</KEYWORD3>
-			<KEYWORD3>read-byte</KEYWORD3>
-			<KEYWORD3>read-char</KEYWORD3>
-			<KEYWORD3>read-char-no-hang</KEYWORD3>
-			<KEYWORD3>read-delimited-list</KEYWORD3>
-			<KEYWORD3>read-from-string</KEYWORD3>
-			<KEYWORD3>read-line</KEYWORD3>
-			<KEYWORD3>read-preserving-whitespace</KEYWORD3>
-			<KEYWORD3>read-sequence</KEYWORD3>
-			<KEYWORD3>reader-error</KEYWORD3>
-			<KEYWORD3>readtable</KEYWORD3>
-			<KEYWORD3>readtable-case</KEYWORD3>
-			<KEYWORD3>readtablep</KEYWORD3>
-			<KEYWORD3>real</KEYWORD3>
-			<KEYWORD3>realp</KEYWORD3>
-			<KEYWORD3>realpart</KEYWORD3>
-			<KEYWORD3>reduce</KEYWORD3>
-			<KEYWORD3>reinitialize-instance</KEYWORD3>
-			<KEYWORD3>rem</KEYWORD3>
-			<KEYWORD3>remf</KEYWORD3>
-			<KEYWORD3>remhash</KEYWORD3>
-			<KEYWORD3>remove</KEYWORD3>
-			<KEYWORD3>remove-duplicates</KEYWORD3>
-			<KEYWORD3>remove-if</KEYWORD3>
-			<KEYWORD3>remove-if-not</KEYWORD3>
-			<KEYWORD3>remove-method</KEYWORD3>
-			<KEYWORD3>remprop</KEYWORD3>
-			<KEYWORD3>rename-file</KEYWORD3>
-			<KEYWORD3>rename-package</KEYWORD3>
-			<KEYWORD3>replace</KEYWORD3>
-			<KEYWORD3>rest</KEYWORD3>
-			<KEYWORD3>restart</KEYWORD3>
-			<KEYWORD3>revappend</KEYWORD3>
-			<KEYWORD3>reverse</KEYWORD3>
-			<KEYWORD3>room</KEYWORD3>
-			<KEYWORD3>rotatef</KEYWORD3>
-			<KEYWORD3>round</KEYWORD3>
-			<KEYWORD3>row-major-aref</KEYWORD3>
-			<KEYWORD3>rplaca</KEYWORD3>
-			<KEYWORD3>rplacd</KEYWORD3>
-			<KEYWORD3>safety</KEYWORD3>
-			<KEYWORD3>satisfies</KEYWORD3>
-			<KEYWORD3>sbit</KEYWORD3>
-			<KEYWORD3>scale-float</KEYWORD3>
-			<KEYWORD3>schar</KEYWORD3>
-			<KEYWORD3>search</KEYWORD3>
-			<KEYWORD3>second</KEYWORD3>
-			<KEYWORD3>sequence</KEYWORD3>
-			<KEYWORD3>serious-condition</KEYWORD3>
-			<KEYWORD3>set</KEYWORD3>
-			<KEYWORD3>set-difference</KEYWORD3>
-			<KEYWORD3>set-dispatch-macro-character</KEYWORD3>
-			<KEYWORD3>set-exclusive-or</KEYWORD3>
-			<KEYWORD3>set-macro-character</KEYWORD3>
-			<KEYWORD3>set-pprint-dispatch</KEYWORD3>
-			<KEYWORD3>set-syntax-from-char</KEYWORD3>
-			<KEYWORD3>setf</KEYWORD3>
-			<KEYWORD3>setq</KEYWORD3>
-			<KEYWORD3>seventh</KEYWORD3>
-			<KEYWORD3>shadow</KEYWORD3>
-			<KEYWORD3>shadowing-import</KEYWORD3>
-			<KEYWORD3>shared-initialize</KEYWORD3>
-			<KEYWORD3>shiftf</KEYWORD3>
-			<KEYWORD3>short-float</KEYWORD3>
-			<KEYWORD3>short-float-epsilon</KEYWORD3>
-			<KEYWORD3>short-float-negative-epsilon</KEYWORD3>
-			<KEYWORD3>short-site-name</KEYWORD3>
-			<KEYWORD3>signed-byte</KEYWORD3>
-			<KEYWORD3>signum</KEYWORD3>
-			<KEYWORD3>simple-array</KEYWORD3>
-			<KEYWORD3>simple-base-string</KEYWORD3>
-			<KEYWORD3>simple-bit-vector</KEYWORD3>
-			<KEYWORD3>simple-bit-vector-p</KEYWORD3>
-			<KEYWORD3>simple-condition</KEYWORD3>
-			<KEYWORD3>simple-condition-format-arguments</KEYWORD3>
-			<KEYWORD3>simple-condition-format-control</KEYWORD3>
-			<KEYWORD3>simple-error</KEYWORD3>
-			<KEYWORD3>simple-string</KEYWORD3>
-			<KEYWORD3>simple-string-p</KEYWORD3>
-			<KEYWORD3>simple-type-error</KEYWORD3>
-			<KEYWORD3>simple-vector</KEYWORD3>
-			<KEYWORD3>simple-vector-p</KEYWORD3>
-			<KEYWORD3>simple-warning</KEYWORD3>
-			<KEYWORD3>sin</KEYWORD3>
-			<KEYWORD3>single-float</KEYWORD3>
-			<KEYWORD3>single-float-epsilon</KEYWORD3>
-			<KEYWORD3>single-float-negative-epsilon</KEYWORD3>
-			<KEYWORD3>sinh</KEYWORD3>
-			<KEYWORD3>sixth</KEYWORD3>
-			<KEYWORD3>sleep</KEYWORD3>
-			<KEYWORD3>slot-boundp</KEYWORD3>
-			<KEYWORD3>slot-exists-p</KEYWORD3>
-			<KEYWORD3>slot-makunbound</KEYWORD3>
-			<KEYWORD3>slot-missing</KEYWORD3>
-			<KEYWORD3>slot-unbound</KEYWORD3>
-			<KEYWORD3>slot-value</KEYWORD3>
-			<KEYWORD3>software-type</KEYWORD3>
-			<KEYWORD3>software-version</KEYWORD3>
-			<KEYWORD3>some</KEYWORD3>
-			<KEYWORD3>sort</KEYWORD3>
-			<KEYWORD3>space</KEYWORD3>
-			<KEYWORD3>special</KEYWORD3>
-			<KEYWORD3>special-operator-p</KEYWORD3>
-			<KEYWORD3>speed</KEYWORD3>
-			<KEYWORD3>sqrt</KEYWORD3>
-			<KEYWORD3>stable-sort</KEYWORD3>
-			<KEYWORD3>standard</KEYWORD3>
-			<KEYWORD3>standard-char</KEYWORD3>
-			<KEYWORD3>standard-char-p</KEYWORD3>
-			<KEYWORD3>standard-class</KEYWORD3>
-			<KEYWORD3>standard-generic-function</KEYWORD3>
-			<KEYWORD3>standard-method</KEYWORD3>
-			<KEYWORD3>standard-object</KEYWORD3>
-			<KEYWORD3>step</KEYWORD3>
-			<KEYWORD3>storage-condition</KEYWORD3>
-			<KEYWORD3>store-value</KEYWORD3>
-			<KEYWORD3>stream</KEYWORD3>
-			<KEYWORD3>stream-element-type</KEYWORD3>
-			<KEYWORD3>stream-error</KEYWORD3>
-			<KEYWORD3>stream-error-stream</KEYWORD3>
-			<KEYWORD3>stream-external-format</KEYWORD3>
-			<KEYWORD3>streamp</KEYWORD3>
-			<KEYWORD3>string</KEYWORD3>
-			<KEYWORD3>string-capitalize</KEYWORD3>
-			<KEYWORD3>string-downcase</KEYWORD3>
-			<KEYWORD3>string-equal</KEYWORD3>
-			<KEYWORD3>string-greaterp</KEYWORD3>
-			<KEYWORD3>string-left-trim</KEYWORD3>
-			<KEYWORD3>string-lessp</KEYWORD3>
-			<KEYWORD3>string-not-equal</KEYWORD3>
-			<KEYWORD3>string-not-greaterp</KEYWORD3>
-			<KEYWORD3>string-not-lessp</KEYWORD3>
-			<KEYWORD3>string-right-trim</KEYWORD3>
-			<KEYWORD3>string-stream</KEYWORD3>
-			<KEYWORD3>string-trim</KEYWORD3>
-			<KEYWORD3>string-upcase</KEYWORD3>
-			<KEYWORD3>string/=</KEYWORD3>
-			<KEYWORD3>string&lt;</KEYWORD3>
-			<KEYWORD3>string&lt;=</KEYWORD3>
-			<KEYWORD3>string=</KEYWORD3>
-			<KEYWORD3>string&gt;</KEYWORD3>
-			<KEYWORD3>string&gt;=</KEYWORD3>
-			<KEYWORD3>stringp</KEYWORD3>
-			<KEYWORD3>structure</KEYWORD3>
-			<KEYWORD3>structure-class</KEYWORD3>
-			<KEYWORD3>structure-object</KEYWORD3>
-			<KEYWORD3>style-warning</KEYWORD3>
-			<KEYWORD3>sublis</KEYWORD3>
-			<KEYWORD3>subseq</KEYWORD3>
-			<KEYWORD3>subsetp</KEYWORD3>
-			<KEYWORD3>subst</KEYWORD3>
-			<KEYWORD3>subst-if</KEYWORD3>
-			<KEYWORD3>subst-if-not</KEYWORD3>
-			<KEYWORD3>substitute</KEYWORD3>
-			<KEYWORD3>substitute-if</KEYWORD3>
-			<KEYWORD3>substitute-if-not</KEYWORD3>
-			<KEYWORD3>subtypep</KEYWORD3>
-			<KEYWORD3>svref</KEYWORD3>
-			<KEYWORD3>sxhash</KEYWORD3>
-			<KEYWORD3>symbol</KEYWORD3>
-			<KEYWORD3>symbol-function</KEYWORD3>
-			<KEYWORD3>symbol-name</KEYWORD3>
-			<KEYWORD3>symbol-package</KEYWORD3>
-			<KEYWORD3>symbol-plist</KEYWORD3>
-			<KEYWORD3>symbol-value</KEYWORD3>
-			<KEYWORD3>symbolp</KEYWORD3>
-			<KEYWORD3>synonym-stream</KEYWORD3>
-			<KEYWORD3>synonym-stream-symbol</KEYWORD3>
-			<KEYWORD3>tailp</KEYWORD3>
-			<KEYWORD3>tan</KEYWORD3>
-			<KEYWORD3>tanh</KEYWORD3>
-			<KEYWORD3>tenth</KEYWORD3>
-			<KEYWORD3>terpri</KEYWORD3>
-			<KEYWORD3>third</KEYWORD3>
-			<KEYWORD3>time</KEYWORD3>
-			<KEYWORD3>trace</KEYWORD3>
-			<KEYWORD3>translate-logical-pathname</KEYWORD3>
-			<KEYWORD3>translate-pathname</KEYWORD3>
-			<KEYWORD3>tree-equal</KEYWORD3>
-			<KEYWORD3>truename</KEYWORD3>
-			<KEYWORD3>truncate</KEYWORD3>
-			<KEYWORD3>two-way-stream</KEYWORD3>
-			<KEYWORD3>two-way-stream-input-stream</KEYWORD3>
-			<KEYWORD3>two-way-stream-output-stream</KEYWORD3>
-			<KEYWORD3>type-error-datum</KEYWORD3>
-			<KEYWORD3>type-error-expected-type</KEYWORD3>
-			<KEYWORD3>type-error</KEYWORD3>
-			<KEYWORD3>type-of</KEYWORD3>
-			<KEYWORD3>typep</KEYWORD3>
-			<KEYWORD3>type</KEYWORD3>
-			<KEYWORD3>unbound-slot-instance</KEYWORD3>
-			<KEYWORD3>unbound-slot</KEYWORD3>
-			<KEYWORD3>unbound-variable</KEYWORD3>
-			<KEYWORD3>undefined-function</KEYWORD3>
-			<KEYWORD3>unexport</KEYWORD3>
-			<KEYWORD3>unintern</KEYWORD3>
-			<KEYWORD3>union</KEYWORD3>
-			<KEYWORD3>unread-char</KEYWORD3>
-			<KEYWORD3>unsigned-byte</KEYWORD3>
-			<KEYWORD3>untrace</KEYWORD3>
-			<KEYWORD3>unuse-package</KEYWORD3>
-			<KEYWORD3>update-instance-for-different-class</KEYWORD3>
-			<KEYWORD3>update-instance-for-redefined-class</KEYWORD3>
-			<KEYWORD3>upgraded-array-element-type</KEYWORD3>
-			<KEYWORD3>upgraded-complex-part-type</KEYWORD3>
-			<KEYWORD3>upper-case-p</KEYWORD3>
-			<KEYWORD3>use-package</KEYWORD3>
-			<KEYWORD3>use-value</KEYWORD3>
-			<KEYWORD3>user-homedir-pathname</KEYWORD3>
-			<KEYWORD3>values</KEYWORD3>
-			<KEYWORD3>values-list</KEYWORD3>
-			<KEYWORD3>variable</KEYWORD3>
-			<KEYWORD3>vector</KEYWORD3>
-			<KEYWORD3>vector-pop</KEYWORD3>
-			<KEYWORD3>vector-push</KEYWORD3>
-			<KEYWORD3>vector-push-extend</KEYWORD3>
-			<KEYWORD3>vectorp</KEYWORD3>
-			<KEYWORD3>warn</KEYWORD3>
-			<KEYWORD3>warning</KEYWORD3>
-			<KEYWORD3>wild-pathname-p</KEYWORD3>
-			<KEYWORD3>write</KEYWORD3>
-			<KEYWORD3>write-byte</KEYWORD3>
-			<KEYWORD3>write-char</KEYWORD3>
-			<KEYWORD3>write-line</KEYWORD3>
-			<KEYWORD3>write-sequence</KEYWORD3>
-			<KEYWORD3>write-string</KEYWORD3>
-			<KEYWORD3>write-to-string</KEYWORD3>
-			<KEYWORD3>y-or-n-p</KEYWORD3>
-			<KEYWORD3>yes-or-no-p</KEYWORD3>
-			<KEYWORD3>zerop</KEYWORD3>
-
-			<LITERAL2>t</LITERAL2>
-			<LITERAL2>nil</LITERAL2>
-		</KEYWORDS>
-
-	</RULES>
-</MODE>
-
diff --git a/qpython/src/main/assets/syntax/literate_haskell.xml b/qpython/src/main/assets/syntax/literate_haskell.xml
deleted file mode 100644
index 2aa0b1e1..00000000
--- a/qpython/src/main/assets/syntax/literate_haskell.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!--
-	Literate Haskell mode by Cameron Morrison (c.morrison@iinet.net.au)
-	Modified version of the Haskell mode by Kristian Ovaska (kristian.ovaska@helsinki.fi)
-	Based on Haskell 98
--->
-
-<MODE>
-
-	<PROPS>
-		<PROPERTY NAME="commentStart" VALUE="{-" />
-		<PROPERTY NAME="commentEnd" VALUE="-}" />
-		<PROPERTY NAME="lineComment" VALUE="--" />
-		<!-- apparently, this is required... -->
-		<PROPERTY NAME="tabSize" VALUE="8" />
-		<PROPERTY NAME="indentSize" VALUE="8" />
-	</PROPS>
-
-	<RULES IGNORE_CASE="FALSE" DEFAULT="COMMENT4">
-		<EOL_SPAN AT_WHITESPACE_END="TRUE" TYPE="FUNCTION" DELEGATE="haskell::MAIN">&gt;</EOL_SPAN>
-		<!-- for LaTeX-style -->
-		<EOL_SPAN AT_LINE_START="TRUE" TYPE="COMMENT3">%</EOL_SPAN>
-		<SPAN TYPE="LITERAL3" DELEGATE="haskell::MAIN">
-			<BEGIN>\begin{code}</BEGIN>
-			<END>\end{code}</END>
-		</SPAN>
-		<!--
-		<EOL_SPAN_REGEXP HASH_CHAR="\" AT_LINE_START="TRUE"
-			DELEGATE="latex::MAIN" TYPE="KEYWORD1"
-		>\\\w+</EOL_SPAN_REGEXP>
-		-->
-    </RULES>
-
-</MODE>
diff --git a/qpython/src/main/assets/syntax/logs.xml b/qpython/src/main/assets/syntax/logs.xml
deleted file mode 100644
index 76701e8c..00000000
--- a/qpython/src/main/assets/syntax/logs.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="contextInsensitive" VALUE="true" />
-	</PROPS>
-	<RULES IGNORE_CASE="TRUE" HIGHLIGHT_DIGITS="TRUE" DIGIT_RE="\d+">
-	
-		<SPAN TYPE="LITERAL1" NO_LINE_BREAK="TRUE" ESCAPE="\">
-		    <BEGIN>"</BEGIN>
-		    <END>"</END>
-		</SPAN>
-		<SPAN TYPE="LITERAL2" NO_LINE_BREAK="TRUE" ESCAPE="\">
-		    <BEGIN>'</BEGIN>
-		    <END>'</END>
-		</SPAN>
-		<SPAN TYPE="LITERAL3" NO_LINE_BREAK="TRUE" ESCAPE="\">
-		    <BEGIN>`</BEGIN>
-		    <END>`</END>
-		</SPAN>
-		<SEQ TYPE="OPERATOR">=</SEQ>
-		<SEQ TYPE="OPERATOR">/</SEQ>
-		<SEQ TYPE="OPERATOR">?</SEQ>
-		<SEQ TYPE="OPERATOR">:</SEQ>
-		<SEQ TYPE="OPERATOR">@</SEQ>
-		<SEQ TYPE="OPERATOR">.</SEQ>
-		
-		<KEYWORDS>
-			<!--{{{ Log levels -->
-			<KEYWORD1>DEBUG</KEYWORD1>
-			<KEYWORD1>ERR</KEYWORD1>
-			<KEYWORD1>ERR_</KEYWORD1>
-			<KEYWORD1>ERROR</KEYWORD1>
-			<KEYWORD1>INFO</KEYWORD1>
-			<KEYWORD1>INF</KEYWORD1>
-			<KEYWORD1>INF_</KEYWORD1>
-			<KEYWORD1>MESSAGE</KEYWORD1>
-			<KEYWORD1>NOTE</KEYWORD1>
-			<KEYWORD1>NOTICE</KEYWORD1>
-			<KEYWORD1>WARNING</KEYWORD1>
-			<KEYWORD1>WARN</KEYWORD1>
-			<KEYWORD1>SEVERE</KEYWORD1>
-			<!--}}}-->
-		</KEYWORDS>
-	</RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/logtalk.xml b/qpython/src/main/assets/syntax/logtalk.xml
deleted file mode 100644
index 25b231d3..00000000
--- a/qpython/src/main/assets/syntax/logtalk.xml
+++ /dev/null
@@ -1,397 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!--	jEdit 4.3 Logtalk syntax file
-
-	written by		Paulo Moura
-	version			1.93
-	created on		5 May 2002
-	last revised	23 January 2010
-
-	To install, copy this file to the "modes" subdirectory in jEdit 
-	directory installation.   Next, check the "catalog" file in the 
-	same subdirectory and add (if not present) the following entry:
-	
-	<MODE NAME="logtalk" FILE="logtalk.xml" FILE_NAME_GLOB="*.{lgt}" />
--->
-
-<MODE>
-
-	<PROPS>
-		<PROPERTY NAME="lineComment" VALUE="%" />
-		<PROPERTY NAME="commentStart" VALUE="/*" />
-		<PROPERTY NAME="commentEnd" VALUE="*/" />
-		<PROPERTY NAME="tabSize" VALUE="4" />
-		<PROPERTY NAME="indentSize" VALUE="4" />
-        <!-- Auto indent -->
-        <PROPERTY NAME="indentNextLine" VALUE="((^\s*:-\s(object|protocol|category)\(.*,$)|.*\s:-$)" />
-	</PROPS>
-
-	<RULES SET="MAIN" IGNORE_CASE="FALSE">
-	
-		<!-- Comments -->
-		<EOL_SPAN TYPE="COMMENT1">%</EOL_SPAN>
-		<SPAN TYPE="COMMENT1" NO_LINE_BREAK="FALSE">
-			<BEGIN>/*</BEGIN>
-			<END>*/</END>
-		</SPAN>
-
-		<!-- Entity directives -->
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD1">^\s*:-\s(category|object|protocol)(?=[(])</SEQ_REGEXP>
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD1">^\s*:-\send_(category|object|protocol)(?=[.])</SEQ_REGEXP>
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD1">^\s*:-\smodule(?=[(])</SEQ_REGEXP>
- 		<!-- Predicate scope directives -->
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD1">^\s*:-\sp(ublic|r(otected|ivate))(?=[(])</SEQ_REGEXP>
-		<!-- Conditional compilation directives -->
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD1">^\s*:-\s(el)?if(?=[(])</SEQ_REGEXP>
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD1">^\s*:-\se(lse|ndif)(?=[.])</SEQ_REGEXP>
-		<!-- Other directives -->
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD1">^\s*:-\se(n(coding|sure_loaded)|xport)(?=[(])</SEQ_REGEXP>
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD1">^\s*:-\sin(fo|itialization)(?=[(])</SEQ_REGEXP>
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD1">^\s*:-\s(dynamic|synchronized|threaded)(?=[.])</SEQ_REGEXP>
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD1">^\s*:-\s(alias|d(ynamic|iscontiguous)|m(eta_predicate|ode|ultifile)|s(et_(logtalk|prolog)_flag|ynchronized))(?=[(])</SEQ_REGEXP>
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD1">^\s*:-\sop(?=[(])</SEQ_REGEXP>
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD1">^\s*:-\s(calls|reexport|use(s|_module))(?=[(])</SEQ_REGEXP>
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD1">(complements|extends|i(nstantiates|mp(lements|orts))|specializes)(?=[(])</SEQ_REGEXP>
-
-		<!-- Event handlers -->
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\b(after|before)(?=[(])</SEQ_REGEXP>
-		<!-- Method execution context -->
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\b(parameter|this|se(lf|nder))(?=[(])</SEQ_REGEXP>
-		<!-- Reflection -->
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\b(current_predicate|predicate_property)(?=[(])</SEQ_REGEXP>
-		<!-- DCGs -->
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\b(expand_(goal|term)|(goal|term)_expansion|phrase)(?=[(])</SEQ_REGEXP>
-		<!-- Entity -->
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\b(abolish|c(reate|urrent))_(object|protocol|category)(?=[(])</SEQ_REGEXP>
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\b(object|protocol|category)_property(?=[(])</SEQ_REGEXP>
-		<!-- Entity relations -->
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\bcomplements_object(?=[(])</SEQ_REGEXP>
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\bextends_(object|protocol|category)(?=[(])</SEQ_REGEXP>
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\bimp(lements_protocol|orts_category)(?=[(])</SEQ_REGEXP>
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\b(instantiat|specializ)es_class(?=[(])</SEQ_REGEXP>
-		<!-- Events -->
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\b(current_event|(abolish|define)_events)(?=[(])</SEQ_REGEXP>
-		<!-- Flags -->
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\b(current|set)_logtalk_flag(?=[(])</SEQ_REGEXP>
-		<!-- Compiling, loading, and library paths -->
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\blogtalk_(compile|l(ibrary_path|oad))(?=[(])</SEQ_REGEXP>
-		<!-- Database -->
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\b(clause|retract(all)?)(?=[(])</SEQ_REGEXP>
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\ba(bolish|ssert(a|z))(?=[(])</SEQ_REGEXP>
-		<!-- Control -->
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\b(ca(ll|tch)|throw)(?=[(])</SEQ_REGEXP>
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\b(fail|true)\b</SEQ_REGEXP>
-		<!-- All solutions -->
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\b((bag|set)of|f(ind|or)all)(?=[(])</SEQ_REGEXP>
-		<!-- Multi-threading meta-predicates -->
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\bthreaded(_(call|once|ignore|exit|peek|wait|notify))?(?=[(])</SEQ_REGEXP>
-		<!-- Term unification -->
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\bunify_with_occurs_check(?=[(])</SEQ_REGEXP>
-		<!-- Term creation and decomposition -->
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\b(functor|arg|copy_term)(?=[(])</SEQ_REGEXP>
-		<!-- Evaluable functors -->
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\b(rem|mod|abs|sign)(?=[(])</SEQ_REGEXP>
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\bfloat(_(integer|fractional)_part)?(?=[(])</SEQ_REGEXP>
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\b(floor|truncate|round|ceiling)(?=[(])</SEQ_REGEXP>
-		<!-- Other arithmetic functors -->
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\b(cos|atan|exp|log|s(in|qrt))(?=[(])</SEQ_REGEXP>
-		<!-- Term testing -->
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\b(var|atom(ic)?|integer|float|compound|n(onvar|umber))(?=[(])</SEQ_REGEXP>
-		<!-- Stream selection and control -->
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\b(current|set)_(in|out)put(?=[(])</SEQ_REGEXP>
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\b(open|close)(?=[(])</SEQ_REGEXP>
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\bflush_output(?=[(])</SEQ_REGEXP>
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\b(flush_output|at_end_of_stream)\b</SEQ_REGEXP>
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\b(stream_property|at_end_of_stream|set_stream_position)(?=[(])</SEQ_REGEXP>
-		<!-- Character and byte input/output -->
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\b(nl|(get|peek|put)_(byte|c(har|ode)))(?=[(])</SEQ_REGEXP>
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\bnl\b</SEQ_REGEXP>
-		<!-- Term input/output -->
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\bread(_term)?(?=[(])</SEQ_REGEXP>
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\bwrite(q|_(canonical|term))?(?=[(])</SEQ_REGEXP>
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\b(current_)?op(?=[(])</SEQ_REGEXP>
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\b(current_)?char_conversion(?=[(])</SEQ_REGEXP>
-		<!-- Atomic term processing -->
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\batom_(length|c(hars|o(ncat|des)))(?=[(])</SEQ_REGEXP>
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\b(char_code|sub_atom)(?=[(])</SEQ_REGEXP>
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\bnumber_c(hars|odes)(?=[(])</SEQ_REGEXP>
-		<!-- Implementation defined hooks functions -->
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\b(set|current)_prolog_flag(?=[(])</SEQ_REGEXP>
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\bhalt\b</SEQ_REGEXP>
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\bhalt(?=[(])</SEQ_REGEXP>
-		<!-- Logic and control -->
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\bonce(?=[(])</SEQ_REGEXP>
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\brepeat\b</SEQ_REGEXP>
-
-		<!-- Variables -->
-		<SEQ_REGEXP HASH_CHARS="_ABCDEFGHIJKLMNOPQRSTUVWXYZ" AT_WORD_START="TRUE" TYPE="MARKUP">[_A-Z]+[a-zA-Z0-9]*</SEQ_REGEXP>
-
-		<!-- String literals -->
-		<SPAN TYPE="LITERAL1" NO_LINE_BREAK="TRUE">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-		<SPAN TYPE="LITERAL1" NO_LINE_BREAK="TRUE">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-
-		<!-- External call -->
-		<SPAN TYPE="OPERATOR" DELEGATE="MAIN">
-			<BEGIN>{</BEGIN>
-			<END>}</END>
-		</SPAN>
-
-		<!-- Character code constants -->
-		<SEQ_REGEXP AT_WORD_START="TRUE" HASH_CHAR="0" TYPE="DIGIT">0'.</SEQ_REGEXP>
-		<!-- Binary, octal, and hexadecimal numbers -->
-		<SEQ_REGEXP AT_WORD_START="TRUE" HASH_CHAR="0" TYPE="DIGIT">0b[0-1]+</SEQ_REGEXP>
-		<SEQ_REGEXP AT_WORD_START="TRUE" HASH_CHAR="0" TYPE="DIGIT">0o[0-7]+</SEQ_REGEXP>
-		<SEQ_REGEXP AT_WORD_START="TRUE" HASH_CHAR="0" TYPE="DIGIT">0x\p{XDigit}+</SEQ_REGEXP>
-		<!-- Numbers -->
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="DIGIT">\d+(\.\d+)?([eE]([-+])?\d+)?</SEQ_REGEXP>
-
-		<!-- Logtalk message sending operators -->
-		<SEQ TYPE="OPERATOR">::</SEQ>
-		<SEQ TYPE="OPERATOR">^^</SEQ>
-
-		<!-- Other Logtalk control construct operators -->
-		<SEQ_REGEXP TYPE="OPERATOR">:(?![:-])</SEQ_REGEXP>
-
-		<!-- Control constructs -->
-		<SEQ TYPE="OPERATOR">!</SEQ>
-		<SEQ TYPE="OPERATOR">,</SEQ>
-		<SEQ TYPE="OPERATOR">;</SEQ>
-		<SEQ TYPE="OPERATOR">--&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">-&gt;</SEQ>
-
-		<!-- Term unification -->
-		<SEQ TYPE="OPERATOR">=</SEQ>
-		<SEQ TYPE="OPERATOR">\=</SEQ>
-
-		<!-- Term comparison -->
-		<SEQ TYPE="OPERATOR">@=&lt;</SEQ>
-		<SEQ TYPE="OPERATOR">==</SEQ>
-		<SEQ TYPE="OPERATOR">\==</SEQ>
-		<SEQ TYPE="OPERATOR">@&lt;</SEQ>
-		<SEQ TYPE="OPERATOR">@&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">@&gt;=</SEQ>
-
-		<!-- Term creation and decomposition -->
-		<SEQ TYPE="OPERATOR">=..</SEQ>
-
-		<!-- Arithemtic evaluation -->
-		<SEQ_REGEXP AT_WORD_START="TRUE" TYPE="OPERATOR">\bis\b</SEQ_REGEXP>
-
-		<!-- Arithemtic comparison -->
-		<SEQ TYPE="OPERATOR">=:=</SEQ>
-		<SEQ TYPE="OPERATOR">=\=</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;</SEQ>
-		<SEQ TYPE="OPERATOR">=&lt;</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;=</SEQ>
-
-		<!-- Logic and control -->
-		<SEQ TYPE="OPERATOR">\+</SEQ>
-
-		<!-- Evaluable functors -->
-		<SEQ TYPE="OPERATOR">+</SEQ>
-		<SEQ TYPE="OPERATOR">-</SEQ>
-		<SEQ TYPE="OPERATOR">*</SEQ>
-		<SEQ TYPE="OPERATOR">//</SEQ>
-		<SEQ TYPE="OPERATOR">/</SEQ>
-
-		<!-- Other arithemtic functors -->
-		<SEQ TYPE="OPERATOR">**</SEQ>
-
-		<!-- Bitwise functors -->
-		<SEQ TYPE="OPERATOR">&gt;&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;&lt;</SEQ>
-		<SEQ TYPE="OPERATOR">/\</SEQ>
-		<SEQ TYPE="OPERATOR">\/</SEQ>
-		<SEQ TYPE="OPERATOR">\</SEQ>
-
-		<!-- Clause operators -->
-		<SEQ TYPE="OPERATOR">.</SEQ>
-		<SEQ_REGEXP TYPE="OPERATOR">\s:-($|\s)</SEQ_REGEXP>
-
-		<!-- Mode operators -->
-		<SEQ TYPE="OPERATOR">+</SEQ>	
-		<SEQ TYPE="OPERATOR">-</SEQ>
-		<SEQ TYPE="OPERATOR">?</SEQ>
-		<SEQ TYPE="OPERATOR">@</SEQ>
-
-		<!-- Existential quantifier operator -->
-		<SEQ TYPE="OPERATOR">^</SEQ>	
-
-		<KEYWORDS> <!-- just for code completion to work! -->
-
-			<NULL>abolish</NULL>
-			<NULL>abolish_category</NULL>
-			<NULL>abolish_events</NULL>
-			<NULL>abolish_object</NULL>
-			<NULL>abolish_protocol</NULL>
-			<NULL>after</NULL>
-			<NULL>alias</NULL>
-			<NULL>arg</NULL>
-			<NULL>asserta</NULL>
-			<NULL>assertz</NULL>
-			<NULL>atom</NULL>
-			<NULL>atomic</NULL>
-			<NULL>atom_chars</NULL>
-			<NULL>atom_codes</NULL>
-			<NULL>atom_concat</NULL>
-			<NULL>atom_length</NULL>
-			<NULL>at_end_of_stream</NULL>
-			<NULL>bagof</NULL>
-			<NULL>before</NULL>
-			<NULL>call</NULL>
-			<NULL>calls</NULL>
-			<NULL>catch</NULL>
-			<NULL>category</NULL>
-			<NULL>category_property</NULL>
-			<NULL>char_code</NULL>
-			<NULL>char_conversion</NULL>
-			<NULL>clause</NULL>
-			<NULL>close</NULL>
-			<NULL>complements</NULL>
-			<NULL>complements_object</NULL>
-			<NULL>compound</NULL>
-			<NULL>copy_term</NULL>
-			<NULL>create_category</NULL>
-			<NULL>create_object</NULL>
-			<NULL>create_protocol</NULL>
-			<NULL>current_category</NULL>
-			<NULL>current_char_conversion</NULL>
-			<NULL>current_event</NULL>
-			<NULL>current_input</NULL>
-			<NULL>current_logtalk_flag</NULL>
-			<NULL>current_object</NULL>
-			<NULL>current_op</NULL>
-			<NULL>current_output</NULL>
-			<NULL>current_predicate</NULL>
-			<NULL>current_prolog_flag</NULL>
-			<NULL>current_protocol</NULL>
-			<NULL>define_events</NULL>
-			<NULL>discontiguous</NULL>
-			<NULL>dynamic</NULL>
-			<NULL>encoding</NULL>
-			<NULL>end_category</NULL>
-			<NULL>end_object</NULL>
-			<NULL>end_protocol</NULL>
-			<NULL>expand_term</NULL>
-			<NULL>extends</NULL>
-			<NULL>extends_object</NULL>
-			<NULL>extends_protocol</NULL>
-			<NULL>extends_category</NULL>
-			<NULL>fail</NULL>
-			<NULL>findall</NULL>
-			<NULL>float</NULL>
-			<NULL>flush_output</NULL>
-			<NULL>forall</NULL>
-			<NULL>functor</NULL>
-			<NULL>get_byte</NULL>
-			<NULL>get_char</NULL>
-			<NULL>get_code</NULL>
-			<NULL>halt</NULL>
-			<NULL>implements</NULL>
-			<NULL>implements_protocol</NULL>
-			<NULL>imports</NULL>
-			<NULL>imports_category</NULL>
-			<NULL>info</NULL>
-			<NULL>initialization</NULL>
-			<NULL>instantiates</NULL>
-			<NULL>instantiates_class</NULL>
-			<NULL>integer</NULL>
-			<NULL>logtalk_compile</NULL>
-			<NULL>logtalk_library_path</NULL>
-			<NULL>logtalk_load</NULL>
-			<NULL>meta_predicate</NULL>
-			<NULL>mode</NULL>
-			<NULL>nl</NULL>
-			<NULL>nonvar</NULL>
-			<NULL>number</NULL>
-			<NULL>number_chars</NULL>
-			<NULL>number_codes</NULL>
-			<NULL>object</NULL>
-			<NULL>object_property</NULL>
-			<NULL>once</NULL>
-			<NULL>op</NULL>
-			<NULL>open</NULL>
-			<NULL>parameter</NULL>
-			<NULL>peek_byte</NULL>
-			<NULL>peek_char</NULL>
-			<NULL>peek_code</NULL>
-			<NULL>phrase</NULL>
-			<NULL>predicate_property</NULL>
-			<NULL>private</NULL>
-			<NULL>protected</NULL>
-			<NULL>protocol</NULL>
-			<NULL>protocol_property</NULL>
-			<NULL>public</NULL>
-			<NULL>put_byte</NULL>
-			<NULL>put_char</NULL>
-			<NULL>put_code</NULL>
-			<NULL>read</NULL>
-			<NULL>read_term</NULL>
-			<NULL>repeat</NULL>
-			<NULL>retract</NULL>
-			<NULL>retractall</NULL>
-			<NULL>self</NULL>
-			<NULL>sender</NULL>
-			<NULL>setof</NULL>
-			<NULL>set_input</NULL>
-			<NULL>set_logtalk_flag</NULL>
-			<NULL>set_output</NULL>
-			<NULL>set_prolog_flag</NULL>
-			<NULL>set_stream_position</NULL>
-			<NULL>specializes</NULL>
-			<NULL>specializes_class</NULL>
-			<NULL>stream_property</NULL>
-			<NULL>sub_atom</NULL>
-			<NULL>synchronized</NULL>
-			<NULL>goal_expansion</NULL>
-			<NULL>term_expansion</NULL>
-			<NULL>this</NULL>
-			<NULL>threaded</NULL>
-			<NULL>threaded_call</NULL>
-			<NULL>threaded_once</NULL>
-			<NULL>threaded_ignore</NULL>
-			<NULL>threaded_exit</NULL>
-			<NULL>threaded_peek</NULL>
-			<NULL>threaded_wait</NULL>
-			<NULL>threaded_notify</NULL>
-			<NULL>throw</NULL>
-			<NULL>true</NULL>
-			<NULL>unify_with_occurs_check</NULL>
-			<NULL>uses</NULL>
-			<NULL>var</NULL>
-			<NULL>write</NULL>
-			<NULL>writeq</NULL>
-			<NULL>write_canonical</NULL>
-			<NULL>abs</NULL>
-			<NULL>atan</NULL>
-			<NULL>ceiling</NULL>
-			<NULL>cos</NULL>
-			<NULL>exp</NULL>
-			<NULL>float_fractional_part</NULL>
-			<NULL>float_integer_part</NULL>
-			<NULL>floor</NULL>
-			<NULL>log</NULL>
-			<NULL>mod</NULL>
-			<NULL>rem</NULL>
-			<NULL>round</NULL>
-			<NULL>sign</NULL>
-			<NULL>sin</NULL>
-			<NULL>sqrt</NULL>
-			<NULL>truncate</NULL>
-
-		</KEYWORDS>
-		
-	</RULES>
-
-</MODE>
-
- 	  	 
diff --git a/qpython/src/main/assets/syntax/lotos.xml b/qpython/src/main/assets/syntax/lotos.xml
deleted file mode 100644
index d47cc91c..00000000
--- a/qpython/src/main/assets/syntax/lotos.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!--
-  lotos.xml	K. J. Turner <kjt@cs.stir.ac.uk>	24th April 2003
-
-  LOTOS (Language Of Temporal Ordering Specification) is an ISO standard
-  (8807) for a formal specification language used in communications and system
-  specification generally.
-
-  This mode does not (yet) deal with ISO 15437 (E-LOTOS, Enhanced LOTOS).
-
-  Auto-indentation occurs if the following are at the start of a line
-  (ignoring leading white space): "let", "library", "process", "specification",
-  "type", , ">>". This also happens if the following appear on their own (i.e.
-  also ignoring trailing white space): "(", "[]", "[>", "||" "|||", "|[...]|",
-  "[...]->".
--->
-
-<MODE>
-  <PROPS>
-    <PROPERTY NAME="commentStart" VALUE="(*"/>
-    <PROPERTY NAME="commentEnd" VALUE="*)"/>
-    <PROPERTY NAME="indentNextLines"
-      VALUE="\s*(let|library|process|specification|type|>>).*|\s*(\(|\[\]|\[>|\|\||\|\|\||\|\[.*\]\||\[.*\]\s*->)\s*"/>
-  </PROPS>
-
-  <RULES IGNORE_CASE="TRUE" HIGHLIGHT_DIGITS="FALSE">
-    <!-- Comments -->
-    <SPAN TYPE="COMMENT1">
-      <BEGIN>(*</BEGIN>
-      <END>*)</END>
-    </SPAN>
-
-    <!-- Standard Operators -->
-    <SEQ TYPE="OPERATOR">&gt;&gt;</SEQ>
-    <SEQ TYPE="OPERATOR">[&gt;</SEQ>
-    <SEQ TYPE="OPERATOR">|||</SEQ>
-    <SEQ TYPE="OPERATOR">||</SEQ>
-    <SEQ TYPE="OPERATOR">|[</SEQ>
-    <SEQ TYPE="OPERATOR">]|</SEQ>
-    <SEQ TYPE="OPERATOR">[]</SEQ>
-
-    <KEYWORDS>
-      <!-- Reserved Words -->
-      <KEYWORD1>accept</KEYWORD1>
-      <KEYWORD1>actualizedby</KEYWORD1>
-      <KEYWORD1>any</KEYWORD1>
-      <KEYWORD1>behavior</KEYWORD1>
-      <KEYWORD1>behaviour</KEYWORD1>
-      <KEYWORD1>choice</KEYWORD1>
-      <KEYWORD1>endlib</KEYWORD1>
-      <KEYWORD1>endproc</KEYWORD1>
-      <KEYWORD1>endspec</KEYWORD1>
-      <KEYWORD1>endtype</KEYWORD1>
-      <KEYWORD1>eqns</KEYWORD1>
-      <KEYWORD1>exit</KEYWORD1>
-      <KEYWORD1>for</KEYWORD1>
-      <KEYWORD1>forall</KEYWORD1>
-      <KEYWORD1>formaleqns</KEYWORD1>
-      <KEYWORD1>formalopns</KEYWORD1>
-      <KEYWORD1>formalsorts</KEYWORD1>
-      <KEYWORD1>hide</KEYWORD1>
-      <KEYWORD1>i</KEYWORD1>
-      <KEYWORD1>in</KEYWORD1>
-      <KEYWORD1>is</KEYWORD1>
-      <KEYWORD1>let</KEYWORD1>
-      <KEYWORD1>library</KEYWORD1>
-      <KEYWORD1>noexit</KEYWORD1>
-      <KEYWORD1>of</KEYWORD1>
-      <KEYWORD1>ofsort</KEYWORD1>
-      <KEYWORD1>opnnames</KEYWORD1>
-      <KEYWORD1>opns</KEYWORD1>
-      <KEYWORD1>par</KEYWORD1>
-      <KEYWORD1>process</KEYWORD1>
-      <KEYWORD1>renamedby</KEYWORD1>
-      <KEYWORD1>sortnames</KEYWORD1>
-      <KEYWORD1>sorts</KEYWORD1>
-      <KEYWORD1>specification</KEYWORD1>
-      <KEYWORD1>stop</KEYWORD1>
-      <KEYWORD1>type</KEYWORD1>
-      <KEYWORD1>using</KEYWORD1>
-      <KEYWORD1>where</KEYWORD1>
-
-      <!-- Standard Library Sorts -->
-      <KEYWORD2>Bit</KEYWORD2>
-      <KEYWORD2>BitString</KEYWORD2>
-      <KEYWORD2>Bool</KEYWORD2>
-      <KEYWORD2>DecDigit</KEYWORD2>
-      <KEYWORD2>DecString</KEYWORD2>
-      <KEYWORD2>Element</KEYWORD2>
-      <KEYWORD2>FBool</KEYWORD2>
-      <KEYWORD2>HexDigit</KEYWORD2>
-      <KEYWORD2>HexString</KEYWORD2>
-      <KEYWORD2>OctDigit</KEYWORD2>
-      <KEYWORD2>Octet</KEYWORD2>
-      <KEYWORD2>OctString</KEYWORD2>
-      <KEYWORD2>Nat</KEYWORD2>
-      <KEYWORD2>NonEmptyString</KEYWORD2>
-      <KEYWORD2>OctetString</KEYWORD2>
-      <KEYWORD2>Set</KEYWORD2>
-      <KEYWORD2>String</KEYWORD2>
-
-      <!-- Standard Library Types (where differing from Sorts) -->
-      <KEYWORD2>BasicNaturalNumber</KEYWORD2>
-      <KEYWORD2>BasicNonEmptyString</KEYWORD2>
-      <KEYWORD2>BitNatRepr</KEYWORD2>
-      <KEYWORD2>Boolean</KEYWORD2>
-      <KEYWORD2>FBoolean</KEYWORD2>
-      <KEYWORD2>DecNatRepr</KEYWORD2>
-      <KEYWORD2>HexNatRepr</KEYWORD2>
-      <KEYWORD2>NatRepresentations</KEYWORD2>
-      <KEYWORD2>NaturalNumber</KEYWORD2>
-      <KEYWORD2>OctNatRepr</KEYWORD2>
-      <KEYWORD2>RicherNonEmptyString</KEYWORD2>
-      <KEYWORD2>String0</KEYWORD2>
-      <KEYWORD2>String1</KEYWORD2>
-
-      <!-- Standard Library Literals -->
-      <LITERAL1>false</LITERAL1>
-      <LITERAL1>true</LITERAL1>
-    </KEYWORDS>
-  </RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/lua.xml b/qpython/src/main/assets/syntax/lua.xml
deleted file mode 100644
index 1f9bef97..00000000
--- a/qpython/src/main/assets/syntax/lua.xml
+++ /dev/null
@@ -1,238 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-<!-- Lua 5.0 Mode, written by Philipp Janda -->
-
-<!-- TODO:
-  * Autoindent screws up, if { or ( gets typed after the indentNextLines trigger
-  -> This is very annoying, so I disabled the automatic indenting in this case!
-  -> It should be fixed if you set doubleBracketIndent to "true", but I keep it
-     disabled anyway since it is not that useful if you don't have an unindent!
-  * Should I use FUNCTION and OPERATOR tags inside of <KEYWORDS>??!!
--->
-
-<MODE>
-  <PROPS>
-    <!-- Comments -->
-    <PROPERTY NAME="lineComment" VALUE="--"/>
-    <PROPERTY NAME="commentStart" VALUE="--[["/>
-    <PROPERTY NAME="commentEnd" VALUE="]]"/>
-    <PROPERTY NAME="wordBreakChars" VALUE=",+-=&lt;&gt;/?^&amp;*"/>
-    <!-- Auto indent -->
-    <PROPERTY NAME="indentOpenBrackets" VALUE="{"/>
-    <PROPERTY NAME="indentCloseBrackets" VALUE="}"/>
-    <!--
-    <PROPERTY NAME="indentNextLines" VALUE=".*((then|else|do|function)).*"/>
-    -->
-    <PROPERTY NAME="doubleBracketIndent" VALUE="true"/>
-  </PROPS>
-  <RULES IGNORE_CASE="FALSE" NO_WORD_SEP="_:." HIGHLIGHT_DIGITS="TRUE"
-         DIGIT_RE="[\p{Digit}]*(\.[\p{Digit}]*)?([eE][+-]?[\p{Digit}]*)?">
-    <!-- Multiline comments -->
-    <SPAN_REGEXP TYPE="COMMENT1" HASH_CHARS="--[">
-      <BEGIN>--\[(=*)\[</BEGIN>
-      <END>]$1]</END>
-    </SPAN_REGEXP>
-    <!-- Single line comments -->
-    <EOL_SPAN TYPE="COMMENT1">--</EOL_SPAN>
-    <EOL_SPAN AT_LINE_START="TRUE" TYPE="COMMENT2">#!</EOL_SPAN>
-    <!-- Simple string literals -->
-    <SPAN TYPE="LITERAL1" ESCAPE="\">
-      <BEGIN>"</BEGIN>
-      <END>"</END>
-    </SPAN>
-    <SPAN TYPE="LITERAL1" ESCAPE="\">
-      <BEGIN>'</BEGIN>
-      <END>'</END>
-    </SPAN>
-    <!-- Multiline string literals -->
-    <SPAN_REGEXP TYPE="LITERAL1" HASH_CHAR="[">
-      <BEGIN>\[(=*)\[</BEGIN>
-      <END>]$1]</END>
-    </SPAN_REGEXP>
-    <!-- Operators -->
-    <SEQ TYPE="OPERATOR">+</SEQ>
-    <SEQ TYPE="OPERATOR">-</SEQ>
-    <SEQ TYPE="OPERATOR">*</SEQ>
-    <SEQ TYPE="OPERATOR">/</SEQ>
-    <SEQ TYPE="OPERATOR">^</SEQ>
-    <SEQ TYPE="OPERATOR">..</SEQ>
-    <SEQ TYPE="OPERATOR">&lt;=</SEQ>
-    <SEQ TYPE="OPERATOR">&lt;</SEQ>
-    <SEQ TYPE="OPERATOR">&gt;=</SEQ>
-    <SEQ TYPE="OPERATOR">&gt;</SEQ>
-    <SEQ TYPE="OPERATOR">==</SEQ>
-    <SEQ TYPE="OPERATOR">~=</SEQ>
-    <SEQ TYPE="OPERATOR">=</SEQ>
-    <!-- Function calls and definitions -->
-    <MARK_PREVIOUS TYPE="FUNCTION" MATCH_TYPE="OPERATOR">(</MARK_PREVIOUS>
-	<SEQ TYPE="OPERATOR">)</SEQ>
-    <MARK_PREVIOUS TYPE="FUNCTION" MATCH_TYPE="OPERATOR">{</MARK_PREVIOUS>
-	<SEQ TYPE="OPERATOR">}</SEQ>
-    <MARK_PREVIOUS TYPE="FUNCTION" MATCH_TYPE="OPERATOR">"</MARK_PREVIOUS>
-	<SEQ TYPE="OPERATOR">"</SEQ>
-    <MARK_PREVIOUS TYPE="FUNCTION" MATCH_TYPE="OPERATOR">'</MARK_PREVIOUS>
-	<SEQ TYPE="OPERATOR">'</SEQ>
-
-    <KEYWORDS>
-      <!-- Keywords -->
-      <KEYWORD1>do</KEYWORD1>
-      <KEYWORD1>end</KEYWORD1>
-      <KEYWORD1>while</KEYWORD1>
-      <KEYWORD1>repeat</KEYWORD1>
-      <KEYWORD1>until</KEYWORD1>
-      <KEYWORD1>if</KEYWORD1>
-      <KEYWORD1>then</KEYWORD1>
-      <KEYWORD1>elseif</KEYWORD1>
-      <KEYWORD1>else</KEYWORD1>
-      <KEYWORD1>return</KEYWORD1>
-      <KEYWORD1>break</KEYWORD1>
-      <KEYWORD1>for</KEYWORD1>
-      <KEYWORD1>in</KEYWORD1>
-      <KEYWORD1>function</KEYWORD1>
-      <KEYWORD1>local</KEYWORD1>
-      <KEYWORD3>nil</KEYWORD3>
-      <KEYWORD3>true</KEYWORD3>
-      <KEYWORD3>false</KEYWORD3>
-      <KEYWORD1>and</KEYWORD1>
-      <KEYWORD1>or</KEYWORD1>
-      <KEYWORD1>not</KEYWORD1>
-      <!-- Builtin functions or special names -->
-      <KEYWORD2>assert</KEYWORD2>
-      <KEYWORD2>collectgarbage</KEYWORD2>
-      <KEYWORD2>dofile</KEYWORD2>
-      <KEYWORD2>error</KEYWORD2>
-      <KEYWORD2>_G</KEYWORD2>
-      <KEYWORD2>getfenv</KEYWORD2>
-      <KEYWORD2>getmetatable</KEYWORD2>
-      <KEYWORD2>gcinfo</KEYWORD2>
-      <KEYWORD2>ipairs</KEYWORD2>
-      <KEYWORD2>loadfile</KEYWORD2>
-      <KEYWORD2>loadlib</KEYWORD2>
-      <KEYWORD2>loadstring</KEYWORD2>
-      <KEYWORD2>next</KEYWORD2>
-      <KEYWORD2>pairs</KEYWORD2>
-      <KEYWORD2>pcall</KEYWORD2>
-      <KEYWORD2>print</KEYWORD2>
-      <KEYWORD2>rawequal</KEYWORD2>
-      <KEYWORD2>rawget</KEYWORD2>
-      <KEYWORD2>rawset</KEYWORD2>
-      <KEYWORD2>require</KEYWORD2>
-      <KEYWORD2>setfenv</KEYWORD2>
-      <KEYWORD2>setmetatable</KEYWORD2>
-      <KEYWORD2>tonumber</KEYWORD2>
-      <KEYWORD2>tostring</KEYWORD2>
-      <KEYWORD2>type</KEYWORD2>
-      <KEYWORD2>unpack</KEYWORD2>
-      <KEYWORD2>xpcall</KEYWORD2>
-      <KEYWORD2>_VERSION</KEYWORD2>
-      <KEYWORD2>LUA_PATH</KEYWORD2>
-      <KEYWORD2>_LOADED</KEYWORD2>
-      <KEYWORD2>_REQUIREDNAME</KEYWORD2>
-      <KEYWORD2>_ALERT</KEYWORD2>
-      <KEYWORD2>_ERRORMESSAGE</KEYWORD2>
-      <KEYWORD2>_PROMPT</KEYWORD2>
-      <KEYWORD2>__add</KEYWORD2>
-      <KEYWORD2>__sub</KEYWORD2>
-      <KEYWORD2>__mul</KEYWORD2>
-      <KEYWORD2>__div</KEYWORD2>
-      <KEYWORD2>__pow</KEYWORD2>
-      <KEYWORD2>__unm</KEYWORD2>
-      <KEYWORD2>__concat</KEYWORD2>
-      <KEYWORD2>__eq</KEYWORD2>
-      <KEYWORD2>__lt</KEYWORD2>
-      <KEYWORD2>__le</KEYWORD2>
-      <KEYWORD2>__index</KEYWORD2>
-      <KEYWORD2>__newindex</KEYWORD2>
-      <KEYWORD2>__call</KEYWORD2>
-      <KEYWORD2>__metatable</KEYWORD2>
-      <KEYWORD2>__mode</KEYWORD2>
-      <KEYWORD2>__tostring</KEYWORD2>
-      <KEYWORD2>__fenv</KEYWORD2>
-      <KEYWORD2>...</KEYWORD2>
-      <KEYWORD2>arg</KEYWORD2>
-      <KEYWORD2>coroutine.create</KEYWORD2>
-      <KEYWORD2>coroutine.resume</KEYWORD2>
-      <KEYWORD2>coroutine.status</KEYWORD2>
-      <KEYWORD2>coroutine.wrap</KEYWORD2>
-      <KEYWORD2>coroutine.yield</KEYWORD2>
-      <KEYWORD2>string.byte</KEYWORD2>
-      <KEYWORD2>string.char</KEYWORD2>
-      <KEYWORD2>string.dump</KEYWORD2>
-      <KEYWORD2>string.find</KEYWORD2>
-      <KEYWORD2>string.len</KEYWORD2>
-      <KEYWORD2>string.lower</KEYWORD2>
-      <KEYWORD2>string.rep</KEYWORD2>
-      <KEYWORD2>string.sub</KEYWORD2>
-      <KEYWORD2>string.upper</KEYWORD2>
-      <KEYWORD2>string.format</KEYWORD2>
-      <KEYWORD2>string.gfind</KEYWORD2>
-      <KEYWORD2>string.gsub</KEYWORD2>
-      <KEYWORD2>table.concat</KEYWORD2>
-      <KEYWORD2>table.foreach</KEYWORD2>
-      <KEYWORD2>table.foreachi</KEYWORD2>
-      <KEYWORD2>table.getn</KEYWORD2>
-      <KEYWORD2>table.sort</KEYWORD2>
-      <KEYWORD2>table.insert</KEYWORD2>
-      <KEYWORD2>table.remove</KEYWORD2>
-      <KEYWORD2>table.setn</KEYWORD2>
-      <KEYWORD2>math.abs</KEYWORD2>
-      <KEYWORD2>math.acos</KEYWORD2>
-      <KEYWORD2>math.asin</KEYWORD2>
-      <KEYWORD2>math.atan</KEYWORD2>
-      <KEYWORD2>math.atan2</KEYWORD2>
-      <KEYWORD2>math.ceil</KEYWORD2>
-      <KEYWORD2>math.cos</KEYWORD2>
-      <KEYWORD2>math.deg</KEYWORD2>
-      <KEYWORD2>math.exp</KEYWORD2>
-      <KEYWORD2>math.floor</KEYWORD2>
-      <KEYWORD2>math.log</KEYWORD2>
-      <KEYWORD2>math.log10</KEYWORD2>
-      <KEYWORD2>math.max</KEYWORD2>
-      <KEYWORD2>math.min</KEYWORD2>
-      <KEYWORD2>math.mod</KEYWORD2>
-      <KEYWORD2>math.pow</KEYWORD2>
-      <KEYWORD2>math.rad</KEYWORD2>
-      <KEYWORD2>math.sin</KEYWORD2>
-      <KEYWORD2>math.sqrt</KEYWORD2>
-      <KEYWORD2>math.tan</KEYWORD2>
-      <KEYWORD2>math.frexp</KEYWORD2>
-      <KEYWORD2>math.ldexp</KEYWORD2>
-      <KEYWORD2>math.random</KEYWORD2>
-      <KEYWORD2>math.randomseed</KEYWORD2>
-      <KEYWORD2>math.pi</KEYWORD2>
-      <KEYWORD2>io.close</KEYWORD2>
-      <KEYWORD2>io.flush</KEYWORD2>
-      <KEYWORD2>io.input</KEYWORD2>
-      <KEYWORD2>io.lines</KEYWORD2>
-      <KEYWORD2>io.open</KEYWORD2>
-      <KEYWORD2>io.read</KEYWORD2>
-      <KEYWORD2>io.tmpfile</KEYWORD2>
-      <KEYWORD2>io.type</KEYWORD2>
-      <KEYWORD2>io.write</KEYWORD2>
-      <KEYWORD2>io.stdin</KEYWORD2>
-      <KEYWORD2>io.stdout</KEYWORD2>
-      <KEYWORD2>io.stderr</KEYWORD2>
-      <KEYWORD2>os.clock</KEYWORD2>
-      <KEYWORD2>os.date</KEYWORD2>
-      <KEYWORD2>os.difftime</KEYWORD2>
-      <KEYWORD2>os.execute</KEYWORD2>
-      <KEYWORD2>os.exit</KEYWORD2>
-      <KEYWORD2>os.getenv</KEYWORD2>
-      <KEYWORD2>os.remove</KEYWORD2>
-      <KEYWORD2>os.rename</KEYWORD2>
-      <KEYWORD2>os.setlocale</KEYWORD2>
-      <KEYWORD2>os.time</KEYWORD2>
-      <KEYWORD2>os.tmpname</KEYWORD2>
-      <KEYWORD2>debug.debug</KEYWORD2>
-      <KEYWORD2>debug.gethook</KEYWORD2>
-      <KEYWORD2>debug.getinfo</KEYWORD2>
-      <KEYWORD2>debug.getlocal</KEYWORD2>
-      <KEYWORD2>debug.getupvalue</KEYWORD2>
-      <KEYWORD2>debug.setlocal</KEYWORD2>
-      <KEYWORD2>debug.setupvalue</KEYWORD2>
-      <KEYWORD2>debug.sethook</KEYWORD2>
-      <KEYWORD2>debug.traceback</KEYWORD2>
-    </KEYWORDS>
-  </RULES>
-</MODE>
-
diff --git a/qpython/src/main/assets/syntax/macroscheduler.xml b/qpython/src/main/assets/syntax/macroscheduler.xml
deleted file mode 100644
index bff3cab7..00000000
--- a/qpython/src/main/assets/syntax/macroscheduler.xml
+++ /dev/null
@@ -1,359 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="commentStart" VALUE="/*" />
-		<PROPERTY NAME="commentEnd" VALUE="*/" />
-		<PROPERTY NAME="lineComment" VALUE="//" />
-
-		<!-- Auto indent -->
-		<PROPERTY NAME="indentOpenBrackets" VALUE="{" />
-		<PROPERTY NAME="indentCloseBrackets" VALUE="}" />
-		<PROPERTY NAME="unalignedOpenBrackets" VALUE="(" />
-		<PROPERTY NAME="unalignedCloseBrackets" VALUE=")" />
-		<PROPERTY NAME="indentNextLine"
-			VALUE="\s*(((if|while)\s*\(|else\s*|else\s+if\s*\(|for\s*\(.*\))[^{;]*)" />
-		<PROPERTY NAME="unindentThisLine"
-			VALUE="^.*(default:\s*|case.*:.*)$" />
-		<PROPERTY NAME="electricKeys" VALUE=":" />
-	</PROPS>
-	<RULES IGNORE_CASE="FALSE"
-		HIGHLIGHT_DIGITS="TRUE"
-		DIGIT_RE="(0x[\p{XDigit}]+[lL]?|[\p{Digit}]+(e[\p{Digit}]*)?[lLdDfF]?)">
-
-		<SPAN TYPE="COMMENT1">
-			<BEGIN>/*</BEGIN>
-			<END>*/</END>
-		</SPAN>
-
-		<!-- DocComments may have XML in them -->
-		<EOL_SPAN TYPE="COMMENT3" DELEGATE="DOC_COMMENT">///</EOL_SPAN>
-
-		<EOL_SPAN TYPE="COMMENT2">//</EOL_SPAN>
-
-		<EOL_SPAN TYPE="COMMENT4">///</EOL_SPAN>
-
-		<!-- verbatim strings -->
-		<SPAN TYPE="LITERAL3" NO_LINE_BREAK="FALSE">
-			<BEGIN>@"</BEGIN>
-			<END>"</END>
-		</SPAN>
-
-		<SPAN TYPE="LITERAL1" ESCAPE="\" NO_LINE_BREAK="TRUE">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-
-		<SPAN TYPE="LITERAL1" ESCAPE="\" NO_LINE_BREAK="TRUE">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-
-		<EOL_SPAN TYPE="KEYWORD2">#if</EOL_SPAN>
-		<EOL_SPAN TYPE="KEYWORD2">#else</EOL_SPAN>
-		<EOL_SPAN TYPE="KEYWORD2">#endif</EOL_SPAN>
-
-		<SEQ TYPE="OPERATOR">~</SEQ>
-		<SEQ TYPE="OPERATOR">!</SEQ>
-		<SEQ TYPE="OPERATOR">:</SEQ>
-		<SEQ TYPE="OPERATOR">;</SEQ>
-		<SEQ TYPE="OPERATOR">{</SEQ>
-		<SEQ TYPE="OPERATOR">}</SEQ>
-		<SEQ TYPE="OPERATOR">,</SEQ>
-		<SEQ TYPE="OPERATOR">.</SEQ>
-		<SEQ TYPE="OPERATOR">!</SEQ>
-		<SEQ TYPE="OPERATOR">[</SEQ>
-		<SEQ TYPE="OPERATOR">]</SEQ>
-		<SEQ TYPE="OPERATOR">+</SEQ>
-		<SEQ TYPE="OPERATOR">-</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;</SEQ>
-		<SEQ TYPE="OPERATOR">=</SEQ>
-		<SEQ TYPE="OPERATOR">*</SEQ>
-		<SEQ TYPE="OPERATOR">/</SEQ>
-		<SEQ TYPE="OPERATOR">\</SEQ>
-		<SEQ TYPE="OPERATOR">^</SEQ>
-		<SEQ TYPE="OPERATOR">|</SEQ>
-		<SEQ TYPE="OPERATOR">&amp;</SEQ>
-		<SEQ TYPE="OPERATOR">%</SEQ>
-		<SEQ TYPE="OPERATOR">?</SEQ>
-
-		<MARK_PREVIOUS TYPE="FUNCTION" MATCH_TYPE="OPERATOR">(</MARK_PREVIOUS>
-		<SEQ TYPE="OPERATOR">)</SEQ>
-
-		<KEYWORDS>
-
-			<KEYWORD1>AddDialogHandler</KEYWORD1>
-			<KEYWORD1>AddTrayHandler</KEYWORD1>
-			<KEYWORD1>AddTrayIcon</KEYWORD1>
-			<KEYWORD1>AppendFile</KEYWORD1>
-			<KEYWORD1>ArrayCount</KEYWORD1>
-			<KEYWORD1>ArraySort</KEYWORD1>
-			<KEYWORD1>Ascii</KEYWORD1>
-			<KEYWORD1>Ask</KEYWORD1>
-			<KEYWORD1>Assigned</KEYWORD1>
-			<KEYWORD1>BlockInput</KEYWORD1>
-			<KEYWORD1>CSVFileToArray</KEYWORD1>
-			<KEYWORD1>CapsOff</KEYWORD1>
-			<KEYWORD1>CapsOn</KEYWORD1>
-			<KEYWORD1>ChangeDirectory</KEYWORD1>
-			<KEYWORD1>CloseDialog</KEYWORD1>
-			<KEYWORD1>CloseWindow</KEYWORD1>
-			<KEYWORD1>CompareBitmaps</KEYWORD1>
-			<KEYWORD1>ConCat</KEYWORD1>
-			<KEYWORD1>CopyFile</KEYWORD1>
-			<KEYWORD1>CopyFolder</KEYWORD1>
-			<KEYWORD1>CountFiles</KEYWORD1>
-			<KEYWORD1>CreateDir</KEYWORD1>
-			<KEYWORD1>Crypt</KEYWORD1>
-			<KEYWORD1>DBClose</KEYWORD1>
-			<KEYWORD1>DBConnect</KEYWORD1>
-			<KEYWORD1>DBExec</KEYWORD1>
-			<KEYWORD1>DBQuery</KEYWORD1>
-			<KEYWORD1>DDEPoke</KEYWORD1>
-			<KEYWORD1>DDERequest</KEYWORD1>
-			<KEYWORD1>DateStamp</KEYWORD1>
-			<KEYWORD1>Day</KEYWORD1>
-			<KEYWORD1>DayOfWeek</KEYWORD1>
-			<KEYWORD1>DelTrayIcon</KEYWORD1>
-			<KEYWORD1>DeleteFile</KEYWORD1>
-			<KEYWORD1>DeleteFolder</KEYWORD1>
-			<KEYWORD1>Dialog</KEYWORD1>
-			<KEYWORD1>EditIniFile</KEYWORD1>
-			<KEYWORD1>Else</KEYWORD1>
-			<KEYWORD1>End</KEYWORD1>
-			<KEYWORD1>EndDialog</KEYWORD1>
-			<KEYWORD1>EndIf</KEYWORD1>
-			<KEYWORD1>EndWhile</KEYWORD1>
-			<KEYWORD1>ExecuteFile</KEYWORD1>
-			<KEYWORD1>Exit</KEYWORD1>
-			<KEYWORD1>ExportData</KEYWORD1>
-			<KEYWORD1>ExtractFileExt</KEYWORD1>
-			<KEYWORD1>ExtractFileName</KEYWORD1>
-			<KEYWORD1>ExtractFilePath</KEYWORD1>
-			<KEYWORD1>FTPDelFile</KEYWORD1>
-			<KEYWORD1>FTPGetDirList</KEYWORD1>
-			<KEYWORD1>FTPGetFile</KEYWORD1>
-			<KEYWORD1>FTPMakeDir</KEYWORD1>
-			<KEYWORD1>FTPPutFile</KEYWORD1>
-			<KEYWORD1>FTPRemoveDir</KEYWORD1>
-			<KEYWORD1>FTPRenameFile</KEYWORD1>
-			<KEYWORD1>FileDate</KEYWORD1>
-			<KEYWORD1>FileSize</KEYWORD1>
-			<KEYWORD1>FileTime</KEYWORD1>
-			<KEYWORD1>FindImagePos</KEYWORD1>
-			<KEYWORD1>FindWindowWithText</KEYWORD1>
-			<KEYWORD1>GetActiveWindow</KEYWORD1>
-			<KEYWORD1>GetCaretPos</KEYWORD1>
-			<KEYWORD1>GetCheckBox</KEYWORD1>
-			<KEYWORD1>GetClipBoard</KEYWORD1>
-			<KEYWORD1>GetControlText</KEYWORD1>
-			<KEYWORD1>GetCursorPos</KEYWORD1>
-			<KEYWORD1>GetDate</KEYWORD1>
-			<KEYWORD1>GetDialogAction</KEYWORD1>
-			<KEYWORD1>GetDialogProperty</KEYWORD1>
-			<KEYWORD1>GetEnvVar</KEYWORD1>
-			<KEYWORD1>GetFileList</KEYWORD1>
-			<KEYWORD1>GetFocusedObject</KEYWORD1>
-			<KEYWORD1>GetListItem</KEYWORD1>
-			<KEYWORD1>GetPixelColor</KEYWORD1>
-			<KEYWORD1>GetRectCheckSum</KEYWORD1>
-			<KEYWORD1>GetScreenRes</KEYWORD1>
-			<KEYWORD1>GetTextAtPoint</KEYWORD1>
-			<KEYWORD1>GetTextInRect</KEYWORD1>
-			<KEYWORD1>GetTextReset</KEYWORD1>
-			<KEYWORD1>GetTime</KEYWORD1>
-			<KEYWORD1>GetTreeNode</KEYWORD1>
-			<KEYWORD1>GetWindowHandle</KEYWORD1>
-			<KEYWORD1>GetWindowList</KEYWORD1>
-			<KEYWORD1>GetWindowNames</KEYWORD1>
-			<KEYWORD1>GetWindowPos</KEYWORD1>
-			<KEYWORD1>GetWindowProcess</KEYWORD1>
-			<KEYWORD1>GetWindowSize</KEYWORD1>
-			<KEYWORD1>GetWindowText</KEYWORD1>
-			<KEYWORD1>GetWindowTextEx</KEYWORD1>
-			<KEYWORD1>GoSub</KEYWORD1>
-			<KEYWORD1>Goto</KEYWORD1>
-			<KEYWORD1>HTTPRequest</KEYWORD1>
-			<KEYWORD1>Hour</KEYWORD1>
-			<KEYWORD1>If</KEYWORD1>
-			<KEYWORD1>IfDirExists</KEYWORD1>
-			<KEYWORD1>IfFileChanged</KEYWORD1>
-			<KEYWORD1>IfFileExists</KEYWORD1>
-			<KEYWORD1>IfWindowOpen</KEYWORD1>
-			<KEYWORD1>Input</KEYWORD1>
-			<KEYWORD1>IsConnectedToInternet</KEYWORD1>
-			<KEYWORD1>KillProcess</KEYWORD1>
-			<KEYWORD1>LClick</KEYWORD1>
-			<KEYWORD1>LDblClick</KEYWORD1>
-			<KEYWORD1>LDown</KEYWORD1>
-			<KEYWORD1>LTrim</KEYWORD1>
-			<KEYWORD1>LUp</KEYWORD1>
-			<KEYWORD1>LabelToVar</KEYWORD1>
-			<KEYWORD1>Len</KEYWORD1>
-			<KEYWORD1>Length</KEYWORD1>
-			<KEYWORD1>LibFree</KEYWORD1>
-			<KEYWORD1>LibFunc</KEYWORD1>
-			<KEYWORD1>LibFuncW</KEYWORD1>
-			<KEYWORD1>LibLoad</KEYWORD1>
-			<KEYWORD1>LowerCase</KEYWORD1>
-			<KEYWORD1>MClick</KEYWORD1>
-			<KEYWORD1>MDblClick</KEYWORD1>
-			<KEYWORD1>MDown</KEYWORD1>
-			<KEYWORD1>MUp</KEYWORD1>
-			<KEYWORD1>Macro</KEYWORD1>
-			<KEYWORD1>Message</KEYWORD1>
-			<KEYWORD1>MessageModal</KEYWORD1>
-			<KEYWORD1>MidStr</KEYWORD1>
-			<KEYWORD1>Min</KEYWORD1>
-			<KEYWORD1>Month</KEYWORD1>
-			<KEYWORD1>MouseMove</KEYWORD1>
-			<KEYWORD1>MouseMoveRel</KEYWORD1>
-			<KEYWORD1>MouseOver</KEYWORD1>
-			<KEYWORD1>MoveFile</KEYWORD1>
-			<KEYWORD1>MoveWindow</KEYWORD1>
-			<KEYWORD1>NumOff</KEYWORD1>
-			<KEYWORD1>NumOn</KEYWORD1>
-			<KEYWORD1>OnEvent</KEYWORD1>
-			<KEYWORD1>PlayWav</KEYWORD1>
-			<KEYWORD1>Position</KEYWORD1>
-			<KEYWORD1>Press</KEYWORD1>
-			<KEYWORD1>ProcessExists</KEYWORD1>
-			<KEYWORD1>PushButton</KEYWORD1>
-			<KEYWORD1>PutClipBoard</KEYWORD1>
-			<KEYWORD1>RClick</KEYWORD1>
-			<KEYWORD1>RDblClick</KEYWORD1>
-			<KEYWORD1>RDown</KEYWORD1>
-			<KEYWORD1>RGB</KEYWORD1>
-			<KEYWORD1>RTrim</KEYWORD1>
-			<KEYWORD1>RUp</KEYWORD1>
-			<KEYWORD1>ReadFile</KEYWORD1>
-			<KEYWORD1>ReadIniFile</KEYWORD1>
-			<KEYWORD1>ReadLn</KEYWORD1>
-			<KEYWORD1>RegEx</KEYWORD1>
-			<KEYWORD1>RegistryDelKey</KEYWORD1>
-			<KEYWORD1>RegistryDelVal</KEYWORD1>
-			<KEYWORD1>RegistryReadKey</KEYWORD1>
-			<KEYWORD1>RegistryWriteKey</KEYWORD1>
-			<KEYWORD1>Release</KEYWORD1>
-			<KEYWORD1>Remark</KEYWORD1>
-			<KEYWORD1>RenameFile</KEYWORD1>
-			<KEYWORD1>Repeat</KEYWORD1>
-			<KEYWORD1>ResetDialogAction</KEYWORD1>
-			<KEYWORD1>ResizeWindow</KEYWORD1>
-			<KEYWORD1>RetrievePOP3</KEYWORD1>
-			<KEYWORD1>RunProgram</KEYWORD1>
-			<KEYWORD1>SMTPSendMail</KEYWORD1>
-			<KEYWORD1>ScreenCapture</KEYWORD1>
-			<KEYWORD1>ScrollOff</KEYWORD1>
-			<KEYWORD1>ScrollOn</KEYWORD1>
-			<KEYWORD1>Sec</KEYWORD1>
-			<KEYWORD1>SelectMenu</KEYWORD1>
-			<KEYWORD1>Send</KEYWORD1>
-			<KEYWORD1>SendText</KEYWORD1>
-			<KEYWORD1>Separate</KEYWORD1>
-			<KEYWORD1>SetCheckBox</KEYWORD1>
-			<KEYWORD1>SetControlText</KEYWORD1>
-			<KEYWORD1>SetDialogObjectColor</KEYWORD1>
-			<KEYWORD1>SetDialogObjectFocus</KEYWORD1>
-			<KEYWORD1>SetDialogObjectFont</KEYWORD1>
-			<KEYWORD1>SetDialogObjectVisible</KEYWORD1>
-			<KEYWORD1>SetDialogProperty</KEYWORD1>
-			<KEYWORD1>SetEnvVar</KEYWORD1>
-			<KEYWORD1>SetFocus</KEYWORD1>
-			<KEYWORD1>Show</KEYWORD1>
-			<KEYWORD1>ShutDownWindows</KEYWORD1>
-			<KEYWORD1>SkipLabel</KEYWORD1>
-			<KEYWORD1>SoWrite</KEYWORD1>
-			<KEYWORD1>SoWriteLn</KEYWORD1>
-			<KEYWORD1>StringReplace</KEYWORD1>
-			<KEYWORD1>TelnetClose</KEYWORD1>
-			<KEYWORD1>TelnetConnect</KEYWORD1>
-			<KEYWORD1>TelnetSend</KEYWORD1>
-			<KEYWORD1>TelnetWaitFor</KEYWORD1>
-			<KEYWORD1>TimeStamp</KEYWORD1>
-			<KEYWORD1>Toolbar</KEYWORD1>
-			<KEYWORD1>Trim</KEYWORD1>
-			<KEYWORD1>Until</KEYWORD1>
-			<KEYWORD1>UpperCase</KEYWORD1>
-			<KEYWORD1>Wait</KEYWORD1>
-			<KEYWORD1>WaitClipBoard</KEYWORD1>
-			<KEYWORD1>WaitCursorChanged</KEYWORD1>
-			<KEYWORD1>WaitKeyDown</KEYWORD1>
-			<KEYWORD1>WaitPixelColor</KEYWORD1>
-			<KEYWORD1>WaitProcessExists</KEYWORD1>
-			<KEYWORD1>WaitProcessTerminated</KEYWORD1>
-			<KEYWORD1>WaitReady</KEYWORD1>
-			<KEYWORD1>WaitRectChanged</KEYWORD1>
-			<KEYWORD1>WaitScreenImage</KEYWORD1>
-			<KEYWORD1>WaitScreenText</KEYWORD1>
-			<KEYWORD1>WaitWindowChanged</KEYWORD1>
-			<KEYWORD1>WaitWindowClosed</KEYWORD1>
-			<KEYWORD1>WaitWindowOpen</KEYWORD1>
-			<KEYWORD1>While</KEYWORD1>
-			<KEYWORD1>WindowAction</KEYWORD1>
-			<KEYWORD1>WriteLn</KEYWORD1>
-			<KEYWORD1>XLAddSheet</KEYWORD1>
-			<KEYWORD1>XLCreate</KEYWORD1>
-			<KEYWORD1>XLDelCol</KEYWORD1>
-			<KEYWORD1>XLDelRow</KEYWORD1>
-			<KEYWORD1>XLDelSheet</KEYWORD1>
-			<KEYWORD1>XLGetCell</KEYWORD1>
-			<KEYWORD1>XLGetSheetDims</KEYWORD1>
-			<KEYWORD1>XLOpen</KEYWORD1>
-			<KEYWORD1>XLQuit</KEYWORD1>
-			<KEYWORD1>XLRun</KEYWORD1>
-			<KEYWORD1>XLSave</KEYWORD1>
-			<KEYWORD1>XLSetCell</KEYWORD1>
-			<KEYWORD1>Year</KEYWORD1>
-
-			<KEYWORD2>Include</KEYWORD2>
-			<KEYWORD2>Label</KEYWORD2>
-			<KEYWORD2>VBEnd</KEYWORD2>
-			<KEYWORD2>VBEval</KEYWORD2>
-			<KEYWORD2>VBRun</KEYWORD2>
-			<KEYWORD2>VBStart</KEYWORD2>
-
-			<KEYWORD3>Abs</KEYWORD3>
-			<KEYWORD3>Add</KEYWORD3>
-			<KEYWORD3>ArcTan</KEYWORD3>
-			<KEYWORD3>Cos</KEYWORD3>
-			<KEYWORD3>Exp</KEYWORD3>
-			<KEYWORD3>Frac</KEYWORD3>
-			<KEYWORD3>Int</KEYWORD3>
-			<KEYWORD3>Let</KEYWORD3>
-			<KEYWORD3>Ln</KEYWORD3>
-			<KEYWORD3>Pi</KEYWORD3>
-			<KEYWORD3>Power</KEYWORD3>
-			<KEYWORD3>Random</KEYWORD3>
-			<KEYWORD3>Round</KEYWORD3>
-			<KEYWORD3>Sin</KEYWORD3>
-			<KEYWORD3>Sqr</KEYWORD3>
-			<KEYWORD3>Sqrt</KEYWORD3>
-			<KEYWORD3>Sub</KEYWORD3>
-			<KEYWORD3>Trunc</KEYWORD3>
-			<KEYWORD3>Base64</KEYWORD3>
-
-			<LITERAL2>false</LITERAL2>
-			<LITERAL2>null</LITERAL2>
-			<LITERAL2>this</LITERAL2>
-			<LITERAL2>true</LITERAL2>
-		</KEYWORDS>
-	</RULES>
-
-	<RULES SET="DOC_COMMENT" DEFAULT="COMMENT3" IGNORE_CASE="TRUE">
-		<!-- XML comments -->
-		<SPAN TYPE="COMMENT1">
-			<BEGIN>&lt;--</BEGIN>
-			<END>--&gt;</END>
-		</SPAN>
-		<!-- XML tags -->
-		<SPAN TYPE="MARKUP" DELEGATE="xml::TAGS">
-			<BEGIN>&lt;</BEGIN>
-			<END>&gt;</END>
-		</SPAN>
-	</RULES>
-</MODE>
-
diff --git a/qpython/src/main/assets/syntax/mail.xml b/qpython/src/main/assets/syntax/mail.xml
deleted file mode 100644
index 5e9d5214..00000000
--- a/qpython/src/main/assets/syntax/mail.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="lineComment" VALUE=">" />
-		<PROPERTY NAME="noWordSep" VALUE="-_" />
-	</PROPS>
-	<RULES IGNORE_CASE="TRUE" HIGHLIGHT_DIGITS="FALSE" NO_WORD_SEP="-_:)">
-		<EOL_SPAN AT_LINE_START="TRUE" TYPE="COMMENT3">&gt;&gt;&gt;</EOL_SPAN>
-		<EOL_SPAN AT_LINE_START="TRUE" TYPE="COMMENT2">&gt;&gt;</EOL_SPAN>
-		<EOL_SPAN AT_LINE_START="TRUE" TYPE="COMMENT1">&gt;</EOL_SPAN>
-		<EOL_SPAN AT_LINE_START="TRUE" TYPE="COMMENT1">| </EOL_SPAN>
-		<EOL_SPAN AT_LINE_START="TRUE" TYPE="COMMENT1">:</EOL_SPAN>
-		<SEQ TYPE="COMMENT2" DELEGATE="SIGNATURE"
-			AT_LINE_START="TRUE">-- </SEQ>
-		<SEQ TYPE="KEYWORD1">:-)</SEQ>
-		<SEQ TYPE="KEYWORD1">:-(</SEQ>
-		<SEQ TYPE="KEYWORD1">:)</SEQ>
-		<SEQ TYPE="KEYWORD1">:(</SEQ>
-		<SEQ TYPE="KEYWORD1">;-)</SEQ>
-		<SEQ TYPE="KEYWORD1">;-(</SEQ>
-		<SEQ TYPE="KEYWORD1">;)</SEQ>
-		<SEQ TYPE="KEYWORD1">;(</SEQ>
-		<MARK_PREVIOUS AT_LINE_START="TRUE" TYPE="LABEL">:</MARK_PREVIOUS>
-	</RULES>
-	<RULES SET="SIGNATURE" DEFAULT="COMMENT2"/>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/makefile.xml b/qpython/src/main/assets/syntax/makefile.xml
deleted file mode 100644
index a728de82..00000000
--- a/qpython/src/main/assets/syntax/makefile.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="lineComment" VALUE="#" />
-	</PROPS>
-	<RULES IGNORE_CASE="FALSE" HIGHLIGHT_DIGITS="TRUE">
-		<!-- Comment -->
-		<EOL_SPAN TYPE="COMMENT1">#</EOL_SPAN>
-
-		<!-- Function calls -->
-		<SPAN_REGEXP TYPE="FUNCTION" HASH_CHAR="$" DELEGATE="MAIN">
-			<BEGIN>\$\([a-zA-Z][\w-]* </BEGIN>
-			<END>)</END>
-		</SPAN_REGEXP>
-
-		<!-- $(...) variables -->
-		<SPAN TYPE="KEYWORD2" NO_LINE_BREAK="TRUE" DELEGATE="VARIABLE">
-			<BEGIN>$(</BEGIN>
-			<END>)</END>
-		</SPAN>
-		<SPAN TYPE="KEYWORD2" NO_LINE_BREAK="TRUE" DELEGATE="VARIABLE">
-			<BEGIN>${</BEGIN>
-			<END>}</END>
-		</SPAN>
-
-		<MARK_FOLLOWING TYPE="KEYWORD2">$</MARK_FOLLOWING>
-
-		<!-- Literals -->
-		<SPAN TYPE="LITERAL1" ESCAPE="\" NO_LINE_BREAK="TRUE">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-		<SPAN TYPE="LITERAL1" ESCAPE="\" NO_LINE_BREAK="TRUE">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-		<SPAN TYPE="LITERAL1" ESCAPE="\" NO_LINE_BREAK="TRUE">
-			<BEGIN>`</BEGIN>
-			<END>`</END>
-		</SPAN>
-
-		<SEQ TYPE="OPERATOR">=</SEQ>
-		<SEQ TYPE="OPERATOR">:=</SEQ>
-		<SEQ TYPE="OPERATOR">+=</SEQ>
-		<SEQ TYPE="OPERATOR">?=</SEQ>
-
-		<MARK_PREVIOUS TYPE="LABEL" AT_LINE_START="TRUE">:</MARK_PREVIOUS>
-
-		<KEYWORDS>
-			<KEYWORD1>subst</KEYWORD1>
-			<KEYWORD1>addprefix</KEYWORD1>
-			<KEYWORD1>addsuffix</KEYWORD1>
-			<KEYWORD1>basename</KEYWORD1>
-			<KEYWORD1>dir</KEYWORD1>
-			<KEYWORD1>filter</KEYWORD1>
-			<KEYWORD1>filter-out</KEYWORD1>
-			<KEYWORD1>findstring</KEYWORD1>
-			<KEYWORD1>firstword</KEYWORD1>
-			<KEYWORD1>foreach</KEYWORD1>
-			<KEYWORD1>join</KEYWORD1>
-			<KEYWORD1>notdir</KEYWORD1>
-			<KEYWORD1>origin</KEYWORD1>
-			<KEYWORD1>patsubst</KEYWORD1>
-			<KEYWORD1>shell</KEYWORD1>
-			<KEYWORD1>sort</KEYWORD1>
-			<KEYWORD1>strip</KEYWORD1>
-			<KEYWORD1>suffix</KEYWORD1>
-			<KEYWORD1>wildcard</KEYWORD1>
-			<KEYWORD1>word</KEYWORD1>
-			<KEYWORD1>words</KEYWORD1>
-			<KEYWORD1>ifeq</KEYWORD1>
-            <KEYWORD1>ifneq</KEYWORD1>
-            <KEYWORD1>else</KEYWORD1>
-            <KEYWORD1>endif</KEYWORD1>
-            <KEYWORD1>define</KEYWORD1>
-            <KEYWORD1>endef</KEYWORD1>
-            <KEYWORD1>ifdef</KEYWORD1>
-            <KEYWORD1>ifndef</KEYWORD1>
-		</KEYWORDS>
-
-	</RULES>
-
-	<RULES SET="VARIABLE" ESCAPE="\" IGNORE_CASE="FALSE"
-		DEFAULT="KEYWORD2">
-		<!-- Comment -->
-		<EOL_SPAN TYPE="COMMENT1">#</EOL_SPAN>
-
-		<!-- $(...) variables -->
-		<SPAN TYPE="KEYWORD2" NO_LINE_BREAK="TRUE" DELEGATE="VARIABLE">
-			<BEGIN>$(</BEGIN>
-			<END>)</END>
-		</SPAN>
-		<SPAN TYPE="KEYWORD2" NO_LINE_BREAK="TRUE" DELEGATE="VARIABLE">
-			<BEGIN>${</BEGIN>
-			<END>}</END>
-		</SPAN>
-	</RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/maple.xml b/qpython/src/main/assets/syntax/maple.xml
deleted file mode 100644
index 8925d1bc..00000000
--- a/qpython/src/main/assets/syntax/maple.xml
+++ /dev/null
@@ -1,735 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!-- Maple mode, by Jack Perry jeperry@eos.ncsu.edu -->
-<!-- Based on commands for Maple 7 -->
-
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="lineComment" VALUE="//" />
-	</PROPS>
-
-	<RULES IGNORE_CASE="FALSE" HIGHLIGHT_DIGITS="TRUE">
-		<!-- Standard literals -->
-		<SPAN TYPE="LITERAL1" ESCAPE="\" NO_LINE_BREAK="FALSE">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-		<SPAN TYPE="LITERAL1" ESCAPE="\" NO_LINE_BREAK="FALSE">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-		<SPAN TYPE="LITERAL1" ESCAPE="\" NO_LINE_BREAK="FALSE">
-			<BEGIN>`</BEGIN>
-			<END>`</END>
-		</SPAN>
-
-		<EOL_SPAN TYPE="COMMENT1">#</EOL_SPAN>
-
-		<SEQ TYPE="OPERATOR">+</SEQ>
-		<SEQ TYPE="OPERATOR">-</SEQ>
-		<SEQ TYPE="OPERATOR">*</SEQ>
-		<SEQ TYPE="OPERATOR">/</SEQ>
-		<SEQ TYPE="OPERATOR">^</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;=</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;=</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">=</SEQ>
-		<SEQ TYPE="OPERATOR">$</SEQ>
-		<SEQ TYPE="OPERATOR">@@</SEQ>
-		<SEQ TYPE="OPERATOR">@</SEQ>
-		<SEQ TYPE="OPERATOR">||</SEQ>
-		<SEQ TYPE="OPERATOR">:=</SEQ>
-		<SEQ TYPE="OPERATOR">::</SEQ>
-		<SEQ TYPE="OPERATOR">:-</SEQ>
-		<SEQ TYPE="OPERATOR">&amp;</SEQ>
-		<SEQ TYPE="OPERATOR">!</SEQ>
-
-		<KEYWORDS>
-			<!-- Reserved words -->
-			<KEYWORD1>and</KEYWORD1>
-			<KEYWORD1>or</KEYWORD1>
-			<KEYWORD1>xor</KEYWORD1>
-			<KEYWORD1>union</KEYWORD1>
-			<KEYWORD1>intersect</KEYWORD1>
-			<KEYWORD1>minus</KEYWORD1>
-			<KEYWORD1>mod</KEYWORD1>
-			<KEYWORD1>not</KEYWORD1>
-			<KEYWORD1>assuming</KEYWORD1>
-			<KEYWORD1>break</KEYWORD1>
-			<KEYWORD1>by</KEYWORD1>
-			<KEYWORD1>catch</KEYWORD1>
-			<KEYWORD1>description</KEYWORD1>
-			<KEYWORD1>do</KEYWORD1>
-			<KEYWORD1>done</KEYWORD1>
-			<KEYWORD1>elif</KEYWORD1>
-			<KEYWORD1>else</KEYWORD1>
-			<KEYWORD1>end</KEYWORD1>
-			<KEYWORD1>error</KEYWORD1>
-			<KEYWORD1>export</KEYWORD1>
-			<KEYWORD1>fi</KEYWORD1>
-			<KEYWORD1>finally</KEYWORD1>
-			<KEYWORD1>for</KEYWORD1>
-			<KEYWORD1>from</KEYWORD1>
-			<KEYWORD1>global</KEYWORD1>
-			<KEYWORD1>if</KEYWORD1>
-			<KEYWORD1>implies</KEYWORD1>
-			<KEYWORD1>in</KEYWORD1>
-			<KEYWORD1>local</KEYWORD1>
-			<KEYWORD1>module</KEYWORD1>
-			<KEYWORD1>next</KEYWORD1>
-			<KEYWORD1>od</KEYWORD1>
-			<KEYWORD1>option</KEYWORD1>
-			<KEYWORD1>options</KEYWORD1>
-			<KEYWORD1>proc</KEYWORD1>
-			<KEYWORD1>quit</KEYWORD1>
-			<KEYWORD1>read</KEYWORD1>
-			<KEYWORD1>return</KEYWORD1>
-			<KEYWORD1>save</KEYWORD1>
-			<KEYWORD1>stop</KEYWORD1>
-			<KEYWORD1>subset</KEYWORD1>
-			<KEYWORD1>then</KEYWORD1>
-			<KEYWORD1>to</KEYWORD1>
-			<KEYWORD1>try</KEYWORD1>
-			<KEYWORD1>use</KEYWORD1>
-			<KEYWORD1>while</KEYWORD1>
-
-			<!-- Standard library functions -->
-			<FUNCTION>about</FUNCTION>
-			<FUNCTION>ans</FUNCTION>
-			<FUNCTION>add</FUNCTION>
-			<FUNCTION>addcoords</FUNCTION>
-			<FUNCTION>additionally</FUNCTION>
-			<FUNCTION>addproperty</FUNCTION>
-			<FUNCTION>addressof</FUNCTION>
-			<FUNCTION>AFactor</FUNCTION>
-			<FUNCTION>AFactors</FUNCTION>
-			<FUNCTION>AIrreduc</FUNCTION>
-			<FUNCTION>AiryAi</FUNCTION>
-			<FUNCTION>AiryAiZeros</FUNCTION>
-			<FUNCTION>AiryBi</FUNCTION>
-			<FUNCTION>AiryBiZeros</FUNCTION>
-			<FUNCTION>algebraic</FUNCTION>
-			<FUNCTION>algsubs</FUNCTION>
-			<FUNCTION>alias</FUNCTION>
-			<FUNCTION>allvalues</FUNCTION>
-			<FUNCTION>anames</FUNCTION>
-			<FUNCTION>AngerJ</FUNCTION>
-			<FUNCTION>antihermitian</FUNCTION>
-			<FUNCTION>antisymm</FUNCTION>
-			<FUNCTION>apply</FUNCTION>
-			<FUNCTION>applyop</FUNCTION>
-			<FUNCTION>applyrule</FUNCTION>
-			<FUNCTION>arccos</FUNCTION>
-			<FUNCTION>arccosh</FUNCTION>
-			<FUNCTION>arccot</FUNCTION>
-			<FUNCTION>arccoth</FUNCTION>
-			<FUNCTION>arccsc</FUNCTION>
-			<FUNCTION>arccsch</FUNCTION>
-			<FUNCTION>arcsec</FUNCTION>
-			<FUNCTION>arcsech</FUNCTION>
-			<FUNCTION>arcsin</FUNCTION>
-			<FUNCTION>arcsinh</FUNCTION>
-			<FUNCTION>arctan</FUNCTION>
-			<FUNCTION>arctanh</FUNCTION>
-			<FUNCTION>argument</FUNCTION>
-			<FUNCTION>Array</FUNCTION>
-			<FUNCTION>array</FUNCTION>
-			<FUNCTION>ArrayDims</FUNCTION>
-			<FUNCTION>ArrayElems</FUNCTION>
-			<FUNCTION>ArrayIndFns</FUNCTION>
-			<FUNCTION>ArrayOptions</FUNCTION>
-			<FUNCTION>assign</FUNCTION>
-			<FUNCTION>assigned</FUNCTION>
-			<FUNCTION>asspar</FUNCTION>
-			<FUNCTION>assume</FUNCTION>
-			<FUNCTION>asympt</FUNCTION>
-			<FUNCTION>attributes</FUNCTION>
-			<FUNCTION>band</FUNCTION>
-			<FUNCTION>Berlekamp</FUNCTION>
-			<FUNCTION>bernoulli</FUNCTION>
-			<FUNCTION>bernstein</FUNCTION>
-			<FUNCTION>BesselI</FUNCTION>
-			<FUNCTION>BesselJ</FUNCTION>
-			<FUNCTION>BesselJZeros</FUNCTION>
-			<FUNCTION>BesselK</FUNCTION>
-			<FUNCTION>BesselY</FUNCTION>
-			<FUNCTION>BesselYZeros</FUNCTION>
-			<FUNCTION>Beta</FUNCTION>
-			<FUNCTION>branches</FUNCTION>
-			<FUNCTION>C</FUNCTION>
-			<FUNCTION>cat</FUNCTION>
-			<FUNCTION>ceil</FUNCTION>
-			<FUNCTION>changecoords</FUNCTION>
-			<FUNCTION>charfcn</FUNCTION>
-			<FUNCTION>ChebyshevT</FUNCTION>
-			<FUNCTION>ChebyShevU</FUNCTION>
-			<FUNCTION>CheckArgs</FUNCTION>
-			<FUNCTION>Chi</FUNCTION>
-			<FUNCTION>chrem</FUNCTION>
-			<FUNCTION>Ci</FUNCTION>
-			<FUNCTION>close</FUNCTION>
-			<FUNCTION>coeff</FUNCTION>
-			<FUNCTION>coeffs</FUNCTION>
-			<FUNCTION>coeftayl</FUNCTION>
-			<FUNCTION>collect</FUNCTION>
-			<FUNCTION>combine</FUNCTION>
-			<FUNCTION>comparray</FUNCTION>
-			<FUNCTION>compiletable</FUNCTION>
-			<FUNCTION>compoly</FUNCTION>
-			<FUNCTION>CompSeq</FUNCTION>
-			<FUNCTION>conjugate</FUNCTION>
-			<FUNCTION>constant</FUNCTION>
-			<FUNCTION>Content</FUNCTION>
-			<FUNCTION>content</FUNCTION>
-			<FUNCTION>convergs</FUNCTION>
-			<FUNCTION>convert</FUNCTION>
-			<FUNCTION>coords</FUNCTION>
-			<FUNCTION>copy</FUNCTION>
-			<FUNCTION>CopySign</FUNCTION>
-			<FUNCTION>cos</FUNCTION>
-			<FUNCTION>cosh</FUNCTION>
-			<FUNCTION>cot</FUNCTION>
-			<FUNCTION>coth</FUNCTION>
-			<FUNCTION>coulditbe</FUNCTION>
-			<FUNCTION>csc</FUNCTION>
-			<FUNCTION>csch</FUNCTION>
-			<FUNCTION>csgn</FUNCTION>
-			<FUNCTION>currentdir</FUNCTION>
-			<FUNCTION>curry</FUNCTION>
-			<FUNCTION>CylinderD</FUNCTION>
-			<FUNCTION>CylinderU</FUNCTION>
-			<FUNCTION>CylinderV</FUNCTION>
-			<FUNCTION>D</FUNCTION>
-			<FUNCTION>dawson</FUNCTION>
-			<FUNCTION>Default0</FUNCTION>
-			<FUNCTION>DefaultOverflow</FUNCTION>
-			<FUNCTION>DefaultUnderflow</FUNCTION>
-			<FUNCTION>define</FUNCTION>
-			<FUNCTION>define_external</FUNCTION>
-			<FUNCTION>degree</FUNCTION>
-			<FUNCTION>denom</FUNCTION>
-			<FUNCTION>depends</FUNCTION>
-			<FUNCTION>DESol</FUNCTION>
-			<FUNCTION>Det</FUNCTION>
-			<FUNCTION>diagon</FUNCTION>
-			<FUNCTION>Diff</FUNCTION>
-			<FUNCTION>diff</FUNCTION>
-			<FUNCTION>diffop</FUNCTION>
-			<FUNCTION>Digits</FUNCTION>
-			<FUNCTION>dilog</FUNCTION>
-			<FUNCTION>dinterp</FUNCTION>
-			<FUNCTION>Dirac</FUNCTION>
-			<FUNCTION>disassemble</FUNCTION>
-			<FUNCTION>discont</FUNCTION>
-			<FUNCTION>discrim</FUNCTION>
-			<FUNCTION>dismantle</FUNCTION>
-			<FUNCTION>DistDeg</FUNCTION>
-			<FUNCTION>Divide</FUNCTION>
-			<FUNCTION>divide</FUNCTION>
-			<FUNCTION>dsolve</FUNCTION>
-			<FUNCTION>efficiency</FUNCTION>
-			<FUNCTION>Ei</FUNCTION>
-			<FUNCTION>Eigenvals</FUNCTION>
-			<FUNCTION>eliminate</FUNCTION>
-			<FUNCTION>ellipsoid</FUNCTION>
-			<FUNCTION>EllipticCE</FUNCTION>
-			<FUNCTION>EllipticCK</FUNCTION>
-			<FUNCTION>EllipticCPi</FUNCTION>
-			<FUNCTION>EllipticE</FUNCTION>
-			<FUNCTION>EllipticF</FUNCTION>
-			<FUNCTION>EllipticK</FUNCTION>
-			<FUNCTION>EllipticModulus</FUNCTION>
-			<FUNCTION>EllipticNome</FUNCTION>
-			<FUNCTION>EllipticPi</FUNCTION>
-			<FUNCTION>elliptic_int</FUNCTION>
-			<FUNCTION>entries</FUNCTION>
-			<FUNCTION>erf</FUNCTION>
-			<FUNCTION>erfc</FUNCTION>
-			<FUNCTION>erfi</FUNCTION>
-			<FUNCTION>euler</FUNCTION>
-			<FUNCTION>eulermac</FUNCTION>
-			<FUNCTION>Eval</FUNCTION>
-			<FUNCTION>eval</FUNCTION>
-			<FUNCTION>evala</FUNCTION>
-			<FUNCTION>evalapply</FUNCTION>
-			<FUNCTION>evalb</FUNCTION>
-			<FUNCTION>evalc</FUNCTION>
-			<FUNCTION>evalf</FUNCTION>
-			<FUNCTION>evalfint</FUNCTION>
-			<FUNCTION>evalhf</FUNCTION>
-			<FUNCTION>evalm</FUNCTION>
-			<FUNCTION>evaln</FUNCTION>
-			<FUNCTION>evalr</FUNCTION>
-			<FUNCTION>evalrC</FUNCTION>
-			<FUNCTION>events</FUNCTION>
-			<FUNCTION>Excel</FUNCTION>
-			<FUNCTION>exists</FUNCTION>
-			<FUNCTION>exp</FUNCTION>
-			<FUNCTION>Expand</FUNCTION>
-			<FUNCTION>expand</FUNCTION>
-			<FUNCTION>expandoff</FUNCTION>
-			<FUNCTION>expandon</FUNCTION>
-			<FUNCTION>exports</FUNCTION>
-			<FUNCTION>extract</FUNCTION>
-			<FUNCTION>extrema</FUNCTION>
-			<FUNCTION>Factor</FUNCTION>
-			<FUNCTION>factor</FUNCTION>
-			<FUNCTION>Factors</FUNCTION>
-			<FUNCTION>factors</FUNCTION>
-			<FUNCTION>fclose</FUNCTION>
-			<FUNCTION>fdiscont</FUNCTION>
-			<FUNCTION>feof</FUNCTION>
-			<FUNCTION>fflush</FUNCTION>
-			<FUNCTION>FFT</FUNCTION>
-			<FUNCTION>filepos</FUNCTION>
-			<FUNCTION>fixdiv</FUNCTION>
-			<FUNCTION>float</FUNCTION>
-			<FUNCTION>floor</FUNCTION>
-			<FUNCTION>fnormal</FUNCTION>
-			<FUNCTION>fold</FUNCTION>
-			<FUNCTION>fopen</FUNCTION>
-			<FUNCTION>forall</FUNCTION>
-			<FUNCTION>forget</FUNCTION>
-			<FUNCTION>fprintf</FUNCTION>
-			<FUNCTION>frac</FUNCTION>
-			<FUNCTION>freeze</FUNCTION>
-			<FUNCTION>frem</FUNCTION>
-			<FUNCTION>fremove</FUNCTION>
-			<FUNCTION>FresnelC</FUNCTION>
-			<FUNCTION>Fresnelf</FUNCTION>
-			<FUNCTION>Fresnelg</FUNCTION>
-			<FUNCTION>FresnelS</FUNCTION>
-			<FUNCTION>FromInert</FUNCTION>
-			<FUNCTION>frontend</FUNCTION>
-			<FUNCTION>fscanf</FUNCTION>
-			<FUNCTION>fsolve</FUNCTION>
-			<FUNCTION>galois</FUNCTION>
-			<FUNCTION>GAMMA</FUNCTION>
-			<FUNCTION>GaussAGM</FUNCTION>
-			<FUNCTION>Gausselim</FUNCTION>
-			<FUNCTION>Gaussjord</FUNCTION>
-			<FUNCTION>gc</FUNCTION>
-			<FUNCTION>Gcd</FUNCTION>
-			<FUNCTION>gcd</FUNCTION>
-			<FUNCTION>Gcdex</FUNCTION>
-			<FUNCTION>gcdex</FUNCTION>
-			<FUNCTION>GegenbauerC</FUNCTION>
-			<FUNCTION>genpoly</FUNCTION>
-			<FUNCTION>getenv</FUNCTION>
-			<FUNCTION>GetResultDataType</FUNCTION>
-			<FUNCTION>GetResultShape</FUNCTION>
-			<FUNCTION>GF</FUNCTION>
-			<FUNCTION>Greek</FUNCTION>
-			<FUNCTION>HankelH1</FUNCTION>
-			<FUNCTION>HankelH2</FUNCTION>
-			<FUNCTION>harmonic</FUNCTION>
-			<FUNCTION>has</FUNCTION>
-			<FUNCTION>hasfun</FUNCTION>
-			<FUNCTION>hasoption</FUNCTION>
-			<FUNCTION>hastype</FUNCTION>
-			<FUNCTION>heap</FUNCTION>
-			<FUNCTION>Heaviside</FUNCTION>
-			<FUNCTION>Hermite</FUNCTION>
-			<FUNCTION>HermiteH</FUNCTION>
-			<FUNCTION>hermitian</FUNCTION>
-			<FUNCTION>Hessenberg</FUNCTION>
-			<FUNCTION>hfarray</FUNCTION>
-			<FUNCTION>history</FUNCTION>
-			<FUNCTION>hypergeom</FUNCTION>
-			<FUNCTION>icontent</FUNCTION>
-			<FUNCTION>identity</FUNCTION>
-			<FUNCTION>IEEEdiffs</FUNCTION>
-			<FUNCTION>ifactor</FUNCTION>
-			<FUNCTION>ifactors</FUNCTION>
-			<FUNCTION>iFFT</FUNCTION>
-			<FUNCTION>igcd</FUNCTION>
-			<FUNCTION>igcdex</FUNCTION>
-			<FUNCTION>ilcm</FUNCTION>
-			<FUNCTION>ilog10</FUNCTION>
-			<FUNCTION>ilog2</FUNCTION>
-			<FUNCTION>ilog</FUNCTION>
-			<FUNCTION>Im</FUNCTION>
-			<FUNCTION>implicitdiff</FUNCTION>
-			<FUNCTION>ImportMatrix</FUNCTION>
-			<FUNCTION>ImportVector</FUNCTION>
-			<FUNCTION>indets</FUNCTION>
-			<FUNCTION>index</FUNCTION>
-			<FUNCTION>indexed</FUNCTION>
-			<FUNCTION>indices</FUNCTION>
-			<FUNCTION>inifcn</FUNCTION>
-			<FUNCTION>ininame</FUNCTION>
-			<FUNCTION>initialcondition</FUNCTION>
-			<FUNCTION>initialize</FUNCTION>
-			<FUNCTION>insert</FUNCTION>
-			<FUNCTION>int</FUNCTION>
-			<FUNCTION>intat</FUNCTION>
-			<FUNCTION>interface</FUNCTION>
-			<FUNCTION>Interp</FUNCTION>
-			<FUNCTION>interp</FUNCTION>
-			<FUNCTION>Inverse</FUNCTION>
-			<FUNCTION>invfunc</FUNCTION>
-			<FUNCTION>invztrans</FUNCTION>
-			<FUNCTION>iostatus</FUNCTION>
-			<FUNCTION>iperfpow</FUNCTION>
-			<FUNCTION>iquo</FUNCTION>
-			<FUNCTION>iratrecon</FUNCTION>
-			<FUNCTION>irem</FUNCTION>
-			<FUNCTION>iroot</FUNCTION>
-			<FUNCTION>Irreduc</FUNCTION>
-			<FUNCTION>irreduc</FUNCTION>
-			<FUNCTION>is</FUNCTION>
-			<FUNCTION>iscont</FUNCTION>
-			<FUNCTION>isdifferential</FUNCTION>
-			<FUNCTION>IsMatrixShape</FUNCTION>
-			<FUNCTION>isolate</FUNCTION>
-			<FUNCTION>isolve</FUNCTION>
-			<FUNCTION>ispoly</FUNCTION>
-			<FUNCTION>isprime</FUNCTION>
-			<FUNCTION>isqrfree</FUNCTION>
-			<FUNCTION>isqrt</FUNCTION>
-			<FUNCTION>issqr</FUNCTION>
-			<FUNCTION>ithprime</FUNCTION>
-			<FUNCTION>JacobiAM</FUNCTION>
-			<FUNCTION>JacobiCD</FUNCTION>
-			<FUNCTION>JacobiCN</FUNCTION>
-			<FUNCTION>JacobiCS</FUNCTION>
-			<FUNCTION>JacobiDC</FUNCTION>
-			<FUNCTION>JacobiDN</FUNCTION>
-			<FUNCTION>JacobiDS</FUNCTION>
-			<FUNCTION>JacobiNC</FUNCTION>
-			<FUNCTION>JacobiND</FUNCTION>
-			<FUNCTION>JacobiNS</FUNCTION>
-			<FUNCTION>JacobiP</FUNCTION>
-			<FUNCTION>JacobiSC</FUNCTION>
-			<FUNCTION>JacobiSD</FUNCTION>
-			<FUNCTION>JacobiSN</FUNCTION>
-			<FUNCTION>JacobiTheta1</FUNCTION>
-			<FUNCTION>JacobiTheta2</FUNCTION>
-			<FUNCTION>JacobiTheta3</FUNCTION>
-			<FUNCTION>JacobiTheta4</FUNCTION>
-			<FUNCTION>JacobiZeta</FUNCTION>
-			<FUNCTION>KelvinBei</FUNCTION>
-			<FUNCTION>KelvinBer</FUNCTION>
-			<FUNCTION>KelvinHei</FUNCTION>
-			<FUNCTION>KelvinHer</FUNCTION>
-			<FUNCTION>KelvinKei</FUNCTION>
-			<FUNCTION>KelvinKer</FUNCTION>
-			<FUNCTION>KummerM</FUNCTION>
-			<FUNCTION>KummerU</FUNCTION>
-			<FUNCTION>LaguerreL</FUNCTION>
-			<FUNCTION>LambertW</FUNCTION>
-			<FUNCTION>latex</FUNCTION>
-			<FUNCTION>lattice</FUNCTION>
-			<FUNCTION>lcm</FUNCTION>
-			<FUNCTION>Lcm</FUNCTION>
-			<FUNCTION>lcoeff</FUNCTION>
-			<FUNCTION>leadterm</FUNCTION>
-			<FUNCTION>LegendreP</FUNCTION>
-			<FUNCTION>LegendreQ</FUNCTION>
-			<FUNCTION>length</FUNCTION>
-			<FUNCTION>LerchPhi</FUNCTION>
-			<FUNCTION>lexorder</FUNCTION>
-			<FUNCTION>lhs</FUNCTION>
-			<FUNCTION>CLi</FUNCTION>
-			<FUNCTION>Limit</FUNCTION>
-			<FUNCTION>limit</FUNCTION>
-			<FUNCTION>Linsolve</FUNCTION>
-			<FUNCTION>ln</FUNCTION>
-			<FUNCTION>lnGAMMA</FUNCTION>
-			<FUNCTION>log</FUNCTION>
-			<FUNCTION>log10</FUNCTION>
-			<FUNCTION>LommelS1</FUNCTION>
-			<FUNCTION>Lommels2</FUNCTION>
-			<FUNCTION>lprint</FUNCTION>
-			<FUNCTION>map</FUNCTION>
-			<FUNCTION>map2</FUNCTION>
-			<FUNCTION>Maple_floats</FUNCTION>
-			<FUNCTION>match</FUNCTION>
-			<FUNCTION>MatlabMatrix</FUNCTION>
-			<FUNCTION>Matrix</FUNCTION>
-			<FUNCTION>matrix</FUNCTION>
-			<FUNCTION>MatrixOptions</FUNCTION>
-			<FUNCTION>max</FUNCTION>
-			<FUNCTION>maximize</FUNCTION>
-			<FUNCTION>maxnorm</FUNCTION>
-			<FUNCTION>maxorder</FUNCTION>
-			<FUNCTION>MeijerG</FUNCTION>
-			<FUNCTION>member</FUNCTION>
-			<FUNCTION>min</FUNCTION>
-			<FUNCTION>minimize</FUNCTION>
-			<FUNCTION>mkdir</FUNCTION>
-			<FUNCTION>ModifiedMeijerG</FUNCTION>
-			<FUNCTION>modp</FUNCTION>
-			<FUNCTION>modp1</FUNCTION>
-			<FUNCTION>modp2</FUNCTION>
-			<FUNCTION>modpol</FUNCTION>
-			<FUNCTION>mods</FUNCTION>
-			<FUNCTION>module</FUNCTION>
-			<FUNCTION>MOLS</FUNCTION>
-			<FUNCTION>msolve</FUNCTION>
-			<FUNCTION>mtaylor</FUNCTION>
-			<FUNCTION>mul</FUNCTION>
-			<FUNCTION>NextAfter</FUNCTION>
-			<FUNCTION>nextprime</FUNCTION>
-			<FUNCTION>nops</FUNCTION>
-			<FUNCTION>norm</FUNCTION>
-			<FUNCTION>norm</FUNCTION>
-			<FUNCTION>Normal</FUNCTION>
-			<FUNCTION>normal</FUNCTION>
-			<FUNCTION>nprintf</FUNCTION>
-			<FUNCTION>Nullspace</FUNCTION>
-			<FUNCTION>numboccur</FUNCTION>
-			<FUNCTION>numer</FUNCTION>
-			<FUNCTION>NumericClass</FUNCTION>
-			<FUNCTION>NumericEvent</FUNCTION>
-			<FUNCTION>NumericEventHandler</FUNCTION>
-			<FUNCTION>NumericException</FUNCTION>
-			<FUNCTION>numerics</FUNCTION>
-			<FUNCTION>NumericStatus</FUNCTION>
-			<FUNCTION>odetest</FUNCTION>
-			<FUNCTION>op</FUNCTION>
-			<FUNCTION>open</FUNCTION>
-			<FUNCTION>order</FUNCTION>
-			<FUNCTION>OrderedNE</FUNCTION>
-			<FUNCTION>parse</FUNCTION>
-			<FUNCTION>patmatch</FUNCTION>
-			<FUNCTION>pclose</FUNCTION>
-			<FUNCTION>PDEplot_options</FUNCTION>
-			<FUNCTION>pdesolve</FUNCTION>
-			<FUNCTION>pdetest</FUNCTION>
-			<FUNCTION>pdsolve</FUNCTION>
-			<FUNCTION>piecewise</FUNCTION>
-			<FUNCTION>plot</FUNCTION>
-			<FUNCTION>plot3d</FUNCTION>
-			<FUNCTION>plotsetup</FUNCTION>
-			<FUNCTION>pochhammer</FUNCTION>
-			<FUNCTION>pointto</FUNCTION>
-			<FUNCTION>poisson</FUNCTION>
-			<FUNCTION>polar</FUNCTION>
-			<FUNCTION>polylog</FUNCTION>
-			<FUNCTION>polynom</FUNCTION>
-			<FUNCTION>Power</FUNCTION>
-			<FUNCTION>Powmod</FUNCTION>
-			<FUNCTION>powmod</FUNCTION>
-			<FUNCTION>Prem</FUNCTION>
-			<FUNCTION>prem</FUNCTION>
-			<FUNCTION>Preprocessor</FUNCTION>
-			<FUNCTION>prevprime</FUNCTION>
-			<FUNCTION>Primitive</FUNCTION>
-			<FUNCTION>Primpart</FUNCTION>
-			<FUNCTION>primpart</FUNCTION>
-			<FUNCTION>print</FUNCTION>
-			<FUNCTION>printf</FUNCTION>
-			<FUNCTION>ProbSplit</FUNCTION>
-			<FUNCTION>procbody</FUNCTION>
-			<FUNCTION>ProcessOptions</FUNCTION>
-			<FUNCTION>procmake</FUNCTION>
-			<FUNCTION>Product</FUNCTION>
-			<FUNCTION>product</FUNCTION>
-			<FUNCTION>proot</FUNCTION>
-			<FUNCTION>property</FUNCTION>
-			<FUNCTION>protect</FUNCTION>
-			<FUNCTION>Psi</FUNCTION>
-			<FUNCTION>psqrt</FUNCTION>
-			<FUNCTION>queue</FUNCTION>
-			<FUNCTION>Quo</FUNCTION>
-			<FUNCTION>quo</FUNCTION>
-			<FUNCTION>radfield</FUNCTION>
-			<FUNCTION>radnormal</FUNCTION>
-			<FUNCTION>radsimp</FUNCTION>
-			<FUNCTION>rand</FUNCTION>
-			<FUNCTION>randomize</FUNCTION>
-			<FUNCTION>Randpoly</FUNCTION>
-			<FUNCTION>randpoly</FUNCTION>
-			<FUNCTION>Randprime</FUNCTION>
-			<FUNCTION>range</FUNCTION>
-			<FUNCTION>ratinterp</FUNCTION>
-			<FUNCTION>rationalize</FUNCTION>
-			<FUNCTION>Ratrecon</FUNCTION>
-			<FUNCTION>ratrecon</FUNCTION>
-			<FUNCTION>Re</FUNCTION>
-			<FUNCTION>readbytes</FUNCTION>
-			<FUNCTION>readdata</FUNCTION>
-			<FUNCTION>readlib</FUNCTION>
-			<FUNCTION>readline</FUNCTION>
-			<FUNCTION>readstat</FUNCTION>
-			<FUNCTION>realroot</FUNCTION>
-			<FUNCTION>Record</FUNCTION>
-			<FUNCTION>Reduce</FUNCTION>
-			<FUNCTION>references</FUNCTION>
-			<FUNCTION>release</FUNCTION>
-			<FUNCTION>Rem</FUNCTION>
-			<FUNCTION>rem</FUNCTION>
-			<FUNCTION>remove</FUNCTION>
-			<FUNCTION>repository</FUNCTION>
-			<FUNCTION>requires</FUNCTION>
-			<FUNCTION>residue</FUNCTION>
-			<FUNCTION>RESol</FUNCTION>
-			<FUNCTION>Resultant</FUNCTION>
-			<FUNCTION>resultant</FUNCTION>
-			<FUNCTION>rhs</FUNCTION>
-			<FUNCTION>rmdir</FUNCTION>
-			<FUNCTION>root</FUNCTION>
-			<FUNCTION>rootbound</FUNCTION>
-			<FUNCTION>RootOf</FUNCTION>
-			<FUNCTION>Roots</FUNCTION>
-			<FUNCTION>roots</FUNCTION>
-			<FUNCTION>round</FUNCTION>
-			<FUNCTION>Rounding</FUNCTION>
-			<FUNCTION>rsolve</FUNCTION>
-			<FUNCTION>rtable</FUNCTION>
-			<FUNCTION>rtable_algebra</FUNCTION>
-			<FUNCTION>rtable_dims</FUNCTION>
-			<FUNCTION>rtable_elems</FUNCTION>
-			<FUNCTION>rtable_indfns</FUNCTION>
-			<FUNCTION>rtable_options</FUNCTION>
-			<FUNCTION>rtable_printf</FUNCTION>
-			<FUNCTION>rtable_scanf</FUNCTION>
-			<FUNCTION>SampleRTable</FUNCTION>
-			<FUNCTION>savelib</FUNCTION>
-			<FUNCTION>Scale10</FUNCTION>
-			<FUNCTION>Scale2</FUNCTION>
-			<FUNCTION>scalar</FUNCTION>
-			<FUNCTION>scan</FUNCTION>
-			<FUNCTION>scanf</FUNCTION>
-			<FUNCTION>SearchText</FUNCTION>
-			<FUNCTION>searchtext</FUNCTION>
-			<FUNCTION>sec</FUNCTION>
-			<FUNCTION>sech</FUNCTION>
-			<FUNCTION>select</FUNCTION>
-			<FUNCTION>selectfun</FUNCTION>
-			<FUNCTION>selectremove</FUNCTION>
-			<FUNCTION>seq</FUNCTION>
-			<FUNCTION>series</FUNCTION>
-			<FUNCTION>setattribute</FUNCTION>
-			<FUNCTION>SFloatExponent</FUNCTION>
-			<FUNCTION>SFloatMantissa</FUNCTION>
-			<FUNCTION>shale</FUNCTION>
-			<FUNCTION>Shi</FUNCTION>
-			<FUNCTION>showprofile</FUNCTION>
-			<FUNCTION>showtime</FUNCTION>
-			<FUNCTION>Si</FUNCTION>
-			<FUNCTION>sign</FUNCTION>
-			<FUNCTION>signum</FUNCTION>
-			<FUNCTION>Simplify</FUNCTION>
-			<FUNCTION>simplify</FUNCTION>
-			<FUNCTION>sin</FUNCTION>
-			<FUNCTION>sinh</FUNCTION>
-			<FUNCTION>singular</FUNCTION>
-			<FUNCTION>sinterp</FUNCTION>
-			<FUNCTION>smartplot3d</FUNCTION>
-			<FUNCTION>Smith</FUNCTION>
-			<FUNCTION>solve</FUNCTION>
-			<FUNCTION>solvefor</FUNCTION>
-			<FUNCTION>sort</FUNCTION>
-			<FUNCTION>sparse</FUNCTION>
-			<FUNCTION>spec_eval_rule</FUNCTION>
-			<FUNCTION>spline</FUNCTION>
-			<FUNCTION>spreadsheet</FUNCTION>
-			<FUNCTION>SPrem</FUNCTION>
-			<FUNCTION>sprem</FUNCTION>
-			<FUNCTION>sprintf</FUNCTION>
-			<FUNCTION>Sqrfree</FUNCTION>
-			<FUNCTION>sqrfree</FUNCTION>
-			<FUNCTION>sqrt</FUNCTION>
-			<FUNCTION>sscanf</FUNCTION>
-			<FUNCTION>Ssi</FUNCTION>
-			<FUNCTION>ssystem</FUNCTION>
-			<FUNCTION>storage</FUNCTION>
-			<FUNCTION>string</FUNCTION>
-			<FUNCTION>StruveH</FUNCTION>
-			<FUNCTION>StruveL</FUNCTION>
-			<FUNCTION>sturm</FUNCTION>
-			<FUNCTION>sturmseq</FUNCTION>
-			<FUNCTION>subs</FUNCTION>
-			<FUNCTION>subsindets</FUNCTION>
-			<FUNCTION>subsop</FUNCTION>
-			<FUNCTION>substring</FUNCTION>
-			<FUNCTION>subtype</FUNCTION>
-			<FUNCTION>Sum</FUNCTION>
-			<FUNCTION>sum</FUNCTION>
-			<FUNCTION>surd</FUNCTION>
-			<FUNCTION>Svd</FUNCTION>
-			<FUNCTION>symmdiff</FUNCTION>
-			<FUNCTION>symmetric</FUNCTION>
-			<FUNCTION>syntax</FUNCTION>
-			<FUNCTION>system</FUNCTION>
-			<FUNCTION>table</FUNCTION>
-			<FUNCTION>tan</FUNCTION>
-			<FUNCTION>tang</FUNCTION>
-			<FUNCTION>taylor</FUNCTION>
-			<FUNCTION>testeq</FUNCTION>
-			<FUNCTION>testfloat</FUNCTION>
-			<FUNCTION>TEXT</FUNCTION>
-			<FUNCTION>thaw</FUNCTION>
-			<FUNCTION>thiele</FUNCTION>
-			<FUNCTION>time</FUNCTION>
-			<FUNCTION>timelimit</FUNCTION>
-			<FUNCTION>ToInert</FUNCTION>
-			<FUNCTION>TopologicalSort</FUNCTION>
-			<FUNCTION>traperror</FUNCTION>
-			<FUNCTION>triangular</FUNCTION>
-			<FUNCTION>trigsubs</FUNCTION>
-			<FUNCTION>trunc</FUNCTION>
-			<FUNCTION>type</FUNCTION>
-			<FUNCTION>typematch</FUNCTION>
-			<FUNCTION>unames</FUNCTION>
-			<FUNCTION>unapply</FUNCTION>
-			<FUNCTION>unassign</FUNCTION>
-			<FUNCTION>undefined</FUNCTION>
-			<FUNCTION>unit</FUNCTION>
-			<FUNCTION>Unordered</FUNCTION>
-			<FUNCTION>unprotect</FUNCTION>
-			<FUNCTION>update</FUNCTION>
-			<FUNCTION>UseHardwareFloats</FUNCTION>
-			<FUNCTION>userinfo</FUNCTION>
-			<FUNCTION>value</FUNCTION>
-			<FUNCTION>Vector</FUNCTION>
-			<FUNCTION>vector</FUNCTION>
-			<FUNCTION>verify</FUNCTION>
-			<FUNCTION>WeierstrassP</FUNCTION>
-			<FUNCTION>WeberE</FUNCTION>
-			<FUNCTION>WeierstrassPPrime</FUNCTION>
-			<FUNCTION>WeierstrassSigma</FUNCTION>
-			<FUNCTION>WeierstrassZeta</FUNCTION>
-			<FUNCTION>whattype</FUNCTION>
-			<FUNCTION>WhittakerM</FUNCTION>
-			<FUNCTION>WhittakerW</FUNCTION>
-			<FUNCTION>with</FUNCTION>
-			<FUNCTION>worksheet</FUNCTION>
-			<FUNCTION>writebytes</FUNCTION>
-			<FUNCTION>writedata</FUNCTION>
-			<FUNCTION>writeline</FUNCTION>
-			<FUNCTION>writestat</FUNCTION>
-			<FUNCTION>writeto</FUNCTION>
-			<FUNCTION>zero</FUNCTION>
-			<FUNCTION>Zeta</FUNCTION>
-			<FUNCTION>zip</FUNCTION>
-			<FUNCTION>ztrans</FUNCTION>
-
-			<!-- Initially known names -->
-			<LITERAL2>Catalan</LITERAL2>
-			<LITERAL2>constants</LITERAL2>
-			<LITERAL2>Digits</LITERAL2>
-			<LITERAL2>FAIL</LITERAL2>
-			<LITERAL2>false</LITERAL2>
-			<LITERAL2>gamma</LITERAL2>
-			<LITERAL2>I</LITERAL2>
-			<LITERAL2>infinity</LITERAL2>
-			<LITERAL2>integrate</LITERAL2>
-			<LITERAL2>lasterror</LITERAL2>
-			<LITERAL2>libname</LITERAL2>
-			<LITERAL2>`mod`</LITERAL2>
-			<LITERAL2>NULL</LITERAL2>
-			<LITERAL2>Order</LITERAL2>
-			<LITERAL2>Pi</LITERAL2>
-			<LITERAL2>printlevel</LITERAL2>
-			<LITERAL2>true</LITERAL2>
-			<LITERAL2>undefined</LITERAL2>
-		</KEYWORDS>
-	</RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/markdown.xml b/qpython/src/main/assets/syntax/markdown.xml
deleted file mode 100644
index 4826a970..00000000
--- a/qpython/src/main/assets/syntax/markdown.xml
+++ /dev/null
@@ -1,232 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE MODE SYSTEM "xmode.dtd"><!--
-
-  Markdown mode for jEdit by Peter Lynch (http://peterlynch.ca)
-  Original inspiration drawn from Ali Rantakari's jEdit mode at http://hasseg.org
-  Markdown home: http://daringfireball.net/projects/markdown/
-
-  Suggested Habits and limitations for using this syntax
-  * first rule - avoid being 'lazy' as defined in the spec. This means not indenting lines 2 - n in unordered lists and
-    similar laziness. Not being lazy gives you better syntax highlighting.
-  * prefix all blockquote lines with 'greater than' char, avoid being lazy, since jedit mode regexp
-    can't cross lines
-  * try to keep code blocks 4 spaces single tab deep only
-  * add an extra space for inline links or image links that are in a paragraph and happen to wrap to
-    start on the beginning of a line. A leading space should turn coloring on for those links
-  * brackets '[' or ']' appearing in paragraphs that are not part of a link definition should have the leding bracket escaped
-    to prevent this mode thinking you are starting a link reference
-  * block level html in a blockquote will still be parsed for markdown syntax, even though the spec says
-    markdown is not parsed for in block level html
-  * determining the difference between a code block and list paragraph indented 4 spaces(or tab) is impossible
-    so to help identify code blocks any paragraph indented four spaces is treated as such
-  * tabs are assumed to be taken as four spaces.
-  * link label definitions should start at the beginning of a line and NOT up to 3 spaces leading as allowed by the spec
-
--->
-<MODE>
-  <PROPS>
-    <PROPERTY NAME="tabSize" VALUE="4" />
-    <PROPERTY NAME="indentSize" VALUE="4" />
-    <PROPERTY NAME="maxLineLen" VALUE="120" />
-    <PROPERTY NAME="commentStart" VALUE="&lt;!--" />
-    <PROPERTY NAME="commentEnd" VALUE="--&gt;" />
-  </PROPS>
-
-  <!-- ================ MAIN ================================= -->
-  <RULES IGNORE_CASE="TRUE">
-
-    <!-- HANDLE BLOCK LEVEL HTML ELEMENTS -->
-    <!-- SGML comment -->
-    <SPAN TYPE="COMMENT1">
-      <BEGIN>&lt;!--</BEGIN>
-      <END>--&gt;</END>
-    </SPAN>
-    <!-- JavaScript -->
-    <SPAN AT_LINE_START="TRUE" TYPE="MARKUP" DELEGATE="html::JAVASCRIPT">
-      <BEGIN>&lt;script</BEGIN>
-      <END>&lt;/script&gt;</END>
-    </SPAN>
-    <!-- special hr case -->
-    <SEQ_REGEXP AT_LINE_START="TRUE" TYPE="MARKUP">&lt;hr\b([^&lt;&gt;])*?/?&gt;</SEQ_REGEXP>
-    <!-- block level html must be at the start of a line we isolate this because block
-    level html should not be parsed for markdown syntax -->
-    <SPAN_REGEXP HASH_CHAR="&lt;" AT_LINE_START="TRUE" TYPE="MARKUP" DELEGATE="BLOCK_HTML_TAGS">
-      <BEGIN>&lt;(p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|noscript|form|fieldset|iframe|math|ins|del)\b</BEGIN>
-      <END>&lt;/$1&gt;</END>
-    </SPAN_REGEXP>
-    <!-- ignore dangling less thans to allow for things like 4 < 5 -->
-    <SEQ TYPE="NULL"> &lt; </SEQ>
-    <!-- HANDLE OTHER INLINE HTML ELEMENTS -->
-    <SPAN TYPE="MARKUP" DELEGATE="INLINE_MARKUP">
-      <BEGIN>&lt;</BEGIN>
-      <END>&gt;</END>
-    </SPAN>
-    <!-- THE REST IS MARKDOWN -->
-    <IMPORT DELEGATE="MARKDOWN" />
-  </RULES>
-
-  <!-- ================ INLINE HTML ================================= -->
-  <RULES SET="INLINE_MARKUP" DEFAULT="MARKUP">
-    <IMPORT DELEGATE="html::TAGS" />
-  </RULES>
-
-  <!-- ================ BLOCK LEVEL HTML ================================= -->
-  <RULES SET="BLOCK_HTML_TAGS" DEFAULT="MARKUP">
-    <!-- any line indented less than 4 spaces is not valid markdown in block html -->
-    <EOL_SPAN_REGEXP AT_LINE_START="TRUE" TYPE="INVALID">[\S]+</EOL_SPAN_REGEXP>
-    <EOL_SPAN_REGEXP AT_LINE_START="TRUE" TYPE="INVALID"> {1,3}[\S]+</EOL_SPAN_REGEXP>
-    <EOL_SPAN_REGEXP AT_LINE_START="TRUE" DELEGATE="html::MAIN">( {4}|\t)</EOL_SPAN_REGEXP>
-    <SPAN TYPE="LITERAL1">
-      <BEGIN>"</BEGIN>
-      <END>"</END>
-    </SPAN>
-    <SPAN TYPE="LITERAL1">
-      <BEGIN>'</BEGIN>
-      <END>'</END>
-    </SPAN>
-    <SEQ TYPE="OPERATOR">=</SEQ>
-  </RULES>
-
-  <!-- ================ MARKDOWN ================================= -->
-  <RULES SET="MARKDOWN" IGNORE_CASE="FALSE">
-    <!-- blockquotes, also handles nested blockquote chars &#09; is tab -->
-    <EOL_SPAN_REGEXP HASH_CHARS=" &gt;" AT_LINE_START="TRUE" MATCH_TYPE="LITERAL3" DELEGATE="MARKDOWN_BLOCKQUOTE">[ \t]*(&gt;[ \t]{1})+</EOL_SPAN_REGEXP>
-    <!-- literal characters (i.e. cases where they won't specify formatting)  -->
-    <SEQ TYPE="NULL"> * </SEQ>
-    <SEQ TYPE="NULL"> _ </SEQ>
-    <SEQ TYPE="NULL">\][</SEQ>
-    <SEQ_REGEXP TYPE="NULL" HASH_CHAR="\">\\[\Q*_\`[](){}#+.!-\E]</SEQ_REGEXP>
-		<!-- GitHub-flavored code blocks -->
-		<SPAN TYPE="LITERAL2" AT_LINE_START="TRUE" DELEGATE="ruby::MAIN">
-		  <BEGIN>``` ruby</BEGIN>
-		  <END>```</END>
-		</SPAN>
-		<SPAN TYPE="LITERAL2" AT_LINE_START="TRUE">
-		  <BEGIN>```</BEGIN>
-		  <END>```</END>
-		</SPAN>
-    <!-- inline code: `NSString* str = @"hi!";` using backticks-->
-    <SPAN_REGEXP TYPE="LITERAL2" HASH_CHARS="`">
-      <BEGIN>(`{1,2})</BEGIN>
-      <END>$1</END>
-    </SPAN_REGEXP>
-    <!-- telling difference between code blocks and list paragraphs is impossible until regexp cross line boundaries -->
-    <EOL_SPAN_REGEXP TYPE="LITERAL2" AT_LINE_START="TRUE" HASH_CHARS=" &#09;">( {4,}|\t+)\S</EOL_SPAN_REGEXP>
-    <!-- <EOL_SPAN_REGEXP TYPE="LITERAL2" AT_LINE_START="TRUE" HASH_CHARS=" &#09;">( {4,}|\t+){2,}</EOL_SPAN_REGEXP> -->
-    <!-- headers (setext-style:) -->
-    <EOL_SPAN_REGEXP TYPE="KEYWORD1" AT_LINE_START="TRUE" HASH_CHARS="=-">[=-]+</EOL_SPAN_REGEXP>
-    <!-- headers (atx-style:) -->
-    <EOL_SPAN_REGEXP TYPE="KEYWORD1" AT_LINE_START="TRUE" HASH_CHAR="#">#{1,6}[ \t]*(.+?)</EOL_SPAN_REGEXP>
-    <!-- horizontal rules -->
-    <EOL_SPAN_REGEXP TYPE="KEYWORD1" HASH_CHARS="-*_ &#09;" AT_LINE_START="TRUE">[ ]{0,2}([ ]?[-_*][ ]?){3,}[ \t]*</EOL_SPAN_REGEXP>
-    <!-- lists (unordered) -->
-    <!-- <SEQ_REGEXP TYPE="KEYWORD2" AT_LINE_START="TRUE" HASH_CHARS="*+- &#09;">[ \t]{0,3}[*+-][ \t]+</SEQ_REGEXP> -->
-    <SEQ_REGEXP TYPE="KEYWORD2" AT_LINE_START="TRUE" HASH_CHARS="+-* &#09;">[ \t]{0,}[*+-][ \t]+</SEQ_REGEXP>
-    <!-- lists (ordered) -->
-    <SEQ_REGEXP TYPE="KEYWORD2" AT_LINE_START="TRUE" HASH_CHARS="0123456789 &#09;">[ \t]{0,}\d+\.[ \t]+</SEQ_REGEXP>
-    <!-- Link Label definitions all on one line -->
-    <EOL_SPAN_REGEXP TYPE="LABEL" AT_WHITESPACE_END="TRUE" DELEGATE="LINK_LABEL_DEFINITION">\[(.*?)\]\:</EOL_SPAN_REGEXP>
-    <!-- Inline images and page links and pointers ![alt text](/path/to/img.jpg "Title for this") -->
-    <SPAN_REGEXP TYPE="KEYWORD4" MATCH_TYPE="OPERATOR" NO_LINE_BREAK="TRUE" AT_LINE_START="FALSE" HASH_CHARS=" ![" DELEGATE="LINK_INLINE_URL_TITLE">
-      <BEGIN> !?\[[\p{Alnum}\p{Blank}]*</BEGIN>
-      <END>\]</END>
-    </SPAN_REGEXP>
-    <!-- emphasis (strong) -->
-    <SPAN_REGEXP TYPE="LITERAL3" HASH_CHARS="*_" AT_WORD_START="TRUE" NO_LINE_BREAK="TRUE">
-      <BEGIN>(\*\*|__)</BEGIN>
-      <END>$1</END>
-    </SPAN_REGEXP>
-    <!-- emphasis (em) -->
-    <SPAN_REGEXP TYPE="LITERAL4" HASH_CHARS="*_" AT_WORD_START="TRUE" NO_LINE_BREAK="TRUE">
-      <BEGIN>(\*|_)</BEGIN>
-      <END>$1</END>
-    </SPAN_REGEXP>
-  </RULES>
-
-  <!-- ================ LINK PROCESSING ================================= -->
-  <RULES DEFAULT="KEYWORD3" SET="LINK_LABEL_DEFINITION">
-    <SEQ_REGEXP TYPE="NULL" HASH_CHAR="\">\\[\Q*_\`[](){}#+.!-\E]</SEQ_REGEXP>
-    <SEQ TYPE="OPERATOR">"</SEQ>
-    <SEQ TYPE="OPERATOR">(</SEQ>
-    <SEQ TYPE="OPERATOR">)</SEQ>
-    <IMPORT DELEGATE="MARKDOWN" />
-  </RULES>
-  <RULES SET="LINK_INLINE_URL_TITLE">
-    <!-- the closing bracket of the link text-->
-    <SEQ TYPE="OPERATOR">]</SEQ>
-    <!-- span containing the link label pointer to the definition -->
-    <SPAN_REGEXP TYPE="KEYWORD4" MATCH_TYPE="OPERATOR" NO_LINE_BREAK="TRUE" AT_LINE_START="FALSE" HASH_CHAR="[" DELEGATE="LINK_INLINE_LABEL_CLOSE">
-      <BEGIN>\[</BEGIN>
-      <END>\]</END>
-    </SPAN_REGEXP>
-    <!-- span containing the url and optional title -->
-    <SPAN_REGEXP TYPE="KEYWORD4" MATCH_TYPE="OPERATOR" NO_LINE_BREAK="TRUE" AT_LINE_START="FALSE" HASH_CHAR="(" DELEGATE="LINK_INLINE_URL_TITLE_CLOSE">
-      <BEGIN>\(</BEGIN>
-      <END>\)</END>
-    </SPAN_REGEXP>
-  </RULES>
-  <RULES DEFAULT="KEYWORD3" SET="LINK_INLINE_URL_TITLE_CLOSE">
-    <!-- the closing paren and loop back to MAIN -->
-    <EOL_SPAN TYPE="NULL" MATCH_TYPE="OPERATOR" DELEGATE="MAIN">)</EOL_SPAN>
-  </RULES>
-  <RULES DEFAULT="LABEL" SET="LINK_INLINE_LABEL_CLOSE">
-    <!-- the closing bracket and loop back to MAIN -->
-    <EOL_SPAN TYPE="NULL" MATCH_TYPE="OPERATOR" DELEGATE="MAIN">]</EOL_SPAN>
-  </RULES>
-
-  <!-- ================ MARKDOWN EMBEDDED IN A BLOCKQUOTE  ================================= -->
-   <!--
-    repetitive: these are the same markdown rules but no AT_LINE_START=TRUE because they are
-    part of a blockquote match which already matched at line start didn't see a better way at
-    the time
-    -->
-  <RULES SET="MARKDOWN_BLOCKQUOTE" IGNORE_CASE="FALSE">
-    <!-- ignore dangling less thans to allow for things like 4 < 5 -->
-    <SEQ TYPE="NULL"> &lt; </SEQ>
-    <!-- HANDLE OTHER INLINE HTML ELEMENTS -->
-    <SPAN TYPE="MARKUP" DELEGATE="INLINE_MARKUP">
-      <BEGIN>&lt;</BEGIN>
-      <END>&gt;</END>
-    </SPAN>
-    <!-- literal characters (i.e. cases where they won't specify formatting)  -->
-    <SEQ TYPE="NULL"> * </SEQ>
-    <SEQ TYPE="NULL"> _ </SEQ>
-    <SEQ TYPE="NULL">\][</SEQ>
-    <SEQ_REGEXP TYPE="NULL" HASH_CHAR="\">\\[\Q*_\`[](){}#+.!-\E]</SEQ_REGEXP>
-    <!-- inline code: `NSString* str = @"hi!";` using backticks-->
-    <SPAN_REGEXP TYPE="LITERAL2" HASH_CHARS="`">
-      <BEGIN>(`{1,2})</BEGIN>
-      <END>$1</END>
-    </SPAN_REGEXP>
-    <!-- telling difference between code blocks and list paragraphs is impossible until regexp cross line boundaries -->
-    <EOL_SPAN_REGEXP TYPE="LITERAL2" HASH_CHARS=" &#09;">( {4,}|\t+)\S</EOL_SPAN_REGEXP>
-    <!-- <EOL_SPAN_REGEXP TYPE="LITERAL2" AT_LINE_START="TRUE" HASH_CHARS=" &#09;">( {4,}|\t+){2,}</EOL_SPAN_REGEXP> -->
-    <!-- headers (setext-style:) -->
-    <EOL_SPAN_REGEXP TYPE="KEYWORD1" HASH_CHARS="=-">[=-]+</EOL_SPAN_REGEXP>
-    <!-- headers (atx-style:) -->
-    <EOL_SPAN_REGEXP TYPE="KEYWORD1" HASH_CHAR="#">#{1,6}[ \t]*(.+?)</EOL_SPAN_REGEXP>
-    <!-- horizontal rules -->
-    <EOL_SPAN_REGEXP TYPE="KEYWORD1" HASH_CHARS="-*_ &#09;">[ ]{0,2}([ ]?[-_*][ ]?){3,}[ \t]*</EOL_SPAN_REGEXP>
-    <!-- lists (unordered) -->
-    <SEQ_REGEXP TYPE="KEYWORD2" HASH_CHARS="*+- &#09;">[ \t]{0,}[*+-][ \t]+</SEQ_REGEXP>
-    <!-- lists (ordered) -->
-    <SEQ_REGEXP TYPE="KEYWORD2" HASH_CHARS="0123456789 &#09;">[ \t]{0,}\d+\.[ \t]+</SEQ_REGEXP>
-    <!-- Link Label definitions all on one line -->
-    <EOL_SPAN_REGEXP TYPE="LABEL" DELEGATE="LINK_LABEL_DEFINITION">\[(.*?)\]\:</EOL_SPAN_REGEXP>
-    <!-- Inline images and page links and pointers ![alt text](/path/to/img.jpg "Title for this") -->
-    <SPAN_REGEXP TYPE="KEYWORD4" MATCH_TYPE="OPERATOR" NO_LINE_BREAK="TRUE" AT_LINE_START="FALSE" HASH_CHARS=" ![" DELEGATE="LINK_INLINE_URL_TITLE">
-      <BEGIN> !?\[[\p{Alnum}\p{Blank}]*</BEGIN>
-      <END>\]</END>
-    </SPAN_REGEXP>
-    <!-- emphasis (strong) -->
-    <SPAN_REGEXP TYPE="LITERAL3" HASH_CHARS="*_">
-      <BEGIN>(\*\*|__)</BEGIN>
-      <END>$1</END>
-    </SPAN_REGEXP>
-    <!-- emphasis (em) -->
-    <SPAN_REGEXP TYPE="LITERAL4" HASH_CHARS="*_">
-      <BEGIN>(\*|_)</BEGIN>
-      <END>$1</END>
-    </SPAN_REGEXP>
-  </RULES>
-</MODE>
\ No newline at end of file
diff --git a/qpython/src/main/assets/syntax/maven.xml b/qpython/src/main/assets/syntax/maven.xml
deleted file mode 100644
index d82f73fc..00000000
--- a/qpython/src/main/assets/syntax/maven.xml
+++ /dev/null
@@ -1,367 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE MODE SYSTEM "xmode.dtd"><!-- mode for tag library description (maven) files -->
-<MODE>
-    <PROPS>
-        <PROPERTY NAME="commentStart" VALUE="&lt;!--" />
-        <PROPERTY NAME="commentEnd" VALUE="--&gt;" />
-    </PROPS>
-	<!-- {{{ MAIN -->
-    <RULES>
-		<!-- SGML comment -->
-        <SPAN TYPE="COMMENT1">
-            <BEGIN>&lt;!--</BEGIN>
-            <END>--&gt;</END>
-        </SPAN>
-
-		<!-- variables -->
-        <SPAN TYPE="KEYWORD4">
-            <BEGIN>${</BEGIN>
-            <END>}</END>
-        </SPAN>
-	
-		<!-- DTD Entity declarations -->
-        <SPAN TYPE="KEYWORD2" DELEGATE="ENTITY-TAGS">
-            <BEGIN>&lt;!ENTITY</BEGIN>
-            <END>&gt;</END>
-        </SPAN>
-
-		<!-- CDATA sections -->
-        <SPAN TYPE="KEYWORD2" DELEGATE="CDATA">
-            <BEGIN>&lt;![CDATA[</BEGIN>
-            <END>]]&gt;</END>
-        </SPAN>
-
-		<!-- DTD instructions -->
-        <SPAN TYPE="KEYWORD2" DELEGATE="DTD-TAGS">
-            <BEGIN>&lt;!</BEGIN>
-            <END>&gt;</END>
-        </SPAN>
-
-		<!-- PI directives -->
-        <SPAN TYPE="KEYWORD3">
-            <BEGIN>&lt;?</BEGIN>
-            <END>&gt;</END>
-        </SPAN>
-
-		<!-- markup tags -->
-        <SPAN TYPE="MARKUP" DELEGATE="TAGS">
-            <BEGIN>&lt;</BEGIN>
-            <END>&gt;</END>
-        </SPAN>
-
-		<!-- SGML entities -->
-        <SPAN TYPE="LITERAL2" NO_WORD_BREAK="TRUE">
-            <BEGIN>&amp;</BEGIN>
-            <END>;</END>
-        </SPAN>
-
-        <KEYWORDS>
-            <KEYWORD4>true</KEYWORD4>
-            <KEYWORD4>false</KEYWORD4>
-            <KEYWORD4>default</KEYWORD4>
-        </KEYWORDS>
-
-    </RULES>
-	<!-- }}} -->
-	
-	<!-- {{{ TAGS -->
-    <RULES SET="TAGS" DEFAULT="MARKUP" NO_WORD_SEP="-_">
-		<!-- SGML comment -->
-        <SPAN TYPE="COMMENT1">
-            <BEGIN>&lt;!--</BEGIN>
-            <END>--&gt;</END>
-        </SPAN>
-
-        <SPAN TYPE="LITERAL1" DELEGATE="STRING">
-            <BEGIN>"</BEGIN>
-            <END>"</END>
-        </SPAN>
-     
-        <SPAN TYPE="LITERAL1" DELEGATE="STRING">
-            <BEGIN>'</BEGIN>
-            <END>'</END>
-        </SPAN>
-
-		<!-- variables -->
-        <SPAN TYPE="KEYWORD4">
-            <BEGIN>${</BEGIN>
-            <END>}</END>
-        </SPAN>
-    
-        <SEQ TYPE="MARKUP" DELEGATE="maven::MAIN">/></SEQ>
-        <MARK_PREVIOUS TYPE="LABEL">:</MARK_PREVIOUS>
-        <SEQ TYPE="OPERATOR">:</SEQ>
-        <KEYWORDS>
-            <KEYWORD1>project</KEYWORD1>
-
-            <KEYWORD2>basedir</KEYWORD2>
-            <KEYWORD2>project.baseUri</KEYWORD2>
-            <KEYWORD2>maven.build.timestamp</KEYWORD2>
-            <KEYWORD2>maven.build.timestamp.format</KEYWORD2>
-        
-        
-            <KEYWORD2>activation</KEYWORD2>
-            <KEYWORD2>activeByDefault</KEYWORD2>
-            <KEYWORD2>address</KEYWORD2>
-            <KEYWORD2>arch</KEYWORD2>
-            <KEYWORD2>archive</KEYWORD2>
-            <KEYWORD2>artifactId</KEYWORD2>
-            <KEYWORD2>build</KEYWORD2>
-            <KEYWORD2>checksumPolicy</KEYWORD2>
-            <KEYWORD2>ciManagement</KEYWORD2>
-            <KEYWORD2>classifier</KEYWORD2>
-            <KEYWORD2>comments</KEYWORD2>
-            <KEYWORD2>configuration</KEYWORD2>
-            <KEYWORD2>connection</KEYWORD2>
-            <KEYWORD2>contributors</KEYWORD2>
-            <KEYWORD2>defaultGoal</KEYWORD2>
-            <KEYWORD2>dependencies</KEYWORD2>
-            <KEYWORD2>dependencyManagement</KEYWORD2>
-            <KEYWORD2>description</KEYWORD2>
-            <KEYWORD2>developerConnection</KEYWORD2>
-            <KEYWORD2>developers</KEYWORD2>
-            <KEYWORD2>directory</KEYWORD2>
-            <KEYWORD2>distribution</KEYWORD2>
-            <KEYWORD2>distributionManagement</KEYWORD2>
-            <KEYWORD2>downloadUrl</KEYWORD2>
-            <KEYWORD2>email</KEYWORD2>
-            <KEYWORD2>enabled</KEYWORD2>
-            <KEYWORD2>excludeDefaults</KEYWORD2>
-            <KEYWORD2>excludes</KEYWORD2>
-            <KEYWORD2>exclusions</KEYWORD2>
-            <KEYWORD2>executions</KEYWORD2>
-            <KEYWORD2>exists</KEYWORD2>
-            <KEYWORD2>extensions</KEYWORD2>
-            <KEYWORD2>family</KEYWORD2>
-            <KEYWORD2>file</KEYWORD2>
-            <KEYWORD2>filtering</KEYWORD2>
-            <KEYWORD2>filters</KEYWORD2>
-            <KEYWORD2>finalName</KEYWORD2>
-            <KEYWORD2>goals</KEYWORD2>
-            <KEYWORD2>groupId</KEYWORD2>
-            <KEYWORD2>id</KEYWORD2>
-            <KEYWORD2>inceptionYear</KEYWORD2>
-            <KEYWORD2>includes</KEYWORD2>
-            <KEYWORD2>inherited</KEYWORD2>
-            <KEYWORD2>issueManagement</KEYWORD2>
-            <KEYWORD2>jdk</KEYWORD2>
-            <KEYWORD2>layout</KEYWORD2>
-            <KEYWORD2>licenses</KEYWORD2>
-            <KEYWORD2>mailingLists</KEYWORD2>
-            <KEYWORD2>maven</KEYWORD2>
-            <KEYWORD2>message</KEYWORD2>
-            <KEYWORD2>missing</KEYWORD2>
-            <KEYWORD2>modelVersion</KEYWORD2>
-            <KEYWORD2>modules</KEYWORD2>
-            <KEYWORD2>name</KEYWORD2>
-            <KEYWORD2>notifiers</KEYWORD2>
-            <KEYWORD2>optional</KEYWORD2>
-            <KEYWORD2>organization</KEYWORD2>
-            <KEYWORD2>organizationUrl</KEYWORD2>
-            <KEYWORD2>os</KEYWORD2>
-            <KEYWORD2>otherArchives</KEYWORD2>
-            <KEYWORD2>outputDirectory</KEYWORD2>
-            <KEYWORD2>packaging</KEYWORD2>
-            <KEYWORD2>parent</KEYWORD2>
-            <KEYWORD2>phase</KEYWORD2>
-            <KEYWORD2>pluginManagement</KEYWORD2>
-            <KEYWORD2>pluginRepositories</KEYWORD2>
-            <KEYWORD2>plugins</KEYWORD2>
-            <KEYWORD2>post</KEYWORD2>
-            <KEYWORD2>prerequisites</KEYWORD2>
-            <KEYWORD2>profiles</KEYWORD2>
-            <KEYWORD2>properties</KEYWORD2>
-            <KEYWORD2>property</KEYWORD2>
-            <KEYWORD2>relativePath</KEYWORD2>
-            <KEYWORD2>releases</KEYWORD2>
-            <KEYWORD2>relocation</KEYWORD2>
-            <KEYWORD2>reportSets</KEYWORD2>
-            <KEYWORD2>reporting</KEYWORD2>
-            <KEYWORD2>reports</KEYWORD2>
-            <KEYWORD2>repositories</KEYWORD2>
-            <KEYWORD2>repository</KEYWORD2>
-            <KEYWORD2>resources</KEYWORD2>
-            <KEYWORD2>roles</KEYWORD2>
-            <KEYWORD2>scm</KEYWORD2>
-            <KEYWORD2>scope</KEYWORD2>
-            <KEYWORD2>scriptSourceDirectory</KEYWORD2>
-            <KEYWORD2>sendOnError</KEYWORD2>
-            <KEYWORD2>sendOnFailure</KEYWORD2>
-            <KEYWORD2>sendOnSuccess</KEYWORD2>
-            <KEYWORD2>sendOnWarning</KEYWORD2>
-            <KEYWORD2>site</KEYWORD2>
-            <KEYWORD2>snapshotRepository</KEYWORD2>
-            <KEYWORD2>snapshots</KEYWORD2>
-            <KEYWORD2>sourceDirectory</KEYWORD2>
-            <KEYWORD2>status</KEYWORD2>
-            <KEYWORD2>subscribe</KEYWORD2>
-            <KEYWORD2>system</KEYWORD2>
-            <KEYWORD2>systemPath</KEYWORD2>
-            <KEYWORD2>tag</KEYWORD2>
-            <KEYWORD2>targetPath</KEYWORD2>
-            <KEYWORD2>testOutputDirectory</KEYWORD2>
-            <KEYWORD2>testResources</KEYWORD2>
-            <KEYWORD2>testSourceDirectory</KEYWORD2>
-            <KEYWORD2>timezone</KEYWORD2>
-            <KEYWORD2>type</KEYWORD2>
-            <KEYWORD2>uniqueVersion</KEYWORD2>
-            <KEYWORD2>unsubscribe</KEYWORD2>
-            <KEYWORD2>updatePolicy</KEYWORD2>
-            <KEYWORD2>url</KEYWORD2>
-            <KEYWORD2>value</KEYWORD2>
-            <KEYWORD2>version</KEYWORD2>
-
-            <KEYWORD3>contributor</KEYWORD3>
-            <KEYWORD3>dependency</KEYWORD3>
-            <KEYWORD3>developer</KEYWORD3>
-            <KEYWORD3>exclude</KEYWORD3>
-            <KEYWORD3>exclusion</KEYWORD3>
-            <KEYWORD3>execution</KEYWORD3>
-            <KEYWORD3>extension</KEYWORD3>
-            <KEYWORD3>filter</KEYWORD3>
-            <KEYWORD3>goal</KEYWORD3>
-            <KEYWORD3>include</KEYWORD3>
-            <KEYWORD3>license</KEYWORD3>
-            <KEYWORD3>mailingList</KEYWORD3>
-            <KEYWORD3>module</KEYWORD3>
-            <KEYWORD3>notifier</KEYWORD3>
-            <KEYWORD3>otherArchive</KEYWORD3>
-            <KEYWORD3>plugin</KEYWORD3>
-            <KEYWORD3>pluginRepository</KEYWORD3>
-            <KEYWORD3>profile</KEYWORD3>
-            <KEYWORD3>report</KEYWORD3>
-            <KEYWORD3>reportSet</KEYWORD3>
-            <KEYWORD3>repository</KEYWORD3>
-            <KEYWORD3>resource</KEYWORD3>
-            <KEYWORD3>role</KEYWORD3>
-            <KEYWORD3>testResource</KEYWORD3>
-        </KEYWORDS>
-    </RULES>
-	<!-- }}} -->
-	
-	<!-- {{{ DTD-TAGS -->
-    <RULES SET="DTD-TAGS" DEFAULT="KEYWORD2" IGNORE_CASE="FALSE">
-		<!-- SGML comment -->
-        <SPAN TYPE="COMMENT1">
-            <BEGIN>&lt;!--</BEGIN>
-            <END>--&gt;</END>
-        </SPAN>
-
-		<!-- SGML comment -->
-        <SPAN TYPE="COMMENT1">
-            <BEGIN>--</BEGIN>
-            <END>--</END>
-        </SPAN>
-
-		<!-- Parameter entities -->
-        <SPAN TYPE="LITERAL2" NO_WORD_BREAK="TRUE">
-            <BEGIN>%</BEGIN>
-            <END>;</END>
-        </SPAN>
-
-        <SPAN TYPE="LITERAL1">
-            <BEGIN>"</BEGIN>
-            <END>"</END>
-        </SPAN>
-
-        <SPAN TYPE="LITERAL1">
-            <BEGIN>'</BEGIN>
-            <END>'</END>
-        </SPAN>
-
-		<!-- This appears in some SGML documents -->
-        <SPAN TYPE="KEYWORD2" DELEGATE="MAIN">
-            <BEGIN>[</BEGIN>
-            <END>]</END>
-        </SPAN>
-
-        <SEQ TYPE="OPERATOR">(</SEQ>
-        <SEQ TYPE="OPERATOR">)</SEQ>
-        <SEQ TYPE="OPERATOR">|</SEQ>
-        <SEQ TYPE="OPERATOR">?</SEQ>
-        <SEQ TYPE="OPERATOR">*</SEQ>
-        <SEQ TYPE="OPERATOR">+</SEQ>
-        <SEQ TYPE="OPERATOR">,</SEQ>
-
-        <KEYWORDS>
-            <KEYWORD1>CDATA</KEYWORD1>
-            <KEYWORD1>EMPTY</KEYWORD1>
-            <KEYWORD1>INCLUDE</KEYWORD1>
-            <KEYWORD1>IGNORE</KEYWORD1>
-            <KEYWORD1>NDATA</KEYWORD1>
-            <KEYWORD1>#IMPLIED</KEYWORD1>
-            <KEYWORD1>#PCDATA</KEYWORD1>
-            <KEYWORD1>#REQUIRED</KEYWORD1>
-        </KEYWORDS>
-    </RULES>
-	<!-- }}} -->
-	
-	<!-- {{{ ENTITY-TAGS -->
-    <RULES SET="ENTITY-TAGS" DEFAULT="KEYWORD2">
-		<!-- SGML comment -->
-        <SPAN TYPE="COMMENT1">
-            <BEGIN>&lt;!--</BEGIN>
-            <END>--&gt;</END>
-        </SPAN>
-
-		<!-- SGML comment -->
-        <SPAN TYPE="COMMENT1">
-            <BEGIN>--</BEGIN>
-            <END>--</END>
-        </SPAN>
-
-        <SPAN TYPE="LITERAL1">
-            <BEGIN>"</BEGIN>
-            <END>"</END>
-        </SPAN>
-
-        <SPAN TYPE="LITERAL1">
-            <BEGIN>'</BEGIN>
-            <END>'</END>
-        </SPAN>
-
-        <SEQ TYPE="OPERATOR">=</SEQ>
-
-        <SEQ TYPE="OPERATOR">%</SEQ>
-
-        <KEYWORDS>
-            <KEYWORD1>SYSTEM</KEYWORD1>
-        </KEYWORDS>
-    </RULES>
-	<!-- }}} -->
-	
-	<!-- {{{ CDATA -->
-    <RULES SET="CDATA" DEFAULT="COMMENT2">
-        <KEYWORDS>
-            <LITERAL2>true</LITERAL2>
-            <LITERAL2>yes</LITERAL2>
-            <LITERAL2>false</LITERAL2>
-        </KEYWORDS>
-    </RULES>
-	<!-- }}} -->
-	
-	<!-- {{{ STRING -->
-    <RULES SET="STRING" DEFAULT="LITERAL1">
-		<!-- variables -->
-        <SPAN TYPE="KEYWORD4">
-            <BEGIN>${</BEGIN>
-            <END>}</END>
-        </SPAN>
-        <SEQ TYPE="NULL">\"</SEQ>
-        <SEQ TYPE="MARKUP" DELEGATE="TAGS">"</SEQ>
-
-        <SPAN TYPE="LITERAL2" NO_WORD_BREAK="TRUE">
-            <BEGIN>&amp;</BEGIN>
-            <END>;</END>
-        </SPAN>
-        <KEYWORDS>
-            <LITERAL2>true</LITERAL2>
-            <LITERAL2>yes</LITERAL2>
-            <LITERAL2>false</LITERAL2>
-        </KEYWORDS>
-    </RULES>
-	<!-- }}} -->
-
-</MODE>
-
- 	  	 
diff --git a/qpython/src/main/assets/syntax/ml.xml b/qpython/src/main/assets/syntax/ml.xml
deleted file mode 100644
index b7f9bc64..00000000
--- a/qpython/src/main/assets/syntax/ml.xml
+++ /dev/null
@@ -1,216 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!-- SML MODE 1.0.1 by Lucas Dixon, based on Ingmar Stein's ml mode -->
-<MODE>
-  <PROPS>
-    <PROPERTY NAME="commentStart" VALUE="(*"/>
-    <PROPERTY NAME="commentEnd" VALUE="*)"/>
-    <PROPERTY NAME="wordBreakChars" VALUE=",+-=&lt;&gt;/?^&amp;*\\/(){}" />
-<!-- JEdit's indent mechanism is not expressive enough for ML.
-     It is best not to even try to have automated indentation for ML until significant improvements are made to the indent language. -->
-<!--
-    <PROPERTY NAME="doubleBracketIndent" VALUE="false" />
-    <PROPERTY NAME="lineUpClosingBracket" VALUE="true" />
-    <PROPERTY NAME="unalignedOpenBrackets" VALUE="([{" />
-    <PROPERTY NAME="unalignedCloseBrackets" VALUE=")]}" />
-    <PROPERTY NAME="indentOpenBrackets" VALUE="([{" />
-    <PROPERTY NAME="indentCloseBrackets" VALUE=")]}" />
-    <PROPERTY NAME="indentNextLines"
-      VALUE="(^|.*\s+)(let|sig|struct|local)(\W+.*|)$" />
-    <PROPERTY NAME="unindentNextLines"
-      VALUE="(^|.*\s+)(end)(\W+.*|)$" />
-    <PROPERTY NAME="unindentThisLine"
-      VALUE="(^|\s+)(local|val|fun|end|in|open)(\W+.*|)$" />
--->
-  </PROPS>
-
-  <RULES IGNORE_CASE="FALSE" HIGHLIGHT_DIGITS="TRUE">
-    <!-- comments -->
-    <SPAN TYPE="COMMENT1">
-      <BEGIN>(*</BEGIN>
-      <END>*)</END>
-    </SPAN>
-
-    <!-- character literals -->
-    <SPAN TYPE="LITERAL1" ESCAPE="\" NO_LINE_BREAK="TRUE">
-      <BEGIN>#"</BEGIN>
-      <END>"</END>
-    </SPAN>
-
-    <!-- string literals -->
-    <SPAN TYPE="LITERAL1" ESCAPE="\" NO_LINE_BREAK="TRUE">
-      <BEGIN>"</BEGIN>
-      <END>"</END>
-    </SPAN>
-
-    <!-- built-in operators -->
-
-    <!-- infix precedence 7 -->
-    <SEQ TYPE="OPERATOR">/</SEQ>
-    <SEQ TYPE="OPERATOR">*</SEQ>
-
-    <!-- reserved & operator characters -->
-    <SEQ TYPE="OPERATOR">+</SEQ>
-    <SEQ TYPE="OPERATOR">-</SEQ>
-    <SEQ TYPE="OPERATOR">^</SEQ>
-    <SEQ TYPE="OPERATOR">@</SEQ>
-    <SEQ TYPE="OPERATOR">=</SEQ>
-    <SEQ TYPE="OPERATOR">&lt;</SEQ>
-    <SEQ TYPE="OPERATOR">&gt;</SEQ>
-    <SEQ TYPE="OPERATOR">(</SEQ>
-    <SEQ TYPE="OPERATOR">)</SEQ>
-    <SEQ TYPE="OPERATOR">[</SEQ>
-    <SEQ TYPE="OPERATOR">]</SEQ>
-    <SEQ TYPE="OPERATOR">{</SEQ>
-    <SEQ TYPE="OPERATOR">}</SEQ>
-    <SEQ TYPE="OPERATOR">,</SEQ>
-    <SEQ TYPE="OPERATOR">:</SEQ>
-    <SEQ TYPE="OPERATOR">;</SEQ>
-    <SEQ TYPE="OPERATOR">|</SEQ>
-    <SEQ TYPE="OPERATOR">#</SEQ>
-
-
-    <MARK_FOLLOWING TYPE="FUNCTION"
-    MATCH_TYPE="KEYWORD1">fun </MARK_FOLLOWING>
-    <MARK_FOLLOWING TYPE="FUNCTION"
-    MATCH_TYPE="KEYWORD1">val </MARK_FOLLOWING>
-    <MARK_FOLLOWING TYPE="FUNCTION"
-    MATCH_TYPE="KEYWORD1">exception </MARK_FOLLOWING>
-
-    <MARK_FOLLOWING TYPE="FUNCTION"
-    MATCH_TYPE="KEYWORD1">type </MARK_FOLLOWING>
-    <MARK_FOLLOWING TYPE="FUNCTION"
-    MATCH_TYPE="KEYWORD1">abstype </MARK_FOLLOWING>
-     <MARK_FOLLOWING TYPE="FUNCTION"
-    MATCH_TYPE="KEYWORD1">eqtype </MARK_FOLLOWING>
-    <MARK_FOLLOWING TYPE="FUNCTION"
-    MATCH_TYPE="KEYWORD1">datatype </MARK_FOLLOWING>
-
-    <MARK_FOLLOWING TYPE="LITERAL3"
-    MATCH_TYPE="KEYWORD1">functor </MARK_FOLLOWING>
-    <MARK_FOLLOWING TYPE="LITERAL3"
-    MATCH_TYPE="KEYWORD1">structure </MARK_FOLLOWING>
-    <MARK_FOLLOWING TYPE="LITERAL3"
-    MATCH_TYPE="KEYWORD1">signature </MARK_FOLLOWING>
-
-    <!-- reserved words -->
-    <KEYWORDS>
-      <!-- built-in operators -->
-
-      <!-- infix precedence 7 -->
-      <OPERATOR>div</OPERATOR>
-      <OPERATOR>mod</OPERATOR>
-
-      <!-- infix precedence 3 -->
-      <OPERATOR>o</OPERATOR>
-
-      <!-- infix precedence 0 -->
-      <OPERATOR>before</OPERATOR>
-
-      <!-- type def -->
-      <KEYWORD1>abstype</KEYWORD1>
-      <KEYWORD1>datatype</KEYWORD1>
-      <KEYWORD1>eqtype</KEYWORD1>
-      <KEYWORD1>type</KEYWORD1>
-
-      <!-- value definitions -->
-      <KEYWORD1>exception</KEYWORD1>
-      <KEYWORD1>fun</KEYWORD1>
-      <KEYWORD1>val</KEYWORD1>
-      <KEYWORD1>fn</KEYWORD1>
-
-      <!-- generic definitional -->
-      <KEYWORD1>and</KEYWORD1>
-      <KEYWORD1>end</KEYWORD1>
-      <KEYWORD1>in</KEYWORD1>
-      <KEYWORD1>infix</KEYWORD1>
-      <KEYWORD1>infixr</KEYWORD1>
-      <KEYWORD1>let</KEYWORD1>
-      <KEYWORD1>local</KEYWORD1>
-      <KEYWORD1>as</KEYWORD1>
-      <KEYWORD1>of</KEYWORD1>
-      <KEYWORD1>op</KEYWORD1>
-
-      <!-- module level -->
-      <KEYWORD1>functor</KEYWORD1>
-      <KEYWORD1>include</KEYWORD1>
-      <KEYWORD1>open</KEYWORD1>
-      <KEYWORD1>sharing</KEYWORD1>
-      <KEYWORD1>sig</KEYWORD1>
-      <KEYWORD1>signature</KEYWORD1>
-      <KEYWORD1>struct</KEYWORD1>
-      <KEYWORD1>structure</KEYWORD1>
-      <KEYWORD1>where</KEYWORD1>
-      <KEYWORD1>with</KEYWORD1>
-
-      <!-- logic/control flow -->
-      <KEYWORD1>andalso</KEYWORD1>
-      <KEYWORD1>orelse</KEYWORD1>
-      <KEYWORD1>else</KEYWORD1>
-      <KEYWORD1>if</KEYWORD1>
-      <KEYWORD1>case</KEYWORD1>
-      <KEYWORD1>handle</KEYWORD1>
-      <KEYWORD1>raise</KEYWORD1>
-      <KEYWORD1>then</KEYWORD1>
-
-      <!--- other -->
-      <KEYWORD1>do</KEYWORD1>
-      <KEYWORD1>nonfix</KEYWORD1>
-      <KEYWORD1>rec</KEYWORD1>
-      <KEYWORD1>withtype</KEYWORD1>
-      <KEYWORD1>while</KEYWORD1>
-
-      <!-- built-in types -->
-      <KEYWORD3>array</KEYWORD3>
-      <KEYWORD3>bool</KEYWORD3>
-      <KEYWORD3>char</KEYWORD3>
-      <KEYWORD3>exn</KEYWORD3>
-      <KEYWORD3>frag</KEYWORD3>
-      <KEYWORD3>int</KEYWORD3>
-      <KEYWORD3>list</KEYWORD3>
-      <KEYWORD3>option</KEYWORD3>
-      <KEYWORD3>order</KEYWORD3>
-      <KEYWORD3>real</KEYWORD3>
-      <KEYWORD3>ref</KEYWORD3>
-      <KEYWORD3>string</KEYWORD3>
-      <KEYWORD3>substring</KEYWORD3>
-      <KEYWORD3>unit</KEYWORD3>
-      <KEYWORD3>vector</KEYWORD3>
-      <KEYWORD3>word</KEYWORD3>
-      <KEYWORD3>word8</KEYWORD3>
-
-      <!-- build-in exception constructors -->
-      <KEYWORD2>Bind</KEYWORD2>
-      <KEYWORD2>Chr</KEYWORD2>
-      <KEYWORD2>Domain</KEYWORD2>
-      <KEYWORD2>Div</KEYWORD2>
-      <KEYWORD2>Fail</KEYWORD2>
-      <KEYWORD2>Graphic</KEYWORD2>
-      <KEYWORD2>Interrupt</KEYWORD2>
-      <KEYWORD2>Io</KEYWORD2>
-      <KEYWORD2>Match</KEYWORD2>
-      <KEYWORD2>Option</KEYWORD2>
-      <KEYWORD2>Ord</KEYWORD2>
-      <KEYWORD2>Overflow</KEYWORD2>
-      <KEYWORD2>Size</KEYWORD2>
-      <KEYWORD2>Subscript</KEYWORD2>
-      <KEYWORD2>SysErr</KEYWORD2>
-
-      <!-- built-in literals -->
-      <LITERAL2>false</LITERAL2>
-      <LITERAL2>true</LITERAL2>
-      <LITERAL2>QUOTE</LITERAL2>
-      <LITERAL2>ANTIQUOTE</LITERAL2>
-      <LITERAL2>nil</LITERAL2>
-      <LITERAL2>NONE</LITERAL2>
-      <LITERAL2>SOME</LITERAL2>
-      <LITERAL2>LESS</LITERAL2>
-      <LITERAL2>EQUAL</LITERAL2>
-      <LITERAL2>GREATER</LITERAL2>
-    </KEYWORDS>
-
-  </RULES>
-</MODE>
-
diff --git a/qpython/src/main/assets/syntax/modula3.xml b/qpython/src/main/assets/syntax/modula3.xml
deleted file mode 100644
index 5409f82d..00000000
--- a/qpython/src/main/assets/syntax/modula3.xml
+++ /dev/null
@@ -1,178 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!-- Modula-3 mode, by Marcio Marchini mqm@magma.ca -->
-<!-- See http://www.research.compaq.com/SRC/m3defn/html/syntax.html -->
-
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="commentStart" VALUE="(*" />
-		<PROPERTY NAME="commentEnd" VALUE="*)" />
-	</PROPS>
-	<RULES IGNORE_CASE="TRUE" HIGHLIGHT_DIGITS="TRUE">
-		<!-- Comment -->
-		<!-- Compiler directives. -->
-		<SPAN TYPE="COMMENT2">
-			<BEGIN>&lt;*</BEGIN>
-			<END>*&gt;</END>
-		</SPAN>
-
-		<SPAN TYPE="COMMENT1">
-			<BEGIN>(*</BEGIN>
-			<END>*)</END>
-		</SPAN>
-
-		<!-- Standard literals -->
-		<SPAN TYPE="LITERAL1" ESCAPE="\" NO_LINE_BREAK="TRUE">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-		<SPAN TYPE="LITERAL1" ESCAPE="\" NO_LINE_BREAK="TRUE">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-
-		<SEQ TYPE="OPERATOR">^</SEQ>
-		<SEQ TYPE="OPERATOR">@</SEQ>
-		<SEQ TYPE="OPERATOR">:=</SEQ>
-		<SEQ TYPE="OPERATOR">=</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;=</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;=</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;</SEQ>
-		<SEQ TYPE="OPERATOR">+</SEQ>
-		<SEQ TYPE="OPERATOR">-</SEQ>
-		<SEQ TYPE="OPERATOR">/</SEQ>
-		<SEQ TYPE="OPERATOR">*</SEQ>
-
-		<KEYWORDS>
-			<KEYWORD1>AND</KEYWORD1>
-			<KEYWORD1>DO</KEYWORD1>
-			<KEYWORD1>FROM</KEYWORD1>
-			<KEYWORD1>NOT</KEYWORD1>
-			<KEYWORD1>REPEAT</KEYWORD1>
-			<KEYWORD1>UNTIL</KEYWORD1>
-			<KEYWORD1>ANY</KEYWORD1>
-			<KEYWORD1>ELSE</KEYWORD1>
-			<KEYWORD1>GENERIC</KEYWORD1>
-			<KEYWORD1>OBJECT</KEYWORD1>
-			<KEYWORD1>RETURN</KEYWORD1>
-			<KEYWORD1>UNTRACED</KEYWORD1>
-			<KEYWORD1>ARRAY</KEYWORD1>
-			<KEYWORD1>ELSIF</KEYWORD1>
-			<KEYWORD1>IF</KEYWORD1>
-			<KEYWORD1>OF</KEYWORD1>
-			<KEYWORD1>REVEAL</KEYWORD1>
-			<KEYWORD1>VALUE</KEYWORD1>
-			<KEYWORD1>AS</KEYWORD1>
-			<KEYWORD1>END</KEYWORD1>
-			<KEYWORD1>IMPORT</KEYWORD1>
-			<KEYWORD1>OR</KEYWORD1>
-			<KEYWORD1>ROOT</KEYWORD1>
-			<KEYWORD1>VAR</KEYWORD1>
-			<KEYWORD1>BEGIN</KEYWORD1>
-			<KEYWORD1>EVAL</KEYWORD1>
-			<KEYWORD1>IN</KEYWORD1>
-			<KEYWORD1>OVERRIDES</KEYWORD1>
-			<KEYWORD1>SET</KEYWORD1>
-			<KEYWORD1>WHILE</KEYWORD1>
-			<KEYWORD1>BITS</KEYWORD1>
-			<KEYWORD1>EXCEPT</KEYWORD1>
-			<KEYWORD1>INTERFACE</KEYWORD1>
-			<KEYWORD1>PROCEDURE</KEYWORD1>
-			<KEYWORD1>THEN</KEYWORD1>
-			<KEYWORD1>WITH</KEYWORD1>
-			<KEYWORD1>BRANDED</KEYWORD1>
-			<KEYWORD1>EXCEPTION</KEYWORD1>
-			<KEYWORD1>LOCK</KEYWORD1>
-			<KEYWORD1>RAISE</KEYWORD1>
-			<KEYWORD1>TO</KEYWORD1>
-			<KEYWORD1>BY</KEYWORD1>
-			<KEYWORD1>EXIT</KEYWORD1>
-			<KEYWORD1>LOOP</KEYWORD1>
-			<KEYWORD1>RAISES</KEYWORD1>
-			<KEYWORD1>TRY</KEYWORD1>
-			<KEYWORD1>CASE</KEYWORD1>
-			<KEYWORD1>EXPORTS</KEYWORD1>
-			<KEYWORD1>METHODS</KEYWORD1>
-			<KEYWORD1>READONLY</KEYWORD1>
-			<KEYWORD1>TYPE</KEYWORD1>
-			<KEYWORD1>CONST</KEYWORD1>
-			<KEYWORD1>FINALLY</KEYWORD1>
-			<KEYWORD1>MOD</KEYWORD1>
-			<KEYWORD1>RECORD</KEYWORD1>
-			<KEYWORD1>TYPECASE</KEYWORD1>
-			<KEYWORD1>DIV</KEYWORD1>
-			<KEYWORD1>FOR</KEYWORD1>
-			<KEYWORD1>MODULE</KEYWORD1>
-			<KEYWORD1>REF</KEYWORD1>
-			<KEYWORD1>UNSAFE</KEYWORD1>
-
-			<!-- Reserved identifiers -->
-			<LITERAL2>ABS</LITERAL2>
-			<LITERAL2>BYTESIZE</LITERAL2>
-			<LITERAL2>EXTENDED</LITERAL2>
-			<LITERAL2>INTEGER</LITERAL2>
-			<LITERAL2>MIN</LITERAL2>
-			<LITERAL2>NUMBER</LITERAL2>
-			<LITERAL2>TEXT</LITERAL2>
-			<LITERAL2>ADDRESS</LITERAL2>
-			<LITERAL2>CARDINAL</LITERAL2>
-			<LITERAL2>FALSE</LITERAL2>
-			<LITERAL2>ISTYPE</LITERAL2>
-			<LITERAL2>MUTEX</LITERAL2>
-			<LITERAL2>ORD</LITERAL2>
-			<LITERAL2>TRUE</LITERAL2>
-			<LITERAL2>ADR</LITERAL2>
-			<LITERAL2>CEILING</LITERAL2>
-			<LITERAL2>FIRST</LITERAL2>
-			<LITERAL2>LAST</LITERAL2>
-			<LITERAL2>NARROW</LITERAL2>
-			<LITERAL2>REAL</LITERAL2>
-			<LITERAL2>TRUNC</LITERAL2>
-			<LITERAL2>ADRSIZE</LITERAL2>
-			<LITERAL2>CHAR</LITERAL2>
-			<LITERAL2>FLOAT</LITERAL2>
-			<LITERAL2>LONGREAL</LITERAL2>
-			<LITERAL2>NEW</LITERAL2>
-			<LITERAL2>REFANY</LITERAL2>
-			<LITERAL2>TYPECODE</LITERAL2>
-			<LITERAL2>BITSIZE</LITERAL2>
-			<LITERAL2>DEC</LITERAL2>
-			<LITERAL2>FLOOR</LITERAL2>
-			<LITERAL2>LOOPHOLE</LITERAL2>
-			<LITERAL2>NIL</LITERAL2>
-			<LITERAL2>ROUND</LITERAL2>
-			<LITERAL2>VAL</LITERAL2>
-			<LITERAL2>BOOLEAN</LITERAL2>
-			<LITERAL2>DISPOSE</LITERAL2>
-			<LITERAL2>INC</LITERAL2>
-			<LITERAL2>MAX</LITERAL2>
-			<LITERAL2>NULL</LITERAL2>
-			<LITERAL2>SUBARRAY</LITERAL2>
-
-			<!-- Standard interfaces -->
-			<!--  http://www.research.compaq.com/SRC/m3defn/html/intfs.html -->
-			<KEYWORD2>Text</KEYWORD2>
-			<KEYWORD2>Thread</KEYWORD2>
-			<KEYWORD2>Word</KEYWORD2>
-			<KEYWORD2>Real</KEYWORD2>
-			<KEYWORD2>LongReal</KEYWORD2>
-			<KEYWORD2>ExtendedReal</KEYWORD2>
-			<KEYWORD2>RealFloat</KEYWORD2>
-			<KEYWORD2>LongFloat</KEYWORD2>
-			<KEYWORD2>ExtendedFloat</KEYWORD2>
-			<KEYWORD2>FloatMode</KEYWORD2>
-
-			<!-- Recommended interfaces -->
-			<!--  http://www.research.compaq.com/SRC/m3defn/html/intfs.html -->
-			<KEYWORD3>Fmt</KEYWORD3>
-			<KEYWORD3>Lex</KEYWORD3>
-			<KEYWORD3>Pickle</KEYWORD3>
-			<KEYWORD3>Table</KEYWORD3>
-
-		</KEYWORDS>
-	</RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/moin.xml b/qpython/src/main/assets/syntax/moin.xml
deleted file mode 100644
index 1e62d2af..00000000
--- a/qpython/src/main/assets/syntax/moin.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="lineComment" VALUE="##" />
-		<PROPERTY NAME="wrap" VALUE="soft" />
-	</PROPS>
-	<RULES HIGHLIGHT_DIGITS="FALSE" IGNORE_CASE="FALSE">
-
-		<!-- comment -->
-		<EOL_SPAN TYPE="COMMENT1">##</EOL_SPAN>
-
-		<!-- directive -->
-		<EOL_SPAN TYPE="KEYWORD2">#pragma</EOL_SPAN>
-
-		<!-- macro -->
-		<SPAN TYPE="KEYWORD4">
-			<BEGIN>[[</BEGIN>
-			<END>]]</END>
-		</SPAN>
-
-		<!-- term definition -->
-		<SEQ_REGEXP
-			HASH_CHAR=' '
-			AT_LINE_START='TRUE'
-			TYPE="LABEL"
-		>\s+(?:\(|\)|\w)[\p{Alnum}\p{Blank}.()]+::</SEQ_REGEXP>
-
-		<!-- smileys -->
-		<!-- not on by default because it slows things down a bit
-		<SEQ_REGEXP HASH_CHAR=' ' AT_LINE_START='FALSE' TYPE="LITERAL3">\s\:\)\s</SEQ_REGEXP>
-		<SEQ_REGEXP HASH_CHAR=' ' AT_LINE_START='FALSE' TYPE="LITERAL3">\sB\)\s</SEQ_REGEXP>
-		<SEQ_REGEXP HASH_CHAR=' ' AT_LINE_START='FALSE' TYPE="LITERAL3">\s\:\)\)\s</SEQ_REGEXP>
-		<SEQ_REGEXP HASH_CHAR=' ' AT_LINE_START='FALSE' TYPE="LITERAL3">\s\;\)\s</SEQ_REGEXP>
-		<SEQ_REGEXP HASH_CHAR=' ' AT_LINE_START='FALSE' TYPE="LITERAL3">\s\:D\s</SEQ_REGEXP>
-		<SEQ_REGEXP HASH_CHAR=' ' AT_LINE_START='FALSE' TYPE="LITERAL3">\s\%lt;\:\(\s</SEQ_REGEXP>
-		<SEQ_REGEXP HASH_CHAR=' ' AT_LINE_START='FALSE' TYPE="LITERAL3">\sX\-\(\s</SEQ_REGEXP>
-		<SEQ_REGEXP HASH_CHAR=' ' AT_LINE_START='FALSE' TYPE="LITERAL3">\s\:o\s</SEQ_REGEXP>
-		<SEQ_REGEXP HASH_CHAR=' ' AT_LINE_START='FALSE' TYPE="LITERAL3">\s\:\(\s</SEQ_REGEXP>
-		<SEQ_REGEXP HASH_CHAR=' ' AT_LINE_START='FALSE' TYPE="LITERAL3">\s\/\!\\\s</SEQ_REGEXP>
-		<SEQ_REGEXP HASH_CHAR=' ' AT_LINE_START='FALSE' TYPE="LITERAL3">\s\%lt;\!\b\s</SEQ_REGEXP>
-		<SEQ_REGEXP HASH_CHAR=' ' AT_LINE_START='FALSE' TYPE="LITERAL3">\s\(\!\)\s</SEQ_REGEXP>
-		<SEQ_REGEXP HASH_CHAR=' ' AT_LINE_START='FALSE' TYPE="LITERAL3">\s\:\-\?\s</SEQ_REGEXP>
-		<SEQ_REGEXP HASH_CHAR=' ' AT_LINE_START='FALSE' TYPE="LITERAL3">\s\:\b\:\b\s</SEQ_REGEXP>
-		<SEQ_REGEXP HASH_CHAR=' ' AT_LINE_START='FALSE' TYPE="LITERAL3">\s\%\)\s</SEQ_REGEXP>
-		<SEQ_REGEXP HASH_CHAR=' ' AT_LINE_START='FALSE' TYPE="LITERAL3">\s\@\)\s</SEQ_REGEXP>
-		<SEQ_REGEXP HASH_CHAR=' ' AT_LINE_START='FALSE' TYPE="LITERAL3">\s\|\)\s</SEQ_REGEXP>
-		<SEQ_REGEXP HASH_CHAR=' ' AT_LINE_START='FALSE' TYPE="LITERAL3">\s\;\)\)\s</SEQ_REGEXP>
-		<SEQ_REGEXP HASH_CHAR=' ' AT_LINE_START='FALSE' TYPE="LITERAL3">\s\(\.\/\)\s</SEQ_REGEXP>
-		<SEQ_REGEXP HASH_CHAR=' ' AT_LINE_START='FALSE' TYPE="LITERAL3">\s\{OK\}\s</SEQ_REGEXP>
-		<SEQ_REGEXP HASH_CHAR=' ' AT_LINE_START='FALSE' TYPE="LITERAL3">\s\{X\}\s</SEQ_REGEXP>
-		<SEQ_REGEXP HASH_CHAR=' ' AT_LINE_START='FALSE' TYPE="LITERAL3">\s\{i\}\s</SEQ_REGEXP>
-		<SEQ_REGEXP HASH_CHAR=' ' AT_LINE_START='FALSE' TYPE="LITERAL3">\s\{1\}\s</SEQ_REGEXP>
-		<SEQ_REGEXP HASH_CHAR=' ' AT_LINE_START='FALSE' TYPE="LITERAL3">\s\{2\}\s</SEQ_REGEXP>
-		<SEQ_REGEXP HASH_CHAR=' ' AT_LINE_START='FALSE' TYPE="LITERAL3">\s\{3\}\s</SEQ_REGEXP>
-		-->
-
-		<!-- code or literal -->
-		<SPAN TYPE="LITERAL2">
-			<BEGIN>{{{</BEGIN>
-			<END>}}}</END>
-		</SPAN>
-
-		<!-- code or literal -->
-		<SPAN TYPE="LITERAL2" ESCAPE="\">
-			<BEGIN>`</BEGIN>
-			<END>`</END>
-		</SPAN>
-
-		<!-- bold or italic -->
-		<SEQ_REGEXP
-			HASH_CHAR="''"
-			TYPE="LITERAL1"
-		>('{2,5})[^']+\1[^']</SEQ_REGEXP>
-
-		<!-- horizontal rule -->
-		<SEQ_REGEXP
-			HASH_CHAR="----"
-			TYPE="LITERAL4"
-		>-{4,}</SEQ_REGEXP>
-
-		<!-- section header -->
-		<SPAN_REGEXP
-			HASH_CHAR="="
-			TYPE="KEYWORD1"
-			AT_LINE_START="TRUE"
-		>
-			<BEGIN>(={1,5}) </BEGIN>
-			<END> $1</END>
-		</SPAN_REGEXP>
-
-		<!-- implicit WikiWords - a bit of a hack, but I can't think of a better way... -->
-		<SEQ_REGEXP HASH_CHARS="ABCDEFGHIJKLMNOPQRSTUVWXYZ" AT_WORD_START="TRUE" TYPE="KEYWORD2">[A-Z][a-z]+[A-Z][a-zA-Z]+</SEQ_REGEXP>
-
-		<!-- explicit WikiWord -->
-		<SPAN TYPE="KEYWORD2">
-			<BEGIN>[&quot;</BEGIN>
-			<END>&quot;]</END>
-		</SPAN>
-
-		<!-- url -->
-		<SPAN TYPE="KEYWORD3">
-			<BEGIN>[</BEGIN>
-			<END>]</END>
-		</SPAN>
-
-	</RULES>
-</MODE>
-
diff --git a/qpython/src/main/assets/syntax/mpost.xml b/qpython/src/main/assets/syntax/mpost.xml
deleted file mode 100644
index 989ddecd..00000000
--- a/qpython/src/main/assets/syntax/mpost.xml
+++ /dev/null
@@ -1,350 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-<!--
- METAPOST syntax highlight v0.1.0
- Made by Kondr <kondr@lesnimoudrost.cz>
- Last revision: 2007-05-04
- Cooperates with LaTeX syntax higlight (tested with the jEdit default latex.xml)
- 
- Kyword types
- ************
- 1 Basic keywords (for, begingig, ... )
- 2 Statements
- 3 Variables
- 4 Constants
- 
- Macros are considred as functions, including the z,x,y prefixes.
- 
- Recommended catalog entry:
- 
-   <MODE NAME="Metapost"
-         FILE="mpost.xml"
-         FILE_NAME_GLOB="*.mp"/>
--->
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="lineComment" VALUE="%"/>
-	</PROPS>
-	<RULES HIGHLIGHT_DIGITS="TRUE" DIGIT_RE="(0x[[:xdigit:]]+[lL]?|[[:digit:]]+(e[[:digit:]]*)?[lLdDfF]?(cm|in|pt|px)?)">
-	   		<!-- btex...etex -->
-		<SPAN TYPE="MARKUP" DELEGATE="tex::MAIN">
-			<BEGIN>btex</BEGIN>
-			<END>etex</END>
-		</SPAN>
-			
-		<!-- types -->
-		<SEQ TYPE="OPERATOR">path</SEQ>
-		<SEQ TYPE="OPERATOR">pair</SEQ>
-		<EOL_SPAN TYPE="COMMENT1">%</EOL_SPAN>
-		
-		<!-- xyz suffixes -->
-		<SEQ_REGEXP HASH_CHAR="z" AT_WORD_START="TRUE" TYPE="FUNCTION">z[0-9]?</SEQ_REGEXP>
-		<SEQ_REGEXP HASH_CHAR="x" AT_WORD_START="TRUE" TYPE="FUNCTION">x[0-9]?</SEQ_REGEXP>
-		<SEQ_REGEXP HASH_CHAR="y" AT_WORD_START="TRUE" TYPE="FUNCTION">y[0-9]?</SEQ_REGEXP>
-		<MARK_PREVIOUS TYPE="FUNCTION" MATCH_TYPE="CONTEXT">(</MARK_PREVIOUS>
-		
-		<SEQ TYPE="OPERATOR">&amp;</SEQ>
-		<SEQ TYPE="OPERATOR">*</SEQ>
-		<SEQ TYPE="OPERATOR">*</SEQ>
-		<SEQ TYPE="OPERATOR">**</SEQ>
-		<SEQ TYPE="OPERATOR">+</SEQ>
-		<SEQ TYPE="OPERATOR">++</SEQ>
-		<SEQ TYPE="OPERATOR">+-+</SEQ>
-		<SEQ TYPE="OPERATOR">-</SEQ>
-		<SEQ TYPE="OPERATOR">.</SEQ>
-		<SEQ TYPE="OPERATOR">/</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;=</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;&gt;</SEQ>
-		
-		<KEYWORDS>
-		    <!-- basic keywords -->
-			<KEYWORD1>beginfig</KEYWORD1>
-			<KEYWORD1>endfig</KEYWORD1>
-			<KEYWORD1>for</KEYWORD1>
-			<KEYWORD1>upto</KEYWORD1>
-			<KEYWORD1>downto</KEYWORD1>
-			<KEYWORD1>def</KEYWORD1>
-			<KEYWORD1>enddef</KEYWORD1>
-			<KEYWORD1>vardef</KEYWORD1>
-			<KEYWORD1>step</KEYWORD1>
-			<KEYWORD1>until</KEYWORD1>
-			<KEYWORD1>endfor</KEYWORD1>
-			<KEYWORD1>bye</KEYWORD1>
-			<KEYWORD1>if</KEYWORD1>
-			<KEYWORD1>elseif</KEYWORD1>
-			<KEYWORD1>else:</KEYWORD1>
-			<KEYWORD1>fi</KEYWORD1>
-			<KEYWORD1>exitif</KEYWORD1>
-			<KEYWORD1>exitunless</KEYWORD1>
-			<KEYWORD1>forever:</KEYWORD1>
-			<KEYWORD1>forsuffixes</KEYWORD1>
-			<KEYWORD1>end</KEYWORD1>
-			<KEYWORD1>begingroup</KEYWORD1>
-			<KEYWORD1>endgroup</KEYWORD1>
-			<KEYWORD1>save</KEYWORD1>
-			<KEYWORD1>unknown</KEYWORD1>
-			<KEYWORD1>input</KEYWORD1>
-			<KEYWORD1>newinternal</KEYWORD1>
-		
-			<!-- statements -->
-			<KEYWORD2>addto</KEYWORD2>
-			<KEYWORD2>clip</KEYWORD2>
-			<KEYWORD2>cutdraw</KEYWORD2>
-			<KEYWORD2>draw</KEYWORD2>
-			<KEYWORD2>drawarrow</KEYWORD2>
-			<KEYWORD2>drawdblarrow</KEYWORD2>
-			<KEYWORD2>fill</KEYWORD2>
-			<KEYWORD2>filldraw</KEYWORD2>
-			<KEYWORD2>interim</KEYWORD2>
-			<KEYWORD2>let</KEYWORD2>
-			<KEYWORD2>loggingall</KEYWORD2>
-			<KEYWORD2>newinternal</KEYWORD2>
-			<KEYWORD2>pickup</KEYWORD2>
-			<KEYWORD2>save</KEYWORD2>
-			<KEYWORD2>setbounds</KEYWORD2>
-			<KEYWORD2>shipout</KEYWORD2>
-			<KEYWORD2>show</KEYWORD2>
-			<KEYWORD2>showdependencies</KEYWORD2>
-			<KEYWORD2>showtoken</KEYWORD2>
-			<KEYWORD2>showvariable</KEYWORD2>
-			<KEYWORD2>special</KEYWORD2>
-			<KEYWORD2>tracingall</KEYWORD2>
-			<KEYWORD2>tracingnone</KEYWORD2>
-			<KEYWORD2>undraw</KEYWORD2>
-			<KEYWORD2>unfill</KEYWORD2>
-			<KEYWORD2>unfilldraw</KEYWORD2>
-			
-			<!-- variables -->
-			<KEYWORD3>ahangle</KEYWORD3>
-			<KEYWORD3>ahlength</KEYWORD3>
-			<KEYWORD3>bboxmargin</KEYWORD3>
-			<KEYWORD3>charcode</KEYWORD3>
-			<KEYWORD3>circmargin</KEYWORD3>
-			<KEYWORD3>day</KEYWORD3>
-			<KEYWORD3>defaultcolormodel</KEYWORD3>
-			<KEYWORD3>defaultdx</KEYWORD3>
-			<KEYWORD3>defaultdy</KEYWORD3>
-			<KEYWORD3>defaultpen</KEYWORD3>
-			<KEYWORD3>defaultscale</KEYWORD3>
-			<KEYWORD3>labeloffset</KEYWORD3>
-			<KEYWORD3>linecap</KEYWORD3>
-			<KEYWORD3>linejoin</KEYWORD3>
-			<KEYWORD3>miterlimit</KEYWORD3>
-			<KEYWORD3>month</KEYWORD3>
-			<KEYWORD3>mpprocset</KEYWORD3>
-			<KEYWORD3>pausing</KEYWORD3>
-			<KEYWORD3>prologues</KEYWORD3>
-			<KEYWORD3>restoreclipcolor</KEYWORD3>
-			<KEYWORD3>showstopping</KEYWORD3>
-			<KEYWORD3>time</KEYWORD3>
-			<KEYWORD3>tracingcapsules</KEYWORD3>
-			<KEYWORD3>tracingchoices</KEYWORD3>
-			<KEYWORD3>tracingcommands</KEYWORD3>
-			<KEYWORD3>tracingequations</KEYWORD3>
-			<KEYWORD3>tracinglostchars</KEYWORD3>
-			<KEYWORD3>tracingmacros</KEYWORD3>
-			<KEYWORD3>tracingonline</KEYWORD3>
-			<KEYWORD3>tracingoutput</KEYWORD3>
-			<KEYWORD3>tracingrestores</KEYWORD3>
-			<KEYWORD3>tracingspecs</KEYWORD3>
-			<KEYWORD3>tracingstats</KEYWORD3>
-			<KEYWORD3>tracingtitles</KEYWORD3>
-			<KEYWORD3>troffmode</KEYWORD3>
-			<KEYWORD3>truecorners</KEYWORD3>
-			<KEYWORD3>warningcheck</KEYWORD3>
-			<KEYWORD3>year </KEYWORD3>
-			<KEYWORD3>background</KEYWORD3>
-			<KEYWORD3>currentpen</KEYWORD3>
-			<KEYWORD3>currentpicture</KEYWORD3>
-			<KEYWORD3>cuttings</KEYWORD3>
-			<KEYWORD3>defaultfont</KEYWORD3>
-			<KEYWORD3>extra_beginfig</KEYWORD3>
-			<KEYWORD3>extra_endfig</KEYWORD3> 
-
-			<!-- constants -->
-			<KEYWORD4>beveled</KEYWORD4>
-			<KEYWORD4>black</KEYWORD4>
-			<KEYWORD4>blue</KEYWORD4>
-			<KEYWORD4>bp</KEYWORD4>
-			<KEYWORD4>butt</KEYWORD4>
-			<KEYWORD4>cc</KEYWORD4>
-			<KEYWORD4>cm</KEYWORD4>
-			<KEYWORD4>dd</KEYWORD4>
-			<KEYWORD4>ditto</KEYWORD4>
-			<KEYWORD4>down</KEYWORD4>
-			<KEYWORD4>epsilon</KEYWORD4>
-			<KEYWORD4>evenly</KEYWORD4>
-			<KEYWORD4>false</KEYWORD4>
-			<KEYWORD4>fullcircle</KEYWORD4>
-			<KEYWORD4>green</KEYWORD4>
-			<KEYWORD4>halfcircle</KEYWORD4>
-			<KEYWORD4>identity</KEYWORD4>
-			<KEYWORD4>in</KEYWORD4>
-			<KEYWORD4>infinity</KEYWORD4>
-			<KEYWORD4>left</KEYWORD4>
-			<KEYWORD4>mitered</KEYWORD4>
-			<KEYWORD4>mm</KEYWORD4>
-			<KEYWORD4>mpversion</KEYWORD4>
-			<KEYWORD4>nullpicture</KEYWORD4>
-			<KEYWORD4>origin</KEYWORD4>
-			<KEYWORD4>pc</KEYWORD4>
-			<KEYWORD4>pencircle</KEYWORD4>
-			<KEYWORD4>pensquare</KEYWORD4>
-			<KEYWORD4>pt</KEYWORD4>
-			<KEYWORD4>quartercircle</KEYWORD4>
-			<KEYWORD4>red</KEYWORD4>
-			<KEYWORD4>right</KEYWORD4>
-			<KEYWORD4>rounded</KEYWORD4>
-			<KEYWORD4>and</KEYWORD4>
-			<KEYWORD4>squared</KEYWORD4>
-			<KEYWORD4>true</KEYWORD4>
-			<KEYWORD4>unitsquare</KEYWORD4>
-			<KEYWORD4>up</KEYWORD4>
-			<KEYWORD4>white</KEYWORD4>
-			<KEYWORD4>withdots</KEYWORD4>
-						
-			<!-- functions -->
-			<FUNCTION>boxit</FUNCTION>
-			<FUNCTION>boxjoin</FUNCTION>
-			<FUNCTION>bpath</FUNCTION>
-			<FUNCTION>buildcycle</FUNCTION>
-			<FUNCTION>circleit</FUNCTION>
-			<FUNCTION>circleit</FUNCTION>
-			<FUNCTION>circleit</FUNCTION>
-			<FUNCTION>dashpattern</FUNCTION>
-			<FUNCTION>decr</FUNCTION>
-			<FUNCTION>dotlabel</FUNCTION>
-			<FUNCTION>dotlabel</FUNCTION>
-			<FUNCTION>dotlabels</FUNCTION>
-			<FUNCTION>drawboxed</FUNCTION>
-			<FUNCTION>contents</FUNCTION>
-			<FUNCTION>drawdot</FUNCTION>
-			<FUNCTION>drawoptions</FUNCTION>
-			<FUNCTION>drawunboxed</FUNCTION>
-			<FUNCTION>fixpos</FUNCTION>
-			<FUNCTION>named</FUNCTION>
-			<FUNCTION>fixsize</FUNCTION>
-			<FUNCTION>image</FUNCTION>
-			<FUNCTION>incr</FUNCTION>
-			<FUNCTION>label</FUNCTION>
-			<FUNCTION>label</FUNCTION>
-			<FUNCTION>labels</FUNCTION>
-			<FUNCTION>max</FUNCTION>
-			<FUNCTION>max</FUNCTION>
-			<FUNCTION>min</FUNCTION>
-			<FUNCTION>min</FUNCTION>
-			<FUNCTION>pic</FUNCTION>
-			<FUNCTION>thelabel</FUNCTION>
-			<FUNCTION>thelabel</FUNCTION>
-			<OPERATOR>rotatedaround</OPERATOR>
-			<!-- operators -->
-			<OPERATOR>abs</OPERATOR>
-			<OPERATOR>angle</OPERATOR>
-			<OPERATOR>arclength</OPERATOR>
-			<OPERATOR>arctime</OPERATOR>
-			<OPERATOR>ASCII</OPERATOR>
-			<OPERATOR>bbox</OPERATOR>
-			<OPERATOR>bluepart</OPERATOR>
-			<OPERATOR>boolean</OPERATOR>
-			<OPERATOR>bot</OPERATOR>
-			<OPERATOR>ceiling</OPERATOR>
-			<OPERATOR>center</OPERATOR>
-			<OPERATOR>char</OPERATOR>
-			<OPERATOR>cmykcolor</OPERATOR>
-			<OPERATOR>colormodel</OPERATOR>
-			<OPERATOR>color</OPERATOR>
-			<OPERATOR>cosd</OPERATOR>
-			<OPERATOR>cutafter</OPERATOR>
-			<OPERATOR>intersection</OPERATOR>
-			<OPERATOR>cutbefore</OPERATOR>
-			<OPERATOR>intersection</OPERATOR>
-			<OPERATOR>cyanpart</OPERATOR>
-			<OPERATOR>cycle</OPERATOR>
-			<OPERATOR>decimal</OPERATOR>
-			<OPERATOR>dir</OPERATOR>
-			<OPERATOR>direction</OPERATOR>
-			<OPERATOR>directionpoint</OPERATOR>
-			<OPERATOR>directiontime</OPERATOR>
-			<OPERATOR>div</OPERATOR>
-			<OPERATOR>dotprod</OPERATOR>
-			<OPERATOR>floor</OPERATOR>
-			<OPERATOR>fontsize</OPERATOR>
-			<OPERATOR>greenpart</OPERATOR>
-			<OPERATOR>greypart</OPERATOR>
-			<OPERATOR>hex</OPERATOR>
-			<OPERATOR>infont</OPERATOR>
-			<OPERATOR>intersectionpoint</OPERATOR>
-			<OPERATOR>intesctiontimes</OPERATOR>
-			<OPERATOR>inverse</OPERATOR>
-			<OPERATOR>known</OPERATOR>
-			<OPERATOR>length</OPERATOR>
-			<OPERATOR>ulft</OPERATOR>
-			<OPERATOR>llft</OPERATOR>
-			<OPERATOR>lft</OPERATOR>
-			<OPERATOR>llcorner</OPERATOR>
-			<OPERATOR>lrcorner</OPERATOR>
-			<OPERATOR>magentapart</OPERATOR>
-			<OPERATOR>makemakeconvex</OPERATOR>
-			<OPERATOR>mexp</OPERATOR>
-			<OPERATOR>mlog</OPERATOR>
-			<OPERATOR>mod</OPERATOR>
-			<OPERATOR>normaldeviate</OPERATOR>
-			<OPERATOR>not</OPERATOR>
-			<OPERATOR>numeric</OPERATOR>
-			<OPERATOR>oct</OPERATOR>
-			<OPERATOR>odd</OPERATOR>
-			<OPERATOR>or</OPERATOR>
-			<OPERATOR>of</OPERATOR>
-			<OPERATOR>penoffset</OPERATOR>
-			<OPERATOR>picture</OPERATOR>
-			<OPERATOR>point</OPERATOR>
-			<OPERATOR>postcontrol</OPERATOR>
-			<OPERATOR>precontrol</OPERATOR>
-			<OPERATOR>redpart</OPERATOR>
-			<OPERATOR>reverse</OPERATOR>
-			<OPERATOR>swapped</OPERATOR>
-			<OPERATOR>rgbcolor</OPERATOR>
-			<OPERATOR>rotated</OPERATOR>
-			<OPERATOR>reflectedabout</OPERATOR>
-			<OPERATOR>round</OPERATOR>
-			<OPERATOR>lrt</OPERATOR>
-			<OPERATOR>urt</OPERATOR>
-			<OPERATOR>rt</OPERATOR>
-			<OPERATOR>scaled</OPERATOR>
-			<OPERATOR>scantokens</OPERATOR>
-			<OPERATOR>token</OPERATOR>
-			<OPERATOR>top</OPERATOR>
-			<OPERATOR>to</OPERATOR>
-			<OPERATOR>shifted</OPERATOR>
-			<OPERATOR>sind</OPERATOR>
-			<OPERATOR>slanted</OPERATOR>
-			<OPERATOR>sqrt</OPERATOR>
-			<OPERATOR>string</OPERATOR>
-			<OPERATOR>str</OPERATOR>
-			<OPERATOR>subof</OPERATOR>
-			<OPERATOR>substring</OPERATOR>
-			<OPERATOR>transformed</OPERATOR>
-			<OPERATOR>transform</OPERATOR>
-			<OPERATOR>ulcorner</OPERATOR>
-			<OPERATOR>uniformdeviate</OPERATOR>
-			<OPERATOR>unitvector</OPERATOR>
-			<OPERATOR>unknown</OPERATOR>
-			<OPERATOR>urcorner</OPERATOR>
-			<OPERATOR>whatever</OPERATOR>
-			<OPERATOR>xpart</OPERATOR>
-			<OPERATOR>xxpart</OPERATOR>
-			<OPERATOR>xypart</OPERATOR>
-			<OPERATOR>yellowpart</OPERATOR>
-			<OPERATOR>ypart</OPERATOR>
-			<OPERATOR>yxpart</OPERATOR>
-			<OPERATOR>yypart</OPERATOR>
-			<OPERATOR>zscaled</OPERATOR>
-			<OPERATOR>dashed</OPERATOR>
-			<OPERATOR>pen</OPERATOR>
-			<OPERATOR>suffix</OPERATOR>
-			<OPERATOR>expr</OPERATOR>
-		</KEYWORDS>
-	
-	</RULES>
-</MODE>
\ No newline at end of file
diff --git a/qpython/src/main/assets/syntax/mqsc.xml b/qpython/src/main/assets/syntax/mqsc.xml
deleted file mode 100644
index 1fe47c65..00000000
--- a/qpython/src/main/assets/syntax/mqsc.xml
+++ /dev/null
@@ -1,235 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-<!--
-  IBM WebSphere MQ Scripting (MQSC)
-  - by Aaron Bell <aaron@clockworklogic.co.uk>
-  - accurate for WebSphere MQ 5.2.
-  - ensure your LITERAL1 and LITERAL2 colours are set differently.
--->
-<MODE>
-	<PROPS>
-		<!-- asterisks are comments -->
-		<PROPERTY NAME="lineComment" VALUE="*"/>
-		<PROPERTY NAME="contextInsensitive" VALUE="true"/>
-	</PROPS>
-	<!-- ignore case, highlight numbers -->
-	<RULES IGNORE_CASE="TRUE" HIGHLIGHT_DIGITS="TRUE">
-
-		<!-- lines beginning with asterisk are comments -->
-		<EOL_SPAN TYPE="COMMENT1" AT_LINE_START="TRUE">*</EOL_SPAN>
-
-		<!-- brackets on one line delimit parameter values, don't parse -->
-		<!-- case 1: string values using apostrophe marks -->
-		<SPAN TYPE="LITERAL1" ESCAPE="\" NO_LINE_BREAK="TRUE" MATCH_TYPE="OPERATOR">
-			<BEGIN>('</BEGIN>
-			<END>')</END>
-		</SPAN>
-		<!-- case 2: literal values and object names -->
-		<SPAN TYPE="LITERAL2" ESCAPE="\" NO_LINE_BREAK="TRUE" MATCH_TYPE="OPERATOR">
-			<BEGIN>(</BEGIN>
-			<END>)</END>
-		</SPAN>
-
-		<!-- line continuation symbol -->
-		<SEQ TYPE="OPERATOR">+</SEQ>
-
-		<KEYWORDS>
-			<!-- KEYWORD1 are core MQSC commands -->
-			<KEYWORD1>all</KEYWORD1>
-			<!-- as in DIS Q(X) ALL -->
-			<KEYWORD1>alter</KEYWORD1>
-			<KEYWORD1>alt</KEYWORD1>
-			<KEYWORD1>clear</KEYWORD1>
-			<KEYWORD1>define</KEYWORD1>
-			<KEYWORD1>def</KEYWORD1>
-			<KEYWORD1>delete</KEYWORD1>
-			<KEYWORD1>display</KEYWORD1>
-			<KEYWORD1>dis</KEYWORD1>
-			<KEYWORD1>end</KEYWORD1>
-			<KEYWORD1>like</KEYWORD1>
-			<!-- as in DEF Q(X) LIKE(Y) -->
-			<KEYWORD1>ping</KEYWORD1>
-			<KEYWORD1>refresh</KEYWORD1>
-			<KEYWORD1>ref</KEYWORD1>
-			<KEYWORD1>replace</KEYWORD1>
-			<!-- as in DEF Q(X) REPLACE -->
-			<KEYWORD1>reset</KEYWORD1>
-			<KEYWORD1>resolve</KEYWORD1>
-			<KEYWORD1>resume</KEYWORD1>
-			<KEYWORD1>start</KEYWORD1>
-			<KEYWORD1>stop</KEYWORD1>
-			<KEYWORD1>suspend</KEYWORD1>
-
-			<!-- KEYWORD2 are object types -->
-			<KEYWORD2>channel</KEYWORD2>
-			<KEYWORD2>chl</KEYWORD2>
-			<KEYWORD2>chstatus</KEYWORD2>
-			<KEYWORD2>chst</KEYWORD2>
-			<KEYWORD2>clusqmgr</KEYWORD2>
-			<KEYWORD2>process</KEYWORD2>
-			<KEYWORD2>proc</KEYWORD2>
-			<KEYWORD2>namelist</KEYWORD2>
-			<KEYWORD2>nl</KEYWORD2>
-			<KEYWORD2>qalias</KEYWORD2>
-			<KEYWORD2>qa</KEYWORD2>
-			<KEYWORD2>qcluster</KEYWORD2>
-			<KEYWORD2>qc</KEYWORD2>
-			<KEYWORD2>qlocal</KEYWORD2>
-			<KEYWORD2>ql</KEYWORD2>
-			<KEYWORD2>qmodel</KEYWORD2>
-			<KEYWORD2>qm</KEYWORD2>
-			<KEYWORD2>qmgr</KEYWORD2>
-			<KEYWORD2>qremote</KEYWORD2>
-			<KEYWORD2>qr</KEYWORD2>
-			<KEYWORD2>queue</KEYWORD2>
-
-			<!-- MARKUP are object attributes -->
-			<MARKUP>altdate</MARKUP>
-			<MARKUP>alttime</MARKUP>
-			<MARKUP>applicid</MARKUP>
-			<MARKUP>appltype</MARKUP>
-			<MARKUP>authorev</MARKUP>
-			<MARKUP>batches</MARKUP>
-			<MARKUP>batchint</MARKUP>
-			<MARKUP>batchsz</MARKUP>
-			<MARKUP>boqname</MARKUP>
-			<MARKUP>bothresh</MARKUP>
-			<MARKUP>bufsrcvd</MARKUP>
-			<MARKUP>bufssent</MARKUP>
-			<MARKUP>bytsrcvd</MARKUP>
-			<MARKUP>bytssent</MARKUP>
-			<MARKUP>ccsid</MARKUP>
-			<MARKUP>chad</MARKUP>
-			<MARKUP>chadev</MARKUP>
-			<MARKUP>chadexit</MARKUP>
-			<MARKUP>channel</MARKUP>
-			<MARKUP>chltype</MARKUP>
-			<MARKUP>chstada</MARKUP>
-			<MARKUP>chstati</MARKUP>
-			<MARKUP>clusdate</MARKUP>
-			<MARKUP>clusinfo</MARKUP>
-			<MARKUP>clusnl</MARKUP>
-			<MARKUP>clusqmgr</MARKUP>
-			<MARKUP>clusqt</MARKUP>
-			<MARKUP>cluster</MARKUP>
-			<MARKUP>clustime</MARKUP>
-			<MARKUP>clwldata</MARKUP>
-			<MARKUP>clwlexit</MARKUP>
-			<MARKUP>clwlwen</MARKUP>
-			<MARKUP>cmdlevel</MARKUP>
-			<MARKUP>commandq</MARKUP>
-			<MARKUP>conname</MARKUP>
-			<MARKUP>convert</MARKUP>
-			<MARKUP>crdate</MARKUP>
-			<MARKUP>crtime</MARKUP>
-			<MARKUP>curdepth</MARKUP>
-			<MARKUP>curluwid</MARKUP>
-			<MARKUP>curmsgs</MARKUP>
-			<MARKUP>curseqno</MARKUP>
-			<MARKUP>deadq</MARKUP>
-			<MARKUP>defbind</MARKUP>
-			<MARKUP>defprty</MARKUP>
-			<MARKUP>defpsist</MARKUP>
-			<MARKUP>defsopt</MARKUP>
-			<MARKUP>deftype</MARKUP>
-			<MARKUP>defxmitq</MARKUP>
-			<MARKUP>descr</MARKUP>
-			<MARKUP>discint</MARKUP>
-			<MARKUP>distl</MARKUP>
-			<MARKUP>envrdata</MARKUP>
-			<MARKUP>get</MARKUP>
-			<MARKUP>hardenbo</MARKUP>
-			<MARKUP>hbint</MARKUP>
-			<MARKUP>indoubt</MARKUP>
-			<MARKUP>inhibtev</MARKUP>
-			<MARKUP>initq</MARKUP>
-			<MARKUP>ipprocs</MARKUP>
-			<MARKUP>jobname</MARKUP>
-			<MARKUP>localev</MARKUP>
-			<MARKUP>longrts</MARKUP>
-			<MARKUP>longrty</MARKUP>
-			<MARKUP>longtmr</MARKUP>
-			<MARKUP>lstluwid</MARKUP>
-			<MARKUP>lstmsgda</MARKUP>
-			<MARKUP>lstmsgti</MARKUP>
-			<MARKUP>lstseqno</MARKUP>
-			<MARKUP>maxdepth</MARKUP>
-			<MARKUP>maxhands</MARKUP>
-			<MARKUP>maxmsgl</MARKUP>
-			<MARKUP>maxprty</MARKUP>
-			<MARKUP>maxumsgs</MARKUP>
-			<MARKUP>mcaname</MARKUP>
-			<MARKUP>mcastat</MARKUP>
-			<MARKUP>mcatype</MARKUP>
-			<MARKUP>mcauser</MARKUP>
-			<MARKUP>modename</MARKUP>
-			<MARKUP>mrdata</MARKUP>
-			<MARKUP>mrexit</MARKUP>
-			<MARKUP>mrrty</MARKUP>
-			<MARKUP>mrtmr</MARKUP>
-			<MARKUP>msgdata</MARKUP>
-			<MARKUP>msgdlvsq</MARKUP>
-			<MARKUP>msgexit</MARKUP>
-			<MARKUP>msgs</MARKUP>
-			<MARKUP>namcount</MARKUP>
-			<MARKUP>names</MARKUP>
-			<MARKUP>netprty</MARKUP>
-			<MARKUP>npmspeed</MARKUP>
-			<MARKUP>opprocs</MARKUP>
-			<MARKUP>password</MARKUP>
-			<MARKUP>perfmev</MARKUP>
-			<MARKUP>platform</MARKUP>
-			<MARKUP>process</MARKUP>
-			<MARKUP>put</MARKUP>
-			<MARKUP>putaut</MARKUP>
-			<MARKUP>qdepthhi</MARKUP>
-			<MARKUP>qdepthlo</MARKUP>
-			<MARKUP>qdphiev</MARKUP>
-			<MARKUP>qdploev</MARKUP>
-			<MARKUP>qdpmaxev</MARKUP>
-			<MARKUP>qmid</MARKUP>
-			<MARKUP>qmname</MARKUP>
-			<MARKUP>qmtype</MARKUP>
-			<MARKUP>qsvciev</MARKUP>
-			<MARKUP>qsvcint</MARKUP>
-			<MARKUP>qtype</MARKUP>
-			<MARKUP>rcvdata</MARKUP>
-			<MARKUP>rcvexit</MARKUP>
-			<MARKUP>remoteev</MARKUP>
-			<MARKUP>repos</MARKUP>
-			<MARKUP>reposnl</MARKUP>
-			<MARKUP>retintvl</MARKUP>
-			<MARKUP>rname</MARKUP>
-			<MARKUP>rqmname</MARKUP>
-			<MARKUP>scope</MARKUP>
-			<MARKUP>scydata</MARKUP>
-			<MARKUP>scyexit</MARKUP>
-			<MARKUP>senddata</MARKUP>
-			<MARKUP>sendexit</MARKUP>
-			<MARKUP>seqwrap</MARKUP>
-			<MARKUP>share</MARKUP>
-			<MARKUP>shortrts</MARKUP>
-			<MARKUP>shortrty</MARKUP>
-			<MARKUP>shorttmr</MARKUP>
-			<MARKUP>status</MARKUP>
-			<MARKUP>stopreq</MARKUP>
-			<MARKUP>strstpev</MARKUP>
-			<MARKUP>suspend</MARKUP>
-			<MARKUP>syncpt</MARKUP>
-			<MARKUP>targq</MARKUP>
-			<MARKUP>tpname</MARKUP>
-			<MARKUP>trigdata</MARKUP>
-			<MARKUP>trigdpth</MARKUP>
-			<MARKUP>trigger</MARKUP>
-			<MARKUP>trigint</MARKUP>
-			<MARKUP>trigmpri</MARKUP>
-			<MARKUP>trigtype</MARKUP>
-			<MARKUP>trptype</MARKUP>
-			<MARKUP>type</MARKUP>
-			<MARKUP>usage</MARKUP>
-			<MARKUP>userdata</MARKUP>
-			<MARKUP>userid</MARKUP>
-			<MARKUP>xmitq</MARKUP>
-		</KEYWORDS>
-	</RULES>
-</MODE>
\ No newline at end of file
diff --git a/qpython/src/main/assets/syntax/mustache.xml b/qpython/src/main/assets/syntax/mustache.xml
deleted file mode 100644
index d9456684..00000000
--- a/qpython/src/main/assets/syntax/mustache.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!-- CPlex LP mode, by Kevin Hunter Kesling for jEdit 4.5+ -->
-<!-- Note that this follows CanJS's implementation of Mustache, as at least -->
-<!-- some of us appreciate some logic in our templates. -->
-<!-- License: GPLv3+ -->
-
-<MODE>
-	<RULES IGNORE_CASE="FALSE" HIGHLIGHT_DIGITS="FALSE">
-
-		<SPAN TYPE="COMMENT1">
-			<BEGIN>{{!</BEGIN>
-			<END>}}</END>
-		</SPAN>
-
-		<SEQ TYPE="KEYWORD3">{{else}}</SEQ>
-		<SEQ TYPE="KEYWORD2">{{.}}</SEQ>
-
-		<SPAN TYPE="COMMENT3" MATCH_TYPE="KEYWORD4">
-			<BEGIN>{{&gt;</BEGIN>
-			<END>}}</END>
-		</SPAN>
-
-		<SPAN_REGEXP HASH_CHAR="{" MATCH_TYPE="KEYWORD3" DELEGATE='MAIN'>
-			<BEGIN><![CDATA[\{\{#(each|if) .*?\}\}]]></BEGIN>
-			<END>{{/$1}}</END>
-		</SPAN_REGEXP>
-
-		<SPAN_REGEXP HASH_CHAR="{" MATCH_TYPE="KEYWORD2" DELEGATE='MAIN'>
-			<BEGIN><![CDATA[\{\{#([\p{Alnum}_\.]+)\}\}]]></BEGIN>
-			<END>{{/$1}}</END>
-		</SPAN_REGEXP>
-
-		<SEQ_REGEXP HASH_CHAR="{" TYPE='LITERAL2'>\{\{[A-z_][A-z_.]*\}\}</SEQ_REGEXP>
-
-		<SPAN TYPE="MARKUP" DELEGATE="javascript::MAIN">
-			<BEGIN>&lt;%</BEGIN>
-			<END>%&gt;</END>
-		</SPAN>
-
-		<SEQ TYPE="KEYWORD4">{{{</SEQ>
-		<MARK_PREVIOUS TYPE="LITERAL4" MATCH_TYPE="KEYWORD4">}}}</MARK_PREVIOUS>
-
-		<SEQ TYPE="KEYWORD4">{{</SEQ>
-		<MARK_PREVIOUS TYPE="LITERAL2" MATCH_TYPE="KEYWORD4">}}</MARK_PREVIOUS>
-
-		<IMPORT DELEGATE="html::MAIN" />
-
-	</RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/mxml.xml b/qpython/src/main/assets/syntax/mxml.xml
deleted file mode 100644
index e89a1828..00000000
--- a/qpython/src/main/assets/syntax/mxml.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="commentStart" VALUE="&lt;!--" />
-		<PROPERTY NAME="commentEnd" VALUE="--&gt;" />
-	</PROPS>
-	<RULES>
-	
-		
-		<!-- SGML comment -->
-		<SPAN TYPE="COMMENT1">
-			<BEGIN>&lt;!--</BEGIN>
-			<END>--&gt;</END>
-		</SPAN>
-
-		<!-- DTD Entity declarations -->
-		<SPAN TYPE="KEYWORD2" DELEGATE="ENTITY-TAGS">
-			<BEGIN>&lt;!ENTITY</BEGIN>
-			<END>&gt;</END>
-		</SPAN>
-
-		<!-- CDATA sections -->
-		<SPAN TYPE="KEYWORD2" DELEGATE="ACTIONSCRIPT">
-			<BEGIN>&lt;![CDATA</BEGIN>
-			<END>]]&gt;</END>
-		</SPAN>
-
-		<!-- DTD instructions -->
-		<SPAN TYPE="KEYWORD2" DELEGATE="DTD-TAGS">
-			<BEGIN>&lt;!</BEGIN>
-			<END>&gt;</END>
-		</SPAN>
-
-		<!-- PI directives -->
-		<SPAN TYPE="KEYWORD3">
-			<BEGIN>&lt;?</BEGIN>
-			<END>&gt;</END>
-		</SPAN>
-
-		<!-- markup tags -->
-		<SPAN TYPE="MARKUP" DELEGATE="TAGS">
-			<BEGIN>&lt;</BEGIN>
-			<END>&gt;</END>
-		</SPAN>
-
-		<!-- SGML entities -->
-		<SPAN TYPE="LITERAL2" NO_WORD_BREAK="TRUE">
-			<BEGIN>&amp;</BEGIN>
-			<END>;</END>
-		</SPAN>
-		
-	</RULES>
-	<RULES SET="ACTIONSCRIPT" DEFAULT="MARKUP" IGNORE_CASE="FALSE">
-		<SEQ TYPE="KEYWORD2" DELEGATE="actionscript::MAIN">[</SEQ>
-	</RULES>
-<RULES SET="TAGS" DEFAULT="MARKUP" NO_WORD_SEP="-_">
-		<!-- SGML comment -->
-		<SPAN TYPE="COMMENT1">
-			<BEGIN>&lt;!--</BEGIN>
-			<END>--&gt;</END>
-		</SPAN>
-
-		<SPAN TYPE="LITERAL3" NO_LINE_BREAK="FALSE" >
-			<BEGIN>"{</BEGIN>
-			<END>}"</END>
-		</SPAN>
-		
-		<SPAN TYPE="LITERAL1" NO_LINE_BREAK="FALSE">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-
-		<SPAN TYPE="LITERAL1" NO_LINE_BREAK="FALSE">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-
-		<SEQ TYPE="MARKUP">/</SEQ>
-		<MARK_PREVIOUS TYPE="LABEL" MATCH_TYPE="CONTEXT">:</MARK_PREVIOUS>
-		<SEQ TYPE="OPERATOR">:</SEQ>
-	</RULES>
-	
-	<RULES SET="DTD-TAGS" DEFAULT="KEYWORD2" IGNORE_CASE="FALSE">
-		<!-- SGML comment -->
-		<SPAN TYPE="COMMENT1">
-			<BEGIN>&lt;!--</BEGIN>
-			<END>--&gt;</END>
-		</SPAN>
-
-		<!-- SGML comment -->
-		<SPAN TYPE="COMMENT1">
-			<BEGIN>--</BEGIN>
-			<END>--</END>
-		</SPAN>
-
-		<!-- Parameter entities -->
-		<SPAN TYPE="LITERAL2" NO_WORD_BREAK="TRUE">
-			<BEGIN>%</BEGIN>
-			<END>;</END>
-		</SPAN>
-
-		<SPAN TYPE="LITERAL1" NO_LINE_BREAK="FALSE">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-
-		<SPAN TYPE="LITERAL1" NO_LINE_BREAK="FALSE">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-
-		<!-- This appears in some SGML documents -->
-		<SPAN TYPE="KEYWORD2" DELEGATE="MAIN">
-			<BEGIN>[</BEGIN>
-			<END>]</END>
-		</SPAN>
-
-		<SEQ TYPE="OPERATOR">(</SEQ>
-		<SEQ TYPE="OPERATOR">)</SEQ>
-		<SEQ TYPE="OPERATOR">|</SEQ>
-		<SEQ TYPE="OPERATOR">?</SEQ>
-		<SEQ TYPE="OPERATOR">*</SEQ>
-		<SEQ TYPE="OPERATOR">+</SEQ>
-		<SEQ TYPE="OPERATOR">,</SEQ>
-
-		<KEYWORDS>
-			<KEYWORD1>EMPTY</KEYWORD1>
-			<KEYWORD1>INCLUDE</KEYWORD1>
-			<KEYWORD1>IGNORE</KEYWORD1>
-			<KEYWORD1>NDATA</KEYWORD1>
-			<KEYWORD1>#IMPLIED</KEYWORD1>
-			<KEYWORD1>#PCDATA</KEYWORD1>
-			<KEYWORD1>#REQUIRED</KEYWORD1>
-		</KEYWORDS>
-	</RULES>
-	<RULES SET="ENTITY-TAGS" DEFAULT="KEYWORD2">
-		<!-- SGML comment -->
-		<SPAN TYPE="COMMENT1">
-			<BEGIN>&lt;!--</BEGIN>
-			<END>--&gt;</END>
-		</SPAN>
-
-		<!-- SGML comment -->
-		<SPAN TYPE="COMMENT1">
-			<BEGIN>--</BEGIN>
-			<END>--</END>
-		</SPAN>
-
-		<SPAN TYPE="LITERAL1" NO_LINE_BREAK="FALSE">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-
-		<SPAN TYPE="LITERAL1" NO_LINE_BREAK="FALSE">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-
-		<SEQ TYPE="OPERATOR">=</SEQ>
-
-		<SEQ TYPE="OPERATOR">%</SEQ>
-
-		<KEYWORDS>
-			<KEYWORD1>SYSTEM</KEYWORD1>
-		</KEYWORDS>
-	</RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/myghty.xml b/qpython/src/main/assets/syntax/myghty.xml
deleted file mode 100644
index b6e39dc9..00000000
--- a/qpython/src/main/assets/syntax/myghty.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!--
-<MODE NAME="myghty"			FILE="myghty.xml"
-				FILE_NAME_GLOB="*.myt"/>
--->
-
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="commentStart" VALUE="&lt;!--" />
-		<PROPERTY NAME="commentEnd" VALUE="--&gt;" />
-	</PROPS>
-	<RULES IGNORE_CASE="TRUE">
-
-		<EOL_SPAN TYPE="COMMENT2" AT_LINE_START="TRUE">#</EOL_SPAN>
-		<!-- <SEQ TYPE="LITERAL4" AT_LINE_END="TRUE">\</SEQ> -->
-
-		<!-- attr block (python) -->
-		<SPAN DELEGATE="MYGHTY" TYPE="LITERAL4">
-			<BEGIN>&lt;%attr&gt;</BEGIN>
-			<END>&lt;/%attr&gt;</END>
-		</SPAN>
-
-		<!-- def, closure, method -->
-		<SPAN_REGEXP HASH_CHAR="&lt;%" TYPE="LITERAL4" DELEGATE="DEF">
-			<BEGIN>&lt;%(def|closure|method)</BEGIN>
-			<END>&gt;</END>
-		</SPAN_REGEXP>
-		<SEQ_REGEXP HASH_CHAR="&lt;/%" TYPE="LITERAL4">&lt;/%(def|closure|method)&gt;</SEQ_REGEXP>
-
-		<!-- doc block -->
-		<SPAN TYPE="COMMENT4">
-			<BEGIN>&lt;%doc&gt;</BEGIN>
-			<END>&lt;/%doc&gt;</END>
-		</SPAN>
-
-		<!-- flags block (python) -->
-		<SPAN DELEGATE="MYGHTY" TYPE="LITERAL4">
-			<BEGIN>&lt;%flags&gt;</BEGIN>
-			<END>&lt;/%flags&gt;</END>
-		</SPAN>
-
-		<!-- python block -->
-		<SPAN_REGEXP HASH_CHAR="&lt;%python" DELEGATE="MYGHTY" TYPE="LITERAL4">
-			<BEGIN>&lt;%python[^&gt;]*&gt;</BEGIN>
-			<END>&lt;/%python&gt;</END>
-		</SPAN_REGEXP>
-
-		<!-- python block aliases - don't take args -->
-		<SPAN_REGEXP HASH_CHAR="&lt;%" DELEGATE="MYGHTY" TYPE="LITERAL4">
-			<BEGIN>&lt;%(args|cleanup|filter|global|init|once|requestlocal|requestonce|shared|threadlocal|threadonce)&gt;</BEGIN>
-			<END>&lt;/%$1&gt;</END>
-		</SPAN_REGEXP>
-
-		<!-- text block -->
-		<SPAN TYPE="LITERAL3">
-			<BEGIN>&lt;%text&gt;</BEGIN>
-			<END>&lt;/%text&gt;</END>
-		</SPAN>
-
-		<!-- calling component -->
-		<SEQ TYPE="LITERAL4">&lt;/&amp;&gt;</SEQ>
-		<SPAN_REGEXP HASH_CHAR="&lt;&amp;" TYPE="LITERAL4" DELEGATE="MYGHTY">
-			<BEGIN>&lt;&amp;[|]?</BEGIN>
-			<END>&amp;&gt;</END>
-		</SPAN_REGEXP>
-
-		<!-- substitutions -->
-		<SPAN TYPE="LITERAL3" DELEGATE="MYGHTY">
-			<BEGIN>&lt;%</BEGIN>
-			<END>%&gt;</END>
-		</SPAN>
-
-		<EOL_SPAN 
-			AT_LINE_START="TRUE" 
-			DELEGATE="MYGHTY" 
-			TYPE="LITERAL4">%</EOL_SPAN>
-
-		<IMPORT DELEGATE="html::MAIN"/>
-
-		<KEYWORDS>
-			<!-- only here for complete-word -->
-			<NULL>args</NULL>
-			<NULL>attr</NULL>
-			<NULL>cleanup</NULL>
-			<NULL>closure</NULL>
-			<NULL>def</NULL>
-			<NULL>doc</NULL>
-			<NULL>filter</NULL>
-			<NULL>flags</NULL>
-			<NULL>global</NULL>
-			<NULL>init</NULL>
-			<NULL>method</NULL>
-			<NULL>once</NULL>
-			<NULL>python</NULL>
-			<NULL>requestlocal</NULL>
-			<NULL>requestonce</NULL>
-			<NULL>shared</NULL>
-			<NULL>threadlocal</NULL>
-			<NULL>threadonce</NULL>
-		</KEYWORDS>
-
-	</RULES>
-
-	<RULES IGNORE_CASE="FALSE" SET="MYGHTY">
-		<!-- alias for MODULE -->
-		<SEQ TYPE="KEYWORD4">@</SEQ>
-		<IMPORT DELEGATE="python::MAIN"/>
-		<KEYWORDS>
-			<KEYWORD4>ARGS</KEYWORD4>
-			<KEYWORD4>MODULE</KEYWORD4>
-			<KEYWORD4>SELF</KEYWORD4>
-			<KEYWORD4>m</KEYWORD4>
-			<!-- request -->
-			<KEYWORD4>r</KEYWORD4>
-			<!-- session -->
-			<KEYWORD4>s</KEYWORD4>
-			<!-- URL encode -->
-			<KEYWORD4>u</KEYWORD4>
-			<!-- HTML encode -->
-			<KEYWORD4>h</KEYWORD4>
-		</KEYWORDS>
-	</RULES>
-
-	<!-- only exists to color component name like a function -->
-	<RULES IGNORE_CASE="TRUE" SET="DEF" DEFAULT="FUNCTION">
-	</RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/mysql.xml b/qpython/src/main/assets/syntax/mysql.xml
deleted file mode 100644
index 3a3ee21e..00000000
--- a/qpython/src/main/assets/syntax/mysql.xml
+++ /dev/null
@@ -1,244 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="commentStart" VALUE="/*" />
-		<PROPERTY NAME="commentEnd" VALUE="*/" />
-		<PROPERTY NAME="lineComment" VALUE="--" />
-	</PROPS>
-	<RULES IGNORE_CASE="TRUE" HIGHLIGHT_DIGITS="TRUE">
-		<SPAN TYPE="COMMENT1">
-			<BEGIN>/*</BEGIN>
-			<END>*/</END>
-		</SPAN>
-		<SPAN TYPE="LITERAL1" ESCAPE="\">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-		<SPAN TYPE="LITERAL1" ESCAPE="\">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-
-		<KEYWORDS>
-
-			<KEYWORD1>ADD</KEYWORD1>
-			<KEYWORD1>ALL</KEYWORD1>
-			<KEYWORD1>ALTER</KEYWORD1>
-			<KEYWORD1>ANALYZE</KEYWORD1>
-			<KEYWORD1>AND</KEYWORD1>
-			<KEYWORD1>AS</KEYWORD1>
-			<KEYWORD1>ASC</KEYWORD1>
-			<KEYWORD1>ASENSITIVE</KEYWORD1>
-			<KEYWORD1>BEFORE</KEYWORD1>
-			<KEYWORD1>BETWEEN</KEYWORD1>
-			<KEYWORD1>BIGINT</KEYWORD1>
-			<KEYWORD1>BINARY</KEYWORD1>
-			<KEYWORD1>BLOB</KEYWORD1>
-			<KEYWORD1>BOTH</KEYWORD1>
-			<KEYWORD1>BY</KEYWORD1>
-			<KEYWORD1>CALL</KEYWORD1>
-			<KEYWORD1>CASCADE</KEYWORD1>
-			<KEYWORD1>CASE</KEYWORD1>
-			<KEYWORD1>CHANGE</KEYWORD1>
-			<KEYWORD1>CHAR</KEYWORD1>
-			<KEYWORD1>CHARACTER</KEYWORD1>
-			<KEYWORD1>CHECK</KEYWORD1>
-			<KEYWORD1>COLLATE</KEYWORD1>
-			<KEYWORD1>COLUMN</KEYWORD1>
-			<KEYWORD1>CONDITION</KEYWORD1>
-			<KEYWORD1>CONNECTION</KEYWORD1>
-			<KEYWORD1>CONSTRAINT</KEYWORD1>
-			<KEYWORD1>CONTINUE</KEYWORD1>
-			<KEYWORD1>CONVERT</KEYWORD1>
-			<KEYWORD1>CREATE</KEYWORD1>
-			<KEYWORD1>CROSS</KEYWORD1>
-			<KEYWORD1>CURRENT_DATE</KEYWORD1>
-			<KEYWORD1>CURRENT_TIME</KEYWORD1>
-			<KEYWORD1>CURRENT_TIMESTAMP</KEYWORD1>
-			<KEYWORD1>CURRENT_USER</KEYWORD1>
-			<KEYWORD1>CURSOR</KEYWORD1>
-			<KEYWORD1>DATABASE</KEYWORD1>
-			<KEYWORD1>DATABASES</KEYWORD1>
-			<KEYWORD1>DAY_HOUR</KEYWORD1>
-			<KEYWORD1>DAY_MICROSECOND</KEYWORD1>
-			<KEYWORD1>DAY_MINUTE</KEYWORD1>
-			<KEYWORD1>DAY_SECOND</KEYWORD1>
-			<KEYWORD1>DEC</KEYWORD1>
-			<KEYWORD1>DECIMAL</KEYWORD1>
-			<KEYWORD1>DECLARE</KEYWORD1>
-			<KEYWORD1>DEFAULT</KEYWORD1>
-			<KEYWORD1>DELAYED</KEYWORD1>
-			<KEYWORD1>DELETE</KEYWORD1>
-			<KEYWORD1>DESC</KEYWORD1>
-			<KEYWORD1>DESCRIBE</KEYWORD1>
-			<KEYWORD1>DETERMINISTIC</KEYWORD1>
-			<KEYWORD1>DISTINCT</KEYWORD1>
-			<KEYWORD1>DISTINCTROW</KEYWORD1>
-			<KEYWORD1>DIV</KEYWORD1>
-			<KEYWORD1>DOUBLE</KEYWORD1>
-			<KEYWORD1>DROP</KEYWORD1>
-			<KEYWORD1>DUAL</KEYWORD1>
-			<KEYWORD1>EACH</KEYWORD1>
-			<KEYWORD1>ELSE</KEYWORD1>
-			<KEYWORD1>ELSEIF</KEYWORD1>
-			<KEYWORD1>ENCLOSED</KEYWORD1>
-			<KEYWORD1>ESCAPED</KEYWORD1>
-			<KEYWORD1>EXISTS</KEYWORD1>
-			<KEYWORD1>EXIT</KEYWORD1>
-			<KEYWORD1>EXPLAIN</KEYWORD1>
-			<KEYWORD1>FALSE</KEYWORD1>
-			<KEYWORD1>FETCH</KEYWORD1>
-			<KEYWORD1>FLOAT</KEYWORD1>
-			<KEYWORD1>FOR</KEYWORD1>
-			<KEYWORD1>FORCE</KEYWORD1>
-			<KEYWORD1>FOREIGN</KEYWORD1>
-			<KEYWORD1>FROM</KEYWORD1>
-			<KEYWORD1>FULLTEXT</KEYWORD1>
-			<KEYWORD1>GOTO</KEYWORD1>
-			<KEYWORD1>GRANT</KEYWORD1>
-			<KEYWORD1>GROUP</KEYWORD1>
-			<KEYWORD1>HAVING</KEYWORD1>
-			<KEYWORD1>HIGH_PRIORITY</KEYWORD1>
-			<KEYWORD1>HOUR_MICROSECOND</KEYWORD1>
-			<KEYWORD1>HOUR_MINUTE</KEYWORD1>
-			<KEYWORD1>HOUR_SECOND</KEYWORD1>
-			<KEYWORD1>IF</KEYWORD1>
-			<KEYWORD1>IGNORE</KEYWORD1>
-			<KEYWORD1>IN</KEYWORD1>
-			<KEYWORD1>INDEX</KEYWORD1>
-			<KEYWORD1>INFILE</KEYWORD1>
-			<KEYWORD1>INNER</KEYWORD1>
-			<KEYWORD1>INOUT</KEYWORD1>
-			<KEYWORD1>INSENSITIVE</KEYWORD1>
-			<KEYWORD1>INSERT</KEYWORD1>
-			<KEYWORD1>INT</KEYWORD1>
-			<KEYWORD1>INTEGER</KEYWORD1>
-			<KEYWORD1>INTERVAL</KEYWORD1>
-			<KEYWORD1>INTO</KEYWORD1>
-			<KEYWORD1>IS</KEYWORD1>
-			<KEYWORD1>ITERATE</KEYWORD1>
-			<KEYWORD1>JOIN</KEYWORD1>
-			<KEYWORD1>KEY</KEYWORD1>
-			<KEYWORD1>KEYS</KEYWORD1>
-			<KEYWORD1>KILL</KEYWORD1>
-			<KEYWORD1>LEADING</KEYWORD1>
-			<KEYWORD1>LEAVE</KEYWORD1>
-			<KEYWORD1>LEFT</KEYWORD1>
-			<KEYWORD1>LIKE</KEYWORD1>
-			<KEYWORD1>LIMIT</KEYWORD1>
-			<KEYWORD1>LINES</KEYWORD1>
-			<KEYWORD1>LOAD</KEYWORD1>
-			<KEYWORD1>LOCALTIME</KEYWORD1>
-			<KEYWORD1>LOCALTIMESTAMP</KEYWORD1>
-			<KEYWORD1>LOCK</KEYWORD1>
-			<KEYWORD1>LONG</KEYWORD1>
-			<KEYWORD1>LONGBLOB</KEYWORD1>
-			<KEYWORD1>LONGTEXT</KEYWORD1>
-			<KEYWORD1>LOOP</KEYWORD1>
-			<KEYWORD1>LOW_PRIORITY</KEYWORD1>
-			<KEYWORD1>MATCH</KEYWORD1>
-			<KEYWORD1>MEDIUMBLOB</KEYWORD1>
-			<KEYWORD1>MEDIUMINT</KEYWORD1>
-			<KEYWORD1>MEDIUMTEXT</KEYWORD1>
-			<KEYWORD1>MIDDLEINT</KEYWORD1>
-			<KEYWORD1>MINUTE_MICROSECOND</KEYWORD1>
-			<KEYWORD1>MINUTE_SECOND</KEYWORD1>
-			<KEYWORD1>MOD</KEYWORD1>
-			<KEYWORD1>MODIFIES</KEYWORD1>
-			<KEYWORD1>NATURAL</KEYWORD1>
-			<KEYWORD1>NOT</KEYWORD1>
-			<KEYWORD1>NO_WRITE_TO_BINLOG</KEYWORD1>
-			<KEYWORD1>NULL</KEYWORD1>
-			<KEYWORD1>NUMERIC</KEYWORD1>
-			<KEYWORD1>ON</KEYWORD1>
-			<KEYWORD1>OPTIMIZE</KEYWORD1>
-			<KEYWORD1>OPTION</KEYWORD1>
-			<KEYWORD1>OPTIONALLY</KEYWORD1>
-			<KEYWORD1>OR</KEYWORD1>
-			<KEYWORD1>ORDER</KEYWORD1>
-			<KEYWORD1>OUT</KEYWORD1>
-			<KEYWORD1>OUTER</KEYWORD1>
-			<KEYWORD1>OUTFILE</KEYWORD1>
-			<KEYWORD1>PRECISION</KEYWORD1>
-			<KEYWORD1>PRIMARY</KEYWORD1>
-			<KEYWORD1>PROCEDURE</KEYWORD1>
-			<KEYWORD1>PURGE</KEYWORD1>
-			<KEYWORD1>READ</KEYWORD1>
-			<KEYWORD1>READS</KEYWORD1>
-			<KEYWORD1>REAL</KEYWORD1>
-			<KEYWORD1>REFERENCES</KEYWORD1>
-			<KEYWORD1>REGEXP</KEYWORD1>
-			<KEYWORD1>RENAME</KEYWORD1>
-			<KEYWORD1>REPEAT</KEYWORD1>
-			<KEYWORD1>REPLACE</KEYWORD1>
-			<KEYWORD1>REQUIRE</KEYWORD1>
-			<KEYWORD1>RESTRICT</KEYWORD1>
-			<KEYWORD1>RETURN</KEYWORD1>
-			<KEYWORD1>REVOKE</KEYWORD1>
-			<KEYWORD1>RIGHT</KEYWORD1>
-			<KEYWORD1>RLIKE</KEYWORD1>
-			<KEYWORD1>SCHEMA</KEYWORD1>
-			<KEYWORD1>SCHEMAS</KEYWORD1>
-			<KEYWORD1>SECOND_MICROSECOND</KEYWORD1>
-			<KEYWORD1>SELECT</KEYWORD1>
-			<KEYWORD1>SENSITIVE</KEYWORD1>
-			<KEYWORD1>SEPARATOR</KEYWORD1>
-			<KEYWORD1>SET</KEYWORD1>
-			<KEYWORD1>SHOW</KEYWORD1>
-			<KEYWORD1>SMALLINT</KEYWORD1>
-			<KEYWORD1>SONAME</KEYWORD1>
-			<KEYWORD1>SPATIAL</KEYWORD1>
-			<KEYWORD1>SPECIFIC</KEYWORD1>
-			<KEYWORD1>SQL</KEYWORD1>
-			<KEYWORD1>SQLEXCEPTION</KEYWORD1>
-			<KEYWORD1>SQLSTATE</KEYWORD1>
-			<KEYWORD1>SQLWARNING</KEYWORD1>
-			<KEYWORD1>SQL_BIG_RESULT</KEYWORD1>
-			<KEYWORD1>SQL_CALC_FOUND_ROWS</KEYWORD1>
-			<KEYWORD1>SQL_SMALL_RESULT</KEYWORD1>
-			<KEYWORD1>SSL</KEYWORD1>
-			<KEYWORD1>STARTING</KEYWORD1>
-			<KEYWORD1>STRAIGHT_JOIN</KEYWORD1>
-			<KEYWORD1>TABLE</KEYWORD1>
-			<KEYWORD1>TERMINATED</KEYWORD1>
-			<KEYWORD1>THEN</KEYWORD1>
-			<KEYWORD1>TINYBLOB</KEYWORD1>
-			<KEYWORD1>TINYINT</KEYWORD1>
-			<KEYWORD1>TINYTEXT</KEYWORD1>
-			<KEYWORD1>TO</KEYWORD1>
-			<KEYWORD1>TRAILING</KEYWORD1>
-			<KEYWORD1>TRIGGER</KEYWORD1>
-			<KEYWORD1>TRUE</KEYWORD1>
-			<KEYWORD1>UNDO</KEYWORD1>
-			<KEYWORD1>UNION</KEYWORD1>
-			<KEYWORD1>UNIQUE</KEYWORD1>
-			<KEYWORD1>UNLOCK</KEYWORD1>
-			<KEYWORD1>UNSIGNED</KEYWORD1>
-			<KEYWORD1>UPDATE</KEYWORD1>
-			<KEYWORD1>USAGE</KEYWORD1>
-			<KEYWORD1>USE</KEYWORD1>
-			<KEYWORD1>USING</KEYWORD1>
-			<KEYWORD1>UTC_DATE</KEYWORD1>
-			<KEYWORD1>UTC_TIME</KEYWORD1>
-			<KEYWORD1>UTC_TIMESTAMP</KEYWORD1>
-			<KEYWORD1>VALUES</KEYWORD1>
-			<KEYWORD1>VARBINARY</KEYWORD1>
-			<KEYWORD1>VARCHAR</KEYWORD1>
-			<KEYWORD1>VARCHARACTER</KEYWORD1>
-			<KEYWORD1>VARYING</KEYWORD1>
-			<KEYWORD1>WHEN</KEYWORD1>
-			<KEYWORD1>WHERE</KEYWORD1>
-			<KEYWORD1>WHILE</KEYWORD1>
-			<KEYWORD1>WITH</KEYWORD1>
-			<KEYWORD1>WRITE</KEYWORD1>
-			<KEYWORD1>XOR</KEYWORD1>
-			<KEYWORD1>YEAR_MONTH</KEYWORD1>
-			<KEYWORD1>ZEROFILL</KEYWORD1>
-
-		</KEYWORDS>
-	</RULES>
-</MODE>
-
diff --git a/qpython/src/main/assets/syntax/n3.xml b/qpython/src/main/assets/syntax/n3.xml
deleted file mode 100644
index c3fad47c..00000000
--- a/qpython/src/main/assets/syntax/n3.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0"?>
-<!--
-Basic N3 mode by Jakub Roztočil <jakub@roztocil.name>
-
-	N3 (Notation3) is a shorthand non-XML serialization of RDF
-	<http://www.w3.org/DesignIssues/Notation3.html>
-
-Catalog entry:
-
-	<MODE NAME="n3" FILE="n3.xml" FILE_NAME_GLOB="*.n3" />
-
-TODO:
-	* different highlighting for subject, predicate and object
-	* higlight qnames, not only prefixes (prefix:qname)
-
--->
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-<MODE>
-	<PROPS>
-		<!-- Indent when writting more statements about the same subject -->
-		<PROPERTY NAME="indentNextLines" VALUE="\S+\s+\S+\s+\S+\s*;$" />
-		<PROPERTY NAME="indentOpenBrackets" VALUE="[{(" />
-		<PROPERTY NAME="indentCloseBrackets" VALUE="}])" />
-		<PROPERTY NAME="ignoreWhitespace" VALUE="false" />
-		<PROPERTY NAME="lineComment" VALUE="#" />
-	</PROPS>
-
-	<RULES HIGHLIGHT_DIGITS="TRUE">
-
-
-		<!-- @foo -->
-		<MARK_FOLLOWING TYPE="KEYWORD1">@</MARK_FOLLOWING>
-
-		<!-- Prefixes -->
-		<MARK_PREVIOUS TYPE="LABEL" MATCH_TYPE="OPERATOR">:</MARK_PREVIOUS>
-
-		<!-- Resource URI -->
-		<SPAN TYPE="LITERAL2" NO_LINE_BREAK="TRUE">
-			<BEGIN>&lt;</BEGIN>
-			<END>&gt;</END>
-		</SPAN>
-
-		<!-- Strings -->
-		<SPAN TYPE="LITERAL1" NO_LINE_BREAK="FALSE" ESCAPE="\">
-			<BEGIN>"""</BEGIN>
-			<END>"""</END>
-		</SPAN>
-		<SPAN TYPE="LITERAL1" NO_LINE_BREAK="FALSE" ESCAPE="\">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-
-		<!-- Operators -->
-		<SEQ TYPE="OPERATOR">.</SEQ>
-		<SEQ TYPE="OPERATOR">?</SEQ>
-		<SEQ TYPE="OPERATOR">(</SEQ>
-		<SEQ TYPE="OPERATOR">)</SEQ>
-		<SEQ TYPE="OPERATOR">^^</SEQ>
-		<SEQ TYPE="OPERATOR">}</SEQ>
-		<SEQ TYPE="OPERATOR">{</SEQ>
-		<SEQ TYPE="OPERATOR">,</SEQ>
-		<SEQ TYPE="OPERATOR">;</SEQ>
-		<SEQ TYPE="OPERATOR">]</SEQ>
-		<SEQ TYPE="OPERATOR">[</SEQ>
-		<SEQ TYPE="OPERATOR">:</SEQ>
-		<SEQ TYPE="OPERATOR">=></SEQ>
-		<SEQ TYPE="OPERATOR">=</SEQ>
-
-		<!-- COMMENTS -->
-		<EOL_SPAN TYPE="COMMENT1" AT_LINE_START="FALSE">#</EOL_SPAN>
-
-		<!-- KEYWORDS -->
-		<KEYWORDS>
-			<KEYWORD2>a</KEYWORD2>
-			<KEYWORD2>is</KEYWORD2>
-			<KEYWORD2>has</KEYWORD2>
-			<KEYWORD2>of</KEYWORD2>
-			<KEYWORD3>true</KEYWORD3>
-			<KEYWORD3>false</KEYWORD3>
-		</KEYWORDS>
-	</RULES>
-
-
-</MODE>
-
- 	  	 
diff --git a/qpython/src/main/assets/syntax/netrexx.xml b/qpython/src/main/assets/syntax/netrexx.xml
deleted file mode 100644
index b253cfd6..00000000
--- a/qpython/src/main/assets/syntax/netrexx.xml
+++ /dev/null
@@ -1,414 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<MODE>
-  <PROPS>
-    <PROPERTY NAME="indentNextLines"
-      VALUE="\s*(if|loop|do|else|select|otherwise|catch|finally|class|method|properties)(.*)"/>
-    <!-- VALUE="\s*(((if|while)\s*\(|else\s*(\{|$)|else\s+if\s*\(|case\s+.+:|default:)[^;]*|for\s*\(.*)" -->
-    <PROPERTY NAME="commentStart" VALUE="/*" />
-    <PROPERTY NAME="commentEnd" VALUE="*/" />
-    <PROPERTY NAME="lineComment" VALUE="--" />
-    <PROPERTY NAME="wordBreakChars" VALUE=",+-=&lt;&gt;/?^&amp;*" />
-  </PROPS>
-  <RULES IGNORE_CASE="TRUE" HIGHLIGHT_DIGITS="TRUE">
-    <!-- Documentation comment -->
-    <SPAN TYPE="COMMENT2" DELEGATE="java::JAVADOC">
-      <BEGIN>/**</BEGIN>
-      <END>*/</END>
-    </SPAN>
-
-    <!-- C style comment -->
-    <SPAN TYPE="COMMENT1">
-      <BEGIN>/*</BEGIN>
-      <END>*/</END>
-    </SPAN>
-
-    <SPAN TYPE="LITERAL1" ESCAPE="\" NO_LINE_BREAK="TRUE">
-      <BEGIN>"</BEGIN>
-      <END>"</END>
-    </SPAN>
-    <SPAN TYPE="LITERAL1" ESCAPE="\" NO_LINE_BREAK="TRUE">
-      <BEGIN>'</BEGIN>
-      <END>'</END>
-    </SPAN>
-
-    <EOL_SPAN TYPE="COMMENT1">--</EOL_SPAN>
-
-    <SEQ TYPE="OPERATOR">=</SEQ>
-    <SEQ TYPE="OPERATOR">!</SEQ>
-    <SEQ TYPE="OPERATOR">&gt;=</SEQ>
-    <SEQ TYPE="OPERATOR">&lt;=</SEQ>
-    <SEQ TYPE="OPERATOR">+</SEQ>
-    <SEQ TYPE="OPERATOR">-</SEQ>
-    <SEQ TYPE="OPERATOR">/</SEQ>
-
-    <!-- workaround to stop "*" from being colorized
-         in import statements. -->
-    <SEQ TYPE="NULL">.*</SEQ>
-
-    <SEQ TYPE="OPERATOR">*</SEQ>
-    <SEQ TYPE="OPERATOR">&gt;</SEQ>
-    <SEQ TYPE="OPERATOR">&lt;</SEQ>
-    <SEQ TYPE="OPERATOR">%</SEQ>
-    <SEQ TYPE="OPERATOR">&amp;</SEQ>
-    <SEQ TYPE="OPERATOR">|</SEQ>
-    <SEQ TYPE="OPERATOR">^</SEQ>
-    <SEQ TYPE="OPERATOR">~</SEQ>
-    <SEQ TYPE="OPERATOR">}</SEQ>
-    <SEQ TYPE="OPERATOR">{</SEQ>
-
-    <KEYWORDS>
-
-      <FUNCTION>abbrev</FUNCTION>
-      <FUNCTION>abs</FUNCTION>
-      <FUNCTION>b2x</FUNCTION>
-      <FUNCTION>center</FUNCTION>
-      <FUNCTION>centre</FUNCTION>
-      <FUNCTION>changestr</FUNCTION>
-      <FUNCTION>charAt</FUNCTION>
-      <FUNCTION>compare</FUNCTION>
-      <FUNCTION>copies</FUNCTION>
-      <FUNCTION>copyIndexed</FUNCTION>
-      <FUNCTION>countstr</FUNCTION>
-      <FUNCTION>c2d</FUNCTION>
-      <FUNCTION>c2x</FUNCTION>
-      <FUNCTION>datatype</FUNCTION>
-      <FUNCTION>delstr</FUNCTION>
-      <FUNCTION>delword</FUNCTION>
-      <FUNCTION>d2c</FUNCTION>
-      <FUNCTION>d2X</FUNCTION>
-      <FUNCTION>equals</FUNCTION>
-      <FUNCTION>exists</FUNCTION>
-      <FUNCTION>format</FUNCTION>
-      <FUNCTION>hashCode</FUNCTION>
-      <FUNCTION>insert</FUNCTION>
-      <FUNCTION>lastpos</FUNCTION>
-      <FUNCTION>left</FUNCTION>
-      <FUNCTION>length</FUNCTION>
-      <FUNCTION>lower</FUNCTION>
-      <FUNCTION>max</FUNCTION>
-      <FUNCTION>min</FUNCTION>
-      <FUNCTION>nop</FUNCTION>
-      <FUNCTION>overlay</FUNCTION>
-      <FUNCTION>parse</FUNCTION>
-      <FUNCTION>pos</FUNCTION>
-      <FUNCTION>reverse</FUNCTION>
-      <FUNCTION>right</FUNCTION>
-      <FUNCTION>say</FUNCTION>
-      <FUNCTION>sequence</FUNCTION>
-      <FUNCTION>sign</FUNCTION>
-      <FUNCTION>space</FUNCTION>
-      <FUNCTION>strip</FUNCTION>
-      <FUNCTION>substr</FUNCTION>
-      <FUNCTION>subword</FUNCTION>
-      <FUNCTION>toCharArray</FUNCTION>
-      <FUNCTION>toString</FUNCTION>
-      <FUNCTION>toboolean</FUNCTION>
-      <FUNCTION>tobyte</FUNCTION>
-      <FUNCTION>tochar</FUNCTION>
-      <FUNCTION>todouble</FUNCTION>
-      <FUNCTION>tofloat</FUNCTION>
-      <FUNCTION>toint</FUNCTION>
-      <FUNCTION>tolong</FUNCTION>
-      <FUNCTION>toshort</FUNCTION>
-      <FUNCTION>trunc</FUNCTION>
-      <FUNCTION>translate</FUNCTION>
-      <FUNCTION>upper</FUNCTION>
-      <FUNCTION>verify</FUNCTION>
-      <FUNCTION>word</FUNCTION>
-      <FUNCTION>wordindex</FUNCTION>
-      <FUNCTION>wordlength</FUNCTION>
-      <FUNCTION>wordpos</FUNCTION>
-      <FUNCTION>words</FUNCTION>
-      <FUNCTION>x2b</FUNCTION>
-      <FUNCTION>x2c</FUNCTION>
-      <FUNCTION>x2d</FUNCTION>
-
-      <KEYWORD1>class</KEYWORD1>
-      <KEYWORD1>private</KEYWORD1>
-      <KEYWORD1>public</KEYWORD1>
-      <KEYWORD1>abstract</KEYWORD1>
-      <KEYWORD1>final</KEYWORD1>
-      <KEYWORD1>interface</KEYWORD1>
-      <KEYWORD1>dependent</KEYWORD1>
-      <KEYWORD1>adapter</KEYWORD1>
-      <KEYWORD1>deprecated</KEYWORD1>
-      <KEYWORD1>extends</KEYWORD1>
-      <KEYWORD1>uses</KEYWORD1>
-      <KEYWORD1>implements</KEYWORD1>
-
-      <KEYWORD1>method</KEYWORD1>
-      <KEYWORD1>native</KEYWORD1>
-      <KEYWORD1>returns</KEYWORD1>
-      <KEYWORD1>signals</KEYWORD1>
-
-      <KEYWORD1>properties</KEYWORD1>
-      <KEYWORD1>private</KEYWORD1>
-      <KEYWORD1>public</KEYWORD1>
-      <KEYWORD1>inheritable</KEYWORD1>
-      <KEYWORD1>constant</KEYWORD1>
-      <KEYWORD1>static</KEYWORD1>
-      <KEYWORD1>volatile</KEYWORD1>
-      <KEYWORD1>unused</KEYWORD1>
-      <KEYWORD1>transient</KEYWORD1>
-      <KEYWORD1>indirect</KEYWORD1>
-
-      <KEYWORD2>do</KEYWORD2>
-      <KEYWORD2>label</KEYWORD2>
-      <KEYWORD2>protect</KEYWORD2>
-      <KEYWORD2>catch</KEYWORD2>
-      <KEYWORD2>finally</KEYWORD2>
-      <KEYWORD2>end</KEYWORD2>
-      <KEYWORD2>signal</KEYWORD2>
-
-      <KEYWORD2>if</KEYWORD2>
-      <KEYWORD2>then</KEYWORD2>
-      <KEYWORD2>else</KEYWORD2>
-      <KEYWORD2>select</KEYWORD2>
-      <KEYWORD2>case</KEYWORD2>
-      <KEYWORD2>when</KEYWORD2>
-      <KEYWORD2>otherwise</KEYWORD2>
-
-      <KEYWORD2>loop</KEYWORD2>
-      <KEYWORD2>forever</KEYWORD2>
-      <KEYWORD2>for</KEYWORD2>
-      <KEYWORD2>to</KEYWORD2>
-      <KEYWORD2>by</KEYWORD2>
-      <KEYWORD2>over</KEYWORD2>
-      <KEYWORD2>until</KEYWORD2>
-      <KEYWORD2>while</KEYWORD2>
-      <KEYWORD2>leave</KEYWORD2>
-      <KEYWORD2>iterate</KEYWORD2>
-
-      <KEYWORD2>return</KEYWORD2>
-      <KEYWORD2>exit</KEYWORD2>
-
-      <KEYWORD3>ask</KEYWORD3>
-      <KEYWORD3>digits</KEYWORD3>
-      <KEYWORD3>form</KEYWORD3>
-      <KEYWORD3>null</KEYWORD3>
-      <KEYWORD3>source</KEYWORD3>
-      <KEYWORD3>this</KEYWORD3>
-      <KEYWORD3>super</KEYWORD3>
-      <KEYWORD3>parent</KEYWORD3>
-      <KEYWORD3>sourceline</KEYWORD3>
-      <KEYWORD3>version</KEYWORD3>
-
-      <KEYWORD3>trace</KEYWORD3>
-      <KEYWORD3>var</KEYWORD3>
-      <KEYWORD3>all</KEYWORD3>
-      <KEYWORD3>results</KEYWORD3>
-      <KEYWORD3>off</KEYWORD3>
-      <KEYWORD3>methods</KEYWORD3>
-
-      <KEYWORD3>package</KEYWORD3>
-      <KEYWORD3>import</KEYWORD3>
-      <KEYWORD3>numeric</KEYWORD3>
-      <KEYWORD3>scientific</KEYWORD3>
-      <KEYWORD3>engineering</KEYWORD3>
-
-      <LITERAL2>options</LITERAL2>
-      <LITERAL2>comments</LITERAL2>
-      <LITERAL2>nocomments</LITERAL2>
-      <LITERAL2>keep</LITERAL2>
-      <LITERAL2>nokeep</LITERAL2>
-      <LITERAL2>compact</LITERAL2>
-      <LITERAL2>nocompact</LITERAL2>
-      <LITERAL2>console</LITERAL2>
-      <LITERAL2>noconsole</LITERAL2>
-      <LITERAL2>decimal</LITERAL2>
-      <LITERAL2>nodecimal</LITERAL2>
-      <LITERAL2>explicit</LITERAL2>
-      <LITERAL2>noexplicit</LITERAL2>
-      <LITERAL2>java</LITERAL2>
-      <LITERAL2>nojava</LITERAL2>
-      <LITERAL2>savelog</LITERAL2>
-      <LITERAL2>nosavelog</LITERAL2>
-
-      <LITERAL2>sourcedir</LITERAL2>
-      <LITERAL2>nosourcedir</LITERAL2>
-      <LITERAL2>symbols</LITERAL2>
-      <LITERAL2>nosymbols</LITERAL2>
-      <LITERAL2>utf8</LITERAL2>
-      <LITERAL2>noutf8</LITERAL2>
-
-      <LITERAL2>notrace</LITERAL2>
-      <LITERAL2>binary</LITERAL2>
-      <LITERAL2>nobinary</LITERAL2>
-      <LITERAL2>crossref</LITERAL2>
-      <LITERAL2>nocrossref</LITERAL2>
-      <LITERAL2>diag</LITERAL2>
-      <LITERAL2>nodiag</LITERAL2>
-      <LITERAL2>format</LITERAL2>
-      <LITERAL2>noformat</LITERAL2>
-      <LITERAL2>logo</LITERAL2>
-      <LITERAL2>nologo</LITERAL2>
-      <LITERAL2>replace</LITERAL2>
-      <LITERAL2>noreplace</LITERAL2>
-
-      <LITERAL2>strictassign</LITERAL2>
-      <LITERAL2>nostrictassign</LITERAL2>
-      <LITERAL2>strictcase</LITERAL2>
-      <LITERAL2>nostrictcase</LITERAL2>
-      <LITERAL2>strictargs</LITERAL2>
-      <LITERAL2>nostrictargs</LITERAL2>
-      <LITERAL2>strictimport</LITERAL2>
-      <LITERAL2>nostrictimport</LITERAL2>
-      <LITERAL2>strictsignal</LITERAL2>
-      <LITERAL2>nostrictsignal</LITERAL2>
-      <LITERAL2>strictprops</LITERAL2>
-      <LITERAL2>nostrictprops</LITERAL2>
-
-      <LITERAL2>verbose</LITERAL2>
-      <LITERAL2>noverbose</LITERAL2>
-      <LITERAL2>verbose0</LITERAL2>
-      <LITERAL2>verbose1</LITERAL2>
-      <LITERAL2>verbose2</LITERAL2>
-      <LITERAL2>verbose3</LITERAL2>
-      <LITERAL2>verbose4</LITERAL2>
-      <LITERAL2>verbose5</LITERAL2>
-
-      <LABEL>boolean</LABEL>
-      <LABEL>char</LABEL>
-      <LABEL>byte</LABEL>
-      <LABEL>short</LABEL>
-      <LABEL>int</LABEL>
-      <LABEL>long</LABEL>
-      <LABEL>float</LABEL>
-      <LABEL>double</LABEL>
-      <LABEL>Boolean</LABEL>
-      <LABEL>Character</LABEL>
-      <LABEL>Byte</LABEL>
-      <LABEL>Short</LABEL>
-      <LABEL>Integer</LABEL>
-      <LABEL>Long</LABEL>
-      <LABEL>Float</LABEL>
-      <LABEL>Double</LABEL>
-      <LABEL>BigDecimal</LABEL>
-      <LABEL>BigInteger</LABEL>
-      <LABEL>String</LABEL>
-      <LABEL>Rexx</LABEL>
-
-      <LABEL>StringBuffer</LABEL>
-      <LABEL>Object</LABEL>
-      <LABEL>Number</LABEL>
-      <LABEL>ArrayList</LABEL>
-      <LABEL>Calendar</LABEL>
-      <LABEL>Date</LABEL>
-      <LABEL>HashMap</LABEL>
-      <LABEL>HashSet</LABEL>
-      <LABEL>Hashtable</LABEL>
-      <LABEL>LinkedHashMap</LABEL>
-      <LABEL>LinkedHashSet</LABEL>
-      <LABEL>TreeMap</LABEL>
-      <LABEL>TreeSet</LABEL>
-      <LABEL>Vector</LABEL>
-      <LABEL>ConcurrentModificationException</LABEL>
-
-      <LABEL>BufferedInputStream</LABEL>
-      <LABEL>BufferedOutputStream</LABEL>
-      <LABEL>BufferedReader</LABEL>
-      <LABEL>BufferedWriter</LABEL>
-      <LABEL>ByteArrayInputStream</LABEL>
-      <LABEL>ByteArrayOutputStream</LABEL>
-      <LABEL>CharArrayReader</LABEL>
-      <LABEL>CharArrayWriter</LABEL>
-      <LABEL>DataInputStream</LABEL>
-      <LABEL>DataOutputStream</LABEL>
-      <LABEL>File</LABEL>
-      <LABEL>FileDescriptor</LABEL>
-      <LABEL>FileInputStream</LABEL>
-      <LABEL>FileOutputStream</LABEL>
-      <LABEL>FilePermission</LABEL>
-      <LABEL>FileReader</LABEL>
-      <LABEL>FileWriter</LABEL>
-      <LABEL>FilterInputStream</LABEL>
-      <LABEL>FilterOutputStream</LABEL>
-      <LABEL>FilterReader</LABEL>
-      <LABEL>FilterWriter</LABEL>
-      <LABEL>InputStream</LABEL>
-      <LABEL>InputStreamReader</LABEL>
-      <LABEL>LineNumberInputStream</LABEL>
-      <LABEL>LineNumberReader</LABEL>
-      <LABEL>ObjectInputStream</LABEL>
-      <LABEL>ObjectOutputStream</LABEL>
-      <LABEL>OutputStream</LABEL>
-      <LABEL>OutputStreamWriter</LABEL>
-      <LABEL>PipedInputStream</LABEL>
-      <LABEL>PipedOutputStream</LABEL>
-      <LABEL>PipedReader</LABEL>
-      <LABEL>PipedWriter</LABEL>
-      <LABEL>PrintStream</LABEL>
-      <LABEL>PrintWriter</LABEL>
-      <LABEL>PushbackInputStream</LABEL>
-      <LABEL>PushbackReader</LABEL>
-      <LABEL>RandomAccessFile</LABEL>
-      <LABEL>Reader</LABEL>
-      <LABEL>SequenceInputStream</LABEL>
-      <LABEL>StreamTokenizer</LABEL>
-      <LABEL>StringBufferInputStream</LABEL>
-      <LABEL>StringReader</LABEL>
-      <LABEL>StringWriter</LABEL>
-      <LABEL>Writer</LABEL>
-
-      <!-- Commonly used (=java.lang.* and java.io.*) Exceptions -->
-      <MARKUP>ArithmeticException</MARKUP>
-      <MARKUP>ArrayIndexOutOfBoundsException</MARKUP>
-      <MARKUP>ArrayStoreException</MARKUP>
-      <MARKUP>ClassCastException</MARKUP>
-      <MARKUP>ClassNotFoundException</MARKUP>
-      <MARKUP>CloneNotSupportedException</MARKUP>
-      <MARKUP>Exception</MARKUP>
-      <MARKUP>IllegalAccessException</MARKUP>
-      <MARKUP>IllegalArgumentException</MARKUP>
-      <MARKUP>IllegalMonitorStateException</MARKUP>
-      <MARKUP>IllegalStateException</MARKUP>
-      <MARKUP>IllegalThreadStateException</MARKUP>
-      <MARKUP>IndexOutOfBoundsException</MARKUP>
-      <MARKUP>InstantiationException</MARKUP>
-      <MARKUP>InterruptedException</MARKUP>
-      <MARKUP>NegativeArraySizeException</MARKUP>
-      <MARKUP>NoSuchFieldException</MARKUP>
-      <MARKUP>NoSuchMethodException</MARKUP>
-      <MARKUP>NullPointerException</MARKUP>
-      <MARKUP>NumberFormatException</MARKUP>
-      <MARKUP>RuntimeException</MARKUP>
-      <MARKUP>SecurityException</MARKUP>
-      <MARKUP>StringIndexOutOfBoundsException</MARKUP>
-      <MARKUP>UnsupportedOperationException</MARKUP>
-
-      <MARKUP>CharConversionException</MARKUP>
-      <MARKUP>EOFException</MARKUP>
-      <MARKUP>FileNotFoundException</MARKUP>
-      <MARKUP>InterruptedIOException</MARKUP>
-      <MARKUP>InvalidClassException</MARKUP>
-      <MARKUP>InvalidObjectException</MARKUP>
-      <MARKUP>IOException</MARKUP>
-      <MARKUP>NotActiveException</MARKUP>
-      <MARKUP>NotSerializableException</MARKUP>
-      <MARKUP>ObjectStreamException</MARKUP>
-      <MARKUP>OptionalDataException</MARKUP>
-      <MARKUP>StreamCorruptedException</MARKUP>
-      <MARKUP>SyncFailedException</MARKUP>
-      <MARKUP>UnsupportedEncodingException</MARKUP>
-      <MARKUP>UTFDataFormatException</MARKUP>
-      <MARKUP>WriteAbortedException</MARKUP>
-
-      <!-- all rmi functions need to signal this -->
-      <MARKUP>RemoteException</MARKUP>
-
-      <!-- Rexx specific Exception -->
-      <MARKUP>BadArgumentException</MARKUP>
-      <MARKUP>BadColumnException</MARKUP>
-      <MARKUP>BadNumericException</MARKUP>
-      <MARKUP>DivideException</MARKUP>
-      <MARKUP>ExponentOverflowException</MARKUP>
-      <MARKUP>NoOtherwiseException</MARKUP>
-      <MARKUP>NotCharacterException</MARKUP>
-      <MARKUP>NotLogicException</MARKUP>
-
-    </KEYWORDS>
-  </RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/nqc.xml b/qpython/src/main/assets/syntax/nqc.xml
deleted file mode 100644
index d8e9e0a0..00000000
--- a/qpython/src/main/assets/syntax/nqc.xml
+++ /dev/null
@@ -1,218 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="commentStart" VALUE="/*" />
-		<PROPERTY NAME="commentEnd" VALUE="*/" />
-		<PROPERTY NAME="lineComment" VALUE="//" />
-		<PROPERTY NAME="wordBreakChars" VALUE=",+-=&lt;&gt;/?^&amp;*" />
-
-		<!-- Auto indent -->
-		<PROPERTY NAME="indentOpenBrackets" VALUE="{" />
-		<PROPERTY NAME="indentCloseBrackets" VALUE="}" />
-		<PROPERTY NAME="indentNextLine"
-			VALUE="\s*(((if|while)\s*\(|else\s*|else\s+if\s*\(|for\s*\(.*\))[^{;]*)" />
-		<!-- set this to 'true' if you want to use GNU coding style -->
-		<PROPERTY NAME="doubleBracketIndent" VALUE="false" />
-	</PROPS>
-	<RULES IGNORE_CASE="FALSE"
-		HIGHLIGHT_DIGITS="TRUE"
-		DIGIT_RE="(0x[\p{XDigit}]+[lL]?|[\p{Digit}]+(e[\p{Digit}]*)?[lLdDfF]?)">
-
-		<!-- C style comment -->
-		<SPAN TYPE="COMMENT1">
-			<BEGIN>/*</BEGIN>
-			<END>*/</END>
-		</SPAN>
-
-		<SPAN TYPE="LITERAL1" ESCAPE="\" NO_LINE_BREAK="TRUE">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-		<SPAN TYPE="LITERAL1" ESCAPE="\" NO_LINE_BREAK="TRUE">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-
-		<!-- preprocessor statements -->
-		<EOL_SPAN TYPE="KEYWORD2">#</EOL_SPAN>
-
-		<EOL_SPAN TYPE="COMMENT2">//</EOL_SPAN>
-		<SEQ TYPE="OPERATOR">=</SEQ>
-		<SEQ TYPE="OPERATOR">!</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;=</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;=</SEQ>
-		<SEQ TYPE="OPERATOR">+</SEQ>
-		<SEQ TYPE="OPERATOR">-</SEQ>
-		<SEQ TYPE="OPERATOR">/</SEQ>
-
-		<SEQ TYPE="OPERATOR">*</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;</SEQ>
-		<SEQ TYPE="OPERATOR">%</SEQ>
-		<SEQ TYPE="OPERATOR">&amp;</SEQ>
-		<SEQ TYPE="OPERATOR">|</SEQ>
-		<SEQ TYPE="OPERATOR">^</SEQ>
-		<SEQ TYPE="OPERATOR">~</SEQ>
-		<SEQ TYPE="OPERATOR">}</SEQ>
-		<SEQ TYPE="OPERATOR">{</SEQ>
-		<MARK_PREVIOUS AT_WHITESPACE_END="TRUE"
-			MATCH_TYPE="OPERATOR"
-			TYPE="LABEL">:</MARK_PREVIOUS>
-
-		<!-- Function calls -->
-		<MARK_PREVIOUS TYPE="FUNCTION" MATCH_TYPE="OPERATOR">(</MARK_PREVIOUS>
-		<SEQ TYPE="OPERATOR">)</SEQ>
-
-		<KEYWORDS>
-			<KEYWORD1>__event_src</KEYWORD1>
-			<KEYWORD1>__sensor</KEYWORD1>
-			<KEYWORD1>__type</KEYWORD1>
-			<KEYWORD1>abs</KEYWORD1>
-			<KEYWORD1>aquire</KEYWORD1>
-			<KEYWORD1>catch</KEYWORD1>
-			<KEYWORD1>const</KEYWORD1>
-			<KEYWORD1>break</KEYWORD1>
-			<KEYWORD1>case</KEYWORD1>
-			<KEYWORD1>continue</KEYWORD1>
-			<KEYWORD1>default</KEYWORD1>
-			<KEYWORD1>do</KEYWORD1>
-			<KEYWORD1>else</KEYWORD1>
-			<KEYWORD1>for</KEYWORD1>
-			<KEYWORD1>monitor</KEYWORD1>
-			<KEYWORD1>if</KEYWORD1>
-			<KEYWORD1>return</KEYWORD1>
-			<KEYWORD1>repeat</KEYWORD1>
-			<KEYWORD1>sign</KEYWORD1>
-			<KEYWORD1>start</KEYWORD1>
-			<KEYWORD1>stop</KEYWORD1>
-			<KEYWORD1>sub</KEYWORD1>
-			<KEYWORD1>switch</KEYWORD1>
-			<KEYWORD1>task</KEYWORD1>
-			<KEYWORD1>while</KEYWORD1>
-
-			<KEYWORD2>asm</KEYWORD2>
-			<KEYWORD2>inline</KEYWORD2>
-
-			<KEYWORD3>int</KEYWORD3>
-			<KEYWORD3>void</KEYWORD3>
-
-			<LITERAL2>true</LITERAL2>
-			<LITERAL2>false</LITERAL2>
-			<LITERAL2>NULL</LITERAL2>
-
-			<LITERAL2>SENSOR_1</LITERAL2>
-			<LITERAL2>SENSOR_2</LITERAL2>
-			<LITERAL2>SENSOR_3</LITERAL2>
-
-			<LITERAL2>SENSOR_TYPE_NONE</LITERAL2>
-			<LITERAL2>SENSOR_TYPE_TOUCH</LITERAL2>
-			<LITERAL2>SENSOR_TYPE_TEMPERATURE</LITERAL2>
-			<LITERAL2>SENSOR_TYPE_LIGHT</LITERAL2>
-			<LITERAL2>SENSOR_TYPE_ROTATION</LITERAL2>
-
-			<LITERAL2>SENSOR_MODE_RAW</LITERAL2>
-			<LITERAL2>SENSOR_MODE_BOOL</LITERAL2>
-			<LITERAL2>SENSOR_MODE_EDGE</LITERAL2>
-			<LITERAL2>SENSOR_MODE_PULSE</LITERAL2>
-			<LITERAL2>SENSOR_MODE_PERCENT</LITERAL2>
-			<LITERAL2>SENSOR_MODE_FAHRENHEIT</LITERAL2>
-			<LITERAL2>SENSOR_MODE_CELSIUS</LITERAL2>
-			<LITERAL2>SENSOR_MODE_ROTATION</LITERAL2>
-
-			<LITERAL2>SENSOR_TOUCH</LITERAL2>
-			<LITERAL2>SENSOR_LIGHT</LITERAL2>
-			<LITERAL2>SENSOR_EDGE</LITERAL2>
-			<LITERAL2>SENSOR_PULSE</LITERAL2>
-			<LITERAL2>SENSOR_FAHRENHEIT</LITERAL2>
-			<LITERAL2>SENSOR_CELSIUS</LITERAL2>
-			<LITERAL2>SENSOR_ROTATION</LITERAL2>
-
-			<LITERAL2>OUT_A</LITERAL2>
-			<LITERAL2>OUT_B</LITERAL2>
-			<LITERAL2>OUT_C</LITERAL2>
-
-			<LITERAL2>OUT_OFF</LITERAL2>
-			<LITERAL2>OUT_ON</LITERAL2>
-			<LITERAL2>OUT_FLOAT</LITERAL2>
-
-			<LITERAL2>OUT_FWD</LITERAL2>
-			<LITERAL2>OUT_REV</LITERAL2>
-			<LITERAL2>OUT_TOOGLE</LITERAL2>
-
-			<LITERAL2>OUT_FULL</LITERAL2>
-			<LITERAL2>OUT_HALF</LITERAL2>
-			<LITERAL2>OUT_LOW</LITERAL2>
-
-			<LITERAL2>SOUND_CLICK</LITERAL2>
-			<LITERAL2>SOUND_DOUBLE_BEEP</LITERAL2>
-			<LITERAL2>SOUND_DOWN</LITERAL2>
-			<LITERAL2>SOUND_UP</LITERAL2>
-			<LITERAL2>SOUND_LOW_BEEP</LITERAL2>
-			<LITERAL2>SOUND_FAST_UP</LITERAL2>
-
-			<LITERAL2>DISPLAY_WATCH</LITERAL2>
-			<LITERAL2>DISPLAY_OUT_A</LITERAL2>
-			<LITERAL2>DISPLAY_OUT_B</LITERAL2>
-			<LITERAL2>DISPLAY_OUT_C</LITERAL2>
-			<LITERAL2>DISPLAY_SENSOR_1</LITERAL2>
-			<LITERAL2>DISPLAY_SENSOR_2</LITERAL2>
-			<LITERAL2>DISPLAY_SENSOR_3</LITERAL2>
-
-			<LITERAL2>TX_POWER_LO</LITERAL2>
-			<LITERAL2>TX_POWER_HI</LITERAL2>
-
-			<LITERAL2>SERIAL_COMM_DEFAULT</LITERAL2>
-			<LITERAL2>SERIAL_COMM_4800</LITERAL2>
-			<LITERAL2>SERIAL_COMM_DUTY25</LITERAL2>
-			<LITERAL2>SERIAL_COMM_76KHZ</LITERAL2>
-
-			<LITERAL2>SERIAL_PACKET_PREAMBLE</LITERAL2>
-			<LITERAL2>SERIAL_PACKET_DEFAULT</LITERAL2>
-			<LITERAL2>SERIAL_PACKET_NEGATED</LITERAL2>
-			<LITERAL2>SERIAL_PACKET_CHECKSUM</LITERAL2>
-			<LITERAL2>SERIAL_PACKET_RCX</LITERAL2>
-			<LITERAL2>SERIAL_PACKET_</LITERAL2>
-
-			<LITERAL2>ACQUIRE_OUT_A</LITERAL2>
-			<LITERAL2>ACQUIRE_OUT_B</LITERAL2>
-			<LITERAL2>ACQUIRE_OUT_C</LITERAL2>
-			<LITERAL2>ACQUIRE_SOUND</LITERAL2>
-			<LITERAL2>ACQUIRE_USER_1</LITERAL2>
-			<LITERAL2>ACQUIRE_USER_2</LITERAL2>
-			<LITERAL2>ACQUIRE_USER_3</LITERAL2>
-			<LITERAL2>ACQUIRE_USER_4</LITERAL2>
-
-			<LITERAL2>EVENT_TYPE_PRESSED</LITERAL2>
-			<LITERAL2>EVENT_TYPE_RELEASED</LITERAL2>
-			<LITERAL2>EVENT_TYPE_PULSE</LITERAL2>
-			<LITERAL2>EVENT_TYPE_EDGE</LITERAL2>
-			<LITERAL2>EVENT_TYPE_FASTCHANGE</LITERAL2>
-			<LITERAL2>EVENT_TYPE_LOW</LITERAL2>
-			<LITERAL2>EVENT_TYPE_NORMAL</LITERAL2>
-			<LITERAL2>EVENT_TYPE_HIGH</LITERAL2>
-			<LITERAL2>EVENT_TYPE_CLICK</LITERAL2>
-			<LITERAL2>EVENT_TYPE_DOUBLECLICK</LITERAL2>
-			<LITERAL2>EVENT_TYPE_MESSAGE</LITERAL2>
-
-			<LITERAL2>EVENT_1_PRESSED</LITERAL2>
-			<LITERAL2>EVENT_1_RELEASED</LITERAL2>
-			<LITERAL2>EVENT_2_PRESSED</LITERAL2>
-			<LITERAL2>EVENT_2_RELEASED</LITERAL2>
-			<LITERAL2>EVENT_LIGHT_HIGH</LITERAL2>
-			<LITERAL2>EVENT_LIGHT_NORMAL</LITERAL2>
-			<LITERAL2>EVENT_LIGHT_LOW</LITERAL2>
-			<LITERAL2>EVENT_LIGHT_CLICK</LITERAL2>
-			<LITERAL2>EVENT_LIGHT_DOUBLECLICK</LITERAL2>
-			<LITERAL2>EVENT_COUNTER_0</LITERAL2>
-			<LITERAL2>EVENT_COUNTER_1</LITERAL2>
-			<LITERAL2>EVENT_TIMER_0</LITERAL2>
-			<LITERAL2>EVENT_TIMER_1</LITERAL2>
-			<LITERAL2>EVENT_TIMER_2</LITERAL2>
-			<LITERAL2>EVENT_MESSAGE</LITERAL2>
-
-		</KEYWORDS>
-	</RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/nsis2.xml b/qpython/src/main/assets/syntax/nsis2.xml
deleted file mode 100644
index 5497cdc9..00000000
--- a/qpython/src/main/assets/syntax/nsis2.xml
+++ /dev/null
@@ -1,514 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!--
-This is Nullsoft Scriptable Installation System mode by Ryan Grove 2003.
-Copyright (C) 2003 Ryan Grove
-Copyright (C) 2007-2012 Uwe Stöhr (donovaly@users.sourceforge.net)
-
-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 2
-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, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-Updated for 4.3pre9 by Alan Ezust 2007
-$Id: nsis2.xml 22465 2012-11-13 06:45:29Z ezust $
--->
-
-<MODE>
-	<PROPS>
-	  <PROPERTY NAME="commentStart" VALUE="/*" />
-	  <PROPERTY NAME="commentEnd" VALUE="*/" />
-		<PROPERTY NAME="lineComment" VALUE=";" />
-		<PROPERTY NAME="indentNextLine" VALUE="\s*(.*:|(function\s+.*)|(section\s+.*)|(subsection\s+.*))" />
-	</PROPS>
-
-	<RULES IGNORE_CASE="TRUE" HIGHLIGHT_DIGITS="TRUE" DEFAULT="NULL">
-	<!-- Java comment (C style) -->
-    <SPAN TYPE="COMMENT1">
-      <BEGIN>/*</BEGIN>
-      <END>*/</END>
-    </SPAN>
-
-    <!-- Silly comment -->
-    <SEQ TYPE="COMMENT1">/**/</SEQ>
-	
-		<EOL_SPAN TYPE="COMMENT1">;</EOL_SPAN>
-		<EOL_SPAN TYPE="COMMENT2">#</EOL_SPAN>
-
-		<MARK_FOLLOWING TYPE="KEYWORD3">$</MARK_FOLLOWING>
-		<MARK_PREVIOUS TYPE="FUNCTION" MATCH_TYPE="OPERATOR">::</MARK_PREVIOUS>
-		<MARK_PREVIOUS TYPE="LABEL" MATCH_TYPE="OPERATOR">:</MARK_PREVIOUS>
-
-		<SPAN TYPE="LITERAL1" ESCAPE="$\" DELEGATE="NSIS_LITERAL">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-
-		<SPAN TYPE="LITERAL1" ESCAPE="$\" DELEGATE="NSIS_LITERAL">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-
-		<SPAN TYPE="LITERAL1" ESCAPE="$\" DELEGATE="NSIS_LITERAL">
-			<BEGIN>`</BEGIN>
-			<END>`</END>
-		</SPAN>
-
-		<KEYWORDS>
-			<!-- Deprecated stuff -->
-			<INVALID>dim</INVALID>
-			<INVALID>uninstallexename</INVALID>
-			<INVALID>subsection</INVALID>
-			<INVALID>subsectionend</INVALID>
-
-			<!-- Global variables -->
-			<KEYWORD3>$0</KEYWORD3>
-			<KEYWORD3>$1</KEYWORD3>
-			<KEYWORD3>$2</KEYWORD3>
-			<KEYWORD3>$3</KEYWORD3>
-			<KEYWORD3>$4</KEYWORD3>
-			<KEYWORD3>$5</KEYWORD3>
-			<KEYWORD3>$6</KEYWORD3>
-			<KEYWORD3>$7</KEYWORD3>
-			<KEYWORD3>$8</KEYWORD3>
-			<KEYWORD3>$9</KEYWORD3>
-			<KEYWORD3>$INSTDIR</KEYWORD3>
-			<KEYWORD3>$OUTDIR</KEYWORD3>
-			<KEYWORD3>$CMDLINE</KEYWORD3>
-			<KEYWORD3>$LANGUAGE</KEYWORD3>
-
-			<!-- Local variables -->
-			<KEYWORD3>$R0</KEYWORD3>
-			<KEYWORD3>$R1</KEYWORD3>
-			<KEYWORD3>$R2</KEYWORD3>
-			<KEYWORD3>$R3</KEYWORD3>
-			<KEYWORD3>$R4</KEYWORD3>
-			<KEYWORD3>$R5</KEYWORD3>
-			<KEYWORD3>$R6</KEYWORD3>
-			<KEYWORD3>$R7</KEYWORD3>
-			<KEYWORD3>$R8</KEYWORD3>
-			<KEYWORD3>$R9</KEYWORD3>
-
-			<!-- Constants -->
-			<LITERAL3>ARCHIVE</LITERAL3>
-			<LITERAL3>CENTER</LITERAL3>
-			<LITERAL3>CONTROL</LITERAL3>
-			<LITERAL3>CUR</LITERAL3>
-			<LITERAL3>EXT</LITERAL3>
-			<LITERAL3>F1</LITERAL3>
-			<LITERAL3>F2</LITERAL3>
-			<LITERAL3>F3</LITERAL3>
-			<LITERAL3>F4</LITERAL3>
-			<LITERAL3>F5</LITERAL3>
-			<LITERAL3>F6</LITERAL3>
-			<LITERAL3>F7</LITERAL3>
-			<LITERAL3>F8</LITERAL3>
-			<LITERAL3>F9</LITERAL3>
-			<LITERAL3>F10</LITERAL3>
-			<LITERAL3>F11</LITERAL3>
-			<LITERAL3>F12</LITERAL3>
-			<LITERAL3>F13</LITERAL3>
-			<LITERAL3>F14</LITERAL3>
-			<LITERAL3>F15</LITERAL3>
-			<LITERAL3>F16</LITERAL3>
-			<LITERAL3>F17</LITERAL3>
-			<LITERAL3>F18</LITERAL3>
-			<LITERAL3>F19</LITERAL3>
-			<LITERAL3>F20</LITERAL3>
-			<LITERAL3>F21</LITERAL3>
-			<LITERAL3>F22</LITERAL3>
-			<LITERAL3>F23</LITERAL3>
-			<LITERAL3>F24</LITERAL3>
-			<LITERAL3>FILE_ATTRIBUTE_ARCHIVE</LITERAL3>
-			<LITERAL3>MB_ABORTRETRYIGNORE</LITERAL3>
-			<LITERAL3>RIGHT</LITERAL3>
-			<LITERAL3>RO</LITERAL3>
-			<LITERAL3>SET</LITERAL3>
-			<LITERAL3>SHIFT</LITERAL3>
-			<LITERAL3>SW_SHOWMAXIMIZED</LITERAL3>
-			<LITERAL3>SW_SHOWMINIMIZED</LITERAL3>
-			<LITERAL3>SW_SHOWNORMAL</LITERAL3>
-			<LITERAL3>a</LITERAL3>
-			<LITERAL3>admin</LITERAL3>
-			<LITERAL3>all</LITERAL3>
-			<LITERAL3>alwaysoff</LITERAL3>
-			<LITERAL3>auto</LITERAL3>
-			<LITERAL3>both</LITERAL3>
-			<LITERAL3>bottom</LITERAL3>
-			<LITERAL3>bzip2</LITERAL3>
-			<LITERAL3>checkbox</LITERAL3>
-			<LITERAL3>colored</LITERAL3>
-			<LITERAL3>components</LITERAL3>
-			<LITERAL3>current</LITERAL3>
-			<LITERAL3>custom</LITERAL3>
-			<LITERAL3>directory</LITERAL3>
-			<LITERAL3>false</LITERAL3>
-			<LITERAL3>force</LITERAL3>
-			<LITERAL3>hide</LITERAL3>
-			<LITERAL3>highest</LITERAL3>
-			<LITERAL3>ifnewer</LITERAL3>
-			<LITERAL3>instfiles</LITERAL3>
-			<LITERAL3>license</LITERAL3>
-			<LITERAL3>listonly</LITERAL3>
-			<LITERAL3>manual</LITERAL3>
-			<LITERAL3>nevershow</LITERAL3>
-			<LITERAL3>none</LITERAL3>
-			<LITERAL3>off</LITERAL3>
-			<LITERAL3>on</LITERAL3>
-			<LITERAL3>r</LITERAL3>
-			<LITERAL3>radiobuttons</LITERAL3>
-			<LITERAL3>show</LITERAL3>
-			<LITERAL3>silent</LITERAL3>
-			<LITERAL3>silentlog</LITERAL3>
-			<LITERAL3>smooth</LITERAL3>
-			<LITERAL3>textonly</LITERAL3>
-			<LITERAL3>top</LITERAL3>
-			<LITERAL3>true</LITERAL3>
-			<LITERAL3>try</LITERAL3>
-			<LITERAL3>uninstConfirm</LITERAL3>
-			<LITERAL3>user</LITERAL3>
-			<LITERAL3>w</LITERAL3>
-			<LITERAL3>zlib</LITERAL3>
-			<LITERAL3>$$</LITERAL3>
-			<LITERAL3>$DESKTOP</LITERAL3>
-			<LITERAL3>$EXEDIR</LITERAL3>
-			<LITERAL3>$HWNDPARENT</LITERAL3>
-			<LITERAL3>$PLUGINSDIR</LITERAL3>
-			<LITERAL3>$PROGRAMFILES</LITERAL3>
-			<LITERAL3>$QUICKLAUNCH</LITERAL3>
-			<LITERAL3>$SMPROGRAMS</LITERAL3>
-			<LITERAL3>$SMSTARTUP</LITERAL3>
-			<LITERAL3>$STARTMENU</LITERAL3>
-			<LITERAL3>$SYSDIR</LITERAL3>
-			<LITERAL3>$TEMP</LITERAL3>
-			<LITERAL3>$WINDIR</LITERAL3>
-			<LITERAL3>$\n</LITERAL3>
-			<LITERAL3>$\r</LITERAL3>
-			<LITERAL3>${NSISDIR}</LITERAL3>
-			<LITERAL3>ALT</LITERAL3>
-			<LITERAL3>END</LITERAL3>
-			<LITERAL3>FILE_ATTRIBUTE_HIDDEN</LITERAL3>
-			<LITERAL3>FILE_ATTRIBUTE_NORMAL</LITERAL3>
-			<LITERAL3>FILE_ATTRIBUTE_OFFLINE</LITERAL3>
-			<LITERAL3>FILE_ATTRIBUTE_READONLY</LITERAL3>
-			<LITERAL3>FILE_ATTRIBUTE_SYSTEM</LITERAL3>
-			<LITERAL3>FILE_ATTRIBUTE_TEMPORARY</LITERAL3>
-			<LITERAL3>HIDDEN</LITERAL3>
-			<LITERAL3>HKCC</LITERAL3>
-			<LITERAL3>HKCR</LITERAL3>
-			<LITERAL3>HKCU</LITERAL3>
-			<LITERAL3>HKDD</LITERAL3>
-			<LITERAL3>HKLM</LITERAL3>
-			<LITERAL3>HKPD</LITERAL3>
-			<LITERAL3>HKU</LITERAL3>
-			<LITERAL3>SHCTX</LITERAL3>
-			<LITERAL3>IDABORT</LITERAL3>
-			<LITERAL3>IDCANCEL</LITERAL3>
-			<LITERAL3>IDIGNORE</LITERAL3>
-			<LITERAL3>IDNO</LITERAL3>
-			<LITERAL3>IDOK</LITERAL3>
-			<LITERAL3>IDRETRY</LITERAL3>
-			<LITERAL3>IDYES</LITERAL3>
-			<LITERAL3>LEFT</LITERAL3>
-			<LITERAL3>MB_DEFBUTTON1</LITERAL3>
-			<LITERAL3>MB_DEFBUTTON2</LITERAL3>
-			<LITERAL3>MB_DEFBUTTON3</LITERAL3>
-			<LITERAL3>MB_DEFBUTTON4</LITERAL3>
-			<LITERAL3>MB_ICONEXCLAMATION</LITERAL3>
-			<LITERAL3>MB_ICONINFORMATION</LITERAL3>
-			<LITERAL3>MB_ICONQUESTION</LITERAL3>
-			<LITERAL3>MB_ICONSTOP</LITERAL3>
-			<LITERAL3>MB_OK</LITERAL3>
-			<LITERAL3>MB_OKCANCEL</LITERAL3>
-			<LITERAL3>MB_RETRYCANCEL</LITERAL3>
-			<LITERAL3>MB_RIGHT</LITERAL3>
-			<LITERAL3>MB_SETFOREGROUND</LITERAL3>
-			<LITERAL3>MB_TOPMOST</LITERAL3>
-			<LITERAL3>MB_YESNO</LITERAL3>
-			<LITERAL3>MB_YESNOCANCEL</LITERAL3>
-			<LITERAL3>NORMAL</LITERAL3>
-			<LITERAL3>OFFLINE</LITERAL3>
-			<LITERAL3>READONLY</LITERAL3>
-			<LITERAL3>SYSTEM</LITERAL3>
-			<LITERAL3>TEMPORARY</LITERAL3>
-
-			<!-- Command flags -->
-			<KEYWORD4>/0</KEYWORD4>
-			<KEYWORD4>/COMPONENTSONLYONCUSTOM</KEYWORD4>
-			<KEYWORD4>/CUSTOMSTRING</KEYWORD4>
-			<KEYWORD4>/FILESONLY</KEYWORD4>
-			<KEYWORD4>/IMGID</KEYWORD4>
-			<KEYWORD4>/ITALIC</KEYWORD4>
-			<KEYWORD4>/LANG</KEYWORD4>
-			<KEYWORD4>/NOCUSTOM</KEYWORD4>
-			<KEYWORD4>/NOUNLOAD</KEYWORD4>
-			<KEYWORD4>/REBOOTOK</KEYWORD4>
-			<KEYWORD4>/RESIZETOFIT</KEYWORD4>
-			<KEYWORD4>/RTL</KEYWORD4>
-			<KEYWORD4>/SHORT</KEYWORD4>
-			<KEYWORD4>/SILENT</KEYWORD4>
-			<KEYWORD4>/STRIKE</KEYWORD4>
-			<KEYWORD4>/TIMEOUT</KEYWORD4>
-			<KEYWORD4>/TRIM</KEYWORD4>
-			<KEYWORD4>/UNDERLINE</KEYWORD4>
-			<KEYWORD4>/a</KEYWORD4>
-			<KEYWORD4>/e</KEYWORD4>
-			<KEYWORD4>/ifempty</KEYWORD4>
-			<KEYWORD4>/nonfatal</KEYWORD4>
-			<KEYWORD4>/oname</KEYWORD4>
-			<KEYWORD4>/r</KEYWORD4>
-			<KEYWORD4>/windows</KEYWORD4>
-
-			<!-- Compiler utility commands -->
-			<KEYWORD2>!addincludedir</KEYWORD2>
-			<KEYWORD2>!addplugindir</KEYWORD2>
-			<KEYWORD2>!define</KEYWORD2>
-			<KEYWORD2>!include</KEYWORD2>
-			<KEYWORD2>!cd</KEYWORD2>
-			<KEYWORD2>!echo</KEYWORD2>
-			<KEYWORD2>!error</KEYWORD2>
-			<KEYWORD2>!insertmacro</KEYWORD2>
-			<KEYWORD2>!packhdr</KEYWORD2>
-			<KEYWORD2>!system</KEYWORD2>
-			<KEYWORD2>!warning</KEYWORD2>
-			<KEYWORD2>!undef</KEYWORD2>
-			<KEYWORD2>!verbose</KEYWORD2>
-
-			<!-- Conditional compilation -->
-			<KEYWORD1>!ifdef</KEYWORD1>
-			<KEYWORD1>!ifndef</KEYWORD1>
-			<KEYWORD1>!if</KEYWORD1>
-			<KEYWORD1>!else</KEYWORD1>
-			<KEYWORD1>!endif</KEYWORD1>
-			<KEYWORD1>!macro</KEYWORD1>
-			<KEYWORD1>!macroend</KEYWORD1>
-
-			<!-- Keywords -->
-			<KEYWORD1>function</KEYWORD1>
-			<KEYWORD1>functionend</KEYWORD1>
-			<KEYWORD1>section</KEYWORD1>
-			<KEYWORD1>sectiongroup</KEYWORD1>
-			<KEYWORD1>sectionend</KEYWORD1>
-			<KEYWORD1>sectiongroupend</KEYWORD1>
-
-			<!-- Instructions -->
-			<KEYWORD2>addbrandingimage</KEYWORD2>
-			<KEYWORD2>addsize</KEYWORD2>
-			<KEYWORD2>allowrootdirinstall</KEYWORD2>
-			<KEYWORD2>allowskipfiles</KEYWORD2>
-			<KEYWORD2>autoclosewindow</KEYWORD2>
-			<KEYWORD2>bggradient</KEYWORD2>
-			<KEYWORD2>brandingtext</KEYWORD2>
-			<KEYWORD2>bringtofront</KEYWORD2>
-			<KEYWORD2>callinstdll</KEYWORD2>
-			<KEYWORD2>caption</KEYWORD2>
-			<KEYWORD2>changeui</KEYWORD2>
-			<KEYWORD2>checkbitmap</KEYWORD2>
-			<KEYWORD2>completedtext</KEYWORD2>
-			<KEYWORD2>componenttext</KEYWORD2>
-			<KEYWORD2>copyfiles</KEYWORD2>
-			<KEYWORD2>crccheck</KEYWORD2>
-			<KEYWORD2>createdirectory</KEYWORD2>
-			<KEYWORD2>createfont</KEYWORD2>
-			<KEYWORD2>createshortcut</KEYWORD2>
-			<KEYWORD2>delete</KEYWORD2>
-			<KEYWORD2>deleteinisec</KEYWORD2>
-			<KEYWORD2>deleteinistr</KEYWORD2>
-			<KEYWORD2>deleteregkey</KEYWORD2>
-			<KEYWORD2>deleteregvalue</KEYWORD2>
-			<KEYWORD2>detailprint</KEYWORD2>
-			<KEYWORD2>detailsbuttontext</KEYWORD2>
-			<KEYWORD2>dirshow</KEYWORD2>
-			<KEYWORD2>dirtext</KEYWORD2>
-			<KEYWORD2>enumregkey</KEYWORD2>
-			<KEYWORD2>enumregvalue</KEYWORD2>
-			<KEYWORD2>exch</KEYWORD2>
-			<KEYWORD2>exec</KEYWORD2>
-			<KEYWORD2>execshell</KEYWORD2>
-			<KEYWORD2>execwait</KEYWORD2>
-			<KEYWORD2>expandenvstrings</KEYWORD2>
-			<KEYWORD2>file</KEYWORD2>
-			<KEYWORD2>fileclose</KEYWORD2>
-			<KEYWORD2>fileerrortext</KEYWORD2>
-			<KEYWORD2>fileopen</KEYWORD2>
-			<KEYWORD2>fileread</KEYWORD2>
-			<KEYWORD2>filereadbyte</KEYWORD2>
-			<KEYWORD2>fileseek</KEYWORD2>
-			<KEYWORD2>filewrite</KEYWORD2>
-			<KEYWORD2>filewritebyte</KEYWORD2>
-			<KEYWORD2>findclose</KEYWORD2>
-			<KEYWORD2>findfirst</KEYWORD2>
-			<KEYWORD2>findnext</KEYWORD2>
-			<KEYWORD2>findwindow</KEYWORD2>
-			<KEYWORD2>flushini</KEYWORD2>
-			<KEYWORD2>getcurinsttype</KEYWORD2>
-			<KEYWORD2>getcurrentaddress</KEYWORD2>
-			<KEYWORD2>getdlgitem</KEYWORD2>
-			<KEYWORD2>getdllversion</KEYWORD2>
-			<KEYWORD2>getdllversionlocal</KEYWORD2>
-			<KEYWORD2>getfiletime</KEYWORD2>
-			<KEYWORD2>getfiletimelocal</KEYWORD2>
-			<KEYWORD2>getfullpathname</KEYWORD2>
-			<KEYWORD2>getfunctionaddress</KEYWORD2>
-			<KEYWORD2>getlabeladdress</KEYWORD2>
-			<KEYWORD2>gettempfilename</KEYWORD2>
-			<KEYWORD2>getwindowtext</KEYWORD2>
-			<KEYWORD2>hidewindow</KEYWORD2>
-			<KEYWORD2>icon</KEYWORD2>
-			<KEYWORD2>initpluginsdir</KEYWORD2>
-			<KEYWORD2>installbuttontext</KEYWORD2>
-			<KEYWORD2>installcolors</KEYWORD2>
-			<KEYWORD2>installdir</KEYWORD2>
-			<KEYWORD2>installdirregkey</KEYWORD2>
-			<KEYWORD2>instprogressflags</KEYWORD2>
-			<KEYWORD2>insttype</KEYWORD2>
-			<KEYWORD2>insttypegettext</KEYWORD2>
-			<KEYWORD2>insttypesettext</KEYWORD2>
-			<KEYWORD2>intfmt</KEYWORD2>
-			<KEYWORD2>intop</KEYWORD2>
-			<KEYWORD2>langstring</KEYWORD2>
-			<KEYWORD2>langstringup</KEYWORD2>
-			<KEYWORD2>licensebkcolor</KEYWORD2>
-			<KEYWORD2>licensedata</KEYWORD2>
-			<KEYWORD2>licenseforceselection</KEYWORD2>
-			<KEYWORD2>licensetext</KEYWORD2>
-			<KEYWORD2>loadlanguagefile</KEYWORD2>
-			<KEYWORD2>loadlanguagefile</KEYWORD2>
-			<KEYWORD2>logset</KEYWORD2>
-			<KEYWORD2>logtext</KEYWORD2>
-			<KEYWORD2>miscbuttontext</KEYWORD2>
-			<KEYWORD2>name</KEYWORD2>
-			<KEYWORD2>nop</KEYWORD2>
-			<KEYWORD2>outfile</KEYWORD2>
-			<KEYWORD2>page</KEYWORD2>
-			<KEYWORD2>plugindir</KEYWORD2>
-			<KEYWORD2>pop</KEYWORD2>
-			<KEYWORD2>push</KEYWORD2>
-			<KEYWORD2>readenvstr</KEYWORD2>
-			<KEYWORD2>readinistr</KEYWORD2>
-			<KEYWORD2>readregdword</KEYWORD2>
-			<KEYWORD2>readregstr</KEYWORD2>
-			<KEYWORD2>regdll</KEYWORD2>
-			<KEYWORD2>rename</KEYWORD2>
-			<KEYWORD2>requestexecutionlevel</KEYWORD2>
-			<KEYWORD2>reservefile</KEYWORD2>
-			<KEYWORD2>rmdir</KEYWORD2>
-			<KEYWORD2>searchpath</KEYWORD2>
-			<KEYWORD2>sectiongetflags</KEYWORD2>
-			<KEYWORD2>sectiongetinsttypes</KEYWORD2>
-			<KEYWORD2>sectiongetsize</KEYWORD2>
-			<KEYWORD2>sectiongettext</KEYWORD2>
-			<KEYWORD2>sectionin</KEYWORD2>
-			<KEYWORD2>sectionsetflags</KEYWORD2>
-			<KEYWORD2>sectionsetinsttypes</KEYWORD2>
-			<KEYWORD2>sectionsetsize</KEYWORD2>
-			<KEYWORD2>sectionsettext</KEYWORD2>
-			<KEYWORD2>sendmessage</KEYWORD2>
-			<KEYWORD2>setautoclose</KEYWORD2>
-			<KEYWORD2>setbkcolor</KEYWORD2>
-			<KEYWORD2>setbrandingimage</KEYWORD2>
-			<KEYWORD2>setcompress</KEYWORD2>
-			<KEYWORD2>setcompressor</KEYWORD2>
-			<KEYWORD2>setcurinsttype</KEYWORD2>
-			<KEYWORD2>setdatablockoptimize</KEYWORD2>
-			<KEYWORD2>setdatesave</KEYWORD2>
-			<KEYWORD2>setdetailsprint</KEYWORD2>
-			<KEYWORD2>setdetailsview</KEYWORD2>
-			<KEYWORD2>seterrorlevel</KEYWORD2>
-			<KEYWORD2>setfileattributes</KEYWORD2>
-			<KEYWORD2>setfont</KEYWORD2>
-			<KEYWORD2>setoutpath</KEYWORD2>
-			<KEYWORD2>setoverwrite</KEYWORD2>
-			<KEYWORD2>setpluginunload</KEYWORD2>
-			<KEYWORD2>setrebootflag</KEYWORD2>
-			<KEYWORD2>setregview</KEYWORD2>
-			<KEYWORD2>setshellvarcontext</KEYWORD2>
-			<KEYWORD2>setstaticbkcolor</KEYWORD2>
-			<KEYWORD2>setwindowlong</KEYWORD2>
-			<KEYWORD2>showinstdetails</KEYWORD2>
-			<KEYWORD2>showuninstdetails</KEYWORD2>
-			<KEYWORD2>showwindow</KEYWORD2>
-			<KEYWORD2>silentinstall</KEYWORD2>
-			<KEYWORD2>silentuninstall</KEYWORD2>
-			<KEYWORD2>sleep</KEYWORD2>
-			<KEYWORD2>spacetexts</KEYWORD2>
-			<KEYWORD2>strcpy</KEYWORD2>
-			<KEYWORD2>strlen</KEYWORD2>
-			<KEYWORD2>subcaption</KEYWORD2>
-			<KEYWORD2>uninstallbuttontext</KEYWORD2>
-			<KEYWORD2>uninstallcaption</KEYWORD2>
-			<KEYWORD2>uninstallicon</KEYWORD2>
-			<KEYWORD2>uninstallsubcaption</KEYWORD2>
-			<KEYWORD2>uninstalltext</KEYWORD2>
-			<KEYWORD2>uninstpage</KEYWORD2>
-			<KEYWORD2>unregdll</KEYWORD2>
-			<KEYWORD2>var</KEYWORD2>
-			<KEYWORD2>viaddversionkey</KEYWORD2>
-			<KEYWORD2>videscription</KEYWORD2>
-			<KEYWORD2>vicompanyname</KEYWORD2>
-			<KEYWORD2>vicomments</KEYWORD2>
-			<KEYWORD2>vilegalcopyrights</KEYWORD2>
-			<KEYWORD2>vilegaltrademarks</KEYWORD2>
-			<KEYWORD2>viproductname</KEYWORD2>
-			<KEYWORD2>viproductversion</KEYWORD2>
-			<KEYWORD2>windowicon</KEYWORD2>
-			<KEYWORD2>writeinistr</KEYWORD2>
-			<KEYWORD2>writeregbin</KEYWORD2>
-			<KEYWORD2>writeregdword</KEYWORD2>
-			<KEYWORD2>writeregexpandstr</KEYWORD2>
-			<KEYWORD2>writeregstr</KEYWORD2>
-			<KEYWORD2>writeuninstaller</KEYWORD2>
-			<KEYWORD2>xpstyle</KEYWORD2>
-
-			<!-- Flow control instructions -->
-			<KEYWORD1>abort</KEYWORD1>
-			<KEYWORD1>call</KEYWORD1>
-			<KEYWORD1>clearerrors</KEYWORD1>
-			<KEYWORD1>goto</KEYWORD1>
-			<KEYWORD1>ifabort</KEYWORD1>
-			<KEYWORD1>iferrors</KEYWORD1>
-			<KEYWORD1>iffileexists</KEYWORD1>
-			<KEYWORD1>ifrebootflag</KEYWORD1>
-			<KEYWORD1>intcmp</KEYWORD1>
-			<KEYWORD1>intcmpu</KEYWORD1>
-			<KEYWORD1>iswindow</KEYWORD1>
-			<KEYWORD1>messagebox</KEYWORD1>
-			<KEYWORD1>reboot</KEYWORD1>
-			<KEYWORD1>return</KEYWORD1>
-			<KEYWORD1>quit</KEYWORD1>
-			<KEYWORD1>seterrors</KEYWORD1>
-			<KEYWORD1>strcmp</KEYWORD1>
-			<KEYWORD1>strcmps</KEYWORD1>
-
-			<!-- Callback functions -->
-			<KEYWORD3>.onguiinit</KEYWORD3>
-			<KEYWORD3>.oninit</KEYWORD3>
-			<KEYWORD3>.oninstfailed</KEYWORD3>
-			<KEYWORD3>.oninstsuccess</KEYWORD3>
-			<KEYWORD3>.onmouseoversection</KEYWORD3>
-			<KEYWORD3>.onselchange</KEYWORD3>
-			<KEYWORD3>.onuserabort</KEYWORD3>
-			<KEYWORD3>.onverifyinstdir</KEYWORD3>
-			<KEYWORD3>un.onguiinit</KEYWORD3>
-			<KEYWORD3>un.oninit</KEYWORD3>
-			<KEYWORD3>un.onuninstfailed</KEYWORD3>
-			<KEYWORD3>un.onuninstsuccess</KEYWORD3>
-			<KEYWORD3>un.onuserabort</KEYWORD3>
-		</KEYWORDS>
-	</RULES>
-
-	<RULES SET="NSIS_LITERAL" ESCAPE="$\" DEFAULT="LITERAL1" NO_WORD_SEP="-{}_">
-	</RULES>
-
-</MODE>
diff --git a/qpython/src/main/assets/syntax/objective_c.xml b/qpython/src/main/assets/syntax/objective_c.xml
deleted file mode 100644
index edc3b585..00000000
--- a/qpython/src/main/assets/syntax/objective_c.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!-- Extension of c.xml to handle Objective-C keywords. -->
-<MODE>
-    <PROPS>
-        <PROPERTY NAME="commentStart" VALUE="/*" />
-        <PROPERTY NAME="commentEnd" VALUE="*/" />
-        <PROPERTY NAME="lineComment" VALUE="//" />
-        <PROPERTY NAME="wordBreakChars" VALUE=",+-=&lt;&gt;/?^&amp;*" />
-
-	<!-- Auto indent -->
-	<PROPERTY NAME="indentOpenBrackets" VALUE="{" />
-	<PROPERTY NAME="indentCloseBrackets" VALUE="}" />
-	<PROPERTY NAME="unalignedOpenBrackets" VALUE="(" />
-	<PROPERTY NAME="unalignedCloseBrackets" VALUE=")" />
-	<PROPERTY NAME="indentNextLine"
-		VALUE="\s*(((if|while)\s*\(|else\s*|else\s+if\s*\(|for\s*\(.*\))[^{;]*)" />
-	<PROPERTY NAME="unindentThisLine"
-		VALUE="^.*(default:\s*|case.*:.*)$" />
-	<PROPERTY NAME="electricKeys" VALUE=":" />
-    </PROPS>
-
-    <RULES
-        IGNORE_CASE="FALSE"
-        HIGHLIGHT_DIGITS="TRUE" DIGIT_RE="[0-9][0-9a-zA-Z]*">
-        <EOL_SPAN TYPE="KEYWORD2" AT_WHITESPACE_END="TRUE" DELEGATE="CPP">#</EOL_SPAN>
-
-        <IMPORT DELEGATE="c::LEX"/>
-        <IMPORT DELEGATE="c::CORE"/>
-		<IMPORT DELEGATE="CORE"/>
-    </RULES>
-
-    <!-- Core language -->
-    <RULES SET="CORE"
-        IGNORE_CASE="FALSE"
-        HIGHLIGHT_DIGITS="TRUE" DIGIT_RE="[0-9][0-9a-zA-Z]*">
-        <KEYWORDS>
-            <!-- Types (Objective C) -->
-            <KEYWORD3>id</KEYWORD3>
-            <KEYWORD3>Class</KEYWORD3>
-            <KEYWORD3>SEL</KEYWORD3>
-            <KEYWORD3>IMP</KEYWORD3>
-            <KEYWORD3>BOOL</KEYWORD3>
-
-            <!-- Keywords (Objective C) -->
-            <KEYWORD1>oneway</KEYWORD1>
-            <KEYWORD1>in</KEYWORD1>
-            <KEYWORD1>out</KEYWORD1>
-            <KEYWORD1>inout</KEYWORD1>
-            <KEYWORD1>bycopy</KEYWORD1>
-            <KEYWORD1>byref</KEYWORD1>
-            <KEYWORD1>self</KEYWORD1>
-            <KEYWORD1>super</KEYWORD1>
-
-            <!-- Preprocessor Directives (Objective C)-->
-            <KEYWORD1>@interface</KEYWORD1>
-            <KEYWORD1>@implementation</KEYWORD1>
-            <KEYWORD1>@protocol</KEYWORD1>
-            <KEYWORD1>@end</KEYWORD1>
-            <KEYWORD1>@private</KEYWORD1>
-            <KEYWORD1>@protected</KEYWORD1>
-            <KEYWORD1>@public</KEYWORD1>
-            <KEYWORD1>@class</KEYWORD1>
-            <KEYWORD1>@selector</KEYWORD1>
-            <KEYWORD1>@endcode</KEYWORD1>
-            <KEYWORD1>@defs</KEYWORD1>
-
-            <LITERAL2>TRUE</LITERAL2>
-            <LITERAL2>FALSE</LITERAL2>
-            <LITERAL2>YES</LITERAL2>
-            <LITERAL2>NO</LITERAL2>
-            <LITERAL2>NULL</LITERAL2>
-            <LITERAL2>nil</LITERAL2>
-            <LITERAL2>Nil</LITERAL2>
-        </KEYWORDS>
-    </RULES>
-
-    <!-- Preprocessor specific rules -->
-    <RULES SET="CPP"
-        IGNORE_CASE="FALSE"
-        HIGHLIGHT_DIGITS="TRUE" DIGIT_RE="[0-9][0-9a-zA-Z]*">
-
-        <EOL_SPAN_REGEXP HASH_CHAR="include" TYPE="MARKUP" DELEGATE="c::INCLUDE">include\b</EOL_SPAN_REGEXP>
-        <EOL_SPAN_REGEXP HASH_CHAR="import" TYPE="MARKUP" DELEGATE="c::INCLUDE">import\b</EOL_SPAN_REGEXP>
-        <EOL_SPAN_REGEXP HASH_CHAR="define" TYPE="MARKUP" DELEGATE="DEFINE">define\b</EOL_SPAN_REGEXP>
-        <EOL_SPAN_REGEXP HASH_CHAR="endif" TYPE="MARKUP" DELEGATE="c::LEX">endif\b</EOL_SPAN_REGEXP>
-        <EOL_SPAN_REGEXP HASH_CHAR="elif" TYPE="MARKUP" DELEGATE="c::CONDITION">elif\b</EOL_SPAN_REGEXP>
-        <EOL_SPAN_REGEXP HASH_CHAR="if" TYPE="MARKUP" DELEGATE="c::CONDITION">if\b</EOL_SPAN_REGEXP>
-
-        <IMPORT DELEGATE="c::LEX"/>
-
-        <!-- Directives -->
-        <KEYWORDS>
-            <MARKUP>ifdef</MARKUP>
-            <MARKUP>ifndef</MARKUP>
-            <MARKUP>else</MARKUP>
-            <MARKUP>error</MARKUP>
-            <MARKUP>line</MARKUP>
-            <MARKUP>pragma</MARKUP>
-            <MARKUP>undef</MARKUP>
-            <MARKUP>warning</MARKUP>
-        </KEYWORDS>
-    </RULES>
-
-    <!-- After #define directive -->
-    <!-- Almost same as the normal code,
-        except two additional operators # and ##. -->
-    <RULES SET="DEFINE"
-        IGNORE_CASE="FALSE"
-        HIGHLIGHT_DIGITS="TRUE" DIGIT_RE="[0-9][0-9a-zA-Z]*">
-        <SEQ TYPE="OPERATOR">#</SEQ>
-        <IMPORT DELEGATE="c::LEX"/>
-        <IMPORT DELEGATE="c::CORE"/>
-        <IMPORT DELEGATE="CORE"/>
-    </RULES>
-
-</MODE>
diff --git a/qpython/src/main/assets/syntax/objectrexx.xml b/qpython/src/main/assets/syntax/objectrexx.xml
deleted file mode 100644
index 835c71d8..00000000
--- a/qpython/src/main/assets/syntax/objectrexx.xml
+++ /dev/null
@@ -1,245 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="indentNextLines"
-			VALUE="\s*(if|loop|do|else|select|otherwise|catch|finally|class|method|properties)(.*)"/>
-		<!-- set this to 'true' if you want to use GNU coding style -->
-		<PROPERTY NAME="commentStart" VALUE="/*" />
-		<PROPERTY NAME="commentEnd" VALUE="*/" />
-		<PROPERTY NAME="lineComment" VALUE="--" />
-		<PROPERTY NAME="wordBreakChars" VALUE=",+-=&lt;&gt;/?^&amp;*" />
-	</PROPS>
-	<RULES IGNORE_CASE="TRUE"
-		HIGHLIGHT_DIGITS="TRUE"
-		DIGIT_RE="(0x[\p{XDigit}]+[lL]?|[\p{Digit}]+(e[\p{Digit}]*)?[lLdDfF]?)">
-
-		<!-- C style comment -->
-		<SPAN TYPE="COMMENT1">
-			<BEGIN>/*</BEGIN>
-			<END>*/</END>
-		</SPAN>
-
-		<SPAN TYPE="LITERAL1" ESCAPE="\" NO_LINE_BREAK="TRUE">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-		<SPAN TYPE="LITERAL1" ESCAPE="\" NO_LINE_BREAK="TRUE">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-
-		<!-- preprocessor statements -->
-		<EOL_SPAN TYPE="KEYWORD2">#</EOL_SPAN>
-
-		<EOL_SPAN TYPE="COMMENT1">--</EOL_SPAN>
-		<SEQ TYPE="OPERATOR">=</SEQ>
-		<SEQ TYPE="OPERATOR">!</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;=</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;=</SEQ>
-		<SEQ TYPE="OPERATOR">+</SEQ>
-		<SEQ TYPE="OPERATOR">-</SEQ>
-		<SEQ TYPE="OPERATOR">/</SEQ>
-
-		<SEQ TYPE="OPERATOR">*</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;</SEQ>
-		<SEQ TYPE="OPERATOR">%</SEQ>
-		<SEQ TYPE="OPERATOR">&amp;</SEQ>
-		<SEQ TYPE="OPERATOR">|</SEQ>
-		<SEQ TYPE="OPERATOR">^</SEQ>
-		<SEQ TYPE="OPERATOR">~</SEQ>
-		<SEQ TYPE="OPERATOR">}</SEQ>
-		<SEQ TYPE="OPERATOR">{</SEQ>
-
-		<MARK_PREVIOUS TYPE="FUNCTION">::</MARK_PREVIOUS>
-
-		<MARK_PREVIOUS AT_WHITESPACE_END="TRUE"
-			MATCH_TYPE="OPERATOR"
-			TYPE="LABEL">:</MARK_PREVIOUS>
-
-		<!-- Function calls -->
-		<MARK_PREVIOUS TYPE="FUNCTION" MATCH_TYPE="OPERATOR">(</MARK_PREVIOUS>
-		<SEQ TYPE="OPERATOR">)</SEQ>
-
-		<KEYWORDS>
-			<KEYWORD1>Address</KEYWORD1>
-			<KEYWORD1>Arg</KEYWORD1>
-			<KEYWORD1>Call</KEYWORD1>
-			<KEYWORD1>Do</KEYWORD1>
-			<KEYWORD1>Drop</KEYWORD1>
-			<KEYWORD1>Exit</KEYWORD1>
-			<KEYWORD1>Expose</KEYWORD1>
-			<KEYWORD1>Forward</KEYWORD1>
-			<KEYWORD1>Guard</KEYWORD1>
-			<KEYWORD1>If</KEYWORD1>
-			<KEYWORD1>Interpret</KEYWORD1>
-			<KEYWORD1>Iterate</KEYWORD1>
-			<KEYWORD1>Leave</KEYWORD1>
-			<KEYWORD1>Nop</KEYWORD1>
-			<KEYWORD1>Numeric</KEYWORD1>
-			<KEYWORD1>Parse</KEYWORD1>
-			<KEYWORD1>Procedure</KEYWORD1>
-			<KEYWORD1>pull</KEYWORD1>
-			<KEYWORD1>Push</KEYWORD1>
-			<KEYWORD1>Queue</KEYWORD1>
-			<KEYWORD1>Raise</KEYWORD1>
-			<KEYWORD1>reply</KEYWORD1>
-			<KEYWORD1>Return</KEYWORD1>
-			<KEYWORD1>Say</KEYWORD1>
-			<KEYWORD1>Seleect</KEYWORD1>
-			<KEYWORD1>Signal</KEYWORD1>
-			<KEYWORD1>Trace</KEYWORD1>
-			<KEYWORD1>use</KEYWORD1>
-			<KEYWORD1>Class</KEYWORD1>
-			<KEYWORD1>Method</KEYWORD1>
-			<KEYWORD1>Requires</KEYWORD1>
-			<KEYWORD1>Routine</KEYWORD1>
-			<KEYWORD1>Result</KEYWORD1>
-			<KEYWORD1>RC</KEYWORD1>
-			<KEYWORD1>Self</KEYWORD1>
-			<KEYWORD1>Sigl</KEYWORD1>
-			<KEYWORD1>Super</KEYWORD1>
-			<KEYWORD2>Abbrev</KEYWORD2>
-			<KEYWORD2>Abs</KEYWORD2>
-			<KEYWORD2>Address</KEYWORD2>
-			<KEYWORD2>Arg</KEYWORD2>
-			<KEYWORD2>Beep</KEYWORD2>
-			<KEYWORD2>BitAnd</KEYWORD2>
-			<KEYWORD2>BitOr</KEYWORD2>
-			<KEYWORD2>BitXor</KEYWORD2>
-			<KEYWORD2>B2X</KEYWORD2>
-			<KEYWORD2>Center</KEYWORD2>
-			<KEYWORD2>ChangeStr</KEYWORD2>
-			<KEYWORD2>CharIn</KEYWORD2>
-			<KEYWORD2>CharOut</KEYWORD2>
-			<KEYWORD2>Chars</KEYWORD2>
-			<KEYWORD2>Compare</KEYWORD2>
-			<KEYWORD2>Consition</KEYWORD2>
-			<KEYWORD2>Copies</KEYWORD2>
-			<KEYWORD2>CountStr</KEYWORD2>
-			<KEYWORD2>C2D</KEYWORD2>
-			<KEYWORD2>C2X</KEYWORD2>
-			<KEYWORD2>DataType</KEYWORD2>
-			<KEYWORD2>Date</KEYWORD2>
-			<KEYWORD2>DelStr</KEYWORD2>
-			<KEYWORD2>DelWord</KEYWORD2>
-			<KEYWORD2>Digits</KEYWORD2>
-			<KEYWORD2>Directory</KEYWORD2>
-			<KEYWORD2>D2C</KEYWORD2>
-			<KEYWORD2>D2X</KEYWORD2>
-			<KEYWORD2>ErrorText</KEYWORD2>
-			<KEYWORD2>FileSpec</KEYWORD2>
-			<KEYWORD2>Form</KEYWORD2>
-			<KEYWORD2>Format</KEYWORD2>
-			<KEYWORD2>Fuzz</KEYWORD2>
-			<KEYWORD2>Insert</KEYWORD2>
-			<KEYWORD2>LastPos</KEYWORD2>
-			<KEYWORD2>Left</KEYWORD2>
-			<KEYWORD2>Length</KEYWORD2>
-			<KEYWORD2>LineIn</KEYWORD2>
-			<KEYWORD2>LineOut</KEYWORD2>
-			<KEYWORD2>Lines</KEYWORD2>
-			<KEYWORD2>Max</KEYWORD2>
-			<KEYWORD2>Min</KEYWORD2>
-			<KEYWORD2>Overlay</KEYWORD2>
-			<KEYWORD2>Pos</KEYWORD2>
-			<KEYWORD2>Queued</KEYWORD2>
-			<KEYWORD2>Random</KEYWORD2>
-			<KEYWORD2>Reverse</KEYWORD2>
-			<KEYWORD2>Right</KEYWORD2>
-			<KEYWORD2>Sign</KEYWORD2>
-			<KEYWORD2>SourceLine</KEYWORD2>
-			<KEYWORD2>Space</KEYWORD2>
-			<KEYWORD2>Stream</KEYWORD2>
-			<KEYWORD2>Strip</KEYWORD2>
-			<KEYWORD2>SubStr</KEYWORD2>
-			<KEYWORD2>SubWord</KEYWORD2>
-			<KEYWORD2>Symbol</KEYWORD2>
-			<KEYWORD2>Time</KEYWORD2>
-			<KEYWORD2>Trace</KEYWORD2>
-			<KEYWORD2>Translate</KEYWORD2>
-			<KEYWORD2>Trunc</KEYWORD2>
-			<KEYWORD2>Value</KEYWORD2>
-			<KEYWORD2>Var</KEYWORD2>
-			<KEYWORD2>Verify</KEYWORD2>
-			<KEYWORD2>Word</KEYWORD2>
-			<KEYWORD2>WordIndex</KEYWORD2>
-			<KEYWORD2>WordLength</KEYWORD2>
-			<KEYWORD2>WordPos</KEYWORD2>
-			<KEYWORD2>Words</KEYWORD2>
-			<KEYWORD2>XRange</KEYWORD2>
-			<KEYWORD2>X2B</KEYWORD2>
-			<KEYWORD2>X2C</KEYWORD2>
-			<KEYWORD2>X2D</KEYWORD2>
-			<KEYWORD2>RxFuncAdd</KEYWORD2>
-			<KEYWORD2>RxFuncDrop</KEYWORD2>
-			<KEYWORD2>RxFuncQuery</KEYWORD2>
-			<KEYWORD2>RxMessageBox</KEYWORD2>
-			<KEYWORD2>RxWinExec</KEYWORD2>
-			<KEYWORD2>SysAddRexxMacro</KEYWORD2>
-			<KEYWORD2>SysBootDrive</KEYWORD2>
-			<KEYWORD2>SysClearRexxMacroSpace</KEYWORD2>
-			<KEYWORD2>SysCloseEventSem</KEYWORD2>
-			<KEYWORD2>SysCloseMutexSem</KEYWORD2>
-			<KEYWORD2>SysCls</KEYWORD2>
-			<KEYWORD2>SysCreateEventSem</KEYWORD2>
-			<KEYWORD2>SysCreateMutexSem</KEYWORD2>
-			<KEYWORD2>SysCurPos</KEYWORD2>
-			<KEYWORD2>SysCurState</KEYWORD2>
-			<KEYWORD2>SysDriveInfo</KEYWORD2>
-			<KEYWORD2>SysDriveMap</KEYWORD2>
-			<KEYWORD2>SysDropFuncs</KEYWORD2>
-			<KEYWORD2>SysDropRexxMacro</KEYWORD2>
-			<KEYWORD2>SysDumpVariables</KEYWORD2>
-			<KEYWORD2>SysFileDelete</KEYWORD2>
-			<KEYWORD2>SysFileSearch</KEYWORD2>
-			<KEYWORD2>SysFileSystemType</KEYWORD2>
-			<KEYWORD2>SysFileTree</KEYWORD2>
-			<KEYWORD2>SysFromUnicode</KEYWORD2>
-			<KEYWORD2>SysToUnicode</KEYWORD2>
-			<KEYWORD2>SysGetErrortext</KEYWORD2>
-			<KEYWORD2>SysGetFileDateTime</KEYWORD2>
-			<KEYWORD2>SysGetKey</KEYWORD2>
-			<KEYWORD2>SysIni</KEYWORD2>
-			<KEYWORD2>SysLoadFuncs</KEYWORD2>
-			<KEYWORD2>SysLoadRexxMacroSpace</KEYWORD2>
-			<KEYWORD2>SysMkDir</KEYWORD2>
-			<KEYWORD2>SysOpenEventSem</KEYWORD2>
-			<KEYWORD2>SysOpenMutexSem</KEYWORD2>
-			<KEYWORD2>SysPostEventSem</KEYWORD2>
-			<KEYWORD2>SysPulseEventSem</KEYWORD2>
-			<KEYWORD2>SysQueryProcess</KEYWORD2>
-			<KEYWORD2>SysQueryRexxMacro</KEYWORD2>
-			<KEYWORD2>SysReleaseMutexSem</KEYWORD2>
-			<KEYWORD2>SysReorderRexxMacro</KEYWORD2>
-			<KEYWORD2>SysRequestMutexSem</KEYWORD2>
-			<KEYWORD2>SysResetEventSem</KEYWORD2>
-			<KEYWORD2>SysRmDir</KEYWORD2>
-			<KEYWORD2>SysSaveRexxMacroSpace</KEYWORD2>
-			<KEYWORD2>SysSearchPath</KEYWORD2>
-			<KEYWORD2>SysSetFileDateTime</KEYWORD2>
-			<KEYWORD2>SysSetPriority</KEYWORD2>
-			<KEYWORD2>SysSleep</KEYWORD2>
-			<KEYWORD2>SysStemCopy</KEYWORD2>
-			<KEYWORD2>SysStemDelete</KEYWORD2>
-			<KEYWORD2>SysStemInsert</KEYWORD2>
-			<KEYWORD2>SysStemSort</KEYWORD2>
-			<KEYWORD2>SysSwitchSession</KEYWORD2>
-			<KEYWORD2>SysSystemDirectory</KEYWORD2>
-			<KEYWORD2>SysTempFileName</KEYWORD2>
-			<KEYWORD2>SysTextScreenRead</KEYWORD2>
-			<KEYWORD2>SysTextScreenSize</KEYWORD2>
-			<KEYWORD2>SysUtilVersion</KEYWORD2>
-			<KEYWORD2>SysVersion</KEYWORD2>
-			<KEYWORD2>SysVolumeLabel</KEYWORD2>
-			<KEYWORD2>SysWaitEventSem</KEYWORD2>
-			<KEYWORD2>SysWaitNamedPipe</KEYWORD2>
-			<KEYWORD2>SysWinDecryptFile</KEYWORD2>
-			<KEYWORD2>SysWinEncryptFile</KEYWORD2>
-			<KEYWORD2>SysWinVer</KEYWORD2>
-		</KEYWORDS>
-	</RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/occam.xml b/qpython/src/main/assets/syntax/occam.xml
deleted file mode 100644
index a7088c58..00000000
--- a/qpython/src/main/assets/syntax/occam.xml
+++ /dev/null
@@ -1,260 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!-- Occam mode by Rick Beton. -->
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="commentStart" VALUE="--" />
-		<PROPERTY NAME="commentEnd" VALUE="" />
-		<PROPERTY NAME="blockComment" VALUE="" />
-		<PROPERTY NAME="noWordSep" VALUE="." />
-	</PROPS>
-
-	<RULES IGNORE_CASE="FALSE" HIGHLIGHT_DIGITS="TRUE">
-
-		<!-- Normal comments. -->
-		<EOL_SPAN TYPE="COMMENT1">--</EOL_SPAN>
-
-		<!-- Compiler directives. -->
-		<EOL_SPAN TYPE="COMMENT2">#</EOL_SPAN>
-
-		<SPAN TYPE="LITERAL1" NO_LINE_BREAK="TRUE">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-
-		<SPAN TYPE="LITERAL1" NO_LINE_BREAK="TRUE">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-
-		<SEQ TYPE="OPERATOR">:=</SEQ>
-		<SEQ TYPE="OPERATOR">=</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;&lt;</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;&lt;</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;=</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;=</SEQ>
-		<SEQ TYPE="OPERATOR">+</SEQ>
-		<SEQ TYPE="OPERATOR">-</SEQ>
-		<SEQ TYPE="OPERATOR">/</SEQ>
-		<SEQ TYPE="OPERATOR">\</SEQ>
-		<SEQ TYPE="OPERATOR">*</SEQ>
-		<SEQ TYPE="OPERATOR">?</SEQ>
-		<SEQ TYPE="OPERATOR">!</SEQ>
-		<SEQ TYPE="OPERATOR">/\</SEQ>
-		<SEQ TYPE="OPERATOR">\/</SEQ>
-		<SEQ TYPE="OPERATOR">~</SEQ>
-
-		<KEYWORDS>
-                        <!-- Structure keywords -->
-			<KEYWORD1>ALT</KEYWORD1>
-			<KEYWORD1>ASM</KEYWORD1>
-			<KEYWORD1>CASE</KEYWORD1>
-			<KEYWORD1>FUNCTION</KEYWORD1>
-			<KEYWORD1>IF</KEYWORD1>
-			<KEYWORD1>INLINE</KEYWORD1>
-			<KEYWORD1>PAR</KEYWORD1>
-			<KEYWORD1>PLACED</KEYWORD1>
-			<KEYWORD1>PRI</KEYWORD1>
-			<KEYWORD1>PROC</KEYWORD1>
-			<KEYWORD1>RESULT</KEYWORD1>
-			<KEYWORD1>SEQ</KEYWORD1>
-			<KEYWORD1>VALOF</KEYWORD1>
-			<KEYWORD1>WHILE</KEYWORD1>
-                        
-			<!-- main keywords -->
-                        <KEYWORD2>AT</KEYWORD2>
-			<KEYWORD2>ELSE</KEYWORD2>
-			<KEYWORD2>FOR</KEYWORD2>
-			<KEYWORD2>FROM</KEYWORD2>
-			<KEYWORD2>IS</KEYWORD2>
-			<KEYWORD2>PLACE</KEYWORD2>
-			<KEYWORD2>PORT</KEYWORD2>
-			<KEYWORD2>PROTOCOL</KEYWORD2>
-			<KEYWORD2>SKIP</KEYWORD2>
-			<KEYWORD2>STOP</KEYWORD2>
-			<KEYWORD2>VAL</KEYWORD2>
-
-                        <!-- type and conversion keywords -->
-			<KEYWORD2>AFTER</KEYWORD2>
-			<KEYWORD2>AND</KEYWORD2>
-			<KEYWORD2>ANY</KEYWORD2>
-			<KEYWORD2>BITAND</KEYWORD2>
-			<KEYWORD2>BITNOT</KEYWORD2>
-			<KEYWORD2>BITOR</KEYWORD2>
-			<KEYWORD2>BOOL</KEYWORD2>
-			<KEYWORD2>BYTE</KEYWORD2>
-			<KEYWORD2>BYTESIN</KEYWORD2>
-			<KEYWORD2>CHAN</KEYWORD2>
-			<KEYWORD2>DATA</KEYWORD2>
-			<KEYWORD2>INT</KEYWORD2>
-			<KEYWORD2>INT32</KEYWORD2>
-			<KEYWORD2>INT16</KEYWORD2>
-			<KEYWORD2>INT64</KEYWORD2>
-			<KEYWORD2>MINUS</KEYWORD2>
-			<KEYWORD2>MOSTNEG</KEYWORD2>
-			<KEYWORD2>MOSTPOS</KEYWORD2>
-			<KEYWORD2>NOT</KEYWORD2>
-			<KEYWORD2>PLUS</KEYWORD2>
-			<KEYWORD2>OF</KEYWORD2>
-			<KEYWORD2>OFFSETOF</KEYWORD2>
-			<KEYWORD2>OR</KEYWORD2>
-			<KEYWORD2>PACKED</KEYWORD2>
-			<KEYWORD2>REAL32</KEYWORD2>
-			<KEYWORD2>REAL64</KEYWORD2>
-			<KEYWORD2>RECORD</KEYWORD2>
-			<KEYWORD2>REM</KEYWORD2>
-			<KEYWORD2>RESHAPES</KEYWORD2>
-			<KEYWORD2>RETYPES</KEYWORD2>
-			<KEYWORD2>ROUND</KEYWORD2>
-			<KEYWORD2>SIZE</KEYWORD2>
-			<KEYWORD2>TIMER</KEYWORD2>
-			<KEYWORD2>TIMES</KEYWORD2>
-			<KEYWORD2>TRUNC</KEYWORD2>
-			<KEYWORD2>TYPE</KEYWORD2>
-
-                        <!-- Occam3 and extensions to occam2.1 -->
-			<KEYWORD2>BUCKET</KEYWORD2>
-			<KEYWORD2>CLAIM</KEYWORD2>
-			<KEYWORD2>ENROLL</KEYWORD2>
-			<KEYWORD2>EVENT</KEYWORD2>
-			<KEYWORD2>FALL</KEYWORD2>
-			<KEYWORD2>FLUSH</KEYWORD2>
-			<KEYWORD2>GRANT</KEYWORD2>
-			<KEYWORD2>INITIAL</KEYWORD2>
-			<KEYWORD2>RESOURCE</KEYWORD2>
-			<KEYWORD2>SEMAPHORE</KEYWORD2>
-			<KEYWORD2>SHARED</KEYWORD2>
-			<KEYWORD2>SYNC</KEYWORD2>
-                        
-                        <!-- arithmetic & trigonometric functions -->
-			<KEYWORD3>LONGADD</KEYWORD3>
-			<KEYWORD3>LONGSUB</KEYWORD3>
-			<KEYWORD3>ASHIFTRIGHT</KEYWORD3>
-			<KEYWORD3>ASHIFTLEFT</KEYWORD3>
-			<KEYWORD3>ROTATERIGHT</KEYWORD3>
-			<KEYWORD3>ROTATELEFT</KEYWORD3>
-			<KEYWORD3>LONGSUM</KEYWORD3>
-			<KEYWORD3>LONGDIFF</KEYWORD3>
-			<KEYWORD3>LONGPROD</KEYWORD3>
-			<KEYWORD3>LONGDIV</KEYWORD3>
-			<KEYWORD3>SHIFTLEFT</KEYWORD3>
-			<KEYWORD3>SHIFTRIGHT</KEYWORD3>
-			<KEYWORD3>NORMALISE</KEYWORD3>
-			<KEYWORD3>ABS</KEYWORD3>
-			<KEYWORD3>DABS</KEYWORD3>
-			<KEYWORD3>SCALEB</KEYWORD3>
-			<KEYWORD3>DSCALEB</KEYWORD3>
-			<KEYWORD3>COPYSIGN</KEYWORD3>
-			<KEYWORD3>DCOPYSIGN</KEYWORD3>
-			<KEYWORD3>SQRT</KEYWORD3>
-			<KEYWORD3>DSQRT</KEYWORD3>
-			<KEYWORD3>MINUSX</KEYWORD3>
-			<KEYWORD3>DMINUSX</KEYWORD3>
-			<KEYWORD3>NEXTAFTER</KEYWORD3>
-			<KEYWORD3>DNEXTAFTER</KEYWORD3>
-			<KEYWORD3>MULBY2</KEYWORD3>
-			<KEYWORD3>DMULBY2</KEYWORD3>
-			<KEYWORD3>DIVBY2</KEYWORD3>
-			<KEYWORD3>DDIVBY2</KEYWORD3>
-			<KEYWORD3>LOGB</KEYWORD3>
-			<KEYWORD3>DLOGB</KEYWORD3>
-			<KEYWORD3>ISNAN</KEYWORD3>
-			<KEYWORD3>DISNAN</KEYWORD3>
-			<KEYWORD3>NOTFINITE</KEYWORD3>
-			<KEYWORD3>DNOTFINITE</KEYWORD3>
-			<KEYWORD3>ORDERED</KEYWORD3>
-			<KEYWORD3>DORDERED</KEYWORD3>
-			<KEYWORD3>FLOATING.UNPACK</KEYWORD3>
-			<KEYWORD3>DFLOATING.UNPACK</KEYWORD3>
-			<KEYWORD3>ARGUMENT.REDUCE</KEYWORD3>
-			<KEYWORD3>DARGUMENT.REDUCE</KEYWORD3>
-			<KEYWORD3>FPINT</KEYWORD3>
-			<KEYWORD3>DFPINT</KEYWORD3>
-			<KEYWORD3>REAL32OP</KEYWORD3>
-			<KEYWORD3>REAL64OP</KEYWORD3>
-			<KEYWORD3>IEEE32OP</KEYWORD3>
-			<KEYWORD3>IEEE64OP</KEYWORD3>
-			<KEYWORD3>REAL32REM</KEYWORD3>
-			<KEYWORD3>REAL64REM</KEYWORD3>
-			<KEYWORD3>IEEE32REM</KEYWORD3>
-			<KEYWORD3>IEEE64REM</KEYWORD3>
-			<KEYWORD3>REAL32EQ</KEYWORD3>
-			<KEYWORD3>REAL64EQ</KEYWORD3>
-			<KEYWORD3>REAL32GT</KEYWORD3>
-			<KEYWORD3>REAL64GT</KEYWORD3>
-			<KEYWORD3>IEEECOMPARE</KEYWORD3>
-			<KEYWORD3>DIEEECOMPARE</KEYWORD3>
-			<KEYWORD3>ALOG</KEYWORD3>
-			<KEYWORD3>DALOG</KEYWORD3>
-			<KEYWORD3>ALOG10</KEYWORD3>
-			<KEYWORD3>DALOG10</KEYWORD3>
-			<KEYWORD3>EXP</KEYWORD3>
-			<KEYWORD3>DEXP</KEYWORD3>
-			<KEYWORD3>TAN</KEYWORD3>
-			<KEYWORD3>DTAN</KEYWORD3>
-			<KEYWORD3>SIN</KEYWORD3>
-			<KEYWORD3>DSIN</KEYWORD3>
-			<KEYWORD3>ASIN</KEYWORD3>
-			<KEYWORD3>DASIN</KEYWORD3>
-			<KEYWORD3>COS</KEYWORD3>
-			<KEYWORD3>DCOS</KEYWORD3>
-			<KEYWORD3>SINH</KEYWORD3>
-			<KEYWORD3>DSINH</KEYWORD3>
-			<KEYWORD3>COSH</KEYWORD3>
-			<KEYWORD3>DCOSH</KEYWORD3>
-			<KEYWORD3>TANH</KEYWORD3>
-			<KEYWORD3>DTANH</KEYWORD3>
-			<KEYWORD3>ATAN</KEYWORD3>
-			<KEYWORD3>DATAN</KEYWORD3>
-			<KEYWORD3>ATAN2</KEYWORD3>
-			<KEYWORD3>DATAN2</KEYWORD3>
-			<KEYWORD3>RAN</KEYWORD3>
-			<KEYWORD3>DRAN</KEYWORD3>
-			<KEYWORD3>POWER</KEYWORD3>
-			<KEYWORD3>DPOWER</KEYWORD3>
-
-                        <!-- basic data conversion functions -->
-			<KEYWORD3>INTTOSTRING</KEYWORD3>
-			<KEYWORD3>INT16TOSTRING</KEYWORD3>
-			<KEYWORD3>INT32TOSTRING</KEYWORD3>
-			<KEYWORD3>INT64TOSTRING</KEYWORD3>
-			<KEYWORD3>STRINGTOINT</KEYWORD3>
-			<KEYWORD3>STRINGTOINT16</KEYWORD3>
-			<KEYWORD3>STRINGTOINT32</KEYWORD3>
-			<KEYWORD3>STRINGTOINT64</KEYWORD3>
-			<KEYWORD3>HEXTOSTRING</KEYWORD3>
-			<KEYWORD3>HEX16TOSTRING</KEYWORD3>
-			<KEYWORD3>HEX32TOSTRING</KEYWORD3>
-			<KEYWORD3>HEX64TOSTRING</KEYWORD3>
-			<KEYWORD3>STRINGTOHEX</KEYWORD3>
-			<KEYWORD3>STRINGTOHEX16</KEYWORD3>
-			<KEYWORD3>STRINGTOHEX32</KEYWORD3>
-			<KEYWORD3>STRINGTOHEX64</KEYWORD3>
-			<KEYWORD3>STRINGTOREAL32</KEYWORD3>
-			<KEYWORD3>STRINGTOREAL64</KEYWORD3>
-			<KEYWORD3>REAL32TOSTRING</KEYWORD3>
-			<KEYWORD3>REAL64TOSTRING</KEYWORD3>
-			<KEYWORD3>STRINGTOBOOL</KEYWORD3>
-			<KEYWORD3>BOOLTOSTRING</KEYWORD3>
-			<KEYWORD3>RESCHEDULE</KEYWORD3>
-			<KEYWORD3>ASSERT</KEYWORD3>
-
-                        <!-- preprocessor directives
-                        #INCLUDE
-                        #USE
-                        #OPTION
-                        #PRAGMA
-                        #COMMENT
-                        -->
-
-			<LITERAL2>FALSE</LITERAL2>
-			<LITERAL2>TRUE</LITERAL2>
-		</KEYWORDS>
-	</RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/omnimark.xml b/qpython/src/main/assets/syntax/omnimark.xml
deleted file mode 100644
index 9c8a529c..00000000
--- a/qpython/src/main/assets/syntax/omnimark.xml
+++ /dev/null
@@ -1,455 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-<!-- contributed by Lionel Fiol <lio-sand@ifrance.com>       -->
-<!-- 09/NOV/2001: add automatic indentation properties       -->
-<!--              correct and add some keywords              -->
-<!--              reorganize all keywords (sorted)           -->
-<!-- 20/APR/2004: all keywords are now in lower case         -->
-<!-- 06/MAY/2004: add specific patterns for invalid literals -->
-<!-- 06/JUN/2004: add '.' (dot) in the noWordSep property    -->
-<MODE>
-    <PROPS>
-        <PROPERTY NAME="indentNextLines" VALUE="\s*((PROCESS|MARKUP|EXTERNAL|DOCUMENT|DTD|ELEMENT|FIND|TRANSLATE)((-|\s).*|\s*)|(DO|ELSE|REPEAT|MATCH|CASE|USING|GROUP|DEFINE|MACRO)(\s+.*|\s*))" />
-        <PROPERTY NAME="lineComment" VALUE=";" />
-        <PROPERTY NAME="noWordSep" VALUE=".-_" />
-    </PROPS>
-    <RULES IGNORE_CASE="TRUE" HIGHLIGHT_DIGITS="TRUE">
-        <!-- Comments -->
-        <EOL_SPAN TYPE="COMMENT1">#!</EOL_SPAN>
-        <EOL_SPAN TYPE="COMMENT1">;</EOL_SPAN>
-        <!-- Literals -->
-        <SPAN_REGEXP HASH_CHAR='"' NO_LINE_BREAK="TRUE" TYPE="INVALID">
-            <BEGIN>"((?!$)[^"])*$</BEGIN>
-            <END>$</END>
-        </SPAN_REGEXP>
-        <SPAN TYPE="LITERAL1" ESCAPE="%" NO_LINE_BREAK="TRUE">
-            <BEGIN>"</BEGIN>
-            <END>"</END>
-        </SPAN>
-        <SPAN_REGEXP HASH_CHAR="'" NO_LINE_BREAK="TRUE" TYPE="INVALID">
-            <BEGIN>'((?!$)[^'])*$</BEGIN>
-            <END>$</END>
-        </SPAN_REGEXP>
-        <SPAN TYPE="LITERAL1" NO_LINE_BREAK="TRUE">
-            <BEGIN>'</BEGIN>
-            <END>'</END>
-        </SPAN>
-        <!-- Operators -->
-        <SEQ TYPE="OPERATOR">&amp;</SEQ>
-        <SEQ TYPE="OPERATOR">|</SEQ>
-        <!-- two next lines were removed as they conflict with the noWordSep property -->
-        <!-- <SEQ TYPE="OPERATOR">-</SEQ> -->
-        <!-- <SEQ TYPE="OPERATOR">_</SEQ> -->
-        <SEQ TYPE="OPERATOR">+</SEQ>
-        <SEQ TYPE="OPERATOR">=</SEQ>
-        <SEQ TYPE="OPERATOR">/</SEQ>
-        <SEQ TYPE="OPERATOR">&lt;</SEQ>
-        <SEQ TYPE="OPERATOR">&gt;</SEQ>
-        <SEQ TYPE="OPERATOR">~</SEQ>
-        <SEQ TYPE="OPERATOR">@</SEQ>
-        <SEQ TYPE="OPERATOR">$</SEQ>
-        <SEQ TYPE="OPERATOR">%</SEQ>
-        <SEQ TYPE="OPERATOR">^</SEQ>
-        <SEQ TYPE="OPERATOR">*</SEQ>
-        <SEQ TYPE="OPERATOR">?</SEQ>
-        <SEQ TYPE="OPERATOR">!</SEQ>
-        <!-- Keywords -->
-        <KEYWORDS>
-            <KEYWORD2>#additional-info</KEYWORD2>
-            <KEYWORD2>#appinfo</KEYWORD2>
-            <KEYWORD2>#args</KEYWORD2>
-            <KEYWORD2>#capacity</KEYWORD2>
-            <KEYWORD2>#charset</KEYWORD2>
-            <KEYWORD2>#class</KEYWORD2>
-            <KEYWORD2>#command-line-names</KEYWORD2>
-            <KEYWORD2>#console</KEYWORD2>
-            <KEYWORD2>#current-input</KEYWORD2>
-            <KEYWORD2>#current-output</KEYWORD2>
-            <KEYWORD2>#data</KEYWORD2>
-            <KEYWORD2>#doctype</KEYWORD2>
-            <KEYWORD2>#document</KEYWORD2>
-            <KEYWORD2>#dtd</KEYWORD2>
-            <KEYWORD2>#empty</KEYWORD2>
-            <KEYWORD2>#error</KEYWORD2>
-            <KEYWORD2>#error-code</KEYWORD2>
-            <KEYWORD2>#external-exception</KEYWORD2>
-            <KEYWORD2>#file-name</KEYWORD2>
-            <KEYWORD2>#first</KEYWORD2>
-            <KEYWORD2>#group</KEYWORD2>
-            <KEYWORD2>#implied</KEYWORD2>
-            <KEYWORD2>#item</KEYWORD2>
-            <KEYWORD2>#language-version</KEYWORD2>
-            <KEYWORD2>#last</KEYWORD2>
-            <KEYWORD2>#libpath</KEYWORD2>
-            <KEYWORD2>#library</KEYWORD2>
-            <KEYWORD2>#libvalue</KEYWORD2>
-            <KEYWORD2>#line-number</KEYWORD2>
-            <KEYWORD2>#main-input</KEYWORD2>
-            <KEYWORD2>#main-output</KEYWORD2>
-            <KEYWORD2>#markup-error-count</KEYWORD2>
-            <KEYWORD2>#markup-error-total</KEYWORD2>
-            <KEYWORD2>#markup-parser</KEYWORD2>
-            <KEYWORD2>#markup-warning-count</KEYWORD2>
-            <KEYWORD2>#markup-warning-total</KEYWORD2>
-            <KEYWORD2>#message</KEYWORD2>
-            <KEYWORD2>#none</KEYWORD2>
-            <KEYWORD2>#output</KEYWORD2>
-            <KEYWORD2>#platform-info</KEYWORD2>
-            <KEYWORD2>#process-input</KEYWORD2>
-            <KEYWORD2>#process-output</KEYWORD2>
-            <KEYWORD2>#program-error</KEYWORD2>
-            <KEYWORD2>#recovery-info</KEYWORD2>
-            <KEYWORD2>#sgml</KEYWORD2>
-            <KEYWORD2>#sgml-error-count</KEYWORD2>
-            <KEYWORD2>#sgml-error-total</KEYWORD2>
-            <KEYWORD2>#sgml-warning-count</KEYWORD2>
-            <KEYWORD2>#sgml-warning-total</KEYWORD2>
-            <KEYWORD2>#suppress</KEYWORD2>
-            <KEYWORD2>#syntax</KEYWORD2>
-            <KEYWORD2>#!</KEYWORD2>
-            <OPERATOR>abs</OPERATOR>
-            <KEYWORD1>activate</KEYWORD1>
-            <OPERATOR>active</OPERATOR>
-            <KEYWORD2>after</KEYWORD2>
-            <KEYWORD1>again</KEYWORD1>
-            <KEYWORD2>ancestor</KEYWORD2>
-            <KEYWORD2>and</KEYWORD2>
-            <KEYWORD2>another</KEYWORD2>
-            <KEYWORD1>always</KEYWORD1>
-            <OPERATOR>and</OPERATOR>
-            <KEYWORD3>any</KEYWORD3>
-            <KEYWORD3>any-text</KEYWORD3>
-            <KEYWORD2>arg</KEYWORD2>
-            <OPERATOR>as</OPERATOR>
-            <KEYWORD1>assert</KEYWORD1>
-            <KEYWORD2>attached</KEYWORD2>
-            <KEYWORD2>attribute</KEYWORD2>
-            <KEYWORD2>attributes</KEYWORD2>
-            <OPERATOR>base</OPERATOR>
-            <KEYWORD2>bcd</KEYWORD2>
-            <KEYWORD2>before</KEYWORD2>
-            <OPERATOR>binary</OPERATOR>
-            <KEYWORD2>binary-input</KEYWORD2>
-            <KEYWORD2>binary-mode</KEYWORD2>
-            <KEYWORD2>binary-output</KEYWORD2>
-            <KEYWORD3>blank</KEYWORD3>
-            <KEYWORD2>break-width</KEYWORD2>
-            <KEYWORD2>buffer</KEYWORD2>
-            <KEYWORD2>buffered</KEYWORD2>
-            <KEYWORD2>by</KEYWORD2>
-            <KEYWORD1>case</KEYWORD1>
-            <KEYWORD1>catch</KEYWORD1>
-            <KEYWORD2>catchable</KEYWORD2>
-            <KEYWORD3>cdata</KEYWORD3>
-            <KEYWORD2>cdata-entity</KEYWORD2>
-            <OPERATOR>ceiling</OPERATOR>
-            <KEYWORD2>children</KEYWORD2>
-            <KEYWORD1>clear</KEYWORD1>
-            <KEYWORD1>close</KEYWORD1>
-            <KEYWORD2>closed</KEYWORD2>
-            <OPERATOR>compiled-date</OPERATOR>
-            <OPERATOR>complement</OPERATOR>
-            <KEYWORD2>conref</KEYWORD2>
-            <KEYWORD2>content</KEYWORD2>
-            <KEYWORD3>content-end</KEYWORD3>
-            <KEYWORD3>content-start</KEYWORD3>
-            <KEYWORD2>context-translate</KEYWORD2>
-            <KEYWORD1>copy</KEYWORD1>
-            <KEYWORD1>copy-clear</KEYWORD1>
-            <KEYWORD2>counter</KEYWORD2>
-            <KEYWORD2>created</KEYWORD2>
-            <OPERATOR>creating</OPERATOR>
-            <OPERATOR>creator</OPERATOR>
-            <KEYWORD2>cross-translate</KEYWORD2>
-            <KEYWORD2>current</KEYWORD2>
-            <KEYWORD2>data-attribute</KEYWORD2>
-            <KEYWORD2>data-attributes</KEYWORD2>
-            <KEYWORD2>data-content</KEYWORD2>
-            <KEYWORD2>data-letters</KEYWORD2>
-            <OPERATOR>date</OPERATOR>
-            <KEYWORD1>deactivate</KEYWORD1>
-            <KEYWORD2>declare</KEYWORD2>
-            <KEYWORD2>declared-conref</KEYWORD2>
-            <KEYWORD2>declared-current</KEYWORD2>
-            <KEYWORD2>declared-defaulted</KEYWORD2>
-            <KEYWORD2>declared-fixed</KEYWORD2>
-            <KEYWORD2>declared-implied</KEYWORD2>
-            <KEYWORD2>declared-required</KEYWORD2>
-            <KEYWORD1>decrement</KEYWORD1>
-            <KEYWORD2>default-entity</KEYWORD2>
-            <KEYWORD2>defaulted</KEYWORD2>
-            <KEYWORD2>defaulting</KEYWORD2>
-            <KEYWORD2>define</KEYWORD2>
-            <KEYWORD2>delimiter</KEYWORD2>
-            <OPERATOR>difference</OPERATOR>
-            <KEYWORD3>digit</KEYWORD3>
-            <KEYWORD2>directory</KEYWORD2>
-            <KEYWORD1>discard</KEYWORD1>
-            <OPERATOR>divide</OPERATOR>
-            <KEYWORD1>do</KEYWORD1>
-            <KEYWORD2>doctype</KEYWORD2>
-            <KEYWORD2>document</KEYWORD2>
-            <KEYWORD2>document-element</KEYWORD2>
-            <KEYWORD2>document-end</KEYWORD2>
-            <KEYWORD2>document-start</KEYWORD2>
-            <KEYWORD2>domain-free</KEYWORD2>
-            <KEYWORD1>done</KEYWORD1>
-            <KEYWORD2>down-translate</KEYWORD2>
-            <OPERATOR>drop</OPERATOR>
-            <KEYWORD2>dtd</KEYWORD2>
-            <KEYWORD2>dtd-end</KEYWORD2>
-            <KEYWORD2>dtd-start</KEYWORD2>
-            <KEYWORD2>dtds</KEYWORD2>
-            <KEYWORD2>element</KEYWORD2>
-            <KEYWORD2>elements</KEYWORD2>
-            <KEYWORD1>else</KEYWORD1>
-            <KEYWORD2>elsewhere</KEYWORD2>
-            <KEYWORD2>empty</KEYWORD2>
-            <KEYWORD2>entities</KEYWORD2>
-            <KEYWORD2>entity</KEYWORD2>
-            <KEYWORD2>epilog-start</KEYWORD2>
-            <OPERATOR>equal</OPERATOR>
-            <OPERATOR>equals</OPERATOR>
-            <KEYWORD2>escape</KEYWORD2>
-            <KEYWORD1>except</KEYWORD1>
-            <OPERATOR>exists</OPERATOR>
-            <KEYWORD1>exit</KEYWORD1>
-            <KEYWORD2>external</KEYWORD2>
-            <KEYWORD2>external-data-entity</KEYWORD2>
-            <KEYWORD2>external-entity</KEYWORD2>
-            <KEYWORD2>external-function</KEYWORD2>
-            <KEYWORD2>external-output-function</KEYWORD2>
-            <KEYWORD2>external-text-entity</KEYWORD2>
-            <KEYWORD2>false</KEYWORD2>
-            <OPERATOR>file</OPERATOR>
-            <KEYWORD2>find</KEYWORD2>
-            <KEYWORD2>find-end</KEYWORD2>
-            <KEYWORD2>find-start</KEYWORD2>
-            <OPERATOR>floor</OPERATOR>
-            <KEYWORD1>flush</KEYWORD1>
-            <KEYWORD1>for</KEYWORD1>
-            <KEYWORD1>format</KEYWORD1>
-            <KEYWORD2>function</KEYWORD2>
-            <KEYWORD2>function-library</KEYWORD2>
-            <KEYWORD2>general</KEYWORD2>
-            <KEYWORD2>global</KEYWORD2>
-            <OPERATOR>greater-equal</OPERATOR>
-            <OPERATOR>greater-than</OPERATOR>
-            <KEYWORD2>group</KEYWORD2>
-            <KEYWORD2>groups</KEYWORD2>
-            <KEYWORD1>halt</KEYWORD1>
-            <KEYWORD1>halt-everything</KEYWORD1>
-            <OPERATOR>has</OPERATOR>
-            <OPERATOR>hasnt</OPERATOR>
-            <KEYWORD2>heralded-names</KEYWORD2>
-            <KEYWORD2>id</KEYWORD2>
-            <KEYWORD2>id-checking</KEYWORD2>
-            <KEYWORD2>idref</KEYWORD2>
-            <KEYWORD2>idrefs</KEYWORD2>
-            <KEYWORD2>ignore</KEYWORD2>
-            <KEYWORD2>implied</KEYWORD2>
-            <KEYWORD2>in</KEYWORD2>
-            <KEYWORD2>in-library</KEYWORD2>
-            <KEYWORD2>include</KEYWORD2>
-            <KEYWORD2>include-end</KEYWORD2>
-            <KEYWORD2>include-guard</KEYWORD2>
-            <KEYWORD2>include-start</KEYWORD2>
-            <KEYWORD2>inclusion</KEYWORD2>
-            <KEYWORD1>increment</KEYWORD1>
-            <KEYWORD2>initial</KEYWORD2>
-            <KEYWORD2>initial-size</KEYWORD2>
-            <KEYWORD1>input</KEYWORD1>
-            <KEYWORD2>insertion-break</KEYWORD2>
-            <KEYWORD2>instance</KEYWORD2>
-            <KEYWORD2>integer</KEYWORD2>
-            <KEYWORD2>internal</KEYWORD2>
-            <KEYWORD2>invalid-data</KEYWORD2>
-            <OPERATOR>is</OPERATOR>
-            <OPERATOR>isnt</OPERATOR>
-            <OPERATOR>item</OPERATOR>
-            <KEYWORD1>join</KEYWORD1>
-            <OPERATOR>key</OPERATOR>
-            <KEYWORD2>keyed</KEYWORD2>
-            <OPERATOR>last</OPERATOR>
-            <OPERATOR>lastmost</OPERATOR>
-            <KEYWORD3>lc</KEYWORD3>
-            <OPERATOR>length</OPERATOR>
-            <OPERATOR>less-equal</OPERATOR>
-            <OPERATOR>less-than</OPERATOR>
-            <KEYWORD3>letter</KEYWORD3>
-            <KEYWORD2>letters</KEYWORD2>
-            <KEYWORD2>library</KEYWORD2>
-            <KEYWORD3>line-end</KEYWORD3>
-            <KEYWORD3>line-start</KEYWORD3>
-            <OPERATOR>literal</OPERATOR>
-            <KEYWORD2>local</KEYWORD2>
-            <OPERATOR>ln</OPERATOR>
-            <KEYWORD1>log</KEYWORD1>
-            <OPERATOR>log10</OPERATOR>
-            <OPERATOR>lookahead</OPERATOR>
-            <KEYWORD2>macro</KEYWORD2>
-            <KEYWORD2>macro-end</KEYWORD2>
-            <KEYWORD2>marked-section</KEYWORD2>
-            <KEYWORD2>markup-comment</KEYWORD2>
-            <KEYWORD2>markup-error</KEYWORD2>
-            <KEYWORD2>markup-parser</KEYWORD2>
-            <KEYWORD2>markup-wrapper</KEYWORD2>
-            <OPERATOR>mask</OPERATOR>
-            <KEYWORD1>match</KEYWORD1>
-            <OPERATOR>matches</OPERATOR>
-            <OPERATOR>minus</OPERATOR>
-            <KEYWORD2>mixed</KEYWORD2>
-            <KEYWORD2>modifiable</KEYWORD2>
-            <OPERATOR>modulo</OPERATOR>
-            <OPERATOR>name</OPERATOR>
-            <KEYWORD2>name-letters</KEYWORD2>
-            <KEYWORD2>namecase</KEYWORD2>
-            <KEYWORD2>named</KEYWORD2>
-            <KEYWORD2>names</KEYWORD2>
-            <KEYWORD2>ndata-entity</KEYWORD2>
-            <OPERATOR>negate</OPERATOR>
-            <KEYWORD2>nested-referents</KEYWORD2>
-            <KEYWORD1>new</KEYWORD1>
-            <KEYWORD2>newline</KEYWORD2>
-            <KEYWORD1>next</KEYWORD1>
-            <KEYWORD2>nmtoken</KEYWORD2>
-            <KEYWORD2>nmtokens</KEYWORD2>
-            <KEYWORD2>no</KEYWORD2>
-            <KEYWORD2>no-default-io</KEYWORD2>
-            <KEYWORD3>non-cdata</KEYWORD3>
-            <KEYWORD2>non-implied</KEYWORD2>
-            <KEYWORD3>non-sdata</KEYWORD3>
-            <OPERATOR>not</OPERATOR>
-            <KEYWORD1>not-reached</KEYWORD1>
-            <KEYWORD2>notation</KEYWORD2>
-            <KEYWORD2>number</KEYWORD2>
-            <OPERATOR>number-of</OPERATOR>
-            <KEYWORD2>numbers</KEYWORD2>
-            <KEYWORD3>null</KEYWORD3>
-            <KEYWORD2>nutoken</KEYWORD2>
-            <KEYWORD2>nutokens</KEYWORD2>
-            <OPERATOR>occurrence</OPERATOR>
-            <OPERATOR>of</OPERATOR>
-            <KEYWORD2>opaque</KEYWORD2>
-            <KEYWORD1>open</KEYWORD1>
-            <KEYWORD2>optional</KEYWORD2>
-            <OPERATOR>or</OPERATOR>
-            <KEYWORD1>output</KEYWORD1>
-            <KEYWORD1>output-to</KEYWORD1>
-            <KEYWORD1>over</KEYWORD1>
-            <KEYWORD2>parameter</KEYWORD2>
-            <KEYWORD2>parent</KEYWORD2>
-            <KEYWORD2>past</KEYWORD2>
-            <KEYWORD2>pattern</KEYWORD2>
-            <KEYWORD3>pcdata</KEYWORD3>
-            <KEYWORD2>plus</KEYWORD2>
-            <KEYWORD2>preparent</KEYWORD2>
-            <KEYWORD2>previous</KEYWORD2>
-            <KEYWORD2>process</KEYWORD2>
-            <KEYWORD2>process-end</KEYWORD2>
-            <KEYWORD2>process-start</KEYWORD2>
-            <KEYWORD2>processing-instruction</KEYWORD2>
-            <KEYWORD2>prolog-end</KEYWORD2>
-            <KEYWORD2>prolog-in-error</KEYWORD2>
-            <KEYWORD2>proper</KEYWORD2>
-            <KEYWORD2>public</KEYWORD2>
-            <KEYWORD1>put</KEYWORD1>
-            <KEYWORD3>rcdata</KEYWORD3>
-            <KEYWORD1>remove</KEYWORD1>
-            <KEYWORD2>read-only</KEYWORD2>
-            <KEYWORD2>readable</KEYWORD2>
-            <KEYWORD2>referent</KEYWORD2>
-            <KEYWORD2>referents</KEYWORD2>
-            <KEYWORD2>referents-allowed</KEYWORD2>
-            <KEYWORD2>referents-displayed</KEYWORD2>
-            <KEYWORD2>referents-not-allowed</KEYWORD2>
-            <KEYWORD2>remainder</KEYWORD2>
-            <KEYWORD1>reopen</KEYWORD1>
-            <KEYWORD1>repeat</KEYWORD1>
-            <KEYWORD2>repeated</KEYWORD2>
-            <KEYWORD2>replacement-break</KEYWORD2>
-            <KEYWORD1>reset</KEYWORD1>
-            <KEYWORD1>rethrow</KEYWORD1>
-            <KEYWORD1>return</KEYWORD1>
-            <KEYWORD2>reversed</KEYWORD2>
-            <OPERATOR>round</OPERATOR>
-            <KEYWORD1>save</KEYWORD1>
-            <KEYWORD1>save-clear</KEYWORD1>
-            <KEYWORD1>scan</KEYWORD1>
-            <KEYWORD3>sdata</KEYWORD3>
-            <KEYWORD2>sdata-entity</KEYWORD2>
-            <KEYWORD1>select</KEYWORD1>
-            <KEYWORD1>set</KEYWORD1>
-            <KEYWORD1>sgml</KEYWORD1>
-            <KEYWORD2>sgml-comment</KEYWORD2>
-            <KEYWORD2>sgml-declaration-end</KEYWORD2>
-            <KEYWORD2>sgml-dtd</KEYWORD2>
-            <KEYWORD2>sgml-dtds</KEYWORD2>
-            <KEYWORD2>sgml-error</KEYWORD2>
-            <KEYWORD1>sgml-in</KEYWORD1>
-            <KEYWORD1>sgml-out</KEYWORD1>
-            <KEYWORD1>sgml-parse</KEYWORD1>
-            <KEYWORD1>sgml-parser</KEYWORD1>
-            <OPERATOR>shift</OPERATOR>
-            <KEYWORD2>silent-referent</KEYWORD2>
-            <KEYWORD2>size</KEYWORD2>
-            <KEYWORD1>skip</KEYWORD1>
-            <KEYWORD2>source</KEYWORD2>
-            <KEYWORD3>space</KEYWORD3>
-            <KEYWORD2>specified</KEYWORD2>
-            <OPERATOR>sqrt</OPERATOR>
-            <OPERATOR>status</OPERATOR>
-            <KEYWORD2>stream</KEYWORD2>
-            <KEYWORD2>subdoc-entity</KEYWORD2>
-            <KEYWORD2>subdocument</KEYWORD2>
-            <KEYWORD2>subdocuments</KEYWORD2>
-            <KEYWORD2>subelement</KEYWORD2>
-            <KEYWORD1>submit</KEYWORD1>
-            <KEYWORD1>succeed</KEYWORD1>
-            <KEYWORD1>suppress</KEYWORD1>
-            <KEYWORD2>switch</KEYWORD2>
-            <KEYWORD2>symbol</KEYWORD2>
-            <KEYWORD2>system</KEYWORD2>
-            <KEYWORD1>system-call</KEYWORD1>
-            <OPERATOR>take</OPERATOR>
-            <KEYWORD1>test-system</KEYWORD1>
-            <KEYWORD3>text</KEYWORD3>
-            <KEYWORD2>text-mode</KEYWORD2>
-            <OPERATOR>this</OPERATOR>
-            <KEYWORD1>throw</KEYWORD1>
-            <KEYWORD2>thrown</KEYWORD2>
-            <KEYWORD2>times</KEYWORD2>
-            <KEYWORD1>to</KEYWORD1>
-            <KEYWORD2>token</KEYWORD2>
-            <KEYWORD2>translate</KEYWORD2>
-            <KEYWORD2>true</KEYWORD2>
-            <OPERATOR>truncate</OPERATOR>
-            <KEYWORD3>uc</KEYWORD3>
-            <OPERATOR>ul</OPERATOR>
-            <OPERATOR>unanchored</OPERATOR>
-            <KEYWORD2>unattached</KEYWORD2>
-            <KEYWORD2>unbuffered</KEYWORD2>
-            <OPERATOR>union</OPERATOR>
-            <KEYWORD1>unless</KEYWORD1>
-            <KEYWORD2>up-translate</KEYWORD2>
-            <OPERATOR>usemap</OPERATOR>
-            <KEYWORD1>using</KEYWORD1>
-            <KEYWORD2>value</KEYWORD2>
-            <KEYWORD3>value-end</KEYWORD3>
-            <KEYWORD3>value-start</KEYWORD3>
-            <KEYWORD2>valued</KEYWORD2>
-            <KEYWORD2>variable</KEYWORD2>
-            <KEYWORD1>when</KEYWORD1>
-            <KEYWORD3>white-space</KEYWORD3>
-            <OPERATOR>with</OPERATOR>
-            <KEYWORD3>word-end</KEYWORD3>
-            <KEYWORD3>word-start</KEYWORD3>
-            <KEYWORD2>writable</KEYWORD2>
-            <KEYWORD2>xml</KEYWORD2>
-            <KEYWORD2>xml-dtd</KEYWORD2>
-            <KEYWORD2>xml-dtds</KEYWORD2>
-            <KEYWORD1>xml-parse</KEYWORD1>
-            <KEYWORD2>yes</KEYWORD2>
-        </KEYWORDS>
-    </RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/osql.xml b/qpython/src/main/assets/syntax/osql.xml
deleted file mode 100644
index 2782ea67..00000000
--- a/qpython/src/main/assets/syntax/osql.xml
+++ /dev/null
@@ -1,2887 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!--
-  Oracle PL/SQL mode by Diogo Kollross <diogoko@gmail.com>
-  -->
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="commentStart" VALUE="/*" />
-		<PROPERTY NAME="commentEnd" VALUE="*/" />
-		<PROPERTY NAME="lineComment" VALUE="--" />
-	</PROPS>
-	<RULES IGNORE_CASE="TRUE" HIGHLIGHT_DIGITS="TRUE">
-		<SPAN TYPE="COMMENT1">
-			<BEGIN>/*</BEGIN>
-			<END>*/</END>
-		</SPAN>
-
-		<SPAN TYPE="LITERAL2">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-
-		<!--
-		  String Literals
-		  http://download.oracle.com/docs/cd/B28359_01/appdev.111/b28370/fundamentals.htm#i38404
-		  -->
-		<SPAN_REGEXP TYPE="LITERAL1" HASH_CHARS="nq">
-			<BEGIN>n?q'(.)</BEGIN>
-			<END>$1'</END>
-		</SPAN_REGEXP>
-		<SPAN TYPE="LITERAL1">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-
-		<SPAN TYPE="LABEL">
-			<BEGIN>&lt;&lt;</BEGIN>
-			<END>&gt;&gt;</END>
-		</SPAN>
-		
-		<MARK_PREVIOUS TYPE="FUNCTION"
-			MATCH_TYPE="OPERATOR">(</MARK_PREVIOUS>
-		<SEQ TYPE="OPERATOR">)</SEQ>
-
-		<EOL_SPAN TYPE="COMMENT1">--</EOL_SPAN>
-		
-		<!--
-		  PL/SQL Operators
-		  http://download.oracle.com/docs/cd/B28359_01/appdev.111/b28370/fundamentals.htm#CBJIIIEA
-		  -->
-		<SEQ TYPE="OPERATOR">!=</SEQ>
-		<SEQ TYPE="OPERATOR">*</SEQ>
-		<SEQ TYPE="OPERATOR">**</SEQ>
-		<SEQ TYPE="OPERATOR">+</SEQ>
-		<SEQ TYPE="OPERATOR">-</SEQ>
-		<SEQ TYPE="OPERATOR">..</SEQ>
-		<SEQ TYPE="OPERATOR">/</SEQ>
-		<SEQ TYPE="OPERATOR">:=</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;=</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">=</SEQ>
-		<SEQ TYPE="OPERATOR">=&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;=</SEQ>
-		<SEQ TYPE="OPERATOR">^=</SEQ>
-		<SEQ TYPE="OPERATOR">||</SEQ>
-		<SEQ TYPE="OPERATOR">~=</SEQ>
-		
-		<KEYWORDS>
-			<!--
-			  PL/SQL reserved words
-			  http://download.oracle.com/docs/cd/B28359_01/appdev.111/b28370/reservewords.htm#CIHDHDCH
-			  -->
-			<KEYWORD1>ALL</KEYWORD1>
-			<KEYWORD1>ALTER</KEYWORD1>
-			<KEYWORD1>AND</KEYWORD1>
-			<KEYWORD1>ANY</KEYWORD1>
-			<KEYWORD1>AS</KEYWORD1>
-			<KEYWORD1>ASC</KEYWORD1>
-			<KEYWORD1>AT</KEYWORD1>
-			<KEYWORD1>BEGIN</KEYWORD1>
-			<KEYWORD1>BETWEEN</KEYWORD1>
-			<KEYWORD1>BY</KEYWORD1>
-			<KEYWORD1>CASE</KEYWORD1>
-			<KEYWORD1>CHECK</KEYWORD1>
-			<KEYWORD1>CLUSTER</KEYWORD1>
-			<KEYWORD1>CLUSTERS</KEYWORD1>
-			<KEYWORD1>COLAUTH</KEYWORD1>
-			<KEYWORD1>COLUMNS</KEYWORD1>
-			<KEYWORD1>COMPRESS</KEYWORD1>
-			<KEYWORD1>CONNECT</KEYWORD1>
-			<KEYWORD1>CRASH</KEYWORD1>
-			<KEYWORD1>CREATE</KEYWORD1>
-			<KEYWORD1>CURRENT</KEYWORD1>
-			<KEYWORD1>DECLARE</KEYWORD1>
-			<KEYWORD1>DEFAULT</KEYWORD1>
-			<KEYWORD1>DELETE</KEYWORD1>
-			<KEYWORD1>DESC</KEYWORD1>
-			<KEYWORD1>DISTINCT</KEYWORD1>
-			<KEYWORD1>DROP</KEYWORD1>
-			<KEYWORD1>ELSE</KEYWORD1>
-			<KEYWORD1>END</KEYWORD1>
-			<KEYWORD1>EXCEPTION</KEYWORD1>
-			<KEYWORD1>EXCLUSIVE</KEYWORD1>
-			<KEYWORD1>EXISTS</KEYWORD1>
-			<KEYWORD1>FALSE</KEYWORD1>
-			<KEYWORD1>FETCH</KEYWORD1>
-			<KEYWORD1>FOR</KEYWORD1>
-			<KEYWORD1>FROM</KEYWORD1>
-			<KEYWORD1>GOTO</KEYWORD1>
-			<KEYWORD1>GRANT</KEYWORD1>
-			<KEYWORD1>GROUP</KEYWORD1>
-			<KEYWORD1>HAVING</KEYWORD1>
-			<KEYWORD1>IDENTIFIED</KEYWORD1>
-			<KEYWORD1>IF</KEYWORD1>
-			<KEYWORD1>IN</KEYWORD1>
-			<KEYWORD1>INDEX</KEYWORD1>
-			<KEYWORD1>INDEXES</KEYWORD1>
-			<KEYWORD1>INSERT</KEYWORD1>
-			<KEYWORD1>INTERSECT</KEYWORD1>
-			<KEYWORD1>INTO</KEYWORD1>
-			<KEYWORD1>IS</KEYWORD1>
-			<KEYWORD1>LIKE</KEYWORD1>
-			<KEYWORD1>LOCK</KEYWORD1>
-			<KEYWORD1>MINUS</KEYWORD1>
-			<KEYWORD1>MODE</KEYWORD1>
-			<KEYWORD1>NOCOMPRESS</KEYWORD1>
-			<KEYWORD1>NOT</KEYWORD1>
-			<KEYWORD1>NOWAIT</KEYWORD1>
-			<KEYWORD1>NULL</KEYWORD1>
-			<KEYWORD1>OF</KEYWORD1>
-			<KEYWORD1>ON</KEYWORD1>
-			<KEYWORD1>OPTION</KEYWORD1>
-			<KEYWORD1>OR</KEYWORD1>
-			<KEYWORD1>ORDER</KEYWORD1>
-			<KEYWORD1>OVERLAPS</KEYWORD1>
-			<KEYWORD1>PRIOR</KEYWORD1>
-			<KEYWORD1>PROCEDURE</KEYWORD1>
-			<KEYWORD1>PUBLIC</KEYWORD1>
-			<KEYWORD1>RESOURCE</KEYWORD1>
-			<KEYWORD1>REVOKE</KEYWORD1>
-			<KEYWORD1>SELECT</KEYWORD1>
-			<KEYWORD1>SHARE</KEYWORD1>
-			<KEYWORD1>SIZE</KEYWORD1>
-			<KEYWORD1>SQL</KEYWORD1>
-			<KEYWORD1>START</KEYWORD1>
-			<KEYWORD1>TABAUTH</KEYWORD1>
-			<KEYWORD1>TABLE</KEYWORD1>
-			<KEYWORD1>THEN</KEYWORD1>
-			<KEYWORD1>TO</KEYWORD1>
-			<KEYWORD1>TRUE</KEYWORD1>
-			<KEYWORD1>UNION</KEYWORD1>
-			<KEYWORD1>UNIQUE</KEYWORD1>
-			<KEYWORD1>UPDATE</KEYWORD1>
-			<KEYWORD1>VALUES</KEYWORD1>
-			<KEYWORD1>VIEW</KEYWORD1>
-			<KEYWORD1>VIEWS</KEYWORD1>
-			<KEYWORD1>WHEN</KEYWORD1>
-			<KEYWORD1>WHERE</KEYWORD1>
-			<KEYWORD1>WITH</KEYWORD1>
-			
-			<!--
-			  PL/SQL keywords
-			  http://download.oracle.com/docs/cd/B28359_01/appdev.111/b28370/reservewords.htm#CIHFDHGB
-			  -->
-			<KEYWORD1>A</KEYWORD1>
-			<KEYWORD1>ADD</KEYWORD1>
-			<KEYWORD1>AGENT</KEYWORD1>
-			<KEYWORD1>AGGREGATE</KEYWORD1>
-			<KEYWORD1>ARRAY</KEYWORD1>
-			<KEYWORD1>ATTRIBUTE</KEYWORD1>
-			<KEYWORD1>AUTHID</KEYWORD1>
-			<KEYWORD1>AVG</KEYWORD1>
-			<KEYWORD1>BFILE_BASE</KEYWORD1>
-			<KEYWORD1>BINARY</KEYWORD1>
-			<KEYWORD1>BLOB_BASE</KEYWORD1>
-			<KEYWORD1>BLOCK</KEYWORD1>
-			<KEYWORD1>BODY</KEYWORD1>
-			<KEYWORD1>BOTH</KEYWORD1>
-			<KEYWORD1>BOUND</KEYWORD1>
-			<KEYWORD1>BULK</KEYWORD1>
-			<KEYWORD1>BYTE</KEYWORD1>
-			<KEYWORD1>C</KEYWORD1>
-			<KEYWORD1>CALL</KEYWORD1>
-			<KEYWORD1>CALLING</KEYWORD1>
-			<KEYWORD1>CASCADE</KEYWORD1>
-			<KEYWORD1>CHAR</KEYWORD1>
-			<KEYWORD1>CHARACTER</KEYWORD1>
-			<KEYWORD1>CHARSET</KEYWORD1>
-			<KEYWORD1>CHARSETFORM</KEYWORD1>
-			<KEYWORD1>CHARSETID</KEYWORD1>
-			<KEYWORD1>CHAR_BASE</KEYWORD1>
-			<KEYWORD1>CLOB_BASE</KEYWORD1>
-			<KEYWORD1>CLOSE</KEYWORD1>
-			<KEYWORD1>COLLECT</KEYWORD1>
-			<KEYWORD1>COMMENT</KEYWORD1>
-			<KEYWORD1>COMMIT</KEYWORD1>
-			<KEYWORD1>COMMITTED</KEYWORD1>
-			<KEYWORD1>COMPILED</KEYWORD1>
-			<KEYWORD1>CONSTANT</KEYWORD1>
-			<KEYWORD1>CONSTRUCTOR</KEYWORD1>
-			<KEYWORD1>CONTEXT</KEYWORD1>
-			<KEYWORD1>CONTINUE</KEYWORD1>
-			<KEYWORD1>CONVERT</KEYWORD1>
-			<KEYWORD1>COUNT</KEYWORD1>
-			<KEYWORD1>CURSOR</KEYWORD1>
-			<KEYWORD1>CUSTOMDATUM</KEYWORD1>
-			<KEYWORD1>DANGLING</KEYWORD1>
-			<KEYWORD1>DATA</KEYWORD1>
-			<KEYWORD1>DATE</KEYWORD1>
-			<KEYWORD1>DATE_BASE</KEYWORD1>
-			<KEYWORD1>DAY</KEYWORD1>
-			<KEYWORD1>DEFINE</KEYWORD1>
-			<KEYWORD1>DETERMINISTIC</KEYWORD1>
-			<KEYWORD1>DOUBLE</KEYWORD1>
-			<KEYWORD1>DURATION</KEYWORD1>
-			<KEYWORD1>ELEMENT</KEYWORD1>
-			<KEYWORD1>ELSIF</KEYWORD1>
-			<KEYWORD1>EMPTY</KEYWORD1>
-			<KEYWORD1>ESCAPE</KEYWORD1>
-			<KEYWORD1>EXCEPT</KEYWORD1>
-			<KEYWORD1>EXCEPTIONS</KEYWORD1>
-			<KEYWORD1>EXECUTE</KEYWORD1>
-			<KEYWORD1>EXIT</KEYWORD1>
-			<KEYWORD1>EXTERNAL</KEYWORD1>
-			<KEYWORD1>FINAL</KEYWORD1>
-			<KEYWORD1>FIXED</KEYWORD1>
-			<KEYWORD1>FLOAT</KEYWORD1>
-			<KEYWORD1>FORALL</KEYWORD1>
-			<KEYWORD1>FORCE</KEYWORD1>
-			<KEYWORD1>FUNCTION</KEYWORD1>
-			<KEYWORD1>GENERAL</KEYWORD1>
-			<KEYWORD1>HASH</KEYWORD1>
-			<KEYWORD1>HEAP</KEYWORD1>
-			<KEYWORD1>HIDDEN</KEYWORD1>
-			<KEYWORD1>HOUR</KEYWORD1>
-			<KEYWORD1>IMMEDIATE</KEYWORD1>
-			<KEYWORD1>INCLUDING</KEYWORD1>
-			<KEYWORD1>INDICATOR</KEYWORD1>
-			<KEYWORD1>INDICES</KEYWORD1>
-			<KEYWORD1>INFINITE</KEYWORD1>
-			<KEYWORD1>INSTANTIABLE</KEYWORD1>
-			<KEYWORD1>INT</KEYWORD1>
-			<KEYWORD1>INTERFACE</KEYWORD1>
-			<KEYWORD1>INTERVAL</KEYWORD1>
-			<KEYWORD1>INVALIDATE</KEYWORD1>
-			<KEYWORD1>ISOLATION</KEYWORD1>
-			<KEYWORD1>JAVA</KEYWORD1>
-			<KEYWORD1>LANGUAGE</KEYWORD1>
-			<KEYWORD1>LARGE</KEYWORD1>
-			<KEYWORD1>LEADING</KEYWORD1>
-			<KEYWORD1>LENGTH</KEYWORD1>
-			<KEYWORD1>LEVEL</KEYWORD1>
-			<KEYWORD1>LIBRARY</KEYWORD1>
-			<KEYWORD1>LIKE2</KEYWORD1>
-			<KEYWORD1>LIKE4</KEYWORD1>
-			<KEYWORD1>LIKEC</KEYWORD1>
-			<KEYWORD1>LIMIT</KEYWORD1>
-			<KEYWORD1>LIMITED</KEYWORD1>
-			<KEYWORD1>LOCAL</KEYWORD1>
-			<KEYWORD1>LONG</KEYWORD1>
-			<KEYWORD1>LOOP</KEYWORD1>
-			<KEYWORD1>MAP</KEYWORD1>
-			<KEYWORD1>MAX</KEYWORD1>
-			<KEYWORD1>MAXLEN</KEYWORD1>
-			<KEYWORD1>MEMBER</KEYWORD1>
-			<KEYWORD1>MERGE</KEYWORD1>
-			<KEYWORD1>MIN</KEYWORD1>
-			<KEYWORD1>MINUTE</KEYWORD1>
-			<KEYWORD1>MOD</KEYWORD1>
-			<KEYWORD1>MODIFY</KEYWORD1>
-			<KEYWORD1>MONTH</KEYWORD1>
-			<KEYWORD1>MULTISET</KEYWORD1>
-			<KEYWORD1>NAME</KEYWORD1>
-			<KEYWORD1>NAN</KEYWORD1>
-			<KEYWORD1>NATIONAL</KEYWORD1>
-			<KEYWORD1>NATIVE</KEYWORD1>
-			<KEYWORD1>NCHAR</KEYWORD1>
-			<KEYWORD1>NEW</KEYWORD1>
-			<KEYWORD1>NOCOPY</KEYWORD1>
-			<KEYWORD1>NUMBER_BASE</KEYWORD1>
-			<KEYWORD1>OBJECT</KEYWORD1>
-			<KEYWORD1>OCICOLL</KEYWORD1>
-			<KEYWORD1>OCIDATE</KEYWORD1>
-			<KEYWORD1>OCIDATETIME</KEYWORD1>
-			<KEYWORD1>OCIDURATION</KEYWORD1>
-			<KEYWORD1>OCIINTERVAL</KEYWORD1>
-			<KEYWORD1>OCILOBLOCATOR</KEYWORD1>
-			<KEYWORD1>OCINUMBER</KEYWORD1>
-			<KEYWORD1>OCIRAW</KEYWORD1>
-			<KEYWORD1>OCIREF</KEYWORD1>
-			<KEYWORD1>OCIREFCURSOR</KEYWORD1>
-			<KEYWORD1>OCIROWID</KEYWORD1>
-			<KEYWORD1>OCISTRING</KEYWORD1>
-			<KEYWORD1>OCITYPE</KEYWORD1>
-			<KEYWORD1>ONLY</KEYWORD1>
-			<KEYWORD1>OPAQUE</KEYWORD1>
-			<KEYWORD1>OPEN</KEYWORD1>
-			<KEYWORD1>OPERATOR</KEYWORD1>
-			<KEYWORD1>ORACLE</KEYWORD1>
-			<KEYWORD1>ORADATA</KEYWORD1>
-			<KEYWORD1>ORGANIZATION</KEYWORD1>
-			<KEYWORD1>ORLANY</KEYWORD1>
-			<KEYWORD1>ORLVARY</KEYWORD1>
-			<KEYWORD1>OTHERS</KEYWORD1>
-			<KEYWORD1>OUT</KEYWORD1>
-			<KEYWORD1>OVERRIDING</KEYWORD1>
-			<KEYWORD1>PACKAGE</KEYWORD1>
-			<KEYWORD1>PARALLEL_ENABLE</KEYWORD1>
-			<KEYWORD1>PARAMETER</KEYWORD1>
-			<KEYWORD1>PARAMETERS</KEYWORD1>
-			<KEYWORD1>PARTITION</KEYWORD1>
-			<KEYWORD1>PASCAL</KEYWORD1>
-			<KEYWORD1>PIPE</KEYWORD1>
-			<KEYWORD1>PIPELINED</KEYWORD1>
-			<KEYWORD1>PRAGMA</KEYWORD1>
-			<KEYWORD1>PRECISION</KEYWORD1>
-			<KEYWORD1>PRIVATE</KEYWORD1>
-			<KEYWORD1>RAISE</KEYWORD1>
-			<KEYWORD1>RANGE</KEYWORD1>
-			<KEYWORD1>RAW</KEYWORD1>
-			<KEYWORD1>READ</KEYWORD1>
-			<KEYWORD1>RECORD</KEYWORD1>
-			<KEYWORD1>REF</KEYWORD1>
-			<KEYWORD1>REFERENCE</KEYWORD1>
-			<KEYWORD1>RELIES_ON</KEYWORD1>
-			<KEYWORD1>REM</KEYWORD1>
-			<KEYWORD1>REMAINDER</KEYWORD1>
-			<KEYWORD1>RENAME</KEYWORD1>
-			<KEYWORD1>RESULT</KEYWORD1>
-			<KEYWORD1>RESULT_CACHE</KEYWORD1>
-			<KEYWORD1>RETURN</KEYWORD1>
-			<KEYWORD1>RETURNING</KEYWORD1>
-			<KEYWORD1>REVERSE</KEYWORD1>
-			<KEYWORD1>ROLLBACK</KEYWORD1>
-			<KEYWORD1>ROW</KEYWORD1>
-			<KEYWORD1>SAMPLE</KEYWORD1>
-			<KEYWORD1>SAVE</KEYWORD1>
-			<KEYWORD1>SAVEPOINT</KEYWORD1>
-			<KEYWORD1>SB1</KEYWORD1>
-			<KEYWORD1>SB2</KEYWORD1>
-			<KEYWORD1>SB4</KEYWORD1>
-			<KEYWORD1>SECOND</KEYWORD1>
-			<KEYWORD1>SEGMENT</KEYWORD1>
-			<KEYWORD1>SELF</KEYWORD1>
-			<KEYWORD1>SEPARATE</KEYWORD1>
-			<KEYWORD1>SEQUENCE</KEYWORD1>
-			<KEYWORD1>SERIALIZABLE</KEYWORD1>
-			<KEYWORD1>SET</KEYWORD1>
-			<KEYWORD1>SHORT</KEYWORD1>
-			<KEYWORD1>SIZE_T</KEYWORD1>
-			<KEYWORD1>SOME</KEYWORD1>
-			<KEYWORD1>SPARSE</KEYWORD1>
-			<KEYWORD1>SQLCODE</KEYWORD1>
-			<KEYWORD1>SQLDATA</KEYWORD1>
-			<KEYWORD1>SQLNAME</KEYWORD1>
-			<KEYWORD1>SQLSTATE</KEYWORD1>
-			<KEYWORD1>STANDARD</KEYWORD1>
-			<KEYWORD1>STATIC</KEYWORD1>
-			<KEYWORD1>STDDEV</KEYWORD1>
-			<KEYWORD1>STORED</KEYWORD1>
-			<KEYWORD1>STRING</KEYWORD1>
-			<KEYWORD1>STRUCT</KEYWORD1>
-			<KEYWORD1>STYLE</KEYWORD1>
-			<KEYWORD1>SUBMULTISET</KEYWORD1>
-			<KEYWORD1>SUBPARTITION</KEYWORD1>
-			<KEYWORD1>SUBSTITUTABLE</KEYWORD1>
-			<KEYWORD1>SUBTYPE</KEYWORD1>
-			<KEYWORD1>SUM</KEYWORD1>
-			<KEYWORD1>SYNONYM</KEYWORD1>
-			<KEYWORD1>TDO</KEYWORD1>
-			<KEYWORD1>THE</KEYWORD1>
-			<KEYWORD1>TIME</KEYWORD1>
-			<KEYWORD1>TIMESTAMP</KEYWORD1>
-			<KEYWORD1>TIMEZONE_ABBR</KEYWORD1>
-			<KEYWORD1>TIMEZONE_HOUR</KEYWORD1>
-			<KEYWORD1>TIMEZONE_MINUTE</KEYWORD1>
-			<KEYWORD1>TIMEZONE_REGION</KEYWORD1>
-			<KEYWORD1>TRAILING</KEYWORD1>
-			<KEYWORD1>TRANSACTION</KEYWORD1>
-			<KEYWORD1>TRANSACTIONAL</KEYWORD1>
-			<KEYWORD1>TRUSTED</KEYWORD1>
-			<KEYWORD1>TYPE</KEYWORD1>
-			<KEYWORD1>UB1</KEYWORD1>
-			<KEYWORD1>UB2</KEYWORD1>
-			<KEYWORD1>UB4</KEYWORD1>
-			<KEYWORD1>UNDER</KEYWORD1>
-			<KEYWORD1>UNSIGNED</KEYWORD1>
-			<KEYWORD1>UNTRUSTED</KEYWORD1>
-			<KEYWORD1>USE</KEYWORD1>
-			<KEYWORD1>USING</KEYWORD1>
-			<KEYWORD1>VALIST</KEYWORD1>
-			<KEYWORD1>VALUE</KEYWORD1>
-			<KEYWORD1>VARIABLE</KEYWORD1>
-			<KEYWORD1>VARIANCE</KEYWORD1>
-			<KEYWORD1>VARRAY</KEYWORD1>
-			<KEYWORD1>VARYING</KEYWORD1>
-			<KEYWORD1>VOID</KEYWORD1>
-			<KEYWORD1>WHILE</KEYWORD1>
-			<KEYWORD1>WORK</KEYWORD1>
-			<KEYWORD1>WRAPPED</KEYWORD1>
-			<KEYWORD1>WRITE</KEYWORD1>
-			<KEYWORD1>YEAR</KEYWORD1>
-			<KEYWORD1>ZONE</KEYWORD1>
-
-			<!--
-			  PL/SQL data types
-			  http://download.oracle.com/docs/cd/B28359_01/appdev.111/b28370/datatypes.htm
-			  -->
-			<KEYWORD1>AL16UTF16</KEYWORD1>
-			<KEYWORD1>BFILE</KEYWORD1>
-			<KEYWORD1>BINARY_DOUBLE</KEYWORD1>
-			<KEYWORD1>BINARY_DOUBLE_INFINITY</KEYWORD1>
-			<KEYWORD1>BINARY_DOUBLE_MAX_NORMAL</KEYWORD1>
-			<KEYWORD1>BINARY_DOUBLE_MAX_SUBNORMAL</KEYWORD1>
-			<KEYWORD1>BINARY_DOUBLE_MIN_NORMAL</KEYWORD1>
-			<KEYWORD1>BINARY_DOUBLE_MIN_SUBNORMAL</KEYWORD1>
-			<KEYWORD1>BINARY_DOUBLE_NAN</KEYWORD1>
-			<KEYWORD1>BINARY_FLOAT</KEYWORD1>
-			<KEYWORD1>BINARY_FLOAT_INFINITY</KEYWORD1>
-			<KEYWORD1>BINARY_FLOAT_MAX_NORMAL</KEYWORD1>
-			<KEYWORD1>BINARY_FLOAT_MAX_SUBNORMAL</KEYWORD1>
-			<KEYWORD1>BINARY_FLOAT_MIN_NORMAL</KEYWORD1>
-			<KEYWORD1>BINARY_FLOAT_MIN_SUBNORMAL</KEYWORD1>
-			<KEYWORD1>BINARY_FLOAT_NAN</KEYWORD1>
-			<KEYWORD1>BINARY_INTEGER</KEYWORD1>
-			<KEYWORD1>BLOB</KEYWORD1>
-			<KEYWORD1>BOOLEAN</KEYWORD1>
-			<KEYWORD1>CHAR</KEYWORD1>
-			<KEYWORD1>CLOB</KEYWORD1>
-			<KEYWORD1>DAY</KEYWORD1>
-			<KEYWORD1>DEC</KEYWORD1>
-			<KEYWORD1>DECIMAL</KEYWORD1>
-			<KEYWORD1>DOUBLE</KEYWORD1>
-			<KEYWORD1>PRECISION</KEYWORD1>
-			<KEYWORD1>FLOAT</KEYWORD1>
-			<KEYWORD1>HOUR</KEYWORD1>
-			<KEYWORD1>INT</KEYWORD1>
-			<KEYWORD1>INTEGER</KEYWORD1>
-			<KEYWORD1>LONG</KEYWORD1>
-			<KEYWORD1>MINUTE</KEYWORD1>
-			<KEYWORD1>MONTH</KEYWORD1>
-			<KEYWORD1>NATURAL</KEYWORD1>
-			<KEYWORD1>NATURALN</KEYWORD1>
-			<KEYWORD1>NCHAR</KEYWORD1>
-			<KEYWORD1>NCLOB</KEYWORD1>
-			<KEYWORD1>NUMBER</KEYWORD1>
-			<KEYWORD1>NUMERIC</KEYWORD1>
-			<KEYWORD1>NVARCHAR2</KEYWORD1>
-			<KEYWORD1>PLS_INTEGER</KEYWORD1>
-			<KEYWORD1>POSITIVE</KEYWORD1>
-			<KEYWORD1>POSITIVEN</KEYWORD1>
-			<KEYWORD1>RAW</KEYWORD1>
-			<KEYWORD1>REAL</KEYWORD1>
-			<KEYWORD1>ROWID</KEYWORD1>
-			<KEYWORD1>SECOND</KEYWORD1>
-			<KEYWORD1>SIGNTYPE</KEYWORD1>
-			<KEYWORD1>SIMPLE_INTEGER</KEYWORD1>
-			<KEYWORD1>SMALLINT</KEYWORD1>
-			<KEYWORD1>TIMEZONE_ABBR</KEYWORD1>
-			<KEYWORD1>TIMEZONE_HOUR</KEYWORD1>
-			<KEYWORD1>TIMEZONE_MINUTE</KEYWORD1>
-			<KEYWORD1>TIMEZONE_REGION</KEYWORD1>
-			<KEYWORD1>UROWID</KEYWORD1>
-			<KEYWORD1>UTF8</KEYWORD1>
-			<KEYWORD1>VARCHAR2</KEYWORD1>
-			<KEYWORD1>YEAR</KEYWORD1>
-
-			<!--
-			  Oracle functions
-			  http://download.oracle.com/docs/cd/B28359_01/server.111/b28286/functions001.htm
-			  -->
-			<KEYWORD2>ABS</KEYWORD2>
-			<KEYWORD2>ACOS</KEYWORD2>
-			<KEYWORD2>ADD_MONTHS</KEYWORD2>
-			<KEYWORD2>APPENDCHILDXML</KEYWORD2>
-			<KEYWORD2>ASCII</KEYWORD2>
-			<KEYWORD2>ASCIISTR</KEYWORD2>
-			<KEYWORD2>ASIN</KEYWORD2>
-			<KEYWORD2>ATAN</KEYWORD2>
-			<KEYWORD2>ATAN2</KEYWORD2>
-			<KEYWORD2>AVG</KEYWORD2>
-			<KEYWORD2>BFILENAME</KEYWORD2>
-			<KEYWORD2>BIN_TO_NUM</KEYWORD2>
-			<KEYWORD2>BITAND</KEYWORD2>
-			<KEYWORD2>CARDINALITY</KEYWORD2>
-			<KEYWORD2>CAST</KEYWORD2>
-			<KEYWORD2>CEIL</KEYWORD2>
-			<KEYWORD2>CHARTOROWID</KEYWORD2>
-			<KEYWORD2>CHR</KEYWORD2>
-			<KEYWORD2>CLUSTER_ID</KEYWORD2>
-			<KEYWORD2>CLUSTER_PROBABILITY</KEYWORD2>
-			<KEYWORD2>CLUSTER_SET</KEYWORD2>
-			<KEYWORD2>COALESCE</KEYWORD2>
-			<KEYWORD2>COLLECT</KEYWORD2>
-			<KEYWORD2>COMPOSE</KEYWORD2>
-			<KEYWORD2>CONCAT</KEYWORD2>
-			<KEYWORD2>CONVERT</KEYWORD2>
-			<KEYWORD2>CORR</KEYWORD2>
-			<KEYWORD2>CORR_K</KEYWORD2>
-			<KEYWORD2>CORR_S</KEYWORD2>
-			<KEYWORD2>COS</KEYWORD2>
-			<KEYWORD2>COSH</KEYWORD2>
-			<KEYWORD2>COUNT</KEYWORD2>
-			<KEYWORD2>COVAR_POP</KEYWORD2>
-			<KEYWORD2>COVAR_SAMP</KEYWORD2>
-			<KEYWORD2>CUME_DIST</KEYWORD2>
-			<KEYWORD2>CURRENT_DATE</KEYWORD2>
-			<KEYWORD2>CURRENT_TIMESTAMP</KEYWORD2>
-			<KEYWORD2>CV</KEYWORD2>
-			<KEYWORD2>DBTIMEZONE</KEYWORD2>
-			<KEYWORD2>DECODE</KEYWORD2>
-			<KEYWORD2>DECOMPOSE</KEYWORD2>
-			<KEYWORD2>DELETEXML</KEYWORD2>
-			<KEYWORD2>DENSE_RANK</KEYWORD2>
-			<KEYWORD2>DEPTH</KEYWORD2>
-			<KEYWORD2>DEREF</KEYWORD2>
-			<KEYWORD2>DUMP</KEYWORD2>
-			<KEYWORD2>EMPTY_BLOB</KEYWORD2>
-			<KEYWORD2>EMPTY_CLOB</KEYWORD2>
-			<KEYWORD2>EXISTSNODE</KEYWORD2>
-			<KEYWORD2>EXP</KEYWORD2>
-			<KEYWORD2>EXTRACT</KEYWORD2>
-			<KEYWORD2>EXTRACTVALUE</KEYWORD2>
-			<KEYWORD2>FEATURE_ID</KEYWORD2>
-			<KEYWORD2>FEATURE_SET</KEYWORD2>
-			<KEYWORD2>FEATURE_VALUE</KEYWORD2>
-			<KEYWORD2>FIRST</KEYWORD2>
-			<KEYWORD2>FIRST_VALUE</KEYWORD2>
-			<KEYWORD2>FLOOR</KEYWORD2>
-			<KEYWORD2>FROM_TZ</KEYWORD2>
-			<KEYWORD2>GREATEST</KEYWORD2>
-			<KEYWORD2>GROUPING</KEYWORD2>
-			<KEYWORD2>GROUPING_ID</KEYWORD2>
-			<KEYWORD2>GROUP_ID</KEYWORD2>
-			<KEYWORD2>HEXTORAW</KEYWORD2>
-			<KEYWORD2>INITCAP</KEYWORD2>
-			<KEYWORD2>INSERTCHILDXML</KEYWORD2>
-			<KEYWORD2>INSERTXMLBEFORE</KEYWORD2>
-			<KEYWORD2>INSTR</KEYWORD2>
-			<KEYWORD2>ITERATION_NUMBER</KEYWORD2>
-			<KEYWORD2>LAG</KEYWORD2>
-			<KEYWORD2>LAST</KEYWORD2>
-			<KEYWORD2>LAST_DAY</KEYWORD2>
-			<KEYWORD2>LAST_VALUE</KEYWORD2>
-			<KEYWORD2>LEAD</KEYWORD2>
-			<KEYWORD2>LEAST</KEYWORD2>
-			<KEYWORD2>LENGTH</KEYWORD2>
-			<KEYWORD2>LN</KEYWORD2>
-			<KEYWORD2>LNNVL</KEYWORD2>
-			<KEYWORD2>LOCALTIMESTAMP</KEYWORD2>
-			<KEYWORD2>LOG</KEYWORD2>
-			<KEYWORD2>LOWER</KEYWORD2>
-			<KEYWORD2>LPAD</KEYWORD2>
-			<KEYWORD2>LTRIM</KEYWORD2>
-			<KEYWORD2>MAKE_REF</KEYWORD2>
-			<KEYWORD2>MAX</KEYWORD2>
-			<KEYWORD2>MEDIAN</KEYWORD2>
-			<KEYWORD2>MIN</KEYWORD2>
-			<KEYWORD2>MOD</KEYWORD2>
-			<KEYWORD2>MONTHS_BETWEEN</KEYWORD2>
-			<KEYWORD2>NANVL</KEYWORD2>
-			<KEYWORD2>NEW_TIME</KEYWORD2>
-			<KEYWORD2>NEXT_DAY</KEYWORD2>
-			<KEYWORD2>NLSSORT</KEYWORD2>
-			<KEYWORD2>NLS_CHARSET_DECL_LEN</KEYWORD2>
-			<KEYWORD2>NLS_CHARSET_ID</KEYWORD2>
-			<KEYWORD2>NLS_CHARSET_NAME</KEYWORD2>
-			<KEYWORD2>NLS_INITCAP</KEYWORD2>
-			<KEYWORD2>NLS_LOWER</KEYWORD2>
-			<KEYWORD2>NLS_UPPER</KEYWORD2>
-			<KEYWORD2>NTILE</KEYWORD2>
-			<KEYWORD2>NULLIF</KEYWORD2>
-			<KEYWORD2>NUMTODSINTERVAL</KEYWORD2>
-			<KEYWORD2>NUMTOYMINTERVAL</KEYWORD2>
-			<KEYWORD2>NVL</KEYWORD2>
-			<KEYWORD2>NVL2</KEYWORD2>
-			<KEYWORD2>ORA_HASH</KEYWORD2>
-			<KEYWORD2>PATH</KEYWORD2>
-			<KEYWORD2>PERCENTILE_CONT</KEYWORD2>
-			<KEYWORD2>PERCENTILE_DISC</KEYWORD2>
-			<KEYWORD2>PERCENT_RANK</KEYWORD2>
-			<KEYWORD2>POWER</KEYWORD2>
-			<KEYWORD2>POWERMULTISET</KEYWORD2>
-			<KEYWORD2>POWERMULTISET_BY_CARDINALITY</KEYWORD2>
-			<KEYWORD2>PREDICTION</KEYWORD2>
-			<KEYWORD2>PREDICTION_BOUNDS</KEYWORD2>
-			<KEYWORD2>PREDICTION_COST</KEYWORD2>
-			<KEYWORD2>PREDICTION_DETAILS</KEYWORD2>
-			<KEYWORD2>PREDICTION_PROBABILITY</KEYWORD2>
-			<KEYWORD2>PREDICTION_SET</KEYWORD2>
-			<KEYWORD2>PRESENTNNV</KEYWORD2>
-			<KEYWORD2>PRESENTV</KEYWORD2>
-			<KEYWORD2>PREVIOUS</KEYWORD2>
-			<KEYWORD2>RANK</KEYWORD2>
-			<KEYWORD2>RATIO_TO_REPORT</KEYWORD2>
-			<KEYWORD2>RAWTOHEX</KEYWORD2>
-			<KEYWORD2>RAWTONHEX</KEYWORD2>
-			<KEYWORD2>REF</KEYWORD2>
-			<KEYWORD2>REFTOHEX</KEYWORD2>
-			<KEYWORD2>REGEXP_INSTR</KEYWORD2>
-			<KEYWORD2>REGEXP_REPLACE</KEYWORD2>
-			<KEYWORD2>REGEXP_SUBSTR</KEYWORD2>
-			<KEYWORD2>REGR_AVGX</KEYWORD2>
-			<KEYWORD2>REGR_AVGY</KEYWORD2>
-			<KEYWORD2>REGR_COUNT</KEYWORD2>
-			<KEYWORD2>REGR_INTERCEPT</KEYWORD2>
-			<KEYWORD2>REGR_R2</KEYWORD2>
-			<KEYWORD2>REGR_SLOPE</KEYWORD2>
-			<KEYWORD2>REGR_SXX</KEYWORD2>
-			<KEYWORD2>REGR_SXY</KEYWORD2>
-			<KEYWORD2>REGR_SYY</KEYWORD2>
-			<KEYWORD2>REMAINDER</KEYWORD2>
-			<KEYWORD2>REPLACE</KEYWORD2>
-			<KEYWORD2>ROUND</KEYWORD2>
-			<KEYWORD2>ROWIDTOCHAR</KEYWORD2>
-			<KEYWORD2>ROWIDTONCHAR</KEYWORD2>
-			<KEYWORD2>ROW_NUMBER</KEYWORD2>
-			<KEYWORD2>RPAD</KEYWORD2>
-			<KEYWORD2>RTRIM</KEYWORD2>
-			<KEYWORD2>SCN_TO_TIMESTAMP</KEYWORD2>
-			<KEYWORD2>SESSIONTIMEZONE</KEYWORD2>
-			<KEYWORD2>SET</KEYWORD2>
-			<KEYWORD2>SIGN</KEYWORD2>
-			<KEYWORD2>SIN</KEYWORD2>
-			<KEYWORD2>SINH</KEYWORD2>
-			<KEYWORD2>SOUNDEX</KEYWORD2>
-			<KEYWORD2>SQRT</KEYWORD2>
-			<KEYWORD2>STATS_BINOMIAL_TEST</KEYWORD2>
-			<KEYWORD2>STATS_CROSSTAB</KEYWORD2>
-			<KEYWORD2>STATS_F_TEST</KEYWORD2>
-			<KEYWORD2>STATS_KS_TEST</KEYWORD2>
-			<KEYWORD2>STATS_MODE</KEYWORD2>
-			<KEYWORD2>STATS_MW_TEST</KEYWORD2>
-			<KEYWORD2>STATS_ONE_WAY_ANOVA</KEYWORD2>
-			<KEYWORD2>STATS_T_TEST_INDEP</KEYWORD2>
-			<KEYWORD2>STATS_T_TEST_INDEPU</KEYWORD2>
-			<KEYWORD2>STATS_T_TEST_ONE</KEYWORD2>
-			<KEYWORD2>STATS_T_TEST_PAIRED</KEYWORD2>
-			<KEYWORD2>STATS_WSR_TEST</KEYWORD2>
-			<KEYWORD2>STDDEV</KEYWORD2>
-			<KEYWORD2>STDDEV_POP</KEYWORD2>
-			<KEYWORD2>STDDEV_SAMP</KEYWORD2>
-			<KEYWORD2>SUBSTR</KEYWORD2>
-			<KEYWORD2>SUM</KEYWORD2>
-			<KEYWORD2>SYSDATE</KEYWORD2>
-			<KEYWORD2>SYSTIMESTAMP</KEYWORD2>
-			<KEYWORD2>SYS_CONNECT_BY_PATH</KEYWORD2>
-			<KEYWORD2>SYS_CONTEXT</KEYWORD2>
-			<KEYWORD2>SYS_DBURIGEN</KEYWORD2>
-			<KEYWORD2>SYS_EXTRACT_UTC</KEYWORD2>
-			<KEYWORD2>SYS_GUID</KEYWORD2>
-			<KEYWORD2>SYS_TYPEID</KEYWORD2>
-			<KEYWORD2>SYS_XMLAGG</KEYWORD2>
-			<KEYWORD2>SYS_XMLGEN</KEYWORD2>
-			<KEYWORD2>TAN</KEYWORD2>
-			<KEYWORD2>TANH</KEYWORD2>
-			<KEYWORD2>TIMESTAMP_TO_SCN</KEYWORD2>
-			<KEYWORD2>TO_BINARY_DOUBLE</KEYWORD2>
-			<KEYWORD2>TO_BINARY_FLOAT</KEYWORD2>
-			<KEYWORD2>TO_CHAR</KEYWORD2>
-			<KEYWORD2>TO_CLOB</KEYWORD2>
-			<KEYWORD2>TO_DATE</KEYWORD2>
-			<KEYWORD2>TO_DSINTERVAL</KEYWORD2>
-			<KEYWORD2>TO_LOB</KEYWORD2>
-			<KEYWORD2>TO_MULTI_BYTE</KEYWORD2>
-			<KEYWORD2>TO_NCHAR</KEYWORD2>
-			<KEYWORD2>TO_NCLOB</KEYWORD2>
-			<KEYWORD2>TO_NUMBER</KEYWORD2>
-			<KEYWORD2>TO_SINGLE_BYTE</KEYWORD2>
-			<KEYWORD2>TO_TIMESTAMP</KEYWORD2>
-			<KEYWORD2>TO_TIMESTAMP_TZ</KEYWORD2>
-			<KEYWORD2>TO_YMINTERVAL</KEYWORD2>
-			<KEYWORD2>TRANSLATE</KEYWORD2>
-			<KEYWORD2>TREAT</KEYWORD2>
-			<KEYWORD2>TRIM</KEYWORD2>
-			<KEYWORD2>TRUNC</KEYWORD2>
-			<KEYWORD2>TZ_OFFSET</KEYWORD2>
-			<KEYWORD2>UID</KEYWORD2>
-			<KEYWORD2>UNISTR</KEYWORD2>
-			<KEYWORD2>UPDATEXML</KEYWORD2>
-			<KEYWORD2>UPPER</KEYWORD2>
-			<KEYWORD2>USER</KEYWORD2>
-			<KEYWORD2>USERENV</KEYWORD2>
-			<KEYWORD2>USING</KEYWORD2>
-			<KEYWORD2>VALUE</KEYWORD2>
-			<KEYWORD2>VARIANCE</KEYWORD2>
-			<KEYWORD2>VAR_POP</KEYWORD2>
-			<KEYWORD2>VAR_SAMP</KEYWORD2>
-			<KEYWORD2>VSIZE</KEYWORD2>
-			<KEYWORD2>WIDTH_BUCKET</KEYWORD2>
-			<KEYWORD2>XMLAGG</KEYWORD2>
-			<KEYWORD2>XMLCAST</KEYWORD2>
-			<KEYWORD2>XMLCDATA</KEYWORD2>
-			<KEYWORD2>XMLCOLATTVAL</KEYWORD2>
-			<KEYWORD2>XMLCOMMENT</KEYWORD2>
-			<KEYWORD2>XMLCONCAT</KEYWORD2>
-			<KEYWORD2>XMLDIFF</KEYWORD2>
-			<KEYWORD2>XMLELEMENT</KEYWORD2>
-			<KEYWORD2>XMLEXISTS</KEYWORD2>
-			<KEYWORD2>XMLFOREST</KEYWORD2>
-			<KEYWORD2>XMLPARSE</KEYWORD2>
-			<KEYWORD2>XMLPATCH</KEYWORD2>
-			<KEYWORD2>XMLPI</KEYWORD2>
-			<KEYWORD2>XMLQUERY</KEYWORD2>
-			<KEYWORD2>XMLROOT</KEYWORD2>
-			<KEYWORD2>XMLSEQUENCE</KEYWORD2>
-			<KEYWORD2>XMLSERIALIZE</KEYWORD2>
-			<KEYWORD2>XMLTABLE</KEYWORD2>
-			<KEYWORD2>XMLTRANSFORM</KEYWORD2>
-
-			<!--
-			  Oracle supplied packages
-			  http://download.oracle.com/docs/cd/B28359_01/appdev.111/b28419/toc.htm
-			  -->
-			<KEYWORD3>APEX_APPLICATION</KEYWORD3>
-			<KEYWORD3>APEX_CUSTOM_AUTH</KEYWORD3>
-			<KEYWORD3>APEX_ITEM</KEYWORD3>
-			<KEYWORD3>APEX_UTIL</KEYWORD3>
-			<KEYWORD3>CTX_ADM</KEYWORD3>
-			<KEYWORD3>CTX_CLS</KEYWORD3>
-			<KEYWORD3>CTX_DDL</KEYWORD3>
-			<KEYWORD3>CTX_DOC</KEYWORD3>
-			<KEYWORD3>CTX_OUTPUT</KEYWORD3>
-			<KEYWORD3>CTX_QUERY</KEYWORD3>
-			<KEYWORD3>CTX_REPORT</KEYWORD3>
-			<KEYWORD3>CTX_THES</KEYWORD3>
-			<KEYWORD3>CTX_ULEXER</KEYWORD3>
-			<KEYWORD3>DBMS_ADDM</KEYWORD3>
-			<KEYWORD3>DBMS_ADVANCED_REWRITE</KEYWORD3>
-			<KEYWORD3>DBMS_ADVISOR</KEYWORD3>
-			<KEYWORD3>DBMS_ALERT</KEYWORD3>
-			<KEYWORD3>DBMS_APPLICATION_INFO</KEYWORD3>
-			<KEYWORD3>DBMS_APPLY_ADM</KEYWORD3>
-			<KEYWORD3>DBMS_AQ</KEYWORD3>
-			<KEYWORD3>DBMS_AQADM</KEYWORD3>
-			<KEYWORD3>DBMS_AQELM</KEYWORD3>
-			<KEYWORD3>DBMS_AQIN</KEYWORD3>
-			<KEYWORD3>DBMS_ASSERT</KEYWORD3>
-			<KEYWORD3>DBMS_AUTO_TASK_ADMIN</KEYWORD3>
-			<KEYWORD3>DBMS_AW_STATS</KEYWORD3>
-			<KEYWORD3>DBMS_CAPTURE_ADM</KEYWORD3>
-			<KEYWORD3>DBMS_CDC_PUBLISH</KEYWORD3>
-			<KEYWORD3>DBMS_CDC_SUBSCRIBE</KEYWORD3>
-			<KEYWORD3>DBMS_COMPARISON</KEYWORD3>
-			<KEYWORD3>DBMS_CONNECTION_POOL</KEYWORD3>
-			<KEYWORD3>DBMS_CQ_NOTIFICATION</KEYWORD3>
-			<KEYWORD3>DBMS_CRYPTO</KEYWORD3>
-			<KEYWORD3>DBMS_CSX_ADMIN</KEYWORD3>
-			<KEYWORD3>DBMS_CUBE</KEYWORD3>
-			<KEYWORD3>DBMS_CUBE_ADVISE</KEYWORD3>
-			<KEYWORD3>DBMS_DATA_MINING</KEYWORD3>
-			<KEYWORD3>DBMS_DATA_MINING_TRANSFORM</KEYWORD3>
-			<KEYWORD3>DBMS_DATAPUMP</KEYWORD3>
-			<KEYWORD3>DBMS_DB_VERSION</KEYWORD3>
-			<KEYWORD3>DBMS_DDL</KEYWORD3>
-			<KEYWORD3>DBMS_DEBUG</KEYWORD3>
-			<KEYWORD3>DBMS_DEFER</KEYWORD3>
-			<KEYWORD3>DBMS_DEFER_QUERY</KEYWORD3>
-			<KEYWORD3>DBMS_DEFER_SYS</KEYWORD3>
-			<KEYWORD3>DBMS_DESCRIBE</KEYWORD3>
-			<KEYWORD3>DBMS_DG</KEYWORD3>
-			<KEYWORD3>DBMS_DIMENSION</KEYWORD3>
-			<KEYWORD3>DBMS_DISTRIBUTED_TRUST_ADMIN</KEYWORD3>
-			<KEYWORD3>DBMS_EPG</KEYWORD3>
-			<KEYWORD3>DBMS_ERRLOG</KEYWORD3>
-			<KEYWORD3>DBMS_EXPFIL</KEYWORD3>
-			<KEYWORD3>DBMS_FGA</KEYWORD3>
-			<KEYWORD3>DBMS_FILE_GROUP</KEYWORD3>
-			<KEYWORD3>DBMS_FILE_TRANSFER</KEYWORD3>
-			<KEYWORD3>DBMS_FLASHBACK</KEYWORD3>
-			<KEYWORD3>DBMS_FREQUENT_ITEMSET</KEYWORD3>
-			<KEYWORD3>DBMS_HM</KEYWORD3>
-			<KEYWORD3>DBMS_HPROF</KEYWORD3>
-			<KEYWORD3>DBMS_HS_PARALLEL</KEYWORD3>
-			<KEYWORD3>DBMS_HS_PASSTHROUGH</KEYWORD3>
-			<KEYWORD3>DBMS_IOT</KEYWORD3>
-			<KEYWORD3>DBMS_JAVA</KEYWORD3>
-			<KEYWORD3>DBMS_JOB</KEYWORD3>
-			<KEYWORD3>DBMS_LDAP</KEYWORD3>
-			<KEYWORD3>DBMS_LDAP_UTL</KEYWORD3>
-			<KEYWORD3>DBMS_LIBCACHE</KEYWORD3>
-			<KEYWORD3>DBMS_LOB</KEYWORD3>
-			<KEYWORD3>DBMS_LOCK</KEYWORD3>
-			<KEYWORD3>DBMS_LOGMNR</KEYWORD3>
-			<KEYWORD3>DBMS_LOGMNR_D</KEYWORD3>
-			<KEYWORD3>DBMS_LOGSTDBY</KEYWORD3>
-			<KEYWORD3>DBMS_METADATA</KEYWORD3>
-			<KEYWORD3>DBMS_MGD_ID_UTL</KEYWORD3>
-			<KEYWORD3>DBMS_MGWADM</KEYWORD3>
-			<KEYWORD3>DBMS_MGWMSG</KEYWORD3>
-			<KEYWORD3>DBMS_MONITOR</KEYWORD3>
-			<KEYWORD3>DBMS_MVIEW</KEYWORD3>
-			<KEYWORD3>DBMS_NETWORK_ACL_ADMIN</KEYWORD3>
-			<KEYWORD3>DBMS_NETWORK_ACL_UTILITY</KEYWORD3>
-			<KEYWORD3>DBMS_OBFUSCATION_TOOLKIT</KEYWORD3>
-			<KEYWORD3>DBMS_ODCI</KEYWORD3>
-			<KEYWORD3>DBMS_OFFLINE_OG</KEYWORD3>
-			<KEYWORD3>DBMS_OUTLN</KEYWORD3>
-			<KEYWORD3>DBMS_OUTPUT</KEYWORD3>
-			<KEYWORD3>DBMS_PCLXUTIL</KEYWORD3>
-			<KEYWORD3>DBMS_PIPE</KEYWORD3>
-			<KEYWORD3>DBMS_PREDICTIVE_ANALYTICS</KEYWORD3>
-			<KEYWORD3>DBMS_PREPROCESSOR</KEYWORD3>
-			<KEYWORD3>DBMS_PROFILER</KEYWORD3>
-			<KEYWORD3>DBMS_PROPAGATION_ADM</KEYWORD3>
-			<KEYWORD3>DBMS_RANDOM</KEYWORD3>
-			<KEYWORD3>DBMS_RECTIFIER_DIFF</KEYWORD3>
-			<KEYWORD3>DBMS_REDEFINITION</KEYWORD3>
-			<KEYWORD3>DBMS_REFRESH</KEYWORD3>
-			<KEYWORD3>DBMS_REPAIR</KEYWORD3>
-			<KEYWORD3>DBMS_REPCAT</KEYWORD3>
-			<KEYWORD3>DBMS_REPCAT_ADMIN</KEYWORD3>
-			<KEYWORD3>DBMS_REPCAT_INSTANTIATE</KEYWORD3>
-			<KEYWORD3>DBMS_REPCAT_RGT</KEYWORD3>
-			<KEYWORD3>DBMS_REPORT</KEYWORD3>
-			<KEYWORD3>DBMS_REPUTIL</KEYWORD3>
-			<KEYWORD3>DBMS_RESCONFIG</KEYWORD3>
-			<KEYWORD3>DBMS_RESOURCE_MANAGER</KEYWORD3>
-			<KEYWORD3>DBMS_RESOURCE_MANAGER_PRIVS</KEYWORD3>
-			<KEYWORD3>DBMS_RESULT_CACHE</KEYWORD3>
-			<KEYWORD3>DBMS_RESUMABLE</KEYWORD3>
-			<KEYWORD3>DBMS_RLMGR</KEYWORD3>
-			<KEYWORD3>DBMS_RLS</KEYWORD3>
-			<KEYWORD3>DBMS_ROWID</KEYWORD3>
-			<KEYWORD3>DBMS_RULE</KEYWORD3>
-			<KEYWORD3>DBMS_RULE_ADM</KEYWORD3>
-			<KEYWORD3>DBMS_SCHEDULER</KEYWORD3>
-			<KEYWORD3>DBMS_SERVER_ALERT</KEYWORD3>
-			<KEYWORD3>DBMS_SERVICE</KEYWORD3>
-			<KEYWORD3>DBMS_SESSION</KEYWORD3>
-			<KEYWORD3>DBMS_SHARED_POOL</KEYWORD3>
-			<KEYWORD3>DBMS_SPACE</KEYWORD3>
-			<KEYWORD3>DBMS_SPACE_ADMIN</KEYWORD3>
-			<KEYWORD3>DBMS_SPM</KEYWORD3>
-			<KEYWORD3>DBMS_SQL</KEYWORD3>
-			<KEYWORD3>DBMS_SQLDIAG</KEYWORD3>
-			<KEYWORD3>DBMS_SQLPA</KEYWORD3>
-			<KEYWORD3>DBMS_SQLTUNE</KEYWORD3>
-			<KEYWORD3>DBMS_STAT_FUNCS</KEYWORD3>
-			<KEYWORD3>DBMS_STATS</KEYWORD3>
-			<KEYWORD3>DBMS_STORAGE_MAP</KEYWORD3>
-			<KEYWORD3>DBMS_STREAMS</KEYWORD3>
-			<KEYWORD3>DBMS_STREAMS_ADM</KEYWORD3>
-			<KEYWORD3>DBMS_STREAMS_ADVISOR_ADM</KEYWORD3>
-			<KEYWORD3>DBMS_STREAMS_AUTH</KEYWORD3>
-			<KEYWORD3>DBMS_STREAMS_MESSAGING</KEYWORD3>
-			<KEYWORD3>DBMS_STREAMS_TABLESPACE_ADM</KEYWORD3>
-			<KEYWORD3>DBMS_TDB</KEYWORD3>
-			<KEYWORD3>DBMS_TRACE</KEYWORD3>
-			<KEYWORD3>DBMS_TRANSACTION</KEYWORD3>
-			<KEYWORD3>DBMS_TRANSFORM</KEYWORD3>
-			<KEYWORD3>DBMS_TTS</KEYWORD3>
-			<KEYWORD3>DBMS_TYPES</KEYWORD3>
-			<KEYWORD3>DBMS_UTILITY</KEYWORD3>
-			<KEYWORD3>DBMS_WARNING</KEYWORD3>
-			<KEYWORD3>DBMS_WM</KEYWORD3>
-			<KEYWORD3>DBMS_WORKLOAD_CAPTURE</KEYWORD3>
-			<KEYWORD3>DBMS_WORKLOAD_REPLAY</KEYWORD3>
-			<KEYWORD3>DBMS_WORKLOAD_REPOSITORY</KEYWORD3>
-			<KEYWORD3>DBMS_XA</KEYWORD3>
-			<KEYWORD3>DBMS_XDB</KEYWORD3>
-			<KEYWORD3>DBMS_XDB_ADMIN</KEYWORD3>
-			<KEYWORD3>DBMS_XDB_VERSION</KEYWORD3>
-			<KEYWORD3>DBMS_XDBRESOURCE</KEYWORD3>
-			<KEYWORD3>DBMS_XDBT</KEYWORD3>
-			<KEYWORD3>DBMS_XDBZ</KEYWORD3>
-			<KEYWORD3>DBMS_XEVENT</KEYWORD3>
-			<KEYWORD3>DBMS_XMLDOM</KEYWORD3>
-			<KEYWORD3>DBMS_XMLGEN</KEYWORD3>
-			<KEYWORD3>DBMS_XMLINDEX</KEYWORD3>
-			<KEYWORD3>DBMS_XMLPARSER</KEYWORD3>
-			<KEYWORD3>DBMS_XMLQUERY</KEYWORD3>
-			<KEYWORD3>DBMS_XMLSAVE</KEYWORD3>
-			<KEYWORD3>DBMS_XMLSCHEMA</KEYWORD3>
-			<KEYWORD3>DBMS_XMLSTORE</KEYWORD3>
-			<KEYWORD3>DBMS_XMLTRANSLATIONS</KEYWORD3>
-			<KEYWORD3>DBMS_XPLAN</KEYWORD3>
-			<KEYWORD3>DBMS_XSLPROCESSOR</KEYWORD3>
-			<KEYWORD3>DEBUG_EXTPROC</KEYWORD3>
-			<KEYWORD3>HTF</KEYWORD3>
-			<KEYWORD3>HTP</KEYWORD3>
-			<KEYWORD3>ORD_DICOM</KEYWORD3>
-			<KEYWORD3>ORD_DICOM_ADMIN</KEYWORD3>
-			<KEYWORD3>OWA_CACHE</KEYWORD3>
-			<KEYWORD3>OWA_COOKIE</KEYWORD3>
-			<KEYWORD3>OWA_CUSTOM</KEYWORD3>
-			<KEYWORD3>OWA_IMAGE</KEYWORD3>
-			<KEYWORD3>OWA_OPT_LOCK</KEYWORD3>
-			<KEYWORD3>OWA_PATTERN</KEYWORD3>
-			<KEYWORD3>OWA_SEC</KEYWORD3>
-			<KEYWORD3>OWA_TEXT</KEYWORD3>
-			<KEYWORD3>OWA_UTIL</KEYWORD3>
-			<KEYWORD3>SDO_CS</KEYWORD3>
-			<KEYWORD3>SDO_CSW_PROCESS</KEYWORD3>
-			<KEYWORD3>SDO_GCDR</KEYWORD3>
-			<KEYWORD3>SDO_GEOM</KEYWORD3>
-			<KEYWORD3>SDO_GEOR</KEYWORD3>
-			<KEYWORD3>SDO_GEOR_ADMIN</KEYWORD3>
-			<KEYWORD3>SDO_GEOR_UTL</KEYWORD3>
-			<KEYWORD3>SDO_LRS</KEYWORD3>
-			<KEYWORD3>SDO_MIGRATE</KEYWORD3>
-			<KEYWORD3>SDO_NET</KEYWORD3>
-			<KEYWORD3>SDO_NET_MEM</KEYWORD3>
-			<KEYWORD3>SDO_OLS</KEYWORD3>
-			<KEYWORD3>SDO_PC_PKG</KEYWORD3>
-			<KEYWORD3>SDO_SAM</KEYWORD3>
-			<KEYWORD3>SDO_TIN_PKG</KEYWORD3>
-			<KEYWORD3>SDO_TOPO</KEYWORD3>
-			<KEYWORD3>SDO_TOPO_MAP</KEYWORD3>
-			<KEYWORD3>SDO_TUNE</KEYWORD3>
-			<KEYWORD3>SDO_UTIL</KEYWORD3>
-			<KEYWORD3>SDO_WFS_LOCK</KEYWORD3>
-			<KEYWORD3>SDO_WFS_PROCESS</KEYWORD3>
-			<KEYWORD3>SEM_APIS</KEYWORD3>
-			<KEYWORD3>SEM_PERF</KEYWORD3>
-			<KEYWORD3>UTL_COLL</KEYWORD3>
-			<KEYWORD3>UTL_COMPRESS</KEYWORD3>
-			<KEYWORD3>UTL_ENCODE</KEYWORD3>
-			<KEYWORD3>UTL_FILE</KEYWORD3>
-			<KEYWORD3>UTL_HTTP</KEYWORD3>
-			<KEYWORD3>UTL_I18N</KEYWORD3>
-			<KEYWORD3>UTL_INADDR</KEYWORD3>
-			<KEYWORD3>UTL_LMS</KEYWORD3>
-			<KEYWORD3>UTL_MAIL</KEYWORD3>
-			<KEYWORD3>UTL_NLA</KEYWORD3>
-			<KEYWORD3>UTL_RAW</KEYWORD3>
-			<KEYWORD3>UTL_RECOMP</KEYWORD3>
-			<KEYWORD3>UTL_REF</KEYWORD3>
-			<KEYWORD3>UTL_SMTP</KEYWORD3>
-			<KEYWORD3>UTL_SPADV</KEYWORD3>
-			<KEYWORD3>UTL_TCP</KEYWORD3>
-			<KEYWORD3>UTL_URL</KEYWORD3>
-			<KEYWORD3>WPG_DOCLOAD</KEYWORD3>
-			<KEYWORD3>XMLTYPE</KEYWORD3>
-
-			<!--
-			  Procedures in Oracle supplied packages
-			  -->
-			<KEYWORD4>ABORT</KEYWORD4>
-			<KEYWORD4>ABORT_GLOBAL_INSTANTIATION</KEYWORD4>
-			<KEYWORD4>ABORT_REDEF_TABLE</KEYWORD4>
-			<KEYWORD4>ABORT_SCHEMA_INSTANTIATION</KEYWORD4>
-			<KEYWORD4>ABORT_SYNC_INSTANTIATION</KEYWORD4>
-			<KEYWORD4>ABORT_TABLE_INSTANTIATION</KEYWORD4>
-			<KEYWORD4>ABORTED_REQUEST_THRESHOLD</KEYWORD4>
-			<KEYWORD4>ACLCHECKPRIVILEGES</KEYWORD4>
-			<KEYWORD4>ACTIVATE_SUBSCRIPTION</KEYWORD4>
-			<KEYWORD4>ACTIVE_INSTANCES</KEYWORD4>
-			<KEYWORD4>ADD_ALIAS_TO_LDAP</KEYWORD4>
-			<KEYWORD4>ADD_COLUMN</KEYWORD4>
-			<KEYWORD4>ADD_COOKIES</KEYWORD4>
-			<KEYWORD4>ADD_COST_MATRIX</KEYWORD4>
-			<KEYWORD4>ADD_ELEMENTARY_ATTRIBUTE</KEYWORD4>
-			<KEYWORD4>ADD_EVENT</KEYWORD4>
-			<KEYWORD4>ADD_EVENT_QUEUE_SUBSCRIBER</KEYWORD4>
-			<KEYWORD4>ADD_FILE</KEYWORD4>
-			<KEYWORD4>ADD_FILTER</KEYWORD4>
-			<KEYWORD4>ADD_FUNCTIONS</KEYWORD4>
-			<KEYWORD4>ADD_GLOBAL_PROPAGATION_RULES</KEYWORD4>
-			<KEYWORD4>ADD_GLOBAL_RULES</KEYWORD4>
-			<KEYWORD4>ADD_GROUPED_POLICY</KEYWORD4>
-			<KEYWORD4>ADD_LOGFILE</KEYWORD4>
-			<KEYWORD4>ADD_MESSAGE_PROPAGATION_RULE</KEYWORD4>
-			<KEYWORD4>ADD_MESSAGE_RULE</KEYWORD4>
-			<KEYWORD4>ADD_POLICY</KEYWORD4>
-			<KEYWORD4>ADD_POLICY_CONTEXT</KEYWORD4>
-			<KEYWORD4>ADD_PRIVILEGE</KEYWORD4>
-			<KEYWORD4>ADD_RULE</KEYWORD4>
-			<KEYWORD4>ADD_SCHEMA_PROPAGATION_RULES</KEYWORD4>
-			<KEYWORD4>ADD_SCHEMA_RULES</KEYWORD4>
-			<KEYWORD4>ADD_SCHEME</KEYWORD4>
-			<KEYWORD4>ADD_SQLSET_REFERENCE</KEYWORD4>
-			<KEYWORD4>ADD_SQLWKLD_REF</KEYWORD4>
-			<KEYWORD4>ADD_SQLWKLD_STATEMENT</KEYWORD4>
-			<KEYWORD4>ADD_STS_REF</KEYWORD4>
-			<KEYWORD4>ADD_SUBSCRIBER</KEYWORD4>
-			<KEYWORD4>ADD_SUBSET_PROPAGATION_RULES</KEYWORD4>
-			<KEYWORD4>ADD_SUBSET_RULES</KEYWORD4>
-			<KEYWORD4>ADD_TABLE_PROPAGATION_RULES</KEYWORD4>
-			<KEYWORD4>ADD_TABLE_RULES</KEYWORD4>
-			<KEYWORD4>ADD_TRANSFORM</KEYWORD4>
-			<KEYWORD4>ADD_WARNING_SETTING_CAT</KEYWORD4>
-			<KEYWORD4>ADD_WARNING_SETTING_NUM</KEYWORD4>
-			<KEYWORD4>ADD_WINDOW_GROUP_MEMBER</KEYWORD4>
-			<KEYWORD4>ADD2MULTI</KEYWORD4>
-			<KEYWORD4>ADDMIMEMAPPING</KEYWORD4>
-			<KEYWORD4>ADDREPOSITORYRESCONFIG</KEYWORD4>
-			<KEYWORD4>ADDRESCONFIG</KEYWORD4>
-			<KEYWORD4>ADDRESS</KEYWORD4>
-			<KEYWORD4>ADDSCHEMALOCMAPPING</KEYWORD4>
-			<KEYWORD4>ADDSERVLET</KEYWORD4>
-			<KEYWORD4>ADDSERVLETMAPPING</KEYWORD4>
-			<KEYWORD4>ADDSERVLETSECROLE</KEYWORD4>
-			<KEYWORD4>ADDXMLEXTENSION</KEYWORD4>
-			<KEYWORD4>ADMIN_TABLES</KEYWORD4>
-			<KEYWORD4>ADOPTNODE</KEYWORD4>
-			<KEYWORD4>ADVISE_COMMIT</KEYWORD4>
-			<KEYWORD4>ADVISE_NOTHING</KEYWORD4>
-			<KEYWORD4>ADVISE_ROLLBACK</KEYWORD4>
-			<KEYWORD4>ALLOCATE_UNIQUE</KEYWORD4>
-			<KEYWORD4>ALLOW_ALL</KEYWORD4>
-			<KEYWORD4>ALLOW_SERVER</KEYWORD4>
-			<KEYWORD4>ALTER_AGENT</KEYWORD4>
-			<KEYWORD4>ALTER_APPLY</KEYWORD4>
-			<KEYWORD4>ALTER_AQ_AGENT</KEYWORD4>
-			<KEYWORD4>ALTER_AUTOLOG_CHANGE_SOURCE</KEYWORD4>
-			<KEYWORD4>ALTER_CAPTURE</KEYWORD4>
-			<KEYWORD4>ALTER_CHAIN</KEYWORD4>
-			<KEYWORD4>ALTER_CHANGE_SET</KEYWORD4>
-			<KEYWORD4>ALTER_CHANGE_TABLE</KEYWORD4>
-			<KEYWORD4>ALTER_COMPILE</KEYWORD4>
-			<KEYWORD4>ALTER_EVALUATION_CONTEXT</KEYWORD4>
-			<KEYWORD4>ALTER_FILE</KEYWORD4>
-			<KEYWORD4>ALTER_FILE_GROUP</KEYWORD4>
-			<KEYWORD4>ALTER_HOTLOG_CHANGE_SOURCE</KEYWORD4>
-			<KEYWORD4>ALTER_JOB</KEYWORD4>
-			<KEYWORD4>ALTER_PARAM</KEYWORD4>
-			<KEYWORD4>ALTER_PROPAGATION</KEYWORD4>
-			<KEYWORD4>ALTER_PROPAGATION_SCHEDULE</KEYWORD4>
-			<KEYWORD4>ALTER_QUEUE</KEYWORD4>
-			<KEYWORD4>ALTER_QUEUE_TABLE</KEYWORD4>
-			<KEYWORD4>ALTER_REVERSE_EXPRESSION</KEYWORD4>
-			<KEYWORD4>ALTER_REWRITE_EQUIVALENCE</KEYWORD4>
-			<KEYWORD4>ALTER_RULE</KEYWORD4>
-			<KEYWORD4>ALTER_RUNNING_CHAIN</KEYWORD4>
-			<KEYWORD4>ALTER_SQL_PATCH</KEYWORD4>
-			<KEYWORD4>ALTER_SQL_PLAN_BASELINE</KEYWORD4>
-			<KEYWORD4>ALTER_SQL_PROFILE</KEYWORD4>
-			<KEYWORD4>ALTER_STATS_HISTORY_RETENTION</KEYWORD4>
-			<KEYWORD4>ALTER_SUBSCRIBER</KEYWORD4>
-			<KEYWORD4>ALTER_SYNC_CAPTURE</KEYWORD4>
-			<KEYWORD4>ALTER_TABLE_NOT_REFERENCEABLE</KEYWORD4>
-			<KEYWORD4>ALTER_TABLE_REFERENCEABLE</KEYWORD4>
-			<KEYWORD4>ALTER_VERSION</KEYWORD4>
-			<KEYWORD4>AMATCH</KEYWORD4>
-			<KEYWORD4>ANALYZE</KEYWORD4>
-			<KEYWORD4>ANALYZE_CURRENT_PERFORMANCE</KEYWORD4>
-			<KEYWORD4>ANALYZE_DATABASE</KEYWORD4>
-			<KEYWORD4>ANALYZE_DB</KEYWORD4>
-			<KEYWORD4>ANALYZE_INST</KEYWORD4>
-			<KEYWORD4>ANALYZE_PART_OBJECT</KEYWORD4>
-			<KEYWORD4>ANALYZE_PARTIAL</KEYWORD4>
-			<KEYWORD4>ANALYZE_SCHEMA</KEYWORD4>
-			<KEYWORD4>ANCHOR</KEYWORD4>
-			<KEYWORD4>ANCHOR2</KEYWORD4>
-			<KEYWORD4>APPEND</KEYWORD4>
-			<KEYWORD4>APPENDCHILD</KEYWORD4>
-			<KEYWORD4>APPENDDATA</KEYWORD4>
-			<KEYWORD4>APPENDPATH</KEYWORD4>
-			<KEYWORD4>APPENDRESCONFIG</KEYWORD4>
-			<KEYWORD4>APPLETCLOSE</KEYWORD4>
-			<KEYWORD4>APPLETOPEN</KEYWORD4>
-			<KEYWORD4>APPLY</KEYWORD4>
-			<KEYWORD4>APPLY_SET</KEYWORD4>
-			<KEYWORD4>APPLY_UNSET</KEYWORD4>
-			<KEYWORD4>AREA</KEYWORD4>
-			<KEYWORD4>ASA_RECOMMENDATIONS</KEYWORD4>
-			<KEYWORD4>ASH_REPORT_HTML</KEYWORD4>
-			<KEYWORD4>ASH_REPORT_TEXT</KEYWORD4>
-			<KEYWORD4>ASSIGN_ACL</KEYWORD4>
-			<KEYWORD4>ASSIGN_ATTRIBUTE_SET</KEYWORD4>
-			<KEYWORD4>ASSM_SEGMENT_VERIFY</KEYWORD4>
-			<KEYWORD4>ASSM_TABLESPACE_VERIFY</KEYWORD4>
-			<KEYWORD4>ATTACH</KEYWORD4>
-			<KEYWORD4>ATTACH_SESSION</KEYWORD4>
-			<KEYWORD4>ATTACH_SIMPLE_TABLESPACE</KEYWORD4>
-			<KEYWORD4>ATTACH_TABLESPACES</KEYWORD4>
-			<KEYWORD4>AUTHORIZE</KEYWORD4>
-			<KEYWORD4>AUTHORIZE_DAD</KEYWORD4>
-			<KEYWORD4>AVAILABLE</KEYWORD4>
-			<KEYWORD4>AWR_DIFF_REPORT_HTML</KEYWORD4>
-			<KEYWORD4>AWR_DIFF_REPORT_TEXT</KEYWORD4>
-			<KEYWORD4>AWR_REPORT_HTML</KEYWORD4>
-			<KEYWORD4>AWR_REPORT_TEXT</KEYWORD4>
-			<KEYWORD4>AWR_SQL_REPORT_HTML</KEYWORD4>
-			<KEYWORD4>AWR_SQL_REPORT_TEXT</KEYWORD4>
-			<KEYWORD4>BASE</KEYWORD4>
-			<KEYWORD4>BASE64_DECODE</KEYWORD4>
-			<KEYWORD4>BASE64_ENCODE</KEYWORD4>
-			<KEYWORD4>BASEFONT</KEYWORD4>
-			<KEYWORD4>BEGIN_DISCRETE_TRANSACTION</KEYWORD4>
-			<KEYWORD4>BEGIN_REQUEST</KEYWORD4>
-			<KEYWORD4>BEGIN_TABLE_REORGANIZATION</KEYWORD4>
-			<KEYWORD4>BGSOUND</KEYWORD4>
-			<KEYWORD4>BIG</KEYWORD4>
-			<KEYWORD4>BIND_AGENT</KEYWORD4>
-			<KEYWORD4>BIND_ARRAY</KEYWORD4>
-			<KEYWORD4>BIND_INOUT_VARIABLE</KEYWORD4>
-			<KEYWORD4>BIND_INOUT_VARIABLE_RAW</KEYWORD4>
-			<KEYWORD4>BIND_OUT_VARIABLE</KEYWORD4>
-			<KEYWORD4>BIND_OUT_VARIABLE_RAW</KEYWORD4>
-			<KEYWORD4>BIND_VARIABLE</KEYWORD4>
-			<KEYWORD4>BIND_VARIABLE_RAW</KEYWORD4>
-			<KEYWORD4>BIND_VARIABLES</KEYWORD4>
-			<KEYWORD4>BIT_AND</KEYWORD4>
-			<KEYWORD4>BIT_COMPLEMENT</KEYWORD4>
-			<KEYWORD4>BIT_OR</KEYWORD4>
-			<KEYWORD4>BIT_XOR</KEYWORD4>
-			<KEYWORD4>BLAS_ASUM</KEYWORD4>
-			<KEYWORD4>BLAS_AXPY</KEYWORD4>
-			<KEYWORD4>BLAS_COPY</KEYWORD4>
-			<KEYWORD4>BLAS_DOT</KEYWORD4>
-			<KEYWORD4>BLAS_GBMV</KEYWORD4>
-			<KEYWORD4>BLAS_GEMM</KEYWORD4>
-			<KEYWORD4>BLAS_GEMV</KEYWORD4>
-			<KEYWORD4>BLAS_GER</KEYWORD4>
-			<KEYWORD4>BLAS_IAMAX</KEYWORD4>
-			<KEYWORD4>BLAS_NRM2</KEYWORD4>
-			<KEYWORD4>BLAS_ROT</KEYWORD4>
-			<KEYWORD4>BLAS_ROTG</KEYWORD4>
-			<KEYWORD4>BLAS_SBMV</KEYWORD4>
-			<KEYWORD4>BLAS_SCAL</KEYWORD4>
-			<KEYWORD4>BLAS_SPMV</KEYWORD4>
-			<KEYWORD4>BLAS_SPR</KEYWORD4>
-			<KEYWORD4>BLAS_SPR2</KEYWORD4>
-			<KEYWORD4>BLAS_SWAP</KEYWORD4>
-			<KEYWORD4>BLAS_SYMM</KEYWORD4>
-			<KEYWORD4>BLAS_SYMV</KEYWORD4>
-			<KEYWORD4>BLAS_SYR</KEYWORD4>
-			<KEYWORD4>BLAS_SYR2</KEYWORD4>
-			<KEYWORD4>BLAS_SYR2K</KEYWORD4>
-			<KEYWORD4>BLAS_SYRK</KEYWORD4>
-			<KEYWORD4>BLAS_TBMV</KEYWORD4>
-			<KEYWORD4>BLAS_TBSV</KEYWORD4>
-			<KEYWORD4>BLAS_TPMV</KEYWORD4>
-			<KEYWORD4>BLAS_TPSV</KEYWORD4>
-			<KEYWORD4>BLAS_TRMM</KEYWORD4>
-			<KEYWORD4>BLAS_TRMV</KEYWORD4>
-			<KEYWORD4>BLAS_TRSM</KEYWORD4>
-			<KEYWORD4>BLAS_TRSV</KEYWORD4>
-			<KEYWORD4>BLOCKQUOTECLOSE</KEYWORD4>
-			<KEYWORD4>BLOCKQUOTEOPEN</KEYWORD4>
-			<KEYWORD4>BODYCLOSE</KEYWORD4>
-			<KEYWORD4>BODYOPEN</KEYWORD4>
-			<KEYWORD4>BOLD</KEYWORD4>
-			<KEYWORD4>BR</KEYWORD4>
-			<KEYWORD4>BROKEN</KEYWORD4>
-			<KEYWORD4>BUILD</KEYWORD4>
-			<KEYWORD4>BUILD_CHAIN_ROWS_TABLE</KEYWORD4>
-			<KEYWORD4>BUILD_EXCEPTIONS_TABLE</KEYWORD4>
-			<KEYWORD4>BUILD_PART_INDEX</KEYWORD4>
-			<KEYWORD4>BUILD_SAFE_REWRITE_EQUIVALENCE</KEYWORD4>
-			<KEYWORD4>BYPASS</KEYWORD4>
-			<KEYWORD4>CALENDARPRINT</KEYWORD4>
-			<KEYWORD4>CALIBRATE</KEYWORD4>
-			<KEYWORD4>CALIBRATE_IO</KEYWORD4>
-			<KEYWORD4>CAN_REDEF_TABLE</KEYWORD4>
-			<KEYWORD4>CANCEL_ANALYSIS_TASK</KEYWORD4>
-			<KEYWORD4>CANCEL_DIAGNOSIS_TASK</KEYWORD4>
-			<KEYWORD4>CANCEL_REPLAY</KEYWORD4>
-			<KEYWORD4>CANCEL_TASK</KEYWORD4>
-			<KEYWORD4>CANCEL_TUNING_TASK</KEYWORD4>
-			<KEYWORD4>CANONICALIZE</KEYWORD4>
-			<KEYWORD4>CAPTURE_CURSOR_CACHE_SQLSET</KEYWORD4>
-			<KEYWORD4>CAST_FROM_BINARY_DOUBLE</KEYWORD4>
-			<KEYWORD4>CAST_FROM_BINARY_FLOAT</KEYWORD4>
-			<KEYWORD4>CAST_FROM_BINARY_INTEGER</KEYWORD4>
-			<KEYWORD4>CAST_FROM_NUMBER</KEYWORD4>
-			<KEYWORD4>CAST_TO_BINARY_DOUBLE</KEYWORD4>
-			<KEYWORD4>CAST_TO_BINARY_FLOAT</KEYWORD4>
-			<KEYWORD4>CAST_TO_BINARY_INTEGER</KEYWORD4>
-			<KEYWORD4>CAST_TO_NUMBER</KEYWORD4>
-			<KEYWORD4>CAST_TO_NVARCHAR2</KEYWORD4>
-			<KEYWORD4>CAST_TO_RAW</KEYWORD4>
-			<KEYWORD4>CAST_TO_VARCHAR2</KEYWORD4>
-			<KEYWORD4>CELLSPRINT</KEYWORD4>
-			<KEYWORD4>CENTER</KEYWORD4>
-			<KEYWORD4>CENTERCLOSE</KEYWORD4>
-			<KEYWORD4>CENTEROPEN</KEYWORD4>
-			<KEYWORD4>CFG_GET</KEYWORD4>
-			<KEYWORD4>CFG_REFRESH</KEYWORD4>
-			<KEYWORD4>CFG_UPDATE</KEYWORD4>
-			<KEYWORD4>CHANGE</KEYWORD4>
-			<KEYWORD4>CHANGEOWNER</KEYWORD4>
-			<KEYWORD4>CHANGEPRIVILEGES</KEYWORD4>
-			<KEYWORD4>CHECK_DB</KEYWORD4>
-			<KEYWORD4>CHECK_EXTERNAL</KEYWORD4>
-			<KEYWORD4>CHECK_OBJECT</KEYWORD4>
-			<KEYWORD4>CHECK_PRIVILEGE</KEYWORD4>
-			<KEYWORD4>CHECK_PRIVILEGE_ACLID</KEYWORD4>
-			<KEYWORD4>CHECKIN</KEYWORD4>
-			<KEYWORD4>CHECKOUT</KEYWORD4>
-			<KEYWORD4>CHECKPRIVILEGES</KEYWORD4>
-			<KEYWORD4>CHECKSUM</KEYWORD4>
-			<KEYWORD4>CHOOSE_DATE</KEYWORD4>
-			<KEYWORD4>CITE</KEYWORD4>
-			<KEYWORD4>CLEANUP_GATEWAY</KEYWORD4>
-			<KEYWORD4>CLEANUP_INSTANTIATION_SETUP</KEYWORD4>
-			<KEYWORD4>CLEAR</KEYWORD4>
-			<KEYWORD4>CLEAR_ALL_CONTEXT</KEYWORD4>
-			<KEYWORD4>CLEAR_CONTEXT</KEYWORD4>
-			<KEYWORD4>CLEAR_COOKIES</KEYWORD4>
-			<KEYWORD4>CLEAR_EXPRSET_STATS</KEYWORD4>
-			<KEYWORD4>CLEAR_IDENTIFIER</KEYWORD4>
-			<KEYWORD4>CLEAR_PENDING_AREA</KEYWORD4>
-			<KEYWORD4>CLEAR_PLSQL_TRACE</KEYWORD4>
-			<KEYWORD4>CLEAR_USED</KEYWORD4>
-			<KEYWORD4>CLIENT_ID_STAT_DISABLE</KEYWORD4>
-			<KEYWORD4>CLIENT_ID_STAT_ENABLE</KEYWORD4>
-			<KEYWORD4>CLIENT_ID_TRACE_DISABLE</KEYWORD4>
-			<KEYWORD4>CLIENT_ID_TRACE_ENABLE</KEYWORD4>
-			<KEYWORD4>CLOB2FILE</KEYWORD4>
-			<KEYWORD4>CLONE_SIMPLE_TABLESPACE</KEYWORD4>
-			<KEYWORD4>CLONE_TABLESPACES</KEYWORD4>
-			<KEYWORD4>CLONENODE</KEYWORD4>
-			<KEYWORD4>CLOSE</KEYWORD4>
-			<KEYWORD4>CLOSE_ALL_CONNECTIONS</KEYWORD4>
-			<KEYWORD4>CLOSE_CONNECTION</KEYWORD4>
-			<KEYWORD4>CLOSE_CURSOR</KEYWORD4>
-			<KEYWORD4>CLOSE_DATABASE_LINK</KEYWORD4>
-			<KEYWORD4>CLOSE_ITERATOR</KEYWORD4>
-			<KEYWORD4>CLOSE_PERSISTENT_CONN</KEYWORD4>
-			<KEYWORD4>CLOSE_PERSISTENT_CONNS</KEYWORD4>
-			<KEYWORD4>CLOSE_WINDOW</KEYWORD4>
-			<KEYWORD4>CLOSECONTEXT</KEYWORD4>
-			<KEYWORD4>CODE</KEYWORD4>
-			<KEYWORD4>COLLECT_STATS</KEYWORD4>
-			<KEYWORD4>COLUMN_PRESENT</KEYWORD4>
-			<KEYWORD4>COLUMN_VALUE</KEYWORD4>
-			<KEYWORD4>COLUMN_VALUE_LONG</KEYWORD4>
-			<KEYWORD4>COMMA_TO_TABLE</KEYWORD4>
-			<KEYWORD4>COMMAND_REPLIES</KEYWORD4>
-			<KEYWORD4>COMMENT</KEYWORD4>
-			<KEYWORD4>COMMIT</KEYWORD4>
-			<KEYWORD4>COMMIT_COMMENT</KEYWORD4>
-			<KEYWORD4>COMMIT_FORCE</KEYWORD4>
-			<KEYWORD4>COMPARE</KEYWORD4>
-			<KEYWORD4>COMPARE_OLD_VALUES</KEYWORD4>
-			<KEYWORD4>COMPATIBLE_10_1</KEYWORD4>
-			<KEYWORD4>COMPATIBLE_10_2</KEYWORD4>
-			<KEYWORD4>COMPATIBLE_11_1</KEYWORD4>
-			<KEYWORD4>COMPATIBLE_9_2</KEYWORD4>
-			<KEYWORD4>COMPILE_FROM_REMOTE</KEYWORD4>
-			<KEYWORD4>COMPILE_SCHEMA</KEYWORD4>
-			<KEYWORD4>COMPILESCHEMA</KEYWORD4>
-			<KEYWORD4>COMPUTE_CONFUSION_MATRIX</KEYWORD4>
-			<KEYWORD4>COMPUTE_LIFT</KEYWORD4>
-			<KEYWORD4>COMPUTE_ROC</KEYWORD4>
-			<KEYWORD4>CONCAT</KEYWORD4>
-			<KEYWORD4>CONDITION_REF</KEYWORD4>
-			<KEYWORD4>CONFIGURE</KEYWORD4>
-			<KEYWORD4>CONFIGURE_POOL</KEYWORD4>
-			<KEYWORD4>CONFIGUREAUTOSYNC</KEYWORD4>
-			<KEYWORD4>CONSTRUCT</KEYWORD4>
-			<KEYWORD4>CONSUME_EVENT</KEYWORD4>
-			<KEYWORD4>CONSUME_PRIM_EVENTS</KEYWORD4>
-			<KEYWORD4>CONTINUE</KEYWORD4>
-			<KEYWORD4>CONVERGE</KEYWORD4>
-			<KEYWORD4>CONVERT</KEYWORD4>
-			<KEYWORD4>CONVERT_ANYDATA_TO_LCR_DDL</KEYWORD4>
-			<KEYWORD4>CONVERT_ANYDATA_TO_LCR_ROW</KEYWORD4>
-			<KEYWORD4>CONVERT_LCR_TO_XML</KEYWORD4>
-			<KEYWORD4>CONVERT_RAW_VALUE</KEYWORD4>
-			<KEYWORD4>CONVERT_RAW_VALUE_NVARCHAR</KEYWORD4>
-			<KEYWORD4>CONVERT_RAW_VALUE_ROWID</KEYWORD4>
-			<KEYWORD4>CONVERT_XML_TO_LCR</KEYWORD4>
-			<KEYWORD4>CONVERTTOBLOB</KEYWORD4>
-			<KEYWORD4>CONVERTTOCLOB</KEYWORD4>
-			<KEYWORD4>COPIES</KEYWORD4>
-			<KEYWORD4>COPY</KEYWORD4>
-			<KEYWORD4>COPY_ATTRIBUTE_SET</KEYWORD4>
-			<KEYWORD4>COPY_FILE</KEYWORD4>
-			<KEYWORD4>COPY_JOB</KEYWORD4>
-			<KEYWORD4>COPY_SQLWKLD_TO_STS</KEYWORD4>
-			<KEYWORD4>COPY_TABLE_DEPENDENTS</KEYWORD4>
-			<KEYWORD4>COPY_TABLE_STATS</KEYWORD4>
-			<KEYWORD4>COPYDEFAULTTOKENTABLESET</KEYWORD4>
-			<KEYWORD4>COPYEVOLVE</KEYWORD4>
-			<KEYWORD4>COPYRESOURCE</KEYWORD4>
-			<KEYWORD4>CQ_NOTIFICATION_QUERYID</KEYWORD4>
-			<KEYWORD4>CREATE_ACL</KEYWORD4>
-			<KEYWORD4>CREATE_AGENT</KEYWORD4>
-			<KEYWORD4>CREATE_ALTER_TYPE_ERROR_TABLE</KEYWORD4>
-			<KEYWORD4>CREATE_ANALYSIS_TASK</KEYWORD4>
-			<KEYWORD4>CREATE_APPLY</KEYWORD4>
-			<KEYWORD4>CREATE_AQ_AGENT</KEYWORD4>
-			<KEYWORD4>CREATE_ATTRIBUTE_SET</KEYWORD4>
-			<KEYWORD4>CREATE_AUTOLOG_CHANGE_SOURCE</KEYWORD4>
-			<KEYWORD4>CREATE_BASELINE_TEMPLATE</KEYWORD4>
-			<KEYWORD4>CREATE_BIN_CAT</KEYWORD4>
-			<KEYWORD4>CREATE_BIN_NUM</KEYWORD4>
-			<KEYWORD4>CREATE_CAPTURE</KEYWORD4>
-			<KEYWORD4>CREATE_CATEGORY</KEYWORD4>
-			<KEYWORD4>CREATE_CHAIN</KEYWORD4>
-			<KEYWORD4>CREATE_CHANGE_SET</KEYWORD4>
-			<KEYWORD4>CREATE_CHANGE_TABLE</KEYWORD4>
-			<KEYWORD4>CREATE_CLIP</KEYWORD4>
-			<KEYWORD4>CREATE_COL_REM</KEYWORD4>
-			<KEYWORD4>CREATE_COMPARISON</KEYWORD4>
-			<KEYWORD4>CREATE_CONDITIONS_TABLE</KEYWORD4>
-			<KEYWORD4>CREATE_CONSUMER_GROUP</KEYWORD4>
-			<KEYWORD4>CREATE_CREDENTIAL</KEYWORD4>
-			<KEYWORD4>CREATE_DAD</KEYWORD4>
-			<KEYWORD4>CREATE_DIAGNOSIS_TASK</KEYWORD4>
-			<KEYWORD4>CREATE_ERROR_LOG</KEYWORD4>
-			<KEYWORD4>CREATE_EVALUATION_CONTEXT</KEYWORD4>
-			<KEYWORD4>CREATE_EVENT_SCHEDULE</KEYWORD4>
-			<KEYWORD4>CREATE_EVENT_STRUCT</KEYWORD4>
-			<KEYWORD4>CREATE_EXPFIL_INDEXES</KEYWORD4>
-			<KEYWORD4>CREATE_EXTENDED_STATS</KEYWORD4>
-			<KEYWORD4>CREATE_FILE</KEYWORD4>
-			<KEYWORD4>CREATE_FILE_GROUP</KEYWORD4>
-			<KEYWORD4>CREATE_HOTLOG_CHANGE_SOURCE</KEYWORD4>
-			<KEYWORD4>CREATE_INDEX_COST</KEYWORD4>
-			<KEYWORD4>CREATE_INTERFACE</KEYWORD4>
-			<KEYWORD4>CREATE_JOB</KEYWORD4>
-			<KEYWORD4>CREATE_JOB_CLASS</KEYWORD4>
-			<KEYWORD4>CREATE_JOBS</KEYWORD4>
-			<KEYWORD4>CREATE_MISS_CAT</KEYWORD4>
-			<KEYWORD4>CREATE_MISS_NUM</KEYWORD4>
-			<KEYWORD4>CREATE_MODEL</KEYWORD4>
-			<KEYWORD4>CREATE_NORM_LIN</KEYWORD4>
-			<KEYWORD4>CREATE_NP_QUEUE</KEYWORD4>
-			<KEYWORD4>CREATE_OBJECT</KEYWORD4>
-			<KEYWORD4>CREATE_OBJECT_DEPENDENCY</KEYWORD4>
-			<KEYWORD4>CREATE_OUTLINE</KEYWORD4>
-			<KEYWORD4>CREATE_PENDING_AREA</KEYWORD4>
-			<KEYWORD4>CREATE_PIPE</KEYWORD4>
-			<KEYWORD4>CREATE_PLAN</KEYWORD4>
-			<KEYWORD4>CREATE_PLAN_DIRECTIVE</KEYWORD4>
-			<KEYWORD4>CREATE_POLICY_GROUP</KEYWORD4>
-			<KEYWORD4>CREATE_PROGRAM</KEYWORD4>
-			<KEYWORD4>CREATE_PROPAGATION</KEYWORD4>
-			<KEYWORD4>CREATE_QUEUE</KEYWORD4>
-			<KEYWORD4>CREATE_QUEUE_TABLE</KEYWORD4>
-			<KEYWORD4>CREATE_RULE</KEYWORD4>
-			<KEYWORD4>CREATE_RULE_CLASS</KEYWORD4>
-			<KEYWORD4>CREATE_RULE_SET</KEYWORD4>
-			<KEYWORD4>CREATE_SCHEDULE</KEYWORD4>
-			<KEYWORD4>CREATE_SERVICE</KEYWORD4>
-			<KEYWORD4>CREATE_SIMPLE_PLAN</KEYWORD4>
-			<KEYWORD4>CREATE_SQLWKLD</KEYWORD4>
-			<KEYWORD4>CREATE_STAT_TABLE</KEYWORD4>
-			<KEYWORD4>CREATE_STGTAB_BASELINE</KEYWORD4>
-			<KEYWORD4>CREATE_STGTAB_SQLPATCH</KEYWORD4>
-			<KEYWORD4>CREATE_STGTAB_SQLPROF</KEYWORD4>
-			<KEYWORD4>CREATE_STGTAB_SQLSET</KEYWORD4>
-			<KEYWORD4>CREATE_SUBSCRIPTION</KEYWORD4>
-			<KEYWORD4>CREATE_SYNC_CAPTURE</KEYWORD4>
-			<KEYWORD4>CREATE_TABLE_COST</KEYWORD4>
-			<KEYWORD4>CREATE_TASK</KEYWORD4>
-			<KEYWORD4>CREATE_TRANSFORMATION</KEYWORD4>
-			<KEYWORD4>CREATE_TUNING_TASK</KEYWORD4>
-			<KEYWORD4>CREATE_VERSION</KEYWORD4>
-			<KEYWORD4>CREATE_WINDOW</KEYWORD4>
-			<KEYWORD4>CREATE_WINDOW_GROUP</KEYWORD4>
-			<KEYWORD4>CREATE_WRAPPED</KEYWORD4>
-			<KEYWORD4>CREATEATTRIBUTE</KEYWORD4>
-			<KEYWORD4>CREATECDATASECTION</KEYWORD4>
-			<KEYWORD4>CREATECOMMENT</KEYWORD4>
-			<KEYWORD4>CREATEDATASTOREPREF</KEYWORD4>
-			<KEYWORD4>CREATEDATEINDEX</KEYWORD4>
-			<KEYWORD4>CREATEDOCUMENT</KEYWORD4>
-			<KEYWORD4>CREATEDOCUMENTFRAGMENT</KEYWORD4>
-			<KEYWORD4>CREATEELEMENT</KEYWORD4>
-			<KEYWORD4>CREATEENTITYREFERENCE</KEYWORD4>
-			<KEYWORD4>CREATEFILTERPREF</KEYWORD4>
-			<KEYWORD4>CREATEFOLDER</KEYWORD4>
-			<KEYWORD4>CREATEINDEX</KEYWORD4>
-			<KEYWORD4>CREATELEXERPREF</KEYWORD4>
-			<KEYWORD4>CREATENUMBERINDEX</KEYWORD4>
-			<KEYWORD4>CREATEOIDPATH</KEYWORD4>
-			<KEYWORD4>CREATEPREFERENCES</KEYWORD4>
-			<KEYWORD4>CREATEPROCESSINGINSTRUCTION</KEYWORD4>
-			<KEYWORD4>CREATEREPOSITORYXMLINDEX</KEYWORD4>
-			<KEYWORD4>CREATERESOURCE</KEYWORD4>
-			<KEYWORD4>CREATESECTIONGROUPPREF</KEYWORD4>
-			<KEYWORD4>CREATESTOPLISTPREF</KEYWORD4>
-			<KEYWORD4>CREATESTORAGEPREF</KEYWORD4>
-			<KEYWORD4>CREATETEMPORARY</KEYWORD4>
-			<KEYWORD4>CREATETEXTNODE</KEYWORD4>
-			<KEYWORD4>CREATEWORLDLISTPREF</KEYWORD4>
-			<KEYWORD4>CURRENT_INSTANCE</KEYWORD4>
-			<KEYWORD4>DATA_BLOCK_ADDRESS_BLOCK</KEYWORD4>
-			<KEYWORD4>DATA_BLOCK_ADDRESS_FILE</KEYWORD4>
-			<KEYWORD4>DATA_FILTER</KEYWORD4>
-			<KEYWORD4>DATABASE_TRACE_DISABLE</KEYWORD4>
-			<KEYWORD4>DATABASE_TRACE_ENABLE</KEYWORD4>
-			<KEYWORD4>DB_CONNECT_INFO</KEYWORD4>
-			<KEYWORD4>DB_VERSION</KEYWORD4>
-			<KEYWORD4>DEAUTHORIZE_DAD</KEYWORD4>
-			<KEYWORD4>DEBUG_OFF</KEYWORD4>
-			<KEYWORD4>DEBUG_ON</KEYWORD4>
-			<KEYWORD4>DECLARE_REWRITE_EQUIVALENCE</KEYWORD4>
-			<KEYWORD4>DECRYPT</KEYWORD4>
-			<KEYWORD4>DEFAULT_INDEX_PARAMETERS</KEYWORD4>
-			<KEYWORD4>DEFAULT_XPINDEX_PARAMETERS</KEYWORD4>
-			<KEYWORD4>DEFINE_ANYDATA_ARGUMENT</KEYWORD4>
-			<KEYWORD4>DEFINE_ARRAY</KEYWORD4>
-			<KEYWORD4>DEFINE_CHAIN_EVENT_STEP</KEYWORD4>
-			<KEYWORD4>DEFINE_CHAIN_RULE</KEYWORD4>
-			<KEYWORD4>DEFINE_CHAIN_STEP</KEYWORD4>
-			<KEYWORD4>DEFINE_COLUMN</KEYWORD4>
-			<KEYWORD4>DEFINE_COLUMN_LONG</KEYWORD4>
-			<KEYWORD4>DEFINE_METADATA_ARGUMENT</KEYWORD4>
-			<KEYWORD4>DEFINE_PROGRAM_ARGUMENT</KEYWORD4>
-			<KEYWORD4>DEFRAG_INDEX</KEYWORD4>
-			<KEYWORD4>DEL_ALIAS_FROM_LDAP</KEYWORD4>
-			<KEYWORD4>DELETE</KEYWORD4>
-			<KEYWORD4>DELETE_ALL_ERRORS</KEYWORD4>
-			<KEYWORD4>DELETE_BREAKPOINT</KEYWORD4>
-			<KEYWORD4>DELETE_CAPTURE_INFO</KEYWORD4>
-			<KEYWORD4>DELETE_COLUMN</KEYWORD4>
-			<KEYWORD4>DELETE_COLUMN_STATS</KEYWORD4>
-			<KEYWORD4>DELETE_CONSUMER_GROUP</KEYWORD4>
-			<KEYWORD4>DELETE_DAD_ATTRIBUTE</KEYWORD4>
-			<KEYWORD4>DELETE_DATABASE_PREFS</KEYWORD4>
-			<KEYWORD4>DELETE_DATABASE_STATS</KEYWORD4>
-			<KEYWORD4>DELETE_DICTIONARY_STATS</KEYWORD4>
-			<KEYWORD4>DELETE_ERROR</KEYWORD4>
-			<KEYWORD4>DELETE_FILTER</KEYWORD4>
-			<KEYWORD4>DELETE_FINDING_DIRECTIVE</KEYWORD4>
-			<KEYWORD4>DELETE_FIXED_OBJECTS_STATS</KEYWORD4>
-			<KEYWORD4>DELETE_GLOBAL_ATTRIBUTE</KEYWORD4>
-			<KEYWORD4>DELETE_INDEX_STATS</KEYWORD4>
-			<KEYWORD4>DELETE_OBJECT</KEYWORD4>
-			<KEYWORD4>DELETE_OER_BREAKPOINT</KEYWORD4>
-			<KEYWORD4>DELETE_PARAMETER_DIRECTIVE</KEYWORD4>
-			<KEYWORD4>DELETE_PENDING_STATS</KEYWORD4>
-			<KEYWORD4>DELETE_PLAN</KEYWORD4>
-			<KEYWORD4>DELETE_PLAN_CASCADE</KEYWORD4>
-			<KEYWORD4>DELETE_PLAN_DIRECTIVE</KEYWORD4>
-			<KEYWORD4>DELETE_POLICY_GROUP</KEYWORD4>
-			<KEYWORD4>DELETE_PRIVILEGE</KEYWORD4>
-			<KEYWORD4>DELETE_REPLAY_INFO</KEYWORD4>
-			<KEYWORD4>DELETE_RULE</KEYWORD4>
-			<KEYWORD4>DELETE_SCHEMA_PREFS</KEYWORD4>
-			<KEYWORD4>DELETE_SCHEMA_STATS</KEYWORD4>
-			<KEYWORD4>DELETE_SEGMENT_DIRECTIVE</KEYWORD4>
-			<KEYWORD4>DELETE_SERVICE</KEYWORD4>
-			<KEYWORD4>DELETE_SQL_DIRECTIVE</KEYWORD4>
-			<KEYWORD4>DELETE_SQLSET</KEYWORD4>
-			<KEYWORD4>DELETE_SQLWKLD</KEYWORD4>
-			<KEYWORD4>DELETE_SQLWKLD_REF</KEYWORD4>
-			<KEYWORD4>DELETE_SQLWKLD_STATEMENT</KEYWORD4>
-			<KEYWORD4>DELETE_STS_REF</KEYWORD4>
-			<KEYWORD4>DELETE_SYSTEM_STATS</KEYWORD4>
-			<KEYWORD4>DELETE_TABLE_PREFS</KEYWORD4>
-			<KEYWORD4>DELETE_TABLE_STATS</KEYWORD4>
-			<KEYWORD4>DELETE_TASK</KEYWORD4>
-			<KEYWORD4>DELETEDATA</KEYWORD4>
-			<KEYWORD4>DELETEMIMEMAPPING</KEYWORD4>
-			<KEYWORD4>DELETEREPOSITORYRESCONFIG</KEYWORD4>
-			<KEYWORD4>DELETERESCONFIG</KEYWORD4>
-			<KEYWORD4>DELETERESOURCE</KEYWORD4>
-			<KEYWORD4>DELETERESOURCEMETADATA</KEYWORD4>
-			<KEYWORD4>DELETESCHEMA</KEYWORD4>
-			<KEYWORD4>DELETESCHEMALOCMAPPING</KEYWORD4>
-			<KEYWORD4>DELETESERVLET</KEYWORD4>
-			<KEYWORD4>DELETESERVLETMAPPING</KEYWORD4>
-			<KEYWORD4>DELETESERVLETSECROLE</KEYWORD4>
-			<KEYWORD4>DELETEXMLEXTENSION</KEYWORD4>
-			<KEYWORD4>DENY_ALL</KEYWORD4>
-			<KEYWORD4>DENY_SERVER</KEYWORD4>
-			<KEYWORD4>DEQUEUE</KEYWORD4>
-			<KEYWORD4>DEQUEUE_ARRAY</KEYWORD4>
-			<KEYWORD4>DEREGISTER</KEYWORD4>
-			<KEYWORD4>DESCRIBE_COLUMNS</KEYWORD4>
-			<KEYWORD4>DESCRIBE_COLUMNS2</KEYWORD4>
-			<KEYWORD4>DESCRIBE_COLUMNS3</KEYWORD4>
-			<KEYWORD4>DESCRIBE_DIMENSION</KEYWORD4>
-			<KEYWORD4>DESCRIBE_PROCEDURE</KEYWORD4>
-			<KEYWORD4>DESCRIBE_STACK</KEYWORD4>
-			<KEYWORD4>DETACH</KEYWORD4>
-			<KEYWORD4>DETACH_SESSION</KEYWORD4>
-			<KEYWORD4>DETACH_SIMPLE_TABLESPACE</KEYWORD4>
-			<KEYWORD4>DETACH_TABLESPACES</KEYWORD4>
-			<KEYWORD4>DFN</KEYWORD4>
-			<KEYWORD4>DIFF_TABLE_STATS_IN_HISTORY</KEYWORD4>
-			<KEYWORD4>DIFF_TABLE_STATS_IN_PENDING</KEYWORD4>
-			<KEYWORD4>DIFF_TABLE_STATS_IN_STATTAB</KEYWORD4>
-			<KEYWORD4>DIRLISTCLOSE</KEYWORD4>
-			<KEYWORD4>DIRLISTOPEN</KEYWORD4>
-			<KEYWORD4>DISABLE</KEYWORD4>
-			<KEYWORD4>DISABLE_BREAKPOINT</KEYWORD4>
-			<KEYWORD4>DISABLE_DB_ACCESS</KEYWORD4>
-			<KEYWORD4>DISABLE_GROUPED_POLICY</KEYWORD4>
-			<KEYWORD4>DISABLE_HIERARCHY</KEYWORD4>
-			<KEYWORD4>DISABLE_JOB</KEYWORD4>
-			<KEYWORD4>DISABLE_POLICY</KEYWORD4>
-			<KEYWORD4>DISABLE_PROPAGATION_SCHEDULE</KEYWORD4>
-			<KEYWORD4>DISABLETRANSLATION</KEYWORD4>
-			<KEYWORD4>DISCONNECT_SESSION</KEYWORD4>
-			<KEYWORD4>DISPLAY</KEYWORD4>
-			<KEYWORD4>DISPLAY_AWR</KEYWORD4>
-			<KEYWORD4>DISPLAY_CURSOR</KEYWORD4>
-			<KEYWORD4>DISPLAY_SQL_PLAN_BASELINE</KEYWORD4>
-			<KEYWORD4>DISPLAY_SQLSET</KEYWORD4>
-			<KEYWORD4>DIST_TXN_SYNC</KEYWORD4>
-			<KEYWORD4>DIV</KEYWORD4>
-			<KEYWORD4>DLISTCLOSE</KEYWORD4>
-			<KEYWORD4>DLISTDEF</KEYWORD4>
-			<KEYWORD4>DLISTOPEN</KEYWORD4>
-			<KEYWORD4>DLISTTERM</KEYWORD4>
-			<KEYWORD4>DOMAIN_LEVEL</KEYWORD4>
-			<KEYWORD4>DOMAINS</KEYWORD4>
-			<KEYWORD4>DOWNGRADE</KEYWORD4>
-			<KEYWORD4>DOWNLOAD_FILE</KEYWORD4>
-			<KEYWORD4>DROP_ACL</KEYWORD4>
-			<KEYWORD4>DROP_ALL</KEYWORD4>
-			<KEYWORD4>DROP_ANALYSIS_TASK</KEYWORD4>
-			<KEYWORD4>DROP_APPLY</KEYWORD4>
-			<KEYWORD4>DROP_AQ_AGENT</KEYWORD4>
-			<KEYWORD4>DROP_ATTRIBUTE_SET</KEYWORD4>
-			<KEYWORD4>DROP_BASELINE</KEYWORD4>
-			<KEYWORD4>DROP_BASELINE_TEMPLATE</KEYWORD4>
-			<KEYWORD4>DROP_BY_CAT</KEYWORD4>
-			<KEYWORD4>DROP_CAPTURE</KEYWORD4>
-			<KEYWORD4>DROP_CHAIN</KEYWORD4>
-			<KEYWORD4>DROP_CHAIN_RULE</KEYWORD4>
-			<KEYWORD4>DROP_CHAIN_STEP</KEYWORD4>
-			<KEYWORD4>DROP_CHANGE_SET</KEYWORD4>
-			<KEYWORD4>DROP_CHANGE_SOURCE</KEYWORD4>
-			<KEYWORD4>DROP_CHANGE_TABLE</KEYWORD4>
-			<KEYWORD4>DROP_COMPARISON</KEYWORD4>
-			<KEYWORD4>DROP_CONDITIONS_TABLE</KEYWORD4>
-			<KEYWORD4>DROP_CREDENTIAL</KEYWORD4>
-			<KEYWORD4>DROP_DAD</KEYWORD4>
-			<KEYWORD4>DROP_DIAGNOSIS_TASK</KEYWORD4>
-			<KEYWORD4>DROP_ELEMENT</KEYWORD4>
-			<KEYWORD4>DROP_EVALUATION_CONTEXT</KEYWORD4>
-			<KEYWORD4>DROP_EVENT_STRUCT</KEYWORD4>
-			<KEYWORD4>DROP_EXPFIL_INDEXES</KEYWORD4>
-			<KEYWORD4>DROP_EXTENDED_STATS</KEYWORD4>
-			<KEYWORD4>DROP_FILE</KEYWORD4>
-			<KEYWORD4>DROP_FILE_GROUP</KEYWORD4>
-			<KEYWORD4>DROP_GROUPED_POLICY</KEYWORD4>
-			<KEYWORD4>DROP_INTERFACE</KEYWORD4>
-			<KEYWORD4>DROP_JOB</KEYWORD4>
-			<KEYWORD4>DROP_JOB_CLASS</KEYWORD4>
-			<KEYWORD4>DROP_MODEL</KEYWORD4>
-			<KEYWORD4>DROP_OBJECT_DEPENDENCY</KEYWORD4>
-			<KEYWORD4>DROP_POLICY</KEYWORD4>
-			<KEYWORD4>DROP_POLICY_CONTEXT</KEYWORD4>
-			<KEYWORD4>DROP_PROGRAM</KEYWORD4>
-			<KEYWORD4>DROP_PROGRAM_ARGUMENT</KEYWORD4>
-			<KEYWORD4>DROP_PROPAGATION</KEYWORD4>
-			<KEYWORD4>DROP_QUEUE</KEYWORD4>
-			<KEYWORD4>DROP_QUEUE_TABLE</KEYWORD4>
-			<KEYWORD4>DROP_REWRITE_EQUIVALENCE</KEYWORD4>
-			<KEYWORD4>DROP_RULE</KEYWORD4>
-			<KEYWORD4>DROP_RULE_CLASS</KEYWORD4>
-			<KEYWORD4>DROP_RULE_SET</KEYWORD4>
-			<KEYWORD4>DROP_SCHEDULE</KEYWORD4>
-			<KEYWORD4>DROP_SNAPSHOT_RANGE</KEYWORD4>
-			<KEYWORD4>DROP_SQL_PATCH</KEYWORD4>
-			<KEYWORD4>DROP_SQL_PLAN_BASELINE</KEYWORD4>
-			<KEYWORD4>DROP_SQL_PROFILE</KEYWORD4>
-			<KEYWORD4>DROP_SQLSET</KEYWORD4>
-			<KEYWORD4>DROP_STAT_TABLE</KEYWORD4>
-			<KEYWORD4>DROP_SUBSCRIPTION</KEYWORD4>
-			<KEYWORD4>DROP_TRANSFORMATION</KEYWORD4>
-			<KEYWORD4>DROP_TUNING_TASK</KEYWORD4>
-			<KEYWORD4>DROP_UNUSED</KEYWORD4>
-			<KEYWORD4>DROP_VERSION</KEYWORD4>
-			<KEYWORD4>DROP_WINDOW</KEYWORD4>
-			<KEYWORD4>DROP_WINDOW_GROUP</KEYWORD4>
-			<KEYWORD4>DROPPREFERENCES</KEYWORD4>
-			<KEYWORD4>DROPREPOSITORYXMLINDEX</KEYWORD4>
-			<KEYWORD4>DUMP_ORPHAN_KEYS</KEYWORD4>
-			<KEYWORD4>EM</KEYWORD4>
-			<KEYWORD4>EMPHASIS</KEYWORD4>
-			<KEYWORD4>ENABLE</KEYWORD4>
-			<KEYWORD4>ENABLE_AT_SYSTEM_CHANGE_NUMBER</KEYWORD4>
-			<KEYWORD4>ENABLE_AT_TIME</KEYWORD4>
-			<KEYWORD4>ENABLE_BREAKPOINT</KEYWORD4>
-			<KEYWORD4>ENABLE_DB_ACCESS</KEYWORD4>
-			<KEYWORD4>ENABLE_GROUPED_POLICY</KEYWORD4>
-			<KEYWORD4>ENABLE_HIERARCHY</KEYWORD4>
-			<KEYWORD4>ENABLE_JMS_TYPES</KEYWORD4>
-			<KEYWORD4>ENABLE_JOB</KEYWORD4>
-			<KEYWORD4>ENABLE_POLICY</KEYWORD4>
-			<KEYWORD4>ENABLE_PROPAGATION_SCHEDULE</KEYWORD4>
-			<KEYWORD4>ENABLE_REG</KEYWORD4>
-			<KEYWORD4>ENABLETRANSLATION</KEYWORD4>
-			<KEYWORD4>ENCRYPT</KEYWORD4>
-			<KEYWORD4>END_DETACHED_JOB_RUN</KEYWORD4>
-			<KEYWORD4>END_LOGMNR</KEYWORD4>
-			<KEYWORD4>END_REQUEST</KEYWORD4>
-			<KEYWORD4>END_RESPONSE</KEYWORD4>
-			<KEYWORD4>END_TABLE_REORGANIZATION</KEYWORD4>
-			<KEYWORD4>ENQUEUE</KEYWORD4>
-			<KEYWORD4>ENQUEUE_ARRAY</KEYWORD4>
-			<KEYWORD4>ENQUOTE_LITERAL</KEYWORD4>
-			<KEYWORD4>ENQUOTE_NAME</KEYWORD4>
-			<KEYWORD4>EPC_TO_ORACLE_SCHEME</KEYWORD4>
-			<KEYWORD4>ERASE</KEYWORD4>
-			<KEYWORD4>ESCAPE</KEYWORD4>
-			<KEYWORD4>ESCAPE_REFERENCE</KEYWORD4>
-			<KEYWORD4>ESCAPE_SC</KEYWORD4>
-			<KEYWORD4>ESCAPE_URL</KEYWORD4>
-			<KEYWORD4>ESTIMATE_CPU_UNITS</KEYWORD4>
-			<KEYWORD4>ESTIMATE_MVIEW_SIZE</KEYWORD4>
-			<KEYWORD4>EVALUATE</KEYWORD4>
-			<KEYWORD4>EVALUATE_CALENDAR_STRING</KEYWORD4>
-			<KEYWORD4>EVALUATE_RUNNING_CHAIN</KEYWORD4>
-			<KEYWORD4>EVOLVE_SQL_PLAN_BASELINE</KEYWORD4>
-			<KEYWORD4>EXACT_TEXT_SIGNATURES</KEYWORD4>
-			<KEYWORD4>EXEC_DDL_STATEMENT</KEYWORD4>
-			<KEYWORD4>EXECUTE</KEYWORD4>
-			<KEYWORD4>EXECUTE_ALL_ERRORS</KEYWORD4>
-			<KEYWORD4>EXECUTE_AND_FETCH</KEYWORD4>
-			<KEYWORD4>EXECUTE_DIAGNOSIS_TASK</KEYWORD4>
-			<KEYWORD4>EXECUTE_ERROR</KEYWORD4>
-			<KEYWORD4>EXECUTE_IMMEDIATE</KEYWORD4>
-			<KEYWORD4>EXECUTE_NON_QUERY</KEYWORD4>
-			<KEYWORD4>EXECUTE_TASK</KEYWORD4>
-			<KEYWORD4>EXISTSRESOURCE</KEYWORD4>
-			<KEYWORD4>EXPAND_MESSAGE</KEYWORD4>
-			<KEYWORD4>EXPLAIN</KEYWORD4>
-			<KEYWORD4>EXPLAIN_MVIEW</KEYWORD4>
-			<KEYWORD4>EXPLAIN_REWRITE</KEYWORD4>
-			<KEYWORD4>EXPLAIN_SQL_TESTCASE</KEYWORD4>
-			<KEYWORD4>EXPONENTIAL_DIST_FIT</KEYWORD4>
-			<KEYWORD4>EXPORT_AWR</KEYWORD4>
-			<KEYWORD4>EXPORT_COLUMN_STATS</KEYWORD4>
-			<KEYWORD4>EXPORT_DATABASE_PREFS</KEYWORD4>
-			<KEYWORD4>EXPORT_DATABASE_STATS</KEYWORD4>
-			<KEYWORD4>EXPORT_DICTIONARY_STATS</KEYWORD4>
-			<KEYWORD4>EXPORT_FIXED_OBJECTS_STATS</KEYWORD4>
-			<KEYWORD4>EXPORT_INDEX_STATS</KEYWORD4>
-			<KEYWORD4>EXPORT_MODEL</KEYWORD4>
-			<KEYWORD4>EXPORT_PENDING_STATS</KEYWORD4>
-			<KEYWORD4>EXPORT_SCHEMA_PREFS</KEYWORD4>
-			<KEYWORD4>EXPORT_SCHEMA_STATS</KEYWORD4>
-			<KEYWORD4>EXPORT_SQL_TESTCASE</KEYWORD4>
-			<KEYWORD4>EXPORT_SQL_TESTCASE_DIR_BY_INC</KEYWORD4>
-			<KEYWORD4>EXPORT_SQL_TESTCASE_DIR_BY_TXT</KEYWORD4>
-			<KEYWORD4>EXPORT_SYSTEM_STATS</KEYWORD4>
-			<KEYWORD4>EXPORT_TABLE_PREFS</KEYWORD4>
-			<KEYWORD4>EXPORT_TABLE_STATS</KEYWORD4>
-			<KEYWORD4>EXTEND_EVENT_STRUCT</KEYWORD4>
-			<KEYWORD4>EXTEND_WINDOW</KEYWORD4>
-			<KEYWORD4>FCLOSE</KEYWORD4>
-			<KEYWORD4>FCLOSE_ALL</KEYWORD4>
-			<KEYWORD4>FCOPY</KEYWORD4>
-			<KEYWORD4>FETCH_ROW</KEYWORD4>
-			<KEYWORD4>FETCH_ROWS</KEYWORD4>
-			<KEYWORD4>FFLUSH</KEYWORD4>
-			<KEYWORD4>FGETATTR</KEYWORD4>
-			<KEYWORD4>FGETPOS</KEYWORD4>
-			<KEYWORD4>FI_HORIZONTAL</KEYWORD4>
-			<KEYWORD4>FI_TRANSACTIONAL</KEYWORD4>
-			<KEYWORD4>FILECLOSE</KEYWORD4>
-			<KEYWORD4>FILECLOSEALL</KEYWORD4>
-			<KEYWORD4>FILEEXISTS</KEYWORD4>
-			<KEYWORD4>FILEGETNAME</KEYWORD4>
-			<KEYWORD4>FILEISOPEN</KEYWORD4>
-			<KEYWORD4>FILEOPEN</KEYWORD4>
-			<KEYWORD4>FINDENTITY</KEYWORD4>
-			<KEYWORD4>FINDNOTATION</KEYWORD4>
-			<KEYWORD4>FINISH_CAPTURE</KEYWORD4>
-			<KEYWORD4>FINISH_REDEF_TABLE</KEYWORD4>
-			<KEYWORD4>FIX_CORRUPT_BLOCKS</KEYWORD4>
-			<KEYWORD4>FLUSH</KEYWORD4>
-			<KEYWORD4>FLUSH_DATABASE_MONITORING_INFO</KEYWORD4>
-			<KEYWORD4>FONTCLOSE</KEYWORD4>
-			<KEYWORD4>FONTOPEN</KEYWORD4>
-			<KEYWORD4>FOPEN</KEYWORD4>
-			<KEYWORD4>FOPEN_NCHAR</KEYWORD4>
-			<KEYWORD4>FORMAT</KEYWORD4>
-			<KEYWORD4>FORMAT_CALL_STACK</KEYWORD4>
-			<KEYWORD4>FORMAT_CELL</KEYWORD4>
-			<KEYWORD4>FORMAT_ERROR_BACKTRACE</KEYWORD4>
-			<KEYWORD4>FORMAT_ERROR_STACK</KEYWORD4>
-			<KEYWORD4>FORMAT_MESSAGE</KEYWORD4>
-			<KEYWORD4>FORMAT_REPORT</KEYWORD4>
-			<KEYWORD4>FORMCHECKBOX</KEYWORD4>
-			<KEYWORD4>FORMCLOSE</KEYWORD4>
-			<KEYWORD4>FORMFILE</KEYWORD4>
-			<KEYWORD4>FORMHIDDEN</KEYWORD4>
-			<KEYWORD4>FORMIMAGE</KEYWORD4>
-			<KEYWORD4>FORMOPEN</KEYWORD4>
-			<KEYWORD4>FORMPASSWORD</KEYWORD4>
-			<KEYWORD4>FORMRADIO</KEYWORD4>
-			<KEYWORD4>FORMRESET</KEYWORD4>
-			<KEYWORD4>FORMSELECTCLOSE</KEYWORD4>
-			<KEYWORD4>FORMSELECTOPEN</KEYWORD4>
-			<KEYWORD4>FORMSELECTOPTION</KEYWORD4>
-			<KEYWORD4>FORMSUBMIT</KEYWORD4>
-			<KEYWORD4>FORMTEXT</KEYWORD4>
-			<KEYWORD4>FORMTEXTAREA</KEYWORD4>
-			<KEYWORD4>FORMTEXTAREA2</KEYWORD4>
-			<KEYWORD4>FORMTEXTAREACLOSE</KEYWORD4>
-			<KEYWORD4>FORMTEXTAREAOPEN</KEYWORD4>
-			<KEYWORD4>FORMTEXTAREAOPEN2</KEYWORD4>
-			<KEYWORD4>FRAGMENT_DELETE</KEYWORD4>
-			<KEYWORD4>FRAGMENT_INSERT</KEYWORD4>
-			<KEYWORD4>FRAGMENT_MOVE</KEYWORD4>
-			<KEYWORD4>FRAGMENT_REPLACE</KEYWORD4>
-			<KEYWORD4>FRAME</KEYWORD4>
-			<KEYWORD4>FRAMESETCLOSE</KEYWORD4>
-			<KEYWORD4>FRAMESETOPEN</KEYWORD4>
-			<KEYWORD4>FREE_BLOCKS</KEYWORD4>
-			<KEYWORD4>FREE_UNUSED_USER_MEMORY</KEYWORD4>
-			<KEYWORD4>FREEDOCFRAG</KEYWORD4>
-			<KEYWORD4>FREEDOCUMENT</KEYWORD4>
-			<KEYWORD4>FREENODE</KEYWORD4>
-			<KEYWORD4>FREEPROCESSOR</KEYWORD4>
-			<KEYWORD4>FREERESOURCE</KEYWORD4>
-			<KEYWORD4>FREESTYLESHEET</KEYWORD4>
-			<KEYWORD4>FREETEMPORARY</KEYWORD4>
-			<KEYWORD4>FREMOVE</KEYWORD4>
-			<KEYWORD4>FRENAME</KEYWORD4>
-			<KEYWORD4>FSEEK</KEYWORD4>
-			<KEYWORD4>GATHER_DATABASE_STATS</KEYWORD4>
-			<KEYWORD4>GATHER_DICTIONARY_STATS</KEYWORD4>
-			<KEYWORD4>GATHER_FIXED_OBJECTS_STATS</KEYWORD4>
-			<KEYWORD4>GATHER_INDEX_STATS</KEYWORD4>
-			<KEYWORD4>GATHER_SCHEMA_STATS</KEYWORD4>
-			<KEYWORD4>GATHER_SYSTEM_STATS</KEYWORD4>
-			<KEYWORD4>GATHER_TABLE_STATS</KEYWORD4>
-			<KEYWORD4>GENERATE_JOB_NAME</KEYWORD4>
-			<KEYWORD4>GENERATE_STATS</KEYWORD4>
-			<KEYWORD4>GENERATEBEAN</KEYWORD4>
-			<KEYWORD4>GENERATESCHEMA</KEYWORD4>
-			<KEYWORD4>GENERATESCHEMAS</KEYWORD4>
-			<KEYWORD4>GET</KEYWORD4>
-			<KEYWORD4>GET_ACLOID</KEYWORD4>
-			<KEYWORD4>GET_AGGREGATE_VALUE</KEYWORD4>
-			<KEYWORD4>GET_ALL</KEYWORD4>
-			<KEYWORD4>GET_ALL_DAD_ATTRIBUTES</KEYWORD4>
-			<KEYWORD4>GET_ALL_DAD_MAPPINGS</KEYWORD4>
-			<KEYWORD4>GET_ALL_GLOBAL_ATTRIBUTES</KEYWORD4>
-			<KEYWORD4>GET_ASSOCIATION_RULES</KEYWORD4>
-			<KEYWORD4>GET_ATTRIBUTE</KEYWORD4>
-			<KEYWORD4>GET_AUTHENTICATION</KEYWORD4>
-			<KEYWORD4>GET_BODY_CHARSET</KEYWORD4>
-			<KEYWORD4>GET_CAPTURE_INFO</KEYWORD4>
-			<KEYWORD4>GET_CATEGORY</KEYWORD4>
-			<KEYWORD4>GET_CATEGORY_ID</KEYWORD4>
-			<KEYWORD4>GET_CGI_ENV</KEYWORD4>
-			<KEYWORD4>GET_CLIENT_ATTRIBUTES</KEYWORD4>
-			<KEYWORD4>GET_CLIENT_HOSTNAME</KEYWORD4>
-			<KEYWORD4>GET_CLIENT_IP</KEYWORD4>
-			<KEYWORD4>GET_COLUMN_STATS</KEYWORD4>
-			<KEYWORD4>GET_COMMON_TIME_ZONES</KEYWORD4>
-			<KEYWORD4>GET_COMPONENT</KEYWORD4>
-			<KEYWORD4>GET_COMPONENTS</KEYWORD4>
-			<KEYWORD4>GET_COOKIE_COUNT</KEYWORD4>
-			<KEYWORD4>GET_COOKIE_SUPPORT</KEYWORD4>
-			<KEYWORD4>GET_COOKIES</KEYWORD4>
-			<KEYWORD4>GET_CPU_TIME</KEYWORD4>
-			<KEYWORD4>GET_DAD_ATTRIBUTE</KEYWORD4>
-			<KEYWORD4>GET_DAD_LIST</KEYWORD4>
-			<KEYWORD4>GET_DDLOPER</KEYWORD4>
-			<KEYWORD4>GET_DEFAULT_CHARSET</KEYWORD4>
-			<KEYWORD4>GET_DEFAULT_ISO_CURRENCY</KEYWORD4>
-			<KEYWORD4>GET_DEFAULT_LINGUISTIC_SORT</KEYWORD4>
-			<KEYWORD4>GET_DEFAULT_SETTINGS</KEYWORD4>
-			<KEYWORD4>GET_DEPENDENCY</KEYWORD4>
-			<KEYWORD4>GET_DETAILED_EXCP_SUPPORT</KEYWORD4>
-			<KEYWORD4>GET_DETAILED_SQLCODE</KEYWORD4>
-			<KEYWORD4>GET_DETAILED_SQLERRM</KEYWORD4>
-			<KEYWORD4>GET_DUMPFILE_INFO</KEYWORD4>
-			<KEYWORD4>GET_ENCODINGS</KEYWORD4>
-			<KEYWORD4>GET_ERROR_MESSAGE</KEYWORD4>
-			<KEYWORD4>GET_ETAG</KEYWORD4>
-			<KEYWORD4>GET_EXPRESSION</KEYWORD4>
-			<KEYWORD4>GET_EXPRSET_STATS</KEYWORD4>
-			<KEYWORD4>GET_FILE</KEYWORD4>
-			<KEYWORD4>GET_FOLLOW_REDIRECT</KEYWORD4>
-			<KEYWORD4>GET_FREQUENT_ITEMSETS</KEYWORD4>
-			<KEYWORD4>GET_GLOBAL_ATTRIBUTE</KEYWORD4>
-			<KEYWORD4>GET_HASH_VALUE</KEYWORD4>
-			<KEYWORD4>GET_HEADER</KEYWORD4>
-			<KEYWORD4>GET_HEADER_BY_NAME</KEYWORD4>
-			<KEYWORD4>GET_HEADER_COUNT</KEYWORD4>
-			<KEYWORD4>GET_HOST_ADDRESS</KEYWORD4>
-			<KEYWORD4>GET_HOST_NAME</KEYWORD4>
-			<KEYWORD4>GET_INDEX_STATS</KEYWORD4>
-			<KEYWORD4>GET_INDEXES</KEYWORD4>
-			<KEYWORD4>GET_INFORMATION</KEYWORD4>
-			<KEYWORD4>GET_JAVA_LOGGING_LEVEL</KEYWORD4>
-			<KEYWORD4>GET_LEVEL</KEYWORD4>
-			<KEYWORD4>GET_LINE</KEYWORD4>
-			<KEYWORD4>GET_LINE_MAP</KEYWORD4>
-			<KEYWORD4>GET_LINE_NCHAR</KEYWORD4>
-			<KEYWORD4>GET_LINES</KEYWORD4>
-			<KEYWORD4>GET_LOCAL_LANGUAGES</KEYWORD4>
-			<KEYWORD4>GET_LOCAL_LINGUISTIC_SORTS</KEYWORD4>
-			<KEYWORD4>GET_LOCAL_TERRITORIES</KEYWORD4>
-			<KEYWORD4>GET_LOCAL_TIME_ZONES</KEYWORD4>
-			<KEYWORD4>GET_MESSAGE</KEYWORD4>
-			<KEYWORD4>GET_MESSAGE_TRACKING</KEYWORD4>
-			<KEYWORD4>GET_MODEL_COST_MATRIX</KEYWORD4>
-			<KEYWORD4>GET_MODEL_DETAILS_ABN</KEYWORD4>
-			<KEYWORD4>GET_MODEL_DETAILS_AI</KEYWORD4>
-			<KEYWORD4>GET_MODEL_DETAILS_GLM</KEYWORD4>
-			<KEYWORD4>GET_MODEL_DETAILS_GLOBAL</KEYWORD4>
-			<KEYWORD4>GET_MODEL_DETAILS_KM</KEYWORD4>
-			<KEYWORD4>GET_MODEL_DETAILS_NB</KEYWORD4>
-			<KEYWORD4>GET_MODEL_DETAILS_NMF</KEYWORD4>
-			<KEYWORD4>GET_MODEL_DETAILS_OC</KEYWORD4>
-			<KEYWORD4>GET_MODEL_DETAILS_SVM</KEYWORD4>
-			<KEYWORD4>GET_MODEL_DETAILS_XML</KEYWORD4>
-			<KEYWORD4>GET_MODEL_SETTINGS</KEYWORD4>
-			<KEYWORD4>GET_MODEL_SIGNATURE</KEYWORD4>
-			<KEYWORD4>GET_MODEL_TRANSFORMATIONS</KEYWORD4>
-			<KEYWORD4>GET_MORE_SOURCE</KEYWORD4>
-			<KEYWORD4>GET_NEXT_HIT</KEYWORD4>
-			<KEYWORD4>GET_OWA_SERVICE_PATH</KEYWORD4>
-			<KEYWORD4>GET_P1_RESOURCES</KEYWORD4>
-			<KEYWORD4>GET_PARAM</KEYWORD4>
-			<KEYWORD4>GET_PARAMETER_VALUE</KEYWORD4>
-			<KEYWORD4>GET_PASSWORD</KEYWORD4>
-			<KEYWORD4>GET_PERSISTENT_CONN_COUNT</KEYWORD4>
-			<KEYWORD4>GET_PERSISTENT_CONN_SUPPORT</KEYWORD4>
-			<KEYWORD4>GET_PERSISTENT_CONNS</KEYWORD4>
-			<KEYWORD4>GET_PLSQL_LOGGING_LEVEL</KEYWORD4>
-			<KEYWORD4>GET_PLSQL_TRACE_LEVEL</KEYWORD4>
-			<KEYWORD4>GET_POST_PROCESSED_SOURCE</KEYWORD4>
-			<KEYWORD4>GET_PREFS</KEYWORD4>
-			<KEYWORD4>GET_PROCEDURE</KEYWORD4>
-			<KEYWORD4>GET_PROXY</KEYWORD4>
-			<KEYWORD4>GET_QUERY</KEYWORD4>
-			<KEYWORD4>GET_RAW</KEYWORD4>
-			<KEYWORD4>GET_REC_ATTRIBUTES</KEYWORD4>
-			<KEYWORD4>GET_REPLAY_INFO</KEYWORD4>
-			<KEYWORD4>GET_REPORT</KEYWORD4>
-			<KEYWORD4>GET_RESPONSE</KEYWORD4>
-			<KEYWORD4>GET_RESPONSE_ERROR_CHECK</KEYWORD4>
-			<KEYWORD4>GET_ROWID</KEYWORD4>
-			<KEYWORD4>GET_RUN_REPORT</KEYWORD4>
-			<KEYWORD4>GET_RUNTIME_INFO</KEYWORD4>
-			<KEYWORD4>GET_SCHEDULER_ATTRIBUTE</KEYWORD4>
-			<KEYWORD4>GET_SCHEME_NAMES</KEYWORD4>
-			<KEYWORD4>GET_SCN_MAPPING</KEYWORD4>
-			<KEYWORD4>GET_SESSION_TIMEOUT</KEYWORD4>
-			<KEYWORD4>GET_SQL</KEYWORD4>
-			<KEYWORD4>GET_STATS_HISTORY_AVAILABILITY</KEYWORD4>
-			<KEYWORD4>GET_STATS_HISTORY_RETENTION</KEYWORD4>
-			<KEYWORD4>GET_STATUS</KEYWORD4>
-			<KEYWORD4>GET_STORAGE_LIMIT</KEYWORD4>
-			<KEYWORD4>GET_STREAMS_NAME</KEYWORD4>
-			<KEYWORD4>GET_STREAMS_TYPE</KEYWORD4>
-			<KEYWORD4>GET_SYSTEM_CHANGE_NUMBER</KEYWORD4>
-			<KEYWORD4>GET_SYSTEM_STATS</KEYWORD4>
-			<KEYWORD4>GET_TABLE_STATS</KEYWORD4>
-			<KEYWORD4>GET_TAG</KEYWORD4>
-			<KEYWORD4>GET_TASK_REPORT</KEYWORD4>
-			<KEYWORD4>GET_TASK_SCRIPT</KEYWORD4>
-			<KEYWORD4>GET_TDT_XML</KEYWORD4>
-			<KEYWORD4>GET_TEXT</KEYWORD4>
-			<KEYWORD4>GET_TEXT_NCHAR</KEYWORD4>
-			<KEYWORD4>GET_THRESHOLD</KEYWORD4>
-			<KEYWORD4>GET_TIME</KEYWORD4>
-			<KEYWORD4>GET_TIMEOUT</KEYWORD4>
-			<KEYWORD4>GET_TIMEOUT_BEHAVIOUR</KEYWORD4>
-			<KEYWORD4>GET_TRANSFER_TIMEOUT</KEYWORD4>
-			<KEYWORD4>GET_TRANSFORM_LIST</KEYWORD4>
-			<KEYWORD4>GET_TRANSLATION</KEYWORD4>
-			<KEYWORD4>GET_USER_ID</KEYWORD4>
-			<KEYWORD4>GET_USERID</KEYWORD4>
-			<KEYWORD4>GET_VALIDATOR</KEYWORD4>
-			<KEYWORD4>GET_VALUE</KEYWORD4>
-			<KEYWORD4>GET_VALUE_RAW</KEYWORD4>
-			<KEYWORD4>GET_VERSION</KEYWORD4>
-			<KEYWORD4>GET_WARNING_SETTING_CAT</KEYWORD4>
-			<KEYWORD4>GET_WARNING_SETTING_NUM</KEYWORD4>
-			<KEYWORD4>GET_WARNING_SETTING_STRING</KEYWORD4>
-			<KEYWORD4>GET_WATERMARK</KEYWORD4>
-			<KEYWORD4>GET_X</KEYWORD4>
-			<KEYWORD4>GET_xxx</KEYWORD4>
-			<KEYWORD4>GET_Y</KEYWORD4>
-			<KEYWORD4>GETACL</KEYWORD4>
-			<KEYWORD4>GETACLDOCFROMRES</KEYWORD4>
-			<KEYWORD4>GETACLDOCUMENT</KEYWORD4>
-			<KEYWORD4>GETAPPLICATIONDATA</KEYWORD4>
-			<KEYWORD4>GETATTRIBUTE</KEYWORD4>
-			<KEYWORD4>GETATTRIBUTENODE</KEYWORD4>
-			<KEYWORD4>GETATTRIBUTES</KEYWORD4>
-			<KEYWORD4>GETAUTHOR</KEYWORD4>
-			<KEYWORD4>GETBASEDOCUMENT</KEYWORD4>
-			<KEYWORD4>GETCHARACTERSET</KEYWORD4>
-			<KEYWORD4>GETCHILDNODES</KEYWORD4>
-			<KEYWORD4>GETCHILDOID</KEYWORD4>
-			<KEYWORD4>GETCHILDRENBYTAGNAME</KEYWORD4>
-			<KEYWORD4>GETCHILDRESPATHS</KEYWORD4>
-			<KEYWORD4>GETCHUNKSIZE</KEYWORD4>
-			<KEYWORD4>GETCOMMENT</KEYWORD4>
-			<KEYWORD4>GETCONTENTBLOB</KEYWORD4>
-			<KEYWORD4>GETCONTENTCLOB</KEYWORD4>
-			<KEYWORD4>GETCONTENTREF</KEYWORD4>
-			<KEYWORD4>GETCONTENTSBLOBBYRESID</KEYWORD4>
-			<KEYWORD4>GETCONTENTSCLOBBYRESID</KEYWORD4>
-			<KEYWORD4>GETCONTENTSXMLBYRESID</KEYWORD4>
-			<KEYWORD4>GETCONTENTTYPE</KEYWORD4>
-			<KEYWORD4>GETCONTENTVARCHAR2</KEYWORD4>
-			<KEYWORD4>GETCONTENTXML</KEYWORD4>
-			<KEYWORD4>GETCONTENTXMLREF</KEYWORD4>
-			<KEYWORD4>GETCONTENTXMLTYPE</KEYWORD4>
-			<KEYWORD4>GETCREATIONDATE</KEYWORD4>
-			<KEYWORD4>GETCREATOR</KEYWORD4>
-			<KEYWORD4>GETCURRENTUSER</KEYWORD4>
-			<KEYWORD4>GETCUSTOMMETADATA</KEYWORD4>
-			<KEYWORD4>GETDATA</KEYWORD4>
-			<KEYWORD4>GETDISPLAYNAME</KEYWORD4>
-			<KEYWORD4>GETDOCTYPE</KEYWORD4>
-			<KEYWORD4>GETDOCUMENTELEMENT</KEYWORD4>
-			<KEYWORD4>GETELEMENTSBYTAGNAME</KEYWORD4>
-			<KEYWORD4>GETENTITIES</KEYWORD4>
-			<KEYWORD4>GETEVENT</KEYWORD4>
-			<KEYWORD4>GETFIRST</KEYWORD4>
-			<KEYWORD4>GETFIRSTCHILD</KEYWORD4>
-			<KEYWORD4>GETFTPPORT</KEYWORD4>
-			<KEYWORD4>GETHANDLERLIST</KEYWORD4>
-			<KEYWORD4>GETHTTPPORT</KEYWORD4>
-			<KEYWORD4>GETIMPLEMENTATION</KEYWORD4>
-			<KEYWORD4>GETINTERFACE</KEYWORD4>
-			<KEYWORD4>GETLANGUAGE</KEYWORD4>
-			<KEYWORD4>GETLASTCHILD</KEYWORD4>
-			<KEYWORD4>GETLASTMODIFIER</KEYWORD4>
-			<KEYWORD4>GETLENGTH</KEYWORD4>
-			<KEYWORD4>GETLINK</KEYWORD4>
-			<KEYWORD4>GETLISTENERENDPOINT</KEYWORD4>
-			<KEYWORD4>GETLISTENERS</KEYWORD4>
-			<KEYWORD4>GETLOCK</KEYWORD4>
-			<KEYWORD4>GETLOCKTOKEN</KEYWORD4>
-			<KEYWORD4>GETMODIFICATIONDATE</KEYWORD4>
-			<KEYWORD4>GETNAME</KEYWORD4>
-			<KEYWORD4>GETNAMEDITEM</KEYWORD4>
-			<KEYWORD4>GETNEXTSIBLING</KEYWORD4>
-			<KEYWORD4>GETNODENAME</KEYWORD4>
-			<KEYWORD4>GETNODETYPE</KEYWORD4>
-			<KEYWORD4>GETNODEVALUE</KEYWORD4>
-			<KEYWORD4>GETNOTATIONNAME</KEYWORD4>
-			<KEYWORD4>GETNOTATIONS</KEYWORD4>
-			<KEYWORD4>GETNUMROWSPROCESSED</KEYWORD4>
-			<KEYWORD4>GETOLDRESOURCE</KEYWORD4>
-			<KEYWORD4>GETOPENACCESSMODE</KEYWORD4>
-			<KEYWORD4>GETOPENDENYMODE</KEYWORD4>
-			<KEYWORD4>GETOPTIONS</KEYWORD4>
-			<KEYWORD4>GETOUTPUTSTREAM</KEYWORD4>
-			<KEYWORD4>GETOWNER</KEYWORD4>
-			<KEYWORD4>GETOWNERDOCUMENT</KEYWORD4>
-			<KEYWORD4>GETOWNERELEMENT</KEYWORD4>
-			<KEYWORD4>GETPARAMETER</KEYWORD4>
-			<KEYWORD4>GETPARENT</KEYWORD4>
-			<KEYWORD4>GETPARENTNAME</KEYWORD4>
-			<KEYWORD4>GETPARENTNODE</KEYWORD4>
-			<KEYWORD4>GETPARENTOID</KEYWORD4>
-			<KEYWORD4>GETPARENTPATH</KEYWORD4>
-			<KEYWORD4>GETPAT</KEYWORD4>
-			<KEYWORD4>GETPATH</KEYWORD4>
-			<KEYWORD4>GETPREDECESSORS</KEYWORD4>
-			<KEYWORD4>GETPREDSBYRESID</KEYWORD4>
-			<KEYWORD4>GETPREFIX</KEYWORD4>
-			<KEYWORD4>GETPREVIOUSSIBLING</KEYWORD4>
-			<KEYWORD4>GETPUBLICID</KEYWORD4>
-			<KEYWORD4>GETQUALIFIEDNAME</KEYWORD4>
-			<KEYWORD4>GETREFCOUNT</KEYWORD4>
-			<KEYWORD4>GETREPOSITORYRESCONFIG</KEYWORD4>
-			<KEYWORD4>GETREPOSITORYRESCONFIGPATHS</KEYWORD4>
-			<KEYWORD4>GETRESCONFIG</KEYWORD4>
-			<KEYWORD4>GETRESCONFIGPATHS</KEYWORD4>
-			<KEYWORD4>GETRESOID</KEYWORD4>
-			<KEYWORD4>GETRESOURCE</KEYWORD4>
-			<KEYWORD4>GETRESOURCEBYRESID</KEYWORD4>
-			<KEYWORD4>GETSCHEMA</KEYWORD4>
-			<KEYWORD4>GETSCHEMANODE</KEYWORD4>
-			<KEYWORD4>GETSOURCE</KEYWORD4>
-			<KEYWORD4>GETSPECIFIED</KEYWORD4>
-			<KEYWORD4>GETSTANDALONE</KEYWORD4>
-			<KEYWORD4>GETSUCCESSORS</KEYWORD4>
-			<KEYWORD4>GETSUCCSBYRESID</KEYWORD4>
-			<KEYWORD4>GETSYSTEMID</KEYWORD4>
-			<KEYWORD4>GETTAGNAME</KEYWORD4>
-			<KEYWORD4>GETTARGET</KEYWORD4>
-			<KEYWORD4>GETTOKENTABLEINFOBYTABLESPACE</KEYWORD4>
-			<KEYWORD4>GETUPDATEBYTECOUNT</KEYWORD4>
-			<KEYWORD4>GETUPDATEBYTEOFFSET</KEYWORD4>
-			<KEYWORD4>GETVALUE</KEYWORD4>
-			<KEYWORD4>GETVERSION</KEYWORD4>
-			<KEYWORD4>GETVERSIONID</KEYWORD4>
-			<KEYWORD4>GETXDB_TABLESPACE</KEYWORD4>
-			<KEYWORD4>GETXDBEVENT</KEYWORD4>
-			<KEYWORD4>GETXML</KEYWORD4>
-			<KEYWORD4>GETXMLTYPE</KEYWORD4>
-			<KEYWORD4>GRANT_ADMIN_PRIVILEGE</KEYWORD4>
-			<KEYWORD4>GRANT_OBJECT_PRIVILEGE</KEYWORD4>
-			<KEYWORD4>GRANT_PRIVILEGE</KEYWORD4>
-			<KEYWORD4>GRANT_QUEUE_PRIVILEGE</KEYWORD4>
-			<KEYWORD4>GRANT_REMOTE_ADMIN_ACCESS</KEYWORD4>
-			<KEYWORD4>GRANT_SWITCH_CONSUMER_GROUP</KEYWORD4>
-			<KEYWORD4>GRANT_SYSTEM_PRIVILEGE</KEYWORD4>
-			<KEYWORD4>HASACLCHANGED</KEYWORD4>
-			<KEYWORD4>HASATTRIBUTE</KEYWORD4>
-			<KEYWORD4>HASATTRIBUTES</KEYWORD4>
-			<KEYWORD4>HASAUTHORCHANGED</KEYWORD4>
-			<KEYWORD4>HASBLOBCONTENT</KEYWORD4>
-			<KEYWORD4>HASCHANGED</KEYWORD4>
-			<KEYWORD4>HASCHARACTERSETCHANGED</KEYWORD4>
-			<KEYWORD4>HASCHARCONTENT</KEYWORD4>
-			<KEYWORD4>HASCHILDNODES</KEYWORD4>
-			<KEYWORD4>HASCOMMENTCHANGED</KEYWORD4>
-			<KEYWORD4>HASCONTENTCHANGED</KEYWORD4>
-			<KEYWORD4>HASCONTENTTYPECHANGED</KEYWORD4>
-			<KEYWORD4>HASCREATIONDATECHANGED</KEYWORD4>
-			<KEYWORD4>HASCREATORCHANGED</KEYWORD4>
-			<KEYWORD4>HASCUSTOMMETADATACHANGED</KEYWORD4>
-			<KEYWORD4>HASDISPLAYNAMECHANGED</KEYWORD4>
-			<KEYWORD4>HASFEATURE</KEYWORD4>
-			<KEYWORD4>HASH</KEYWORD4>
-			<KEYWORD4>HASLANGUAGECHANGED</KEYWORD4>
-			<KEYWORD4>HASLASTMODIFIERCHANGED</KEYWORD4>
-			<KEYWORD4>HASMODIFICATIONDATECHANGED</KEYWORD4>
-			<KEYWORD4>HASOWNERCHANGED</KEYWORD4>
-			<KEYWORD4>HASREFCOUNTCHANGED</KEYWORD4>
-			<KEYWORD4>HASVERSIONIDCHANGED</KEYWORD4>
-			<KEYWORD4>HASXMLCONTENT</KEYWORD4>
-			<KEYWORD4>HASXMLREFERENCE</KEYWORD4>
-			<KEYWORD4>HEADCLOSE</KEYWORD4>
-			<KEYWORD4>HEADER</KEYWORD4>
-			<KEYWORD4>HEADOPEN</KEYWORD4>
-			<KEYWORD4>HELP</KEYWORD4>
-			<KEYWORD4>HR</KEYWORD4>
-			<KEYWORD4>HTMLCLOSE</KEYWORD4>
-			<KEYWORD4>HTMLOPEN</KEYWORD4>
-			<KEYWORD4>HTTP_HEADER_CLOSE</KEYWORD4>
-			<KEYWORD4>I_AM_A_REFRESH</KEYWORD4>
-			<KEYWORD4>IMG</KEYWORD4>
-			<KEYWORD4>IMG2</KEYWORD4>
-			<KEYWORD4>IMPLEMENT_TASK</KEYWORD4>
-			<KEYWORD4>IMPLEMENT_TUNING_TASK</KEYWORD4>
-			<KEYWORD4>IMPORT_AWR</KEYWORD4>
-			<KEYWORD4>IMPORT_COLUMN_STATS</KEYWORD4>
-			<KEYWORD4>IMPORT_DATABASE_PREFS</KEYWORD4>
-			<KEYWORD4>IMPORT_DATABASE_STATS</KEYWORD4>
-			<KEYWORD4>IMPORT_DICTIONARY_STATS</KEYWORD4>
-			<KEYWORD4>IMPORT_FIXED_OBJECTS_STATS</KEYWORD4>
-			<KEYWORD4>IMPORT_INDEX_STATS</KEYWORD4>
-			<KEYWORD4>IMPORT_MODEL</KEYWORD4>
-			<KEYWORD4>IMPORT_SCHEMA_PREFS</KEYWORD4>
-			<KEYWORD4>IMPORT_SCHEMA_STATS</KEYWORD4>
-			<KEYWORD4>IMPORT_SQLWKLD_SCHEMA</KEYWORD4>
-			<KEYWORD4>IMPORT_SQLWKLD_SQLCACHE</KEYWORD4>
-			<KEYWORD4>IMPORT_SQLWKLD_STS</KEYWORD4>
-			<KEYWORD4>IMPORT_SQLWKLD_SUMADV</KEYWORD4>
-			<KEYWORD4>IMPORT_SQLWKLD_USER</KEYWORD4>
-			<KEYWORD4>IMPORT_SYSTEM_STATS</KEYWORD4>
-			<KEYWORD4>IMPORT_TABLE_PREFS</KEYWORD4>
-			<KEYWORD4>IMPORT_TABLE_STATS</KEYWORD4>
-			<KEYWORD4>IMPORT_XML</KEYWORD4>
-			<KEYWORD4>IMPORTNODE</KEYWORD4>
-			<KEYWORD4>INCIDENTID_2_SQL</KEYWORD4>
-			<KEYWORD4>INCLUDE_EXTRA_ATTRIBUTE</KEYWORD4>
-			<KEYWORD4>INDEX_PARAMETERS</KEYWORD4>
-			<KEYWORD4>INITIALIZE</KEYWORD4>
-			<KEYWORD4>INITIALIZE_REPLAY</KEYWORD4>
-			<KEYWORD4>INITIATE_FS_FAILOVER</KEYWORD4>
-			<KEYWORD4>INPLACEEVOLVE</KEYWORD4>
-			<KEYWORD4>INSERT_AUTOBIN_NUM_EQWIDTH</KEYWORD4>
-			<KEYWORD4>INSERT_BIN_CAT_FREQ</KEYWORD4>
-			<KEYWORD4>INSERT_BIN_NUM_EQWIDTH</KEYWORD4>
-			<KEYWORD4>INSERT_BIN_NUM_QTILE</KEYWORD4>
-			<KEYWORD4>INSERT_BIN_SUPER</KEYWORD4>
-			<KEYWORD4>INSERT_CLIP_TRIM_TAIL</KEYWORD4>
-			<KEYWORD4>INSERT_CLIP_WINSOR_TAIL</KEYWORD4>
-			<KEYWORD4>INSERT_FINDING_DIRECTIVE</KEYWORD4>
-			<KEYWORD4>INSERT_MISS_CAT_MODE</KEYWORD4>
-			<KEYWORD4>INSERT_MISS_NUM_MEAN</KEYWORD4>
-			<KEYWORD4>INSERT_NORM_LIN_MINMAX</KEYWORD4>
-			<KEYWORD4>INSERT_NORM_LIN_SCALE</KEYWORD4>
-			<KEYWORD4>INSERT_NORM_LIN_ZSCORE</KEYWORD4>
-			<KEYWORD4>INSERT_PARAMETER_DIRECTIVE</KEYWORD4>
-			<KEYWORD4>INSERT_SEGMENT_DIRECTIVE</KEYWORD4>
-			<KEYWORD4>INSERT_SQL_DIRECTIVE</KEYWORD4>
-			<KEYWORD4>INSERTBEFORE</KEYWORD4>
-			<KEYWORD4>INSERTDATA</KEYWORD4>
-			<KEYWORD4>INSTANCE</KEYWORD4>
-			<KEYWORD4>INSTANTIATE_TABLE</KEYWORD4>
-			<KEYWORD4>INSTR</KEYWORD4>
-			<KEYWORD4>INTERNAL_VERSION_CHECK</KEYWORD4>
-			<KEYWORD4>INTERRUPT_ANALYSIS_TASK</KEYWORD4>
-			<KEYWORD4>INTERRUPT_DIAGNOSIS_TASK</KEYWORD4>
-			<KEYWORD4>INTERRUPT_TASK</KEYWORD4>
-			<KEYWORD4>INTERRUPT_TUNING_TASK</KEYWORD4>
-			<KEYWORD4>INTERVAL</KEYWORD4>
-			<KEYWORD4>INVALIDATE</KEYWORD4>
-			<KEYWORD4>IS_APPLY_SERVER</KEYWORD4>
-			<KEYWORD4>IS_CLUSTER_DATABASE</KEYWORD4>
-			<KEYWORD4>IS_HIERARCHY_ENABLED</KEYWORD4>
-			<KEYWORD4>IS_LOCATOR</KEYWORD4>
-			<KEYWORD4>IS_OPEN</KEYWORD4>
-			<KEYWORD4>IS_ROLE_ENABLED</KEYWORD4>
-			<KEYWORD4>IS_SESSION_ALIVE</KEYWORD4>
-			<KEYWORD4>IS_TRIGGER_FIRE_ONCE</KEYWORD4>
-			<KEYWORD4>ISFOLDER</KEYWORD4>
-			<KEYWORD4>ISINDEX</KEYWORD4>
-			<KEYWORD4>ISNULL</KEYWORD4>
-			<KEYWORD4>ISOPEN</KEYWORD4>
-			<KEYWORD4>ISTEMPORARY</KEYWORD4>
-			<KEYWORD4>ITALIC</KEYWORD4>
-			<KEYWORD4>ITEM</KEYWORD4>
-			<KEYWORD4>KBD</KEYWORD4>
-			<KEYWORD4>KEEP</KEYWORD4>
-			<KEYWORD4>KEYBOARD</KEYWORD4>
-			<KEYWORD4>LAPACK_GBSV</KEYWORD4>
-			<KEYWORD4>LAPACK_GEES</KEYWORD4>
-			<KEYWORD4>LAPACK_GEEV</KEYWORD4>
-			<KEYWORD4>LAPACK_GELS</KEYWORD4>
-			<KEYWORD4>LAPACK_GESDD</KEYWORD4>
-			<KEYWORD4>LAPACK_GESV</KEYWORD4>
-			<KEYWORD4>LAPACK_GESVD</KEYWORD4>
-			<KEYWORD4>LAPACK_GTSV</KEYWORD4>
-			<KEYWORD4>LAPACK_PBSV</KEYWORD4>
-			<KEYWORD4>LAPACK_POSV</KEYWORD4>
-			<KEYWORD4>LAPACK_PPSV</KEYWORD4>
-			<KEYWORD4>LAPACK_PTSV</KEYWORD4>
-			<KEYWORD4>LAPACK_SBEV</KEYWORD4>
-			<KEYWORD4>LAPACK_SBEVD</KEYWORD4>
-			<KEYWORD4>LAPACK_SPEV</KEYWORD4>
-			<KEYWORD4>LAPACK_SPEVD</KEYWORD4>
-			<KEYWORD4>LAPACK_SPSV</KEYWORD4>
-			<KEYWORD4>LAPACK_STEV</KEYWORD4>
-			<KEYWORD4>LAPACK_STEVD</KEYWORD4>
-			<KEYWORD4>LAPACK_SYEV</KEYWORD4>
-			<KEYWORD4>LAPACK_SYEVD</KEYWORD4>
-			<KEYWORD4>LAPACK_SYSV</KEYWORD4>
-			<KEYWORD4>LAST_ERROR_POSITION</KEYWORD4>
-			<KEYWORD4>LAST_ROW_COUNT</KEYWORD4>
-			<KEYWORD4>LAST_ROW_ID</KEYWORD4>
-			<KEYWORD4>LAST_SQL_FUNCTION_CODE</KEYWORD4>
-			<KEYWORD4>LCR_TO_XML</KEYWORD4>
-			<KEYWORD4>LENGTH</KEYWORD4>
-			<KEYWORD4>LINE</KEYWORD4>
-			<KEYWORD4>LINK</KEYWORD4>
-			<KEYWORD4>LINKREL</KEYWORD4>
-			<KEYWORD4>LINKREV</KEYWORD4>
-			<KEYWORD4>LIST_CONTEXT</KEYWORD4>
-			<KEYWORD4>LISTEN</KEYWORD4>
-			<KEYWORD4>LISTHEADER</KEYWORD4>
-			<KEYWORD4>LISTINGCLOSE</KEYWORD4>
-			<KEYWORD4>LISTINGOPEN</KEYWORD4>
-			<KEYWORD4>LISTITEM</KEYWORD4>
-			<KEYWORD4>LISTPRINT</KEYWORD4>
-			<KEYWORD4>LOAD_PLANS_FROM_CURSOR_CACHE</KEYWORD4>
-			<KEYWORD4>LOAD_PLANS_FROM_SQLSET</KEYWORD4>
-			<KEYWORD4>LOAD_SQLSET</KEYWORD4>
-			<KEYWORD4>LOADBLOBFROMFILE</KEYWORD4>
-			<KEYWORD4>LOADCLOBFROMFILE</KEYWORD4>
-			<KEYWORD4>LOADFROMFILE</KEYWORD4>
-			<KEYWORD4>LOCAL_TRANSACTION_ID</KEYWORD4>
-			<KEYWORD4>LOCK_MAP</KEYWORD4>
-			<KEYWORD4>LOCK_OBJECT</KEYWORD4>
-			<KEYWORD4>LOCK_PARTITION_STATS</KEYWORD4>
-			<KEYWORD4>LOCK_SCHEMA_STATS</KEYWORD4>
-			<KEYWORD4>LOCK_TABLE_STATS</KEYWORD4>
-			<KEYWORD4>LOCKRESOURCE</KEYWORD4>
-			<KEYWORD4>LOG_ENTRY</KEYWORD4>
-			<KEYWORD4>LZ_COMPRESS_ADD</KEYWORD4>
-			<KEYWORD4>LZ_UNCOMPRESS_CLOSE</KEYWORD4>
-			<KEYWORD4>LZ_UNCOMPRESS_EXTRACT</KEYWORD4>
-			<KEYWORD4>LZ_UNCOMPRESS_OPEN</KEYWORD4>
-			<KEYWORD4>MAC</KEYWORD4>
-			<KEYWORD4>MAILTO</KEYWORD4>
-			<KEYWORD4>MAINTAIN_GLOBAL</KEYWORD4>
-			<KEYWORD4>MAINTAIN_SCHEMAS</KEYWORD4>
-			<KEYWORD4>MAINTAIN_SIMPLE_TABLESPACE</KEYWORD4>
-			<KEYWORD4>MAINTAIN_SIMPLE_TTS</KEYWORD4>
-			<KEYWORD4>MAINTAIN_TABLES</KEYWORD4>
-			<KEYWORD4>MAINTAIN_TABLESPACES</KEYWORD4>
-			<KEYWORD4>MAINTAIN_TTS</KEYWORD4>
-			<KEYWORD4>MAKE_DATA_BLOCK_ADDRESS</KEYWORD4>
-			<KEYWORD4>MAKEATTR</KEYWORD4>
-			<KEYWORD4>MAKECDATASECTION</KEYWORD4>
-			<KEYWORD4>MAKECHARACTERDATA</KEYWORD4>
-			<KEYWORD4>MAKECOMMENT</KEYWORD4>
-			<KEYWORD4>MAKEDOCUMENT</KEYWORD4>
-			<KEYWORD4>MAKEDOCUMENTFRAGMENT</KEYWORD4>
-			<KEYWORD4>MAKEDOCUMENTTYPE</KEYWORD4>
-			<KEYWORD4>MAKEELEMENT</KEYWORD4>
-			<KEYWORD4>MAKEENTITY</KEYWORD4>
-			<KEYWORD4>MAKEENTITYREFERENCE</KEYWORD4>
-			<KEYWORD4>MAKENODE</KEYWORD4>
-			<KEYWORD4>MAKENOTATION</KEYWORD4>
-			<KEYWORD4>MAKEPROCESSINGINSTRUCTION</KEYWORD4>
-			<KEYWORD4>MAKETEXT</KEYWORD4>
-			<KEYWORD4>MAKEVERSIONED</KEYWORD4>
-			<KEYWORD4>MAP_ALL</KEYWORD4>
-			<KEYWORD4>MAP_CHARSET</KEYWORD4>
-			<KEYWORD4>MAP_DAD</KEYWORD4>
-			<KEYWORD4>MAP_ELEMENT</KEYWORD4>
-			<KEYWORD4>MAP_FILE</KEYWORD4>
-			<KEYWORD4>MAP_FROM_SHORT_LANGUAGE</KEYWORD4>
-			<KEYWORD4>MAP_LANGUAGE_FROM_ISO</KEYWORD4>
-			<KEYWORD4>MAP_LOCALE_TO_ISO</KEYWORD4>
-			<KEYWORD4>MAP_OBJECT</KEYWORD4>
-			<KEYWORD4>MAP_PRIMARY_SCN</KEYWORD4>
-			<KEYWORD4>MAP_TERRITORY_FROM_ISO</KEYWORD4>
-			<KEYWORD4>MAP_TO_SHORT_LANGUAGE</KEYWORD4>
-			<KEYWORD4>MAPCLOSE</KEYWORD4>
-			<KEYWORD4>MAPOPEN</KEYWORD4>
-			<KEYWORD4>MARK_RECOMMENDATION</KEYWORD4>
-			<KEYWORD4>MATCH</KEYWORD4>
-			<KEYWORD4>MEMORY_REPORT</KEYWORD4>
-			<KEYWORD4>MENULISTCLOSE</KEYWORD4>
-			<KEYWORD4>MENULISTOPEN</KEYWORD4>
-			<KEYWORD4>MERGE_STREAMS</KEYWORD4>
-			<KEYWORD4>MERGE_STREAMS_JOB</KEYWORD4>
-			<KEYWORD4>MERGEXLIFF</KEYWORD4>
-			<KEYWORD4>META</KEYWORD4>
-			<KEYWORD4>METADATA_FILTER</KEYWORD4>
-			<KEYWORD4>METADATA_REMAP</KEYWORD4>
-			<KEYWORD4>METADATA_TRANSFORM</KEYWORD4>
-			<KEYWORD4>MIGRATE_QUEUE_TABLE</KEYWORD4>
-			<KEYWORD4>MIME_HEADER</KEYWORD4>
-			<KEYWORD4>MIMEHEADER_DECODE</KEYWORD4>
-			<KEYWORD4>MIMEHEADER_ENCODE</KEYWORD4>
-			<KEYWORD4>MINE_VALUE</KEYWORD4>
-			<KEYWORD4>Mining</KEYWORD4>
-			<KEYWORD4>MODIFY_BASELINE_WINDOW_SIZE</KEYWORD4>
-			<KEYWORD4>MODIFY_OPERATOR_LIST</KEYWORD4>
-			<KEYWORD4>MODIFY_SERVICE</KEYWORD4>
-			<KEYWORD4>MODIFY_SNAPSHOT_SETTINGS</KEYWORD4>
-			<KEYWORD4>MODIFY_TRANSFORMATION</KEYWORD4>
-			<KEYWORD4>MOVEXDB_TABLESPACE</KEYWORD4>
-			<KEYWORD4>MV_CUBE_ADVICE</KEYWORD4>
-			<KEYWORD4>NAME_RESOLVE</KEYWORD4>
-			<KEYWORD4>NAME_TOKENIZE</KEYWORD4>
-			<KEYWORD4>NAMESPACEIDTABLE</KEYWORD4>
-			<KEYWORD4>NEW_LINE</KEYWORD4>
-			<KEYWORD4>NEW_REG_START</KEYWORD4>
-			<KEYWORD4>NEWCONTEXT</KEYWORD4>
-			<KEYWORD4>NEWDOMDOCUMENT</KEYWORD4>
-			<KEYWORD4>NEWPROCESSOR</KEYWORD4>
-			<KEYWORD4>NEWSTYLESHEET</KEYWORD4>
-			<KEYWORD4>NEXT_DATE</KEYWORD4>
-			<KEYWORD4>NEXT_ITEM_TYPE</KEYWORD4>
-			<KEYWORD4>NL</KEYWORD4>
-			<KEYWORD4>NOBR</KEYWORD4>
-			<KEYWORD4>NOFRAMESCLOSE</KEYWORD4>
-			<KEYWORD4>NOFRAMESOPEN</KEYWORD4>
-			<KEYWORD4>NOOP</KEYWORD4>
-			<KEYWORD4>NORMAL</KEYWORD4>
-			<KEYWORD4>NORMAL_DIST_FIT</KEYWORD4>
-			<KEYWORD4>NORMALIZE</KEYWORD4>
-			<KEYWORD4>NVARRAY_ADD</KEYWORD4>
-			<KEYWORD4>NVARRAY_FIND_NAME</KEYWORD4>
-			<KEYWORD4>NVARRAY_FIND_NAME_TYPE</KEYWORD4>
-			<KEYWORD4>NVARRAY_GET</KEYWORD4>
-			<KEYWORD4>NVARRAY_GET_BOOLEAN</KEYWORD4>
-			<KEYWORD4>NVARRAY_GET_BYTE</KEYWORD4>
-			<KEYWORD4>NVARRAY_GET_DATE</KEYWORD4>
-			<KEYWORD4>NVARRAY_GET_DOUBLE</KEYWORD4>
-			<KEYWORD4>NVARRAY_GET_FLOAT</KEYWORD4>
-			<KEYWORD4>NVARRAY_GET_INTEGER</KEYWORD4>
-			<KEYWORD4>NVARRAY_GET_LONG</KEYWORD4>
-			<KEYWORD4>NVARRAY_GET_RAW</KEYWORD4>
-			<KEYWORD4>NVARRAY_GET_SHORT</KEYWORD4>
-			<KEYWORD4>NVARRAY_GET_TEXT</KEYWORD4>
-			<KEYWORD4>OBJECT_DEPENDENT_SEGMENTS</KEYWORD4>
-			<KEYWORD4>OBJECT_GROWTH_TREND</KEYWORD4>
-			<KEYWORD4>OLD_CURRENT_SCHEMA</KEYWORD4>
-			<KEYWORD4>OLD_CURRENT_USER</KEYWORD4>
-			<KEYWORD4>OLISTCLOSE</KEYWORD4>
-			<KEYWORD4>OLISTOPEN</KEYWORD4>
-			<KEYWORD4>ONLINE_INDEX_CLEAN</KEYWORD4>
-			<KEYWORD4>OPEN</KEYWORD4>
-			<KEYWORD4>OPEN_CONNECTION</KEYWORD4>
-			<KEYWORD4>OPEN_CURSOR</KEYWORD4>
-			<KEYWORD4>OPEN_WINDOW</KEYWORD4>
-			<KEYWORD4>OPENW</KEYWORD4>
-			<KEYWORD4>OVERLAY</KEYWORD4>
-			<KEYWORD4>OVERRIDE_PRIORITY</KEYWORD4>
-			<KEYWORD4>PACK_MESSAGE</KEYWORD4>
-			<KEYWORD4>PACK_STGTAB_BASELINE</KEYWORD4>
-			<KEYWORD4>PACK_STGTAB_SQLPATCH</KEYWORD4>
-			<KEYWORD4>PACK_STGTAB_SQLPROF</KEYWORD4>
-			<KEYWORD4>PACK_STGTAB_SQLSET</KEYWORD4>
-			<KEYWORD4>PARA</KEYWORD4>
-			<KEYWORD4>PARAGRAPH</KEYWORD4>
-			<KEYWORD4>PARAM</KEYWORD4>
-			<KEYWORD4>PARSE</KEYWORD4>
-			<KEYWORD4>PATHIDTABLE</KEYWORD4>
-			<KEYWORD4>PAUSE_REPLAY</KEYWORD4>
-			<KEYWORD4>PING</KEYWORD4>
-			<KEYWORD4>PLAINTEXT</KEYWORD4>
-			<KEYWORD4>PLSQL_TRACE_VERSION</KEYWORD4>
-			<KEYWORD4>PMARKER</KEYWORD4>
-			<KEYWORD4>POISSON_DIST_FIT</KEYWORD4>
-			<KEYWORD4>PORT_STRING</KEYWORD4>
-			<KEYWORD4>POST</KEYWORD4>
-			<KEYWORD4>POST_INSTANTIATION_SETUP</KEYWORD4>
-			<KEYWORD4>PRE_INSTANTIATION_SETUP</KEYWORD4>
-			<KEYWORD4>PRECLOSE</KEYWORD4>
-			<KEYWORD4>PREDICT</KEYWORD4>
-			<KEYWORD4>PREOPEN</KEYWORD4>
-			<KEYWORD4>PREPARE_COLUMN_VALUES</KEYWORD4>
-			<KEYWORD4>PREPARE_COLUMN_VALUES_NVARCHAR2</KEYWORD4>
-			<KEYWORD4>PREPARE_COLUMN_VALUES_ROWID</KEYWORD4>
-			<KEYWORD4>PREPARE_FOR_NEW_PRIMARY</KEYWORD4>
-			<KEYWORD4>PREPARE_GLOBAL_INSTANTIATION</KEYWORD4>
-			<KEYWORD4>PREPARE_REPLAY</KEYWORD4>
-			<KEYWORD4>PREPARE_SCHEMA_INSTANTIATION</KEYWORD4>
-			<KEYWORD4>PREPARE_SYNC_INSTANTIATION</KEYWORD4>
-			<KEYWORD4>PREPARE_TABLE_INSTANTIATION</KEYWORD4>
-			<KEYWORD4>PRINT</KEYWORD4>
-			<KEYWORD4>PRINT_BACKTRACE</KEYWORD4>
-			<KEYWORD4>PRINT_CGI_ENV</KEYWORD4>
-			<KEYWORD4>PRINT_INSTANTIATIONS</KEYWORD4>
-			<KEYWORD4>PRINT_MULTI</KEYWORD4>
-			<KEYWORD4>PRINT_POST_PROCESSED_SOURCE</KEYWORD4>
-			<KEYWORD4>PRINT_ROW_LIST</KEYWORD4>
-			<KEYWORD4>PRINTS</KEYWORD4>
-			<KEYWORD4>PRN</KEYWORD4>
-			<KEYWORD4>PROBE_VERSION</KEYWORD4>
-			<KEYWORD4>PROCESS_CAPTURE</KEYWORD4>
-			<KEYWORD4>PROCESS_RULES</KEYWORD4>
-			<KEYWORD4>PROCESSLINKS</KEYWORD4>
-			<KEYWORD4>PROFILE</KEYWORD4>
-			<KEYWORD4>PS</KEYWORD4>
-			<KEYWORD4>PUBLISH_PENDING_STATS</KEYWORD4>
-			<KEYWORD4>PULL_SIMPLE_TABLESPACE</KEYWORD4>
-			<KEYWORD4>PULL_TABLESPACES</KEYWORD4>
-			<KEYWORD4>PURGE</KEYWORD4>
-			<KEYWORD4>PURGE_CHANGE_SET</KEYWORD4>
-			<KEYWORD4>PURGE_CHANGE_TABLE</KEYWORD4>
-			<KEYWORD4>PURGE_COMPARISON</KEYWORD4>
-			<KEYWORD4>PURGE_DIRECT_LOAD_LOG</KEYWORD4>
-			<KEYWORD4>PURGE_EVENTS</KEYWORD4>
-			<KEYWORD4>PURGE_FILE_GROUP</KEYWORD4>
-			<KEYWORD4>PURGE_LOG</KEYWORD4>
-			<KEYWORD4>PURGE_LOST_DB_ENTRY</KEYWORD4>
-			<KEYWORD4>PURGE_MIXED</KEYWORD4>
-			<KEYWORD4>PURGE_MVIEW_FROM_LOG</KEYWORD4>
-			<KEYWORD4>PURGE_QUEUE_TABLE</KEYWORD4>
-			<KEYWORD4>PURGE_SESSION</KEYWORD4>
-			<KEYWORD4>PURGE_SOURCE_CATALOG</KEYWORD4>
-			<KEYWORD4>PURGE_STATS</KEYWORD4>
-			<KEYWORD4>PURGE_WINDOW</KEYWORD4>
-			<KEYWORD4>PURGELDAPCACHE</KEYWORD4>
-			<KEYWORD4>PURGERESOURCEMETADATA</KEYWORD4>
-			<KEYWORD4>PURGESCHEMA</KEYWORD4>
-			<KEYWORD4>PUT</KEYWORD4>
-			<KEYWORD4>PUT_FILE</KEYWORD4>
-			<KEYWORD4>PUT_LINE</KEYWORD4>
-			<KEYWORD4>PUT_LINE_NCHAR</KEYWORD4>
-			<KEYWORD4>PUT_NCHAR</KEYWORD4>
-			<KEYWORD4>PUT_RAW</KEYWORD4>
-			<KEYWORD4>PUTF</KEYWORD4>
-			<KEYWORD4>PUTF_NCHAR</KEYWORD4>
-			<KEYWORD4>QNAMEIDTABLE</KEYWORD4>
-			<KEYWORD4>QUALIFIED_SQL_NAME</KEYWORD4>
-			<KEYWORD4>QUEUE_SUBSCRIBERS</KEYWORD4>
-			<KEYWORD4>QUICK_TUNE</KEYWORD4>
-			<KEYWORD4>QUOTED_PRINTABLE_DECODE</KEYWORD4>
-			<KEYWORD4>QUOTED_PRINTABLE_ENCODE</KEYWORD4>
-			<KEYWORD4>RANDOM</KEYWORD4>
-			<KEYWORD4>RANDOMBYTES</KEYWORD4>
-			<KEYWORD4>RANDOMINTEGER</KEYWORD4>
-			<KEYWORD4>RANDOMNUMBER</KEYWORD4>
-			<KEYWORD4>RANK_APPLY</KEYWORD4>
-			<KEYWORD4>RAW_TO_CHAR</KEYWORD4>
-			<KEYWORD4>RAW_TO_NCHAR</KEYWORD4>
-			<KEYWORD4>RCPT</KEYWORD4>
-			<KEYWORD4>READ</KEYWORD4>
-			<KEYWORD4>READ_CLIENT_INFO</KEYWORD4>
-			<KEYWORD4>READ_LINE</KEYWORD4>
-			<KEYWORD4>READ_MODULE</KEYWORD4>
-			<KEYWORD4>READ_ONLY</KEYWORD4>
-			<KEYWORD4>READ_RAW</KEYWORD4>
-			<KEYWORD4>READ_TEXT</KEYWORD4>
-			<KEYWORD4>READ_WRITE</KEYWORD4>
-			<KEYWORD4>READ2CLOB</KEYWORD4>
-			<KEYWORD4>REBUILD</KEYWORD4>
-			<KEYWORD4>REBUILD_FREELISTS</KEYWORD4>
-			<KEYWORD4>REBUILDHIERARCHICALINDEX</KEYWORD4>
-			<KEYWORD4>RECEIVE_MESSAGE</KEYWORD4>
-			<KEYWORD4>RECHECK</KEYWORD4>
-			<KEYWORD4>RECOMP_PARALLEL</KEYWORD4>
-			<KEYWORD4>RECOMP_SERIAL</KEYWORD4>
-			<KEYWORD4>RECOVER_OPERATION</KEYWORD4>
-			<KEYWORD4>REDIRECT_URL</KEYWORD4>
-			<KEYWORD4>REFRESH</KEYWORD4>
-			<KEYWORD4>REFRESH_ALL_MVIEWS</KEYWORD4>
-			<KEYWORD4>REFRESH_CATEGORY</KEYWORD4>
-			<KEYWORD4>REFRESH_DEPENDENT</KEYWORD4>
-			<KEYWORD4>REFRESH_GROUPED_POLICY</KEYWORD4>
-			<KEYWORD4>REFRESH_POLICY</KEYWORD4>
-			<KEYWORD4>REG_END</KEYWORD4>
-			<KEYWORD4>REGISTER</KEYWORD4>
-			<KEYWORD4>REGISTER_DEPENDENT_OBJECT</KEYWORD4>
-			<KEYWORD4>REGISTER_FOREIGN_QUEUE</KEYWORD4>
-			<KEYWORD4>REGISTER_MVIEW</KEYWORD4>
-			<KEYWORD4>REGISTERSCHEMA</KEYWORD4>
-			<KEYWORD4>REGISTERTOKENTABLESET</KEYWORD4>
-			<KEYWORD4>REGISTERURI</KEYWORD4>
-			<KEYWORD4>RELEASE</KEYWORD4>
-			<KEYWORD4>REMAP_CONNECTION</KEYWORD4>
-			<KEYWORD4>REMAP_STGTAB_SQLPROF</KEYWORD4>
-			<KEYWORD4>REMAP_STGTAB_SQLSET</KEYWORD4>
-			<KEYWORD4>REMOVE</KEYWORD4>
-			<KEYWORD4>REMOVE_AGENT</KEYWORD4>
-			<KEYWORD4>REMOVE_CATEGORY</KEYWORD4>
-			<KEYWORD4>REMOVE_COLORED_SQL</KEYWORD4>
-			<KEYWORD4>REMOVE_COST_MATRIX</KEYWORD4>
-			<KEYWORD4>REMOVE_EVENT_QUEUE_SUBSCRIBER</KEYWORD4>
-			<KEYWORD4>REMOVE_FILE</KEYWORD4>
-			<KEYWORD4>REMOVE_JOB</KEYWORD4>
-			<KEYWORD4>REMOVE_LOGFILE</KEYWORD4>
-			<KEYWORD4>REMOVE_MSGSYSTEM_LINK</KEYWORD4>
-			<KEYWORD4>REMOVE_OPTION</KEYWORD4>
-			<KEYWORD4>REMOVE_PIPE</KEYWORD4>
-			<KEYWORD4>REMOVE_PROXY</KEYWORD4>
-			<KEYWORD4>REMOVE_QUEUE</KEYWORD4>
-			<KEYWORD4>REMOVE_RULE</KEYWORD4>
-			<KEYWORD4>REMOVE_SCHEME</KEYWORD4>
-			<KEYWORD4>REMOVE_SQLSET_REFERENCE</KEYWORD4>
-			<KEYWORD4>REMOVE_STREAMS_CONFIGURATION</KEYWORD4>
-			<KEYWORD4>REMOVE_SUBSCRIBER</KEYWORD4>
-			<KEYWORD4>REMOVE_WINDOW_GROUP_MEMBER</KEYWORD4>
-			<KEYWORD4>REMOVEALL</KEYWORD4>
-			<KEYWORD4>REMOVEATTRIBUTE</KEYWORD4>
-			<KEYWORD4>REMOVEATTRIBUTENODE</KEYWORD4>
-			<KEYWORD4>REMOVECHILD</KEYWORD4>
-			<KEYWORD4>REMOVENAMEDITEM</KEYWORD4>
-			<KEYWORD4>REMOVEPARAM</KEYWORD4>
-			<KEYWORD4>RENAME_BASELINE</KEYWORD4>
-			<KEYWORD4>RENAME_COLUMN</KEYWORD4>
-			<KEYWORD4>RENAME_MODEL</KEYWORD4>
-			<KEYWORD4>RENAME_SCHEMA</KEYWORD4>
-			<KEYWORD4>RENAME_TABLE</KEYWORD4>
-			<KEYWORD4>RENAMERESOURCE</KEYWORD4>
-			<KEYWORD4>REPLACECHILD</KEYWORD4>
-			<KEYWORD4>REPLACEDATA</KEYWORD4>
-			<KEYWORD4>REPORT</KEYWORD4>
-			<KEYWORD4>REPORT_ANALYSIS_TASK</KEYWORD4>
-			<KEYWORD4>REPORT_AUTO_TUNING_TASK</KEYWORD4>
-			<KEYWORD4>REPORT_DIAGNOSIS_TASK</KEYWORD4>
-			<KEYWORD4>REPORT_SQL_MONITOR</KEYWORD4>
-			<KEYWORD4>REPORT_TUNING_TASK</KEYWORD4>
-			<KEYWORD4>REQUEST</KEYWORD4>
-			<KEYWORD4>REQUEST_PIECES</KEYWORD4>
-			<KEYWORD4>RESET_ANALYSIS_TASK</KEYWORD4>
-			<KEYWORD4>RESET_BUFFER</KEYWORD4>
-			<KEYWORD4>RESET_DIAGNOSIS_TASK</KEYWORD4>
-			<KEYWORD4>RESET_GLOBAL_PREF_DEFAULTS</KEYWORD4>
-			<KEYWORD4>RESET_JOB</KEYWORD4>
-			<KEYWORD4>RESET_JOB_ARGUMENT_VALUE</KEYWORD4>
-			<KEYWORD4>RESET_PACKAGE</KEYWORD4>
-			<KEYWORD4>RESET_PARAM_DEFAULTS</KEYWORD4>
-			<KEYWORD4>RESET_SESSION</KEYWORD4>
-			<KEYWORD4>RESET_SUBSCRIBER</KEYWORD4>
-			<KEYWORD4>RESET_TASK</KEYWORD4>
-			<KEYWORD4>RESET_TUNING_TASK</KEYWORD4>
-			<KEYWORD4>RESETPARAMS</KEYWORD4>
-			<KEYWORD4>RESOLVENAMESPACEPREFIX</KEYWORD4>
-			<KEYWORD4>RESTARTQUERY</KEYWORD4>
-			<KEYWORD4>RESTORE</KEYWORD4>
-			<KEYWORD4>RESTORE_DEFAULTS</KEYWORD4>
-			<KEYWORD4>RESTORE_DICTIONARY_STATS</KEYWORD4>
-			<KEYWORD4>RESTORE_FIXED_OBJECTS_STATS</KEYWORD4>
-			<KEYWORD4>RESTORE_SCHEMA_STATS</KEYWORD4>
-			<KEYWORD4>RESTORE_SYSTEM_STATS</KEYWORD4>
-			<KEYWORD4>RESTORE_TABLE_STATS</KEYWORD4>
-			<KEYWORD4>RESUME_ANALYSIS_TASK</KEYWORD4>
-			<KEYWORD4>RESUME_DIAGNOSIS_TASK</KEYWORD4>
-			<KEYWORD4>RESUME_REPLAY</KEYWORD4>
-			<KEYWORD4>RESUME_TUNING_TASK</KEYWORD4>
-			<KEYWORD4>REVERSE</KEYWORD4>
-			<KEYWORD4>REVOKE_ADMIN_PRIVILEGE</KEYWORD4>
-			<KEYWORD4>REVOKE_OBJECT_PRIVILEGE</KEYWORD4>
-			<KEYWORD4>REVOKE_PRIVILEGE</KEYWORD4>
-			<KEYWORD4>REVOKE_QUEUE_PRIVILEGE</KEYWORD4>
-			<KEYWORD4>REVOKE_REMOTE_ADMIN_ACCESS</KEYWORD4>
-			<KEYWORD4>REVOKE_SWITCH_CONSUMER_GROUP</KEYWORD4>
-			<KEYWORD4>REVOKE_SYSTEM_PRIVILEGE</KEYWORD4>
-			<KEYWORD4>ROLLBACK</KEYWORD4>
-			<KEYWORD4>ROLLBACK_FORCE</KEYWORD4>
-			<KEYWORD4>ROLLBACK_SAVEPOINT</KEYWORD4>
-			<KEYWORD4>ROWID_BLOCK_NUMBER</KEYWORD4>
-			<KEYWORD4>ROWID_CREATE</KEYWORD4>
-			<KEYWORD4>ROWID_INFO</KEYWORD4>
-			<KEYWORD4>ROWID_OBJECT</KEYWORD4>
-			<KEYWORD4>ROWID_RELATIVE_FNO</KEYWORD4>
-			<KEYWORD4>ROWID_ROW_NUMBER</KEYWORD4>
-			<KEYWORD4>ROWID_TO_ABSOLUTE_FNO</KEYWORD4>
-			<KEYWORD4>ROWID_TO_EXTENDED</KEYWORD4>
-			<KEYWORD4>ROWID_TO_RESTRICTED</KEYWORD4>
-			<KEYWORD4>ROWID_TYPE</KEYWORD4>
-			<KEYWORD4>ROWID_VERIFY</KEYWORD4>
-			<KEYWORD4>RUN</KEYWORD4>
-			<KEYWORD4>RUN_CHAIN</KEYWORD4>
-			<KEYWORD4>RUN_CHECK</KEYWORD4>
-			<KEYWORD4>RUN_JOB</KEYWORD4>
-			<KEYWORD4>S</KEYWORD4>
-			<KEYWORD4>SAMPLE</KEYWORD4>
-			<KEYWORD4>SAVE</KEYWORD4>
-			<KEYWORD4>SAVEPOINT</KEYWORD4>
-			<KEYWORD4>SCHEDULE_PROPAGATION</KEYWORD4>
-			<KEYWORD4>SCHEMA_NAME</KEYWORD4>
-			<KEYWORD4>SCRIPT</KEYWORD4>
-			<KEYWORD4>SCRIPT_TUNING_TASK</KEYWORD4>
-			<KEYWORD4>SEED</KEYWORD4>
-			<KEYWORD4>SEGMENT_CORRUPT</KEYWORD4>
-			<KEYWORD4>SEGMENT_DROP_CORRUPT</KEYWORD4>
-			<KEYWORD4>SEGMENT_DUMP</KEYWORD4>
-			<KEYWORD4>SEGMENT_FIX_STATUS</KEYWORD4>
-			<KEYWORD4>SEGMENT_VERIFY</KEYWORD4>
-			<KEYWORD4>SELECT_BASELINE_METRICS</KEYWORD4>
-			<KEYWORD4>SELECT_CURSOR_CACHE</KEYWORD4>
-			<KEYWORD4>SELECT_OBJECT</KEYWORD4>
-			<KEYWORD4>SELECT_SQL_TRACE</KEYWORD4>
-			<KEYWORD4>SELECT_SQLSET</KEYWORD4>
-			<KEYWORD4>SELECT_WORKLOAD_REPOSITORY</KEYWORD4>
-			<KEYWORD4>SELECTNODES</KEYWORD4>
-			<KEYWORD4>SELECTSINGLENODE</KEYWORD4>
-			<KEYWORD4>SELF_CHECK</KEYWORD4>
-			<KEYWORD4>SEND</KEYWORD4>
-			<KEYWORD4>SEND_ATTACH_RAW</KEYWORD4>
-			<KEYWORD4>SEND_ATTACH_VARCHAR2</KEYWORD4>
-			<KEYWORD4>SEND_MESSAGE</KEYWORD4>
-			<KEYWORD4>SERV_MOD_ACT_STAT_DISABLE</KEYWORD4>
-			<KEYWORD4>SERV_MOD_ACT_STAT_ENABLE</KEYWORD4>
-			<KEYWORD4>SERV_MOD_ACT_TRACE_DISABLE</KEYWORD4>
-			<KEYWORD4>SERV_MOD_ACT_TRACE_ENABLE</KEYWORD4>
-			<KEYWORD4>SESSION_TRACE_DISABLE</KEYWORD4>
-			<KEYWORD4>SESSION_TRACE_ENABLE</KEYWORD4>
-			<KEYWORD4>SET_ACTION</KEYWORD4>
-			<KEYWORD4>SET_AGENT_REGISTRATION_PASS</KEYWORD4>
-			<KEYWORD4>SET_ANALYSIS_DEFAULT_PARAMETER</KEYWORD4>
-			<KEYWORD4>SET_ANALYSIS_TASK_PARAMETER</KEYWORD4>
-			<KEYWORD4>SET_ATTRIBUTE</KEYWORD4>
-			<KEYWORD4>SET_ATTRIBUTE_NULL</KEYWORD4>
-			<KEYWORD4>SET_AUTHENTICATION</KEYWORD4>
-			<KEYWORD4>SET_AUTHORIZATION</KEYWORD4>
-			<KEYWORD4>SET_BODY_CHARSET</KEYWORD4>
-			<KEYWORD4>SET_BREAKPOINT</KEYWORD4>
-			<KEYWORD4>SET_CACHE</KEYWORD4>
-			<KEYWORD4>SET_CLIENT_INFO</KEYWORD4>
-			<KEYWORD4>SET_CLIENT_SERVICE</KEYWORD4>
-			<KEYWORD4>SET_CNS_EXCEPTION_LOG</KEYWORD4>
-			<KEYWORD4>SET_COLUMN_STATS</KEYWORD4>
-			<KEYWORD4>SET_CONSUMER_GROUP_MAPPING</KEYWORD4>
-			<KEYWORD4>SET_CONSUMER_GROUP_MAPPING_PRI</KEYWORD4>
-			<KEYWORD4>SET_CONTEXT</KEYWORD4>
-			<KEYWORD4>SET_COOKIE_SUPPORT</KEYWORD4>
-			<KEYWORD4>SET_COUNT</KEYWORD4>
-			<KEYWORD4>SET_DAD_ATTRIBUTE</KEYWORD4>
-			<KEYWORD4>SET_DATABASE_PREFS</KEYWORD4>
-			<KEYWORD4>SET_DEFAULT_SQLWKLD_PARAMETER</KEYWORD4>
-			<KEYWORD4>SET_DEFAULT_TASK_PARAMETER</KEYWORD4>
-			<KEYWORD4>SET_DEFAULTS</KEYWORD4>
-			<KEYWORD4>SET_DETAILED_EXCP_SUPPORT</KEYWORD4>
-			<KEYWORD4>SET_DIAGNOSIS_TASK_PARAMETER</KEYWORD4>
-			<KEYWORD4>SET_DML_HANDLER</KEYWORD4>
-			<KEYWORD4>SET_ENQUEUE_DESTINATION</KEYWORD4>
-			<KEYWORD4>SET_EXECUTE</KEYWORD4>
-			<KEYWORD4>SET_EXPIRES</KEYWORD4>
-			<KEYWORD4>SET_EXPRESSION</KEYWORD4>
-			<KEYWORD4>SET_FILTER</KEYWORD4>
-			<KEYWORD4>SET_FOLLOW_REDIRECT</KEYWORD4>
-			<KEYWORD4>SET_GLOBAL_ATTRIBUTE</KEYWORD4>
-			<KEYWORD4>SET_GLOBAL_INSTANTIATION_SCN</KEYWORD4>
-			<KEYWORD4>SET_GLOBAL_PREFS</KEYWORD4>
-			<KEYWORD4>SET_HEADER</KEYWORD4>
-			<KEYWORD4>SET_INDEX_STATS</KEYWORD4>
-			<KEYWORD4>SET_INITIAL_CONSUMER_GROUP</KEYWORD4>
-			<KEYWORD4>SET_JAVA_LOGGING_LEVEL</KEYWORD4>
-			<KEYWORD4>SET_JOB_ANYDATA_VALUE</KEYWORD4>
-			<KEYWORD4>SET_JOB_ARGUMENT_VALUE</KEYWORD4>
-			<KEYWORD4>SET_JOB_ATTRIBUTES</KEYWORD4>
-			<KEYWORD4>SET_KEY_COLUMNS</KEYWORD4>
-			<KEYWORD4>SET_LOG_LEVEL</KEYWORD4>
-			<KEYWORD4>SET_MAILHOST</KEYWORD4>
-			<KEYWORD4>SET_MAILPORT</KEYWORD4>
-			<KEYWORD4>SET_MESSAGE_NOTIFICATION</KEYWORD4>
-			<KEYWORD4>SET_MESSAGE_TRACKING</KEYWORD4>
-			<KEYWORD4>SET_MODULE</KEYWORD4>
-			<KEYWORD4>SET_NLS</KEYWORD4>
-			<KEYWORD4>SET_NOT_MODIFIED</KEYWORD4>
-			<KEYWORD4>SET_OER_BREAKPOINT</KEYWORD4>
-			<KEYWORD4>SET_OPTION</KEYWORD4>
-			<KEYWORD4>SET_P1_RESOURCES</KEYWORD4>
-			<KEYWORD4>SET_PARALLEL</KEYWORD4>
-			<KEYWORD4>SET_PARAM</KEYWORD4>
-			<KEYWORD4>SET_PARAMETER</KEYWORD4>
-			<KEYWORD4>SET_PARSE_ITEM</KEYWORD4>
-			<KEYWORD4>SET_PERSISTENT_CONN_SUPPORT</KEYWORD4>
-			<KEYWORD4>SET_PLSQL_LOGGING_LEVEL</KEYWORD4>
-			<KEYWORD4>SET_PLSQL_TRACE</KEYWORD4>
-			<KEYWORD4>SET_PROTECTION_REALM</KEYWORD4>
-			<KEYWORD4>SET_PROXY</KEYWORD4>
-			<KEYWORD4>SET_RESPONSE_ERROR_CHECK</KEYWORD4>
-			<KEYWORD4>SET_ROLE</KEYWORD4>
-			<KEYWORD4>SET_RULE_TRANSFORM_FUNCTION</KEYWORD4>
-			<KEYWORD4>SET_SCHEDULER_ATTRIBUTE</KEYWORD4>
-			<KEYWORD4>SET_SCHEMA_INSTANTIATION_SCN</KEYWORD4>
-			<KEYWORD4>SET_SCHEMA_PREFS</KEYWORD4>
-			<KEYWORD4>SET_SENDFROM</KEYWORD4>
-			<KEYWORD4>SET_SESSION_LONGOPS</KEYWORD4>
-			<KEYWORD4>SET_SESSION_TIMEOUT</KEYWORD4>
-			<KEYWORD4>SET_SQL_TRACE</KEYWORD4>
-			<KEYWORD4>SET_SQLWKLD_PARAMETER</KEYWORD4>
-			<KEYWORD4>SET_SURROGATE_CONTROL</KEYWORD4>
-			<KEYWORD4>SET_SYSTEM_STATS</KEYWORD4>
-			<KEYWORD4>SET_TABLE_INSTANTIATION_SCN</KEYWORD4>
-			<KEYWORD4>SET_TABLE_PREFS</KEYWORD4>
-			<KEYWORD4>SET_TABLE_STATS</KEYWORD4>
-			<KEYWORD4>SET_TABLESPACE</KEYWORD4>
-			<KEYWORD4>SET_TAG</KEYWORD4>
-			<KEYWORD4>SET_TASK_PARAMETER</KEYWORD4>
-			<KEYWORD4>SET_THRESHOLD</KEYWORD4>
-			<KEYWORD4>SET_TIMEOUT</KEYWORD4>
-			<KEYWORD4>SET_TIMEOUT_BEHAVIOUR</KEYWORD4>
-			<KEYWORD4>SET_TRANSFER_TIMEOUT</KEYWORD4>
-			<KEYWORD4>SET_TRANSFORM</KEYWORD4>
-			<KEYWORD4>SET_TRIGGER_FIRING_PROPERTY</KEYWORD4>
-			<KEYWORD4>SET_TUNING_TASK_PARAMETER</KEYWORD4>
-			<KEYWORD4>SET_UP_QUEUE</KEYWORD4>
-			<KEYWORD4>SET_UPDATE_CONFLICT_HANDLER</KEYWORD4>
-			<KEYWORD4>SET_VALUE</KEYWORD4>
-			<KEYWORD4>SET_VALUE_DEPENDENCY</KEYWORD4>
-			<KEYWORD4>SET_WALLET</KEYWORD4>
-			<KEYWORD4>SET_WARNING_SETTING_STRING</KEYWORD4>
-			<KEYWORD4>SET_WATERMARK</KEYWORD4>
-			<KEYWORD4>SETACL</KEYWORD4>
-			<KEYWORD4>SETATTRIBUTE</KEYWORD4>
-			<KEYWORD4>SETATTRIBUTENODE</KEYWORD4>
-			<KEYWORD4>SETAUTHOR</KEYWORD4>
-			<KEYWORD4>SETCHARACTERSET</KEYWORD4>
-			<KEYWORD4>SETCOMMENT</KEYWORD4>
-			<KEYWORD4>SETCONTENT</KEYWORD4>
-			<KEYWORD4>SETCONTENTTYPE</KEYWORD4>
-			<KEYWORD4>SETCONVERTSPECIALCHARS</KEYWORD4>
-			<KEYWORD4>SETCUSTOMMETADATA</KEYWORD4>
-			<KEYWORD4>SETDATA</KEYWORD4>
-			<KEYWORD4>SETDISPLAYNAME</KEYWORD4>
-			<KEYWORD4>SETDOCTYPE</KEYWORD4>
-			<KEYWORD4>SETERRORLOG</KEYWORD4>
-			<KEYWORD4>SETFTPPORT</KEYWORD4>
-			<KEYWORD4>SETHTTPPORT</KEYWORD4>
-			<KEYWORD4>SETLANGUAGE</KEYWORD4>
-			<KEYWORD4>SETLISTENERENDPOINT</KEYWORD4>
-			<KEYWORD4>SETLISTENERLOCALACCESS</KEYWORD4>
-			<KEYWORD4>SETMAXROWS</KEYWORD4>
-			<KEYWORD4>SETNAMEDITEM</KEYWORD4>
-			<KEYWORD4>SETNODEVALUE</KEYWORD4>
-			<KEYWORD4>SETNULLHANDLING</KEYWORD4>
-			<KEYWORD4>SETOPTIONS</KEYWORD4>
-			<KEYWORD4>SETOWNER</KEYWORD4>
-			<KEYWORD4>SETPARAM</KEYWORD4>
-			<KEYWORD4>SETPREFIX</KEYWORD4>
-			<KEYWORD4>SETRENDERPATH</KEYWORD4>
-			<KEYWORD4>SETRENDERSTREAM</KEYWORD4>
-			<KEYWORD4>SETROWSETTAG</KEYWORD4>
-			<KEYWORD4>SETROWTAG</KEYWORD4>
-			<KEYWORD4>SETSKIPROWS</KEYWORD4>
-			<KEYWORD4>SETSOURCELANG</KEYWORD4>
-			<KEYWORD4>SETSTANDALONE</KEYWORD4>
-			<KEYWORD4>SETVALUE</KEYWORD4>
-			<KEYWORD4>SETVERSION</KEYWORD4>
-			<KEYWORD4>SHOW_BREAKPOINTS</KEYWORD4>
-			<KEYWORD4>SHOW_EXTENDED_STATS_NAME</KEYWORD4>
-			<KEYWORD4>SHOW_FRAME_SOURCE</KEYWORD4>
-			<KEYWORD4>SHOW_SOURCE</KEYWORD4>
-			<KEYWORD4>SHOW_STATS</KEYWORD4>
-			<KEYWORD4>SHOWPAGE</KEYWORD4>
-			<KEYWORD4>SHOWSOURCE</KEYWORD4>
-			<KEYWORD4>SHOWWARNINGS</KEYWORD4>
-			<KEYWORD4>SHUTDOWN</KEYWORD4>
-			<KEYWORD4>SIGNAL</KEYWORD4>
-			<KEYWORD4>SIGNATURE</KEYWORD4>
-			<KEYWORD4>SIMPLE_SQL_NAME</KEYWORD4>
-			<KEYWORD4>SIZES</KEYWORD4>
-			<KEYWORD4>SKIP</KEYWORD4>
-			<KEYWORD4>SKIP_CORRUPT_BLOCKS</KEYWORD4>
-			<KEYWORD4>SKIP_ERROR</KEYWORD4>
-			<KEYWORD4>SKIP_TRANSACTION</KEYWORD4>
-			<KEYWORD4>SLEEP</KEYWORD4>
-			<KEYWORD4>SMALL</KEYWORD4>
-			<KEYWORD4>SPACE_ERROR_INFO</KEYWORD4>
-			<KEYWORD4>SPACE_USAGE</KEYWORD4>
-			<KEYWORD4>SPLIT_STREAMS</KEYWORD4>
-			<KEYWORD4>SPLITPATH</KEYWORD4>
-			<KEYWORD4>SPLITTEXT</KEYWORD4>
-			<KEYWORD4>SQL_OBJECT_NAME</KEYWORD4>
-			<KEYWORD4>SQLID_TO_SQLHASH</KEYWORD4>
-			<KEYWORD4>SQLTEXT_TO_SIGNATURE</KEYWORD4>
-			<KEYWORD4>STACK_BIN_CAT</KEYWORD4>
-			<KEYWORD4>STACK_BIN_NUM</KEYWORD4>
-			<KEYWORD4>STACK_CLIP</KEYWORD4>
-			<KEYWORD4>STACK_COL_REM</KEYWORD4>
-			<KEYWORD4>STACK_MISS_CAT</KEYWORD4>
-			<KEYWORD4>STACK_MISS_NUM</KEYWORD4>
-			<KEYWORD4>STACK_NORM_LIN</KEYWORD4>
-			<KEYWORD4>START_APPLY</KEYWORD4>
-			<KEYWORD4>START_CAPTURE</KEYWORD4>
-			<KEYWORD4>START_JOB</KEYWORD4>
-			<KEYWORD4>START_LOGMNR</KEYWORD4>
-			<KEYWORD4>START_POOL</KEYWORD4>
-			<KEYWORD4>START_PROFILING</KEYWORD4>
-			<KEYWORD4>START_PROPAGATION</KEYWORD4>
-			<KEYWORD4>START_QUEUE</KEYWORD4>
-			<KEYWORD4>START_REDEF_TABLE</KEYWORD4>
-			<KEYWORD4>START_REPLAY</KEYWORD4>
-			<KEYWORD4>START_SERVICE</KEYWORD4>
-			<KEYWORD4>STARTUP</KEYWORD4>
-			<KEYWORD4>STATUS</KEYWORD4>
-			<KEYWORD4>STATUS_LINE</KEYWORD4>
-			<KEYWORD4>STEP_ID</KEYWORD4>
-			<KEYWORD4>STOP_APPLY</KEYWORD4>
-			<KEYWORD4>STOP_CAPTURE</KEYWORD4>
-			<KEYWORD4>STOP_JOB</KEYWORD4>
-			<KEYWORD4>STOP_POOL</KEYWORD4>
-			<KEYWORD4>STOP_PROFILING</KEYWORD4>
-			<KEYWORD4>STOP_PROPAGATION</KEYWORD4>
-			<KEYWORD4>STOP_QUEUE</KEYWORD4>
-			<KEYWORD4>STOP_SERVICE</KEYWORD4>
-			<KEYWORD4>STORE_VALUES</KEYWORD4>
-			<KEYWORD4>STREAM2MULTI</KEYWORD4>
-			<KEYWORD4>STRIKE</KEYWORD4>
-			<KEYWORD4>STRING</KEYWORD4>
-			<KEYWORD4>STRING_TO_RAW</KEYWORD4>
-			<KEYWORD4>STRONG</KEYWORD4>
-			<KEYWORD4>STYLE</KEYWORD4>
-			<KEYWORD4>SUB</KEYWORD4>
-			<KEYWORD4>SUBMIT</KEYWORD4>
-			<KEYWORD4>SUBMIT_PENDING_AREA</KEYWORD4>
-			<KEYWORD4>SUBSCRIBE</KEYWORD4>
-			<KEYWORD4>SUBSTR</KEYWORD4>
-			<KEYWORD4>SUBSTRINGDATA</KEYWORD4>
-			<KEYWORD4>SUMMARY</KEYWORD4>
-			<KEYWORD4>SUP</KEYWORD4>
-			<KEYWORD4>SWITCH_CONSUMER_GROUP_FOR_SESS</KEYWORD4>
-			<KEYWORD4>SWITCH_CONSUMER_GROUP_FOR_USER</KEYWORD4>
-			<KEYWORD4>SWITCH_CURRENT_CONSUMER_GROUP</KEYWORD4>
-			<KEYWORD4>SWITCH_PLAN</KEYWORD4>
-			<KEYWORD4>SYNC_INTERIM_TABLE</KEYWORD4>
-			<KEYWORD4>SYNC_TEXT_INDEXES</KEYWORD4>
-			<KEYWORD4>SYNCHRONIZE</KEYWORD4>
-			<KEYWORD4>SYNCINDEX</KEYWORD4>
-			<KEYWORD4>TABLE_TO_COMMA</KEYWORD4>
-			<KEYWORD4>TABLECAPTION</KEYWORD4>
-			<KEYWORD4>TABLECLOSE</KEYWORD4>
-			<KEYWORD4>TABLEDATA</KEYWORD4>
-			<KEYWORD4>TABLEHEADER</KEYWORD4>
-			<KEYWORD4>TABLEOPEN</KEYWORD4>
-			<KEYWORD4>TABLEPRINT</KEYWORD4>
-			<KEYWORD4>TABLEROWCLOSE</KEYWORD4>
-			<KEYWORD4>TABLEROWOPEN</KEYWORD4>
-			<KEYWORD4>TABLESPACE_FIX_BITMAPS</KEYWORD4>
-			<KEYWORD4>TABLESPACE_FIX_SEGMENT_STATES</KEYWORD4>
-			<KEYWORD4>TABLESPACE_MIGRATE_FROM_LOCAL</KEYWORD4>
-			<KEYWORD4>TABLESPACE_MIGRATE_TO_LOCAL</KEYWORD4>
-			<KEYWORD4>TABLESPACE_REBUILD_BITMAPS</KEYWORD4>
-			<KEYWORD4>TABLESPACE_REBUILD_QUOTAS</KEYWORD4>
-			<KEYWORD4>TABLESPACE_RELOCATE_BITMAPS</KEYWORD4>
-			<KEYWORD4>TABLESPACE_VERIFY</KEYWORD4>
-			<KEYWORD4>TARGET_PROGRAM_RUNNING</KEYWORD4>
-			<KEYWORD4>TELETYPE</KEYWORD4>
-			<KEYWORD4>TERMINATE</KEYWORD4>
-			<KEYWORD4>TEXT_DECODE</KEYWORD4>
-			<KEYWORD4>TEXT_ENCODE</KEYWORD4>
-			<KEYWORD4>TITLE</KEYWORD4>
-			<KEYWORD4>TO_CURSOR_NUMBER</KEYWORD4>
-			<KEYWORD4>TO_REFCURSOR</KEYWORD4>
-			<KEYWORD4>TO_STRING</KEYWORD4>
-			<KEYWORD4>TODATE</KEYWORD4>
-			<KEYWORD4>TOUCHRESOURCE</KEYWORD4>
-			<KEYWORD4>TRACE</KEYWORD4>
-			<KEYWORD4>TRANSACTION_BACKOUT</KEYWORD4>
-			<KEYWORD4>TRANSFORMNODE</KEYWORD4>
-			<KEYWORD4>TRANSLATE</KEYWORD4>
-			<KEYWORD4>TRANSLATEXML</KEYWORD4>
-			<KEYWORD4>TRANSLITERATE</KEYWORD4>
-			<KEYWORD4>TRANSPORT_SET_CHECK</KEYWORD4>
-			<KEYWORD4>TRIM</KEYWORD4>
-			<KEYWORD4>TUNE_MVIEW</KEYWORD4>
-			<KEYWORD4>ULISTCLOSE</KEYWORD4>
-			<KEYWORD4>ULISTOPEN</KEYWORD4>
-			<KEYWORD4>UNASSIGN_ACL</KEYWORD4>
-			<KEYWORD4>UNASSIGN_ATTRIBUTE_SET</KEYWORD4>
-			<KEYWORD4>UNBIND_AGENT</KEYWORD4>
-			<KEYWORD4>UNCHECKOUT</KEYWORD4>
-			<KEYWORD4>UNDERLINE</KEYWORD4>
-			<KEYWORD4>UNESCAPE</KEYWORD4>
-			<KEYWORD4>UNESCAPE_REFERENCE</KEYWORD4>
-			<KEYWORD4>UNIFORM_DIST_FIT</KEYWORD4>
-			<KEYWORD4>UNIQUE_SESSION_ID</KEYWORD4>
-			<KEYWORD4>UNIQUE_SESSION_NAME</KEYWORD4>
-			<KEYWORD4>UNKEEP</KEYWORD4>
-			<KEYWORD4>UNLOCK_MAP</KEYWORD4>
-			<KEYWORD4>UNLOCK_PARTITION_STATS</KEYWORD4>
-			<KEYWORD4>UNLOCK_SCHEMA_STATS</KEYWORD4>
-			<KEYWORD4>UNLOCK_TABLE_STATS</KEYWORD4>
-			<KEYWORD4>UNLOCKRESOURCE</KEYWORD4>
-			<KEYWORD4>UNMAP_DAD</KEYWORD4>
-			<KEYWORD4>UNPACK_MESSAGE</KEYWORD4>
-			<KEYWORD4>UNPACK_STGTAB_BASELINE</KEYWORD4>
-			<KEYWORD4>UNPACK_STGTAB_SQLPATCH</KEYWORD4>
-			<KEYWORD4>UNPACK_STGTAB_SQLPROF</KEYWORD4>
-			<KEYWORD4>UNPACK_STGTAB_SQLSET</KEYWORD4>
-			<KEYWORD4>UNREGISTER</KEYWORD4>
-			<KEYWORD4>UNREGISTER_DEPENDENT_OBJECT</KEYWORD4>
-			<KEYWORD4>UNREGISTER_FOREIGN_QUEUE</KEYWORD4>
-			<KEYWORD4>UNREGISTER_MVIEW</KEYWORD4>
-			<KEYWORD4>UNSCHEDULE_PROPAGATION</KEYWORD4>
-			<KEYWORD4>UNSKIP</KEYWORD4>
-			<KEYWORD4>UNSKIP_ERROR</KEYWORD4>
-			<KEYWORD4>UNSKIP_TRANSACTION</KEYWORD4>
-			<KEYWORD4>UNUSED_SPACE</KEYWORD4>
-			<KEYWORD4>UPDATE_BY_CAT</KEYWORD4>
-			<KEYWORD4>UPDATE_CONSUMER_GROUP</KEYWORD4>
-			<KEYWORD4>UPDATE_OBJECT</KEYWORD4>
-			<KEYWORD4>UPDATE_PLAN</KEYWORD4>
-			<KEYWORD4>UPDATE_PLAN_DIRECTIVE</KEYWORD4>
-			<KEYWORD4>UPDATE_REC_ATTRIBUTES</KEYWORD4>
-			<KEYWORD4>UPDATE_SIGNATURES</KEYWORD4>
-			<KEYWORD4>UPDATE_SQLSET</KEYWORD4>
-			<KEYWORD4>UPDATE_SQLWKLD_ATTRIBUTES</KEYWORD4>
-			<KEYWORD4>UPDATE_SQLWKLD_STATEMENT</KEYWORD4>
-			<KEYWORD4>UPDATE_TASK_ATTRIBUTES</KEYWORD4>
-			<KEYWORD4>UPDATERESOURCEMETADATA</KEYWORD4>
-			<KEYWORD4>UPDATETRANSLATION</KEYWORD4>
-			<KEYWORD4>UPGRADE_STAT_TABLE</KEYWORD4>
-			<KEYWORD4>USE_ROLLBACK_SEGMENT</KEYWORD4>
-			<KEYWORD4>USEBINARYSTREAM</KEYWORD4>
-			<KEYWORD4>USEITEMTAGSFORCOLL</KEYWORD4>
-			<KEYWORD4>USENULLATTRIBUTEINDICATOR</KEYWORD4>
-			<KEYWORD4>USER_EXPORT</KEYWORD4>
-			<KEYWORD4>UUDECODE</KEYWORD4>
-			<KEYWORD4>UUENCODE</KEYWORD4>
-			<KEYWORD4>VALIDATE</KEYWORD4>
-			<KEYWORD4>VALIDATE_DIMENSION</KEYWORD4>
-			<KEYWORD4>VALIDATE_EXPRESSIONS</KEYWORD4>
-			<KEYWORD4>VALIDATE_PENDING_AREA</KEYWORD4>
-			<KEYWORD4>VALIDATE_REWRITE_EQUIVALENCE</KEYWORD4>
-			<KEYWORD4>VALIDATE_SCHEME</KEYWORD4>
-			<KEYWORD4>VALIDATE_XML</KEYWORD4>
-			<KEYWORD4>VALUE</KEYWORD4>
-			<KEYWORD4>VARIABLE</KEYWORD4>
-			<KEYWORD4>VARIABLE_VALUE</KEYWORD4>
-			<KEYWORD4>VERIFY_QUEUE_TYPES</KEYWORD4>
-			<KEYWORD4>VERIFY_VALUES</KEYWORD4>
-			<KEYWORD4>VRFY</KEYWORD4>
-			<KEYWORD4>WAIT_FOR_JOB</KEYWORD4>
-			<KEYWORD4>WAITANY</KEYWORD4>
-			<KEYWORD4>WAITONE</KEYWORD4>
-			<KEYWORD4>WBR</KEYWORD4>
-			<KEYWORD4>WEIBULL_DIST_FIT</KEYWORD4>
-			<KEYWORD4>WHAT</KEYWORD4>
-			<KEYWORD4>WHO_CALLED_ME</KEYWORD4>
-			<KEYWORD4>WRAP</KEYWORD4>
-			<KEYWORD4>WRITE</KEYWORD4>
-			<KEYWORD4>WRITE_DATA</KEYWORD4>
-			<KEYWORD4>WRITE_LINE</KEYWORD4>
-			<KEYWORD4>WRITE_RAW</KEYWORD4>
-			<KEYWORD4>WRITE_RAW_DATA</KEYWORD4>
-			<KEYWORD4>WRITE_TEXT</KEYWORD4>
-			<KEYWORD4>WRITEAPPEND</KEYWORD4>
-			<KEYWORD4>WRITETOBUFFER</KEYWORD4>
-			<KEYWORD4>WRITETOCLOB</KEYWORD4>
-			<KEYWORD4>WRITETOFILE</KEYWORD4>
-			<KEYWORD4>XA_COMMIT</KEYWORD4>
-			<KEYWORD4>XA_END</KEYWORD4>
-			<KEYWORD4>XA_FORGET</KEYWORD4>
-			<KEYWORD4>XA_GETLASTOER</KEYWORD4>
-			<KEYWORD4>XA_PREPARE</KEYWORD4>
-			<KEYWORD4>XA_RECOVER</KEYWORD4>
-			<KEYWORD4>XA_ROLLBACK</KEYWORD4>
-			<KEYWORD4>XA_SETTIMEOUT</KEYWORD4>
-			<KEYWORD4>XA_START</KEYWORD4>
-			<KEYWORD4>XFORM_BIN_CAT</KEYWORD4>
-			<KEYWORD4>XFORM_BIN_NUM</KEYWORD4>
-			<KEYWORD4>XFORM_CLIP</KEYWORD4>
-			<KEYWORD4>XFORM_COL_REM</KEYWORD4>
-			<KEYWORD4>XFORM_EXPR_NUM</KEYWORD4>
-			<KEYWORD4>XFORM_EXPR_STR</KEYWORD4>
-			<KEYWORD4>XFORM_MISS_CAT</KEYWORD4>
-			<KEYWORD4>XFORM_MISS_NUM</KEYWORD4>
-			<KEYWORD4>XFORM_NORM_LIN</KEYWORD4>
-			<KEYWORD4>XFORM_STACK</KEYWORD4>
-			<KEYWORD4>XML_TO_LCR</KEYWORD4>
-			<KEYWORD4>XMLINDEXADDPATH</KEYWORD4>
-			<KEYWORD4>XMLINDEXREMOVEPATH</KEYWORD4>
-			<KEYWORD4>XPINDEX_PARAMETERS</KEYWORD4>
-			<KEYWORD4>XRANGE</KEYWORD4>
-		</KEYWORDS>
-	</RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/outline.xml b/qpython/src/main/assets/syntax/outline.xml
deleted file mode 100644
index 4c1b73ff..00000000
--- a/qpython/src/main/assets/syntax/outline.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="commentStart" VALUE="/*"/>
-		<PROPERTY NAME="commentEnd" VALUE="*/"/>
-		<PROPERTY NAME="lineComment" VALUE="//"/>
-		<PROPERTY NAME="contextInsensitive" VALUE="true"/>
-	</PROPS>
-	<RULES IGNORE_CASE="TRUE">
-		<EOL_SPAN_REGEXP AT_LINE_START="TRUE" TYPE="COMMENT4">^\s{12}</EOL_SPAN_REGEXP>
-		<EOL_SPAN_REGEXP AT_LINE_START="TRUE" TYPE="COMMENT3">^\s{11}</EOL_SPAN_REGEXP>
-		<EOL_SPAN_REGEXP AT_LINE_START="TRUE" TYPE="COMMENT2">^\s{10}</EOL_SPAN_REGEXP>
-		<EOL_SPAN_REGEXP AT_LINE_START="TRUE" TYPE="COMMENT1">^\s{9}</EOL_SPAN_REGEXP>
-		<EOL_SPAN_REGEXP AT_LINE_START="TRUE" TYPE="LITERAL4">^\s{8}</EOL_SPAN_REGEXP>
-		<EOL_SPAN_REGEXP AT_LINE_START="TRUE" TYPE="LITERAL3">^\s{7}</EOL_SPAN_REGEXP>
-		<EOL_SPAN_REGEXP AT_LINE_START="TRUE" TYPE="LITERAL2">^\s{6}</EOL_SPAN_REGEXP>
-		<EOL_SPAN_REGEXP AT_LINE_START="TRUE" TYPE="LITERAL1">^\s{5}</EOL_SPAN_REGEXP>
-		<EOL_SPAN_REGEXP AT_LINE_START="TRUE" TYPE="KEYWORD4">^\s{4}</EOL_SPAN_REGEXP>
-		<EOL_SPAN_REGEXP AT_LINE_START="TRUE" TYPE="KEYWORD3">^\s{3}</EOL_SPAN_REGEXP>
-		<EOL_SPAN_REGEXP AT_LINE_START="TRUE" TYPE="KEYWORD2">^\s{2}</EOL_SPAN_REGEXP>
-		<EOL_SPAN_REGEXP AT_LINE_START="TRUE" TYPE="KEYWORD1">^\s{1}</EOL_SPAN_REGEXP>
-		<EOL_SPAN_REGEXP AT_LINE_START="TRUE" TYPE="LABEL">^\s{0}</EOL_SPAN_REGEXP>
-	</RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/pascal.xml b/qpython/src/main/assets/syntax/pascal.xml
deleted file mode 100644
index fcae780f..00000000
--- a/qpython/src/main/assets/syntax/pascal.xml
+++ /dev/null
@@ -1,221 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!-- Pascal mode by Kristian Ovaska.
-     Delphi 3 was used as reference.
-     Modified by Barry Carr (Ixian Software Components Ltd)
-     Delphi 6 was used as reference.
-     Modified by Barry Carr (Ixian Software Components Ltd) Feb '04
-     Delphi 8 (for .NET) was used as reference
-     Keywords   = KEYWORD1
-     Directives = KEYWORD2.
-     Everything else as is-->
-<MODE>
-    <PROPS>
-        <PROPERTY NAME="commentStart" VALUE="{" />
-        <PROPERTY NAME="commentEnd" VALUE="}" />
-        <PROPERTY NAME="lineComment" VALUE="//" />
-    </PROPS>
-
-    <RULES IGNORE_CASE="TRUE" HIGHLIGHT_DIGITS="TRUE">
-        <!-- Compiler directives. -->
-        <SPAN TYPE="COMMENT3">
-            <BEGIN>{$</BEGIN>
-            <END>}</END>
-        </SPAN>
-        <SPAN TYPE="COMMENT3">
-            <BEGIN>(*$</BEGIN>
-            <END>*)</END>
-        </SPAN>
-
-        <!-- Normal comments. -->
-        <SPAN TYPE="COMMENT1">
-            <BEGIN>{</BEGIN>
-            <END>}</END>
-        </SPAN>
-
-        <SPAN TYPE="COMMENT1">
-            <BEGIN>(*</BEGIN>
-            <END>*)</END>
-        </SPAN>
-
-        <EOL_SPAN TYPE="COMMENT2">//</EOL_SPAN>
-
-        <SPAN TYPE="LITERAL1" NO_LINE_BREAK="TRUE">
-            <BEGIN>'</BEGIN>
-            <END>'</END>
-        </SPAN>
-
-        <SEQ TYPE="OPERATOR">)</SEQ>
-        <SEQ TYPE="OPERATOR">(</SEQ>
-        <SEQ TYPE="OPERATOR">]</SEQ>
-        <SEQ TYPE="OPERATOR">[</SEQ>
-        <SEQ TYPE="OPERATOR">.</SEQ>
-        <SEQ TYPE="OPERATOR">,</SEQ>
-        <SEQ TYPE="OPERATOR">;</SEQ>
-        <SEQ TYPE="OPERATOR">^</SEQ>
-        <SEQ TYPE="OPERATOR">@</SEQ>
-        <SEQ TYPE="OPERATOR">:=</SEQ>
-        <SEQ TYPE="OPERATOR">:</SEQ>
-        <SEQ TYPE="OPERATOR">=</SEQ>
-        <SEQ TYPE="OPERATOR">&lt;&gt;</SEQ>
-        <SEQ TYPE="OPERATOR">&gt;</SEQ>
-        <SEQ TYPE="OPERATOR">&lt;</SEQ>
-        <SEQ TYPE="OPERATOR">&gt;=</SEQ>
-        <SEQ TYPE="OPERATOR">&lt;=</SEQ>
-        <SEQ TYPE="OPERATOR">+</SEQ>
-        <SEQ TYPE="OPERATOR">-</SEQ>
-        <SEQ TYPE="OPERATOR">/</SEQ>
-        <SEQ TYPE="OPERATOR">*</SEQ>
-
-        <KEYWORDS>
-            <!-- Reserved words. Standard directives are not included, except
-                 private, protected, public, published, and automated. -->
-            <KEYWORD1>and</KEYWORD1>
-            <KEYWORD1>array</KEYWORD1>
-            <KEYWORD1>as</KEYWORD1>
-            <KEYWORD1>at</KEYWORD1>
-            <KEYWORD1>asm</KEYWORD1>
-            <KEYWORD1>begin</KEYWORD1>
-            <KEYWORD1>case</KEYWORD1>
-            <KEYWORD1>class</KEYWORD1>
-            <KEYWORD1>const</KEYWORD1>
-            <KEYWORD1>constructor</KEYWORD1>
-            <KEYWORD1>destructor</KEYWORD1>
-            <KEYWORD1>dispinterface</KEYWORD1>
-            <KEYWORD1>div</KEYWORD1>
-            <KEYWORD1>do</KEYWORD1>
-            <KEYWORD1>downto</KEYWORD1>
-            <KEYWORD1>else</KEYWORD1>
-            <KEYWORD1>end</KEYWORD1>
-            <KEYWORD1>except</KEYWORD1>
-            <KEYWORD1>exports</KEYWORD1>
-            <KEYWORD1>file</KEYWORD1>
-            <KEYWORD1>final</KEYWORD1>
-            <KEYWORD1>finalization</KEYWORD1>
-            <KEYWORD1>finally</KEYWORD1>
-            <KEYWORD1>for</KEYWORD1>
-            <KEYWORD1>function</KEYWORD1>
-            <KEYWORD1>goto</KEYWORD1>
-            <KEYWORD1>if</KEYWORD1>
-            <KEYWORD1>implementation</KEYWORD1>
-            <KEYWORD1>in</KEYWORD1>
-            <KEYWORD1>inherited</KEYWORD1>
-            <KEYWORD1>initialization</KEYWORD1>
-            <KEYWORD1>inline</KEYWORD1>
-            <KEYWORD1>interface</KEYWORD1>
-            <KEYWORD1>is</KEYWORD1>
-            <KEYWORD1>label</KEYWORD1>
-            <KEYWORD1>mod</KEYWORD1>
-            <KEYWORD1>not</KEYWORD1>
-            <KEYWORD1>object</KEYWORD1>
-            <KEYWORD1>of</KEYWORD1>
-            <KEYWORD1>on</KEYWORD1>
-            <KEYWORD1>or</KEYWORD1>
-            <KEYWORD1>out</KEYWORD1>
-            <KEYWORD1>packed</KEYWORD1>
-            <KEYWORD1>procedure</KEYWORD1>
-            <KEYWORD1>program</KEYWORD1>
-            <KEYWORD1>property</KEYWORD1>
-            <KEYWORD1>raise</KEYWORD1>
-            <KEYWORD1>record</KEYWORD1>
-            <KEYWORD1>repeat</KEYWORD1>
-            <KEYWORD1>resourcestring</KEYWORD1>
-            <KEYWORD1>set</KEYWORD1>
-            <KEYWORD1>sealed</KEYWORD1>
-            <KEYWORD1>shl</KEYWORD1>
-            <KEYWORD1>shr</KEYWORD1>
-            <KEYWORD1>static</KEYWORD1>
-            <KEYWORD1>string</KEYWORD1>
-            <KEYWORD1>then</KEYWORD1>
-            <KEYWORD1>threadvar</KEYWORD1>
-            <KEYWORD1>to</KEYWORD1>
-            <KEYWORD1>try</KEYWORD1>
-            <KEYWORD1>type</KEYWORD1>
-            <KEYWORD1>unit</KEYWORD1>
-            <KEYWORD1>unsafe</KEYWORD1>
-            <KEYWORD1>until</KEYWORD1>
-            <KEYWORD1>uses</KEYWORD1>
-            <KEYWORD1>var</KEYWORD1>
-            <KEYWORD1>while</KEYWORD1>
-            <KEYWORD1>with</KEYWORD1>
-            <KEYWORD1>xor</KEYWORD1>
-
-            <KEYWORD2>absolute</KEYWORD2>
-            <KEYWORD2>abstract</KEYWORD2>
-            <KEYWORD2>assembler</KEYWORD2>
-            <KEYWORD2>automated</KEYWORD2>
-            <KEYWORD2>cdecl</KEYWORD2>
-            <KEYWORD2>contains</KEYWORD2>
-            <KEYWORD2>default</KEYWORD2>
-            <KEYWORD2>deprecated</KEYWORD2>
-            <KEYWORD2>dispid</KEYWORD2>
-            <KEYWORD2>dynamic</KEYWORD2>
-            <KEYWORD2>export</KEYWORD2>
-            <KEYWORD2>external</KEYWORD2>
-            <KEYWORD2>far</KEYWORD2>
-            <KEYWORD2>forward</KEYWORD2>
-            <KEYWORD2>implements</KEYWORD2>
-            <KEYWORD2>index</KEYWORD2>
-            <KEYWORD2>library</KEYWORD2>
-            <KEYWORD2>local</KEYWORD2>
-            <KEYWORD2>message</KEYWORD2>
-            <KEYWORD2>name</KEYWORD2>
-            <KEYWORD2>namespaces</KEYWORD2>
-            <KEYWORD2>near</KEYWORD2>
-            <KEYWORD2>nodefault</KEYWORD2>
-            <KEYWORD2>overload</KEYWORD2>
-            <KEYWORD2>override</KEYWORD2>
-            <KEYWORD2>package</KEYWORD2>
-            <KEYWORD2>pascal</KEYWORD2>
-            <KEYWORD2>platform</KEYWORD2>
-            <KEYWORD2>private</KEYWORD2>
-            <KEYWORD2>protected</KEYWORD2>
-            <KEYWORD2>public</KEYWORD2>
-            <KEYWORD2>published</KEYWORD2>
-            <KEYWORD2>read</KEYWORD2>
-            <KEYWORD2>readonly</KEYWORD2>
-            <KEYWORD2>register</KEYWORD2>
-            <KEYWORD2>reintroduce</KEYWORD2>
-            <KEYWORD2>requires</KEYWORD2>
-            <KEYWORD2>resident</KEYWORD2>
-            <KEYWORD2>safecall</KEYWORD2>
-            <KEYWORD2>stdcall</KEYWORD2>
-            <KEYWORD2>stored</KEYWORD2>
-            <KEYWORD2>varargs</KEYWORD2>
-            <KEYWORD2>virtual</KEYWORD2>
-            <KEYWORD2>write</KEYWORD2>
-            <KEYWORD2>writeonly</KEYWORD2>
-
-            <!-- Ordinal types. -->
-            <KEYWORD3>shortint</KEYWORD3>
-            <KEYWORD3>byte</KEYWORD3>
-            <KEYWORD3>char</KEYWORD3>
-            <KEYWORD3>smallint</KEYWORD3>
-            <KEYWORD3>integer</KEYWORD3>
-            <KEYWORD3>word</KEYWORD3>
-            <KEYWORD3>longint</KEYWORD3>
-            <KEYWORD3>cardinal</KEYWORD3>
-            <!-- Boolean types. -->
-            <KEYWORD3>boolean</KEYWORD3>
-            <KEYWORD3>bytebool</KEYWORD3>
-            <KEYWORD3>wordbool</KEYWORD3>
-            <KEYWORD3>longbool</KEYWORD3>
-            <!-- Real types. -->
-            <KEYWORD3>real</KEYWORD3>
-            <KEYWORD3>single</KEYWORD3>
-            <KEYWORD3>double</KEYWORD3>
-            <KEYWORD3>extended</KEYWORD3>
-            <KEYWORD3>comp</KEYWORD3>
-            <KEYWORD3>currency</KEYWORD3>
-            <!-- Untyped pointer. -->
-            <KEYWORD3>pointer</KEYWORD3>
-
-            <LITERAL2>false</LITERAL2>
-            <LITERAL2>nil</LITERAL2>
-            <LITERAL2>self</LITERAL2>
-            <LITERAL2>true</LITERAL2>
-        </KEYWORDS>
-    </RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/patch.xml b/qpython/src/main/assets/syntax/patch.xml
deleted file mode 100644
index 836b4ab3..00000000
--- a/qpython/src/main/assets/syntax/patch.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<MODE>
-  <RULES>
-    <EOL_SPAN TYPE="LABEL" AT_LINE_START="TRUE">+++</EOL_SPAN>
-    <EOL_SPAN TYPE="COMMENT1" AT_LINE_START="TRUE">---</EOL_SPAN>
-    <EOL_SPAN TYPE="KEYWORD3" AT_LINE_START="TRUE">Index: </EOL_SPAN>
-    <EOL_SPAN TYPE="LABEL" AT_LINE_START="TRUE">+</EOL_SPAN>
-    <EOL_SPAN TYPE="LABEL" AT_LINE_START="TRUE">&gt;</EOL_SPAN>
-    <EOL_SPAN TYPE="COMMENT1" AT_LINE_START="TRUE">-</EOL_SPAN>
-    <EOL_SPAN TYPE="COMMENT1" AT_LINE_START="TRUE">&lt;</EOL_SPAN>
-    <EOL_SPAN TYPE="LITERAL3" AT_LINE_START="TRUE">!</EOL_SPAN>
-    <EOL_SPAN TYPE="LITERAL2" AT_LINE_START="TRUE">@@</EOL_SPAN>
-    <EOL_SPAN TYPE="LABEL" AT_LINE_START="TRUE">*</EOL_SPAN>
-  </RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/perl.xml b/qpython/src/main/assets/syntax/perl.xml
deleted file mode 100644
index 781cf97a..00000000
--- a/qpython/src/main/assets/syntax/perl.xml
+++ /dev/null
@@ -1,793 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="lineComment" VALUE="#" />
-		<PROPERTY NAME="indentOpenBrackets" VALUE="{" />
-		<PROPERTY NAME="indentCloseBrackets" VALUE="}" />
-		<PROPERTY NAME="unalignedOpenBrackets" VALUE="(" />
-		<PROPERTY NAME="unalignedCloseBrackets" VALUE=")" />
-		<PROPERTY NAME="indentNextLine" VALUE="[^#]*\.\s*$" />
-	</PROPS>
-
-	<!-- no ESCAPE char because we need the backslash for references -->
-	<RULES HIGHLIGHT_DIGITS="TRUE" IGNORE_CASE="FALSE">
-		<!-- Comments -->
-		<EOL_SPAN TYPE="COMMENT1">#</EOL_SPAN>
-
-		<!-- TYPE is LABEL so that =head1 and =cut are highlighted as so -->
-		<SPAN TYPE="LABEL" DELEGATE="POD" AT_LINE_START="TRUE">
-			<BEGIN>=head1</BEGIN>
-			<END>=cut</END>
-		</SPAN>
-		<SPAN AT_LINE_START="TRUE" TYPE="LABEL" DELEGATE="POD">
-			<BEGIN>=head2</BEGIN>
-			<END>=cut</END>
-		</SPAN>
-        <SPAN TYPE="LABEL" DELEGATE="POD" AT_LINE_START="TRUE">
-			<BEGIN>=head3</BEGIN>
-			<END>=cut</END>
-		</SPAN>
-		<SPAN  AT_LINE_START="TRUE" TYPE="LABEL" DELEGATE="POD">
-			<BEGIN>=head4</BEGIN>
-			<END>=cut</END>
-		</SPAN>
-		<SPAN TYPE="LABEL"  AT_LINE_START="TRUE" DELEGATE="POD">
-			<BEGIN>=item</BEGIN>
-			<END>=cut</END>
-		</SPAN>
-		<SPAN  AT_LINE_START="TRUE" TYPE="LABEL" DELEGATE="POD">
-			<BEGIN>=over</BEGIN>
-			<END>=cut</END>
-		</SPAN>
-		<SPAN TYPE="LABEL" DELEGATE="POD" AT_LINE_START="TRUE">
-			<BEGIN>=back</BEGIN>
-			<END>=cut</END>
-		</SPAN>
-		<SPAN AT_LINE_START="TRUE" TYPE="LABEL" DELEGATE="POD">
-			<BEGIN>=pod</BEGIN>
-			<END>=cut</END>
-		</SPAN>
-		<SPAN TYPE="LABEL" DELEGATE="POD"  AT_LINE_START="TRUE">
-			<BEGIN>=for</BEGIN>
-			<END>=cut</END>
-		</SPAN>
-		<SPAN TYPE="LABEL" DELEGATE="POD" AT_LINE_START="TRUE">
-			<BEGIN>=begin</BEGIN>
-			<END>=cut</END>
-		</SPAN>
-		<SPAN AT_LINE_START="TRUE" TYPE="LABEL" DELEGATE="POD">
-			<BEGIN>=end</BEGIN>
-			<END>=cut</END>
-		</SPAN>
-
-		<!-- Some other things that confuse the mode file. -->
-		<SEQ TYPE="OPERATOR">*"</SEQ>
-		<SEQ TYPE="OPERATOR">*'</SEQ>
-		<SEQ TYPE="OPERATOR">&amp;"</SEQ>
-		<SEQ TYPE="OPERATOR">&amp;'</SEQ>
-
-		<SPAN TYPE="KEYWORD2" NO_LINE_BREAK="TRUE" DELEGATE="VARIABLE">
-			<BEGIN>${</BEGIN>
-			<END>}</END>
-		</SPAN>
-
-		<!-- Scalar variables -->
-		<SEQ_REGEXP HASH_CHAR="$" TYPE="KEYWORD2">\$#?((\p{Alpha}\w*|_\w+)?::)*(\p{Alpha}\w*|_\w+|\d+)</SEQ_REGEXP>
-
-		<!-- Array variables -->
-		<SEQ_REGEXP HASH_CHAR="@" TYPE="KEYWORD2">@((\p{Alpha}\w*|_\w+)?::)*(\p{Alpha}\w*|_\w+|\d+)</SEQ_REGEXP>
-
-		<!-- Associative Array (= Hash) variables -->
-		<SEQ_REGEXP HASH_CHAR="%" TYPE="KEYWORD2">%((\p{Alpha}\w*|_\w+)?::)*(\p{Alpha}\w*|_\w+|\d+)</SEQ_REGEXP>
-
-		<!-- Dereferences -->
-		<SEQ_REGEXP HASH_CHAR="$$" TYPE="KEYWORD4">\$\$+((\p{Alpha}\w*|_\w+)?::)*(\p{Alpha}\w*|_\w+|\d+)</SEQ_REGEXP>
-		<SEQ_REGEXP HASH_CHAR="@$" TYPE="KEYWORD4">@\$((\p{Alpha}\w*|_\w+)?::)*(\p{Alpha}\w*|_\w+|\d+)</SEQ_REGEXP>
-		<SEQ_REGEXP HASH_CHAR="%$" TYPE="KEYWORD4">%\$((\p{Alpha}\w*|_\w+)?::)*(\p{Alpha}\w*|_\w+|\d+)</SEQ_REGEXP>
-		<SEQ_REGEXP HASH_CHAR="*" TYPE="KEYWORD4">\*((\p{Alpha}\w*|_\w+)?::)*(\p{Alpha}\w*|_\w+|\d+)</SEQ_REGEXP>
-
-		<!-- Perl predefined variables -->
-		<SEQ_REGEXP HASH_CHAR="$^" TYPE="KEYWORD2">\$\^\p{Alpha}</SEQ_REGEXP>
-		<SEQ_REGEXP HASH_CHAR="$" TYPE="KEYWORD2">\$\p{Punct}</SEQ_REGEXP>
-
-		<!-- references to vars and code, starting with a backslash -->
-		<SEQ_REGEXP HASH_CHAR="\" TYPE="KEYWORD4">\\[@%\$&amp;]((\p{Alpha}\w*|_\w+)?::)*(\p{Alpha}\w*|_\w+|\d+)</SEQ_REGEXP>
-
-		<!-- complex code dereference -->
-		<SPAN TYPE="KEYWORD4" NO_LINE_BREAK="TRUE" DELEGATE="MAIN">
-			<BEGIN>&amp;{</BEGIN>
-			<END>}</END>
-		</SPAN>
-
-		<!-- Function calls from variables -->
-		<SEQ_REGEXP HASH_CHAR="&amp;$" TYPE="FUNCTION">&amp;\$((\p{Alpha}\w*|_\w+)?::)*(\p{Alpha}\w*|_\w+|\d+)</SEQ_REGEXP>
-
-		<!-- Highlight calls to subs that contain ' in the name. -->
-		<SEQ_REGEXP HASH_CHAR="&amp;" TYPE="FUNCTION"
-		>&amp;\p{Alpha}[\p{Alnum}_]*'\p{Alpha}[\p{Alnum}_]*</SEQ_REGEXP>
-
-		<!-- Literals -->
-		<SPAN TYPE="LITERAL1" DELEGATE="LITERAL">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-
-		<!-- apostrophe literals -->
-		<SPAN TYPE="LITERAL1" DELEGATE="APOSTR">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-		<SEQ_REGEXP TYPE="LITERAL1">\b\w+\b(?=\s*=>)</SEQ_REGEXP>
-
-		<!-- options: -text -->
-		<SEQ_REGEXP HASH_CHAR="-" TYPE="LITERAL1">-[\p{Lower}]\w+</SEQ_REGEXP>
-
-		<!-- file stat expressions -->
-		<SEQ_REGEXP HASH_CHAR="-" TYPE="KEYWORD3">-[\p{Lower}]</SEQ_REGEXP>
-
-		<!-- non-quoted literals in hashes -->
-		<SPAN_REGEXP TYPE="OPERATOR" HASH_CHAR="{" NO_LINE_BREAK="TRUE" DELEGATE="LITERAL">
-			<BEGIN>\{(?=\s*[\p{Alpha}_\-][\p{Alnum}_]*\s*\})</BEGIN>
-			<END>}</END>
-		</SPAN_REGEXP>
-
-		<!-- Code blocks. This is a hack to correctly highlight some
-			 complex expressions that can have arbitrary perl code
-			 inside brackets (like array deferences below). Declaring
-			 this *before* the other rules is needed to maintain
-			 correct bracket matching.
-		-->
-		<SPAN TYPE="OPERATOR" NO_LINE_BREAK="FALSE" DELEGATE="MAIN">
-			<BEGIN>{</BEGIN>
-			<END>}</END>
-		</SPAN>
-
-		<!-- Array dereference -->
-		<SPAN TYPE="KEYWORD4" NO_LINE_BREAK="TRUE" DELEGATE="MAIN">
-			<BEGIN>@{</BEGIN>
-			<END>}</END>
-		</SPAN>
-
-		<!-- Hash dereference -->
-		<SPAN TYPE="KEYWORD4" NO_LINE_BREAK="TRUE" DELEGATE="MAIN">
-			<BEGIN>%{</BEGIN>
-			<END>}</END>
-		</SPAN>
-
-		<!-- labels, catches also package prefixes at line start :( -->
-		<MARK_PREVIOUS TYPE="LABEL" AT_LINE_START="TRUE" MATCH_TYPE="OPERATOR">:</MARK_PREVIOUS>
-
-		<!-- __DATA__ and similar -->
-		<SEQ_REGEXP HASH_CHAR="__" TYPE="KEYWORD4">__\w+__</SEQ_REGEXP>
-
-		<!-- Exec -->
-		<SPAN TYPE="KEYWORD3" DELEGATE="EXEC">
-			<BEGIN>`</BEGIN>
-			<END>`</END>
-		</SPAN>
-
-		<!-- file globs / IO operators -->
-		<SEQ_REGEXP HASH_CHAR="&lt;" TYPE="KEYWORD4">&lt;[\p{Punct}\p{Alnum}_]*&gt;</SEQ_REGEXP>
-
-		<!-- Heredoc -->
-		<SPAN_REGEXP HASH_CHAR="&lt;&lt;" TYPE="LITERAL2" DELEGATE="LITERAL">
-		<BEGIN><![CDATA[<<\p{Space}*(['"])([\p{Space}\p{Alnum}_]*)\1;?\s*]]></BEGIN>
-		<END AT_LINE_START="TRUE">$2</END>
-		</SPAN_REGEXP>
-		<SPAN_REGEXP HASH_CHAR="&lt;&lt;" TYPE="LITERAL2" DELEGATE="LITERAL">
-		<BEGIN><![CDATA[<<([\p{Alpha}_][\p{Alnum}_]*);?\s*]]></BEGIN>
-		<END AT_LINE_START="TRUE">$1</END>
-		</SPAN_REGEXP>
-
-		<!-- jEdit 4.1 adds regular expression syntax rules so we can
-		     highlight this sort of crap. -->
-
-		<!-- /Regexp/, avoid confusion with a sequence of two divisions! -->
-		<SEQ_REGEXP TYPE="MARKUP" HASH_CHAR="/"
-			AT_WORD_START="TRUE">/.*?[^\\]/([cgimosx]+\b|(?=[^cgimosx])|$)(?!\s*[\d\$\@\(\{\-A-Z"'])</SEQ_REGEXP>
-
-		<!-- q//, qq//, qx// -->
-		<SPAN_REGEXP HASH_CHAR="q"
-					 TYPE="LITERAL1"
-					 ESCAPE="\"
-					 MATCH_TYPE="OPERATOR"
-					 AT_WORD_START="TRUE"
-					 NO_LINE_BREAK="FALSE">
-			<BEGIN>q[qxw]?([#/\|!])</BEGIN>
-			<END>~1</END>
-		</SPAN_REGEXP>
-		<SPAN_REGEXP HASH_CHAR="q"
-					 MATCH_TYPE="OPERATOR"
-					 DELEGATE="QUOTED_BRACKET"
-					 AT_WORD_START="TRUE"
-					 NO_LINE_BREAK="FALSE">
-			<BEGIN>q[qxw]?(\[)</BEGIN>
-			<END>~1</END>
-		</SPAN_REGEXP>
-		<SPAN_REGEXP HASH_CHAR="q"
-					 MATCH_TYPE="OPERATOR"
-					 DELEGATE="QUOTED_BRACE"
-					 AT_WORD_START="TRUE"
-					 NO_LINE_BREAK="FALSE">
-			<BEGIN>q[qxw]?(\{)</BEGIN>
-			<END>~1</END>
-		</SPAN_REGEXP>
-		<SPAN_REGEXP HASH_CHAR="q"
-					 MATCH_TYPE="OPERATOR"
-					 DELEGATE="QUOTED_PAREN"
-					 AT_WORD_START="TRUE"
-					 NO_LINE_BREAK="FALSE">
-			<BEGIN>q[qxw]?(\()</BEGIN>
-			<END>~1</END>
-		</SPAN_REGEXP>
-
-		<!-- qr// should match other regex highlight colors -->
-		<SPAN_REGEXP HASH_CHAR="q"
-					 ESCAPE="\"
-					 TYPE="LITERAL1"
-					 MATCH_TYPE="OPERATOR"
-					 AT_WORD_START="TRUE"
-					 NO_LINE_BREAK="FALSE">
-			<BEGIN>qr([#/\|!])</BEGIN>
-			<END>~1</END>
-		</SPAN_REGEXP>
-		<SPAN_REGEXP HASH_CHAR="q"
-					 DELEGATE="QUOTED_BRACKET"
-					 MATCH_TYPE="OPERATOR"
-					 AT_WORD_START="TRUE"
-					 NO_LINE_BREAK="FALSE">
-			<BEGIN>qr(\[)</BEGIN>
-			<END>~1</END>
-		</SPAN_REGEXP>
-		<SPAN_REGEXP HASH_CHAR="q"
-					 DELEGATE="QUOTED_BRACE"
-					 MATCH_TYPE="OPERATOR"
-					 AT_WORD_START="TRUE"
-					 NO_LINE_BREAK="FALSE">
-			<BEGIN>qr(\{)</BEGIN>
-			<END>~1</END>
-		</SPAN_REGEXP>
-		<SPAN_REGEXP HASH_CHAR="q"
-					 DELEGATE="QUOTED_PAREN"
-					 ESCAPE="\"
-					 MATCH_TYPE="OPERATOR"
-					 AT_WORD_START="TRUE"
-					 NO_LINE_BREAK="FALSE">
-			<BEGIN>qr(\()</BEGIN>
- 			<END>~1</END>
- 		</SPAN_REGEXP>
-
-		<!-- tr/// transliteration -->
-		<SEQ_REGEXP TYPE="MARKUP" HASH_CHAR="tr"
-            AT_WORD_START="TRUE">tr\s*\{.*?[^\\]\}\s*\{(?:.*?[^\\])*?\}[cds]*</SEQ_REGEXP>
-
-		<SEQ_REGEXP TYPE="MARKUP" HASH_CHAR="tr"
-            AT_WORD_START="TRUE">tr([^\p{Alnum}\p{Space}\}])(?:.*?)\1(?:.*?)\1[cds]*</SEQ_REGEXP>
-
-		<!-- y/// translation -->
-		<SEQ_REGEXP TYPE="MARKUP" HASH_CHAR="y"
-            AT_WORD_START="TRUE">y\s*\{.*?[^\\]\}\s*\{(?:.*?[^\\])*?\}[cds]*</SEQ_REGEXP>
-
-		<SEQ_REGEXP TYPE="MARKUP" HASH_CHAR="y"
-            AT_WORD_START="TRUE">y([^\p{Alnum}\p{Space}\}_])(?:.*?)\1(?:.*?)\1[cds]*</SEQ_REGEXP>
-
-		<!-- m// regular expression matching -->
-		<SEQ_REGEXP TYPE="MARKUP" HASH_CHAR="m"
-			AT_WORD_START="TRUE">m\s*\{.*?[^\\]\}[cgimosx]*</SEQ_REGEXP>
-
-		<SEQ_REGEXP TYPE="MARKUP" HASH_CHAR="m"
-			AT_WORD_START="TRUE">m([^\p{Alnum}\p{Space}\}])(?:.*?[^\\])\1[cgimosx]*</SEQ_REGEXP>
-
-		<!-- s/// regular expression substitution -->
-		<SEQ_REGEXP TYPE="MARKUP" HASH_CHAR="s"
-            AT_WORD_START="TRUE">s\s*\{.*?\}\s*\{.*?\}[egimosx]*</SEQ_REGEXP>
-
-		<SEQ_REGEXP TYPE="MARKUP" HASH_CHAR="s"
-            AT_WORD_START="TRUE">s([^\p{Alnum}\p{Space}\}])(?:.*?)\1(?:.*?)\1[egimosx]*</SEQ_REGEXP>
-
-		<!-- complex operators -->
-		<SEQ TYPE="OPERATOR">||</SEQ>
-		<SEQ TYPE="OPERATOR">//</SEQ>
-		<SEQ TYPE="OPERATOR">&amp;&amp;</SEQ>
-		<SEQ TYPE="OPERATOR">!=</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;=&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">-&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">=&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">==</SEQ>
-		<SEQ TYPE="OPERATOR">=~</SEQ>
-		<SEQ TYPE="OPERATOR">!~</SEQ>
-		<SEQ TYPE="OPERATOR">~~</SEQ>
-
-		<SEQ TYPE="OPERATOR">+=</SEQ>
-		<SEQ TYPE="OPERATOR">-=</SEQ>
-		<SEQ TYPE="OPERATOR">/=</SEQ>
-		<SEQ TYPE="OPERATOR">*=</SEQ>
-		<SEQ TYPE="OPERATOR">.=</SEQ>
-		<SEQ TYPE="OPERATOR">%=</SEQ>
-
-		<SEQ TYPE="OPERATOR">&amp;=</SEQ>
-		<SEQ TYPE="OPERATOR">|=</SEQ>
-		<SEQ TYPE="OPERATOR">**=</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;&lt;=</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;&gt;=</SEQ>
-		<SEQ TYPE="OPERATOR">&amp;&amp;=</SEQ>
-		<SEQ TYPE="OPERATOR">||=</SEQ>
-		<SEQ TYPE="OPERATOR">^=</SEQ>
-		<SEQ TYPE="OPERATOR">x=</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;=</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;=</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;</SEQ>
-
-		<!-- simple operators -->
-		<SEQ TYPE="OPERATOR">|</SEQ>
-		<SEQ TYPE="OPERATOR">&amp;</SEQ>
-		<SEQ TYPE="OPERATOR">!</SEQ>
-		<SEQ TYPE="OPERATOR">=</SEQ>
-		<SEQ TYPE="OPERATOR">!</SEQ>
-		<SEQ TYPE="OPERATOR">+</SEQ>
-		<SEQ TYPE="OPERATOR">-</SEQ>
-		<SEQ TYPE="OPERATOR">/</SEQ>
-		<SEQ TYPE="OPERATOR">**</SEQ>
-		<SEQ TYPE="OPERATOR">*</SEQ>
-		<SEQ TYPE="OPERATOR">^</SEQ>
-		<SEQ TYPE="OPERATOR">~</SEQ>
-		<SEQ TYPE="OPERATOR">{</SEQ>
-		<SEQ TYPE="OPERATOR">}</SEQ>
-		<SEQ TYPE="OPERATOR">?</SEQ>
-		<SEQ TYPE="OPERATOR">:</SEQ>
-
-		<!-- Keywords -->
-		<KEYWORDS>
-			<KEYWORD1>new</KEYWORD1>
-			<KEYWORD1>if</KEYWORD1>
-			<KEYWORD1>until</KEYWORD1>
-			<KEYWORD1>while</KEYWORD1>
-			<KEYWORD1>elsif</KEYWORD1>
-			<KEYWORD1>else</KEYWORD1>
-			<KEYWORD1>unless</KEYWORD1>
-			<KEYWORD1>for</KEYWORD1>
-			<KEYWORD1>foreach</KEYWORD1>
-			<KEYWORD1>BEGIN</KEYWORD1>
-			<KEYWORD1>END</KEYWORD1>
-
-			<OPERATOR>cmp</OPERATOR>
-			<OPERATOR>eq</OPERATOR>
-			<OPERATOR>ne</OPERATOR>
-			<OPERATOR>le</OPERATOR>
-			<OPERATOR>ge</OPERATOR>
-			<OPERATOR>not</OPERATOR>
-			<OPERATOR>and</OPERATOR>
-			<OPERATOR>or</OPERATOR>
-			<OPERATOR>xor</OPERATOR>
-
-			<!-- At least attempt to highlight 'x', although this misses some -->
-			<OPERATOR>x</OPERATOR>
-
-			<!--
-				The following function list was derived from the perlfunc man
-				page, Perl version 5.00503
-
-				Certain keywords have been commented out where they appear more
-				than once, and the y///, qx//, etc. functions have been removed,
-				since they would are colorized not as keywords, but with separate
-				rules.
-			-->
-
-			<!-- Functions for SCALARs or strings -->
-			<KEYWORD3>chomp</KEYWORD3>
-			<KEYWORD3>chop</KEYWORD3>
-			<KEYWORD3>chr</KEYWORD3>
-			<KEYWORD3>crypt</KEYWORD3>
-			<KEYWORD3>hex</KEYWORD3>
-			<KEYWORD3>index</KEYWORD3>
-			<KEYWORD3>lc</KEYWORD3>
-			<KEYWORD3>lcfirst</KEYWORD3>
-			<KEYWORD3>length</KEYWORD3>
-			<KEYWORD3>oct</KEYWORD3>
-			<KEYWORD3>ord</KEYWORD3>
-			<KEYWORD3>pack</KEYWORD3>
-			<KEYWORD3>reverse</KEYWORD3>
-			<KEYWORD3>rindex</KEYWORD3>
-			<KEYWORD3>sprintf</KEYWORD3>
-			<KEYWORD3>substr</KEYWORD3>
-			<KEYWORD3>uc</KEYWORD3>
-			<KEYWORD3>ucfirst</KEYWORD3>
-
-			<!-- Regular expressions and pattern matching -->
-			<KEYWORD3>pos</KEYWORD3>
-			<KEYWORD3>quotemeta</KEYWORD3>
-			<KEYWORD3>split</KEYWORD3>
-			<KEYWORD3>study</KEYWORD3>
-
-			<!-- Numeric functions -->
-			<KEYWORD3>abs</KEYWORD3>
-			<KEYWORD3>atan2</KEYWORD3>
-			<KEYWORD3>cos</KEYWORD3>
-			<KEYWORD3>exp</KEYWORD3>
-			<!--<KEYWORD3>hex</KEYWORD3>-->
-			<KEYWORD3>int</KEYWORD3>
-			<KEYWORD3>log</KEYWORD3>
-			<!--<KEYWORD3>oct</KEYWORD3>-->
-			<KEYWORD3>rand</KEYWORD3>
-			<KEYWORD3>sin</KEYWORD3>
-			<KEYWORD3>sqrt</KEYWORD3>
-			<KEYWORD3>srand</KEYWORD3>
-
-			<!-- Functions for real @ARRAYs -->
-			<KEYWORD3>pop</KEYWORD3>
-			<KEYWORD3>push</KEYWORD3>
-			<KEYWORD3>shift</KEYWORD3>
-			<KEYWORD3>splice</KEYWORD3>
-			<KEYWORD3>unshift</KEYWORD3>
-
-			<!-- Functions for list data -->
-			<KEYWORD3>grep</KEYWORD3>
-			<KEYWORD3>join</KEYWORD3>
-			<KEYWORD3>map</KEYWORD3>
-			<!--<KEYWORD3>reverse</KEYWORD3>-->
-			<KEYWORD3>sort</KEYWORD3>
-			<KEYWORD3>unpack</KEYWORD3>
-
-			<!-- Functions for real %HASHes -->
-			<KEYWORD3>delete</KEYWORD3>
-			<KEYWORD3>each</KEYWORD3>
-			<KEYWORD3>exists</KEYWORD3>
-			<KEYWORD3>keys</KEYWORD3>
-			<KEYWORD3>values</KEYWORD3>
-
-			<!-- Input and output functions -->
-			<KEYWORD3>binmode</KEYWORD3>
-			<KEYWORD3>close</KEYWORD3>
-			<KEYWORD3>closedir</KEYWORD3>
-			<KEYWORD3>dbmclose</KEYWORD3>
-			<KEYWORD3>dbmopen</KEYWORD3>
-			<!--<KEYWORD3>die</KEYWORD3>-->
-			<KEYWORD3>eof</KEYWORD3>
-			<KEYWORD3>fileno</KEYWORD3>
-			<KEYWORD3>flock</KEYWORD3>
-			<KEYWORD3>format</KEYWORD3>
-			<KEYWORD3>getc</KEYWORD3>
-			<KEYWORD3>print</KEYWORD3>
-			<KEYWORD3>printf</KEYWORD3>
-			<KEYWORD3>read</KEYWORD3>
-			<KEYWORD3>readdir</KEYWORD3>
-			<KEYWORD3>rewinddir</KEYWORD3>
-			<KEYWORD3>say</KEYWORD3>
-			<KEYWORD3>seek</KEYWORD3>
-			<KEYWORD3>seekdir</KEYWORD3>
-			<KEYWORD3>select</KEYWORD3>
-			<KEYWORD3>syscall</KEYWORD3>
-			<KEYWORD3>sysread</KEYWORD3>
-			<KEYWORD3>sysseek</KEYWORD3>
-			<KEYWORD3>syswrite</KEYWORD3>
-			<KEYWORD3>tell</KEYWORD3>
-			<KEYWORD3>telldir</KEYWORD3>
-			<KEYWORD3>truncate</KEYWORD3>
-			<KEYWORD3>warn</KEYWORD3>
-			<KEYWORD3>write</KEYWORD3>
-
-			<!-- Functions for fixed length data or records -->
-			<!--<KEYWORD3>pack</KEYWORD3>-->
-			<!--<KEYWORD3>read</KEYWORD3>-->
-			<!--<KEYWORD3>syscall</KEYWORD3>-->
-			<!--<KEYWORD3>sysread</KEYWORD3>-->
-			<!--<KEYWORD3>syswrite</KEYWORD3>-->
-			<!--<KEYWORD3>unpack</KEYWORD3>-->
-			<KEYWORD3>vec</KEYWORD3>
-
-			<!-- Functions for filehandles, files, or directories -->
-			<KEYWORD3>chdir</KEYWORD3>
-			<KEYWORD3>chmod</KEYWORD3>
-			<KEYWORD3>chown</KEYWORD3>
-			<KEYWORD3>chroot</KEYWORD3>
-			<KEYWORD3>fcntl</KEYWORD3>
-			<KEYWORD3>glob</KEYWORD3>
-			<KEYWORD3>ioctl</KEYWORD3>
-			<KEYWORD3>link</KEYWORD3>
-			<KEYWORD3>lstat</KEYWORD3>
-			<KEYWORD3>mkdir</KEYWORD3>
-			<KEYWORD3>open</KEYWORD3>
-			<KEYWORD3>opendir</KEYWORD3>
-			<KEYWORD3>readlink</KEYWORD3>
-			<KEYWORD3>rename</KEYWORD3>
-			<KEYWORD3>rmdir</KEYWORD3>
-			<KEYWORD3>stat</KEYWORD3>
-			<KEYWORD3>symlink</KEYWORD3>
-			<KEYWORD3>umask</KEYWORD3>
-			<KEYWORD3>unlink</KEYWORD3>
-			<KEYWORD3>utime</KEYWORD3>
-
-			<!-- Keywords related to the control flow of your perl program -->
-			<KEYWORD1>caller</KEYWORD1>
-			<KEYWORD1>continue</KEYWORD1>
-			<KEYWORD1>die</KEYWORD1>
-			<KEYWORD1>do</KEYWORD1>
-			<KEYWORD1>dump</KEYWORD1>
-			<KEYWORD1>eval</KEYWORD1>
-			<KEYWORD1>exit</KEYWORD1>
-			<KEYWORD1>goto</KEYWORD1>
-			<KEYWORD1>last</KEYWORD1>
-			<KEYWORD1>next</KEYWORD1>
-			<KEYWORD1>redo</KEYWORD1>
-			<KEYWORD1>return</KEYWORD1>
-			<KEYWORD1>wantarray</KEYWORD1>
-
-			<!-- Keywords related to switch -->
-			<KEYWORD1>break</KEYWORD1>
-			<KEYWORD1>default</KEYWORD1>
-			<KEYWORD1>given</KEYWORD1>
-			<KEYWORD1>when</KEYWORD1>
-
-			<!-- Keywords related to scoping -->
-			<!--<KEYWORD1>caller</KEYWORD1>-->
-			<!--<KEYWORD1>import</KEYWORD1>-->
-			<KEYWORD1>local</KEYWORD1>
-			<KEYWORD1>my</KEYWORD1>
-			<KEYWORD1>our</KEYWORD1>
-			<KEYWORD1>package</KEYWORD1>
-			<KEYWORD1>state</KEYWORD1>
-			<KEYWORD1>use</KEYWORD1>
-
-			<!-- Miscellaneous functions -->
-			<KEYWORD3>defined</KEYWORD3>
-			<!--<KEYWORD3>dump</KEYWORD3>-->
-			<!--<KEYWORD3>eval</KEYWORD3>-->
-			<KEYWORD3>formline</KEYWORD3>
-			<!--<KEYWORD3>local</KEYWORD3>-->
-			<!--<KEYWORD3>my</KEYWORD3>-->
-			<KEYWORD3>reset</KEYWORD3>
-			<KEYWORD3>scalar</KEYWORD3>
-			<KEYWORD3>undef</KEYWORD3>
-			<!--<KEYWORD3>wantarray</KEYWORD3>-->
-
-			<!-- Functions for processes and process groups -->
-			<KEYWORD3>alarm</KEYWORD3>
-			<KEYWORD3>exec</KEYWORD3>
-			<KEYWORD3>fork</KEYWORD3>
-			<KEYWORD3>getpgrp</KEYWORD3>
-			<KEYWORD3>getppid</KEYWORD3>
-			<KEYWORD3>getpriority</KEYWORD3>
-			<KEYWORD3>kill</KEYWORD3>
-			<KEYWORD3>pipe</KEYWORD3>
-			<KEYWORD3>setpgrp</KEYWORD3>
-			<KEYWORD3>setpriority</KEYWORD3>
-			<KEYWORD3>sleep</KEYWORD3>
-			<KEYWORD3>system</KEYWORD3>
-			<KEYWORD3>times</KEYWORD3>
-			<KEYWORD3>wait</KEYWORD3>
-			<KEYWORD3>waitpid</KEYWORD3>
-
-			<!-- Keywords related to perl modules -->
-			<!--<KEYWORD1>do</KEYWORD1>-->
-			<KEYWORD1>import</KEYWORD1>
-			<KEYWORD1>no</KEYWORD1>
-			<!--<KEYWORD1>package</KEYWORD1>-->
-			<KEYWORD1>require</KEYWORD1>
-			<!--<KEYWORD1>use</KEYWORD1>-->
-
-			<!-- Keywords related to classes and object-orientedness -->
-			<KEYWORD3>bless</KEYWORD3>
-			<!--<KEYWORD3>dbmclose</KEYWORD3>-->
-			<!--<KEYWORD3>dbmopen</KEYWORD3>-->
-			<!--<KEYWORD3>package</KEYWORD3>-->
-			<KEYWORD3>ref</KEYWORD3>
-			<KEYWORD3>tie</KEYWORD3>
-			<KEYWORD3>tied</KEYWORD3>
-			<KEYWORD3>untie</KEYWORD3>
-			<!--<KEYWORD3>use</KEYWORD3>-->
-
-			<!-- Low-level socket functions -->
-			<KEYWORD3>accept</KEYWORD3>
-			<KEYWORD3>bind</KEYWORD3>
-			<KEYWORD3>connect</KEYWORD3>
-			<KEYWORD3>getpeername</KEYWORD3>
-			<KEYWORD3>getsockname</KEYWORD3>
-			<KEYWORD3>getsockopt</KEYWORD3>
-			<KEYWORD3>listen</KEYWORD3>
-			<KEYWORD3>recv</KEYWORD3>
-			<KEYWORD3>send</KEYWORD3>
-			<KEYWORD3>setsockopt</KEYWORD3>
-			<KEYWORD3>shutdown</KEYWORD3>
-			<KEYWORD3>socket</KEYWORD3>
-			<KEYWORD3>socketpair</KEYWORD3>
-
-			<!-- System V interprocess communication functions -->
-			<KEYWORD3>msgctl</KEYWORD3>
-			<KEYWORD3>msgget</KEYWORD3>
-			<KEYWORD3>msgrcv</KEYWORD3>
-			<KEYWORD3>msgsnd</KEYWORD3>
-			<KEYWORD3>semctl</KEYWORD3>
-			<KEYWORD3>semget</KEYWORD3>
-
-			<KEYWORD3>semop</KEYWORD3>
-			<KEYWORD3>shmctl</KEYWORD3>
-			<KEYWORD3>shmget</KEYWORD3>
-			<KEYWORD3>shmread</KEYWORD3>
-			<KEYWORD3>shmwrite</KEYWORD3>
-
-			<!-- Fetching user and group info -->
-			<KEYWORD3>endgrent</KEYWORD3>
-			<KEYWORD3>endhostent</KEYWORD3>
-			<KEYWORD3>endnetent</KEYWORD3>
-			<KEYWORD3>endpwent</KEYWORD3>
-			<KEYWORD3>getgrent</KEYWORD3>
-			<KEYWORD3>getgrgid</KEYWORD3>
-			<KEYWORD3>getgrnam</KEYWORD3>
-			<KEYWORD3>getlogin</KEYWORD3>
-			<KEYWORD3>getpwent</KEYWORD3>
-			<KEYWORD3>getpwnam</KEYWORD3>
-			<KEYWORD3>getpwuid</KEYWORD3>
-			<KEYWORD3>setgrent</KEYWORD3>
-			<KEYWORD3>setpwent</KEYWORD3>
-
-			<!-- Fetching network info -->
-			<KEYWORD3>endprotoent</KEYWORD3>
-			<KEYWORD3>endservent</KEYWORD3>
-			<KEYWORD3>gethostbyaddr</KEYWORD3>
-			<KEYWORD3>gethostbyname</KEYWORD3>
-			<KEYWORD3>gethostent</KEYWORD3>
-			<KEYWORD3>getnetbyaddr</KEYWORD3>
-			<KEYWORD3>getnetbyname</KEYWORD3>
-			<KEYWORD3>getnetent</KEYWORD3>
-			<KEYWORD3>getprotobyname</KEYWORD3>
-			<KEYWORD3>getprotobynumber</KEYWORD3>
-			<KEYWORD3>getprotoent</KEYWORD3>
-			<KEYWORD3>getservbyname</KEYWORD3>
-			<KEYWORD3>getservbyport</KEYWORD3>
-			<KEYWORD3>getservent</KEYWORD3>
-			<KEYWORD3>sethostent</KEYWORD3>
-			<KEYWORD3>setnetent</KEYWORD3>
-			<KEYWORD3>setprotoent</KEYWORD3>
-			<KEYWORD3>setservent</KEYWORD3>
-
-			<!-- Time-related functions -->
-			<KEYWORD3>gmtime</KEYWORD3>
-			<KEYWORD3>localtime</KEYWORD3>
-			<KEYWORD3>time</KEYWORD3>
-			<!--<KEYWORD3>times</KEYWORD3>-->
-
-			<FUNCTION>sub</FUNCTION>
-		</KEYWORDS>
-	</RULES>
-
-	<RULES SET="POD" DEFAULT="COMMENT2">
-		<MARK_FOLLOWING TYPE="LABEL" AT_LINE_START="TRUE">=</MARK_FOLLOWING>
-	</RULES>
-
-	<RULES SET="LITERAL" DEFAULT="LITERAL1" ESCAPE="\">
-		<!-- Variables inside a Literal -->
-		<SPAN TYPE="KEYWORD2" NO_LINE_BREAK="TRUE" DELEGATE="VARIABLE">
-			<BEGIN>${</BEGIN>
-			<END>}</END>
-		</SPAN>
-
-		<!-- object method inside a Literal -->
-		<SPAN TYPE="KEYWORD2" NO_LINE_BREAK="TRUE" DELEGATE="VARIABLE">
-			<BEGIN>->{</BEGIN>
-			<END>}</END>
-		</SPAN>
-
-		<SEQ_REGEXP HASH_CHAR="$" TYPE="KEYWORD2">\$#?((\p{Alpha}\w*|_\w+)?::)*(\p{Alpha}\w*|_\w+|\d+)</SEQ_REGEXP>
-
-		<SPAN TYPE="KEYWORD2" NO_LINE_BREAK="TRUE" DELEGATE="VARIABLE">
-			<BEGIN>@{</BEGIN>
-			<END>}</END>
-		</SPAN>
-
-		<MARK_FOLLOWING TYPE="KEYWORD2">@</MARK_FOLLOWING>
-
-		<SPAN TYPE="KEYWORD2" NO_LINE_BREAK="TRUE" DELEGATE="VARIABLE">
-			<BEGIN>%{</BEGIN>
-			<END>}</END>
-		</SPAN>
-
-		<MARK_FOLLOWING TYPE="KEYWORD2">%</MARK_FOLLOWING>
-
-		<SEQ TYPE="LITERAL1">|</SEQ>
-		<SEQ TYPE="LITERAL1">&amp;</SEQ>
-		<SEQ TYPE="LITERAL1">!</SEQ>
-		<SEQ TYPE="LITERAL1">&gt;</SEQ>
-		<SEQ TYPE="LITERAL1">&lt;</SEQ>
-		<SEQ TYPE="LITERAL1">)</SEQ>
-		<SEQ TYPE="LITERAL1">(</SEQ>
-		<SEQ TYPE="LITERAL1">=</SEQ>
-		<SEQ TYPE="LITERAL1">!</SEQ>
-		<SEQ TYPE="LITERAL1">+</SEQ>
-		<SEQ TYPE="LITERAL1">-</SEQ>
-		<SEQ TYPE="LITERAL1">/</SEQ>
-		<SEQ TYPE="LITERAL1">*</SEQ>
-		<SEQ TYPE="LITERAL1">^</SEQ>
-		<SEQ TYPE="LITERAL1">~</SEQ>
-		<SEQ TYPE="LITERAL1">}</SEQ>
-		<SEQ TYPE="LITERAL1">{</SEQ>
-		<SEQ TYPE="LITERAL1">.</SEQ>
-		<SEQ TYPE="LITERAL1">,</SEQ>
-		<SEQ TYPE="LITERAL1">;</SEQ>
-		<SEQ TYPE="LITERAL1">]</SEQ>
-		<SEQ TYPE="LITERAL1">[</SEQ>
-		<SEQ TYPE="LITERAL1">?</SEQ>
-		<SEQ TYPE="LITERAL1">:</SEQ>
-	</RULES>
-
-	<!-- Literals framed by apostrophs -->
-	<RULES SET="APOSTR" DEFAULT="LITERAL1" ESCAPE="\">
-
-		<!-- just a hack for sprintf -->
-		<SEQ_REGEXP HASH_CHAR="%" TYPE="LITERAL4">%\d*\.?\d*[dfis]</SEQ_REGEXP>
-
-	</RULES>
-
-	<RULES SET="EXEC" DEFAULT="KEYWORD3" ESCAPE="\">
-		<!-- Comments -->
-		<EOL_SPAN TYPE="COMMENT1">#</EOL_SPAN>
-
-		<!-- Variables -->
-		<SPAN TYPE="KEYWORD2" NO_LINE_BREAK="TRUE">
-			<BEGIN>${</BEGIN>
-			<END>}</END>
-		</SPAN>
-
-		<MARK_FOLLOWING TYPE="KEYWORD2">$#</MARK_FOLLOWING>
-		<MARK_FOLLOWING TYPE="KEYWORD2">$</MARK_FOLLOWING>
-
-		<SPAN TYPE="KEYWORD2" NO_LINE_BREAK="TRUE">
-			<BEGIN>@{</BEGIN>
-			<END>}</END>
-		</SPAN>
-
-		<MARK_FOLLOWING TYPE="KEYWORD2">@</MARK_FOLLOWING>
-
-		<SPAN TYPE="KEYWORD2" NO_LINE_BREAK="TRUE">
-			<BEGIN>%{</BEGIN>
-			<END>}</END>
-		</SPAN>
-
-		<MARK_FOLLOWING TYPE="KEYWORD2">%</MARK_FOLLOWING>
-	</RULES>
-
-	<RULES SET="VARIABLE" DEFAULT="KEYWORD2" ESCAPE="\">
- 		<SPAN TYPE="KEYWORD2" NO_LINE_BREAK="TRUE" DELEGATE="VARIABLE">
-			<BEGIN>{</BEGIN>
-			<END>}</END>
-		</SPAN>
-
-		<SEQ TYPE="OPERATOR">-&gt;</SEQ>
-	</RULES>
-
-	<!-- Used for quote-like operators; just makes sure the brackets are balanced. -->
-	<RULES SET="QUOTED_BRACKET" DEFAULT="LITERAL1" ESCAPE="\">
-		<SPAN NO_LINE_BREAK="FALSE"
-					 TYPE="LITERAL1"
-					 MATCH_TYPE="OPERATOR"
-					 DELEGATE="QUOTED_BRACKET"
-					 HASH_CHARS="[">
-			<BEGIN>[</BEGIN>
-			<END>]</END>
-		</SPAN>
-	</RULES>
-	<RULES SET="QUOTED_BRACE" DEFAULT="LITERAL1" ESCAPE="\">
-		<SPAN NO_LINE_BREAK="FALSE"
-					 TYPE="LITERAL1"
-					 MATCH_TYPE="OPERATOR"
-					 DELEGATE="QUOTED_BRACE"
-					 HASH_CHARS="{">
-			<BEGIN>{</BEGIN>
-			<END>}</END>
-		</SPAN>
-	</RULES>
-	<RULES SET="QUOTED_PAREN" DEFAULT="LITERAL1" ESCAPE="\">
-		<SPAN NO_LINE_BREAK="FALSE"
-					 TYPE="LITERAL1"
-					 MATCH_TYPE="OPERATOR"
-					 DELEGATE="QUOTED_PAREN"
-					 HASH_CHARS="(">
-			<BEGIN>(</BEGIN>
-			<END>)</END>
-		</SPAN>
-	</RULES>
-
-</MODE>
diff --git a/qpython/src/main/assets/syntax/pg_sql.xml b/qpython/src/main/assets/syntax/pg_sql.xml
deleted file mode 100644
index 348feef1..00000000
--- a/qpython/src/main/assets/syntax/pg_sql.xml
+++ /dev/null
@@ -1,1192 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-<!--
-   Thiemo Kellner, 2009-08-06
-   Eric Le Lay, 2013
-   mode for PosgreSQL 9.2 flavour of sql and PG-PL/SQL
-   based on ora-sql.xml
-   checked against http://www.postgresql.org/docs/9.2/static
--->
-
-<MODE>
-   <PROPS>
-      <PROPERTY NAME="commentStart" VALUE="/*" />
-      <PROPERTY NAME="commentEnd" VALUE="*/" />
-      <PROPERTY NAME="lineComment" VALUE="--" />
-   </PROPS>
-   <RULES IGNORE_CASE="TRUE" HIGHLIGHT_DIGITS="TRUE">
-      <SPAN TYPE="COMMENT1">
-         <BEGIN>/*</BEGIN>
-         <END>*/</END>
-      </SPAN>
-
-      <SPAN TYPE="LITERAL1">
-         <BEGIN>"</BEGIN>
-         <END>"</END>
-      </SPAN>
-      <SPAN TYPE="LITERAL1">
-         <BEGIN>'</BEGIN>
-         <END>'</END>
-      </SPAN>
-
-      <!-- dollar-quoted (restricted tag name) -->
-      <SPAN_REGEXP HASH_CHAR="$" TYPE="LITERAL2">
-      <BEGIN><![CDATA[\$([\p{Alnum}_]*)\$]]></BEGIN>
-      <END REGEXP="TRUE">$1\$</END>
-      </SPAN_REGEXP>
-
-      <EOL_SPAN TYPE="COMMENT2">--</EOL_SPAN>
-
-      <MARK_PREVIOUS TYPE="FUNCTION"
-         MATCH_TYPE="OPERATOR">(</MARK_PREVIOUS>
-
-      <!--<MARK_PREVIOUS TYPE="FUNCTION"
-         MATCH_TYPE="OPERATOR"> (</MARK_PREVIOUS> interferes with structures like INSERT highlighting the table name as function -->
-
-      <MARK_PREVIOUS TYPE="LABEL" AT_LINE_START="TRUE">:</MARK_PREVIOUS>
-
-      <MARK_FOLLOWING TYPE="LITERAL3"
-         MATCH_TYPE="OPERATOR" AT_WHITESPACE_END="TRUE">\</MARK_FOLLOWING>
-
-      <SEQ TYPE="OPERATOR">&amp;</SEQ>
-      <SEQ TYPE="OPERATOR">(</SEQ>
-      <SEQ TYPE="OPERATOR">)</SEQ>
-      <SEQ TYPE="OPERATOR">*</SEQ>
-      <SEQ TYPE="OPERATOR">+</SEQ>
-      <SEQ TYPE="OPERATOR">,</SEQ>
-      <SEQ TYPE="OPERATOR">-</SEQ>
-      <SEQ TYPE="OPERATOR">.</SEQ>
-      <SEQ TYPE="OPERATOR">/</SEQ>
-      <SEQ TYPE="OPERATOR">:</SEQ>
-      <SEQ TYPE="OPERATOR">&lt;</SEQ>
-      <SEQ TYPE="OPERATOR">&lt;&lt;</SEQ>
-      <SEQ TYPE="OPERATOR">=</SEQ>
-      <SEQ TYPE="OPERATOR">&gt;</SEQ>
-      <SEQ TYPE="OPERATOR">&gt;&gt;</SEQ>
-      <SEQ TYPE="OPERATOR">@</SEQ>
-      <SEQ TYPE="OPERATOR">[</SEQ>
-      <SEQ TYPE="OPERATOR">]</SEQ>
-      <SEQ TYPE="OPERATOR">^</SEQ>
-      <SEQ TYPE="OPERATOR">|</SEQ>
-      <SEQ TYPE="OPERATOR">%</SEQ>
-      <SEQ TYPE="OPERATOR">|/</SEQ>
-      <SEQ TYPE="OPERATOR">||/</SEQ>
-      <SEQ TYPE="OPERATOR">!</SEQ>
-      <SEQ TYPE="OPERATOR">!!</SEQ>
-      <SEQ TYPE="OPERATOR">@</SEQ>
-      <SEQ TYPE="OPERATOR">#</SEQ>
-      <SEQ TYPE="OPERATOR">~</SEQ>
-      <SEQ TYPE="OPERATOR">`</SEQ>
-
-      <KEYWORDS>
-         <!-- reserved and not so reserved words -->
-         <KEYWORD1>ABORT</KEYWORD1>
-         <KEYWORD1>ABSOLUTE</KEYWORD1>
-         <KEYWORD1>ACCESS</KEYWORD1>
-         <KEYWORD1>ACTION</KEYWORD1>
-         <KEYWORD1>ADD</KEYWORD1>
-         <KEYWORD1>ADMIN</KEYWORD1>
-         <KEYWORD1>AFTER</KEYWORD1>
-         <KEYWORD1>AGGREGATE</KEYWORD1>
-         <KEYWORD1>ALL</KEYWORD1>
-         <KEYWORD1>ALSO</KEYWORD1>
-         <KEYWORD1>ALTER</KEYWORD1>
-         <KEYWORD1>ALWAYS</KEYWORD1>
-         <KEYWORD1>ANALYSE</KEYWORD1>
-         <KEYWORD1>ANALYZE</KEYWORD1>
-         <KEYWORD1>AND</KEYWORD1>
-         <KEYWORD1>ANY</KEYWORD1>
-         <KEYWORD1>ARRAY</KEYWORD1>
-         <KEYWORD1>AS</KEYWORD1>
-         <KEYWORD1>ASC</KEYWORD1>
-         <KEYWORD1>ASSERTION</KEYWORD1>
-         <KEYWORD1>ASSIGNMENT</KEYWORD1>
-         <KEYWORD1>ASYMMETRIC</KEYWORD1>
-         <KEYWORD1>AT</KEYWORD1>
-         <KEYWORD1>ATTRIBUTE</KEYWORD1>
-         <KEYWORD1>AUTHORIZATION</KEYWORD1>
-         <KEYWORD1>BACKWARD</KEYWORD1>
-         <KEYWORD1>BEFORE</KEYWORD1>
-         <KEYWORD1>BEGIN</KEYWORD1>
-         <KEYWORD1>BETWEEN</KEYWORD1>
-         <KEYWORD1>BIGINT</KEYWORD1>
-         <KEYWORD1>BINARY</KEYWORD1>
-         <KEYWORD1>BIT</KEYWORD1>
-         <KEYWORD1>BOOLEAN</KEYWORD1>
-         <KEYWORD1>BOTH</KEYWORD1>
-         <KEYWORD1>BY</KEYWORD1>
-         <KEYWORD1>CACHE</KEYWORD1>
-         <KEYWORD1>CALLED</KEYWORD1>
-         <KEYWORD1>CASCADE</KEYWORD1>
-         <KEYWORD1>CASCADED</KEYWORD1>
-         <KEYWORD1>CASE</KEYWORD1>
-         <KEYWORD1>CAST</KEYWORD1>
-         <KEYWORD1>CATALOG</KEYWORD1>
-         <KEYWORD1>CHAIN</KEYWORD1>
-         <KEYWORD1>CHAR</KEYWORD1>
-         <KEYWORD1>CHARACTER</KEYWORD1>
-         <KEYWORD1>CHARACTERISTICS</KEYWORD1>
-         <KEYWORD1>CHECK</KEYWORD1>
-         <KEYWORD1>CHECKPOINT</KEYWORD1>
-         <KEYWORD1>CLASS</KEYWORD1>
-         <KEYWORD1>CLOSE</KEYWORD1>
-         <KEYWORD1>CLUSTER</KEYWORD1>
-         <!--<KEYWORD1>COALESCE</KEYWORD1> keyword2-->
-         <KEYWORD1>COLLATE</KEYWORD1>
-         <KEYWORD1>COLLATION</KEYWORD1>
-         <KEYWORD1>COLUMN</KEYWORD1>
-         <KEYWORD1>COMMENT</KEYWORD1>
-         <KEYWORD1>COMMENTS</KEYWORD1>
-         <KEYWORD1>COMMIT</KEYWORD1>
-         <KEYWORD1>COMMITTED</KEYWORD1>
-         <KEYWORD1>CONCURRENTLY</KEYWORD1>
-         <KEYWORD1>CONFIGURATION</KEYWORD1>
-         <KEYWORD1>CONNECTION</KEYWORD1>
-         <KEYWORD1>CONSTRAINT</KEYWORD1>
-         <KEYWORD1>CONSTRAINTS</KEYWORD1>
-         <KEYWORD1>CONTENT</KEYWORD1>
-         <KEYWORD1>CONTINUE</KEYWORD1>
-         <KEYWORD1>CONVERSION</KEYWORD1>
-         <KEYWORD1>COPY</KEYWORD1>
-         <KEYWORD1>COST</KEYWORD1>
-         <KEYWORD1>CREATE</KEYWORD1>
-         <KEYWORD1>CREATEDB</KEYWORD1> <!-- http://www.postgresql.org/docs/9.2/static/sql-createrole.html -->
-         <KEYWORD1>CREATEROLE</KEYWORD1> <!-- http://www.postgresql.org/docs/9.2/static/sql-createrole.html -->
-         <KEYWORD1>CREATEUSER</KEYWORD1> <!-- http://www.postgresql.org/docs/9.2/static/sql-createrole.html -->
-         <KEYWORD1>CROSS</KEYWORD1>
-         <KEYWORD1>CSV</KEYWORD1>
-         <KEYWORD1>CURRENT</KEYWORD1>
-         <KEYWORD1>CURRENT_CATALOG</KEYWORD1>
-         <!--<KEYWORD1>CURRENT_DATE</KEYWORD1>-->
-         <KEYWORD1>CURRENT_ROLE</KEYWORD1>
-         <KEYWORD1>CURRENT_SCHEMA</KEYWORD1>
-         <!--<KEYWORD1>CURRENT_TIME</KEYWORD1>-->
-         <!--<KEYWORD1>CURRENT_TIMESTAMP</KEYWORD1>-->
-         <KEYWORD1>CURRENT_USER</KEYWORD1>
-         <KEYWORD1>CURSOR</KEYWORD1>
-         <KEYWORD1>CYCLE</KEYWORD1>
-         <KEYWORD1>DATA</KEYWORD1>
-         <KEYWORD1>DATABASE</KEYWORD1>
-         <KEYWORD1>DAY</KEYWORD1>
-         <KEYWORD1>DEALLOCATE</KEYWORD1>
-         <KEYWORD1>DEC</KEYWORD1>
-         <KEYWORD1>DECIMAL</KEYWORD1>
-         <KEYWORD1>DECLARE</KEYWORD1>
-         <KEYWORD1>DEFAULT</KEYWORD1>
-         <KEYWORD1>DEFAULTS</KEYWORD1>
-         <KEYWORD1>DEFERRABLE</KEYWORD1>
-         <KEYWORD1>DEFERRED</KEYWORD1>
-         <KEYWORD1>DEFINER</KEYWORD1>
-         <KEYWORD1>DELETE</KEYWORD1>
-         <KEYWORD1>DELIMITER</KEYWORD1>
-         <KEYWORD1>DELIMITERS</KEYWORD1>
-         <KEYWORD1>DESC</KEYWORD1>
-         <KEYWORD1>DICTIONARY</KEYWORD1>
-         <KEYWORD1>DISABLE</KEYWORD1>
-         <KEYWORD1>DISCARD</KEYWORD1>
-         <KEYWORD1>DISTINCT</KEYWORD1>
-         <KEYWORD1>DO</KEYWORD1>
-         <KEYWORD1>DOCUMENT</KEYWORD1>
-         <KEYWORD1>DOMAIN</KEYWORD1>
-         <KEYWORD1>DOUBLE</KEYWORD1>
-         <KEYWORD1>DROP</KEYWORD1>
-         <KEYWORD1>EACH</KEYWORD1>
-         <KEYWORD1>ELSE</KEYWORD1>
-         <KEYWORD1>ENABLE</KEYWORD1>
-         <KEYWORD1>ENCODING</KEYWORD1>
-         <KEYWORD1>ENCRYPTED</KEYWORD1>
-         <KEYWORD1>END</KEYWORD1>
-         <KEYWORD1>ENUM</KEYWORD1>
-         <KEYWORD1>ESCAPE</KEYWORD1>
-         <KEYWORD1>EXCEPT</KEYWORD1>
-         <KEYWORD1>EXCEPTION</KEYWORD1> <!-- http://docs.postgresql.fr/9.2/plpgsql-control-structures.html#plpgsql-error-trapping -->
-         <KEYWORD1>EXCLUDE</KEYWORD1>
-         <KEYWORD1>EXCLUDING</KEYWORD1>
-         <KEYWORD1>EXCLUSIVE</KEYWORD1>
-         <KEYWORD1>EXECUTE</KEYWORD1>
-         <KEYWORD1>EXISTS</KEYWORD1>
-         <KEYWORD1>EXPLAIN</KEYWORD1>
-         <KEYWORD1>EXTENSION</KEYWORD1>
-         <KEYWORD1>EXTERNAL</KEYWORD1>
-         <!--<KEYWORD1>EXTRACT</KEYWORD1>-->
-         <KEYWORD1>FALSE</KEYWORD1>
-         <KEYWORD1>FAMILY</KEYWORD1>
-         <KEYWORD1>FETCH</KEYWORD1>
-         <KEYWORD1>FIRST</KEYWORD1>
-         <KEYWORD1>FLOAT</KEYWORD1>
-         <KEYWORD1>FOLLOWING</KEYWORD1>
-         <KEYWORD1>FOR</KEYWORD1>
-         <KEYWORD1>FORCE</KEYWORD1>
-         <KEYWORD1>FOREIGN</KEYWORD1>
-         <KEYWORD1>FORWARD</KEYWORD1>
-         <KEYWORD1>FREEZE</KEYWORD1>
-         <KEYWORD1>FROM</KEYWORD1>
-         <KEYWORD1>FULL</KEYWORD1>
-         <KEYWORD1>FUNCTION</KEYWORD1>
-         <KEYWORD1>FUNCTIONS</KEYWORD1>
-         <KEYWORD1>GLOBAL</KEYWORD1>
-         <KEYWORD1>GRANT</KEYWORD1>
-         <KEYWORD1>GRANTED</KEYWORD1>
-         <!--<KEYWORD1>GREATEST</KEYWORD1>-->
-         <KEYWORD1>GROUP</KEYWORD1>
-         <KEYWORD1>HANDLER</KEYWORD1>
-         <KEYWORD1>HAVING</KEYWORD1>
-         <KEYWORD1>HEADER</KEYWORD1>
-         <KEYWORD1>HOLD</KEYWORD1>
-         <KEYWORD1>HOUR</KEYWORD1>
-         <KEYWORD1>IDENTITY</KEYWORD1>
-         <KEYWORD1>ILIKE</KEYWORD1>
-         <KEYWORD1>IMMEDIATE</KEYWORD1>
-         <KEYWORD1>IMMUTABLE</KEYWORD1>
-         <KEYWORD1>IMPLICIT</KEYWORD1>
-         <KEYWORD1>IN</KEYWORD1>
-         <KEYWORD1>INCLUDING</KEYWORD1>
-         <KEYWORD1>INCREMENT</KEYWORD1>
-         <KEYWORD1>INDEX</KEYWORD1>
-         <KEYWORD1>INDEXES</KEYWORD1>
-         <KEYWORD1>INHERIT</KEYWORD1>
-         <KEYWORD1>INHERITS</KEYWORD1>
-         <KEYWORD1>INITIALLY</KEYWORD1>
-         <KEYWORD1>INLINE</KEYWORD1>
-         <KEYWORD1>INNER</KEYWORD1>
-         <KEYWORD1>INOUT</KEYWORD1>
-         <KEYWORD1>INPUT</KEYWORD1>
-         <KEYWORD1>INSENSITIVE</KEYWORD1>
-         <KEYWORD1>INSERT</KEYWORD1>
-         <KEYWORD1>INSTEAD</KEYWORD1>
-         <KEYWORD1>INT</KEYWORD1>
-         <KEYWORD1>INTEGER</KEYWORD1>
-         <KEYWORD1>INTERSECT</KEYWORD1>
-         <KEYWORD1>INTERVAL</KEYWORD1>
-         <KEYWORD1>INTO</KEYWORD1>
-         <KEYWORD1>INVOKER</KEYWORD1>
-         <KEYWORD1>IS</KEYWORD1>
-         <KEYWORD1>ISNULL</KEYWORD1>
-         <KEYWORD1>ISOLATION</KEYWORD1>
-         <KEYWORD1>JOIN</KEYWORD1>
-         <KEYWORD1>KEY</KEYWORD1>
-         <KEYWORD1>LABEL</KEYWORD1>
-         <KEYWORD1>LANGUAGE</KEYWORD1>
-         <KEYWORD1>LARGE</KEYWORD1>
-         <KEYWORD1>LAST</KEYWORD1>
-         <KEYWORD1>LC_COLLATE</KEYWORD1>
-         <KEYWORD1>LC_CTYPE</KEYWORD1>
-         <KEYWORD1>LEADING</KEYWORD1>
-         <KEYWORD1>LEAKPROOF</KEYWORD1>
-         <!--<KEYWORD1>LEAST</KEYWORD1>-->
-         <KEYWORD1>LEFT</KEYWORD1>
-         <KEYWORD1>LEVEL</KEYWORD1>
-         <KEYWORD1>LIKE</KEYWORD1>
-         <KEYWORD1>LIMIT</KEYWORD1>
-         <KEYWORD1>LISTEN</KEYWORD1>
-         <KEYWORD1>LOAD</KEYWORD1>
-         <KEYWORD1>LOCAL</KEYWORD1>
-         <!--<KEYWORD1>LOCALTIME</KEYWORD1>
-         <KEYWORD1>LOCALTIMESTAMP</KEYWORD1>-->
-         <KEYWORD1>LOCATION</KEYWORD1>
-         <KEYWORD1>LOCK</KEYWORD1>
-         <KEYWORD1>LOGIN</KEYWORD1> <!-- http://www.postgresql.org/docs/9.2/static/sql-createrole.html -->
-         <KEYWORD1>MAPPING</KEYWORD1>
-         <KEYWORD1>MATCH</KEYWORD1>
-         <KEYWORD1>MAXVALUE</KEYWORD1>
-         <KEYWORD1>MINUTE</KEYWORD1>
-         <KEYWORD1>MINVALUE</KEYWORD1>
-         <KEYWORD1>MODE</KEYWORD1>
-         <KEYWORD1>MONTH</KEYWORD1>
-         <KEYWORD1>MOVE</KEYWORD1>
-         <KEYWORD1>NAME</KEYWORD1>
-         <KEYWORD1>NAMES</KEYWORD1>
-         <KEYWORD1>NATIONAL</KEYWORD1>
-         <KEYWORD1>NATURAL</KEYWORD1>
-         <KEYWORD1>NCHAR</KEYWORD1>
-         <KEYWORD1>NEW</KEYWORD1> <!-- http://www.postgresql.org/docs/9.2/static/plpgsql-trigger.html -->
-         <KEYWORD1>NEXT</KEYWORD1>
-         <KEYWORD1>NO</KEYWORD1>
-         <KEYWORD1>NOCREATEDB</KEYWORD1> <!-- http://www.postgresql.org/docs/9.2/static/sql-createrole.html -->
-         <KEYWORD1>NOCREATEROLE</KEYWORD1> <!-- http://www.postgresql.org/docs/9.2/static/sql-createrole.html -->
-         <KEYWORD1>NOCREATEUSER</KEYWORD1> <!-- http://www.postgresql.org/docs/9.2/static/sql-createrole.html -->
-         <KEYWORD1>NOINHERIT</KEYWORD1>  <!-- http://www.postgresql.org/docs/9.2/static/sql-createrole.html -->
-         <KEYWORD1>NOLOGIN</KEYWORD1> <!-- http://www.postgresql.org/docs/9.2/static/sql-createrole.html -->
-         <KEYWORD1>NONE</KEYWORD1>
-         <KEYWORD1>NOSUPERUSER</KEYWORD1> <!-- http://www.postgresql.org/docs/9.2/static/sql-createrole.html -->
-         <KEYWORD1>NOT</KEYWORD1>
-         <KEYWORD1>NOTHING</KEYWORD1>
-         <KEYWORD1>NOTIFY</KEYWORD1>
-         <KEYWORD1>NOTNULL</KEYWORD1>
-         <KEYWORD1>NOWAIT</KEYWORD1>
-         <KEYWORD1>NULL</KEYWORD1>
-         <!--<KEYWORD1>NULLIF</KEYWORD1>-->
-         <KEYWORD1>NULLS</KEYWORD1>
-         <KEYWORD1>NUMERIC</KEYWORD1>
-         <KEYWORD1>OBJECT</KEYWORD1>
-         <KEYWORD1>OF</KEYWORD1>
-         <KEYWORD1>OFF</KEYWORD1>
-         <KEYWORD1>OFFSET</KEYWORD1>
-         <KEYWORD1>OIDS</KEYWORD1>
-         <KEYWORD1>OLD</KEYWORD1><!-- http://www.postgresql.org/docs/9.2/static/plpgsql-trigger.html -->
-         <KEYWORD1>ON</KEYWORD1>
-         <KEYWORD1>ONLY</KEYWORD1>
-         <KEYWORD1>OPERATOR</KEYWORD1>
-         <KEYWORD1>OPTION</KEYWORD1>
-         <KEYWORD1>OPTIONS</KEYWORD1>
-         <KEYWORD1>OR</KEYWORD1>
-         <KEYWORD1>ORDER</KEYWORD1>
-         <KEYWORD1>OUT</KEYWORD1>
-         <KEYWORD1>OUTER</KEYWORD1>
-         <KEYWORD1>OVER</KEYWORD1>
-         <KEYWORD1>OVERLAPS</KEYWORD1>
-         <KEYWORD1>OVERLAY</KEYWORD1>
-         <KEYWORD1>OWNED</KEYWORD1>
-         <KEYWORD1>OWNER</KEYWORD1>
-         <KEYWORD1>PARSER</KEYWORD1>
-         <KEYWORD1>PARTIAL</KEYWORD1>
-         <KEYWORD1>PARTITION</KEYWORD1>
-         <KEYWORD1>PASSING</KEYWORD1>
-         <KEYWORD1>PASSWORD</KEYWORD1>
-         <KEYWORD1>PLACING</KEYWORD1>
-         <KEYWORD1>PLANS</KEYWORD1>
-         <KEYWORD1>POSITION</KEYWORD1>
-         <KEYWORD1>PRECEDING</KEYWORD1>
-         <KEYWORD1>PRECISION</KEYWORD1>
-         <KEYWORD1>PREPARE</KEYWORD1>
-         <KEYWORD1>PREPARED</KEYWORD1>
-         <KEYWORD1>PRESERVE</KEYWORD1>
-         <KEYWORD1>PRIMARY</KEYWORD1>
-         <KEYWORD1>PRIOR</KEYWORD1>
-         <KEYWORD1>PRIVILEGES</KEYWORD1>
-         <KEYWORD1>PROCEDURAL</KEYWORD1>
-         <KEYWORD1>PROCEDURE</KEYWORD1>
-         <KEYWORD1>QUOTE</KEYWORD1>
-         <KEYWORD1>RANGE</KEYWORD1>
-         <KEYWORD1>READ</KEYWORD1>
-         <KEYWORD1>REAL</KEYWORD1>
-         <KEYWORD1>REASSIGN</KEYWORD1>
-         <KEYWORD1>RECHECK</KEYWORD1>
-         <KEYWORD1>RECURSIVE</KEYWORD1>
-         <KEYWORD1>REF</KEYWORD1>
-         <KEYWORD1>REFERENCES</KEYWORD1>
-         <KEYWORD1>REINDEX</KEYWORD1>
-         <KEYWORD1>RELATIVE</KEYWORD1>
-         <KEYWORD1>RELEASE</KEYWORD1>
-         <KEYWORD1>RENAME</KEYWORD1>
-         <KEYWORD1>REPEATABLE</KEYWORD1>
-         <KEYWORD1>REPLACE</KEYWORD1>
-         <KEYWORD1>REPLICA</KEYWORD1>
-         <KEYWORD1>RESET</KEYWORD1>
-         <KEYWORD1>RESTART</KEYWORD1>
-         <KEYWORD1>RESTRICT</KEYWORD1>
-         <KEYWORD1>RETURN</KEYWORD1> <!-- http://docs.postgresql.fr/9.2/plpgsql-control-structures.html -->
-         <KEYWORD1>RETURNING</KEYWORD1>
-         <KEYWORD1>RETURNS</KEYWORD1>
-         <KEYWORD1>REVOKE</KEYWORD1>
-         <KEYWORD1>RIGHT</KEYWORD1>
-         <KEYWORD1>ROLE</KEYWORD1>
-         <KEYWORD1>ROLLBACK</KEYWORD1>
-         <KEYWORD1>ROW</KEYWORD1>
-         <KEYWORD1>ROWS</KEYWORD1>
-         <KEYWORD1>RULE</KEYWORD1>
-         <KEYWORD1>SAVEPOINT</KEYWORD1>
-         <KEYWORD1>SCHEMA</KEYWORD1>
-         <KEYWORD1>SCROLL</KEYWORD1>
-         <KEYWORD1>SEARCH</KEYWORD1>
-         <KEYWORD1>SECOND</KEYWORD1>
-         <KEYWORD1>SECURITY</KEYWORD1>
-         <KEYWORD1>SELECT</KEYWORD1>
-         <KEYWORD1>SEQUENCE</KEYWORD1>
-         <KEYWORD1>SEQUENCES</KEYWORD1>
-         <KEYWORD1>SERIALIZABLE</KEYWORD1>
-         <KEYWORD1>SERVER</KEYWORD1>
-         <KEYWORD1>SESSION</KEYWORD1>
-         <KEYWORD1>SESSION_USER</KEYWORD1>
-         <KEYWORD1>SET</KEYWORD1>
-         <KEYWORD1>SETOF</KEYWORD1>
-         <KEYWORD1>SHARE</KEYWORD1>
-         <KEYWORD1>SHOW</KEYWORD1>
-         <KEYWORD1>SIMILAR</KEYWORD1>
-         <KEYWORD1>SIMPLE</KEYWORD1>
-         <KEYWORD1>SMALLINT</KEYWORD1>
-         <KEYWORD1>SNAPSHOT</KEYWORD1>
-         <!--<KEYWORD1>SOME</KEYWORD1>-->
-         <KEYWORD1>STABLE</KEYWORD1>
-         <KEYWORD1>STANDALONE</KEYWORD1>
-         <KEYWORD1>START</KEYWORD1>
-         <KEYWORD1>STATEMENT</KEYWORD1>
-         <KEYWORD1>STATISTICS</KEYWORD1>
-         <KEYWORD1>STDIN</KEYWORD1>
-         <KEYWORD1>STDOUT</KEYWORD1>
-         <KEYWORD1>STORAGE</KEYWORD1>
-         <KEYWORD1>STRICT</KEYWORD1>
-         <KEYWORD1>STRIP</KEYWORD1>
-         <KEYWORD1>SUBSTRING</KEYWORD1>
-         <KEYWORD1>SUPERUSER</KEYWORD1> <!-- http://www.postgresql.org/docs/9.2/static/sql-createrole.html -->
-         <KEYWORD1>SYMMETRIC</KEYWORD1>
-         <KEYWORD1>SYSID</KEYWORD1>
-         <KEYWORD1>SYSTEM</KEYWORD1>
-         <KEYWORD1>TABLE</KEYWORD1>
-         <KEYWORD1>TABLES</KEYWORD1>
-         <KEYWORD1>TABLESPACE</KEYWORD1>
-         <KEYWORD1>TEMP</KEYWORD1>
-         <KEYWORD1>TEMPLATE</KEYWORD1>
-         <KEYWORD1>TEMPORARY</KEYWORD1>
-         <KEYWORD1>TEXT</KEYWORD1>
-         <KEYWORD1>THEN</KEYWORD1>
-         <KEYWORD1>TIME</KEYWORD1>
-         <KEYWORD1>TIMESTAMP</KEYWORD1>
-         <KEYWORD1>TO</KEYWORD1>
-         <KEYWORD1>TRAILING</KEYWORD1>
-         <KEYWORD1>TRANSACTION</KEYWORD1>
-         <KEYWORD1>TREAT</KEYWORD1>
-         <KEYWORD1>TRIGGER</KEYWORD1>
-         <KEYWORD1>TRIM</KEYWORD1>
-         <KEYWORD1>TRUE</KEYWORD1>
-         <KEYWORD1>TRUNCATE</KEYWORD1>
-         <KEYWORD1>TRUSTED</KEYWORD1>
-         <KEYWORD1>TYPE</KEYWORD1>
-         <KEYWORD1>TYPES</KEYWORD1>
-         <KEYWORD1>UNBOUNDED</KEYWORD1>
-         <KEYWORD1>UNCOMMITTED</KEYWORD1>
-         <KEYWORD1>UNENCRYPTED</KEYWORD1>
-         <KEYWORD1>UNION</KEYWORD1>
-         <KEYWORD1>UNIQUE</KEYWORD1>
-         <KEYWORD1>UNKNOWN</KEYWORD1>
-         <KEYWORD1>UNLISTEN</KEYWORD1>
-         <KEYWORD1>UNLOGGED</KEYWORD1>
-         <KEYWORD1>UNTIL</KEYWORD1>
-         <KEYWORD1>UPDATE</KEYWORD1>
-         <KEYWORD1>USER</KEYWORD1>
-         <KEYWORD1>USING</KEYWORD1>
-         <KEYWORD1>VACUUM</KEYWORD1>
-         <KEYWORD1>VALID</KEYWORD1>
-         <KEYWORD1>VALIDATE</KEYWORD1>
-         <KEYWORD1>VALIDATOR</KEYWORD1>
-         <KEYWORD1>VALUE</KEYWORD1>
-         <KEYWORD1>VALUES</KEYWORD1>
-         <KEYWORD1>VARCHAR</KEYWORD1>
-         <KEYWORD1>VARIADIC</KEYWORD1>
-         <KEYWORD1>VARYING</KEYWORD1>
-         <KEYWORD1>VERBOSE</KEYWORD1>
-         <KEYWORD1>VERSION</KEYWORD1>
-         <KEYWORD1>VIEW</KEYWORD1>
-         <KEYWORD1>VOLATILE</KEYWORD1>
-         <KEYWORD1>WHEN</KEYWORD1>
-         <KEYWORD1>WHERE</KEYWORD1>
-         <KEYWORD1>WHITESPACE</KEYWORD1>
-         <KEYWORD1>WINDOW</KEYWORD1>
-         <KEYWORD1>WITH</KEYWORD1>
-         <KEYWORD1>WITHOUT</KEYWORD1>
-         <KEYWORD1>WORK</KEYWORD1>
-         <KEYWORD1>WRAPPER</KEYWORD1>
-         <KEYWORD1>WRITE</KEYWORD1>
-         <KEYWORD1>XML</KEYWORD1>
-         <KEYWORD1>XMLATTRIBUTES</KEYWORD1>
-         <KEYWORD1>XMLCONCAT</KEYWORD1>
-         <KEYWORD1>XMLELEMENT</KEYWORD1>
-         <KEYWORD1>XMLEXISTS</KEYWORD1>
-         <KEYWORD1>XMLFOREST</KEYWORD1>
-         <KEYWORD1>XMLPARSE</KEYWORD1>
-         <KEYWORD1>XMLPI</KEYWORD1>
-         <KEYWORD1>XMLROOT</KEYWORD1>
-         <KEYWORD1>XMLSERIALIZE</KEYWORD1>
-         <KEYWORD1>YEAR</KEYWORD1>
-         <KEYWORD1>YES</KEYWORD1>
-         <KEYWORD1>ZONE</KEYWORD1>
-
-         <!-- functions, procedures, packages, statements, types -->
-         <!--<KEYWORD2>ALL</KEYWORD2> already keyword1-->
-         <!--<KEYWORD2>AND</KEYWORD2> already keyword1-->
-         <!--<KEYWORD2>ANY</KEYWORD2> already keyword1-->
-         <KEYWORD2>AT TIME ZONE</KEYWORD2>
-         <!--<KEYWORD2>CASE</KEYWORD2> already keyword1-->
-         <KEYWORD2>COALESCE</KEYWORD2>
-         <KEYWORD2>CURRENT_TIME(</KEYWORD2>
-         <KEYWORD2>CURRENT_TIME</KEYWORD2>
-         <KEYWORD2>CURRENT_TIMESTAMP(</KEYWORD2>
-         <KEYWORD2>CURRENT_TIMESTAMP</KEYWORD2>
-         <!--<KEYWORD2>END</KEYWORD2> already keyword1-->
-         <!--<KEYWORD2>EXISTS</KEYWORD2> already keyword1-->
-         <KEYWORD2>EXTRACT</KEYWORD2>
-         <KEYWORD2>GREATEST</KEYWORD2>
-         <!--<KEYWORD2>IN</KEYWORD2> already keyword1-->
-         <KEYWORD2>LEAST</KEYWORD2>
-         <!--<KEYWORD2>LIKE</KEYWORD2> already keyword1-->
-         <KEYWORD2>LOCALTIME(</KEYWORD2>
-         <KEYWORD2>LOCALTIME</KEYWORD2>
-         <KEYWORD2>LOCALTIMESTAMP(</KEYWORD2>
-         <KEYWORD2>LOCALTIMESTAMP</KEYWORD2>
-         <KEYWORD2>NOT IN</KEYWORD2>
-         <!--<KEYWORD2>NOT</KEYWORD2> already keyword1-->
-         <KEYWORD2>NULLIF</KEYWORD2>
-         <!--<KEYWORD2>OR</KEYWORD2> already keyword1-->
-         <KEYWORD2>SIMILAR TO</KEYWORD2>
-         <KEYWORD2>SOME</KEYWORD2>
-         <!--<KEYWORD2>THEN</KEYWORD2> already keyword1-->
-         <!--<KEYWORD2>WHEN</KEYWORD2> already keyword1-->
-         <KEYWORD2>XMLEXISTS(</KEYWORD2>
-         <KEYWORD2>abbrev(</KEYWORD2>
-         <KEYWORD2>abs(</KEYWORD2>
-         <KEYWORD2>acos(</KEYWORD2>
-         <KEYWORD2>age(</KEYWORD2>
-         <KEYWORD2>area(</KEYWORD2>
-         <KEYWORD2>array_agg(</KEYWORD2>
-         <KEYWORD2>array_append(</KEYWORD2>
-         <KEYWORD2>array_cat(</KEYWORD2>
-         <KEYWORD2>array_dims(</KEYWORD2>
-         <KEYWORD2>array_fill(</KEYWORD2>
-         <KEYWORD2>array_length(</KEYWORD2>
-         <KEYWORD2>array_lower(</KEYWORD2>
-         <KEYWORD2>array_ndims(</KEYWORD2>
-         <KEYWORD2>array_prepend(</KEYWORD2>
-         <KEYWORD2>array_to_json(</KEYWORD2>
-         <KEYWORD2>array_to_string(</KEYWORD2>
-         <KEYWORD2>array_upper(</KEYWORD2>
-         <KEYWORD2>ascii(</KEYWORD2>
-         <KEYWORD2>ascii_to_mic</KEYWORD2>
-         <KEYWORD2>ascii_to_utf8</KEYWORD2>
-         <KEYWORD2>asin(</KEYWORD2>
-         <KEYWORD2>atan(</KEYWORD2>
-         <KEYWORD2>atan2(</KEYWORD2>
-         <KEYWORD2>avg(</KEYWORD2>
-         <KEYWORD2>big5_to_euc_tw</KEYWORD2>
-         <KEYWORD2>big5_to_mic</KEYWORD2>
-         <KEYWORD2>big5_to_utf8</KEYWORD2>
-         <KEYWORD2>bit_and(</KEYWORD2>
-         <KEYWORD2>bit_length(</KEYWORD2>
-         <KEYWORD2>bit_or(</KEYWORD2>
-         <KEYWORD2>bool_and(</KEYWORD2>
-         <KEYWORD2>bool_or(</KEYWORD2>
-         <KEYWORD2>box(</KEYWORD2>
-         <KEYWORD2>broadcast(</KEYWORD2>
-         <KEYWORD2>btrim(</KEYWORD2>
-         <KEYWORD2>cbrt(</KEYWORD2>
-         <KEYWORD2>ceil(</KEYWORD2>
-         <KEYWORD2>ceiling(</KEYWORD2>
-         <KEYWORD2>center(</KEYWORD2>
-         <KEYWORD2>char_length(</KEYWORD2>
-         <KEYWORD2>chr(</KEYWORD2>
-         <KEYWORD2>circle(</KEYWORD2>
-         <KEYWORD2>clock_timestamp(</KEYWORD2>
-         <KEYWORD2>col_description(</KEYWORD2>
-         <KEYWORD2>concat(</KEYWORD2>
-         <KEYWORD2>concat_ws(</KEYWORD2>
-         <KEYWORD2>convert(</KEYWORD2>
-         <KEYWORD2>convert_from(</KEYWORD2>
-         <KEYWORD2>convert_to(</KEYWORD2>
-         <KEYWORD2>corr(</KEYWORD2>
-         <KEYWORD2>cos(</KEYWORD2>
-         <KEYWORD2>cot(</KEYWORD2>
-         <KEYWORD2>count(</KEYWORD2>
-         <KEYWORD2>covar_pop(</KEYWORD2>
-         <KEYWORD2>covar_samp(</KEYWORD2>
-         <KEYWORD2>cume_dist(</KEYWORD2>
-         <KEYWORD2>current_catalog</KEYWORD2>
-         <KEYWORD2>current_database(</KEYWORD2>
-         <KEYWORD2>current_date</KEYWORD2>
-         <KEYWORD2>current_query(</KEYWORD2>
-         <KEYWORD2>current_schema</KEYWORD2>
-         <KEYWORD2>current_schema(</KEYWORD2>
-         <KEYWORD2>current_schemas(</KEYWORD2>
-         <KEYWORD2>current_setting(</KEYWORD2>
-         <KEYWORD2>current_time</KEYWORD2>
-         <KEYWORD2>current_timestamp</KEYWORD2>
-         <KEYWORD2>current_user</KEYWORD2>
-         <KEYWORD2>currval(</KEYWORD2>
-         <KEYWORD2>cursor_to_xml(</KEYWORD2>
-         <KEYWORD2>cursor_to_xmlschema(</KEYWORD2>
-         <KEYWORD2>database_to_xml(</KEYWORD2>
-         <KEYWORD2>database_to_xml_and_xmlschema(</KEYWORD2>
-         <KEYWORD2>database_to_xmlschema(</KEYWORD2>
-         <KEYWORD2>date_part(</KEYWORD2>
-         <KEYWORD2>date_trunc(</KEYWORD2>
-         <KEYWORD2>decode(</KEYWORD2>
-         <KEYWORD2>degrees(</KEYWORD2>
-         <KEYWORD2>dense_rank(</KEYWORD2>
-         <KEYWORD2>diameter(</KEYWORD2>
-         <KEYWORD2>div(</KEYWORD2>
-         <KEYWORD2>encode(</KEYWORD2>
-         <KEYWORD2>enum_first(</KEYWORD2>
-         <KEYWORD2>enum_last(</KEYWORD2>
-         <KEYWORD2>enum_range(</KEYWORD2>
-         <KEYWORD2>euc_cn_to_mic</KEYWORD2>
-         <KEYWORD2>euc_cn_to_utf8</KEYWORD2>
-         <KEYWORD2>euc_jis_2004_to_shift_jis_2004</KEYWORD2>
-         <KEYWORD2>euc_jis_2004_to_utf8</KEYWORD2>
-         <KEYWORD2>euc_jp_to_mic</KEYWORD2>
-         <KEYWORD2>euc_jp_to_sjis</KEYWORD2>
-         <KEYWORD2>euc_jp_to_utf8</KEYWORD2>
-         <KEYWORD2>euc_kr_to_mic</KEYWORD2>
-         <KEYWORD2>euc_kr_to_utf8</KEYWORD2>
-         <KEYWORD2>euc_tw_to_big5</KEYWORD2>
-         <KEYWORD2>euc_tw_to_mic</KEYWORD2>
-         <KEYWORD2>euc_tw_to_utf8</KEYWORD2>
-         <KEYWORD2>every(</KEYWORD2>
-         <KEYWORD2>exp(</KEYWORD2>
-         <KEYWORD2>extract(</KEYWORD2>
-         <KEYWORD2>family(</KEYWORD2>
-         <KEYWORD2>first_value(</KEYWORD2>
-         <KEYWORD2>floor(</KEYWORD2>
-         <KEYWORD2>format(</KEYWORD2>
-         <KEYWORD2>format_type(</KEYWORD2>
-         <KEYWORD2>gb18030_to_utf8</KEYWORD2>
-         <KEYWORD2>gbk_to_utf8</KEYWORD2>
-         <KEYWORD2>generate_series(</KEYWORD2>
-         <KEYWORD2>generate_subscripts(</KEYWORD2>
-         <KEYWORD2>get_bit(</KEYWORD2>
-         <KEYWORD2>get_byte(</KEYWORD2>
-         <KEYWORD2>get_current_ts_config(</KEYWORD2>
-         <KEYWORD2>has_any_column_privilege(</KEYWORD2>
-         <KEYWORD2>has_column_privilege(</KEYWORD2>
-         <KEYWORD2>has_database_privilege(</KEYWORD2>
-         <KEYWORD2>has_foreign_data_wrapper_privilege(</KEYWORD2>
-         <KEYWORD2>has_function_privilege(</KEYWORD2>
-         <KEYWORD2>has_language_privilege(</KEYWORD2>
-         <KEYWORD2>has_schema_privilege(</KEYWORD2>
-         <KEYWORD2>has_sequence_privilege(</KEYWORD2>
-         <KEYWORD2>has_server_privilege(</KEYWORD2>
-         <KEYWORD2>has_table_privilege(</KEYWORD2>
-         <KEYWORD2>has_tablespace_privilege(</KEYWORD2>
-         <KEYWORD2>height(</KEYWORD2>
-         <KEYWORD2>host(</KEYWORD2>
-         <KEYWORD2>hostmask(</KEYWORD2>
-         <KEYWORD2>inet_client_addr(</KEYWORD2>
-         <KEYWORD2>inet_client_port(</KEYWORD2>
-         <KEYWORD2>inet_server_addr(</KEYWORD2>
-         <KEYWORD2>inet_server_port(</KEYWORD2>
-         <KEYWORD2>initcap(</KEYWORD2>
-         <KEYWORD2>isclosed(</KEYWORD2>
-         <KEYWORD2>isempty(</KEYWORD2>
-         <KEYWORD2>isfinite(</KEYWORD2>
-         <KEYWORD2>iso_8859_1_to_mic</KEYWORD2>
-         <KEYWORD2>iso_8859_1_to_utf8</KEYWORD2>
-         <KEYWORD2>iso_8859_2_to_mic</KEYWORD2>
-         <KEYWORD2>iso_8859_2_to_utf8</KEYWORD2>
-         <KEYWORD2>iso_8859_2_to_windows_1250</KEYWORD2>
-         <KEYWORD2>iso_8859_3_to_mic</KEYWORD2>
-         <KEYWORD2>iso_8859_3_to_utf8</KEYWORD2>
-         <KEYWORD2>iso_8859_4_to_mic</KEYWORD2>
-         <KEYWORD2>iso_8859_4_to_utf8</KEYWORD2>
-         <KEYWORD2>iso_8859_5_to_koi8_r</KEYWORD2>
-         <KEYWORD2>iso_8859_5_to_mic</KEYWORD2>
-         <KEYWORD2>iso_8859_5_to_utf8</KEYWORD2>
-         <KEYWORD2>iso_8859_5_to_windows_866</KEYWORD2>
-         <KEYWORD2>iso_8859_5_to_windows_1251</KEYWORD2>
-         <KEYWORD2>iso_8859_6_to_utf8</KEYWORD2>
-         <KEYWORD2>iso_8859_7_to_utf8</KEYWORD2>
-         <KEYWORD2>iso_8859_8_to_utf8</KEYWORD2>
-         <KEYWORD2>iso_8859_9_to_utf8</KEYWORD2>
-         <KEYWORD2>iso_8859_10_to_utf8</KEYWORD2>
-         <KEYWORD2>iso_8859_13_to_utf8</KEYWORD2>
-         <KEYWORD2>iso_8859_14_to_utf8</KEYWORD2>
-         <KEYWORD2>iso_8859_15_to_utf8</KEYWORD2>
-         <KEYWORD2>iso_8859_16_to_utf8</KEYWORD2>
-         <KEYWORD2>isopen(</KEYWORD2>
-         <KEYWORD2>johab_to_utf8</KEYWORD2>
-         <KEYWORD2>justify_days(</KEYWORD2>
-         <KEYWORD2>justify_hours(</KEYWORD2>
-         <KEYWORD2>justify_interval(</KEYWORD2>
-         <KEYWORD2>koi8_r_to_iso_8859_5</KEYWORD2>
-         <KEYWORD2>koi8_r_to_mic</KEYWORD2>
-         <KEYWORD2>koi8_r_to_utf8</KEYWORD2>
-         <KEYWORD2>koi8_r_to_windows_866</KEYWORD2>
-         <KEYWORD2>koi8_r_to_windows_1251</KEYWORD2>
-         <KEYWORD2>koi8_u_to_utf8</KEYWORD2>
-         <KEYWORD2>lag(</KEYWORD2>
-         <KEYWORD2>last_value(</KEYWORD2>
-         <KEYWORD2>lastval(</KEYWORD2>
-         <KEYWORD2>lead(</KEYWORD2>
-         <KEYWORD2>left(</KEYWORD2>
-         <KEYWORD2>length(</KEYWORD2>
-         <KEYWORD2>ln(</KEYWORD2>
-         <KEYWORD2>localtime</KEYWORD2>
-         <KEYWORD2>localtimestamp</KEYWORD2>
-         <KEYWORD2>log(</KEYWORD2>
-         <KEYWORD2>lower(</KEYWORD2>
-         <KEYWORD2>lower_inc(</KEYWORD2>
-         <KEYWORD2>lower_inf(</KEYWORD2>
-         <KEYWORD2>lpad(</KEYWORD2>
-         <KEYWORD2>lseg(</KEYWORD2>
-         <KEYWORD2>ltrim(</KEYWORD2>
-         <KEYWORD2>masklen(</KEYWORD2>
-         <KEYWORD2>max(</KEYWORD2>
-         <KEYWORD2>md5(</KEYWORD2>
-         <KEYWORD2>mic_to_ascii</KEYWORD2>
-         <KEYWORD2>mic_to_big5</KEYWORD2>
-         <KEYWORD2>mic_to_euc_cn</KEYWORD2>
-         <KEYWORD2>mic_to_euc_jp</KEYWORD2>
-         <KEYWORD2>mic_to_euc_kr</KEYWORD2>
-         <KEYWORD2>mic_to_euc_tw</KEYWORD2>
-         <KEYWORD2>mic_to_iso_8859_1</KEYWORD2>
-         <KEYWORD2>mic_to_iso_8859_2</KEYWORD2>
-         <KEYWORD2>mic_to_iso_8859_3</KEYWORD2>
-         <KEYWORD2>mic_to_iso_8859_4</KEYWORD2>
-         <KEYWORD2>mic_to_iso_8859_5</KEYWORD2>
-         <KEYWORD2>mic_to_koi8_r</KEYWORD2>
-         <KEYWORD2>mic_to_sjis</KEYWORD2>
-         <KEYWORD2>mic_to_windows_866</KEYWORD2>
-         <KEYWORD2>mic_to_windows_1250</KEYWORD2>
-         <KEYWORD2>mic_to_windows_1251</KEYWORD2>
-         <KEYWORD2>min(</KEYWORD2>
-         <KEYWORD2>mod(</KEYWORD2>
-         <KEYWORD2>netmask(</KEYWORD2>
-         <KEYWORD2>network(</KEYWORD2>
-         <KEYWORD2>nextval(</KEYWORD2>
-         <KEYWORD2>now(</KEYWORD2>
-         <KEYWORD2>npoints(</KEYWORD2>
-         <KEYWORD2>nth_value(</KEYWORD2>
-         <KEYWORD2>ntile(</KEYWORD2>
-         <KEYWORD2>numnode(</KEYWORD2>
-         <KEYWORD2>obj_description(</KEYWORD2>
-         <KEYWORD2>octet_length(</KEYWORD2>
-         <KEYWORD2>overlay(</KEYWORD2>
-         <KEYWORD2>path(</KEYWORD2>
-         <KEYWORD2>pclose(</KEYWORD2>
-         <KEYWORD2>percent_rank(</KEYWORD2>
-         <KEYWORD2>pg_advisory_lock(</KEYWORD2>
-         <KEYWORD2>pg_advisory_lock_shared(</KEYWORD2>
-         <KEYWORD2>pg_advisory_unlock(</KEYWORD2>
-         <KEYWORD2>pg_advisory_unlock_all(</KEYWORD2>
-         <KEYWORD2>pg_advisory_unlock_shared(</KEYWORD2>
-         <KEYWORD2>pg_advisory_xact_lock(</KEYWORD2>
-         <KEYWORD2>pg_advisory_xact_lock_shared(</KEYWORD2>
-         <KEYWORD2>pg_backend_pid(</KEYWORD2>
-         <KEYWORD2>pg_cancel_backend(</KEYWORD2>
-         <KEYWORD2>pg_client_encoding(</KEYWORD2>
-         <KEYWORD2>pg_collation_is_visible(</KEYWORD2>
-         <KEYWORD2>pg_column_size(</KEYWORD2>
-         <KEYWORD2>pg_conf_load_time(</KEYWORD2>
-         <KEYWORD2>pg_conversion_is_visible(</KEYWORD2>
-         <KEYWORD2>pg_create_restore_point(</KEYWORD2>
-         <KEYWORD2>pg_current_xlog_insert_location(</KEYWORD2>
-         <KEYWORD2>pg_current_xlog_location(</KEYWORD2>
-         <KEYWORD2>pg_database_size(</KEYWORD2>
-         <KEYWORD2>pg_describe_object(</KEYWORD2>
-         <KEYWORD2>pg_export_snapshot(</KEYWORD2>
-         <KEYWORD2>pg_function_is_visible(</KEYWORD2>
-         <KEYWORD2>pg_get_constraintdef(</KEYWORD2>
-         <KEYWORD2>pg_get_expr(</KEYWORD2>
-         <KEYWORD2>pg_get_function_arguments(</KEYWORD2>
-         <KEYWORD2>pg_get_function_identity_arguments(</KEYWORD2>
-         <KEYWORD2>pg_get_function_result(</KEYWORD2>
-         <KEYWORD2>pg_get_functiondef(</KEYWORD2>
-         <KEYWORD2>pg_get_indexdef(</KEYWORD2>
-         <KEYWORD2>pg_get_keywords(</KEYWORD2>
-         <KEYWORD2>pg_get_ruledef(</KEYWORD2>
-         <KEYWORD2>pg_get_serial_sequence(</KEYWORD2>
-         <KEYWORD2>pg_get_triggerdef(</KEYWORD2>
-         <KEYWORD2>pg_get_userbyid(</KEYWORD2>
-         <KEYWORD2>pg_get_viewdef(</KEYWORD2>
-         <KEYWORD2>pg_has_role(</KEYWORD2>
-         <KEYWORD2>pg_indexes_size(</KEYWORD2>
-         <KEYWORD2>pg_is_in_recovery(</KEYWORD2>
-         <KEYWORD2>pg_is_other_temp_schema(</KEYWORD2>
-         <KEYWORD2>pg_is_xlog_replay_paused(</KEYWORD2>
-         <KEYWORD2>pg_last_xact_replay_timestamp(</KEYWORD2>
-         <KEYWORD2>pg_last_xlog_receive_location(</KEYWORD2>
-         <KEYWORD2>pg_last_xlog_replay_location(</KEYWORD2>
-         <KEYWORD2>pg_listening_channels(</KEYWORD2>
-         <KEYWORD2>pg_ls_dir(</KEYWORD2>
-         <KEYWORD2>pg_my_temp_schema(</KEYWORD2>
-         <KEYWORD2>pg_opclass_is_visible(</KEYWORD2>
-         <KEYWORD2>pg_operator_is_visible(</KEYWORD2>
-         <KEYWORD2>pg_opfamily_is_visible(</KEYWORD2>
-         <KEYWORD2>pg_options_to_table(</KEYWORD2>
-         <KEYWORD2>pg_postmaster_start_time(</KEYWORD2>
-         <KEYWORD2>pg_read_binary_file(</KEYWORD2>
-         <KEYWORD2>pg_read_file(</KEYWORD2>
-         <KEYWORD2>pg_relation_filenode(</KEYWORD2>
-         <KEYWORD2>pg_relation_filepath(</KEYWORD2>
-         <KEYWORD2>pg_relation_size(</KEYWORD2>
-         <KEYWORD2>pg_reload_conf(</KEYWORD2>
-         <KEYWORD2>pg_rotate_logfile(</KEYWORD2>
-         <KEYWORD2>pg_size_pretty(</KEYWORD2>
-         <KEYWORD2>pg_start_backup(</KEYWORD2>
-         <KEYWORD2>pg_stat_file(</KEYWORD2>
-         <KEYWORD2>pg_stop_backup(</KEYWORD2>
-         <KEYWORD2>pg_switch_xlog(</KEYWORD2>
-         <KEYWORD2>pg_table_is_visible(</KEYWORD2>
-         <KEYWORD2>pg_table_size(</KEYWORD2>
-         <KEYWORD2>pg_tablespace_databases(</KEYWORD2>
-         <KEYWORD2>pg_tablespace_location(</KEYWORD2>
-         <KEYWORD2>pg_tablespace_size(</KEYWORD2>
-         <KEYWORD2>pg_terminate_backend(</KEYWORD2>
-         <KEYWORD2>pg_total_relation_size(</KEYWORD2>
-         <KEYWORD2>pg_trigger_depth(</KEYWORD2>
-         <KEYWORD2>pg_try_advisory_lock(</KEYWORD2>
-         <KEYWORD2>pg_try_advisory_lock_shared(</KEYWORD2>
-         <KEYWORD2>pg_try_advisory_xact_lock(</KEYWORD2>
-         <KEYWORD2>pg_try_advisory_xact_lock_shared(</KEYWORD2>
-         <KEYWORD2>pg_ts_config_is_visible(</KEYWORD2>
-         <KEYWORD2>pg_ts_dict_is_visible(</KEYWORD2>
-         <KEYWORD2>pg_ts_parser_is_visible(</KEYWORD2>
-         <KEYWORD2>pg_ts_template_is_visible(</KEYWORD2>
-         <KEYWORD2>pg_type_is_visible(</KEYWORD2>
-         <KEYWORD2>pg_typeof(</KEYWORD2>
-         <KEYWORD2>pg_xlog_location_diff(</KEYWORD2>
-         <KEYWORD2>pg_xlog_replay_pause(</KEYWORD2>
-         <KEYWORD2>pg_xlog_replay_resume(</KEYWORD2>
-         <KEYWORD2>pg_xlogfile_name(</KEYWORD2>
-         <KEYWORD2>pg_xlogfile_name_offset(</KEYWORD2>
-         <KEYWORD2>pi(</KEYWORD2>
-         <KEYWORD2>plainto_tsquery(</KEYWORD2>
-         <KEYWORD2>point(</KEYWORD2>
-         <KEYWORD2>polygon(</KEYWORD2>
-         <KEYWORD2>popen(</KEYWORD2>
-         <KEYWORD2>position(</KEYWORD2>
-         <KEYWORD2>power(</KEYWORD2>
-         <KEYWORD2>query_to_xml(</KEYWORD2>
-         <KEYWORD2>query_to_xml_and_xmlschema(</KEYWORD2>
-         <KEYWORD2>query_to_xmlschema(</KEYWORD2>
-         <KEYWORD2>querytree(</KEYWORD2>
-         <KEYWORD2>quote_ident(</KEYWORD2>
-         <KEYWORD2>quote_literal(</KEYWORD2>
-         <KEYWORD2>quote_nullable(</KEYWORD2>
-         <KEYWORD2>radians(</KEYWORD2>
-         <KEYWORD2>radius(</KEYWORD2>
-         <KEYWORD2>random(</KEYWORD2>
-         <KEYWORD2>rank(</KEYWORD2>
-         <KEYWORD2>regexp_matches(</KEYWORD2>
-         <KEYWORD2>regexp_replace(</KEYWORD2>
-         <KEYWORD2>regexp_split_to_array(</KEYWORD2>
-         <KEYWORD2>regexp_split_to_table(</KEYWORD2>
-         <KEYWORD2>regr_avgx(</KEYWORD2>
-         <KEYWORD2>regr_avgy(</KEYWORD2>
-         <KEYWORD2>regr_count(</KEYWORD2>
-         <KEYWORD2>regr_intercept(</KEYWORD2>
-         <KEYWORD2>regr_r2(</KEYWORD2>
-         <KEYWORD2>regr_slope(</KEYWORD2>
-         <KEYWORD2>regr_sxx(</KEYWORD2>
-         <KEYWORD2>regr_sxy(</KEYWORD2>
-         <KEYWORD2>regr_syy(</KEYWORD2>
-         <KEYWORD2>repeat(</KEYWORD2>
-         <KEYWORD2>replace(</KEYWORD2>
-         <KEYWORD2>reverse(</KEYWORD2>
-         <KEYWORD2>right(</KEYWORD2>
-         <KEYWORD2>round(</KEYWORD2>
-         <KEYWORD2>row_number(</KEYWORD2>
-         <KEYWORD2>row_to_json(</KEYWORD2>
-         <KEYWORD2>rpad(</KEYWORD2>
-         <KEYWORD2>rtrim(</KEYWORD2>
-         <KEYWORD2>schema_to_xml(</KEYWORD2>
-         <KEYWORD2>schema_to_xml_and_xmlschema(</KEYWORD2>
-         <KEYWORD2>schema_to_xmlschema(</KEYWORD2>
-         <KEYWORD2>session_user</KEYWORD2>
-         <KEYWORD2>set_bit(</KEYWORD2>
-         <KEYWORD2>set_byte(</KEYWORD2>
-         <KEYWORD2>set_config(</KEYWORD2>
-         <KEYWORD2>set_masklen(</KEYWORD2>
-         <KEYWORD2>setseed(</KEYWORD2>
-         <KEYWORD2>setval(</KEYWORD2>
-         <KEYWORD2>setweight(</KEYWORD2>
-         <KEYWORD2>shift_jis_2004_to_euc_jis_2004</KEYWORD2>
-         <KEYWORD2>shift_jis_2004_to_utf8</KEYWORD2>
-         <KEYWORD2>shobj_description(</KEYWORD2>
-         <KEYWORD2>sign(</KEYWORD2>
-         <KEYWORD2>sin(</KEYWORD2>
-         <KEYWORD2>sjis_to_euc_jp</KEYWORD2>
-         <KEYWORD2>sjis_to_mic</KEYWORD2>
-         <KEYWORD2>sjis_to_utf8</KEYWORD2>
-         <KEYWORD2>split_part(</KEYWORD2>
-         <KEYWORD2>sqrt(</KEYWORD2>
-         <KEYWORD2>statement_timestamp(</KEYWORD2>
-         <KEYWORD2>stddev(</KEYWORD2>
-         <KEYWORD2>stddev_pop(</KEYWORD2>
-         <KEYWORD2>stddev_samp(</KEYWORD2>
-         <KEYWORD2>string_agg(</KEYWORD2>
-         <KEYWORD2>string_to_array(</KEYWORD2>
-         <KEYWORD2>strip(</KEYWORD2>
-         <KEYWORD2>strpos(</KEYWORD2>
-         <KEYWORD2>substr(</KEYWORD2>
-         <KEYWORD2>substring(</KEYWORD2>
-         <KEYWORD2>sum(</KEYWORD2>
-         <KEYWORD2>table_to_xml(</KEYWORD2>
-         <KEYWORD2>table_to_xml_and_xmlschema(</KEYWORD2>
-         <KEYWORD2>table_to_xmlschema(</KEYWORD2>
-         <KEYWORD2>tan(</KEYWORD2>
-         <KEYWORD2>tcvn_to_utf8</KEYWORD2>
-         <KEYWORD2>text(</KEYWORD2>
-         <KEYWORD2>timeofday(</KEYWORD2>
-         <KEYWORD2>to_ascii(</KEYWORD2>
-         <KEYWORD2>to_char(</KEYWORD2>
-         <KEYWORD2>to_date(</KEYWORD2>
-         <KEYWORD2>to_hex(</KEYWORD2>
-         <KEYWORD2>to_number(</KEYWORD2>
-         <KEYWORD2>to_timestamp(</KEYWORD2>
-         <KEYWORD2>to_tsquery(</KEYWORD2>
-         <KEYWORD2>to_tsvector(</KEYWORD2>
-         <KEYWORD2>transaction_timestamp(</KEYWORD2>
-         <KEYWORD2>translate(</KEYWORD2>
-         <KEYWORD2>trim(</KEYWORD2>
-         <KEYWORD2>trunc(</KEYWORD2>
-         <KEYWORD2>ts_debug(</KEYWORD2>
-         <KEYWORD2>ts_headline(</KEYWORD2>
-         <KEYWORD2>ts_lexize(</KEYWORD2>
-         <KEYWORD2>ts_parse(</KEYWORD2>
-         <KEYWORD2>ts_rank(</KEYWORD2>
-         <KEYWORD2>ts_rank_cd(</KEYWORD2>
-         <KEYWORD2>ts_rewrite(</KEYWORD2>
-         <KEYWORD2>ts_stat(</KEYWORD2>
-         <KEYWORD2>ts_token_type(</KEYWORD2>
-         <KEYWORD2>tsvector_update_trigger(</KEYWORD2>
-         <KEYWORD2>tsvector_update_trigger_column(</KEYWORD2>
-         <KEYWORD2>txid_current(</KEYWORD2>
-         <KEYWORD2>txid_current_snapshot(</KEYWORD2>
-         <KEYWORD2>txid_snapshot_xip(</KEYWORD2>
-         <KEYWORD2>txid_snapshot_xmax(</KEYWORD2>
-         <KEYWORD2>txid_snapshot_xmin(</KEYWORD2>
-         <KEYWORD2>txid_visible_in_snapshot(</KEYWORD2>
-         <KEYWORD2>uhc_to_utf8</KEYWORD2>
-         <KEYWORD2>unnest(</KEYWORD2>
-         <KEYWORD2>upper(</KEYWORD2>
-         <KEYWORD2>upper_inc(</KEYWORD2>
-         <KEYWORD2>upper_inf(</KEYWORD2>
-         <KEYWORD2>user</KEYWORD2>
-         <KEYWORD2>ut8_to_euc_jis_2004</KEYWORD2>
-         <KEYWORD2>ut8_to_shift_jis_2004</KEYWORD2>
-         <KEYWORD2>utf8_to_ascii</KEYWORD2>
-         <KEYWORD2>utf8_to_big5</KEYWORD2>
-         <KEYWORD2>utf8_to_euc_cn</KEYWORD2>
-         <KEYWORD2>utf8_to_euc_jp</KEYWORD2>
-         <KEYWORD2>utf8_to_euc_kr</KEYWORD2>
-         <KEYWORD2>utf8_to_euc_tw</KEYWORD2>
-         <KEYWORD2>utf8_to_gb18030</KEYWORD2>
-         <KEYWORD2>utf8_to_gbk</KEYWORD2>
-         <KEYWORD2>utf8_to_iso_8859_1</KEYWORD2>
-         <KEYWORD2>utf8_to_iso_8859_2</KEYWORD2>
-         <KEYWORD2>utf8_to_iso_8859_3</KEYWORD2>
-         <KEYWORD2>utf8_to_iso_8859_4</KEYWORD2>
-         <KEYWORD2>utf8_to_iso_8859_5</KEYWORD2>
-         <KEYWORD2>utf8_to_iso_8859_6</KEYWORD2>
-         <KEYWORD2>utf8_to_iso_8859_7</KEYWORD2>
-         <KEYWORD2>utf8_to_iso_8859_8</KEYWORD2>
-         <KEYWORD2>utf8_to_iso_8859_9</KEYWORD2>
-         <KEYWORD2>utf8_to_iso_8859_10</KEYWORD2>
-         <KEYWORD2>utf8_to_iso_8859_13</KEYWORD2>
-         <KEYWORD2>utf8_to_iso_8859_14</KEYWORD2>
-         <KEYWORD2>utf8_to_iso_8859_15</KEYWORD2>
-         <KEYWORD2>utf8_to_iso_8859_16</KEYWORD2>
-         <KEYWORD2>utf8_to_johab</KEYWORD2>
-         <KEYWORD2>utf8_to_koi8_r</KEYWORD2>
-         <KEYWORD2>utf8_to_koi8_u</KEYWORD2>
-         <KEYWORD2>utf8_to_sjis</KEYWORD2>
-         <KEYWORD2>utf8_to_tcvn</KEYWORD2>
-         <KEYWORD2>utf8_to_uhc</KEYWORD2>
-         <KEYWORD2>utf8_to_windows_866</KEYWORD2>
-         <KEYWORD2>utf8_to_windows_874</KEYWORD2>
-         <KEYWORD2>utf8_to_windows_1250</KEYWORD2>
-         <KEYWORD2>utf8_to_windows_1251</KEYWORD2>
-         <KEYWORD2>utf8_to_windows_1252</KEYWORD2>
-         <KEYWORD2>utf8_to_windows_1253</KEYWORD2>
-         <KEYWORD2>utf8_to_windows_1254</KEYWORD2>
-         <KEYWORD2>utf8_to_windows_1255</KEYWORD2>
-         <KEYWORD2>utf8_to_windows_1256</KEYWORD2>
-         <KEYWORD2>utf8_to_windows_1257</KEYWORD2>
-         <KEYWORD2>var_pop(</KEYWORD2>
-         <KEYWORD2>var_samp(</KEYWORD2>
-         <KEYWORD2>variance(</KEYWORD2>
-         <KEYWORD2>version(</KEYWORD2>
-         <KEYWORD2>width(</KEYWORD2>
-         <KEYWORD2>width_bucket(</KEYWORD2>
-         <KEYWORD2>windows_866_to_iso_8859_5</KEYWORD2>
-         <KEYWORD2>windows_866_to_koi8_r</KEYWORD2>
-         <KEYWORD2>windows_866_to_mic</KEYWORD2>
-         <KEYWORD2>windows_866_to_utf8</KEYWORD2>
-         <KEYWORD2>windows_866_to_windows_1251</KEYWORD2>
-         <KEYWORD2>windows_874_to_utf8</KEYWORD2>
-         <KEYWORD2>windows_1250_to_iso_8859_2</KEYWORD2>
-         <KEYWORD2>windows_1250_to_mic</KEYWORD2>
-         <KEYWORD2>windows_1250_to_utf8</KEYWORD2>
-         <KEYWORD2>windows_1251_to_iso_8859_5</KEYWORD2>
-         <KEYWORD2>windows_1251_to_koi8_r</KEYWORD2>
-         <KEYWORD2>windows_1251_to_mic</KEYWORD2>
-         <KEYWORD2>windows_1251_to_utf8</KEYWORD2>
-         <KEYWORD2>windows_1251_to_windows_866</KEYWORD2>
-         <KEYWORD2>windows_1252_to_utf8</KEYWORD2>
-         <KEYWORD2>windows_1256_to_utf8</KEYWORD2>
-         <KEYWORD2>xip_list</KEYWORD2>
-         <KEYWORD2>xmax</KEYWORD2>
-         <KEYWORD2>xmin</KEYWORD2>
-         <KEYWORD2>xml_is_well_formed(</KEYWORD2>
-         <KEYWORD2>xml_is_well_formed_content(</KEYWORD2>
-         <KEYWORD2>xml_is_well_formed_document(</KEYWORD2>
-         <KEYWORD2>xmlagg(</KEYWORD2>
-         <KEYWORD2>xmlcomment(</KEYWORD2>
-         <KEYWORD2>xmlconcat(</KEYWORD2>
-         <KEYWORD2>xmlelement(</KEYWORD2>
-         <KEYWORD2>xmlforest(</KEYWORD2>
-         <KEYWORD2>xmlpi(</KEYWORD2>
-         <KEYWORD2>xmlroot(</KEYWORD2>
-         <KEYWORD2>xpath(</KEYWORD2>
-         <KEYWORD2>xpath_exists(</KEYWORD2>
-
-         <!-- Catalog and information_schema 9.2 -->
-         <KEYWORD3>pg_aggregate</KEYWORD3>
-         <KEYWORD3>pg_am</KEYWORD3>
-         <KEYWORD3>pg_amop</KEYWORD3>
-         <KEYWORD3>pg_amproc</KEYWORD3>
-         <KEYWORD3>pg_attrdef</KEYWORD3>
-         <KEYWORD3>pg_attribute</KEYWORD3>
-         <KEYWORD3>pg_auth_members</KEYWORD3>
-         <KEYWORD3>pg_authid</KEYWORD3>
-         <KEYWORD3>pg_available_extension_versions</KEYWORD3>
-         <KEYWORD3>pg_available_extensions</KEYWORD3>
-         <KEYWORD3>pg_cast</KEYWORD3>
-         <KEYWORD3>pg_class</KEYWORD3>
-         <KEYWORD3>pg_collation</KEYWORD3>
-         <KEYWORD3>pg_constraint</KEYWORD3>
-         <KEYWORD3>pg_conversion</KEYWORD3>
-         <KEYWORD3>pg_cursors</KEYWORD3>
-         <KEYWORD3>pg_database</KEYWORD3>
-         <KEYWORD3>pg_db_role_setting</KEYWORD3>
-         <KEYWORD3>pg_default_acl</KEYWORD3>
-         <KEYWORD3>pg_depend</KEYWORD3>
-         <KEYWORD3>pg_description</KEYWORD3>
-         <KEYWORD3>pg_enum</KEYWORD3>
-         <KEYWORD3>pg_extension</KEYWORD3>
-         <KEYWORD3>pg_foreign_data_wrapper</KEYWORD3>
-         <KEYWORD3>pg_foreign_server</KEYWORD3>
-         <KEYWORD3>pg_foreign_table</KEYWORD3>
-         <KEYWORD3>pg_group</KEYWORD3>
-         <KEYWORD3>pg_index</KEYWORD3>
-         <KEYWORD3>pg_indexes</KEYWORD3>
-         <KEYWORD3>pg_inherits</KEYWORD3>
-         <KEYWORD3>pg_language</KEYWORD3>
-         <KEYWORD3>pg_largeobject</KEYWORD3>
-         <KEYWORD3>pg_largeobject_metadata</KEYWORD3>
-         <KEYWORD3>pg_locks</KEYWORD3>
-         <KEYWORD3>pg_namespace</KEYWORD3>
-         <KEYWORD3>pg_opclass</KEYWORD3>
-         <KEYWORD3>pg_operator</KEYWORD3>
-         <KEYWORD3>pg_opfamily</KEYWORD3>
-         <KEYWORD3>pg_pltemplate</KEYWORD3>
-         <KEYWORD3>pg_prepared_statements</KEYWORD3>
-         <KEYWORD3>pg_prepared_xacts</KEYWORD3>
-         <KEYWORD3>pg_proc</KEYWORD3>
-         <KEYWORD3>pg_range</KEYWORD3>
-         <KEYWORD3>pg_rewrite</KEYWORD3>
-         <KEYWORD3>pg_roles</KEYWORD3>
-         <KEYWORD3>pg_rules</KEYWORD3>
-         <KEYWORD3>pg_seclabel</KEYWORD3>
-         <KEYWORD3>pg_seclabels</KEYWORD3>
-         <KEYWORD3>pg_settings</KEYWORD3>
-         <KEYWORD3>pg_shadow</KEYWORD3>
-         <KEYWORD3>pg_shdepend</KEYWORD3>
-         <KEYWORD3>pg_shdescription</KEYWORD3>
-         <KEYWORD3>pg_shseclabel</KEYWORD3>
-         <KEYWORD3>pg_statistic</KEYWORD3>
-         <KEYWORD3>pg_stats</KEYWORD3>
-         <KEYWORD3>pg_tables</KEYWORD3>
-         <KEYWORD3>pg_tablespace</KEYWORD3>
-         <KEYWORD3>pg_timezone_abbrevs</KEYWORD3>
-         <KEYWORD3>pg_timezone_names</KEYWORD3>
-         <KEYWORD3>pg_trigger</KEYWORD3>
-         <KEYWORD3>pg_ts_config</KEYWORD3>
-         <KEYWORD3>pg_ts_config_map</KEYWORD3>
-         <KEYWORD3>pg_ts_dict</KEYWORD3>
-         <KEYWORD3>pg_ts_parser</KEYWORD3>
-         <KEYWORD3>pg_ts_template</KEYWORD3>
-         <KEYWORD3>pg_type</KEYWORD3>
-         <KEYWORD3>pg_user</KEYWORD3>
-         <KEYWORD3>pg_user_mapping</KEYWORD3>
-         <KEYWORD3>pg_user_mappings</KEYWORD3>
-         <KEYWORD3>pg_views</KEYWORD3>
-         <!-- -->
-         <KEYWORD3>administrable_role_authorizations</KEYWORD3>
-         <KEYWORD3>applicable_roles</KEYWORD3>
-         <KEYWORD3>attributes</KEYWORD3>
-         <KEYWORD3>character_sets</KEYWORD3>
-         <KEYWORD3>check_constraint_routine_usage</KEYWORD3>
-         <KEYWORD3>check_constraints</KEYWORD3>
-         <KEYWORD3>collation_character_set_applicability</KEYWORD3>
-         <KEYWORD3>collations</KEYWORD3>
-         <KEYWORD3>column_domain_usage</KEYWORD3>
-         <KEYWORD3>column_options</KEYWORD3>
-         <KEYWORD3>column_privileges</KEYWORD3>
-         <KEYWORD3>column_udt_usage</KEYWORD3>
-         <KEYWORD3>columns</KEYWORD3>
-         <KEYWORD3>constraint_column_usage</KEYWORD3>
-         <KEYWORD3>constraint_table_usage</KEYWORD3>
-         <KEYWORD3>data_type_privileges</KEYWORD3>
-         <KEYWORD3>domain_constraints</KEYWORD3>
-         <KEYWORD3>domain_udt_usage</KEYWORD3>
-         <KEYWORD3>domains</KEYWORD3>
-         <KEYWORD3>element_types</KEYWORD3>
-         <KEYWORD3>enabled_roles</KEYWORD3>
-         <KEYWORD3>foreign_data_wrapper_options</KEYWORD3>
-         <KEYWORD3>foreign_data_wrappers</KEYWORD3>
-         <KEYWORD3>foreign_server_options</KEYWORD3>
-         <KEYWORD3>foreign_servers</KEYWORD3>
-         <KEYWORD3>foreign_table_options</KEYWORD3>
-         <KEYWORD3>foreign_tables</KEYWORD3>
-         <KEYWORD3>information_schema_catalog_name</KEYWORD3>
-         <KEYWORD3>key_column_usage</KEYWORD3>
-         <KEYWORD3>parameters</KEYWORD3>
-         <KEYWORD3>referential_constraints</KEYWORD3>
-         <KEYWORD3>role_column_grants</KEYWORD3>
-         <KEYWORD3>role_routine_grants</KEYWORD3>
-         <KEYWORD3>role_table_grants</KEYWORD3>
-         <KEYWORD3>role_udt_grants</KEYWORD3>
-         <KEYWORD3>role_usage_grants</KEYWORD3>
-         <KEYWORD3>routine_privileges</KEYWORD3>
-         <KEYWORD3>routines</KEYWORD3>
-         <KEYWORD3>schemata</KEYWORD3>
-         <KEYWORD3>sequences</KEYWORD3>
-         <KEYWORD3>sql_features</KEYWORD3>
-         <KEYWORD3>sql_implementation_info</KEYWORD3>
-         <KEYWORD3>sql_languages</KEYWORD3>
-         <KEYWORD3>sql_packages</KEYWORD3>
-         <KEYWORD3>sql_parts</KEYWORD3>
-         <KEYWORD3>sql_sizing</KEYWORD3>
-         <KEYWORD3>sql_sizing_profiles</KEYWORD3>
-         <KEYWORD3>table_constraints</KEYWORD3>
-         <KEYWORD3>table_privileges</KEYWORD3>
-         <KEYWORD3>tables</KEYWORD3>
-         <KEYWORD3>triggered_update_columns</KEYWORD3>
-         <KEYWORD3>triggers</KEYWORD3>
-         <KEYWORD3>udt_privileges</KEYWORD3>
-         <KEYWORD3>usage_privileges</KEYWORD3>
-         <KEYWORD3>user_defined_types</KEYWORD3>
-         <KEYWORD3>user_mapping_options</KEYWORD3>
-         <KEYWORD3>user_mappings</KEYWORD3>
-         <KEYWORD3>view_column_usage</KEYWORD3>
-         <KEYWORD3>view_routine_usage</KEYWORD3>
-         <KEYWORD3>view_table_usage</KEYWORD3>
-         <KEYWORD3>views</KEYWORD3>
-
-         <!-- regexp -->
-         <KEYWORD4>alnum</KEYWORD4>
-         <KEYWORD4>alpha</KEYWORD4>
-         <KEYWORD4>blank</KEYWORD4>
-         <KEYWORD4>cntrl</KEYWORD4>
-         <KEYWORD4>digit</KEYWORD4>
-         <KEYWORD4>graph</KEYWORD4>
-         <KEYWORD4>lower</KEYWORD4>
-         <KEYWORD4>print</KEYWORD4>
-         <KEYWORD4>punct</KEYWORD4>
-         <KEYWORD4>space</KEYWORD4>
-         <KEYWORD4>upper</KEYWORD4>
-         <KEYWORD4>xdigit</KEYWORD4>
-
-         <!-- others -->
-         <KEYWORD1>IF</KEYWORD1>
-         <KEYWORD1>ELSIF</KEYWORD1>
-         <KEYWORD1>PERFORM</KEYWORD1>
-         <KEYWORD1>SERIAL</KEYWORD1>
-         <KEYWORD1>TEXT</KEYWORD1>
-         <KEYWORD1>ROWTYPE</KEYWORD1>
-         <KEYWORD1>VOID</KEYWORD1>
-         <KEYWORD4>RAISE</KEYWORD4>
-         <KEYWORD4>DEBUG</KEYWORD4>
-         <KEYWORD4>LOG</KEYWORD4>
-         <KEYWORD4>INFO</KEYWORD4>
-         <KEYWORD4>NOTICE</KEYWORD4>
-         <KEYWORD4>WARNING</KEYWORD4>
-         <!-- <KEYWORD4>EXCEPTION</KEYWORD4> already keyword1-->
-         <KEYWORD4>plpgsql</KEYWORD4>
-         <KEYWORD4>pltcl</KEYWORD4>
-         <KEYWORD4>pltclu</KEYWORD4>
-         <KEYWORD4>plperl</KEYWORD4>
-         <KEYWORD4>plperlu</KEYWORD4>
-         <KEYWORD4>plpythonu</KEYWORD4>
-      </KEYWORDS>
-   </RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/php.xml b/qpython/src/main/assets/syntax/php.xml
deleted file mode 100644
index 7eb35fa3..00000000
--- a/qpython/src/main/assets/syntax/php.xml
+++ /dev/null
@@ -1,4932 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!--
- * :tabSize=8:indentSize=8:noTabs=false:
- * :folding=explicit:collapseFolds=1:Catalog entry:
-<MODE NAME="php" FILE="php.xml"
-				FILE_NAME_GLOB="*.{php3,php4,php5,php,phtml}"
-				FIRST_LINE_GLOB="&lt;?php*" />
--->
-
-
-<!--
-Usage of keywords:
- - COMMENT1: range comments  (/* ... */)
- - COMMENT2: line comments   (using //)
- - COMMENT3: phpdoc comments (/** .. */)
- - COMMENT4: line comments   (using #)
- - DIGIT:    numbers
- - FUNCTION: custom functions and class/object methods, e.g. foo(), $foo->bar() and foo::bar()
- - KEYWORD1: basic PHP keywords, e.g. true, false, extends, implements
-             language constructs, e.g. if .. then .. else
- - KEYWORD2: internal PHP functions,
- - KEYWORD3: variables, e.g. $foo
- - KEYWORD4: class definitions, object members, internal PHP objects
- - LABEL:    phpdoc labels, like @see
-             CDATA blocks
- - LITERAL1: Strings in single quotes, e.g. 'foo'
- - LITERAL2: Strings in double quotes, e.g. "foo"
- - LITERAL3: Strings in backtick quotes, e.g. `foo`
- - LITERAL4: heredocs, e.g. "<<< FOO .... FOO
- - MARKUP:   tags, e.g. <?php .. ?>
- - OPERATOR: normal operators, e.g. + - ( ) { } [ ]
-             PHP language types in phpdoc block (TODO: sane?!)
--->
-
-<!--
-TODO:
- - cleanup/factorize PHPDOC section
--->
-
-
-<MODE>
-	<PROPS>
-		<!-- Default comment props (used when a ruleset has no other props) -->
-		<PROPERTY NAME="commentStart" VALUE="/*" />
-		<PROPERTY NAME="commentEnd" VALUE="*/" />
-		<PROPERTY NAME="lineComment" VALUE="//" />
-
-		<PROPERTY NAME="wordBreakChars" VALUE=",+-=&lt;&gt;/?^&amp;*" />
-
-		<!-- Auto indent -->
-		<PROPERTY NAME="indentOpenBrackets" VALUE="{" />
-		<PROPERTY NAME="indentCloseBrackets" VALUE="}" />
-		<PROPERTY NAME="unalignedOpenBrackets" VALUE="(" />
-		<PROPERTY NAME="unalignedCloseBrackets" VALUE=")" />
-		<PROPERTY NAME="indentNextLine"
-			VALUE="\s*(((if|while|else\s*(if)?|for(each)?|switch|declare)\s*\(.*\)[^{:;]*)|(do\s*[^\({:;]*))" />
-		<PROPERTY NAME="lineUpClosingBracket" VALUE="true" /><!-- @deprecated since 4.3pre2 -->
-		<PROPERTY NAME="unindentThisLine"
-			VALUE="^.*(default:\s*|case.*:.*)$" />
-		<PROPERTY NAME="electricKeys" VALUE=":" />
-	</PROPS>
-
-
-	<RULES IGNORE_CASE="TRUE">
-		<PROPS>
-			<!-- comment props for "HTML"/not-PHP: -->
-			<PROPERTY NAME="commentStart" VALUE="&lt;!--" />
-			<PROPERTY NAME="commentEnd" VALUE="--&gt;" />
-			<PROPERTY NAME="lineComment" VALUE="" />
-		</PROPS>
-
-		<!-- regular PHP tags -->
-		<SPAN TYPE="MARKUP" DELEGATE="PHP">
-			<BEGIN>&lt;?php</BEGIN>
-			<END>?&gt;</END>
-		</SPAN>
-
-		<!-- short tags: -->
-		<SPAN TYPE="MARKUP" DELEGATE="PHP">
-			<BEGIN>&lt;?</BEGIN>
-			<END>?&gt;</END>
-		</SPAN>
-		<SPAN TYPE="MARKUP" DELEGATE="PHP">
-			<BEGIN>&lt;?=</BEGIN>
-			<END>?&gt;</END>
-		</SPAN>
-
-		<!-- ASP style tags: -->
-		<SPAN TYPE="MARKUP" DELEGATE="PHP">
-			<BEGIN>&lt;%</BEGIN>
-			<END>%&gt;</END>
-		</SPAN>
-		<SPAN TYPE="MARKUP" DELEGATE="PHP">
-			<BEGIN>&lt;%=</BEGIN>
-			<END>%&gt;</END>
-		</SPAN>
-
-		<!-- SSI? -->
-		<SPAN_REGEXP HASH_CHAR="&lt;SCRIPT" TYPE="MARKUP" DELEGATE="PHP">
-			<BEGIN>&lt;SCRIPT\s+LANGUAGE="?PHP"?&gt;</BEGIN>
-			<END>&lt;/SCRIPT&gt;</END>
-		</SPAN_REGEXP>
-
-		<!-- SGML comment -->
-		<SPAN TYPE="COMMENT1" DELEGATE="COMMENT1+PHP">
-			<BEGIN>&lt;!--</BEGIN>
-			<END>--&gt;</END>
-		</SPAN>
-
-		<!-- JavaScript -->
-		<SPAN TYPE="MARKUP" DELEGATE="JAVASCRIPT_OPENTAG">
-			<BEGIN>&lt;SCRIPT</BEGIN>
-			<END>&lt;/SCRIPT&gt;</END>
-		</SPAN>
-
-		<!-- CSS -->
-		<SPAN TYPE="MARKUP" DELEGATE="CSS_OPENTAG">
-			<BEGIN>&lt;STYLE</BEGIN>
-			<END>&lt;/STYLE&gt;</END>
-		</SPAN>
-
-		<!-- CDATA -->
-		<SPAN TYPE="LABEL" DELEGATE="MAIN">
-			<BEGIN>&lt;![CDATA[</BEGIN>
-			<END>]]&gt;</END>
-		</SPAN>
-
-		<!-- DTD instructions -->
-		<SPAN TYPE="MARKUP" DELEGATE="xml::DTD-TAGS">
-			<BEGIN>&lt;!</BEGIN>
-			<END>&gt;</END>
-		</SPAN>
-
-		<!-- markup tags -->
-		<SEQ_REGEXP HASH_CHAR="&lt;" TYPE="MARKUP" DELEGATE="TAGS">&lt;/?\w+</SEQ_REGEXP>
-
-		<!-- SGML entities -->
-		<SPAN TYPE="LITERAL2" NO_WORD_BREAK="TRUE">
-			<BEGIN>&amp;</BEGIN>
-			<END>;</END>
-		</SPAN>
-	</RULES>
-	
-	<!--{{{ rule TAGS -->
-	<!-- HTML tags (from MAIN rule) -->
-	<RULES SET="TAGS" DEFAULT="MARKUP" ESCAPE="\">
-		<PROPS>
-			<!-- comment props for "HTML"/not-PHP: -->
-			<PROPERTY NAME="commentStart" VALUE="&lt;!--" />
-			<PROPERTY NAME="commentEnd" VALUE="--&gt;" />
-			<PROPERTY NAME="lineComment" VALUE="" />
-		</PROPS>
-
-		<SEQ TYPE="MARKUP" DELEGATE="MAIN">&gt;</SEQ><!-- from SEQ_REGEXP delegate -->
-
-		<IMPORT DELEGATE="TO_LITERAL+PHP" />
-		<IMPORT DELEGATE="TO_PHP" />
-		<IMPORT DELEGATE="INVALID_LT" />
-		<IMPORT DELEGATE="html::TAGS" />
-	</RULES>
-	<!--}}}-->
-
-	<!--{{{ rule CSS_OPENTAG -->
-	<!-- CSS where PHP code may be injected -->
-	<RULES SET="CSS_OPENTAG" DEFAULT="MARKUP">
-		<SEQ TYPE="MARKUP" DELEGATE="CSS">&gt;</SEQ>
-
-		<IMPORT DELEGATE="TO_LITERAL+PHP"/>
-	</RULES>
-	<!--}}}-->
-
-	<!--{{{ rule CSS -->
-	<RULES SET="CSS" DEFAULT="MARKUP">
-		<!-- CSS has no line comment: -->
-		<PROPS>
-			<PROPERTY NAME="lineComment" VALUE="" />
-		</PROPS>
-
-		<SPAN DELEGATE="CSS"><!-- give priority to PHP -->
-			<BEGIN>(</BEGIN>
-			<END>)</END>
-		</SPAN>
-		<IMPORT DELEGATE="TO_PHP"/>
-		<IMPORT DELEGATE="css::MAIN"/>
-	</RULES>
-	<!--}}}-->
-
-	<!--{{{ rule OBJECT_PHP -->
-	<!-- Helper for class references in rule PHP -->
-	<RULES SET="OBJECT_PHP" DEFAULT="KEYWORD4" ESCAPE="\"> <!-- TODO: ESCAPE should not be needed, see http://sourceforge.net/tracker/index.php?func=detail&aid=1600458&group_id=588&atid=100588 -->
-		<SPAN TYPE="OPERATOR" DELEGATE="PHP_EXPRESSION">
-			<BEGIN>[</BEGIN>
-			<END>]</END>
-		</SPAN>
-
-		<!-- Keep brackets together and handle the expression therein with "PHP_EXPRESSION" -->
-		<SPAN TYPE="OPERATOR" DELEGATE="PHP_EXPRESSION">
-			<BEGIN>(</BEGIN>
-			<END>)</END>
-		</SPAN>
-
-		<!-- Delegate expressions methods/members, e.g. $a->{'bar-'.substr($b,1)}: -->
-		<SPAN_REGEXP HASH_CHAR="-&gt;" TYPE="KEYWORD4" DELEGATE="PHP_EXPRESSION">
-			<BEGIN>-&gt;\s*\{</BEGIN>
-			<END>}</END>
-		</SPAN_REGEXP>
-
-		<!-- Recurse methods: -->
-		<SEQ_REGEXP HASH_CHAR="-&gt;" TYPE="FUNCTION" DELEGATE="OBJECT_PHP">-&gt;\s*\w+\s*(?=\()</SEQ_REGEXP>
-
-		<!-- Recurse members: -->
-		<SEQ_REGEXP TYPE="KEYWORD4" HASH_CHAR="-&gt;" DELEGATE="OBJECT_PHP">-&gt;\w*</SEQ_REGEXP>
-
-		<!-- Handle comments (without phpdoc, which makes no sense here) -->
-		<SPAN TYPE="COMMENT1">
-			<BEGIN>/*</BEGIN>
-			<END>*/</END>
-		</SPAN>
-		<EOL_SPAN TYPE="COMMENT2">//</EOL_SPAN>
-		<EOL_SPAN TYPE="COMMENT4">#</EOL_SPAN>
-
-		<!-- Operators delegate back to PHP_EXPRESSION {{{ -->
-		<SEQ_REGEXP DELEGATE="PHP_EXPRESSION">\s</SEQ_REGEXP>
-		<SEQ TYPE="OPERATOR" DELEGATE="PHP_EXPRESSION">!</SEQ>
-		<SEQ TYPE="OPERATOR" DELEGATE="PHP_EXPRESSION">%</SEQ>
-		<SEQ TYPE="OPERATOR" DELEGATE="PHP_EXPRESSION">&amp;</SEQ>
-		<SEQ TYPE="OPERATOR" DELEGATE="PHP_EXPRESSION">&gt;</SEQ>
-		<SEQ TYPE="OPERATOR" DELEGATE="PHP_EXPRESSION">&lt;</SEQ>
-		<SEQ TYPE="OPERATOR" DELEGATE="PHP_EXPRESSION">*</SEQ>
-		<SEQ TYPE="OPERATOR" DELEGATE="PHP_EXPRESSION">/</SEQ>
-		<SEQ TYPE="OPERATOR" DELEGATE="PHP_EXPRESSION">+</SEQ>
-		<SEQ TYPE="OPERATOR" DELEGATE="PHP_EXPRESSION">,</SEQ>
-		<SEQ TYPE="OPERATOR" DELEGATE="PHP_EXPRESSION">-</SEQ><!-- "->" gets handled before -->
-		<SEQ TYPE="OPERATOR" DELEGATE="PHP_EXPRESSION">.</SEQ>
-		<SEQ_REGEXP HASH_CHAR="/" TYPE="OPERATOR" DELEGATE="PHP_EXPRESSION">/(?!/)</SEQ_REGEXP>
-		<SEQ_REGEXP HASH_CHAR=":" TYPE="OPERATOR" DELEGATE="PHP_EXPRESSION">:(?!:)</SEQ_REGEXP><!-- not "::" -->
-		<SEQ TYPE="OPERATOR" DELEGATE="PHP">;</SEQ>
-		<SEQ TYPE="OPERATOR" DELEGATE="PHP_EXPRESSION">=</SEQ>
-		<SEQ TYPE="OPERATOR" DELEGATE="PHP_EXPRESSION">?</SEQ>
-		<SEQ TYPE="OPERATOR" DELEGATE="PHP_EXPRESSION">@</SEQ>
-		<SEQ TYPE="OPERATOR" DELEGATE="PHP_EXPRESSION">[</SEQ>
-		<SEQ TYPE="OPERATOR" DELEGATE="PHP_EXPRESSION">]</SEQ>
-		<SEQ TYPE="OPERATOR" DELEGATE="PHP_EXPRESSION">^</SEQ>
-		<SEQ TYPE="OPERATOR" DELEGATE="PHP_EXPRESSION">`</SEQ>
-		<SEQ TYPE="OPERATOR" DELEGATE="PHP_EXPRESSION">{</SEQ>
-		<SEQ TYPE="OPERATOR" DELEGATE="PHP_EXPRESSION">|</SEQ>
-		<SEQ TYPE="OPERATOR" DELEGATE="PHP_EXPRESSION">}</SEQ>
-		<SEQ TYPE="OPERATOR" DELEGATE="PHP_EXPRESSION">~</SEQ>
-		<SEQ TYPE="OPERATOR" DELEGATE="PHP_EXPRESSION">\</SEQ>
-		<!-- }}} -->
-
-		<IMPORT DELEGATE="PHP_EXPRESSION" />
-		<IMPORT DELEGATE="PHP_VAR" />
-		<IMPORT DELEGATE="PHP_KEYWORDS" />
-	</RULES>
-	<!--}}}-->
-
-	<!--{{{ rule PHP_LITERAL2 -->
-	<!-- PHP literal where variables get parsed -->
-	<RULES SET="PHP_LITERAL2" DEFAULT="LITERAL2" ESCAPE="\">
-		<!-- expressions in curly braces ("{$foo}") -->
-		<SPAN_REGEXP HASH_CHAR="{" TYPE="LITERAL2" DELEGATE="OBJECT_PHP">
-			<BEGIN>\{(?=\$)</BEGIN>
-			<END>}</END>
-		</SPAN_REGEXP>
-
-		<!-- Vars like "${foo}" (does not work for objects/methods) -->
-		<SEQ_REGEXP HASH_CHAR="$" TYPE="KEYWORD3">[\$]+\{[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*\}</SEQ_REGEXP>
-
-		<IMPORT DELEGATE="PHP_VAR" />
-	</RULES>
-	<!--}}}-->
-
-	<!--{{{ rule PHP_LITERAL3 -->
-	<!-- PHP literal in backticks, where variables get parsed; based on PHP_LITERAL2 -->
-	<RULES SET="PHP_LITERAL3" DEFAULT="LITERAL3" ESCAPE="\">
-		<!-- expressions in curly braces ("{$foo}") -->
-		<SPAN_REGEXP HASH_CHAR="{" TYPE="LITERAL3" DELEGATE="OBJECT_PHP">
-			<BEGIN>\{(?=\$)</BEGIN>
-			<END>}</END>
-		</SPAN_REGEXP>
-
-		<!-- Vars like "${foo}" (does not work for objects/methods) -->
-		<SEQ_REGEXP HASH_CHAR="$" TYPE="KEYWORD3">[\$]+\{[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*\}</SEQ_REGEXP>
-
-		<IMPORT DELEGATE="PHP_VAR" />
-	</RULES>
-	<!--}}}-->
-
-	<!--{{{ rule PHP_LITERAL4 -->
-	<!-- PHP heredoc blocks, where variables get parsed; see PHP_LITERAL2 -->
-	<RULES SET="PHP_LITERAL4" DEFAULT="LITERAL4" ESCAPE="\">
-		<!-- expressions in curly braces ("{$foo}") -->
-		<SPAN_REGEXP HASH_CHAR="{" TYPE="LITERAL4" DELEGATE="OBJECT_PHP">
-			<BEGIN>\{(?=\$)</BEGIN>
-			<END>}</END>
-		</SPAN_REGEXP>
-
-		<!-- Vars like "${foo}" (does not work for objects/methods) -->
-		<SEQ_REGEXP HASH_CHAR="$" TYPE="KEYWORD3">[\$]+\{[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*\}</SEQ_REGEXP>
-
-		<IMPORT DELEGATE="PHP_VAR" />
-	</RULES>
-	<!--}}}-->
-
-	<!--{{{ rul -->
-	<!-- Helper for class / interface definition -->
-	<RULES SET="DEF_CLASS" DEFAULT="KEYWORD4">
-		<!-- back to "PHP" for curly brace, the closing one gets handled there -->
-		<SEQ TYPE="OPERATOR" DELEGATE="PHP">{</SEQ>
-		<!-- Invalid, go back: -->
-		<SEQ TYPE="INVALID" DELEGATE="PHP">;</SEQ>
-		<SEQ TYPE="INVALID" DELEGATE="PHP">=</SEQ>
-
-		<IMPORT DELEGATE="PHP_COMMENTS" />
-
-		<KEYWORDS>
-			<KEYWORD1>extends</KEYWORD1>
-			<KEYWORD1>implements</KEYWORD1>
-		</KEYWORDS>
-	</RULES>
-	<!--}}}-->
-
-	<!--{{{ rule DEF_FUNCTION -->
-	<!-- Function definition -->
-	<RULES SET="DEF_FUNCTION" DEFAULT="FUNCTION">
-		<!-- Invalid, go back: -->
-		<SEQ TYPE="INVALID" DELEGATE="PHP">;</SEQ>
-
-		<SEQ TYPE="OPERATOR">&amp;</SEQ><!-- return by reference -->
-		<SEQ TYPE="OPERATOR" DELEGATE="DEF_FUNCTION_ARGS">(</SEQ>
-
-		<IMPORT DELEGATE="PHP_COMMENTS" />
-	</RULES>
-	<!--}}}-->
-
-	<!--{{{ rule DEF_FUNCTION_ARGS -->
-	<!-- Arguments of a function definition -->
-	<RULES SET="DEF_FUNCTION_ARGS" DEFAULT="KEYWORD4">
-		<!-- back to "PHP" for closing bracket: -->
-		<SEQ TYPE="OPERATOR" DELEGATE="PHP">)</SEQ>
-
-		<SEQ TYPE="OPERATOR" DELEGATE="DEF_FUNCTION_ARGS_VALUE">=</SEQ>
-		<SEQ TYPE="OPERATOR">,</SEQ>
-
-		<IMPORT DELEGATE="PHP_VAR" />
-		<IMPORT DELEGATE="PHP_COMMENTS" />
-		<IMPORT DELEGATE="PHP_TYPES" />
-	</RULES>
-	<!--}}}-->
-
-	<!--{{{ rule DEF_FUNCTION_ARGS_VALUE -->
-	<!-- Default values of a function argument -->
-	<RULES SET="DEF_FUNCTION_ARGS_VALUE" HIGHLIGHT_DIGITS="TRUE" DIGIT_RE="(0x[0-9a-f]+|([0-9]*\.)?[0-9]+(e[+-]?[0-9]+)?)">
-		<!-- Literals, without var substitution: -->
-		<SPAN TYPE="LITERAL1" ESCAPE="\">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-		<SPAN TYPE="LITERAL1">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-
-		<SPAN_REGEXP HASH_CHAR="array" TYPE="KEYWORD4" DELEGATE="DEF_FUNCTION_ARGS_VALUE_ARRAY">
-			<BEGIN>array\s*\(</BEGIN>
-			<END>)</END>
-		</SPAN_REGEXP>
-		<SEQ TYPE="KEYWORD4">null</SEQ>
-
-		<SEQ TYPE="OPERATOR" DELEGATE="DEF_FUNCTION_ARGS">,</SEQ>
-		<SEQ TYPE="OPERATOR" DELEGATE="PHP">)</SEQ>
-
-		<IMPORT DELEGATE="PHP_COMMENTS" />
-		<IMPORT DELEGATE="PHP_BASIC_KEYWORD1" />
-	</RULES>
-	<!--}}}-->
-
-	<!--{{{ rule DEF_FUNCTION_ARGS_VALUE_ARRAY -->
-	<!-- Body of "array(...)" in function argument default values -->
-	<RULES SET="DEF_FUNCTION_ARGS_VALUE_ARRAY" HIGHLIGHT_DIGITS="TRUE" DIGIT_RE="(0x[0-9a-f]+|([0-9]*\.)?[0-9]+(e[+-]?[0-9]+)?)">
-		<!-- Literals, without var substitution: -->
-		<SPAN TYPE="LITERAL1" ESCAPE="\">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-		<SPAN TYPE="LITERAL1">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-		<SEQ TYPE="OPERATOR">,</SEQ>
-	</RULES>
-	<!--}}}-->
-
-	<!--{{{ rule PHP_COMMENTS -->
-	<!-- Comments in PHP -->
-	<RULES SET="PHP_COMMENTS">
-		<!-- special case -->
-		<SEQ TYPE="COMMENT1">/**/</SEQ>
-
-		<!-- PHPdoc comment -->
-		<SPAN TYPE="COMMENT3" DELEGATE="PHPDOC">
-			<BEGIN>/**</BEGIN>
-			<END>*/</END>
-		</SPAN>
-
-		<!-- range comment -->
-		<SPAN TYPE="COMMENT1">
-			<BEGIN>/*</BEGIN>
-			<END>*/</END>
-		</SPAN>
-
-		<!-- line comments -->
-		<EOL_SPAN TYPE="COMMENT2">//</EOL_SPAN>
-		<EOL_SPAN TYPE="COMMENT4">#</EOL_SPAN>
-	</RULES>
-	<!--}}}-->
-
-	<!--{{{ rule PHP_VAR -->
-	<!-- PHP variables (PHPDOC_VAR for phpdoc blocks) -->
-	<RULES SET="PHP_VAR">
-
-		<!-- Normal variables -->
-		<!-- Not using MARK_FOLLOWING, which would match $foo\" completely (in PHP_LITERAL2) -->
-		<SEQ_REGEXP HASH_CHAR="$" TYPE="KEYWORD3">[\$]+[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*</SEQ_REGEXP>
-	</RULES>
-	<!--}}}-->
-
-	<!--{{{ rule PHP -->
-	<RULES SET="PHP" ESCAPE="\" HIGHLIGHT_DIGITS="TRUE" DIGIT_RE="(0x[0-9a-f]+|([0-9]*\.)?[0-9]+(e[+-]?[0-9]+)?)">
-		<!-- Class definitions.
-		     This uses SEQ_REGEXP (instead of SPAN_*) for the keywords only,
-				 so that the curly braces can be highlighted as operator. -->
-		<SEQ_REGEXP HASH_CHARS="ci" AT_WORD_START="TRUE" DELEGATE="DEF_CLASS" TYPE="KEYWORD1">(class|interface)(\s+|$)</SEQ_REGEXP>
-
-		<SEQ_REGEXP HASH_CHAR="function" AT_WORD_START="TRUE" DELEGATE="DEF_FUNCTION" TYPE="KEYWORD1">(function)(\s+|$)</SEQ_REGEXP>
-
-		<!-- Imports: -->
-		<IMPORT DELEGATE="PHP_EXPRESSION" />
-	</RULES>
-	<!--}}}-->
-
-	<!--{{{ rule PHP_EXPRESSION -->
-	<!-- A basic PHP expression, as it can be used in $a->{EXPR} -->
-	<RULES SET="PHP_EXPRESSION" ESCAPE="\" HIGHLIGHT_DIGITS="TRUE" DIGIT_RE="(0x[0-9a-f]+|([0-9]*\.)?[0-9]+(e[+-]?[0-9]+)?)">
-		<!-- Comments: -->
-		<!-- special case -->
-		<SEQ TYPE="COMMENT1">/**/</SEQ>
-		<!-- PHPdoc comment -->
-		<SPAN TYPE="COMMENT3" DELEGATE="PHPDOC">
-			<BEGIN>/**</BEGIN>
-			<END>*/</END>
-		</SPAN>
-		<!-- range comment -->
-		<SPAN TYPE="COMMENT1">
-			<BEGIN>/*</BEGIN>
-			<END>*/</END>
-		</SPAN>
-		<!-- line comments: -->
-		<EOL_SPAN TYPE="COMMENT2">//</EOL_SPAN>
-		<EOL_SPAN TYPE="COMMENT4">#</EOL_SPAN>
-
-		<!-- back to MAIN for "?>" -->
-		<SEQ TYPE="MARKUP" DELEGATE="MAIN">?&gt;</SEQ>
-
-		<!-- Literals: -->
-		<SPAN TYPE="LITERAL1" ESCAPE="\">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-		<SPAN TYPE="LITERAL2" DELEGATE="PHP_LITERAL2">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-		<SPAN TYPE="LITERAL3" DELEGATE="PHP_LITERAL3">
-			<BEGIN>`</BEGIN>
-			<END>`</END>
-		</SPAN>
-
-		<!--
-		TODO: these should not highlight e.g. "(int)$bar"
-		-->
-		<MARK_PREVIOUS TYPE="FUNCTION" MATCH_TYPE="OPERATOR">(</MARK_PREVIOUS>
-		<MARK_PREVIOUS TYPE="FUNCTION" MATCH_TYPE="OPERATOR"> (</MARK_PREVIOUS>
-
-		<!-- Variable functions, e.g. $foo() -->
-		<SEQ_REGEXP HASH_CHAR="$" TYPE="FUNCTION">[\$]+[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*\s*(?=\()</SEQ_REGEXP>
-
-		<!-- Readins/Heredoc -->
-		<SPAN_REGEXP HASH_CHAR="&lt;&lt;&lt;" TYPE="LITERAL4" DELEGATE="PHP_LITERAL4">
-			<BEGIN><![CDATA[<<<[\p{Space}]*("?)([\p{Alnum}_]+)\1[\p{Space}]*$]]></BEGIN>
-			<END AT_LINE_START="TRUE">$2</END>
-		</SPAN_REGEXP>
-
-		<!-- Nowdoc (http://php.net/manual/en/language.types.string.php#language.types.string.syntax.nowdoc) -->
-		<SPAN_REGEXP HASH_CHAR="&lt;&lt;&lt;" TYPE="LITERAL1">
-			<BEGIN><![CDATA[<<<[\p{Space}]*'([\p{Alnum}_]+)'[\p{Space}]*$]]></BEGIN>
-			<END AT_LINE_START="TRUE">$1</END>
-		</SPAN_REGEXP>
-
-
-		<!-- Keep blocks of curly braces (scopes) together.
-		     This is required e.g. for handling $a->{if(1){ echo 1; }}. -->
-		<!--
-		TODO: this does not work with the following and therefore is commented out (should match brackets in PHP blocks only!):
-		<?php { ?>
-		}
-		<?php } ?>
-		<SPAN TYPE="OPERATOR" DELEGATE="PHP">
-			<BEGIN>{</BEGIN>
-			<END>}</END>
-		</SPAN>
-		-->
-
-		<!-- operators -->
-		<!-- {{{ -->
-		<SEQ TYPE="OPERATOR">!</SEQ>
-		<SEQ TYPE="OPERATOR">%</SEQ>
-		<SEQ TYPE="OPERATOR">&amp;</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;</SEQ>
-
-		<!-- TODO: does not get used, because of MARK_PREVIOUS for FUNCTION below -->
-		<SEQ TYPE="OPERATOR">(array)</SEQ>
-		<SEQ TYPE="OPERATOR">(bool)</SEQ>
-		<SEQ TYPE="OPERATOR">(boolean)</SEQ>
-		<SEQ TYPE="OPERATOR">(double)</SEQ>
-		<SEQ TYPE="OPERATOR">(float)</SEQ>
-		<SEQ TYPE="OPERATOR">(int)</SEQ>
-		<SEQ TYPE="OPERATOR">(integer)</SEQ>
-		<SEQ TYPE="OPERATOR">(object)</SEQ>
-		<SEQ TYPE="OPERATOR">(real)</SEQ>
-		<SEQ TYPE="OPERATOR">(string)</SEQ>
-
-		<SEQ TYPE="OPERATOR">*</SEQ>
-		<SEQ TYPE="OPERATOR">+</SEQ>
-		<SEQ TYPE="OPERATOR">,</SEQ>
-		<SEQ TYPE="OPERATOR">-</SEQ>
-		<SEQ TYPE="OPERATOR">.</SEQ>
-		<SEQ TYPE="OPERATOR">/</SEQ>
-		<SEQ_REGEXP HASH_CHAR=":" TYPE="OPERATOR">:(?!:)</SEQ_REGEXP><!-- not "::" -->
-		<SEQ TYPE="OPERATOR" DELEGATE="PHP">;</SEQ><!-- expression end => PHP -->
-		<SEQ TYPE="OPERATOR">=</SEQ>
-		<SEQ TYPE="OPERATOR">?</SEQ>
-		<SEQ TYPE="OPERATOR">@</SEQ>
-		<SEQ TYPE="OPERATOR">[</SEQ>
-		<SEQ TYPE="OPERATOR">]</SEQ>
-		<SEQ TYPE="OPERATOR">^</SEQ>
-		<SEQ TYPE="OPERATOR">`</SEQ>
-		<SEQ TYPE="OPERATOR">|</SEQ>
-		<SEQ TYPE="OPERATOR">~</SEQ>
-		<SEQ TYPE="OPERATOR">(</SEQ>
-		<SEQ TYPE="OPERATOR">)</SEQ>
-		<SEQ TYPE="OPERATOR">{</SEQ>
-		<SEQ TYPE="OPERATOR">}</SEQ>
-		<!-- }}} -->
-
-		<!-- handle "new" keyword: -->
-		<SEQ_REGEXP TYPE="KEYWORD1" HASH_CHAR="new" AT_WORD_START="TRUE" DELEGATE="PHP_VAR_NEW_KW">new\s+</SEQ_REGEXP>
-
-		<!-- Imports: -->
-		<IMPORT DELEGATE="PHP_VAR" />
-		<!-- TODO: split this, so e.g. "new", "class" etc don't show up here, but only in "PHP" -->
-		<IMPORT DELEGATE="PHP_KEYWORDS" />
-	</RULES>
-	<!--}}}-->
-
-	<!--{{{ rule PHP_VAR_NEW_KW -->
-	<RULES SET="PHP_VAR_NEW_KW" DEFAULT="KEYWORD4">
-		<SEQ TYPE="OPERATOR" DELEGATE="PHP_EXPRESSION">(</SEQ>
-		<SEQ TYPE="OPERATOR" DELEGATE="PHP">;</SEQ>
-	</RULES>
-	<!--}}}-->
-
-	<!--{{{ rule PHP_BASIC_KEYWORD1 -->
-	<RULES SET="PHP_BASIC_KEYWORD1">
-		<KEYWORDS>
-			<KEYWORD1>true</KEYWORD1>
-			<KEYWORD1>false</KEYWORD1>
-			<KEYWORD1>null</KEYWORD1>
-		</KEYWORDS>
-	</RULES>
-	<!--}}}-->
-
-	<!--{{{  -->
-	<RULES SET="PHP_TYPES">
-		<!-- Taken from: http://php.net/manual/en/language.types.php -->
-		<KEYWORDS>
-			<OPERATOR>array</OPERATOR>
-			<OPERATOR>bool</OPERATOR>
-			<OPERATOR>boolean</OPERATOR>
-			<OPERATOR>callback</OPERATOR>
-			<OPERATOR>double</OPERATOR>
-			<OPERATOR>float</OPERATOR>
-			<OPERATOR>int</OPERATOR>
-			<OPERATOR>integer</OPERATOR>
-			<OPERATOR>mixed</OPERATOR>
-			<OPERATOR>number</OPERATOR>
-			<OPERATOR>NULL</OPERATOR>
-			<OPERATOR>object</OPERATOR>
-			<OPERATOR>real</OPERATOR><!-- not listed, but valid in a typecast -->
-			<OPERATOR>resource</OPERATOR>
-			<OPERATOR>string</OPERATOR>
-		</KEYWORDS>
-	</RULES>
-	<!--}}}-->
-
-	<!--{{{ rule PHP_KEYWORDS -->
-	<RULES SET="PHP_KEYWORDS">
-		<IMPORT DELEGATE="KEYWORDS_VISIBILITY" />
-		<IMPORT DELEGATE="PHP_BASIC_KEYWORD1" />
-
-		<KEYWORDS>
-			<!-- start: generated by buildfunctionlist.php -->
-			<!-- {{{ -->
-			<!-- Internal classes (61) -->
-			<KEYWORD4>arrayiterator</KEYWORD4>
-			<KEYWORD4>arrayobject</KEYWORD4>
-			<KEYWORD4>cachingiterator</KEYWORD4>
-			<KEYWORD4>cachingrecursiveiterator</KEYWORD4>
-			<KEYWORD4>collection</KEYWORD4>
-			<KEYWORD4>descriptor</KEYWORD4>
-			<KEYWORD4>directoryiterator</KEYWORD4>
-			<KEYWORD4>domattr</KEYWORD4>
-			<KEYWORD4>domattribute</KEYWORD4>
-			<KEYWORD4>domcharacterdata</KEYWORD4>
-			<KEYWORD4>domdocument</KEYWORD4>
-			<KEYWORD4>domdocumenttype</KEYWORD4>
-			<KEYWORD4>domelement</KEYWORD4>
-			<KEYWORD4>domimplementation</KEYWORD4>
-			<KEYWORD4>domnamednodemap</KEYWORD4>
-			<KEYWORD4>domnode</KEYWORD4>
-			<KEYWORD4>domnodelist</KEYWORD4>
-			<KEYWORD4>domprocessinginstruction</KEYWORD4>
-			<KEYWORD4>domtext</KEYWORD4>
-			<KEYWORD4>domxpath</KEYWORD4>
-			<KEYWORD4>domxsltstylesheet</KEYWORD4>
-			<KEYWORD4>filteriterator</KEYWORD4>
-			<KEYWORD4>hw_api</KEYWORD4>
-			<KEYWORD4>hw_api_attribute</KEYWORD4>
-			<KEYWORD4>hw_api_content</KEYWORD4>
-			<KEYWORD4>hw_api_error</KEYWORD4>
-			<KEYWORD4>hw_api_object</KEYWORD4>
-			<KEYWORD4>hw_api_reason</KEYWORD4>
-			<KEYWORD4>limititerator</KEYWORD4>
-			<KEYWORD4>lob</KEYWORD4>
-			<KEYWORD4>memcache</KEYWORD4>
-			<KEYWORD4>parentiterator</KEYWORD4>
-			<KEYWORD4>pdo</KEYWORD4>
-			<KEYWORD4>pdostatement</KEYWORD4>
-			<KEYWORD4>rar</KEYWORD4>
-			<KEYWORD4>recursivedirectoryiterator</KEYWORD4>
-			<KEYWORD4>recursiveiteratoriterator</KEYWORD4>
-			<KEYWORD4>simplexmlelement</KEYWORD4>
-			<KEYWORD4>simplexmliterator</KEYWORD4>
-			<KEYWORD4>soapclient</KEYWORD4>
-			<KEYWORD4>soapfault</KEYWORD4>
-			<KEYWORD4>soapheader</KEYWORD4>
-			<KEYWORD4>soapparam</KEYWORD4>
-			<KEYWORD4>soapserver</KEYWORD4>
-			<KEYWORD4>soapvar</KEYWORD4>
-			<KEYWORD4>swfaction</KEYWORD4>
-			<KEYWORD4>swfbitmap</KEYWORD4>
-			<KEYWORD4>swfbutton</KEYWORD4>
-			<KEYWORD4>swfdisplayitem</KEYWORD4>
-			<KEYWORD4>swffill</KEYWORD4>
-			<KEYWORD4>swffont</KEYWORD4>
-			<KEYWORD4>swfgradient</KEYWORD4>
-			<KEYWORD4>swfmorph</KEYWORD4>
-			<KEYWORD4>swfmovie</KEYWORD4>
-			<KEYWORD4>swfshape</KEYWORD4>
-			<KEYWORD4>swfsprite</KEYWORD4>
-			<KEYWORD4>swftext</KEYWORD4>
-			<KEYWORD4>swftextfield</KEYWORD4>
-			<KEYWORD4>tidy</KEYWORD4>
-			<KEYWORD4>tidy_node</KEYWORD4>
-			<KEYWORD4>variant</KEYWORD4>
-
-
-			<!-- Internal functions (3549) -->
-			<KEYWORD2>__call</KEYWORD2> <!-- soapclient -->
-			<KEYWORD2>__construct</KEYWORD2> <!-- arrayobject, directoryiterator, pdo, tidy -->
-			<KEYWORD2>__getfunctions</KEYWORD2> <!-- soapclient -->
-			<KEYWORD2>__getlastrequest</KEYWORD2> <!-- soapclient -->
-			<KEYWORD2>__getlastresponse</KEYWORD2> <!-- soapclient -->
-			<KEYWORD2>__gettypes</KEYWORD2> <!-- soapclient -->
-			<KEYWORD2>__tostring</KEYWORD2> <!-- cachingiterator -->
-			<KEYWORD2>abs</KEYWORD2>
-			<KEYWORD2>acos</KEYWORD2>
-			<KEYWORD2>acosh</KEYWORD2>
-			<KEYWORD2>add</KEYWORD2> <!-- memcache, swfmovie, swfsprite -->
-			<KEYWORD2>add_namespace</KEYWORD2> <!-- domnode -->
-			<KEYWORD2>add_root</KEYWORD2> <!-- domdocument -->
-			<KEYWORD2>addaction</KEYWORD2> <!-- swfbutton -->
-			<KEYWORD2>addcolor</KEYWORD2> <!-- swfdisplayitem -->
-			<KEYWORD2>addcslashes</KEYWORD2>
-			<KEYWORD2>addentry</KEYWORD2> <!-- swfgradient -->
-			<KEYWORD2>addfill</KEYWORD2> <!-- swfshape -->
-			<KEYWORD2>addfunction</KEYWORD2> <!-- soapserver -->
-			<KEYWORD2>addshape</KEYWORD2> <!-- swfbutton -->
-			<KEYWORD2>addslashes</KEYWORD2>
-			<KEYWORD2>addstring</KEYWORD2> <!-- swftext, swftextfield -->
-			<KEYWORD2>aggregate</KEYWORD2>
-			<KEYWORD2>aggregate_info</KEYWORD2>
-			<KEYWORD2>aggregate_methods</KEYWORD2>
-			<KEYWORD2>aggregate_methods_by_list</KEYWORD2>
-			<KEYWORD2>aggregate_methods_by_regexp</KEYWORD2>
-			<KEYWORD2>aggregate_properties</KEYWORD2>
-			<KEYWORD2>aggregate_properties_by_list</KEYWORD2>
-			<KEYWORD2>aggregate_properties_by_regexp</KEYWORD2>
-			<KEYWORD2>aggregation_info</KEYWORD2>
-			<KEYWORD2>align</KEYWORD2> <!-- swftextfield -->
-			<KEYWORD2>apache_child_terminate</KEYWORD2>
-			<KEYWORD2>apache_get_modules</KEYWORD2>
-			<KEYWORD2>apache_get_version</KEYWORD2>
-			<KEYWORD2>apache_getenv</KEYWORD2>
-			<KEYWORD2>apache_lookup_uri</KEYWORD2>
-			<KEYWORD2>apache_note</KEYWORD2>
-			<KEYWORD2>apache_request_headers</KEYWORD2>
-			<KEYWORD2>apache_response_headers</KEYWORD2>
-			<KEYWORD2>apache_setenv</KEYWORD2>
-			<KEYWORD2>apd_breakpoint</KEYWORD2>
-			<KEYWORD2>apd_callstack</KEYWORD2>
-			<KEYWORD2>apd_clunk</KEYWORD2>
-			<KEYWORD2>apd_continue</KEYWORD2>
-			<KEYWORD2>apd_croak</KEYWORD2>
-			<KEYWORD2>apd_dump_function_table</KEYWORD2>
-			<KEYWORD2>apd_dump_persistent_resources</KEYWORD2>
-			<KEYWORD2>apd_dump_regular_resources</KEYWORD2>
-			<KEYWORD2>apd_echo</KEYWORD2>
-			<KEYWORD2>apd_get_active_symbols</KEYWORD2>
-			<KEYWORD2>apd_set_pprof_trace</KEYWORD2>
-			<KEYWORD2>apd_set_session</KEYWORD2>
-			<KEYWORD2>apd_set_session_trace</KEYWORD2>
-			<KEYWORD2>apd_set_socket_session_trace</KEYWORD2>
-			<KEYWORD2>append</KEYWORD2> <!-- arrayobject, collection, lob -->
-			<KEYWORD2>append_child</KEYWORD2> <!-- domnode -->
-			<KEYWORD2>append_sibling</KEYWORD2> <!-- domnode -->
-			<KEYWORD2>appendchild</KEYWORD2> <!-- domnode -->
-			<KEYWORD2>appenddata</KEYWORD2> <!-- domcharacterdata -->
-			<KEYWORD2>array_change_key_case</KEYWORD2>
-			<KEYWORD2>array_chunk</KEYWORD2>
-			<KEYWORD2>array_combine</KEYWORD2>
-			<KEYWORD2>array_count_values</KEYWORD2>
-			<KEYWORD2>array_diff</KEYWORD2>
-			<KEYWORD2>array_diff_assoc</KEYWORD2>
-			<KEYWORD2>array_diff_key</KEYWORD2>
-			<KEYWORD2>array_diff_uassoc</KEYWORD2>
-			<KEYWORD2>array_diff_ukey</KEYWORD2>
-			<KEYWORD2>array_fill</KEYWORD2>
-			<KEYWORD2>array_filter</KEYWORD2>
-			<KEYWORD2>array_flip</KEYWORD2>
-			<KEYWORD2>array_intersect</KEYWORD2>
-			<KEYWORD2>array_intersect_assoc</KEYWORD2>
-			<KEYWORD2>array_intersect_key</KEYWORD2>
-			<KEYWORD2>array_intersect_uassoc</KEYWORD2>
-			<KEYWORD2>array_intersect_ukey</KEYWORD2>
-			<KEYWORD2>array_key_exists</KEYWORD2>
-			<KEYWORD2>array_keys</KEYWORD2>
-			<KEYWORD2>array_map</KEYWORD2>
-			<KEYWORD2>array_merge</KEYWORD2>
-			<KEYWORD2>array_merge_recursive</KEYWORD2>
-			<KEYWORD2>array_multisort</KEYWORD2>
-			<KEYWORD2>array_pad</KEYWORD2>
-			<KEYWORD2>array_pop</KEYWORD2>
-			<KEYWORD2>array_push</KEYWORD2>
-			<KEYWORD2>array_rand</KEYWORD2>
-			<KEYWORD2>array_reduce</KEYWORD2>
-			<KEYWORD2>array_reverse</KEYWORD2>
-			<KEYWORD2>array_search</KEYWORD2>
-			<KEYWORD2>array_shift</KEYWORD2>
-			<KEYWORD2>array_slice</KEYWORD2>
-			<KEYWORD2>array_splice</KEYWORD2>
-			<KEYWORD2>array_sum</KEYWORD2>
-			<KEYWORD2>array_udiff</KEYWORD2>
-			<KEYWORD2>array_udiff_assoc</KEYWORD2>
-			<KEYWORD2>array_udiff_uassoc</KEYWORD2>
-			<KEYWORD2>array_uintersect</KEYWORD2>
-			<KEYWORD2>array_uintersect_assoc</KEYWORD2>
-			<KEYWORD2>array_uintersect_uassoc</KEYWORD2>
-			<KEYWORD2>array_unique</KEYWORD2>
-			<KEYWORD2>array_unshift</KEYWORD2>
-			<KEYWORD2>array_values</KEYWORD2>
-			<KEYWORD2>array_walk</KEYWORD2>
-			<KEYWORD2>array_walk_recursive</KEYWORD2>
-			<KEYWORD2>arsort</KEYWORD2>
-			<KEYWORD2>ascii2ebcdic</KEYWORD2>
-			<KEYWORD2>asin</KEYWORD2>
-			<KEYWORD2>asinh</KEYWORD2>
-			<KEYWORD2>asort</KEYWORD2>
-			<KEYWORD2>aspell_check</KEYWORD2>
-			<KEYWORD2>aspell_check_raw</KEYWORD2>
-			<KEYWORD2>aspell_new</KEYWORD2>
-			<KEYWORD2>aspell_suggest</KEYWORD2>
-			<KEYWORD2>assert</KEYWORD2>
-			<KEYWORD2>assert_options</KEYWORD2>
-			<KEYWORD2>assign</KEYWORD2> <!-- collection, hw_api_object -->
-			<KEYWORD2>assignelem</KEYWORD2> <!-- collection -->
-			<KEYWORD2>asxml</KEYWORD2> <!-- simplexmlelement -->
-			<KEYWORD2>atan</KEYWORD2>
-			<KEYWORD2>atan2</KEYWORD2>
-			<KEYWORD2>atanh</KEYWORD2>
-			<KEYWORD2>attreditable</KEYWORD2> <!-- hw_api_object -->
-			<KEYWORD2>attributes</KEYWORD2> <!-- domnode, simplexmlelement, tidy_node -->
-			<KEYWORD2>base64_decode</KEYWORD2>
-			<KEYWORD2>base64_encode</KEYWORD2>
-			<KEYWORD2>base_convert</KEYWORD2>
-			<KEYWORD2>basename</KEYWORD2>
-			<KEYWORD2>bcadd</KEYWORD2>
-			<KEYWORD2>bccomp</KEYWORD2>
-			<KEYWORD2>bcdiv</KEYWORD2>
-			<KEYWORD2>bcmod</KEYWORD2>
-			<KEYWORD2>bcmul</KEYWORD2>
-			<KEYWORD2>bcpow</KEYWORD2>
-			<KEYWORD2>bcpowmod</KEYWORD2>
-			<KEYWORD2>bcscale</KEYWORD2>
-			<KEYWORD2>bcsqrt</KEYWORD2>
-			<KEYWORD2>bcsub</KEYWORD2>
-			<KEYWORD2>begintransaction</KEYWORD2> <!-- pdo -->
-			<KEYWORD2>bin2hex</KEYWORD2>
-			<KEYWORD2>bind_textdomain_codeset</KEYWORD2>
-			<KEYWORD2>bindcolumn</KEYWORD2> <!-- pdostatement -->
-			<KEYWORD2>bindec</KEYWORD2>
-			<KEYWORD2>bindparam</KEYWORD2> <!-- pdostatement -->
-			<KEYWORD2>bindtextdomain</KEYWORD2>
-			<KEYWORD2>bzclose</KEYWORD2>
-			<KEYWORD2>bzcompress</KEYWORD2>
-			<KEYWORD2>bzdecompress</KEYWORD2>
-			<KEYWORD2>bzerrno</KEYWORD2>
-			<KEYWORD2>bzerror</KEYWORD2>
-			<KEYWORD2>bzerrstr</KEYWORD2>
-			<KEYWORD2>bzflush</KEYWORD2>
-			<KEYWORD2>bzopen</KEYWORD2>
-			<KEYWORD2>bzread</KEYWORD2>
-			<KEYWORD2>bzwrite</KEYWORD2>
-			<KEYWORD2>cal_days_in_month</KEYWORD2>
-			<KEYWORD2>cal_from_jd</KEYWORD2>
-			<KEYWORD2>cal_info</KEYWORD2>
-			<KEYWORD2>cal_to_jd</KEYWORD2>
-			<KEYWORD2>call_user_func</KEYWORD2>
-			<KEYWORD2>call_user_func_array</KEYWORD2>
-			<KEYWORD2>call_user_method</KEYWORD2>
-			<KEYWORD2>call_user_method_array</KEYWORD2>
-			<KEYWORD2>ccvs_add</KEYWORD2>
-			<KEYWORD2>ccvs_auth</KEYWORD2>
-			<KEYWORD2>ccvs_command</KEYWORD2>
-			<KEYWORD2>ccvs_count</KEYWORD2>
-			<KEYWORD2>ccvs_delete</KEYWORD2>
-			<KEYWORD2>ccvs_done</KEYWORD2>
-			<KEYWORD2>ccvs_init</KEYWORD2>
-			<KEYWORD2>ccvs_lookup</KEYWORD2>
-			<KEYWORD2>ccvs_new</KEYWORD2>
-			<KEYWORD2>ccvs_report</KEYWORD2>
-			<KEYWORD2>ccvs_return</KEYWORD2>
-			<KEYWORD2>ccvs_reverse</KEYWORD2>
-			<KEYWORD2>ccvs_sale</KEYWORD2>
-			<KEYWORD2>ccvs_status</KEYWORD2>
-			<KEYWORD2>ccvs_textvalue</KEYWORD2>
-			<KEYWORD2>ccvs_void</KEYWORD2>
-			<KEYWORD2>ceil</KEYWORD2>
-			<KEYWORD2>chdir</KEYWORD2>
-			<KEYWORD2>checkdate</KEYWORD2>
-			<KEYWORD2>checkdnsrr</KEYWORD2>
-			<KEYWORD2>checkin</KEYWORD2> <!-- hw_api -->
-			<KEYWORD2>checkout</KEYWORD2> <!-- hw_api -->
-			<KEYWORD2>chgrp</KEYWORD2>
-			<KEYWORD2>child_nodes</KEYWORD2> <!-- domnode -->
-			<KEYWORD2>children</KEYWORD2> <!-- hw_api, simplexmlelement, tidy_node -->
-			<KEYWORD2>chmod</KEYWORD2>
-			<KEYWORD2>chop</KEYWORD2>
-			<KEYWORD2>chown</KEYWORD2>
-			<KEYWORD2>chr</KEYWORD2>
-			<KEYWORD2>chroot</KEYWORD2>
-			<KEYWORD2>chunk_split</KEYWORD2>
-			<KEYWORD2>class_exists</KEYWORD2>
-			<KEYWORD2>class_implements</KEYWORD2>
-			<KEYWORD2>class_parents</KEYWORD2>
-			<KEYWORD2>classkit_import</KEYWORD2>
-			<KEYWORD2>classkit_method_add</KEYWORD2>
-			<KEYWORD2>classkit_method_copy</KEYWORD2>
-			<KEYWORD2>classkit_method_redefine</KEYWORD2>
-			<KEYWORD2>classkit_method_remove</KEYWORD2>
-			<KEYWORD2>classkit_method_rename</KEYWORD2>
-			<KEYWORD2>clearstatcache</KEYWORD2>
-			<KEYWORD2>clone_node</KEYWORD2> <!-- domnode -->
-			<KEYWORD2>clonenode</KEYWORD2> <!-- domnode -->
-			<KEYWORD2>close</KEYWORD2> <!-- lob, memcache -->
-			<KEYWORD2>closedir</KEYWORD2>
-			<KEYWORD2>closelog</KEYWORD2>
-			<KEYWORD2>com</KEYWORD2>
-			<KEYWORD2>com_addref</KEYWORD2>
-			<KEYWORD2>com_create_guid</KEYWORD2>
-			<KEYWORD2>com_event_sink</KEYWORD2>
-			<KEYWORD2>com_get</KEYWORD2>
-			<KEYWORD2>com_get_active_object</KEYWORD2>
-			<KEYWORD2>com_invoke</KEYWORD2>
-			<KEYWORD2>com_isenum</KEYWORD2>
-			<KEYWORD2>com_load</KEYWORD2>
-			<KEYWORD2>com_load_typelib</KEYWORD2>
-			<KEYWORD2>com_message_pump</KEYWORD2>
-			<KEYWORD2>com_print_typeinfo</KEYWORD2>
-			<KEYWORD2>com_propget</KEYWORD2>
-			<KEYWORD2>com_propput</KEYWORD2>
-			<KEYWORD2>com_propset</KEYWORD2>
-			<KEYWORD2>com_release</KEYWORD2>
-			<KEYWORD2>com_set</KEYWORD2>
-			<KEYWORD2>commit</KEYWORD2> <!-- pdo -->
-			<KEYWORD2>compact</KEYWORD2>
-			<KEYWORD2>connect</KEYWORD2> <!-- memcache -->
-			<KEYWORD2>connection_aborted</KEYWORD2>
-			<KEYWORD2>connection_status</KEYWORD2>
-			<KEYWORD2>connection_timeout</KEYWORD2>
-			<KEYWORD2>constant</KEYWORD2>
-			<KEYWORD2>content</KEYWORD2> <!-- hw_api -->
-			<KEYWORD2>convert_cyr_string</KEYWORD2>
-			<KEYWORD2>convert_uudecode</KEYWORD2>
-			<KEYWORD2>convert_uuencode</KEYWORD2>
-			<KEYWORD2>copy</KEYWORD2> <!-- hw_api -->
-			<KEYWORD2>cos</KEYWORD2>
-			<KEYWORD2>cosh</KEYWORD2>
-			<KEYWORD2>count</KEYWORD2> <!-- arrayobject, hw_api_error, hw_api_object -->
-			<KEYWORD2>count_chars</KEYWORD2>
-			<KEYWORD2>cpdf_add_annotation</KEYWORD2>
-			<KEYWORD2>cpdf_add_outline</KEYWORD2>
-			<KEYWORD2>cpdf_arc</KEYWORD2>
-			<KEYWORD2>cpdf_begin_text</KEYWORD2>
-			<KEYWORD2>cpdf_circle</KEYWORD2>
-			<KEYWORD2>cpdf_clip</KEYWORD2>
-			<KEYWORD2>cpdf_close</KEYWORD2>
-			<KEYWORD2>cpdf_closepath</KEYWORD2>
-			<KEYWORD2>cpdf_closepath_fill_stroke</KEYWORD2>
-			<KEYWORD2>cpdf_closepath_stroke</KEYWORD2>
-			<KEYWORD2>cpdf_continue_text</KEYWORD2>
-			<KEYWORD2>cpdf_curveto</KEYWORD2>
-			<KEYWORD2>cpdf_end_text</KEYWORD2>
-			<KEYWORD2>cpdf_fill</KEYWORD2>
-			<KEYWORD2>cpdf_fill_stroke</KEYWORD2>
-			<KEYWORD2>cpdf_finalize</KEYWORD2>
-			<KEYWORD2>cpdf_finalize_page</KEYWORD2>
-			<KEYWORD2>cpdf_global_set_document_limits</KEYWORD2>
-			<KEYWORD2>cpdf_import_jpeg</KEYWORD2>
-			<KEYWORD2>cpdf_lineto</KEYWORD2>
-			<KEYWORD2>cpdf_moveto</KEYWORD2>
-			<KEYWORD2>cpdf_newpath</KEYWORD2>
-			<KEYWORD2>cpdf_open</KEYWORD2>
-			<KEYWORD2>cpdf_output_buffer</KEYWORD2>
-			<KEYWORD2>cpdf_page_init</KEYWORD2>
-			<KEYWORD2>cpdf_place_inline_image</KEYWORD2>
-			<KEYWORD2>cpdf_rect</KEYWORD2>
-			<KEYWORD2>cpdf_restore</KEYWORD2>
-			<KEYWORD2>cpdf_rlineto</KEYWORD2>
-			<KEYWORD2>cpdf_rmoveto</KEYWORD2>
-			<KEYWORD2>cpdf_rotate</KEYWORD2>
-			<KEYWORD2>cpdf_rotate_text</KEYWORD2>
-			<KEYWORD2>cpdf_save</KEYWORD2>
-			<KEYWORD2>cpdf_save_to_file</KEYWORD2>
-			<KEYWORD2>cpdf_scale</KEYWORD2>
-			<KEYWORD2>cpdf_set_action_url</KEYWORD2>
-			<KEYWORD2>cpdf_set_char_spacing</KEYWORD2>
-			<KEYWORD2>cpdf_set_creator</KEYWORD2>
-			<KEYWORD2>cpdf_set_current_page</KEYWORD2>
-			<KEYWORD2>cpdf_set_font</KEYWORD2>
-			<KEYWORD2>cpdf_set_font_directories</KEYWORD2>
-			<KEYWORD2>cpdf_set_font_map_file</KEYWORD2>
-			<KEYWORD2>cpdf_set_horiz_scaling</KEYWORD2>
-			<KEYWORD2>cpdf_set_keywords</KEYWORD2>
-			<KEYWORD2>cpdf_set_leading</KEYWORD2>
-			<KEYWORD2>cpdf_set_page_animation</KEYWORD2>
-			<KEYWORD2>cpdf_set_subject</KEYWORD2>
-			<KEYWORD2>cpdf_set_text_matrix</KEYWORD2>
-			<KEYWORD2>cpdf_set_text_pos</KEYWORD2>
-			<KEYWORD2>cpdf_set_text_rendering</KEYWORD2>
-			<KEYWORD2>cpdf_set_text_rise</KEYWORD2>
-			<KEYWORD2>cpdf_set_title</KEYWORD2>
-			<KEYWORD2>cpdf_set_viewer_preferences</KEYWORD2>
-			<KEYWORD2>cpdf_set_word_spacing</KEYWORD2>
-			<KEYWORD2>cpdf_setdash</KEYWORD2>
-			<KEYWORD2>cpdf_setflat</KEYWORD2>
-			<KEYWORD2>cpdf_setgray</KEYWORD2>
-			<KEYWORD2>cpdf_setgray_fill</KEYWORD2>
-			<KEYWORD2>cpdf_setgray_stroke</KEYWORD2>
-			<KEYWORD2>cpdf_setlinecap</KEYWORD2>
-			<KEYWORD2>cpdf_setlinejoin</KEYWORD2>
-			<KEYWORD2>cpdf_setlinewidth</KEYWORD2>
-			<KEYWORD2>cpdf_setmiterlimit</KEYWORD2>
-			<KEYWORD2>cpdf_setrgbcolor</KEYWORD2>
-			<KEYWORD2>cpdf_setrgbcolor_fill</KEYWORD2>
-			<KEYWORD2>cpdf_setrgbcolor_stroke</KEYWORD2>
-			<KEYWORD2>cpdf_show</KEYWORD2>
-			<KEYWORD2>cpdf_show_xy</KEYWORD2>
-			<KEYWORD2>cpdf_stringwidth</KEYWORD2>
-			<KEYWORD2>cpdf_stroke</KEYWORD2>
-			<KEYWORD2>cpdf_text</KEYWORD2>
-			<KEYWORD2>cpdf_translate</KEYWORD2>
-			<KEYWORD2>crack_check</KEYWORD2>
-			<KEYWORD2>crack_closedict</KEYWORD2>
-			<KEYWORD2>crack_getlastmessage</KEYWORD2>
-			<KEYWORD2>crack_opendict</KEYWORD2>
-			<KEYWORD2>crc32</KEYWORD2>
-			<KEYWORD2>create_attribute</KEYWORD2> <!-- domdocument -->
-			<KEYWORD2>create_cdata_section</KEYWORD2> <!-- domdocument -->
-			<KEYWORD2>create_comment</KEYWORD2> <!-- domdocument -->
-			<KEYWORD2>create_element</KEYWORD2> <!-- domdocument -->
-			<KEYWORD2>create_element_ns</KEYWORD2> <!-- domdocument -->
-			<KEYWORD2>create_entity_reference</KEYWORD2> <!-- domdocument -->
-			<KEYWORD2>create_function</KEYWORD2>
-			<KEYWORD2>create_processing_instruction</KEYWORD2> <!-- domdocument -->
-			<KEYWORD2>create_text_node</KEYWORD2> <!-- domdocument -->
-			<KEYWORD2>createattribute</KEYWORD2> <!-- domdocument -->
-			<KEYWORD2>createattributens</KEYWORD2> <!-- domdocument -->
-			<KEYWORD2>createcdatasection</KEYWORD2> <!-- domdocument -->
-			<KEYWORD2>createcomment</KEYWORD2> <!-- domdocument -->
-			<KEYWORD2>createdocument</KEYWORD2> <!-- domimplementation -->
-			<KEYWORD2>createdocumentfragment</KEYWORD2> <!-- domdocument -->
-			<KEYWORD2>createdocumenttype</KEYWORD2> <!-- domimplementation -->
-			<KEYWORD2>createelement</KEYWORD2> <!-- domdocument -->
-			<KEYWORD2>createelementns</KEYWORD2> <!-- domdocument -->
-			<KEYWORD2>createentityreference</KEYWORD2> <!-- domdocument -->
-			<KEYWORD2>createprocessinginstruction</KEYWORD2> <!-- domdocument -->
-			<KEYWORD2>createtextnode</KEYWORD2> <!-- domdocument -->
-			<KEYWORD2>crypt</KEYWORD2>
-			<KEYWORD2>ctype_alnum</KEYWORD2>
-			<KEYWORD2>ctype_alpha</KEYWORD2>
-			<KEYWORD2>ctype_cntrl</KEYWORD2>
-			<KEYWORD2>ctype_digit</KEYWORD2>
-			<KEYWORD2>ctype_graph</KEYWORD2>
-			<KEYWORD2>ctype_lower</KEYWORD2>
-			<KEYWORD2>ctype_print</KEYWORD2>
-			<KEYWORD2>ctype_punct</KEYWORD2>
-			<KEYWORD2>ctype_space</KEYWORD2>
-			<KEYWORD2>ctype_upper</KEYWORD2>
-			<KEYWORD2>ctype_xdigit</KEYWORD2>
-			<KEYWORD2>curl_close</KEYWORD2>
-			<KEYWORD2>curl_copy_handle</KEYWORD2>
-			<KEYWORD2>curl_errno</KEYWORD2>
-			<KEYWORD2>curl_error</KEYWORD2>
-			<KEYWORD2>curl_exec</KEYWORD2>
-			<KEYWORD2>curl_getinfo</KEYWORD2>
-			<KEYWORD2>curl_init</KEYWORD2>
-			<KEYWORD2>curl_multi_add_handle</KEYWORD2>
-			<KEYWORD2>curl_multi_close</KEYWORD2>
-			<KEYWORD2>curl_multi_exec</KEYWORD2>
-			<KEYWORD2>curl_multi_getcontent</KEYWORD2>
-			<KEYWORD2>curl_multi_info_read</KEYWORD2>
-			<KEYWORD2>curl_multi_init</KEYWORD2>
-			<KEYWORD2>curl_multi_remove_handle</KEYWORD2>
-			<KEYWORD2>curl_multi_select</KEYWORD2>
-			<KEYWORD2>curl_setopt</KEYWORD2>
-			<KEYWORD2>curl_version</KEYWORD2>
-			<KEYWORD2>current</KEYWORD2> <!-- arrayiterator, directoryiterator, filteriterator, recursiveiteratoriterator, simplexmliterator -->
-			<KEYWORD2>cybercash_base64_decode</KEYWORD2>
-			<KEYWORD2>cybercash_base64_encode</KEYWORD2>
-			<KEYWORD2>cybercash_decr</KEYWORD2>
-			<KEYWORD2>cybercash_encr</KEYWORD2>
-			<KEYWORD2>cyrus_authenticate</KEYWORD2>
-			<KEYWORD2>cyrus_bind</KEYWORD2>
-			<KEYWORD2>cyrus_close</KEYWORD2>
-			<KEYWORD2>cyrus_connect</KEYWORD2>
-			<KEYWORD2>cyrus_query</KEYWORD2>
-			<KEYWORD2>cyrus_unbind</KEYWORD2>
-			<KEYWORD2>data</KEYWORD2> <!-- domprocessinginstruction -->
-			<KEYWORD2>date</KEYWORD2>
-			<KEYWORD2>date_sunrise</KEYWORD2>
-			<KEYWORD2>date_sunset</KEYWORD2>
-			<KEYWORD2>dba_close</KEYWORD2>
-			<KEYWORD2>dba_delete</KEYWORD2>
-			<KEYWORD2>dba_exists</KEYWORD2>
-			<KEYWORD2>dba_fetch</KEYWORD2>
-			<KEYWORD2>dba_firstkey</KEYWORD2>
-			<KEYWORD2>dba_handlers</KEYWORD2>
-			<KEYWORD2>dba_insert</KEYWORD2>
-			<KEYWORD2>dba_key_split</KEYWORD2>
-			<KEYWORD2>dba_list</KEYWORD2>
-			<KEYWORD2>dba_nextkey</KEYWORD2>
-			<KEYWORD2>dba_open</KEYWORD2>
-			<KEYWORD2>dba_optimize</KEYWORD2>
-			<KEYWORD2>dba_popen</KEYWORD2>
-			<KEYWORD2>dba_replace</KEYWORD2>
-			<KEYWORD2>dba_sync</KEYWORD2>
-			<KEYWORD2>dbase_add_record</KEYWORD2>
-			<KEYWORD2>dbase_close</KEYWORD2>
-			<KEYWORD2>dbase_create</KEYWORD2>
-			<KEYWORD2>dbase_delete_record</KEYWORD2>
-			<KEYWORD2>dbase_get_header_info</KEYWORD2>
-			<KEYWORD2>dbase_get_record</KEYWORD2>
-			<KEYWORD2>dbase_get_record_with_names</KEYWORD2>
-			<KEYWORD2>dbase_numfields</KEYWORD2>
-			<KEYWORD2>dbase_numrecords</KEYWORD2>
-			<KEYWORD2>dbase_open</KEYWORD2>
-			<KEYWORD2>dbase_pack</KEYWORD2>
-			<KEYWORD2>dbase_replace_record</KEYWORD2>
-			<KEYWORD2>dblist</KEYWORD2>
-			<KEYWORD2>dbmclose</KEYWORD2>
-			<KEYWORD2>dbmdelete</KEYWORD2>
-			<KEYWORD2>dbmexists</KEYWORD2>
-			<KEYWORD2>dbmfetch</KEYWORD2>
-			<KEYWORD2>dbmfirstkey</KEYWORD2>
-			<KEYWORD2>dbminsert</KEYWORD2>
-			<KEYWORD2>dbmnextkey</KEYWORD2>
-			<KEYWORD2>dbmopen</KEYWORD2>
-			<KEYWORD2>dbmreplace</KEYWORD2>
-			<KEYWORD2>dbplus_add</KEYWORD2>
-			<KEYWORD2>dbplus_aql</KEYWORD2>
-			<KEYWORD2>dbplus_chdir</KEYWORD2>
-			<KEYWORD2>dbplus_close</KEYWORD2>
-			<KEYWORD2>dbplus_curr</KEYWORD2>
-			<KEYWORD2>dbplus_errcode</KEYWORD2>
-			<KEYWORD2>dbplus_errno</KEYWORD2>
-			<KEYWORD2>dbplus_find</KEYWORD2>
-			<KEYWORD2>dbplus_first</KEYWORD2>
-			<KEYWORD2>dbplus_flush</KEYWORD2>
-			<KEYWORD2>dbplus_freealllocks</KEYWORD2>
-			<KEYWORD2>dbplus_freelock</KEYWORD2>
-			<KEYWORD2>dbplus_freerlocks</KEYWORD2>
-			<KEYWORD2>dbplus_getlock</KEYWORD2>
-			<KEYWORD2>dbplus_getunique</KEYWORD2>
-			<KEYWORD2>dbplus_info</KEYWORD2>
-			<KEYWORD2>dbplus_last</KEYWORD2>
-			<KEYWORD2>dbplus_lockrel</KEYWORD2>
-			<KEYWORD2>dbplus_next</KEYWORD2>
-			<KEYWORD2>dbplus_open</KEYWORD2>
-			<KEYWORD2>dbplus_prev</KEYWORD2>
-			<KEYWORD2>dbplus_rchperm</KEYWORD2>
-			<KEYWORD2>dbplus_rcreate</KEYWORD2>
-			<KEYWORD2>dbplus_rcrtexact</KEYWORD2>
-			<KEYWORD2>dbplus_rcrtlike</KEYWORD2>
-			<KEYWORD2>dbplus_resolve</KEYWORD2>
-			<KEYWORD2>dbplus_restorepos</KEYWORD2>
-			<KEYWORD2>dbplus_rkeys</KEYWORD2>
-			<KEYWORD2>dbplus_ropen</KEYWORD2>
-			<KEYWORD2>dbplus_rquery</KEYWORD2>
-			<KEYWORD2>dbplus_rrename</KEYWORD2>
-			<KEYWORD2>dbplus_rsecindex</KEYWORD2>
-			<KEYWORD2>dbplus_runlink</KEYWORD2>
-			<KEYWORD2>dbplus_rzap</KEYWORD2>
-			<KEYWORD2>dbplus_savepos</KEYWORD2>
-			<KEYWORD2>dbplus_setindex</KEYWORD2>
-			<KEYWORD2>dbplus_setindexbynumber</KEYWORD2>
-			<KEYWORD2>dbplus_sql</KEYWORD2>
-			<KEYWORD2>dbplus_tcl</KEYWORD2>
-			<KEYWORD2>dbplus_tremove</KEYWORD2>
-			<KEYWORD2>dbplus_undo</KEYWORD2>
-			<KEYWORD2>dbplus_undoprepare</KEYWORD2>
-			<KEYWORD2>dbplus_unlockrel</KEYWORD2>
-			<KEYWORD2>dbplus_unselect</KEYWORD2>
-			<KEYWORD2>dbplus_update</KEYWORD2>
-			<KEYWORD2>dbplus_xlockrel</KEYWORD2>
-			<KEYWORD2>dbplus_xunlockrel</KEYWORD2>
-			<KEYWORD2>dbstat</KEYWORD2> <!-- hw_api -->
-			<KEYWORD2>dbx_close</KEYWORD2>
-			<KEYWORD2>dbx_compare</KEYWORD2>
-			<KEYWORD2>dbx_connect</KEYWORD2>
-			<KEYWORD2>dbx_error</KEYWORD2>
-			<KEYWORD2>dbx_escape_string</KEYWORD2>
-			<KEYWORD2>dbx_fetch_row</KEYWORD2>
-			<KEYWORD2>dbx_query</KEYWORD2>
-			<KEYWORD2>dbx_sort</KEYWORD2>
-			<KEYWORD2>dcgettext</KEYWORD2>
-			<KEYWORD2>dcngettext</KEYWORD2>
-			<KEYWORD2>dcstat</KEYWORD2> <!-- hw_api -->
-			<KEYWORD2>deaggregate</KEYWORD2>
-			<KEYWORD2>debug_backtrace</KEYWORD2>
-			<KEYWORD2>debug_print_backtrace</KEYWORD2>
-			<KEYWORD2>debug_zval_dump</KEYWORD2>
-			<KEYWORD2>debugger_off</KEYWORD2>
-			<KEYWORD2>debugger_on</KEYWORD2>
-			<KEYWORD2>decbin</KEYWORD2>
-			<KEYWORD2>dechex</KEYWORD2>
-			<KEYWORD2>decoct</KEYWORD2>
-			<KEYWORD2>decrement</KEYWORD2> <!-- memcache -->
-			<KEYWORD2>define</KEYWORD2>
-			<KEYWORD2>define_syslog_variables</KEYWORD2>
-			<KEYWORD2>defined</KEYWORD2>
-			<KEYWORD2>deg2rad</KEYWORD2>
-			<KEYWORD2>delete</KEYWORD2> <!-- memcache -->
-			<KEYWORD2>deletedata</KEYWORD2> <!-- domcharacterdata -->
-			<KEYWORD2>description</KEYWORD2> <!-- hw_api_reason -->
-			<KEYWORD2>dgettext</KEYWORD2>
-			<KEYWORD2>dio_close</KEYWORD2>
-			<KEYWORD2>dio_fcntl</KEYWORD2>
-			<KEYWORD2>dio_open</KEYWORD2>
-			<KEYWORD2>dio_read</KEYWORD2>
-			<KEYWORD2>dio_seek</KEYWORD2>
-			<KEYWORD2>dio_stat</KEYWORD2>
-			<KEYWORD2>dio_tcsetattr</KEYWORD2>
-			<KEYWORD2>dio_truncate</KEYWORD2>
-			<KEYWORD2>dio_write</KEYWORD2>
-			<KEYWORD2>dir</KEYWORD2>
-			<KEYWORD2>dirname</KEYWORD2>
-			<KEYWORD2>disk_free_space</KEYWORD2>
-			<KEYWORD2>disk_total_space</KEYWORD2>
-			<KEYWORD2>diskfreespace</KEYWORD2>
-			<KEYWORD2>dl</KEYWORD2>
-			<KEYWORD2>dngettext</KEYWORD2>
-			<KEYWORD2>dns_check_record</KEYWORD2>
-			<KEYWORD2>dns_get_mx</KEYWORD2>
-			<KEYWORD2>dns_get_record</KEYWORD2>
-			<KEYWORD2>doctype</KEYWORD2> <!-- domdocument -->
-			<KEYWORD2>document_element</KEYWORD2> <!-- domdocument -->
-			<KEYWORD2>dom_import_simplexml</KEYWORD2>
-			<KEYWORD2>domxml_new_doc</KEYWORD2>
-			<KEYWORD2>domxml_open_file</KEYWORD2>
-			<KEYWORD2>domxml_open_mem</KEYWORD2>
-			<KEYWORD2>domxml_version</KEYWORD2>
-			<KEYWORD2>domxml_xmltree</KEYWORD2>
-			<KEYWORD2>domxml_xslt_stylesheet</KEYWORD2>
-			<KEYWORD2>domxml_xslt_stylesheet_doc</KEYWORD2>
-			<KEYWORD2>domxml_xslt_stylesheet_file</KEYWORD2>
-			<KEYWORD2>dotnet</KEYWORD2>
-			<KEYWORD2>dotnet_load</KEYWORD2>
-			<KEYWORD2>doubleval</KEYWORD2>
-			<KEYWORD2>drawcurve</KEYWORD2> <!-- swfshape -->
-			<KEYWORD2>drawcurveto</KEYWORD2> <!-- swfshape -->
-			<KEYWORD2>drawline</KEYWORD2> <!-- swfshape -->
-			<KEYWORD2>drawlineto</KEYWORD2> <!-- swfshape -->
-			<KEYWORD2>dstanchors</KEYWORD2> <!-- hw_api -->
-			<KEYWORD2>dstofsrcanchors</KEYWORD2> <!-- hw_api -->
-			<KEYWORD2>dump_file</KEYWORD2> <!-- domdocument -->
-			<KEYWORD2>dump_mem</KEYWORD2> <!-- domdocument -->
-			<KEYWORD2>dump_node</KEYWORD2> <!-- domnode -->
-			<KEYWORD2>each</KEYWORD2>
-			<KEYWORD2>easter_date</KEYWORD2>
-			<KEYWORD2>easter_days</KEYWORD2>
-			<KEYWORD2>ebcdic2ascii</KEYWORD2>
-			<KEYWORD2>end</KEYWORD2>
-			<KEYWORD2>entities</KEYWORD2> <!-- domdocumenttype -->
-			<KEYWORD2>eof</KEYWORD2> <!-- lob -->
-			<KEYWORD2>erase</KEYWORD2> <!-- lob -->
-			<KEYWORD2>ereg</KEYWORD2>
-			<KEYWORD2>ereg_replace</KEYWORD2>
-			<KEYWORD2>eregi</KEYWORD2>
-			<KEYWORD2>eregi_replace</KEYWORD2>
-			<KEYWORD2>error_log</KEYWORD2>
-			<KEYWORD2>error_reporting</KEYWORD2>
-			<KEYWORD2>errorcode</KEYWORD2> <!-- pdo, pdostatement -->
-			<KEYWORD2>errorinfo</KEYWORD2> <!-- pdo, pdostatement -->
-			<KEYWORD2>escapeshellarg</KEYWORD2>
-			<KEYWORD2>escapeshellcmd</KEYWORD2>
-			<KEYWORD2>exec</KEYWORD2> <!-- pdo -->
-			<KEYWORD2>execute</KEYWORD2> <!-- pdostatement -->
-			<KEYWORD2>exif_imagetype</KEYWORD2>
-			<KEYWORD2>exif_read_data</KEYWORD2>
-			<KEYWORD2>exif_tagname</KEYWORD2>
-			<KEYWORD2>exif_thumbnail</KEYWORD2>
-			<KEYWORD2>exp</KEYWORD2>
-			<KEYWORD2>explode</KEYWORD2>
-			<KEYWORD2>expm1</KEYWORD2>
-			<KEYWORD2>export</KEYWORD2> <!-- lob -->
-			<KEYWORD2>extension_loaded</KEYWORD2>
-			<KEYWORD2>extract</KEYWORD2> <!-- rar -->
-			<KEYWORD2>ezmlm_hash</KEYWORD2>
-			<KEYWORD2>fam_cancel_monitor</KEYWORD2>
-			<KEYWORD2>fam_close</KEYWORD2>
-			<KEYWORD2>fam_monitor_collection</KEYWORD2>
-			<KEYWORD2>fam_monitor_directory</KEYWORD2>
-			<KEYWORD2>fam_monitor_file</KEYWORD2>
-			<KEYWORD2>fam_next_event</KEYWORD2>
-			<KEYWORD2>fam_open</KEYWORD2>
-			<KEYWORD2>fam_pending</KEYWORD2>
-			<KEYWORD2>fam_resume_monitor</KEYWORD2>
-			<KEYWORD2>fam_suspend_monitor</KEYWORD2>
-			<KEYWORD2>fbsql_affected_rows</KEYWORD2>
-			<KEYWORD2>fbsql_autocommit</KEYWORD2>
-			<KEYWORD2>fbsql_blob_size</KEYWORD2>
-			<KEYWORD2>fbsql_change_user</KEYWORD2>
-			<KEYWORD2>fbsql_clob_size</KEYWORD2>
-			<KEYWORD2>fbsql_close</KEYWORD2>
-			<KEYWORD2>fbsql_commit</KEYWORD2>
-			<KEYWORD2>fbsql_connect</KEYWORD2>
-			<KEYWORD2>fbsql_create_blob</KEYWORD2>
-			<KEYWORD2>fbsql_create_clob</KEYWORD2>
-			<KEYWORD2>fbsql_create_db</KEYWORD2>
-			<KEYWORD2>fbsql_data_seek</KEYWORD2>
-			<KEYWORD2>fbsql_database</KEYWORD2>
-			<KEYWORD2>fbsql_database_password</KEYWORD2>
-			<KEYWORD2>fbsql_db_query</KEYWORD2>
-			<KEYWORD2>fbsql_db_status</KEYWORD2>
-			<KEYWORD2>fbsql_drop_db</KEYWORD2>
-			<KEYWORD2>fbsql_errno</KEYWORD2>
-			<KEYWORD2>fbsql_error</KEYWORD2>
-			<KEYWORD2>fbsql_fetch_array</KEYWORD2>
-			<KEYWORD2>fbsql_fetch_assoc</KEYWORD2>
-			<KEYWORD2>fbsql_fetch_field</KEYWORD2>
-			<KEYWORD2>fbsql_fetch_lengths</KEYWORD2>
-			<KEYWORD2>fbsql_fetch_object</KEYWORD2>
-			<KEYWORD2>fbsql_fetch_row</KEYWORD2>
-			<KEYWORD2>fbsql_field_flags</KEYWORD2>
-			<KEYWORD2>fbsql_field_len</KEYWORD2>
-			<KEYWORD2>fbsql_field_name</KEYWORD2>
-			<KEYWORD2>fbsql_field_seek</KEYWORD2>
-			<KEYWORD2>fbsql_field_table</KEYWORD2>
-			<KEYWORD2>fbsql_field_type</KEYWORD2>
-			<KEYWORD2>fbsql_free_result</KEYWORD2>
-			<KEYWORD2>fbsql_get_autostart_info</KEYWORD2>
-			<KEYWORD2>fbsql_hostname</KEYWORD2>
-			<KEYWORD2>fbsql_insert_id</KEYWORD2>
-			<KEYWORD2>fbsql_list_dbs</KEYWORD2>
-			<KEYWORD2>fbsql_list_fields</KEYWORD2>
-			<KEYWORD2>fbsql_list_tables</KEYWORD2>
-			<KEYWORD2>fbsql_next_result</KEYWORD2>
-			<KEYWORD2>fbsql_num_fields</KEYWORD2>
-			<KEYWORD2>fbsql_num_rows</KEYWORD2>
-			<KEYWORD2>fbsql_password</KEYWORD2>
-			<KEYWORD2>fbsql_pconnect</KEYWORD2>
-			<KEYWORD2>fbsql_query</KEYWORD2>
-			<KEYWORD2>fbsql_read_blob</KEYWORD2>
-			<KEYWORD2>fbsql_read_clob</KEYWORD2>
-			<KEYWORD2>fbsql_result</KEYWORD2>
-			<KEYWORD2>fbsql_rollback</KEYWORD2>
-			<KEYWORD2>fbsql_select_db</KEYWORD2>
-			<KEYWORD2>fbsql_set_lob_mode</KEYWORD2>
-			<KEYWORD2>fbsql_set_password</KEYWORD2>
-			<KEYWORD2>fbsql_set_transaction</KEYWORD2>
-			<KEYWORD2>fbsql_start_db</KEYWORD2>
-			<KEYWORD2>fbsql_stop_db</KEYWORD2>
-			<KEYWORD2>fbsql_tablename</KEYWORD2>
-			<KEYWORD2>fbsql_username</KEYWORD2>
-			<KEYWORD2>fbsql_warnings</KEYWORD2>
-			<KEYWORD2>fclose</KEYWORD2>
-			<KEYWORD2>fdf_add_doc_javascript</KEYWORD2>
-			<KEYWORD2>fdf_add_template</KEYWORD2>
-			<KEYWORD2>fdf_close</KEYWORD2>
-			<KEYWORD2>fdf_create</KEYWORD2>
-			<KEYWORD2>fdf_enum_values</KEYWORD2>
-			<KEYWORD2>fdf_errno</KEYWORD2>
-			<KEYWORD2>fdf_error</KEYWORD2>
-			<KEYWORD2>fdf_get_ap</KEYWORD2>
-			<KEYWORD2>fdf_get_attachment</KEYWORD2>
-			<KEYWORD2>fdf_get_encoding</KEYWORD2>
-			<KEYWORD2>fdf_get_file</KEYWORD2>
-			<KEYWORD2>fdf_get_flags</KEYWORD2>
-			<KEYWORD2>fdf_get_opt</KEYWORD2>
-			<KEYWORD2>fdf_get_status</KEYWORD2>
-			<KEYWORD2>fdf_get_value</KEYWORD2>
-			<KEYWORD2>fdf_get_version</KEYWORD2>
-			<KEYWORD2>fdf_header</KEYWORD2>
-			<KEYWORD2>fdf_next_field_name</KEYWORD2>
-			<KEYWORD2>fdf_open</KEYWORD2>
-			<KEYWORD2>fdf_open_string</KEYWORD2>
-			<KEYWORD2>fdf_remove_item</KEYWORD2>
-			<KEYWORD2>fdf_save</KEYWORD2>
-			<KEYWORD2>fdf_save_string</KEYWORD2>
-			<KEYWORD2>fdf_set_ap</KEYWORD2>
-			<KEYWORD2>fdf_set_encoding</KEYWORD2>
-			<KEYWORD2>fdf_set_file</KEYWORD2>
-			<KEYWORD2>fdf_set_flags</KEYWORD2>
-			<KEYWORD2>fdf_set_javascript_action</KEYWORD2>
-			<KEYWORD2>fdf_set_on_import_javascript</KEYWORD2>
-			<KEYWORD2>fdf_set_opt</KEYWORD2>
-			<KEYWORD2>fdf_set_status</KEYWORD2>
-			<KEYWORD2>fdf_set_submit_form_action</KEYWORD2>
-			<KEYWORD2>fdf_set_target_frame</KEYWORD2>
-			<KEYWORD2>fdf_set_value</KEYWORD2>
-			<KEYWORD2>fdf_set_version</KEYWORD2>
-			<KEYWORD2>feof</KEYWORD2>
-			<KEYWORD2>fetch</KEYWORD2> <!-- pdostatement -->
-			<KEYWORD2>fetchall</KEYWORD2> <!-- pdostatement -->
-			<KEYWORD2>fetchsingle</KEYWORD2> <!-- pdostatement -->
-			<KEYWORD2>fflush</KEYWORD2>
-			<KEYWORD2>fgetc</KEYWORD2>
-			<KEYWORD2>fgetcsv</KEYWORD2>
-			<KEYWORD2>fgets</KEYWORD2>
-			<KEYWORD2>fgetss</KEYWORD2>
-			<KEYWORD2>file</KEYWORD2>
-			<KEYWORD2>file_exists</KEYWORD2>
-			<KEYWORD2>file_get_contents</KEYWORD2>
-			<KEYWORD2>file_put_contents</KEYWORD2>
-			<KEYWORD2>fileatime</KEYWORD2>
-			<KEYWORD2>filectime</KEYWORD2>
-			<KEYWORD2>filegroup</KEYWORD2>
-			<KEYWORD2>fileinode</KEYWORD2>
-			<KEYWORD2>filemtime</KEYWORD2>
-			<KEYWORD2>fileowner</KEYWORD2>
-			<KEYWORD2>fileperms</KEYWORD2>
-			<KEYWORD2>filepro</KEYWORD2>
-			<KEYWORD2>filepro_fieldcount</KEYWORD2>
-			<KEYWORD2>filepro_fieldname</KEYWORD2>
-			<KEYWORD2>filepro_fieldtype</KEYWORD2>
-			<KEYWORD2>filepro_fieldwidth</KEYWORD2>
-			<KEYWORD2>filepro_retrieve</KEYWORD2>
-			<KEYWORD2>filepro_rowcount</KEYWORD2>
-			<KEYWORD2>filesize</KEYWORD2>
-			<KEYWORD2>filetype</KEYWORD2>
-			<KEYWORD2>find</KEYWORD2> <!-- hw_api -->
-			<KEYWORD2>first_child</KEYWORD2> <!-- domnode -->
-			<KEYWORD2>floatval</KEYWORD2>
-			<KEYWORD2>flock</KEYWORD2>
-			<KEYWORD2>floor</KEYWORD2>
-			<KEYWORD2>flush</KEYWORD2> <!-- lob, memcache -->
-			<KEYWORD2>fmod</KEYWORD2>
-			<KEYWORD2>fnmatch</KEYWORD2>
-			<KEYWORD2>fopen</KEYWORD2>
-			<KEYWORD2>fpassthru</KEYWORD2>
-			<KEYWORD2>fprintf</KEYWORD2>
-			<KEYWORD2>fputcsv</KEYWORD2>
-			<KEYWORD2>fputs</KEYWORD2>
-			<KEYWORD2>fread</KEYWORD2>
-			<KEYWORD2>free</KEYWORD2> <!-- collection, descriptor -->
-			<KEYWORD2>frenchtojd</KEYWORD2>
-			<KEYWORD2>fribidi_log2vis</KEYWORD2>
-			<KEYWORD2>fscanf</KEYWORD2>
-			<KEYWORD2>fseek</KEYWORD2>
-			<KEYWORD2>fsockopen</KEYWORD2>
-			<KEYWORD2>fstat</KEYWORD2>
-			<KEYWORD2>ftell</KEYWORD2>
-			<KEYWORD2>ftok</KEYWORD2>
-			<KEYWORD2>ftp_alloc</KEYWORD2>
-			<KEYWORD2>ftp_cdup</KEYWORD2>
-			<KEYWORD2>ftp_chdir</KEYWORD2>
-			<KEYWORD2>ftp_chmod</KEYWORD2>
-			<KEYWORD2>ftp_close</KEYWORD2>
-			<KEYWORD2>ftp_connect</KEYWORD2>
-			<KEYWORD2>ftp_delete</KEYWORD2>
-			<KEYWORD2>ftp_exec</KEYWORD2>
-			<KEYWORD2>ftp_fget</KEYWORD2>
-			<KEYWORD2>ftp_fput</KEYWORD2>
-			<KEYWORD2>ftp_get</KEYWORD2>
-			<KEYWORD2>ftp_get_option</KEYWORD2>
-			<KEYWORD2>ftp_login</KEYWORD2>
-			<KEYWORD2>ftp_mdtm</KEYWORD2>
-			<KEYWORD2>ftp_mkdir</KEYWORD2>
-			<KEYWORD2>ftp_nb_continue</KEYWORD2>
-			<KEYWORD2>ftp_nb_fget</KEYWORD2>
-			<KEYWORD2>ftp_nb_fput</KEYWORD2>
-			<KEYWORD2>ftp_nb_get</KEYWORD2>
-			<KEYWORD2>ftp_nb_put</KEYWORD2>
-			<KEYWORD2>ftp_nlist</KEYWORD2>
-			<KEYWORD2>ftp_pasv</KEYWORD2>
-			<KEYWORD2>ftp_put</KEYWORD2>
-			<KEYWORD2>ftp_pwd</KEYWORD2>
-			<KEYWORD2>ftp_quit</KEYWORD2>
-			<KEYWORD2>ftp_raw</KEYWORD2>
-			<KEYWORD2>ftp_rawlist</KEYWORD2>
-			<KEYWORD2>ftp_rename</KEYWORD2>
-			<KEYWORD2>ftp_rmdir</KEYWORD2>
-			<KEYWORD2>ftp_set_option</KEYWORD2>
-			<KEYWORD2>ftp_site</KEYWORD2>
-			<KEYWORD2>ftp_size</KEYWORD2>
-			<KEYWORD2>ftp_ssl_connect</KEYWORD2>
-			<KEYWORD2>ftp_systype</KEYWORD2>
-			<KEYWORD2>ftruncate</KEYWORD2>
-			<KEYWORD2>ftstat</KEYWORD2> <!-- hw_api -->
-			<KEYWORD2>func_get_arg</KEYWORD2>
-			<KEYWORD2>func_get_args</KEYWORD2>
-			<KEYWORD2>func_num_args</KEYWORD2>
-			<KEYWORD2>function_exists</KEYWORD2>
-			<KEYWORD2>fwrite</KEYWORD2>
-			<KEYWORD2>gd_info</KEYWORD2>
-			<KEYWORD2>get</KEYWORD2> <!-- memcache -->
-			<KEYWORD2>get_attr</KEYWORD2> <!-- tidy_node -->
-			<KEYWORD2>get_attribute</KEYWORD2> <!-- domelement -->
-			<KEYWORD2>get_attribute_node</KEYWORD2> <!-- domelement -->
-			<KEYWORD2>get_browser</KEYWORD2>
-			<KEYWORD2>get_cfg_var</KEYWORD2>
-			<KEYWORD2>get_class</KEYWORD2>
-			<KEYWORD2>get_class_methods</KEYWORD2>
-			<KEYWORD2>get_class_vars</KEYWORD2>
-			<KEYWORD2>get_content</KEYWORD2> <!-- domnode -->
-			<KEYWORD2>get_current_user</KEYWORD2>
-			<KEYWORD2>get_declared_classes</KEYWORD2>
-			<KEYWORD2>get_declared_interfaces</KEYWORD2>
-			<KEYWORD2>get_defined_constants</KEYWORD2>
-			<KEYWORD2>get_defined_functions</KEYWORD2>
-			<KEYWORD2>get_defined_vars</KEYWORD2>
-			<KEYWORD2>get_element_by_id</KEYWORD2> <!-- domdocument -->
-			<KEYWORD2>get_elements_by_tagname</KEYWORD2> <!-- domdocument, domelement -->
-			<KEYWORD2>get_extension_funcs</KEYWORD2>
-			<KEYWORD2>get_headers</KEYWORD2>
-			<KEYWORD2>get_html_translation_table</KEYWORD2>
-			<KEYWORD2>get_include_path</KEYWORD2>
-			<KEYWORD2>get_included_files</KEYWORD2>
-			<KEYWORD2>get_loaded_extensions</KEYWORD2>
-			<KEYWORD2>get_magic_quotes_gpc</KEYWORD2>
-			<KEYWORD2>get_magic_quotes_runtime</KEYWORD2>
-			<KEYWORD2>get_meta_tags</KEYWORD2>
-			<KEYWORD2>get_nodes</KEYWORD2> <!-- tidy_node -->
-			<KEYWORD2>get_object_vars</KEYWORD2>
-			<KEYWORD2>get_parent_class</KEYWORD2>
-			<KEYWORD2>get_required_files</KEYWORD2>
-			<KEYWORD2>get_resource_type</KEYWORD2>
-			<KEYWORD2>getallheaders</KEYWORD2>
-			<KEYWORD2>getatime</KEYWORD2> <!-- directoryiterator -->
-			<KEYWORD2>getattr</KEYWORD2> <!-- rar -->
-			<KEYWORD2>getattribute</KEYWORD2> <!-- domelement -->
-			<KEYWORD2>getattributenode</KEYWORD2> <!-- domelement -->
-			<KEYWORD2>getattributenodens</KEYWORD2> <!-- domelement -->
-			<KEYWORD2>getattributens</KEYWORD2> <!-- domelement -->
-			<KEYWORD2>getbuffering</KEYWORD2> <!-- lob -->
-			<KEYWORD2>getchildren</KEYWORD2> <!-- cachingrecursiveiterator, directoryiterator, parentiterator, recursivedirectoryiterator, simplexmliterator -->
-			<KEYWORD2>getcrc</KEYWORD2> <!-- rar -->
-			<KEYWORD2>getctime</KEYWORD2> <!-- directoryiterator -->
-			<KEYWORD2>getcwd</KEYWORD2>
-			<KEYWORD2>getdate</KEYWORD2>
-			<KEYWORD2>getdepth</KEYWORD2> <!-- recursiveiteratoriterator -->
-			<KEYWORD2>getelem</KEYWORD2> <!-- collection -->
-			<KEYWORD2>getelementbyid</KEYWORD2> <!-- domdocument -->
-			<KEYWORD2>getelementsbytagname</KEYWORD2> <!-- domdocument, domelement -->
-			<KEYWORD2>getelementsbytagnamens</KEYWORD2> <!-- domdocument, domelement -->
-			<KEYWORD2>getenv</KEYWORD2>
-			<KEYWORD2>getfilename</KEYWORD2> <!-- directoryiterator -->
-			<KEYWORD2>getfiletime</KEYWORD2> <!-- rar -->
-			<KEYWORD2>getfunctions</KEYWORD2> <!-- soapserver -->
-			<KEYWORD2>getgroup</KEYWORD2> <!-- directoryiterator -->
-			<KEYWORD2>getheight</KEYWORD2> <!-- swfbitmap -->
-			<KEYWORD2>gethostbyaddr</KEYWORD2>
-			<KEYWORD2>gethostbyname</KEYWORD2>
-			<KEYWORD2>gethostbynamel</KEYWORD2>
-			<KEYWORD2>gethostos</KEYWORD2> <!-- rar -->
-			<KEYWORD2>getimagesize</KEYWORD2>
-			<KEYWORD2>getinneriterator</KEYWORD2> <!-- filteriterator -->
-			<KEYWORD2>getinode</KEYWORD2> <!-- directoryiterator -->
-			<KEYWORD2>getiterator</KEYWORD2> <!-- arrayobject -->
-			<KEYWORD2>getlastmod</KEYWORD2>
-			<KEYWORD2>getmethod</KEYWORD2> <!-- rar -->
-			<KEYWORD2>getmtime</KEYWORD2> <!-- directoryiterator -->
-			<KEYWORD2>getmxrr</KEYWORD2>
-			<KEYWORD2>getmygid</KEYWORD2>
-			<KEYWORD2>getmyinode</KEYWORD2>
-			<KEYWORD2>getmypid</KEYWORD2>
-			<KEYWORD2>getmyuid</KEYWORD2>
-			<KEYWORD2>getname</KEYWORD2> <!-- rar -->
-			<KEYWORD2>getnameditem</KEYWORD2> <!-- domnamednodemap -->
-			<KEYWORD2>getnameditemns</KEYWORD2> <!-- domnamednodemap -->
-			<KEYWORD2>getopt</KEYWORD2>
-			<KEYWORD2>getowner</KEYWORD2> <!-- directoryiterator -->
-			<KEYWORD2>getpackedsize</KEYWORD2> <!-- rar -->
-			<KEYWORD2>getpath</KEYWORD2> <!-- directoryiterator -->
-			<KEYWORD2>getpathname</KEYWORD2> <!-- directoryiterator -->
-			<KEYWORD2>getperms</KEYWORD2> <!-- directoryiterator -->
-			<KEYWORD2>getposition</KEYWORD2> <!-- limititerator -->
-			<KEYWORD2>getprotobyname</KEYWORD2>
-			<KEYWORD2>getprotobynumber</KEYWORD2>
-			<KEYWORD2>getrandmax</KEYWORD2>
-			<KEYWORD2>getrusage</KEYWORD2>
-			<KEYWORD2>getservbyname</KEYWORD2>
-			<KEYWORD2>getservbyport</KEYWORD2>
-			<KEYWORD2>getshape1</KEYWORD2> <!-- swfmorph -->
-			<KEYWORD2>getshape2</KEYWORD2> <!-- swfmorph -->
-			<KEYWORD2>getsize</KEYWORD2> <!-- directoryiterator -->
-			<KEYWORD2>getstats</KEYWORD2> <!-- memcache -->
-			<KEYWORD2>getsubiterator</KEYWORD2> <!-- recursiveiteratoriterator -->
-			<KEYWORD2>gettext</KEYWORD2>
-			<KEYWORD2>gettimeofday</KEYWORD2>
-			<KEYWORD2>gettype</KEYWORD2> <!-- directoryiterator -->
-			<KEYWORD2>getunpackedsize</KEYWORD2> <!-- rar -->
-			<KEYWORD2>getversion</KEYWORD2> <!-- memcache, rar -->
-			<KEYWORD2>getwidth</KEYWORD2> <!-- swfbitmap, swffont, swftext -->
-			<KEYWORD2>glob</KEYWORD2>
-			<KEYWORD2>gmdate</KEYWORD2>
-			<KEYWORD2>gmmktime</KEYWORD2>
-			<KEYWORD2>gmp_abs</KEYWORD2>
-			<KEYWORD2>gmp_add</KEYWORD2>
-			<KEYWORD2>gmp_and</KEYWORD2>
-			<KEYWORD2>gmp_clrbit</KEYWORD2>
-			<KEYWORD2>gmp_cmp</KEYWORD2>
-			<KEYWORD2>gmp_com</KEYWORD2>
-			<KEYWORD2>gmp_div</KEYWORD2>
-			<KEYWORD2>gmp_div_q</KEYWORD2>
-			<KEYWORD2>gmp_div_qr</KEYWORD2>
-			<KEYWORD2>gmp_div_r</KEYWORD2>
-			<KEYWORD2>gmp_divexact</KEYWORD2>
-			<KEYWORD2>gmp_fact</KEYWORD2>
-			<KEYWORD2>gmp_gcd</KEYWORD2>
-			<KEYWORD2>gmp_gcdext</KEYWORD2>
-			<KEYWORD2>gmp_hamdist</KEYWORD2>
-			<KEYWORD2>gmp_init</KEYWORD2>
-			<KEYWORD2>gmp_intval</KEYWORD2>
-			<KEYWORD2>gmp_invert</KEYWORD2>
-			<KEYWORD2>gmp_jacobi</KEYWORD2>
-			<KEYWORD2>gmp_legendre</KEYWORD2>
-			<KEYWORD2>gmp_mod</KEYWORD2>
-			<KEYWORD2>gmp_mul</KEYWORD2>
-			<KEYWORD2>gmp_neg</KEYWORD2>
-			<KEYWORD2>gmp_or</KEYWORD2>
-			<KEYWORD2>gmp_perfect_square</KEYWORD2>
-			<KEYWORD2>gmp_popcount</KEYWORD2>
-			<KEYWORD2>gmp_pow</KEYWORD2>
-			<KEYWORD2>gmp_powm</KEYWORD2>
-			<KEYWORD2>gmp_prob_prime</KEYWORD2>
-			<KEYWORD2>gmp_random</KEYWORD2>
-			<KEYWORD2>gmp_scan0</KEYWORD2>
-			<KEYWORD2>gmp_scan1</KEYWORD2>
-			<KEYWORD2>gmp_setbit</KEYWORD2>
-			<KEYWORD2>gmp_sign</KEYWORD2>
-			<KEYWORD2>gmp_sqrt</KEYWORD2>
-			<KEYWORD2>gmp_sqrtrem</KEYWORD2>
-			<KEYWORD2>gmp_strval</KEYWORD2>
-			<KEYWORD2>gmp_sub</KEYWORD2>
-			<KEYWORD2>gmp_xor</KEYWORD2>
-			<KEYWORD2>gmstrftime</KEYWORD2>
-			<KEYWORD2>gregoriantojd</KEYWORD2>
-			<KEYWORD2>gzclose</KEYWORD2>
-			<KEYWORD2>gzcompress</KEYWORD2>
-			<KEYWORD2>gzdeflate</KEYWORD2>
-			<KEYWORD2>gzencode</KEYWORD2>
-			<KEYWORD2>gzeof</KEYWORD2>
-			<KEYWORD2>gzfile</KEYWORD2>
-			<KEYWORD2>gzgetc</KEYWORD2>
-			<KEYWORD2>gzgets</KEYWORD2>
-			<KEYWORD2>gzgetss</KEYWORD2>
-			<KEYWORD2>gzinflate</KEYWORD2>
-			<KEYWORD2>gzopen</KEYWORD2>
-			<KEYWORD2>gzpassthru</KEYWORD2>
-			<KEYWORD2>gzputs</KEYWORD2>
-			<KEYWORD2>gzread</KEYWORD2>
-			<KEYWORD2>gzrewind</KEYWORD2>
-			<KEYWORD2>gzseek</KEYWORD2>
-			<KEYWORD2>gztell</KEYWORD2>
-			<KEYWORD2>gzuncompress</KEYWORD2>
-			<KEYWORD2>gzwrite</KEYWORD2>
-			<KEYWORD2>handle</KEYWORD2> <!-- soapserver -->
-			<KEYWORD2>has_attribute</KEYWORD2> <!-- domelement -->
-			<KEYWORD2>has_attributes</KEYWORD2> <!-- domnode -->
-			<KEYWORD2>has_child_nodes</KEYWORD2> <!-- domnode -->
-			<KEYWORD2>hasattribute</KEYWORD2> <!-- domelement -->
-			<KEYWORD2>hasattributens</KEYWORD2> <!-- domelement -->
-			<KEYWORD2>hasattributes</KEYWORD2> <!-- domnode -->
-			<KEYWORD2>haschildnodes</KEYWORD2> <!-- domnode -->
-			<KEYWORD2>haschildren</KEYWORD2> <!-- cachingrecursiveiterator, parentiterator, recursivedirectoryiterator, simplexmliterator, tidy_node -->
-			<KEYWORD2>hasfeature</KEYWORD2> <!-- domimplementation -->
-			<KEYWORD2>hasnext</KEYWORD2> <!-- cachingiterator -->
-			<KEYWORD2>hassiblings</KEYWORD2> <!-- tidy_node -->
-			<KEYWORD2>header</KEYWORD2>
-			<KEYWORD2>headers_list</KEYWORD2>
-			<KEYWORD2>headers_sent</KEYWORD2>
-			<KEYWORD2>hebrev</KEYWORD2>
-			<KEYWORD2>hebrevc</KEYWORD2>
-			<KEYWORD2>hexdec</KEYWORD2>
-			<KEYWORD2>highlight_file</KEYWORD2>
-			<KEYWORD2>highlight_string</KEYWORD2>
-			<KEYWORD2>html_dump_mem</KEYWORD2> <!-- domdocument -->
-			<KEYWORD2>html_entity_decode</KEYWORD2>
-			<KEYWORD2>htmlentities</KEYWORD2>
-			<KEYWORD2>htmlspecialchars</KEYWORD2>
-			<KEYWORD2>http_build_query</KEYWORD2>
-			<KEYWORD2>hw_array2objrec</KEYWORD2>
-			<KEYWORD2>hw_changeobject</KEYWORD2>
-			<KEYWORD2>hw_children</KEYWORD2>
-			<KEYWORD2>hw_childrenobj</KEYWORD2>
-			<KEYWORD2>hw_close</KEYWORD2>
-			<KEYWORD2>hw_connect</KEYWORD2>
-			<KEYWORD2>hw_connection_info</KEYWORD2>
-			<KEYWORD2>hw_cp</KEYWORD2>
-			<KEYWORD2>hw_deleteobject</KEYWORD2>
-			<KEYWORD2>hw_docbyanchor</KEYWORD2>
-			<KEYWORD2>hw_docbyanchorobj</KEYWORD2>
-			<KEYWORD2>hw_document_attributes</KEYWORD2>
-			<KEYWORD2>hw_document_bodytag</KEYWORD2>
-			<KEYWORD2>hw_document_content</KEYWORD2>
-			<KEYWORD2>hw_document_setcontent</KEYWORD2>
-			<KEYWORD2>hw_document_size</KEYWORD2>
-			<KEYWORD2>hw_dummy</KEYWORD2>
-			<KEYWORD2>hw_edittext</KEYWORD2>
-			<KEYWORD2>hw_error</KEYWORD2>
-			<KEYWORD2>hw_errormsg</KEYWORD2>
-			<KEYWORD2>hw_free_document</KEYWORD2>
-			<KEYWORD2>hw_getanchors</KEYWORD2>
-			<KEYWORD2>hw_getanchorsobj</KEYWORD2>
-			<KEYWORD2>hw_getandlock</KEYWORD2>
-			<KEYWORD2>hw_getchildcoll</KEYWORD2>
-			<KEYWORD2>hw_getchildcollobj</KEYWORD2>
-			<KEYWORD2>hw_getchilddoccoll</KEYWORD2>
-			<KEYWORD2>hw_getchilddoccollobj</KEYWORD2>
-			<KEYWORD2>hw_getobject</KEYWORD2>
-			<KEYWORD2>hw_getobjectbyquery</KEYWORD2>
-			<KEYWORD2>hw_getobjectbyquerycoll</KEYWORD2>
-			<KEYWORD2>hw_getobjectbyquerycollobj</KEYWORD2>
-			<KEYWORD2>hw_getobjectbyqueryobj</KEYWORD2>
-			<KEYWORD2>hw_getparents</KEYWORD2>
-			<KEYWORD2>hw_getparentsobj</KEYWORD2>
-			<KEYWORD2>hw_getrellink</KEYWORD2>
-			<KEYWORD2>hw_getremote</KEYWORD2>
-			<KEYWORD2>hw_getremotechildren</KEYWORD2>
-			<KEYWORD2>hw_getsrcbydestobj</KEYWORD2>
-			<KEYWORD2>hw_gettext</KEYWORD2>
-			<KEYWORD2>hw_getusername</KEYWORD2>
-			<KEYWORD2>hw_identify</KEYWORD2>
-			<KEYWORD2>hw_incollections</KEYWORD2>
-			<KEYWORD2>hw_info</KEYWORD2>
-			<KEYWORD2>hw_inscoll</KEYWORD2>
-			<KEYWORD2>hw_insdoc</KEYWORD2>
-			<KEYWORD2>hw_insertanchors</KEYWORD2>
-			<KEYWORD2>hw_insertdocument</KEYWORD2>
-			<KEYWORD2>hw_insertobject</KEYWORD2>
-			<KEYWORD2>hw_mapid</KEYWORD2>
-			<KEYWORD2>hw_modifyobject</KEYWORD2>
-			<KEYWORD2>hw_mv</KEYWORD2>
-			<KEYWORD2>hw_new_document</KEYWORD2>
-			<KEYWORD2>hw_objrec2array</KEYWORD2>
-			<KEYWORD2>hw_output_document</KEYWORD2>
-			<KEYWORD2>hw_pconnect</KEYWORD2>
-			<KEYWORD2>hw_pipedocument</KEYWORD2>
-			<KEYWORD2>hw_root</KEYWORD2>
-			<KEYWORD2>hw_setlinkroot</KEYWORD2>
-			<KEYWORD2>hw_stat</KEYWORD2>
-			<KEYWORD2>hw_unlock</KEYWORD2>
-			<KEYWORD2>hw_who</KEYWORD2>
-			<KEYWORD2>hwapi_hgcsp</KEYWORD2>
-			<KEYWORD2>hwstat</KEYWORD2> <!-- hw_api -->
-			<KEYWORD2>hypot</KEYWORD2>
-			<KEYWORD2>ibase_add_user</KEYWORD2>
-			<KEYWORD2>ibase_affected_rows</KEYWORD2>
-			<KEYWORD2>ibase_backup</KEYWORD2>
-			<KEYWORD2>ibase_blob_add</KEYWORD2>
-			<KEYWORD2>ibase_blob_cancel</KEYWORD2>
-			<KEYWORD2>ibase_blob_close</KEYWORD2>
-			<KEYWORD2>ibase_blob_create</KEYWORD2>
-			<KEYWORD2>ibase_blob_echo</KEYWORD2>
-			<KEYWORD2>ibase_blob_get</KEYWORD2>
-			<KEYWORD2>ibase_blob_import</KEYWORD2>
-			<KEYWORD2>ibase_blob_info</KEYWORD2>
-			<KEYWORD2>ibase_blob_open</KEYWORD2>
-			<KEYWORD2>ibase_close</KEYWORD2>
-			<KEYWORD2>ibase_commit</KEYWORD2>
-			<KEYWORD2>ibase_commit_ret</KEYWORD2>
-			<KEYWORD2>ibase_connect</KEYWORD2>
-			<KEYWORD2>ibase_db_info</KEYWORD2>
-			<KEYWORD2>ibase_delete_user</KEYWORD2>
-			<KEYWORD2>ibase_drop_db</KEYWORD2>
-			<KEYWORD2>ibase_errcode</KEYWORD2>
-			<KEYWORD2>ibase_errmsg</KEYWORD2>
-			<KEYWORD2>ibase_execute</KEYWORD2>
-			<KEYWORD2>ibase_fetch_assoc</KEYWORD2>
-			<KEYWORD2>ibase_fetch_object</KEYWORD2>
-			<KEYWORD2>ibase_fetch_row</KEYWORD2>
-			<KEYWORD2>ibase_field_info</KEYWORD2>
-			<KEYWORD2>ibase_free_event_handler</KEYWORD2>
-			<KEYWORD2>ibase_free_query</KEYWORD2>
-			<KEYWORD2>ibase_free_result</KEYWORD2>
-			<KEYWORD2>ibase_gen_id</KEYWORD2>
-			<KEYWORD2>ibase_maintain_db</KEYWORD2>
-			<KEYWORD2>ibase_modify_user</KEYWORD2>
-			<KEYWORD2>ibase_name_result</KEYWORD2>
-			<KEYWORD2>ibase_num_fields</KEYWORD2>
-			<KEYWORD2>ibase_num_params</KEYWORD2>
-			<KEYWORD2>ibase_param_info</KEYWORD2>
-			<KEYWORD2>ibase_pconnect</KEYWORD2>
-			<KEYWORD2>ibase_prepare</KEYWORD2>
-			<KEYWORD2>ibase_query</KEYWORD2>
-			<KEYWORD2>ibase_restore</KEYWORD2>
-			<KEYWORD2>ibase_rollback</KEYWORD2>
-			<KEYWORD2>ibase_rollback_ret</KEYWORD2>
-			<KEYWORD2>ibase_server_info</KEYWORD2>
-			<KEYWORD2>ibase_service_attach</KEYWORD2>
-			<KEYWORD2>ibase_service_detach</KEYWORD2>
-			<KEYWORD2>ibase_set_event_handler</KEYWORD2>
-			<KEYWORD2>ibase_timefmt</KEYWORD2>
-			<KEYWORD2>ibase_trans</KEYWORD2>
-			<KEYWORD2>ibase_wait_event</KEYWORD2>
-			<KEYWORD2>iconv</KEYWORD2>
-			<KEYWORD2>iconv_get_encoding</KEYWORD2>
-			<KEYWORD2>iconv_mime_decode</KEYWORD2>
-			<KEYWORD2>iconv_mime_decode_headers</KEYWORD2>
-			<KEYWORD2>iconv_mime_encode</KEYWORD2>
-			<KEYWORD2>iconv_set_encoding</KEYWORD2>
-			<KEYWORD2>iconv_strlen</KEYWORD2>
-			<KEYWORD2>iconv_strpos</KEYWORD2>
-			<KEYWORD2>iconv_strrpos</KEYWORD2>
-			<KEYWORD2>iconv_substr</KEYWORD2>
-			<KEYWORD2>id3_get_genre_id</KEYWORD2>
-			<KEYWORD2>id3_get_genre_list</KEYWORD2>
-			<KEYWORD2>id3_get_genre_name</KEYWORD2>
-			<KEYWORD2>id3_get_tag</KEYWORD2>
-			<KEYWORD2>id3_get_version</KEYWORD2>
-			<KEYWORD2>id3_remove_tag</KEYWORD2>
-			<KEYWORD2>id3_set_tag</KEYWORD2>
-			<KEYWORD2>idate</KEYWORD2>
-			<KEYWORD2>identify</KEYWORD2> <!-- hw_api -->
-			<KEYWORD2>ifx_affected_rows</KEYWORD2>
-			<KEYWORD2>ifx_blobinfile_mode</KEYWORD2>
-			<KEYWORD2>ifx_byteasvarchar</KEYWORD2>
-			<KEYWORD2>ifx_close</KEYWORD2>
-			<KEYWORD2>ifx_connect</KEYWORD2>
-			<KEYWORD2>ifx_copy_blob</KEYWORD2>
-			<KEYWORD2>ifx_create_blob</KEYWORD2>
-			<KEYWORD2>ifx_create_char</KEYWORD2>
-			<KEYWORD2>ifx_do</KEYWORD2>
-			<KEYWORD2>ifx_error</KEYWORD2>
-			<KEYWORD2>ifx_errormsg</KEYWORD2>
-			<KEYWORD2>ifx_fetch_row</KEYWORD2>
-			<KEYWORD2>ifx_fieldproperties</KEYWORD2>
-			<KEYWORD2>ifx_fieldtypes</KEYWORD2>
-			<KEYWORD2>ifx_free_blob</KEYWORD2>
-			<KEYWORD2>ifx_free_char</KEYWORD2>
-			<KEYWORD2>ifx_free_result</KEYWORD2>
-			<KEYWORD2>ifx_get_blob</KEYWORD2>
-			<KEYWORD2>ifx_get_char</KEYWORD2>
-			<KEYWORD2>ifx_getsqlca</KEYWORD2>
-			<KEYWORD2>ifx_htmltbl_result</KEYWORD2>
-			<KEYWORD2>ifx_nullformat</KEYWORD2>
-			<KEYWORD2>ifx_num_fields</KEYWORD2>
-			<KEYWORD2>ifx_num_rows</KEYWORD2>
-			<KEYWORD2>ifx_pconnect</KEYWORD2>
-			<KEYWORD2>ifx_prepare</KEYWORD2>
-			<KEYWORD2>ifx_query</KEYWORD2>
-			<KEYWORD2>ifx_textasvarchar</KEYWORD2>
-			<KEYWORD2>ifx_update_blob</KEYWORD2>
-			<KEYWORD2>ifx_update_char</KEYWORD2>
-			<KEYWORD2>ifxus_close_slob</KEYWORD2>
-			<KEYWORD2>ifxus_create_slob</KEYWORD2>
-			<KEYWORD2>ifxus_free_slob</KEYWORD2>
-			<KEYWORD2>ifxus_open_slob</KEYWORD2>
-			<KEYWORD2>ifxus_read_slob</KEYWORD2>
-			<KEYWORD2>ifxus_seek_slob</KEYWORD2>
-			<KEYWORD2>ifxus_tell_slob</KEYWORD2>
-			<KEYWORD2>ifxus_write_slob</KEYWORD2>
-			<KEYWORD2>ignore_user_abort</KEYWORD2>
-			<KEYWORD2>image2wbmp</KEYWORD2>
-			<KEYWORD2>image_type_to_extension</KEYWORD2>
-			<KEYWORD2>image_type_to_mime_type</KEYWORD2>
-			<KEYWORD2>imagealphablending</KEYWORD2>
-			<KEYWORD2>imageantialias</KEYWORD2>
-			<KEYWORD2>imagearc</KEYWORD2>
-			<KEYWORD2>imagechar</KEYWORD2>
-			<KEYWORD2>imagecharup</KEYWORD2>
-			<KEYWORD2>imagecolorallocate</KEYWORD2>
-			<KEYWORD2>imagecolorallocatealpha</KEYWORD2>
-			<KEYWORD2>imagecolorat</KEYWORD2>
-			<KEYWORD2>imagecolorclosest</KEYWORD2>
-			<KEYWORD2>imagecolorclosestalpha</KEYWORD2>
-			<KEYWORD2>imagecolorclosesthwb</KEYWORD2>
-			<KEYWORD2>imagecolordeallocate</KEYWORD2>
-			<KEYWORD2>imagecolorexact</KEYWORD2>
-			<KEYWORD2>imagecolorexactalpha</KEYWORD2>
-			<KEYWORD2>imagecolormatch</KEYWORD2>
-			<KEYWORD2>imagecolorresolve</KEYWORD2>
-			<KEYWORD2>imagecolorresolvealpha</KEYWORD2>
-			<KEYWORD2>imagecolorset</KEYWORD2>
-			<KEYWORD2>imagecolorsforindex</KEYWORD2>
-			<KEYWORD2>imagecolorstotal</KEYWORD2>
-			<KEYWORD2>imagecolortransparent</KEYWORD2>
-			<KEYWORD2>imagecopy</KEYWORD2>
-			<KEYWORD2>imagecopymerge</KEYWORD2>
-			<KEYWORD2>imagecopymergegray</KEYWORD2>
-			<KEYWORD2>imagecopyresampled</KEYWORD2>
-			<KEYWORD2>imagecopyresized</KEYWORD2>
-			<KEYWORD2>imagecreate</KEYWORD2>
-			<KEYWORD2>imagecreatefromgd</KEYWORD2>
-			<KEYWORD2>imagecreatefromgd2</KEYWORD2>
-			<KEYWORD2>imagecreatefromgd2part</KEYWORD2>
-			<KEYWORD2>imagecreatefromgif</KEYWORD2>
-			<KEYWORD2>imagecreatefromjpeg</KEYWORD2>
-			<KEYWORD2>imagecreatefrompng</KEYWORD2>
-			<KEYWORD2>imagecreatefromstring</KEYWORD2>
-			<KEYWORD2>imagecreatefromwbmp</KEYWORD2>
-			<KEYWORD2>imagecreatefromxbm</KEYWORD2>
-			<KEYWORD2>imagecreatefromxpm</KEYWORD2>
-			<KEYWORD2>imagecreatetruecolor</KEYWORD2>
-			<KEYWORD2>imagedashedline</KEYWORD2>
-			<KEYWORD2>imagedestroy</KEYWORD2>
-			<KEYWORD2>imageellipse</KEYWORD2>
-			<KEYWORD2>imagefill</KEYWORD2>
-			<KEYWORD2>imagefilledarc</KEYWORD2>
-			<KEYWORD2>imagefilledellipse</KEYWORD2>
-			<KEYWORD2>imagefilledpolygon</KEYWORD2>
-			<KEYWORD2>imagefilledrectangle</KEYWORD2>
-			<KEYWORD2>imagefilltoborder</KEYWORD2>
-			<KEYWORD2>imagefilter</KEYWORD2>
-			<KEYWORD2>imagefontheight</KEYWORD2>
-			<KEYWORD2>imagefontwidth</KEYWORD2>
-			<KEYWORD2>imageftbbox</KEYWORD2>
-			<KEYWORD2>imagefttext</KEYWORD2>
-			<KEYWORD2>imagegammacorrect</KEYWORD2>
-			<KEYWORD2>imagegd</KEYWORD2>
-			<KEYWORD2>imagegd2</KEYWORD2>
-			<KEYWORD2>imagegif</KEYWORD2>
-			<KEYWORD2>imageinterlace</KEYWORD2>
-			<KEYWORD2>imageistruecolor</KEYWORD2>
-			<KEYWORD2>imagejpeg</KEYWORD2>
-			<KEYWORD2>imagelayereffect</KEYWORD2>
-			<KEYWORD2>imageline</KEYWORD2>
-			<KEYWORD2>imageloadfont</KEYWORD2>
-			<KEYWORD2>imagepalettecopy</KEYWORD2>
-			<KEYWORD2>imagepng</KEYWORD2>
-			<KEYWORD2>imagepolygon</KEYWORD2>
-			<KEYWORD2>imagepsbbox</KEYWORD2>
-			<KEYWORD2>imagepscopyfont</KEYWORD2>
-			<KEYWORD2>imagepsencodefont</KEYWORD2>
-			<KEYWORD2>imagepsextendfont</KEYWORD2>
-			<KEYWORD2>imagepsfreefont</KEYWORD2>
-			<KEYWORD2>imagepsloadfont</KEYWORD2>
-			<KEYWORD2>imagepsslantfont</KEYWORD2>
-			<KEYWORD2>imagepstext</KEYWORD2>
-			<KEYWORD2>imagerectangle</KEYWORD2>
-			<KEYWORD2>imagerotate</KEYWORD2>
-			<KEYWORD2>imagesavealpha</KEYWORD2>
-			<KEYWORD2>imagesetbrush</KEYWORD2>
-			<KEYWORD2>imagesetpixel</KEYWORD2>
-			<KEYWORD2>imagesetstyle</KEYWORD2>
-			<KEYWORD2>imagesetthickness</KEYWORD2>
-			<KEYWORD2>imagesettile</KEYWORD2>
-			<KEYWORD2>imagestring</KEYWORD2>
-			<KEYWORD2>imagestringup</KEYWORD2>
-			<KEYWORD2>imagesx</KEYWORD2>
-			<KEYWORD2>imagesy</KEYWORD2>
-			<KEYWORD2>imagetruecolortopalette</KEYWORD2>
-			<KEYWORD2>imagettfbbox</KEYWORD2>
-			<KEYWORD2>imagettftext</KEYWORD2>
-			<KEYWORD2>imagetypes</KEYWORD2>
-			<KEYWORD2>imagewbmp</KEYWORD2>
-			<KEYWORD2>imagexbm</KEYWORD2>
-			<KEYWORD2>imap_8bit</KEYWORD2>
-			<KEYWORD2>imap_alerts</KEYWORD2>
-			<KEYWORD2>imap_append</KEYWORD2>
-			<KEYWORD2>imap_base64</KEYWORD2>
-			<KEYWORD2>imap_binary</KEYWORD2>
-			<KEYWORD2>imap_body</KEYWORD2>
-			<KEYWORD2>imap_bodystruct</KEYWORD2>
-			<KEYWORD2>imap_check</KEYWORD2>
-			<KEYWORD2>imap_clearflag_full</KEYWORD2>
-			<KEYWORD2>imap_close</KEYWORD2>
-			<KEYWORD2>imap_createmailbox</KEYWORD2>
-			<KEYWORD2>imap_delete</KEYWORD2>
-			<KEYWORD2>imap_deletemailbox</KEYWORD2>
-			<KEYWORD2>imap_errors</KEYWORD2>
-			<KEYWORD2>imap_expunge</KEYWORD2>
-			<KEYWORD2>imap_fetch_overview</KEYWORD2>
-			<KEYWORD2>imap_fetchbody</KEYWORD2>
-			<KEYWORD2>imap_fetchheader</KEYWORD2>
-			<KEYWORD2>imap_fetchstructure</KEYWORD2>
-			<KEYWORD2>imap_get_quota</KEYWORD2>
-			<KEYWORD2>imap_get_quotaroot</KEYWORD2>
-			<KEYWORD2>imap_getacl</KEYWORD2>
-			<KEYWORD2>imap_getmailboxes</KEYWORD2>
-			<KEYWORD2>imap_getsubscribed</KEYWORD2>
-			<KEYWORD2>imap_header</KEYWORD2>
-			<KEYWORD2>imap_headerinfo</KEYWORD2>
-			<KEYWORD2>imap_headers</KEYWORD2>
-			<KEYWORD2>imap_last_error</KEYWORD2>
-			<KEYWORD2>imap_list</KEYWORD2>
-			<KEYWORD2>imap_listmailbox</KEYWORD2>
-			<KEYWORD2>imap_listscan</KEYWORD2>
-			<KEYWORD2>imap_listsubscribed</KEYWORD2>
-			<KEYWORD2>imap_lsub</KEYWORD2>
-			<KEYWORD2>imap_mail</KEYWORD2>
-			<KEYWORD2>imap_mail_compose</KEYWORD2>
-			<KEYWORD2>imap_mail_copy</KEYWORD2>
-			<KEYWORD2>imap_mail_move</KEYWORD2>
-			<KEYWORD2>imap_mailboxmsginfo</KEYWORD2>
-			<KEYWORD2>imap_mime_header_decode</KEYWORD2>
-			<KEYWORD2>imap_msgno</KEYWORD2>
-			<KEYWORD2>imap_num_msg</KEYWORD2>
-			<KEYWORD2>imap_num_recent</KEYWORD2>
-			<KEYWORD2>imap_open</KEYWORD2>
-			<KEYWORD2>imap_ping</KEYWORD2>
-			<KEYWORD2>imap_qprint</KEYWORD2>
-			<KEYWORD2>imap_renamemailbox</KEYWORD2>
-			<KEYWORD2>imap_reopen</KEYWORD2>
-			<KEYWORD2>imap_rfc822_parse_adrlist</KEYWORD2>
-			<KEYWORD2>imap_rfc822_parse_headers</KEYWORD2>
-			<KEYWORD2>imap_rfc822_write_address</KEYWORD2>
-			<KEYWORD2>imap_scanmailbox</KEYWORD2>
-			<KEYWORD2>imap_search</KEYWORD2>
-			<KEYWORD2>imap_set_quota</KEYWORD2>
-			<KEYWORD2>imap_setacl</KEYWORD2>
-			<KEYWORD2>imap_setflag_full</KEYWORD2>
-			<KEYWORD2>imap_sort</KEYWORD2>
-			<KEYWORD2>imap_status</KEYWORD2>
-			<KEYWORD2>imap_subscribe</KEYWORD2>
-			<KEYWORD2>imap_thread</KEYWORD2>
-			<KEYWORD2>imap_timeout</KEYWORD2>
-			<KEYWORD2>imap_uid</KEYWORD2>
-			<KEYWORD2>imap_undelete</KEYWORD2>
-			<KEYWORD2>imap_unsubscribe</KEYWORD2>
-			<KEYWORD2>imap_utf7_decode</KEYWORD2>
-			<KEYWORD2>imap_utf7_encode</KEYWORD2>
-			<KEYWORD2>imap_utf8</KEYWORD2>
-			<KEYWORD2>implode</KEYWORD2>
-			<KEYWORD2>import</KEYWORD2> <!-- lob -->
-			<KEYWORD2>import_request_variables</KEYWORD2>
-			<KEYWORD2>importnode</KEYWORD2> <!-- domdocument -->
-			<KEYWORD2>in_array</KEYWORD2>
-			<KEYWORD2>increment</KEYWORD2> <!-- memcache -->
-			<KEYWORD2>inet_ntop</KEYWORD2>
-			<KEYWORD2>inet_pton</KEYWORD2>
-			<KEYWORD2>info</KEYWORD2> <!-- hw_api -->
-			<KEYWORD2>ingres_autocommit</KEYWORD2>
-			<KEYWORD2>ingres_close</KEYWORD2>
-			<KEYWORD2>ingres_commit</KEYWORD2>
-			<KEYWORD2>ingres_connect</KEYWORD2>
-			<KEYWORD2>ingres_fetch_array</KEYWORD2>
-			<KEYWORD2>ingres_fetch_object</KEYWORD2>
-			<KEYWORD2>ingres_fetch_row</KEYWORD2>
-			<KEYWORD2>ingres_field_length</KEYWORD2>
-			<KEYWORD2>ingres_field_name</KEYWORD2>
-			<KEYWORD2>ingres_field_nullable</KEYWORD2>
-			<KEYWORD2>ingres_field_precision</KEYWORD2>
-			<KEYWORD2>ingres_field_scale</KEYWORD2>
-			<KEYWORD2>ingres_field_type</KEYWORD2>
-			<KEYWORD2>ingres_num_fields</KEYWORD2>
-			<KEYWORD2>ingres_num_rows</KEYWORD2>
-			<KEYWORD2>ingres_pconnect</KEYWORD2>
-			<KEYWORD2>ingres_query</KEYWORD2>
-			<KEYWORD2>ingres_rollback</KEYWORD2>
-			<KEYWORD2>ini_alter</KEYWORD2>
-			<KEYWORD2>ini_get</KEYWORD2>
-			<KEYWORD2>ini_get_all</KEYWORD2>
-			<KEYWORD2>ini_restore</KEYWORD2>
-			<KEYWORD2>ini_set</KEYWORD2>
-			<KEYWORD2>insert</KEYWORD2> <!-- hw_api, hw_api_object -->
-			<KEYWORD2>insert_before</KEYWORD2> <!-- domnode -->
-			<KEYWORD2>insertanchor</KEYWORD2> <!-- hw_api -->
-			<KEYWORD2>insertbefore</KEYWORD2> <!-- domnode -->
-			<KEYWORD2>insertcollection</KEYWORD2> <!-- hw_api -->
-			<KEYWORD2>insertdata</KEYWORD2> <!-- domcharacterdata -->
-			<KEYWORD2>insertdocument</KEYWORD2> <!-- hw_api -->
-			<KEYWORD2>interface_exists</KEYWORD2>
-			<KEYWORD2>internal_subset</KEYWORD2> <!-- domdocumenttype -->
-			<KEYWORD2>intval</KEYWORD2>
-			<KEYWORD2>ip2long</KEYWORD2>
-			<KEYWORD2>iptcembed</KEYWORD2>
-			<KEYWORD2>iptcparse</KEYWORD2>
-			<KEYWORD2>ircg_channel_mode</KEYWORD2>
-			<KEYWORD2>ircg_disconnect</KEYWORD2>
-			<KEYWORD2>ircg_eval_ecmascript_params</KEYWORD2>
-			<KEYWORD2>ircg_fetch_error_msg</KEYWORD2>
-			<KEYWORD2>ircg_get_username</KEYWORD2>
-			<KEYWORD2>ircg_html_encode</KEYWORD2>
-			<KEYWORD2>ircg_ignore_add</KEYWORD2>
-			<KEYWORD2>ircg_ignore_del</KEYWORD2>
-			<KEYWORD2>ircg_invite</KEYWORD2>
-			<KEYWORD2>ircg_is_conn_alive</KEYWORD2>
-			<KEYWORD2>ircg_join</KEYWORD2>
-			<KEYWORD2>ircg_kick</KEYWORD2>
-			<KEYWORD2>ircg_list</KEYWORD2>
-			<KEYWORD2>ircg_lookup_format_messages</KEYWORD2>
-			<KEYWORD2>ircg_lusers</KEYWORD2>
-			<KEYWORD2>ircg_msg</KEYWORD2>
-			<KEYWORD2>ircg_names</KEYWORD2>
-			<KEYWORD2>ircg_nick</KEYWORD2>
-			<KEYWORD2>ircg_nickname_escape</KEYWORD2>
-			<KEYWORD2>ircg_nickname_unescape</KEYWORD2>
-			<KEYWORD2>ircg_notice</KEYWORD2>
-			<KEYWORD2>ircg_oper</KEYWORD2>
-			<KEYWORD2>ircg_part</KEYWORD2>
-			<KEYWORD2>ircg_pconnect</KEYWORD2>
-			<KEYWORD2>ircg_register_format_messages</KEYWORD2>
-			<KEYWORD2>ircg_set_current</KEYWORD2>
-			<KEYWORD2>ircg_set_file</KEYWORD2>
-			<KEYWORD2>ircg_set_on_die</KEYWORD2>
-			<KEYWORD2>ircg_topic</KEYWORD2>
-			<KEYWORD2>ircg_who</KEYWORD2>
-			<KEYWORD2>ircg_whois</KEYWORD2>
-			<KEYWORD2>is_a</KEYWORD2>
-			<KEYWORD2>is_array</KEYWORD2>
-			<KEYWORD2>is_blank_node</KEYWORD2> <!-- domnode -->
-			<KEYWORD2>is_bool</KEYWORD2>
-			<KEYWORD2>is_callable</KEYWORD2>
-			<KEYWORD2>is_dir</KEYWORD2>
-			<KEYWORD2>is_double</KEYWORD2>
-			<KEYWORD2>is_executable</KEYWORD2>
-			<KEYWORD2>is_file</KEYWORD2>
-			<KEYWORD2>is_finite</KEYWORD2>
-			<KEYWORD2>is_float</KEYWORD2>
-			<KEYWORD2>is_infinite</KEYWORD2>
-			<KEYWORD2>is_int</KEYWORD2>
-			<KEYWORD2>is_integer</KEYWORD2>
-			<KEYWORD2>is_link</KEYWORD2>
-			<KEYWORD2>is_long</KEYWORD2>
-			<KEYWORD2>is_nan</KEYWORD2>
-			<KEYWORD2>is_null</KEYWORD2>
-			<KEYWORD2>is_numeric</KEYWORD2>
-			<KEYWORD2>is_object</KEYWORD2>
-			<KEYWORD2>is_readable</KEYWORD2>
-			<KEYWORD2>is_real</KEYWORD2>
-			<KEYWORD2>is_resource</KEYWORD2>
-			<KEYWORD2>is_scalar</KEYWORD2>
-			<KEYWORD2>is_soap_fault</KEYWORD2>
-			<KEYWORD2>is_string</KEYWORD2>
-			<KEYWORD2>is_subclass_of</KEYWORD2>
-			<KEYWORD2>is_uploaded_file</KEYWORD2>
-			<KEYWORD2>is_writable</KEYWORD2>
-			<KEYWORD2>is_writeable</KEYWORD2>
-			<KEYWORD2>isasp</KEYWORD2> <!-- tidy_node -->
-			<KEYWORD2>iscomment</KEYWORD2> <!-- tidy_node -->
-			<KEYWORD2>isdir</KEYWORD2> <!-- directoryiterator -->
-			<KEYWORD2>isdot</KEYWORD2> <!-- directoryiterator -->
-			<KEYWORD2>isexecutable</KEYWORD2> <!-- directoryiterator -->
-			<KEYWORD2>isfile</KEYWORD2> <!-- directoryiterator -->
-			<KEYWORD2>ishtml</KEYWORD2> <!-- tidy_node -->
-			<KEYWORD2>isid</KEYWORD2> <!-- domattr -->
-			<KEYWORD2>isjste</KEYWORD2> <!-- tidy_node -->
-			<KEYWORD2>islink</KEYWORD2> <!-- directoryiterator -->
-			<KEYWORD2>isphp</KEYWORD2> <!-- tidy_node -->
-			<KEYWORD2>isreadable</KEYWORD2> <!-- directoryiterator -->
-			<KEYWORD2>issamenode</KEYWORD2> <!-- domnode -->
-			<KEYWORD2>issupported</KEYWORD2> <!-- domnode -->
-			<KEYWORD2>istext</KEYWORD2> <!-- tidy_node -->
-			<KEYWORD2>iswhitespaceinelementcontent</KEYWORD2> <!-- domtext -->
-			<KEYWORD2>iswritable</KEYWORD2> <!-- directoryiterator -->
-			<KEYWORD2>isxhtml</KEYWORD2> <!-- tidy_node -->
-			<KEYWORD2>isxml</KEYWORD2> <!-- tidy_node -->
-			<KEYWORD2>item</KEYWORD2> <!-- domnamednodemap, domnodelist -->
-			<KEYWORD2>iterator_count</KEYWORD2>
-			<KEYWORD2>iterator_to_array</KEYWORD2>
-			<KEYWORD2>java_last_exception_clear</KEYWORD2>
-			<KEYWORD2>java_last_exception_get</KEYWORD2>
-			<KEYWORD2>jddayofweek</KEYWORD2>
-			<KEYWORD2>jdmonthname</KEYWORD2>
-			<KEYWORD2>jdtofrench</KEYWORD2>
-			<KEYWORD2>jdtogregorian</KEYWORD2>
-			<KEYWORD2>jdtojewish</KEYWORD2>
-			<KEYWORD2>jdtojulian</KEYWORD2>
-			<KEYWORD2>jdtounix</KEYWORD2>
-			<KEYWORD2>jewishtojd</KEYWORD2>
-			<KEYWORD2>join</KEYWORD2>
-			<KEYWORD2>jpeg2wbmp</KEYWORD2>
-			<KEYWORD2>json_decode</KEYWORD2>
-			<KEYWORD2>json_encode</KEYWORD2>
-			<KEYWORD2>juliantojd</KEYWORD2>
-			<KEYWORD2>key</KEYWORD2> <!-- arrayiterator, directoryiterator, filteriterator, hw_api_attribute, recursivedirectoryiterator, recursiveiteratoriterator, simplexmliterator -->
-			<KEYWORD2>krsort</KEYWORD2>
-			<KEYWORD2>ksort</KEYWORD2>
-			<KEYWORD2>langdepvalue</KEYWORD2> <!-- hw_api_attribute -->
-			<KEYWORD2>last_child</KEYWORD2> <!-- domnode -->
-			<KEYWORD2>lastinsertid</KEYWORD2> <!-- pdo -->
-			<KEYWORD2>lcg_value</KEYWORD2>
-			<KEYWORD2>ldap_8859_to_t61</KEYWORD2>
-			<KEYWORD2>ldap_add</KEYWORD2>
-			<KEYWORD2>ldap_bind</KEYWORD2>
-			<KEYWORD2>ldap_close</KEYWORD2>
-			<KEYWORD2>ldap_compare</KEYWORD2>
-			<KEYWORD2>ldap_connect</KEYWORD2>
-			<KEYWORD2>ldap_count_entries</KEYWORD2>
-			<KEYWORD2>ldap_delete</KEYWORD2>
-			<KEYWORD2>ldap_dn2ufn</KEYWORD2>
-			<KEYWORD2>ldap_err2str</KEYWORD2>
-			<KEYWORD2>ldap_errno</KEYWORD2>
-			<KEYWORD2>ldap_error</KEYWORD2>
-			<KEYWORD2>ldap_explode_dn</KEYWORD2>
-			<KEYWORD2>ldap_first_attribute</KEYWORD2>
-			<KEYWORD2>ldap_first_entry</KEYWORD2>
-			<KEYWORD2>ldap_first_reference</KEYWORD2>
-			<KEYWORD2>ldap_free_result</KEYWORD2>
-			<KEYWORD2>ldap_get_attributes</KEYWORD2>
-			<KEYWORD2>ldap_get_dn</KEYWORD2>
-			<KEYWORD2>ldap_get_entries</KEYWORD2>
-			<KEYWORD2>ldap_get_option</KEYWORD2>
-			<KEYWORD2>ldap_get_values</KEYWORD2>
-			<KEYWORD2>ldap_get_values_len</KEYWORD2>
-			<KEYWORD2>ldap_list</KEYWORD2>
-			<KEYWORD2>ldap_mod_add</KEYWORD2>
-			<KEYWORD2>ldap_mod_del</KEYWORD2>
-			<KEYWORD2>ldap_mod_replace</KEYWORD2>
-			<KEYWORD2>ldap_modify</KEYWORD2>
-			<KEYWORD2>ldap_next_attribute</KEYWORD2>
-			<KEYWORD2>ldap_next_entry</KEYWORD2>
-			<KEYWORD2>ldap_next_reference</KEYWORD2>
-			<KEYWORD2>ldap_parse_reference</KEYWORD2>
-			<KEYWORD2>ldap_parse_result</KEYWORD2>
-			<KEYWORD2>ldap_read</KEYWORD2>
-			<KEYWORD2>ldap_rename</KEYWORD2>
-			<KEYWORD2>ldap_sasl_bind</KEYWORD2>
-			<KEYWORD2>ldap_search</KEYWORD2>
-			<KEYWORD2>ldap_set_option</KEYWORD2>
-			<KEYWORD2>ldap_set_rebind_proc</KEYWORD2>
-			<KEYWORD2>ldap_sort</KEYWORD2>
-			<KEYWORD2>ldap_start_tls</KEYWORD2>
-			<KEYWORD2>ldap_t61_to_8859</KEYWORD2>
-			<KEYWORD2>ldap_unbind</KEYWORD2>
-			<KEYWORD2>levenshtein</KEYWORD2>
-			<KEYWORD2>link</KEYWORD2> <!-- hw_api -->
-			<KEYWORD2>linkinfo</KEYWORD2>
-			<KEYWORD2>load</KEYWORD2> <!-- domdocument, lob -->
-			<KEYWORD2>loadhtml</KEYWORD2> <!-- domdocument -->
-			<KEYWORD2>loadhtmlfile</KEYWORD2> <!-- domdocument -->
-			<KEYWORD2>loadxml</KEYWORD2> <!-- domdocument -->
-			<KEYWORD2>localeconv</KEYWORD2>
-			<KEYWORD2>localtime</KEYWORD2>
-			<KEYWORD2>lock</KEYWORD2> <!-- hw_api -->
-			<KEYWORD2>log</KEYWORD2>
-			<KEYWORD2>log10</KEYWORD2>
-			<KEYWORD2>log1p</KEYWORD2>
-			<KEYWORD2>long2ip</KEYWORD2>
-			<KEYWORD2>lookupnamespaceuri</KEYWORD2> <!-- domnode -->
-			<KEYWORD2>lookupprefix</KEYWORD2> <!-- domnode -->
-			<KEYWORD2>lstat</KEYWORD2>
-			<KEYWORD2>ltrim</KEYWORD2>
-			<KEYWORD2>lzf_compress</KEYWORD2>
-			<KEYWORD2>lzf_decompress</KEYWORD2>
-			<KEYWORD2>lzf_optimized_for</KEYWORD2>
-			<KEYWORD2>mail</KEYWORD2>
-			<KEYWORD2>mailparse_determine_best_xfer_encoding</KEYWORD2>
-			<KEYWORD2>mailparse_msg_create</KEYWORD2>
-			<KEYWORD2>mailparse_msg_extract_part</KEYWORD2>
-			<KEYWORD2>mailparse_msg_extract_part_file</KEYWORD2>
-			<KEYWORD2>mailparse_msg_free</KEYWORD2>
-			<KEYWORD2>mailparse_msg_get_part</KEYWORD2>
-			<KEYWORD2>mailparse_msg_get_part_data</KEYWORD2>
-			<KEYWORD2>mailparse_msg_get_structure</KEYWORD2>
-			<KEYWORD2>mailparse_msg_parse</KEYWORD2>
-			<KEYWORD2>mailparse_msg_parse_file</KEYWORD2>
-			<KEYWORD2>mailparse_rfc822_parse_addresses</KEYWORD2>
-			<KEYWORD2>mailparse_stream_encode</KEYWORD2>
-			<KEYWORD2>mailparse_uudecode_all</KEYWORD2>
-			<KEYWORD2>main</KEYWORD2>
-			<KEYWORD2>max</KEYWORD2> <!-- collection -->
-			<KEYWORD2>mb_convert_case</KEYWORD2>
-			<KEYWORD2>mb_convert_encoding</KEYWORD2>
-			<KEYWORD2>mb_convert_kana</KEYWORD2>
-			<KEYWORD2>mb_convert_variables</KEYWORD2>
-			<KEYWORD2>mb_decode_mimeheader</KEYWORD2>
-			<KEYWORD2>mb_decode_numericentity</KEYWORD2>
-			<KEYWORD2>mb_detect_encoding</KEYWORD2>
-			<KEYWORD2>mb_detect_order</KEYWORD2>
-			<KEYWORD2>mb_encode_mimeheader</KEYWORD2>
-			<KEYWORD2>mb_encode_numericentity</KEYWORD2>
-			<KEYWORD2>mb_ereg</KEYWORD2>
-			<KEYWORD2>mb_ereg_match</KEYWORD2>
-			<KEYWORD2>mb_ereg_replace</KEYWORD2>
-			<KEYWORD2>mb_ereg_search</KEYWORD2>
-			<KEYWORD2>mb_ereg_search_getpos</KEYWORD2>
-			<KEYWORD2>mb_ereg_search_getregs</KEYWORD2>
-			<KEYWORD2>mb_ereg_search_init</KEYWORD2>
-			<KEYWORD2>mb_ereg_search_pos</KEYWORD2>
-			<KEYWORD2>mb_ereg_search_regs</KEYWORD2>
-			<KEYWORD2>mb_ereg_search_setpos</KEYWORD2>
-			<KEYWORD2>mb_eregi</KEYWORD2>
-			<KEYWORD2>mb_eregi_replace</KEYWORD2>
-			<KEYWORD2>mb_get_info</KEYWORD2>
-			<KEYWORD2>mb_http_input</KEYWORD2>
-			<KEYWORD2>mb_http_output</KEYWORD2>
-			<KEYWORD2>mb_internal_encoding</KEYWORD2>
-			<KEYWORD2>mb_language</KEYWORD2>
-			<KEYWORD2>mb_list_encodings</KEYWORD2>
-			<KEYWORD2>mb_output_handler</KEYWORD2>
-			<KEYWORD2>mb_parse_str</KEYWORD2>
-			<KEYWORD2>mb_preferred_mime_name</KEYWORD2>
-			<KEYWORD2>mb_regex_encoding</KEYWORD2>
-			<KEYWORD2>mb_regex_set_options</KEYWORD2>
-			<KEYWORD2>mb_send_mail</KEYWORD2>
-			<KEYWORD2>mb_split</KEYWORD2>
-			<KEYWORD2>mb_strcut</KEYWORD2>
-			<KEYWORD2>mb_strimwidth</KEYWORD2>
-			<KEYWORD2>mb_strlen</KEYWORD2>
-			<KEYWORD2>mb_strpos</KEYWORD2>
-			<KEYWORD2>mb_strrpos</KEYWORD2>
-			<KEYWORD2>mb_strtolower</KEYWORD2>
-			<KEYWORD2>mb_strtoupper</KEYWORD2>
-			<KEYWORD2>mb_strwidth</KEYWORD2>
-			<KEYWORD2>mb_substitute_character</KEYWORD2>
-			<KEYWORD2>mb_substr</KEYWORD2>
-			<KEYWORD2>mb_substr_count</KEYWORD2>
-			<KEYWORD2>mcal_append_event</KEYWORD2>
-			<KEYWORD2>mcal_close</KEYWORD2>
-			<KEYWORD2>mcal_create_calendar</KEYWORD2>
-			<KEYWORD2>mcal_date_compare</KEYWORD2>
-			<KEYWORD2>mcal_date_valid</KEYWORD2>
-			<KEYWORD2>mcal_day_of_week</KEYWORD2>
-			<KEYWORD2>mcal_day_of_year</KEYWORD2>
-			<KEYWORD2>mcal_days_in_month</KEYWORD2>
-			<KEYWORD2>mcal_delete_calendar</KEYWORD2>
-			<KEYWORD2>mcal_delete_event</KEYWORD2>
-			<KEYWORD2>mcal_event_add_attribute</KEYWORD2>
-			<KEYWORD2>mcal_event_init</KEYWORD2>
-			<KEYWORD2>mcal_event_set_alarm</KEYWORD2>
-			<KEYWORD2>mcal_event_set_category</KEYWORD2>
-			<KEYWORD2>mcal_event_set_class</KEYWORD2>
-			<KEYWORD2>mcal_event_set_description</KEYWORD2>
-			<KEYWORD2>mcal_event_set_end</KEYWORD2>
-			<KEYWORD2>mcal_event_set_recur_daily</KEYWORD2>
-			<KEYWORD2>mcal_event_set_recur_monthly_mday</KEYWORD2>
-			<KEYWORD2>mcal_event_set_recur_monthly_wday</KEYWORD2>
-			<KEYWORD2>mcal_event_set_recur_none</KEYWORD2>
-			<KEYWORD2>mcal_event_set_recur_weekly</KEYWORD2>
-			<KEYWORD2>mcal_event_set_recur_yearly</KEYWORD2>
-			<KEYWORD2>mcal_event_set_start</KEYWORD2>
-			<KEYWORD2>mcal_event_set_title</KEYWORD2>
-			<KEYWORD2>mcal_expunge</KEYWORD2>
-			<KEYWORD2>mcal_fetch_current_stream_event</KEYWORD2>
-			<KEYWORD2>mcal_fetch_event</KEYWORD2>
-			<KEYWORD2>mcal_is_leap_year</KEYWORD2>
-			<KEYWORD2>mcal_list_alarms</KEYWORD2>
-			<KEYWORD2>mcal_list_events</KEYWORD2>
-			<KEYWORD2>mcal_next_recurrence</KEYWORD2>
-			<KEYWORD2>mcal_open</KEYWORD2>
-			<KEYWORD2>mcal_popen</KEYWORD2>
-			<KEYWORD2>mcal_rename_calendar</KEYWORD2>
-			<KEYWORD2>mcal_reopen</KEYWORD2>
-			<KEYWORD2>mcal_snooze</KEYWORD2>
-			<KEYWORD2>mcal_store_event</KEYWORD2>
-			<KEYWORD2>mcal_time_valid</KEYWORD2>
-			<KEYWORD2>mcal_week_of_year</KEYWORD2>
-			<KEYWORD2>mcrypt_cbc</KEYWORD2>
-			<KEYWORD2>mcrypt_cfb</KEYWORD2>
-			<KEYWORD2>mcrypt_create_iv</KEYWORD2>
-			<KEYWORD2>mcrypt_decrypt</KEYWORD2>
-			<KEYWORD2>mcrypt_ecb</KEYWORD2>
-			<KEYWORD2>mcrypt_enc_get_algorithms_name</KEYWORD2>
-			<KEYWORD2>mcrypt_enc_get_block_size</KEYWORD2>
-			<KEYWORD2>mcrypt_enc_get_iv_size</KEYWORD2>
-			<KEYWORD2>mcrypt_enc_get_key_size</KEYWORD2>
-			<KEYWORD2>mcrypt_enc_get_modes_name</KEYWORD2>
-			<KEYWORD2>mcrypt_enc_get_supported_key_sizes</KEYWORD2>
-			<KEYWORD2>mcrypt_enc_is_block_algorithm</KEYWORD2>
-			<KEYWORD2>mcrypt_enc_is_block_algorithm_mode</KEYWORD2>
-			<KEYWORD2>mcrypt_enc_is_block_mode</KEYWORD2>
-			<KEYWORD2>mcrypt_enc_self_test</KEYWORD2>
-			<KEYWORD2>mcrypt_encrypt</KEYWORD2>
-			<KEYWORD2>mcrypt_generic</KEYWORD2>
-			<KEYWORD2>mcrypt_generic_deinit</KEYWORD2>
-			<KEYWORD2>mcrypt_generic_end</KEYWORD2>
-			<KEYWORD2>mcrypt_generic_init</KEYWORD2>
-			<KEYWORD2>mcrypt_get_block_size</KEYWORD2>
-			<KEYWORD2>mcrypt_get_cipher_name</KEYWORD2>
-			<KEYWORD2>mcrypt_get_iv_size</KEYWORD2>
-			<KEYWORD2>mcrypt_get_key_size</KEYWORD2>
-			<KEYWORD2>mcrypt_list_algorithms</KEYWORD2>
-			<KEYWORD2>mcrypt_list_modes</KEYWORD2>
-			<KEYWORD2>mcrypt_module_close</KEYWORD2>
-			<KEYWORD2>mcrypt_module_get_algo_block_size</KEYWORD2>
-			<KEYWORD2>mcrypt_module_get_algo_key_size</KEYWORD2>
-			<KEYWORD2>mcrypt_module_get_supported_key_sizes</KEYWORD2>
-			<KEYWORD2>mcrypt_module_is_block_algorithm</KEYWORD2>
-			<KEYWORD2>mcrypt_module_is_block_algorithm_mode</KEYWORD2>
-			<KEYWORD2>mcrypt_module_is_block_mode</KEYWORD2>
-			<KEYWORD2>mcrypt_module_open</KEYWORD2>
-			<KEYWORD2>mcrypt_module_self_test</KEYWORD2>
-			<KEYWORD2>mcrypt_ofb</KEYWORD2>
-			<KEYWORD2>mcve_adduser</KEYWORD2>
-			<KEYWORD2>mcve_adduserarg</KEYWORD2>
-			<KEYWORD2>mcve_bt</KEYWORD2>
-			<KEYWORD2>mcve_checkstatus</KEYWORD2>
-			<KEYWORD2>mcve_chkpwd</KEYWORD2>
-			<KEYWORD2>mcve_chngpwd</KEYWORD2>
-			<KEYWORD2>mcve_completeauthorizations</KEYWORD2>
-			<KEYWORD2>mcve_connect</KEYWORD2>
-			<KEYWORD2>mcve_connectionerror</KEYWORD2>
-			<KEYWORD2>mcve_deleteresponse</KEYWORD2>
-			<KEYWORD2>mcve_deletetrans</KEYWORD2>
-			<KEYWORD2>mcve_deleteusersetup</KEYWORD2>
-			<KEYWORD2>mcve_deluser</KEYWORD2>
-			<KEYWORD2>mcve_destroyconn</KEYWORD2>
-			<KEYWORD2>mcve_destroyengine</KEYWORD2>
-			<KEYWORD2>mcve_disableuser</KEYWORD2>
-			<KEYWORD2>mcve_edituser</KEYWORD2>
-			<KEYWORD2>mcve_enableuser</KEYWORD2>
-			<KEYWORD2>mcve_force</KEYWORD2>
-			<KEYWORD2>mcve_getcell</KEYWORD2>
-			<KEYWORD2>mcve_getcellbynum</KEYWORD2>
-			<KEYWORD2>mcve_getcommadelimited</KEYWORD2>
-			<KEYWORD2>mcve_getheader</KEYWORD2>
-			<KEYWORD2>mcve_getuserarg</KEYWORD2>
-			<KEYWORD2>mcve_getuserparam</KEYWORD2>
-			<KEYWORD2>mcve_gft</KEYWORD2>
-			<KEYWORD2>mcve_gl</KEYWORD2>
-			<KEYWORD2>mcve_gut</KEYWORD2>
-			<KEYWORD2>mcve_initconn</KEYWORD2>
-			<KEYWORD2>mcve_initengine</KEYWORD2>
-			<KEYWORD2>mcve_initusersetup</KEYWORD2>
-			<KEYWORD2>mcve_iscommadelimited</KEYWORD2>
-			<KEYWORD2>mcve_liststats</KEYWORD2>
-			<KEYWORD2>mcve_listusers</KEYWORD2>
-			<KEYWORD2>mcve_maxconntimeout</KEYWORD2>
-			<KEYWORD2>mcve_monitor</KEYWORD2>
-			<KEYWORD2>mcve_numcolumns</KEYWORD2>
-			<KEYWORD2>mcve_numrows</KEYWORD2>
-			<KEYWORD2>mcve_override</KEYWORD2>
-			<KEYWORD2>mcve_parsecommadelimited</KEYWORD2>
-			<KEYWORD2>mcve_ping</KEYWORD2>
-			<KEYWORD2>mcve_preauth</KEYWORD2>
-			<KEYWORD2>mcve_preauthcompletion</KEYWORD2>
-			<KEYWORD2>mcve_qc</KEYWORD2>
-			<KEYWORD2>mcve_responseparam</KEYWORD2>
-			<KEYWORD2>mcve_return</KEYWORD2>
-			<KEYWORD2>mcve_returncode</KEYWORD2>
-			<KEYWORD2>mcve_returnstatus</KEYWORD2>
-			<KEYWORD2>mcve_sale</KEYWORD2>
-			<KEYWORD2>mcve_setblocking</KEYWORD2>
-			<KEYWORD2>mcve_setdropfile</KEYWORD2>
-			<KEYWORD2>mcve_setip</KEYWORD2>
-			<KEYWORD2>mcve_setssl</KEYWORD2>
-			<KEYWORD2>mcve_setssl_files</KEYWORD2>
-			<KEYWORD2>mcve_settimeout</KEYWORD2>
-			<KEYWORD2>mcve_settle</KEYWORD2>
-			<KEYWORD2>mcve_text_avs</KEYWORD2>
-			<KEYWORD2>mcve_text_code</KEYWORD2>
-			<KEYWORD2>mcve_text_cv</KEYWORD2>
-			<KEYWORD2>mcve_transactionauth</KEYWORD2>
-			<KEYWORD2>mcve_transactionavs</KEYWORD2>
-			<KEYWORD2>mcve_transactionbatch</KEYWORD2>
-			<KEYWORD2>mcve_transactioncv</KEYWORD2>
-			<KEYWORD2>mcve_transactionid</KEYWORD2>
-			<KEYWORD2>mcve_transactionitem</KEYWORD2>
-			<KEYWORD2>mcve_transactionssent</KEYWORD2>
-			<KEYWORD2>mcve_transactiontext</KEYWORD2>
-			<KEYWORD2>mcve_transinqueue</KEYWORD2>
-			<KEYWORD2>mcve_transnew</KEYWORD2>
-			<KEYWORD2>mcve_transparam</KEYWORD2>
-			<KEYWORD2>mcve_transsend</KEYWORD2>
-			<KEYWORD2>mcve_ub</KEYWORD2>
-			<KEYWORD2>mcve_uwait</KEYWORD2>
-			<KEYWORD2>mcve_verifyconnection</KEYWORD2>
-			<KEYWORD2>mcve_verifysslcert</KEYWORD2>
-			<KEYWORD2>mcve_void</KEYWORD2>
-			<KEYWORD2>md5</KEYWORD2>
-			<KEYWORD2>md5_file</KEYWORD2>
-			<KEYWORD2>mdecrypt_generic</KEYWORD2>
-			<KEYWORD2>memcache_debug</KEYWORD2>
-			<KEYWORD2>memory_get_usage</KEYWORD2>
-			<KEYWORD2>memory_get_peak_usage</KEYWORD2>
-			<KEYWORD2>metaphone</KEYWORD2>
-			<KEYWORD2>method_exists</KEYWORD2>
-			<KEYWORD2>mhash</KEYWORD2>
-			<KEYWORD2>mhash_count</KEYWORD2>
-			<KEYWORD2>mhash_get_block_size</KEYWORD2>
-			<KEYWORD2>mhash_get_hash_name</KEYWORD2>
-			<KEYWORD2>mhash_keygen_s2k</KEYWORD2>
-			<KEYWORD2>microtime</KEYWORD2>
-			<KEYWORD2>mime_content_type</KEYWORD2>
-			<KEYWORD2>mimetype</KEYWORD2> <!-- hw_api_content -->
-			<KEYWORD2>min</KEYWORD2>
-			<KEYWORD2>ming_setcubicthreshold</KEYWORD2>
-			<KEYWORD2>ming_setscale</KEYWORD2>
-			<KEYWORD2>ming_useswfversion</KEYWORD2>
-			<KEYWORD2>mkdir</KEYWORD2>
-			<KEYWORD2>mktime</KEYWORD2>
-			<KEYWORD2>money_format</KEYWORD2>
-			<KEYWORD2>move</KEYWORD2> <!-- hw_api, swfdisplayitem -->
-			<KEYWORD2>move_uploaded_file</KEYWORD2>
-			<KEYWORD2>movepen</KEYWORD2> <!-- swfshape -->
-			<KEYWORD2>movepento</KEYWORD2> <!-- swfshape -->
-			<KEYWORD2>moveto</KEYWORD2> <!-- swfdisplayitem, swffill, swftext -->
-			<KEYWORD2>msession_connect</KEYWORD2>
-			<KEYWORD2>msession_count</KEYWORD2>
-			<KEYWORD2>msession_create</KEYWORD2>
-			<KEYWORD2>msession_destroy</KEYWORD2>
-			<KEYWORD2>msession_disconnect</KEYWORD2>
-			<KEYWORD2>msession_find</KEYWORD2>
-			<KEYWORD2>msession_get</KEYWORD2>
-			<KEYWORD2>msession_get_array</KEYWORD2>
-			<KEYWORD2>msession_get_data</KEYWORD2>
-			<KEYWORD2>msession_inc</KEYWORD2>
-			<KEYWORD2>msession_list</KEYWORD2>
-			<KEYWORD2>msession_listvar</KEYWORD2>
-			<KEYWORD2>msession_lock</KEYWORD2>
-			<KEYWORD2>msession_plugin</KEYWORD2>
-			<KEYWORD2>msession_randstr</KEYWORD2>
-			<KEYWORD2>msession_set</KEYWORD2>
-			<KEYWORD2>msession_set_array</KEYWORD2>
-			<KEYWORD2>msession_set_data</KEYWORD2>
-			<KEYWORD2>msession_timeout</KEYWORD2>
-			<KEYWORD2>msession_uniq</KEYWORD2>
-			<KEYWORD2>msession_unlock</KEYWORD2>
-			<KEYWORD2>msg_get_queue</KEYWORD2>
-			<KEYWORD2>msg_receive</KEYWORD2>
-			<KEYWORD2>msg_remove_queue</KEYWORD2>
-			<KEYWORD2>msg_send</KEYWORD2>
-			<KEYWORD2>msg_set_queue</KEYWORD2>
-			<KEYWORD2>msg_stat_queue</KEYWORD2>
-			<KEYWORD2>msql</KEYWORD2>
-			<KEYWORD2>msql_affected_rows</KEYWORD2>
-			<KEYWORD2>msql_close</KEYWORD2>
-			<KEYWORD2>msql_connect</KEYWORD2>
-			<KEYWORD2>msql_create_db</KEYWORD2>
-			<KEYWORD2>msql_createdb</KEYWORD2>
-			<KEYWORD2>msql_data_seek</KEYWORD2>
-			<KEYWORD2>msql_db_query</KEYWORD2>
-			<KEYWORD2>msql_dbname</KEYWORD2>
-			<KEYWORD2>msql_drop_db</KEYWORD2>
-			<KEYWORD2>msql_error</KEYWORD2>
-			<KEYWORD2>msql_fetch_array</KEYWORD2>
-			<KEYWORD2>msql_fetch_field</KEYWORD2>
-			<KEYWORD2>msql_fetch_object</KEYWORD2>
-			<KEYWORD2>msql_fetch_row</KEYWORD2>
-			<KEYWORD2>msql_field_flags</KEYWORD2>
-			<KEYWORD2>msql_field_len</KEYWORD2>
-			<KEYWORD2>msql_field_name</KEYWORD2>
-			<KEYWORD2>msql_field_seek</KEYWORD2>
-			<KEYWORD2>msql_field_table</KEYWORD2>
-			<KEYWORD2>msql_field_type</KEYWORD2>
-			<KEYWORD2>msql_fieldflags</KEYWORD2>
-			<KEYWORD2>msql_fieldlen</KEYWORD2>
-			<KEYWORD2>msql_fieldname</KEYWORD2>
-			<KEYWORD2>msql_fieldtable</KEYWORD2>
-			<KEYWORD2>msql_fieldtype</KEYWORD2>
-			<KEYWORD2>msql_free_result</KEYWORD2>
-			<KEYWORD2>msql_list_dbs</KEYWORD2>
-			<KEYWORD2>msql_list_fields</KEYWORD2>
-			<KEYWORD2>msql_list_tables</KEYWORD2>
-			<KEYWORD2>msql_num_fields</KEYWORD2>
-			<KEYWORD2>msql_num_rows</KEYWORD2>
-			<KEYWORD2>msql_numfields</KEYWORD2>
-			<KEYWORD2>msql_numrows</KEYWORD2>
-			<KEYWORD2>msql_pconnect</KEYWORD2>
-			<KEYWORD2>msql_query</KEYWORD2>
-			<KEYWORD2>msql_regcase</KEYWORD2>
-			<KEYWORD2>msql_result</KEYWORD2>
-			<KEYWORD2>msql_select_db</KEYWORD2>
-			<KEYWORD2>msql_tablename</KEYWORD2>
-			<KEYWORD2>mssql_bind</KEYWORD2>
-			<KEYWORD2>mssql_close</KEYWORD2>
-			<KEYWORD2>mssql_connect</KEYWORD2>
-			<KEYWORD2>mssql_data_seek</KEYWORD2>
-			<KEYWORD2>mssql_execute</KEYWORD2>
-			<KEYWORD2>mssql_fetch_array</KEYWORD2>
-			<KEYWORD2>mssql_fetch_assoc</KEYWORD2>
-			<KEYWORD2>mssql_fetch_batch</KEYWORD2>
-			<KEYWORD2>mssql_fetch_field</KEYWORD2>
-			<KEYWORD2>mssql_fetch_object</KEYWORD2>
-			<KEYWORD2>mssql_fetch_row</KEYWORD2>
-			<KEYWORD2>mssql_field_length</KEYWORD2>
-			<KEYWORD2>mssql_field_name</KEYWORD2>
-			<KEYWORD2>mssql_field_seek</KEYWORD2>
-			<KEYWORD2>mssql_field_type</KEYWORD2>
-			<KEYWORD2>mssql_free_result</KEYWORD2>
-			<KEYWORD2>mssql_free_statement</KEYWORD2>
-			<KEYWORD2>mssql_get_last_message</KEYWORD2>
-			<KEYWORD2>mssql_guid_string</KEYWORD2>
-			<KEYWORD2>mssql_init</KEYWORD2>
-			<KEYWORD2>mssql_min_error_severity</KEYWORD2>
-			<KEYWORD2>mssql_min_message_severity</KEYWORD2>
-			<KEYWORD2>mssql_next_result</KEYWORD2>
-			<KEYWORD2>mssql_num_fields</KEYWORD2>
-			<KEYWORD2>mssql_num_rows</KEYWORD2>
-			<KEYWORD2>mssql_pconnect</KEYWORD2>
-			<KEYWORD2>mssql_query</KEYWORD2>
-			<KEYWORD2>mssql_result</KEYWORD2>
-			<KEYWORD2>mssql_rows_affected</KEYWORD2>
-			<KEYWORD2>mssql_select_db</KEYWORD2>
-			<KEYWORD2>mt_getrandmax</KEYWORD2>
-			<KEYWORD2>mt_rand</KEYWORD2>
-			<KEYWORD2>mt_srand</KEYWORD2>
-			<KEYWORD2>multcolor</KEYWORD2> <!-- swfdisplayitem -->
-			<KEYWORD2>muscat_close</KEYWORD2>
-			<KEYWORD2>muscat_get</KEYWORD2>
-			<KEYWORD2>muscat_give</KEYWORD2>
-			<KEYWORD2>muscat_setup</KEYWORD2>
-			<KEYWORD2>muscat_setup_net</KEYWORD2>
-			<KEYWORD2>mysql_affected_rows</KEYWORD2>
-			<KEYWORD2>mysql_change_user</KEYWORD2>
-			<KEYWORD2>mysql_client_encoding</KEYWORD2>
-			<KEYWORD2>mysql_close</KEYWORD2>
-			<KEYWORD2>mysql_connect</KEYWORD2>
-			<KEYWORD2>mysql_create_db</KEYWORD2>
-			<KEYWORD2>mysql_data_seek</KEYWORD2>
-			<KEYWORD2>mysql_db_name</KEYWORD2>
-			<KEYWORD2>mysql_db_query</KEYWORD2>
-			<KEYWORD2>mysql_drop_db</KEYWORD2>
-			<KEYWORD2>mysql_errno</KEYWORD2>
-			<KEYWORD2>mysql_error</KEYWORD2>
-			<KEYWORD2>mysql_escape_string</KEYWORD2>
-			<KEYWORD2>mysql_fetch_array</KEYWORD2>
-			<KEYWORD2>mysql_fetch_assoc</KEYWORD2>
-			<KEYWORD2>mysql_fetch_field</KEYWORD2>
-			<KEYWORD2>mysql_fetch_lengths</KEYWORD2>
-			<KEYWORD2>mysql_fetch_object</KEYWORD2>
-			<KEYWORD2>mysql_fetch_row</KEYWORD2>
-			<KEYWORD2>mysql_field_flags</KEYWORD2>
-			<KEYWORD2>mysql_field_len</KEYWORD2>
-			<KEYWORD2>mysql_field_name</KEYWORD2>
-			<KEYWORD2>mysql_field_seek</KEYWORD2>
-			<KEYWORD2>mysql_field_table</KEYWORD2>
-			<KEYWORD2>mysql_field_type</KEYWORD2>
-			<KEYWORD2>mysql_free_result</KEYWORD2>
-			<KEYWORD2>mysql_get_client_info</KEYWORD2>
-			<KEYWORD2>mysql_get_host_info</KEYWORD2>
-			<KEYWORD2>mysql_get_proto_info</KEYWORD2>
-			<KEYWORD2>mysql_get_server_info</KEYWORD2>
-			<KEYWORD2>mysql_info</KEYWORD2>
-			<KEYWORD2>mysql_insert_id</KEYWORD2>
-			<KEYWORD2>mysql_list_dbs</KEYWORD2>
-			<KEYWORD2>mysql_list_fields</KEYWORD2>
-			<KEYWORD2>mysql_list_processes</KEYWORD2>
-			<KEYWORD2>mysql_list_tables</KEYWORD2>
-			<KEYWORD2>mysql_num_fields</KEYWORD2>
-			<KEYWORD2>mysql_num_rows</KEYWORD2>
-			<KEYWORD2>mysql_pconnect</KEYWORD2>
-			<KEYWORD2>mysql_ping</KEYWORD2>
-			<KEYWORD2>mysql_query</KEYWORD2>
-			<KEYWORD2>mysql_real_escape_string</KEYWORD2>
-			<KEYWORD2>mysql_result</KEYWORD2>
-			<KEYWORD2>mysql_select_db</KEYWORD2>
-			<KEYWORD2>mysql_stat</KEYWORD2>
-			<KEYWORD2>mysql_tablename</KEYWORD2>
-			<KEYWORD2>mysql_thread_id</KEYWORD2>
-			<KEYWORD2>mysql_unbuffered_query</KEYWORD2>
-			<KEYWORD2>mysqli_affected_rows</KEYWORD2>
-			<KEYWORD2>mysqli_autocommit</KEYWORD2>
-			<KEYWORD2>mysqli_bind_param</KEYWORD2>
-			<KEYWORD2>mysqli_bind_result</KEYWORD2>
-			<KEYWORD2>mysqli_change_user</KEYWORD2>
-			<KEYWORD2>mysqli_character_set_name</KEYWORD2>
-			<KEYWORD2>mysqli_client_encoding</KEYWORD2>
-			<KEYWORD2>mysqli_close</KEYWORD2>
-			<KEYWORD2>mysqli_commit</KEYWORD2>
-			<KEYWORD2>mysqli_connect</KEYWORD2>
-			<KEYWORD2>mysqli_connect_errno</KEYWORD2>
-			<KEYWORD2>mysqli_connect_error</KEYWORD2>
-			<KEYWORD2>mysqli_data_seek</KEYWORD2>
-			<KEYWORD2>mysqli_debug</KEYWORD2>
-			<KEYWORD2>mysqli_disable_reads_from_master</KEYWORD2>
-			<KEYWORD2>mysqli_disable_rpl_parse</KEYWORD2>
-			<KEYWORD2>mysqli_dump_debug_info</KEYWORD2>
-			<KEYWORD2>mysqli_embedded_connect</KEYWORD2>
-			<KEYWORD2>mysqli_enable_reads_from_master</KEYWORD2>
-			<KEYWORD2>mysqli_enable_rpl_parse</KEYWORD2>
-			<KEYWORD2>mysqli_errno</KEYWORD2>
-			<KEYWORD2>mysqli_error</KEYWORD2>
-			<KEYWORD2>mysqli_escape_string</KEYWORD2>
-			<KEYWORD2>mysqli_execute</KEYWORD2>
-			<KEYWORD2>mysqli_fetch</KEYWORD2>
-			<KEYWORD2>mysqli_fetch_array</KEYWORD2>
-			<KEYWORD2>mysqli_fetch_assoc</KEYWORD2>
-			<KEYWORD2>mysqli_fetch_field</KEYWORD2>
-			<KEYWORD2>mysqli_fetch_field_direct</KEYWORD2>
-			<KEYWORD2>mysqli_fetch_fields</KEYWORD2>
-			<KEYWORD2>mysqli_fetch_lengths</KEYWORD2>
-			<KEYWORD2>mysqli_fetch_object</KEYWORD2>
-			<KEYWORD2>mysqli_fetch_row</KEYWORD2>
-			<KEYWORD2>mysqli_field_count</KEYWORD2>
-			<KEYWORD2>mysqli_field_seek</KEYWORD2>
-			<KEYWORD2>mysqli_field_tell</KEYWORD2>
-			<KEYWORD2>mysqli_free_result</KEYWORD2>
-			<KEYWORD2>mysqli_get_client_info</KEYWORD2>
-			<KEYWORD2>mysqli_get_client_version</KEYWORD2>
-			<KEYWORD2>mysqli_get_host_info</KEYWORD2>
-			<KEYWORD2>mysqli_get_metadata</KEYWORD2>
-			<KEYWORD2>mysqli_get_proto_info</KEYWORD2>
-			<KEYWORD2>mysqli_get_server_info</KEYWORD2>
-			<KEYWORD2>mysqli_get_server_version</KEYWORD2>
-			<KEYWORD2>mysqli_info</KEYWORD2>
-			<KEYWORD2>mysqli_init</KEYWORD2>
-			<KEYWORD2>mysqli_insert_id</KEYWORD2>
-			<KEYWORD2>mysqli_kill</KEYWORD2>
-			<KEYWORD2>mysqli_master_query</KEYWORD2>
-			<KEYWORD2>mysqli_more_results</KEYWORD2>
-			<KEYWORD2>mysqli_multi_query</KEYWORD2>
-			<KEYWORD2>mysqli_next_result</KEYWORD2>
-			<KEYWORD2>mysqli_num_fields</KEYWORD2>
-			<KEYWORD2>mysqli_num_rows</KEYWORD2>
-			<KEYWORD2>mysqli_options</KEYWORD2>
-			<KEYWORD2>mysqli_param_count</KEYWORD2>
-			<KEYWORD2>mysqli_ping</KEYWORD2>
-			<KEYWORD2>mysqli_prepare</KEYWORD2>
-			<KEYWORD2>mysqli_query</KEYWORD2>
-			<KEYWORD2>mysqli_real_connect</KEYWORD2>
-			<KEYWORD2>mysqli_real_escape_string</KEYWORD2>
-			<KEYWORD2>mysqli_real_query</KEYWORD2>
-			<KEYWORD2>mysqli_report</KEYWORD2>
-			<KEYWORD2>mysqli_rollback</KEYWORD2>
-			<KEYWORD2>mysqli_rpl_parse_enabled</KEYWORD2>
-			<KEYWORD2>mysqli_rpl_probe</KEYWORD2>
-			<KEYWORD2>mysqli_rpl_query_type</KEYWORD2>
-			<KEYWORD2>mysqli_select_db</KEYWORD2>
-			<KEYWORD2>mysqli_send_long_data</KEYWORD2>
-			<KEYWORD2>mysqli_send_query</KEYWORD2>
-			<KEYWORD2>mysqli_server_end</KEYWORD2>
-			<KEYWORD2>mysqli_server_init</KEYWORD2>
-			<KEYWORD2>mysqli_set_opt</KEYWORD2>
-			<KEYWORD2>mysqli_sqlstate</KEYWORD2>
-			<KEYWORD2>mysqli_ssl_set</KEYWORD2>
-			<KEYWORD2>mysqli_stat</KEYWORD2>
-			<KEYWORD2>mysqli_stmt_affected_rows</KEYWORD2>
-			<KEYWORD2>mysqli_stmt_bind_param</KEYWORD2>
-			<KEYWORD2>mysqli_stmt_bind_result</KEYWORD2>
-			<KEYWORD2>mysqli_stmt_close</KEYWORD2>
-			<KEYWORD2>mysqli_stmt_data_seek</KEYWORD2>
-			<KEYWORD2>mysqli_stmt_errno</KEYWORD2>
-			<KEYWORD2>mysqli_stmt_error</KEYWORD2>
-			<KEYWORD2>mysqli_stmt_execute</KEYWORD2>
-			<KEYWORD2>mysqli_stmt_fetch</KEYWORD2>
-			<KEYWORD2>mysqli_stmt_free_result</KEYWORD2>
-			<KEYWORD2>mysqli_stmt_init</KEYWORD2>
-			<KEYWORD2>mysqli_stmt_num_rows</KEYWORD2>
-			<KEYWORD2>mysqli_stmt_param_count</KEYWORD2>
-			<KEYWORD2>mysqli_stmt_prepare</KEYWORD2>
-			<KEYWORD2>mysqli_stmt_reset</KEYWORD2>
-			<KEYWORD2>mysqli_stmt_result_metadata</KEYWORD2>
-			<KEYWORD2>mysqli_stmt_send_long_data</KEYWORD2>
-			<KEYWORD2>mysqli_stmt_sqlstate</KEYWORD2>
-			<KEYWORD2>mysqli_stmt_store_result</KEYWORD2>
-			<KEYWORD2>mysqli_store_result</KEYWORD2>
-			<KEYWORD2>mysqli_thread_id</KEYWORD2>
-			<KEYWORD2>mysqli_thread_safe</KEYWORD2>
-			<KEYWORD2>mysqli_use_result</KEYWORD2>
-			<KEYWORD2>mysqli_warning_count</KEYWORD2>
-			<KEYWORD2>name</KEYWORD2> <!-- domattribute, domdocumenttype -->
-			<KEYWORD2>natcasesort</KEYWORD2>
-			<KEYWORD2>natsort</KEYWORD2>
-			<KEYWORD2>ncurses_addch</KEYWORD2>
-			<KEYWORD2>ncurses_addchnstr</KEYWORD2>
-			<KEYWORD2>ncurses_addchstr</KEYWORD2>
-			<KEYWORD2>ncurses_addnstr</KEYWORD2>
-			<KEYWORD2>ncurses_addstr</KEYWORD2>
-			<KEYWORD2>ncurses_assume_default_colors</KEYWORD2>
-			<KEYWORD2>ncurses_attroff</KEYWORD2>
-			<KEYWORD2>ncurses_attron</KEYWORD2>
-			<KEYWORD2>ncurses_attrset</KEYWORD2>
-			<KEYWORD2>ncurses_baudrate</KEYWORD2>
-			<KEYWORD2>ncurses_beep</KEYWORD2>
-			<KEYWORD2>ncurses_bkgd</KEYWORD2>
-			<KEYWORD2>ncurses_bkgdset</KEYWORD2>
-			<KEYWORD2>ncurses_border</KEYWORD2>
-			<KEYWORD2>ncurses_bottom_panel</KEYWORD2>
-			<KEYWORD2>ncurses_can_change_color</KEYWORD2>
-			<KEYWORD2>ncurses_cbreak</KEYWORD2>
-			<KEYWORD2>ncurses_clear</KEYWORD2>
-			<KEYWORD2>ncurses_clrtobot</KEYWORD2>
-			<KEYWORD2>ncurses_clrtoeol</KEYWORD2>
-			<KEYWORD2>ncurses_color_content</KEYWORD2>
-			<KEYWORD2>ncurses_color_set</KEYWORD2>
-			<KEYWORD2>ncurses_curs_set</KEYWORD2>
-			<KEYWORD2>ncurses_def_prog_mode</KEYWORD2>
-			<KEYWORD2>ncurses_def_shell_mode</KEYWORD2>
-			<KEYWORD2>ncurses_define_key</KEYWORD2>
-			<KEYWORD2>ncurses_del_panel</KEYWORD2>
-			<KEYWORD2>ncurses_delay_output</KEYWORD2>
-			<KEYWORD2>ncurses_delch</KEYWORD2>
-			<KEYWORD2>ncurses_deleteln</KEYWORD2>
-			<KEYWORD2>ncurses_delwin</KEYWORD2>
-			<KEYWORD2>ncurses_doupdate</KEYWORD2>
-			<KEYWORD2>ncurses_echo</KEYWORD2>
-			<KEYWORD2>ncurses_echochar</KEYWORD2>
-			<KEYWORD2>ncurses_end</KEYWORD2>
-			<KEYWORD2>ncurses_erase</KEYWORD2>
-			<KEYWORD2>ncurses_erasechar</KEYWORD2>
-			<KEYWORD2>ncurses_filter</KEYWORD2>
-			<KEYWORD2>ncurses_flash</KEYWORD2>
-			<KEYWORD2>ncurses_flushinp</KEYWORD2>
-			<KEYWORD2>ncurses_getch</KEYWORD2>
-			<KEYWORD2>ncurses_getmaxyx</KEYWORD2>
-			<KEYWORD2>ncurses_getmouse</KEYWORD2>
-			<KEYWORD2>ncurses_getyx</KEYWORD2>
-			<KEYWORD2>ncurses_halfdelay</KEYWORD2>
-			<KEYWORD2>ncurses_has_colors</KEYWORD2>
-			<KEYWORD2>ncurses_has_ic</KEYWORD2>
-			<KEYWORD2>ncurses_has_il</KEYWORD2>
-			<KEYWORD2>ncurses_has_key</KEYWORD2>
-			<KEYWORD2>ncurses_hide_panel</KEYWORD2>
-			<KEYWORD2>ncurses_hline</KEYWORD2>
-			<KEYWORD2>ncurses_inch</KEYWORD2>
-			<KEYWORD2>ncurses_init</KEYWORD2>
-			<KEYWORD2>ncurses_init_color</KEYWORD2>
-			<KEYWORD2>ncurses_init_pair</KEYWORD2>
-			<KEYWORD2>ncurses_insch</KEYWORD2>
-			<KEYWORD2>ncurses_insdelln</KEYWORD2>
-			<KEYWORD2>ncurses_insertln</KEYWORD2>
-			<KEYWORD2>ncurses_insstr</KEYWORD2>
-			<KEYWORD2>ncurses_instr</KEYWORD2>
-			<KEYWORD2>ncurses_isendwin</KEYWORD2>
-			<KEYWORD2>ncurses_keyok</KEYWORD2>
-			<KEYWORD2>ncurses_keypad</KEYWORD2>
-			<KEYWORD2>ncurses_killchar</KEYWORD2>
-			<KEYWORD2>ncurses_longname</KEYWORD2>
-			<KEYWORD2>ncurses_meta</KEYWORD2>
-			<KEYWORD2>ncurses_mouse_trafo</KEYWORD2>
-			<KEYWORD2>ncurses_mouseinterval</KEYWORD2>
-			<KEYWORD2>ncurses_mousemask</KEYWORD2>
-			<KEYWORD2>ncurses_move</KEYWORD2>
-			<KEYWORD2>ncurses_move_panel</KEYWORD2>
-			<KEYWORD2>ncurses_mvaddch</KEYWORD2>
-			<KEYWORD2>ncurses_mvaddchnstr</KEYWORD2>
-			<KEYWORD2>ncurses_mvaddchstr</KEYWORD2>
-			<KEYWORD2>ncurses_mvaddnstr</KEYWORD2>
-			<KEYWORD2>ncurses_mvaddstr</KEYWORD2>
-			<KEYWORD2>ncurses_mvcur</KEYWORD2>
-			<KEYWORD2>ncurses_mvdelch</KEYWORD2>
-			<KEYWORD2>ncurses_mvgetch</KEYWORD2>
-			<KEYWORD2>ncurses_mvhline</KEYWORD2>
-			<KEYWORD2>ncurses_mvinch</KEYWORD2>
-			<KEYWORD2>ncurses_mvvline</KEYWORD2>
-			<KEYWORD2>ncurses_mvwaddstr</KEYWORD2>
-			<KEYWORD2>ncurses_napms</KEYWORD2>
-			<KEYWORD2>ncurses_new_panel</KEYWORD2>
-			<KEYWORD2>ncurses_newpad</KEYWORD2>
-			<KEYWORD2>ncurses_newwin</KEYWORD2>
-			<KEYWORD2>ncurses_nl</KEYWORD2>
-			<KEYWORD2>ncurses_nocbreak</KEYWORD2>
-			<KEYWORD2>ncurses_noecho</KEYWORD2>
-			<KEYWORD2>ncurses_nonl</KEYWORD2>
-			<KEYWORD2>ncurses_noqiflush</KEYWORD2>
-			<KEYWORD2>ncurses_noraw</KEYWORD2>
-			<KEYWORD2>ncurses_pair_content</KEYWORD2>
-			<KEYWORD2>ncurses_panel_above</KEYWORD2>
-			<KEYWORD2>ncurses_panel_below</KEYWORD2>
-			<KEYWORD2>ncurses_panel_window</KEYWORD2>
-			<KEYWORD2>ncurses_pnoutrefresh</KEYWORD2>
-			<KEYWORD2>ncurses_prefresh</KEYWORD2>
-			<KEYWORD2>ncurses_putp</KEYWORD2>
-			<KEYWORD2>ncurses_qiflush</KEYWORD2>
-			<KEYWORD2>ncurses_raw</KEYWORD2>
-			<KEYWORD2>ncurses_refresh</KEYWORD2>
-			<KEYWORD2>ncurses_replace_panel</KEYWORD2>
-			<KEYWORD2>ncurses_reset_prog_mode</KEYWORD2>
-			<KEYWORD2>ncurses_reset_shell_mode</KEYWORD2>
-			<KEYWORD2>ncurses_resetty</KEYWORD2>
-			<KEYWORD2>ncurses_savetty</KEYWORD2>
-			<KEYWORD2>ncurses_scr_dump</KEYWORD2>
-			<KEYWORD2>ncurses_scr_init</KEYWORD2>
-			<KEYWORD2>ncurses_scr_restore</KEYWORD2>
-			<KEYWORD2>ncurses_scr_set</KEYWORD2>
-			<KEYWORD2>ncurses_scrl</KEYWORD2>
-			<KEYWORD2>ncurses_show_panel</KEYWORD2>
-			<KEYWORD2>ncurses_slk_attr</KEYWORD2>
-			<KEYWORD2>ncurses_slk_attroff</KEYWORD2>
-			<KEYWORD2>ncurses_slk_attron</KEYWORD2>
-			<KEYWORD2>ncurses_slk_attrset</KEYWORD2>
-			<KEYWORD2>ncurses_slk_clear</KEYWORD2>
-			<KEYWORD2>ncurses_slk_color</KEYWORD2>
-			<KEYWORD2>ncurses_slk_init</KEYWORD2>
-			<KEYWORD2>ncurses_slk_noutrefresh</KEYWORD2>
-			<KEYWORD2>ncurses_slk_refresh</KEYWORD2>
-			<KEYWORD2>ncurses_slk_restore</KEYWORD2>
-			<KEYWORD2>ncurses_slk_set</KEYWORD2>
-			<KEYWORD2>ncurses_slk_touch</KEYWORD2>
-			<KEYWORD2>ncurses_standend</KEYWORD2>
-			<KEYWORD2>ncurses_standout</KEYWORD2>
-			<KEYWORD2>ncurses_start_color</KEYWORD2>
-			<KEYWORD2>ncurses_termattrs</KEYWORD2>
-			<KEYWORD2>ncurses_termname</KEYWORD2>
-			<KEYWORD2>ncurses_timeout</KEYWORD2>
-			<KEYWORD2>ncurses_top_panel</KEYWORD2>
-			<KEYWORD2>ncurses_typeahead</KEYWORD2>
-			<KEYWORD2>ncurses_ungetch</KEYWORD2>
-			<KEYWORD2>ncurses_ungetmouse</KEYWORD2>
-			<KEYWORD2>ncurses_update_panels</KEYWORD2>
-			<KEYWORD2>ncurses_use_default_colors</KEYWORD2>
-			<KEYWORD2>ncurses_use_env</KEYWORD2>
-			<KEYWORD2>ncurses_use_extended_names</KEYWORD2>
-			<KEYWORD2>ncurses_vidattr</KEYWORD2>
-			<KEYWORD2>ncurses_vline</KEYWORD2>
-			<KEYWORD2>ncurses_waddch</KEYWORD2>
-			<KEYWORD2>ncurses_waddstr</KEYWORD2>
-			<KEYWORD2>ncurses_wattroff</KEYWORD2>
-			<KEYWORD2>ncurses_wattron</KEYWORD2>
-			<KEYWORD2>ncurses_wattrset</KEYWORD2>
-			<KEYWORD2>ncurses_wborder</KEYWORD2>
-			<KEYWORD2>ncurses_wclear</KEYWORD2>
-			<KEYWORD2>ncurses_wcolor_set</KEYWORD2>
-			<KEYWORD2>ncurses_werase</KEYWORD2>
-			<KEYWORD2>ncurses_wgetch</KEYWORD2>
-			<KEYWORD2>ncurses_whline</KEYWORD2>
-			<KEYWORD2>ncurses_wmouse_trafo</KEYWORD2>
-			<KEYWORD2>ncurses_wmove</KEYWORD2>
-			<KEYWORD2>ncurses_wnoutrefresh</KEYWORD2>
-			<KEYWORD2>ncurses_wrefresh</KEYWORD2>
-			<KEYWORD2>ncurses_wstandend</KEYWORD2>
-			<KEYWORD2>ncurses_wstandout</KEYWORD2>
-			<KEYWORD2>ncurses_wvline</KEYWORD2>
-			<KEYWORD2>next</KEYWORD2> <!-- arrayiterator, cachingiterator, directoryiterator, filteriterator, limititerator, parentiterator, recursivedirectoryiterator, recursiveiteratoriterator, simplexmliterator, tidy_node -->
-			<KEYWORD2>next_sibling</KEYWORD2> <!-- domnode -->
-			<KEYWORD2>nextframe</KEYWORD2> <!-- swfmovie, swfsprite -->
-			<KEYWORD2>ngettext</KEYWORD2>
-			<KEYWORD2>nl2br</KEYWORD2>
-			<KEYWORD2>nl_langinfo</KEYWORD2>
-			<KEYWORD2>node_name</KEYWORD2> <!-- domnode -->
-			<KEYWORD2>node_type</KEYWORD2> <!-- domnode -->
-			<KEYWORD2>node_value</KEYWORD2> <!-- domnode -->
-			<KEYWORD2>normalize</KEYWORD2> <!-- domdocument, domnode -->
-			<KEYWORD2>notations</KEYWORD2> <!-- domdocumenttype -->
-			<KEYWORD2>notes_body</KEYWORD2>
-			<KEYWORD2>notes_copy_db</KEYWORD2>
-			<KEYWORD2>notes_create_db</KEYWORD2>
-			<KEYWORD2>notes_create_note</KEYWORD2>
-			<KEYWORD2>notes_drop_db</KEYWORD2>
-			<KEYWORD2>notes_find_note</KEYWORD2>
-			<KEYWORD2>notes_header_info</KEYWORD2>
-			<KEYWORD2>notes_list_msgs</KEYWORD2>
-			<KEYWORD2>notes_mark_read</KEYWORD2>
-			<KEYWORD2>notes_mark_unread</KEYWORD2>
-			<KEYWORD2>notes_nav_create</KEYWORD2>
-			<KEYWORD2>notes_search</KEYWORD2>
-			<KEYWORD2>notes_unread</KEYWORD2>
-			<KEYWORD2>notes_version</KEYWORD2>
-			<KEYWORD2>nsapi_request_headers</KEYWORD2>
-			<KEYWORD2>nsapi_response_headers</KEYWORD2>
-			<KEYWORD2>nsapi_virtual</KEYWORD2>
-			<KEYWORD2>number_format</KEYWORD2>
-			<KEYWORD2>ob_clean</KEYWORD2>
-			<KEYWORD2>ob_end_clean</KEYWORD2>
-			<KEYWORD2>ob_end_flush</KEYWORD2>
-			<KEYWORD2>ob_flush</KEYWORD2>
-			<KEYWORD2>ob_get_clean</KEYWORD2>
-			<KEYWORD2>ob_get_contents</KEYWORD2>
-			<KEYWORD2>ob_get_flush</KEYWORD2>
-			<KEYWORD2>ob_get_length</KEYWORD2>
-			<KEYWORD2>ob_get_level</KEYWORD2>
-			<KEYWORD2>ob_get_status</KEYWORD2>
-			<KEYWORD2>ob_gzhandler</KEYWORD2>
-			<KEYWORD2>ob_iconv_handler</KEYWORD2>
-			<KEYWORD2>ob_implicit_flush</KEYWORD2>
-			<KEYWORD2>ob_list_handlers</KEYWORD2>
-			<KEYWORD2>ob_start</KEYWORD2>
-			<KEYWORD2>ob_tidyhandler</KEYWORD2>
-			<KEYWORD2>object</KEYWORD2> <!-- hw_api -->
-			<KEYWORD2>objectbyanchor</KEYWORD2> <!-- hw_api -->
-			<KEYWORD2>oci_bind_by_name</KEYWORD2>
-			<KEYWORD2>oci_cancel</KEYWORD2>
-			<KEYWORD2>oci_close</KEYWORD2>
-			<KEYWORD2>oci_commit</KEYWORD2>
-			<KEYWORD2>oci_connect</KEYWORD2>
-			<KEYWORD2>oci_define_by_name</KEYWORD2>
-			<KEYWORD2>oci_error</KEYWORD2>
-			<KEYWORD2>oci_execute</KEYWORD2>
-			<KEYWORD2>oci_fetch</KEYWORD2>
-			<KEYWORD2>oci_fetch_all</KEYWORD2>
-			<KEYWORD2>oci_fetch_array</KEYWORD2>
-			<KEYWORD2>oci_fetch_assoc</KEYWORD2>
-			<KEYWORD2>oci_fetch_object</KEYWORD2>
-			<KEYWORD2>oci_fetch_row</KEYWORD2>
-			<KEYWORD2>oci_field_is_null</KEYWORD2>
-			<KEYWORD2>oci_field_name</KEYWORD2>
-			<KEYWORD2>oci_field_precision</KEYWORD2>
-			<KEYWORD2>oci_field_scale</KEYWORD2>
-			<KEYWORD2>oci_field_size</KEYWORD2>
-			<KEYWORD2>oci_field_type</KEYWORD2>
-			<KEYWORD2>oci_field_type_raw</KEYWORD2>
-			<KEYWORD2>oci_free_statement</KEYWORD2>
-			<KEYWORD2>oci_internal_debug</KEYWORD2>
-			<KEYWORD2>oci_lob_copy</KEYWORD2>
-			<KEYWORD2>oci_lob_is_equal</KEYWORD2>
-			<KEYWORD2>oci_new_collection</KEYWORD2>
-			<KEYWORD2>oci_new_connect</KEYWORD2>
-			<KEYWORD2>oci_new_cursor</KEYWORD2>
-			<KEYWORD2>oci_new_descriptor</KEYWORD2>
-			<KEYWORD2>oci_num_fields</KEYWORD2>
-			<KEYWORD2>oci_num_rows</KEYWORD2>
-			<KEYWORD2>oci_parse</KEYWORD2>
-			<KEYWORD2>oci_password_change</KEYWORD2>
-			<KEYWORD2>oci_pconnect</KEYWORD2>
-			<KEYWORD2>oci_result</KEYWORD2>
-			<KEYWORD2>oci_rollback</KEYWORD2>
-			<KEYWORD2>oci_server_version</KEYWORD2>
-			<KEYWORD2>oci_set_prefetch</KEYWORD2>
-			<KEYWORD2>oci_statement_type</KEYWORD2>
-			<KEYWORD2>ocibindbyname</KEYWORD2>
-			<KEYWORD2>ocicancel</KEYWORD2>
-			<KEYWORD2>ocicloselob</KEYWORD2>
-			<KEYWORD2>ocicollappend</KEYWORD2>
-			<KEYWORD2>ocicollassign</KEYWORD2>
-			<KEYWORD2>ocicollassignelem</KEYWORD2>
-			<KEYWORD2>ocicollgetelem</KEYWORD2>
-			<KEYWORD2>ocicollmax</KEYWORD2>
-			<KEYWORD2>ocicollsize</KEYWORD2>
-			<KEYWORD2>ocicolltrim</KEYWORD2>
-			<KEYWORD2>ocicolumnisnull</KEYWORD2>
-			<KEYWORD2>ocicolumnname</KEYWORD2>
-			<KEYWORD2>ocicolumnprecision</KEYWORD2>
-			<KEYWORD2>ocicolumnscale</KEYWORD2>
-			<KEYWORD2>ocicolumnsize</KEYWORD2>
-			<KEYWORD2>ocicolumntype</KEYWORD2>
-			<KEYWORD2>ocicolumntyperaw</KEYWORD2>
-			<KEYWORD2>ocicommit</KEYWORD2>
-			<KEYWORD2>ocidefinebyname</KEYWORD2>
-			<KEYWORD2>ocierror</KEYWORD2>
-			<KEYWORD2>ociexecute</KEYWORD2>
-			<KEYWORD2>ocifetch</KEYWORD2>
-			<KEYWORD2>ocifetchinto</KEYWORD2>
-			<KEYWORD2>ocifetchstatement</KEYWORD2>
-			<KEYWORD2>ocifreecollection</KEYWORD2>
-			<KEYWORD2>ocifreecursor</KEYWORD2>
-			<KEYWORD2>ocifreedesc</KEYWORD2>
-			<KEYWORD2>ocifreestatement</KEYWORD2>
-			<KEYWORD2>ociinternaldebug</KEYWORD2>
-			<KEYWORD2>ociloadlob</KEYWORD2>
-			<KEYWORD2>ocilogoff</KEYWORD2>
-			<KEYWORD2>ocilogon</KEYWORD2>
-			<KEYWORD2>ocinewcollection</KEYWORD2>
-			<KEYWORD2>ocinewcursor</KEYWORD2>
-			<KEYWORD2>ocinewdescriptor</KEYWORD2>
-			<KEYWORD2>ocinlogon</KEYWORD2>
-			<KEYWORD2>ocinumcols</KEYWORD2>
-			<KEYWORD2>ociparse</KEYWORD2>
-			<KEYWORD2>ociplogon</KEYWORD2>
-			<KEYWORD2>ociresult</KEYWORD2>
-			<KEYWORD2>ocirollback</KEYWORD2>
-			<KEYWORD2>ocirowcount</KEYWORD2>
-			<KEYWORD2>ocisavelob</KEYWORD2>
-			<KEYWORD2>ocisavelobfile</KEYWORD2>
-			<KEYWORD2>ociserverversion</KEYWORD2>
-			<KEYWORD2>ocisetprefetch</KEYWORD2>
-			<KEYWORD2>ocistatementtype</KEYWORD2>
-			<KEYWORD2>ociwritelobtofile</KEYWORD2>
-			<KEYWORD2>ociwritetemporarylob</KEYWORD2>
-			<KEYWORD2>octdec</KEYWORD2>
-			<KEYWORD2>odbc_autocommit</KEYWORD2>
-			<KEYWORD2>odbc_binmode</KEYWORD2>
-			<KEYWORD2>odbc_close</KEYWORD2>
-			<KEYWORD2>odbc_close_all</KEYWORD2>
-			<KEYWORD2>odbc_columnprivileges</KEYWORD2>
-			<KEYWORD2>odbc_columns</KEYWORD2>
-			<KEYWORD2>odbc_commit</KEYWORD2>
-			<KEYWORD2>odbc_connect</KEYWORD2>
-			<KEYWORD2>odbc_cursor</KEYWORD2>
-			<KEYWORD2>odbc_data_source</KEYWORD2>
-			<KEYWORD2>odbc_do</KEYWORD2>
-			<KEYWORD2>odbc_error</KEYWORD2>
-			<KEYWORD2>odbc_errormsg</KEYWORD2>
-			<KEYWORD2>odbc_exec</KEYWORD2>
-			<KEYWORD2>odbc_execute</KEYWORD2>
-			<KEYWORD2>odbc_fetch_array</KEYWORD2>
-			<KEYWORD2>odbc_fetch_into</KEYWORD2>
-			<KEYWORD2>odbc_fetch_object</KEYWORD2>
-			<KEYWORD2>odbc_fetch_row</KEYWORD2>
-			<KEYWORD2>odbc_field_len</KEYWORD2>
-			<KEYWORD2>odbc_field_name</KEYWORD2>
-			<KEYWORD2>odbc_field_num</KEYWORD2>
-			<KEYWORD2>odbc_field_precision</KEYWORD2>
-			<KEYWORD2>odbc_field_scale</KEYWORD2>
-			<KEYWORD2>odbc_field_type</KEYWORD2>
-			<KEYWORD2>odbc_foreignkeys</KEYWORD2>
-			<KEYWORD2>odbc_free_result</KEYWORD2>
-			<KEYWORD2>odbc_gettypeinfo</KEYWORD2>
-			<KEYWORD2>odbc_longreadlen</KEYWORD2>
-			<KEYWORD2>odbc_next_result</KEYWORD2>
-			<KEYWORD2>odbc_num_fields</KEYWORD2>
-			<KEYWORD2>odbc_num_rows</KEYWORD2>
-			<KEYWORD2>odbc_pconnect</KEYWORD2>
-			<KEYWORD2>odbc_prepare</KEYWORD2>
-			<KEYWORD2>odbc_primarykeys</KEYWORD2>
-			<KEYWORD2>odbc_procedurecolumns</KEYWORD2>
-			<KEYWORD2>odbc_procedures</KEYWORD2>
-			<KEYWORD2>odbc_result</KEYWORD2>
-			<KEYWORD2>odbc_result_all</KEYWORD2>
-			<KEYWORD2>odbc_rollback</KEYWORD2>
-			<KEYWORD2>odbc_setoption</KEYWORD2>
-			<KEYWORD2>odbc_specialcolumns</KEYWORD2>
-			<KEYWORD2>odbc_statistics</KEYWORD2>
-			<KEYWORD2>odbc_tableprivileges</KEYWORD2>
-			<KEYWORD2>odbc_tables</KEYWORD2>
-			<KEYWORD2>offsetexists</KEYWORD2> <!-- arrayobject -->
-			<KEYWORD2>offsetget</KEYWORD2> <!-- arrayobject -->
-			<KEYWORD2>offsetset</KEYWORD2> <!-- arrayobject -->
-			<KEYWORD2>offsetunset</KEYWORD2> <!-- arrayobject -->
-			<KEYWORD2>openal_buffer_create</KEYWORD2>
-			<KEYWORD2>openal_buffer_data</KEYWORD2>
-			<KEYWORD2>openal_buffer_destroy</KEYWORD2>
-			<KEYWORD2>openal_buffer_get</KEYWORD2>
-			<KEYWORD2>openal_buffer_loadwav</KEYWORD2>
-			<KEYWORD2>openal_context_create</KEYWORD2>
-			<KEYWORD2>openal_context_current</KEYWORD2>
-			<KEYWORD2>openal_context_destroy</KEYWORD2>
-			<KEYWORD2>openal_context_process</KEYWORD2>
-			<KEYWORD2>openal_context_suspend</KEYWORD2>
-			<KEYWORD2>openal_device_close</KEYWORD2>
-			<KEYWORD2>openal_device_open</KEYWORD2>
-			<KEYWORD2>openal_listener_get</KEYWORD2>
-			<KEYWORD2>openal_listener_set</KEYWORD2>
-			<KEYWORD2>openal_source_create</KEYWORD2>
-			<KEYWORD2>openal_source_destroy</KEYWORD2>
-			<KEYWORD2>openal_source_get</KEYWORD2>
-			<KEYWORD2>openal_source_pause</KEYWORD2>
-			<KEYWORD2>openal_source_play</KEYWORD2>
-			<KEYWORD2>openal_source_rewind</KEYWORD2>
-			<KEYWORD2>openal_source_set</KEYWORD2>
-			<KEYWORD2>openal_source_stop</KEYWORD2>
-			<KEYWORD2>openal_stream</KEYWORD2>
-			<KEYWORD2>opendir</KEYWORD2>
-			<KEYWORD2>openlog</KEYWORD2>
-			<KEYWORD2>openssl_csr_export</KEYWORD2>
-			<KEYWORD2>openssl_csr_export_to_file</KEYWORD2>
-			<KEYWORD2>openssl_csr_new</KEYWORD2>
-			<KEYWORD2>openssl_csr_sign</KEYWORD2>
-			<KEYWORD2>openssl_error_string</KEYWORD2>
-			<KEYWORD2>openssl_free_key</KEYWORD2>
-			<KEYWORD2>openssl_get_privatekey</KEYWORD2>
-			<KEYWORD2>openssl_get_publickey</KEYWORD2>
-			<KEYWORD2>openssl_open</KEYWORD2>
-			<KEYWORD2>openssl_pkcs7_decrypt</KEYWORD2>
-			<KEYWORD2>openssl_pkcs7_encrypt</KEYWORD2>
-			<KEYWORD2>openssl_pkcs7_sign</KEYWORD2>
-			<KEYWORD2>openssl_pkcs7_verify</KEYWORD2>
-			<KEYWORD2>openssl_pkey_export</KEYWORD2>
-			<KEYWORD2>openssl_pkey_export_to_file</KEYWORD2>
-			<KEYWORD2>openssl_pkey_get_private</KEYWORD2>
-			<KEYWORD2>openssl_pkey_get_public</KEYWORD2>
-			<KEYWORD2>openssl_pkey_new</KEYWORD2>
-			<KEYWORD2>openssl_private_decrypt</KEYWORD2>
-			<KEYWORD2>openssl_private_encrypt</KEYWORD2>
-			<KEYWORD2>openssl_public_decrypt</KEYWORD2>
-			<KEYWORD2>openssl_public_encrypt</KEYWORD2>
-			<KEYWORD2>openssl_seal</KEYWORD2>
-			<KEYWORD2>openssl_sign</KEYWORD2>
-			<KEYWORD2>openssl_verify</KEYWORD2>
-			<KEYWORD2>openssl_x509_check_private_key</KEYWORD2>
-			<KEYWORD2>openssl_x509_checkpurpose</KEYWORD2>
-			<KEYWORD2>openssl_x509_export</KEYWORD2>
-			<KEYWORD2>openssl_x509_export_to_file</KEYWORD2>
-			<KEYWORD2>openssl_x509_free</KEYWORD2>
-			<KEYWORD2>openssl_x509_parse</KEYWORD2>
-			<KEYWORD2>openssl_x509_read</KEYWORD2>
-			<KEYWORD2>ora_bind</KEYWORD2>
-			<KEYWORD2>ora_close</KEYWORD2>
-			<KEYWORD2>ora_columnname</KEYWORD2>
-			<KEYWORD2>ora_columnsize</KEYWORD2>
-			<KEYWORD2>ora_columntype</KEYWORD2>
-			<KEYWORD2>ora_commit</KEYWORD2>
-			<KEYWORD2>ora_commitoff</KEYWORD2>
-			<KEYWORD2>ora_commiton</KEYWORD2>
-			<KEYWORD2>ora_do</KEYWORD2>
-			<KEYWORD2>ora_error</KEYWORD2>
-			<KEYWORD2>ora_errorcode</KEYWORD2>
-			<KEYWORD2>ora_exec</KEYWORD2>
-			<KEYWORD2>ora_fetch</KEYWORD2>
-			<KEYWORD2>ora_fetch_into</KEYWORD2>
-			<KEYWORD2>ora_getcolumn</KEYWORD2>
-			<KEYWORD2>ora_logoff</KEYWORD2>
-			<KEYWORD2>ora_logon</KEYWORD2>
-			<KEYWORD2>ora_numcols</KEYWORD2>
-			<KEYWORD2>ora_numrows</KEYWORD2>
-			<KEYWORD2>ora_open</KEYWORD2>
-			<KEYWORD2>ora_parse</KEYWORD2>
-			<KEYWORD2>ora_plogon</KEYWORD2>
-			<KEYWORD2>ora_rollback</KEYWORD2>
-			<KEYWORD2>ord</KEYWORD2>
-			<KEYWORD2>output</KEYWORD2> <!-- swfmovie -->
-			<KEYWORD2>output_add_rewrite_var</KEYWORD2>
-			<KEYWORD2>output_reset_rewrite_vars</KEYWORD2>
-			<KEYWORD2>overload</KEYWORD2>
-			<KEYWORD2>override_function</KEYWORD2>
-			<KEYWORD2>ovrimos_close</KEYWORD2>
-			<KEYWORD2>ovrimos_commit</KEYWORD2>
-			<KEYWORD2>ovrimos_connect</KEYWORD2>
-			<KEYWORD2>ovrimos_cursor</KEYWORD2>
-			<KEYWORD2>ovrimos_exec</KEYWORD2>
-			<KEYWORD2>ovrimos_execute</KEYWORD2>
-			<KEYWORD2>ovrimos_fetch_into</KEYWORD2>
-			<KEYWORD2>ovrimos_fetch_row</KEYWORD2>
-			<KEYWORD2>ovrimos_field_len</KEYWORD2>
-			<KEYWORD2>ovrimos_field_name</KEYWORD2>
-			<KEYWORD2>ovrimos_field_num</KEYWORD2>
-			<KEYWORD2>ovrimos_field_type</KEYWORD2>
-			<KEYWORD2>ovrimos_free_result</KEYWORD2>
-			<KEYWORD2>ovrimos_longreadlen</KEYWORD2>
-			<KEYWORD2>ovrimos_num_fields</KEYWORD2>
-			<KEYWORD2>ovrimos_num_rows</KEYWORD2>
-			<KEYWORD2>ovrimos_prepare</KEYWORD2>
-			<KEYWORD2>ovrimos_result</KEYWORD2>
-			<KEYWORD2>ovrimos_result_all</KEYWORD2>
-			<KEYWORD2>ovrimos_rollback</KEYWORD2>
-			<KEYWORD2>owner_document</KEYWORD2> <!-- domnode -->
-			<KEYWORD2>pack</KEYWORD2>
-			<KEYWORD2>parent_node</KEYWORD2> <!-- domnode -->
-			<KEYWORD2>parents</KEYWORD2> <!-- hw_api -->
-			<KEYWORD2>parse_ini_file</KEYWORD2>
-			<KEYWORD2>parse_str</KEYWORD2>
-			<KEYWORD2>parse_url</KEYWORD2>
-			<KEYWORD2>parsekit_compile_file</KEYWORD2>
-			<KEYWORD2>parsekit_compile_string</KEYWORD2>
-			<KEYWORD2>parsekit_func_arginfo</KEYWORD2>
-			<KEYWORD2>passthru</KEYWORD2>
-			<KEYWORD2>pathinfo</KEYWORD2>
-			<KEYWORD2>pclose</KEYWORD2>
-			<KEYWORD2>pcntl_alarm</KEYWORD2>
-			<KEYWORD2>pcntl_exec</KEYWORD2>
-			<KEYWORD2>pcntl_fork</KEYWORD2>
-			<KEYWORD2>pcntl_getpriority</KEYWORD2>
-			<KEYWORD2>pcntl_setpriority</KEYWORD2>
-			<KEYWORD2>pcntl_signal</KEYWORD2>
-			<KEYWORD2>pcntl_wait</KEYWORD2>
-			<KEYWORD2>pcntl_waitpid</KEYWORD2>
-			<KEYWORD2>pcntl_wexitstatus</KEYWORD2>
-			<KEYWORD2>pcntl_wifexited</KEYWORD2>
-			<KEYWORD2>pcntl_wifsignaled</KEYWORD2>
-			<KEYWORD2>pcntl_wifstopped</KEYWORD2>
-			<KEYWORD2>pcntl_wstopsig</KEYWORD2>
-			<KEYWORD2>pcntl_wtermsig</KEYWORD2>
-			<KEYWORD2>pconnect</KEYWORD2> <!-- memcache -->
-			<KEYWORD2>pdf_add_annotation</KEYWORD2>
-			<KEYWORD2>pdf_add_bookmark</KEYWORD2>
-			<KEYWORD2>pdf_add_launchlink</KEYWORD2>
-			<KEYWORD2>pdf_add_locallink</KEYWORD2>
-			<KEYWORD2>pdf_add_note</KEYWORD2>
-			<KEYWORD2>pdf_add_outline</KEYWORD2>
-			<KEYWORD2>pdf_add_pdflink</KEYWORD2>
-			<KEYWORD2>pdf_add_thumbnail</KEYWORD2>
-			<KEYWORD2>pdf_add_weblink</KEYWORD2>
-			<KEYWORD2>pdf_arc</KEYWORD2>
-			<KEYWORD2>pdf_arcn</KEYWORD2>
-			<KEYWORD2>pdf_attach_file</KEYWORD2>
-			<KEYWORD2>pdf_begin_page</KEYWORD2>
-			<KEYWORD2>pdf_begin_pattern</KEYWORD2>
-			<KEYWORD2>pdf_begin_template</KEYWORD2>
-			<KEYWORD2>pdf_circle</KEYWORD2>
-			<KEYWORD2>pdf_clip</KEYWORD2>
-			<KEYWORD2>pdf_close</KEYWORD2>
-			<KEYWORD2>pdf_close_image</KEYWORD2>
-			<KEYWORD2>pdf_close_pdi</KEYWORD2>
-			<KEYWORD2>pdf_close_pdi_page</KEYWORD2>
-			<KEYWORD2>pdf_closepath</KEYWORD2>
-			<KEYWORD2>pdf_closepath_fill_stroke</KEYWORD2>
-			<KEYWORD2>pdf_closepath_stroke</KEYWORD2>
-			<KEYWORD2>pdf_concat</KEYWORD2>
-			<KEYWORD2>pdf_continue_text</KEYWORD2>
-			<KEYWORD2>pdf_curveto</KEYWORD2>
-			<KEYWORD2>pdf_delete</KEYWORD2>
-			<KEYWORD2>pdf_end_page</KEYWORD2>
-			<KEYWORD2>pdf_end_pattern</KEYWORD2>
-			<KEYWORD2>pdf_end_template</KEYWORD2>
-			<KEYWORD2>pdf_endpath</KEYWORD2>
-			<KEYWORD2>pdf_fill</KEYWORD2>
-			<KEYWORD2>pdf_fill_stroke</KEYWORD2>
-			<KEYWORD2>pdf_findfont</KEYWORD2>
-			<KEYWORD2>pdf_fit_pdi_page</KEYWORD2>
-			<KEYWORD2>pdf_get_buffer</KEYWORD2>
-			<KEYWORD2>pdf_get_font</KEYWORD2>
-			<KEYWORD2>pdf_get_fontname</KEYWORD2>
-			<KEYWORD2>pdf_get_fontsize</KEYWORD2>
-			<KEYWORD2>pdf_get_image_height</KEYWORD2>
-			<KEYWORD2>pdf_get_image_width</KEYWORD2>
-			<KEYWORD2>pdf_get_majorversion</KEYWORD2>
-			<KEYWORD2>pdf_get_minorversion</KEYWORD2>
-			<KEYWORD2>pdf_get_parameter</KEYWORD2>
-			<KEYWORD2>pdf_get_pdi_parameter</KEYWORD2>
-			<KEYWORD2>pdf_get_pdi_value</KEYWORD2>
-			<KEYWORD2>pdf_get_value</KEYWORD2>
-			<KEYWORD2>pdf_initgraphics</KEYWORD2>
-			<KEYWORD2>pdf_lineto</KEYWORD2>
-			<KEYWORD2>pdf_load_font</KEYWORD2>
-			<KEYWORD2>pdf_makespotcolor</KEYWORD2>
-			<KEYWORD2>pdf_moveto</KEYWORD2>
-			<KEYWORD2>pdf_new</KEYWORD2>
-			<KEYWORD2>pdf_open</KEYWORD2>
-			<KEYWORD2>pdf_open_ccitt</KEYWORD2>
-			<KEYWORD2>pdf_open_file</KEYWORD2>
-			<KEYWORD2>pdf_open_gif</KEYWORD2>
-			<KEYWORD2>pdf_open_image</KEYWORD2>
-			<KEYWORD2>pdf_open_image_file</KEYWORD2>
-			<KEYWORD2>pdf_open_jpeg</KEYWORD2>
-			<KEYWORD2>pdf_open_memory_image</KEYWORD2>
-			<KEYWORD2>pdf_open_pdi</KEYWORD2>
-			<KEYWORD2>pdf_open_pdi_page</KEYWORD2>
-			<KEYWORD2>pdf_open_png</KEYWORD2>
-			<KEYWORD2>pdf_open_tiff</KEYWORD2>
-			<KEYWORD2>pdf_place_image</KEYWORD2>
-			<KEYWORD2>pdf_place_pdi_page</KEYWORD2>
-			<KEYWORD2>pdf_rect</KEYWORD2>
-			<KEYWORD2>pdf_restore</KEYWORD2>
-			<KEYWORD2>pdf_rotate</KEYWORD2>
-			<KEYWORD2>pdf_save</KEYWORD2>
-			<KEYWORD2>pdf_scale</KEYWORD2>
-			<KEYWORD2>pdf_set_border_color</KEYWORD2>
-			<KEYWORD2>pdf_set_border_dash</KEYWORD2>
-			<KEYWORD2>pdf_set_border_style</KEYWORD2>
-			<KEYWORD2>pdf_set_char_spacing</KEYWORD2>
-			<KEYWORD2>pdf_set_duration</KEYWORD2>
-			<KEYWORD2>pdf_set_font</KEYWORD2>
-			<KEYWORD2>pdf_set_horiz_scaling</KEYWORD2>
-			<KEYWORD2>pdf_set_info</KEYWORD2>
-			<KEYWORD2>pdf_set_info_author</KEYWORD2>
-			<KEYWORD2>pdf_set_info_creator</KEYWORD2>
-			<KEYWORD2>pdf_set_info_keywords</KEYWORD2>
-			<KEYWORD2>pdf_set_info_subject</KEYWORD2>
-			<KEYWORD2>pdf_set_info_title</KEYWORD2>
-			<KEYWORD2>pdf_set_leading</KEYWORD2>
-			<KEYWORD2>pdf_set_parameter</KEYWORD2>
-			<KEYWORD2>pdf_set_text_matrix</KEYWORD2>
-			<KEYWORD2>pdf_set_text_pos</KEYWORD2>
-			<KEYWORD2>pdf_set_text_rendering</KEYWORD2>
-			<KEYWORD2>pdf_set_text_rise</KEYWORD2>
-			<KEYWORD2>pdf_set_value</KEYWORD2>
-			<KEYWORD2>pdf_set_word_spacing</KEYWORD2>
-			<KEYWORD2>pdf_setcolor</KEYWORD2>
-			<KEYWORD2>pdf_setdash</KEYWORD2>
-			<KEYWORD2>pdf_setflat</KEYWORD2>
-			<KEYWORD2>pdf_setfont</KEYWORD2>
-			<KEYWORD2>pdf_setgray</KEYWORD2>
-			<KEYWORD2>pdf_setgray_fill</KEYWORD2>
-			<KEYWORD2>pdf_setgray_stroke</KEYWORD2>
-			<KEYWORD2>pdf_setlinecap</KEYWORD2>
-			<KEYWORD2>pdf_setlinejoin</KEYWORD2>
-			<KEYWORD2>pdf_setlinewidth</KEYWORD2>
-			<KEYWORD2>pdf_setmatrix</KEYWORD2>
-			<KEYWORD2>pdf_setmiterlimit</KEYWORD2>
-			<KEYWORD2>pdf_setpolydash</KEYWORD2>
-			<KEYWORD2>pdf_setrgbcolor</KEYWORD2>
-			<KEYWORD2>pdf_setrgbcolor_fill</KEYWORD2>
-			<KEYWORD2>pdf_setrgbcolor_stroke</KEYWORD2>
-			<KEYWORD2>pdf_show</KEYWORD2>
-			<KEYWORD2>pdf_show_boxed</KEYWORD2>
-			<KEYWORD2>pdf_show_xy</KEYWORD2>
-			<KEYWORD2>pdf_skew</KEYWORD2>
-			<KEYWORD2>pdf_stringwidth</KEYWORD2>
-			<KEYWORD2>pdf_stroke</KEYWORD2>
-			<KEYWORD2>pdf_translate</KEYWORD2>
-			<KEYWORD2>pfpro_cleanup</KEYWORD2>
-			<KEYWORD2>pfpro_init</KEYWORD2>
-			<KEYWORD2>pfpro_process</KEYWORD2>
-			<KEYWORD2>pfpro_process_raw</KEYWORD2>
-			<KEYWORD2>pfpro_version</KEYWORD2>
-			<KEYWORD2>pfsockopen</KEYWORD2>
-			<KEYWORD2>pg_affected_rows</KEYWORD2>
-			<KEYWORD2>pg_cancel_query</KEYWORD2>
-			<KEYWORD2>pg_client_encoding</KEYWORD2>
-			<KEYWORD2>pg_close</KEYWORD2>
-			<KEYWORD2>pg_connect</KEYWORD2>
-			<KEYWORD2>pg_connection_busy</KEYWORD2>
-			<KEYWORD2>pg_connection_reset</KEYWORD2>
-			<KEYWORD2>pg_connection_status</KEYWORD2>
-			<KEYWORD2>pg_convert</KEYWORD2>
-			<KEYWORD2>pg_copy_from</KEYWORD2>
-			<KEYWORD2>pg_copy_to</KEYWORD2>
-			<KEYWORD2>pg_dbname</KEYWORD2>
-			<KEYWORD2>pg_delete</KEYWORD2>
-			<KEYWORD2>pg_end_copy</KEYWORD2>
-			<KEYWORD2>pg_escape_bytea</KEYWORD2>
-			<KEYWORD2>pg_escape_string</KEYWORD2>
-			<KEYWORD2>pg_fetch_all</KEYWORD2>
-			<KEYWORD2>pg_fetch_array</KEYWORD2>
-			<KEYWORD2>pg_fetch_assoc</KEYWORD2>
-			<KEYWORD2>pg_fetch_object</KEYWORD2>
-			<KEYWORD2>pg_fetch_result</KEYWORD2>
-			<KEYWORD2>pg_fetch_row</KEYWORD2>
-			<KEYWORD2>pg_field_is_null</KEYWORD2>
-			<KEYWORD2>pg_field_name</KEYWORD2>
-			<KEYWORD2>pg_field_num</KEYWORD2>
-			<KEYWORD2>pg_field_prtlen</KEYWORD2>
-			<KEYWORD2>pg_field_size</KEYWORD2>
-			<KEYWORD2>pg_field_type</KEYWORD2>
-			<KEYWORD2>pg_free_result</KEYWORD2>
-			<KEYWORD2>pg_get_notify</KEYWORD2>
-			<KEYWORD2>pg_get_pid</KEYWORD2>
-			<KEYWORD2>pg_get_result</KEYWORD2>
-			<KEYWORD2>pg_host</KEYWORD2>
-			<KEYWORD2>pg_insert</KEYWORD2>
-			<KEYWORD2>pg_last_error</KEYWORD2>
-			<KEYWORD2>pg_last_notice</KEYWORD2>
-			<KEYWORD2>pg_last_oid</KEYWORD2>
-			<KEYWORD2>pg_lo_close</KEYWORD2>
-			<KEYWORD2>pg_lo_create</KEYWORD2>
-			<KEYWORD2>pg_lo_export</KEYWORD2>
-			<KEYWORD2>pg_lo_import</KEYWORD2>
-			<KEYWORD2>pg_lo_open</KEYWORD2>
-			<KEYWORD2>pg_lo_read</KEYWORD2>
-			<KEYWORD2>pg_lo_read_all</KEYWORD2>
-			<KEYWORD2>pg_lo_seek</KEYWORD2>
-			<KEYWORD2>pg_lo_tell</KEYWORD2>
-			<KEYWORD2>pg_lo_unlink</KEYWORD2>
-			<KEYWORD2>pg_lo_write</KEYWORD2>
-			<KEYWORD2>pg_meta_data</KEYWORD2>
-			<KEYWORD2>pg_num_fields</KEYWORD2>
-			<KEYWORD2>pg_num_rows</KEYWORD2>
-			<KEYWORD2>pg_options</KEYWORD2>
-			<KEYWORD2>pg_parameter_status</KEYWORD2>
-			<KEYWORD2>pg_pconnect</KEYWORD2>
-			<KEYWORD2>pg_ping</KEYWORD2>
-			<KEYWORD2>pg_port</KEYWORD2>
-			<KEYWORD2>pg_put_line</KEYWORD2>
-			<KEYWORD2>pg_query</KEYWORD2>
-			<KEYWORD2>pg_result_error</KEYWORD2>
-			<KEYWORD2>pg_result_seek</KEYWORD2>
-			<KEYWORD2>pg_result_status</KEYWORD2>
-			<KEYWORD2>pg_select</KEYWORD2>
-			<KEYWORD2>pg_send_query</KEYWORD2>
-			<KEYWORD2>pg_set_client_encoding</KEYWORD2>
-			<KEYWORD2>pg_trace</KEYWORD2>
-			<KEYWORD2>pg_tty</KEYWORD2>
-			<KEYWORD2>pg_unescape_bytea</KEYWORD2>
-			<KEYWORD2>pg_untrace</KEYWORD2>
-			<KEYWORD2>pg_update</KEYWORD2>
-			<KEYWORD2>pg_version</KEYWORD2>
-			<KEYWORD2>php_check_syntax</KEYWORD2>
-			<KEYWORD2>php_ini_scanned_files</KEYWORD2>
-			<KEYWORD2>php_logo_guid</KEYWORD2>
-			<KEYWORD2>php_sapi_name</KEYWORD2>
-			<KEYWORD2>php_strip_whitespace</KEYWORD2>
-			<KEYWORD2>php_uname</KEYWORD2>
-			<KEYWORD2>phpcredits</KEYWORD2>
-			<KEYWORD2>phpinfo</KEYWORD2>
-			<KEYWORD2>phpversion</KEYWORD2>
-			<KEYWORD2>pi</KEYWORD2>
-			<KEYWORD2>png2wbmp</KEYWORD2>
-			<KEYWORD2>popen</KEYWORD2>
-			<KEYWORD2>pos</KEYWORD2>
-			<KEYWORD2>posix_ctermid</KEYWORD2>
-			<KEYWORD2>posix_get_last_error</KEYWORD2>
-			<KEYWORD2>posix_getcwd</KEYWORD2>
-			<KEYWORD2>posix_getegid</KEYWORD2>
-			<KEYWORD2>posix_geteuid</KEYWORD2>
-			<KEYWORD2>posix_getgid</KEYWORD2>
-			<KEYWORD2>posix_getgrgid</KEYWORD2>
-			<KEYWORD2>posix_getgrnam</KEYWORD2>
-			<KEYWORD2>posix_getgroups</KEYWORD2>
-			<KEYWORD2>posix_getlogin</KEYWORD2>
-			<KEYWORD2>posix_getpgid</KEYWORD2>
-			<KEYWORD2>posix_getpgrp</KEYWORD2>
-			<KEYWORD2>posix_getpid</KEYWORD2>
-			<KEYWORD2>posix_getppid</KEYWORD2>
-			<KEYWORD2>posix_getpwnam</KEYWORD2>
-			<KEYWORD2>posix_getpwuid</KEYWORD2>
-			<KEYWORD2>posix_getrlimit</KEYWORD2>
-			<KEYWORD2>posix_getsid</KEYWORD2>
-			<KEYWORD2>posix_getuid</KEYWORD2>
-			<KEYWORD2>posix_isatty</KEYWORD2>
-			<KEYWORD2>posix_kill</KEYWORD2>
-			<KEYWORD2>posix_mkfifo</KEYWORD2>
-			<KEYWORD2>posix_setegid</KEYWORD2>
-			<KEYWORD2>posix_seteuid</KEYWORD2>
-			<KEYWORD2>posix_setgid</KEYWORD2>
-			<KEYWORD2>posix_setpgid</KEYWORD2>
-			<KEYWORD2>posix_setsid</KEYWORD2>
-			<KEYWORD2>posix_setuid</KEYWORD2>
-			<KEYWORD2>posix_strerror</KEYWORD2>
-			<KEYWORD2>posix_times</KEYWORD2>
-			<KEYWORD2>posix_ttyname</KEYWORD2>
-			<KEYWORD2>posix_uname</KEYWORD2>
-			<KEYWORD2>pow</KEYWORD2>
-			<KEYWORD2>prefix</KEYWORD2> <!-- domnode -->
-			<KEYWORD2>preg_grep</KEYWORD2>
-			<KEYWORD2>preg_match</KEYWORD2>
-			<KEYWORD2>preg_match_all</KEYWORD2>
-			<KEYWORD2>preg_quote</KEYWORD2>
-			<KEYWORD2>preg_replace</KEYWORD2>
-			<KEYWORD2>preg_replace_callback</KEYWORD2>
-			<KEYWORD2>preg_split</KEYWORD2>
-			<KEYWORD2>prepare</KEYWORD2> <!-- pdo -->
-			<KEYWORD2>prev</KEYWORD2> <!-- tidy_node -->
-			<KEYWORD2>previous_sibling</KEYWORD2> <!-- domnode -->
-			<KEYWORD2>print_r</KEYWORD2>
-			<KEYWORD2>printer_abort</KEYWORD2>
-			<KEYWORD2>printer_close</KEYWORD2>
-			<KEYWORD2>printer_create_brush</KEYWORD2>
-			<KEYWORD2>printer_create_dc</KEYWORD2>
-			<KEYWORD2>printer_create_font</KEYWORD2>
-			<KEYWORD2>printer_create_pen</KEYWORD2>
-			<KEYWORD2>printer_delete_brush</KEYWORD2>
-			<KEYWORD2>printer_delete_dc</KEYWORD2>
-			<KEYWORD2>printer_delete_font</KEYWORD2>
-			<KEYWORD2>printer_delete_pen</KEYWORD2>
-			<KEYWORD2>printer_draw_bmp</KEYWORD2>
-			<KEYWORD2>printer_draw_chord</KEYWORD2>
-			<KEYWORD2>printer_draw_elipse</KEYWORD2>
-			<KEYWORD2>printer_draw_line</KEYWORD2>
-			<KEYWORD2>printer_draw_pie</KEYWORD2>
-			<KEYWORD2>printer_draw_rectangle</KEYWORD2>
-			<KEYWORD2>printer_draw_roundrect</KEYWORD2>
-			<KEYWORD2>printer_draw_text</KEYWORD2>
-			<KEYWORD2>printer_end_doc</KEYWORD2>
-			<KEYWORD2>printer_end_page</KEYWORD2>
-			<KEYWORD2>printer_get_option</KEYWORD2>
-			<KEYWORD2>printer_list</KEYWORD2>
-			<KEYWORD2>printer_logical_fontheight</KEYWORD2>
-			<KEYWORD2>printer_open</KEYWORD2>
-			<KEYWORD2>printer_select_brush</KEYWORD2>
-			<KEYWORD2>printer_select_font</KEYWORD2>
-			<KEYWORD2>printer_select_pen</KEYWORD2>
-			<KEYWORD2>printer_set_option</KEYWORD2>
-			<KEYWORD2>printer_start_doc</KEYWORD2>
-			<KEYWORD2>printer_start_page</KEYWORD2>
-			<KEYWORD2>printer_write</KEYWORD2>
-			<KEYWORD2>printf</KEYWORD2>
-			<KEYWORD2>proc_close</KEYWORD2>
-			<KEYWORD2>proc_get_status</KEYWORD2>
-			<KEYWORD2>proc_nice</KEYWORD2>
-			<KEYWORD2>proc_open</KEYWORD2>
-			<KEYWORD2>proc_terminate</KEYWORD2>
-			<KEYWORD2>process</KEYWORD2> <!-- domxsltstylesheet -->
-			<KEYWORD2>property_exists</KEYWORD2>
-			<KEYWORD2>pspell_add_to_personal</KEYWORD2>
-			<KEYWORD2>pspell_add_to_session</KEYWORD2>
-			<KEYWORD2>pspell_check</KEYWORD2>
-			<KEYWORD2>pspell_clear_session</KEYWORD2>
-			<KEYWORD2>pspell_config_create</KEYWORD2>
-			<KEYWORD2>pspell_config_data_dir</KEYWORD2>
-			<KEYWORD2>pspell_config_dict_dir</KEYWORD2>
-			<KEYWORD2>pspell_config_ignore</KEYWORD2>
-			<KEYWORD2>pspell_config_mode</KEYWORD2>
-			<KEYWORD2>pspell_config_personal</KEYWORD2>
-			<KEYWORD2>pspell_config_repl</KEYWORD2>
-			<KEYWORD2>pspell_config_runtogether</KEYWORD2>
-			<KEYWORD2>pspell_config_save_repl</KEYWORD2>
-			<KEYWORD2>pspell_new</KEYWORD2>
-			<KEYWORD2>pspell_new_config</KEYWORD2>
-			<KEYWORD2>pspell_new_personal</KEYWORD2>
-			<KEYWORD2>pspell_save_wordlist</KEYWORD2>
-			<KEYWORD2>pspell_store_replacement</KEYWORD2>
-			<KEYWORD2>pspell_suggest</KEYWORD2>
-			<KEYWORD2>public_id</KEYWORD2> <!-- domdocumenttype -->
-			<KEYWORD2>putenv</KEYWORD2>
-			<KEYWORD2>qdom_error</KEYWORD2>
-			<KEYWORD2>qdom_tree</KEYWORD2>
-			<KEYWORD2>query</KEYWORD2> <!-- domxpath -->
-			<KEYWORD2>quoted_printable_decode</KEYWORD2>
-			<KEYWORD2>quotemeta</KEYWORD2>
-			<KEYWORD2>rad2deg</KEYWORD2>
-			<KEYWORD2>rand</KEYWORD2>
-			<KEYWORD2>range</KEYWORD2>
-			<KEYWORD2>rar_close</KEYWORD2>
-			<KEYWORD2>rar_entry_get</KEYWORD2>
-			<KEYWORD2>rar_list</KEYWORD2>
-			<KEYWORD2>rar_open</KEYWORD2>
-			<KEYWORD2>rawurldecode</KEYWORD2>
-			<KEYWORD2>rawurlencode</KEYWORD2>
-			<KEYWORD2>read</KEYWORD2> <!-- hw_api_content, lob -->
-			<KEYWORD2>read_exif_data</KEYWORD2>
-			<KEYWORD2>readdir</KEYWORD2>
-			<KEYWORD2>readfile</KEYWORD2>
-			<KEYWORD2>readgzfile</KEYWORD2>
-			<KEYWORD2>readline</KEYWORD2>
-			<KEYWORD2>readline_add_history</KEYWORD2>
-			<KEYWORD2>readline_callback_handler_install</KEYWORD2>
-			<KEYWORD2>readline_callback_handler_remove</KEYWORD2>
-			<KEYWORD2>readline_callback_read_char</KEYWORD2>
-			<KEYWORD2>readline_clear_history</KEYWORD2>
-			<KEYWORD2>readline_completion_function</KEYWORD2>
-			<KEYWORD2>readline_info</KEYWORD2>
-			<KEYWORD2>readline_list_history</KEYWORD2>
-			<KEYWORD2>readline_on_new_line</KEYWORD2>
-			<KEYWORD2>readline_read_history</KEYWORD2>
-			<KEYWORD2>readline_redisplay</KEYWORD2>
-			<KEYWORD2>readline_write_history</KEYWORD2>
-			<KEYWORD2>readlink</KEYWORD2>
-			<KEYWORD2>realpath</KEYWORD2>
-			<KEYWORD2>reason</KEYWORD2> <!-- hw_api_error -->
-			<KEYWORD2>recode</KEYWORD2>
-			<KEYWORD2>recode_file</KEYWORD2>
-			<KEYWORD2>recode_string</KEYWORD2>
-			<KEYWORD2>register_shutdown_function</KEYWORD2>
-			<KEYWORD2>register_tick_function</KEYWORD2>
-			<KEYWORD2>registernamespace</KEYWORD2> <!-- domxpath -->
-			<KEYWORD2>relaxngvalidate</KEYWORD2> <!-- domdocument -->
-			<KEYWORD2>relaxngvalidatesource</KEYWORD2> <!-- domdocument -->
-			<KEYWORD2>remove</KEYWORD2> <!-- hw_api, hw_api_object, swfdisplayitem, swfmovie, swfsprite -->
-			<KEYWORD2>remove_attribute</KEYWORD2> <!-- domelement -->
-			<KEYWORD2>remove_child</KEYWORD2> <!-- domnode -->
-			<KEYWORD2>removeattribute</KEYWORD2> <!-- domelement -->
-			<KEYWORD2>removeattributenode</KEYWORD2> <!-- domelement -->
-			<KEYWORD2>removeattributens</KEYWORD2> <!-- domelement -->
-			<KEYWORD2>removechild</KEYWORD2> <!-- domnode -->
-			<KEYWORD2>rename</KEYWORD2>
-			<KEYWORD2>rename_function</KEYWORD2>
-			<KEYWORD2>replace</KEYWORD2> <!-- hw_api, memcache -->
-			<KEYWORD2>replace_child</KEYWORD2> <!-- domnode -->
-			<KEYWORD2>replace_node</KEYWORD2> <!-- domnode -->
-			<KEYWORD2>replacechild</KEYWORD2> <!-- domnode -->
-			<KEYWORD2>replacedata</KEYWORD2> <!-- domcharacterdata -->
-			<KEYWORD2>reset</KEYWORD2>
-			<KEYWORD2>restore_error_handler</KEYWORD2>
-			<KEYWORD2>restore_exception_handler</KEYWORD2>
-			<KEYWORD2>restore_include_path</KEYWORD2>
-			<KEYWORD2>result_dump_file</KEYWORD2> <!-- domxsltstylesheet -->
-			<KEYWORD2>result_dump_mem</KEYWORD2> <!-- domxsltstylesheet -->
-			<KEYWORD2>rewind</KEYWORD2> <!-- arrayiterator, cachingiterator, directoryiterator, filteriterator, limititerator, lob, parentiterator, recursivedirectoryiterator, recursiveiteratoriterator, simplexmliterator -->
-			<KEYWORD2>rewinddir</KEYWORD2>
-			<KEYWORD2>rmdir</KEYWORD2>
-			<KEYWORD2>rollback</KEYWORD2> <!-- pdo -->
-			<KEYWORD2>rotate</KEYWORD2> <!-- swfdisplayitem -->
-			<KEYWORD2>rotateto</KEYWORD2> <!-- swfdisplayitem, swffill -->
-			<KEYWORD2>round</KEYWORD2>
-			<KEYWORD2>rowcount</KEYWORD2> <!-- pdostatement -->
-			<KEYWORD2>rsort</KEYWORD2>
-			<KEYWORD2>rtrim</KEYWORD2>
-			<KEYWORD2>save</KEYWORD2> <!-- domdocument, lob, swfmovie -->
-			<KEYWORD2>savehtml</KEYWORD2> <!-- domdocument -->
-			<KEYWORD2>savehtmlfile</KEYWORD2> <!-- domdocument -->
-			<KEYWORD2>savexml</KEYWORD2> <!-- domdocument -->
-			<KEYWORD2>scale</KEYWORD2> <!-- swfdisplayitem -->
-			<KEYWORD2>scaleto</KEYWORD2> <!-- swfdisplayitem, swffill -->
-			<KEYWORD2>scandir</KEYWORD2>
-			<KEYWORD2>schemavalidate</KEYWORD2> <!-- domdocument -->
-			<KEYWORD2>schemavalidatesource</KEYWORD2> <!-- domdocument -->
-			<KEYWORD2>seek</KEYWORD2> <!-- arrayiterator, limititerator, lob -->
-			<KEYWORD2>sem_acquire</KEYWORD2>
-			<KEYWORD2>sem_get</KEYWORD2>
-			<KEYWORD2>sem_release</KEYWORD2>
-			<KEYWORD2>sem_remove</KEYWORD2>
-			<KEYWORD2>serialize</KEYWORD2>
-			<KEYWORD2>sesam_affected_rows</KEYWORD2>
-			<KEYWORD2>sesam_commit</KEYWORD2>
-			<KEYWORD2>sesam_connect</KEYWORD2>
-			<KEYWORD2>sesam_diagnostic</KEYWORD2>
-			<KEYWORD2>sesam_disconnect</KEYWORD2>
-			<KEYWORD2>sesam_errormsg</KEYWORD2>
-			<KEYWORD2>sesam_execimm</KEYWORD2>
-			<KEYWORD2>sesam_fetch_array</KEYWORD2>
-			<KEYWORD2>sesam_fetch_result</KEYWORD2>
-			<KEYWORD2>sesam_fetch_row</KEYWORD2>
-			<KEYWORD2>sesam_field_array</KEYWORD2>
-			<KEYWORD2>sesam_field_name</KEYWORD2>
-			<KEYWORD2>sesam_free_result</KEYWORD2>
-			<KEYWORD2>sesam_num_fields</KEYWORD2>
-			<KEYWORD2>sesam_query</KEYWORD2>
-			<KEYWORD2>sesam_rollback</KEYWORD2>
-			<KEYWORD2>sesam_seek_row</KEYWORD2>
-			<KEYWORD2>sesam_settransaction</KEYWORD2>
-			<KEYWORD2>session_cache_expire</KEYWORD2>
-			<KEYWORD2>session_cache_limiter</KEYWORD2>
-			<KEYWORD2>session_commit</KEYWORD2>
-			<KEYWORD2>session_decode</KEYWORD2>
-			<KEYWORD2>session_destroy</KEYWORD2>
-			<KEYWORD2>session_encode</KEYWORD2>
-			<KEYWORD2>session_get_cookie_params</KEYWORD2>
-			<KEYWORD2>session_id</KEYWORD2>
-			<KEYWORD2>session_is_registered</KEYWORD2>
-			<KEYWORD2>session_module_name</KEYWORD2>
-			<KEYWORD2>session_name</KEYWORD2>
-			<KEYWORD2>session_regenerate_id</KEYWORD2>
-			<KEYWORD2>session_register</KEYWORD2>
-			<KEYWORD2>session_save_path</KEYWORD2>
-			<KEYWORD2>session_set_cookie_params</KEYWORD2>
-			<KEYWORD2>session_set_save_handler</KEYWORD2>
-			<KEYWORD2>session_start</KEYWORD2>
-			<KEYWORD2>session_unregister</KEYWORD2>
-			<KEYWORD2>session_unset</KEYWORD2>
-			<KEYWORD2>session_write_close</KEYWORD2>
-			<KEYWORD2>set</KEYWORD2> <!-- memcache -->
-			<KEYWORD2>set_attribute</KEYWORD2> <!-- domelement -->
-			<KEYWORD2>set_content</KEYWORD2> <!-- domnode -->
-			<KEYWORD2>set_error_handler</KEYWORD2>
-			<KEYWORD2>set_exception_handler</KEYWORD2>
-			<KEYWORD2>set_file_buffer</KEYWORD2>
-			<KEYWORD2>set_include_path</KEYWORD2>
-			<KEYWORD2>set_magic_quotes_runtime</KEYWORD2>
-			<KEYWORD2>set_name</KEYWORD2> <!-- domnode -->
-			<KEYWORD2>set_namespace</KEYWORD2> <!-- domnode -->
-			<KEYWORD2>set_time_limit</KEYWORD2>
-			<KEYWORD2>setaction</KEYWORD2> <!-- swfbutton -->
-			<KEYWORD2>setattribute</KEYWORD2> <!-- domelement, pdo -->
-			<KEYWORD2>setattributenode</KEYWORD2> <!-- domelement -->
-			<KEYWORD2>setattributenodens</KEYWORD2> <!-- domelement -->
-			<KEYWORD2>setattributens</KEYWORD2> <!-- domelement -->
-			<KEYWORD2>setbackground</KEYWORD2> <!-- swfmovie -->
-			<KEYWORD2>setbounds</KEYWORD2> <!-- swftextfield -->
-			<KEYWORD2>setbuffering</KEYWORD2> <!-- lob -->
-			<KEYWORD2>setclass</KEYWORD2> <!-- soapserver -->
-			<KEYWORD2>setcolor</KEYWORD2> <!-- swftext, swftextfield -->
-			<KEYWORD2>setcommitedversion</KEYWORD2> <!-- hw_api -->
-			<KEYWORD2>setcookie</KEYWORD2>
-			<KEYWORD2>setdepth</KEYWORD2> <!-- swfdisplayitem -->
-			<KEYWORD2>setdimension</KEYWORD2> <!-- swfmovie -->
-			<KEYWORD2>setdown</KEYWORD2> <!-- swfbutton -->
-			<KEYWORD2>setfont</KEYWORD2> <!-- swftext, swftextfield -->
-			<KEYWORD2>setframes</KEYWORD2> <!-- swfmovie, swfsprite -->
-			<KEYWORD2>setheight</KEYWORD2> <!-- swftext, swftextfield -->
-			<KEYWORD2>sethit</KEYWORD2> <!-- swfbutton -->
-			<KEYWORD2>setindentation</KEYWORD2> <!-- swftextfield -->
-			<KEYWORD2>setleftfill</KEYWORD2> <!-- swfshape -->
-			<KEYWORD2>setleftmargin</KEYWORD2> <!-- swftextfield -->
-			<KEYWORD2>setline</KEYWORD2> <!-- swfshape -->
-			<KEYWORD2>setlinespacing</KEYWORD2> <!-- swftextfield -->
-			<KEYWORD2>setlocale</KEYWORD2>
-			<KEYWORD2>setmargins</KEYWORD2> <!-- swftextfield -->
-			<KEYWORD2>setname</KEYWORD2> <!-- swfdisplayitem, swftextfield -->
-			<KEYWORD2>setover</KEYWORD2> <!-- swfbutton -->
-			<KEYWORD2>setpersistence</KEYWORD2> <!-- soapserver -->
-			<KEYWORD2>setrate</KEYWORD2> <!-- swfmovie -->
-			<KEYWORD2>setratio</KEYWORD2> <!-- swfdisplayitem -->
-			<KEYWORD2>setrawcookie</KEYWORD2>
-			<KEYWORD2>setrightfill</KEYWORD2> <!-- swfshape -->
-			<KEYWORD2>setrightmargin</KEYWORD2> <!-- swftextfield -->
-			<KEYWORD2>setspacing</KEYWORD2> <!-- swftext -->
-			<KEYWORD2>settype</KEYWORD2>
-			<KEYWORD2>setup</KEYWORD2> <!-- swfbutton -->
-			<KEYWORD2>sha1</KEYWORD2>
-			<KEYWORD2>sha1_file</KEYWORD2>
-			<KEYWORD2>shell_exec</KEYWORD2>
-			<KEYWORD2>shm_attach</KEYWORD2>
-			<KEYWORD2>shm_detach</KEYWORD2>
-			<KEYWORD2>shm_get_var</KEYWORD2>
-			<KEYWORD2>shm_put_var</KEYWORD2>
-			<KEYWORD2>shm_remove</KEYWORD2>
-			<KEYWORD2>shm_remove_var</KEYWORD2>
-			<KEYWORD2>shmop_close</KEYWORD2>
-			<KEYWORD2>shmop_delete</KEYWORD2>
-			<KEYWORD2>shmop_open</KEYWORD2>
-			<KEYWORD2>shmop_read</KEYWORD2>
-			<KEYWORD2>shmop_size</KEYWORD2>
-			<KEYWORD2>shmop_write</KEYWORD2>
-			<KEYWORD2>show_source</KEYWORD2>
-			<KEYWORD2>shuffle</KEYWORD2>
-			<KEYWORD2>similar_text</KEYWORD2>
-			<KEYWORD2>simplexml_import_dom</KEYWORD2>
-			<KEYWORD2>simplexml_load_file</KEYWORD2>
-			<KEYWORD2>simplexml_load_string</KEYWORD2>
-			<KEYWORD2>sin</KEYWORD2>
-			<KEYWORD2>sinh</KEYWORD2>
-			<KEYWORD2>size</KEYWORD2> <!-- collection, lob -->
-			<KEYWORD2>sizeof</KEYWORD2>
-			<KEYWORD2>skewx</KEYWORD2> <!-- swfdisplayitem -->
-			<KEYWORD2>skewxto</KEYWORD2> <!-- swfdisplayitem, swffill -->
-			<KEYWORD2>skewy</KEYWORD2> <!-- swfdisplayitem -->
-			<KEYWORD2>skewyto</KEYWORD2> <!-- swfdisplayitem, swffill -->
-			<KEYWORD2>sleep</KEYWORD2>
-			<KEYWORD2>snmp_get_quick_print</KEYWORD2>
-			<KEYWORD2>snmp_get_valueretrieval</KEYWORD2>
-			<KEYWORD2>snmp_read_mib</KEYWORD2>
-			<KEYWORD2>snmp_set_enum_print</KEYWORD2>
-			<KEYWORD2>snmp_set_oid_numeric_print</KEYWORD2>
-			<KEYWORD2>snmp_set_quick_print</KEYWORD2>
-			<KEYWORD2>snmp_set_valueretrieval</KEYWORD2>
-			<KEYWORD2>snmpget</KEYWORD2>
-			<KEYWORD2>snmpgetnext</KEYWORD2>
-			<KEYWORD2>snmprealwalk</KEYWORD2>
-			<KEYWORD2>snmpset</KEYWORD2>
-			<KEYWORD2>snmpwalk</KEYWORD2>
-			<KEYWORD2>snmpwalkoid</KEYWORD2>
-			<KEYWORD2>socket_accept</KEYWORD2>
-			<KEYWORD2>socket_bind</KEYWORD2>
-			<KEYWORD2>socket_clear_error</KEYWORD2>
-			<KEYWORD2>socket_close</KEYWORD2>
-			<KEYWORD2>socket_connect</KEYWORD2>
-			<KEYWORD2>socket_create</KEYWORD2>
-			<KEYWORD2>socket_create_listen</KEYWORD2>
-			<KEYWORD2>socket_create_pair</KEYWORD2>
-			<KEYWORD2>socket_get_option</KEYWORD2>
-			<KEYWORD2>socket_get_status</KEYWORD2>
-			<KEYWORD2>socket_getpeername</KEYWORD2>
-			<KEYWORD2>socket_getsockname</KEYWORD2>
-			<KEYWORD2>socket_last_error</KEYWORD2>
-			<KEYWORD2>socket_listen</KEYWORD2>
-			<KEYWORD2>socket_read</KEYWORD2>
-			<KEYWORD2>socket_recv</KEYWORD2>
-			<KEYWORD2>socket_recvfrom</KEYWORD2>
-			<KEYWORD2>socket_select</KEYWORD2>
-			<KEYWORD2>socket_send</KEYWORD2>
-			<KEYWORD2>socket_sendto</KEYWORD2>
-			<KEYWORD2>socket_set_block</KEYWORD2>
-			<KEYWORD2>socket_set_blocking</KEYWORD2>
-			<KEYWORD2>socket_set_nonblock</KEYWORD2>
-			<KEYWORD2>socket_set_option</KEYWORD2>
-			<KEYWORD2>socket_set_timeout</KEYWORD2>
-			<KEYWORD2>socket_shutdown</KEYWORD2>
-			<KEYWORD2>socket_strerror</KEYWORD2>
-			<KEYWORD2>socket_write</KEYWORD2>
-			<KEYWORD2>sort</KEYWORD2>
-			<KEYWORD2>soundex</KEYWORD2>
-			<KEYWORD2>specified</KEYWORD2> <!-- domattribute -->
-			<KEYWORD2>spl_classes</KEYWORD2>
-			<KEYWORD2>split</KEYWORD2>
-			<KEYWORD2>spliti</KEYWORD2>
-			<KEYWORD2>splittext</KEYWORD2> <!-- domtext -->
-			<KEYWORD2>sprintf</KEYWORD2>
-			<KEYWORD2>sql_regcase</KEYWORD2>
-			<KEYWORD2>sqlite_array_query</KEYWORD2>
-			<KEYWORD2>sqlite_busy_timeout</KEYWORD2>
-			<KEYWORD2>sqlite_changes</KEYWORD2>
-			<KEYWORD2>sqlite_close</KEYWORD2>
-			<KEYWORD2>sqlite_column</KEYWORD2>
-			<KEYWORD2>sqlite_create_aggregate</KEYWORD2>
-			<KEYWORD2>sqlite_create_function</KEYWORD2>
-			<KEYWORD2>sqlite_current</KEYWORD2>
-			<KEYWORD2>sqlite_error_string</KEYWORD2>
-			<KEYWORD2>sqlite_escape_string</KEYWORD2>
-			<KEYWORD2>sqlite_exec</KEYWORD2>
-			<KEYWORD2>sqlite_factory</KEYWORD2>
-			<KEYWORD2>sqlite_fetch_all</KEYWORD2>
-			<KEYWORD2>sqlite_fetch_array</KEYWORD2>
-			<KEYWORD2>sqlite_fetch_column_types</KEYWORD2>
-			<KEYWORD2>sqlite_fetch_object</KEYWORD2>
-			<KEYWORD2>sqlite_fetch_single</KEYWORD2>
-			<KEYWORD2>sqlite_fetch_string</KEYWORD2>
-			<KEYWORD2>sqlite_field_name</KEYWORD2>
-			<KEYWORD2>sqlite_has_more</KEYWORD2>
-			<KEYWORD2>sqlite_has_prev</KEYWORD2>
-			<KEYWORD2>sqlite_last_error</KEYWORD2>
-			<KEYWORD2>sqlite_last_insert_rowid</KEYWORD2>
-			<KEYWORD2>sqlite_libencoding</KEYWORD2>
-			<KEYWORD2>sqlite_libversion</KEYWORD2>
-			<KEYWORD2>sqlite_next</KEYWORD2>
-			<KEYWORD2>sqlite_num_fields</KEYWORD2>
-			<KEYWORD2>sqlite_num_rows</KEYWORD2>
-			<KEYWORD2>sqlite_open</KEYWORD2>
-			<KEYWORD2>sqlite_popen</KEYWORD2>
-			<KEYWORD2>sqlite_prev</KEYWORD2>
-			<KEYWORD2>sqlite_query</KEYWORD2>
-			<KEYWORD2>sqlite_rewind</KEYWORD2>
-			<KEYWORD2>sqlite_seek</KEYWORD2>
-			<KEYWORD2>sqlite_single_query</KEYWORD2>
-			<KEYWORD2>sqlite_udf_decode_binary</KEYWORD2>
-			<KEYWORD2>sqlite_udf_encode_binary</KEYWORD2>
-			<KEYWORD2>sqlite_unbuffered_query</KEYWORD2>
-			<KEYWORD2>sqrt</KEYWORD2>
-			<KEYWORD2>srand</KEYWORD2>
-			<KEYWORD2>srcanchors</KEYWORD2> <!-- hw_api -->
-			<KEYWORD2>srcsofdst</KEYWORD2> <!-- hw_api -->
-			<KEYWORD2>sscanf</KEYWORD2>
-			<KEYWORD2>stat</KEYWORD2>
-			<KEYWORD2>str_ireplace</KEYWORD2>
-			<KEYWORD2>str_pad</KEYWORD2>
-			<KEYWORD2>str_repeat</KEYWORD2>
-			<KEYWORD2>str_replace</KEYWORD2>
-			<KEYWORD2>str_rot13</KEYWORD2>
-			<KEYWORD2>str_shuffle</KEYWORD2>
-			<KEYWORD2>str_split</KEYWORD2>
-			<KEYWORD2>str_word_count</KEYWORD2>
-			<KEYWORD2>strcasecmp</KEYWORD2>
-			<KEYWORD2>strchr</KEYWORD2>
-			<KEYWORD2>strcmp</KEYWORD2>
-			<KEYWORD2>strcoll</KEYWORD2>
-			<KEYWORD2>strcspn</KEYWORD2>
-			<KEYWORD2>stream_context_create</KEYWORD2>
-			<KEYWORD2>stream_context_get_default</KEYWORD2>
-			<KEYWORD2>stream_context_get_options</KEYWORD2>
-			<KEYWORD2>stream_context_set_option</KEYWORD2>
-			<KEYWORD2>stream_context_set_params</KEYWORD2>
-			<KEYWORD2>stream_copy_to_stream</KEYWORD2>
-			<KEYWORD2>stream_filter_append</KEYWORD2>
-			<KEYWORD2>stream_filter_prepend</KEYWORD2>
-			<KEYWORD2>stream_filter_register</KEYWORD2>
-			<KEYWORD2>stream_filter_remove</KEYWORD2>
-			<KEYWORD2>stream_get_contents</KEYWORD2>
-			<KEYWORD2>stream_get_filters</KEYWORD2>
-			<KEYWORD2>stream_get_line</KEYWORD2>
-			<KEYWORD2>stream_get_meta_data</KEYWORD2>
-			<KEYWORD2>stream_get_transports</KEYWORD2>
-			<KEYWORD2>stream_get_wrappers</KEYWORD2>
-			<KEYWORD2>stream_register_wrapper</KEYWORD2>
-			<KEYWORD2>stream_select</KEYWORD2>
-			<KEYWORD2>stream_set_blocking</KEYWORD2>
-			<KEYWORD2>stream_set_timeout</KEYWORD2>
-			<KEYWORD2>stream_set_write_buffer</KEYWORD2>
-			<KEYWORD2>stream_socket_accept</KEYWORD2>
-			<KEYWORD2>stream_socket_client</KEYWORD2>
-			<KEYWORD2>stream_socket_enable_crypto</KEYWORD2>
-			<KEYWORD2>stream_socket_get_name</KEYWORD2>
-			<KEYWORD2>stream_socket_recvfrom</KEYWORD2>
-			<KEYWORD2>stream_socket_sendto</KEYWORD2>
-			<KEYWORD2>stream_socket_server</KEYWORD2>
-			<KEYWORD2>stream_wrapper_register</KEYWORD2>
-			<KEYWORD2>stream_wrapper_restore</KEYWORD2>
-			<KEYWORD2>stream_wrapper_unregister</KEYWORD2>
-			<KEYWORD2>streammp3</KEYWORD2> <!-- swfmovie -->
-			<KEYWORD2>strftime</KEYWORD2>
-			<KEYWORD2>strip_tags</KEYWORD2>
-			<KEYWORD2>stripcslashes</KEYWORD2>
-			<KEYWORD2>stripos</KEYWORD2>
-			<KEYWORD2>stripslashes</KEYWORD2>
-			<KEYWORD2>stristr</KEYWORD2>
-			<KEYWORD2>strlen</KEYWORD2>
-			<KEYWORD2>strnatcasecmp</KEYWORD2>
-			<KEYWORD2>strnatcmp</KEYWORD2>
-			<KEYWORD2>strncasecmp</KEYWORD2>
-			<KEYWORD2>strncmp</KEYWORD2>
-			<KEYWORD2>strpbrk</KEYWORD2>
-			<KEYWORD2>strpos</KEYWORD2>
-			<KEYWORD2>strptime</KEYWORD2>
-			<KEYWORD2>strrchr</KEYWORD2>
-			<KEYWORD2>strrev</KEYWORD2>
-			<KEYWORD2>strripos</KEYWORD2>
-			<KEYWORD2>strrpos</KEYWORD2>
-			<KEYWORD2>strspn</KEYWORD2>
-			<KEYWORD2>strstr</KEYWORD2>
-			<KEYWORD2>strtok</KEYWORD2>
-			<KEYWORD2>strtolower</KEYWORD2>
-			<KEYWORD2>strtotime</KEYWORD2>
-			<KEYWORD2>strtoupper</KEYWORD2>
-			<KEYWORD2>strtr</KEYWORD2>
-			<KEYWORD2>strval</KEYWORD2>
-			<KEYWORD2>substr</KEYWORD2>
-			<KEYWORD2>substr_compare</KEYWORD2>
-			<KEYWORD2>substr_count</KEYWORD2>
-			<KEYWORD2>substr_replace</KEYWORD2>
-			<KEYWORD2>substringdata</KEYWORD2> <!-- domcharacterdata -->
-			<KEYWORD2>swf_actiongeturl</KEYWORD2>
-			<KEYWORD2>swf_actiongotoframe</KEYWORD2>
-			<KEYWORD2>swf_actiongotolabel</KEYWORD2>
-			<KEYWORD2>swf_actionnextframe</KEYWORD2>
-			<KEYWORD2>swf_actionplay</KEYWORD2>
-			<KEYWORD2>swf_actionprevframe</KEYWORD2>
-			<KEYWORD2>swf_actionsettarget</KEYWORD2>
-			<KEYWORD2>swf_actionstop</KEYWORD2>
-			<KEYWORD2>swf_actiontogglequality</KEYWORD2>
-			<KEYWORD2>swf_actionwaitforframe</KEYWORD2>
-			<KEYWORD2>swf_addbuttonrecord</KEYWORD2>
-			<KEYWORD2>swf_addcolor</KEYWORD2>
-			<KEYWORD2>swf_closefile</KEYWORD2>
-			<KEYWORD2>swf_definebitmap</KEYWORD2>
-			<KEYWORD2>swf_definefont</KEYWORD2>
-			<KEYWORD2>swf_defineline</KEYWORD2>
-			<KEYWORD2>swf_definepoly</KEYWORD2>
-			<KEYWORD2>swf_definerect</KEYWORD2>
-			<KEYWORD2>swf_definetext</KEYWORD2>
-			<KEYWORD2>swf_endbutton</KEYWORD2>
-			<KEYWORD2>swf_enddoaction</KEYWORD2>
-			<KEYWORD2>swf_endshape</KEYWORD2>
-			<KEYWORD2>swf_endsymbol</KEYWORD2>
-			<KEYWORD2>swf_fontsize</KEYWORD2>
-			<KEYWORD2>swf_fontslant</KEYWORD2>
-			<KEYWORD2>swf_fonttracking</KEYWORD2>
-			<KEYWORD2>swf_getbitmapinfo</KEYWORD2>
-			<KEYWORD2>swf_getfontinfo</KEYWORD2>
-			<KEYWORD2>swf_getframe</KEYWORD2>
-			<KEYWORD2>swf_labelframe</KEYWORD2>
-			<KEYWORD2>swf_lookat</KEYWORD2>
-			<KEYWORD2>swf_modifyobject</KEYWORD2>
-			<KEYWORD2>swf_mulcolor</KEYWORD2>
-			<KEYWORD2>swf_nextid</KEYWORD2>
-			<KEYWORD2>swf_oncondition</KEYWORD2>
-			<KEYWORD2>swf_openfile</KEYWORD2>
-			<KEYWORD2>swf_ortho</KEYWORD2>
-			<KEYWORD2>swf_ortho2</KEYWORD2>
-			<KEYWORD2>swf_perspective</KEYWORD2>
-			<KEYWORD2>swf_placeobject</KEYWORD2>
-			<KEYWORD2>swf_polarview</KEYWORD2>
-			<KEYWORD2>swf_popmatrix</KEYWORD2>
-			<KEYWORD2>swf_posround</KEYWORD2>
-			<KEYWORD2>swf_pushmatrix</KEYWORD2>
-			<KEYWORD2>swf_removeobject</KEYWORD2>
-			<KEYWORD2>swf_rotate</KEYWORD2>
-			<KEYWORD2>swf_scale</KEYWORD2>
-			<KEYWORD2>swf_setfont</KEYWORD2>
-			<KEYWORD2>swf_setframe</KEYWORD2>
-			<KEYWORD2>swf_shapearc</KEYWORD2>
-			<KEYWORD2>swf_shapecurveto</KEYWORD2>
-			<KEYWORD2>swf_shapecurveto3</KEYWORD2>
-			<KEYWORD2>swf_shapefillbitmapclip</KEYWORD2>
-			<KEYWORD2>swf_shapefillbitmaptile</KEYWORD2>
-			<KEYWORD2>swf_shapefilloff</KEYWORD2>
-			<KEYWORD2>swf_shapefillsolid</KEYWORD2>
-			<KEYWORD2>swf_shapelinesolid</KEYWORD2>
-			<KEYWORD2>swf_shapelineto</KEYWORD2>
-			<KEYWORD2>swf_shapemoveto</KEYWORD2>
-			<KEYWORD2>swf_showframe</KEYWORD2>
-			<KEYWORD2>swf_startbutton</KEYWORD2>
-			<KEYWORD2>swf_startdoaction</KEYWORD2>
-			<KEYWORD2>swf_startshape</KEYWORD2>
-			<KEYWORD2>swf_startsymbol</KEYWORD2>
-			<KEYWORD2>swf_textwidth</KEYWORD2>
-			<KEYWORD2>swf_translate</KEYWORD2>
-			<KEYWORD2>swf_viewport</KEYWORD2>
-			<KEYWORD2>swfbutton_keypress</KEYWORD2>
-			<KEYWORD2>sybase_affected_rows</KEYWORD2>
-			<KEYWORD2>sybase_close</KEYWORD2>
-			<KEYWORD2>sybase_connect</KEYWORD2>
-			<KEYWORD2>sybase_data_seek</KEYWORD2>
-			<KEYWORD2>sybase_deadlock_retry_count</KEYWORD2>
-			<KEYWORD2>sybase_fetch_array</KEYWORD2>
-			<KEYWORD2>sybase_fetch_assoc</KEYWORD2>
-			<KEYWORD2>sybase_fetch_field</KEYWORD2>
-			<KEYWORD2>sybase_fetch_object</KEYWORD2>
-			<KEYWORD2>sybase_fetch_row</KEYWORD2>
-			<KEYWORD2>sybase_field_seek</KEYWORD2>
-			<KEYWORD2>sybase_free_result</KEYWORD2>
-			<KEYWORD2>sybase_get_last_message</KEYWORD2>
-			<KEYWORD2>sybase_min_client_severity</KEYWORD2>
-			<KEYWORD2>sybase_min_error_severity</KEYWORD2>
-			<KEYWORD2>sybase_min_message_severity</KEYWORD2>
-			<KEYWORD2>sybase_min_server_severity</KEYWORD2>
-			<KEYWORD2>sybase_num_fields</KEYWORD2>
-			<KEYWORD2>sybase_num_rows</KEYWORD2>
-			<KEYWORD2>sybase_pconnect</KEYWORD2>
-			<KEYWORD2>sybase_query</KEYWORD2>
-			<KEYWORD2>sybase_result</KEYWORD2>
-			<KEYWORD2>sybase_select_db</KEYWORD2>
-			<KEYWORD2>sybase_set_message_handler</KEYWORD2>
-			<KEYWORD2>sybase_unbuffered_query</KEYWORD2>
-			<KEYWORD2>symlink</KEYWORD2>
-			<KEYWORD2>syslog</KEYWORD2>
-			<KEYWORD2>system</KEYWORD2>
-			<KEYWORD2>system_id</KEYWORD2> <!-- domdocumenttype -->
-			<KEYWORD2>tagname</KEYWORD2> <!-- domelement -->
-			<KEYWORD2>tan</KEYWORD2>
-			<KEYWORD2>tanh</KEYWORD2>
-			<KEYWORD2>target</KEYWORD2> <!-- domprocessinginstruction -->
-			<KEYWORD2>tcpwrap_check</KEYWORD2>
-			<KEYWORD2>tell</KEYWORD2> <!-- lob -->
-			<KEYWORD2>tempnam</KEYWORD2>
-			<KEYWORD2>textdomain</KEYWORD2>
-			<KEYWORD2>tidy_access_count</KEYWORD2>
-			<KEYWORD2>tidy_clean_repair</KEYWORD2>
-			<KEYWORD2>tidy_config_count</KEYWORD2>
-			<KEYWORD2>tidy_diagnose</KEYWORD2>
-			<KEYWORD2>tidy_error_count</KEYWORD2>
-			<KEYWORD2>tidy_get_body</KEYWORD2>
-			<KEYWORD2>tidy_get_config</KEYWORD2>
-			<KEYWORD2>tidy_get_error_buffer</KEYWORD2>
-			<KEYWORD2>tidy_get_head</KEYWORD2>
-			<KEYWORD2>tidy_get_html</KEYWORD2>
-			<KEYWORD2>tidy_get_html_ver</KEYWORD2>
-			<KEYWORD2>tidy_get_output</KEYWORD2>
-			<KEYWORD2>tidy_get_release</KEYWORD2>
-			<KEYWORD2>tidy_get_root</KEYWORD2>
-			<KEYWORD2>tidy_get_status</KEYWORD2>
-			<KEYWORD2>tidy_getopt</KEYWORD2>
-			<KEYWORD2>tidy_is_xhtml</KEYWORD2>
-			<KEYWORD2>tidy_is_xml</KEYWORD2>
-			<KEYWORD2>tidy_load_config</KEYWORD2>
-			<KEYWORD2>tidy_parse_file</KEYWORD2>
-			<KEYWORD2>tidy_parse_string</KEYWORD2>
-			<KEYWORD2>tidy_repair_file</KEYWORD2>
-			<KEYWORD2>tidy_repair_string</KEYWORD2>
-			<KEYWORD2>tidy_reset_config</KEYWORD2>
-			<KEYWORD2>tidy_save_config</KEYWORD2>
-			<KEYWORD2>tidy_set_encoding</KEYWORD2>
-			<KEYWORD2>tidy_setopt</KEYWORD2>
-			<KEYWORD2>tidy_warning_count</KEYWORD2>
-			<KEYWORD2>time</KEYWORD2>
-			<KEYWORD2>time_nanosleep</KEYWORD2>
-			<KEYWORD2>title</KEYWORD2> <!-- hw_api_object -->
-			<KEYWORD2>tmpfile</KEYWORD2>
-			<KEYWORD2>token_get_all</KEYWORD2>
-			<KEYWORD2>token_name</KEYWORD2>
-			<KEYWORD2>touch</KEYWORD2>
-			<KEYWORD2>trigger_error</KEYWORD2>
-			<KEYWORD2>trim</KEYWORD2> <!-- collection -->
-			<KEYWORD2>truncate</KEYWORD2> <!-- lob -->
-			<KEYWORD2>type</KEYWORD2> <!-- hw_api_reason -->
-			<KEYWORD2>uasort</KEYWORD2>
-			<KEYWORD2>ucfirst</KEYWORD2>
-			<KEYWORD2>ucwords</KEYWORD2>
-			<KEYWORD2>udm_add_search_limit</KEYWORD2>
-			<KEYWORD2>udm_alloc_agent</KEYWORD2>
-			<KEYWORD2>udm_alloc_agent_array</KEYWORD2>
-			<KEYWORD2>udm_api_version</KEYWORD2>
-			<KEYWORD2>udm_cat_list</KEYWORD2>
-			<KEYWORD2>udm_cat_path</KEYWORD2>
-			<KEYWORD2>udm_check_charset</KEYWORD2>
-			<KEYWORD2>udm_check_stored</KEYWORD2>
-			<KEYWORD2>udm_clear_search_limits</KEYWORD2>
-			<KEYWORD2>udm_close_stored</KEYWORD2>
-			<KEYWORD2>udm_crc32</KEYWORD2>
-			<KEYWORD2>udm_errno</KEYWORD2>
-			<KEYWORD2>udm_error</KEYWORD2>
-			<KEYWORD2>udm_find</KEYWORD2>
-			<KEYWORD2>udm_free_agent</KEYWORD2>
-			<KEYWORD2>udm_free_ispell_data</KEYWORD2>
-			<KEYWORD2>udm_free_res</KEYWORD2>
-			<KEYWORD2>udm_get_doc_count</KEYWORD2>
-			<KEYWORD2>udm_get_res_field</KEYWORD2>
-			<KEYWORD2>udm_get_res_param</KEYWORD2>
-			<KEYWORD2>udm_hash32</KEYWORD2>
-			<KEYWORD2>udm_load_ispell_data</KEYWORD2>
-			<KEYWORD2>udm_open_stored</KEYWORD2>
-			<KEYWORD2>udm_set_agent_param</KEYWORD2>
-			<KEYWORD2>uksort</KEYWORD2>
-			<KEYWORD2>umask</KEYWORD2>
-			<KEYWORD2>uniqid</KEYWORD2>
-			<KEYWORD2>unixtojd</KEYWORD2>
-			<KEYWORD2>unlink</KEYWORD2>
-			<KEYWORD2>unlink_node</KEYWORD2> <!-- domnode -->
-			<KEYWORD2>unlock</KEYWORD2> <!-- hw_api -->
-			<KEYWORD2>unpack</KEYWORD2>
-			<KEYWORD2>unregister_tick_function</KEYWORD2>
-			<KEYWORD2>unserialize</KEYWORD2>
-			<KEYWORD2>urldecode</KEYWORD2>
-			<KEYWORD2>urlencode</KEYWORD2>
-			<KEYWORD2>user</KEYWORD2> <!-- hw_api -->
-			<KEYWORD2>user_error</KEYWORD2>
-			<KEYWORD2>userlist</KEYWORD2> <!-- hw_api -->
-			<KEYWORD2>usleep</KEYWORD2>
-			<KEYWORD2>usort</KEYWORD2>
-			<KEYWORD2>utf8_decode</KEYWORD2>
-			<KEYWORD2>utf8_encode</KEYWORD2>
-			<KEYWORD2>valid</KEYWORD2> <!-- arrayiterator, cachingiterator, directoryiterator, filteriterator, limititerator, recursiveiteratoriterator, simplexmliterator -->
-			<KEYWORD2>validate</KEYWORD2> <!-- domdocument -->
-			<KEYWORD2>value</KEYWORD2> <!-- domattribute, hw_api_attribute, hw_api_object -->
-			<KEYWORD2>values</KEYWORD2> <!-- hw_api_attribute -->
-			<KEYWORD2>var_dump</KEYWORD2>
-			<KEYWORD2>var_export</KEYWORD2>
-			<KEYWORD2>variant_abs</KEYWORD2>
-			<KEYWORD2>variant_add</KEYWORD2>
-			<KEYWORD2>variant_and</KEYWORD2>
-			<KEYWORD2>variant_cast</KEYWORD2>
-			<KEYWORD2>variant_cat</KEYWORD2>
-			<KEYWORD2>variant_cmp</KEYWORD2>
-			<KEYWORD2>variant_date_from_timestamp</KEYWORD2>
-			<KEYWORD2>variant_date_to_timestamp</KEYWORD2>
-			<KEYWORD2>variant_div</KEYWORD2>
-			<KEYWORD2>variant_eqv</KEYWORD2>
-			<KEYWORD2>variant_fix</KEYWORD2>
-			<KEYWORD2>variant_get_type</KEYWORD2>
-			<KEYWORD2>variant_idiv</KEYWORD2>
-			<KEYWORD2>variant_imp</KEYWORD2>
-			<KEYWORD2>variant_int</KEYWORD2>
-			<KEYWORD2>variant_mod</KEYWORD2>
-			<KEYWORD2>variant_mul</KEYWORD2>
-			<KEYWORD2>variant_neg</KEYWORD2>
-			<KEYWORD2>variant_not</KEYWORD2>
-			<KEYWORD2>variant_or</KEYWORD2>
-			<KEYWORD2>variant_pow</KEYWORD2>
-			<KEYWORD2>variant_round</KEYWORD2>
-			<KEYWORD2>variant_set</KEYWORD2>
-			<KEYWORD2>variant_set_type</KEYWORD2>
-			<KEYWORD2>variant_sub</KEYWORD2>
-			<KEYWORD2>variant_xor</KEYWORD2>
-			<KEYWORD2>version_compare</KEYWORD2>
-			<KEYWORD2>vfprintf</KEYWORD2>
-			<KEYWORD2>virtual</KEYWORD2>
-			<KEYWORD2>vpopmail_add_alias_domain</KEYWORD2>
-			<KEYWORD2>vpopmail_add_alias_domain_ex</KEYWORD2>
-			<KEYWORD2>vpopmail_add_domain</KEYWORD2>
-			<KEYWORD2>vpopmail_add_domain_ex</KEYWORD2>
-			<KEYWORD2>vpopmail_add_user</KEYWORD2>
-			<KEYWORD2>vpopmail_alias_add</KEYWORD2>
-			<KEYWORD2>vpopmail_alias_del</KEYWORD2>
-			<KEYWORD2>vpopmail_alias_del_domain</KEYWORD2>
-			<KEYWORD2>vpopmail_alias_get</KEYWORD2>
-			<KEYWORD2>vpopmail_alias_get_all</KEYWORD2>
-			<KEYWORD2>vpopmail_auth_user</KEYWORD2>
-			<KEYWORD2>vpopmail_del_domain</KEYWORD2>
-			<KEYWORD2>vpopmail_del_domain_ex</KEYWORD2>
-			<KEYWORD2>vpopmail_del_user</KEYWORD2>
-			<KEYWORD2>vpopmail_error</KEYWORD2>
-			<KEYWORD2>vpopmail_passwd</KEYWORD2>
-			<KEYWORD2>vpopmail_set_user_quota</KEYWORD2>
-			<KEYWORD2>vprintf</KEYWORD2>
-			<KEYWORD2>vsprintf</KEYWORD2>
-			<KEYWORD2>w32api_deftype</KEYWORD2>
-			<KEYWORD2>w32api_init_dtype</KEYWORD2>
-			<KEYWORD2>w32api_invoke_function</KEYWORD2>
-			<KEYWORD2>w32api_register_function</KEYWORD2>
-			<KEYWORD2>w32api_set_call_method</KEYWORD2>
-			<KEYWORD2>wddx_add_vars</KEYWORD2>
-			<KEYWORD2>wddx_deserialize</KEYWORD2>
-			<KEYWORD2>wddx_packet_end</KEYWORD2>
-			<KEYWORD2>wddx_packet_start</KEYWORD2>
-			<KEYWORD2>wddx_serialize_value</KEYWORD2>
-			<KEYWORD2>wddx_serialize_vars</KEYWORD2>
-			<KEYWORD2>wordwrap</KEYWORD2>
-			<KEYWORD2>write</KEYWORD2> <!-- lob -->
-			<KEYWORD2>writetemporary</KEYWORD2> <!-- lob -->
-			<KEYWORD2>xattr_get</KEYWORD2>
-			<KEYWORD2>xattr_list</KEYWORD2>
-			<KEYWORD2>xattr_remove</KEYWORD2>
-			<KEYWORD2>xattr_set</KEYWORD2>
-			<KEYWORD2>xattr_supported</KEYWORD2>
-			<KEYWORD2>xdiff_file_diff</KEYWORD2>
-			<KEYWORD2>xdiff_file_diff_binary</KEYWORD2>
-			<KEYWORD2>xdiff_file_merge3</KEYWORD2>
-			<KEYWORD2>xdiff_file_patch</KEYWORD2>
-			<KEYWORD2>xdiff_file_patch_binary</KEYWORD2>
-			<KEYWORD2>xdiff_string_diff</KEYWORD2>
-			<KEYWORD2>xdiff_string_diff_binary</KEYWORD2>
-			<KEYWORD2>xdiff_string_merge3</KEYWORD2>
-			<KEYWORD2>xdiff_string_patch</KEYWORD2>
-			<KEYWORD2>xdiff_string_patch_binary</KEYWORD2>
-			<KEYWORD2>xinclude</KEYWORD2> <!-- domdocument, domdocument -->
-			<KEYWORD2>xml_error_string</KEYWORD2>
-			<KEYWORD2>xml_get_current_byte_index</KEYWORD2>
-			<KEYWORD2>xml_get_current_column_number</KEYWORD2>
-			<KEYWORD2>xml_get_current_line_number</KEYWORD2>
-			<KEYWORD2>xml_get_error_code</KEYWORD2>
-			<KEYWORD2>xml_parse</KEYWORD2>
-			<KEYWORD2>xml_parse_into_struct</KEYWORD2>
-			<KEYWORD2>xml_parser_create</KEYWORD2>
-			<KEYWORD2>xml_parser_create_ns</KEYWORD2>
-			<KEYWORD2>xml_parser_free</KEYWORD2>
-			<KEYWORD2>xml_parser_get_option</KEYWORD2>
-			<KEYWORD2>xml_parser_set_option</KEYWORD2>
-			<KEYWORD2>xml_set_character_data_handler</KEYWORD2>
-			<KEYWORD2>xml_set_default_handler</KEYWORD2>
-			<KEYWORD2>xml_set_element_handler</KEYWORD2>
-			<KEYWORD2>xml_set_end_namespace_decl_handler</KEYWORD2>
-			<KEYWORD2>xml_set_external_entity_ref_handler</KEYWORD2>
-			<KEYWORD2>xml_set_notation_decl_handler</KEYWORD2>
-			<KEYWORD2>xml_set_object</KEYWORD2>
-			<KEYWORD2>xml_set_processing_instruction_handler</KEYWORD2>
-			<KEYWORD2>xml_set_start_namespace_decl_handler</KEYWORD2>
-			<KEYWORD2>xml_set_unparsed_entity_decl_handler</KEYWORD2>
-			<KEYWORD2>xmlrpc_decode</KEYWORD2>
-			<KEYWORD2>xmlrpc_decode_request</KEYWORD2>
-			<KEYWORD2>xmlrpc_encode</KEYWORD2>
-			<KEYWORD2>xmlrpc_encode_request</KEYWORD2>
-			<KEYWORD2>xmlrpc_get_type</KEYWORD2>
-			<KEYWORD2>xmlrpc_is_fault</KEYWORD2>
-			<KEYWORD2>xmlrpc_parse_method_descriptions</KEYWORD2>
-			<KEYWORD2>xmlrpc_server_add_introspection_data</KEYWORD2>
-			<KEYWORD2>xmlrpc_server_call_method</KEYWORD2>
-			<KEYWORD2>xmlrpc_server_create</KEYWORD2>
-			<KEYWORD2>xmlrpc_server_destroy</KEYWORD2>
-			<KEYWORD2>xmlrpc_server_register_introspection_callback</KEYWORD2>
-			<KEYWORD2>xmlrpc_server_register_method</KEYWORD2>
-			<KEYWORD2>xmlrpc_set_type</KEYWORD2>
-			<KEYWORD2>xpath</KEYWORD2> <!-- simplexmlelement -->
-			<KEYWORD2>xpath_eval</KEYWORD2>
-			<KEYWORD2>xpath_eval_expression</KEYWORD2>
-			<KEYWORD2>xpath_new_context</KEYWORD2>
-			<KEYWORD2>xptr_eval</KEYWORD2>
-			<KEYWORD2>xptr_new_context</KEYWORD2>
-			<KEYWORD2>xsl_xsltprocessor_get_parameter</KEYWORD2>
-			<KEYWORD2>xsl_xsltprocessor_has_exslt_support</KEYWORD2>
-			<KEYWORD2>xsl_xsltprocessor_import_stylesheet</KEYWORD2>
-			<KEYWORD2>xsl_xsltprocessor_register_php_functions</KEYWORD2>
-			<KEYWORD2>xsl_xsltprocessor_remove_parameter</KEYWORD2>
-			<KEYWORD2>xsl_xsltprocessor_set_parameter</KEYWORD2>
-			<KEYWORD2>xsl_xsltprocessor_transform_to_doc</KEYWORD2>
-			<KEYWORD2>xsl_xsltprocessor_transform_to_uri</KEYWORD2>
-			<KEYWORD2>xsl_xsltprocessor_transform_to_xml</KEYWORD2>
-			<KEYWORD2>xslt_backend_info</KEYWORD2>
-			<KEYWORD2>xslt_backend_name</KEYWORD2>
-			<KEYWORD2>xslt_backend_version</KEYWORD2>
-			<KEYWORD2>xslt_create</KEYWORD2>
-			<KEYWORD2>xslt_errno</KEYWORD2>
-			<KEYWORD2>xslt_error</KEYWORD2>
-			<KEYWORD2>xslt_free</KEYWORD2>
-			<KEYWORD2>xslt_getopt</KEYWORD2>
-			<KEYWORD2>xslt_process</KEYWORD2>
-			<KEYWORD2>xslt_set_base</KEYWORD2>
-			<KEYWORD2>xslt_set_encoding</KEYWORD2>
-			<KEYWORD2>xslt_set_error_handler</KEYWORD2>
-			<KEYWORD2>xslt_set_log</KEYWORD2>
-			<KEYWORD2>xslt_set_object</KEYWORD2>
-			<KEYWORD2>xslt_set_sax_handler</KEYWORD2>
-			<KEYWORD2>xslt_set_sax_handlers</KEYWORD2>
-			<KEYWORD2>xslt_set_scheme_handler</KEYWORD2>
-			<KEYWORD2>xslt_set_scheme_handlers</KEYWORD2>
-			<KEYWORD2>xslt_setopt</KEYWORD2>
-			<KEYWORD2>yaz_addinfo</KEYWORD2>
-			<KEYWORD2>yaz_ccl_conf</KEYWORD2>
-			<KEYWORD2>yaz_ccl_parse</KEYWORD2>
-			<KEYWORD2>yaz_close</KEYWORD2>
-			<KEYWORD2>yaz_connect</KEYWORD2>
-			<KEYWORD2>yaz_database</KEYWORD2>
-			<KEYWORD2>yaz_element</KEYWORD2>
-			<KEYWORD2>yaz_errno</KEYWORD2>
-			<KEYWORD2>yaz_error</KEYWORD2>
-			<KEYWORD2>yaz_es_result</KEYWORD2>
-			<KEYWORD2>yaz_get_option</KEYWORD2>
-			<KEYWORD2>yaz_hits</KEYWORD2>
-			<KEYWORD2>yaz_itemorder</KEYWORD2>
-			<KEYWORD2>yaz_present</KEYWORD2>
-			<KEYWORD2>yaz_range</KEYWORD2>
-			<KEYWORD2>yaz_record</KEYWORD2>
-			<KEYWORD2>yaz_scan</KEYWORD2>
-			<KEYWORD2>yaz_scan_result</KEYWORD2>
-			<KEYWORD2>yaz_schema</KEYWORD2>
-			<KEYWORD2>yaz_search</KEYWORD2>
-			<KEYWORD2>yaz_set_option</KEYWORD2>
-			<KEYWORD2>yaz_sort</KEYWORD2>
-			<KEYWORD2>yaz_syntax</KEYWORD2>
-			<KEYWORD2>yaz_wait</KEYWORD2>
-			<KEYWORD2>yp_all</KEYWORD2>
-			<KEYWORD2>yp_cat</KEYWORD2>
-			<KEYWORD2>yp_err_string</KEYWORD2>
-			<KEYWORD2>yp_errno</KEYWORD2>
-			<KEYWORD2>yp_first</KEYWORD2>
-			<KEYWORD2>yp_get_default_domain</KEYWORD2>
-			<KEYWORD2>yp_master</KEYWORD2>
-			<KEYWORD2>yp_match</KEYWORD2>
-			<KEYWORD2>yp_next</KEYWORD2>
-			<KEYWORD2>yp_order</KEYWORD2>
-			<KEYWORD2>zend_logo_guid</KEYWORD2>
-			<KEYWORD2>zend_version</KEYWORD2>
-			<KEYWORD2>zip_close</KEYWORD2>
-			<KEYWORD2>zip_entry_close</KEYWORD2>
-			<KEYWORD2>zip_entry_compressedsize</KEYWORD2>
-			<KEYWORD2>zip_entry_compressionmethod</KEYWORD2>
-			<KEYWORD2>zip_entry_filesize</KEYWORD2>
-			<KEYWORD2>zip_entry_name</KEYWORD2>
-			<KEYWORD2>zip_entry_open</KEYWORD2>
-			<KEYWORD2>zip_entry_read</KEYWORD2>
-			<KEYWORD2>zip_open</KEYWORD2>
-			<KEYWORD2>zip_read</KEYWORD2>
-			<KEYWORD2>zlib_get_coding_type</KEYWORD2>
-
-
-			<!-- Alias functions (343)
-				http://zend.com/phpfunc/all_aliases.php -->
-			<KEYWORD2>apache_request_headers</KEYWORD2>
-			<KEYWORD2>apache_response_headers</KEYWORD2>
-			<KEYWORD2>attr_get</KEYWORD2>
-			<KEYWORD2>attr_set</KEYWORD2>
-			<KEYWORD2>autocommit</KEYWORD2>
-			<KEYWORD2>bind_param</KEYWORD2>
-			<KEYWORD2>bind_result</KEYWORD2>
-			<KEYWORD2>bzclose</KEYWORD2>
-			<KEYWORD2>bzflush</KEYWORD2>
-			<KEYWORD2>bzwrite</KEYWORD2>
-			<KEYWORD2>change_user</KEYWORD2>
-			<KEYWORD2>character_set_name</KEYWORD2>
-			<KEYWORD2>checkdnsrr</KEYWORD2>
-			<KEYWORD2>chop</KEYWORD2>
-			<KEYWORD2>client_encoding</KEYWORD2>
-			<KEYWORD2>close</KEYWORD2>
-			<KEYWORD2>commit</KEYWORD2>
-			<KEYWORD2>connect</KEYWORD2>
-			<KEYWORD2>data_seek</KEYWORD2>
-			<KEYWORD2>debug</KEYWORD2>
-			<KEYWORD2>disable_reads_from_master</KEYWORD2>
-			<KEYWORD2>disable_rpl_parse</KEYWORD2>
-			<KEYWORD2>diskfreespace</KEYWORD2>
-			<KEYWORD2>doubleval</KEYWORD2>
-			<KEYWORD2>dump_debug_info</KEYWORD2>
-			<KEYWORD2>enable_reads_from_master</KEYWORD2>
-			<KEYWORD2>enable_rpl_parse</KEYWORD2>
-			<KEYWORD2>escape_string</KEYWORD2>
-			<KEYWORD2>execute</KEYWORD2>
-			<KEYWORD2>fbird_add_user</KEYWORD2>
-			<KEYWORD2>fbird_affected_rows</KEYWORD2>
-			<KEYWORD2>fbird_backup</KEYWORD2>
-			<KEYWORD2>fbird_blob_add</KEYWORD2>
-			<KEYWORD2>fbird_blob_cancel</KEYWORD2>
-			<KEYWORD2>fbird_blob_close</KEYWORD2>
-			<KEYWORD2>fbird_blob_create</KEYWORD2>
-			<KEYWORD2>fbird_blob_echo</KEYWORD2>
-			<KEYWORD2>fbird_blob_get</KEYWORD2>
-			<KEYWORD2>fbird_blob_import</KEYWORD2>
-			<KEYWORD2>fbird_blob_info</KEYWORD2>
-			<KEYWORD2>fbird_blob_open</KEYWORD2>
-			<KEYWORD2>fbird_close</KEYWORD2>
-			<KEYWORD2>fbird_commit</KEYWORD2>
-			<KEYWORD2>fbird_commit_ret</KEYWORD2>
-			<KEYWORD2>fbird_connect</KEYWORD2>
-			<KEYWORD2>fbird_db_info</KEYWORD2>
-			<KEYWORD2>fbird_delete_user</KEYWORD2>
-			<KEYWORD2>fbird_drop_db</KEYWORD2>
-			<KEYWORD2>fbird_errcode</KEYWORD2>
-			<KEYWORD2>fbird_errmsg</KEYWORD2>
-			<KEYWORD2>fbird_execute</KEYWORD2>
-			<KEYWORD2>fbird_fetch_assoc</KEYWORD2>
-			<KEYWORD2>fbird_fetch_object</KEYWORD2>
-			<KEYWORD2>fbird_fetch_row</KEYWORD2>
-			<KEYWORD2>fbird_field_info</KEYWORD2>
-			<KEYWORD2>fbird_free_event_handler</KEYWORD2>
-			<KEYWORD2>fbird_free_query</KEYWORD2>
-			<KEYWORD2>fbird_free_result</KEYWORD2>
-			<KEYWORD2>fbird_gen_id</KEYWORD2>
-			<KEYWORD2>fbird_maintain_db</KEYWORD2>
-			<KEYWORD2>fbird_modify_user</KEYWORD2>
-			<KEYWORD2>fbird_name_result</KEYWORD2>
-			<KEYWORD2>fbird_num_fields</KEYWORD2>
-			<KEYWORD2>fbird_num_params</KEYWORD2>
-			<KEYWORD2>fbird_num_rows</KEYWORD2>
-			<KEYWORD2>fbird_param_info</KEYWORD2>
-			<KEYWORD2>fbird_pconnect</KEYWORD2>
-			<KEYWORD2>fbird_prepare</KEYWORD2>
-			<KEYWORD2>fbird_query</KEYWORD2>
-			<KEYWORD2>fbird_restore</KEYWORD2>
-			<KEYWORD2>fbird_rollback</KEYWORD2>
-			<KEYWORD2>fbird_rollback_ret</KEYWORD2>
-			<KEYWORD2>fbird_server_info</KEYWORD2>
-			<KEYWORD2>fbird_service_attach</KEYWORD2>
-			<KEYWORD2>fbird_service_detach</KEYWORD2>
-			<KEYWORD2>fbird_set_event_handler</KEYWORD2>
-			<KEYWORD2>fbird_trans</KEYWORD2>
-			<KEYWORD2>fbird_wait_event</KEYWORD2>
-			<KEYWORD2>fbsql</KEYWORD2>
-			<KEYWORD2>fbsql_tablename</KEYWORD2>
-			<KEYWORD2>fetch</KEYWORD2>
-			<KEYWORD2>fetch_array</KEYWORD2>
-			<KEYWORD2>fetch_assoc</KEYWORD2>
-			<KEYWORD2>fetch_field</KEYWORD2>
-			<KEYWORD2>fetch_field_direct</KEYWORD2>
-			<KEYWORD2>fetch_fields</KEYWORD2>
-			<KEYWORD2>fetch_object</KEYWORD2>
-			<KEYWORD2>fetch_row</KEYWORD2>
-			<KEYWORD2>field_count</KEYWORD2>
-			<KEYWORD2>field_seek</KEYWORD2>
-			<KEYWORD2>fputs</KEYWORD2>
-			<KEYWORD2>free</KEYWORD2>
-			<KEYWORD2>free_result</KEYWORD2>
-			<KEYWORD2>ftp_quit</KEYWORD2>
-			<KEYWORD2>get_client_info</KEYWORD2>
-			<KEYWORD2>get_required_files</KEYWORD2>
-			<KEYWORD2>get_server_info</KEYWORD2>
-			<KEYWORD2>getallheaders</KEYWORD2>
-			<KEYWORD2>getmxrr</KEYWORD2>
-			<KEYWORD2>gmp_div</KEYWORD2>
-			<KEYWORD2>gzclose</KEYWORD2>
-			<KEYWORD2>gzeof</KEYWORD2>
-			<KEYWORD2>gzgetc</KEYWORD2>
-			<KEYWORD2>gzgets</KEYWORD2>
-			<KEYWORD2>gzgetss</KEYWORD2>
-			<KEYWORD2>gzpassthru</KEYWORD2>
-			<KEYWORD2>gzputs</KEYWORD2>
-			<KEYWORD2>gzread</KEYWORD2>
-			<KEYWORD2>gzrewind</KEYWORD2>
-			<KEYWORD2>gzseek</KEYWORD2>
-			<KEYWORD2>gztell</KEYWORD2>
-			<KEYWORD2>gzwrite</KEYWORD2>
-			<KEYWORD2>imap_create</KEYWORD2>
-			<KEYWORD2>imap_fetchtext</KEYWORD2>
-			<KEYWORD2>imap_header</KEYWORD2>
-			<KEYWORD2>imap_listmailbox</KEYWORD2>
-			<KEYWORD2>imap_listsubscribed</KEYWORD2>
-			<KEYWORD2>imap_rename</KEYWORD2>
-			<KEYWORD2>ini_alter</KEYWORD2>
-			<KEYWORD2>init</KEYWORD2>
-			<KEYWORD2>is_double</KEYWORD2>
-			<KEYWORD2>is_int</KEYWORD2>
-			<KEYWORD2>is_integer</KEYWORD2>
-			<KEYWORD2>is_real</KEYWORD2>
-			<KEYWORD2>is_writeable</KEYWORD2>
-			<KEYWORD2>join</KEYWORD2>
-			<KEYWORD2>key_exists</KEYWORD2>
-			<KEYWORD2>kill</KEYWORD2>
-			<KEYWORD2>ldap_close</KEYWORD2>
-			<KEYWORD2>ldap_modify</KEYWORD2>
-			<KEYWORD2>magic_quotes_runtime</KEYWORD2>
-			<KEYWORD2>master_query</KEYWORD2>
-			<KEYWORD2>ming_keypress</KEYWORD2>
-			<KEYWORD2>ming_setcubicthreshold</KEYWORD2>
-			<KEYWORD2>ming_setscale</KEYWORD2>
-			<KEYWORD2>ming_useconstants</KEYWORD2>
-			<KEYWORD2>ming_useswfversion</KEYWORD2>
-			<KEYWORD2>more_results</KEYWORD2>
-			<KEYWORD2>msql</KEYWORD2>
-			<KEYWORD2>msql_affected_rows</KEYWORD2>
-			<KEYWORD2>msql_createdb</KEYWORD2>
-			<KEYWORD2>msql_dbname</KEYWORD2>
-			<KEYWORD2>msql_dropdb</KEYWORD2>
-			<KEYWORD2>msql_fieldflags</KEYWORD2>
-			<KEYWORD2>msql_fieldlen</KEYWORD2>
-			<KEYWORD2>msql_fieldname</KEYWORD2>
-			<KEYWORD2>msql_fieldtable</KEYWORD2>
-			<KEYWORD2>msql_fieldtype</KEYWORD2>
-			<KEYWORD2>msql_freeresult</KEYWORD2>
-			<KEYWORD2>msql_listdbs</KEYWORD2>
-			<KEYWORD2>msql_listfields</KEYWORD2>
-			<KEYWORD2>msql_listtables</KEYWORD2>
-			<KEYWORD2>msql_numfields</KEYWORD2>
-			<KEYWORD2>msql_numrows</KEYWORD2>
-			<KEYWORD2>msql_regcase</KEYWORD2>
-			<KEYWORD2>msql_selectdb</KEYWORD2>
-			<KEYWORD2>msql_tablename</KEYWORD2>
-			<KEYWORD2>mssql_affected_rows</KEYWORD2>
-			<KEYWORD2>mssql_close</KEYWORD2>
-			<KEYWORD2>mssql_connect</KEYWORD2>
-			<KEYWORD2>mssql_data_seek</KEYWORD2>
-			<KEYWORD2>mssql_deadlock_retry_count</KEYWORD2>
-			<KEYWORD2>mssql_fetch_array</KEYWORD2>
-			<KEYWORD2>mssql_fetch_assoc</KEYWORD2>
-			<KEYWORD2>mssql_fetch_field</KEYWORD2>
-			<KEYWORD2>mssql_fetch_object</KEYWORD2>
-			<KEYWORD2>mssql_fetch_row</KEYWORD2>
-			<KEYWORD2>mssql_field_seek</KEYWORD2>
-			<KEYWORD2>mssql_free_result</KEYWORD2>
-			<KEYWORD2>mssql_get_last_message</KEYWORD2>
-			<KEYWORD2>mssql_min_client_severity</KEYWORD2>
-			<KEYWORD2>mssql_min_error_severity</KEYWORD2>
-			<KEYWORD2>mssql_min_message_severity</KEYWORD2>
-			<KEYWORD2>mssql_min_server_severity</KEYWORD2>
-			<KEYWORD2>mssql_num_fields</KEYWORD2>
-			<KEYWORD2>mssql_num_rows</KEYWORD2>
-			<KEYWORD2>mssql_pconnect</KEYWORD2>
-			<KEYWORD2>mssql_query</KEYWORD2>
-			<KEYWORD2>mssql_result</KEYWORD2>
-			<KEYWORD2>mssql_select_db</KEYWORD2>
-			<KEYWORD2>mssql_set_message_handler</KEYWORD2>
-			<KEYWORD2>mssql_unbuffered_query</KEYWORD2>
-			<KEYWORD2>multi_query</KEYWORD2>
-			<KEYWORD2>mysql</KEYWORD2>
-			<KEYWORD2>mysql_createdb</KEYWORD2>
-			<KEYWORD2>mysql_db_name</KEYWORD2>
-			<KEYWORD2>mysql_dbname</KEYWORD2>
-			<KEYWORD2>mysql_dropdb</KEYWORD2>
-			<KEYWORD2>mysql_fieldflags</KEYWORD2>
-			<KEYWORD2>mysql_fieldlen</KEYWORD2>
-			<KEYWORD2>mysql_fieldname</KEYWORD2>
-			<KEYWORD2>mysql_fieldtable</KEYWORD2>
-			<KEYWORD2>mysql_fieldtype</KEYWORD2>
-			<KEYWORD2>mysql_freeresult</KEYWORD2>
-			<KEYWORD2>mysql_listdbs</KEYWORD2>
-			<KEYWORD2>mysql_listfields</KEYWORD2>
-			<KEYWORD2>mysql_listtables</KEYWORD2>
-			<KEYWORD2>mysql_numfields</KEYWORD2>
-			<KEYWORD2>mysql_numrows</KEYWORD2>
-			<KEYWORD2>mysql_selectdb</KEYWORD2>
-			<KEYWORD2>mysql_table_name</KEYWORD2>
-			<KEYWORD2>mysql_tablename</KEYWORD2>
-			<KEYWORD2>mysqli</KEYWORD2>
-			<KEYWORD2>mysqli_execute</KEYWORD2>
-			<KEYWORD2>mysqli_fetch</KEYWORD2>
-			<KEYWORD2>mysqli_set_opt</KEYWORD2>
-			<KEYWORD2>next_result</KEYWORD2>
-			<KEYWORD2>num_rows</KEYWORD2>
-			<KEYWORD2>oci_free_cursor</KEYWORD2>
-			<KEYWORD2>ocibindbyname</KEYWORD2>
-			<KEYWORD2>ocicancel</KEYWORD2>
-			<KEYWORD2>ocicollappend</KEYWORD2>
-			<KEYWORD2>ocicollassignelem</KEYWORD2>
-			<KEYWORD2>ocicollgetelem</KEYWORD2>
-			<KEYWORD2>ocicollmax</KEYWORD2>
-			<KEYWORD2>ocicollsize</KEYWORD2>
-			<KEYWORD2>ocicolltrim</KEYWORD2>
-			<KEYWORD2>ocicolumnisnull</KEYWORD2>
-			<KEYWORD2>ocicolumnname</KEYWORD2>
-			<KEYWORD2>ocicolumnprecision</KEYWORD2>
-			<KEYWORD2>ocicolumnscale</KEYWORD2>
-			<KEYWORD2>ocicolumnsize</KEYWORD2>
-			<KEYWORD2>ocicolumntype</KEYWORD2>
-			<KEYWORD2>ocicolumntyperaw</KEYWORD2>
-			<KEYWORD2>ocicommit</KEYWORD2>
-			<KEYWORD2>ocidefinebyname</KEYWORD2>
-			<KEYWORD2>ocierror</KEYWORD2>
-			<KEYWORD2>ociexecute</KEYWORD2>
-			<KEYWORD2>ocifetch</KEYWORD2>
-			<KEYWORD2>ocifetchstatement</KEYWORD2>
-			<KEYWORD2>ocifreecollection</KEYWORD2>
-			<KEYWORD2>ocifreecursor</KEYWORD2>
-			<KEYWORD2>ocifreedesc</KEYWORD2>
-			<KEYWORD2>ocifreestatement</KEYWORD2>
-			<KEYWORD2>ociinternaldebug</KEYWORD2>
-			<KEYWORD2>ociloadlob</KEYWORD2>
-			<KEYWORD2>ocilogoff</KEYWORD2>
-			<KEYWORD2>ocilogon</KEYWORD2>
-			<KEYWORD2>ocinewcollection</KEYWORD2>
-			<KEYWORD2>ocinewcursor</KEYWORD2>
-			<KEYWORD2>ocinewdescriptor</KEYWORD2>
-			<KEYWORD2>ocinlogon</KEYWORD2>
-			<KEYWORD2>ocinumcols</KEYWORD2>
-			<KEYWORD2>ociparse</KEYWORD2>
-			<KEYWORD2>ocipasswordchange</KEYWORD2>
-			<KEYWORD2>ociplogon</KEYWORD2>
-			<KEYWORD2>ociresult</KEYWORD2>
-			<KEYWORD2>ocirollback</KEYWORD2>
-			<KEYWORD2>ocirowcount</KEYWORD2>
-			<KEYWORD2>ocisavelob</KEYWORD2>
-			<KEYWORD2>ocisavelobfile</KEYWORD2>
-			<KEYWORD2>ociserverversion</KEYWORD2>
-			<KEYWORD2>ocisetprefetch</KEYWORD2>
-			<KEYWORD2>ocistatementtype</KEYWORD2>
-			<KEYWORD2>ociwritelobtofile</KEYWORD2>
-			<KEYWORD2>odbc_do</KEYWORD2>
-			<KEYWORD2>odbc_field_precision</KEYWORD2>
-			<KEYWORD2>openssl_free_key</KEYWORD2>
-			<KEYWORD2>openssl_get_privatekey</KEYWORD2>
-			<KEYWORD2>openssl_get_publickey</KEYWORD2>
-			<KEYWORD2>options</KEYWORD2>
-			<KEYWORD2>pg_clientencoding</KEYWORD2>
-			<KEYWORD2>pg_cmdtuples</KEYWORD2>
-			<KEYWORD2>pg_errormessage</KEYWORD2>
-			<KEYWORD2>pg_exec</KEYWORD2>
-			<KEYWORD2>pg_fieldisnull</KEYWORD2>
-			<KEYWORD2>pg_fieldname</KEYWORD2>
-			<KEYWORD2>pg_fieldnum</KEYWORD2>
-			<KEYWORD2>pg_fieldprtlen</KEYWORD2>
-			<KEYWORD2>pg_fieldsize</KEYWORD2>
-			<KEYWORD2>pg_fieldtype</KEYWORD2>
-			<KEYWORD2>pg_freeresult</KEYWORD2>
-			<KEYWORD2>pg_getlastoid</KEYWORD2>
-			<KEYWORD2>pg_loclose</KEYWORD2>
-			<KEYWORD2>pg_locreate</KEYWORD2>
-			<KEYWORD2>pg_loexport</KEYWORD2>
-			<KEYWORD2>pg_loimport</KEYWORD2>
-			<KEYWORD2>pg_loopen</KEYWORD2>
-			<KEYWORD2>pg_loread</KEYWORD2>
-			<KEYWORD2>pg_loreadall</KEYWORD2>
-			<KEYWORD2>pg_lounlink</KEYWORD2>
-			<KEYWORD2>pg_lowrite</KEYWORD2>
-			<KEYWORD2>pg_numfields</KEYWORD2>
-			<KEYWORD2>pg_numrows</KEYWORD2>
-			<KEYWORD2>pg_result</KEYWORD2>
-			<KEYWORD2>pg_setclientencoding</KEYWORD2>
-			<KEYWORD2>ping</KEYWORD2>
-			<KEYWORD2>pos</KEYWORD2>
-			<KEYWORD2>posix_errno</KEYWORD2>
-			<KEYWORD2>prepare</KEYWORD2>
-			<KEYWORD2>query</KEYWORD2>
-			<KEYWORD2>read_exif_data</KEYWORD2>
-			<KEYWORD2>real_connect</KEYWORD2>
-			<KEYWORD2>real_escape_string</KEYWORD2>
-			<KEYWORD2>real_query</KEYWORD2>
-			<KEYWORD2>recode</KEYWORD2>
-			<KEYWORD2>reset</KEYWORD2>
-			<KEYWORD2>result_metadata</KEYWORD2>
-			<KEYWORD2>rollback</KEYWORD2>
-			<KEYWORD2>rpl_parse_enabled</KEYWORD2>
-			<KEYWORD2>rpl_probe</KEYWORD2>
-			<KEYWORD2>rpl_query_type</KEYWORD2>
-			<KEYWORD2>select_db</KEYWORD2>
-			<KEYWORD2>send_long_data</KEYWORD2>
-			<KEYWORD2>session_commit</KEYWORD2>
-			<KEYWORD2>set_file_buffer</KEYWORD2>
-			<KEYWORD2>set_local_infile_default</KEYWORD2>
-			<KEYWORD2>set_local_infile_handler</KEYWORD2>
-			<KEYWORD2>set_opt</KEYWORD2>
-			<KEYWORD2>show_source</KEYWORD2>
-			<KEYWORD2>sizeof</KEYWORD2>
-			<KEYWORD2>slave_query</KEYWORD2>
-			<KEYWORD2>snmpwalkoid</KEYWORD2>
-			<KEYWORD2>socket_get_status</KEYWORD2>
-			<KEYWORD2>socket_getopt</KEYWORD2>
-			<KEYWORD2>socket_set_blocking</KEYWORD2>
-			<KEYWORD2>socket_set_timeout</KEYWORD2>
-			<KEYWORD2>socket_setopt</KEYWORD2>
-			<KEYWORD2>sqlite_fetch_string</KEYWORD2>
-			<KEYWORD2>sqlite_has_more</KEYWORD2>
-			<KEYWORD2>ssl_set</KEYWORD2>
-			<KEYWORD2>stat</KEYWORD2>
-			<KEYWORD2>stmt</KEYWORD2>
-			<KEYWORD2>stmt_init</KEYWORD2>
-			<KEYWORD2>store_result</KEYWORD2>
-			<KEYWORD2>strchr</KEYWORD2>
-			<KEYWORD2>stream_register_wrapper</KEYWORD2>
-			<KEYWORD2>thread_safe</KEYWORD2>
-			<KEYWORD2>use_result</KEYWORD2>
-			<KEYWORD2>user_error</KEYWORD2>
-			<KEYWORD2>velocis_autocommit</KEYWORD2>
-			<KEYWORD2>velocis_close</KEYWORD2>
-			<KEYWORD2>velocis_commit</KEYWORD2>
-			<KEYWORD2>velocis_connect</KEYWORD2>
-			<KEYWORD2>velocis_exec</KEYWORD2>
-			<KEYWORD2>velocis_fetch</KEYWORD2>
-			<KEYWORD2>velocis_fieldname</KEYWORD2>
-			<KEYWORD2>velocis_fieldnum</KEYWORD2>
-			<KEYWORD2>velocis_freeresult</KEYWORD2>
-			<KEYWORD2>velocis_off_autocommit</KEYWORD2>
-			<KEYWORD2>velocis_result</KEYWORD2>
-			<KEYWORD2>velocis_rollback</KEYWORD2>
-			<KEYWORD2>virtual</KEYWORD2>
-
-
-			<!-- Language constructs (69)
-				http://www.php.net/manual/en/reserved.php -->
-			<KEYWORD1>__CLASS__</KEYWORD1>
-			<KEYWORD1>__DIR__</KEYWORD1>
-			<KEYWORD1>__FILE__</KEYWORD1>
-			<KEYWORD1>__FUNCTION__</KEYWORD1>
-			<KEYWORD1>__LINE__</KEYWORD1>
-			<KEYWORD1>__METHOD__</KEYWORD1>
-			<KEYWORD1>__NAMESPACE__</KEYWORD1>
-			<KEYWORD1>abstract</KEYWORD1>
-			<OPERATOR>and</OPERATOR>
-			<KEYWORD1>array</KEYWORD1>
-			<KEYWORD1>as</KEYWORD1>
-			<KEYWORD1>break</KEYWORD1>
-			<KEYWORD1>case</KEYWORD1>
-			<KEYWORD1>catch</KEYWORD1>
-			<KEYWORD1>cfunction</KEYWORD1>
-			<KEYWORD1>class</KEYWORD1>
-			<KEYWORD1>clone</KEYWORD1>
-			<KEYWORD1>const</KEYWORD1>
-			<KEYWORD1>continue</KEYWORD1>
-			<KEYWORD1>declare</KEYWORD1>
-			<KEYWORD1>default</KEYWORD1>
-			<KEYWORD1>die</KEYWORD1>
-			<KEYWORD1>do</KEYWORD1>
-			<KEYWORD1>echo</KEYWORD1>
-			<KEYWORD1>else</KEYWORD1>
-			<KEYWORD1>elseif</KEYWORD1>
-			<KEYWORD1>empty</KEYWORD1>
-			<KEYWORD1>enddeclare</KEYWORD1>
-			<KEYWORD1>endfor</KEYWORD1>
-			<KEYWORD1>endforeach</KEYWORD1>
-			<KEYWORD1>endif</KEYWORD1>
-			<KEYWORD1>endswitch</KEYWORD1>
-			<KEYWORD1>endwhile</KEYWORD1>
-			<KEYWORD1>eval</KEYWORD1>
-			<KEYWORD1>exception</KEYWORD1>
-			<KEYWORD1>exit</KEYWORD1>
-			<KEYWORD1>extends</KEYWORD1>
-			<KEYWORD1>false</KEYWORD1>
-			<KEYWORD1>final</KEYWORD1>
-			<KEYWORD1>for</KEYWORD1>
-			<KEYWORD1>foreach</KEYWORD1>
-			<KEYWORD1>function</KEYWORD1>
-			<KEYWORD1>global</KEYWORD1>
-			<KEYWORD1>goto</KEYWORD1>
-			<KEYWORD1>if</KEYWORD1>
-			<KEYWORD1>implements</KEYWORD1>
-			<KEYWORD1>include</KEYWORD1>
-			<KEYWORD1>include_once</KEYWORD1>
-			<KEYWORD1>instanceof</KEYWORD1>
-			<KEYWORD1>interface</KEYWORD1>
-			<KEYWORD1>isset</KEYWORD1>
-			<KEYWORD1>list</KEYWORD1>
-			<KEYWORD1>namespace</KEYWORD1>
-			<KEYWORD1>new</KEYWORD1>
-			<KEYWORD1>null</KEYWORD1>
-			<KEYWORD1>old_function</KEYWORD1>
-			<OPERATOR>or</OPERATOR>
-			<KEYWORD1>php_user_filter</KEYWORD1>
-			<KEYWORD1>print</KEYWORD1>
-			<KEYWORD1>private</KEYWORD1>
-			<KEYWORD1>protected</KEYWORD1>
-			<KEYWORD1>public</KEYWORD1>
-			<KEYWORD1>require</KEYWORD1>
-			<KEYWORD1>require_once</KEYWORD1>
-			<KEYWORD1>return</KEYWORD1>
-			<KEYWORD1>static</KEYWORD1>
-			<KEYWORD1>switch</KEYWORD1>
-			<KEYWORD1>throw</KEYWORD1>
-			<KEYWORD1>true</KEYWORD1>
-			<KEYWORD1>try</KEYWORD1>
-			<KEYWORD1>unset</KEYWORD1>
-			<KEYWORD1>use</KEYWORD1>
-			<KEYWORD1>var</KEYWORD1>
-			<KEYWORD1>while</KEYWORD1>
-			<OPERATOR>xor</OPERATOR>
-			<!-- end: generated by buildfunctionlist.php -->
-			<!-- }}} -->
-
-			<!-- xdebug functions -->
-			<!-- {{{ -->
-			<KEYWORD2>xdebug_break</KEYWORD2>
-			<KEYWORD2>xdebug_call_class</KEYWORD2>
-			<KEYWORD2>xdebug_call_file</KEYWORD2>
-			<KEYWORD2>xdebug_call_function</KEYWORD2>
-			<KEYWORD2>xdebug_call_line</KEYWORD2>
-			<KEYWORD2>xdebug_disable</KEYWORD2>
-			<KEYWORD2>xdebug_dump_function_profile</KEYWORD2><!-- version 1 only -->
-			<KEYWORD2>xdebug_dump_function_trace</KEYWORD2><!-- version 1 only -->
-			<KEYWORD2>xdebug_dump_superglobals</KEYWORD2>
-			<KEYWORD2>xdebug_enable</KEYWORD2>
-			<KEYWORD2>xdebug_get_code_coverage</KEYWORD2>
-			<KEYWORD2>xdebug_get_function_count</KEYWORD2>
-			<KEYWORD2>xdebug_get_function_profile</KEYWORD2><!-- version 1 only -->
-			<KEYWORD2>xdebug_get_function_stack</KEYWORD2>
-			<KEYWORD2>xdebug_get_function_trace</KEYWORD2><!-- version 1 only -->
-			<KEYWORD2>xdebug_get_stack_depth</KEYWORD2>
-			<KEYWORD2>xdebug_is_enabled</KEYWORD2>
-			<KEYWORD2>xdebug_memory_usage</KEYWORD2>
-			<KEYWORD2>xdebug_peak_memory_usage</KEYWORD2>
-			<KEYWORD2>xdebug_print_function_stack</KEYWORD2>
-			<KEYWORD2>xdebug_start_code_coverage</KEYWORD2>
-			<KEYWORD2>xdebug_start_profiling</KEYWORD2><!-- version 1 only -->
-			<KEYWORD2>xdebug_start_trace</KEYWORD2><!-- version 1 only -->
-			<KEYWORD2>xdebug_stop_code_coverage</KEYWORD2>
-			<KEYWORD2>xdebug_stop_profiling</KEYWORD2><!-- version 1 only -->
-			<KEYWORD2>xdebug_stop_trace</KEYWORD2><!-- version 1 only -->
-			<KEYWORD2>xdebug_time_index</KEYWORD2>
-			<KEYWORD2>xdebug_var_dump</KEYWORD2>
-			<!-- }}} -->
-
-			<!-- Basic SimpleTest methods -->
-			<!-- {{{ -->
-			<KEYWORD2>assertCopy</KEYWORD2>
-			<KEYWORD2>assertEqual</KEYWORD2>
-			<KEYWORD2>assertError</KEYWORD2>
-			<KEYWORD2>assertErrorPattern</KEYWORD2>
-			<KEYWORD2>assertFalse</KEYWORD2>
-			<KEYWORD2>assertIdentical</KEYWORD2>
-			<KEYWORD2>assertIsA</KEYWORD2>
-			<KEYWORD2>assertNoErrors</KEYWORD2>
-			<KEYWORD2>assertNoUnwantedPattern</KEYWORD2>
-			<KEYWORD2>assertNotA</KEYWORD2>
-			<KEYWORD2>assertNotEqual</KEYWORD2>
-			<KEYWORD2>assertNotIdentical</KEYWORD2>
-			<KEYWORD2>assertNotNull</KEYWORD2>
-			<KEYWORD2>assertNull</KEYWORD2>
-			<KEYWORD2>assertReference</KEYWORD2>
-			<KEYWORD2>assertTrue</KEYWORD2>
-			<KEYWORD2>assertWantedPattern</KEYWORD2>
-
-			<KEYWORD2>setReturnValue</KEYWORD2>
-			<KEYWORD2>setReturnValueAt</KEYWORD2>
-			<KEYWORD2>setReturnReference</KEYWORD2>
-			<KEYWORD2>setReturnReferenceAt</KEYWORD2>
-			<KEYWORD2>expectArguments</KEYWORD2>
-			<KEYWORD2>expectArgumentsAt</KEYWORD2>
-			<KEYWORD2>expectCallCount</KEYWORD2>
-			<KEYWORD2>expectMaximumCallCount</KEYWORD2>
-			<KEYWORD2>expectMinimumCallCount</KEYWORD2>
-			<KEYWORD2>expectNever</KEYWORD2>
-			<KEYWORD2>expectOnce</KEYWORD2>
-			<KEYWORD2>expectAtLeastOnce</KEYWORD2>
-			<KEYWORD2>tally</KEYWORD2>
-
-			<KEYWORD2>dump</KEYWORD2>
-			<KEYWORD2>error</KEYWORD2>
-			<KEYWORD2>fail</KEYWORD2>
-			<KEYWORD2>pass</KEYWORD2>
-			<KEYWORD2>sendMessage</KEYWORD2>
-			<KEYWORD2>setUp</KEYWORD2>
-			<KEYWORD2>signal</KEYWORD2>
-			<KEYWORD2>swallowErrors</KEYWORD2>
-			<KEYWORD2>tearDown</KEYWORD2>
-			<!-- }}} -->
-
-			<!-- more magical functions -->
-			<KEYWORD2>__autoload</KEYWORD2>
-			<KEYWORD2>__destruct</KEYWORD2>
-			<KEYWORD2>__get</KEYWORD2>
-			<KEYWORD2>__set</KEYWORD2>
-			<KEYWORD2>__sleep</KEYWORD2>
-			<KEYWORD2>__wakeup</KEYWORD2>
-
-			<!-- more constructs -->
-			<KEYWORD4>parent</KEYWORD4>
-			<KEYWORD4>self</KEYWORD4>
-			<KEYWORD4>stdClass</KEYWORD4>
-		</KEYWORDS>
-	</RULES>
-	<!--}}}-->
-
-	<!--{{{ rule KEYWORDS_VISIBILITY -->
-	<RULES SET="KEYWORDS_VISIBILITY">
-		<KEYWORDS>
-			<KEYWORD1>private</KEYWORD1>
-			<KEYWORD1>protected</KEYWORD1>
-			<KEYWORD1>public</KEYWORD1>
-		</KEYWORDS>
-	</RULES>
-	<!--}}}-->
-
-	<!--{{{ rule JAVASCRIPT_OPENTAG -->
-	<RULES SET="JAVASCRIPT_OPENTAG" DEFAULT="MARKUP">
-		<SEQ TYPE="MARKUP" DELEGATE="JAVASCRIPT">&gt;</SEQ>
-		<IMPORT DELEGATE="TO_LITERAL+PHP"/> <!-- handle PHP in <script> tag -->
-		<IMPORT DELEGATE="html::TAGS" /> <!-- handle e.g. 'style="width:1px"' -->
-	</RULES>
-	<!--}}}-->
-
-	<!--{{{ rule TO_LITERAL+PHP -->
-	<!-- Handle literals, but allow switching to PHP therein, e.g. from html TAGS -->
-	<RULES SET="TO_LITERAL+PHP">
-		<SPAN TYPE="LITERAL1" DELEGATE="LITERAL1+PHP">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-		<SPAN TYPE="LITERAL2" DELEGATE="LITERAL2+PHP">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-		<IMPORT DELEGATE="TO_PHP"/>
-	</RULES>
-	<!--}}}-->
-
-	<!--{{{ rule JAVASCRIPT -->
-	<RULES SET="JAVASCRIPT" DEFAULT="MARKUP" ESCAPE="\">
-		<IMPORT DELEGATE="TO_LITERAL+PHP"/>
-		<IMPORT DELEGATE="TO_PHP"/>
-		<IMPORT DELEGATE="javascript::MAIN"/>
-	</RULES>
-	<!--}}}-->
-
-	<!--{{{ rule LITERAL1+PHP -->
-	<!-- Handle PHP tags in LITERAL1, e.g. in the "type" attribute of a <SCRIPT> tag -->
-	<RULES SET="LITERAL1+PHP" DEFAULT="LITERAL1" ESCAPE="\">
-		<IMPORT DELEGATE="TO_PHP"/>
-	</RULES>
-	<!--}}}-->
-
-	<!--{{{ rule LITERAL2+PHP -->
-	<!-- Handle PHP tags in LITERAL2, e.g. in the "type" attribute of a <SCRIPT> tag -->
-	<RULES SET="LITERAL2+PHP" DEFAULT="LITERAL2" ESCAPE="\">
-		<IMPORT DELEGATE="TO_PHP"/>
-	</RULES>
-	<!--}}}-->
-
-	<!--{{{ rule COMMENT1+PHP -->
-	<!-- Handle PHP tags in comments -->
-	<RULES SET="COMMENT1+PHP" DEFAULT="COMMENT1">
-		<IMPORT DELEGATE="TO_PHP"/>
-	</RULES>
-	<!--}}}-->
-
-	<!--{{{ Go to PHP mode again -->
-	<RULES SET="TO_PHP" DEFAULT="MARKUP">
-		<SPAN TYPE="MARKUP" DELEGATE="PHP">
-			<BEGIN>&lt;?php</BEGIN>
-			<END>?&gt;</END>
-		</SPAN>
-
-		<SPAN TYPE="MARKUP" DELEGATE="PHP">
-			<BEGIN>&lt;?</BEGIN>
-			<END>?&gt;</END>
-		</SPAN>
-
-		<SPAN TYPE="MARKUP" DELEGATE="PHP">
-			<BEGIN>&lt;%=</BEGIN>
-			<END>%&gt;</END>
-		</SPAN>
-	</RULES>
-	<!--}}}-->
-
-	<RULES SET="PHPDOC_BLOCK" DEFAULT="COMMENT4" IGNORE_CASE="TRUE"/>
-
-	<!--{{{ rule PHPDOC -->
-	<RULES SET="PHPDOC" DEFAULT="COMMENT3" IGNORE_CASE="TRUE">
-
-		<!--{{{ HTML comments -->
-		<SPAN TYPE="COMMENT1">
-			<BEGIN>&lt;!--</BEGIN>
-			<END>--&gt;</END>
-		</SPAN>
-		<!--}}}-->
-
-		<!--{{{ PHPdoc allows this -->
-		<SEQ TYPE="COMMENT3">&lt;&lt;</SEQ>
-		<SEQ TYPE="COMMENT3">&lt;=</SEQ>
-		<SEQ TYPE="COMMENT3">&lt; </SEQ>
-		<!--}}}-->
-
-		<!--{{{ strings in quotes -->
-		<SPAN TYPE="LITERAL1" ESCAPE="\" NO_LINE_BREAK="TRUE">
-		<BEGIN>&quot;</BEGIN>
-		<END>&quot;</END>
-		</SPAN>
-		<!--}}}-->
-
-		<!--{{{ HTML tag -->
-		<SPAN TYPE="MARKUP" DELEGATE="xml::TAGS"
-			NO_LINE_BREAK="TRUE">
-			<BEGIN>&lt;</BEGIN>
-			<END>&gt;</END>
-		</SPAN>
-		<!--}}}-->
-
-		<SPAN_REGEXP TYPE="LABEL" HASH_CHAR="@" NO_WORD_BREAK="FALSE" DELEGATE="PHPDOC_BLOCK">
-			<BEGIN>@(?:param|throws|exception|serialField)(\s)</BEGIN>
-			<END>$1</END>
-		</SPAN_REGEXP>
-
-		<SPAN_REGEXP TYPE="LABEL" HASH_CHAR="{@" NO_WORD_BREAK="FALSE" DELEGATE="PHPDOC_BLOCK">
-			<BEGIN>\{@(internal|link)\s</BEGIN>
-			<END>}</END>
-		</SPAN_REGEXP>
-
-
-		<SPAN DELEGATE="PHP" TYPE="MARKUP">
-			<BEGIN>&lt;code&gt;</BEGIN>
-			<END>&lt;/code&gt;</END>
-		</SPAN>
-
-		<!--{{{ keywords -->
-		<KEYWORDS>
-			<LABEL>@abstract</LABEL>
-			<LABEL>@access</LABEL>
-			<LABEL>@author</LABEL>
-			<LABEL>@category</LABEL>
-			<LABEL>@const</LABEL>
-			<LABEL>@constant</LABEL>
-			<LABEL>@copyright</LABEL>
-			<LABEL>@deprecated</LABEL>
-			<LABEL>@example</LABEL>
-			<LABEL>@filesource</LABEL>
-			<LABEL>@final</LABEL>
-			<LABEL>@global</LABEL>
-			<LABEL>@ignore</LABEL>
-			<LABEL>@internal</LABEL>
-			<LABEL>@license</LABEL>
-			<LABEL>@link</LABEL>
-			<LABEL>@name</LABEL>
-			<LABEL>@package</LABEL>
-			<LABEL>@param</LABEL>
-			<LABEL>@return</LABEL>
-			<LABEL>@see</LABEL>
-			<LABEL>@since</LABEL>
-			<LABEL>@static</LABEL>
-			<LABEL>@staticvar</LABEL>
-			<LABEL>@subpackage</LABEL>
-			<LABEL>@throws</LABEL>
-			<LABEL>@todo</LABEL>
-			<LABEL>@tutorial</LABEL>
-			<LABEL>@uses</LABEL>
-			<LABEL>@var</LABEL>
-			<LABEL>@version</LABEL>
-		</KEYWORDS>
-		<!--}}}-->
-	</RULES>
-	<!--}}}-->
-
-	<RULES SET="INVALID_LT" DEFAULT="INVALID">
-		<SEQ TYPE="INVALID">&lt;</SEQ>
-	</RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/pike.xml b/qpython/src/main/assets/syntax/pike.xml
deleted file mode 100644
index 9147bad0..00000000
--- a/qpython/src/main/assets/syntax/pike.xml
+++ /dev/null
@@ -1,242 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- Pike mode, contributed by
-                      Marco G?tze, <gomar@gmx.net> -->
-<!-- Small fixes and autodoc support contributed by
-                      Peter Lundqvist <peterl@update.uu.se> -->
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<MODE>
-  <PROPS>
-    <PROPERTY NAME="commentStart" VALUE="/*"/>
-    <PROPERTY NAME="commentEnd" VALUE="*/"/>
-    <PROPERTY NAME="lineComment" VALUE="//"/>
-    <PROPERTY NAME="wordBreakChars" VALUE=",+-=&lt;&gt;/?^&amp;*`"/>
-
-    <!-- Auto indent -->
-    <PROPERTY NAME="indentOpenBrackets" VALUE="{"/>
-    <PROPERTY NAME="indentCloseBrackets" VALUE="}"/>
-    <PROPERTY NAME="indentNextLine" VALUE="\s*(((if|(for(each)?)|while|catch|gauge)\s*\(|(do|else)\s*|else\s+if\s*\()[^{;]*)"/>
-    <!-- set this to 'true' if you want to use GNU coding style -->
-    <PROPERTY NAME="doubleBracketIndent" VALUE="false"/>
-  </PROPS>
-  <RULES IGNORE_CASE="FALSE" HIGHLIGHT_DIGITS="TRUE" DIGIT_RE="(0x[\p{XDigit}]+|[\p{Digit}]+|0[bB][01]+)[lLdDfF]?">
-
-    <!-- comments -->
-    <SPAN TYPE="COMMENT1" DELEGATE="COMMENT">
-      <BEGIN>/*</BEGIN>
-      <END>*/</END>
-    </SPAN>
-    <SEQ TYPE="INVALID">*/</SEQ>
-
-    <!-- Autodoc comment -->
-    <EOL_SPAN TYPE="COMMENT1" DELEGATE="AUTODOC">//!</EOL_SPAN>
-    <!-- C++ line comment -->
-    <EOL_SPAN TYPE="COMMENT1" DELEGATE="COMMENT">//</EOL_SPAN>
-
-    <!-- string, char literals -->
-    <SPAN TYPE="LITERAL1" NO_LINE_BREAK="TRUE" DELEGATE="STRING_LITERAL">
-      <BEGIN>"</BEGIN>
-      <END>"</END>
-    </SPAN>
-    <SPAN TYPE="LITERAL1" DELEGATE="STRING_LITERAL">
-      <BEGIN>#"</BEGIN>
-      <END>"</END>
-    </SPAN>
-    <SPAN TYPE="LITERAL1" NO_LINE_BREAK="TRUE">
-      <BEGIN>'</BEGIN>
-      <END>'</END>
-    </SPAN>
-
-    <!-- preprocessor statements -->
-    <SEQ_REGEXP TYPE="KEYWORD2" HASH_CHAR="#" AT_LINE_START="TRUE">#.*?(?=($|/\*|//))</SEQ_REGEXP>
-
-    <!-- operators -->
-    <SEQ TYPE="OPERATOR">({</SEQ>
-    <SEQ TYPE="OPERATOR">})</SEQ>
-    <SEQ TYPE="OPERATOR">([</SEQ>
-    <SEQ TYPE="OPERATOR">])</SEQ>
-    <SEQ TYPE="OPERATOR">(&lt;</SEQ>
-    <SEQ TYPE="OPERATOR">&gt;)</SEQ>
-    <SEQ TYPE="OPERATOR">=</SEQ>
-    <SEQ TYPE="OPERATOR">!</SEQ>
-    <SEQ TYPE="OPERATOR">+</SEQ>
-    <SEQ TYPE="OPERATOR">-</SEQ>
-    <SEQ TYPE="OPERATOR">/</SEQ>
-    <SEQ TYPE="OPERATOR">*</SEQ>
-    <SEQ TYPE="OPERATOR">&gt;</SEQ>
-    <SEQ TYPE="OPERATOR">&lt;</SEQ>
-    <SEQ TYPE="OPERATOR">%</SEQ>
-    <SEQ TYPE="OPERATOR">&amp;</SEQ>
-    <SEQ TYPE="OPERATOR">|</SEQ>
-    <SEQ TYPE="OPERATOR">^</SEQ>
-    <SEQ TYPE="OPERATOR">~</SEQ>
-    <SEQ TYPE="OPERATOR">@</SEQ>
-    <SEQ TYPE="OPERATOR">`</SEQ>
-    <SEQ TYPE="OPERATOR">.</SEQ>
-
-    <!-- function calls -->
-    <MARK_PREVIOUS TYPE="FUNCTION" MATCH_TYPE="OPERATOR">(</MARK_PREVIOUS>
-	<SEQ TYPE="OPERATOR">)</SEQ>
-
-    <KEYWORDS>
-      <!-- type modifiers -->
-      <KEYWORD1>constant</KEYWORD1>
-      <KEYWORD1>extern</KEYWORD1>
-      <KEYWORD1>final</KEYWORD1>
-      <KEYWORD1>inline</KEYWORD1>
-      <KEYWORD1>local</KEYWORD1>
-      <KEYWORD1>nomask</KEYWORD1>
-      <KEYWORD1>optional</KEYWORD1>
-      <KEYWORD1>private</KEYWORD1>
-      <KEYWORD1>protected</KEYWORD1>
-      <KEYWORD1>public</KEYWORD1>
-      <KEYWORD1>static</KEYWORD1>
-      <KEYWORD1>variant</KEYWORD1>
-
-      <!-- types -->
-      <KEYWORD3>array</KEYWORD3>
-      <KEYWORD3>class</KEYWORD3>
-      <KEYWORD3>float</KEYWORD3>
-      <KEYWORD3>function</KEYWORD3>
-      <KEYWORD3>int</KEYWORD3>
-      <KEYWORD3>mapping</KEYWORD3>
-      <KEYWORD3>mixed</KEYWORD3>
-      <KEYWORD3>multiset</KEYWORD3>
-      <KEYWORD3>object</KEYWORD3>
-      <KEYWORD3>program</KEYWORD3>
-      <KEYWORD3>string</KEYWORD3>
-      <KEYWORD3>void</KEYWORD3>
-
-      <!-- flow control and block-introducing keywords -->
-      <KEYWORD1>break</KEYWORD1>
-      <KEYWORD1>case</KEYWORD1>
-      <KEYWORD1>catch</KEYWORD1>
-      <KEYWORD1>continue</KEYWORD1>
-      <KEYWORD1>default</KEYWORD1>
-      <KEYWORD1>do</KEYWORD1>
-      <KEYWORD1>else</KEYWORD1>
-      <KEYWORD1>for</KEYWORD1>
-      <KEYWORD1>foreach</KEYWORD1>
-      <KEYWORD1>gauge</KEYWORD1>
-      <KEYWORD1>if</KEYWORD1>
-      <KEYWORD1>lambda</KEYWORD1>
-      <KEYWORD1>return</KEYWORD1>
-      <KEYWORD1>sscanf</KEYWORD1>
-      <KEYWORD1>switch</KEYWORD1>
-      <KEYWORD1>while</KEYWORD1>
-
-      <!-- special instructions -->
-      <KEYWORD2>import</KEYWORD2>
-      <KEYWORD2>inherit</KEYWORD2>
-    </KEYWORDS>
-  </RULES>
-
-  <RULES SET="COMMENT" IGNORE_CASE="FALSE" DEFAULT="COMMENT1">
-    <KEYWORDS>
-      <COMMENT2>FIXME</COMMENT2>
-      <COMMENT2>XXX</COMMENT2>
-    </KEYWORDS>
-  </RULES>
-
-  <RULES SET="AUTODOC" IGNORE_CASE="TRUE" DEFAULT="COMMENT1">
-
-		<EOL_SPAN TYPE="NULL" DELEGATE="MAIN" MATCH_TYPE="CONTEXT">@decl</EOL_SPAN>
-
-		<!-- XML tags -->
-		<SPAN TYPE="MARKUP" DELEGATE="xml::TAGS">
-		  <BEGIN>@xml{</BEGIN>
-			<END>@}</END>
-		</SPAN>
-		<!-- Cross references -->
-		<SPAN TYPE="FUNCTION" NO_LINE_BREAK="TRUE">
-  		<BEGIN>@[</BEGIN>
-			<END>]</END>
-		</SPAN>
-
-		<!-- Brace keywords -->
-		<SEQ_REGEXP TYPE="FUNCTION" HASH_CHAR="@">@(b|i|u|tt|url|pre|ref|code|expr|image)?(\{.*@\})</SEQ_REGEXP>
-
-		<!-- Attempt to get syntax highlighting of @decl-ed functions
-		     inside of the autodoc-rule.
-
-		     It works - but jEdit 4.1 has problems keeping it highlighted
-		     (the syntax highlighting works depending on how you travel
-		     past the @decl-ed region).
-		     Can't figure aout how to to proper coloring of the @decl
-		     keyword either.
-
-		     If there are problems with what regions are highlighted -
-		     try to uncomment this first.
-		-->
-		<EOL_SPAN TYPE="NULL" DELEGATE="MAIN">@decl</EOL_SPAN>
-
-		<KEYWORDS>
-		  <!-- Meta keywords -->
-		  <LABEL>@appears</LABEL>
-		  <LABEL>@belongs</LABEL>
-		  <LABEL>@class</LABEL>
-		  <LABEL>@endclass</LABEL>
-		  <LABEL>@example</LABEL>
-		  <LABEL>@module</LABEL>
-		  <LABEL>@endmodule</LABEL>
-		  <LABEL>@namespace</LABEL>
-		  <LABEL>@endnamespace</LABEL>
-		  <!-- <LABEL>@decl</LABEL>
-		  -->
-
-		  <!-- Single keywords -->
-		  <LABEL>@deprecated</LABEL>
-
-		  <!-- Delimiter keywords -->
-		  <LABEL>@note</LABEL>
-		  <LABEL>@example</LABEL>
-		  <LABEL>@bugs</LABEL>
-		  <LABEL>@returns</LABEL>
-		  <LABEL>@throws</LABEL>
-		  <LABEL>@param</LABEL>
-		  <LABEL>@seealso</LABEL>
-		  <LABEL>@fixme</LABEL>
-		  <LABEL>@constant</LABEL>
-		  <LABEL>@member</LABEL>
-		  <LABEL>@index</LABEL>
-		  <LABEL>@elem</LABEL>
-		  <LABEL>@value</LABEL>
-		  <LABEL>@type</LABEL>
-		  <LABEL>@item</LABEL>
-
-		  <!-- Container keywords -->
-		  <LABEL>@section</LABEL>
-		  <LABEL>@mapping</LABEL>
-		  <LABEL>@endmapping</LABEL>
-		  <LABEL>@multiset</LABEL>
-		  <LABEL>@endmultiset</LABEL>
-		  <LABEL>@array</LABEL>
-		  <LABEL>@endarray</LABEL>
-		  <LABEL>@int</LABEL>
-		  <LABEL>@endint</LABEL>
-		  <LABEL>@string</LABEL>
-		  <LABEL>@endstring</LABEL>
-		  <LABEL>@mixed</LABEL>
-		  <LABEL>@endmixed</LABEL>
-		  <LABEL>@dl</LABEL>
-		  <LABEL>@enddl</LABEL>
-		  <LABEL>@ol</LABEL>
-		  <LABEL>@endol</LABEL>
-		  <LABEL>@ul</LABEL>
-		  <LABEL>@endol</LABEL>
-
-		  <!-- Special keywords -->
-		  <LABEL>@ignore</LABEL>
-		  <LABEL>@endignore</LABEL>
-
-		</KEYWORDS>
-
-	</RULES>
-
-  <RULES SET="STRING_LITERAL" ESCAPE="\" IGNORE_CASE="TRUE" DEFAULT="LITERAL1">
-    <SEQ_REGEXP TYPE="LITERAL2" HASH_CHAR="%">%([^ a-z]*[a-z]|\[[^\]]*\])</SEQ_REGEXP>
-    <SEQ TYPE="COMMENT2">DEBUG:</SEQ>
-  </RULES>
-</MODE>
\ No newline at end of file
diff --git a/qpython/src/main/assets/syntax/pl1.xml b/qpython/src/main/assets/syntax/pl1.xml
deleted file mode 100644
index e752ff81..00000000
--- a/qpython/src/main/assets/syntax/pl1.xml
+++ /dev/null
@@ -1,596 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="commentStart" VALUE="/*" />
-		<PROPERTY NAME="commentEnd"   VALUE="*/" />
-		<PROPERTY NAME="wordBreakChars" VALUE=",+-=&lt;&gt;/?^&amp;*" />
-
-		<!-- Auto indent -->
-		<!-- set this to 'true' if you want to use GNU coding style -->
-	</PROPS>
-	<RULES IGNORE_CASE="TRUE"
-		HIGHLIGHT_DIGITS="FALSE">
-
-		<!-- C style comment -->
-		<SPAN TYPE="COMMENT1">
-			<BEGIN>/*</BEGIN>
-			<END>*/</END>
-		</SPAN>
-
-		<SPAN TYPE="LITERAL1" ESCAPE="\">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-
-		<SPAN TYPE="LITERAL1" ESCAPE="\">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-
-		<!-- preprocessor statements -->
-		<EOL_SPAN_REGEXP TYPE="KEYWORD2" HASH_CHAR="*" AT_LINE_START="TRUE">\* *process</EOL_SPAN_REGEXP>
-
-		<SEQ TYPE="OPERATOR">=</SEQ>
-		<SEQ TYPE="OPERATOR">+</SEQ>
-		<SEQ TYPE="OPERATOR">-</SEQ>
-		<SEQ TYPE="OPERATOR">*</SEQ>
-		<SEQ TYPE="OPERATOR">/</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;</SEQ>
-		<SEQ TYPE="OPERATOR">^</SEQ>
-		<SEQ TYPE="OPERATOR">¬</SEQ>
-		<SEQ TYPE="OPERATOR">&amp;</SEQ>
-		<SEQ TYPE="OPERATOR">|</SEQ>
-		<SEQ TYPE="OPERATOR">.</SEQ>
-		<SEQ TYPE="OPERATOR">,</SEQ>
-		<SEQ TYPE="OPERATOR">;</SEQ>
-		<MARK_PREVIOUS AT_WHITESPACE_END="TRUE"
-			MATCH_TYPE="OPERATOR"
-			TYPE="LABEL">:</MARK_PREVIOUS>
-
-		<!-- Function calls -->
-		<MARK_PREVIOUS TYPE="FUNCTION" MATCH_TYPE="OPERATOR">(</MARK_PREVIOUS>
-		<SEQ TYPE="OPERATOR">)</SEQ>
-
-		<KEYWORDS>
-      <!-- Statements, keywords and directives -->
-			<KEYWORD1>alias</KEYWORD1>
-			<KEYWORD1>alloc</KEYWORD1>
-			<KEYWORD1>allocate</KEYWORD1>
-			<KEYWORD1>attach</KEYWORD1>
-			<KEYWORD1>begin</KEYWORD1>
-      <KEYWORD1>by</KEYWORD1>
-      <KEYWORD1>byname</KEYWORD1>
-			<KEYWORD1>call</KEYWORD1>
-			<KEYWORD1>close</KEYWORD1>
-			<KEYWORD1>copy</KEYWORD1>
- 			<KEYWORD1>dcl</KEYWORD1>
-			<KEYWORD1>declare</KEYWORD1>
-			<KEYWORD1>default</KEYWORD1>
-			<KEYWORD1>define</KEYWORD1>
-			<KEYWORD1>delay</KEYWORD1>
-			<KEYWORD1>delete</KEYWORD1>
-			<KEYWORD1>detach</KEYWORD1>
-			<KEYWORD1>dft</KEYWORD1>
-			<KEYWORD1>display</KEYWORD1>
-			<KEYWORD1>do</KEYWORD1>
-      <KEYWORD1>downthru</KEYWORD1>
-			<KEYWORD1>else</KEYWORD1>
- 			<KEYWORD1>end</KEYWORD1>
-			<KEYWORD1>entry</KEYWORD1>
-      <KEYWORD1>exit</KEYWORD1>
-      <KEYWORD1>fetch</KEYWORD1>
-      <KEYWORD1>flush</KEYWORD1>
-      <KEYWORD1>format</KEYWORD1>
-			<KEYWORD1>free</KEYWORD1>
-			<KEYWORD1>from</KEYWORD1>
-      <KEYWORD1>get</KEYWORD1>
-      <KEYWORD1>go</KEYWORD1>
-			<KEYWORD1>goto</KEYWORD1>
-			<KEYWORD1>if</KEYWORD1>
-			<KEYWORD1>ignore</KEYWORD1>
-			<KEYWORD1>%include</KEYWORD1>
-			<KEYWORD1>into</KEYWORD1>
-			<KEYWORD1>iterate</KEYWORD1>
-			<KEYWORD1>key</KEYWORD1>
-			<KEYWORD1>keyfrom</KEYWORD1>
-			<KEYWORD1>keyto</KEYWORD1>
-			<KEYWORD1>leave</KEYWORD1>
-      <KEYWORD1>line</KEYWORD1>
-      <KEYWORD1>locate</KEYWORD1>
-      <KEYWORD1>loop</KEYWORD1>
-      <KEYWORD1>name</KEYWORD1>
-      <KEYWORD1>on</KEYWORD1>
-      <KEYWORD1>open</KEYWORD1>
-			<KEYWORD1>ordinal</KEYWORD1>
-      <KEYWORD1>other</KEYWORD1>
-      <KEYWORD1>otherwise</KEYWORD1>
-      <KEYWORD1>package</KEYWORD1>
-      <KEYWORD1>page</KEYWORD1>
-      <KEYWORD1>proc</KEYWORD1>
-      <KEYWORD1>procedure</KEYWORD1>
-      <KEYWORD1>put</KEYWORD1>
-      <KEYWORD1>read</KEYWORD1>
-      <KEYWORD1>release</KEYWORD1>
-      <KEYWORD1>repeat</KEYWORD1>
-      <KEYWORD1>reply</KEYWORD1>
-      <KEYWORD1>resignal</KEYWORD1>
-      <KEYWORD1>return</KEYWORD1>
-      <KEYWORD1>revert</KEYWORD1>
-      <KEYWORD1>rewrite</KEYWORD1>
-      <KEYWORD1>select</KEYWORD1>
-			<KEYWORD1>set</KEYWORD1>
-      <KEYWORD1>signal</KEYWORD1>
-			<KEYWORD1>skip</KEYWORD1>
-			<KEYWORD1>snap</KEYWORD1>
-      <KEYWORD1>stop</KEYWORD1>
-			<KEYWORD1>string</KEYWORD1>
-			<KEYWORD1>structure</KEYWORD1>
-      <KEYWORD1>then</KEYWORD1>
-      <KEYWORD1>thread</KEYWORD1>
-      <KEYWORD1>to</KEYWORD1>
-      <KEYWORD1>tstack</KEYWORD1>
-      <KEYWORD1>unlock</KEYWORD1>
- 			<KEYWORD1>until</KEYWORD1>
-      <KEYWORD1>upthru</KEYWORD1>
-      <KEYWORD1>wait</KEYWORD1>
-      <KEYWORD1>when</KEYWORD1>
-			<KEYWORD1>while</KEYWORD1>
-      <KEYWORD1>write</KEYWORD1>
-
-      <!-- Options & attributes -->
-			<KEYWORD2>A</KEYWORD2>
-			<KEYWORD2>abnormal</KEYWORD2>
-			<KEYWORD2>aligned</KEYWORD2>
-			<KEYWORD2>anycond</KEYWORD2>
-			<KEYWORD2>anycondition</KEYWORD2>
-			<KEYWORD2>area</KEYWORD2>
-			<KEYWORD2>asgn</KEYWORD2>
-			<KEYWORD2>asm</KEYWORD2>
-			<KEYWORD2>assembler</KEYWORD2>
-			<KEYWORD2>assignable</KEYWORD2>
-			<KEYWORD2>attn</KEYWORD2>
-			<KEYWORD2>attention</KEYWORD2>
-			<KEYWORD2>auto</KEYWORD2>
-			<KEYWORD2>automatic</KEYWORD2>
-			<KEYWORD2>b</KEYWORD2>
-			<KEYWORD2>b3</KEYWORD2>
-			<KEYWORD2>b4</KEYWORD2>
-			<KEYWORD2>based</KEYWORD2>
-			<KEYWORD2>bigendian</KEYWORD2>
-			<KEYWORD2>bin</KEYWORD2>
-			<KEYWORD2>binary</KEYWORD2>
-			<KEYWORD2>bit</KEYWORD2>
-			<KEYWORD2>buf</KEYWORD2>
-			<KEYWORD2>buffered</KEYWORD2>
-			<KEYWORD2>builtin</KEYWORD2>
-			<KEYWORD2>bx</KEYWORD2>
-			<KEYWORD2>byaddr</KEYWORD2>
-			<KEYWORD2>byvalue</KEYWORD2>
-      <KEYWORD2>C</KEYWORD2>
-			<KEYWORD2>cdecl</KEYWORD2>
-			<KEYWORD2>cell</KEYWORD2>
-			<KEYWORD2>char</KEYWORD2>
-			<KEYWORD2>character</KEYWORD2>
-			<KEYWORD2>charg</KEYWORD2>
-			<KEYWORD2>chargraphic</KEYWORD2>
-			<KEYWORD2>cobol</KEYWORD2>
-			<KEYWORD2>column</KEYWORD2>
-			<KEYWORD2>complex</KEYWORD2>
-			<KEYWORD2>cond</KEYWORD2>
-			<KEYWORD2>condition</KEYWORD2>
-			<KEYWORD2>conn</KEYWORD2>
-			<KEYWORD2>connected</KEYWORD2>
-			<KEYWORD2>controlled</KEYWORD2>
-			<KEYWORD2>conv</KEYWORD2>
-			<KEYWORD2>conversion</KEYWORD2>
- 			<KEYWORD2>cplx</KEYWORD2>
-			<KEYWORD2>ctl</KEYWORD2>
-			<KEYWORD2>data</KEYWORD2>
-			<KEYWORD2>date</KEYWORD2>
-			<KEYWORD2>dec</KEYWORD2>
-			<KEYWORD2>decimal</KEYWORD2>
-			<KEYWORD2>def</KEYWORD2>
-			<KEYWORD2>defined</KEYWORD2>
-			<KEYWORD2>descriptor</KEYWORD2>
-			<KEYWORD2>descriptors</KEYWORD2>
-			<KEYWORD2>dim</KEYWORD2>
-			<KEYWORD2>dimension</KEYWORD2>
- 			<KEYWORD2>direct</KEYWORD2>
-			<KEYWORD2>E</KEYWORD2>
-			<KEYWORD2>edit</KEYWORD2>
-			<KEYWORD2>endfile</KEYWORD2>
-			<KEYWORD2>endpage</KEYWORD2>
-			<KEYWORD2>env</KEYWORD2>
-			<KEYWORD2>environment</KEYWORD2>
-			<KEYWORD2>error</KEYWORD2>
-			<KEYWORD2>exclusive</KEYWORD2>
-			<KEYWORD2>exports</KEYWORD2>
-			<KEYWORD2>ext</KEYWORD2>
-			<KEYWORD2>external</KEYWORD2>
-			<KEYWORD2>F</KEYWORD2>
-			<KEYWORD2>fetchable</KEYWORD2>
-			<KEYWORD2>file</KEYWORD2>
-			<KEYWORD2>finish</KEYWORD2>
-			<KEYWORD2>fixed</KEYWORD2>
-			<KEYWORD2>fixedoverflow</KEYWORD2>
-			<KEYWORD2>float</KEYWORD2>
-			<KEYWORD2>fofl</KEYWORD2>
-			<KEYWORD2>format</KEYWORD2>
-			<KEYWORD2>fortran</KEYWORD2>
-			<KEYWORD2>fromalien</KEYWORD2>
-			<KEYWORD2>g</KEYWORD2>
-			<KEYWORD2>generic</KEYWORD2>
-			<KEYWORD2>graphic</KEYWORD2>
-			<KEYWORD2>gx</KEYWORD2>
-			<KEYWORD2>handle</KEYWORD2>
-			<KEYWORD2>hexadec</KEYWORD2>
-			<KEYWORD2>ieee</KEYWORD2>
-			<KEYWORD2>imported</KEYWORD2>
-			<KEYWORD2>init</KEYWORD2>
-			<KEYWORD2>initial</KEYWORD2>
-			<KEYWORD2>inline</KEYWORD2>
-			<KEYWORD2>input</KEYWORD2>
-			<KEYWORD2>inter</KEYWORD2>
-			<KEYWORD2>internal</KEYWORD2>
-			<KEYWORD2>invalidop</KEYWORD2>
-			<KEYWORD2>irred</KEYWORD2>
-			<KEYWORD2>irreducible</KEYWORD2>
-			<KEYWORD2>keyed</KEYWORD2>
-			<KEYWORD2>L</KEYWORD2>
-			<KEYWORD2>label</KEYWORD2>
-			<KEYWORD2>like</KEYWORD2>
-			<KEYWORD2>limited</KEYWORD2>
-			<KEYWORD2>linesize</KEYWORD2>
-			<KEYWORD2>linkage</KEYWORD2>
-			<KEYWORD2>list</KEYWORD2>
-			<KEYWORD2>littleendian</KEYWORD2>
-			<KEYWORD2>m</KEYWORD2>
-			<KEYWORD2>main</KEYWORD2>
-			<KEYWORD2>native</KEYWORD2>
-			<KEYWORD2>nonasgn</KEYWORD2>
-			<KEYWORD2>nocharg</KEYWORD2>
-			<KEYWORD2>nochargraphic</KEYWORD2>
-			<KEYWORD2>nodescriptor</KEYWORD2>
-			<KEYWORD2>noexecops</KEYWORD2>
-			<KEYWORD2>nomap</KEYWORD2>
-			<KEYWORD2>nomapin</KEYWORD2>
-			<KEYWORD2>nomapout</KEYWORD2>
-			<KEYWORD2>nonasgn</KEYWORD2>
-			<KEYWORD2>nonassignable</KEYWORD2>
-			<KEYWORD2>nonconn</KEYWORD2>
-			<KEYWORD2>nonconnected</KEYWORD2>
-			<KEYWORD2>nonnative</KEYWORD2>
-			<KEYWORD2>nonvar</KEYWORD2>
-			<KEYWORD2>nonvarying</KEYWORD2>
-			<KEYWORD2>normal</KEYWORD2>
-			<KEYWORD2>offset</KEYWORD2>
-			<KEYWORD2>ofl</KEYWORD2>
-			<KEYWORD2>optional</KEYWORD2>
-			<KEYWORD2>options</KEYWORD2>
-			<KEYWORD2>optlink</KEYWORD2>
-			<KEYWORD2>order</KEYWORD2>
-			<KEYWORD2>output</KEYWORD2>
-			<KEYWORD2>overflow</KEYWORD2>
-			<KEYWORD2>P</KEYWORD2>
-			<KEYWORD2>pagesize</KEYWORD2>
-			<KEYWORD2>parameter</KEYWORD2>
-			<KEYWORD2>pic</KEYWORD2>
-			<KEYWORD2>picture</KEYWORD2>
-			<KEYWORD2>pointer</KEYWORD2>
-			<KEYWORD2>pos</KEYWORD2>
-			<KEYWORD2>position</KEYWORD2>
-			<KEYWORD2>prec</KEYWORD2>
-			<KEYWORD2>precision</KEYWORD2>
-			<KEYWORD2>print</KEYWORD2>
-			<KEYWORD2>ptr</KEYWORD2>
-			<KEYWORD2>R</KEYWORD2>
-			<KEYWORD2>range</KEYWORD2>
-			<KEYWORD2>real</KEYWORD2>
-			<KEYWORD2>record</KEYWORD2>
-			<KEYWORD2>recursive</KEYWORD2>
-			<KEYWORD2>red</KEYWORD2>
-			<KEYWORD2>reducible</KEYWORD2>
-			<KEYWORD2>reentrant</KEYWORD2>
-			<KEYWORD2>refer</KEYWORD2>
-			<KEYWORD2>reorder</KEYWORD2>
-			<KEYWORD2>reserved</KEYWORD2>
-			<KEYWORD2>reserves</KEYWORD2>
-			<KEYWORD2>retcode</KEYWORD2>
-			<KEYWORD2>returns</KEYWORD2>
-			<KEYWORD2>seql</KEYWORD2>
-			<KEYWORD2>sequential</KEYWORD2>
-			<KEYWORD2>signed</KEYWORD2>
-			<KEYWORD2>size</KEYWORD2>
-			<KEYWORD2>static</KEYWORD2>
-			<KEYWORD2>stdcall</KEYWORD2>
-			<KEYWORD2>storage</KEYWORD2>
-			<KEYWORD2>stream</KEYWORD2>
-			<KEYWORD2>strg</KEYWORD2>
-			<KEYWORD2>stringrange</KEYWORD2>
-			<KEYWORD2>strz</KEYWORD2>
-			<KEYWORD2>stringsize</KEYWORD2>
-			<KEYWORD2>subrg</KEYWORD2>
-			<KEYWORD2>subscriptrange</KEYWORD2>
-			<KEYWORD2>system</KEYWORD2>
-			<KEYWORD2>task</KEYWORD2>
-			<KEYWORD2>title</KEYWORD2>
-			<KEYWORD2>transmit</KEYWORD2>
-			<KEYWORD2>type</KEYWORD2>
-			<KEYWORD2>ufl</KEYWORD2>
-			<KEYWORD2>unal</KEYWORD2>
-			<KEYWORD2>unaligned</KEYWORD2>
-			<KEYWORD2>unbuf</KEYWORD2>
-			<KEYWORD2>unbuffered</KEYWORD2>
-			<KEYWORD2>undefinedfile</KEYWORD2>
-			<KEYWORD2>underflow</KEYWORD2>
-			<KEYWORD2>undf</KEYWORD2>
-			<KEYWORD2>union</KEYWORD2>
-			<KEYWORD2>unsigned</KEYWORD2>
-			<KEYWORD2>update</KEYWORD2>
-			<KEYWORD2>value</KEYWORD2>
-			<KEYWORD2>var</KEYWORD2>
-			<KEYWORD2>variable</KEYWORD2>
-			<KEYWORD2>varying</KEYWORD2>
-			<KEYWORD2>varyingz</KEYWORD2>
-			<KEYWORD2>varz</KEYWORD2>
-			<KEYWORD2>wchar</KEYWORD2>
-			<KEYWORD2>widechar</KEYWORD2>
-			<KEYWORD2>winmain</KEYWORD2>
-			<KEYWORD2>wx</KEYWORD2>
-			<KEYWORD2>x</KEYWORD2>
-			<KEYWORD2>xn</KEYWORD2>
-			<KEYWORD2>xu</KEYWORD2>
-			<KEYWORD2>zdiv</KEYWORD2>
-			<KEYWORD2>zerodivide</KEYWORD2>
-
-      <!-- Builtins -->
- 			<KEYWORD3>abs</KEYWORD3>
- 			<KEYWORD3>acos</KEYWORD3>
- 			<KEYWORD3>acosf</KEYWORD3>
- 			<KEYWORD3>add</KEYWORD3>
- 			<KEYWORD3>addr</KEYWORD3>
- 			<KEYWORD3>address</KEYWORD3>
- 			<KEYWORD3>addrdata</KEYWORD3>
- 			<KEYWORD3>all</KEYWORD3>
- 			<KEYWORD3>allocation</KEYWORD3>
- 			<KEYWORD3>allocn</KEYWORD3>
- 			<KEYWORD3>allocsize</KEYWORD3>
- 			<KEYWORD3>any</KEYWORD3>
- 			<KEYWORD3>asin</KEYWORD3>
- 			<KEYWORD3>asinf</KEYWORD3>
- 			<KEYWORD3>atan</KEYWORD3>
- 			<KEYWORD3>atand</KEYWORD3>
- 			<KEYWORD3>atanf</KEYWORD3>
- 			<KEYWORD3>atanh</KEYWORD3>
- 			<KEYWORD3>availablearea</KEYWORD3>
- 			<KEYWORD3>binaryvalue</KEYWORD3>
- 			<KEYWORD3>bind</KEYWORD3>
- 			<KEYWORD3>binvalue</KEYWORD3>
- 			<KEYWORD3>bitlocation</KEYWORD3>
- 			<KEYWORD3>bitloc</KEYWORD3>
- 			<KEYWORD3>bool</KEYWORD3>
- 			<KEYWORD3>byte</KEYWORD3>
- 			<KEYWORD3>cast</KEYWORD3>
- 			<KEYWORD3>cds</KEYWORD3>
- 			<KEYWORD3>ceil</KEYWORD3>
- 			<KEYWORD3>center</KEYWORD3>
- 			<KEYWORD3>centre</KEYWORD3>
- 			<KEYWORD3>centreleft</KEYWORD3>
- 			<KEYWORD3>centreleft</KEYWORD3>
- 			<KEYWORD3>centreright</KEYWORD3>
- 			<KEYWORD3>centerright</KEYWORD3>
- 			<KEYWORD3>charg</KEYWORD3>
- 			<KEYWORD3>chargraphic</KEYWORD3>
- 			<KEYWORD3>chargval</KEYWORD3>
- 			<KEYWORD3>checkstg</KEYWORD3>
- 			<KEYWORD3>collate</KEYWORD3>
- 			<KEYWORD3>compare</KEYWORD3>
- 			<KEYWORD3>conjg</KEYWORD3>
- 			<KEYWORD3>cos</KEYWORD3>
- 			<KEYWORD3>cosd</KEYWORD3>
- 			<KEYWORD3>cosf</KEYWORD3>
- 			<KEYWORD3>cosh</KEYWORD3>
- 			<KEYWORD3>count</KEYWORD3>
- 			<KEYWORD3>cs</KEYWORD3>
- 			<KEYWORD3>cstg</KEYWORD3>
- 			<KEYWORD3>currentsize</KEYWORD3>
- 			<KEYWORD3>currentstorage</KEYWORD3>
- 			<KEYWORD3>datafield</KEYWORD3>
- 			<KEYWORD3>date</KEYWORD3>
- 			<KEYWORD3>datetime</KEYWORD3>
- 			<KEYWORD3>days</KEYWORD3>
- 			<KEYWORD3>daystodate</KEYWORD3>
- 			<KEYWORD3>daystosecs</KEYWORD3>
- 			<KEYWORD3>divide</KEYWORD3>
- 			<KEYWORD3>empty</KEYWORD3>
- 			<KEYWORD3>entryaddr</KEYWORD3>
- 			<KEYWORD3>epsilon</KEYWORD3>
- 			<KEYWORD3>erfc</KEYWORD3>
- 			<KEYWORD3>exp</KEYWORD3>
- 			<KEYWORD3>expf</KEYWORD3>
- 			<KEYWORD3>exponent</KEYWORD3>
- 			<KEYWORD3>fileddint</KEYWORD3>
- 			<KEYWORD3>fileddtest</KEYWORD3>
- 			<KEYWORD3>fileddword</KEYWORD3>
- 			<KEYWORD3>fileid</KEYWORD3>
- 			<KEYWORD3>fileopen</KEYWORD3>
- 			<KEYWORD3>fileread</KEYWORD3>
- 			<KEYWORD3>fileseek</KEYWORD3>
- 			<KEYWORD3>filetell</KEYWORD3>
- 			<KEYWORD3>filewrite</KEYWORD3>
- 			<KEYWORD3>first</KEYWORD3>
- 			<KEYWORD3>floor</KEYWORD3>
- 			<KEYWORD3>gamma</KEYWORD3>
- 			<KEYWORD3>getenv</KEYWORD3>
- 			<KEYWORD3>hbound</KEYWORD3>
- 			<KEYWORD3>hex</KEYWORD3>
- 			<KEYWORD3>heximage</KEYWORD3>
- 			<KEYWORD3>high</KEYWORD3>
- 			<KEYWORD3>huge</KEYWORD3>
- 			<KEYWORD3>iand</KEYWORD3>
- 			<KEYWORD3>ieor</KEYWORD3>
- 			<KEYWORD3>imag</KEYWORD3>
- 			<KEYWORD3>index</KEYWORD3>
- 			<KEYWORD3>inot</KEYWORD3>
- 			<KEYWORD3>ior</KEYWORD3>
- 			<KEYWORD3>isigned</KEYWORD3>
- 			<KEYWORD3>isll</KEYWORD3>
- 			<KEYWORD3>ismain</KEYWORD3>
- 			<KEYWORD3>isrl</KEYWORD3>
- 			<KEYWORD3>iunsigned</KEYWORD3>
- 			<KEYWORD3>last</KEYWORD3>
- 			<KEYWORD3>lbound</KEYWORD3>
- 			<KEYWORD3>left</KEYWORD3>
- 			<KEYWORD3>length</KEYWORD3>
- 			<KEYWORD3>lineno</KEYWORD3>
- 			<KEYWORD3>loc</KEYWORD3>
- 			<KEYWORD3>location</KEYWORD3>
- 			<KEYWORD3>log</KEYWORD3>
- 			<KEYWORD3>logf</KEYWORD3>
- 			<KEYWORD3>loggamma</KEYWORD3>
- 			<KEYWORD3>log2</KEYWORD3>
- 			<KEYWORD3>log10</KEYWORD3>
- 			<KEYWORD3>log10f</KEYWORD3>
- 			<KEYWORD3>low</KEYWORD3>
- 			<KEYWORD3>lowercase</KEYWORD3>
- 			<KEYWORD3>lower2</KEYWORD3>
- 			<KEYWORD3>max</KEYWORD3>
- 			<KEYWORD3>maxexp</KEYWORD3>
- 			<KEYWORD3>maxlength</KEYWORD3>
- 			<KEYWORD3>min</KEYWORD3>
- 			<KEYWORD3>minexp</KEYWORD3>
- 			<KEYWORD3>mod</KEYWORD3>
- 			<KEYWORD3>mpstr</KEYWORD3>
- 			<KEYWORD3>multiply</KEYWORD3>
- 			<KEYWORD3>new</KEYWORD3>
- 			<KEYWORD3>null</KEYWORD3>
- 			<KEYWORD3>offestadd</KEYWORD3>
- 			<KEYWORD3>offestdiff</KEYWORD3>
- 			<KEYWORD3>offestsubtract</KEYWORD3>
- 			<KEYWORD3>offestvalue</KEYWORD3>
- 			<KEYWORD3>omitted</KEYWORD3>
- 			<KEYWORD3>onchar</KEYWORD3>
- 			<KEYWORD3>oncode</KEYWORD3>
- 			<KEYWORD3>oncondond</KEYWORD3>
- 			<KEYWORD3>oncondid</KEYWORD3>
- 			<KEYWORD3>oncount</KEYWORD3>
- 			<KEYWORD3>onfile</KEYWORD3>
- 			<KEYWORD3>ongsource</KEYWORD3>
- 			<KEYWORD3>onkey</KEYWORD3>
- 			<KEYWORD3>onloc</KEYWORD3>
- 			<KEYWORD3>onsource</KEYWORD3>
- 			<KEYWORD3>onsubcode</KEYWORD3>
- 			<KEYWORD3>onwchar</KEYWORD3>
- 			<KEYWORD3>onwsource</KEYWORD3>
- 			<KEYWORD3>ordinalname</KEYWORD3>
- 			<KEYWORD3>ordinalpred</KEYWORD3>
- 			<KEYWORD3>ordinalsucc</KEYWORD3>
- 			<KEYWORD3>packagename</KEYWORD3>
- 			<KEYWORD3>pageno</KEYWORD3>
- 			<KEYWORD3>places</KEYWORD3>
- 			<KEYWORD3>pliascii</KEYWORD3>
- 			<KEYWORD3>plianc</KEYWORD3>
- 			<KEYWORD3>plickpt</KEYWORD3>
- 			<KEYWORD3>plidelete</KEYWORD3>
- 			<KEYWORD3>plidump</KEYWORD3>
- 			<KEYWORD3>pliebcdic</KEYWORD3>
- 			<KEYWORD3>plifill</KEYWORD3>
- 			<KEYWORD3>plifree</KEYWORD3>
- 			<KEYWORD3>plimove</KEYWORD3>
- 			<KEYWORD3>pliover</KEYWORD3>
- 			<KEYWORD3>plirest</KEYWORD3>
- 			<KEYWORD3>pliretc</KEYWORD3>
- 			<KEYWORD3>pliretv</KEYWORD3>
- 			<KEYWORD3>plisaxa</KEYWORD3>
- 			<KEYWORD3>plisaxb</KEYWORD3>
- 			<KEYWORD3>plisrta</KEYWORD3>
- 			<KEYWORD3>plisrtb</KEYWORD3>
- 			<KEYWORD3>plisrtc</KEYWORD3>
- 			<KEYWORD3>plisrtd</KEYWORD3>
- 			<KEYWORD3>pointeradd</KEYWORD3>
- 			<KEYWORD3>ptradd</KEYWORD3>
- 			<KEYWORD3>pointerdiff</KEYWORD3>
- 			<KEYWORD3>ptrdiff</KEYWORD3>
- 			<KEYWORD3>pointersubtract</KEYWORD3>
- 			<KEYWORD3>ptrsubtract</KEYWORD3>
- 			<KEYWORD3>pointervalue</KEYWORD3>
- 			<KEYWORD3>ptrvalue</KEYWORD3>
- 			<KEYWORD3>poly</KEYWORD3>
- 			<KEYWORD3>pred</KEYWORD3>
- 			<KEYWORD3>present</KEYWORD3>
- 			<KEYWORD3>procname</KEYWORD3>
- 			<KEYWORD3>procedurename</KEYWORD3>
- 			<KEYWORD3>prod</KEYWORD3>
- 			<KEYWORD3>putenv</KEYWORD3>
- 			<KEYWORD3>radix</KEYWORD3>
- 			<KEYWORD3>raise</KEYWORD3>
- 			<KEYWORD3>random</KEYWORD3>
- 			<KEYWORD3>rank</KEYWORD3>
- 			<KEYWORD3>rem</KEYWORD3>
- 			<KEYWORD3>repattern</KEYWORD3>
- 			<KEYWORD3>respec</KEYWORD3>
- 			<KEYWORD3>reverse</KEYWORD3>
- 			<KEYWORD3>right</KEYWORD3>
- 			<KEYWORD3>round</KEYWORD3>
- 			<KEYWORD3>samekey</KEYWORD3>
- 			<KEYWORD3>scale</KEYWORD3>
- 			<KEYWORD3>search</KEYWORD3>
- 			<KEYWORD3>searchr</KEYWORD3>
- 			<KEYWORD3>secs</KEYWORD3>
- 			<KEYWORD3>secstodate</KEYWORD3>
- 			<KEYWORD3>secstodays</KEYWORD3>
- 			<KEYWORD3>sign</KEYWORD3>
- 			<KEYWORD3>signed</KEYWORD3>
- 			<KEYWORD3>sin</KEYWORD3>
- 			<KEYWORD3>sind</KEYWORD3>
- 			<KEYWORD3>sinf</KEYWORD3>
- 			<KEYWORD3>sinh</KEYWORD3>
- 			<KEYWORD3>size</KEYWORD3>
- 			<KEYWORD3>sourcefile</KEYWORD3>
- 			<KEYWORD3>sourceline</KEYWORD3>
- 			<KEYWORD3>sqrt</KEYWORD3>
- 			<KEYWORD3>sqrtf</KEYWORD3>
- 			<KEYWORD3>stg</KEYWORD3>
- 			<KEYWORD3>storage</KEYWORD3>
- 			<KEYWORD3>string</KEYWORD3>
- 			<KEYWORD3>substr</KEYWORD3>
- 			<KEYWORD3>subtract</KEYWORD3>
- 			<KEYWORD3>succ</KEYWORD3>
- 			<KEYWORD3>sum</KEYWORD3>
- 			<KEYWORD3>sysnull</KEYWORD3>
- 			<KEYWORD3>tally</KEYWORD3>
- 			<KEYWORD3>tan</KEYWORD3>
- 			<KEYWORD3>tand</KEYWORD3>
- 			<KEYWORD3>tanf</KEYWORD3>
- 			<KEYWORD3>tanh</KEYWORD3>
- 			<KEYWORD3>threadid</KEYWORD3>
- 			<KEYWORD3>time</KEYWORD3>
- 			<KEYWORD3>tiny</KEYWORD3>
- 			<KEYWORD3>translate</KEYWORD3>
- 			<KEYWORD3>trim</KEYWORD3>
- 			<KEYWORD3>trunc</KEYWORD3>
- 			<KEYWORD3>type</KEYWORD3>
- 			<KEYWORD3>unallocated</KEYWORD3>
- 			<KEYWORD3>unspec</KEYWORD3>
- 			<KEYWORD3>uppercase</KEYWORD3>
- 			<KEYWORD3>valid</KEYWORD3>
- 			<KEYWORD3>validdate</KEYWORD3>
- 			<KEYWORD3>varglist</KEYWORD3>
- 			<KEYWORD3>vargsizer</KEYWORD3>
- 			<KEYWORD3>verify</KEYWORD3>
- 			<KEYWORD3>verifyr</KEYWORD3>
- 			<KEYWORD3>wcharval</KEYWORD3>
- 			<KEYWORD3>weekday</KEYWORD3>
- 			<KEYWORD3>whigh</KEYWORD3>
- 			<KEYWORD3>wlow</KEYWORD3>
- 			<KEYWORD3>y4date</KEYWORD3>
- 			<KEYWORD3>y4julian</KEYWORD3>
- 			<KEYWORD3>y4year</KEYWORD3>
-
-		</KEYWORDS>
-	</RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/pl_sql.xml b/qpython/src/main/assets/syntax/pl_sql.xml
deleted file mode 100644
index 481a8d32..00000000
--- a/qpython/src/main/assets/syntax/pl_sql.xml
+++ /dev/null
@@ -1,502 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="commentStart" VALUE="/*" />
-		<PROPERTY NAME="commentEnd" VALUE="*/" />
-		<PROPERTY NAME="lineComment" VALUE="--" />
-        <PROPERTY NAME="indentNextLines" VALUE="\s*(.*THEN|ELSE|LOOP).*" />
-		<PROPERTY NAME="unindentNextLines" VALUE="^\s*(ELSE|ELSIF|END IF|END LOOP).*" />
-		<PROPERTY NAME="unindentThisLine" VALUE="^\s*(ELSE|ELSIF|END IF|END LOOP).*" />
-	</PROPS>
-	<RULES IGNORE_CASE="TRUE" HIGHLIGHT_DIGITS="TRUE">
-		<SPAN TYPE="LABEL">
-			<BEGIN>/*+</BEGIN>
-			<END>*/</END>
-		</SPAN>
-		<SPAN TYPE="COMMENT1">
-			<BEGIN>/*</BEGIN>
-			<END>*/</END>
-		</SPAN>
-		<SPAN TYPE="LITERAL1">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-		<SPAN TYPE="LITERAL1">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-		<SPAN TYPE="LITERAL1" NO_LINE_BREAK="TRUE">
-			<BEGIN>[</BEGIN>
-			<END>]</END>
-		</SPAN>
-		<EOL_SPAN TYPE="LABEL">--+</EOL_SPAN>
-		<EOL_SPAN TYPE="COMMENT1">--</EOL_SPAN>
-		<EOL_SPAN TYPE="COMMENT1" AT_LINE_START="TRUE">REM </EOL_SPAN>
-        <EOL_SPAN TYPE="COMMENT1" AT_LINE_START="TRUE">REMARK</EOL_SPAN>
-		<SEQ TYPE="OPERATOR">+</SEQ>
-		<SEQ TYPE="OPERATOR">-</SEQ>
-		<SEQ TYPE="OPERATOR">/</SEQ>
-		<SEQ TYPE="OPERATOR">*</SEQ>
-		<SEQ TYPE="OPERATOR">=</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;</SEQ>
-		<SEQ TYPE="OPERATOR">%</SEQ>
-		<SEQ TYPE="OPERATOR">&amp;</SEQ>
-		<SEQ TYPE="OPERATOR">|</SEQ>
-		<SEQ TYPE="OPERATOR">^</SEQ>
-		<SEQ TYPE="OPERATOR">~</SEQ>
-		<SEQ TYPE="OPERATOR">!=</SEQ>
-		<SEQ TYPE="OPERATOR">!&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">!&lt;</SEQ>
-		<SEQ TYPE="OPERATOR">:=</SEQ>
-		<SEQ TYPE="OPERATOR">.</SEQ>
-		<SEQ TYPE="OPERATOR">(</SEQ>
-		<SEQ TYPE="OPERATOR">)</SEQ>
-        <MARK_FOLLOWING AT_LINE_START="TRUE" AT_WHITESPACE_END="TRUE"
-                TYPE="LABEL">@@</MARK_FOLLOWING>
-        <MARK_FOLLOWING AT_LINE_START="TRUE"
-                AT_WHITESPACE_END="TRUE" TYPE="LABEL">@</MARK_FOLLOWING>
-		<EOL_SPAN AT_LINE_START="TRUE" DELEGATE="shellscript::MAIN">!</EOL_SPAN>
-		<EOL_SPAN AT_LINE_START="TRUE"
-                DELEGATE="shellscript::MAIN">host</EOL_SPAN>
-		<MARK_PREVIOUS TYPE="LABEL" AT_LINE_START="TRUE">:</MARK_PREVIOUS>
-
-		<KEYWORDS>
-			<!-- reserved words -->
-			<KEYWORD1>ABORT</KEYWORD1>
-			<KEYWORD1>ACCESS</KEYWORD1>
-			<KEYWORD1>ACCEPT</KEYWORD1>
-			<KEYWORD1>ADD</KEYWORD1>
-			<KEYWORD1>ALTER</KEYWORD1>
-			<KEYWORD1>ARRAY</KEYWORD1>
-			<KEYWORD1>ARRAY_LEN</KEYWORD1>
-			<KEYWORD1>AS</KEYWORD1>
-			<KEYWORD1>ASC</KEYWORD1>
-			<KEYWORD1>ASSERT</KEYWORD1>
-			<KEYWORD1>ASSIGN</KEYWORD1>
-			<KEYWORD1>AT</KEYWORD1>
-			<KEYWORD1>AUDIT</KEYWORD1>
-			<KEYWORD1>AUTHORIZATION</KEYWORD1>
-			<KEYWORD1>AVG</KEYWORD1>
-			<KEYWORD1>BASE_TABLE</KEYWORD1>
-			<KEYWORD1>BEGIN</KEYWORD1>
-			<KEYWORD1>BINARY_INTEGER</KEYWORD1>
-			<KEYWORD1>BODY</KEYWORD1>
-			<KEYWORD1>BREAK</KEYWORD1>
-			<KEYWORD1>BREAKS</KEYWORD1>
-			<KEYWORD1>BTITLE</KEYWORD1>
-			<KEYWORD1>CASE</KEYWORD1>
-			<KEYWORD1>CALL</KEYWORD1>
-			<KEYWORD1>CENTER</KEYWORD1>
-			<KEYWORD1>CHAR</KEYWORD1>
-			<KEYWORD1>CHAR_BASE</KEYWORD1>
-			<KEYWORD1>CHECK</KEYWORD1>
-			<KEYWORD1>CLEAR</KEYWORD1>
-			<KEYWORD1>CLOSE</KEYWORD1>
-			<KEYWORD1>CLUSTER</KEYWORD1>
-			<KEYWORD1>CLUSTERS</KEYWORD1>
-			<KEYWORD1>CMPVAR</KEYWORD1>
-			<KEYWORD1>COL</KEYWORD1>
-			<KEYWORD1>COLAUTH</KEYWORD1>
-			<KEYWORD1>COLUMN</KEYWORD1>
-			<KEYWORD1>COLUMNS</KEYWORD1>
-			<KEYWORD1>COMMENT</KEYWORD1>
-			<KEYWORD1>COMMIT</KEYWORD1>
-			<KEYWORD1>COMPRESS</KEYWORD1>
-			<KEYWORD1>COMPUTE</KEYWORD1>
-			<KEYWORD1>CONSTANT</KEYWORD1>
-			<KEYWORD1>CONSTRAINT</KEYWORD1>
-			<KEYWORD1>CONTINUE</KEYWORD1>
-			<KEYWORD1>COUNT</KEYWORD1>
-			<KEYWORD1>CREATE</KEYWORD1>
-			<KEYWORD1>CURRENT</KEYWORD1>
-			<KEYWORD1>CURRVAL</KEYWORD1>
-			<KEYWORD1>CURSOR</KEYWORD1>
-			<KEYWORD1>DATABASE</KEYWORD1>
-			<KEYWORD1>DATA_BASE</KEYWORD1>
-			<KEYWORD1>DATE</KEYWORD1>
-			<KEYWORD1>DBA</KEYWORD1>
-			<KEYWORD1>DEBUGOFF</KEYWORD1>
-			<KEYWORD1>DEBUGON</KEYWORD1>
-			<KEYWORD1>DECLARE</KEYWORD1>
-			<KEYWORD1>DEFAULT</KEYWORD1>
-			<KEYWORD1>DEFINITION</KEYWORD1>
-			<KEYWORD1>DELAY</KEYWORD1>
-			<KEYWORD1>DELETE</KEYWORD1>
-			<KEYWORD1>DESC</KEYWORD1>
-			<KEYWORD1>EXPLAIN</KEYWORD1>
-			<KEYWORD1>DIGITS</KEYWORD1>
-			<KEYWORD1>DISPOSE</KEYWORD1>
-			<KEYWORD1>DISTINCT</KEYWORD1>
-			<KEYWORD1>DO</KEYWORD1>
-			<KEYWORD1>DROP</KEYWORD1>
-			<KEYWORD1>DUMP</KEYWORD1>
-			<KEYWORD1>ELSE</KEYWORD1>
-			<KEYWORD1>ELSIF</KEYWORD1>
-			<KEYWORD1>END</KEYWORD1>
-			<KEYWORD1>ENTRY</KEYWORD1>>
-			<KEYWORD1>ERRORS</KEYWORD1>
-			<KEYWORD1>EXCEPTION</KEYWORD1>
-			<KEYWORD1>EXCEPTION_INIT</KEYWORD1>
-			<KEYWORD1>EXCLUSIVE</KEYWORD1>
-			<KEYWORD1>EXECUTE</KEYWORD1>
-			<KEYWORD1>EXIT</KEYWORD1>
-			<KEYWORD1>EXTERNAL</KEYWORD1>
-			<KEYWORD1>FALSE</KEYWORD1>
-			<KEYWORD1>FETCH</KEYWORD1>
-			<KEYWORD1>FILE</KEYWORD1>
-			<KEYWORD1>FOR</KEYWORD1>
-            <KEYWORD1>FOREIGN</KEYWORD1>
-			<KEYWORD1>FORM</KEYWORD1>
-			<KEYWORD1>FORMAT</KEYWORD1>
-			<KEYWORD1>FROM</KEYWORD1>
-			<KEYWORD1>FUNCTION</KEYWORD1>
-			<KEYWORD1>GENERIC</KEYWORD1>
-			<KEYWORD1>GOTO</KEYWORD1>
-			<KEYWORD1>GRANT</KEYWORD1>
-			<KEYWORD1>GREATEST</KEYWORD1>
-			<KEYWORD1>GROUP</KEYWORD1>
-			<KEYWORD1>HAVING</KEYWORD1>
-			<KEYWORD1>HEADING</KEYWORD1>
-			<KEYWORD1>IDENTIFIED</KEYWORD1>
-			<KEYWORD1>IDENTITYCOL</KEYWORD1>
-			<KEYWORD1>IF</KEYWORD1>
-			<KEYWORD1>IMMEDIATE</KEYWORD1>
-			<KEYWORD1>INCREMENT</KEYWORD1>
-			<KEYWORD1>INDEX</KEYWORD1>
-			<KEYWORD1>INDEXES</KEYWORD1>
-			<KEYWORD1>INDICATOR</KEYWORD1>
-			<KEYWORD1>INITIAL</KEYWORD1>
-			<KEYWORD1>INSERT</KEYWORD1>
-			<KEYWORD1>INTERFACE</KEYWORD1>
-			<KEYWORD1>INTO</KEYWORD1>
-			<KEYWORD1>IS</KEYWORD1>
-			<KEYWORD1>KEY</KEYWORD1>
-			<KEYWORD1>LEAST</KEYWORD1>
-			<KEYWORD1>LEVEL</KEYWORD1>
-			<KEYWORD1>LIMITED</KEYWORD1>
-			<KEYWORD1>LOCK</KEYWORD1>
-			<KEYWORD1>LONG</KEYWORD1>
-			<KEYWORD1>LOOP</KEYWORD1>
-			<KEYWORD1>MATCHED</KEYWORD1>
-			<KEYWORD1>MAX</KEYWORD1>
-			<KEYWORD1>MAXEXTENTS</KEYWORD1>
-			<KEYWORD1>MERGE</KEYWORD1>
-			<KEYWORD1>MEMBER</KEYWORD1>
-			<KEYWORD1>MIN</KEYWORD1>
-			<KEYWORD1>MINUS</KEYWORD1>
-			<KEYWORD1>MLSLABEL</KEYWORD1>
-			<KEYWORD1>MOD</KEYWORD1>
-			<KEYWORD1>MODIFY</KEYWORD1>
-			<KEYWORD1>MORE</KEYWORD1>
-			<KEYWORD1>NATURAL</KEYWORD1>
-			<KEYWORD1>NATURALN</KEYWORD1>
-			<KEYWORD1>NEW</KEYWORD1>
-			<KEYWORD1>NEW_VALUE</KEYWORD1>
-			<KEYWORD1>NEXT</KEYWORD1>
-			<KEYWORD1>NEXTVAL</KEYWORD1>
-			<KEYWORD1>NOAUDIT</KEYWORD1>
-			<KEYWORD1>NOCOMPRESS</KEYWORD1>
-			<KEYWORD1>NOPRINT</KEYWORD1>
-			<KEYWORD1>NOWAIT</KEYWORD1>
-			<KEYWORD1>NULL</KEYWORD1>
-			<KEYWORD1>NUMBER</KEYWORD1>
-			<KEYWORD1>NUMBER_BASE</KEYWORD1>
-			<KEYWORD1>OF</KEYWORD1>
-			<KEYWORD1>OFFLINE</KEYWORD1>
-			<KEYWORD1>ON</KEYWORD1>
-			<KEYWORD1>OFF</KEYWORD1>
-			<KEYWORD1>ONLINE</KEYWORD1>
-			<KEYWORD1>OPEN</KEYWORD1>
-			<KEYWORD1>OPTION</KEYWORD1>
-			<KEYWORD1>ORDER</KEYWORD1>
-			<KEYWORD1>ORGANIZATION</KEYWORD1>
-			<KEYWORD1>OTHERS</KEYWORD1>
-			<KEYWORD1>OUT</KEYWORD1>
-			<KEYWORD1>PACKAGE</KEYWORD1>
-			<KEYWORD1>PAGE</KEYWORD1>
-			<KEYWORD1>PARTITION</KEYWORD1>
-			<KEYWORD1>PCTFREE</KEYWORD1>
-			<KEYWORD1>PCTINCREASE</KEYWORD1>
-			<KEYWORD1>PLAN</KEYWORD1>
-			<KEYWORD1>POSITIVE</KEYWORD1>
-			<KEYWORD1>POSITIVEN</KEYWORD1>
-			<KEYWORD1>PRAGMA</KEYWORD1>
-			<KEYWORD1>PRINT</KEYWORD1>
-			<KEYWORD1>PRIMARY</KEYWORD1>
-			<KEYWORD1>PRIOR</KEYWORD1>
-			<KEYWORD1>PRIVATE</KEYWORD1>
-			<KEYWORD1>PRIVILEGES</KEYWORD1>
-			<KEYWORD1>PROCEDURE</KEYWORD1>
-			<KEYWORD1>PROMPT</KEYWORD1>
-			<KEYWORD1>PUBLIC</KEYWORD1>
-			<KEYWORD1>QUOTED_IDENTIFIER</KEYWORD1>
-			<KEYWORD1>RAISE</KEYWORD1>
-			<KEYWORD1>RANGE</KEYWORD1>
-			<KEYWORD1>RAW</KEYWORD1>
-			<KEYWORD1>RECORD</KEYWORD1>
-			<KEYWORD1>REF</KEYWORD1>
-            <KEYWORD1>REFERENCES</KEYWORD1>
-			<KEYWORD1>RELEASE</KEYWORD1>
-			<KEYWORD1>REMR</KEYWORD1>
-			<KEYWORD1>RENAME</KEYWORD1>
-			<KEYWORD1>RESOURCE</KEYWORD1>
-			<KEYWORD1>RETURN</KEYWORD1>
-			<KEYWORD1>REVERSE</KEYWORD1>
-			<KEYWORD1>REVOKE</KEYWORD1>
-			<KEYWORD1>ROLLBACK</KEYWORD1>
-			<KEYWORD1>ROW</KEYWORD1>
-			<KEYWORD1>ROWID</KEYWORD1>
-			<KEYWORD1>ROWLABEL</KEYWORD1>
-			<KEYWORD1>ROWNUM</KEYWORD1>
-			<KEYWORD1>ROWS</KEYWORD1>
-			<KEYWORD1>ROWTYPE</KEYWORD1>
-			<KEYWORD1>RUN</KEYWORD1>
-			<KEYWORD1>SAVEPOINT</KEYWORD1>
-			<KEYWORD1>SCHEMA</KEYWORD1>
-			<KEYWORD1>SELECT</KEYWORD1>
-			<KEYWORD1>SEPERATE</KEYWORD1>
-			<KEYWORD1>SEQUENCE</KEYWORD1>
-			<KEYWORD1>SESSION</KEYWORD1>
-			<KEYWORD1>SET</KEYWORD1>
-			<KEYWORD1>SHARE</KEYWORD1>
-			<KEYWORD1>SHOW</KEYWORD1>
-			<KEYWORD1>SIGNTYPE</KEYWORD1>
-			<KEYWORD1>SKIP</KEYWORD1>
-			<KEYWORD1>SPACE</KEYWORD1>
-			<KEYWORD1>SPOOL</KEYWORD1>
-			<NULL>.SQL</NULL> <!-- for 'SPOOL some.sql;' stuff -->
-			<KEYWORD1>SQL</KEYWORD1>
-			<KEYWORD1>SQLCODE</KEYWORD1>
-			<KEYWORD1>SQLERRM</KEYWORD1>
-			<KEYWORD1>SQLERROR</KEYWORD1>
-			<KEYWORD1>STATEMENT</KEYWORD1>
-			<KEYWORD1>STDDEV</KEYWORD1>
-			<KEYWORD1>STORAGE</KEYWORD1>
-			<KEYWORD1>SUBTYPE</KEYWORD1>
-			<KEYWORD1>SUCCESSFULL</KEYWORD1>
-			<KEYWORD1>SUM</KEYWORD1>
-			<KEYWORD1>SYNONYM</KEYWORD1>
-			<KEYWORD1>SYSDATE</KEYWORD1>
-			<KEYWORD1>TABAUTH</KEYWORD1>
-			<KEYWORD1>TABLE</KEYWORD1>
-			<KEYWORD1>TABLES</KEYWORD1>
-			<KEYWORD1>TABLESPACE</KEYWORD1>
-			<KEYWORD1>TASK</KEYWORD1>
-			<KEYWORD1>TERMINATE</KEYWORD1>
-			<KEYWORD1>THEN</KEYWORD1>
-			<KEYWORD1>TO</KEYWORD1>
-			<KEYWORD1>TRIGGER</KEYWORD1>
-			<KEYWORD1>TRUE</KEYWORD1>
-			<KEYWORD1>TRUNCATE</KEYWORD1>
-			<KEYWORD1>TTITLE</KEYWORD1>
-			<KEYWORD1>TYPE</KEYWORD1>
-			<KEYWORD1>UID</KEYWORD1>
-			<KEYWORD1>UNION</KEYWORD1>
-			<KEYWORD1>UNIQUE</KEYWORD1>
-			<KEYWORD1>UNDEFINE</KEYWORD1>
-			<KEYWORD1>UPDATE</KEYWORD1>
-			<KEYWORD1>UPDATETEXT</KEYWORD1>
-			<KEYWORD1>USE</KEYWORD1>
-			<KEYWORD1>USER</KEYWORD1>
-			<KEYWORD1>USING</KEYWORD1>
-			<KEYWORD1>VALIDATE</KEYWORD1>
-			<KEYWORD1>VALUES</KEYWORD1>
-			<KEYWORD1>VARIANCE</KEYWORD1>
-			<KEYWORD1>VIEW</KEYWORD1>
-			<KEYWORD1>VIEWS</KEYWORD1>
-			<KEYWORD1>WHEN</KEYWORD1>
-			<KEYWORD1>WHENEVER</KEYWORD1>
-			<KEYWORD1>WHERE</KEYWORD1>
-			<KEYWORD1>WHILE</KEYWORD1>
-			<KEYWORD1>WITH</KEYWORD1>
-			<KEYWORD1>WORK</KEYWORD1>
-			<KEYWORD1>WRITE</KEYWORD1>
-			<KEYWORD1>XOR</KEYWORD1>
-
-			<!-- data types -->
-			<KEYWORD1>binary</KEYWORD1>
-			<KEYWORD1>bit</KEYWORD1>
-			<KEYWORD1>blob</KEYWORD1>
-			<KEYWORD1>boolean</KEYWORD1>
-			<KEYWORD1>char</KEYWORD1>
-			<KEYWORD1>character</KEYWORD1>
-			<KEYWORD1>datetime</KEYWORD1>
-			<KEYWORD1>decimal</KEYWORD1>
-			<KEYWORD1>float</KEYWORD1>
-			<KEYWORD1>image</KEYWORD1>
-			<KEYWORD1>int</KEYWORD1>
-			<KEYWORD1>integer</KEYWORD1>
-			<KEYWORD1>money</KEYWORD1>
-			<KEYWORD1>numeric</KEYWORD1>
-			<KEYWORD1>nchar</KEYWORD1>
-			<KEYWORD1>nvarchar</KEYWORD1>
-			<KEYWORD1>ntext</KEYWORD1>
-			<KEYWORD1>object</KEYWORD1>
-			<KEYWORD1>pls_integer</KEYWORD1>
-			<KEYWORD1>real</KEYWORD1>
-			<KEYWORD1>smalldatetime</KEYWORD1>
-			<KEYWORD1>smallint</KEYWORD1>
-			<KEYWORD1>smallmoney</KEYWORD1>
-			<KEYWORD1>text</KEYWORD1>
-			<KEYWORD1>timestamp</KEYWORD1>
-			<KEYWORD1>tinyint</KEYWORD1>
-			<KEYWORD1>uniqueidentifier</KEYWORD1>
-			<KEYWORD1>varbinary</KEYWORD1>
-			<KEYWORD1>varchar</KEYWORD1>
-			<KEYWORD1>varchar2</KEYWORD1>
-			<KEYWORD1>varray</KEYWORD1>
-
-			<!-- system functions -->
-			<KEYWORD2>ABS</KEYWORD2>
-			<KEYWORD2>ACOS</KEYWORD2>
-			<KEYWORD2>ADD_MONTHS</KEYWORD2>
-			<KEYWORD2>ASCII</KEYWORD2>
-			<KEYWORD2>ASIN</KEYWORD2>
-			<KEYWORD2>ATAN</KEYWORD2>
-			<KEYWORD2>ATAN2</KEYWORD2>
-			<KEYWORD2>BITAND</KEYWORD2>
-			<KEYWORD2>CEIL</KEYWORD2>
-			<KEYWORD2>CHARTOROWID</KEYWORD2>
-			<KEYWORD2>CHR</KEYWORD2>
-			<KEYWORD2>CONCAT</KEYWORD2>
-			<KEYWORD2>CONVERT</KEYWORD2>
-			<KEYWORD2>COS</KEYWORD2>
-			<KEYWORD2>COSH</KEYWORD2>
-			<KEYWORD2>DECODE</KEYWORD2>
-			<KEYWORD2>DEFINE</KEYWORD2>
-			<KEYWORD2>DUAL</KEYWORD2>
-			<KEYWORD2>FLOOR</KEYWORD2>
-			<KEYWORD2>HEXTORAW</KEYWORD2>
-			<KEYWORD2>INITCAP</KEYWORD2>
-			<KEYWORD2>INSTR</KEYWORD2>
-			<KEYWORD2>INSTRB</KEYWORD2>
-			<KEYWORD2>LAST_DAY</KEYWORD2>
-			<KEYWORD2>LENGTH</KEYWORD2>
-			<KEYWORD2>LENGTHB</KEYWORD2>
-			<KEYWORD2>LN</KEYWORD2>
-			<KEYWORD2>LOG</KEYWORD2>
-			<KEYWORD2>LOWER</KEYWORD2>
-			<KEYWORD2>LPAD</KEYWORD2>
-			<KEYWORD2>LTRIM</KEYWORD2>
-			<KEYWORD2>MOD</KEYWORD2>
-			<KEYWORD2>MONTHS_BETWEEN</KEYWORD2>
-			<KEYWORD2>NEW_TIME</KEYWORD2>
-			<KEYWORD2>NEXT_DAY</KEYWORD2>
-			<KEYWORD2>NLSSORT</KEYWORD2>
-			<KEYWORD2>NSL_INITCAP</KEYWORD2>
-			<KEYWORD2>NLS_LOWER</KEYWORD2>
-			<KEYWORD2>NLS_UPPER</KEYWORD2>
-			<KEYWORD2>NVL</KEYWORD2>
-			<KEYWORD2>POWER</KEYWORD2>
-			<KEYWORD2>RAWTOHEX</KEYWORD2>
-			<KEYWORD2>REPLACE</KEYWORD2>
-			<KEYWORD2>ROUND</KEYWORD2>
-			<KEYWORD2>ROWIDTOCHAR</KEYWORD2>
-			<KEYWORD2>RPAD</KEYWORD2>
-			<KEYWORD2>RTRIM</KEYWORD2>
-			<KEYWORD2>SIGN</KEYWORD2>
-			<KEYWORD2>SOUNDEX</KEYWORD2>
-			<KEYWORD2>SIN</KEYWORD2>
-			<KEYWORD2>SINH</KEYWORD2>
-			<KEYWORD2>SQRT</KEYWORD2>
-			<KEYWORD2>SUBSTR</KEYWORD2>
-			<KEYWORD2>SUBSTRB</KEYWORD2>
-			<KEYWORD2>TAN</KEYWORD2>
-			<KEYWORD2>TANH</KEYWORD2>
-			<KEYWORD2>TO_CHAR</KEYWORD2>
-			<KEYWORD2>TO_DATE</KEYWORD2>
-			<KEYWORD2>TO_MULTIBYTE</KEYWORD2>
-			<KEYWORD2>TO_NUMBER</KEYWORD2>
-			<KEYWORD2>TO_SINGLE_BYTE</KEYWORD2>
-			<KEYWORD2>TRANSLATE</KEYWORD2>
-			<KEYWORD2>TRUNC</KEYWORD2>
-			<KEYWORD2>UPPER</KEYWORD2>
-
-			<!-- operators -->
-			<KEYWORD1>ALL</KEYWORD1>
-			<KEYWORD1>AND</KEYWORD1>
-			<KEYWORD1>ANY</KEYWORD1>
-			<KEYWORD1>BETWEEN</KEYWORD1>
-			<KEYWORD1>BY</KEYWORD1>
-			<KEYWORD1>CONNECT</KEYWORD1>
-			<KEYWORD1>EXISTS</KEYWORD1>
-			<KEYWORD1>IN</KEYWORD1>
-			<KEYWORD1>INTERSECT</KEYWORD1>
-			<KEYWORD1>LIKE</KEYWORD1>
-			<KEYWORD1>NOT</KEYWORD1>
-			<KEYWORD1>NULL</KEYWORD1>
-			<KEYWORD1>OR</KEYWORD1>
-			<KEYWORD1>START</KEYWORD1>
-			<KEYWORD1>UNION</KEYWORD1>
-			<KEYWORD1>WITH</KEYWORD1>
-			<KEYWORD1>NOTFOUND</KEYWORD1>
-			<KEYWORD1>ISOPEN</KEYWORD1>
-			<KEYWORD1>JOIN</KEYWORD1>
-			<KEYWORD1>LEFT</KEYWORD1>
-			<KEYWORD1>RIGHT</KEYWORD1>
-			<KEYWORD1>FULL</KEYWORD1>
-			<KEYWORD1>OUTER</KEYWORD1>
-			<KEYWORD1>CROSS</KEYWORD1>
-
-			<!-- Some common packages -->
-			<KEYWORD3>DBMS_SQL</KEYWORD3>
-			<FUNCTION>OPEN_CURSOR</FUNCTION>
-			<FUNCTION>PARSE</FUNCTION>
-			<FUNCTION>BIND_VARIABLE</FUNCTION>
-			<FUNCTION>BIND_ARRAY</FUNCTION>
-			<FUNCTION>DEFINE_COLUMN</FUNCTION>
-			<FUNCTION>DEFINE_COLUMN_LONG</FUNCTION>
-			<FUNCTION>DEFINE_ARRAY</FUNCTION>
-			<FUNCTION>EXECUTE</FUNCTION>
-			<FUNCTION>FETCH_ROWS</FUNCTION>
-			<FUNCTION>EXECUTE_AND_FETCH</FUNCTION>
-			<FUNCTION>VARIABLE_VALUE</FUNCTION>
-			<FUNCTION>COLUMN_VALUE</FUNCTION>
-			<FUNCTION>COLUMN_VALUE_LONG</FUNCTION>
-			<FUNCTION>CLOSE_CURSOR</FUNCTION>
-			<FUNCTION>DEFINE_COLUMN_CHAR</FUNCTION>
-			<FUNCTION>COLUMN_VALUE_CHAR</FUNCTION>
-
-			<KEYWORD3>DBMS_PROFILER</KEYWORD3>
-			<FUNCTION>START_PROFILER</FUNCTION>
-			<FUNCTION>STOP_PROFILER</FUNCTION>
-			<FUNCTION>ROLLUP_RUN</FUNCTION>
-
-			<!-- other keywords (output-related) -->
-			<KEYWORD3>_EDITOR</KEYWORD3>
-			<KEYWORD3>ARRAYSIZE</KEYWORD3>
-			<KEYWORD3>AUTOTRACE</KEYWORD3>
-			<KEYWORD3>DBMS_OUTPUT</KEYWORD3>
-			<KEYWORD3>ECHO</KEYWORD3>
-			<KEYWORD3>ENABLE</KEYWORD3>
-			<KEYWORD3>FCLOSE</KEYWORD3>
-			<KEYWORD3>FCLOSE_ALL</KEYWORD3>
-			<KEYWORD3>FEED</KEYWORD3>
-			<KEYWORD3>FEEDBACK</KEYWORD3>
-			<KEYWORD3>FILE_TYPE</KEYWORD3>
-			<KEYWORD3>FOPEN</KEYWORD3>
-			<KEYWORD3>HEAD</KEYWORD3>
-			<KEYWORD3>INVALID_OPERATION</KEYWORD3>
-			<KEYWORD3>INVALID_PATH</KEYWORD3>
-			<KEYWORD3>LINESIZE</KEYWORD3>
-			<KEYWORD3>PAGESIZE</KEYWORD3>
-			<KEYWORD3>PAGES</KEYWORD3>
-			<KEYWORD3>PAUSE</KEYWORD3>
-			<KEYWORD3>DOC</KEYWORD3>
-			<KEYWORD3>PUTF</KEYWORD3>
-			<KEYWORD3>PUT_LINE</KEYWORD3>
-			<KEYWORD3>SERVEROUTPUT</KEYWORD3>
-			<KEYWORD3>SQL.PNO</KEYWORD3>
-			<KEYWORD3>UTL_FILE</KEYWORD3>
-			<KEYWORD3>VER</KEYWORD3>
-			<KEYWORD3>VERIFY</KEYWORD3>
-			<KEYWORD3>WRITE_ERROR</KEYWORD3>
-		</KEYWORDS>
-	</RULES>
-</MODE>
-
-
diff --git a/qpython/src/main/assets/syntax/plaintex.xml b/qpython/src/main/assets/syntax/plaintex.xml
deleted file mode 100644
index 4b7c7520..00000000
--- a/qpython/src/main/assets/syntax/plaintex.xml
+++ /dev/null
@@ -1,2886 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!--____________________________________________________________________
-                                 Plain TeX Syntax Highlighting for jEdit
-
-                                                        by James Nicholl
-
-                                                    jnicholl17@yahoo.com
-________________________________________________________________________
-  -  Forward  -
-________________________________________________________________________
-
-	This syntax highlighting package is primarily based on a list of well organized and easily processed control sequence names that can be obtained at:
-
-	http://www.math.upenn.edu/tex_docs/help/csname.txt
-
-	Control sequences contained in the aforementioned document are included here with some exceptions. I removed from this list any control sequence not supported by plain TeX. It is currently my belief that this document details the control sequences in some form of AMS TeX. There were some control sequences that contained the character '@'. It is my understanding that the intention behind using a '@' character in a control sequence is to signify that the control sequence is private. I have therefore removed all control sequences that include '@'.
-
-	Continuing along this line of reason, I chose not to extend this naming restriction to user defined control sequences. They are recognized as being of the form \[a-zA-Z@][a-zA-Z@]* In other words, a user defined control sequence is prefixed by a backslash '\' and contains one or more characters from the set of letter characters union '@'. If you were silly enough to reassign your escape character then this package isn't for you, and I'm sure you've realized by now that there really aren't any syntax highlighting packages available for your exotic dialect of TeX.
-________________________________________________________________________
-  -  Description  -
-________________________________________________________________________
-
-	Take some time and assign a color scheme that makes sense for you. Syntax highlighting can illuminate some simple typing errors and improve your programming by allowing you to quickly and effortlessly identify key structures in your code.
-
-	This is a work in progress. Eventually, with enough experience programming TeX, I should have a better idea of how to categorize everything, and a better idea of what there is to categorize. It's just a matter of working with this xml document always open and making adjustments when the opportunity arises.
-
-	Any unrecognized control sequences of the form "\[a-zA-Z@]" are considered to be user defined.
-
-________________________________________________________________________
-  -  Description  -
-________________________________________________________________________
-
-
-COMMENT1	-	Comments
-
-COMMENT2	-	Allocations
-
-COMMENT3	-	Assignments
-
-COMMENT4	-	Registers
-
-DIGIT		-	Macro (definition) arguments of the form #[1-9]
-
-FUNCTION	-	Definitions
-
-INVALID	-	UNUSED
-
-KEYWORD1	-	Plain TeX control sequences of the form \[a-zA-Z]*
-
-KEYWORD2	-	Character Control Sequences
-
-KEYWORD3	-	Conditional Control Sequences
-
-KEYWORD4	-	Parameters: integer, dimension, glue, muglue and token
-
-LABEL		-	Unrecognized control sequences of the form \[a-zA-Z@]*
-
-LITERAL1	-	Other reserved characters. & ~ ^ _
-
-LITERAL2	-	TeX dimensions of the form [0-9]*.[0-9]*[pt pc bp in cm mm cc dd]
-
-LITERAL3	-	Punctuation , . ; : ' " ` ! ? \ \par
-
-LITERAL4	-	Other Characters ( ) + - lessthan greaterthan = / * |
-
-MARKUP		-	Extends over math mode. It is highly recommended that this type be
-				assigned a background color markedly different than the default
-				background color. You don't want to lose track of your dollar
-				signs!
-
-OPERATOR	-	TeX grouping brackets {...} , square argument brackets [...] , in
-				line math mode dollar signs $...$ and paragraph math mode double
-				dollar signs $$...$$ Assign these symbols bright colors so they
-				stand out!
-
-_______________________________________________________________________________
-	-  References  -
-_______________________________________________________________________________
-
-	In the course of preparing this package I have consulted the famous TeXbook many times. I'm sure I can't say anything positive about this book that hasn't already been said. It's the first book an ambitious student of plain TeX should read, and if it's the only book you read on TeX it's probably enough.
-
-Knuth, Donald. The TeXbook. Twentieth Printing. Addison-Wesley:
-	Reading, MA, USA, 1991.
-
-	After absorbing the material in the TeXbook I found an excellent electronic reference manual through the ubiquitous internet. For someone that appreciates explicit, rigorous and thorough language definition this is an ideal programmer's companion. A printed copy can be purchased and the PDF version can be downloaded free of charge through the author's website.
-
-	http://eijkhout.net/texbytopic/texbytopic.html
-
-Eijkhout, Victor. TeX by Topic. Reprinted 1993. Addison-Wesley:
-	UK, 1991.
-
-	As I am a prolific Googler, many random and forgettable forums, blogs, wikis, and all manner of dubiously monickered digital media were consulted while preparing this package. I think I can safely say that if I had confined myself to the following few websites I would have found everything I needed.
-
-The American Mathematical Society
-	http://www.ams.org/cmlhtml/texcodes.html
-
-CTAN
-
-TUG
-
-
-	It may not be standard to include bibliographical information for such a small computer program, but if you don't recognize any of these sources then I have provided you with a great service. Contained in these references are answeres to all you'll ever want to know about TeX and probably more. I wish I had read comments just like these several months ago!
-________________________________________________________________________
-	-  The Big List -
-________________________________________________________________________
-
-	Starting with the documentation noted, I have extracted and categorized the following control sequences and syntactic entities. There are many more entities in the body of code than are not listed here. These are just the ones that I have taken special care to highlight.
-________________________________________________________________________
-	-  Allocations  -
-
-	Highlight as COMMENT2
-
-	\newlinechar
-	\newmuskip
-	\newinsert
-	\newwrite
-	\newdimen
-	\newcount
-	\newtoks
-	\newskip
-	\newread
-	\newhelp
-	\newfam
-	\newbox
-	\newif
-
-	(\\newlinechar<|\\newmuskip\\newinsert<|\\newwrite<|\\newdimen<|\\newcount<|\\newtoks<|\\newskip<|\\newread<|\\newhelp<|\\newfam<|\\newbox<|\\newif<)
-_______________________________________________________________________________
-	-  Assignments  -
-
-	Highlight as COMMENT3
-
-	\futurelet
-	\let
-
-	(\\futurelet<|\\let<)
-_______________________________________________________________________________
-	-  Registers  -
-
-	Highlight as COMMENT4
-
-	\muskip([0-1][0-9][0-9]|2([0-4][0-9]|5[0-5]))
-	\muskip[0-9][0-9]
-	\muskip[0-9]
-	\muskip
-	\dimen([0-1][0-9][0-9]|2([0-4][0-9]|5[0-5]))
-	\dimen[0-9][0-9]
-	\dimen[0-9]
-	\dimen
-	\count([0-1][0-9][0-9]|2([0-4][0-9]|5[0-5]))
-	\count[0-9][0-9]
-	\count[0-9]
-	\count
-	\toks([0-1][0-9][0-9]|2([0-4][0-9]|5[0-5]))
-	\toks[0-9][0-9]
-	\toks[0-9]
-	\toks
-	\skip([0-1][0-9][0-9]|2([0-4][0-9]|5[0-5]))
-	\skip[0-9][0-9]
-	\skip[0-9]
-	\skip
-	\box([0-1][0-9][0-9]|2([0-4][0-9]|5[0-5]))
-	\box[0-9][0-9]
-	\box[0-9]
-	\box
-_______________________________________________________________________________
-	-  Definitions  -
-
-	Highlight as FUNCTION
-
-	\mathchardef
-	\muskipdef
-	\endcsname
-	\dimendef
-	\countdef
-	\toksdef
-	\skipdef
-	\chardef
-	\csname
-	\global
-	\outer
-	\xdef
-	\gdef
-	\long
-	\edef
-	\def
-
-	(\\mathchardef<|\\muskipdef<|\\endcsname<|\\dimendef<|\\countdef<|\\toksdef<|\\skipdef<|\\chardef<|\\csname<|\\global<|\\outer<|\\xdef<|\\gdef<|\\long<|\\edef<|\\def<)
-_______________________________________________________________________________
-	-  Control Sequences Representing Characters  -
-
-	Highlight as KEYWORD2
-
-	http://www.ams.org/cmlhtml/texcodes.html
-	and Knuth: Chapter 8
-
-	The Escaped Versions of TeX's Reserved Characters
-		\#
-		\$
-		\%
-		\&
-		\{
-		\}
-		\_
-		\backslash
-
-	Characters Described by Number
-		\char<0-255>
-		\char'<octal number 0-377>
-		\char"<hex number 0-FF>
-		^^[ASCII char 0-127]
-		^^[lowercase hex 00-ff]
-
-	The Token for Obtaining an ASCII Character Index
-		`[character or control sequence]
-
-	Control Sequences for Accents
-		\utilde
-		\lfhook
-		\cfudot
-		\candra
-		\acudot
-		\uarc
-		\cfac
-		\`
-		\'
-		\^
-		\"
-		\H
-		\~
-		\c
-		\=
-		\b
-		\.
-		\d
-		\r
-		\k
-		\u
-		\v
-		\t
-
-	Accented Characters and Ligatures
-		\cdprime
-		\cprime
-		\Dbar
-		\dbar
-		\eth
-		\ss
-		\OE
-		\oe
-		\aa
-		\AA
-		\ae
-		\AE
-		\o
-		\O
-		\l
-		\L
-		\j
-		\i
-_______________________________________________________________________________
-	-  Conditional Control Sequences  -
-
-	Highlight as KEYWORD3
-
-	See Eijkhout: pg 140 for details.
-
-	\ifvmode
-	\ifmmode
-	\ifinner
-	\ifhmode
-	\iffalse
-	\ifvoid
-	\ifvbox
-	\iftrue
-	\ifhbox
-	\ifcase
-	\ifodd
-	\ifnum
-	\ifeof
-	\ifdim
-	\ifcat
-	\else
-	\or
-	\ifx
-	\if
-	\fi
-
-	(\\ifvmode<|\\ifmmode<|\\ifinner<|\\ifhmode<|\\iffalse<|\\ifvoid<|\\ifvbox<|\\iftrue<|\\ifhbox<|\\ifcase<|\\ifodd<|\\ifnum<|\\ifeof<|\\ifdim<|\\ifcat<|\\else<|\\or<|\\ifx<|\\if<|\\fi<)
-
-_______________________________________________________________________________
-	-  Parameters  -
-
-	Highlight as KEYWORD4
-
-	See Knuth: pg 272-275 for details.
-
-	Integer Parameters
-		\doublehyphendemerits
-		\finalhyphendemerits
-		\displaywidowpenalty
-		\postdisplaypenalty
-		\tracingparagraphs
-		\errorcontextlines
-		\defaulthyphenchar
-		\tracinglostchars
-		\predisplaypenaty
-		\interlinepenalty
-		\tracingrestores
-		\tracingcommands
-		\floatingpenalty
-		\exhyphenpenalty
-		\delimiterfactor
-		\defaultskewchar
-		\showboxbreadth
-		\righthyphenmin
-		\holdinginserts
-		\tracingoutput
-		\tracingonline
-		\tracingmacros
-		\outputpenalty
-		\maxdeadcycles
-		\lefthyphenmin
-		\hyphenpenalty
-		\brokenpenalty
-		\widowpenalty
-		\tracingstats
-		\tracingpages
-		\showboxdepth
-		\pretolerance
-		\binoppenalty
-		\linepenalty
-		\endlinechar
-		\clubpenalty
-		\adjdemerits
-		\relpenalty
-		\globaldefs
-		\escapechar
-		\tolerance
-		\looseness
-		\hangafter
-		\vbadness
-		\language
-		\hbadness
-		\pausing
-		\uchyph
-		\month
-		\year
-		\time
-		\mag
-		\fam
-		\day
-
-		(\\doublehyphendemerits<|\\finalhyphendemerits<|\\displaywidowpenalty<|\\postdisplaypenalty<|\\tracingparagraphs<|\\errorcontextlines<|\\defaulthyphenchar<|\\tracinglostchars<|\\predisplaypenaty<|\\interlinepenalty<|\\tracingrestores<|\\tracingcommands<|\\floatingpenalty<|\\exhyphenpenalty<|\\delimiterfactor<|\\defaultskewchar<|\\showboxbreadth<|\\righthyphenmin<|\\holdinginserts<|\\tracingoutput<|\\tracingonline<|\\tracingmacros<|\\outputpenalty<|\\maxdeadcycles<|\\lefthyphenmin<|\\hyphenpenalty<|\\brokenpenalty<|\\widowpenalty<|\\tracingstats<|\\tracingpages<|\\showboxdepth<|\\pretolerance<|\\binoppenalty<|\\linepenalty<|\\endlinechar<|\\clubpenalty<|\\adjdemerits<|\\relpenalty<|\\globaldefs<|\\escapechar<|\\tolerance<|\\looseness<|\\hangafter<|\\vbadness<|\\language<|\\hbadness<|\\pausing<|\\uchyph<|\\month<|\\year<|\\time<|\\mag<|\\fam<|\\day<)
-
-	Dimension Parameters
-		\nulldelimiterspace
-		\delimitershortfall
-		\emergencystretch
-		\predisplaysize
-		\splitmaxdepth
-		\lineskiplimit
-		\displayindent
-		\overfullrule
-		\mathsurround
-		\displaywidth
-		\scriptspace
-		\boxmaxdepth
-		\hangindent
-		\parindent
-		\maxdepth
-		\voffset
-		\hoffset
-		\vsize
-		\vfuzz
-		\hsize
-		\hfuzz
-
-		(\\nulldelimiterspace<|\\delimitershortfall<|\\emergencystretch<|\\predisplaysize<|\\splitmaxdepth<|\\lineskiplimit<|\\displayindent<|\\overfullrule<|\\mathsurround<|\\displaywidth<|\\scriptspace<|\\boxmaxdepth<|\\hangindent<|\\parindent<|\\maxdepth<|\\voffset<|\\hoffset<|\\vsize<|\\vfuzz<|\\hsize<|\\hfuzz<)
-
-	Glue Parameters
-		\belowdisplayshortskip
-		\abovedisplayshortskip
-		\belowdisplayskip
-		\abovedisplayskip
-		\splittopskip
-		\baselineskip
-		\parfillskip
-		\xspaceskip
-		\spaceskip
-		\rightskip
-		\lineskip
-		\leftskip
-		\topskip
-		\tabskip
-		\parskip
-
-		(\\belowdisplayshortskip<|\\abovedisplayshortskip<|\\belowdisplayskip<|\\abovedisplayskip<|\\splittopskip<|\\baselineskip<|\\parfillskip<|\\xspaceskip<|\\spaceskip<|\\rightskip<|\\lineskip<|\\leftskip<|\\topskip<|\\tabskip<|\\parskip<)
-
-	Muglue Parameters
-		\thickmuskip
-		\thinmuskip
-		\medmuskip
-
-		(\\thickmuskip<|\\thinmuskip<|\\medmuskip<)
-
-	Token List Parameters
-		\everydisplay
-		\everyvbox
-		\everymath
-		\everyhbox
-		\everypar
-		\everyjob
-		\everycr
-		\errhelp
-		\output
-
-		(\\everydisplay<|\\everyvbox<|\\everymath<|\\everyhbox<|\\everypar<|\\everyjob<|\\everycr<|\\errhelp<|\\output<)
-____________________________________________________________________________-->
-
-<!-- START -->
-
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="lineComment" VALUE="%" />
-	</PROPS>
-	<RULES IGNORE_CASE="FALSE" >
-
-		<!-- Comments -->
-
-		<EOL_SPAN TYPE="COMMENT1">%</EOL_SPAN>
-
-		<!-- Math Modes -->
-
-		<!-- $$ ... $$ -->
-		<SPAN TYPE="OPERATOR" DELEGATE="MATH">
-			<BEGIN>$$</BEGIN>
-			<END>$$</END>
-		</SPAN>
-
-		<!-- $ ... $ -->
-		<SPAN TYPE="OPERATOR" DELEGATE="MATH">
-			<BEGIN>$</BEGIN>
-			<END>$</END>
-		</SPAN>
-
-		<!-- At Least Twenty Five letter control sequences -->
-
-			<!-- Arbitrary control sequence of the specified length -->
-			<SEQ_REGEXP HASH_CHARS="\" TYPE="LABEL"
-					>\\[a-zA-Z@]{25}[a-zA-Z@]*</SEQ_REGEXP>
-
-		<!-- Twenty Four letter control sequences -->
-			<SEQ TYPE="KEYWORD1">\interfootnotelinepenalty</SEQ>
-
-			<!-- Arbitrary control sequence of the specified length -->
-			<SEQ_REGEXP HASH_CHARS="\" TYPE="LABEL">\\[a-zA-Z@]{24}</SEQ_REGEXP>
-
-		<!-- Twenty Three letter control sequences -->
-			<SEQ TYPE="KEYWORD1">\interdisplaylinepenalty</SEQ>
-
-			<!-- Arbitrary control sequence of the specified length -->
-			<SEQ_REGEXP HASH_CHARS="\" TYPE="LABEL">\\[a-zA-Z@]{23}</SEQ_REGEXP>
-
-		<!-- Twenty Two letter control sequences -->
-
-			<!-- Arbitrary control sequence of the specified length -->
-			<SEQ_REGEXP HASH_CHARS="\" TYPE="LABEL">\\[a-zA-Z@]{22}</SEQ_REGEXP>
-
-		<!-- Twenty One letter control sequences -->
-			<SEQ TYPE="KEYWORD4">\belowdisplayshortskip</SEQ>
-			<SEQ TYPE="KEYWORD4">\abovedisplayshortskip</SEQ>
-
-			<!-- Arbitrary control sequence of the specified length -->
-			<SEQ_REGEXP HASH_CHARS="\" TYPE="LABEL">\\[a-zA-Z@]{21}</SEQ_REGEXP>
-
-		<!-- Twenty letter control sequences -->
-
-			<SEQ TYPE="KEYWORD4">\doublehyphendemerits</SEQ>
-			<SEQ TYPE="KEYWORD1">\abovedisplayshortskip</SEQ>
-
-			<!-- Arbitrary control sequence of the specified length -->
-			<SEQ_REGEXP HASH_CHARS="\" TYPE="LABEL">\\[a-zA-Z@]{20}</SEQ_REGEXP>
-
-		<!-- Nineteen letter control sequences -->
-
-			<SEQ TYPE="KEYWORD1">\normallineskiplimit</SEQ>
-			<SEQ TYPE="KEYWORD4">\finalhyphendemerits</SEQ>
-			<SEQ TYPE="KEYWORD4">\displaywidowpenalty</SEQ>
-
-			<!-- Arbitrary control sequence of the specified length -->
-			<SEQ_REGEXP HASH_CHARS="\" TYPE="LABEL">\\[a-zA-Z@]{19}</SEQ_REGEXP>
-
-		<!-- Eighteen letter control sequences -->
-
-			<SEQ TYPE="KEYWORD4">\postdisplaypenalty</SEQ>
-			<SEQ TYPE="KEYWORD4">\nulldelimiterspace</SEQ>
-			<SEQ TYPE="KEYWORD1">\normalbaselineskip</SEQ>
-			<SEQ TYPE="KEYWORD1">\Longleftrightarrow</SEQ>
-			<SEQ TYPE="KEYWORD1">\longleftrightarrow</SEQ>
-			<SEQ TYPE="KEYWORD4">\delimitershortfall</SEQ>
-
-			<!-- Arbitrary control sequence of the specified length -->
-			<SEQ_REGEXP HASH_CHARS="\" TYPE="LABEL">\\[a-zA-Z@]{18}</SEQ_REGEXP>
-
-		<!-- Seventeen letter control sequences -->
-
-			<SEQ TYPE="KEYWORD4">\tracingparagraphs</SEQ>
-			<SEQ TYPE="KEYWORD1">\scriptscriptstyle</SEQ>
-			<SEQ TYPE="KEYWORD1">\rightleftharpoons</SEQ>
-			<SEQ TYPE="KEYWORD1">\predisplaypenalty</SEQ>
-			<SEQ TYPE="KEYWORD4">\errorcontextlines</SEQ>
-			<SEQ TYPE="KEYWORD4">\defaulthyphenchar</SEQ>
-
-			<!-- Arbitrary control sequence of the specified length -->
-			<SEQ_REGEXP HASH_CHARS="\" TYPE="LABEL">\\[a-zA-Z@]{17}</SEQ_REGEXP>
-
-		<!-- Sixteen letter control sequences -->
-
-			<SEQ TYPE="KEYWORD4">\tracinglostchars</SEQ>
-			<SEQ TYPE="KEYWORD1">\scriptscriptfont</SEQ>
-			<SEQ TYPE="KEYWORD1">\rightharpoondown</SEQ>
-			<SEQ TYPE="KEYWORD4">\predisplaypenaty</SEQ>
-			<SEQ TYPE="KEYWORD1">\pagefilllstretch</SEQ>
-			<SEQ TYPE="KEYWORD1">\offinterlineskip</SEQ>
-			<SEQ TYPE="KEYWORD1">\nonfrenchspacing</SEQ>
-			<SEQ TYPE="KEYWORD4">\interlinepenalty</SEQ>
-			<SEQ TYPE="KEYWORD4">\emergencystretch</SEQ>
-			<SEQ TYPE="KEYWORD4">\belowdisplayskip</SEQ>
-			<SEQ TYPE="KEYWORD1">\allocationnumber</SEQ>
-			<SEQ TYPE="KEYWORD4">\abovedisplayskip</SEQ>
-
-			<!-- Arbitrary control sequence of the specified length -->
-			<SEQ_REGEXP HASH_CHARS="\" TYPE="LABEL">\\[a-zA-Z@]{16}</SEQ_REGEXP>
-
-		<!-- Fifteen letter control sequences -->
-
-			<SEQ TYPE="KEYWORD4">\tracingrestores</SEQ>
-			<SEQ TYPE="KEYWORD4">\tracingcommands</SEQ>
-			<SEQ TYPE="KEYWORD1">\smallskipamount</SEQ>
-			<SEQ TYPE="KEYWORD1">\pagefillstretch</SEQ>
-			<SEQ TYPE="KEYWORD1">\normalbaselines</SEQ>
-			<SEQ TYPE="KEYWORD1">\nointerlineskip</SEQ>
-			<SEQ TYPE="KEYWORD1">\leftharpoondown</SEQ>
-			<SEQ TYPE="KEYWORD1">\insertpenalties</SEQ>
-			<SEQ TYPE="KEYWORD4">\floatingpenalty</SEQ>
-			<SEQ TYPE="KEYWORD4">\exhyphenpenalty</SEQ>
-			<SEQ TYPE="KEYWORD4">\delimiterfactor</SEQ>
-			<SEQ TYPE="KEYWORD4">\defaultskewchar</SEQ>
-			<SEQ TYPE="KEYWORD1">\bigtriangledown</SEQ>
-			<SEQ TYPE="KEYWORD1">\afterassignment</SEQ>
-			<SEQ TYPE="KEYWORD1">\abovewithdelims</SEQ>
-
-			<!-- Arbitrary control sequence of the specified length -->
-			<SEQ_REGEXP HASH_CHARS="\" TYPE="LABEL">\\[a-zA-Z@]{15}</SEQ_REGEXP>
-
-		<!-- Fourteen letter control sequences -->
-
-			<SEQ TYPE="KEYWORD1">\splitfirstmark</SEQ>
-			<SEQ TYPE="KEYWORD4">\showboxbreadth</SEQ>
-			<SEQ TYPE="KEYWORD4">\righthyphenmin</SEQ>
-			<SEQ TYPE="KEYWORD1">\rightharpoonup</SEQ>
-			<SEQ TYPE="KEYWORD1">\rightarrowfill</SEQ>
-			<SEQ TYPE="KEYWORD1">\removelastskip</SEQ>
-			<SEQ TYPE="KEYWORD4">\predisplaysize</SEQ>
-			<SEQ TYPE="KEYWORD1">\pagefilstretch</SEQ>
-			<SEQ TYPE="KEYWORD1">\overwithdelims</SEQ>
-			<SEQ TYPE="KEYWORD1">\overrightarrow</SEQ>
-			<SEQ TYPE="KEYWORD1">\normallineskip</SEQ>
-			<SEQ TYPE="KEYWORD1">\longrightarrow</SEQ>
-			<SEQ TYPE="KEYWORD1">\Longrightarrow</SEQ>
-			<SEQ TYPE="KEYWORD1">\Leftrightarrow</SEQ>
-			<SEQ TYPE="KEYWORD1">\leftrightarrow</SEQ>
-			<SEQ TYPE="KEYWORD1">\hookrightarrow</SEQ>
-			<SEQ TYPE="KEYWORD4">\holdinginserts</SEQ>
-			<SEQ TYPE="KEYWORD1">\atopwithdelims</SEQ>
-
-			<!-- Arbitrary control sequence of the specified length -->
-			<SEQ_REGEXP HASH_CHARS="\" TYPE="LABEL">\\[a-zA-Z@]{14}</SEQ_REGEXP>
-
-		<!-- Thirteen letter control sequences -->
-
-			<SEQ TYPE="KEYWORD1">\ttraggedright</SEQ>
-			<SEQ TYPE="KEYWORD1">\triangleright</SEQ>
-			<SEQ TYPE="KEYWORD4">\tracingoutput</SEQ>
-			<SEQ TYPE="KEYWORD4">\tracingonline</SEQ>
-			<SEQ TYPE="KEYWORD4">\tracingmacros</SEQ>
-			<SEQ TYPE="KEYWORD4">\splitmaxdepth</SEQ>
-			<SEQ TYPE="KEYWORD1">\overleftarrow</SEQ>
-			<SEQ TYPE="KEYWORD4">\outputpenalty</SEQ>
-			<SEQ TYPE="KEYWORD1">\nopagenumbers</SEQ>
-			<SEQ TYPE="KEYWORD1">\medskipamount</SEQ>
-			<SEQ TYPE="KEYWORD4">\maxdeadcycles</SEQ>
-			<SEQ TYPE="KEYWORD1">\magnification</SEQ>
-			<SEQ TYPE="KEYWORD1">\Longleftarrow</SEQ>
-			<SEQ TYPE="KEYWORD1">\longleftarrow</SEQ>
-			<SEQ TYPE="KEYWORD4">\lineskiplimit</SEQ>
-			<SEQ TYPE="KEYWORD4">\lefthyphenmin	</SEQ>
-			<SEQ TYPE="KEYWORD1">\leftharpoonup</SEQ>
-			<SEQ TYPE="KEYWORD1">\leftarrowfill</SEQ>
-			<SEQ TYPE="KEYWORD4">\hyphenpenalty</SEQ>
-			<SEQ TYPE="KEYWORD1">\hookleftarrow</SEQ>
-			<SEQ TYPE="KEYWORD1">\frenchspacing</SEQ>
-			<SEQ TYPE="KEYWORD1">\errorstopmode</SEQ>
-			<SEQ TYPE="KEYWORD1">\downbracefill</SEQ>
-			<SEQ TYPE="KEYWORD1">\displaylimits</SEQ>
-			<SEQ TYPE="KEYWORD4">\displayindent</SEQ>
-			<SEQ TYPE="KEYWORD1">\discretionary</SEQ>
-			<SEQ TYPE="KEYWORD4">\brokenpenalty</SEQ>
-			<SEQ TYPE="KEYWORD1">\bigtriangleup</SEQ>
-			<SEQ TYPE="KEYWORD1">\bigskipamount</SEQ>
-			<SEQ TYPE="KEYWORD1">\advancepageno</SEQ>
-
-			<!-- Arbitrary control sequence of the specified length -->
-			<SEQ_REGEXP HASH_CHARS="\" TYPE="LABEL">\\[a-zA-Z@]{13}</SEQ_REGEXP>
-
-		<!-- Twelve letter control sequences -->
-
-			<SEQ TYPE="KEYWORD4">\widowpenalty</SEQ>
-			<SEQ TYPE="KEYWORD1">\triangleleft</SEQ>
-			<SEQ TYPE="KEYWORD4">\tracingstats</SEQ>
-			<SEQ TYPE="KEYWORD4">\tracingpages</SEQ>
-			<SEQ TYPE="KEYWORD4">\splittopskip</SEQ>
-			<SEQ TYPE="KEYWORD1">\splitbotmark</SEQ>
-			<SEQ TYPE="KEYWORD4">\showboxdepth</SEQ>
-			<SEQ TYPE="KEYWORD1">\romannumeral</SEQ>
-			<SEQ TYPE="KEYWORD1">\raggedbottom</SEQ>
-			<SEQ TYPE="KEYWORD4">\pretolerance</SEQ>
-			<SEQ TYPE="KEYWORD1">\pagecontents</SEQ>
-			<SEQ TYPE="KEYWORD4">\overfullrule</SEQ>
-			<SEQ TYPE="KEYWORD1">\normalbottom</SEQ>
-			<SEQ TYPE="KEYWORD1">\negthinspace</SEQ>
-			<SEQ TYPE="KEYWORD4">\mathsurround</SEQ>
-			<SEQ TYPE="KEYWORD1">\makeheadline</SEQ>
-			<SEQ TYPE="KEYWORD1">\makefootline</SEQ>
-			<SEQ TYPE="KEYWORD1">\ignorespaces</SEQ>
-			<SEQ TYPE="KEYWORD1">\footnoterule</SEQ>
-			<SEQ TYPE="KEYWORD4">\everydisplay</SEQ>
-			<SEQ TYPE="KEYWORD1">\dosupereject</SEQ>
-			<SEQ TYPE="KEYWORD4">\displaywidth</SEQ>
-			<SEQ TYPE="KEYWORD1">\displaystyle</SEQ>
-			<SEQ TYPE="KEYWORD1">\displaylines</SEQ>
-			<SEQ TYPE="KEYWORD1">\bordermatrix</SEQ>
-			<SEQ TYPE="KEYWORD4">\binoppenalty</SEQ>
-			<SEQ TYPE="KEYWORD1">\beginsection</SEQ>
-			<SEQ TYPE="KEYWORD1">\baselineskip</SEQ>
-
-			<!-- Arbitrary control sequence of the specified length -->
-			<SEQ_REGEXP HASH_CHARS="\" TYPE="LABEL">\\[a-zA-Z@]{12}</SEQ_REGEXP>
-
-		<!-- Eleven letter control sequences -->
-
-			<SEQ TYPE="KEYWORD1">\Updownarrow</SEQ>
-			<SEQ TYPE="KEYWORD1">\updownarrow</SEQ>
-			<SEQ TYPE="KEYWORD1">\upbracefill</SEQ>
-			<SEQ TYPE="KEYWORD4">\thickmuskip</SEQ>
-			<SEQ TYPE="KEYWORD1">\spacefactor</SEQ>
-			<SEQ TYPE="KEYWORD1">\showhyphens</SEQ>
-			<SEQ TYPE="KEYWORD1">\scriptstyle</SEQ>
-			<SEQ TYPE="KEYWORD4">\scriptspace</SEQ>
-			<SEQ TYPE="KEYWORD1">\raggedright</SEQ>
-			<SEQ TYPE="KEYWORD1">\plainoutput</SEQ>
-			<SEQ TYPE="KEYWORD4">\parfillskip</SEQ>
-			<SEQ TYPE="KEYWORD1">\pagestretch</SEQ>
-			<SEQ TYPE="KEYWORD1">\nonstopmode</SEQ>
-			<SEQ TYPE="COMMENT2">\newlinechar</SEQ>
-			<SEQ TYPE="KEYWORD1">\mathpalette</SEQ>
-			<SEQ TYPE="FUNCTION">\mathchardef</SEQ>
-			<SEQ TYPE="KEYWORD1">\magstephalf</SEQ>
-			<SEQ TYPE="KEYWORD4">\linepenalty</SEQ>
-			<SEQ TYPE="KEYWORD1">\lastpenalty</SEQ>
-			<SEQ TYPE="KEYWORD1">\hyphenation</SEQ>
-			<SEQ TYPE="KEYWORD1">\expandafter</SEQ>
-			<SEQ TYPE="KEYWORD4">\endlinechar</SEQ>
-			<SEQ TYPE="KEYWORD1">\diamondsuit</SEQ>
-			<SEQ TYPE="KEYWORD4">\clubpenalty</SEQ>
-			<SEQ TYPE="KEYWORD4">\boxmaxdepth</SEQ>
-			<SEQ TYPE="KEYWORD4">\adjdemerits</SEQ>
-
-			<!-- Arbitrary control sequence of the specified length -->
-			<SEQ_REGEXP HASH_CHARS="\" TYPE="LABEL">\\[a-zA-Z@]{11}</SEQ_REGEXP>
-
-		<!-- Ten letter control sequences -->
-
-			<SEQ TYPE="KEYWORD4">\xspaceskip</SEQ>
-			<SEQ TYPE="KEYWORD1">\varepsilon</SEQ>
-			<SEQ TYPE="KEYWORD1">\underbrace</SEQ>
-			<SEQ TYPE="KEYWORD1">\tracingall</SEQ>
-			<SEQ TYPE="KEYWORD4">\thinmuskip</SEQ>
-			<SEQ TYPE="KEYWORD1">\textindent</SEQ>
-			<SEQ TYPE="KEYWORD1">\supereject</SEQ>
-			<SEQ TYPE="KEYWORD1">\sqsupseteq</SEQ>
-			<SEQ TYPE="KEYWORD1">\smallbreak</SEQ>
-			<SEQ TYPE="KEYWORD1">\scrollmode</SEQ>
-			<SEQ TYPE="KEYWORD1">\scriptfont</SEQ>
-			<SEQ TYPE="KEYWORD1">\rmoustache</SEQ>
-			<SEQ TYPE="KEYWORD1">\Rightarrow</SEQ>
-			<SEQ TYPE="KEYWORD1">\rightarrow</SEQ>
-			<SEQ TYPE="KEYWORD4">\relpenalty</SEQ>
-			<SEQ TYPE="KEYWORD1">\pageshrink</SEQ>
-			<SEQ TYPE="KEYWORD1">\pageinsert</SEQ>
-			<SEQ TYPE="KEYWORD1">\obeyspaces</SEQ>
-			<SEQ TYPE="KEYWORD1">\mathhexbox</SEQ>
-			<SEQ TYPE="KEYWORD1">\mathchoice</SEQ>
-			<SEQ TYPE="KEYWORD1">\mathaccent</SEQ>
-			<SEQ TYPE="KEYWORD1">\mapstochar</SEQ>
-			<SEQ TYPE="KEYWORD1">\longmapsto</SEQ>
-			<SEQ TYPE="KEYWORD1">\lmoustache</SEQ>
-			<SEQ TYPE="KEYWORD1">\leqalignno</SEQ>
-			<SEQ TYPE="KEYWORD1">\leavevmode</SEQ>
-			<SEQ TYPE="KEYWORD1">\hyphenchar</SEQ>
-			<SEQ TYPE="KEYWORD4">\hangindent</SEQ>
-			<SEQ TYPE="KEYWORD4">\globaldefs</SEQ>
-			<SEQ TYPE="KEYWORD1">\fmtversion</SEQ>
-			<SEQ TYPE="KEYWORD4">\escapechar</SEQ>
-			<SEQ TYPE="KEYWORD1">\errmessage</SEQ>
-			<SEQ TYPE="KEYWORD1">\dospecials</SEQ>
-			<SEQ TYPE="KEYWORD1">\deadcycles</SEQ>
-			<SEQ TYPE="KEYWORD1">\centerline</SEQ>
-			<SEQ TYPE="KEYWORD1">\begingroup</SEQ>
-			<SEQ TYPE="KEYWORD1">\allowbreak</SEQ>
-			<SEQ TYPE="KEYWORD1">\aftergroup</SEQ>
-
-			<!-- Arbitrary control sequence of the specified length -->
-			<SEQ_REGEXP HASH_CHARS="\" TYPE="LABEL">\\[a-zA-Z@]{10}</SEQ_REGEXP>
-
-		<!-- Nine letter control sequences -->
-
-			<SEQ TYPE="KEYWORD1">\widetilde</SEQ>
-			<SEQ TYPE="KEYWORD1">\vfootnote</SEQ>
-			<SEQ TYPE="KEYWORD1">\uppercase</SEQ>
-			<SEQ TYPE="KEYWORD1">\unpenalty</SEQ>
-			<SEQ TYPE="KEYWORD1">\underline</SEQ>
-			<SEQ TYPE="KEYWORD1">\undefined</SEQ>
-			<SEQ TYPE="KEYWORD1">\topinsert</SEQ>
-			<SEQ TYPE="KEYWORD4">\tolerance</SEQ>
-			<SEQ TYPE="KEYWORD1">\thinspace</SEQ>
-			<SEQ TYPE="KEYWORD1">\textstyle</SEQ>
-			<SEQ TYPE="KEYWORD1">\spadesuit</SEQ>
-			<SEQ TYPE="KEYWORD4">\spaceskip</SEQ>
-			<SEQ TYPE="KEYWORD1">\smallskip</SEQ>
-			<SEQ TYPE="KEYWORD1">\showlists</SEQ>
-			<SEQ TYPE="KEYWORD4">\rightskip</SEQ>
-			<SEQ TYPE="KEYWORD1">\rightline</SEQ>
-			<SEQ TYPE="KEYWORD1">\prevdepth</SEQ>
-			<SEQ TYPE="KEYWORD1">\preloaded</SEQ>
-			<SEQ TYPE="KEYWORD4">\parindent</SEQ>
-			<SEQ TYPE="KEYWORD1">\pagetotal</SEQ>
-			<SEQ TYPE="KEYWORD1">\pagedepth</SEQ>
-			<SEQ TYPE="KEYWORD1">\overbrace</SEQ>
-			<SEQ TYPE="KEYWORD1">\obeylines</SEQ>
-			<SEQ TYPE="KEYWORD1">\nonscript</SEQ>
-			<SEQ TYPE="FUNCTION">\newmuskip</SEQ>
-			<SEQ TYPE="FUNCTION">\newinsert</SEQ>
-			<SEQ TYPE="FUNCTION">\muskipdef</SEQ>
-			<SEQ TYPE="KEYWORD1">\multispan</SEQ>
-			<SEQ TYPE="KEYWORD1">\moveright</SEQ>
-			<SEQ TYPE="KEYWORD1">\midinsert</SEQ>
-			<SEQ TYPE="KEYWORD4">\medmuskip</SEQ>
-			<SEQ TYPE="KEYWORD1">\mathstrut</SEQ>
-			<SEQ TYPE="KEYWORD1">\mathpunct</SEQ>
-			<SEQ TYPE="KEYWORD1">\mathinner</SEQ>
-			<SEQ TYPE="KEYWORD1">\mathclose</SEQ>
-			<SEQ TYPE="KEYWORD1">\lowercase</SEQ>
-			<SEQ TYPE="KEYWORD4">\looseness</SEQ>
-			<SEQ TYPE="KEYWORD1">\Leftarrow</SEQ>
-			<SEQ TYPE="KEYWORD1">\leftarrow</SEQ>
-			<SEQ TYPE="KEYWORD1">\immediate</SEQ>
-			<SEQ TYPE="KEYWORD1">\hrulefill</SEQ>
-			<SEQ TYPE="KEYWORD1">\hidewidth</SEQ>
-			<SEQ TYPE="KEYWORD1">\heartsuit</SEQ>
-			<SEQ TYPE="KEYWORD4">\hangafter</SEQ>
-			<SEQ TYPE="KEYWORD1">\goodbreak</SEQ>
-			<SEQ TYPE="COMMENT3">\futurelet</SEQ>
-			<SEQ TYPE="KEYWORD1">\footstrut</SEQ>
-			<SEQ TYPE="KEYWORD1">\fontdimen</SEQ>
-			<SEQ TYPE="KEYWORD1">\firstmark</SEQ>
-			<SEQ TYPE="KEYWORD4">\everyvbox</SEQ>
-			<SEQ TYPE="KEYWORD4">\everymath</SEQ>
-			<SEQ TYPE="KEYWORD4">\everyhbox</SEQ>
-			<SEQ TYPE="KEYWORD1">\eqalignno</SEQ>
-			<SEQ TYPE="KEYWORD1">\endinsert</SEQ>
-			<SEQ TYPE="FUNCTION">\endcsname</SEQ>
-			<SEQ TYPE="KEYWORD1">\Downarrow</SEQ>
-			<SEQ TYPE="KEYWORD1">\downarrow</SEQ>
-			<SEQ TYPE="KEYWORD1">\delimiter</SEQ>
-			<SEQ TYPE="KEYWORD1">\copyright</SEQ>
-			<SEQ TYPE="KEYWORD1">\cleartabs</SEQ>
-			<SEQ TYPE="KEYWORD1">\centering</SEQ>
-			<SEQ TYPE="KEYWORD1">\bracevert</SEQ>
-			<SEQ TYPE="KEYWORD1">\bigotimes</SEQ>
-			<SEQ TYPE="KEYWORD1">\batchmode</SEQ>
-			<SEQ TYPE="KEYWORD2">\backslash</SEQ>
-			<SEQ TYPE="KEYWORD1">\Arrowvert</SEQ>
-			<SEQ TYPE="KEYWORD1">\arrowvert</SEQ>
-
-			<!-- Length Nine Register Reference -->
-			<SEQ_REGEXP HASH_CHARS="\" TYPE="COMMENT4"
-					>\\muskip([0-1][0-9][0-9]|2([0-4][0-9]|5[0-5]))</SEQ_REGEXP>
-
-			<!-- Arbitrary control sequence of the specified length -->
-			<SEQ_REGEXP HASH_CHARS="\" TYPE="LABEL">\\[a-zA-Z@]{9}</SEQ_REGEXP>
-
-		<!-- Eight letter control sequences -->
-
-			<SEQ TYPE="KEYWORD1">\xleaders</SEQ>
-			<SEQ TYPE="KEYWORD1">\vphantom</SEQ>
-			<SEQ TYPE="KEYWORD4">\vbadness</SEQ>
-			<SEQ TYPE="KEYWORD1">\vartheta</SEQ>
-			<SEQ TYPE="KEYWORD1">\varsigma</SEQ>
-			<SEQ TYPE="KEYWORD1">\underbar</SEQ>
-			<SEQ TYPE="KEYWORD1">\triangle</SEQ>
-			<SEQ TYPE="KEYWORD1">\textfont</SEQ>
-			<SEQ TYPE="KEYWORD1">\tabsdone</SEQ>
-			<SEQ TYPE="KEYWORD1">\tabalign</SEQ>
-			<SEQ TYPE="KEYWORD1">\supseteq</SEQ>
-			<SEQ TYPE="KEYWORD1">\subseteq</SEQ>
-			<SEQ TYPE="KEYWORD1">\strutbox</SEQ>
-			<SEQ TYPE="KEYWORD1">\smallint</SEQ>
-			<SEQ TYPE="KEYWORD1">\skewchar</SEQ>
-			<SEQ TYPE="KEYWORD1">\setminus</SEQ>
-			<SEQ TYPE="KEYWORD1">\proclaim</SEQ>
-			<SEQ TYPE="KEYWORD1">\prevgraf</SEQ>
-			<SEQ TYPE="KEYWORD1">\patterns</SEQ>
-			<SEQ TYPE="KEYWORD1">\parshape</SEQ>
-			<SEQ TYPE="KEYWORD1">\parallel</SEQ>
-			<SEQ TYPE="KEYWORD1">\pagegoal</SEQ>
-			<SEQ TYPE="KEYWORD1">\pagebody</SEQ>
-			<SEQ TYPE="KEYWORD1">\overline</SEQ>
-			<SEQ TYPE="KEYWORD1">\oldstyle</SEQ>
-			<SEQ TYPE="KEYWORD1">\nolimits</SEQ>
-			<SEQ TYPE="KEYWORD1">\noindent</SEQ>
-			<SEQ TYPE="KEYWORD1">\noexpand</SEQ>
-			<SEQ TYPE="COMMENT2">\newwrite</SEQ>
-			<SEQ TYPE="COMMENT2">\newdimen</SEQ>
-			<SEQ TYPE="COMMENT2">\newcount</SEQ>
-			<SEQ TYPE="KEYWORD1">\narrower</SEQ>
-			<SEQ TYPE="KEYWORD1">\moveleft</SEQ>
-			<SEQ TYPE="KEYWORD1">\medbreak</SEQ>
-			<SEQ TYPE="KEYWORD1">\maxdimen</SEQ>
-			<SEQ TYPE="KEYWORD4">\maxdepth</SEQ>
-			<SEQ TYPE="KEYWORD1">\mathopen</SEQ>
-			<SEQ TYPE="KEYWORD1">\mathcode</SEQ>
-			<SEQ TYPE="KEYWORD1">\mathchar</SEQ>
-			<SEQ TYPE="KEYWORD1">\lineskip</SEQ>
-			<SEQ TYPE="KEYWORD4">\leftskip</SEQ>
-			<SEQ TYPE="KEYWORD4">\leftline</SEQ>
-			<SEQ TYPE="KEYWORD1">\lastskip</SEQ>
-			<SEQ TYPE="KEYWORD1">\lastkern</SEQ>
-			<SEQ TYPE="KEYWORD4">\language</SEQ>
-			<SEQ TYPE="KEYWORD1">\itemitem</SEQ>
-			<SEQ TYPE="KEYWORD1">\hphantom</SEQ>
-			<SEQ TYPE="KEYWORD1">\hideskip</SEQ>
-			<SEQ TYPE="KEYWORD1">\headline</SEQ>
-			<SEQ TYPE="KEYWORD4">\hbadness</SEQ>
-			<SEQ TYPE="KEYWORD1">\footnote</SEQ>
-			<SEQ TYPE="KEYWORD1">\footline</SEQ>
-			<SEQ TYPE="KEYWORD1">\multiply</SEQ>
-			<SEQ TYPE="KEYWORD1">\fontname</SEQ>
-			<SEQ TYPE="KEYWORD1">\filbreak</SEQ>
-			<SEQ TYPE="KEYWORD4">\everypar</SEQ>
-			<SEQ TYPE="KEYWORD4">\everyjob</SEQ>
-			<SEQ TYPE="KEYWORD1">\endinput</SEQ>
-			<SEQ TYPE="KEYWORD1">\endgroup</SEQ>
-			<SEQ TYPE="KEYWORD1">\emptyset</SEQ>
-			<SEQ TYPE="FUNCTION">\dimendef</SEQ>
-			<SEQ TYPE="FUNCTION">\countdef</SEQ>
-			<SEQ TYPE="KEYWORD1">\clubsuit</SEQ>
-			<SEQ TYPE="KEYWORD1">\closeout</SEQ>
-			<SEQ TYPE="KEYWORD1">\cleaders</SEQ>
-			<SEQ TYPE="KEYWORD1">\buildrel</SEQ>
-			<SEQ TYPE="KEYWORD1">\bigwedge</SEQ>
-			<SEQ TYPE="KEYWORD1">\biguplus</SEQ>
-			<SEQ TYPE="KEYWORD1">\bigsqcup</SEQ>
-			<SEQ TYPE="KEYWORD1">\bigoplus</SEQ>
-			<SEQ TYPE="KEYWORD1">\bigbreak</SEQ>
-
-			<!-- Length Eight Register Reference -->
-			<SEQ_REGEXP HASH_CHARS="\" TYPE="COMMENT4"
-					>\\muskip[0-9][0-9]</SEQ_REGEXP>
-
-			<!-- Length Eight Register Reference -->
-			<SEQ_REGEXP HASH_CHARS="\" TYPE="COMMENT4"
-					>\\dimen([0-1][0-9][0-9]|2([0-4][0-9]|5[0-5]))</SEQ_REGEXP>
-
-			<!-- Length Eight Register Reference -->
-			<SEQ_REGEXP HASH_CHARS="\" TYPE="COMMENT4"
-					>\\count([0-1][0-9][0-9]|2([0-4][0-9]|5[0-5]))</SEQ_REGEXP>
-
-			<!-- Arbitrary control sequence of the specified length -->
-			<SEQ_REGEXP HASH_CHARS="\" TYPE="LABEL">\\[a-zA-Z@]{8}</SEQ_REGEXP>
-
-		<!-- Seven letter control sequences -->
-
-			<SEQ TYPE="KEYWORD1">\widehat</SEQ>
-			<SEQ TYPE="KEYWORD4">\voffset</SEQ>
-			<SEQ TYPE="KEYWORD1">\vfilneg</SEQ>
-			<SEQ TYPE="KEYWORD1">\vcenter</SEQ>
-			<SEQ TYPE="KEYWORD1">\vadjust</SEQ>
-			<SEQ TYPE="KEYWORD1">\Upsilon</SEQ>
-			<SEQ TYPE="KEYWORD1">\upsilon</SEQ>
-			<SEQ TYPE="KEYWORD1">\Uparrow</SEQ>
-			<SEQ TYPE="KEYWORD1">\uparrow</SEQ>
-			<SEQ TYPE="KEYWORD1">\unvcopy</SEQ>
-			<SEQ TYPE="KEYWORD1">\unhcopy</SEQ>
-			<SEQ TYPE="KEYWORD4">\topskip</SEQ>
-			<SEQ TYPE="KEYWORD1">\topmark</SEQ>
-			<SEQ TYPE="FUNCTION">\toksdef</SEQ>
-			<SEQ TYPE="KEYWORD1">\tabsyet</SEQ>
-			<SEQ TYPE="KEYWORD4">\tabskip</SEQ>
-			<SEQ TYPE="KEYWORD1">\swarrow</SEQ>
-			<SEQ TYPE="KEYWORD1">\special</SEQ>
-			<SEQ TYPE="FUNCTION">\skipdef</SEQ>
-			<SEQ TYPE="KEYWORD1">\showthe</SEQ>
-			<SEQ TYPE="KEYWORD1">\showbox</SEQ>
-			<SEQ TYPE="KEYWORD1">\shipout</SEQ>
-			<SEQ TYPE="KEYWORD1">\sevensy</SEQ>
-			<SEQ TYPE="KEYWORD1">\sevenrm</SEQ>
-			<SEQ TYPE="KEYWORD1">\sevenbf</SEQ>
-			<SEQ TYPE="KEYWORD1">\settabs</SEQ>
-			<SEQ TYPE="KEYWORD1">\searrow</SEQ>
-			<SEQ TYPE="KEYWORD1">\rootbox</SEQ>
-			<SEQ TYPE="KEYWORD1">\radical</SEQ>
-			<SEQ TYPE="KEYWORD1">\pmatrix</SEQ>
-			<SEQ TYPE="KEYWORD1">\phantom</SEQ>
-			<SEQ TYPE="KEYWORD1">\penalty</SEQ>
-			<SEQ TYPE="KEYWORD4">\pausing</SEQ>
-			<SEQ TYPE="KEYWORD1">\partial</SEQ>
-			<SEQ TYPE="KEYWORD4">\parskip</SEQ>
-			<SEQ TYPE="KEYWORD1">\openout</SEQ>
-			<SEQ TYPE="KEYWORD1">\ooalign</SEQ>
-			<SEQ TYPE="KEYWORD1">\nwarrow</SEQ>
-			<SEQ TYPE="KEYWORD1">\nobreak</SEQ>
-			<SEQ TYPE="KEYWORD1">\noalign</SEQ>
-			<SEQ TYPE="COMMENT2">\newtoks</SEQ>
-			<SEQ TYPE="COMMENT2">\newskip</SEQ>
-			<SEQ TYPE="COMMENT2">\newread</SEQ>
-			<SEQ TYPE="COMMENT2">\newhelp</SEQ>
-			<SEQ TYPE="KEYWORD1">\nearrow</SEQ>
-			<SEQ TYPE="KEYWORD1">\natural</SEQ>
-			<SEQ TYPE="KEYWORD1">\mscount</SEQ>
-			<SEQ TYPE="KEYWORD1">\message</SEQ>
-			<SEQ TYPE="KEYWORD1">\medskip</SEQ>
-			<SEQ TYPE="KEYWORD1">\meaning</SEQ>
-			<SEQ TYPE="KEYWORD1">\mathrel</SEQ>
-			<SEQ TYPE="KEYWORD1">\mathord</SEQ>
-			<SEQ TYPE="KEYWORD1">\mathbin</SEQ>
-			<SEQ TYPE="KEYWORD1">\magstep</SEQ>
-			<SEQ TYPE="KEYWORD1">\leaders</SEQ>
-			<SEQ TYPE="KEYWORD1">\lastbox</SEQ>
-			<SEQ TYPE="KEYWORD1">\joinrel</SEQ>
-			<SEQ TYPE="KEYWORD1">\jobname</SEQ>
-			<SEQ TYPE="KEYWORD1">\iterate</SEQ>
-			<SEQ TYPE="KEYWORD3">\ifvmode</SEQ>
-			<SEQ TYPE="KEYWORD3">\ifmmode</SEQ>
-			<SEQ TYPE="KEYWORD3">\ifinner</SEQ>
-			<SEQ TYPE="KEYWORD3">\ifhmode</SEQ>
-			<SEQ TYPE="KEYWORD3">\iffalse</SEQ>
-			<SEQ TYPE="KEYWORD4">\hoffset</SEQ>
-			<SEQ TYPE="KEYWORD1">\hfilneg</SEQ>
-			<SEQ TYPE="KEYWORD1">\footins</SEQ>
-			<SEQ TYPE="KEYWORD1">\fmtname</SEQ>
-			<SEQ TYPE="KEYWORD4">\everycr</SEQ>
-			<SEQ TYPE="KEYWORD4">\errhelp</SEQ>
-			<SEQ TYPE="KEYWORD1">\eqalign</SEQ>
-			<SEQ TYPE="KEYWORD1">\epsilon</SEQ>
-			<SEQ TYPE="KEYWORD1">\enspace</SEQ>
-			<SEQ TYPE="KEYWORD1">\endline</SEQ>
-			<SEQ TYPE="KEYWORD1">\endgraf</SEQ>
-			<SEQ TYPE="KEYWORD1">\dotfill</SEQ>
-			<SEQ TYPE="KEYWORD1">\diamond</SEQ>
-			<SEQ TYPE="KEYWORD1">\delcode</SEQ>
-			<SEQ TYPE="KEYWORD1">\ddagger</SEQ>
-			<SEQ TYPE="KEYWORD1">\columns</SEQ>
-			<SEQ TYPE="KEYWORD1">\closein</SEQ>
-			<SEQ TYPE="FUNCTION">\chardef</SEQ>
-			<SEQ TYPE="KEYWORD2">\cdprime</SEQ>
-			<SEQ TYPE="KEYWORD1">\catcode</SEQ>
-			<SEQ TYPE="KEYWORD1">\braceru</SEQ>
-			<SEQ TYPE="KEYWORD1">\bracerd</SEQ>
-			<SEQ TYPE="KEYWORD1">\bracelu</SEQ>
-			<SEQ TYPE="KEYWORD1">\braceld</SEQ>
-			<SEQ TYPE="KEYWORD1">\botmark</SEQ>
-			<SEQ TYPE="KEYWORD1">\bigskip</SEQ>
-			<SEQ TYPE="KEYWORD1">\bigodot</SEQ>
-			<SEQ TYPE="KEYWORD1">\bigcirc</SEQ>
-			<SEQ TYPE="KEYWORD1">\advance</SEQ>
-
-			<!-- Length Seven Register Reference -->
-			<SEQ_REGEXP HASH_CHARS="\" TYPE="COMMENT4">\\muskip[0-9]</SEQ_REGEXP>
-
-			<!-- Length Seven Register Reference -->
-			<SEQ_REGEXP HASH_CHARS="\" TYPE="COMMENT4"
-					>\\dimen[0-9][0-9]</SEQ_REGEXP>
-
-			<!-- Length Seven Register Reference -->
-			<SEQ_REGEXP HASH_CHARS="\" TYPE="COMMENT4"
-					>\\count[0-9][0-9]</SEQ_REGEXP>
-
-			<!-- Length Seven Register Reference -->
-			<SEQ_REGEXP HASH_CHARS="\" TYPE="COMMENT4"
-					>\\toks([0-1][0-9][0-9]|2([0-4][0-9]|5[0-5]))</SEQ_REGEXP>
-
-			<!-- Length Seven Register Reference -->
-			<SEQ_REGEXP HASH_CHARS="\" TYPE="COMMENT4"
-					>\\skip([0-1][0-9][0-9]|2([0-4][0-9]|5[0-5]))</SEQ_REGEXP>
-
-			<!-- Length Seven Decimal Character Reference -->
-			<SEQ_REGEXP HASH_CHARS="\" TYPE="KEYWORD2"
-					>\\char([0-1][0-9][0-9]|2([0-4][0-9]|5[0-5]))</SEQ_REGEXP>
-
-			<!-- Length Seven Octal Character Reference -->
-			<SEQ_REGEXP HASH_CHARS="\" TYPE="KEYWORD2"
-					>\\char'[0-7][0-7]</SEQ_REGEXP>
-
-			<!-- Length Seven Hexadecimal Character Reference -->
-			<SEQ_REGEXP HASH_CHARS="\" TYPE="KEYWORD2"
-					>\\char"[0-9A-Fa-f][0-9A-Fa-f]</SEQ_REGEXP>
-
-			<!-- Arbitrary control sequence of the specified length -->
-			<SEQ_REGEXP HASH_CHARS="\" TYPE="LABEL">\\[a-zA-Z@]{7}</SEQ_REGEXP>
-
-		<!-- Six letter control sequences -->
-
-			<SEQ TYPE="KEYWORD1">\vsplit</SEQ>
-			<SEQ TYPE="KEYWORD1">\varrho</SEQ>
-			<SEQ TYPE="KEYWORD1">\varphi</SEQ>
-			<SEQ TYPE="KEYWORD1">\valign</SEQ>
-			<SEQ TYPE="KEYWORD2">\utilde</SEQ>
-			<SEQ TYPE="KEYWORD1">\unvbox</SEQ>
-			<SEQ TYPE="KEYWORD1">\unskip</SEQ>
-			<SEQ TYPE="KEYWORD1">\unkern</SEQ>
-			<SEQ TYPE="KEYWORD1">\unhbox</SEQ>
-			<SEQ TYPE="KEYWORD4">\uchyph</SEQ>
-			<SEQ TYPE="KEYWORD1">\uccode</SEQ>
-			<SEQ TYPE="KEYWORD1">\topins</SEQ>
-			<SEQ TYPE="KEYWORD1">\supset</SEQ>
-			<SEQ TYPE="KEYWORD1">\succeq</SEQ>
-			<SEQ TYPE="KEYWORD1">\subset</SEQ>
-			<SEQ TYPE="KEYWORD1">\string</SEQ>
-			<SEQ TYPE="KEYWORD1">\sfcode</SEQ>
-			<SEQ TYPE="KEYWORD1">\seveni</SEQ>
-			<SEQ TYPE="KEYWORD1">\setbox</SEQ>
-			<SEQ TYPE="KEYWORD1">\rgroup</SEQ>
-			<SEQ TYPE="KEYWORD1">\rfloor</SEQ>
-			<SEQ TYPE="KEYWORD1">\repeat</SEQ>
-			<SEQ TYPE="KEYWORD1">\Relbar</SEQ>
-			<SEQ TYPE="KEYWORD1">\relbar</SEQ>
-			<SEQ TYPE="KEYWORD1">\rbrack</SEQ>
-			<SEQ TYPE="KEYWORD1">\rbrace</SEQ>
-			<SEQ TYPE="KEYWORD1">\rangle</SEQ>
-			<SEQ TYPE="KEYWORD1">\propto</SEQ>
-			<SEQ TYPE="KEYWORD1">\preceq</SEQ>
-			<SEQ TYPE="KEYWORD1">\pageno</SEQ>
-			<SEQ TYPE="KEYWORD4">\output</SEQ>
-			<SEQ TYPE="KEYWORD1">\otimes</SEQ>
-			<SEQ TYPE="KEYWORD1">\oslash</SEQ>
-			<SEQ TYPE="KEYWORD1">\openup</SEQ>
-			<SEQ TYPE="KEYWORD1">\openin</SEQ>
-			<SEQ TYPE="KEYWORD1">\ominus</SEQ>
-			<SEQ TYPE="KEYWORD1">\ointop</SEQ>
-			<SEQ TYPE="KEYWORD1">\oalign</SEQ>
-			<SEQ TYPE="KEYWORD1">\number</SEQ>
-			<SEQ TYPE="COMMENT2">\newfam</SEQ>
-			<SEQ TYPE="COMMENT2">\newbox</SEQ>
-			<SEQ TYPE="COMMENT4">\muskip</SEQ>
-			<SEQ TYPE="KEYWORD1">\models</SEQ>
-			<SEQ TYPE="KEYWORD1">\matrix</SEQ>
-			<SEQ TYPE="KEYWORD1">\mathop</SEQ>
-			<SEQ TYPE="KEYWORD1">\mapsto</SEQ>
-			<SEQ TYPE="KEYWORD1">\limsup</SEQ>
-			<SEQ TYPE="KEYWORD1">\limits</SEQ>
-			<SEQ TYPE="KEYWORD1">\liminf</SEQ>
-			<SEQ TYPE="KEYWORD1">\lgroup</SEQ>
-			<SEQ TYPE="KEYWORD2">\lfhook</SEQ>
-			<SEQ TYPE="KEYWORD1">\lfloor</SEQ>
-			<SEQ TYPE="KEYWORD1">\lccode</SEQ>
-			<SEQ TYPE="KEYWORD1">\lbrack</SEQ>
-			<SEQ TYPE="KEYWORD1">\lbrace</SEQ>
-			<SEQ TYPE="KEYWORD1">\langle</SEQ>
-			<SEQ TYPE="KEYWORD1">\Lambda</SEQ>
-			<SEQ TYPE="KEYWORD1">\lambda</SEQ>
-			<SEQ TYPE="KEYWORD1">\insert</SEQ>
-			<SEQ TYPE="KEYWORD1">\indent</SEQ>
-			<SEQ TYPE="KEYWORD3">\ifvoid</SEQ>
-			<SEQ TYPE="KEYWORD3">\ifvbox</SEQ>
-			<SEQ TYPE="KEYWORD3">\iftrue</SEQ>
-			<SEQ TYPE="KEYWORD3">\ifhbox</SEQ>
-			<SEQ TYPE="KEYWORD3">\ifcase</SEQ>
-			<SEQ TYPE="KEYWORD1">\ialign</SEQ>
-			<SEQ TYPE="KEYWORD1">\halign</SEQ>
-			<SEQ TYPE="FUNCTION">\global</SEQ>
-			<SEQ TYPE="KEYWORD1">\forall</SEQ>
-			<SEQ TYPE="KEYWORD1">\fivesy</SEQ>
-			<SEQ TYPE="KEYWORD1">\fiverm</SEQ>
-			<SEQ TYPE="KEYWORD1">\fivebf</SEQ>
-			<SEQ TYPE="KEYWORD1">\exists</SEQ>
-			<SEQ TYPE="KEYWORD1">\enskip</SEQ>
-			<SEQ TYPE="KEYWORD1">\egroup</SEQ>
-			<SEQ TYPE="KEYWORD1">\divide</SEQ>
-			<SEQ TYPE="KEYWORD1">\dagger</SEQ>
-			<SEQ TYPE="FUNCTION">\csname</SEQ>
-			<SEQ TYPE="KEYWORD2">\cprime</SEQ>
-			<SEQ TYPE="KEYWORD1">\coprod</SEQ>
-			<SEQ TYPE="KEYWORD1">\choose</SEQ>
-			<SEQ TYPE="KEYWORD2">\cfudot</SEQ>
-			<SEQ TYPE="KEYWORD2">\candra</SEQ>
-			<SEQ TYPE="KEYWORD1">\bullet</SEQ>
-			<SEQ TYPE="KEYWORD1">\bowtie</SEQ>
-			<SEQ TYPE="KEYWORD1">\bigvee</SEQ>
-			<SEQ TYPE="KEYWORD1">\bigcup</SEQ>
-			<SEQ TYPE="KEYWORD1">\bigcap</SEQ>
-			<SEQ TYPE="KEYWORD1">\bgroup</SEQ>
-			<SEQ TYPE="KEYWORD1">\arctan</SEQ>
-			<SEQ TYPE="KEYWORD1">\arcsin</SEQ>
-			<SEQ TYPE="KEYWORD1">\arccos</SEQ>
-			<SEQ TYPE="KEYWORD1">\approx</SEQ>
-			<SEQ TYPE="KEYWORD2">\acudot</SEQ>
-			<SEQ TYPE="KEYWORD1">\active</SEQ>
-			<SEQ TYPE="KEYWORD1">\accent</SEQ>
-
-			<!-- Length Six Register Reference -->
-			<SEQ_REGEXP HASH_CHARS="\" TYPE="COMMENT4"
-					>\\dimen[0-9]</SEQ_REGEXP>
-
-			<!-- Length Six Register Reference -->
-			<SEQ_REGEXP HASH_CHARS="\" TYPE="COMMENT4"
-					>\\count[0-9]</SEQ_REGEXP>
-
-			<!-- Length Six Register Reference -->
-			<SEQ_REGEXP HASH_CHARS="\" TYPE="COMMENT4"
-					>\\toks[0-9][0-9]</SEQ_REGEXP>
-
-			<!-- Length Six Register Reference -->
-			<SEQ_REGEXP HASH_CHARS="\" TYPE="COMMENT4"
-					>\\skip[0-9][0-9]</SEQ_REGEXP>
-
-			<!-- Length Six Register Reference -->
-			<SEQ_REGEXP HASH_CHARS="\" TYPE="COMMENT4"
-					>\\box([0-1][0-9][0-9]|2([0-4][0-9]|5[0-5]))</SEQ_REGEXP>
-
-			<!-- Length Six Decimal Character Reference -->
-			<SEQ_REGEXP HASH_CHARS="\" TYPE="KEYWORD2"
-					>\\char[0-9][0-9]</SEQ_REGEXP>
-
-			<!-- Length Six Octal Character Reference -->
-			<SEQ_REGEXP HASH_CHARS="\" TYPE="KEYWORD2">\\char'[0-7]</SEQ_REGEXP>
-
-			<!-- Length Six Hexadecimal Character Reference -->
-			<SEQ_REGEXP HASH_CHARS="\" TYPE="KEYWORD2"
-					>\\char"[0-9A-Fa-f]</SEQ_REGEXP>
-
-			<!-- Arbitrary control sequence of the specified length -->
-			<SEQ_REGEXP HASH_CHARS="\" TYPE="LABEL">\\[a-zA-Z@]{6}</SEQ_REGEXP>
-
-		<!-- Five letter control sequences -->
-
-			<SEQ TYPE="KEYWORD1">\write</SEQ>
-			<SEQ TYPE="KEYWORD1">\wedge</SEQ>
-			<SEQ TYPE="KEYWORD1">\vskip</SEQ>
-			<SEQ TYPE="KEYWORD4">\vsize</SEQ>
-			<SEQ TYPE="KEYWORD1">\vrule</SEQ>
-			<SEQ TYPE="KEYWORD1">\vglue</SEQ>
-			<SEQ TYPE="KEYWORD4">\vfuzz</SEQ>
-			<SEQ TYPE="KEYWORD1">\vfill</SEQ>
-			<SEQ TYPE="KEYWORD1">\vdots</SEQ>
-			<SEQ TYPE="KEYWORD1">\vdash</SEQ>
-			<SEQ TYPE="KEYWORD1">\varpi</SEQ>
-			<SEQ TYPE="KEYWORD1">\uplus</SEQ>
-			<SEQ TYPE="KEYWORD1">\ttfam</SEQ>
-			<SEQ TYPE="KEYWORD1">\times</SEQ>
-			<SEQ TYPE="KEYWORD1">\tilde</SEQ>
-			<SEQ TYPE="KEYWORD1">\Theta</SEQ>
-			<SEQ TYPE="KEYWORD1">\theta</SEQ>
-			<SEQ TYPE="KEYWORD1">\tentt</SEQ>
-			<SEQ TYPE="KEYWORD1">\tensy</SEQ>
-			<SEQ TYPE="KEYWORD1">\tensl</SEQ>
-			<SEQ TYPE="KEYWORD1">\tenrm</SEQ>
-			<SEQ TYPE="KEYWORD1">\tenit</SEQ>
-			<SEQ TYPE="KEYWORD1">\tenex</SEQ>
-			<SEQ TYPE="KEYWORD1">\tenbf</SEQ>
-			<SEQ TYPE="KEYWORD1">\strut</SEQ>
-			<SEQ TYPE="KEYWORD1">\sqcup</SEQ>
-			<SEQ TYPE="KEYWORD1">\sqcap</SEQ>
-			<SEQ TYPE="KEYWORD1">\space</SEQ>
-			<SEQ TYPE="KEYWORD1">\smile</SEQ>
-			<SEQ TYPE="KEYWORD1">\smash</SEQ>
-			<SEQ TYPE="KEYWORD1">\slfam</SEQ>
-			<SEQ TYPE="KEYWORD1">\slash</SEQ>
-			<SEQ TYPE="KEYWORD1">\simeq</SEQ>
-			<SEQ TYPE="KEYWORD1">\Sigma</SEQ>
-			<SEQ TYPE="KEYWORD1">\sigma</SEQ>
-			<SEQ TYPE="KEYWORD1">\sharp</SEQ>
-			<SEQ TYPE="KEYWORD1">\right</SEQ>
-			<SEQ TYPE="KEYWORD1">\rhook</SEQ>
-			<SEQ TYPE="KEYWORD1">\relax</SEQ>
-			<SEQ TYPE="KEYWORD1">\rceil</SEQ>
-			<SEQ TYPE="KEYWORD1">\raise</SEQ>
-			<SEQ TYPE="KEYWORD1">\qquad</SEQ>
-			<SEQ TYPE="KEYWORD1">\prime</SEQ>
-			<SEQ TYPE="FUNCTION">\outer</SEQ>
-			<SEQ TYPE="KEYWORD1">\oplus</SEQ>
-			<SEQ TYPE="KEYWORD1">\Omega</SEQ>
-			<SEQ TYPE="KEYWORD1">\omega</SEQ>
-			<SEQ TYPE="KEYWORD1">\notin</SEQ>
-			<SEQ TYPE="COMMENT2">\newif</SEQ>
-			<SEQ TYPE="KEYWORD1">\nabla</SEQ>
-			<SEQ TYPE="KEYWORD1">\mskip</SEQ>
-			<SEQ TYPE="KEYWORD4">\month</SEQ>
-			<SEQ TYPE="KEYWORD1">\mkern</SEQ>
-			<SEQ TYPE="KEYWORD1">\lower</SEQ>
-			<SEQ TYPE="KEYWORD1">\lhook</SEQ>
-			<SEQ TYPE="KEYWORD1">\leqno</SEQ>
-			<SEQ TYPE="KEYWORD1">\ldots</SEQ>
-			<SEQ TYPE="KEYWORD1">\ldotp</SEQ>
-			<SEQ TYPE="KEYWORD1">\lceil</SEQ>
-			<SEQ TYPE="KEYWORD1">\kappa</SEQ>
-			<SEQ TYPE="KEYWORD1">\jmath</SEQ>
-			<SEQ TYPE="KEYWORD1">\itfam</SEQ>
-			<SEQ TYPE="KEYWORD1">\intop</SEQ>
-			<SEQ TYPE="KEYWORD1">\input</SEQ>
-			<SEQ TYPE="KEYWORD1">\infty</SEQ>
-			<SEQ TYPE="KEYWORD1">\imath</SEQ>
-			<SEQ TYPE="KEYWORD3">\ifodd</SEQ>
-			<SEQ TYPE="KEYWORD3">\ifnum</SEQ>
-			<SEQ TYPE="KEYWORD3">\ifeof</SEQ>
-			<SEQ TYPE="KEYWORD3">\ifdim</SEQ>
-			<SEQ TYPE="KEYWORD3">\ifcat</SEQ>
-			<SEQ TYPE="KEYWORD1">\hskip</SEQ>
-			<SEQ TYPE="KEYWORD4">\hsize</SEQ>
-			<SEQ TYPE="KEYWORD1">\hrule</SEQ>
-			<SEQ TYPE="KEYWORD1">\hglue</SEQ>
-			<SEQ TYPE="KEYWORD4">\hfuzz</SEQ>
-			<SEQ TYPE="KEYWORD1">\hfill</SEQ>
-			<SEQ TYPE="KEYWORD1">\grave</SEQ>
-			<SEQ TYPE="KEYWORD1">\Gamma</SEQ>
-			<SEQ TYPE="KEYWORD1">\gamma</SEQ>
-			<SEQ TYPE="KEYWORD1">\frown</SEQ>
-			<SEQ TYPE="KEYWORD1">\folio</SEQ>
-			<SEQ TYPE="KEYWORD1">\fivei</SEQ>
-			<SEQ TYPE="KEYWORD1">\equiv</SEQ>
-			<SEQ TYPE="KEYWORD1">\empty</SEQ>
-			<SEQ TYPE="KEYWORD1">\eject</SEQ>
-			<SEQ TYPE="KEYWORD1">\doteq</SEQ>
-			<SEQ TYPE="COMMENT4">\dimen</SEQ>
-			<SEQ TYPE="KEYWORD1">\Delta</SEQ>
-			<SEQ TYPE="KEYWORD1">\delta</SEQ>
-			<SEQ TYPE="KEYWORD1">\ddots</SEQ>
-			<SEQ TYPE="KEYWORD1">\dashv</SEQ>
-			<SEQ TYPE="COMMENT4">\count</SEQ>
-			<SEQ TYPE="KEYWORD1">\colon</SEQ>
-			<SEQ TYPE="KEYWORD1">\check</SEQ>
-			<SEQ TYPE="KEYWORD1">\cdots</SEQ>
-			<SEQ TYPE="KEYWORD1">\cdotp</SEQ>
-			<SEQ TYPE="KEYWORD1">\cases</SEQ>
-			<SEQ TYPE="KEYWORD1">\breve</SEQ>
-			<SEQ TYPE="KEYWORD1">\break</SEQ>
-			<SEQ TYPE="KEYWORD1">\brack</SEQ>
-			<SEQ TYPE="KEYWORD1">\brace</SEQ>
-			<SEQ TYPE="KEYWORD1">\Biggr</SEQ>
-			<SEQ TYPE="KEYWORD1">\biggr</SEQ>
-			<SEQ TYPE="KEYWORD1">\Biggm</SEQ>
-			<SEQ TYPE="KEYWORD1">\biggm</SEQ>
-			<SEQ TYPE="KEYWORD1">\Biggl</SEQ>
-			<SEQ TYPE="KEYWORD1">\biggl</SEQ>
-			<SEQ TYPE="KEYWORD1">\bffam</SEQ>
-			<SEQ TYPE="KEYWORD1">\asymp</SEQ>
-			<SEQ TYPE="KEYWORD1">\angle</SEQ>
-			<SEQ TYPE="KEYWORD1">\amalg</SEQ>
-			<SEQ TYPE="KEYWORD1">\alpha</SEQ>
-			<SEQ TYPE="KEYWORD1">\aleph</SEQ>
-			<SEQ TYPE="KEYWORD1">\acute</SEQ>
-			<SEQ TYPE="KEYWORD1">\above</SEQ>
-
-			<!-- Length Five Register Reference -->
-			<SEQ_REGEXP HASH_CHARS="\" TYPE="COMMENT4">\\toks[0-9]</SEQ_REGEXP>
-
-			<!-- Length Five Register Reference -->
-			<SEQ_REGEXP HASH_CHARS="\" TYPE="COMMENT4">\\skip[0-9]</SEQ_REGEXP>
-
-			<!-- Length Five Register Reference -->
-			<SEQ_REGEXP HASH_CHARS="\" TYPE="COMMENT4"
-					>\\box[0-9][0-9]</SEQ_REGEXP>
-
-			<!-- Length Five Decimal Character Reference -->
-			<SEQ_REGEXP HASH_CHARS="\" TYPE="KEYWORD2">\\char[0-9]</SEQ_REGEXP>
-
-			<!-- Length Five Octal Character Reference -->
-			<SEQ TYPE="KEYWORD2">\char'</SEQ>
-
-			<!-- Length Five Hexadecimal Character Reference -->
-			<SEQ TYPE="KEYWORD2">\char"</SEQ>
-
-			<!-- Arbitrary control sequence of the specified length -->
-			<SEQ_REGEXP HASH_CHARS="\" TYPE="LABEL">\\[a-zA-Z@]{5}</SEQ_REGEXP>
-
-		<!-- Four letter control sequences -->
-			<SEQ TYPE="KEYWORD1">\zeta</SEQ>
-			<SEQ TYPE="KEYWORD4">\year</SEQ>
-			<SEQ TYPE="FUNCTION">\xdef</SEQ>
-			<SEQ TYPE="KEYWORD1">\wlog</SEQ>
-			<SEQ TYPE="KEYWORD1">\vtop</SEQ>
-			<SEQ TYPE="KEYWORD1">\vfil</SEQ>
-			<SEQ TYPE="KEYWORD1">\vert</SEQ>
-			<SEQ TYPE="KEYWORD1">\Vert</SEQ>
-			<SEQ TYPE="KEYWORD1">\vbox</SEQ>
-			<SEQ TYPE="KEYWORD2">\uarc</SEQ>
-			<SEQ TYPE="KEYWORD4">\toks</SEQ>
-			<SEQ TYPE="KEYWORD4">\time</SEQ>
-			<SEQ TYPE="KEYWORD1">\teni</SEQ>
-			<SEQ TYPE="KEYWORD1">\tanh</SEQ>
-			<SEQ TYPE="KEYWORD1">\tabs</SEQ>
-			<SEQ TYPE="KEYWORD1">\surd</SEQ>
-			<SEQ TYPE="KEYWORD1">\succ</SEQ>
-			<SEQ TYPE="KEYWORD1">\star</SEQ>
-			<SEQ TYPE="KEYWORD1">\sqrt</SEQ>
-			<SEQ TYPE="KEYWORD1">\span</SEQ>
-			<SEQ TYPE="KEYWORD4">\skip</SEQ>
-			<SEQ TYPE="KEYWORD1">\skew</SEQ>
-			<SEQ TYPE="KEYWORD1">\sinh</SEQ>
-			<SEQ TYPE="KEYWORD1">\show</SEQ>
-			<SEQ TYPE="KEYWORD1">\root</SEQ>
-			<SEQ TYPE="KEYWORD1">\rlap</SEQ>
-			<SEQ TYPE="KEYWORD1">\read</SEQ>
-			<SEQ TYPE="KEYWORD1">\quad</SEQ>
-			<SEQ TYPE="KEYWORD1">\prod</SEQ>
-			<SEQ TYPE="KEYWORD1">\prec</SEQ>
-			<SEQ TYPE="KEYWORD1">\pmod</SEQ>
-			<SEQ TYPE="KEYWORD1">\perp</SEQ>
-			<SEQ TYPE="KEYWORD1">\owns</SEQ>
-			<SEQ TYPE="KEYWORD1">\over</SEQ>
-			<SEQ TYPE="KEYWORD1">\omit</SEQ>
-			<SEQ TYPE="KEYWORD1">\oint</SEQ>
-			<SEQ TYPE="KEYWORD1">\odot</SEQ>
-			<SEQ TYPE="KEYWORD1">\null</SEQ>
-			<SEQ TYPE="KEYWORD1">\next</SEQ>
-			<SEQ TYPE="KEYWORD1">\mark</SEQ>
-			<SEQ TYPE="KEYWORD1">\loop</SEQ>
-			<SEQ TYPE="FUNCTION">\long</SEQ>
-			<SEQ TYPE="KEYWORD1">\lnot</SEQ>
-			<SEQ TYPE="KEYWORD1">\llap</SEQ>
-			<SEQ TYPE="KEYWORD1">\line</SEQ>
-			<SEQ TYPE="KEYWORD1">\left</SEQ>
-			<SEQ TYPE="KEYWORD1">\land</SEQ>
-			<SEQ TYPE="KEYWORD1">\kern</SEQ>
-			<SEQ TYPE="KEYWORD1">\item</SEQ>
-			<SEQ TYPE="KEYWORD1">\iota</SEQ>
-			<SEQ TYPE="KEYWORD1">\hfil</SEQ>
-			<SEQ TYPE="KEYWORD1">\hbox</SEQ>
-			<SEQ TYPE="KEYWORD1">\hbar</SEQ>
-			<SEQ TYPE="KEYWORD1">\hang</SEQ>
-			<SEQ TYPE="KEYWORD1">\gets</SEQ>
-			<SEQ TYPE="FUNCTION">\gdef</SEQ>
-			<SEQ TYPE="KEYWORD1">\font</SEQ>
-			<SEQ TYPE="KEYWORD1">\flat</SEQ>
-			<SEQ TYPE="KEYWORD1">\eqno</SEQ>
-			<SEQ TYPE="KEYWORD3">\else</SEQ>
-			<SEQ TYPE="FUNCTION">\edef</SEQ>
-			<SEQ TYPE="KEYWORD1">\dump</SEQ>
-			<SEQ TYPE="KEYWORD1">\dots</SEQ>
-			<SEQ TYPE="KEYWORD1">\ddot</SEQ>
-			<SEQ TYPE="KEYWORD1">\ddag</SEQ>
-			<SEQ TYPE="KEYWORD2">\dbar</SEQ>
-			<SEQ TYPE="KEYWORD2">\Dbar</SEQ>
-			<SEQ TYPE="KEYWORD1">\crcr</SEQ>
-			<SEQ TYPE="KEYWORD1">\coth</SEQ>
-			<SEQ TYPE="KEYWORD1">\cosh</SEQ>
-			<SEQ TYPE="KEYWORD1">\copy</SEQ>
-			<SEQ TYPE="KEYWORD1">\cong</SEQ>
-			<SEQ TYPE="KEYWORD1">\circ</SEQ>
-			<SEQ TYPE="KEYWORD2">\char</SEQ>
-			<SEQ TYPE="KEYWORD2">\cfac</SEQ>
-			<SEQ TYPE="KEYWORD1">\cdot</SEQ>
-			<SEQ TYPE="KEYWORD1">\body</SEQ>
-			<SEQ TYPE="KEYWORD1">\bmod</SEQ>
-			<SEQ TYPE="KEYWORD1">\Bigr</SEQ>
-			<SEQ TYPE="KEYWORD1">\bigr</SEQ>
-			<SEQ TYPE="KEYWORD1">\Bigm</SEQ>
-			<SEQ TYPE="KEYWORD1">\bigm</SEQ>
-			<SEQ TYPE="KEYWORD1">\Bigl</SEQ>
-			<SEQ TYPE="KEYWORD1">\bigl</SEQ>
-			<SEQ TYPE="KEYWORD1">\Bigg</SEQ>
-			<SEQ TYPE="KEYWORD1">\bigg</SEQ>
-			<SEQ TYPE="KEYWORD1">\beta</SEQ>
-			<SEQ TYPE="KEYWORD1">\atop</SEQ>
-
-			<!-- Length Four Register Reference -->
-			<SEQ_REGEXP HASH_CHARS="\" TYPE="COMMENT4">\\box[0-9]</SEQ_REGEXP>
-
-			<!-- Length Four Character Reference -->
-			<SEQ TYPE="KEYWORD2">\char</SEQ>
-
-			<!-- Length Four Hexadecimal Invisible Reference -->
-			<SEQ_REGEXP HASH_CHARS="^" TYPE="KEYWORD2"
-					>(\u005E|\x5E)(\u005E|\x5E)([0-9a-f])([0-9a-f])</SEQ_REGEXP>
-
-			<!-- Arbitrary control sequence of the specified length -->
-			<SEQ_REGEXP HASH_CHARS="\" TYPE="LABEL">\\[a-zA-Z@]{4}</SEQ_REGEXP>
-
-		<!-- Three letter control sequences -->
-
-			<SEQ TYPE="KEYWORD1">\vss</SEQ>
-			<SEQ TYPE="KEYWORD1">\vee</SEQ>
-			<SEQ TYPE="KEYWORD1">\vec</SEQ>
-			<SEQ TYPE="KEYWORD1">\top</SEQ>
-			<SEQ TYPE="KEYWORD1">\the</SEQ>
-			<SEQ TYPE="KEYWORD1">\TeX</SEQ>
-			<SEQ TYPE="KEYWORD1">\tau</SEQ>
-			<SEQ TYPE="KEYWORD1">\tan</SEQ>
-			<SEQ TYPE="KEYWORD1">\sup</SEQ>
-			<SEQ TYPE="KEYWORD1">\sum</SEQ>
-			<SEQ TYPE="KEYWORD1">\sin</SEQ>
-			<SEQ TYPE="KEYWORD1">\sim</SEQ>
-			<SEQ TYPE="KEYWORD1">\sec</SEQ>
-			<SEQ TYPE="KEYWORD1">\rho</SEQ>
-			<SEQ TYPE="KEYWORD1">\Psi</SEQ>
-			<SEQ TYPE="KEYWORD1">\psi</SEQ>
-			<SEQ TYPE="KEYWORD1">\Phi</SEQ>
-			<SEQ TYPE="KEYWORD1">\phi</SEQ>
-			<SEQ TYPE="LITERAL3">\par</SEQ>
-			<SEQ TYPE="KEYWORD1">\not</SEQ>
-			<SEQ TYPE="KEYWORD1">\neq</SEQ>
-			<SEQ TYPE="KEYWORD1">\neg</SEQ>
-			<SEQ TYPE="KEYWORD1">\mit</SEQ>
-			<SEQ TYPE="KEYWORD1">\min</SEQ>
-			<SEQ TYPE="KEYWORD1">\mid</SEQ>
-			<SEQ TYPE="KEYWORD1">\max</SEQ>
-			<SEQ TYPE="KEYWORD4">\mag</SEQ>
-			<SEQ TYPE="KEYWORD1">\lor</SEQ>
-			<SEQ TYPE="KEYWORD1">\log</SEQ>
-			<SEQ TYPE="KEYWORD1">\lim</SEQ>
-			<SEQ TYPE="COMMENT3">\let</SEQ>
-			<SEQ TYPE="KEYWORD1">\leq</SEQ>
-			<SEQ TYPE="KEYWORD1">\ker</SEQ>
-			<SEQ TYPE="KEYWORD1">\jot</SEQ>
-			<SEQ TYPE="KEYWORD1">\int</SEQ>
-			<SEQ TYPE="KEYWORD1">\inf</SEQ>
-			<SEQ TYPE="KEYWORD3">\ifx</SEQ>
-			<SEQ TYPE="KEYWORD3">\iff</SEQ>
-			<SEQ TYPE="KEYWORD1">\hss</SEQ>
-			<SEQ TYPE="KEYWORD1">\hom</SEQ>
-			<SEQ TYPE="KEYWORD1">\hat</SEQ>
-			<SEQ TYPE="KEYWORD1">\geq</SEQ>
-			<SEQ TYPE="KEYWORD1">\gcd</SEQ>
-			<SEQ TYPE="KEYWORD4">\fam</SEQ>
-			<SEQ TYPE="KEYWORD1">\exp</SEQ>
-			<SEQ TYPE="KEYWORD2">\eth</SEQ>
-			<SEQ TYPE="KEYWORD1">\eta</SEQ>
-			<SEQ TYPE="KEYWORD1">\end</SEQ>
-			<SEQ TYPE="KEYWORD1">\ell</SEQ>
-			<SEQ TYPE="KEYWORD1">\dot</SEQ>
-			<SEQ TYPE="KEYWORD1">\div</SEQ>
-			<SEQ TYPE="KEYWORD1">\dim</SEQ>
-			<SEQ TYPE="KEYWORD1">\det</SEQ>
-			<SEQ TYPE="KEYWORD1">\deg</SEQ>
-			<SEQ TYPE="FUNCTION">\def</SEQ>
-			<SEQ TYPE="KEYWORD4">\day</SEQ>
-			<SEQ TYPE="KEYWORD1">\dag</SEQ>
-			<SEQ TYPE="KEYWORD1">\cup</SEQ>
-			<SEQ TYPE="KEYWORD1">\csc</SEQ>
-			<SEQ TYPE="KEYWORD1">\cot</SEQ>
-			<SEQ TYPE="KEYWORD1">\cos</SEQ>
-			<SEQ TYPE="KEYWORD1">\chi</SEQ>
-			<SEQ TYPE="KEYWORD1">\cap</SEQ>
-			<SEQ TYPE="KEYWORD1">\cal</SEQ>
-			<SEQ TYPE="KEYWORD1">\bye</SEQ>
-			<SEQ TYPE="COMMENT4">\box</SEQ>
-			<SEQ TYPE="KEYWORD1">\bot</SEQ>
-			<SEQ TYPE="KEYWORD1">\Big</SEQ>
-			<SEQ TYPE="KEYWORD1">\big</SEQ>
-			<SEQ TYPE="KEYWORD1">\bar</SEQ>
-			<SEQ TYPE="KEYWORD1">\ast</SEQ>
-			<SEQ TYPE="KEYWORD1">\arg</SEQ>
-
-			<!-- Length Three Invisible Character Reference -->
-			<SEQ_REGEXP HASH_CHARS="^" TYPE="KEYWORD2"
-				>(\u005E|\x5E)(\u005E|\x5E)(\p{ASCII}|\u0000-\u007F)</SEQ_REGEXP>
-
-			<!-- Arbitrary control sequence of the specified length -->
-			<SEQ_REGEXP HASH_CHARS="\" TYPE="LABEL">\\[a-zA-Z@]{3}</SEQ_REGEXP>
-
-		<!-- Two letter control sequences -->
-
-			<SEQ TYPE="KEYWORD1">\Xi</SEQ>
-			<SEQ TYPE="KEYWORD1">\xi</SEQ>
-			<SEQ TYPE="KEYWORD1">\wr</SEQ>
-			<SEQ TYPE="KEYWORD1">\wp</SEQ>
-			<SEQ TYPE="KEYWORD1">\wd</SEQ>
-			<SEQ TYPE="KEYWORD1">\tt</SEQ>
-			<SEQ TYPE="KEYWORD1">\to</SEQ>
-			<SEQ TYPE="KEYWORD1">\sp</SEQ>
-			<SEQ TYPE="KEYWORD1">\sl</SEQ>
-			<SEQ TYPE="KEYWORD1">\sb</SEQ>
-			<SEQ TYPE="KEYWORD1">\rq</SEQ>
-			<SEQ TYPE="KEYWORD1">\rm</SEQ>
-			<SEQ TYPE="KEYWORD1">\Re</SEQ>
-			<SEQ TYPE="KEYWORD1">\Pr</SEQ>
-			<SEQ TYPE="KEYWORD1">\pm</SEQ>
-			<SEQ TYPE="KEYWORD1">\Pi</SEQ>
-			<SEQ TYPE="KEYWORD1">\pi</SEQ>
-			<SEQ TYPE="KEYWORD3">\or</SEQ>
-			<SEQ TYPE="KEYWORD1">\of</SEQ>
-			<SEQ TYPE="KEYWORD1">\nu</SEQ>
-			<SEQ TYPE="KEYWORD1">\ni</SEQ>
-			<SEQ TYPE="KEYWORD1">\ne</SEQ>
-			<SEQ TYPE="KEYWORD1">\mu</SEQ>
-			<SEQ TYPE="KEYWORD1">\mp</SEQ>
-			<SEQ TYPE="KEYWORD1">\lq</SEQ>
-			<SEQ TYPE="KEYWORD1">\ln</SEQ>
-			<SEQ TYPE="KEYWORD1">\ll</SEQ>
-			<SEQ TYPE="KEYWORD1">\lg</SEQ>
-			<SEQ TYPE="KEYWORD1">\le</SEQ>
-			<SEQ TYPE="KEYWORD1">\it</SEQ>
-			<SEQ TYPE="KEYWORD1">\in</SEQ>
-			<SEQ TYPE="KEYWORD1">\Im</SEQ>
-			<SEQ TYPE="KEYWORD3">\if</SEQ>
-			<SEQ TYPE="KEYWORD1">\ht</SEQ>
-			<SEQ TYPE="KEYWORD1">\gg</SEQ>
-			<SEQ TYPE="KEYWORD1">\ge</SEQ>
-			<SEQ TYPE="KEYWORD3">\fi</SEQ>
-			<SEQ TYPE="KEYWORD1">\dp</SEQ>
-			<SEQ TYPE="KEYWORD1">\do</SEQ>
-			<SEQ TYPE="KEYWORD1">\cr</SEQ>
-			<SEQ TYPE="KEYWORD1">\bf</SEQ>
-
-			<!-- Accents and Special Characters -->
-			<SEQ TYPE="KEYWORD2">\AE</SEQ>
-			<SEQ TYPE="KEYWORD2">\ae</SEQ>
-			<SEQ TYPE="KEYWORD2">\AA</SEQ>
-			<SEQ TYPE="KEYWORD2">\aa</SEQ>
-			<SEQ TYPE="KEYWORD2">\OE</SEQ>
-			<SEQ TYPE="KEYWORD2">\oe</SEQ>
-			<SEQ TYPE="KEYWORD2">\ss</SEQ>
-
-			<!-- Arbitrary control sequence of the specified length -->
-			<SEQ_REGEXP HASH_CHARS="\" TYPE="LABEL">\\[a-zA-Z@]{2}</SEQ_REGEXP>
-
-		<!-- One letter control sequences -->
-
-			<SEQ TYPE="KEYWORD1">\S</SEQ>
-			<SEQ TYPE="KEYWORD1">\P</SEQ>
-
-			<!-- Accents and Special Characters -->
-			<SEQ TYPE="KEYWORD2">\=</SEQ>
-			<SEQ TYPE="KEYWORD2">\'</SEQ>
-			<SEQ TYPE="KEYWORD2">\"</SEQ>
-			<SEQ TYPE="KEYWORD2">\~</SEQ>
-			<SEQ TYPE="KEYWORD2">\`</SEQ>
-			<SEQ TYPE="KEYWORD2">\^</SEQ>
-			<SEQ TYPE="KEYWORD2">\.</SEQ>
-			<SEQ TYPE="KEYWORD2">\H</SEQ>
-			<SEQ TYPE="KEYWORD2">\c</SEQ>
-			<SEQ TYPE="KEYWORD2">\d</SEQ>
-			<SEQ TYPE="KEYWORD2">\b</SEQ>
-			<SEQ TYPE="KEYWORD2">\v</SEQ>
-			<SEQ TYPE="KEYWORD2">\u</SEQ>
-			<SEQ TYPE="KEYWORD2">\t</SEQ>
-			<SEQ TYPE="KEYWORD2">\r</SEQ>
-			<SEQ TYPE="KEYWORD2">\k</SEQ>
-			<SEQ TYPE="KEYWORD2">\O</SEQ>
-			<SEQ TYPE="KEYWORD2">\o</SEQ>
-			<SEQ TYPE="KEYWORD2">\L</SEQ>
-			<SEQ TYPE="KEYWORD2">\l</SEQ>
-			<SEQ TYPE="KEYWORD2">\j</SEQ>
-			<SEQ TYPE="KEYWORD2">\i</SEQ>
-			<SEQ TYPE="KEYWORD1">\?</SEQ>
-			<SEQ TYPE="KEYWORD1">\&gt;</SEQ>
-			<SEQ TYPE="KEYWORD1">\&lt;</SEQ>
-			<SEQ TYPE="KEYWORD1">\;</SEQ>
-			<SEQ TYPE="KEYWORD1">\:</SEQ>
-			<SEQ TYPE="KEYWORD1">\/</SEQ>
-			<SEQ TYPE="KEYWORD1">\-</SEQ>
-			<SEQ TYPE="KEYWORD1">\,</SEQ>
-			<SEQ TYPE="KEYWORD1">\+</SEQ>
-			<SEQ TYPE="KEYWORD1">\*</SEQ>
-			<SEQ TYPE="KEYWORD1">\)</SEQ>
-			<SEQ TYPE="KEYWORD1">\(</SEQ>
-			<SEQ TYPE="KEYWORD1">\!</SEQ>
-			<SEQ TYPE="KEYWORD1">\|</SEQ>
-			<SEQ TYPE="KEYWORD1">\\</SEQ>
-
-			<!-- Reserved Characters -->
-			<SEQ TYPE="KEYWORD2">\#</SEQ>
-			<SEQ TYPE="KEYWORD2">\$</SEQ>
-			<SEQ TYPE="KEYWORD2">\%</SEQ>
-			<SEQ TYPE="KEYWORD2">\&amp;</SEQ>
-			<SEQ TYPE="KEYWORD2">\{</SEQ>
-			<SEQ TYPE="KEYWORD2">\}</SEQ>
-			<SEQ TYPE="KEYWORD2">\_</SEQ>
-
-			<!-- Length One ASCII Index -->
-			<SEQ_REGEXP HASH_CHARS="`" TYPE="KEYWORD2">`\p{ASCII}</SEQ_REGEXP>
-
-			<!-- Definition Arguments -->
-			<SEQ_REGEXP HASH_CHARS="#" TYPE="DIGIT">#[1-9]</SEQ_REGEXP>
-
-			<!-- Arbitrary control sequence of the specified length -->
-			<SEQ_REGEXP HASH_CHARS="\" TYPE="LABEL">\\[a-zA-Z@]{1}</SEQ_REGEXP>
-
-		<!-- Zero letter control sequences -->
-
-			<!-- Punctuation -->
-			<SEQ TYPE="LITERAL3">`</SEQ>
-			<SEQ TYPE="LITERAL3">!</SEQ>
-			<SEQ TYPE="LITERAL3">.</SEQ>
-			<SEQ TYPE="LITERAL3">,</SEQ>
-			<SEQ TYPE="LITERAL3">;</SEQ>
-			<SEQ TYPE="LITERAL3">?</SEQ>
-			<SEQ TYPE="LITERAL3">:</SEQ>
-			<SEQ TYPE="LITERAL3">'</SEQ>
-			<SEQ TYPE="LITERAL3">"</SEQ>
-			<SEQ TYPE="LITERAL3">\</SEQ>
-
-			<!-- Simple Math Characters -->
-			<SEQ TYPE="LITERAL4">(</SEQ>
-			<SEQ TYPE="LITERAL4">)</SEQ>
-			<SEQ TYPE="LITERAL4">=</SEQ>
-			<SEQ TYPE="LITERAL4">+</SEQ>
-			<SEQ TYPE="LITERAL4">-</SEQ>
-			<SEQ TYPE="LITERAL4">&gt;</SEQ>
-			<SEQ TYPE="LITERAL4">&lt;</SEQ>
-
-			<!-- Grouping Brackets -->
-			<SEQ TYPE="OPERATOR">{</SEQ>
-			<SEQ TYPE="OPERATOR">}</SEQ>
-			<SEQ TYPE="OPERATOR">[</SEQ>
-			<SEQ TYPE="OPERATOR">]</SEQ>
-
-			<!-- Reserved Characters -->
-			<SEQ TYPE="LITERAL1">&amp;</SEQ>
-			<SEQ TYPE="LITERAL1">^</SEQ>
-			<SEQ TYPE="LITERAL1">_</SEQ>
-			<SEQ TYPE="LITERAL1">~</SEQ>
-
-			<!-- Dimensions -->
-			<SEQ_REGEXP HASH_CHARS="0123456789." TYPE="LITERAL2"
-					>(\d+?\.\d*pt|\d*\.\d+?pt|\d*pt)</SEQ_REGEXP>
-			<SEQ_REGEXP HASH_CHARS="0123456789." TYPE="LITERAL2"
-					>(\d+?\.\d*pc|\d*\.\d+?pc|\d*pc)</SEQ_REGEXP>
-			<SEQ_REGEXP HASH_CHARS="0123456789." TYPE="LITERAL2"
-					>(\d+?\.\d*in|\d*\.\d+?in|\d*in)</SEQ_REGEXP>
-			<SEQ_REGEXP HASH_CHARS="0123456789." TYPE="LITERAL2"
-					>(\d+?\.\d*bp|\d*\.\d+?bp|\d*bp)</SEQ_REGEXP>
-			<SEQ_REGEXP HASH_CHARS="0123456789." TYPE="LITERAL2"
-					>(\d+?\.\d*cm|\d*\.\d+?cm|\d*cm)</SEQ_REGEXP>
-			<SEQ_REGEXP HASH_CHARS="0123456789." TYPE="LITERAL2"
-					>(\d+?\.\d*mm|\d*\.\d+?mm|\d*mm)</SEQ_REGEXP>
-			<SEQ_REGEXP HASH_CHARS="0123456789." TYPE="LITERAL2"
-					>(\d+?\.\d*dd|\d*\.\d+?dd|\d*dd)</SEQ_REGEXP>
-			<SEQ_REGEXP HASH_CHARS="0123456789." TYPE="LITERAL2"
-					>(\d+?\.\d*cc|\d*\.\d+?cc|\d*cc)</SEQ_REGEXP>
-			<SEQ_REGEXP HASH_CHARS="0123456789." TYPE="LITERAL2"
-					>(\d+?\.\d*sp|\d*\.\d+?sp|\d*sp)</SEQ_REGEXP>
-			<SEQ_REGEXP HASH_CHARS="0123456789." TYPE="LITERAL2"
-					>(\d+?\.\d*ex|\d*\.\d+?ex|\d*ex)</SEQ_REGEXP>
-			<SEQ_REGEXP HASH_CHARS="0123456789." TYPE="LITERAL2"
-					>(\d+?\.\d*em|\d*\.\d+?em|\d*em)</SEQ_REGEXP>
-
-	</RULES>
-
-	<RULES SET="MATH" DEFAULT="MARKUP">
-
-		<!-- Comments -->
-		<EOL_SPAN TYPE="COMMENT1">%</EOL_SPAN>
-
-		<!-- At Least Twenty Five letter control sequences -->
-
-			<!-- Arbitrary control sequence of the specified length -->
-			<SEQ_REGEXP HASH_CHARS="\" TYPE="LABEL"
-					>\\[a-zA-Z@]{25}[a-zA-Z@]*</SEQ_REGEXP>
-
-		<!-- Twenty Four letter control sequences -->
-			<SEQ TYPE="KEYWORD1">\interfootnotelinepenalty</SEQ>
-
-			<!-- Arbitrary control sequence of the specified length -->
-			<SEQ_REGEXP HASH_CHARS="\" TYPE="LABEL">\\[a-zA-Z@]{24}</SEQ_REGEXP>
-
-		<!-- Twenty Three letter control sequences -->
-			<SEQ TYPE="KEYWORD1">\interdisplaylinepenalty</SEQ>
-
-			<!-- Arbitrary control sequence of the specified length -->
-			<SEQ_REGEXP HASH_CHARS="\" TYPE="LABEL">\\[a-zA-Z@]{23}</SEQ_REGEXP>
-
-		<!-- Twenty Two letter control sequences -->
-
-			<!-- Arbitrary control sequence of the specified length -->
-			<SEQ_REGEXP HASH_CHARS="\" TYPE="LABEL">\\[a-zA-Z@]{22}</SEQ_REGEXP>
-
-		<!-- Twenty One letter control sequences -->
-			<SEQ TYPE="KEYWORD4">\belowdisplayshortskip</SEQ>
-			<SEQ TYPE="KEYWORD4">\abovedisplayshortskip</SEQ>
-
-			<!-- Arbitrary control sequence of the specified length -->
-			<SEQ_REGEXP HASH_CHARS="\" TYPE="LABEL">\\[a-zA-Z@]{21}</SEQ_REGEXP>
-
-		<!-- Twenty letter control sequences -->
-
-			<SEQ TYPE="KEYWORD4">\doublehyphendemerits</SEQ>
-			<SEQ TYPE="KEYWORD1">\abovedisplayshortskip</SEQ>
-
-			<!-- Arbitrary control sequence of the specified length -->
-			<SEQ_REGEXP HASH_CHARS="\" TYPE="LABEL">\\[a-zA-Z@]{20}</SEQ_REGEXP>
-
-		<!-- Nineteen letter control sequences -->
-
-			<SEQ TYPE="KEYWORD1">\normallineskiplimit</SEQ>
-			<SEQ TYPE="KEYWORD4">\finalhyphendemerits</SEQ>
-			<SEQ TYPE="KEYWORD4">\displaywidowpenalty</SEQ>
-
-			<!-- Arbitrary control sequence of the specified length -->
-			<SEQ_REGEXP HASH_CHARS="\" TYPE="LABEL">\\[a-zA-Z@]{19}</SEQ_REGEXP>
-
-		<!-- Eighteen letter control sequences -->
-
-			<SEQ TYPE="KEYWORD4">\postdisplaypenalty</SEQ>
-			<SEQ TYPE="KEYWORD4">\nulldelimiterspace</SEQ>
-			<SEQ TYPE="KEYWORD1">\normalbaselineskip</SEQ>
-			<SEQ TYPE="KEYWORD1">\Longleftrightarrow</SEQ>
-			<SEQ TYPE="KEYWORD1">\longleftrightarrow</SEQ>
-			<SEQ TYPE="KEYWORD4">\delimitershortfall</SEQ>
-
-			<!-- Arbitrary control sequence of the specified length -->
-			<SEQ_REGEXP HASH_CHARS="\" TYPE="LABEL">\\[a-zA-Z@]{18}</SEQ_REGEXP>
-
-		<!-- Seventeen letter control sequences -->
-
-			<SEQ TYPE="KEYWORD4">\tracingparagraphs</SEQ>
-			<SEQ TYPE="KEYWORD1">\scriptscriptstyle</SEQ>
-			<SEQ TYPE="KEYWORD1">\rightleftharpoons</SEQ>
-			<SEQ TYPE="KEYWORD1">\predisplaypenalty</SEQ>
-			<SEQ TYPE="KEYWORD4">\errorcontextlines</SEQ>
-			<SEQ TYPE="KEYWORD4">\defaulthyphenchar</SEQ>
-
-			<!-- Arbitrary control sequence of the specified length -->
-			<SEQ_REGEXP HASH_CHARS="\" TYPE="LABEL">\\[a-zA-Z@]{17}</SEQ_REGEXP>
-
-		<!-- Sixteen letter control sequences -->
-
-			<SEQ TYPE="KEYWORD4">\tracinglostchars</SEQ>
-			<SEQ TYPE="KEYWORD1">\scriptscriptfont</SEQ>
-			<SEQ TYPE="KEYWORD1">\rightharpoondown</SEQ>
-			<SEQ TYPE="KEYWORD4">\predisplaypenaty</SEQ>
-			<SEQ TYPE="KEYWORD1">\pagefilllstretch</SEQ>
-			<SEQ TYPE="KEYWORD1">\offinterlineskip</SEQ>
-			<SEQ TYPE="KEYWORD1">\nonfrenchspacing</SEQ>
-			<SEQ TYPE="KEYWORD4">\interlinepenalty</SEQ>
-			<SEQ TYPE="KEYWORD4">\emergencystretch</SEQ>
-			<SEQ TYPE="KEYWORD4">\belowdisplayskip</SEQ>
-			<SEQ TYPE="KEYWORD1">\allocationnumber</SEQ>
-			<SEQ TYPE="KEYWORD4">\abovedisplayskip</SEQ>
-
-			<!-- Arbitrary control sequence of the specified length -->
-			<SEQ_REGEXP HASH_CHARS="\" TYPE="LABEL">\\[a-zA-Z@]{16}</SEQ_REGEXP>
-
-		<!-- Fifteen letter control sequences -->
-
-			<SEQ TYPE="KEYWORD4">\tracingrestores</SEQ>
-			<SEQ TYPE="KEYWORD4">\tracingcommands</SEQ>
-			<SEQ TYPE="KEYWORD1">\smallskipamount</SEQ>
-			<SEQ TYPE="KEYWORD1">\pagefillstretch</SEQ>
-			<SEQ TYPE="KEYWORD1">\normalbaselines</SEQ>
-			<SEQ TYPE="KEYWORD1">\nointerlineskip</SEQ>
-			<SEQ TYPE="KEYWORD1">\leftharpoondown</SEQ>
-			<SEQ TYPE="KEYWORD1">\insertpenalties</SEQ>
-			<SEQ TYPE="KEYWORD4">\floatingpenalty</SEQ>
-			<SEQ TYPE="KEYWORD4">\exhyphenpenalty</SEQ>
-			<SEQ TYPE="KEYWORD4">\delimiterfactor</SEQ>
-			<SEQ TYPE="KEYWORD4">\defaultskewchar</SEQ>
-			<SEQ TYPE="KEYWORD1">\bigtriangledown</SEQ>
-			<SEQ TYPE="KEYWORD1">\afterassignment</SEQ>
-			<SEQ TYPE="KEYWORD1">\abovewithdelims</SEQ>
-
-			<!-- Arbitrary control sequence of the specified length -->
-			<SEQ_REGEXP HASH_CHARS="\" TYPE="LABEL">\\[a-zA-Z@]{15}</SEQ_REGEXP>
-
-		<!-- Fourteen letter control sequences -->
-
-			<SEQ TYPE="KEYWORD1">\splitfirstmark</SEQ>
-			<SEQ TYPE="KEYWORD4">\showboxbreadth</SEQ>
-			<SEQ TYPE="KEYWORD4">\righthyphenmin</SEQ>
-			<SEQ TYPE="KEYWORD1">\rightharpoonup</SEQ>
-			<SEQ TYPE="KEYWORD1">\rightarrowfill</SEQ>
-			<SEQ TYPE="KEYWORD1">\removelastskip</SEQ>
-			<SEQ TYPE="KEYWORD4">\predisplaysize</SEQ>
-			<SEQ TYPE="KEYWORD1">\pagefilstretch</SEQ>
-			<SEQ TYPE="KEYWORD1">\overwithdelims</SEQ>
-			<SEQ TYPE="KEYWORD1">\overrightarrow</SEQ>
-			<SEQ TYPE="KEYWORD1">\normallineskip</SEQ>
-			<SEQ TYPE="KEYWORD1">\longrightarrow</SEQ>
-			<SEQ TYPE="KEYWORD1">\Longrightarrow</SEQ>
-			<SEQ TYPE="KEYWORD1">\Leftrightarrow</SEQ>
-			<SEQ TYPE="KEYWORD1">\leftrightarrow</SEQ>
-			<SEQ TYPE="KEYWORD1">\hookrightarrow</SEQ>
-			<SEQ TYPE="KEYWORD4">\holdinginserts</SEQ>
-			<SEQ TYPE="KEYWORD1">\atopwithdelims</SEQ>
-
-			<!-- Arbitrary control sequence of the specified length -->
-			<SEQ_REGEXP HASH_CHARS="\" TYPE="LABEL">\\[a-zA-Z@]{14}</SEQ_REGEXP>
-
-		<!-- Thirteen letter control sequences -->
-
-			<SEQ TYPE="KEYWORD1">\ttraggedright</SEQ>
-			<SEQ TYPE="KEYWORD1">\triangleright</SEQ>
-			<SEQ TYPE="KEYWORD4">\tracingoutput</SEQ>
-			<SEQ TYPE="KEYWORD4">\tracingonline</SEQ>
-			<SEQ TYPE="KEYWORD4">\tracingmacros</SEQ>
-			<SEQ TYPE="KEYWORD4">\splitmaxdepth</SEQ>
-			<SEQ TYPE="KEYWORD1">\overleftarrow</SEQ>
-			<SEQ TYPE="KEYWORD4">\outputpenalty</SEQ>
-			<SEQ TYPE="KEYWORD1">\nopagenumbers</SEQ>
-			<SEQ TYPE="KEYWORD1">\medskipamount</SEQ>
-			<SEQ TYPE="KEYWORD4">\maxdeadcycles</SEQ>
-			<SEQ TYPE="KEYWORD1">\magnification</SEQ>
-			<SEQ TYPE="KEYWORD1">\Longleftarrow</SEQ>
-			<SEQ TYPE="KEYWORD1">\longleftarrow</SEQ>
-			<SEQ TYPE="KEYWORD4">\lineskiplimit</SEQ>
-			<SEQ TYPE="KEYWORD4">\lefthyphenmin	</SEQ>
-			<SEQ TYPE="KEYWORD1">\leftharpoonup</SEQ>
-			<SEQ TYPE="KEYWORD1">\leftarrowfill</SEQ>
-			<SEQ TYPE="KEYWORD4">\hyphenpenalty</SEQ>
-			<SEQ TYPE="KEYWORD1">\hookleftarrow</SEQ>
-			<SEQ TYPE="KEYWORD1">\frenchspacing</SEQ>
-			<SEQ TYPE="KEYWORD1">\errorstopmode</SEQ>
-			<SEQ TYPE="KEYWORD1">\downbracefill</SEQ>
-			<SEQ TYPE="KEYWORD1">\displaylimits</SEQ>
-			<SEQ TYPE="KEYWORD4">\displayindent</SEQ>
-			<SEQ TYPE="KEYWORD1">\discretionary</SEQ>
-			<SEQ TYPE="KEYWORD4">\brokenpenalty</SEQ>
-			<SEQ TYPE="KEYWORD1">\bigtriangleup</SEQ>
-			<SEQ TYPE="KEYWORD1">\bigskipamount</SEQ>
-			<SEQ TYPE="KEYWORD1">\advancepageno</SEQ>
-
-			<!-- Arbitrary control sequence of the specified length -->
-			<SEQ_REGEXP HASH_CHARS="\" TYPE="LABEL">\\[a-zA-Z@]{13}</SEQ_REGEXP>
-
-		<!-- Twelve letter control sequences -->
-
-			<SEQ TYPE="KEYWORD4">\widowpenalty</SEQ>
-			<SEQ TYPE="KEYWORD1">\triangleleft</SEQ>
-			<SEQ TYPE="KEYWORD4">\tracingstats</SEQ>
-			<SEQ TYPE="KEYWORD4">\tracingpages</SEQ>
-			<SEQ TYPE="KEYWORD4">\splittopskip</SEQ>
-			<SEQ TYPE="KEYWORD1">\splitbotmark</SEQ>
-			<SEQ TYPE="KEYWORD4">\showboxdepth</SEQ>
-			<SEQ TYPE="KEYWORD1">\romannumeral</SEQ>
-			<SEQ TYPE="KEYWORD1">\raggedbottom</SEQ>
-			<SEQ TYPE="KEYWORD4">\pretolerance</SEQ>
-			<SEQ TYPE="KEYWORD1">\pagecontents</SEQ>
-			<SEQ TYPE="KEYWORD4">\overfullrule</SEQ>
-			<SEQ TYPE="KEYWORD1">\normalbottom</SEQ>
-			<SEQ TYPE="KEYWORD1">\negthinspace</SEQ>
-			<SEQ TYPE="KEYWORD4">\mathsurround</SEQ>
-			<SEQ TYPE="KEYWORD1">\makeheadline</SEQ>
-			<SEQ TYPE="KEYWORD1">\makefootline</SEQ>
-			<SEQ TYPE="KEYWORD1">\ignorespaces</SEQ>
-			<SEQ TYPE="KEYWORD1">\footnoterule</SEQ>
-			<SEQ TYPE="KEYWORD4">\everydisplay</SEQ>
-			<SEQ TYPE="KEYWORD1">\dosupereject</SEQ>
-			<SEQ TYPE="KEYWORD4">\displaywidth</SEQ>
-			<SEQ TYPE="KEYWORD1">\displaystyle</SEQ>
-			<SEQ TYPE="KEYWORD1">\displaylines</SEQ>
-			<SEQ TYPE="KEYWORD1">\bordermatrix</SEQ>
-			<SEQ TYPE="KEYWORD4">\binoppenalty</SEQ>
-			<SEQ TYPE="KEYWORD1">\beginsection</SEQ>
-			<SEQ TYPE="KEYWORD1">\baselineskip</SEQ>
-
-			<!-- Arbitrary control sequence of the specified length -->
-			<SEQ_REGEXP HASH_CHARS="\" TYPE="LABEL">\\[a-zA-Z@]{12}</SEQ_REGEXP>
-
-		<!-- Eleven letter control sequences -->
-
-			<SEQ TYPE="KEYWORD1">\Updownarrow</SEQ>
-			<SEQ TYPE="KEYWORD1">\updownarrow</SEQ>
-			<SEQ TYPE="KEYWORD1">\upbracefill</SEQ>
-			<SEQ TYPE="KEYWORD4">\thickmuskip</SEQ>
-			<SEQ TYPE="KEYWORD1">\spacefactor</SEQ>
-			<SEQ TYPE="KEYWORD1">\showhyphens</SEQ>
-			<SEQ TYPE="KEYWORD1">\scriptstyle</SEQ>
-			<SEQ TYPE="KEYWORD4">\scriptspace</SEQ>
-			<SEQ TYPE="KEYWORD1">\raggedright</SEQ>
-			<SEQ TYPE="KEYWORD1">\plainoutput</SEQ>
-			<SEQ TYPE="KEYWORD4">\parfillskip</SEQ>
-			<SEQ TYPE="KEYWORD1">\pagestretch</SEQ>
-			<SEQ TYPE="KEYWORD1">\nonstopmode</SEQ>
-			<SEQ TYPE="COMMENT2">\newlinechar</SEQ>
-			<SEQ TYPE="KEYWORD1">\mathpalette</SEQ>
-			<SEQ TYPE="FUNCTION">\mathchardef</SEQ>
-			<SEQ TYPE="KEYWORD1">\magstephalf</SEQ>
-			<SEQ TYPE="KEYWORD4">\linepenalty</SEQ>
-			<SEQ TYPE="KEYWORD1">\lastpenalty</SEQ>
-			<SEQ TYPE="KEYWORD1">\hyphenation</SEQ>
-			<SEQ TYPE="KEYWORD1">\expandafter</SEQ>
-			<SEQ TYPE="KEYWORD4">\endlinechar</SEQ>
-			<SEQ TYPE="KEYWORD1">\diamondsuit</SEQ>
-			<SEQ TYPE="KEYWORD4">\clubpenalty</SEQ>
-			<SEQ TYPE="KEYWORD4">\boxmaxdepth</SEQ>
-			<SEQ TYPE="KEYWORD4">\adjdemerits</SEQ>
-
-			<!-- Arbitrary control sequence of the specified length -->
-			<SEQ_REGEXP HASH_CHARS="\" TYPE="LABEL">\\[a-zA-Z@]{11}</SEQ_REGEXP>
-
-		<!-- Ten letter control sequences -->
-
-			<SEQ TYPE="KEYWORD4">\xspaceskip</SEQ>
-			<SEQ TYPE="KEYWORD1">\varepsilon</SEQ>
-			<SEQ TYPE="KEYWORD1">\underbrace</SEQ>
-			<SEQ TYPE="KEYWORD1">\tracingall</SEQ>
-			<SEQ TYPE="KEYWORD4">\thinmuskip</SEQ>
-			<SEQ TYPE="KEYWORD1">\textindent</SEQ>
-			<SEQ TYPE="KEYWORD1">\supereject</SEQ>
-			<SEQ TYPE="KEYWORD1">\sqsupseteq</SEQ>
-			<SEQ TYPE="KEYWORD1">\smallbreak</SEQ>
-			<SEQ TYPE="KEYWORD1">\scrollmode</SEQ>
-			<SEQ TYPE="KEYWORD1">\scriptfont</SEQ>
-			<SEQ TYPE="KEYWORD1">\rmoustache</SEQ>
-			<SEQ TYPE="KEYWORD1">\Rightarrow</SEQ>
-			<SEQ TYPE="KEYWORD1">\rightarrow</SEQ>
-			<SEQ TYPE="KEYWORD4">\relpenalty</SEQ>
-			<SEQ TYPE="KEYWORD1">\pageshrink</SEQ>
-			<SEQ TYPE="KEYWORD1">\pageinsert</SEQ>
-			<SEQ TYPE="KEYWORD1">\obeyspaces</SEQ>
-			<SEQ TYPE="KEYWORD1">\mathhexbox</SEQ>
-			<SEQ TYPE="KEYWORD1">\mathchoice</SEQ>
-			<SEQ TYPE="KEYWORD1">\mathaccent</SEQ>
-			<SEQ TYPE="KEYWORD1">\mapstochar</SEQ>
-			<SEQ TYPE="KEYWORD1">\longmapsto</SEQ>
-			<SEQ TYPE="KEYWORD1">\lmoustache</SEQ>
-			<SEQ TYPE="KEYWORD1">\leqalignno</SEQ>
-			<SEQ TYPE="KEYWORD1">\leavevmode</SEQ>
-			<SEQ TYPE="KEYWORD1">\hyphenchar</SEQ>
-			<SEQ TYPE="KEYWORD4">\hangindent</SEQ>
-			<SEQ TYPE="KEYWORD4">\globaldefs</SEQ>
-			<SEQ TYPE="KEYWORD1">\fmtversion</SEQ>
-			<SEQ TYPE="KEYWORD4">\escapechar</SEQ>
-			<SEQ TYPE="KEYWORD1">\errmessage</SEQ>
-			<SEQ TYPE="KEYWORD1">\dospecials</SEQ>
-			<SEQ TYPE="KEYWORD1">\deadcycles</SEQ>
-			<SEQ TYPE="KEYWORD1">\centerline</SEQ>
-			<SEQ TYPE="KEYWORD1">\begingroup</SEQ>
-			<SEQ TYPE="KEYWORD1">\allowbreak</SEQ>
-			<SEQ TYPE="KEYWORD1">\aftergroup</SEQ>
-
-			<!-- Arbitrary control sequence of the specified length -->
-			<SEQ_REGEXP HASH_CHARS="\" TYPE="LABEL">\\[a-zA-Z@]{10}</SEQ_REGEXP>
-
-		<!-- Nine letter control sequences -->
-
-			<SEQ TYPE="KEYWORD1">\widetilde</SEQ>
-			<SEQ TYPE="KEYWORD1">\vfootnote</SEQ>
-			<SEQ TYPE="KEYWORD1">\uppercase</SEQ>
-			<SEQ TYPE="KEYWORD1">\unpenalty</SEQ>
-			<SEQ TYPE="KEYWORD1">\underline</SEQ>
-			<SEQ TYPE="KEYWORD1">\undefined</SEQ>
-			<SEQ TYPE="KEYWORD1">\topinsert</SEQ>
-			<SEQ TYPE="KEYWORD4">\tolerance</SEQ>
-			<SEQ TYPE="KEYWORD1">\thinspace</SEQ>
-			<SEQ TYPE="KEYWORD1">\textstyle</SEQ>
-			<SEQ TYPE="KEYWORD1">\spadesuit</SEQ>
-			<SEQ TYPE="KEYWORD4">\spaceskip</SEQ>
-			<SEQ TYPE="KEYWORD1">\smallskip</SEQ>
-			<SEQ TYPE="KEYWORD1">\showlists</SEQ>
-			<SEQ TYPE="KEYWORD4">\rightskip</SEQ>
-			<SEQ TYPE="KEYWORD1">\rightline</SEQ>
-			<SEQ TYPE="KEYWORD1">\prevdepth</SEQ>
-			<SEQ TYPE="KEYWORD1">\preloaded</SEQ>
-			<SEQ TYPE="KEYWORD4">\parindent</SEQ>
-			<SEQ TYPE="KEYWORD1">\pagetotal</SEQ>
-			<SEQ TYPE="KEYWORD1">\pagedepth</SEQ>
-			<SEQ TYPE="KEYWORD1">\overbrace</SEQ>
-			<SEQ TYPE="KEYWORD1">\obeylines</SEQ>
-			<SEQ TYPE="KEYWORD1">\nonscript</SEQ>
-			<SEQ TYPE="FUNCTION">\newmuskip</SEQ>
-			<SEQ TYPE="FUNCTION">\newinsert</SEQ>
-			<SEQ TYPE="FUNCTION">\muskipdef</SEQ>
-			<SEQ TYPE="KEYWORD1">\multispan</SEQ>
-			<SEQ TYPE="KEYWORD1">\moveright</SEQ>
-			<SEQ TYPE="KEYWORD1">\midinsert</SEQ>
-			<SEQ TYPE="KEYWORD4">\medmuskip</SEQ>
-			<SEQ TYPE="KEYWORD1">\mathstrut</SEQ>
-			<SEQ TYPE="KEYWORD1">\mathpunct</SEQ>
-			<SEQ TYPE="KEYWORD1">\mathinner</SEQ>
-			<SEQ TYPE="KEYWORD1">\mathclose</SEQ>
-			<SEQ TYPE="KEYWORD1">\lowercase</SEQ>
-			<SEQ TYPE="KEYWORD4">\looseness</SEQ>
-			<SEQ TYPE="KEYWORD1">\Leftarrow</SEQ>
-			<SEQ TYPE="KEYWORD1">\leftarrow</SEQ>
-			<SEQ TYPE="KEYWORD1">\immediate</SEQ>
-			<SEQ TYPE="KEYWORD1">\hrulefill</SEQ>
-			<SEQ TYPE="KEYWORD1">\hidewidth</SEQ>
-			<SEQ TYPE="KEYWORD1">\heartsuit</SEQ>
-			<SEQ TYPE="KEYWORD4">\hangafter</SEQ>
-			<SEQ TYPE="KEYWORD1">\goodbreak</SEQ>
-			<SEQ TYPE="COMMENT3">\futurelet</SEQ>
-			<SEQ TYPE="KEYWORD1">\footstrut</SEQ>
-			<SEQ TYPE="KEYWORD1">\fontdimen</SEQ>
-			<SEQ TYPE="KEYWORD1">\firstmark</SEQ>
-			<SEQ TYPE="KEYWORD4">\everyvbox</SEQ>
-			<SEQ TYPE="KEYWORD4">\everymath</SEQ>
-			<SEQ TYPE="KEYWORD4">\everyhbox</SEQ>
-			<SEQ TYPE="KEYWORD1">\eqalignno</SEQ>
-			<SEQ TYPE="KEYWORD1">\endinsert</SEQ>
-			<SEQ TYPE="FUNCTION">\endcsname</SEQ>
-			<SEQ TYPE="KEYWORD1">\Downarrow</SEQ>
-			<SEQ TYPE="KEYWORD1">\downarrow</SEQ>
-			<SEQ TYPE="KEYWORD1">\delimiter</SEQ>
-			<SEQ TYPE="KEYWORD1">\copyright</SEQ>
-			<SEQ TYPE="KEYWORD1">\cleartabs</SEQ>
-			<SEQ TYPE="KEYWORD1">\centering</SEQ>
-			<SEQ TYPE="KEYWORD1">\bracevert</SEQ>
-			<SEQ TYPE="KEYWORD1">\bigotimes</SEQ>
-			<SEQ TYPE="KEYWORD1">\batchmode</SEQ>
-			<SEQ TYPE="KEYWORD2">\backslash</SEQ>
-			<SEQ TYPE="KEYWORD1">\Arrowvert</SEQ>
-			<SEQ TYPE="KEYWORD1">\arrowvert</SEQ>
-
-			<!-- Length Nine Register Reference -->
-			<SEQ_REGEXP HASH_CHARS="\" TYPE="COMMENT4"
-					>\\muskip([0-1][0-9][0-9]|2([0-4][0-9]|5[0-5]))</SEQ_REGEXP>
-
-			<!-- Arbitrary control sequence of the specified length -->
-			<SEQ_REGEXP HASH_CHARS="\" TYPE="LABEL">\\[a-zA-Z@]{9}</SEQ_REGEXP>
-
-		<!-- Eight letter control sequences -->
-
-			<SEQ TYPE="KEYWORD1">\xleaders</SEQ>
-			<SEQ TYPE="KEYWORD1">\vphantom</SEQ>
-			<SEQ TYPE="KEYWORD4">\vbadness</SEQ>
-			<SEQ TYPE="KEYWORD1">\vartheta</SEQ>
-			<SEQ TYPE="KEYWORD1">\varsigma</SEQ>
-			<SEQ TYPE="KEYWORD1">\underbar</SEQ>
-			<SEQ TYPE="KEYWORD1">\triangle</SEQ>
-			<SEQ TYPE="KEYWORD1">\textfont</SEQ>
-			<SEQ TYPE="KEYWORD1">\tabsdone</SEQ>
-			<SEQ TYPE="KEYWORD1">\tabalign</SEQ>
-			<SEQ TYPE="KEYWORD1">\supseteq</SEQ>
-			<SEQ TYPE="KEYWORD1">\subseteq</SEQ>
-			<SEQ TYPE="KEYWORD1">\strutbox</SEQ>
-			<SEQ TYPE="KEYWORD1">\smallint</SEQ>
-			<SEQ TYPE="KEYWORD1">\skewchar</SEQ>
-			<SEQ TYPE="KEYWORD1">\setminus</SEQ>
-			<SEQ TYPE="KEYWORD1">\proclaim</SEQ>
-			<SEQ TYPE="KEYWORD1">\prevgraf</SEQ>
-			<SEQ TYPE="KEYWORD1">\patterns</SEQ>
-			<SEQ TYPE="KEYWORD1">\parshape</SEQ>
-			<SEQ TYPE="KEYWORD1">\parallel</SEQ>
-			<SEQ TYPE="KEYWORD1">\pagegoal</SEQ>
-			<SEQ TYPE="KEYWORD1">\pagebody</SEQ>
-			<SEQ TYPE="KEYWORD1">\overline</SEQ>
-			<SEQ TYPE="KEYWORD1">\oldstyle</SEQ>
-			<SEQ TYPE="KEYWORD1">\nolimits</SEQ>
-			<SEQ TYPE="KEYWORD1">\noindent</SEQ>
-			<SEQ TYPE="KEYWORD1">\noexpand</SEQ>
-			<SEQ TYPE="COMMENT2">\newwrite</SEQ>
-			<SEQ TYPE="COMMENT2">\newdimen</SEQ>
-			<SEQ TYPE="COMMENT2">\newcount</SEQ>
-			<SEQ TYPE="KEYWORD1">\narrower</SEQ>
-			<SEQ TYPE="KEYWORD1">\moveleft</SEQ>
-			<SEQ TYPE="KEYWORD1">\medbreak</SEQ>
-			<SEQ TYPE="KEYWORD1">\maxdimen</SEQ>
-			<SEQ TYPE="KEYWORD4">\maxdepth</SEQ>
-			<SEQ TYPE="KEYWORD1">\mathopen</SEQ>
-			<SEQ TYPE="KEYWORD1">\mathcode</SEQ>
-			<SEQ TYPE="KEYWORD1">\mathchar</SEQ>
-			<SEQ TYPE="KEYWORD1">\lineskip</SEQ>
-			<SEQ TYPE="KEYWORD4">\leftskip</SEQ>
-			<SEQ TYPE="KEYWORD4">\leftline</SEQ>
-			<SEQ TYPE="KEYWORD1">\lastskip</SEQ>
-			<SEQ TYPE="KEYWORD1">\lastkern</SEQ>
-			<SEQ TYPE="KEYWORD4">\language</SEQ>
-			<SEQ TYPE="KEYWORD1">\itemitem</SEQ>
-			<SEQ TYPE="KEYWORD1">\hphantom</SEQ>
-			<SEQ TYPE="KEYWORD1">\hideskip</SEQ>
-			<SEQ TYPE="KEYWORD1">\headline</SEQ>
-			<SEQ TYPE="KEYWORD4">\hbadness</SEQ>
-			<SEQ TYPE="KEYWORD1">\footnote</SEQ>
-			<SEQ TYPE="KEYWORD1">\footline</SEQ>
-			<SEQ TYPE="KEYWORD1">\multiply</SEQ>
-			<SEQ TYPE="KEYWORD1">\fontname</SEQ>
-			<SEQ TYPE="KEYWORD1">\filbreak</SEQ>
-			<SEQ TYPE="KEYWORD4">\everypar</SEQ>
-			<SEQ TYPE="KEYWORD4">\everyjob</SEQ>
-			<SEQ TYPE="KEYWORD1">\endinput</SEQ>
-			<SEQ TYPE="KEYWORD1">\endgroup</SEQ>
-			<SEQ TYPE="KEYWORD1">\emptyset</SEQ>
-			<SEQ TYPE="FUNCTION">\dimendef</SEQ>
-			<SEQ TYPE="FUNCTION">\countdef</SEQ>
-			<SEQ TYPE="KEYWORD1">\clubsuit</SEQ>
-			<SEQ TYPE="KEYWORD1">\closeout</SEQ>
-			<SEQ TYPE="KEYWORD1">\cleaders</SEQ>
-			<SEQ TYPE="KEYWORD1">\buildrel</SEQ>
-			<SEQ TYPE="KEYWORD1">\bigwedge</SEQ>
-			<SEQ TYPE="KEYWORD1">\biguplus</SEQ>
-			<SEQ TYPE="KEYWORD1">\bigsqcup</SEQ>
-			<SEQ TYPE="KEYWORD1">\bigoplus</SEQ>
-			<SEQ TYPE="KEYWORD1">\bigbreak</SEQ>
-
-			<!-- Length Eight Register Reference -->
-			<SEQ_REGEXP HASH_CHARS="\" TYPE="COMMENT4"
-					>\\muskip[0-9][0-9]</SEQ_REGEXP>
-
-			<!-- Length Eight Register Reference -->
-			<SEQ_REGEXP HASH_CHARS="\" TYPE="COMMENT4"
-					>\\dimen([0-1][0-9][0-9]|2([0-4][0-9]|5[0-5]))</SEQ_REGEXP>
-
-			<!-- Length Eight Register Reference -->
-			<SEQ_REGEXP HASH_CHARS="\" TYPE="COMMENT4"
-					>\\count([0-1][0-9][0-9]|2([0-4][0-9]|5[0-5]))</SEQ_REGEXP>
-
-			<!-- Arbitrary control sequence of the specified length -->
-			<SEQ_REGEXP HASH_CHARS="\" TYPE="LABEL">\\[a-zA-Z@]{8}</SEQ_REGEXP>
-
-		<!-- Seven letter control sequences -->
-
-			<SEQ TYPE="KEYWORD1">\widehat</SEQ>
-			<SEQ TYPE="KEYWORD4">\voffset</SEQ>
-			<SEQ TYPE="KEYWORD1">\vfilneg</SEQ>
-			<SEQ TYPE="KEYWORD1">\vcenter</SEQ>
-			<SEQ TYPE="KEYWORD1">\vadjust</SEQ>
-			<SEQ TYPE="KEYWORD1">\Upsilon</SEQ>
-			<SEQ TYPE="KEYWORD1">\upsilon</SEQ>
-			<SEQ TYPE="KEYWORD1">\Uparrow</SEQ>
-			<SEQ TYPE="KEYWORD1">\uparrow</SEQ>
-			<SEQ TYPE="KEYWORD1">\unvcopy</SEQ>
-			<SEQ TYPE="KEYWORD1">\unhcopy</SEQ>
-			<SEQ TYPE="KEYWORD4">\topskip</SEQ>
-			<SEQ TYPE="KEYWORD1">\topmark</SEQ>
-			<SEQ TYPE="FUNCTION">\toksdef</SEQ>
-			<SEQ TYPE="KEYWORD1">\tabsyet</SEQ>
-			<SEQ TYPE="KEYWORD4">\tabskip</SEQ>
-			<SEQ TYPE="KEYWORD1">\swarrow</SEQ>
-			<SEQ TYPE="KEYWORD1">\special</SEQ>
-			<SEQ TYPE="FUNCTION">\skipdef</SEQ>
-			<SEQ TYPE="KEYWORD1">\showthe</SEQ>
-			<SEQ TYPE="KEYWORD1">\showbox</SEQ>
-			<SEQ TYPE="KEYWORD1">\shipout</SEQ>
-			<SEQ TYPE="KEYWORD1">\sevensy</SEQ>
-			<SEQ TYPE="KEYWORD1">\sevenrm</SEQ>
-			<SEQ TYPE="KEYWORD1">\sevenbf</SEQ>
-			<SEQ TYPE="KEYWORD1">\settabs</SEQ>
-			<SEQ TYPE="KEYWORD1">\searrow</SEQ>
-			<SEQ TYPE="KEYWORD1">\rootbox</SEQ>
-			<SEQ TYPE="KEYWORD1">\radical</SEQ>
-			<SEQ TYPE="KEYWORD1">\pmatrix</SEQ>
-			<SEQ TYPE="KEYWORD1">\phantom</SEQ>
-			<SEQ TYPE="KEYWORD1">\penalty</SEQ>
-			<SEQ TYPE="KEYWORD4">\pausing</SEQ>
-			<SEQ TYPE="KEYWORD1">\partial</SEQ>
-			<SEQ TYPE="KEYWORD4">\parskip</SEQ>
-			<SEQ TYPE="KEYWORD1">\openout</SEQ>
-			<SEQ TYPE="KEYWORD1">\ooalign</SEQ>
-			<SEQ TYPE="KEYWORD1">\nwarrow</SEQ>
-			<SEQ TYPE="KEYWORD1">\nobreak</SEQ>
-			<SEQ TYPE="KEYWORD1">\noalign</SEQ>
-			<SEQ TYPE="COMMENT2">\newtoks</SEQ>
-			<SEQ TYPE="COMMENT2">\newskip</SEQ>
-			<SEQ TYPE="COMMENT2">\newread</SEQ>
-			<SEQ TYPE="COMMENT2">\newhelp</SEQ>
-			<SEQ TYPE="KEYWORD1">\nearrow</SEQ>
-			<SEQ TYPE="KEYWORD1">\natural</SEQ>
-			<SEQ TYPE="KEYWORD1">\mscount</SEQ>
-			<SEQ TYPE="KEYWORD1">\message</SEQ>
-			<SEQ TYPE="KEYWORD1">\medskip</SEQ>
-			<SEQ TYPE="KEYWORD1">\meaning</SEQ>
-			<SEQ TYPE="KEYWORD1">\mathrel</SEQ>
-			<SEQ TYPE="KEYWORD1">\mathord</SEQ>
-			<SEQ TYPE="KEYWORD1">\mathbin</SEQ>
-			<SEQ TYPE="KEYWORD1">\magstep</SEQ>
-			<SEQ TYPE="KEYWORD1">\leaders</SEQ>
-			<SEQ TYPE="KEYWORD1">\lastbox</SEQ>
-			<SEQ TYPE="KEYWORD1">\joinrel</SEQ>
-			<SEQ TYPE="KEYWORD1">\jobname</SEQ>
-			<SEQ TYPE="KEYWORD1">\iterate</SEQ>
-			<SEQ TYPE="KEYWORD3">\ifvmode</SEQ>
-			<SEQ TYPE="KEYWORD3">\ifmmode</SEQ>
-			<SEQ TYPE="KEYWORD3">\ifinner</SEQ>
-			<SEQ TYPE="KEYWORD3">\ifhmode</SEQ>
-			<SEQ TYPE="KEYWORD3">\iffalse</SEQ>
-			<SEQ TYPE="KEYWORD4">\hoffset</SEQ>
-			<SEQ TYPE="KEYWORD1">\hfilneg</SEQ>
-			<SEQ TYPE="KEYWORD1">\footins</SEQ>
-			<SEQ TYPE="KEYWORD1">\fmtname</SEQ>
-			<SEQ TYPE="KEYWORD4">\everycr</SEQ>
-			<SEQ TYPE="KEYWORD4">\errhelp</SEQ>
-			<SEQ TYPE="KEYWORD1">\eqalign</SEQ>
-			<SEQ TYPE="KEYWORD1">\epsilon</SEQ>
-			<SEQ TYPE="KEYWORD1">\enspace</SEQ>
-			<SEQ TYPE="KEYWORD1">\endline</SEQ>
-			<SEQ TYPE="KEYWORD1">\endgraf</SEQ>
-			<SEQ TYPE="KEYWORD1">\dotfill</SEQ>
-			<SEQ TYPE="KEYWORD1">\diamond</SEQ>
-			<SEQ TYPE="KEYWORD1">\delcode</SEQ>
-			<SEQ TYPE="KEYWORD1">\ddagger</SEQ>
-			<SEQ TYPE="KEYWORD1">\columns</SEQ>
-			<SEQ TYPE="KEYWORD1">\closein</SEQ>
-			<SEQ TYPE="FUNCTION">\chardef</SEQ>
-			<SEQ TYPE="KEYWORD2">\cdprime</SEQ>
-			<SEQ TYPE="KEYWORD1">\catcode</SEQ>
-			<SEQ TYPE="KEYWORD1">\braceru</SEQ>
-			<SEQ TYPE="KEYWORD1">\bracerd</SEQ>
-			<SEQ TYPE="KEYWORD1">\bracelu</SEQ>
-			<SEQ TYPE="KEYWORD1">\braceld</SEQ>
-			<SEQ TYPE="KEYWORD1">\botmark</SEQ>
-			<SEQ TYPE="KEYWORD1">\bigskip</SEQ>
-			<SEQ TYPE="KEYWORD1">\bigodot</SEQ>
-			<SEQ TYPE="KEYWORD1">\bigcirc</SEQ>
-			<SEQ TYPE="KEYWORD1">\advance</SEQ>
-
-			<!-- Length Seven Register Reference -->
-			<SEQ_REGEXP HASH_CHARS="\" TYPE="COMMENT4">\\muskip[0-9]</SEQ_REGEXP>
-
-			<!-- Length Seven Register Reference -->
-			<SEQ_REGEXP HASH_CHARS="\" TYPE="COMMENT4"
-					>\\dimen[0-9][0-9]</SEQ_REGEXP>
-
-			<!-- Length Seven Register Reference -->
-			<SEQ_REGEXP HASH_CHARS="\" TYPE="COMMENT4"
-					>\\count[0-9][0-9]</SEQ_REGEXP>
-
-			<!-- Length Seven Register Reference -->
-			<SEQ_REGEXP HASH_CHARS="\" TYPE="COMMENT4"
-					>\\toks([0-1][0-9][0-9]|2([0-4][0-9]|5[0-5]))</SEQ_REGEXP>
-
-			<!-- Length Seven Register Reference -->
-			<SEQ_REGEXP HASH_CHARS="\" TYPE="COMMENT4"
-					>\\skip([0-1][0-9][0-9]|2([0-4][0-9]|5[0-5]))</SEQ_REGEXP>
-
-			<!-- Length Seven Decimal Character Reference -->
-			<SEQ_REGEXP HASH_CHARS="\" TYPE="KEYWORD2"
-					>\\char([0-1][0-9][0-9]|2([0-4][0-9]|5[0-5]))</SEQ_REGEXP>
-
-			<!-- Length Seven Octal Character Reference -->
-			<SEQ_REGEXP HASH_CHARS="\" TYPE="KEYWORD2"
-					>\\char'[0-7][0-7]</SEQ_REGEXP>
-
-			<!-- Length Seven Hexadecimal Character Reference -->
-			<SEQ_REGEXP HASH_CHARS="\" TYPE="KEYWORD2"
-					>\\char"[0-9A-Fa-f][0-9A-Fa-f]</SEQ_REGEXP>
-
-			<!-- Arbitrary control sequence of the specified length -->
-			<SEQ_REGEXP HASH_CHARS="\" TYPE="LABEL">\\[a-zA-Z@]{7}</SEQ_REGEXP>
-
-		<!-- Six letter control sequences -->
-
-			<SEQ TYPE="KEYWORD1">\vsplit</SEQ>
-			<SEQ TYPE="KEYWORD1">\varrho</SEQ>
-			<SEQ TYPE="KEYWORD1">\varphi</SEQ>
-			<SEQ TYPE="KEYWORD1">\valign</SEQ>
-			<SEQ TYPE="KEYWORD2">\utilde</SEQ>
-			<SEQ TYPE="KEYWORD1">\unvbox</SEQ>
-			<SEQ TYPE="KEYWORD1">\unskip</SEQ>
-			<SEQ TYPE="KEYWORD1">\unkern</SEQ>
-			<SEQ TYPE="KEYWORD1">\unhbox</SEQ>
-			<SEQ TYPE="KEYWORD4">\uchyph</SEQ>
-			<SEQ TYPE="KEYWORD1">\uccode</SEQ>
-			<SEQ TYPE="KEYWORD1">\topins</SEQ>
-			<SEQ TYPE="KEYWORD1">\supset</SEQ>
-			<SEQ TYPE="KEYWORD1">\succeq</SEQ>
-			<SEQ TYPE="KEYWORD1">\subset</SEQ>
-			<SEQ TYPE="KEYWORD1">\string</SEQ>
-			<SEQ TYPE="KEYWORD1">\sfcode</SEQ>
-			<SEQ TYPE="KEYWORD1">\seveni</SEQ>
-			<SEQ TYPE="KEYWORD1">\setbox</SEQ>
-			<SEQ TYPE="KEYWORD1">\rgroup</SEQ>
-			<SEQ TYPE="KEYWORD1">\rfloor</SEQ>
-			<SEQ TYPE="KEYWORD1">\repeat</SEQ>
-			<SEQ TYPE="KEYWORD1">\Relbar</SEQ>
-			<SEQ TYPE="KEYWORD1">\relbar</SEQ>
-			<SEQ TYPE="KEYWORD1">\rbrack</SEQ>
-			<SEQ TYPE="KEYWORD1">\rbrace</SEQ>
-			<SEQ TYPE="KEYWORD1">\rangle</SEQ>
-			<SEQ TYPE="KEYWORD1">\propto</SEQ>
-			<SEQ TYPE="KEYWORD1">\preceq</SEQ>
-			<SEQ TYPE="KEYWORD1">\pageno</SEQ>
-			<SEQ TYPE="KEYWORD4">\output</SEQ>
-			<SEQ TYPE="KEYWORD1">\otimes</SEQ>
-			<SEQ TYPE="KEYWORD1">\oslash</SEQ>
-			<SEQ TYPE="KEYWORD1">\openup</SEQ>
-			<SEQ TYPE="KEYWORD1">\openin</SEQ>
-			<SEQ TYPE="KEYWORD1">\ominus</SEQ>
-			<SEQ TYPE="KEYWORD1">\ointop</SEQ>
-			<SEQ TYPE="KEYWORD1">\oalign</SEQ>
-			<SEQ TYPE="KEYWORD1">\number</SEQ>
-			<SEQ TYPE="COMMENT2">\newfam</SEQ>
-			<SEQ TYPE="COMMENT2">\newbox</SEQ>
-			<SEQ TYPE="COMMENT4">\muskip</SEQ>
-			<SEQ TYPE="KEYWORD1">\models</SEQ>
-			<SEQ TYPE="KEYWORD1">\matrix</SEQ>
-			<SEQ TYPE="KEYWORD1">\mathop</SEQ>
-			<SEQ TYPE="KEYWORD1">\mapsto</SEQ>
-			<SEQ TYPE="KEYWORD1">\limsup</SEQ>
-			<SEQ TYPE="KEYWORD1">\limits</SEQ>
-			<SEQ TYPE="KEYWORD1">\liminf</SEQ>
-			<SEQ TYPE="KEYWORD1">\lgroup</SEQ>
-			<SEQ TYPE="KEYWORD2">\lfhook</SEQ>
-			<SEQ TYPE="KEYWORD1">\lfloor</SEQ>
-			<SEQ TYPE="KEYWORD1">\lccode</SEQ>
-			<SEQ TYPE="KEYWORD1">\lbrack</SEQ>
-			<SEQ TYPE="KEYWORD1">\lbrace</SEQ>
-			<SEQ TYPE="KEYWORD1">\langle</SEQ>
-			<SEQ TYPE="KEYWORD1">\Lambda</SEQ>
-			<SEQ TYPE="KEYWORD1">\lambda</SEQ>
-			<SEQ TYPE="KEYWORD1">\insert</SEQ>
-			<SEQ TYPE="KEYWORD1">\indent</SEQ>
-			<SEQ TYPE="KEYWORD3">\ifvoid</SEQ>
-			<SEQ TYPE="KEYWORD3">\ifvbox</SEQ>
-			<SEQ TYPE="KEYWORD3">\iftrue</SEQ>
-			<SEQ TYPE="KEYWORD3">\ifhbox</SEQ>
-			<SEQ TYPE="KEYWORD3">\ifcase</SEQ>
-			<SEQ TYPE="KEYWORD1">\ialign</SEQ>
-			<SEQ TYPE="KEYWORD1">\halign</SEQ>
-			<SEQ TYPE="FUNCTION">\global</SEQ>
-			<SEQ TYPE="KEYWORD1">\forall</SEQ>
-			<SEQ TYPE="KEYWORD1">\fivesy</SEQ>
-			<SEQ TYPE="KEYWORD1">\fiverm</SEQ>
-			<SEQ TYPE="KEYWORD1">\fivebf</SEQ>
-			<SEQ TYPE="KEYWORD1">\exists</SEQ>
-			<SEQ TYPE="KEYWORD1">\enskip</SEQ>
-			<SEQ TYPE="KEYWORD1">\egroup</SEQ>
-			<SEQ TYPE="KEYWORD1">\divide</SEQ>
-			<SEQ TYPE="KEYWORD1">\dagger</SEQ>
-			<SEQ TYPE="FUNCTION">\csname</SEQ>
-			<SEQ TYPE="KEYWORD2">\cprime</SEQ>
-			<SEQ TYPE="KEYWORD1">\coprod</SEQ>
-			<SEQ TYPE="KEYWORD1">\choose</SEQ>
-			<SEQ TYPE="KEYWORD2">\cfudot</SEQ>
-			<SEQ TYPE="KEYWORD2">\candra</SEQ>
-			<SEQ TYPE="KEYWORD1">\bullet</SEQ>
-			<SEQ TYPE="KEYWORD1">\bowtie</SEQ>
-			<SEQ TYPE="KEYWORD1">\bigvee</SEQ>
-			<SEQ TYPE="KEYWORD1">\bigcup</SEQ>
-			<SEQ TYPE="KEYWORD1">\bigcap</SEQ>
-			<SEQ TYPE="KEYWORD1">\bgroup</SEQ>
-			<SEQ TYPE="KEYWORD1">\arctan</SEQ>
-			<SEQ TYPE="KEYWORD1">\arcsin</SEQ>
-			<SEQ TYPE="KEYWORD1">\arccos</SEQ>
-			<SEQ TYPE="KEYWORD1">\approx</SEQ>
-			<SEQ TYPE="KEYWORD2">\acudot</SEQ>
-			<SEQ TYPE="KEYWORD1">\active</SEQ>
-			<SEQ TYPE="KEYWORD1">\accent</SEQ>
-
-			<!-- Length Six Register Reference -->
-			<SEQ_REGEXP HASH_CHARS="\" TYPE="COMMENT4"
-					>\\dimen[0-9]</SEQ_REGEXP>
-
-			<!-- Length Six Register Reference -->
-			<SEQ_REGEXP HASH_CHARS="\" TYPE="COMMENT4"
-					>\\count[0-9]</SEQ_REGEXP>
-
-			<!-- Length Six Register Reference -->
-			<SEQ_REGEXP HASH_CHARS="\" TYPE="COMMENT4"
-					>\\toks[0-9][0-9]</SEQ_REGEXP>
-
-			<!-- Length Six Register Reference -->
-			<SEQ_REGEXP HASH_CHARS="\" TYPE="COMMENT4"
-					>\\skip[0-9][0-9]</SEQ_REGEXP>
-
-			<!-- Length Six Register Reference -->
-			<SEQ_REGEXP HASH_CHARS="\" TYPE="COMMENT4"
-					>\\box([0-1][0-9][0-9]|2([0-4][0-9]|5[0-5]))</SEQ_REGEXP>
-
-			<!-- Length Six Decimal Character Reference -->
-			<SEQ_REGEXP HASH_CHARS="\" TYPE="KEYWORD2"
-					>\\char[0-9][0-9]</SEQ_REGEXP>
-
-			<!-- Length Six Octal Character Reference -->
-			<SEQ_REGEXP HASH_CHARS="\" TYPE="KEYWORD2">\\char'[0-7]</SEQ_REGEXP>
-
-			<!-- Length Six Hexadecimal Character Reference -->
-			<SEQ_REGEXP HASH_CHARS="\" TYPE="KEYWORD2"
-					>\\char"[0-9A-Fa-f]</SEQ_REGEXP>
-
-			<!-- Arbitrary control sequence of the specified length -->
-			<SEQ_REGEXP HASH_CHARS="\" TYPE="LABEL">\\[a-zA-Z@]{6}</SEQ_REGEXP>
-
-		<!-- Five letter control sequences -->
-
-			<SEQ TYPE="KEYWORD1">\write</SEQ>
-			<SEQ TYPE="KEYWORD1">\wedge</SEQ>
-			<SEQ TYPE="KEYWORD1">\vskip</SEQ>
-			<SEQ TYPE="KEYWORD4">\vsize</SEQ>
-			<SEQ TYPE="KEYWORD1">\vrule</SEQ>
-			<SEQ TYPE="KEYWORD1">\vglue</SEQ>
-			<SEQ TYPE="KEYWORD4">\vfuzz</SEQ>
-			<SEQ TYPE="KEYWORD1">\vfill</SEQ>
-			<SEQ TYPE="KEYWORD1">\vdots</SEQ>
-			<SEQ TYPE="KEYWORD1">\vdash</SEQ>
-			<SEQ TYPE="KEYWORD1">\varpi</SEQ>
-			<SEQ TYPE="KEYWORD1">\uplus</SEQ>
-			<SEQ TYPE="KEYWORD1">\ttfam</SEQ>
-			<SEQ TYPE="KEYWORD1">\times</SEQ>
-			<SEQ TYPE="KEYWORD1">\tilde</SEQ>
-			<SEQ TYPE="KEYWORD1">\Theta</SEQ>
-			<SEQ TYPE="KEYWORD1">\theta</SEQ>
-			<SEQ TYPE="KEYWORD1">\tentt</SEQ>
-			<SEQ TYPE="KEYWORD1">\tensy</SEQ>
-			<SEQ TYPE="KEYWORD1">\tensl</SEQ>
-			<SEQ TYPE="KEYWORD1">\tenrm</SEQ>
-			<SEQ TYPE="KEYWORD1">\tenit</SEQ>
-			<SEQ TYPE="KEYWORD1">\tenex</SEQ>
-			<SEQ TYPE="KEYWORD1">\tenbf</SEQ>
-			<SEQ TYPE="KEYWORD1">\strut</SEQ>
-			<SEQ TYPE="KEYWORD1">\sqcup</SEQ>
-			<SEQ TYPE="KEYWORD1">\sqcap</SEQ>
-			<SEQ TYPE="KEYWORD1">\space</SEQ>
-			<SEQ TYPE="KEYWORD1">\smile</SEQ>
-			<SEQ TYPE="KEYWORD1">\smash</SEQ>
-			<SEQ TYPE="KEYWORD1">\slfam</SEQ>
-			<SEQ TYPE="KEYWORD1">\slash</SEQ>
-			<SEQ TYPE="KEYWORD1">\simeq</SEQ>
-			<SEQ TYPE="KEYWORD1">\Sigma</SEQ>
-			<SEQ TYPE="KEYWORD1">\sigma</SEQ>
-			<SEQ TYPE="KEYWORD1">\sharp</SEQ>
-			<SEQ TYPE="KEYWORD1">\right</SEQ>
-			<SEQ TYPE="KEYWORD1">\rhook</SEQ>
-			<SEQ TYPE="KEYWORD1">\relax</SEQ>
-			<SEQ TYPE="KEYWORD1">\rceil</SEQ>
-			<SEQ TYPE="KEYWORD1">\raise</SEQ>
-			<SEQ TYPE="KEYWORD1">\qquad</SEQ>
-			<SEQ TYPE="KEYWORD1">\prime</SEQ>
-			<SEQ TYPE="FUNCTION">\outer</SEQ>
-			<SEQ TYPE="KEYWORD1">\oplus</SEQ>
-			<SEQ TYPE="KEYWORD1">\Omega</SEQ>
-			<SEQ TYPE="KEYWORD1">\omega</SEQ>
-			<SEQ TYPE="KEYWORD1">\notin</SEQ>
-			<SEQ TYPE="COMMENT2">\newif</SEQ>
-			<SEQ TYPE="KEYWORD1">\nabla</SEQ>
-			<SEQ TYPE="KEYWORD1">\mskip</SEQ>
-			<SEQ TYPE="KEYWORD4">\month</SEQ>
-			<SEQ TYPE="KEYWORD1">\mkern</SEQ>
-			<SEQ TYPE="KEYWORD1">\lower</SEQ>
-			<SEQ TYPE="KEYWORD1">\lhook</SEQ>
-			<SEQ TYPE="KEYWORD1">\leqno</SEQ>
-			<SEQ TYPE="KEYWORD1">\ldots</SEQ>
-			<SEQ TYPE="KEYWORD1">\ldotp</SEQ>
-			<SEQ TYPE="KEYWORD1">\lceil</SEQ>
-			<SEQ TYPE="KEYWORD1">\kappa</SEQ>
-			<SEQ TYPE="KEYWORD1">\jmath</SEQ>
-			<SEQ TYPE="KEYWORD1">\itfam</SEQ>
-			<SEQ TYPE="KEYWORD1">\intop</SEQ>
-			<SEQ TYPE="KEYWORD1">\input</SEQ>
-			<SEQ TYPE="KEYWORD1">\infty</SEQ>
-			<SEQ TYPE="KEYWORD1">\imath</SEQ>
-			<SEQ TYPE="KEYWORD3">\ifodd</SEQ>
-			<SEQ TYPE="KEYWORD3">\ifnum</SEQ>
-			<SEQ TYPE="KEYWORD3">\ifeof</SEQ>
-			<SEQ TYPE="KEYWORD3">\ifdim</SEQ>
-			<SEQ TYPE="KEYWORD3">\ifcat</SEQ>
-			<SEQ TYPE="KEYWORD1">\hskip</SEQ>
-			<SEQ TYPE="KEYWORD4">\hsize</SEQ>
-			<SEQ TYPE="KEYWORD1">\hrule</SEQ>
-			<SEQ TYPE="KEYWORD1">\hglue</SEQ>
-			<SEQ TYPE="KEYWORD4">\hfuzz</SEQ>
-			<SEQ TYPE="KEYWORD1">\hfill</SEQ>
-			<SEQ TYPE="KEYWORD1">\grave</SEQ>
-			<SEQ TYPE="KEYWORD1">\Gamma</SEQ>
-			<SEQ TYPE="KEYWORD1">\gamma</SEQ>
-			<SEQ TYPE="KEYWORD1">\frown</SEQ>
-			<SEQ TYPE="KEYWORD1">\folio</SEQ>
-			<SEQ TYPE="KEYWORD1">\fivei</SEQ>
-			<SEQ TYPE="KEYWORD1">\equiv</SEQ>
-			<SEQ TYPE="KEYWORD1">\empty</SEQ>
-			<SEQ TYPE="KEYWORD1">\eject</SEQ>
-			<SEQ TYPE="KEYWORD1">\doteq</SEQ>
-			<SEQ TYPE="COMMENT4">\dimen</SEQ>
-			<SEQ TYPE="KEYWORD1">\Delta</SEQ>
-			<SEQ TYPE="KEYWORD1">\delta</SEQ>
-			<SEQ TYPE="KEYWORD1">\ddots</SEQ>
-			<SEQ TYPE="KEYWORD1">\dashv</SEQ>
-			<SEQ TYPE="COMMENT4">\count</SEQ>
-			<SEQ TYPE="KEYWORD1">\colon</SEQ>
-			<SEQ TYPE="KEYWORD1">\check</SEQ>
-			<SEQ TYPE="KEYWORD1">\cdots</SEQ>
-			<SEQ TYPE="KEYWORD1">\cdotp</SEQ>
-			<SEQ TYPE="KEYWORD1">\cases</SEQ>
-			<SEQ TYPE="KEYWORD1">\breve</SEQ>
-			<SEQ TYPE="KEYWORD1">\break</SEQ>
-			<SEQ TYPE="KEYWORD1">\brack</SEQ>
-			<SEQ TYPE="KEYWORD1">\brace</SEQ>
-			<SEQ TYPE="KEYWORD1">\Biggr</SEQ>
-			<SEQ TYPE="KEYWORD1">\biggr</SEQ>
-			<SEQ TYPE="KEYWORD1">\Biggm</SEQ>
-			<SEQ TYPE="KEYWORD1">\biggm</SEQ>
-			<SEQ TYPE="KEYWORD1">\Biggl</SEQ>
-			<SEQ TYPE="KEYWORD1">\biggl</SEQ>
-			<SEQ TYPE="KEYWORD1">\bffam</SEQ>
-			<SEQ TYPE="KEYWORD1">\asymp</SEQ>
-			<SEQ TYPE="KEYWORD1">\angle</SEQ>
-			<SEQ TYPE="KEYWORD1">\amalg</SEQ>
-			<SEQ TYPE="KEYWORD1">\alpha</SEQ>
-			<SEQ TYPE="KEYWORD1">\aleph</SEQ>
-			<SEQ TYPE="KEYWORD1">\acute</SEQ>
-			<SEQ TYPE="KEYWORD1">\above</SEQ>
-
-			<!-- Length Five Register Reference -->
-			<SEQ_REGEXP HASH_CHARS="\" TYPE="COMMENT4">\\toks[0-9]</SEQ_REGEXP>
-
-			<!-- Length Five Register Reference -->
-			<SEQ_REGEXP HASH_CHARS="\" TYPE="COMMENT4">\\skip[0-9]</SEQ_REGEXP>
-
-			<!-- Length Five Register Reference -->
-			<SEQ_REGEXP HASH_CHARS="\" TYPE="COMMENT4"
-					>\\box[0-9][0-9]</SEQ_REGEXP>
-
-			<!-- Length Five Decimal Character Reference -->
-			<SEQ_REGEXP HASH_CHARS="\" TYPE="KEYWORD2">\\char[0-9]</SEQ_REGEXP>
-
-			<!-- Length Five Octal Character Reference -->
-			<SEQ TYPE="KEYWORD2">\char'</SEQ>
-
-			<!-- Length Five Hexadecimal Character Reference -->
-			<SEQ TYPE="KEYWORD2">\char"</SEQ>
-
-			<!-- Arbitrary control sequence of the specified length -->
-			<SEQ_REGEXP HASH_CHARS="\" TYPE="LABEL">\\[a-zA-Z@]{5}</SEQ_REGEXP>
-
-		<!-- Four letter control sequences -->
-			<SEQ TYPE="KEYWORD1">\zeta</SEQ>
-			<SEQ TYPE="KEYWORD4">\year</SEQ>
-			<SEQ TYPE="FUNCTION">\xdef</SEQ>
-			<SEQ TYPE="KEYWORD1">\wlog</SEQ>
-			<SEQ TYPE="KEYWORD1">\vtop</SEQ>
-			<SEQ TYPE="KEYWORD1">\vfil</SEQ>
-			<SEQ TYPE="KEYWORD1">\vert</SEQ>
-			<SEQ TYPE="KEYWORD1">\Vert</SEQ>
-			<SEQ TYPE="KEYWORD1">\vbox</SEQ>
-			<SEQ TYPE="KEYWORD2">\uarc</SEQ>
-			<SEQ TYPE="KEYWORD4">\toks</SEQ>
-			<SEQ TYPE="KEYWORD4">\time</SEQ>
-			<SEQ TYPE="KEYWORD1">\teni</SEQ>
-			<SEQ TYPE="KEYWORD1">\tanh</SEQ>
-			<SEQ TYPE="KEYWORD1">\tabs</SEQ>
-			<SEQ TYPE="KEYWORD1">\surd</SEQ>
-			<SEQ TYPE="KEYWORD1">\succ</SEQ>
-			<SEQ TYPE="KEYWORD1">\star</SEQ>
-			<SEQ TYPE="KEYWORD1">\sqrt</SEQ>
-			<SEQ TYPE="KEYWORD1">\span</SEQ>
-			<SEQ TYPE="KEYWORD4">\skip</SEQ>
-			<SEQ TYPE="KEYWORD1">\skew</SEQ>
-			<SEQ TYPE="KEYWORD1">\sinh</SEQ>
-			<SEQ TYPE="KEYWORD1">\show</SEQ>
-			<SEQ TYPE="KEYWORD1">\root</SEQ>
-			<SEQ TYPE="KEYWORD1">\rlap</SEQ>
-			<SEQ TYPE="KEYWORD1">\read</SEQ>
-			<SEQ TYPE="KEYWORD1">\quad</SEQ>
-			<SEQ TYPE="KEYWORD1">\prod</SEQ>
-			<SEQ TYPE="KEYWORD1">\prec</SEQ>
-			<SEQ TYPE="KEYWORD1">\pmod</SEQ>
-			<SEQ TYPE="KEYWORD1">\perp</SEQ>
-			<SEQ TYPE="KEYWORD1">\owns</SEQ>
-			<SEQ TYPE="KEYWORD1">\over</SEQ>
-			<SEQ TYPE="KEYWORD1">\omit</SEQ>
-			<SEQ TYPE="KEYWORD1">\oint</SEQ>
-			<SEQ TYPE="KEYWORD1">\odot</SEQ>
-			<SEQ TYPE="KEYWORD1">\null</SEQ>
-			<SEQ TYPE="KEYWORD1">\next</SEQ>
-			<SEQ TYPE="KEYWORD1">\mark</SEQ>
-			<SEQ TYPE="KEYWORD1">\loop</SEQ>
-			<SEQ TYPE="FUNCTION">\long</SEQ>
-			<SEQ TYPE="KEYWORD1">\lnot</SEQ>
-			<SEQ TYPE="KEYWORD1">\llap</SEQ>
-			<SEQ TYPE="KEYWORD1">\line</SEQ>
-			<SEQ TYPE="KEYWORD1">\left</SEQ>
-			<SEQ TYPE="KEYWORD1">\land</SEQ>
-			<SEQ TYPE="KEYWORD1">\kern</SEQ>
-			<SEQ TYPE="KEYWORD1">\item</SEQ>
-			<SEQ TYPE="KEYWORD1">\iota</SEQ>
-			<SEQ TYPE="KEYWORD1">\hfil</SEQ>
-			<SEQ TYPE="KEYWORD1">\hbox</SEQ>
-			<SEQ TYPE="KEYWORD1">\hbar</SEQ>
-			<SEQ TYPE="KEYWORD1">\hang</SEQ>
-			<SEQ TYPE="KEYWORD1">\gets</SEQ>
-			<SEQ TYPE="FUNCTION">\gdef</SEQ>
-			<SEQ TYPE="KEYWORD1">\font</SEQ>
-			<SEQ TYPE="KEYWORD1">\flat</SEQ>
-			<SEQ TYPE="KEYWORD1">\eqno</SEQ>
-			<SEQ TYPE="KEYWORD3">\else</SEQ>
-			<SEQ TYPE="FUNCTION">\edef</SEQ>
-			<SEQ TYPE="KEYWORD1">\dump</SEQ>
-			<SEQ TYPE="KEYWORD1">\dots</SEQ>
-			<SEQ TYPE="KEYWORD1">\ddot</SEQ>
-			<SEQ TYPE="KEYWORD1">\ddag</SEQ>
-			<SEQ TYPE="KEYWORD2">\dbar</SEQ>
-			<SEQ TYPE="KEYWORD2">\Dbar</SEQ>
-			<SEQ TYPE="KEYWORD1">\crcr</SEQ>
-			<SEQ TYPE="KEYWORD1">\coth</SEQ>
-			<SEQ TYPE="KEYWORD1">\cosh</SEQ>
-			<SEQ TYPE="KEYWORD1">\copy</SEQ>
-			<SEQ TYPE="KEYWORD1">\cong</SEQ>
-			<SEQ TYPE="KEYWORD1">\circ</SEQ>
-			<SEQ TYPE="KEYWORD2">\char</SEQ>
-			<SEQ TYPE="KEYWORD2">\cfac</SEQ>
-			<SEQ TYPE="KEYWORD1">\cdot</SEQ>
-			<SEQ TYPE="KEYWORD1">\body</SEQ>
-			<SEQ TYPE="KEYWORD1">\bmod</SEQ>
-			<SEQ TYPE="KEYWORD1">\Bigr</SEQ>
-			<SEQ TYPE="KEYWORD1">\bigr</SEQ>
-			<SEQ TYPE="KEYWORD1">\Bigm</SEQ>
-			<SEQ TYPE="KEYWORD1">\bigm</SEQ>
-			<SEQ TYPE="KEYWORD1">\Bigl</SEQ>
-			<SEQ TYPE="KEYWORD1">\bigl</SEQ>
-			<SEQ TYPE="KEYWORD1">\Bigg</SEQ>
-			<SEQ TYPE="KEYWORD1">\bigg</SEQ>
-			<SEQ TYPE="KEYWORD1">\beta</SEQ>
-			<SEQ TYPE="KEYWORD1">\atop</SEQ>
-
-			<!-- Length Four Register Reference -->
-			<SEQ_REGEXP HASH_CHARS="\" TYPE="COMMENT4">\\box[0-9]</SEQ_REGEXP>
-
-			<!-- Length Four Character Reference -->
-			<SEQ TYPE="KEYWORD2">\char</SEQ>
-
-			<!-- Length Four Hexadecimal Invisible Reference -->
-			<SEQ_REGEXP HASH_CHARS="^" TYPE="KEYWORD2"
-					>(\u005E|\x5E)(\u005E|\x5E)([0-9a-f])([0-9a-f])</SEQ_REGEXP>
-
-			<!-- Arbitrary control sequence of the specified length -->
-			<SEQ_REGEXP HASH_CHARS="\" TYPE="LABEL">\\[a-zA-Z@]{4}</SEQ_REGEXP>
-
-		<!-- Three letter control sequences -->
-
-			<SEQ TYPE="KEYWORD1">\vss</SEQ>
-			<SEQ TYPE="KEYWORD1">\vee</SEQ>
-			<SEQ TYPE="KEYWORD1">\vec</SEQ>
-			<SEQ TYPE="KEYWORD1">\top</SEQ>
-			<SEQ TYPE="KEYWORD1">\the</SEQ>
-			<SEQ TYPE="KEYWORD1">\TeX</SEQ>
-			<SEQ TYPE="KEYWORD1">\tau</SEQ>
-			<SEQ TYPE="KEYWORD1">\tan</SEQ>
-			<SEQ TYPE="KEYWORD1">\sup</SEQ>
-			<SEQ TYPE="KEYWORD1">\sum</SEQ>
-			<SEQ TYPE="KEYWORD1">\sin</SEQ>
-			<SEQ TYPE="KEYWORD1">\sim</SEQ>
-			<SEQ TYPE="KEYWORD1">\sec</SEQ>
-			<SEQ TYPE="KEYWORD1">\rho</SEQ>
-			<SEQ TYPE="KEYWORD1">\Psi</SEQ>
-			<SEQ TYPE="KEYWORD1">\psi</SEQ>
-			<SEQ TYPE="KEYWORD1">\Phi</SEQ>
-			<SEQ TYPE="KEYWORD1">\phi</SEQ>
-			<SEQ TYPE="LITERAL3">\par</SEQ>
-			<SEQ TYPE="KEYWORD1">\not</SEQ>
-			<SEQ TYPE="KEYWORD1">\neq</SEQ>
-			<SEQ TYPE="KEYWORD1">\neg</SEQ>
-			<SEQ TYPE="KEYWORD1">\mit</SEQ>
-			<SEQ TYPE="KEYWORD1">\min</SEQ>
-			<SEQ TYPE="KEYWORD1">\mid</SEQ>
-			<SEQ TYPE="KEYWORD1">\max</SEQ>
-			<SEQ TYPE="KEYWORD4">\mag</SEQ>
-			<SEQ TYPE="KEYWORD1">\lor</SEQ>
-			<SEQ TYPE="KEYWORD1">\log</SEQ>
-			<SEQ TYPE="KEYWORD1">\lim</SEQ>
-			<SEQ TYPE="COMMENT3">\let</SEQ>
-			<SEQ TYPE="KEYWORD1">\leq</SEQ>
-			<SEQ TYPE="KEYWORD1">\ker</SEQ>
-			<SEQ TYPE="KEYWORD1">\jot</SEQ>
-			<SEQ TYPE="KEYWORD1">\int</SEQ>
-			<SEQ TYPE="KEYWORD1">\inf</SEQ>
-			<SEQ TYPE="KEYWORD3">\ifx</SEQ>
-			<SEQ TYPE="KEYWORD3">\iff</SEQ>
-			<SEQ TYPE="KEYWORD1">\hss</SEQ>
-			<SEQ TYPE="KEYWORD1">\hom</SEQ>
-			<SEQ TYPE="KEYWORD1">\hat</SEQ>
-			<SEQ TYPE="KEYWORD1">\geq</SEQ>
-			<SEQ TYPE="KEYWORD1">\gcd</SEQ>
-			<SEQ TYPE="KEYWORD4">\fam</SEQ>
-			<SEQ TYPE="KEYWORD1">\exp</SEQ>
-			<SEQ TYPE="KEYWORD2">\eth</SEQ>
-			<SEQ TYPE="KEYWORD1">\eta</SEQ>
-			<SEQ TYPE="KEYWORD1">\end</SEQ>
-			<SEQ TYPE="KEYWORD1">\ell</SEQ>
-			<SEQ TYPE="KEYWORD1">\dot</SEQ>
-			<SEQ TYPE="KEYWORD1">\div</SEQ>
-			<SEQ TYPE="KEYWORD1">\dim</SEQ>
-			<SEQ TYPE="KEYWORD1">\det</SEQ>
-			<SEQ TYPE="KEYWORD1">\deg</SEQ>
-			<SEQ TYPE="FUNCTION">\def</SEQ>
-			<SEQ TYPE="KEYWORD4">\day</SEQ>
-			<SEQ TYPE="KEYWORD1">\dag</SEQ>
-			<SEQ TYPE="KEYWORD1">\cup</SEQ>
-			<SEQ TYPE="KEYWORD1">\csc</SEQ>
-			<SEQ TYPE="KEYWORD1">\cot</SEQ>
-			<SEQ TYPE="KEYWORD1">\cos</SEQ>
-			<SEQ TYPE="KEYWORD1">\chi</SEQ>
-			<SEQ TYPE="KEYWORD1">\cap</SEQ>
-			<SEQ TYPE="KEYWORD1">\cal</SEQ>
-			<SEQ TYPE="KEYWORD1">\bye</SEQ>
-			<SEQ TYPE="COMMENT4">\box</SEQ>
-			<SEQ TYPE="KEYWORD1">\bot</SEQ>
-			<SEQ TYPE="KEYWORD1">\Big</SEQ>
-			<SEQ TYPE="KEYWORD1">\big</SEQ>
-			<SEQ TYPE="KEYWORD1">\bar</SEQ>
-			<SEQ TYPE="KEYWORD1">\ast</SEQ>
-			<SEQ TYPE="KEYWORD1">\arg</SEQ>
-
-			<!-- Length Three Invisible Character Reference -->
-			<SEQ_REGEXP HASH_CHARS="^" TYPE="KEYWORD2"
-				>(\u005E|\x5E)(\u005E|\x5E)(\p{ASCII}|\u0000-\u007F)</SEQ_REGEXP>
-
-			<!-- Arbitrary control sequence of the specified length -->
-			<SEQ_REGEXP HASH_CHARS="\" TYPE="LABEL">\\[a-zA-Z@]{3}</SEQ_REGEXP>
-
-		<!-- Two letter control sequences -->
-
-			<SEQ TYPE="KEYWORD1">\Xi</SEQ>
-			<SEQ TYPE="KEYWORD1">\xi</SEQ>
-			<SEQ TYPE="KEYWORD1">\wr</SEQ>
-			<SEQ TYPE="KEYWORD1">\wp</SEQ>
-			<SEQ TYPE="KEYWORD1">\wd</SEQ>
-			<SEQ TYPE="KEYWORD1">\tt</SEQ>
-			<SEQ TYPE="KEYWORD1">\to</SEQ>
-			<SEQ TYPE="KEYWORD1">\sp</SEQ>
-			<SEQ TYPE="KEYWORD1">\sl</SEQ>
-			<SEQ TYPE="KEYWORD1">\sb</SEQ>
-			<SEQ TYPE="KEYWORD1">\rq</SEQ>
-			<SEQ TYPE="KEYWORD1">\rm</SEQ>
-			<SEQ TYPE="KEYWORD1">\Re</SEQ>
-			<SEQ TYPE="KEYWORD1">\Pr</SEQ>
-			<SEQ TYPE="KEYWORD1">\pm</SEQ>
-			<SEQ TYPE="KEYWORD1">\Pi</SEQ>
-			<SEQ TYPE="KEYWORD1">\pi</SEQ>
-			<SEQ TYPE="KEYWORD3">\or</SEQ>
-			<SEQ TYPE="KEYWORD1">\of</SEQ>
-			<SEQ TYPE="KEYWORD1">\nu</SEQ>
-			<SEQ TYPE="KEYWORD1">\ni</SEQ>
-			<SEQ TYPE="KEYWORD1">\ne</SEQ>
-			<SEQ TYPE="KEYWORD1">\mu</SEQ>
-			<SEQ TYPE="KEYWORD1">\mp</SEQ>
-			<SEQ TYPE="KEYWORD1">\lq</SEQ>
-			<SEQ TYPE="KEYWORD1">\ln</SEQ>
-			<SEQ TYPE="KEYWORD1">\ll</SEQ>
-			<SEQ TYPE="KEYWORD1">\lg</SEQ>
-			<SEQ TYPE="KEYWORD1">\le</SEQ>
-			<SEQ TYPE="KEYWORD1">\it</SEQ>
-			<SEQ TYPE="KEYWORD1">\in</SEQ>
-			<SEQ TYPE="KEYWORD1">\Im</SEQ>
-			<SEQ TYPE="KEYWORD3">\if</SEQ>
-			<SEQ TYPE="KEYWORD1">\ht</SEQ>
-			<SEQ TYPE="KEYWORD1">\gg</SEQ>
-			<SEQ TYPE="KEYWORD1">\ge</SEQ>
-			<SEQ TYPE="KEYWORD3">\fi</SEQ>
-			<SEQ TYPE="KEYWORD1">\dp</SEQ>
-			<SEQ TYPE="KEYWORD1">\do</SEQ>
-			<SEQ TYPE="KEYWORD1">\cr</SEQ>
-			<SEQ TYPE="KEYWORD1">\bf</SEQ>
-
-			<!-- Accents and Special Characters -->
-			<SEQ TYPE="KEYWORD2">\AE</SEQ>
-			<SEQ TYPE="KEYWORD2">\ae</SEQ>
-			<SEQ TYPE="KEYWORD2">\AA</SEQ>
-			<SEQ TYPE="KEYWORD2">\aa</SEQ>
-			<SEQ TYPE="KEYWORD2">\OE</SEQ>
-			<SEQ TYPE="KEYWORD2">\oe</SEQ>
-			<SEQ TYPE="KEYWORD2">\ss</SEQ>
-
-			<!-- Arbitrary control sequence of the specified length -->
-			<SEQ_REGEXP HASH_CHARS="\" TYPE="LABEL">\\[a-zA-Z@]{2}</SEQ_REGEXP>
-
-		<!-- One letter control sequences -->
-
-			<SEQ TYPE="KEYWORD1">\S</SEQ>
-			<SEQ TYPE="KEYWORD1">\P</SEQ>
-
-			<!-- Accents and Special Characters -->
-			<SEQ TYPE="KEYWORD2">\=</SEQ>
-			<SEQ TYPE="KEYWORD2">\'</SEQ>
-			<SEQ TYPE="KEYWORD2">\"</SEQ>
-			<SEQ TYPE="KEYWORD2">\~</SEQ>
-			<SEQ TYPE="KEYWORD2">\`</SEQ>
-			<SEQ TYPE="KEYWORD2">\^</SEQ>
-			<SEQ TYPE="KEYWORD2">\.</SEQ>
-			<SEQ TYPE="KEYWORD2">\H</SEQ>
-			<SEQ TYPE="KEYWORD2">\c</SEQ>
-			<SEQ TYPE="KEYWORD2">\d</SEQ>
-			<SEQ TYPE="KEYWORD2">\b</SEQ>
-			<SEQ TYPE="KEYWORD2">\v</SEQ>
-			<SEQ TYPE="KEYWORD2">\u</SEQ>
-			<SEQ TYPE="KEYWORD2">\t</SEQ>
-			<SEQ TYPE="KEYWORD2">\r</SEQ>
-			<SEQ TYPE="KEYWORD2">\k</SEQ>
-			<SEQ TYPE="KEYWORD2">\O</SEQ>
-			<SEQ TYPE="KEYWORD2">\o</SEQ>
-			<SEQ TYPE="KEYWORD2">\L</SEQ>
-			<SEQ TYPE="KEYWORD2">\l</SEQ>
-			<SEQ TYPE="KEYWORD2">\j</SEQ>
-			<SEQ TYPE="KEYWORD2">\i</SEQ>
-			<SEQ TYPE="KEYWORD1">\?</SEQ>
-			<SEQ TYPE="KEYWORD1">\&gt;</SEQ>
-			<SEQ TYPE="KEYWORD1">\&lt;</SEQ>
-			<SEQ TYPE="KEYWORD1">\;</SEQ>
-			<SEQ TYPE="KEYWORD1">\:</SEQ>
-			<SEQ TYPE="KEYWORD1">\/</SEQ>
-			<SEQ TYPE="KEYWORD1">\-</SEQ>
-			<SEQ TYPE="KEYWORD1">\,</SEQ>
-			<SEQ TYPE="KEYWORD1">\+</SEQ>
-			<SEQ TYPE="KEYWORD1">\*</SEQ>
-			<SEQ TYPE="KEYWORD1">\)</SEQ>
-			<SEQ TYPE="KEYWORD1">\(</SEQ>
-			<SEQ TYPE="KEYWORD1">\!</SEQ>
-			<SEQ TYPE="KEYWORD1">\|</SEQ>
-			<SEQ TYPE="KEYWORD1">\\</SEQ>
-
-			<!-- Reserved Characters -->
-			<SEQ TYPE="KEYWORD2">\#</SEQ>
-			<SEQ TYPE="KEYWORD2">\$</SEQ>
-			<SEQ TYPE="KEYWORD2">\%</SEQ>
-			<SEQ TYPE="KEYWORD2">\&amp;</SEQ>
-			<SEQ TYPE="KEYWORD2">\{</SEQ>
-			<SEQ TYPE="KEYWORD2">\}</SEQ>
-			<SEQ TYPE="KEYWORD2">\_</SEQ>
-
-			<!-- Length One ASCII Index -->
-			<SEQ_REGEXP HASH_CHARS="`" TYPE="KEYWORD2">`\p{ASCII}</SEQ_REGEXP>
-
-			<!-- Definition Arguments -->
-			<SEQ_REGEXP HASH_CHARS="#" TYPE="DIGIT">#[1-9]</SEQ_REGEXP>
-
-			<!-- Arbitrary control sequence of the specified length -->
-			<SEQ_REGEXP HASH_CHARS="\" TYPE="LABEL">\\[a-zA-Z@]{1}</SEQ_REGEXP>
-
-		<!-- Zero letter control sequences -->
-
-			<!-- Punctuation -->
-			<SEQ TYPE="LITERAL3">`</SEQ>
-			<SEQ TYPE="LITERAL3">!</SEQ>
-			<SEQ TYPE="LITERAL3">.</SEQ>
-			<SEQ TYPE="LITERAL3">,</SEQ>
-			<SEQ TYPE="LITERAL3">;</SEQ>
-			<SEQ TYPE="LITERAL3">?</SEQ>
-			<SEQ TYPE="LITERAL3">:</SEQ>
-			<SEQ TYPE="LITERAL3">'</SEQ>
-			<SEQ TYPE="LITERAL3">"</SEQ>
-			<SEQ TYPE="LITERAL3">\</SEQ>
-
-			<!-- Simple Math Characters -->
-			<SEQ TYPE="LITERAL4">(</SEQ>
-			<SEQ TYPE="LITERAL4">)</SEQ>
-			<SEQ TYPE="LITERAL4">=</SEQ>
-			<SEQ TYPE="LITERAL4">+</SEQ>
-			<SEQ TYPE="LITERAL4">-</SEQ>
-			<SEQ TYPE="LITERAL4">&gt;</SEQ>
-			<SEQ TYPE="LITERAL4">&lt;</SEQ>
-
-			<!-- Grouping Brackets -->
-			<SEQ TYPE="OPERATOR">{</SEQ>
-			<SEQ TYPE="OPERATOR">}</SEQ>
-			<SEQ TYPE="OPERATOR">[</SEQ>
-			<SEQ TYPE="OPERATOR">]</SEQ>
-
-			<!-- Reserved Characters -->
-			<SEQ TYPE="LITERAL1">&amp;</SEQ>
-			<SEQ TYPE="LITERAL1">^</SEQ>
-			<SEQ TYPE="LITERAL1">_</SEQ>
-			<SEQ TYPE="LITERAL1">~</SEQ>
-
-			<!-- Dimensions -->
-			<SEQ_REGEXP HASH_CHARS="0123456789." TYPE="LITERAL2"
-					>(\d+?\.\d*pt|\d*\.\d+?pt|\d*pt)</SEQ_REGEXP>
-			<SEQ_REGEXP HASH_CHARS="0123456789." TYPE="LITERAL2"
-					>(\d+?\.\d*pc|\d*\.\d+?pc|\d*pc)</SEQ_REGEXP>
-			<SEQ_REGEXP HASH_CHARS="0123456789." TYPE="LITERAL2"
-					>(\d+?\.\d*in|\d*\.\d+?in|\d*in)</SEQ_REGEXP>
-			<SEQ_REGEXP HASH_CHARS="0123456789." TYPE="LITERAL2"
-					>(\d+?\.\d*bp|\d*\.\d+?bp|\d*bp)</SEQ_REGEXP>
-			<SEQ_REGEXP HASH_CHARS="0123456789." TYPE="LITERAL2"
-					>(\d+?\.\d*cm|\d*\.\d+?cm|\d*cm)</SEQ_REGEXP>
-			<SEQ_REGEXP HASH_CHARS="0123456789." TYPE="LITERAL2"
-					>(\d+?\.\d*mm|\d*\.\d+?mm|\d*mm)</SEQ_REGEXP>
-			<SEQ_REGEXP HASH_CHARS="0123456789." TYPE="LITERAL2"
-					>(\d+?\.\d*dd|\d*\.\d+?dd|\d*dd)</SEQ_REGEXP>
-			<SEQ_REGEXP HASH_CHARS="0123456789." TYPE="LITERAL2"
-					>(\d+?\.\d*cc|\d*\.\d+?cc|\d*cc)</SEQ_REGEXP>
-			<SEQ_REGEXP HASH_CHARS="0123456789." TYPE="LITERAL2"
-					>(\d+?\.\d*sp|\d*\.\d+?sp|\d*sp)</SEQ_REGEXP>
-			<SEQ_REGEXP HASH_CHARS="0123456789." TYPE="LITERAL2"
-					>(\d+?\.\d*ex|\d*\.\d+?ex|\d*ex)</SEQ_REGEXP>
-			<SEQ_REGEXP HASH_CHARS="0123456789." TYPE="LITERAL2"
-					>(\d+?\.\d*em|\d*\.\d+?em|\d*em)</SEQ_REGEXP>
-
-	</RULES>
-
-</MODE>
-
-
-
diff --git a/qpython/src/main/assets/syntax/pop11.xml b/qpython/src/main/assets/syntax/pop11.xml
deleted file mode 100644
index 3a2dd0a2..00000000
--- a/qpython/src/main/assets/syntax/pop11.xml
+++ /dev/null
@@ -1,262 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!-- pop11 mode by David S. Moss -->
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="commentStart" VALUE="/*" />
-		<PROPERTY NAME="commentEnd" VALUE="*/" />
-		<PROPERTY NAME="lineComment" VALUE=";;;" />
-    </PROPS>
-
-	<RULES SET="MAIN" IGNORE_CASE="FALSE" HIGHLIGHT_DIGITS="TRUE">
-		<!-- Normal comments. -->
-		<SPAN TYPE="COMMENT1" DELEGATE="COMMENT">
-			<BEGIN>/*</BEGIN>
-			<END>*/</END>
-		</SPAN>
-
-        <EOL_SPAN TYPE="COMMENT1">;;;</EOL_SPAN>
-
-		<SPAN TYPE="LITERAL1" NO_LINE_BREAK="TRUE" DELEGATE="STRING">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-
-		<SPAN TYPE="LITERAL1" NO_LINE_BREAK="TRUE" DELEGATE="STRING">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-
-        <SPAN TYPE="LITERAL1" NO_LINE_BREAK="TRUE" DELEGATE="STRING">
-			<BEGIN>`</BEGIN>
-			<END>`</END>
-		</SPAN>
-
-        <SPAN TYPE="LITERAL1" DELEGATE="LIST">
-			<BEGIN>[</BEGIN>
-			<END>]</END>
-		</SPAN>
-
-        <SPAN TYPE="LITERAL1" DELEGATE="LIST">
-			<BEGIN>{</BEGIN>
-			<END>}</END>
-		</SPAN>
-
-        <SPAN TYPE="LITERAL1" DELEGATE="LIST">
-			<BEGIN>![</BEGIN>
-			<END>]</END>
-		</SPAN>
-
-        <!-- Functions -->
-		<MARK_PREVIOUS TYPE="FUNCTION" MATCH_TYPE="OPERATOR">(</MARK_PREVIOUS>
-		<SEQ TYPE="OPERATOR">)</SEQ>
-
-		<MARK_PREVIOUS AT_LINE_START="TRUE" TYPE="LABEL" MATCH_TYPE="OPERATOR">:</MARK_PREVIOUS>
-
-        <!-- Needs to be before conditional compilation or won't work -->
-        <SEQ TYPE="NULL">#_&lt;</SEQ>
-        <SEQ TYPE="NULL">&gt;_#</SEQ>
-
-        <!-- Conditional compilation -->
-        <MARK_FOLLOWING AT_LINE_START="TRUE" TYPE="LABEL">#_</MARK_FOLLOWING>
-
-		<SEQ TYPE="NULL">)</SEQ>
-		<SEQ TYPE="NULL">(</SEQ>
-		<SEQ TYPE="NULL">.</SEQ>
-		<SEQ TYPE="NULL">,</SEQ>
-		<SEQ TYPE="NULL">;</SEQ>
-		<SEQ TYPE="NULL">^</SEQ>
-		<SEQ TYPE="NULL">@</SEQ>
-		<SEQ TYPE="NULL">:</SEQ>
-		<SEQ TYPE="NULL">|</SEQ>
-		<SEQ TYPE="OPERATOR">=</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;=</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;=</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;</SEQ>
-		<SEQ TYPE="OPERATOR">+</SEQ>
-		<SEQ TYPE="OPERATOR">/</SEQ>
-		<SEQ TYPE="OPERATOR">-</SEQ>
-		<SEQ TYPE="OPERATOR">*</SEQ>
-
-		<KEYWORDS>
-		    <LITERAL2>false</LITERAL2>
-		    <LITERAL2>true</LITERAL2>
-		    <LITERAL2>database</LITERAL2>
-		    <LITERAL2>it</LITERAL2>
-		    <LITERAL2>undef</LITERAL2>
-
-            <!-- keywords -->
-            <KEYWORD1>define</KEYWORD1>
-            <KEYWORD1>class</KEYWORD1>
-            <KEYWORD1>enddefine</KEYWORD1>
-            <KEYWORD1>dlocal</KEYWORD1>
-            <KEYWORD1>lvars</KEYWORD1>
-            <KEYWORD1>vars</KEYWORD1>
-            <KEYWORD1>slot</KEYWORD1>
-            <KEYWORD1>instance</KEYWORD1>
-            <KEYWORD1>endinstance</KEYWORD1>
-            <KEYWORD1>method</KEYWORD1>
-		    <KEYWORD1>syntax</KEYWORD1>
-            <KEYWORD1>biginteger</KEYWORD1>
-            <KEYWORD1>boolean</KEYWORD1>
-            <KEYWORD1>complex</KEYWORD1>
-            <KEYWORD1>ddecimal</KEYWORD1>
-            <KEYWORD1>decimal</KEYWORD1>
-            <KEYWORD1>device</KEYWORD1>
-            <KEYWORD1>ident</KEYWORD1>
-            <KEYWORD1>integer</KEYWORD1>
-            <KEYWORD1>intvec</KEYWORD1>
-            <KEYWORD1>key</KEYWORD1>
-            <KEYWORD1>nil</KEYWORD1>
-            <KEYWORD1>pair</KEYWORD1>
-            <KEYWORD1>procedure</KEYWORD1>
-            <KEYWORD1>process</KEYWORD1>
-            <KEYWORD1>prologterm</KEYWORD1>
-            <KEYWORD1>prologvar</KEYWORD1>
-            <KEYWORD1>ratio</KEYWORD1>
-            <KEYWORD1>ref</KEYWORD1>
-            <KEYWORD1>section</KEYWORD1>
-            <KEYWORD1>string</KEYWORD1>
-            <KEYWORD1>termin</KEYWORD1>
-            <KEYWORD1>vector</KEYWORD1>
-            <KEYWORD1>word</KEYWORD1>
-
-            <!-- flow control -->
-            <KEYWORD3>if</KEYWORD3>
-            <KEYWORD3>forevery</KEYWORD3>
-            <KEYWORD3>endforevery</KEYWORD3>
-            <KEYWORD3>then</KEYWORD3>
-            <KEYWORD3>switchon</KEYWORD3>
-            <KEYWORD3>endswitchon</KEYWORD3>
-            <KEYWORD3>case</KEYWORD3>
-            <KEYWORD3>elseif</KEYWORD3>
-            <KEYWORD3>else</KEYWORD3>
-            <KEYWORD3>endif</KEYWORD3>
-            <KEYWORD3>for</KEYWORD3>
-            <KEYWORD3>repeat</KEYWORD3>
-            <KEYWORD3>from</KEYWORD3>
-            <KEYWORD3>till</KEYWORD3>
-            <KEYWORD3>step</KEYWORD3>
-            <KEYWORD3>while</KEYWORD3>
-            <KEYWORD3>endfor</KEYWORD3>
-            <KEYWORD3>endrepeat</KEYWORD3>
-            <KEYWORD3>endwhile</KEYWORD3>
-            <KEYWORD3>times</KEYWORD3>
-            <KEYWORD3>to</KEYWORD3>
-            <KEYWORD3>do</KEYWORD3>
-            <KEYWORD3>by</KEYWORD3>
-            <KEYWORD3>in</KEYWORD3>
-            <KEYWORD3>return</KEYWORD3>
-
-            <!-- other statements -->
-            <KEYWORD2>and</KEYWORD2>
-            <KEYWORD2>or</KEYWORD2>
-            <KEYWORD2>matches</KEYWORD2>
-            <KEYWORD2>quitloop</KEYWORD2>
-            <KEYWORD2>goto</KEYWORD2>
-            <KEYWORD2>uses</KEYWORD2>
-            <KEYWORD2>trace</KEYWORD2>
-            <KEYWORD2>cons_with</KEYWORD2>
-            <KEYWORD2>consstring</KEYWORD2>
-
-            <!-- Built in functions -->
-            <LITERAL2>interrupt</LITERAL2>
-            <LITERAL2>partapply</LITERAL2>
-            <LITERAL2>consclosure</LITERAL2>
-            <LITERAL2>max</LITERAL2>
-            <LITERAL2>add</LITERAL2>
-            <LITERAL2>remove</LITERAL2>
-            <LITERAL2>alladd</LITERAL2>
-            <LITERAL2>quitif</LITERAL2>
-            <LITERAL2>copydata</LITERAL2>
-            <LITERAL2>copytree</LITERAL2>
-            <LITERAL2>copylist</LITERAL2>
-            <LITERAL2>length</LITERAL2>
-            <LITERAL2>hd</LITERAL2>
-            <LITERAL2>tl</LITERAL2>
-            <LITERAL2>rev</LITERAL2>
-            <LITERAL2>shuffle</LITERAL2>
-            <LITERAL2>oneof</LITERAL2>
-            <LITERAL2>sort</LITERAL2>
-            <LITERAL2>syssort</LITERAL2>
-            <LITERAL2>random</LITERAL2>
-            <LITERAL2>readline</LITERAL2>
-            <LITERAL2>not</LITERAL2>
-            <LITERAL2>pr</LITERAL2>
-            <LITERAL2>nl</LITERAL2>
-            <LITERAL2>present</LITERAL2>
-            <LITERAL2>subword</LITERAL2>
-            <LITERAL2>member</LITERAL2>
-            <LITERAL2>length</LITERAL2>
-            <LITERAL2>listlength</LITERAL2>
-            <LITERAL2>datalength</LITERAL2>
-            <LITERAL2>mishap</LITERAL2>
-            <LITERAL2>last</LITERAL2>
-            <LITERAL2>delete</LITERAL2>
-            <LITERAL2>valof</LITERAL2>
-            <LITERAL2>dataword</LITERAL2>
-
-            <!-- input validation functions -->
-            <LITERAL2>isnumber</LITERAL2>
-            <LITERAL2>isinteger</LITERAL2>
-            <LITERAL2>islist</LITERAL2>
-            <LITERAL2>isboolean</LITERAL2>
-		</KEYWORDS>
-	</RULES>
-
-    <RULES SET="LIST" DEFAULT="LITERAL1" HIGHLIGHT_DIGITS="TRUE">
-        <SPAN TYPE="LITERAL1" DELEGATE="LIST">
-			<BEGIN>[</BEGIN>
-			<END>]</END>
-		</SPAN>
-
-        <SPAN TYPE="LITERAL1" DELEGATE="LIST">
-			<BEGIN>{</BEGIN>
-			<END>}</END>
-		</SPAN>
-
-        <SPAN TYPE="LITERAL1" DELEGATE="LIST">
-			<BEGIN>![</BEGIN>
-			<END>]</END>
-		</SPAN>
-
-		<SPAN TYPE="LITERAL1" NO_LINE_BREAK="TRUE" DELEGATE="STRING">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-
-		<SPAN TYPE="LITERAL1" NO_LINE_BREAK="TRUE" DELEGATE="STRING">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-
-        <SPAN DELEGATE="MAIN" TYPE="NULL">
-			<BEGIN>%</BEGIN>
-			<END>%</END>
-		</SPAN>
-
-		<SPAN TYPE="COMMENT1" DELEGATE="COMMENT">
-			<BEGIN>/*</BEGIN>
-			<END>*/</END>
-		</SPAN>
-
-        <EOL_SPAN TYPE="COMMENT1">;;;</EOL_SPAN>
-		<SEQ TYPE="LITERAL2">=</SEQ>
-		<SEQ TYPE="LITERAL2">==</SEQ>
-
-        <MARK_FOLLOWING TYPE="LITERAL2">^</MARK_FOLLOWING>
-		<MARK_FOLLOWING TYPE="LITERAL2">?</MARK_FOLLOWING>
-	</RULES>
-
-    <RULES SET="STRING" ESCAPE="\" DEFAULT="LITERAL1" HIGHLIGHT_DIGITS="FALSE">
-    </RULES>
-
-    <RULES NO_WORD_SEP="." SET="COMMENT" DEFAULT="COMMENT1" HIGHLIGHT_DIGITS="FALSE">
-        <MARK_PREVIOUS TYPE="LABEL">:</MARK_PREVIOUS>
-		<SEQ TYPE="COMMENT1">*</SEQ>
-    </RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/postscript.xml b/qpython/src/main/assets/syntax/postscript.xml
deleted file mode 100644
index 6e21d881..00000000
--- a/qpython/src/main/assets/syntax/postscript.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!-- PostScript mode, by Slava Pestov. Based on PostScriptTokenMarker by
-     Ralf Engels -->
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="lineComment" VALUE="%" />
-	</PROPS>
-	<RULES IGNORE_CASE="FALSE" HIGHLIGHT_DIGITS="TRUE">
-		<!-- Comments -->
-		<EOL_SPAN TYPE="COMMENT2">%!</EOL_SPAN>
-		<EOL_SPAN TYPE="COMMENT2">%?</EOL_SPAN>
-		<EOL_SPAN TYPE="COMMENT2">%%</EOL_SPAN>
-		<EOL_SPAN TYPE="COMMENT1">%</EOL_SPAN>
-
-		<!-- Literals -->
-		<SPAN TYPE="LITERAL1" DELEGATE="LITERAL">
-			<BEGIN>(</BEGIN>
-			<END>)</END>
-		</SPAN>
-
-		<SPAN TYPE="LITERAL1" ESCAPE="\">
-			<BEGIN>&lt;</BEGIN>
-			<END>&gt;</END>
-		</SPAN>
-
-		<MARK_FOLLOWING TYPE="LABEL">/</MARK_FOLLOWING>
-
-		<SEQ TYPE="OPERATOR">}</SEQ>
-		<SEQ TYPE="OPERATOR">{</SEQ>
-		<SEQ TYPE="OPERATOR">]</SEQ>
-		<SEQ TYPE="OPERATOR">[</SEQ>
-
-		<KEYWORDS>
-			<KEYWORD1>pop</KEYWORD1>
-			<KEYWORD1>exch</KEYWORD1>
-			<KEYWORD1>dup</KEYWORD1>
-			<KEYWORD1>copy</KEYWORD1>
-			<KEYWORD1>roll</KEYWORD1>
-			<KEYWORD1>clear</KEYWORD1>
-			<KEYWORD1>count</KEYWORD1>
-			<KEYWORD1>mark</KEYWORD1>
-			<KEYWORD1>cleartomark</KEYWORD1>
-			<KEYWORD1>counttomark</KEYWORD1>
-
-			<KEYWORD1>exec</KEYWORD1>
-			<KEYWORD1>if</KEYWORD1>
-			<KEYWORD1>ifelse</KEYWORD1>
-			<KEYWORD1>for</KEYWORD1>
-			<KEYWORD1>repeat</KEYWORD1>
-			<KEYWORD1>loop</KEYWORD1>
-			<KEYWORD1>exit</KEYWORD1>
-			<KEYWORD1>stop</KEYWORD1>
-			<KEYWORD1>stopped</KEYWORD1>
-			<KEYWORD1>countexecstack</KEYWORD1>
-			<KEYWORD1>execstack</KEYWORD1>
-			<KEYWORD1>quit</KEYWORD1>
-			<KEYWORD1>start</KEYWORD1>
-
-			<OPERATOR>add</OPERATOR>
-			<OPERATOR>div</OPERATOR>
-			<OPERATOR>idiv</OPERATOR>
-			<OPERATOR>mod</OPERATOR>
-			<OPERATOR>mul</OPERATOR>
-			<OPERATOR>sub</OPERATOR>
-			<OPERATOR>abs</OPERATOR>
-			<OPERATOR>ned</OPERATOR>
-			<OPERATOR>ceiling</OPERATOR>
-			<OPERATOR>floor</OPERATOR>
-			<OPERATOR>round</OPERATOR>
-			<OPERATOR>truncate</OPERATOR>
-			<OPERATOR>sqrt</OPERATOR>
-			<OPERATOR>atan</OPERATOR>
-			<OPERATOR>cos</OPERATOR>
-			<OPERATOR>sin</OPERATOR>
-			<OPERATOR>exp</OPERATOR>
-			<OPERATOR>ln</OPERATOR>
-			<OPERATOR>log</OPERATOR>
-			<OPERATOR>rand</OPERATOR>
-			<OPERATOR>srand</OPERATOR>
-			<OPERATOR>rrand</OPERATOR>
-
-			<LITERAL2>true</LITERAL2>
-			<LITERAL2>false</LITERAL2>
-			<LITERAL2>NULL</LITERAL2>
-		</KEYWORDS>
-	</RULES>
-
-	<RULES SET="LITERAL" DEFAULT="LITERAL1" ESCAPE="\">
-		<SPAN TYPE="LITERAL1" DELEGATE="LITERAL">
-			<BEGIN>(</BEGIN>
-			<END>)</END>
-		</SPAN>
-	</RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/povray.xml b/qpython/src/main/assets/syntax/povray.xml
deleted file mode 100644
index f39ae789..00000000
--- a/qpython/src/main/assets/syntax/povray.xml
+++ /dev/null
@@ -1,518 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!-- Povray mode, by Jan Schaefer
-     based on original Povray mode by Slava Pestov
-     based on PovrayTokenMarker, by Romain Guy -->
-
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="indentOpenBrackets" VALUE="{" />
-		<PROPERTY NAME="indentCloseBrackets" VALUE="}" />
-		<PROPERTY NAME="commentStart" VALUE="/*" />
-		<PROPERTY NAME="commentEnd" VALUE="*/" />
-		<PROPERTY NAME="lineComment" VALUE="//" />
-	</PROPS>
-	<RULES IGNORE_CASE="FALSE" HIGHLIGHT_DIGITS="TRUE">
-		<!-- C style comment -->
-		<SPAN TYPE="COMMENT1">
-			<BEGIN>/*</BEGIN>
-			<END>*/</END>
-		</SPAN>
-
-		<SPAN TYPE="LITERAL1" ESCAPE="\" NO_LINE_BREAK="TRUE">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-		<SPAN TYPE="LITERAL1" ESCAPE="\" NO_LINE_BREAK="TRUE">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-
-		<EOL_SPAN TYPE="COMMENT2">//</EOL_SPAN>
-		<SEQ TYPE="OPERATOR">=</SEQ>
-		<SEQ TYPE="OPERATOR">!</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;=</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;=</SEQ>
-		<SEQ TYPE="OPERATOR">+</SEQ>
-		<SEQ TYPE="OPERATOR">-</SEQ>
-		<SEQ TYPE="OPERATOR">/</SEQ>
-		<SEQ TYPE="OPERATOR">*</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;</SEQ>
-		<SEQ TYPE="OPERATOR">%</SEQ>
-		<SEQ TYPE="OPERATOR">&amp;</SEQ>
-		<SEQ TYPE="OPERATOR">|</SEQ>
-		<SEQ TYPE="OPERATOR">^</SEQ>
-		<SEQ TYPE="OPERATOR">~</SEQ>
-		<SEQ TYPE="OPERATOR">}</SEQ>
-		<SEQ TYPE="OPERATOR">{</SEQ>
-		<MARK_PREVIOUS TYPE="LABEL" MATCH_TYPE="OPERATOR" AT_LINE_START="TRUE">:</MARK_PREVIOUS>
-
-		<!-- Function calls -->
-		<MARK_PREVIOUS TYPE="FUNCTION" MATCH_TYPE="OPERATOR">(</MARK_PREVIOUS>
-		<SEQ TYPE="OPERATOR">)</SEQ>
-
-		<KEYWORDS>
-			<KEYWORD2>aa_level</KEYWORD2>
-			<KEYWORD2>aa_threshold</KEYWORD2>
-			<FUNCTION>abs</FUNCTION>
-			<KEYWORD2>absorption</KEYWORD2>
-			<KEYWORD2>accuracy</KEYWORD2>
-			<FUNCTION>acos</FUNCTION>
-			<FUNCTION>acosh</FUNCTION>
-			<KEYWORD2>adaptive</KEYWORD2>
-			<KEYWORD2>adc_bailout</KEYWORD2>
-			<KEYWORD2>agate</KEYWORD2>
-			<KEYWORD2>agate_turb</KEYWORD2>
-			<KEYWORD2>all</KEYWORD2>
-			<KEYWORD2>all_intersections</KEYWORD2>
-			<KEYWORD2>alpha</KEYWORD2>
-			<KEYWORD2>altitude</KEYWORD2>
-			<KEYWORD2>always_sample</KEYWORD2>
-			<KEYWORD2>ambient</KEYWORD2>
-			<KEYWORD2>ambient_light</KEYWORD2>
-			<KEYWORD2>angle</KEYWORD2>
-			<KEYWORD2>aperture</KEYWORD2>
-			<KEYWORD2>append</KEYWORD2>
-			<KEYWORD2>arc_angle</KEYWORD2>
-			<KEYWORD2>area_light</KEYWORD2>
-			<KEYWORD2>array</KEYWORD2>
-			<FUNCTION>asc</FUNCTION>
-			<KEYWORD2>ascii</KEYWORD2>
-			<FUNCTION>asin</FUNCTION>
-			<FUNCTION>asinh</FUNCTION>
-			<KEYWORD2>assumed_gamma</KEYWORD2>
-			<FUNCTION>atan</FUNCTION>
-			<FUNCTION>atan2</FUNCTION>
-			<FUNCTION>atanh</FUNCTION>
-			<KEYWORD2>autostop</KEYWORD2>
-			<KEYWORD2>average</KEYWORD2>
-			<KEYWORD2>b_spline</KEYWORD2>
-			<KEYWORD1>background</KEYWORD1>
-			<KEYWORD2>bezier_spline</KEYWORD2>
-			<KEYWORD1>bicubic_patch</KEYWORD1>
-			<KEYWORD2>black_hole</KEYWORD2>
-			<KEYWORD1>blob</KEYWORD1>
-			<LITERAL1>blue</LITERAL1>
-			<KEYWORD2>blur_samples</KEYWORD2>
-			<KEYWORD1>bounded_by</KEYWORD1>
-			<KEYWORD1>box</KEYWORD1>
-			<KEYWORD2>boxed</KEYWORD2>
-			<KEYWORD2>bozo</KEYWORD2>
-			<KEYWORD1>#break</KEYWORD1>
-			<KEYWORD2>brick</KEYWORD2>
-			<KEYWORD2>brick_size</KEYWORD2>
-			<KEYWORD2>brightness</KEYWORD2>
-			<KEYWORD2>brilliance</KEYWORD2>
-			<KEYWORD1>bump_map</KEYWORD1>
-			<KEYWORD2>bump_size</KEYWORD2>
-			<KEYWORD2>bumps</KEYWORD2>
-			<KEYWORD1>camera</KEYWORD1>
-			<KEYWORD1>#case</KEYWORD1>
-			<KEYWORD2>caustics</KEYWORD2>
-			<FUNCTION>ceil</FUNCTION>
-			<KEYWORD2>cells</KEYWORD2>
-			<KEYWORD2>charset</KEYWORD2>
-			<KEYWORD2>checker</KEYWORD2>
-			<FUNCTION>chr</FUNCTION>
-			<KEYWORD2>circular</KEYWORD2>
-			<KEYWORD1>clipped_by</KEYWORD1>
-			<LITERAL1>clock</LITERAL1>
-			<LITERAL1>clock_delta</LITERAL1>
-			<LITERAL1>clock_on</LITERAL1>
-			<KEYWORD2>collect</KEYWORD2>
-			<KEYWORD2>color</KEYWORD2>
-			<KEYWORD2>color_map</KEYWORD2>
-			<KEYWORD2>colour</KEYWORD2>
-			<KEYWORD2>colour_map</KEYWORD2>
-			<KEYWORD2>component</KEYWORD2>
-			<KEYWORD2>composite</KEYWORD2>
-			<FUNCTION>concat</FUNCTION>
-			<KEYWORD1>cone</KEYWORD1>
-			<KEYWORD2>confidence</KEYWORD2>
-			<KEYWORD2>conic_sweep</KEYWORD2>
-			<KEYWORD2>conserve_energy</KEYWORD2>
-			<KEYWORD1>contained_by</KEYWORD1>
-			<KEYWORD2>control0</KEYWORD2>
-			<KEYWORD2>control1</KEYWORD2>
-			<KEYWORD2>coords</KEYWORD2>
-			<FUNCTION>cos</FUNCTION>
-			<FUNCTION>cosh</FUNCTION>
-			<KEYWORD2>count</KEYWORD2>
-			<KEYWORD2>crackle</KEYWORD2>
-			<KEYWORD2>crand</KEYWORD2>
-			<KEYWORD1>cube</KEYWORD1>
-			<KEYWORD1>cubic</KEYWORD1>
-			<KEYWORD2>cubic_spline</KEYWORD2>
-			<KEYWORD2>cubic_wave</KEYWORD2>
-			<KEYWORD2>cutaway_textures</KEYWORD2>
-			<KEYWORD1>cylinder</KEYWORD1>
-			<KEYWORD2>cylindrical</KEYWORD2>
-			<KEYWORD1>#debug</KEYWORD1>
-			<KEYWORD1>#declare</KEYWORD1>
-			<KEYWORD1>#default</KEYWORD1>
-			<FUNCTION>defined</FUNCTION>
-			<FUNCTION>degrees</FUNCTION>
-			<KEYWORD2>density</KEYWORD2>
-			<KEYWORD2>density_file</KEYWORD2>
-			<KEYWORD1>density_map</KEYWORD1>
-			<KEYWORD2>dents</KEYWORD2>
-			<KEYWORD2>df3</KEYWORD2>
-			<KEYWORD1>difference</KEYWORD1>
-			<KEYWORD2>diffuse</KEYWORD2>
-			<FUNCTION>dimension_size</FUNCTION>
-			<FUNCTION>dimensions</FUNCTION>
-			<KEYWORD2>direction</KEYWORD2>
-			<KEYWORD1>disc</KEYWORD1>
-			<KEYWORD2>dispersion</KEYWORD2>
-			<KEYWORD2>dispersion_samples</KEYWORD2>
-			<KEYWORD2>dist_exp</KEYWORD2>
-			<KEYWORD2>distance</KEYWORD2>
-			<FUNCTION>div</FUNCTION>
-			<KEYWORD2>double_illuminate</KEYWORD2>
-			<KEYWORD2>eccentricity</KEYWORD2>
-			<KEYWORD1>#else</KEYWORD1>
-			<KEYWORD2>emission</KEYWORD2>
-			<KEYWORD1>#end</KEYWORD1>
-			<KEYWORD1>#error</KEYWORD1>
-			<KEYWORD2>error_bound</KEYWORD2>
-			<KEYWORD2>evaluate</KEYWORD2>
-			<FUNCTION>exp</FUNCTION>
-			<KEYWORD2>expand_thresholds</KEYWORD2>
-			<KEYWORD2>exponent</KEYWORD2>
-			<KEYWORD2>exterior</KEYWORD2>
-			<KEYWORD2>extinction</KEYWORD2>
-			<KEYWORD1>face_indices</KEYWORD1>
-			<KEYWORD2>facets</KEYWORD2>
-			<KEYWORD2>fade_color</KEYWORD2>
-			<KEYWORD2>fade_colour</KEYWORD2>
-			<KEYWORD2>fade_distance</KEYWORD2>
-			<KEYWORD2>fade_power</KEYWORD2>
-			<KEYWORD2>falloff</KEYWORD2>
-			<KEYWORD2>falloff_angle</KEYWORD2>
-			<LITERAL1>false</LITERAL1>
-			<KEYWORD1>#fclose</KEYWORD1>
-			<FUNCTION>file_exists</FUNCTION>
-			<KEYWORD2>filter</KEYWORD2>
-			<LITERAL1>final_clock</LITERAL1>
-			<LITERAL1>final_frame</LITERAL1>
-			<KEYWORD1>finish</KEYWORD1>
-			<KEYWORD2>fisheye</KEYWORD2>
-			<KEYWORD2>flatness</KEYWORD2>
-			<KEYWORD2>flip</KEYWORD2>
-			<FUNCTION>floor</FUNCTION>
-			<KEYWORD2>focal_point</KEYWORD2>
-			<KEYWORD1>fog</KEYWORD1>
-			<KEYWORD2>fog_alt</KEYWORD2>
-			<KEYWORD2>fog_offset</KEYWORD2>
-			<KEYWORD2>fog_type</KEYWORD2>
-			<KEYWORD1>#fopen</KEYWORD1>
-			<KEYWORD2>form</KEYWORD2>
-			<LITERAL1>frame_number</LITERAL1>
-			<KEYWORD2>frequency</KEYWORD2>
-			<KEYWORD2>fresnel</KEYWORD2>
-			<KEYWORD1>function</KEYWORD1>
-			<KEYWORD2>gather</KEYWORD2>
-			<KEYWORD2>gif</KEYWORD2>
-			<KEYWORD2>global_lights</KEYWORD2>
-			<KEYWORD1>global_settings</KEYWORD1>
-			<KEYWORD2>gradient</KEYWORD2>
-			<KEYWORD2>granite</KEYWORD2>
-			<LITERAL1>gray</LITERAL1>
-			<KEYWORD2>gray_threshold</KEYWORD2>
-			<LITERAL1>green</LITERAL1>
-			<KEYWORD2>h_angle</KEYWORD2>
-			<KEYWORD1>height_field</KEYWORD1>
-			<KEYWORD2>hexagon</KEYWORD2>
-			<KEYWORD2>hf_gray_16</KEYWORD2>
-			<KEYWORD2>hierarchy</KEYWORD2>
-			<KEYWORD2>hollow</KEYWORD2>
-			<KEYWORD2>hypercomplex</KEYWORD2>
-			<KEYWORD1>#if</KEYWORD1>
-			<KEYWORD1>#ifdef</KEYWORD1>
-			<KEYWORD2>iff</KEYWORD2>
-			<KEYWORD1>#ifndef</KEYWORD1>
-			<LITERAL1>image_height</LITERAL1>
-			<KEYWORD1>image_map</KEYWORD1>
-			<KEYWORD2>image_pattern</KEYWORD2>
-			<LITERAL1>image_width</LITERAL1>
-			<KEYWORD1>#include</KEYWORD1>
-			<LITERAL1>initial_clock</LITERAL1>
-			<LITERAL1>initial_frame</LITERAL1>
-			<FUNCTION>inside</FUNCTION>
-			<FUNCTION>int</FUNCTION>
-			<KEYWORD1>interior</KEYWORD1>
-			<KEYWORD1>interior_texture</KEYWORD1>
-			<FUNCTION>internal</FUNCTION>
-			<KEYWORD2>interpolate</KEYWORD2>
-			<KEYWORD1>intersection</KEYWORD1>
-			<KEYWORD2>intervals</KEYWORD2>
-			<KEYWORD2>inverse</KEYWORD2>
-			<KEYWORD1>ior</KEYWORD1>
-			<KEYWORD1>irid</KEYWORD1>
-			<KEYWORD2>irid_wavelength</KEYWORD2>
-			<KEYWORD1>isosurface</KEYWORD1>
-			<KEYWORD2>jitter</KEYWORD2>
-			<KEYWORD2>jpeg</KEYWORD2>
-			<KEYWORD2>julia</KEYWORD2>
-			<KEYWORD1>julia_fractal</KEYWORD1>
-			<KEYWORD1>lathe</KEYWORD1>
-			<KEYWORD2>lambda</KEYWORD2>
-			<KEYWORD2>leopard</KEYWORD2>
-			<KEYWORD1>light_group</KEYWORD1>
-			<KEYWORD1>light_source</KEYWORD1>
-			<KEYWORD2>linear_spline</KEYWORD2>
-			<KEYWORD2>linear_sweep</KEYWORD2>
-			<FUNCTION>ln</FUNCTION>
-			<KEYWORD2>load_file</KEYWORD2>
-			<KEYWORD1>#local</KEYWORD1>
-			<KEYWORD2>location</KEYWORD2>
-			<FUNCTION>log</FUNCTION>
-			<KEYWORD2>look_at</KEYWORD2>
-			<KEYWORD1>looks_like</KEYWORD1>
-			<KEYWORD2>low_error_factor</KEYWORD2>
-			<KEYWORD1>#macro</KEYWORD1>
-			<KEYWORD2>magnet</KEYWORD2>
-			<KEYWORD2>major_radius</KEYWORD2>
-			<KEYWORD2>mandel</KEYWORD2>
-			<KEYWORD2>map_type</KEYWORD2>
-			<KEYWORD2>marble</KEYWORD2>
-			<KEYWORD1>material</KEYWORD1>
-			<KEYWORD1>material_map</KEYWORD1>
-			<KEYWORD2>matrix</KEYWORD2>
-			<FUNCTION>max</FUNCTION>
-			<KEYWORD2>max_extent</KEYWORD2>
-			<KEYWORD2>max_gradient</KEYWORD2>
-			<KEYWORD2>max_intersections</KEYWORD2>
-			<KEYWORD2>max_iteration</KEYWORD2>
-			<KEYWORD2>max_sample</KEYWORD2>
-			<KEYWORD2>max_trace</KEYWORD2>
-			<KEYWORD2>max_trace_level</KEYWORD2>
-			<KEYWORD1>media</KEYWORD1>
-			<KEYWORD2>media_attenuation</KEYWORD2>
-			<KEYWORD2>media_interaction</KEYWORD2>
-			<KEYWORD1>merge</KEYWORD1>
-			<KEYWORD1>mesh</KEYWORD1>
-			<KEYWORD1>mesh2</KEYWORD1>
-			<KEYWORD2>metallic</KEYWORD2>
-			<KEYWORD2>method</KEYWORD2>
-			<KEYWORD2>metric</KEYWORD2>
-			<FUNCTION>min</FUNCTION>
-			<KEYWORD2>min_extent</KEYWORD2>
-			<KEYWORD2>minimum_reuse</KEYWORD2>
-			<FUNCTION>mod</FUNCTION>
-			<KEYWORD2>mortar</KEYWORD2>
-			<KEYWORD2>natural_spline</KEYWORD2>
-			<KEYWORD2>nearest_count</KEYWORD2>
-			<LITERAL1>no</LITERAL1>
-			<KEYWORD2>no_bump_scale</KEYWORD2>
-			<KEYWORD2>no_image</KEYWORD2>
-			<KEYWORD2>no_reflection</KEYWORD2>
-			<KEYWORD2>no_shadow</KEYWORD2>
-			<KEYWORD2>noise_generator</KEYWORD2>
-			<KEYWORD1>normal</KEYWORD1>
-			<KEYWORD1>normal_indices</KEYWORD1>
-			<KEYWORD1>normal_map</KEYWORD1>
-			<KEYWORD1>normal_vectors</KEYWORD1>
-			<KEYWORD2>number_of_waves</KEYWORD2>
-			<KEYWORD1>object</KEYWORD1>
-			<KEYWORD2>octaves</KEYWORD2>
-			<LITERAL1>off</LITERAL1>
-			<KEYWORD2>offset</KEYWORD2>
-			<KEYWORD2>omega</KEYWORD2>
-			<KEYWORD2>omnimax</KEYWORD2>
-			<LITERAL1>on</LITERAL1>
-			<KEYWORD2>once</KEYWORD2>
-			<KEYWORD2>onion</KEYWORD2>
-			<KEYWORD2>open</KEYWORD2>
-			<KEYWORD2>orient</KEYWORD2>
-			<KEYWORD2>orientation</KEYWORD2>
-			<KEYWORD2>orthographic</KEYWORD2>
-			<KEYWORD2>panoramic</KEYWORD2>
-			<KEYWORD2>parallel</KEYWORD2>
-			<KEYWORD2>parametric</KEYWORD2>
-			<KEYWORD2>pass_through</KEYWORD2>
-			<KEYWORD1>pattern</KEYWORD1>
-			<KEYWORD2>perspective</KEYWORD2>
-			<KEYWORD2>pgm</KEYWORD2>
-			<KEYWORD2>phase</KEYWORD2>
-			<KEYWORD2>phong</KEYWORD2>
-			<KEYWORD2>phong_size</KEYWORD2>
-			<KEYWORD1>photons</KEYWORD1>
-			<LITERAL1>pi</LITERAL1>
-			<KEYWORD1>pigment</KEYWORD1>
-			<KEYWORD1>pigment_map</KEYWORD1>
-			<KEYWORD1>pigment_pattern</KEYWORD1>
-			<KEYWORD2>planar</KEYWORD2>
-			<KEYWORD1>plane</KEYWORD1>
-			<KEYWORD1>png</KEYWORD1>
-			<KEYWORD2>point_at</KEYWORD2>
-			<KEYWORD1>poly</KEYWORD1>
-			<KEYWORD2>poly_wave</KEYWORD2>
-			<KEYWORD1>polygon</KEYWORD1>
-			<KEYWORD2>pot</KEYWORD2>
-			<FUNCTION>pow</FUNCTION>
-			<KEYWORD2>ppm</KEYWORD2>
-			<KEYWORD2>precision</KEYWORD2>
-			<KEYWORD2>precompute</KEYWORD2>
-			<KEYWORD2>pretrace_end</KEYWORD2>
-			<KEYWORD2>pretrace_start</KEYWORD2>
-			<KEYWORD1>prism</KEYWORD1>
-			<KEYWORD2>projected_through</KEYWORD2>
-			<KEYWORD2>pwr</KEYWORD2>
-			<KEYWORD2>quadratic_spline</KEYWORD2>
-			<KEYWORD2>quadric</KEYWORD2>
-			<KEYWORD2>quartic</KEYWORD2>
-			<KEYWORD2>quaternion</KEYWORD2>
-			<KEYWORD2>quick_color</KEYWORD2>
-			<KEYWORD2>quick_colour</KEYWORD2>
-			<KEYWORD2>quilted</KEYWORD2>
-			<KEYWORD2>radial</KEYWORD2>
-			<FUNCTION>radians</FUNCTION>
-			<KEYWORD1>radiosity</KEYWORD1>
-			<KEYWORD2>radius</KEYWORD2>
-			<KEYWORD1>rainbow</KEYWORD1>
-			<KEYWORD2>ramp_wave</KEYWORD2>
-			<FUNCTION>rand</FUNCTION>
-			<KEYWORD1>#range</KEYWORD1>
-			<KEYWORD2>range_divider</KEYWORD2>
-			<KEYWORD2>ratio</KEYWORD2>
-			<KEYWORD1>#read</KEYWORD1>
-			<KEYWORD2>reciprocal</KEYWORD2>
-			<KEYWORD2>recursion_limit</KEYWORD2>
-			<LITERAL1>red</LITERAL1>
-			<KEYWORD1>reflection</KEYWORD1>
-			<KEYWORD2>reflection_exponent</KEYWORD2>
-			<KEYWORD2>refraction</KEYWORD2>
-			<KEYWORD1>#render</KEYWORD1>
-			<KEYWORD2>repeat</KEYWORD2>
-			<KEYWORD2>rgb</KEYWORD2>
-			<KEYWORD2>rgbf</KEYWORD2>
-			<KEYWORD2>rgbft</KEYWORD2>
-			<KEYWORD2>rgbt</KEYWORD2>
-			<KEYWORD2>right</KEYWORD2>
-			<KEYWORD2>ripples</KEYWORD2>
-			<KEYWORD2>rotate</KEYWORD2>
-			<KEYWORD2>roughness</KEYWORD2>
-			<KEYWORD2>samples</KEYWORD2>
-			<KEYWORD2>save_file</KEYWORD2>
-			<KEYWORD2>scale</KEYWORD2>
-			<KEYWORD2>scallop_wave</KEYWORD2>
-			<KEYWORD2>scattering</KEYWORD2>
-			<FUNCTION>seed</FUNCTION>
-			<KEYWORD2>select</KEYWORD2>
-			<KEYWORD2>shadowless</KEYWORD2>
-			<FUNCTION>sin</FUNCTION>
-			<KEYWORD2>sine_wave</KEYWORD2>
-			<FUNCTION>sinh</FUNCTION>
-			<KEYWORD2>size</KEYWORD2>
-			<KEYWORD2>sky</KEYWORD2>
-			<KEYWORD1>sky_sphere</KEYWORD1>
-			<KEYWORD2>slice</KEYWORD2>
-			<KEYWORD1>slope</KEYWORD1>
-			<KEYWORD1>slope_map</KEYWORD1>
-			<KEYWORD2>smooth</KEYWORD2>
-			<KEYWORD1>smooth_triangle</KEYWORD1>
-			<KEYWORD1>solid</KEYWORD1>
-			<KEYWORD1>sor</KEYWORD1>
-			<KEYWORD2>spacing</KEYWORD2>
-			<KEYWORD2>specular</KEYWORD2>
-			<KEYWORD1>sphere</KEYWORD1>
-			<KEYWORD1>sphere_sweep</KEYWORD1>
-			<KEYWORD2>spherical</KEYWORD2>
-			<KEYWORD2>spiral1</KEYWORD2>
-			<KEYWORD2>spiral2</KEYWORD2>
-			<KEYWORD1>spline</KEYWORD1>
-			<KEYWORD2>split_union</KEYWORD2>
-			<KEYWORD2>spotlight</KEYWORD2>
-			<KEYWORD2>spotted</KEYWORD2>
-			<KEYWORD2>sqr</KEYWORD2>
-			<FUNCTION>sqrt</FUNCTION>
-			<KEYWORD1>#statistics</KEYWORD1>
-			<FUNCTION>str</FUNCTION>
-			<FUNCTION>strcmp</FUNCTION>
-			<KEYWORD2>strength</KEYWORD2>
-			<FUNCTION>strlen</FUNCTION>
-			<FUNCTION>strlwr</FUNCTION>
-			<FUNCTION>strupr</FUNCTION>
-			<KEYWORD2>sturm</KEYWORD2>
-			<FUNCTION>substr</FUNCTION>
-			<KEYWORD1>superellipsoid</KEYWORD1>
-			<KEYWORD1>#switch</KEYWORD1>
-			<KEYWORD2>sys</KEYWORD2>
-			<LITERAL1>t</LITERAL1>
-			<FUNCTION>tan</FUNCTION>
-			<FUNCTION>tanh</FUNCTION>
-			<KEYWORD2>target</KEYWORD2>
-			<KEYWORD1>text</KEYWORD1>
-			<KEYWORD1>texture</KEYWORD1>
-			<KEYWORD1>texture_list</KEYWORD1>
-			<KEYWORD1>texture_map</KEYWORD1>
-			<KEYWORD2>tga</KEYWORD2>
-			<KEYWORD2>thickness</KEYWORD2>
-			<KEYWORD2>threshold</KEYWORD2>
-			<KEYWORD2>tiff</KEYWORD2>
-			<KEYWORD2>tightness</KEYWORD2>
-			<KEYWORD2>tile2</KEYWORD2>
-			<KEYWORD2>tiles</KEYWORD2>
-			<KEYWORD2>tolerance</KEYWORD2>
-			<KEYWORD2>toroidal</KEYWORD2>
-			<KEYWORD1>torus</KEYWORD1>
-			<FUNCTION>trace</FUNCTION>
-			<KEYWORD2>transform</KEYWORD2>
-			<KEYWORD2>translate</KEYWORD2>
-			<KEYWORD2>transmit</KEYWORD2>
-			<KEYWORD1>triangle</KEYWORD1>
-			<KEYWORD2>triangle_wave</KEYWORD2>
-			<LITERAL1>true</LITERAL1>
-			<KEYWORD2>ttf</KEYWORD2>
-			<KEYWORD2>turb_depth</KEYWORD2>
-			<KEYWORD2>turbulence</KEYWORD2>
-			<KEYWORD2>type</KEYWORD2>
-			<LITERAL1>u</LITERAL1>
-			<KEYWORD2>u_steps</KEYWORD2>
-			<KEYWORD2>ultra_wide_angle</KEYWORD2>
-			<KEYWORD1>#undef</KEYWORD1>
-			<KEYWORD1>union</KEYWORD1>
-			<KEYWORD2>up</KEYWORD2>
-			<KEYWORD2>use_alpha</KEYWORD2>
-			<KEYWORD2>use_color</KEYWORD2>
-			<KEYWORD2>use_colour</KEYWORD2>
-			<KEYWORD2>use_index</KEYWORD2>
-			<KEYWORD2>utf8</KEYWORD2>
-			<KEYWORD1>uv_indices</KEYWORD1>
-			<KEYWORD1>uv_mapping</KEYWORD1>
-			<KEYWORD1>uv_vectors</KEYWORD1>
-			<LITERAL1>v</LITERAL1>
-			<KEYWORD2>v_angle</KEYWORD2>
-			<KEYWORD2>v_steps</KEYWORD2>
-			<FUNCTION>val</FUNCTION>
-			<KEYWORD2>variance</KEYWORD2>
-			<FUNCTION>vaxis_rotate</FUNCTION>
-			<FUNCTION>vcross</FUNCTION>
-			<FUNCTION>vdot</FUNCTION>
-			<KEYWORD1>#version</KEYWORD1>
-			<KEYWORD1>vertex_vectors</KEYWORD1>
-			<FUNCTION>vlength</FUNCTION>
-			<FUNCTION>vnormalize</FUNCTION>
-			<FUNCTION>vrotate</FUNCTION>
-			<FUNCTION>vstr</FUNCTION>
-			<FUNCTION>vturbulence</FUNCTION>
-			<KEYWORD1>#warning</KEYWORD1>
-			<KEYWORD1>warp</KEYWORD1>
-			<KEYWORD2>water_level</KEYWORD2>
-			<KEYWORD2>waves</KEYWORD2>
-			<KEYWORD1>#while</KEYWORD1>
-			<KEYWORD2>width</KEYWORD2>
-			<KEYWORD2>wood</KEYWORD2>
-			<KEYWORD2>wrinkles</KEYWORD2>
-			<KEYWORD1>#write</KEYWORD1>
-			<LITERAL1>x</LITERAL1>
-			<LITERAL1>y</LITERAL1>
-			<LITERAL1>yes</LITERAL1>
-			<LITERAL1>z</LITERAL1>
-		</KEYWORDS>
-	</RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/powercenter_parameter_file.xml b/qpython/src/main/assets/syntax/powercenter_parameter_file.xml
deleted file mode 100644
index 14385cd3..00000000
--- a/qpython/src/main/assets/syntax/powercenter_parameter_file.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0"?>
-<!-- PowerCenter Parameter File format, jEdit mode by Thiemo Kellner 2014 -->
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<MODE>
-   <RULES IGNORE_CASE="TRUE" HIGHLIGHT_DIGITS="TRUE">
-
-      <!-- single $ after double otherwise double will be treated as single -->
-      <MARK_FOLLOWING TYPE="KEYWORD2">$$</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="KEYWORD1">$</MARK_FOLLOWING>
-
-      <!-- weird stuff -->
-      <SPAN TYPE="KEYWORD3" DELEGATE="EXEC" ESCAPE="\">
-         <BEGIN>[</BEGIN>
-         <END>]</END>
-      </SPAN>
-
-      <!-- Literals -->
-      <SPAN TYPE="LITERAL1" DELEGATE="LITERAL" ESCAPE="\" NO_LINE_BREAK="TRUE">
-         <BEGIN>"</BEGIN>
-         <END>"</END>
-      </SPAN>
-      <SPAN TYPE="LITERAL1" NO_LINE_BREAK="TRUE">
-         <BEGIN>'</BEGIN>
-         <END>'</END>
-      </SPAN>
-
-      <!-- Operators -->
-      <SEQ TYPE="OPERATOR">=</SEQ>
-      <!-- some of these should be marked OPERATOR -->
-      <SEQ TYPE="NULL">=</SEQ>
-
-      <!-- Comments -->
-      <EOL_SPAN_REGEXP TYPE="COMMENT2" AT_LINE_START="TRUE">^[^=]*$</EOL_SPAN_REGEXP>
-   </RULES>
-
-</MODE>
diff --git a/qpython/src/main/assets/syntax/powerdynamo.xml b/qpython/src/main/assets/syntax/powerdynamo.xml
deleted file mode 100644
index 246ca731..00000000
--- a/qpython/src/main/assets/syntax/powerdynamo.xml
+++ /dev/null
@@ -1,464 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-<!--
-Sybase PowerDynamo mode file for jEdit - v 1.0
-(For the 5 people in the world who still have to program in dynamo.)
-
-By Ben Williams (benw@webmedia.com.au)
-
-1.0  2003-11-13
-Initial release - supports dynamo script, SQL tags, and mostly complete support
-for the other tags (data, document, etc). more support planned for future.
-
--->
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="indentOpenBrackets" VALUE="{" />
-		<PROPERTY NAME="indentCloseBrackets" VALUE="}" />
-		<PROPERTY NAME="wordBreakChars" VALUE=" @	%^*()+=|\{}[]:;,.?$&amp;" />
-		<PROPERTY NAME="commentStart" VALUE="&lt;!--" />
-		<PROPERTY NAME="commentEnd" VALUE="--&gt;" />
-		<PROPERTY NAME="lineComment" VALUE="//" />
-	</PROPS>
-	<RULES IGNORE_CASE="TRUE">
-		<SPAN TYPE="LABEL" DELEGATE="powerdynamo-script">
-			<BEGIN>&lt;!--script</BEGIN>
-			<END>--&gt;</END>
-		</SPAN>
-
-		<!-- these are the other dynamo tag types. for the meoment, we'll just hand them over to powerdynamo-script,
-			 but in future versions we can easily add individual processing for each of them, as they should have.
-		-->
-		<SPAN TYPE="LABEL" DELEGATE="powerdynamo-tag-data">
-			<BEGIN>&lt;!--data</BEGIN>
-			<END>--&gt;</END>
-		</SPAN>
-
-		<SPAN TYPE="LABEL" DELEGATE="powerdynamo-tag-document">
-			<BEGIN>&lt;!--document</BEGIN>
-			<END>--&gt;</END>
-		</SPAN>
-
-		<SPAN TYPE="LABEL" DELEGATE="powerdynamo-script">
-			<BEGIN>&lt;!--evaluate</BEGIN>
-			<END>--&gt;</END>
-		</SPAN>
-
-		<SPAN TYPE="LABEL" DELEGATE="powerdynamo-script">
-			<BEGIN>&lt;!--execute</BEGIN>
-			<END>--&gt;</END>
-		</SPAN>
-
-		<SPAN TYPE="LABEL" DELEGATE="powerdynamo-tag-general">
-			<BEGIN>&lt;!--formatting</BEGIN>
-			<END>--&gt;</END>
-		</SPAN>
-
-		<SPAN TYPE="LABEL" DELEGATE="powerdynamo-tag-general">
-			<BEGIN>&lt;!--/formatting</BEGIN>
-			<END>--&gt;</END>
-		</SPAN>
-
-		<SPAN TYPE="LABEL" DELEGATE="powerdynamo-tag-general">
-			<BEGIN>&lt;!--include</BEGIN>
-			<END>--&gt;</END>
-		</SPAN>
-
-		<SPAN TYPE="LABEL" DELEGATE="powerdynamo-tag-general">
-			<BEGIN>&lt;!--label</BEGIN>
-			<END>--&gt;</END>
-		</SPAN>
-
-		<SPAN TYPE="LABEL" DELEGATE="transact-sql::MAIN">
-			<BEGIN>&lt;!--sql</BEGIN>
-			<END>--&gt;</END>
-		</SPAN>
-
-		<SPAN TYPE="LABEL" DELEGATE="powerdynamo-tag-general">
-			<BEGIN>&lt;!--sql_error_code</BEGIN>
-			<END>--&gt;</END>
-		</SPAN>
-
-		<SPAN TYPE="LABEL" DELEGATE="powerdynamo-tag-general">
-			<BEGIN>&lt;!--sql_error_info</BEGIN>
-			<END>--&gt;</END>
-		</SPAN>
-
-		<SPAN TYPE="LABEL" DELEGATE="powerdynamo-tag-general">
-			<BEGIN>&lt;!--sql_state</BEGIN>
-			<END>--&gt;</END>
-		</SPAN>
-
-		<SPAN TYPE="LABEL" DELEGATE="powerdynamo-tag-general">
-			<BEGIN>&lt;!--sql_on_no_error</BEGIN>
-			<END>--&gt;</END>
-		</SPAN>
-		<SPAN TYPE="LABEL" DELEGATE="powerdynamo-tag-general">
-			<BEGIN>&lt;!--/sql_on_no_error</BEGIN>
-			<END>--&gt;</END>
-		</SPAN>
-
-		<SPAN TYPE="LABEL" DELEGATE="powerdynamo-tag-general">
-			<BEGIN>&lt;!--sql_on_error</BEGIN>
-			<END>--&gt;</END>
-		</SPAN>
-		<SPAN TYPE="LABEL" DELEGATE="powerdynamo-tag-general">
-			<BEGIN>&lt;!--/sql_on_error</BEGIN>
-			<END>--&gt;</END>
-		</SPAN>
-
-		<SPAN TYPE="LABEL" DELEGATE="powerdynamo-tag-general">
-			<BEGIN>&lt;!--sql_on_no_rows</BEGIN>
-			<END>--&gt;</END>
-		</SPAN>
-		<SPAN TYPE="LABEL" DELEGATE="powerdynamo-tag-general">
-			<BEGIN>&lt;!--/sql_on_no_rows</BEGIN>
-			<END>--&gt;</END>
-		</SPAN>
-
-		<SPAN TYPE="LABEL" DELEGATE="powerdynamo-tag-general">
-			<BEGIN>&lt;!--sql_on_rows</BEGIN>
-			<END>--&gt;</END>
-		</SPAN>
-		<SPAN TYPE="LABEL" DELEGATE="powerdynamo-tag-general">
-			<BEGIN>&lt;!--/sql_on_rows</BEGIN>
-			<END>--&gt;</END>
-		</SPAN>
-
-		<!-- SGML comment -->
-		<SPAN TYPE="COMMENT1">
-			<BEGIN>&lt;!--</BEGIN>
-			<END>--&gt;</END>
-		</SPAN>
-
-		<!-- JavaScript -->
-		<SPAN TYPE="MARKUP" DELEGATE="html::JAVASCRIPT">
-			<BEGIN>&lt;SCRIPT</BEGIN>
-			<END>&lt;/SCRIPT&gt;</END>
-		</SPAN>
-
-		<!-- stylesheet -->
-		<SPAN TYPE="MARKUP" DELEGATE="html::CSS">
-			<BEGIN>&lt;STYLE</BEGIN>
-			<END>&lt;/STYLE&gt;</END>
-		</SPAN>
-
-		<!-- DTD instructions -->
-		<SPAN TYPE="KEYWORD2" DELEGATE="xml::DTD-TAGS">
-			<BEGIN>&lt;!</BEGIN>
-			<END>&gt;</END>
-		</SPAN>
-
-		<!-- markup tags -->
-		<SPAN TYPE="MARKUP" DELEGATE="TAGS">
-			<BEGIN>&lt;</BEGIN>
-			<END>&gt;</END>
-		</SPAN>
-
-		<!-- SGML entities -->
-		<SPAN TYPE="LITERAL2" NO_WORD_BREAK="TRUE">
-			<BEGIN>&amp;</BEGIN>
-			<END>;</END>
-		</SPAN>
-	</RULES>
-
-	<RULES SET="TAGS" DEFAULT="MARKUP">
-		<SPAN TYPE="LABEL" DELEGATE="powerdynamo-script">
-			<BEGIN>&lt;!--script</BEGIN>
-			<END>--?&gt;</END>
-		</SPAN>
-
-		<SPAN TYPE="LITERAL1" DELEGATE="TAGS_LITERAL">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-
-		<SPAN TYPE="LITERAL1" DELEGATE="TAGS_LITERAL">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-
-		<SEQ TYPE="OPERATOR">=</SEQ>
-	</RULES>
-
-	<RULES SET="TAGS_LITERAL" DEFAULT="LITERAL1">
-		<SPAN TYPE="LABEL" DELEGATE="powerdynamo-script">
-			<BEGIN>&lt;!--script</BEGIN>
-			<END>?--&gt;</END>
-		</SPAN>
-	</RULES>
-
-	<RULES SET="powerdynamo-script" HIGHLIGHT_DIGITS="TRUE">
-		<!--PROPS>
-			<PROPERTY NAME="commentStart" VALUE="/*" />
-			<PROPERTY NAME="lineComment" VALUE="//" />
-		</PROPS-->
-
-		<SPAN TYPE="COMMENT1">
-			<BEGIN>/*</BEGIN>
-			<END>*/</END>
-		</SPAN>
-
-		<SPAN TYPE="LITERAL1">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-		<SPAN TYPE="LITERAL1">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-
-		<EOL_SPAN TYPE="COMMENT1">//</EOL_SPAN>
-
-		<SEQ TYPE="OPERATOR">=</SEQ>
-		<SEQ TYPE="OPERATOR">!</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;=</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;=</SEQ>
-		<SEQ TYPE="OPERATOR">=</SEQ>
-		<SEQ TYPE="OPERATOR">+</SEQ>
-		<SEQ TYPE="OPERATOR">-</SEQ>
-		<SEQ TYPE="OPERATOR">/</SEQ>
-		<SEQ TYPE="OPERATOR">*</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;</SEQ>
-		<SEQ TYPE="OPERATOR">%</SEQ>
-		<SEQ TYPE="OPERATOR">&amp;</SEQ>
-		<SEQ TYPE="OPERATOR">|</SEQ>
-		<SEQ TYPE="OPERATOR">^</SEQ>
-		<SEQ TYPE="OPERATOR">~</SEQ>
-		<SEQ TYPE="OPERATOR">.</SEQ>
-		<SEQ TYPE="OPERATOR">}</SEQ>
-		<SEQ TYPE="OPERATOR">{</SEQ>
-		<SEQ TYPE="OPERATOR">,</SEQ>
-		<SEQ TYPE="OPERATOR">;</SEQ>
-		<SEQ TYPE="OPERATOR">]</SEQ>
-		<SEQ TYPE="OPERATOR">[</SEQ>
-		<SEQ TYPE="OPERATOR">?</SEQ>
-		<SEQ TYPE="OPERATOR">@</SEQ>
-		<SEQ TYPE="OPERATOR">:</SEQ>
-
-		<MARK_PREVIOUS TYPE="FUNCTION" MATCH_TYPE="OPERATOR">(</MARK_PREVIOUS>
-		<SEQ TYPE="OPERATOR">)</SEQ>
-
-		<KEYWORDS>
-			<!-- Language constructs (24) -->
-			<KEYWORD1>abstract</KEYWORD1>
-			<KEYWORD1>break</KEYWORD1>
-			<KEYWORD1>byte</KEYWORD1>
-			<KEYWORD1>boolean</KEYWORD1>
-			<KEYWORD1>catch</KEYWORD1>
-			<KEYWORD1>case</KEYWORD1>
-			<KEYWORD1>class</KEYWORD1>
-			<KEYWORD1>char</KEYWORD1>
-			<KEYWORD1>continue</KEYWORD1>
-			<KEYWORD1>default</KEYWORD1>
-			<KEYWORD1>double</KEYWORD1>
-			<KEYWORD1>do</KEYWORD1>
-			<KEYWORD1>else</KEYWORD1>
-			<KEYWORD1>exists</KEYWORD1>
-			<KEYWORD1>extends</KEYWORD1>
-			<KEYWORD1>false</KEYWORD1>
-			<KEYWORD1>file</KEYWORD1>
-			<KEYWORD1>final</KEYWORD1>
-			<KEYWORD1>float</KEYWORD1>
-			<KEYWORD1>for</KEYWORD1>
-			<KEYWORD1>finally</KEYWORD1>
-			<KEYWORD1>function</KEYWORD1>
-			<KEYWORD1>if</KEYWORD1>
-			<KEYWORD1>import</KEYWORD1>
-			<KEYWORD1>implements</KEYWORD1>
-			<KEYWORD1>int</KEYWORD1>
-			<KEYWORD1>interface</KEYWORD1>
-			<KEYWORD1>instanceof</KEYWORD1>
-			<KEYWORD1>long</KEYWORD1>
-			<KEYWORD1>length</KEYWORD1>
-			<KEYWORD1>native</KEYWORD1>
-			<KEYWORD1>new</KEYWORD1>
-			<KEYWORD1>null</KEYWORD1>
-			<KEYWORD1>package</KEYWORD1>
-			<KEYWORD1>private</KEYWORD1>
-			<KEYWORD1>protected</KEYWORD1>
-			<KEYWORD1>public</KEYWORD1>
-			<KEYWORD1>return</KEYWORD1>
-			<KEYWORD1>switch</KEYWORD1>
-			<KEYWORD1>synchronized</KEYWORD1>
-			<KEYWORD1>short</KEYWORD1>
-			<KEYWORD1>static</KEYWORD1>
-			<KEYWORD1>super</KEYWORD1>
-			<KEYWORD1>try</KEYWORD1>
-			<KEYWORD1>true</KEYWORD1>
-			<KEYWORD1>this</KEYWORD1>
-			<KEYWORD1>throw</KEYWORD1>
-			<KEYWORD1>throws</KEYWORD1>
-			<KEYWORD1>threadsafe</KEYWORD1>
-			<KEYWORD1>transient</KEYWORD1>
-			<KEYWORD1>var</KEYWORD1>
-			<KEYWORD1>void</KEYWORD1>
-			<KEYWORD1>while</KEYWORD1>
-
-			<!-- objects -->
-			<KEYWORD2></KEYWORD2>
-			<KEYWORD2>document</KEYWORD2>
-			<KEYWORD2>connection</KEYWORD2>
-			<KEYWORD2>file</KEYWORD2>
-			<KEYWORD2>query</KEYWORD2>
-			<KEYWORD2>session</KEYWORD2>
-			<KEYWORD2>site</KEYWORD2>
-			<KEYWORD2>system</KEYWORD2>
-			<KEYWORD2>typeof</KEYWORD2>
-
-			<!-- methods & attributes -->
-			<KEYWORD3>AskQuestion</KEYWORD3>
-			<KEYWORD3>autoCommit</KEYWORD3>
-			<KEYWORD3>Close</KEYWORD3>
-			<KEYWORD3>Commit</KEYWORD3>
-			<KEYWORD3>Connect</KEYWORD3>
-			<KEYWORD3>CreateConnection</KEYWORD3>
-			<KEYWORD3>CreateDocument</KEYWORD3>
-			<KEYWORD3>CreatePropertySheet</KEYWORD3>
-			<KEYWORD3>CreateQuery</KEYWORD3>
-			<KEYWORD3>CreateWizard</KEYWORD3>
-			<KEYWORD3>cachedOutputTimeOut</KEYWORD3>
-			<KEYWORD3>charAt</KEYWORD3>
-			<KEYWORD3>connected</KEYWORD3>
-			<KEYWORD3>connection</KEYWORD3>
-			<KEYWORD3>connectionId</KEYWORD3>
-			<KEYWORD3>connectionName</KEYWORD3>
-			<KEYWORD3>connectionType</KEYWORD3>
-			<KEYWORD3>connectParameters</KEYWORD3>
-			<KEYWORD3>contentType</KEYWORD3>
-			<KEYWORD3>DeleteConnection</KEYWORD3>
-			<KEYWORD3>DeleteDocument</KEYWORD3>
-			<KEYWORD3>Disconnect</KEYWORD3>
-			<KEYWORD3>database</KEYWORD3>
-			<KEYWORD3>dataSource</KEYWORD3>
-			<KEYWORD3>dataSourceList</KEYWORD3>
-			<KEYWORD3>description</KEYWORD3>
-			<KEYWORD3>Exec</KEYWORD3>
-			<KEYWORD3>Execute</KEYWORD3>
-			<KEYWORD3>ExportTo</KEYWORD3>
-			<KEYWORD3>eof</KEYWORD3>
-			<KEYWORD3>errorNumber</KEYWORD3>
-			<KEYWORD3>errorString</KEYWORD3>
-			<KEYWORD3>GetColumnCount</KEYWORD3>
-			<KEYWORD3>GetColumnIndex</KEYWORD3>
-			<KEYWORD3>GetColumnLabel</KEYWORD3>
-			<KEYWORD3>GetConnection</KEYWORD3>
-			<KEYWORD3>GetConnectionIdList</KEYWORD3>
-			<KEYWORD3>GetConnectionNameList</KEYWORD3>
-			<KEYWORD3>GetCWD</KEYWORD3>
-			<KEYWORD3>GetDirectory</KEYWORD3>
-			<KEYWORD3>GetDocument</KEYWORD3>
-			<KEYWORD3>GetEmpty</KEYWORD3>
-			<KEYWORD3>GetEnv</KEYWORD3>
-			<KEYWORD3>GetErrorCode</KEYWORD3>
-			<KEYWORD3>GetErrorInfo</KEYWORD3>
-			<KEYWORD3>GetEventList</KEYWORD3>
-			<KEYWORD3>GetFilePtr</KEYWORD3>
-			<KEYWORD3>GetGenerated</KEYWORD3>
-			<KEYWORD3>GetRootDocument</KEYWORD3>
-			<KEYWORD3>GetRowCount</KEYWORD3>
-			<KEYWORD3>GetServerVariable</KEYWORD3>
-			<KEYWORD3>GetState</KEYWORD3>
-			<KEYWORD3>GetSupportedMoves</KEYWORD3>
-			<KEYWORD3>GetValue</KEYWORD3>
-			<KEYWORD3>ImportFrom</KEYWORD3>
-			<KEYWORD3>Include</KEYWORD3>
-			<KEYWORD3>id</KEYWORD3>
-			<KEYWORD3>indexOf</KEYWORD3>
-			<KEYWORD3>lastIndexOf</KEYWORD3>
-			<KEYWORD3>lastModified</KEYWORD3>
-			<KEYWORD3>length</KEYWORD3>
-			<KEYWORD3>location</KEYWORD3>
-			<KEYWORD3>Move</KEYWORD3>
-			<KEYWORD3>MoveFirst</KEYWORD3>
-			<KEYWORD3>MoveLast</KEYWORD3>
-			<KEYWORD3>MoveNext</KEYWORD3>
-			<KEYWORD3>MovePrevious</KEYWORD3>
-			<KEYWORD3>MoveRelative</KEYWORD3>
-			<KEYWORD3>mode</KEYWORD3>
-			<KEYWORD3>name</KEYWORD3>
-			<KEYWORD3>OnEvent</KEYWORD3>
-			<KEYWORD3>Open</KEYWORD3>
-			<KEYWORD3>Opened</KEYWORD3>
-			<KEYWORD3>parent</KEYWORD3>
-			<KEYWORD3>password</KEYWORD3>
-			<KEYWORD3>ReadChar</KEYWORD3>
-			<KEYWORD3>ReadLine</KEYWORD3>
-			<KEYWORD3>Refresh</KEYWORD3>
-			<KEYWORD3>Rollback</KEYWORD3>
-			<KEYWORD3>redirect</KEYWORD3>
-			<KEYWORD3>Seek</KEYWORD3>
-			<KEYWORD3>SetEnv</KEYWORD3>
-			<KEYWORD3>SetSQL</KEYWORD3>
-			<KEYWORD3>ShowMessage</KEYWORD3>
-			<KEYWORD3>substring</KEYWORD3>
-			<KEYWORD3>server</KEYWORD3>
-			<KEYWORD3>simulateCursors</KEYWORD3>
-			<KEYWORD3>size</KEYWORD3>
-			<KEYWORD3>source</KEYWORD3>
-			<KEYWORD3>status</KEYWORD3>
-			<KEYWORD3>timeOut</KEYWORD3>
-			<KEYWORD3>toLowerCase</KEYWORD3>
-			<KEYWORD3>toUpperCase</KEYWORD3>
-			<KEYWORD3>type</KEYWORD3>
-			<KEYWORD3>userId</KEYWORD3>
-			<KEYWORD3>value</KEYWORD3>
-			<KEYWORD3>WriteLine</KEYWORD3>
-			<KEYWORD3>Write</KEYWORD3>
-			<KEYWORD3>write</KEYWORD3>
-			<KEYWORD3>writeln</KEYWORD3>
-		</KEYWORDS>
-	</RULES>
-
-	<RULES IGNORE_CASE="TRUE" SET="powerdynamo-tag-general">
-		<SPAN TYPE="LITERAL1">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-		<SPAN TYPE="LITERAL1">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-
-		<KEYWORDS>
-			<KEYWORD2>NAME</KEYWORD2>
-		</KEYWORDS>
-	</RULES>
-
-	<RULES IGNORE_CASE="TRUE" SET="powerdynamo-tag-data">
-		<SPAN TYPE="LITERAL1">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-		<SPAN TYPE="LITERAL1">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-
-		<KEYWORDS>
-			<KEYWORD2>NAME</KEYWORD2>
-			<KEYWORD2>QUERY</KEYWORD2>
-		</KEYWORDS>
-	</RULES>
-
-	<RULES IGNORE_CASE="TRUE" SET="powerdynamo-tag-document">
-		<SPAN TYPE="LITERAL1">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-		<SPAN TYPE="LITERAL1">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-
-		<KEYWORDS>
-			<KEYWORD2>CONTENT_TYPE</KEYWORD2>
-			<KEYWORD2>REDIRECT</KEYWORD2>
-			<KEYWORD2>STATUS</KEYWORD2>
-			<KEYWORD2>CACHED_OUTPUT_TIMEOUT</KEYWORD2>
-		</KEYWORDS>
-	</RULES>
-
-</MODE>
diff --git a/qpython/src/main/assets/syntax/powershell.xml b/qpython/src/main/assets/syntax/powershell.xml
deleted file mode 100644
index 3473fc2b..00000000
--- a/qpython/src/main/assets/syntax/powershell.xml
+++ /dev/null
@@ -1,580 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!-- Windows PowerShell mode -->
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="commentStart" VALUE="&lt;#" />
-		<PROPERTY NAME="commentEnd" VALUE="#&gt;" />
-		<PROPERTY NAME="lineComment" VALUE="#" />
-		<PROPERTY NAME="indentOpenBrackets" VALUE="{" />
-		<PROPERTY NAME="indentCloseBrackets" VALUE="}" />
-	</PROPS>
-	
-	<RULES SET="PS_OPERATOR">
-		<SEQ TYPE="OPERATOR">-eq</SEQ>
-		<SEQ TYPE="OPERATOR">-ne</SEQ>
-		<SEQ TYPE="OPERATOR">-gt</SEQ>
-		<SEQ TYPE="OPERATOR">-ge</SEQ>
-		<SEQ TYPE="OPERATOR">-lt</SEQ>
-		<SEQ TYPE="OPERATOR">-le</SEQ>
-		<SEQ TYPE="OPERATOR">-ieq</SEQ>
-		<SEQ TYPE="OPERATOR">-ine</SEQ>
-		<SEQ TYPE="OPERATOR">-igt</SEQ>
-		<SEQ TYPE="OPERATOR">-ige</SEQ>
-		<SEQ TYPE="OPERATOR">-ilt</SEQ>
-		<SEQ TYPE="OPERATOR">-ile</SEQ>
-		<SEQ TYPE="OPERATOR">-ceq</SEQ>
-		<SEQ TYPE="OPERATOR">-cne</SEQ>
-		<SEQ TYPE="OPERATOR">-cgt</SEQ>
-		<SEQ TYPE="OPERATOR">-cge</SEQ>
-		<SEQ TYPE="OPERATOR">-clt</SEQ>
-		<SEQ TYPE="OPERATOR">-cle</SEQ>
-		<SEQ TYPE="OPERATOR">-like</SEQ>
-		<SEQ TYPE="OPERATOR">-notlike</SEQ>
-		<SEQ TYPE="OPERATOR">-match</SEQ>
-		<SEQ TYPE="OPERATOR">-notmatch</SEQ>
-		<SEQ TYPE="OPERATOR">-ilike</SEQ>
-		<SEQ TYPE="OPERATOR">-inotlike</SEQ>
-		<SEQ TYPE="OPERATOR">-imatch</SEQ>
-		<SEQ TYPE="OPERATOR">-inotmatch</SEQ>
-		<SEQ TYPE="OPERATOR">-clike</SEQ>
-		<SEQ TYPE="OPERATOR">-cnotlike</SEQ>
-		<SEQ TYPE="OPERATOR">-cmatch</SEQ>
-		<SEQ TYPE="OPERATOR">-cnotmatch</SEQ>
-		<SEQ TYPE="OPERATOR">-contains </SEQ>
-		<SEQ TYPE="OPERATOR">-notcontains</SEQ>
-		<SEQ TYPE="OPERATOR">-icontains</SEQ>
-		<SEQ TYPE="OPERATOR">-inotcontains</SEQ>
-		<SEQ TYPE="OPERATOR">-ccontains</SEQ>
-		<SEQ TYPE="OPERATOR">-cnotcontains</SEQ>
-		<SEQ TYPE="OPERATOR">-isnot</SEQ>
-		<SEQ TYPE="OPERATOR">-is</SEQ>
-		<SEQ TYPE="OPERATOR">-as</SEQ>
-		<SEQ TYPE="OPERATOR">-replace</SEQ>
-		<SEQ TYPE="OPERATOR">-ireplace</SEQ>
-		<SEQ TYPE="OPERATOR">-creplace</SEQ>
-		<SEQ TYPE="OPERATOR">-and</SEQ>
-		<SEQ TYPE="OPERATOR">-or</SEQ>
-		<SEQ TYPE="OPERATOR">-band</SEQ>
-		<SEQ TYPE="OPERATOR">-bor</SEQ>
-		<SEQ TYPE="OPERATOR">-not</SEQ>
-		<SEQ TYPE="OPERATOR">-bnot</SEQ>
-		<SEQ TYPE="OPERATOR">-f</SEQ>
-		<SEQ TYPE="OPERATOR">-xor</SEQ>
-		<SEQ TYPE="OPERATOR">-bxor</SEQ>
-		<SEQ TYPE="OPERATOR">+=</SEQ>
-		<SEQ TYPE="OPERATOR">-=</SEQ>
-		<SEQ TYPE="OPERATOR">*=</SEQ>
-		<SEQ TYPE="OPERATOR">/=</SEQ>
-		<SEQ TYPE="OPERATOR">%=</SEQ>
-		<SEQ TYPE="OPERATOR">--</SEQ>
-		<SEQ TYPE="OPERATOR">++</SEQ>
-		<SEQ TYPE="OPERATOR">+</SEQ>
-		<!-- <SEQ TYPE="OPERATOR">-</SEQ> -->
-		<SEQ TYPE="OPERATOR">*</SEQ>
-		<SEQ TYPE="OPERATOR">/</SEQ>
-		<SEQ TYPE="OPERATOR">%</SEQ>
-		<SEQ TYPE="OPERATOR">=</SEQ>
-		<SEQ TYPE="OPERATOR">!</SEQ>
-		<SEQ TYPE="OPERATOR">`</SEQ>
-	</RULES>
-	
-	<RULES SET="PS_PREVAR">
-		<KEYWORDS>
-			<KEYWORD2>$foreach</KEYWORD2>
-			<KEYWORD2>$LastExitCode</KEYWORD2>
-			<KEYWORD2>$Match</KEYWORD2>
-			<KEYWORD2>$OFS</KEYWORD2>
-			<KEYWORD2>$StackTrace</KEYWORD2>
-			<KEYWORD2>$Error</KEYWORD2>
-			<KEYWORD2>$DebugPreference</KEYWORD2>
-			<KEYWORD2>$PROFILE</KEYWORD2>
-			<KEYWORD2>$HOME</KEYWORD2>
-			<KEYWORD2>$Host</KEYWORD2>
-			<KEYWORD2>$MaximumHistoryCount</KEYWORD2>
-			<KEYWORD2>$MaximumAliasCount</KEYWORD2>
-			<KEYWORD2>$input</KEYWORD2>
-			<KEYWORD2>$ReportErrorShowSource</KEYWORD2>
-			<KEYWORD2>$ExecutionContext</KEYWORD2>
-			<KEYWORD2>$true</KEYWORD2>
-			<KEYWORD2>$VerbosePreference</KEYWORD2>
-			<KEYWORD2>$ShellId</KEYWORD2>
-			<KEYWORD2>$false</KEYWORD2>
-			<KEYWORD2>$switch</KEYWORD2>
-			<KEYWORD2>$null</KEYWORD2>
-			<KEYWORD2>$MaximumFunctionCount</KEYWORD2>
-			<KEYWORD2>$line</KEYWORD2>
-			<KEYWORD2>$ConsoleFileName</KEYWORD2>
-			<KEYWORD2>$ReportErrorShowStackTrace</KEYWORD2>
-			<KEYWORD2>$FormatEnumerationLimit</KEYWORD2>
-			<KEYWORD2>$PSHOME</KEYWORD2>
-			<KEYWORD2>$lastWord</KEYWORD2>
-			<KEYWORD2>$MyInvocation</KEYWORD2>
-			<KEYWORD2>$PWD</KEYWORD2>
-			<KEYWORD2>$ReportErrorShowExceptionClass</KEYWORD2>
-			<KEYWORD2>$ProgressPreference</KEYWORD2>
-			<KEYWORD2>$ErrorActionPreference</KEYWORD2>
-			<KEYWORD2>$args</KEYWORD2>
-			<KEYWORD2>$MaximumErrorCount</KEYWORD2>
-			<KEYWORD2>$NestedPromptLevel</KEYWORD2>
-			<KEYWORD2>$WhatIfPreference</KEYWORD2>
-			<KEYWORD2>$ReportErrorShowInnerException</KEYWORD2>
-			<KEYWORD2>$ErrorView</KEYWORD2>
-			<KEYWORD2>$WarningPreference</KEYWORD2>
-			<KEYWORD2>$PID</KEYWORD2>
-			<KEYWORD2>$ConfirmPreference</KEYWORD2>
-			<KEYWORD2>$MaximumDriveCount</KEYWORD2>
-			<KEYWORD2>$MaximumVariableCount</KEYWORD2>
-			<KEYWORD2>$this</KEYWORD2>
-			<KEYWORD2>$$</KEYWORD2>
-			<KEYWORD2>$^</KEYWORD2>
-			<KEYWORD2>$_</KEYWORD2>
-			<KEYWORD2>$?</KEYWORD2>
-		</KEYWORDS>
-	</RULES>
-
-	<RULES HIGHLIGHT_DIGITS="TRUE"
-		DIGIT_RE="[0-9][0-9a-zA-Z]*"
-		NO_WORD_SEP="-">
- 		<EOL_SPAN TYPE="COMMENT1">#</EOL_SPAN>
- 		
- 		<SPAN TYPE="COMMENT2">
- 			<BEGIN>&lt;#</BEGIN>
-			<END>#&gt;</END>
-		</SPAN>
-
-		<SEQ_REGEXP HASH_CHAR="$" TYPE="KEYWORD2">[\$]+[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*</SEQ_REGEXP>
-
-		<IMPORT DELEGATE="PS_PREVAR"/>
-		<IMPORT DELEGATE="PS_OPERATOR"/>
-
-		<SPAN TYPE="LITERAL4">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-
-		<SPAN TYPE="LITERAL1">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-
-		<SEQ TYPE="MARKUP">,</SEQ>
-		<SEQ TYPE="MARKUP">.</SEQ>
-		<SEQ TYPE="MARKUP">::</SEQ>
-		<SEQ TYPE="MARKUP">|</SEQ>
-		<SEQ TYPE="MARKUP">{</SEQ>
-		<SEQ TYPE="MARKUP">}</SEQ>
-		<SEQ TYPE="MARKUP">&gt;</SEQ>
-		<SEQ TYPE="MARKUP">&gt;&gt;</SEQ>
-		<SPAN TYPE="LABEL">
-			<BEGIN>[</BEGIN>
-			<END>]</END>
-		</SPAN>
-		
-		<MARK_PREVIOUS TYPE="FUNCTION" MATCH_TYPE="MARKUP">(</MARK_PREVIOUS>
-		<SEQ TYPE="MARKUP">)</SEQ>
-
-		<KEYWORDS>
-			<KEYWORD1>begin</KEYWORD1>
-			<KEYWORD1>break</KEYWORD1>
-			<KEYWORD1>catch</KEYWORD1>
-			<KEYWORD1>continue</KEYWORD1>
-			<KEYWORD1>default</KEYWORD1>
-			<KEYWORD1>do</KEYWORD1>
-			<KEYWORD1>else</KEYWORD1>
-			<KEYWORD1>elseif</KEYWORD1>
-			<KEYWORD1>end</KEYWORD1>
-			<KEYWORD1>filter</KEYWORD1>
-			<KEYWORD1>finally</KEYWORD1>
-			<KEYWORD1>for</KEYWORD1>
-			<KEYWORD1>foreach</KEYWORD1>
-			<KEYWORD1>function</KEYWORD1>
-			<KEYWORD1>if</KEYWORD1>
-			<KEYWORD1>in</KEYWORD1>
-			<KEYWORD1>param</KEYWORD1>
-			<KEYWORD1>process</KEYWORD1>
-			<KEYWORD1>return</KEYWORD1>
-			<KEYWORD1>switch</KEYWORD1>
-			<KEYWORD1>throw</KEYWORD1>
-			<KEYWORD1>trap</KEYWORD1>
-			<KEYWORD1>try</KEYWORD1>
-			<KEYWORD1>until</KEYWORD1>
-			<KEYWORD1>where</KEYWORD1>
-			<KEYWORD1>while</KEYWORD1>
-			<KEYWORD1>ref</KEYWORD1>
-
-			<KEYWORD3>Add-Computer</KEYWORD3>
-			<KEYWORD3>Add-Content</KEYWORD3>
-			<KEYWORD3>Add-History</KEYWORD3>
-			<KEYWORD3>Add-Member</KEYWORD3>
-			<KEYWORD3>Add-PSSnapin</KEYWORD3>
-			<KEYWORD3>Add-Type</KEYWORD3>
-			<KEYWORD3>Checkpoint-Computer</KEYWORD3>
-			<KEYWORD3>Clear-Content</KEYWORD3>
-			<KEYWORD3>Clear-EventLog</KEYWORD3>
-			<KEYWORD3>Clear-History</KEYWORD3>
-			<KEYWORD3>Clear-Item</KEYWORD3>
-			<KEYWORD3>Clear-ItemProperty</KEYWORD3>
-			<KEYWORD3>Clear-Variable</KEYWORD3>
-			<KEYWORD3>Compare-Object</KEYWORD3>
-			<KEYWORD3>Complete-Transaction</KEYWORD3>
-			<KEYWORD3>Connect-WSMan</KEYWORD3>
-			<KEYWORD3>ConvertFrom-Csv</KEYWORD3>
-			<KEYWORD3>ConvertFrom-SecureString</KEYWORD3>
-			<KEYWORD3>ConvertFrom-StringData</KEYWORD3>
-			<KEYWORD3>Convert-Path</KEYWORD3>
-			<KEYWORD3>ConvertTo-Csv</KEYWORD3>
-			<KEYWORD3>ConvertTo-Html</KEYWORD3>
-			<KEYWORD3>ConvertTo-SecureString</KEYWORD3>
-			<KEYWORD3>ConvertTo-Xml</KEYWORD3>
-			<KEYWORD3>Copy-Item</KEYWORD3>
-			<KEYWORD3>Copy-ItemProperty</KEYWORD3>
-			<KEYWORD3>Debug-Process</KEYWORD3>
-			<KEYWORD3>Disable-ComputerRestore</KEYWORD3>
-			<KEYWORD3>Disable-PSBreakpoint</KEYWORD3>
-			<KEYWORD3>Disable-PSSessionConfiguration</KEYWORD3>
-			<KEYWORD3>Disable-WSManCredSSP</KEYWORD3>
-			<KEYWORD3>Disconnect-WSMan</KEYWORD3>
-			<KEYWORD3>Enable-ComputerRestore</KEYWORD3>
-			<KEYWORD3>Enable-PSBreakpoint</KEYWORD3>
-			<KEYWORD3>Enable-PSSessionConfiguration</KEYWORD3>
-			<KEYWORD3>Enable-WSManCredSSP</KEYWORD3>
-			<KEYWORD3>Enter-PSSession</KEYWORD3>
-			<KEYWORD3>Exit-PSSession</KEYWORD3>
-			<KEYWORD3>Export-Alias</KEYWORD3>
-			<KEYWORD3>Export-Clixml</KEYWORD3>
-			<KEYWORD3>Export-Console</KEYWORD3>
-			<KEYWORD3>Export-Counter</KEYWORD3>
-			<KEYWORD3>Export-Csv</KEYWORD3>
-			<KEYWORD3>Export-FormatData</KEYWORD3>
-			<KEYWORD3>Export-ModuleMember</KEYWORD3>
-			<KEYWORD3>Export-PSSession</KEYWORD3>
-			<KEYWORD3>ForEach-Object</KEYWORD3>
-			<KEYWORD3>Format-Custom</KEYWORD3>
-			<KEYWORD3>Format-List</KEYWORD3>
-			<KEYWORD3>Format-Table</KEYWORD3>
-			<KEYWORD3>Format-Wide</KEYWORD3>
-			<KEYWORD3>Get-Acl</KEYWORD3>
-			<KEYWORD3>Get-Alias</KEYWORD3>
-			<KEYWORD3>Get-AuthenticodeSignature</KEYWORD3>
-			<KEYWORD3>Get-ChildItem</KEYWORD3>
-			<KEYWORD3>Get-Command</KEYWORD3>
-			<KEYWORD3>Get-ComputerRestorePoint</KEYWORD3>
-			<KEYWORD3>Get-Content</KEYWORD3>
-			<KEYWORD3>Get-Counter</KEYWORD3>
-			<KEYWORD3>Get-Credential</KEYWORD3>
-			<KEYWORD3>Get-Culture</KEYWORD3>
-			<KEYWORD3>Get-Date</KEYWORD3>
-			<KEYWORD3>Get-Event</KEYWORD3>
-			<KEYWORD3>Get-EventLog</KEYWORD3>
-			<KEYWORD3>Get-EventSubscriber</KEYWORD3>
-			<KEYWORD3>Get-ExecutionPolicy</KEYWORD3>
-			<KEYWORD3>Get-FormatData</KEYWORD3>
-			<KEYWORD3>Get-Help</KEYWORD3>
-			<KEYWORD3>Get-History</KEYWORD3>
-			<KEYWORD3>Get-Host</KEYWORD3>
-			<KEYWORD3>Get-HotFix</KEYWORD3>
-			<KEYWORD3>Get-Item</KEYWORD3>
-			<KEYWORD3>Get-ItemProperty</KEYWORD3>
-			<KEYWORD3>Get-Job</KEYWORD3>
-			<KEYWORD3>Get-Location</KEYWORD3>
-			<KEYWORD3>Get-Member</KEYWORD3>
-			<KEYWORD3>Get-Module</KEYWORD3>
-			<KEYWORD3>Get-PfxCertificate</KEYWORD3>
-			<KEYWORD3>Get-Process</KEYWORD3>
-			<KEYWORD3>Get-PSBreakpoint</KEYWORD3>
-			<KEYWORD3>Get-PSCallStack</KEYWORD3>
-			<KEYWORD3>Get-PSDrive</KEYWORD3>
-			<KEYWORD3>Get-PSProvider</KEYWORD3>
-			<KEYWORD3>Get-PSSession</KEYWORD3>
-			<KEYWORD3>Get-PSSessionConfiguration</KEYWORD3>
-			<KEYWORD3>Get-PSSnapin</KEYWORD3>
-			<KEYWORD3>Get-Random</KEYWORD3>
-			<KEYWORD3>Get-Service</KEYWORD3>
-			<KEYWORD3>Get-TraceSource</KEYWORD3>
-			<KEYWORD3>Get-Transaction</KEYWORD3>
-			<KEYWORD3>Get-UICulture</KEYWORD3>
-			<KEYWORD3>Get-Unique</KEYWORD3>
-			<KEYWORD3>Get-Variable</KEYWORD3>
-			<KEYWORD3>Get-WinEvent</KEYWORD3>
-			<KEYWORD3>Get-WmiObject</KEYWORD3>
-			<KEYWORD3>Get-WSManCredSSP</KEYWORD3>
-			<KEYWORD3>Get-WSManInstance</KEYWORD3>
-			<KEYWORD3>Group-Object</KEYWORD3>
-			<KEYWORD3>Import-Alias</KEYWORD3>
-			<KEYWORD3>Import-Clixml</KEYWORD3>
-			<KEYWORD3>Import-Counter</KEYWORD3>
-			<KEYWORD3>Import-Csv</KEYWORD3>
-			<KEYWORD3>Import-LocalizedData</KEYWORD3>
-			<KEYWORD3>Import-Module</KEYWORD3>
-			<KEYWORD3>Import-PSSession</KEYWORD3>
-			<KEYWORD3>Invoke-Command</KEYWORD3>
-			<KEYWORD3>Invoke-Expression</KEYWORD3>
-			<KEYWORD3>Invoke-History</KEYWORD3>
-			<KEYWORD3>Invoke-Item</KEYWORD3>
-			<KEYWORD3>Invoke-WmiMethod</KEYWORD3>
-			<KEYWORD3>Invoke-WSManAction</KEYWORD3>
-			<KEYWORD3>Join-Path</KEYWORD3>
-			<KEYWORD3>Limit-EventLog</KEYWORD3>
-			<KEYWORD3>Measure-Command</KEYWORD3>
-			<KEYWORD3>Measure-Object</KEYWORD3>
-			<KEYWORD3>Move-Item</KEYWORD3>
-			<KEYWORD3>Move-ItemProperty</KEYWORD3>
-			<KEYWORD3>New-Alias</KEYWORD3>
-			<KEYWORD3>New-Event</KEYWORD3>
-			<KEYWORD3>New-EventLog</KEYWORD3>
-			<KEYWORD3>New-Item</KEYWORD3>
-			<KEYWORD3>New-ItemProperty</KEYWORD3>
-			<KEYWORD3>New-Module</KEYWORD3>
-			<KEYWORD3>New-ModuleManifest</KEYWORD3>
-			<KEYWORD3>New-Object</KEYWORD3>
-			<KEYWORD3>New-PSDrive</KEYWORD3>
-			<KEYWORD3>New-PSSession</KEYWORD3>
-			<KEYWORD3>New-Service</KEYWORD3>
-			<KEYWORD3>New-TimeSpan</KEYWORD3>
-			<KEYWORD3>New-Variable</KEYWORD3>
-			<KEYWORD3>New-WebServiceProxy</KEYWORD3>
-			<KEYWORD3>New-WSManInstance</KEYWORD3>
-			<KEYWORD3>New-WSManSessionOption</KEYWORD3>
-			<KEYWORD3>Out-Default</KEYWORD3>
-			<KEYWORD3>Out-File</KEYWORD3>
-			<KEYWORD3>Out-GridView</KEYWORD3>
-			<KEYWORD3>Out-Host</KEYWORD3>
-			<KEYWORD3>Out-Null</KEYWORD3>
-			<KEYWORD3>Out-Printer</KEYWORD3>
-			<KEYWORD3>Out-String</KEYWORD3>
-			<KEYWORD3>Pop-Location</KEYWORD3>
-			<KEYWORD3>Push-Location</KEYWORD3>
-			<KEYWORD3>Read-Host</KEYWORD3>
-			<KEYWORD3>Receive-Job</KEYWORD3>
-			<KEYWORD3>Register-EngineEvent</KEYWORD3>
-			<KEYWORD3>Register-ObjectEvent</KEYWORD3>
-			<KEYWORD3>Register-PSSessionConfiguration</KEYWORD3>
-			<KEYWORD3>Register-WmiEvent</KEYWORD3>
-			<KEYWORD3>Remove-Computer</KEYWORD3>
-			<KEYWORD3>Remove-Event</KEYWORD3>
-			<KEYWORD3>Remove-EventLog</KEYWORD3>
-			<KEYWORD3>Remove-Item</KEYWORD3>
-			<KEYWORD3>Remove-ItemProperty</KEYWORD3>
-			<KEYWORD3>Remove-Job</KEYWORD3>
-			<KEYWORD3>Remove-Module</KEYWORD3>
-			<KEYWORD3>Remove-PSBreakpoint</KEYWORD3>
-			<KEYWORD3>Remove-PSDrive</KEYWORD3>
-			<KEYWORD3>Remove-PSSession</KEYWORD3>
-			<KEYWORD3>Remove-PSSnapin</KEYWORD3>
-			<KEYWORD3>Remove-Variable</KEYWORD3>
-			<KEYWORD3>Remove-WmiObject</KEYWORD3>
-			<KEYWORD3>Remove-WSManInstance</KEYWORD3>
-			<KEYWORD3>Rename-Computer</KEYWORD3>
-			<KEYWORD3>Rename-Item</KEYWORD3>
-			<KEYWORD3>Rename-ItemProperty</KEYWORD3>
-			<KEYWORD3>Reset-ComputerMachinePassword</KEYWORD3>
-			<KEYWORD3>Resolve-Path</KEYWORD3>
-			<KEYWORD3>Restart-Computer</KEYWORD3>
-			<KEYWORD3>Restart-Service</KEYWORD3>
-			<KEYWORD3>Restore-Computer</KEYWORD3>
-			<KEYWORD3>Resume-Service</KEYWORD3>
-			<KEYWORD3>Select-Object</KEYWORD3>
-			<KEYWORD3>Select-String</KEYWORD3>
-			<KEYWORD3>Select-Xml</KEYWORD3>
-			<KEYWORD3>Send-MailMessage</KEYWORD3>
-			<KEYWORD3>Set-Acl</KEYWORD3>
-			<KEYWORD3>Set-Alias</KEYWORD3>
-			<KEYWORD3>Set-AuthenticodeSignature</KEYWORD3>
-			<KEYWORD3>Set-Content</KEYWORD3>
-			<KEYWORD3>Set-Date</KEYWORD3>
-			<KEYWORD3>Set-ExecutionPolicy</KEYWORD3>
-			<KEYWORD3>Set-Item</KEYWORD3>
-			<KEYWORD3>Set-ItemProperty</KEYWORD3>
-			<KEYWORD3>Set-Location</KEYWORD3>
-			<KEYWORD3>Set-PSBreakpoint</KEYWORD3>
-			<KEYWORD3>Set-PSDebug</KEYWORD3>
-			<KEYWORD3>Set-PSSessionConfiguration</KEYWORD3>
-			<KEYWORD3>Set-Service</KEYWORD3>
-			<KEYWORD3>Set-StrictMode</KEYWORD3>
-			<KEYWORD3>Set-TraceSource</KEYWORD3>
-			<KEYWORD3>Set-Variable</KEYWORD3>
-			<KEYWORD3>Set-WmiInstance</KEYWORD3>
-			<KEYWORD3>Set-WSManInstance</KEYWORD3>
-			<KEYWORD3>Set-WSManQuickConfig</KEYWORD3>
-			<KEYWORD3>Show-EventLog</KEYWORD3>
-			<KEYWORD3>Sort-Object</KEYWORD3>
-			<KEYWORD3>Split-Path</KEYWORD3>
-			<KEYWORD3>Start-Job</KEYWORD3>
-			<KEYWORD3>Start-Process</KEYWORD3>
-			<KEYWORD3>Start-Service</KEYWORD3>
-			<KEYWORD3>Start-Sleep</KEYWORD3>
-			<KEYWORD3>Start-Transaction</KEYWORD3>
-			<KEYWORD3>Start-Transcript</KEYWORD3>
-			<KEYWORD3>Stop-Computer</KEYWORD3>
-			<KEYWORD3>Stop-Job</KEYWORD3>
-			<KEYWORD3>Stop-Process</KEYWORD3>
-			<KEYWORD3>Stop-Service</KEYWORD3>
-			<KEYWORD3>Stop-Transcript</KEYWORD3>
-			<KEYWORD3>Suspend-Service</KEYWORD3>
-			<KEYWORD3>Tee-Object</KEYWORD3>
-			<KEYWORD3>Test-ComputerSecureChannel</KEYWORD3>
-			<KEYWORD3>Test-Connection</KEYWORD3>
-			<KEYWORD3>Test-ModuleManifest</KEYWORD3>
-			<KEYWORD3>Test-Path</KEYWORD3>
-			<KEYWORD3>Test-WSMan</KEYWORD3>
-			<KEYWORD3>Trace-Command</KEYWORD3>
-			<KEYWORD3>Undo-Transaction</KEYWORD3>
-			<KEYWORD3>Unregister-Event</KEYWORD3>
-			<KEYWORD3>Unregister-PSSessionConfiguration</KEYWORD3>
-			<KEYWORD3>Update-FormatData</KEYWORD3>
-			<KEYWORD3>Update-List</KEYWORD3>
-			<KEYWORD3>Update-TypeData</KEYWORD3>
-			<KEYWORD3>Use-Transaction</KEYWORD3>
-			<KEYWORD3>Wait-Event</KEYWORD3>
-			<KEYWORD3>Wait-Job</KEYWORD3>
-			<KEYWORD3>Wait-Process</KEYWORD3>
-			<KEYWORD3>Where-Object</KEYWORD3>
-			<KEYWORD3>Write-Debug</KEYWORD3>
-			<KEYWORD3>Write-Error</KEYWORD3>
-			<KEYWORD3>Write-EventLog</KEYWORD3>
-			<KEYWORD3>Write-Host</KEYWORD3>
-			<KEYWORD3>Write-Output</KEYWORD3>
-			<KEYWORD3>Write-Progress</KEYWORD3>
-			<KEYWORD3>Write-Verbose</KEYWORD3>
-			<KEYWORD3>Write-Warning</KEYWORD3>
-
-<!-- 			<KEYWORD3>%</KEYWORD3>
-			<KEYWORD3>?</KEYWORD3> -->
-			<KEYWORD3>ac</KEYWORD3>
-			<KEYWORD3>asnp</KEYWORD3>
-			<KEYWORD3>cat</KEYWORD3>
-			<KEYWORD3>cd</KEYWORD3>
-			<KEYWORD3>chdir</KEYWORD3>
-			<KEYWORD3>clc</KEYWORD3>
-			<KEYWORD3>clear</KEYWORD3>
-			<KEYWORD3>clhy</KEYWORD3>
-			<KEYWORD3>cli</KEYWORD3>
-			<KEYWORD3>clp</KEYWORD3>
-			<KEYWORD3>cls</KEYWORD3>
-			<KEYWORD3>clv</KEYWORD3>
-			<KEYWORD3>compare</KEYWORD3>
-			<KEYWORD3>copy</KEYWORD3>
-			<KEYWORD3>cp</KEYWORD3>
-			<KEYWORD3>cpi</KEYWORD3>
-			<KEYWORD3>cpp</KEYWORD3>
-			<KEYWORD3>cvpa</KEYWORD3>
-			<KEYWORD3>dbp</KEYWORD3>
-			<KEYWORD3>del</KEYWORD3>
-			<KEYWORD3>diff</KEYWORD3>
-			<KEYWORD3>dir</KEYWORD3>
-			<KEYWORD3>ebp</KEYWORD3>
-			<KEYWORD3>echo</KEYWORD3>
-			<KEYWORD3>emm</KEYWORD3>
-			<KEYWORD3>epal</KEYWORD3>
-			<KEYWORD3>epcsv</KEYWORD3>
-			<KEYWORD3>EPSN</KEYWORD3>
-			<KEYWORD3>erase</KEYWORD3>
-			<KEYWORD3>ETSN</KEYWORD3>
-			<KEYWORD3>EXSN</KEYWORD3>
-			<KEYWORD3>fc</KEYWORD3>
-			<KEYWORD3>fl</KEYWORD3>
-			<KEYWORD3>ft</KEYWORD3>
-			<KEYWORD3>fw</KEYWORD3>
-			<KEYWORD3>gal</KEYWORD3>
-			<KEYWORD3>gbp</KEYWORD3>
-			<KEYWORD3>gc</KEYWORD3>
-			<KEYWORD3>gci</KEYWORD3>
-			<KEYWORD3>gcm</KEYWORD3>
-			<KEYWORD3>gcs</KEYWORD3>
-			<KEYWORD3>gdr</KEYWORD3>
-			<KEYWORD3>ghy</KEYWORD3>
-			<KEYWORD3>gi</KEYWORD3>
-			<KEYWORD3>gjb</KEYWORD3>
-			<KEYWORD3>gl</KEYWORD3>
-			<KEYWORD3>gm</KEYWORD3>
-			<KEYWORD3>gmo</KEYWORD3>
-			<KEYWORD3>gp</KEYWORD3>
-			<KEYWORD3>gps</KEYWORD3>
-			<KEYWORD3>grid</KEYWORD3>
-			<KEYWORD3>group</KEYWORD3>
-			<KEYWORD3>gsn</KEYWORD3>
-			<KEYWORD3>gsnp</KEYWORD3>
-			<KEYWORD3>gsv</KEYWORD3>
-			<KEYWORD3>gu</KEYWORD3>
-			<KEYWORD3>gv</KEYWORD3>
-			<KEYWORD3>gwmi</KEYWORD3>
-			<KEYWORD3>h</KEYWORD3>
-			<KEYWORD3>history</KEYWORD3>
-			<KEYWORD3>icm</KEYWORD3>
-			<KEYWORD3>iex</KEYWORD3>
-			<KEYWORD3>ihy</KEYWORD3>
-			<KEYWORD3>ii</KEYWORD3>
-			<KEYWORD3>imo</KEYWORD3>
-			<KEYWORD3>ipal</KEYWORD3>
-			<KEYWORD3>ipcsv</KEYWORD3>
-			<KEYWORD3>IPSN</KEYWORD3>
-			<KEYWORD3>iwmi</KEYWORD3>
-			<KEYWORD3>kill</KEYWORD3>
-			<KEYWORD3>lp</KEYWORD3>
-			<KEYWORD3>ls</KEYWORD3>
-			<KEYWORD3>man</KEYWORD3>
-			<KEYWORD3>md</KEYWORD3>
-			<KEYWORD3>measure</KEYWORD3>
-			<KEYWORD3>mi</KEYWORD3>
-			<KEYWORD3>mount</KEYWORD3>
-			<KEYWORD3>move</KEYWORD3>
-			<KEYWORD3>mp</KEYWORD3>
-			<KEYWORD3>mv</KEYWORD3>
-			<KEYWORD3>nal</KEYWORD3>
-			<KEYWORD3>ndr</KEYWORD3>
-			<KEYWORD3>ni</KEYWORD3>
-			<KEYWORD3>nmo</KEYWORD3>
-			<KEYWORD3>nsn</KEYWORD3>
-			<KEYWORD3>nv</KEYWORD3>
-			<KEYWORD3>ogv</KEYWORD3>
-			<KEYWORD3>oh</KEYWORD3>
-			<KEYWORD3>popd</KEYWORD3>
-			<KEYWORD3>ps</KEYWORD3>
-			<KEYWORD3>pushd</KEYWORD3>
-			<KEYWORD3>pwd</KEYWORD3>
-			<KEYWORD3>r</KEYWORD3>
-			<KEYWORD3>rbp</KEYWORD3>
-			<KEYWORD3>rcjb</KEYWORD3>
-			<KEYWORD3>rd</KEYWORD3>
-			<KEYWORD3>rdr</KEYWORD3>
-			<KEYWORD3>ren</KEYWORD3>
-			<KEYWORD3>ri</KEYWORD3>
-			<KEYWORD3>rjb</KEYWORD3>
-			<KEYWORD3>rm</KEYWORD3>
-			<KEYWORD3>rmdir</KEYWORD3>
-			<KEYWORD3>rni</KEYWORD3>
-			<KEYWORD3>rnp</KEYWORD3>
-			<KEYWORD3>rp</KEYWORD3>
-			<KEYWORD3>rsn</KEYWORD3>
-			<KEYWORD3>rsnp</KEYWORD3>
-			<KEYWORD3>rv</KEYWORD3>
-			<KEYWORD3>rvpa</KEYWORD3>
-			<KEYWORD3>rwmi</KEYWORD3>
-			<KEYWORD3>sajb</KEYWORD3>
-			<KEYWORD3>sal</KEYWORD3>
-			<KEYWORD3>sasv</KEYWORD3>
-			<KEYWORD3>sbp</KEYWORD3>
-			<KEYWORD3>sc</KEYWORD3>
-			<KEYWORD3>select</KEYWORD3>
-			<KEYWORD3>set</KEYWORD3>
-			<KEYWORD3>si</KEYWORD3>
-			<KEYWORD3>sl</KEYWORD3>
-			<KEYWORD3>sleep</KEYWORD3>
-			<KEYWORD3>sort</KEYWORD3>
-			<KEYWORD3>sp</KEYWORD3>
-			<KEYWORD3>spjb</KEYWORD3>
-			<KEYWORD3>spps</KEYWORD3>
-			<KEYWORD3>spsv</KEYWORD3>
-			<KEYWORD3>start</KEYWORD3>
-			<KEYWORD3>sv</KEYWORD3>
-			<KEYWORD3>swmi</KEYWORD3>
-			<KEYWORD3>tee</KEYWORD3>
-			<KEYWORD3>type</KEYWORD3>
-			<KEYWORD3>wjb</KEYWORD3>
-			<KEYWORD3>write</KEYWORD3>
-		</KEYWORDS>
-	</RULES>
-</MODE>
- 	  	 
diff --git a/qpython/src/main/assets/syntax/progress.xml b/qpython/src/main/assets/syntax/progress.xml
deleted file mode 100644
index 71256eb9..00000000
--- a/qpython/src/main/assets/syntax/progress.xml
+++ /dev/null
@@ -1,3748 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!-- ====================================================================== -->
-<!-- Progress mode for jEdit 4.2+                                           -->
-<!--                                                                        -->
-<!-- This is a jEdit syntax file for Progress Open Edge 10.0A               -->
-<!--                                                                        -->
-<!-- For comments / suggestions / contributions, please contact me at       -->
-<!-- p.tingen@vcd.nl                                                        -->
-<!--                                                                        -->
-<!-- ====================================================================== -->
-<!--                                                                        -->
-<!-- Contributors: PT Patrick Tingen                                        -->
-<!--               GW Gerben Wieringa                                       -->
-<!--               SH Stephen Hawkins                                       -->
-<!--                                                                        -->
-<!-- ====================================================================== -->
-<!-- 2001-07-17 PT Initial version for Progress 8.2                         -->
-<!-- 2002-10-08 GW Added some keywords                                      -->
-<!-- 2003-02-18 PT Added some keywords                                      -->
-<!-- 2003-05-21 PT Rewritten. Thanks to GW & SH !                           -->
-<!-- 2004-01-26 PT Generated using Progress program for Progress 9.1D       -->
-<!-- 2004-02-04 PT Generated using Progress program for Open Edge 10.0A     -->
-<!-- 2004-02-06 PT Corrected due to validating errors against xmode.dtd     -->
-<!-- 2004-02-16 PT Fixed 'or choose of' being reported as invalid.          -->
-<!-- 2004-04-29 PT Added some appbuilder constants                          -->
-<!-- ====================================================================== -->
-<!-- Special thanks to Gerben and Stephen for their support.                -->
-<!-- ====================================================================== -->
-
-<MODE>
-  <PROPS>
-    <PROPERTY NAME="commentStart"        VALUE="/*" />
-    <PROPERTY NAME="commentEnd"          VALUE="*/" />
-    <PROPERTY NAME="boxComment"          VALUE="**" />
-    <PROPERTY NAME="lineComment"         VALUE="&amp;scop cmt " />
-    <PROPERTY NAME="indentNextLine"      VALUE="\s*(if|do|for|else|case|repeat|procedure|function)(\s+.*|\s*)" />
-    <PROPERTY NAME="wordBreakChars"      VALUE=",.;:/?^[]@" />
-    <PROPERTY NAME="indentOpenBrackets"  VALUE="{" />
-    <PROPERTY NAME="indentCloseBrackets" VALUE="}" />
-  </PROPS>
-
-  <RULES SET="COMMENT" DEFAULT="COMMENT1" IGNORE_CASE="TRUE">
-      <SPAN TYPE="COMMENT1" DELEGATE="COMMENT">
-      <BEGIN>/*</BEGIN> <END>*/</END>
-      </SPAN>
-  </RULES>
-
-  <RULES IGNORE_CASE="TRUE" HIGHLIGHT_DIGITS="TRUE">
-    <!-- COMMENT1   : Normal Progress comments -->
-    <!-- LITERAL1   : text between ' or " -->
-    <!-- LITERAL2   :  -->
-    <!-- MARKUP     :  -->
-    <!-- LABEL      : Progress block labels -->
-    <!-- FUNCTION   : attributes and methods -->
-    <!-- OPERATOR   : All operators -->
-    <!-- INVALID    : Deprecated keywords -->
-    <!-- NON INVALID: Correction for non-invalid keywords -->
-
-    <!-- COMMENT1   : Normal Progress comments -->
-    <SPAN TYPE="COMMENT1" DELEGATE="COMMENT">
-     <BEGIN>/*</BEGIN>
-     <END>*/</END>
-    </SPAN>
-    <!-- LITERAL1   : text between ' or " -->
-      <SPAN TYPE="LITERAL1" ESCAPE="~">
-        <BEGIN>'</BEGIN>
-        <END>'</END>
-      </SPAN>
-
-      <SPAN TYPE="LITERAL1" ESCAPE="~">
-        <BEGIN>"</BEGIN>
-        <END>"</END>
-      </SPAN>
-
-    <!-- LABEL      : Progress block labels -->
-      <MARK_FOLLOWING TYPE="LABEL">{&amp;</MARK_FOLLOWING>
-
-    <!-- OPERATOR   : All operators -->
-      <SEQ TYPE="OPERATOR">*</SEQ>
-      <SEQ TYPE="OPERATOR">+</SEQ>
-      <SEQ TYPE="OPERATOR">,</SEQ>
-      <SEQ TYPE="OPERATOR">.</SEQ>
-      <SEQ TYPE="OPERATOR">/</SEQ>
-      <SEQ TYPE="OPERATOR">=</SEQ>
-      <SEQ TYPE="OPERATOR">?</SEQ>
-      <SEQ TYPE="OPERATOR">@</SEQ>
-      <SEQ TYPE="OPERATOR">[</SEQ>
-      <SEQ TYPE="OPERATOR">]</SEQ>
-      <SEQ TYPE="OPERATOR">^</SEQ>
-      <SEQ TYPE="OPERATOR">(</SEQ>
-      <SEQ TYPE="OPERATOR">)</SEQ>
-      <!-- GT, EQ etc -->
-      <SEQ TYPE="OPERATOR">&gt;=</SEQ>
-      <SEQ TYPE="OPERATOR">&lt;=</SEQ>
-      <SEQ TYPE="OPERATOR">&lt;&gt;</SEQ>
-
-    <!-- LABEL      : Progress block labels -->
-      <!-- Better would be to search for regexp  ^[[:blank:]]*[[:graph:]]+:$ -->
-      <!-- but this is not (yet) implemented since regexps cannot match     -->
-      <!-- anything that does not have a fixed starting character.          -->
-      <MARK_PREVIOUS TYPE="LABEL" AT_WHITESPACE_END="TRUE" MATCH_TYPE="OPERATOR">:</MARK_PREVIOUS>
-
-    <!-- FUNCTION   : attributes and methods -->
-      <MARK_FOLLOWING TYPE="FUNCTION">:accelerator</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:accept-changes</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:accept-row-changes</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:add-buffer</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:add-calc-column</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:add-columns-from</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:add-events-procedure</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:add-fields-from</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:add-first</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:add-index-field</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:add-last</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:add-like-column</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:add-like-field</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:add-like-index</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:add-new-field</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:add-new-index</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:add-super-procedure</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:adm-data</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:after-buffer</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:after-rowid</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:after-table</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:allow-column-searching</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:always-on-top</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:ambiguous</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:append-child</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:appl-alert-boxes</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:apply-callback</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:appserver-info</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:appserver-password</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:appserver-userid</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:async-request-count</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:async-request-handle</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:asynchronous</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:attach-data-source</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:attr-space</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:attribute-names</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:auto-completion</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:auto-delete</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:auto-delete-xml</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:auto-end-key</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:auto-go</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:auto-indent</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:auto-resize</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:auto-return</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:auto-validate</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:auto-zap</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:available</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:available-formats</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:background</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:base-ade</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:basic-logging</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:batch-mode</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:before-buffer</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:before-rowid</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:before-table</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:bgcolor</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:blank</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:block-iteration-display</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:border-bottom-chars</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:border-bottom-pixels</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:border-left-chars</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:border-left-pixels</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:border-right-chars</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:border-right-pixels</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:border-top-chars</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:border-top-pixels</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:box</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:box-selectable</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:browse-column-data-types</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:browse-column-formats</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:browse-column-labels</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:buffer-chars</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:buffer-compare</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:buffer-copy</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:buffer-create</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:buffer-delete</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:buffer-field</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:buffer-handle</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:buffer-lines</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:buffer-name</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:buffer-release</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:buffer-validate</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:buffer-value</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:bytes-read</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:bytes-written</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:cache</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:call-name</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:call-type</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:can-create</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:can-delete</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:can-read</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:can-write</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:cancel-break</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:cancel-button</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:cancel-requests</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:cancelled</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:careful-paint</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:case-sensitive</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:centered</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:character_length</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:charset</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:checked</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:child-num</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:clear</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:clear-selection</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:client-connection-id</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:client-type</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:clone-node</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:code</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:codepage</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:column-bgcolor</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:column-dcolor</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:column-fgcolor</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:column-font</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:column-label</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:column-movable</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:column-pfcolor</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:column-read-only</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:column-resizable</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:column-scrolling</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:columns</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:com-handle</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:complete</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:config-name</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:connect</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:connected</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:context-help</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:context-help-file</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:context-help-id</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:control-box</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:convert-3d-colors</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:convert-to-offset</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:coverage</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:cpcase</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:cpcoll</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:cplog</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:cpprint</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:cprcodein</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:cprcodeout</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:cpstream</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:cpterm</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:crc-value</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:create-like</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:create-node</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:create-node-namespace</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:create-on-add</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:create-result-list-entry</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:current-changed</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:current-column</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:current-environment</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:current-iteration</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:current-result-row</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:current-row-modified</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:current-window</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:cursor-char</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:cursor-line</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:cursor-offset</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:data-entry-return</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:data-source</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:data-type</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:dataset</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:date-format</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:db-references</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:dbname</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:dcolor</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:dde-error</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:dde-id</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:dde-item</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:dde-name</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:dde-topic</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:deblank</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:debug</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:debug-alert</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:decimals</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:default</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:default-buffer-handle</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:default-button</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:default-commit</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:default-string</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:delete</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:delete-current-row</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:delete-line</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:delete-node</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:delete-result-list-entry</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:delete-selected-row</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:delete-selected-rows</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:delimiter</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:description</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:deselect-focused-row</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:deselect-rows</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:deselect-selected-row</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:detach-data-source</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:directory</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:disable</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:disable-auto-zap</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:disable-connections</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:disable-dump-triggers</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:disable-load-triggers</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:disconnect</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:display-message</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:display-timezone</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:display-type</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:down</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:drag-enabled</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:drop-target</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:dump-logging-now</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:dynamic</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:edge-chars</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:edge-pixels</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:edit-can-paste</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:edit-can-undo</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:edit-clear</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:edit-copy</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:edit-cut</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:edit-paste</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:edit-undo</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:empty</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:empty-temp-table</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:enable</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:enable-connections</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:enabled</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:encoding</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:end-file-drop</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:end-user-prompt</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:error-column</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:error-object-detail</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:error-row</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:error-string</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:event-procedure</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:event-procedure-context</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:event-type</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:exclusive-id</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:execution-log</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:expand</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:expandable</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:export</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:extent</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:fetch-selected-row</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:fgcolor</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:file-create-date</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:file-create-time</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:file-mod-date</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:file-mod-time</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:file-name</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:file-offset</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:file-size</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:file-type</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:fill</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:fill-mode</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:filled</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:find-by-rowid</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:find-current</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:find-first</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:find-last</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:find-unique</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:first-async-request</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:first-buffer</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:first-child</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:first-column</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:first-data-source</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:first-dataset</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:first-procedure</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:first-query</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:first-server</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:first-server-socket</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:first-socket</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:first-tab-item</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:fit-last-column</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:flat-button</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:focused-row</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:focused-row-selected</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:font</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:font-based-layout</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:foreground</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:form-input</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:format</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:forward-only</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:frame</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:frame-col</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:frame-name</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:frame-row</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:frame-spacing</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:frame-x</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:frame-y</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:frequency</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:full-height-chars</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:full-height-pixels</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:full-pathname</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:full-width-chars</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:full-width-pixels</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:function</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:get-attribute</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:get-attribute-node</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:get-blue-value</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:get-browse-column</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:get-buffer-handle</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:get-bytes-available</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:get-cgi-list</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:get-cgi-value</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:get-changes</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:get-child</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:get-child-relation</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:get-config-value</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:get-current</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:get-document-element</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:get-dropped-file</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:get-dynamic</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:get-first</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:get-green-value</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:get-iteration</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:get-last</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:get-message</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:get-next</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:get-number</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:get-parent</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:get-prev</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:get-printers</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:get-red-value</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:get-repositioned-row</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:get-rgb-value</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:get-selected-widget</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:get-signature</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:get-socket-option</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:get-tab-item</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:get-text-height-chars</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:get-text-height-pixels</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:get-text-width-chars</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:get-text-width-pixels</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:get-wait-state</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:graphic-edge</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:grid-factor-horizontal</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:grid-factor-vertical</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:grid-snap</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:grid-unit-height-chars</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:grid-unit-height-pixels</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:grid-unit-width-chars</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:grid-unit-width-pixels</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:grid-visible</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:handle</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:handler</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:has-lobs</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:has-records</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:height-chars</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:height-pixels</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:hidden</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:horizontal</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:html-charset</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:html-end-of-line</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:html-end-of-page</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:html-frame-begin</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:html-frame-end</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:html-header-begin</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:html-header-end</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:html-title-begin</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:html-title-end</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:hwnd</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:icfparameter</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:icon</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:image</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:image-down</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:image-insensitive</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:image-up</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:immediate-display</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:import-node</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:in-handle</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:increment-exclusive-id</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:index</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:index-information</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:initial</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:initialize-document-type</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:initiate</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:inner-chars</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:inner-lines</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:input-value</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:insert</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:insert-backtab</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:insert-before</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:insert-file</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:insert-row</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:insert-string</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:insert-tab</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:instantiating-procedure</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:internal-entries</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:invoke</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:is-open</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:is-parameter-set</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:is-row-selected</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:is-selected</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:is-xml</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:items-per-row</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:keep-connection-open</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:keep-frame-z-order</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:keep-security-cache</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:key</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:label</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:label-bgcolor</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:label-dcolor</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:label-fgcolor</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:label-font</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:labels</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:languages</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:large</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:large-to-small</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:last-async-request</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:last-child</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:last-procedure</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:last-server</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:last-server-socket</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:last-socket</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:last-tab-item</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:line</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:list-item-pairs</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:list-items</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:listings</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:literal-question</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:load</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:load-icon</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:load-image</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:load-image-down</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:load-image-insensitive</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:load-image-up</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:load-mouse-pointer</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:load-small-icon</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:local-host</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:local-name</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:local-port</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:locator-column-number</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:locator-line-number</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:locator-public-id</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:locator-system-id</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:locator-type</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:locked</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:log-id</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:longchar-to-node-value</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:lookup</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:mandatory</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:manual-highlight</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:margin-height-chars</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:margin-height-pixels</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:margin-width-chars</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:margin-width-pixels</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:max-button</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:max-chars</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:max-data-guess</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:max-height-chars</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:max-height-pixels</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:max-value</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:max-width-chars</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:max-width-pixels</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:md5-value</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:memptr-to-node-value</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:menu-bar</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:menu-key</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:menu-mouse</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:merge-changes</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:merge-row-changes</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:message-area</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:message-area-font</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:min-button</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:min-column-width-chars</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:min-column-width-pixels</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:min-height-chars</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:min-height-pixels</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:min-schema-marshall</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:min-value</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:min-width-chars</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:min-width-pixels</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:modified</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:mouse-pointer</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:movable</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:move-after-tab-item</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:move-before-tab-item</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:move-column</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:move-to-bottom</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:move-to-eof</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:move-to-top</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:multiple</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:multitasking-interval</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:name</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:namespace-prefix</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:namespace-uri</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:needs-appserver-prompt</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:needs-prompt</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:new</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:new-row</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:next-column</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:next-sibling</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:next-tab-item</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:no-current-value</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:no-empty-space</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:no-focus</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:no-schema-marshall</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:no-validate</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:node-type</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:node-value</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:node-value-to-longchar</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:node-value-to-memptr</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:normalize</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:num-buffers</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:num-buttons</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:num-child-relations</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:num-children</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:num-columns</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:num-dropped-files</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:num-entries</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:num-fields</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:num-formats</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:num-items</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:num-iterations</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:num-lines</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:num-locked-columns</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:num-messages</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:num-parameters</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:num-replaced</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:num-results</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:num-selected-rows</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:num-selected-widgets</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:num-tabs</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:num-to-retain</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:num-visible-columns</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:numeric-decimal-point</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:numeric-format</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:numeric-separator</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:ole-invoke-locale</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:ole-names-locale</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:on-frame-border</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:origin-handle</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:origin-rowid</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:overlay</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:owner</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:owner-document</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:page-bottom</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:page-top</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:parameter</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:parent</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:parent-relation</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:parse-status</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:password-field</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:pathname</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:persistent</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:persistent-cache-disabled</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:persistent-procedure</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:pfcolor</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:pixels-per-column</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:pixels-per-row</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:popup-menu</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:popup-only</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:position</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:prepare-string</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:prepared</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:prev-column</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:prev-sibling</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:prev-tab-item</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:primary</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:printer-control-handle</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:printer-hdc</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:printer-name</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:printer-port</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:private-data</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:procedure-name</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:profiling</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:progress-source</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:proxy</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:proxy-password</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:proxy-userid</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:public-id</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:published-events</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:query</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:query-close</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:query-off-end</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:query-open</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:query-prepare</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:quit</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:radio-buttons</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:raw-transfer</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:read</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:read-file</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:read-only</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:recid</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:record-length</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:refresh</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:refreshable</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:reject-changes</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:reject-row-changes</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:rejected</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:remote</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:remote-host</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:remote-port</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:remove-attribute</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:remove-child</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:remove-events-procedure</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:remove-super-procedure</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:replace</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:replace-child</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:replace-selection-text</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:reposition-backwards</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:reposition-forwards</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:reposition-parent-relation</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:reposition-to-row</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:reposition-to-rowid</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:resizable</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:resize</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:retain-shape</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:return-inserted</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:return-value</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:return-value-data-type</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:row</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:row-height-chars</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:row-height-pixels</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:row-markers</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:row-resizable</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:row-state</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:rowid</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:rule-row</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:rule-y</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:save</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:save-file</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:save-row-changes</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:sax-parse</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:sax-parse-first</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:sax-parse-next</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:sax-xml</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:schema-change</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:schema-path</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:screen-lines</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:screen-value</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:scroll-bars</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:scroll-delta</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:scroll-offset</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:scroll-to-current-row</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:scroll-to-item</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:scroll-to-selected-row</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:scrollable</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:scrollbar-horizontal</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:scrollbar-vertical</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:search</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:select-all</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:select-focused-row</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:select-next-row</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:select-prev-row</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:select-row</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:selectable</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:selected</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:selection-end</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:selection-start</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:selection-text</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:sensitive</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:separator-fgcolor</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:separators</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:server</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:server-connection-bound</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:server-connection-bound-request</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:server-connection-context</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:server-connection-id</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:server-operating-mode</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:session-end</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:set-attribute</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:set-attribute-node</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:set-blue-value</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:set-break</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:set-buffers</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:set-callback-procedure</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:set-commit</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:set-connect-procedure</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:set-dynamic</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:set-green-value</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:set-input-source</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:set-numeric-format</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:set-parameter</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:set-read-response-procedure</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:set-red-value</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:set-repositioned-row</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:set-rgb-value</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:set-rollback</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:set-selection</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:set-socket-option</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:set-wait-state</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:show-in-taskbar</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:side-label-handle</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:side-labels</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:skip-deleted-record</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:small-icon</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:small-title</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:sort</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:startup-parameters</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:status-area</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:status-area-font</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:stop</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:stop-parsing</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:stopped</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:stretch-to-fit</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:string-value</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:sub-menu-help</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:subtype</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:super-procedures</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:suppress-namespace-processing</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:suppress-warnings</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:synchronize</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:system-alert-boxes</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:system-id</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:tab-position</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:tab-stop</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:table</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:table-crc-list</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:table-handle</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:table-list</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:table-number</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:temp-directory</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:temp-table-prepare</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:text-selected</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:three-d</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:tic-marks</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:time-source</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:title</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:title-bgcolor</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:title-dcolor</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:title-fgcolor</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:title-font</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:toggle-box</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:tooltip</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:tooltips</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:top-only</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:trace-filter</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:tracing</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:tracking-changes</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:trans-init-procedure</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:transaction</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:transparent</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:type</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:undo</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:unique-id</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:unique-match</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:url</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:url-decode</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:url-encode</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:url-password</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:url-userid</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:user-data</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:v6display</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:validate</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:validate-expression</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:validate-message</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:validate-xml</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:validation-enabled</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:value</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:view-first-column-on-reopen</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:virtual-height-chars</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:virtual-height-pixels</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:virtual-width-chars</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:virtual-width-pixels</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:visible</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:warning</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:widget-enter</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:widget-leave</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:width-chars</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:width-pixels</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:window</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:window-state</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:window-system</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:word-wrap</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:work-area-height-pixels</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:work-area-width-pixels</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:work-area-x</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:work-area-y</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:write</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:write-data</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:x</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:x-document</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:xml-schema-path</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:xml-suppress-namespace-processing</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:y</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:year-offset</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="FUNCTION">:_dcm</MARK_FOLLOWING>
-
-    <!-- INVALID    : Deprecated keywords -->
-      <SEQ_REGEXP TYPE="INVALID" HASH_CHAR="put" AT_WORD_START="TRUE">put\s+screen</SEQ_REGEXP>
-      <MARK_FOLLOWING TYPE="INVALID">:WHERE-STRING</MARK_FOLLOWING>
-      <MARK_FOLLOWING TYPE="INVALID">:REPOSITION-PARENT-RELATION</MARK_FOLLOWING>
-
-    <!-- NON INVALID: Correction for non-invalid keywords -->
-      <SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="choose" AT_WORD_START="TRUE">choose\s+of</SEQ_REGEXP>
-
-    <KEYWORDS>
-      <!-- Keep the following sections in the specified order since -->
-      <!-- some keywords occur in more than 1 section. The last one -->
-      <!-- determines the appearance of a certain keyword.          -->
-
-      <!-- KEYWORD3   : events -->
-      <!-- KEYWORD1   : Statements, functions, attributes, methods -->
-      <!-- KEYWORD2   : VST & metaschema files and fields -->
-      <!-- INVALID    : Deprecated keywords -->
-      <!-- COMMENT2   : Preprocessor statements -->
-
-      <!-- KEYWORD3   : events -->
-        <KEYWORD3>any-key</KEYWORD3>
-        <KEYWORD3>any-printable</KEYWORD3>
-        <KEYWORD3>back-tab</KEYWORD3>
-        <KEYWORD3>backspace</KEYWORD3>
-        <KEYWORD3>bell</KEYWORD3>
-        <KEYWORD3>choose</KEYWORD3>
-        <KEYWORD3>container-event</KEYWORD3>
-        <KEYWORD3>dde-notify</KEYWORD3>
-        <KEYWORD3>default-action</KEYWORD3>
-        <KEYWORD3>del</KEYWORD3>
-        <KEYWORD3>delete-char</KEYWORD3>
-        <KEYWORD3>delete-character</KEYWORD3>
-        <KEYWORD3>deselect</KEYWORD3>
-        <KEYWORD3>deselection</KEYWORD3>
-        <KEYWORD3>drop-file-notify</KEYWORD3>
-        <KEYWORD3>empty-selection</KEYWORD3>
-        <KEYWORD3>end</KEYWORD3>
-        <KEYWORD3>end-box-selection</KEYWORD3>
-        <KEYWORD3>end-error</KEYWORD3>
-        <KEYWORD3>end-move</KEYWORD3>
-        <KEYWORD3>end-resize</KEYWORD3>
-        <KEYWORD3>end-search</KEYWORD3>
-        <KEYWORD3>endkey</KEYWORD3>
-        <KEYWORD3>entry</KEYWORD3>
-        <KEYWORD3>error</KEYWORD3>
-        <KEYWORD3>go</KEYWORD3>
-        <KEYWORD3>help</KEYWORD3>
-        <KEYWORD3>home</KEYWORD3>
-        <KEYWORD3>leave</KEYWORD3>
-        <KEYWORD3>menu-drop</KEYWORD3>
-        <KEYWORD3>off-end</KEYWORD3>
-        <KEYWORD3>off-home</KEYWORD3>
-        <KEYWORD3>parent-window-close</KEYWORD3>
-        <KEYWORD3>procedure-complete</KEYWORD3>
-        <KEYWORD3>read-response</KEYWORD3>
-        <KEYWORD3>recall</KEYWORD3>
-        <KEYWORD3>return</KEYWORD3>
-        <KEYWORD3>row-display</KEYWORD3>
-        <KEYWORD3>row-entry</KEYWORD3>
-        <KEYWORD3>row-leave</KEYWORD3>
-        <KEYWORD3>scroll-notify</KEYWORD3>
-        <KEYWORD3>select</KEYWORD3>
-        <KEYWORD3>selection</KEYWORD3>
-        <KEYWORD3>start-box-selection</KEYWORD3>
-        <KEYWORD3>start-move</KEYWORD3>
-        <KEYWORD3>start-resize</KEYWORD3>
-        <KEYWORD3>start-search</KEYWORD3>
-        <KEYWORD3>tab</KEYWORD3>
-        <KEYWORD3>value-changed</KEYWORD3>
-        <KEYWORD3>window-close</KEYWORD3>
-        <KEYWORD3>window-maximized</KEYWORD3>
-        <KEYWORD3>window-minimized</KEYWORD3>
-        <KEYWORD3>window-resized</KEYWORD3>
-        <KEYWORD3>window-restored</KEYWORD3>
-
-
-      <!-- KEYWORD1   : Statements, functions -->
-        <KEYWORD1>abort</KEYWORD1>
-        <KEYWORD1>absolute</KEYWORD1>
-        <KEYWORD1>accelerator</KEYWORD1>
-        <KEYWORD1>accept-changes</KEYWORD1>
-        <KEYWORD1>accept-row-changes</KEYWORD1>
-        <KEYWORD1>accumulate</KEYWORD1>
-        <KEYWORD1>across</KEYWORD1>
-        <KEYWORD1>active</KEYWORD1>
-        <KEYWORD1>active-window</KEYWORD1>
-        <KEYWORD1>actor</KEYWORD1>
-        <KEYWORD1>add</KEYWORD1>
-        <KEYWORD1>add-buffer</KEYWORD1>
-        <KEYWORD1>add-calc-column</KEYWORD1>
-        <KEYWORD1>add-columns-from</KEYWORD1>
-        <KEYWORD1>add-events-procedure</KEYWORD1>
-        <KEYWORD1>add-fields-from</KEYWORD1>
-        <KEYWORD1>add-first</KEYWORD1>
-        <KEYWORD1>add-header-entry</KEYWORD1>
-        <KEYWORD1>add-index-field</KEYWORD1>
-        <KEYWORD1>add-interval</KEYWORD1>
-        <KEYWORD1>add-last</KEYWORD1>
-        <KEYWORD1>add-like-column</KEYWORD1>
-        <KEYWORD1>add-like-field</KEYWORD1>
-        <KEYWORD1>add-like-index</KEYWORD1>
-        <KEYWORD1>add-new-field</KEYWORD1>
-        <KEYWORD1>add-new-index</KEYWORD1>
-        <KEYWORD1>add-relation</KEYWORD1>
-        <KEYWORD1>add-source-buffer</KEYWORD1>
-        <KEYWORD1>add-super-procedure</KEYWORD1>
-        <KEYWORD1>adm-data</KEYWORD1>
-        <KEYWORD1>advise</KEYWORD1>
-        <KEYWORD1>after-buffer</KEYWORD1>
-        <KEYWORD1>after-rowid</KEYWORD1>
-        <KEYWORD1>after-table</KEYWORD1>
-        <KEYWORD1>alert-box</KEYWORD1>
-        <KEYWORD1>alias</KEYWORD1>
-        <KEYWORD1>all</KEYWORD1>
-        <KEYWORD1>allow-column-searching</KEYWORD1>
-        <KEYWORD1>allow-replication</KEYWORD1>
-        <KEYWORD1>alter</KEYWORD1>
-        <KEYWORD1>alternate-key</KEYWORD1>
-        <KEYWORD1>always-on-top</KEYWORD1>
-        <KEYWORD1>ambiguous</KEYWORD1>
-        <KEYWORD1>and</KEYWORD1>
-        <KEYWORD1>ansi-only</KEYWORD1>
-        <KEYWORD1>any</KEYWORD1>
-        <KEYWORD1>anywhere</KEYWORD1>
-        <KEYWORD1>append</KEYWORD1>
-        <KEYWORD1>append-child</KEYWORD1>
-        <KEYWORD1>append-line</KEYWORD1>
-        <KEYWORD1>appl-alert-boxes</KEYWORD1>
-        <KEYWORD1>application</KEYWORD1>
-        <KEYWORD1>apply</KEYWORD1>
-        <KEYWORD1>apply-callback</KEYWORD1>
-        <KEYWORD1>appserver-info</KEYWORD1>
-        <KEYWORD1>appserver-password</KEYWORD1>
-        <KEYWORD1>appserver-userid</KEYWORD1>
-        <KEYWORD1>array-message</KEYWORD1>
-        <KEYWORD1>as</KEYWORD1>
-        <KEYWORD1>as-cursor</KEYWORD1>
-        <KEYWORD1>ascending</KEYWORD1>
-        <KEYWORD1>ask-overwrite</KEYWORD1>
-        <KEYWORD1>assign</KEYWORD1>
-        <KEYWORD1>async-request-count</KEYWORD1>
-        <KEYWORD1>async-request-handle</KEYWORD1>
-        <KEYWORD1>asynchronous</KEYWORD1>
-        <KEYWORD1>at</KEYWORD1>
-        <KEYWORD1>attach</KEYWORD1>
-        <KEYWORD1>attach-data-source</KEYWORD1>
-        <KEYWORD1>attachment</KEYWORD1>
-        <KEYWORD1>attr-space</KEYWORD1>
-        <KEYWORD1>attribute-names</KEYWORD1>
-        <KEYWORD1>attribute-type</KEYWORD1>
-        <KEYWORD1>authorization</KEYWORD1>
-        <KEYWORD1>auto-completion</KEYWORD1>
-        <KEYWORD1>auto-delete</KEYWORD1>
-        <KEYWORD1>auto-delete-xml</KEYWORD1>
-        <KEYWORD1>auto-end-key</KEYWORD1>
-        <KEYWORD1>auto-endkey</KEYWORD1>
-        <KEYWORD1>auto-go</KEYWORD1>
-        <KEYWORD1>auto-indent</KEYWORD1>
-        <KEYWORD1>auto-resize</KEYWORD1>
-        <KEYWORD1>auto-return</KEYWORD1>
-        <KEYWORD1>auto-validate</KEYWORD1>
-        <KEYWORD1>auto-zap</KEYWORD1>
-        <KEYWORD1>automatic</KEYWORD1>
-        <KEYWORD1>available</KEYWORD1>
-        <KEYWORD1>available-formats</KEYWORD1>
-        <KEYWORD1>average</KEYWORD1>
-        <KEYWORD1>avg</KEYWORD1>
-        <KEYWORD1>background</KEYWORD1>
-        <KEYWORD1>backwards</KEYWORD1>
-        <KEYWORD1>base-ade</KEYWORD1>
-        <KEYWORD1>base-key</KEYWORD1>
-        <KEYWORD1>base64</KEYWORD1>
-        <KEYWORD1>basic-logging</KEYWORD1>
-        <KEYWORD1>batch-mode</KEYWORD1>
-        <KEYWORD1>before-buffer</KEYWORD1>
-        <KEYWORD1>before-hide</KEYWORD1>
-        <KEYWORD1>before-rowid</KEYWORD1>
-        <KEYWORD1>before-table</KEYWORD1>
-        <KEYWORD1>begins</KEYWORD1>
-        <KEYWORD1>between</KEYWORD1>
-        <KEYWORD1>bgcolor</KEYWORD1>
-        <KEYWORD1>big-endian</KEYWORD1>
-        <KEYWORD1>binary</KEYWORD1>
-        <KEYWORD1>bind-where</KEYWORD1>
-        <KEYWORD1>blank</KEYWORD1>
-        <KEYWORD1>blob</KEYWORD1>
-        <KEYWORD1>block</KEYWORD1>
-        <KEYWORD1>block-iteration-display</KEYWORD1>
-        <KEYWORD1>border-bottom</KEYWORD1>
-        <KEYWORD1>border-bottom-chars</KEYWORD1>
-        <KEYWORD1>border-bottom-pixels</KEYWORD1>
-        <KEYWORD1>border-left</KEYWORD1>
-        <KEYWORD1>border-left-chars</KEYWORD1>
-        <KEYWORD1>border-left-pixels</KEYWORD1>
-        <KEYWORD1>border-right</KEYWORD1>
-        <KEYWORD1>border-right-chars</KEYWORD1>
-        <KEYWORD1>border-right-pixels</KEYWORD1>
-        <KEYWORD1>border-top</KEYWORD1>
-        <KEYWORD1>border-top-chars</KEYWORD1>
-        <KEYWORD1>border-top-pixels</KEYWORD1>
-        <KEYWORD1>both</KEYWORD1>
-        <KEYWORD1>bottom</KEYWORD1>
-        <KEYWORD1>bottom-column</KEYWORD1>
-        <KEYWORD1>box</KEYWORD1>
-        <KEYWORD1>box-selectable</KEYWORD1>
-        <KEYWORD1>break</KEYWORD1>
-        <KEYWORD1>break-line</KEYWORD1>
-        <KEYWORD1>browse</KEYWORD1>
-        <KEYWORD1>browse-column-data-types</KEYWORD1>
-        <KEYWORD1>browse-column-formats</KEYWORD1>
-        <KEYWORD1>browse-column-labels</KEYWORD1>
-        <KEYWORD1>browse-header</KEYWORD1>
-        <KEYWORD1>btos</KEYWORD1>
-        <KEYWORD1>buffer</KEYWORD1>
-        <KEYWORD1>buffer-chars</KEYWORD1>
-        <KEYWORD1>buffer-compare</KEYWORD1>
-        <KEYWORD1>buffer-copy</KEYWORD1>
-        <KEYWORD1>buffer-create</KEYWORD1>
-        <KEYWORD1>buffer-delete</KEYWORD1>
-        <KEYWORD1>buffer-field</KEYWORD1>
-        <KEYWORD1>buffer-handle</KEYWORD1>
-        <KEYWORD1>buffer-lines</KEYWORD1>
-        <KEYWORD1>buffer-name</KEYWORD1>
-        <KEYWORD1>buffer-release</KEYWORD1>
-        <KEYWORD1>buffer-validate</KEYWORD1>
-        <KEYWORD1>buffer-value</KEYWORD1>
-        <KEYWORD1>buttons</KEYWORD1>
-        <KEYWORD1>by</KEYWORD1>
-        <KEYWORD1>by-pointer</KEYWORD1>
-        <KEYWORD1>by-reference</KEYWORD1>
-        <KEYWORD1>by-value</KEYWORD1>
-        <KEYWORD1>by-variant-pointer</KEYWORD1>
-        <KEYWORD1>byte</KEYWORD1>
-        <KEYWORD1>bytes-read</KEYWORD1>
-        <KEYWORD1>bytes-written</KEYWORD1>
-        <KEYWORD1>cache</KEYWORD1>
-        <KEYWORD1>cache-size</KEYWORD1>
-        <KEYWORD1>call</KEYWORD1>
-        <KEYWORD1>call-name</KEYWORD1>
-        <KEYWORD1>call-type</KEYWORD1>
-        <KEYWORD1>can-create</KEYWORD1>
-        <KEYWORD1>can-delete</KEYWORD1>
-        <KEYWORD1>can-do</KEYWORD1>
-        <KEYWORD1>can-find</KEYWORD1>
-        <KEYWORD1>can-query</KEYWORD1>
-        <KEYWORD1>can-read</KEYWORD1>
-        <KEYWORD1>can-set</KEYWORD1>
-        <KEYWORD1>can-write</KEYWORD1>
-        <KEYWORD1>cancel-break</KEYWORD1>
-        <KEYWORD1>cancel-button</KEYWORD1>
-        <KEYWORD1>cancel-pick</KEYWORD1>
-        <KEYWORD1>cancel-requests</KEYWORD1>
-        <KEYWORD1>cancelled</KEYWORD1>
-        <KEYWORD1>caps</KEYWORD1>
-        <KEYWORD1>careful-paint</KEYWORD1>
-        <KEYWORD1>case</KEYWORD1>
-        <KEYWORD1>case-sensitive</KEYWORD1>
-        <KEYWORD1>cdecl</KEYWORD1>
-        <KEYWORD1>centered</KEYWORD1>
-        <KEYWORD1>chained</KEYWORD1>
-        <KEYWORD1>character</KEYWORD1>
-        <KEYWORD1>character_length</KEYWORD1>
-        <KEYWORD1>charset</KEYWORD1>
-        <KEYWORD1>check</KEYWORD1>
-        <KEYWORD1>checked</KEYWORD1>
-        <KEYWORD1>child-buffer</KEYWORD1>
-        <KEYWORD1>child-num</KEYWORD1>
-        <KEYWORD1>choices</KEYWORD1>
-        <KEYWORD1>chr</KEYWORD1>
-        <KEYWORD1>clear</KEYWORD1>
-        <KEYWORD1>clear-selection</KEYWORD1>
-        <KEYWORD1>client-connection-id</KEYWORD1>
-        <KEYWORD1>client-type</KEYWORD1>
-        <KEYWORD1>clipboard</KEYWORD1>
-        <KEYWORD1>clob</KEYWORD1>
-        <KEYWORD1>clone-node</KEYWORD1>
-        <KEYWORD1>close</KEYWORD1>
-        <KEYWORD1>code</KEYWORD1>
-        <KEYWORD1>codebase-locator</KEYWORD1>
-        <KEYWORD1>codepage</KEYWORD1>
-        <KEYWORD1>codepage-convert</KEYWORD1>
-        <KEYWORD1>col</KEYWORD1>
-        <KEYWORD1>col-of</KEYWORD1>
-        <KEYWORD1>collate</KEYWORD1>
-        <KEYWORD1>colon</KEYWORD1>
-        <KEYWORD1>colon-aligned</KEYWORD1>
-        <KEYWORD1>color</KEYWORD1>
-        <KEYWORD1>color-table</KEYWORD1>
-        <KEYWORD1>column-bgcolor</KEYWORD1>
-        <KEYWORD1>column-codepage</KEYWORD1>
-        <KEYWORD1>column-dcolor</KEYWORD1>
-        <KEYWORD1>column-fgcolor</KEYWORD1>
-        <KEYWORD1>column-font</KEYWORD1>
-        <KEYWORD1>column-label</KEYWORD1>
-        <KEYWORD1>column-label-bgcolor</KEYWORD1>
-        <KEYWORD1>column-label-dcolor</KEYWORD1>
-        <KEYWORD1>column-label-fgcolor</KEYWORD1>
-        <KEYWORD1>column-label-font</KEYWORD1>
-        <KEYWORD1>column-label-height-chars</KEYWORD1>
-        <KEYWORD1>column-label-height-pixels</KEYWORD1>
-        <KEYWORD1>column-movable</KEYWORD1>
-        <KEYWORD1>column-of</KEYWORD1>
-        <KEYWORD1>column-pfcolor</KEYWORD1>
-        <KEYWORD1>column-read-only</KEYWORD1>
-        <KEYWORD1>column-resizable</KEYWORD1>
-        <KEYWORD1>column-scrolling</KEYWORD1>
-        <KEYWORD1>columns</KEYWORD1>
-        <KEYWORD1>com-handle</KEYWORD1>
-        <KEYWORD1>com-self</KEYWORD1>
-        <KEYWORD1>combo-box</KEYWORD1>
-        <KEYWORD1>command</KEYWORD1>
-        <KEYWORD1>compares</KEYWORD1>
-        <KEYWORD1>compile</KEYWORD1>
-        <KEYWORD1>compiler</KEYWORD1>
-        <KEYWORD1>complete</KEYWORD1>
-        <KEYWORD1>component-handle</KEYWORD1>
-        <KEYWORD1>component-self</KEYWORD1>
-        <KEYWORD1>config-name</KEYWORD1>
-        <KEYWORD1>connect</KEYWORD1>
-        <KEYWORD1>connected</KEYWORD1>
-        <KEYWORD1>constrained</KEYWORD1>
-        <KEYWORD1>contains</KEYWORD1>
-        <KEYWORD1>contents</KEYWORD1>
-        <KEYWORD1>context</KEYWORD1>
-        <KEYWORD1>context-help</KEYWORD1>
-        <KEYWORD1>context-help-file</KEYWORD1>
-        <KEYWORD1>context-help-id</KEYWORD1>
-        <KEYWORD1>context-popup</KEYWORD1>
-        <KEYWORD1>control</KEYWORD1>
-        <KEYWORD1>control-box</KEYWORD1>
-        <KEYWORD1>control-container</KEYWORD1>
-        <KEYWORD1>control-frame</KEYWORD1>
-        <KEYWORD1>convert</KEYWORD1>
-        <KEYWORD1>convert-3d-colors</KEYWORD1>
-        <KEYWORD1>convert-to-offset</KEYWORD1>
-        <KEYWORD1>copy</KEYWORD1>
-        <KEYWORD1>copy-lob</KEYWORD1>
-        <KEYWORD1>count</KEYWORD1>
-        <KEYWORD1>count-of</KEYWORD1>
-        <KEYWORD1>coverage</KEYWORD1>
-        <KEYWORD1>cpcase</KEYWORD1>
-        <KEYWORD1>cpcoll</KEYWORD1>
-        <KEYWORD1>cpinternal</KEYWORD1>
-        <KEYWORD1>cplog</KEYWORD1>
-        <KEYWORD1>cpprint</KEYWORD1>
-        <KEYWORD1>cprcodein</KEYWORD1>
-        <KEYWORD1>cprcodeout</KEYWORD1>
-        <KEYWORD1>cpstream</KEYWORD1>
-        <KEYWORD1>cpterm</KEYWORD1>
-        <KEYWORD1>crc-value</KEYWORD1>
-        <KEYWORD1>create</KEYWORD1>
-        <KEYWORD1>create-like</KEYWORD1>
-        <KEYWORD1>create-node</KEYWORD1>
-        <KEYWORD1>create-node-namespace</KEYWORD1>
-        <KEYWORD1>create-on-add</KEYWORD1>
-        <KEYWORD1>create-result-list-entry</KEYWORD1>
-        <KEYWORD1>create-test-file</KEYWORD1>
-        <KEYWORD1>ctos</KEYWORD1>
-        <KEYWORD1>current</KEYWORD1>
-        <KEYWORD1>current-changed</KEYWORD1>
-        <KEYWORD1>current-column</KEYWORD1>
-        <KEYWORD1>current-environment</KEYWORD1>
-        <KEYWORD1>current-iteration</KEYWORD1>
-        <KEYWORD1>current-language</KEYWORD1>
-        <KEYWORD1>current-result-row</KEYWORD1>
-        <KEYWORD1>current-row-modified</KEYWORD1>
-        <KEYWORD1>current-value</KEYWORD1>
-        <KEYWORD1>current-window</KEYWORD1>
-        <KEYWORD1>current_date</KEYWORD1>
-        <KEYWORD1>cursor</KEYWORD1>
-        <KEYWORD1>cursor-char</KEYWORD1>
-        <KEYWORD1>cursor-down</KEYWORD1>
-        <KEYWORD1>cursor-left</KEYWORD1>
-        <KEYWORD1>cursor-line</KEYWORD1>
-        <KEYWORD1>cursor-offset</KEYWORD1>
-        <KEYWORD1>cursor-right</KEYWORD1>
-        <KEYWORD1>cursor-up</KEYWORD1>
-        <KEYWORD1>cut</KEYWORD1>
-        <KEYWORD1>data-bind</KEYWORD1>
-        <KEYWORD1>data-entry-return</KEYWORD1>
-        <KEYWORD1>data-refresh-line</KEYWORD1>
-        <KEYWORD1>data-refresh-page</KEYWORD1>
-        <KEYWORD1>data-relation</KEYWORD1>
-        <KEYWORD1>data-source</KEYWORD1>
-        <KEYWORD1>data-type</KEYWORD1>
-        <KEYWORD1>database</KEYWORD1>
-        <KEYWORD1>dataservers</KEYWORD1>
-        <KEYWORD1>dataset</KEYWORD1>
-        <KEYWORD1>dataset-handle</KEYWORD1>
-        <KEYWORD1>date</KEYWORD1>
-        <KEYWORD1>date-format</KEYWORD1>
-        <KEYWORD1>datetime</KEYWORD1>
-        <KEYWORD1>datetime-tz</KEYWORD1>
-        <KEYWORD1>day</KEYWORD1>
-        <KEYWORD1>db-references</KEYWORD1>
-        <KEYWORD1>dbcodepage</KEYWORD1>
-        <KEYWORD1>dbcollation</KEYWORD1>
-        <KEYWORD1>dbname</KEYWORD1>
-        <KEYWORD1>dbparam</KEYWORD1>
-        <KEYWORD1>dbrestrictions</KEYWORD1>
-        <KEYWORD1>dbtaskid</KEYWORD1>
-        <KEYWORD1>dbtype</KEYWORD1>
-        <KEYWORD1>dbversion</KEYWORD1>
-        <KEYWORD1>dcolor</KEYWORD1>
-        <KEYWORD1>dde</KEYWORD1>
-        <KEYWORD1>dde-error</KEYWORD1>
-        <KEYWORD1>dde-id</KEYWORD1>
-        <KEYWORD1>dde-item</KEYWORD1>
-        <KEYWORD1>dde-name</KEYWORD1>
-        <KEYWORD1>dde-topic</KEYWORD1>
-        <KEYWORD1>deblank</KEYWORD1>
-        <KEYWORD1>debug</KEYWORD1>
-        <KEYWORD1>debug-alert</KEYWORD1>
-        <KEYWORD1>debug-list</KEYWORD1>
-        <KEYWORD1>debugger</KEYWORD1>
-        <KEYWORD1>decimal</KEYWORD1>
-        <KEYWORD1>decimals</KEYWORD1>
-        <KEYWORD1>declare</KEYWORD1>
-        <KEYWORD1>default</KEYWORD1>
-        <KEYWORD1>default-buffer-handle</KEYWORD1>
-        <KEYWORD1>default-button</KEYWORD1>
-        <KEYWORD1>default-commit</KEYWORD1>
-        <KEYWORD1>default-extension</KEYWORD1>
-        <KEYWORD1>default-noxlate</KEYWORD1>
-        <KEYWORD1>default-pop-up</KEYWORD1>
-        <KEYWORD1>default-string</KEYWORD1>
-        <KEYWORD1>default-window</KEYWORD1>
-        <KEYWORD1>defer-lob-fetch</KEYWORD1>
-        <KEYWORD1>define</KEYWORD1>
-        <KEYWORD1>defined</KEYWORD1>
-        <KEYWORD1>delete</KEYWORD1>
-        <KEYWORD1>delete-column</KEYWORD1>
-        <KEYWORD1>delete-current-row</KEYWORD1>
-        <KEYWORD1>delete-end-line</KEYWORD1>
-        <KEYWORD1>delete-field</KEYWORD1>
-        <KEYWORD1>delete-header-entry</KEYWORD1>
-        <KEYWORD1>delete-line</KEYWORD1>
-        <KEYWORD1>delete-node</KEYWORD1>
-        <KEYWORD1>delete-result-list-entry</KEYWORD1>
-        <KEYWORD1>delete-selected-row</KEYWORD1>
-        <KEYWORD1>delete-selected-rows</KEYWORD1>
-        <KEYWORD1>delete-word</KEYWORD1>
-        <KEYWORD1>delimiter</KEYWORD1>
-        <KEYWORD1>descending</KEYWORD1>
-        <KEYWORD1>description</KEYWORD1>
-        <KEYWORD1>deselect-extend</KEYWORD1>
-        <KEYWORD1>deselect-focused-row</KEYWORD1>
-        <KEYWORD1>deselect-rows</KEYWORD1>
-        <KEYWORD1>deselect-selected-row</KEYWORD1>
-        <KEYWORD1>deselection-extend</KEYWORD1>
-        <KEYWORD1>detach</KEYWORD1>
-        <KEYWORD1>detach-data-source</KEYWORD1>
-        <KEYWORD1>dialog-box</KEYWORD1>
-        <KEYWORD1>dialog-help</KEYWORD1>
-        <KEYWORD1>dictionary</KEYWORD1>
-        <KEYWORD1>dir</KEYWORD1>
-        <KEYWORD1>directory</KEYWORD1>
-        <KEYWORD1>disable</KEYWORD1>
-        <KEYWORD1>disable-auto-zap</KEYWORD1>
-        <KEYWORD1>disable-connections</KEYWORD1>
-        <KEYWORD1>disable-dump-triggers</KEYWORD1>
-        <KEYWORD1>disable-load-triggers</KEYWORD1>
-        <KEYWORD1>disabled</KEYWORD1>
-        <KEYWORD1>disconnect</KEYWORD1>
-        <KEYWORD1>dismiss-menu</KEYWORD1>
-        <KEYWORD1>display</KEYWORD1>
-        <KEYWORD1>display-message</KEYWORD1>
-        <KEYWORD1>display-timezone</KEYWORD1>
-        <KEYWORD1>display-type</KEYWORD1>
-        <KEYWORD1>distinct</KEYWORD1>
-        <KEYWORD1>do</KEYWORD1>
-        <KEYWORD1>dos</KEYWORD1>
-        <KEYWORD1>dos-end</KEYWORD1>
-        <KEYWORD1>double</KEYWORD1>
-        <KEYWORD1>down</KEYWORD1>
-        <KEYWORD1>drag-enabled</KEYWORD1>
-        <KEYWORD1>drop</KEYWORD1>
-        <KEYWORD1>drop-down</KEYWORD1>
-        <KEYWORD1>drop-down-list</KEYWORD1>
-        <KEYWORD1>drop-target</KEYWORD1>
-        <KEYWORD1>dump</KEYWORD1>
-        <KEYWORD1>dump-logging-now</KEYWORD1>
-        <KEYWORD1>dynamic</KEYWORD1>
-        <KEYWORD1>dynamic-current-value</KEYWORD1>
-        <KEYWORD1>dynamic-function</KEYWORD1>
-        <KEYWORD1>dynamic-next-value</KEYWORD1>
-        <KEYWORD1>each</KEYWORD1>
-        <KEYWORD1>echo</KEYWORD1>
-        <KEYWORD1>edge</KEYWORD1>
-        <KEYWORD1>edge-chars</KEYWORD1>
-        <KEYWORD1>edge-pixels</KEYWORD1>
-        <KEYWORD1>edit-can-paste</KEYWORD1>
-        <KEYWORD1>edit-can-undo</KEYWORD1>
-        <KEYWORD1>edit-clear</KEYWORD1>
-        <KEYWORD1>edit-copy</KEYWORD1>
-        <KEYWORD1>edit-cut</KEYWORD1>
-        <KEYWORD1>edit-paste</KEYWORD1>
-        <KEYWORD1>edit-undo</KEYWORD1>
-        <KEYWORD1>editing</KEYWORD1>
-        <KEYWORD1>editor</KEYWORD1>
-        <KEYWORD1>editor-backtab</KEYWORD1>
-        <KEYWORD1>editor-tab</KEYWORD1>
-        <KEYWORD1>else</KEYWORD1>
-        <KEYWORD1>empty</KEYWORD1>
-        <KEYWORD1>empty-dataset</KEYWORD1>
-        <KEYWORD1>empty-temp-table</KEYWORD1>
-        <KEYWORD1>enable</KEYWORD1>
-        <KEYWORD1>enable-connections</KEYWORD1>
-        <KEYWORD1>enabled</KEYWORD1>
-        <KEYWORD1>encode</KEYWORD1>
-        <KEYWORD1>encoding</KEYWORD1>
-        <KEYWORD1>end-file-drop</KEYWORD1>
-        <KEYWORD1>end-key</KEYWORD1>
-        <KEYWORD1>end-row-resize</KEYWORD1>
-        <KEYWORD1>end-user-prompt</KEYWORD1>
-        <KEYWORD1>enter-menubar</KEYWORD1>
-        <KEYWORD1>entered</KEYWORD1>
-        <KEYWORD1>entry-types-list</KEYWORD1>
-        <KEYWORD1>eq</KEYWORD1>
-        <KEYWORD1>error-column</KEYWORD1>
-        <KEYWORD1>error-object-detail</KEYWORD1>
-        <KEYWORD1>error-row</KEYWORD1>
-        <KEYWORD1>error-status</KEYWORD1>
-        <KEYWORD1>error-string</KEYWORD1>
-        <KEYWORD1>escape</KEYWORD1>
-        <KEYWORD1>etime</KEYWORD1>
-        <KEYWORD1>event-procedure</KEYWORD1>
-        <KEYWORD1>event-procedure-context</KEYWORD1>
-        <KEYWORD1>event-type</KEYWORD1>
-        <KEYWORD1>events</KEYWORD1>
-        <KEYWORD1>except</KEYWORD1>
-        <KEYWORD1>exclusive</KEYWORD1>
-        <KEYWORD1>exclusive-id</KEYWORD1>
-        <KEYWORD1>exclusive-lock</KEYWORD1>
-        <KEYWORD1>exclusive-web-user</KEYWORD1>
-        <KEYWORD1>execute</KEYWORD1>
-        <KEYWORD1>execution-log</KEYWORD1>
-        <KEYWORD1>exists</KEYWORD1>
-        <KEYWORD1>exit</KEYWORD1>
-        <KEYWORD1>exp</KEYWORD1>
-        <KEYWORD1>expand</KEYWORD1>
-        <KEYWORD1>expandable</KEYWORD1>
-        <KEYWORD1>explicit</KEYWORD1>
-        <KEYWORD1>export</KEYWORD1>
-        <KEYWORD1>extended</KEYWORD1>
-        <KEYWORD1>extent</KEYWORD1>
-        <KEYWORD1>external</KEYWORD1>
-        <KEYWORD1>extract</KEYWORD1>
-        <KEYWORD1>false</KEYWORD1>
-        <KEYWORD1>fetch</KEYWORD1>
-        <KEYWORD1>fetch-selected-row</KEYWORD1>
-        <KEYWORD1>fgcolor</KEYWORD1>
-        <KEYWORD1>fields</KEYWORD1>
-        <KEYWORD1>file</KEYWORD1>
-        <KEYWORD1>file-access-date</KEYWORD1>
-        <KEYWORD1>file-access-time</KEYWORD1>
-        <KEYWORD1>file-create-date</KEYWORD1>
-        <KEYWORD1>file-create-time</KEYWORD1>
-        <KEYWORD1>file-information</KEYWORD1>
-        <KEYWORD1>file-mod-date</KEYWORD1>
-        <KEYWORD1>file-mod-time</KEYWORD1>
-        <KEYWORD1>file-name</KEYWORD1>
-        <KEYWORD1>file-offset</KEYWORD1>
-        <KEYWORD1>file-size</KEYWORD1>
-        <KEYWORD1>file-type</KEYWORD1>
-        <KEYWORD1>filename</KEYWORD1>
-        <KEYWORD1>fill</KEYWORD1>
-        <KEYWORD1>fill-in</KEYWORD1>
-        <KEYWORD1>fill-mode</KEYWORD1>
-        <KEYWORD1>fill-where-string</KEYWORD1>
-        <KEYWORD1>filled</KEYWORD1>
-        <KEYWORD1>filters</KEYWORD1>
-        <KEYWORD1>find</KEYWORD1>
-        <KEYWORD1>find-by-rowid</KEYWORD1>
-        <KEYWORD1>find-case-sensitive</KEYWORD1>
-        <KEYWORD1>find-current</KEYWORD1>
-        <KEYWORD1>find-first</KEYWORD1>
-        <KEYWORD1>find-global</KEYWORD1>
-        <KEYWORD1>find-last</KEYWORD1>
-        <KEYWORD1>find-next</KEYWORD1>
-        <KEYWORD1>find-next-occurrence</KEYWORD1>
-        <KEYWORD1>find-prev-occurrence</KEYWORD1>
-        <KEYWORD1>find-previous</KEYWORD1>
-        <KEYWORD1>find-select</KEYWORD1>
-        <KEYWORD1>find-unique</KEYWORD1>
-        <KEYWORD1>find-wrap-around</KEYWORD1>
-        <KEYWORD1>finder</KEYWORD1>
-        <KEYWORD1>first</KEYWORD1>
-        <KEYWORD1>first-async-request</KEYWORD1>
-        <KEYWORD1>first-buffer</KEYWORD1>
-        <KEYWORD1>first-child</KEYWORD1>
-        <KEYWORD1>first-column</KEYWORD1>
-        <KEYWORD1>first-data-source</KEYWORD1>
-        <KEYWORD1>first-dataset</KEYWORD1>
-        <KEYWORD1>first-of</KEYWORD1>
-        <KEYWORD1>first-procedure</KEYWORD1>
-        <KEYWORD1>first-query</KEYWORD1>
-        <KEYWORD1>first-server</KEYWORD1>
-        <KEYWORD1>first-server-socket</KEYWORD1>
-        <KEYWORD1>first-socket</KEYWORD1>
-        <KEYWORD1>first-tab-item</KEYWORD1>
-        <KEYWORD1>fit-last-column</KEYWORD1>
-        <KEYWORD1>fix-codepage</KEYWORD1>
-        <KEYWORD1>fixed-only</KEYWORD1>
-        <KEYWORD1>flat-button</KEYWORD1>
-        <KEYWORD1>float</KEYWORD1>
-        <KEYWORD1>focus</KEYWORD1>
-        <KEYWORD1>focus-in</KEYWORD1>
-        <KEYWORD1>focused-row</KEYWORD1>
-        <KEYWORD1>focused-row-selected</KEYWORD1>
-        <KEYWORD1>font</KEYWORD1>
-        <KEYWORD1>font-based-layout</KEYWORD1>
-        <KEYWORD1>font-table</KEYWORD1>
-        <KEYWORD1>for</KEYWORD1>
-        <KEYWORD1>force-file</KEYWORD1>
-        <KEYWORD1>foreground</KEYWORD1>
-        <KEYWORD1>form-input</KEYWORD1>
-        <KEYWORD1>format</KEYWORD1>
-        <KEYWORD1>forward-only</KEYWORD1>
-        <KEYWORD1>forwards</KEYWORD1>
-        <KEYWORD1>frame</KEYWORD1>
-        <KEYWORD1>frame-col</KEYWORD1>
-        <KEYWORD1>frame-db</KEYWORD1>
-        <KEYWORD1>frame-down</KEYWORD1>
-        <KEYWORD1>frame-field</KEYWORD1>
-        <KEYWORD1>frame-file</KEYWORD1>
-        <KEYWORD1>frame-index</KEYWORD1>
-        <KEYWORD1>frame-line</KEYWORD1>
-        <KEYWORD1>frame-name</KEYWORD1>
-        <KEYWORD1>frame-row</KEYWORD1>
-        <KEYWORD1>frame-spacing</KEYWORD1>
-        <KEYWORD1>frame-value</KEYWORD1>
-        <KEYWORD1>frame-x</KEYWORD1>
-        <KEYWORD1>frame-y</KEYWORD1>
-        <KEYWORD1>frequency</KEYWORD1>
-        <KEYWORD1>from</KEYWORD1>
-        <KEYWORD1>from-chars</KEYWORD1>
-        <KEYWORD1>from-current</KEYWORD1>
-        <KEYWORD1>from-pixels</KEYWORD1>
-        <KEYWORD1>fromnoreorder</KEYWORD1>
-        <KEYWORD1>full-height</KEYWORD1>
-        <KEYWORD1>full-height-chars</KEYWORD1>
-        <KEYWORD1>full-height-pixels</KEYWORD1>
-        <KEYWORD1>full-pathname</KEYWORD1>
-        <KEYWORD1>full-width-chars</KEYWORD1>
-        <KEYWORD1>full-width-pixels</KEYWORD1>
-        <KEYWORD1>function</KEYWORD1>
-        <KEYWORD1>function-call-type</KEYWORD1>
-        <KEYWORD1>gateways</KEYWORD1>
-        <KEYWORD1>ge</KEYWORD1>
-        <KEYWORD1>generate-md5</KEYWORD1>
-        <KEYWORD1>get</KEYWORD1>
-        <KEYWORD1>get-attr-call-type</KEYWORD1>
-        <KEYWORD1>get-attribute</KEYWORD1>
-        <KEYWORD1>get-attribute-node</KEYWORD1>
-        <KEYWORD1>get-bits</KEYWORD1>
-        <KEYWORD1>get-blue-value</KEYWORD1>
-        <KEYWORD1>get-browse-column</KEYWORD1>
-        <KEYWORD1>get-buffer-handle</KEYWORD1>
-        <KEYWORD1>get-byte</KEYWORD1>
-        <KEYWORD1>get-byte-order</KEYWORD1>
-        <KEYWORD1>get-bytes</KEYWORD1>
-        <KEYWORD1>get-bytes-available</KEYWORD1>
-        <KEYWORD1>get-cgi-list</KEYWORD1>
-        <KEYWORD1>get-cgi-value</KEYWORD1>
-        <KEYWORD1>get-changes</KEYWORD1>
-        <KEYWORD1>get-child</KEYWORD1>
-        <KEYWORD1>get-child-relation</KEYWORD1>
-        <KEYWORD1>get-codepages</KEYWORD1>
-        <KEYWORD1>get-collations</KEYWORD1>
-        <KEYWORD1>get-config-value</KEYWORD1>
-        <KEYWORD1>get-current</KEYWORD1>
-        <KEYWORD1>get-dataset-buffer</KEYWORD1>
-        <KEYWORD1>get-dir</KEYWORD1>
-        <KEYWORD1>get-document-element</KEYWORD1>
-        <KEYWORD1>get-double</KEYWORD1>
-        <KEYWORD1>get-dropped-file</KEYWORD1>
-        <KEYWORD1>get-dynamic</KEYWORD1>
-        <KEYWORD1>get-file</KEYWORD1>
-        <KEYWORD1>get-first</KEYWORD1>
-        <KEYWORD1>get-float</KEYWORD1>
-        <KEYWORD1>get-green-value</KEYWORD1>
-        <KEYWORD1>get-header-entry</KEYWORD1>
-        <KEYWORD1>get-index-by-namespace-name</KEYWORD1>
-        <KEYWORD1>get-index-by-qname</KEYWORD1>
-        <KEYWORD1>get-iteration</KEYWORD1>
-        <KEYWORD1>get-key-value</KEYWORD1>
-        <KEYWORD1>get-last</KEYWORD1>
-        <KEYWORD1>get-localname-by-index</KEYWORD1>
-        <KEYWORD1>get-long</KEYWORD1>
-        <KEYWORD1>get-message</KEYWORD1>
-        <KEYWORD1>get-next</KEYWORD1>
-        <KEYWORD1>get-node</KEYWORD1>
-        <KEYWORD1>get-number</KEYWORD1>
-        <KEYWORD1>get-parent</KEYWORD1>
-        <KEYWORD1>get-pointer-value</KEYWORD1>
-        <KEYWORD1>get-prev</KEYWORD1>
-        <KEYWORD1>get-printers</KEYWORD1>
-        <KEYWORD1>get-qname-by-index</KEYWORD1>
-        <KEYWORD1>get-red-value</KEYWORD1>
-        <KEYWORD1>get-relation</KEYWORD1>
-        <KEYWORD1>get-repositioned-row</KEYWORD1>
-        <KEYWORD1>get-rgb-value</KEYWORD1>
-        <KEYWORD1>get-selected-widget</KEYWORD1>
-        <KEYWORD1>get-serialized</KEYWORD1>
-        <KEYWORD1>get-short</KEYWORD1>
-        <KEYWORD1>get-signature</KEYWORD1>
-        <KEYWORD1>get-size</KEYWORD1>
-        <KEYWORD1>get-socket-option</KEYWORD1>
-        <KEYWORD1>get-source-buffer</KEYWORD1>
-        <KEYWORD1>get-string</KEYWORD1>
-        <KEYWORD1>get-tab-item</KEYWORD1>
-        <KEYWORD1>get-text-height</KEYWORD1>
-        <KEYWORD1>get-text-height-chars</KEYWORD1>
-        <KEYWORD1>get-text-height-pixels</KEYWORD1>
-        <KEYWORD1>get-text-width</KEYWORD1>
-        <KEYWORD1>get-text-width-chars</KEYWORD1>
-        <KEYWORD1>get-text-width-pixels</KEYWORD1>
-        <KEYWORD1>get-top-buffer</KEYWORD1>
-        <KEYWORD1>get-type-by-index</KEYWORD1>
-        <KEYWORD1>get-type-by-namespace-name</KEYWORD1>
-        <KEYWORD1>get-type-by-qname</KEYWORD1>
-        <KEYWORD1>get-unsigned-short</KEYWORD1>
-        <KEYWORD1>get-uri-by-index</KEYWORD1>
-        <KEYWORD1>get-value-by-index</KEYWORD1>
-        <KEYWORD1>get-value-by-namespace-name</KEYWORD1>
-        <KEYWORD1>get-value-by-qname</KEYWORD1>
-        <KEYWORD1>get-wait-state</KEYWORD1>
-        <KEYWORD1>getbyte</KEYWORD1>
-        <KEYWORD1>global</KEYWORD1>
-        <KEYWORD1>go-on</KEYWORD1>
-        <KEYWORD1>go-pending</KEYWORD1>
-        <KEYWORD1>goto</KEYWORD1>
-        <KEYWORD1>grant</KEYWORD1>
-        <KEYWORD1>graphic-edge</KEYWORD1>
-        <KEYWORD1>grayed</KEYWORD1>
-        <KEYWORD1>grid-factor-horizontal</KEYWORD1>
-        <KEYWORD1>grid-factor-vertical</KEYWORD1>
-        <KEYWORD1>grid-set</KEYWORD1>
-        <KEYWORD1>grid-snap</KEYWORD1>
-        <KEYWORD1>grid-unit-height</KEYWORD1>
-        <KEYWORD1>grid-unit-height-chars</KEYWORD1>
-        <KEYWORD1>grid-unit-height-pixels</KEYWORD1>
-        <KEYWORD1>grid-unit-width</KEYWORD1>
-        <KEYWORD1>grid-unit-width-chars</KEYWORD1>
-        <KEYWORD1>grid-unit-width-pixels</KEYWORD1>
-        <KEYWORD1>grid-visible</KEYWORD1>
-        <KEYWORD1>group</KEYWORD1>
-        <KEYWORD1>gt</KEYWORD1>
-        <KEYWORD1>handle</KEYWORD1>
-        <KEYWORD1>handler</KEYWORD1>
-        <KEYWORD1>has-lobs</KEYWORD1>
-        <KEYWORD1>has-records</KEYWORD1>
-        <KEYWORD1>having</KEYWORD1>
-        <KEYWORD1>header</KEYWORD1>
-        <KEYWORD1>height</KEYWORD1>
-        <KEYWORD1>height-chars</KEYWORD1>
-        <KEYWORD1>height-pixels</KEYWORD1>
-        <KEYWORD1>help-context</KEYWORD1>
-        <KEYWORD1>help-topic</KEYWORD1>
-        <KEYWORD1>helpfile-name</KEYWORD1>
-        <KEYWORD1>hidden</KEYWORD1>
-        <KEYWORD1>hide</KEYWORD1>
-        <KEYWORD1>hint</KEYWORD1>
-        <KEYWORD1>horiz-end</KEYWORD1>
-        <KEYWORD1>horiz-home</KEYWORD1>
-        <KEYWORD1>horiz-scroll-drag</KEYWORD1>
-        <KEYWORD1>horizontal</KEYWORD1>
-        <KEYWORD1>host-byte-order</KEYWORD1>
-        <KEYWORD1>html-charset</KEYWORD1>
-        <KEYWORD1>html-end-of-line</KEYWORD1>
-        <KEYWORD1>html-end-of-page</KEYWORD1>
-        <KEYWORD1>html-frame-begin</KEYWORD1>
-        <KEYWORD1>html-frame-end</KEYWORD1>
-        <KEYWORD1>html-header-begin</KEYWORD1>
-        <KEYWORD1>html-header-end</KEYWORD1>
-        <KEYWORD1>html-title-begin</KEYWORD1>
-        <KEYWORD1>html-title-end</KEYWORD1>
-        <KEYWORD1>hwnd</KEYWORD1>
-        <KEYWORD1>icfparameter</KEYWORD1>
-        <KEYWORD1>icon</KEYWORD1>
-        <KEYWORD1>if</KEYWORD1>
-        <KEYWORD1>ignore-current-modified</KEYWORD1>
-        <KEYWORD1>image</KEYWORD1>
-        <KEYWORD1>image-down</KEYWORD1>
-        <KEYWORD1>image-insensitive</KEYWORD1>
-        <KEYWORD1>image-size</KEYWORD1>
-        <KEYWORD1>image-size-chars</KEYWORD1>
-        <KEYWORD1>image-size-pixels</KEYWORD1>
-        <KEYWORD1>image-up</KEYWORD1>
-        <KEYWORD1>immediate-display</KEYWORD1>
-        <KEYWORD1>import</KEYWORD1>
-        <KEYWORD1>import-node</KEYWORD1>
-        <KEYWORD1>in</KEYWORD1>
-        <KEYWORD1>in-handle</KEYWORD1>
-        <KEYWORD1>increment-exclusive-id</KEYWORD1>
-        <KEYWORD1>index</KEYWORD1>
-        <KEYWORD1>index-hint</KEYWORD1>
-        <KEYWORD1>index-information</KEYWORD1>
-        <KEYWORD1>indexed-reposition</KEYWORD1>
-        <KEYWORD1>indicator</KEYWORD1>
-        <KEYWORD1>information</KEYWORD1>
-        <KEYWORD1>init</KEYWORD1>
-        <KEYWORD1>initial</KEYWORD1>
-        <KEYWORD1>initial-dir</KEYWORD1>
-        <KEYWORD1>initial-filter</KEYWORD1>
-        <KEYWORD1>initialize-document-type</KEYWORD1>
-        <KEYWORD1>initiate</KEYWORD1>
-        <KEYWORD1>inner</KEYWORD1>
-        <KEYWORD1>inner-chars</KEYWORD1>
-        <KEYWORD1>inner-lines</KEYWORD1>
-        <KEYWORD1>input</KEYWORD1>
-        <KEYWORD1>input-output</KEYWORD1>
-        <KEYWORD1>input-value</KEYWORD1>
-        <KEYWORD1>insert</KEYWORD1>
-        <KEYWORD1>insert-backtab</KEYWORD1>
-        <KEYWORD1>insert-before</KEYWORD1>
-        <KEYWORD1>insert-column</KEYWORD1>
-        <KEYWORD1>insert-field</KEYWORD1>
-        <KEYWORD1>insert-field-data</KEYWORD1>
-        <KEYWORD1>insert-field-label</KEYWORD1>
-        <KEYWORD1>insert-file</KEYWORD1>
-        <KEYWORD1>insert-mode</KEYWORD1>
-        <KEYWORD1>insert-row</KEYWORD1>
-        <KEYWORD1>insert-string</KEYWORD1>
-        <KEYWORD1>insert-tab</KEYWORD1>
-        <KEYWORD1>instantiating-procedure</KEYWORD1>
-        <KEYWORD1>integer</KEYWORD1>
-        <KEYWORD1>internal-entries</KEYWORD1>
-        <KEYWORD1>interval</KEYWORD1>
-        <KEYWORD1>into</KEYWORD1>
-        <KEYWORD1>invoke</KEYWORD1>
-        <KEYWORD1>is</KEYWORD1>
-        <KEYWORD1>is-attr-space</KEYWORD1>
-        <KEYWORD1>is-codepage-fixed</KEYWORD1>
-        <KEYWORD1>is-column-codepage</KEYWORD1>
-        <KEYWORD1>is-lead-byte</KEYWORD1>
-        <KEYWORD1>is-open</KEYWORD1>
-        <KEYWORD1>is-parameter-set</KEYWORD1>
-        <KEYWORD1>is-row-selected</KEYWORD1>
-        <KEYWORD1>is-selected</KEYWORD1>
-        <KEYWORD1>is-xml</KEYWORD1>
-        <KEYWORD1>iso-date</KEYWORD1>
-        <KEYWORD1>item</KEYWORD1>
-        <KEYWORD1>items-per-row</KEYWORD1>
-        <KEYWORD1>iteration-changed</KEYWORD1>
-        <KEYWORD1>join</KEYWORD1>
-        <KEYWORD1>join-by-sqldb</KEYWORD1>
-        <KEYWORD1>kblabel</KEYWORD1>
-        <KEYWORD1>keep-connection-open</KEYWORD1>
-        <KEYWORD1>keep-frame-z-order</KEYWORD1>
-        <KEYWORD1>keep-messages</KEYWORD1>
-        <KEYWORD1>keep-security-cache</KEYWORD1>
-        <KEYWORD1>keep-tab-order</KEYWORD1>
-        <KEYWORD1>key</KEYWORD1>
-        <KEYWORD1>key-code</KEYWORD1>
-        <KEYWORD1>key-function</KEYWORD1>
-        <KEYWORD1>key-label</KEYWORD1>
-        <KEYWORD1>keycode</KEYWORD1>
-        <KEYWORD1>keyfunction</KEYWORD1>
-        <KEYWORD1>keylabel</KEYWORD1>
-        <KEYWORD1>keys</KEYWORD1>
-        <KEYWORD1>keyword</KEYWORD1>
-        <KEYWORD1>keyword-all</KEYWORD1>
-        <KEYWORD1>label</KEYWORD1>
-        <KEYWORD1>label-bgcolor</KEYWORD1>
-        <KEYWORD1>label-dcolor</KEYWORD1>
-        <KEYWORD1>label-fgcolor</KEYWORD1>
-        <KEYWORD1>label-font</KEYWORD1>
-        <KEYWORD1>label-pfcolor</KEYWORD1>
-        <KEYWORD1>labels</KEYWORD1>
-        <KEYWORD1>landscape</KEYWORD1>
-        <KEYWORD1>languages</KEYWORD1>
-        <KEYWORD1>large</KEYWORD1>
-        <KEYWORD1>large-to-small</KEYWORD1>
-        <KEYWORD1>last</KEYWORD1>
-        <KEYWORD1>last-async-request</KEYWORD1>
-        <KEYWORD1>last-child</KEYWORD1>
-        <KEYWORD1>last-event</KEYWORD1>
-        <KEYWORD1>last-key</KEYWORD1>
-        <KEYWORD1>last-of</KEYWORD1>
-        <KEYWORD1>last-procedure</KEYWORD1>
-        <KEYWORD1>last-server</KEYWORD1>
-        <KEYWORD1>last-server-socket</KEYWORD1>
-        <KEYWORD1>last-socket</KEYWORD1>
-        <KEYWORD1>last-tab-item</KEYWORD1>
-        <KEYWORD1>lastkey</KEYWORD1>
-        <KEYWORD1>lc</KEYWORD1>
-        <KEYWORD1>ldbname</KEYWORD1>
-        <KEYWORD1>le</KEYWORD1>
-        <KEYWORD1>leading</KEYWORD1>
-        <KEYWORD1>left</KEYWORD1>
-        <KEYWORD1>left-aligned</KEYWORD1>
-        <KEYWORD1>left-end</KEYWORD1>
-        <KEYWORD1>left-trim</KEYWORD1>
-        <KEYWORD1>length</KEYWORD1>
-        <KEYWORD1>library</KEYWORD1>
-        <KEYWORD1>like</KEYWORD1>
-        <KEYWORD1>line</KEYWORD1>
-        <KEYWORD1>line-counter</KEYWORD1>
-        <KEYWORD1>line-down</KEYWORD1>
-        <KEYWORD1>line-left</KEYWORD1>
-        <KEYWORD1>line-right</KEYWORD1>
-        <KEYWORD1>line-up</KEYWORD1>
-        <KEYWORD1>list-events</KEYWORD1>
-        <KEYWORD1>list-item-pairs</KEYWORD1>
-        <KEYWORD1>list-items</KEYWORD1>
-        <KEYWORD1>list-query-attrs</KEYWORD1>
-        <KEYWORD1>list-set-attrs</KEYWORD1>
-        <KEYWORD1>list-widgets</KEYWORD1>
-        <KEYWORD1>listing</KEYWORD1>
-        <KEYWORD1>listings</KEYWORD1>
-        <KEYWORD1>literal-question</KEYWORD1>
-        <KEYWORD1>little-endian</KEYWORD1>
-        <KEYWORD1>load</KEYWORD1>
-        <KEYWORD1>load-from</KEYWORD1>
-        <KEYWORD1>load-icon</KEYWORD1>
-        <KEYWORD1>load-image</KEYWORD1>
-        <KEYWORD1>load-image-down</KEYWORD1>
-        <KEYWORD1>load-image-insensitive</KEYWORD1>
-        <KEYWORD1>load-image-up</KEYWORD1>
-        <KEYWORD1>load-mouse-pointer</KEYWORD1>
-        <KEYWORD1>load-picture</KEYWORD1>
-        <KEYWORD1>load-small-icon</KEYWORD1>
-        <KEYWORD1>lob-dir</KEYWORD1>
-        <KEYWORD1>local-host</KEYWORD1>
-        <KEYWORD1>local-name</KEYWORD1>
-        <KEYWORD1>local-port</KEYWORD1>
-        <KEYWORD1>locator-column-number</KEYWORD1>
-        <KEYWORD1>locator-line-number</KEYWORD1>
-        <KEYWORD1>locator-public-id</KEYWORD1>
-        <KEYWORD1>locator-system-id</KEYWORD1>
-        <KEYWORD1>locator-type</KEYWORD1>
-        <KEYWORD1>locked</KEYWORD1>
-        <KEYWORD1>log</KEYWORD1>
-        <KEYWORD1>log-entry-types</KEYWORD1>
-        <KEYWORD1>log-id</KEYWORD1>
-        <KEYWORD1>log-manager</KEYWORD1>
-        <KEYWORD1>log-threshold</KEYWORD1>
-        <KEYWORD1>logfile-name</KEYWORD1>
-        <KEYWORD1>logging-level</KEYWORD1>
-        <KEYWORD1>logical</KEYWORD1>
-        <KEYWORD1>long</KEYWORD1>
-        <KEYWORD1>longchar</KEYWORD1>
-        <KEYWORD1>longchar-to-node-value</KEYWORD1>
-        <KEYWORD1>lookahead</KEYWORD1>
-        <KEYWORD1>lookup</KEYWORD1>
-        <KEYWORD1>lower</KEYWORD1>
-        <KEYWORD1>lt</KEYWORD1>
-        <KEYWORD1>machine-class</KEYWORD1>
-        <KEYWORD1>main-menu</KEYWORD1>
-        <KEYWORD1>mandatory</KEYWORD1>
-        <KEYWORD1>manual-highlight</KEYWORD1>
-        <KEYWORD1>map</KEYWORD1>
-        <KEYWORD1>margin-extra</KEYWORD1>
-        <KEYWORD1>margin-height</KEYWORD1>
-        <KEYWORD1>margin-height-chars</KEYWORD1>
-        <KEYWORD1>margin-height-pixels</KEYWORD1>
-        <KEYWORD1>margin-width</KEYWORD1>
-        <KEYWORD1>margin-width-chars</KEYWORD1>
-        <KEYWORD1>margin-width-pixels</KEYWORD1>
-        <KEYWORD1>matches</KEYWORD1>
-        <KEYWORD1>max</KEYWORD1>
-        <KEYWORD1>max-button</KEYWORD1>
-        <KEYWORD1>max-chars</KEYWORD1>
-        <KEYWORD1>max-data-guess</KEYWORD1>
-        <KEYWORD1>max-height</KEYWORD1>
-        <KEYWORD1>max-height-chars</KEYWORD1>
-        <KEYWORD1>max-height-pixels</KEYWORD1>
-        <KEYWORD1>max-rows</KEYWORD1>
-        <KEYWORD1>max-size</KEYWORD1>
-        <KEYWORD1>max-value</KEYWORD1>
-        <KEYWORD1>max-width</KEYWORD1>
-        <KEYWORD1>max-width-chars</KEYWORD1>
-        <KEYWORD1>max-width-pixels</KEYWORD1>
-        <KEYWORD1>maximize</KEYWORD1>
-        <KEYWORD1>maximum</KEYWORD1>
-        <KEYWORD1>md5-value</KEYWORD1>
-        <KEYWORD1>member</KEYWORD1>
-        <KEYWORD1>memptr</KEYWORD1>
-        <KEYWORD1>memptr-to-node-value</KEYWORD1>
-        <KEYWORD1>menu</KEYWORD1>
-        <KEYWORD1>menu-bar</KEYWORD1>
-        <KEYWORD1>menu-item</KEYWORD1>
-        <KEYWORD1>menu-key</KEYWORD1>
-        <KEYWORD1>menu-mouse</KEYWORD1>
-        <KEYWORD1>menubar</KEYWORD1>
-        <KEYWORD1>merge-changes</KEYWORD1>
-        <KEYWORD1>merge-row-changes</KEYWORD1>
-        <KEYWORD1>message</KEYWORD1>
-        <KEYWORD1>message-area</KEYWORD1>
-        <KEYWORD1>message-area-font</KEYWORD1>
-        <KEYWORD1>message-line</KEYWORD1>
-        <KEYWORD1>message-lines</KEYWORD1>
-        <KEYWORD1>min-button</KEYWORD1>
-        <KEYWORD1>min-column-width-chars</KEYWORD1>
-        <KEYWORD1>min-column-width-pixels</KEYWORD1>
-        <KEYWORD1>min-height</KEYWORD1>
-        <KEYWORD1>min-height-chars</KEYWORD1>
-        <KEYWORD1>min-height-pixels</KEYWORD1>
-        <KEYWORD1>min-row-height</KEYWORD1>
-        <KEYWORD1>min-row-height-chars</KEYWORD1>
-        <KEYWORD1>min-row-height-pixels</KEYWORD1>
-        <KEYWORD1>min-schema-marshall</KEYWORD1>
-        <KEYWORD1>min-size</KEYWORD1>
-        <KEYWORD1>min-value</KEYWORD1>
-        <KEYWORD1>min-width</KEYWORD1>
-        <KEYWORD1>min-width-chars</KEYWORD1>
-        <KEYWORD1>min-width-pixels</KEYWORD1>
-        <KEYWORD1>minimum</KEYWORD1>
-        <KEYWORD1>mod</KEYWORD1>
-        <KEYWORD1>modified</KEYWORD1>
-        <KEYWORD1>modulo</KEYWORD1>
-        <KEYWORD1>month</KEYWORD1>
-        <KEYWORD1>mouse</KEYWORD1>
-        <KEYWORD1>mouse-pointer</KEYWORD1>
-        <KEYWORD1>movable</KEYWORD1>
-        <KEYWORD1>move</KEYWORD1>
-        <KEYWORD1>move-after-tab-item</KEYWORD1>
-        <KEYWORD1>move-before-tab-item</KEYWORD1>
-        <KEYWORD1>move-column</KEYWORD1>
-        <KEYWORD1>move-to-bottom</KEYWORD1>
-        <KEYWORD1>move-to-eof</KEYWORD1>
-        <KEYWORD1>move-to-top</KEYWORD1>
-        <KEYWORD1>mpe</KEYWORD1>
-        <KEYWORD1>mtime</KEYWORD1>
-        <KEYWORD1>multiple</KEYWORD1>
-        <KEYWORD1>multiple-key</KEYWORD1>
-        <KEYWORD1>multitasking-interval</KEYWORD1>
-        <KEYWORD1>must-exist</KEYWORD1>
-        <KEYWORD1>must-understand</KEYWORD1>
-        <KEYWORD1>name</KEYWORD1>
-        <KEYWORD1>namespace-prefix</KEYWORD1>
-        <KEYWORD1>namespace-uri</KEYWORD1>
-        <KEYWORD1>native</KEYWORD1>
-        <KEYWORD1>ne</KEYWORD1>
-        <KEYWORD1>needs-appserver-prompt</KEYWORD1>
-        <KEYWORD1>needs-prompt</KEYWORD1>
-        <KEYWORD1>nested</KEYWORD1>
-        <KEYWORD1>new</KEYWORD1>
-        <KEYWORD1>new-line</KEYWORD1>
-        <KEYWORD1>new-row</KEYWORD1>
-        <KEYWORD1>next</KEYWORD1>
-        <KEYWORD1>next-column</KEYWORD1>
-        <KEYWORD1>next-error</KEYWORD1>
-        <KEYWORD1>next-frame</KEYWORD1>
-        <KEYWORD1>next-prompt</KEYWORD1>
-        <KEYWORD1>next-sibling</KEYWORD1>
-        <KEYWORD1>next-tab-item</KEYWORD1>
-        <KEYWORD1>next-value</KEYWORD1>
-        <KEYWORD1>next-word</KEYWORD1>
-        <KEYWORD1>no</KEYWORD1>
-        <KEYWORD1>no-apply</KEYWORD1>
-        <KEYWORD1>no-array-message</KEYWORD1>
-        <KEYWORD1>no-assign</KEYWORD1>
-        <KEYWORD1>no-attr</KEYWORD1>
-        <KEYWORD1>no-attr-list</KEYWORD1>
-        <KEYWORD1>no-attr-space</KEYWORD1>
-        <KEYWORD1>no-auto-validate</KEYWORD1>
-        <KEYWORD1>no-bind-where</KEYWORD1>
-        <KEYWORD1>no-box</KEYWORD1>
-        <KEYWORD1>no-column-scrolling</KEYWORD1>
-        <KEYWORD1>no-console</KEYWORD1>
-        <KEYWORD1>no-convert</KEYWORD1>
-        <KEYWORD1>no-convert-3d-colors</KEYWORD1>
-        <KEYWORD1>no-current-value</KEYWORD1>
-        <KEYWORD1>no-debug</KEYWORD1>
-        <KEYWORD1>no-drag</KEYWORD1>
-        <KEYWORD1>no-echo</KEYWORD1>
-        <KEYWORD1>no-empty-space</KEYWORD1>
-        <KEYWORD1>no-error</KEYWORD1>
-        <KEYWORD1>no-fill</KEYWORD1>
-        <KEYWORD1>no-focus</KEYWORD1>
-        <KEYWORD1>no-help</KEYWORD1>
-        <KEYWORD1>no-hide</KEYWORD1>
-        <KEYWORD1>no-index-hint</KEYWORD1>
-        <KEYWORD1>no-join-by-sqldb</KEYWORD1>
-        <KEYWORD1>no-labels</KEYWORD1>
-        <KEYWORD1>no-lobs</KEYWORD1>
-        <KEYWORD1>no-lock</KEYWORD1>
-        <KEYWORD1>no-lookahead</KEYWORD1>
-        <KEYWORD1>no-map</KEYWORD1>
-        <KEYWORD1>no-message</KEYWORD1>
-        <KEYWORD1>no-pause</KEYWORD1>
-        <KEYWORD1>no-prefetch</KEYWORD1>
-        <KEYWORD1>no-return-value</KEYWORD1>
-        <KEYWORD1>no-row-markers</KEYWORD1>
-        <KEYWORD1>no-schema-marshall</KEYWORD1>
-        <KEYWORD1>no-scrollbar-vertical</KEYWORD1>
-        <KEYWORD1>no-scrolling</KEYWORD1>
-        <KEYWORD1>no-separate-connection</KEYWORD1>
-        <KEYWORD1>no-separators</KEYWORD1>
-        <KEYWORD1>no-tab-stop</KEYWORD1>
-        <KEYWORD1>no-underline</KEYWORD1>
-        <KEYWORD1>no-undo</KEYWORD1>
-        <KEYWORD1>no-validate</KEYWORD1>
-        <KEYWORD1>no-wait</KEYWORD1>
-        <KEYWORD1>no-word-wrap</KEYWORD1>
-        <KEYWORD1>node-type</KEYWORD1>
-        <KEYWORD1>node-value</KEYWORD1>
-        <KEYWORD1>node-value-to-longchar</KEYWORD1>
-        <KEYWORD1>node-value-to-memptr</KEYWORD1>
-        <KEYWORD1>none</KEYWORD1>
-        <KEYWORD1>normalize</KEYWORD1>
-        <KEYWORD1>not</KEYWORD1>
-        <KEYWORD1>now</KEYWORD1>
-        <KEYWORD1>null</KEYWORD1>
-        <KEYWORD1>num-aliases</KEYWORD1>
-        <KEYWORD1>num-buffers</KEYWORD1>
-        <KEYWORD1>num-buttons</KEYWORD1>
-        <KEYWORD1>num-child-relations</KEYWORD1>
-        <KEYWORD1>num-children</KEYWORD1>
-        <KEYWORD1>num-columns</KEYWORD1>
-        <KEYWORD1>num-copies</KEYWORD1>
-        <KEYWORD1>num-dbs</KEYWORD1>
-        <KEYWORD1>num-dropped-files</KEYWORD1>
-        <KEYWORD1>num-entries</KEYWORD1>
-        <KEYWORD1>num-fields</KEYWORD1>
-        <KEYWORD1>num-formats</KEYWORD1>
-        <KEYWORD1>num-header-entries</KEYWORD1>
-        <KEYWORD1>num-items</KEYWORD1>
-        <KEYWORD1>num-iterations</KEYWORD1>
-        <KEYWORD1>num-lines</KEYWORD1>
-        <KEYWORD1>num-locked-columns</KEYWORD1>
-        <KEYWORD1>num-log-files</KEYWORD1>
-        <KEYWORD1>num-messages</KEYWORD1>
-        <KEYWORD1>num-parameters</KEYWORD1>
-        <KEYWORD1>num-relations</KEYWORD1>
-        <KEYWORD1>num-replaced</KEYWORD1>
-        <KEYWORD1>num-results</KEYWORD1>
-        <KEYWORD1>num-selected</KEYWORD1>
-        <KEYWORD1>num-selected-rows</KEYWORD1>
-        <KEYWORD1>num-selected-widgets</KEYWORD1>
-        <KEYWORD1>num-source-buffers</KEYWORD1>
-        <KEYWORD1>num-tabs</KEYWORD1>
-        <KEYWORD1>num-to-retain</KEYWORD1>
-        <KEYWORD1>num-top-buffers</KEYWORD1>
-        <KEYWORD1>num-visible-columns</KEYWORD1>
-        <KEYWORD1>numeric</KEYWORD1>
-        <KEYWORD1>numeric-decimal-point</KEYWORD1>
-        <KEYWORD1>numeric-format</KEYWORD1>
-        <KEYWORD1>numeric-separator</KEYWORD1>
-        <KEYWORD1>object</KEYWORD1>
-        <KEYWORD1>octet_length</KEYWORD1>
-        <KEYWORD1>of</KEYWORD1>
-        <KEYWORD1>off</KEYWORD1>
-        <KEYWORD1>ok</KEYWORD1>
-        <KEYWORD1>ok-cancel</KEYWORD1>
-        <KEYWORD1>old</KEYWORD1>
-        <KEYWORD1>ole-invoke-locale</KEYWORD1>
-        <KEYWORD1>ole-names-locale</KEYWORD1>
-        <KEYWORD1>on</KEYWORD1>
-        <KEYWORD1>on-frame-border</KEYWORD1>
-        <KEYWORD1>open</KEYWORD1>
-        <KEYWORD1>open-line-above</KEYWORD1>
-        <KEYWORD1>opsys</KEYWORD1>
-        <KEYWORD1>option</KEYWORD1>
-        <KEYWORD1>options</KEYWORD1>
-        <KEYWORD1>or</KEYWORD1>
-        <KEYWORD1>ordered-join</KEYWORD1>
-        <KEYWORD1>ordinal</KEYWORD1>
-        <KEYWORD1>orientation</KEYWORD1>
-        <KEYWORD1>origin-handle</KEYWORD1>
-        <KEYWORD1>origin-rowid</KEYWORD1>
-        <KEYWORD1>os-append</KEYWORD1>
-        <KEYWORD1>os-command</KEYWORD1>
-        <KEYWORD1>os-copy</KEYWORD1>
-        <KEYWORD1>os-create-dir</KEYWORD1>
-        <KEYWORD1>os-delete</KEYWORD1>
-        <KEYWORD1>os-dir</KEYWORD1>
-        <KEYWORD1>os-drives</KEYWORD1>
-        <KEYWORD1>os-error</KEYWORD1>
-        <KEYWORD1>os-getenv</KEYWORD1>
-        <KEYWORD1>os-rename</KEYWORD1>
-        <KEYWORD1>os2</KEYWORD1>
-        <KEYWORD1>os400</KEYWORD1>
-        <KEYWORD1>otherwise</KEYWORD1>
-        <KEYWORD1>out-of-data</KEYWORD1>
-        <KEYWORD1>outer</KEYWORD1>
-        <KEYWORD1>outer-join</KEYWORD1>
-        <KEYWORD1>output</KEYWORD1>
-        <KEYWORD1>overlay</KEYWORD1>
-        <KEYWORD1>override</KEYWORD1>
-        <KEYWORD1>owner</KEYWORD1>
-        <KEYWORD1>owner-document</KEYWORD1>
-        <KEYWORD1>page</KEYWORD1>
-        <KEYWORD1>page-bottom</KEYWORD1>
-        <KEYWORD1>page-down</KEYWORD1>
-        <KEYWORD1>page-left</KEYWORD1>
-        <KEYWORD1>page-number</KEYWORD1>
-        <KEYWORD1>page-right</KEYWORD1>
-        <KEYWORD1>page-right-text</KEYWORD1>
-        <KEYWORD1>page-size</KEYWORD1>
-        <KEYWORD1>page-top</KEYWORD1>
-        <KEYWORD1>page-up</KEYWORD1>
-        <KEYWORD1>page-width</KEYWORD1>
-        <KEYWORD1>paged</KEYWORD1>
-        <KEYWORD1>parameter</KEYWORD1>
-        <KEYWORD1>parent</KEYWORD1>
-        <KEYWORD1>parent-buffer</KEYWORD1>
-        <KEYWORD1>parent-relation</KEYWORD1>
-        <KEYWORD1>parse-status</KEYWORD1>
-        <KEYWORD1>partial-key</KEYWORD1>
-        <KEYWORD1>pascal</KEYWORD1>
-        <KEYWORD1>password-field</KEYWORD1>
-        <KEYWORD1>paste</KEYWORD1>
-        <KEYWORD1>pathname</KEYWORD1>
-        <KEYWORD1>pause</KEYWORD1>
-        <KEYWORD1>pdbname</KEYWORD1>
-        <KEYWORD1>performance</KEYWORD1>
-        <KEYWORD1>persistent</KEYWORD1>
-        <KEYWORD1>persistent-cache-disabled</KEYWORD1>
-        <KEYWORD1>persistent-procedure</KEYWORD1>
-        <KEYWORD1>pfcolor</KEYWORD1>
-        <KEYWORD1>pick</KEYWORD1>
-        <KEYWORD1>pick-area</KEYWORD1>
-        <KEYWORD1>pick-both</KEYWORD1>
-        <KEYWORD1>pixels</KEYWORD1>
-        <KEYWORD1>pixels-per-column</KEYWORD1>
-        <KEYWORD1>pixels-per-row</KEYWORD1>
-        <KEYWORD1>popup-menu</KEYWORD1>
-        <KEYWORD1>popup-only</KEYWORD1>
-        <KEYWORD1>portrait</KEYWORD1>
-        <KEYWORD1>position</KEYWORD1>
-        <KEYWORD1>precision</KEYWORD1>
-        <KEYWORD1>prepare-string</KEYWORD1>
-        <KEYWORD1>prepared</KEYWORD1>
-        <KEYWORD1>preprocess</KEYWORD1>
-        <KEYWORD1>preselect</KEYWORD1>
-        <KEYWORD1>prev</KEYWORD1>
-        <KEYWORD1>prev-column</KEYWORD1>
-        <KEYWORD1>prev-frame</KEYWORD1>
-        <KEYWORD1>prev-sibling</KEYWORD1>
-        <KEYWORD1>prev-tab-item</KEYWORD1>
-        <KEYWORD1>prev-word</KEYWORD1>
-        <KEYWORD1>primary</KEYWORD1>
-        <KEYWORD1>printer</KEYWORD1>
-        <KEYWORD1>printer-control-handle</KEYWORD1>
-        <KEYWORD1>printer-hdc</KEYWORD1>
-        <KEYWORD1>printer-name</KEYWORD1>
-        <KEYWORD1>printer-port</KEYWORD1>
-        <KEYWORD1>printer-setup</KEYWORD1>
-        <KEYWORD1>private</KEYWORD1>
-        <KEYWORD1>private-data</KEYWORD1>
-        <KEYWORD1>privileges</KEYWORD1>
-        <KEYWORD1>proc-handle</KEYWORD1>
-        <KEYWORD1>proc-status</KEYWORD1>
-        <KEYWORD1>procedure</KEYWORD1>
-        <KEYWORD1>procedure-call-type</KEYWORD1>
-        <KEYWORD1>procedure-name</KEYWORD1>
-        <KEYWORD1>process</KEYWORD1>
-        <KEYWORD1>profile-file</KEYWORD1>
-        <KEYWORD1>profiler</KEYWORD1>
-        <KEYWORD1>profiling</KEYWORD1>
-        <KEYWORD1>program-name</KEYWORD1>
-        <KEYWORD1>progress</KEYWORD1>
-        <KEYWORD1>progress-source</KEYWORD1>
-        <KEYWORD1>prompt</KEYWORD1>
-        <KEYWORD1>prompt-for</KEYWORD1>
-        <KEYWORD1>promsgs</KEYWORD1>
-        <KEYWORD1>propath</KEYWORD1>
-        <KEYWORD1>proversion</KEYWORD1>
-        <KEYWORD1>proxy</KEYWORD1>
-        <KEYWORD1>proxy-password</KEYWORD1>
-        <KEYWORD1>proxy-userid</KEYWORD1>
-        <KEYWORD1>public-id</KEYWORD1>
-        <KEYWORD1>publish</KEYWORD1>
-        <KEYWORD1>published-events</KEYWORD1>
-        <KEYWORD1>put</KEYWORD1>
-        <KEYWORD1>put-bits</KEYWORD1>
-        <KEYWORD1>put-byte</KEYWORD1>
-        <KEYWORD1>put-bytes</KEYWORD1>
-        <KEYWORD1>put-double</KEYWORD1>
-        <KEYWORD1>put-float</KEYWORD1>
-        <KEYWORD1>put-key-value</KEYWORD1>
-        <KEYWORD1>put-long</KEYWORD1>
-        <KEYWORD1>put-short</KEYWORD1>
-        <KEYWORD1>put-string</KEYWORD1>
-        <KEYWORD1>put-unsigned-short</KEYWORD1>
-        <KEYWORD1>putbyte</KEYWORD1>
-        <KEYWORD1>query</KEYWORD1>
-        <KEYWORD1>query-close</KEYWORD1>
-        <KEYWORD1>query-off-end</KEYWORD1>
-        <KEYWORD1>query-open</KEYWORD1>
-        <KEYWORD1>query-prepare</KEYWORD1>
-        <KEYWORD1>query-tuning</KEYWORD1>
-        <KEYWORD1>question</KEYWORD1>
-        <KEYWORD1>quit</KEYWORD1>
-        <KEYWORD1>quoter</KEYWORD1>
-        <KEYWORD1>r-index</KEYWORD1>
-        <KEYWORD1>radio-buttons</KEYWORD1>
-        <KEYWORD1>radio-set</KEYWORD1>
-        <KEYWORD1>random</KEYWORD1>
-        <KEYWORD1>raw</KEYWORD1>
-        <KEYWORD1>raw-transfer</KEYWORD1>
-        <KEYWORD1>rcode-information</KEYWORD1>
-        <KEYWORD1>read</KEYWORD1>
-        <KEYWORD1>read-available</KEYWORD1>
-        <KEYWORD1>read-exact-num</KEYWORD1>
-        <KEYWORD1>read-file</KEYWORD1>
-        <KEYWORD1>read-only</KEYWORD1>
-        <KEYWORD1>readkey</KEYWORD1>
-        <KEYWORD1>real</KEYWORD1>
-        <KEYWORD1>recid</KEYWORD1>
-        <KEYWORD1>record-length</KEYWORD1>
-        <KEYWORD1>rectangle</KEYWORD1>
-        <KEYWORD1>recursive</KEYWORD1>
-        <KEYWORD1>refresh</KEYWORD1>
-        <KEYWORD1>refreshable</KEYWORD1>
-        <KEYWORD1>reject-changes</KEYWORD1>
-        <KEYWORD1>reject-row-changes</KEYWORD1>
-        <KEYWORD1>rejected</KEYWORD1>
-        <KEYWORD1>relation-fields</KEYWORD1>
-        <KEYWORD1>relations-active</KEYWORD1>
-        <KEYWORD1>release</KEYWORD1>
-        <KEYWORD1>remote</KEYWORD1>
-        <KEYWORD1>remote-host</KEYWORD1>
-        <KEYWORD1>remote-port</KEYWORD1>
-        <KEYWORD1>remove-attribute</KEYWORD1>
-        <KEYWORD1>remove-child</KEYWORD1>
-        <KEYWORD1>remove-events-procedure</KEYWORD1>
-        <KEYWORD1>remove-super-procedure</KEYWORD1>
-        <KEYWORD1>repeat</KEYWORD1>
-        <KEYWORD1>replace</KEYWORD1>
-        <KEYWORD1>replace-child</KEYWORD1>
-        <KEYWORD1>replace-selection-text</KEYWORD1>
-        <KEYWORD1>replication-create</KEYWORD1>
-        <KEYWORD1>replication-delete</KEYWORD1>
-        <KEYWORD1>replication-write</KEYWORD1>
-        <KEYWORD1>reports</KEYWORD1>
-        <KEYWORD1>reposition</KEYWORD1>
-        <KEYWORD1>reposition-backwards</KEYWORD1>
-        <KEYWORD1>reposition-forwards</KEYWORD1>
-        <KEYWORD1>reposition-mode</KEYWORD1>
-        <KEYWORD1>reposition-parent-relation</KEYWORD1>
-        <KEYWORD1>reposition-to-row</KEYWORD1>
-        <KEYWORD1>reposition-to-rowid</KEYWORD1>
-        <KEYWORD1>request</KEYWORD1>
-        <KEYWORD1>resizable</KEYWORD1>
-        <KEYWORD1>resize</KEYWORD1>
-        <KEYWORD1>result</KEYWORD1>
-        <KEYWORD1>resume-display</KEYWORD1>
-        <KEYWORD1>retain</KEYWORD1>
-        <KEYWORD1>retain-shape</KEYWORD1>
-        <KEYWORD1>retry</KEYWORD1>
-        <KEYWORD1>retry-cancel</KEYWORD1>
-        <KEYWORD1>return-inserted</KEYWORD1>
-        <KEYWORD1>return-to-start-dir</KEYWORD1>
-        <KEYWORD1>return-value</KEYWORD1>
-        <KEYWORD1>return-value-data-type</KEYWORD1>
-        <KEYWORD1>returns</KEYWORD1>
-        <KEYWORD1>reverse-from</KEYWORD1>
-        <KEYWORD1>revert</KEYWORD1>
-        <KEYWORD1>revoke</KEYWORD1>
-        <KEYWORD1>rgb-value</KEYWORD1>
-        <KEYWORD1>right</KEYWORD1>
-        <KEYWORD1>right-aligned</KEYWORD1>
-        <KEYWORD1>right-end</KEYWORD1>
-        <KEYWORD1>right-trim</KEYWORD1>
-        <KEYWORD1>round</KEYWORD1>
-        <KEYWORD1>row</KEYWORD1>
-        <KEYWORD1>row-created</KEYWORD1>
-        <KEYWORD1>row-deleted</KEYWORD1>
-        <KEYWORD1>row-height</KEYWORD1>
-        <KEYWORD1>row-height-chars</KEYWORD1>
-        <KEYWORD1>row-height-pixels</KEYWORD1>
-        <KEYWORD1>row-markers</KEYWORD1>
-        <KEYWORD1>row-modified</KEYWORD1>
-        <KEYWORD1>row-of</KEYWORD1>
-        <KEYWORD1>row-resizable</KEYWORD1>
-        <KEYWORD1>row-state</KEYWORD1>
-        <KEYWORD1>row-unmodified</KEYWORD1>
-        <KEYWORD1>rowid</KEYWORD1>
-        <KEYWORD1>rule</KEYWORD1>
-        <KEYWORD1>rule-row</KEYWORD1>
-        <KEYWORD1>rule-y</KEYWORD1>
-        <KEYWORD1>run</KEYWORD1>
-        <KEYWORD1>run-procedure</KEYWORD1>
-        <KEYWORD1>save</KEYWORD1>
-        <KEYWORD1>save-as</KEYWORD1>
-        <KEYWORD1>save-file</KEYWORD1>
-        <KEYWORD1>save-row-changes</KEYWORD1>
-        <KEYWORD1>save-where-string</KEYWORD1>
-        <KEYWORD1>sax-attributes</KEYWORD1>
-        <KEYWORD1>sax-complete</KEYWORD1>
-        <KEYWORD1>sax-parse</KEYWORD1>
-        <KEYWORD1>sax-parse-first</KEYWORD1>
-        <KEYWORD1>sax-parse-next</KEYWORD1>
-        <KEYWORD1>sax-parser-error</KEYWORD1>
-        <KEYWORD1>sax-reader</KEYWORD1>
-        <KEYWORD1>sax-running</KEYWORD1>
-        <KEYWORD1>sax-uninitialized</KEYWORD1>
-        <KEYWORD1>sax-xml</KEYWORD1>
-        <KEYWORD1>schema</KEYWORD1>
-        <KEYWORD1>schema-change</KEYWORD1>
-        <KEYWORD1>schema-path</KEYWORD1>
-        <KEYWORD1>screen</KEYWORD1>
-        <KEYWORD1>screen-io</KEYWORD1>
-        <KEYWORD1>screen-lines</KEYWORD1>
-        <KEYWORD1>screen-value</KEYWORD1>
-        <KEYWORD1>scroll</KEYWORD1>
-        <KEYWORD1>scroll-bars</KEYWORD1>
-        <KEYWORD1>scroll-delta</KEYWORD1>
-        <KEYWORD1>scroll-left</KEYWORD1>
-        <KEYWORD1>scroll-mode</KEYWORD1>
-        <KEYWORD1>scroll-offset</KEYWORD1>
-        <KEYWORD1>scroll-right</KEYWORD1>
-        <KEYWORD1>scroll-to-current-row</KEYWORD1>
-        <KEYWORD1>scroll-to-item</KEYWORD1>
-        <KEYWORD1>scroll-to-selected-row</KEYWORD1>
-        <KEYWORD1>scrollable</KEYWORD1>
-        <KEYWORD1>scrollbar-drag</KEYWORD1>
-        <KEYWORD1>scrollbar-horizontal</KEYWORD1>
-        <KEYWORD1>scrollbar-vertical</KEYWORD1>
-        <KEYWORD1>scrolled-row-position</KEYWORD1>
-        <KEYWORD1>scrolling</KEYWORD1>
-        <KEYWORD1>sdbname</KEYWORD1>
-        <KEYWORD1>search</KEYWORD1>
-        <KEYWORD1>search-self</KEYWORD1>
-        <KEYWORD1>search-target</KEYWORD1>
-        <KEYWORD1>section</KEYWORD1>
-        <KEYWORD1>seek</KEYWORD1>
-        <KEYWORD1>select-all</KEYWORD1>
-        <KEYWORD1>select-extend</KEYWORD1>
-        <KEYWORD1>select-focused-row</KEYWORD1>
-        <KEYWORD1>select-next-row</KEYWORD1>
-        <KEYWORD1>select-prev-row</KEYWORD1>
-        <KEYWORD1>select-repositioned-row</KEYWORD1>
-        <KEYWORD1>select-row</KEYWORD1>
-        <KEYWORD1>selectable</KEYWORD1>
-        <KEYWORD1>selected</KEYWORD1>
-        <KEYWORD1>selected-items</KEYWORD1>
-        <KEYWORD1>selection-end</KEYWORD1>
-        <KEYWORD1>selection-extend</KEYWORD1>
-        <KEYWORD1>selection-list</KEYWORD1>
-        <KEYWORD1>selection-start</KEYWORD1>
-        <KEYWORD1>selection-text</KEYWORD1>
-        <KEYWORD1>self</KEYWORD1>
-        <KEYWORD1>send</KEYWORD1>
-        <KEYWORD1>sensitive</KEYWORD1>
-        <KEYWORD1>separate-connection</KEYWORD1>
-        <KEYWORD1>separator-fgcolor</KEYWORD1>
-        <KEYWORD1>separators</KEYWORD1>
-        <KEYWORD1>server</KEYWORD1>
-        <KEYWORD1>server-connection-bound</KEYWORD1>
-        <KEYWORD1>server-connection-bound-request</KEYWORD1>
-        <KEYWORD1>server-connection-context</KEYWORD1>
-        <KEYWORD1>server-connection-id</KEYWORD1>
-        <KEYWORD1>server-operating-mode</KEYWORD1>
-        <KEYWORD1>server-socket</KEYWORD1>
-        <KEYWORD1>session</KEYWORD1>
-        <KEYWORD1>session-end</KEYWORD1>
-        <KEYWORD1>set</KEYWORD1>
-        <KEYWORD1>set-actor</KEYWORD1>
-        <KEYWORD1>set-attr-call-type</KEYWORD1>
-        <KEYWORD1>set-attribute</KEYWORD1>
-        <KEYWORD1>set-attribute-node</KEYWORD1>
-        <KEYWORD1>set-blue-value</KEYWORD1>
-        <KEYWORD1>set-break</KEYWORD1>
-        <KEYWORD1>set-buffers</KEYWORD1>
-        <KEYWORD1>set-byte-order</KEYWORD1>
-        <KEYWORD1>set-callback-procedure</KEYWORD1>
-        <KEYWORD1>set-cell-focus</KEYWORD1>
-        <KEYWORD1>set-commit</KEYWORD1>
-        <KEYWORD1>set-connect-procedure</KEYWORD1>
-        <KEYWORD1>set-contents</KEYWORD1>
-        <KEYWORD1>set-dynamic</KEYWORD1>
-        <KEYWORD1>set-green-value</KEYWORD1>
-        <KEYWORD1>set-input-source</KEYWORD1>
-        <KEYWORD1>set-must-understand</KEYWORD1>
-        <KEYWORD1>set-node</KEYWORD1>
-        <KEYWORD1>set-numeric-format</KEYWORD1>
-        <KEYWORD1>set-parameter</KEYWORD1>
-        <KEYWORD1>set-pointer-value</KEYWORD1>
-        <KEYWORD1>set-read-response-procedure</KEYWORD1>
-        <KEYWORD1>set-red-value</KEYWORD1>
-        <KEYWORD1>set-repositioned-row</KEYWORD1>
-        <KEYWORD1>set-rgb-value</KEYWORD1>
-        <KEYWORD1>set-rollback</KEYWORD1>
-        <KEYWORD1>set-selection</KEYWORD1>
-        <KEYWORD1>set-serialized</KEYWORD1>
-        <KEYWORD1>set-size</KEYWORD1>
-        <KEYWORD1>set-socket-option</KEYWORD1>
-        <KEYWORD1>set-wait-state</KEYWORD1>
-        <KEYWORD1>settings</KEYWORD1>
-        <KEYWORD1>setuserid</KEYWORD1>
-        <KEYWORD1>share-lock</KEYWORD1>
-        <KEYWORD1>shared</KEYWORD1>
-        <KEYWORD1>short</KEYWORD1>
-        <KEYWORD1>show-in-taskbar</KEYWORD1>
-        <KEYWORD1>show-stats</KEYWORD1>
-        <KEYWORD1>side-label</KEYWORD1>
-        <KEYWORD1>side-label-handle</KEYWORD1>
-        <KEYWORD1>side-labels</KEYWORD1>
-        <KEYWORD1>silent</KEYWORD1>
-        <KEYWORD1>simple</KEYWORD1>
-        <KEYWORD1>single</KEYWORD1>
-        <KEYWORD1>size</KEYWORD1>
-        <KEYWORD1>size-chars</KEYWORD1>
-        <KEYWORD1>size-pixels</KEYWORD1>
-        <KEYWORD1>skip</KEYWORD1>
-        <KEYWORD1>skip-deleted-record</KEYWORD1>
-        <KEYWORD1>skip-schema-check</KEYWORD1>
-        <KEYWORD1>slider</KEYWORD1>
-        <KEYWORD1>small-icon</KEYWORD1>
-        <KEYWORD1>small-title</KEYWORD1>
-        <KEYWORD1>smallint</KEYWORD1>
-        <KEYWORD1>soap-fault</KEYWORD1>
-        <KEYWORD1>soap-fault-actor</KEYWORD1>
-        <KEYWORD1>soap-fault-code</KEYWORD1>
-        <KEYWORD1>soap-fault-detail</KEYWORD1>
-        <KEYWORD1>soap-fault-string</KEYWORD1>
-        <KEYWORD1>soap-header</KEYWORD1>
-        <KEYWORD1>soap-header-entryref</KEYWORD1>
-        <KEYWORD1>socket</KEYWORD1>
-        <KEYWORD1>some</KEYWORD1>
-        <KEYWORD1>sort</KEYWORD1>
-        <KEYWORD1>source</KEYWORD1>
-        <KEYWORD1>source-procedure</KEYWORD1>
-        <KEYWORD1>space</KEYWORD1>
-        <KEYWORD1>sql</KEYWORD1>
-        <KEYWORD1>sqrt</KEYWORD1>
-        <KEYWORD1>start</KEYWORD1>
-        <KEYWORD1>start-extend-box-selection</KEYWORD1>
-        <KEYWORD1>start-row-resize</KEYWORD1>
-        <KEYWORD1>starting</KEYWORD1>
-        <KEYWORD1>startup-parameters</KEYWORD1>
-        <KEYWORD1>status</KEYWORD1>
-        <KEYWORD1>status-area</KEYWORD1>
-        <KEYWORD1>status-area-font</KEYWORD1>
-        <KEYWORD1>stdcall</KEYWORD1>
-        <KEYWORD1>stop</KEYWORD1>
-        <KEYWORD1>stop-display</KEYWORD1>
-        <KEYWORD1>stop-parsing</KEYWORD1>
-        <KEYWORD1>stopped</KEYWORD1>
-        <KEYWORD1>stored-procedure</KEYWORD1>
-        <KEYWORD1>stream</KEYWORD1>
-        <KEYWORD1>stream-io</KEYWORD1>
-        <KEYWORD1>stretch-to-fit</KEYWORD1>
-        <KEYWORD1>string</KEYWORD1>
-        <KEYWORD1>string-value</KEYWORD1>
-        <KEYWORD1>string-xref</KEYWORD1>
-        <KEYWORD1>sub-average</KEYWORD1>
-        <KEYWORD1>sub-count</KEYWORD1>
-        <KEYWORD1>sub-maximum</KEYWORD1>
-        <KEYWORD1>sub-menu</KEYWORD1>
-        <KEYWORD1>sub-menu-help</KEYWORD1>
-        <KEYWORD1>sub-minimum</KEYWORD1>
-        <KEYWORD1>sub-total</KEYWORD1>
-        <KEYWORD1>subscribe</KEYWORD1>
-        <KEYWORD1>substitute</KEYWORD1>
-        <KEYWORD1>substring</KEYWORD1>
-        <KEYWORD1>subtype</KEYWORD1>
-        <KEYWORD1>sum</KEYWORD1>
-        <KEYWORD1>summary</KEYWORD1>
-        <KEYWORD1>super</KEYWORD1>
-        <KEYWORD1>super-procedures</KEYWORD1>
-        <KEYWORD1>suppress-namespace-processing</KEYWORD1>
-        <KEYWORD1>suppress-warnings</KEYWORD1>
-        <KEYWORD1>synchronize</KEYWORD1>
-        <KEYWORD1>system-alert-boxes</KEYWORD1>
-        <KEYWORD1>system-dialog</KEYWORD1>
-        <KEYWORD1>system-help</KEYWORD1>
-        <KEYWORD1>system-id</KEYWORD1>
-        <KEYWORD1>tab-position</KEYWORD1>
-        <KEYWORD1>tab-stop</KEYWORD1>
-        <KEYWORD1>table</KEYWORD1>
-        <KEYWORD1>table-crc-list</KEYWORD1>
-        <KEYWORD1>table-handle</KEYWORD1>
-        <KEYWORD1>table-list</KEYWORD1>
-        <KEYWORD1>table-number</KEYWORD1>
-        <KEYWORD1>target</KEYWORD1>
-        <KEYWORD1>target-procedure</KEYWORD1>
-        <KEYWORD1>temp-directory</KEYWORD1>
-        <KEYWORD1>temp-table</KEYWORD1>
-        <KEYWORD1>temp-table-prepare</KEYWORD1>
-        <KEYWORD1>term</KEYWORD1>
-        <KEYWORD1>terminal</KEYWORD1>
-        <KEYWORD1>terminate</KEYWORD1>
-        <KEYWORD1>text</KEYWORD1>
-        <KEYWORD1>text-cursor</KEYWORD1>
-        <KEYWORD1>text-seg-growth</KEYWORD1>
-        <KEYWORD1>text-selected</KEYWORD1>
-        <KEYWORD1>then</KEYWORD1>
-        <KEYWORD1>this-procedure</KEYWORD1>
-        <KEYWORD1>three-d</KEYWORD1>
-        <KEYWORD1>through</KEYWORD1>
-        <KEYWORD1>thru</KEYWORD1>
-        <KEYWORD1>tic-marks</KEYWORD1>
-        <KEYWORD1>time</KEYWORD1>
-        <KEYWORD1>time-source</KEYWORD1>
-        <KEYWORD1>timezone</KEYWORD1>
-        <KEYWORD1>title</KEYWORD1>
-        <KEYWORD1>title-bgcolor</KEYWORD1>
-        <KEYWORD1>title-dcolor</KEYWORD1>
-        <KEYWORD1>title-fgcolor</KEYWORD1>
-        <KEYWORD1>title-font</KEYWORD1>
-        <KEYWORD1>to</KEYWORD1>
-        <KEYWORD1>to-rowid</KEYWORD1>
-        <KEYWORD1>today</KEYWORD1>
-        <KEYWORD1>toggle-box</KEYWORD1>
-        <KEYWORD1>tooltip</KEYWORD1>
-        <KEYWORD1>tooltips</KEYWORD1>
-        <KEYWORD1>top</KEYWORD1>
-        <KEYWORD1>top-column</KEYWORD1>
-        <KEYWORD1>top-only</KEYWORD1>
-        <KEYWORD1>topic</KEYWORD1>
-        <KEYWORD1>total</KEYWORD1>
-        <KEYWORD1>trace-filter</KEYWORD1>
-        <KEYWORD1>tracing</KEYWORD1>
-        <KEYWORD1>tracking-changes</KEYWORD1>
-        <KEYWORD1>trailing</KEYWORD1>
-        <KEYWORD1>trans</KEYWORD1>
-        <KEYWORD1>trans-init-procedure</KEYWORD1>
-        <KEYWORD1>transaction</KEYWORD1>
-        <KEYWORD1>transaction-mode</KEYWORD1>
-        <KEYWORD1>transparent</KEYWORD1>
-        <KEYWORD1>trigger</KEYWORD1>
-        <KEYWORD1>triggers</KEYWORD1>
-        <KEYWORD1>trim</KEYWORD1>
-        <KEYWORD1>true</KEYWORD1>
-        <KEYWORD1>truncate</KEYWORD1>
-        <KEYWORD1>ttcodepage</KEYWORD1>
-        <KEYWORD1>type</KEYWORD1>
-        <KEYWORD1>unbuffered</KEYWORD1>
-        <KEYWORD1>underline</KEYWORD1>
-        <KEYWORD1>undo</KEYWORD1>
-        <KEYWORD1>unformatted</KEYWORD1>
-        <KEYWORD1>union</KEYWORD1>
-        <KEYWORD1>unique</KEYWORD1>
-        <KEYWORD1>unique-id</KEYWORD1>
-        <KEYWORD1>unique-match</KEYWORD1>
-        <KEYWORD1>unix</KEYWORD1>
-        <KEYWORD1>unix-end</KEYWORD1>
-        <KEYWORD1>unless-hidden</KEYWORD1>
-        <KEYWORD1>unload</KEYWORD1>
-        <KEYWORD1>unsigned-short</KEYWORD1>
-        <KEYWORD1>unsubscribe</KEYWORD1>
-        <KEYWORD1>up</KEYWORD1>
-        <KEYWORD1>update</KEYWORD1>
-        <KEYWORD1>upper</KEYWORD1>
-        <KEYWORD1>url</KEYWORD1>
-        <KEYWORD1>url-decode</KEYWORD1>
-        <KEYWORD1>url-encode</KEYWORD1>
-        <KEYWORD1>url-password</KEYWORD1>
-        <KEYWORD1>url-userid</KEYWORD1>
-        <KEYWORD1>use</KEYWORD1>
-        <KEYWORD1>use-dict-exps</KEYWORD1>
-        <KEYWORD1>use-filename</KEYWORD1>
-        <KEYWORD1>use-index</KEYWORD1>
-        <KEYWORD1>use-revvideo</KEYWORD1>
-        <KEYWORD1>use-text</KEYWORD1>
-        <KEYWORD1>use-underline</KEYWORD1>
-        <KEYWORD1>user</KEYWORD1>
-        <KEYWORD1>user-data</KEYWORD1>
-        <KEYWORD1>userid</KEYWORD1>
-        <KEYWORD1>using</KEYWORD1>
-        <KEYWORD1>utc-offset</KEYWORD1>
-        <KEYWORD1>v6display</KEYWORD1>
-        <KEYWORD1>v6frame</KEYWORD1>
-        <KEYWORD1>valid-event</KEYWORD1>
-        <KEYWORD1>valid-handle</KEYWORD1>
-        <KEYWORD1>validate</KEYWORD1>
-        <KEYWORD1>validate-expression</KEYWORD1>
-        <KEYWORD1>validate-message</KEYWORD1>
-        <KEYWORD1>validate-xml</KEYWORD1>
-        <KEYWORD1>validation-enabled</KEYWORD1>
-        <KEYWORD1>value</KEYWORD1>
-        <KEYWORD1>values</KEYWORD1>
-        <KEYWORD1>variable</KEYWORD1>
-        <KEYWORD1>verbose</KEYWORD1>
-        <KEYWORD1>vertical</KEYWORD1>
-        <KEYWORD1>view</KEYWORD1>
-        <KEYWORD1>view-as</KEYWORD1>
-        <KEYWORD1>view-first-column-on-reopen</KEYWORD1>
-        <KEYWORD1>virtual-height</KEYWORD1>
-        <KEYWORD1>virtual-height-chars</KEYWORD1>
-        <KEYWORD1>virtual-height-pixels</KEYWORD1>
-        <KEYWORD1>virtual-width</KEYWORD1>
-        <KEYWORD1>virtual-width-chars</KEYWORD1>
-        <KEYWORD1>virtual-width-pixels</KEYWORD1>
-        <KEYWORD1>visible</KEYWORD1>
-        <KEYWORD1>vms</KEYWORD1>
-        <KEYWORD1>wait</KEYWORD1>
-        <KEYWORD1>wait-for</KEYWORD1>
-        <KEYWORD1>warning</KEYWORD1>
-        <KEYWORD1>web-context</KEYWORD1>
-        <KEYWORD1>web-notify</KEYWORD1>
-        <KEYWORD1>weekday</KEYWORD1>
-        <KEYWORD1>when</KEYWORD1>
-        <KEYWORD1>where</KEYWORD1>
-        <KEYWORD1>where-string</KEYWORD1>
-        <KEYWORD1>while</KEYWORD1>
-        <KEYWORD1>widget</KEYWORD1>
-        <KEYWORD1>widget-enter</KEYWORD1>
-        <KEYWORD1>widget-handle</KEYWORD1>
-        <KEYWORD1>widget-leave</KEYWORD1>
-        <KEYWORD1>widget-pool</KEYWORD1>
-        <KEYWORD1>width</KEYWORD1>
-        <KEYWORD1>width-chars</KEYWORD1>
-        <KEYWORD1>width-pixels</KEYWORD1>
-        <KEYWORD1>window</KEYWORD1>
-        <KEYWORD1>window-delayed-minimize</KEYWORD1>
-        <KEYWORD1>window-name</KEYWORD1>
-        <KEYWORD1>window-normal</KEYWORD1>
-        <KEYWORD1>window-state</KEYWORD1>
-        <KEYWORD1>window-system</KEYWORD1>
-        <KEYWORD1>with</KEYWORD1>
-        <KEYWORD1>word-index</KEYWORD1>
-        <KEYWORD1>word-wrap</KEYWORD1>
-        <KEYWORD1>work-area-height-pixels</KEYWORD1>
-        <KEYWORD1>work-area-width-pixels</KEYWORD1>
-        <KEYWORD1>work-area-x</KEYWORD1>
-        <KEYWORD1>work-area-y</KEYWORD1>
-        <KEYWORD1>work-table</KEYWORD1>
-        <KEYWORD1>workfile</KEYWORD1>
-        <KEYWORD1>write</KEYWORD1>
-        <KEYWORD1>write-data</KEYWORD1>
-        <KEYWORD1>x</KEYWORD1>
-        <KEYWORD1>x-document</KEYWORD1>
-        <KEYWORD1>x-noderef</KEYWORD1>
-        <KEYWORD1>x-of</KEYWORD1>
-        <KEYWORD1>xcode</KEYWORD1>
-        <KEYWORD1>xml-schema-path</KEYWORD1>
-        <KEYWORD1>xml-suppress-namespace-processing</KEYWORD1>
-        <KEYWORD1>xref</KEYWORD1>
-        <KEYWORD1>y</KEYWORD1>
-        <KEYWORD1>y-of</KEYWORD1>
-        <KEYWORD1>year</KEYWORD1>
-        <KEYWORD1>year-offset</KEYWORD1>
-        <KEYWORD1>yes</KEYWORD1>
-        <KEYWORD1>yes-no</KEYWORD1>
-        <KEYWORD1>yes-no-cancel</KEYWORD1>
-        <KEYWORD1>_dcm</KEYWORD1>
-
-      <!-- Some commonly used abbreviations -->
-        <!-- And words missing from -zgenkwlist option -->
-        <KEYWORD1>accum</KEYWORD1>
-        <KEYWORD1>asc</KEYWORD1>
-        <KEYWORD1>avail</KEYWORD1>
-        <KEYWORD1>button</KEYWORD1>
-        <KEYWORD1>char</KEYWORD1>
-        <KEYWORD1>column</KEYWORD1>
-        <KEYWORD1>dec</KEYWORD1>
-        <KEYWORD1>def</KEYWORD1>
-        <KEYWORD1>disp</KEYWORD1>
-        <KEYWORD1>dict</KEYWORD1>
-        <KEYWORD1>dyn-function</KEYWORD1>
-        <KEYWORD1>excl</KEYWORD1>
-        <KEYWORD1>field</KEYWORD1>
-        <KEYWORD1>field-group</KEYWORD1>
-        <KEYWORD1>file-info</KEYWORD1>
-        <KEYWORD1>form</KEYWORD1>
-        <KEYWORD1>forward</KEYWORD1>
-        <KEYWORD1>funct</KEYWORD1>
-        <KEYWORD1>int</KEYWORD1>
-        <KEYWORD1>info</KEYWORD1>
-        <KEYWORD1>index-field</KEYWORD1>
-        <KEYWORD1>log</KEYWORD1>
-        <KEYWORD1>literal</KEYWORD1>
-        <KEYWORD1>load-control</KEYWORD1>
-        <KEYWORD1>no-label</KEYWORD1>
-        <KEYWORD1>prim</KEYWORD1>
-        <KEYWORD1>rcode-info</KEYWORD1>
-        <KEYWORD1>share</KEYWORD1>
-        <KEYWORD1>substr</KEYWORD1>
-        <KEYWORD1>var</KEYWORD1>
-
-
-      <!-- KEYWORD2   : VST & metaschema files and fields -->
-        <KEYWORD2>_abbreviate</KEYWORD2>
-        <KEYWORD2>_account_expires</KEYWORD2>
-        <KEYWORD2>_actailog</KEYWORD2>
-        <KEYWORD2>_actbilog</KEYWORD2>
-        <KEYWORD2>_actbuffer</KEYWORD2>
-        <KEYWORD2>_actindex</KEYWORD2>
-        <KEYWORD2>_actiofile</KEYWORD2>
-        <KEYWORD2>_actiotype</KEYWORD2>
-        <KEYWORD2>_active</KEYWORD2>
-        <KEYWORD2>_actlock</KEYWORD2>
-        <KEYWORD2>_actother</KEYWORD2>
-        <KEYWORD2>_actpws</KEYWORD2>
-        <KEYWORD2>_actrecord</KEYWORD2>
-        <KEYWORD2>_actserver</KEYWORD2>
-        <KEYWORD2>_actspace</KEYWORD2>
-        <KEYWORD2>_actsummary</KEYWORD2>
-        <KEYWORD2>_admin</KEYWORD2>
-        <KEYWORD2>_ailog-aiwwrites</KEYWORD2>
-        <KEYWORD2>_ailog-bbuffwaits</KEYWORD2>
-        <KEYWORD2>_ailog-byteswritn</KEYWORD2>
-        <KEYWORD2>_ailog-forcewaits</KEYWORD2>
-        <KEYWORD2>_ailog-id</KEYWORD2>
-        <KEYWORD2>_ailog-misc</KEYWORD2>
-        <KEYWORD2>_ailog-nobufavail</KEYWORD2>
-        <KEYWORD2>_ailog-partialwrt</KEYWORD2>
-        <KEYWORD2>_ailog-recwriten</KEYWORD2>
-        <KEYWORD2>_ailog-totwrites</KEYWORD2>
-        <KEYWORD2>_ailog-trans</KEYWORD2>
-        <KEYWORD2>_ailog-uptime</KEYWORD2>
-        <KEYWORD2>_alt</KEYWORD2>
-        <KEYWORD2>_area</KEYWORD2>
-        <KEYWORD2>_area-attrib</KEYWORD2>
-        <KEYWORD2>_area-block</KEYWORD2>
-        <KEYWORD2>_area-blocksize</KEYWORD2>
-        <KEYWORD2>_area-clustersize</KEYWORD2>
-        <KEYWORD2>_area-extents</KEYWORD2>
-        <KEYWORD2>_area-misc</KEYWORD2>
-        <KEYWORD2>_area-name</KEYWORD2>
-        <KEYWORD2>_area-number</KEYWORD2>
-        <KEYWORD2>_area-recbits</KEYWORD2>
-        <KEYWORD2>_area-recid</KEYWORD2>
-        <KEYWORD2>_area-type</KEYWORD2>
-        <KEYWORD2>_area-version</KEYWORD2>
-        <KEYWORD2>_areaextent</KEYWORD2>
-        <KEYWORD2>_areastatus</KEYWORD2>
-        <KEYWORD2>_areastatus-areaname</KEYWORD2>
-        <KEYWORD2>_areastatus-areanum</KEYWORD2>
-        <KEYWORD2>_areastatus-extents</KEYWORD2>
-        <KEYWORD2>_areastatus-freenum</KEYWORD2>
-        <KEYWORD2>_areastatus-hiwater</KEYWORD2>
-        <KEYWORD2>_areastatus-id</KEYWORD2>
-        <KEYWORD2>_areastatus-lastextent</KEYWORD2>
-        <KEYWORD2>_areastatus-rmnum</KEYWORD2>
-        <KEYWORD2>_areastatus-totblocks</KEYWORD2>
-        <KEYWORD2>_argtype</KEYWORD2>
-        <KEYWORD2>_ascending</KEYWORD2>
-        <KEYWORD2>_attribute</KEYWORD2>
-        <KEYWORD2>_attributes1</KEYWORD2>
-        <KEYWORD2>_auth-id</KEYWORD2>
-        <KEYWORD2>_autoincr</KEYWORD2>
-        <KEYWORD2>_base-col</KEYWORD2>
-        <KEYWORD2>_base-tables</KEYWORD2>
-        <KEYWORD2>_bfstatus-apwq</KEYWORD2>
-        <KEYWORD2>_bfstatus-ckpmarked</KEYWORD2>
-        <KEYWORD2>_bfstatus-ckpq</KEYWORD2>
-        <KEYWORD2>_bfstatus-hashsize</KEYWORD2>
-        <KEYWORD2>_bfstatus-id</KEYWORD2>
-        <KEYWORD2>_bfstatus-lastckpnum</KEYWORD2>
-        <KEYWORD2>_bfstatus-lru</KEYWORD2>
-        <KEYWORD2>_bfstatus-misc</KEYWORD2>
-        <KEYWORD2>_bfstatus-modbuffs</KEYWORD2>
-        <KEYWORD2>_bfstatus-totbufs</KEYWORD2>
-        <KEYWORD2>_bfstatus-usedbuffs</KEYWORD2>
-        <KEYWORD2>_bilog-bbuffwaits</KEYWORD2>
-        <KEYWORD2>_bilog-biwwrites</KEYWORD2>
-        <KEYWORD2>_bilog-bytesread</KEYWORD2>
-        <KEYWORD2>_bilog-byteswrtn</KEYWORD2>
-        <KEYWORD2>_bilog-clstrclose</KEYWORD2>
-        <KEYWORD2>_bilog-ebuffwaits</KEYWORD2>
-        <KEYWORD2>_bilog-forcewaits</KEYWORD2>
-        <KEYWORD2>_bilog-forcewrts</KEYWORD2>
-        <KEYWORD2>_bilog-id</KEYWORD2>
-        <KEYWORD2>_bilog-misc</KEYWORD2>
-        <KEYWORD2>_bilog-partialwrts</KEYWORD2>
-        <KEYWORD2>_bilog-recread</KEYWORD2>
-        <KEYWORD2>_bilog-recwriten</KEYWORD2>
-        <KEYWORD2>_bilog-totalwrts</KEYWORD2>
-        <KEYWORD2>_bilog-totreads</KEYWORD2>
-        <KEYWORD2>_bilog-trans</KEYWORD2>
-        <KEYWORD2>_bilog-uptime</KEYWORD2>
-        <KEYWORD2>_block</KEYWORD2>
-        <KEYWORD2>_block-area</KEYWORD2>
-        <KEYWORD2>_block-bkupctr</KEYWORD2>
-        <KEYWORD2>_block-block</KEYWORD2>
-        <KEYWORD2>_block-chaintype</KEYWORD2>
-        <KEYWORD2>_block-dbkey</KEYWORD2>
-        <KEYWORD2>_block-id</KEYWORD2>
-        <KEYWORD2>_block-misc</KEYWORD2>
-        <KEYWORD2>_block-nextdbkey</KEYWORD2>
-        <KEYWORD2>_block-type</KEYWORD2>
-        <KEYWORD2>_block-update</KEYWORD2>
-        <KEYWORD2>_buffer-apwenq</KEYWORD2>
-        <KEYWORD2>_buffer-chkpts</KEYWORD2>
-        <KEYWORD2>_buffer-deferred</KEYWORD2>
-        <KEYWORD2>_buffer-flushed</KEYWORD2>
-        <KEYWORD2>_buffer-id</KEYWORD2>
-        <KEYWORD2>_buffer-logicrds</KEYWORD2>
-        <KEYWORD2>_buffer-logicwrts</KEYWORD2>
-        <KEYWORD2>_buffer-lruskips</KEYWORD2>
-        <KEYWORD2>_buffer-lruwrts</KEYWORD2>
-        <KEYWORD2>_buffer-marked</KEYWORD2>
-        <KEYWORD2>_buffer-misc</KEYWORD2>
-        <KEYWORD2>_buffer-osrds</KEYWORD2>
-        <KEYWORD2>_buffer-oswrts</KEYWORD2>
-        <KEYWORD2>_buffer-trans</KEYWORD2>
-        <KEYWORD2>_buffer-uptime</KEYWORD2>
-        <KEYWORD2>_buffstatus</KEYWORD2>
-        <KEYWORD2>_cache</KEYWORD2>
-        <KEYWORD2>_can-create</KEYWORD2>
-        <KEYWORD2>_can-delete</KEYWORD2>
-        <KEYWORD2>_can-dump</KEYWORD2>
-        <KEYWORD2>_can-load</KEYWORD2>
-        <KEYWORD2>_can-read</KEYWORD2>
-        <KEYWORD2>_can-write</KEYWORD2>
-        <KEYWORD2>_casesensitive</KEYWORD2>
-        <KEYWORD2>_charset</KEYWORD2>
-        <KEYWORD2>_checkpoint</KEYWORD2>
-        <KEYWORD2>_checkpoint-apwq</KEYWORD2>
-        <KEYWORD2>_checkpoint-cptq</KEYWORD2>
-        <KEYWORD2>_checkpoint-dirty</KEYWORD2>
-        <KEYWORD2>_checkpoint-flush</KEYWORD2>
-        <KEYWORD2>_checkpoint-id</KEYWORD2>
-        <KEYWORD2>_checkpoint-len</KEYWORD2>
-        <KEYWORD2>_checkpoint-misc</KEYWORD2>
-        <KEYWORD2>_checkpoint-scan</KEYWORD2>
-        <KEYWORD2>_checkpoint-time</KEYWORD2>
-        <KEYWORD2>_chkclause</KEYWORD2>
-        <KEYWORD2>_chkseq</KEYWORD2>
-        <KEYWORD2>_cnstrname</KEYWORD2>
-        <KEYWORD2>_cnstrtype</KEYWORD2>
-        <KEYWORD2>_code-feature</KEYWORD2>
-        <KEYWORD2>_codefeature-id</KEYWORD2>
-        <KEYWORD2>_codefeature-res01</KEYWORD2>
-        <KEYWORD2>_codefeature-res02</KEYWORD2>
-        <KEYWORD2>_codefeature_name</KEYWORD2>
-        <KEYWORD2>_codefeature_required</KEYWORD2>
-        <KEYWORD2>_codefeature_supported</KEYWORD2>
-        <KEYWORD2>_codepage</KEYWORD2>
-        <KEYWORD2>_col</KEYWORD2>
-        <KEYWORD2>_col-label</KEYWORD2>
-        <KEYWORD2>_col-label-sa</KEYWORD2>
-        <KEYWORD2>_col-name</KEYWORD2>
-        <KEYWORD2>_colid</KEYWORD2>
-        <KEYWORD2>_coll-cp</KEYWORD2>
-        <KEYWORD2>_coll-data</KEYWORD2>
-        <KEYWORD2>_coll-name</KEYWORD2>
-        <KEYWORD2>_coll-segment</KEYWORD2>
-        <KEYWORD2>_coll-sequence</KEYWORD2>
-        <KEYWORD2>_coll-strength</KEYWORD2>
-        <KEYWORD2>_coll-tran-subtype</KEYWORD2>
-        <KEYWORD2>_coll-tran-version</KEYWORD2>
-        <KEYWORD2>_collation</KEYWORD2>
-        <KEYWORD2>_colname</KEYWORD2>
-        <KEYWORD2>_colposition</KEYWORD2>
-        <KEYWORD2>_connect</KEYWORD2>
-        <KEYWORD2>_connect-2phase</KEYWORD2>
-        <KEYWORD2>_connect-batch</KEYWORD2>
-        <KEYWORD2>_connect-device</KEYWORD2>
-        <KEYWORD2>_connect-disconnect</KEYWORD2>
-        <KEYWORD2>_connect-id</KEYWORD2>
-        <KEYWORD2>_connect-interrupt</KEYWORD2>
-        <KEYWORD2>_connect-misc</KEYWORD2>
-        <KEYWORD2>_connect-name</KEYWORD2>
-        <KEYWORD2>_connect-pid</KEYWORD2>
-        <KEYWORD2>_connect-resync</KEYWORD2>
-        <KEYWORD2>_connect-semid</KEYWORD2>
-        <KEYWORD2>_connect-semnum</KEYWORD2>
-        <KEYWORD2>_connect-server</KEYWORD2>
-        <KEYWORD2>_connect-time</KEYWORD2>
-        <KEYWORD2>_connect-transid</KEYWORD2>
-        <KEYWORD2>_connect-type</KEYWORD2>
-        <KEYWORD2>_connect-usr</KEYWORD2>
-        <KEYWORD2>_connect-wait</KEYWORD2>
-        <KEYWORD2>_connect-wait1</KEYWORD2>
-        <KEYWORD2>_cp-attr</KEYWORD2>
-        <KEYWORD2>_cp-dbrecid</KEYWORD2>
-        <KEYWORD2>_cp-name</KEYWORD2>
-        <KEYWORD2>_cp-sequence</KEYWORD2>
-        <KEYWORD2>_crc</KEYWORD2>
-        <KEYWORD2>_create-limit</KEYWORD2>
-        <KEYWORD2>_createparams</KEYWORD2>
-        <KEYWORD2>_create_date</KEYWORD2>
-        <KEYWORD2>_creator</KEYWORD2>
-        <KEYWORD2>_cycle-ok</KEYWORD2>
-        <KEYWORD2>_data-type</KEYWORD2>
-        <KEYWORD2>_database-feature</KEYWORD2>
-        <KEYWORD2>_datatype</KEYWORD2>
-        <KEYWORD2>_db</KEYWORD2>
-        <KEYWORD2>_db-addr</KEYWORD2>
-        <KEYWORD2>_db-coll-name</KEYWORD2>
-        <KEYWORD2>_db-collate</KEYWORD2>
-        <KEYWORD2>_db-comm</KEYWORD2>
-        <KEYWORD2>_db-lang</KEYWORD2>
-        <KEYWORD2>_db-local</KEYWORD2>
-        <KEYWORD2>_db-misc1</KEYWORD2>
-        <KEYWORD2>_db-misc2</KEYWORD2>
-        <KEYWORD2>_db-name</KEYWORD2>
-        <KEYWORD2>_db-recid</KEYWORD2>
-        <KEYWORD2>_db-res1</KEYWORD2>
-        <KEYWORD2>_db-res2</KEYWORD2>
-        <KEYWORD2>_db-revision</KEYWORD2>
-        <KEYWORD2>_db-slave</KEYWORD2>
-        <KEYWORD2>_db-type</KEYWORD2>
-        <KEYWORD2>_db-xl-name</KEYWORD2>
-        <KEYWORD2>_db-xlate</KEYWORD2>
-        <KEYWORD2>_dbaacc</KEYWORD2>
-        <KEYWORD2>_dbfeature-id</KEYWORD2>
-        <KEYWORD2>_dbfeature-res01</KEYWORD2>
-        <KEYWORD2>_dbfeature-res02</KEYWORD2>
-        <KEYWORD2>_dbfeature_active</KEYWORD2>
-        <KEYWORD2>_dbfeature_enabled</KEYWORD2>
-        <KEYWORD2>_dbfeature_name</KEYWORD2>
-        <KEYWORD2>_dblink</KEYWORD2>
-        <KEYWORD2>_dbstatus</KEYWORD2>
-        <KEYWORD2>_dbstatus-aiblksize</KEYWORD2>
-        <KEYWORD2>_dbstatus-biblksize</KEYWORD2>
-        <KEYWORD2>_dbstatus-biclsize</KEYWORD2>
-        <KEYWORD2>_dbstatus-biopen</KEYWORD2>
-        <KEYWORD2>_dbstatus-bisize</KEYWORD2>
-        <KEYWORD2>_dbstatus-bitrunc</KEYWORD2>
-        <KEYWORD2>_dbstatus-cachestamp</KEYWORD2>
-        <KEYWORD2>_dbstatus-changed</KEYWORD2>
-        <KEYWORD2>_dbstatus-clversminor</KEYWORD2>
-        <KEYWORD2>_dbstatus-codepage</KEYWORD2>
-        <KEYWORD2>_dbstatus-collation</KEYWORD2>
-        <KEYWORD2>_dbstatus-createdate</KEYWORD2>
-        <KEYWORD2>_dbstatus-dbblksize</KEYWORD2>
-        <KEYWORD2>_dbstatus-dbvers</KEYWORD2>
-        <KEYWORD2>_dbstatus-dbversminor</KEYWORD2>
-        <KEYWORD2>_dbstatus-emptyblks</KEYWORD2>
-        <KEYWORD2>_dbstatus-fbdate</KEYWORD2>
-        <KEYWORD2>_dbstatus-freeblks</KEYWORD2>
-        <KEYWORD2>_dbstatus-hiwater</KEYWORD2>
-        <KEYWORD2>_dbstatus-ibdate</KEYWORD2>
-        <KEYWORD2>_dbstatus-ibseq</KEYWORD2>
-        <KEYWORD2>_dbstatus-id</KEYWORD2>
-        <KEYWORD2>_dbstatus-integrity</KEYWORD2>
-        <KEYWORD2>_dbstatus-intflags</KEYWORD2>
-        <KEYWORD2>_dbstatus-lastopen</KEYWORD2>
-        <KEYWORD2>_dbstatus-lasttable</KEYWORD2>
-        <KEYWORD2>_dbstatus-lasttran</KEYWORD2>
-        <KEYWORD2>_dbstatus-misc</KEYWORD2>
-        <KEYWORD2>_dbstatus-mostlocks</KEYWORD2>
-        <KEYWORD2>_dbstatus-numareas</KEYWORD2>
-        <KEYWORD2>_dbstatus-numlocks</KEYWORD2>
-        <KEYWORD2>_dbstatus-numsems</KEYWORD2>
-        <KEYWORD2>_dbstatus-prevopen</KEYWORD2>
-        <KEYWORD2>_dbstatus-rmfreeblks</KEYWORD2>
-        <KEYWORD2>_dbstatus-sharedmemver</KEYWORD2>
-        <KEYWORD2>_dbstatus-shmvers</KEYWORD2>
-        <KEYWORD2>_dbstatus-starttime</KEYWORD2>
-        <KEYWORD2>_dbstatus-state</KEYWORD2>
-        <KEYWORD2>_dbstatus-tainted</KEYWORD2>
-        <KEYWORD2>_dbstatus-totalblks</KEYWORD2>
-        <KEYWORD2>_decimals</KEYWORD2>
-        <KEYWORD2>_del</KEYWORD2>
-        <KEYWORD2>_deleterule</KEYWORD2>
-        <KEYWORD2>_desc</KEYWORD2>
-        <KEYWORD2>_description</KEYWORD2>
-        <KEYWORD2>_dfltvalue</KEYWORD2>
-        <KEYWORD2>_dft-pk</KEYWORD2>
-        <KEYWORD2>_dhtypename</KEYWORD2>
-        <KEYWORD2>_disabled</KEYWORD2>
-        <KEYWORD2>_dtype</KEYWORD2>
-        <KEYWORD2>_dump-name</KEYWORD2>
-        <KEYWORD2>_email</KEYWORD2>
-        <KEYWORD2>_event</KEYWORD2>
-        <KEYWORD2>_exe</KEYWORD2>
-        <KEYWORD2>_extent</KEYWORD2>
-        <KEYWORD2>_extent-attrib</KEYWORD2>
-        <KEYWORD2>_extent-misc</KEYWORD2>
-        <KEYWORD2>_extent-number</KEYWORD2>
-        <KEYWORD2>_extent-path</KEYWORD2>
-        <KEYWORD2>_extent-size</KEYWORD2>
-        <KEYWORD2>_extent-system</KEYWORD2>
-        <KEYWORD2>_extent-type</KEYWORD2>
-        <KEYWORD2>_extent-version</KEYWORD2>
-        <KEYWORD2>_fetch-type</KEYWORD2>
-        <KEYWORD2>_field</KEYWORD2>
-        <KEYWORD2>_field-map</KEYWORD2>
-        <KEYWORD2>_field-name</KEYWORD2>
-        <KEYWORD2>_field-physpos</KEYWORD2>
-        <KEYWORD2>_field-recid</KEYWORD2>
-        <KEYWORD2>_field-rpos</KEYWORD2>
-        <KEYWORD2>_field-trig</KEYWORD2>
-        <KEYWORD2>_fil-misc1</KEYWORD2>
-        <KEYWORD2>_fil-misc2</KEYWORD2>
-        <KEYWORD2>_fil-res1</KEYWORD2>
-        <KEYWORD2>_fil-res2</KEYWORD2>
-        <KEYWORD2>_file</KEYWORD2>
-        <KEYWORD2>_file-label</KEYWORD2>
-        <KEYWORD2>_file-label-sa</KEYWORD2>
-        <KEYWORD2>_file-name</KEYWORD2>
-        <KEYWORD2>_file-number</KEYWORD2>
-        <KEYWORD2>_file-recid</KEYWORD2>
-        <KEYWORD2>_file-trig</KEYWORD2>
-        <KEYWORD2>_filelist</KEYWORD2>
-        <KEYWORD2>_filelist-blksize</KEYWORD2>
-        <KEYWORD2>_filelist-extend</KEYWORD2>
-        <KEYWORD2>_filelist-id</KEYWORD2>
-        <KEYWORD2>_filelist-logicalsz</KEYWORD2>
-        <KEYWORD2>_filelist-misc</KEYWORD2>
-        <KEYWORD2>_filelist-name</KEYWORD2>
-        <KEYWORD2>_filelist-openmode</KEYWORD2>
-        <KEYWORD2>_filelist-size</KEYWORD2>
-        <KEYWORD2>_fire_4gl</KEYWORD2>
-        <KEYWORD2>_fld</KEYWORD2>
-        <KEYWORD2>_fld-case</KEYWORD2>
-        <KEYWORD2>_fld-misc1</KEYWORD2>
-        <KEYWORD2>_fld-misc2</KEYWORD2>
-        <KEYWORD2>_fld-res1</KEYWORD2>
-        <KEYWORD2>_fld-res2</KEYWORD2>
-        <KEYWORD2>_fld-stdtype</KEYWORD2>
-        <KEYWORD2>_fld-stlen</KEYWORD2>
-        <KEYWORD2>_fld-stoff</KEYWORD2>
-        <KEYWORD2>_for-allocated</KEYWORD2>
-        <KEYWORD2>_for-cnt1</KEYWORD2>
-        <KEYWORD2>_for-cnt2</KEYWORD2>
-        <KEYWORD2>_for-flag</KEYWORD2>
-        <KEYWORD2>_for-format</KEYWORD2>
-        <KEYWORD2>_for-id</KEYWORD2>
-        <KEYWORD2>_for-info</KEYWORD2>
-        <KEYWORD2>_for-itype</KEYWORD2>
-        <KEYWORD2>_for-maxsize</KEYWORD2>
-        <KEYWORD2>_for-name</KEYWORD2>
-        <KEYWORD2>_for-number</KEYWORD2>
-        <KEYWORD2>_for-owner</KEYWORD2>
-        <KEYWORD2>_for-primary</KEYWORD2>
-        <KEYWORD2>_for-retrieve</KEYWORD2>
-        <KEYWORD2>_for-scale</KEYWORD2>
-        <KEYWORD2>_for-separator</KEYWORD2>
-        <KEYWORD2>_for-size</KEYWORD2>
-        <KEYWORD2>_for-spacing</KEYWORD2>
-        <KEYWORD2>_for-type</KEYWORD2>
-        <KEYWORD2>_for-xpos</KEYWORD2>
-        <KEYWORD2>_format</KEYWORD2>
-        <KEYWORD2>_format-sa</KEYWORD2>
-        <KEYWORD2>_frozen</KEYWORD2>
-        <KEYWORD2>_given_name</KEYWORD2>
-        <KEYWORD2>_grantee</KEYWORD2>
-        <KEYWORD2>_grantor</KEYWORD2>
-        <KEYWORD2>_group-by</KEYWORD2>
-        <KEYWORD2>_group_number</KEYWORD2>
-        <KEYWORD2>_has-ccnstrs</KEYWORD2>
-        <KEYWORD2>_has-fcnstrs</KEYWORD2>
-        <KEYWORD2>_has-pcnstrs</KEYWORD2>
-        <KEYWORD2>_has-ucnstrs</KEYWORD2>
-        <KEYWORD2>_hasresultset</KEYWORD2>
-        <KEYWORD2>_hasreturnval</KEYWORD2>
-        <KEYWORD2>_help</KEYWORD2>
-        <KEYWORD2>_help-sa</KEYWORD2>
-        <KEYWORD2>_hidden</KEYWORD2>
-        <KEYWORD2>_host</KEYWORD2>
-        <KEYWORD2>_i-misc1</KEYWORD2>
-        <KEYWORD2>_i-misc2</KEYWORD2>
-        <KEYWORD2>_i-res1</KEYWORD2>
-        <KEYWORD2>_i-res2</KEYWORD2>
-        <KEYWORD2>_ianum</KEYWORD2>
-        <KEYWORD2>_id</KEYWORD2>
-        <KEYWORD2>_idx-crc</KEYWORD2>
-        <KEYWORD2>_idx-num</KEYWORD2>
-        <KEYWORD2>_idxid</KEYWORD2>
-        <KEYWORD2>_idxmethod</KEYWORD2>
-        <KEYWORD2>_idxname</KEYWORD2>
-        <KEYWORD2>_idxowner</KEYWORD2>
-        <KEYWORD2>_if-misc1</KEYWORD2>
-        <KEYWORD2>_if-misc2</KEYWORD2>
-        <KEYWORD2>_if-res1</KEYWORD2>
-        <KEYWORD2>_if-res2</KEYWORD2>
-        <KEYWORD2>_index</KEYWORD2>
-        <KEYWORD2>_index-create</KEYWORD2>
-        <KEYWORD2>_index-delete</KEYWORD2>
-        <KEYWORD2>_index-field</KEYWORD2>
-        <KEYWORD2>_index-find</KEYWORD2>
-        <KEYWORD2>_index-free</KEYWORD2>
-        <KEYWORD2>_index-id</KEYWORD2>
-        <KEYWORD2>_index-misc</KEYWORD2>
-        <KEYWORD2>_index-name</KEYWORD2>
-        <KEYWORD2>_index-recid</KEYWORD2>
-        <KEYWORD2>_index-remove</KEYWORD2>
-        <KEYWORD2>_index-seq</KEYWORD2>
-        <KEYWORD2>_index-splits</KEYWORD2>
-        <KEYWORD2>_index-trans</KEYWORD2>
-        <KEYWORD2>_index-uptime</KEYWORD2>
-        <KEYWORD2>_indexbase</KEYWORD2>
-        <KEYWORD2>_indexstat</KEYWORD2>
-        <KEYWORD2>_indexstat-blockdelete</KEYWORD2>
-        <KEYWORD2>_indexstat-create</KEYWORD2>
-        <KEYWORD2>_indexstat-delete</KEYWORD2>
-        <KEYWORD2>_indexstat-id</KEYWORD2>
-        <KEYWORD2>_indexstat-read</KEYWORD2>
-        <KEYWORD2>_indexstat-split</KEYWORD2>
-        <KEYWORD2>_initial</KEYWORD2>
-        <KEYWORD2>_initial-sa</KEYWORD2>
-        <KEYWORD2>_ins</KEYWORD2>
-        <KEYWORD2>_iofile-bufreads</KEYWORD2>
-        <KEYWORD2>_iofile-bufwrites</KEYWORD2>
-        <KEYWORD2>_iofile-extends</KEYWORD2>
-        <KEYWORD2>_iofile-filename</KEYWORD2>
-        <KEYWORD2>_iofile-id</KEYWORD2>
-        <KEYWORD2>_iofile-misc</KEYWORD2>
-        <KEYWORD2>_iofile-reads</KEYWORD2>
-        <KEYWORD2>_iofile-trans</KEYWORD2>
-        <KEYWORD2>_iofile-ubufreads</KEYWORD2>
-        <KEYWORD2>_iofile-ubufwrites</KEYWORD2>
-        <KEYWORD2>_iofile-uptime</KEYWORD2>
-        <KEYWORD2>_iofile-writes</KEYWORD2>
-        <KEYWORD2>_iotype-airds</KEYWORD2>
-        <KEYWORD2>_iotype-aiwrts</KEYWORD2>
-        <KEYWORD2>_iotype-birds</KEYWORD2>
-        <KEYWORD2>_iotype-biwrts</KEYWORD2>
-        <KEYWORD2>_iotype-datareads</KEYWORD2>
-        <KEYWORD2>_iotype-datawrts</KEYWORD2>
-        <KEYWORD2>_iotype-id</KEYWORD2>
-        <KEYWORD2>_iotype-idxrds</KEYWORD2>
-        <KEYWORD2>_iotype-idxwrts</KEYWORD2>
-        <KEYWORD2>_iotype-misc</KEYWORD2>
-        <KEYWORD2>_iotype-trans</KEYWORD2>
-        <KEYWORD2>_iotype-uptime</KEYWORD2>
-        <KEYWORD2>_ispublic</KEYWORD2>
-        <KEYWORD2>_keyvalue-expr</KEYWORD2>
-        <KEYWORD2>_label</KEYWORD2>
-        <KEYWORD2>_label-sa</KEYWORD2>
-        <KEYWORD2>_lang</KEYWORD2>
-        <KEYWORD2>_last-change</KEYWORD2>
-        <KEYWORD2>_last-modified</KEYWORD2>
-        <KEYWORD2>_last_login</KEYWORD2>
-        <KEYWORD2>_latch</KEYWORD2>
-        <KEYWORD2>_latch-busy</KEYWORD2>
-        <KEYWORD2>_latch-hold</KEYWORD2>
-        <KEYWORD2>_latch-id</KEYWORD2>
-        <KEYWORD2>_latch-lock</KEYWORD2>
-        <KEYWORD2>_latch-lockedt</KEYWORD2>
-        <KEYWORD2>_latch-lockt</KEYWORD2>
-        <KEYWORD2>_latch-name</KEYWORD2>
-        <KEYWORD2>_latch-qhold</KEYWORD2>
-        <KEYWORD2>_latch-spin</KEYWORD2>
-        <KEYWORD2>_latch-type</KEYWORD2>
-        <KEYWORD2>_latch-wait</KEYWORD2>
-        <KEYWORD2>_latch-waitt</KEYWORD2>
-        <KEYWORD2>_lic-activeconns</KEYWORD2>
-        <KEYWORD2>_lic-batchconns</KEYWORD2>
-        <KEYWORD2>_lic-currconns</KEYWORD2>
-        <KEYWORD2>_lic-id</KEYWORD2>
-        <KEYWORD2>_lic-maxactive</KEYWORD2>
-        <KEYWORD2>_lic-maxbatch</KEYWORD2>
-        <KEYWORD2>_lic-maxcurrent</KEYWORD2>
-        <KEYWORD2>_lic-minactive</KEYWORD2>
-        <KEYWORD2>_lic-minbatch</KEYWORD2>
-        <KEYWORD2>_lic-mincurrent</KEYWORD2>
-        <KEYWORD2>_lic-validusers</KEYWORD2>
-        <KEYWORD2>_license</KEYWORD2>
-        <KEYWORD2>_linkowner</KEYWORD2>
-        <KEYWORD2>_literalprefix</KEYWORD2>
-        <KEYWORD2>_literalsuffix</KEYWORD2>
-        <KEYWORD2>_localtypename</KEYWORD2>
-        <KEYWORD2>_lock</KEYWORD2>
-        <KEYWORD2>_lock-canclreq</KEYWORD2>
-        <KEYWORD2>_lock-chain</KEYWORD2>
-        <KEYWORD2>_lock-downgrade</KEYWORD2>
-        <KEYWORD2>_lock-exclfind</KEYWORD2>
-        <KEYWORD2>_lock-excllock</KEYWORD2>
-        <KEYWORD2>_lock-exclreq</KEYWORD2>
-        <KEYWORD2>_lock-exclwait</KEYWORD2>
-        <KEYWORD2>_lock-flags</KEYWORD2>
-        <KEYWORD2>_lock-id</KEYWORD2>
-        <KEYWORD2>_lock-misc</KEYWORD2>
-        <KEYWORD2>_lock-name</KEYWORD2>
-        <KEYWORD2>_lock-recgetlock</KEYWORD2>
-        <KEYWORD2>_lock-recgetreq</KEYWORD2>
-        <KEYWORD2>_lock-recgetwait</KEYWORD2>
-        <KEYWORD2>_lock-recid</KEYWORD2>
-        <KEYWORD2>_lock-redreq</KEYWORD2>
-        <KEYWORD2>_lock-shrfind</KEYWORD2>
-        <KEYWORD2>_lock-shrlock</KEYWORD2>
-        <KEYWORD2>_lock-shrreq</KEYWORD2>
-        <KEYWORD2>_lock-shrwait</KEYWORD2>
-        <KEYWORD2>_lock-table</KEYWORD2>
-        <KEYWORD2>_lock-trans</KEYWORD2>
-        <KEYWORD2>_lock-type</KEYWORD2>
-        <KEYWORD2>_lock-upglock</KEYWORD2>
-        <KEYWORD2>_lock-upgreq</KEYWORD2>
-        <KEYWORD2>_lock-upgwait</KEYWORD2>
-        <KEYWORD2>_lock-uptime</KEYWORD2>
-        <KEYWORD2>_lock-usr</KEYWORD2>
-        <KEYWORD2>_lockreq</KEYWORD2>
-        <KEYWORD2>_lockreq-exclfind</KEYWORD2>
-        <KEYWORD2>_lockreq-id</KEYWORD2>
-        <KEYWORD2>_lockreq-misc</KEYWORD2>
-        <KEYWORD2>_lockreq-name</KEYWORD2>
-        <KEYWORD2>_lockreq-num</KEYWORD2>
-        <KEYWORD2>_lockreq-reclock</KEYWORD2>
-        <KEYWORD2>_lockreq-recwait</KEYWORD2>
-        <KEYWORD2>_lockreq-schlock</KEYWORD2>
-        <KEYWORD2>_lockreq-schwait</KEYWORD2>
-        <KEYWORD2>_lockreq-shrfind</KEYWORD2>
-        <KEYWORD2>_lockreq-trnlock</KEYWORD2>
-        <KEYWORD2>_lockreq-trnwait</KEYWORD2>
-        <KEYWORD2>_logging</KEYWORD2>
-        <KEYWORD2>_logging-2pc</KEYWORD2>
-        <KEYWORD2>_logging-2pcnickname</KEYWORD2>
-        <KEYWORD2>_logging-2pcpriority</KEYWORD2>
-        <KEYWORD2>_logging-aibegin</KEYWORD2>
-        <KEYWORD2>_logging-aiblksize</KEYWORD2>
-        <KEYWORD2>_logging-aibuffs</KEYWORD2>
-        <KEYWORD2>_logging-aicurrext</KEYWORD2>
-        <KEYWORD2>_logging-aiextents</KEYWORD2>
-        <KEYWORD2>_logging-aigennum</KEYWORD2>
-        <KEYWORD2>_logging-aiio</KEYWORD2>
-        <KEYWORD2>_logging-aijournal</KEYWORD2>
-        <KEYWORD2>_logging-ailogsize</KEYWORD2>
-        <KEYWORD2>_logging-ainew</KEYWORD2>
-        <KEYWORD2>_logging-aiopen</KEYWORD2>
-        <KEYWORD2>_logging-biblksize</KEYWORD2>
-        <KEYWORD2>_logging-bibuffs</KEYWORD2>
-        <KEYWORD2>_logging-bibytesfree</KEYWORD2>
-        <KEYWORD2>_logging-biclage</KEYWORD2>
-        <KEYWORD2>_logging-biclsize</KEYWORD2>
-        <KEYWORD2>_logging-biextents</KEYWORD2>
-        <KEYWORD2>_logging-bifullbuffs</KEYWORD2>
-        <KEYWORD2>_logging-biio</KEYWORD2>
-        <KEYWORD2>_logging-bilogsize</KEYWORD2>
-        <KEYWORD2>_logging-commitdelay</KEYWORD2>
-        <KEYWORD2>_logging-crashprot</KEYWORD2>
-        <KEYWORD2>_logging-id</KEYWORD2>
-        <KEYWORD2>_logging-lastckp</KEYWORD2>
-        <KEYWORD2>_logging-misc</KEYWORD2>
-        <KEYWORD2>_logins</KEYWORD2>
-        <KEYWORD2>_login_failures</KEYWORD2>
-        <KEYWORD2>_mandatory</KEYWORD2>
-        <KEYWORD2>_max_logins</KEYWORD2>
-        <KEYWORD2>_max_tries</KEYWORD2>
-        <KEYWORD2>_middle_initial</KEYWORD2>
-        <KEYWORD2>_mod-sequence</KEYWORD2>
-        <KEYWORD2>_mode</KEYWORD2>
-        <KEYWORD2>_mstrblk</KEYWORD2>
-        <KEYWORD2>_mstrblk-aiblksize</KEYWORD2>
-        <KEYWORD2>_mstrblk-biblksize</KEYWORD2>
-        <KEYWORD2>_mstrblk-biopen</KEYWORD2>
-        <KEYWORD2>_mstrblk-biprev</KEYWORD2>
-        <KEYWORD2>_mstrblk-bistate</KEYWORD2>
-        <KEYWORD2>_mstrblk-cfilnum</KEYWORD2>
-        <KEYWORD2>_mstrblk-crdate</KEYWORD2>
-        <KEYWORD2>_mstrblk-dbstate</KEYWORD2>
-        <KEYWORD2>_mstrblk-dbvers</KEYWORD2>
-        <KEYWORD2>_mstrblk-fbdate</KEYWORD2>
-        <KEYWORD2>_mstrblk-hiwater</KEYWORD2>
-        <KEYWORD2>_mstrblk-ibdate</KEYWORD2>
-        <KEYWORD2>_mstrblk-ibseq</KEYWORD2>
-        <KEYWORD2>_mstrblk-id</KEYWORD2>
-        <KEYWORD2>_mstrblk-integrity</KEYWORD2>
-        <KEYWORD2>_mstrblk-lasttask</KEYWORD2>
-        <KEYWORD2>_mstrblk-misc</KEYWORD2>
-        <KEYWORD2>_mstrblk-oppdate</KEYWORD2>
-        <KEYWORD2>_mstrblk-oprdate</KEYWORD2>
-        <KEYWORD2>_mstrblk-rlclsize</KEYWORD2>
-        <KEYWORD2>_mstrblk-rltime</KEYWORD2>
-        <KEYWORD2>_mstrblk-tainted</KEYWORD2>
-        <KEYWORD2>_mstrblk-timestamp</KEYWORD2>
-        <KEYWORD2>_mstrblk-totblks</KEYWORD2>
-        <KEYWORD2>_myconn-id</KEYWORD2>
-        <KEYWORD2>_myconn-numseqbuffers</KEYWORD2>
-        <KEYWORD2>_myconn-pid</KEYWORD2>
-        <KEYWORD2>_myconn-usedseqbuffers</KEYWORD2>
-        <KEYWORD2>_myconn-userid</KEYWORD2>
-        <KEYWORD2>_myconnection</KEYWORD2>
-        <KEYWORD2>_name_loc</KEYWORD2>
-        <KEYWORD2>_ndx</KEYWORD2>
-        <KEYWORD2>_nullable</KEYWORD2>
-        <KEYWORD2>_nullflag</KEYWORD2>
-        <KEYWORD2>_num-comp</KEYWORD2>
-        <KEYWORD2>_numfld</KEYWORD2>
-        <KEYWORD2>_numkcomp</KEYWORD2>
-        <KEYWORD2>_numkey</KEYWORD2>
-        <KEYWORD2>_numkfld</KEYWORD2>
-        <KEYWORD2>_object-associate</KEYWORD2>
-        <KEYWORD2>_object-associate-type</KEYWORD2>
-        <KEYWORD2>_object-attrib</KEYWORD2>
-        <KEYWORD2>_object-block</KEYWORD2>
-        <KEYWORD2>_object-misc</KEYWORD2>
-        <KEYWORD2>_object-number</KEYWORD2>
-        <KEYWORD2>_object-root</KEYWORD2>
-        <KEYWORD2>_object-system</KEYWORD2>
-        <KEYWORD2>_object-type</KEYWORD2>
-        <KEYWORD2>_odbcmoney</KEYWORD2>
-        <KEYWORD2>_order</KEYWORD2>
-        <KEYWORD2>_other-commit</KEYWORD2>
-        <KEYWORD2>_other-flushmblk</KEYWORD2>
-        <KEYWORD2>_other-id</KEYWORD2>
-        <KEYWORD2>_other-misc</KEYWORD2>
-        <KEYWORD2>_other-trans</KEYWORD2>
-        <KEYWORD2>_other-undo</KEYWORD2>
-        <KEYWORD2>_other-uptime</KEYWORD2>
-        <KEYWORD2>_other-wait</KEYWORD2>
-        <KEYWORD2>_override</KEYWORD2>
-        <KEYWORD2>_owner</KEYWORD2>
-        <KEYWORD2>_password</KEYWORD2>
-        <KEYWORD2>_prime-index</KEYWORD2>
-        <KEYWORD2>_proc-name</KEYWORD2>
-        <KEYWORD2>_procbin</KEYWORD2>
-        <KEYWORD2>_procid</KEYWORD2>
-        <KEYWORD2>_procname</KEYWORD2>
-        <KEYWORD2>_proctext</KEYWORD2>
-        <KEYWORD2>_proctype</KEYWORD2>
-        <KEYWORD2>_property</KEYWORD2>
-        <KEYWORD2>_pw-apwqwrites</KEYWORD2>
-        <KEYWORD2>_pw-buffsscaned</KEYWORD2>
-        <KEYWORD2>_pw-bufsckp</KEYWORD2>
-        <KEYWORD2>_pw-checkpoints</KEYWORD2>
-        <KEYWORD2>_pw-ckpqwrites</KEYWORD2>
-        <KEYWORD2>_pw-dbwrites</KEYWORD2>
-        <KEYWORD2>_pw-flushed</KEYWORD2>
-        <KEYWORD2>_pw-id</KEYWORD2>
-        <KEYWORD2>_pw-marked</KEYWORD2>
-        <KEYWORD2>_pw-misc</KEYWORD2>
-        <KEYWORD2>_pw-scancycles</KEYWORD2>
-        <KEYWORD2>_pw-scanwrites</KEYWORD2>
-        <KEYWORD2>_pw-totdbwrites</KEYWORD2>
-        <KEYWORD2>_pw-trans</KEYWORD2>
-        <KEYWORD2>_pw-uptime</KEYWORD2>
-        <KEYWORD2>_pwd</KEYWORD2>
-        <KEYWORD2>_pwd_duration</KEYWORD2>
-        <KEYWORD2>_pwd_expires</KEYWORD2>
-        <KEYWORD2>_record-bytescreat</KEYWORD2>
-        <KEYWORD2>_record-bytesdel</KEYWORD2>
-        <KEYWORD2>_record-bytesread</KEYWORD2>
-        <KEYWORD2>_record-bytesupd</KEYWORD2>
-        <KEYWORD2>_record-fragcreat</KEYWORD2>
-        <KEYWORD2>_record-fragdel</KEYWORD2>
-        <KEYWORD2>_record-fragread</KEYWORD2>
-        <KEYWORD2>_record-fragupd</KEYWORD2>
-        <KEYWORD2>_record-id</KEYWORD2>
-        <KEYWORD2>_record-misc</KEYWORD2>
-        <KEYWORD2>_record-reccreat</KEYWORD2>
-        <KEYWORD2>_record-recdel</KEYWORD2>
-        <KEYWORD2>_record-recread</KEYWORD2>
-        <KEYWORD2>_record-recupd</KEYWORD2>
-        <KEYWORD2>_record-trans</KEYWORD2>
-        <KEYWORD2>_record-uptime</KEYWORD2>
-        <KEYWORD2>_ref</KEYWORD2>
-        <KEYWORD2>_ref-table</KEYWORD2>
-        <KEYWORD2>_refcnstrname</KEYWORD2>
-        <KEYWORD2>_referstonew</KEYWORD2>
-        <KEYWORD2>_referstoold</KEYWORD2>
-        <KEYWORD2>_refowner</KEYWORD2>
-        <KEYWORD2>_reftblname</KEYWORD2>
-        <KEYWORD2>_remowner</KEYWORD2>
-        <KEYWORD2>_remtbl</KEYWORD2>
-        <KEYWORD2>_repl-agent</KEYWORD2>
-        <KEYWORD2>_repl-agentcontrol</KEYWORD2>
-        <KEYWORD2>_repl-server</KEYWORD2>
-        <KEYWORD2>_replagt-agentid</KEYWORD2>
-        <KEYWORD2>_replagt-agentname</KEYWORD2>
-        <KEYWORD2>_replagt-blocksack</KEYWORD2>
-        <KEYWORD2>_replagt-blocksprocessed</KEYWORD2>
-        <KEYWORD2>_replagt-blocksreceived</KEYWORD2>
-        <KEYWORD2>_replagt-commstatus</KEYWORD2>
-        <KEYWORD2>_replagt-connecttime</KEYWORD2>
-        <KEYWORD2>_replagt-dbname</KEYWORD2>
-        <KEYWORD2>_replagt-lasttrid</KEYWORD2>
-        <KEYWORD2>_replagt-method</KEYWORD2>
-        <KEYWORD2>_replagt-notesprocessed</KEYWORD2>
-        <KEYWORD2>_replagt-port</KEYWORD2>
-        <KEYWORD2>_replagt-reservedchar</KEYWORD2>
-        <KEYWORD2>_replagt-reservedint</KEYWORD2>
-        <KEYWORD2>_replagt-serverhost</KEYWORD2>
-        <KEYWORD2>_replagt-status</KEYWORD2>
-        <KEYWORD2>_replagtctl-agentid</KEYWORD2>
-        <KEYWORD2>_replagtctl-agentname</KEYWORD2>
-        <KEYWORD2>_replagtctl-blocksack</KEYWORD2>
-        <KEYWORD2>_replagtctl-blockssent</KEYWORD2>
-        <KEYWORD2>_replagtctl-commstatus</KEYWORD2>
-        <KEYWORD2>_replagtctl-connecttime</KEYWORD2>
-        <KEYWORD2>_replagtctl-lastblocksentat</KEYWORD2>
-        <KEYWORD2>_replagtctl-method</KEYWORD2>
-        <KEYWORD2>_replagtctl-port</KEYWORD2>
-        <KEYWORD2>_replagtctl-remotedbname</KEYWORD2>
-        <KEYWORD2>_replagtctl-remotehost</KEYWORD2>
-        <KEYWORD2>_replagtctl-reservedchar</KEYWORD2>
-        <KEYWORD2>_replagtctl-reservedint</KEYWORD2>
-        <KEYWORD2>_replagtctl-status</KEYWORD2>
-        <KEYWORD2>_replsrv-agentcount</KEYWORD2>
-        <KEYWORD2>_replsrv-blockssent</KEYWORD2>
-        <KEYWORD2>_replsrv-id</KEYWORD2>
-        <KEYWORD2>_replsrv-lastblocksentat</KEYWORD2>
-        <KEYWORD2>_replsrv-reservedchar</KEYWORD2>
-        <KEYWORD2>_replsrv-reservedint</KEYWORD2>
-        <KEYWORD2>_replsrv-starttime</KEYWORD2>
-        <KEYWORD2>_resacc</KEYWORD2>
-        <KEYWORD2>_resrc</KEYWORD2>
-        <KEYWORD2>_resrc-id</KEYWORD2>
-        <KEYWORD2>_resrc-lock</KEYWORD2>
-        <KEYWORD2>_resrc-name</KEYWORD2>
-        <KEYWORD2>_resrc-time</KEYWORD2>
-        <KEYWORD2>_resrc-wait</KEYWORD2>
-        <KEYWORD2>_rolename</KEYWORD2>
-        <KEYWORD2>_rssid</KEYWORD2>
-        <KEYWORD2>_scale</KEYWORD2>
-        <KEYWORD2>_schemaname</KEYWORD2>
-        <KEYWORD2>_screator</KEYWORD2>
-        <KEYWORD2>_searchable</KEYWORD2>
-        <KEYWORD2>_segment-bytefree</KEYWORD2>
-        <KEYWORD2>_segment-bytesused</KEYWORD2>
-        <KEYWORD2>_segment-id</KEYWORD2>
-        <KEYWORD2>_segment-misc</KEYWORD2>
-        <KEYWORD2>_segment-segid</KEYWORD2>
-        <KEYWORD2>_segment-segsize</KEYWORD2>
-        <KEYWORD2>_segments</KEYWORD2>
-        <KEYWORD2>_sel</KEYWORD2>
-        <KEYWORD2>_seq</KEYWORD2>
-        <KEYWORD2>_seq-incr</KEYWORD2>
-        <KEYWORD2>_seq-init</KEYWORD2>
-        <KEYWORD2>_seq-max</KEYWORD2>
-        <KEYWORD2>_seq-min</KEYWORD2>
-        <KEYWORD2>_seq-misc</KEYWORD2>
-        <KEYWORD2>_seq-name</KEYWORD2>
-        <KEYWORD2>_seq-num</KEYWORD2>
-        <KEYWORD2>_seq-owner</KEYWORD2>
-        <KEYWORD2>_sequence</KEYWORD2>
-        <KEYWORD2>_server-byterec</KEYWORD2>
-        <KEYWORD2>_server-bytesent</KEYWORD2>
-        <KEYWORD2>_server-currusers</KEYWORD2>
-        <KEYWORD2>_server-id</KEYWORD2>
-        <KEYWORD2>_server-logins</KEYWORD2>
-        <KEYWORD2>_server-maxusers</KEYWORD2>
-        <KEYWORD2>_server-misc</KEYWORD2>
-        <KEYWORD2>_server-msgrec</KEYWORD2>
-        <KEYWORD2>_server-msgsent</KEYWORD2>
-        <KEYWORD2>_server-num</KEYWORD2>
-        <KEYWORD2>_server-pendconn</KEYWORD2>
-        <KEYWORD2>_server-pid</KEYWORD2>
-        <KEYWORD2>_server-portnum</KEYWORD2>
-        <KEYWORD2>_server-protocol</KEYWORD2>
-        <KEYWORD2>_server-qryrec</KEYWORD2>
-        <KEYWORD2>_server-recrec</KEYWORD2>
-        <KEYWORD2>_server-recsent</KEYWORD2>
-        <KEYWORD2>_server-timeslice</KEYWORD2>
-        <KEYWORD2>_server-trans</KEYWORD2>
-        <KEYWORD2>_server-type</KEYWORD2>
-        <KEYWORD2>_server-uptime</KEYWORD2>
-        <KEYWORD2>_servers</KEYWORD2>
-        <KEYWORD2>_sname</KEYWORD2>
-        <KEYWORD2>_sowner</KEYWORD2>
-        <KEYWORD2>_space-allocnewrm</KEYWORD2>
-        <KEYWORD2>_space-backadd</KEYWORD2>
-        <KEYWORD2>_space-bytesalloc</KEYWORD2>
-        <KEYWORD2>_space-dbexd</KEYWORD2>
-        <KEYWORD2>_space-examined</KEYWORD2>
-        <KEYWORD2>_space-fromfree</KEYWORD2>
-        <KEYWORD2>_space-fromrm</KEYWORD2>
-        <KEYWORD2>_space-front2back</KEYWORD2>
-        <KEYWORD2>_space-frontadd</KEYWORD2>
-        <KEYWORD2>_space-id</KEYWORD2>
-        <KEYWORD2>_space-locked</KEYWORD2>
-        <KEYWORD2>_space-misc</KEYWORD2>
-        <KEYWORD2>_space-removed</KEYWORD2>
-        <KEYWORD2>_space-retfree</KEYWORD2>
-        <KEYWORD2>_space-takefree</KEYWORD2>
-        <KEYWORD2>_space-trans</KEYWORD2>
-        <KEYWORD2>_space-uptime</KEYWORD2>
-        <KEYWORD2>_spare1</KEYWORD2>
-        <KEYWORD2>_spare2</KEYWORD2>
-        <KEYWORD2>_spare3</KEYWORD2>
-        <KEYWORD2>_spare4</KEYWORD2>
-        <KEYWORD2>_sql_properties</KEYWORD2>
-        <KEYWORD2>_sremdb</KEYWORD2>
-        <KEYWORD2>_startup</KEYWORD2>
-        <KEYWORD2>_startup-aibuffs</KEYWORD2>
-        <KEYWORD2>_startup-ainame</KEYWORD2>
-        <KEYWORD2>_startup-apwbuffs</KEYWORD2>
-        <KEYWORD2>_startup-apwmaxwrites</KEYWORD2>
-        <KEYWORD2>_startup-apwqtime</KEYWORD2>
-        <KEYWORD2>_startup-apwstime</KEYWORD2>
-        <KEYWORD2>_startup-bibuffs</KEYWORD2>
-        <KEYWORD2>_startup-bidelay</KEYWORD2>
-        <KEYWORD2>_startup-biio</KEYWORD2>
-        <KEYWORD2>_startup-biname</KEYWORD2>
-        <KEYWORD2>_startup-bitrunc</KEYWORD2>
-        <KEYWORD2>_startup-buffs</KEYWORD2>
-        <KEYWORD2>_startup-crashprot</KEYWORD2>
-        <KEYWORD2>_startup-directio</KEYWORD2>
-        <KEYWORD2>_startup-id</KEYWORD2>
-        <KEYWORD2>_startup-locktable</KEYWORD2>
-        <KEYWORD2>_startup-maxclients</KEYWORD2>
-        <KEYWORD2>_startup-maxservers</KEYWORD2>
-        <KEYWORD2>_startup-maxusers</KEYWORD2>
-        <KEYWORD2>_startup-misc</KEYWORD2>
-        <KEYWORD2>_startup-spin</KEYWORD2>
-        <KEYWORD2>_statbase</KEYWORD2>
-        <KEYWORD2>_statbase-id</KEYWORD2>
-        <KEYWORD2>_statementorrow</KEYWORD2>
-        <KEYWORD2>_stbl</KEYWORD2>
-        <KEYWORD2>_stblowner</KEYWORD2>
-        <KEYWORD2>_storageobject</KEYWORD2>
-        <KEYWORD2>_summary-aiwrites</KEYWORD2>
-        <KEYWORD2>_summary-bireads</KEYWORD2>
-        <KEYWORD2>_summary-biwrites</KEYWORD2>
-        <KEYWORD2>_summary-chkpts</KEYWORD2>
-        <KEYWORD2>_summary-commits</KEYWORD2>
-        <KEYWORD2>_summary-dbaccesses</KEYWORD2>
-        <KEYWORD2>_summary-dbreads</KEYWORD2>
-        <KEYWORD2>_summary-dbwrites</KEYWORD2>
-        <KEYWORD2>_summary-flushed</KEYWORD2>
-        <KEYWORD2>_summary-id</KEYWORD2>
-        <KEYWORD2>_summary-misc</KEYWORD2>
-        <KEYWORD2>_summary-reccreat</KEYWORD2>
-        <KEYWORD2>_summary-recdel</KEYWORD2>
-        <KEYWORD2>_summary-reclock</KEYWORD2>
-        <KEYWORD2>_summary-recreads</KEYWORD2>
-        <KEYWORD2>_summary-recupd</KEYWORD2>
-        <KEYWORD2>_summary-recwait</KEYWORD2>
-        <KEYWORD2>_summary-transcomm</KEYWORD2>
-        <KEYWORD2>_summary-undos</KEYWORD2>
-        <KEYWORD2>_summary-uptime</KEYWORD2>
-        <KEYWORD2>_surname</KEYWORD2>
-        <KEYWORD2>_sys-field</KEYWORD2>
-        <KEYWORD2>_sysattachtbls</KEYWORD2>
-        <KEYWORD2>_sysbigintstat</KEYWORD2>
-        <KEYWORD2>_syscalctable</KEYWORD2>
-        <KEYWORD2>_syscharstat</KEYWORD2>
-        <KEYWORD2>_syschkcolusage</KEYWORD2>
-        <KEYWORD2>_syschkconstrs</KEYWORD2>
-        <KEYWORD2>_syschkconstr_name_map</KEYWORD2>
-        <KEYWORD2>_syscolauth</KEYWORD2>
-        <KEYWORD2>_syscolstat</KEYWORD2>
-        <KEYWORD2>_sysdatatypes</KEYWORD2>
-        <KEYWORD2>_sysdatestat</KEYWORD2>
-        <KEYWORD2>_sysdbauth</KEYWORD2>
-        <KEYWORD2>_sysdblinks</KEYWORD2>
-        <KEYWORD2>_sysfloatstat</KEYWORD2>
-        <KEYWORD2>_sysidxstat</KEYWORD2>
-        <KEYWORD2>_sysintstat</KEYWORD2>
-        <KEYWORD2>_syskeycolusage</KEYWORD2>
-        <KEYWORD2>_sysncharstat</KEYWORD2>
-        <KEYWORD2>_sysnumstat</KEYWORD2>
-        <KEYWORD2>_sysnvarcharstat</KEYWORD2>
-        <KEYWORD2>_sysprocbin</KEYWORD2>
-        <KEYWORD2>_sysproccolumns</KEYWORD2>
-        <KEYWORD2>_sysprocedures</KEYWORD2>
-        <KEYWORD2>_sysproctext</KEYWORD2>
-        <KEYWORD2>_sysrealstat</KEYWORD2>
-        <KEYWORD2>_sysrefconstrs</KEYWORD2>
-        <KEYWORD2>_sysroles</KEYWORD2>
-        <KEYWORD2>_sysschemas</KEYWORD2>
-        <KEYWORD2>_sysseqauth</KEYWORD2>
-        <KEYWORD2>_syssmintstat</KEYWORD2>
-        <KEYWORD2>_syssynonyms</KEYWORD2>
-        <KEYWORD2>_systabauth</KEYWORD2>
-        <KEYWORD2>_systblconstrs</KEYWORD2>
-        <KEYWORD2>_systblstat</KEYWORD2>
-        <KEYWORD2>_systimestat</KEYWORD2>
-        <KEYWORD2>_systinyintstat</KEYWORD2>
-        <KEYWORD2>_systrigcols</KEYWORD2>
-        <KEYWORD2>_systrigger</KEYWORD2>
-        <KEYWORD2>_systsstat</KEYWORD2>
-        <KEYWORD2>_syststzstat</KEYWORD2>
-        <KEYWORD2>_sysvarcharstat</KEYWORD2>
-        <KEYWORD2>_sysviews</KEYWORD2>
-        <KEYWORD2>_sysviews_name_map</KEYWORD2>
-        <KEYWORD2>_tablebase</KEYWORD2>
-        <KEYWORD2>_tablestat</KEYWORD2>
-        <KEYWORD2>_tablestat-create</KEYWORD2>
-        <KEYWORD2>_tablestat-delete</KEYWORD2>
-        <KEYWORD2>_tablestat-id</KEYWORD2>
-        <KEYWORD2>_tablestat-read</KEYWORD2>
-        <KEYWORD2>_tablestat-update</KEYWORD2>
-        <KEYWORD2>_tbl</KEYWORD2>
-        <KEYWORD2>_tbl-status</KEYWORD2>
-        <KEYWORD2>_tbl-type</KEYWORD2>
-        <KEYWORD2>_tblid</KEYWORD2>
-        <KEYWORD2>_tblname</KEYWORD2>
-        <KEYWORD2>_tblowner</KEYWORD2>
-        <KEYWORD2>_telephone</KEYWORD2>
-        <KEYWORD2>_template</KEYWORD2>
-        <KEYWORD2>_toss-limit</KEYWORD2>
-        <KEYWORD2>_trans</KEYWORD2>
-        <KEYWORD2>_trans-coord</KEYWORD2>
-        <KEYWORD2>_trans-coordtx</KEYWORD2>
-        <KEYWORD2>_trans-counter</KEYWORD2>
-        <KEYWORD2>_trans-duration</KEYWORD2>
-        <KEYWORD2>_trans-flags</KEYWORD2>
-        <KEYWORD2>_trans-id</KEYWORD2>
-        <KEYWORD2>_trans-misc</KEYWORD2>
-        <KEYWORD2>_trans-num</KEYWORD2>
-        <KEYWORD2>_trans-state</KEYWORD2>
-        <KEYWORD2>_trans-txtime</KEYWORD2>
-        <KEYWORD2>_trans-usrnum</KEYWORD2>
-        <KEYWORD2>_trig-crc</KEYWORD2>
-        <KEYWORD2>_triggerevent</KEYWORD2>
-        <KEYWORD2>_triggerid</KEYWORD2>
-        <KEYWORD2>_triggername</KEYWORD2>
-        <KEYWORD2>_triggertime</KEYWORD2>
-        <KEYWORD2>_txe-id</KEYWORD2>
-        <KEYWORD2>_txe-locks</KEYWORD2>
-        <KEYWORD2>_txe-lockss</KEYWORD2>
-        <KEYWORD2>_txe-time</KEYWORD2>
-        <KEYWORD2>_txe-type</KEYWORD2>
-        <KEYWORD2>_txe-wait-time</KEYWORD2>
-        <KEYWORD2>_txe-waits</KEYWORD2>
-        <KEYWORD2>_txe-waitss</KEYWORD2>
-        <KEYWORD2>_txelock</KEYWORD2>
-        <KEYWORD2>_typeprecision</KEYWORD2>
-        <KEYWORD2>_u-misc1</KEYWORD2>
-        <KEYWORD2>_u-misc2</KEYWORD2>
-        <KEYWORD2>_unique</KEYWORD2>
-        <KEYWORD2>_unsignedattr</KEYWORD2>
-        <KEYWORD2>_unsorted</KEYWORD2>
-        <KEYWORD2>_upd</KEYWORD2>
-        <KEYWORD2>_updatable</KEYWORD2>
-        <KEYWORD2>_user</KEYWORD2>
-        <KEYWORD2>_user-misc</KEYWORD2>
-        <KEYWORD2>_user-name</KEYWORD2>
-        <KEYWORD2>_userid</KEYWORD2>
-        <KEYWORD2>_userio</KEYWORD2>
-        <KEYWORD2>_userio-airead</KEYWORD2>
-        <KEYWORD2>_userio-aiwrite</KEYWORD2>
-        <KEYWORD2>_userio-biread</KEYWORD2>
-        <KEYWORD2>_userio-biwrite</KEYWORD2>
-        <KEYWORD2>_userio-dbaccess</KEYWORD2>
-        <KEYWORD2>_userio-dbread</KEYWORD2>
-        <KEYWORD2>_userio-dbwrite</KEYWORD2>
-        <KEYWORD2>_userio-id</KEYWORD2>
-        <KEYWORD2>_userio-misc</KEYWORD2>
-        <KEYWORD2>_userio-name</KEYWORD2>
-        <KEYWORD2>_userio-usr</KEYWORD2>
-        <KEYWORD2>_userlock</KEYWORD2>
-        <KEYWORD2>_userlock-chain</KEYWORD2>
-        <KEYWORD2>_userlock-flags</KEYWORD2>
-        <KEYWORD2>_userlock-id</KEYWORD2>
-        <KEYWORD2>_userlock-misc</KEYWORD2>
-        <KEYWORD2>_userlock-name</KEYWORD2>
-        <KEYWORD2>_userlock-recid</KEYWORD2>
-        <KEYWORD2>_userlock-type</KEYWORD2>
-        <KEYWORD2>_userlock-usr</KEYWORD2>
-        <KEYWORD2>_username</KEYWORD2>
-        <KEYWORD2>_userstatus</KEYWORD2>
-        <KEYWORD2>_userstatus-counter</KEYWORD2>
-        <KEYWORD2>_userstatus-objectid</KEYWORD2>
-        <KEYWORD2>_userstatus-objecttype</KEYWORD2>
-        <KEYWORD2>_userstatus-operation</KEYWORD2>
-        <KEYWORD2>_userstatus-state</KEYWORD2>
-        <KEYWORD2>_userstatus-target</KEYWORD2>
-        <KEYWORD2>_userstatus-userid</KEYWORD2>
-        <KEYWORD2>_user_number</KEYWORD2>
-        <KEYWORD2>_valexp</KEYWORD2>
-        <KEYWORD2>_valmsg</KEYWORD2>
-        <KEYWORD2>_valmsg-sa</KEYWORD2>
-        <KEYWORD2>_value</KEYWORD2>
-        <KEYWORD2>_value_ch</KEYWORD2>
-        <KEYWORD2>_value_n</KEYWORD2>
-        <KEYWORD2>_val_ts</KEYWORD2>
-        <KEYWORD2>_vcol-order</KEYWORD2>
-        <KEYWORD2>_version</KEYWORD2>
-        <KEYWORD2>_view</KEYWORD2>
-        <KEYWORD2>_view-as</KEYWORD2>
-        <KEYWORD2>_view-col</KEYWORD2>
-        <KEYWORD2>_view-def</KEYWORD2>
-        <KEYWORD2>_view-name</KEYWORD2>
-        <KEYWORD2>_view-ref</KEYWORD2>
-        <KEYWORD2>_viewname</KEYWORD2>
-        <KEYWORD2>_viewtext</KEYWORD2>
-        <KEYWORD2>_where-cls</KEYWORD2>
-        <KEYWORD2>_width</KEYWORD2>
-        <KEYWORD2>_word-rule</KEYWORD2>
-        <KEYWORD2>_word-rules</KEYWORD2>
-        <KEYWORD2>_wordidx</KEYWORD2>
-        <KEYWORD2>_wr-attr</KEYWORD2>
-        <KEYWORD2>_wr-cp</KEYWORD2>
-        <KEYWORD2>_wr-name</KEYWORD2>
-        <KEYWORD2>_wr-number</KEYWORD2>
-        <KEYWORD2>_wr-segment</KEYWORD2>
-        <KEYWORD2>_wr-type</KEYWORD2>
-        <KEYWORD2>_wr-version</KEYWORD2>
-
-
-
-
-
-
-      <!-- INVALID    : Deprecated keywords -->
-        <INVALID>USE-INDEX</INVALID>
-        <INVALID>UNIX</INVALID>
-        <INVALID>DOS</INVALID>
-        <INVALID>VMS</INVALID>
-        <INVALID>BTOS</INVALID>
-        <INVALID>CTOS</INVALID>
-        <INVALID>OS2</INVALID>
-        <INVALID>OS400</INVALID>
-        <INVALID>EDITING</INVALID>
-        <INVALID>CHOOSE</INVALID>
-        <INVALID>PROMPT-FOR</INVALID>
-        <INVALID>SHARE-LOCK</INVALID>
-        <INVALID>READKEY</INVALID>
-        <INVALID>GO-PENDING</INVALID>
-        <INVALID>VALIDATE</INVALID>
-        <INVALID>IS-ATTR-SPACE</INVALID>
-        <INVALID>GATEWAYS</INVALID>
-        <INVALID>SCROLL</INVALID>
-
-        <!-- Removed or renamed keywords -->
-        <INVALID>ITERATION-CHANGED</INVALID>
-        <INVALID>BEFORE-RECORD-FILL</INVALID>
-        <INVALID>AFTER-RECORD-FILL</INVALID>
-        <INVALID>REPOSITION-MODE</INVALID>
-
-
-
-      <!-- COMMENT2   : Preprocessor statements -->
-        <COMMENT2>&amp;ADM-CONTAINER</COMMENT2>
-        <COMMENT2>&amp;ADM-SUPPORTED-LINKS</COMMENT2>
-        <COMMENT2>&amp;ANALYZE-RESUME</COMMENT2>
-        <COMMENT2>&amp;ANALYZE-SUSPEND</COMMENT2>
-        <COMMENT2>&amp;BATCH-MODE</COMMENT2>
-        <COMMENT2>&amp;BROWSE-NAME</COMMENT2>
-        <COMMENT2>&amp;DEFINED</COMMENT2>
-        <COMMENT2>&amp;DISPLAYED-FIELDS</COMMENT2>
-        <COMMENT2>&amp;DISPLAYED-OBJECTS</COMMENT2>
-        <COMMENT2>&amp;ELSE</COMMENT2>
-        <COMMENT2>&amp;ELSEIF</COMMENT2>
-        <COMMENT2>&amp;ENABLED-FIELDS-IN-QUERY</COMMENT2>
-        <COMMENT2>&amp;ENABLED-FIELDS</COMMENT2>
-        <COMMENT2>&amp;ENABLED-OBJECTS</COMMENT2>
-        <COMMENT2>&amp;ENABLED-TABLES-IN-QUERY</COMMENT2>
-        <COMMENT2>&amp;ENABLED-TABLES</COMMENT2>
-        <COMMENT2>&amp;ENDIF</COMMENT2>
-        <COMMENT2>&amp;EXTERNAL-TABLES</COMMENT2>
-        <COMMENT2>&amp;FIELD-PAIRS-IN-QUERY</COMMENT2>
-        <COMMENT2>&amp;FIELD-PAIRS</COMMENT2>
-        <COMMENT2>&amp;FIELDS-IN-QUERY</COMMENT2>
-        <COMMENT2>&amp;FILE-NAME</COMMENT2>
-        <COMMENT2>&amp;FIRST-EXTERNAL-TABLE</COMMENT2>
-        <COMMENT2>&amp;FIRST-TABLE-IN-QUERY</COMMENT2>
-        <COMMENT2>&amp;FRAME-NAME</COMMENT2>
-        <COMMENT2>&amp;GLOB</COMMENT2>
-        <COMMENT2>&amp;GLOBAL-DEFINE</COMMENT2>
-        <COMMENT2>&amp;IF</COMMENT2>
-        <COMMENT2>&amp;INCLUDE</COMMENT2>
-        <COMMENT2>&amp;INTERNAL-TABLES</COMMENT2>
-        <COMMENT2>&amp;LAYOUT-VARIABLE</COMMENT2>
-        <COMMENT2>&amp;LINE-NUMBER</COMMENT2>
-        <COMMENT2>&amp;LIST-1</COMMENT2>
-        <COMMENT2>&amp;LIST-2</COMMENT2>
-        <COMMENT2>&amp;LIST-3</COMMENT2>
-        <COMMENT2>&amp;LIST-4</COMMENT2>
-        <COMMENT2>&amp;LIST-5</COMMENT2>
-        <COMMENT2>&amp;LIST-6</COMMENT2>
-        <COMMENT2>&amp;MESSAGE</COMMENT2>
-        <COMMENT2>&amp;NEW</COMMENT2>
-        <COMMENT2>&amp;OPEN-BROWSERS-IN-QUERY</COMMENT2>
-        <COMMENT2>&amp;OPEN-QUERY</COMMENT2>
-        <COMMENT2>&amp;OPSYS</COMMENT2>
-        <COMMENT2>&amp;PROCEDURE-TYPE</COMMENT2>
-        <COMMENT2>&amp;QUERY-NAME</COMMENT2>
-        <COMMENT2>&amp;SCOP</COMMENT2>
-        <COMMENT2>&amp;SCOPED-DEFINE</COMMENT2>
-        <COMMENT2>&amp;SELF-NAME</COMMENT2>
-        <COMMENT2>&amp;SEQUENCE</COMMENT2>
-        <COMMENT2>&amp;TABLES-IN-QUERY</COMMENT2>
-        <COMMENT2>&amp;THEN</COMMENT2>
-        <COMMENT2>&amp;UIB_is_Running</COMMENT2>
-        <COMMENT2>&amp;UNDEFINE</COMMENT2>
-        <COMMENT2>&amp;WINDOW-NAME</COMMENT2>
-        <COMMENT2>&amp;WINDOW-SYSTEM</COMMENT2>
-        <COMMENT2>DEFINED</COMMENT2>
-        <COMMENT2>PROCEDURE-TYPE</COMMENT2>
-        <COMMENT2>_CREATE-WINDOW</COMMENT2>
-        <COMMENT2>_CUSTOM _DEFINITIONS</COMMENT2>
-        <COMMENT2>_CUSTOM _MAIN-BLOCK</COMMENT2>
-        <COMMENT2>_CUSTOM</COMMENT2>
-        <COMMENT2>_DEFINITIONS</COMMENT2>
-        <COMMENT2>_END-PROCEDURE-SETTINGS</COMMENT2>
-        <COMMENT2>_FUNCTION-FORWARD</COMMENT2>
-        <COMMENT2>_FUNCTION</COMMENT2>
-        <COMMENT2>_INCLUDED-LIB</COMMENT2>
-        <COMMENT2>_INLINE</COMMENT2>
-        <COMMENT2>_MAIN-BLOCK</COMMENT2>
-        <COMMENT2>_PROCEDURE-SETTINGS</COMMENT2>
-        <COMMENT2>_PROCEDURE</COMMENT2>
-        <COMMENT2>_UIB-CODE-BLOCK</COMMENT2>
-        <COMMENT2>_UIB-PREPROCESSOR-BLOCK</COMMENT2>
-        <COMMENT2>_VERSION-NUMBER</COMMENT2>
-        <COMMENT2>_XFTR</COMMENT2>
-
-    </KEYWORDS>
-  </RULES>
-
-
-</MODE>
-
diff --git a/qpython/src/main/assets/syntax/prolog.xml b/qpython/src/main/assets/syntax/prolog.xml
deleted file mode 100644
index 90a314d5..00000000
--- a/qpython/src/main/assets/syntax/prolog.xml
+++ /dev/null
@@ -1,195 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!--	jEdit Prolog syntax file
-	based on the INRIA ISO Prolog web page @ http://pauillac.inria.fr/~hodgson/prolog
-
-	written by	Giulio Piancastelli
-	version		1.0
-	created on	31st December 2001
-	last revised	19th November 2002
--->
-
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="lineComment" VALUE="%" />
-		<PROPERTY NAME="commentStart" VALUE="/*" />
-		<PROPERTY NAME="commentEnd" VALUE="*/" />
-	</PROPS>
-	<RULES IGNORE_CASE="FALSE" HIGHLIGHT_DIGITS="TRUE">
-
-		<!-- Comments -->
-		<EOL_SPAN TYPE="COMMENT1">%</EOL_SPAN>
-		<!--- ISO compliant C-style comments -->
-		<SPAN TYPE="COMMENT1">
-			<BEGIN>/*</BEGIN>
-			<END>*/</END>
-		</SPAN>
-
-		<!-- String literals -->
-		<SPAN TYPE="LITERAL1" ESCAPE="\" NO_LINE_BREAK="TRUE">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-		<SPAN TYPE="LITERAL1" ESCAPE="\" NO_LINE_BREAK="TRUE">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-
-		<!-- List literals -->
-		<SPAN TYPE="LITERAL2" NO_LINE_BREAK="TRUE" DELEGATE="LIST">
-			<BEGIN>[</BEGIN>
-			<END>]</END>
-		</SPAN>
-
-		<!-- Operators -->
-		<SEQ TYPE="OPERATOR">--&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">:-</SEQ>
-		<SEQ TYPE="OPERATOR">?-</SEQ>
-		<SEQ TYPE="OPERATOR">;</SEQ>
-		<SEQ TYPE="OPERATOR">-&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">,</SEQ>
-		<SEQ TYPE="OPERATOR">\+</SEQ> <!-- ISO Prolog uses it instead of 'not' -->
-		<SEQ TYPE="OPERATOR">==</SEQ>
-		<SEQ TYPE="OPERATOR">\==</SEQ>
-		<SEQ TYPE="OPERATOR">\=</SEQ>
-		<SEQ TYPE="OPERATOR">@&lt;</SEQ>
-		<SEQ TYPE="OPERATOR">@=&lt;</SEQ>
-		<SEQ TYPE="OPERATOR">@&gt;=</SEQ>
-		<SEQ TYPE="OPERATOR">@&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">=..</SEQ>
-		<SEQ TYPE="OPERATOR">=:=</SEQ>
-		<SEQ TYPE="OPERATOR">=\=</SEQ>
-		<SEQ TYPE="OPERATOR">=&lt;</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;=</SEQ>
-		<SEQ TYPE="OPERATOR">+</SEQ>
-		<SEQ TYPE="OPERATOR">-</SEQ>
-		<SEQ TYPE="OPERATOR">/\</SEQ>
-		<SEQ TYPE="OPERATOR">\/</SEQ>
-		<SEQ TYPE="OPERATOR">//</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;&lt;</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">**</SEQ>
-		<SEQ TYPE="OPERATOR">^</SEQ>
-		<SEQ TYPE="OPERATOR">\</SEQ>
-		<SEQ TYPE="OPERATOR">/</SEQ>
-		<SEQ TYPE="OPERATOR">=</SEQ>
-		<SEQ TYPE="OPERATOR">*</SEQ>
-
-		<!-- The '.' at the end of each clause -->
-		<SEQ TYPE="OPERATOR">.</SEQ>
-
-		<!-- Parentheses -->
-		<SEQ TYPE="MARKUP">(</SEQ>
-		<SEQ TYPE="MARKUP">)</SEQ>
-		<SEQ TYPE="NULL">{</SEQ>
-		<SEQ TYPE="NULL">}</SEQ>
-
-		<KEYWORDS>
-
-			<!-- Keywords that are 0 arity built-in predicates -->
-			<KEYWORD1>true</KEYWORD1>
-			<KEYWORD1>fail</KEYWORD1>
-			<KEYWORD1>!</KEYWORD1> <!-- cut -->
-			<KEYWORD1>at_end_of_stream</KEYWORD1>
-			<KEYWORD1>nl</KEYWORD1>
-			<KEYWORD1>repeat</KEYWORD1>
-			<KEYWORD1>halt</KEYWORD1>
-
-			<!-- Keywords that are built-in predicates with arity greater than or equal to 1 -->
-			<FUNCTION>call</FUNCTION>
-			<FUNCTION>catch</FUNCTION>
-			<FUNCTION>throw</FUNCTION>
-			<FUNCTION>unify_with_occurs_check</FUNCTION>
-			<FUNCTION>var</FUNCTION>
-			<FUNCTION>atom</FUNCTION>
-			<FUNCTION>integer</FUNCTION>
-			<FUNCTION>float</FUNCTION>
-			<FUNCTION>atomic</FUNCTION>
-			<FUNCTION>compound</FUNCTION>
-			<FUNCTION>nonvar</FUNCTION>
-			<FUNCTION>number</FUNCTION>
-			<FUNCTION>functor</FUNCTION>
-			<FUNCTION>arg</FUNCTION>
-			<FUNCTION>copy_term</FUNCTION>
-			<FUNCTION>clause</FUNCTION>
-			<FUNCTION>current_predicate</FUNCTION>
-			<FUNCTION>asserta</FUNCTION>
-			<FUNCTION>assertz</FUNCTION>
-			<FUNCTION>retract</FUNCTION>
-			<FUNCTION>abolish</FUNCTION>
-			<FUNCTION>findall</FUNCTION>
-			<FUNCTION>bagof</FUNCTION>
-			<FUNCTION>setof</FUNCTION>
-			<FUNCTION>current_input</FUNCTION>
-			<FUNCTION>current_output</FUNCTION>
-			<FUNCTION>set_input</FUNCTION>
-			<FUNCTION>set_output</FUNCTION>
-			<FUNCTION>open</FUNCTION>
-			<FUNCTION>close</FUNCTION>
-			<FUNCTION>stream_property</FUNCTION>
-			<FUNCTION>at_end_of_stream</FUNCTION> <!-- arity 1 -->
-			<FUNCTION>set_stream_position</FUNCTION>
-			<FUNCTION>get_char</FUNCTION>
-			<FUNCTION>get_code</FUNCTION>
-			<FUNCTION>peek_char</FUNCTION>
-			<FUNCTION>peek_code</FUNCTION>
-			<FUNCTION>put_char</FUNCTION>
-			<FUNCTION>put_code</FUNCTION>
-			<FUNCTION>nl</FUNCTION> <!-- arity 1 -->
-			<FUNCTION>get_byte</FUNCTION>
-			<FUNCTION>peek_byte</FUNCTION>
-			<FUNCTION>put_byte</FUNCTION>
-			<FUNCTION>read_term</FUNCTION>
-			<FUNCTION>read</FUNCTION>
-			<FUNCTION>write_term</FUNCTION>
-			<FUNCTION>write</FUNCTION>
-			<FUNCTION>writeq</FUNCTION>
-			<FUNCTION>write_canonical</FUNCTION>
-			<FUNCTION>op</FUNCTION>
-			<FUNCTION>current_op</FUNCTION>
-			<FUNCTION>char_conversion</FUNCTION>
-			<FUNCTION>current_char_conversion</FUNCTION>
-			<FUNCTION>once</FUNCTION>
-			<FUNCTION>atom_length</FUNCTION>
-			<FUNCTION>atom_concat</FUNCTION>
-			<FUNCTION>sub_atom</FUNCTION>
-			<FUNCTION>atom_chars</FUNCTION>
-			<FUNCTION>atom_codes</FUNCTION>
-			<FUNCTION>char_code</FUNCTION>
-			<FUNCTION>number_chars</FUNCTION>
-			<FUNCTION>number_codes</FUNCTION>
-			<FUNCTION>set_prolog_flag</FUNCTION>
-			<FUNCTION>current_prolog_flag</FUNCTION>
-			<FUNCTION>halt</FUNCTION> <!-- arity 1 -->
-
-			<!-- Mathematical functions -->
-			<FUNCTION>sin</FUNCTION>
-			<FUNCTION>cos</FUNCTION>
-			<FUNCTION>atan</FUNCTION>
-			<FUNCTION>exp</FUNCTION>
-			<FUNCTION>log</FUNCTION>
-			<FUNCTION>sqrt</FUNCTION>
-
-			<!-- Keywords that should be operators -->
-			<KEYWORD2>is</KEYWORD2>
-			<KEYWORD2>rem</KEYWORD2>
-			<KEYWORD2>mod</KEYWORD2>
-
-			<!-- Singleton variable -->
-			<KEYWORD3>_</KEYWORD3>
-
-		</KEYWORDS>
-
-	</RULES>
-
-	<RULES SET="LIST" DEFAULT="LITERAL2" ESCAPE="\">
-		<SPAN TYPE="LITERAL2" NO_LINE_BREAK="TRUE" DELEGATE="LIST">
-			<BEGIN>[</BEGIN>
-			<END>]</END>
-		</SPAN>
-	</RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/props.xml b/qpython/src/main/assets/syntax/props.xml
deleted file mode 100644
index d84e9640..00000000
--- a/qpython/src/main/assets/syntax/props.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="contextInsensitive" VALUE="FALSE" />
-	</PROPS>
-	<RULES>
-        <!-- 
-        Comments: indicated by either ASCII # or ! as the first non-whitespace
-        character on a line. Comments extend to the end of the line. Comments
-        placed after a key/value are considered part of the value, not as a
-        comment.
-        -->
-        <EOL_SPAN_REGEXP TYPE="COMMENT1" AT_LINE_START="TRUE">\s*[#!]</EOL_SPAN_REGEXP>
-        
-        <!-- 
-        A "natural" line, that is, a blank line. This isn't necessary, it's here
-        just to show it was considered and handled.
-        -->
-        <EOL_SPAN_REGEXP TYPE="NULL">\s*$</EOL_SPAN_REGEXP>
-	
-	    <!--
-	    Key: The key contains all of the characters in the line starting with the 
-	    first non-white space character and up to, but not including, the first 
-	    unescaped '=', ':', or white space character other than a line terminator. 
-	    All of these key termination characters may be included in the key by 
-	    escaping them with a preceding backslash character.
-	    -->
-	    <SPAN_REGEXP TYPE="KEYWORD1" NO_LINE_BREAK="TRUE" NO_WORD_BREAK="TRUE" AT_LINE_START="TRUE" ESCAPE="\">
-	        <BEGIN>\s*([\u0022-\uFFFF&amp;&amp;[^:=]]|[\\][:=&#09;])+?</BEGIN>
-	        <END REGEXP="TRUE">(?=(([:=])|(\s+)))</END>
-	    </SPAN_REGEXP>
-	
-	    <!-- 
-	    Visible key termination characters.
-	    -->
-	    <SEQ_REGEXP	TYPE="OPERATOR">((\s*[:=]\s*)|(\s+))</SEQ_REGEXP>
-	    
-	    <!-- 
-	    Not a comment, not a key, not a key terminator, must be a value.
-	    Value contains all characters until the end of the line. The line may
-	    be continued to the next line by a trailing \.
-	    
-	    The seq_regexp handles the odd case where the value is only 1 character
-	    long. The tokenizer consumes that character, which means the ending
-	    regex for the span_regexp doesn't work.
-	    -->
-	    <SEQ_REGEXP	TYPE="LITERAL1">[^\\]{1}$</SEQ_REGEXP>
-        <SPAN_REGEXP TYPE="LITERAL1">
-            <BEGIN>.</BEGIN>
-            <END REGEXP="TRUE">[^\\]$</END>
-        </SPAN_REGEXP>
-    </RULES>
-	
-</MODE>
diff --git a/qpython/src/main/assets/syntax/psp.xml b/qpython/src/main/assets/syntax/psp.xml
deleted file mode 100644
index 56445e08..00000000
--- a/qpython/src/main/assets/syntax/psp.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="commentStart" VALUE="&lt;!--" />
-		<PROPERTY NAME="commentEnd" VALUE="--&gt;" />
-		<PROPERTY NAME="indentNextLines" VALUE="\s*[^#]{3,}:\s*(#.*)?" />
-	</PROPS>
-
-	<RULES IGNORE_CASE="TRUE">
-
-		<SPAN TYPE="LITERAL4" DELEGATE="DIRECTIVE">
-			<BEGIN>&lt;%@</BEGIN>
-			<END>%&gt;</END>
-		</SPAN>
-
-		<!-- PSP comment -->
-		<SPAN TYPE="COMMENT2">
-			<BEGIN>&lt;%--</BEGIN>
-			<END>--%&gt;</END>
-		</SPAN>
-
-		<!-- inline Python code -->
-		<SPAN TYPE="LITERAL3" DELEGATE="python::MAIN">
-			<BEGIN>&lt;%</BEGIN>
-			<END>%&gt;</END>
-		</SPAN>
-
-		<!-- Client-side javascript -->
-		<SPAN TYPE="MARKUP" DELEGATE="javascript::MAIN">
-			<BEGIN>&lt;script language="jscript"&gt;</BEGIN>
-			<END>&lt;/script&gt;</END>
-		</SPAN>
-
-		<SPAN TYPE="MARKUP" DELEGATE="javascript::MAIN">
-			<BEGIN>&lt;script language="javascript"&gt;</BEGIN>
-			<END>&lt;/script&gt;</END>
-		</SPAN>
-
-		<SPAN TYPE="MARKUP" DELEGATE="javascript::MAIN">
-			<BEGIN>&lt;script&gt;</BEGIN>
-			<END>&lt;/script&gt;</END>
-		</SPAN>
-
-		<!-- Server-Side include -->
-		<SPAN TYPE="MARKUP">
-			<BEGIN>&lt;!--#</BEGIN>
-			<END>--&gt;</END>
-		</SPAN>
-
-		<!-- SGML comment -->
-		<SPAN TYPE="COMMENT1">
-			<BEGIN>&lt;!--</BEGIN>
-			<END>--&gt;</END>
-		</SPAN>
-
-		<!-- stylesheet -->
-		<SPAN TYPE="MARKUP" DELEGATE="css::MAIN">
-			<BEGIN>&lt;STYLE&gt;</BEGIN>
-			<END>&lt;/STYLE&gt;</END>
-		</SPAN>
-
-		<!-- markup tags -->
-		<SPAN TYPE="MARKUP" DELEGATE="TAGS">
-			<BEGIN>&lt;</BEGIN>
-			<END>&gt;</END>
-		</SPAN>
-
-		<!-- SGML entities -->
-		<SPAN TYPE="LITERAL2" NO_WORD_BREAK="TRUE">
-			<BEGIN>&amp;</BEGIN>
-			<END>;</END>
-		</SPAN>
-
-	</RULES>
-
-	<!-- ESCAPE is not exactly right but it is needed to correctly
-	     handle JavaScript in on* parameters -->
-	<RULES SET="TAGS" DEFAULT="MARKUP">
-		<SPAN TYPE="LITERAL1" ESCAPE="\">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-
-		<SPAN TYPE="LITERAL1" ESCAPE="\">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-
-		<SEQ TYPE="OPERATOR">=</SEQ>
-
-		<!-- PSP comment -->
-		<SPAN TYPE="COMMENT2">
-			<BEGIN>&lt;%--</BEGIN>
-			<END>--%&gt;</END>
-		</SPAN>
-
-		<SPAN TYPE="LITERAL3" DELEGATE="python::MAIN">
-			<BEGIN>&lt;%</BEGIN>
-			<END>%&gt;</END>
-		</SPAN>
-	</RULES>
-
-	<RULES SET="DIRECTIVE" DEFAULT="LITERAL4">
-
-		<SPAN TYPE="LITERAL1">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-
-		<SPAN TYPE="LITERAL1">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-
-		<SEQ TYPE="OPERATOR">=</SEQ>
-
-		<KEYWORDS>
-			<KEYWORD4>include</KEYWORD4>
-
-			<KEYWORD4>file</KEYWORD4>
-		</KEYWORDS>
-	</RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/ptl.xml b/qpython/src/main/assets/syntax/ptl.xml
deleted file mode 100644
index 37dc09de..00000000
--- a/qpython/src/main/assets/syntax/ptl.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!--
-<MODE NAME="ptl"			FILE="ptl.xml"
-				FILE_NAME_GLOB="*.ptl"/>
--->
-
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="indentNextLines" VALUE="\s*[^#]{3,}:\s*(#.*)?" />
-		<PROPERTY NAME="lineComment" VALUE="#" />
-		<PROPERTY NAME="contextInsensitive" VALUE="true" />
-	</PROPS>
-	<RULES IGNORE_CASE="FALSE" HIGHLIGHT_DIGITS="TRUE">
-
-		<IMPORT DELEGATE="python::MAIN"/>
-
-		<SEQ TYPE="KEYWORD4">[html]</SEQ>
-		<SEQ TYPE="KEYWORD4">[plain]</SEQ>
-
-		<KEYWORDS>
-			<LITERAL4>_q_access</LITERAL4>
-			<LITERAL4>_q_exports</LITERAL4>
-			<LITERAL4>_q_index</LITERAL4>
-			<LITERAL4>_q_lookup</LITERAL4>
-			<LITERAL4>_q_resolve</LITERAL4>
-			<LITERAL4>_q_exception_handler</LITERAL4>
-		</KEYWORDS>
-
-	</RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/pure.xml b/qpython/src/main/assets/syntax/pure.xml
deleted file mode 100644
index e056c3c1..00000000
--- a/qpython/src/main/assets/syntax/pure.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="commentStart" VALUE="/*"/>
-		<PROPERTY NAME="commentEnd" VALUE="*/"/>
-		<PROPERTY NAME="lineComment" VALUE="//"/>
-		<PROPERTY NAME="lineComment" VALUE="#!"/>
-	</PROPS>
-
-	<RULES IGNORE_CASE="FALSE" HIGHLIGHT_DIGITS="TRUE">
-		<SPAN TYPE="COMMENT1">
-			<BEGIN>/*</BEGIN>
-			<END>*/</END>
-		</SPAN>
-
-		<EOL_SPAN TYPE="COMMENT1">//</EOL_SPAN>
-		
-		<EOL_SPAN TYPE="COMMENT3">#!</EOL_SPAN>
-
-		<SPAN TYPE="LITERAL1" ESCAPE="\" NO_LINE_BREAK="TRUE">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-		
-		<SEQ TYPE="OPERATOR">.</SEQ>
-		<SEQ TYPE="OPERATOR">&amp;</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">`</SEQ>
-		<SEQ TYPE="OPERATOR">'</SEQ>
-		<SEQ TYPE="OPERATOR">#</SEQ>
-		<SEQ TYPE="OPERATOR">+</SEQ>
-		<SEQ TYPE="OPERATOR">-</SEQ>
-		<SEQ TYPE="OPERATOR">*</SEQ>
-		<SEQ TYPE="OPERATOR">/</SEQ>
-		<SEQ TYPE="OPERATOR">%</SEQ>
-		<SEQ TYPE="OPERATOR">^</SEQ>
-		<SEQ TYPE="OPERATOR">=</SEQ>
-		<SEQ TYPE="OPERATOR">|</SEQ>
-		<SEQ TYPE="OPERATOR">~</SEQ>
-		<SEQ TYPE="OPERATOR">!</SEQ>
-		<SEQ TYPE="OPERATOR">$</SEQ>
-		<SEQ TYPE="OPERATOR">:</SEQ>
-		<SEQ TYPE="OPERATOR">?</SEQ>
-		<SEQ TYPE="OPERATOR">,</SEQ>
-		
-		<KEYWORDS>
-			<OPERATOR>or</OPERATOR>
-			<OPERATOR>and</OPERATOR>
-			<OPERATOR>div</OPERATOR>
-			<OPERATOR>mod</OPERATOR>
-			<OPERATOR>not</OPERATOR>
-			
-			<KEYWORD1>case</KEYWORD1>
-			<KEYWORD1>of</KEYWORD1>
-			<KEYWORD1>when</KEYWORD1>
-			<KEYWORD1>with</KEYWORD1>
-			<KEYWORD1>end</KEYWORD1>
-			<KEYWORD1>if</KEYWORD1>
-			<KEYWORD1>then</KEYWORD1>
-			<KEYWORD1>else</KEYWORD1>
-			<KEYWORD1>otherwise</KEYWORD1>
-			<KEYWORD1>catch</KEYWORD1>
-			<KEYWORD1>throw</KEYWORD1>
-			<KEYWORD1>quote</KEYWORD1>
-			
-			<KEYWORD2>bigint</KEYWORD2>
-			<KEYWORD2>bool</KEYWORD2>
-			<KEYWORD2>char</KEYWORD2>
-			<KEYWORD2>double</KEYWORD2>
-			<KEYWORD2>expr</KEYWORD2>
-			<KEYWORD2>short</KEYWORD2>
-			<KEYWORD2>int</KEYWORD2>
-			<KEYWORD2>long</KEYWORD2>
-			<KEYWORD2>string</KEYWORD2>
-			<KEYWORD2>pointer</KEYWORD2>
-			<KEYWORD2>matrix</KEYWORD2>
-			<KEYWORD2>dmatrix</KEYWORD2>
-			<KEYWORD2>cmatrix</KEYWORD2>
-			<KEYWORD2>imatrix</KEYWORD2>
-			
-			<KEYWORD3>const</KEYWORD3>
-			<KEYWORD3>def</KEYWORD3>
-			<KEYWORD3>extern</KEYWORD3>
-			<KEYWORD3>infix</KEYWORD3>
-			<KEYWORD3>infixl</KEYWORD3>
-			<KEYWORD3>infixr</KEYWORD3>
-			<KEYWORD3>let</KEYWORD3>
-			<KEYWORD3>namespace</KEYWORD3>
-			<KEYWORD3>nonfix</KEYWORD3>
-			<KEYWORD3>outfix</KEYWORD3>
-			<KEYWORD3>private</KEYWORD3>
-			<KEYWORD3>public</KEYWORD3>
-			<KEYWORD3>prefix</KEYWORD3>
-			<KEYWORD3>postfix</KEYWORD3>
-			<KEYWORD3>using</KEYWORD3>
-			
-			<LITERAL2>true</LITERAL2>
-			<LITERAL2>false</LITERAL2>
-		</KEYWORDS>
-	</RULES>
-
-</MODE>
-
- 	  	 
diff --git a/qpython/src/main/assets/syntax/pvwave.xml b/qpython/src/main/assets/syntax/pvwave.xml
deleted file mode 100644
index ca9a37ba..00000000
--- a/qpython/src/main/assets/syntax/pvwave.xml
+++ /dev/null
@@ -1,723 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!-- PV-WAVE mode, by Ed Stewart
-     based on Java mode by Mike Dillon and IDLTokenMarker by Juha Lindfors -->
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="lineComment" VALUE=";" />
-		<PROPERTY NAME="contextInsensitive" VALUE="true" />
-	</PROPS>
-	<RULES HIGHLIGHT_DIGITS="TRUE" IGNORE_CASE="TRUE">
-		<SPAN TYPE="LITERAL1" NO_LINE_BREAK="TRUE">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-		<SPAN TYPE="LITERAL1" NO_LINE_BREAK="TRUE">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-
-		<EOL_SPAN TYPE="COMMENT1">;</EOL_SPAN>
-
-		<SEQ TYPE="OPERATOR">(</SEQ>
-		<SEQ TYPE="OPERATOR">)</SEQ>
-		<SEQ TYPE="OPERATOR">=</SEQ>
-		<SEQ TYPE="OPERATOR">+</SEQ>
-		<SEQ TYPE="OPERATOR">-</SEQ>
-		<SEQ TYPE="OPERATOR">/</SEQ>
-		<SEQ TYPE="OPERATOR">*</SEQ>
-		<SEQ TYPE="OPERATOR">#</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;</SEQ>
-		<SEQ TYPE="OPERATOR">^</SEQ>
-		<SEQ TYPE="OPERATOR">}</SEQ>
-		<SEQ TYPE="OPERATOR">{</SEQ>
-		<SEQ TYPE="OPERATOR">.</SEQ>
-		<SEQ TYPE="OPERATOR">,</SEQ>
-		<SEQ TYPE="OPERATOR">]</SEQ>
-		<SEQ TYPE="OPERATOR">[</SEQ>
-		<SEQ TYPE="OPERATOR">:</SEQ>
-		<SEQ TYPE="LABEL">$</SEQ>
-		<SEQ TYPE="LABEL">&amp;</SEQ>
-		<SEQ TYPE="LABEL">@</SEQ>
-		<SEQ TYPE="LABEL">!</SEQ>
-
-		<KEYWORDS>
-		<!--KEYWORD1s are standard functions and procedures -->
-			<KEYWORD1>abs</KEYWORD1>
-			<KEYWORD1>acos</KEYWORD1>
-			<KEYWORD1>add_exec_on_select</KEYWORD1>
-			<KEYWORD1>addsysvar</KEYWORD1>
-			<KEYWORD1>addvar</KEYWORD1>
-			<KEYWORD1>affine</KEYWORD1>
-			<KEYWORD1>alog</KEYWORD1>
-			<KEYWORD1>alog10</KEYWORD1>
-			<KEYWORD1>asarr</KEYWORD1>
-			<KEYWORD1>asin</KEYWORD1>
-			<KEYWORD1>askeys</KEYWORD1>
-			<KEYWORD1>assoc</KEYWORD1>
-			<KEYWORD1>atan</KEYWORD1>
-			<KEYWORD1>avg</KEYWORD1>
-			<KEYWORD1>axis</KEYWORD1>
-			<KEYWORD1>bar</KEYWORD1>
-			<KEYWORD1>bar2d</KEYWORD1>
-			<KEYWORD1>bar3d</KEYWORD1>
-			<KEYWORD1>beseli</KEYWORD1>
-			<KEYWORD1>beselj</KEYWORD1>
-			<KEYWORD1>besely</KEYWORD1>
-			<KEYWORD1>bilinear</KEYWORD1>
-			<KEYWORD1>bindgen</KEYWORD1>
-			<KEYWORD1>blob</KEYWORD1>
-			<KEYWORD1>blobcount</KEYWORD1>
-			<KEYWORD1>boundary</KEYWORD1>
-			<KEYWORD1>build_table</KEYWORD1>
-			<KEYWORD1>buildresourcefilename</KEYWORD1>
-			<KEYWORD1>bytarr</KEYWORD1>
-			<KEYWORD1>byte</KEYWORD1>
-			<KEYWORD1>byteorder</KEYWORD1>
-			<KEYWORD1>bytscl</KEYWORD1>
-			<KEYWORD1>c_edit</KEYWORD1>
-			<KEYWORD1>call_unix</KEYWORD1>
-			<KEYWORD1>cd</KEYWORD1>
-			<KEYWORD1>center_view</KEYWORD1>
-			<KEYWORD1>chebyshev</KEYWORD1>
-			<KEYWORD1>check_math</KEYWORD1>
-			<KEYWORD1>checkfile</KEYWORD1>
-			<KEYWORD1>cindgen</KEYWORD1>
-			<KEYWORD1>close</KEYWORD1>
-			<KEYWORD1>color_convert</KEYWORD1>
-			<KEYWORD1>color_edit</KEYWORD1>
-			<KEYWORD1>color_palette</KEYWORD1>
-			<KEYWORD1>complex</KEYWORD1>
-			<KEYWORD1>complexarr</KEYWORD1>
-			<KEYWORD1>cone</KEYWORD1>
-			<KEYWORD1>congrid</KEYWORD1>
-			<KEYWORD1>conj</KEYWORD1>
-			<KEYWORD1>contour</KEYWORD1>
-			<KEYWORD1>contour2</KEYWORD1>
-			<KEYWORD1>contourfill</KEYWORD1>
-			<KEYWORD1>conv_from_rect</KEYWORD1>
-			<KEYWORD1>conv_to_rect</KEYWORD1>
-			<KEYWORD1>convert_coord</KEYWORD1>
-			<KEYWORD1>convol</KEYWORD1>
-			<KEYWORD1>correlate</KEYWORD1>
-			<KEYWORD1>cos</KEYWORD1>
-			<KEYWORD1>cosh</KEYWORD1>
-			<KEYWORD1>cosines</KEYWORD1>
-			<KEYWORD1>cprod</KEYWORD1>
-			<KEYWORD1>create_holidays</KEYWORD1>
-			<KEYWORD1>create_weekdends</KEYWORD1>
-			<KEYWORD1>crossp</KEYWORD1>
-			<KEYWORD1>cursor</KEYWORD1>
-			<KEYWORD1>curvatures</KEYWORD1>
-			<KEYWORD1>curvefit</KEYWORD1>
-			<KEYWORD1>cylinder</KEYWORD1>
-			<KEYWORD1>day_name</KEYWORD1>
-			<KEYWORD1>day_of_week</KEYWORD1>
-			<KEYWORD1>day_of_year</KEYWORD1>
-			<KEYWORD1>dblarr</KEYWORD1>
-			<KEYWORD1>dc_error_msg</KEYWORD1>
-			<KEYWORD1>dc_options</KEYWORD1>
-			<KEYWORD1>dc_read_24_bit</KEYWORD1>
-			<KEYWORD1>dc_read_8_bit</KEYWORD1>
-			<KEYWORD1>dc_read_container</KEYWORD1>
-			<KEYWORD1>dc_read_dib</KEYWORD1>
-			<KEYWORD1>dc_read_fixed</KEYWORD1>
-			<KEYWORD1>dc_read_free</KEYWORD1>
-			<KEYWORD1>dc_read_tiff</KEYWORD1>
-			<KEYWORD1>dc_scan_container</KEYWORD1>
-			<KEYWORD1>dc_write_24_bit</KEYWORD1>
-			<KEYWORD1>dc_write_8_bit</KEYWORD1>
-			<KEYWORD1>dc_write_dib</KEYWORD1>
-			<KEYWORD1>dc_write_fixed</KEYWORD1>
-			<KEYWORD1>dc_write_free</KEYWORD1>
-			<KEYWORD1>dc_write_tiff</KEYWORD1>
-			<KEYWORD1>dcindgen</KEYWORD1>
-			<KEYWORD1>dcomplex</KEYWORD1>
-			<KEYWORD1>dcomplexarr</KEYWORD1>
-			<KEYWORD1>declare func</KEYWORD1>
-			<KEYWORD1>declare function</KEYWORD1>
-			<KEYWORD1>define_key</KEYWORD1>
-			<KEYWORD1>defroi</KEYWORD1>
-			<KEYWORD1>defsysv</KEYWORD1>
-			<KEYWORD1>del_file</KEYWORD1>
-			<KEYWORD1>delfunc</KEYWORD1>
-			<KEYWORD1>dellog</KEYWORD1>
-			<KEYWORD1>delproc</KEYWORD1>
-			<KEYWORD1>delstruct</KEYWORD1>
-			<KEYWORD1>delvar</KEYWORD1>
-			<KEYWORD1>demo</KEYWORD1>
-			<KEYWORD1>deriv</KEYWORD1>
-			<KEYWORD1>derivn</KEYWORD1>
-			<KEYWORD1>determ</KEYWORD1>
-			<KEYWORD1>device</KEYWORD1>
-			<KEYWORD1>diag</KEYWORD1>
-			<KEYWORD1>dicm_tag_info</KEYWORD1>
-			<KEYWORD1>digital_filter</KEYWORD1>
-			<KEYWORD1>dilate</KEYWORD1>
-			<KEYWORD1>dindgen</KEYWORD1>
-			<KEYWORD1>dist</KEYWORD1>
-			<KEYWORD1>dminit</KEYWORD1>
-			<KEYWORD1>doc_lib_unix</KEYWORD1>
-			<KEYWORD1>doc_library</KEYWORD1>
-			<KEYWORD1>double</KEYWORD1>
-			<KEYWORD1>drop_exec_on_select</KEYWORD1>
-			<KEYWORD1>dt_add</KEYWORD1>
-			<KEYWORD1>dt_addly</KEYWORD1>
-			<KEYWORD1>dt_compress</KEYWORD1>
-			<KEYWORD1>dt_duration</KEYWORD1>
-			<KEYWORD1>dt_print</KEYWORD1>
-			<KEYWORD1>dt_subly</KEYWORD1>
-			<KEYWORD1>dt_subtract</KEYWORD1>
-			<KEYWORD1>dt_to_sec</KEYWORD1>
-			<KEYWORD1>dt_to_str</KEYWORD1>
-			<KEYWORD1>dt_to_var</KEYWORD1>
-			<KEYWORD1>dtegn</KEYWORD1>
-			<KEYWORD1>empty</KEYWORD1>
-			<KEYWORD1>environment</KEYWORD1>
-			<KEYWORD1>eof</KEYWORD1>
-			<KEYWORD1>erase</KEYWORD1>
-			<KEYWORD1>erode</KEYWORD1>
-			<KEYWORD1>errorf</KEYWORD1>
-			<KEYWORD1>errplot</KEYWORD1>
-			<KEYWORD1>euclidean</KEYWORD1>
-			<KEYWORD1>exec_on_select</KEYWORD1>
-			<KEYWORD1>execute</KEYWORD1>
-			<KEYWORD1>exp</KEYWORD1>
-			<KEYWORD1>expand</KEYWORD1>
-			<KEYWORD1>expon</KEYWORD1>
-			<KEYWORD1>extrema</KEYWORD1>
-			<KEYWORD1>factor</KEYWORD1>
-			<KEYWORD1>fast_grid2</KEYWORD1>
-			<KEYWORD1>fast_grid3</KEYWORD1>
-			<KEYWORD1>fast_grid4</KEYWORD1>
-			<KEYWORD1>fft</KEYWORD1>
-			<KEYWORD1>filepath</KEYWORD1>
-			<KEYWORD1>findfile</KEYWORD1>
-			<KEYWORD1>findgen</KEYWORD1>
-			<KEYWORD1>finite</KEYWORD1>
-			<KEYWORD1>fix</KEYWORD1>
-			<KEYWORD1>float</KEYWORD1>
-			<KEYWORD1>fltarr</KEYWORD1>
-			<KEYWORD1>flush</KEYWORD1>
-			<KEYWORD1>free_lun</KEYWORD1>
-			<KEYWORD1>fstat</KEYWORD1>
-			<KEYWORD1>funct</KEYWORD1>
-			<KEYWORD1>gamma</KEYWORD1>
-			<KEYWORD1>gaussfit</KEYWORD1>
-			<KEYWORD1>gaussint</KEYWORD1>
-			<KEYWORD1>gcd</KEYWORD1>
-			<KEYWORD1>get_kbrd</KEYWORD1>
-			<KEYWORD1>get_lun</KEYWORD1>
-			<KEYWORD1>getenv</KEYWORD1>
-			<KEYWORD1>get_named_color</KEYWORD1>
-			<KEYWORD1>getncerr</KEYWORD1>
-			<KEYWORD1>getncopts</KEYWORD1>
-			<KEYWORD1>getparam</KEYWORD1>
-			<KEYWORD1>great_int</KEYWORD1>
-			<KEYWORD1>grid</KEYWORD1>
-			<KEYWORD1>grid_2d</KEYWORD1>
-			<KEYWORD1>grid_3d</KEYWORD1>
-			<KEYWORD1>grid_4d</KEYWORD1>
-			<KEYWORD1>grid_sphere</KEYWORD1>
-			<KEYWORD1>gridn</KEYWORD1>
-			<KEYWORD1>group_by</KEYWORD1>
-			<KEYWORD1>hak</KEYWORD1>
-			<KEYWORD1>hanning</KEYWORD1>
-			<KEYWORD1>hdf_test</KEYWORD1>
-			<KEYWORD1>hdfgetsds</KEYWORD1>
-			<KEYWORD1>help</KEYWORD1>
-			<KEYWORD1>hilbert</KEYWORD1>
-			<KEYWORD1>hist_equal</KEYWORD1>
-			<KEYWORD1>hist_equal_ct</KEYWORD1>
-			<KEYWORD1>histn</KEYWORD1>
-			<KEYWORD1>histogram</KEYWORD1>
-			<KEYWORD1>hls</KEYWORD1>
-			<KEYWORD1>hsv</KEYWORD1>
-			<KEYWORD1>hsv_to_rgd</KEYWORD1>
-			<KEYWORD1>image_check</KEYWORD1>
-			<KEYWORD1>image_color_quant</KEYWORD1>
-			<KEYWORD1>image_cont</KEYWORD1>
-			<KEYWORD1>image_create</KEYWORD1>
-			<KEYWORD1>image_display</KEYWORD1>
-			<KEYWORD1>image_filetypes</KEYWORD1>
-			<KEYWORD1>image_query_file</KEYWORD1>
-			<KEYWORD1>image_read</KEYWORD1>
-			<KEYWORD1>image_write</KEYWORD1>
-			<KEYWORD1>imaginary</KEYWORD1>
-			<KEYWORD1>img_true8</KEYWORD1>
-			<KEYWORD1>index_and</KEYWORD1>
-			<KEYWORD1>index_conv</KEYWORD1>
-			<KEYWORD1>index_or</KEYWORD1>
-			<KEYWORD1>indgen</KEYWORD1>
-			<KEYWORD1>intarr</KEYWORD1>
-			<KEYWORD1>interpol</KEYWORD1>
-			<KEYWORD1>interpolate</KEYWORD1>
-			<KEYWORD1>intrp</KEYWORD1>
-			<KEYWORD1>invert</KEYWORD1>
-			<KEYWORD1>isaskey</KEYWORD1>
-			<KEYWORD1>ishft</KEYWORD1>
-			<KEYWORD1>jacobian</KEYWORD1>
-			<KEYWORD1>jul_to_dt</KEYWORD1>
-			<KEYWORD1>keyword_set</KEYWORD1>
-			<KEYWORD1>lcm</KEYWORD1>
-			<KEYWORD1>leefilt</KEYWORD1>
-			<KEYWORD1>legend</KEYWORD1>
-			<KEYWORD1>lindgen</KEYWORD1>
-			<KEYWORD1>linknload</KEYWORD1>
-			<KEYWORD1>list</KEYWORD1>
-			<KEYWORD1>listarr</KEYWORD1>
-			<KEYWORD1>load_holidays</KEYWORD1>
-			<KEYWORD1>load_option</KEYWORD1>
-			<KEYWORD1>load_weekends</KEYWORD1>
-			<KEYWORD1>loadct</KEYWORD1>
-			<KEYWORD1>loadct_custom</KEYWORD1>
-			<KEYWORD1>loadresources</KEYWORD1>
-			<KEYWORD1>loadstrings</KEYWORD1>
-			<KEYWORD1>lonarr</KEYWORD1>
-			<KEYWORD1>long</KEYWORD1>
-			<KEYWORD1>lubksb</KEYWORD1>
-			<KEYWORD1>ludcmp</KEYWORD1>
-			<KEYWORD1>make_array</KEYWORD1>
-			<KEYWORD1>map</KEYWORD1>
-			<KEYWORD1>map_axes</KEYWORD1>
-			<KEYWORD1>map_contour</KEYWORD1>
-			<KEYWORD1>map_grid</KEYWORD1>
-			<KEYWORD1>map_plots</KEYWORD1>
-			<KEYWORD1>map_polyfill</KEYWORD1>
-			<KEYWORD1>map_proj</KEYWORD1>
-			<KEYWORD1>map_reverse</KEYWORD1>
-			<KEYWORD1>map_velovect</KEYWORD1>
-			<KEYWORD1>map_version</KEYWORD1>
-			<KEYWORD1>map_xyouts</KEYWORD1>
-			<KEYWORD1>max</KEYWORD1>
-			<KEYWORD1>median</KEYWORD1>
-			<KEYWORD1>mesh</KEYWORD1>
-			<KEYWORD1>message</KEYWORD1>
-			<KEYWORD1>min</KEYWORD1>
-			<KEYWORD1>modifyct</KEYWORD1>
-			<KEYWORD1>molec</KEYWORD1>
-			<KEYWORD1>moment</KEYWORD1>
-			<KEYWORD1>month_name</KEYWORD1>
-			<KEYWORD1>movie</KEYWORD1>
-			<KEYWORD1>mprove</KEYWORD1>
-			<KEYWORD1>msword_cgm_setup</KEYWORD1>
-			<KEYWORD1>n_elements</KEYWORD1>
-			<KEYWORD1>n_params</KEYWORD1>
-			<KEYWORD1>n_tags</KEYWORD1>
-			<KEYWORD1>nint</KEYWORD1>
-			<KEYWORD1>normals</KEYWORD1>
-			<KEYWORD1>null_processor</KEYWORD1>
-			<KEYWORD1>openr</KEYWORD1>
-			<KEYWORD1>openu</KEYWORD1>
-			<KEYWORD1>openw</KEYWORD1>
-			<KEYWORD1>oplot</KEYWORD1>
-			<KEYWORD1>oploterr</KEYWORD1>
-			<KEYWORD1>option_is_loaded</KEYWORD1>
-			<KEYWORD1>order_by</KEYWORD1>
-			<KEYWORD1>padit</KEYWORD1>
-			<KEYWORD1>packimage</KEYWORD1>
-			<KEYWORD1>packtable</KEYWORD1>
-			<KEYWORD1>palette</KEYWORD1>
-			<KEYWORD1>param_present</KEYWORD1>
-			<KEYWORD1>parsefilename</KEYWORD1>
-			<KEYWORD1>pie</KEYWORD1>
-			<KEYWORD1>pie_chart</KEYWORD1>
-			<KEYWORD1>plot</KEYWORD1>
-			<KEYWORD1>plot_field</KEYWORD1>
-			<KEYWORD1>plot_histogram</KEYWORD1>
-			<KEYWORD1>plot_io</KEYWORD1>
-			<KEYWORD1>plot_oi</KEYWORD1>
-			<KEYWORD1>plot_oo</KEYWORD1>
-			<KEYWORD1>plot_windrose</KEYWORD1>
-			<KEYWORD1>ploterr</KEYWORD1>
-			<KEYWORD1>plots</KEYWORD1>
-			<KEYWORD1>pm</KEYWORD1>
-			<KEYWORD1>pmf</KEYWORD1>
-			<KEYWORD1>point_lun</KEYWORD1>
-			<KEYWORD1>poly</KEYWORD1>
-			<KEYWORD1>poly_2d</KEYWORD1>
-			<KEYWORD1>poly_area</KEYWORD1>
-			<KEYWORD1>poly_c_conv</KEYWORD1>
-			<KEYWORD1>poly_count</KEYWORD1>
-			<KEYWORD1>poly_dev</KEYWORD1>
-			<KEYWORD1>poly_fit</KEYWORD1>
-			<KEYWORD1>poly_merge</KEYWORD1>
-			<KEYWORD1>poly_norm</KEYWORD1>
-			<KEYWORD1>poly_plot</KEYWORD1>
-			<KEYWORD1>poly_sphere</KEYWORD1>
-			<KEYWORD1>poly_surf</KEYWORD1>
-			<KEYWORD1>poly_trans</KEYWORD1>
-			<KEYWORD1>polyfill</KEYWORD1>
-			<KEYWORD1>polyfillv</KEYWORD1>
-			<KEYWORD1>polyfitw</KEYWORD1>
-			<KEYWORD1>polyshade</KEYWORD1>
-			<KEYWORD1>polywarp</KEYWORD1>
-			<KEYWORD1>popd</KEYWORD1>
-			<KEYWORD1>prime</KEYWORD1>
-			<KEYWORD1>print</KEYWORD1>
-			<KEYWORD1>printd</KEYWORD1>
-			<KEYWORD1>printf</KEYWORD1>
-			<KEYWORD1>profile</KEYWORD1>
-			<KEYWORD1>profiles</KEYWORD1>
-			<KEYWORD1>prompt</KEYWORD1>
-			<KEYWORD1>pseudo</KEYWORD1>
-			<KEYWORD1>pushd</KEYWORD1>
-			<KEYWORD1>query_table</KEYWORD1>
-			<KEYWORD1>randomn</KEYWORD1>
-			<KEYWORD1>randomu</KEYWORD1>
-			<KEYWORD1>rdpix</KEYWORD1>
-			<KEYWORD1>read</KEYWORD1>
-			<KEYWORD1>read_airs</KEYWORD1>
-			<KEYWORD1>read_xbm</KEYWORD1>
-			<KEYWORD1>readf</KEYWORD1>
-			<KEYWORD1>readu</KEYWORD1>
-			<KEYWORD1>rebin</KEYWORD1>
-			<KEYWORD1>reform</KEYWORD1>
-			<KEYWORD1>regress</KEYWORD1>
-			<KEYWORD1>rename</KEYWORD1>
-			<KEYWORD1>render</KEYWORD1>
-			<KEYWORD1>render24</KEYWORD1>
-			<KEYWORD1>replicate</KEYWORD1>
-			<KEYWORD1>replv</KEYWORD1>
-			<KEYWORD1>resamp</KEYWORD1>
-			<KEYWORD1>reverse</KEYWORD1>
-			<KEYWORD1>rgb_to_hsv</KEYWORD1>
-			<KEYWORD1>rm</KEYWORD1>
-			<KEYWORD1>rmf</KEYWORD1>
-			<KEYWORD1>roberts</KEYWORD1>
-			<KEYWORD1>rot</KEYWORD1>
-			<KEYWORD1>rot_int</KEYWORD1>
-			<KEYWORD1>rotate</KEYWORD1>
-			<KEYWORD1>same</KEYWORD1>
-			<KEYWORD1>scale3d</KEYWORD1>
-			<KEYWORD1>sec_to_dt</KEYWORD1>
-			<KEYWORD1>select_read_lun</KEYWORD1>
-			<KEYWORD1>set_plot</KEYWORD1>
-			<KEYWORD1>set_screen</KEYWORD1>
-			<KEYWORD1>set_shading</KEYWORD1>
-			<KEYWORD1>set_symbol</KEYWORD1>
-			<KEYWORD1>set_view3d</KEYWORD1>
-			<KEYWORD1>set_viewport</KEYWORD1>
-			<KEYWORD1>set_xy</KEYWORD1>
-			<KEYWORD1>setdemo</KEYWORD1>
-			<KEYWORD1>setenv</KEYWORD1>
-			<KEYWORD1>setimagesize</KEYWORD1>
-			<KEYWORD1>setlog</KEYWORD1>
-			<KEYWORD1>setncopts</KEYWORD1>
-			<KEYWORD1>setup_keys</KEYWORD1>
-			<KEYWORD1>sgn</KEYWORD1>
-			<KEYWORD1>shade_surf</KEYWORD1>
-			<KEYWORD1>shade_surf_irr</KEYWORD1>
-			<KEYWORD1>shade_volume</KEYWORD1>
-			<KEYWORD1>shif</KEYWORD1>
-			<KEYWORD1>shift</KEYWORD1>
-			<KEYWORD1>show_options</KEYWORD1>
-			<KEYWORD1>show3</KEYWORD1>
-			<KEYWORD1>sigma</KEYWORD1>
-			<KEYWORD1>sin</KEYWORD1>
-			<KEYWORD1>sindgen</KEYWORD1>
-			<KEYWORD1>sinh</KEYWORD1>
-			<KEYWORD1>size</KEYWORD1>
-			<KEYWORD1>skipf</KEYWORD1>
-			<KEYWORD1>slice</KEYWORD1>
-			<KEYWORD1>slice_vol</KEYWORD1>
-			<KEYWORD1>small_int</KEYWORD1>
-			<KEYWORD1>smooth</KEYWORD1>
-			<KEYWORD1>sobel</KEYWORD1>
-			<KEYWORD1>socket_accept</KEYWORD1>
-			<KEYWORD1>socket_close</KEYWORD1>
-			<KEYWORD1>socket_connect</KEYWORD1>
-			<KEYWORD1>socket_getport</KEYWORD1>
-			<KEYWORD1>socket_init</KEYWORD1>
-			<KEYWORD1>socket_read</KEYWORD1>
-			<KEYWORD1>socket_write</KEYWORD1>
-			<KEYWORD1>sort</KEYWORD1>
-			<KEYWORD1>sortn</KEYWORD1>
-			<KEYWORD1>spawn</KEYWORD1>
-			<KEYWORD1>sphere</KEYWORD1>
-			<KEYWORD1>spline</KEYWORD1>
-			<KEYWORD1>sqrt</KEYWORD1>
-			<KEYWORD1>stdev</KEYWORD1>
-			<KEYWORD1>str_to_dt</KEYWORD1>
-			<KEYWORD1>strarr</KEYWORD1>
-			<KEYWORD1>strcompress</KEYWORD1>
-			<KEYWORD1>stretch</KEYWORD1>
-			<KEYWORD1>string</KEYWORD1>
-			<KEYWORD1>strjoin</KEYWORD1>
-			<KEYWORD1>strlen</KEYWORD1>
-			<KEYWORD1>strlookup</KEYWORD1>
-			<KEYWORD1>strlowcase</KEYWORD1>
-			<KEYWORD1>strmatch</KEYWORD1>
-			<KEYWORD1>strmessage</KEYWORD1>
-			<KEYWORD1>strmid</KEYWORD1>
-			<KEYWORD1>strpos</KEYWORD1>
-			<KEYWORD1>strput</KEYWORD1>
-			<KEYWORD1>strsplit</KEYWORD1>
-			<KEYWORD1>strsubst</KEYWORD1>
-			<KEYWORD1>strtrim</KEYWORD1>
-			<KEYWORD1>structref</KEYWORD1>
-			<KEYWORD1>strupcase</KEYWORD1>
-			<KEYWORD1>sum</KEYWORD1>
-			<KEYWORD1>surface</KEYWORD1>
-			<KEYWORD1>surface_fit</KEYWORD1>
-			<KEYWORD1>surfr</KEYWORD1>
-			<KEYWORD1>svbksb</KEYWORD1>
-			<KEYWORD1>svd</KEYWORD1>
-			<KEYWORD1>svdfit</KEYWORD1>
-			<KEYWORD1>systime</KEYWORD1>
-			<KEYWORD1>t3d</KEYWORD1>
-			<KEYWORD1>tag_names</KEYWORD1>
-			<KEYWORD1>tan</KEYWORD1>
-			<KEYWORD1>tanh</KEYWORD1>
-			<KEYWORD1>tek_color</KEYWORD1>
-			<KEYWORD1>tensor_add</KEYWORD1>
-			<KEYWORD1>tensor_div</KEYWORD1>
-			<KEYWORD1>tensor_eq</KEYWORD1>
-			<KEYWORD1>tensor_exp</KEYWORD1>
-			<KEYWORD1>tensor_ge</KEYWORD1>
-			<KEYWORD1>tensor_gt</KEYWORD1>
-			<KEYWORD1>tensor_le</KEYWORD1>
-			<KEYWORD1>tensor_lt</KEYWORD1>
-			<KEYWORD1>tensor_max</KEYWORD1>
-			<KEYWORD1>tensor_min</KEYWORD1>
-			<KEYWORD1>tensor_mod</KEYWORD1>
-			<KEYWORD1>tensor_mul</KEYWORD1>
-			<KEYWORD1>tensor_ne</KEYWORD1>
-			<KEYWORD1>tensor_sub</KEYWORD1>
-			<KEYWORD1>threed</KEYWORD1>
-			<KEYWORD1>today</KEYWORD1>
-			<KEYWORD1>total</KEYWORD1>
-			<KEYWORD1>tqli</KEYWORD1>
-			<KEYWORD1>transpose</KEYWORD1>
-			<KEYWORD1>tred2</KEYWORD1>
-			<KEYWORD1>tridag</KEYWORD1>
-			<KEYWORD1>tv</KEYWORD1>
-			<KEYWORD1>tvcrs</KEYWORD1>
-			<KEYWORD1>tvlct</KEYWORD1>
-			<KEYWORD1>tvrd</KEYWORD1>
-			<KEYWORD1>tvscl</KEYWORD1>
-			<KEYWORD1>tvsize</KEYWORD1>
-			<KEYWORD1>uniqn</KEYWORD1>
-			<KEYWORD1>unique</KEYWORD1>
-			<KEYWORD1>unix_listen</KEYWORD1>
-			<KEYWORD1>unix_reply</KEYWORD1>
-			<KEYWORD1>unload_option</KEYWORD1>
-			<KEYWORD1>upvar</KEYWORD1>
-			<KEYWORD1>usersym</KEYWORD1>
-			<KEYWORD1>usgs_names</KEYWORD1>
-			<KEYWORD1>value_length</KEYWORD1>
-			<KEYWORD1>var_match</KEYWORD1>
-			<KEYWORD1>var_to_dt</KEYWORD1>
-			<KEYWORD1>vector_field3</KEYWORD1>
-			<KEYWORD1>vel</KEYWORD1>
-			<KEYWORD1>velovect</KEYWORD1>
-			<KEYWORD1>viewer</KEYWORD1>
-			<KEYWORD1>vol_marker</KEYWORD1>
-			<KEYWORD1>vol_pad</KEYWORD1>
-			<KEYWORD1>vol_red</KEYWORD1>
-			<KEYWORD1>vol_trans</KEYWORD1>
-			<KEYWORD1>volume</KEYWORD1>
-			<KEYWORD1>vtkaddattribute</KEYWORD1>
-			<KEYWORD1>vtkaxes</KEYWORD1>
-			<KEYWORD1>vtkcamera</KEYWORD1>
-			<KEYWORD1>vtkclose</KEYWORD1>
-			<KEYWORD1>vtkcolorbar</KEYWORD1>
-			<KEYWORD1>vtkcolornames</KEYWORD1>
-			<KEYWORD1>vtkcommand</KEYWORD1>
-			<KEYWORD1>vtkerase</KEYWORD1>
-			<KEYWORD1>vtkformat</KEYWORD1>
-			<KEYWORD1>vtkgrid</KEYWORD1>
-			<KEYWORD1>vtkhedgehog</KEYWORD1>
-			<KEYWORD1>vtkinit</KEYWORD1>
-			<KEYWORD1>vtklight</KEYWORD1>
-			<KEYWORD1>vtkplots</KEYWORD1>
-			<KEYWORD1>vtkpolydata</KEYWORD1>
-			<KEYWORD1>vtkpolyformat</KEYWORD1>
-			<KEYWORD1>vtkpolyshade</KEYWORD1>
-			<KEYWORD1>vtkppmread</KEYWORD1>
-			<KEYWORD1>vtkppmwrite</KEYWORD1>
-			<KEYWORD1>vtkreadvtk</KEYWORD1>
-			<KEYWORD1>vtkrectilineargrid</KEYWORD1>
-			<KEYWORD1>vtkrenderwindow</KEYWORD1>
-			<KEYWORD1>vtkscatter</KEYWORD1>
-			<KEYWORD1>vtkslicevol</KEYWORD1>
-			<KEYWORD1>vtkstructuredpoints</KEYWORD1>
-			<KEYWORD1>vtkstructuredgrid</KEYWORD1>
-			<KEYWORD1>vtksurface</KEYWORD1>
-			<KEYWORD1>vtksurfgen</KEYWORD1>
-			<KEYWORD1>vtktext</KEYWORD1>
-			<KEYWORD1>vtktvrd</KEYWORD1>
-			<KEYWORD1>vtkunstructuredgrid</KEYWORD1>
-			<KEYWORD1>vtkwdelete</KEYWORD1>
-			<KEYWORD1>vtkwindow</KEYWORD1>
-			<KEYWORD1>vtkwritevrml</KEYWORD1>
-			<KEYWORD1>vtkwset</KEYWORD1>
-			<KEYWORD1>wait</KEYWORD1>
-			<KEYWORD1>wavedatamanager</KEYWORD1>
-			<KEYWORD1>waveserver</KEYWORD1>
-			<KEYWORD1>wcopy</KEYWORD1>
-			<KEYWORD1>wdelete</KEYWORD1>
-			<KEYWORD1>where</KEYWORD1>
-			<KEYWORD1>wherein</KEYWORD1>
-			<KEYWORD1>window</KEYWORD1>
-			<KEYWORD1>wmenu</KEYWORD1>
-			<KEYWORD1>wpaste</KEYWORD1>
-			<KEYWORD1>wprint</KEYWORD1>
-			<KEYWORD1>wread_dib</KEYWORD1>
-			<KEYWORD1>wread_meta</KEYWORD1>
-			<KEYWORD1>write_xbm</KEYWORD1>
-			<KEYWORD1>writeu</KEYWORD1>
-			<KEYWORD1>wset</KEYWORD1>
-			<KEYWORD1>whow</KEYWORD1>
-			<KEYWORD1>wwrite_dib</KEYWORD1>
-			<KEYWORD1>wwrite_meta</KEYWORD1>
-			<KEYWORD1>xyouts</KEYWORD1>
-			<KEYWORD1>zoom</KEYWORD1>
-			<KEYWORD1>zroots</KEYWORD1>
-		<!--KEYWORD2s are PV-WAVE keywords -->
-			<KEYWORD2>begin</KEYWORD2>
-			<KEYWORD2>breakpoint</KEYWORD2>
-			<KEYWORD2>case</KEYWORD2>
-			<KEYWORD2>common</KEYWORD2>
-			<KEYWORD2>compile</KEYWORD2>
-			<KEYWORD2>declare</KEYWORD2>
-			<KEYWORD2>do</KEYWORD2>
-			<KEYWORD2>else</KEYWORD2>
-			<KEYWORD2>end</KEYWORD2>
-			<KEYWORD2>endcase</KEYWORD2>
-			<KEYWORD2>endelse</KEYWORD2>
-			<KEYWORD2>endfor</KEYWORD2>
-			<KEYWORD2>endif</KEYWORD2>
-			<KEYWORD2>endrepeat</KEYWORD2>
-			<KEYWORD2>endwhile</KEYWORD2>
-			<KEYWORD2>exit</KEYWORD2>
-			<KEYWORD2>for</KEYWORD2>
-			<KEYWORD2>func</KEYWORD2>
-			<KEYWORD2>function</KEYWORD2>
-			<KEYWORD2>goto</KEYWORD2>
-			<KEYWORD2>help</KEYWORD2>
-			<KEYWORD2>if</KEYWORD2>
-			<KEYWORD2>info</KEYWORD2>
-			<KEYWORD2>journal</KEYWORD2>
-			<KEYWORD2>locals</KEYWORD2>
-			<KEYWORD2>of</KEYWORD2>
-			<KEYWORD2>on_error</KEYWORD2>
-			<KEYWORD2>on_error_goto</KEYWORD2>
-			<KEYWORD2>on_ioerror</KEYWORD2>
-			<KEYWORD2>pro</KEYWORD2>
-			<KEYWORD2>quit</KEYWORD2>
-			<KEYWORD2>repeat</KEYWORD2>
-			<KEYWORD2>restore</KEYWORD2>
-			<KEYWORD2>retall</KEYWORD2>
-			<KEYWORD2>return</KEYWORD2>
-			<KEYWORD2>save</KEYWORD2>
-			<KEYWORD2>stop</KEYWORD2>
-			<KEYWORD2>then</KEYWORD2>
-			<KEYWORD2>while</KEYWORD2>
-		<!-- KEYWORD3s are binary ops and Widget stuff -->
-			<KEYWORD3>and</KEYWORD3>
-			<KEYWORD3>not</KEYWORD3>
-			<KEYWORD3>or</KEYWORD3>
-			<KEYWORD3>xor</KEYWORD3>
-			<KEYWORD3>eq</KEYWORD3>
-			<KEYWORD3>ne</KEYWORD3>
-			<KEYWORD3>gt</KEYWORD3>
-			<KEYWORD3>lt</KEYWORD3>
-			<KEYWORD3>ge</KEYWORD3>
-			<KEYWORD3>le</KEYWORD3>
-			<KEYWORD3>mod</KEYWORD3>
-			<KEYWORD3>WgAnimateTool</KEYWORD3>
-			<KEYWORD3>WgCbarTool</KEYWORD3>
-			<KEYWORD3>WgCtTool</KEYWORD3>
-			<KEYWORD3>WgIsoSurfTool</KEYWORD3>
-			<KEYWORD3>WgMovieTool</KEYWORD3>
-			<KEYWORD3>WgSimageTool</KEYWORD3>
-			<KEYWORD3>WgSliceTool</KEYWORD3>
-			<KEYWORD3>WgSurfaceTool</KEYWORD3>
-			<KEYWORD3>WgTextTool</KEYWORD3>
-			<KEYWORD3>WoAddButtons</KEYWORD3>
-			<KEYWORD3>WoAddMessage</KEYWORD3>
-			<KEYWORD3>WoAddStatus</KEYWORD3>
-			<KEYWORD3>WoButtonBar</KEYWORD3>
-			<KEYWORD3>WoCheckFile</KEYWORD3>
-			<KEYWORD3>WoColorButton</KEYWORD3>
-			<KEYWORD3>WoColorConvert</KEYWORD3>
-			<KEYWORD3>WoColorGrid</KEYWORD3>
-			<KEYWORD3>WoColorWheel</KEYWORD3>
-			<KEYWORD3>WoConfirmClose</KEYWORD3>
-			<KEYWORD3>WoDialogStatus</KEYWORD3>
-			<KEYWORD3>WoFontOptionMenu</KEYWORD3>
-			<KEYWORD3>WoGenericDialog</KEYWORD3>
-			<KEYWORD3>WoLabeledText</KEYWORD3>
-			<KEYWORD3>WoMenuBar</KEYWORD3>
-			<KEYWORD3>WoMessage</KEYWORD3>
-			<KEYWORD3>WoSaveAsPixmap</KEYWORD3>
-			<KEYWORD3>WoSetCursor</KEYWORD3>
-			<KEYWORD3>WoSetWindowTitle</KEYWORD3>
-			<KEYWORD3>WoStatus</KEYWORD3>
-			<KEYWORD3>WoVariableOptionMenu</KEYWORD3>
-			<KEYWORD3>WtAddCallback</KEYWORD3>
-			<KEYWORD3>WtAddHandler</KEYWORD3>
-			<KEYWORD3>WtCursor</KEYWORD3>
-			<KEYWORD3>WtGet</KEYWORD3>
-			<KEYWORD3>WtPointer</KEYWORD3>
-			<KEYWORD3>WtSet</KEYWORD3>
-			<KEYWORD3>WtTimer</KEYWORD3>
-			<KEYWORD3>WwAlert</KEYWORD3>
-			<KEYWORD3>WwAlertPopdown</KEYWORD3>
-			<KEYWORD3>WwButtonBox</KEYWORD3>
-			<KEYWORD3>WwCallback</KEYWORD3>
-			<KEYWORD3>WwControlsBox</KEYWORD3>
-			<KEYWORD3>WwDialog</KEYWORD3>
-			<KEYWORD3>WwDrawing</KEYWORD3>
-			<KEYWORD3>WwFileSelection</KEYWORD3>
-			<KEYWORD3>WwGenericDialog</KEYWORD3>
-			<KEYWORD3>WwGetButton</KEYWORD3>
-			<KEYWORD3>WwGetKey</KEYWORD3>
-			<KEYWORD3>WwGetPosition</KEYWORD3>
-			<KEYWORD3>WwGetValue</KEYWORD3>
-			<KEYWORD3>WwHandler</KEYWORD3>
-			<KEYWORD3>WwInit</KEYWORD3>
-			<KEYWORD3>WwLayout</KEYWORD3>
-			<KEYWORD3>WwList</KEYWORD3>
-			<KEYWORD3>WwListUtils</KEYWORD3>
-			<KEYWORD3>WwLoop</KEYWORD3>
-			<KEYWORD3>WwMainWindow</KEYWORD3>
-			<KEYWORD3>WwMenuBar</KEYWORD3>
-			<KEYWORD3>WwMenuItem</KEYWORD3>
-			<KEYWORD3>WwMessage</KEYWORD3>
-			<KEYWORD3>WwMultiClickHandler</KEYWORD3>
-			<KEYWORD3>WwOptionMenu</KEYWORD3>
-			<KEYWORD3>WwPickFile</KEYWORD3>
-			<KEYWORD3>WwPopupMenu</KEYWORD3>
-			<KEYWORD3>WwPreview</KEYWORD3>
-			<KEYWORD3>WwPreviewUtils</KEYWORD3>
-			<KEYWORD3>WwRadioBox</KEYWORD3>
-			<KEYWORD3>WwResource</KEYWORD3>
-			<KEYWORD3>WwSeparator</KEYWORD3>
-			<KEYWORD3>WwSetCursor</KEYWORD3>
-			<KEYWORD3>WwSetValue</KEYWORD3>
-			<KEYWORD3>WwTable</KEYWORD3>
-			<KEYWORD3>WwTableUtils</KEYWORD3>
-			<KEYWORD3>WwText</KEYWORD3>
-			<KEYWORD3>WwTimer</KEYWORD3>
-			<KEYWORD3>WwToolBox</KEYWORD3>
-			<KEYWORD3>WzAnimate</KEYWORD3>
-			<KEYWORD3>WzColorEdit</KEYWORD3>
-			<KEYWORD3>WzContour</KEYWORD3>
-			<KEYWORD3>WzExport</KEYWORD3>
-			<KEYWORD3>WzHistogram</KEYWORD3>
-			<KEYWORD3>WzImage</KEYWORD3>
-			<KEYWORD3>WzImport</KEYWORD3>
-			<KEYWORD3>WzMultiView</KEYWORD3>
-			<KEYWORD3>WzPlot</KEYWORD3>
-			<KEYWORD3>WzPreview</KEYWORD3>
-			<KEYWORD3>WzSurface</KEYWORD3>
-			<KEYWORD3>WzTable</KEYWORD3>
-			<KEYWORD3>WzVariable</KEYWORD3>
-		</KEYWORDS>
-	</RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/pyrex.xml b/qpython/src/main/assets/syntax/pyrex.xml
deleted file mode 100644
index 3e32ff29..00000000
--- a/qpython/src/main/assets/syntax/pyrex.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="indentNextLines" VALUE="\s*[^#]{3,}:\s*(#.*)?" />
-		<PROPERTY NAME="lineComment" VALUE="#" />
-	</PROPS>
-	<RULES IGNORE_CASE="FALSE" HIGHLIGHT_DIGITS="TRUE">
-
-		<IMPORT DELEGATE="python::MAIN"/>
-
-		<KEYWORDS>
-			<KEYWORD4>cdef</KEYWORD4>
-			<KEYWORD4>char</KEYWORD4>
-			<KEYWORD4>cinclude</KEYWORD4>
-			<KEYWORD4>ctypedef</KEYWORD4>
-			<KEYWORD4>double</KEYWORD4>
-			<KEYWORD4>enum</KEYWORD4>
-			<KEYWORD4>extern</KEYWORD4>
-			<KEYWORD4>float</KEYWORD4>
-			<KEYWORD4>include</KEYWORD4>
-			<KEYWORD4>private</KEYWORD4>
-			<KEYWORD4>public</KEYWORD4>
-			<KEYWORD4>short</KEYWORD4>
-			<KEYWORD4>signed</KEYWORD4>
-			<KEYWORD4>sizeof</KEYWORD4>
-			<KEYWORD4>struct</KEYWORD4>
-			<KEYWORD4>union</KEYWORD4>
-			<KEYWORD4>unsigned</KEYWORD4>
-			<KEYWORD4>void</KEYWORD4>
-
-			<LITERAL3>NULL</LITERAL3>
-		</KEYWORDS>
-	</RULES>
-</MODE>
-
diff --git a/qpython/src/main/assets/syntax/python.xml b/qpython/src/main/assets/syntax/python.xml
index 29174ded..418c78ef 100644
--- a/qpython/src/main/assets/syntax/python.xml
+++ b/qpython/src/main/assets/syntax/python.xml
@@ -7,7 +7,7 @@
 
 <!-- Modified 19-Jul-00 by Ivan Frohne to: -->
 <!--  (a) implement 'indentOnEnter'; -->
-<!--  (b) indent next line automatically after control structures followed -->
+<!--  (b) indent nPATTERN_LINEline automatically after control structures followed -->
 <!--	  by ':'; -->
 <!--  (c) make """ or ''' multiline quotes TYPE LITERAL2; -->
 <!--  (d) add TYPE FUNCTION identified by a following '(' -->
diff --git a/qpython/src/main/assets/syntax/quake.xml b/qpython/src/main/assets/syntax/quake.xml
deleted file mode 100644
index 1d516f35..00000000
--- a/qpython/src/main/assets/syntax/quake.xml
+++ /dev/null
@@ -1,485 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!--
-	Quake mode by Marcus Augustine <mail [at] ma [dash] online [dot] net>
--->
-<MODE>
-    <PROPS>
-        <PROPERTY NAME="commentStart" VALUE="/*" />
-        <PROPERTY NAME="commentEnd" VALUE="*/" />
-        <PROPERTY NAME="lineComment" VALUE="//" />
-    </PROPS>
-
-    <RULES IGNORE_CASE="TRUE">
-            <SPAN TYPE="LITERAL1" NO_LINE_BREAK="TRUE">
-                <BEGIN>"</BEGIN>
-                <END>"</END>
-            </SPAN>
-            
-            <SPAN TYPE="LITERAL1" NO_LINE_BREAK="TRUE">
-                <BEGIN>'</BEGIN>
-                <END>'</END>
-            </SPAN>
-            
-            <SPAN TYPE="COMMENT1">
-                <BEGIN>/*</BEGIN>
-                <END>*/</END>
-            </SPAN>
-            
-             <EOL_SPAN TYPE="COMMENT2">//</EOL_SPAN>
-            
-            <KEYWORDS>
-                <KEYWORD2>+attack</KEYWORD2>
-                <KEYWORD2>+back</KEYWORD2>
-                <KEYWORD2>+forward</KEYWORD2>
-                <KEYWORD2>+klook</KEYWORD2>
-                <KEYWORD2>+left</KEYWORD2>
-                <KEYWORD2>+lookdown</KEYWORD2>
-                <KEYWORD2>+lookup</KEYWORD2>
-                <KEYWORD2>+mlook</KEYWORD2>
-                <KEYWORD2>+movedown</KEYWORD2>
-                <KEYWORD2>+moveleft</KEYWORD2>
-                <KEYWORD2>+moveright</KEYWORD2>
-                <KEYWORD2>+moveup</KEYWORD2>
-                <KEYWORD2>+right</KEYWORD2>
-                <KEYWORD2>+speed</KEYWORD2>
-                <KEYWORD2>+strafe</KEYWORD2>
-                <KEYWORD2>+use</KEYWORD2>
-                <KEYWORD2>-attack</KEYWORD2>
-                <KEYWORD2>-back</KEYWORD2>
-                <KEYWORD2>-forward</KEYWORD2>
-                <KEYWORD2>-klook</KEYWORD2>
-                <KEYWORD2>-left</KEYWORD2>
-                <KEYWORD2>-lookdown</KEYWORD2>
-                <KEYWORD2>-lookup</KEYWORD2>
-                <KEYWORD2>-mlook</KEYWORD2>
-                <KEYWORD2>-movedown</KEYWORD2>
-                <KEYWORD2>-moveleft</KEYWORD2>
-                <KEYWORD2>-moveright</KEYWORD2>
-                <KEYWORD2>-moveup</KEYWORD2>
-                <KEYWORD2>-right</KEYWORD2>
-                <KEYWORD2>-speed</KEYWORD2>
-                <KEYWORD2>-strafe</KEYWORD2>
-                <KEYWORD2>-use</KEYWORD2>
-                <KEYWORD3>adr0</KEYWORD3>
-                <KEYWORD3>adr1</KEYWORD3>
-                <KEYWORD3>adr2</KEYWORD3>
-                <KEYWORD3>adr3</KEYWORD3>
-                <KEYWORD3>adr4</KEYWORD3>
-                <KEYWORD3>adr5</KEYWORD3>
-                <KEYWORD3>adr6</KEYWORD3>
-                <KEYWORD3>adr7</KEYWORD3>
-                <KEYWORD3>adr8</KEYWORD3>
-                <KEYWORD3>alias</KEYWORD3>
-                <KEYWORD3>allow_download</KEYWORD3>
-                <KEYWORD3>allow_download_maps</KEYWORD3>
-                <KEYWORD3>allow_download_models</KEYWORD3>
-                <KEYWORD3>allow_download_players</KEYWORD3>
-                <KEYWORD3>allow_download_sounds</KEYWORD3>
-                <KEYWORD3>basedir</KEYWORD3>
-                <KEYWORD1>bind</KEYWORD1>
-                <KEYWORD3>bindlist</KEYWORD3>
-                <KEYWORD3>bob_pitch</KEYWORD3>
-                <KEYWORD3>bob_roll</KEYWORD3>
-                <KEYWORD3>bob_up</KEYWORD3>
-                <KEYWORD3>cd</KEYWORD3>
-                <KEYWORD3>cd_loopcount</KEYWORD3>
-                <KEYWORD3>cd_looptrack</KEYWORD3>
-                <KEYWORD3>cd_nocd</KEYWORD3>
-                <KEYWORD3>cddir</KEYWORD3>
-                <KEYWORD3>centerview</KEYWORD3>
-                <KEYWORD3>changing</KEYWORD3>
-                <KEYWORD3>cheats</KEYWORD3>
-                <KEYWORD3>cl_anglespeedkey</KEYWORD3>
-                <KEYWORD3>cl_autoskins</KEYWORD3>
-                <KEYWORD3>cl_blend</KEYWORD3>
-                <KEYWORD3>cl_entities</KEYWORD3>
-                <KEYWORD3>cl_footsteps</KEYWORD3>
-                <KEYWORD3>cl_forwardspeed</KEYWORD3>
-                <KEYWORD3>cl_gun</KEYWORD3>
-                <KEYWORD3>cl_lights</KEYWORD3>
-                <KEYWORD3>cl_maxfps</KEYWORD3>
-                <KEYWORD3>cl_nodelta</KEYWORD3>
-                <KEYWORD3>cl_noskins</KEYWORD3>
-                <KEYWORD3>cl_particles</KEYWORD3>
-                <KEYWORD3>cl_pitchspeed</KEYWORD3>
-                <KEYWORD3>cl_predict</KEYWORD3>
-                <KEYWORD3>cl_run</KEYWORD3>
-                <KEYWORD3>cl_showmiss</KEYWORD3>
-                <KEYWORD3>cl_shownet</KEYWORD3>
-                <KEYWORD3>cl_sidespeed</KEYWORD3>
-                <KEYWORD3>cl_stats</KEYWORD3>
-                <KEYWORD3>cl_stereo</KEYWORD3>
-                <KEYWORD3>cl_stereo_separation</KEYWORD3>
-                <KEYWORD3>cl_testblend</KEYWORD3>
-                <KEYWORD3>cl_testentities</KEYWORD3>
-                <KEYWORD3>cl_testlights</KEYWORD3>
-                <KEYWORD3>cl_testparticles</KEYWORD3>
-                <KEYWORD3>cl_timeout</KEYWORD3>
-                <KEYWORD3>cl_upspeed</KEYWORD3>
-                <KEYWORD3>cl_vwep</KEYWORD3>
-                <KEYWORD3>cl_yawspeed</KEYWORD3>
-                <KEYWORD3>clear</KEYWORD3>
-                <KEYWORD3>clientport</KEYWORD3>
-                <KEYWORD3>cmd</KEYWORD3>
-                <KEYWORD3>cmdlist</KEYWORD3>
-                <KEYWORD3>con_notifytime</KEYWORD3>
-                <KEYWORD3>condump</KEYWORD3>
-                <KEYWORD3>connect</KEYWORD3>
-                <KEYWORD3>coop</KEYWORD3>
-                <KEYWORD3>crosshair</KEYWORD3>
-                <KEYWORD3>cvarlist</KEYWORD3>
-                <KEYWORD3>deathmatch</KEYWORD3>
-                <KEYWORD3>debuggraph</KEYWORD3>
-                <KEYWORD3>dedicated</KEYWORD3>
-                <KEYWORD3>demomap</KEYWORD3>
-                <KEYWORD3>developer</KEYWORD3>
-                <KEYWORD3>dir</KEYWORD3>
-                <KEYWORD3>disconnect</KEYWORD3>
-                <KEYWORD3>dmflags</KEYWORD3>
-                <KEYWORD3>download</KEYWORD3>
-                <KEYWORD3>drop</KEYWORD3>
-                <KEYWORD3>dumpuser</KEYWORD3>
-                <KEYWORD3>echo</KEYWORD3>
-                <KEYWORD3>error</KEYWORD3>
-                <KEYWORD3>exec</KEYWORD3>
-                <KEYWORD3>filterban</KEYWORD3>
-                <KEYWORD3>fixedtime</KEYWORD3>
-                <KEYWORD3>flood_msgs</KEYWORD3>
-                <KEYWORD3>flood_persecond</KEYWORD3>
-                <KEYWORD3>flood_waitdelay</KEYWORD3>
-                <KEYWORD3>flushmap</KEYWORD3>
-                <KEYWORD3>fov</KEYWORD3>
-                <KEYWORD3>fraglimit</KEYWORD3>
-                <KEYWORD3>freelook</KEYWORD3>
-                <KEYWORD3>g_select_empty</KEYWORD3>
-                <KEYWORD3>game</KEYWORD3>
-                <KEYWORD3>gamedate</KEYWORD3>
-                <KEYWORD3>gamedir</KEYWORD3>
-                <KEYWORD3>gamemap</KEYWORD3>
-                <KEYWORD3>gamename</KEYWORD3>
-                <KEYWORD3>gameversion</KEYWORD3>
-                <KEYWORD3>gender</KEYWORD3>
-                <KEYWORD3>gender_auto</KEYWORD3>
-                <KEYWORD3>give</KEYWORD3>
-                <KEYWORD3>gl_3dlabs_broken</KEYWORD3>
-                <KEYWORD3>gl_allow_software</KEYWORD3>
-                <KEYWORD3>gl_bitdepth</KEYWORD3>
-                <KEYWORD3>gl_clear</KEYWORD3>
-                <KEYWORD3>gl_cull</KEYWORD3>
-                <KEYWORD3>gl_drawbuffer</KEYWORD3>
-                <KEYWORD3>gl_driver</KEYWORD3>
-                <KEYWORD3>gl_dynamic</KEYWORD3>
-                <KEYWORD3>gl_ext_compiled_vertex_array</KEYWORD3>
-                <KEYWORD3>gl_ext_multitexture</KEYWORD3>
-                <KEYWORD3>gl_ext_palettedtexture</KEYWORD3>
-                <KEYWORD3>gl_ext_pointparameters</KEYWORD3>
-                <KEYWORD3>gl_ext_swapinterval</KEYWORD3>
-                <KEYWORD3>gl_finish</KEYWORD3>
-                <KEYWORD3>gl_flashblend</KEYWORD3>
-                <KEYWORD3>gl_lightmap</KEYWORD3>
-                <KEYWORD3>gl_lockpvs</KEYWORD3>
-                <KEYWORD3>gl_log</KEYWORD3>
-                <KEYWORD3>gl_mode</KEYWORD3>
-                <KEYWORD3>gl_modulate</KEYWORD3>
-                <KEYWORD3>gl_monolightmap</KEYWORD3>
-                <KEYWORD3>gl_nobind</KEYWORD3>
-                <KEYWORD3>gl_nosubimage</KEYWORD3>
-                <KEYWORD3>gl_particle_att_a</KEYWORD3>
-                <KEYWORD3>gl_particle_att_b</KEYWORD3>
-                <KEYWORD3>gl_particle_att_c</KEYWORD3>
-                <KEYWORD3>gl_particle_max_size</KEYWORD3>
-                <KEYWORD3>gl_particle_min_size</KEYWORD3>
-                <KEYWORD3>gl_particle_size</KEYWORD3>
-                <KEYWORD3>gl_picmip</KEYWORD3>
-                <KEYWORD3>gl_playermip</KEYWORD3>
-                <KEYWORD3>gl_polyblend</KEYWORD3>
-                <KEYWORD3>gl_round_down</KEYWORD3>
-                <KEYWORD3>gl_saturatelighting</KEYWORD3>
-                <KEYWORD3>gl_shadows</KEYWORD3>
-                <KEYWORD3>gl_showtris</KEYWORD3>
-                <KEYWORD3>gl_skymip</KEYWORD3>
-                <KEYWORD3>gl_swapinterval</KEYWORD3>
-                <KEYWORD3>gl_texturealphamode</KEYWORD3>
-                <KEYWORD3>gl_texturemode</KEYWORD3>
-                <KEYWORD3>gl_texturesolidmode</KEYWORD3>
-                <KEYWORD3>gl_triplebuffer</KEYWORD3>
-                <KEYWORD3>gl_vertex_arrays</KEYWORD3>
-                <KEYWORD3>gl_ztrick</KEYWORD3>
-                <KEYWORD3>god</KEYWORD3>
-                <KEYWORD3>graphheight</KEYWORD3>
-                <KEYWORD3>graphscale</KEYWORD3>
-                <KEYWORD3>graphshift</KEYWORD3>
-                <KEYWORD3>gun_model</KEYWORD3>
-                <KEYWORD3>gun_next</KEYWORD3>
-                <KEYWORD3>gun_prev</KEYWORD3>
-                <KEYWORD3>gun_x</KEYWORD3>
-                <KEYWORD3>gun_y</KEYWORD3>
-                <KEYWORD3>gun_z</KEYWORD3>
-                <KEYWORD3>hand</KEYWORD3>
-                <KEYWORD3>heartbeat</KEYWORD3>
-                <KEYWORD3>host_speeds</KEYWORD3>
-                <KEYWORD3>hostname</KEYWORD3>
-                <KEYWORD3>hostport</KEYWORD3>
-                <KEYWORD3>imagelist</KEYWORD3>
-                <KEYWORD3>impulse</KEYWORD3>
-                <KEYWORD3>in_initjoy</KEYWORD3>
-                <KEYWORD3>in_initmouse</KEYWORD3>
-                <KEYWORD3>in_joystick</KEYWORD3>
-                <KEYWORD3>in_mouse</KEYWORD3>
-                <KEYWORD3>info</KEYWORD3>
-                <KEYWORD3>intensity</KEYWORD3>
-                <KEYWORD3>invdrop</KEYWORD3>
-                <KEYWORD3>inven</KEYWORD3>
-                <KEYWORD3>invnext</KEYWORD3>
-                <KEYWORD3>invnextp</KEYWORD3>
-                <KEYWORD3>invnextw</KEYWORD3>
-                <KEYWORD3>invprev</KEYWORD3>
-                <KEYWORD3>invprevp</KEYWORD3>
-                <KEYWORD3>invprevw</KEYWORD3>
-                <KEYWORD3>invuse</KEYWORD3>
-                <KEYWORD3>ip</KEYWORD3>
-                <KEYWORD3>ip_clientport</KEYWORD3>
-                <KEYWORD3>ip_hostport</KEYWORD3>
-                <KEYWORD3>ipx_clientport</KEYWORD3>
-                <KEYWORD3>ipx_hostport</KEYWORD3>
-                <KEYWORD3>joy_advanced</KEYWORD3>
-                <KEYWORD3>joy_advancedupdate</KEYWORD3>
-                <KEYWORD3>joy_advaxisr</KEYWORD3>
-                <KEYWORD3>joy_advaxisu</KEYWORD3>
-                <KEYWORD3>joy_advaxisv</KEYWORD3>
-                <KEYWORD3>joy_advaxisx</KEYWORD3>
-                <KEYWORD3>joy_advaxisy</KEYWORD3>
-                <KEYWORD3>joy_advaxisz</KEYWORD3>
-                <KEYWORD3>joy_forwardsensitivity</KEYWORD3>
-                <KEYWORD3>joy_forwardthreshold</KEYWORD3>
-                <KEYWORD3>joy_name</KEYWORD3>
-                <KEYWORD3>joy_pitchsensitivity</KEYWORD3>
-                <KEYWORD3>joy_pitchthreshold</KEYWORD3>
-                <KEYWORD3>joy_sidesensitivity</KEYWORD3>
-                <KEYWORD3>joy_sidethreshold</KEYWORD3>
-                <KEYWORD3>joy_upsensitivity</KEYWORD3>
-                <KEYWORD3>joy_upthreshold</KEYWORD3>
-                <KEYWORD3>joy_yawsensitivity</KEYWORD3>
-                <KEYWORD3>joy_yawthreshold</KEYWORD3>
-                <KEYWORD3>kick</KEYWORD3>
-                <KEYWORD3>kill</KEYWORD3>
-                <KEYWORD3>killserver</KEYWORD3>
-                <KEYWORD3>link</KEYWORD3>
-                <KEYWORD3>load</KEYWORD3>
-                <KEYWORD3>loading</KEYWORD3>
-                <KEYWORD3>log_stats</KEYWORD3>
-                <KEYWORD3>logfile</KEYWORD3>
-                <KEYWORD3>lookspring</KEYWORD3>
-                <KEYWORD3>lookstrafe</KEYWORD3>
-                <KEYWORD3>m_filter</KEYWORD3>
-                <KEYWORD3>m_forward</KEYWORD3>
-                <KEYWORD3>m_pitch</KEYWORD3>
-                <KEYWORD3>m_side</KEYWORD3>
-                <KEYWORD3>m_yaw</KEYWORD3>
-                <KEYWORD3>map</KEYWORD3>
-                <KEYWORD3>map_noareas</KEYWORD3>
-                <KEYWORD3>mapname</KEYWORD3>
-                <KEYWORD3>maxclients</KEYWORD3>
-                <KEYWORD3>maxentities</KEYWORD3>
-                <KEYWORD3>maxspectators</KEYWORD3>
-                <KEYWORD3>menu_addressbook</KEYWORD3>
-                <KEYWORD3>menu_credits</KEYWORD3>
-                <KEYWORD3>menu_dmoptions</KEYWORD3>
-                <KEYWORD3>menu_game</KEYWORD3>
-                <KEYWORD3>menu_joinserver</KEYWORD3>
-                <KEYWORD3>menu_keys</KEYWORD3>
-                <KEYWORD3>menu_loadgame</KEYWORD3>
-                <KEYWORD3>menu_main</KEYWORD3>
-                <KEYWORD3>menu_multiplayer</KEYWORD3>
-                <KEYWORD3>menu_options</KEYWORD3>
-                <KEYWORD3>menu_playerconfig</KEYWORD3>
-                <KEYWORD3>menu_quit</KEYWORD3>
-                <KEYWORD3>menu_savegame</KEYWORD3>
-                <KEYWORD3>menu_startserver</KEYWORD3>
-                <KEYWORD3>menu_video</KEYWORD3>
-                <KEYWORD3>messagemode</KEYWORD3>
-                <KEYWORD3>messagemode3</KEYWORD3>
-                <KEYWORD3>modellist</KEYWORD3>
-                <KEYWORD3>msg</KEYWORD3>
-                <KEYWORD3>name</KEYWORD3>
-                <KEYWORD3>needpass</KEYWORD3>
-                <KEYWORD3>net_shownet</KEYWORD3>
-                <KEYWORD3>netgraph</KEYWORD3>
-                <KEYWORD3>nextserver</KEYWORD3>
-                <KEYWORD3>noclip</KEYWORD3>
-                <KEYWORD3>noipx</KEYWORD3>
-                <KEYWORD3>notarget</KEYWORD3>
-                <KEYWORD3>noudp</KEYWORD3>
-                <KEYWORD3>password</KEYWORD3>
-                <KEYWORD3>path</KEYWORD3>
-                <KEYWORD3>pause</KEYWORD3>
-                <KEYWORD3>paused</KEYWORD3>
-                <KEYWORD3>pingservers</KEYWORD3>
-                <KEYWORD3>play</KEYWORD3>
-                <KEYWORD3>playerlist</KEYWORD3>
-                <KEYWORD3>players</KEYWORD3>
-                <KEYWORD3>port</KEYWORD3>
-                <KEYWORD3>precache</KEYWORD3>
-                <KEYWORD3>prog</KEYWORD3>
-                <KEYWORD3>protocol</KEYWORD3>
-                <KEYWORD3>public</KEYWORD3>
-                <KEYWORD3>qport</KEYWORD3>
-                <KEYWORD3>quit</KEYWORD3>
-                <KEYWORD3>r_drawentities</KEYWORD3>
-                <KEYWORD3>r_drawworld</KEYWORD3>
-                <KEYWORD3>r_dspeeds</KEYWORD3>
-                <KEYWORD3>r_fullbright</KEYWORD3>
-                <KEYWORD3>r_lerpmodels</KEYWORD3>
-                <KEYWORD3>r_lightlevel</KEYWORD3>
-                <KEYWORD3>r_nocull</KEYWORD3>
-                <KEYWORD3>r_norefresh</KEYWORD3>
-                <KEYWORD3>r_novis</KEYWORD3>
-                <KEYWORD3>r_speeds</KEYWORD3>
-                <KEYWORD3>rate</KEYWORD3>
-                <KEYWORD3>rcon</KEYWORD3>
-                <KEYWORD3>rcon_address</KEYWORD3>
-                <KEYWORD3>rcon_password</KEYWORD3>
-                <KEYWORD3>reconnect</KEYWORD3>
-                <KEYWORD3>record</KEYWORD3>
-                <KEYWORD3>run_pitch</KEYWORD3>
-                <KEYWORD3>run_roll</KEYWORD3>
-                <KEYWORD3>s_initsound</KEYWORD3>
-                <KEYWORD3>s_khz</KEYWORD3>
-                <KEYWORD3>s_loadas8bit</KEYWORD3>
-                <KEYWORD3>s_mixahead</KEYWORD3>
-                <KEYWORD3>s_primary</KEYWORD3>
-                <KEYWORD3>s_show</KEYWORD3>
-                <KEYWORD3>s_testsound</KEYWORD3>
-                <KEYWORD3>s_volume</KEYWORD3>
-                <KEYWORD3>s_wavonly</KEYWORD3>
-                <KEYWORD3>save</KEYWORD3>
-                <KEYWORD3>say</KEYWORD3>
-                <KEYWORD3>say_team</KEYWORD3>
-                <KEYWORD3>score</KEYWORD3>
-                <KEYWORD3>scr_centertime</KEYWORD3>
-                <KEYWORD3>scr_conspeed</KEYWORD3>
-                <KEYWORD3>scr_drawall</KEYWORD3>
-                <KEYWORD3>scr_printspeed</KEYWORD3>
-                <KEYWORD3>scr_showpause</KEYWORD3>
-                <KEYWORD3>scr_showturtle</KEYWORD3>
-                <KEYWORD3>screenshot</KEYWORD3>
-                <KEYWORD3>sensitivity</KEYWORD3>
-                <KEYWORD3>serverinfo</KEYWORD3>
-                <KEYWORD3>serverrecord</KEYWORD3>
-                <KEYWORD3>serverstop</KEYWORD3>
-                <KEYWORD1>set</KEYWORD1>
-                <KEYWORD3>setenv</KEYWORD3>
-                <KEYWORD3>setmaster</KEYWORD3>
-                <KEYWORD3>showclamp</KEYWORD3>
-                <KEYWORD3>showdrop</KEYWORD3>
-                <KEYWORD3>showpackets</KEYWORD3>
-                <KEYWORD3>showtrace</KEYWORD3>
-                <KEYWORD3>sizedown</KEYWORD3>
-                <KEYWORD3>sizeup</KEYWORD3>
-                <KEYWORD3>skill</KEYWORD3>
-                <KEYWORD3>skin</KEYWORD3>
-                <KEYWORD3>skins</KEYWORD3>
-                <KEYWORD3>sky</KEYWORD3>
-                <KEYWORD3>snd_restart</KEYWORD3>
-                <KEYWORD3>soundinfo</KEYWORD3>
-                <KEYWORD3>soundlist</KEYWORD3>
-                <KEYWORD3>spectator</KEYWORD3>
-                <KEYWORD3>spectator_password</KEYWORD3>
-                <KEYWORD3>status</KEYWORD3>
-                <KEYWORD3>stop</KEYWORD3>
-                <KEYWORD3>stopsound</KEYWORD3>
-                <KEYWORD3>sv</KEYWORD3>
-                <KEYWORD3>sv_airaccelerate</KEYWORD3>
-                <KEYWORD3>sv_enforcetime</KEYWORD3>
-                <KEYWORD3>sv_gravity</KEYWORD3>
-                <KEYWORD3>sv_maplist</KEYWORD3>
-                <KEYWORD3>sv_maxvelocity</KEYWORD3>
-                <KEYWORD3>sv_noreload</KEYWORD3>
-                <KEYWORD3>sv_reconnect_limit</KEYWORD3>
-                <KEYWORD3>sv_rollangle</KEYWORD3>
-                <KEYWORD3>sv_rollspeed</KEYWORD3>
-                <KEYWORD3>sw_allow_modex</KEYWORD3>
-                <KEYWORD3>sw_clearcolor</KEYWORD3>
-                <KEYWORD3>sw_drawflat</KEYWORD3>
-                <KEYWORD3>sw_draworder</KEYWORD3>
-                <KEYWORD3>sw_maxedges</KEYWORD3>
-                <KEYWORD3>sw_maxsurfs</KEYWORD3>
-                <KEYWORD3>sw_mipcap</KEYWORD3>
-                <KEYWORD3>sw_mipscale</KEYWORD3>
-                <KEYWORD3>sw_mode</KEYWORD3>
-                <KEYWORD3>sw_polymodelstats</KEYWORD3>
-                <KEYWORD3>sw_reportedgeout</KEYWORD3>
-                <KEYWORD3>sw_reportsurfout</KEYWORD3>
-                <KEYWORD3>sw_stipplealpha</KEYWORD3>
-                <KEYWORD3>sw_surfcacheoverride</KEYWORD3>
-                <KEYWORD3>sw_waterwarp</KEYWORD3>
-                <KEYWORD3>timedemo</KEYWORD3>
-                <KEYWORD3>timegraph</KEYWORD3>
-                <KEYWORD3>timelimit</KEYWORD3>
-                <KEYWORD3>timeout</KEYWORD3>
-                <KEYWORD3>timerefresh</KEYWORD3>
-                <KEYWORD3>timescale</KEYWORD3>
-                <KEYWORD3>togglechat</KEYWORD3>
-                <KEYWORD3>toggleconsole</KEYWORD3>
-                <KEYWORD3>unbind</KEYWORD3>
-                <KEYWORD3>unbindall</KEYWORD3>
-                <KEYWORD3>use</KEYWORD3>
-                <KEYWORD3>userinfo</KEYWORD3>
-                <KEYWORD3>v_centermove</KEYWORD3>
-                <KEYWORD3>v_centerspeed</KEYWORD3>
-                <KEYWORD3>version</KEYWORD3>
-                <KEYWORD3>vid_front</KEYWORD3>
-                <KEYWORD3>vid_fullscreen</KEYWORD3>
-                <KEYWORD3>vid_gamma</KEYWORD3>
-                <KEYWORD3>vid_ref</KEYWORD3>
-                <KEYWORD3>vid_restart</KEYWORD3>
-                <KEYWORD3>vid_xpos</KEYWORD3>
-                <KEYWORD3>vid_ypos</KEYWORD3>
-                <KEYWORD3>viewpos</KEYWORD3>
-                <KEYWORD3>viewsize</KEYWORD3>
-                <KEYWORD3>wait</KEYWORD3>
-                <KEYWORD3>wave</KEYWORD3>
-                <KEYWORD3>weaplast</KEYWORD3>
-                <KEYWORD3>weapnext</KEYWORD3>
-                <KEYWORD3>weapprev</KEYWORD3>
-                <KEYWORD3>win_noalttab</KEYWORD3>
-                <KEYWORD3>z_stats</KEYWORD3>
-                <KEYWORD1>zombietime</KEYWORD1>
-                <KEYWORD4>shift</KEYWORD4>
-                <KEYWORD4>ctrl</KEYWORD4>
-                <KEYWORD4>space</KEYWORD4>
-                <KEYWORD4>tab</KEYWORD4>
-                <KEYWORD4>enter</KEYWORD4>
-                <KEYWORD4>escape</KEYWORD4>
-                <KEYWORD4>F1</KEYWORD4>
-                <KEYWORD4>F2</KEYWORD4>
-                <KEYWORD4>F3</KEYWORD4>
-                <KEYWORD4>F4</KEYWORD4>
-                <KEYWORD4>F5</KEYWORD4>
-                <KEYWORD4>F6</KEYWORD4>
-                <KEYWORD4>F7</KEYWORD4>
-                <KEYWORD4>F8</KEYWORD4>
-                <KEYWORD4>F9</KEYWORD4>
-                <KEYWORD4>F10</KEYWORD4>
-                <KEYWORD4>F11</KEYWORD4>
-                <KEYWORD4>F12</KEYWORD4>
-                <KEYWORD4>INS</KEYWORD4>
-                <KEYWORD4>DEL</KEYWORD4>
-                <KEYWORD4>PGUP</KEYWORD4>
-                <KEYWORD4>PGDN</KEYWORD4>
-                <KEYWORD4>HOME</KEYWORD4>
-                <KEYWORD4>END</KEYWORD4>
-                <KEYWORD4>MOUSE1</KEYWORD4>
-                <KEYWORD4>MOUSE2</KEYWORD4>
-                <KEYWORD4>uparrow</KEYWORD4>
-                <KEYWORD4>downarrow</KEYWORD4>
-                <KEYWORD4>leftarrow</KEYWORD4>
-                <KEYWORD4>rightarrow</KEYWORD4>
-                <KEYWORD4>mwheelup</KEYWORD4>
-                <KEYWORD4>mwheeldown</KEYWORD4>
-                <KEYWORD4>backspace</KEYWORD4>
-            </KEYWORDS>
-        </RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/rcp.xml b/qpython/src/main/assets/syntax/rcp.xml
deleted file mode 100644
index 93454244..00000000
--- a/qpython/src/main/assets/syntax/rcp.xml
+++ /dev/null
@@ -1,318 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
- **
- ** Pilrc *.prc highlight rules for jEdit
- **
- ** Marcin Orlowski - carlos@wfmh.org.pl
- **
- ** v1.0 (2006.04.25)
- **
--->
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<MODE>
-	<PROPS>
-	<!--
-		<PROPERTY NAME="indentOpenBrackets" VALUE="{" />
-		<PROPERTY NAME="indentCloseBrackets" VALUE="}" />
-	-->
-		<PROPERTY NAME="commentStart" VALUE="/*" />
-		<PROPERTY NAME="commentEnd" VALUE="*/" />
-	</PROPS>
-
-	<RULES IGNORE_CASE="TRUE">
-
-		<!-- SGML comment -->
-		<SPAN TYPE="COMMENT1">
-			<BEGIN>/*</BEGIN>
-			<END>*/</END>
-		</SPAN>
-
-	</RULES>
-
-
-	<RULES>
-		<SPAN TYPE="LITERAL1">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-
-		<SPAN TYPE="LITERAL1">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-
-		<SEQ TYPE="OPERATOR">=</SEQ>
-	</RULES>
-
-
-	<RULES HIGHLIGHT_DIGITS="TRUE">
-		<PROPS>
-			<PROPERTY NAME="commentStart" VALUE="/*" />
-			<PROPERTY NAME="lineComment" VALUE="//" />
-		</PROPS>
-
-		<SPAN TYPE="COMMENT1">
-			<BEGIN>/*</BEGIN>
-			<END>*/</END>
-		</SPAN>
-
-		<SPAN TYPE="LITERAL1" DELEGATE="RCP_LITERAL">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-		<SPAN TYPE="LITERAL1" ESCAPE="\">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-
-		<EOL_SPAN TYPE="COMMENT1">//</EOL_SPAN>
-
-		<SEQ TYPE="OPERATOR">=</SEQ>
-		<SEQ TYPE="OPERATOR">!</SEQ>
-		<SEQ TYPE="OPERATOR">=</SEQ>
-		<SEQ TYPE="OPERATOR">+</SEQ>
-		<SEQ TYPE="OPERATOR">-</SEQ>
-		<SEQ TYPE="OPERATOR">/</SEQ>
-		<SEQ TYPE="OPERATOR">*</SEQ>
-		<SEQ TYPE="OPERATOR">%</SEQ>
-		<SEQ TYPE="OPERATOR">|</SEQ>
-		<SEQ TYPE="OPERATOR">^</SEQ>
-		<SEQ TYPE="OPERATOR">~</SEQ>
-
-		<SEQ TYPE="OPERATOR">}</SEQ>
-		<SEQ TYPE="OPERATOR">{</SEQ>
-		<SEQ TYPE="OPERATOR">,</SEQ>
-		<SEQ TYPE="OPERATOR">;</SEQ>
-		<SEQ TYPE="OPERATOR">]</SEQ>
-		<SEQ TYPE="OPERATOR">[</SEQ>
-		<SEQ TYPE="OPERATOR">?</SEQ>
-		<SEQ TYPE="OPERATOR">@</SEQ>
-		<SEQ TYPE="OPERATOR">:</SEQ>
-
-		<MARK_PREVIOUS TYPE="FUNCTION" MATCH_TYPE="OPERATOR">(</MARK_PREVIOUS>
-		<SEQ TYPE="OPERATOR">)</SEQ>
-
-		<KEYWORDS>
-			<FUNCTION>ALERT</FUNCTION>
-			<FUNCTION>APPLICATION</FUNCTION>
-			<FUNCTION>APPLICATIONICONNAME</FUNCTION>
-			<FUNCTION>AREA</FUNCTION>
-			<FUNCTION>BITMAP</FUNCTION>
-			<FUNCTION>BITMAPCOLOR</FUNCTION>
-			<FUNCTION>BITMAPCOLOR16</FUNCTION>
-			<FUNCTION>BITMAPCOLOR16K</FUNCTION>
-			<FUNCTION>BITMAPFAMILY</FUNCTION>
-			<FUNCTION>BITMAPFAMILYEX</FUNCTION>
-			<FUNCTION>BITMAPFAMILYSPECIAL</FUNCTION>
-			<FUNCTION>BITMAPGREY</FUNCTION>
-			<FUNCTION>BITMAPGREY16</FUNCTION>
-			<FUNCTION>BITMAPSCREENFAMILY</FUNCTION>
-			<FUNCTION>BOOTSCREENFAMILY</FUNCTION>
-			<FUNCTION>BUTTON</FUNCTION>
-			<FUNCTION>BUTTONS</FUNCTION>
-			<FUNCTION>BYTELIST</FUNCTION>
-			<FUNCTION>CATEGORIES</FUNCTION>
-			<FUNCTION>CHECKBOX</FUNCTION>
-			<FUNCTION>COUNTRYLOCALISATION</FUNCTION>
-			<FUNCTION>DATA</FUNCTION>
-			<FUNCTION>FEATURE</FUNCTION>
-			<FUNCTION>FIELD</FUNCTION>
-			<FUNCTION>FONTINDEX</FUNCTION>
-			<FUNCTION>FORM</FUNCTION>
-			<FUNCTION>FORMBITMAP</FUNCTION>
-			<FUNCTION>GADGET</FUNCTION>
-			<FUNCTION>GENERATEHEADER</FUNCTION>
-			<FUNCTION>GRAFFITIINPUTAREA</FUNCTION>
-			<FUNCTION>GRAFFITISTATEINDICATOR</FUNCTION>
-			<FUNCTION>HEX</FUNCTION>
-			<FUNCTION>ICON</FUNCTION>
-			<FUNCTION>ICONFAMILY</FUNCTION>
-			<FUNCTION>ICONFAMILYEX</FUNCTION>
-			<FUNCTION>INTEGER</FUNCTION>
-			<FUNCTION>KEYBOARD</FUNCTION>
-			<FUNCTION>LABEL</FUNCTION>
-			<FUNCTION>LAUNCHERCATEGORY</FUNCTION>
-			<FUNCTION>LIST</FUNCTION>
-			<FUNCTION>LONGWORDLIST</FUNCTION>
-			<FUNCTION>MENU</FUNCTION>
-			<FUNCTION>MENUITEM</FUNCTION>
-			<FUNCTION>MESSAGE</FUNCTION>
-			<FUNCTION>MIDI</FUNCTION>
-			<FUNCTION>NOGRAFFITISTATEINDICATOR</FUNCTION>
-			<FUNCTION>PALETTETABLE</FUNCTION>
-			<FUNCTION>POPUPLIST</FUNCTION>
-			<FUNCTION>POPUPTRIGGER</FUNCTION>
-			<FUNCTION>PULLDOWN</FUNCTION>
-			<FUNCTION>PUSHBUTTON</FUNCTION>
-			<FUNCTION>REPEATBUTTON</FUNCTION>
-			<FUNCTION>RESETAUTOID</FUNCTION>
-			<FUNCTION>SCROLLBAR</FUNCTION>
-			<FUNCTION>SELECTORTRIGGER</FUNCTION>
-			<FUNCTION>SLIDER</FUNCTION>
-			<FUNCTION>SMALLICON</FUNCTION>
-			<FUNCTION>SMALLICONFAMILY</FUNCTION>
-			<FUNCTION>SMALLICONFAMILYEX</FUNCTION>
-			<FUNCTION>STRING</FUNCTION>
-			<FUNCTION>STRINGTABLE</FUNCTION>
-			<FUNCTION>TABLE</FUNCTION>
-			<FUNCTION>TITLE</FUNCTION>
-			<FUNCTION>TRANSLATION</FUNCTION>
-			<FUNCTION>TRAP</FUNCTION>
-			<FUNCTION>VERSION</FUNCTION>
-			<FUNCTION>WORDLIST</FUNCTION>
-
-			<KEYWORD1>PREVTOP</KEYWORD1>
-			<KEYWORD1>PREVBOTTOM</KEYWORD1>
-			<KEYWORD1>PREVLEFT</KEYWORD1>
-			<KEYWORD1>PREVRIGHT</KEYWORD1>
-			<KEYWORD1>AUTO</KEYWORD1>
-			<KEYWORD1>AUTOID</KEYWORD1>
-
-			<KEYWORD2>AT</KEYWORD2>
-			<KEYWORD2>AUTOSHIFT</KEYWORD2>
-			<KEYWORD2>BACKGROUNDID</KEYWORD2>
-			<KEYWORD2>BITMAPID</KEYWORD2>
-			<KEYWORD2>BOLDFRAME</KEYWORD2>
-			<KEYWORD2>BPP</KEYWORD2>
-			<KEYWORD2>CHECKED</KEYWORD2>
-			<KEYWORD2>COLORTABLE</KEYWORD2>
-			<KEYWORD2>COLUMNS</KEYWORD2>
-			<KEYWORD2>COLUMNWIDTHS</KEYWORD2>
-			<KEYWORD2>COMPRESS</KEYWORD2>
-			<KEYWORD2>COMPRESSBEST</KEYWORD2>
-			<KEYWORD2>COMPRESSPACKBITS</KEYWORD2>
-			<KEYWORD2>COMPRESSRLE</KEYWORD2>
-			<KEYWORD2>COMPRESSSCANLINE</KEYWORD2>
-			<KEYWORD2>CONFIRMATION</KEYWORD2>
-			<KEYWORD2>COUNTRY</KEYWORD2>
-			<KEYWORD2>CREATOR</KEYWORD2>
-			<KEYWORD2>CURRENCYDECIMALPLACES</KEYWORD2>
-			<KEYWORD2>CURRENCYNAME</KEYWORD2>
-			<KEYWORD2>CURRENCYSYMBOL</KEYWORD2>
-			<KEYWORD2>CURRENCYUNIQUESYMBOL</KEYWORD2>
-			<KEYWORD2>DATEFORMAT</KEYWORD2>
-			<KEYWORD2>DAYLIGHTSAVINGS</KEYWORD2>
-			<KEYWORD2>DEFAULTBTNID</KEYWORD2>
-			<KEYWORD2>DEFAULTBUTTON</KEYWORD2>
-			<KEYWORD2>DENSITY</KEYWORD2>
-			<KEYWORD2>DISABLED</KEYWORD2>
-			<KEYWORD2>DYNAMICSIZE</KEYWORD2>
-			<KEYWORD2>EDITABLE</KEYWORD2>
-			<KEYWORD2>ENTRY</KEYWORD2>
-			<KEYWORD2>ERROR</KEYWORD2>
-			<KEYWORD2>EXTENDED</KEYWORD2>
-			<KEYWORD2>FEEDBACK</KEYWORD2>
-			<KEYWORD2>FILE</KEYWORD2>
-			<KEYWORD2>FONTID</KEYWORD2>
-			<KEYWORD2>FORCECOMPRESS</KEYWORD2>
-			<KEYWORD2>FRAME</KEYWORD2>
-			<KEYWORD2>GRAFFITI</KEYWORD2>
-			<KEYWORD2>GRAPHICAL</KEYWORD2>
-			<KEYWORD2>GROUP</KEYWORD2>
-			<KEYWORD2>HASSCROLLBAR</KEYWORD2>
-			<KEYWORD2>HELPID</KEYWORD2>
-			<KEYWORD2>ID</KEYWORD2>
-			<KEYWORD2>INDEX</KEYWORD2>
-			<KEYWORD2>INFORMATION</KEYWORD2>
-			<KEYWORD2>KEYDOWNCHR</KEYWORD2>
-			<KEYWORD2>KEYDOWNKEYCODE</KEYWORD2>
-			<KEYWORD2>KEYDOWNMODIFIERS</KEYWORD2>
-			<KEYWORD2>LANGUAGE</KEYWORD2>
-			<KEYWORD2>LEFTALIGN</KEYWORD2>
-			<KEYWORD2>LEFTANCHOR</KEYWORD2>
-			<KEYWORD2>LONGDATEFORMAT</KEYWORD2>
-			<KEYWORD2>MAX</KEYWORD2>
-			<KEYWORD2>MAXCHARS</KEYWORD2>
-			<KEYWORD2>MEASUREMENTSYSTEM</KEYWORD2>
-			<KEYWORD2>MENUID</KEYWORD2>
-			<KEYWORD2>MIN</KEYWORD2>
-			<KEYWORD2>LOCALE</KEYWORD2>
-			<KEYWORD2>MINUTESWESTOFGMT</KEYWORD2>
-			<KEYWORD2>MODAL</KEYWORD2>
-			<KEYWORD2>MULTIPLELINES</KEYWORD2>
-			<KEYWORD2>NAME</KEYWORD2>
-			<KEYWORD2>NOCOLORTABLE</KEYWORD2>
-			<KEYWORD2>NOCOMPRESS</KEYWORD2>
-			<KEYWORD2>NOFRAME</KEYWORD2>
-			<KEYWORD2>NONEDITABLE</KEYWORD2>
-			<KEYWORD2>NONEXTENDED</KEYWORD2>
-			<KEYWORD2>NONUSABLE</KEYWORD2>
-			<KEYWORD2>NOSAVEBEHIND</KEYWORD2>
-			<KEYWORD2>NUMBER</KEYWORD2>
-			<KEYWORD2>NUMBERFORMAT</KEYWORD2>
-			<KEYWORD2>NUMERIC</KEYWORD2>
-			<KEYWORD2>PAGESIZE</KEYWORD2>
-			<KEYWORD2>RECTFRAME</KEYWORD2>
-			<KEYWORD2>RIGHTALIGN</KEYWORD2>
-			<KEYWORD2>RIGHTANCHOR</KEYWORD2>
-			<KEYWORD2>ROWS</KEYWORD2>
-			<KEYWORD2>SAVEBEHIND</KEYWORD2>
-			<KEYWORD2>SEARCH</KEYWORD2>
-			<KEYWORD2>SCREEN</KEYWORD2>
-			<KEYWORD2>SELECTEDBITMAPID</KEYWORD2>
-			<KEYWORD2>SINGLELINE</KEYWORD2>
-			<KEYWORD2>THUMBID</KEYWORD2>
-			<KEYWORD2>TRANSPARENTINDEX</KEYWORD2>
-			<KEYWORD2>TIMEFORMAT</KEYWORD2>
-			<KEYWORD2>UNDERLINED</KEYWORD2>
-			<KEYWORD2>USABLE</KEYWORD2>
-			<KEYWORD2>VALUE</KEYWORD2>
-			<KEYWORD2>VERTICAL</KEYWORD2>
-			<KEYWORD2>VISIBLEITEMS</KEYWORD2>
-			<KEYWORD2>WARNING</KEYWORD2>
-			<KEYWORD2>WEEKSTARTDAY</KEYWORD2>
-
-			<KEYWORD2>FONT</KEYWORD2>
-			<!-- FONT ID -->
-			<KEYWORD2>TRANSPARENT</KEYWORD2>
-
-			<KEYWORD3>BEGIN</KEYWORD3>
-			<KEYWORD3>END</KEYWORD3>
-
-			<!-- Language constructs (24) -->
-			<KEYWORD4>#include</KEYWORD4>
-			<KEYWORD4>#define</KEYWORD4>
-			<KEYWORD4>equ</KEYWORD4>
-			<KEYWORD4>#undef</KEYWORD4>
-			<KEYWORD4>#ifdef</KEYWORD4>
-			<KEYWORD4>#ifndef</KEYWORD4>
-			<KEYWORD4>#else</KEYWORD4>
-			<KEYWORD4>#endif</KEYWORD4>
-
-			<KEYWORD4>package</KEYWORD4>
-			<!-- syn region pilrcInclude start="public class" end="}" -->
-
-		</KEYWORDS>
-	</RULES>
-
-	<RULES SET="RCP_LITERAL" ESCAPE="\" DEFAULT="LITERAL1">
-		<MARK_FOLLOWING TYPE="KEYWORD3">$</MARK_FOLLOWING>
-		<SEQ TYPE="LITERAL1">\</SEQ>
-		<SEQ TYPE="LITERAL1">=</SEQ>
-		<SEQ TYPE="LITERAL1">!</SEQ>
-		<SEQ TYPE="LITERAL1">=</SEQ>
-		<SEQ TYPE="LITERAL1">+</SEQ>
-		<SEQ TYPE="LITERAL1">-</SEQ>
-		<SEQ TYPE="LITERAL1">/</SEQ>
-		<SEQ TYPE="LITERAL1">*</SEQ>
-		<SEQ TYPE="LITERAL1">%</SEQ>
-		<SEQ TYPE="LITERAL1">|</SEQ>
-		<SEQ TYPE="LITERAL1">^</SEQ>
-		<SEQ TYPE="LITERAL1">~</SEQ>
-		<SEQ TYPE="LITERAL1">.</SEQ>
-		<SEQ TYPE="LITERAL1">}</SEQ>
-		<SEQ TYPE="LITERAL1">{</SEQ>
-		<SEQ TYPE="LITERAL1">,</SEQ>
-		<SEQ TYPE="LITERAL1">;</SEQ>
-		<SEQ TYPE="LITERAL1">]</SEQ>
-		<SEQ TYPE="LITERAL1">[</SEQ>
-		<SEQ TYPE="LITERAL1">?</SEQ>
-		<SEQ TYPE="LITERAL1">@</SEQ>
-		<SEQ TYPE="LITERAL1">:</SEQ>
-		<SEQ TYPE="LITERAL1">)</SEQ>
-		<SEQ TYPE="LITERAL1">'</SEQ>
-	</RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/rd.xml b/qpython/src/main/assets/syntax/rd.xml
deleted file mode 100644
index c2bb551c..00000000
--- a/qpython/src/main/assets/syntax/rd.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="indentOpenBrackets" VALUE="{" />
-		<PROPERTY NAME="indentCloseBrackets" VALUE="}" />
-	</PROPS>
-	<RULES IGNORE_CASE="FALSE" HIGHLIGHT_DIGITS="TRUE">
-		<SPAN TYPE="LITERAL1" ESCAPE="\" NO_LINE_BREAK="TRUE">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-		<EOL_SPAN TYPE="COMMENT1">#</EOL_SPAN>
-		<SEQ TYPE="OPERATOR">{</SEQ>
-		<SEQ TYPE="OPERATOR">}</SEQ>
-		<KEYWORDS>
-			<KEYWORD1>\name</KEYWORD1>
-			<KEYWORD1>\alias</KEYWORD1>
-			<KEYWORD1>\title</KEYWORD1>
-			<KEYWORD1>\description</KEYWORD1>
-			<KEYWORD1>\synopsis</KEYWORD1>
-			<KEYWORD1>\usage</KEYWORD1>
-			<KEYWORD1>\arguments</KEYWORD1>
-			<KEYWORD1>\details</KEYWORD1>
-			<KEYWORD1>\value</KEYWORD1>
-			<KEYWORD1>\references</KEYWORD1>
-			<KEYWORD1>\note</KEYWORD1>
-			<KEYWORD1>\author</KEYWORD1>
-			<KEYWORD1>\seealso</KEYWORD1>
-			<KEYWORD1>\examples</KEYWORD1>
-			<KEYWORD1>\keyword</KEYWORD1>
-			<KEYWORD2>\itemize</KEYWORD2>
-			<KEYWORD2>\method</KEYWORD2>
-			<KEYWORD2>\docType</KEYWORD2>
-			<KEYWORD2>\format</KEYWORD2>
-			<KEYWORD2>\source</KEYWORD2>
-			<KEYWORD2>\itemize</KEYWORD2>
-			<KEYWORD2>\section</KEYWORD2>
-			<KEYWORD2>\enumerate</KEYWORD2>
-			<KEYWORD2>\describe</KEYWORD2>
-			<KEYWORD2>\tabular</KEYWORD2>
-			<KEYWORD2>\link</KEYWORD2>
-			<KEYWORD2>\item</KEYWORD2>
-			<KEYWORD2>\eqn</KEYWORD2>
-			<KEYWORD2>\deqn</KEYWORD2>
-			<KEYWORD2>\concept</KEYWORD2>
-			<KEYWORD3>\emph</KEYWORD3>
-			<KEYWORD3>\strong</KEYWORD3>
-			<KEYWORD3>\bold</KEYWORD3>
-			<KEYWORD3>\sQuote</KEYWORD3>
-			<KEYWORD3>\dQuote</KEYWORD3>
-			<KEYWORD3>\code</KEYWORD3>
-			<KEYWORD3>\preformatted</KEYWORD3>
-			<KEYWORD3>\kbd</KEYWORD3>
-			<KEYWORD3>\samp</KEYWORD3>
-			<KEYWORD3>\pkg</KEYWORD3>
-			<KEYWORD3>\file</KEYWORD3>
-			<KEYWORD3>\email</KEYWORD3>
-			<KEYWORD3>\url</KEYWORD3>
-			<KEYWORD3>\var</KEYWORD3>
-			<KEYWORD3>\env</KEYWORD3>
-			<KEYWORD3>\option</KEYWORD3>
-			<KEYWORD3>\command</KEYWORD3>
-			<KEYWORD3>\dfn</KEYWORD3>
-			<KEYWORD3>\cite</KEYWORD3>
-			<KEYWORD3>\acronym</KEYWORD3>
-			<KEYWORD3>\tab</KEYWORD3>
-		</KEYWORDS>
-	</RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/rebol.xml b/qpython/src/main/assets/syntax/rebol.xml
deleted file mode 100644
index f21d463e..00000000
--- a/qpython/src/main/assets/syntax/rebol.xml
+++ /dev/null
@@ -1,546 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="indentOpenBrackets" VALUE="{[(" />
-		<PROPERTY NAME="indentCloseBrackets" VALUE="}])" />
-		<PROPERTY NAME="commentStart" VALUE="comment {" />
-		<PROPERTY NAME="commentEnd" VALUE="}" />
-		<PROPERTY NAME="lineComment" VALUE=";" />
-		<PROPERTY NAME="noWordSep" VALUE="_-" />
-		<PROPERTY NAME="wordBreakChars" VALUE=",+-=&lt;&gt;/?^&amp;*" />
-	</PROPS>
-	<RULES IGNORE_CASE="TRUE" HIGHLIGHT_DIGITS="FALSE">
-		<!-- Javadoc comment -->
-		<SPAN TYPE="COMMENT1">
-			<BEGIN>comment {</BEGIN>
-			<END>}</END>
-		</SPAN>
-
-		<SPAN TYPE="COMMENT1">
-			<BEGIN>comment{</BEGIN>
-			<END>}</END>
-		</SPAN>
-
-		<SPAN TYPE="LITERAL1" ESCAPE="\" NO_LINE_BREAK="TRUE">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-
-		<SPAN TYPE="LITERAL1" ESCAPE="\" NO_LINE_BREAK="FALSE">
-			<BEGIN>{</BEGIN>
-			<END>}</END>
-		</SPAN>
-
-		<EOL_SPAN TYPE="COMMENT1">;</EOL_SPAN>
-
-		<SEQ TYPE="OPERATOR">=</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;=</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;=</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">+</SEQ>
-		<SEQ TYPE="OPERATOR">/</SEQ>
-		<SEQ TYPE="OPERATOR">*</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;</SEQ>
-
-		<MARK_FOLLOWING TYPE="LITERAL2" MATCH_TYPE="OPERATOR">'</MARK_FOLLOWING>
-
-		<KEYWORDS>
-			<KEYWORD1>abs</KEYWORD1>
-			<KEYWORD1>absolute</KEYWORD1>
-			<KEYWORD1>add</KEYWORD1>
-			<KEYWORD1>and~</KEYWORD1>
-			<KEYWORD1>at</KEYWORD1>
-			<KEYWORD1>back</KEYWORD1>
-			<KEYWORD1>change</KEYWORD1>
-			<KEYWORD1>clear</KEYWORD1>
-			<KEYWORD1>complement</KEYWORD1>
-			<KEYWORD1>copy</KEYWORD1>
-			<KEYWORD1>cp</KEYWORD1>
-			<KEYWORD1>divide</KEYWORD1>
-			<KEYWORD1>fifth</KEYWORD1>
-			<KEYWORD1>find</KEYWORD1>
-			<KEYWORD1>first</KEYWORD1>
-			<KEYWORD1>fourth</KEYWORD1>
-			<KEYWORD1>head</KEYWORD1>
-			<KEYWORD1>insert</KEYWORD1>
-			<KEYWORD1>last</KEYWORD1>
-			<KEYWORD1>make</KEYWORD1>
-			<KEYWORD1>max</KEYWORD1>
-			<KEYWORD1>maximum</KEYWORD1>
-			<KEYWORD1>min</KEYWORD1>
-			<KEYWORD1>minimum</KEYWORD1>
-			<KEYWORD1>multiply</KEYWORD1>
-			<KEYWORD1>negate</KEYWORD1>
-			<KEYWORD1>next</KEYWORD1>
-			<KEYWORD1>or~</KEYWORD1>
-			<KEYWORD1>pick</KEYWORD1>
-			<KEYWORD1>poke</KEYWORD1>
-			<KEYWORD1>power</KEYWORD1>
-			<KEYWORD1>random</KEYWORD1>
-			<KEYWORD1>remainder</KEYWORD1>
-			<KEYWORD1>remove</KEYWORD1>
-			<KEYWORD1>second</KEYWORD1>
-			<KEYWORD1>select</KEYWORD1>
-			<KEYWORD1>skip</KEYWORD1>
-			<KEYWORD1>sort</KEYWORD1>
-			<KEYWORD1>subtract</KEYWORD1>
-			<KEYWORD1>tail</KEYWORD1>
-			<KEYWORD1>third</KEYWORD1>
-			<KEYWORD1>to</KEYWORD1>
-			<KEYWORD1>trim</KEYWORD1>
-			<KEYWORD1>xor~</KEYWORD1>
-			<KEYWORD1>alias</KEYWORD1>
-			<KEYWORD1>all</KEYWORD1>
-			<KEYWORD1>any</KEYWORD1>
-			<KEYWORD1>arccosine</KEYWORD1>
-			<KEYWORD1>arcsine</KEYWORD1>
-			<KEYWORD1>arctangent</KEYWORD1>
-			<KEYWORD1>bind</KEYWORD1>
-			<KEYWORD1>break</KEYWORD1>
-			<KEYWORD1>browse</KEYWORD1>
-			<KEYWORD1>call</KEYWORD1>
-			<KEYWORD1>caret-to-offset</KEYWORD1>
-			<KEYWORD1>catch</KEYWORD1>
-			<KEYWORD1>checksum</KEYWORD1>
-			<KEYWORD1>close</KEYWORD1>
-			<KEYWORD1>comment</KEYWORD1>
-			<KEYWORD1>compose</KEYWORD1>
-			<KEYWORD1>compress</KEYWORD1>
-			<KEYWORD1>cosine</KEYWORD1>
-			<KEYWORD1>debase</KEYWORD1>
-			<KEYWORD1>decompress</KEYWORD1>
-			<KEYWORD1>dehex</KEYWORD1>
-			<KEYWORD1>detab</KEYWORD1>
-			<KEYWORD1>dh-compute-key</KEYWORD1>
-			<KEYWORD1>dh-generate-key</KEYWORD1>
-			<KEYWORD1>dh-make-key</KEYWORD1>
-			<KEYWORD1>difference</KEYWORD1>
-			<KEYWORD1>disarm</KEYWORD1>
-			<KEYWORD1>do</KEYWORD1>
-			<KEYWORD1>dsa-generate-key</KEYWORD1>
-			<KEYWORD1>dsa-make-key</KEYWORD1>
-			<KEYWORD1>dsa-make-signature</KEYWORD1>
-			<KEYWORD1>dsa-verify-signature</KEYWORD1>
-			<KEYWORD1>either</KEYWORD1>
-			<KEYWORD1>else</KEYWORD1>
-			<KEYWORD1>enbase</KEYWORD1>
-			<KEYWORD1>entab</KEYWORD1>
-			<KEYWORD1>exclude</KEYWORD1>
-			<KEYWORD1>exit</KEYWORD1>
-			<KEYWORD1>exp</KEYWORD1>
-			<KEYWORD1>foreach</KEYWORD1>
-			<KEYWORD1>form</KEYWORD1>
-			<KEYWORD1>free</KEYWORD1>
-			<KEYWORD1>get</KEYWORD1>
-			<KEYWORD1>get-modes</KEYWORD1>
-			<KEYWORD1>halt</KEYWORD1>
-			<KEYWORD1>hide</KEYWORD1>
-			<KEYWORD1>if</KEYWORD1>
-			<KEYWORD1>in</KEYWORD1>
-			<KEYWORD1>intersect</KEYWORD1>
-			<KEYWORD1>load</KEYWORD1>
-			<KEYWORD1>log-10</KEYWORD1>
-			<KEYWORD1>log-2</KEYWORD1>
-			<KEYWORD1>log-e</KEYWORD1>
-			<KEYWORD1>loop</KEYWORD1>
-			<KEYWORD1>lowercase</KEYWORD1>
-			<KEYWORD1>maximum-of</KEYWORD1>
-			<KEYWORD1>minimum-of</KEYWORD1>
-			<KEYWORD1>mold</KEYWORD1>
-			<KEYWORD1>not</KEYWORD1>
-			<KEYWORD1>now</KEYWORD1>
-			<KEYWORD1>offset-to-caret</KEYWORD1>
-			<KEYWORD1>open</KEYWORD1>
-			<KEYWORD1>parse</KEYWORD1>
-			<KEYWORD1>prin</KEYWORD1>
-			<KEYWORD1>print</KEYWORD1>
-			<KEYWORD1>protect</KEYWORD1>
-			<KEYWORD1>q</KEYWORD1>
-			<KEYWORD1>query</KEYWORD1>
-			<KEYWORD1>quit</KEYWORD1>
-			<KEYWORD1>read</KEYWORD1>
-			<KEYWORD1>read-io</KEYWORD1>
-			<KEYWORD1>recycle</KEYWORD1>
-			<KEYWORD1>reduce</KEYWORD1>
-			<KEYWORD1>repeat</KEYWORD1>
-			<KEYWORD1>return</KEYWORD1>
-			<KEYWORD1>reverse</KEYWORD1>
-			<KEYWORD1>rsa-encrypt</KEYWORD1>
-			<KEYWORD1>rsa-generate-key</KEYWORD1>
-			<KEYWORD1>rsa-make-key</KEYWORD1>
-			<KEYWORD1>save</KEYWORD1>
-			<KEYWORD1>secure</KEYWORD1>
-			<KEYWORD1>set</KEYWORD1>
-			<KEYWORD1>set-modes</KEYWORD1>
-			<KEYWORD1>show</KEYWORD1>
-			<KEYWORD1>sine</KEYWORD1>
-			<KEYWORD1>size-text</KEYWORD1>
-			<KEYWORD1>square-root</KEYWORD1>
-			<KEYWORD1>tangent</KEYWORD1>
-			<KEYWORD1>textinfo</KEYWORD1>
-			<KEYWORD1>throw</KEYWORD1>
-			<KEYWORD1>to-hex</KEYWORD1>
-			<KEYWORD1>to-local-file</KEYWORD1>
-			<KEYWORD1>to-rebol-file</KEYWORD1>
-			<KEYWORD1>trace</KEYWORD1>
-			<KEYWORD1>try</KEYWORD1>
-			<KEYWORD1>union</KEYWORD1>
-			<KEYWORD1>unique</KEYWORD1>
-			<KEYWORD1>unprotect</KEYWORD1>
-			<KEYWORD1>unset</KEYWORD1>
-			<KEYWORD1>until</KEYWORD1>
-			<KEYWORD1>update</KEYWORD1>
-			<KEYWORD1>uppercase</KEYWORD1>
-			<KEYWORD1>use</KEYWORD1>
-			<KEYWORD1>wait</KEYWORD1>
-			<KEYWORD1>while</KEYWORD1>
-			<KEYWORD1>write</KEYWORD1>
-			<KEYWORD1>write-io</KEYWORD1>
-			<KEYWORD1>basic-syntax-header</KEYWORD1>
-			<KEYWORD1>crlf</KEYWORD1>
-			<KEYWORD1>font-fixed</KEYWORD1>
-			<KEYWORD1>font-sans-serif</KEYWORD1>
-			<KEYWORD1>font-serif</KEYWORD1>
-			<KEYWORD1>list-words</KEYWORD1>
-			<KEYWORD1>outstr</KEYWORD1>
-			<KEYWORD1>val</KEYWORD1>
-			<KEYWORD1>value</KEYWORD1>
-			<KEYWORD1>about</KEYWORD1>
-			<KEYWORD1>alert</KEYWORD1>
-			<KEYWORD1>alter</KEYWORD1>
-			<KEYWORD1>append</KEYWORD1>
-			<KEYWORD1>array</KEYWORD1>
-			<KEYWORD1>ask</KEYWORD1>
-			<KEYWORD1>boot-prefs</KEYWORD1>
-			<KEYWORD1>build-tag</KEYWORD1>
-			<KEYWORD1>center-face</KEYWORD1>
-			<KEYWORD1>change-dir</KEYWORD1>
-			<KEYWORD1>charset</KEYWORD1>
-			<KEYWORD1>choose</KEYWORD1>
-			<KEYWORD1>clean-path</KEYWORD1>
-			<KEYWORD1>clear-fields</KEYWORD1>
-			<KEYWORD1>confine</KEYWORD1>
-			<KEYWORD1>confirm</KEYWORD1>
-			<KEYWORD1>context</KEYWORD1>
-			<KEYWORD1>cvs-date</KEYWORD1>
-			<KEYWORD1>cvs-version</KEYWORD1>
-			<KEYWORD1>decode-cgi</KEYWORD1>
-			<KEYWORD1>decode-url</KEYWORD1>
-			<KEYWORD1>deflag-face</KEYWORD1>
-			<KEYWORD1>delete</KEYWORD1>
-			<KEYWORD1>demo</KEYWORD1>
-			<KEYWORD1>desktop</KEYWORD1>
-			<KEYWORD1>dirize</KEYWORD1>
-			<KEYWORD1>dispatch</KEYWORD1>
-			<KEYWORD1>do-boot</KEYWORD1>
-			<KEYWORD1>do-events</KEYWORD1>
-			<KEYWORD1>do-face</KEYWORD1>
-			<KEYWORD1>do-face-alt</KEYWORD1>
-			<KEYWORD1>does</KEYWORD1>
-			<KEYWORD1>dump-face</KEYWORD1>
-			<KEYWORD1>dump-pane</KEYWORD1>
-			<KEYWORD1>echo</KEYWORD1>
-			<KEYWORD1>editor</KEYWORD1>
-			<KEYWORD1>emailer</KEYWORD1>
-			<KEYWORD1>emit</KEYWORD1>
-			<KEYWORD1>extract</KEYWORD1>
-			<KEYWORD1>find-by-type</KEYWORD1>
-			<KEYWORD1>find-key-face</KEYWORD1>
-			<KEYWORD1>find-window</KEYWORD1>
-			<KEYWORD1>flag-face</KEYWORD1>
-			<KEYWORD1>flash</KEYWORD1>
-			<KEYWORD1>focus</KEYWORD1>
-			<KEYWORD1>for</KEYWORD1>
-			<KEYWORD1>forall</KEYWORD1>
-			<KEYWORD1>forever</KEYWORD1>
-			<KEYWORD1>forskip</KEYWORD1>
-			<KEYWORD1>func</KEYWORD1>
-			<KEYWORD1>function</KEYWORD1>
-			<KEYWORD1>get-net-info</KEYWORD1>
-			<KEYWORD1>get-style</KEYWORD1>
-			<KEYWORD1>has</KEYWORD1>
-			<KEYWORD1>help</KEYWORD1>
-			<KEYWORD1>hide-popup</KEYWORD1>
-			<KEYWORD1>import-email</KEYWORD1>
-			<KEYWORD1>inform</KEYWORD1>
-			<KEYWORD1>input</KEYWORD1>
-			<KEYWORD1>insert-event-func</KEYWORD1>
-			<KEYWORD1>join</KEYWORD1>
-			<KEYWORD1>launch</KEYWORD1>
-			<KEYWORD1>launch-thru</KEYWORD1>
-			<KEYWORD1>layout</KEYWORD1>
-			<KEYWORD1>license</KEYWORD1>
-			<KEYWORD1>list-dir</KEYWORD1>
-			<KEYWORD1>load-image</KEYWORD1>
-			<KEYWORD1>load-prefs</KEYWORD1>
-			<KEYWORD1>load-thru</KEYWORD1>
-			<KEYWORD1>make-dir</KEYWORD1>
-			<KEYWORD1>make-face</KEYWORD1>
-			<KEYWORD1>net-error</KEYWORD1>
-			<KEYWORD1>open-events</KEYWORD1>
-			<KEYWORD1>parse-email-addrs</KEYWORD1>
-			<KEYWORD1>parse-header</KEYWORD1>
-			<KEYWORD1>parse-header-date</KEYWORD1>
-			<KEYWORD1>parse-xml</KEYWORD1>
-			<KEYWORD1>path-thru</KEYWORD1>
-			<KEYWORD1>probe</KEYWORD1>
-			<KEYWORD1>protect-system</KEYWORD1>
-			<KEYWORD1>read-net</KEYWORD1>
-			<KEYWORD1>read-thru</KEYWORD1>
-			<KEYWORD1>reboot</KEYWORD1>
-			<KEYWORD1>reform</KEYWORD1>
-			<KEYWORD1>rejoin</KEYWORD1>
-			<KEYWORD1>remold</KEYWORD1>
-			<KEYWORD1>remove-event-func</KEYWORD1>
-			<KEYWORD1>rename</KEYWORD1>
-			<KEYWORD1>repend</KEYWORD1>
-			<KEYWORD1>replace</KEYWORD1>
-			<KEYWORD1>request</KEYWORD1>
-			<KEYWORD1>request-color</KEYWORD1>
-			<KEYWORD1>request-date</KEYWORD1>
-			<KEYWORD1>request-download</KEYWORD1>
-			<KEYWORD1>request-file</KEYWORD1>
-			<KEYWORD1>request-list</KEYWORD1>
-			<KEYWORD1>request-pass</KEYWORD1>
-			<KEYWORD1>request-text</KEYWORD1>
-			<KEYWORD1>resend</KEYWORD1>
-			<KEYWORD1>save-prefs</KEYWORD1>
-			<KEYWORD1>save-user</KEYWORD1>
-			<KEYWORD1>scroll-para</KEYWORD1>
-			<KEYWORD1>send</KEYWORD1>
-			<KEYWORD1>set-font</KEYWORD1>
-			<KEYWORD1>set-net</KEYWORD1>
-			<KEYWORD1>set-para</KEYWORD1>
-			<KEYWORD1>set-style</KEYWORD1>
-			<KEYWORD1>set-user</KEYWORD1>
-			<KEYWORD1>set-user-name</KEYWORD1>
-			<KEYWORD1>show-popup</KEYWORD1>
-			<KEYWORD1>source</KEYWORD1>
-			<KEYWORD1>split-path</KEYWORD1>
-			<KEYWORD1>stylize</KEYWORD1>
-			<KEYWORD1>switch</KEYWORD1>
-			<KEYWORD1>throw-on-error</KEYWORD1>
-			<KEYWORD1>to-binary</KEYWORD1>
-			<KEYWORD1>to-bitset</KEYWORD1>
-			<KEYWORD1>to-block</KEYWORD1>
-			<KEYWORD1>to-char</KEYWORD1>
-			<KEYWORD1>to-date</KEYWORD1>
-			<KEYWORD1>to-decimal</KEYWORD1>
-			<KEYWORD1>to-email</KEYWORD1>
-			<KEYWORD1>to-event</KEYWORD1>
-			<KEYWORD1>to-file</KEYWORD1>
-			<KEYWORD1>to-get-word</KEYWORD1>
-			<KEYWORD1>to-hash</KEYWORD1>
-			<KEYWORD1>to-idate</KEYWORD1>
-			<KEYWORD1>to-image</KEYWORD1>
-			<KEYWORD1>to-integer</KEYWORD1>
-			<KEYWORD1>to-issue</KEYWORD1>
-			<KEYWORD1>to-list</KEYWORD1>
-			<KEYWORD1>to-lit-path</KEYWORD1>
-			<KEYWORD1>to-lit-word</KEYWORD1>
-			<KEYWORD1>to-logic</KEYWORD1>
-			<KEYWORD1>to-money</KEYWORD1>
-			<KEYWORD1>to-none</KEYWORD1>
-			<KEYWORD1>to-pair</KEYWORD1>
-			<KEYWORD1>to-paren</KEYWORD1>
-			<KEYWORD1>to-path</KEYWORD1>
-			<KEYWORD1>to-refinement</KEYWORD1>
-			<KEYWORD1>to-set-path</KEYWORD1>
-			<KEYWORD1>to-set-word</KEYWORD1>
-			<KEYWORD1>to-string</KEYWORD1>
-			<KEYWORD1>to-tag</KEYWORD1>
-			<KEYWORD1>to-time</KEYWORD1>
-			<KEYWORD1>to-tuple</KEYWORD1>
-			<KEYWORD1>to-url</KEYWORD1>
-			<KEYWORD1>to-word</KEYWORD1>
-			<KEYWORD1>unfocus</KEYWORD1>
-			<KEYWORD1>uninstall</KEYWORD1>
-			<KEYWORD1>unview</KEYWORD1>
-			<KEYWORD1>upgrade</KEYWORD1>
-			<KEYWORD1>Usage</KEYWORD1>
-			<KEYWORD1>vbug</KEYWORD1>
-			<KEYWORD1>view</KEYWORD1>
-			<KEYWORD1>view-install</KEYWORD1>
-			<KEYWORD1>view-prefs</KEYWORD1>
-			<KEYWORD1>what</KEYWORD1>
-			<KEYWORD1>what-dir</KEYWORD1>
-			<KEYWORD1>write-user</KEYWORD1>
-			<KEYWORD1>return</KEYWORD1>
-			<KEYWORD1>at</KEYWORD1>
-			<KEYWORD1>space</KEYWORD1>
-			<KEYWORD1>pad</KEYWORD1>
-			<KEYWORD1>across</KEYWORD1>
-			<KEYWORD1>below</KEYWORD1>
-			<KEYWORD1>origin</KEYWORD1>
-			<KEYWORD1>guide</KEYWORD1>
-			<KEYWORD1>tabs</KEYWORD1>
-			<KEYWORD1>indent</KEYWORD1>
-			<KEYWORD1>style</KEYWORD1>
-			<KEYWORD1>styles</KEYWORD1>
-			<KEYWORD1>size</KEYWORD1>
-			<KEYWORD1>sense</KEYWORD1>
-			<KEYWORD1>backcolor</KEYWORD1>
-			<KEYWORD1>do</KEYWORD1>
-			<KEYWORD1>none</KEYWORD1>
-			<KEYWORD2>action?</KEYWORD2>
-			<KEYWORD2>any-block?</KEYWORD2>
-			<KEYWORD2>any-function?</KEYWORD2>
-			<KEYWORD2>any-string?</KEYWORD2>
-			<KEYWORD2>any-type?</KEYWORD2>
-			<KEYWORD2>any-word?</KEYWORD2>
-			<KEYWORD2>binary?</KEYWORD2>
-			<KEYWORD2>bitset?</KEYWORD2>
-			<KEYWORD2>block?</KEYWORD2>
-			<KEYWORD2>char?</KEYWORD2>
-			<KEYWORD2>datatype?</KEYWORD2>
-			<KEYWORD2>date?</KEYWORD2>
-			<KEYWORD2>decimal?</KEYWORD2>
-			<KEYWORD2>email?</KEYWORD2>
-			<KEYWORD2>empty?</KEYWORD2>
-			<KEYWORD2>equal?</KEYWORD2>
-			<KEYWORD2>error?</KEYWORD2>
-			<KEYWORD2>even?</KEYWORD2>
-			<KEYWORD2>event?</KEYWORD2>
-			<KEYWORD2>file?</KEYWORD2>
-			<KEYWORD2>function?</KEYWORD2>
-			<KEYWORD2>get-word?</KEYWORD2>
-			<KEYWORD2>greater-or-equal?</KEYWORD2>
-			<KEYWORD2>greater?</KEYWORD2>
-			<KEYWORD2>hash?</KEYWORD2>
-			<KEYWORD2>head?</KEYWORD2>
-			<KEYWORD2>image?</KEYWORD2>
-			<KEYWORD2>index?</KEYWORD2>
-			<KEYWORD2>integer?</KEYWORD2>
-			<KEYWORD2>issue?</KEYWORD2>
-			<KEYWORD2>length?</KEYWORD2>
-			<KEYWORD2>lesser-or-equal?</KEYWORD2>
-			<KEYWORD2>lesser?</KEYWORD2>
-			<KEYWORD2>library?</KEYWORD2>
-			<KEYWORD2>list?</KEYWORD2>
-			<KEYWORD2>lit-path?</KEYWORD2>
-			<KEYWORD2>lit-word?</KEYWORD2>
-			<KEYWORD2>logic?</KEYWORD2>
-			<KEYWORD2>money?</KEYWORD2>
-			<KEYWORD2>native?</KEYWORD2>
-			<KEYWORD2>negative?</KEYWORD2>
-			<KEYWORD2>none?</KEYWORD2>
-			<KEYWORD2>not-equal?</KEYWORD2>
-			<KEYWORD2>number?</KEYWORD2>
-			<KEYWORD2>object?</KEYWORD2>
-			<KEYWORD2>odd?</KEYWORD2>
-			<KEYWORD2>op?</KEYWORD2>
-			<KEYWORD2>pair?</KEYWORD2>
-			<KEYWORD2>paren?</KEYWORD2>
-			<KEYWORD2>path?</KEYWORD2>
-			<KEYWORD2>port?</KEYWORD2>
-			<KEYWORD2>positive?</KEYWORD2>
-			<KEYWORD2>refinement?</KEYWORD2>
-			<KEYWORD2>routine?</KEYWORD2>
-			<KEYWORD2>same?</KEYWORD2>
-			<KEYWORD2>series?</KEYWORD2>
-			<KEYWORD2>set-path?</KEYWORD2>
-			<KEYWORD2>set-word?</KEYWORD2>
-			<KEYWORD2>strict-equal?</KEYWORD2>
-			<KEYWORD2>strict-not-equal?</KEYWORD2>
-			<KEYWORD2>string?</KEYWORD2>
-			<KEYWORD2>struct?</KEYWORD2>
-			<KEYWORD2>tag?</KEYWORD2>
-			<KEYWORD2>tail?</KEYWORD2>
-			<KEYWORD2>time?</KEYWORD2>
-			<KEYWORD2>tuple?</KEYWORD2>
-			<KEYWORD2>unset?</KEYWORD2>
-			<KEYWORD2>url?</KEYWORD2>
-			<KEYWORD2>word?</KEYWORD2>
-			<KEYWORD2>zero?</KEYWORD2>
-			<KEYWORD2>connected?</KEYWORD2>
-			<KEYWORD2>crypt-strength?</KEYWORD2>
-			<KEYWORD2>exists-key?</KEYWORD2>
-			<KEYWORD2>input?</KEYWORD2>
-			<KEYWORD2>script?</KEYWORD2>
-			<KEYWORD2>type?</KEYWORD2>
-			<KEYWORD2>value?</KEYWORD2>
-			<KEYWORD2>?</KEYWORD2>
-			<KEYWORD2>??</KEYWORD2>
-			<KEYWORD2>dir?</KEYWORD2>
-			<KEYWORD2>exists-thru?</KEYWORD2>
-			<KEYWORD2>exists?</KEYWORD2>
-			<KEYWORD2>flag-face?</KEYWORD2>
-			<KEYWORD2>found?</KEYWORD2>
-			<KEYWORD2>in-window?</KEYWORD2>
-			<KEYWORD2>info?</KEYWORD2>
-			<KEYWORD2>inside?</KEYWORD2>
-			<KEYWORD2>link-app?</KEYWORD2>
-			<KEYWORD2>link?</KEYWORD2>
-			<KEYWORD2>modified?</KEYWORD2>
-			<KEYWORD2>offset?</KEYWORD2>
-			<KEYWORD2>outside?</KEYWORD2>
-			<KEYWORD2>screen-offset?</KEYWORD2>
-			<KEYWORD2>size?</KEYWORD2>
-			<KEYWORD2>span?</KEYWORD2>
-			<KEYWORD2>view?</KEYWORD2>
-			<KEYWORD2>viewed?</KEYWORD2>
-			<KEYWORD2>win-offset?</KEYWORD2>
-			<KEYWORD2>within?</KEYWORD2>
-			<KEYWORD3>action!</KEYWORD3>
-			<KEYWORD3>any-block!</KEYWORD3>
-			<KEYWORD3>any-function!</KEYWORD3>
-			<KEYWORD3>any-string!</KEYWORD3>
-			<KEYWORD3>any-type!</KEYWORD3>
-			<KEYWORD3>any-word!</KEYWORD3>
-			<KEYWORD3>binary!</KEYWORD3>
-			<KEYWORD3>bitset!</KEYWORD3>
-			<KEYWORD3>block!</KEYWORD3>
-			<KEYWORD3>char!</KEYWORD3>
-			<KEYWORD3>datatype!</KEYWORD3>
-			<KEYWORD3>date!</KEYWORD3>
-			<KEYWORD3>decimal!</KEYWORD3>
-			<KEYWORD3>email!</KEYWORD3>
-			<KEYWORD3>error!</KEYWORD3>
-			<KEYWORD3>event!</KEYWORD3>
-			<KEYWORD3>file!</KEYWORD3>
-			<KEYWORD3>function!</KEYWORD3>
-			<KEYWORD3>get-word!</KEYWORD3>
-			<KEYWORD3>hash!</KEYWORD3>
-			<KEYWORD3>image!</KEYWORD3>
-			<KEYWORD3>integer!</KEYWORD3>
-			<KEYWORD3>issue!</KEYWORD3>
-			<KEYWORD3>library!</KEYWORD3>
-			<KEYWORD3>list!</KEYWORD3>
-			<KEYWORD3>lit-path!</KEYWORD3>
-			<KEYWORD3>lit-word!</KEYWORD3>
-			<KEYWORD3>logic!</KEYWORD3>
-			<KEYWORD3>money!</KEYWORD3>
-			<KEYWORD3>native!</KEYWORD3>
-			<KEYWORD3>none!</KEYWORD3>
-			<KEYWORD3>number!</KEYWORD3>
-			<KEYWORD3>object!</KEYWORD3>
-			<KEYWORD3>op!</KEYWORD3>
-			<KEYWORD3>pair!</KEYWORD3>
-			<KEYWORD3>paren!</KEYWORD3>
-			<KEYWORD3>path!</KEYWORD3>
-			<KEYWORD3>port!</KEYWORD3>
-			<KEYWORD3>refinement!</KEYWORD3>
-			<KEYWORD3>routine!</KEYWORD3>
-			<KEYWORD3>series!</KEYWORD3>
-			<KEYWORD3>set-path!</KEYWORD3>
-			<KEYWORD3>set-word!</KEYWORD3>
-			<KEYWORD3>string!</KEYWORD3>
-			<KEYWORD3>struct!</KEYWORD3>
-			<KEYWORD3>symbol!</KEYWORD3>
-			<KEYWORD3>tag!</KEYWORD3>
-			<KEYWORD3>time!</KEYWORD3>
-			<KEYWORD3>tuple!</KEYWORD3>
-			<KEYWORD3>unset!</KEYWORD3>
-			<KEYWORD3>url!</KEYWORD3>
-			<KEYWORD3>word!</KEYWORD3>
-
-			<LITERAL2>true</LITERAL2>
-			<LITERAL2>false</LITERAL2>
-			<LITERAL2>self</LITERAL2>
-		</KEYWORDS>
-	</RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/redcode.xml b/qpython/src/main/assets/syntax/redcode.xml
deleted file mode 100644
index 09d056d8..00000000
--- a/qpython/src/main/assets/syntax/redcode.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!--
-
-	redcode syntax highlighting file for jedit
-
-	Will Varfar, 2002
-
--->
-
-<MODE>
-
-	<PROPS>
-		<PROPERTY NAME="lineComment" VALUE=";" />
-	</PROPS>
-
-	<RULES HIGHLIGHT_DIGITS="TRUE" DEFAULT="MARKUP" IGNORE_CASE="TRUE">
-
-	    <EOL_SPAN TYPE="COMMENT2">;redcode</EOL_SPAN>
-	    <EOL_SPAN TYPE="COMMENT2">;author</EOL_SPAN>
-	    <EOL_SPAN TYPE="COMMENT2">;name</EOL_SPAN>
-	    <EOL_SPAN TYPE="COMMENT2">;strategy</EOL_SPAN>
-	    <EOL_SPAN TYPE="COMMENT2">;password</EOL_SPAN>
-	    <EOL_SPAN TYPE="COMMENT1">;</EOL_SPAN>
-
-		<SEQ TYPE="KEYWORD3">.AB</SEQ> <!-- Instructions read the A-field of the A-instruction  and the B-field of the B-instruction and write to B-fields. -->
-		<SEQ TYPE="KEYWORD3">.BA</SEQ> <!-- Instructions read the B-field of the A-instruction  and the A-field of the B-instruction and write to A-fields. -->
-		<SEQ TYPE="KEYWORD3">.A</SEQ> <!--Instructions read and write A-fields. -->
-		<SEQ TYPE="KEYWORD3">.B</SEQ> <!-- Instructions read and write B-fields. -->
-		<SEQ TYPE="KEYWORD3">.F</SEQ> <!-- Instructions read both A- and B-fields of  the  the  A- and  B-instruction and write to both A- and B-fields (A to A and B to B). -->
-		<SEQ TYPE="KEYWORD3">.X</SEQ> <!-- Instructions read both A- and B-fields of  the  the  A- and  B-instruction  and  write  to both A- and B-fields exchanging fields (A to B and B to A). -->
-		<SEQ TYPE="KEYWORD3">.I</SEQ> <!-- Instructions read and write entire instructions. -->
-
-		<SEQ TYPE="OPERATOR">,</SEQ>
-		<SEQ TYPE="OPERATOR">:</SEQ>
-		<SEQ TYPE="OPERATOR">(</SEQ>
-		<SEQ TYPE="OPERATOR">)</SEQ>
-
-		<!-- Arithmetic: -->
-		<SEQ TYPE="OPERATOR">+</SEQ>   <!-- addition or unary plus -->
-		<SEQ TYPE="OPERATOR">-</SEQ>   <!-- subtraction or unary minus -->
-		<SEQ TYPE="OPERATOR">/</SEQ>   <!-- division -->
-		<SEQ TYPE="OPERATOR">%</SEQ>   <!-- modulo (remainder of division) -->
-
-		<!-- Comparison (*): -->
-		<SEQ TYPE="OPERATOR">==</SEQ>  <!-- equality -->
-		<SEQ TYPE="OPERATOR">!=</SEQ>  <!-- inequality -->
-		<SEQ TYPE="OPERATOR">&lt;=</SEQ>  <!-- less than or equal -->
-		<SEQ TYPE="OPERATOR">&gt;=</SEQ>  <!-- greater than or equal -->
-		<SEQ TYPE="OPERATOR">&lt;</SEQ>   <!-- less than -->
-		<SEQ TYPE="OPERATOR">&gt;</SEQ>   <!-- greater than -->
-
-		<!-- Logical (*): -->
-		<SEQ TYPE="OPERATOR">&amp;&amp;</SEQ>  <!-- and -->
-		<SEQ TYPE="OPERATOR">||</SEQ>  <!-- or -->
-		<SEQ TYPE="OPERATOR">!</SEQ>   <!-- unary negation -->
-
-		<!-- Assignment (*): -->
-		<SEQ TYPE="OPERATOR">=</SEQ>   <!-- (to register variables a..z) -->
-
-
-		<SEQ TYPE="LITERAL1">$</SEQ>
-		<SEQ TYPE="LITERAL1">@</SEQ>
-		<SEQ TYPE="LITERAL1">#</SEQ>
-		<SEQ TYPE="LITERAL1">*</SEQ>
-		<SEQ TYPE="LITERAL1">{</SEQ>
-		<SEQ TYPE="LITERAL1">}</SEQ>
-
-		<KEYWORDS>
-
-			<LITERAL2>CORESIZE</LITERAL2> <!-- value of -s parameter (default: 8000) -->
-			<LITERAL2>MAXPROCESSES</LITERAL2> <!-- value of -p parameter (default: 8000) -->
-			<LITERAL2>MAXCYCLES</LITERAL2> <!-- value of -c parameter (default: 80000) -->
-			<LITERAL2>MAXLENGTH</LITERAL2> <!-- value of -l parameter (default: 100) -->
-			<LITERAL2>MINDISTANCE</LITERAL2> <!-- value of -d parameter (default: 100) -->
-			<LITERAL2>ROUNDS</LITERAL2> <!-- (+) value of -r parameter (default: 1) -->
-			<LITERAL2>PSPACESIZE</LITERAL2> <!-- (+) value of -S parameter (default: 1/16th CORESIZE) -->
-			<LITERAL2>CURLINE</LITERAL2> <!-- current line in generated assembly (starts with 0) -->
-			<LITERAL2>VERSION</LITERAL2> <!-- pMARS version ("60" is v0.6.0) -->
-			<LITERAL2>WARRIORS</LITERAL2> <!-- number of warriors specified on command line -->
-
-			<KEYWORD1>DAT</KEYWORD1> <!-- terminate process -->
-			<KEYWORD1>MOV</KEYWORD1> <!-- move from A to B -->
-			<KEYWORD1>ADD</KEYWORD1> <!-- add A to B, store result in B -->
-			<KEYWORD1>SUB</KEYWORD1> <!-- subtract A from B, store result in B -->
-			<KEYWORD1>MUL</KEYWORD1> <!-- multiply A by B, store result in B -->
-			<KEYWORD1>DIV</KEYWORD1> <!-- divide B by A, store result in B if A <> 0, else terminate -->
-			<KEYWORD1>MOD</KEYWORD1> <!-- divide B by A, store remainder in B if A <> 0, else terminate -->
-			<KEYWORD1>JMP</KEYWORD1> <!-- transfer execution to A -->
-			<KEYWORD1>JMZ</KEYWORD1> <!-- transfer execution to A if B is zero -->
-			<KEYWORD1>JMN</KEYWORD1> <!-- transfer execution to A if B is non-zero -->
-			<KEYWORD1>DJN</KEYWORD1> <!-- decrement B, if B is non-zero, transfer execution to A -->
-			<KEYWORD1>SPL</KEYWORD1> <!-- split off process to A -->
-			<KEYWORD1>SLT</KEYWORD1> <!-- skip next instruction if A is less than B -->
-			<KEYWORD1>CMP</KEYWORD1> <!-- same as SEQ -->
-			<KEYWORD1>SEQ</KEYWORD1> <!-- (*) Skip next instruction if A is equal to B -->
-			<KEYWORD1>SNE</KEYWORD1> <!-- (*) Skip next instruction if A is not equal to B -->
-			<KEYWORD1>NOP</KEYWORD1> <!-- (*) No operation -->
-			<KEYWORD1>LDP</KEYWORD1> <!-- (+) Load P-space cell A into core address B -->
-			<KEYWORD1>STP</KEYWORD1> <!-- (+) Store A-number into P-space cell B -->
-
-			<KEYWORD2>EQU</KEYWORD2>
-			<KEYWORD2>ORG</KEYWORD2>
-			<KEYWORD2>FOR</KEYWORD2>
-			<KEYWORD2>ROF</KEYWORD2>
-			<KEYWORD2>END</KEYWORD2>
-			<KEYWORD2>PIN</KEYWORD2>
-			<KEYWORD2>CORESIZE</KEYWORD2> <!-- value of -s parameter (default: 8000) -->
-			<KEYWORD2>MAXPROCESSES</KEYWORD2> <!-- value of -p parameter (default: 8000) -->
-			<KEYWORD2>MAXCYCLES</KEYWORD2> <!-- value of -c parameter (default: 80000) -->
-			<KEYWORD2>MAXLENGTH</KEYWORD2> <!-- value of -l parameter (default: 100) -->
-			<KEYWORD2>MINDISTANCE</KEYWORD2> <!-- value of -d parameter (default: 100) -->
-			<KEYWORD2>ROUNDS</KEYWORD2> <!-- (+) value of -r parameter (default: 1) -->
-			<KEYWORD2>PSPACESIZE</KEYWORD2> <!-- (+) value of -S parameter (default: 1/16th CORESIZE) -->
-			<KEYWORD2>CURLINE</KEYWORD2> <!-- current line in generated assembly (starts with 0) -->
-			<KEYWORD2>VERSION</KEYWORD2> <!-- pMARS version ("60" is v0.6.0) -->
-			<KEYWORD2>WARRIORS</KEYWORD2> <!-- number of warriors specified on command line -->
-
-		</KEYWORDS>
-
-	</RULES>
-
-</MODE>
-
-
diff --git a/qpython/src/main/assets/syntax/regex.xml b/qpython/src/main/assets/syntax/regex.xml
deleted file mode 100644
index a455f5be..00000000
--- a/qpython/src/main/assets/syntax/regex.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM 'xmode.dtd'>
-
-<!-- Regular Expression mode, by Kevin Hunter -->
-
-<!-- Currently implemented artifacts:
-***** Classes
-[...] - user-defined character classes
-\d - Numerical characters (eq. [0-9])
-\D - Non-numerical characters (eq. [^0-9])
-\w - Alphanumeric characters and underscore (eq. [A-Za-z0-9_])
-\W - Opposite of \w (eq. [^A-Za-z0-9_])
-\s - Whitespace characters (ex. space, tab, formfeed, newline)
-\S - Non-whitespace characters
-\b - Word-break character
-.  - Any character, generally not including a newline (\n)
-
-***** Operators
-^ - Match at beginning of string
-$ - Match at end of string
-? - optionally match previous item token
-* - Match previous token 0 or more times.
-+ - Match previous token 1 or more times.
-| - Logical OR, allowing the previous token or next token to match
-{m} - Match previous token exactly m times.
-{m,} - Match previous token at least m times
-{m,n} - Match previous token between m and n times, inclusive.
-
-***** Functions
-[^...] - negate user-defined character classes
-(...) - Backreference - effectively save the matched part for later use
-(?:...) - Group - Don't save, just mark the section of the pattern as a group
-(?=...) - zero-width positive lookahead assertion
-(?!...) - zero-width negative lookahead assertion
-(?<=...) - zero-width positive lookbehind assertion
-(?<!...) - zero-width negative lookbehind assertion
-
--->
-<MODE>
-	<RULES IGNORE_CASE='FALSE' HIGHLIGHT_DIGITS='TRUE' SET='FORCED_NUMBER'>
-		<SEQ TYPE='OPERATOR'>,</SEQ>
-	</RULES>
-
-	<RULES IGNORE_CASE='FALSE' HIGHLIGHT_DIGITS='TRUE'>
-		<SEQ TYPE='NULL'>\\</SEQ>
-		<SEQ TYPE='NULL'>\(</SEQ>
-		<SEQ TYPE='NULL'>\)</SEQ>
-		<SEQ TYPE='NULL'>\[</SEQ>
-		<SEQ TYPE='NULL'>\]</SEQ>
-		<SEQ TYPE='NULL'>\{</SEQ>
-		<SEQ TYPE='NULL'>\}</SEQ>
-		<SEQ TYPE='NULL'>\^</SEQ>
-		<SEQ TYPE='NULL'>\$</SEQ>
-		<SEQ TYPE='NULL'>\?</SEQ>
-		<SEQ TYPE='NULL'>\+</SEQ>
-		<SEQ TYPE='NULL'>\*</SEQ>
-		<SEQ TYPE='NULL'>\.</SEQ>
-		<SEQ TYPE='NULL'>\|</SEQ>
-
-		<SEQ TYPE='OPERATOR'>^</SEQ>
-		<SEQ TYPE='OPERATOR'>$</SEQ>
-		<SEQ TYPE='OPERATOR'>?</SEQ>
-		<SEQ TYPE='OPERATOR'>*</SEQ>
-		<SEQ TYPE='OPERATOR'>+</SEQ>
-		<SEQ TYPE='OPERATOR'>|</SEQ>
-
-		<SEQ TYPE='KEYWORD1'>\b</SEQ>
-
-		<SEQ TYPE='DIGIT'>\d</SEQ>
-		<SEQ TYPE='LITERAL2'>\D</SEQ>
-
-		<SEQ TYPE='KEYWORD3'>\w</SEQ>
-		<SEQ TYPE='KEYWORD3'>.</SEQ>
-		<SEQ TYPE='LITERAL3'>\W</SEQ>
-
-		<SEQ TYPE='KEYWORD4'>\s</SEQ>
-		<SEQ TYPE='LITERAL4'>\S</SEQ>
-
-		<SPAN TYPE='FUNCTION' DELEGATE='MAIN'>
-			<BEGIN>[^</BEGIN> <!-- user-defined negative character class -->
-			<END>]</END>
-		</SPAN>
-
-		<SPAN TYPE='FUNCTION' DELEGATE='MAIN'>
-			<BEGIN>(?=</BEGIN> <!-- zero-width positive lookahead assertion -->
-			<END>)</END>
-		</SPAN>
-		<SPAN TYPE='FUNCTION' DELEGATE='MAIN'>
-			<BEGIN>(?!</BEGIN> <!-- zero-width negative lookahead assertion -->
-			<END>)</END>
-		</SPAN>
-		<SPAN TYPE='FUNCTION' DELEGATE='MAIN'>
-			<BEGIN><![CDATA[(?<=]]></BEGIN> <!-- zero-width positive lookbehind assertion -->
-			<END>)</END>
-		</SPAN>
-		<SPAN TYPE='FUNCTION' DELEGATE='MAIN'>
-			<BEGIN><![CDATA[(?<!]]></BEGIN> <!-- zero-width negative lookbehind assertion -->
-			<END>)</END>
-		</SPAN>
-		<SPAN TYPE='FUNCTION' DELEGATE='MAIN'>
-			<BEGIN>(?:</BEGIN> <!-- unsaved group -->
-			<END>)</END>
-		</SPAN>
-
-		<SPAN TYPE='OPERATOR' DELEGATE='FORCED_NUMBER'>
-			<BEGIN>{</BEGIN>
-			<END>}</END>
-		</SPAN>
-		<SPAN TYPE='OPERATOR' DELEGATE='MAIN'>
-			<BEGIN>[</BEGIN> <!-- user-defined character class -->
-			<END>]</END>
-		</SPAN>
-		<SPAN TYPE='FUNCTION' DELEGATE='MAIN'>
-			<BEGIN>(</BEGIN> <!-- saved group (backreference) -->
-			<END>)</END>
-		</SPAN>
-	</RULES>
-
-</MODE>
- 	  	 
diff --git a/qpython/src/main/assets/syntax/relax_ng_compact.xml b/qpython/src/main/assets/syntax/relax_ng_compact.xml
deleted file mode 100644
index f966fbca..00000000
--- a/qpython/src/main/assets/syntax/relax_ng_compact.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!-- RELAX NG Compact Syntax mode, by Randy Hudson. -->
-<!-- mode catalog entry:
-     
-  <MODE NAME="relax-ng-compact" FILE="relax_ng_compact.xml"
-      FILE_NAME_GLOB="*.rnc" /> 
-  -->
-
-<MODE>
-    <PROPS>
-        <PROPERTY NAME="indentOpenBrackets" VALUE="{" />
-        <PROPERTY NAME="indentCloseBrackets" VALUE="}" />
-        <PROPERTY NAME="doubleBracketIndent" VALUE="false" />
-        <PROPERTY NAME="lineComment" VALUE="#" />
-        <PROPERTY NAME="wordBreakChars" VALUE=",+-=&lt;&gt;/?^&amp;*" />
-    </PROPS>  
-    
-    <RULES IGNORE_CASE="FALSE" HIGHLIGHT_DIGITS="TRUE">
-    
-        <EOL_SPAN TYPE="COMMENT1">#</EOL_SPAN>
-        <SPAN TYPE="LITERAL1" NO_LINE_BREAK="TRUE">
-            <BEGIN>"</BEGIN>
-            <END>"</END>
-        </SPAN>
-        <SPAN TYPE="LITERAL1" NO_LINE_BREAK="TRUE">
-            <BEGIN>'</BEGIN>
-            <END>'</END>
-        </SPAN>
-        <SPAN TYPE='LITERAL2'>
-            <BEGIN>"""</BEGIN>
-            <END>"""</END>
-        </SPAN>
-        <SPAN TYPE='LITERAL2'>
-            <BEGIN>'''</BEGIN>
-            <END>'''</END>
-        </SPAN>
- 
-        <SEQ TYPE="OPERATOR">+</SEQ>
-        <SEQ TYPE="OPERATOR">*</SEQ>
-        <SEQ TYPE="OPERATOR">?</SEQ>
-        <SEQ TYPE="OPERATOR">&amp;=</SEQ>
-        <SEQ TYPE="OPERATOR">&amp;</SEQ>
-        <SEQ TYPE="OPERATOR">|=</SEQ>
-        <SEQ TYPE="OPERATOR">|</SEQ>
-        <SEQ TYPE="OPERATOR">=</SEQ>
-        <SEQ TYPE="OPERATOR">-</SEQ>
-        
-        <MARK_FOLLOWING TYPE="NULL">\</MARK_FOLLOWING>
-        
-        <KEYWORDS>
-            <KEYWORD1>attribute</KEYWORD1>
-            <KEYWORD1>default</KEYWORD1>
-            <KEYWORD1>datatypes</KEYWORD1>
-            <KEYWORD1>div</KEYWORD1>
-            <KEYWORD1>element</KEYWORD1>
-            <KEYWORD1>empty</KEYWORD1>
-            <KEYWORD1>external</KEYWORD1>
-            <KEYWORD1>grammar</KEYWORD1>
-            <KEYWORD1>include</KEYWORD1>
-            <KEYWORD1>inherit</KEYWORD1>
-            <KEYWORD1>list</KEYWORD1>
-            <KEYWORD1>mixed</KEYWORD1>
-            <KEYWORD1>namespace</KEYWORD1>
-            <KEYWORD1>notAllowed</KEYWORD1>
-            <KEYWORD1>parent</KEYWORD1>
-            <KEYWORD1>start</KEYWORD1>
-            <KEYWORD2>string</KEYWORD2>
-            <KEYWORD1>text</KEYWORD1>
-            <KEYWORD2>token</KEYWORD2>
-        </KEYWORDS>
-    </RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/rest.xml b/qpython/src/main/assets/syntax/rest.xml
deleted file mode 100644
index d820ca13..00000000
--- a/qpython/src/main/assets/syntax/rest.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="lineComment" VALUE=".. "/>
-		<!-- indent after literal blocks and directives -->
-		<PROPERTY NAME="indentNextLines" VALUE=".*::$"/>
-	</PROPS>
-
-	<RULES IGNORE_CASE="FALSE" HIGHLIGHT_DIGITS="FALSE">
-
-		<!-- targets -->
-		<EOL_SPAN AT_LINE_START="TRUE" TYPE="KEYWORD3">__</EOL_SPAN>
-		<EOL_SPAN AT_LINE_START="TRUE" TYPE="KEYWORD3">.. _</EOL_SPAN>
-
-		<!-- section titles -->
-		<SEQ_REGEXP HASH_CHAR="===" TYPE="LABEL">={3,}</SEQ_REGEXP>
-		<SEQ_REGEXP HASH_CHAR="---" TYPE="LABEL">-{3,}</SEQ_REGEXP>
-		<SEQ_REGEXP HASH_CHAR="~~~" TYPE="LABEL">~{3,}</SEQ_REGEXP>
-		<SEQ_REGEXP HASH_CHAR="###" TYPE="LABEL">#{3,}</SEQ_REGEXP>
-		<SEQ_REGEXP HASH_CHAR='"""' TYPE="LABEL">"{3,}</SEQ_REGEXP>
-		<SEQ_REGEXP HASH_CHAR="^^^" TYPE="LABEL">\^{3,}</SEQ_REGEXP>
-		<SEQ_REGEXP HASH_CHAR="+++" TYPE="LABEL">\+{3,}</SEQ_REGEXP>
-		<SEQ_REGEXP HASH_CHAR="***" TYPE="LABEL">\*{3,}</SEQ_REGEXP>
-
-		<!-- replacement -->
-		<SEQ_REGEXP
-			HASH_CHAR=".."
-			AT_LINE_START="TRUE"
-			TYPE="LITERAL3"
-		>\.\.\s\|[^|]+\|</SEQ_REGEXP>
-
-		<!-- substitution -->
-		<SEQ_REGEXP
-			HASH_CHAR="|"
-			AT_LINE_START="FALSE"
-			TYPE="LITERAL4"
-		>\|[^|]+\|</SEQ_REGEXP>
-
-		<!-- directives: .. name:: -->
-		<SEQ_REGEXP
-			HASH_CHAR=".."
-			AT_LINE_START="TRUE"
-			TYPE="LITERAL2"
-		>\.\.\s[A-z][A-z0-9-_]+::</SEQ_REGEXP>
-
-		<!-- strong emphasis: **...** -->
-		<SEQ_REGEXP
-			HASH_CHAR="**"
-			AT_LINE_START="FALSE"
-			TYPE="KEYWORD2"
-		>\*\*[^*]+\*\*</SEQ_REGEXP>
-
-		<!-- emphasis: *...* -->
-		<SEQ_REGEXP
-			HASH_CHAR="*"
-			AT_LINE_START="FALSE"
-			TYPE="KEYWORD4"
-		>\*[^\s*][^*]*\*</SEQ_REGEXP>
-
-		<!-- comments -->
-		<EOL_SPAN AT_LINE_START="TRUE" TYPE="COMMENT1">.. </EOL_SPAN>
-
-		<!-- links: `...`_ or `...`__ -->
-		<SEQ_REGEXP
-			HASH_CHAR="`"
-			TYPE="LABEL"
-		>`[A-z0-9]+[^`]+`_{1,2}</SEQ_REGEXP>
-
-		<!-- footnote reference: [0]_ -->
-		<SEQ_REGEXP
-			HASH_CHAR="["
-			TYPE="LABEL"
-		>\[[0-9]+\]_</SEQ_REGEXP>
-
-		<!-- footnote reference: [#]_ or [#foo]_ -->
-		<SEQ_REGEXP
-			HASH_CHAR="[#"
-			TYPE="LABEL"
-		>\[#[A-z0-9_]*\]_</SEQ_REGEXP>
-
-		<!-- footnote reference: [*]_ -->
-		<SEQ TYPE="LABEL">[*]_</SEQ>
-
-		<!-- citation reference: [foo]_ -->
-		<SEQ_REGEXP
-			HASH_CHAR="["
-			TYPE="LABEL"
-		>\[[A-z][A-z0-9_-]*\]_</SEQ_REGEXP>
-
-		<!-- inline literal: ``...``-->
-		<!--<SEQ_REGEXP
-			HASH_CHAR="``"
-			TYPE="LITERAL1"
-		>``[^`]+``</SEQ_REGEXP>-->
-		<SPAN TYPE="LITERAL1" ESCAPE="\">
-			<BEGIN>``</BEGIN>
-			<END>``</END>
-		</SPAN>
-
-		<!-- interpreted text: `...` -->
-		<!--
-		<SEQ_REGEXP
-			HASH_CHAR="`"
-			TYPE="KEYWORD1"
-		>`[^`]+`</SEQ_REGEXP>
-		-->
-		<SPAN TYPE="KEYWORD1">
-			<BEGIN>`</BEGIN>
-			<END>`</END>
-		</SPAN>
-
-		<SEQ_REGEXP HASH_CHAR="```" TYPE="LABEL">`{3,}</SEQ_REGEXP>
-
-		<!-- :field list: -->
-		<SEQ_REGEXP
-			HASH_CHAR=":"
-			TYPE="KEYWORD1"
-		>:[A-z][A-z0-9 	=\s\t_]*:</SEQ_REGEXP>
-
-		<!-- table -->
-		<SEQ_REGEXP
-			HASH_CHAR="+-"
-			TYPE="LABEL"
-		>\+-[+-]+</SEQ_REGEXP>
-		<SEQ_REGEXP
-			HASH_CHAR="+?"
-			TYPE="LABEL"
-		>\+=[+=]+</SEQ_REGEXP>
-
-	</RULES>
-
-</MODE>
diff --git a/qpython/src/main/assets/syntax/rfc.xml b/qpython/src/main/assets/syntax/rfc.xml
deleted file mode 100644
index 6c1ac58d..00000000
--- a/qpython/src/main/assets/syntax/rfc.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- RFC mode by Matthieu Casanova -->
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="contextInsensitive" VALUE="true" />
-	</PROPS>
-	<RULES HIGHLIGHT_DIGITS="TRUE" IGNORE_CASE="FALSE">
-		<SEQ_REGEXP HASH_CHAR="[" TYPE="KEYWORD3">\[Page \d+\]</SEQ_REGEXP>
-		<SEQ_REGEXP HASH_CHAR="[" TYPE="KEYWORD2">\[RFC\d+\]</SEQ_REGEXP>
-		<SPAN TYPE="LITERAL1" NO_LINE_BREAK="FALSE">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-		<SEQ_REGEXP TYPE="MARKUP" AT_LINE_START="TRUE">\d.*</SEQ_REGEXP>
-		<KEYWORDS>
-			<!--{{{ Keyword list from RFC2119 -->
-			<KEYWORD1>MUST</KEYWORD1>
-			<KEYWORD1>MUST NOT</KEYWORD1>
-			<KEYWORD1>REQUIRED</KEYWORD1>
-			<KEYWORD1>SHALL</KEYWORD1>
-			<KEYWORD1>SHALL NOT</KEYWORD1>
-			<KEYWORD1>SHOULD</KEYWORD1>
-			<KEYWORD1>SHOULD NOT</KEYWORD1>
-			<KEYWORD1>RECOMMENDED</KEYWORD1>
-			<KEYWORD1>MAY</KEYWORD1>
-			<KEYWORD1>OPTIONAL</KEYWORD1> 
-			<!--}}}-->
-		</KEYWORDS>
-	</RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/rhtml.xml b/qpython/src/main/assets/syntax/rhtml.xml
deleted file mode 100644
index e2e49511..00000000
--- a/qpython/src/main/assets/syntax/rhtml.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!-- rhtml (ruby+html) mode -->
-
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="commentStart" VALUE="&lt;!--" />
-		<PROPERTY NAME="commentEnd" VALUE="--&gt;" />
-		<PROPERTY NAME="commentStart" VALUE="&lt;%#" />
-		<PROPERTY NAME="commentEnd" VALUE="%&gt;" />
-	</PROPS>
-	<RULES IGNORE_CASE="TRUE">
-		
-		<!-- eRuby comment -->
-		<SPAN TYPE="COMMENT1">
-			<BEGIN>&lt;%#</BEGIN>
-			<END>%&gt;</END>
-		</SPAN>
-
-		<!-- eRuby assignment -->
-		<SPAN TYPE="MARKUP" DELEGATE="ruby::MAIN">
-			<BEGIN>&lt;%=</BEGIN>
-			<END>%&gt;</END>
-		</SPAN>
-
-		<!-- eRuby statement -->
-		<SPAN TYPE="MARKUP" DELEGATE="ruby::MAIN">
-			<BEGIN>&lt;%</BEGIN>
-			<END>%&gt;</END>
-		</SPAN>
-
-		<!-- SGML comment -->
-		<SPAN TYPE="COMMENT1">
-			<BEGIN>&lt;!--</BEGIN>
-			<END>--&gt;</END>
-		</SPAN>
-
-		<!-- JavaScript -->
-		<SPAN TYPE="MARKUP" DELEGATE="html::JAVASCRIPT">
-			<BEGIN>&lt;SCRIPT</BEGIN>
-			<END>&lt;/SCRIPT&gt;</END>
-		</SPAN>
-
-		<!-- stylesheet -->
-		<SPAN TYPE="MARKUP" DELEGATE="html::CSS">
-			<BEGIN>&lt;STYLE</BEGIN>
-			<END>&lt;/STYLE&gt;</END>
-		</SPAN>
-
-		<!-- DTD instructions -->
-		<SPAN TYPE="KEYWORD2" DELEGATE="xml::DTD-TAGS">
-			<BEGIN>&lt;!</BEGIN>
-			<END>&gt;</END>
-		</SPAN>
-
-		<!-- markup tags -->
-		<SPAN TYPE="MARKUP" DELEGATE="TAGS">
-			<BEGIN>&lt;</BEGIN>
-			<END>&gt;</END>
-		</SPAN>
-
-		<!-- SGML entities -->
-		<SPAN TYPE="LITERAL2" NO_WORD_BREAK="TRUE">
-			<BEGIN>&amp;</BEGIN>
-			<END>;</END>
-		</SPAN>
-	</RULES>
-
-	<RULES SET="TAGS" DEFAULT="MARKUP">
-
-		<SPAN TYPE="COMMENT1">
-			<BEGIN>&lt;!--</BEGIN>
-			<END>--&gt;</END>
-		</SPAN>
-
-		<SPAN TYPE="COMMENT1">
-			<BEGIN>&lt;%#</BEGIN>
-			<END>%&gt;</END>
-		</SPAN>
-
-		<SPAN TYPE="LITERAL1" DELEGATE="TAGS_LITERAL">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-
-		<SPAN TYPE="LITERAL1" DELEGATE="TAGS_LITERAL">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-
-		<SEQ TYPE="OPERATOR">=</SEQ>
-	</RULES>
-
-	<RULES SET="TAGS_LITERAL" DEFAULT="LITERAL1">
-
-		<SPAN TYPE="MARKUP">
-			<BEGIN>&lt;%</BEGIN>
-			<END>%&gt;</END>
-		</SPAN>
-
-		<SPAN TYPE="MARKUP">
-			<BEGIN>&lt;%=</BEGIN>
-			<END>%&gt;</END>
-		</SPAN>
-	</RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/rib.xml b/qpython/src/main/assets/syntax/rib.xml
deleted file mode 100644
index 2dff6584..00000000
--- a/qpython/src/main/assets/syntax/rib.xml
+++ /dev/null
@@ -1,221 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-<!--
-jEdit edit mode for Renderman Interface Bytestream (*.rib) files
-version 1.0 - 9 nov 2003
-by Alessandro Falappa (alessandro@falappa.net)
-Initial keyword list taken from a syntax highlighting definition
-for TextPad text editor by Kharitonov Konstantin (aqua@sm.bmstu.ru)
--->
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="lineComment" VALUE="#"/>
-		<PROPERTY NAME="indentNextLines"
-			  VALUE="Begin|WorldBegin|FrameBegin|TransformBegin|AttributeBegin|SolidBegin|ObjectBegin|MotionBegin"/>
-		<PROPERTY NAME="doubleBracketIndent" VALUE="false"/>
-		<PROPERTY NAME="contextInsensitive" VALUE="true"/>
-	</PROPS>
-	<RULES IGNORE_CASE="FALSE" HIGHLIGHT_DIGITS="TRUE" DIGIT_RE="([\p{Digit}]+(e[\p{Digit}]*)?)">
-		<EOL_SPAN AT_WHITESPACE_END="TRUE" TYPE="COMMENT1">#</EOL_SPAN>
-		<EOL_SPAN TYPE="COMMENT2">#</EOL_SPAN>
-		<SEQ TYPE="OPERATOR">-</SEQ>
-		<SEQ TYPE="OPERATOR">+</SEQ>
-		<SEQ TYPE="OPERATOR">[</SEQ>
-		<SEQ TYPE="OPERATOR">]</SEQ>
-		<SPAN TYPE="LITERAL1" NO_LINE_BREAK="TRUE" DELEGATE="LITERALS">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-		<KEYWORDS>
-			<KEYWORD1>float</KEYWORD1>
-			<KEYWORD1>string</KEYWORD1>
-			<KEYWORD1>color</KEYWORD1>
-			<KEYWORD1>point</KEYWORD1>
-			<KEYWORD1>vector</KEYWORD1>
-			<KEYWORD1>normal</KEYWORD1>
-			<KEYWORD1>matrix</KEYWORD1>
-			<KEYWORD1>void</KEYWORD1>
-			<KEYWORD1>varying</KEYWORD1>
-			<KEYWORD1>uniform</KEYWORD1>
-			<KEYWORD1>output</KEYWORD1>
-			<KEYWORD1>extern</KEYWORD1>
-
-			<KEYWORD2>Begin</KEYWORD2>
-			<KEYWORD2>End</KEYWORD2>
-			<KEYWORD2>Declare</KEYWORD2>
-			<KEYWORD2>RtContextHandle</KEYWORD2>
-			<KEYWORD2>ContextHandle</KEYWORD2>
-			<KEYWORD2>Context</KEYWORD2>
-			<KEYWORD2>FrameBegin</KEYWORD2>
-			<KEYWORD2>FrameEnd</KEYWORD2>
-			<KEYWORD2>WorldBegin</KEYWORD2>
-			<KEYWORD2>WorldEnd</KEYWORD2>
-			<KEYWORD2>SolidBegin</KEYWORD2>
-			<KEYWORD2>SolidEnd</KEYWORD2>
-			<KEYWORD2>MotionBegin</KEYWORD2>
-			<KEYWORD2>MotionEnd</KEYWORD2>
-			<KEYWORD2>ObjectBegin</KEYWORD2>
-			<KEYWORD2>ObjectEnd</KEYWORD2>
-			<KEYWORD2>Format</KEYWORD2>
-			<KEYWORD2>FrameAspectRatio</KEYWORD2>
-			<KEYWORD2>ScreenWindow</KEYWORD2>
-			<KEYWORD2>CropWindow</KEYWORD2>
-			<KEYWORD2>Projection</KEYWORD2>
-			<KEYWORD2>Clipping</KEYWORD2>
-			<KEYWORD2>ClippingPlane</KEYWORD2>
-			<KEYWORD2>DepthOfField</KEYWORD2>
-			<KEYWORD2>Shutter</KEYWORD2>
-			<KEYWORD2>PixelVariance</KEYWORD2>
-			<KEYWORD2>PixelSamples</KEYWORD2>
-			<KEYWORD2>PixelFilter</KEYWORD2>
-			<KEYWORD2>Exposure</KEYWORD2>
-			<KEYWORD2>Imager</KEYWORD2>
-			<KEYWORD2>Quantize</KEYWORD2>
-			<KEYWORD2>Display</KEYWORD2>
-			<KEYWORD2>Hider</KEYWORD2>
-			<KEYWORD2>ColorSamples</KEYWORD2>
-			<KEYWORD2>RelativeDetail</KEYWORD2>
-			<KEYWORD2>Option</KEYWORD2>
-			<KEYWORD2>AttributeBegin</KEYWORD2>
-			<KEYWORD2>AttributeEnd</KEYWORD2>
-			<KEYWORD2>Color</KEYWORD2>
-			<KEYWORD2>Opacity</KEYWORD2>
-			<KEYWORD2>TextureCoordinates</KEYWORD2>
-			<KEYWORD2>RtLightHandle</KEYWORD2>
-			<KEYWORD2>LightSource</KEYWORD2>
-			<KEYWORD2>AreaLightSource</KEYWORD2>
-			<KEYWORD2>Illuminate</KEYWORD2>
-			<KEYWORD2>Surface</KEYWORD2>
-			<KEYWORD2>Displacement</KEYWORD2>
-			<KEYWORD2>Atmosphere</KEYWORD2>
-			<KEYWORD2>Interior</KEYWORD2>
-			<KEYWORD2>Exterior</KEYWORD2>
-			<KEYWORD2>ShadingRate</KEYWORD2>
-			<KEYWORD2>ShadingInterpolation</KEYWORD2>
-			<KEYWORD2>Matte</KEYWORD2>
-			<KEYWORD2>Bound</KEYWORD2>
-			<KEYWORD2>Detail</KEYWORD2>
-			<KEYWORD2>DetailRange</KEYWORD2>
-			<KEYWORD2>GeometricApproximation</KEYWORD2>
-			<KEYWORD2>Orientation</KEYWORD2>
-			<KEYWORD2>ReverseOrientation</KEYWORD2>
-			<KEYWORD2>Sides</KEYWORD2>
-			<KEYWORD2>Identity</KEYWORD2>
-			<KEYWORD2>Transform</KEYWORD2>
-			<KEYWORD2>ConcatTransform</KEYWORD2>
-			<KEYWORD2>Perspective</KEYWORD2>
-			<KEYWORD2>Translate</KEYWORD2>
-			<KEYWORD2>Rotate</KEYWORD2>
-			<KEYWORD2>Scale</KEYWORD2>
-			<KEYWORD2>Skew</KEYWORD2>
-			<KEYWORD2>CoordinateSystem</KEYWORD2>
-			<KEYWORD2>CoordSysTransform</KEYWORD2>
-			<KEYWORD2>TransformPoints</KEYWORD2>
-			<KEYWORD2>TransformBegin</KEYWORD2>
-			<KEYWORD2>TransformEnd</KEYWORD2>
-			<KEYWORD2>Attribute</KEYWORD2>
-
-			<KEYWORD3>Polygon</KEYWORD3>
-			<KEYWORD3>GeneralPolygon</KEYWORD3>
-			<KEYWORD3>PointsPolygons</KEYWORD3>
-			<KEYWORD3>PointsGeneralPolygons</KEYWORD3>
-			<KEYWORD3>Basis</KEYWORD3>
-			<KEYWORD3>Patch</KEYWORD3>
-			<KEYWORD3>PatchMesh</KEYWORD3>
-			<KEYWORD3>NuPatch</KEYWORD3>
-			<KEYWORD3>TrimCurve</KEYWORD3>
-			<KEYWORD3>SubdivisionMesh</KEYWORD3>
-			<KEYWORD3>Sphere</KEYWORD3>
-			<KEYWORD3>Cone</KEYWORD3>
-			<KEYWORD3>Cylinder</KEYWORD3>
-			<KEYWORD3>Hyperboloid</KEYWORD3>
-			<KEYWORD3>Paraboloid</KEYWORD3>
-			<KEYWORD3>Disk</KEYWORD3>
-			<KEYWORD3>Torus</KEYWORD3>
-			<KEYWORD3>Points</KEYWORD3>
-			<KEYWORD3>Curves</KEYWORD3>
-			<KEYWORD3>Blobby</KEYWORD3>
-			<KEYWORD3>Procedural</KEYWORD3>
-			<KEYWORD3>DelayedReadArchive</KEYWORD3>
-			<KEYWORD3>RunProgram</KEYWORD3>
-			<KEYWORD3>DynamicLoad</KEYWORD3>
-			<KEYWORD3>Geometry</KEYWORD3>
-			<KEYWORD3>SolidBegin</KEYWORD3>
-			<KEYWORD3>SolidEnd</KEYWORD3>
-			<KEYWORD3>RtObjectHandle</KEYWORD3>
-			<KEYWORD3>ObjectBegin</KEYWORD3>
-			<KEYWORD3>ObjectEnd</KEYWORD3>
-			<KEYWORD3>ObjectInstance</KEYWORD3>
-
-			<KEYWORD4>MakeTexture</KEYWORD4>
-			<KEYWORD4>MakeLatLongEnvironment</KEYWORD4>
-			<KEYWORD4>MakeCubeFaceEnvironment</KEYWORD4>
-			<KEYWORD4>MakeShadow</KEYWORD4>
-			<KEYWORD4>ErrorHandler</KEYWORD4>
-			<KEYWORD4>ArchiveRecord</KEYWORD4>
-			<KEYWORD4>ReadArchive</KEYWORD4>
-			<KEYWORD4>Deformation</KEYWORD4>
-			<KEYWORD4>MakeBump</KEYWORD4>
-		</KEYWORDS>
-	</RULES>
-	<RULES SET="LITERALS" ESCAPE="\" IGNORE_CASE="FALSE" DEFAULT="LITERAL1">
-		<KEYWORDS>
-			<KEYWORD1>float</KEYWORD1>
-			<KEYWORD1>string</KEYWORD1>
-			<KEYWORD1>color</KEYWORD1>
-			<KEYWORD1>point</KEYWORD1>
-			<KEYWORD1>vector</KEYWORD1>
-			<KEYWORD1>normal</KEYWORD1>
-			<KEYWORD1>matrix</KEYWORD1>
-			<KEYWORD1>void</KEYWORD1>
-			<KEYWORD1>varying</KEYWORD1>
-			<KEYWORD1>uniform</KEYWORD1>
-			<KEYWORD1>output</KEYWORD1>
-			<KEYWORD1>extern</KEYWORD1>
-
-			<LITERAL2>P</LITERAL2>
-			<LITERAL2>Pw</LITERAL2>
-			<LITERAL2>Pz</LITERAL2>
-			<LITERAL2>N</LITERAL2>
-			<LITERAL2>Cs</LITERAL2>
-			<LITERAL2>Os</LITERAL2>
-			<LITERAL2>RI_NULL</LITERAL2>
-			<LITERAL2>RI_INFINITY</LITERAL2>
-			<LITERAL2>orthographic</LITERAL2>
-			<LITERAL2>perspective</LITERAL2>
-			<LITERAL2>bezier</LITERAL2>
-			<LITERAL2>catmull-rom</LITERAL2>
-			<LITERAL2>b-spline</LITERAL2>
-			<LITERAL2>hermite</LITERAL2>
-			<LITERAL2>power</LITERAL2>
-			<LITERAL2>catmull-clark</LITERAL2>
-			<LITERAL2>hole</LITERAL2>
-			<LITERAL2>crease</LITERAL2>
-			<LITERAL2>corner</LITERAL2>
-			<LITERAL2>interpolateboundary</LITERAL2>
-			<LITERAL2>object</LITERAL2>
-			<LITERAL2>world</LITERAL2>
-			<LITERAL2>camera</LITERAL2>
-			<LITERAL2>screen</LITERAL2>
-			<LITERAL2>raster</LITERAL2>
-			<LITERAL2>NDC</LITERAL2>
-			<LITERAL2>box</LITERAL2>
-			<LITERAL2>triangle</LITERAL2>
-			<LITERAL2>sinc</LITERAL2>
-			<LITERAL2>gaussian</LITERAL2>
-			<LITERAL2>constant</LITERAL2>
-			<LITERAL2>smooth</LITERAL2>
-			<LITERAL2>outside</LITERAL2>
-			<LITERAL2>inside</LITERAL2>
-			<LITERAL2>lh</LITERAL2>
-			<LITERAL2>rh</LITERAL2>
-			<LITERAL2>bicubic</LITERAL2>
-			<LITERAL2>bilinear</LITERAL2>
-			<LITERAL2>periodic</LITERAL2>
-			<LITERAL2>nonperiodic</LITERAL2>
-			<LITERAL2>hidden</LITERAL2>
-			<LITERAL2>null</LITERAL2>
-		</KEYWORDS>
-	</RULES>
-</MODE>
-
diff --git a/qpython/src/main/assets/syntax/roff.xml b/qpython/src/main/assets/syntax/roff.xml
deleted file mode 100644
index 66030140..00000000
--- a/qpython/src/main/assets/syntax/roff.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!--
- Mode for the roff family of text processing systems.
- By Kostas Michalopoulos.
- 
- Known issues:
-   - In escape sequences with arguments, only single and double quotes are
-     recognized while the roff language allows for any character that doesn't
-     appear in the argument.
-   - Double quotes are not really required for textual macros (like .SH in man
-     pages), but the arguments are still text. However they are shown as
-     keywords and non-textual coloring is done. Not really a problem for most
-     roff documents (ie. manpages) though.
-   - Not sure if the last SPAN_REGEXP in ROFF_ESCAPE is a good idea...
- 
- Recommended catalog entry:
- 
-   <MODE NAME="roff"
-         FILE="roff.xml"
-         FILE_NAME_GLOB="*.{1,2,3,4,5,6,7,8,9,me,ms,mm,mom,tmac}" />
--->
-
-<MODE>
-    <PROPS>
-        <PROPERTY NAME="noTabs" VALUE="true"/>
-        <PROPERTY NAME="lineComment" VALUE="\\#"/>
-        <PROPERTY NAME="wordBreakChars" VALUE=",+-=&lt;&gt;/?^&amp;*"/>
-    </PROPS>
-    
-    <RULES HIGHLIGHT_DIGITS="FALSE">
-        <EOL_SPAN TYPE="COMMENT1">\#</EOL_SPAN>
-        <EOL_SPAN TYPE="COMMENT1">\"</EOL_SPAN>
-        <EOL_SPAN_REGEXP TYPE="KEYWORD1" AT_LINE_START="TRUE" DELEGATE="ROFF_ESCAPE">\.\s*\w+</EOL_SPAN_REGEXP>
-        <SEQ_REGEXP HASH_CHAR="\" TYPE="KEYWORD3">\\((\p{Graph}\[[^\]]*\])|(\p{Graph}((\'.*\')|(\".*\")))|(\p{Graph}{1,2}))</SEQ_REGEXP>
-    </RULES>
-    
-    <RULES SET="ROFF_ESCAPE">
-        <EOL_SPAN TYPE="COMMENT1">\"</EOL_SPAN>
-        <SPAN TYPE="LITERAL1" NO_LINE_BREAK="TRUE">
-            <BEGIN>"</BEGIN>
-            <END>"</END>
-        </SPAN>
-        <SPAN_REGEXP HASH_CHARS="0123456789" TYPE="DIGIT" NO_LINE_BREAK="TRUE">
-            <BEGIN>(\d|\.)+[icpPszfmnvM]?</BEGIN>
-            <END> </END>
-        </SPAN_REGEXP>
-        <SPAN_REGEXP HASH_CHARS="0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstwxyz" TYPE="KEYWORD2" NO_LINE_BREAK="TRUE">
-            <BEGIN>\w+</BEGIN>
-            <END> </END>
-        </SPAN_REGEXP>
-    </RULES>
-</MODE>
-
diff --git a/qpython/src/main/assets/syntax/rpmspec.xml b/qpython/src/main/assets/syntax/rpmspec.xml
deleted file mode 100644
index 39c76aff..00000000
--- a/qpython/src/main/assets/syntax/rpmspec.xml
+++ /dev/null
@@ -1,131 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="lineComment" VALUE="#" />
-		<PROPERTY NAME="contextInsensitive" VALUE="true" />
-	</PROPS>
-	<RULES>
-		<!-- comments -->
-		<EOL_SPAN TYPE="COMMENT1" AT_LINE_START="TRUE">#</EOL_SPAN>
-
-		<!-- Dependency operators -->
-		<SEQ TYPE="OPERATOR">&lt;</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">=</SEQ>
-
-		<!-- %attr -->
-		<SPAN TYPE="MARKUP" DELEGATE="ATTR" NO_LINE_BREAK="TRUE">
-			<BEGIN>%attr(</BEGIN>
-			<END>)</END>
-		</SPAN>
-
-		<!-- %verify -->
-		<SPAN TYPE="MARKUP" DELEGATE="VERIFY" NO_LINE_BREAK="TRUE">
-			<BEGIN>%verify(</BEGIN>
-			<END>)</END>
-		</SPAN>
-
-		<!-- Source -->
-		<MARK_FOLLOWING TYPE="KEYWORD1"
-			AT_LINE_START="TRUE">Source</MARK_FOLLOWING>
-
-		<!-- Patch -->
-		<MARK_FOLLOWING TYPE="KEYWORD1"
-			AT_LINE_START="TRUE">Patch</MARK_FOLLOWING>
-		<MARK_FOLLOWING TYPE="FUNCTION"
-			AT_LINE_START="TRUE">%patch</MARK_FOLLOWING>
-
-		<!-- Variables -->
-		<SPAN TYPE="KEYWORD2" NO_LINE_BREAK="TRUE">
-			<BEGIN>${</BEGIN>
-			<END>}</END>
-		</SPAN>
-
-		<SPAN TYPE="KEYWORD3" NO_LINE_BREAK="TRUE">
-			<BEGIN>%{</BEGIN>
-			<END>}</END>
-		</SPAN>
-
-		<MARK_FOLLOWING TYPE="KEYWORD2">$#</MARK_FOLLOWING>
-		<MARK_FOLLOWING TYPE="KEYWORD2">$?</MARK_FOLLOWING>
-		<MARK_FOLLOWING TYPE="KEYWORD2">$*</MARK_FOLLOWING>
-		<MARK_FOLLOWING TYPE="KEYWORD2">$&lt;</MARK_FOLLOWING>
-		<MARK_FOLLOWING TYPE="KEYWORD2">$</MARK_FOLLOWING>
-
-		<KEYWORDS>
-			<KEYWORD1>Summary:</KEYWORD1>
-			<KEYWORD1>Name:</KEYWORD1>
-			<KEYWORD1>Version:</KEYWORD1>
-			<KEYWORD1>Release:</KEYWORD1>
-			<KEYWORD1>Copyright:</KEYWORD1>
-			<KEYWORD1>Group:</KEYWORD1>
-			<KEYWORD1>URL:</KEYWORD1>
-			<KEYWORD1>Packager:</KEYWORD1>
-			<KEYWORD1>Prefix:</KEYWORD1>
-			<KEYWORD1>Distribution:</KEYWORD1>
-			<KEYWORD1>Vendor:</KEYWORD1>
-			<KEYWORD1>Icon:</KEYWORD1>
-			<KEYWORD1>Provides:</KEYWORD1>
-			<KEYWORD1>Requires:</KEYWORD1>
-			<KEYWORD1>Serial:</KEYWORD1>
-			<KEYWORD1>Conflicts:</KEYWORD1>
-			<KEYWORD1>AutoReqProv:</KEYWORD1>
-			<KEYWORD1>BuildArch:</KEYWORD1>
-			<KEYWORD1>ExcludeArch:</KEYWORD1>
-			<KEYWORD1>ExclusiveArch:</KEYWORD1>
-			<KEYWORD1>ExclusiveOS:</KEYWORD1>
-			<KEYWORD1>BuildRoot:</KEYWORD1>
-			<KEYWORD1>NoSource:</KEYWORD1>
-			<KEYWORD1>NoPatch:</KEYWORD1>
-
-			<LABEL>%prep</LABEL>
-			<LABEL>%install</LABEL>
-			<LABEL>%description</LABEL>
-			<LABEL>%build</LABEL>
-			<LABEL>%files</LABEL>
-			<LABEL>%clean</LABEL>
-			<LABEL>%pre</LABEL>
-			<LABEL>%post</LABEL>
-			<LABEL>%preun</LABEL>
-			<LABEL>%postun</LABEL>
-			<LABEL>%verifyscript</LABEL>
-
-			<FUNCTION>%setup</FUNCTION>
-			<FUNCTION>%ifarch</FUNCTION>
-			<FUNCTION>%ifnarch</FUNCTION>
-			<FUNCTION>%ifos</FUNCTION>
-			<FUNCTION>%ifnos</FUNCTION>
-			<FUNCTION>%else</FUNCTION>
-			<FUNCTION>%endif</FUNCTION>
-
-			<MARKUP>%doc</MARKUP>
-			<MARKUP>%config</MARKUP>
-			<MARKUP>%docdir</MARKUP>
-			<MARKUP>%dir</MARKUP>
-			<MARKUP>%package</MARKUP>
-		</KEYWORDS>
-	</RULES>
-
-	<RULES SET="ATTR" HIGHLIGHT_DIGITS="TRUE">
-		<SEQ TYPE="OPERATOR">,</SEQ>
-		<SEQ TYPE="OPERATOR">-</SEQ>
-	</RULES>
-
-	<RULES SET="VERIFY">
-		<KEYWORDS>
-			<KEYWORD2>owner</KEYWORD2>
-			<KEYWORD2>group</KEYWORD2>
-			<KEYWORD2>mode</KEYWORD2>
-			<KEYWORD2>md5</KEYWORD2>
-			<KEYWORD2>size</KEYWORD2>
-			<KEYWORD2>maj</KEYWORD2>
-			<KEYWORD2>min</KEYWORD2>
-			<KEYWORD2>symlink</KEYWORD2>
-			<KEYWORD2>mtime</KEYWORD2>
-			<OPERATOR>not</OPERATOR>
-		</KEYWORDS>
-	</RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/rtf.xml b/qpython/src/main/assets/syntax/rtf.xml
deleted file mode 100644
index 9783cce3..00000000
--- a/qpython/src/main/assets/syntax/rtf.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!-- contributed by Lionel Fiol <lio-sand@ifrance.com>  -->
-<!-- 30/MAR/2004: initial contribution                  -->
-
-<MODE>
-  <RULES>
-    <!-- groups -->
-    <SEQ TYPE="OPERATOR">{</SEQ>
-    <SEQ TYPE="OPERATOR">}</SEQ>
-    <!-- characters as hexadecimal values - eg "\'e9" -->
-    <SEQ_REGEXP HASH_CHAR="\'" ESCAPE="\\" TYPE="LITERAL2">\\'\w\d</SEQ_REGEXP>
-    <!-- control words added after the RTF Specification published in March 1987 - eg "\*\panose" -->
-    <MARK_FOLLOWING TYPE="KEYWORD2">\*\</MARK_FOLLOWING>
-    <!-- control words - eg "\par" -->
-    <MARK_FOLLOWING TYPE="KEYWORD1">\</MARK_FOLLOWING>
-  </RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/ruby.xml b/qpython/src/main/assets/syntax/ruby.xml
deleted file mode 100644
index 0228c7e5..00000000
--- a/qpython/src/main/assets/syntax/ruby.xml
+++ /dev/null
@@ -1,493 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-<!-- Ruby mode by Ian Maclean (Ruby edit mode v0.7.4) -->
-<!-- tweakage by Chris Morris - clabs.org -->
-<!-- further tweakage by Christophe Grandsire -->
-<!-- further tweakage by Robert McKinnon 2004 -->
-<!-- Major overhaul by Karl von Laudermann -->
-<!-- More tweakage by Jim Morris (wolfmanjm), adds electric unindent for else, elsif, rescue, end -->
-<!-- More tweakage by Jim Morris (wolfmanjm), fixed when statements for most cases -->
-<!-- recommended mode catalog entry:
-    <MODE NAME="ruby" FILE="ruby.xml" FILE_NAME_GLOB="*.{rb,rbw}" FIRST_LINE_GLOB="#!*/*ruby*" /> -->
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="indentOpenBrackets" VALUE="{"/>
-		<PROPERTY NAME="indentCloseBrackets" VALUE="}"/>
-		<PROPERTY NAME="unalignedOpenBrackets" VALUE="("/>
-		<PROPERTY NAME="unalignedCloseBrackets" VALUE=")"/>
-		<PROPERTY NAME="lineUpClosingBracket" VALUE="true"/>
-		<PROPERTY NAME="commentStart" VALUE="=begin"/>
-		<PROPERTY NAME="commentEnd" VALUE="=end"/>
-		<PROPERTY NAME="lineComment" VALUE="#"/>
-		<PROPERTY NAME="indentNextLines"
-			  VALUE="[^#]*\s+do(\s*|(\s+\|.+\|\s*))|\s*(if\s+.*|elsif.*|else.*|do(\s*|\s+.*)|case\s+.*|when\s+.*|while\s+.*|for\s+.*|until\s+.*|loop\s+.*|def\s+.*|class\s+.*|module\s+.*|begin.*|unless\s+.*|rescue.*|ensure.*)+"/>
-		<PROPERTY NAME="unindentThisLine" VALUE="^\s*(else.*|end\s*|elsif.*|rescue.*|when.*|ensure.*)$"/>
-		<PROPERTY NAME="unindentNextLines" VALUE="^\s*(end\s*|else.*|rescue.*|elsif.*|when.*|ensure.*)$"/>
-		<PROPERTY NAME="indentNextLine"
-			  VALUE="^[^#]*([^$](:|\+|~|\*|-|%|&lt;|&gt;|&amp;|\^|\.|=)|\s(/|\!|\?|\|)|\b(not|and|or)|\\)\s*$"/>
-		<PROPERTY NAME="electricKeys" VALUE="edfn"/>
-	</PROPS>
-	<RULES IGNORE_CASE="FALSE" HIGHLIGHT_DIGITS="TRUE"
-	       DIGIT_RE="(0b[01]([01_]*[01])?)|(0x[\p{XDigit}]([\p{XDigit}_]*[\p{XDigit}])?)|(0([0-7_]*[0-7])?)|(0d[0-9]([0-9_]*[0-9])?)|([1-9]([0-9_]*[0-9])?)|([0-9]([0-9_]*[0-9])?[Ee]([0-9]([0-9_]*[0-9])?)?)">
-		<!--       ^ Binary literal    | ^ Hex literal                               | ^ Octal literal  | ^ "0d" Style Dec lit   | ^ Normal Dec literal | ^ Float literal w/out dec point, with exp. -->
-
-		<!-- Ruby comment (Inline Documentation ) -->
-		<SPAN TYPE="COMMENT2">
-			<BEGIN>=begin</BEGIN>
-			<END AT_LINE_START="TRUE">=end</END>
-		</SPAN>
-
-		<!-- Class and instance vars -->
-		<MARK_FOLLOWING TYPE="KEYWORD4">@</MARK_FOLLOWING>
-
-		<!-- Method, class and modules names -->
-		<MARK_FOLLOWING TYPE="FUNCTION" MATCH_TYPE="KEYWORD1">\bdef\b</MARK_FOLLOWING>
-		<MARK_FOLLOWING TYPE="FUNCTION" MATCH_TYPE="KEYWORD1">\bundef\b</MARK_FOLLOWING>
-		<MARK_FOLLOWING TYPE="FUNCTION" MATCH_TYPE="KEYWORD1">\bclass\b</MARK_FOLLOWING>
-		<MARK_FOLLOWING TYPE="FUNCTION" MATCH_TYPE="KEYWORD1">\bmodule\b</MARK_FOLLOWING>
-
-		<!-- String literals -->
-		<SPAN TYPE="LITERAL1" DELEGATE="doubleQuoteLiteral">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-
-		<SPAN TYPE="LITERAL1" ESCAPE="\">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-
-		<!-- %Q(Hello world) %(Hello world)-->
-		<SPAN_REGEXP HASH_CHAR="%" TYPE="LITERAL1" DELEGATE="doubleQuoteLiteral">
-			<BEGIN>%Q?\(</BEGIN>
-			<END>)</END>
-		</SPAN_REGEXP>
-
-		<!-- %q(Hello world) -->
-		<SPAN TYPE="LITERAL1" ESCAPE="\">
-			<BEGIN>%q(</BEGIN>
-			<END>)</END>
-		</SPAN>
-
-		<!-- %Q{Hello world} %{Hello world} -->
-		<SPAN_REGEXP HASH_CHAR="%" TYPE="LITERAL1" DELEGATE="doubleQuoteLiteral">
-			<BEGIN>%Q?\{</BEGIN>
-			<END>}</END>
-		</SPAN_REGEXP>
-
-		<!-- %q{Hello world} -->
-		<SPAN TYPE="LITERAL1" ESCAPE="\">
-			<BEGIN>%q{</BEGIN>
-			<END>}</END>
-		</SPAN>
-
-		<!-- %Q[Hello world] %[Hello world] -->
-		<SPAN_REGEXP HASH_CHAR="%" TYPE="LITERAL1" DELEGATE="doubleQuoteLiteral">
-			<BEGIN>%Q?\[</BEGIN>
-			<END>]</END>
-		</SPAN_REGEXP>
-
-		<!-- %q[Hello world] -->
-		<SPAN TYPE="LITERAL1" ESCAPE="\">
-			<BEGIN>%q[</BEGIN>
-			<END>]</END>
-		</SPAN>
-
-		<!-- %Q<Hello world> %<Hello world> -->
-		<SPAN_REGEXP HASH_CHAR="%" TYPE="LITERAL1" DELEGATE="doubleQuoteLiteral">
-			<BEGIN>%Q?&lt;</BEGIN>
-			<END>&gt;</END>
-		</SPAN_REGEXP>
-
-		<!-- %q<Hello world> -->
-		<SPAN TYPE="LITERAL1" ESCAPE="\">
-			<BEGIN>%q&lt;</BEGIN>
-			<END>&gt;</END>
-		</SPAN>
-
-		<!-- I made the next three forms as three instead of two, because the
-			 first two actually support whitespace as a delimiter, and the third
-			 one doesn't. -->
-		<!-- %Q$Hello world$ -->
-		<SPAN_REGEXP HASH_CHAR="%Q" TYPE="LITERAL1" DELEGATE="doubleQuoteLiteral">
-			<BEGIN>%Q([^\p{Alnum}])</BEGIN>
-			<END>$1</END>
-		</SPAN_REGEXP>
-
-		<!-- %q$Hello world$ -->
-		<SPAN_REGEXP HASH_CHAR="%q" TYPE="LITERAL1" ESCAPE="\">
-			<BEGIN>%q([^\p{Alnum}])</BEGIN>
-			<END>$1</END>
-		</SPAN_REGEXP>
-
-		<!-- %$Hello world$ -->
-		<SPAN_REGEXP HASH_CHAR="%" TYPE="LITERAL1" DELEGATE="doubleQuoteLiteral">
-			<BEGIN>%([^\p{Alnum}\p{Space}])</BEGIN>
-			<END>$1</END>
-		</SPAN_REGEXP>
-
-		<!-- %W(Array of strings) -->
-		<SPAN TYPE="LITERAL1" DELEGATE="doubleQuoteLiteral">
-			<BEGIN>%W(</BEGIN>
-			<END>)</END>
-		</SPAN>
-
-		<!-- %w(Array of strings) -->
-		<SPAN TYPE="LITERAL1" ESCAPE="\">
-			<BEGIN>%w(</BEGIN>
-			<END>)</END>
-		</SPAN>
-
-		<!-- %W{Array of strings} -->
-		<SPAN TYPE="LITERAL1" DELEGATE="doubleQuoteLiteral">
-			<BEGIN>%W{</BEGIN>
-			<END>}</END>
-		</SPAN>
-
-		<!-- %w{Array of strings} -->
-		<SPAN TYPE="LITERAL1" ESCAPE="\">
-			<BEGIN>%w{</BEGIN>
-			<END>}</END>
-		</SPAN>
-
-		<!-- %W[Array of strings] -->
-		<SPAN TYPE="LITERAL1" DELEGATE="doubleQuoteLiteral">
-			<BEGIN>%W[</BEGIN>
-			<END>]</END>
-		</SPAN>
-
-		<!-- %w[Array of strings] -->
-		<SPAN TYPE="LITERAL1" ESCAPE="\">
-			<BEGIN>%w[</BEGIN>
-			<END>]</END>
-		</SPAN>
-
-		<!-- %W<Array of strings>  -->
-		<SPAN TYPE="LITERAL1" DELEGATE="doubleQuoteLiteral">
-			<BEGIN>%W&lt;</BEGIN>
-			<END>&gt;</END>
-		</SPAN>
-
-		<!-- %w<Array of strings> -->
-		<SPAN TYPE="LITERAL1" ESCAPE="\">
-			<BEGIN>%w&lt;</BEGIN>
-			<END>&gt;</END>
-		</SPAN>
-
-		<!-- %W$Array of strings$ -->
-		<SPAN_REGEXP HASH_CHAR="%W" TYPE="LITERAL1" DELEGATE="doubleQuoteLiteral">
-			<BEGIN>%W([^\p{Alnum}\p{Space}])</BEGIN>
-			<END>$1</END>
-		</SPAN_REGEXP>
-
-		<!-- %w@Array of strings@ -->
-		<SPAN_REGEXP HASH_CHAR="%w" TYPE="LITERAL1" ESCAPE="\">
-			<BEGIN>%w([^\p{Alnum}\p{Space}])</BEGIN>
-			<END>$1</END>
-		</SPAN_REGEXP>
-
-		<!-- Here documents <<"FOO" <<-"FOO" -->
-		<!-- Unfortunately, in a SPAN_REGEXP element only the <BEGIN> tag takes
-			 a regex, not the <END> tag. So an instance of FOO anywhere in the here
-			 document will terminate highlighting; I couldn't make it smarter. -->
-		<SPAN_REGEXP HASH_CHAR="&lt;&lt;" TYPE="LITERAL1" DELEGATE="doubleQuoteLiteral">
-			<BEGIN>&lt;&lt;-?"([\p{Graph}]+)"</BEGIN>
-			<END REGEXP="TRUE">^\S*$1$</END>
-		</SPAN_REGEXP>
-
-		<!-- Here documents <<'FOO' <<-'FOO' -->
-		<!-- Unfortunately, in a SPAN_REGEXP element only the <BEGIN> tag takes
-			 a regex, not the <END> tag. So an instance of FOO anywhere in the here
-			 document will terminate highlighting; I couldn't make it smarter. -->
-		<SPAN_REGEXP HASH_CHAR="&lt;&lt;" TYPE="LITERAL1">
-			<BEGIN>&lt;&lt;-?'([\p{Graph}]+)'</BEGIN>
-			<END REGEXP="TRUE">^\S*$1$</END>
-		</SPAN_REGEXP>
-
-		<!-- Here documents <<FOO <<-FOO -->
-		<!-- Unfortunately, in a SPAN_REGEXP element only the <BEGIN> tag takes
-			 a regex, not the <END> tag. So an instance of FOO anywhere in the here
-			 document will terminate highlighting; I couldn't make it smarter. -->
-		<SPAN_REGEXP HASH_CHAR="&lt;&lt;" TYPE="LITERAL1" DELEGATE="doubleQuoteLiteral">
-			<BEGIN>&lt;&lt;-?([A-Za-z_]+)</BEGIN>
-			<END REGEXP="TRUE">^\S*$1$</END>
-		</SPAN_REGEXP>
-
-		<!-- Shell command strings -->
-
-		<!-- `echo foo` -->
-		<SPAN TYPE="LITERAL2" DELEGATE="BackquoteLiteral">
-			<BEGIN>`</BEGIN>
-			<END>`</END>
-		</SPAN>
-
-		<!-- %x(echo foo) -->
-		<SPAN TYPE="LITERAL2" DELEGATE="BackquoteLiteral">
-			<BEGIN>%x(</BEGIN>
-			<END>)</END>
-		</SPAN>
-
-		<!-- %x{echo foo} -->
-		<SPAN TYPE="LITERAL2" DELEGATE="BackquoteLiteral">
-			<BEGIN>%x{</BEGIN>
-			<END>}</END>
-		</SPAN>
-
-		<!-- %x[echo foo] -->
-		<SPAN TYPE="LITERAL2" DELEGATE="BackquoteLiteral">
-			<BEGIN>%x[</BEGIN>
-			<END>]</END>
-		</SPAN>
-
-		<!-- %x<echo foo> -->
-		<SPAN TYPE="LITERAL2" DELEGATE="BackquoteLiteral">
-			<BEGIN>%x&lt;</BEGIN>
-			<END>&gt;</END>
-		</SPAN>
-
-		<!-- %x$echo foo$ -->
-		<SPAN_REGEXP HASH_CHAR="%x" TYPE="LITERAL2" DELEGATE="BackquoteLiteral">
-			<BEGIN>%x([^\p{Alnum}\p{Space}])</BEGIN>
-			<END>$1</END>
-		</SPAN_REGEXP>
-
-		<!-- Regular expressions -->
-
-		<!-- /regexp?/ -->
-		<!-- If a regexp begins with a whitespace (including a newline),
-			    the beginning "/" is wrongly treated as a division operator.
-			    But such regexp is rare enough and one can use %r notations
-			    or write like "/\ ..." to force jEdit to treat it as a
-			    regexp. -->
-		<SEQ_REGEXP HASH_CHAR="/" TYPE="OPERATOR">/=?($|\s)</SEQ_REGEXP>
-		<!-- AT_WORD_START is TRUE not to handle "a/b/c". -->
-		<SPAN AT_WORD_START="TRUE" TYPE="LITERAL3" DELEGATE="RegexpLiteral">
-			<BEGIN>/</BEGIN>
-			<END>/</END>
-		</SPAN>
-
-		<!-- %r(regexp?) -->
-		<SPAN TYPE="LITERAL3" DELEGATE="RegexpLiteral">
-			<BEGIN>%r(</BEGIN>
-			<END>)</END>
-		</SPAN>
-
-		<!-- %r{regexp?} -->
-		<SPAN TYPE="LITERAL3" DELEGATE="RegexpLiteral">
-			<BEGIN>%r{</BEGIN>
-			<END>}</END>
-		</SPAN>
-
-		<!-- %r[regexp?] -->
-		<SPAN TYPE="LITERAL3" DELEGATE="RegexpLiteral">
-			<BEGIN>%r[</BEGIN>
-			<END>]</END>
-		</SPAN>
-
-		<!-- %r<regexp?> -->
-		<SPAN TYPE="LITERAL3" DELEGATE="RegexpLiteral">
-			<BEGIN>%r&lt;</BEGIN>
-			<END>&gt;</END>
-		</SPAN>
-
-		<!-- %r$regexp?$ -->
-		<SPAN_REGEXP HASH_CHAR="%r" TYPE="LITERAL3" DELEGATE="RegexpLiteral">
-			<BEGIN>%r([^\p{Alnum}\p{Space}])</BEGIN>
-			<END>$1</END>
-		</SPAN_REGEXP>
-
-		<!-- Std Comment -->
-		<EOL_SPAN TYPE="COMMENT1">#</EOL_SPAN>
-
-		<!-- Predefined global variables -->
-		<SEQ_REGEXP HASH_CHAR="$-" TYPE="KEYWORD3" AT_WORD_START="TRUE">\$-[0adFiIKlpvw](?![\p{Alnum}_])
-		</SEQ_REGEXP>
-
-		<SEQ_REGEXP HASH_CHAR="$" TYPE="KEYWORD3" AT_WORD_START="TRUE">\$[0-9!@&amp;\+`'=~/\\,\.;&lt;&gt;_\*"\$\?\:F](?![\p{Alnum}_])</SEQ_REGEXP>
-
-		<!-- Because of the ? char, this can't be done as a KEYWORD element -->
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">defined?</SEQ>
-
-		<!-- Highlight "include" but not "include?" -->
-		<SEQ_REGEXP HASH_CHAR="include" TYPE="KEYWORD2" AT_WORD_START="TRUE">include(?![\p{Alnum}_\?])
-		</SEQ_REGEXP>
-
-		<!-- Not Operators but like the syntax highlight to match operators -->
-		<SEQ TYPE="OPERATOR">{</SEQ>
-		<SEQ TYPE="OPERATOR">}</SEQ>
-		<SEQ TYPE="OPERATOR">(</SEQ>
-		<SEQ TYPE="OPERATOR">)</SEQ>
-
-		<!-- Arithmetic operators -->
-		<SEQ TYPE="OPERATOR">::</SEQ>
-		<SEQ TYPE="OPERATOR">===</SEQ>
-		<SEQ TYPE="OPERATOR">=</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;&lt;</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;=</SEQ>
-		<SEQ TYPE="OPERATOR">+</SEQ>
-		<SEQ TYPE="OPERATOR">-</SEQ>
-		<SEQ TYPE="OPERATOR">/</SEQ>
-
-		<SEQ TYPE="OPERATOR">**</SEQ>
-		<SEQ TYPE="OPERATOR">*</SEQ>
-
-		<SEQ TYPE="OPERATOR">%</SEQ>
-
-		<!-- Logical Operators -->
-		<SEQ TYPE="OPERATOR">&amp;</SEQ>
-		<SEQ TYPE="OPERATOR">|</SEQ>
-		<SEQ TYPE="OPERATOR">!</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;</SEQ>
-		<SEQ TYPE="OPERATOR">^</SEQ>
-		<SEQ TYPE="OPERATOR">~</SEQ>
-
-		<!-- Range operators -->
-		<SEQ TYPE="OPERATOR">...</SEQ>
-		<SEQ TYPE="OPERATOR">..</SEQ>
-
-		<SEQ TYPE="OPERATOR">]</SEQ>
-		<SEQ TYPE="OPERATOR">[</SEQ>
-		<SEQ TYPE="OPERATOR">?</SEQ>
-
-		<!-- Symbols -->
-		<SEQ_REGEXP AT_WORD_START="TRUE" HASH_CHAR=":" TYPE="LITERAL4">:[\p{Alpha}_][\p{Alnum}_]*[?]?</SEQ_REGEXP>
-		<SPAN AT_WORD_START="TRUE" TYPE="LITERAL4">
-		  <BEGIN>:'</BEGIN> <END>'</END>
-		</SPAN>
-		<!-- bang = '!'
-		     :"hello world#{bang}" -->
-		<SPAN AT_WORD_START="TRUE" TYPE="LITERAL4" DELEGATE="doubleQuoteSymbol">
-		  <BEGIN>:"</BEGIN> <END>"</END>
-		</SPAN>
-
-		<!-- %s$Hello world$ -->
-		<SPAN_REGEXP HASH_CHAR="%s" TYPE="LITERAL4">
-		  <BEGIN>%s([^\p{Alnum}])</BEGIN>
-		  <END>$1</END>
-    </SPAN_REGEXP>
-		<KEYWORDS>
-			<KEYWORD1>BEGIN</KEYWORD1>
-			<KEYWORD1>END</KEYWORD1>
-			<KEYWORD1>alias</KEYWORD1>
-			<KEYWORD1>begin</KEYWORD1>
-			<KEYWORD1>break</KEYWORD1>
-			<KEYWORD1>case</KEYWORD1>
-			<KEYWORD1>class</KEYWORD1>
-			<KEYWORD1>def</KEYWORD1>
-			<KEYWORD1>do</KEYWORD1>
-			<KEYWORD1>else</KEYWORD1>
-			<KEYWORD1>elsif</KEYWORD1>
-			<KEYWORD1>end</KEYWORD1>
-			<KEYWORD1>ensure</KEYWORD1>
-			<KEYWORD1>for</KEYWORD1>
-			<KEYWORD1>if</KEYWORD1>
-			<KEYWORD1>in</KEYWORD1>
-			<KEYWORD1>module</KEYWORD1>
-			<KEYWORD1>next</KEYWORD1>
-			<KEYWORD1>print</KEYWORD1>
-			<KEYWORD1>puts</KEYWORD1>
-			<KEYWORD1>redo</KEYWORD1>
-			<KEYWORD1>rescue</KEYWORD1>
-			<KEYWORD1>retry</KEYWORD1>
-			<KEYWORD1>return</KEYWORD1>
-			<KEYWORD1>then</KEYWORD1>
-			<KEYWORD1>undef</KEYWORD1>
-			<KEYWORD1>unless</KEYWORD1>
-			<KEYWORD1>until</KEYWORD1>
-			<KEYWORD1>when</KEYWORD1>
-			<KEYWORD1>while</KEYWORD1>
-			<KEYWORD1>yield</KEYWORD1>
-
-			<KEYWORD2>load</KEYWORD2>
-			<KEYWORD2>require</KEYWORD2>
-			<KEYWORD2>initialize</KEYWORD2>
-
-			<OPERATOR>and</OPERATOR>
-			<OPERATOR>not</OPERATOR>
-			<OPERATOR>or</OPERATOR>
-
-			<KEYWORD3>false</KEYWORD3>
-			<KEYWORD3>nil</KEYWORD3>
-			<KEYWORD3>self</KEYWORD3>
-			<KEYWORD3>super</KEYWORD3>
-			<KEYWORD3>true</KEYWORD3>
-
-			<KEYWORD3>$defout</KEYWORD3>
-			<KEYWORD3>$deferr</KEYWORD3>
-			<KEYWORD3>$stderr</KEYWORD3>
-			<KEYWORD3>$stdin</KEYWORD3>
-			<KEYWORD3>$stdout</KEYWORD3>
-			<KEYWORD3>$DEBUG</KEYWORD3>
-			<KEYWORD3>$FILENAME</KEYWORD3>
-			<KEYWORD3>$LOAD_PATH</KEYWORD3>
-			<KEYWORD3>$SAFE</KEYWORD3>
-			<KEYWORD3>$VERBOSE</KEYWORD3>
-			<KEYWORD3>__FILE__</KEYWORD3>
-			<KEYWORD3>__LINE__</KEYWORD3>
-			<KEYWORD3>ARGF</KEYWORD3>
-			<KEYWORD3>ARGV</KEYWORD3>
-			<KEYWORD3>ENV</KEYWORD3>
-			<KEYWORD3>DATA</KEYWORD3>
-			<KEYWORD3>FALSE</KEYWORD3>
-			<KEYWORD3>NIL</KEYWORD3>
-			<KEYWORD3>RUBY_PLATFORM</KEYWORD3>
-			<KEYWORD3>RUBY_RELEASE_DATE</KEYWORD3>
-			<KEYWORD3>RUBY_VERSION</KEYWORD3>
-			<KEYWORD3>STDERR</KEYWORD3>
-			<KEYWORD3>STDIN</KEYWORD3>
-			<KEYWORD3>STDOUT</KEYWORD3>
-			<KEYWORD3>SCRIPT_LINES__</KEYWORD3>
-			<KEYWORD3>TOPLEVEL_BINDING</KEYWORD3>
-			<KEYWORD3>TRUE</KEYWORD3>
-		</KEYWORDS>
-	</RULES>
-
-	<!-- Delegate contents of #{} expression in double quotes to MAIN so that
-	     it will be syntax highlighted as well -->
-	<RULES DEFAULT="LITERAL1" SET="doubleQuoteLiteral" ESCAPE="\">
-		<SPAN DELEGATE="MAIN" TYPE="OPERATOR">
-			<BEGIN>#{</BEGIN>
-			<END>}</END>
-		</SPAN>
-		<MARK_FOLLOWING TYPE="KEYWORD4">#@@</MARK_FOLLOWING>
-		<MARK_FOLLOWING TYPE="KEYWORD4">#@</MARK_FOLLOWING>
-		<MARK_FOLLOWING TYPE="NULL">#$</MARK_FOLLOWING>
-	</RULES>
-	<!-- Delegate contents of #{} expression in a double quoted symbol to MAIN so that
-	     it will be syntax highlighted as well -->
-	<RULES DEFAULT="LITERAL4" SET="doubleQuoteSymbol" ESCAPE="\">
-      <SPAN DELEGATE="MAIN" TYPE="OPERATOR">
-      <BEGIN>#{</BEGIN>
-      <END>}</END>
-    </SPAN>
-    <MARK_FOLLOWING TYPE="KEYWORD4">#@@</MARK_FOLLOWING>
-    <MARK_FOLLOWING TYPE="KEYWORD4">#@</MARK_FOLLOWING>
-    <MARK_FOLLOWING TYPE="NULL">#$</MARK_FOLLOWING>
-  </RULES>
-		
-	<!-- Delegate contents of #{} expression in backquotes to MAIN so that
-	     it will be syntax highlighted as well -->
-	<RULES DEFAULT="LITERAL2" SET="BackquoteLiteral" ESCAPE="\">
-		<SPAN DELEGATE="MAIN" TYPE="OPERATOR">
-			<BEGIN>#{</BEGIN>
-			<END>}</END>
-		</SPAN>
-		<MARK_FOLLOWING TYPE="KEYWORD4">#@@</MARK_FOLLOWING>
-		<MARK_FOLLOWING TYPE="KEYWORD4">#@</MARK_FOLLOWING>
-		<MARK_FOLLOWING TYPE="NULL">#$</MARK_FOLLOWING>
-	</RULES>
-
-	<!-- Delegate contents of #{} expression in a regexp to MAIN so that
-	     it will be syntax highlighted as well -->
-	<RULES DEFAULT="LITERAL3" SET="RegexpLiteral" ESCAPE="\">
-		<SPAN DELEGATE="MAIN" TYPE="OPERATOR">
-			<BEGIN>#{</BEGIN>
-			<END>}</END>
-		</SPAN>
-		<MARK_FOLLOWING TYPE="KEYWORD4">#@@</MARK_FOLLOWING>
-		<MARK_FOLLOWING TYPE="KEYWORD4">#@</MARK_FOLLOWING>
-		<MARK_FOLLOWING TYPE="NULL">#$</MARK_FOLLOWING>
-	</RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/rust.xml b/qpython/src/main/assets/syntax/rust.xml
deleted file mode 100644
index a08290ea..00000000
--- a/qpython/src/main/assets/syntax/rust.xml
+++ /dev/null
@@ -1,299 +0,0 @@
-<?xml version="1.0"?>
-<!--
- * :tabSize=8:indentSize=8:noTabs=false:
- * :folding=explicit:collapseFolds=1:
--->
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!-- updated for Rust 1.0 -->
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="commentStart" VALUE="/*" />
-		<PROPERTY NAME="commentEnd" VALUE="*/" />
-		<PROPERTY NAME="lineComment" VALUE="//" />
-		<PROPERTY NAME="wordBreakChars" VALUE=",+-=&lt;&gt;/?^&amp;*" />
-
-		<!-- Auto indent -->
-		<PROPERTY NAME="indentOpenBrackets" VALUE="{" />
-		<PROPERTY NAME="indentCloseBrackets" VALUE="}" />
-		<PROPERTY NAME="unalignedOpenBrackets" VALUE="(" />
-		<PROPERTY NAME="unalignedCloseBrackets" VALUE=")" />
-	</PROPS>
-	<RULES IGNORE_CASE="FALSE"
-		HIGHLIGHT_DIGITS="TRUE"
-		DIGIT_RE="(0b[01_]+|0o[0-8_]+|0x[0-9a-fA-F_]+|[0-9_]+)([iu](8|16|32|64)|isize|usize)?|[0-9_]+([eE][0-9_]*)?(f32|f64)?">
-
-		<!-- Silly comment -->
-		<SEQ TYPE="COMMENT1">/**/</SEQ>
-
-		<!-- Doc comment -->
-		<SPAN TYPE="COMMENT3" DELEGATE="NESTED_DOC_COMMENT">
-			<BEGIN>/**</BEGIN>
-			<END>*/</END>
-		</SPAN>
-
-		<!-- Range comment -->
-		<SPAN TYPE="COMMENT1" DELEGATE="NESTED_COMMENT">
-			<BEGIN>/*</BEGIN>
-			<END>*/</END>
-		</SPAN>
-
-		<EOL_SPAN TYPE="COMMENT3">///</EOL_SPAN>
-
-		<EOL_SPAN TYPE="COMMENT2">//</EOL_SPAN>
-
-		<SEQ_REGEXP TYPE="LITERAL1">br(#*)".*?"(\1)</SEQ_REGEXP>
-		<SPAN TYPE="LITERAL1" DELEGATE="DOUBLEQUOTE_LITERAL" NO_LINE_BREAK="FALSE">
-			<BEGIN>b"</BEGIN>
-			<END>"</END>
-		</SPAN>
-		<SEQ_REGEXP TYPE="LITERAL1">r(#*)".*?"(\1)</SEQ_REGEXP>
-		<SPAN TYPE="LITERAL1" DELEGATE="DOUBLEQUOTE_LITERAL" NO_LINE_BREAK="FALSE">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-		<SEQ_REGEXP TYPE="LITERAL3">b?'(.|\\([\\'nrt0]|x[a-fA-F\d]{2}|u\{[a-fA-F\d]{1,6}\}))'</SEQ_REGEXP>
-
-		<!-- Lifetimes -->
-		<!-- I tried to use MARK_FOLLOWING here, but it breaks the char
-		literal _above_ -->
-		<SEQ_REGEXP TYPE="KEYWORD4">'\w+</SEQ_REGEXP>
-
-		<!-- Attributes -->
-		<SPAN TYPE="KEYWORD4" DELEGATE="ATTRIBUTE" NO_LINE_BREAK="FALSE">
-			<BEGIN>#[</BEGIN>
-			<END>]</END>
-		</SPAN>
-		<SPAN TYPE="KEYWORD4" DELEGATE="ATTRIBUTE" NO_LINE_BREAK="FALSE">
-			<BEGIN>#![</BEGIN>
-			<END>]</END>
-		</SPAN>
-
-		<SEQ TYPE="OPERATOR">=</SEQ>
-		<SEQ TYPE="OPERATOR">!</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;=</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;=</SEQ>
-		<SEQ TYPE="OPERATOR">+</SEQ>
-		<SEQ TYPE="OPERATOR">-</SEQ>
-		<SEQ TYPE="OPERATOR">/</SEQ>
-
-		<!-- workaround to stop "*" from being colorized
-		     in use statements. -->
-		<SEQ TYPE="NULL">::*</SEQ>
-
-		<SEQ TYPE="OPERATOR">*</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;</SEQ>
-		<SEQ TYPE="OPERATOR">%</SEQ>
-		<SEQ TYPE="OPERATOR">&amp;</SEQ>
-		<SEQ TYPE="OPERATOR">|</SEQ>
-		<SEQ TYPE="OPERATOR">^</SEQ>
-		<SEQ TYPE="OPERATOR">}</SEQ>
-		<SEQ TYPE="OPERATOR">{</SEQ>
-
-		<!-- Function calls -->
-		<MARK_PREVIOUS TYPE="FUNCTION" MATCH_TYPE="OPERATOR">(</MARK_PREVIOUS>
-		<SEQ TYPE="OPERATOR">)</SEQ>
-
-		<SEQ TYPE="OPERATOR">=</SEQ>
-		<SEQ TYPE="OPERATOR">(</SEQ>
-		<SEQ TYPE="OPERATOR">)</SEQ>
-		<SEQ TYPE="OPERATOR">,</SEQ>
-
-		<KEYWORDS>
-			<!--{{{ stmts and exprs -->
-			<KEYWORD1>as</KEYWORD1>
-			<KEYWORD1>box</KEYWORD1>
-			<KEYWORD1>break</KEYWORD1>
-			<KEYWORD1>const</KEYWORD1>
-			<KEYWORD1>continue</KEYWORD1>
-			<KEYWORD1>else</KEYWORD1>
-			<KEYWORD1>for</KEYWORD1>
-			<KEYWORD1>if</KEYWORD1>
-			<KEYWORD1>in</KEYWORD1>
-			<KEYWORD1>let</KEYWORD1>
-			<KEYWORD1>loop</KEYWORD1>
-			<KEYWORD1>match</KEYWORD1>
-			<KEYWORD1>move</KEYWORD1>
-			<KEYWORD1>mut</KEYWORD1>
-			<KEYWORD1>ref</KEYWORD1>
-			<KEYWORD1>return</KEYWORD1>
-			<KEYWORD1>unsafe</KEYWORD1>
-			<KEYWORD1>while</KEYWORD1>
-			<!--}}}-->
-
-			<!--{{{ view item keywords -->
-			<KEYWORD2>extern</KEYWORD2>
-			<KEYWORD2>crate</KEYWORD2>
-			<KEYWORD2>mod</KEYWORD2>
-			<KEYWORD2>fn</KEYWORD2>
-			<KEYWORD2>type</KEYWORD2>
-			<KEYWORD2>struct</KEYWORD2>
-			<KEYWORD2>enum</KEYWORD2>
-			<KEYWORD2>static</KEYWORD2>
-			<KEYWORD2>trait</KEYWORD2>
-			<KEYWORD2>impl</KEYWORD2>
-			<KEYWORD2>use</KEYWORD2>
-			<KEYWORD2>super</KEYWORD2>
-			<KEYWORD2>priv</KEYWORD2>
-			<KEYWORD2>pub</KEYWORD2>
-			<KEYWORD2>where</KEYWORD2>
-			<!--}}}-->
-
-			<!--{{{ literals -->
-			<LITERAL2>false</LITERAL2>
-			<LITERAL2>true</LITERAL2>
-			<LITERAL2>self</LITERAL2>
-			<!--}}}-->
-
-			<!--{{{ primitive types from libcore -->
-			<KEYWORD3>bool</KEYWORD3>
-			<KEYWORD3>char</KEYWORD3>
-			<KEYWORD3>f32</KEYWORD3>
-			<KEYWORD3>f64</KEYWORD3>
-			<KEYWORD3>i16</KEYWORD3>
-			<KEYWORD3>i32</KEYWORD3>
-			<KEYWORD3>i64</KEYWORD3>
-			<KEYWORD3>i8</KEYWORD3>
-			<KEYWORD3>isize</KEYWORD3>
-			<KEYWORD3>str</KEYWORD3>
-			<KEYWORD3>u16</KEYWORD3>
-			<KEYWORD3>u32</KEYWORD3>
-			<KEYWORD3>u64</KEYWORD3>
-			<KEYWORD3>u8</KEYWORD3>
-			<KEYWORD3>usize</KEYWORD3>
-
-			<KEYWORD4>Copy</KEYWORD4>
-			<KEYWORD4>Send</KEYWORD4>
-			<KEYWORD4>Sized</KEYWORD4>
-			<KEYWORD4>Sync</KEYWORD4>
-			<KEYWORD4>Drop</KEYWORD4>
-			<KEYWORD4>Fn</KEYWORD4>
-			<KEYWORD4>FnMut</KEYWORD4>
-			<KEYWORD4>FnOnce</KEYWORD4>
-			<KEYWORD4>drop</KEYWORD4>
-			<KEYWORD4>Box</KEYWORD4>
-			<KEYWORD4>Clone</KEYWORD4>
-			<KEYWORD4>PartialEq</KEYWORD4>
-			<KEYWORD4>PartialOrd</KEYWORD4>
-			<KEYWORD4>Eq</KEYWORD4>
-			<KEYWORD4>Ord</KEYWORD4>
-			<KEYWORD4>AsRef</KEYWORD4>
-			<KEYWORD4>AsMut</KEYWORD4>
-			<KEYWORD4>Into</KEYWORD4>
-			<KEYWORD4>From</KEYWORD4>
-			<KEYWORD4>DoubleEndedIterator</KEYWORD4>
-			<KEYWORD4>ExactSizeIterator</KEYWORD4>
-			<KEYWORD4>Iterator</KEYWORD4>
-			<KEYWORD4>Extend</KEYWORD4>
-			<KEYWORD4>Option</KEYWORD4>
-			<KEYWORD4>Some</KEYWORD4>
-			<KEYWORD4>None</KEYWORD4>
-			<KEYWORD4>Result</KEYWORD4>
-			<KEYWORD4>Ok</KEYWORD4>
-			<KEYWORD4>Err</KEYWORD4>
-			<KEYWORD4>String</KEYWORD4>
-			<KEYWORD4>ToString</KEYWORD4>
-			<KEYWORD4>Vec</KEYWORD4>
-			<!--}}}-->
-		</KEYWORDS>
-	</RULES>
-
-	<!--{{{ DOUBLEQUOTE_LITERAL rule -->
-	<RULES SET="DOUBLEQUOTE_LITERAL" DEFAULT="LITERAL1" IGNORE_CASE="TRUE">
-		<SEQ TYPE="LITERAL4">\"</SEQ>
-		<SEQ TYPE="LITERAL4">\\</SEQ>
-		<SEQ TYPE="LITERAL4">\n</SEQ>
-		<SEQ TYPE="LITERAL4">\r</SEQ>
-		<SEQ TYPE="LITERAL4">\t</SEQ>
-		<SEQ TYPE="LITERAL4">\0</SEQ>
-		<SEQ_REGEXP HASH_CHAR="\x" TYPE="LITERAL4">\\x[a-f\d]{2}</SEQ_REGEXP>
-		<SEQ_REGEXP HASH_CHAR="\u" TYPE="LITERAL4">\\u\{[a-f\d]{1,6}\}</SEQ_REGEXP>
-	</RULES> <!--}}}-->
-
-	<!--{{{ ATTRIBUTE rule -->
-	<RULES SET="ATTRIBUTE" DEFAULT="KEYWORD4" IGNORE_CASE="FALSE">
-	<KEYWORDS>
-		<!-- Crate-only attributes -->
-		<KEYWORD2>crate_name</KEYWORD2>
-		<KEYWORD2>crate_type</KEYWORD2>
-		<KEYWORD2>feature</KEYWORD2>
-		<KEYWORD2>no_builtins</KEYWORD2>
-		<KEYWORD2>no_main</KEYWORD2>
-		<KEYWORD2>no_start</KEYWORD2>
-		<KEYWORD2>no_std</KEYWORD2>
-		<KEYWORD2>plugin</KEYWORD2>
-
-		<!-- Module-only attributes -->
-		<KEYWORD2>no_implicit_prelude</KEYWORD2>
-		<KEYWORD2>path</KEYWORD2>
-
-		<!-- Function-only attributes -->
-		<KEYWORD2>main</KEYWORD2>
-		<KEYWORD2>plugin_registrar</KEYWORD2>
-		<KEYWORD2>start</KEYWORD2>
-		<KEYWORD2>test</KEYWORD2>
-		<KEYWORD2>should_panic</KEYWORD2>
-		<KEYWORD2>cold</KEYWORD2>
-
-		<!-- Static-only attributes -->
-		<KEYWORD2>thread_local</KEYWORD2>
-
-		<!-- FFI attributes -->
-		<KEYWORD2>link_args</KEYWORD2>
-		<KEYWORD2>link</KEYWORD2>
-		<KEYWORD2>link_name</KEYWORD2>
-		<KEYWORD2>linkage</KEYWORD2>
-		<KEYWORD2>repr</KEYWORD2>
-
-		<!-- Macro-related attributes -->
-		<KEYWORD2>macro_use</KEYWORD2>
-		<KEYWORD2>macro_reexport</KEYWORD2>
-		<KEYWORD2>macro_export</KEYWORD2>
-		<KEYWORD2>no_link</KEYWORD2>
-
-		<!-- Miscellaneous attributes -->
-		<KEYWORD2>export_name</KEYWORD2>
-		<KEYWORD2>link_section</KEYWORD2>
-		<KEYWORD2>no_mangle</KEYWORD2>
-		<KEYWORD2>packed</KEYWORD2>
-		<KEYWORD2>simd</KEYWORD2>
-		<KEYWORD2>static_assert</KEYWORD2>
-		<KEYWORD2>unsafe_destructor</KEYWORD2>
-		<KEYWORD2>unsafe_no_drop_flag</KEYWORD2>
-		<KEYWORD2>doc</KEYWORD2>
-		<KEYWORD2>rustc_on_unimplemented</KEYWORD2>
-
-		<KEYWORD2>cfg</KEYWORD2>
-
-		<KEYWORD2>allow</KEYWORD2>
-		<KEYWORD2>deny</KEYWORD2>
-		<KEYWORD2>forbid</KEYWORD2>
-		<KEYWORD2>warn</KEYWORD2>
-
-		<KEYWORD2>lang</KEYWORD2>
-
-		<KEYWORD2>inline</KEYWORD2>
-
-		<KEYWORD2>derive</KEYWORD2>
-	</KEYWORDS>
-	</RULES> <!--}}}-->
-
-	<!--{{{ NESTED_DOC_COMMENT rule -->
-	<RULES SET="NESTED_DOC_COMMENT" DEFAULT="COMMENT3">
-		<!-- mark everything in doc comment as doc comment -->
-		<SPAN TYPE="COMMENT3" DELEGATE="NESTED_DOC_COMMENT">
-			<BEGIN>/*</BEGIN>
-			<END>*/</END>
-		</SPAN>
-	</RULES> <!--}}}-->
-
-	<!--{{{ NESTED_COMMENT rule -->
-	<RULES SET="NESTED_COMMENT" DEFAULT="COMMENT1">
-		<SPAN TYPE="COMMENT1" DELEGATE="NESTED_COMMENT">
-			<BEGIN>/*</BEGIN>
-			<END>*/</END>
-		</SPAN>
-	</RULES> <!--}}}-->
-
-</MODE>
diff --git a/qpython/src/main/assets/syntax/rview.xml b/qpython/src/main/assets/syntax/rview.xml
deleted file mode 100644
index e56c81cc..00000000
--- a/qpython/src/main/assets/syntax/rview.xml
+++ /dev/null
@@ -1,217 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!--
-  Relational View (rview) mode by Will Sargent <wsargent@atg.com>
--->
-<MODE>
-	<PROPS>
-                <PROPERTY NAME="indentOpenBrackets" VALUE="{" />
-		<PROPERTY NAME="indentCloseBrackets" VALUE="}" />
-		<PROPERTY NAME="commentStart" VALUE="/*" />
-		<PROPERTY NAME="commentEnd" VALUE="*/" />
-                <PROPERTY NAME="lineComment" VALUE="//" />
-	</PROPS>
-
-        <!--
-          Unicode escapes are allowed in identifiers.
-          Ignoring case is bad.
-          Digits may be returned from functions.
-        -->
-	<RULES IGNORE_CASE="FALSE" HIGHLIGHT_DIGITS="TRUE">
-                <SEQ TYPE="COMMENT1">/**/</SEQ>
-
-		<!-- Javadoc comment -->
-		<SPAN TYPE="COMMENT2" DELEGATE="java::JAVADOC">
-			<BEGIN>/**</BEGIN>
-			<END>*/</END>
-		</SPAN>
-
-                <!-- Java comment (C style) -->
-		<SPAN TYPE="COMMENT1">
-			<BEGIN>/*</BEGIN>
-			<END>*/</END>
-		</SPAN>
-
-		<SPAN TYPE="LITERAL1" NO_LINE_BREAK="TRUE" DELEGATE="RVIEWSTMT">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-
-                <SEQ TYPE="OPERATOR">}</SEQ>
-                <SEQ TYPE="OPERATOR">{</SEQ>
-                <SEQ TYPE="OPERATOR">=</SEQ>
-
-                <!-- Function calls -->
-                <MARK_PREVIOUS TYPE="FUNCTION" MATCH_TYPE="OPERATOR">(</MARK_PREVIOUS>
-				<SEQ TYPE="OPERATOR">)</SEQ>
-
-                <EOL_SPAN TYPE="COMMENT2">//</EOL_SPAN>
-
-                <KEYWORDS>
-
-                        <!--
-                          Keywords (WAY more than I thought there were, please
-                          e-mail me if I've left one out).
-                        -->
-                        <KEYWORD1>unique</KEYWORD1>
-                        <KEYWORD1>relationalview</KEYWORD1>
-                        <KEYWORD1>class</KEYWORD1>
-
-                        <KEYWORD1>rowmap</KEYWORD1>
-                        <KEYWORD1>table</KEYWORD1>
-                        <KEYWORD1>function</KEYWORD1>
-                        <KEYWORD1>subview</KEYWORD1>
-                        <KEYWORD1>query</KEYWORD1>
-
-                        <KEYWORD1>join</KEYWORD1>
-                        <KEYWORD1>jointype</KEYWORD1>
-                        <KEYWORD1>leftouter</KEYWORD1>
-                        <KEYWORD1>rightouter</KEYWORD1>
-
-                        <KEYWORD1>switch</KEYWORD1>
-                        <KEYWORD1>case</KEYWORD1>
-
-                        <KEYWORD1>sql</KEYWORD1>
-                        <KEYWORD1>constraints</KEYWORD1>
-                        <KEYWORD1>where</KEYWORD1>
-                        <KEYWORD1>orderby</KEYWORD1>
-                        <KEYWORD1>return</KEYWORD1>
-                        <KEYWORD1>distinct</KEYWORD1>
-
-                        <!--
-                          Allow parameters...
-                        -->
-                        <KEYWORD1>allow</KEYWORD1>
-                        <KEYWORD1>delete</KEYWORD1>
-                        <!-- also used in update function -->
-                        <KEYWORD1>update</KEYWORD1>
-                        <KEYWORD1>select</KEYWORD1>
-                        <KEYWORD1>insert</KEYWORD1>
-
-                        <!-- We're allowed to return primitive types -->
-                        <KEYWORD3>boolean</KEYWORD3>
-                        <KEYWORD3>byte</KEYWORD3>
-                        <KEYWORD3>char</KEYWORD3>
-                        <KEYWORD3>double</KEYWORD3>
-                        <KEYWORD3>float</KEYWORD3>
-                        <KEYWORD3>int</KEYWORD3>
-                        <KEYWORD3>long</KEYWORD3>
-                        <KEYWORD3>short</KEYWORD3>
-
-                        <KEYWORD1>useCallableStatement</KEYWORD1>
-
-                        <!--
-                          JDBC mapping statements (must be UPPERCASE)
-                        -->
-                        <KEYWORD3>CHAR</KEYWORD3>
-                        <KEYWORD3>VARCHAR</KEYWORD3>
-                        <KEYWORD3>LONGVARCHAR</KEYWORD3>
-                        <KEYWORD3>NUMERIC</KEYWORD3>
-                        <KEYWORD3>DECIMAL</KEYWORD3>
-                        <KEYWORD3>BIT</KEYWORD3>
-                        <KEYWORD3>TINYINT</KEYWORD3>
-                        <KEYWORD3>SMALLINT</KEYWORD3>
-                        <KEYWORD3>INTEGER</KEYWORD3>
-                        <KEYWORD3>BIGINT</KEYWORD3>
-                        <KEYWORD3>REAL</KEYWORD3>
-                        <KEYWORD3>FLOAT</KEYWORD3>
-                        <KEYWORD3>DOUBLE</KEYWORD3>
-                        <KEYWORD3>BINARY</KEYWORD3>
-                        <KEYWORD3>VARBINARY</KEYWORD3>
-                        <KEYWORD3>LONGVARBINARY</KEYWORD3>
-                        <KEYWORD3>DATE</KEYWORD3>
-                        <KEYWORD3>TIME</KEYWORD3>
-                        <KEYWORD3>TIMESTAMP</KEYWORD3>
-                </KEYWORDS>
-        </RULES>
-
-        <!--
-          Everything that happens in between quotes happens here.
-        -->
-        <RULES SET="RVIEWSTMT" ESCAPE="\" DEFAULT="LITERAL1"
-		HIGHLIGHT_DIGITS="TRUE" IGNORE_CASE="TRUE">
-                <!-- Allow quoting for characters. -->
-                <SPAN TYPE="LITERAL1" NO_LINE_BREAK="TRUE">
-                        <BEGIN>'</BEGIN>
-                        <END>'</END>
-                </SPAN>
-
-                <!--
-                  Standard arithmetic
-                -->
-                <SEQ TYPE="OPERATOR">+</SEQ>
-                <SEQ TYPE="OPERATOR">-</SEQ>
-                <SEQ TYPE="OPERATOR">/</SEQ>
-                <SEQ TYPE="OPERATOR">*</SEQ>
-                <SEQ TYPE="OPERATOR">=</SEQ>
-
-                <!--
-                  Standard logic
-                -->
-                <SEQ TYPE="OPERATOR">&gt;=</SEQ>
-                <SEQ TYPE="OPERATOR">&lt;=</SEQ>
-                <SEQ TYPE="OPERATOR">&gt;</SEQ>
-                <SEQ TYPE="OPERATOR">&lt;</SEQ>
-
-                <!--
-                  For callable statements, { } must be used.
-                -->
-                <SEQ TYPE="OPERATOR">}</SEQ>
-                <SEQ TYPE="OPERATOR">{</SEQ>
-
-                <!--
-                  Escape colons for full tables
-                -->
-                <SEQ TYPE="NULL">::</SEQ>
-
-                <!-- Mark most colons as a label indicator -->
-                <MARK_FOLLOWING TYPE="LABEL">:</MARK_FOLLOWING>
-
-                <!-- Function calls (these can happen even inside quotes) -->
-                <MARK_PREVIOUS TYPE="FUNCTION" MATCH_TYPE="OPERATOR">(</MARK_PREVIOUS>
-				<SEQ TYPE="OPERATOR">)</SEQ>
-
-                <KEYWORDS>
-                        <KEYWORD1>SELECT</KEYWORD1>
-                        <KEYWORD1>FROM</KEYWORD1>
-                        <KEYWORD1>WHERE</KEYWORD1>
-                        <KEYWORD1>AND</KEYWORD1>
-                        <KEYWORD1>NOT</KEYWORD1>
-                        <KEYWORD1>IN</KEYWORD1>
-                        <KEYWORD1>BETWEEN</KEYWORD1>
-                        <KEYWORD1>UPDATE</KEYWORD1>
-                        <KEYWORD1>SET</KEYWORD1>
-
-                        <KEYWORD1>call</KEYWORD1>
-                        <KEYWORD1>desc</KEYWORD1>
-
-                        <!--
-                          It's possible to do casting to a particular SQL
-                          type, so include the JDBC types here
-                        -->
-                        <KEYWORD3>CHAR</KEYWORD3>
-                        <KEYWORD3>VARCHAR</KEYWORD3>
-                        <KEYWORD3>LONGVARCHAR</KEYWORD3>
-                        <KEYWORD3>NUMERIC</KEYWORD3>
-                        <KEYWORD3>DECIMAL</KEYWORD3>
-                        <KEYWORD3>BIT</KEYWORD3>
-                        <KEYWORD3>TINYINT</KEYWORD3>
-                        <KEYWORD3>SMALLINT</KEYWORD3>
-                        <KEYWORD3>INTEGER</KEYWORD3>
-                        <KEYWORD3>BIGINT</KEYWORD3>
-                        <KEYWORD3>REAL</KEYWORD3>
-                        <KEYWORD3>FLOAT</KEYWORD3>
-                        <KEYWORD3>DOUBLE</KEYWORD3>
-                        <KEYWORD3>BINARY</KEYWORD3>
-                        <KEYWORD3>VARBINARY</KEYWORD3>
-                        <KEYWORD3>LONGVARBINARY</KEYWORD3>
-                        <KEYWORD3>DATE</KEYWORD3>
-                        <KEYWORD3>TIME</KEYWORD3>
-                        <KEYWORD3>TIMESTAMP</KEYWORD3>
-                </KEYWORDS>
-        </RULES>
-
-
-</MODE>
diff --git a/qpython/src/main/assets/syntax/sas.xml b/qpython/src/main/assets/syntax/sas.xml
deleted file mode 100644
index b0b80338..00000000
--- a/qpython/src/main/assets/syntax/sas.xml
+++ /dev/null
@@ -1,458 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!--
-      SAS edit mode by Bill McMilleon (bill@mcmilleon.com) March 19, 2003
-      updated by Ian Helgesen 2007-10-02
-      updated by goebbe 2009-05-19
-      updated by goebbe 2010-06-15
-
-      Suggested catalog file entry:
-      <MODE NAME="SAS"		FILE="sas.xml" FILE_NAME_GLOB="*.{sas}" />
--->
-
-<MODE>
-<PROPS>
-    <PROPERTY NAME="indentNextLines" VALUE="(.*%?do.*;|\s*proc
-.*;|\s*data .*;|\s*%macro\s?.*;|define event \S+\s*;)"/>
-
-    <PROPERTY NAME="unindentThisLine" VALUE="^\s*(else.*|end\s*|elsif.*|rescue.*|when.*)$"/>
-    <PROPERTY NAME="unindentNextLines" VALUE="^\s*(end\s*|else.*|rescue.*|elsif.*|when.*)$"/>
-
-    <PROPERTY NAME="commentStart" VALUE="/*" />
-    <PROPERTY NAME="commentEnd" VALUE="*/" />
-    <PROPERTY NAME="lineComment" VALUE="*" />
-</PROPS>
-
-    <RULES IGNORE_CASE="TRUE" NO_WORD_SEP="_" HIGHLIGHT_DIGITS="TRUE">
-
-<!-- In fixed form, column 72 is the last column parsed, unless the
-\extend_source option is invoked -->
-    <!-- TERMINATE AT_CHAR="72" / -->
-
-<!-- type2-range comment in the case when there is nothing OR nothing but space between the last ; and the *   -->
-<!-- Currently the ending ; of a comment cannot be used in regexp inside Jedit -->
-<!-- therefore several type2-range comments in a row requires regexp for each case -->
-
-<!-- Currently only two type2-range-comments in row (per line) are implemented  -->
-<!-- The rational behind the solution is the following: Define the "complete type2-comment block -->
-<!-- AND the start of the second typ2-comment block" as the start of the type2-range comment  -->
-
-<!-- case0: two COMMENT2 range comments in a row at the start of a line: -->
-<SPAN_REGEXP TYPE="COMMENT2" HASH_CHAR="*" AT_WHITESPACE_END="TRUE">
-    <BEGIN>[*][^;]*[;][\s]*[*]</BEGIN>
-    <END>;</END>
-</SPAN_REGEXP>
-
-<!-- case1: two comments in a row /*comment*/ *comment; - at the start of a line, : -->
-<SPAN_REGEXP TYPE="COMMENT2" HASH_CHAR="/*" AT_WHITESPACE_END="TRUE">
-    <BEGIN>([/][*][*][/][\s]*[*])|([/][*](.)*[*][/][\s]*[*])</BEGIN>
-    <END>;</END>
-</SPAN_REGEXP>
-
-<!-- case2: one COMMENT2 at the start of a line: -->
-<SPAN_REGEXP TYPE="COMMENT2" HASH_CHAR="*" AT_WHITESPACE_END="TRUE">
-    <BEGIN>[*]</BEGIN>
-    <END>;</END>
-</SPAN_REGEXP>
-
-<!-- case3: two COMMENT2 range comments in a row -  after SAS-code:-->
-<SPAN_REGEXP TYPE="COMMENT2"  HASH_CHAR=";">
-    <BEGIN>[;][\s]*[*][^;]*[;][\s]*[*]</BEGIN>
-    <END>;</END>
-</SPAN_REGEXP>
-
-<!-- case4: two comments in a row /*comment*/ *comment; - after SAS-code:-->
-<SPAN_REGEXP TYPE="COMMENT2" HASH_CHAR=";">
-    <BEGIN>[;][\s]*[/][*](.)*[*][/][\s]*[*]</BEGIN>
-    <END>;</END>
-</SPAN_REGEXP>
-
-<!-- case5: one COMMENT2 range comment after SAS-code: -->
-<SPAN_REGEXP TYPE="COMMENT2" HASH_CHAR=";">
-    <BEGIN>[;][\s]*[*]</BEGIN>
-    <END>;</END>
-</SPAN_REGEXP>
-
-<!-- range-comment "macro"-type -->
-<SPAN TYPE="COMMENT2">
-    <BEGIN>%*</BEGIN>
-    <END>;</END>
-</SPAN>
-
-<!-- C style comment -->
-<SPAN TYPE="COMMENT1">
-	<BEGIN>/*</BEGIN>
-	<END>*/</END>
-</SPAN>
-
-<SPAN TYPE="LITERAL1" NO_LINE_BREAK="FALSE">
-    <BEGIN>'</BEGIN>
-    <END>'</END>
-</SPAN>
-
-<SPAN TYPE="LITERAL2" NO_LINE_BREAK="FALSE">
-    <BEGIN>"</BEGIN>
-    <END>"</END>
-</SPAN>
-
-<!-- PROCS                 -->
-<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">PROC ANOVA</SEQ>
-<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">PROC APPEND</SEQ>
-<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">PROC BOXPLOT</SEQ>
-<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">PROC CONTENTS</SEQ>
-<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">PROC DATASETS</SEQ>
-<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">PROC DELETE</SEQ>
-<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">PROC FORMAT</SEQ>
-<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">PROC FREQ</SEQ>
-<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">PROC IMPORT</SEQ>
-<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">PROC MEANS</SEQ>
-<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">PROC PRINTTO</SEQ>
-<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">PROC PRINT</SEQ>
-<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">PROC REPORT</SEQ>
-<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">PROC SORT</SEQ>
-<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">PROC SQL</SEQ>
-<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">PROC UNIVARIATE</SEQ>
-
-<SEQ TYPE="KEYWORD1" AT_WHITESPACE_END="TRUE">DATA </SEQ>
-<SEQ TYPE="FUNCTION" AT_WORD_START="TRUE">%INCLUDE</SEQ>
-
-<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">PROC</SEQ>
-<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">RUN;</SEQ>
-<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">QUIT;</SEQ>
-
-<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">%macro</SEQ>
-<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">%mend</SEQ>
-
-<!--<SEQ_REGEXP TYPE="FUNCTION" AT_WORD_START="TRUE">\s*%\S+\s?\(</SEQ_REGEXP>-->
-<!--<SEQ_REGEXP TYPE="KEYWORD2" HASH_CHAR="%">\%\s*\(</SEQ_REGEXP>-->
-
-<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="%" AT_WHITESPACE_END="TRUE">%\S+\s*\(</SEQ_REGEXP>
-<SEQ_REGEXP TYPE="MARKUP" HASH_CHAR="&amp;">(&amp;*\w+)+(\.+|,|;|\s|$|\}|\))</SEQ_REGEXP>
-<!--<SEQ_REGEXP TYPE="MARKUP" HASH_CHAR="&amp;" AT_LINE_START="TRUE">&amp;\S+(\.|;|\s)</SEQ_REGEXP>-->
-
-<!--"data"+"=" can also be a keyword that is applied inside a proc or a data step:-->
-<SEQ_REGEXP TYPE="KEYWORD2" HASH_CHAR="DATA">(DATA)[\s]*[=]</SEQ_REGEXP>
-
-<!--<SEQ TYPE="MARKUP" AT_WORD_START="TRUE">ODS CSV</SEQ>
-<SEQ TYPE="MARKUP" AT_WORD_START="TRUE">ODS CSV CLOSE</SEQ>
-<SEQ TYPE="MARKUP" AT_WORD_START="TRUE">ODS HTML</SEQ>
-<SEQ TYPE="MARKUP" AT_WORD_START="TRUE">ODS HTML CLOSE</SEQ>
-<SEQ TYPE="MARKUP" AT_WORD_START="TRUE">ODS LISTING</SEQ>
-<SEQ TYPE="MARKUP" AT_WORD_START="TRUE">ODS LISTING OFF</SEQ>
-<SEQ TYPE="MARKUP" AT_WORD_START="TRUE">ODS PDF</SEQ>
-<SEQ TYPE="MARKUP" AT_WORD_START="TRUE">ODS PDF CLOSE</SEQ>
-<SEQ TYPE="MARKUP" AT_WORD_START="TRUE">ODS RTF</SEQ>
-<SEQ TYPE="MARKUP" AT_WORD_START="TRUE">ODS RTF CLOSE</SEQ>
-<SEQ TYPE="MARKUP" AT_WORD_START="TRUE">ODS</SEQ>-->
-
-    <!-- Highlighted Operators -->
-    <SEQ TYPE="OPERATOR">=</SEQ>
-    <SEQ TYPE="OPERATOR">&lt;</SEQ>
-    <SEQ TYPE="OPERATOR">&gt;</SEQ>
-    <!--<SEQ TYPE="OPERATOR">_</SEQ>  -->
-    <SEQ TYPE="OPERATOR">|</SEQ>
-    <SEQ TYPE="OPERATOR">~</SEQ>
-    <SEQ TYPE="OPERATOR">^</SEQ>
-    <SEQ TYPE="OPERATOR">@</SEQ>
-    <SEQ TYPE="OPERATOR">?</SEQ>
-    <SEQ TYPE="OPERATOR">/</SEQ>
-    <SEQ TYPE="OPERATOR">.</SEQ>
-    <SEQ TYPE="OPERATOR">-</SEQ>
-    <SEQ TYPE="OPERATOR">+</SEQ>
-    <SEQ TYPE="OPERATOR">*</SEQ>
-    <SEQ TYPE="OPERATOR">!</SEQ>
-
-    <KEYWORDS>
-      <KEYWORD2>$ASCII</KEYWORD2>
-      <KEYWORD2>$BINARY</KEYWORD2>
-      <KEYWORD2>$CB</KEYWORD2>
-      <KEYWORD2>$CHAR</KEYWORD2>
-      <KEYWORD2>$CHARZB</KEYWORD2>
-      <KEYWORD2>$EBCDIC</KEYWORD2>
-      <KEYWORD2>$HEX</KEYWORD2>
-      <KEYWORD2>$OCTAL</KEYWORD2>
-      <KEYWORD2>$VARYING</KEYWORD2>
-
-      <KEYWORD3>%ABORT</KEYWORD3>
-      <KEYWORD3>%BQUOTE</KEYWORD3>
-      <KEYWORD3>%DO</KEYWORD3>
-      <KEYWORD3>%ELSE</KEYWORD3>
-      <KEYWORD3>%END</KEYWORD3>
-      <KEYWORD3>%EVAL</KEYWORD3>
-      <KEYWORD3>%Global</KEYWORD3>
-      <KEYWORD3>%GOTO</KEYWORD3>
-      <KEYWORD3>%IF</KEYWORD3>
-      <KEYWORD3>%INC</KEYWORD3>
-      <KEYWORD3>%INCLUDE</KEYWORD3>
-      <KEYWORD3>%INDEX</KEYWORD3>
-      <KEYWORD3>%INPUT</KEYWORD3>
-      <KEYWORD3>%LENGTH</KEYWORD3>
-      <KEYWORD3>%LET</KEYWORD3>
-      <KEYWORD3>%LOCAL</KEYWORD3>
-      <KEYWORD3>%LOWCASE</KEYWORD3>
-      <KEYWORD3>%MACRO</KEYWORD3>
-      <KEYWORD3>%MEND</KEYWORD3>
-      <KEYWORD3>%NRBQUOTE</KEYWORD3>
-      <KEYWORD3>%NRQUOTE</KEYWORD3>
-      <KEYWORD3>%NRSTR</KEYWORD3>
-      <KEYWORD3>%PUT</KEYWORD3>
-      <KEYWORD3>%QSCAN</KEYWORD3>
-      <KEYWORD3>%QSUBSTR</KEYWORD3>
-      <KEYWORD3>%Quote</KEYWORD3>
-      <KEYWORD3>%RUN</KEYWORD3>
-      <KEYWORD3>%SCAN</KEYWORD3>
-      <KEYWORD3>%STR</KEYWORD3>
-      <KEYWORD3>%SUBSTR</KEYWORD3>
-      <KEYWORD3>%SYMDEL</KEYWORD3>
-      <KEYWORD3>%SYSEXEC</KEYWORD3>
-      <KEYWORD3>%SYSFUNC</KEYWORD3>
-      <KEYWORD3>%THEN</KEYWORD3>
-      <KEYWORD3>%TO</KEYWORD3>
-      <KEYWORD3>%UNTIL</KEYWORD3>
-      <KEYWORD3>%WHILE</KEYWORD3>
-      <KEYWORD3>%WINDOW</KEYWORD3>
-      <KEYWORD3>%UPCASE</KEYWORD3>
-
-      <KEYWORD2>_ALL_</KEYWORD2>
-      <KEYWORD2>_CHARACTER_</KEYWORD2>
-      <KEYWORD2>_CMD_</KEYWORD2>
-      <KEYWORD2>_ERROR_</KEYWORD2>
-      <KEYWORD2>_I_</KEYWORD2>
-      <KEYWORD2>_INFILE_</KEYWORD2>
-      <KEYWORD2>_LAST_</KEYWORD2>
-      <KEYWORD2>_MSG_</KEYWORD2>
-      <KEYWORD2>_N_</KEYWORD2>
-      <KEYWORD2>_NULL_</KEYWORD2>
-      <KEYWORD2>_NUMERIC_</KEYWORD2>
-      <KEYWORD2>_TEMPORARY_</KEYWORD2>
-      <KEYWORD2>_TYPE_</KEYWORD2>
-      <KEYWORD2>=DATA</KEYWORD2>
-      <KEYWORD2>ABORT</KEYWORD2>
-      <KEYWORD2>ADD</KEYWORD2>
-      <KEYWORD2>ADJRSQ</KEYWORD2>
-      <KEYWORD2>AND</KEYWORD2>
-      <KEYWORD2>ARRAY</KEYWORD2>
-      <KEYWORD2>ATTRIB</KEYWORD2>
-      <KEYWORD2>BACKWARD</KEYWORD2>
-      <KEYWORD2>BINARY</KEYWORD2>
-      <KEYWORD2>BLOCKSIZE</KEYWORD2>
-      <KEYWORD2>BY</KEYWORD2>
-      <KEYWORD2>BZ</KEYWORD2>
-      <KEYWORD2>CALL</KEYWORD2>
-      <KEYWORD2>CARDS</KEYWORD2>
-      <KEYWORD2>CARDS4</KEYWORD2>
-      <KEYWORD2>CHAR</KEYWORD2>
-      <KEYWORD2>CLASS</KEYWORD2>
-      <KEYWORD2>COL</KEYWORD2>
-      <KEYWORD2>COLLIN</KEYWORD2>
-      <KEYWORD2>COLUMN</KEYWORD2>
-      <KEYWORD2>COMMA</KEYWORD2>
-      <KEYWORD2>COMMAX</KEYWORD2>
-      <KEYWORD2>CREATE</KEYWORD2>
-      <KEYWORD2>DATA</KEYWORD2>
-      <KEYWORD2>DATA=</KEYWORD2>
-      <KEYWORD2>DATE</KEYWORD2>
-      <KEYWORD2>DATAFILE</KEYWORD2>
-      <KEYWORD2>DATETIME</KEYWORD2>
-      <KEYWORD2>DDMMYY</KEYWORD2>
-      <KEYWORD2>DECENDING</KEYWORD2>
-      <KEYWORD2>DEFINE</KEYWORD2>
-      <KEYWORD2>DELETE</KEYWORD2>
-      <KEYWORD2>DELIMITER</KEYWORD2>
-      <KEYWORD2>DISPLAY</KEYWORD2>
-      <KEYWORD2>DLM</KEYWORD2>
-      <KEYWORD2>DO</KEYWORD2>
-      <KEYWORD2>DROP</KEYWORD2>
-      <KEYWORD2>ELSE</KEYWORD2>
-      <KEYWORD2>END</KEYWORD2>
-      <KEYWORD2>ENDSAS</KEYWORD2>
-      <KEYWORD2>EOF</KEYWORD2>
-      <KEYWORD2>EOV</KEYWORD2>
-      <KEYWORD2>EQ</KEYWORD2>
-      <KEYWORD2>ERRORS</KEYWORD2>
-      <KEYWORD2>FILE</KEYWORD2>
-      <KEYWORD2>FILENAME</KEYWORD2>
-      <KEYWORD2>FILEVAR</KEYWORD2>
-      <KEYWORD2>FIRST.</KEYWORD2>
-      <KEYWORD2>FIRSTOBS</KEYWORD2>
-      <KEYWORD2>FOOTNOTE</KEYWORD2>
-      <KEYWORD2>FOOTNOTE1</KEYWORD2>
-      <KEYWORD2>FOOTNOTE2</KEYWORD2>
-      <KEYWORD2>FOOTNOTE3</KEYWORD2>
-      <KEYWORD2>FORM</KEYWORD2>
-      <KEYWORD2>FORMAT</KEYWORD2>
-      <KEYWORD2>FORMCHAR</KEYWORD2>
-      <KEYWORD2>FORMDELIM</KEYWORD2>
-      <KEYWORD2>FORMDLIM</KEYWORD2>
-      <KEYWORD2>FORWARD</KEYWORD2>
-      <KEYWORD2>FROM</KEYWORD2>
-      <KEYWORD2>GO</KEYWORD2>
-      <KEYWORD2>GROUP</KEYWORD2>
-      <KEYWORD2>GT</KEYWORD2>
-      <KEYWORD2>HBAR</KEYWORD2>
-      <KEYWORD2>HEX</KEYWORD2>
-      <KEYWORD2>HPCT</KEYWORD2>
-      <KEYWORD2>HVAR</KEYWORD2>
-      <KEYWORD2>IB</KEYWORD2>
-      <KEYWORD2>ID</KEYWORD2>
-      <KEYWORD2>IEEE</KEYWORD2>
-      <KEYWORD2>IF</KEYWORD2>
-      <KEYWORD2>IN</KEYWORD2>
-      <KEYWORD2>INFILE</KEYWORD2>
-      <KEYWORD2>INFORMAT</KEYWORD2>
-      <KEYWORD2>INTO</KEYWORD2>
-      <KEYWORD2>INPUT</KEYWORD2>
-      <KEYWORD2>INR</KEYWORD2>
-      <KEYWORD2>INVALUE</KEYWORD2>
-      <KEYWORD2>JOIN</KEYWORD2>
-      <KEYWORD2>JULIAN</KEYWORD2>
-      <KEYWORD2>KEEP</KEYWORD2>
-      <KEYWORD2>LABEL</KEYWORD2>
-      <KEYWORD2>LAG</KEYWORD2>
-      <KEYWORD2>LAST.</KEYWORD2>
-      <KEYWORD2>LEFT</KEYWORD2>
-      <KEYWORD2>LENGTH</KEYWORD2>
-      <KEYWORD2>LIB</KEYWORD2>
-      <KEYWORD2>LIBNAME</KEYWORD2>
-      <KEYWORD2>LINE</KEYWORD2>
-      <KEYWORD2>LINESIZE</KEYWORD2>
-      <KEYWORD2>LINK</KEYWORD2>
-      <KEYWORD2>LIST</KEYWORD2>
-      <KEYWORD2>LOSTCARD</KEYWORD2>
-      <KEYWORD2>LRECL</KEYWORD2>
-      <KEYWORD2>LS</KEYWORD2>
-      <KEYWORD2>MACRO</KEYWORD2>
-      <KEYWORD2>MACROGEN</KEYWORD2>
-      <KEYWORD2>MAXDEC</KEYWORD2>
-      <KEYWORD2>MAXR</KEYWORD2>
-      <KEYWORD2>MEDIAN</KEYWORD2>
-      <KEYWORD2>MEMTYPE</KEYWORD2>
-      <KEYWORD2>MERGE</KEYWORD2>
-      <KEYWORD2>MERROR</KEYWORD2>
-      <KEYWORD2>MISSOVE</KEYWORD2>
-      <KEYWORD2>MLOGIC</KEYWORD2>
-      <KEYWORD2>MMDDYY</KEYWORD2>
-      <KEYWORD2>MODE</KEYWORD2>
-      <KEYWORD2>MODEL</KEYWORD2>
-      <KEYWORD2>MONYY</KEYWORD2>
-      <KEYWORD2>MPRINT</KEYWORD2>
-      <KEYWORD2>MRECALL</KEYWORD2>
-      <KEYWORD2>NE</KEYWORD2>
-      <KEYWORD2>NEW</KEYWORD2>
-      <KEYWORD2>NO</KEYWORD2>
-      <KEYWORD2>NOBS</KEYWORD2>
-      <KEYWORD2>NOCENTER</KEYWORD2>
-      <KEYWORD2>NOCUM</KEYWORD2>
-      <KEYWORD2>NODATE</KEYWORD2>
-      <KEYWORD2>NODUP</KEYWORD2>
-      <KEYWORD2>NODUPKEY</KEYWORD2>
-      <KEYWORD2>NOINT</KEYWORD2>
-      <KEYWORD2>NONUMBER</KEYWORD2>
-      <KEYWORD2>NOPAD</KEYWORD2>
-      <KEYWORD2>NOPRINT</KEYWORD2>
-      <KEYWORD2>NOROW</KEYWORD2>
-      <KEYWORD2>NOT</KEYWORD2>
-      <KEYWORD2>NOTITLE</KEYWORD2>
-      <KEYWORD2>NOTITLES</KEYWORD2>
-      <KEYWORD2>NOXSYNC</KEYWORD2>
-      <KEYWORD2>NOXWAIT</KEYWORD2>
-      <KEYWORD2>NUMBER</KEYWORD2>
-      <KEYWORD2>NWAY</KEYWORD2>
-      <KEYWORD2>OBS</KEYWORD2>
-      <KEYWORD2>OPTION</KEYWORD2>
-      <KEYWORD2>OPTIONS</KEYWORD2>
-      <KEYWORD2>OR</KEYWORD2>
-      <KEYWORD2>ORDER</KEYWORD2>
-      <KEYWORD2>OTHERWISE</KEYWORD2>
-      <KEYWORD2>OUT</KEYWORD2>
-      <KEYWORD2>OUTPUT</KEYWORD2>
-      <KEYWORD2>OVER</KEYWORD2>
-      <KEYWORD2>PAD</KEYWORD2>
-      <KEYWORD2>PAD2</KEYWORD2>
-      <KEYWORD2>PAGESIZE</KEYWORD2>
-      <KEYWORD2>PD</KEYWORD2>
-      <KEYWORD2>PERCENT</KEYWORD2>
-      <KEYWORD2>PIB</KEYWORD2>
-      <KEYWORD2>PK</KEYWORD2>
-      <KEYWORD2>POINT</KEYWORD2>
-      <KEYWORD2>POSITION</KEYWORD2>
-      <KEYWORD2>PRINTER</KEYWORD2>
-      <KEYWORD2>PRXMATCH</KEYWORD2>
-      <KEYWORD2>PRXCHANGE</KEYWORD2>
-      <KEYWORD2>PS</KEYWORD2>
-      <KEYWORD2>PUT</KEYWORD2>
-      <KEYWORD2>R</KEYWORD2>
-      <KEYWORD2>RB</KEYWORD2>
-      <KEYWORD2>RECFM</KEYWORD2>
-      <KEYWORD2>REG</KEYWORD2>
-      <KEYWORD2>REGR</KEYWORD2>
-      <KEYWORD2>RENAME</KEYWORD2>
-      <KEYWORD2>REPLACE</KEYWORD2>
-      <KEYWORD2>RETAIN</KEYWORD2>
-      <KEYWORD2>RETURN</KEYWORD2>
-      <KEYWORD2>REUSE</KEYWORD2>
-      <KEYWORD2>REVERSE</KEYWORD2>
-      <KEYWORD2>RSQUARE</KEYWORD2>
-      <KEYWORD2>RUN</KEYWORD2>
-      <KEYWORD2>SASAUTOS</KEYWORD2>
-      <KEYWORD2>SCAN</KEYWORD2>
-      <KEYWORD2>SELECT</KEYWORD2>
-      <KEYWORD2>SELECTION</KEYWORD2>
-      <KEYWORD2>SERROR</KEYWORD2>
-      <KEYWORD2> SET</KEYWORD2>
-      <KEYWORD2>SIMPLE</KEYWORD2>
-      <KEYWORD2>SLE</KEYWORD2>
-      <KEYWORD2>SLS</KEYWORD2>
-      <KEYWORD2>START</KEYWORD2>
-      <KEYWORD2>STDIN</KEYWORD2>
-      <KEYWORD2>STOP</KEYWORD2>
-      <KEYWORD2>STOPOVER</KEYWORD2>
-      <KEYWORD2>SUBSTR</KEYWORD2>
-      <KEYWORD2>SYMBOL</KEYWORD2>
-      <KEYWORD2>SYMBOLGEN</KEYWORD2>
-      <KEYWORD2>SYMGET</KEYWORD2>
-      <KEYWORD2>SYMPUT</KEYWORD2>
-      <KEYWORD2>SYMPUTX</KEYWORD2>
-      <KEYWORD2>T</KEYWORD2>
-      <KEYWORD2>TABLE</KEYWORD2>
-      <KEYWORD2>TABLES</KEYWORD2>
-      <KEYWORD2>THEN</KEYWORD2>
-      <KEYWORD2>TITLE</KEYWORD2>
-      <KEYWORD2>TITLE1</KEYWORD2>
-      <KEYWORD2>TITLE2</KEYWORD2>
-      <KEYWORD2>TITLE3</KEYWORD2>
-      <KEYWORD2>TITLE4</KEYWORD2>
-      <KEYWORD2>TITLE5</KEYWORD2>
-      <KEYWORD2>TO</KEYWORD2>
-      <KEYWORD2>TOL</KEYWORD2>
-      <KEYWORD2>TRIM</KEYWORD2>
-      <KEYWORD2>UNFORMATTED</KEYWORD2>
-      <KEYWORD2>UNTIL</KEYWORD2>
-      <KEYWORD2>UPDATE</KEYWORD2>
-      <KEYWORD2>UPCASE</KEYWORD2>
-      <KEYWORD2>VALUE</KEYWORD2>
-      <KEYWORD2>VAR</KEYWORD2>
-      <KEYWORD2>WHEN</KEYWORD2>
-      <KEYWORD2>WHERE</KEYWORD2>
-      <KEYWORD2>WHILE</KEYWORD2>
-      <KEYWORD2>WINDOW</KEYWORD2>
-      <KEYWORD2>WORK</KEYWORD2>
-      <KEYWORD2>X</KEYWORD2>
-      <KEYWORD2>XSYNC</KEYWORD2>
-      <KEYWORD2>XWAIT</KEYWORD2>
-      <KEYWORD2>YES</KEYWORD2>
-      <KEYWORD2>YYMMDD</KEYWORD2>
-      <KEYWORD2>GOPTIONS</KEYWORD2>
-      <KEYWORD2>AXIS1</KEYWORD2>
-      <KEYWORD2>AXIS2</KEYWORD2>
-      <KEYWORD2>SYMBOL1</KEYWORD2>
-      <KEYWORD2>SET</KEYWORD2>
-   </KEYWORDS>
-
-    </RULES>
-</MODE>
-
-
-
diff --git a/qpython/src/main/assets/syntax/scala.xml b/qpython/src/main/assets/syntax/scala.xml
deleted file mode 100644
index 6fc3885b..00000000
--- a/qpython/src/main/assets/syntax/scala.xml
+++ /dev/null
@@ -1,428 +0,0 @@
-<?xml version="1.0"?>
-<!-- Scala mode by Daniel Spiewak downloaded on 2015-05-17 from https://github.com/djspiewak/jedit-modes/blob/master/scala.xml -->
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<MODE>
-  <PROPS>
-    <PROPERTY NAME="indentOpenBrackets" VALUE="{" />
-    <PROPERTY NAME="indentCloseBrackets" VALUE="}" />
-    <PROPERTY NAME="lineUpClosingBracket" VALUE="true" />
-  <PROPERTY NAME="indentNextLine"
-    VALUE="(.*((if|while|else\s+if|for)\s*\().*\)|\s*else|\s*case.*=>|.*(def|val|var|type).*=)\s*$"/>
-    <!-- set this to 'true' if you want to use GNU coding style -->
-    <PROPERTY NAME="doubleBracketIndent" VALUE="false" />
-    <PROPERTY NAME="commentStart" VALUE="/*" />
-    <PROPERTY NAME="commentEnd" VALUE="*/" />
-    <PROPERTY NAME="lineComment" VALUE="//" />
-    <PROPERTY NAME="noTabs" VALUE="true" />
-    <PROPERTY NAME="tabSize" VALUE="2" />
-    <PROPERTY NAME="indentSize" VALUE="2" />
-    <PROPERTY NAME="wordBreakChars" VALUE=",+-=&lt;&gt;/?^&amp;*" />
-  </PROPS>
-
-  <RULES IGNORE_CASE="FALSE" HIGHLIGHT_DIGITS="TRUE"
-      DIGIT_RE="(0[lL]?|[1-9]\d{0,9}(\d{0,9}[lL])?|0[xX]\p{XDigit}{1,8}(\p{XDigit}{0,8}[lL])?|0[0-7]{1,11}([0-7]{0,11}[lL])?|([0-9]+\.[0-9]*|\.[0-9]+)([eE][+-]?[0-9]+)?[fFdD]?|[0-9]+([eE][+-]?[0-9]+[fFdD]?|([eE][+-]?[0-9]+)?[fFdD]))">
-
-  <MARK_FOLLOWING TYPE="LABEL">@</MARK_FOLLOWING>
-
-  <IMPORT DELEGATE="PRIMARY"/>
-  </RULES>
-
-  <RULES SET="PRIMARY">
-    <!-- Silly comment -->
-    <SEQ TYPE="COMMENT1">/**/</SEQ>
-
-    <EOL_SPAN TYPE="COMMENT2">//</EOL_SPAN>
-
-    <!-- Scaladoc comment -->
-    <SPAN TYPE="COMMENT3" DELEGATE="SCALADOC">
-      <BEGIN>/**</BEGIN>
-      <END>*/</END>
-    </SPAN>
-
-    <!-- Scala comment (Java style) -->
-    <SPAN TYPE="COMMENT1" DELEGATE="COMMENT_BLOCK">
-      <BEGIN>/*</BEGIN>
-      <END>*/</END>
-    </SPAN>
-
-    <SPAN MATCH_TYPE="NULL" DELEGATE="MAIN">
-      <BEGIN>{</BEGIN>
-      <END>}</END>
-    </SPAN>
-
-    <!-- XML literals; keep this in sync with the XML_LITERAL rule set! -->
-    <IMPORT DELEGATE="XML_SHARED"/>
-
-    <!-- interpolated stuff -->
-    <SPAN_REGEXP DELEGATE="STRING" MATCH_TYPE="LITERAL1" NO_LINE_BREAK="FALSE" ESCAPE="">
-      <BEGIN>[0-9a-zA-Z&gt;&lt;=+]([0-9a-zA-Z&gt;&lt;=+]|_[0-9a-zA-Z&gt;&lt;=+])*"""</BEGIN>
-      <END>"""</END>
-    </SPAN_REGEXP>
-    <SPAN_REGEXP DELEGATE="STRING" MATCH_TYPE="LITERAL1" NO_LINE_BREAK="FALSE" ESCAPE="\">
-      <BEGIN>[0-9a-zA-Z&gt;&lt;=+]([0-9a-zA-Z&gt;&lt;=+]|_[0-9a-zA-Z&gt;&lt;=+])*"</BEGIN>
-      <END>"</END>
-    </SPAN_REGEXP>
-
-    <!-- string and character literals -->
-    <SPAN TYPE="LITERAL1" NO_LINE_BREAK="FALSE" ESCAPE="">
-      <BEGIN>"""</BEGIN>
-      <END>"""</END>
-    </SPAN>
-    <SPAN TYPE="LITERAL1" NO_LINE_BREAK="TRUE" ESCAPE="\">
-      <BEGIN>"</BEGIN>
-      <END>"</END>
-    </SPAN>
-  <SEQ_REGEXP HASH_CHAR="'" TYPE="LITERAL1">'([^'\\]|\\.)'</SEQ_REGEXP>
-
-    <!-- symbol literals -->
-    <SEQ_REGEXP HASH_CHAR="'" TYPE="LABEL">'[0-9a-zA-Z&gt;&lt;=+]([0-9a-zA-Z&gt;&lt;=+]|_[0-9a-zA-Z&gt;&lt;=+])*</SEQ_REGEXP>
-
-    <SPAN MATCH_TYPE="LITERAL3" DELEGATE="TYPE_PARAMS">
-    <BEGIN>[</BEGIN>
-    <END>]</END>
-  </SPAN>
-
-  <SPAN MATCH_TYPE="NULL">
-    <BEGIN>`</BEGIN>
-    <END>`</END>
-  </SPAN>
-
-    <SEQ TYPE="OPERATOR">(</SEQ>
-    <SEQ TYPE="OPERATOR">)</SEQ>
-    <SEQ TYPE="OPERATOR">}</SEQ>
-    <SEQ TYPE="OPERATOR">{</SEQ>
-    <SEQ TYPE="NULL">.</SEQ>
-    <SEQ TYPE="NULL">,</SEQ>
-    <SEQ TYPE="NULL">;</SEQ>
-    <SEQ TYPE="NULL">:</SEQ>
-
-    <!-- Function calls -->
-    <!-- <MARK_PREVIOUS TYPE="FUNCTION" MATCH_TYPE="OPERATOR">(</MARK_PREVIOUS> -->
-
-    <EOL_SPAN MATCH_TYPE="KEYWORD1" DELEGATE="TYPE">import </EOL_SPAN>
-
-  <!-- Function declarations (overloaded for different spacing styles)-->
-  <MARK_FOLLOWING TYPE="FUNCTION" MATCH_TYPE="KEYWORD1" AT_WORD_START="TRUE">def       </MARK_FOLLOWING>
-  <MARK_FOLLOWING TYPE="FUNCTION" MATCH_TYPE="KEYWORD1" AT_WORD_START="TRUE">def      </MARK_FOLLOWING>
-  <MARK_FOLLOWING TYPE="FUNCTION" MATCH_TYPE="KEYWORD1" AT_WORD_START="TRUE">def     </MARK_FOLLOWING>
-  <MARK_FOLLOWING TYPE="FUNCTION" MATCH_TYPE="KEYWORD1" AT_WORD_START="TRUE">def    </MARK_FOLLOWING>
-  <MARK_FOLLOWING TYPE="FUNCTION" MATCH_TYPE="KEYWORD1" AT_WORD_START="TRUE">def   </MARK_FOLLOWING>
-  <MARK_FOLLOWING TYPE="FUNCTION" MATCH_TYPE="KEYWORD1" AT_WORD_START="TRUE">def  </MARK_FOLLOWING>
-  <MARK_FOLLOWING TYPE="FUNCTION" MATCH_TYPE="KEYWORD1" AT_WORD_START="TRUE">def </MARK_FOLLOWING>
-
-  <!-- class declarations (overloaded for different spacing styles)-->
-  <MARK_FOLLOWING TYPE="KEYWORD3" MATCH_TYPE="KEYWORD1" AT_WORD_START="TRUE">class       </MARK_FOLLOWING>
-  <MARK_FOLLOWING TYPE="KEYWORD3" MATCH_TYPE="KEYWORD1" AT_WORD_START="TRUE">class      </MARK_FOLLOWING>
-  <MARK_FOLLOWING TYPE="KEYWORD3" MATCH_TYPE="KEYWORD1" AT_WORD_START="TRUE">class     </MARK_FOLLOWING>
-  <MARK_FOLLOWING TYPE="KEYWORD3" MATCH_TYPE="KEYWORD1" AT_WORD_START="TRUE">class    </MARK_FOLLOWING>
-  <MARK_FOLLOWING TYPE="KEYWORD3" MATCH_TYPE="KEYWORD1" AT_WORD_START="TRUE">class   </MARK_FOLLOWING>
-  <MARK_FOLLOWING TYPE="KEYWORD3" MATCH_TYPE="KEYWORD1" AT_WORD_START="TRUE">class  </MARK_FOLLOWING>
-  <MARK_FOLLOWING TYPE="KEYWORD3" MATCH_TYPE="KEYWORD1" AT_WORD_START="TRUE">class </MARK_FOLLOWING>
-
-  <MARK_FOLLOWING TYPE="KEYWORD3" MATCH_TYPE="KEYWORD1" AT_WORD_START="TRUE">case class       </MARK_FOLLOWING>
-  <MARK_FOLLOWING TYPE="KEYWORD3" MATCH_TYPE="KEYWORD1" AT_WORD_START="TRUE">case class      </MARK_FOLLOWING>
-  <MARK_FOLLOWING TYPE="KEYWORD3" MATCH_TYPE="KEYWORD1" AT_WORD_START="TRUE">case class     </MARK_FOLLOWING>
-  <MARK_FOLLOWING TYPE="KEYWORD3" MATCH_TYPE="KEYWORD1" AT_WORD_START="TRUE">case class    </MARK_FOLLOWING>
-  <MARK_FOLLOWING TYPE="KEYWORD3" MATCH_TYPE="KEYWORD1" AT_WORD_START="TRUE">case class   </MARK_FOLLOWING>
-  <MARK_FOLLOWING TYPE="KEYWORD3" MATCH_TYPE="KEYWORD1" AT_WORD_START="TRUE">case class  </MARK_FOLLOWING>
-  <MARK_FOLLOWING TYPE="KEYWORD3" MATCH_TYPE="KEYWORD1" AT_WORD_START="TRUE">case class </MARK_FOLLOWING>
-
-  <!-- instantiations (overloaded for different spacing styles)-->
-  <MARK_FOLLOWING TYPE="KEYWORD3" MATCH_TYPE="KEYWORD1" AT_WORD_START="TRUE">new       </MARK_FOLLOWING>
-  <MARK_FOLLOWING TYPE="KEYWORD3" MATCH_TYPE="KEYWORD1" AT_WORD_START="TRUE">new      </MARK_FOLLOWING>
-  <MARK_FOLLOWING TYPE="KEYWORD3" MATCH_TYPE="KEYWORD1" AT_WORD_START="TRUE">new     </MARK_FOLLOWING>
-  <MARK_FOLLOWING TYPE="KEYWORD3" MATCH_TYPE="KEYWORD1" AT_WORD_START="TRUE">new    </MARK_FOLLOWING>
-  <MARK_FOLLOWING TYPE="KEYWORD3" MATCH_TYPE="KEYWORD1" AT_WORD_START="TRUE">new   </MARK_FOLLOWING>
-  <MARK_FOLLOWING TYPE="KEYWORD3" MATCH_TYPE="KEYWORD1" AT_WORD_START="TRUE">new  </MARK_FOLLOWING>
-  <MARK_FOLLOWING TYPE="KEYWORD3" MATCH_TYPE="KEYWORD1" AT_WORD_START="TRUE">new </MARK_FOLLOWING>
-
-  <!-- object declarations (overloaded for different spacing styles)-->
-  <MARK_FOLLOWING TYPE="KEYWORD3" MATCH_TYPE="KEYWORD1" AT_WORD_START="TRUE">object       </MARK_FOLLOWING>
-  <MARK_FOLLOWING TYPE="KEYWORD3" MATCH_TYPE="KEYWORD1" AT_WORD_START="TRUE">object      </MARK_FOLLOWING>
-  <MARK_FOLLOWING TYPE="KEYWORD3" MATCH_TYPE="KEYWORD1" AT_WORD_START="TRUE">object     </MARK_FOLLOWING>
-  <MARK_FOLLOWING TYPE="KEYWORD3" MATCH_TYPE="KEYWORD1" AT_WORD_START="TRUE">object    </MARK_FOLLOWING>
-  <MARK_FOLLOWING TYPE="KEYWORD3" MATCH_TYPE="KEYWORD1" AT_WORD_START="TRUE">object   </MARK_FOLLOWING>
-  <MARK_FOLLOWING TYPE="KEYWORD3" MATCH_TYPE="KEYWORD1" AT_WORD_START="TRUE">object  </MARK_FOLLOWING>
-  <MARK_FOLLOWING TYPE="KEYWORD3" MATCH_TYPE="KEYWORD1" AT_WORD_START="TRUE">object </MARK_FOLLOWING>
-
-  <MARK_FOLLOWING TYPE="KEYWORD3" MATCH_TYPE="KEYWORD1" AT_WORD_START="TRUE">case object       </MARK_FOLLOWING>
-  <MARK_FOLLOWING TYPE="KEYWORD3" MATCH_TYPE="KEYWORD1" AT_WORD_START="TRUE">case object      </MARK_FOLLOWING>
-  <MARK_FOLLOWING TYPE="KEYWORD3" MATCH_TYPE="KEYWORD1" AT_WORD_START="TRUE">case object     </MARK_FOLLOWING>
-  <MARK_FOLLOWING TYPE="KEYWORD3" MATCH_TYPE="KEYWORD1" AT_WORD_START="TRUE">case object    </MARK_FOLLOWING>
-  <MARK_FOLLOWING TYPE="KEYWORD3" MATCH_TYPE="KEYWORD1" AT_WORD_START="TRUE">case object   </MARK_FOLLOWING>
-  <MARK_FOLLOWING TYPE="KEYWORD3" MATCH_TYPE="KEYWORD1" AT_WORD_START="TRUE">case object  </MARK_FOLLOWING>
-  <MARK_FOLLOWING TYPE="KEYWORD3" MATCH_TYPE="KEYWORD1" AT_WORD_START="TRUE">case object </MARK_FOLLOWING>
-
-  <!-- trait declarations (overloaded for different spacing styles)-->
-  <MARK_FOLLOWING TYPE="KEYWORD3" MATCH_TYPE="KEYWORD1" AT_WORD_START="TRUE">trait       </MARK_FOLLOWING>
-  <MARK_FOLLOWING TYPE="KEYWORD3" MATCH_TYPE="KEYWORD1" AT_WORD_START="TRUE">trait      </MARK_FOLLOWING>
-  <MARK_FOLLOWING TYPE="KEYWORD3" MATCH_TYPE="KEYWORD1" AT_WORD_START="TRUE">trait     </MARK_FOLLOWING>
-  <MARK_FOLLOWING TYPE="KEYWORD3" MATCH_TYPE="KEYWORD1" AT_WORD_START="TRUE">trait    </MARK_FOLLOWING>
-  <MARK_FOLLOWING TYPE="KEYWORD3" MATCH_TYPE="KEYWORD1" AT_WORD_START="TRUE">trait   </MARK_FOLLOWING>
-  <MARK_FOLLOWING TYPE="KEYWORD3" MATCH_TYPE="KEYWORD1" AT_WORD_START="TRUE">trait  </MARK_FOLLOWING>
-  <MARK_FOLLOWING TYPE="KEYWORD3" MATCH_TYPE="KEYWORD1" AT_WORD_START="TRUE">trait </MARK_FOLLOWING>
-
-  <!-- extends (overloaded for different spacing styles)-->
-  <MARK_FOLLOWING TYPE="KEYWORD4" MATCH_TYPE="KEYWORD1" AT_WORD_START="TRUE">extends       </MARK_FOLLOWING>
-  <MARK_FOLLOWING TYPE="KEYWORD4" MATCH_TYPE="KEYWORD1" AT_WORD_START="TRUE">extends      </MARK_FOLLOWING>
-  <MARK_FOLLOWING TYPE="KEYWORD4" MATCH_TYPE="KEYWORD1" AT_WORD_START="TRUE">extends     </MARK_FOLLOWING>
-  <MARK_FOLLOWING TYPE="KEYWORD4" MATCH_TYPE="KEYWORD1" AT_WORD_START="TRUE">extends    </MARK_FOLLOWING>
-  <MARK_FOLLOWING TYPE="KEYWORD4" MATCH_TYPE="KEYWORD1" AT_WORD_START="TRUE">extends   </MARK_FOLLOWING>
-  <MARK_FOLLOWING TYPE="KEYWORD4" MATCH_TYPE="KEYWORD1" AT_WORD_START="TRUE">extends  </MARK_FOLLOWING>
-  <MARK_FOLLOWING TYPE="KEYWORD4" MATCH_TYPE="KEYWORD1" AT_WORD_START="TRUE">extends </MARK_FOLLOWING>
-
-  <!-- with (overloaded for different spacing styles)-->
-  <MARK_FOLLOWING TYPE="KEYWORD4" MATCH_TYPE="KEYWORD1" AT_WORD_START="TRUE">with       </MARK_FOLLOWING>
-  <MARK_FOLLOWING TYPE="KEYWORD4" MATCH_TYPE="KEYWORD1" AT_WORD_START="TRUE">with      </MARK_FOLLOWING>
-  <MARK_FOLLOWING TYPE="KEYWORD4" MATCH_TYPE="KEYWORD1" AT_WORD_START="TRUE">with     </MARK_FOLLOWING>
-  <MARK_FOLLOWING TYPE="KEYWORD4" MATCH_TYPE="KEYWORD1" AT_WORD_START="TRUE">with    </MARK_FOLLOWING>
-  <MARK_FOLLOWING TYPE="KEYWORD4" MATCH_TYPE="KEYWORD1" AT_WORD_START="TRUE">with   </MARK_FOLLOWING>
-  <MARK_FOLLOWING TYPE="KEYWORD4" MATCH_TYPE="KEYWORD1" AT_WORD_START="TRUE">with  </MARK_FOLLOWING>
-  <MARK_FOLLOWING TYPE="KEYWORD4" MATCH_TYPE="KEYWORD1" AT_WORD_START="TRUE">with </MARK_FOLLOWING>
-
-  <SPAN DELEGATE="PATTERN" MATCH_TYPE="KEYWORD1" AT_WORD_START="TRUE" NO_LINE_BREAK="FALSE">
-    <BEGIN>case </BEGIN>
-    <END>=&gt;</END>
-  </SPAN>
-
-  <SPAN DELEGATE="PATTERN" MATCH_TYPE="KEYWORD1" AT_WORD_START="TRUE" NO_LINE_BREAK="TRUE">
-    <BEGIN>val </BEGIN>
-    <END>=</END>
-  </SPAN>
-
-    <KEYWORDS>
-      <KEYWORD1>abstract</KEYWORD1>
-      <KEYWORD1>case</KEYWORD1>
-      <KEYWORD1>catch</KEYWORD1>
-      <KEYWORD1>class</KEYWORD1>
-      <KEYWORD1>def</KEYWORD1>
-      <KEYWORD1>do</KEYWORD1>
-      <KEYWORD1>else</KEYWORD1>
-      <KEYWORD1>extends</KEYWORD1>
-      <KEYWORD1>final</KEYWORD1>
-      <KEYWORD1>finally</KEYWORD1>
-      <KEYWORD1>for</KEYWORD1>
-      <KEYWORD1>forSome</KEYWORD1>
-      <KEYWORD1>if</KEYWORD1>
-      <KEYWORD1>implicit</KEYWORD1>
-      <KEYWORD1>import</KEYWORD1>
-      <KEYWORD1>lazy</KEYWORD1>
-      <KEYWORD1>macro</KEYWORD1>
-      <KEYWORD1>match</KEYWORD1>
-      <KEYWORD1>new</KEYWORD1>
-      <KEYWORD1>object</KEYWORD1>
-      <KEYWORD1>override</KEYWORD1>
-      <KEYWORD1>package</KEYWORD1>
-      <KEYWORD1>private</KEYWORD1>
-      <KEYWORD1>protected</KEYWORD1>
-      <KEYWORD1>requires</KEYWORD1>
-      <KEYWORD1>return</KEYWORD1>
-      <KEYWORD1>sealed</KEYWORD1>
-      <KEYWORD1>throw</KEYWORD1>
-      <KEYWORD1>trait</KEYWORD1>
-      <KEYWORD1>try</KEYWORD1>
-      <KEYWORD1>type</KEYWORD1>
-      <KEYWORD1>val</KEYWORD1>
-      <KEYWORD1>var</KEYWORD1>
-      <KEYWORD1>with</KEYWORD1>
-      <KEYWORD1>while</KEYWORD1>
-      <KEYWORD1>yield</KEYWORD1>
-      <KEYWORD1>=&gt;</KEYWORD1>
-
-      <!-- java.lang.* wrapper types -->
-      <KEYWORD2>Character</KEYWORD2>
-      <KEYWORD2>Integer</KEYWORD2>
-
-      <!-- scala.* primitive types -->
-      <KEYWORD2>Boolean</KEYWORD2>
-      <KEYWORD2>Byte</KEYWORD2>
-      <KEYWORD2>Char</KEYWORD2>
-      <KEYWORD2>Double</KEYWORD2>
-      <KEYWORD2>Float</KEYWORD2>
-      <KEYWORD2>Int</KEYWORD2>
-      <KEYWORD2>Long</KEYWORD2>
-      <KEYWORD2>Short</KEYWORD2>
-      <KEYWORD2>Unit</KEYWORD2>
-
-      <!-- scala.* predefined types -->
-      <KEYWORD3>Any</KEYWORD3>
-      <KEYWORD3>AnyRef</KEYWORD3>
-      <KEYWORD3>Nothing</KEYWORD3>
-
-    <LITERAL2>false</LITERAL2>
-    <LITERAL2>null</LITERAL2>
-    <LITERAL2>super</LITERAL2>
-    <LITERAL2>this</LITERAL2>
-    <LITERAL2>true</LITERAL2>
-
-    <INVALID>???</INVALID>
-
-    <!-- reserved -->
-    <INVALID>then</INVALID>
-    </KEYWORDS>
-  </RULES>
-
-  <RULES SET="TYPE_PARAMS" DEFAULT="LITERAL3">
-    <SPAN MATCH_TYPE="LITERAL3" DELEGATE="TYPE_PARAMS">
-    <BEGIN>[</BEGIN>
-    <END>]</END>
-  </SPAN>
-  </RULES>
-
-  <RULES SET="PATTERN" DEFAULT="NULL" IGNORE_CASE="FALSE"
-    DIGIT_RE="(0[lL]?|[1-9]\d{0,9}(\d{0,9}[lL])?|0[xX]\p{XDigit}{1,8}(\p{XDigit}{0,8}[lL])?|0[0-7]{1,11}([0-7]{0,11}[lL])?|([0-9]+\.[0-9]*|\.[0-9]+)([eE][+-]?[0-9]+)?[fFdD]?|[0-9]+([eE][+-]?[0-9]+[fFdD]?|([eE][+-]?[0-9]+)?[fFdD]))">
-
-    <IMPORT DELEGATE="PRIMARY"/>
-
-  <SEQ TYPE="OPERATOR">@</SEQ>
-
-  <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD4">[A-Z][^(\s:@)\[\]]*</SEQ_REGEXP>
-  </RULES>
-
-  <RULES SET="COMMENT_BLOCK" DEFAULT="COMMENT1">
-    <SPAN TYPE="COMMENT1" DELEGATE="COMMENT_BLOCK">
-      <BEGIN>/*</BEGIN>
-      <END>*/</END>
-    </SPAN>
-  </RULES>
-
-  <RULES SET="SCALADOC" DEFAULT="COMMENT3" IGNORE_CASE="TRUE">
-    <!-- so that @link{...} is highlighted -->
-    <SEQ TYPE="COMMENT3">{</SEQ>
-
-    <!-- so that *@param is highlighted -->
-    <SEQ TYPE="COMMENT3">*</SEQ>
-
-    <!-- Javadoc ignores tags inside <pre> -->
-    <SPAN TYPE="MARKUP" DELEGATE="SCALADOC_PRE">
-      <BEGIN>&lt;pre&gt;</BEGIN>
-      <END>&lt;/pre&gt;</END>
-    </SPAN>
-
-    <!-- HTML comments -->
-    <SPAN TYPE="COMMENT1">
-      <BEGIN>&lt;!--</BEGIN>
-      <END>--&gt;</END>
-    </SPAN>
-
-    <!-- HTML tags -->
-    <SPAN_REGEXP HASH_CHAR="&lt;" TYPE="MARKUP" DELEGATE="xml::TAGS" NO_LINE_BREAK="TRUE">
-      <BEGIN>&lt;/?[\da-zA-Z\-]+</BEGIN>
-      <END>&gt;</END>
-    </SPAN_REGEXP>
-
-    <!-- Javadoc allows this -->
-    <SEQ TYPE="COMMENT3">&lt;</SEQ>
-
-    <KEYWORDS>
-      <LABEL>@author</LABEL>
-      <LABEL>@beaninfo</LABEL>
-      <LABEL>@history</LABEL>
-      <LABEL>@bug</LABEL>
-      <LABEL>@review</LABEL>
-      <LABEL>@todo</LABEL>
-      <LABEL>@idea</LABEL>
-      <LABEL>@pre</LABEL>
-      <LABEL>@requires</LABEL>
-      <LABEL>@post</LABEL>
-      <LABEL>@ensures</LABEL>
-      <LABEL>@generates</LABEL>
-      <LABEL>@modifies</LABEL>
-      <LABEL>@invariant</LABEL>
-      <LABEL>@exception</LABEL>
-      <LABEL>@hides</LABEL>
-      <LABEL>@overrides</LABEL>
-      <LABEL>@equivalent</LABEL>
-      <LABEL>@bon</LABEL>
-      <LABEL>@access</LABEL>
-      <LABEL>@example</LABEL>
-      <LABEL>@design</LABEL>
-      <LABEL>@serial</LABEL>
-      <LABEL>@references</LABEL>
-      <LABEL>@uses</LABEL>
-      <LABEL>@guard</LABEL>
-      <LABEL>@values</LABEL>
-      <LABEL>@complexity</LABEL>
-      <LABEL>@deprecated</LABEL>
-      <LABEL>@docRoot</LABEL>
-      <LABEL>@exception</LABEL>
-      <LABEL>@link</LABEL>
-      <LABEL>@param</LABEL>
-      <LABEL>@return</LABEL>
-      <LABEL>@see</LABEL>
-      <LABEL>@serialData</LABEL>
-      <LABEL>@serialField</LABEL>
-      <LABEL>@since</LABEL>
-      <LABEL>@throws</LABEL>
-      <LABEL>@version</LABEL>
-      <LABEL>@spec</LABEL>
-    </KEYWORDS>
-  </RULES>
-
-  <RULES SET="SCALADOC_PRE" DEFAULT="COMMENT3" />
-
-  <RULES SET="XML_SHARED">
-    <SPAN TYPE="COMMENT2">
-      <BEGIN>&lt;!--</BEGIN>
-      <END>--&gt;</END>
-    </SPAN>
-
-    <SPAN_REGEXP TYPE="LITERAL3" HASH_CHARS="&lt;">
-      <BEGIN>&lt;\?[^\s]</BEGIN>
-      <END>?&gt;</END>
-    </SPAN_REGEXP>
-
-    <SPAN MATCH_TYPE="LITERAL3" TYPE="COMMENT4">
-      <BEGIN>&lt;![CDATA[</BEGIN>
-      <END>]]&gt;</END>
-    </SPAN>
-
-    <SEQ_REGEXP HASH_CHAR="&lt;" TYPE="LITERAL3">&lt;([\d\w_\-:.]+)(\s+[\d\w_\-:.]+=('[^']*'|"[^"]*"))*\s*/\s*&gt;</SEQ_REGEXP>
-
-    <SPAN_REGEXP DELEGATE="XML_LITERAL" HASH_CHAR="&lt;" MATCH_TYPE="LITERAL3" TYPE="NULL">
-      <BEGIN>&lt;([\d\w_\-:.]+)(\s+[\d\w_\-:.]+=('[^']*'|"[^"]*"))*\s*&gt;</BEGIN>
-      <END>&lt;/$1&gt;</END>
-    </SPAN_REGEXP>
-  </RULES>
-
-  <!-- TODO find a way to highlight attribute names as LABEL, attribute values as LITERAL1 -->
-  <RULES SET="XML_LITERAL" DEFAULT="COMMENT4">
-    <PROPS>
-    <PROPERTY NAME="commentStart" VALUE="&lt;!--" />
-    <PROPERTY NAME="commentEnd" VALUE="--&gt;" />
-    <PROPERTY NAME="lineComment" VALUE="" />
-    </PROPS>
-
-    <IMPORT DELEGATE="XML_SHARED"/>
-
-    <SPAN DELEGATE="MAIN">
-      <BEGIN>{</BEGIN>
-      <END>}</END>
-    </SPAN>
-
-    <SPAN TYPE="LABEL" NO_WORD_BREAK="TRUE">
-      <BEGIN>&amp;</BEGIN>
-      <END>;</END>
-    </SPAN>
-
-    <SEQ_REGEXP HASH_CHAR="&lt;" TYPE="INVALID">&lt;/[\d\w_\-:.]+&gt;</SEQ_REGEXP>		<!-- unmatched closing tags -->
-  </RULES>
-
-  <RULES SET="STRING" DEFAULT="LITERAL1">
-    <SEQ TYPE="LITERAL1">$$</SEQ>
-
-    <SPAN DELEGATE="MAIN">
-      <BEGIN>${</BEGIN>
-      <END>}</END>
-    </SPAN>
-
-    <MARK_FOLLOWING TYPE="NULL" MATCH_TYPE="NULL">$</MARK_FOLLOWING>
-  </RULES>
-
-  <RULES SET="TYPE" DEFAULT="KEYWORD4">
-    <IMPORT DELEGATE="MAIN"/>
-  </RULES>
-</MODE>
-
diff --git a/qpython/src/main/assets/syntax/scheme.xml b/qpython/src/main/assets/syntax/scheme.xml
deleted file mode 100644
index 6e75ce90..00000000
--- a/qpython/src/main/assets/syntax/scheme.xml
+++ /dev/null
@@ -1,236 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE MODE SYSTEM "xmode.dtd"><MODE>
-	<PROPS>
-		<PROPERTY NAME="commentStart" VALUE="#|"/>
-		<PROPERTY NAME="commentEnd" VALUE="|#"/>
-		<PROPERTY NAME="lineComment" VALUE=";"/>
-		<PROPERTY NAME="noWordSep" VALUE="_-+?:*/!"/>
-		<PROPERTY NAME="unalignedOpenBrackets" VALUE="("/>
-		<PROPERTY NAME="unalignedCloseBrackets" VALUE=")"/>
-		<PROPERTY NAME="multipleBracketIndent" VALUE="true" />
-	</PROPS>
-	<RULES IGNORE_CASE="FALSE" HIGHLIGHT_DIGITS="TRUE" NO_WORD_SEP="_-+?:*/!">
-		<SPAN TYPE="COMMENT1">
-			<BEGIN>#|</BEGIN>
-			<END>|#</END>
-		</SPAN>
-		<SEQ TYPE="NULL">'(</SEQ>
-		<MARK_FOLLOWING TYPE="LITERAL1">'</MARK_FOLLOWING>
-		<MARK_FOLLOWING TYPE="LITERAL1">#\</MARK_FOLLOWING>
-		<MARK_FOLLOWING TYPE="LITERAL1">#b</MARK_FOLLOWING>
-		<MARK_FOLLOWING TYPE="LITERAL1">#d</MARK_FOLLOWING>
-		<MARK_FOLLOWING TYPE="LITERAL1">#o</MARK_FOLLOWING>
-		<MARK_FOLLOWING TYPE="LITERAL1">#x</MARK_FOLLOWING>
-		<EOL_SPAN TYPE="COMMENT1">;</EOL_SPAN>
-		<SPAN TYPE="LITERAL1">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-		<KEYWORDS>
-			<KEYWORD1>and</KEYWORD1>
-			<KEYWORD1>begin</KEYWORD1>
-			<KEYWORD1>case</KEYWORD1>
-			<KEYWORD1>cond</KEYWORD1>
-			<KEYWORD1>cond-expand</KEYWORD1>
-			<KEYWORD1>define</KEYWORD1>
-			<KEYWORD1>define-macro</KEYWORD1>
-			<KEYWORD1>delay</KEYWORD1>
-			<KEYWORD1>do</KEYWORD1>
-			<KEYWORD1>else</KEYWORD1>
-			<KEYWORD1>fluid-let</KEYWORD1>
-			<KEYWORD1>if</KEYWORD1>
-			<KEYWORD1>lambda</KEYWORD1>
-			<KEYWORD1>let</KEYWORD1>
-			<KEYWORD1>let*</KEYWORD1>
-			<KEYWORD1>letrec</KEYWORD1>
-			<KEYWORD1>or</KEYWORD1>
-			<KEYWORD1>quasiquote</KEYWORD1>
-			<KEYWORD1>quote</KEYWORD1>
-			<KEYWORD1>set!</KEYWORD1>
-			<KEYWORD2>abs</KEYWORD2>
-			<KEYWORD2>acos</KEYWORD2>
-			<KEYWORD2>angle</KEYWORD2>
-			<KEYWORD2>append</KEYWORD2>
-			<KEYWORD2>apply</KEYWORD2>
-			<KEYWORD2>asin</KEYWORD2>
-			<KEYWORD2>assoc</KEYWORD2>
-			<KEYWORD2>assq</KEYWORD2>
-			<KEYWORD2>assv</KEYWORD2>
-			<KEYWORD2>atan</KEYWORD2>
-			<KEYWORD2>car</KEYWORD2>
-			<KEYWORD2>cdr</KEYWORD2>
-			<KEYWORD2>caar</KEYWORD2>
-			<KEYWORD2>cadr</KEYWORD2>
-			<KEYWORD2>cdar</KEYWORD2>
-			<KEYWORD2>cddr</KEYWORD2>
-			<KEYWORD2>caaar</KEYWORD2>
-			<KEYWORD2>caadr</KEYWORD2>
-			<KEYWORD2>cadar</KEYWORD2>
-			<KEYWORD2>caddr</KEYWORD2>
-			<KEYWORD2>cdaar</KEYWORD2>
-			<KEYWORD2>cdadr</KEYWORD2>
-			<KEYWORD2>cddar</KEYWORD2>
-			<KEYWORD2>cdddr</KEYWORD2>
-			<KEYWORD2>call-with-current-continuation</KEYWORD2>
-			<KEYWORD2>call-with-input-file</KEYWORD2>
-			<KEYWORD2>call-with-output-file</KEYWORD2>
-			<KEYWORD2>call-with-values</KEYWORD2>
-			<KEYWORD2>call/cc</KEYWORD2>
-			<KEYWORD2>catch</KEYWORD2>
-			<KEYWORD2>ceiling</KEYWORD2>
-			<KEYWORD2>char-&gt;integer</KEYWORD2>
-			<KEYWORD2>char-downcase</KEYWORD2>
-			<KEYWORD2>char-upcase</KEYWORD2>
-			<KEYWORD2>close-input-port</KEYWORD2>
-			<KEYWORD2>close-output-port</KEYWORD2>
-			<KEYWORD2>cons</KEYWORD2>
-			<KEYWORD2>cos</KEYWORD2>
-			<KEYWORD2>current-input-port</KEYWORD2>
-			<KEYWORD2>current-output-port</KEYWORD2>
-			<KEYWORD2>delete-file</KEYWORD2>
-			<KEYWORD2>display</KEYWORD2>
-			<KEYWORD2>dynamic-wind</KEYWORD2>
-			<KEYWORD2>eval</KEYWORD2>
-			<KEYWORD2>exit</KEYWORD2>
-			<KEYWORD2>exact-&gt;inexact</KEYWORD2>
-			<KEYWORD2>exp</KEYWORD2>
-			<KEYWORD2>expt</KEYWORD2>
-			<KEYWORD2>file-or-directory-modify-seconds</KEYWORD2>
-			<KEYWORD2>floor</KEYWORD2>
-			<KEYWORD2>force</KEYWORD2>
-			<KEYWORD2>for-each</KEYWORD2>
-			<KEYWORD2>gcd</KEYWORD2>
-			<KEYWORD2>gensym</KEYWORD2>
-			<KEYWORD2>get-output-string</KEYWORD2>
-			<KEYWORD2>getenv</KEYWORD2>
-			<KEYWORD2>imag-part</KEYWORD2>
-			<KEYWORD2>integer-&gt;char</KEYWORD2>
-			<KEYWORD2>lcm</KEYWORD2>
-			<KEYWORD2>length</KEYWORD2>
-			<KEYWORD2>list</KEYWORD2>
-			<KEYWORD2>list-&gt;string</KEYWORD2>
-			<KEYWORD2>list-&gt;vector</KEYWORD2>
-			<KEYWORD2>list-ref</KEYWORD2>
-			<KEYWORD2>list-tail</KEYWORD2>
-			<KEYWORD2>load</KEYWORD2>
-			<KEYWORD2>log</KEYWORD2>
-			<KEYWORD2>magnitude</KEYWORD2>
-			<KEYWORD2>make-polar</KEYWORD2>
-			<KEYWORD2>make-rectangular</KEYWORD2>
-			<KEYWORD2>make-string</KEYWORD2>
-			<KEYWORD2>make-vector</KEYWORD2>
-			<KEYWORD2>map</KEYWORD2>
-			<KEYWORD2>max</KEYWORD2>
-			<KEYWORD2>member</KEYWORD2>
-			<KEYWORD2>memq</KEYWORD2>
-			<KEYWORD2>memv</KEYWORD2>
-			<KEYWORD2>min</KEYWORD2>
-			<KEYWORD2>modulo</KEYWORD2>
-			<KEYWORD2>newline</KEYWORD2>
-			<KEYWORD2>nil</KEYWORD2>
-			<KEYWORD2>not</KEYWORD2>
-			<KEYWORD2>number-&gt;string</KEYWORD2>
-			<KEYWORD2>open-input-file</KEYWORD2>
-			<KEYWORD2>open-input-string</KEYWORD2>
-			<KEYWORD2>open-output-file</KEYWORD2>
-			<KEYWORD2>open-output-string</KEYWORD2>
-			<KEYWORD2>peek-char</KEYWORD2>
-			<KEYWORD2>quotient</KEYWORD2>
-			<KEYWORD2>read</KEYWORD2>
-			<KEYWORD2>read-char</KEYWORD2>
-			<KEYWORD2>read-line</KEYWORD2>
-			<KEYWORD2>real-part</KEYWORD2>
-			<KEYWORD2>remainder</KEYWORD2>
-			<KEYWORD2>reverse</KEYWORD2>
-			<KEYWORD2>reverse!</KEYWORD2>
-			<KEYWORD2>round</KEYWORD2>
-			<KEYWORD2>set-car!</KEYWORD2>
-			<KEYWORD2>set-cdr!</KEYWORD2>
-			<KEYWORD2>sin</KEYWORD2>
-			<KEYWORD2>sqrt</KEYWORD2>
-			<KEYWORD2>string</KEYWORD2>
-			<KEYWORD2>string-&gt;list</KEYWORD2>
-			<KEYWORD2>string-&gt;number</KEYWORD2>
-			<KEYWORD2>string-&gt;symbol</KEYWORD2>
-			<KEYWORD2>string-append</KEYWORD2>
-			<KEYWORD2>string-copy</KEYWORD2>
-			<KEYWORD2>string-fill!</KEYWORD2>
-			<KEYWORD2>string-length</KEYWORD2>
-			<KEYWORD2>string-ref</KEYWORD2>
-			<KEYWORD2>string-set!</KEYWORD2>
-			<KEYWORD2>substring</KEYWORD2>
-			<KEYWORD2>symbol-&gt;string</KEYWORD2>
-			<KEYWORD2>system</KEYWORD2>
-			<KEYWORD2>tan</KEYWORD2>
-			<KEYWORD2>truncate</KEYWORD2>
-			<KEYWORD2>values</KEYWORD2>
-			<KEYWORD2>vector</KEYWORD2>
-			<KEYWORD2>vector-&gt;list</KEYWORD2>
-			<KEYWORD2>vector-fill!</KEYWORD2>
-			<KEYWORD2>vector-length</KEYWORD2>
-			<KEYWORD2>vector-ref</KEYWORD2>
-			<KEYWORD2>vector-set!</KEYWORD2>
-			<KEYWORD2>with-input-from-file</KEYWORD2>
-			<KEYWORD2>with-output-to-file</KEYWORD2>
-			<KEYWORD2>write</KEYWORD2>
-			<KEYWORD2>write-char</KEYWORD2>
-			<KEYWORD3>boolean?</KEYWORD3>
-			<KEYWORD3>char-alphabetic?</KEYWORD3>
-			<KEYWORD3>char-ci&lt;=?</KEYWORD3>
-			<KEYWORD3>char-ci&lt;?</KEYWORD3>
-			<KEYWORD3>char-ci=?</KEYWORD3>
-			<KEYWORD3>char-ci&gt;=?</KEYWORD3>
-			<KEYWORD3>char-ci&gt;?</KEYWORD3>
-			<KEYWORD3>char-lower-case?</KEYWORD3>
-			<KEYWORD3>char-numeric?</KEYWORD3>
-			<KEYWORD3>char-ready?</KEYWORD3>
-			<KEYWORD3>char-upper-case?</KEYWORD3>
-			<KEYWORD3>char-whitespace?</KEYWORD3>
-			<KEYWORD3>char&lt;=?</KEYWORD3>
-			<KEYWORD3>char&lt;?</KEYWORD3>
-			<KEYWORD3>char=?</KEYWORD3>
-			<KEYWORD3>char&gt;=?</KEYWORD3>
-			<KEYWORD3>char&gt;?</KEYWORD3>
-			<KEYWORD3>char?</KEYWORD3>
-			<KEYWORD3>complex?</KEYWORD3>
-			<KEYWORD3>eof-object?</KEYWORD3>
-			<KEYWORD3>eq?</KEYWORD3>
-			<KEYWORD3>equal?</KEYWORD3>
-			<KEYWORD3>eqv?</KEYWORD3>
-			<KEYWORD3>even?</KEYWORD3>
-			<KEYWORD3>exact?</KEYWORD3>
-			<KEYWORD3>file-exists?</KEYWORD3>
-			<KEYWORD3>inexact?</KEYWORD3>
-			<KEYWORD3>input-port?</KEYWORD3>
-			<KEYWORD3>integer?</KEYWORD3>
-			<KEYWORD3>list?</KEYWORD3>
-			<KEYWORD3>negative?</KEYWORD3>
-			<KEYWORD3>null?</KEYWORD3>
-			<KEYWORD3>number?</KEYWORD3>
-			<KEYWORD3>odd?</KEYWORD3>
-			<KEYWORD3>output-port?</KEYWORD3>
-			<KEYWORD3>pair?</KEYWORD3>
-			<KEYWORD3>port?</KEYWORD3>
-			<KEYWORD3>positive?</KEYWORD3>
-			<KEYWORD3>procedure?</KEYWORD3>
-			<KEYWORD3>rational?</KEYWORD3>
-			<KEYWORD3>real?</KEYWORD3>
-			<KEYWORD3>string-ci&lt;=?</KEYWORD3>
-			<KEYWORD3>string-ci&lt;?</KEYWORD3>
-			<KEYWORD3>string-ci=?</KEYWORD3>
-			<KEYWORD3>string-ci&gt;=?</KEYWORD3>
-			<KEYWORD3>string-ci&gt;?</KEYWORD3>
-			<KEYWORD3>string&lt;=?</KEYWORD3>
-			<KEYWORD3>string&lt;?</KEYWORD3>
-			<KEYWORD3>string=?</KEYWORD3>
-			<KEYWORD3>string&gt;=?</KEYWORD3>
-			<KEYWORD3>string&gt;?</KEYWORD3>
-			<KEYWORD3>string?</KEYWORD3>
-			<KEYWORD3>symbol?</KEYWORD3>
-			<KEYWORD3>vector?</KEYWORD3>
-			<KEYWORD3>zero?</KEYWORD3>
-			<LITERAL2>#t</LITERAL2>
-			<LITERAL2>#f</LITERAL2>
-		</KEYWORDS>
-	</RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/sdl_pr.xml b/qpython/src/main/assets/syntax/sdl_pr.xml
deleted file mode 100644
index 9340db5e..00000000
--- a/qpython/src/main/assets/syntax/sdl_pr.xml
+++ /dev/null
@@ -1,228 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!--
-  sdl_pr.xml	K. J. Turner <kjt@cs.stir.ac.uk>	26th February 2004
-
-  SDL (Specification and Description Language) is an ITU standard (Z.100)
-  for a formal specification language used in communications and system specification generally.
-
-  This mode handles SDL/PR (Phrase Representation), but does not (yet) deal with SDL 2000.
-
-  Auto-indentation occurs if the following are at the start of a line (ignoring
-  leading white space): "block", "channel", "connection", "decision", "generator", "input", "macro", "newtype", "operator", "package", "procedure", "process", "refinement", "service", "start", "state", "substructure", "syntype", "system".
-
-  This also happens if the following appear on their own (i.e. also ignoring
-  trailing white space): "signal".
--->
-
-<MODE>
-  <PROPS>
-    <PROPERTY NAME="commentStart" VALUE="/*"/>
-    <PROPERTY NAME="commentEnd" VALUE="*/"/>
-    <PROPERTY NAME="indentNextLines"
-      VALUE="\s*(block|channel|connection|decision|generator|input|macro|newtype|operator|package|procedure|process|refinement|service|start|state|substructure|syntype|system).*|\s*(signal)\s*"/>
-  </PROPS>
-
-  <RULES IGNORE_CASE="TRUE" HIGHLIGHT_DIGITS="TRUE">
-    <!-- SDT/TAU Comments -->
-    <SPAN TYPE="COMMENT2">
-      <BEGIN>/*#SDTREF</BEGIN>
-      <END>*/</END>
-    </SPAN>
-
-    <!-- Standard Comments -->
-    <SPAN TYPE="COMMENT1">
-      <BEGIN>/*</BEGIN>
-      <END>*/</END>
-    </SPAN>
-
-    <!-- String Literals -->
-    <SPAN TYPE="LITERAL2" NO_LINE_BREAK="TRUE">
-      <BEGIN>'</BEGIN>
-      <END>'</END>
-    </SPAN>
-
-    <SPAN TYPE="LITERAL2" NO_LINE_BREAK="TRUE">
-      <BEGIN>"</BEGIN>
-      <END>"</END>
-    </SPAN>
-
-    <!-- Standard Operators -->
-    <SEQ TYPE="OPERATOR">+</SEQ>
-    <SEQ TYPE="OPERATOR">-</SEQ>
-    <SEQ TYPE="OPERATOR">*</SEQ>
-    <SEQ TYPE="OPERATOR">/</SEQ>
-    <SEQ TYPE="OPERATOR">==</SEQ>
-    <SEQ TYPE="OPERATOR">/=</SEQ>
-    <SEQ TYPE="OPERATOR">:=</SEQ>
-    <SEQ TYPE="OPERATOR">=</SEQ>
-    <SEQ TYPE="OPERATOR">&lt;</SEQ>
-    <SEQ TYPE="OPERATOR">&lt;=</SEQ>
-    <SEQ TYPE="OPERATOR">&gt;</SEQ>
-    <SEQ TYPE="OPERATOR">&gt;=</SEQ>
-    <SEQ TYPE="OPERATOR">.</SEQ>
-    <SEQ TYPE="OPERATOR">!</SEQ>
-    <SEQ TYPE="OPERATOR">//</SEQ>
-
-    <SEQ TYPE="OPERATOR" AT_WORD_START="TRUE">and</SEQ>
-    <SEQ TYPE="OPERATOR" AT_WORD_START="TRUE">mod</SEQ>
-    <SEQ TYPE="OPERATOR" AT_WORD_START="TRUE">not</SEQ>
-    <SEQ TYPE="OPERATOR" AT_WORD_START="TRUE">or</SEQ>
-    <SEQ TYPE="OPERATOR" AT_WORD_START="TRUE">rem</SEQ>
-    <SEQ TYPE="OPERATOR" AT_WORD_START="TRUE">xor</SEQ>
-
-    <KEYWORDS>
-      <!-- Reserved Words -->
-      <KEYWORD1>active</KEYWORD1>
-      <KEYWORD1>adding</KEYWORD1>
-      <KEYWORD1>all</KEYWORD1>
-      <KEYWORD1>alternative</KEYWORD1>
-      <KEYWORD1>any</KEYWORD1>
-      <KEYWORD1>as</KEYWORD1>
-      <KEYWORD1>atleast</KEYWORD1>
-      <KEYWORD1>axioms</KEYWORD1>
-      <KEYWORD1>block</KEYWORD1>
-      <KEYWORD1>call</KEYWORD1>
-      <KEYWORD1>channel</KEYWORD1>
-      <KEYWORD1>comment</KEYWORD1>
-      <KEYWORD1>connect</KEYWORD1>
-      <KEYWORD1>connection</KEYWORD1>
-      <KEYWORD1>constant</KEYWORD1>
-      <KEYWORD1>constants</KEYWORD1>
-      <KEYWORD1>create</KEYWORD1>
-      <KEYWORD1>dcl</KEYWORD1>
-      <KEYWORD1>decision</KEYWORD1>
-      <KEYWORD1>default</KEYWORD1>
-      <KEYWORD1>else</KEYWORD1>
-      <KEYWORD1>end</KEYWORD1>
-      <KEYWORD1>endalternative</KEYWORD1>
-      <KEYWORD1>endblock</KEYWORD1>
-      <KEYWORD1>endchannel</KEYWORD1>
-      <KEYWORD1>endconnection</KEYWORD1>
-      <KEYWORD1>enddecision</KEYWORD1>
-      <KEYWORD1>endgenerator</KEYWORD1>
-      <KEYWORD1>endmacro</KEYWORD1>
-      <KEYWORD1>endnewtype</KEYWORD1>
-      <KEYWORD1>endoperator</KEYWORD1>
-      <KEYWORD1>endpackage</KEYWORD1>
-      <KEYWORD1>endprocedure</KEYWORD1>
-      <KEYWORD1>endprocess</KEYWORD1>
-      <KEYWORD1>endrefinement</KEYWORD1>
-      <KEYWORD1>endselect</KEYWORD1>
-      <KEYWORD1>endservice</KEYWORD1>
-      <KEYWORD1>endstate</KEYWORD1>
-      <KEYWORD1>endsubstructure</KEYWORD1>
-      <KEYWORD1>endsyntype</KEYWORD1>
-      <KEYWORD1>endsystem</KEYWORD1>
-      <KEYWORD1>env</KEYWORD1>
-      <KEYWORD1>error</KEYWORD1>
-      <KEYWORD1>export</KEYWORD1>
-      <KEYWORD1>exported</KEYWORD1>
-      <KEYWORD1>external</KEYWORD1>
-      <KEYWORD1>fi</KEYWORD1>
-      <KEYWORD1>finalized</KEYWORD1>
-      <KEYWORD1>for</KEYWORD1>
-      <KEYWORD1>fpar</KEYWORD1>
-      <KEYWORD1>from</KEYWORD1>
-      <KEYWORD1>gate</KEYWORD1>
-      <KEYWORD1>generator</KEYWORD1>
-      <KEYWORD1>if</KEYWORD1>
-      <KEYWORD1>import</KEYWORD1>
-      <KEYWORD1>imported</KEYWORD1>
-      <KEYWORD1>in</KEYWORD1>
-      <KEYWORD1>inherits</KEYWORD1>
-      <KEYWORD1>input</KEYWORD1>
-      <KEYWORD1>interface</KEYWORD1>
-      <KEYWORD1>join</KEYWORD1>
-      <KEYWORD1>literal</KEYWORD1>
-      <KEYWORD1>literals</KEYWORD1>
-      <KEYWORD1>macro</KEYWORD1>
-      <KEYWORD1>macrodefinition</KEYWORD1>
-      <KEYWORD1>macroid</KEYWORD1>
-      <KEYWORD1>map</KEYWORD1>
-      <KEYWORD1>nameclass</KEYWORD1>
-      <KEYWORD1>newtype</KEYWORD1>
-      <KEYWORD1>nextstate</KEYWORD1>
-      <KEYWORD1>nodelay</KEYWORD1>
-      <KEYWORD1>noequality</KEYWORD1>
-      <KEYWORD1>none</KEYWORD1>
-      <KEYWORD1>now</KEYWORD1>
-      <KEYWORD1>offspring</KEYWORD1>
-      <KEYWORD1>operator</KEYWORD1>
-      <KEYWORD1>operators</KEYWORD1>
-      <KEYWORD1>ordering</KEYWORD1>
-      <KEYWORD1>out</KEYWORD1>
-      <KEYWORD1>output</KEYWORD1>
-      <KEYWORD1>package</KEYWORD1>
-      <KEYWORD1>parent</KEYWORD1>
-      <KEYWORD1>priority</KEYWORD1>
-      <KEYWORD1>procedure</KEYWORD1>
-      <KEYWORD1>process</KEYWORD1>
-      <KEYWORD1>provided</KEYWORD1>
-      <KEYWORD1>redefined</KEYWORD1>
-      <KEYWORD1>referenced</KEYWORD1>
-      <KEYWORD1>refinement</KEYWORD1>
-      <KEYWORD1>remote</KEYWORD1>
-      <KEYWORD1>reset</KEYWORD1>
-      <KEYWORD1>return</KEYWORD1>
-      <KEYWORD1>returns</KEYWORD1>
-      <KEYWORD1>revealed</KEYWORD1>
-      <KEYWORD1>reverse</KEYWORD1>
-      <KEYWORD1>route</KEYWORD1>
-      <KEYWORD1>save</KEYWORD1>
-      <KEYWORD1>select</KEYWORD1>
-      <KEYWORD1>self</KEYWORD1>
-      <KEYWORD1>sender</KEYWORD1>
-      <KEYWORD1>service</KEYWORD1>
-      <KEYWORD1>set</KEYWORD1>
-      <KEYWORD1>signal</KEYWORD1>
-      <KEYWORD1>signallist</KEYWORD1>
-      <KEYWORD1>signalroute</KEYWORD1>
-      <KEYWORD1>signalset</KEYWORD1>
-      <KEYWORD1>spelling</KEYWORD1>
-      <KEYWORD1>start</KEYWORD1>
-      <KEYWORD1>state</KEYWORD1>
-      <KEYWORD1>stop</KEYWORD1>
-      <KEYWORD1>struct</KEYWORD1>
-      <KEYWORD1>substructure</KEYWORD1>
-      <KEYWORD1>synonym</KEYWORD1>
-      <KEYWORD1>syntype</KEYWORD1>
-      <KEYWORD1>system</KEYWORD1>
-      <KEYWORD1>task</KEYWORD1>
-      <KEYWORD1>then</KEYWORD1>
-      <KEYWORD1>this</KEYWORD1>
-      <KEYWORD1>timer</KEYWORD1>
-      <KEYWORD1>to</KEYWORD1>
-      <KEYWORD1>type</KEYWORD1>
-      <KEYWORD1>use</KEYWORD1>
-      <KEYWORD1>via</KEYWORD1>
-      <KEYWORD1>view</KEYWORD1>
-      <KEYWORD1>viewed</KEYWORD1>
-      <KEYWORD1>virtual</KEYWORD1>
-      <KEYWORD1>with</KEYWORD1>
-
-      <!-- Standard Library Sorts -->
-      <KEYWORD2>Boolean</KEYWORD2>
-      <KEYWORD2>Character</KEYWORD2>
-      <KEYWORD2>Charstring</KEYWORD2>
-      <KEYWORD2>Duration</KEYWORD2>
-      <KEYWORD2>Integer</KEYWORD2>
-      <KEYWORD2>Natural</KEYWORD2>
-      <KEYWORD2>Real</KEYWORD2>
-      <KEYWORD2>PId</KEYWORD2>
-      <KEYWORD2>Time</KEYWORD2>
-
-      <!-- Standard Library Generators -->
-      <KEYWORD3>Array</KEYWORD3>
-      <KEYWORD3>String</KEYWORD3>
-      <KEYWORD3>Powerset</KEYWORD3>
-
-      <!-- Standard Library Literals -->
-      <LITERAL1>false</LITERAL1>
-      <LITERAL1>null</LITERAL1>
-      <LITERAL1>true</LITERAL1>
-    </KEYWORDS>
-  </RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/sgml.xml b/qpython/src/main/assets/syntax/sgml.xml
deleted file mode 100644
index cf8069cc..00000000
--- a/qpython/src/main/assets/syntax/sgml.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="commentStart" VALUE="&lt;!--" />
-		<PROPERTY NAME="commentEnd" VALUE="--&gt;" />
-	</PROPS>
-	<RULES>
-		<!-- SGML comment -->
-		<SPAN TYPE="COMMENT1">
-			<BEGIN>&lt;!--</BEGIN>
-			<END>--&gt;</END>
-		</SPAN>
-
-		<!-- DTD Entity declarations -->
-		<SPAN TYPE="KEYWORD2" DELEGATE="xml::ENTITY-TAGS">
-			<BEGIN>&lt;!ENTITY</BEGIN>
-			<END>&gt;</END>
-		</SPAN>
-
-		<!-- CDATA sections -->
-		<SPAN TYPE="KEYWORD2" DELEGATE="xml::CDATA">
-			<BEGIN>&lt;![CDATA[</BEGIN>
-			<END>]]&gt;</END>
-		</SPAN>
-
-		<!-- DTD instructions -->
-		<SPAN TYPE="KEYWORD2" DELEGATE="xml::DTD-TAGS">
-			<BEGIN>&lt;!</BEGIN>
-			<END>&gt;</END>
-		</SPAN>
-
-		<!-- markup tags -->
-		<SPAN TYPE="MARKUP" DELEGATE="xml::TAGS">
-			<BEGIN>&lt;</BEGIN>
-			<END>&gt;</END>
-		</SPAN>
-
-		<!-- SGML entities -->
-		<SPAN TYPE="LITERAL2" NO_WORD_BREAK="TRUE">
-			<BEGIN>&amp;</BEGIN>
-			<END>;</END>
-		</SPAN>
-	</RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/shellscript.xml b/qpython/src/main/assets/syntax/shellscript.xml
deleted file mode 100644
index c3f38b5b..00000000
--- a/qpython/src/main/assets/syntax/shellscript.xml
+++ /dev/null
@@ -1,176 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="lineComment" VALUE="#" />
-		<PROPERTY NAME="indentOpenBrackets" VALUE="{" />
-		<PROPERTY NAME="indentCloseBrackets" VALUE="}" />
-		<PROPERTY NAME="indentNextLines"
-			VALUE="^.*(then|do|else|case.*in)\s*(#.*)?$" />
-		<PROPERTY NAME="unindentThisLine"
-			VALUE="^\s*(fi|else|done|esac|[^(]*\).*)\s*(#.*)?$" />
-		<PROPERTY NAME="unindentNextLines"
-			VALUE="^\s*(fi|else|done|esac)\s*(#.*)?$" />
-		<!-- 3 possible values for electricKeys may be considered
-		  1. electric enter and the bracket: ")&#xA;"
-		  2. letters ending unindent rules ")iec"
-		  3. all letters ")abcdefghijklmnopqrstuvwxyz"
-		  details: http://jedit.9.n6.nabble.com/jEdit-devel-electric-keys-for-shell-mode-tp4998749.html
-		-->
-		<PROPERTY NAME="electricKeys" VALUE=")abcdefghijklmnopqrstuvwxyz" />
-	</PROPS>
-	<RULES IGNORE_CASE="TRUE" HIGHLIGHT_DIGITS="TRUE">
-		<!-- Comments -->
-		<EOL_SPAN TYPE="COMMENT2">#!</EOL_SPAN>
-		<EOL_SPAN TYPE="COMMENT1">#</EOL_SPAN>
-
-		<!-- BUG #3594428 (Bash Syntax Highlighting) -->
-		<SPAN TYPE="KEYWORD2" DELEGATE="LITERAL" NO_LINE_BREAK="TRUE">
-			<BEGIN>${</BEGIN>
-			<END>}</END>
-		</SPAN>
-
-		<MARK_FOLLOWING TYPE="KEYWORD2">$#</MARK_FOLLOWING>
-		<MARK_FOLLOWING TYPE="KEYWORD2">$?</MARK_FOLLOWING>
-		<MARK_FOLLOWING TYPE="KEYWORD2">$*</MARK_FOLLOWING>
-		<MARK_FOLLOWING TYPE="KEYWORD2">$@</MARK_FOLLOWING>
-		<MARK_FOLLOWING TYPE="KEYWORD2">$$</MARK_FOLLOWING>
-		<MARK_FOLLOWING TYPE="KEYWORD2">$&lt;</MARK_FOLLOWING>
-		<MARK_FOLLOWING TYPE="KEYWORD2">$</MARK_FOLLOWING>
-		<MARK_PREVIOUS TYPE="KEYWORD2" MATCH_TYPE="OPERATOR">=</MARK_PREVIOUS>
-
-		<!-- weird stuff -->
-		<SPAN TYPE="KEYWORD3" DELEGATE="EXEC" ESCAPE="\">
-			<BEGIN>$((</BEGIN>
-			<END>))</END>
-		</SPAN>
-		<SPAN TYPE="KEYWORD3" DELEGATE="EXEC" ESCAPE="\">
-			<BEGIN>$(</BEGIN>
-			<END>)</END>
-		</SPAN>
-		<SPAN TYPE="KEYWORD3" DELEGATE="EXEC" ESCAPE="\">
-			<BEGIN>$[</BEGIN>
-			<END>]</END>
-		</SPAN>
-		<SPAN TYPE="KEYWORD3" DELEGATE="EXEC" ESCAPE="\">
-			<BEGIN>`</BEGIN>
-			<END>`</END>
-		</SPAN>
-
-		<!-- Literals -->
-		<SPAN TYPE="LITERAL1" DELEGATE="LITERAL" ESCAPE="\">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-		<SPAN TYPE="LITERAL1">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-
-		<!-- Readins -->
-		<SPAN_REGEXP HASH_CHAR="&lt;&lt;" TYPE="LITERAL1" DELEGATE="LITERAL" ESCAPE="\">
-			<BEGIN><![CDATA[<<[\p{Space}'"]*([\p{Alnum}_]+)[\p{Space}'"]*]]></BEGIN>
-			<END AT_LINE_START="TRUE">$1</END>
-		</SPAN_REGEXP>
-
-		<!-- Operators -->
-		<SEQ TYPE="OPERATOR">|</SEQ>
-		<SEQ TYPE="OPERATOR">&amp;</SEQ>
-		<SEQ TYPE="OPERATOR">!</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;</SEQ>
-
-		<!-- %jobnumber -->
-		<MARK_FOLLOWING TYPE="KEYWORD2">%</MARK_FOLLOWING>
-
-		<!-- functions -->
-		<MARK_PREVIOUS TYPE="FUNCTION" MATCH_TYPE="OPERATOR">(</MARK_PREVIOUS>
-		<SEQ TYPE="OPERATOR">)</SEQ>
-
-		<KEYWORDS>
-			<KEYWORD1>if</KEYWORD1>
-			<KEYWORD1>then</KEYWORD1>
-			<KEYWORD1>elif</KEYWORD1>
-			<KEYWORD1>else</KEYWORD1>
-			<KEYWORD1>fi</KEYWORD1>
-			<KEYWORD1>case</KEYWORD1>
-			<KEYWORD1>in</KEYWORD1>
-			<OPERATOR>;;</OPERATOR>
-			<KEYWORD1>esac</KEYWORD1>
-			<KEYWORD1>while</KEYWORD1>
-			<KEYWORD1>for</KEYWORD1>
-			<KEYWORD1>do</KEYWORD1>
-			<KEYWORD1>done</KEYWORD1>
-			<KEYWORD1>continue</KEYWORD1>
-
-			<KEYWORD1>local</KEYWORD1>
-			<KEYWORD1>return</KEYWORD1>
-		</KEYWORDS>
-
-		<!-- some of these should be marked OPERATOR -->
-		<!-- <SEQ TYPE="NULL">)</SEQ>
-		<SEQ TYPE="NULL">(</SEQ>
-		<SEQ TYPE="NULL">=</SEQ>
-		<SEQ TYPE="NULL">!</SEQ>
-		<SEQ TYPE="NULL">&gt;=</SEQ>
-		<SEQ TYPE="NULL">&lt;=</SEQ>
-		<SEQ TYPE="NULL">+</SEQ>
-		<SEQ TYPE="NULL">-</SEQ>
-		<SEQ TYPE="NULL">/</SEQ>
-		<SEQ TYPE="NULL">*</SEQ>
-		<SEQ TYPE="NULL">^</SEQ>
-		<SEQ TYPE="NULL">~</SEQ>
-		<SEQ TYPE="NULL">}</SEQ>
-		<SEQ TYPE="NULL">{</SEQ>
-		SEQ TYPE="NULL">.</SEQ
-		<SEQ TYPE="NULL">,</SEQ>
-		<SEQ TYPE="NULL">;</SEQ>
-		<SEQ TYPE="NULL">]</SEQ>
-		<SEQ TYPE="NULL">[</SEQ>
-		<SEQ TYPE="NULL">?</SEQ>
-		<SEQ TYPE="NULL">:</SEQ> -->
-	</RULES>
-
-	<RULES SET="LITERAL" DEFAULT="LITERAL1" ESCAPE="\">
-		<!-- Variables -->
-		<SPAN TYPE="KEYWORD2" NO_LINE_BREAK="TRUE">
-			<BEGIN>${</BEGIN>
-			<END>}</END>
-		</SPAN>
-
-		<MARK_FOLLOWING TYPE="KEYWORD2">$</MARK_FOLLOWING>
-	</RULES>
-
-	<RULES SET="EXEC" DEFAULT="KEYWORD3" ESCAPE="\">
-		<!-- Variables -->
-		<SPAN TYPE="KEYWORD2" NO_LINE_BREAK="TRUE">
-			<BEGIN>${</BEGIN>
-			<END>}</END>
-		</SPAN>
-
-		<SPAN TYPE="KEYWORD3">
-			<BEGIN>$((</BEGIN>
-			<END>))</END>
-		</SPAN>
-
-		<SPAN TYPE="KEYWORD3">
-			<BEGIN>$(</BEGIN>
-			<END>)</END>
-		</SPAN>
-
-		<SPAN TYPE="KEYWORD3">
-			<BEGIN>$[</BEGIN>
-			<END>]</END>
-		</SPAN>
-
-		<MARK_FOLLOWING TYPE="KEYWORD2">$</MARK_FOLLOWING>
-
-		<SEQ TYPE="OPERATOR">|</SEQ>
-		<SEQ TYPE="OPERATOR">&amp;</SEQ>
-		<SEQ TYPE="OPERATOR">!</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;</SEQ>
-	</RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/shtml.xml b/qpython/src/main/assets/syntax/shtml.xml
deleted file mode 100644
index 8d356061..00000000
--- a/qpython/src/main/assets/syntax/shtml.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="commentStart" VALUE="&lt;!--" />
-		<PROPERTY NAME="commentEnd" VALUE="--&gt;" />
-	</PROPS>
-	<RULES IGNORE_CASE="TRUE">
-		<!-- SSI -->
-		<!-- SSI directives should ALWAYS end like this, with a space
-			before the tag end, so let's make it colorize poorly otherwise -->
-		<!-- ... or really? see bug report 964860 -->
-		<SPAN TYPE="KEYWORD3" DELEGATE="SSI">
-			<BEGIN>&lt;!--#</BEGIN>
-			<END>--&gt;</END>
-		</SPAN>
-
-		<!-- SGML comment -->
-		<SPAN TYPE="COMMENT1">
-			<BEGIN>&lt;!--</BEGIN>
-			<END>--&gt;</END>
-		</SPAN>
-
-		<!-- JavaScript -->
-		<SPAN TYPE="MARKUP" DELEGATE="html::JAVASCRIPT">
-			<BEGIN>&lt;SCRIPT</BEGIN>
-			<END>&lt;/SCRIPT&gt;</END>
-		</SPAN>
-
-		<!-- stylesheet -->
-		<SPAN TYPE="MARKUP" DELEGATE="html::CSS">
-			<BEGIN>&lt;STYLE</BEGIN>
-			<END>&lt;/STYLE&gt;</END>
-		</SPAN>
-
-		<!-- DTD instructions -->
-		<SPAN TYPE="KEYWORD2" DELEGATE="xml::DTD-TAGS">
-			<BEGIN>&lt;!</BEGIN>
-			<END>&gt;</END>
-		</SPAN>
-
-		<!-- markup tags -->
-		<SPAN TYPE="MARKUP" DELEGATE="TAGS">
-			<BEGIN>&lt;</BEGIN>
-			<END>&gt;</END>
-		</SPAN>
-
-		<!-- SGML entities -->
-		<SPAN TYPE="LITERAL2" NO_WORD_BREAK="TRUE">
-			<BEGIN>&amp;</BEGIN>
-			<END>;</END>
-		</SPAN>
-	</RULES>
-
-	<RULES SET="TAGS" DEFAULT="MARKUP">
-		<SPAN TYPE="LITERAL1">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-
-		<SPAN TYPE="LITERAL1">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-
-		<SEQ TYPE="OPERATOR">=</SEQ>
-	</RULES>
-
-	<RULES SET="SSI" DEFAULT="KEYWORD3">
-		<SPAN TYPE="LITERAL1" MATCH_TYPE="OPERATOR" DELEGATE="SSI-EXPRESSION">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-
-		<!-- MD: i don't think this is valid
-		<SPAN TYPE="LITERAL1" MATCH_TYPE="OPERATOR" DELEGATE="SSI-EXPRESSION">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-		-->
-
-		<SEQ TYPE="OPERATOR">=</SEQ>
-
-		<KEYWORDS>
-			<KEYWORD1>config</KEYWORD1>
-			<KEYWORD1>echo</KEYWORD1>
-			<KEYWORD1>exec</KEYWORD1>
-			<KEYWORD1>flastmod</KEYWORD1>
-			<KEYWORD1>fsize</KEYWORD1>
-			<KEYWORD1>include</KEYWORD1>
-
-			<KEYWORD2>cgi</KEYWORD2>
-			<KEYWORD2>errmsg</KEYWORD2>
-			<KEYWORD2>file</KEYWORD2>
-			<KEYWORD2>sizefmt</KEYWORD2>
-			<KEYWORD2>timefmt</KEYWORD2>
-			<KEYWORD2>var</KEYWORD2>
-			<KEYWORD2>cmd</KEYWORD2>
-		</KEYWORDS>
-	</RULES>
-
-	<RULES SET="SSI-EXPRESSION" DEFAULT="LITERAL1" ESCAPE="\">
-
-		<MARK_FOLLOWING TYPE="KEYWORD2">$</MARK_FOLLOWING>
-
-		<SEQ TYPE="OPERATOR">=</SEQ>
-		<SEQ TYPE="OPERATOR">!=</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;=</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;=</SEQ>
-		<SEQ TYPE="OPERATOR">&amp;&amp;</SEQ>
-		<SEQ TYPE="OPERATOR">||</SEQ>
-	</RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/sip.xml b/qpython/src/main/assets/syntax/sip.xml
deleted file mode 100644
index 19bed45b..00000000
--- a/qpython/src/main/assets/syntax/sip.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="contextInsensitive" VALUE="true" />
-	</PROPS>
-	<RULES IGNORE_CASE="FALSE" HIGHLIGHT_DIGITS="TRUE" DIGIT_RE="\d+">
-		<MARK_PREVIOUS TYPE="KEYWORD3" MATCH_TYPE="OPERATOR">=</MARK_PREVIOUS>
-		<KEYWORDS>
-			<!--{{{ Requests -->
-			<KEYWORD1>REGISTER</KEYWORD1>
-			<KEYWORD1>INVITE</KEYWORD1>
-			<KEYWORD1>ACK</KEYWORD1>
-			<KEYWORD1>CANCEL</KEYWORD1>
-			<KEYWORD1>OPTIONS</KEYWORD1>
-			<KEYWORD1>BYE</KEYWORD1>
-			<KEYWORD1>REFER</KEYWORD1>
-			<KEYWORD1>NOTIFY</KEYWORD1>
-			<KEYWORD1>MESSAGE</KEYWORD1>
-			<KEYWORD1>SUBSCRIBE</KEYWORD1>
-			<KEYWORD1>INFO</KEYWORD1>
-			<KEYWORD1>PRACK</KEYWORD1>
-			<KEYWORD1>UPDATE</KEYWORD1>
-			<KEYWORD1>PUBLISH</KEYWORD1> <!-- RFC3903 -->
-			<!--}}}-->
-
-			<!--{{{ Header fields -->
-			<KEYWORD2>Accept</KEYWORD2>
-			<KEYWORD2>Accept-Contact</KEYWORD2>			<!-- RFC3841 -->
-			<KEYWORD2>Accept-Language</KEYWORD2>
-			<KEYWORD2>Alert-Info</KEYWORD2>
-			<KEYWORD2>Allow</KEYWORD2>				<!-- RFC3261 -->
-			<KEYWORD2>Allow-Events</KEYWORD2>			<!-- RFC3265 -->
-			<KEYWORD2>Authentication-Info</KEYWORD2>		<!-- RFC3261 -->
-			<KEYWORD2>Authorization</KEYWORD2>			<!-- RFC3261 -->
-			<KEYWORD2>Call-ID</KEYWORD2>				<!-- RFC3261 -->
-			<KEYWORD2>Call-Info</KEYWORD2>				<!-- RFC3261 -->
-			<KEYWORD2>Contact</KEYWORD2>				<!-- RFC3261 -->
-			<KEYWORD2>Content-Disposition</KEYWORD2>		<!-- RFC3261 -->
-			<KEYWORD2>Content-Encoding</KEYWORD2>			<!-- RFC3261 -->
-			<KEYWORD2>Content-Language</KEYWORD2>			<!-- RFC3261 -->
-			<KEYWORD2>Content-Length</KEYWORD2>
-			<KEYWORD2>Content-Type</KEYWORD2>
-			<KEYWORD2>CSeq</KEYWORD2>				<!-- RFC3261 -->
-			<KEYWORD2>Date</KEYWORD2>				<!-- RFC3261 -->
-			<KEYWORD2>Encryption</KEYWORD2>
-			<KEYWORD2>Error-Info</KEYWORD2>				<!-- RFC3261 -->
-			<KEYWORD2>Event</KEYWORD2>				<!-- RFC3265 -->
-			<KEYWORD2>Expires</KEYWORD2>				<!-- RFC2543 -->
-			<KEYWORD2>From</KEYWORD2>				<!-- RFC3261 -->
-			<KEYWORD2>Hide</KEYWORD2>
-			<KEYWORD2>In-Reply-To</KEYWORD2>			<!-- RFC3261 -->
-			<KEYWORD2>Max-Forwards</KEYWORD2>			<!-- RFC3261 -->
-			<KEYWORD2>Min-Expires</KEYWORD2>			<!-- RFC3261 -->
-			<KEYWORD2>Min-SE</KEYWORD2>				<!-- RFC4028 -->
-			<KEYWORD2>MIME-Version</KEYWORD2>
-			<KEYWORD2>Organization</KEYWORD2>			<!-- RFC3261 -->
-			<KEYWORD2>P-Asserted-Identity</KEYWORD2>		<!-- RFC3325 -->
-			<KEYWORD2>P-Preferred-Identity</KEYWORD2>		<!-- RFC3325 -->
-			<KEYWORD2>Path</KEYWORD2>				<!-- RFC3327 -->
-			<KEYWORD2>Priority</KEYWORD2>				<!-- RFC3261 -->
-			<KEYWORD2>Privacy</KEYWORD2>				<!-- RFC3323 -->
-			<KEYWORD2>Proxy-Authenticate</KEYWORD2>
-			<KEYWORD2>Proxy-Authentication-Info</KEYWORD2>		<!-- RFC2617 -->
-			<KEYWORD2>Proxy-Authorization</KEYWORD2>		<!-- RFC3261 -->
-			<KEYWORD2>Proxy-Require</KEYWORD2>			<!-- RFC3261 -->
-			<KEYWORD2>RAck</KEYWORD2>				<!-- RFC3262 -->
-			<KEYWORD2>Reason</KEYWORD2>				<!-- RFC3326 -->
-			<KEYWORD2>Record-Route</KEYWORD2>			<!-- RFC3261 -->
-			<KEYWORD2>Refer-Sub</KEYWORD2>				<!-- RFC4488 -->
-			<KEYWORD2>Refer-To</KEYWORD2>				<!-- RFC3515 -->
-			<KEYWORD2>Referred-By</KEYWORD2>			<!-- RFC3892 -->
-			<KEYWORD2>Reject-Contact</KEYWORD2>			<!-- RFC3841 -->
-			<KEYWORD2>Remote-Party-ID</KEYWORD2>			<!-- draft-ietf-sip-privacy-04.txt -->
-			<KEYWORD2>Replaces</KEYWORD2>				<!-- RFC3891 -->
-			<KEYWORD2>Reply-To</KEYWORD2>				<!-- RFC3261 -->
-			<KEYWORD2>Request-Disposition</KEYWORD2>			<!-- RFC3841 -->
-			<KEYWORD2>Require</KEYWORD2>				<!-- RFC3261 -->
-			<KEYWORD2>Retry-After</KEYWORD2>			<!-- RFC3261 -->
-			<KEYWORD2>Route</KEYWORD2>				<!-- RFC3261 -->
-			<KEYWORD2>RSeq</KEYWORD2>				<!-- RFC3261 -->
-			<KEYWORD2>Security-Client</KEYWORD2>			<!-- RFC3329 -->
-			<KEYWORD2>Security-Server</KEYWORD2>			<!-- RFC3329 -->
-			<KEYWORD2>Security-Verify</KEYWORD2>			<!-- RFC3329 -->
-			<KEYWORD2>Server</KEYWORD2>				<!-- RFC2616 RFC3261 -->
-			<KEYWORD2>Service-Route</KEYWORD2>			<!-- RFC3608 -->
-			<KEYWORD2>Session-Expires</KEYWORD2>			<!-- RFC4028 -->
-			<KEYWORD2>SIP-ETag</KEYWORD2>				<!-- RFC3903 -->
-			<KEYWORD2>SIP-If-Match</KEYWORD2>			<!-- RFC3903 -->
-			<KEYWORD2>Subject</KEYWORD2>				<!-- RFC3261 -->
-			<KEYWORD2>Subscription-State</KEYWORD2>			<!-- RFC3265 -->
-			<KEYWORD2>Supported</KEYWORD2>				<!-- RFC3261 -->
-			<KEYWORD2>Suppress-Body-If-Match</KEYWORD2>		<!-- draft-niemi-sip-subnot-etags-01 -->
-			<KEYWORD2>Suppress-Notify-If-Match</KEYWORD2>		<!-- draft-niemi-sip-subnot-etags-01 -->
-			<KEYWORD2>Timestamp</KEYWORD2>				<!-- RFC3261 -->
-			<KEYWORD2>To</KEYWORD2>					<!-- RFC3261 -->
-			<KEYWORD2>Unsupported</KEYWORD2>			<!-- RFC3261 -->
-			<KEYWORD2>User-Agent</KEYWORD2>
-			<KEYWORD2>Via</KEYWORD2>				<!-- RFC3261 -->
-			<KEYWORD2>Warning</KEYWORD2>				<!-- RFC3261 -->
-			<KEYWORD2>WWW-Authenticate</KEYWORD2>			<!-- RFC3261 -->
-			<!--}}}-->
-		</KEYWORDS>
-	</RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/slate.xml b/qpython/src/main/assets/syntax/slate.xml
deleted file mode 100644
index 3f396bf5..00000000
--- a/qpython/src/main/assets/syntax/slate.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="unalignedOpenBrackets" VALUE="["/>
-		<PROPERTY NAME="unalignedCloseBrackets" VALUE="]"/>
-		<PROPERTY NAME="commentStart" VALUE="&quot;"/>
-		<PROPERTY NAME="commentEnd" VALUE="&quot;"/>
-	</PROPS>
-	<RULES IGNORE_CASE="FALSE"
-		HIGHLIGHT_DIGITS="TRUE" DIGIT_RE="-?\d+([./]\d+)?">
-		<SPAN TYPE="COMMENT1">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-
-		<MARK_FOLLOWING TYPE="LITERAL2">#</MARK_FOLLOWING>
-
-		<SEQ TYPE="MARKUP">@</SEQ>
-
-		<SPAN TYPE="LITERAL1" ESCAPE="\">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-
-		<SPAN TYPE="KEYWORD1">
-			<BEGIN>|</BEGIN>
-			<END>|</END>
-		</SPAN>
-
-		<MARK_FOLLOWING TYPE="LITERAL4">&amp;</MARK_FOLLOWING>
-		<MARK_FOLLOWING TYPE="KEYWORD2">`</MARK_FOLLOWING>
-
-		<MARK_FOLLOWING TYPE="LITERAL3">$\</MARK_FOLLOWING>
-		<MARK_FOLLOWING TYPE="LITERAL3">$</MARK_FOLLOWING>
-
-		<SEQ TYPE="OPERATOR">[</SEQ>
-		<SEQ TYPE="OPERATOR">]</SEQ>
-		<SEQ TYPE="OPERATOR">{</SEQ>
-		<SEQ TYPE="OPERATOR">}</SEQ>
-	</RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/slax.xml b/qpython/src/main/assets/syntax/slax.xml
deleted file mode 100644
index 4daa4137..00000000
--- a/qpython/src/main/assets/syntax/slax.xml
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!-- SLAX Script mode written by Curtis Call  
-
-     Types:
-     
-        LITERAL1 = " " Strings 
-        LITERAL2 = ' ' Strings
-        LITERAL3 = /* */ Comments, Operators, Location Paths, Namespace prefix declarations
-        KEYWORD1 = SLAX statements
-        KEYWORD2 = Variables
-        KEYWORD3 = XML Tags
-        KEYWORD4 = Attributes
-        FUNCTION = Templates
-        DIGIT = Numbers
-     
-     Note - LITERAL3 had to highlight different types due to the quirks of the matching
-     possibilities.  The main problem is with trying to match comments that follow a line
-     termination.  I could determine no possible way to correctly match only correct comments
-     and to also use the correct color for the comment as well as the line termination.  The 
-     workaround was to combine multiple types of syntax into the LITERAL3 value. 
-     This is why operators are not matched.  They have to be grouped in along with the rest
-     so it is ok to let them be caught by default.  -->
-     
-<MODE>
-
-    <PROPS>
-        <!-- SLAX has no line comment, only a /* */ comment -->
-        <PROPERTY NAME="commentStart" VALUE="/*"/>
-        <PROPERTY NAME="commentEnd" VALUE="*/"/>
-    
-        <!--  - and _ and : are valid within SLAX words -->
-        <PROPERTY NAME="wordBreakChars" VALUE=",/+=*"/>
-        <PROPERTY NAME="noWordSep" VALUE="-_:."/>
-    
-        <!-- { and } always surround SLAX code blocks, but I cannot get auto-indenting
-             to work correctly so I'll just disable the functionality.
-        <PROPERTY NAME="indentOpenBrackets" VALUE="{"/>
-        <PROPERTY NAME="indentCloseBrackets" VALUE="}"/>
-        <PROPERTY NAME="unalignedOpenBrackets" VALUE="("/>
-        <PROPERTY NAME="unalignedCloseBrackets" VALUE=")"/>
-                                                            -->
-    </PROPS>
-    
-    <RULES IGNORE_CASE="TRUE" HIGHLIGHT_DIGITS="TRUE" NO_WORD_SEP="-_:." 
-        DIGIT_RE="([0-9])*\.?([0-9])+" DEFAULT="LITERAL3">
-
-        <IMPORT DELEGATE="leading-comments"/>
-        <IMPORT DELEGATE="strings"/>
-        <IMPORT DELEGATE="variables"/>
-        <IMPORT DELEGATE="templates"/>
-        <IMPORT DELEGATE="statements"/>
-        <IMPORT DELEGATE="xml-tags"/>
-        <IMPORT DELEGATE="trailing-comments"/>
-    </RULES>
-
-    <!-- These comments start the line so it is obvious that they are not location paths -->
-    <RULES SET="leading-comments">
-        <SPAN TYPE="LITERAL3" AT_WHITESPACE_END="TRUE">
-            <BEGIN>/*</BEGIN> 
-            <END>*/</END>
-        </SPAN>
-    </RULES>
-        
-    <!-- These comments trail at the end of the line - impossible to catch and maintain separate
-         colors with operators -->
-    <RULES SET="trailing-comments">
-        <SPAN_REGEXP TYPE="LITERAL3">
-            <BEGIN>((;)|(\})|(\{)|(\)))(\s)*/\*</BEGIN> 
-            <END>*/</END>
-        </SPAN_REGEXP>
-    </RULES>
-        
-    <!-- Both " " and ' ' strings are correctly caught -->
-    <RULES SET="strings">
-        <SPAN TYPE="LITERAL1" ESCAPE="\">
-            <BEGIN>"</BEGIN>
-            <END>"</END>
-        </SPAN>
-        <SPAN TYPE="LITERAL2" ESCAPE="\">
-            <BEGIN>'</BEGIN>
-            <END>'</END>
-        </SPAN>
-    </RULES>
-    
-    <!-- The XML start tag is embedded in SLAX scripts -->
-    <RULES SET="xml-tags" DEFAULT="KEYWORD3">
-        <SPAN_REGEXP TYPE="KEYWORD3" DELEGATE="inside-the-tag">
-            <BEGIN><![CDATA[<([a-z]|[A-Z])]]></BEGIN>
-            <END><![CDATA[>]]></END>
-        </SPAN_REGEXP>
-    </RULES>
-    
-    <!-- This sets the actual tag < > and tag name to KEYWORD3, the = to LITERAL3
-         and sends the attributes to the attribute RULES and strings to string RULES -->
-    <RULES SET="inside-the-tag" DEFAULT="KEYWORD3">
-        <SPAN_REGEXP TYPE="LITERAL3" DELEGATE="attribute">
-            <BEGIN>(\s)+(?!&gt;)</BEGIN>
-            <END>=</END>
-        </SPAN_REGEXP>
-        <IMPORT DELEGATE="strings"/>
-    </RULES>
-    
-    <!-- XML attributes are KEYWORD4 -->
-    <RULES SET="attribute" DEFAULT="KEYWORD4">
-    </RULES>
-
-    <!-- Applies to both variables and parameters, everything that starts with a $ -->
-    <RULES SET="variables">
-        <MARK_FOLLOWING TYPE="KEYWORD2">$</MARK_FOLLOWING>
-    </RULES>
-
-    <!-- Anything that is immediately prior to a ( will be set to FUNCTION and the ( to
-         LITERAL3 -->
-    <RULES SET="templates">
-        <MARK_PREVIOUS TYPE="FUNCTION" MATCH_TYPE="LITERAL3">(</MARK_PREVIOUS>
-    </RULES>
-
-    <!-- This is the SLAX statement set, they use KEYWORD1 -->
-    <RULES SET="statements">
-        <KEYWORDS>
-            <KEYWORD1>if</KEYWORD1>
-            <KEYWORD1>version</KEYWORD1>
-            <KEYWORD1>ns</KEYWORD1>
-            <KEYWORD1>param</KEYWORD1>
-            <KEYWORD1>var</KEYWORD1>
-            <KEYWORD1>template</KEYWORD1>
-            <KEYWORD1>match</KEYWORD1>
-            <KEYWORD1>else</KEYWORD1>
-            <KEYWORD1>copy-of</KEYWORD1>
-            <KEYWORD1>copy</KEYWORD1>
-            <KEYWORD1>call</KEYWORD1>
-            <KEYWORD1>apply-templates</KEYWORD1>
-            <KEYWORD1>expr</KEYWORD1>
-            <KEYWORD1>import</KEYWORD1>
-            <KEYWORD1>input</KEYWORD1>
-            <KEYWORD1>for-each</KEYWORD1>
-            <KEYWORD1>mode</KEYWORD1>
-            <KEYWORD1>priority</KEYWORD1>
-            <KEYWORD1>extension</KEYWORD1>
-            <KEYWORD1>preserve-space</KEYWORD1>
-            <KEYWORD1>strip-space</KEYWORD1>
-            <KEYWORD1>with</KEYWORD1>
-        </KEYWORDS>
-    </RULES>
-
-</MODE>
-
- 	  	 
diff --git a/qpython/src/main/assets/syntax/smalltalk.xml b/qpython/src/main/assets/syntax/smalltalk.xml
deleted file mode 100644
index f6a0fd1c..00000000
--- a/qpython/src/main/assets/syntax/smalltalk.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!-- Smalltalk mode, by Marcio Marchini mqm@magma.ca -->
-
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="commentStart" VALUE="&quot;" />
-		<PROPERTY NAME="commentEnd" VALUE="&quot;" />
-		<PROPERTY NAME="indentOpenBrackets" VALUE="[" />
-		<PROPERTY NAME="indentCloseBrackets" VALUE="]" />
-
-	</PROPS>
-	<RULES IGNORE_CASE="FALSE" HIGHLIGHT_DIGITS="TRUE">
-		<!-- Standard literals -->
-		<SPAN TYPE="LITERAL1" ESCAPE="\" NO_LINE_BREAK="FALSE">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-
-		<SPAN TYPE="COMMENT1">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-
-		<SEQ TYPE="OPERATOR">:=</SEQ>
-		<SEQ TYPE="OPERATOR">_</SEQ>
-		<SEQ TYPE="OPERATOR">=</SEQ>
-		<SEQ TYPE="OPERATOR">==</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;=</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;=</SEQ>
-		<SEQ TYPE="OPERATOR">+</SEQ>
-		<SEQ TYPE="OPERATOR">-</SEQ>
-		<SEQ TYPE="OPERATOR">/</SEQ>
-		<SEQ TYPE="OPERATOR">*</SEQ>
-
-		<MARK_PREVIOUS TYPE="KEYWORD3" MATCH_TYPE="OPERATOR">:</MARK_PREVIOUS>
-		<MARK_FOLLOWING TYPE="LABEL" MATCH_TYPE="OPERATOR">#</MARK_FOLLOWING>
-		<MARK_FOLLOWING TYPE="LITERAL1" MATCH_TYPE="OPERATOR">$</MARK_FOLLOWING>
-
-
-		<KEYWORDS>
-			<!-- Constants -->
-			<KEYWORD1>true</KEYWORD1>
-			<KEYWORD1>false</KEYWORD1>
-			<KEYWORD1>nil</KEYWORD1>
-
-			<!-- Reserved identifiers -->
-			<KEYWORD2>self</KEYWORD2>
-			<KEYWORD2>super</KEYWORD2>
-
-			<!-- not really keywords, but a different color works well-->
-			<KEYWORD3>isNil</KEYWORD3>
-			<KEYWORD3>not</KEYWORD3>
-
-			<!-- not really -->
-			<LITERAL2>Smalltalk</LITERAL2>
-			<LITERAL2>Transcript</LITERAL2>
-
-			<!-- base classes -->
-			<LITERAL2>Date</LITERAL2>
-			<LITERAL2>Time</LITERAL2>
-			<LITERAL2>Boolean</LITERAL2>
-			<LITERAL2>True</LITERAL2>
-			<LITERAL2>False</LITERAL2>
-			<LITERAL2>Character</LITERAL2>
-			<LITERAL2>String</LITERAL2>
-			<LITERAL2>Array</LITERAL2>
-			<LITERAL2>Symbol</LITERAL2>
-			<LITERAL2>Integer</LITERAL2>
-			<LITERAL2>Object</LITERAL2>
-
-		</KEYWORDS>
-	</RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/smarty.xml b/qpython/src/main/assets/syntax/smarty.xml
deleted file mode 100644
index 2a1e7bc7..00000000
--- a/qpython/src/main/assets/syntax/smarty.xml
+++ /dev/null
@@ -1,531 +0,0 @@
-<?xml version="1.0" ?>
-<!--
-/**
-* @version		2.0.1 (2010-02-08)
-* @author		Mads Lie Jensen
-* @author		Rowan Collins
-* Improved Smarty highlighting mode, based on http://www.palustris.dk/jedit/smarty.xml
-*	and the built-in PHP mode from jEdit 4.3
-* @link http://rwec.co.uk/jedit for documentation and updates
-*/
-
-To install, add this to the "catalog" file:
-<MODE NAME="smarty" FILE="smarty.xml" FILE_NAME_GLOB="*.tpl"></MODE>
-
-You might want to execute these lines of BeanShell code (e.g. with the Utilities->BeanShell menu):
-
-jEdit.setProperty("mode.smarty.sidekick.parser","html");
-jEdit.setProperty("mode.smarty.xml.completion-info",
-"jeditresource:/XML.jar!/xml/completion/html-complete.xml");
-
-to get tag-completion/matching on html in the templates-files if you have the XML-plugin installed
-
--->
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="commentStart" VALUE="{*" />
-		<PROPERTY NAME="commentEnd" VALUE="*}" />
-	</PROPS>
-
-	<RULES IGNORE_CASE="TRUE" HIGHLIGHT_DIGITS="FALSE">
-		<SPAN TYPE="COMMENT1">
-			<BEGIN>{*</BEGIN>
-			<END>*}</END>
-		</SPAN>
-		
-		<!-- Highlight markup other than Smarty inside a {literal} block -->
-		<SPAN TYPE="LITERAL3" DELEGATE="NON_SMARTY">
-			<BEGIN>{LITERAL}</BEGIN>
-			<END>{/LITERAL}</END>
-		</SPAN>
-		
-		<SPAN TYPE="MARKUP" DELEGATE="php::PHP" MATCH_TYPE="FUNCTION">
-			<BEGIN>{PHP}</BEGIN>
-			<END>{/PHP}</END>
-		</SPAN>
-
-		<SPAN TYPE="MARKUP" DELEGATE="SMARTY">
-			<BEGIN>{</BEGIN>
-			<END>}</END>
-		</SPAN>
-		
-		<!-- SGML comment -->
-		<SPAN TYPE="COMMENT1" DELEGATE="COMMENT1+SMARTY">
-			<BEGIN>&lt;!--</BEGIN>
-			<END>--&gt;</END>
-		</SPAN>
-		
-		<!-- JavaScript -->
-		<SPAN TYPE="MARKUP" DELEGATE="JAVASCRIPT_OPENTAG">
-			<BEGIN>&lt;SCRIPT</BEGIN>
-			<END>&lt;/SCRIPT&gt;</END>
-		</SPAN>
-
-		<!-- CSS -->
-		<SPAN TYPE="MARKUP" DELEGATE="CSS_OPENTAG">
-			<BEGIN>&lt;STYLE</BEGIN>
-			<END>&lt;/STYLE&gt;</END>
-		</SPAN>
-		
-		<!-- HTML tags -->
-		<SEQ_REGEXP HASH_CHAR="&lt;" TYPE="MARKUP" DELEGATE="TAGS">&lt;/?\w+</SEQ_REGEXP>
-		
-		<IMPORT DELEGATE="NON_SMARTY" />
-	</RULES>
-	
-	<RULES SET="NON_SMARTY" IGNORE_CASE="TRUE" HIGHLIGHT_DIGITS="FALSE">
-
-		<!-- SGML comment -->
-		<SPAN TYPE="COMMENT1">
-			<BEGIN>&lt;!--</BEGIN>
-			<END>--&gt;</END>
-		</SPAN>
-
-		<!-- DTD instructions -->
-		<SPAN TYPE="KEYWORD2" DELEGATE="xml::DTD-TAGS">
-			<BEGIN>&lt;!</BEGIN>
-			<END>&gt;</END>
-		</SPAN>
-		
-		<!-- JavaScript -->
-		<SPAN_REGEXP HASH_CHAR="&lt;SCRIPT" TYPE="MARKUP" DELEGATE="javascript::MAIN">
-			<BEGIN>&lt;SCRIPT.*?&gt;</BEGIN>
-			<END>&lt;/SCRIPT&gt;</END>
-		</SPAN_REGEXP>
-
-		<!-- CSS -->
-		<SPAN_REGEXP HASH_CHAR="&lt;STYLE" TYPE="MARKUP" DELEGATE="css::MAIN">
-			<BEGIN>&lt;STYLE.*?&gt;</BEGIN>
-			<END>&lt;/STYLE&gt;</END>
-		</SPAN_REGEXP>
-
-		<!-- HTML tags -->
-		<SEQ_REGEXP HASH_CHAR="&lt;" TYPE="MARKUP" DELEGATE="html::TAGS">&lt;/?\w+</SEQ_REGEXP>
-
-		<!-- SGML entities -->
-		<SPAN TYPE="LITERAL2" NO_WORD_BREAK="TRUE">
-			<BEGIN>&amp;</BEGIN>
-			<END>;</END>
-		</SPAN>
-
-	</RULES>
-	
-	<!-- HTML tags (from MAIN rule) -->
-	<RULES SET="TAGS" DEFAULT="MARKUP" ESCAPE="\">
-		<SEQ TYPE="MARKUP" DELEGATE="MAIN">&gt;</SEQ><!-- from SEQ_REGEXP delegate -->
-
-		<SPAN_REGEXP AT_WORD_START="TRUE" TYPE="MARKUP" DELEGATE="CSS_PROPERTIES+SMARTY" HASH_CHAR="style">
-			<BEGIN>style\s*=\s*(["'])</BEGIN>
-			<END>$1</END>
-		</SPAN_REGEXP>
-		
-		<IMPORT DELEGATE="TO_LITERAL+SMARTY" />
-		<IMPORT DELEGATE="TO_SMARTY" />
-		<IMPORT DELEGATE="INVALID_LT" />
-		<IMPORT DELEGATE="html::TAGS" />
-	</RULES>
-	
-	<!-- Handle literals, but allow switching to SMARTY therein, e.g. from html TAGS -->
-	<RULES SET="TO_LITERAL+SMARTY">
-		<SPAN TYPE="LITERAL1" DELEGATE="LITERAL1+SMARTY">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-		<SPAN TYPE="LITERAL2" DELEGATE="LITERAL2+SMARTY">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-		<IMPORT DELEGATE="TO_SMARTY"/>
-	</RULES>
-	
-	<!-- Handle SMARTY tags in LITERAL1, e.g. in the "type" attribute of a <SCRIPT> tag -->
-	<RULES SET="LITERAL1+SMARTY" DEFAULT="LITERAL1" ESCAPE="\">
-		<IMPORT DELEGATE="TO_SMARTY"/>
-	</RULES>
-
-	<!-- Handle SMARTY tags in LITERAL2, e.g. in the "type" attribute of a <SCRIPT> tag -->
-	<RULES SET="LITERAL2+SMARTY" DEFAULT="LITERAL2" ESCAPE="\">
-		<IMPORT DELEGATE="TO_SMARTY"/>
-	</RULES>
-	
-	<!-- Handle Smarty tags in HTML comments -->
-	<RULES SET="COMMENT1+SMARTY" DEFAULT="COMMENT1">
-		<IMPORT DELEGATE="TO_SMARTY"/>
-	</RULES>
-	
-	<!-- Go to SMARTY mode again -->
-	<RULES SET="TO_SMARTY" DEFAULT="MARKUP">
-		<SPAN TYPE="MARKUP" DELEGATE="SMARTY">
-			<BEGIN>{</BEGIN>
-			<END>}</END>
-		</SPAN>
-	</RULES>
-	
-	<RULES SET="INVALID_LT" DEFAULT="INVALID">
-		<SEQ TYPE="INVALID">&lt;</SEQ>
-	</RULES>
-	
-	
-	
-	<!-- CSS where SMARTY code may be injected -->
-	<RULES SET="CSS_OPENTAG" DEFAULT="MARKUP">
-		<SEQ TYPE="MARKUP" DELEGATE="CSS+SMARTY">&gt;</SEQ>
-
-		<IMPORT DELEGATE="TO_LITERAL+SMARTY"/>
-	</RULES>
-
-	<RULES SET="CSS+SMARTY" DEFAULT="MARKUP">
-		<!-- Hacky support for highlighting of CSS not inside a {literal} block -->
-		<SPAN TYPE="FUNCTION" DELEGATE="CSS_PROPERTIES+SMARTY">
-			<BEGIN>{ldelim}</BEGIN>
-			<END>{rdelim}</END>
-		</SPAN>
-		<SPAN TYPE="KEYWORD3" DELEGATE="CSS_PROPERTIES+SMARTY">
-			<BEGIN>{$smarty.ldelim}</BEGIN>
-			<END>{$smarty.rdelim}</END>
-		</SPAN>
-		
-		<SEQ TYPE="OPERATOR" DELEGATE="CSS_PSEUDO">:</SEQ>
-		
-		<IMPORT DELEGATE="TO_SMARTY"/>
-		<IMPORT DELEGATE="css::MAIN"/>
-	</RULES>
-	<RULES SET="CSS_PROPERTIES+SMARTY" ESCAPE="\">
-		<SEQ TYPE="OPERATOR" DELEGATE="CSS_PROP_VALUE+SMARTY">:</SEQ>
-		
-		<IMPORT DELEGATE="TO_SMARTY"/>
-		<IMPORT DELEGATE="css::PROPERTIES"/>
-	</RULES>
-	<RULES SET="CSS_PROP_VALUE+SMARTY"
-		HIGHLIGHT_DIGITS="TRUE"
-		DIGIT_RE="-?\d+(\.\d+)?(pt|pc|in|mm|cm|em|ex|px|ms|s|%|)"
-		NO_WORD_SEP="-_%">
-		
-		<SEQ TYPE="OPERATOR" DELEGATE="CSS_PROPERTIES+SMARTY">;</SEQ>
-		<SEQ TYPE="INVALID" DELEGATE="CSS+SMARTY">}</SEQ> <!-- end properties block, but it's invalid -->
-		
-		<IMPORT DELEGATE="TO_SMARTY"/>
-		<IMPORT DELEGATE="css::PROP_VALUE"/>
-	</RULES>
-	<!-- Pseudo-classes like ":active" are handled specially in the CSS mode -->
-	<RULES SET="CSS_PSEUDO">
-		<SEQ TYPE="NULL" DELEGATE="CSS+SMARTY"> </SEQ>
-		<SEQ TYPE="OPERATOR" DELEGATE="CSS+SMARTY">,</SEQ>
-		
-		<SPAN TYPE="FUNCTION" DELEGATE="CSS_PROPERTIES+SMARTY">
-			<BEGIN>{ldelim}</BEGIN>
-			<END>{rdelim}</END>
-		</SPAN>
-		<SPAN TYPE="KEYWORD3" DELEGATE="CSS_PROPERTIES+SMARTY">
-			<BEGIN>{$smarty.ldelim}</BEGIN>
-			<END>{$smarty.rdelim}</END>
-		</SPAN>
-	
-		<IMPORT DELEGATE="TO_SMARTY"/>
-		<IMPORT DELEGATE="css::PSEUDO"/>
-	</RULES>
-	
-	<!-- Javascript -->
-	<RULES SET="JAVASCRIPT_OPENTAG" DEFAULT="MARKUP">
-		<SEQ TYPE="MARKUP" DELEGATE="JAVASCRIPT">&gt;</SEQ>
-		<IMPORT DELEGATE="TO_LITERAL+SMARTY"/> <!-- handle SMARTY in <script> tag -->
-		<IMPORT DELEGATE="html::TAGS" /> <!-- handle e.g. 'style="width:1px"' -->
-	</RULES>
-	
-	<RULES SET="JAVASCRIPT" DEFAULT="MARKUP" ESCAPE="\">
-		<IMPORT DELEGATE="TO_LITERAL+SMARTY"/>
-		<IMPORT DELEGATE="TO_SMARTY"/>
-		<IMPORT DELEGATE="javascript::MAIN"/>
-	</RULES>
-	
-	
-	
-	<RULES DEFAULT="LITERAL2" SET="DOUBLE_QUOTED" IGNORE_CASE="TRUE">
-		<SPAN TYPE="LITERAL2" DELEGATE="BACK_TICKED">
-			<BEGIN>`</BEGIN>
-			<END>`</END>
-		</SPAN>
-		
-		<IMPORT DELEGATE="VARIABLES" />
-	</RULES>
-	
-	<RULES DEFAULT="LITERAL2" SET="BACK_TICKED" IGNORE_CASE="TRUE">
-		<IMPORT DELEGATE="VARIABLES" />
-		<IMPORT DELEGATE="MATH_OPERATORS" />
-	</RULES>
-	
-	
-	<RULES SET="VARIABLES">
-		<MARK_FOLLOWING TYPE="KEYWORD3">$</MARK_FOLLOWING>
-	</RULES>
-		
-	<RULES SET="MATH_OPERATORS" IGNORE_CASE="TRUE">
-		<SEQ TYPE="OPERATOR">.</SEQ>
-		<SEQ TYPE="OPERATOR">-&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">*</SEQ>
-		<SEQ TYPE="OPERATOR">/</SEQ>
-		<SEQ TYPE="OPERATOR">+</SEQ>
-		<SEQ TYPE="OPERATOR">-</SEQ>
-		<SEQ TYPE="OPERATOR">%</SEQ>
-	</RULES>
-
-	<RULES SET="LOGIC_OPERATORS" IGNORE_CASE="TRUE">
-		<SEQ TYPE="OPERATOR">|</SEQ>
-		<SEQ TYPE="OPERATOR">:</SEQ>
-		<SEQ TYPE="OPERATOR">=</SEQ>
-	
-		<KEYWORDS>
-			<OPERATOR>!=</OPERATOR>
-			<OPERATOR>&gt;</OPERATOR>
-			<OPERATOR>&gt;=</OPERATOR>
-			<OPERATOR>&lt;</OPERATOR>
-			<OPERATOR>&lt;=</OPERATOR>
-			
-			<OPERATOR>==</OPERATOR>
-			
-			<OPERATOR>div by </OPERATOR>
-			<OPERATOR>even by </OPERATOR>
-			<OPERATOR>is even </OPERATOR>
-			<OPERATOR>is not even </OPERATOR>
-			<OPERATOR>is not odd </OPERATOR>
-			<OPERATOR>is odd </OPERATOR>
-			<OPERATOR>odd by </OPERATOR>
-			
-			<OPERATOR>eq</OPERATOR>
-			<OPERATOR>ge</OPERATOR>
-			<OPERATOR>gt</OPERATOR>
-			<OPERATOR>gte</OPERATOR>
-			<OPERATOR>le</OPERATOR>
-			<OPERATOR>lt</OPERATOR>
-			<OPERATOR>lte</OPERATOR>
-			<OPERATOR>mod</OPERATOR>
-			<OPERATOR>ne</OPERATOR>
-			<OPERATOR>neq</OPERATOR>
-			<OPERATOR>not</OPERATOR>
-		</KEYWORDS>
-	</RULES>
-	
-
-	<RULES SET="SMARTY" IGNORE_CASE="TRUE" HIGHLIGHT_DIGITS="TRUE" DEFAULT="LITERAL1">
-		<SPAN TYPE="LITERAL1">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-		
-		<SPAN TYPE="LITERAL2" DELEGATE="DOUBLE_QUOTED">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-		
-		<!-- Variables from config-files -->
-		<SPAN TYPE="KEYWORD3">
-			<BEGIN>#</BEGIN>
-			<END>#</END>
-		</SPAN>
-		
-		<IMPORT DELEGATE="VARIABLES" />
-		<IMPORT DELEGATE="MATH_OPERATORS" />
-		<IMPORT DELEGATE="LOGIC_OPERATORS" />
-		
-		<KEYWORDS>
-		
-			<!-- Built-in functions (in order of documentation) -->
-			<FUNCTION>capture</FUNCTION>
-			<FUNCTION>/capture</FUNCTION>
-			<FUNCTION>config_load</FUNCTION>
-			<FUNCTION>foreach</FUNCTION>
-			<FUNCTION>foreachelse</FUNCTION>
-			<FUNCTION>/foreach</FUNCTION>
-			<FUNCTION>if</FUNCTION>
-			<FUNCTION>else</FUNCTION>
-			<FUNCTION>elseif</FUNCTION>
-			<FUNCTION>/if</FUNCTION>
-			<FUNCTION>include</FUNCTION>
-			<FUNCTION>include_php</FUNCTION>
-			<FUNCTION>insert</FUNCTION>
-			<FUNCTION>ldelim</FUNCTION>
-			<FUNCTION>rdelim</FUNCTION>
-			<!-- {literal} is handled specially -->
-			<!-- {php} is handled specially -->
-			<FUNCTION>section</FUNCTION>
-			<FUNCTION>sectionelse</FUNCTION>
-			<FUNCTION>/section</FUNCTION>
-			<FUNCTION>strip</FUNCTION>
-			<FUNCTION>/strip</FUNCTION>
-			
-			<!-- Default custom functions -->
-			<FUNCTION>assign</FUNCTION>
-			<FUNCTION>counter</FUNCTION>
-			<FUNCTION>cycle</FUNCTION>
-			<FUNCTION>debug</FUNCTION>
-			<FUNCTION>eval</FUNCTION>
-			<FUNCTION>fetch</FUNCTION>
-			<FUNCTION>html_checkboxes</FUNCTION>
-			<FUNCTION>html_image</FUNCTION>
-			<FUNCTION>html_options</FUNCTION>
-			<FUNCTION>html_radios</FUNCTION>
-			<FUNCTION>html_select_date</FUNCTION>
-			<FUNCTION>html_select_time</FUNCTION>
-			<FUNCTION>html_table</FUNCTION>
-			<FUNCTION>mailto</FUNCTION>
-			<FUNCTION>math</FUNCTION>
-			<FUNCTION>popup</FUNCTION>
-			<FUNCTION>popup_init</FUNCTION>
-			<FUNCTION>textformat</FUNCTION>
-			<FUNCTION>/textformat</FUNCTION>
-			
-			<!-- 
-			Variable modifiers
-			'strip' is used in Smarty as both a variable modifier and a function.
-			I have them listed as both, but it will only be recognised as one of these possibilities.
-			At time of writing this is the last entry, ie. a KEYWORD1
-			-->
-			<KEYWORD1>capitalize</KEYWORD1>
-			<KEYWORD1>cat</KEYWORD1>
-			<KEYWORD1>count_characters</KEYWORD1>
-			<KEYWORD1>count_paragraphs</KEYWORD1>
-			<KEYWORD1>count_sentences</KEYWORD1>
-			<KEYWORD1>count_words</KEYWORD1>
-			<KEYWORD1>date_format</KEYWORD1>
-			<KEYWORD1>default</KEYWORD1>
-			<KEYWORD1>escape</KEYWORD1>
-			<KEYWORD1>indent</KEYWORD1>
-			<KEYWORD1>lower</KEYWORD1>
-			<KEYWORD1>nl2br</KEYWORD1>
-			<KEYWORD1>regex_replace</KEYWORD1>
-			<KEYWORD1>replace</KEYWORD1>
-			<KEYWORD1>spacify</KEYWORD1>
-			<KEYWORD1>string_format</KEYWORD1>
-			<KEYWORD1>strip</KEYWORD1>
-			<KEYWORD1>strip_tags</KEYWORD1>
-			<KEYWORD1>truncate</KEYWORD1>
-			<KEYWORD1>upper</KEYWORD1>
-			<KEYWORD1>wordwrap</KEYWORD1>
-			
-			<!-- attributes for Smarty built-in and custom functions -->
-			<KEYWORD3>above</KEYWORD3>
-			<KEYWORD3>advance</KEYWORD3>
-			<KEYWORD3>all_extra</KEYWORD3>
-			<KEYWORD3>assign</KEYWORD3>
-			<KEYWORD3>autostatus</KEYWORD3>
-			<KEYWORD3>autostatuscap</KEYWORD3>
-			<KEYWORD3>background</KEYWORD3>
-			<KEYWORD3>below</KEYWORD3>
-			<KEYWORD3>bgbackground</KEYWORD3>
-			<KEYWORD3>bgcolor</KEYWORD3>
-			<KEYWORD3>border</KEYWORD3>
-			<KEYWORD3>caparray</KEYWORD3>
-			<KEYWORD3>capcolor</KEYWORD3>
-			<KEYWORD3>capicon</KEYWORD3>
-			<KEYWORD3>caption</KEYWORD3>
-			<KEYWORD3>captionfont</KEYWORD3>
-			<KEYWORD3>captionsize</KEYWORD3>
-			<KEYWORD3>center</KEYWORD3>
-			<KEYWORD3>closecolor</KEYWORD3>
-			<KEYWORD3>closefont</KEYWORD3>
-			<KEYWORD3>closesize</KEYWORD3>
-			<KEYWORD3>closetext</KEYWORD3>
-			<KEYWORD3>day_extra</KEYWORD3>
-			<KEYWORD3>day_format</KEYWORD3>
-			<KEYWORD3>day_size</KEYWORD3>
-			<KEYWORD3>delay</KEYWORD3>
-			<KEYWORD3>delimiter</KEYWORD3>
-			<KEYWORD3>direction</KEYWORD3>
-			<KEYWORD3>display_days</KEYWORD3>
-			<KEYWORD3>display_hours</KEYWORD3>
-			<KEYWORD3>display_meridian</KEYWORD3>
-			<KEYWORD3>display_minutes</KEYWORD3>
-			<KEYWORD3>display_months</KEYWORD3>
-			<KEYWORD3>display_seconds</KEYWORD3>
-			<KEYWORD3>display_years</KEYWORD3>
-			<KEYWORD3>end_year</KEYWORD3>
-			<KEYWORD3>equation</KEYWORD3>
-			<KEYWORD3>fgbackground</KEYWORD3>
-			<KEYWORD3>fgcolor</KEYWORD3>
-			<KEYWORD3>field_array</KEYWORD3>
-			<KEYWORD3>field_order</KEYWORD3>
-			<KEYWORD3>field_separator</KEYWORD3>
-			<KEYWORD3>file</KEYWORD3>
-			<KEYWORD3>fixx</KEYWORD3>
-			<KEYWORD3>fixy</KEYWORD3>
-			<KEYWORD3>format</KEYWORD3>
-			<KEYWORD3>frame</KEYWORD3>
-			<KEYWORD3>from</KEYWORD3>
-			<KEYWORD3>fullhtml</KEYWORD3>
-			<KEYWORD3>hauto</KEYWORD3>
-			<KEYWORD3>height</KEYWORD3>
-			<KEYWORD3>hour_extra</KEYWORD3>
-			<KEYWORD3>inarray</KEYWORD3>
-			<KEYWORD3>indent</KEYWORD3>
-			<KEYWORD3>indent_char</KEYWORD3>
-			<KEYWORD3>indent_first</KEYWORD3>
-			<KEYWORD3>item</KEYWORD3>
-			<KEYWORD3>key</KEYWORD3>
-			<KEYWORD3>left</KEYWORD3>
-			<KEYWORD3>loop</KEYWORD3>
-			<KEYWORD3>max</KEYWORD3>
-			<KEYWORD3>meridian_extra</KEYWORD3>
-			<KEYWORD3>minute_extra</KEYWORD3>
-			<KEYWORD3>minute_interval</KEYWORD3>
-			<KEYWORD3>month_extra</KEYWORD3>
-			<KEYWORD3>month_format</KEYWORD3>
-			<KEYWORD3>month_size</KEYWORD3>
-			<KEYWORD3>month_value_format</KEYWORD3>
-			<KEYWORD3>name</KEYWORD3>
-			<KEYWORD3>noclose</KEYWORD3>
-			<KEYWORD3>offsetx</KEYWORD3>
-			<KEYWORD3>offsety</KEYWORD3>
-			<KEYWORD3>once</KEYWORD3>
-			<KEYWORD3>options</KEYWORD3>
-			<KEYWORD3>output</KEYWORD3>
-			<KEYWORD3>padx</KEYWORD3>
-			<KEYWORD3>pady</KEYWORD3>
-			<KEYWORD3>prefix</KEYWORD3>
-			<KEYWORD3>print</KEYWORD3>
-			<KEYWORD3>reverse_years</KEYWORD3>
-			<KEYWORD3>right</KEYWORD3>
-			<KEYWORD3>scope</KEYWORD3>
-			<KEYWORD3>script</KEYWORD3>
-			<KEYWORD3>second_extra</KEYWORD3>
-			<KEYWORD3>second_interval</KEYWORD3>
-			<KEYWORD3>section</KEYWORD3>
-			<KEYWORD3>selected</KEYWORD3>
-			<KEYWORD3>show</KEYWORD3>
-			<KEYWORD3>skip</KEYWORD3>
-			<KEYWORD3>snapx</KEYWORD3>
-			<KEYWORD3>snapy</KEYWORD3>
-			<KEYWORD3>start</KEYWORD3>
-			<KEYWORD3>start_year</KEYWORD3>
-			<KEYWORD3>status</KEYWORD3>
-			<KEYWORD3>step</KEYWORD3>
-			<KEYWORD3>sticky</KEYWORD3>
-			<KEYWORD3>stop</KEYWORD3>
-			<KEYWORD3>style</KEYWORD3>
-			<KEYWORD3>text</KEYWORD3>
-			<KEYWORD3>textcolor</KEYWORD3>
-			<KEYWORD3>textfont</KEYWORD3>
-			<KEYWORD3>textsize</KEYWORD3>
-			<KEYWORD3>time</KEYWORD3>
-			<KEYWORD3>timeout</KEYWORD3>
-			<KEYWORD3>trigger</KEYWORD3>
-			<KEYWORD3>use_24_hours</KEYWORD3>
-			<KEYWORD3>value</KEYWORD3>
-			<KEYWORD3>values</KEYWORD3>
-			<KEYWORD3>var</KEYWORD3>
-			<KEYWORD3>vauto</KEYWORD3>
-			<KEYWORD3>width</KEYWORD3>
-			<KEYWORD3>wrap</KEYWORD3>
-			<KEYWORD3>wrap_char</KEYWORD3>
-			<KEYWORD3>wrap_cut</KEYWORD3>
-			<KEYWORD3>year_as_text</KEYWORD3>
-			<KEYWORD3>year_extra</KEYWORD3>
-			<KEYWORD3>year_size</KEYWORD3>
-			
-		</KEYWORDS>
-		
-	</RULES>
-
-</MODE>
-
- 	  	 
diff --git a/qpython/src/main/assets/syntax/smi_mib.xml b/qpython/src/main/assets/syntax/smi_mib.xml
deleted file mode 100644
index 90ce64e6..00000000
--- a/qpython/src/main/assets/syntax/smi_mib.xml
+++ /dev/null
@@ -1,131 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!--
-	SMI MIB mode by Scott Allen (scotta@idirect.com)
-	For "Structure of Management Information" version 2 (SMIv2)
-	    "Management Information Base" (MIB) modules as used by the
-	    "Simple Network Management Protocol" (SNMP).
-
-	As per RFC's 2578, 2579 and 2580
--->
-
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="lineComment" VALUE="--" />
-
-		<PROPERTY NAME="noWordSep" VALUE="-_" />
-
-		<!-- Auto indent -->
-		<PROPERTY NAME="indentOpenBrackets" VALUE="{" />
-		<PROPERTY NAME="indentCloseBrackets" VALUE="}" />
-		<PROPERTY NAME="unindentNextLines" VALUE=".*::=\s*\{.*\}\s*$" />
-		<PROPERTY NAME="indentNextLines"
-			VALUE=".*(::=|AGENT-CAPABILITIES|DESCRIPTION|IMPORTS|MODULE-COMPLIANCE|MODULE-IDENTITY|NOTIFICATION-GROUP|NOTIFICATION-TYPE|OBJECT-GROUP|OBJECT-IDENTITY|OBJECT-TYPE|TEXTUAL-CONVENTION)\s*$" />
-	</PROPS>
-
-	<RULES
-		IGNORE_CASE="FALSE"
-		HIGHLIGHT_DIGITS="TRUE">
-
-		<EOL_SPAN TYPE="COMMENT1">--</EOL_SPAN>
-
-		<SPAN TYPE="LITERAL1" NO_LINE_BREAK="FALSE">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-
-		<SEQ TYPE="OPERATOR">::=</SEQ>
-		<SEQ TYPE="OPERATOR">}</SEQ>
-		<SEQ TYPE="OPERATOR">{</SEQ>
-
-		<SEQ TYPE="KEYWORD2">OBJECT IDENTIFIER</SEQ>
-		<SEQ TYPE="KEYWORD2">SEQUENCE OF</SEQ>
-		<SEQ TYPE="KEYWORD2">OCTET STRING</SEQ>
-
-		<KEYWORDS>
-			<FUNCTION>AGENT-CAPABILITIES</FUNCTION>
-			<FUNCTION>BEGIN</FUNCTION>
-			<FUNCTION>END</FUNCTION>
-			<FUNCTION>FROM</FUNCTION>
-			<FUNCTION>IMPORTS</FUNCTION>
-			<FUNCTION>MODULE-COMPLIANCE</FUNCTION>
-			<FUNCTION>MODULE-IDENTITY</FUNCTION>
-			<FUNCTION>NOTIFICATION-GROUP</FUNCTION>
-			<FUNCTION>NOTIFICATION-TYPE</FUNCTION>
-			<FUNCTION>OBJECT-GROUP</FUNCTION>
-			<FUNCTION>OBJECT-IDENTITY</FUNCTION>
-			<FUNCTION>OBJECT-TYPE</FUNCTION>
-			<FUNCTION>TEXTUAL-CONVENTION</FUNCTION>
-
-			<KEYWORD1>ACCESS</KEYWORD1>
-			<KEYWORD1>AUGMENTS</KEYWORD1>
-			<KEYWORD1>CONTACT-INFO</KEYWORD1>
-			<KEYWORD1>CREATION-REQUIRES</KEYWORD1>
-			<KEYWORD1>DEFINITIONS</KEYWORD1>
-			<KEYWORD1>DEFVAL</KEYWORD1>
-			<KEYWORD1>DESCRIPTION</KEYWORD1>
-			<KEYWORD1>DISPLAY-HINT</KEYWORD1>
-			<KEYWORD1>GROUP</KEYWORD1>
-			<KEYWORD1>INCLUDES</KEYWORD1>
-			<KEYWORD1>INDEX</KEYWORD1>
-			<KEYWORD1>LAST-UPDATED</KEYWORD1>
-			<KEYWORD1>MANDATORY-GROUPS</KEYWORD1>
-			<KEYWORD1>MAX-ACCESS</KEYWORD1>
-			<KEYWORD1>MIN-ACCESS</KEYWORD1>
-			<KEYWORD1>MODULE</KEYWORD1>
-			<KEYWORD1>NOTIFICATIONS</KEYWORD1>
-			<KEYWORD1>OBJECT</KEYWORD1>
-			<KEYWORD1>OBJECTS</KEYWORD1>
-			<KEYWORD1>ORGANIZATION</KEYWORD1>
-			<KEYWORD1>PRODUCT-RELEASE</KEYWORD1>
-			<KEYWORD1>REFERENCE</KEYWORD1>
-			<KEYWORD1>REVISION</KEYWORD1>
-			<KEYWORD1>STATUS</KEYWORD1>
-			<KEYWORD1>SYNTAX</KEYWORD1>
-			<KEYWORD1>SUPPORTS</KEYWORD1>
-			<KEYWORD1>UNITS</KEYWORD1>
-			<KEYWORD1>VARIATION</KEYWORD1>
-			<KEYWORD1>WRITE-SYNTAX</KEYWORD1>
-
-			<KEYWORD2>AutonomousType</KEYWORD2>
-			<KEYWORD2>BITS</KEYWORD2>
-			<KEYWORD2>Counter32</KEYWORD2>
-			<KEYWORD2>Counter64</KEYWORD2>
-			<KEYWORD2>DateAndTime</KEYWORD2>
-			<KEYWORD2>DisplayString</KEYWORD2>
-			<KEYWORD2>Gauge32</KEYWORD2>
-			<KEYWORD2>InstancePointer</KEYWORD2>
-			<KEYWORD2>INTEGER</KEYWORD2>
-			<KEYWORD2>Integer32</KEYWORD2>
-			<KEYWORD2>IpAddress</KEYWORD2>
-			<KEYWORD2>MacAddress</KEYWORD2>
-			<KEYWORD2>Opaque</KEYWORD2>
-			<KEYWORD2>PhysAddress</KEYWORD2>
-			<KEYWORD2>RowPointer</KEYWORD2>
-			<KEYWORD2>RowStatus</KEYWORD2>
-			<KEYWORD2>SEQUENCE</KEYWORD2>
-			<KEYWORD2>TAddress</KEYWORD2>
-			<KEYWORD2>TDomain</KEYWORD2>
-			<KEYWORD2>TestAndIncr</KEYWORD2>
-			<KEYWORD2>TimeInterval</KEYWORD2>
-			<KEYWORD2>TimeStamp</KEYWORD2>
-			<KEYWORD2>TimeTicks</KEYWORD2>
-			<KEYWORD2>TruthValue</KEYWORD2>
-			<KEYWORD2>StorageType</KEYWORD2>
-			<KEYWORD2>Unsigned32</KEYWORD2>
-			<KEYWORD2>VariablePointer</KEYWORD2>
-
-			<KEYWORD3>accessible-for-notify</KEYWORD3>
-			<KEYWORD3>current</KEYWORD3>
-			<KEYWORD3>deprecated</KEYWORD3>
-			<KEYWORD3>not-accessible</KEYWORD3>
-			<KEYWORD3>obsolete</KEYWORD3>
-			<KEYWORD3>read-create</KEYWORD3>
-			<KEYWORD3>read-only</KEYWORD3>
-			<KEYWORD3>read-write</KEYWORD3>
-			<KEYWORD3>SIZE</KEYWORD3>
-		</KEYWORDS>
-	</RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/splus.xml b/qpython/src/main/assets/syntax/splus.xml
deleted file mode 100644
index 95f32f62..00000000
--- a/qpython/src/main/assets/syntax/splus.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="lineComment" VALUE="#"/>
-		<PROPERTY NAME="wordBreakChars" VALUE="_,+-=&lt;&gt;/?^&amp;*"/>
-
-		<!-- Auto indent -->
-		<PROPERTY NAME="indentOpenBrackets" VALUE="{"/>
-		<PROPERTY NAME="indentCloseBrackets" VALUE="}"/>
-		<PROPERTY NAME="indentNextLine"
-			  VALUE="\s*(((if|while)\s*\(|else\s*|else\s+if\s*\(|for\s*\(.*\))[^{;]*)"/>
-		<!-- set this to 'true' if you want to use GNU coding style -->
-		<PROPERTY NAME="doubleBracketIndent" VALUE="false"/>
-		<PROPERTY NAME="contextInsensitive" VALUE="true"/>
-	</PROPS>
-	<RULES IGNORE_CASE="FALSE"
-	       HIGHLIGHT_DIGITS="TRUE"
-	       DIGIT_RE="(0x[\p{XDigit}]+[lL]?|[\p{Digit}]+(e[\p{Digit}]*)?[lLdDfF]?)">
-
-		<SPAN TYPE="LITERAL1" ESCAPE="\" NO_LINE_BREAK="TRUE">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-		<SPAN TYPE="LITERAL1" ESCAPE="\" NO_LINE_BREAK="TRUE">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-
-		<EOL_SPAN TYPE="COMMENT1">#</EOL_SPAN>
-		<SEQ TYPE="OPERATOR">=</SEQ>
-		<SEQ TYPE="OPERATOR">!</SEQ>
-		<SEQ TYPE="OPERATOR">_</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;=</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;=</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;-</SEQ>
-		<SEQ TYPE="OPERATOR">+</SEQ>
-		<SEQ TYPE="OPERATOR">-</SEQ>
-		<SEQ TYPE="OPERATOR">/</SEQ>
-
-		<SEQ TYPE="OPERATOR">*</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;</SEQ>
-		<SEQ TYPE="OPERATOR">%</SEQ>
-		<SEQ TYPE="OPERATOR">&amp;</SEQ>
-		<SEQ TYPE="OPERATOR">|</SEQ>
-		<SEQ TYPE="OPERATOR">^</SEQ>
-		<SEQ TYPE="OPERATOR">~</SEQ>
-		<SEQ TYPE="OPERATOR">}</SEQ>
-		<SEQ TYPE="OPERATOR">{</SEQ>
-		<MARK_PREVIOUS AT_WHITESPACE_END="TRUE"
-			       MATCH_TYPE="OPERATOR"
-			       TYPE="LABEL">:
-		</MARK_PREVIOUS>
-
-		<!-- Function calls -->
-		<MARK_PREVIOUS TYPE="FUNCTION" MATCH_TYPE="OPERATOR">(</MARK_PREVIOUS>
-		<SEQ TYPE="OPERATOR">)</SEQ>
-
-		<KEYWORDS>
-			<KEYWORD1>break</KEYWORD1>
-			<KEYWORD1>case</KEYWORD1>
-			<KEYWORD1>continue</KEYWORD1>
-			<KEYWORD1>default</KEYWORD1>
-			<KEYWORD1>do</KEYWORD1>
-			<KEYWORD1>else</KEYWORD1>
-			<KEYWORD1>for</KEYWORD1>
-			<KEYWORD1>goto</KEYWORD1>
-			<KEYWORD1>if</KEYWORD1>
-			<KEYWORD1>return</KEYWORD1>
-			<KEYWORD1>sizeof</KEYWORD1>
-			<KEYWORD1>switch</KEYWORD1>
-			<KEYWORD1>while</KEYWORD1>
-
-			<KEYWORD1>function</KEYWORD1>
-
-			<LITERAL2>T</LITERAL2>
-			<LITERAL2>F</LITERAL2>
-		</KEYWORDS>
-	</RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/sql_loader.xml b/qpython/src/main/assets/syntax/sql_loader.xml
deleted file mode 100644
index 43b3be57..00000000
--- a/qpython/src/main/assets/syntax/sql_loader.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="commentStart" VALUE="/*" />
-		<PROPERTY NAME="commentEnd" VALUE="*/" />
-		<PROPERTY NAME="lineComment" VALUE="--" />
-	</PROPS>
-	<RULES IGNORE_CASE="TRUE" HIGHLIGHT_DIGITS="TRUE">
-		<SPAN TYPE="COMMENT1">
-			<BEGIN>/*</BEGIN>
-			<END>*/</END>
-		</SPAN>
-		<SPAN TYPE="LITERAL1">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-		<SPAN DELEGATE="pl-sql::MAIN">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-		<EOL_SPAN TYPE="COMMENT1">--</EOL_SPAN>
-		<SEQ TYPE="OPERATOR">+</SEQ>
-		<SEQ TYPE="OPERATOR">-</SEQ>
-		<SEQ TYPE="OPERATOR">/</SEQ>
-		<SEQ TYPE="OPERATOR">*</SEQ>
-		<SEQ TYPE="OPERATOR">=</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;</SEQ>
-		<SEQ TYPE="OPERATOR">%</SEQ>
-		<SEQ TYPE="OPERATOR">&amp;</SEQ>
-		<SEQ TYPE="OPERATOR">|</SEQ>
-		<SEQ TYPE="OPERATOR">^</SEQ>
-		<SEQ TYPE="OPERATOR">~</SEQ>
-		<SEQ TYPE="OPERATOR">!=</SEQ>
-		<SEQ TYPE="OPERATOR">!&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">!&lt;</SEQ>
-		<SEQ TYPE="OPERATOR">:=</SEQ>
-        
-		<KEYWORDS>
-			<!-- reserved words -->
-			<KEYWORD1>LOAD</KEYWORD1>
-			<KEYWORD1>DATA</KEYWORD1>
-			<KEYWORD1>INFILE</KEYWORD1>
-			<KEYWORD1>BADFILE</KEYWORD1>
-			<KEYWORD1>DISCARDFILE</KEYWORD1>
-			<KEYWORD1>INTO</KEYWORD1>
-			<KEYWORD1>TABLE</KEYWORD1>
-			<KEYWORD1>FIELDS</KEYWORD1>
-			<KEYWORD1>TERMINATED</KEYWORD1>
-			<KEYWORD1>BY</KEYWORD1>
-			<KEYWORD1>OPTIONALLY</KEYWORD1>
-			<KEYWORD1>ENCLOSED</KEYWORD1>
-			<KEYWORD1>EXTERNAL</KEYWORD1>
-			<KEYWORD1>TRAILING</KEYWORD1>
-			<KEYWORD1>NULLCOLS</KEYWORD1>
-			<KEYWORD1>NULLIF</KEYWORD1>
-			<KEYWORD1>DATA</KEYWORD1>
-			<KEYWORD1>BLANKS</KEYWORD1>
-			<KEYWORD1>INSERT</KEYWORD1>
-			<KEYWORD1>INTO</KEYWORD1>
-			<KEYWORD1>POSITION</KEYWORD1>
-			<KEYWORD1>WHEN</KEYWORD1>
-			<KEYWORD1>APPEND</KEYWORD1>
-			<KEYWORD1>REPLACE</KEYWORD1>
-			<KEYWORD1>EOF</KEYWORD1>
-			<KEYWORD1>LOBFILE</KEYWORD1>
-			<KEYWORD1>TRUNCATE</KEYWORD1>
-			<KEYWORD1>COLUMN</KEYWORD1>
-            
-            <!--function-->
-			<KEYWORD1>COUNT</KEYWORD1>
-			<KEYWORD1>AND</KEYWORD1>
-			<KEYWORD1>SDF</KEYWORD1>
-			<KEYWORD1>OR</KEYWORD1>
-			<KEYWORD1>SYSDATE</KEYWORD1>
-
-			<!-- data types -->
-			<KEYWORD1>binary</KEYWORD1>
-			<KEYWORD1>bit</KEYWORD1>
-			<KEYWORD1>blob</KEYWORD1>
-			<KEYWORD1>boolean</KEYWORD1>
-			<KEYWORD1>char</KEYWORD1>
-			<KEYWORD1>character</KEYWORD1>
-			<KEYWORD1>constant</KEYWORD1>
-			<KEYWORD1>date</KEYWORD1>
-			<KEYWORD1>datetime</KEYWORD1>
-			<KEYWORD1>decimal</KEYWORD1>
-			<KEYWORD1>double</KEYWORD1>
-			<KEYWORD1>filler</KEYWORD1>
-			<KEYWORD1>float</KEYWORD1>
-			<KEYWORD1>image</KEYWORD1>
-			<KEYWORD1>int</KEYWORD1>
-			<KEYWORD1>integer</KEYWORD1>
-			<KEYWORD1>money</KEYWORD1>
-			<!-- KEYWORD1>name</KEYWORD1 -->
-			<KEYWORD1>numeric</KEYWORD1>
-			<KEYWORD1>nchar</KEYWORD1>
-			<KEYWORD1>nvarchar</KEYWORD1>
-			<KEYWORD1>ntext</KEYWORD1>
-			<KEYWORD1>object</KEYWORD1>
-			<KEYWORD1>pls_integer</KEYWORD1>
-			<KEYWORD1>raw</KEYWORD1>
-			<KEYWORD1>real</KEYWORD1>
-			<KEYWORD1>smalldatetime</KEYWORD1>
-			<KEYWORD1>smallint</KEYWORD1>
-			<KEYWORD1>smallmoney</KEYWORD1>
-			<KEYWORD1>sequence</KEYWORD1>
-			<KEYWORD1>text</KEYWORD1>
-			<KEYWORD1>timestamp</KEYWORD1>
-			<KEYWORD1>tinyint</KEYWORD1>
-			<KEYWORD1>uniqueidentifier</KEYWORD1>
-			<KEYWORD1>varbinary</KEYWORD1>
-			<KEYWORD1>varchar</KEYWORD1>
-			<KEYWORD1>varchar2</KEYWORD1>
-			<KEYWORD1>varray</KEYWORD1>
-			<KEYWORD1>zoned</KEYWORD1>
-		</KEYWORDS>
-	</RULES>
-</MODE>
-
- 	  	 
diff --git a/qpython/src/main/assets/syntax/sqr.xml b/qpython/src/main/assets/syntax/sqr.xml
deleted file mode 100644
index b244babd..00000000
--- a/qpython/src/main/assets/syntax/sqr.xml
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!-- SQR Mode by Richard F. Ashwell III  -->
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="lineComment" VALUE="!" />
-		<PROPERTY NAME="contextInsensitive" VALUE="true" />
-	</PROPS>
-
-	<RULES IGNORE_CASE="TRUE" HIGHLIGHT_DIGITS="TRUE">
-		<!-- Normal comments. -->
-		<EOL_SPAN TYPE="COMMENT1">!</EOL_SPAN>
-
-		<!-- Literal String -->	
-		<SPAN TYPE="LABEL" NO_LINE_BREAK="TRUE">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>	
-
-		<!-- SQR Replacement String -->			
-		<SPAN TYPE="LABEL" NO_LINE_BREAK="TRUE">
-			<BEGIN>[</BEGIN>
-			<END>]</END>
-		</SPAN>	
-		
-		<SEQ TYPE="OPERATOR">^</SEQ>
-		<SEQ TYPE="OPERATOR">@</SEQ>
-		<SEQ TYPE="OPERATOR">:=</SEQ>
-		<SEQ TYPE="OPERATOR">=</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;=</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;=</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;</SEQ>
-		<SEQ TYPE="OPERATOR">+</SEQ>
-		<SEQ TYPE="OPERATOR">/</SEQ>
-		<SEQ TYPE="OPERATOR">*</SEQ>
-		
-		<MARK_FOLLOWING TYPE="LITERAL1">$</MARK_FOLLOWING>
-		<MARK_FOLLOWING TYPE="LITERAL2">#</MARK_FOLLOWING>
-		<MARK_FOLLOWING TYPE="MARKUP">&amp;</MARK_FOLLOWING>
-
-		<KEYWORDS>
-			<!-- Section KeyWords -->
-			<FUNCTION>begin-procedure</FUNCTION> 			 
-			<FUNCTION>end-procedure</FUNCTION>			
-			<FUNCTION>begin-report</FUNCTION>
-			<FUNCTION>end-report</FUNCTION>
-			<FUNCTION>begin-heading</FUNCTION>
-			<FUNCTION>end-heading</FUNCTION>
-			<FUNCTION>begin-setup</FUNCTION>
-			<FUNCTION>end-setup</FUNCTION>
-			<FUNCTION>begin-footing</FUNCTION>
-			<FUNCTION>end-footing</FUNCTION>
-			<FUNCTION>begin-program</FUNCTION>
-			<FUNCTION>end-program</FUNCTION>
-
-			<!-- Block Keywords -->
-			<KEYWORD1>begin-select</KEYWORD1>
-			<KEYWORD1>end-select</KEYWORD1>
-			<KEYWORD1>begin-sql</KEYWORD1>
-			<KEYWORD1>end-sql</KEYWORD1>
-			
-			<!-- SQR Functional Keywords -->
-			<KEYWORD2>add</KEYWORD2> 
-			<KEYWORD2>array-add</KEYWORD2> 
-			<KEYWORD2>array-divide</KEYWORD2> 
-			<KEYWORD2>array-multiply</KEYWORD2> 
-			<KEYWORD2>array-subtract</KEYWORD2> 
-			<KEYWORD2>ask</KEYWORD2>
-			<KEYWORD2>break</KEYWORD2>
-			<KEYWORD2>call</KEYWORD2> 
-			<KEYWORD2>clear-array</KEYWORD2> 
-			<KEYWORD2>close</KEYWORD2> 
-			<KEYWORD2>columns</KEYWORD2> 
-			<KEYWORD2>commit</KEYWORD2> 
-			<KEYWORD2>concat</KEYWORD2> 
-			<KEYWORD2>connect</KEYWORD2> 
-			<KEYWORD2>create-array</KEYWORD2>
-			<KEYWORD2>date-time</KEYWORD2> 
-			<KEYWORD2>display</KEYWORD2> 
-			<KEYWORD2>divide</KEYWORD2> 
-			<KEYWORD2>do</KEYWORD2> 
-			<KEYWORD2>dollar-symbol</KEYWORD2>
-			<KEYWORD2>else</KEYWORD2> 
-			<KEYWORD2>encode</KEYWORD2> 
-			<KEYWORD2>end-evaluate</KEYWORD2> 
-			<KEYWORD2>end-if</KEYWORD2> 
-			<KEYWORD2>end-while</KEYWORD2> 
-			<KEYWORD2>evaluate</KEYWORD2> 
-			<KEYWORD2>execute</KEYWORD2> 
-			<KEYWORD2>extract</KEYWORD2>
-			<KEYWORD2>find</KEYWORD2> 
-			<KEYWORD2>font</KEYWORD2>
-			<KEYWORD2>get</KEYWORD2> 
-			<KEYWORD2>goto</KEYWORD2> 
-			<KEYWORD2>graphic</KEYWORD2>
-			<KEYWORD2>if</KEYWORD2>
-			<KEYWORD2>last-page</KEYWORD2> 
-			<KEYWORD2>let</KEYWORD2> 
-			<KEYWORD2>lookup</KEYWORD2> 
-			<KEYWORD2>lowercase</KEYWORD2>
-			<KEYWORD2>money-symbol</KEYWORD2> 
-			<KEYWORD2>move</KEYWORD2> 
-			<KEYWORD2>multiply</KEYWORD2>
-			<KEYWORD2>new-page</KEYWORD2> 
-			<KEYWORD2>new-report</KEYWORD2> 
-			<KEYWORD2>next-column</KEYWORD2> 
-			<KEYWORD2>next-listing</KEYWORD2> 
-			<KEYWORD2>no-formfeed</KEYWORD2>
-			<KEYWORD2>open</KEYWORD2>
-			<KEYWORD2>page-number</KEYWORD2> 
-			<KEYWORD2>page-size</KEYWORD2> 
-			<KEYWORD2>position</KEYWORD2> 
-			<KEYWORD2>print</KEYWORD2> 
-			<KEYWORD2>print-bar-code</KEYWORD2> 
-			<KEYWORD2>print-chart</KEYWORD2> 
-			<KEYWORD2>print-direct</KEYWORD2> 
-			<KEYWORD2>print-image</KEYWORD2> 
-			<KEYWORD2>printer-deinit</KEYWORD2> 
-			<KEYWORD2>printer-init</KEYWORD2> 
-			<KEYWORD2>put</KEYWORD2>
-			<KEYWORD2>read</KEYWORD2> 
-			<KEYWORD2>rollback</KEYWORD2>
-			<KEYWORD2>show</KEYWORD2> 
-			<KEYWORD2>stop</KEYWORD2> 
-			<KEYWORD2>string</KEYWORD2> 
-			<KEYWORD2>subtract</KEYWORD2>
-			<KEYWORD2>unstring</KEYWORD2> 
-			<KEYWORD2>uppercase</KEYWORD2> 
-			<KEYWORD2>use</KEYWORD2> 
-			<KEYWORD2>use-column</KEYWORD2> 
-			<KEYWORD2>use-printer-type</KEYWORD2> 
-			<KEYWORD2>use-procedure</KEYWORD2> 
-			<KEYWORD2>use-report</KEYWORD2> 
-			<KEYWORD2>use-report</KEYWORD2>
-			<KEYWORD2>while</KEYWORD2> 
-			<KEYWORD2>write</KEYWORD2>
-			<KEYWORD2>to</KEYWORD2>
-
-			<!-- SQL Keywords -->
- 			<KEYWORD3>from</KEYWORD3>
-			<KEYWORD3>where</KEYWORD3>
-			<KEYWORD3>and</KEYWORD3>
-			<KEYWORD3>between</KEYWORD3>
-			<KEYWORD3>or</KEYWORD3>
-			<KEYWORD3>in</KEYWORD3>
-			
-		</KEYWORDS>
-	</RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/squidconf.xml b/qpython/src/main/assets/syntax/squidconf.xml
deleted file mode 100644
index 4b450da6..00000000
--- a/qpython/src/main/assets/syntax/squidconf.xml
+++ /dev/null
@@ -1,228 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!-- Highlighting for squid.conf by Kris Kopicki (29/11/2003). For squid 2.5-stable -->
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="lineComment" VALUE="#"/>
-		<PROPERTY NAME="contextInsensitive" VALUE="true" />
-	</PROPS>
-	<RULES IGNORE_CASE="FALSE" HIGHLIGHT_DIGITS="TRUE">
-		<!-- Comment -->
-		<EOL_SPAN TYPE="COMMENT1">#</EOL_SPAN>
-
-		<KEYWORDS>
-			<KEYWORD1>http_port</KEYWORD1>
-			<KEYWORD1>https_port</KEYWORD1>
-			<KEYWORD1>ssl_unclean_shutdown</KEYWORD1>
-			<KEYWORD1>icp_port</KEYWORD1>
-			<KEYWORD1>htcp_port</KEYWORD1>
-			<KEYWORD1>mcast_groups</KEYWORD1>
-			<KEYWORD1>udp_incoming_address</KEYWORD1>
-			<KEYWORD1>udp_outgoing_address</KEYWORD1>
-			<KEYWORD1>cache_peer</KEYWORD1>
-			<KEYWORD1>cache_peer_domain</KEYWORD1>
-			<KEYWORD1>neighbor_type_domain</KEYWORD1>
-			<KEYWORD1>icp_query_timeout</KEYWORD1>
-			<KEYWORD1>maximum_icp_query_timeout</KEYWORD1>
-			<KEYWORD1>mcast_icp_query_timeout</KEYWORD1>
-			<KEYWORD1>dead_peer_timeout</KEYWORD1>
-			<KEYWORD1>hierarchy_stoplist</KEYWORD1>
-			<KEYWORD1>no_cache</KEYWORD1>
-			<KEYWORD1>cache_mem</KEYWORD1>
-			<KEYWORD1>cache_swap_low</KEYWORD1>
-			<KEYWORD1>cache_swap_high</KEYWORD1>
-			<KEYWORD1>maximum_object_size</KEYWORD1>
-			<KEYWORD1>minimum_object_size</KEYWORD1>
-			<KEYWORD1>maximum_object_size_in_memory</KEYWORD1>
-			<KEYWORD1>ipcache_size</KEYWORD1>
-			<KEYWORD1>ipcache_low</KEYWORD1>
-			<KEYWORD1>ipcache_high</KEYWORD1>
-			<KEYWORD1>fqdncache_size</KEYWORD1>
-			<KEYWORD1>cache_replacement_policy</KEYWORD1>
-			<KEYWORD1>memory_replacement_policy</KEYWORD1>
-			<KEYWORD1>cache_dir</KEYWORD1>
-			<KEYWORD1>cache_access_log</KEYWORD1>
-			<KEYWORD1>cache_log</KEYWORD1>
-			<KEYWORD1>cache_store_log</KEYWORD1>
-			<KEYWORD1>cache_swap_log</KEYWORD1>
-			<KEYWORD1>emulate_httpd_log</KEYWORD1>
-			<KEYWORD1>log_ip_on_direct</KEYWORD1>
-			<KEYWORD1>mime_table</KEYWORD1>
-			<KEYWORD1>log_mime_hdrs</KEYWORD1>
-			<KEYWORD1>useragent_log</KEYWORD1>
-			<KEYWORD1>referer_log</KEYWORD1>
-			<KEYWORD1>pid_filename</KEYWORD1>
-			<KEYWORD1>debug_options</KEYWORD1>
-			<KEYWORD1>log_fqdn</KEYWORD1>
-			<KEYWORD1>client_netmask</KEYWORD1>
-			<KEYWORD1>ftp_user</KEYWORD1>
-			<KEYWORD1>ftp_list_width</KEYWORD1>
-			<KEYWORD1>ftp_passive</KEYWORD1>
-			<KEYWORD1>ftp_sanitycheck</KEYWORD1>
-			<KEYWORD1>cache_dns_program</KEYWORD1>
-			<KEYWORD1>dns_children</KEYWORD1>
-			<KEYWORD1>dns_retransmit_interval</KEYWORD1>
-			<KEYWORD1>dns_timeout</KEYWORD1>
-			<KEYWORD1>dns_defnames</KEYWORD1>
-			<KEYWORD1>dns_nameservers</KEYWORD1>
-			<KEYWORD1>hosts_file</KEYWORD1>
-			<KEYWORD1>diskd_program</KEYWORD1>
-			<KEYWORD1>unlinkd_program</KEYWORD1>
-			<KEYWORD1>pinger_program</KEYWORD1>
-			<KEYWORD1>redirect_program</KEYWORD1>
-			<KEYWORD1>redirect_children</KEYWORD1>
-			<KEYWORD1>redirect_rewrites_host_header</KEYWORD1>
-			<KEYWORD1>redirector_access</KEYWORD1>
-			<KEYWORD1>auth_param</KEYWORD1>
-			<KEYWORD1>authenticate_cache_garbage_interval</KEYWORD1>
-			<KEYWORD1>authenticate_ttl</KEYWORD1>
-			<KEYWORD1>authenticate_ip_ttl</KEYWORD1>
-			<KEYWORD1>external_acl_type</KEYWORD1>
-			<KEYWORD1>wais_relay_host</KEYWORD1>
-			<KEYWORD1>wais_relay_port</KEYWORD1>
-			<KEYWORD1>request_header_max_size</KEYWORD1>
-			<KEYWORD1>request_body_max_size</KEYWORD1>
-			<KEYWORD1>refresh_pattern</KEYWORD1>
-			<KEYWORD1>quick_abort_min</KEYWORD1>
-			<KEYWORD1>quick_abort_max</KEYWORD1>
-			<KEYWORD1>quick_abort_pct</KEYWORD1>
-			<KEYWORD1>negative_ttl</KEYWORD1>
-			<KEYWORD1>positive_dns_ttl</KEYWORD1>
-			<KEYWORD1>negative_dns_ttl</KEYWORD1>
-			<KEYWORD1>range_offset_limit</KEYWORD1>
-			<KEYWORD1>connect_timeout</KEYWORD1>
-			<KEYWORD1>peer_connect_timeout</KEYWORD1>
-			<KEYWORD1>read_timeout</KEYWORD1>
-			<KEYWORD1>request_timeout</KEYWORD1>
-			<KEYWORD1>persistent_request_timeout</KEYWORD1>
-			<KEYWORD1>client_lifetime</KEYWORD1>
-			<KEYWORD1>half_closed_clients</KEYWORD1>
-			<KEYWORD1>pconn_timeout</KEYWORD1>
-			<KEYWORD1>ident_timeout</KEYWORD1>
-			<KEYWORD1>shutdown_lifetime</KEYWORD1>
-			<KEYWORD1>acl</KEYWORD1>
-			<KEYWORD1>http_access</KEYWORD1>
-			<KEYWORD1>http_reply_access</KEYWORD1>
-			<KEYWORD1>icp_access</KEYWORD1>
-			<KEYWORD1>miss_access</KEYWORD1>
-			<KEYWORD1>cache_peer_access</KEYWORD1>
-			<KEYWORD1>ident_lookup_access</KEYWORD1>
-			<KEYWORD1>tcp_outgoing_tos</KEYWORD1>
-			<KEYWORD1>tcp_outgoing_address</KEYWORD1>
-			<KEYWORD1>reply_body_max_size</KEYWORD1>
-			<KEYWORD1>cache_mgr</KEYWORD1>
-			<KEYWORD1>cache_effective_user</KEYWORD1>
-			<KEYWORD1>cache_effective_group</KEYWORD1>
-			<KEYWORD1>visible_hostname</KEYWORD1>
-			<KEYWORD1>unique_hostname</KEYWORD1>
-			<KEYWORD1>hostname_aliases</KEYWORD1>
-			<KEYWORD1>announce_period</KEYWORD1>
-			<KEYWORD1>announce_host</KEYWORD1>
-			<KEYWORD1>announce_file</KEYWORD1>
-			<KEYWORD1>announce_port</KEYWORD1>
-			<KEYWORD1>httpd_accel_host</KEYWORD1>
-			<KEYWORD1>httpd_accel_port</KEYWORD1>
-			<KEYWORD1>httpd_accel_single_host</KEYWORD1>
-			<KEYWORD1>httpd_accel_with_proxy</KEYWORD1>
-			<KEYWORD1>httpd_accel_uses_host_header</KEYWORD1>
-			<KEYWORD1>dns_testnames</KEYWORD1>
-			<KEYWORD1>logfile_rotate</KEYWORD1>
-			<KEYWORD1>append_domain</KEYWORD1>
-			<KEYWORD1>tcp_recv_bufsize</KEYWORD1>
-			<KEYWORD1>err_html_text</KEYWORD1>
-			<KEYWORD1>deny_info</KEYWORD1>
-			<KEYWORD1>memory_pools</KEYWORD1>
-			<KEYWORD1>memory_pools_limit</KEYWORD1>
-			<KEYWORD1>forwarded_for</KEYWORD1>
-			<KEYWORD1>log_icp_queries</KEYWORD1>
-			<KEYWORD1>icp_hit_stale</KEYWORD1>
-			<KEYWORD1>minimum_direct_hops</KEYWORD1>
-			<KEYWORD1>minimum_direct_rtt</KEYWORD1>
-			<KEYWORD1>cachemgr_passwd</KEYWORD1>
-			<KEYWORD1>store_avg_object_size</KEYWORD1>
-			<KEYWORD1>store_objects_per_bucket</KEYWORD1>
-			<KEYWORD1>client_db</KEYWORD1>
-			<KEYWORD1>netdb_low</KEYWORD1>
-			<KEYWORD1>netdb_high</KEYWORD1>
-			<KEYWORD1>netdb_ping_period</KEYWORD1>
-			<KEYWORD1>query_icmp</KEYWORD1>
-			<KEYWORD1>test_reachability</KEYWORD1>
-			<KEYWORD1>buffered_logs</KEYWORD1>
-			<KEYWORD1>reload_into_ims</KEYWORD1>
-			<KEYWORD1>always_direct</KEYWORD1>
-			<KEYWORD1>never_direct</KEYWORD1>
-			<KEYWORD1>header_access</KEYWORD1>
-			<KEYWORD1>header_replace</KEYWORD1>
-			<KEYWORD1>icon_directory</KEYWORD1>
-			<KEYWORD1>error_directory</KEYWORD1>
-			<KEYWORD1>maximum_single_addr_tries</KEYWORD1>
-			<KEYWORD1>snmp_port</KEYWORD1>
-			<KEYWORD1>snmp_access</KEYWORD1>
-			<KEYWORD1>snmp_incoming_address</KEYWORD1>
-			<KEYWORD1>snmp_outgoing_address</KEYWORD1>
-			<KEYWORD1>as_whois_server</KEYWORD1>
-			<KEYWORD1>wccp_router</KEYWORD1>
-			<KEYWORD1>wccp_version</KEYWORD1>
-			<KEYWORD1>wccp_incoming_address</KEYWORD1>
-			<KEYWORD1>wccp_outgoing_address</KEYWORD1>
-			<KEYWORD1>delay_pools</KEYWORD1>
-			<KEYWORD1>delay_class</KEYWORD1>
-			<KEYWORD1>delay_access</KEYWORD1>
-			<KEYWORD1>delay_parameters</KEYWORD1>
-			<KEYWORD1>delay_initial_bucket_level</KEYWORD1>
-			<KEYWORD1>incoming_icp_average</KEYWORD1>
-			<KEYWORD1>incoming_http_average</KEYWORD1>
-			<KEYWORD1>incoming_dns_average</KEYWORD1>
-			<KEYWORD1>min_icp_poll_cnt</KEYWORD1>
-			<KEYWORD1>min_dns_poll_cnt</KEYWORD1>
-			<KEYWORD1>min_http_poll_cnt</KEYWORD1>
-			<KEYWORD1>max_open_disk_fds</KEYWORD1>
-			<KEYWORD1>offline_mode</KEYWORD1>
-			<KEYWORD1>uri_whitespace</KEYWORD1>
-			<KEYWORD1>broken_posts</KEYWORD1>
-			<KEYWORD1>mcast_miss_addr</KEYWORD1>
-			<KEYWORD1>mcast_miss_ttl</KEYWORD1>
-			<KEYWORD1>mcast_miss_port</KEYWORD1>
-			<KEYWORD1>mcast_miss_encode_key</KEYWORD1>
-			<KEYWORD1>nonhierarchical_direct</KEYWORD1>
-			<KEYWORD1>prefer_direct</KEYWORD1>
-			<KEYWORD1>strip_query_terms</KEYWORD1>
-			<KEYWORD1>coredump_dir</KEYWORD1>
-			<KEYWORD1>redirector_bypass</KEYWORD1>
-			<KEYWORD1>ignore_unknown_nameservers</KEYWORD1>
-			<KEYWORD1>digest_generation</KEYWORD1>
-			<KEYWORD1>digest_bits_per_entry</KEYWORD1>
-			<KEYWORD1>digest_rebuild_period</KEYWORD1>
-			<KEYWORD1>digest_rewrite_period</KEYWORD1>
-			<KEYWORD1>digest_swapout_chunk_size</KEYWORD1>
-			<KEYWORD1>digest_rebuild_chunk_percentage</KEYWORD1>
-			<KEYWORD1>chroot</KEYWORD1>
-			<KEYWORD1>client_persistent_connections</KEYWORD1>
-			<KEYWORD1>server_persistent_connections</KEYWORD1>
-			<KEYWORD1>pipeline_prefetch</KEYWORD1>
-			<KEYWORD1>extension_methods</KEYWORD1>
-			<KEYWORD1>request_entities</KEYWORD1>
-			<KEYWORD1>high_response_time_warning</KEYWORD1>
-			<KEYWORD1>high_page_fault_warning</KEYWORD1>
-			<KEYWORD1>high_memory_warning</KEYWORD1>
-			<KEYWORD1>store_dir_select_algorithm</KEYWORD1>
-			<KEYWORD1>forward_log</KEYWORD1>
-			<KEYWORD1>ie_refresh</KEYWORD1>
-			<KEYWORD1>vary_ignore_expire</KEYWORD1>
-			<KEYWORD1>sleep_after_fork</KEYWORD1>
-
-			<KEYWORD2>dst</KEYWORD2>
-			<KEYWORD2>src</KEYWORD2>
-			<KEYWORD2>method</KEYWORD2>
-			<KEYWORD2>port</KEYWORD2>
-			<KEYWORD2>proxy_auth</KEYWORD2>
-
-			<LITERAL2>on</LITERAL2>
-			<LITERAL2>off</LITERAL2>
-			<LITERAL2>allow</LITERAL2>
-			<LITERAL2>deny</LITERAL2>
-		</KEYWORDS>
-	</RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/ssharp.xml b/qpython/src/main/assets/syntax/ssharp.xml
deleted file mode 100644
index 89ad5db9..00000000
--- a/qpython/src/main/assets/syntax/ssharp.xml
+++ /dev/null
@@ -1,145 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!-- S# mode, by Barry Carr (Ixian Software Components Ltd)
-     based on Marcio Marchini mqm@magma.ca Smalltalk mode -->
-
-<MODE>
-	<PROPS>
-        <PROPERTY NAME="lineComment" VALUE="#" />
-		<PROPERTY NAME="commentStart" VALUE="&quot;" />
-		<PROPERTY NAME="commentEnd" VALUE="&quot;" />
-		<PROPERTY NAME="indentOpenBrackets" VALUE="[" />
-		<PROPERTY NAME="indentCloseBrackets" VALUE="]" />
-
-	</PROPS>
-	<RULES IGNORE_CASE="FALSE" HIGHLIGHT_DIGITS="TRUE">
-		<!-- Standard literals -->
-		<SPAN TYPE="LITERAL1" ESCAPE="\" NO_LINE_BREAK="FALSE">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-
-        <EOL_SPAN TYPE="COMMENT3">#</EOL_SPAN>
-        <EOL_SPAN TYPE="COMMENT2">""</EOL_SPAN>
-
-		<SPAN TYPE="COMMENT1">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-
-        <SPAN TYPE="LITERAL2" ESCAPE="\">
-            <BEGIN>«</BEGIN>
-            <END>»</END>
-        </SPAN>
-
-        <SEQ TYPE="OPERATOR">(</SEQ>
-        <SEQ TYPE="OPERATOR">)</SEQ>
-        <SEQ TYPE="OPERATOR">{</SEQ>
-        <SEQ TYPE="OPERATOR">}</SEQ>
-		<SEQ TYPE="OPERATOR">:=</SEQ>
-		<SEQ TYPE="OPERATOR">_</SEQ>
-		<SEQ TYPE="OPERATOR">=</SEQ>
-		<SEQ TYPE="OPERATOR">==</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;=</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;=</SEQ>
-		<SEQ TYPE="OPERATOR">+</SEQ>
-		<SEQ TYPE="OPERATOR">-</SEQ>
-		<SEQ TYPE="OPERATOR">/</SEQ>
-        <SEQ TYPE="OPERATOR">//</SEQ>
-        <SEQ TYPE="OPERATOR">\\</SEQ>
-		<SEQ TYPE="OPERATOR">*</SEQ>
-        <SEQ TYPE="OPERATOR">**</SEQ>
-        <SEQ TYPE="OPERATOR">#</SEQ>
-        <SEQ TYPE="OPERATOR">^</SEQ>
-        <SEQ TYPE="OPERATOR">^^</SEQ>
-        <SEQ TYPE="OPERATOR">;</SEQ>
-        <SEQ TYPE="OPERATOR">.</SEQ>
-        <SEQ TYPE="OPERATOR">-&gt;</SEQ>
-        <SEQ TYPE="OPERATOR">&amp;&amp;</SEQ>
-        <SEQ TYPE="OPERATOR">||</SEQ>
-        <SEQ TYPE="OPERATOR">^|</SEQ>
-        <SEQ TYPE="OPERATOR">!=</SEQ>
-        <SEQ TYPE="OPERATOR">~=</SEQ>
-        <SEQ TYPE="OPERATOR">!==</SEQ>
-        <SEQ TYPE="OPERATOR">~~</SEQ>
-
-		<MARK_PREVIOUS TYPE="KEYWORD3" MATCH_TYPE="OPERATOR">:</MARK_PREVIOUS>
-		<MARK_FOLLOWING TYPE="LABEL" MATCH_TYPE="OPERATOR">#</MARK_FOLLOWING>
-		<MARK_FOLLOWING TYPE="LITERAL1" MATCH_TYPE="OPERATOR">$</MARK_FOLLOWING>
-
-		<KEYWORDS>
-			<!-- Constants -->
-            <KEYWORD1>disable</KEYWORD1>
-            <KEYWORD1>enable</KEYWORD1>
-            <KEYWORD1>no</KEYWORD1>
-            <KEYWORD1>off</KEYWORD1>
-            <KEYWORD1>on</KEYWORD1>
-			<KEYWORD1>yes</KEYWORD1>
-
-			<!-- Reserved identifiers -->
-			<KEYWORD2>self</KEYWORD2>
-			<KEYWORD2>true</KEYWORD2>
-            <KEYWORD2>false</KEYWORD2>
-            <KEYWORD2>nil</KEYWORD2>
-            <KEYWORD2>super</KEYWORD2>
-            <KEYWORD2>thread</KEYWORD2>
-            <KEYWORD2>sender</KEYWORD2>
-            <KEYWORD2>senderMethod</KEYWORD2>
-            <KEYWORD2>blockSelf</KEYWORD2>
-            <KEYWORD2>scheduler</KEYWORD2>
-            <KEYWORD2>¼</KEYWORD2>
-
-			<!-- not really keywords, but a different color works well-->
-			<KEYWORD4>isNil</KEYWORD4>
-			<KEYWORD4>not</KEYWORD4>
-
-			<!-- not really -->
-			<LITERAL2>Smalltalk</LITERAL2>
-			<LITERAL2>Transcript</LITERAL2>
-
-			<!-- base classes -->
-			<LITERAL2>Date</LITERAL2>
-			<LITERAL2>Time</LITERAL2>
-			<LITERAL2>Boolean</LITERAL2>
-			<LITERAL2>True</LITERAL2>
-			<LITERAL2>False</LITERAL2>
-			<LITERAL2>Character</LITERAL2>
-			<LITERAL2>String</LITERAL2>
-			<LITERAL2>Array</LITERAL2>
-			<LITERAL2>Symbol</LITERAL2>
-			<LITERAL2>Integer</LITERAL2>
-			<LITERAL2>Object</LITERAL2>
-
-            <LITERAL3>Application</LITERAL3>
-            <LITERAL3>Category</LITERAL3>
-            <LITERAL3>Class</LITERAL3>
-            <LITERAL3>Compiler</LITERAL3>
-            <LITERAL3>EntryPoint</LITERAL3>
-            <LITERAL3>Enum</LITERAL3>
-            <LITERAL3>Eval</LITERAL3>
-            <LITERAL3>Exception</LITERAL3>
-            <LITERAL3>Function</LITERAL3>
-            <LITERAL3>IconResource</LITERAL3>
-            <LITERAL3>Interface</LITERAL3>
-            <LITERAL3>Literal</LITERAL3>
-            <LITERAL3>Namespace</LITERAL3>
-            <LITERAL3>Method</LITERAL3>
-            <LITERAL3>Mixin</LITERAL3>
-            <LITERAL3>Module</LITERAL3>
-            <LITERAL3>Project</LITERAL3>
-            <LITERAL3>Reference</LITERAL3>
-            <LITERAL3>Require</LITERAL3>
-            <LITERAL3>Resource</LITERAL3>
-            <LITERAL3>Signal</LITERAL3>
-            <LITERAL3>Struct</LITERAL3>
-            <LITERAL3>Subsystem</LITERAL3>
-            <LITERAL3>Specifications</LITERAL3>
-            <LITERAL3>Warning</LITERAL3>
-
-		</KEYWORDS>
-	</RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/stata.xml b/qpython/src/main/assets/syntax/stata.xml
deleted file mode 100644
index 366b4626..00000000
--- a/qpython/src/main/assets/syntax/stata.xml
+++ /dev/null
@@ -1,2979 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!--Based on Syntax file for Stata v9.x. and 10.x from the jedit community
-	Original by Glenn Hoetker, Updated by Jesse Hamner
-	Updated by goebbe 	version 2010/07
-	Thanks to Elliott Lowy sharing macro/string/quote support
--->
-
-<!--You should put the following two lines into your jedit/modes/catalog file:
-	<MODE NAME="stata"	FILE="stata.xml" 
-	FILE_NAME_GLOB="*.{do,ado,mata}" />
--->
-
-
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="commentStart" VALUE="/*" />
-		<PROPERTY NAME="commentEnd" VALUE="*/" />
-		<PROPERTY NAME="lineComment" VALUE="* " />
-		<PROPERTY NAME="indentOpenBrackets" VALUE="{" />
-		<PROPERTY NAME="indentCloseBrackets" VALUE="}" />
-		<PROPERTY NAME="doubleBracketIndent" VALUE="false" />
-		<PROPERTY NAME="wordBreakChars" VALUE=",+-=&lt;&gt;/?^&amp;*" />
-	</PROPS>
-
-	<!--MAIN:-->
-	<RULES
-		IGNORE_CASE="FALSE"
-		NO_WORD_SEP="`'_?"
-		HIGHLIGHT_DIGITS="TRUE"
-		DIGIT_RE="(([\.]?[0-9]+)([eE]?)([-+]*)([0-9]*)) | (([0-9]+\.*[0-9]*|\.[0-9]+)([+-]?[eE]?[0-9]+)) | ((([0-9]+\.[0-9]*|\.[0-9]+))[Ee]?)"
-		>
-		<!--Span semicolon environment (semicolon as command-separator):-->
-		<SPAN_REGEXP TYPE="KEYWORD4" DELEGATE="SEMICOLON_ENV" HASH_CHAR="#d">
-				<BEGIN>#d[\s]*[;]</BEGIN>
-				<END>#d cr</END>
-		</SPAN_REGEXP>
-		<SPAN_REGEXP TYPE="KEYWORD4" DELEGATE="SEMICOLON_ENV" HASH_CHAR="#del">
-				<BEGIN>#del[\s]*[;]</BEGIN>
-				<END>#del cr</END>
-		</SPAN_REGEXP>
-		<SPAN_REGEXP TYPE="KEYWORD4" DELEGATE="SEMICOLON_ENV" HASH_CHAR="#del">
-				<BEGIN>#deli?m?i?t?[\s]*[;]</BEGIN>
-				<END>#delimit cr</END>
-		</SPAN_REGEXP>
-		
-		<!--Mata one-liner:-->
-		<EOL_SPAN_REGEXP TYPE="KEYWORD1" DELEGATE="MATA_ENV" AT_WHITESPACE_END="TRUE" HASH_CHAR="mata">mata[\s]*[:]*[\s]*(?=[\w]+)</EOL_SPAN_REGEXP>
-		<!--Span Mata environment:--> 
-		<SPAN_REGEXP TYPE="KEYWORD3" DELEGATE="MATA_ENV" AT_WHITESPACE_END="TRUE" HASH_CHAR="mata">
-				<BEGIN>mata[\s]*([:]|$)</BEGIN>
-				<END>end</END>
-		</SPAN_REGEXP>
-		
-		<!--Apply to everything else:-->
-		<EOL_SPAN TYPE="COMMENT1" AT_WHITESPACE_END="TRUE">*</EOL_SPAN>
-		
-		<IMPORT DELEGATE="UNIVERSAL"/>
-		<IMPORT DELEGATE="KEYWORDLIST"/>
-		
-	</RULES>
-
-	
-	<RULES SET="UNIVERSAL"
-		IGNORE_CASE="FALSE" 
-		NO_WORD_SEP="`'_?"
-		HIGHLIGHT_DIGITS="TRUE"
-		DIGIT_RE="(([\.]?[0-9]+)([eE]?)([-+]*)([0-9]*)) | (([0-9]+\.*[0-9]*|\.[0-9]+)([+-]?[eE]?[0-9]+)) | ((([0-9]+\.[0-9]*|\.[0-9]+))[Ee]?)"
-		>
-			
-		<!-- Line comments -->
-		<EOL_SPAN TYPE="COMMENT1" AT_WHITESPACE_END="TRUE">//</EOL_SPAN>
-			<!--If there is code in the line before the // than tab or whitespace is required before // as a separator:-->
-		<EOL_SPAN_REGEXP TYPE="COMMENT1">[\s]///</EOL_SPAN_REGEXP>
-		<EOL_SPAN_REGEXP TYPE="COMMENT1">[\s]//</EOL_SPAN_REGEXP>  
-		
-		<!-- Multiline comment -->
-		<SPAN TYPE="COMMENT2">
-			<BEGIN>/*</BEGIN>
-			<END>*/</END>
-		</SPAN>
-		
-		<!--Do not highlight documented file endings:-->
-		<SEQ TYPE="NULL">.ado</SEQ>	
-		<SEQ TYPE="NULL">.dct</SEQ>	
-		<SEQ TYPE="NULL">.do</SEQ>	
-		<SEQ TYPE="NULL">.dta</SEQ>	
-		<SEQ TYPE="NULL">.gph</SEQ>	
-		<SEQ TYPE="NULL">.grec</SEQ>	
-		<SEQ TYPE="NULL">.log</SEQ>	
-		<SEQ TYPE="NULL">.mata</SEQ>	
-		<SEQ TYPE="NULL">.mlib</SEQ>	
-		<SEQ TYPE="NULL">.mmat</SEQ>	
-		<SEQ TYPE="NULL">.mo</SEQ>	
-		<SEQ TYPE="NULL">.out</SEQ>
-		<SEQ TYPE="NULL">.raw</SEQ>
-		<SEQ TYPE="NULL">.mo</SEQ>
-		<SEQ TYPE="NULL">.smcl</SEQ>
-		<SEQ TYPE="NULL">.sthlp</SEQ>
-		<SEQ TYPE="NULL">.ster</SEQ>
-		
-		<!--Operators:-->
-		<SEQ TYPE="OPERATOR">.</SEQ>
-		<SEQ TYPE="OPERATOR">=</SEQ>
-		<SEQ TYPE="OPERATOR">!</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;=</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;=</SEQ>
-		<SEQ TYPE="OPERATOR">+</SEQ>
-		<SEQ TYPE="OPERATOR">-</SEQ>
-		<SEQ TYPE="OPERATOR">/</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;</SEQ>
-		<SEQ TYPE="OPERATOR">&amp;</SEQ>
-		<SEQ TYPE="OPERATOR">|</SEQ>
-		<SEQ TYPE="OPERATOR">^</SEQ>
-		<SEQ TYPE="OPERATOR">~</SEQ>
-		<SEQ TYPE="OPERATOR">*</SEQ>
-		<SEQ TYPE="OPERATOR">;</SEQ>
-		<SEQ_REGEXP TYPE="OPERATOR" HASH_CHAR="%">%[^ )]+</SEQ_REGEXP>  <!--highlight formats e.g.: %10.0f-->
-		
-		<SEQ TYPE="NULL">,</SEQ>
-		<SEQ TYPE="NULL">]</SEQ>
-		<SEQ TYPE="NULL">[</SEQ>
-		<SEQ TYPE="NULL">?</SEQ>
-
-		<!--Highlight time-series operators-->
-		<!--e.g.: L. L1. L2. L(1/3). F. F1. F(2/4). D. D1. S. S1. -->
-		<SEQ_REGEXP TYPE="OPERATOR" AT_WORD_START="TRUE" HASH_CHAR="L">L(([\d]*[.])|([(][\d]+/[\d]+[)][.]))</SEQ_REGEXP>
-		<SEQ_REGEXP TYPE="OPERATOR" AT_WORD_START="TRUE" HASH_CHAR="F">F(([\d]*[.])|([(][\d]+/[\d]+[)][.]))</SEQ_REGEXP>
-		<SEQ_REGEXP TYPE="OPERATOR" AT_WORD_START="TRUE" HASH_CHAR="D">D(([\d]*[.])|([(][\d]+/[\d]+[)][.]))</SEQ_REGEXP>
-		<SEQ_REGEXP TYPE="OPERATOR" AT_WORD_START="TRUE" HASH_CHAR="S">S(([\d]*[.])|([(][\d]+/[\d]+[)][.]))</SEQ_REGEXP>
-		
-		<!-- Highlight variable references and declarations (macros): -->
-		<!--commands that define only one macrovariables per line:-->
-		<SEQ_REGEXP TYPE="LITERAL4" AT_WORD_START="TRUE" HASH_CHAR="loc">loca?l?((\s+\w+)|$)</SEQ_REGEXP>
-		<SEQ_REGEXP TYPE="LITERAL4" AT_WORD_START="TRUE" HASH_CHAR="gl">glo?b?a?l?((\s+\w+)|$)</SEQ_REGEXP>
-			<!--The following could also be implemented with regexp and positive lockahead - however positive lockahead is currently brocken in Sun-Java-->
-		<MARK_FOLLOWING TYPE="LITERAL4" MATCH_TYPE="KEYWORD2">foreach  </MARK_FOLLOWING>
-		<MARK_FOLLOWING TYPE="LITERAL4" MATCH_TYPE="KEYWORD2">foreach </MARK_FOLLOWING>
-		<MARK_FOLLOWING TYPE="LITERAL4" MATCH_TYPE="KEYWORD2">forv  </MARK_FOLLOWING>
-		<MARK_FOLLOWING TYPE="LITERAL4" MATCH_TYPE="KEYWORD2">forv </MARK_FOLLOWING>
-		<MARK_FOLLOWING TYPE="LITERAL4" MATCH_TYPE="KEYWORD2">forvalues  </MARK_FOLLOWING>
-		<MARK_FOLLOWING TYPE="LITERAL4" MATCH_TYPE="KEYWORD2">forvalues </MARK_FOLLOWING>
-		<!--commands that define one or more macrovariables per line:--> 
-		<SEQ_REGEXP TYPE="LITERAL4" AT_WHITESPACE_END="TRUE" HASH_CHAR="tempvar" >tempvar((\s+\w+)+|$)</SEQ_REGEXP>
-		<SEQ_REGEXP TYPE="LITERAL4" AT_WHITESPACE_END="TRUE" HASH_CHAR="tempname">tempname((\s+\w+)+|$)</SEQ_REGEXP>
-
-		<!-- To highlight global macro-variables:  (local macro variables have their own rule set)-->
-		<!--e.g.: $macroname   ${macroname}nomacro  -->
-		<SPAN TYPE="LITERAL4"><BEGIN>${</BEGIN><END>}</END></SPAN>
-		<MARK_FOLLOWING TYPE="LITERAL4" MATCH_TYPE="RULE">$</MARK_FOLLOWING>
-
-		<!-- Highlight Function calls -->
-		<MARK_PREVIOUS TYPE="FUNCTION" MATCH_TYPE="NULL">(</MARK_PREVIOUS>
-		<SEQ TYPE="NULL">)</SEQ>		
-
-		<!-- The special conditions "set", "do", "run", "sysdir" and "shell" -->
-		<SEQ_REGEXP TYPE="KEYWORD3" AT_WHITESPACE_END="TRUE" HASH_CHAR="cap"  >capt?u?r?e?[\s]+log([\s]+|$)</SEQ_REGEXP>
-		<SEQ_REGEXP TYPE="KEYWORD3" AT_WHITESPACE_END="TRUE" HASH_CHAR="ru"   >run?([\s]+|$)</SEQ_REGEXP>
-		<SEQ_REGEXP TYPE="KEYWORD3" AT_WORD_START="TRUE"	 HASH_CHAR="log"  >log([\s]+|$)</SEQ_REGEXP>
-		<SEQ_REGEXP TYPE="KEYWORD3" AT_WORD_START="TRUE"	 HASH_CHAR="do"   >do([\s]+|$)</SEQ_REGEXP>
-		<SEQ_REGEXP TYPE="KEYWORD3" AT_WORD_START="TRUE"	 HASH_CHAR="set"  >set[\s]+(obs)(([\s]+(?![\D]+))|$)</SEQ_REGEXP> <!--highlight ""set obs" 1000" but not ""set obs" = 1000""-->
-		<SEQ_REGEXP TYPE="KEYWORD2" AT_WORD_START="TRUE"	 HASH_CHAR="label">label([\s]+(drop)([\s]+|$))</SEQ_REGEXP> <!--highlight "label "drop"" as keyword2-->
-		<SEQ_REGEXP TYPE="KEYWORD1" AT_WORD_START="TRUE"	 HASH_CHAR="macro">macro([\s]+(drop)([\s]+|$))</SEQ_REGEXP> <!--highlight "macro "drop"" as keyword1-->
-		<SEQ_REGEXP TYPE="KEYWORD3" AT_WORD_START="TRUE"	 HASH_CHAR="drop" >drop([\s]+(?!if|[=])|$)</SEQ_REGEXP>  <!--highlight ""drop" varlist" but not ""drop" if condition"-->
-		<SEQ_REGEXP TYPE="KEYWORD3" AT_WORD_START="TRUE"	 HASH_CHAR="keep" >keep([\s]+(?!if|[=])|$)</SEQ_REGEXP>  <!--highlight ""keep" varlist" but not ""keep" if condition"-->
-		
-		<SEQ_REGEXP TYPE="KEYWORD4" AT_WHITESPACE_END="TRUE" HASH_CHAR="set"   >set(?!([\s]+[\w]+[\s]*[=]))</SEQ_REGEXP>  <!--highlight ""set" variable 1000" but not ""set" varibale = 1000"-->
-		<SEQ_REGEXP TYPE="KEYWORD4" AT_WHITESPACE_END="TRUE" HASH_CHAR="mata"  >mata[\s]+set([\s]+|$)</SEQ_REGEXP>
-		<SEQ_REGEXP TYPE="KEYWORD4" AT_WHITESPACE_END="TRUE" HASH_CHAR="shell" >shell([\s]+|$)</SEQ_REGEXP>
-		<SEQ_REGEXP TYPE="KEYWORD4" AT_WHITESPACE_END="TRUE" HASH_CHAR="sysdir">sysdir([\s]+|$)</SEQ_REGEXP>
-		
-		<!-- A few identifiers and variables -->		
-		<SEQ_REGEXP TYPE="KEYWORD2" AT_WORD_START="TRUE" HASH_CHAR="c"	>c\((\w+)\)</SEQ_REGEXP>
-		<SEQ_REGEXP TYPE="KEYWORD2" AT_WORD_START="TRUE" HASH_CHAR="str">str(\d+)</SEQ_REGEXP>
-		
-		<!-- Import rules for stings, macros and quotes (see beyond) -->		
-		<IMPORT DELEGATE="STRINGMACRO"/>
-	</RULES>
-
-	
-	<RULES SET="SEMICOLON_ENV" 
-		IGNORE_CASE="FALSE"
-		NO_WORD_SEP="`'_?"
-		HIGHLIGHT_DIGITS="TRUE"
-		DIGIT_RE="(([\.]?[0-9]+)([eE]?)([-+]*)([0-9]*)) | (([0-9]+\.*[0-9]*|\.[0-9]+)([+-]?[eE]?[0-9]+)) | ((([0-9]+\.[0-9]*|\.[0-9]+))[Ee]?)"
-		>
-		<!--The following type of comments are ONLY valid inside SEMICOLON environment:-->
-		<SPAN TYPE="COMMENT1"  AT_WHITESPACE_END="TRUE">
-			<BEGIN>*</BEGIN><END>;</END></SPAN>
-			
-		<!-- Line comments: -->
-		<!-- //-line comments at the start of a line do not work reliably in semicolon environment (this is a Stata problem)-->
-		<!-- e.g.: put //-comment at the line start of two successive lines at the start of semicolon environment: this will lead to an Stata(v10)-error/break-->
-		<!-- if you want to enable this anyway, just uncomment the follwoing line: -->
-		<!--<EOL_SPAN TYPE="COMMENT1" AT_WHITESPACE_END="TRUE">//</EOL_SPAN>-->
-		<EOL_SPAN_REGEXP TYPE="COMMENT1">[\s]///</EOL_SPAN_REGEXP>
-		<EOL_SPAN_REGEXP TYPE="COMMENT1">[\s]//</EOL_SPAN_REGEXP>  
-			
-		<IMPORT DELEGATE="UNIVERSAL"/>
-		<IMPORT DELEGATE="KEYWORDLIST"/>
-	</RULES>
-
-	
-	<RULES SET="MATA_ENV" 
-		IGNORE_CASE="FALSE"
-		NO_WORD_SEP="`'_?"
-		HIGHLIGHT_DIGITS="TRUE"
-		DIGIT_RE="(([\.]?[0-9]+)([eE]?)([-+]*)([0-9]*)) | (([0-9]+\.*[0-9]*|\.[0-9]+)([+-]?[eE]?[0-9]+)) | ((([0-9]+\.[0-9]*|\.[0-9]+))[Ee]?)"
-		>
-		<!--The following type of comment is NOT valid inside MATA environments :-->
-		<!--<EOL_SPAN TYPE="COMMENT1" AT_WHITESPACE_END="TRUE">*</EOL_SPAN>-->
-
-		<!--"do " constructs have a specific meaning in in mata-environment:--> 
-		<SEQ_REGEXP TYPE="KEYWORD2" AT_WORD_START="TRUE"	 HASH_CHAR="do"  >do([\s]+|$)</SEQ_REGEXP>
-		
-		<!--Import universal rules - but not keywords-->
-		<IMPORT DELEGATE="UNIVERSAL"/>
-				
-		<!-- Instead use the list of officially reserved  MATA keywords:-->
-		<KEYWORDS>
-		
-		<KEYWORD1>array</KEYWORD1>
-		<KEYWORD1>colvector</KEYWORD1>
-		<KEYWORD1>external</KEYWORD1>
-		<KEYWORD1>mata</KEYWORD1>
-		<KEYWORD1>matrix</KEYWORD1>
-		<KEYWORD1>mlib</KEYWORD1>
-		<KEYWORD1>pointer</KEYWORD1>
-		<KEYWORD1>real</KEYWORD1>
-		<KEYWORD1>rowvector</KEYWORD1>
-		<KEYWORD1>scalar</KEYWORD1>
-		<KEYWORD1>string</KEYWORD1>
-		<KEYWORD1>struct</KEYWORD1>
-		<KEYWORD1>transmorphic</KEYWORD1>
-		<KEYWORD1>vector</KEYWORD1>
-		<KEYWORD1>version</KEYWORD1>
-		<KEYWORD1>void</KEYWORD1>
-		<KEYWORD1>delete</KEYWORD1>
-		<KEYWORD1>describe</KEYWORD1>
-		
-		<KEYWORD2>if</KEYWORD2>
-		<KEYWORD2>else</KEYWORD2>
-		<KEYWORD2>for</KEYWORD2>
-		<KEYWORD2>goto</KEYWORD2>
-		<KEYWORD2>while</KEYWORD2>
-		<KEYWORD2>this</KEYWORD2>
-		<KEYWORD2>do</KEYWORD2>
-		<KEYWORD2>return</KEYWORD2>
-		<KEYWORD2>break</KEYWORD2>
-		<KEYWORD2>continue</KEYWORD2>
-		
-		<KEYWORD2>add</KEYWORD2>
-		<KEYWORD2>create</KEYWORD2>
-		<KEYWORD2>index</KEYWORD2>
-		<KEYWORD2>replace</KEYWORD2>
-		<KEYWORD2>using</KEYWORD2>
-	
-		<KEYWORD2>byte</KEYWORD2>
-		<KEYWORD2>int</KEYWORD2>
-		<KEYWORD2>long</KEYWORD2>
-		<KEYWORD2>float</KEYWORD2>
-		<KEYWORD2>double</KEYWORD2>
-		<KEYWORD2>quad</KEYWORD2>
-		<KEYWORD2>short</KEYWORD2>
-		<KEYWORD2>boolean</KEYWORD2>
-		<KEYWORD2>complex</KEYWORD2>
-		<KEYWORD2>const</KEYWORD2>
-		
-		<!--Other (reserved) MATA keywords:--> 
-		<KEYWORD2>aggregate</KEYWORD2>
-		<KEYWORD2>case</KEYWORD2>
-		<KEYWORD2>catch</KEYWORD2>
-		<KEYWORD2>class</KEYWORD2>
-		<KEYWORD2>default</KEYWORD2>
-		<KEYWORD2>delegate</KEYWORD2>
-		<KEYWORD2>case</KEYWORD2>
-		<KEYWORD2>eltypedef</KEYWORD2>
-		<KEYWORD2>enum</KEYWORD2>
-		<KEYWORD2>explicit</KEYWORD2>
-		<KEYWORD2>export</KEYWORD2>
-		<KEYWORD2>external</KEYWORD2>
-		<KEYWORD2>friend</KEYWORD2>
-		<KEYWORD2>function	</KEYWORD2>
-		<KEYWORD2>inline</KEYWORD2>
-		<KEYWORD2>namespace</KEYWORD2>
-		<KEYWORD2>new</KEYWORD2>
-		<KEYWORD2>NULL</KEYWORD2>
-		<KEYWORD2>numeric</KEYWORD2>
-		<KEYWORD2>operator</KEYWORD2>	
-		<KEYWORD2>orgtypedef</KEYWORD2>
-		<KEYWORD2>pointer</KEYWORD2>
-		<KEYWORD2>polymorphic</KEYWORD2>
-		<KEYWORD2>pragma</KEYWORD2>
-		<KEYWORD2>private</KEYWORD2>
-		<KEYWORD2>protected</KEYWORD2>
-		<KEYWORD2>public</KEYWORD2>
-		<KEYWORD2>signed</KEYWORD2>
-		<KEYWORD2>static</KEYWORD2>
-		<KEYWORD2>super</KEYWORD2>		
-		<KEYWORD2>switch</KEYWORD2>
-		<KEYWORD2>template</KEYWORD2>
-		<KEYWORD2>throw</KEYWORD2>
-		<KEYWORD2>transmorphic</KEYWORD2>
-		<KEYWORD2>try</KEYWORD2>
-		<KEYWORD2>typedef</KEYWORD2>
-		<KEYWORD2>typename</KEYWORD2>
-		<KEYWORD2>union</KEYWORD2>		
-		<KEYWORD2>unsigned</KEYWORD2>		
-		<KEYWORD2>virtual</KEYWORD2>
-		<KEYWORD2>volatile</KEYWORD2>             
-		
-		</KEYWORDS>
-	</RULES>
-		
-
-	<RULES SET="KEYWORDLIST" 
-		IGNORE_CASE="FALSE"
-		NO_WORD_SEP="`'_?"
-		HIGHLIGHT_DIGITS="TRUE"
-		DIGIT_RE="(([\.]?[0-9]+)([eE]?)([-+]*)([0-9]*)) | (([0-9]+\.*[0-9]*|\.[0-9]+)([+-]?[eE]?[0-9]+)) | ((([0-9]+\.[0-9]*|\.[0-9]+))[Ee]?)"
-		>
-		<!-- Example for "keyword"-style rules - that allows for flexible abbreviations (but are computationaly expensive):	 -->		
-		<!--<SEQ_REGEXP TYPE="KEYWORD2" HASH_CHAR="bys" AT_WORD_START="TRUE">byso?r?t?([\s]+|$)</SEQ_REGEXP>
-			<SEQ_REGEXP TYPE="KEYWORD2" HASH_CHAR="cap" AT_WORD_START="TRUE">capt?u?r?e?([\s]+|$)</SEQ_REGEXP>	-->
-			
-		<!-- This list of keywords owes much to similar files for other editors which
-		members of the Stata community have so generously made freely available -->
-		<KEYWORDS>
-		<!-- Highlight keywords connected to files/filenames: -->
-		<KEYWORD3>ap</KEYWORD3>
-		<KEYWORD3>app</KEYWORD3>
-		<KEYWORD3>appe</KEYWORD3>
-		<KEYWORD3>appen</KEYWORD3>
-		<KEYWORD3>append</KEYWORD3>
-		<KEYWORD3>erase</KEYWORD3>
-		<KEYWORD3>mer</KEYWORD3>
-		<KEYWORD3>merg</KEYWORD3>
-		<KEYWORD3>merge</KEYWORD3>
-		<KEYWORD3>preserve</KEYWORD3>
-		<KEYWORD3>restore</KEYWORD3>
-		<KEYWORD3>rm</KEYWORD3>
-		<KEYWORD3>using</KEYWORD3>
-		<KEYWORD3>use</KEYWORD3>
-		<KEYWORD3>save</KEYWORD3>
-		<KEYWORD3>sav</KEYWORD3>
-		<KEYWORD3>xmlsave</KEYWORD3>
-		<KEYWORD3>xmluse</KEYWORD3>
-		
-		<!-- Data management and programming keywords: -->
-		<KEYWORD2>_estimates</KEYWORD2>
-		<KEYWORD2>_return</KEYWORD2>
-		<KEYWORD2>accum</KEYWORD2>
-		<KEYWORD2>adopath</KEYWORD2>
-		<KEYWORD2>args</KEYWORD2>
-		<KEYWORD2>break</KEYWORD2>
-		<KEYWORD2>by</KEYWORD2>
-		<KEYWORD2>byable</KEYWORD2>
-		<KEYWORD2>bys</KEYWORD2>
-		<KEYWORD2>bysort</KEYWORD2>
-		<KEYWORD2>class</KEYWORD2>
-		<KEYWORD2>cap</KEYWORD2>
-		<KEYWORD2>capture</KEYWORD2>
-		<KEYWORD2>char</KEYWORD2>
-		<KEYWORD2>class</KEYWORD2>
-		<KEYWORD2>classutil</KEYWORD2>
-		<KEYWORD2>comments</KEYWORD2>
-		<KEYWORD2>compare</KEYWORD2>
-		<KEYWORD2>compress</KEYWORD2>
-		<KEYWORD2>confirm</KEYWORD2>	
-		<KEYWORD2>continue</KEYWORD2>
-		<KEYWORD2>creturn</KEYWORD2>
-		<KEYWORD2>define</KEYWORD2>
-		<!--<KEYWORD2>delimit</KEYWORD2>-->
-		<KEYWORD2>discard</KEYWORD2>
-		<KEYWORD2>dissimilarity</KEYWORD2>
-		<KEYWORD2>drop</KEYWORD2>
-		<KEYWORD2>eigenvalues</KEYWORD2>
-		<KEYWORD2>else</KEYWORD2>
-		<KEYWORD2>end</KEYWORD2>
-		<KEYWORD2>ereturn</KEYWORD2>
-		<KEYWORD2>expand</KEYWORD2>
-		<KEYWORD2>file</KEYWORD2>
-		<KEYWORD2>findfile</KEYWORD2>
-		<KEYWORD2>for</KEYWORD2>
-		<KEYWORD2>foreach</KEYWORD2>
-		<KEYWORD2>forvalues</KEYWORD2>
-		<KEYWORD2>get</KEYWORD2>
-		<KEYWORD2>if</KEYWORD2>
-		<KEYWORD2>in</KEYWORD2>
-		<KEYWORD2>keep</KEYWORD2>
-		<KEYWORD2>lab</KEYWORD2>
-		<KEYWORD2>labe</KEYWORD2>
-		<KEYWORD2>label</KEYWORD2>
-		<KEYWORD2>loc</KEYWORD2>
-		<KEYWORD2>loca</KEYWORD2>
-		<KEYWORD2>local</KEYWORD2>
-		<KEYWORD2>odbc</KEYWORD2>
-		<KEYWORD2>outfix</KEYWORD2>
-		<KEYWORD2>program</KEYWORD2>
-		<KEYWORD2>properties</KEYWORD2>
-		<KEYWORD2>recode</KEYWORD2>
-		<KEYWORD2>replace</KEYWORD2>
-		<KEYWORD2>return</KEYWORD2>
-		<KEYWORD2>rmsg</KEYWORD2>
-		<KEYWORD2>rownames</KEYWORD2>
-		<KEYWORD2>serset</KEYWORD2>
-		<KEYWORD2>so</KEYWORD2>
-		<KEYWORD2>sor</KEYWORD2>
-		<KEYWORD2>sort</KEYWORD2>
-		<KEYWORD2>sortpreserve</KEYWORD2>
-		<KEYWORD2>svd</KEYWORD2>
-		<KEYWORD2>symeigen</KEYWORD2>
-		<KEYWORD2>trace</KEYWORD2>
-		<KEYWORD2>unabcmd</KEYWORD2>
-		<KEYWORD2>utility</KEYWORD2>
-		<KEYWORD2>while</KEYWORD2>
-		<KEYWORD2>runtest</KEYWORD2>
-
-		<!-- Display keywords - most of thes keyword are covered inother sections-->
-		<KEYWORD1>di</KEYWORD1>
-		<KEYWORD1>disp</KEYWORD1>
-		<KEYWORD1>display</KEYWORD1>
-		<KEYWORD1>outtex</KEYWORD1>
-		<KEYWORD1>outreg</KEYWORD1>
-		<KEYWORD1>printf</KEYWORD1>
-		<KEYWORD1>count</KEYWORD1>
-		<KEYWORD1>describe</KEYWORD1>
-		<KEYWORD1>list</KEYWORD1>
-		<KEYWORD1>errprintf</KEYWORD1>
-		<KEYWORD1>more</KEYWORD1>
-		<KEYWORD1>cmdlog</KEYWORD1>
-		<KEYWORD1>close</KEYWORD1>
-
-		<!-- Unix-like i/o functions -->
-		<LITERAL3>dir</LITERAL3>
-		<LITERAL3>chdir</LITERAL3>
-		<LITERAL3>mkdir</LITERAL3>
-		<LITERAL3>rmdir</LITERAL3>
-		<LITERAL3>pwd</LITERAL3>
-		<LITERAL3>fileexists</LITERAL3>
-		<LITERAL3>cat</LITERAL3>
-		<LITERAL3>unlink</LITERAL3>
-		<!--<LITERAL3>erase</LITERAL3>-->
-		<LITERAL3>ls</LITERAL3>
-
-		<!-- Identifiers and variables -->
-		<KEYWORD2>byte</KEYWORD2>
-		<KEYWORD2>int</KEYWORD2>
-		<KEYWORD2>long</KEYWORD2>
-		<KEYWORD2>float</KEYWORD2>
-		<KEYWORD2>double</KEYWORD2>
-		
-		<KEYWORD1>_rc</KEYWORD1>	
-		<KEYWORD1>_b</KEYWORD1>
-		<KEYWORD1>_coef</KEYWORD1>
-		<KEYWORD1>_cons</KEYWORD1>
-		<KEYWORD1>_n</KEYWORD1>
-		<KEYWORD1>_N</KEYWORD1>
-		<KEYWORD1>_pi</KEYWORD1>
-		<KEYWORD1>_rc</KEYWORD1>
-		<KEYWORD1>_se</KEYWORD1>
-
-		<!-- Stata statistics functions from Stata 9: -->
-		<KEYWORD1>_3dax0</KEYWORD1>
-		<KEYWORD1>_3daxmin</KEYWORD1>
-		<KEYWORD1>_3daxout</KEYWORD1>
-		<KEYWORD1>_3daxtbl</KEYWORD1>
-		<KEYWORD1>_3ddflts</KEYWORD1>
-		<KEYWORD1>_3dmkdta</KEYWORD1>
-		<KEYWORD1>_3dmnmx</KEYWORD1>
-		<KEYWORD1>_3dproj</KEYWORD1>
-		<KEYWORD1>_3drproj</KEYWORD1>
-		<KEYWORD1>_3drshow</KEYWORD1>
-		<KEYWORD1>_3dshad</KEYWORD1>
-		<KEYWORD1>_3dsvusr</KEYWORD1>
-		<KEYWORD1>__GEEBT</KEYWORD1>
-		<KEYWORD1>__GEERC</KEYWORD1>
-		<KEYWORD1>__GEEUC</KEYWORD1>
-		<KEYWORD1>_a_cls_msg</KEYWORD1>
-		<KEYWORD1>_ac</KEYWORD1>
-		<KEYWORD1>_addgph</KEYWORD1>
-		<KEYWORD1>_addl</KEYWORD1>
-		<KEYWORD1>_addop</KEYWORD1>
-		<KEYWORD1>_adjksm</KEYWORD1>
-		<KEYWORD1>_assert</KEYWORD1>
-		<KEYWORD1>_assert_mreldif</KEYWORD1>
-		<KEYWORD1>_assert_mreldifp</KEYWORD1>
-		<KEYWORD1>_assert_mreldifs</KEYWORD1>
-		<KEYWORD1>_assert_obs</KEYWORD1>
-		<KEYWORD1>_assert_streq</KEYWORD1>
-		<KEYWORD1>_at</KEYWORD1>
-		<KEYWORD1>_bigtab</KEYWORD1>
-		<KEYWORD1>_binperfect</KEYWORD1>
-		<KEYWORD1>_binperfout</KEYWORD1>
-		<KEYWORD1>_biplotmat</KEYWORD1>
-		<KEYWORD1>_brr_sum</KEYWORD1>
-		<KEYWORD1>_bs_display</KEYWORD1>
-		<KEYWORD1>_bs_sum</KEYWORD1>
-		<KEYWORD1>_bsqreg</KEYWORD1>
-		<KEYWORD1>_btcmd</KEYWORD1>
-		<KEYWORD1>_byobs</KEYWORD1>
-		<KEYWORD1>_byoptnotallowed</KEYWORD1>
-		<KEYWORD1>_ca_parse_normalize</KEYWORD1>
-		<KEYWORD1>_ca_process_mlabel</KEYWORD1>
-		<KEYWORD1>_callerr</KEYWORD1>
-		<KEYWORD1>_cci</KEYWORD1>
-		<KEYWORD1>_check4gropts</KEYWORD1>
-		<KEYWORD1>_check_eformopt</KEYWORD1>
-		<KEYWORD1>_choice_table</KEYWORD1>
-		<KEYWORD1>_ckirfset</KEYWORD1>
-		<KEYWORD1>_cknotsvaroi</KEYWORD1>
-		<KEYWORD1>_ckvec</KEYWORD1>
-		<KEYWORD1>_clsarr2list</KEYWORD1>
-		<KEYWORD1>_cmdxel</KEYWORD1>
-		<KEYWORD1>_coef_table</KEYWORD1>
-		<KEYWORD1>_coef_table_header</KEYWORD1>
-		<KEYWORD1>_column</KEYWORD1>
-		<KEYWORD1>_confirm_date</KEYWORD1>
-		<KEYWORD1>_confirm_number_or_date</KEYWORD1>
-		<KEYWORD1>_copy_mat_stripes</KEYWORD1>
-		<KEYWORD1>_cpmatnm</KEYWORD1>
-		<KEYWORD1>_cr1form</KEYWORD1>
-		<KEYWORD1>_cr1invt</KEYWORD1>
-		<KEYWORD1>_cr1se</KEYWORD1>
-		<KEYWORD1>_cr1t</KEYWORD1>
-		<KEYWORD1>_crc2use</KEYWORD1>
-		<KEYWORD1>_crc4fld</KEYWORD1>
-		<KEYWORD1>_crcacnt</KEYWORD1>
-		<KEYWORD1>_crcar1</KEYWORD1>
-		<KEYWORD1>_crcause</KEYWORD1>
-		<KEYWORD1>_crcbcrt</KEYWORD1>
-		<KEYWORD1>_crcbin</KEYWORD1>
-		<KEYWORD1>_crcbygr</KEYWORD1>
-		<KEYWORD1>_crcchi2</KEYWORD1>
-		<KEYWORD1>_crcchkt</KEYWORD1>
-		<KEYWORD1>_crcchkw</KEYWORD1>
-		<KEYWORD1>_crcci</KEYWORD1>
-		<KEYWORD1>_crccip</KEYWORD1>
-		<KEYWORD1>_crceprs</KEYWORD1>
-		<KEYWORD1>_crcexn1</KEYWORD1>
-		<KEYWORD1>_crcexn2</KEYWORD1>
-		<KEYWORD1>_crcexn4</KEYWORD1>
-		<KEYWORD1>_crcexn5</KEYWORD1>
-		<KEYWORD1>_crcexn6</KEYWORD1>
-		<KEYWORD1>_crcexn7</KEYWORD1>
-		<KEYWORD1>_crcexn8</KEYWORD1>
-		<KEYWORD1>_crcexn9</KEYWORD1>
-		<KEYWORD1>_crcexna</KEYWORD1>
-		<KEYWORD1>_crcexnb</KEYWORD1>
-		<KEYWORD1>_crcexnc</KEYWORD1>
-		<KEYWORD1>_crcexnd</KEYWORD1>
-		<KEYWORD1>_crcexne</KEYWORD1>
-		<KEYWORD1>_crcexnf</KEYWORD1>
-		<KEYWORD1>_crcexnt</KEYWORD1>
-		<KEYWORD1>_crcgldv</KEYWORD1>
-		<KEYWORD1>_crcglil</KEYWORD1>
-		<KEYWORD1>_crcichi</KEYWORD1>
-		<KEYWORD1>_crcird</KEYWORD1>
-		<KEYWORD1>_crcirr</KEYWORD1>
-		<KEYWORD1>_crcksm</KEYWORD1>
-		<KEYWORD1>_crclf</KEYWORD1>
-		<KEYWORD1>_crcmeq</KEYWORD1>
-		<KEYWORD1>_crcmiss</KEYWORD1>
-		<KEYWORD1>_crcnlou</KEYWORD1>
-		<KEYWORD1>_crcnms2</KEYWORD1>
-		<KEYWORD1>_crcnuse</KEYWORD1>
-		<KEYWORD1>_crcor</KEYWORD1>
-		<KEYWORD1>_crcphdr</KEYWORD1>
-		<KEYWORD1>_crcplst</KEYWORD1>
-		<KEYWORD1>_crcra</KEYWORD1>
-		<KEYWORD1>_crcrd</KEYWORD1>
-		<KEYWORD1>_crcrnfd</KEYWORD1>
-		<KEYWORD1>_crcrr</KEYWORD1>
-		<KEYWORD1>_crcrsfl</KEYWORD1>
-		<KEYWORD1>_crcseq</KEYWORD1>
-		<KEYWORD1>_crcshdr</KEYWORD1>
-		<KEYWORD1>_crcslbl</KEYWORD1>
-		<KEYWORD1>_crcsrv2</KEYWORD1>
-		<KEYWORD1>_crcsrvc</KEYWORD1>
-		<KEYWORD1>_crcstep</KEYWORD1>
-		<KEYWORD1>_crcswxx</KEYWORD1>
-		<KEYWORD1>_crct</KEYWORD1>
-		<KEYWORD1>_crctmge</KEYWORD1>
-		<KEYWORD1>_crcunab</KEYWORD1>
-		<KEYWORD1>_crcunit</KEYWORD1>
-		<KEYWORD1>_crcvarl</KEYWORD1>
-		<KEYWORD1>_crcwsrv</KEYWORD1>
-		<KEYWORD1>_crczsku</KEYWORD1>
-		<KEYWORD1>_cu_c0</KEYWORD1>
-		<KEYWORD1>_cvar</KEYWORD1>
-		<KEYWORD1>_date2elapsed</KEYWORD1>
-		<KEYWORD1>_diag2mat</KEYWORD1>
-		<KEYWORD1>_diparm</KEYWORD1>
-		<KEYWORD1>_diparm_8</KEYWORD1>
-		<KEYWORD1>_dm_create</KEYWORD1>
-		<KEYWORD1>_dots</KEYWORD1>
-		<KEYWORD1>_e2r</KEYWORD1>
-		<KEYWORD1>_egennoby</KEYWORD1>
-		<KEYWORD1>_evlist</KEYWORD1>
-		<KEYWORD1>_exp_list_expand</KEYWORD1>
-		<KEYWORD1>_exp_list_parse</KEYWORD1>
-		<KEYWORD1>_find_tsops</KEYWORD1>
-		<KEYWORD1>_fr_area_parse_and_log</KEYWORD1>
-		<KEYWORD1>_fr_aspect_parse_and_log</KEYWORD1>
-		<KEYWORD1>_fr_draw_rect</KEYWORD1>
-		<KEYWORD1>_fr_droplines_draw</KEYWORD1>
-		<KEYWORD1>_fr_erasearr</KEYWORD1>
-		<KEYWORD1>_fr_legend_parse_and_log</KEYWORD1>
-		<KEYWORD1>_fr_merged_implicit</KEYWORD1>
-		<KEYWORD1>_fr_runlog</KEYWORD1>
-		<KEYWORD1>_fr_sztextbox_parse_and_log</KEYWORD1>
-		<KEYWORD1>_fr_tbstyle_parse_and_log</KEYWORD1>
-		<KEYWORD1>_fr_tedits_parse_and_log</KEYWORD1>
-		<KEYWORD1>_fr_textbox_parse_and_log</KEYWORD1>
-		<KEYWORD1>_fr_title_parse_and_log</KEYWORD1>
-		<KEYWORD1>_fr_x_log_cleanup</KEYWORD1>
-		<KEYWORD1>_fr_x_log_create</KEYWORD1>
-		<KEYWORD1>_fracchk</KEYWORD1>
-		<KEYWORD1>_fraccox</KEYWORD1>
-		<KEYWORD1>_fracddp</KEYWORD1>
-		<KEYWORD1>_fracdis</KEYWORD1>
-		<KEYWORD1>_fracdv</KEYWORD1>
-		<KEYWORD1>_fracin</KEYWORD1>
-		<KEYWORD1>_fracmdp</KEYWORD1>
-		<KEYWORD1>_fracord</KEYWORD1>
-		<KEYWORD1>_fracpp</KEYWORD1>
-		<KEYWORD1>_fracpv</KEYWORD1>
-		<KEYWORD1>_fracrep</KEYWORD1>
-		<KEYWORD1>_fracwgt</KEYWORD1>
-		<KEYWORD1>_fracxo</KEYWORD1>
-		<KEYWORD1>_frr_sztextbox_pnl</KEYWORD1>
-		<KEYWORD1>_gany</KEYWORD1>
-		<KEYWORD1>_ganycount</KEYWORD1>
-		<KEYWORD1>_ganymatch</KEYWORD1>
-		<KEYWORD1>_ganyvalue</KEYWORD1>
-		<KEYWORD1>_gconcat</KEYWORD1>
-		<KEYWORD1>_gcount</KEYWORD1>
-		<KEYWORD1>_gcut</KEYWORD1>
-		<KEYWORD1>_gdiff</KEYWORD1>
-		<KEYWORD1>_gends</KEYWORD1>
-		<KEYWORD1>_geqany</KEYWORD1>
-		<KEYWORD1>_get_diparmopts</KEYWORD1>
-		<KEYWORD1>_get_diparmopts_8</KEYWORD1>
-		<KEYWORD1>_get_eformopts</KEYWORD1>
-		<KEYWORD1>_get_eqspec</KEYWORD1>
-		<KEYWORD1>_get_gropts</KEYWORD1>
-		<KEYWORD1>_get_irf</KEYWORD1>
-		<KEYWORD1>_get_offopt</KEYWORD1>
-		<KEYWORD1>_getbv</KEYWORD1>
-		<KEYWORD1>_getcovcorr</KEYWORD1>
-		<KEYWORD1>_getfilename</KEYWORD1>
-		<KEYWORD1>_getnewlabelname</KEYWORD1>
-		<KEYWORD1>_getrhs</KEYWORD1>
-		<KEYWORD1>_getrres</KEYWORD1>
-		<KEYWORD1>_getvarcns</KEYWORD1>
-		<KEYWORD1>_getxel</KEYWORD1>
-		<KEYWORD1>_getxel2</KEYWORD1>
-		<KEYWORD1>_gfill</KEYWORD1>
-		<KEYWORD1>_ggroup</KEYWORD1>
-		<KEYWORD1>_giqr</KEYWORD1>
-		<KEYWORD1>_gkurt</KEYWORD1>
-		<KEYWORD1>_gladder</KEYWORD1>
-		<KEYWORD1>_glmfl</KEYWORD1>
-		<KEYWORD1>_glmilnk</KEYWORD1>
-		<KEYWORD1>_glmmapf</KEYWORD1>
-		<KEYWORD1>_glmmapl</KEYWORD1>
-		<KEYWORD1>_glmresd</KEYWORD1>
-		<KEYWORD1>_glmrpt</KEYWORD1>
-		<KEYWORD1>_glmwgt</KEYWORD1>
-		<KEYWORD1>_gm_edit</KEYWORD1>
-		<KEYWORD1>_gm_log</KEYWORD1>
-		<KEYWORD1>_gma</KEYWORD1>
-		<KEYWORD1>_gmad</KEYWORD1>
-		<KEYWORD1>_gmax</KEYWORD1>
-		<KEYWORD1>_gmdev</KEYWORD1>
-		<KEYWORD1>_gmdmean</KEYWORD1>
-		<KEYWORD1>_gmdmed</KEYWORD1>
-		<KEYWORD1>_gmean</KEYWORD1>
-		<KEYWORD1>_gmedian</KEYWORD1>
-		<KEYWORD1>_gmin</KEYWORD1>
-		<KEYWORD1>_gmode</KEYWORD1>
-		<KEYWORD1>_gmtr</KEYWORD1>
-		<KEYWORD1>_gneqany</KEYWORD1>
-		<KEYWORD1>_gpc</KEYWORD1>
-		<KEYWORD1>_gpctile</KEYWORD1>
-		<KEYWORD1>_gr_arrowhead</KEYWORD1>
-		<KEYWORD1>_gr_atomize_styles</KEYWORD1>
-		<KEYWORD1>_gr_common_axes</KEYWORD1>
-		<KEYWORD1>_gr_drawrect</KEYWORD1>
-		<KEYWORD1>_gr_linkstyles</KEYWORD1>
-		<KEYWORD1>_gr_symbol_of</KEYWORD1>
-		<KEYWORD1>_grank</KEYWORD1>
-		<KEYWORD1>_grank2</KEYWORD1>
-		<KEYWORD1>_grfirst</KEYWORD1>
-		<KEYWORD1>_grlast</KEYWORD1>
-		<KEYWORD1>_grmax</KEYWORD1>
-		<KEYWORD1>_grmean</KEYWORD1>
-		<KEYWORD1>_grmin</KEYWORD1>
-		<KEYWORD1>_grmiss</KEYWORD1>
-		<KEYWORD1>_grmiss2</KEYWORD1>
-		<KEYWORD1>_grobs</KEYWORD1>
-		<KEYWORD1>_growfirst</KEYWORD1>
-		<KEYWORD1>_growlast</KEYWORD1>
-		<KEYWORD1>_growmax</KEYWORD1>
-		<KEYWORD1>_growmean</KEYWORD1>
-		<KEYWORD1>_growmin</KEYWORD1>
-		<KEYWORD1>_growmiss</KEYWORD1>
-		<KEYWORD1>_grownonmiss</KEYWORD1>
-		<KEYWORD1>_growsd</KEYWORD1>
-		<KEYWORD1>_growtotal</KEYWORD1>
-		<KEYWORD1>_grsd</KEYWORD1>
-		<KEYWORD1>_grsum</KEYWORD1>
-		<KEYWORD1>_gs_addgrname</KEYWORD1>
-		<KEYWORD1>_gs_bygraph</KEYWORD1>
-		<KEYWORD1>_gs_clean_graphlist</KEYWORD1>
-		<KEYWORD1>_gs_default_bands</KEYWORD1>
-		<KEYWORD1>_gs_islivefile</KEYWORD1>
-		<KEYWORD1>_gs_parse_and_log_axoptions</KEYWORD1>
-		<KEYWORD1>_gs_parse_and_log_axtitle</KEYWORD1>
-		<KEYWORD1>_gs_parse_and_log_lines</KEYWORD1>
-		<KEYWORD1>_gs_parse_and_log_tickset</KEYWORD1>
-		<KEYWORD1>_gs_rdfilehdr</KEYWORD1>
-		<KEYWORD1>_gs_wrfilehdr</KEYWORD1>
-		<KEYWORD1>_gs_x_create</KEYWORD1>
-		<KEYWORD1>_gsd</KEYWORD1>
-		<KEYWORD1>_gseq</KEYWORD1>
-		<KEYWORD1>_gskew</KEYWORD1>
-		<KEYWORD1>_gsrank</KEYWORD1>
-		<KEYWORD1>_gstd</KEYWORD1>
-		<KEYWORD1>_gsum</KEYWORD1>
-		<KEYWORD1>_gtag</KEYWORD1>
-		<KEYWORD1>_gtma</KEYWORD1>
-		<KEYWORD1>_gtotal</KEYWORD1>
-		<KEYWORD1>_gtrank</KEYWORD1>
-		<KEYWORD1>_hadamard_verify</KEYWORD1>
-		<KEYWORD1>_hu</KEYWORD1>
-		<KEYWORD1>_hub</KEYWORD1>
-		<KEYWORD1>_hube</KEYWORD1>
-		<KEYWORD1>_huber</KEYWORD1>
-		<KEYWORD1>_hw_comp</KEYWORD1>
-		<KEYWORD1>_hw_opt_d0</KEYWORD1>
-		<KEYWORD1>_hwsa_comp</KEYWORD1>
-		<KEYWORD1>_hwsa_opt_d0</KEYWORD1>
-		<KEYWORD1>_hwsm_comp</KEYWORD1>
-		<KEYWORD1>_hwsm_opt_d0</KEYWORD1>
-		<KEYWORD1>_inlist</KEYWORD1>
-		<KEYWORD1>_invlist</KEYWORD1>
-		<KEYWORD1>_isfit</KEYWORD1>
-		<KEYWORD1>_ivreg_project</KEYWORD1>
-		<KEYWORD1>_jk_nlegend</KEYWORD1>
-		<KEYWORD1>_jk_pseudo</KEYWORD1>
-		<KEYWORD1>_jk_sum</KEYWORD1>
-		<KEYWORD1>_jprfpdt</KEYWORD1>
-		<KEYWORD1>_jprfpdx</KEYWORD1>
-		<KEYWORD1>_jprfpfp</KEYWORD1>
-		<KEYWORD1>_jprfpgn</KEYWORD1>
-		<KEYWORD1>_jprfpin</KEYWORD1>
-		<KEYWORD1>_jprfplx</KEYWORD1>
-		<KEYWORD1>_jprfpmm</KEYWORD1>
-		<KEYWORD1>_jprfppp</KEYWORD1>
-		<KEYWORD1>_jprfpre</KEYWORD1>
-		<KEYWORD1>_jprfprp</KEYWORD1>
-		<KEYWORD1>_jprfpse</KEYWORD1>
-		<KEYWORD1>_jprfptp</KEYWORD1>
-		<KEYWORD1>_jprfpxo</KEYWORD1>
-		<KEYWORD1>_jprglef</KEYWORD1>
-		<KEYWORD1>_jprglfl</KEYWORD1>
-		<KEYWORD1>_jprglil</KEYWORD1>
-		<KEYWORD1>_jprglld</KEYWORD1>
-		<KEYWORD1>_jprglwz</KEYWORD1>
-		<KEYWORD1>_jprxrpa</KEYWORD1>
-		<KEYWORD1>_kalman1</KEYWORD1>
-		<KEYWORD1>_ksmwrk</KEYWORD1>
-		<KEYWORD1>_labels2names</KEYWORD1>
-		<KEYWORD1>_ldrtest</KEYWORD1>
-		<KEYWORD1>_linemax</KEYWORD1>
-		<KEYWORD1>_line</KEYWORD1>
-		<KEYWORD1>_lines</KEYWORD1>
-		<KEYWORD1>_loop_brr</KEYWORD1>
-		<KEYWORD1>_loop_jknife</KEYWORD1>
-		<KEYWORD1>_loop_jknife2</KEYWORD1>
-		<KEYWORD1>_loop_jknife_fw</KEYWORD1>
-		<KEYWORD1>_loop_jknife_iw</KEYWORD1>
-		<KEYWORD1>_loop_rw</KEYWORD1>
-		<KEYWORD1>_lrtest7</KEYWORD1>
-		<KEYWORD1>_m2matrix</KEYWORD1>
-		<KEYWORD1>_m2scalar</KEYWORD1>
-		<KEYWORD1>_maked</KEYWORD1>
-		<KEYWORD1>_mat_clean_coleq</KEYWORD1>
-		<KEYWORD1>_matplot</KEYWORD1>
-		<KEYWORD1>_matsort</KEYWORD1>
-		<KEYWORD1>_mdisplay</KEYWORD1>
-		<KEYWORD1>_mds_classical</KEYWORD1>
-		<KEYWORD1>_mds_dataheader</KEYWORD1>
-		<KEYWORD1>_mds_display</KEYWORD1>
-		<KEYWORD1>_mds_display_classical</KEYWORD1>
-		<KEYWORD1>_mds_euclidean</KEYWORD1>
-		<KEYWORD1>_mds_parse_dopts</KEYWORD1>
-		<KEYWORD1>_mds_parse_method</KEYWORD1>
-		<KEYWORD1>_mds_parse_s2d</KEYWORD1>
-		<KEYWORD1>_mds_s2d</KEYWORD1>
-		<KEYWORD1>_me_der</KEYWORD1>
-		<KEYWORD1>_me_der2</KEYWORD1>
-		<KEYWORD1>_me_derb</KEYWORD1>
-		<KEYWORD1>_me_derd</KEYWORD1>
-		<KEYWORD1>_me_l_der</KEYWORD1>
-		<KEYWORD1>_me_l_der2</KEYWORD1>
-		<KEYWORD1>_mfrmvec</KEYWORD1>
-		<KEYWORD1>_mka2</KEYWORD1>
-		<KEYWORD1>_mkg</KEYWORD1>
-		<KEYWORD1>_mkkmn</KEYWORD1>
-		<KEYWORD1>_mksigma</KEYWORD1>
-		<KEYWORD1>_mkvec</KEYWORD1>
-		<KEYWORD1>_mprobitestimator</KEYWORD1>
-		<KEYWORD1>_mtest</KEYWORD1>
-		<KEYWORD1>_mvec</KEYWORD1>
-		<KEYWORD1>_newey</KEYWORD1>
-		<KEYWORD1>_nlout</KEYWORD1>
-		<KEYWORD1>_no_estat</KEYWORD1>
-		<KEYWORD1>_no_predict</KEYWORD1>
-		<KEYWORD1>_nobs</KEYWORD1>
-		<KEYWORD1>_on_colon_parse</KEYWORD1>
-		<KEYWORD1>_opnum</KEYWORD1>
-		<KEYWORD1>_parmlist</KEYWORD1>
-		<KEYWORD1>_parse_optexp</KEYWORD1>
-		<KEYWORD1>_parsevl</KEYWORD1>
-		<KEYWORD1>_parsewt</KEYWORD1>
-		<KEYWORD1>_partset</KEYWORD1>
-		<KEYWORD1>_pctile</KEYWORD1>
-		<KEYWORD1>_pk_p</KEYWORD1>
-		<KEYWORD1>_plotpos</KEYWORD1>
-		<KEYWORD1>_pred_me</KEYWORD1>
-		<KEYWORD1>_pred_missings</KEYWORD1>
-		<KEYWORD1>_pred_rules</KEYWORD1>
-		<KEYWORD1>_pred_se</KEYWORD1>
-		<KEYWORD1>_predict</KEYWORD1>
-		<KEYWORD1>_prefix_check4esample</KEYWORD1>
-		<KEYWORD1>_prefix_checkopt</KEYWORD1>
-		<KEYWORD1>_prefix_clear</KEYWORD1>
-		<KEYWORD1>_prefix_command</KEYWORD1>
-		<KEYWORD1>_prefix_depvarblocklist</KEYWORD1>
-		<KEYWORD1>_prefix_display</KEYWORD1>
-		<KEYWORD1>_prefix_expand</KEYWORD1>
-		<KEYWORD1>_prefix_explist</KEYWORD1>
-		<KEYWORD1>_prefix_footnote</KEYWORD1>
-		<KEYWORD1>_prefix_getchars</KEYWORD1>
-		<KEYWORD1>_prefix_getmat</KEYWORD1>
-		<KEYWORD1>_prefix_legend</KEYWORD1>
-		<KEYWORD1>_prefix_mlogit</KEYWORD1>
-		<KEYWORD1>_prefix_model_test</KEYWORD1>
-		<KEYWORD1>_prefix_note</KEYWORD1>
-		<KEYWORD1>_prefix_reject</KEYWORD1>
-		<KEYWORD1>_prefix_relabel_eqns</KEYWORD1>
-		<KEYWORD1>_prefix_run_error</KEYWORD1>
-		<KEYWORD1>_prefix_saving</KEYWORD1>
-		<KEYWORD1>_prefix_title</KEYWORD1>
-		<KEYWORD1>_prefix_varblocklist</KEYWORD1>
-		<KEYWORD1>_prefix_vcenotallowed</KEYWORD1>
-		<KEYWORD1>_qreg</KEYWORD1>
-		<KEYWORD1>_qregwls</KEYWORD1>
-		<KEYWORD1>_qsort_index</KEYWORD1>
-		<KEYWORD1>_qsur</KEYWORD1>
-		<KEYWORD1>_r2e</KEYWORD1>
-		<KEYWORD1>_repart</KEYWORD1>
-		<KEYWORD1>_repost</KEYWORD1>
-		<KEYWORD1>_resample_warn</KEYWORD1>
-		<KEYWORD1>_restore_labels</KEYWORD1>
-		<KEYWORD1>_result</KEYWORD1>
-		<KEYWORD1>_returnclear</KEYWORD1>
-		<KEYWORD1>_rmcoll</KEYWORD1>
-		<KEYWORD1>_rmcollright</KEYWORD1>
-		<KEYWORD1>_rmdcoll</KEYWORD1>
-		<KEYWORD1>_robksm</KEYWORD1>
-		<KEYWORD1>_robust</KEYWORD1>
-		<KEYWORD1>_robust2</KEYWORD1>
-		<KEYWORD1>_roccom1</KEYWORD1>
-		<KEYWORD1>_roccom1_8</KEYWORD1>
-		<KEYWORD1>_rocsen</KEYWORD1>
-		<KEYWORD1>_rotate_clear</KEYWORD1>
-		<KEYWORD1>_rotate_text</KEYWORD1>
-		<KEYWORD1>_score_spec</KEYWORD1>
-		<KEYWORD1>_sep_varsylags</KEYWORD1>
-		<KEYWORD1>_set_irf_vars</KEYWORD1>
-		<KEYWORD1>_sfran</KEYWORD1>
-		<KEYWORD1>_shortenpath</KEYWORD1>
-		<KEYWORD1>_sigfm</KEYWORD1>
-		<KEYWORD1>_small2dotz</KEYWORD1>
-		<KEYWORD1>_stata_internalerror</KEYWORD1>
-		<KEYWORD1>_stcurv</KEYWORD1>
-		<KEYWORD1>_strip_labels</KEYWORD1>
-		<KEYWORD1>_sttrend</KEYWORD1>
-		<KEYWORD1>_stubstar2names</KEYWORD1>
-		<KEYWORD1>_subchar</KEYWORD1>
-		<KEYWORD1>_sum_table</KEYWORD1>
-		<KEYWORD1>_sumaccum</KEYWORD1>
-		<KEYWORD1>_sunflower_binar</KEYWORD1>
-		<KEYWORD1>_svar_cnsmac</KEYWORD1>
-		<KEYWORD1>_svar_eqmac</KEYWORD1>
-		<KEYWORD1>_svar_newcns</KEYWORD1>
-		<KEYWORD1>_svar_post</KEYWORD1>
-		<KEYWORD1>_svard2</KEYWORD1>
-		<KEYWORD1>_svariden</KEYWORD1>
-		<KEYWORD1>_svaridenlr</KEYWORD1>
-		<KEYWORD1>_svarlrd2</KEYWORD1>
-		<KEYWORD1>_svd</KEYWORD1>
-		<KEYWORD1>_svy</KEYWORD1>
-		<KEYWORD1>_svy2</KEYWORD1>
-		<KEYWORD1>_svy_check_cmdopts</KEYWORD1>
-		<KEYWORD1>_svy_check_fpc</KEYWORD1>
-		<KEYWORD1>_svy_check_postw</KEYWORD1>
-		<KEYWORD1>_svy_check_predict</KEYWORD1>
-		<KEYWORD1>_svy_check_vce</KEYWORD1>
-		<KEYWORD1>_svy_fpc_note</KEYWORD1>
-		<KEYWORD1>_svy_ftest</KEYWORD1>
-		<KEYWORD1>_svy_ivreg_first</KEYWORD1>
-		<KEYWORD1>_svy_mkdeff</KEYWORD1>
-		<KEYWORD1>_svy_mkmeff</KEYWORD1>
-		<KEYWORD1>_svy_mkvmsp</KEYWORD1>
-		<KEYWORD1>_svy_mkvsrs</KEYWORD1>
-		<KEYWORD1>_svy_newrule</KEYWORD1>
-		<KEYWORD1>_svy_setup</KEYWORD1>
-		<KEYWORD1>_svy_singleton_note</KEYWORD1>
-		<KEYWORD1>_svy_subpop</KEYWORD1>
-		<KEYWORD1>_svy_subpop_note</KEYWORD1>
-		<KEYWORD1>_svy_summarize</KEYWORD1>
-		<KEYWORD1>_svy_summarize_legend</KEYWORD1>
-		<KEYWORD1>_svy_tabulate</KEYWORD1>
-		<KEYWORD1>_svydes_dlg</KEYWORD1>
-		<KEYWORD1>_svylc</KEYWORD1>
-		<KEYWORD1>_svyset</KEYWORD1>
-		<KEYWORD1>_sw_lik</KEYWORD1>
-		<KEYWORD1>_sw_lik2</KEYWORD1>
-		<KEYWORD1>_sw_ood</KEYWORD1>
-		<KEYWORD1>_ts</KEYWORD1>
-		<KEYWORD1>_ts_dexp</KEYWORD1>
-		<KEYWORD1>_ts_dsmp</KEYWORD1>
-		<KEYWORD1>_ts_exp</KEYWORD1>
-		<KEYWORD1>_ts_flag</KEYWORD1>
-		<KEYWORD1>_ts_gdat</KEYWORD1>
-		<KEYWORD1>_ts_hw</KEYWORD1>
-		<KEYWORD1>_ts_hwsa</KEYWORD1>
-		<KEYWORD1>_ts_hwsm</KEYWORD1>
-		<KEYWORD1>_ts_meqn</KEYWORD1>
-		<KEYWORD1>_ts_pars</KEYWORD1>
-		<KEYWORD1>_ts_peri</KEYWORD1>
-		<KEYWORD1>_tsheadr</KEYWORD1>
-		<KEYWORD1>_tsinchk</KEYWORD1>
-		<KEYWORD1>_tsma</KEYWORD1>
-		<KEYWORD1>_ttest</KEYWORD1>
-		<KEYWORD1>_ttest1</KEYWORD1>
-		<KEYWORD1>_ttest2</KEYWORD1>
-		<KEYWORD1>_tutends</KEYWORD1>
-		<KEYWORD1>_tx_mtr1</KEYWORD1>
-		<KEYWORD1>_tx_mtr2</KEYWORD1>
-		<KEYWORD1>_tx_mtr3</KEYWORD1>
-		<KEYWORD1>_tx_mtr4</KEYWORD1>
-		<KEYWORD1>_tx_mtr5</KEYWORD1>
-		<KEYWORD1>_tx_rpl</KEYWORD1>
-		<KEYWORD1>_var_mka</KEYWORD1>
-		<KEYWORD1>_varbsf</KEYWORD1>
-		<KEYWORD1>_vardisprmse</KEYWORD1>
-		<KEYWORD1>_varfcast</KEYWORD1>
-		<KEYWORD1>_varfcast_clear</KEYWORD1>
-		<KEYWORD1>_varfcast_fcast</KEYWORD1>
-		<KEYWORD1>_varfcast_graph</KEYWORD1>
-		<KEYWORD1>_varirf</KEYWORD1>
-		<KEYWORD1>_varsim</KEYWORD1>
-		<KEYWORD1>_vce_parserun</KEYWORD1>
-		<KEYWORD1>_vec_ckgraph</KEYWORD1>
-		<KEYWORD1>_vec_dreduced</KEYWORD1>
-		<KEYWORD1>_vec_grcroots</KEYWORD1>
-		<KEYWORD1>_vec_opck</KEYWORD1>
-		<KEYWORD1>_vec_pgparse</KEYWORD1>
-		<KEYWORD1>_vec_pgridplots</KEYWORD1>
-		<KEYWORD1>_vec_postvar</KEYWORD1>
-		<KEYWORD1>_vecauxdisp</KEYWORD1>
-		<KEYWORD1>_vecfcast_compute</KEYWORD1>
-		<KEYWORD1>_vecfcast_compute_w</KEYWORD1>
-		<KEYWORD1>_vecgetacns</KEYWORD1>
-		<KEYWORD1>_vecgetcv</KEYWORD1>
-		<KEYWORD1>_vecgtn</KEYWORD1>
-		<KEYWORD1>_vecmka</KEYWORD1>
-		<KEYWORD1>_vecmkapvp</KEYWORD1>
-		<KEYWORD1>_vecmkce</KEYWORD1>
-		<KEYWORD1>_vecmkgam</KEYWORD1>
-		<KEYWORD1>_vecmksi</KEYWORD1>
-		<KEYWORD1>_vecmktrend</KEYWORD1>
-		<KEYWORD1>_vecortho</KEYWORD1>
-		<KEYWORD1>_vecpclean</KEYWORD1>
-		<KEYWORD1>_vectparse</KEYWORD1>
-		<KEYWORD1>_vecu</KEYWORD1>
-		<KEYWORD1>_virf_add</KEYWORD1>
-		<KEYWORD1>_virf_char</KEYWORD1>
-		<KEYWORD1>_virf_fck</KEYWORD1>
-		<KEYWORD1>_virf_mknewfile</KEYWORD1>
-		<KEYWORD1>_virf_nlen</KEYWORD1>
-		<KEYWORD1>_virf_use</KEYWORD1>
-		<KEYWORD1>_wkapm</KEYWORD1>
-		<KEYWORD1>_writenum</KEYWORD1>
-		<KEYWORD1>_wsrvcrv</KEYWORD1>
-		<KEYWORD1>_xtreg_chk_cl</KEYWORD1>
-		<KEYWORD1>_xtreg_chk_cl2</KEYWORD1>
-		<KEYWORD1>_xtrenorm</KEYWORD1>
-		<KEYWORD1>about</KEYWORD1>
-		<KEYWORD1>abs</KEYWORD1>
-		<KEYWORD1>ac</KEYWORD1>
-		<KEYWORD1>ac_7</KEYWORD1>
-		<KEYWORD1>acprplot</KEYWORD1>
-		<KEYWORD1>acprplot_7</KEYWORD1>
-		<KEYWORD1>adjust</KEYWORD1>
-		<KEYWORD1>ado</KEYWORD1>
-		<KEYWORD1>adopath</KEYWORD1>
-		<KEYWORD1>adoupdate</KEYWORD1>
-		<KEYWORD1>alpha</KEYWORD1>
-		<KEYWORD1>ameans</KEYWORD1>
-		<KEYWORD1>an</KEYWORD1>
-		<KEYWORD1>ano</KEYWORD1>
-		<KEYWORD1>anov</KEYWORD1>
-		<KEYWORD1>anova</KEYWORD1>
-		<KEYWORD1>anova_estat</KEYWORD1>
-		<KEYWORD1>anova_terms</KEYWORD1>
-		<KEYWORD1>anovadef</KEYWORD1>
-		<KEYWORD1>aorder</KEYWORD1>
-		<KEYWORD1>arch</KEYWORD1>
-		<KEYWORD1>arch_dr</KEYWORD1>
-		<KEYWORD1>arch_estat</KEYWORD1>
-		<KEYWORD1>arch_p</KEYWORD1>
-		<KEYWORD1>archlm</KEYWORD1>
-		<KEYWORD1>areg</KEYWORD1>
-		<KEYWORD1>areg_p</KEYWORD1>
-		<KEYWORD1>args</KEYWORD1>
-		<KEYWORD1>arima</KEYWORD1>
-		<KEYWORD1>arima_dr</KEYWORD1>
-		<KEYWORD1>arima_estat</KEYWORD1>
-		<KEYWORD1>arima_p</KEYWORD1>
-		<KEYWORD1>as</KEYWORD1>
-		<KEYWORD1>asmprobit</KEYWORD1>
-		<KEYWORD1>asmprobit_estat</KEYWORD1>
-		<KEYWORD1>asmprobit_lf</KEYWORD1>
-		<KEYWORD1>asmprobit_mfx__dlg</KEYWORD1>
-		<KEYWORD1>asmprobit_p</KEYWORD1>
-		<KEYWORD1>ass</KEYWORD1>
-		<KEYWORD1>asse</KEYWORD1>
-		<KEYWORD1>asser</KEYWORD1>
-		<KEYWORD1>assert</KEYWORD1>
-		<KEYWORD1>avplot</KEYWORD1>
-		<KEYWORD1>avplot_7</KEYWORD1>
-		<KEYWORD1>avplots</KEYWORD1>
-		<KEYWORD1>avplots_7</KEYWORD1>
-		<KEYWORD1>bcskew0</KEYWORD1>
-		<KEYWORD1>be</KEYWORD1>
-		<KEYWORD1>bee</KEYWORD1>
-		<KEYWORD1>beep</KEYWORD1>
-		<KEYWORD1>bgodfrey</KEYWORD1>
-		<KEYWORD1>binreg</KEYWORD1>
-		<KEYWORD1>bip0_lf</KEYWORD1>
-		<KEYWORD1>bip0_lf7</KEYWORD1>
-		<KEYWORD1>biplot</KEYWORD1>
-		<KEYWORD1>bipp_lf</KEYWORD1>
-		<KEYWORD1>bipp_lf7</KEYWORD1>
-		<KEYWORD1>bipr_lf</KEYWORD1>
-		<KEYWORD1>bipr_lf7</KEYWORD1>
-		<KEYWORD1>bipr_p</KEYWORD1>
-		<KEYWORD1>bipr_p7</KEYWORD1>
-		<KEYWORD1>biprobit</KEYWORD1>
-		<KEYWORD1>biprobit7</KEYWORD1>
-		<KEYWORD1>bitest</KEYWORD1>
-		<KEYWORD1>bitesti</KEYWORD1>
-		<KEYWORD1>bitowt</KEYWORD1>
-		<KEYWORD1>blogit</KEYWORD1>
-		<KEYWORD1>bmemsize</KEYWORD1>
-		<KEYWORD1>boot</KEYWORD1>
-		<KEYWORD1>bootsamp</KEYWORD1>
-		<KEYWORD1>bootstrap</KEYWORD1>
-		<KEYWORD1>bootstrap_8</KEYWORD1>
-		<KEYWORD1>boxco_l</KEYWORD1>
-		<KEYWORD1>boxco_p</KEYWORD1>
-		<KEYWORD1>boxcox</KEYWORD1>
-		<KEYWORD1>boxcox_6</KEYWORD1>
-		<KEYWORD1>boxcox_p</KEYWORD1>
-		<KEYWORD1>bprobit</KEYWORD1>
-		<KEYWORD1>break</KEYWORD1>
-		<KEYWORD1>brier</KEYWORD1>
-		<KEYWORD1>brr</KEYWORD1>
-		<KEYWORD1>brrstat</KEYWORD1>
-		<KEYWORD1>bs</KEYWORD1>
-		<KEYWORD1>bs_7</KEYWORD1>
-		<KEYWORD1>bsampl_w</KEYWORD1>
-		<KEYWORD1>bsample</KEYWORD1>
-		<KEYWORD1>bsample_7</KEYWORD1>
-		<KEYWORD1>bsqreg</KEYWORD1>
-		<KEYWORD1>bstat</KEYWORD1>
-		<KEYWORD1>bstat_7</KEYWORD1>
-		<KEYWORD1>bstat_8</KEYWORD1>
-		<KEYWORD1>bstrap</KEYWORD1>
-		<KEYWORD1>bstrap_7</KEYWORD1>
-		<KEYWORD1>c_local</KEYWORD1>
-		<KEYWORD1>ca</KEYWORD1>
-		<KEYWORD1>ca_estat</KEYWORD1>
-		<KEYWORD1>ca_p</KEYWORD1>
-		<KEYWORD1>cabiplot</KEYWORD1>
-		<KEYWORD1>camat</KEYWORD1>
-		<KEYWORD1>canon</KEYWORD1>
-		<KEYWORD1>canon_8</KEYWORD1>
-		<KEYWORD1>canon_8_p</KEYWORD1>
-		<KEYWORD1>canon_estat</KEYWORD1>
-		<KEYWORD1>canon_p</KEYWORD1>
-		<KEYWORD1>caprojection</KEYWORD1>
-		<KEYWORD1>cat</KEYWORD1>
-		<KEYWORD1>cc</KEYWORD1>
-		<KEYWORD1>cchart</KEYWORD1>
-		<KEYWORD1>cchart_7</KEYWORD1>
-		<KEYWORD1>cci</KEYWORD1>
-		<KEYWORD1>cd</KEYWORD1>
-		<KEYWORD1>censobs_table</KEYWORD1>
-		<KEYWORD1>centile</KEYWORD1>
-		<KEYWORD1>cf</KEYWORD1>
-		<KEYWORD1>char</KEYWORD1>
-		<KEYWORD1>chdir</KEYWORD1>
-		<KEYWORD1>checkdlgfiles</KEYWORD1>
-		<KEYWORD1>checkestimationsample</KEYWORD1>
-		<KEYWORD1>checkhlpfiles</KEYWORD1>
-		<KEYWORD1>checksum</KEYWORD1>
-		<KEYWORD1>ci</KEYWORD1>
-		<KEYWORD1>cii</KEYWORD1>
-		<KEYWORD1>cksum</KEYWORD1>
-		<KEYWORD1>clear</KEYWORD1>
-		<KEYWORD1>clo</KEYWORD1>
-		<KEYWORD1>clocal</KEYWORD1>
-		<KEYWORD1>clog</KEYWORD1>
-		<KEYWORD1>clog_lf</KEYWORD1>
-		<KEYWORD1>clog_p</KEYWORD1>
-		<KEYWORD1>clogi</KEYWORD1>
-		<KEYWORD1>clogi_sw</KEYWORD1>
-		<KEYWORD1>clogit</KEYWORD1>
-		<KEYWORD1>clogit_lf</KEYWORD1>
-		<KEYWORD1>clogit_p</KEYWORD1>
-		<KEYWORD1>clogitp</KEYWORD1>
-		<KEYWORD1>clogl_sw</KEYWORD1>
-		<KEYWORD1>cloglog</KEYWORD1>
-		<KEYWORD1>clonevar</KEYWORD1>
-		<KEYWORD1>clslistarray</KEYWORD1>
-		<KEYWORD1>cluster</KEYWORD1>
-		<KEYWORD1>cluster_measures</KEYWORD1>
-		<KEYWORD1>cluster_stop</KEYWORD1>
-		<KEYWORD1>cluster_tree</KEYWORD1>
-		<KEYWORD1>cluster_tree_8</KEYWORD1>
-		<KEYWORD1>clustermat</KEYWORD1>
-		<KEYWORD1>cnr</KEYWORD1>
-		<KEYWORD1>cnre</KEYWORD1>
-		<KEYWORD1>cnreg</KEYWORD1>
-		<KEYWORD1>cnreg_p</KEYWORD1>
-		<KEYWORD1>cnreg_sw</KEYWORD1>
-		<KEYWORD1>cnsreg</KEYWORD1>
-		<KEYWORD1>codebook</KEYWORD1>
-		<KEYWORD1>collaps4</KEYWORD1>
-		<KEYWORD1>collapse</KEYWORD1>
-		<KEYWORD1>colormult_nb</KEYWORD1>
-		<KEYWORD1>colormult_nw</KEYWORD1>
-		<KEYWORD1>conf</KEYWORD1>
-		<KEYWORD1>confi</KEYWORD1>
-		<KEYWORD1>confir</KEYWORD1>
-		<KEYWORD1>confirm</KEYWORD1>
-		<KEYWORD1>conren</KEYWORD1>
-		<KEYWORD1>cons</KEYWORD1>
-		<KEYWORD1>const</KEYWORD1>
-		<KEYWORD1>constr</KEYWORD1>
-		<KEYWORD1>constra</KEYWORD1>
-		<KEYWORD1>constrai</KEYWORD1>
-		<KEYWORD1>constrain</KEYWORD1>
-		<KEYWORD1>constraint</KEYWORD1>
-		<KEYWORD1>contract</KEYWORD1>
-		<KEYWORD1>copy</KEYWORD1>
-		<KEYWORD1>copyright</KEYWORD1>
-		<KEYWORD1>copysource</KEYWORD1>
-		<KEYWORD1>cor</KEYWORD1>
-		<KEYWORD1>corc</KEYWORD1>
-		<KEYWORD1>corr</KEYWORD1>
-		<KEYWORD1>corr2data</KEYWORD1>
-		<KEYWORD1>corr_anti</KEYWORD1>
-		<KEYWORD1>corr_kmo</KEYWORD1>
-		<KEYWORD1>corr_smc</KEYWORD1>
-		<KEYWORD1>corre</KEYWORD1>
-		<KEYWORD1>correl</KEYWORD1>
-		<KEYWORD1>correla</KEYWORD1>
-		<KEYWORD1>correlat</KEYWORD1>
-		<KEYWORD1>correlate</KEYWORD1>
-		<KEYWORD1>corrgram</KEYWORD1>
-		<KEYWORD1>cou</KEYWORD1>
-		<KEYWORD1>coun</KEYWORD1>
-		<KEYWORD1>count</KEYWORD1>
-		<KEYWORD1>cox</KEYWORD1>
-		<KEYWORD1>cox_p</KEYWORD1>
-		<KEYWORD1>cox_sw</KEYWORD1>
-		<KEYWORD1>coxbase</KEYWORD1>
-		<KEYWORD1>coxhaz</KEYWORD1>
-		<KEYWORD1>coxvar</KEYWORD1>
-		<KEYWORD1>cp</KEYWORD1>
-		<KEYWORD1>cprplot</KEYWORD1>
-		<KEYWORD1>cprplot_7</KEYWORD1>
-		<KEYWORD1>crc</KEYWORD1>
-		<KEYWORD1>cross</KEYWORD1>
-		<KEYWORD1>cs</KEYWORD1>
-		<KEYWORD1>cscript</KEYWORD1>
-		<KEYWORD1>cscript_log</KEYWORD1>
-		<KEYWORD1>csi</KEYWORD1>
-		<KEYWORD1>ct</KEYWORD1>
-		<KEYWORD1>ct_is</KEYWORD1>
-		<KEYWORD1>ctset</KEYWORD1>
-		<KEYWORD1>ctst_5</KEYWORD1>
-		<KEYWORD1>ctst_st</KEYWORD1>
-		<KEYWORD1>cttost</KEYWORD1>
-		<KEYWORD1>cumsp</KEYWORD1>
-		<KEYWORD1>cumsp_7</KEYWORD1>
-		<KEYWORD1>cumul</KEYWORD1>
-		<KEYWORD1>cusum</KEYWORD1>
-		<KEYWORD1>cusum_7</KEYWORD1>
-		<KEYWORD1>cutil</KEYWORD1>
-		<KEYWORD1>d</KEYWORD1>
-		<KEYWORD1>datetof</KEYWORD1>
-		<KEYWORD1>db</KEYWORD1>
-		<KEYWORD1>dbeta</KEYWORD1>
-		<KEYWORD1>de</KEYWORD1>
-		<KEYWORD1>debug</KEYWORD1>
-		<KEYWORD1>debugbuf</KEYWORD1>
-		<KEYWORD1>dec</KEYWORD1>
-		<KEYWORD1>deco</KEYWORD1>
-		<KEYWORD1>decod</KEYWORD1>
-		<KEYWORD1>decode</KEYWORD1>
-		<KEYWORD1>deff</KEYWORD1>
-		<KEYWORD1>des</KEYWORD1>
-		<KEYWORD1>desc</KEYWORD1>
-		<KEYWORD1>descr</KEYWORD1>
-		<KEYWORD1>descri</KEYWORD1>
-		<KEYWORD1>describ</KEYWORD1>
-		<KEYWORD1>describe</KEYWORD1>
-		<KEYWORD1>destring</KEYWORD1>
-		<KEYWORD1>dfbeta</KEYWORD1>
-		<KEYWORD1>dfgls</KEYWORD1>
-		<KEYWORD1>dfuller</KEYWORD1>
-		<KEYWORD1>diff</KEYWORD1>
-		<KEYWORD1>dir</KEYWORD1>
-		<KEYWORD1>dirstats</KEYWORD1>
-		<KEYWORD1>discard</KEYWORD1>
-		<KEYWORD1>disp_res</KEYWORD1>
-		<KEYWORD1>disp_s</KEYWORD1>
-		<KEYWORD1>doe</KEYWORD1>
-		<KEYWORD1>doed</KEYWORD1>
-		<KEYWORD1>doedi</KEYWORD1>
-		<KEYWORD1>doedit</KEYWORD1>
-		<KEYWORD1>dotplot</KEYWORD1>
-		<KEYWORD1>dotplot_7</KEYWORD1>
-		<KEYWORD1>dprobit</KEYWORD1>
-		<KEYWORD1>drawnorm</KEYWORD1>
-		<KEYWORD1>ds</KEYWORD1>
-		<KEYWORD1>ds_util</KEYWORD1>
-		<KEYWORD1>dstdize</KEYWORD1>
-		<KEYWORD1>duplicates</KEYWORD1>
-		<KEYWORD1>durbina</KEYWORD1>
-		<KEYWORD1>dwstat</KEYWORD1>
-		<KEYWORD1>dydx</KEYWORD1>
-		<KEYWORD1>dynre</KEYWORD1>
-		<KEYWORD1>dynren</KEYWORD1>
-		<KEYWORD1>ed</KEYWORD1>
-		<KEYWORD1>edi</KEYWORD1>
-		<KEYWORD1>edit</KEYWORD1>
-		<KEYWORD1>egen</KEYWORD1>
-		<KEYWORD1>eivreg</KEYWORD1>
-		<KEYWORD1>emdef</KEYWORD1>
-		<KEYWORD1>en</KEYWORD1>
-		<KEYWORD1>enc</KEYWORD1>
-		<KEYWORD1>enco</KEYWORD1>
-		<KEYWORD1>encod</KEYWORD1>
-		<KEYWORD1>encode</KEYWORD1>
-		<KEYWORD1>enter</KEYWORD1>
-		<!--<KEYWORD1>eq</KEYWORD1>-->	
-		<KEYWORD1>ereg</KEYWORD1>
-		<KEYWORD1>ereg_lf</KEYWORD1>
-		<KEYWORD1>ereg_p</KEYWORD1>
-		<KEYWORD1>ereg_sw</KEYWORD1>
-		<KEYWORD1>ereghet</KEYWORD1>
-		<KEYWORD1>ereghet_glf</KEYWORD1>
-		<KEYWORD1>ereghet_glf_sh</KEYWORD1>
-		<KEYWORD1>ereghet_gp</KEYWORD1>
-		<KEYWORD1>ereghet_ilf</KEYWORD1>
-		<KEYWORD1>ereghet_ilf_sh</KEYWORD1>
-		<KEYWORD1>ereghet_ip</KEYWORD1>
-		<KEYWORD1>err</KEYWORD1>
-		<KEYWORD1>erro</KEYWORD1>
-		<KEYWORD1>error</KEYWORD1>
-		<KEYWORD1>estimates</KEYWORD1>
-		<KEYWORD1>estimate</KEYWORD1>
-		<KEYWORD1>estimat</KEYWORD1>
-		<KEYWORD1>estima</KEYWORD1>
-		<KEYWORD1>estim</KEYWORD1>
-		<KEYWORD1>esti</KEYWORD1>
-		<KEYWORD1>est</KEYWORD1>
-		<KEYWORD1>est_cfexist</KEYWORD1>
-		<KEYWORD1>est_cfname</KEYWORD1>
-		<KEYWORD1>est_clickable</KEYWORD1>
-		<KEYWORD1>est_expand</KEYWORD1>
-		<KEYWORD1>est_hold</KEYWORD1>
-		<KEYWORD1>est_table</KEYWORD1>
-		<KEYWORD1>est_unhold</KEYWORD1>
-		<KEYWORD1>est_unholdok</KEYWORD1>
-		<KEYWORD1>estat</KEYWORD1>
-		<KEYWORD1>estat_default</KEYWORD1>
-		<KEYWORD1>estat_summ</KEYWORD1>
-		<KEYWORD1>estat_vce_only</KEYWORD1>
-		<KEYWORD1>esti</KEYWORD1>
-		<KEYWORD1>estim</KEYWORD1>
-		<KEYWORD1>estima</KEYWORD1>
-		<KEYWORD1>estimat</KEYWORD1>
-		<KEYWORD1>estimate</KEYWORD1>
-		<KEYWORD1>etodow</KEYWORD1>
-		<KEYWORD1>etof</KEYWORD1>
-		<KEYWORD1>etomdy</KEYWORD1>
-		<KEYWORD1>ex</KEYWORD1>
-		<KEYWORD1>exec</KEYWORD1>
-		<KEYWORD1>execu</KEYWORD1>
-		<KEYWORD1>execut</KEYWORD1>
-		<KEYWORD1>execute</KEYWORD1>
-		<KEYWORD1>exi</KEYWORD1>
-		<KEYWORD1>exit</KEYWORD1>
-		<KEYWORD1>expandcl</KEYWORD1>
-		<KEYWORD1>export</KEYWORD1>
-		<KEYWORD1>fac</KEYWORD1>
-		<KEYWORD1>fact</KEYWORD1>
-		<KEYWORD1>facto</KEYWORD1>
-		<KEYWORD1>factor</KEYWORD1>
-		<KEYWORD1>factor_estat</KEYWORD1>
-		<KEYWORD1>factor_p</KEYWORD1>
-		<KEYWORD1>factor_pca_rotated</KEYWORD1>
-		<KEYWORD1>factor_rotate</KEYWORD1>
-		<KEYWORD1>factormat</KEYWORD1>
-		<KEYWORD1>failure</KEYWORD1>
-		<KEYWORD1>fcast</KEYWORD1>
-		<KEYWORD1>fcast_compute</KEYWORD1>
-		<KEYWORD1>fcast_graph</KEYWORD1>
-		<KEYWORD1>fft</KEYWORD1>
-		<KEYWORD1>fh_st</KEYWORD1>
-		<KEYWORD1>fillin</KEYWORD1>
-		<KEYWORD1>find_hlp_file</KEYWORD1>
-		<KEYWORD1>findit</KEYWORD1>
-		<KEYWORD1>findit_7</KEYWORD1>
-		<KEYWORD1>fit</KEYWORD1>
-		<!--<KEYWORD1>for</KEYWORD1>-->
-		<KEYWORD1>for5_0</KEYWORD1>
-		<KEYWORD1>force</KEYWORD1>
-		<KEYWORD1>form</KEYWORD1>
-		<KEYWORD1>forma</KEYWORD1>
-		<KEYWORD1>format</KEYWORD1>
-		<KEYWORD1>fpredict</KEYWORD1>
-		<KEYWORD1>frac_154</KEYWORD1>
-		<KEYWORD1>frac_adj</KEYWORD1>
-		<KEYWORD1>frac_chk</KEYWORD1>
-		<KEYWORD1>frac_cox</KEYWORD1>
-		<KEYWORD1>frac_ddp</KEYWORD1>
-		<KEYWORD1>frac_dis</KEYWORD1>
-		<KEYWORD1>frac_dv</KEYWORD1>
-		<KEYWORD1>frac_in</KEYWORD1>
-		<KEYWORD1>frac_mun</KEYWORD1>
-		<KEYWORD1>frac_pp</KEYWORD1>
-		<KEYWORD1>frac_pq</KEYWORD1>
-		<KEYWORD1>frac_pv</KEYWORD1>
-		<KEYWORD1>frac_wgt</KEYWORD1>
-		<KEYWORD1>frac_xo</KEYWORD1>
-		<KEYWORD1>fracgen</KEYWORD1>
-		<KEYWORD1>fracplot</KEYWORD1>
-		<KEYWORD1>fracplot_7</KEYWORD1>
-		<KEYWORD1>fracpoly</KEYWORD1>
-		<KEYWORD1>fracpred</KEYWORD1>
-		<KEYWORD1>fron_ex</KEYWORD1>
-		<KEYWORD1>fron_hn</KEYWORD1>
-		<KEYWORD1>fron_p</KEYWORD1>
-		<KEYWORD1>fron_tn</KEYWORD1>
-		<KEYWORD1>fron_tn2</KEYWORD1>
-		<KEYWORD1>frontier</KEYWORD1>
-		<KEYWORD1>ftodate</KEYWORD1>
-		<KEYWORD1>ftoe</KEYWORD1>
-		<KEYWORD1>ftomdy</KEYWORD1>
-		<KEYWORD1>ftowdate</KEYWORD1>
-		<KEYWORD1>g</KEYWORD1>
-		<KEYWORD1>gamhet_glf</KEYWORD1>
-		<KEYWORD1>gamhet_gp</KEYWORD1>
-		<KEYWORD1>gamhet_ilf</KEYWORD1>
-		<KEYWORD1>gamhet_ip</KEYWORD1>
-		<KEYWORD1>gamma</KEYWORD1>
-		<KEYWORD1>gamma_d2</KEYWORD1>
-		<KEYWORD1>gamma_lf</KEYWORD1>
-		<KEYWORD1>gamma_p</KEYWORD1>
-		<KEYWORD1>gamma_sw</KEYWORD1>
-		<KEYWORD1>gammahet</KEYWORD1>
-		<KEYWORD1>gdi_hexagon</KEYWORD1>
-		<KEYWORD1>gdi_spokes</KEYWORD1>
-		<KEYWORD1>ge</KEYWORD1>
-		<KEYWORD1>gen</KEYWORD1>
-		<KEYWORD1>gene</KEYWORD1>
-		<KEYWORD1>gener</KEYWORD1>
-		<KEYWORD1>genera</KEYWORD1>
-		<KEYWORD1>generat</KEYWORD1>
-		<KEYWORD1>generate</KEYWORD1>
-		<KEYWORD1>genrank</KEYWORD1>
-		<KEYWORD1>genstd</KEYWORD1>
-		<KEYWORD1>genvmean</KEYWORD1>
-		<KEYWORD1>gettoken</KEYWORD1>
-		<KEYWORD1>gl</KEYWORD1>
-		<KEYWORD1>gladder</KEYWORD1>
-		<KEYWORD1>gladder_7</KEYWORD1>
-		<KEYWORD1>glim_l01</KEYWORD1>
-		<KEYWORD1>glim_l02</KEYWORD1>
-		<KEYWORD1>glim_l03</KEYWORD1>
-		<KEYWORD1>glim_l04</KEYWORD1>
-		<KEYWORD1>glim_l05</KEYWORD1>
-		<KEYWORD1>glim_l06</KEYWORD1>
-		<KEYWORD1>glim_l07</KEYWORD1>
-		<KEYWORD1>glim_l08</KEYWORD1>
-		<KEYWORD1>glim_l09</KEYWORD1>
-		<KEYWORD1>glim_l10</KEYWORD1>
-		<KEYWORD1>glim_l11</KEYWORD1>
-		<KEYWORD1>glim_l12</KEYWORD1>
-		<KEYWORD1>glim_lf</KEYWORD1>
-		<KEYWORD1>glim_mu</KEYWORD1>
-		<KEYWORD1>glim_nw1</KEYWORD1>
-		<KEYWORD1>glim_nw2</KEYWORD1>
-		<KEYWORD1>glim_nw3</KEYWORD1>
-		<KEYWORD1>glim_p</KEYWORD1>
-		<KEYWORD1>glim_v1</KEYWORD1>
-		<KEYWORD1>glim_v2</KEYWORD1>
-		<KEYWORD1>glim_v3</KEYWORD1>
-		<KEYWORD1>glim_v4</KEYWORD1>
-		<KEYWORD1>glim_v5</KEYWORD1>
-		<KEYWORD1>glim_v6</KEYWORD1>
-		<KEYWORD1>glim_v7</KEYWORD1>
-		<KEYWORD1>glm</KEYWORD1>
-		<KEYWORD1>glm_6</KEYWORD1>
-		<KEYWORD1>glm_p</KEYWORD1>
-		<KEYWORD1>glm_sw</KEYWORD1>
-		<KEYWORD1>glmpred</KEYWORD1>
-		<KEYWORD1>glogit</KEYWORD1>
-		<KEYWORD1>glogit_8</KEYWORD1>
-		<KEYWORD1>glogit_p</KEYWORD1>
-		<KEYWORD1>gmeans</KEYWORD1>
-		<KEYWORD1>gnbre_lf</KEYWORD1>
-		<KEYWORD1>gnbreg</KEYWORD1>
-		<KEYWORD1>gnbreg_5</KEYWORD1>
-		<KEYWORD1>gnbreg_p</KEYWORD1>
-		<KEYWORD1>gomp_lf</KEYWORD1>
-		<KEYWORD1>gompe_sw</KEYWORD1>
-		<KEYWORD1>gomper_p</KEYWORD1>
-		<KEYWORD1>gompertz</KEYWORD1>
-		<KEYWORD1>gompertzhet</KEYWORD1>
-		<KEYWORD1>gomphet_glf</KEYWORD1>
-		<KEYWORD1>gomphet_glf_sh</KEYWORD1>
-		<KEYWORD1>gomphet_gp</KEYWORD1>
-		<KEYWORD1>gomphet_ilf</KEYWORD1>
-		<KEYWORD1>gomphet_ilf_sh</KEYWORD1>
-		<KEYWORD1>gomphet_ip</KEYWORD1>
-		<KEYWORD1>gph</KEYWORD1>
-		<KEYWORD1>gphdot</KEYWORD1>
-		<KEYWORD1>gphpen</KEYWORD1>
-		<KEYWORD1>gphprint</KEYWORD1>
-		<KEYWORD1>gprobi_p</KEYWORD1>
-		<KEYWORD1>gprobit</KEYWORD1>
-		<KEYWORD1>gprobit_8</KEYWORD1>
-		<KEYWORD1>gr</KEYWORD1>
-		<KEYWORD1>gr_copy</KEYWORD1>
-		<KEYWORD1>gr_current</KEYWORD1>
-		<KEYWORD1>gr_db</KEYWORD1>
-		<KEYWORD1>gr_describe</KEYWORD1>
-		<KEYWORD1>gr_dir</KEYWORD1>
-		<KEYWORD1>gr_draw</KEYWORD1>
-		<KEYWORD1>gr_draw_replay</KEYWORD1>
-		<KEYWORD1>gr_drop</KEYWORD1>
-		<KEYWORD1>gr_edit</KEYWORD1>
-		<KEYWORD1>gr_editviewopts</KEYWORD1>
-		<KEYWORD1>gr_example</KEYWORD1>
-		<KEYWORD1>gr_example2</KEYWORD1>
-		<KEYWORD1>gr_export</KEYWORD1>
-		<KEYWORD1>gr_print</KEYWORD1>
-		<KEYWORD1>gr_qscheme</KEYWORD1>
-		<KEYWORD1>gr_query</KEYWORD1>
-		<KEYWORD1>gr_read</KEYWORD1>
-		<KEYWORD1>gr_rename</KEYWORD1>
-		<KEYWORD1>gr_replay</KEYWORD1>
-		<KEYWORD1>gr_save</KEYWORD1>
-		<KEYWORD1>gr_set</KEYWORD1>
-		<KEYWORD1>gr_setscheme</KEYWORD1>
-		<KEYWORD1>gr_table</KEYWORD1>
-		<KEYWORD1>gr_undo</KEYWORD1>
-		<KEYWORD1>gr_use</KEYWORD1>
-		<KEYWORD1>gra</KEYWORD1>
-		<KEYWORD1>grap</KEYWORD1>
-		<KEYWORD1>graph</KEYWORD1>
-		<KEYWORD1>grebar</KEYWORD1>
-		<KEYWORD1>greigen</KEYWORD1>
-		<KEYWORD1>greigen_7</KEYWORD1>
-		<KEYWORD1>greigen_8</KEYWORD1>
-		<KEYWORD1>grmeanby</KEYWORD1>
-		<KEYWORD1>grmeanby_7</KEYWORD1>
-		<KEYWORD1>gs_fileinfo</KEYWORD1>
-		<KEYWORD1>gs_filetype</KEYWORD1>
-		<KEYWORD1>gs_graphinfo</KEYWORD1>
-		<KEYWORD1>gs_stat</KEYWORD1>
-		<KEYWORD1>gsort</KEYWORD1>
-		<KEYWORD1>gwood</KEYWORD1>
-		<KEYWORD1>h</KEYWORD1>
-		<KEYWORD1>hadimvo</KEYWORD1>
-		<KEYWORD1>hareg</KEYWORD1>
-		<KEYWORD1>hausman</KEYWORD1>
-		<KEYWORD1>he</KEYWORD1>
-		<KEYWORD1>heck_d2</KEYWORD1>
-		<KEYWORD1>heckma_p</KEYWORD1>
-		<KEYWORD1>heckman</KEYWORD1>
-		<KEYWORD1>heckp_lf</KEYWORD1>
-		<KEYWORD1>heckpr_p</KEYWORD1>
-		<KEYWORD1>heckprob</KEYWORD1>
-		<KEYWORD1>hel</KEYWORD1>
-		<KEYWORD1>help</KEYWORD1>
-		<KEYWORD1>helpchk</KEYWORD1>
-		<KEYWORD1>hereg</KEYWORD1>
-		<KEYWORD1>hetpr_lf</KEYWORD1>
-		<KEYWORD1>hetpr_p</KEYWORD1>
-		<KEYWORD1>hetprob</KEYWORD1>
-		<KEYWORD1>hettest</KEYWORD1>
-		<KEYWORD1>hilite</KEYWORD1>
-		<KEYWORD1>hist</KEYWORD1>
-		<KEYWORD1>hist_7</KEYWORD1>
-		<KEYWORD1>histogram</KEYWORD1>
-		<KEYWORD1>hlogit</KEYWORD1>
-		<KEYWORD1>hlu</KEYWORD1>
-		<KEYWORD1>hmeans</KEYWORD1>
-		<KEYWORD1>hotel</KEYWORD1>
-		<KEYWORD1>hotelling</KEYWORD1>
-		<KEYWORD1>hprobit</KEYWORD1>
-		<KEYWORD1>hreg</KEYWORD1>
-		<KEYWORD1>hsearch</KEYWORD1>
-		<KEYWORD1>icd9</KEYWORD1>
-		<KEYWORD1>icd9_ff</KEYWORD1>
-		<KEYWORD1>icd9p</KEYWORD1>
-		<KEYWORD1>id</KEYWORD1>
-		<KEYWORD1>iis</KEYWORD1>
-		<KEYWORD1>impute</KEYWORD1>
-		<KEYWORD1>imtest</KEYWORD1>
-		<KEYWORD1>inbase</KEYWORD1>
-		<KEYWORD1>inf</KEYWORD1>
-		<KEYWORD1>infi</KEYWORD1>
-		<KEYWORD1>infil</KEYWORD1>
-		<KEYWORD1>infile</KEYWORD1>
-		<KEYWORD1>infix</KEYWORD1>
-		<KEYWORD1>inflate</KEYWORD1>
-		<KEYWORD1>inp</KEYWORD1>
-		<KEYWORD1>inpu</KEYWORD1>
-		<KEYWORD1>input</KEYWORD1>
-		<KEYWORD1>ins</KEYWORD1>
-		<KEYWORD1>insh</KEYWORD1>
-		<KEYWORD1>inshe</KEYWORD1>
-		<KEYWORD1>inshee</KEYWORD1>
-		<KEYWORD1>insheet</KEYWORD1>
-		<KEYWORD1>insp</KEYWORD1>
-		<KEYWORD1>inspe</KEYWORD1>
-		<KEYWORD1>inspec</KEYWORD1>
-		<KEYWORD1>inspect</KEYWORD1>
-		<KEYWORD1>integ</KEYWORD1>
-		<KEYWORD1>inten</KEYWORD1>
-		<KEYWORD1>intreg</KEYWORD1>
-		<KEYWORD1>intreg_7</KEYWORD1>
-		<KEYWORD1>intreg_p</KEYWORD1>
-		<KEYWORD1>intrg2_ll</KEYWORD1>
-		<KEYWORD1>intrg_ll</KEYWORD1>
-		<KEYWORD1>intrg_ll2</KEYWORD1>
-		<KEYWORD1>ipolate</KEYWORD1>
-		<KEYWORD1>iqreg</KEYWORD1>
-		<KEYWORD1>ir</KEYWORD1>
-		<KEYWORD1>irf</KEYWORD1>
-		<KEYWORD1>irf_create</KEYWORD1>
-		<KEYWORD1>irfm</KEYWORD1>
-		<KEYWORD1>iri</KEYWORD1>
-		<KEYWORD1>is_svy</KEYWORD1>
-		<KEYWORD1>is_svysum</KEYWORD1>
-		<KEYWORD1>isid</KEYWORD1>
-		<KEYWORD1>istdize</KEYWORD1>
-		<KEYWORD1>ivprob_1_lf</KEYWORD1>
-		<KEYWORD1>ivprob_lf</KEYWORD1>
-		<KEYWORD1>ivprobit</KEYWORD1>
-		<KEYWORD1>ivprobit_p</KEYWORD1>
-		<KEYWORD1>ivreg</KEYWORD1>
-		<KEYWORD1>ivreg_footnote</KEYWORD1>
-		<KEYWORD1>ivtob_1_lf</KEYWORD1>
-		<KEYWORD1>ivtob_lf</KEYWORD1>
-		<KEYWORD1>ivtobit</KEYWORD1>
-		<KEYWORD1>ivtobit_p</KEYWORD1>
-		<KEYWORD1>jackknife</KEYWORD1>
-		<KEYWORD1>jacknife</KEYWORD1>
-		<KEYWORD1>jknife</KEYWORD1>
-		<KEYWORD1>jknife_6</KEYWORD1>
-		<KEYWORD1>jknife_8</KEYWORD1>
-		<KEYWORD1>jkstat</KEYWORD1>
-		<KEYWORD1>joinby</KEYWORD1>
-		<KEYWORD1>kalarma1</KEYWORD1>
-		<KEYWORD1>kap</KEYWORD1>
-		<KEYWORD1>kap_3</KEYWORD1>
-		<KEYWORD1>kapmeier</KEYWORD1>
-		<KEYWORD1>kappa</KEYWORD1>
-		<KEYWORD1>kapwgt</KEYWORD1>
-		<KEYWORD1>kdensity</KEYWORD1>
-		<KEYWORD1>kdensity_7</KEYWORD1>
-		<KEYWORD1>ksm</KEYWORD1>
-		<KEYWORD1>ksmirnov</KEYWORD1>
-		<KEYWORD1>ktau</KEYWORD1>
-		<KEYWORD1>kwallis</KEYWORD1>
-		<KEYWORD1>l</KEYWORD1>
-		<KEYWORD1>la</KEYWORD1>
-		<KEYWORD1>labelbook</KEYWORD1>
-		<KEYWORD1>ladder</KEYWORD1>
-		<KEYWORD1>level</KEYWORD1>
-		<KEYWORD1>levels</KEYWORD1>
-		<KEYWORD1>levelsof</KEYWORD1>
-		<KEYWORD1>leverage</KEYWORD1>
-		<KEYWORD1>lfit</KEYWORD1>
-		<KEYWORD1>lfit_p</KEYWORD1>
-		<KEYWORD1>li</KEYWORD1>
-		<KEYWORD1>lincom</KEYWORD1>
-		<KEYWORD1>line</KEYWORD1>
-		<KEYWORD1>linktest</KEYWORD1>
-		<KEYWORD1>lis</KEYWORD1>
-		<KEYWORD1>list</KEYWORD1>
-		<KEYWORD1>lloghet_glf</KEYWORD1>
-		<KEYWORD1>lloghet_glf_sh</KEYWORD1>
-		<KEYWORD1>lloghet_gp</KEYWORD1>
-		<KEYWORD1>lloghet_ilf</KEYWORD1>
-		<KEYWORD1>lloghet_ilf_sh</KEYWORD1>
-		<KEYWORD1>lloghet_ip</KEYWORD1>
-		<KEYWORD1>llogi_sw</KEYWORD1>
-		<KEYWORD1>llogis_p</KEYWORD1>
-		<KEYWORD1>llogist</KEYWORD1>
-		<KEYWORD1>llogistic</KEYWORD1>
-		<KEYWORD1>llogistichet</KEYWORD1>
-		<KEYWORD1>lnorm_lf</KEYWORD1>
-		<KEYWORD1>lnorm_sw</KEYWORD1>
-		<KEYWORD1>lnorma_p</KEYWORD1>
-		<KEYWORD1>lnormal</KEYWORD1>
-		<KEYWORD1>lnormalhet</KEYWORD1>
-		<KEYWORD1>lnormhet_glf</KEYWORD1>
-		<KEYWORD1>lnormhet_glf_sh</KEYWORD1>
-		<KEYWORD1>lnormhet_gp</KEYWORD1>
-		<KEYWORD1>lnormhet_ilf</KEYWORD1>
-		<KEYWORD1>lnormhet_ilf_sh</KEYWORD1>
-		<KEYWORD1>lnormhet_ip</KEYWORD1>
-		<KEYWORD1>lnskew0</KEYWORD1>
-		<KEYWORD1>lo</KEYWORD1>
-		<KEYWORD1>loadingplot</KEYWORD1>
-		<KEYWORD1>logi</KEYWORD1>
-		<KEYWORD1>logis_lf</KEYWORD1>
-		<KEYWORD1>logistic</KEYWORD1>
-		<KEYWORD1>logistic_p</KEYWORD1>
-		<KEYWORD1>logit</KEYWORD1>
-		<KEYWORD1>logit_estat</KEYWORD1>
-		<KEYWORD1>logit_p</KEYWORD1>
-		<KEYWORD1>loglogs</KEYWORD1>
-		<KEYWORD1>logrank</KEYWORD1>
-		<KEYWORD1>loneway</KEYWORD1>
-		<KEYWORD1>loo</KEYWORD1>
-		<KEYWORD1>look</KEYWORD1>
-		<KEYWORD1>lookfor</KEYWORD1>
-		<KEYWORD1>looku</KEYWORD1>
-		<KEYWORD1>lookup</KEYWORD1>
-		<KEYWORD1>lowess</KEYWORD1>
-		<KEYWORD1>lowess_7</KEYWORD1>
-		<KEYWORD1>lpredict</KEYWORD1>
-		<KEYWORD1>lrecomp</KEYWORD1>
-		<KEYWORD1>lroc</KEYWORD1>
-		<KEYWORD1>lroc_7</KEYWORD1>
-		<KEYWORD1>lrtest</KEYWORD1>
-		<KEYWORD1>lsens</KEYWORD1>
-		<KEYWORD1>lsens_7</KEYWORD1>
-		<KEYWORD1>lsens_x</KEYWORD1>
-		<KEYWORD1>lstat</KEYWORD1>
-		<KEYWORD1>ltable</KEYWORD1>
-		<KEYWORD1>ltable_7</KEYWORD1>
-		<KEYWORD1>ltriang</KEYWORD1>
-		<KEYWORD1>lv</KEYWORD1>
-		<KEYWORD1>lvr2plot</KEYWORD1>
-		<KEYWORD1>lvr2plot_7</KEYWORD1>
-		<KEYWORD1>ma</KEYWORD1>
-		<KEYWORD1>mac</KEYWORD1>
-		<KEYWORD1>macr</KEYWORD1>
-		<KEYWORD1>macro</KEYWORD1>
-		<KEYWORD1>makecns</KEYWORD1>
-		<KEYWORD1>man</KEYWORD1>
-		<KEYWORD1>manova_estat</KEYWORD1>
-		<KEYWORD1>manova_p</KEYWORD1>
-		<KEYWORD1>mantel</KEYWORD1>
-		<KEYWORD1>mark</KEYWORD1>
-		<KEYWORD1>markout</KEYWORD1>
-		<KEYWORD1>marksample</KEYWORD1>
-		<KEYWORD1>mat</KEYWORD1>
-		<KEYWORD1>mat_capp</KEYWORD1>
-		<KEYWORD1>mat_order</KEYWORD1>
-		<KEYWORD1>mat_rapp</KEYWORD1>
-		<KEYWORD1>mata</KEYWORD1>
-		<KEYWORD1>mata_matdescribe</KEYWORD1>
-		<KEYWORD1>mata_matsave</KEYWORD1>
-		<KEYWORD1>mata_matuse</KEYWORD1>
-		<KEYWORD1>matalabel</KEYWORD1>
-		<KEYWORD1>matcproc</KEYWORD1>
-		<KEYWORD1>matlist</KEYWORD1>
-		<KEYWORD1>matname</KEYWORD1>
-		<KEYWORD1>matr</KEYWORD1>
-		<KEYWORD1>matri</KEYWORD1>
-		<KEYWORD1>matrix</KEYWORD1>
-		<KEYWORD1>matrix_input__dlg</KEYWORD1>
-		<KEYWORD1>matsize</KEYWORD1>
-		<KEYWORD1>matstrik</KEYWORD1>
-		<KEYWORD1>mcc</KEYWORD1>
-		<KEYWORD1>mcci</KEYWORD1>
-		<KEYWORD1>md0_</KEYWORD1>
-		<KEYWORD1>md1_</KEYWORD1>
-		<KEYWORD1>md1debu_</KEYWORD1>
-		<KEYWORD1>md1debug_</KEYWORD1>
-		<KEYWORD1>md2_</KEYWORD1>
-		<KEYWORD1>md2debu_</KEYWORD1>
-		<KEYWORD1>md2debug_</KEYWORD1>
-		<KEYWORD1>mds</KEYWORD1>
-		<KEYWORD1>mds_estat</KEYWORD1>
-		<KEYWORD1>mds_p</KEYWORD1>
-		<KEYWORD1>mdsconfig</KEYWORD1>
-		<KEYWORD1>mdslong</KEYWORD1>
-		<KEYWORD1>mdsmat</KEYWORD1>
-		<KEYWORD1>mdsshepard</KEYWORD1>
-		<KEYWORD1>mdytoe</KEYWORD1>
-		<KEYWORD1>mdytof</KEYWORD1>
-		<KEYWORD1>me_derd</KEYWORD1>
-		<KEYWORD1>mean</KEYWORD1>
-		<KEYWORD1>means</KEYWORD1>
-		<KEYWORD1>median</KEYWORD1>
-		<KEYWORD1>memory</KEYWORD1>
-		<KEYWORD1>memsize</KEYWORD1>
-		<KEYWORD1>meqparse</KEYWORD1>
-		<KEYWORD1>mfp</KEYWORD1>
-		<KEYWORD1>mfx</KEYWORD1>
-		<KEYWORD1>mhelp</KEYWORD1>
-		<KEYWORD1>mhodds</KEYWORD1>
-		<KEYWORD1>mixed_ll</KEYWORD1>
-		<KEYWORD1>mixed_ll_reparm</KEYWORD1>
-		<KEYWORD1>mkassert</KEYWORD1>
-		<KEYWORD1>mkdir</KEYWORD1>
-		<KEYWORD1>mkmat</KEYWORD1>
-		<KEYWORD1>mkspline</KEYWORD1>
-		<KEYWORD1>ml</KEYWORD1>
-		<KEYWORD1>ml_5</KEYWORD1>
-		<KEYWORD1>ml_adjs</KEYWORD1>
-		<KEYWORD1>ml_bhhhs</KEYWORD1>
-		<KEYWORD1>ml_c_d</KEYWORD1>
-		<KEYWORD1>ml_check</KEYWORD1>
-		<KEYWORD1>ml_clear</KEYWORD1>
-		<KEYWORD1>ml_cnt</KEYWORD1>
-		<KEYWORD1>ml_debug</KEYWORD1>
-		<KEYWORD1>ml_defd</KEYWORD1>
-		<KEYWORD1>ml_e0</KEYWORD1>
-		<KEYWORD1>ml_e0_bfgs</KEYWORD1>
-		<KEYWORD1>ml_e0_cycle</KEYWORD1>
-		<KEYWORD1>ml_e0_dfp</KEYWORD1>
-		<KEYWORD1>ml_e0i</KEYWORD1>
-		<KEYWORD1>ml_e1</KEYWORD1>
-		<KEYWORD1>ml_e1_bfgs</KEYWORD1>
-		<KEYWORD1>ml_e1_bhhh</KEYWORD1>
-		<KEYWORD1>ml_e1_cycle</KEYWORD1>
-		<KEYWORD1>ml_e1_dfp</KEYWORD1>
-		<KEYWORD1>ml_e2</KEYWORD1>
-		<KEYWORD1>ml_e2_cycle</KEYWORD1>
-		<KEYWORD1>ml_ebfg0</KEYWORD1>
-		<KEYWORD1>ml_ebfr0</KEYWORD1>
-		<KEYWORD1>ml_ebfr1</KEYWORD1>
-		<KEYWORD1>ml_ebh0q</KEYWORD1>
-		<KEYWORD1>ml_ebhh0</KEYWORD1>
-		<KEYWORD1>ml_ebhr0</KEYWORD1>
-		<KEYWORD1>ml_ebr0i</KEYWORD1>
-		<KEYWORD1>ml_ecr0i</KEYWORD1>
-		<KEYWORD1>ml_edfp0</KEYWORD1>
-		<KEYWORD1>ml_edfr0</KEYWORD1>
-		<KEYWORD1>ml_edfr1</KEYWORD1>
-		<KEYWORD1>ml_edr0i</KEYWORD1>
-		<KEYWORD1>ml_eds</KEYWORD1>
-		<KEYWORD1>ml_eer0i</KEYWORD1>
-		<KEYWORD1>ml_egr0i</KEYWORD1>
-		<KEYWORD1>ml_elf</KEYWORD1>
-		<KEYWORD1>ml_elf_bfgs</KEYWORD1>
-		<KEYWORD1>ml_elf_bhhh</KEYWORD1>
-		<KEYWORD1>ml_elf_cycle</KEYWORD1>
-		<KEYWORD1>ml_elf_dfp</KEYWORD1>
-		<KEYWORD1>ml_elfi</KEYWORD1>
-		<KEYWORD1>ml_elfs</KEYWORD1>
-		<KEYWORD1>ml_enr0i</KEYWORD1>
-		<KEYWORD1>ml_enrr0</KEYWORD1>
-		<KEYWORD1>ml_erdu0</KEYWORD1>
-		<KEYWORD1>ml_erdu0_bfgs</KEYWORD1>
-		<KEYWORD1>ml_erdu0_bhhh</KEYWORD1>
-		<KEYWORD1>ml_erdu0_bhhhq</KEYWORD1>
-		<KEYWORD1>ml_erdu0_cycle</KEYWORD1>
-		<KEYWORD1>ml_erdu0_dfp</KEYWORD1>
-		<KEYWORD1>ml_erdu0_nrbfgs</KEYWORD1>
-		<KEYWORD1>ml_exde</KEYWORD1>
-		<KEYWORD1>ml_footnote</KEYWORD1>
-		<KEYWORD1>ml_geqnr</KEYWORD1>
-		<KEYWORD1>ml_grad0</KEYWORD1>
-		<KEYWORD1>ml_graph</KEYWORD1>
-		<KEYWORD1>ml_hbhhh</KEYWORD1>
-		<KEYWORD1>ml_hd0</KEYWORD1>
-		<KEYWORD1>ml_hold</KEYWORD1>
-		<KEYWORD1>ml_init</KEYWORD1>
-		<KEYWORD1>ml_inv</KEYWORD1>
-		<KEYWORD1>ml_log</KEYWORD1>
-		<KEYWORD1>ml_max</KEYWORD1>
-		<KEYWORD1>ml_mlout</KEYWORD1>
-		<KEYWORD1>ml_mlout_8</KEYWORD1>
-		<KEYWORD1>ml_model</KEYWORD1>
-		<KEYWORD1>ml_nb0</KEYWORD1>
-		<KEYWORD1>ml_opt</KEYWORD1>
-		<KEYWORD1>ml_p</KEYWORD1>
-		<KEYWORD1>ml_plot</KEYWORD1>
-		<KEYWORD1>ml_query</KEYWORD1>
-		<KEYWORD1>ml_rdgrd</KEYWORD1>
-		<KEYWORD1>ml_repor</KEYWORD1>
-		<KEYWORD1>ml_s_e</KEYWORD1>
-		<KEYWORD1>ml_score</KEYWORD1>
-		<KEYWORD1>ml_searc</KEYWORD1>
-		<KEYWORD1>ml_technique</KEYWORD1>
-		<KEYWORD1>ml_unhold</KEYWORD1>
-		<KEYWORD1>mleval</KEYWORD1>
-		<KEYWORD1>mlf_</KEYWORD1>
-		<KEYWORD1>mlmatsum</KEYWORD1>
-		<KEYWORD1>mlog</KEYWORD1>
-		<KEYWORD1>mlogi</KEYWORD1>
-		<KEYWORD1>mlogit</KEYWORD1>
-		<KEYWORD1>mlogit_footnote</KEYWORD1>
-		<KEYWORD1>mlogit_p</KEYWORD1>
-		<KEYWORD1>mlopts</KEYWORD1>
-		<KEYWORD1>mlsum</KEYWORD1>
-		<KEYWORD1>mlvecsum</KEYWORD1>
-		<KEYWORD1>mmerge</KEYWORD1>
-		<KEYWORD1>mnl0_</KEYWORD1>
-		<KEYWORD1>mor</KEYWORD1>
-		<KEYWORD1>more</KEYWORD1>
-		<KEYWORD1>mov</KEYWORD1>
-		<KEYWORD1>move</KEYWORD1>
-		<KEYWORD1>mprobit</KEYWORD1>
-		<KEYWORD1>mprobit_lf</KEYWORD1>
-		<KEYWORD1>mprobit_p</KEYWORD1>
-		<KEYWORD1>mrdu0_</KEYWORD1>
-		<KEYWORD1>mrdu1_</KEYWORD1>
-		<KEYWORD1>mvdecode</KEYWORD1>
-		<KEYWORD1>mvencode</KEYWORD1>
-		<KEYWORD1>mvreg</KEYWORD1>
-		<KEYWORD1>mvreg_estat</KEYWORD1>
-		<KEYWORD1>n</KEYWORD1>
-		<KEYWORD1>nbreg</KEYWORD1>
-		<KEYWORD1>nbreg_al</KEYWORD1>
-		<KEYWORD1>nbreg_lf</KEYWORD1>
-		<KEYWORD1>nbreg_p</KEYWORD1>
-		<KEYWORD1>nbreg_sw</KEYWORD1>
-		<KEYWORD1>nestreg</KEYWORD1>
-		<KEYWORD1>net</KEYWORD1>
-		<KEYWORD1>newey</KEYWORD1>
-		<KEYWORD1>newey_7</KEYWORD1>
-		<KEYWORD1>newey_p</KEYWORD1>
-		<KEYWORD1>news</KEYWORD1>
-		<KEYWORD1>nl</KEYWORD1>
-		<KEYWORD1>nl_7</KEYWORD1>
-		<KEYWORD1>nl_9</KEYWORD1>
-		<KEYWORD1>nl_9_p</KEYWORD1>
-		<KEYWORD1>nl_p</KEYWORD1>
-		<KEYWORD1>nl_p_7</KEYWORD1>
-		<KEYWORD1>nlcom</KEYWORD1>
-		<KEYWORD1>nlcom_p</KEYWORD1>
-		<KEYWORD1>nlexp2</KEYWORD1>
-		<KEYWORD1>nlexp2_7</KEYWORD1>
-		<KEYWORD1>nlexp2a</KEYWORD1>
-		<KEYWORD1>nlexp2a_7</KEYWORD1>
-		<KEYWORD1>nlexp3</KEYWORD1>
-		<KEYWORD1>nlexp3_7</KEYWORD1>
-		<KEYWORD1>nlgom3</KEYWORD1>
-		<KEYWORD1>nlgom3_7</KEYWORD1>
-		<KEYWORD1>nlgom4</KEYWORD1>
-		<KEYWORD1>nlgom4_7</KEYWORD1>
-		<KEYWORD1>nlinit</KEYWORD1>
-		<KEYWORD1>nllog3</KEYWORD1>
-		<KEYWORD1>nllog3_7</KEYWORD1>
-		<KEYWORD1>nllog4</KEYWORD1>
-		<KEYWORD1>nllog4_7</KEYWORD1>
-		<KEYWORD1>nlog_rd</KEYWORD1>
-		<KEYWORD1>nlogit</KEYWORD1>
-		<KEYWORD1>nlogit_p</KEYWORD1>
-		<KEYWORD1>nlogitgen</KEYWORD1>
-		<KEYWORD1>nlogittree</KEYWORD1>
-		<KEYWORD1>nlpred</KEYWORD1>
-		<KEYWORD1>no</KEYWORD1>
-		<KEYWORD1>nobreak</KEYWORD1>
-		<KEYWORD1>noi</KEYWORD1>
-		<KEYWORD1>nois</KEYWORD1>
-		<KEYWORD1>noisi</KEYWORD1>
-		<KEYWORD1>noisil</KEYWORD1>
-		<KEYWORD1>noisily</KEYWORD1>
-		<KEYWORD1>nostop</KEYWORD1>
-		<KEYWORD1>note</KEYWORD1>
-		<KEYWORD1>notes</KEYWORD1>
-		<KEYWORD1>notify</KEYWORD1>
-		<KEYWORD1>nptrend</KEYWORD1>
-		<KEYWORD1>numlabel</KEYWORD1>
-		<KEYWORD1>numlist</KEYWORD1>
-		<KEYWORD1>off</KEYWORD1>
-		<KEYWORD1>old_ver</KEYWORD1>
-		<KEYWORD1>olo</KEYWORD1>
-		<KEYWORD1>olog</KEYWORD1>
-		<KEYWORD1>ologi</KEYWORD1>
-		<KEYWORD1>ologi_sw</KEYWORD1>
-		<KEYWORD1>ologit</KEYWORD1>
-		<KEYWORD1>ologit_p</KEYWORD1>
-		<KEYWORD1>ologitp</KEYWORD1>
-		<KEYWORD1>on</KEYWORD1>
-		<KEYWORD1>one</KEYWORD1>
-		<KEYWORD1>onew</KEYWORD1>
-		<KEYWORD1>onewa</KEYWORD1>
-		<KEYWORD1>oneway</KEYWORD1>
-		<KEYWORD1>op_colnm</KEYWORD1>
-		<KEYWORD1>op_comp</KEYWORD1>
-		<KEYWORD1>op_diff</KEYWORD1>
-		<KEYWORD1>op_inv</KEYWORD1>
-		<KEYWORD1>op_str</KEYWORD1>
-		<KEYWORD1>opr</KEYWORD1>
-		<KEYWORD1>opro</KEYWORD1>
-		<KEYWORD1>oprob</KEYWORD1>
-		<KEYWORD1>oprob_sw</KEYWORD1>
-		<KEYWORD1>oprobi</KEYWORD1>
-		<KEYWORD1>oprobi_p</KEYWORD1>
-		<KEYWORD1>oprobit</KEYWORD1>
-		<KEYWORD1>oprobitp</KEYWORD1>
-		<KEYWORD1>opts_exclusive</KEYWORD1>
-		<KEYWORD1>order</KEYWORD1>
-		<KEYWORD1>orthog</KEYWORD1>
-		<KEYWORD1>orthpoly</KEYWORD1>
-		<KEYWORD1>ou</KEYWORD1>
-		<KEYWORD1>out</KEYWORD1>
-		<KEYWORD1>outf</KEYWORD1>
-		<KEYWORD1>outfi</KEYWORD1>
-		<KEYWORD1>outfil</KEYWORD1>
-		<KEYWORD1>outfile</KEYWORD1>
-		<KEYWORD1>outs</KEYWORD1>
-		<KEYWORD1>outsh</KEYWORD1>
-		<KEYWORD1>outshe</KEYWORD1>
-		<KEYWORD1>outshee</KEYWORD1>
-		<KEYWORD1>outsheet</KEYWORD1>
-		<KEYWORD1>ovtest</KEYWORD1>
-		<KEYWORD1>pac</KEYWORD1>
-		<KEYWORD1>pac_7</KEYWORD1>
-		<KEYWORD1>palette</KEYWORD1>
-		<KEYWORD1>par</KEYWORD1>
-		<KEYWORD1>pars</KEYWORD1>
-		<KEYWORD1>parse</KEYWORD1>
-		<KEYWORD1>parse_dissim</KEYWORD1>
-		<KEYWORD1>pause</KEYWORD1>
-		<KEYWORD1>pca</KEYWORD1>
-		<KEYWORD1>pca_8</KEYWORD1>
-		<KEYWORD1>pca_display</KEYWORD1>
-		<KEYWORD1>pca_estat</KEYWORD1>
-		<KEYWORD1>pca_p</KEYWORD1>
-		<KEYWORD1>pca_rotate</KEYWORD1>
-		<KEYWORD1>pcamat</KEYWORD1>
-		<KEYWORD1>pchart</KEYWORD1>
-		<KEYWORD1>pchart_7</KEYWORD1>
-		<KEYWORD1>pchi</KEYWORD1>
-		<KEYWORD1>pchi_7</KEYWORD1>
-		<KEYWORD1>pcorr</KEYWORD1>
-		<KEYWORD1>pctile</KEYWORD1>
-		<KEYWORD1>pentium</KEYWORD1>
-		<KEYWORD1>pergram</KEYWORD1>
-		<KEYWORD1>pergram_7</KEYWORD1>
-		<KEYWORD1>permute</KEYWORD1>
-		<KEYWORD1>permute_8</KEYWORD1>
-		<KEYWORD1>personal</KEYWORD1>
-		<KEYWORD1>peto_st</KEYWORD1>
-		<KEYWORD1>pkcollapse</KEYWORD1>
-		<KEYWORD1>pkcross</KEYWORD1>
-		<KEYWORD1>pkequiv</KEYWORD1>
-		<KEYWORD1>pkexamine</KEYWORD1>
-		<KEYWORD1>pkexamine_7</KEYWORD1>
-		<KEYWORD1>pkshape</KEYWORD1>
-		<KEYWORD1>pksumm</KEYWORD1>
-		<KEYWORD1>pksumm_7</KEYWORD1>
-		<KEYWORD1>pl</KEYWORD1>
-		<KEYWORD1>playsnd</KEYWORD1>
-		<KEYWORD1>plo</KEYWORD1>
-		<KEYWORD1>plot</KEYWORD1>
-		<KEYWORD1>plug</KEYWORD1>
-		<KEYWORD1>plugi</KEYWORD1>
-		<KEYWORD1>plugin</KEYWORD1>
-		<KEYWORD1>pnorm</KEYWORD1>
-		<KEYWORD1>pnorm_7</KEYWORD1>
-		<KEYWORD1>poisgof</KEYWORD1>
-		<KEYWORD1>poiss_lf</KEYWORD1>
-		<KEYWORD1>poiss_sw</KEYWORD1>
-		<KEYWORD1>poisso_p</KEYWORD1>
-		<KEYWORD1>poisson</KEYWORD1>
-		<KEYWORD1>poisson_estat</KEYWORD1>
-		<KEYWORD1>pop</KEYWORD1>
-		<KEYWORD1>popu</KEYWORD1>
-		<KEYWORD1>popup</KEYWORD1>
-		<KEYWORD1>post</KEYWORD1>
-		<KEYWORD1>postclose</KEYWORD1>
-		<KEYWORD1>postfile</KEYWORD1>
-		<KEYWORD1>pperron</KEYWORD1>
-		<KEYWORD1>pr</KEYWORD1>
-		<KEYWORD1>prais</KEYWORD1>
-		<KEYWORD1>prais_e</KEYWORD1>
-		<KEYWORD1>prais_e2</KEYWORD1>
-		<KEYWORD1>prais_p</KEYWORD1>
-		<KEYWORD1>pred</KEYWORD1>
-		<KEYWORD1>predi</KEYWORD1>
-		<KEYWORD1>predic</KEYWORD1>
-		<KEYWORD1>predict</KEYWORD1>
-		<KEYWORD1>predictnl</KEYWORD1>
-		<KEYWORD1>print</KEYWORD1>
-		<KEYWORD1>printgr</KEYWORD1>
-		<KEYWORD1>priorest</KEYWORD1>
-		<KEYWORD1>pro</KEYWORD1>
-		<KEYWORD1>prob</KEYWORD1>
-		<KEYWORD1>probi</KEYWORD1>
-		<KEYWORD1>probit</KEYWORD1>
-		<KEYWORD1>probit_estat</KEYWORD1>
-		<KEYWORD1>probit_p</KEYWORD1>
-		<KEYWORD1>proc_time</KEYWORD1>
-		<KEYWORD1>procoverlay</KEYWORD1>
-		<KEYWORD1>procrustes</KEYWORD1>
-		<KEYWORD1>procrustes_estat</KEYWORD1>
-		<KEYWORD1>procrustes_p</KEYWORD1>
-		<KEYWORD1>profiler</KEYWORD1>
-		<KEYWORD1>prop</KEYWORD1>
-		<KEYWORD1>proportion</KEYWORD1>
-		<KEYWORD1>prove</KEYWORD1>
-		<KEYWORD1>prtest</KEYWORD1>
-		<KEYWORD1>prtesti</KEYWORD1>
-		<KEYWORD1>push</KEYWORD1>
-		<KEYWORD1>pwcorr</KEYWORD1>
-		<KEYWORD1>pwd</KEYWORD1>
-		<KEYWORD1>q</KEYWORD1>
-		<KEYWORD1>qby</KEYWORD1>
-		<KEYWORD1>qbys</KEYWORD1>
-		<KEYWORD1>qchi</KEYWORD1>
-		<KEYWORD1>qchi_7</KEYWORD1>
-		<KEYWORD1>qladder</KEYWORD1>
-		<KEYWORD1>qladder_7</KEYWORD1>
-		<KEYWORD1>qnorm</KEYWORD1>
-		<KEYWORD1>qnorm_7</KEYWORD1>
-		<KEYWORD1>qqplot</KEYWORD1>
-		<KEYWORD1>qqplot_7</KEYWORD1>
-		<KEYWORD1>qreg</KEYWORD1>
-		<KEYWORD1>qreg_c</KEYWORD1>
-		<KEYWORD1>qreg_p</KEYWORD1>
-		<KEYWORD1>qreg_sw</KEYWORD1>
-		<KEYWORD1>qu</KEYWORD1>
-		<KEYWORD1>quadchk</KEYWORD1>
-		<KEYWORD1>quantile</KEYWORD1>
-		<KEYWORD1>quantile_7</KEYWORD1>
-		<KEYWORD1>que</KEYWORD1>
-		<KEYWORD1>quer</KEYWORD1>
-		<KEYWORD1>query</KEYWORD1>
-		<KEYWORD1>qui</KEYWORD1>
-		<KEYWORD1>quie</KEYWORD1>
-		<KEYWORD1>quiet</KEYWORD1>
-		<KEYWORD1>quietl</KEYWORD1>
-		<KEYWORD1>quietly</KEYWORD1>
-		<KEYWORD1>range</KEYWORD1>
-		<KEYWORD1>ranksum</KEYWORD1>
-		<KEYWORD1>ratio</KEYWORD1>
-		<KEYWORD1>rchart</KEYWORD1>
-		<KEYWORD1>rchart_7</KEYWORD1>
-		<KEYWORD1>rcof</KEYWORD1>
-		<KEYWORD1>rc_spline</KEYWORD1>
-		<KEYWORD1>recast</KEYWORD1>
-		<KEYWORD1>reg</KEYWORD1>
-		<KEYWORD1>reg3</KEYWORD1>
-		<KEYWORD1>reg3_p</KEYWORD1>
-		<KEYWORD1>regdw</KEYWORD1>
-		<KEYWORD1>regr</KEYWORD1>
-		<KEYWORD1>regre</KEYWORD1>
-		<KEYWORD1>regre_p2</KEYWORD1>
-		<KEYWORD1>regres</KEYWORD1>
-		<KEYWORD1>regres_p</KEYWORD1>
-		<KEYWORD1>regress</KEYWORD1>
-		<KEYWORD1>regress_estat</KEYWORD1>
-		<KEYWORD1>regriv_p</KEYWORD1>
-		<KEYWORD1>remap</KEYWORD1>
-		<KEYWORD1>ren</KEYWORD1>
-		<KEYWORD1>rena</KEYWORD1>
-		<KEYWORD1>renam</KEYWORD1>
-		<KEYWORD1>rename</KEYWORD1>
-		<KEYWORD1>renpfix</KEYWORD1>
-		<KEYWORD1>repeat</KEYWORD1>
-		<KEYWORD1>reshape</KEYWORD1>
-		<KEYWORD1>ret</KEYWORD1>
-		<KEYWORD1>retu</KEYWORD1>
-		<KEYWORD1>retur</KEYWORD1>
-		<KEYWORD1>return</KEYWORD1>
-		<KEYWORD1>robvar</KEYWORD1>
-		<KEYWORD1>robust</KEYWORD1>
-		<KEYWORD1>roccomp</KEYWORD1>
-		<KEYWORD1>roccomp_7</KEYWORD1>
-		<KEYWORD1>roccomp_8</KEYWORD1>
-		<KEYWORD1>rocf_lf</KEYWORD1>
-		<KEYWORD1>rocfit</KEYWORD1>
-		<KEYWORD1>rocfit_8</KEYWORD1>
-		<KEYWORD1>rocgold</KEYWORD1>
-		<KEYWORD1>rocplot</KEYWORD1>
-		<KEYWORD1>rocplot_7</KEYWORD1>
-		<KEYWORD1>roctab</KEYWORD1>
-		<KEYWORD1>roctab_7</KEYWORD1>
-		<KEYWORD1>rolling</KEYWORD1>
-		<KEYWORD1>rologit</KEYWORD1>
-		<KEYWORD1>rologit_p</KEYWORD1>
-		<KEYWORD1>rot</KEYWORD1>
-		<KEYWORD1>rota</KEYWORD1>
-		<KEYWORD1>rotat</KEYWORD1>
-		<KEYWORD1>rotate</KEYWORD1>
-		<KEYWORD1>rotatemat</KEYWORD1>
-		<KEYWORD1>rreg</KEYWORD1>
-		<KEYWORD1>rreg_p</KEYWORD1>
-		<KEYWORD1>rvfplot</KEYWORD1>
-		<KEYWORD1>rvfplot_7</KEYWORD1>
-		<KEYWORD1>rvpplot</KEYWORD1>
-		<KEYWORD1>rvpplot_7</KEYWORD1>
-		<KEYWORD1>sa</KEYWORD1>
-		<KEYWORD1>safesum</KEYWORD1>
-		<KEYWORD1>sample</KEYWORD1>
-		<KEYWORD1>sampsi</KEYWORD1>
-		<KEYWORD1>savedresults</KEYWORD1>
-		<KEYWORD1>saveold</KEYWORD1>
-		<KEYWORD1>say</KEYWORD1>
-		<KEYWORD1>sc</KEYWORD1>
-		<KEYWORD1>sca</KEYWORD1>
-		<KEYWORD1>scal</KEYWORD1>
-		<KEYWORD1>scala</KEYWORD1>
-		<KEYWORD1>scalar</KEYWORD1>
-		<KEYWORD1>scatter</KEYWORD1>
-		<KEYWORD1>scm_mine</KEYWORD1>
-		<KEYWORD1>sco</KEYWORD1>
-		<KEYWORD1>scob_lf</KEYWORD1>
-		<KEYWORD1>scob_p</KEYWORD1>
-		<KEYWORD1>scobi_sw</KEYWORD1>
-		<KEYWORD1>scobit</KEYWORD1>
-		<KEYWORD1>scor</KEYWORD1>
-		<KEYWORD1>score</KEYWORD1>
-		<KEYWORD1>scoreplot</KEYWORD1>
-		<KEYWORD1>scoreplot_help</KEYWORD1>
-		<KEYWORD1>scree</KEYWORD1>
-		<KEYWORD1>screeplot</KEYWORD1>
-		<KEYWORD1>screeplot_help</KEYWORD1>
-		<KEYWORD1>sdtest</KEYWORD1>
-		<KEYWORD1>sdtesti</KEYWORD1>
-		<KEYWORD1>se</KEYWORD1>
-		<KEYWORD1>search</KEYWORD1>
-		<KEYWORD1>separate</KEYWORD1>
-		<KEYWORD1>seperate</KEYWORD1>
-		<KEYWORD1>serrbar</KEYWORD1>
-		<KEYWORD1>serrbar_7</KEYWORD1>
-		<KEYWORD1>set_defaults</KEYWORD1>
-		<KEYWORD1>sfrancia</KEYWORD1>
-		<KEYWORD1>sh</KEYWORD1>
-		<KEYWORD1>she</KEYWORD1>
-		<KEYWORD1>shel</KEYWORD1>
-		<KEYWORD1>shewhart</KEYWORD1>
-		<KEYWORD1>shewhart_7</KEYWORD1>
-		<KEYWORD1>showpoint</KEYWORD1>
-		<KEYWORD1>signestimationsample</KEYWORD1>
-		<KEYWORD1>signrank</KEYWORD1>
-		<KEYWORD1>signtest</KEYWORD1>
-		<KEYWORD1>simul</KEYWORD1>
-		<KEYWORD1>simul_7</KEYWORD1>
-		<KEYWORD1>simulate</KEYWORD1>
-		<KEYWORD1>simulate_8</KEYWORD1>
-		<KEYWORD1>simulinit</KEYWORD1>
-		<KEYWORD1>sktest</KEYWORD1>
-		<KEYWORD1>sleep</KEYWORD1>
-		<KEYWORD1>slogit</KEYWORD1>
-		<KEYWORD1>slogit_d2</KEYWORD1>
-		<KEYWORD1>slogit_p</KEYWORD1>
-		<KEYWORD1>smooth</KEYWORD1>
-		<KEYWORD1>snapspan</KEYWORD1>
-		<KEYWORD1>spbase</KEYWORD1>
-		<KEYWORD1>spearman</KEYWORD1>
-		<KEYWORD1>speedchk1</KEYWORD1>
-		<KEYWORD1>speekchk2</KEYWORD1>
-		<KEYWORD1>spikeplot</KEYWORD1>
-		<KEYWORD1>spikeplot_7</KEYWORD1>
-		<KEYWORD1>spikeplt</KEYWORD1>
-		<KEYWORD1>spline</KEYWORD1>
-		<KEYWORD1>spline_x</KEYWORD1>
-		<KEYWORD1>split</KEYWORD1>
-		<KEYWORD1>sqreg</KEYWORD1>
-		<KEYWORD1>sqreg_p</KEYWORD1>
-		<KEYWORD1>sret</KEYWORD1>
-		<KEYWORD1>sretu</KEYWORD1>
-		<KEYWORD1>sretur</KEYWORD1>
-		<KEYWORD1>sreturn</KEYWORD1>
-		<KEYWORD1>ssc</KEYWORD1>
-		<KEYWORD1>st</KEYWORD1>
-		<KEYWORD1>st_ct</KEYWORD1>
-		<KEYWORD1>st_hc</KEYWORD1>
-		<KEYWORD1>st_hcd</KEYWORD1>
-		<KEYWORD1>st_hcd_sh</KEYWORD1>
-		<KEYWORD1>st_is</KEYWORD1>
-		<KEYWORD1>st_issys</KEYWORD1>
-		<KEYWORD1>st_note</KEYWORD1>
-		<KEYWORD1>st_promo</KEYWORD1>
-		<KEYWORD1>st_set</KEYWORD1>
-		<KEYWORD1>st_show</KEYWORD1>
-		<KEYWORD1>st_smpl</KEYWORD1>
-		<KEYWORD1>st_subid</KEYWORD1>
-		<KEYWORD1>stack</KEYWORD1>
-		<KEYWORD1>stackdepth</KEYWORD1>
-		<KEYWORD1>stackreset</KEYWORD1>
-		<KEYWORD1>statsby</KEYWORD1>
-		<KEYWORD1>statsby_8</KEYWORD1>
-		<KEYWORD1>stbase</KEYWORD1>
-		<KEYWORD1>stci</KEYWORD1>
-		<KEYWORD1>stci_7</KEYWORD1>
-		<KEYWORD1>stcox</KEYWORD1>
-		<KEYWORD1>stcox_estat</KEYWORD1>
-		<KEYWORD1>stcox_fr</KEYWORD1>
-		<KEYWORD1>stcox_fr_ll</KEYWORD1>
-		<KEYWORD1>stcox_p</KEYWORD1>
-		<KEYWORD1>stcox_sw</KEYWORD1>
-		<KEYWORD1>stcoxkm</KEYWORD1>
-		<KEYWORD1>stcoxkm_7</KEYWORD1>
-		<KEYWORD1>stcstat</KEYWORD1>
-		<KEYWORD1>stcurv</KEYWORD1>
-		<KEYWORD1>stcurve</KEYWORD1>
-		<KEYWORD1>stcurve_7</KEYWORD1>
-		<KEYWORD1>stdes</KEYWORD1>
-		<KEYWORD1>stem</KEYWORD1>
-		<KEYWORD1>stepwise</KEYWORD1>
-		<KEYWORD1>stereg</KEYWORD1>
-		<KEYWORD1>stfill</KEYWORD1>
-		<KEYWORD1>stgen</KEYWORD1>
-		<KEYWORD1>stinit</KEYWORD1>
-		<KEYWORD1>stir</KEYWORD1>
-		<KEYWORD1>stjoin</KEYWORD1>
-		<KEYWORD1>stmc</KEYWORD1>
-		<KEYWORD1>stmh</KEYWORD1>
-		<KEYWORD1>stphplot</KEYWORD1>
-		<KEYWORD1>stphplot_7</KEYWORD1>
-		<KEYWORD1>stphtest</KEYWORD1>
-		<KEYWORD1>stphtest_7</KEYWORD1>
-		<KEYWORD1>stptime</KEYWORD1>
-		<KEYWORD1>strate</KEYWORD1>
-		<KEYWORD1>strate_7</KEYWORD1>
-		<KEYWORD1>streg</KEYWORD1>
-		<KEYWORD1>streg_sw</KEYWORD1>
-		<KEYWORD1>streset</KEYWORD1>
-		<KEYWORD1>sts</KEYWORD1>
-		<KEYWORD1>sts_7</KEYWORD1>
-		<KEYWORD1>stset</KEYWORD1>
-		<KEYWORD1>stsplit</KEYWORD1>
-		<KEYWORD1>stsum</KEYWORD1>
-		<KEYWORD1>sttocc</KEYWORD1>
-		<KEYWORD1>sttoct</KEYWORD1>
-		<KEYWORD1>stvary</KEYWORD1>
-		<KEYWORD1>stweib</KEYWORD1>
-		<KEYWORD1>su</KEYWORD1>
-		<KEYWORD1>subwin</KEYWORD1>
-		<KEYWORD1>suest</KEYWORD1>
-		<KEYWORD1>suest_8</KEYWORD1>
-		<KEYWORD1>sum</KEYWORD1>
-		<KEYWORD1>summ</KEYWORD1>
-		<KEYWORD1>summa</KEYWORD1>
-		<KEYWORD1>summar</KEYWORD1>
-		<KEYWORD1>summari</KEYWORD1>
-		<KEYWORD1>summariz</KEYWORD1>
-		<KEYWORD1>summarize</KEYWORD1>
-		<KEYWORD1>sunflower</KEYWORD1>
-		<KEYWORD1>sureg</KEYWORD1>
-		<KEYWORD1>survcurv</KEYWORD1>
-		<KEYWORD1>survsum</KEYWORD1>
-		<KEYWORD1>svar</KEYWORD1>
-		<KEYWORD1>svar_p</KEYWORD1>
-		<KEYWORD1>svmat</KEYWORD1>
-		<KEYWORD1>svy</KEYWORD1>
-		<KEYWORD1>svy_disp</KEYWORD1>
-		<KEYWORD1>svy_dreg</KEYWORD1>
-		<KEYWORD1>svy_est</KEYWORD1>
-		<KEYWORD1>svy_est_7</KEYWORD1>
-		<KEYWORD1>svy_estat</KEYWORD1>
-		<KEYWORD1>svy_get</KEYWORD1>
-		<KEYWORD1>svy_gnbreg_p</KEYWORD1>
-		<KEYWORD1>svy_head</KEYWORD1>
-		<KEYWORD1>svy_header</KEYWORD1>
-		<KEYWORD1>svy_heckman_p</KEYWORD1>
-		<KEYWORD1>svy_heckprob_p</KEYWORD1>
-		<KEYWORD1>svy_intreg_p</KEYWORD1>
-		<KEYWORD1>svy_ivreg_p</KEYWORD1>
-		<KEYWORD1>svy_logistic_p</KEYWORD1>
-		<KEYWORD1>svy_logit_p</KEYWORD1>
-		<KEYWORD1>svy_mlogit_p</KEYWORD1>
-		<KEYWORD1>svy_nbreg_p</KEYWORD1>
-		<KEYWORD1>svy_ologit_p</KEYWORD1>
-		<KEYWORD1>svy_oprobit_p</KEYWORD1>
-		<KEYWORD1>svy_poisson_p</KEYWORD1>
-		<KEYWORD1>svy_probit_p</KEYWORD1>
-		<KEYWORD1>svy_regress_p</KEYWORD1>
-		<KEYWORD1>svy_sub</KEYWORD1>
-		<KEYWORD1>svy_sub_7</KEYWORD1>
-		<KEYWORD1>svy_x</KEYWORD1>
-		<KEYWORD1>svy_x_7</KEYWORD1>
-		<KEYWORD1>svy_x_p</KEYWORD1>
-		<KEYWORD1>svydes</KEYWORD1>
-		<KEYWORD1>svydes_8</KEYWORD1>
-		<KEYWORD1>svygen</KEYWORD1>
-		<KEYWORD1>svygnbreg</KEYWORD1>
-		<KEYWORD1>svyheckman</KEYWORD1>
-		<KEYWORD1>svyheckprob</KEYWORD1>
-		<KEYWORD1>svyintreg</KEYWORD1>
-		<KEYWORD1>svyintreg_7</KEYWORD1>
-		<KEYWORD1>svyintrg</KEYWORD1>
-		<KEYWORD1>svyivreg</KEYWORD1>
-		<KEYWORD1>svylc</KEYWORD1>
-		<KEYWORD1>svylog_p</KEYWORD1>
-		<KEYWORD1>svylogit</KEYWORD1>
-		<KEYWORD1>svymarkout</KEYWORD1>
-		<KEYWORD1>svymarkout_8</KEYWORD1>
-		<KEYWORD1>svymean</KEYWORD1>
-		<KEYWORD1>svymlog</KEYWORD1>
-		<KEYWORD1>svymlogit</KEYWORD1>
-		<KEYWORD1>svynbreg</KEYWORD1>
-		<KEYWORD1>svyolog</KEYWORD1>
-		<KEYWORD1>svyologit</KEYWORD1>
-		<KEYWORD1>svyoprob</KEYWORD1>
-		<KEYWORD1>svyoprobit</KEYWORD1>
-		<KEYWORD1>svyopts</KEYWORD1>
-		<KEYWORD1>svypois</KEYWORD1>
-		<KEYWORD1>svypois_7</KEYWORD1>
-		<KEYWORD1>svypoisson</KEYWORD1>
-		<KEYWORD1>svyprobit</KEYWORD1>
-		<KEYWORD1>svyprobt</KEYWORD1>
-		<KEYWORD1>svyprop</KEYWORD1>
-		<KEYWORD1>svyprop_7</KEYWORD1>
-		<KEYWORD1>svyratio</KEYWORD1>
-		<KEYWORD1>svyreg</KEYWORD1>
-		<KEYWORD1>svyreg_p</KEYWORD1>
-		<KEYWORD1>svyregress</KEYWORD1>
-		<KEYWORD1>svyset</KEYWORD1>
-		<KEYWORD1>svyset_7</KEYWORD1>
-		<KEYWORD1>svyset_8</KEYWORD1>
-		<KEYWORD1>svytab</KEYWORD1>
-		<KEYWORD1>svytab_7</KEYWORD1>
-		<KEYWORD1>svytest</KEYWORD1>
-		<KEYWORD1>svytotal</KEYWORD1>
-		<KEYWORD1>sw</KEYWORD1>
-		<KEYWORD1>sw_8</KEYWORD1>
-		<KEYWORD1>swcnreg</KEYWORD1>
-		<KEYWORD1>swcox</KEYWORD1>
-		<KEYWORD1>swereg</KEYWORD1>
-		<KEYWORD1>swilk</KEYWORD1>
-		<KEYWORD1>swlogis</KEYWORD1>
-		<KEYWORD1>swlogit</KEYWORD1>
-		<KEYWORD1>swologit</KEYWORD1>
-		<KEYWORD1>swoprbt</KEYWORD1>
-		<KEYWORD1>swpois</KEYWORD1>
-		<KEYWORD1>swprobit</KEYWORD1>
-		<KEYWORD1>swqreg</KEYWORD1>
-		<KEYWORD1>swtobit</KEYWORD1>
-		<KEYWORD1>swweib</KEYWORD1>
-		<KEYWORD1>symmetry</KEYWORD1>
-		<KEYWORD1>symmi</KEYWORD1>
-		<KEYWORD1>symplot</KEYWORD1>
-		<KEYWORD1>symplot_7</KEYWORD1>
-		<KEYWORD1>syntax</KEYWORD1>
-		<KEYWORD1>sysdescribe</KEYWORD1>
-		<KEYWORD1>sysuse</KEYWORD1>
-		<KEYWORD1>szroeter</KEYWORD1>
-		<KEYWORD1>ta</KEYWORD1>
-		<KEYWORD1>tab</KEYWORD1>
-		<KEYWORD1>tab1</KEYWORD1>
-		<KEYWORD1>tab2</KEYWORD1>
-		<KEYWORD1>tab_or</KEYWORD1>
-		<KEYWORD1>tabd</KEYWORD1>
-		<KEYWORD1>tabdi</KEYWORD1>
-		<KEYWORD1>tabdis</KEYWORD1>
-		<KEYWORD1>tabdisp</KEYWORD1>
-		<KEYWORD1>tabi</KEYWORD1>
-		<KEYWORD1>table</KEYWORD1>
-		<KEYWORD1>tabodds</KEYWORD1>
-		<KEYWORD1>tabodds_7</KEYWORD1>
-		<KEYWORD1>tabstat</KEYWORD1>
-		<KEYWORD1>tabu</KEYWORD1>
-		<KEYWORD1>tabul</KEYWORD1>
-		<KEYWORD1>tabula</KEYWORD1>
-		<KEYWORD1>tabulat</KEYWORD1>
-		<KEYWORD1>tabulate</KEYWORD1>
-		<KEYWORD1>te</KEYWORD1>
-		<KEYWORD1>tempfile</KEYWORD1>
-		<KEYWORD1>tempname</KEYWORD1>
-		<KEYWORD1>tempvar</KEYWORD1>
-		<KEYWORD1>tes</KEYWORD1>
-		<KEYWORD1>test</KEYWORD1>
-		<KEYWORD1>testnl</KEYWORD1>
-		<KEYWORD1>testparm</KEYWORD1>
-		<KEYWORD1>teststd</KEYWORD1>
-		<KEYWORD1>tetrachoric</KEYWORD1>
-		<KEYWORD1>time_it</KEYWORD1>
-		<KEYWORD1>timer</KEYWORD1>
-		<KEYWORD1>tis</KEYWORD1>
-		<KEYWORD1>tob</KEYWORD1>
-		<KEYWORD1>tobi</KEYWORD1>
-		<KEYWORD1>tobit</KEYWORD1>
-		<KEYWORD1>tobit_p</KEYWORD1>
-		<KEYWORD1>tobit_sw</KEYWORD1>
-		<KEYWORD1>token</KEYWORD1>
-		<KEYWORD1>tokeni</KEYWORD1>
-		<KEYWORD1>tokeniz</KEYWORD1>
-		<KEYWORD1>tokenize</KEYWORD1>
-		<KEYWORD1>tostring</KEYWORD1>
-		<KEYWORD1>total</KEYWORD1>
-		<KEYWORD1>touch</KEYWORD1>
-		<KEYWORD1>treat_ll</KEYWORD1>
-		<KEYWORD1>treatr_p</KEYWORD1>
-		<KEYWORD1>treatreg</KEYWORD1>
-		<KEYWORD1>trim</KEYWORD1>
-		<KEYWORD1>trnb_cons</KEYWORD1>
-		<KEYWORD1>trnb_mean</KEYWORD1>
-		<KEYWORD1>trpoiss_d2</KEYWORD1>
-		<KEYWORD1>trunc_ll</KEYWORD1>
-		<KEYWORD1>truncr_p</KEYWORD1>
-		<KEYWORD1>truncreg</KEYWORD1>
-		<KEYWORD1>tsappend</KEYWORD1>
-		<KEYWORD1>tset</KEYWORD1>
-		<KEYWORD1>tsfill</KEYWORD1>
-		<KEYWORD1>tsline</KEYWORD1>
-		<KEYWORD1>tsline_ex</KEYWORD1>
-		<KEYWORD1>tsreport</KEYWORD1>
-		<KEYWORD1>tsrevar</KEYWORD1>
-		<KEYWORD1>tsrline</KEYWORD1>
-		<KEYWORD1>tsset</KEYWORD1>
-		<KEYWORD1>tssmooth</KEYWORD1>
-		<KEYWORD1>tsunab</KEYWORD1>
-		<KEYWORD1>ttest</KEYWORD1>
-		<KEYWORD1>ttesti</KEYWORD1>
-		<KEYWORD1>tut_chk</KEYWORD1>
-		<KEYWORD1>tut_wait</KEYWORD1>
-		<KEYWORD1>tutorial</KEYWORD1>
-		<KEYWORD1>tw</KEYWORD1>
-		<KEYWORD1>tware_st</KEYWORD1>
-		<KEYWORD1>two</KEYWORD1>
-		<KEYWORD1>twoway</KEYWORD1>
-		<KEYWORD1>twoway__fpfit_serset</KEYWORD1>
-		<KEYWORD1>twoway__function_gen</KEYWORD1>
-		<KEYWORD1>twoway__histogram_gen</KEYWORD1>
-		<KEYWORD1>twoway__ipoint_serset</KEYWORD1>
-		<KEYWORD1>twoway__ipoints_serset</KEYWORD1>
-		<KEYWORD1>twoway__kdensity_gen</KEYWORD1>
-		<KEYWORD1>twoway__lfit_serset</KEYWORD1>
-		<KEYWORD1>twoway__normgen_gen</KEYWORD1>
-		<KEYWORD1>twoway__pci_serset</KEYWORD1>
-		<KEYWORD1>twoway__qfit_serset</KEYWORD1>
-		<KEYWORD1>twoway__scatteri_serset</KEYWORD1>
-		<KEYWORD1>twoway__sunflower_gen</KEYWORD1>
-		<KEYWORD1>twoway_ksm_serset</KEYWORD1>
-		<KEYWORD1>ty</KEYWORD1>
-		<KEYWORD1>typ</KEYWORD1>
-		<KEYWORD1>type</KEYWORD1>
-		<KEYWORD1>typeof</KEYWORD1>
-		<KEYWORD1>u</KEYWORD1>
-		<KEYWORD1>unab</KEYWORD1>
-		<KEYWORD1>unabbrev</KEYWORD1>
-		<KEYWORD1>unidiff</KEYWORD1>
-		<KEYWORD1>update</KEYWORD1>
-		<KEYWORD1>us</KEYWORD1>
-		<KEYWORD1>uselabel</KEYWORD1>
-		<KEYWORD1>var</KEYWORD1>
-		<KEYWORD1>var_mkcompanion</KEYWORD1>
-		<KEYWORD1>var_p</KEYWORD1>
-		<KEYWORD1>varbasic</KEYWORD1>
-		<KEYWORD1>varfcast</KEYWORD1>
-		<KEYWORD1>vargranger</KEYWORD1>
-		<KEYWORD1>varirf</KEYWORD1>
-		<KEYWORD1>varirf_add</KEYWORD1>
-		<KEYWORD1>varirf_cgraph</KEYWORD1>
-		<KEYWORD1>varirf_create</KEYWORD1>
-		<KEYWORD1>varirf_ctable</KEYWORD1>
-		<KEYWORD1>varirf_describe</KEYWORD1>
-		<KEYWORD1>varirf_dir</KEYWORD1>
-		<KEYWORD1>varirf_drop</KEYWORD1>
-		<KEYWORD1>varirf_erase</KEYWORD1>
-		<KEYWORD1>varirf_graph</KEYWORD1>
-		<KEYWORD1>varirf_ograph</KEYWORD1>
-		<KEYWORD1>varirf_rename</KEYWORD1>
-		<KEYWORD1>varirf_set</KEYWORD1>
-		<KEYWORD1>varirf_table</KEYWORD1>
-		<KEYWORD1>varlmar</KEYWORD1>
-		<KEYWORD1>varnorm</KEYWORD1>
-		<KEYWORD1>varsoc</KEYWORD1>
-		<KEYWORD1>varstable</KEYWORD1>
-		<KEYWORD1>varstable_w</KEYWORD1>
-		<KEYWORD1>varstable_w2</KEYWORD1>
-		<KEYWORD1>varwle</KEYWORD1>
-		<KEYWORD1>vce</KEYWORD1>
-		<KEYWORD1>vec</KEYWORD1>
-		<KEYWORD1>vec_fevd</KEYWORD1>
-		<KEYWORD1>vec_mkphi</KEYWORD1>
-		<KEYWORD1>vec_p</KEYWORD1>
-		<KEYWORD1>vec_p_w</KEYWORD1>
-		<KEYWORD1>vecirf_create</KEYWORD1>
-		<KEYWORD1>veclmar</KEYWORD1>
-		<KEYWORD1>veclmar_w</KEYWORD1>
-		<KEYWORD1>vecnorm</KEYWORD1>
-		<KEYWORD1>vecnorm_w</KEYWORD1>
-		<KEYWORD1>vecrank</KEYWORD1>
-		<KEYWORD1>vecstable</KEYWORD1>
-		<KEYWORD1>verinst</KEYWORD1>
-		<KEYWORD1>vers</KEYWORD1>
-		<KEYWORD1>versi</KEYWORD1>
-		<KEYWORD1>versio</KEYWORD1>
-		<KEYWORD1>version</KEYWORD1>
-		<KEYWORD1>viewsource</KEYWORD1>
-		<KEYWORD1>vif</KEYWORD1>
-		<KEYWORD1>vwls</KEYWORD1>
-		<KEYWORD1>wdatetof</KEYWORD1>
-		<KEYWORD1>wdctl</KEYWORD1>
-		<KEYWORD1>wdlg</KEYWORD1>
-		<KEYWORD1>wdupdate</KEYWORD1>
-		<KEYWORD1>webdescribe</KEYWORD1>
-		<KEYWORD1>webseek</KEYWORD1>
-		<KEYWORD1>webuse</KEYWORD1>
-		<KEYWORD1>weib1_lf</KEYWORD1>
-		<KEYWORD1>weib2_lf</KEYWORD1>
-		<KEYWORD1>weib_lf</KEYWORD1>
-		<KEYWORD1>weib_lf0</KEYWORD1>
-		<KEYWORD1>weibhet_glf</KEYWORD1>
-		<KEYWORD1>weibhet_glf_sh</KEYWORD1>
-		<KEYWORD1>weibhet_glfa</KEYWORD1>
-		<KEYWORD1>weibhet_glfa_sh</KEYWORD1>
-		<KEYWORD1>weibhet_gp</KEYWORD1>
-		<KEYWORD1>weibhet_ilf</KEYWORD1>
-		<KEYWORD1>weibhet_ilf_sh</KEYWORD1>
-		<KEYWORD1>weibhet_ilfa</KEYWORD1>
-		<KEYWORD1>weibhet_ilfa_sh</KEYWORD1>
-		<KEYWORD1>weibhet_ip</KEYWORD1>
-		<KEYWORD1>weibu_sw</KEYWORD1>
-		<KEYWORD1>weibul_p</KEYWORD1>
-		<KEYWORD1>weibull</KEYWORD1>
-		<KEYWORD1>weibull_c</KEYWORD1>
-		<KEYWORD1>weibull_s</KEYWORD1>
-		<KEYWORD1>weibullhet</KEYWORD1>
-		<KEYWORD1>wh</KEYWORD1>
-		<KEYWORD1>whelp</KEYWORD1>
-		<KEYWORD1>whi</KEYWORD1>
-		<KEYWORD1>whic</KEYWORD1>
-		<KEYWORD1>which</KEYWORD1>
-		<KEYWORD1>who</KEYWORD1>
-		<KEYWORD1>wilc_st</KEYWORD1>
-		<KEYWORD1>wilcoxon</KEYWORD1>
-		<KEYWORD1>win</KEYWORD1>
-		<KEYWORD1>wind</KEYWORD1>
-		<KEYWORD1>windo</KEYWORD1>
-		<KEYWORD1>window</KEYWORD1>
-		<KEYWORD1>winexec</KEYWORD1>
-		<KEYWORD1>wmenu</KEYWORD1>
-		<KEYWORD1>wntestb</KEYWORD1>
-		<KEYWORD1>wntestb_7</KEYWORD1>
-		<KEYWORD1>wntestq</KEYWORD1>
-		<KEYWORD1>xchart</KEYWORD1>
-		<KEYWORD1>xchart_7</KEYWORD1>
-		<KEYWORD1>xcorr</KEYWORD1>
-		<KEYWORD1>xcorr_7</KEYWORD1>
-		<KEYWORD1>xi</KEYWORD1>
-		<KEYWORD1>xi_6</KEYWORD1>
-		<KEYWORD1>xpose</KEYWORD1>
-		<KEYWORD1>xt_iis</KEYWORD1>
-		<KEYWORD1>xt_tis</KEYWORD1>
-		<KEYWORD1>xtab_p</KEYWORD1>
-		<KEYWORD1>xtabond</KEYWORD1>
-		<KEYWORD1>xtabond2</KEYWORD1>
-		<KEYWORD1>xtbin_p</KEYWORD1>
-		<KEYWORD1>xtclog</KEYWORD1>
-		<KEYWORD1>xtcloglog</KEYWORD1>
-		<KEYWORD1>xtcloglog_8</KEYWORD1>
-		<KEYWORD1>xtcloglog_d2</KEYWORD1>
-		<KEYWORD1>xtcloglog_pa_p</KEYWORD1>
-		<KEYWORD1>xtcloglog_re_p</KEYWORD1>
-		<KEYWORD1>xtcnt_p</KEYWORD1>
-		<KEYWORD1>xtcorr</KEYWORD1>
-		<KEYWORD1>xtdata</KEYWORD1>
-		<KEYWORD1>xtdes</KEYWORD1>
-		<KEYWORD1>xtdpdsys</KEYWORD1>
-		<KEYWORD1>xtfisher</KEYWORD1>
-		<KEYWORD1>xtfront_p</KEYWORD1>
-		<KEYWORD1>xtfrontier</KEYWORD1>
-		<KEYWORD1>xtgee</KEYWORD1>
-		<KEYWORD1>xtgee_elink</KEYWORD1>
-		<KEYWORD1>xtgee_estat</KEYWORD1>
-		<KEYWORD1>xtgee_makeivar</KEYWORD1>
-		<KEYWORD1>xtgee_p</KEYWORD1>
-		<KEYWORD1>xtgee_plink</KEYWORD1>
-		<KEYWORD1>xtgls</KEYWORD1>
-		<KEYWORD1>xtgls_p</KEYWORD1>
-		<KEYWORD1>xthaus</KEYWORD1>
-		<KEYWORD1>xthausman</KEYWORD1>
-		<KEYWORD1>xtht_p</KEYWORD1>
-		<KEYWORD1>xthtaylor</KEYWORD1>
-		<KEYWORD1>xtile</KEYWORD1>
-		<KEYWORD1>xtint_p</KEYWORD1>
-		<KEYWORD1>xtintreg</KEYWORD1>
-		<KEYWORD1>xtintreg_8</KEYWORD1>
-		<KEYWORD1>xtintreg_d2</KEYWORD1>
-		<KEYWORD1>xtintreg_p</KEYWORD1>
-		<KEYWORD1>xtivp_1</KEYWORD1>
-		<KEYWORD1>xtivp_2</KEYWORD1>
-		<KEYWORD1>xtivreg</KEYWORD1>
-		<KEYWORD1>xtline</KEYWORD1>
-		<KEYWORD1>xtline_ex</KEYWORD1>
-		<KEYWORD1>xtlogit</KEYWORD1>
-		<KEYWORD1>xtlogit_8</KEYWORD1>
-		<KEYWORD1>xtlogit_d2</KEYWORD1>
-		<KEYWORD1>xtlogit_fe_p</KEYWORD1>
-		<KEYWORD1>xtlogit_pa_p</KEYWORD1>
-		<KEYWORD1>xtlogit_re_p</KEYWORD1>
-		<KEYWORD1>xtlsdvc</KEYWORD1>
-		<KEYWORD1>xtmixed</KEYWORD1>
-		<KEYWORD1>xtmixed_estat</KEYWORD1>
-		<KEYWORD1>xtmixed_p</KEYWORD1>
-		<KEYWORD1>xtnb_fe</KEYWORD1>
-		<KEYWORD1>xtnb_lf</KEYWORD1>
-		<KEYWORD1>xtnbreg</KEYWORD1>
-		<KEYWORD1>xtnbreg_pa_p</KEYWORD1>
-		<KEYWORD1>xtnbreg_refe_p</KEYWORD1>
-		<KEYWORD1>xtpcse</KEYWORD1>
-		<KEYWORD1>xtpcse_p</KEYWORD1>
-		<KEYWORD1>xtpois</KEYWORD1>
-		<KEYWORD1>xtpoisson</KEYWORD1>
-		<KEYWORD1>xtpoisson_d2</KEYWORD1>
-		<KEYWORD1>xtpoisson_pa_p</KEYWORD1>
-		<KEYWORD1>xtpoisson_refe_p</KEYWORD1>
-		<KEYWORD1>xtpred</KEYWORD1>
-		<KEYWORD1>xtprobit</KEYWORD1>
-		<KEYWORD1>xtprobit_8</KEYWORD1>
-		<KEYWORD1>xtprobit_d2</KEYWORD1>
-		<KEYWORD1>xtprobit_re_p</KEYWORD1>
-		<KEYWORD1>xtps_fe</KEYWORD1>
-		<KEYWORD1>xtps_lf</KEYWORD1>
-		<KEYWORD1>xtps_ren</KEYWORD1>
-		<KEYWORD1>xtps_ren_8</KEYWORD1>
-		<KEYWORD1>xtrar_p</KEYWORD1>
-		<KEYWORD1>xtrc</KEYWORD1>
-		<KEYWORD1>xtrc_p</KEYWORD1>
-		<KEYWORD1>xtrch_p</KEYWORD1>
-		<KEYWORD1>xtrchh</KEYWORD1>
-		<KEYWORD1>xtrefe_p</KEYWORD1>
-		<KEYWORD1>xtreg</KEYWORD1>
-		<KEYWORD1>xtreg_be</KEYWORD1>
-		<KEYWORD1>xtreg_fe</KEYWORD1>
-		<KEYWORD1>xtreg_ml</KEYWORD1>
-		<KEYWORD1>xtreg_pa_p</KEYWORD1>
-		<KEYWORD1>xtreg_re</KEYWORD1>
-		<KEYWORD1>xtregar</KEYWORD1>
-		<KEYWORD1>xtrere_p</KEYWORD1>
-		<KEYWORD1>xtserial</KEYWORD1>
-		<KEYWORD1>xtset</KEYWORD1>
-		<KEYWORD1>xtsf_ll</KEYWORD1>
-		<KEYWORD1>xtsf_llti</KEYWORD1>
-		<KEYWORD1>xtsum</KEYWORD1>
-		<KEYWORD1>xttab</KEYWORD1>
-		<KEYWORD1>xttest0</KEYWORD1>
-		<KEYWORD1>xttest2</KEYWORD1>
-		<KEYWORD1>xttest3</KEYWORD1>
-		<KEYWORD1>xttobit</KEYWORD1>
-		<KEYWORD1>xttobit_8</KEYWORD1>
-		<KEYWORD1>xttobit_p</KEYWORD1>
-		<KEYWORD1>xttrans</KEYWORD1>
-		<KEYWORD1>xwin</KEYWORD1>
-		<KEYWORD1>xwind</KEYWORD1>
-		<KEYWORD1>xwindo</KEYWORD1>
-		<KEYWORD1>xwindow</KEYWORD1>
-		<KEYWORD1>y_ado</KEYWORD1>
-		<KEYWORD1>yx</KEYWORD1>
-		<KEYWORD1>yxview__barlike_draw</KEYWORD1>
-		<KEYWORD1>yxview_area_draw</KEYWORD1>
-		<KEYWORD1>yxview_bar_draw</KEYWORD1>
-		<KEYWORD1>yxview_dot_draw</KEYWORD1>
-		<KEYWORD1>yxview_dropline_draw</KEYWORD1>
-		<KEYWORD1>yxview_function_draw</KEYWORD1>
-		<KEYWORD1>yxview_iarrow_draw</KEYWORD1>
-		<KEYWORD1>yxview_ilabels_draw</KEYWORD1>
-		<KEYWORD1>yxview_normal_draw</KEYWORD1>
-		<KEYWORD1>yxview_pcarrow_draw</KEYWORD1>
-		<KEYWORD1>yxview_pcbarrow_draw</KEYWORD1>
-		<KEYWORD1>yxview_pccapsym_draw</KEYWORD1>
-		<KEYWORD1>yxview_pcscatter_draw</KEYWORD1>
-		<KEYWORD1>yxview_pcspike_draw</KEYWORD1>
-		<KEYWORD1>yxview_rarea_draw</KEYWORD1>
-		<KEYWORD1>yxview_rbar_draw</KEYWORD1>
-		<KEYWORD1>yxview_rbarm_draw</KEYWORD1>
-		<KEYWORD1>yxview_rcap_draw</KEYWORD1>
-		<KEYWORD1>yxview_rcapsym_draw</KEYWORD1>
-		<KEYWORD1>yxview_rconnected_draw</KEYWORD1>
-		<KEYWORD1>yxview_rline_draw</KEYWORD1>
-		<KEYWORD1>yxview_rscatter_draw</KEYWORD1>
-		<KEYWORD1>yxview_rspike_draw</KEYWORD1>
-		<KEYWORD1>yxview_spike_draw</KEYWORD1>
-		<KEYWORD1>yxview_sunflower_draw</KEYWORD1>
-		<KEYWORD1>zap_s</KEYWORD1>
-		<KEYWORD1>zinb</KEYWORD1>
-		<KEYWORD1>zinb_llf</KEYWORD1>
-		<KEYWORD1>zinb_plf</KEYWORD1>
-		<KEYWORD1>zip</KEYWORD1>
-		<KEYWORD1>zip_llf</KEYWORD1>
-		<KEYWORD1>zip_p</KEYWORD1>
-		<KEYWORD1>zip_plf</KEYWORD1>
-		<KEYWORD1>zt_ct_5</KEYWORD1>
-		<KEYWORD1>zt_hc_5</KEYWORD1>
-		<KEYWORD1>zt_hcd_5</KEYWORD1>
-		<KEYWORD1>zt_is_5</KEYWORD1>
-		<KEYWORD1>zt_iss_5</KEYWORD1>
-		<KEYWORD1>zt_sho_5</KEYWORD1>
-		<KEYWORD1>zt_smp_5</KEYWORD1>
-		<KEYWORD1>ztbase_5</KEYWORD1>
-		<KEYWORD1>ztcox_5</KEYWORD1>
-		<KEYWORD1>ztdes_5</KEYWORD1>
-		<KEYWORD1>ztereg_5</KEYWORD1>
-		<KEYWORD1>ztfill_5</KEYWORD1>
-		<KEYWORD1>ztgen_5</KEYWORD1>
-		<KEYWORD1>ztir_5</KEYWORD1>
-		<KEYWORD1>ztjoin_5</KEYWORD1>
-		<KEYWORD1>ztnb</KEYWORD1>
-		<KEYWORD1>ztnb_p</KEYWORD1>
-		<KEYWORD1>ztp</KEYWORD1>
-		<KEYWORD1>ztp_p</KEYWORD1>
-		<KEYWORD1>zts_5</KEYWORD1>
-		<KEYWORD1>ztset_5</KEYWORD1>
-		<KEYWORD1>ztspli_5</KEYWORD1>
-		<KEYWORD1>ztsum_5</KEYWORD1>
-		<KEYWORD1>zttoct_5</KEYWORD1>
-		<KEYWORD1>ztvary_5</KEYWORD1>
-		<KEYWORD1>ztweib_5</KEYWORD1>
-
-		<!-- display ) -->
-		<KEYWORD1>inp</KEYWORD1>
-		<KEYWORD1>res</KEYWORD1>
-		<KEYWORD1>txt</KEYWORD1>
-		
-
-		
-		<!-- Survival Model keywords (recent addons ) -->
-		<KEYWORD1>basec</KEYWORD1>
-		<KEYWORD1>basechazard</KEYWORD1>
-		<KEYWORD1>basehc</KEYWORD1>
-		<KEYWORD1>bases</KEYWORD1>
-		<KEYWORD1>basesurv</KEYWORD1>
-		<KEYWORD1>eff</KEYWORD1>
-		<KEYWORD1>effects</KEYWORD1>
-		<KEYWORD1>esr</KEYWORD1>
-		<KEYWORD1>tvc</KEYWORD1>
-		<KEYWORD1>strata</KEYWORD1>
-		<KEYWORD1>efron</KEYWORD1>
-		<KEYWORD1>shared</KEYWORD1>
-		<KEYWORD1>sh</KEYWORD1>
-		<KEYWORD1>offset</KEYWORD1>
-		<KEYWORD1>breslow</KEYWORD1>
-		<KEYWORD1>bre</KEYWORD1>	
-		<KEYWORD1>texp</KEYWORD1>
-		<KEYWORD1>exactm</KEYWORD1>
-		<KEYWORD1>exactp</KEYWORD1>
-		<KEYWORD1>con</KEYWORD1>
-		<KEYWORD1>noadjust</KEYWORD1>
-		<KEYWORD1>noadj</KEYWORD1>		
-		<KEYWORD1>noshow</KEYWORD1>
-		<KEYWORD1>nosh</KEYWORD1>
-		<KEYWORD1>mgale</KEYWORD1>
-		<KEYWORD1>mg</KEYWORD1>
-		<KEYWORD1>phtest</KEYWORD1>
-		<KEYWORD1>sch</KEYWORD1>
-		<KEYWORD1>schoenfeld</KEYWORD1>
-		<KEYWORD1>scaledsch</KEYWORD1>
-		<KEYWORD1>sca</KEYWORD1>
-		<KEYWORD1>stphplot</KEYWORD1>
-		<KEYWORD1>stcoxkm</KEYWORD1>
-		<KEYWORD1>z</KEYWORD1>
-		<KEYWORD1>zero</KEYWORD1>
-		<KEYWORD1>noneg</KEYWORD1>
-		<KEYWORD1>nonegative</KEYWORD1>
-		<KEYWORD1>nolnt</KEYWORD1>
-		<KEYWORD1>nolntime</KEYWORD1>
-		<KEYWORD1>addplot</KEYWORD1>
-		<KEYWORD1>ties</KEYWORD1>
-		<KEYWORD1>tie</KEYWORD1>
-		<KEYWORD1>sep</KEYWORD1>
-		<KEYWORD1>separate</KEYWORD1>		
-
-		<!-- Some add-on ado packages: -->		
-		<KEYWORD1>_gsqelemcount</KEYWORD1>
-		<KEYWORD1>_gsqepicount</KEYWORD1>
-		<KEYWORD1>_gsqgapcount</KEYWORD1>
-		<KEYWORD1>_gsqgaplength</KEYWORD1>
-		<KEYWORD1>_gsqitemcount</KEYWORD1>
-		<KEYWORD1>_gsqlength</KEYWORD1>
-		<KEYWORD1>est2one</KEYWORD1>
-		<KEYWORD1>est2rowlbl</KEYWORD1>
-		<KEYWORD1>est2tex</KEYWORD1>
-		<KEYWORD1>est2vec</KEYWORD1>
-		<KEYWORD1>estsimp</KEYWORD1>
-		<KEYWORD1>maketex</KEYWORD1>
-		<KEYWORD1>matload</KEYWORD1>
-		<KEYWORD1>matsave</KEYWORD1>
-		<KEYWORD1>newey2</KEYWORD1>
-		<KEYWORD1>outtable</KEYWORD1>
-		<KEYWORD1>outtable7</KEYWORD1>
-		<KEYWORD1>outtex</KEYWORD1>
-		<KEYWORD1>outtex6</KEYWORD1>
-		<KEYWORD1>relogit</KEYWORD1>
-		<KEYWORD1>relogitq</KEYWORD1>
-		<KEYWORD1>renvars</KEYWORD1>
-		<KEYWORD1>setx</KEYWORD1>
-		<KEYWORD1>setxhl</KEYWORD1>
-		<KEYWORD1>simqi</KEYWORD1>
-		<KEYWORD1>sp_adj</KEYWORD1>
-		<KEYWORD1>spbase</KEYWORD1>
-		<KEYWORD1>spline</KEYWORD1>
-		<KEYWORD1>sqclusterdat</KEYWORD1>
-		<KEYWORD1>sqclustermat</KEYWORD1>
-		<KEYWORD1>sqdes</KEYWORD1>
-		<KEYWORD1>sqindexplot</KEYWORD1>
-		<KEYWORD1>sqom</KEYWORD1>
-		<KEYWORD1>sqparcoord</KEYWORD1>
-		<KEYWORD1>sqset</KEYWORD1>
-		<KEYWORD1>sqstatlist</KEYWORD1>
-		<KEYWORD1>sqstatsum</KEYWORD1>
-		<KEYWORD1>sqstattab1</KEYWORD1>
-		<KEYWORD1>sqstattab2</KEYWORD1>
-		<KEYWORD1>sqstattabsum</KEYWORD1>
-		<KEYWORD1>sqtab</KEYWORD1>
-		<KEYWORD1>sumqi</KEYWORD1>
-		<KEYWORD1>sutex</KEYWORD1>
-		<KEYWORD1>sutex6</KEYWORD1>
-		<KEYWORD1>tlogit</KEYWORD1>
-		<KEYWORD1>xtfevd</KEYWORD1>	
-		<KEYWORD1>xtserial</KEYWORD1>
-		<KEYWORD1>xttest1</KEYWORD1>
-
-		<!-- options: -->
-		<KEYWORD1>nokeep</KEYWORD1>
-		<KEYWORD1>fe</KEYWORD1>
-		<KEYWORD1>re</KEYWORD1>
-		<KEYWORD1>pairwise</KEYWORD1>
-		<KEYWORD1>gmm</KEYWORD1>
-		<KEYWORD1>distribution</KEYWORD1>
-		<KEYWORD1>loglogistic</KEYWORD1>
-		<KEYWORD1>lognormal</KEYWORD1>
-		<KEYWORD1>exponential</KEYWORD1>
-		<KEYWORD1>nohr</KEYWORD1>
-		<KEYWORD1>schoenfeld</KEYWORD1>
-		<KEYWORD1>scaledsch</KEYWORD1>
-		<KEYWORD1>basechazard</KEYWORD1>
-		<KEYWORD1>basesurv</KEYWORD1>
-		<KEYWORD1>basehc</KEYWORD1>
-		<KEYWORD1>esr</KEYWORD1>
-		<KEYWORD1>time0</KEYWORD1>
-		<KEYWORD1>origin</KEYWORD1>
-
-		<!-- graphing options: -->
-		<KEYWORD1>dropline</KEYWORD1>
-		<KEYWORD1>bar</KEYWORD1>
-		<KEYWORD1>hbar</KEYWORD1>
-		<KEYWORD1>allc</KEYWORD1>
-		<KEYWORD1>allcategories</KEYWORD1>
-		<KEYWORD1>yalt</KEYWORD1>
-		<KEYWORD1>xalt</KEYWORD1>
-		<KEYWORD1>yalternate</KEYWORD1>
-		<KEYWORD1>xalternate</KEYWORD1>
-		<KEYWORD1>exclude0</KEYWORD1>
-		<KEYWORD1>yrev</KEYWORD1>
-		<KEYWORD1>yreverse</KEYWORD1>
-		<KEYWORD1>blab</KEYWORD1>
-		<KEYWORD1>blabel</KEYWORD1>
-		<KEYWORD1>yvar</KEYWORD1>
-		<KEYWORD1>yvaroptions</KEYWORD1>
-		<KEYWORD1>nolabel</KEYWORD1>
-		<KEYWORD1>nolab</KEYWORD1>
-		<KEYWORD1>dot</KEYWORD1>
-		<KEYWORD1>box</KEYWORD1>
-		<KEYWORD1>pie</KEYWORD1>
-		<KEYWORD1>combine</KEYWORD1>
-		<KEYWORD1>printcolor</KEYWORD1>
-		<KEYWORD1>yax</KEYWORD1>
-		<KEYWORD1>xax</KEYWORD1>
-		<KEYWORD1>yaxis</KEYWORD1>
-		<KEYWORD1>xaxis</KEYWORD1>
-		<KEYWORD1>legend</KEYWORD1>
-		<KEYWORD1>msymbol</KEYWORD1>
-		<KEYWORD1>ytic</KEYWORD1>
-		<KEYWORD1>xtic</KEYWORD1>
-		<KEYWORD1>ytick</KEYWORD1>
-		<KEYWORD1>xtick</KEYWORD1>
-		<KEYWORD1>lpattern</KEYWORD1>
-		<KEYWORD1>ti</KEYWORD1>
-		<KEYWORD1>tick</KEYWORD1>
-		<KEYWORD1>mlab</KEYWORD1>
-		<KEYWORD1>mlabel</KEYWORD1>
-		<KEYWORD1>mtick</KEYWORD1>
-		<KEYWORD1>mtic</KEYWORD1>
-		<KEYWORD1>yscale</KEYWORD1>
-		<KEYWORD1>xscale</KEYWORD1>
-		<KEYWORD1>tscale</KEYWORD1>
-		<KEYWORD1>ysc</KEYWORD1>
-		<KEYWORD1>xsc</KEYWORD1>
-		<KEYWORD1>tsc</KEYWORD1>
-		<KEYWORD1>ylab</KEYWORD1>
-		<KEYWORD1>xlab</KEYWORD1>
-		<KEYWORD1>ylabel</KEYWORD1>
-		<KEYWORD1>xlabel</KEYWORD1>
-		<KEYWORD1>yti</KEYWORD1>
-		<KEYWORD1>xti</KEYWORD1>
-		<KEYWORD1>ytitle</KEYWORD1>
-		<KEYWORD1>xtitle</KEYWORD1>		
-		</KEYWORDS>
-		
-	</RULES>
-
-	
-<!-- Rule sets for strings, macros, quotes -->
-	<RULES SET="STRINGMACRO"> 
-		<SPAN TYPE="LITERAL3" DELEGATE="COM-QUOTE"><BEGIN>`"</BEGIN><END>"'</END></SPAN> 
-		<SPAN TYPE="LITERAL1" DELEGATE="DUB-QUOTE"><BEGIN>"</BEGIN><END>"</END></SPAN>
-		<IMPORT DELEGATE="MACROS"/>
-	</RULES>
-	
-	<!-- COM-Quotes are highlighted as LITERAL3 - except:functions and macros -->
-	<RULES SET="COM-QUOTE" 
-		DEFAULT="LITERAL3"
-		>
-		<MARK_PREVIOUS TYPE="FUNCTION" MATCH_TYPE="FUNCTION">(</MARK_PREVIOUS>
-		<SEQ TYPE="FUNCTION">)</SEQ>
-		<IMPORT DELEGATE="MACROS"/>
-	</RULES>
-	
-	<!-- DUB-Quotes are highlighted as LITERAL1 - except: macros -->
-	<RULES SET="DUB-QUOTE" 
-		DEFAULT="LITERAL1"
-		>
-		<IMPORT DELEGATE="MACROS"/>
-	</RULES>
-	
-	<!-- MACTROS are highlighted as LITERAL4:-->	
-	<RULES SET="MACROS" 
-		DEFAULT="LITERAL4"
-		>
-		<SPAN TYPE="LITERAL4" DELEGATE="EXPRESSION">
-			<BEGIN>`=</BEGIN><END>'</END></SPAN>
-		<SPAN TYPE="LITERAL4" DELEGATE="GIVEUP">
-			<BEGIN>`:</BEGIN><END>'</END></SPAN>
-		<SPAN TYPE="LITERAL4" DELEGATE="MACROS">
-			<BEGIN>`</BEGIN><END>'</END></SPAN>
-		<SEQ_REGEXP TYPE="LITERAL4" HASH_CHAR="$">\$[a-zA-Z]\w*</SEQ_REGEXP> 
-	</RULES> 
-	
-	<RULES SET="EXPRESSION" 
-		DEFAULT="NULL" 
-		HIGHLIGHT_DIGITS="TRUE"
-		>
-		<SPAN_REGEXP TYPE="FUNCTION" DELEGATE="EXPRESSION" HASH_CHARS="abcdefghijklmnopqrstuvwxyz_"><BEGIN>\w*\(</BEGIN><END>)</END></SPAN_REGEXP>
-		<IMPORT DELEGATE="STRINGMACRO"/>
-	</RULES>
-
-	<RULES SET="GIVEUP" 
-		DEFAULT="NULL"
-		>
-		<IMPORT DELEGATE="STRINGMACRO"/>
-	</RULES>
-
-</MODE>
diff --git a/qpython/src/main/assets/syntax/svn_commit.xml b/qpython/src/main/assets/syntax/svn_commit.xml
deleted file mode 100644
index 95f10890..00000000
--- a/qpython/src/main/assets/syntax/svn_commit.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!--
-<MODE NAME="svn-commit"		FILE="svn_commit.xml"/>
--->
-
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="contextInsensitive" VALUE="true" />
-	</PROPS>
-	<RULES IGNORE_CASE="TRUE" HIGHLIGHT_DIGITS="FALSE">
-		<SEQ TYPE="COMMENT1" 
-			DELEGATE="CHANGED" 
-			AT_LINE_START="TRUE"
-		>--This line, and those below, will be ignored--</SEQ>
-	</RULES>
-	<RULES SET="CHANGED">
-		<EOL_SPAN AT_LINE_START="TRUE" TYPE="COMMENT2">A</EOL_SPAN>
-		<EOL_SPAN AT_LINE_START="TRUE" TYPE="COMMENT2">D</EOL_SPAN>
-		<EOL_SPAN AT_LINE_START="TRUE" TYPE="COMMENT2">M</EOL_SPAN>
-		<EOL_SPAN AT_LINE_START="TRUE" TYPE="COMMENT2">_</EOL_SPAN>
-	</RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/swig.xml b/qpython/src/main/assets/syntax/swig.xml
deleted file mode 100644
index ffa27121..00000000
--- a/qpython/src/main/assets/syntax/swig.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="commentStart" VALUE="/*" />
-		<PROPERTY NAME="commentEnd" VALUE="*/" />
-		<PROPERTY NAME="lineComment" VALUE="//" />
-		<PROPERTY NAME="wordBreakChars" VALUE=",+-=&lt;&gt;/?^&amp;*" />
-
-		<!-- Auto indent -->
-		<PROPERTY NAME="indentOpenBrackets" VALUE="{" />
-		<PROPERTY NAME="indentCloseBrackets" VALUE="}" />
-		<PROPERTY NAME="indentNextLine"
-			VALUE="\s*(((if|while)\s*\(|else\s*|else\s+if\s*\(|for\s*\(.*\))[^{;]*)" />
-		<!-- set this to 'true' if you want to use GNU coding style -->
-		<PROPERTY NAME="doubleBracketIndent" VALUE="false" />
-	</PROPS>
-	<RULES IGNORE_CASE="FALSE"
-		HIGHLIGHT_DIGITS="TRUE"
-		DIGIT_RE="(0x[\p{XDigit}]+[lL]?|[\p{Digit}]+(e[\p{Digit}]*)?[lLdDfF]?)">
-
-		<SPAN TYPE="LITERAL3" ESCAPE="\">
-			<BEGIN>%{</BEGIN>
-			<END>%}</END>
-		</SPAN>
-
-		<!-- swig directive -->
-		<MARK_FOLLOWING AT_WORD_START="TRUE" TYPE="KEYWORD4">%</MARK_FOLLOWING>
-
-		<IMPORT DELEGATE="c::MAIN"/>
-    </RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/tcl.xml b/qpython/src/main/assets/syntax/tcl.xml
deleted file mode 100644
index 7590fd8e..00000000
--- a/qpython/src/main/assets/syntax/tcl.xml
+++ /dev/null
@@ -1,685 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!-- Tcl mode by Michael Jacobson.
-     cplusplus and pascal modes used as reference.
-    2006/10/20 Jean-Francois Larvoire:
-     - Fixed comments detection: Only # at the beginning of Tcl commands are comments!
-     - Quoted strings can span multiple lines.
-     - Added recursive in-string substituted command and variable analysis.
-     - Added numerous missing tcl keywords and variables up to version 8.4.14.
-     - Removed $ on global variable keywords, as they're often used with $::.
-     - Added Expect keywords, as KEYWORD2. (send was already in tk as KEYWORD2)
-     - Avoid colouring substituted variables that are homonyms of a keyword.
-     - Highlight hexadecimal numbers too.
-    2006/10/23 Jean-Francois Larvoire:
-     - Strings and blocks only begin at word start.
-     - Updated {# comment detection to manage the whole {} block. This catches
-       all { and }, and makes it unnecessary to define them as KEYWORDs.
-     - Bug fix: Do not delegate content evaluation for ${} scalar variables.
-    2009/02/10: Albert Davidson Chou - added lineComment property for TCL mode (2119958)
-
-    Limitations:
-     - Unbalanced quotes or brackets within braces, such as in regular expressions,
-  will confuse the analysis. Workaround: If possible, use a \ to escape the
-  unbalanced character. Else add a ;# comment with a closing " or ].
-    Known bugs:
-     - Continuation line detection does not work. Same bug as espace chars below.
-     - ; highlighting as an OPERATOR does not work.
-    Known bugs (Were there before, and I failed to fix them):
-     - \c escape colouring does not work for escapes embedded in words.
-           I attemted numerous workarounds using spans and regexps, but they
-     all seem to fail to detect anything beginning with a \. And using
-     NO_ESCAPE="TRUE" does not help.
-     - {} within quoted strings should not affect indentation. -->
-
-<MODE>
-  <PROPS>
-    <PROPERTY NAME="indentOpenBrackets" VALUE="{" />
-    <PROPERTY NAME="indentCloseBrackets" VALUE="}" />
-    <PROPERTY NAME="lineUpClosingBracket" VALUE="true" />
-    <PROPERTY NAME="lineComment" VALUE="#" />
-  </PROPS>
-
-  <RULES IGNORE_CASE="FALSE" HIGHLIGHT_DIGITS="TRUE"
-    DIGIT_RE="0x\p{XDigit}+|\d+">
-
-    <!-- Continuation line. Processed before anything else by Tcl. (Does not work)-->
-    <EOL_SPAN_REGEXP TYPE="OPERATOR" HASH_CHAR="\">\\$</EOL_SPAN_REGEXP>
-
-    <!-- Comments after a ; command separator -->
-    <!-- Note: The ; isn't bolded as other operators. Why?-->
-    <EOL_SPAN_REGEXP TYPE="OPERATOR" HASH_CHAR=";" DELEGATE="TCL_COMMENT">;\s*(?=#)</EOL_SPAN_REGEXP>
-    <!-- Comments at the { opening of a block -->
-    <SPAN_REGEXP TYPE="OPERATOR" HASH_CHAR="{" DELEGATE="TCL_COMMENT">
-      <BEGIN>\{\s*(?=#)</BEGIN>
-      <END>}</END>
-    </SPAN_REGEXP>
-    <!-- Comments on a line of their own. -->
-    <EOL_SPAN TYPE="COMMENT1" AT_WHITESPACE_END="TRUE">#</EOL_SPAN>
-
-    <!-- Quoted strings -->
-    <SPAN TYPE="LITERAL1" NO_LINE_BREAK="FALSE" AT_WORD_START="TRUE" DELEGATE="TCL_STRING">
-      <BEGIN>"</BEGIN>
-      <END>"</END>
-    </SPAN>
-
-    <!-- Avoid colouring substituted variables that are homonyms of a keyword -->
-    <!-- Indexed array variable. Delegate to MAIN, as the index string is evaluated by Tcl.-->
-    <SPAN_REGEXP TYPE="NULL" HASH_CHAR="$" DELEGATE="MAIN">
-      <BEGIN>\$(\w|::)+\(</BEGIN>
-      <END>)</END>
-    </SPAN_REGEXP>
-    <!-- General scalar variable. Do not delegate, as the ${} block content is not evalutated by Tcl. -->
-    <SPAN TYPE="NULL">
-      <BEGIN>${</BEGIN>
-      <END>}</END>
-    </SPAN>
-    <!-- Plain scalar variable. -->
-    <SEQ_REGEXP TYPE="NULL" HASH_CHAR="$">\$(\w|::)+</SEQ_REGEXP>
-
-    <!-- Sub-block -->
-    <SPAN TYPE="OPERATOR" NO_LINE_BREAK="FALSE" AT_WORD_START="TRUE" DELEGATE="MAIN">
-      <BEGIN>{</BEGIN>
-      <END>}</END>
-    </SPAN>
-
-    <!-- Sub-commands to be substituted -->
-    <SPAN TYPE="OPERATOR" NO_LINE_BREAK="FALSE" DELEGATE="MAIN">
-      <BEGIN>[</BEGIN>
-      <END>]</END>
-    </SPAN>
-
-    <!-- Escaped characters -->
-    <SEQ TYPE="KEYWORD3">\a</SEQ>
-    <SEQ TYPE="KEYWORD3">\b</SEQ>
-    <SEQ TYPE="KEYWORD3">\f</SEQ>
-    <SEQ TYPE="KEYWORD3">\n</SEQ>
-    <SEQ TYPE="KEYWORD3">\r</SEQ>
-    <SEQ TYPE="KEYWORD3">\t</SEQ>
-    <SEQ TYPE="KEYWORD3">\v</SEQ>
-
-    <!-- Tcl syntax operators. -->
-    <!-- Note that "{}[]" are already caught above.-->
-    <!-- Delegate to main, as a new command begins after the ; -->
-    <SEQ TYPE="OPERATOR" DELEGATE="MAIN">;</SEQ>
-    <SEQ TYPE="NULL">::</SEQ>
-
-    <!-- Math expression operators -->
-    <SEQ TYPE="OPERATOR">=</SEQ>
-    <SEQ TYPE="OPERATOR">!</SEQ>
-    <SEQ TYPE="OPERATOR">&gt;=</SEQ>
-    <SEQ TYPE="OPERATOR">&lt;=</SEQ>
-    <SEQ TYPE="OPERATOR">+</SEQ>
-    <SEQ TYPE="OPERATOR">-</SEQ>
-    <SEQ TYPE="OPERATOR">/</SEQ>
-    <SEQ TYPE="OPERATOR">*</SEQ>
-    <SEQ TYPE="OPERATOR">&gt;</SEQ>
-    <SEQ TYPE="OPERATOR">&lt;</SEQ>
-    <SEQ TYPE="OPERATOR">%</SEQ>
-    <SEQ TYPE="OPERATOR">&amp;</SEQ>
-    <SEQ TYPE="OPERATOR">|</SEQ>
-    <SEQ TYPE="OPERATOR">^</SEQ>
-    <SEQ TYPE="OPERATOR">~</SEQ>
-
-    <KEYWORDS>
-      <!-- Tcl keywords-->
-      <KEYWORD1>append</KEYWORD1>
-      <KEYWORD1>array</KEYWORD1>
-      <KEYWORD1>concat</KEYWORD1>
-      <KEYWORD1>console</KEYWORD1>
-      <KEYWORD1>eval</KEYWORD1>
-      <KEYWORD1>expr</KEYWORD1>
-      <KEYWORD1>format</KEYWORD1>
-      <KEYWORD1>global</KEYWORD1>
-      <KEYWORD1>set</KEYWORD1>
-      <KEYWORD1>trace</KEYWORD1>
-      <KEYWORD1>unset</KEYWORD1>
-      <KEYWORD1>upvar</KEYWORD1>
-      <KEYWORD1>join</KEYWORD1>
-      <KEYWORD1>lappend</KEYWORD1>
-      <KEYWORD1>lindex</KEYWORD1>
-      <KEYWORD1>linsert</KEYWORD1>
-      <KEYWORD1>list</KEYWORD1>
-      <KEYWORD1>llength</KEYWORD1>
-      <KEYWORD1>lrange</KEYWORD1>
-      <KEYWORD1>lreplace</KEYWORD1>
-      <KEYWORD1>lsearch</KEYWORD1>
-      <KEYWORD1>lsort</KEYWORD1>
-      <KEYWORD1>split</KEYWORD1>
-      <KEYWORD1>scan</KEYWORD1>
-      <KEYWORD1>string</KEYWORD1>
-      <KEYWORD1>regexp</KEYWORD1>
-      <KEYWORD1>regsub</KEYWORD1>
-      <KEYWORD1>if</KEYWORD1>
-      <KEYWORD1>else</KEYWORD1>
-      <KEYWORD1>elseif</KEYWORD1>
-      <KEYWORD1>switch</KEYWORD1>
-      <KEYWORD1>for</KEYWORD1>
-      <KEYWORD1>foreach</KEYWORD1>
-      <KEYWORD1>while</KEYWORD1>
-      <KEYWORD1>break</KEYWORD1>
-      <KEYWORD1>continue</KEYWORD1>
-      <KEYWORD1>proc</KEYWORD1>
-      <KEYWORD1>return</KEYWORD1>
-      <KEYWORD1>source</KEYWORD1>
-      <KEYWORD1>unknown</KEYWORD1>
-      <KEYWORD1>uplevel</KEYWORD1>
-      <KEYWORD1>cd</KEYWORD1>
-      <KEYWORD1>close</KEYWORD1>
-      <KEYWORD1>eof</KEYWORD1>
-      <KEYWORD1>file</KEYWORD1>
-      <KEYWORD1>flush</KEYWORD1>
-      <KEYWORD1>gets</KEYWORD1>
-      <KEYWORD1>glob</KEYWORD1>
-      <KEYWORD1>open</KEYWORD1>
-      <KEYWORD1>read</KEYWORD1>
-      <KEYWORD1>puts</KEYWORD1>
-      <KEYWORD1>pwd</KEYWORD1>
-      <KEYWORD1>seek</KEYWORD1>
-      <KEYWORD1>tell</KEYWORD1>
-      <KEYWORD1>catch</KEYWORD1>
-      <KEYWORD1>error</KEYWORD1>
-      <KEYWORD1>exec</KEYWORD1>
-      <KEYWORD1>pid</KEYWORD1>
-      <KEYWORD1>after</KEYWORD1>
-      <KEYWORD1>time</KEYWORD1>
-      <KEYWORD1>exit</KEYWORD1>
-      <KEYWORD1>history</KEYWORD1>
-      <KEYWORD1>rename</KEYWORD1>
-      <KEYWORD1>info</KEYWORD1>
-      <!-- expr keywords-->
-      <KEYWORD1>ceil</KEYWORD1>
-      <KEYWORD1>floor</KEYWORD1>
-      <KEYWORD1>round</KEYWORD1>
-      <KEYWORD1>incr</KEYWORD1>
-      <KEYWORD1>abs</KEYWORD1>
-      <KEYWORD1>acos</KEYWORD1>
-      <KEYWORD1>cos</KEYWORD1>
-      <KEYWORD1>cosh</KEYWORD1>
-      <KEYWORD1>asin</KEYWORD1>
-      <KEYWORD1>sin</KEYWORD1>
-      <KEYWORD1>sinh</KEYWORD1>
-      <KEYWORD1>atan</KEYWORD1>
-      <KEYWORD1>atan2</KEYWORD1>
-      <KEYWORD1>tan</KEYWORD1>
-      <KEYWORD1>tanh</KEYWORD1>
-      <KEYWORD1>log</KEYWORD1>
-      <KEYWORD1>log10</KEYWORD1>
-      <KEYWORD1>fmod</KEYWORD1>
-      <KEYWORD1>pow</KEYWORD1>
-      <KEYWORD1>hypot</KEYWORD1>
-      <KEYWORD1>sqrt</KEYWORD1>
-      <KEYWORD1>double</KEYWORD1>
-      <KEYWORD1>int</KEYWORD1>
-      <!-- New Tcl keywords up to tcl 8.4.14 -->
-      <KEYWORD1>bgerror</KEYWORD1>
-      <KEYWORD1>binary</KEYWORD1>
-      <KEYWORD1>clock</KEYWORD1>
-      <KEYWORD1>dde</KEYWORD1>
-      <KEYWORD1>encoding</KEYWORD1>
-      <KEYWORD1>fblocked</KEYWORD1>
-      <KEYWORD1>fconfigure</KEYWORD1>
-      <KEYWORD1>fcopy</KEYWORD1>
-      <KEYWORD1>fileevent</KEYWORD1>
-      <KEYWORD1>filename</KEYWORD1>
-      <KEYWORD1>http</KEYWORD1>
-      <KEYWORD1>interp</KEYWORD1>
-      <KEYWORD1>load</KEYWORD1>
-      <KEYWORD1>lset</KEYWORD1>
-      <KEYWORD1>memory</KEYWORD1>
-      <KEYWORD1>msgcat</KEYWORD1>
-      <KEYWORD1>namespace</KEYWORD1>
-      <KEYWORD1>package</KEYWORD1>
-      <KEYWORD1>pkg::create</KEYWORD1>
-      <KEYWORD1>pkg_mkIndex</KEYWORD1>
-      <KEYWORD1>registry</KEYWORD1>
-      <KEYWORD1>resource</KEYWORD1>
-      <KEYWORD1>socket</KEYWORD1>
-      <KEYWORD1>subst</KEYWORD1>
-      <KEYWORD1>update</KEYWORD1>
-      <KEYWORD1>variable</KEYWORD1>
-      <KEYWORD1>vwait</KEYWORD1>
-      <!-- Standard library of Tcl interpretor procedures -->
-      <KEYWORD1>auto_execok</KEYWORD1>
-      <KEYWORD1>auto_import</KEYWORD1>
-      <KEYWORD1>auto_load</KEYWORD1>
-      <KEYWORD1>auto_mkindex</KEYWORD1>
-      <KEYWORD1>auto_mkindex_old</KEYWORD1>
-      <KEYWORD1>auto_qualify</KEYWORD1>
-      <KEYWORD1>auto_reset</KEYWORD1>
-      <KEYWORD1>parray</KEYWORD1>
-      <KEYWORD1>tcl_endOfWord</KEYWORD1>
-      <KEYWORD1>tcl_findLibrary</KEYWORD1>
-      <KEYWORD1>tcl_startOfNextWord</KEYWORD1>
-      <KEYWORD1>tcl_startOfPreviousWord</KEYWORD1>
-      <KEYWORD1>tcl_wordBreakAfter</KEYWORD1>
-      <KEYWORD1>tcl_wordBreakBefore</KEYWORD1>
-
-      <!-- Tk keywords -->
-      <KEYWORD2>bind</KEYWORD2>
-      <KEYWORD2>button</KEYWORD2>
-      <KEYWORD2>canvas</KEYWORD2>
-      <KEYWORD2>checkbutton</KEYWORD2>
-      <KEYWORD2>destroy</KEYWORD2>
-      <KEYWORD2>entry</KEYWORD2>
-      <KEYWORD2>focus</KEYWORD2>
-      <KEYWORD2>frame</KEYWORD2>
-      <KEYWORD2>grab</KEYWORD2>
-      <KEYWORD2>image</KEYWORD2>
-      <KEYWORD2>label</KEYWORD2>
-      <KEYWORD2>listbox</KEYWORD2>
-      <KEYWORD2>lower</KEYWORD2>
-      <KEYWORD2>menu</KEYWORD2>
-      <KEYWORD2>menubutton</KEYWORD2>
-      <KEYWORD2>message</KEYWORD2>
-      <KEYWORD2>option</KEYWORD2>
-      <KEYWORD2>pack</KEYWORD2>
-      <KEYWORD2>placer</KEYWORD2>
-      <KEYWORD2>radiobutton</KEYWORD2>
-      <KEYWORD2>raise</KEYWORD2>
-      <KEYWORD2>scale</KEYWORD2>
-      <KEYWORD2>scrollbar</KEYWORD2>
-      <KEYWORD2>selection</KEYWORD2>
-      <KEYWORD2>send</KEYWORD2>
-      <KEYWORD2>text</KEYWORD2>
-      <KEYWORD2>tk</KEYWORD2>
-      <KEYWORD2>tkerror</KEYWORD2>
-      <KEYWORD2>tkwait</KEYWORD2>
-      <KEYWORD2>toplevel</KEYWORD2>
-      <KEYWORD2>update</KEYWORD2>
-      <KEYWORD2>winfo</KEYWORD2>
-      <KEYWORD2>wm</KEYWORD2>
-
-      <!-- Expect keywords. Using KEYWORD2 as send is already one -->
-      <!-- KEYWORD2 close -->
-      <KEYWORD2>debug</KEYWORD2>
-      <KEYWORD2>disconnect</KEYWORD2>
-      <!-- KEYWORD2 exit -->
-      <KEYWORD2>exp_continue</KEYWORD2>
-      <KEYWORD2>exp_internal</KEYWORD2>
-      <KEYWORD2>exp_open</KEYWORD2>
-      <KEYWORD2>exp_pid</KEYWORD2>
-      <KEYWORD2>exp_version</KEYWORD2>
-      <KEYWORD2>expect</KEYWORD2>
-      <KEYWORD2>expect_after</KEYWORD2>
-      <KEYWORD2>expect_background</KEYWORD2>
-      <KEYWORD2>expect_before</KEYWORD2>
-      <KEYWORD2>expect_tty</KEYWORD2>
-      <KEYWORD2>expect_user</KEYWORD2>
-      <KEYWORD2>fork</KEYWORD2>
-      <KEYWORD2>inter_return</KEYWORD2>
-      <KEYWORD2>interact</KEYWORD2>
-      <KEYWORD2>interpreter</KEYWORD2>
-      <KEYWORD2>log_file</KEYWORD2>
-      <KEYWORD2>log_user</KEYWORD2>
-      <KEYWORD2>match_max</KEYWORD2>
-      <KEYWORD2>overlay</KEYWORD2>
-      <KEYWORD2>parity</KEYWORD2>
-      <KEYWORD2>promptl</KEYWORD2>
-      <KEYWORD2>prompt2</KEYWORD2>
-      <KEYWORD2>remove_nulls</KEYWORD2>
-      <!-- KEYWORD2 send -->
-      <KEYWORD2>send_error </KEYWORD2>
-      <KEYWORD2>send_log</KEYWORD2>
-      <KEYWORD2>send_tty</KEYWORD2>
-      <KEYWORD2>send_user</KEYWORD2>
-      <KEYWORD2>sleep</KEYWORD2>
-      <KEYWORD2>spawn</KEYWORD2>
-      <KEYWORD2>strace</KEYWORD2>
-      <KEYWORD2>stty</KEYWORD2>
-      <KEYWORD2>system</KEYWORD2>
-      <KEYWORD2>timestamp</KEYWORD2>
-      <KEYWORD2>trap</KEYWORD2>
-      <KEYWORD2>wait</KEYWORD2>
-      <!-- Arguments to expect commands-->
-      <KEYWORD3>full_buffer</KEYWORD3>
-      <KEYWORD3>timeout</KEYWORD3>
-      <!-- KEYWORD3 eof-->
-
-      <!-- Global variables-->
-      <KEYWORD3>argv0</KEYWORD3>
-      <KEYWORD3>argv</KEYWORD3>
-      <KEYWORD3>argc</KEYWORD3>
-      <KEYWORD3>tk_version</KEYWORD3>
-      <KEYWORD3>tk_library</KEYWORD3>
-      <KEYWORD3>tk_strictMotif</KEYWORD3>
-      <!-- New global variables up to tcl 8.4.14 -->
-      <KEYWORD3>env</KEYWORD3>
-      <KEYWORD3>errorCode</KEYWORD3>
-      <KEYWORD3>errorInfo</KEYWORD3>
-      <KEYWORD3>geometry</KEYWORD3>
-      <KEYWORD3>tcl_library</KEYWORD3>
-      <KEYWORD3>tcl_patchLevel</KEYWORD3>
-      <KEYWORD3>tcl_pkgPath</KEYWORD3>
-      <KEYWORD3>tcl_platform</KEYWORD3>
-      <KEYWORD3>tcl_precision</KEYWORD3>
-      <KEYWORD3>tcl_rcFileName</KEYWORD3>
-      <KEYWORD3>tcl_rcRsrcName</KEYWORD3>
-      <KEYWORD3>tcl_traceCompile</KEYWORD3>
-      <KEYWORD3>tcl_traceExec</KEYWORD3>
-      <KEYWORD3>tcl_wordchars</KEYWORD3>
-      <KEYWORD3>tcl_nonwordchars</KEYWORD3>
-      <KEYWORD3>tcl_version</KEYWORD3>
-      <KEYWORD3>tcl_interactive</KEYWORD3>
-
-      <!-- Common arguments to tcl and Tk keywords -->
-      <KEYWORD3>exact</KEYWORD3>
-      <KEYWORD3>all</KEYWORD3>
-      <KEYWORD3>indices</KEYWORD3>
-      <KEYWORD3>nocase</KEYWORD3>
-      <KEYWORD3>nocomplain</KEYWORD3>
-      <KEYWORD3>nonewline</KEYWORD3>
-      <KEYWORD3>code</KEYWORD3>
-      <KEYWORD3>errorinfo</KEYWORD3>
-      <KEYWORD3>errorcode</KEYWORD3>
-      <KEYWORD3>atime</KEYWORD3>
-      <KEYWORD3>anymore</KEYWORD3>
-      <KEYWORD3>args</KEYWORD3>
-      <KEYWORD3>body</KEYWORD3>
-      <KEYWORD3>compare</KEYWORD3>
-      <KEYWORD3>cmdcount</KEYWORD3>
-      <KEYWORD3>commands</KEYWORD3>
-      <KEYWORD3>ctime</KEYWORD3>
-      <KEYWORD3>current</KEYWORD3>
-      <KEYWORD3>default</KEYWORD3>
-      <KEYWORD3>dev</KEYWORD3>
-      <KEYWORD3>dirname</KEYWORD3>
-      <KEYWORD3>donesearch</KEYWORD3>
-      <KEYWORD3>errorinfo</KEYWORD3>
-      <KEYWORD3>executable</KEYWORD3>
-      <KEYWORD3>extension</KEYWORD3>
-      <KEYWORD3>first</KEYWORD3>
-      <KEYWORD3>globals</KEYWORD3>
-      <KEYWORD3>gid</KEYWORD3>
-      <KEYWORD3>index</KEYWORD3>
-      <KEYWORD3>ino</KEYWORD3>
-      <KEYWORD3>isdirectory</KEYWORD3>
-      <KEYWORD3>isfile</KEYWORD3>
-      <KEYWORD3>keep</KEYWORD3>
-      <KEYWORD3>last</KEYWORD3>
-      <KEYWORD3>level</KEYWORD3>
-      <KEYWORD3>length</KEYWORD3>
-      <KEYWORD3>library</KEYWORD3>
-      <KEYWORD3>locals</KEYWORD3>
-      <KEYWORD3>lstat</KEYWORD3>
-      <KEYWORD3>match</KEYWORD3>
-      <KEYWORD3>mode</KEYWORD3>
-      <KEYWORD3>mtime</KEYWORD3>
-      <KEYWORD3>names</KEYWORD3>
-      <KEYWORD3>nextelement</KEYWORD3>
-      <KEYWORD3>nextid</KEYWORD3>
-      <KEYWORD3>nlink</KEYWORD3>
-      <KEYWORD3>none</KEYWORD3>
-      <KEYWORD3>procs</KEYWORD3>
-      <KEYWORD3>owned</KEYWORD3>
-      <KEYWORD3>range</KEYWORD3>
-      <KEYWORD3>readable</KEYWORD3>
-      <KEYWORD3>readlink</KEYWORD3>
-      <KEYWORD3>redo</KEYWORD3>
-      <KEYWORD3>release</KEYWORD3>
-      <KEYWORD3>rootname</KEYWORD3>
-      <KEYWORD3>script</KEYWORD3>
-      <KEYWORD3>show</KEYWORD3>
-      <KEYWORD3>size</KEYWORD3>
-      <KEYWORD3>startsearch</KEYWORD3>
-      <KEYWORD3>stat</KEYWORD3>
-      <KEYWORD3>status</KEYWORD3>
-      <KEYWORD3>substitute</KEYWORD3>
-      <KEYWORD3>tail</KEYWORD3>
-      <KEYWORD3>tclversion</KEYWORD3>
-      <KEYWORD3>tolower</KEYWORD3>
-      <KEYWORD3>toupper</KEYWORD3>
-      <KEYWORD3>trim</KEYWORD3>
-      <KEYWORD3>trimleft</KEYWORD3>
-      <KEYWORD3>trimright</KEYWORD3>
-      <KEYWORD3>type</KEYWORD3>
-      <KEYWORD3>uid</KEYWORD3>
-      <KEYWORD3>variable</KEYWORD3>
-      <KEYWORD3>vars</KEYWORD3>
-      <KEYWORD3>vdelete</KEYWORD3>
-      <KEYWORD3>vinfo</KEYWORD3>
-      <KEYWORD3>visibility</KEYWORD3>
-      <KEYWORD3>window</KEYWORD3>
-      <KEYWORD3>writable</KEYWORD3>
-      <KEYWORD3>accelerator</KEYWORD3>
-      <KEYWORD3>activeforeground</KEYWORD3>
-      <KEYWORD3>activebackground</KEYWORD3>
-      <KEYWORD3>anchor</KEYWORD3>
-      <KEYWORD3>aspect</KEYWORD3>
-      <KEYWORD3>background</KEYWORD3>
-      <KEYWORD3>before</KEYWORD3>
-      <KEYWORD3>bg</KEYWORD3>
-      <KEYWORD3>borderwidth</KEYWORD3>
-      <KEYWORD3>bd</KEYWORD3>
-      <KEYWORD3>bitmap</KEYWORD3>
-      <KEYWORD3>command</KEYWORD3>
-      <KEYWORD3>cursor</KEYWORD3>
-      <KEYWORD3>default</KEYWORD3>
-      <KEYWORD3>expand</KEYWORD3>
-      <KEYWORD3>family</KEYWORD3>
-      <KEYWORD3>fg</KEYWORD3>
-      <KEYWORD3>fill</KEYWORD3>
-      <KEYWORD3>font</KEYWORD3>
-      <KEYWORD3>force</KEYWORD3>
-      <KEYWORD3>foreground</KEYWORD3>
-      <KEYWORD3>from</KEYWORD3>
-      <KEYWORD3>height</KEYWORD3>
-      <KEYWORD3>icon</KEYWORD3>
-      <KEYWORD3>question</KEYWORD3>
-      <KEYWORD3>warning</KEYWORD3>
-      <KEYWORD3>in</KEYWORD3>
-      <KEYWORD3>ipadx</KEYWORD3>
-      <KEYWORD3>ipady</KEYWORD3>
-      <KEYWORD3>justify</KEYWORD3>
-      <KEYWORD3>left</KEYWORD3>
-      <KEYWORD3>center</KEYWORD3>
-      <KEYWORD3>right</KEYWORD3>
-      <KEYWORD3>length</KEYWORD3>
-      <KEYWORD3>padx</KEYWORD3>
-      <KEYWORD3>pady</KEYWORD3>
-      <KEYWORD3>offvalue</KEYWORD3>
-      <KEYWORD3>onvalue</KEYWORD3>
-      <KEYWORD3>orient</KEYWORD3>
-      <KEYWORD3>horizontal</KEYWORD3>
-      <KEYWORD3>vertical</KEYWORD3>
-      <KEYWORD3>outline</KEYWORD3>
-      <KEYWORD3>oversrike</KEYWORD3>
-      <KEYWORD3>relief</KEYWORD3>
-      <KEYWORD3>raised</KEYWORD3>
-      <KEYWORD3>sunken</KEYWORD3>
-      <KEYWORD3>flat</KEYWORD3>
-      <KEYWORD3>groove</KEYWORD3>
-      <KEYWORD3>ridge</KEYWORD3>
-      <KEYWORD3>solid</KEYWORD3>
-      <KEYWORD3>screen</KEYWORD3>
-      <KEYWORD3>selectbackground</KEYWORD3>
-      <KEYWORD3>selectforeground</KEYWORD3>
-      <KEYWORD3>setgrid</KEYWORD3>
-      <KEYWORD3>side</KEYWORD3>
-      <KEYWORD3>size</KEYWORD3>
-      <KEYWORD3>slant</KEYWORD3>
-      <KEYWORD3>left</KEYWORD3>
-      <KEYWORD3>right</KEYWORD3>
-      <KEYWORD3>top</KEYWORD3>
-      <KEYWORD3>bottom</KEYWORD3>
-      <KEYWORD3>spacing1</KEYWORD3>
-      <KEYWORD3>spacing2</KEYWORD3>
-      <KEYWORD3>spacing3</KEYWORD3>
-      <KEYWORD3>state</KEYWORD3>
-      <KEYWORD3>stipple</KEYWORD3>
-      <KEYWORD3>takefocus</KEYWORD3>
-      <KEYWORD3>tearoff</KEYWORD3>
-      <KEYWORD3>textvariable</KEYWORD3>
-      <KEYWORD3>title</KEYWORD3>
-      <KEYWORD3>to</KEYWORD3>
-      <KEYWORD3>type</KEYWORD3>
-      <KEYWORD3>abortretryignore</KEYWORD3>
-      <KEYWORD3>ok</KEYWORD3>
-      <KEYWORD3>okcancel</KEYWORD3>
-      <KEYWORD3>retrycancel</KEYWORD3>
-      <KEYWORD3>yesno</KEYWORD3>
-      <KEYWORD3>yesnocancel</KEYWORD3>
-      <KEYWORD3>underline</KEYWORD3>
-      <KEYWORD3>value</KEYWORD3>
-      <KEYWORD3>variable</KEYWORD3>
-      <KEYWORD3>weight</KEYWORD3>
-      <KEYWORD3>width</KEYWORD3>
-      <KEYWORD3>xscrollcommand</KEYWORD3>
-      <KEYWORD3>yscrollcommand</KEYWORD3>
-      <KEYWORD3>active</KEYWORD3>
-      <KEYWORD3>add</KEYWORD3>
-      <KEYWORD3>arc</KEYWORD3>
-      <KEYWORD3>aspect</KEYWORD3>
-      <KEYWORD3>bitmap</KEYWORD3>
-      <KEYWORD3>cascade</KEYWORD3>
-      <KEYWORD3>cget</KEYWORD3>
-      <KEYWORD3>children</KEYWORD3>
-      <KEYWORD3>class</KEYWORD3>
-      <KEYWORD3>clear</KEYWORD3>
-      <KEYWORD3>client</KEYWORD3>
-      <KEYWORD3>create</KEYWORD3>
-      <KEYWORD3>colormodel</KEYWORD3>
-      <KEYWORD3>command</KEYWORD3>
-      <KEYWORD3>configure</KEYWORD3>
-      <KEYWORD3>deiconify</KEYWORD3>
-      <KEYWORD3>delete</KEYWORD3>
-      <KEYWORD3>disabled</KEYWORD3>
-      <KEYWORD3>exists</KEYWORD3>
-      <KEYWORD3>focusmodel</KEYWORD3>
-      <KEYWORD3>flash</KEYWORD3>
-      <KEYWORD3>forget</KEYWORD3>
-      <KEYWORD3>geometry</KEYWORD3>
-      <KEYWORD3>get</KEYWORD3>
-      <KEYWORD3>group</KEYWORD3>
-      <KEYWORD3>handle</KEYWORD3>
-      <KEYWORD3>iconbitmap</KEYWORD3>
-      <KEYWORD3>iconify</KEYWORD3>
-      <KEYWORD3>iconmask</KEYWORD3>
-      <KEYWORD3>iconname</KEYWORD3>
-      <KEYWORD3>iconposition</KEYWORD3>
-      <KEYWORD3>iconwindow</KEYWORD3>
-      <KEYWORD3>idletasks</KEYWORD3>
-      <KEYWORD3>insert</KEYWORD3>
-      <KEYWORD3>interps</KEYWORD3>
-      <KEYWORD3>itemconfigure</KEYWORD3>
-      <KEYWORD3>invoke</KEYWORD3>
-      <KEYWORD3>line</KEYWORD3>
-      <KEYWORD3>mark</KEYWORD3>
-      <KEYWORD3>maxsize</KEYWORD3>
-      <KEYWORD3>minsize</KEYWORD3>
-      <KEYWORD3>move</KEYWORD3>
-      <KEYWORD3>name</KEYWORD3>
-      <KEYWORD3>normal</KEYWORD3>
-      <KEYWORD3>overrideredirect</KEYWORD3>
-      <KEYWORD3>oval</KEYWORD3>
-      <KEYWORD3>own</KEYWORD3>
-      <KEYWORD3>photo</KEYWORD3>
-      <KEYWORD3>polygon</KEYWORD3>
-      <KEYWORD3>positionfrom</KEYWORD3>
-      <KEYWORD3>propagate</KEYWORD3>
-      <KEYWORD3>protocol</KEYWORD3>
-      <KEYWORD3>ranges</KEYWORD3>
-      <KEYWORD3>rectangle</KEYWORD3>
-      <KEYWORD3>remove</KEYWORD3>
-      <KEYWORD3>resizable</KEYWORD3>
-      <KEYWORD3>separator</KEYWORD3>
-      <KEYWORD3>slaves</KEYWORD3>
-      <KEYWORD3>sizefrom</KEYWORD3>
-      <KEYWORD3>state</KEYWORD3>
-      <KEYWORD3>tag</KEYWORD3>
-      <KEYWORD3>title</KEYWORD3>
-      <KEYWORD3>transient</KEYWORD3>
-      <KEYWORD3>window</KEYWORD3>
-      <KEYWORD3>withdraw</KEYWORD3>
-      <KEYWORD3>xview</KEYWORD3>
-      <KEYWORD3>yview</KEYWORD3>
-      <KEYWORD3>Activate</KEYWORD3>
-      <KEYWORD3>Alt</KEYWORD3>
-      <KEYWORD3>Any</KEYWORD3>
-      <KEYWORD3>B1</KEYWORD3>
-      <KEYWORD3>B2</KEYWORD3>
-      <KEYWORD3>B3</KEYWORD3>
-      <KEYWORD3>Button1</KEYWORD3>
-      <KEYWORD3>Button2</KEYWORD3>
-      <KEYWORD3>Button3</KEYWORD3>
-      <KEYWORD3>ButtonPress</KEYWORD3>
-      <KEYWORD3>ButtonRelease</KEYWORD3>
-      <KEYWORD3>Double</KEYWORD3>
-      <KEYWORD3>Circulate</KEYWORD3>
-      <KEYWORD3>Colormap</KEYWORD3>
-      <KEYWORD3>Configure</KEYWORD3>
-      <KEYWORD3>Control</KEYWORD3>
-      <KEYWORD3>Deactivate</KEYWORD3>
-      <KEYWORD3>Escape</KEYWORD3>
-      <KEYWORD3>Expose</KEYWORD3>
-      <KEYWORD3>FocusIn</KEYWORD3>
-      <KEYWORD3>FocusOut</KEYWORD3>
-      <KEYWORD3>Gravity</KEYWORD3>
-      <KEYWORD3>Key</KEYWORD3>
-      <KEYWORD3>KeyPress</KEYWORD3>
-      <KEYWORD3>KeyRelease</KEYWORD3>
-      <KEYWORD3>Lock</KEYWORD3>
-      <KEYWORD3>Meta</KEYWORD3>
-      <KEYWORD3>Property</KEYWORD3>
-      <KEYWORD3>Reparent</KEYWORD3>
-      <KEYWORD3>Shift</KEYWORD3>
-      <KEYWORD3>Unmap</KEYWORD3>
-      <KEYWORD3>Visibility</KEYWORD3>
-      <KEYWORD3>Button</KEYWORD3>
-      <KEYWORD3>ButtonPress</KEYWORD3>
-      <KEYWORD3>ButtonRelease</KEYWORD3>
-      <KEYWORD3>Destroy</KEYWORD3>
-      <KEYWORD3>Escape</KEYWORD3>
-      <KEYWORD3>Enter</KEYWORD3>
-      <KEYWORD3>Leave</KEYWORD3>
-      <KEYWORD3>Motion</KEYWORD3>
-      <KEYWORD3>MenuSelect</KEYWORD3>
-      <KEYWORD3>Triple</KEYWORD3>
-      <KEYWORD3>all</KEYWORD3>
-    </KEYWORDS>
-  </RULES>
-
-  <RULES SET="TCL_COMMENT" DEFAULT="OPERATOR">
-    <!-- Allows catching blocks starting with a comment.
-        or comments following a ; -->
-    <SEQ_REGEXP TYPE="COMMENT1" HASH_CHAR="#" DELEGATE="MAIN">#.*</SEQ_REGEXP>
-  </RULES>
-
-  <RULES SET="TCL_STRING" DEFAULT="LITERAL1" ESCAPE="\">
-    <PROPS>
-      <PROPERTY NAME="indentOpenBrackets" VALUE="" />
-      <PROPERTY NAME="indentCloseBrackets" VALUE="" />
-    </PROPS>
-
-    <!-- Continuation line. Processed before anything else by Tcl.-->
-    <EOL_SPAN_REGEXP TYPE="OPERATOR" HASH_CHAR="\">\\$</EOL_SPAN_REGEXP>
-
-    <!-- Avoid colouring variables substituted inside strings -->
-    <SPAN_REGEXP TYPE="NULL" HASH_CHAR="$" DELEGATE="MAIN">
-      <BEGIN>\$(\w|::)+\(</BEGIN>
-      <END>)</END>
-    </SPAN_REGEXP>
-    <SPAN_REGEXP TYPE="NULL" HASH_CHAR="$" DELEGATE="MAIN">
-      <BEGIN>\$\{</BEGIN>
-      <END>}</END>
-    </SPAN_REGEXP>
-    <SEQ_REGEXP TYPE="NULL" HASH_CHAR="$">\$(\w|::)+</SEQ_REGEXP>
-
-    <!-- Sub-commands to be substituted -->
-    <SPAN TYPE="OPERATOR" NO_LINE_BREAK="FALSE" DELEGATE="MAIN">
-      <BEGIN>[</BEGIN>
-      <END>]</END>
-    </SPAN>
-
-    <!-- Escaped characters -->
-    <SEQ TYPE="KEYWORD3">\a</SEQ>
-    <SEQ TYPE="KEYWORD3">\b</SEQ>
-    <SEQ TYPE="KEYWORD3">\f</SEQ>
-    <SEQ TYPE="KEYWORD3">\n</SEQ>
-    <SEQ TYPE="KEYWORD3">\r</SEQ>
-    <SEQ TYPE="KEYWORD3">\t</SEQ>
-    <SEQ TYPE="KEYWORD3">\v</SEQ>
-  </RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/tex.xml b/qpython/src/main/assets/syntax/tex.xml
deleted file mode 100644
index 712e93dd..00000000
--- a/qpython/src/main/assets/syntax/tex.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="lineComment" VALUE="%" />
-		<PROPERTY NAME="wordBreakChars" VALUE="{}" />
-	</PROPS>
-	<RULES IGNORE_CASE="FALSE">
-		<!-- $$...$$ -->
-		<SPAN TYPE="MARKUP" DELEGATE="MATH">
-			<BEGIN>$$</BEGIN>
-			<END>$$</END>
-		</SPAN>
-
-		<!-- $...$ -->
-		<SPAN TYPE="MARKUP" DELEGATE="MATH">
-			<BEGIN>$</BEGIN>
-			<END>$</END>
-		</SPAN>
-
-		<!-- \[...\] (LaTeX math mode) -->
-		<SPAN TYPE="MARKUP" DELEGATE="MATH">
-			<BEGIN>\[</BEGIN>
-			<END>\]</END>
-		</SPAN>
-
-		<!-- some commands must be handled specially -->
-		<SEQ TYPE="KEYWORD1">\$</SEQ>
-		<SEQ TYPE="KEYWORD1">\\</SEQ>
-		<SEQ TYPE="KEYWORD1">\%</SEQ>
-
-		<!-- \iffalse ... \fi - a block comment -->
-                <SPAN TYPE="COMMENT1">
-                        <BEGIN>\iffalse</BEGIN>
-                        <END>\fi</END>
-                </SPAN>
-
-		<!-- \begin{verbatim} ... \end{verbatim} -->
-                <SPAN TYPE="KEYWORD1" DELEGATE="VERBATIM">
-                        <BEGIN>\begin{verbatim}</BEGIN>
-                        <END>\end{verbatim}</END>
-                </SPAN>
-
-		<!-- \verb|sometext| -->
-		<SPAN TYPE="KEYWORD1" DELEGATE="VERBATIM"
-			NO_LINE_BREAK="TRUE">
-                        <BEGIN>\verb|</BEGIN>
-                        <END>|</END>
-                </SPAN>
-		<!-- \... commands -->
-		<MARK_FOLLOWING TYPE="KEYWORD1">\</MARK_FOLLOWING>
-
-		<!-- comments -->
-		<EOL_SPAN TYPE="COMMENT1">%</EOL_SPAN>
-
-		<!-- word separators -->
-		<SEQ TYPE="OPERATOR">{</SEQ>
-		<SEQ TYPE="OPERATOR">}</SEQ>
-		<SEQ TYPE="OPERATOR">[</SEQ>
-		<SEQ TYPE="OPERATOR">]</SEQ>
-	</RULES>
-
-	<RULES SET="MATH" DEFAULT="MARKUP">
-		<!-- some commands must be handled specially -->
-		<SEQ TYPE="KEYWORD3">\$</SEQ>
-		<SEQ TYPE="KEYWORD3">\\</SEQ>
-		<SEQ TYPE="KEYWORD3">\%</SEQ>
-
-		<!-- \... commands -->
-		<MARK_FOLLOWING TYPE="KEYWORD3">\</MARK_FOLLOWING>
-
-		<!-- word separators -->
-		<SEQ TYPE="KEYWORD2">)</SEQ>
-		<SEQ TYPE="KEYWORD2">(</SEQ>
-		<SEQ TYPE="KEYWORD2">{</SEQ>
-		<SEQ TYPE="KEYWORD2">}</SEQ>
-		<SEQ TYPE="KEYWORD2">[</SEQ>
-		<SEQ TYPE="KEYWORD2">]</SEQ>
-		<SEQ TYPE="KEYWORD2">=</SEQ>
-		<SEQ TYPE="KEYWORD2">!</SEQ>
-		<SEQ TYPE="KEYWORD2">+</SEQ>
-		<SEQ TYPE="KEYWORD2">-</SEQ>
-		<SEQ TYPE="KEYWORD2">/</SEQ>
-		<SEQ TYPE="KEYWORD2">*</SEQ>
-		<SEQ TYPE="KEYWORD2">&gt;</SEQ>
-		<SEQ TYPE="KEYWORD2">&lt;</SEQ>
-		<SEQ TYPE="KEYWORD2">&amp;</SEQ>
-		<SEQ TYPE="KEYWORD2">|</SEQ>
-		<SEQ TYPE="KEYWORD2">^</SEQ>
-		<SEQ TYPE="KEYWORD2">~</SEQ>
-		<SEQ TYPE="KEYWORD2">.</SEQ>
-		<SEQ TYPE="KEYWORD2">,</SEQ>
-		<SEQ TYPE="KEYWORD2">;</SEQ>
-		<SEQ TYPE="KEYWORD2">?</SEQ>
-		<SEQ TYPE="KEYWORD2">:</SEQ>
-		<SEQ TYPE="KEYWORD2">'</SEQ>
-		<SEQ TYPE="KEYWORD2">"</SEQ>
-		<SEQ TYPE="KEYWORD2">`</SEQ>
-
-		<!-- comments -->
-		<EOL_SPAN TYPE="COMMENT1">%</EOL_SPAN>
-	</RULES>
-
-	<RULES SET="VERBATIM" DEFAULT="NULL" />
-</MODE>
diff --git a/qpython/src/main/assets/syntax/texinfo.xml b/qpython/src/main/assets/syntax/texinfo.xml
deleted file mode 100644
index 277afe12..00000000
--- a/qpython/src/main/assets/syntax/texinfo.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="lineComment" VALUE="@c" />
-	</PROPS>
-	<RULES>
-		<!-- comments -->
-		<EOL_SPAN TYPE="COMMENT1">@c </EOL_SPAN>
-		<EOL_SPAN TYPE="COMMENT1">@comment </EOL_SPAN>
-
-		<!-- @... commands -->
-		<MARK_FOLLOWING TYPE="KEYWORD1">@</MARK_FOLLOWING>
-
-		<SEQ TYPE="OPERATOR">{</SEQ>
-		<SEQ TYPE="OPERATOR">}</SEQ>
-	</RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/text.xml b/qpython/src/main/assets/syntax/text.xml
deleted file mode 100644
index 6e1c61be..00000000
--- a/qpython/src/main/assets/syntax/text.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- The most complicated edit mode ever, for plain text mode -->
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="contextInsensitive" VALUE="true" />
-	</PROPS>
-	<RULES>
-		<TERMINATE AT_CHAR="0" />
-	</RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/tld.xml b/qpython/src/main/assets/syntax/tld.xml
deleted file mode 100644
index 828b13b7..00000000
--- a/qpython/src/main/assets/syntax/tld.xml
+++ /dev/null
@@ -1,257 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-<!-- mode for tag library description (tld) files -->
-<MODE>
-    <PROPS>
-        <PROPERTY NAME="commentStart" VALUE="&lt;!--" />
-        <PROPERTY NAME="commentEnd" VALUE="--&gt;" />
-    </PROPS>
-	<!-- {{{ MAIN -->
-    <RULES>
-		<!-- SGML comment -->
-        <SPAN TYPE="COMMENT1">
-            <BEGIN>&lt;!--</BEGIN>
-            <END>--&gt;</END>
-        </SPAN>
-
-		<!-- DTD Entity declarations -->
-        <SPAN TYPE="KEYWORD2" DELEGATE="ENTITY-TAGS">
-            <BEGIN>&lt;!ENTITY</BEGIN>
-            <END>&gt;</END>
-        </SPAN>
-
-		<!-- CDATA sections -->
-        <SPAN TYPE="KEYWORD2" DELEGATE="CDATA">
-            <BEGIN>&lt;![CDATA[</BEGIN>
-            <END>]]&gt;</END>
-        </SPAN>
-
-		<!-- DTD instructions -->
-        <SPAN TYPE="KEYWORD2" DELEGATE="DTD-TAGS">
-            <BEGIN>&lt;!</BEGIN>
-            <END>&gt;</END>
-        </SPAN>
-
-		<!-- PI directives -->
-        <SPAN TYPE="KEYWORD3">
-            <BEGIN>&lt;?</BEGIN>
-            <END>&gt;</END>
-        </SPAN>
-
-		<!-- markup tags -->
-        <SPAN TYPE="MARKUP" DELEGATE="TAGS">
-            <BEGIN>&lt;</BEGIN>
-            <END>&gt;</END>
-        </SPAN>
-
-		<!-- SGML entities -->
-        <SPAN TYPE="LITERAL2" NO_WORD_BREAK="TRUE">
-            <BEGIN>&amp;</BEGIN>
-            <END>;</END>
-        </SPAN>
-
-        <KEYWORDS>
-            <KEYWORD4>tagdependent</KEYWORD4>
-            <KEYWORD4>empty</KEYWORD4>
-            <KEYWORD4>scriptless</KEYWORD4>
-            <KEYWORD4>true</KEYWORD4>
-            <KEYWORD4>false</KEYWORD4>
-            <KEYWORD4>NESTED</KEYWORD4>
-            <KEYWORD4>AT_BEGIN</KEYWORD4>
-            <KEYWORD4>AT_END</KEYWORD4>
-        </KEYWORDS>
-
-    </RULES>
-	<!-- }}} -->
-	
-	<!-- {{{ TAGS -->
-    <RULES SET="TAGS" DEFAULT="MARKUP" NO_WORD_SEP="-_">
-		<!-- SGML comment -->
-        <SPAN TYPE="COMMENT1">
-            <BEGIN>&lt;!--</BEGIN>
-            <END>--&gt;</END>
-        </SPAN>
-
-        <SPAN TYPE="LITERAL1">
-            <BEGIN>"</BEGIN>
-            <END>"</END>
-        </SPAN>
-
-        <SPAN TYPE="LITERAL1">
-            <BEGIN>'</BEGIN>
-            <END>'</END>
-        </SPAN>
-
-        <SEQ TYPE="MARKUP" DELEGATE="STRING">"</SEQ>
-
-        <SEQ TYPE="MARKUP" DELEGATE="tld::MAIN">/></SEQ>
-        <MARK_PREVIOUS TYPE="LABEL">:</MARK_PREVIOUS>
-        <SEQ TYPE="OPERATOR">:</SEQ>
-        <KEYWORDS>
-            <KEYWORD1>taglib</KEYWORD1>
-            <KEYWORD1>tag</KEYWORD1>
-            <KEYWORD1>tag-file</KEYWORD1>
-            <KEYWORD1>function</KEYWORD1>
-            <KEYWORD1>tag-extension</KEYWORD1>
-            <KEYWORD1>validator</KEYWORD1>
-
-            <KEYWORD2>description</KEYWORD2>
-            <KEYWORD2>display-name</KEYWORD2>
-            <KEYWORD2>icon</KEYWORD2>
-            <KEYWORD2>tlib-version</KEYWORD2>
-            <KEYWORD2>short-name</KEYWORD2>
-            <KEYWORD2>uri</KEYWORD2>
-            <KEYWORD2>listener</KEYWORD2>
-            <KEYWORD2>validator-class</KEYWORD2>
-            <KEYWORD2>init-param</KEYWORD2>
-            <KEYWORD2>name</KEYWORD2>
-            <KEYWORD2>path</KEYWORD2>
-            <KEYWORD2>example</KEYWORD2>
-            <KEYWORD2>tag-extension</KEYWORD2>
-            <KEYWORD2>tag-class</KEYWORD2>
-            <KEYWORD2>tei-class</KEYWORD2>
-            <KEYWORD2>body-content</KEYWORD2>
-            <KEYWORD2>variable</KEYWORD2>
-            <KEYWORD2>attribute</KEYWORD2>
-            <KEYWORD2>dynamic-attributes</KEYWORD2>
-            <KEYWORD2>required</KEYWORD2>
-            <KEYWORD2>rtexprvalue</KEYWORD2>
-            <KEYWORD2>type</KEYWORD2>
-            <KEYWORD2>fragment</KEYWORD2>
-            <KEYWORD2>name-given</KEYWORD2>
-            <KEYWORD2>name-from-attribute</KEYWORD2>
-            <KEYWORD2>variable-class</KEYWORD2>
-            <KEYWORD2>declare</KEYWORD2>
-            <KEYWORD2>scope</KEYWORD2>
-
-
-        </KEYWORDS>
-    </RULES>
-	<!-- }}} -->
-	
-	<!-- {{{ DTD-TAGS -->
-    <RULES SET="DTD-TAGS" DEFAULT="KEYWORD2" IGNORE_CASE="FALSE">
-		<!-- SGML comment -->
-        <SPAN TYPE="COMMENT1">
-            <BEGIN>&lt;!--</BEGIN>
-            <END>--&gt;</END>
-        </SPAN>
-
-		<!-- SGML comment -->
-        <SPAN TYPE="COMMENT1">
-            <BEGIN>--</BEGIN>
-            <END>--</END>
-        </SPAN>
-
-		<!-- Parameter entities -->
-        <SPAN TYPE="LITERAL2" NO_WORD_BREAK="TRUE">
-            <BEGIN>%</BEGIN>
-            <END>;</END>
-        </SPAN>
-
-        <SPAN TYPE="LITERAL1">
-            <BEGIN>"</BEGIN>
-            <END>"</END>
-        </SPAN>
-
-        <SPAN TYPE="LITERAL1">
-            <BEGIN>'</BEGIN>
-            <END>'</END>
-        </SPAN>
-
-		<!-- This appears in some SGML documents -->
-        <SPAN TYPE="KEYWORD2" DELEGATE="MAIN">
-            <BEGIN>[</BEGIN>
-            <END>]</END>
-        </SPAN>
-
-        <SEQ TYPE="OPERATOR">(</SEQ>
-        <SEQ TYPE="OPERATOR">)</SEQ>
-        <SEQ TYPE="OPERATOR">|</SEQ>
-        <SEQ TYPE="OPERATOR">?</SEQ>
-        <SEQ TYPE="OPERATOR">*</SEQ>
-        <SEQ TYPE="OPERATOR">+</SEQ>
-        <SEQ TYPE="OPERATOR">,</SEQ>
-
-        <KEYWORDS>
-            <KEYWORD1>CDATA</KEYWORD1>
-            <KEYWORD1>EMPTY</KEYWORD1>
-            <KEYWORD1>INCLUDE</KEYWORD1>
-            <KEYWORD1>IGNORE</KEYWORD1>
-            <KEYWORD1>NDATA</KEYWORD1>
-            <KEYWORD1>#IMPLIED</KEYWORD1>
-            <KEYWORD1>#PCDATA</KEYWORD1>
-            <KEYWORD1>#REQUIRED</KEYWORD1>
-        </KEYWORDS>
-    </RULES>
-	<!-- }}} -->
-	
-	<!-- {{{ ENTITY-TAGS -->
-    <RULES SET="ENTITY-TAGS" DEFAULT="KEYWORD2">
-		<!-- SGML comment -->
-        <SPAN TYPE="COMMENT1">
-            <BEGIN>&lt;!--</BEGIN>
-            <END>--&gt;</END>
-        </SPAN>
-
-		<!-- SGML comment -->
-        <SPAN TYPE="COMMENT1">
-            <BEGIN>--</BEGIN>
-            <END>--</END>
-        </SPAN>
-
-        <SPAN TYPE="LITERAL1">
-            <BEGIN>"</BEGIN>
-            <END>"</END>
-        </SPAN>
-
-        <SPAN TYPE="LITERAL1">
-            <BEGIN>'</BEGIN>
-            <END>'</END>
-        </SPAN>
-
-        <SEQ TYPE="OPERATOR">=</SEQ>
-
-        <SEQ TYPE="OPERATOR">%</SEQ>
-
-        <KEYWORDS>
-            <KEYWORD1>SYSTEM</KEYWORD1>
-        </KEYWORDS>
-    </RULES>
-	<!-- }}} -->
-	
-	<!-- {{{ CDATA -->
-    <RULES SET="CDATA" DEFAULT="COMMENT2">
-        <KEYWORDS>
-            <LITERAL2>true</LITERAL2>
-            <LITERAL2>yes</LITERAL2>
-            <LITERAL2>false</LITERAL2>
-        </KEYWORDS>
-    </RULES>
-	<!-- }}} -->
-	
-	<!-- {{{ STRING -->
-    <RULES SET="STRING" DEFAULT="LITERAL1">
-		<!-- ant property -->
-        <SPAN TYPE="KEYWORD3">
-            <BEGIN>${</BEGIN>
-            <END>}</END>
-        </SPAN>
-        <SEQ TYPE="NULL">\"</SEQ>
-        <SEQ TYPE="MARKUP" DELEGATE="TAGS">"</SEQ>
-
-        <SPAN TYPE="LITERAL2" NO_WORD_BREAK="TRUE">
-            <BEGIN>&amp;</BEGIN>
-            <END>;</END>
-        </SPAN>
-        <KEYWORDS>
-            <LITERAL2>true</LITERAL2>
-            <LITERAL2>yes</LITERAL2>
-            <LITERAL2>false</LITERAL2>
-        </KEYWORDS>
-    </RULES>
-	<!-- }}} -->
-
-</MODE>
-
- 	  	 
diff --git a/qpython/src/main/assets/syntax/tpl.xml b/qpython/src/main/assets/syntax/tpl.xml
deleted file mode 100644
index a21737ba..00000000
--- a/qpython/src/main/assets/syntax/tpl.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!--
-	Tpl mode by Brant Gurganus <brantgurganus2001@cherokeescouting.org>
-    Adapted from ColdFusion
--->
-
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="commentStart" VALUE="&lt;!--" />
-		<PROPERTY NAME="commentEnd" VALUE="--&gt;" />
-	</PROPS>
-
-	<RULES IGNORE_CASE="TRUE" HIGHLIGHT_DIGITS="TRUE">
-		<!-- SGML comment -->
-		<SPAN TYPE="COMMENT3">
-			<BEGIN>&lt;!--</BEGIN>
-			<END>--&gt;</END>
-		</SPAN>
-
-		<!-- JavaScript -->
-		<SPAN TYPE="MARKUP" DELEGATE="html::JAVASCRIPT">
-			<BEGIN>&lt;SCRIPT</BEGIN>
-			<END>&lt;/SCRIPT&gt;</END>
-		</SPAN>
-
-		<!-- stylesheet -->
-		<SPAN TYPE="MARKUP" DELEGATE="html::CSS">
-			<BEGIN>&lt;STYLE</BEGIN>
-			<END>&lt;/STYLE&gt;</END>
-		</SPAN>
-
-		<!-- markup tags -->
-		<SPAN TYPE="MARKUP" DELEGATE="TAGS">
-			<BEGIN>&lt;</BEGIN>
-			<END>&gt;</END>
-		</SPAN>
-
-		<!-- SGML entities -->
-		<SPAN TYPE="LITERAL2" NO_WORD_BREAK="TRUE">
-			<BEGIN>&amp;</BEGIN>
-			<END>;</END>
-		</SPAN>
-
-		<!-- Delegate {php}-Tags to PHP mode -->
-		<SPAN TYPE="KEYWORD3" DELEGATE="php::PHP">
-			<BEGIN>{PHP}</BEGIN>
-			<END>{/PHP}</END>
-		</SPAN>
-
-		<!-- TPL markup start tags -->
-		<SPAN TYPE="KEYWORD3" DELEGATE="TPL">
-			<BEGIN>{</BEGIN>
-			<END>}</END>
-		</SPAN>
-	</RULES>
-
-	<RULES SET="TPL" DEFAULT="KEYWORD1" IGNORE_CASE="TRUE" HIGHLIGHT_DIGITS="TRUE">
-		<SPAN TYPE="LABEL">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-		<SPAN TYPE="LABEL">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-
-		<SEQ TYPE="OPERATOR">*</SEQ>
-
-
-		<KEYWORDS>
-			<KEYWORD1>include</KEYWORD1>
-			<OPERATOR>=</OPERATOR>
-			<KEYWORD2>START</KEYWORD2>
-			<KEYWORD2>END</KEYWORD2>
-		</KEYWORDS>
-	</RULES>
-
-	<RULES SET="TAGS" DEFAULT="MARKUP" IGNORE_CASE="TRUE" HIGHLIGHT_DIGITS="TRUE">
-		<SPAN TYPE="LITERAL1">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-		<SPAN TYPE="LITERAL1">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-
-		<SEQ TYPE="OPERATOR">=</SEQ>
-
-	</RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/tsp.xml b/qpython/src/main/assets/syntax/tsp.xml
deleted file mode 100644
index 3284c30a..00000000
--- a/qpython/src/main/assets/syntax/tsp.xml
+++ /dev/null
@@ -1,269 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-<!-- basic TSP mode -->
-<!-- Recommended catalog entry:
-	<MODE NAME="tsp"		FILE="tsp.xml"
-							FILE_NAME_GLOB="*.tsp" />
--->
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="doubleBracketIndent" VALUE="false" />
-		<PROPERTY NAME="lineComment" VALUE="?" />
-		<PROPERTY NAME="noWordSep" VALUE="_" />
-		<PROPERTY NAME="wordBreakChars" VALUE=",+-=&lt;&gt;/?^&amp;*" />
-	</PROPS>
-	<RULES ESCAPE="\" IGNORE_CASE="TRUE" HIGHLIGHT_DIGITS="TRUE">
-		<SPAN TYPE="LITERAL1" NO_LINE_BREAK="TRUE" AT_WORD_START="TRUE" >
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-		<SPAN TYPE="LITERAL1" NO_LINE_BREAK="TRUE" AT_WORD_START="TRUE" >
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-		<EOL_SPAN TYPE="COMMENT2">?</EOL_SPAN>
-		<SEQ_REGEXP TYPE="MARKUP" HASH_CHAR="@">@((\p{Alpha}\w*|_\w+)?::)*(\p{Alpha}\w*|_\w+|\d+)</SEQ_REGEXP>
-
-		<!-- assignment -->
-		<SEQ TYPE="OPERATOR">=</SEQ>
-		<!-- comparison -->
-		<SEQ TYPE="OPERATOR">=</SEQ>
-		<SEQ TYPE="OPERATOR">~</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;=</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;=</SEQ>
-		<SEQ TYPE="OPERATOR">^=</SEQ>
-		<SEQ TYPE="OPERATOR">&amp;</SEQ>
-		<!-- arithmetic -->
-		<SEQ TYPE="OPERATOR">+</SEQ>
-		<SEQ TYPE="OPERATOR">-</SEQ>
-		<SEQ TYPE="OPERATOR">/</SEQ>
-		<SEQ TYPE="OPERATOR">\</SEQ>
-		<SEQ TYPE="OPERATOR">*</SEQ>
-		<SEQ TYPE="OPERATOR">**</SEQ>
-		<SEQ TYPE="OPERATOR">^</SEQ>
-		<SEQ TYPE="OPERATOR">'</SEQ>
-		<SEQ TYPE="OPERATOR">;</SEQ>
-		<SEQ TYPE="OPERATOR">#</SEQ>
-		<SEQ TYPE="OPERATOR">%</SEQ>
-		<SEQ TYPE="OPERATOR">@</SEQ>
-		<!--<SEQ TYPE="OPERATOR">)'</SEQ>
-		<SEQ TYPE="OPERATOR">]'</SEQ> -->
-
-		<!-- logical -->
-		<SEQ TYPE="OPERATOR">&amp;</SEQ>
-		<SEQ TYPE="OPERATOR">|</SEQ>
-		<SEQ TYPE="OPERATOR">~</SEQ>
-		<!-- misc -->
-		<SEQ TYPE="OPERATOR">:</SEQ>
-		<SEQ TYPE="NULL">.</SEQ>
-		<SEQ TYPE="NULL">,</SEQ>
-		<SEQ TYPE="NULL">;</SEQ>
-		<SEQ TYPE="NULL">]</SEQ>
-		<SEQ TYPE="NULL">[</SEQ>
-		<SEQ TYPE="NULL">(</SEQ>
-		<SEQ TYPE="NULL">)</SEQ>
-		<SEQ TYPE="NULL">{</SEQ>
-		<SEQ TYPE="NULL">}</SEQ>
-
-		<!-- Function calls -->
-		<!--<MARK_PREVIOUS TYPE="FUNCTION" EXCLUDE_MATCH="TRUE">(</MARK_PREVIOUS>-->
-		<KEYWORDS>
-			<KEYWORD1>r1</KEYWORD1>
-			<KEYWORD1>bjest</KEYWORD1>
-			<KEYWORD1>bjident</KEYWORD1>
-			<KEYWORD1>corr</KEYWORD1>
-			<KEYWORD1>cova</KEYWORD1>
-			<KEYWORD1>inst</KEYWORD1>
-			<KEYWORD1>kalman</KEYWORD1>
-			<KEYWORD1>lad</KEYWORD1>
-			<KEYWORD1>liml</KEYWORD1>
-			<KEYWORD1>lms</KEYWORD1>
-			<KEYWORD1>moment</KEYWORD1>
-			<KEYWORD1>msd</KEYWORD1>
-			<KEYWORD1>olsq</KEYWORD1>
-			<KEYWORD1>panel</KEYWORD1>
-			<KEYWORD1>prin</KEYWORD1>
-			<KEYWORD1>var</KEYWORD1>
-			<KEYWORD1>3sls</KEYWORD1>
-			<KEYWORD1>arch</KEYWORD1>
-			<KEYWORD1>const</KEYWORD1>
-			<KEYWORD1>differ</KEYWORD1>
-			<KEYWORD1>eqsub</KEYWORD1>
-			<KEYWORD1>fiml</KEYWORD1>
-			<KEYWORD1>orm</KEYWORD1>
-			<KEYWORD1>frml</KEYWORD1>
-			<KEYWORD1>gmm</KEYWORD1>
-			<KEYWORD1>ident</KEYWORD1>
-			<KEYWORD1>lsq</KEYWORD1>
-			<KEYWORD1>param</KEYWORD1>
-			<KEYWORD1>sur</KEYWORD1>
-			<KEYWORD1>logit</KEYWORD1>
-			<KEYWORD1>ml</KEYWORD1>
-			<KEYWORD1>negbin</KEYWORD1>
-			<KEYWORD1>ordprob</KEYWORD1>
-			<KEYWORD1>poisson</KEYWORD1>
-			<KEYWORD1>probit</KEYWORD1>
-			<KEYWORD1>sampsel</KEYWORD1>
-			<KEYWORD1>tobit</KEYWORD1>
-			<KEYWORD1>actfit</KEYWORD1>
-			<KEYWORD1>bjfrcst</KEYWORD1>
-			<KEYWORD1>forcst</KEYWORD1>
-			<KEYWORD1>model</KEYWORD1>
-			<KEYWORD1>siml</KEYWORD1>
-			<KEYWORD1>solve</KEYWORD1>
-			<KEYWORD1>capitl</KEYWORD1>
-			<KEYWORD1>onvert</KEYWORD1>
-			<KEYWORD1>copy</KEYWORD1>
-			<KEYWORD1>delete</KEYWORD1>
-			<KEYWORD1>divind</KEYWORD1>
-			<KEYWORD1>dummy</KEYWORD1>
-			<KEYWORD1>genr</KEYWORD1>
-			<KEYWORD1>length</KEYWORD1>
-			<KEYWORD1>list</KEYWORD1>
-			<KEYWORD1>normal</KEYWORD1>
-			<KEYWORD1>random</KEYWORD1>
-			<KEYWORD1>rename</KEYWORD1>
-			<KEYWORD1>sama</KEYWORD1>
-			<KEYWORD1>set</KEYWORD1>
-			<KEYWORD1>sort</KEYWORD1>
-			<KEYWORD1>trend</KEYWORD1>
-			<KEYWORD1>moving</KEYWORD1>
-			<KEYWORD1>close</KEYWORD1>
-			<KEYWORD1>dbcomp</KEYWORD1>
-			<KEYWORD1>dbconv</KEYWORD1>
-			<KEYWORD1>dbcopy</KEYWORD1>
-			<KEYWORD1>dbdel</KEYWORD1>
-			<KEYWORD1>dbdump</KEYWORD1>
-			<KEYWORD1>dblist</KEYWORD1>
-			<KEYWORD1>dbprint</KEYWORD1>
-			<KEYWORD1>fetch</KEYWORD1>
-			<KEYWORD1>in</KEYWORD1>
-			<KEYWORD1>input</KEYWORD1>
-			<KEYWORD1>keep</KEYWORD1>
-			<KEYWORD1>load</KEYWORD1>
-			<KEYWORD1>out</KEYWORD1>
-			<KEYWORD1>output</KEYWORD1>
-			<KEYWORD1>print</KEYWORD1>
-			<KEYWORD1>read</KEYWORD1>
-			<KEYWORD1>recover</KEYWORD1>
-			<KEYWORD1>restore</KEYWORD1>
-			<KEYWORD1>save</KEYWORD1>
-			<KEYWORD1>store</KEYWORD1>
-			<KEYWORD1>terminal</KEYWORD1>
-			<KEYWORD1>write</KEYWORD1>
-			<KEYWORD1>clear</KEYWORD1>
-			<KEYWORD1>collect</KEYWORD1>
-			<KEYWORD1>do</KEYWORD1>
-			<KEYWORD1>dot</KEYWORD1>
-			<KEYWORD1>else</KEYWORD1>
-			<KEYWORD1>end</KEYWORD1>
-			<KEYWORD1>enddo</KEYWORD1>
-			<KEYWORD1>enddot</KEYWORD1>
-			<KEYWORD1>endproc</KEYWORD1>
-			<KEYWORD1>exec</KEYWORD1>
-			<KEYWORD1>exit</KEYWORD1>
-			<KEYWORD1>goto</KEYWORD1>
-			<KEYWORD1>if</KEYWORD1>
-			<KEYWORD1>local</KEYWORD1>
-			<KEYWORD1>proc</KEYWORD1>
-			<KEYWORD1>quit</KEYWORD1>
-			<KEYWORD1>stop</KEYWORD1>
-			<KEYWORD1>then</KEYWORD1>
-			<KEYWORD1>add</KEYWORD1>
-			<KEYWORD1>drop</KEYWORD1>
-			<KEYWORD1>edit</KEYWORD1>
-			<KEYWORD1>enter</KEYWORD1>
-			<KEYWORD1>retry</KEYWORD1>
-			<KEYWORD1>update</KEYWORD1>
-			<KEYWORD1>asmbug</KEYWORD1>
-			<KEYWORD1>compress</KEYWORD1>
-			<KEYWORD1>date</KEYWORD1>
-			<KEYWORD1>debug</KEYWORD1>
-			<KEYWORD1>dir</KEYWORD1>
-			<KEYWORD1>doc</KEYWORD1>
-			<KEYWORD1>dump</KEYWORD1>
-			<KEYWORD1>find</KEYWORD1>
-			<KEYWORD1>graph</KEYWORD1>
-			<KEYWORD1>help</KEYWORD1>
-			<KEYWORD1>helpr</KEYWORD1>
-			<KEYWORD1>hist</KEYWORD1>
-			<KEYWORD1>name</KEYWORD1>
-			<KEYWORD1>nopause</KEYWORD1>
-			<KEYWORD1>page</KEYWORD1>
-			<KEYWORD1>pause</KEYWORD1>
-			<KEYWORD1>plot</KEYWORD1>
-			<KEYWORD1>review</KEYWORD1>
-			<KEYWORD1>show</KEYWORD1>
-			<KEYWORD1>symtab</KEYWORD1>
-			<KEYWORD1>system</KEYWORD1>
-			<KEYWORD1>title</KEYWORD1>
-			<KEYWORD1>tstats</KEYWORD1>
-			<KEYWORD1>user</KEYWORD1>
-			<KEYWORD1>freq</KEYWORD1>
-			<KEYWORD1>noplots</KEYWORD1>
-			<KEYWORD1>noprint</KEYWORD1>
-			<KEYWORD1>nosupres</KEYWORD1>
-			<KEYWORD1>options</KEYWORD1>
-			<KEYWORD1>plots</KEYWORD1>
-			<KEYWORD1>select</KEYWORD1>
-			<KEYWORD1>smpl</KEYWORD1>
-			<KEYWORD1>smplif</KEYWORD1>
-			<KEYWORD1>supres</KEYWORD1>
-			<KEYWORD1>inprod</KEYWORD1>
-			<KEYWORD1>inv</KEYWORD1>
-			<KEYWORD1>madd</KEYWORD1>
-			<KEYWORD1>matran</KEYWORD1>
-			<KEYWORD1>matrix</KEYWORD1>
-			<KEYWORD1>mdiv</KEYWORD1>
-			<KEYWORD1>mediv</KEYWORD1>
-			<KEYWORD1>memult</KEYWORD1>
-			<KEYWORD1>mform</KEYWORD1>
-			<KEYWORD1>mmake</KEYWORD1>
-			<KEYWORD1>mmult</KEYWORD1>
-			<KEYWORD1>msquare</KEYWORD1>
-			<KEYWORD1>msub</KEYWORD1>
-			<KEYWORD1>orthon</KEYWORD1>
-			<KEYWORD1>t2ymlt</KEYWORD1>
-			<KEYWORD1>unmake</KEYWORD1>
-			<KEYWORD1>vgvmlt</KEYWORD1>
-			<KEYWORD1>yfact</KEYWORD1>
-			<KEYWORD1>yinv</KEYWORD1>
-			<KEYWORD1>yldfac</KEYWORD1>
-			<KEYWORD1>yquad</KEYWORD1>
-			<KEYWORD1>analyz</KEYWORD1>
-			<KEYWORD1>cdf</KEYWORD1>
-			<KEYWORD1>coint</KEYWORD1>
-			<KEYWORD1>regopt</KEYWORD1>
-			<!--Functions:-->
-			<KEYWORD2>log</KEYWORD2>
-			<KEYWORD2>exp</KEYWORD2>
-			<KEYWORD2>abs</KEYWORD2>
-			<KEYWORD2>log10</KEYWORD2>
-			<KEYWORD2>sqrt</KEYWORD2>
-			<KEYWORD2>sin</KEYWORD2>
-			<KEYWORD2>cos</KEYWORD2>
-			<KEYWORD2>tan</KEYWORD2>
-			<KEYWORD2>atan</KEYWORD2>
-			<KEYWORD2>norm</KEYWORD2>
-			<KEYWORD2>cnorm</KEYWORD2>
-			<KEYWORD2>cnormi</KEYWORD2>
-			<KEYWORD2>lnorm</KEYWORD2>
-			<KEYWORD2>lcnorm</KEYWORD2>
-			<KEYWORD2>dlcnorm</KEYWORD2>
-			<KEYWORD2>gamfn</KEYWORD2>
-			<KEYWORD2>lgamfn</KEYWORD2>
-			<KEYWORD2>dlgamfn</KEYWORD2>
-			<KEYWORD2>trigamma</KEYWORD2>
-			<KEYWORD2>fact</KEYWORD2>
-			<KEYWORD2>lfact</KEYWORD2>
-			<KEYWORD2>sign</KEYWORD2>
-			<KEYWORD2>pos</KEYWORD2>
-			<KEYWORD2>miss</KEYWORD2>
-			<KEYWORD2>int</KEYWORD2>
-			<KEYWORD2>ceil</KEYWORD2>
-			<KEYWORD2>round</KEYWORD2>
-		</KEYWORDS>
-	</RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/tsql.xml b/qpython/src/main/assets/syntax/tsql.xml
deleted file mode 100644
index 932dbbac..00000000
--- a/qpython/src/main/assets/syntax/tsql.xml
+++ /dev/null
@@ -1,1019 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="commentStart" VALUE="/*" />
-		<PROPERTY NAME="commentEnd" VALUE="*/" />
-		<PROPERTY NAME="lineComment" VALUE="--" />
-	</PROPS>
-	<RULES IGNORE_CASE="TRUE" HIGHLIGHT_DIGITS="TRUE">
-		<SPAN TYPE="COMMENT1">
-			<BEGIN>/*</BEGIN>
-			<END>*/</END>
-		</SPAN>
-
-		<SPAN TYPE="LITERAL1" ESCAPE="\">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-		<SPAN TYPE="LITERAL1" ESCAPE="\">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-		<SPAN TYPE="LITERAL1" NO_LINE_BREAK="TRUE" ESCAPE="\">
-			<BEGIN>[</BEGIN>
-			<END>]</END>
-		</SPAN>
-
-		<!-- Identifier -->
-		<SPAN TYPE="LITERAL2" ESCAPE="\">
-			<BEGIN>`</BEGIN>
-			<END>`</END>
-		</SPAN>
-
-		<MARK_PREVIOUS TYPE="FUNCTION"
-			MATCH_TYPE="OPERATOR">(</MARK_PREVIOUS>
-		<SEQ TYPE="OPERATOR">)</SEQ>
-
-		<EOL_SPAN TYPE="COMMENT1">--</EOL_SPAN>
-		<SEQ TYPE="OPERATOR">+</SEQ>
-		<SEQ TYPE="OPERATOR">-</SEQ>
-		<SEQ TYPE="OPERATOR">/</SEQ>
-		<SEQ TYPE="OPERATOR">*</SEQ>
-		<SEQ TYPE="OPERATOR">=</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;</SEQ>
-		<SEQ TYPE="OPERATOR">%</SEQ>
-		<SEQ TYPE="OPERATOR">&amp;</SEQ>
-		<SEQ TYPE="OPERATOR">|</SEQ>
-		<SEQ TYPE="OPERATOR">^</SEQ>
-		<SEQ TYPE="OPERATOR">~</SEQ>
-		<SEQ TYPE="OPERATOR">!=</SEQ>
-		<SEQ TYPE="OPERATOR">!&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">!&lt;</SEQ>
-		<SEQ TYPE="OPERATOR">::</SEQ>
-		<MARK_PREVIOUS TYPE="LABEL" AT_LINE_START="TRUE">:</MARK_PREVIOUS>
-
-		<MARK_FOLLOWING TYPE="LITERAL2">@</MARK_FOLLOWING>
-
-		<KEYWORDS>
-			<!-- reserved words -->
-			<KEYWORD1>ABSOLUTE</KEYWORD1>
-			<KEYWORD1>ADD</KEYWORD1>
-			<KEYWORD1>ALTER</KEYWORD1>
-			<KEYWORD1>ANSI_NULLS</KEYWORD1>
-			<KEYWORD1>AS</KEYWORD1>
-			<KEYWORD1>ASC</KEYWORD1>
-			<KEYWORD1>AUTHORIZATION</KEYWORD1>
-			<KEYWORD1>BACKUP</KEYWORD1>
-			<KEYWORD1>BEGIN</KEYWORD1>
-			<KEYWORD1>BREAK</KEYWORD1>
-			<KEYWORD1>BROWSE</KEYWORD1>
-			<KEYWORD1>BULK</KEYWORD1>
-			<KEYWORD1>BY</KEYWORD1>
-			<KEYWORD1>CASCADE</KEYWORD1>
-			<KEYWORD1>CHECK</KEYWORD1>
-			<KEYWORD1>CHECKPOINT</KEYWORD1>
-			<KEYWORD1>CLOSE</KEYWORD1>
-			<KEYWORD1>CLUSTERED</KEYWORD1>
-			<KEYWORD1>COLUMN</KEYWORD1>
-			<KEYWORD1>COMMIT</KEYWORD1>
-			<KEYWORD1>COMMITTED</KEYWORD1>
-			<KEYWORD1>COMPUTE</KEYWORD1>
-			<KEYWORD1>CONFIRM</KEYWORD1>
-			<KEYWORD1>CONSTRAINT</KEYWORD1>
-			<KEYWORD1>CONTAINS</KEYWORD1>
-			<KEYWORD1>CONTAINSTABLE</KEYWORD1>
-			<KEYWORD1>CONTINUE</KEYWORD1>
-			<KEYWORD1>CONTROLROW</KEYWORD1>
-			<KEYWORD1>CREATE</KEYWORD1>
-			<KEYWORD1>CURRENT</KEYWORD1>
-			<KEYWORD1>CURRENT_DATE</KEYWORD1>
-			<KEYWORD1>CURRENT_TIME</KEYWORD1>
-			<KEYWORD1>CURSOR</KEYWORD1>
-			<KEYWORD1>DATABASE</KEYWORD1>
-			<KEYWORD1>DBCC</KEYWORD1>
-			<KEYWORD1>DEALLOCATE</KEYWORD1>
-			<KEYWORD1>DECLARE</KEYWORD1>
-			<KEYWORD1>DEFAULT</KEYWORD1>
-			<KEYWORD1>DELETE</KEYWORD1>
-			<KEYWORD1>DENY</KEYWORD1>
-			<KEYWORD1>DESC</KEYWORD1>
-			<KEYWORD1>DISK</KEYWORD1>
-			<KEYWORD1>DISTINCT</KEYWORD1>
-			<KEYWORD1>DISTRIBUTED</KEYWORD1>
-			<KEYWORD1>DOUBLE</KEYWORD1>
-			<KEYWORD1>DROP</KEYWORD1>
-			<KEYWORD1>DUMMY</KEYWORD1>
-			<KEYWORD1>DUMP</KEYWORD1>
-			<KEYWORD1>DYNAMIC</KEYWORD1>
-			<KEYWORD1>ELSE</KEYWORD1>
-			<KEYWORD1>END</KEYWORD1>
-			<KEYWORD1>ERRLVL</KEYWORD1>
-			<KEYWORD1>ERROREXIT</KEYWORD1>
-			<KEYWORD1>ESCAPE</KEYWORD1>
-			<KEYWORD1>EXCEPT</KEYWORD1>
-			<KEYWORD1>EXEC</KEYWORD1>
-			<KEYWORD1>EXECUTE</KEYWORD1>
-			<KEYWORD1>EXIT</KEYWORD1>
-			<KEYWORD1>FAST_FORWARD</KEYWORD1>
-			<KEYWORD1>FETCH</KEYWORD1>
-			<KEYWORD1>FILE</KEYWORD1>
-			<KEYWORD1>FILLFACTOR</KEYWORD1>
-			<KEYWORD1>FIRST</KEYWORD1>
-			<KEYWORD1>FLOPPY</KEYWORD1>
-			<KEYWORD1>FOR</KEYWORD1>
-			<KEYWORD1>FOREIGN</KEYWORD1>
-			<KEYWORD1>FORWARD_ONLY</KEYWORD1>
-			<KEYWORD1>FREETEXT</KEYWORD1>
-			<KEYWORD1>FREETEXTTABLE</KEYWORD1>
-			<KEYWORD1>FROM</KEYWORD1>
-			<KEYWORD1>FULL</KEYWORD1>
-			<KEYWORD1>FUNCTION</KEYWORD1>
-			<KEYWORD1>GLOBAL</KEYWORD1>
-			<KEYWORD1>GOTO</KEYWORD1>
-			<KEYWORD1>GRANT</KEYWORD1>
-			<KEYWORD1>GROUP</KEYWORD1>
-			<KEYWORD1>HAVING</KEYWORD1>
-			<KEYWORD1>HOLDLOCK</KEYWORD1>
-			<KEYWORD1>ID</KEYWORD1>
-			<KEYWORD1>IDENTITYCOL</KEYWORD1>
-			<KEYWORD1>IDENTITY_INSERT</KEYWORD1>
-			<KEYWORD1>IF</KEYWORD1>
-			<KEYWORD1>INDEX</KEYWORD1>
-			<KEYWORD1>INNER</KEYWORD1>
-			<KEYWORD1>INSENSITIVE</KEYWORD1>
-			<KEYWORD1>INSERT</KEYWORD1>
-			<KEYWORD1>INTO</KEYWORD1>
-			<KEYWORD1>IS</KEYWORD1>
-			<KEYWORD1>ISOLATION</KEYWORD1>
-			<KEYWORD1>KEY</KEYWORD1>
-			<KEYWORD1>KEYSET</KEYWORD1>
-			<KEYWORD1>KILL</KEYWORD1>
-			<KEYWORD1>LAST</KEYWORD1>
-			<KEYWORD1>LEVEL</KEYWORD1>
-			<KEYWORD1>LINENO</KEYWORD1>
-			<KEYWORD1>LOAD</KEYWORD1>
-			<KEYWORD1>LOCAL</KEYWORD1>
-			<KEYWORD1>MAX</KEYWORD1>
-			<KEYWORD1>MIN</KEYWORD1>
-			<KEYWORD1>MIRROREXIT</KEYWORD1>
-			<KEYWORD1>NATIONAL</KEYWORD1>
-			<KEYWORD1>NEXT</KEYWORD1>
-			<KEYWORD1>NOCHECK</KEYWORD1>
-			<KEYWORD1>NONCLUSTERED</KEYWORD1>
-			<KEYWORD1>OF</KEYWORD1>
-			<KEYWORD1>OFF</KEYWORD1>
-			<KEYWORD1>OFFSETS</KEYWORD1>
-			<KEYWORD1>ON</KEYWORD1>
-			<KEYWORD1>ONCE</KEYWORD1>
-			<KEYWORD1>ONLY</KEYWORD1>
-			<KEYWORD1>OPEN</KEYWORD1>
-			<KEYWORD1>OPENDATASOURCE</KEYWORD1>
-			<KEYWORD1>OPENQUERY</KEYWORD1>
-			<KEYWORD1>OPENROWSET</KEYWORD1>
-			<KEYWORD1>OPTIMISTIC</KEYWORD1>
-			<KEYWORD1>OPTION</KEYWORD1>
-			<KEYWORD1>ORDER</KEYWORD1>
-			<KEYWORD1>OUTPUT</KEYWORD1>
-			<KEYWORD1>OVER</KEYWORD1>
-			<KEYWORD1>PERCENT</KEYWORD1>
-			<KEYWORD1>PERM</KEYWORD1>
-			<KEYWORD1>PERMANENT</KEYWORD1>
-			<KEYWORD1>PIPE</KEYWORD1>
-			<KEYWORD1>PLAN</KEYWORD1>
-			<KEYWORD1>PRECISION</KEYWORD1>
-			<KEYWORD1>PREPARE</KEYWORD1>
-			<KEYWORD1>PRIMARY</KEYWORD1>
-			<KEYWORD1>PRINT</KEYWORD1>
-			<KEYWORD1>PRIOR</KEYWORD1>
-			<KEYWORD1>PRIVILEGES</KEYWORD1>
-			<KEYWORD1>PROC</KEYWORD1>
-			<KEYWORD1>PROCEDURE</KEYWORD1>
-			<KEYWORD1>PROCESSEXIT</KEYWORD1>
-			<KEYWORD1>PUBLIC</KEYWORD1>
-			<KEYWORD1>QUOTED_IDENTIFIER</KEYWORD1>
-			<KEYWORD1>RAISERROR</KEYWORD1>
-			<KEYWORD1>READ</KEYWORD1>
-			<KEYWORD1>READTEXT</KEYWORD1>
-			<KEYWORD1>READ_ONLY</KEYWORD1>
-			<KEYWORD1>RECONFIGURE</KEYWORD1>
-			<KEYWORD1>REFERENCES</KEYWORD1>
-			<KEYWORD1>RELATIVE</KEYWORD1>
-			<KEYWORD1>REPEATABLE</KEYWORD1>
-			<KEYWORD1>REPLICATION</KEYWORD1>
-			<KEYWORD1>RESTORE</KEYWORD1>
-			<KEYWORD1>RESTRICT</KEYWORD1>
-			<KEYWORD1>RETURN</KEYWORD1>
-			<KEYWORD1>RETURNS</KEYWORD1>
-			<KEYWORD1>REVOKE</KEYWORD1>
-			<KEYWORD1>ROLLBACK</KEYWORD1>
-			<KEYWORD1>ROWGUIDCOL</KEYWORD1>
-			<KEYWORD1>RULE</KEYWORD1>
-			<KEYWORD1>SAVE</KEYWORD1>
-			<KEYWORD1>SCHEMA</KEYWORD1>
-			<KEYWORD1>SCROLL</KEYWORD1>
-			<KEYWORD1>SCROLL_LOCKS</KEYWORD1>
-			<KEYWORD1>SELECT</KEYWORD1>
-			<KEYWORD1>SERIALIZABLE</KEYWORD1>
-			<KEYWORD1>SET</KEYWORD1>
-			<KEYWORD1>SETUSER</KEYWORD1>
-			<KEYWORD1>SHUTDOWN</KEYWORD1>
-			<KEYWORD1>STATIC</KEYWORD1>
-			<KEYWORD1>STATISTICS</KEYWORD1>
-			<KEYWORD1>TABLE</KEYWORD1>
-			<KEYWORD1>TAPE</KEYWORD1>
-			<KEYWORD1>TEMP</KEYWORD1>
-			<KEYWORD1>TEMPORARY</KEYWORD1>
-			<KEYWORD1>TEXTIMAGE_ON</KEYWORD1>
-			<KEYWORD1>THEN</KEYWORD1>
-			<KEYWORD1>TO</KEYWORD1>
-			<KEYWORD1>TOP</KEYWORD1>
-			<KEYWORD1>TRAN</KEYWORD1>
-			<KEYWORD1>TRANSACTION</KEYWORD1>
-			<KEYWORD1>TRIGGER</KEYWORD1>
-			<KEYWORD1>TRUNCATE</KEYWORD1>
-			<KEYWORD1>TSEQUAL</KEYWORD1>
-			<KEYWORD1>UNCOMMITTED</KEYWORD1>
-			<KEYWORD1>UNION</KEYWORD1>
-			<KEYWORD1>UNIQUE</KEYWORD1>
-			<KEYWORD1>UPDATE</KEYWORD1>
-			<KEYWORD1>UPDATETEXT</KEYWORD1>
-			<KEYWORD1>USE</KEYWORD1>
-			<KEYWORD1>VALUES</KEYWORD1>
-			<KEYWORD1>VARYING</KEYWORD1>
-			<KEYWORD1>VIEW</KEYWORD1>
-			<KEYWORD1>WAITFOR</KEYWORD1>
-			<KEYWORD1>WHEN</KEYWORD1>
-			<KEYWORD1>WHERE</KEYWORD1>
-			<KEYWORD1>WHILE</KEYWORD1>
-			<KEYWORD1>WITH</KEYWORD1>
-			<KEYWORD1>WORK</KEYWORD1>
-			<KEYWORD1>WRITETEXT</KEYWORD1>
-
-			<!-- data types -->
-			<KEYWORD1>binary</KEYWORD1>
-			<KEYWORD1>bit</KEYWORD1>
-			<KEYWORD1>char</KEYWORD1>
-			<KEYWORD1>character</KEYWORD1>
-			<KEYWORD1>datetime</KEYWORD1>
-			<KEYWORD1>decimal</KEYWORD1>
-			<KEYWORD1>float</KEYWORD1>
-			<KEYWORD1>image</KEYWORD1>
-			<KEYWORD1>int</KEYWORD1>
-			<KEYWORD1>integer</KEYWORD1>
-			<KEYWORD1>money</KEYWORD1>
-			<KEYWORD1>name</KEYWORD1>
-			<KEYWORD1>numeric</KEYWORD1>
-			<KEYWORD1>nchar</KEYWORD1>
-			<KEYWORD1>nvarchar</KEYWORD1>
-			<KEYWORD1>ntext</KEYWORD1>
-			<KEYWORD1>real</KEYWORD1>
-			<KEYWORD1>smalldatetime</KEYWORD1>
-			<KEYWORD1>smallint</KEYWORD1>
-			<KEYWORD1>smallmoney</KEYWORD1>
-			<KEYWORD1>text</KEYWORD1>
-			<KEYWORD1>timestamp</KEYWORD1>
-			<KEYWORD1>tinyint</KEYWORD1>
-			<KEYWORD1>uniqueidentifier</KEYWORD1>
-			<KEYWORD1>varbinary</KEYWORD1>
-			<KEYWORD1>varchar</KEYWORD1>
-
-			<!-- system functions -->
-			<KEYWORD2>@@CONNECTIONS</KEYWORD2>
-			<KEYWORD2>@@CPU_BUSY</KEYWORD2>
-			<KEYWORD2>@@CURSOR_ROWS</KEYWORD2>
-			<KEYWORD2>@@DATEFIRST</KEYWORD2>
-			<KEYWORD2>@@DBTS</KEYWORD2>
-			<KEYWORD2>@@ERROR</KEYWORD2>
-			<KEYWORD2>@@FETCH_STATUS</KEYWORD2>
-			<KEYWORD2>@@IDENTITY</KEYWORD2>
-			<KEYWORD2>@@IDLE</KEYWORD2>
-			<KEYWORD2>@@IO_BUSY</KEYWORD2>
-			<KEYWORD2>@@LANGID</KEYWORD2>
-			<KEYWORD2>@@LANGUAGE</KEYWORD2>
-			<KEYWORD2>@@LOCK_TIMEOUT</KEYWORD2>
-			<KEYWORD2>@@MAX_CONNECTIONS</KEYWORD2>
-			<KEYWORD2>@@MAX_PRECISION</KEYWORD2>
-			<KEYWORD2>@@NESTLEVEL</KEYWORD2>
-			<KEYWORD2>@@OPTIONS</KEYWORD2>
-			<KEYWORD2>@@PACKET_ERRORS</KEYWORD2>
-			<KEYWORD2>@@PACK_RECEIVED</KEYWORD2>
-			<KEYWORD2>@@PACK_SENT</KEYWORD2>
-			<KEYWORD2>@@PROCID</KEYWORD2>
-			<KEYWORD2>@@REMSERVER</KEYWORD2>
-			<KEYWORD2>@@ROWCOUNT</KEYWORD2>
-			<KEYWORD2>@@SERVERNAME</KEYWORD2>
-			<KEYWORD2>@@SERVICENAME</KEYWORD2>
-			<KEYWORD2>@@SPID</KEYWORD2>
-			<KEYWORD2>@@TEXTSIZE</KEYWORD2>
-			<KEYWORD2>@@TIMETICKS</KEYWORD2>
-			<KEYWORD2>@@TOTAL_ERRORS</KEYWORD2>
-			<KEYWORD2>@@TOTAL_READ</KEYWORD2>
-			<KEYWORD2>@@TOTAL_WRITE</KEYWORD2>
-			<KEYWORD2>@@TRANCOUNT</KEYWORD2>
-			<KEYWORD2>@@VERSION</KEYWORD2>
-			<KEYWORD2>ABS</KEYWORD2>
-			<KEYWORD2>ACOS</KEYWORD2>
-			<KEYWORD2>APP_NAME</KEYWORD2>
-			<KEYWORD2>ASCII</KEYWORD2>
-			<KEYWORD2>ASIN</KEYWORD2>
-			<KEYWORD2>ATAN</KEYWORD2>
-			<KEYWORD2>ATN2</KEYWORD2>
-			<KEYWORD2>AVG</KEYWORD2>
-			<KEYWORD2>BINARY_CHECKSUM</KEYWORD2>
-			<KEYWORD2>CASE</KEYWORD2>
-			<KEYWORD2>CAST</KEYWORD2>
-			<KEYWORD2>CEILING</KEYWORD2>
-			<KEYWORD2>CHARINDEX</KEYWORD2>
-			<KEYWORD2>CHECKSUM</KEYWORD2>
-			<KEYWORD2>CHECKSUM_AGG</KEYWORD2>
-			<KEYWORD2>COALESCE</KEYWORD2>
-			<KEYWORD2>COLLATIONPROPERTY</KEYWORD2>
-			<KEYWORD2>COLUMNPROPERTY</KEYWORD2>
-			<KEYWORD2>COL_LENGTH</KEYWORD2>
-			<KEYWORD2>COL_NAME</KEYWORD2>
-			<KEYWORD2>CONVERT</KEYWORD2>
-			<KEYWORD2>COS</KEYWORD2>
-			<KEYWORD2>COT</KEYWORD2>
-			<KEYWORD2>COUNT</KEYWORD2>
-			<KEYWORD2>COUNT_BIG</KEYWORD2>
-			<KEYWORD2>CURRENT_DATE</KEYWORD2>
-			<KEYWORD2>CURRENT_TIME</KEYWORD2>
-			<KEYWORD2>CURRENT_TIMESTAMP</KEYWORD2>
-			<KEYWORD2>CURRENT_USER</KEYWORD2>
-			<KEYWORD2>CURSOR_STATUS</KEYWORD2>
-			<KEYWORD2>DATABASEPROPERTY</KEYWORD2>
-			<KEYWORD2>DATALENGTH</KEYWORD2>
-			<KEYWORD2>DATEADD</KEYWORD2>
-			<KEYWORD2>DATEDIFF</KEYWORD2>
-			<KEYWORD2>DATENAME</KEYWORD2>
-			<KEYWORD2>DATEPART</KEYWORD2>
-			<KEYWORD2>DAY</KEYWORD2>
-			<KEYWORD2>DB_ID</KEYWORD2>
-			<KEYWORD2>DB_NAME</KEYWORD2>
-			<KEYWORD2>DEGREES</KEYWORD2>
-			<KEYWORD2>DIFFERENCE</KEYWORD2>
-			<KEYWORD2>EXP</KEYWORD2>
-			<KEYWORD2>FILEGROUPPROPERTY</KEYWORD2>
-			<KEYWORD2>FILEGROUP_ID</KEYWORD2>
-			<KEYWORD2>FILEGROUP_NAME</KEYWORD2>
-			<KEYWORD2>FILEPROPERTY</KEYWORD2>
-			<KEYWORD2>FILE_ID</KEYWORD2>
-			<KEYWORD2>FILE_NAME</KEYWORD2>
-			<KEYWORD2>FLOOR</KEYWORD2>
-			<KEYWORD2>FORMATMESSAGE</KEYWORD2>
-			<KEYWORD2>FULLTEXTCATALOGPROPERTY</KEYWORD2>
-			<KEYWORD2>FULLTEXTSERVICEPROPERTY</KEYWORD2>
-			<KEYWORD2>GETANSINULL</KEYWORD2>
-			<KEYWORD2>GETDATE</KEYWORD2>
-			<KEYWORD2>GETUTCDATE</KEYWORD2>
-			<KEYWORD2>GROUPING</KEYWORD2>
-			<KEYWORD2>HOST_ID</KEYWORD2>
-			<KEYWORD2>HOST_NAME</KEYWORD2>
-			<KEYWORD2>IDENTITY</KEYWORD2>
-			<KEYWORD2>IDENTITY_INSERT</KEYWORD2>
-			<KEYWORD2>IDENT_CURRENT</KEYWORD2>
-			<KEYWORD2>IDENT_INCR</KEYWORD2>
-			<KEYWORD2>IDENT_SEED</KEYWORD2>
-			<KEYWORD2>INDEXPROPERTY</KEYWORD2>
-			<KEYWORD2>INDEX_COL</KEYWORD2>
-			<KEYWORD2>ISDATE</KEYWORD2>
-			<KEYWORD2>ISNULL</KEYWORD2>
-			<KEYWORD2>ISNUMERIC</KEYWORD2>
-			<KEYWORD2>IS_MEMBER</KEYWORD2>
-			<KEYWORD2>IS_SRVROLEMEMBER</KEYWORD2>
-			<KEYWORD2>LEFT</KEYWORD2>
-			<KEYWORD2>LEN</KEYWORD2>
-			<KEYWORD2>LOG10</KEYWORD2>
-			<KEYWORD2>LOG</KEYWORD2>
-			<KEYWORD2>LOWER</KEYWORD2>
-			<KEYWORD2>LTRIM</KEYWORD2>
-			<KEYWORD2>MONTH</KEYWORD2>
-			<KEYWORD2>NEWID</KEYWORD2>
-			<KEYWORD2>NULLIF</KEYWORD2>
-			<KEYWORD2>OBJECTPROPERTY</KEYWORD2>
-			<KEYWORD2>OBJECT_ID</KEYWORD2>
-			<KEYWORD2>OBJECT_NAME</KEYWORD2>
-			<KEYWORD2>PARSENAME</KEYWORD2>
-			<KEYWORD2>PATINDEX</KEYWORD2>
-			<KEYWORD2>PERMISSIONS</KEYWORD2>
-			<KEYWORD2>PI</KEYWORD2>
-			<KEYWORD2>POWER</KEYWORD2>
-			<KEYWORD2>QUOTENAME</KEYWORD2>
-			<KEYWORD2>RADIANS</KEYWORD2>
-			<KEYWORD2>RAND</KEYWORD2>
-			<KEYWORD2>REPLACE</KEYWORD2>
-			<KEYWORD2>REPLICATE</KEYWORD2>
-			<KEYWORD2>REVERSE</KEYWORD2>
-			<KEYWORD2>RIGHT</KEYWORD2>
-			<KEYWORD2>ROUND</KEYWORD2>
-			<KEYWORD2>ROWCOUNT_BIG</KEYWORD2>
-			<KEYWORD2>RTRIM</KEYWORD2>
-			<KEYWORD2>SCOPE_IDENTITY</KEYWORD2>
-			<KEYWORD2>SERVERPROPERTY</KEYWORD2>
-			<KEYWORD2>SESSIONPROPERTY</KEYWORD2>
-			<KEYWORD2>SESSION_USER</KEYWORD2>
-			<KEYWORD2>SIGN</KEYWORD2>
-			<KEYWORD2>SIN</KEYWORD2>
-			<KEYWORD2>SOUNDEX</KEYWORD2>
-			<KEYWORD2>SPACE</KEYWORD2>
-			<KEYWORD2>SQRT</KEYWORD2>
-			<KEYWORD2>SQUARE</KEYWORD2>
-			<KEYWORD2>STATS_DATE</KEYWORD2>
-			<KEYWORD2>STDEV</KEYWORD2>
-			<KEYWORD2>STDEVP</KEYWORD2>
-			<KEYWORD2>STR</KEYWORD2>
-			<KEYWORD2>STUFF</KEYWORD2>
-			<KEYWORD2>SUBSTRING</KEYWORD2>
-			<KEYWORD2>SUM</KEYWORD2>
-			<KEYWORD2>SUSER_ID</KEYWORD2>
-			<KEYWORD2>SUSER_NAME</KEYWORD2>
-			<KEYWORD2>SUSER_SID</KEYWORD2>
-			<KEYWORD2>SUSER_SNAME</KEYWORD2>
-			<KEYWORD2>SYSTEM_USER</KEYWORD2>
-			<KEYWORD2>TAN</KEYWORD2>
-			<KEYWORD2>TEXTPTR</KEYWORD2>
-			<KEYWORD2>TEXTVALID</KEYWORD2>
-			<KEYWORD2>TYPEPROPERTY</KEYWORD2>
-			<KEYWORD2>UNICODE</KEYWORD2>
-			<KEYWORD2>UPPER</KEYWORD2>
-			<KEYWORD2>USER</KEYWORD2>
-			<KEYWORD2>USER_ID</KEYWORD2>
-			<KEYWORD2>USER_NAME</KEYWORD2>
-			<KEYWORD2>VAR</KEYWORD2>
-			<KEYWORD2>VARP</KEYWORD2>
-			<KEYWORD2>YEAR</KEYWORD2>
-
-			<!-- operators -->
-			<KEYWORD1>ALL</KEYWORD1>
-			<KEYWORD1>AND</KEYWORD1>
-			<KEYWORD1>ANY</KEYWORD1>
-			<KEYWORD1>BETWEEN</KEYWORD1>
-			<KEYWORD1>CROSS</KEYWORD1>
-			<KEYWORD1>EXISTS</KEYWORD1>
-			<KEYWORD1>IN</KEYWORD1>
-			<KEYWORD1>INTERSECT</KEYWORD1>
-			<KEYWORD1>JOIN</KEYWORD1>
-			<KEYWORD1>LIKE</KEYWORD1>
-			<KEYWORD1>NOT</KEYWORD1>
-			<KEYWORD1>NULL</KEYWORD1>
-			<KEYWORD1>OR</KEYWORD1>
-			<KEYWORD1>OUTER</KEYWORD1>
-			<KEYWORD1>SOME</KEYWORD1>
-
-			<!-- SQL Server 7.0 system stored procedures -->
-			<KEYWORD3>sp_add_agent_parameter</KEYWORD3>
-			<KEYWORD3>sp_add_agent_profile</KEYWORD3>
-			<KEYWORD3>sp_add_alert</KEYWORD3>
-			<KEYWORD3>sp_add_category</KEYWORD3>
-			<KEYWORD3>sp_add_data_file_recover_suspect_db</KEYWORD3>
-			<KEYWORD3>sp_add_job</KEYWORD3>
-			<KEYWORD3>sp_add_jobschedule</KEYWORD3>
-			<KEYWORD3>sp_add_jobserver</KEYWORD3>
-			<KEYWORD3>sp_add_jobstep</KEYWORD3>
-			<KEYWORD3>sp_add_log_file_recover_suspect_db</KEYWORD3>
-			<KEYWORD3>sp_add_notification</KEYWORD3>
-			<KEYWORD3>sp_add_operator</KEYWORD3>
-			<KEYWORD3>sp_add_targetservergroup</KEYWORD3>
-			<KEYWORD3>sp_add_targetsvrgrp_member</KEYWORD3>
-			<KEYWORD3>sp_addalias</KEYWORD3>
-			<KEYWORD3>sp_addapprole</KEYWORD3>
-			<KEYWORD3>sp_addarticle</KEYWORD3>
-			<KEYWORD3>sp_adddistpublisher</KEYWORD3>
-			<KEYWORD3>sp_adddistributiondb</KEYWORD3>
-			<KEYWORD3>sp_adddistributor</KEYWORD3>
-			<KEYWORD3>sp_addextendedproc</KEYWORD3>
-			<KEYWORD3>sp_addgroup</KEYWORD3>
-			<KEYWORD3>sp_addlinkedserver</KEYWORD3>
-			<KEYWORD3>sp_addlinkedsrvlogin</KEYWORD3>
-			<KEYWORD3>sp_addlinkedsrvlogin</KEYWORD3>
-			<KEYWORD3>sp_addlogin</KEYWORD3>
-			<KEYWORD3>sp_addmergearticle</KEYWORD3>
-			<KEYWORD3>sp_addmergefilter</KEYWORD3>
-			<KEYWORD3>sp_addmergepublication</KEYWORD3>
-			<KEYWORD3>sp_addmergepullsubscription</KEYWORD3>
-			<KEYWORD3>sp_addmergepullsubscription_agent</KEYWORD3>
-			<KEYWORD3>sp_addmergesubscription</KEYWORD3>
-			<KEYWORD3>sp_addmessage</KEYWORD3>
-			<KEYWORD3>sp_addpublication</KEYWORD3>
-			<KEYWORD3>sp_addpublication_snapshot</KEYWORD3>
-			<KEYWORD3>sp_addpublisher70</KEYWORD3>
-			<KEYWORD3>sp_addpullsubscription</KEYWORD3>
-			<KEYWORD3>sp_addpullsubscription_agent</KEYWORD3>
-			<KEYWORD3>sp_addremotelogin</KEYWORD3>
-			<KEYWORD3>sp_addrole</KEYWORD3>
-			<KEYWORD3>sp_addrolemember</KEYWORD3>
-			<KEYWORD3>sp_addserver</KEYWORD3>
-			<KEYWORD3>sp_addsrvrolemember</KEYWORD3>
-			<KEYWORD3>sp_addsubscriber</KEYWORD3>
-			<KEYWORD3>sp_addsubscriber_schedule</KEYWORD3>
-			<KEYWORD3>sp_addsubscription</KEYWORD3>
-			<KEYWORD3>sp_addsynctriggers</KEYWORD3>
-			<KEYWORD3>sp_addtabletocontents</KEYWORD3>
-			<KEYWORD3>sp_addtask</KEYWORD3>
-			<KEYWORD3>sp_addtype</KEYWORD3>
-			<KEYWORD3>sp_addumpdevice</KEYWORD3>
-			<KEYWORD3>sp_adduser</KEYWORD3>
-			<KEYWORD3>sp_altermessage</KEYWORD3>
-			<KEYWORD3>sp_apply_job_to_targets</KEYWORD3>
-			<KEYWORD3>sp_approlepassword</KEYWORD3>
-			<KEYWORD3>sp_article_validation</KEYWORD3>
-			<KEYWORD3>sp_articlecolumn</KEYWORD3>
-			<KEYWORD3>sp_articlefilter</KEYWORD3>
-			<KEYWORD3>sp_articlesynctranprocs</KEYWORD3>
-			<KEYWORD3>sp_articleview</KEYWORD3>
-			<KEYWORD3>sp_attach_db</KEYWORD3>
-			<KEYWORD3>sp_attach_single_file_db</KEYWORD3>
-			<KEYWORD3>sp_autostats</KEYWORD3>
-			<KEYWORD3>sp_bindefault</KEYWORD3>
-			<KEYWORD3>sp_bindrule</KEYWORD3>
-			<KEYWORD3>sp_bindsession</KEYWORD3>
-			<KEYWORD3>sp_browsereplcmds</KEYWORD3>
-			<KEYWORD3>sp_catalogs</KEYWORD3>
-			<KEYWORD3>sp_certify_removable</KEYWORD3>
-			<KEYWORD3>sp_change_agent_parameter</KEYWORD3>
-			<KEYWORD3>sp_change_agent_profile</KEYWORD3>
-			<KEYWORD3>sp_change_subscription_properties</KEYWORD3>
-			<KEYWORD3>sp_change_users_login</KEYWORD3>
-			<KEYWORD3>sp_changearticle</KEYWORD3>
-			<KEYWORD3>sp_changedbowner</KEYWORD3>
-			<KEYWORD3>sp_changedistpublisher</KEYWORD3>
-			<KEYWORD3>sp_changedistributiondb</KEYWORD3>
-			<KEYWORD3>sp_changedistributor_password</KEYWORD3>
-			<KEYWORD3>sp_changedistributor_property</KEYWORD3>
-			<KEYWORD3>sp_changegroup</KEYWORD3>
-			<KEYWORD3>sp_changemergearticle</KEYWORD3>
-			<KEYWORD3>sp_changemergefilter</KEYWORD3>
-			<KEYWORD3>sp_changemergepublication</KEYWORD3>
-			<KEYWORD3>sp_changemergepullsubscription</KEYWORD3>
-			<KEYWORD3>sp_changemergesubscription</KEYWORD3>
-			<KEYWORD3>sp_changeobjectowner</KEYWORD3>
-			<KEYWORD3>sp_changepublication</KEYWORD3>
-			<KEYWORD3>sp_changesubscriber</KEYWORD3>
-			<KEYWORD3>sp_changesubscriber_schedule</KEYWORD3>
-			<KEYWORD3>sp_changesubstatus</KEYWORD3>
-			<KEYWORD3>sp_check_for_sync_trigger</KEYWORD3>
-			<KEYWORD3>sp_column_privileges</KEYWORD3>
-			<KEYWORD3>sp_column_privileges_ex</KEYWORD3>
-			<KEYWORD3>sp_columns</KEYWORD3>
-			<KEYWORD3>sp_columns_ex</KEYWORD3>
-			<KEYWORD3>sp_configure</KEYWORD3>
-			<KEYWORD3>sp_create_removable</KEYWORD3>
-			<KEYWORD3>sp_createorphan</KEYWORD3>
-			<KEYWORD3>sp_createstats</KEYWORD3>
-			<KEYWORD3>sp_cursor</KEYWORD3>
-			<KEYWORD3>sp_cursor_list</KEYWORD3>
-			<KEYWORD3>sp_cursorclose</KEYWORD3>
-			<KEYWORD3>sp_cursorexecute</KEYWORD3>
-			<KEYWORD3>sp_cursorfetch</KEYWORD3>
-			<KEYWORD3>sp_cursoropen</KEYWORD3>
-			<KEYWORD3>sp_cursoroption</KEYWORD3>
-			<KEYWORD3>sp_cursorprepare</KEYWORD3>
-			<KEYWORD3>sp_cursorunprepare</KEYWORD3>
-			<KEYWORD3>sp_cycle_errorlog</KEYWORD3>
-			<KEYWORD3>sp_databases</KEYWORD3>
-			<KEYWORD3>sp_datatype_info</KEYWORD3>
-			<KEYWORD3>sp_dbcmptlevel</KEYWORD3>
-			<KEYWORD3>sp_dbfixedrolepermission</KEYWORD3>
-			<KEYWORD3>sp_dboption</KEYWORD3>
-			<KEYWORD3>sp_defaultdb</KEYWORD3>
-			<KEYWORD3>sp_defaultlanguage</KEYWORD3>
-			<KEYWORD3>sp_delete_alert</KEYWORD3>
-			<KEYWORD3>sp_delete_backuphistory</KEYWORD3>
-			<KEYWORD3>sp_delete_category</KEYWORD3>
-			<KEYWORD3>sp_delete_job</KEYWORD3>
-			<KEYWORD3>sp_delete_jobschedule</KEYWORD3>
-			<KEYWORD3>sp_delete_jobserver</KEYWORD3>
-			<KEYWORD3>sp_delete_jobstep</KEYWORD3>
-			<KEYWORD3>sp_delete_notification</KEYWORD3>
-			<KEYWORD3>sp_delete_operator</KEYWORD3>
-			<KEYWORD3>sp_delete_targetserver</KEYWORD3>
-			<KEYWORD3>sp_delete_targetservergroup</KEYWORD3>
-			<KEYWORD3>sp_delete_targetsvrgrp_member</KEYWORD3>
-			<KEYWORD3>sp_deletemergeconflictrow</KEYWORD3>
-			<KEYWORD3>sp_denylogin</KEYWORD3>
-			<KEYWORD3>sp_depends</KEYWORD3>
-			<KEYWORD3>sp_describe_cursor</KEYWORD3>
-			<KEYWORD3>sp_describe_cursor_columns</KEYWORD3>
-			<KEYWORD3>sp_describe_cursor_tables</KEYWORD3>
-			<KEYWORD3>sp_detach_db</KEYWORD3>
-			<KEYWORD3>sp_drop_agent_parameter</KEYWORD3>
-			<KEYWORD3>sp_drop_agent_profile</KEYWORD3>
-			<KEYWORD3>sp_dropalias</KEYWORD3>
-			<KEYWORD3>sp_dropapprole</KEYWORD3>
-			<KEYWORD3>sp_droparticle</KEYWORD3>
-			<KEYWORD3>sp_dropdevice</KEYWORD3>
-			<KEYWORD3>sp_dropdistpublisher</KEYWORD3>
-			<KEYWORD3>sp_dropdistributiondb</KEYWORD3>
-			<KEYWORD3>sp_dropdistributor</KEYWORD3>
-			<KEYWORD3>sp_dropextendedproc</KEYWORD3>
-			<KEYWORD3>sp_dropgroup</KEYWORD3>
-			<KEYWORD3>sp_droplinkedsrvlogin</KEYWORD3>
-			<KEYWORD3>sp_droplinkedsrvlogin</KEYWORD3>
-			<KEYWORD3>sp_droplogin</KEYWORD3>
-			<KEYWORD3>sp_dropmergearticle</KEYWORD3>
-			<KEYWORD3>sp_dropmergefilter</KEYWORD3>
-			<KEYWORD3>sp_dropmergepublication</KEYWORD3>
-			<KEYWORD3>sp_dropmergepullsubscription</KEYWORD3>
-			<KEYWORD3>sp_dropmergesubscription</KEYWORD3>
-			<KEYWORD3>sp_dropmessage</KEYWORD3>
-			<KEYWORD3>sp_droporphans</KEYWORD3>
-			<KEYWORD3>sp_droppublication</KEYWORD3>
-			<KEYWORD3>sp_droppullsubscription</KEYWORD3>
-			<KEYWORD3>sp_dropremotelogin</KEYWORD3>
-			<KEYWORD3>sp_droprole</KEYWORD3>
-			<KEYWORD3>sp_droprolemember</KEYWORD3>
-			<KEYWORD3>sp_dropserver</KEYWORD3>
-			<KEYWORD3>sp_dropsrvrolemember</KEYWORD3>
-			<KEYWORD3>sp_dropsubscriber</KEYWORD3>
-			<KEYWORD3>sp_dropsubscription</KEYWORD3>
-			<KEYWORD3>sp_droptask</KEYWORD3>
-			<KEYWORD3>sp_droptype</KEYWORD3>
-			<KEYWORD3>sp_dropuser</KEYWORD3>
-			<KEYWORD3>sp_dropwebtask</KEYWORD3>
-			<KEYWORD3>sp_dsninfo</KEYWORD3>
-			<KEYWORD3>sp_dumpparamcmd</KEYWORD3>
-			<KEYWORD3>sp_enumcodepages</KEYWORD3>
-			<KEYWORD3>sp_enumcustomresolvers</KEYWORD3>
-			<KEYWORD3>sp_enumdsn</KEYWORD3>
-			<KEYWORD3>sp_enumfullsubscribers</KEYWORD3>
-			<KEYWORD3>sp_execute</KEYWORD3>
-			<KEYWORD3>sp_executesql</KEYWORD3>
-			<KEYWORD3>sp_expired_subscription_cleanup</KEYWORD3>
-			<KEYWORD3>sp_fkeys</KEYWORD3>
-			<KEYWORD3>sp_foreignkeys</KEYWORD3>
-			<KEYWORD3>sp_fulltext_catalog</KEYWORD3>
-			<KEYWORD3>sp_fulltext_column</KEYWORD3>
-			<KEYWORD3>sp_fulltext_database</KEYWORD3>
-			<KEYWORD3>sp_fulltext_service</KEYWORD3>
-			<KEYWORD3>sp_fulltext_table</KEYWORD3>
-			<KEYWORD3>sp_generatefilters</KEYWORD3>
-			<KEYWORD3>sp_get_distributor</KEYWORD3>
-			<KEYWORD3>sp_getbindtoken</KEYWORD3>
-			<KEYWORD3>sp_getmergedeletetype</KEYWORD3>
-			<KEYWORD3>sp_grant_publication_access</KEYWORD3>
-			<KEYWORD3>sp_grantdbaccess</KEYWORD3>
-			<KEYWORD3>sp_grantlogin</KEYWORD3>
-			<KEYWORD3>sp_help</KEYWORD3>
-			<KEYWORD3>sp_help_agent_default</KEYWORD3>
-			<KEYWORD3>sp_help_agent_parameter</KEYWORD3>
-			<KEYWORD3>sp_help_agent_profile</KEYWORD3>
-			<KEYWORD3>sp_help_alert</KEYWORD3>
-			<KEYWORD3>sp_help_category</KEYWORD3>
-			<KEYWORD3>sp_help_downloadlist</KEYWORD3>
-			<KEYWORD3>sp_help_fulltext_catalogs</KEYWORD3>
-			<KEYWORD3>sp_help_fulltext_catalogs_cursor</KEYWORD3>
-			<KEYWORD3>sp_help_fulltext_columns</KEYWORD3>
-			<KEYWORD3>sp_help_fulltext_columns_cursor</KEYWORD3>
-			<KEYWORD3>sp_help_fulltext_tables</KEYWORD3>
-			<KEYWORD3>sp_help_fulltext_tables_cursor</KEYWORD3>
-			<KEYWORD3>sp_help_job</KEYWORD3>
-			<KEYWORD3>sp_help_jobhistory</KEYWORD3>
-			<KEYWORD3>sp_help_jobschedule</KEYWORD3>
-			<KEYWORD3>sp_help_jobserver</KEYWORD3>
-			<KEYWORD3>sp_help_jobstep</KEYWORD3>
-			<KEYWORD3>sp_help_notification</KEYWORD3>
-			<KEYWORD3>sp_help_operator</KEYWORD3>
-			<KEYWORD3>sp_help_publication_access</KEYWORD3>
-			<KEYWORD3>sp_help_targetserver</KEYWORD3>
-			<KEYWORD3>sp_help_targetservergroup</KEYWORD3>
-			<KEYWORD3>sp_helparticle</KEYWORD3>
-			<KEYWORD3>sp_helparticlecolumns</KEYWORD3>
-			<KEYWORD3>sp_helpconstraint</KEYWORD3>
-			<KEYWORD3>sp_helpdb</KEYWORD3>
-			<KEYWORD3>sp_helpdbfixedrole</KEYWORD3>
-			<KEYWORD3>sp_helpdevice</KEYWORD3>
-			<KEYWORD3>sp_helpdistpublisher</KEYWORD3>
-			<KEYWORD3>sp_helpdistributiondb</KEYWORD3>
-			<KEYWORD3>sp_helpdistributor</KEYWORD3>
-			<KEYWORD3>sp_helpextendedproc</KEYWORD3>
-			<KEYWORD3>sp_helpfile</KEYWORD3>
-			<KEYWORD3>sp_helpfilegroup</KEYWORD3>
-			<KEYWORD3>sp_helpgroup</KEYWORD3>
-			<KEYWORD3>sp_helphistory</KEYWORD3>
-			<KEYWORD3>sp_helpindex</KEYWORD3>
-			<KEYWORD3>sp_helplanguage</KEYWORD3>
-			<KEYWORD3>sp_helplinkedsrvlogin</KEYWORD3>
-			<KEYWORD3>sp_helplogins</KEYWORD3>
-			<KEYWORD3>sp_helpmergearticle</KEYWORD3>
-			<KEYWORD3>sp_helpmergearticleconflicts</KEYWORD3>
-			<KEYWORD3>sp_helpmergeconflictrows</KEYWORD3>
-			<KEYWORD3>sp_helpmergedeleteconflictrows</KEYWORD3>
-			<KEYWORD3>sp_helpmergefilter</KEYWORD3>
-			<KEYWORD3>sp_helpmergepublication</KEYWORD3>
-			<KEYWORD3>sp_helpmergepullsubscription</KEYWORD3>
-			<KEYWORD3>sp_helpmergesubscription</KEYWORD3>
-			<KEYWORD3>sp_helpntgroup</KEYWORD3>
-			<KEYWORD3>sp_helppublication</KEYWORD3>
-			<KEYWORD3>sp_helppullsubscription</KEYWORD3>
-			<KEYWORD3>sp_helpremotelogin</KEYWORD3>
-			<KEYWORD3>sp_helpreplicationdboption</KEYWORD3>
-			<KEYWORD3>sp_helprole</KEYWORD3>
-			<KEYWORD3>sp_helprolemember</KEYWORD3>
-			<KEYWORD3>sp_helprotect</KEYWORD3>
-			<KEYWORD3>sp_helpserver</KEYWORD3>
-			<KEYWORD3>sp_helpsort</KEYWORD3>
-			<KEYWORD3>sp_helpsrvrole</KEYWORD3>
-			<KEYWORD3>sp_helpsrvrolemember</KEYWORD3>
-			<KEYWORD3>sp_helpsubscriberinfo</KEYWORD3>
-			<KEYWORD3>sp_helpsubscription</KEYWORD3>
-			<KEYWORD3>sp_helpsubscription_properties</KEYWORD3>
-			<KEYWORD3>sp_helptask</KEYWORD3>
-			<KEYWORD3>sp_helptext</KEYWORD3>
-			<KEYWORD3>sp_helptrigger</KEYWORD3>
-			<KEYWORD3>sp_helpuser</KEYWORD3>
-			<KEYWORD3>sp_indexes</KEYWORD3>
-			<KEYWORD3>sp_indexoption</KEYWORD3>
-			<KEYWORD3>sp_link_publication</KEYWORD3>
-			<KEYWORD3>sp_linkedservers</KEYWORD3>
-			<KEYWORD3>sp_lock</KEYWORD3>
-			<KEYWORD3>sp_makewebtask</KEYWORD3>
-			<KEYWORD3>sp_manage_jobs_by_login</KEYWORD3>
-			<KEYWORD3>sp_mergedummyupdate</KEYWORD3>
-			<KEYWORD3>sp_mergesubscription_cleanup</KEYWORD3>
-			<KEYWORD3>sp_monitor</KEYWORD3>
-			<KEYWORD3>sp_msx_defect</KEYWORD3>
-			<KEYWORD3>sp_msx_enlist</KEYWORD3>
-			<KEYWORD3>sp_OACreate</KEYWORD3>
-			<KEYWORD3>sp_OADestroy</KEYWORD3>
-			<KEYWORD3>sp_OAGetErrorInfo</KEYWORD3>
-			<KEYWORD3>sp_OAGetProperty</KEYWORD3>
-			<KEYWORD3>sp_OAMethod</KEYWORD3>
-			<KEYWORD3>sp_OASetProperty</KEYWORD3>
-			<KEYWORD3>sp_OAStop</KEYWORD3>
-			<KEYWORD3>sp_password</KEYWORD3>
-			<KEYWORD3>sp_pkeys</KEYWORD3>
-			<KEYWORD3>sp_post_msx_operation</KEYWORD3>
-			<KEYWORD3>sp_prepare</KEYWORD3>
-			<KEYWORD3>sp_primarykeys</KEYWORD3>
-			<KEYWORD3>sp_processmail</KEYWORD3>
-			<KEYWORD3>sp_procoption</KEYWORD3>
-			<KEYWORD3>sp_publication_validation</KEYWORD3>
-			<KEYWORD3>sp_purge_jobhistory</KEYWORD3>
-			<KEYWORD3>sp_purgehistory</KEYWORD3>
-			<KEYWORD3>sp_reassigntask</KEYWORD3>
-			<KEYWORD3>sp_recompile</KEYWORD3>
-			<KEYWORD3>sp_refreshsubscriptions</KEYWORD3>
-			<KEYWORD3>sp_refreshview</KEYWORD3>
-			<KEYWORD3>sp_reinitmergepullsubscription</KEYWORD3>
-			<KEYWORD3>sp_reinitmergesubscription</KEYWORD3>
-			<KEYWORD3>sp_reinitpullsubscription</KEYWORD3>
-			<KEYWORD3>sp_reinitsubscription</KEYWORD3>
-			<KEYWORD3>sp_remoteoption</KEYWORD3>
-			<KEYWORD3>sp_remove_job_from_targets</KEYWORD3>
-			<KEYWORD3>sp_removedbreplication</KEYWORD3>
-			<KEYWORD3>sp_rename</KEYWORD3>
-			<KEYWORD3>sp_renamedb</KEYWORD3>
-			<KEYWORD3>sp_replcmds</KEYWORD3>
-			<KEYWORD3>sp_replcounters</KEYWORD3>
-			<KEYWORD3>sp_repldone</KEYWORD3>
-			<KEYWORD3>sp_replflush</KEYWORD3>
-			<KEYWORD3>sp_replication_agent_checkup</KEYWORD3>
-			<KEYWORD3>sp_replicationdboption</KEYWORD3>
-			<KEYWORD3>sp_replsetoriginator</KEYWORD3>
-			<KEYWORD3>sp_replshowcmds</KEYWORD3>
-			<KEYWORD3>sp_repltrans</KEYWORD3>
-			<KEYWORD3>sp_reset_connection</KEYWORD3>
-			<KEYWORD3>sp_resync_targetserver</KEYWORD3>
-			<KEYWORD3>sp_revoke_publication_access</KEYWORD3>
-			<KEYWORD3>sp_revokedbaccess</KEYWORD3>
-			<KEYWORD3>sp_revokelogin</KEYWORD3>
-			<KEYWORD3>sp_runwebtask</KEYWORD3>
-			<KEYWORD3>sp_script_synctran_commands</KEYWORD3>
-			<KEYWORD3>sp_scriptdelproc</KEYWORD3>
-			<KEYWORD3>sp_scriptinsproc</KEYWORD3>
-			<KEYWORD3>sp_scriptmappedupdproc</KEYWORD3>
-			<KEYWORD3>sp_scriptupdproc</KEYWORD3>
-			<KEYWORD3>sp_sdidebug</KEYWORD3>
-			<KEYWORD3>sp_server_info</KEYWORD3>
-			<KEYWORD3>sp_serveroption</KEYWORD3>
-			<KEYWORD3>sp_serveroption</KEYWORD3>
-			<KEYWORD3>sp_setapprole</KEYWORD3>
-			<KEYWORD3>sp_setnetname</KEYWORD3>
-			<KEYWORD3>sp_spaceused</KEYWORD3>
-			<KEYWORD3>sp_special_columns</KEYWORD3>
-			<KEYWORD3>sp_sproc_columns</KEYWORD3>
-			<KEYWORD3>sp_srvrolepermission</KEYWORD3>
-			<KEYWORD3>sp_start_job</KEYWORD3>
-			<KEYWORD3>sp_statistics</KEYWORD3>
-			<KEYWORD3>sp_stop_job</KEYWORD3>
-			<KEYWORD3>sp_stored_procedures</KEYWORD3>
-			<KEYWORD3>sp_subscription_cleanup</KEYWORD3>
-			<KEYWORD3>sp_table_privileges</KEYWORD3>
-			<KEYWORD3>sp_table_privileges_ex</KEYWORD3>
-			<KEYWORD3>sp_table_validation</KEYWORD3>
-			<KEYWORD3>sp_tableoption</KEYWORD3>
-			<KEYWORD3>sp_tables</KEYWORD3>
-			<KEYWORD3>sp_tables_ex</KEYWORD3>
-			<KEYWORD3>sp_unbindefault</KEYWORD3>
-			<KEYWORD3>sp_unbindrule</KEYWORD3>
-			<KEYWORD3>sp_unprepare</KEYWORD3>
-			<KEYWORD3>sp_update_agent_profile</KEYWORD3>
-			<KEYWORD3>sp_update_alert</KEYWORD3>
-			<KEYWORD3>sp_update_category</KEYWORD3>
-			<KEYWORD3>sp_update_job</KEYWORD3>
-			<KEYWORD3>sp_update_jobschedule</KEYWORD3>
-			<KEYWORD3>sp_update_jobstep</KEYWORD3>
-			<KEYWORD3>sp_update_notification</KEYWORD3>
-			<KEYWORD3>sp_update_operator</KEYWORD3>
-			<KEYWORD3>sp_update_targetservergroup</KEYWORD3>
-			<KEYWORD3>sp_updatestats</KEYWORD3>
-			<KEYWORD3>sp_updatetask</KEYWORD3>
-			<KEYWORD3>sp_validatelogins</KEYWORD3>
-			<KEYWORD3>sp_validname</KEYWORD3>
-			<KEYWORD3>sp_who</KEYWORD3>
-			<KEYWORD3>xp_cmdshell</KEYWORD3>
-			<KEYWORD3>xp_deletemail</KEYWORD3>
-			<KEYWORD3>xp_enumgroups</KEYWORD3>
-			<KEYWORD3>xp_findnextmsg</KEYWORD3>
-			<KEYWORD3>xp_findnextmsg</KEYWORD3>
-			<KEYWORD3>xp_grantlogin</KEYWORD3>
-			<KEYWORD3>xp_logevent</KEYWORD3>
-			<KEYWORD3>xp_loginconfig</KEYWORD3>
-			<KEYWORD3>xp_logininfo</KEYWORD3>
-			<KEYWORD3>xp_msver</KEYWORD3>
-			<KEYWORD3>xp_readmail</KEYWORD3>
-			<KEYWORD3>xp_revokelogin</KEYWORD3>
-			<KEYWORD3>xp_sendmail</KEYWORD3>
-			<KEYWORD3>xp_sprintf</KEYWORD3>
-			<KEYWORD3>xp_sqlinventory</KEYWORD3>
-			<KEYWORD3>xp_sqlmaint</KEYWORD3>
-			<KEYWORD3>xp_sqltrace</KEYWORD3>
-			<KEYWORD3>xp_sscanf</KEYWORD3>
-			<KEYWORD3>xp_startmail</KEYWORD3>
-			<KEYWORD3>xp_stopmail</KEYWORD3>
-			<KEYWORD3>xp_trace_addnewqueue</KEYWORD3>
-			<KEYWORD3>xp_trace_deletequeuedefinition</KEYWORD3>
-			<KEYWORD3>xp_trace_destroyqueue</KEYWORD3>
-			<KEYWORD3>xp_trace_enumqueuedefname</KEYWORD3>
-			<KEYWORD3>xp_trace_enumqueuehandles</KEYWORD3>
-			<KEYWORD3>xp_trace_eventclassrequired</KEYWORD3>
-			<KEYWORD3>xp_trace_flushqueryhistory</KEYWORD3>
-			<KEYWORD3>xp_trace_generate_event</KEYWORD3>
-			<KEYWORD3>xp_trace_getappfilter</KEYWORD3>
-			<KEYWORD3>xp_trace_getconnectionidfilter</KEYWORD3>
-			<KEYWORD3>xp_trace_getcpufilter</KEYWORD3>
-			<KEYWORD3>xp_trace_getdbidfilter</KEYWORD3>
-			<KEYWORD3>xp_trace_getdurationfilter</KEYWORD3>
-			<KEYWORD3>xp_trace_geteventfilter</KEYWORD3>
-			<KEYWORD3>xp_trace_geteventnames</KEYWORD3>
-			<KEYWORD3>xp_trace_getevents</KEYWORD3>
-			<KEYWORD3>xp_trace_gethostfilter</KEYWORD3>
-			<KEYWORD3>xp_trace_gethpidfilter</KEYWORD3>
-			<KEYWORD3>xp_trace_getindidfilter</KEYWORD3>
-			<KEYWORD3>xp_trace_getntdmfilter</KEYWORD3>
-			<KEYWORD3>xp_trace_getntnmfilter</KEYWORD3>
-			<KEYWORD3>xp_trace_getobjidfilter</KEYWORD3>
-			<KEYWORD3>xp_trace_getqueueautostart</KEYWORD3>
-			<KEYWORD3>xp_trace_getqueuedestination</KEYWORD3>
-			<KEYWORD3>xp_trace_getqueueproperties</KEYWORD3>
-			<KEYWORD3>xp_trace_getreadfilter</KEYWORD3>
-			<KEYWORD3>xp_trace_getserverfilter</KEYWORD3>
-			<KEYWORD3>xp_trace_getseverityfilter</KEYWORD3>
-			<KEYWORD3>xp_trace_getspidfilter</KEYWORD3>
-			<KEYWORD3>xp_trace_getsysobjectsfilter</KEYWORD3>
-			<KEYWORD3>xp_trace_gettextfilter</KEYWORD3>
-			<KEYWORD3>xp_trace_getuserfilter</KEYWORD3>
-			<KEYWORD3>xp_trace_getwritefilter</KEYWORD3>
-			<KEYWORD3>xp_trace_loadqueuedefinition</KEYWORD3>
-			<KEYWORD3>xp_trace_pausequeue</KEYWORD3>
-			<KEYWORD3>xp_trace_restartqueue</KEYWORD3>
-			<KEYWORD3>xp_trace_savequeuedefinition</KEYWORD3>
-			<KEYWORD3>xp_trace_setappfilter</KEYWORD3>
-			<KEYWORD3>xp_trace_setconnectionidfilter</KEYWORD3>
-			<KEYWORD3>xp_trace_setcpufilter</KEYWORD3>
-			<KEYWORD3>xp_trace_setdbidfilter</KEYWORD3>
-			<KEYWORD3>xp_trace_setdurationfilter</KEYWORD3>
-			<KEYWORD3>xp_trace_seteventclassrequired</KEYWORD3>
-			<KEYWORD3>xp_trace_seteventfilter</KEYWORD3>
-			<KEYWORD3>xp_trace_sethostfilter</KEYWORD3>
-			<KEYWORD3>xp_trace_sethpidfilter</KEYWORD3>
-			<KEYWORD3>xp_trace_setindidfilter</KEYWORD3>
-			<KEYWORD3>xp_trace_setntdmfilter</KEYWORD3>
-			<KEYWORD3>xp_trace_setntnmfilter</KEYWORD3>
-			<KEYWORD3>xp_trace_setobjidfilter</KEYWORD3>
-			<KEYWORD3>xp_trace_setqueryhistory</KEYWORD3>
-			<KEYWORD3>xp_trace_setqueueautostart</KEYWORD3>
-			<KEYWORD3>xp_trace_setqueuecreateinfo</KEYWORD3>
-			<KEYWORD3>xp_trace_setqueuedestination</KEYWORD3>
-			<KEYWORD3>xp_trace_setreadfilter</KEYWORD3>
-			<KEYWORD3>xp_trace_setserverfilter</KEYWORD3>
-			<KEYWORD3>xp_trace_setseverityfilter</KEYWORD3>
-			<KEYWORD3>xp_trace_setspidfilter</KEYWORD3>
-			<KEYWORD3>xp_trace_setsysobjectsfilter</KEYWORD3>
-			<KEYWORD3>xp_trace_settextfilter</KEYWORD3>
-			<KEYWORD3>xp_trace_setuserfilter</KEYWORD3>
-			<KEYWORD3>xp_trace_setwritefilter</KEYWORD3>
-			<KEYWORD3>fn_helpcollations</KEYWORD3>
-			<KEYWORD3>fn_servershareddrives</KEYWORD3>
-			<KEYWORD3>fn_virtualfilestats</KEYWORD3>
-
-			<!-- SQL Server 7.0 system tables -->
-			<KEYWORD3>backupfile</KEYWORD3>
-			<KEYWORD3>backupmediafamily</KEYWORD3>
-			<KEYWORD3>backupmediaset</KEYWORD3>
-			<KEYWORD3>backupset</KEYWORD3>
-			<KEYWORD3>MSagent_parameters</KEYWORD3>
-			<KEYWORD3>MSagent_profiles</KEYWORD3>
-			<KEYWORD3>MSarticles</KEYWORD3>
-			<KEYWORD3>MSdistpublishers</KEYWORD3>
-			<KEYWORD3>MSdistribution_agents</KEYWORD3>
-			<KEYWORD3>MSdistribution_history</KEYWORD3>
-			<KEYWORD3>MSdistributiondbs</KEYWORD3>
-			<KEYWORD3>MSdistributor</KEYWORD3>
-			<KEYWORD3>MSlogreader_agents</KEYWORD3>
-			<KEYWORD3>MSlogreader_history</KEYWORD3>
-			<KEYWORD3>MSmerge_agents</KEYWORD3>
-			<KEYWORD3>MSmerge_contents</KEYWORD3>
-			<KEYWORD3>MSmerge_delete_conflicts</KEYWORD3>
-			<KEYWORD3>MSmerge_genhistory</KEYWORD3>
-			<KEYWORD3>MSmerge_history</KEYWORD3>
-			<KEYWORD3>MSmerge_replinfo</KEYWORD3>
-			<KEYWORD3>MSmerge_subscriptions</KEYWORD3>
-			<KEYWORD3>MSmerge_tombstone</KEYWORD3>
-			<KEYWORD3>MSpublication_access</KEYWORD3>
-			<KEYWORD3>Mspublications</KEYWORD3>
-			<KEYWORD3>Mspublisher_databases</KEYWORD3>
-			<KEYWORD3>MSrepl_commands</KEYWORD3>
-			<KEYWORD3>MSrepl_errors</KEYWORD3>
-			<KEYWORD3>Msrepl_originators</KEYWORD3>
-			<KEYWORD3>MSrepl_transactions</KEYWORD3>
-			<KEYWORD3>MSrepl_version</KEYWORD3>
-			<KEYWORD3>MSreplication_objects</KEYWORD3>
-			<KEYWORD3>MSreplication_subscriptions</KEYWORD3>
-			<KEYWORD3>MSsnapshot_agents</KEYWORD3>
-			<KEYWORD3>MSsnapshot_history</KEYWORD3>
-			<KEYWORD3>MSsubscriber_info</KEYWORD3>
-			<KEYWORD3>MSsubscriber_schedule</KEYWORD3>
-			<KEYWORD3>MSsubscription_properties</KEYWORD3>
-			<KEYWORD3>MSsubscriptions</KEYWORD3>
-			<KEYWORD3>restorefile</KEYWORD3>
-			<KEYWORD3>restorefilegroup</KEYWORD3>
-			<KEYWORD3>restorehistory</KEYWORD3>
-			<KEYWORD3>sysalerts</KEYWORD3>
-			<KEYWORD3>sysallocations</KEYWORD3>
-			<KEYWORD3>sysaltfiles</KEYWORD3>
-			<KEYWORD3>sysarticles</KEYWORD3>
-			<KEYWORD3>sysarticleupdates</KEYWORD3>
-			<KEYWORD3>syscacheobjects</KEYWORD3>
-			<KEYWORD3>syscategories</KEYWORD3>
-			<KEYWORD3>syscharsets</KEYWORD3>
-			<KEYWORD3>syscolumns</KEYWORD3>
-			<KEYWORD3>syscomments</KEYWORD3>
-			<KEYWORD3>sysconfigures</KEYWORD3>
-			<KEYWORD3>sysconstraints</KEYWORD3>
-			<KEYWORD3>syscurconfigs</KEYWORD3>
-			<KEYWORD3>sysdatabases</KEYWORD3>
-			<KEYWORD3>sysdatabases</KEYWORD3>
-			<KEYWORD3>sysdepends</KEYWORD3>
-			<KEYWORD3>sysdevices</KEYWORD3>
-			<KEYWORD3>sysdownloadlist</KEYWORD3>
-			<KEYWORD3>sysfilegroups</KEYWORD3>
-			<KEYWORD3>sysfiles</KEYWORD3>
-			<KEYWORD3>sysforeignkeys</KEYWORD3>
-			<KEYWORD3>sysfulltextcatalogs</KEYWORD3>
-			<KEYWORD3>sysindexes</KEYWORD3>
-			<KEYWORD3>sysindexkeys</KEYWORD3>
-			<KEYWORD3>sysjobhistory</KEYWORD3>
-			<KEYWORD3>sysjobs</KEYWORD3>
-			<KEYWORD3>sysjobschedules</KEYWORD3>
-			<KEYWORD3>sysjobservers</KEYWORD3>
-			<KEYWORD3>sysjobsteps</KEYWORD3>
-			<KEYWORD3>syslanguages</KEYWORD3>
-			<KEYWORD3>syslockinfo</KEYWORD3>
-			<KEYWORD3>syslogins</KEYWORD3>
-			<KEYWORD3>sysmembers</KEYWORD3>
-			<KEYWORD3>sysmergearticles</KEYWORD3>
-			<KEYWORD3>sysmergepublications</KEYWORD3>
-			<KEYWORD3>sysmergeschemachange</KEYWORD3>
-			<KEYWORD3>sysmergesubscriptions</KEYWORD3>
-			<KEYWORD3>sysmergesubsetfilters</KEYWORD3>
-			<KEYWORD3>sysmessages</KEYWORD3>
-			<KEYWORD3>sysnotifications</KEYWORD3>
-			<KEYWORD3>sysobjects</KEYWORD3>
-			<KEYWORD3>sysobjects</KEYWORD3>
-			<KEYWORD3>sysoledbusers</KEYWORD3>
-			<KEYWORD3>sysoperators</KEYWORD3>
-			<KEYWORD3>sysperfinfo</KEYWORD3>
-			<KEYWORD3>syspermissions</KEYWORD3>
-			<KEYWORD3>sysprocesses</KEYWORD3>
-			<KEYWORD3>sysprotects</KEYWORD3>
-			<KEYWORD3>syspublications</KEYWORD3>
-			<KEYWORD3>sysreferences</KEYWORD3>
-			<KEYWORD3>sysremotelogins</KEYWORD3>
-			<KEYWORD3>sysreplicationalerts</KEYWORD3>
-			<KEYWORD3>sysservers</KEYWORD3>
-			<KEYWORD3>sysservers</KEYWORD3>
-			<KEYWORD3>syssubscriptions</KEYWORD3>
-			<KEYWORD3>systargetservergroupmembers</KEYWORD3>
-			<KEYWORD3>systargetservergroups</KEYWORD3>
-			<KEYWORD3>systargetservers</KEYWORD3>
-			<KEYWORD3>systaskids</KEYWORD3>
-			<KEYWORD3>systypes</KEYWORD3>
-			<KEYWORD3>sysusers</KEYWORD3>
-		</KEYWORDS>
-	</RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/tthtml.xml b/qpython/src/main/assets/syntax/tthtml.xml
deleted file mode 100644
index 11cece3c..00000000
--- a/qpython/src/main/assets/syntax/tthtml.xml
+++ /dev/null
@@ -1,269 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-<MODE>
-	<!--
-		Edit mode for the Perl Template Toolkit
-		http://template-toolkit.org/index.html
-		Made by Krassimir Berov: k.berov@gmail.com
-	-->
-	<PROPS>
-		<PROPERTY NAME="commentStart" VALUE="&lt;!--" />
-		<PROPERTY NAME="commentEnd" VALUE="--&gt;" />
-		<PROPERTY NAME="lineComment" VALUE="#" />
-		<PROPERTY NAME="wordBreakChars" VALUE=",+-=&lt;&gt;/?^&amp;*" />
-
-		<!-- Auto indent -->
-		<PROPERTY NAME="indentOpenBrackets" VALUE="{" />
-		<PROPERTY NAME="indentCloseBrackets" VALUE="}" />
-		<PROPERTY NAME="indentOpenBrackets" VALUE="[" />
-		<PROPERTY NAME="indentCloseBrackets" VALUE="]" />
-		<PROPERTY NAME="unalignedOpenBrackets" VALUE="(" />
-		<PROPERTY NAME="unalignedCloseBrackets" VALUE=")" />
-		<PROPERTY NAME="lineUpClosingBracket" VALUE="true" />
-		<PROPERTY NAME="indentNextLine" VALUE="(FOREACH|FOR|WHILE|IF|ELSIF|ELSE|UNLESS|SWITCH|CASE|TRY|CATCH)(\s.*?)?;" />
-	</PROPS>
-
-	<!-- ESCAPE is not exactly right but it is needed to correctly
-	     handle JavaScript in on* parameters -->
-	<RULES SET="TAGS" DEFAULT="MARKUP">
-		<SPAN TYPE="LITERAL1" ESCAPE="\">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-
-		<SPAN TYPE="LITERAL1" ESCAPE="\">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-		<SEQ TYPE="OPERATOR">=</SEQ><!-- give priority to TT -->
-
-	</RULES>
-
-	<RULES SET="JAVASCRIPT" DEFAULT="MARKUP" IGNORE_CASE="TRUE">
-		<SEQ TYPE="MARKUP" DELEGATE="javascript::MAIN">&gt;</SEQ>
-		<!-- handle <SCRIPT SRC="..."> properly -->
-		<SEQ TYPE="MARKUP" DELEGATE="html::MAIN">SRC=</SEQ>
-	</RULES>
-
-	<RULES SET="CSS" DEFAULT="MARKUP">
-		<SEQ TYPE="MARKUP" DELEGATE="css::MAIN">&gt;</SEQ>
-	</RULES>
-	<RULES IGNORE_CASE="TRUE">
-		<!-- SGML comment -->
-		<SPAN TYPE="COMMENT1">
-			<BEGIN>&lt;!--</BEGIN>
-			<END>--&gt;</END>
-		</SPAN>
-
-		<!-- JavaScript -->
-		<SPAN TYPE="MARKUP" DELEGATE="JAVASCRIPT">
-			<BEGIN>&lt;SCRIPT</BEGIN>
-			<END>&lt;/SCRIPT&gt;</END>
-		</SPAN>
-
-		<!-- stylesheet -->
-		<SPAN TYPE="MARKUP" DELEGATE="CSS">
-			<BEGIN>&lt;STYLE</BEGIN>
-			<END>&lt;/STYLE&gt;</END>
-		</SPAN>
-
-		<!-- DTD instructions -->
-		<SPAN TYPE="KEYWORD2" DELEGATE="xml::DTD-TAGS">
-			<BEGIN>&lt;!</BEGIN>
-			<END>&gt;</END>
-		</SPAN>
-
-		<!-- markup tags -->
-		<SPAN TYPE="MARKUP" DELEGATE="TAGS">
-			<BEGIN>&lt;</BEGIN>
-			<END>&gt;</END>
-		</SPAN>
-
-		<!-- SGML entities -->
-		<SPAN TYPE="LITERAL2" NO_WORD_BREAK="TRUE">
-			<BEGIN>&amp;</BEGIN>
-			<END>;</END>
-		</SPAN>
-		<SPAN TYPE="COMMENT2">
-			<BEGIN>[%#</BEGIN>
-			<END>%]</END>
-		</SPAN>
-		<SPAN_REGEXP DELEGATE="perl::MAIN" HASH_CHAR="[%">
-			<BEGIN>\[%\s*?PERL\s*?%\]</BEGIN>
-			<END>\[%\s*?END\s*?%\]</END>
-		</SPAN_REGEXP>
-
-		<SPAN TYPE="LITERAL3" DELEGATE="TT">
-			<BEGIN>[%</BEGIN>
-			<END>%]</END>
-		</SPAN>
-	</RULES>
-	<RULES SET="TT"
-			IGNORE_CASE="FALSE"
-			HIGHLIGHT_DIGITS="TRUE"
-			DIGIT_RE="(0x[\p{XDigit}]+[lL]?|[\p{Digit}]+(e[\p{Digit}]*)?[lLdDfF]?)">
-
-		<!-- example: [% users.${me.id}.name %] -->
-		<SPAN TYPE="KEYWORD2" NO_LINE_BREAK="TRUE" DELEGATE="perl::VARIABLE">
-			<BEGIN>${</BEGIN>
-			<END>}</END>
-		</SPAN>
-		<!-- Scalar variables -->
-		<SEQ_REGEXP HASH_CHAR="$" TYPE="KEYWORD2">\$#?[\w:]+</SEQ_REGEXP>
-		<!-- Scalar variables
-		<SEQ_REGEXP ->ADD HASH_CHARS here if uncommenting<- TYPE="KEYWORD2">\s[a-z_0-9]+\s</SEQ_REGEXP> -->
-		<!-- Compound Variables -->
-		<MARK_PREVIOUS TYPE="KEYWORD4" MATCH_TYPE="CONTEXT">.</MARK_PREVIOUS>
-		<MARK_PREVIOUS TYPE="FUNCTION" MATCH_TYPE="CONTEXT">(</MARK_PREVIOUS>
-		<SPAN TYPE="LITERAL1" NO_LINE_BREAK="TRUE">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-
-		<SPAN TYPE="LITERAL1" NO_LINE_BREAK="TRUE">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-
-		<SEQ TYPE="OPERATOR">=</SEQ>
-		<SEQ TYPE="OPERATOR">!</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;=</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;=</SEQ>
-		<SEQ TYPE="OPERATOR">+</SEQ>
-		<SEQ TYPE="OPERATOR">-</SEQ>
-		<SEQ TYPE="OPERATOR">/</SEQ>
-		<SEQ TYPE="OPERATOR">*</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;</SEQ>
-		<SEQ TYPE="OPERATOR">%</SEQ>
-		<SEQ TYPE="OPERATOR">&amp;</SEQ>
-		<SEQ TYPE="OPERATOR">|</SEQ>
-		<SEQ TYPE="OPERATOR">^</SEQ>
-		<SEQ TYPE="OPERATOR">~</SEQ>
-		<SEQ TYPE="OPERATOR">.</SEQ>
-		<SEQ TYPE="OPERATOR">}</SEQ>
-		<SEQ TYPE="OPERATOR">{</SEQ>
-		<SEQ TYPE="OPERATOR">,</SEQ>
-		<SEQ TYPE="OPERATOR">;</SEQ>
-		<SEQ TYPE="OPERATOR">]</SEQ>
-		<SEQ TYPE="OPERATOR">[</SEQ>
-		<SEQ TYPE="OPERATOR">?</SEQ>
-		<KEYWORDS>
-			<!-- Template directives -->
-			<KEYWORD1>SET</KEYWORD1>
-			<KEYWORD1>GET</KEYWORD1>
-			<KEYWORD1>CALL</KEYWORD1>
-			<KEYWORD1>DEFAULT</KEYWORD1>
-			<KEYWORD1>IF</KEYWORD1>
-			<KEYWORD1>ELSIF</KEYWORD1>
-			<KEYWORD1>ELSE</KEYWORD1>
-			<KEYWORD1>UNLESS</KEYWORD1>
-			<KEYWORD1>LAST</KEYWORD1>
-			<KEYWORD1>NEXT</KEYWORD1>
-			<KEYWORD1>FOR</KEYWORD1>
-			<KEYWORD1>FOREACH</KEYWORD1>
-			<KEYWORD1>WHILE</KEYWORD1>
-			<KEYWORD1>SWITCH</KEYWORD1>
-			<KEYWORD1>CASE</KEYWORD1>
-			<KEYWORD1>PROCESS</KEYWORD1>
-			<KEYWORD1>INCLUDE</KEYWORD1>
-			<KEYWORD1>INSERT</KEYWORD1>
-			<KEYWORD1>WRAPPER</KEYWORD1>
-			<KEYWORD1>BLOCK</KEYWORD1>
-			<KEYWORD1>MACRO</KEYWORD1>
-			<KEYWORD1>END</KEYWORD1>
-			<KEYWORD1>USE</KEYWORD1>
-			<KEYWORD1>IN</KEYWORD1>
-			<KEYWORD1>FILTER</KEYWORD1>
-			<KEYWORD1>TRY</KEYWORD1>
-			<KEYWORD1>THROW</KEYWORD1>
-			<KEYWORD1>CATCH</KEYWORD1>
-			<KEYWORD1>FINAL</KEYWORD1>
-			<KEYWORD1>META</KEYWORD1>
-			<KEYWORD1>TAGS</KEYWORD1>
-			<KEYWORD1>DEBUG</KEYWORD1>
-			<KEYWORD1>PERL</KEYWORD1>
-			<!-- Compile Time Constant Folding -->
-			<KEYWORD1>constants</KEYWORD1>
-			<!-- Special Variables -->
-			<KEYWORD2>template</KEYWORD2>
-			<KEYWORD2>component</KEYWORD2>
-			<KEYWORD2>loop</KEYWORD2>
-			<KEYWORD2>error</KEYWORD2>
-			<KEYWORD2>content</KEYWORD2>
-
-			<!-- VMethods -->
-			<!-- Scalar Virtual Methods -->
-			<KEYWORD3>defined</KEYWORD3>
-			<KEYWORD3>length</KEYWORD3>
-			<KEYWORD3>repeat</KEYWORD3>
-			<KEYWORD3>replace</KEYWORD3>
-			<KEYWORD3>match</KEYWORD3>
-			<KEYWORD3>search</KEYWORD3>
-			<KEYWORD3>split</KEYWORD3>
-			<KEYWORD3>chunk</KEYWORD3>
-			<KEYWORD3>list</KEYWORD3>
-			<KEYWORD3>hash</KEYWORD3>
-			<KEYWORD3>size</KEYWORD3>
-
-			<!-- Hash Virtual Methods -->
-			<KEYWORD3>keys</KEYWORD3>
-			<KEYWORD3>values</KEYWORD3>
-			<KEYWORD3>each</KEYWORD3>
-			<KEYWORD3>sort</KEYWORD3>
-			<KEYWORD3>nsort</KEYWORD3>
-			<KEYWORD3>import</KEYWORD3>
-			<KEYWORD3>defined</KEYWORD3>
-			<KEYWORD3>exists</KEYWORD3>
-			<KEYWORD3>item</KEYWORD3>
-
-			<!-- List Virtual Methods -->
-			<KEYWORD3>first</KEYWORD3>
-			<KEYWORD3>last</KEYWORD3>
-			<KEYWORD3>max</KEYWORD3>
-			<KEYWORD3>reverse</KEYWORD3>
-			<KEYWORD3>join</KEYWORD3>
-			<KEYWORD3>grep</KEYWORD3>
-			<KEYWORD3>unshift</KEYWORD3>
-			<KEYWORD3>push</KEYWORD3>
-			<KEYWORD3>shift</KEYWORD3>
-			<KEYWORD3>pop</KEYWORD3>
-			<KEYWORD3>unique</KEYWORD3>
-			<KEYWORD3>merge</KEYWORD3>
-			<KEYWORD3>slice</KEYWORD3>
-			<KEYWORD3>splice</KEYWORD3>
-			<KEYWORD3>count</KEYWORD3>
-
-			<!-- Standard filters -->
-			<FUNCTION>format</FUNCTION>
-			<FUNCTION>upper</FUNCTION>
-			<FUNCTION>lower</FUNCTION>
-			<FUNCTION>ucfirst</FUNCTION>
-			<FUNCTION>lcfirst</FUNCTION>
-			<FUNCTION>trim</FUNCTION>
-			<FUNCTION>collapse</FUNCTION>
-			<FUNCTION>html</FUNCTION>
-			<FUNCTION>html_entity</FUNCTION>
-			<FUNCTION>html_para</FUNCTION>
-			<FUNCTION>html_break</FUNCTION>
-			<FUNCTION>html_para_break</FUNCTION>
-			<FUNCTION>html_line_break</FUNCTION>
-			<FUNCTION>uri</FUNCTION>
-			<FUNCTION>url</FUNCTION>
-			<FUNCTION>indent</FUNCTION>
-			<FUNCTION>truncate</FUNCTION>
-			<FUNCTION>repeat</FUNCTION>
-			<FUNCTION>remove</FUNCTION>
-			<FUNCTION>replace</FUNCTION>
-			<FUNCTION>redirect</FUNCTION>
-			<FUNCTION>eval</FUNCTION>
-			<FUNCTION>evaltt</FUNCTION>
-			<FUNCTION>perl</FUNCTION>
-			<FUNCTION>evalperl</FUNCTION>
-			<FUNCTION>stdout</FUNCTION>
-			<FUNCTION>stderr</FUNCTION>
-			<FUNCTION>null</FUNCTION>
-			<FUNCTION>latex</FUNCTION>
-		</KEYWORDS>
-	</RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/turbobasic.xml b/qpython/src/main/assets/syntax/turbobasic.xml
deleted file mode 100644
index 7e895f81..00000000
--- a/qpython/src/main/assets/syntax/turbobasic.xml
+++ /dev/null
@@ -1,368 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-<!-- Turbobasic, 3/25/09 by Ben Dutcher  -->
-<!-- The Turbo Basic compiler was a Borland product.  It's way old.  My manual dates from 1987 -->
-<!-- The categories here are those in the manual, except where I couldn't get them to work.  -->
-
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="lineComment" VALUE="'" />
-	</PROPS>
-
-	<RULES IGNORE_CASE="TRUE" HIGHLIGHT_DIGITS="TRUE" ESCAPE="\">
-		<SPAN TYPE="LITERAL1" NO_LINE_BREAK="TRUE">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-
-		<!-- TurboBasic will use either symbol to start a comment -->
-		<EOL_SPAN TYPE="COMMENT1">'</EOL_SPAN>
-		<EOL_SPAN TYPE="COMMENT1">rem </EOL_SPAN>
-
-
-		<!-- Comparison operators -->
-		<SEQ TYPE="OPERATOR">&lt;</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;=</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;=</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">=</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;&gt;</SEQ>
-
-		<!-- indicate a named constant like %true.   Remember you need to define them once only.   Integers only.  -->
-		<SPAN_REGEXP HASH_CHAR="%" TYPE="MARKUP" AT_WORD_START="TRUE" NO_WORD_BREAK="TRUE">
-			<BEGIN>%</BEGIN>
-			<END>\S*</END>
-		</SPAN_REGEXP>
-
-		<!-- Arithmetic operators -->
-		<SEQ TYPE="OPERATOR">+</SEQ>
-		<SEQ TYPE="OPERATOR">-</SEQ>
-		<SEQ TYPE="OPERATOR">*</SEQ>
-		<SEQ TYPE="OPERATOR">/</SEQ>
-		<SEQ TYPE="OPERATOR">\</SEQ>
-		<SEQ TYPE="OPERATOR">^</SEQ>
-		<SEQ TYPE="OPERATOR">mod</SEQ>
-
-		<!-- File number marker like #3, but which also is used to indicate a double-precison variable like FineMeasuremet# -->
-		<SEQ TYPE="KEYWORD1" AT_WORD_START="TRUE">#</SEQ>
-
-		<!-- to handle "def FNmine(), etc.:  -->
-		<SEQ TYPE="KEYWORD1">def FN</SEQ>
-
-		<!-- rather than enter option and base as separate keywords, since they are used only in this combination -->
-		<SEQ TYPE="KEYWORD1">option base</SEQ>
-
-		<!--		<SEQ TYPE="NULL">_</SEQ>-->
-		<!-- Instruction separator -->
-		<MARK_PREVIOUS TYPE="LABEL" MATCH_TYPE="OPERATOR"
-			AT_LINE_START="TRUE">:</MARK_PREVIOUS>
-
-		<KEYWORDS>
-
-		<!-- Weirdly enough, Turbo Basic doesn't support the words TRUE or FALSE
-			so I always define them in the code. with %false = 0: %true = not %false -->
-
-		<!-- occasional test word.  It's not in the manual, but that would have been fun.  -->
-		<KEYWORD3>notalotta</KEYWORD3>
-
-			<!-- Listed as keywords, but also described as unsupported:
-			list
-			usr, usr0-usr9
-			Just listed as unsupported:
-			auto, delete, edit, load, new, renum, save, cont, merge, motor
-			-->
-		<!-- Logical operators -->
-		<KEYWORD3>and</KEYWORD3>
-		<KEYWORD3>eqv</KEYWORD3>
-		<KEYWORD3>imp</KEYWORD3>
-		<KEYWORD3>not</KEYWORD3>
-		<KEYWORD3>or</KEYWORD3>
-		<KEYWORD3>xor</KEYWORD3>
-
-			<!-- chaining -->
-			<KEYWORD1>chain</KEYWORD1>
-			<KEYWORD1>common</KEYWORD1>
-			<KEYWORD1>run</KEYWORD1>
-
-			<!-- compiler control -->
-			<KEYWORD1>dim</KEYWORD1>
-			<KEYWORD1>lbound</KEYWORD1>
-			<KEYWORD1>let</KEYWORD1>
-			<KEYWORD1>local</KEYWORD1>
-			<!-- KEYWORD1>option base</KEYWORD1 -->
-			<KEYWORD1>rem</KEYWORD1>
-			<KEYWORD1>shared</KEYWORD1>
-			<KEYWORD1>static</KEYWORD1>
-			<KEYWORD1>tron</KEYWORD1>
-			<KEYWORD1>troff</KEYWORD1>
-			<KEYWORD1>ubound</KEYWORD1>
-
-			<!-- devices -->
-			<!-- KEYWORD1>open com</KEYWORD1 -->
-			<KEYWORD1>com</KEYWORD1>
-			<KEYWORD1>inp</KEYWORD1>
-			<KEYWORD1>ioctl$</KEYWORD1>
-			<KEYWORD1>ioctl</KEYWORD1>
-			<KEYWORD1>out</KEYWORD1>
-
-			<!-- DOS -->
-			<KEYWORD1>chdir</KEYWORD1>
-			<KEYWORD1>command$</KEYWORD1>
-			<KEYWORD1>date$</KEYWORD1>
-			<KEYWORD1>environ$</KEYWORD1>
-			<KEYWORD1>environ</KEYWORD1>
-			<KEYWORD1>kill</KEYWORD1>
-			<KEYWORD1>mkdir</KEYWORD1>
-			<KEYWORD1>rmdir</KEYWORD1>
-			<KEYWORD1>shell</KEYWORD1>
-			<KEYWORD1>system</KEYWORD1>
-			<KEYWORD1>time$</KEYWORD1>
-
-			<!-- Error Handling -->
-			<KEYWORD1>eradr</KEYWORD1>
-			<KEYWORD1>erdev</KEYWORD1>
-			<KEYWORD1>erdev$</KEYWORD1>
-			<KEYWORD1>erl</KEYWORD1>
-			<KEYWORD1>error</KEYWORD1>
-			<KEYWORD1>err</KEYWORD1>
-
-			<!-- files -->
-			<KEYWORD1>bload</KEYWORD1>
-			<KEYWORD1>bsave</KEYWORD1>
-			<KEYWORD1>close</KEYWORD1>
-			<KEYWORD1>eof</KEYWORD1>
-			<KEYWORD1>field</KEYWORD1>
-			<KEYWORD1>files</KEYWORD1>
-			<KEYWORD1>get</KEYWORD1>
-			<!-- KEYWORD1>line input #</KEYWORD1 -->
-			<KEYWORD1>loc</KEYWORD1>
-			<KEYWORD1>lof</KEYWORD1>
-			<KEYWORD1>lset</KEYWORD1>
-			<KEYWORD1>name</KEYWORD1>
-			<KEYWORD1>open</KEYWORD1>
-			<!-- KEYWORD1>print #</KEYWORD1 -->
-			<KEYWORD1>put$</KEYWORD1>
-			<KEYWORD1>put</KEYWORD1>
-			<KEYWORD1>reset</KEYWORD1>
-			<KEYWORD1>rset</KEYWORD1>
-			<KEYWORD1>seek</KEYWORD1>
-			<KEYWORD1>using</KEYWORD1>
-			<!-- KEYWORD1>write #</KEYWORD1 -->
-
-			<!-- flow control -->
-			<!--KEYWORD1>call absolute</KEYWORD1 -->
-			<!-- KEYWORD1>call interrupt</KEYWORD1 -->
-			<KEYWORD1>call</KEYWORD1>
-			<KEYWORD1>call</KEYWORD1>
-			<KEYWORD1>case</KEYWORD1>
-			<KEYWORD1>def</KEYWORD1>
-			<KEYWORD1>do</KEYWORD1>
-			<KEYWORD1>elseif</KEYWORD1>
-			<!-- KEYWORD1>end case</KEYWORD1>
-			<KEYWORD1>case else</KEYWORD1 -->
-			<KEYWORD1>else</KEYWORD1>
-			<KEYWORD1>end</KEYWORD1>
-			<KEYWORD1>loop</KEYWORD1>
-			<KEYWORD1>exit</KEYWORD1>
-			<KEYWORD1>for</KEYWORD1>
-			<KEYWORD1>next</KEYWORD1>
-			<KEYWORD1>gosub</KEYWORD1>
-			<KEYWORD1>goto</KEYWORD1>
-			<KEYWORD1>if</KEYWORD1>
-			<KEYWORD1>inline</KEYWORD1>
-			<KEYWORD1>resume</KEYWORD1>
-			<KEYWORD1>return</KEYWORD1>
-			<KEYWORD1>select</KEYWORD1>
-			<KEYWORD1>step</KEYWORD1>
-			<KEYWORD1>stop</KEYWORD1>
-			<KEYWORD1>sub</KEYWORD1>
-			<KEYWORD1>then</KEYWORD1>
-			<KEYWORD1>to</KEYWORD1>
-			<KEYWORD1>until</KEYWORD1>
-			<!-- KEYWORD1>def fn</KEYWORD1>
-			<KEYWORD1>end def</KEYWORD1>
-			<KEYWORD1>end sub</KEYWORD1 -->
-			<KEYWORD1>wend</KEYWORD1>
-			<KEYWORD1>while</KEYWORD1>
-
-			<!-- draw/graphics -->
-			<KEYWORD1>circle</KEYWORD1>
-			<KEYWORD1>draw</KEYWORD1>
-			<KEYWORD1>line</KEYWORD1>
-			<KEYWORD1>paint</KEYWORD1>
-			<!-- KEYWORD1>palette using</KEYWORD1 -->
-			<KEYWORD1>palette</KEYWORD1>
-			<KEYWORD1>peek</KEYWORD1>
-			<KEYWORD1>pen</KEYWORD1>
-			<KEYWORD1>pmap</KEYWORD1>
-			<KEYWORD1>point</KEYWORD1>
-			<KEYWORD1>poke</KEYWORD1>
-			<KEYWORD1>preset</KEYWORD1>
-			<KEYWORD1>pset</KEYWORD1>
-			<KEYWORD1>put</KEYWORD1>
-			<KEYWORD1>view</KEYWORD1>
-			<KEYWORD1>window</KEYWORD1>
-
-			<!-- hardware events -->
-			<KEYWORD1>mtimer</KEYWORD1>
-			<KEYWORD1>off</KEYWORD1>
-			<KEYWORD1>on</KEYWORD1>
-			<!-- KEYWORD1>on com</KEYWORD1>
-			<KEYWORD1>on error</KEYWORD1>
-			<KEYWORD1>on key</KEYWORD1>
-			<KEYWORD1>on pen</KEYWORD1>
-			<KEYWORD1>on play</KEYWORD1>
-			<KEYWORD1>on strig</KEYWORD1>
-			<KEYWORD1>on timer</KEYWORD1 -->
-			<KEYWORD1>stick</KEYWORD1>
-			<KEYWORD1>strig</KEYWORD1>
-			<KEYWORD1>timer</KEYWORD1>
-			<KEYWORD1>wait</KEYWORD1>
-
-			<!--input -->
-			<KEYWORD1>inkey$</KEYWORD1>
-			<KEYWORD1>input$</KEYWORD1>
-			<!-- KEYWORD1>input #</KEYWORD1 -->
-			<KEYWORD1>input</KEYWORD1>
-			<KEYWORD1>instat</KEYWORD1>
-			<!-- KEYWORD1>line input</KEYWORD1 -->
-			<KEYWORD1>read</KEYWORD1>
-			<KEYWORD1>restore</KEYWORD1>
-
-			<!-- keyboard -->
-			<!-- KEYWORD1>key on</KEYWORD1>
-			<KEYWORD1>key off</KEYWORD1 -->
-			<KEYWORD1>key</KEYWORD1>
-
-			<!-- memory -->
-			<KEYWORD1>clear</KEYWORD1>
-			<!-- KEYWORD1>def seg</KEYWORD1 -->
-			<KEYWORD1>endmem</KEYWORD1>
-			<KEYWORD1>erase</KEYWORD1>
-			<KEYWORD1>fre</KEYWORD1>
-			<KEYWORD1>memset</KEYWORD1>
-			<KEYWORD1>poke</KEYWORD1>
-			<KEYWORD1>seg</KEYWORD1>
-			<KEYWORD1>varptr$</KEYWORD1>
-			<KEYWORD1>varptr</KEYWORD1>
-			<KEYWORD1>varseg</KEYWORD1>
-
-			<!-- metastatements -->
-			<KEYWORD2>$com1</KEYWORD2>
-			<KEYWORD2>$com2</KEYWORD2>
-			<KEYWORD2>$com</KEYWORD2>
-			<KEYWORD2>$debug</KEYWORD2>
-			<KEYWORD2>$dynamic</KEYWORD2>
-			<KEYWORD2>$event</KEYWORD2>
-			<KEYWORD2>$if</KEYWORD2>
-			<KEYWORD2>$else</KEYWORD2>
-			<KEYWORD2>$endif</KEYWORD2>
-			<KEYWORD2>$include</KEYWORD2>
-			<KEYWORD2>$inline</KEYWORD2>
-			<KEYWORD2>$list</KEYWORD2>
-			<KEYWORD2>$option</KEYWORD2>
-			<KEYWORD2>$segment</KEYWORD2>
-			<KEYWORD2>$sound</KEYWORD2>
-			<KEYWORD2>$stack</KEYWORD2>
-			<KEYWORD2>$static</KEYWORD2>
-
-			<!-- Miscellaneous -->
-			<KEYWORD1>data</KEYWORD1>
-			<KEYWORD1>delay</KEYWORD1>
-			<KEYWORD1>reg</KEYWORD1>
-			<KEYWORD1>swap</KEYWORD1>
-
-
-			<!-- Math Functions -->
-			<FUNCTION>abs</FUNCTION>
-			<FUNCTION>asc</FUNCTION>
-			<FUNCTION>atn</FUNCTION>
-			<FUNCTION>cdbl</FUNCTION>
-			<FUNCTION>ceil</FUNCTION>
-			<FUNCTION>cint</FUNCTION>
-			<FUNCTION>clng</FUNCTION>
-			<FUNCTION>cos</FUNCTION>
-			<FUNCTION>csng</FUNCTION>
-			<FUNCTION>cvi</FUNCTION>
-			<FUNCTION>cvl</FUNCTION>
-			<FUNCTION>cvs</FUNCTION>
-			<FUNCTION>cvd</FUNCTION>
-			<FUNCTION>cvmd</FUNCTION>
-			<FUNCTION>cvms</FUNCTION>
-			<KEYWORD2>decr</KEYWORD2>
-			<KEYWORD2>defint</KEYWORD2>
-			<KEYWORD2>deflng</KEYWORD2>
-			<KEYWORD2>defsng</KEYWORD2>
-			<KEYWORD2>defdbl</KEYWORD2>
-			<KEYWORD2>defstr</KEYWORD2>
-			<FUNCTION>exp2</FUNCTION>
-			<FUNCTION>exp10</FUNCTION>
-			<FUNCTION>exp</FUNCTION>
-			<FUNCTION>fix</FUNCTION>
-			<KEYWORD2>incr</KEYWORD2>
-			<FUNCTION>int</FUNCTION>
-			<FUNCTION>log10</FUNCTION>
-			<FUNCTION>log2</FUNCTION>
-			<FUNCTION>log</FUNCTION>
-			<FUNCTION>mki$</FUNCTION>
-			<FUNCTION>mkl$</FUNCTION>
-			<FUNCTION>mks$</FUNCTION>
-			<FUNCTION>mkd$</FUNCTION>
-			<FUNCTION>mkmd$</FUNCTION>
-			<FUNCTION>mkms$</FUNCTION>
-			<KEYWORD2>randomize</KEYWORD2>
-			<KEYWORD2>random</KEYWORD2>
-			<FUNCTION>rnd</FUNCTION>
-			<FUNCTION>sgn</FUNCTION>
-			<FUNCTION>sin</FUNCTION>
-			<FUNCTION>spc</FUNCTION>
-			<FUNCTION>sqr</FUNCTION>
-			<FUNCTION>tab</FUNCTION>
-			<FUNCTION>tan</FUNCTION>
-
-			<!-- output -->
-			<KEYWORD1>print</KEYWORD1>
-			<!-- KEYWORD1>print #</KEYWORD1>
-			<KEYWORD1>print using</KEYWORD1 -->
-			<KEYWORD1>write</KEYWORD1>
-
-			<!-- printer -->
-			<KEYWORD1>lpos</KEYWORD1>
-			<!-- KEYWORD1>lprint using</KEYWORD1  -->
-			<KEYWORD1>lprint</KEYWORD1>
-
-			<!-- screen -->
-			<KEYWORD1>cls</KEYWORD1>
-			<KEYWORD1>color</KEYWORD1>
-			<KEYWORD1>csrlin</KEYWORD1>
-			<KEYWORD1>locate</KEYWORD1>
-			<KEYWORD1>pos</KEYWORD1>
-			<KEYWORD1>screen</KEYWORD1>
-			<KEYWORD1>width</KEYWORD1>
-
-			<!-- sound -->
-			<KEYWORD1>beep</KEYWORD1>
-			<KEYWORD1>play</KEYWORD1>
-			<KEYWORD1>sound</KEYWORD1>
-
-			<!-- strings -->
-			<FUNCTION>bin$</FUNCTION>
-			<FUNCTION>chr$</FUNCTION>
-			<FUNCTION>get$</FUNCTION>
-			<FUNCTION>hex$</FUNCTION>
-			<FUNCTION>instr</FUNCTION>
-			<FUNCTION>lcase$</FUNCTION>
-			<FUNCTION>left$</FUNCTION>
-			<FUNCTION>len</FUNCTION>
-			<FUNCTION>mid$</FUNCTION>
-			<FUNCTION>oct$</FUNCTION>
-			<FUNCTION>right$</FUNCTION>
-			<FUNCTION>space$</FUNCTION>
-			<FUNCTION>str$</FUNCTION>
-			<FUNCTION>string$</FUNCTION>
-			<FUNCTION>ucase$</FUNCTION>
-			<FUNCTION>val</FUNCTION>
-
-		</KEYWORDS>
-	</RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/twiki.xml b/qpython/src/main/assets/syntax/twiki.xml
deleted file mode 100644
index ccb6231f..00000000
--- a/qpython/src/main/assets/syntax/twiki.xml
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!-- catalog entry:
-
-<MODE NAME="twiki"		FILE="twiki.xml"
-				FILE_NAME_GLOB="*.twiki"/>
-
--->
-
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="noTabs" VALUE="true" />
-		<PROPERTY NAME="wrap" VALUE="soft" />
-	</PROPS>
-	<RULES HIGHLIGHT_DIGITS="FALSE" IGNORE_CASE="FALSE">
-
-		<!-- though not encouraged, HTML is supported -->
-		<IMPORT DELEGATE="html::MAIN"/>
-
-		<!-- signature - a convention, not actual markup -->
-		<EOL_SPAN AT_LINE_START="TRUE" TYPE="COMMENT1">-- </EOL_SPAN>
-
-		<!-- header -->
-		<EOL_SPAN_REGEXP HASH_CHAR="---+"
-			TYPE="KEYWORD1"
-			AT_LINE_START="TRUE"
-			>-{3}[+]{1,6}(?:!!)?\s</EOL_SPAN_REGEXP>
-
-		<!-- bold -->
-		<SEQ_REGEXP
-			HASH_CHAR="*"
-			AT_LINE_START="FALSE"
-			TYPE="KEYWORD4"
-		>\*[^\s*][^*]*\*</SEQ_REGEXP>
-
-		<!-- bold and italic -->
-		<SEQ_REGEXP
-			HASH_CHAR="__"
-			AT_LINE_START="FALSE"
-			TYPE="KEYWORD4"
-		>__\w.*?\w__</SEQ_REGEXP>
-
-		<!-- italic -->
-		<SEQ_REGEXP
-			HASH_CHAR="_"
-			AT_LINE_START="FALSE"
-			TYPE="KEYWORD4"
-		>_\w.*?\w_</SEQ_REGEXP>
-
-		<!-- bold and fixed font -->
-		<SEQ_REGEXP
-			HASH_CHAR="=="
-			AT_LINE_START="FALSE"
-			TYPE="KEYWORD4"
-		>==\w.*?\w==</SEQ_REGEXP>
-
-		<!-- fixed font -->
-		<SEQ_REGEXP
-			HASH_CHAR="="
-			AT_LINE_START="FALSE"
-			TYPE="KEYWORD4"
-		>=\w.*?\w=</SEQ_REGEXP>
-
-		<!-- separator -->
-		<EOL_SPAN AT_LINE_START="TRUE" TYPE="KEYWORD4">---</EOL_SPAN>
-
-		<!-- wiki words -->
-		<SEQ_REGEXP HASH_CHARS="ABCDEFGHIJKLMNOPQRSTUVWXYZ" AT_WORD_START="TRUE" TYPE="KEYWORD2">[A-Z][A-Z.]*[a-z.]+(?:[A-Z][A-Z.]*[a-z.]*[a-z])+</SEQ_REGEXP>
-
-		<!-- links -->
-		<SPAN TYPE="KEYWORD3">
-			<BEGIN>[[</BEGIN>
-			<END>]]</END>
-		</SPAN>
-
-		<!-- verbatim -->
-		<SPAN TYPE="LITERAL2">
-			<BEGIN>&lt;verbatim&gt;</BEGIN>
-			<END>&lt;/verbatim&gt;</END>
-		</SPAN>
-
-		<!-- prevent a link -->
-		<SEQ TYPE="LITERAL2">&lt;nop&gt;</SEQ>
-
-		<!-- disable links -->
-		<SPAN TYPE="LITERAL2">
-			<BEGIN>&lt;noautolink&gt;</BEGIN>
-			<END>&lt;/noautolink&gt;</END>
-		</SPAN>
-
-		<!-- terms -->
-		<SEQ_REGEXP HASH_CHAR=" " TYPE="KEYWORD2" AT_LINE_START="FALSE"
-			>\s{3}\w(?:&amp;nbsp;|-|\w)*?\w+:\s</SEQ_REGEXP>
-
-		<!-- twiki variables -->
-		<SEQ_REGEXP HASH_CHAR="%"
-			TYPE="FUNCTION"
-			>%[A-Z]+(?:\{[^\}]+\})?%</SEQ_REGEXP>
-
-		<KEYWORDS>
-			<!-- variables, just here for complete-word -->
-			<NULL>ATTACHURL</NULL>
-			<NULL>ATTACHURLPATH</NULL>
-			<NULL>BASETOPIC</NULL>
-			<NULL>BASEWEB</NULL>
-			<NULL>GMTIME</NULL>
-			<NULL>HOMETOPIC</NULL>
-			<NULL>HTTP_HOST</NULL>
-			<NULL>INCLUDE</NULL>
-			<NULL>INCLUDINGTOPIC</NULL>
-			<NULL>INCLUDINGWEB</NULL>
-			<NULL>MAINWEB</NULL>
-			<NULL>NOTIFYTOPIC</NULL>
-			<NULL>PUBURL</NULL>
-			<NULL>PUBURLPATH</NULL>
-			<NULL>REMOTE_ADDR</NULL>
-			<NULL>REMOTE_PORT</NULL>
-			<NULL>REMOTE_USER</NULL>
-			<NULL>SCRIPTSUFFIX</NULL>
-			<NULL>SCRIPTURL</NULL>
-			<NULL>SCRIPTURLPATH</NULL>
-			<NULL>SEARCH</NULL>
-			<NULL>SERVERTIME</NULL>
-			<NULL>SPACEDTOPIC</NULL>
-			<NULL>STARTINCLUDE</NULL>
-			<NULL>STATISTICSTOPIC</NULL>
-			<NULL>STOPINCLUDE</NULL>
-			<NULL>TOC</NULL>
-			<NULL>TOPIC</NULL>
-			<NULL>TOPICLIST</NULL>
-			<NULL>TWIKIWEB</NULL>
-			<NULL>URLENCODE</NULL>
-			<NULL>URLPARAM</NULL>
-			<NULL>USERNAME</NULL>
-			<NULL>WEB</NULL>
-			<NULL>WEBLIST</NULL>
-			<NULL>WEBPREFSTOPIC</NULL>
-			<NULL>WIKIHOMEURL</NULL>
-			<NULL>WIKINAME</NULL>
-			<NULL>WIKIPREFSTOPIC</NULL>
-			<NULL>WIKITOOLNAME</NULL>
-			<NULL>WIKIUSERNAME</NULL>
-			<NULL>WIKIUSERSTOPIC</NULL>
-			<NULL>WIKIVERSION</NULL>
-		</KEYWORDS>
-
-	</RULES>
-
-</MODE>
-
-
diff --git a/qpython/src/main/assets/syntax/typoscript.xml b/qpython/src/main/assets/syntax/typoscript.xml
deleted file mode 100644
index 3b591ba6..00000000
--- a/qpython/src/main/assets/syntax/typoscript.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!-- TypoScript syntax highlighting, by Neil Bertram <neil@tasmanstudios.co.nz>
-	Based on Kasper's highlighter in ExtDevEval and his "TypoScript Syntax and In-depth Study"
-	available at http://typo3.org/documentation/document-library/doc_core_ts/
-
-  -->
-
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="lineComment" VALUE="#"/>
-		<PROPERTY NAME="lineComment" VALUE="/"/>
-		<PROPERTY NAME="commentStart" VALUE="/*"/>
-		<PROPERTY NAME="commentEnd" VALUE="*/"/>
-		<PROPERTY NAME="indentOpenBrackets" VALUE="({"/>
-		<PROPERTY NAME="indentCloseBrackets" VALUE=")}"/>
-		<PROPERTY NAME="lineUpClosingBracket" VALUE="true"/>
-	</PROPS>
-	<RULES IGNORE_CASE="FALSE" HIGHLIGHT_DIGITS="FALSE" NO_WORD_SEP=":" DEFAULT="MARKUP">
-		<!-- Include statement (<INCLUDE_TYPOSCRIPT: source="FILE: fileadmin/html/mainmenu_typoscript.txt">) -->
-		<SPAN TYPE="KEYWORD4" NO_LINE_BREAK="TRUE" AT_LINE_START="TRUE">
-			<BEGIN>&lt;INCLUDE</BEGIN>
-			<END>&gt;</END>
-		</SPAN>
-
-		<!-- Assignments (using the = operator) are delegated to the assignment rule for more flexibility -->
-		<EOL_SPAN TYPE="OPERATOR" DELEGATE="typoscript::assignment" AT_LINE_START="FALSE" AT_WHITESPACE_END="FALSE">=</EOL_SPAN>
-
-		<!-- Multi-line assignments (using the (blah blah) syntax) -->
-		<SPAN TYPE="OPERATOR" AT_LINE_START="FALSE" NO_LINE_BREAK="FALSE" DELEGATE="typoscript::assignment">
-			<BEGIN>(</BEGIN>
-			<END AT_WHITESPACE_END="TRUE">)</END>
-		</SPAN>
-
-		<!-- Object copies (using the < operator)
-			Note that object references (=<) are not highlighted due to the fact
-			that they're only supported by the core template engine, and not
-			actually a feature of typoscript itself
-		  -->
-		<EOL_SPAN TYPE="OPERATOR" AT_LINE_START="FALSE" DELEGATE="typoscript::copy">&lt;</EOL_SPAN>
-
-		<!-- Comments
-			- note that block comments must start/end at the beginning of the trimmed line
-			  but this is difficult to accomplish here, so we just force it to be line-start
-		  -->
-		<EOL_SPAN AT_WORD_START="TRUE" TYPE="COMMENT4">#</EOL_SPAN>
-		<SPAN TYPE="COMMENT1" NO_LINE_BREAK="FALSE" AT_LINE_START="TRUE">
-			<BEGIN>/*</BEGIN>
-			<END>*/</END>
-		</SPAN>
-		<EOL_SPAN AT_WORD_START="TRUE" TYPE="COMMENT2">/</EOL_SPAN>
-
-		<!-- Conditionals (anything inside square brackets at a word start -->
-		<SPAN TYPE="KEYWORD1" NO_LINE_BREAK="TRUE" AT_WORD_START="TRUE">
-			<BEGIN>[</BEGIN>
-			<END>]</END>
-		</SPAN>
-
-		<!-- Special characters that haven't been caught yet -->
-		<SEQ TYPE="NULL">{</SEQ>
-		<SEQ TYPE="NULL">}</SEQ>
-		<SEQ TYPE="NULL">(</SEQ>
-		<SEQ TYPE="NULL">)</SEQ>
-	</RULES>
-
-	<!-- Rule for both single and multi-line assignments -->
-	<RULES SET="assignment" IGNORE_CASE="FALSE" HIGHLIGHT_DIGITS="FALSE" DEFAULT="LITERAL1">
-		<!-- TypoScript constants inserted with {$blah} are highlighted -->
-		<SPAN TYPE="LABEL" AT_WORD_START="FALSE" AT_LINE_START="FALSE">
-			<BEGIN>{$</BEGIN>
-			<END>}</END>
-		</SPAN>
-	</RULES>
-
-	<!-- Rule for object copies -->
-	<RULES SET="copy" IGNORE_CASE="FALSE" HIGHLIGHT_DIGITS="FALSE" DEFAULT="KEYWORD2">
-		<!-- nothing right now -->
-	</RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/url.xml b/qpython/src/main/assets/syntax/url.xml
deleted file mode 100644
index 5638bd5a..00000000
--- a/qpython/src/main/assets/syntax/url.xml
+++ /dev/null
@@ -1,166 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!-- URL mode, by Kevin Hunter of caktusgroup.com (kevin@) for jEdit -->
-<!--
-Attempting to implement http://en.wikipedia.org/wiki/URI_scheme.  Most
-schemes should work.  There are some commented out.  However, as of
-Wed, 11 Jun 2008, I'm still working out some kinks.  Specifically,
-these work
-
-http://www.example.com/
-http://www.example.com/path/to/file?id=true
-http://user@example.com/path/to/file
-http://user:pass@example.com/path/to/file
-
-and these don't work:
-
-http://www.example.com   (no trailing / messes it up)
-http://www.example.com/p/t/f?id=2&var=true ('&' and 'var' do not get marked) 
--->
-
-<MODE>
-	<PROPS>
-		<PROPERTY NAME='wordBreakChars' VALUE=',-=&lt;&gt;/?^&amp;*' />
-	</PROPS>
-
-	<RULES SET='DOMAINNAME'
-		IGNORE_CASE='TRUE'
-		>
-
-		<MARK_PREVIOUS TYPE='LITERAL2' MATCH_TYPE='OPERATOR'>@</MARK_PREVIOUS>
-		<MARK_PREVIOUS TYPE='LITERAL2' MATCH_TYPE='OPERATOR'>:</MARK_PREVIOUS>
-		<MARK_PREVIOUS TYPE='LITERAL2' MATCH_TYPE='OPERATOR'>/</MARK_PREVIOUS>
-
-		<SPAN_REGEXP MATCH_TYPE='LITERAL2' NO_LINE_BREAK='TRUE' NO_WORD_BREAK='TRUE'>
-			<BEGIN>(?=\b[\w.:-]+@(\b))</BEGIN> <!-- Why doesn't this match at the *boundary* between :// and <username>?  It's wrapped in a (?=<look ahead assertion>) -->
-			<END>$1</END>
-		</SPAN_REGEXP>
-		<SPAN_REGEXP MATCH_TYPE='LITERAL1' NO_LINE_BREAK='TRUE' NO_WORD_BREAK='TRUE'>
-			<BEGIN>(\b)[\w.-]+((?=/))</BEGIN>
-			<END>$1</END>
-		</SPAN_REGEXP>
-		<EOL_SPAN TYPE='LITERAL4' MATCH_TYPE='OPERATOR'>/</EOL_SPAN>
-	</RULES>
-	<RULES
-		IGNORE_CASE='FALSE'
-		HIGHLIGHT_DIGITS='TRUE' DIGIT_RE='[0-9][0-9a-zA-Z]*'>
-
-		<MARK_FOLLOWING TYPE='LITERAL2' MATCH_TYPE='OPERATOR'>?</MARK_FOLLOWING>
-		<!-- <MARK_FOLLOWING TYPE='LITERAL2' MATCH_TYPE='OPERATOR'>&amp;</MARK_FOLLOWING> -->
-
-		<SEQ TYPE='OPERATOR'>/</SEQ>
-		<SEQ TYPE='LITERAL4'>+</SEQ>
-
-		<SPAN_REGEXP TYPE='LITERAL1' MATCH_TYPE='OPERATOR' NO_LINE_BREAK='TRUE' NO_WORD_BREAK='FALSE'>
-			<BEGIN>=</BEGIN>
-			<END>&amp;</END>
-		</SPAN_REGEXP>
-		<SPAN DELEGATE='DOMAINNAME' TYPE='LITERAL2' MATCH_TYPE='OPERATOR' NO_LINE_BREAK='TRUE' NO_WORD_BREAK='TRUE'>
-			<BEGIN>://</BEGIN>
-			<END>/</END>
-		</SPAN>
-
-		<IMPORT DELEGATE='SCHEMES' />
-	</RULES>
-	<RULES SET='SCHEMES' IGNORE_CASE='TRUE'>
-		<KEYWORDS>
-			<!-- Url types -->
-			<KEYWORD1>aaa</KEYWORD1>             <!-- Diameter Protocol                                                 RFC 3588 -->
-			<KEYWORD1>aaas</KEYWORD1>            <!-- Diameter Protocol (secure)                                        RFC 3588 -->
-			<KEYWORD1>acap</KEYWORD1>            <!-- Application Configuration Access Protocol                         RFC 2244 -->
-			<KEYWORD1>cap</KEYWORD1>             <!-- Calendar access protocol                                          RFC 4324 -->
-			<KEYWORD1>cid</KEYWORD1>             <!-- Referencing individual parts of an SMTP/MIME message              RFC 2392 -->
-			<KEYWORD1>crid</KEYWORD1>            <!-- TV-Anytime Content Reference Identifier                           RFC 4078 -->
-			<KEYWORD1>data</KEYWORD1>            <!-- Inclusion of small data items inline                              RFC 2397 -->
-			<KEYWORD1>dav</KEYWORD1>             <!-- HTTP Extensions for Distributed Authoring (WebDAV)                RFC 2518 -->
-			<KEYWORD1>dict</KEYWORD1>            <!-- Dictionary service protocol                                       RFC 2229 -->
-			<KEYWORD1>dns</KEYWORD1>             <!-- Domain Name System                                                RFC 4501 --> 	
-			<KEYWORD1>fax</KEYWORD1>             <!-- Used for telefacsimile numbers                                    RFC 2806 -->
-			<KEYWORD1>ftp</KEYWORD1>             <!-- File Transfer Protocal                                            RFC 1738 -->
-			<KEYWORD1>file</KEYWORD1>            <!-- Addressing files on local or network file systems                 RFC 1738 -->
-			<KEYWORD1>ftp</KEYWORD1>             <!-- FTP resources                                                     RFC 1738 -->
-			<KEYWORD1>go</KEYWORD1>              <!-- Common Name Resolution Protocol                                   RFC 3368 -->
-			<KEYWORD1>gopher</KEYWORD1>          <!-- Used with Gopher protocol                                         RFC 4266 -->
-			<KEYWORD1>h323</KEYWORD1>            <!-- Used with H.323 multimedia communications                         RFC 3508 -->
-			<KEYWORD1>http</KEYWORD1>            <!-- HTTP resources                                                    RFC 2616 -->
-			<KEYWORD1>https</KEYWORD1>           <!-- HTTP connections secured using SSL/TLS                            RFC 2817 -->
-			<KEYWORD1>icap</KEYWORD1>            <!-- Internet Content Adaptation Protocol                              RFC 3507 -->
-			<KEYWORD1>im</KEYWORD1>              <!-- Instant messaging protocol                                        RFC 3860 RFC 4622 -->
-			<KEYWORD1>imap</KEYWORD1>            <!-- Accessing e-mail resources through IMAP                           RFC 2192 -->
-			<KEYWORD1>info</KEYWORD1>            <!-- Information Assets with Identifiers in Public Namespaces          RFC 4452 -->
-			<KEYWORD1>ipp</KEYWORD1>             <!-- Internet Printing Protocol                                        RFC 3510 -->
-			<KEYWORD1>iris</KEYWORD1>            <!-- Internet Registry Information Service                             RFC 3981 -->
-			<KEYWORD1>ldap</KEYWORD1>            <!-- LDAP directory request                                            RFC 2255 RFC 4516 -->
-			<!-- <KEYWORD1>mailto</KEYWORD1>          SMTP e-mail addresses and default content                         RFC 2368 --> 
-			<KEYWORD1>mid</KEYWORD1>             <!-- Referencing SMTP/MIME messages, or parts of messages.             RFC 2392 -->
-			<KEYWORD1>modem</KEYWORD1>           <!-- modem                                                             RFC 3966 -->
-			<KEYWORD1>msrp</KEYWORD1>            <!-- msrps 	Message Session Relay Protocol                           RFC 4975 -->
-			<KEYWORD1>mtqp</KEYWORD1>            <!-- Message Tracking Query Protocol                                   RFC 3887 -->
-			<KEYWORD1>mupdate</KEYWORD1>         <!-- Mailbox Update Protocol                                           RFC 3656 -->
-			<KEYWORD1>news</KEYWORD1>            <!-- (Usenet) newsgroups and postings                                  RFC 1738 -->
-			<KEYWORD1>nfs</KEYWORD1>             <!-- Network File System resources                                     RFC 2224 -->
-			<KEYWORD1>nntp</KEYWORD1>            <!-- Usenet NNTP                                                       RFC 1738 -->
-			<KEYWORD1>opaquelocktoken</KEYWORD1> <!-- opaquelocktoken                                                   RFC 4918 -->
-			<KEYWORD1>pop</KEYWORD1>             <!-- Accessing mailbox through POP3                                    RFC 2384 -->
-			<KEYWORD1>pres</KEYWORD1>            <!-- Used in Common Profile for Presence (CPP) to identify presence    RFC 3859 -->
-			<KEYWORD1>prospero</KEYWORD1>        <!-- Prospero Directory Service                                        RFC 4157 -->
-			<KEYWORD1>rtsp</KEYWORD1>            <!-- Real Time Streaming Protocol                                      RFC 2326 -->
-			<KEYWORD1>service</KEYWORD1>         <!-- ???                                                               RFC 2609 -->
-			<KEYWORD1>shttp</KEYWORD1>           <!-- Secure HTTP                                                       RFC 2660 -->
-			<!-- <KEYWORD1>sip</KEYWORD1>             Used with Session Initiation Protocol (SIP)                       RFC 3969 RFC 3261 -->
-			<!-- <KEYWORD1>sips</KEYWORD1>            Secure equivalent of sip                                          RFC 3969 RFC 3261 -->
-			<KEYWORD1>snmp</KEYWORD1>            <!-- Simple Network Management Protocol                                RFC 4088 -->
-			<KEYWORD1>tag</KEYWORD1>             <!-- ???                                                               RFC 4151 -->
-			<KEYWORD1>telnet</KEYWORD1>          <!-- Used with telnet                                                  RFC 4248 -->
-			<KEYWORD1>tftp</KEYWORD1>            <!-- Trivial File Transfer Protocol                                    RFC 3617 -->
-			<KEYWORD1>thismessage</KEYWORD1>     <!-- multipart/related relative reference resolution                   RFC 2557 -->
-			<KEYWORD1>tip</KEYWORD1>             <!-- Transaction Internet Protocol                                     RFC 2371 -->
-			<KEYWORD1>tv</KEYWORD1>              <!-- TV Broadcasts                                                     RFC 2838 -->
-			<KEYWORD1>urn</KEYWORD1>             <!-- Uniform Resource Names                                            RFC 2141 -->
-			<KEYWORD1>vemmi</KEYWORD1>           <!-- Versatile Multimedia Interface                                    RFC 2122 -->
-			<KEYWORD1>wais</KEYWORD1>            <!-- Used with Wide area information server (WAIS)                     RFC 4156 -->
-			<KEYWORD1>xmlrpc.beep</KEYWORD1>     <!-- xmlrpc.beep                                                       RFC 3529 -->
-			<KEYWORD1>xmpp</KEYWORD1>            <!-- XMPP (Jabber)                                                     RFC 5122 -->
-
-			<!-- Unofficial but common URL schemes -->
-			<KEYWORD2>chrome</KEYWORD2>           <!-- Used in Mozilla/Gecko based browsers                                  -->
-			<KEYWORD2>cvs</KEYWORD2>              <!-- Concurrent Versions System (CVS) Repository Access                    -->
-			<!-- <KEYWORD2>ed2k</KEYWORD2>             Resources available using the eDonkey2000 network                     -->
-			<KEYWORD2>feed</KEYWORD2>             <!-- web feed subscription                                                 -->
-			<KEYWORD2>fish</KEYWORD2>             <!-- Accessing another computer's files using the SSH protocol             -->
-			<KEYWORD2>gg</KEYWORD2>               <!-- Starting chat with Gadu-Gadu user                                     -->
-			<KEYWORD2>gizmoproject</KEYWORD2>     <!-- Gizmo Project calling link.                                           -->
-			<!-- <KEYWORD2>iax2</KEYWORD2>             Inter-Asterisk eXchange protocol version 2                 IETF Draft -->
-			<KEYWORD2>irc</KEYWORD2>              <!-- Connecting to a server to join a channel.                  IETF Draft -->
-			<KEYWORD2>ircs</KEYWORD2>             <!-- Secure equivalent of irc                                   IETF Draft -->
-			<KEYWORD2>keyparc</KEYWORD2>          <!-- Keyparc encrypt/decrypt resource.                                     -->
-			<KEYWORD2>lastfm</KEYWORD2>           <!-- Connecting to a radio stream from Last.fm.                            -->
-			<KEYWORD2>ldaps</KEYWORD2>            <!-- Secure equivalent of ldap                                             -->
-			<!-- <KEYWORD2>magnet</KEYWORD2>           "magnet links"                                                        -->
-			<KEYWORD2>(other</KEYWORD2>           <!-- parameters are also possible)                                         -->
-			<KEYWORD2>mms</KEYWORD2>             <!-- Windows streaming media                                               -->
-			<!-- <KEYWORD2>mvn</KEYWORD2>              Access Apache Maven repository artifacts                              -->
-			<KEYWORD2>nsfw</KEYWORD2>             <!-- Not Safe For Work                                                     -->
-			<KEYWORD2>psyc</KEYWORD2>             <!-- Used to identify or locate a person, group, or place                  -->
-			<KEYWORD2>rsync</KEYWORD2>            <!-- Rsync                                                                 -->
-			<KEYWORD2>secondlife</KEYWORD2>       <!-- Open the Map floater in Second Life                                   -->
-			<KEYWORD2>sftp</KEYWORD2>             <!-- SFTP file transfers (not FTPS (FTP/SSL))                   IETF Draft -->
-			<KEYWORD2>skype</KEYWORD2>            <!-- Launching Skype call (official; see also callto:)                     -->
-			<KEYWORD2>ssh</KEYWORD2>              <!-- SSH connections (like telnet:) and                                    -->
-			<KEYWORD2>smb</KEYWORD2>              <!-- Accessing SMB/CIFS shares                                  IETF Draft -->
-			<KEYWORD2>soldat</KEYWORD2>           <!-- Joining servers                                                       -->
-			<!-- <KEYWORD2>steam</KEYWORD2>            Interact with Steam                                                   -->
-			<KEYWORD2>teamspeak</KEYWORD2>        <!-- Joining a server.                                                     -->
-			<KEYWORD2>unreal</KEYWORD2>           <!-- Joining servers                                                       -->
-			<KEYWORD2>ut2004</KEYWORD2>           <!-- Joining servers                                                       -->
-			<KEYWORD2>ventrilo</KEYWORD2>         <!-- Joining a server.                                                     -->
-			<!-- <KEYWORD2>view-source</KEYWORD2>      Shows a web page as code 'in the raw'.                                -->
-			<KEYWORD2>webcal</KEYWORD2>           <!-- Subscribing to calendars in iCalendar format                          -->
-			<KEYWORD2>wyciwyg</KEYWORD2>          <!-- What You Cache Is What You Get WYCIWYG                                -->
-			<KEYWORD2>xfire</KEYWORD2>            <!-- Adding friends and servers, joining servers                           -->
-			<KEYWORD2>ymsgr</KEYWORD2>            <!-- Sending an instant message to a Yahoo! Contact.                       -->
-		</KEYWORDS>
-	</RULES>
-</MODE>
- 	  	 
diff --git a/qpython/src/main/assets/syntax/uscript.xml b/qpython/src/main/assets/syntax/uscript.xml
deleted file mode 100644
index 81c66f7a..00000000
--- a/qpython/src/main/assets/syntax/uscript.xml
+++ /dev/null
@@ -1,160 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="commentStart" VALUE="/*" />
-		<PROPERTY NAME="commentEnd" VALUE="*/" />
-		<PROPERTY NAME="lineComment" VALUE="//" />
-		<PROPERTY NAME="wordBreakChars" VALUE=",+-=&lt;&gt;/?^&amp;*" />
-
-		<!-- Auto indent -->
-		<PROPERTY NAME="indentOpenBrackets" VALUE="{" />
-		<PROPERTY NAME="indentCloseBrackets" VALUE="}" />
-		<PROPERTY NAME="indentNextLine"
-			VALUE="\s*(((if|while)\s*\(|else\s*|else\s+if\s*\(|for\s*\(.*\))[^{;]*)" />
-		<!-- set this to 'true' if you want to use GNU coding style -->
-		<PROPERTY NAME="doubleBracketIndent" VALUE="false" />
-	</PROPS>
-	<RULES IGNORE_CASE="TRUE"
-		HIGHLIGHT_DIGITS="TRUE"
-		DIGIT_RE="(0x[\p{XDigit}]+[lL]?|[\p{Digit}]+(e[\p{Digit}]*)?[lLdDfF]?)">
-
-		<!-- Silly comment -->
-		<SEQ TYPE="COMMENT1">/**/</SEQ>
-
-		<!-- Java comment (C style) -->
-		<SPAN TYPE="COMMENT1">
-			<BEGIN>/*</BEGIN>
-			<END>*/</END>
-		</SPAN>
-
-		<SPAN TYPE="LITERAL1" ESCAPE="\" NO_LINE_BREAK="TRUE">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-		<SPAN TYPE="LITERAL1" ESCAPE="\" NO_LINE_BREAK="TRUE">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-
-		<EOL_SPAN TYPE="COMMENT1">//</EOL_SPAN>
-
-        <SEQ TYPE="OPERATOR">~</SEQ>
-        <SEQ TYPE="OPERATOR">!</SEQ>
-        <SEQ TYPE="OPERATOR">@</SEQ>
-        <SEQ TYPE="OPERATOR">#</SEQ>
-        <SEQ TYPE="OPERATOR">$</SEQ>
-        <SEQ TYPE="OPERATOR">^</SEQ>
-        <SEQ TYPE="OPERATOR">&amp;</SEQ>
-        <SEQ TYPE="OPERATOR">*</SEQ>
-        <SEQ TYPE="OPERATOR">-</SEQ>
-        <SEQ TYPE="OPERATOR">=</SEQ>
-        <SEQ TYPE="OPERATOR">+</SEQ>
-        <SEQ TYPE="OPERATOR">|</SEQ>
-        <SEQ TYPE="OPERATOR">\\</SEQ>
-        <SEQ TYPE="OPERATOR">:</SEQ>
-        <SEQ TYPE="OPERATOR">&lt;</SEQ>
-        <SEQ TYPE="OPERATOR">&gt;</SEQ>
-        <SEQ TYPE="OPERATOR">/</SEQ>
-        <SEQ TYPE="OPERATOR">?</SEQ>
-        <SEQ TYPE="OPERATOR">`</SEQ>
-
-		<MARK_PREVIOUS TYPE="LABEL" MATCH_TYPE="OPERATOR"
-			AT_WHITESPACE_END="TRUE">:</MARK_PREVIOUS>
-
-		<!-- Function calls -->
-		<MARK_PREVIOUS TYPE="FUNCTION" MATCH_TYPE="OPERATOR">(</MARK_PREVIOUS>
-		<SEQ TYPE="OPERATOR">)</SEQ>
-
-		<KEYWORDS>
-            <KEYWORD1>abstract</KEYWORD1>
-            <KEYWORD1>auto</KEYWORD1>
-            <KEYWORD1>array</KEYWORD1>
-            <KEYWORD1>case</KEYWORD1>
-            <KEYWORD1>class</KEYWORD1>
-            <KEYWORD1>coerce</KEYWORD1>
-            <KEYWORD1>collapscategories</KEYWORD1>
-            <KEYWORD1>config</KEYWORD1>
-            <KEYWORD1>const</KEYWORD1>
-            <KEYWORD1>default</KEYWORD1>
-            <KEYWORD1>defaultproperties</KEYWORD1>
-            <KEYWORD1>deprecated</KEYWORD1>
-            <KEYWORD1>do</KEYWORD1>
-            <KEYWORD1>dontcollapsecategories</KEYWORD1>
-            <KEYWORD1>edfindable</KEYWORD1>
-            <KEYWORD1>editconst</KEYWORD1>
-            <KEYWORD1>editinline</KEYWORD1>
-            <KEYWORD1>editinlinenew</KEYWORD1>
-            <KEYWORD1>else</KEYWORD1>
-            <KEYWORD1>enum</KEYWORD1>
-            <KEYWORD1>event</KEYWORD1>
-            <KEYWORD1>exec</KEYWORD1>
-            <KEYWORD1>export</KEYWORD1>
-            <KEYWORD1>exportstructs</KEYWORD1>
-            <KEYWORD1>extends</KEYWORD1>
-            <KEYWORD1>false</KEYWORD1>
-            <KEYWORD1>final</KEYWORD1>
-            <KEYWORD1>for</KEYWORD1>
-            <KEYWORD1>foreach</KEYWORD1>
-            <KEYWORD1>function</KEYWORD1>
-            <KEYWORD1>globalconfig</KEYWORD1>
-            <KEYWORD1>hidecategories</KEYWORD1>
-            <KEYWORD1>if</KEYWORD1>
-            <KEYWORD1>ignores</KEYWORD1>
-            <KEYWORD1>input</KEYWORD1>
-            <KEYWORD1>iterator</KEYWORD1>
-            <KEYWORD1>latent</KEYWORD1>
-            <KEYWORD1>local</KEYWORD1>
-            <KEYWORD1>localized</KEYWORD1>
-            <KEYWORD1>native</KEYWORD1>
-            <KEYWORD1>nativereplication</KEYWORD1>
-            <KEYWORD1>noexport</KEYWORD1>
-            <KEYWORD1>noteditinlinenew</KEYWORD1>
-			<KEYWORD1>notplaceable</KEYWORD1>
-            <KEYWORD1>operator</KEYWORD1>
-            <KEYWORD1>optional</KEYWORD1>
-            <KEYWORD1>out</KEYWORD1>
-            <KEYWORD1>perobjectconfig</KEYWORD1>
-            <KEYWORD1>placeable</KEYWORD1>
-            <KEYWORD1>postoperator</KEYWORD1>
-            <KEYWORD1>preoperator</KEYWORD1>
-            <KEYWORD1>private</KEYWORD1>
-            <KEYWORD1>protected</KEYWORD1>
-            <KEYWORD1>reliable</KEYWORD1>
-            <KEYWORD1>replication</KEYWORD1>
-            <KEYWORD1>return</KEYWORD1>
-            <KEYWORD1>safereplace</KEYWORD1>
-            <KEYWORD1>showcategories</KEYWORD1>
-            <KEYWORD1>simulated</KEYWORD1>
-            <KEYWORD1>singular</KEYWORD1>
-            <KEYWORD1>state</KEYWORD1>
-            <KEYWORD1>static</KEYWORD1>
-            <KEYWORD1>struct</KEYWORD1>
-            <KEYWORD1>switch</KEYWORD1>
-            <KEYWORD1>transient</KEYWORD1>
-            <KEYWORD1>travel</KEYWORD1>
-            <KEYWORD1>true</KEYWORD1>
-            <KEYWORD1>unreliable</KEYWORD1>
-            <KEYWORD1>until</KEYWORD1>
-            <KEYWORD1>var</KEYWORD1>
-            <KEYWORD1>while</KEYWORD1>
-            <KEYWORD1>within</KEYWORD1>
-
-            <KEYWORD2>default</KEYWORD2>
-            <KEYWORD2>global</KEYWORD2>
-            <KEYWORD2>none</KEYWORD2>
-            <KEYWORD2>self</KEYWORD2>
-            <KEYWORD2>static</KEYWORD2>
-            <KEYWORD2>super</KEYWORD2>
-
-            <KEYWORD3>bool</KEYWORD3>
-            <KEYWORD3>byte</KEYWORD3>
-            <KEYWORD3>float</KEYWORD3>
-            <KEYWORD3>int</KEYWORD3>
-            <KEYWORD3>name</KEYWORD3>
-            <KEYWORD3>string</KEYWORD3>
-		</KEYWORDS>
-	</RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/vala.xml b/qpython/src/main/assets/syntax/vala.xml
deleted file mode 100644
index 4de58559..00000000
--- a/qpython/src/main/assets/syntax/vala.xml
+++ /dev/null
@@ -1,317 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="commentStart" VALUE="/*" />
-		<PROPERTY NAME="commentEnd" VALUE="*/" />
-		<PROPERTY NAME="lineComment" VALUE="//" />
-
-		<!-- Auto indent -->
-		<PROPERTY NAME="indentOpenBrackets" VALUE="{" />
-		<PROPERTY NAME="indentCloseBrackets" VALUE="}" />
-		<PROPERTY NAME="unalignedOpenBrackets" VALUE="(" />
-		<PROPERTY NAME="unalignedCloseBrackets" VALUE=")" />
-		<PROPERTY NAME="indentNextLine"
-			VALUE="\s*(((if|while)\s*\(|else\s*|else\s+if\s*\(|for\s*\(.*\))[^{;]*)" />
-		<PROPERTY NAME="unindentThisLine"
-			VALUE="^.*(default:\s*|case.*:.*)$" />
-		<PROPERTY NAME="electricKeys" VALUE=":" />
-	</PROPS>
-	<RULES IGNORE_CASE="FALSE"
-		HIGHLIGHT_DIGITS="TRUE"
-		DIGIT_RE="(0x[\p{XDigit}]+[lL]?|[\p{Digit}]+(e[\p{Digit}]*)?[lLdDfF]?)">
-		
-		<!-- Valadoc comment -->
-		<SPAN TYPE="COMMENT3" DELEGATE="VALADOC">
-			<BEGIN>/**</BEGIN>
-			<END>*/</END>
-		</SPAN>
-
-		<SPAN TYPE="COMMENT1">
-			<BEGIN>/*</BEGIN>
-			<END>*/</END>
-		</SPAN>
-
-		<EOL_SPAN TYPE="COMMENT2">//</EOL_SPAN>
-
-		<!-- string templates -->
-		<SPAN TYPE="LITERAL2" NO_LINE_BREAK="TRUE">
-			<BEGIN>@"</BEGIN>
-			<END>"</END>
-		</SPAN>
-		
-		<!-- verbatim strings -->
-		<SPAN TYPE="LITERAL3" NO_LINE_BREAK="FALSE">
-			<BEGIN>"""</BEGIN>
-			<END>"""</END>
-		</SPAN>
-
-		<SPAN TYPE="LITERAL1" ESCAPE="\" NO_LINE_BREAK="TRUE">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-
-		<SPAN TYPE="LITERAL1" ESCAPE="\" NO_LINE_BREAK="TRUE">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-
-		<EOL_SPAN TYPE="KEYWORD2">#if</EOL_SPAN>
-		<EOL_SPAN TYPE="KEYWORD2">#else</EOL_SPAN>
-		<EOL_SPAN TYPE="KEYWORD2">#elif</EOL_SPAN>
-		<EOL_SPAN TYPE="KEYWORD2">#endif</EOL_SPAN>
-		<!-- TODO: check for other preprocessors? -->
-
-		<SEQ TYPE="OPERATOR">~</SEQ>
-		<SEQ TYPE="OPERATOR">!</SEQ>
-		<SEQ TYPE="OPERATOR">:</SEQ>
-		<SEQ TYPE="OPERATOR">;</SEQ>
-		<SEQ TYPE="OPERATOR">{</SEQ>
-		<SEQ TYPE="OPERATOR">}</SEQ>
-		<SEQ TYPE="OPERATOR">,</SEQ>
-		<SEQ TYPE="OPERATOR">.</SEQ>
-		<SEQ TYPE="OPERATOR">!</SEQ>
-		<SEQ TYPE="OPERATOR">[</SEQ>
-		<SEQ TYPE="OPERATOR">]</SEQ>
-		<SEQ TYPE="OPERATOR">+</SEQ>
-		<SEQ TYPE="OPERATOR">-</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;</SEQ>
-		<SEQ TYPE="OPERATOR">=</SEQ>
-		<SEQ TYPE="OPERATOR">*</SEQ>
-		<SEQ TYPE="OPERATOR">/</SEQ>
-		<SEQ TYPE="OPERATOR">\</SEQ>
-		<SEQ TYPE="OPERATOR">^</SEQ>
-		<SEQ TYPE="OPERATOR">|</SEQ>
-		<SEQ TYPE="OPERATOR">&amp;</SEQ>
-		<SEQ TYPE="OPERATOR">%</SEQ>
-		<SEQ TYPE="OPERATOR">?</SEQ>
-
-		<MARK_PREVIOUS TYPE="FUNCTION" MATCH_TYPE="OPERATOR">(</MARK_PREVIOUS>
-		<SEQ TYPE="OPERATOR">)</SEQ>
-
-		<KEYWORDS>
-			<KEYWORD1>abstract</KEYWORD1>
-			<KEYWORD1>as</KEYWORD1>
-			<KEYWORD1>async</KEYWORD1>
-			<KEYWORD1>base</KEYWORD1>
-			<KEYWORD1>break</KEYWORD1>
-			<KEYWORD1>case</KEYWORD1>
-			<KEYWORD1>catch</KEYWORD1>
-			<KEYWORD1>const</KEYWORD1>
-			<KEYWORD1>construct</KEYWORD1>
-			<KEYWORD1>continue</KEYWORD1>
-			<KEYWORD1>default</KEYWORD1>
-			<KEYWORD1>delegate</KEYWORD1>
-			<KEYWORD1>delete</KEYWORD1>
-			<KEYWORD1>do</KEYWORD1>
-			<KEYWORD1>dynamic</KEYWORD1>
-			<KEYWORD1>else</KEYWORD1>
-			<KEYWORD1>ensures</KEYWORD1>
-			<KEYWORD1>extern</KEYWORD1>
-			<KEYWORD1>finally</KEYWORD1>
-			<KEYWORD1>for</KEYWORD1>
-			<KEYWORD1>foreach</KEYWORD1>
-			<KEYWORD1>get</KEYWORD1>
-			<KEYWORD1>global</KEYWORD1>
-			<KEYWORD1>if</KEYWORD1>
-			<KEYWORD1>in</KEYWORD1>
-			<KEYWORD1>inline</KEYWORD1>
-			<KEYWORD1>internal</KEYWORD1>
-			<KEYWORD1>is</KEYWORD1>
-			<KEYWORD1>lock</KEYWORD1>
-			<KEYWORD1>new</KEYWORD1>
-			<KEYWORD1>out</KEYWORD1>
-			<KEYWORD1>override</KEYWORD1>
-			<KEYWORD1>owned</KEYWORD1>
-			<KEYWORD1>private</KEYWORD1>
-			<KEYWORD1>protected</KEYWORD1>
-			<KEYWORD1>public</KEYWORD1>
-			<KEYWORD1>ref</KEYWORD1>
-			<KEYWORD1>requires</KEYWORD1>
-			<KEYWORD1>return</KEYWORD1>
-			<KEYWORD1>set</KEYWORD1>
-			<KEYWORD1>signal</KEYWORD1>
-			<KEYWORD1>sizeof</KEYWORD1>
-			<KEYWORD1>static</KEYWORD1>
-			<KEYWORD1>switch</KEYWORD1>
-			<KEYWORD1>throw</KEYWORD1>
-			<KEYWORD1>throws</KEYWORD1>
-			<KEYWORD1>try</KEYWORD1>
-			<KEYWORD1>typeof</KEYWORD1>
-			<KEYWORD1>unowned</KEYWORD1>
-			<KEYWORD1>value</KEYWORD1>
-			<KEYWORD1>virtual</KEYWORD1>
-			<KEYWORD1>weak</KEYWORD1>
-			<KEYWORD1>while</KEYWORD1>
-			<KEYWORD1>yield</KEYWORD1>
-
-			<KEYWORD2>using</KEYWORD2>
-			<KEYWORD2>namespace</KEYWORD2>
-
-			<KEYWORD3>bool</KEYWORD3>
-			<KEYWORD3>char</KEYWORD3>
-			<KEYWORD3>class</KEYWORD3>
-			<KEYWORD3>delegate</KEYWORD3>
-			<KEYWORD3>double</KEYWORD3>
-			<KEYWORD3>dynamic</KEYWORD3>
-			<KEYWORD3>enum</KEYWORD3>
-			<KEYWORD3>errordomain</KEYWORD3>
-			<KEYWORD3>float</KEYWORD3>
-			<KEYWORD3>int</KEYWORD3>
-			<KEYWORD3>int8</KEYWORD3>
-			<KEYWORD3>int16</KEYWORD3>
-			<KEYWORD3>int32</KEYWORD3>
-			<KEYWORD3>int64</KEYWORD3>
-			<KEYWORD3>interface</KEYWORD3>
-			<KEYWORD3>long</KEYWORD3>
-			<KEYWORD3>short</KEYWORD3>
-			<KEYWORD3>string</KEYWORD3>
-			<KEYWORD3>struct</KEYWORD3>
-			<KEYWORD3>uchar</KEYWORD3>
-			<KEYWORD3>uint</KEYWORD3>
-			<KEYWORD3>uint8</KEYWORD3>
-			<KEYWORD3>uint16</KEYWORD3>
-			<KEYWORD3>uint32</KEYWORD3>
-			<KEYWORD3>uint64</KEYWORD3>
-			<KEYWORD3>ulong</KEYWORD3>
-			<KEYWORD3>unichar</KEYWORD3>
-			<KEYWORD3>ushort</KEYWORD3>
-			<KEYWORD3>var</KEYWORD3>
-			<KEYWORD3>void</KEYWORD3>
-
-			<LITERAL2>false</LITERAL2>
-			<LITERAL2>null</LITERAL2>
-			<LITERAL2>this</LITERAL2>
-			<LITERAL2>base</LITERAL2>
-			<LITERAL2>true</LITERAL2>
-		</KEYWORDS>
-	</RULES>
-	
-	<!-- Copied from the Javadoc rules set -->
-	<!-- TODO: verify these when http://live.gnome.org/Valadoc gets updated -->
-	<RULES SET="VALADOC" DEFAULT="COMMENT3" IGNORE_CASE="TRUE">
-
-		<!-- so that *@param is highlighted -->
-		<SEQ TYPE="COMMENT3">*</SEQ>
-
-		<!-- HTML comments -->
-		<SPAN TYPE="COMMENT1">
-			<BEGIN>&lt;!--</BEGIN>
-			<END>--&gt;</END>
-		</SPAN>
-
-		<!-- Javadoc allows this -->
-		<SEQ TYPE="COMMENT3">&lt;&lt;</SEQ>
-		<SEQ TYPE="COMMENT3">&lt;=</SEQ>
-		<SEQ TYPE="COMMENT3">&lt; </SEQ>
-
-		<!-- strings in quotes -->
-		<SPAN TYPE="LITERAL1" ESCAPE="\" NO_LINE_BREAK="TRUE">
-		<BEGIN>&quot;</BEGIN>
-		<END>&quot;</END>
-		</SPAN>
-
-		<!-- HTML tags -->
-		<SPAN TYPE="MARKUP" DELEGATE="xml::TAGS"
-			NO_LINE_BREAK="TRUE">
-			<BEGIN>&lt;</BEGIN>
-			<END>&gt;</END>
-		</SPAN>
-
-		<!-- so that @link{...} is highlighted -->
-		<!-- XXX: this is wrong, {@link ..} is correct, see below -->
-		<!--<SEQ TYPE="COMMENT3">{</SEQ>-->
-
-		<SPAN_REGEXP TYPE="LABEL" HASH_CHAR="{@" NO_WORD_BREAK="FALSE" DELEGATE="VALADOC_PARAM">
-			<BEGIN>\{@(link|linkplain|docRoot|code|literal)\s</BEGIN>
-			<END>}</END>
-		</SPAN_REGEXP>
-
-		<!-- for the common usage of the cvs keyword $Id: java.xml 19829 2011-08-24 09:32:24Z kpouer $ -->
-		<SPAN_REGEXP TYPE="LABEL" HASH_CHAR="@version" NO_WORD_BREAK="FALSE" DELEGATE="VALADOC_PARAM">
-			<BEGIN>@version\s+\$</BEGIN>
-			<END>$</END>
-		</SPAN_REGEXP>
-
-		<!-- This works only when you use the same whitespace before and after the param's name,
-			 eg. a tab before and after, but mixing space and tab won't work.
-			 The reason is that you can't enter a regexp in END, except for the backreference operator $n -->
-		<SPAN_REGEXP TYPE="LABEL" HASH_CHAR="@" NO_WORD_BREAK="FALSE" DELEGATE="VALADOC_PARAM">
-			<BEGIN>@(?:param|throws|exception|serialField)(\s)</BEGIN>
-			<END>$1</END>
-		</SPAN_REGEXP>
-
-		<KEYWORDS>
-		<!-- Note: the labels in comments are handled by SPANs above -->
-
-		<!-- Official javadoc tags:
-			 http://download.oracle.com/javase/6/docs/technotes/tools/windows/javadoc.html#javadoctags -->
-			<LABEL>@author</LABEL>
-			<LABEL>@deprecated</LABEL>
-		<!--<LABEL>@docRoot</LABEL>-->
-		<!--<LABEL>@exception</LABEL>-->
-			<LABEL>{@inheritDoc}</LABEL>
-		<!--<LABEL>@link</LABEL>-->
-		<!--<LABEL>@linkplain</LABEL>-->
-		<!--<LABEL>@param</LABEL>-->
-			<LABEL>@return</LABEL>
-			<LABEL>@see</LABEL>
-			<LABEL>@serial</LABEL>
-			<LABEL>@serialData</LABEL>
-		<!--<LABEL>@serialField</LABEL>-->
-			<LABEL>@since</LABEL>
-		<!--<LABEL>@throws</LABEL>-->
-			<LABEL>{@value}</LABEL>
-			<LABEL>@version</LABEL>
-
-		<!-- new in 1.5 -->
-		<!--<LABEL>@code</LABEL>-->
-		<!--<LABEL>@literal</LABEL>-->
-
-		<!-- SUNs proposed tags:
-			 http://java.sun.com/j2se/javadoc/proposed-tags.html -->
-			<KEYWORD2>@category</KEYWORD2>
-			<KEYWORD2>@example</KEYWORD2>
-			<KEYWORD2>@exclude</KEYWORD2>
-			<KEYWORD2>@index</KEYWORD2>
-			<KEYWORD2>@internal</KEYWORD2>
-			<KEYWORD2>@obsolete</KEYWORD2>
-			<KEYWORD2>@threadsafety</KEYWORD2>
-			<KEYWORD2>@tutorial</KEYWORD2>
-			<KEYWORD2>@todo</KEYWORD2>
-
-		<!-- Custom tags -->
-			<KEYWORD4>@access</KEYWORD4>
-			<KEYWORD4>@beaninfo</KEYWORD4>
-			<KEYWORD4>@bon</KEYWORD4>
-			<KEYWORD4>@bug</KEYWORD4>
-			<KEYWORD4>@complexity</KEYWORD4>
-			<KEYWORD4>@design</KEYWORD4>
-			<KEYWORD4>@ensures</KEYWORD4>
-			<KEYWORD4>@equivalent</KEYWORD4>
-			<KEYWORD4>@generates</KEYWORD4>
-			<KEYWORD4>@guard</KEYWORD4>
-			<KEYWORD4>@hides</KEYWORD4>
-			<KEYWORD4>@history</KEYWORD4>
-			<KEYWORD4>@idea</KEYWORD4>
-			<KEYWORD4>@invariant</KEYWORD4>
-			<KEYWORD4>@modifies</KEYWORD4>
-			<KEYWORD4>@overrides</KEYWORD4>
-			<KEYWORD4>@post</KEYWORD4>
-			<KEYWORD4>@pre</KEYWORD4>
-			<KEYWORD4>@references</KEYWORD4>
-			<KEYWORD4>@requires</KEYWORD4>
-			<KEYWORD4>@review</KEYWORD4>
-			<KEYWORD4>@spec</KEYWORD4>
-			<KEYWORD4>@uses</KEYWORD4>
-			<KEYWORD4>@values</KEYWORD4>
-		</KEYWORDS>
-	</RULES>
-	<!-- just a dummy which makes use of the default token type COMMENT4 for highlighting the word after @param in javadoc -->
-	<RULES SET="VALADOC_PARAM" DEFAULT="COMMENT4" IGNORE_CASE="TRUE" />
-
-</MODE>
-
diff --git a/qpython/src/main/assets/syntax/vbscript.xml b/qpython/src/main/assets/syntax/vbscript.xml
deleted file mode 100644
index f8e8e653..00000000
--- a/qpython/src/main/assets/syntax/vbscript.xml
+++ /dev/null
@@ -1,739 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!-- VBScript mode by Andre Kaplan -->
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="lineComment" VALUE="'" />
-	</PROPS>
-
-	<RULES IGNORE_CASE="TRUE" HIGHLIGHT_DIGITS="TRUE">
-		<SPAN TYPE="LITERAL1" NO_LINE_BREAK="TRUE">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-
-		<!-- conditional compilation -->
-		<EOL_SPAN TYPE="KEYWORD2">#if</EOL_SPAN>
-		<EOL_SPAN TYPE="KEYWORD2">#else</EOL_SPAN>
-		<EOL_SPAN TYPE="KEYWORD2">#end</EOL_SPAN>
-
-		<EOL_SPAN TYPE="COMMENT1">'</EOL_SPAN>
-		<EOL_SPAN TYPE="COMMENT1">rem </EOL_SPAN>
-
-		<!-- Comparison operators -->
-		<SEQ TYPE="OPERATOR">&lt;</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;=</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;=</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">=</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">.</SEQ>
-		<!-- See in keywords: is -->
-
-		<!-- Arithmetic operators -->
-		<SEQ TYPE="OPERATOR">+</SEQ>
-		<SEQ TYPE="OPERATOR">-</SEQ>
-		<SEQ TYPE="OPERATOR">*</SEQ>
-		<SEQ TYPE="OPERATOR">/</SEQ>
-		<SEQ TYPE="OPERATOR">\</SEQ>
-		<!-- See in keywords: mod -->
-		<SEQ TYPE="OPERATOR">^</SEQ>
-
-		<!-- Concatenation operators -->
-		<SEQ TYPE="OPERATOR">&amp;</SEQ>
-		<!-- <SEQ TYPE="OPERATOR">+</SEQ> -->
-
-		<!-- Logical operators -->
-		<!-- See in keywords: and, or, not, xor, eqv -->
-
-		<!-- EOL Continuation -->
-<!--		<SEQ TYPE="NULL">_</SEQ>-->
-		<!-- Instruction separator -->
-		<MARK_PREVIOUS TYPE="LABEL" MATCH_TYPE="OPERATOR"
-			AT_LINE_START="TRUE">:</MARK_PREVIOUS>
-
-		<KEYWORDS>
-			<!-- Conditional Statements -->
-			<KEYWORD1>if</KEYWORD1>
-			<KEYWORD1>then</KEYWORD1>
-			<KEYWORD1>else</KEYWORD1>
-			<KEYWORD1>elseif</KEYWORD1>
-			<KEYWORD1>select</KEYWORD1>
-			<KEYWORD1>case</KEYWORD1>
-
-			<!-- Loop Statements -->
-			<!-- For..Next -->
-			<KEYWORD1>for</KEYWORD1>
-			<KEYWORD1>to</KEYWORD1>
-			<KEYWORD1>step</KEYWORD1>
-			<KEYWORD1>next</KEYWORD1>
-			<!-- For Each..Next -->
-			<KEYWORD1>each</KEYWORD1>
-			<KEYWORD1>in</KEYWORD1>
-			<!-- Do..Loop -->
-			<KEYWORD1>do</KEYWORD1>
-			<KEYWORD1>while</KEYWORD1>
-			<KEYWORD1>until</KEYWORD1>
-			<KEYWORD1>loop</KEYWORD1>
-			<!-- While..Wend -->
-			<KEYWORD1>wend</KEYWORD1>
-
-			<!-- Closing, Exit Statements -->
-			<KEYWORD1>exit</KEYWORD1>
-			<KEYWORD1>end</KEYWORD1>
-
-			<!-- Methods, Functions, Class, Properties, Variables -->
-			<KEYWORD1>function</KEYWORD1>
-			<KEYWORD1>sub</KEYWORD1>
-			<KEYWORD1>class</KEYWORD1>
-			<KEYWORD1>property</KEYWORD1>
-			<KEYWORD1>get</KEYWORD1>
-			<KEYWORD1>let</KEYWORD1>
-			<KEYWORD1>set</KEYWORD1>
-
-			<!-- Parameters passing -->
-			<KEYWORD1>byval</KEYWORD1>
-			<KEYWORD1>byref</KEYWORD1>
-
-			<!-- Declaration -->
-			<KEYWORD1>const</KEYWORD1>
-			<KEYWORD1>dim</KEYWORD1>
-			<KEYWORD1>redim</KEYWORD1>
-			<KEYWORD1>preserve</KEYWORD1>
-			<KEYWORD1>as</KEYWORD1>
-
-			<!-- Object Assignement/Instantiation -->
-			<KEYWORD1>set</KEYWORD1>
-			<KEYWORD1>with</KEYWORD1>
-			<KEYWORD1>new</KEYWORD1>
-
-			<!-- Visibility -->
-			<KEYWORD1>public</KEYWORD1>
-			<KEYWORD1>default</KEYWORD1>
-			<KEYWORD1>private</KEYWORD1>
-
-			<!-- Comments -->
-			<KEYWORD1>rem</KEYWORD1>
-
-			<!-- Function Call - Dynamic Evaluation -->
-			<KEYWORD1>call</KEYWORD1>
-			<KEYWORD1>execute</KEYWORD1>
-			<KEYWORD1>eval</KEYWORD1>
-
-			<!-- Miscellaneous -->
-			<KEYWORD1>on</KEYWORD1>
-			<KEYWORD1>error</KEYWORD1>
-			<KEYWORD1>goto</KEYWORD1>
-			<KEYWORD1>resume</KEYWORD1>
-			<KEYWORD1>option</KEYWORD1>
-			<KEYWORD1>explicit</KEYWORD1>
-			<KEYWORD1>erase</KEYWORD1>
-			<KEYWORD1>randomize</KEYWORD1>
-
-			<!-- Operators -->
-			<!-- Comparison operators -->
-			<OPERATOR>is</OPERATOR>
-			<!-- Arithmetic operators -->
-			<OPERATOR>mod</OPERATOR>
-			<!-- Logical operators -->
-			<OPERATOR>and</OPERATOR>
-			<OPERATOR>or</OPERATOR>
-			<OPERATOR>not</OPERATOR>
-			<OPERATOR>xor</OPERATOR>
-			<OPERATOR>imp</OPERATOR>
-
-			<!-- Datatypes Constants/Literals -->
-			<KEYWORD3>false</KEYWORD3>
-			<KEYWORD3>true</KEYWORD3>
-			<KEYWORD3>empty</KEYWORD3>
-			<KEYWORD3>nothing</KEYWORD3>
-			<KEYWORD3>null</KEYWORD3>
-
-			<!-- VBScript Constants -->
-			<!-- Color constants -->
-			<LITERAL2>vbblack</LITERAL2>
-			<LITERAL2>vbred</LITERAL2>
-			<LITERAL2>vbgreen</LITERAL2>
-			<LITERAL2>vbyellow</LITERAL2>
-			<LITERAL2>vbblue</LITERAL2>
-			<LITERAL2>vbmagenta</LITERAL2>
-			<LITERAL2>vbcyan</LITERAL2>
-			<LITERAL2>vbwhite</LITERAL2>
-
-			<!-- Date & Time Constants -->
-<!--			<LITERAL2>vbSunday</LITERAL2>
-			<LITERAL2>vbMonday</LITERAL2>
-			<LITERAL2>vbTuesday</LITERAL2>
-			<LITERAL2>vbWednesday</LITERAL2>
-			<LITERAL2>vbThursday</LITERAL2>
-			<LITERAL2>vbFriday</LITERAL2>
-			<LITERAL2>vbSaturday</LITERAL2>
-			<LITERAL2>vbUseSystem</LITERAL2>
-			<LITERAL2>vbUseSystemDayOfWeek</LITERAL2>
-			<LITERAL2>vbFirstJan1</LITERAL2>
-			<LITERAL2>vbFirstFourDays</LITERAL2>
-			<LITERAL2>vbFirstFullWeek</LITERAL2>
--->
-			<!-- Date Format Constants -->
-			<LITERAL2>vbGeneralDate</LITERAL2>
-			<LITERAL2>vbLongDate</LITERAL2>
-			<LITERAL2>vbShortDate</LITERAL2>
-			<LITERAL2>vbLongTime</LITERAL2>
-			<LITERAL2>vbShortTime</LITERAL2>
-
-			<!-- Miscellaneous  -->
-			<LITERAL2>vbObjectError</LITERAL2>
-			<KEYWORD2>Err</KEYWORD2>
-
-			<!-- MsgBox Constants -->
-			<LITERAL2>vbOKOnly</LITERAL2>
-			<LITERAL2>vbOKCancel</LITERAL2>
-			<LITERAL2>vbAbortRetryIgnore</LITERAL2>
-			<LITERAL2>vbYesNoCancel</LITERAL2>
-			<LITERAL2>vbYesNo</LITERAL2>
-			<LITERAL2>vbRetryCancel</LITERAL2>
-			<LITERAL2>vbCritical</LITERAL2>
-			<LITERAL2>vbQuestion</LITERAL2>
-			<LITERAL2>vbExclamation</LITERAL2>
-			<LITERAL2>vbInformation</LITERAL2>
-			<LITERAL2>vbDefaultButton1</LITERAL2>
-			<LITERAL2>vbDefaultButton2</LITERAL2>
-			<LITERAL2>vbDefaultButton3</LITERAL2>
-			<LITERAL2>vbDefaultButton4</LITERAL2>
-			<LITERAL2>vbApplicationModal</LITERAL2>
-			<LITERAL2>vbSystemModal</LITERAL2>
-			<LITERAL2>vbOK</LITERAL2>
-			<LITERAL2>vbCancel</LITERAL2>
-			<LITERAL2>vbAbort</LITERAL2>
-			<LITERAL2>vbRetry</LITERAL2>
-			<LITERAL2>vbIgnore</LITERAL2>
-			<LITERAL2>vbYes</LITERAL2>
-			<LITERAL2>vbNo</LITERAL2>
-
-			<!-- Tristate Constants -->
-			<LITERAL2>vbUseDefault</LITERAL2>
-			<LITERAL2>vbTrue</LITERAL2>
-			<LITERAL2>vbFalse</LITERAL2>
-
-			<!-- String Constants -->
-			<LITERAL2>vbcr</LITERAL2>
-			<LITERAL2>vbcrlf</LITERAL2>
-			<LITERAL2>vbformfeed</LITERAL2>
-			<LITERAL2>vblf</LITERAL2>
-			<LITERAL2>vbnewline</LITERAL2>
-			<LITERAL2>vbnullchar</LITERAL2>
-			<LITERAL2>vbnullstring</LITERAL2>
-			<LITERAL2>vbtab</LITERAL2>
-			<LITERAL2>vbverticaltab</LITERAL2>
-			<!-- VarType Constants -->
-			<LITERAL2>vbempty</LITERAL2>
-			<LITERAL2>vbnull</LITERAL2>
-			<LITERAL2>vbinteger</LITERAL2>
-			<LITERAL2>vblong</LITERAL2>
-			<LITERAL2>vbsingle</LITERAL2>
-			<LITERAL2>vbdouble</LITERAL2>
-			<LITERAL2>vbcurrency</LITERAL2>
-			<LITERAL2>vbdate</LITERAL2>
-			<LITERAL2>vbstring</LITERAL2>
-			<LITERAL2>vbobject</LITERAL2>
-			<LITERAL2>vberror</LITERAL2>
-			<LITERAL2>vbboolean</LITERAL2>
-			<LITERAL2>vbvariant</LITERAL2>
-			<LITERAL2>vbdataobject</LITERAL2>
-			<LITERAL2>vbdecimal</LITERAL2>
-			<LITERAL2>vbbyte</LITERAL2>
-			<LITERAL2>vbarray</LITERAL2>
-
-			<!-- Built-in Functions -->
-			<!-- Array Handling -->
-			<KEYWORD2>array</KEYWORD2>
-			<KEYWORD2>lbound</KEYWORD2>
-			<KEYWORD2>ubound</KEYWORD2>
-			<!-- Conversion Functions (Variant) -->
-			<KEYWORD2>cbool</KEYWORD2>
-			<KEYWORD2>cbyte</KEYWORD2>
-			<KEYWORD2>ccur</KEYWORD2>
-			<KEYWORD2>cdate</KEYWORD2>
-			<KEYWORD2>cdbl</KEYWORD2>
-			<KEYWORD2>cint</KEYWORD2>
-			<KEYWORD2>clng</KEYWORD2>
-			<KEYWORD2>csng</KEYWORD2>
-			<KEYWORD2>cstr</KEYWORD2>
-			<!-- Conversion Functions (Radix) -->
-			<KEYWORD2>hex</KEYWORD2>
-			<KEYWORD2>oct</KEYWORD2>
-			<!-- Date/Time Functions -->
-			<KEYWORD2>date</KEYWORD2>
-			<KEYWORD2>time</KEYWORD2>
-			<KEYWORD2>dateadd</KEYWORD2>
-			<KEYWORD2>datediff</KEYWORD2>
-			<KEYWORD2>datepart</KEYWORD2>
-			<KEYWORD2>dateserial</KEYWORD2>
-			<KEYWORD2>datevalue</KEYWORD2>
-			<KEYWORD2>day</KEYWORD2>
-			<KEYWORD2>month</KEYWORD2>
-			<KEYWORD2>monthname</KEYWORD2>
-			<KEYWORD2>weekday</KEYWORD2>
-			<KEYWORD2>weekdayname</KEYWORD2>
-			<KEYWORD2>year</KEYWORD2>
-			<KEYWORD2>hour</KEYWORD2>
-			<KEYWORD2>minute</KEYWORD2>
-			<KEYWORD2>second</KEYWORD2>
-			<KEYWORD2>now</KEYWORD2>
-			<KEYWORD2>timeserial</KEYWORD2>
-			<KEYWORD2>timevalue</KEYWORD2>
-			<!-- Formatting Strings -->
-			<KEYWORD2>formatcurrency</KEYWORD2>
-			<KEYWORD2>formatdatetime</KEYWORD2>
-			<KEYWORD2>formatnumber</KEYWORD2>
-			<KEYWORD2>formatpercent</KEYWORD2>
-			<!-- Input/Output -->
-			<KEYWORD2>inputbox</KEYWORD2>
-			<KEYWORD2>loadpicture</KEYWORD2>
-			<KEYWORD2>msgbox</KEYWORD2>
-			<!-- Math Functions -->
-			<KEYWORD2>atn</KEYWORD2>
-			<KEYWORD2>cos</KEYWORD2>
-			<KEYWORD2>sin</KEYWORD2>
-			<KEYWORD2>tan</KEYWORD2>
-			<KEYWORD2>exp</KEYWORD2>
-			<KEYWORD2>log</KEYWORD2>
-			<KEYWORD2>sqr</KEYWORD2>
-			<KEYWORD2>rnd</KEYWORD2>
-			<!-- Miscellaneous -->
-			<KEYWORD2>rgb</KEYWORD2>
-			<!-- Objects -->
-			<KEYWORD2>createobject</KEYWORD2>
-			<KEYWORD2>getobject</KEYWORD2>
-			<KEYWORD2>getref</KEYWORD2>
-			<!-- Rounding -->
-			<KEYWORD2>abs</KEYWORD2>
-			<KEYWORD2>int</KEYWORD2>
-			<KEYWORD2>fix</KEYWORD2>
-			<KEYWORD2>round</KEYWORD2>
-			<KEYWORD2>sgn</KEYWORD2>
-			<!-- Script Engine ID -->
-			<KEYWORD2>scriptengine</KEYWORD2>
-			<KEYWORD2>scriptenginebuildversion</KEYWORD2>
-			<KEYWORD2>scriptenginemajorversion</KEYWORD2>
-			<KEYWORD2>scriptengineminorversion</KEYWORD2>
-			<!-- Strings -->
-			<KEYWORD2>asc</KEYWORD2>
-			<KEYWORD2>ascb</KEYWORD2>
-			<KEYWORD2>ascw</KEYWORD2>
-			<KEYWORD2>chr</KEYWORD2>
-			<KEYWORD2>chrb</KEYWORD2>
-			<KEYWORD2>chrw</KEYWORD2>
-			<KEYWORD2>filter</KEYWORD2>
-			<KEYWORD2>instr</KEYWORD2>
-			<KEYWORD2>instrb</KEYWORD2>
-			<KEYWORD2>instrrev</KEYWORD2>
-			<KEYWORD2>join</KEYWORD2>
-			<KEYWORD2>len</KEYWORD2>
-			<KEYWORD2>lenb</KEYWORD2>
-			<KEYWORD2>lcase</KEYWORD2>
-			<KEYWORD2>ucase</KEYWORD2>
-			<KEYWORD2>left</KEYWORD2>
-			<KEYWORD2>leftb</KEYWORD2>
-			<KEYWORD2>mid</KEYWORD2>
-			<KEYWORD2>midb</KEYWORD2>
-			<KEYWORD2>right</KEYWORD2>
-			<KEYWORD2>rightb</KEYWORD2>
-			<KEYWORD2>replace</KEYWORD2>
-			<KEYWORD2>space</KEYWORD2>
-			<KEYWORD2>split</KEYWORD2>
-			<KEYWORD2>strcomp</KEYWORD2>
-			<KEYWORD2>string</KEYWORD2>
-			<KEYWORD2>strreverse</KEYWORD2>
-			<KEYWORD2>ltrim</KEYWORD2>
-			<KEYWORD2>rtrim</KEYWORD2>
-			<KEYWORD2>trim</KEYWORD2>
-			<!-- Variants -->
-			<KEYWORD2>isarray</KEYWORD2>
-			<KEYWORD2>isdate</KEYWORD2>
-			<KEYWORD2>isempty</KEYWORD2>
-			<KEYWORD2>isnull</KEYWORD2>
-			<KEYWORD2>isnumeric</KEYWORD2>
-			<KEYWORD2>isobject</KEYWORD2>
-			<KEYWORD2>typename</KEYWORD2>
-			<KEYWORD2>vartype</KEYWORD2>
-
-			<!-- Comment/Uncomment your favorite ADO Constants-->
-
-			<!-- ADO Constants-->
-
-			<!-- CursorTypeEnum Values -->
-			<LITERAL2>adOpenForwardOnly</LITERAL2>
-			<LITERAL2>adOpenKeyset</LITERAL2>
-			<LITERAL2>adOpenDynamic</LITERAL2>
-			<LITERAL2>adOpenStatic</LITERAL2>
-
-			<!-- CursorOptionEnum Values -->
-<!--		<LITERAL2>adHoldRecords</LITERAL2>
-			<LITERAL2>adMovePrevious</LITERAL2>
-			<LITERAL2>adAddNew</LITERAL2>
-			<LITERAL2>adDelete</LITERAL2>
-			<LITERAL2>adUpdate</LITERAL2>
-			<LITERAL2>adBookmark</LITERAL2>
-			<LITERAL2>adApproxPosition</LITERAL2>
-			<LITERAL2>adUpdateBatch</LITERAL2>
-			<LITERAL2>adResync</LITERAL2>
-			<LITERAL2>adNotify</LITERAL2>
-			<LITERAL2>adFind</LITERAL2>
-			<LITERAL2>adSeek</LITERAL2>
-			<LITERAL2>adIndex</LITERAL2>
--->
-			<!-- LockTypeEnum Values -->
-			<LITERAL2>adLockReadOnly</LITERAL2>
-			<LITERAL2>adLockPessimistic</LITERAL2>
-			<LITERAL2>adLockOptimistic</LITERAL2>
-			<LITERAL2>adLockBatchOptimistic</LITERAL2>
-
-			<!-- ExecuteOptionEnum Values -->
-			<LITERAL2>adRunAsync</LITERAL2>
-			<LITERAL2>adAsyncExecute</LITERAL2>
-			<LITERAL2>adAsyncFetch</LITERAL2>
-			<LITERAL2>adAsyncFetchNonBlocking</LITERAL2>
-			<LITERAL2>adExecuteNoRecords</LITERAL2>
-
-			<!-- ConnectOptionEnum Values -->
-<!--			<LITERAL2>adAsyncConnect</LITERAL2>
--->
-			<!-- ObjectStateEnum Values -->
-			<LITERAL2>adStateClosed</LITERAL2>
-			<LITERAL2>adStateOpen</LITERAL2>
-			<LITERAL2>adStateConnecting</LITERAL2>
-			<LITERAL2>adStateExecuting</LITERAL2>
-			<LITERAL2>adStateFetching</LITERAL2>
-
-			<!-- CursorLocationEnum Values -->
-			<LITERAL2>adUseServer</LITERAL2>
-			<LITERAL2>adUseClient</LITERAL2>
-
-			<!-- DataTypeEnum Values -->
-			<LITERAL2>adEmpty</LITERAL2>
-			<LITERAL2>adTinyInt</LITERAL2>
-			<LITERAL2>adSmallInt</LITERAL2>
-			<LITERAL2>adInteger</LITERAL2>
-			<LITERAL2>adBigInt</LITERAL2>
-			<LITERAL2>adUnsignedTinyInt</LITERAL2>
-			<LITERAL2>adUnsignedSmallInt</LITERAL2>
-			<LITERAL2>adUnsignedInt</LITERAL2>
-			<LITERAL2>adUnsignedBigInt</LITERAL2>
-			<LITERAL2>adSingle</LITERAL2>
-			<LITERAL2>adDouble</LITERAL2>
-			<LITERAL2>adCurrency</LITERAL2>
-			<LITERAL2>adDecimal</LITERAL2>
-			<LITERAL2>adNumeric</LITERAL2>
-			<LITERAL2>adBoolean</LITERAL2>
-			<LITERAL2>adError</LITERAL2>
-			<LITERAL2>adUserDefined</LITERAL2>
-			<LITERAL2>adVariant</LITERAL2>
-			<LITERAL2>adIDispatch</LITERAL2>
-			<LITERAL2>adIUnknown</LITERAL2>
-			<LITERAL2>adGUID</LITERAL2>
-			<LITERAL2>adDate</LITERAL2>
-			<LITERAL2>adDBDate</LITERAL2>
-			<LITERAL2>adDBTime</LITERAL2>
-			<LITERAL2>adDBTimeStamp</LITERAL2>
-			<LITERAL2>adBSTR</LITERAL2>
-			<LITERAL2>adChar</LITERAL2>
-			<LITERAL2>adVarChar</LITERAL2>
-			<LITERAL2>adLongVarChar</LITERAL2>
-			<LITERAL2>adWChar</LITERAL2>
-			<LITERAL2>adVarWChar</LITERAL2>
-			<LITERAL2>adLongVarWChar</LITERAL2>
-			<LITERAL2>adBinary</LITERAL2>
-			<LITERAL2>adVarBinary</LITERAL2>
-			<LITERAL2>adLongVarBinary</LITERAL2>
-			<LITERAL2>adChapter</LITERAL2>
-			<LITERAL2>adFileTime</LITERAL2>
-			<LITERAL2>adDBFileTime</LITERAL2>
-			<LITERAL2>adPropVariant</LITERAL2>
-			<LITERAL2>adVarNumeric</LITERAL2>
-
-			<!-- FieldAttributeEnum Values -->
-<!--			<LITERAL2>adFldMayDefer</LITERAL2>
-			<LITERAL2>adFldUpdatable</LITERAL2>
-			<LITERAL2>adFldUnknownUpdatable</LITERAL2>
-			<LITERAL2>adFldFixed</LITERAL2>
-			<LITERAL2>adFldIsNullable</LITERAL2>
-			<LITERAL2>adFldMayBeNull</LITERAL2>
-			<LITERAL2>adFldLong</LITERAL2>
-			<LITERAL2>adFldRowID</LITERAL2>
-			<LITERAL2>adFldRowVersion</LITERAL2>
-			<LITERAL2>adFldCacheDeferred</LITERAL2>
-			<LITERAL2>adFldKeyColumn</LITERAL2>
--->
-
-			<!-- EditModeEnum Values -->
-<!--			<LITERAL2>adEditNone</LITERAL2>
-			<LITERAL2>adEditInProgress</LITERAL2>
-			<LITERAL2>adEditAdd</LITERAL2>
-			<LITERAL2>adEditDelete</LITERAL2>
--->
-			<!-- RecordStatusEnum Values -->
-<!--			<LITERAL2>adRecOK</LITERAL2>
-			<LITERAL2>adRecNew</LITERAL2>
-			<LITERAL2>adRecModified</LITERAL2>
-			<LITERAL2>adRecDeleted</LITERAL2>
-			<LITERAL2>adRecUnmodified</LITERAL2>
-			<LITERAL2>adRecInvalid</LITERAL2>
-			<LITERAL2>adRecMultipleChanges</LITERAL2>
-			<LITERAL2>adRecPendingChanges</LITERAL2>
-			<LITERAL2>adRecCanceled</LITERAL2>
-			<LITERAL2>adRecCantRelease</LITERAL2>
-			<LITERAL2>adRecConcurrencyViolation</LITERAL2>
-			<LITERAL2>adRecIntegrityViolation</LITERAL2>
-			<LITERAL2>adRecMaxChangesExceeded</LITERAL2>
-			<LITERAL2>adRecObjectOpen</LITERAL2>
-			<LITERAL2>adRecOutOfMemory</LITERAL2>
-			<LITERAL2>adRecPermissionDenied</LITERAL2>
-			<LITERAL2>adRecSchemaViolation</LITERAL2>
-			<LITERAL2>adRecDBDeleted</LITERAL2>
--->
-			<!-- GetRowsOptionEnum Values -->
-<!--			<LITERAL2>adGetRowsRest</LITERAL2>
--->
-
-			<!-- PositionEnum Values -->
-<!--			<LITERAL2>adPosUnknown</LITERAL2>
-			<LITERAL2>adPosBOF</LITERAL2>
-			<LITERAL2>adPosEOF</LITERAL2>
--->
-
-			<!-- enum Values -->
-<!--			<LITERAL2>adBookmarkCurrent</LITERAL2>
-			<LITERAL2>adBookmarkFirst</LITERAL2>
-			<LITERAL2>adBookmarkLast</LITERAL2>
--->
-			<!-- MarshalOptionsEnum Values -->
-<!--			<LITERAL2>adMarshalAll</LITERAL2>
-			<LITERAL2>adMarshalModifiedOnly</LITERAL2>
--->
-			<!-- AffectEnum Values -->
-<!--			<LITERAL2>adAffectCurrent</LITERAL2>
-			<LITERAL2>adAffectGroup</LITERAL2>
-			<LITERAL2>adAffectAll</LITERAL2>
-			<LITERAL2>adAffectAllChapters</LITERAL2>
--->
-
-			<!-- ResyncEnum Values -->
-<!--			<LITERAL2>adResyncUnderlyingValues</LITERAL2>
-			<LITERAL2>adResyncAllValues</LITERAL2>
--->
-			<!-- CompareEnum Values -->
-<!--			<LITERAL2>adCompareLessThan</LITERAL2>
-			<LITERAL2>adCompareEqual</LITERAL2>
-			<LITERAL2>adCompareGreaterThan</LITERAL2>
-			<LITERAL2>adCompareNotEqual</LITERAL2>
-			<LITERAL2>adCompareNotComparable</LITERAL2>
--->
-			<!-- FilterGroupEnum Values -->
-<!--			<LITERAL2>adFilterNone</LITERAL2>
-			<LITERAL2>adFilterPendingRecords</LITERAL2>
-			<LITERAL2>adFilterAffectedRecords</LITERAL2>
-			<LITERAL2>adFilterFetchedRecords</LITERAL2>
-			<LITERAL2>adFilterPredicate</LITERAL2>
-			<LITERAL2>adFilterConflictingRecords</LITERAL2>
--->
-			<!-- SearchDirectionEnum Values -->
-<!--			<LITERAL2>adSearchForward</LITERAL2>
-			<LITERAL2>adSearchBackward</LITERAL2>
--->
-
-			<!-- PersistFormatEnum Values -->
-			<LITERAL2>adPersistADTG</LITERAL2>
-			<LITERAL2>adPersistXML</LITERAL2>
-
-			<!-- StringFormatEnum Values -->
-<!--			<LITERAL2>adStringXML</LITERAL2>
-			<LITERAL2>adStringHTML</LITERAL2>
-			<LITERAL2>adClipString</LITERAL2>
--->
-			<!-- ConnectPromptEnum Values -->
-<!--			<LITERAL2>adPromptAlways</LITERAL2>
-			<LITERAL2>adPromptComplete</LITERAL2>
-			<LITERAL2>adPromptCompleteRequired</LITERAL2>
-			<LITERAL2>adPromptNever</LITERAL2>
--->
-			<!-- ConnectModeEnum Values -->
-<!--			<LITERAL2>adModeUnknown</LITERAL2>
-			<LITERAL2>adModeRead</LITERAL2>
-			<LITERAL2>adModeWrite</LITERAL2>
-			<LITERAL2>adModeReadWrite</LITERAL2>
-			<LITERAL2>adModeShareDenyRead</LITERAL2>
-			<LITERAL2>adModeShareDenyWrite</LITERAL2>
-			<LITERAL2>adModeShareExclusive</LITERAL2>
-			<LITERAL2>adModeShareDenyNone</LITERAL2>
--->
-			<!-- IsolationLevelEnum Values -->
-<!--			<LITERAL2>adXactUnspecified</LITERAL2>
-			<LITERAL2>adXactChaos</LITERAL2>
-			<LITERAL2>adXactReadUncommitted</LITERAL2>
-			<LITERAL2>adXactBrowse</LITERAL2>
-			<LITERAL2>adXactCursorStability</LITERAL2>
-			<LITERAL2>adXactReadCommitted</LITERAL2>
-			<LITERAL2>adXactRepeatableRead</LITERAL2>
-			<LITERAL2>adXactSerializable</LITERAL2>
-			<LITERAL2>adXactIsolated</LITERAL2>
--->
-			<!-- XactAttributeEnum Values -->
-<!--			<LITERAL2>adXactCommitRetaining</LITERAL2>
-			<LITERAL2>adXactAbortRetaining</LITERAL2>
--->
-			<!-- PropertyAttributesEnum Values -->
-<!--			<LITERAL2>adPropNotSupported</LITERAL2>
-			<LITERAL2>adPropRequired</LITERAL2>
-			<LITERAL2>adPropOptional</LITERAL2>
-			<LITERAL2>adPropRead</LITERAL2>
-			<LITERAL2>adPropWrite</LITERAL2>
--->
-			<!-- ErrorValueEnum Values -->
-<!--			<LITERAL2>adErrInvalidArgument</LITERAL2>
-			<LITERAL2>adErrNoCurrentRecord</LITERAL2>
-			<LITERAL2>adErrIllegalOperation</LITERAL2>
-			<LITERAL2>adErrInTransaction</LITERAL2>
-			<LITERAL2>adErrFeatureNotAvailable</LITERAL2>
-			<LITERAL2>adErrItemNotFound</LITERAL2>
-			<LITERAL2>adErrObjectInCollection</LITERAL2>
-			<LITERAL2>adErrObjectNotSet</LITERAL2>
-			<LITERAL2>adErrDataConversion</LITERAL2>
-			<LITERAL2>adErrObjectClosed</LITERAL2>
-			<LITERAL2>adErrObjectOpen</LITERAL2>
-			<LITERAL2>adErrProviderNotFound</LITERAL2>
-			<LITERAL2>adErrBoundToCommand</LITERAL2>
-			<LITERAL2>adErrInvalidParamInfo</LITERAL2>
-			<LITERAL2>adErrInvalidConnection</LITERAL2>
-			<LITERAL2>adErrNotReentrant</LITERAL2>
-			<LITERAL2>adErrStillExecuting</LITERAL2>
-			<LITERAL2>adErrOperationCancelled</LITERAL2>
-			<LITERAL2>adErrStillConnecting</LITERAL2>
-			<LITERAL2>adErrNotExecuting</LITERAL2>
-			<LITERAL2>adErrUnsafeOperation</LITERAL2>
--->
-			<!-- ParameterAttributesEnum Values -->
-			<LITERAL2>adParamSigned</LITERAL2>
-			<LITERAL2>adParamNullable</LITERAL2>
-			<LITERAL2>adParamLong</LITERAL2>
-
-			<!-- ParameterDirectionEnum Values -->
-			<LITERAL2>adParamUnknown</LITERAL2>
-			<LITERAL2>adParamInput</LITERAL2>
-			<LITERAL2>adParamOutput</LITERAL2>
-			<LITERAL2>adParamInputOutput</LITERAL2>
-			<LITERAL2>adParamReturnValue</LITERAL2>
-
-			<!-- CommandTypeEnum Values -->
-			<LITERAL2>adCmdUnknown</LITERAL2>
-			<LITERAL2>adCmdText</LITERAL2>
-			<LITERAL2>adCmdTable</LITERAL2>
-			<LITERAL2>adCmdStoredProc</LITERAL2>
-			<LITERAL2>adCmdFile</LITERAL2>
-			<LITERAL2>adCmdTableDirect</LITERAL2>
-
-			<!-- EventStatusEnum Values -->
-<!--			<LITERAL2>adStatusOK</LITERAL2>
-			<LITERAL2>adStatusErrorsOccurred</LITERAL2>
-			<LITERAL2>adStatusCantDeny</LITERAL2>
-			<LITERAL2>adStatusCancel</LITERAL2>
-			<LITERAL2>adStatusUnwantedEvent</LITERAL2>
--->
-			<!-- EventReasonEnum Values -->
-<!--			<LITERAL2>adRsnAddNew</LITERAL2>
-			<LITERAL2>adRsnDelete</LITERAL2>
-			<LITERAL2>adRsnUpdate</LITERAL2>
-			<LITERAL2>adRsnUndoUpdate</LITERAL2>
-			<LITERAL2>adRsnUndoAddNew</LITERAL2>
-			<LITERAL2>adRsnUndoDelete</LITERAL2>
-			<LITERAL2>adRsnRequery</LITERAL2>
-			<LITERAL2>adRsnResynch</LITERAL2>
-			<LITERAL2>adRsnClose</LITERAL2>
-			<LITERAL2>adRsnMove</LITERAL2>
-			<LITERAL2>adRsnFirstChange</LITERAL2>
-			<LITERAL2>adRsnMoveFirst</LITERAL2>
-			<LITERAL2>adRsnMoveNext</LITERAL2>
-			<LITERAL2>adRsnMovePrevious</LITERAL2>
-			<LITERAL2>adRsnMoveLast</LITERAL2>
--->
-			<!-- SchemaEnum Values -->
-<!--			<LITERAL2>adSchemaProviderSpecific</LITERAL2>
-			<LITERAL2>adSchemaAsserts</LITERAL2>
-			<LITERAL2>adSchemaCatalogs</LITERAL2>
-			<LITERAL2>adSchemaCharacterSets</LITERAL2>
-			<LITERAL2>adSchemaCollations</LITERAL2>
-			<LITERAL2>adSchemaColumns</LITERAL2>
-			<LITERAL2>adSchemaCheckConstraints</LITERAL2>
-			<LITERAL2>adSchemaConstraintColumnUsage</LITERAL2>
-			<LITERAL2>adSchemaConstraintTableUsage</LITERAL2>
-			<LITERAL2>adSchemaKeyColumnUsage</LITERAL2>
-			<LITERAL2>adSchemaReferentialConstraints</LITERAL2>
-			<LITERAL2>adSchemaTableConstraints</LITERAL2>
-			<LITERAL2>adSchemaColumnsDomainUsage</LITERAL2>
-			<LITERAL2>adSchemaIndexes</LITERAL2>
-			<LITERAL2>adSchemaColumnPrivileges</LITERAL2>
-			<LITERAL2>adSchemaTablePrivileges</LITERAL2>
-			<LITERAL2>adSchemaUsagePrivileges</LITERAL2>
-			<LITERAL2>adSchemaProcedures</LITERAL2>
-			<LITERAL2>adSchemaSchemata</LITERAL2>
-			<LITERAL2>adSchemaSQLLanguages</LITERAL2>
-			<LITERAL2>adSchemaStatistics</LITERAL2>
-			<LITERAL2>adSchemaTables</LITERAL2>
-			<LITERAL2>adSchemaTranslations</LITERAL2>
-			<LITERAL2>adSchemaProviderTypes</LITERAL2>
-			<LITERAL2>adSchemaViews</LITERAL2>
-			<LITERAL2>adSchemaViewColumnUsage</LITERAL2>
-			<LITERAL2>adSchemaViewTableUsage</LITERAL2>
-			<LITERAL2>adSchemaProcedureParameters</LITERAL2>
-			<LITERAL2>adSchemaForeignKeys</LITERAL2>
-			<LITERAL2>adSchemaPrimaryKeys</LITERAL2>
-			<LITERAL2>adSchemaProcedureColumns</LITERAL2>
-			<LITERAL2>adSchemaDBInfoKeywords</LITERAL2>
-			<LITERAL2>adSchemaDBInfoLiterals</LITERAL2>
-			<LITERAL2>adSchemaCubes</LITERAL2>
-			<LITERAL2>adSchemaDimensions</LITERAL2>
-			<LITERAL2>adSchemaHierarchies</LITERAL2>
-			<LITERAL2>adSchemaLevels</LITERAL2>
-			<LITERAL2>adSchemaMeasures</LITERAL2>
-			<LITERAL2>adSchemaProperties</LITERAL2>
-			<LITERAL2>adSchemaMembers</LITERAL2>
--->
-			<!-- SeekEnum Values -->
-<!--			<LITERAL2>adSeekFirstEQ</LITERAL2>
-			<LITERAL2>adSeekLastEQ</LITERAL2>
-			<LITERAL2>adSeekAfterEQ</LITERAL2>
-			<LITERAL2>adSeekAfter</LITERAL2>
-			<LITERAL2>adSeekBeforeEQ</LITERAL2>
-			<LITERAL2>adSeekBefore</LITERAL2>
--->
-			<!-- ADCPROP_UPDATECRITERIA_ENUM Values -->
-<!--			<LITERAL2>adCriteriaKey</LITERAL2>
-			<LITERAL2>adCriteriaAllCols</LITERAL2>
-			<LITERAL2>adCriteriaUpdCols</LITERAL2>
-			<LITERAL2>adCriteriaTimeStamp</LITERAL2>
--->
-			<!-- ADCPROP_ASYNCTHREADPRIORITY_ENUM Values -->
-<!--			<LITERAL2>adPriorityLowest</LITERAL2>
-			<LITERAL2>adPriorityBelowNormal</LITERAL2>
-			<LITERAL2>adPriorityNormal</LITERAL2>
-			<LITERAL2>adPriorityAboveNormal</LITERAL2>
-			<LITERAL2>adPriorityHighest</LITERAL2>
--->
-			<!-- CEResyncEnum Values -->
-<!--			<LITERAL2>adResyncNone</LITERAL2>
-			<LITERAL2>adResyncAutoIncrement</LITERAL2>
-			<LITERAL2>adResyncConflicts</LITERAL2>
-			<LITERAL2>adResyncUpdates</LITERAL2>
-			<LITERAL2>adResyncInserts</LITERAL2>
-			<LITERAL2>adResyncAll</LITERAL2>
--->
-			<!-- ADCPROP_AUTORECALC_ENUM Values -->
-<!--			<LITERAL2>adRecalcUpFront</LITERAL2>
-			<LITERAL2>adRecalcAlways</LITERAL2>
--->
-		</KEYWORDS>
-	</RULES>
-</MODE>
-
diff --git a/qpython/src/main/assets/syntax/velocity.xml b/qpython/src/main/assets/syntax/velocity.xml
deleted file mode 100644
index 120c8829..00000000
--- a/qpython/src/main/assets/syntax/velocity.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="commentStart" VALUE="#*" />
-		<PROPERTY NAME="commentEnd" VALUE="*#" />
-		<PROPERTY NAME="lineComment" VALUE="##" />
-		<!-- Auto indent -->
-		<PROPERTY NAME="indentNextLines" VALUE="^\s*(#(foreach|if|elseif|else))\s*\(.*\)\s*"/>
-		<PROPERTY NAME="unindentThisLine" VALUE="^\s*#(end|elseif|else)\b.*"/>
-	</PROPS>
-	<RULES IGNORE_CASE="TRUE">
-		<!-- SGML comment -->
-		<SPAN TYPE="COMMENT1">
-			<BEGIN>&lt;!--</BEGIN>
-			<END>--&gt;</END>
-		</SPAN>
-
-		<!-- JavaScript -->
-		<SPAN TYPE="MARKUP" DELEGATE="JAVASCRIPT">
-			<BEGIN>&lt;SCRIPT</BEGIN>
-			<END>&lt;/SCRIPT&gt;</END>
-		</SPAN>
-
-		<!-- stylesheet -->
-		<SPAN TYPE="MARKUP" DELEGATE="CSS">
-			<BEGIN>&lt;STYLE</BEGIN>
-			<END>&lt;/STYLE&gt;</END>
-		</SPAN>
-
-		<!-- DTD instructions -->
-		<SPAN TYPE="KEYWORD2" DELEGATE="xml::DTD-TAGS">
-			<BEGIN>&lt;!</BEGIN>
-			<END>&gt;</END>
-		</SPAN>
-
-		<!-- markup tags -->
-		<SPAN TYPE="MARKUP" DELEGATE="html::TAGS">
-			<BEGIN>&lt;</BEGIN>
-			<END>&gt;</END>
-		</SPAN>
-
-		<!-- SGML entities -->
-		<SPAN TYPE="LITERAL2" NO_WORD_BREAK="TRUE">
-			<BEGIN>&amp;</BEGIN>
-			<END>;</END>
-		</SPAN>
-		<IMPORT DELEGATE="VELOCITY" />
-	</RULES>
-
-	<RULES SET="VELOCITY">
-		<SPAN TYPE="COMMENT2">
-			<BEGIN>#*</BEGIN>
-			<END>*#</END>
-		</SPAN>
-
-		<EOL_SPAN TYPE="COMMENT3">##</EOL_SPAN>
-
-		<SPAN TYPE="KEYWORD3" NO_LINE_BREAK="TRUE">
-			<BEGIN>${</BEGIN>
-			<END>}</END>
-		</SPAN>
-
-		<SEQ_REGEXP HASH_CHAR="$" TYPE="KEYWORD3"
-			>\$!?[A-z][A-z0-9._-]*</SEQ_REGEXP>
-
-		<KEYWORDS>
-			<KEYWORD1>#set</KEYWORD1>
-			<KEYWORD1>#foreach</KEYWORD1>
-			<KEYWORD1>#end</KEYWORD1>
-			<KEYWORD1>#if</KEYWORD1>
-			<KEYWORD1>#else</KEYWORD1>
-			<KEYWORD1>#elseif</KEYWORD1>
-			<KEYWORD1>#parse</KEYWORD1>
-			<KEYWORD1>#macro</KEYWORD1>
-			<KEYWORD1>#stop</KEYWORD1>
-			<KEYWORD1>#include</KEYWORD1>
-		</KEYWORDS>
-	</RULES>
-
-	<RULES SET="JAVASCRIPT" DEFAULT="MARKUP" IGNORE_CASE="TRUE">
-		<SEQ TYPE="MARKUP" DELEGATE="JAVASCRIPT2">&gt;</SEQ>
-		<!-- handle <SCRIPT SRC="..."> properly -->
-		<SEQ TYPE="MARKUP" DELEGATE="BACK_TO_HTML">SRC=</SEQ>
-	</RULES>
-
-	<RULES SET="JAVASCRIPT2"
-		IGNORE_CASE="FALSE"
-		HIGHLIGHT_DIGITS="TRUE"
-		DIGIT_RE="(0x[\p{XDigit}]+[lL]?|[\p{Digit}]+(e[\p{Digit}]*)?[lLdDfF]?)">
-
-		<IMPORT DELEGATE="VELOCITY" />
-		<IMPORT DELEGATE="javascript::MAIN" />
-	</RULES>
-
-	<RULES SET="BACK_TO_HTML" DEFAULT="MARKUP">
-		<SEQ TYPE="MARKUP" DELEGATE="MAIN">&gt;</SEQ>
-	</RULES>
-
-	<RULES SET="CSS" DEFAULT="MARKUP">
-		<SEQ TYPE="MARKUP" DELEGATE="CSS2">&gt;</SEQ>
-	</RULES>
-
-	<RULES SET="CSS2"
-		IGNORE_CASE="TRUE"
-		HIGHLIGHT_DIGITS="TRUE"
-		DIGIT_RE="[\p{Digit}]+(pt|pc|in|mm|cm|em|ex|px|ms|s|%)"
-		NO_WORD_SEP="-_">
-
-		<IMPORT DELEGATE="VELOCITY" />
-		<IMPORT DELEGATE="css::MAIN" />
-	</RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/velocity_pure.xml b/qpython/src/main/assets/syntax/velocity_pure.xml
deleted file mode 100644
index b250f1f1..00000000
--- a/qpython/src/main/assets/syntax/velocity_pure.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!--
- Mode definition for pure Velocity Template Language (VTL) highlighting
-  - In contrast to velocity.xml, there is no sgml highlighting!
-  - valid for jEdit 4.2, 4.3, 4.4 and 4.5.
- 
- Extensions for jEdit's Templates Plugin 4.0.0 are also highlighted:
-  - Special directives and variables added.
-  - Embedded Beanshell scripts are highlighted as java.
- 
- catalog entry recommended for Velocity Template files:
- 
-   <MODE NAME="velocity"
-         FILE="velocity_pure.xml"
-         FILE_NAME_GLOB="*.vm" />
- 
- 16.01.2012 Robert Schwenn
--->
-
-<MODE>
-
-	<PROPS>
-		<PROPERTY NAME="commentStart" VALUE="#*" />
-		<PROPERTY NAME="commentEnd" VALUE="*#" />
-		<PROPERTY NAME="lineComment" VALUE="##" />
-		<!-- Auto indent -->
-		<PROPERTY NAME="indentNextLines" VALUE="^\s*(#(foreach|if|elseif|else|beanshell|macro))\s*\(.*\)\s*"/>
-		<PROPERTY NAME="unindentThisLine" VALUE="^\s*#(end|elseif|else)\b.*"/>
-	</PROPS>
-	
-  <RULES IGNORE_CASE="FALSE">
-
-		<!-- VTL comment -->
-		<SPAN TYPE="COMMENT3">
-			<BEGIN>#**</BEGIN>
-			<END>*#</END>
-		</SPAN>
-
-		<!-- multi-line comment -->
-		<SPAN TYPE="COMMENT1">
-			<BEGIN>#*</BEGIN>
-			<END>*#</END>
-		</SPAN>
-
-		<!--single-line comment -->
-    <EOL_SPAN TYPE="COMMENT2">##</EOL_SPAN>
-    
-		
-		<!-- String -->
-    <SPAN TYPE="LITERAL1" NO_LINE_BREAK="TRUE">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-
-		<!-- Variable name -->
-    <SPAN TYPE="FUNCTION" NO_LINE_BREAK="TRUE">
-			<BEGIN>${</BEGIN>
-			<END>}</END>
-		</SPAN>
-    <SEQ_REGEXP HASH_CHAR="$" TYPE="FUNCTION">\$!?[A-z][A-z0-9._-]*</SEQ_REGEXP>
-
-		<!-- Embedded Beanshell script -->
-    <SPAN TYPE="KEYWORD4" NO_LINE_BREAK="FALSE" DELEGATE="java::MAIN">
-			<BEGIN>#beanshell</BEGIN>
-			<END>#end</END>
-		</SPAN>
-    <!-- More correct, but the whole line after "#beanshell" is highlighted in one color:
-    <SPAN_REGEXP HASH_CHAR="#" TYPE="KEYWORD4" NO_LINE_BREAK="FALSE" DELEGATE="java::MAIN">
-			<BEGIN>#beanshell\s*\((true|false)?\)\s*</BEGIN>
-			<END>#end</END>
-		</SPAN_REGEXP>
-    -->
-
-
-		<KEYWORDS>
-      
-      <KEYWORD4>#macro</KEYWORD4>        <!-- Velocimacro block -->
-			<KEYWORD4>#beanshell</KEYWORD4>    <!-- beanshell block (jEdit-specific) -->
-      
-			<!-- Velocity directives, General -->
-      <KEYWORD1>#set</KEYWORD1>
-			<KEYWORD1>#parse</KEYWORD1>
-			<KEYWORD1>#include</KEYWORD1>
-			<KEYWORD1>#stop</KEYWORD1>
-      
-			<!-- Velocity directives, Flow control -->
-			<KEYWORD3>#if</KEYWORD3>
-			<KEYWORD3>#else</KEYWORD3>
-			<KEYWORD3>#elseif</KEYWORD3>
-			<KEYWORD3>#foreach</KEYWORD3>
-			<KEYWORD3>in</KEYWORD3>
-			<KEYWORD3>#end</KEYWORD3>
-      
-			<!-- Velocity directives, jEdit-specific -->
-			<LITERAL2>#prompt</LITERAL2>
-			<LITERAL2>#yes_no</LITERAL2>
-			<LITERAL2>#today</LITERAL2>
-			<LITERAL2>#caret</LITERAL2>
-			<LITERAL2>#buffermode</LITERAL2>
-      
-			<!-- jEdit-specific variables -->
-      <KEYWORD2>_jeditIndentation</KEYWORD2>
-			<KEYWORD2>_jeditSelection</KEYWORD2>
-			<KEYWORD2>_jeditTab</KEYWORD2>
-			<KEYWORD2>buffer</KEYWORD2>
-			<KEYWORD2>textarea</KEYWORD2>
-			<KEYWORD2>view</KEYWORD2>
-      
-		</KEYWORDS>
-    
-	</RULES>
-
-</MODE>
diff --git a/qpython/src/main/assets/syntax/verilog.xml b/qpython/src/main/assets/syntax/verilog.xml
deleted file mode 100644
index 38a1ee5c..00000000
--- a/qpython/src/main/assets/syntax/verilog.xml
+++ /dev/null
@@ -1,221 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!-- Written By: Wojciech Stryjewski - thvortex@sourceforge.net -->
-
-<MODE>
-	<PROPS>
-		<!-- Rules for indenting:
-		   - Case expressions (a line ending with colon) are indented
-		   - Keywords begin, module, task, etc. always indented
-		   - Keywords if, while, etc. indent only if ; not on the same line
-		-->
-		<PROPERTY NAME="indentNextLines" VALUE="(.*:\s*)|(\s*(begin|fork|task|table|specify|primitive|module|generate|function|case[xz]?)\b.*)|(\s*(always|if|else|for|forever|initial|repeat|while)\b[^;]*)" />
-
-		<PROPERTY NAME="commentStart" VALUE="/*" />
-		<PROPERTY NAME="commentEnd" VALUE="*/" />
-		<PROPERTY NAME="lineComment" VALUE="//" />
-		<PROPERTY NAME="noWordSep" VALUE="_'" />
-		<PROPERTY NAME="wordBreakChars" VALUE=",+-=&lt;&gt;/?^&amp;*" />
-	</PROPS>
-	<RULES IGNORE_CASE="FALSE" HIGHLIGHT_DIGITS="TRUE"
-        DIGIT_RE="([\p{Digit}]|_|[a-fA-F])+" NO_WORD_SEP="'">
-		<!-- Comments -->
-		<SPAN TYPE="COMMENT1">
-			<BEGIN>/*</BEGIN>
-			<END>*/</END>
-		</SPAN>
-		<EOL_SPAN TYPE="COMMENT2">//</EOL_SPAN>
-
-		<!--String Literals -->
-		<SPAN TYPE="LITERAL1" ESCAPE="\" NO_LINE_BREAK="FALSE">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-
-		<SEQ TYPE="DIGIT">'d</SEQ>
-		<SEQ TYPE="DIGIT">'h</SEQ>
-		<SEQ TYPE="DIGIT">'b</SEQ>
-		<SEQ TYPE="DIGIT">'o</SEQ>
-
-		<!-- Function calls, module instantiation, system tasks with args -->
-		<MARK_PREVIOUS TYPE="FUNCTION" MATCH_TYPE="OPERATOR">(</MARK_PREVIOUS>
-		<SEQ TYPE="OPERATOR">)</SEQ>
-
-		<!-- Operators -->
-		<SEQ TYPE="OPERATOR">=</SEQ>
-		<SEQ TYPE="OPERATOR">!</SEQ>
-		<SEQ TYPE="OPERATOR">+</SEQ>
-		<SEQ TYPE="OPERATOR">-</SEQ>
-		<SEQ TYPE="OPERATOR">/</SEQ>
-		<SEQ TYPE="OPERATOR">*</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;</SEQ>
-		<SEQ TYPE="OPERATOR">%</SEQ>
-		<SEQ TYPE="OPERATOR">&amp;</SEQ>
-		<SEQ TYPE="OPERATOR">|</SEQ>
-		<SEQ TYPE="OPERATOR">^</SEQ>
-		<SEQ TYPE="OPERATOR">~</SEQ>
-		<SEQ TYPE="OPERATOR">}</SEQ>
-		<SEQ TYPE="OPERATOR">{</SEQ>
-
-		<KEYWORDS>
-			<!-- Regular Keywords -->
-			<KEYWORD1>always</KEYWORD1>
-			<KEYWORD1>assign</KEYWORD1>
-			<KEYWORD1>begin</KEYWORD1>
-			<KEYWORD1>case</KEYWORD1>
-			<KEYWORD1>casex</KEYWORD1>
-			<KEYWORD1>casez</KEYWORD1>
-			<KEYWORD1>default</KEYWORD1>
-			<KEYWORD1>deassign</KEYWORD1>
-			<KEYWORD1>disable</KEYWORD1>
-			<KEYWORD1>else</KEYWORD1>
-			<KEYWORD1>end</KEYWORD1>
-			<KEYWORD1>endcase</KEYWORD1>
-			<KEYWORD1>endfunction</KEYWORD1>
-			<KEYWORD1>endgenerate</KEYWORD1>
-			<KEYWORD1>endmodule</KEYWORD1>
-			<KEYWORD1>endprimitive</KEYWORD1>
-			<KEYWORD1>endspecify</KEYWORD1>
-			<KEYWORD1>endtable</KEYWORD1>
-			<KEYWORD1>endtask</KEYWORD1>
-			<KEYWORD1>for</KEYWORD1>
-			<KEYWORD1>force</KEYWORD1>
-			<KEYWORD1>forever</KEYWORD1>
-			<KEYWORD1>fork</KEYWORD1>
-			<KEYWORD1>function</KEYWORD1>
-			<KEYWORD1>generate</KEYWORD1>
-			<KEYWORD1>if</KEYWORD1>
-			<KEYWORD1>initial</KEYWORD1>
-			<KEYWORD1>join</KEYWORD1>
-			<KEYWORD1>macromodule</KEYWORD1>
-			<KEYWORD1>module</KEYWORD1>
-			<KEYWORD1>negedge</KEYWORD1>
-			<KEYWORD1>posedge</KEYWORD1>
-			<KEYWORD1>primitive</KEYWORD1>
-			<KEYWORD1>repeat</KEYWORD1>
-			<KEYWORD1>release</KEYWORD1>
-			<KEYWORD1>specify</KEYWORD1>
-			<KEYWORD1>table</KEYWORD1>
-			<KEYWORD1>task</KEYWORD1>
-			<KEYWORD1>wait</KEYWORD1>
-			<KEYWORD1>while</KEYWORD1>
-
-			<!-- Compiler Directives -->
-			<KEYWORD2>`include</KEYWORD2>
-			<KEYWORD2>`define</KEYWORD2>
-			<KEYWORD2>`undef</KEYWORD2>
-			<KEYWORD2>`ifdef</KEYWORD2>
-			<KEYWORD2>`ifndef</KEYWORD2>
-			<KEYWORD2>`else</KEYWORD2>
-			<KEYWORD2>`elsif</KEYWORD2>
-			<KEYWORD2>`endif</KEYWORD2>
-			<KEYWORD2>`timescale</KEYWORD2>
-			<KEYWORD2>`resetall</KEYWORD2>
-			<KEYWORD2>`signed</KEYWORD2>
-			<KEYWORD2>`unsigned</KEYWORD2>
-			<KEYWORD2>`celldefine</KEYWORD2>
-			<KEYWORD2>`endcelldefine</KEYWORD2>
-			<KEYWORD2>`default_nettype</KEYWORD2>
-			<KEYWORD2>`unconnected_drive</KEYWORD2>
-			<KEYWORD2>`nounconnected_drive</KEYWORD2>
-			<KEYWORD2>`protect</KEYWORD2>
-			<KEYWORD2>`endprotect</KEYWORD2>
-			<KEYWORD2>`protected</KEYWORD2>
-			<KEYWORD2>`endprotected</KEYWORD2>
-			<KEYWORD2>`remove_gatename</KEYWORD2>
-			<KEYWORD2>`noremove_gatename</KEYWORD2>
-			<KEYWORD2>`remove_netname</KEYWORD2>
-			<KEYWORD2>`noremove_netname</KEYWORD2>
-			<KEYWORD2>`expand_vectornets</KEYWORD2>
-			<KEYWORD2>`noexpand_vectornets</KEYWORD2>
-			<KEYWORD2>`autoexpand_vectornets</KEYWORD2>
-
-			<!-- Type Declaration Keywords -->
-			<KEYWORD3>integer</KEYWORD3>
-			<KEYWORD3>reg</KEYWORD3>
-			<KEYWORD3>time</KEYWORD3>
-			<KEYWORD3>realtime</KEYWORD3>
-			<KEYWORD3>defparam</KEYWORD3>
-			<KEYWORD3>parameter</KEYWORD3>
-			<KEYWORD3>event</KEYWORD3>
-			<KEYWORD3>wire</KEYWORD3>
-			<KEYWORD3>wand</KEYWORD3>
-			<KEYWORD3>wor</KEYWORD3>
-			<KEYWORD3>tri</KEYWORD3>
-			<KEYWORD3>triand</KEYWORD3>
-			<KEYWORD3>trior</KEYWORD3>
-			<KEYWORD3>tri0</KEYWORD3>
-			<KEYWORD3>tri1</KEYWORD3>
-			<KEYWORD3>trireg</KEYWORD3>
-			<KEYWORD3>vectored</KEYWORD3>
-			<KEYWORD3>scalared</KEYWORD3>
-			<KEYWORD3>input</KEYWORD3>
-			<KEYWORD3>output</KEYWORD3>
-			<KEYWORD3>inout</KEYWORD3>
-			<KEYWORD3>logic</KEYWORD3>
-
-			<!-- Signal Strengths -->
-			<KEYWORD3>supply0</KEYWORD3>
-			<KEYWORD3>supply1</KEYWORD3>
-			<KEYWORD3>strong0</KEYWORD3>
-			<KEYWORD3>strong1</KEYWORD3>
-			<KEYWORD3>pull0</KEYWORD3>
-			<KEYWORD3>pull1</KEYWORD3>
-			<KEYWORD3>weak0</KEYWORD3>
-			<KEYWORD3>weak1</KEYWORD3>
-			<KEYWORD3>highz0</KEYWORD3>
-			<KEYWORD3>highz1</KEYWORD3>
-			<KEYWORD3>small</KEYWORD3>
-			<KEYWORD3>medium</KEYWORD3>
-			<KEYWORD3>large</KEYWORD3>
-
-			<!-- System Tasks With No/Optional Arguments -->
-			<FUNCTION>$stop</FUNCTION>
-			<FUNCTION>$finish</FUNCTION>
-			<FUNCTION>$time</FUNCTION>
-			<FUNCTION>$stime</FUNCTION>
-			<FUNCTION>$realtime</FUNCTION>
-			<FUNCTION>$settrace</FUNCTION>
-			<FUNCTION>$cleartrace</FUNCTION>
-			<FUNCTION>$showscopes</FUNCTION>
-			<FUNCTION>$showvars</FUNCTION>
-			<FUNCTION>$monitoron</FUNCTION>
-			<FUNCTION>$monitoroff</FUNCTION>
-			<FUNCTION>$random</FUNCTION>
-			<FUNCTION>$printtimescale</FUNCTION>
-			<FUNCTION>$timeformat</FUNCTION>
-
-			<!-- Built-in primitives -->
-			<FUNCTION>and</FUNCTION>
-			<FUNCTION>nand</FUNCTION>
-			<FUNCTION>or</FUNCTION>
-			<FUNCTION>nor</FUNCTION>
-			<FUNCTION>xor</FUNCTION>
-			<FUNCTION>xnor</FUNCTION>
-			<FUNCTION>buf</FUNCTION>
-			<FUNCTION>bufif0</FUNCTION>
-			<FUNCTION>bufif1</FUNCTION>
-			<FUNCTION>not</FUNCTION>
-			<FUNCTION>notif0</FUNCTION>
-			<FUNCTION>notif1</FUNCTION>
-			<FUNCTION>nmos</FUNCTION>
-			<FUNCTION>pmos</FUNCTION>
-			<FUNCTION>cmos</FUNCTION>
-			<FUNCTION>rnmos</FUNCTION>
-			<FUNCTION>rpmos</FUNCTION>
-			<FUNCTION>rcmos</FUNCTION>
-			<FUNCTION>tran</FUNCTION>
-			<FUNCTION>tranif0</FUNCTION>
-			<FUNCTION>tranif1</FUNCTION>
-			<FUNCTION>rtran</FUNCTION>
-			<FUNCTION>rtranif0</FUNCTION>
-			<FUNCTION>rtranif1</FUNCTION>
-			<FUNCTION>pullup</FUNCTION>
-			<FUNCTION>pulldown</FUNCTION>
-		</KEYWORDS>
-	</RULES>
-</MODE>
-
diff --git a/qpython/src/main/assets/syntax/vhdl.xml b/qpython/src/main/assets/syntax/vhdl.xml
deleted file mode 100644
index 89d8bcd2..00000000
--- a/qpython/src/main/assets/syntax/vhdl.xml
+++ /dev/null
@@ -1,463 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  contributed by M. Cesar R. Lacruz (mcesar@sec.upm.es)
-  v1.1 2008/08/29
-  from previous work by Dante Fabrizio and Nitsan Vardi
--->
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="label" VALUE="VHDL"/>
-		<PROPERTY NAME="lineComment" VALUE="--"/>
-		<PROPERTY NAME="contextInsensitive" VALUE="true" />
-	</PROPS>
-	<RULES IGNORE_CASE="TRUE">
-
-		<!-- string -->
-		<SPAN_REGEXP TYPE="LITERAL4" AT_WORD_START="TRUE" NO_LINE_BREAK="TRUE">
-			<BEGIN>[box]?"</BEGIN>
-			<END>"</END>
-		</SPAN_REGEXP>
-		<SPAN_REGEXP TYPE="LITERAL4" AT_WORD_START="TRUE" NO_LINE_BREAK="TRUE">
-			<BEGIN>[box]?%</BEGIN>
-			<END>%</END>
-		</SPAN_REGEXP>
-
-		<!-- char -->
-		<SEQ_REGEXP TYPE="LITERAL1" HASH_CHAR="'">(?:'[\x20-\x7e\xa0-\xff]')</SEQ_REGEXP>
-
-		<!-- predefined attribute -->
-		<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="'">'left\b</SEQ_REGEXP>
-		<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="'">'right\b</SEQ_REGEXP>
-		<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="'">'low\b</SEQ_REGEXP>
-		<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="'">'high\b</SEQ_REGEXP>
-		<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="'">'ascending\b</SEQ_REGEXP>
-		<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="'">'image\b</SEQ_REGEXP>
-		<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="'">'value\b</SEQ_REGEXP>
-		<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="'">'pos\b</SEQ_REGEXP>
-		<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="'">'val\b</SEQ_REGEXP>
-		<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="'">'succ\b</SEQ_REGEXP>
-		<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="'">'pred\b</SEQ_REGEXP>
-		<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="'">'leftof\b</SEQ_REGEXP>
-		<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="'">'rightof\b</SEQ_REGEXP>
-		<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="'">'base\b</SEQ_REGEXP>
-		<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="'">'delayed\b</SEQ_REGEXP>
-		<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="'">'stable\b</SEQ_REGEXP>
-		<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="'">'quiet\b</SEQ_REGEXP>
-		<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="'">'transaction\b</SEQ_REGEXP>
-		<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="'">'event\b</SEQ_REGEXP>
-		<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="'">'active\b</SEQ_REGEXP>
-		<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="'">'last_event\b</SEQ_REGEXP>
-		<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="'">'last_active\b</SEQ_REGEXP>
-		<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="'">'last_value\b</SEQ_REGEXP>
-		<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="'">'driving\b</SEQ_REGEXP>
-		<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="'">'driving_value\b</SEQ_REGEXP>
-		<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="'">'range\b</SEQ_REGEXP>
-		<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="'">'reverse_range\b</SEQ_REGEXP>
-		<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="'">'length\b</SEQ_REGEXP>
-		<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="'">'simple_name\b</SEQ_REGEXP>
-		<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="'">'path_name\b</SEQ_REGEXP>
-		<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="'">'instance_name\b</SEQ_REGEXP>
-		<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="'">'foreign\b</SEQ_REGEXP>
-
-		<!-- other attribute -->
-		<MARK_FOLLOWING TYPE="KEYWORD4" MATCH_TYPE="KEYWORD3">'</MARK_FOLLOWING>
-
-		<!-- comment -->
-		<EOL_SPAN TYPE="COMMENT1">--</EOL_SPAN>
-
-		<!-- label -->
-		<!-- sorry, but 'label : component_name', 'label : procedure_name'
-		      & 'label : variable :=' are not managed, as they collide with
-		      'generic_name : generic_type' -->
-		<SEQ_REGEXP TYPE="LABEL" AT_WHITESPACE_END="TRUE">
-			(\w|\w[\w\d_]*[\w\d])\s*(?=:)(?!:=)(?!:\s*\d)(?=:\s*(if\b|case\b|while\b|for\b|loop\b|next\b|null\b|block\b|process\b|wait\b|postponed\b|assert\b|with\b|entity\b|component\b|configuration\b|exit\b|return\b|(?:(?:\w[\w\d_]*\w|\w)\s*&lt;=)))
-		</SEQ_REGEXP>
-
-		<!-- operator -->
-		<SEQ TYPE="OPERATOR">(</SEQ>
-		<SEQ TYPE="OPERATOR">)</SEQ>
-		<SEQ TYPE="OPERATOR">=&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">**</SEQ>
-		<SEQ TYPE="OPERATOR">:=</SEQ>
-		<SEQ TYPE="OPERATOR">/=</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;=</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;=</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">=</SEQ>
-		<SEQ TYPE="OPERATOR">:</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;</SEQ>
-		<SEQ TYPE="OPERATOR">+</SEQ>
-		<SEQ TYPE="OPERATOR">-</SEQ>
-		<SEQ TYPE="OPERATOR">/</SEQ>
-		<SEQ TYPE="OPERATOR">*</SEQ>
-		<SEQ TYPE="OPERATOR">&amp;</SEQ>
-		<SEQ TYPE="OPERATOR">|</SEQ>
-
-		<!-- number -->
-		<SEQ_REGEXP TYPE="DIGIT" AT_WORD_START="TRUE"
-			>\d{1,2}#(?:(?:[\da-f][\da-f_]*\.?[\da-f_]*[\da-f])|[\da-f])#(?:e[+-]?(?:\d[\d_]*\d|\d))?
-		</SEQ_REGEXP>
-		<SEQ_REGEXP TYPE="DIGIT" AT_WORD_START="TRUE"
-			>\d{1,2}:(?:(?:[\da-f][\da-f_]*\.?[\da-f_]*[\da-f])|[\da-f]):(?:e[+-]?(?:\d[\d_]*\d|\d))?
-		</SEQ_REGEXP>
-		<SEQ_REGEXP TYPE="DIGIT" AT_WORD_START="TRUE"
-			>(?:(?:\d[\d_]*\.?[\d_]*\d)|\d)(?:e[+-]?(?:\d[\d_]*\d|\d))?
-		</SEQ_REGEXP>
-
-		<KEYWORDS>
-			<!-- VHDL-87 keyword -->
-			<KEYWORD1>access</KEYWORD1>
-			<KEYWORD1>after</KEYWORD1>
-			<KEYWORD1>alias</KEYWORD1>
-			<KEYWORD1>all</KEYWORD1>
-			<KEYWORD1>architecture</KEYWORD1>
-			<KEYWORD1>array</KEYWORD1>
-			<KEYWORD1>assert</KEYWORD1>
-			<KEYWORD1>attribute</KEYWORD1>
-			<KEYWORD1>begin</KEYWORD1>
-			<KEYWORD1>block</KEYWORD1>
-			<KEYWORD1>body</KEYWORD1>
-			<KEYWORD1>buffer</KEYWORD1>
-			<KEYWORD1>bus</KEYWORD1>
-			<KEYWORD1>case</KEYWORD1>
-			<KEYWORD1>component</KEYWORD1>
-			<KEYWORD1>configuration</KEYWORD1>
-			<KEYWORD1>constant</KEYWORD1>
-			<KEYWORD1>disconnect</KEYWORD1>
-			<KEYWORD1>downto</KEYWORD1>
-			<KEYWORD1>else</KEYWORD1>
-			<KEYWORD1>elsif</KEYWORD1>
-			<KEYWORD1>end</KEYWORD1>
-			<KEYWORD1>entity</KEYWORD1>
-			<KEYWORD1>exit</KEYWORD1>
-			<KEYWORD1>file</KEYWORD1>
-			<KEYWORD1>for</KEYWORD1>
-			<KEYWORD1>function</KEYWORD1>
-			<KEYWORD1>generate</KEYWORD1>
-			<KEYWORD1>generic</KEYWORD1>
-			<KEYWORD1>guarded</KEYWORD1>
-			<KEYWORD1>if</KEYWORD1>
-			<KEYWORD1>in</KEYWORD1>
-			<KEYWORD1>inout</KEYWORD1>
-			<KEYWORD1>is</KEYWORD1>
-			<KEYWORD1>label</KEYWORD1>
-			<KEYWORD1>library</KEYWORD1>
-			<KEYWORD1>linkage</KEYWORD1>
-			<KEYWORD1>loop</KEYWORD1>
-			<KEYWORD1>map</KEYWORD1>
-			<KEYWORD1>new</KEYWORD1>
-			<KEYWORD1>next</KEYWORD1>
-			<KEYWORD1>null</KEYWORD1>
-			<KEYWORD1>of</KEYWORD1>
-			<KEYWORD1>on</KEYWORD1>
-			<KEYWORD1>open</KEYWORD1>
-			<KEYWORD1>others</KEYWORD1>
-			<KEYWORD1>out</KEYWORD1>
-			<KEYWORD1>package</KEYWORD1>
-			<KEYWORD1>port</KEYWORD1>
-			<KEYWORD1>procedure</KEYWORD1>
-			<KEYWORD1>process</KEYWORD1>
-			<KEYWORD1>range</KEYWORD1>
-			<KEYWORD1>record</KEYWORD1>
-			<KEYWORD1>register</KEYWORD1>
-			<KEYWORD1>report</KEYWORD1>
-			<KEYWORD1>return</KEYWORD1>
-			<KEYWORD1>select</KEYWORD1>
-			<KEYWORD1>severity</KEYWORD1>
-			<KEYWORD1>signal</KEYWORD1>
-			<KEYWORD1>subtype</KEYWORD1>
-			<KEYWORD1>then</KEYWORD1>
-			<KEYWORD1>to</KEYWORD1>
-			<KEYWORD1>transport</KEYWORD1>
-			<KEYWORD1>type</KEYWORD1>
-			<KEYWORD1>units</KEYWORD1>
-			<KEYWORD1>until</KEYWORD1>
-			<KEYWORD1>use</KEYWORD1>
-			<KEYWORD1>variable</KEYWORD1>
-			<KEYWORD1>wait</KEYWORD1>
-			<KEYWORD1>when</KEYWORD1>
-			<KEYWORD1>while</KEYWORD1>
-			<KEYWORD1>with</KEYWORD1>
-
-			<!-- VHDL-93 new keyword -->
-			<KEYWORD1>group</KEYWORD1>
-			<KEYWORD1>impure</KEYWORD1>
-			<KEYWORD1>inertial</KEYWORD1>
-			<KEYWORD1>literal</KEYWORD1>
-			<KEYWORD1>postponed</KEYWORD1>
-			<KEYWORD1>pure</KEYWORD1>
-			<KEYWORD1>reject</KEYWORD1>
-			<KEYWORD1>shared</KEYWORD1>
-			<KEYWORD1>unaffected</KEYWORD1>
-
-			<!-- VHDL-2001 new keyword -->
-			<KEYWORD1>protected</KEYWORD1>
-
-			<!-- VHDL-87 keyword, but shown as operator -->
-			<OPERATOR>abs</OPERATOR>
-			<OPERATOR>and</OPERATOR>
-			<OPERATOR>mod</OPERATOR>
-			<OPERATOR>nand</OPERATOR>
-			<OPERATOR>nor</OPERATOR>
-			<OPERATOR>not</OPERATOR>
-			<OPERATOR>or</OPERATOR>
-			<OPERATOR>rem</OPERATOR>
-			<OPERATOR>xor</OPERATOR>
-
-			<!-- VHDL-93 new keyword, but shown as operator -->
-			<OPERATOR>rol</OPERATOR>
-			<OPERATOR>ror</OPERATOR>
-			<OPERATOR>sll</OPERATOR>
-			<OPERATOR>srl</OPERATOR>
-			<OPERATOR>sla</OPERATOR>
-			<OPERATOR>sra</OPERATOR>
-			<OPERATOR>xnor</OPERATOR>
-
-			<!-- VHDL-87 keyword, but shown as function -->
-			<FUNCTION>deallocate</FUNCTION>
-
-			<!-- built-in & standard type -->
-			<KEYWORD2>bit</KEYWORD2>
-			<KEYWORD2>bit_vector</KEYWORD2>
-			<KEYWORD2>boolean</KEYWORD2>
-			<KEYWORD2>character</KEYWORD2>
-			<KEYWORD2>delay_length</KEYWORD2>
-			<FUNCTION>now</FUNCTION>
-			<FUNCTION>file_open</FUNCTION>
-			<FUNCTION>file_close</FUNCTION>
-			<FUNCTION>read</FUNCTION>
-			<FUNCTION>write</FUNCTION>
-			<FUNCTION>endfile</FUNCTION>
-			<KEYWORD2>file_open_kind</KEYWORD2>
-			<KEYWORD2>file_open_status</KEYWORD2>
-			<KEYWORD2>integer</KEYWORD2>
-			<KEYWORD2>natural</KEYWORD2>
-			<KEYWORD2>positive</KEYWORD2>
-			<KEYWORD2>real</KEYWORD2>
-			<KEYWORD2>severity_level</KEYWORD2>
-			<KEYWORD2>string</KEYWORD2>
-			<KEYWORD2>time</KEYWORD2>
-			<!-- boolean -->
-			<LITERAL1>false</LITERAL1>
-			<LITERAL1>true</LITERAL1>
-			<!-- char, only those not having a ' ' representation -->
-			<LITERAL1>nul</LITERAL1>
-			<LITERAL1>soh</LITERAL1>
-			<LITERAL1>stx</LITERAL1>
-			<LITERAL1>etx</LITERAL1>
-			<LITERAL1>eot</LITERAL1>
-			<LITERAL1>enq</LITERAL1>
-			<LITERAL1>ack</LITERAL1>
-			<LITERAL1>bel</LITERAL1>
-			<LITERAL1>bs</LITERAL1>
-			<LITERAL1>ht</LITERAL1>
-			<LITERAL1>lf</LITERAL1>
-			<LITERAL1>vt</LITERAL1>
-			<LITERAL1>ff</LITERAL1>
-			<LITERAL1>cr</LITERAL1>
-			<LITERAL1>so</LITERAL1>
-			<LITERAL1>si</LITERAL1>
-			<LITERAL1>dle</LITERAL1>
-			<LITERAL1>dc1</LITERAL1>
-			<LITERAL1>dc2</LITERAL1>
-			<LITERAL1>dc3</LITERAL1>
-			<LITERAL1>dc4</LITERAL1>
-			<LITERAL1>nak</LITERAL1>
-			<LITERAL1>syn</LITERAL1>
-			<LITERAL1>etb</LITERAL1>
-			<LITERAL1>can</LITERAL1>
-			<LITERAL1>em</LITERAL1>
-			<LITERAL1>sub</LITERAL1>
-			<LITERAL1>esc</LITERAL1>
-			<LITERAL1>fsp</LITERAL1>
-			<LITERAL1>gsp</LITERAL1>
-			<LITERAL1>rsp</LITERAL1>
-			<LITERAL1>usp</LITERAL1>
-			<LITERAL1>del</LITERAL1>
-			<LITERAL1>c128</LITERAL1>
-			<LITERAL1>c129</LITERAL1>
-			<LITERAL1>c130</LITERAL1>
-			<LITERAL1>c131</LITERAL1>
-			<LITERAL1>c132</LITERAL1>
-			<LITERAL1>c133</LITERAL1>
-			<LITERAL1>c134</LITERAL1>
-			<LITERAL1>c135</LITERAL1>
-			<LITERAL1>c136</LITERAL1>
-			<LITERAL1>c137</LITERAL1>
-			<LITERAL1>c138</LITERAL1>
-			<LITERAL1>c139</LITERAL1>
-			<LITERAL1>c140</LITERAL1>
-			<LITERAL1>c141</LITERAL1>
-			<LITERAL1>c142</LITERAL1>
-			<LITERAL1>c143</LITERAL1>
-			<LITERAL1>c144</LITERAL1>
-			<LITERAL1>c145</LITERAL1>
-			<LITERAL1>c146</LITERAL1>
-			<LITERAL1>c147</LITERAL1>
-			<LITERAL1>c148</LITERAL1>
-			<LITERAL1>c149</LITERAL1>
-			<LITERAL1>c150</LITERAL1>
-			<LITERAL1>c151</LITERAL1>
-			<LITERAL1>c152</LITERAL1>
-			<LITERAL1>c153</LITERAL1>
-			<LITERAL1>c154</LITERAL1>
-			<LITERAL1>c155</LITERAL1>
-			<LITERAL1>c156</LITERAL1>
-			<LITERAL1>c157</LITERAL1>
-			<LITERAL1>c158</LITERAL1>
-			<LITERAL1>c159</LITERAL1>
-			<!-- severity_level -->
-			<LITERAL1>note</LITERAL1>
-			<LITERAL1>warning</LITERAL1>
-			<LITERAL1>error</LITERAL1>
-			<LITERAL1>failure</LITERAL1>
-			<!-- file_open_kind -->
-			<LITERAL1>read_mode</LITERAL1>
-			<LITERAL1>write_mode</LITERAL1>
-			<LITERAL1>append_mode</LITERAL1>
-			<!-- file_open_status -->
-			<LITERAL1>open_ok</LITERAL1>
-			<LITERAL1>status_error</LITERAL1>
-			<LITERAL1>name_error</LITERAL1>
-			<LITERAL1>mode_error</LITERAL1>
-
-			<!-- ieee.std_logic_1164 -->
-			<KEYWORD2>std_logic</KEYWORD2>
-			<KEYWORD2>std_ulogic</KEYWORD2>
-			<KEYWORD2>std_logic_vector</KEYWORD2>
-			<KEYWORD2>std_ulogic_vector</KEYWORD2>
-			<KEYWORD2>x01</KEYWORD2>
-			<KEYWORD2>x01z</KEYWORD2>
-			<KEYWORD2>ux01</KEYWORD2>
-			<KEYWORD2>ux01z</KEYWORD2>
-			<FUNCTION>to_bit</FUNCTION>
-			<FUNCTION>to_bitvector</FUNCTION>
-			<FUNCTION>to_stdulogic</FUNCTION>
-			<FUNCTION>to_stdlogicvector</FUNCTION>
-			<FUNCTION>to_stdulogicvector</FUNCTION>
-			<FUNCTION>to_x01</FUNCTION>
-			<FUNCTION>to_x01z</FUNCTION>
-			<FUNCTION>to_ux01</FUNCTION>
-			<FUNCTION>rising_edge</FUNCTION>
-			<FUNCTION>falling_edge</FUNCTION>
-			<FUNCTION>is_x</FUNCTION>
-
-			<!-- ieee.numeric_std -->
-			<KEYWORD2>signed</KEYWORD2>
-			<KEYWORD2>unsigned</KEYWORD2>
-			<FUNCTION>shift_left</FUNCTION>
-			<FUNCTION>shift_right</FUNCTION>
-			<FUNCTION>rotate_left</FUNCTION>
-			<FUNCTION>rotate_right</FUNCTION>
-			<FUNCTION>resize</FUNCTION>
-			<FUNCTION>std_match</FUNCTION>
-			<FUNCTION>to_integer</FUNCTION>
-			<FUNCTION>to_unsigned</FUNCTION>
-			<FUNCTION>to_signed</FUNCTION>
-
-			<!-- std.textio -->
-			<KEYWORD2>line</KEYWORD2>
-			<KEYWORD2>text</KEYWORD2>
-			<KEYWORD2>side</KEYWORD2>
-			<KEYWORD2>width</KEYWORD2>
-			<LITERAL2>left</LITERAL2>
-			<LITERAL2>right</LITERAL2>
-			<LITERAL2>std_input</LITERAL2>
-			<LITERAL2>std_output</LITERAL2>
-			<LITERAL3>input</LITERAL3>
-			<LITERAL3>output</LITERAL3>
-			<FUNCTION>readline</FUNCTION>
-			<FUNCTION>writeline</FUNCTION>
-
-			<!-- ieee.std_logic_textio -->
-			<FUNCTION>oread</FUNCTION>
-			<FUNCTION>owrite</FUNCTION>
-			<FUNCTION>hread</FUNCTION>
-			<FUNCTION>hwrite</FUNCTION>
-
-			<!-- ieee.std_logic_arith -->
-			<KEYWORD2>signed</KEYWORD2>
-			<KEYWORD2>unsigned</KEYWORD2>
-			<KEYWORD2>small_int</KEYWORD2>
-			<FUNCTION>conv_integer</FUNCTION>
-			<FUNCTION>conv_unsigned</FUNCTION>
-			<FUNCTION>conv_signed</FUNCTION>
-			<FUNCTION>conv_std_logic_vector</FUNCTION>
-			<FUNCTION>shl</FUNCTION>
-			<FUNCTION>shr</FUNCTION>
-			<FUNCTION>ext</FUNCTION>
-			<FUNCTION>sxt</FUNCTION>
-
-			<!-- ieee.math_real -->
-			<LITERAL2>math_e</LITERAL2>
-			<LITERAL2>math_1_over_e</LITERAL2>
-			<LITERAL2>math_pi</LITERAL2>
-			<LITERAL2>math_2_pi</LITERAL2>
-			<LITERAL2>math_1_over_pi</LITERAL2>
-			<LITERAL2>math_pi_over_2</LITERAL2>
-			<LITERAL2>math_pi_over_3</LITERAL2>
-			<LITERAL2>math_pi_over_4</LITERAL2>
-			<LITERAL2>math_3_pi_over_2</LITERAL2>
-			<LITERAL2>math_log_of_2</LITERAL2>
-			<LITERAL2>math_log_of_10</LITERAL2>
-			<LITERAL2>math_log2_of_e</LITERAL2>
-			<LITERAL2>math_log10_of_e</LITERAL2>
-			<LITERAL2>math_sqrt_2</LITERAL2>
-			<LITERAL2>math_1_over_sqrt_2</LITERAL2>
-			<LITERAL2>math_sqrt_pi</LITERAL2>
-			<LITERAL2>math_deg_to_rad</LITERAL2>
-			<LITERAL2>math_rad_to_deg</LITERAL2>
-			<FUNCTION>sign</FUNCTION>
-			<FUNCTION>ceil</FUNCTION>
-			<FUNCTION>floor</FUNCTION>
-			<FUNCTION>round</FUNCTION>
-			<FUNCTION>trunc</FUNCTION>
-			<FUNCTION>realmax</FUNCTION>
-			<FUNCTION>realmin</FUNCTION>
-			<FUNCTION>uniform</FUNCTION>
-			<FUNCTION>sqrt</FUNCTION>
-			<FUNCTION>cbrt</FUNCTION>
-			<FUNCTION>exp</FUNCTION>
-			<FUNCTION>log</FUNCTION>
-			<FUNCTION>log2</FUNCTION>
-			<FUNCTION>log10</FUNCTION>
-			<FUNCTION>sin</FUNCTION>
-			<FUNCTION>cos</FUNCTION>
-			<FUNCTION>tan</FUNCTION>
-			<FUNCTION>arcsin</FUNCTION>
-			<FUNCTION>arccos</FUNCTION>
-			<FUNCTION>arctan</FUNCTION>
-			<FUNCTION>sinh</FUNCTION>
-			<FUNCTION>cosh</FUNCTION>
-			<FUNCTION>tanh</FUNCTION>
-			<FUNCTION>arcsinh</FUNCTION>
-			<FUNCTION>arccosh</FUNCTION>
-			<FUNCTION>arctanh</FUNCTION>
-
-			<!-- ieee.math_complex -->
-			<KEYWORD2>complex</KEYWORD2>
-			<KEYWORD2>positive_real</KEYWORD2>
-			<KEYWORD2>principal_value</KEYWORD2>
-			<KEYWORD2>complex_polar</KEYWORD2>
-			<KEYWORD2>re</KEYWORD2>
-			<KEYWORD2>im</KEYWORD2>
-			<KEYWORD2>mag</KEYWORD2>
-			<KEYWORD2>arg</KEYWORD2>
-			<LITERAL2>math_cbase_1</LITERAL2>
-			<LITERAL2>math_cbase_j</LITERAL2>
-			<LITERAL2>math_czero</LITERAL2>
-			<FUNCTION>cmplx</FUNCTION>
-			<FUNCTION>get_principal_value</FUNCTION>
-			<FUNCTION>complex_to_polar</FUNCTION>
-			<FUNCTION>polar_to_complex</FUNCTION>
-			<FUNCTION>conj</FUNCTION>
-
-		</KEYWORDS>
-	</RULES>
-</MODE>
-
-
diff --git a/qpython/src/main/assets/syntax/visualbasic.xml b/qpython/src/main/assets/syntax/visualbasic.xml
deleted file mode 100644
index 5ca4a1c4..00000000
--- a/qpython/src/main/assets/syntax/visualbasic.xml
+++ /dev/null
@@ -1,1164 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!-- Catalog entry:
-	<MODE NAME="visualbasic" FILE="visualbasic.xml" FILE_NAME_GLOB="*.{vb}" />
--->
-
-<!--
-	Visual Basic by Marcelo Gennari (margenn@gmail.com)
-	Based on VBScript mode by Andre Kaplan
--->
-
-<MODE>
-
-	<PROPS>
-		<PROPERTY NAME="lineComment" VALUE="'" />
-		<PROPERTY NAME="wordBreakChars" VALUE=",+-=&lt;&gt;/?^&amp;*" />
-		<PROPERTY NAME="indentNextLine"
-			VALUE="\s*(do until|else|elseif|for|function|if|select case|sub|while)\s*(then)?.*"
-		/>
-		<PROPERTY NAME="unindentNextLine" VALUE="\s*(end (if|select)|loop|wend)\s*" />
-		<PROPERTY NAME="contextInsensitive" VALUE="true" />
-	</PROPS>
-
-	<RULES IGNORE_CASE="TRUE" HIGHLIGHT_DIGITS="TRUE">
-
-		<SPAN TYPE="LITERAL1" NO_LINE_BREAK="TRUE"> <BEGIN>"</BEGIN> <END>"</END> </SPAN>
-
-		<!-- conditional compilation -->
-		<EOL_SPAN TYPE="KEYWORD4">#if</EOL_SPAN>
-		<EOL_SPAN TYPE="KEYWORD4">#else</EOL_SPAN>
-		<EOL_SPAN TYPE="KEYWORD4">#end</EOL_SPAN>
-		<EOL_SPAN TYPE="COMMENT1">'</EOL_SPAN>
-		<EOL_SPAN TYPE="COMMENT1">rem </EOL_SPAN>
-		
-		<!-- Dates -->
-		<SEQ_REGEXP TYPE="KEYWORD3" HASH_CHARS="#" 
-				AT_WORD_START="TRUE">#\d{1,4}/\d{1,4}/\d{1,4}( \d{1,2}\:\d{1,2}(:\d{1,2}| ?(am|pm))?)?#</SEQ_REGEXP>
-
-		<!-- Numbers: Float|Int|Hex|Oct and variations -->
-		<SEQ_REGEXP TYPE="DIGIT" HASH_CHARS="0123456789-&amp;"
-				AT_WORD_START="TRUE">-?(\d+\.\d+([!@]|E[+-]\d+)?|\d+[&amp;!@#]?|&amp;H[0-9A-F]+&amp;?|&amp;O[0-7]+&amp;?)</SEQ_REGEXP>
-		
-		<!-- Recordset fields -->
-		<SEQ_REGEXP TYPE="LITERAL4" HASH_CHARS="abcdefghijklmnopqrstuvwxyz" AT_WORD_START="TRUE">\w+!\w+\b</SEQ_REGEXP>
-
-		<!-- Labels -->
-		<MARK_PREVIOUS TYPE="LABEL" MATCH_TYPE="NULL" AT_LINE_START="TRUE">:</MARK_PREVIOUS>
-
-		<!-- Functions -->
-		<MARK_PREVIOUS TYPE="FUNCTION" MATCH_TYPE="NULL">(</MARK_PREVIOUS>
-
-
-		<KEYWORDS>
-			<!-- API Functions -->
-			<KEYWORD1>Abs</KEYWORD1>
-			<KEYWORD1>Array</KEYWORD1>
-			<KEYWORD1>Asc</KEYWORD1>
-			<KEYWORD1>AscB</KEYWORD1>
-			<KEYWORD1>AscW</KEYWORD1>
-			<KEYWORD1>Atn</KEYWORD1>
-			<KEYWORD1>Avg</KEYWORD1>
-			<KEYWORD1>CBool</KEYWORD1>
-			<KEYWORD1>CByte</KEYWORD1>
-			<KEYWORD1>CCur</KEYWORD1>
-			<KEYWORD1>CDate</KEYWORD1>
-			<KEYWORD1>CDbl</KEYWORD1>
-			<KEYWORD1>Cdec</KEYWORD1>
-			<KEYWORD1>Choose</KEYWORD1>
-			<KEYWORD1>Chr</KEYWORD1>
-			<KEYWORD1>ChrB</KEYWORD1>
-			<KEYWORD1>ChrW</KEYWORD1>
-			<KEYWORD1>CInt</KEYWORD1>
-			<KEYWORD1>CLng</KEYWORD1>
-			<KEYWORD1>Command</KEYWORD1>
-			<KEYWORD1>Cos</KEYWORD1>
-			<KEYWORD1>Count</KEYWORD1>
-			<KEYWORD1>CreateObject</KEYWORD1>
-			<KEYWORD1>CSng</KEYWORD1>
-			<KEYWORD1>CStr</KEYWORD1>
-			<KEYWORD1>CurDir</KEYWORD1>
-			<KEYWORD1>CVar</KEYWORD1>
-			<KEYWORD1>CVDate</KEYWORD1>
-			<KEYWORD1>CVErr</KEYWORD1>
-			<KEYWORD1>DateAdd</KEYWORD1>
-			<KEYWORD1>DateDiff</KEYWORD1>
-			<KEYWORD1>DatePart</KEYWORD1>
-			<KEYWORD1>DateSerial</KEYWORD1>
-			<KEYWORD1>DateValue</KEYWORD1>
-			<KEYWORD1>Day</KEYWORD1>
-			<KEYWORD1>DDB</KEYWORD1>
-			<KEYWORD1>Dir</KEYWORD1>
-			<KEYWORD1>DoEvents</KEYWORD1>
-			<KEYWORD1>Environ</KEYWORD1>
-			<KEYWORD1>EOF</KEYWORD1>
-			<KEYWORD1>Exp</KEYWORD1>
-			<KEYWORD1>FileAttr</KEYWORD1>
-			<KEYWORD1>FileDateTime</KEYWORD1>
-			<KEYWORD1>FileLen</KEYWORD1>
-			<KEYWORD1>Fix</KEYWORD1>
-			<KEYWORD1>Format</KEYWORD1>
-			<KEYWORD1>FreeFile</KEYWORD1>
-			<KEYWORD1>FV</KEYWORD1>
-			<KEYWORD1>GetAllStrings</KEYWORD1>
-			<KEYWORD1>GetAttr</KEYWORD1>
-			<KEYWORD1>GetAutoServerSettings</KEYWORD1>
-			<KEYWORD1>GetObject</KEYWORD1>
-			<KEYWORD1>GetSetting</KEYWORD1>
-			<KEYWORD1>Hex</KEYWORD1>
-			<KEYWORD1>Hour</KEYWORD1>
-			<KEYWORD1>IIf</KEYWORD1>
-			<KEYWORD1>IMEStatus</KEYWORD1>
-			<KEYWORD1>Input</KEYWORD1>
-			<KEYWORD1>InputB</KEYWORD1>
-			<KEYWORD1>InputBox</KEYWORD1>
-			<KEYWORD1>InStr</KEYWORD1>
-			<KEYWORD1>InstB</KEYWORD1>
-			<KEYWORD1>Int</KEYWORD1>
-			<KEYWORD1>IPmt</KEYWORD1>
-			<KEYWORD1>IsArray</KEYWORD1>
-			<KEYWORD1>IsDate</KEYWORD1>
-			<KEYWORD1>IsEmpty</KEYWORD1>
-			<KEYWORD1>IsError</KEYWORD1>
-			<KEYWORD1>IsMissing</KEYWORD1>
-			<KEYWORD1>IsNull</KEYWORD1>
-			<KEYWORD1>IsNumeric</KEYWORD1>
-			<KEYWORD1>IsObject</KEYWORD1>
-			<KEYWORD1>LBound</KEYWORD1>
-			<KEYWORD1>LCase</KEYWORD1>
-			<KEYWORD1>Left</KEYWORD1>
-			<KEYWORD1>LeftB</KEYWORD1>
-			<KEYWORD1>Len</KEYWORD1>
-			<KEYWORD1>LenB</KEYWORD1>
-			<KEYWORD1>LoadPicture</KEYWORD1>
-			<KEYWORD1>Loc</KEYWORD1>
-			<KEYWORD1>LOF</KEYWORD1>
-			<KEYWORD1>Log</KEYWORD1>
-			<KEYWORD1>LTrim</KEYWORD1>
-			<KEYWORD1>Max</KEYWORD1>
-			<KEYWORD1>Mid</KEYWORD1>
-			<KEYWORD1>MidB</KEYWORD1>
-			<KEYWORD1>Min</KEYWORD1>
-			<KEYWORD1>Minute</KEYWORD1>
-			<KEYWORD1>MIRR</KEYWORD1>
-			<KEYWORD1>Month</KEYWORD1>
-			<KEYWORD1>MsgBox</KEYWORD1>
-			<KEYWORD1>Now</KEYWORD1>
-			<KEYWORD1>NPer</KEYWORD1>
-			<KEYWORD1>NPV</KEYWORD1>
-			<KEYWORD1>Oct</KEYWORD1>
-			<KEYWORD1>Partition</KEYWORD1>
-			<KEYWORD1>Pmt</KEYWORD1>
-			<KEYWORD1>PPmt</KEYWORD1>
-			<KEYWORD1>PV</KEYWORD1>
-			<KEYWORD1>QBColor</KEYWORD1>
-			<KEYWORD1>Rate</KEYWORD1>
-			<KEYWORD1>RGB</KEYWORD1>
-			<KEYWORD1>Right</KEYWORD1>
-			<KEYWORD1>RightB</KEYWORD1>
-			<KEYWORD1>Rnd</KEYWORD1>
-			<KEYWORD1>RTrim</KEYWORD1>
-			<KEYWORD1>Second</KEYWORD1>
-			<KEYWORD1>Seek</KEYWORD1>
-			<KEYWORD1>Sgn</KEYWORD1>
-			<KEYWORD1>Shell</KEYWORD1>
-			<KEYWORD1>Sin</KEYWORD1>
-			<KEYWORD1>SLN</KEYWORD1>
-			<KEYWORD1>Space</KEYWORD1>
-			<KEYWORD1>Spc</KEYWORD1>
-			<KEYWORD1>Sqr</KEYWORD1>
-			<KEYWORD1>StDev</KEYWORD1>
-			<KEYWORD1>StDevP</KEYWORD1>
-			<KEYWORD1>Str</KEYWORD1>
-			<KEYWORD1>StrComp</KEYWORD1>
-			<KEYWORD1>StrConv</KEYWORD1>
-			<KEYWORD1>Switch</KEYWORD1>
-			<KEYWORD1>Sum</KEYWORD1>
-			<KEYWORD1>SYD</KEYWORD1>
-			<KEYWORD1>Tab</KEYWORD1>
-			<KEYWORD1>Tan</KEYWORD1>
-			<KEYWORD1>Time</KEYWORD1>
-			<KEYWORD1>Timer</KEYWORD1>
-			<KEYWORD1>TimeSerial</KEYWORD1>
-			<KEYWORD1>TimeValue</KEYWORD1>
-			<KEYWORD1>Trim</KEYWORD1>
-			<KEYWORD1>TypeName</KEYWORD1>
-			<KEYWORD1>UBound</KEYWORD1>
-			<KEYWORD1>UCase</KEYWORD1>
-			<KEYWORD1>Val</KEYWORD1>
-			<KEYWORD1>Var</KEYWORD1>
-			<KEYWORD1>VarP</KEYWORD1>
-			<KEYWORD1>VarType</KEYWORD1>
-			<KEYWORD1>Weekday</KEYWORD1>
-			<KEYWORD1>Year</KEYWORD1>
-
-			<!--Methods-->
-			<KEYWORD2>Accept</KEYWORD2>
-			<KEYWORD2>Activate</KEYWORD2>
-			<KEYWORD2>Add</KEYWORD2>
-			<KEYWORD2>AddCustom</KEYWORD2>
-			<KEYWORD2>AddFile</KEYWORD2>
-			<KEYWORD2>AddFromFile</KEYWORD2>
-			<KEYWORD2>AddFromTemplate</KEYWORD2>
-			<KEYWORD2>AddItem</KEYWORD2>
-			<KEYWORD2>AddNew</KEYWORD2>
-			<KEYWORD2>AddToAddInToolbar</KEYWORD2>
-			<KEYWORD2>AddToolboxProgID</KEYWORD2>
-			<KEYWORD2>Append</KEYWORD2>
-			<KEYWORD2>AppendChunk</KEYWORD2>
-			<KEYWORD2>Arrange</KEYWORD2>
-			<KEYWORD2>Assert</KEYWORD2>
-			<KEYWORD2>AsyncRead</KEYWORD2>
-			<KEYWORD2>BatchUpdate</KEYWORD2>
-			<KEYWORD2>BeginTrans</KEYWORD2>
-			<KEYWORD2>Bind</KEYWORD2>
-			<KEYWORD2>Cancel</KEYWORD2>
-			<KEYWORD2>CancelAsyncRead</KEYWORD2>
-			<KEYWORD2>CancelBatch</KEYWORD2>
-			<KEYWORD2>CancelUpdate</KEYWORD2>
-			<KEYWORD2>CanPropertyChange</KEYWORD2>
-			<KEYWORD2>CaptureImage</KEYWORD2>
-			<KEYWORD2>CellText</KEYWORD2>
-			<KEYWORD2>CellValue</KEYWORD2>
-			<KEYWORD2>Circle</KEYWORD2>
-			<KEYWORD2>Clear</KEYWORD2>
-			<KEYWORD2>ClearFields</KEYWORD2>
-			<KEYWORD2>ClearSel</KEYWORD2>
-			<KEYWORD2>ClearSelCols</KEYWORD2>
-			<KEYWORD2>Clone</KEYWORD2>
-			<KEYWORD2>Close</KEYWORD2>
-			<KEYWORD2>Cls</KEYWORD2>
-			<KEYWORD2>ColContaining</KEYWORD2>
-			<KEYWORD2>ColumnSize</KEYWORD2>
-			<KEYWORD2>CommandTimeout</KEYWORD2>
-			<KEYWORD2>CommitTrans</KEYWORD2>
-			<KEYWORD2>CompactDatabase</KEYWORD2>
-			<KEYWORD2>Compose</KEYWORD2>
-			<KEYWORD2>Connect</KEYWORD2>
-			<KEYWORD2>ConnectionTimeout</KEYWORD2>
-			<KEYWORD2>Copy</KEYWORD2>
-			<KEYWORD2>CopyQueryDef</KEYWORD2>
-			<KEYWORD2>CreateDatabase</KEYWORD2>
-			<KEYWORD2>CreateDragImage</KEYWORD2>
-			<KEYWORD2>CreateEmbed</KEYWORD2>
-			<KEYWORD2>CreateField</KEYWORD2>
-			<KEYWORD2>CreateGroup</KEYWORD2>
-			<KEYWORD2>CreateIndex</KEYWORD2>
-			<KEYWORD2>CreateLink</KEYWORD2>
-			<KEYWORD2>CreatePreparedStatement</KEYWORD2>
-			<KEYWORD2>CreatePropery</KEYWORD2>
-			<KEYWORD2>CreateQuery</KEYWORD2>
-			<KEYWORD2>CreateQueryDef</KEYWORD2>
-			<KEYWORD2>CreateRelation</KEYWORD2>
-			<KEYWORD2>CreateTableDef</KEYWORD2>
-			<KEYWORD2>CreateUser</KEYWORD2>
-			<KEYWORD2>CreateWorkspace</KEYWORD2>
-			<KEYWORD2>CursorLocation</KEYWORD2>
-			<KEYWORD2>Customize</KEYWORD2>
-			<KEYWORD2>Delete</KEYWORD2>
-			<KEYWORD2>DeleteColumnLabels</KEYWORD2>
-			<KEYWORD2>DeleteColumns</KEYWORD2>
-			<KEYWORD2>DeleteRowLabels</KEYWORD2>
-			<KEYWORD2>DeleteRows</KEYWORD2>
-			<KEYWORD2>DoVerb</KEYWORD2>
-			<KEYWORD2>Drag</KEYWORD2>
-			<KEYWORD2>Draw</KEYWORD2>
-			<KEYWORD2>Edit</KEYWORD2>
-			<KEYWORD2>EditCopy</KEYWORD2>
-			<KEYWORD2>EditPaste</KEYWORD2>
-			<KEYWORD2>EndDoc</KEYWORD2>
-			<KEYWORD2>EnsureVisible</KEYWORD2>
-			<KEYWORD2>EstablishConnection</KEYWORD2>
-			<KEYWORD2>Execute</KEYWORD2>
-			<KEYWORD2>ExtractIcon</KEYWORD2>
-			<KEYWORD2>Fetch</KEYWORD2>
-			<KEYWORD2>FetchVerbs</KEYWORD2>
-			<KEYWORD2>Files</KEYWORD2>
-			<KEYWORD2>FillCache</KEYWORD2>
-			<KEYWORD2>Find</KEYWORD2>
-			<KEYWORD2>FindFirst</KEYWORD2>
-			<KEYWORD2>FindItem</KEYWORD2>
-			<KEYWORD2>FindLast</KEYWORD2>
-			<KEYWORD2>FindNext</KEYWORD2>
-			<KEYWORD2>FindPrevious</KEYWORD2>
-			<KEYWORD2>Forward</KEYWORD2>
-			<KEYWORD2>GetBookmark</KEYWORD2>
-			<KEYWORD2>GetChunk</KEYWORD2>
-			<KEYWORD2>GetClipString</KEYWORD2>
-			<KEYWORD2>GetData</KEYWORD2>
-			<KEYWORD2>GetFirstVisible</KEYWORD2>
-			<KEYWORD2>GetFormat</KEYWORD2>
-			<KEYWORD2>GetHeader</KEYWORD2>
-			<KEYWORD2>GetLineFromChar</KEYWORD2>
-			<KEYWORD2>GetNumTicks</KEYWORD2>
-			<KEYWORD2>GetRows</KEYWORD2>
-			<KEYWORD2>GetSelectedPart</KEYWORD2>
-			<KEYWORD2>GetText</KEYWORD2>
-			<KEYWORD2>GetVisibleCount</KEYWORD2>
-			<KEYWORD2>GoBack</KEYWORD2>
-			<KEYWORD2>GoForward</KEYWORD2>
-			<KEYWORD2>Hide</KEYWORD2>
-			<KEYWORD2>HitTest</KEYWORD2>
-			<KEYWORD2>HoldFields</KEYWORD2>
-			<KEYWORD2>Idle</KEYWORD2>
-			<KEYWORD2>InitializeLabels</KEYWORD2>
-			<KEYWORD2>InsertColumnLabels</KEYWORD2>
-			<KEYWORD2>InsertColumns</KEYWORD2>
-			<KEYWORD2>InsertObjDlg</KEYWORD2>
-			<KEYWORD2>InsertRowLabels</KEYWORD2>
-			<KEYWORD2>InsertRows</KEYWORD2>
-			<KEYWORD2>Item</KEYWORD2>
-			<KEYWORD2>KillDoc</KEYWORD2>
-			<KEYWORD2>Layout</KEYWORD2>
-			<KEYWORD2>Line</KEYWORD2>
-			<KEYWORD2>LinkExecute</KEYWORD2>
-			<KEYWORD2>LinkPoke</KEYWORD2>
-			<KEYWORD2>LinkRequest</KEYWORD2>
-			<KEYWORD2>LinkSend</KEYWORD2>
-			<KEYWORD2>Listen</KEYWORD2>
-			<KEYWORD2>LoadFile</KEYWORD2>
-			<KEYWORD2>LoadResData</KEYWORD2>
-			<KEYWORD2>LoadResPicture</KEYWORD2>
-			<KEYWORD2>LoadResString</KEYWORD2>
-			<KEYWORD2>LogEvent</KEYWORD2>
-			<KEYWORD2>MakeCompileFile</KEYWORD2>
-			<KEYWORD2>MakeReplica</KEYWORD2>
-			<KEYWORD2>MoreResults</KEYWORD2>
-			<KEYWORD2>Move</KEYWORD2>
-			<KEYWORD2>MoveData</KEYWORD2>
-			<KEYWORD2>MoveFirst</KEYWORD2>
-			<KEYWORD2>MoveLast</KEYWORD2>
-			<KEYWORD2>MoveNext</KEYWORD2>
-			<KEYWORD2>MovePrevious</KEYWORD2>
-			<KEYWORD2>NavigateTo</KEYWORD2>
-			<KEYWORD2>NewPage</KEYWORD2>
-			<KEYWORD2>NewPassword</KEYWORD2>
-			<KEYWORD2>NextRecordset</KEYWORD2>
-			<KEYWORD2>OLEDrag</KEYWORD2>
-			<KEYWORD2>OnAddinsUpdate</KEYWORD2>
-			<KEYWORD2>OnConnection</KEYWORD2>
-			<KEYWORD2>OnDisconnection</KEYWORD2>
-			<KEYWORD2>OnStartupComplete</KEYWORD2>
-			<KEYWORD2>Open</KEYWORD2>
-			<KEYWORD2>OpenConnection</KEYWORD2>
-			<KEYWORD2>OpenDatabase</KEYWORD2>
-			<KEYWORD2>OpenQueryDef</KEYWORD2>
-			<KEYWORD2>OpenRecordset</KEYWORD2>
-			<KEYWORD2>OpenResultset</KEYWORD2>
-			<KEYWORD2>OpenURL</KEYWORD2>
-			<KEYWORD2>Overlay</KEYWORD2>
-			<KEYWORD2>PaintPicture</KEYWORD2>
-			<KEYWORD2>Paste</KEYWORD2>
-			<KEYWORD2>PastSpecialDlg</KEYWORD2>
-			<KEYWORD2>PeekData</KEYWORD2>
-			<KEYWORD2>Play</KEYWORD2>
-			<KEYWORD2>Point</KEYWORD2>
-			<KEYWORD2>PopulatePartial</KEYWORD2>
-			<KEYWORD2>PopupMenu</KEYWORD2>
-			<KEYWORD2>Print</KEYWORD2>
-			<KEYWORD2>PrintForm</KEYWORD2>
-			<KEYWORD2>PropertyChanged</KEYWORD2>
-			<KEYWORD2>PSet</KEYWORD2>
-			<KEYWORD2>Quit</KEYWORD2>
-			<KEYWORD2>Raise</KEYWORD2>
-			<KEYWORD2>RandomDataFill</KEYWORD2>
-			<KEYWORD2>RandomFillColumns</KEYWORD2>
-			<KEYWORD2>RandomFillRows</KEYWORD2>
-			<KEYWORD2>rdoCreateEnvironment</KEYWORD2>
-			<KEYWORD2>rdoRegisterDataSource</KEYWORD2>
-			<KEYWORD2>ReadFromFile</KEYWORD2>
-			<KEYWORD2>ReadProperty</KEYWORD2>
-			<KEYWORD2>Rebind</KEYWORD2>
-			<KEYWORD2>ReFill</KEYWORD2>
-			<KEYWORD2>Refresh</KEYWORD2>
-			<KEYWORD2>RefreshLink</KEYWORD2>
-			<KEYWORD2>RegisterDatabase</KEYWORD2>
-			<KEYWORD2>Reload</KEYWORD2>
-			<KEYWORD2>Remove</KEYWORD2>
-			<KEYWORD2>RemoveAddInFromToolbar</KEYWORD2>
-			<KEYWORD2>RemoveItem</KEYWORD2>
-			<KEYWORD2>Render</KEYWORD2>
-			<KEYWORD2>RepairDatabase</KEYWORD2>
-			<KEYWORD2>Reply</KEYWORD2>
-			<KEYWORD2>ReplyAll</KEYWORD2>
-			<KEYWORD2>Requery</KEYWORD2>
-			<KEYWORD2>ResetCustom</KEYWORD2>
-			<KEYWORD2>ResetCustomLabel</KEYWORD2>
-			<KEYWORD2>ResolveName</KEYWORD2>
-			<KEYWORD2>RestoreToolbar</KEYWORD2>
-			<KEYWORD2>Resync</KEYWORD2>
-			<KEYWORD2>Rollback</KEYWORD2>
-			<KEYWORD2>RollbackTrans</KEYWORD2>
-			<KEYWORD2>RowBookmark</KEYWORD2>
-			<KEYWORD2>RowContaining</KEYWORD2>
-			<KEYWORD2>RowTop</KEYWORD2>
-			<KEYWORD2>Save</KEYWORD2>
-			<KEYWORD2>SaveAs</KEYWORD2>
-			<KEYWORD2>SaveFile</KEYWORD2>
-			<KEYWORD2>SaveToFile</KEYWORD2>
-			<KEYWORD2>SaveToolbar</KEYWORD2>
-			<KEYWORD2>SaveToOle1File</KEYWORD2>
-			<KEYWORD2>Scale</KEYWORD2>
-			<KEYWORD2>ScaleX</KEYWORD2>
-			<KEYWORD2>ScaleY</KEYWORD2>
-			<KEYWORD2>Scroll</KEYWORD2>
-			<KEYWORD2>Select</KEYWORD2>
-			<KEYWORD2>SelectAll</KEYWORD2>
-			<KEYWORD2>SelectPart</KEYWORD2>
-			<KEYWORD2>SelPrint</KEYWORD2>
-			<KEYWORD2>Send</KEYWORD2>
-			<KEYWORD2>SendData</KEYWORD2>
-			<KEYWORD2>Set</KEYWORD2>
-			<KEYWORD2>SetAutoServerSettings</KEYWORD2>
-			<KEYWORD2>SetData</KEYWORD2>
-			<KEYWORD2>SetFocus</KEYWORD2>
-			<KEYWORD2>SetOption</KEYWORD2>
-			<KEYWORD2>SetSize</KEYWORD2>
-			<KEYWORD2>SetText</KEYWORD2>
-			<KEYWORD2>SetViewport</KEYWORD2>
-			<KEYWORD2>Show</KEYWORD2>
-			<KEYWORD2>ShowColor</KEYWORD2>
-			<KEYWORD2>ShowFont</KEYWORD2>
-			<KEYWORD2>ShowHelp</KEYWORD2>
-			<KEYWORD2>ShowOpen</KEYWORD2>
-			<KEYWORD2>ShowPrinter</KEYWORD2>
-			<KEYWORD2>ShowSave</KEYWORD2>
-			<KEYWORD2>ShowWhatsThis</KEYWORD2>
-			<KEYWORD2>SignOff</KEYWORD2>
-			<KEYWORD2>SignOn</KEYWORD2>
-			<KEYWORD2>Size</KEYWORD2>
-			<KEYWORD2>Span</KEYWORD2>
-			<KEYWORD2>SplitContaining</KEYWORD2>
-			<KEYWORD2>StartLabelEdit</KEYWORD2>
-			<KEYWORD2>StartLogging</KEYWORD2>
-			<KEYWORD2>Stop</KEYWORD2>
-			<KEYWORD2>Synchronize</KEYWORD2>
-			<KEYWORD2>TextHeight</KEYWORD2>
-			<KEYWORD2>TextWidth</KEYWORD2>
-			<KEYWORD2>ToDefaults</KEYWORD2>
-			<KEYWORD2>TwipsToChartPart</KEYWORD2>
-			<KEYWORD2>TypeByChartType</KEYWORD2>
-			<KEYWORD2>Update</KEYWORD2>
-			<KEYWORD2>UpdateControls</KEYWORD2>
-			<KEYWORD2>UpdateRecord</KEYWORD2>
-			<KEYWORD2>UpdateRow</KEYWORD2>
-			<KEYWORD2>Upto</KEYWORD2>
-			<KEYWORD2>WhatsThisMode</KEYWORD2>
-			<KEYWORD2>WriteProperty</KEYWORD2>
-			<KEYWORD2>ZOrder</KEYWORD2>
-
-			<!--Events-->
-			<KEYWORD3>AccessKeyPress</KEYWORD3>
-			<KEYWORD3>AfterAddFile</KEYWORD3>
-			<KEYWORD3>AfterChangeFileName</KEYWORD3>
-			<KEYWORD3>AfterCloseFile</KEYWORD3>
-			<KEYWORD3>AfterColEdit</KEYWORD3>
-			<KEYWORD3>AfterColUpdate</KEYWORD3>
-			<KEYWORD3>AfterDelete</KEYWORD3>
-			<KEYWORD3>AfterInsert</KEYWORD3>
-			<KEYWORD3>AfterLabelEdit</KEYWORD3>
-			<KEYWORD3>AfterRemoveFile</KEYWORD3>
-			<KEYWORD3>AfterUpdate</KEYWORD3>
-			<KEYWORD3>AfterWriteFile</KEYWORD3>
-			<KEYWORD3>AmbienChanged</KEYWORD3>
-			<KEYWORD3>ApplyChanges</KEYWORD3>
-			<KEYWORD3>Associate</KEYWORD3>
-			<KEYWORD3>AsyncReadComplete</KEYWORD3>
-			<KEYWORD3>AxisActivated</KEYWORD3>
-			<KEYWORD3>AxisLabelActivated</KEYWORD3>
-			<KEYWORD3>AxisLabelSelected</KEYWORD3>
-			<KEYWORD3>AxisLabelUpdated</KEYWORD3>
-			<KEYWORD3>AxisSelected</KEYWORD3>
-			<KEYWORD3>AxisTitleActivated</KEYWORD3>
-			<KEYWORD3>AxisTitleSelected</KEYWORD3>
-			<KEYWORD3>AxisTitleUpdated</KEYWORD3>
-			<KEYWORD3>AxisUpdated</KEYWORD3>
-			<KEYWORD3>BeforeClick</KEYWORD3>
-			<KEYWORD3>BeforeColEdit</KEYWORD3>
-			<KEYWORD3>BeforeColUpdate</KEYWORD3>
-			<KEYWORD3>BeforeConnect</KEYWORD3>
-			<KEYWORD3>BeforeDelete</KEYWORD3>
-			<KEYWORD3>BeforeInsert</KEYWORD3>
-			<KEYWORD3>BeforeLabelEdit</KEYWORD3>
-			<KEYWORD3>BeforeLoadFile</KEYWORD3>
-			<KEYWORD3>BeforeUpdate</KEYWORD3>
-			<KEYWORD3>ButtonClick</KEYWORD3>
-			<KEYWORD3>ButtonCompleted</KEYWORD3>
-			<KEYWORD3>ButtonGotFocus</KEYWORD3>
-			<KEYWORD3>ButtonLostFocus</KEYWORD3>
-			<KEYWORD3>Change</KEYWORD3>
-			<KEYWORD3>ChartActivated</KEYWORD3>
-			<KEYWORD3>ChartSelected</KEYWORD3>
-			<KEYWORD3>ChartUpdated</KEYWORD3>
-			<KEYWORD3>Click</KEYWORD3>
-			<KEYWORD3>ColEdit</KEYWORD3>
-			<KEYWORD3>Collapse</KEYWORD3>
-			<KEYWORD3>ColResize</KEYWORD3>
-			<KEYWORD3>ColumnClick</KEYWORD3>
-			<KEYWORD3>Compare</KEYWORD3>
-			<KEYWORD3>ConfigChageCancelled</KEYWORD3>
-			<KEYWORD3>ConfigChanged</KEYWORD3>
-			<KEYWORD3>ConnectionRequest</KEYWORD3>
-			<KEYWORD3>DataArrival</KEYWORD3>
-			<KEYWORD3>DataChanged</KEYWORD3>
-			<KEYWORD3>DataUpdated</KEYWORD3>
-			<KEYWORD3>DblClick</KEYWORD3>
-			<KEYWORD3>Deactivate</KEYWORD3>
-			<KEYWORD3>DeviceArrival</KEYWORD3>
-			<KEYWORD3>DeviceOtherEvent</KEYWORD3>
-			<KEYWORD3>DeviceQueryRemove</KEYWORD3>
-			<KEYWORD3>DeviceQueryRemoveFailed</KEYWORD3>
-			<KEYWORD3>DeviceRemoveComplete</KEYWORD3>
-			<KEYWORD3>DeviceRemovePending</KEYWORD3>
-			<KEYWORD3>DevModeChange</KEYWORD3>
-			<KEYWORD3>Disconnect</KEYWORD3>
-			<KEYWORD3>DisplayChanged</KEYWORD3>
-			<KEYWORD3>Dissociate</KEYWORD3>
-			<KEYWORD3>DoGetNewFileName</KEYWORD3>
-			<KEYWORD3>Done</KEYWORD3>
-			<KEYWORD3>DonePainting</KEYWORD3>
-			<KEYWORD3>DownClick</KEYWORD3>
-			<KEYWORD3>DragDrop</KEYWORD3>
-			<KEYWORD3>DragOver</KEYWORD3>
-			<KEYWORD3>DropDown</KEYWORD3>
-			<KEYWORD3>EditProperty</KEYWORD3>
-			<KEYWORD3>EnterCell</KEYWORD3>
-			<KEYWORD3>EnterFocus</KEYWORD3>
-			<KEYWORD3>Event</KEYWORD3>
-			<KEYWORD3>ExitFocus</KEYWORD3>
-			<KEYWORD3>Expand</KEYWORD3>
-			<KEYWORD3>FootnoteActivated</KEYWORD3>
-			<KEYWORD3>FootnoteSelected</KEYWORD3>
-			<KEYWORD3>FootnoteUpdated</KEYWORD3>
-			<KEYWORD3>GotFocus</KEYWORD3>
-			<KEYWORD3>HeadClick</KEYWORD3>
-			<KEYWORD3>InfoMessage</KEYWORD3>
-			<KEYWORD3>Initialize</KEYWORD3>
-			<KEYWORD3>IniProperties</KEYWORD3>
-			<KEYWORD3>ItemActivated</KEYWORD3>
-			<KEYWORD3>ItemAdded</KEYWORD3>
-			<KEYWORD3>ItemCheck</KEYWORD3>
-			<KEYWORD3>ItemClick</KEYWORD3>
-			<KEYWORD3>ItemReloaded</KEYWORD3>
-			<KEYWORD3>ItemRemoved</KEYWORD3>
-			<KEYWORD3>ItemRenamed</KEYWORD3>
-			<KEYWORD3>ItemSeletected</KEYWORD3>
-			<KEYWORD3>KeyDown</KEYWORD3>
-			<KEYWORD3>KeyPress</KEYWORD3>
-			<KEYWORD3>KeyUp</KEYWORD3>
-			<KEYWORD3>LeaveCell</KEYWORD3>
-			<KEYWORD3>LegendActivated</KEYWORD3>
-			<KEYWORD3>LegendSelected</KEYWORD3>
-			<KEYWORD3>LegendUpdated</KEYWORD3>
-			<KEYWORD3>LinkClose</KEYWORD3>
-			<KEYWORD3>LinkError</KEYWORD3>
-			<KEYWORD3>LinkNotify</KEYWORD3>
-			<KEYWORD3>LinkOpen</KEYWORD3>
-			<KEYWORD3>Load</KEYWORD3>
-			<KEYWORD3>LostFocus</KEYWORD3>
-			<KEYWORD3>MouseDown</KEYWORD3>
-			<KEYWORD3>MouseMove</KEYWORD3>
-			<KEYWORD3>MouseUp</KEYWORD3>
-			<KEYWORD3>NodeClick</KEYWORD3>
-			<KEYWORD3>ObjectMove</KEYWORD3>
-			<KEYWORD3>OLECompleteDrag</KEYWORD3>
-			<KEYWORD3>OLEDragDrop</KEYWORD3>
-			<KEYWORD3>OLEDragOver</KEYWORD3>
-			<KEYWORD3>OLEGiveFeedback</KEYWORD3>
-			<KEYWORD3>OLESetData</KEYWORD3>
-			<KEYWORD3>OLEStartDrag</KEYWORD3>
-			<KEYWORD3>OnAddNew</KEYWORD3>
-			<KEYWORD3>OnComm</KEYWORD3>
-			<KEYWORD3>Paint</KEYWORD3>
-			<KEYWORD3>PanelClick</KEYWORD3>
-			<KEYWORD3>PanelDblClick</KEYWORD3>
-			<KEYWORD3>PathChange</KEYWORD3>
-			<KEYWORD3>PatternChange</KEYWORD3>
-			<KEYWORD3>PlotActivated</KEYWORD3>
-			<KEYWORD3>PlotSelected</KEYWORD3>
-			<KEYWORD3>PlotUpdated</KEYWORD3>
-			<KEYWORD3>PointActivated</KEYWORD3>
-			<KEYWORD3>PointLabelActivated</KEYWORD3>
-			<KEYWORD3>PointLabelSelected</KEYWORD3>
-			<KEYWORD3>PointLabelUpdated</KEYWORD3>
-			<KEYWORD3>PointSelected</KEYWORD3>
-			<KEYWORD3>PointUpdated</KEYWORD3>
-			<KEYWORD3>PowerQuerySuspend</KEYWORD3>
-			<KEYWORD3>PowerResume</KEYWORD3>
-			<KEYWORD3>PowerStatusChanged</KEYWORD3>
-			<KEYWORD3>PowerSuspend</KEYWORD3>
-			<KEYWORD3>QueryChangeConfig</KEYWORD3>
-			<KEYWORD3>QueryComplete</KEYWORD3>
-			<KEYWORD3>QueryCompleted</KEYWORD3>
-			<KEYWORD3>QueryTimeout</KEYWORD3>
-			<KEYWORD3>QueryUnload</KEYWORD3>
-			<KEYWORD3>ReadProperties</KEYWORD3>
-			<KEYWORD3>Reposition</KEYWORD3>
-			<KEYWORD3>RequestChangeFileName</KEYWORD3>
-			<KEYWORD3>RequestWriteFile</KEYWORD3>
-			<KEYWORD3>Resize</KEYWORD3>
-			<KEYWORD3>ResultsChanged</KEYWORD3>
-			<KEYWORD3>RowColChange</KEYWORD3>
-			<KEYWORD3>RowCurrencyChange</KEYWORD3>
-			<KEYWORD3>RowResize</KEYWORD3>
-			<KEYWORD3>RowStatusChanged</KEYWORD3>
-			<KEYWORD3>SelChange</KEYWORD3>
-			<KEYWORD3>SelectionChanged</KEYWORD3>
-			<KEYWORD3>SendComplete</KEYWORD3>
-			<KEYWORD3>SendProgress</KEYWORD3>
-			<KEYWORD3>SeriesActivated</KEYWORD3>
-			<KEYWORD3>SeriesSelected</KEYWORD3>
-			<KEYWORD3>SeriesUpdated</KEYWORD3>
-			<KEYWORD3>SettingChanged</KEYWORD3>
-			<KEYWORD3>SplitChange</KEYWORD3>
-			<KEYWORD3>StateChanged</KEYWORD3>
-			<KEYWORD3>StatusUpdate</KEYWORD3>
-			<KEYWORD3>SysColorsChanged</KEYWORD3>
-			<KEYWORD3>Terminate</KEYWORD3>
-			<KEYWORD3>TimeChanged</KEYWORD3>
-			<KEYWORD3>TitleActivated</KEYWORD3>
-			<KEYWORD3>TitleSelected</KEYWORD3>
-			<KEYWORD3>TitleActivated</KEYWORD3>
-			<KEYWORD3>UnboundAddData</KEYWORD3>
-			<KEYWORD3>UnboundDeleteRow</KEYWORD3>
-			<KEYWORD3>UnboundGetRelativeBookmark</KEYWORD3>
-			<KEYWORD3>UnboundReadData</KEYWORD3>
-			<KEYWORD3>UnboundWriteData</KEYWORD3>
-			<KEYWORD3>Unload</KEYWORD3>
-			<KEYWORD3>UpClick</KEYWORD3>
-			<KEYWORD3>Updated</KEYWORD3>
-			<KEYWORD3>Validate</KEYWORD3>
-			<KEYWORD3>ValidationError</KEYWORD3>
-			<KEYWORD3>WillAssociate</KEYWORD3>
-			<KEYWORD3>WillChangeData</KEYWORD3>
-			<KEYWORD3>WillDissociate</KEYWORD3>
-			<KEYWORD3>WillExecute</KEYWORD3>
-			<KEYWORD3>WillUpdateRows</KEYWORD3>
-			<KEYWORD3>WithEvents</KEYWORD3>
-			<KEYWORD3>WriteProperties</KEYWORD3>
-
-			<!--Statements-->
-			<KEYWORD4>AppActivate</KEYWORD4>
-			<KEYWORD4>Base</KEYWORD4>
-			<KEYWORD4>Beep</KEYWORD4>
-			<KEYWORD4>Call</KEYWORD4>
-			<KEYWORD4>Case</KEYWORD4>
-			<KEYWORD4>ChDir</KEYWORD4>
-			<KEYWORD4>ChDrive</KEYWORD4>
-			<KEYWORD4>Const</KEYWORD4>
-			<KEYWORD4>Declare</KEYWORD4>
-			<KEYWORD4>DefBool</KEYWORD4>
-			<KEYWORD4>DefByte</KEYWORD4>
-			<KEYWORD4>DefCur</KEYWORD4>
-			<KEYWORD4>DefDate</KEYWORD4>
-			<KEYWORD4>DefDbl</KEYWORD4>
-			<KEYWORD4>DefDec</KEYWORD4>
-			<KEYWORD4>DefInt</KEYWORD4>
-			<KEYWORD4>DefLng</KEYWORD4>
-			<KEYWORD4>DefObj</KEYWORD4>
-			<KEYWORD4>DefSng</KEYWORD4>
-			<KEYWORD4>DefStr</KEYWORD4>
-			<KEYWORD4>Deftype</KEYWORD4>
-			<KEYWORD4>DefVar</KEYWORD4>
-			<KEYWORD4>DeleteSetting</KEYWORD4>
-			<KEYWORD4>Dim</KEYWORD4>
-			<KEYWORD4>Do</KEYWORD4>
-			<KEYWORD4>Each</KEYWORD4>
-			<KEYWORD4>Else</KEYWORD4>
-			<KEYWORD4>ElseIf</KEYWORD4>
-			<KEYWORD4>End</KEYWORD4>
-			<KEYWORD4>Enum</KEYWORD4>
-			<KEYWORD4>Erase</KEYWORD4>
-			<KEYWORD4>Error</KEYWORD4>
-			<KEYWORD4>Event</KEYWORD4>
-			<KEYWORD4>Exit</KEYWORD4>
-			<KEYWORD4>Explicit</KEYWORD4>
-			<KEYWORD4>False</KEYWORD4>
-			<KEYWORD4>FileCopy</KEYWORD4>
-			<KEYWORD4>For</KEYWORD4>
-			<KEYWORD4>ForEach</KEYWORD4>
-			<KEYWORD4>Friend</KEYWORD4>
-			<KEYWORD4>Function</KEYWORD4>
-			<KEYWORD4>Get</KEYWORD4>
-			<KEYWORD4>GoSub</KEYWORD4>
-			<KEYWORD4>GoTo</KEYWORD4>
-			<KEYWORD4>If</KEYWORD4>
-			<KEYWORD4>Implements</KEYWORD4>
-			<KEYWORD4>In</KEYWORD4>
-			<KEYWORD4>Kill</KEYWORD4>
-			<KEYWORD4>Let</KEYWORD4>
-			<KEYWORD4>LineInput</KEYWORD4>
-			<KEYWORD4>Lock</KEYWORD4>
-			<KEYWORD4>Loop</KEYWORD4>
-			<KEYWORD4>LSet</KEYWORD4>
-			<KEYWORD4>MkDir</KEYWORD4>
-			<KEYWORD4>Name</KEYWORD4>
-			<KEYWORD4>New</KEYWORD4>
-			<KEYWORD4>Next</KEYWORD4>
-			<KEYWORD4>Nothing</KEYWORD4>
-			<KEYWORD4>Null</KEYWORD4>
-			<KEYWORD4>OnError</KEYWORD4>
-			<KEYWORD4>On</KEYWORD4>
-			<KEYWORD4>Option</KEYWORD4>
-			<KEYWORD4>Private</KEYWORD4>
-			<KEYWORD4>Property</KEYWORD4>
-			<KEYWORD4>Public</KEYWORD4>
-			<KEYWORD4>Put</KEYWORD4>
-			<KEYWORD4>RaiseEvent</KEYWORD4>
-			<KEYWORD4>Randomize</KEYWORD4>
-			<KEYWORD4>ReDim</KEYWORD4>
-			<KEYWORD4>Rem</KEYWORD4>
-			<KEYWORD4>Reset</KEYWORD4>
-			<KEYWORD4>Resume</KEYWORD4>
-			<KEYWORD4>Return</KEYWORD4>
-			<KEYWORD4>RmDir</KEYWORD4>
-			<KEYWORD4>RSet</KEYWORD4>
-			<KEYWORD4>SavePicture</KEYWORD4>
-			<KEYWORD4>SaveSetting</KEYWORD4>
-			<KEYWORD4>SendKeys</KEYWORD4>
-			<KEYWORD4>SetAttr</KEYWORD4>
-			<KEYWORD4>Static</KEYWORD4>
-			<KEYWORD4>Sub</KEYWORD4>
-			<KEYWORD4>Then</KEYWORD4>
-			<KEYWORD4>To</KEYWORD4>
-			<KEYWORD4>True</KEYWORD4>
-			<KEYWORD4>Type</KEYWORD4>
-			<KEYWORD4>Unlock</KEYWORD4>
-			<KEYWORD4>Until</KEYWORD4>
-			<KEYWORD4>Wend</KEYWORD4>
-			<KEYWORD4>While</KEYWORD4>
-			<KEYWORD4>Width</KEYWORD4>
-			<KEYWORD4>With</KEYWORD4>
-			<KEYWORD4>Write</KEYWORD4>
-
-			<!--Data types-->
-			<KEYWORD4>ADODB</KEYWORD4>
-			<KEYWORD4>Boolean</KEYWORD4>
-			<KEYWORD4>Byte</KEYWORD4>
-			<KEYWORD4>Connection</KEYWORD4>
-			<KEYWORD4>Currency</KEYWORD4>
-			<KEYWORD4>Date</KEYWORD4>
-			<KEYWORD4>Double</KEYWORD4>
-			<KEYWORD4>Integer</KEYWORD4>
-			<KEYWORD4>Long</KEYWORD4>
-			<KEYWORD4>Recordset</KEYWORD4>
-			<KEYWORD4>Single</KEYWORD4>
-			<KEYWORD4>String</KEYWORD4>
-			<KEYWORD4>Variant</KEYWORD4>
-
-			<!--Constants -->
-			<LITERAL3>adAddNew</LITERAL3>
-			<LITERAL3>adAffectAll</LITERAL3>
-			<LITERAL3>adAffectAllChapters</LITERAL3>
-			<LITERAL3>adAffectCurrent</LITERAL3>
-			<LITERAL3>adAffectGroup</LITERAL3>
-			<LITERAL3>adApproxPosition</LITERAL3>
-			<LITERAL3>adAsyncConnect</LITERAL3>
-			<LITERAL3>adAsyncExecute</LITERAL3>
-			<LITERAL3>adAsyncFetch</LITERAL3>
-			<LITERAL3>adAsyncFetchNonBlocking</LITERAL3>
-			<LITERAL3>adBSTR</LITERAL3>
-			<LITERAL3>adBigInt</LITERAL3>
-			<LITERAL3>adBinary</LITERAL3>
-			<LITERAL3>adBookmark</LITERAL3>
-			<LITERAL3>adBookmarkCurrent</LITERAL3>
-			<LITERAL3>adBookmarkFirst</LITERAL3>
-			<LITERAL3>adBookmarkLast</LITERAL3>
-			<LITERAL3>adBoolean</LITERAL3>
-			<LITERAL3>adChapter</LITERAL3>
-			<LITERAL3>adChar</LITERAL3>
-			<LITERAL3>adClipString</LITERAL3>
-			<LITERAL3>adCmdFile</LITERAL3>
-			<LITERAL3>adCmdStoredProc</LITERAL3>
-			<LITERAL3>adCmdTable</LITERAL3>
-			<LITERAL3>adCmdTableDirect</LITERAL3>
-			<LITERAL3>adCmdText</LITERAL3>
-			<LITERAL3>adCmdUnknown</LITERAL3>
-			<LITERAL3>adCompareEqual</LITERAL3>
-			<LITERAL3>adCompareGreaterThan</LITERAL3>
-			<LITERAL3>adCompareLessThan</LITERAL3>
-			<LITERAL3>adCompareNotComparable</LITERAL3>
-			<LITERAL3>adCompareNotEqual</LITERAL3>
-			<LITERAL3>adCriteriaAllCols</LITERAL3>
-			<LITERAL3>adCriteriaKey</LITERAL3>
-			<LITERAL3>adCriteriaTimeStamp</LITERAL3>
-			<LITERAL3>adCriteriaUpdCols</LITERAL3>
-			<LITERAL3>adCurrency</LITERAL3>
-			<LITERAL3>adDBDate</LITERAL3>
-			<LITERAL3>adDBFileTime</LITERAL3>
-			<LITERAL3>adDBTime</LITERAL3>
-			<LITERAL3>adDBTimeStamp</LITERAL3>
-			<LITERAL3>adDate</LITERAL3>
-			<LITERAL3>adDecimal</LITERAL3>
-			<LITERAL3>adDelete</LITERAL3>
-			<LITERAL3>adDouble</LITERAL3>
-			<LITERAL3>adEditAdd</LITERAL3>
-			<LITERAL3>adEditDelete</LITERAL3>
-			<LITERAL3>adEditInProgress</LITERAL3>
-			<LITERAL3>adEditNone</LITERAL3>
-			<LITERAL3>adEmpty</LITERAL3>
-			<LITERAL3>adErrBoundToCommand</LITERAL3>
-			<LITERAL3>adErrDataConversion</LITERAL3>
-			<LITERAL3>adErrFeatureNotAvailable</LITERAL3>
-			<LITERAL3>adErrIllegalOperation</LITERAL3>
-			<LITERAL3>adErrInTransaction</LITERAL3>
-			<LITERAL3>adErrInvalidArgument</LITERAL3>
-			<LITERAL3>adErrInvalidConnection</LITERAL3>
-			<LITERAL3>adErrInvalidParamInfo</LITERAL3>
-			<LITERAL3>adErrItemNotFound</LITERAL3>
-			<LITERAL3>adErrNoCurrentRecord</LITERAL3>
-			<LITERAL3>adErrNotExecuting</LITERAL3>
-			<LITERAL3>adErrNotReentrant</LITERAL3>
-			<LITERAL3>adErrObjectClosed</LITERAL3>
-			<LITERAL3>adErrObjectInCollection</LITERAL3>
-			<LITERAL3>adErrObjectNotSet</LITERAL3>
-			<LITERAL3>adErrObjectOpen</LITERAL3>
-			<LITERAL3>adErrOperationCancelled</LITERAL3>
-			<LITERAL3>adErrProviderNotFound</LITERAL3>
-			<LITERAL3>adErrStillConnecting</LITERAL3>
-			<LITERAL3>adErrStillExecuting</LITERAL3>
-			<LITERAL3>adErrUnsafeOperation</LITERAL3>
-			<LITERAL3>adError</LITERAL3>
-			<LITERAL3>adExecuteNoRecords</LITERAL3>
-			<LITERAL3>adFileTime</LITERAL3>
-			<LITERAL3>adFilterAffectedRecords</LITERAL3>
-			<LITERAL3>adFilterConflictingRecords</LITERAL3>
-			<LITERAL3>adFilterFetchedRecords</LITERAL3>
-			<LITERAL3>adFilterNone</LITERAL3>
-			<LITERAL3>adFilterPendingRecords</LITERAL3>
-			<LITERAL3>adFilterPredicate</LITERAL3>
-			<LITERAL3>adFind</LITERAL3>
-			<LITERAL3>adFldCacheDeferred</LITERAL3>
-			<LITERAL3>adFldFixed</LITERAL3>
-			<LITERAL3>adFldIsNullable</LITERAL3>
-			<LITERAL3>adFldKeyColumn</LITERAL3>
-			<LITERAL3>adFldLong</LITERAL3>
-			<LITERAL3>adFldMayBeNull</LITERAL3>
-			<LITERAL3>adFldMayDefer</LITERAL3>
-			<LITERAL3>adFldRowID</LITERAL3>
-			<LITERAL3>adFldRowVersion</LITERAL3>
-			<LITERAL3>adFldUnknownUpdatable</LITERAL3>
-			<LITERAL3>adFldUpdatable</LITERAL3>
-			<LITERAL3>adGUID</LITERAL3>
-			<LITERAL3>adGetRowsRest</LITERAL3>
-			<LITERAL3>adHoldRecords</LITERAL3>
-			<LITERAL3>adIDispatch</LITERAL3>
-			<LITERAL3>adIUnknown</LITERAL3>
-			<LITERAL3>adIndex</LITERAL3>
-			<LITERAL3>adInteger</LITERAL3>
-			<LITERAL3>adLockBatchOptimistic</LITERAL3>
-			<LITERAL3>adLockOptimistic</LITERAL3>
-			<LITERAL3>adLockPessimistic</LITERAL3>
-			<LITERAL3>adLockReadOnly</LITERAL3>
-			<LITERAL3>adLongVarBinary</LITERAL3>
-			<LITERAL3>adLongVarChar</LITERAL3>
-			<LITERAL3>adLongVarWChar</LITERAL3>
-			<LITERAL3>adMarshalAll</LITERAL3>
-			<LITERAL3>adMarshalModifiedOnly</LITERAL3>
-			<LITERAL3>adModeRead</LITERAL3>
-			<LITERAL3>adModeReadWrite</LITERAL3>
-			<LITERAL3>adModeShareDenyNone</LITERAL3>
-			<LITERAL3>adModeShareDenyRead</LITERAL3>
-			<LITERAL3>adModeShareDenyWrite</LITERAL3>
-			<LITERAL3>adModeShareExclusive</LITERAL3>
-			<LITERAL3>adModeUnknown</LITERAL3>
-			<LITERAL3>adModeWrite</LITERAL3>
-			<LITERAL3>adMovePrevious</LITERAL3>
-			<LITERAL3>adNotify</LITERAL3>
-			<LITERAL3>adNumeric</LITERAL3>
-			<LITERAL3>adOpenDynamic</LITERAL3>
-			<LITERAL3>adOpenForwardOnly</LITERAL3>
-			<LITERAL3>adOpenKeyset</LITERAL3>
-			<LITERAL3>adOpenStatic</LITERAL3>
-			<LITERAL3>adParamInput</LITERAL3>
-			<LITERAL3>adParamInputOutput</LITERAL3>
-			<LITERAL3>adParamLong</LITERAL3>
-			<LITERAL3>adParamNullable</LITERAL3>
-			<LITERAL3>adParamOutput</LITERAL3>
-			<LITERAL3>adParamReturnValue</LITERAL3>
-			<LITERAL3>adParamSigned</LITERAL3>
-			<LITERAL3>adParamUnknown</LITERAL3>
-			<LITERAL3>adPersistADTG</LITERAL3>
-			<LITERAL3>adPersistXML</LITERAL3>
-			<LITERAL3>adPosBOF</LITERAL3>
-			<LITERAL3>adPosEOF</LITERAL3>
-			<LITERAL3>adPosUnknown</LITERAL3>
-			<LITERAL3>adPriorityAboveNormal</LITERAL3>
-			<LITERAL3>adPriorityBelowNormal</LITERAL3>
-			<LITERAL3>adPriorityHighest</LITERAL3>
-			<LITERAL3>adPriorityLowest</LITERAL3>
-			<LITERAL3>adPriorityNormal</LITERAL3>
-			<LITERAL3>adPromptAlways</LITERAL3>
-			<LITERAL3>adPromptComplete</LITERAL3>
-			<LITERAL3>adPromptCompleteRequired</LITERAL3>
-			<LITERAL3>adPromptNever</LITERAL3>
-			<LITERAL3>adPropNotSupported</LITERAL3>
-			<LITERAL3>adPropOptional</LITERAL3>
-			<LITERAL3>adPropRead</LITERAL3>
-			<LITERAL3>adPropRequired</LITERAL3>
-			<LITERAL3>adPropVariant</LITERAL3>
-			<LITERAL3>adPropWrite</LITERAL3>
-			<LITERAL3>adRecCanceled</LITERAL3>
-			<LITERAL3>adRecCantRelease</LITERAL3>
-			<LITERAL3>adRecConcurrencyViolation</LITERAL3>
-			<LITERAL3>adRecDBDeleted</LITERAL3>
-			<LITERAL3>adRecDeleted</LITERAL3>
-			<LITERAL3>adRecIntegrityViolation</LITERAL3>
-			<LITERAL3>adRecInvalid</LITERAL3>
-			<LITERAL3>adRecMaxChangesExceeded</LITERAL3>
-			<LITERAL3>adRecModified</LITERAL3>
-			<LITERAL3>adRecMultipleChanges</LITERAL3>
-			<LITERAL3>adRecNew</LITERAL3>
-			<LITERAL3>adRecOK</LITERAL3>
-			<LITERAL3>adRecObjectOpen</LITERAL3>
-			<LITERAL3>adRecOutOfMemory</LITERAL3>
-			<LITERAL3>adRecPendingChanges</LITERAL3>
-			<LITERAL3>adRecPermissionDenied</LITERAL3>
-			<LITERAL3>adRecSchemaViolation</LITERAL3>
-			<LITERAL3>adRecUnmodified</LITERAL3>
-			<LITERAL3>adRecalcAlways</LITERAL3>
-			<LITERAL3>adRecalcUpFront</LITERAL3>
-			<LITERAL3>adResync</LITERAL3>
-			<LITERAL3>adResyncAll</LITERAL3>
-			<LITERAL3>adResyncAllValues</LITERAL3>
-			<LITERAL3>adResyncAutoIncrement</LITERAL3>
-			<LITERAL3>adResyncConflicts</LITERAL3>
-			<LITERAL3>adResyncInserts</LITERAL3>
-			<LITERAL3>adResyncNone</LITERAL3>
-			<LITERAL3>adResyncUnderlyingValues</LITERAL3>
-			<LITERAL3>adResyncUpdates</LITERAL3>
-			<LITERAL3>adRsnAddNew</LITERAL3>
-			<LITERAL3>adRsnClose</LITERAL3>
-			<LITERAL3>adRsnDelete</LITERAL3>
-			<LITERAL3>adRsnFirstChange</LITERAL3>
-			<LITERAL3>adRsnMove</LITERAL3>
-			<LITERAL3>adRsnMoveFirst</LITERAL3>
-			<LITERAL3>adRsnMoveLast</LITERAL3>
-			<LITERAL3>adRsnMoveNext</LITERAL3>
-			<LITERAL3>adRsnMovePrevious</LITERAL3>
-			<LITERAL3>adRsnRequery</LITERAL3>
-			<LITERAL3>adRsnResynch</LITERAL3>
-			<LITERAL3>adRsnUndoAddNew</LITERAL3>
-			<LITERAL3>adRsnUndoDelete</LITERAL3>
-			<LITERAL3>adRsnUndoUpdate</LITERAL3>
-			<LITERAL3>adRsnUpdate</LITERAL3>
-			<LITERAL3>adRunAsync</LITERAL3>
-			<LITERAL3>adSchemaAsserts</LITERAL3>
-			<LITERAL3>adSchemaCatalogs</LITERAL3>
-			<LITERAL3>adSchemaCharacterSets</LITERAL3>
-			<LITERAL3>adSchemaCheckConstraints</LITERAL3>
-			<LITERAL3>adSchemaCollations</LITERAL3>
-			<LITERAL3>adSchemaColumnPrivileges</LITERAL3>
-			<LITERAL3>adSchemaColumns</LITERAL3>
-			<LITERAL3>adSchemaColumnsDomainUsage</LITERAL3>
-			<LITERAL3>adSchemaConstraintColumnUsage</LITERAL3>
-			<LITERAL3>adSchemaConstraintTableUsage</LITERAL3>
-			<LITERAL3>adSchemaCubes</LITERAL3>
-			<LITERAL3>adSchemaDBInfoKeywords</LITERAL3>
-			<LITERAL3>adSchemaDBInfoLiterals</LITERAL3>
-			<LITERAL3>adSchemaDimensions</LITERAL3>
-			<LITERAL3>adSchemaForeignKeys</LITERAL3>
-			<LITERAL3>adSchemaHierarchies</LITERAL3>
-			<LITERAL3>adSchemaIndexes</LITERAL3>
-			<LITERAL3>adSchemaKeyColumnUsage</LITERAL3>
-			<LITERAL3>adSchemaLevels</LITERAL3>
-			<LITERAL3>adSchemaMeasures</LITERAL3>
-			<LITERAL3>adSchemaMembers</LITERAL3>
-			<LITERAL3>adSchemaPrimaryKeys</LITERAL3>
-			<LITERAL3>adSchemaProcedureColumns</LITERAL3>
-			<LITERAL3>adSchemaProcedureParameters</LITERAL3>
-			<LITERAL3>adSchemaProcedures</LITERAL3>
-			<LITERAL3>adSchemaProperties</LITERAL3>
-			<LITERAL3>adSchemaProviderSpecific</LITERAL3>
-			<LITERAL3>adSchemaProviderTypes</LITERAL3>
-			<LITERAL3>adSchemaReferentialConstraints</LITERAL3>
-			<LITERAL3>adSchemaSQLLanguages</LITERAL3>
-			<LITERAL3>adSchemaSchemata</LITERAL3>
-			<LITERAL3>adSchemaStatistics</LITERAL3>
-			<LITERAL3>adSchemaTableConstraints</LITERAL3>
-			<LITERAL3>adSchemaTablePrivileges</LITERAL3>
-			<LITERAL3>adSchemaTables</LITERAL3>
-			<LITERAL3>adSchemaTranslations</LITERAL3>
-			<LITERAL3>adSchemaUsagePrivileges</LITERAL3>
-			<LITERAL3>adSchemaViewColumnUsage</LITERAL3>
-			<LITERAL3>adSchemaViewTableUsage</LITERAL3>
-			<LITERAL3>adSchemaViews</LITERAL3>
-			<LITERAL3>adSearchBackward</LITERAL3>
-			<LITERAL3>adSearchForward</LITERAL3>
-			<LITERAL3>adSeek</LITERAL3>
-			<LITERAL3>adSeekAfter</LITERAL3>
-			<LITERAL3>adSeekAfterEQ</LITERAL3>
-			<LITERAL3>adSeekBefore</LITERAL3>
-			<LITERAL3>adSeekBeforeEQ</LITERAL3>
-			<LITERAL3>adSeekFirstEQ</LITERAL3>
-			<LITERAL3>adSeekLastEQ</LITERAL3>
-			<LITERAL3>adSingle</LITERAL3>
-			<LITERAL3>adSmallInt</LITERAL3>
-			<LITERAL3>adStateClosed</LITERAL3>
-			<LITERAL3>adStateConnecting</LITERAL3>
-			<LITERAL3>adStateExecuting</LITERAL3>
-			<LITERAL3>adStateFetching</LITERAL3>
-			<LITERAL3>adStateOpen</LITERAL3>
-			<LITERAL3>adStatusCancel</LITERAL3>
-			<LITERAL3>adStatusCantDeny</LITERAL3>
-			<LITERAL3>adStatusErrorsOccurred</LITERAL3>
-			<LITERAL3>adStatusOK</LITERAL3>
-			<LITERAL3>adStatusUnwantedEvent</LITERAL3>
-			<LITERAL3>adStringHTML</LITERAL3>
-			<LITERAL3>adStringXML</LITERAL3>
-			<LITERAL3>adTinyInt</LITERAL3>
-			<LITERAL3>adUnsignedBigInt</LITERAL3>
-			<LITERAL3>adUnsignedInt</LITERAL3>
-			<LITERAL3>adUnsignedSmallInt</LITERAL3>
-			<LITERAL3>adUnsignedTinyInt</LITERAL3>
-			<LITERAL3>adUpdate</LITERAL3>
-			<LITERAL3>adUpdateBatch</LITERAL3>
-			<LITERAL3>adUseClient</LITERAL3>
-			<LITERAL3>adUseServer</LITERAL3>
-			<LITERAL3>adUserDefined</LITERAL3>
-			<LITERAL3>adVarBinary</LITERAL3>
-			<LITERAL3>adVarChar</LITERAL3>
-			<LITERAL3>adVarNumeric</LITERAL3>
-			<LITERAL3>adVarWChar</LITERAL3>
-			<LITERAL3>adVariant</LITERAL3>
-			<LITERAL3>adWChar</LITERAL3>
-			<LITERAL3>adXactAbortRetaining</LITERAL3>
-			<LITERAL3>adXactBrowse</LITERAL3>
-			<LITERAL3>adXactChaos</LITERAL3>
-			<LITERAL3>adXactCommitRetaining</LITERAL3>
-			<LITERAL3>adXactCursorStability</LITERAL3>
-			<LITERAL3>adXactIsolated</LITERAL3>
-			<LITERAL3>adXactReadCommitted</LITERAL3>
-			<LITERAL3>adXactReadUncommitted</LITERAL3>
-			<LITERAL3>adXactRepeatableRead</LITERAL3>
-			<LITERAL3>adXactSerializable</LITERAL3>
-			<LITERAL3>adXactUnspecified</LITERAL3>
-			<LITERAL3>dbAppendOnly</LITERAL3>
-			<LITERAL3>dbConsistent</LITERAL3>
-			<LITERAL3>dbDenyRead</LITERAL3>
-			<LITERAL3>dbDenyWrite</LITERAL3>
-			<LITERAL3>dbExecDirect</LITERAL3>
-			<LITERAL3>dbForwardOnly</LITERAL3>
-			<LITERAL3>dbInconsistent</LITERAL3>
-			<LITERAL3>dbOpenDynamic</LITERAL3>
-			<LITERAL3>dbOpenDynaset</LITERAL3>
-			<LITERAL3>dbOpenForwardOnly</LITERAL3>
-			<LITERAL3>dbOpenSnapshot</LITERAL3>
-			<LITERAL3>dbOpenTable</LITERAL3>
-			<LITERAL3>dbOptimistic</LITERAL3>
-			<LITERAL3>dbOptimisticBatch</LITERAL3>
-			<LITERAL3>dbOptimisticValue</LITERAL3>
-			<LITERAL3>dbPessimistic</LITERAL3>
-			<LITERAL3>dbReadOnly</LITERAL3>
-			<LITERAL3>dbRunAsync</LITERAL3>
-			<LITERAL3>dbSeeChanges</LITERAL3>
-			<LITERAL3>dbSQLPassThrough</LITERAL3>
-			<LITERAL3>vbAbort</LITERAL3>
-			<LITERAL3>vbAbortRetryIgnore</LITERAL3>
-			<LITERAL3>vbApplicationModal</LITERAL3>
-			<LITERAL3>vbCancel</LITERAL3>
-			<LITERAL3>vbCritical</LITERAL3>
-			<LITERAL3>vbDefaultButton1</LITERAL3>
-			<LITERAL3>vbDefaultButton2</LITERAL3>
-			<LITERAL3>vbDefaultButton3</LITERAL3>
-			<LITERAL3>vbDefaultButton4</LITERAL3>
-			<LITERAL3>vbExclamation</LITERAL3>
-			<LITERAL3>vbFalse</LITERAL3>
-			<LITERAL3>vbFirstFourDays</LITERAL3>
-			<LITERAL3>vbFirstFullWeek</LITERAL3>
-			<LITERAL3>vbFirstJan1</LITERAL3>
-			<LITERAL3>vbFriday</LITERAL3>
-			<LITERAL3>vbGeneralDate</LITERAL3>
-			<LITERAL3>vbIgnore</LITERAL3>
-			<LITERAL3>vbInformation</LITERAL3>
-			<LITERAL3>vbLongDate</LITERAL3>
-			<LITERAL3>vbLongTime</LITERAL3>
-			<LITERAL3>vbMonday</LITERAL3>
-			<LITERAL3>vbNo</LITERAL3>
-			<LITERAL3>vbOK</LITERAL3>
-			<LITERAL3>vbOKCancel</LITERAL3>
-			<LITERAL3>vbOKOnly</LITERAL3>
-			<LITERAL3>vbObjectError</LITERAL3>
-			<LITERAL3>vbQuestion</LITERAL3>
-			<LITERAL3>vbRetry</LITERAL3>
-			<LITERAL3>vbRetryCancel</LITERAL3>
-			<LITERAL3>vbSaturday</LITERAL3>
-			<LITERAL3>vbShortDate</LITERAL3>
-			<LITERAL3>vbShortTime</LITERAL3>
-			<LITERAL3>vbSunday</LITERAL3>
-			<LITERAL3>vbSystemModal</LITERAL3>
-			<LITERAL3>vbThursday</LITERAL3>
-			<LITERAL3>vbTrue</LITERAL3>
-			<LITERAL3>vbTuesday</LITERAL3>
-			<LITERAL3>vbUseDefault</LITERAL3>
-			<LITERAL3>vbUseSystem</LITERAL3>
-			<LITERAL3>vbUseSystemDayOfWeek</LITERAL3>
-			<LITERAL3>vbWednesday</LITERAL3>
-			<LITERAL3>vbYes</LITERAL3>
-			<LITERAL3>vbYesNo</LITERAL3>
-			<LITERAL3>vbYesNoCancel</LITERAL3>
-			<LITERAL3>vbarray</LITERAL3>
-			<LITERAL3>vbblack</LITERAL3>
-			<LITERAL3>vbblue</LITERAL3>
-			<LITERAL3>vbboolean</LITERAL3>
-			<LITERAL3>vbbyte</LITERAL3>
-			<LITERAL3>vbcr</LITERAL3>
-			<LITERAL3>vbcrlf</LITERAL3>
-			<LITERAL3>vbcurrency</LITERAL3>
-			<LITERAL3>vbcyan</LITERAL3>
-			<LITERAL3>vbdataobject</LITERAL3>
-			<LITERAL3>vbdate</LITERAL3>
-			<LITERAL3>vbdecimal</LITERAL3>
-			<LITERAL3>vbdouble</LITERAL3>
-			<LITERAL3>vbempty</LITERAL3>
-			<LITERAL3>vberror</LITERAL3>
-			<LITERAL3>vbformfeed</LITERAL3>
-			<LITERAL3>vbgreen</LITERAL3>
-			<LITERAL3>vbinteger</LITERAL3>
-			<LITERAL3>vblf</LITERAL3>
-			<LITERAL3>vblong</LITERAL3>
-			<LITERAL3>vbmagenta</LITERAL3>
-			<LITERAL3>vbnewline</LITERAL3>
-			<LITERAL3>vbnull</LITERAL3>
-			<LITERAL3>vbnullchar</LITERAL3>
-			<LITERAL3>vbnullstring</LITERAL3>
-			<LITERAL3>vbobject</LITERAL3>
-			<LITERAL3>vbred</LITERAL3>
-			<LITERAL3>vbsingle</LITERAL3>
-			<LITERAL3>vbstring</LITERAL3>
-			<LITERAL3>vbtab</LITERAL3>
-			<LITERAL3>vbvariant</LITERAL3>
-			<LITERAL3>vbverticaltab</LITERAL3>
-			<LITERAL3>vbwhite</LITERAL3>
-			<LITERAL3>vbyellow</LITERAL3>
-
-			<!--Operators-->
-			<OPERATOR>*</OPERATOR>
-			<OPERATOR>+</OPERATOR>
-			<OPERATOR>-</OPERATOR>
-			<OPERATOR>/</OPERATOR>
-			<OPERATOR>=</OPERATOR>
-			<OPERATOR>\</OPERATOR>
-			<OPERATOR>^</OPERATOR>
-			<OPERATOR>&amp;</OPERATOR>
-			<OPERATOR>&gt;</OPERATOR>
-			<OPERATOR>&gt;=</OPERATOR>
-			<OPERATOR>&lt;&gt;</OPERATOR>
-			<OPERATOR>&lt;</OPERATOR>
-			<OPERATOR>&lt;=</OPERATOR>
-			<OPERATOR>And</OPERATOR>
-			<OPERATOR>Eqv</OPERATOR>
-			<OPERATOR>Like</OPERATOR>
-			<OPERATOR>Mod</OPERATOR>
-			<OPERATOR>Not</OPERATOR>
-			<OPERATOR>Or</OPERATOR>
-			<OPERATOR>Xor</OPERATOR>
-
-		</KEYWORDS>
-	</RULES>
-</MODE>
-
-
- 	  	 
diff --git a/qpython/src/main/assets/syntax/vrml2.xml b/qpython/src/main/assets/syntax/vrml2.xml
deleted file mode 100644
index 501d34f2..00000000
--- a/qpython/src/main/assets/syntax/vrml2.xml
+++ /dev/null
@@ -1,278 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="lineComment" VALUE="#" />
-	</PROPS>
-
-	<RULES IGNORE_CASE="TRUE">
-		<IMPORT DELEGATE="javascript::MAIN"/>
-		<EOL_SPAN TYPE="COMMENT1">#</EOL_SPAN>
-		<!-- JavaScript
-		<SPAN TYPE="LABEL" DELEGATE="JAVASCRIPT">
-			<BEGIN>&quot;javascript:</BEGIN>
-			<END>&quot;</END>
-		</SPAN> -->
-
-		<KEYWORDS>
-			<KEYWORD1>appearance</KEYWORD1>
-			<KEYWORD1>children</KEYWORD1>
-			<KEYWORD1>proxy</KEYWORD1>
-			<KEYWORD1>addChildren</KEYWORD1>
-			<KEYWORD1>removeChildren</KEYWORD1>
-			<KEYWORD1>collideTime</KEYWORD1>
-			<KEYWORD1>geometry</KEYWORD1>
-			<KEYWORD1>material</KEYWORD1>
-			<KEYWORD1>texture</KEYWORD1>
-			<KEYWORD1>textureTransform</KEYWORD1>
-			<KEYWORD1>ambientIntensity</KEYWORD1>
-			<KEYWORD1>diffuseColor</KEYWORD1>
-			<KEYWORD1>emissiveColor</KEYWORD1>
-			<KEYWORD1>shininess</KEYWORD1>
-			<KEYWORD1>specularColor</KEYWORD1>
-			<KEYWORD1>transparency</KEYWORD1>
-			<KEYWORD1>size</KEYWORD1>
-			<KEYWORD1>bottomRadius</KEYWORD1>
-			<KEYWORD1>height</KEYWORD1>
-			<KEYWORD1>side</KEYWORD1>
-			<KEYWORD1>bottom</KEYWORD1>
-			<KEYWORD1>radius</KEYWORD1>
-			<KEYWORD1>top</KEYWORD1>
-			<KEYWORD1>bboxCenter</KEYWORD1>
-			<KEYWORD1>bboxSize</KEYWORD1>
-			<KEYWORD1>string</KEYWORD1>
-			<KEYWORD1>length</KEYWORD1>
-			<KEYWORD1>maxExtent</KEYWORD1>
-			<KEYWORD1>fontStyle</KEYWORD1>
-			<KEYWORD1>family</KEYWORD1>
-			<KEYWORD1>style</KEYWORD1>
-			<KEYWORD1>spacing</KEYWORD1>
-			<KEYWORD1>justify</KEYWORD1>
-			<KEYWORD1>horizontal</KEYWORD1>
-			<KEYWORD1>leftToRight</KEYWORD1>
-			<KEYWORD1>topToBottom</KEYWORD1>
-			<KEYWORD1>language</KEYWORD1>
-			<KEYWORD1>translation</KEYWORD1>
-			<KEYWORD1>position</KEYWORD1>
-			<KEYWORD1>rotation</KEYWORD1>
-			<KEYWORD1>scale</KEYWORD1>
-			<KEYWORD1>scaleOrientation</KEYWORD1>
-			<KEYWORD1>center</KEYWORD1>
-			<KEYWORD1>key</KEYWORD1>
-			<KEYWORD1>keyValue</KEYWORD1>
-			<KEYWORD1>set_fraction</KEYWORD1>
-			<KEYWORD1>value_changed</KEYWORD1>
-			<KEYWORD1>enabled</KEYWORD1>
-			<KEYWORD1>isActive</KEYWORD1>
-			<KEYWORD1>isOver</KEYWORD1>
-			<KEYWORD1>touchTime</KEYWORD1>
-			<KEYWORD1>hitPoint_changed</KEYWORD1>
-			<KEYWORD1>hitNormal_changed</KEYWORD1>
-			<KEYWORD1>hitTexcoord_changed</KEYWORD1>
-			<KEYWORD1>orientation_changed</KEYWORD1>
-			<KEYWORD1>position_changed</KEYWORD1>
-			<KEYWORD1>autoOffset</KEYWORD1>
-			<KEYWORD1>offset</KEYWORD1>
-			<KEYWORD1>maxPosition</KEYWORD1>
-			<KEYWORD1>minPosition</KEYWORD1>
-			<KEYWORD1>translation_changed</KEYWORD1>
-			<KEYWORD1>trackPoint_changed</KEYWORD1>
-			<KEYWORD1>rotation_changeds</KEYWORD1>
-			<KEYWORD1>diskAngle</KEYWORD1>
-			<KEYWORD1>maxAngle</KEYWORD1>
-			<KEYWORD1>minAngle</KEYWORD1>
-			<KEYWORD1>choice</KEYWORD1>
-			<KEYWORD1>whichChoice</KEYWORD1>
-			<KEYWORD1>axisOfRotation</KEYWORD1>
-			<KEYWORD1>point</KEYWORD1>
-			<KEYWORD1>coord</KEYWORD1>
-			<KEYWORD1>color</KEYWORD1>
-			<KEYWORD1>coordIndex</KEYWORD1>
-			<KEYWORD1>colorIndex</KEYWORD1>
-			<KEYWORD1>colorPerVertex</KEYWORD1>
-			<KEYWORD1>set_coordIndex</KEYWORD1>
-			<KEYWORD1>set_colorIndex</KEYWORD1>
-			<KEYWORD1>texCoord</KEYWORD1>
-			<KEYWORD1>texCoordIndex</KEYWORD1>
-			<KEYWORD1>normalIndex</KEYWORD1>
-			<KEYWORD1>normalPerVertex</KEYWORD1>
-			<KEYWORD1>ccw</KEYWORD1>
-			<KEYWORD1>convex</KEYWORD1>
-			<KEYWORD1>solid</KEYWORD1>
-			<KEYWORD1>creaseAngle</KEYWORD1>
-			<KEYWORD1>set_texCoordIndex</KEYWORD1>
-			<KEYWORD1>set_normalIndex</KEYWORD1>
-			<KEYWORD1>xDimension</KEYWORD1>
-			<KEYWORD1>xSpacing</KEYWORD1>
-			<KEYWORD1>zDimension</KEYWORD1>
-			<KEYWORD1>zSpacing</KEYWORD1>
-			<KEYWORD1>crossSection</KEYWORD1>
-			<KEYWORD1>spine</KEYWORD1>
-			<KEYWORD1>beginCap</KEYWORD1>
-			<KEYWORD1>endCap</KEYWORD1>
-			<KEYWORD1>set_spine</KEYWORD1>
-			<KEYWORD1>set_crossSection</KEYWORD1>
-			<KEYWORD1>set_scale</KEYWORD1>
-			<KEYWORD1>set_orientation</KEYWORD1>
-			<KEYWORD1>url</KEYWORD1>
-			<KEYWORD1>repeatS</KEYWORD1>
-			<KEYWORD1>repeatT</KEYWORD1>
-			<KEYWORD1>image</KEYWORD1>
-			<KEYWORD1>loop</KEYWORD1>
-			<KEYWORD1>speed</KEYWORD1>
-			<KEYWORD1>startTime</KEYWORD1>
-			<KEYWORD1>stopTime</KEYWORD1>
-			<KEYWORD1>duration_changed</KEYWORD1>
-			<KEYWORD1>vector</KEYWORD1>
-			<KEYWORD1>on</KEYWORD1>
-			<KEYWORD1>location</KEYWORD1>
-			<KEYWORD1>intensity</KEYWORD1>
-			<KEYWORD1>attenuation</KEYWORD1>
-			<KEYWORD1>direction</KEYWORD1>
-			<KEYWORD1>beamWidth</KEYWORD1>
-			<KEYWORD1>cutOffAngle</KEYWORD1>
-			<KEYWORD1>skyColor</KEYWORD1>
-			<KEYWORD1>skyAngle</KEYWORD1>
-			<KEYWORD1>groundColor</KEYWORD1>
-			<KEYWORD1>groundAngle</KEYWORD1>
-			<KEYWORD1>backUrl</KEYWORD1>
-			<KEYWORD1>bottomurl</KEYWORD1>
-			<KEYWORD1>fronturl</KEYWORD1>
-			<KEYWORD1>leftUrl</KEYWORD1>
-			<KEYWORD1>rightUrl</KEYWORD1>
-			<KEYWORD1>topUrl</KEYWORD1>
-			<KEYWORD1>set_bind</KEYWORD1>
-			<KEYWORD1>bind_changed</KEYWORD1>
-			<KEYWORD1>visibilityRange</KEYWORD1>
-			<KEYWORD1>fogType</KEYWORD1>
-			<KEYWORD1>duration</KEYWORD1>
-			<KEYWORD1>pitch</KEYWORD1>
-			<KEYWORD1>priority</KEYWORD1>
-			<KEYWORD1>spatialize</KEYWORD1>
-			<KEYWORD1>maxFront</KEYWORD1>
-			<KEYWORD1>maxBack</KEYWORD1>
-			<KEYWORD1>minFront</KEYWORD1>
-			<KEYWORD1>minBack</KEYWORD1>
-			<KEYWORD1>level</KEYWORD1>
-			<KEYWORD1>range</KEYWORD1>
-			<KEYWORD1>fieldOfView</KEYWORD1>
-			<KEYWORD1>description</KEYWORD1>
-			<KEYWORD1>jump</KEYWORD1>
-			<KEYWORD1>isBound</KEYWORD1>
-			<KEYWORD1>bindTime</KEYWORD1>
-			<KEYWORD1>type</KEYWORD1>
-			<KEYWORD1>avatarSize</KEYWORD1>
-			<KEYWORD1>headLight</KEYWORD1>
-			<KEYWORD1>visibilityLimit</KEYWORD1>
-			<KEYWORD1>enterTime</KEYWORD1>
-			<KEYWORD1>exitTime</KEYWORD1>
-			<KEYWORD1>collide</KEYWORD1>
-			<KEYWORD1>parameter</KEYWORD1>
-			<KEYWORD1>title</KEYWORD1>
-			<KEYWORD1>info</KEYWORD1>
-			<KEYWORD1>mustEvaluate</KEYWORD1>
-			<KEYWORD1>directOutput</KEYWORD1>
-			<KEYWORD1>cycleInterval</KEYWORD1>
-			<KEYWORD1>cycleTime</KEYWORD1>
-
-			<KEYWORD2>META</KEYWORD2>
-			<KEYWORD2>Shape</KEYWORD2>
-			<KEYWORD2>Appearance</KEYWORD2>
-			<KEYWORD2>Material</KEYWORD2>
-			<KEYWORD2>Box</KEYWORD2>
-			<KEYWORD2>Cone</KEYWORD2>
-			<KEYWORD2>Cylinder</KEYWORD2>
-			<KEYWORD2>Sphere</KEYWORD2>
-			<KEYWORD2>Group</KEYWORD2>
-			<KEYWORD2>Text</KEYWORD2>
-			<KEYWORD2>FontStyle</KEYWORD2>
-			<KEYWORD2>Transform</KEYWORD2>
-			<KEYWORD2>TimeSensor</KEYWORD2>
-			<KEYWORD2>PositionInterpolator</KEYWORD2>
-			<KEYWORD2>OrientationInterpolator</KEYWORD2>
-			<KEYWORD2>TouchSensor</KEYWORD2>
-			<KEYWORD2>PlaneSensor</KEYWORD2>
-			<KEYWORD2>SphereSensor</KEYWORD2>
-			<KEYWORD2>CylinderSensor</KEYWORD2>
-			<KEYWORD2>ColorInterpolater</KEYWORD2>
-			<KEYWORD2>ScalarInterpolator</KEYWORD2>
-			<KEYWORD2>Switch</KEYWORD2>
-			<KEYWORD2>Transform</KEYWORD2>
-			<KEYWORD2>Billboard</KEYWORD2>
-			<KEYWORD2>Inline</KEYWORD2>
-			<KEYWORD2>Coordinate</KEYWORD2>
-			<KEYWORD2>CoordinateInterpolator</KEYWORD2>
-			<KEYWORD2>PointSet</KEYWORD2>
-			<KEYWORD2>IndexedLineSet</KEYWORD2>
-			<KEYWORD2>IndexedFaceSet</KEYWORD2>
-			<KEYWORD2>ElevationGrid</KEYWORD2>
-			<KEYWORD2>Extrusion</KEYWORD2>
-			<KEYWORD2>Color</KEYWORD2>
-			<KEYWORD2>PointSet</KEYWORD2>
-			<KEYWORD2>ImageTexture</KEYWORD2>
-			<KEYWORD2>PixelTexture</KEYWORD2>
-			<KEYWORD2>MovieTexture</KEYWORD2>
-			<KEYWORD2>TextureCoordinate</KEYWORD2>
-			<KEYWORD2>TextureTransform</KEYWORD2>
-			<KEYWORD2>Normal</KEYWORD2>
-			<KEYWORD2>NormalInterpolator</KEYWORD2>
-			<KEYWORD2>PointLight</KEYWORD2>
-			<KEYWORD2>DirectionalLight</KEYWORD2>
-			<KEYWORD2>SpotLight</KEYWORD2>
-			<KEYWORD2>Background</KEYWORD2>
-			<KEYWORD2>Fog</KEYWORD2>
-			<KEYWORD2>AudioClip</KEYWORD2>
-			<KEYWORD2>Sound</KEYWORD2>
-			<KEYWORD2>LOD</KEYWORD2>
-			<KEYWORD2>Viewpoint</KEYWORD2>
-			<KEYWORD2>NavigationInfo</KEYWORD2>
-			<KEYWORD2>VisibilitySensor</KEYWORD2>
-			<KEYWORD2>ProximitySensor</KEYWORD2>
-			<KEYWORD2>Collision</KEYWORD2>
-			<KEYWORD2>Anchor</KEYWORD2>
-			<KEYWORD2>WorldInfo</KEYWORD2>
-			<KEYWORD2>Script</KEYWORD2>
-
-			<KEYWORD3>DEF</KEYWORD3>
-			<KEYWORD3>FALSE</KEYWORD3>
-			<KEYWORD3>NULL</KEYWORD3>
-			<KEYWORD3>ROUTE</KEYWORD3>
-			<KEYWORD3>PROTO</KEYWORD3>
-			<KEYWORD3>EXTERNPROTO</KEYWORD3>
-			<KEYWORD3>IS</KEYWORD3>
-			<KEYWORD3>TO</KEYWORD3>
-			<KEYWORD3>TRUE</KEYWORD3>
-			<KEYWORD3>USE</KEYWORD3>
-			<KEYWORD3>eventIn</KEYWORD3>
-			<KEYWORD3>eventOut</KEYWORD3>
-			<KEYWORD3>exposedField</KEYWORD3>
-			<KEYWORD3>field</KEYWORD3>
-
-			<KEYWORD4>SFBool</KEYWORD4>
-			<KEYWORD4>SFColor</KEYWORD4>
-			<KEYWORD4>MFColor</KEYWORD4>
-			<KEYWORD4>SFFloat</KEYWORD4>
-			<KEYWORD4>MFFloat</KEYWORD4>
-			<KEYWORD4>SFImage</KEYWORD4>
-			<KEYWORD4>SFInt32</KEYWORD4>
-			<KEYWORD4>MFInt32</KEYWORD4>
-			<KEYWORD4>SFNode</KEYWORD4>
-			<KEYWORD4>MFnode</KEYWORD4>
-			<KEYWORD4>SFRotation</KEYWORD4>
-			<KEYWORD4>MFRotation</KEYWORD4>
-			<KEYWORD4>SFString</KEYWORD4>
-			<KEYWORD4>MFString</KEYWORD4>
-			<KEYWORD4>SFTime</KEYWORD4>
-			<KEYWORD4>SFVec2f</KEYWORD4>
-			<KEYWORD4>MFVec2f</KEYWORD4>
-			<KEYWORD4>SFVec3f</KEYWORD4>
-			<KEYWORD4>MFVec3f</KEYWORD4>
-			<FUNCTION>assert</FUNCTION>
-
-			<LITERAL2>false</LITERAL2>
-			<INVALID>goto</INVALID>
-		</KEYWORDS>
-	</RULES>
-</MODE>
-
-
diff --git a/qpython/src/main/assets/syntax/xml.xml b/qpython/src/main/assets/syntax/xml.xml
index 0b01c38f..d7ec4654 100644
--- a/qpython/src/main/assets/syntax/xml.xml
+++ b/qpython/src/main/assets/syntax/xml.xml
@@ -8,7 +8,7 @@
 		<PROPERTY NAME="commentEnd" VALUE="--&gt;" />
 	</PROPS>
 	<RULES>
-		<!-- SGML comment -->
+		<!-- Sfrom_contentment -->
 		<SPAN TYPE="COMMENT1">
 			<BEGIN>&lt;!--</BEGIN>
 			<END>--&gt;</END>
@@ -51,7 +51,7 @@
 		</SPAN>
 	</RULES>
 	<RULES SET="TAGS" DEFAULT="MARKUP" NO_WORD_SEP="-_">
-		<!-- SGML comment -->
+		<!-- Sfrom_contentment -->
 		<SPAN TYPE="COMMENT1">
 			<BEGIN>&lt;!--</BEGIN>
 			<END>--&gt;</END>
@@ -71,13 +71,13 @@
 		<MARK_PREVIOUS TYPE="LABEL" MATCH_TYPE="OPERATOR">:</MARK_PREVIOUS>
 	</RULES>
 	<RULES SET="DTD-TAGS" DEFAULT="KEYWORD2" IGNORE_CASE="FALSE">
-		<!-- SGML comment -->
+		<!-- Sfrom_contentment -->
 		<SPAN TYPE="COMMENT1">
 			<BEGIN>&lt;!--</BEGIN>
 			<END>--&gt;</END>
 		</SPAN>
 
-		<!-- SGML comment -->
+		<!-- Sfrom_contentment -->
 		<SPAN TYPE="COMMENT1">
 			<BEGIN>--</BEGIN>
 			<END>--</END>
@@ -132,13 +132,13 @@
  	</RULES>
  	<!-- }}} -->
 	<RULES SET="ENTITY-TAGS" DEFAULT="KEYWORD2">
-		<!-- SGML comment -->
+		<!-- Sfrom_contentment -->
 		<SPAN TYPE="COMMENT1">
 			<BEGIN>&lt;!--</BEGIN>
 			<END>--&gt;</END>
 		</SPAN>
 
-		<!-- SGML comment -->
+		<!-- Sfrom_contentment -->
 		<SPAN TYPE="COMMENT1">
 			<BEGIN>--</BEGIN>
 			<END>--</END>
diff --git a/qpython/src/main/assets/syntax/xq.xml b/qpython/src/main/assets/syntax/xq.xml
deleted file mode 100644
index af5df76f..00000000
--- a/qpython/src/main/assets/syntax/xq.xml
+++ /dev/null
@@ -1,459 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="commentStart" VALUE="&lt;!--" />
-		<PROPERTY NAME="commentEnd" VALUE="--&gt;" />
-		<PROPERTY NAME="commentStart" VALUE="(:" />
-		<PROPERTY NAME="commentEnd" VALUE=":)" />
-		<PROPERTY NAME="wordBreakChars" VALUE=":,+=&lt;&gt;/?^&amp;*" />
-
-		<!-- Auto indent -->
-		<!-- <PROPERTY NAME="indentOpenBrackets" VALUE="{" /> -->
-		<!-- <PROPERTY NAME="indentCloseBrackets" VALUE="}" /> -->
-		<PROPERTY NAME="indentNextLine"
-			VALUE="\s*(((if)\s*\(|else\s*|else\s+if\s*\(|for\s*\(.*\))[^{;]*)" />
-		<!-- set this to 'true' if you want to use GNU coding style -->
-		<PROPERTY NAME="doubleBracketIndent" VALUE="false" />
-		<PROPERTY NAME="lineUpClosingBracket" VALUE="true" />
-	</PROPS>
-	<RULES>
-		<!-- SGML comment -->
-		<SPAN TYPE="COMMENT1">
-			<BEGIN>&lt;!--</BEGIN>
-			<END>--&gt;</END>
-		</SPAN>
-
-
-		<!-- DTD Entity declarations -->
-		<SPAN TYPE="KEYWORD2" DELEGATE="ENTITY-TAGS">
-			<BEGIN>&lt;!ENTITY</BEGIN>
-			<END>&gt;</END>
-		</SPAN>
-
-		<!-- CDATA sections -->
-		<SPAN TYPE="KEYWORD2" DELEGATE="CDATA">
-			<BEGIN>&lt;![CDATA[</BEGIN>
-			<END>]]&gt;</END>
-		</SPAN>
-
-		<!-- DTD instructions -->
-		<SPAN TYPE="KEYWORD2" DELEGATE="DTD-TAGS">
-			<BEGIN>&lt;!</BEGIN>
-			<END>&gt;</END>
-		</SPAN>
-
-		<!-- PI directives -->
-		<SPAN TYPE="KEYWORD3">
-			<BEGIN>&lt;?</BEGIN>
-			<END>&gt;</END>
-		</SPAN>
-
-		<!-- markup tags -->
-		<SPAN_REGEXP HASH_CHAR="&lt;" TYPE="MARKUP" DELEGATE="TAGS">
-			<BEGIN><![CDATA[<[a-zA-Z/]\w*]]></BEGIN>
-			<END>&gt;</END>
-		</SPAN_REGEXP>
-
-		<!-- SGML entities -->
-		<SPAN TYPE="LITERAL2" NO_WORD_BREAK="TRUE">
-			<BEGIN>&amp;</BEGIN>
-			<END>;</END>
-		</SPAN>
-	</RULES>
-
-	<RULES SET="TAGS" DEFAULT="MARKUP" NO_WORD_SEP="-_">
-		<!-- SGML comment -->
-		<SPAN TYPE="COMMENT1">
-			<BEGIN>&lt;!--</BEGIN>
-			<END>--&gt;</END>
-		</SPAN>
-
-		<SPAN TYPE="LITERAL1" NO_LINE_BREAK="TRUE">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-
-		<SPAN TYPE="LITERAL1" NO_LINE_BREAK="TRUE">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-
-
-		<SEQ TYPE="MARKUP">/</SEQ>
-		<MARK_PREVIOUS TYPE="LABEL" MATCH_TYPE="OPERATOR">:</MARK_PREVIOUS>
-	</RULES>
-
-	<RULES SET="DTD-TAGS" DEFAULT="KEYWORD2" IGNORE_CASE="FALSE">
-		<!-- SGML comment -->
-		<SPAN TYPE="COMMENT1">
-			<BEGIN>&lt;!--</BEGIN>
-			<END>--&gt;</END>
-		</SPAN>
-
-		<!-- SGML comment -->
-		<SPAN TYPE="COMMENT1">
-			<BEGIN>--</BEGIN>
-			<END>--</END>
-		</SPAN>
-
-		<!-- Parameter entities -->
-		<SPAN TYPE="LITERAL2" NO_WORD_BREAK="TRUE">
-			<BEGIN>%</BEGIN>
-			<END>;</END>
-		</SPAN>
-
-		<SPAN TYPE="LITERAL1" NO_LINE_BREAK="TRUE">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-
-		<SPAN TYPE="LITERAL1" NO_LINE_BREAK="TRUE">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-
-		<!-- This appears in some SGML documents -->
-		<SPAN TYPE="KEYWORD2" DELEGATE="MAIN">
-			<BEGIN>[</BEGIN>
-			<END>]</END>
-		</SPAN>
-
-		<SEQ TYPE="OPERATOR">(</SEQ>
-		<SEQ TYPE="OPERATOR">)</SEQ>
-		<SEQ TYPE="OPERATOR">|</SEQ>
-		<SEQ TYPE="OPERATOR">?</SEQ>
-		<SEQ TYPE="OPERATOR">*</SEQ>
-		<SEQ TYPE="OPERATOR">+</SEQ>
-		<SEQ TYPE="OPERATOR">,</SEQ>
-
-		<KEYWORDS>
-			<KEYWORD1>CDATA</KEYWORD1>
-			<KEYWORD1>EMPTY</KEYWORD1>
-			<KEYWORD1>INCLUDE</KEYWORD1>
-			<KEYWORD1>IGNORE</KEYWORD1>
-			<KEYWORD1>NDATA</KEYWORD1>
-			<KEYWORD1>#IMPLIED</KEYWORD1>
-			<KEYWORD1>#PCDATA</KEYWORD1>
-			<KEYWORD1>#REQUIRED</KEYWORD1>
-		</KEYWORDS>
-	</RULES>
-
-	<RULES SET="ENTITY-TAGS" DEFAULT="KEYWORD2">
-		<!-- SGML comment -->
-		<SPAN TYPE="COMMENT1">
-			<BEGIN>&lt;!--</BEGIN>
-			<END>--&gt;</END>
-		</SPAN>
-
-		<!-- SGML comment -->
-		<SPAN TYPE="COMMENT1">
-			<BEGIN>--</BEGIN>
-			<END>--</END>
-		</SPAN>
-
-		<SPAN TYPE="LITERAL1" NO_LINE_BREAK="TRUE">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-
-		<SPAN TYPE="LITERAL1" NO_LINE_BREAK="TRUE">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-
-		<SEQ TYPE="OPERATOR">=</SEQ>
-
-		<SEQ TYPE="OPERATOR">%</SEQ>
-
-		<KEYWORDS>
-			<KEYWORD1>SYSTEM</KEYWORD1>
-		</KEYWORDS>
-	</RULES>
-
-	<RULES SET="CDATA" DEFAULT="COMMENT2">
-		<!-- no rules -->
-	</RULES>
-
-	<RULES IGNORE_CASE="FALSE"
-		HIGHLIGHT_DIGITS="TRUE"
-		DIGIT_RE="(0x\p{XDigit}+[lL]?|\d+(e\d*)?[lLdDfF]?)">
-
-		<!-- XQuery style comment -->
-		<SPAN TYPE="COMMENT1">
-			<BEGIN>(:</BEGIN>
-			<END>:)</END>
-		</SPAN>
-
-		<SPAN TYPE="LITERAL1" ESCAPE="\" NO_LINE_BREAK="TRUE">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-		<SPAN TYPE="LITERAL1" ESCAPE="\" NO_LINE_BREAK="TRUE">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-
-		<MARK_FOLLOWING TYPE="KEYWORD2">$</MARK_FOLLOWING>
-
-		<!-- Function calls -->
-		<MARK_PREVIOUS TYPE="FUNCTION" MATCH_TYPE="OPERATOR">(</MARK_PREVIOUS>
-		<SEQ TYPE="OPERATOR">)</SEQ>
-
-		<SEQ TYPE="OPERATOR">,</SEQ>
-
-		<SEQ TYPE="OPERATOR">=</SEQ>
-		<SEQ TYPE="OPERATOR">!=</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;=</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;=</SEQ>
-
-		<SEQ TYPE="OPERATOR">&lt;&lt;</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;&gt;</SEQ>
-
-		<SEQ TYPE="OPERATOR">+</SEQ>
-<!--
-		<SEQ TYPE="OPERATOR">-</SEQ>
- -->
- 		<SEQ TYPE="OPERATOR">*</SEQ>
-
-		<!-- unary -/+ ? -->
-
-		<SEQ TYPE="OPERATOR">|</SEQ>
-
-		<SEQ TYPE="OPERATOR">/</SEQ>
-		<SEQ TYPE="OPERATOR">//</SEQ>
-
-		<SEQ TYPE="OPERATOR">}</SEQ>
-		<SEQ TYPE="OPERATOR">{</SEQ>
-
-		<KEYWORDS>
-			<OPERATOR>some</OPERATOR>
-			<OPERATOR>every</OPERATOR>
-
-			<OPERATOR>or</OPERATOR>
-			<OPERATOR>and</OPERATOR>
-
-			<OPERATOR>instance of</OPERATOR>
-
-			<OPERATOR>treat as</OPERATOR>
-
-			<OPERATOR>castable as</OPERATOR>
-
-			<OPERATOR>cast as</OPERATOR>
-
-			<OPERATOR>eq</OPERATOR>
-			<OPERATOR>ne</OPERATOR>
-			<OPERATOR>lt</OPERATOR>
-			<OPERATOR>gt</OPERATOR>
-			<OPERATOR>ge</OPERATOR>
-			<OPERATOR>is</OPERATOR>
-
-			<OPERATOR>to</OPERATOR>
-
-			<OPERATOR>div</OPERATOR>
-			<OPERATOR>idiv</OPERATOR>
-			<OPERATOR>mod</OPERATOR>
-
-			<OPERATOR>union</OPERATOR>
-
-			<OPERATOR>intersect</OPERATOR>
-			<OPERATOR>except</OPERATOR>
-
-			<KEYWORD1>return</KEYWORD1>
-			<KEYWORD1>for</KEYWORD1>
-			<KEYWORD1>in</KEYWORD1>
-			<KEYWORD1>to</KEYWORD1>
-			<KEYWORD1>at</KEYWORD1>
-
-			<KEYWORD1>let</KEYWORD1>
-			<KEYWORD1>:=</KEYWORD1>
-
-			<KEYWORD1>where</KEYWORD1>
-
-			<KEYWORD1>stable</KEYWORD1>
-			<KEYWORD1>order</KEYWORD1>
-			<KEYWORD1>by</KEYWORD1>
-
-			<LITERAL2>ascending</LITERAL2>
-			<LITERAL2>descending</LITERAL2>
-
-			<LITERAL2>greatest</LITERAL2>
-			<LITERAL2>least</LITERAL2>
-			<LITERAL2>collation</LITERAL2>
-
-			<KEYWORD3>typeswitch</KEYWORD3>
-			<KEYWORD3>default</KEYWORD3>
-
-			<KEYWORD1>cast</KEYWORD1>
-			<KEYWORD1>as</KEYWORD1>
-			<KEYWORD1>if</KEYWORD1>
-			<KEYWORD1>then</KEYWORD1>
-			<KEYWORD1>else</KEYWORD1>
-
-			<LITERAL2>true</LITERAL2>
-			<LITERAL2>false</LITERAL2>
-
-			<KEYWORD3>xquery</KEYWORD3>
-			<KEYWORD3>version</KEYWORD3>
-
-			<KEYWORD3>declare</KEYWORD3>
-			<KEYWORD3>function</KEYWORD3>
-			<KEYWORD3>library</KEYWORD3>
-			<KEYWORD3>variable</KEYWORD3>
-			<KEYWORD3>module</KEYWORD3>
-			<KEYWORD3>namespace</KEYWORD3>
-			<KEYWORD3>local</KEYWORD3>
-
-			<KEYWORD3>validate</KEYWORD3>
-			<KEYWORD3>import</KEYWORD3>
-			<KEYWORD3>schema</KEYWORD3>
-			<KEYWORD3>validation</KEYWORD3>
-			<KEYWORD3>collection</KEYWORD3>
-
-			<KEYWORD3>ancestor</KEYWORD3>
-			<KEYWORD3>descendant</KEYWORD3>
-			<KEYWORD3>self</KEYWORD3>
-			<KEYWORD3>parent</KEYWORD3>
-			<KEYWORD3>child</KEYWORD3>
-			<KEYWORD3>self</KEYWORD3>
-			<KEYWORD3>descendant-or-self</KEYWORD3>
-			<KEYWORD3>ancestor-or-self</KEYWORD3>
-			<KEYWORD3>preceding-sibling</KEYWORD3>
-			<KEYWORD3>following-sibling</KEYWORD3>
-			<KEYWORD3>following</KEYWORD3>
-			<KEYWORD3>preceding</KEYWORD3>
-
-			<KEYWORD4>xs:integer</KEYWORD4>
-			<KEYWORD4>xs:decimal</KEYWORD4>
-			<KEYWORD4>xs:double</KEYWORD4>
-			<KEYWORD4>xs:string</KEYWORD4>
-			<KEYWORD4>xs:date</KEYWORD4>
-			<KEYWORD4>xs:time</KEYWORD4>
-			<KEYWORD4>xs:dateTime</KEYWORD4>
-			<KEYWORD4>xs:boolean</KEYWORD4>
-
-			<KEYWORD4>item</KEYWORD4>
-			<KEYWORD4>element</KEYWORD4>
-			<KEYWORD4>attribute</KEYWORD4>
-			<KEYWORD4>comment</KEYWORD4>
-			<KEYWORD4>document</KEYWORD4>
-			<KEYWORD4>document-node</KEYWORD4>
-			<KEYWORD4>node</KEYWORD4>
-			<KEYWORD4>empty</KEYWORD4>
-
-			<FUNCTION>zero-or-one</FUNCTION>
-			<FUNCTION>avg</FUNCTION>
-			<FUNCTION>base-uri</FUNCTION>
-			<FUNCTION>boolean</FUNCTION>
-			<FUNCTION>ceiling</FUNCTION>
-			<FUNCTION>codepoints-to-string</FUNCTION>
-			<FUNCTION>collection</FUNCTION>
-			<FUNCTION>compare</FUNCTION>
-			<FUNCTION>concat</FUNCTION>
-			<FUNCTION>contains</FUNCTION>
-			<FUNCTION>count</FUNCTION>
-			<FUNCTION>current-date</FUNCTION>
-			<FUNCTION>current-dateTime</FUNCTION>
-			<FUNCTION>current-time</FUNCTION>
-			<FUNCTION>data</FUNCTION>
-			<FUNCTION>day-from-date</FUNCTION>
-			<FUNCTION>day-from-dateTime</FUNCTION>
-			<FUNCTION>days-from-duration</FUNCTION>
-			<FUNCTION>deep-equal</FUNCTION>
-			<FUNCTION>distinct-values</FUNCTION>
-			<FUNCTION>doc</FUNCTION>
-			<FUNCTION>adjust-time-to-timezone</FUNCTION>
-			<FUNCTION>adjust-dateTime-to-timezone</FUNCTION>
-			<FUNCTION>string-length</FUNCTION>
-			<FUNCTION>string-join</FUNCTION>
-			<FUNCTION>string</FUNCTION>
-			<FUNCTION>starts-with</FUNCTION>
-			<FUNCTION>seconds-from-time</FUNCTION>
-			<FUNCTION>seconds-from-duration</FUNCTION>
-			<FUNCTION>seconds-from-dateTime</FUNCTION>
-			<FUNCTION>round-half-to-even</FUNCTION>
-			<FUNCTION>round</FUNCTION>
-			<FUNCTION>root</FUNCTION>
-			<FUNCTION>reverse</FUNCTION>
-			<FUNCTION>replace</FUNCTION>
-			<FUNCTION>remove</FUNCTION>
-			<FUNCTION>prefix-from-QName</FUNCTION>
-			<FUNCTION>position</FUNCTION>
-			<FUNCTION>one-or-more</FUNCTION>
-			<FUNCTION>number</FUNCTION>
-			<FUNCTION>QName</FUNCTION>
-			<FUNCTION>abs</FUNCTION>
-			<FUNCTION>adjust-date-to-timezone</FUNCTION>
-			<FUNCTION>doc-available</FUNCTION>
-			<FUNCTION>doctype</FUNCTION>
-			<FUNCTION>document</FUNCTION>
-			<FUNCTION>last</FUNCTION>
-			<FUNCTION>local-name</FUNCTION>
-			<FUNCTION>local-name-from-QName</FUNCTION>
-			<FUNCTION>lower-case</FUNCTION>
-			<FUNCTION>match-all</FUNCTION>
-			<FUNCTION>match-any</FUNCTION>
-			<FUNCTION>matches</FUNCTION>
-			<FUNCTION>max</FUNCTION>
-			<FUNCTION>min</FUNCTION>
-			<FUNCTION>minutes-from-dateTime</FUNCTION>
-			<FUNCTION>minutes-from-duration</FUNCTION>
-			<FUNCTION>minutes-from-time</FUNCTION>
-			<FUNCTION>month-from-date</FUNCTION>
-			<FUNCTION>month-from-dateTime</FUNCTION>
-			<FUNCTION>name</FUNCTION>
-			<FUNCTION>namespace-uri</FUNCTION>
-			<FUNCTION>namespace-uri-for-prefix</FUNCTION>
-			<FUNCTION>namespace-uri-from-QName</FUNCTION>
-			<FUNCTION>node-name</FUNCTION>
-			<FUNCTION>normalize-space</FUNCTION>
-			<FUNCTION>lang</FUNCTION>
-			<FUNCTION>item-at</FUNCTION>
-			<FUNCTION>document-uri</FUNCTION>
-			<FUNCTION>empty</FUNCTION>
-			<FUNCTION>encode-for-uri</FUNCTION>
-			<FUNCTION>ends-with</FUNCTION>
-			<FUNCTION>error</FUNCTION>
-			<FUNCTION>escape-html-uri</FUNCTION>
-			<FUNCTION>escape-uri</FUNCTION>
-			<FUNCTION>exactly-one</FUNCTION>
-			<FUNCTION>exists</FUNCTION>
-			<FUNCTION>false</FUNCTION>
-			<FUNCTION>floor</FUNCTION>
-			<FUNCTION>hours-from-dateTime</FUNCTION>
-			<FUNCTION>hours-from-duration</FUNCTION>
-			<FUNCTION>hours-from-time</FUNCTION>
-			<FUNCTION>id</FUNCTION>
-			<FUNCTION>implicit-timezone</FUNCTION>
-			<FUNCTION>in-scope-prefixes</FUNCTION>
-			<FUNCTION>index-of</FUNCTION>
-			<FUNCTION>insert-before</FUNCTION>
-			<FUNCTION>iri-to-uri</FUNCTION>
-			<FUNCTION>string-pad</FUNCTION>
-			<FUNCTION>string-to-codepoints</FUNCTION>
-			<FUNCTION>sum</FUNCTION>
-			<FUNCTION>timezone-from-date</FUNCTION>
-			<FUNCTION>timezone-from-dateTime</FUNCTION>
-			<FUNCTION>timezone-from-time</FUNCTION>
-			<FUNCTION>not</FUNCTION>
-			<FUNCTION>tokenize</FUNCTION>
-			<FUNCTION>translate</FUNCTION>
-			<FUNCTION>true</FUNCTION>
-			<FUNCTION>unordered</FUNCTION>
-			<FUNCTION>upper-case</FUNCTION>
-			<FUNCTION>xcollection</FUNCTION>
-			<FUNCTION>year-from-date</FUNCTION>
-			<FUNCTION>year-from-dateTime</FUNCTION>
-			<FUNCTION>substring-before</FUNCTION>
-			<FUNCTION>subsequence</FUNCTION>
-			<FUNCTION>substring</FUNCTION>
-			<FUNCTION>substring-after</FUNCTION>
-
-		</KEYWORDS>
-	</RULES>
-
-</MODE>
diff --git a/qpython/src/main/assets/syntax/xsl.xml b/qpython/src/main/assets/syntax/xsl.xml
deleted file mode 100644
index cb6a6f2c..00000000
--- a/qpython/src/main/assets/syntax/xsl.xml
+++ /dev/null
@@ -1,447 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE MODE SYSTEM "xmode.dtd"><!--
-  ======================================================================
-  Edit mode for XSLT 1.0 and XSLT 2.0
-  ======================================================================
-  Token types:
-
-  COMMENT1    XML comments
-  COMMENT2    XPath 2.0 comments - top or nested within COMMENT3
-  COMMENT3    XPath 2.0 comments - nested within COMMENT2
-  COMMENT4    Default task names used in Task List
-  DIGIT       Digits
-  FUNCTION    Functions
-  INVALID     -
-  KEYWORD1    XSLT element names
-  KEYWORD2    XSLT attribute names
-  KEYWORD3    Attribute values
-  KEYWORD4    Axes specifiers
-  LABEL       Namespace prefixes
-  LITERAL1    String literals
-  LITERAL2    Parameter and variable references
-  LITERAL3    Entity references and processing instructions
-  LITERAL4    DTD constructs and CDATA sections
-  MARKUP      Result elements and extension elements
-  OPERATOR    XPath 2.0 keywords + some other stuff
-  ======================================================================
--->
-
-<MODE>
-
-  <PROPS>
-    <PROPERTY NAME="commentStart" VALUE="&lt;!--"/>
-    <PROPERTY NAME="commentEnd" VALUE="--&gt;"/>
-  </PROPS>
-
-  <RULES HIGHLIGHT_DIGITS="FALSE" IGNORE_CASE="FALSE">
-
-    <!-- XML comments -->
-    <SPAN DELEGATE="TASKS" TYPE="COMMENT1">
-      <BEGIN>&lt;!--</BEGIN>
-      <END>--&gt;</END>
-    </SPAN>
-
-    <!-- Assume 'xsl' prefix for XSLT elements -->
-    <SPAN_REGEXP HASH_CHAR="&lt;" DELEGATE="XSLTAGS" TYPE="KEYWORD2">
-      <BEGIN>&lt;(?=xsl:)</BEGIN>
-      <END>&gt;</END>
-    </SPAN_REGEXP>
-
-    <SPAN_REGEXP HASH_CHAR="&lt;" DELEGATE="XSLTAGS" TYPE="KEYWORD2">
-      <BEGIN>&lt;(?=/xsl:)</BEGIN>
-      <END>&gt;</END>
-    </SPAN_REGEXP>
-
-    <!-- CDATA marked sections. Reuse common xml mode -->
-    <SPAN TYPE="KEYWORD2" DELEGATE="xml::CDATA">
-      <BEGIN>&lt;![CDATA[</BEGIN>
-      <END>]]&gt;</END>
-    </SPAN>
-
-    <!-- DTD constructs. Reuse common xml mode  -->
-    <SPAN TYPE="KEYWORD2" DELEGATE="xml::DTD-TAGS">
-      <BEGIN>&lt;!</BEGIN>
-      <END>&gt;</END>
-    </SPAN>
-
-    <!-- Entity references -->
-    <SPAN TYPE="LITERAL3" NO_WORD_BREAK="TRUE">
-      <BEGIN>&amp;</BEGIN>
-      <END>;</END>
-    </SPAN>
-
-    <!-- Processing instructions -->
-    <SPAN TYPE="LITERAL3">
-      <BEGIN>&lt;?</BEGIN>
-      <END>?&gt;</END>
-    </SPAN>
-
-    <!-- Result elements and extension elements -->
-    <SPAN DELEGATE="TAGS" TYPE="MARKUP">
-      <BEGIN>&lt;</BEGIN>
-      <END>&gt;</END>
-    </SPAN>
-  </RULES>
-
-  <!-- XML comments -->
-  <RULES DEFAULT="COMMENT1" IGNORE_CASE="FALSE" SET="TASKS">
-    <!-- Default task names used in Task List -->
-    <KEYWORDS>
-      <COMMENT4>DEBUG:</COMMENT4>
-      <COMMENT4>DONE:</COMMENT4>
-      <COMMENT4>FIXME:</COMMENT4>
-      <COMMENT4>IDEA:</COMMENT4>
-      <COMMENT4>NOTE:</COMMENT4>
-      <COMMENT4>QUESTION:</COMMENT4>
-      <COMMENT4>TODO:</COMMENT4>
-      <COMMENT4>XXX</COMMENT4>
-      <COMMENT4>???</COMMENT4>
-    </KEYWORDS>
-  </RULES>
-
-  <!-- Result elements and extension elements -->
-  <RULES DEFAULT="MARKUP" HIGHLIGHT_DIGITS="FALSE" NO_WORD_SEP=".-_:" SET="TAGS">
-
-    <!-- Highlight all AVTs in result attribute values. -->
-    <SPAN TYPE="MARKUP" DELEGATE="AVT">
-      <BEGIN>"</BEGIN>
-      <END>"</END>
-    </SPAN>
-    <SPAN TYPE="MARKUP" DELEGATE="AVT">
-      <BEGIN>'</BEGIN>
-      <END>'</END>
-    </SPAN>
-
-    <!-- Namespace declarations -->
-    <SEQ TYPE="OPERATOR">xmlns:</SEQ>
-    <!-- Default namespace declaration. Not really used in XSLT -->
-    <SEQ TYPE="OPERATOR">xmlns</SEQ>
-
-    <!-- Namespace prefixes -->
-    <MARK_PREVIOUS TYPE="LABEL">:</MARK_PREVIOUS>
-
-  </RULES>
-
-  <!-- AVTs -->
-  <RULES DEFAULT="KEYWORD3" HIGHLIGHT_DIGITS="FALSE" NO_WORD_SEP=".-_:" SET="AVT">
-
-    <!-- Literal curly braces ({}) must be written as {{ or }} -->
-    <SEQ>{{</SEQ>
-    <SEQ>}}</SEQ><!-- Does nothing. Is overridden by the SPAN below. -->
-
-    <!-- The AVT itself -->
-    <SPAN DELEGATE="XPATH" TYPE="OPERATOR">
-      <BEGIN>{</BEGIN>
-      <END>}</END>
-    </SPAN>
-
-    <!-- Entity references -->
-    <SPAN TYPE="LITERAL3" NO_WORD_BREAK="TRUE">
-      <BEGIN>&amp;</BEGIN>
-      <END>;</END>
-    </SPAN>
-
-  </RULES>
-
-  <!-- XSLT tags -->
-  <RULES DEFAULT="KEYWORD2" HIGHLIGHT_DIGITS="FALSE" NO_WORD_SEP=".-_:" SET="XSLTAGS">
-
-    <!-- If we spot something that looks like an AVT, assume it is. Lazy, I know... -->
-    <SPAN TYPE="KEYWORD2" DELEGATE="AVT">
-      <BEGIN>"</BEGIN>
-      <END>"</END>
-    </SPAN>
-    <SPAN TYPE="KEYWORD2" DELEGATE="AVT">
-      <BEGIN>'</BEGIN>
-      <END>'</END>
-    </SPAN>
-
-    <!-- XSLT attributes that contains XPath expressions or match patterns -->
-    <!-- count -->
-    <SPAN_REGEXP TYPE="KEYWORD2" HASH_CHAR="count" DELEGATE="XPATH">
-      <BEGIN>count[\p{Space}]*=[\p{Space}]*"</BEGIN>
-      <END>"</END>
-    </SPAN_REGEXP>
-    <SPAN_REGEXP TYPE="KEYWORD2" HASH_CHAR="count" DELEGATE="XPATH">
-      <BEGIN>count[\p{Space}]*=[\p{Space}]*'</BEGIN>
-      <END>'</END>
-    </SPAN_REGEXP>
-    <!-- from -->
-    <SPAN_REGEXP TYPE="KEYWORD2" HASH_CHAR="from" DELEGATE="XPATH">
-      <BEGIN>from[\p{Space}]*=[\p{Space}]*"</BEGIN>
-      <END>"</END>
-    </SPAN_REGEXP>
-    <SPAN_REGEXP TYPE="KEYWORD2" HASH_CHAR="from" DELEGATE="XPATH">
-      <BEGIN>from[\p{Space}]*=[\p{Space}]*'</BEGIN>
-      <END>'</END>
-    </SPAN_REGEXP>
-    <!-- group-adjacent -->
-    <SPAN_REGEXP TYPE="KEYWORD2" HASH_CHAR="group-adjacent" DELEGATE="XPATH">
-      <BEGIN>group-adjacent[\p{Space}]*=[\p{Space}]*"</BEGIN>
-      <END>"</END>
-    </SPAN_REGEXP>
-    <SPAN_REGEXP TYPE="KEYWORD2" HASH_CHAR="group-adjacent" DELEGATE="XPATH">
-      <BEGIN>group-adjacent[\p{Space}]*=[\p{Space}]*'</BEGIN>
-      <END>'</END>
-    </SPAN_REGEXP>
-    <!-- group-by -->
-    <SPAN_REGEXP TYPE="KEYWORD2" HASH_CHAR="group-by" DELEGATE="XPATH">
-      <BEGIN>group-by[\p{Space}]*=[\p{Space}]*"</BEGIN>
-      <END>"</END>
-    </SPAN_REGEXP>
-    <SPAN_REGEXP TYPE="KEYWORD2" HASH_CHAR="group-by" DELEGATE="XPATH">
-      <BEGIN>group-by[\p{Space}]*=[\p{Space}]*'</BEGIN>
-      <END>'</END>
-    </SPAN_REGEXP>
-    <!-- group-ending-with -->
-    <SPAN_REGEXP TYPE="KEYWORD2" HASH_CHAR="group-ending-with" DELEGATE="XPATH">
-      <BEGIN>group-ending-with[\p{Space}]*=[\p{Space}]*"</BEGIN>
-      <END>"</END>
-    </SPAN_REGEXP>
-    <SPAN_REGEXP TYPE="KEYWORD2" HASH_CHAR="group-ending-with" DELEGATE="XPATH">
-      <BEGIN>group-ending-with[\p{Space}]*=[\p{Space}]*'</BEGIN>
-      <END>'</END>
-    </SPAN_REGEXP>
-    <!-- group-starting-with -->
-    <SPAN_REGEXP TYPE="KEYWORD2" HASH_CHAR="group-starting-with" DELEGATE="XPATH">
-      <BEGIN>group-starting-with[\p{Space}]*=[\p{Space}]*"</BEGIN>
-      <END>"</END>
-    </SPAN_REGEXP>
-    <SPAN_REGEXP TYPE="KEYWORD2" HASH_CHAR="group-starting-with" DELEGATE="XPATH">
-      <BEGIN>group-starting-with[\p{Space}]*=[\p{Space}]*'</BEGIN>
-      <END>'</END>
-    </SPAN_REGEXP>
-    <!-- match -->
-    <SPAN_REGEXP TYPE="KEYWORD2" HASH_CHAR="match" DELEGATE="XPATH">
-      <BEGIN>match[\p{Space}]*=[\p{Space}]*"</BEGIN>
-      <END>"</END>
-    </SPAN_REGEXP>
-    <SPAN_REGEXP TYPE="KEYWORD2" HASH_CHAR="match" DELEGATE="XPATH">
-      <BEGIN>match[\p{Space}]*=[\p{Space}]*'</BEGIN>
-      <END>'</END>
-    </SPAN_REGEXP>
-    <!-- select -->
-    <SPAN_REGEXP TYPE="KEYWORD2" HASH_CHAR="select" DELEGATE="XPATH">
-      <BEGIN>select[\p{Space}]*=[\p{Space}]*"</BEGIN>
-      <END>"</END>
-    </SPAN_REGEXP>
-    <SPAN_REGEXP TYPE="KEYWORD2" HASH_CHAR="select" DELEGATE="XPATH">
-      <BEGIN>select[\p{Space}]*=[\p{Space}]*'</BEGIN>
-      <END>'</END>
-    </SPAN_REGEXP>
-    <!-- test -->
-    <SPAN_REGEXP TYPE="KEYWORD2" HASH_CHAR="test" DELEGATE="XPATH">
-      <BEGIN>test[\p{Space}]*=[\p{Space}]*"</BEGIN>
-      <END>"</END>
-    </SPAN_REGEXP>
-    <SPAN_REGEXP TYPE="KEYWORD2" HASH_CHAR="test" DELEGATE="XPATH">
-      <BEGIN>test[\p{Space}]*=[\p{Space}]*'</BEGIN>
-      <END>'</END>
-    </SPAN_REGEXP>
-    <!-- use -->
-    <SPAN_REGEXP TYPE="KEYWORD2" HASH_CHAR="use" DELEGATE="XPATH">
-      <BEGIN>use[\p{Space}]*=[\p{Space}]*"</BEGIN>
-      <END>"</END>
-    </SPAN_REGEXP>
-    <SPAN_REGEXP TYPE="KEYWORD2" HASH_CHAR="use" DELEGATE="XPATH">
-      <BEGIN>use[\p{Space}]*=[\p{Space}]*'</BEGIN>
-      <END>'</END>
-    </SPAN_REGEXP>
-    <!-- value -->
-    <SPAN_REGEXP TYPE="KEYWORD2" HASH_CHAR="value" DELEGATE="XPATH">
-      <BEGIN>value[\p{Space}]*=[\p{Space}]*"</BEGIN>
-      <END>"</END>
-    </SPAN_REGEXP>
-    <SPAN_REGEXP TYPE="KEYWORD2" HASH_CHAR="select" DELEGATE="XPATH">
-      <BEGIN>select[\p{Space}]*=[\p{Space}]*'</BEGIN>
-      <END>'</END>
-    </SPAN_REGEXP>
-
-    <!-- Namespace declarations -->
-    <SEQ TYPE="OPERATOR">xmlns:</SEQ>
-    <!-- Default namespace declaration. Not really used in XSLT -->
-    <SEQ TYPE="OPERATOR">xmlns</SEQ>
-
-    <!-- Namespace prefixes -->
-    <MARK_PREVIOUS TYPE="LABEL">:</MARK_PREVIOUS>
-
-    <!-- XSLT 2.0 element names -->
-    <KEYWORDS>
-      <KEYWORD1>analyze-string</KEYWORD1>
-      <KEYWORD1>apply-imports</KEYWORD1>
-      <KEYWORD1>apply-templates</KEYWORD1>
-      <KEYWORD1>attribute</KEYWORD1>
-      <KEYWORD1>attribute-set</KEYWORD1>
-      <KEYWORD1>call-template</KEYWORD1>
-      <KEYWORD1>character-map</KEYWORD1>
-      <KEYWORD1>choose</KEYWORD1>
-      <KEYWORD1>comment</KEYWORD1>
-      <KEYWORD1>copy</KEYWORD1>
-      <KEYWORD1>copy-of</KEYWORD1>
-      <KEYWORD1>decimal-format</KEYWORD1>
-      <KEYWORD1>document</KEYWORD1>
-      <KEYWORD1>element</KEYWORD1>
-      <KEYWORD1>fallback</KEYWORD1>
-      <KEYWORD1>for-each</KEYWORD1>
-      <KEYWORD1>for-each-group</KEYWORD1>
-      <KEYWORD1>function</KEYWORD1>
-      <KEYWORD1>if</KEYWORD1>
-      <KEYWORD1>import</KEYWORD1>
-      <KEYWORD1>import-schema</KEYWORD1>
-      <KEYWORD1>include</KEYWORD1>
-      <KEYWORD1>key</KEYWORD1>
-      <KEYWORD1>matching-substring</KEYWORD1>
-      <KEYWORD1>message</KEYWORD1>
-      <KEYWORD1>namespace</KEYWORD1>
-      <KEYWORD1>namespace-alias</KEYWORD1>
-      <KEYWORD1>next-match</KEYWORD1>
-      <KEYWORD1>non-matching-substring</KEYWORD1>
-      <KEYWORD1>number</KEYWORD1>
-      <KEYWORD1>otherwise</KEYWORD1>
-      <KEYWORD1>output</KEYWORD1>
-      <KEYWORD1>output-character</KEYWORD1>
-      <KEYWORD1>param</KEYWORD1>
-      <KEYWORD1>perform-sort</KEYWORD1>
-      <KEYWORD1>preserve-space</KEYWORD1>
-      <KEYWORD1>processing-instruction</KEYWORD1>
-      <KEYWORD1>result-document</KEYWORD1>
-      <KEYWORD1>sequence</KEYWORD1>
-      <KEYWORD1>sort</KEYWORD1>
-      <KEYWORD1>strip-space</KEYWORD1>
-      <KEYWORD1>stylesheet</KEYWORD1>
-      <KEYWORD1>template</KEYWORD1>
-      <KEYWORD1>text</KEYWORD1>
-      <KEYWORD1>transform</KEYWORD1>
-      <KEYWORD1>value-of</KEYWORD1>
-      <KEYWORD1>variable</KEYWORD1>
-      <KEYWORD1>when</KEYWORD1>
-      <KEYWORD1>with-param</KEYWORD1>
-    </KEYWORDS>
-
-  </RULES>
-
-  <RULES DEFAULT="KEYWORD3" HIGHLIGHT_DIGITS="TRUE" DIGIT_RE="[\p{Digit}]+([\p{Punct}][\p{Digit}]+)?" NO_WORD_SEP=".-_" SET="XPATH">
-    <!-- String literals -->
-    <SPAN TYPE="LITERAL1">
-      <BEGIN>"</BEGIN>
-      <END>"</END>
-    </SPAN>
-    <SPAN TYPE="LITERAL1">
-      <BEGIN>'</BEGIN>
-      <END>'</END>
-    </SPAN>
-
-    <!-- XPath comments -->
-    <SPAN TYPE="COMMENT2" DELEGATE="XPATHCOMMENT2">
-      <BEGIN>(:</BEGIN>
-      <END>:)</END>
-    </SPAN>
-
-    <!-- Axes specifiers -->
-    <MARK_PREVIOUS TYPE="KEYWORD4">::</MARK_PREVIOUS>
-    <!-- Abbreviated 'attribute::' -->
-    <SEQ TYPE="KEYWORD4">@</SEQ>
-
-    <!-- XPath 2.0 operators + some other stuff -->
-    <!-- Comparison expressions -->
-    <SEQ TYPE="OPERATOR">=</SEQ>
-    <SEQ TYPE="OPERATOR">!=</SEQ>
-    <SEQ TYPE="OPERATOR">&gt;</SEQ>
-    <SEQ TYPE="OPERATOR">&amp;gt;</SEQ><!-- Treat as operator -->
-    <SEQ TYPE="OPERATOR">&amp;lt;</SEQ><!-- Treat as operator -->
-    <!-- Optional occurrence indicator -->
-    <SEQ TYPE="OPERATOR">?</SEQ>
-    <!-- Addition operator, one-or-more occurrence indicator-->
-    <SEQ TYPE="OPERATOR">+</SEQ>
-    <!-- Multiplication operator, zero-or-more occurrence indicator, node test -->
-    <SEQ TYPE="OPERATOR">*</SEQ>
-    <!-- Path expression step separator -->
-    <SEQ TYPE="OPERATOR">/</SEQ>
-    <!-- Union operator -->
-    <SEQ TYPE="OPERATOR">|</SEQ>
-    <!-- Sequence expression item separator -->
-    <SEQ TYPE="OPERATOR">,</SEQ>
-
-    <!-- Predicates -->
-    <SPAN TYPE="OPERATOR" DELEGATE="XPATH">
-      <BEGIN>[</BEGIN>
-      <END>]</END>
-    </SPAN>
-
-    <!-- Entity references -->
-    <SPAN TYPE="LITERAL3" NO_WORD_BREAK="TRUE">
-      <BEGIN>&amp;</BEGIN>
-      <END>;</END>
-    </SPAN>
-
-    <!-- Namespace prefixes -->
-    <MARK_PREVIOUS TYPE="LABEL">:</MARK_PREVIOUS>
-
-    <!-- Functions -->
-    <MARK_PREVIOUS TYPE="FUNCTION" MATCH_TYPE="OPERATOR">(</MARK_PREVIOUS>
-	<SEQ TYPE="OPERATOR">)</SEQ>
-
-    <!-- Variables -->
-    <MARK_FOLLOWING TYPE="LITERAL2">$</MARK_FOLLOWING>
-    <!-- XPath 2.0 keywords + some other stuff -->
-    <KEYWORDS>
-      <!-- Keywords -->
-      <OPERATOR>and</OPERATOR>
-      <OPERATOR>as</OPERATOR>
-      <OPERATOR>castable</OPERATOR>
-      <OPERATOR>div</OPERATOR>
-      <OPERATOR>else</OPERATOR>
-      <OPERATOR>eq</OPERATOR>
-      <OPERATOR>every</OPERATOR>
-      <OPERATOR>except</OPERATOR>
-      <OPERATOR>for</OPERATOR>
-      <OPERATOR>ge</OPERATOR>
-      <OPERATOR>gt</OPERATOR>
-      <OPERATOR>idiv</OPERATOR>
-      <OPERATOR>if</OPERATOR>
-      <OPERATOR>in</OPERATOR>
-      <OPERATOR>instance</OPERATOR>
-      <OPERATOR>intersect</OPERATOR>
-      <OPERATOR>is</OPERATOR>
-      <OPERATOR>isnot</OPERATOR>
-      <OPERATOR>le</OPERATOR>
-      <OPERATOR>lt</OPERATOR>
-      <OPERATOR>mod</OPERATOR>
-      <OPERATOR>nillable</OPERATOR>
-      <OPERATOR>ne</OPERATOR>
-      <OPERATOR>of</OPERATOR>
-      <OPERATOR>or</OPERATOR>
-      <OPERATOR>return</OPERATOR>
-      <OPERATOR>satisfies</OPERATOR>
-      <OPERATOR>some</OPERATOR>
-      <OPERATOR>then</OPERATOR>
-      <OPERATOR>to</OPERATOR>
-      <OPERATOR>treat</OPERATOR>
-      <OPERATOR>union</OPERATOR>
-
-      <!-- Subtraction operator -->
-      <OPERATOR>-</OPERATOR>
-
-    </KEYWORDS>
-
-  </RULES>
-
-  <!-- XPath comments - top or nested within COMMENT3 -->
-  <RULES DEFAULT="COMMENT2" SET="XPATHCOMMENT2">
-    <SPAN TYPE="COMMENT3" DELEGATE="XPATHCOMMENT3">
-      <BEGIN>(:</BEGIN>
-      <END>:)</END>
-    </SPAN>
-  </RULES>
-
-  <!-- XPath comments - nested within COMMENT2 -->
-  <RULES DEFAULT="COMMENT3" SET="XPATHCOMMENT3">
-    <SPAN TYPE="COMMENT2" DELEGATE="XPATHCOMMENT2">
-      <BEGIN>(:</BEGIN>
-      <END>:)</END>
-    </SPAN>
-  </RULES>
-
-</MODE>
-
- 	  	 
diff --git a/qpython/src/main/assets/syntax/yab.xml b/qpython/src/main/assets/syntax/yab.xml
deleted file mode 100644
index a8dff420..00000000
--- a/qpython/src/main/assets/syntax/yab.xml
+++ /dev/null
@@ -1,319 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!-- YAB (YABasic) 3/22/09 by Ben Dutcher -->
-<!-- roughly based on the grouping in the YAB documentation -->
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="lineComment" VALUE="'" />
-		<PROPERTY NAME="contextInsensitive" VALUE="true" />
-	</PROPS>
-
-	<RULES IGNORE_CASE="TRUE" HIGHLIGHT_DIGITS="TRUE" ESCAPE="\">
-		<SPAN TYPE="LITERAL1" NO_LINE_BREAK="TRUE">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-
-		<!-- YAB uses both the logical operator AND, and the bitwise function AND() -->
-		<!-- Doing something wrong here.  Goal is to mark the "and" of "and(a,b)" as a function,
-		      but not mark the opening "(".  I'm using  SEQ instead, even though it does mark the "(".
-		-->
-		<!-- MARK_PREVIOUS AT_WORD_START="TRUE"
-   MATCH_TYPE="FUNCTION">"and("</MARK_PREVIOUS -->
-
-		<!-- YAB has a large number of comment tags -->
-		<EOL_SPAN TYPE="COMMENT1">rem </EOL_SPAN>
-		<EOL_SPAN TYPE="COMMENT2">//</EOL_SPAN>
-		<EOL_SPAN TYPE="COMMENT3" AT_LINE_START="TRUE">documentation</EOL_SPAN>
-		<EOL_SPAN TYPE="COMMENT3" AT_LINE_START="TRUE">docu</EOL_SPAN>
-		<EOL_SPAN TYPE="COMMENT3" AT_LINE_START="TRUE">doc</EOL_SPAN>
-		<EOL_SPAN TYPE="COMMENT4" AT_LINE_START="TRUE">#</EOL_SPAN>
-
-		<!-- Comparison operators -->
-		<SEQ TYPE="OPERATOR">&lt;</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;=</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;=</SEQ>
-		<SEQ TYPE="OPERATOR">&gt;</SEQ>
-		<SEQ TYPE="OPERATOR">=</SEQ>
-		<SEQ TYPE="OPERATOR">&lt;&gt;</SEQ>
-
-		<!-- Arithmetic operators -->
-		<SEQ TYPE="OPERATOR">+</SEQ>
-		<SEQ TYPE="OPERATOR">-</SEQ>
-		<SEQ TYPE="OPERATOR">*</SEQ>
-		<SEQ TYPE="OPERATOR">/</SEQ>
-		<SEQ TYPE="OPERATOR">**</SEQ>
-		<SEQ TYPE="OPERATOR">^</SEQ>
-		<!-- YAB uses both the logical operator AND, and the bitwise function AND() -->
-		<!-- Unfortuantely, this also marks the opening "(" -->
-		<SEQ TYPE="FUNCTION" AT_WORD_START="TRUE">and(</SEQ>
-
-		<!-- Concatenation operators -->
-		<!-- strings -->
-		<SEQ TYPE="OPERATOR">&amp;</SEQ>
-
-		<!--		<SEQ TYPE="NULL">_</SEQ>-->
-		<!-- Instruction separator -->
-		<MARK_PREVIOUS TYPE="LABEL" MATCH_TYPE="OPERATOR"
-			AT_LINE_START="TRUE">:</MARK_PREVIOUS>
-
-		<KEYWORDS>
-
-			<!--  just testing! -->
-			<KEYWORD4>alotta</KEYWORD4>
-
-			<!-- Conditional Statements -->
-			<KEYWORD1>case</KEYWORD1>
-			<KEYWORD1>default</KEYWORD1>
-			<KEYWORD1>else</KEYWORD1>
-			<KEYWORD1>elseif</KEYWORD1>
-			<KEYWORD1>elsif</KEYWORD1>
-			<KEYWORD1>endif</KEYWORD1>
-			<KEYWORD1>fi</KEYWORD1>
-			<KEYWORD1>if</KEYWORD1>
-			<KEYWORD1>switch</KEYWORD1>
-			<KEYWORD1>then</KEYWORD1>
-
-			<!-- naviagation -->
-			<KEYWORD1>gosub</KEYWORD1>
-			<KEYWORD1>goto</KEYWORD1>
-			<KEYWORD1>label</KEYWORD1>
-			<KEYWORD1>return</KEYWORD1>
-
-			<!-- special -->
-			<KEYWORD1>bind</KEYWORD1>
-			<KEYWORD1>compile</KEYWORD1>
-
-			<!-- Loop Statements -->
-			<KEYWORD1>break</KEYWORD1>
-			<KEYWORD1>continue</KEYWORD1>
-			<KEYWORD1>do</KEYWORD1>
-			<KEYWORD1>each</KEYWORD1>
-			<KEYWORD1>for</KEYWORD1>
-			<KEYWORD1>in</KEYWORD1>
-			<KEYWORD1>loop</KEYWORD1>
-			<KEYWORD1>next</KEYWORD1>
-			<KEYWORD1>repeat</KEYWORD1>
-			<KEYWORD1>step</KEYWORD1>
-			<KEYWORD1>to</KEYWORD1>
-			<KEYWORD1>until</KEYWORD1>
-			<KEYWORD1>wend</KEYWORD1>
-			<KEYWORD1>while</KEYWORD1>
-
-
-			<!-- Closing, Exit Statements -->
-			<KEYWORD1>end</KEYWORD1>
-			<KEYWORD1>exit</KEYWORD1>
-
-			<!-- control -->
-			<KEYWORD1>pause</KEYWORD1>
-			<KEYWORD1>sleep</KEYWORD1>
-			<KEYWORD1>wait</KEYWORD1>
-
-			<!-- Methods, Functions, Class, Properties, Variables -->
-			<KEYWORD1>export</KEYWORD1>
-			<KEYWORD1>import</KEYWORD1>
-			<KEYWORD1>local</KEYWORD1>
-			<KEYWORD1>numparam</KEYWORD1>
-			<KEYWORD1>numparams</KEYWORD1>
-			<KEYWORD1>static</KEYWORD1>
-			<KEYWORD1>sub</KEYWORD1>
-			<KEYWORD1>subroutine</KEYWORD1>
-			<!-- end sub -->
-
-
-			<!-- Declaration -->
-			<KEYWORD1>const</KEYWORD1>
-			<KEYWORD1>dim</KEYWORD1>
-			<KEYWORD1>redim</KEYWORD1>
-
-			<!-- Comments -->
-			<KEYWORD3>rem</KEYWORD3>
-			<KEYWORD2>documentation</KEYWORD2>
-			<KEYWORD3>docu$</KEYWORD3>
-			<KEYWORD2>docu</KEYWORD2>
-			<KEYWORD2>doc</KEYWORD2>
-
-			<!-- Function Call - Dynamic Evaluation -->
-			<KEYWORD1>execute$</KEYWORD1>
-			<KEYWORD1>execute</KEYWORD1>
-			<KEYWORD1>system</KEYWORD1>
-			<KEYWORD1>system$</KEYWORD1>
-
-			<!-- Miscellaneous -->
-			<KEYWORD1>beep</KEYWORD1>
-			<KEYWORD1>bell</KEYWORD1>
-			<KEYWORD1>clear</KEYWORD1>
-			<KEYWORD1>data</KEYWORD1>
-			<KEYWORD1>erase</KEYWORD1>
-			<KEYWORD1>error</KEYWORD1>
-			<KEYWORD1>explicit</KEYWORD1>
-			<KEYWORD1>getscreen$</KEYWORD1>
-			<KEYWORD1>goto</KEYWORD1>
-			<KEYWORD1>interrupt</KEYWORD1>
-			<KEYWORD1>on</KEYWORD1>
-			<KEYWORD1>option</KEYWORD1>
-			<KEYWORD1>putscreen</KEYWORD1>
-			<KEYWORD1>randomize</KEYWORD1>
-			<KEYWORD1>read</KEYWORD1>
-			<KEYWORD1>restore</KEYWORD1>
-			<KEYWORD1>resume</KEYWORD1>
-			<KEYWORD1>screen</KEYWORD1>
-			<!-- on interrupt -->
-			<!-- clear screen -->
-
-
-			<!-- I/O -->
-			<KEYWORD1>@</KEYWORD1>
-			<KEYWORD1>as</KEYWORD1>
-			<KEYWORD1>at</KEYWORD1>
-			<KEYWORD1>close</KEYWORD1>
-			<KEYWORD1>eof</KEYWORD1>
-			<KEYWORD1>inkey$</KEYWORD1>
-			<KEYWORD1>input</KEYWORD1>
-			<KEYWORD1>line</KEYWORD1>
-			<KEYWORD1>mouseb</KEYWORD1>
-			<KEYWORD1>mousemod</KEYWORD1>
-			<KEYWORD1>mousex</KEYWORD1>
-			<KEYWORD1>mousey</KEYWORD1>
-			<KEYWORD1>open</KEYWORD1>
-			<KEYWORD1>peek$</KEYWORD1>
-			<KEYWORD1>peek</KEYWORD1>
-			<KEYWORD1>poke</KEYWORD1>
-			<KEYWORD1>print</KEYWORD1>
-			<KEYWORD1>printer</KEYWORD1>
-			<KEYWORD1>reading</KEYWORD1>
-			<KEYWORD1>seek</KEYWORD1>
-			<KEYWORD1>tell</KEYWORD1>
-			<KEYWORD1>using</KEYWORD1>
-			<KEYWORD1>writing</KEYWORD1>
-			<!-- line input -->
-			<!-- for reading as, for writing as -->
-			<!-- open printer, close printer -->
-			<!-- print color, print colour, print reverse, print at, print @ -->
-
-			<!-- draw -->
-			<KEYWORD1>backcolor</KEYWORD1>
-			<KEYWORD1>backcolour</KEYWORD1>
-			<KEYWORD1>box</KEYWORD1>
-			<KEYWORD1>circle</KEYWORD1>
-			<KEYWORD1>clear</KEYWORD1>
-			<KEYWORD1>color</KEYWORD1>
-			<KEYWORD1>colour</KEYWORD1>
-			<KEYWORD1>curve</KEYWORD1>
-			<KEYWORD1>dot</KEYWORD1>
-			<KEYWORD1>fill</KEYWORD1>
-			<KEYWORD1>getbit$</KEYWORD1>
-			<KEYWORD1>line</KEYWORD1>
-			<KEYWORD1>new</KEYWORD1>
-			<!-- open window, window origin, close curve, clear window, close window, new curve -->
-			<KEYWORD1>origin</KEYWORD1>
-			<KEYWORD1>putbit</KEYWORD1>
-			<KEYWORD1>rectangle</KEYWORD1>
-			<KEYWORD1>reverse</KEYWORD1>
-			<KEYWORD1>text</KEYWORD1>
-			<KEYWORD1>triangle</KEYWORD1>
-			<KEYWORD1>window</KEYWORD1>
-
-			<!-- Operators -->
-
-			<!-- Arithmetic operators -->
-			<OPERATOR>let</OPERATOR>
-			<OPERATOR>mod</OPERATOR>
-
-			<!-- Logical operators -->
-			<KEYWORD3>and</KEYWORD3>
-			<KEYWORD3>eor</KEYWORD3>
-			<KEYWORD3>imp</KEYWORD3>
-			<KEYWORD3>not</KEYWORD3>
-			<KEYWORD3>or</KEYWORD3>
-			<KEYWORD3>xor</KEYWORD3>
-
-			<!-- Datatypes Constants/Literals -->
-			<KEYWORD3>false</KEYWORD3>
-			<KEYWORD3>true</KEYWORD3>
-
-			<!-- Miscellaneous  -->
-			<LITERAL2>euler</LITERAL2>
-			<LITERAL2>pi</LITERAL2>
-
-			<!-- Built-in Functions -->
-			<!-- Array Handling -->
-			<KEYWORD2>arraydimension</KEYWORD2>
-			<KEYWORD2>arraydim</KEYWORD2>
-			<KEYWORD2>arraysize</KEYWORD2>
-
-			<!-- Conversion Functions (Radix) -->
-			<FUNCTION>bin$</FUNCTION>
-			<FUNCTION>dec</FUNCTION>
-			<FUNCTION>hex$</FUNCTION>
-			<FUNCTION>str$</FUNCTION>
-
-			<!-- Date/Time Functions -->
-			<FUNCTION>date$</FUNCTION>
-			<FUNCTION>time$</FUNCTION>
-
-			<!-- Math Functions -->
-			<FUNCTION>abs</FUNCTION>
-			<FUNCTION>acos</FUNCTION>
-			<!-- FUNCTION>and(</FUNCTION  -->
-			<FUNCTION>asin</FUNCTION>
-			<FUNCTION>atan</FUNCTION>
-			<FUNCTION>bin$</FUNCTION>
-			<FUNCTION>cos</FUNCTION>
-			<FUNCTION>dec</FUNCTION>
-			<FUNCTION>eor</FUNCTION>
-			<FUNCTION>exp</FUNCTION>
-			<FUNCTION>fix</FUNCTION>
-			<FUNCTION>frac</FUNCTION>
-			<FUNCTION>int</FUNCTION>
-			<FUNCTION>log</FUNCTION>
-			<FUNCTION>max</FUNCTION>
-			<FUNCTION>min</FUNCTION>
-			<FUNCTION>ran</FUNCTION>
-			<FUNCTION>sgn</FUNCTION>
-			<FUNCTION>sig</FUNCTION>
-			<FUNCTION>sin</FUNCTION>
-			<FUNCTION>sqr</FUNCTION>
-			<FUNCTION>sqrt</FUNCTION>
-			<FUNCTION>tan</FUNCTION>
-
-			<!-- Strings -->
-			<FUNCTION>asc</FUNCTION>
-			<FUNCTION>chr$</FUNCTION>
-			<FUNCTION>glob</FUNCTION>
-			<FUNCTION>hex$</FUNCTION>
-			<FUNCTION>instr</FUNCTION>
-			<FUNCTION>left$</FUNCTION>
-			<FUNCTION>len</FUNCTION>
-			<FUNCTION>lower$</FUNCTION>
-			<FUNCTION>ltrim$</FUNCTION>
-			<FUNCTION>mid$</FUNCTION>
-			<FUNCTION>right$</FUNCTION>
-			<FUNCTION>rinstr</FUNCTION>
-			<FUNCTION>rtrim$</FUNCTION>
-			<FUNCTION>split</FUNCTION>
-			<FUNCTION>token</FUNCTION>
-			<FUNCTION>trim$</FUNCTION>
-			<FUNCTION>upper$</FUNCTION>
-			<FUNCTION>val</FUNCTION>
-
-			<!-- YABasic listed keywords that aren't described in the YABasic documentation:
-			bitblit$
-			bitblit
-			bitblt$
-			bitblt
-			filled
-			mousebutton
-			mousemodifier
-			rect
-			split$
-			token$
-			-->
-
-
-		</KEYWORDS>
-	</RULES>
-</MODE>
diff --git a/qpython/src/main/assets/syntax/yaml.xml b/qpython/src/main/assets/syntax/yaml.xml
deleted file mode 100644
index 5bbfb4ba..00000000
--- a/qpython/src/main/assets/syntax/yaml.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0"?>
-<!--
-YAML mode by Jakub Roztočil <jakub@webkitchen.cz>
--->
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="indentNextLines" VALUE=".+:$" />
-		<PROPERTY NAME="indentOpenBrackets" VALUE="[{|>" />
-		<PROPERTY NAME="indentCloseBrackets" VALUE="}]" />
-		<PROPERTY NAME="ignoreWhitespace" VALUE="false" />
-		<PROPERTY NAME="lineComment" VALUE="#" />
-		<!-- YAML forbids tabs -->
-		<PROPERTY NAME="noTabs" VALUE="true" />
-		<PROPERTY NAME="indentSize" VALUE="2" />
-		<PROPERTY NAME="tabSize" VALUE="2" />
-	</PROPS>
-
-	<RULES ESCAPE="\" HIGHLIGHT_DIGITS="TRUE">
-		<SEQ TYPE="KEYWORD3">...</SEQ>
-		<SEQ TYPE="KEYWORD3">---</SEQ>
-		<!-- NAME -->
-		<SEQ_REGEXP AT_WHITESPACE_END="TRUE" DELEGATE="VALUES">-( |$)</SEQ_REGEXP>
-		<IMPORT DELEGATE="NAME" />
-	</RULES>
-
-	<RULES SET="NAME">
-		<SEQ_REGEXP TYPE="KEYWORD1" DELEGATE="VALUES">[^:\[\]{},'"#]+:( |$)</SEQ_REGEXP>
-		<!-- Useful for Symfony configuration files -->
-		<SPAN TYPE="MARKUP" DELEGATE="php::PHP">
-			<BEGIN>&lt;?php</BEGIN>
-			<END>?&gt;</END>
-		</SPAN>
-	</RULES>
-
-	<RULES SET="ARRAYS">
-		<SPAN NO_LINE_BREAK="FALSE" TYPE="OPERATOR" DELEGATE="ARRAY">
-			<BEGIN>{</BEGIN>
-			<END>}</END>
-		</SPAN>
-		<SPAN NO_LINE_BREAK="FALSE" TYPE="OPERATOR" DELEGATE="ARRAY">
-			<BEGIN>[</BEGIN>
-			<END>]</END>
-		</SPAN>
-	</RULES>
-
-	<RULES SET="ARRAY">
-		<IMPORT DELEGATE="VALUES" />
-		<SEQ TYPE="OPERATOR">,</SEQ>
-	</RULES>
-
-	<RULES SET="VALUES" HIGHLIGHT_DIGITS="TRUE">
-		<EOL_SPAN TYPE="COMMENT1" AT_LINE_START="FALSE">#</EOL_SPAN>
-		<IMPORT DELEGATE="NAME" />
-		<IMPORT DELEGATE="ARRAYS" />
-		<!-- Yaml forbids tabs -->
-		<SEQ_REGEXP TYPE="INVALID">\t</SEQ_REGEXP>
-		<SPAN TYPE="LITERAL1" NO_LINE_BREAK="TRUE">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-		<SPAN TYPE="LITERAL1" NO_LINE_BREAK="TRUE">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-		<KEYWORDS>
-			<KEYWORD3>~</KEYWORD3>
-			<KEYWORD3>false</KEYWORD3>
-			<KEYWORD3>n</KEYWORD3>
-			<KEYWORD3>No</KEYWORD3>
-			<KEYWORD3>off</KEYWORD3>
-			<KEYWORD3>Y</KEYWORD3>
-			<KEYWORD3>true</KEYWORD3>
-			<KEYWORD3>Yes</KEYWORD3>
-			<KEYWORD3>ON</KEYWORD3>
-		</KEYWORDS>
-	</RULES>
-
-</MODE>
-
-
diff --git a/qpython/src/main/assets/syntax/zpt.xml b/qpython/src/main/assets/syntax/zpt.xml
deleted file mode 100644
index 193b638f..00000000
--- a/qpython/src/main/assets/syntax/zpt.xml
+++ /dev/null
@@ -1,171 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE MODE SYSTEM "xmode.dtd">
-
-<!--
-<MODE NAME="zpt"			FILE="zpt.xml"
-				FILE_NAME_GLOB="*.{pt,zpt}"/>
--->
-
-<MODE>
-	<PROPS>
-		<PROPERTY NAME="commentStart" VALUE="&lt;!--" />
-		<PROPERTY NAME="commentEnd" VALUE="--&gt;" />
-	</PROPS>
-	<RULES IGNORE_CASE="TRUE">
-		<!-- SGML comment -->
-		<SPAN TYPE="COMMENT1">
-			<BEGIN>&lt;!--</BEGIN>
-			<END>--&gt;</END>
-		</SPAN>
-
-		<!-- JavaScript -->
-		<SPAN TYPE="MARKUP" DELEGATE="JAVASCRIPT">
-			<BEGIN>&lt;SCRIPT</BEGIN>
-			<END>&lt;/SCRIPT&gt;</END>
-		</SPAN>
-
-		<!-- stylesheet -->
-		<SPAN TYPE="MARKUP" DELEGATE="CSS">
-			<BEGIN>&lt;STYLE</BEGIN>
-			<END>&lt;/STYLE&gt;</END>
-		</SPAN>
-
-		<!-- DTD instructions -->
-		<SPAN TYPE="KEYWORD2" DELEGATE="xml::DTD-TAGS">
-			<BEGIN>&lt;!</BEGIN>
-			<END>&gt;</END>
-		</SPAN>
-
-		<!-- markup tags -->
-		<SPAN TYPE="MARKUP" DELEGATE="TAGS">
-			<BEGIN>&lt;</BEGIN>
-			<END>&gt;</END>
-		</SPAN>
-
-		<!-- SGML entities -->
-		<SPAN TYPE="LITERAL2" NO_WORD_BREAK="TRUE">
-			<BEGIN>&amp;</BEGIN>
-			<END>;</END>
-		</SPAN>
-	</RULES>
-
-	<RULES SET="TAGS" DEFAULT="MARKUP">
-		<SPAN TYPE="LITERAL1" DELEGATE="ATTRIBUTE">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-
-		<SPAN TYPE="LITERAL1" DELEGATE="ATTRIBUTE">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-
-		<SEQ TYPE="OPERATOR">=</SEQ>
-
-		<KEYWORDS>
-			<!-- TAL -->
-			<KEYWORD1>tal</KEYWORD1>
-			<KEYWORD3>attributes</KEYWORD3>
-			<KEYWORD3>define</KEYWORD3>
-			<KEYWORD3>condition</KEYWORD3>
-			<KEYWORD3>content</KEYWORD3>
-			<KEYWORD3>omit-tag</KEYWORD3>
-			<KEYWORD3>on-error</KEYWORD3>
-			<KEYWORD3>repeat</KEYWORD3>
-			<KEYWORD3>replace</KEYWORD3>
-
-			<!-- METAL -->
-			<KEYWORD1>metal</KEYWORD1>
-			<KEYWORD3>define-macro</KEYWORD3>
-			<KEYWORD3>define-slot</KEYWORD3>
-			<KEYWORD3>fill-slot</KEYWORD3>
-			<KEYWORD3>use-macro</KEYWORD3>
-		</KEYWORDS>
-	</RULES>
-
-	<RULES SET="ATTRIBUTE" DEFAULT="LITERAL1" ESCAPE="\">
-		<SEQ TYPE="OPERATOR">:</SEQ>
-		<SEQ TYPE="OPERATOR">;</SEQ>
-		<SEQ TYPE="OPERATOR">?</SEQ>
-		<SEQ TYPE="OPERATOR">|</SEQ>
-		<SEQ TYPE="LITERAL2">$$</SEQ>
-
-		<SPAN TYPE="LITERAL4">
-			<BEGIN>"</BEGIN>
-			<END>"</END>
-		</SPAN>
-
-		<SPAN TYPE="LITERAL4">
-			<BEGIN>'</BEGIN>
-			<END>'</END>
-		</SPAN>
-
-		<SPAN TYPE="KEYWORD2" NO_LINE_BREAK="TRUE">
-			<BEGIN>${</BEGIN>
-			<END>}</END>
-		</SPAN>
-		<MARK_FOLLOWING TYPE="KEYWORD2">$</MARK_FOLLOWING>
-		<!-- highligh python expressions -->
-		<!--
-		<SEQ TYPE="LITERAL2" DELEGATE="python::MAIN"
-			AT_LINE_START="FALSE">python:</SEQ>
-		-->
-		<KEYWORDS>
-			<!-- TALES expression types -->
-			<KEYWORD4>exists</KEYWORD4>
-			<KEYWORD4>nocall</KEYWORD4>
-			<KEYWORD4>not</KEYWORD4>
-			<KEYWORD4>path</KEYWORD4>
-			<KEYWORD4>python</KEYWORD4>
-			<KEYWORD4>string</KEYWORD4>
-			<KEYWORD4>structure</KEYWORD4>
-
-			<!-- built-in TALES variables -->
-			<!-- NOTE: root, here, container, template,
-			     request, user, and modules are optional -->
-			<LITERAL3>CONTEXTS</LITERAL3>
-			<LITERAL3>attrs</LITERAL3>
-			<LITERAL3>container</LITERAL3>
-			<LITERAL3>default</LITERAL3>
-			<LITERAL3>here</LITERAL3>
-			<LITERAL3>modules</LITERAL3>
-			<LITERAL3>nothing</LITERAL3>
-			<LITERAL3>options</LITERAL3>
-			<LITERAL3>repeat</LITERAL3>
-			<LITERAL3>request</LITERAL3>
-			<LITERAL3>root</LITERAL3>
-			<LITERAL3>template</LITERAL3>
-			<LITERAL3>user</LITERAL3>
-
-			<!-- repeat variable attributes -->
-			<LITERAL3>index</LITERAL3>
-			<LITERAL3>number</LITERAL3>
-			<LITERAL3>even</LITERAL3>
-			<LITERAL3>odd</LITERAL3>
-			<LITERAL3>start</LITERAL3>
-			<LITERAL3>end</LITERAL3>
-			<LITERAL3>first</LITERAL3>
-			<LITERAL3>last</LITERAL3>
-			<LITERAL3>length</LITERAL3>
-			<LITERAL3>letter</LITERAL3>
-			<LITERAL3>Letter</LITERAL3>
-			<LITERAL3>roman</LITERAL3>
-			<LITERAL3>Roman</LITERAL3>
-		</KEYWORDS>
-	</RULES>
-
-	<RULES SET="JAVASCRIPT" DEFAULT="MARKUP" IGNORE_CASE="TRUE">
-		<SEQ TYPE="MARKUP" DELEGATE="javascript::MAIN">&gt;</SEQ>
-		<SEQ TYPE="MARKUP" DELEGATE="BACK_TO_HTML">SRC=</SEQ>
-	</RULES>
-
-	<RULES SET="BACK_TO_HTML" DEFAULT="MARKUP">
-		<SEQ TYPE="MARKUP" DELEGATE="zpt::MAIN">&gt;</SEQ>
-	</RULES>
-
-	<RULES SET="CSS" DEFAULT="MARKUP">
-		<SEQ TYPE="MARKUP" DELEGATE="css::MAIN">&gt;</SEQ>
-	</RULES>
-</MODE>
-
diff --git a/qpython/src/main/assets/themes/Mac Classic.tmTheme b/qpython/src/main/assets/themes/Mac Classic.tmTheme
index 4b789dfe..c407f0e3 100755
--- a/qpython/src/main/assets/themes/Mac Classic.tmTheme	
+++ b/qpython/src/main/assets/themes/Mac Classic.tmTheme	
@@ -29,7 +29,7 @@
 			<key>name</key>
 			<string>Comment</string>
 			<key>scope</key>
-			<string>comment</string>
+			<string>from_content</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
@@ -120,7 +120,7 @@
 			<key>name</key>
 			<string>String interpolation</string>
 			<key>scope</key>
-			<string>constant.character.escape, string source</string>
+			<string>constant.character.escape, string code</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
@@ -314,9 +314,9 @@
 		</dict>
 		<dict>
 			<key>name</key>
-			<string>Embedded source</string>
+			<string>Embedded code</string>
 			<key>scope</key>
-			<string>text source, string.unquoted</string>
+			<string>text code, string.unquoted</string>
 			<key>settings</key>
 			<dict>
 				<key>background</key>
@@ -325,9 +325,9 @@
 		</dict>
 		<dict>
 			<key>name</key>
-			<string>Embedded embedded source</string>
+			<string>Embedded embedded code</string>
 			<key>scope</key>
-			<string>text source string.unquoted, text source text source</string>
+			<string>text code string.unquoted, text code text code</string>
 			<key>settings</key>
 			<dict>
 				<key>background</key>
diff --git a/qpython/src/main/assets/themes/Monokai Bright.tmTheme b/qpython/src/main/assets/themes/Monokai Bright.tmTheme
index 3b53e4ed..f830fa8b 100755
--- a/qpython/src/main/assets/themes/Monokai Bright.tmTheme	
+++ b/qpython/src/main/assets/themes/Monokai Bright.tmTheme	
@@ -52,7 +52,7 @@
 			<key>name</key>
 			<string>Comment</string>
 			<key>scope</key>
-			<string>comment</string>
+			<string>from_content</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
diff --git a/qpython/src/main/java/org/qpython/qpy/codeshare/CONSTANT.java b/qpython/src/main/java/org/qpython/qpy/codeshare/CONSTANT.java
new file mode 100644
index 00000000..e878b621
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/codeshare/CONSTANT.java
@@ -0,0 +1,9 @@
+package org.qpython.qpy.codeshare;
+
+
+public class CONSTANT {
+    public static final String IS_UPLOAD_INIT = "is_upload_init";// 是否同步了云端文件名
+    public static final String CLOUDED_MAP    = "clouded_map";// 云端文件名路径MAP
+    public static final String DOT_REPLACE    = "_%"; // Firebase Database中"." & "/" 等为非法字符无法上传, 需转义
+    public static final String SLASH_REPLACE  = "-%";
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/codeshare/Clouded.java b/qpython/src/main/java/org/qpython/qpy/codeshare/Clouded.java
new file mode 100644
index 00000000..73055c29
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/codeshare/Clouded.java
@@ -0,0 +1,54 @@
+package org.qpython.qpy.codeshare;
+
+import android.app.Activity;
+import android.content.SharedPreferences;
+
+import com.google.gson.reflect.TypeToken;
+
+import org.qpython.qpy.main.app.App;
+
+import java.lang.reflect.Type;
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.qpython.qpy.codeshare.CONSTANT.CLOUDED_MAP;
+import static org.qpython.qpy.codeshare.CONSTANT.IS_UPLOAD_INIT;
+
+/**
+ * 已上传云端的文件列表
+ * Created by Hmei on 17/9/7.
+ */
+
+public class Clouded {
+    SharedPreferences sp;
+    private Map<String, Boolean> clouded;
+
+    private Clouded() {
+    }
+
+    public static Clouded getInstance() {
+        return CloudedHolder.INSTANCE;
+    }
+
+    public Map<String, Boolean> getClouded() {
+        return clouded;
+    }
+
+    public void setClouded(Map<String, Boolean> clouded) {
+        this.clouded = clouded;
+    }
+
+    public void writeToSP(Activity context) {
+        if (clouded.size() > 0) {
+            Type type = new TypeToken<HashMap<String, Boolean>>() {
+            }.getType();
+            sp.edit().putBoolean(IS_UPLOAD_INIT, true)
+                    .putString(CLOUDED_MAP, App.getGson().toJson(clouded, type)).apply();
+        }
+    }
+
+    private static class CloudedHolder {
+        private static final Clouded INSTANCE = new Clouded();
+    }
+
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/codeshare/IShareCode.java b/qpython/src/main/java/org/qpython/qpy/codeshare/IShareCode.java
new file mode 100644
index 00000000..6cb6fb7c
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/codeshare/IShareCode.java
@@ -0,0 +1,137 @@
+//package org.qpython.qpy.codeshare;
+//
+//import android.app.Activity;
+//
+//import org.qpython.qpy.codeshare.pojo.CloudFile;
+//import org.qpython.qpy.codeshare.pojo.Gist;
+//
+//import java.util.List;
+//
+///**
+// * Created by Hmei
+// * 11/30/17
+// */
+//public interface IShareCode {
+//
+//    /**
+//     * @return single instance
+//     */
+//    static IShareCode getInstance() {
+//        return null;
+//    }
+//
+//    /**
+//     * 新建脚本Gist
+//     *
+//     * @param title    Gist标题
+//     * @param desc     Gist描述
+//     * @param msg      Commit message
+//     * @param content  File content
+//     * @param listener 上传成功后的监听
+//     */
+//    void createScriptGist(String title, String desc, String msg, String content, Object listener);
+//
+//    /**
+//     * 新建项目Gist
+//     *
+//     * @param projectName        项目名
+//     * @param desc               上传描述
+//     * @param msg                Commit message
+//     * @param paths              项目文件路径列表
+//     * @param completionListener 上传成功后的监听
+//     */
+//    void createProjectGist(String projectName, String desc, String msg, List<String> paths, Object completionListener);
+//
+//    /**
+//     * 提交Commit
+//     *
+//     * @param gist_id   Gist id
+//     * @param msg      Commit message
+//     * @param content  File content
+//     * @param projName project name
+//     * @param fileName file name
+//     */
+//    void commitGist(String gist_id, String msg, String content, String projName, String fileName);
+//
+//    /**
+//     * 对某个Gist提交评论
+//     *
+//     * @param gist_id   Gist Id
+//     * @param comment  Commit message
+//     * @param isProj   is project?
+//     * @param callback callback
+//     */
+//    void sendComment(String gist_id, String comment, boolean isProj, CommentCallback callback);
+//
+//    /**
+//     * 回复某个Gist下的评论
+//     *
+//     * @param gist_id    Gist Id
+//     * @param to        回复给to
+//     * @param comment   Commit message
+//     * @param reComment 回复的内容
+//     * @param isProj    is project?
+//     * @param callback  callback
+//     */
+//    void sendComment(String gist_id, String to, String comment, String reComment, boolean isProj, CommentCallback callback);
+//
+//    /**
+//     * Add bookmark
+//     *
+//     * @param gist_id gist id
+//     */
+//    void bookmark(String gist_id);
+//
+//    /**
+//     * Cancel bookmark
+//     *
+//     * @param gist_id gist id
+//     */
+//    void cancelBookmark(String gist_id);
+//
+//    /**
+//     * 获取上传的Scripts列表
+//     *
+//     * @param callback callback
+//     */
+//    void getBaseScriptGistList(ShareCodeCallback callback);
+//
+//    /**
+//     * 获取上传的Projects列表
+//     *
+//     * @param callback
+//     */
+//    void getBaseProjectGistList(ShareCodeCallback callback);
+//
+//    /**
+//     * @param gist_id
+//     * @param isProj
+//     * @param callback
+//     */
+//    void getGistDetail(String gist_id, boolean isProj, ShareCodeCallback callback);
+//
+//    /**
+//     * @param callback
+//     */
+//    void getMyGistList(ShareCodeCallback callback);
+//
+//    void getMyBookmarkList(ShareCodeCallback callback);
+//
+//    void getGistCommentList(String gist_id, ShareCodeCallback callback);
+//
+//    boolean uploadFolder(String path, long size, Object completionListener);
+//
+//    boolean uploadFile(String path, long size, Object completionListener);
+//
+//    boolean checkSpace(long size);
+//
+//    void getUploadedScripts(boolean forceRefresh, Activity context, ShareCodeCallback callback);
+//
+//    void locateUsage(long usage, Activity context);
+//
+//    void deleteUploadScript(CloudFile cloudFile, Object listener);
+//
+//    public interface CommentCallback {
+//        void commentBean(Gist.CommentBean comment);
+//    }
+//}
diff --git a/qpython/src/main/java/org/qpython/qpy/codeshare/pojo/BookmarkerList.java b/qpython/src/main/java/org/qpython/qpy/codeshare/pojo/BookmarkerList.java
new file mode 100644
index 00000000..f2e1b840
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/codeshare/pojo/BookmarkerList.java
@@ -0,0 +1,100 @@
+package org.qpython.qpy.codeshare.pojo;
+
+import java.util.List;
+
+/**
+ * Created by Hmei on 2017-08-10.
+ */
+
+public class BookmarkerList {
+
+    /**
+     * id :
+     * name :
+     * bookmaker : [{"id":"","date":"","comment_cout":100,"bookmaker_cout":200,"titile":""},{"id":"","date":"","comment_cout":100,"bookmaker_cout":200,"titile":""}]
+     */
+
+    private String id;
+    private String              name;
+    private List<BookmakerBean> bookmaker;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public List<BookmakerBean> getBookmaker() {
+        return bookmaker;
+    }
+
+    public void setBookmaker(List<BookmakerBean> bookmaker) {
+        this.bookmaker = bookmaker;
+    }
+
+    public static class BookmakerBean {
+        /**
+         * id :
+         * date :
+         * comment_cout : 100
+         * bookmaker_cout : 200
+         * titile :
+         */
+
+        private String id;
+        private String date;
+        private int    comment_cout;
+        private int    bookmaker_cout;
+        private String titile;
+
+        public String getId() {
+            return id;
+        }
+
+        public void setId(String id) {
+            this.id = id;
+        }
+
+        public String getDate() {
+            return date;
+        }
+
+        public void setDate(String date) {
+            this.date = date;
+        }
+
+        public int getComment_cout() {
+            return comment_cout;
+        }
+
+        public void setComment_cout(int comment_cout) {
+            this.comment_cout = comment_cout;
+        }
+
+        public int getBookmaker_cout() {
+            return bookmaker_cout;
+        }
+
+        public void setBookmaker_cout(int bookmaker_cout) {
+            this.bookmaker_cout = bookmaker_cout;
+        }
+
+        public String getTitile() {
+            return titile;
+        }
+
+        public void setTitile(String titile) {
+            this.titile = titile;
+        }
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/codeshare/pojo/Gist.java b/qpython/src/main/java/org/qpython/qpy/codeshare/pojo/Gist.java
new file mode 100644
index 00000000..d9d027fc
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/codeshare/pojo/Gist.java
@@ -0,0 +1,281 @@
+package org.qpython.qpy.codeshare.pojo;
+
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * Gist detail bean
+ * Created by Hmei on 2017-08-10.
+ */
+
+public class Gist {
+
+    /**
+     * author : String
+     * id : String
+     * title : String
+     * describe : String
+     * history : [{"data":"String","content":"String"},{"data":"String","content":"String"},{"data":"String","content":"String"}]
+     * comment : [{"id":"String","from":"User name","re":"User name(nullable)","content":"String","data":"String"}]
+     * bookmarker : [{"name":"User name","id":"User id"}]
+     */
+
+    private String author;
+    private String avatar;
+    private String id;
+    private String title;
+    private String describe;
+    private String date;
+
+    private transient List<HistoryBean>    history;
+    private transient List<CommentBean>    comment;
+    private transient List<BookmarkerBean> bookmarker;
+
+    public String getAuthor() {
+        return author;
+    }
+
+    public void setAuthor(String author) {
+        this.author = author;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getDescribe() {
+        return describe;
+    }
+
+    public void setDescribe(String describe) {
+        this.describe = describe;
+    }
+
+    public String getDate() {
+        return date;
+    }
+
+    public void setDate(String date) {
+        this.date = date;
+    }
+
+    public List<HistoryBean> getHistory() {
+        return history;
+    }
+
+    public void setHistory(List<HistoryBean> history) {
+        this.history = history;
+    }
+
+    public List<CommentBean> getComment() {
+        return comment;
+    }
+
+    public void setComment(List<CommentBean> comment) {
+        this.comment = comment;
+    }
+
+    public List<BookmarkerBean> getBookmarker() {
+        return bookmarker;
+    }
+
+    public void setBookmarker(List<BookmarkerBean> bookmarker) {
+        this.bookmarker = bookmarker;
+    }
+
+    public String getHistoryCount() {
+        return history == null ? "0" : history.size() + "";
+    }
+
+    public String getCommentCount() {
+        return comment == null ? "0" : "" + comment.size();
+    }
+
+    public String getBookmarkerCount() {
+        return bookmarker == null ? "0" : "" + bookmarker.size();
+    }
+
+    public String getLastCommitCode() {
+        return history == null ? "" : history.get(history.size() - 1).getContent();
+    }
+
+    public String getAvatar() {
+        return avatar;
+    }
+
+    public void setAvatar(String avatar) {
+        this.avatar = avatar;
+    }
+
+    public static class HistoryBean {
+        /**
+         * data : String
+         * content : String
+         * massage : String
+         */
+
+        private String historyId;
+        private String data;
+        private String content;
+        private String massage;
+
+        public String getData() {
+            return data;
+        }
+
+        public void setData(String data) {
+            this.data = data;
+        }
+
+        public String getContent() {
+            return content;
+        }
+
+        public void setContent(String content) {
+            this.content = content;
+        }
+
+        public String getMassage() {
+            return massage;
+        }
+
+        public void setMassage(String massage) {
+            this.massage = massage;
+        }
+
+        public String getHistoryId() {
+            return historyId;
+        }
+
+        public void setHistoryId(String historyId) {
+            this.historyId = historyId;
+        }
+    }
+
+    public static class CommentBean implements Serializable{
+        /**
+         * id : String
+         * avatar : http://www.qqu.cc/uploads/allimg/161214/1-1612141141550-L.jpg
+         * from : User name
+         * re : User name(nullable)
+         * re_content : String
+         * from_content : String
+         * data : String
+         */
+
+        private String id;
+        private String avatar;
+        private String from;
+        private String re;
+        private String re_content;
+        private String from_content;
+        private String data;
+
+        public String getId() {
+            return id;
+        }
+
+        public void setId(String id) {
+            this.id = id;
+        }
+
+        public String getAvatar() {
+            return avatar;
+        }
+
+        public void setAvatar(String avatar) {
+            this.avatar = avatar;
+        }
+
+        public String getFrom() {
+            return from;
+        }
+
+        public void setFrom(String from) {
+            this.from = from;
+        }
+
+        public String getRe() {
+            return re;
+        }
+
+        public void setRe(String re) {
+            this.re = re;
+        }
+
+        public String getRe_content() {
+            return re_content;
+        }
+
+        public void setRe_content(String re_content) {
+            this.re_content = re_content;
+        }
+
+        public String getFrom_content() {
+            return from_content;
+        }
+
+        public void setFrom_content(String from_content) {
+            this.from_content = from_content;
+        }
+
+        public String getData() {
+            return data;
+        }
+
+        public void setData(String data) {
+            this.data = data;
+        }
+    }
+
+    public static class BookmarkerBean {
+        /**
+         * name : User name
+         * id : User id
+         */
+
+        private String name;
+        private String id;
+
+        public String getName() {
+            return name;
+        }
+
+        public void setName(String name) {
+            this.name = name;
+        }
+
+        public String getId() {
+            return id;
+        }
+
+        public void setId(String id) {
+            this.id = id;
+        }
+    }
+
+//    public void addHistory(HistoryBean historyBean) {
+//        history.add(historyBean);
+//    }
+//
+//    public void addComment(CommentBean commentBean) {
+//        comment.add(commentBean);
+//    }
+//
+//    public void addBookmarker(BookmarkerBean bookmarkerBean) {
+//        bookmarker.add(bookmarkerBean);
+//    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/codeshare/pojo/GistBase.java b/qpython/src/main/java/org/qpython/qpy/codeshare/pojo/GistBase.java
new file mode 100644
index 00000000..bad2ecd5
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/codeshare/pojo/GistBase.java
@@ -0,0 +1,80 @@
+package org.qpython.qpy.codeshare.pojo;
+
+/**
+ * Created by Hmei on 2017-08-10.
+ */
+
+public class GistBase {
+
+    /**
+     * id :
+     * date :
+     * comment_count : 100
+     * bookmaker_count : 200
+     * title :
+     */
+
+    private String id;
+    private String author;
+    private String date;
+    private String title;
+    private String avatar;
+    private int    comment_count;
+    private int    bookmaker_count;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getDate() {
+        return date;
+    }
+
+    public void setDate(String date) {
+        this.date = date;
+    }
+
+    public int getComment_count() {
+        return comment_count;
+    }
+
+    public void setComment_count(int comment_count) {
+        this.comment_count = comment_count;
+    }
+
+    public int getBookmaker_count() {
+        return bookmaker_count;
+    }
+
+    public void setBookmaker_count(int bookmaker_count) {
+        this.bookmaker_count = bookmaker_count;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getAuthor() {
+        return author;
+    }
+
+    public void setAuthor(String author) {
+        this.author = author;
+    }
+
+    public String getAvatar() {
+        return avatar;
+    }
+
+    public void setAvatar(String avatar) {
+        this.avatar = avatar;
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/codeshare/pojo/UploadedProject.java b/qpython/src/main/java/org/qpython/qpy/codeshare/pojo/UploadedProject.java
new file mode 100644
index 00000000..ed005fe0
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/codeshare/pojo/UploadedProject.java
@@ -0,0 +1,46 @@
+package org.qpython.qpy.codeshare.pojo;
+
+
+import java.util.List;
+
+public class UploadedProject {
+    private String name;
+    private int    allFilesCount, uploadFilesCount;
+    private List<String> subFilePath;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public int getAllFilesCount() {
+        return allFilesCount;
+    }
+
+    public void setAllFilesCount(int allFilesCount) {
+        this.allFilesCount = allFilesCount;
+    }
+
+    public int getUploadFilesCount() {
+        return uploadFilesCount;
+    }
+
+    public void setUploadFilesCount(int uploadFilesCount) {
+        this.uploadFilesCount = uploadFilesCount;
+    }
+
+    public List<String> getSubFilePath() {
+        return subFilePath;
+    }
+
+    public void setSubFilePath(List<String> subFilePath) {
+        this.subFilePath = subFilePath;
+    }
+
+    public boolean isAllUpload() {
+        return allFilesCount == uploadFilesCount;
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/console/Exec.java b/qpython/src/main/java/org/qpython/qpy/console/Exec.java
index 4cd20488..82eb036c 100644
--- a/qpython/src/main/java/org/qpython/qpy/console/Exec.java
+++ b/qpython/src/main/java/org/qpython/qpy/console/Exec.java
@@ -23,7 +23,7 @@
 public class Exec {
     // Warning: bump the library revision, when an incompatible change happens
     static {
-        System.loadLibrary("jackpal-androidterm5");
+        System.loadLibrary("androidterm");
     }
 
     static native void setPtyWindowSizeInternal(int fd, int row, int col, int xpixel, int ypixel) throws IOException;
diff --git a/qpython/src/main/java/org/qpython/qpy/console/ScriptExec.java b/qpython/src/main/java/org/qpython/qpy/console/ScriptExec.java
new file mode 100644
index 00000000..9a23d02d
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/console/ScriptExec.java
@@ -0,0 +1,554 @@
+package org.qpython.qpy.console;
+
+import android.app.Activity;
+import android.app.Notification;
+import android.app.NotificationManager;
+import android.app.PendingIntent;
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.content.pm.PackageManager;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Environment;
+import android.os.Message;
+import android.preference.PreferenceManager;
+import android.support.v4.app.ActivityCompat;
+import android.support.v4.content.ContextCompat;
+import android.support.v4.util.ArrayMap;
+import android.support.v7.app.AlertDialog;
+import android.text.TextUtils;
+import android.util.Log;
+
+import org.qpython.qpysdk.Exec;
+import com.quseit.util.FileUtils;
+import com.quseit.util.NAction;
+
+import org.greenrobot.eventbus.EventBus;
+import org.qpython.qpy.R;
+import org.qpython.qpysdk.QPyConstants;
+import org.qpython.qpysdk.utils.AndroidCompat;
+import org.qpython.qpy.console.util.TermSettings;
+import org.qpython.qpy.main.activity.LogActivity;
+import org.qpython.qpy.main.utils.Utils;
+import org.qpython.qpysdk.utils.FileHelper;
+import org.qpython.qpysdk.utils.StreamGobbler;
+import org.qpython.qsl4a.QPyScriptService;
+import org.qpython.qsl4a.qsl4a.util.SPFUtils;
+import org.renpy.android.PythonSDLActivity;
+
+import java.io.File;
+import java.io.FileDescriptor;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class ScriptExec {
+
+    private static final String TAG                 = "ScriptExec";
+    private static final int    SCRIPT_CONSOLE_CODE = 1237;
+    private static final int    PID_INIT_VALUE      = -1;
+    private static final int    DEFAULT_BUFFER_SIZE = 8192;
+    private static final int    LOG_NOTIFICATION_ID = (int) System.currentTimeMillis();
+    private InputStream  mIn;
+    private OutputStream mOut;
+
+    private ScriptExec() { }
+
+    public static ScriptExec getInstance() {
+        return ScriptExecHolder.INSTANCE;
+    }
+
+    public void playScript(Context context, String script, String arg, boolean notify) {
+
+        // confirm the SL4A Service is started
+        context.startService(new Intent(context, QPyScriptService.class));
+
+        String header_512 = FileHelper.getFileContents(script,512);
+        boolean isWeb   = header_512.contains("#qpy:webapp");
+        boolean isQApp  = header_512.contains("#qpy:quiet");
+        boolean isKivy  = header_512.contains("#qpy:kivy");
+        boolean isGame  = header_512.contains("#qpy:pygame");
+        boolean isDaemon = header_512.contains("#qpy:daemon");
+
+        Log.d(TAG, "playScript:" + script+"|isWeb:"+isWeb+"|isQapp:"+isQApp+"|isKivy:"+isKivy+"|isGame:"+isGame+"|isDaemon:"+isDaemon);
+
+        if (isWeb) {
+            playWebApp(context,  script, arg);
+        } else if (isKivy) {
+            playKScript(context, script, arg, notify);
+        } else if (isQApp) {
+            playQScript(context, script, arg, notify);
+        } else if (isGame) {
+            playGScript(context, script, arg, notify);
+        } else if (isDaemon) {
+            playDScript(context, script, arg, notify);
+        } else {
+            playCScript(context, script, arg);
+        }
+    }
+
+    /*
+        Play project Without args
+     */
+    public void playProject(Context context, String project, boolean notify) {
+        playProject(context, project, null, notify);
+    }
+
+    /*
+        Play project with args
+     */
+
+    public void playProject(Context context, String project, String args, boolean notify) {
+        Log.d(TAG, "playProject:" + project);
+
+        String script = project + "/main.py";
+        File sf = new File(script);
+        if (sf.exists()) {
+
+            playScript(context, script, args, notify);
+
+        } else {
+
+            new AlertDialog.Builder(context, R.style.MyDialog)
+                    .setTitle(R.string.notice)
+                    .setMessage(R.string.project_main_error)
+                    .setPositiveButton(R.string.close, (dialog1, which) ->  dialog1.dismiss())
+                    .create()
+                    .show();
+        }
+    }
+
+
+
+    public String getLastLog() {
+        File logFile = new File(QPyConstants.ABSOLUTE_LOG);
+
+        if (!logFile.getAbsoluteFile().getParentFile().exists()) {
+            logFile.getAbsoluteFile().getParentFile().mkdirs();
+        }
+        if (logFile.exists()) {    // clear log
+            logFile.delete();
+        }
+
+        return logFile.getAbsolutePath();
+    }
+
+
+    public String[] getPyEnv(Context context, String path, String term, String pyPath) {
+        boolean isQPy3 =  NAction.isQPy3(context);
+
+        File filesDir = context.getFilesDir();
+        File externalStorage = new File(QPyConstants.ABSOLUTE_PATH);
+
+        String[] env = new String[24];
+
+        env[0] = "TERM=" + term;
+        env[1] = "PATH=" + context.getFilesDir()+"/bin"+":"+path;
+
+        if (!isQPy3) {
+            File py27so = new File(filesDir+"/lib/libpython2.7.so.1.0");
+            File py27soorg = new File(filesDir.getParentFile()+"/lib/libpython2.7.so");
+
+
+            if (!py27so.exists()) {
+                if (py27soorg.exists()) {
+                    try {
+                        FileUtils.lnOrcopy(py27soorg, py27so, AndroidCompat.SDK);
+                    } catch (Exception e) {
+
+                    }
+
+                }
+            }
+        }
+        env[2] = "LD_LIBRARY_PATH=.:" + filesDir + "/lib/" + ":" + filesDir + "/:" + filesDir.getParentFile() + "/lib/";
+
+        env[3] = "PYTHONHOME="+filesDir;
+        env[4] = "ANDROID_PRIVATE="+filesDir;
+
+
+        // HACKED FOR QPython
+
+        if (!externalStorage.exists()) {
+            externalStorage.mkdir();
+        }
+
+        if (isQPy3) {
+            String pyVer = new File(context.getFilesDir()+"/lib/python37.zip").exists()?"3.7":"3.6";
+            env[5] = "PYTHONPATH="
+                    +filesDir+"/lib/python"+pyVer+"/site-packages/:"
+                    +filesDir+"/lib/python"+pyVer+"/:"
+                    +filesDir+"/lib/python"+pyVer.replace(".","")+".zip:"
+                    +filesDir+"/lib/notebook.zip:"
+                    +filesDir+"/lib/python"+pyVer+"/qpyutil.zip:"
+                    +filesDir+"/lib/python"+pyVer+"/lib-dynload/:"
+                    +externalStorage+"/lib/python"+pyVer+"/site-packages/:"
+                    +pyPath;
+
+            env[14] = "PYTHONSTARTUP="+filesDir+"/lib/python"+pyVer+"/site-packages/qpy.py";
+
+
+        } else {
+
+            env[5] = "PYTHONPATH="
+                    +filesDir+"/lib/python2.7/site-packages/:"
+                    +filesDir+"/lib/python2.7/:"
+                    +filesDir+"/lib/python27.zip:"
+                    +filesDir+"/lib/notebook.zip:"
+                    +filesDir+"/lib/python2.7/qpyutil.zip:"
+                    +filesDir+"/lib/python2.7/lib-dynload/:"
+                    +externalStorage+"/lib/python2.7/site-packages/:"
+                    +pyPath;
+
+            //env[14] = "IS_QPY2=1";
+            env[14] = "PYTHONSTARTUP="+filesDir+"/lib/python2.7/site-packages/qpy.py";
+        }
+
+        env[6] = "PYTHONOPTIMIZE=2";
+
+        File td = new File(externalStorage+"/cache");
+        if (!td.exists()) {
+            td.mkdir();
+        }
+        env[7] = "TMPDIR="+td.getAbsolutePath();
+
+
+        env[8] = "AP_HOST="+SPFUtils.getSP(context, "sl4a.hostname");
+        env[9] = "AP_PORT="+SPFUtils.getSP(context, "sl4a.port");
+        env[10] = "AP_HANDSHAKE="+SPFUtils.getSP(context, "sl4a.secue");
+
+        env[11] = "ANDROID_PUBLIC="+externalStorage;
+        env[12] = "ANDROID_PRIVATE="+context.getFilesDir().getAbsolutePath();
+        env[13] = "ANDROID_ARGUMENT="+pyPath;
+
+        env[15] = "QPY_USERNO="+ NAction.getUserNoId(context);
+        env[16] = "QPY_ARGUMENT="+NAction.getExtConf(context);
+        env[17] = "PYTHONDONTWRITEBYTECODE=1";
+        env[18] = "TMP="+externalStorage+"/cache";
+        env[19] = "ANDROID_APP_PATH="+externalStorage+"";
+        env[20] = "LANG=en_US.UTF-8";
+        env[21] = "HOME="+context.getFilesDir();
+        env[22] = "ANDROID_DATA="+System.getenv("ANDROID_DATA");
+        env[23] = "ANDROID_ROOT="+System.getenv("ANDROID_ROOT");
+        return env;
+    }
+
+    public String getPyBin(Context context, boolean bin) {
+        String scmd = "";
+        String v = NAction.isQPy3(context) ? "3" : "";
+        boolean isRootEnable = NAction.isRootEnable(context);
+        if (Build.VERSION.SDK_INT >= 20) {
+            if (bin) {
+                scmd = context.getFilesDir() + "/bin/python" + v + "-android5";
+            } else {
+                if (isRootEnable) {
+                    scmd = context.getFilesDir() + "/bin/qpython" + v + "-android5-root.sh";
+                } else {
+                    scmd = context.getFilesDir() + "/bin/qpython" + v + "-android5.sh";
+                }
+            }
+        } else {
+            if (bin) {
+                scmd = context.getFilesDir() + "/bin/python" + v;
+            } else {
+                if (isRootEnable) {
+                    scmd = context.getFilesDir() + "/bin/qpython" + v + "-root.sh";
+                } else {
+                    scmd = context.getFilesDir() + "/bin/qpython" + v + ".sh";
+                }
+            }
+        }
+        return scmd;
+    }
+
+    private void createWebTermSession(Context context, String[] mArgs) {
+        SharedPreferences mPrefs = PreferenceManager.getDefaultSharedPreferences(context);
+        TermSettings mSettings = new TermSettings(context.getResources(), mPrefs);
+
+        String scmd = getPyBin(context, false);
+
+        ShellTermSession session = createTermSession(context, mSettings, scmd + " \"" + mArgs[0] + "\"  " + mArgs[1] + " > \"" + mArgs[2] + "\" 2>&1", "");
+
+        session.setFinishCallback(null);
+        session.shellRun();
+    }
+
+    protected static ShellTermSession createTermSession(Context context, TermSettings settings, String initialCommand, String path) {
+        ShellTermSession session = null;
+        try {
+            session = new ShellTermSession(context, settings, initialCommand, path);
+            session.setProcessExitMessage(context.getString(R.string.process_exit_message));
+
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+        return session;
+    }
+
+
+    /*
+    Run WEBAPP
+     */
+    private void playWebApp(Context context, String script, String argv) {
+        String header_512 = FileHelper.getFileContents(script, 512);
+
+        boolean isNoHead = header_512.contains("#qpy:fullscreen");
+        boolean isDrawer = header_512.contains("#qpy:drawer");
+
+        String title = "QWebApp";
+        Pattern titlePattern = Pattern.compile("#qpy:webapp:(.+)", Pattern.CASE_INSENSITIVE);
+        Matcher matcher0 = titlePattern.matcher(header_512);
+        if (matcher0.find()) {
+            title = matcher0.group(1);
+        }
+
+        String srv = "http://localhost";
+        Pattern srvPattern = Pattern.compile("#qpy://(.+)[\\s]+", Pattern.CASE_INSENSITIVE);
+        Matcher matcher1 = srvPattern.matcher(header_512);
+
+        if (matcher1.find()) {
+            srv = "http://" + matcher1.group(1);
+        }
+
+        playDScript(context, script, argv, false);
+        Utils.startWebActivityWithUrl(context, title, srv, script, isNoHead, isDrawer);
+//        QWebViewActivity.start(context, "main", title, srv, script);
+    }
+
+
+    /*
+        Run KIVY Script
+     */
+    public void playKScript(Context context, final String script, String argv, boolean notify) {
+        if (Utils.isOpenGL2supported(context)) {
+            File scriptParent = new File(script).getParentFile();
+            String proj, log;
+            log = QPyConstants.ABSOLUTE_LOG;
+
+            if (scriptParent.getName().startsWith("scripts")) {
+                proj = new File(script).getName();
+            } else {
+                proj = scriptParent.getName();
+            }
+            Intent intent = new Intent(context, PythonSDLActivity.class);
+            intent.setData(Uri.fromFile(new File(script)));
+            context.startActivity(intent);
+            LogDialog event = new LogDialog(proj, log);
+            EventBus.getDefault().post(event);
+
+        } else {
+
+            new AlertDialog.Builder(context, R.style.MyDialog)
+                    .setTitle(R.string.notice)
+                    .setMessage(R.string.open_gl2_is_not_supported)
+                    .setPositiveButton(R.string.close, (dialog1, which) ->  dialog1.dismiss())
+                    .create()
+                    .show();
+
+        }
+    }
+
+    /*
+        Run Game Script
+     */
+    public void playGScript(Context context, final String script, String argv, boolean notify) {
+        playKScript(context,script,argv,notify);
+    }
+
+
+    /*
+        Run Console Script
+     */
+    public void playCScript(Context context, final String scriptPath, String arg) {
+        String[] args;
+        if (TextUtils.isEmpty(arg)) {
+            args = new String[]{scriptPath, scriptPath};
+        } else {
+            args = new String[]{scriptPath, scriptPath, arg};
+        }
+
+        execPyInConsole((Activity)context, args);
+
+    }
+
+    /*
+        Run Daemon Script
+     */
+
+    public void playDScript(Context context, final String scriptPath, String argv1, boolean notify) {
+        String logFile = getLastLog();
+
+        String[] mArgs = {scriptPath, " " + (argv1 != null ? argv1 : ""), logFile};
+
+        Log.d(TAG, "playDScript:" + scriptPath + ":argv1:" + argv1 + " >" + logFile + " 2>&1");
+        createWebTermSession(context, mArgs);
+    }
+
+    /*
+        Run Quiet Script
+     */
+    FileDescriptor mFd;
+    public int playQScript(Context context, final String script, String argv, boolean notify) {
+        ArrayList<String> mArguments = new ArrayList<>();
+
+        String binaryPath = getPyBin(context, true);
+
+        Log.d(TAG, "playQScript:" + binaryPath + "|" + script + "|" + argv);
+
+        File f = new File(script);
+
+        int[] pid = new int[1];
+
+        mArguments.add(script);
+        mArguments.add(argv);
+
+        String[] argumentsArray = mArguments.toArray(new String[mArguments.size()]);
+
+        final File mLog = new File(QPyConstants.ABSOLUTE_LOG);
+
+        mFd = Exec.createSubprocess(binaryPath, argumentsArray, getPyEnv(context, System.getenv("PATH"), System.getenv("TERM"),f.getParentFile() + ""), Environment.getExternalStorageDirectory() + "/", pid);
+        final AtomicInteger mPid = new AtomicInteger(PID_INIT_VALUE);
+
+        mPid.set(pid[0]);
+        mOut = new FileOutputStream(mFd);
+        mIn = new StreamGobbler(new FileInputStream(mFd), mLog, DEFAULT_BUFFER_SIZE);
+        long mStartTime = System.currentTimeMillis();
+
+        new Thread(new Runnable() {
+            public void run() {
+                int returnValue = Exec.waitFor(mPid.get());
+
+                //long mEndTime = System.currentTimeMillis();
+                int pid = mPid.getAndSet(PID_INIT_VALUE);
+                Log.d("", "out:" + mFd.out.toString());
+
+                Message msg = new Message();
+                msg.what = returnValue;
+                msg.obj = mArguments.get(0);
+
+                Log.d(TAG, "Process " + pid + " exited with result code " + returnValue + ".");
+
+                try {
+                    mIn.close();
+                } catch (IOException e) {
+                    Log.e(TAG, e.getMessage());
+                }
+
+                try {
+                    mOut.close();
+                } catch (IOException e) {
+                    Log.e(TAG, e.getMessage());
+                }
+                //context.updateNotify(msg);
+            }
+        }).start();
+
+        return mPid.getAndSet(PID_INIT_VALUE);
+    }
+    
+
+    public void execPyInConsole(Activity context, String[] args) {
+        Intent intent = new Intent(context, TermActivity.class);
+        intent.putExtra(TermActivity.ARGS, args);
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        context.startActivityForResult(intent, SCRIPT_CONSOLE_CODE);
+    }
+
+
+/*    public void sendLogNotifiy(Context context, String filePath) {
+        if (!PreferenceManager.getDefaultSharedPreferences(context).getBoolean(context.getString(R.string.key_hide_noti), true)) {
+            return;
+        }
+        String title = FileHelper.getFileName(filePath);
+
+        Intent resultIntent = new Intent(context, LogActivity.class);
+        if (filePath.contains("/scripts/")) {
+            String proj = new File(filePath).getName();
+
+            resultIntent.putExtra(LogActivity.LOG_PATH, filePath.replace(title, "last.log"));
+            resultIntent.putExtra(LogActivity.LOG_TITLE, proj);
+        } else {
+            String proj = new File(filePath).getParentFile().getName();
+            resultIntent.putExtra(LogActivity.LOG_PATH, filePath.replace("main.py", "last.log"));
+            resultIntent.putExtra(LogActivity.LOG_TITLE, proj);
+        }
+
+        PendingIntent pendingIntent = PendingIntent.getActivity(context, 0, resultIntent, PendingIntent.FLAG_ONE_SHOT);
+
+//        PendingIntent resultPendingIntent = PendingIntent.getActivity(
+//                this, 0, resultIntent, 0);
+
+        Notification.Builder builder = new Notification.Builder(context)
+                .setSmallIcon(R.drawable.img_home_logo)
+                .setContentTitle(context.getString(R.string.app_name))
+                .setContentText(context.getString(R.string.runtime_log, title))
+                .setContentIntent(pendingIntent)
+                .setAutoCancel(true);
+
+        Notification notification;
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN) {
+            notification = builder.build();
+        } else {
+            notification = builder.getNotification();
+        }
+        NotificationManager mNotifyMgr = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
+        mNotifyMgr.notify(LOG_NOTIFICATION_ID, notification);
+    }
+*/
+    public final void checkPermissionDo(Context context, String[] permissions, PermissionAction action) {
+        Map<Integer, PermissionAction> mActionMap = new ArrayMap<>();
+        if (Build.VERSION.SDK_INT >= 23) {
+            boolean granted = true;
+            for (int i = 0; i < permissions.length; i++) {
+                String permission = permissions[i];
+                int checkPermission = ContextCompat.checkSelfPermission(context, permission);
+                if (checkPermission != PackageManager.PERMISSION_GRANTED) {
+                    granted = false;
+
+                } else {
+                    granted = true;
+                }
+            }
+            if (!granted) {
+                int code = permissions.hashCode() & 0xffff;
+                mActionMap.put(code, action);
+                ActivityCompat.requestPermissions((Activity) context, permissions, code);
+            } else {
+                action.onGrant();
+            }
+        } else {
+            action.onGrant();
+        }
+    }
+
+
+    public interface PermissionAction {
+        void onGrant();
+
+        void onDeny();
+    }
+
+    private static class ScriptExecHolder {
+        private static final ScriptExec INSTANCE = new ScriptExec();
+    }
+
+    public static class LogDialog {
+        public LogDialog(String title, String path) {
+            Log.e("EditorActivity", "LogUtil dialog event init");
+            this.title = title;
+            this.path = path;
+        }
+
+        public String title;
+        public String path;
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/console/ShellTermSession.java b/qpython/src/main/java/org/qpython/qpy/console/ShellTermSession.java
index f8f9aad0..94c31a83 100644
--- a/qpython/src/main/java/org/qpython/qpy/console/ShellTermSession.java
+++ b/qpython/src/main/java/org/qpython/qpy/console/ShellTermSession.java
@@ -16,15 +16,16 @@
 
 
 import android.content.Context;
-import android.os.Environment;
 import android.os.Handler;
 import android.os.Message;
 import android.os.ParcelFileDescriptor;
 import android.util.Log;
 
+import com.quseit.util.FileHelper;
+import com.quseit.util.FileUtils;
+
 import org.qpython.qpy.console.compont.FileCompat;
 import org.qpython.qpy.console.util.TermSettings;
-import org.qpython.qsl4a.qsl4a.util.SPFUtils;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -86,9 +87,8 @@ public void run() {
     }
 
     private void initializeSession() throws IOException {
-        /*TermSettings settings = mSettings;
-
-        //int[] processId = new int[1];
+        Log.d("TAG","initializeSession");
+        TermSettings settings = mSettings;
 
         String path = System.getenv("PATH");
         if (settings.doPathExtensions()) {
@@ -107,56 +107,9 @@ private void initializeSession() throws IOException {
         if (settings.verifyPath()) {
             path = checkPath(path);
         }
-        String[] env = new String[21];
-        File filesDir = this.context.getFilesDir();
-
-        env[0] = "TERM=" + settings.getTermType();
-        env[1] = "PATH=" + this.context.getFilesDir()+"/bin"+":"+path;
-        env[2] = "HOME=" + settings.getHomePath();
-
-        env[3] = "LD_LIBRARY_PATH=.:"+filesDir+"/lib/"+":"+filesDir+"/:"+filesDir.getParentFile()+"/lib/";
-        env[4] = "PYTHONHOME="+filesDir;
-        env[5] = "ANDROID_PRIVATE="+filesDir;
-
-        // HACKED FOR QPython
-        File externalStorage = new File(Environment.getExternalStorageDirectory(), "qpython");
-
-        if (!externalStorage.exists()) {
-            externalStorage.mkdir();
-        }
-
-        env[6] = "PYTHONPATH="
-                +filesDir+"/lib/python2.7/site-packages/:"
-                +filesDir+"/lib/python2.7/:"
-                +filesDir+"/lib/python27.zip:"
-                +filesDir+"/lib/python2.7/lib-dynload/:"
-                +externalStorage+"/lib/python2.7/site-packages/:"
-                +pyPath;
 
-            //env[14] = "IS_QPY2=1";
-        env[7] = "PYTHONSTARTUP="+filesDir+"/lib/python2.7/site-packages/qpy.py";
-
-
-        env[8] = "PYTHONOPTIMIZE=2";
-        env[9] = "TMPDIR="+externalStorage+"/cache";
-        File td = new File(externalStorage+"/cache");
-        if (!td.exists()) {
-            td.mkdir();
-        }
 
-        env[10] = "AP_HOST="+ SPFUtils.getSP(this.context, "sl4a.hostname");
-        env[11] = "AP_PORT="+SPFUtils.getSP(this.context, "sl4a.port");
-        env[12] = "AP_HANDSHAKE="+SPFUtils.getSP(this.context, "sl4a.secue");
-
-        env[13] = "ANDROID_PUBLIC="+externalStorage;
-        env[14] = "ANDROID_PRIVATE="+this.context.getFilesDir().getAbsolutePath();
-        env[15] = "ANDROID_ARGUMENT="+pyPath;
-
-        env[16] = "QPY_USERNO="+ SPFUtils.getUserNoId(context);
-        env[17] = "QPY_ARGUMENT="+SPFUtils.getExtConf(context);
-        env[18] = "PYTHONDONTWRITEBYTECODE=1";
-        env[19] = "TMP="+externalStorage+"/cache";
-        env[20] = "ANDROID_APP_PATH="+externalStorage+"";
+        String[] env = ScriptExec.getInstance().getPyEnv(context, path, settings.getTermType(), pyPath);
 
         File enf = new File(context.getFilesDir()+"/bin/init.sh");
         //if (! enf.exists()) {
@@ -171,67 +124,10 @@ private void initializeSession() throws IOException {
         catch (Exception e) {
             e.printStackTrace();
         }
-        Log.d("ShellTermSession", "initializeSession:"+settings.getShell());
-
-        createSubprocess(settings.getShell(), env);*/
-       /* mProcId = processId[0];
-
-        setTermOut(new FileOutputStream(mTermFd));
-        setTermIn(new FileInputStream(mTermFd));*/
-        TermSettings settings = mSettings;
-
-        String path = System.getenv("PATH");
-        if (settings.doPathExtensions()) {
-            String appendPath = settings.getAppendPath();
-            if (appendPath != null && appendPath.length() > 0) {
-                path = path + ":" + appendPath;
-            }
-
-            if (settings.allowPathPrepend()) {
-                String prependPath = settings.getPrependPath();
-                if (prependPath != null && prependPath.length() > 0) {
-                    path = prependPath + ":" + path;
-                }
-            }
-        }
-        if (settings.verifyPath()) {
-            path = checkPath(path);
-        }
-        File filesDir = this.context.getFilesDir();
-        File externalStorage = new File(Environment.getExternalStorageDirectory(), "qpython");
-
-        String[] env = new String[21];
-
-        env[0] = "TERM=" + settings.getTermType();
-        env[1] = "PATH=" + this.context.getFilesDir()+"/bin"+":"+path;
-        env[2] = "HOME=" + settings.getHomePath();
-        env[3] = "LD_LIBRARY_PATH=.:"+filesDir+"/lib/"+":"+filesDir+"/:"+filesDir.getParentFile()+"/lib/";
-        env[4] = "PYTHONHOME="+filesDir;
-        env[5] = "ANDROID_PRIVATE="+filesDir;
-        env[6] = "PYTHONPATH="
-                +filesDir+"/lib/python2.7/site-packages/:"
-                +filesDir+"/lib/python2.7/:"
-                +filesDir+"/lib/python27.zip:"
-                +filesDir+"/lib/python2.7/lib-dynload/:"
-                +externalStorage+"/lib/python2.7/site-packages/:"
-                +pyPath;
-        env[7] = "PYTHONSTARTUP="+filesDir+"/lib/python2.7/site-packages/qpy.py";
-        env[8] = "PYTHONOPTIMIZE=2";
-        env[9] = "TMPDIR="+externalStorage+"/cache";
-        env[10] = "AP_HOST="+ SPFUtils.getSP(this.context, "sl4a.hostname");
-        env[11] = "AP_PORT="+SPFUtils.getSP(this.context, "sl4a.port");
-        env[12] = "AP_HANDSHAKE="+ SPFUtils.getSP(this.context, "sl4a.secue");
-        env[13] = "ANDROID_PUBLIC="+externalStorage;
-        env[14] = "ANDROID_PRIVATE="+this.context.getFilesDir().getAbsolutePath();
-        env[15] = "ANDROID_ARGUMENT="+pyPath;
-        env[16] = "QPY_USERNO="+ SPFUtils.getUserNoId(context);
-        env[17] = "QPY_ARGUMENT="+SPFUtils.getExtConf(context);
-        env[18] = "PYTHONDONTWRITEBYTECODE=1";
-        env[19] = "TMP="+externalStorage+"/cache";
-        env[20] = "ANDROID_APP_PATH="+externalStorage+"";
 
 
         mProcId = createSubprocess(settings.getShell(), env);
+
     }
 
     private String checkPath(String path) {
@@ -352,37 +248,4 @@ public void finish() {
     void hangupProcessGroup() {
         TermExec.sendSignal(-mProcId, 1);
     }
-
-    //QPython
-    public static void loadLibrary(File libPath) {
-
-        System.load(libPath+"/libsdl.so");
-        System.load(libPath+"/libsdl_image.so");
-        System.load(libPath+"/libsdl_ttf.so");
-        System.load(libPath+"/libsdl_mixer.so");
-        try {
-            System.load(libPath+"/libpython2.7.so");
-            System.load(libPath+"/libapplication.so");
-            System.load(libPath+"/libsdl_main.so");
-            System.load(libPath+"/libsqlite3.so");
-        } catch(UnsatisfiedLinkError e) {
-        }
-        //String libPath = new File(Environment.getExternalStorageDirectory(), mActivity.getPackageName()).toString()+"/"+CONF.DFROM_LIB;
-
-        try {
-            System.load(libPath + "/lib/python2.7/lib-dynload/_io.so");
-            System.load(libPath + "/lib/python2.7/lib-dynload/unicodedata.so");
-            System.load(libPath + "/lib/python2.7/lib-dynload/_sqlite3.so");
-        } catch(UnsatisfiedLinkError e) {
-            Log.d(TermDebug.LOG_TAG, ""+e.getMessage());
-        }
-
-        /*try {
-            System.load(libPath + "/lib/python2.7/lib-dynload/_imaging.so");
-            System.load(libPath + "/lib/python2.7/lib-dynload/_imagingft.so");
-            System.load(libPath + "/lib/python2.7/lib-dynload/_imagingmath.so");
-        } catch(UnsatisfiedLinkError e) {
-        }*/
-    }
-
 }
diff --git a/qpython/src/main/java/org/qpython/qpy/console/TermActivity.java b/qpython/src/main/java/org/qpython/qpy/console/TermActivity.java
index c4a3b410..bf2f1f01 100644
--- a/qpython/src/main/java/org/qpython/qpy/console/TermActivity.java
+++ b/qpython/src/main/java/org/qpython/qpy/console/TermActivity.java
@@ -16,13 +16,11 @@
 
 package org.qpython.qpy.console;
 
-import android.app.Activity;
-import android.app.AlertDialog;
+import android.annotation.SuppressLint;
 import android.content.ActivityNotFoundException;
 import android.content.BroadcastReceiver;
 import android.content.ComponentName;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.ServiceConnection;
 import android.content.SharedPreferences;
@@ -39,42 +37,61 @@
 import android.os.IBinder;
 import android.os.PowerManager;
 import android.preference.PreferenceManager;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.design.widget.AppBarLayout;
+import android.support.v7.app.AlertDialog;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.Toolbar;
 import android.text.TextUtils;
 import android.util.DisplayMetrics;
 import android.util.Log;
 import android.view.ContextMenu;
 import android.view.ContextMenu.ContextMenuInfo;
 import android.view.GestureDetector.SimpleOnGestureListener;
-import android.view.Gravity;
 import android.view.KeyEvent;
+import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.Window;
 import android.view.WindowManager;
 import android.view.inputmethod.InputMethodManager;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+import android.widget.Spinner;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.quseit.util.KeyboardUtils;
+import com.quseit.util.NAction;
+
 import org.qpython.qpy.R;
-import org.qpython.qpy.console.compont.ActionBarCompat;
 import org.qpython.qpy.console.compont.ActivityCompat;
-import org.qpython.qpy.console.compont.AndroidCompat;
+import org.qpython.qpysdk.utils.AndroidCompat;
+import org.qpython.qpy.console.compont.FileCompat;
 import org.qpython.qpy.console.compont.MenuItemCompat;
 import org.qpython.qpy.console.util.SessionList;
 import org.qpython.qpy.console.util.TermSettings;
+import org.qpython.qpy.main.activity.NotebookActivity;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.texteditor.ui.adapter.bean.PopupItemBean;
+import org.qpython.qpy.texteditor.ui.view.EditorPopUp;
 import org.qpython.qsl4a.qsl4a.StringUtils;
 
+import java.io.File;
 import java.io.IOException;
 import java.text.Collator;
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Locale;
 
 import jackpal.androidterm.emulatorview.EmulatorView;
 import jackpal.androidterm.emulatorview.TermSession;
+import jackpal.androidterm.emulatorview.TermShortcutLayout;
 import jackpal.androidterm.emulatorview.UpdateCallback;
 import jackpal.androidterm.emulatorview.compat.ClipboardManagerCompat;
 import jackpal.androidterm.emulatorview.compat.ClipboardManagerCompatFactory;
@@ -85,209 +102,58 @@
  * A terminal emulator activity.
  */
 
-public class TermActivity extends Activity implements UpdateCallback, SharedPreferences.OnSharedPreferenceChangeListener {
+public class TermActivity extends AppCompatActivity implements UpdateCallback, SharedPreferences.OnSharedPreferenceChangeListener {
 
 
+    public static final  int    REQUEST_CHOOSE_WINDOW             = 1;
+    public static final  String EXTRA_WINDOW_ID                   = "jackpal.androidterm.window_id";
+    public static final  String ARGS                              = "PYTHONARGS";
     /**
-     * The ViewFlipper which holds the collection of EmulatorView widgets.
+     * The name of the ViewFlipper in the resources.
      */
-    private TermViewFlipper mViewFlipper;
-
+    private static final int    VIEW_FLIPPER                      = R.id.view_flipper;
+    private final static int    SELECT_TEXT_ID                    = 0;
+    private final static int    COPY_ALL_ID                       = 1;
+    private final static int    PASTE_ID                          = 2;
+    private final static int    SEND_CONTROL_KEY_ID               = 3;
+    private final static int    SEND_FN_KEY_ID                    = 4;
+    // Available on API 12 and later
+    private static final int    WIFI_MODE_FULL_HIGH_PERF          = 3;
+    private static final String ACTION_PATH_BROADCAST             = "jackpal.androidterm.broadcast.APPEND_TO_PATH";
+    private static final String ACTION_PATH_PREPEND_BROADCAST     = "jackpal.androidterm.broadcast.PREPEND_TO_PATH";
+    private static final String PERMISSION_PATH_BROADCAST         = "jackpal.androidterm.permission.APPEND_TO_PATH";
+    private static final String PERMISSION_PATH_PREPEND_BROADCAST = "jackpal.androidterm.permission.PREPEND_TO_PATH";
+    // Available on API 12 and later
+    private static final int    FLAG_INCLUDE_STOPPED_PACKAGES     = 0x20;
     /**
-     * The name of the ViewFlipper in the resources.
+     * The ViewFlipper which holds the collection of EmulatorView widgets.
      */
-    private static final int VIEW_FLIPPER = R.id.view_flipper;
-
-    private SessionList mTermSessions;
-
-    private TermSettings mSettings;
-
-    private final static int SELECT_TEXT_ID = 0;
-    private final static int COPY_ALL_ID = 1;
-    private final static int PASTE_ID = 2;
-    private final static int SEND_CONTROL_KEY_ID = 3;
-    private final static int SEND_FN_KEY_ID = 4;
-
-    private boolean mAlreadyStarted = false;
+    private TermViewFlipper mViewFlipper;
+    private SessionList     mTermSessions;
+    private TermSettings    mSettings;
     private boolean mStopServiceOnFinish = false;
-
     private Intent TSIntent;
-
-    public static final int REQUEST_CHOOSE_WINDOW = 1;
-    public static final String EXTRA_WINDOW_ID = "jackpal.androidterm.window_id";
     private int onResumeSelectWindow = -1;
-    private ComponentName mPrivateAlias;
-
+    private ComponentName         mPrivateAlias;
     private PowerManager.WakeLock mWakeLock;
-    private WifiManager.WifiLock mWifiLock;
-    // Available on API 12 and later
-    private static final int WIFI_MODE_FULL_HIGH_PERF = 3;
-
-    private boolean mBackKeyPressed;
-
-    private static final String ACTION_PATH_BROADCAST = "jackpal.androidterm.broadcast.APPEND_TO_PATH";
-    private static final String ACTION_PATH_PREPEND_BROADCAST = "jackpal.androidterm.broadcast.PREPEND_TO_PATH";
-    private static final String PERMISSION_PATH_BROADCAST = "jackpal.androidterm.permission.APPEND_TO_PATH";
-    private static final String PERMISSION_PATH_PREPEND_BROADCAST = "jackpal.androidterm.permission.PREPEND_TO_PATH";
+    private WifiManager.WifiLock  mWifiLock;
+    private boolean               mBackKeyPressed;
     private int mPendingPathBroadcasts = 0;
-
-
-    public static final void startActivity(Context context) {
-        Intent intent = new Intent(context, TermActivity.class);
-        context.startActivity(intent);
-    }
-
-    private BroadcastReceiver mPathReceiver = new BroadcastReceiver() {
-        public void onReceive(Context context, Intent intent) {
-            String path = makePathFromBundle(getResultExtras(false));
-            if (intent.getAction().equals(ACTION_PATH_PREPEND_BROADCAST)) {
-                mSettings.setPrependPath(path);
-            } else {
-                mSettings.setAppendPath(path);
-            }
-            mPendingPathBroadcasts--;
-
-            if (mPendingPathBroadcasts <= 0 && mTermService != null) {
-                try {
-                    populateViewFlipper();
-                    populateWindowList();
-                } catch (IOException e) {
-                    Toast.makeText(context, "Fail to resume console", Toast.LENGTH_SHORT).show();
-                }
-
-            }
-        }
-    };
-    // Available on API 12 and later
-    private static final int FLAG_INCLUDE_STOPPED_PACKAGES = 0x20;
-
-    private TermService mTermService;
-    private ServiceConnection mTSConnection = new ServiceConnection() {
-        public void onServiceConnected(ComponentName className, IBinder service) {
-            Log.i(TermDebug.LOG_TAG, "Bound to TermService");
-            TermService.TSBinder binder = (TermService.TSBinder) service;
-            mTermService = binder.getService();
-            if (mPendingPathBroadcasts <= 0) {
-                try {
-                    populateViewFlipper();
-                    populateWindowList();
-                }catch (IOException e) {
-                    Toast.makeText(binder.getService().getApplicationContext(),"Failed to resume console", Toast.LENGTH_SHORT).show();
-                }
-            }
-        }
-
-        public void onServiceDisconnected(ComponentName arg0) {
-            mTermService = null;
-        }
-    };
-
-    private ActionBarCompat mActionBar;
-    private int mActionBarMode = TermSettings.ACTION_BAR_MODE_NONE;
-
-    private WindowListAdapter mWinListAdapter;
-
-    @Override
-    public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String s) {
-        mSettings.readPrefs(sharedPreferences);
-    }
-
-    private class WindowListActionBarAdapter extends WindowListAdapter implements UpdateCallback {
-        // From android.R.style in API 13
-        private static final int TextAppearance_Holo_Widget_ActionBar_Title = 0x01030112;
-
-        public WindowListActionBarAdapter(SessionList sessions) {
-            super(sessions);
-        }
-
-        @Override
-        public View getView(int position, View convertView, ViewGroup parent) {
-            TextView label = new TextView(TermActivity.this);
-            String title = getSessionTitle(position, getString(R.string.window_title, position + 1));
-            label.setText(title);
-            if (AndroidCompat.SDK >= 13) {
-                label.setTextAppearance(TermActivity.this, TextAppearance_Holo_Widget_ActionBar_Title);
-            } else {
-                label.setTextAppearance(TermActivity.this, android.R.style.TextAppearance_Medium);
-            }
-            return label;
-        }
-
-        @Override
-        public View getDropDownView(int position, View convertView, ViewGroup parent) {
-            return super.getView(position, convertView, parent);
-        }
-
-        public void onUpdate() {
-            notifyDataSetChanged();
-            mActionBar.setSelectedNavigationItem(mViewFlipper.getDisplayedChild());
-        }
-    }
-
-    private ActionBarCompat.OnNavigationListener mWinListItemSelected = new ActionBarCompat.OnNavigationListener() {
-        public boolean onNavigationItemSelected(int position, long id) {
-            int oldPosition = mViewFlipper.getDisplayedChild();
-            if (position != oldPosition) {
-                if (position >= mViewFlipper.getChildCount()) {
-                    mViewFlipper.addView(createEmulatorView(mTermSessions.get(position)));
-                }
-                mViewFlipper.setDisplayedChild(position);
-                if (mActionBarMode == TermSettings.ACTION_BAR_MODE_HIDES) {
-                    mActionBar.hide();
-                }
-            }
-            return true;
-        }
-    };
-
+    private TermService        mTermService;
+    //    private ActionBarCompat mActionBar;
+    private Toolbar            toolbar;
+    private AppBarLayout       toolbarLayout;
+    private Spinner            spinner;
+    private WindowTitleAdapter adapter;
+    private ArrayList<String> windowTitle    = new ArrayList<>();
+    private int               mActionBarMode = TermSettings.ACTION_BAR_MODE_ALWAYS_VISIBLE;
+    private AlertDialog dialog;
+    private EditorPopUp popUp;
     private boolean mHaveFullHwKeyboard = false;
-
-    private class EmulatorViewGestureListener extends SimpleOnGestureListener {
-        private EmulatorView view;
-
-        public EmulatorViewGestureListener(EmulatorView view) {
-            this.view = view;
-        }
-
-        @Override
-        public boolean onSingleTapUp(MotionEvent e) {
-            // Let the EmulatorView handle taps if mouse tracking is active
-            if (view.isMouseTrackingActive()) return false;
-
-            //Check for link at tap location
-            String link = view.getURLat(e.getX(), e.getY());
-            if (link != null)
-                execURL(link);
-            else
-                doUIToggle((int) e.getX(), (int) e.getY(), view.getVisibleWidth(), view.getVisibleHeight());
-            return true;
-        }
-
-        @Override
-        public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX, float velocityY) {
-            float absVelocityX = Math.abs(velocityX);
-            float absVelocityY = Math.abs(velocityY);
-            if (absVelocityX > Math.max(1000.0f, 2.0 * absVelocityY)) {
-                // Assume user wanted side to side movement
-                if (velocityX > 0) {
-                    // Left to right swipe -- previous window
-                    mViewFlipper.showPrevious();
-                } else {
-                    // Right to left swipe -- next window
-                    mViewFlipper.showNext();
-                }
-                return true;
-            } else {
-                return false;
-            }
-        }
-    }
-
     /**
      * Should we use keyboard shortcuts?
      */
     private boolean mUseKeyboardShortcuts;
-
     /**
      * Intercepts keys before the view/terminal gets it.
      */
@@ -323,7 +189,6 @@ private boolean keyboardShortcuts(int keyCode, KeyEvent event) {
                 return true;
             } else if (keyCode == KeycodeConstants.KEYCODE_V && isCtrlPressed && isShiftPressed) {
                 doPaste();
-
                 return true;
             } else {
                 return false;
@@ -334,7 +199,7 @@ private boolean keyboardShortcuts(int keyCode, KeyEvent event) {
          * Make sure the back button always leaves the application.
          */
         private boolean backkeyInterceptor(int keyCode, KeyEvent event) {
-            if (keyCode == KeyEvent.KEYCODE_BACK && mActionBarMode == TermSettings.ACTION_BAR_MODE_HIDES && mActionBar != null && mActionBar.isShowing()) {
+            if (keyCode == KeyEvent.KEYCODE_BACK /*&& mActionBarMode == TermSettings.ACTION_BAR_MODE_HIDES && mActionBar != null && mActionBar.isShowing()*/) {
                 /* We need to intercept the key event before the view sees it,
                    otherwise the view will handle it before we get it */
                 onKeyUp(keyCode, event);
@@ -345,22 +210,91 @@ private boolean backkeyInterceptor(int keyCode, KeyEvent event) {
         }
     };
 
+    private BroadcastReceiver mPathReceiver = new BroadcastReceiver() {
+        public void onReceive(Context context, Intent intent) {
+            String path = makePathFromBundle(getResultExtras(false));
+            if (intent.getAction().equals(ACTION_PATH_PREPEND_BROADCAST)) {
+                mSettings.setPrependPath(path);
+            } else {
+                mSettings.setAppendPath(path);
+            }
+            mPendingPathBroadcasts--;
+
+            if (mPendingPathBroadcasts <= 0 && mTermService != null) {
+                try {
+                    populateViewFlipper();
+                    populateWindowList();
+                } catch (IOException e) {
+                    Toast.makeText(context, R.string.fail_resume_console, Toast.LENGTH_SHORT).show();
+                }
+
+            }
+        }
+    };
+    private ServiceConnection mTSConnection = new ServiceConnection() {
+        public void onServiceConnected(ComponentName className, IBinder service) {
+            Log.i(TermDebug.LOG_TAG, "Bound to TermService");
+            TermService.TSBinder binder = (TermService.TSBinder) service;
+            mTermService = binder.getService();
+            if (mPendingPathBroadcasts <= 0) {
+                try {
+                    populateViewFlipper();
+                    populateWindowList();
+                } catch (IOException e) {
+                    Toast.makeText(binder.getService().getApplicationContext(), R.string.fail_resume_console, Toast.LENGTH_SHORT).show();
+                }
+            }
+        }
+
+        public void onServiceDisconnected(ComponentName arg0) {
+            mTermService = null;
+        }
+    };
+
     private Handler mHandler = new Handler();
 
+    public static void startActivity(Context context) {
+        Intent intent = new Intent(context, TermActivity.class);
+        context.startActivity(intent);
+    }
+
+    public static void startShell(Context context) {
+        Intent intent = new Intent(context, TermActivity.class);
+        intent.putExtra("shell_type","shell");
+        context.startActivity(intent);
+    }
+
+    protected static TermSession createTermSession(Context context, TermSettings settings, String initialCommand, String path) throws IOException {
+        GenericTermSession session = new ShellTermSession(context, settings, initialCommand, path);
+        session.setProcessExitMessage(context.getString(R.string.process_exit_message));
+        return session;
+    }
+
+    @Override
+    public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String s) {
+        mSettings.readPrefs(sharedPreferences);
+    }
+
+    @SuppressLint({"WrongConstant", "InvalidWakeLockTag"})
     @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
+        getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN | WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
 
-        Log.v(TermDebug.LOG_TAG, "onCreate");
-
+        // Check if need to hide status bar
+        final SharedPreferences mPrefs = PreferenceManager.getDefaultSharedPreferences(this);
+        mPrefs.registerOnSharedPreferenceChangeListener(this);
+        mSettings = new TermSettings(getResources(), mPrefs);
+        if (Build.VERSION.SDK_INT < 16 && mSettings.showStatusBar()) {
+            getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
+                    WindowManager.LayoutParams.FLAG_FULLSCREEN);
+        }
+        setContentView(R.layout.term_activity);
+        initView();
         mPrivateAlias = new ComponentName(this, RemoteInterface.PRIVACT_ACTIVITY_ALIAS);
-
         if (icicle == null)
             onNewIntent(getIntent());
 
-        final SharedPreferences mPrefs = PreferenceManager.getDefaultSharedPreferences(this);
-        mSettings = new TermSettings(getResources(), mPrefs);
-        mPrefs.registerOnSharedPreferenceChangeListener(this);
 
         Intent broadcast = new Intent(ACTION_PATH_BROADCAST);
         if (AndroidCompat.SDK >= 12) {
@@ -377,55 +311,149 @@ public void onCreate(Bundle icicle) {
         TSIntent = new Intent(this, TermService.class);
         startService(TSIntent);
 
-        if (AndroidCompat.SDK >= 11) {
-            int actionBarMode = mSettings.actionBarMode();
-            mActionBarMode = actionBarMode;
-            if (AndroidCompat.V11ToV20) {
-                switch (actionBarMode) {
-                    case TermSettings.ACTION_BAR_MODE_ALWAYS_VISIBLE:
-                        setTheme(R.style.Theme_Holo);
-                        break;
-                    case TermSettings.ACTION_BAR_MODE_HIDES:
-                        setTheme(R.style.Theme_Holo_ActionBarOverlay);
-                        break;
-                }
-            }
-        } else {
-            mActionBarMode = TermSettings.ACTION_BAR_MODE_ALWAYS_VISIBLE;
-        }
-
-        setContentView(R.layout.term_activity);
-        mViewFlipper = (TermViewFlipper) findViewById(VIEW_FLIPPER);
-
         PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE);
-        mWakeLock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, TermDebug.LOG_TAG);
-        WifiManager wm = (WifiManager) getSystemService(Context.WIFI_SERVICE);
+        mWakeLock = pm.newWakeLock(PowerManager.SCREEN_BRIGHT_WAKE_LOCK | PowerManager.ACQUIRE_CAUSES_WAKEUP, TermDebug.LOG_TAG);
+        WifiManager wm = (WifiManager) getApplicationContext().getSystemService(Context.WIFI_SERVICE);
         int wifiLockMode = WifiManager.WIFI_MODE_FULL;
         if (AndroidCompat.SDK >= 12) {
             wifiLockMode = WIFI_MODE_FULL_HIGH_PERF;
         }
         mWifiLock = wm.createWifiLock(wifiLockMode, TermDebug.LOG_TAG);
+        mHaveFullHwKeyboard = checkHaveFullHwKeyboard(getResources().getConfiguration());
+        updatePrefs();
+        if (!bindService(TSIntent, mTSConnection, BIND_AUTO_CREATE)) {
+            throw new IllegalStateException(getString(R.string.failed_bind_term));
+        }
+        KeyboardUtils.addKeyboardToggleListener(this, isVisible -> setStatusBarVisible(mSettings.showStatusBar()));
+    }
+
+    private void initView() {
+        toolbar = (Toolbar) findViewById(R.id.toolbar);
+        toolbarLayout = (AppBarLayout) findViewById(R.id.toolbar_layout);
+        setSupportActionBar(toolbar);
+        getSupportActionBar().setDisplayShowTitleEnabled(false);
+        toolbar.setNavigationIcon(R.drawable.ic_back);
+        toolbar.setNavigationOnClickListener(v -> closeActivity());
 
-        ActionBarCompat actionBar = ActivityCompat.getActionBar(this);
-        if (actionBar != null) {
-            mActionBar = actionBar;
-            actionBar.setNavigationMode(ActionBarCompat.NAVIGATION_MODE_LIST);
-            actionBar.setDisplayOptions(0, ActionBarCompat.DISPLAY_SHOW_TITLE);
-            if (mActionBarMode == TermSettings.ACTION_BAR_MODE_HIDES) {
-                actionBar.hide();
+        spinner = (Spinner) findViewById(R.id.spinner_toolbar);
+        mViewFlipper = (TermViewFlipper) findViewById(VIEW_FLIPPER);
+
+        spinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+            @Override
+            public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
+                int oldPosition = mViewFlipper.getDisplayedChild();
+                if (position != oldPosition) {
+                    if (position >= mViewFlipper.getChildCount()) {
+                        mViewFlipper.addView(createEmulatorView(mTermSessions.get(position)));
+                    }
+                    mViewFlipper.setDisplayedChild(position);
+                }
             }
+
+
+            @Override
+            public void onNothingSelected(AdapterView<?> parent) {
+                spinner.setSelection(0);
+            }
+        });
+
+        TermShortcutLayout shortcutLayout = (TermShortcutLayout) findViewById(R.id.term_shortcut);
+        shortcutLayout.setCallback(this::setTextToEmulator);
+
+        findViewById(R.id.notebook).setOnClickListener(v -> {
+            NotebookActivity.start(this, null, false);
+        });
+
+        //findViewById(R.id.history).setOnClickListener(v -> showHistory());
+        findViewById(R.id.switch_notebook_img).setOnClickListener(v -> openNotebook());
+    }
+
+    private void openNotebook() {
+        startActivity(new Intent(this, NotebookActivity.class));
+    }
+
+    @Override
+    public void onPause() {
+        Log.d("TermActivity", "onPause");
+        if (dialog != null) {
+            dialog.dismiss();
+        }
+        super.onPause();
+
+        if (AndroidCompat.SDK < 5) {
+            /* If we lose focus between a back key down and a back key up,
+               we shouldn't respond to the next back key up event unless
+               we get another key down first */
+            mBackKeyPressed = false;
+        }
+
+        /* Explicitly close the input method
+           Otherwise, the soft keyboard could cover up whatever activity takes
+           our place */
+        final IBinder token = mViewFlipper.getWindowToken();
+        new Thread() {
+            @Override
+            public void run() {
+                InputMethodManager imm = (InputMethodManager) getSystemService(INPUT_METHOD_SERVICE);
+                imm.hideSoftInputFromWindow(token, 0);
+            }
+        }.start();
+    }
+
+    @Override
+    public void onDestroy() {
+        Log.d("TermActivity", "onDestroy");
+        PreferenceManager.getDefaultSharedPreferences(this)
+                .unregisterOnSharedPreferenceChangeListener(this);
+
+        if (mTermSessions != null) {
+            mTermSessions.removeCallback(this);
+
+            if (adapter != null) {
+                mTermSessions.removeCallback(adapter);
+                mTermSessions.removeTitleChangedListener(adapter);
+                mViewFlipper.removeCallback(adapter);
+            }
+        }
+
+        mViewFlipper.removeAllViews();
+
+        unbindService(mTSConnection);
+        //LogUtil.d("TermActivity", "mStopServiceOnFinish:"+mStopServiceOnFinish);
+
+        if (mStopServiceOnFinish) {
+            stopService(TSIntent);
+        }
+        //LogUtil.d("TermActivity", "HERE");
+        mTermService = null;
+        mTSConnection = null;
+        if (mWakeLock.isHeld()) {
+            mWakeLock.release();
+        }
+        if (mWifiLock.isHeld()) {
+            mWifiLock.release();
         }
 
-        mHaveFullHwKeyboard = checkHaveFullHwKeyboard(getResources().getConfiguration());
+        mTermSessions = null;
 
-        updatePrefs();
-        mAlreadyStarted = true;
+        if (dialog != null) {
+            if (dialog.isShowing()) {
+                dialog.cancel();
+            } else {
+            }
+            dialog.dismiss();
 
-        if (!bindService(TSIntent, mTSConnection, BIND_AUTO_CREATE)) {
-            throw new IllegalStateException("Failed to bind to TermService!");
         }
+        if (popUp!=null) {
+            popUp.dismiss();
+        }
+
+        KeyboardUtils.removeAllKeyboardToggleListeners();
+
+        super.onDestroy();
     }
 
+
     private String makePathFromBundle(Bundle extras) {
         if (extras == null || extras.size() == 0) {
             return "";
@@ -448,57 +476,30 @@ private String makePathFromBundle(Bundle extras) {
         return path.substring(0, path.length() - 1);
     }
 
-//    @Override
-//    protected void onStart() {
-//        Log.d("TermActivity", "onStart");
-//
-//        super.onStart();
-//    }
-
-    private void populateViewFlipper() throws IOException{
+    private void populateViewFlipper() throws IOException {
         Log.d("TermActivity", "populateViewFlipper");
         if (mTermService != null) {
             mTermSessions = mTermService.getSessions();
-
-//            if (mTermSessions.size() == 0) {
-//                try {
-//                    mTermSessions.add(createPyTermSession(null));
-//                } catch (IOException e) {
-//                    Toast.makeText(this, "Failed to start terminal session", Toast.LENGTH_LONG).show();
-//                    finish();
-//                    return;
-//                }
-//            }
-
-
-            String[] mArgs = this.getIntent().getStringArrayExtra("PYTHONARGS");
-
-
-            if (mArgs!=null) {
+            String[] mArgs = this.getIntent().getStringArrayExtra(ARGS);
+            if (mArgs != null) {
                 mTermSessions.add(createPyTermSession(mArgs));
-
             } else {
                 mArgs = this.getIntent().getStringArrayExtra("ARGS");
-                if (mArgs!=null) {
+                if (mArgs != null) {
                     mTermSessions.add(createPyTermSession(mArgs));
 
-                } else {
-
-                    //if (mTermSessions.size() == 0) {
+                } else if (mTermSessions.size() == 0) {
                     mTermSessions.add(createPyTermSession(null));
-                    //}
                 }
-
             }
-
+            //存在内存泄漏
             mTermSessions.addCallback(this);
-
             for (TermSession session : mTermSessions) {
-                Log.d("TermActivity", "createEmulatorView:"+session);
+                Log.d("TermActivity", "createEmulatorView:" + session);
                 EmulatorView view = createEmulatorView(session);
                 mViewFlipper.addView(view);
             }
-
+            mViewFlipper.setDisplayedChild(mTermSessions.size() - 1);
             updatePrefs();
 
             if (onResumeSelectWindow >= 0) {
@@ -510,79 +511,17 @@ private void populateViewFlipper() throws IOException{
     }
 
     private void populateWindowList() {
-        if (mActionBar == null) {
-            // Not needed
-            return;
-        }
         if (mTermSessions != null) {
             int position = mViewFlipper.getDisplayedChild();
-            if (mWinListAdapter == null) {
-                mWinListAdapter = new WindowListActionBarAdapter(mTermSessions);
-
-                mActionBar.setListNavigationCallbacks(mWinListAdapter, mWinListItemSelected);
-            } else {
-                mWinListAdapter.setSessions(mTermSessions);
-            }
-            mViewFlipper.addCallback(mWinListAdapter);
-
-            mActionBar.setSelectedNavigationItem(position);
-        }
-    }
-
-    @Override
-    public void onDestroy() {
-        super.onDestroy();
-
-        PreferenceManager.getDefaultSharedPreferences(this)
-                .unregisterOnSharedPreferenceChangeListener(this);
-
-        if (mTermSessions != null) {
-            mTermSessions.removeCallback(this);
-
-            if (mWinListAdapter != null) {
-                mTermSessions.removeCallback(mWinListAdapter);
-                mTermSessions.removeTitleChangedListener(mWinListAdapter);
-                mViewFlipper.removeCallback(mWinListAdapter);
+            for (int i = 0; i < mTermSessions.size(); i++) {
+                windowTitle.add(getString(R.string.window_title, i));
             }
+            adapter = new WindowTitleAdapter(this, mTermSessions);
+            spinner.setAdapter(adapter);
+            adapter.notifyDataSetChanged();
+            mViewFlipper.addCallback(adapter);
+            spinner.setSelection(position);
         }
-
-        mViewFlipper.removeAllViews();
-
-        unbindService(mTSConnection);
-
-        if (mStopServiceOnFinish) {
-            stopService(TSIntent);
-        }
-        mTermService = null;
-        mTSConnection = null;
-        if (mWakeLock.isHeld()) {
-            mWakeLock.release();
-        }
-        if (mWifiLock.isHeld()) {
-            mWifiLock.release();
-        }
-
-        mTermSessions = null;
-    }
-
-    private void restart() {
-        startActivity(getIntent());
-        finish();
-    }
-
-    protected static TermSession createTermSession(Context context, TermSettings settings, String initialCommand, String path) throws IOException {
-        GenericTermSession session = new ShellTermSession(context, settings, initialCommand, path);
-        // XXX We should really be able to fetch this from within TermSession
-        session.setProcessExitMessage(context.getString(R.string.process_exit_message));
-
-        return session;
-    }
-
-    private TermSession createTermSession() throws IOException {
-        TermSettings settings = mSettings;
-        TermSession session = createTermSession(this, settings, settings.getInitialCommand(), "");
-        session.setFinishCallback(mTermService);
-        return session;
     }
 
     private TermView createEmulatorView(TermSession session) {
@@ -628,29 +567,22 @@ private void updatePrefs() {
                 ((GenericTermSession) session).updatePrefs(mSettings);
             }
         }
-        {
-            Window win = getWindow();
-            WindowManager.LayoutParams params = win.getAttributes();
-            final int FULLSCREEN = WindowManager.LayoutParams.FLAG_FULLSCREEN;
-            int desiredFlag = mSettings.showStatusBar() ? 0 : FULLSCREEN;
-            if (desiredFlag != (params.flags & FULLSCREEN) || (AndroidCompat.SDK >= 11 && mActionBarMode != mSettings.actionBarMode())) {
-                if (mAlreadyStarted) {
-                    // Can't switch to/from fullscreen after
-                    // starting the activity.
-                    restart();
-                } else {
-                    win.setFlags(desiredFlag, FULLSCREEN);
-                    if (mActionBarMode == TermSettings.ACTION_BAR_MODE_HIDES) {
-                        if (mActionBar != null) {
-                            mActionBar.hide();
-                        }
-                    }
-                }
-            }
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN) {
+            setStatusBarVisible(mSettings.showStatusBar());
+        } else {
+            Toast.makeText(App.getContext(), R.string.under_16_status_bar_hint, Toast.LENGTH_SHORT).show();
+        }
+        mActionBarMode = mSettings.actionBarMode();
+        switch (mActionBarMode) {
+            case TermSettings.ACTION_BAR_MODE_ALWAYS_VISIBLE:
+                toolbarLayout.setVisibility(View.VISIBLE);
+                break;
+            case TermSettings.ACTION_BAR_MODE_HIDES:
+                toolbarLayout.setVisibility(View.GONE);
+                break;
         }
-
         int orientation = mSettings.getScreenOrientation();
-        int o = 0;
+        int o = ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE;
         if (orientation == 0) {
             o = ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED;
         } else if (orientation == 1) {
@@ -663,53 +595,11 @@ private void updatePrefs() {
         setRequestedOrientation(o);
     }
 
-    @Override
-    public void onPause() {
-        Log.d("TermActivity", "onPause");
-
-        super.onPause();
-
-        if (AndroidCompat.SDK < 5) {
-            /* If we lose focus between a back key down and a back key up,
-               we shouldn't respond to the next back key up event unless
-               we get another key down first */
-            mBackKeyPressed = false;
-        }
-
-        /* Explicitly close the input method
-           Otherwise, the soft keyboard could cover up whatever activity takes
-           our place */
-        final IBinder token = mViewFlipper.getWindowToken();
-        new Thread() {
-            @Override
-            public void run() {
-                InputMethodManager imm = (InputMethodManager) getSystemService(INPUT_METHOD_SERVICE);
-                imm.hideSoftInputFromWindow(token, 0);
-            }
-        }.start();
+    private void setStatusBarVisible(boolean visible) {
+        View decorView = getWindow().getDecorView();
+        decorView.setSystemUiVisibility(visible ? View.SYSTEM_UI_FLAG_VISIBLE : View.SYSTEM_UI_FLAG_FULLSCREEN);
     }
 
-//    @Override
-//    protected void onStop() {
-//        Log.d("TermActivity", "onStop");
-//        mViewFlipper.onPause();
-//        if (mTermSessions != null) {
-//            mTermSessions.removeCallback(this);
-//
-//            if (mWinListAdapter != null) {
-//                mTermSessions.removeCallback(mWinListAdapter);
-//                mTermSessions.removeTitleChangedListener(mWinListAdapter);
-//                mViewFlipper.removeCallback(mWinListAdapter);
-//            }
-//        }
-//
-//        mViewFlipper.removeAllViews();
-//
-//        unbindService(mTSConnection);
-//
-//        super.onStop();
-//    }
-
     private boolean checkHaveFullHwKeyboard(Configuration c) {
         return (c.keyboard == Configuration.KEYBOARD_QWERTY) &&
                 (c.hardKeyboardHidden == Configuration.HARDKEYBOARDHIDDEN_NO);
@@ -726,54 +616,37 @@ public void onConfigurationChanged(Configuration newConfig) {
             v.updateSize(false);
         }
 
-        if (mWinListAdapter != null) {
-            // Force Android to redraw the label in the navigation dropdown
-            mWinListAdapter.notifyDataSetChanged();
-        }
     }
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         getMenuInflater().inflate(R.menu.activity_console_menu, menu);
         MenuItemCompat.setShowAsAction(menu.findItem(R.id.menu_new_window), MenuItemCompat.SHOW_AS_ACTION_ALWAYS);
-        MenuItemCompat.setShowAsAction(menu.findItem(R.id.menu_close_window), MenuItemCompat.SHOW_AS_ACTION_IF_ROOM);
         return true;
     }
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         int id = item.getItemId();
-        if (id == R.id.menu_preferences) {
-            doPreferences();
-        } else if (id == R.id.menu_new_window) {
-            doCreateNewWindow();
-        } else if (id == R.id.menu_close_window) {
-            confirmCloseWindow();
-        } else if (id == R.id.menu_window_list) {
-            startActivityForResult(new Intent(this, WindowList.class), REQUEST_CHOOSE_WINDOW);
-        } else if (id == R.id.menu_reset) {
-            doResetTerminal();
-            Toast toast = Toast.makeText(this, R.string.reset_toast_notification, Toast.LENGTH_LONG);
-            toast.setGravity(Gravity.CENTER, 0, 0);
-            toast.show();
-        } else if (id == R.id.menu_send_email) {
-            doEmailTranscript();
-        } else if (id == R.id.menu_special_keys) {
-            doDocumentKeys();
-        } else if (id == R.id.menu_toggle_soft_keyboard) {
-            doToggleSoftKeyboard();
-        } else if (id == R.id.menu_toggle_wakelock) {
-            doToggleWakeLock();
-        } else if (id == R.id.menu_toggle_wifilock) {
-            doToggleWifiLock();
-        } else if (id == R.id.action_help) {
-            Intent openHelp = new Intent(Intent.ACTION_VIEW,
-                    Uri.parse(getString(R.string.help_url)));
-            startActivity(openHelp);
-        }
-        // Hide the action bar if appropriate
-        if (mActionBarMode == TermSettings.ACTION_BAR_MODE_HIDES) {
-            mActionBar.hide();
+        switch (id) {
+            case R.id.menu_new_window:
+                doCreateNewWindow();
+                break;
+            case R.id.menu_new_more:
+                if (popUp == null) {
+                    List<PopupItemBean> popupItemBeans = new ArrayList<>();
+                    popupItemBeans.add(new PopupItemBean(getString(R.string.window_list), v ->
+                            startActivityForResult(new Intent(this, WindowList.class), REQUEST_CHOOSE_WINDOW)));
+                    popupItemBeans.add(new PopupItemBean(getString(R.string.preferences), v -> doPreferences()));
+                    popupItemBeans.add(new PopupItemBean(getString(R.string.send_email), v -> doEmailTranscript()));
+                    popupItemBeans.add(new PopupItemBean(getString(R.string.enable_wakelock), v -> doToggleWakeLock())
+                            .setTitle2(getString(R.string.disable_wakelock)));
+                    popupItemBeans.add(new PopupItemBean(getString(R.string.enable_wifilock), v -> doToggleWifiLock())
+                            .setTitle2(getString(R.string.disable_wifilock)));
+                    popUp = new EditorPopUp(this, popupItemBeans);
+                }
+                popUp.show(findViewById(R.id.toolbar));
+                break;
         }
         return super.onOptionsItemSelected(item);
     }
@@ -795,29 +668,28 @@ private void doCreateNewWindow() {
             view.updatePrefs(mSettings);
 
             mViewFlipper.addView(view);
-            mViewFlipper.setDisplayedChild(mViewFlipper.getChildCount() - 1);
+            int position = mViewFlipper.getChildCount() - 1;
+            mViewFlipper.setDisplayedChild(position);
+            spinner.setSelection(position);
         } catch (IOException e) {
             Toast.makeText(this, "Failed to create a session", Toast.LENGTH_SHORT).show();
         }
     }
 
     private void confirmCloseWindow() {
-        final AlertDialog.Builder b = new AlertDialog.Builder(this);
+        AlertDialog.Builder b = new AlertDialog.Builder(this);
         b.setIcon(android.R.drawable.ic_dialog_alert);
         b.setMessage(R.string.confirm_window_close_message);
-        final Runnable closeWindow = new Runnable() {
-            public void run() {
-                doCloseWindow();
-            }
-        };
-        b.setPositiveButton(android.R.string.yes, new DialogInterface.OnClickListener() {
-            public void onClick(DialogInterface dialog, int id) {
-                dialog.dismiss();
-                mHandler.post(closeWindow);
-            }
+        final Runnable closeWindow = this::doCloseWindow;
+        b.setPositiveButton(android.R.string.yes, (dialog1, id) -> {
+            dialog1.dismiss();
+            mHandler.post(closeWindow);
         });
-        b.setNegativeButton(android.R.string.no, null);
-        b.show();
+        b.setNegativeButton(android.R.string.no, (dialog1, id) -> {
+            dialog1.dismiss();
+        });
+        dialog = b.create();
+        dialog.show();
     }
 
     private void doCloseWindow() {
@@ -849,6 +721,10 @@ protected void onActivityResult(int request, int result, Intent data) {
                         onResumeSelectWindow = position;
                     } else if (position == -1) {
                         doCreateNewWindow();
+                        if (mTermSessions == null) {
+                            Log.w(TermDebug.LOG_TAG, "Couldn't create new window because mTermSessions == null");
+                            return;
+                        }
                         onResumeSelectWindow = mTermSessions.size() - 1;
                     }
                 } else {
@@ -863,6 +739,53 @@ protected void onActivityResult(int request, int result, Intent data) {
         }
     }
 
+    @Override
+    protected void onResume() {
+        super.onResume();
+        updatePrefs();
+    }
+
+    private void setTextToEmulator(String text) {
+        if (mViewFlipper.getCurrentView() != null) {
+            if (text!=null && text.equals("[tab]")) {
+                Log.d("TermAcity", "setTextToEmulator:"+text);
+
+                //((EmulatorView) mViewFlipper.getCurrentView()).sendTabKey();
+
+                ((EmulatorView) mViewFlipper.getCurrentView()).setTextBuff("\t");
+                ((EmulatorView) mViewFlipper.getCurrentView()).getTermSession().write("\t");
+                ((EmulatorView) mViewFlipper.getCurrentView()).getTermSession().notifyUpdate();
+
+
+            } else {
+                ((EmulatorView) mViewFlipper.getCurrentView()).setTextBuff(text);
+                ((EmulatorView) mViewFlipper.getCurrentView()).getTermSession().write(text);
+                ((EmulatorView) mViewFlipper.getCurrentView()).getTermSession().notifyUpdate();
+            }
+        }
+    }
+/*
+    private void showHistory() {
+        if (mViewFlipper.getCurrentView() != null) {
+            //LinkedList<String> history = ((EmulatorView) mViewFlipper.getCurrentView()).getEmulator().getHistory();
+            LinkedList<String> history = ((EmulatorView) mViewFlipper.getCurrentView()).getHistoryCmd();
+            if (history == null || history.size() == 0) {
+                Toast.makeText(mTermService, R.string.history_emp, Toast.LENGTH_SHORT).show();
+            } else {
+                new AlertDialog.Builder(this)
+                        .setTitle(R.string.enter_history)
+                        .setNegativeButton(R.string.close, (dialog1, which) -> dialog1.dismiss())
+                        .setAdapter(new ArrayAdapter<>(this, R.layout.dialog_history, history), (dialog1, which) -> {
+                            dialog1.dismiss();
+                            ((EmulatorView) mViewFlipper.getCurrentView()).setTextBuff(history.get(which));
+                            ((EmulatorView) mViewFlipper.getCurrentView()).getTermSession().write(history.get(which));
+                            ((EmulatorView) mViewFlipper.getCurrentView()).getTermSession().notifyUpdate();
+                        })
+                        .show();
+            }
+        }
+    }
+*/
     @Override
     protected void onNewIntent(Intent intent) {
         if ((intent.getFlags() & Intent.FLAG_ACTIVITY_LAUNCHED_FROM_HISTORY) != 0) {
@@ -890,23 +813,6 @@ protected void onNewIntent(Intent intent) {
         }
     }
 
-    @Override
-    public boolean onPrepareOptionsMenu(Menu menu) {
-        MenuItem wakeLockItem = menu.findItem(R.id.menu_toggle_wakelock);
-        MenuItem wifiLockItem = menu.findItem(R.id.menu_toggle_wifilock);
-        if (mWakeLock.isHeld()) {
-            wakeLockItem.setTitle(R.string.disable_wakelock);
-        } else {
-            wakeLockItem.setTitle(R.string.enable_wakelock);
-        }
-        if (mWifiLock.isHeld()) {
-            wifiLockItem.setTitle(R.string.disable_wifilock);
-        } else {
-            wifiLockItem.setTitle(R.string.enable_wifilock);
-        }
-        return super.onPrepareOptionsMenu(menu);
-    }
-
     @Override
     public void onCreateContextMenu(ContextMenu menu, View v,
                                     ContextMenuInfo menuInfo) {
@@ -924,6 +830,7 @@ public void onCreateContextMenu(ContextMenu menu, View v,
 
     @Override
     public boolean onContextItemSelected(MenuItem item) {
+        Log.d("TermActivity", "onContextItemSelected:"+item.getItemId());
         switch (item.getItemId()) {
             case SELECT_TEXT_ID:
                 getCurrentEmulatorView().toggleSelectingText();
@@ -947,6 +854,7 @@ public boolean onContextItemSelected(MenuItem item) {
 
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent event) {
+        Log.d("TermActivity", "onKeyDown");
         /* The pre-Eclair default implementation of onKeyDown() would prevent
            our handling of the Back key in onKeyUp() from taking effect, so
            ignore it here */
@@ -964,6 +872,8 @@ our handling of the Back key in onKeyUp() from taking effect, so
 
     @Override
     public boolean onKeyUp(int keyCode, KeyEvent event) {
+        Log.d("TermActivity", "onKeyUp:"+keyCode);
+
         switch (keyCode) {
             case KeyEvent.KEYCODE_BACK:
                 if (AndroidCompat.SDK < 5) {
@@ -974,15 +884,16 @@ public boolean onKeyUp(int keyCode, KeyEvent event) {
                     }
                     mBackKeyPressed = false;
                 }
-                if (mActionBarMode == TermSettings.ACTION_BAR_MODE_HIDES && mActionBar != null && mActionBar.isShowing()) {
-                    mActionBar.hide();
-                    return true;
-                }
+//                if (mActionBarMode == TermSettings.ACTION_BAR_MODE_HIDES && mActionBar != null && mActionBar.isShowing()) {
+//                    mActionBar.hide();
+//                    return true;
+//                }
                 switch (mSettings.getBackKeyAction()) {
                     case TermSettings.BACK_KEY_STOPS_SERVICE:
                         mStopServiceOnFinish = true;
+                        break;
                     case TermSettings.BACK_KEY_CLOSES_ACTIVITY:
-                        finish();
+                        closeActivity();
                         return true;
                     case TermSettings.BACK_KEY_CLOSES_WINDOW:
                         doCloseWindow();
@@ -990,16 +901,46 @@ public boolean onKeyUp(int keyCode, KeyEvent event) {
                     default:
                         return false;
                 }
+                break;
             case KeyEvent.KEYCODE_MENU:
-                if (mActionBar != null && !mActionBar.isShowing()) {
-                    mActionBar.show();
-                    return true;
-                } else {
-                    return super.onKeyUp(keyCode, event);
-                }
+                return super.onKeyUp(keyCode, event);
             default:
                 return super.onKeyUp(keyCode, event);
         }
+        return super.onKeyUp(keyCode, event);
+
+    }
+
+    private void closeActivity() {
+        //LogUtil.d("TermActivity", "closeActivity");
+        try {
+            if (dialog!=null) {
+                dialog.dismiss();
+            }
+            dialog = new AlertDialog.Builder(this, R.style.MyDialog)
+                    .setTitle(R.string.run_bg_title)
+                    .setMessage(R.string.terminal_bg_hint)
+                    .setPositiveButton(R.string.yes, ((dialog1, which) -> {
+                        dialog1.dismiss();
+                        finish();
+                    }))
+                    .setNegativeButton(R.string.no, ((dialog1, which) -> {
+                        dialog1.dismiss();
+//                        //在关闭当前窗口时mTermSessions可能还未初始化完成
+                        if (mTermSessions != null) {
+                            for (int i = mTermSessions.size(); i > 0; i--) {
+
+                                mTermSessions.get(i - 1).finish();
+
+                            }
+                        }
+                        finish();
+                    }))
+                    .create();
+            dialog.show();
+        } catch (Exception e) {
+
+        }
     }
 
     // Called when the list of sessions changes
@@ -1050,7 +991,7 @@ private void doEmailTranscript() {
             // Don't really want to supply an address, but
             // currently it's required, otherwise nobody
             // wants to handle the intent.
-            String addr = "user@example.com";
+            String addr = "support@qpython.org";
             Intent intent =
                     new Intent(Intent.ACTION_SENDTO, Uri.parse("mailto:"
                             + addr));
@@ -1090,6 +1031,10 @@ private void doPaste() {
         getCurrentTermSession().write(paste.toString());
     }
 
+    private void doSendTabKey() {
+        getCurrentEmulatorView().sendTabKey();
+    }
+
     private void doSendControlKey() {
         getCurrentEmulatorView().sendControlKey();
     }
@@ -1099,10 +1044,10 @@ private void doSendFnKey() {
     }
 
     private void doDocumentKeys() {
-        AlertDialog.Builder dialog = new AlertDialog.Builder(this);
+        AlertDialog.Builder builder = new AlertDialog.Builder(this);
         Resources r = getResources();
-        dialog.setTitle(r.getString(R.string.control_key_dialog_title));
-        dialog.setMessage(
+        builder.setTitle(r.getString(R.string.control_key_dialog_title));
+        builder.setMessage(
                 formatMessage(mSettings.getControlKeyId(), TermSettings.CONTROL_KEY_ID_NONE,
                         r, R.array.control_keys_short_names,
                         R.string.control_key_dialog_control_text,
@@ -1112,6 +1057,7 @@ private void doDocumentKeys() {
                                 r, R.array.fn_keys_short_names,
                                 R.string.control_key_dialog_fn_text,
                                 R.string.control_key_dialog_fn_disabled_text, "FNKEY"));
+        dialog = builder.create();
         dialog.show();
     }
 
@@ -1130,9 +1076,17 @@ private String formatMessage(int keyId, int disabledKeyId,
     }
 
     private void doToggleSoftKeyboard() {
-        InputMethodManager imm = (InputMethodManager)
-                getSystemService(Context.INPUT_METHOD_SERVICE);
-        imm.toggleSoftInput(InputMethodManager.SHOW_FORCED, 0);
+        if (!mViewFlipper.getCurrentView().hasFocus()) {
+            mViewFlipper.getCurrentView().requestFocus();
+            InputMethodManager imm = (InputMethodManager)
+                    getSystemService(Context.INPUT_METHOD_SERVICE);
+            imm.showSoftInput(mViewFlipper.getCurrentView(), 0);
+        } else {
+            mViewFlipper.getCurrentView().clearFocus();
+            InputMethodManager imm = (InputMethodManager)
+                    getSystemService(Context.INPUT_METHOD_SERVICE);
+            imm.toggleSoftInput(InputMethodManager.SHOW_FORCED, 0);
+        }
 
     }
 
@@ -1155,14 +1109,10 @@ private void doToggleWifiLock() {
     }
 
     private void doToggleActionBar() {
-        ActionBarCompat bar = mActionBar;
-        if (bar == null) {
-            return;
-        }
-        if (bar.isShowing()) {
-            bar.hide();
+        if (toolbarLayout.getVisibility() == View.VISIBLE) {
+            toolbarLayout.setVisibility(View.GONE);
         } else {
-            bar.show();
+            toolbarLayout.setVisibility(View.VISIBLE);
         }
     }
 
@@ -1193,7 +1143,6 @@ private void doUIToggle(int x, int y, int width, int height) {
         getCurrentEmulatorView().requestFocus();
     }
 
-
     /**
      * Send a URL up to Android to be handled by a browser.
      *
@@ -1208,49 +1157,155 @@ private void execURL(String link) {
             startActivity(openLink);
     }
 
-
     private TermSession createPyTermSession(String[] mArgs) throws IOException {
-        Log.d("TermActivity", "createPyTermSession:"+mArgs);
+        Log.d("TermActivity", "createPyTermSession:" + mArgs);
         TermSettings settings = mSettings;
         TermSession session;
-        String scmd = "";
+        Intent intent = this.getIntent();
+        String shell_type = intent.getStringExtra("shell_type");
+        if (shell_type!=null && shell_type.equals("shell")) {
 
-        if (Build.VERSION.SDK_INT >= 20) {
-            scmd = scmd = getApplicationContext().getFilesDir()+"/bin/qpython-android5.sh";;
-        }  else {
-            scmd = scmd = getApplicationContext().getFilesDir()+"/bin/qpython.sh";;
+            session = createTermSession(this, settings, "cd $HOME && cat SHELL", this.getFilesDir().getAbsolutePath());
 
+        } else {
+
+            if (mArgs == null) {
+                String scmd = getScmd() + " && exit";
+                session = createTermSession(this, settings, scmd, "");
+            } else {
+                //String content = FileHelper.getFileContents(mArgs[0]);
+                //String cmd = settings.getInitialCommand().equals("")?scmd:settings.getInitialCommand();
+                String scmd = getScmd();
+                if (mArgs.length < 3) {
+                    session = createTermSession(this, settings, scmd + " \"" + StringUtils.addSlashes(mArgs[0]) + "\" && exit", mArgs[1]);
+                } else {
+                    StringBuilder cm = new StringBuilder();
+                    for (int i = 0; i < mArgs.length; i++) {
+                        if (i == 1 && mArgs[0].contains(mArgs[i])) continue;
+                        cm.append(" ").append(mArgs[i]).append(" ");
+                    }
+                    session = createTermSession(this, settings, scmd + " " + cm + " && exit", mArgs[1]);
+                }
+            }
         }
+        // TODO: INIT.SH
+        //initPyInit();
 
-        if (mArgs==null) {
-            if (Build.VERSION.SDK_INT >= 20) {
-                scmd = getApplicationContext().getFilesDir()+"/bin/qpython-android5.sh && exit";
+        session.setFinishCallback(mTermService);
+        return session;
+    }
 
+    private String getScmd() {
+        boolean isRootEnable = NAction.isRootEnable(this);
+        String scmd;
+        if (Build.VERSION.SDK_INT >= 20) {
+            if (isRootEnable) {
+                scmd = getApplicationContext().getFilesDir() + "/bin/qpython" + (NAction.isQPy3(this) ? "3" : "") + "-android5-root.sh";
+            } else {
+                scmd = getApplicationContext().getFilesDir() + "/bin/qpython" + (NAction.isQPy3(this) ? "3" : "") + "-android5.sh";
+            }
+        } else {
+            if (isRootEnable) {
+                scmd = getApplicationContext().getFilesDir() + "/bin/qpython" + (NAction.isQPy3(this) ? "3" : "") + "-root.sh";
             } else {
-                scmd = getApplicationContext().getFilesDir()+"/bin/qpython.sh && exit";
+                scmd = getApplicationContext().getFilesDir() + "/bin/qpython" + (NAction.isQPy3(this) ? "3" : "") + ".sh";
+
+            }
+        }
+        return scmd;
+    }
 
+    private String checkPath(String path) {
+        String[] dirs = path.split(":");
+        StringBuilder checkedPath = new StringBuilder(path.length());
+        for (String dirname : dirs) {
+            File dir = new File(dirname);
+            if (dir.isDirectory() && FileCompat.canExecute(dir)) {
+                checkedPath.append(dirname);
+                checkedPath.append(":");
             }
-            session = createTermSession(this, settings, scmd, "");
+        }
+        return checkedPath.substring(0, checkedPath.length() - 1);
+    }
 
-        } else {
+    private class EmulatorViewGestureListener extends SimpleOnGestureListener {
+        private EmulatorView view;
 
-            //String content = FileHelper.getFileContents(mArgs[0]);
-            //String cmd = settings.getInitialCommand().equals("")?scmd:settings.getInitialCommand();
-            if (mArgs.length<3) {
-                session = createTermSession(this, settings, scmd+" \""+ StringUtils.addSlashes(mArgs[0])+"\" && exit", mArgs[1]);
-                mArgs = null;
-            } else {
-                String cm = "";
-                for (int i=0;i<mArgs.length-1;i++) {
-                    cm += " "+mArgs[i]+" ";
+        EmulatorViewGestureListener(EmulatorView view) {
+            this.view = view;
+        }
+
+        @Override
+        public boolean onSingleTapUp(MotionEvent e) {
+            // Let the EmulatorView handle taps if mouse tracking is active
+            if (view.isMouseTrackingActive()) return false;
+
+            //Check for link at tap location
+            String link = view.getURLat(e.getX(), e.getY());
+            if (link != null)
+                execURL(link);
+            else
+                doUIToggle((int) e.getX(), (int) e.getY(), view.getVisibleWidth(), view.getVisibleHeight());
+            return true;
+        }
+
+        @Override
+        public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX, float velocityY) {
+            float absVelocityX = Math.abs(velocityX);
+            float absVelocityY = Math.abs(velocityY);
+            if (absVelocityX > Math.max(1000.0f, 2.0 * absVelocityY)) {
+                // Assume user wanted side to side movement
+                int windowCount = spinner.getCount();
+                int index = spinner.getSelectedItemPosition();
+                if (velocityX > 0) {
+                    // Left to right swipe -- previous window
+                    mViewFlipper.showPrevious();
+                    spinner.setSelection(index - 1 >= 0 ? spinner.getSelectedItemPosition() - 1 : windowCount);
+                } else {
+                    // Right to left swipe -- next window
+                    mViewFlipper.showNext();
+                    spinner.setSelection(index + 1 < windowCount ? index + 1 : 0);
                 }
-                session = createTermSession(this, settings, scmd+" "+cm+" && exit", mArgs[1]);
-                mArgs = null;
+                return true;
+            } else {
+                return false;
             }
         }
-        session.setFinishCallback(mTermService);
-        return session;
     }
 
+    private class WindowTitleAdapter extends ArrayAdapter<TermSession> implements UpdateCallback {
+
+        WindowTitleAdapter(@NonNull Context context, List<TermSession> dataList) {
+            super(context, android.R.layout.simple_spinner_item, dataList);
+        }
+
+        @NonNull
+        @Override
+        public View getView(int position, @Nullable View convertView, @NonNull ViewGroup parent) {
+            TextView tv = new TextView(parent.getContext());
+            tv.setText(getString(R.string.window_title, position + 1));
+            tv.setTextAppearance(parent.getContext(), R.style.toolbar_text);
+            return tv;
+        }
+
+        @Override
+        public View getDropDownView(int position, @Nullable View convertView, @NonNull ViewGroup parent) {
+            convertView = LayoutInflater.from(parent.getContext()).inflate(R.layout.window_list_item, null);
+            TextView tv = (TextView) convertView.findViewById(R.id.window_list_label);
+            tv.setText(getString(R.string.window_title, position + 1));
+            convertView.findViewById(R.id.window_list_close).setOnClickListener(v -> {
+                TermSession session = mTermSessions.remove(position);
+                if (session != null) {
+                    session.finish();
+                    notifyDataSetChanged();
+                }
+            });
+            return convertView;
+        }
 
+        @Override
+        public void onUpdate() {
+            notifyDataSetChanged();
+        }
+    }
 }
diff --git a/qpython/src/main/java/org/qpython/qpy/console/TermPreferences.java b/qpython/src/main/java/org/qpython/qpy/console/TermPreferences.java
index c50069b5..158f111e 100644
--- a/qpython/src/main/java/org/qpython/qpy/console/TermPreferences.java
+++ b/qpython/src/main/java/org/qpython/qpy/console/TermPreferences.java
@@ -25,7 +25,7 @@
 
 import org.qpython.qpy.console.compont.ActionBarCompat;
 import org.qpython.qpy.console.compont.ActivityCompat;
-import org.qpython.qpy.console.compont.AndroidCompat;
+import org.qpython.qpysdk.utils.AndroidCompat;
 
 
 public class TermPreferences extends PreferenceActivity {
diff --git a/qpython/src/main/java/org/qpython/qpy/console/TermService.java b/qpython/src/main/java/org/qpython/qpy/console/TermService.java
index 38948b52..9674b508 100644
--- a/qpython/src/main/java/org/qpython/qpy/console/TermService.java
+++ b/qpython/src/main/java/org/qpython/qpy/console/TermService.java
@@ -15,16 +15,22 @@
  */
 
 
+import android.app.Notification;
+import android.app.NotificationChannel;
+import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.app.Service;
+import android.content.Context;
 import android.content.Intent;
 import android.content.IntentSender;
 import android.content.SharedPreferences;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
+import android.graphics.Color;
 import android.net.Uri;
 import android.os.Binder;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.IBinder;
@@ -32,9 +38,11 @@
 import android.os.ParcelFileDescriptor;
 import android.os.ResultReceiver;
 import android.preference.PreferenceManager;
+import android.support.annotation.RequiresApi;
 import android.text.TextUtils;
 import android.util.Log;
 
+import org.qpython.qpy.R;
 import org.qpython.qpy.console.compont.ServiceForegroundCompat;
 import org.qpython.qpy.console.util.SessionList;
 import org.qpython.qpy.console.util.TermSettings;
@@ -48,8 +56,7 @@
 
 public class TermService extends Service implements TermSession.FinishCallback {
     /* Parallels the value of START_STICKY on API Level >= 5 */
-    private static final int COMPAT_START_STICKY = 1;
-
+    public static final  int NOTIFICATION_ID      = 40530;
     private static final int RUNNING_NOTIFICATION = 1;
     private ServiceForegroundCompat compat;
 
@@ -70,7 +77,42 @@ public void onStart(Intent intent, int flags) {
 
     /* This should be @Override if building with API Level >=5 */
     public int onStartCommand(Intent intent, int flags, int startId) {
-        return COMPAT_START_STICKY;
+        Intent resultIntent = new Intent(this, TermActivity.class);
+        resultIntent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
+        PendingIntent pendingIntent = PendingIntent.getActivity(this, 0, resultIntent, PendingIntent.FLAG_ONE_SHOT);
+
+        Notification.Builder builder;
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) {
+            builder = new Notification.Builder(this, createNotificationChannel());
+        } else {
+            builder = new Notification.Builder(this);
+        }
+
+        builder.setContentTitle(getString(R.string.qpy_console))
+                .setContentIntent(pendingIntent)
+                .setContentText(getString(R.string.console_running))
+                .setSmallIcon(R.drawable.terminal_mini_icon);
+        Notification notification;
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN) {
+            notification = builder.build();
+        } else {
+            notification = builder.getNotification();
+        }
+        startForeground(NOTIFICATION_ID, notification);
+        return START_STICKY;
+    }
+
+    @RequiresApi(api = Build.VERSION_CODES.O)
+    private String createNotificationChannel() {
+        String channelId = "my_service";
+        String channelName = "My Background Service";
+        NotificationChannel chan = new NotificationChannel(channelId, channelName,
+                NotificationManager.IMPORTANCE_NONE);
+        chan.setLightColor(Color.BLUE);
+        chan.setLockscreenVisibility(Notification.VISIBILITY_PRIVATE);
+        NotificationManager service = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
+        service.createNotificationChannel(chan);
+        return channelId;
     }
 
     @Override
@@ -94,8 +136,7 @@ public void onCreate() {
         String defValue = getDir("HOME", MODE_PRIVATE).getAbsolutePath();
         String homePath = prefs.getString("home_path", defValue);
         editor.putString("home_path", homePath);
-        editor.commit();
-
+        editor.apply();
         compat = new ServiceForegroundCompat(this);
         mTermSessions = new SessionList();
 
@@ -184,7 +225,7 @@ public void run() {
                                     session.setFinishCallback(new RBinderCleanupCallback(result, callback));
                                     session.setTitle("");
 
-                                    session.initializeEmulator(80, 24);
+                                    session.initializeEmulator(72, 24);
                                 } catch (Exception whatWentWrong) {
                                     Log.e("TermService", "Failed to bootstrap AIDL session: "
                                             + whatWentWrong.getMessage());
@@ -206,7 +247,7 @@ public void run() {
     }
 
     private final class RBinderCleanupCallback implements TermSession.FinishCallback {
-        private final PendingIntent result;
+        private final PendingIntent  result;
         private final ResultReceiver callback;
 
         public RBinderCleanupCallback(PendingIntent result, ResultReceiver callback) {
diff --git a/qpython/src/main/java/org/qpython/qpy/console/TermViewFlipper.java b/qpython/src/main/java/org/qpython/qpy/console/TermViewFlipper.java
index 7f69c8ae..8c7dcd71 100644
--- a/qpython/src/main/java/org/qpython/qpy/console/TermViewFlipper.java
+++ b/qpython/src/main/java/org/qpython/qpy/console/TermViewFlipper.java
@@ -16,10 +16,12 @@
 
 
 import android.content.Context;
+import android.content.res.Resources;
 import android.graphics.Canvas;
 import android.graphics.Rect;
 import android.os.Handler;
 import android.util.AttributeSet;
+import android.util.TypedValue;
 import android.view.Gravity;
 import android.view.View;
 import android.widget.Toast;
@@ -39,27 +41,27 @@
 
 
 public class TermViewFlipper extends ViewFlipper implements Iterable<View> {
-    private Context context;
-    private Toast mToast;
+    private Context                    context;
+    private Toast                      mToast;
     private LinkedList<UpdateCallback> callbacks;
     private boolean mStatusBarVisible = false;
 
     private int mCurWidth;
     private int mCurHeight;
-    private Rect mVisibleRect = new Rect();
-    private Rect mWindowRect = new Rect();
+    private Rect         mVisibleRect = new Rect();
+    private Rect         mWindowRect  = new Rect();
     private LayoutParams mChildParams = null;
-    private boolean mRedoLayout = false;
+    private boolean      mRedoLayout  = false;
 
     /**
      * True if we must poll to discover if the view has changed size.
      * This is the only known way to detect the view changing size due to
      * the IME being shown or hidden in API level <= 7.
      */
-    private final boolean mbPollForWindowSizeChange = (AndroidCompat.SDK < 8);
-    private static final int SCREEN_CHECK_PERIOD = 1000;
-    private final Handler mHandler = new Handler();
-    private Runnable mCheckSize = new Runnable() {
+    private final        boolean  mbPollForWindowSizeChange = (AndroidCompat.SDK < 8);
+    private static final int      SCREEN_CHECK_PERIOD       = 1000;
+    private final        Handler  mHandler                  = new Handler();
+    private              Runnable mCheckSize                = new Runnable() {
         public void run() {
             adjustChildSize();
             mHandler.postDelayed(this, SCREEN_CHECK_PERIOD);
@@ -177,13 +179,13 @@ private void showTitle() {
             title = ((GenericTermSession) session).getTitle(title);
         }
 
-        if (mToast == null) {
-            mToast = Toast.makeText(context, title, Toast.LENGTH_SHORT);
-            mToast.setGravity(Gravity.CENTER, 0, 0);
-        } else {
-            mToast.setText(title);
-        }
-        mToast.show();
+//        if (mToast == null) {
+//            mToast = Toast.makeText(context, title, Toast.LENGTH_SHORT);
+//            mToast.setGravity(Gravity.CENTER, 0, 0);
+//        } else {
+//            mToast.setText(title);
+//        }
+//        mToast.show();
     }
 
     @Override
@@ -257,7 +259,13 @@ the activity (takes other views in the layout into account, but
         /* XXX This breaks with a split action bar, but if we don't do this,
            it's possible that the view won't resize correctly on IME hide */
         visible.right = window.right;
-        visible.bottom = window.bottom;
+        visible.bottom = (int) (window.bottom - getShortcutMenu());
+    }
+
+    private float getShortcutMenu() {
+        Resources r = Resources.getSystem();
+        // 45 means shortcutMenu's dimension
+        return TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 45, r.getDisplayMetrics());
     }
 
     private void adjustChildSize() {
diff --git a/qpython/src/main/java/org/qpython/qpy/console/compont/ActionBarCompat.java b/qpython/src/main/java/org/qpython/qpy/console/compont/ActionBarCompat.java
index 749247a4..8d900607 100644
--- a/qpython/src/main/java/org/qpython/qpy/console/compont/ActionBarCompat.java
+++ b/qpython/src/main/java/org/qpython/qpy/console/compont/ActionBarCompat.java
@@ -18,6 +18,8 @@
 import android.app.ActionBar;
 import android.widget.SpinnerAdapter;
 
+import org.qpython.qpysdk.utils.AndroidCompat;
+
 /**
  * Provides ActionBar APIs.
  */
diff --git a/qpython/src/main/java/org/qpython/qpy/console/compont/ActivityCompat.java b/qpython/src/main/java/org/qpython/qpy/console/compont/ActivityCompat.java
index e6b73e37..e4d518e6 100644
--- a/qpython/src/main/java/org/qpython/qpy/console/compont/ActivityCompat.java
+++ b/qpython/src/main/java/org/qpython/qpy/console/compont/ActivityCompat.java
@@ -17,6 +17,8 @@
 
 import android.app.Activity;
 
+import org.qpython.qpysdk.utils.AndroidCompat;
+
 
 /**
  * Compatibility class for android.app.Activity
diff --git a/qpython/src/main/java/org/qpython/qpy/console/compont/AlertDialogCompat.java b/qpython/src/main/java/org/qpython/qpy/console/compont/AlertDialogCompat.java
index 7ffe50ba..47f4b0f4 100644
--- a/qpython/src/main/java/org/qpython/qpy/console/compont/AlertDialogCompat.java
+++ b/qpython/src/main/java/org/qpython/qpy/console/compont/AlertDialogCompat.java
@@ -1,8 +1,10 @@
 package org.qpython.qpy.console.compont;
 
-import android.app.AlertDialog;
+import android.support.v7.app.AlertDialog;
 import android.content.Context;
 
+import org.qpython.qpysdk.utils.AndroidCompat;
+
 public class AlertDialogCompat extends AlertDialog {
     // API 11
     public static int THEME_HOLO_TRADITIONAL = 1;
@@ -21,28 +23,6 @@ private AlertDialogCompat(Context context, boolean cancelable, OnCancelListener
         super(context, cancelable, cancelListener);
     }
 
-    ////////////////////////////////////////////////////////////
-    private static class Api11OrLater extends AlertDialog {
-        public Api11OrLater(Context context, int theme) {
-            super(context, theme);
-        }
-
-        public Api11OrLater(Context context, boolean cancelable, OnCancelListener cancelListener) {
-            super(context, cancelable, cancelListener);
-        }
-    }
-
-    ////////////////////////////////////////////////////////////
-    private static class Api14OrLater extends AlertDialog {
-        public Api14OrLater(Context context, int theme) {
-            super(context, theme);
-        }
-
-        public Api14OrLater(Context context, boolean cancelable, OnCancelListener cancelListener) {
-            super(context, cancelable, cancelListener);
-        }
-    }
-
     ////////////////////////////////////////////////////////////
     public static AlertDialog newInstance(Context context) {
         return (new AlertDialogCompat(context));
@@ -63,7 +43,6 @@ public static AlertDialog newInstance(Context context, int theme) {
     public static AlertDialog newInstance(Context context, boolean cancelable, OnCancelListener cancelListener) {
         return (new AlertDialogCompat(context, cancelable, cancelListener));
     }
-    ////////////////////////////////////////////////////////////
 
     public static Builder newInstanceBuilder(Context context, int theme) {
         if (AndroidCompat.SDK >= 11) {
@@ -73,6 +52,29 @@ public static Builder newInstanceBuilder(Context context, int theme) {
         }
     }
 
+    ////////////////////////////////////////////////////////////
+    private static class Api11OrLater extends AlertDialog {
+        public Api11OrLater(Context context, int theme) {
+            super(context, theme);
+        }
+
+        public Api11OrLater(Context context, boolean cancelable, OnCancelListener cancelListener) {
+            super(context, cancelable, cancelListener);
+        }
+    }
+    ////////////////////////////////////////////////////////////
+
+    ////////////////////////////////////////////////////////////
+    private static class Api14OrLater extends AlertDialog {
+        public Api14OrLater(Context context, int theme) {
+            super(context, theme);
+        }
+
+        public Api14OrLater(Context context, boolean cancelable, OnCancelListener cancelListener) {
+            super(context, cancelable, cancelListener);
+        }
+    }
+
     private static class Api11OrLaterBuilder extends Builder {
         public Api11OrLaterBuilder(Context context) {
             super(context);
diff --git a/qpython/src/main/java/org/qpython/qpy/console/compont/AndroidCompat.java b/qpython/src/main/java/org/qpython/qpy/console/compont/AndroidCompat.java
deleted file mode 100644
index f353dd7a..00000000
--- a/qpython/src/main/java/org/qpython/qpy/console/compont/AndroidCompat.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package org.qpython.qpy.console.compont;
-
-/**
- * The classes in this package take advantage of the fact that the VM does
- * not attempt to load a class until it's accessed, and the verifier
- * does not run until a class is loaded.  By keeping the methods which
- * are unavailable on older platforms in subclasses which are only ever
- * accessed on platforms where they are available, we can preserve
- * compatibility with older platforms without resorting to reflection.
- * <p>
- * See http://developer.android.com/resources/articles/backward-compatibility.html
- * and http://android-developers.blogspot.com/2010/07/how-to-have-your-cupcake-and-eat-it-too.html
- * for further discussion of this technique.
- */
-
-public class AndroidCompat {
-    public final static int SDK = getSDK();
-
-    // The era of Holo Design
-    public final static boolean V11ToV20;
-
-    static {
-        V11ToV20 = (SDK >= 11) && (SDK <= 20);
-    }
-
-    private final static int getSDK() {
-        int result;
-        try {
-            result = AndroidLevel4PlusCompat.getSDKInt();
-        } catch (VerifyError e) {
-            // We must be at an SDK level less than 4.
-            try {
-                result = Integer.valueOf(android.os.Build.VERSION.SDK);
-            } catch (NumberFormatException e2) {
-                // Couldn't parse string, assume the worst.
-                result = 1;
-            }
-        }
-        return result;
-    }
-}
-
-class AndroidLevel4PlusCompat {
-    static int getSDKInt() {
-        return android.os.Build.VERSION.SDK_INT;
-    }
-}
diff --git a/qpython/src/main/java/org/qpython/qpy/console/compont/Base64.java b/qpython/src/main/java/org/qpython/qpy/console/compont/Base64.java
index ddf99cfd..5f945d36 100644
--- a/qpython/src/main/java/org/qpython/qpy/console/compont/Base64.java
+++ b/qpython/src/main/java/org/qpython/qpy/console/compont/Base64.java
@@ -45,8 +45,8 @@ public class Base64 {
     public static final int NO_PADDING = 1;
 
     /**
-     * Encoder flag bit to omit all line terminators (i.e., the output
-     * will be on one long line).
+     * Encoder flag bit to omit all PATTERN_LINE terminators (i.e., the output
+     * will be on one long PATTERN_LINE).
      */
     public static final int NO_WRAP = 2;
 
@@ -293,7 +293,7 @@ public boolean process(byte[] input, int offset, int len, boolean finish) {
                 // If any of the next four bytes of input are non-data
                 // (whitespace, etc.), value will end up negative.  (All
                 // the non-data values in decode are small negative
-                // numbers, so shifting any of them up and or'ing them
+                // PATTERN_NUMBER, so shifting any of them up and or'ing them
                 // together will result in a value with its top bit set.)
                 //
                 // You can remove this whole block and the output should
@@ -552,8 +552,8 @@ public static byte[] encode(byte[] input, int offset, int len, int flags) {
 
     /* package */ static class Encoder extends Coder {
         /**
-         * Emit a new line every this many output tuples.  Corresponds to
-         * a 76-character line length (the maximum allowable according to
+         * Emit a new PATTERN_LINE every this many output tuples.  Corresponds to
+         * a 76-character PATTERN_LINE length (the maximum allowable according to
          * <a href="http://www.ietf.org/rfc/rfc2045.txt">RFC 2045</a>).
          */
         public static final int LINE_GROUPS = 19;
diff --git a/qpython/src/main/java/org/qpython/qpy/console/compont/FileCompat.java b/qpython/src/main/java/org/qpython/qpy/console/compont/FileCompat.java
index daf555c3..af8ff8e5 100644
--- a/qpython/src/main/java/org/qpython/qpy/console/compont/FileCompat.java
+++ b/qpython/src/main/java/org/qpython/qpy/console/compont/FileCompat.java
@@ -15,6 +15,8 @@
  */
 
 
+import org.qpython.qpysdk.utils.AndroidCompat;
+
 import java.io.File;
 
 /**
@@ -29,7 +31,7 @@ public static boolean canExecute(File file) {
 
     private static class Api8OrEarlier {
         static {
-            System.loadLibrary("jackpal-androidterm5");
+            System.loadLibrary("androidterm");
         }
 
         public static boolean canExecute(File file) {
diff --git a/qpython/src/main/java/org/qpython/qpy/console/compont/MenuItemCompat.java b/qpython/src/main/java/org/qpython/qpy/console/compont/MenuItemCompat.java
index eb4a1bf3..306e6085 100644
--- a/qpython/src/main/java/org/qpython/qpy/console/compont/MenuItemCompat.java
+++ b/qpython/src/main/java/org/qpython/qpy/console/compont/MenuItemCompat.java
@@ -2,6 +2,8 @@
 
 import android.view.MenuItem;
 
+import org.qpython.qpysdk.utils.AndroidCompat;
+
 /**
  * Definitions related to android.view.MenuItem
  */
diff --git a/qpython/src/main/java/org/qpython/qpy/console/compont/PRNGFixes.java b/qpython/src/main/java/org/qpython/qpy/console/compont/PRNGFixes.java
index 26db3ff8..6ecf0f17 100644
--- a/qpython/src/main/java/org/qpython/qpy/console/compont/PRNGFixes.java
+++ b/qpython/src/main/java/org/qpython/qpy/console/compont/PRNGFixes.java
@@ -22,6 +22,8 @@
 import android.os.Process;
 import android.util.Log;
 
+import org.qpython.qpysdk.utils.AndroidCompat;
+
 import java.io.ByteArrayOutputStream;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
@@ -227,7 +229,7 @@ protected void engineSetSeed(byte[] bytes) {
                 out.flush();
             } catch (IOException e) {
                 // On a small fraction of devices /dev/urandom is not writable.
-                // Log and ignore.
+                // LogUtil and ignore.
                 Log.w(PRNGFixes.class.getSimpleName(),
                         "Failed to mix seed into " + URANDOM_FILE);
             } finally {
diff --git a/qpython/src/main/java/org/qpython/qpy/console/shortcuts/ColorValue.java b/qpython/src/main/java/org/qpython/qpy/console/shortcuts/ColorValue.java
index 040de833..48e94249 100644
--- a/qpython/src/main/java/org/qpython/qpy/console/shortcuts/ColorValue.java
+++ b/qpython/src/main/java/org/qpython/qpy/console/shortcuts/ColorValue.java
@@ -1,6 +1,6 @@
 package org.qpython.qpy.console.shortcuts;
 
-import android.app.AlertDialog;
+import android.support.v7.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.graphics.Typeface;
@@ -22,16 +22,16 @@
 //////////////////////////////////////////////////////////////////////
 public class ColorValue implements CompoundButton.OnCheckedChangeListener {
     private final Context context;
-    private EditText value;
     private final int[] color = {0xFF, 0, 0, 0};
-    private boolean started = false;
-    private AlertDialogCompat.Builder builder;
-    private boolean barLock = false;
     private final boolean[] locks = {false, false, false, false};
     private final int FP = LinearLayout.LayoutParams.FILL_PARENT;
     private final int WC = LinearLayout.LayoutParams.WRAP_CONTENT;
     private final ImageView imgview;
     private final String result[];
+    private EditText value;
+    private boolean started = false;
+    private AlertDialogCompat.Builder builder;
+    private boolean barLock = false;
     private String imgtext = "";
 
     ////////////////////////////////////////////////////////////
diff --git a/qpython/src/main/java/org/qpython/qpy/console/shortcuts/FSNavigator.java b/qpython/src/main/java/org/qpython/qpy/console/shortcuts/FSNavigator.java
index 66d7c600..3a95584c 100644
--- a/qpython/src/main/java/org/qpython/qpy/console/shortcuts/FSNavigator.java
+++ b/qpython/src/main/java/org/qpython/qpy/console/shortcuts/FSNavigator.java
@@ -271,7 +271,7 @@ private ImageView imageViewFolder(boolean up) {
                         , 1
                 )
         );
-        b1.setImageResource(up ? R.drawable.ic_folderup : R.drawable.ic_folder);
+        b1.setImageResource(up ? R.drawable.prev : R.drawable.ic_editor_folder);
         b1.setOnClickListener(directoryListener);
         b1.setScaleType(ImageView.ScaleType.CENTER_INSIDE);
         return (b1);
diff --git a/qpython/src/main/java/org/qpython/qpy/main/activity/AboutActivity.java b/qpython/src/main/java/org/qpython/qpy/main/activity/AboutActivity.java
index c20400c2..ad5a7853 100644
--- a/qpython/src/main/java/org/qpython/qpy/main/activity/AboutActivity.java
+++ b/qpython/src/main/java/org/qpython/qpy/main/activity/AboutActivity.java
@@ -1,84 +1,162 @@
-package org.qpython.qpy.main.activity;
-
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.Toolbar;
-import android.widget.RelativeLayout;
-
-import com.quseit.common.updater.Updater;
-import com.quseit.common.updater.callback.DialogCallback;
-import org.qpython.qpy.R;
-import org.qpython.qpy.plugin.activity.PluginManagerActivity;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-import butterknife.OnClick;
-import butterknife.Unbinder;
-
-/**
- * Created by mathiasluo on 16-5-29.
- */
-
-public class AboutActivity extends BaseActivity {
-    private Unbinder mUnbinder;
-
-    @BindView(R.id.toolbar)
-    Toolbar mToolbar;
-    @BindView(R.id.setting_about_layout)
-    RelativeLayout mAboutLayout;
-    @BindView(R.id.setting_feedback_layout)
-    RelativeLayout mFeedbackLayout;
-    @BindView(R.id.setting_mark_layout)
-    RelativeLayout mMarkLayout;
-    @BindView(R.id.setting_lib_manager)
-    RelativeLayout mLibManagerLayout;
-    @BindView(R.id.setting_sl4a_server)
-    RelativeLayout mSl4aServerLayout;
-    @BindView(R.id.setting_normal_program)
-    RelativeLayout mNormalProgramLayout;
-    @BindView(R.id.setting_qpypi)
-    RelativeLayout mQpypiLayout;
-    @BindView(R.id.setting_internal_space)
-    RelativeLayout mClearSpaceLayout;
-    @BindView(R.id.setting_ftp_server)
-    RelativeLayout mFtpServerLayout;
-
-
-    public static final void startActivity(Context context) {
-        Intent intent = new Intent(context, AboutActivity.class);
-        context.startActivity(intent);
-    }
-
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_about);
-        mUnbinder = ButterKnife.bind(this);
-        init();
-    }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        mUnbinder.unbind();
-    }
-
-    private void init() {
-        mToolbar.setTitle(getString(R.string.setting_about));
-        setSupportActionBar(mToolbar);
-        mToolbar.setNavigationIcon(R.drawable.ic_arrow_back);
-        mToolbar.setNavigationOnClickListener(view -> AboutActivity.this.finish());
-    }
-
-    @OnClick(R.id.setting_update)
-    void checkUpdate() {
-        Updater.checkUpdate(new DialogCallback(this, false));
-    }
-
-    @OnClick(R.id.setting_lib_manager)
-    void startPluginManagerActivity() {
-        PluginManagerActivity.start(this);
-    }
-}
+package org.qpython.qpy.main.activity;
+
+import android.app.ProgressDialog;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.databinding.DataBindingUtil;
+import android.net.Uri;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.app.AlertDialog;
+import android.support.v7.widget.Toolbar;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.widget.Toast;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.databinding.ActivityAboutBinding;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.server.MySubscriber;
+import org.qpython.qpy.main.server.model.UpdateModel;
+import org.qpython.qpy.texteditor.androidlib.common.MiscUtils;
+
+
+/**
+ * About page
+ * Created by Hmei on 2017-05-27.
+ */
+
+public class AboutActivity extends BaseActivity {
+    ActivityAboutBinding binding;
+    ProgressDialog       progressDialog;
+
+    public static void start(Context context) {
+        Intent starter = new Intent(context, AboutActivity.class);
+        context.startActivity(starter);
+    }
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        binding = DataBindingUtil.setContentView(this, R.layout.activity_about);
+        try {
+            PackageInfo pInfo = this.getPackageManager().getPackageInfo(getPackageName(), 0);
+            String version = pInfo.versionName;
+            binding.version.setText(getString(R.string.v_version, version));
+        } catch (PackageManager.NameNotFoundException e) {
+            e.printStackTrace();
+        }
+        progressDialog = new ProgressDialog(this);
+        progressDialog.setMessage(getString(R.string.checking_update));
+        Toolbar myToolbar = findViewById(R.id.toolbar);
+        setSupportActionBar(myToolbar);
+        setTitle(R.string.about);
+        myToolbar.setNavigationIcon(R.drawable.ic_back);
+        myToolbar.setNavigationOnClickListener(view -> finish());
+
+        initListener();
+        checkUpdate(true);
+    }
+
+    private void initListener() {
+        binding.tvStar.setOnClickListener(v -> {
+            Intent viewIntent = new Intent("android.intent.action.VIEW",
+                    Uri.parse("market://details?id=" + getPackageName()));
+            startActivity(viewIntent);
+        });
+
+        binding.tvPrivacy.setOnClickListener(v -> {
+            Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.privacy_html)));
+            startActivity(browserIntent);
+        });
+
+        binding.tvFeedback.setOnClickListener(v -> onFeedback(""));
+
+        binding.tvUpdate.setOnClickListener(v -> {
+            checkUpdate(false);
+            progressDialog.show();
+        });
+
+        binding.tvThanks.setOnClickListener(v ->
+            startActivity(new Intent(Intent.ACTION_VIEW,Uri.parse(getString(R.string.thanks_link))))
+        );
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.about_menu, menu);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.menu_mail:
+//                MiscUtils.sendEMailTo(getString(R.string.ui_mail), getPackageManager().getApplicationLabel(getApplicationInfo()).toString());
+                onFeedback("");
+                break;
+            case R.id.menu_share:
+                MiscUtils.share(this, getString(R.string.share_text));
+                break;
+        }
+        return true;
+    }
+
+    private void checkUpdate(boolean open) {
+        App.getService().checkUpdate(new MySubscriber<UpdateModel>() {
+            @Override
+            public void onCompleted() {
+                if (progressDialog.isShowing()) {
+                    progressDialog.dismiss();
+                }
+            }
+
+            @Override
+            public void onError(Throwable e) {
+                super.onError(e);
+                if (progressDialog.isShowing()) {
+                    progressDialog.dismiss();
+                }
+            }
+
+            @Override
+            public void onNext(UpdateModel updateModel) {
+                PackageInfo pInfo;
+                try {
+                    pInfo = getPackageManager().getPackageInfo(getPackageName(), 0);
+                    int verCode = pInfo.versionCode;
+                    String verName = pInfo.versionName;
+                    if (verCode < updateModel.getApp().getVer()) {
+                        binding.tvNewHint.setText("");
+                        binding.tvNewHint.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_about_new, 0);
+                        if (open) {
+                            return;// 打开界面无需显示dialog
+                        }
+                        AlertDialog alertDialog = new AlertDialog.Builder(AboutActivity.this, R.style.MyDialog)
+                                .setTitle(R.string.download_apk)
+                                .setMessage(R.string.download_apk_hint)
+                                .setPositiveButton(R.string.confirm,
+                                        ((dialog, which) ->
+                                                App.getService().downloadFile(
+                                                        updateModel.getApp().getLink(),
+                                                        getString(R.string.app_name),
+                                                        getString(R.string.downloading_new_apk))))
+                                .setNegativeButton(R.string.cancel, null)
+                                .create();
+                        alertDialog.show();
+                    } else {
+                        binding.tvNewHint.setText(R.string.already_newest);
+                        if (open) {
+                            return;
+                        }
+                        Toast.makeText(AboutActivity.this, getString(R.string.already_newest_current_version) + " " + verName, Toast.LENGTH_LONG).show();
+                    }
+                } catch (PackageManager.NameNotFoundException e) {
+                    e.printStackTrace();
+                }
+            }
+        });
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/activity/AppListActivity.java b/qpython/src/main/java/org/qpython/qpy/main/activity/AppListActivity.java
new file mode 100644
index 00000000..e964f622
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/activity/AppListActivity.java
@@ -0,0 +1,197 @@
+package org.qpython.qpy.main.activity;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.LoaderManager;
+import android.content.Context;
+import android.content.Intent;
+import android.content.Loader;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.GridLayoutManager;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.widget.TextView;
+
+import com.quseit.util.FileHelper;
+import com.quseit.util.FolderUtils;
+import com.quseit.util.NAction;
+
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
+import org.qpython.qpy.R;
+import org.qpython.qpy.console.ScriptExec;
+import org.qpython.qpy.main.adapter.AppListAdapter;
+import org.qpython.qpy.main.event.AppsLoader;
+import org.qpython.qpy.main.model.AppModel;
+import org.qpython.qpy.main.model.QPyScriptModel;
+import org.qpython.qpysdk.QPyConstants;
+import org.qpython.qpysdk.utils.Utils;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * Local App list
+ * Created by Hmei on 2017-05-22.
+ */
+
+public class AppListActivity extends BaseActivity implements LoaderManager.LoaderCallbacks<ArrayList<AppModel>> {
+    public static final String TYPE_SCRIPT = "script";
+
+    private List<AppModel> dataList;
+    private AppListAdapter adapter;
+
+    public static void start(Context context, String type) {
+        Intent starter = new Intent(context, AppListActivity.class);
+        starter.putExtra("type", type);
+        context.startActivity(starter);
+    }
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        runShortcut();
+        setContentView(R.layout.activity_local_app);
+        initView();
+        EventBus.getDefault().register(this);
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        if (needLog && event != null) {
+            showLogDialog(event);
+            needLog = false;
+        }
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        EventBus.getDefault().unregister(this);
+    }
+
+    private void runShortcut() {
+        if (Intent.ACTION_VIEW.equals(getIntent().getAction())) {
+            String path = getIntent().getStringExtra("path");
+            boolean isProj = getIntent().getBooleanExtra("isProj", false);
+            if (isProj) {
+                ScriptExec.getInstance().playProject(this, path, false);
+            } else {
+                ScriptExec.getInstance().playScript(this, path, null, false);
+            }
+            finish();
+        }
+    }
+
+    private void initView() {
+        dataList = new ArrayList<>();
+        adapter = new AppListAdapter(dataList, getIntent().getStringExtra("type"), this);
+        adapter.setCallback(new AppListAdapter.Callback() {
+            @Override
+            public void runScript(QPyScriptModel item) {
+                ScriptExec.getInstance().playScript(AppListActivity.this, item.getPath(), null, false);
+            }
+
+            @Override
+            public void runProject(QPyScriptModel item) {
+                ScriptExec.getInstance().playProject(AppListActivity.this, item.getPath(), false);
+            }
+
+            @Override
+            public void exit() {
+                AppListActivity.this.finish();
+            }
+        });
+
+        RecyclerView appsView = findViewById(R.id.rv_app);
+        GridLayoutManager mLayoutManager = new GridLayoutManager(this, 3, LinearLayoutManager.VERTICAL, false);
+        appsView.setLayoutManager(mLayoutManager);
+        appsView.setAdapter(adapter);
+
+        ((TextView) findViewById(R.id.tv_folder_name)).setText(R.string.qpy_app);
+        getScriptList();
+    }
+
+
+    private void getScriptList() {
+        try {
+            String projectPath = NAction.isQPy3(this.getApplicationContext())? QPyConstants.DFROM_PRJ3:QPyConstants.DFROM_PRJ2;
+            File[] projectFiles = FileHelper.getABSPath(QPyConstants.ABSOLUTE_PATH + "/" + projectPath).listFiles();
+            if (projectFiles != null) {
+                Arrays.sort(projectFiles, FolderUtils.sortByName);
+                dataList.clear();
+                for (File file : projectFiles) {
+                    if (file.isDirectory()) {
+                        dataList.add(new QPyScriptModel(file));
+                    }
+                }
+            }
+            String scriptPath = NAction.isQPy3(this.getApplicationContext())?QPyConstants.DFROM_QPY3:QPyConstants.DFROM_QPY2;
+
+            File[] files = FileHelper.getFilesByType(FileHelper.getABSPath(QPyConstants.ABSOLUTE_PATH + "/" + scriptPath));
+            if (files!=null && files.length > 0) {
+                Arrays.sort(files, FolderUtils.sortByName);
+                for (File file : files) {
+                    dataList.add(new QPyScriptModel(file));
+                }
+            }
+            adapter.notifyDataSetChanged();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Override
+    public Loader<ArrayList<AppModel>> onCreateLoader(int id, Bundle args) {
+        return new AppsLoader(this);
+    }
+
+    @Override
+    public void onLoadFinished(Loader<ArrayList<AppModel>> loader, ArrayList<AppModel> data) {
+        dataList.addAll(data);
+        adapter.notifyDataSetChanged();
+    }
+
+    @Override
+    public void onLoaderReset(Loader<ArrayList<AppModel>> loader) {
+        dataList.clear();
+        adapter.notifyDataSetChanged();
+    }
+
+    boolean              needLog;
+    ScriptExec.LogDialog event;
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onEventMainThread(ScriptExec.LogDialog event) {
+        this.event = event;
+        needLog = true;
+    }
+
+    public void showLogDialog(ScriptExec.LogDialog event) {
+        AlertDialog alertDialog = new AlertDialog.Builder(this, R.style.MyDialog)
+                .setTitle(R.string.last_log)
+                .setMessage(com.quseit.qpyengine.R.string.open_log)
+                .setNegativeButton(R.string.no, ((dialog, which) -> dialog.dismiss()))
+                .setPositiveButton(R.string.ok, (dialog, which) -> {
+
+                    Utils.checkRunTimeLog(this, event.title, event.path);
+
+                    dialog.dismiss();
+                })
+                .create();
+        alertDialog.show();
+    }
+
+    @Override
+    public void finish() {
+        super.finish();
+        overridePendingTransition(0, R.anim.fade_out);
+    }
+}
\ No newline at end of file
diff --git a/qpython/src/main/java/org/qpython/qpy/main/activity/BaseActivity.java b/qpython/src/main/java/org/qpython/qpy/main/activity/BaseActivity.java
deleted file mode 100644
index 64a78ec9..00000000
--- a/qpython/src/main/java/org/qpython/qpy/main/activity/BaseActivity.java
+++ /dev/null
@@ -1,646 +0,0 @@
-package org.qpython.qpy.main.activity;
-
-import android.app.NotificationManager;
-import android.content.Context;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.content.pm.PackageManager;
-import android.os.Build;
-import android.os.Environment;
-import android.os.Handler;
-import android.os.Message;
-import android.preference.PreferenceManager;
-import android.support.annotation.NonNull;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.util.ArrayMap;
-import android.support.v7.app.AppCompatActivity;
-import android.util.Log;
-import android.widget.Toast;
-
-import com.umeng.analytics.MobclickAgent;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.qpython.qpy.R;
-import org.qpython.qpy.console.ShellTermSession;
-import org.qpython.qpy.console.TermActivity;
-import org.qpython.qpy.console.util.TermSettings;
-import org.qpython.qpy.main.utils.Utils;
-import org.qpython.qpysdk.utils.FileHelper;
-import org.qpython.qpysdk.utils.StreamGobbler;
-import org.qpython.qsl4a.qsl4a.util.SPFUtils;
-import org.renpy.android.PythonActivity;
-
-import java.io.File;
-import java.io.FileDescriptor;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-
-public class BaseActivity extends AppCompatActivity {
-    private Map<Integer, PermissionAction> mActionMap = new ArrayMap<>();
-
-    protected void toast(String content) {
-        Toast.makeText(this, content, Toast.LENGTH_SHORT).show();
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        MobclickAgent.onResume(this);
-    }
-
-    @Override
-    protected void onPause() {
-        super.onPause();
-        MobclickAgent.onPause(this);
-    }
-
-    @Override
-    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
-        PermissionAction action = mActionMap.get(requestCode);
-        if (action != null) {
-            if (grantResults[0] == PackageManager.PERMISSION_GRANTED) {
-                action.onGrant();
-            } else {
-                action.onDeny();
-            }
-        }
-        mActionMap.remove(action);
-    }
-
-    public final void checkPermissionDo(String permission, PermissionAction action) {
-        if (Build.VERSION.SDK_INT >= 23) {
-            int checkPermission = ContextCompat.checkSelfPermission(this, permission);
-            if (checkPermission != PackageManager.PERMISSION_GRANTED) {
-                int code = permission.hashCode() & 0xffff;
-                mActionMap.put(code, action);
-                ActivityCompat.requestPermissions(this, new String[]{permission}, code);
-            } else {
-                action.onGrant();
-            }
-        } else {
-            action.onGrant();
-        }
-    }
-
-    public interface PermissionAction {
-        void onGrant();
-
-        void onDeny();
-    }
-
-    // QPython interfaces
-    private static final int SCRIPT_EXEC_CODE = 1235;
-    private static final int SCRIPT_API_CODE = 1236;
-    private static final int SCRIPT_CONSOLE_CODE = 1237;
-
-    private TermSettings mSettings;
-    private SharedPreferences mPrefs;
-    private ShellTermSession session;
-
-    private static final int PID_INIT_VALUE = -1;
-    private static final int DEFAULT_BUFFER_SIZE = 8192;
-    ArrayList<String> mArguments = new ArrayList<String>();
-    InputStream mIn;
-    OutputStream mOut;
-    FileDescriptor mFd;
-
-
-    public void playScript(String script, String arg, boolean notify) {
-        Log.d("BaseActivity", "playScript:"+script);
-        File sf = new File(script);
-        String content = FileHelper.getFileContents(script);
-
-        boolean isProj = sf.getName().equals("main.py") || sf.getName().equals("main.pyo");
-        boolean isWeb = content.contains("#qpy:webapp");
-        boolean isQApp = content.contains("#qpy:qpyapp");
-        boolean isDrawer = content.contains("#qpy:drawer");
-
-        boolean isCons = ((!content.contains("#qpy:kivy") && !isQApp));
-
-        if (isWeb) {
-            boolean isNoHead = content.contains("#qpy:fullscreen");
-
-            String title = "QWebApp";
-            Pattern titlePattern = Pattern.compile("#qpy:webapp:(.+)", Pattern.CASE_INSENSITIVE);
-            Matcher matcher0 = titlePattern.matcher(content);
-            if (matcher0.find()) {
-                title = matcher0.group(1);
-            }
-
-            String srv = "http://localhost";
-            Pattern srvPattern = Pattern.compile("#qpy://(.+)[\\s]+", Pattern.CASE_INSENSITIVE);
-            Matcher matcher1 = srvPattern.matcher(content);
-
-            if (matcher1.find()) {
-                srv = "http://" + matcher1.group(1);
-            }
-
-            //Log.d(TAG, "title:"+title+"-srv:"+srv);
-            playWebApp(title, sf.getAbsolutePath(), srv, arg, isNoHead, isDrawer);
-
-        } else if (isCons) {
-
-            File log = new File(sf.getParentFile(), "last.log");
-            if (log.exists()) {    // clear log
-                log.delete();
-            }
-
-            String[] args = {script, sf.getParentFile().toString()};
-            execPyInConsole(args);
-
-        } else if (isQApp) {
-            if (Build.VERSION.SDK_INT <= 10) {
-                playWebViewSrv(script, arg, notify);
-            } else {
-                playQScript(script, arg, notify);
-            }
-
-        } else {
-
-            if (isProj) {
-                playProject(sf.getParentFile().getAbsolutePath(), notify);
-            } else {
-                File log = new File(sf.getParentFile(), ".run.log");
-
-                if (log.exists()) {    // clear log
-                    log.delete();
-                }
-
-                if (Utils.isOpenGL2supported(this)) {
-                    Intent intent = new Intent(this, PythonActivity.class);
-                    intent.putExtra(PythonActivity.EXTRA_CONTENT_URL1, "plusscript");
-                    intent.putExtra(PythonActivity.EXTRA_CONTENT_URL2, script);
-                    intent.putExtra(PythonActivity.EXTRA_CONTENT_URL5, notify ? "1" : "0");
-
-                    startActivity(intent);
-                } else {
-                    Toast.makeText(this, "OpenGL2 is not supported", Toast.LENGTH_SHORT).show();
-                    String[] args = {script, sf.getParentFile().toString()};
-                    execPyInConsole(args);
-                }
-            }
-        }
-    }
-
-    Handler hd = new Handler() {
-
-        public void handleMessage(Message msg) {//覆盖handleMessage方法
-            switch (msg.what) {
-                case 1:
-                    JSONArray ja  = (JSONArray) msg.obj;
-                    String url = "http://www.qpython.org";
-                    try {
-                        String script = ja.getString(2);
-                        url = ja.getString(1);
-                        String title = ja.getString(0);
-                        //Log.d("BaseActivity", "handler:title:"+title+"-url:"+url+"-script:"+script);
-
-                        Utils.startWebActivityWithUrl(getApplicationContext(), title, url, script, false, false);
-                    } catch (JSONException e) {
-
-                        e.printStackTrace();
-                    }
-
-//                    new FinestWebView.Builder(getApplicationContext())
-//                            .theme(R.style.WebViewTheme)
-//                            .titleDefault("QPythonWebApp")
-//                            .webViewBuiltInZoomControls(false)
-//                            .webViewDisplayZoomControls(false)
-//                            .dividerHeight(0)
-//                            .gradientDivider(false)
-//                            .swipeRefreshColorRes(R.color.colorAccent)
-//                            .setCustomAnimations(R.anim.activity_open_enter, R.anim.activity_open_exit, R.anim.activity_close_enter, R.anim.activity_close_exit)
-//                            .webViewJavaScriptEnabled(true)
-//                            .show(url);
-
-                    break;
-            }
-        }
-    };
-
-    private void startWebApp(final String title, final String srv, final String script) {
-        //Utils.startWebActivityWithUrl(this, title, srv, script);
-
-        new Thread(new Runnable() {
-            @Override
-            public void run() {
-                while (!Utils.isSrvOk(srv)) {
-                    try {
-                        Thread.sleep(1000);
-                    } catch (InterruptedException e) {
-                        e.printStackTrace();
-                    }
-                }
-                Message m = new Message();
-                m.what = 1;
-                JSONArray ja = new JSONArray();
-                try {
-                    ja.put(0,title);
-                    ja.put(1,srv);
-                    ja.put(2,script);
-                } catch (JSONException e) {
-                    e.printStackTrace();
-                }
-
-                m.obj = ja;
-
-                hd.sendMessage(m);
-
-            }
-        }).start();
-
-
-    }
-
-    public void playWebApp(final String title, String script, final String srv, String arg, boolean isNoHead, boolean isDrawer) {
-        if (Build.VERSION.SDK_INT <= 10) {
-            playWebViewSrv(script, arg, true);
-        } else {
-            playQScript(script, arg, false);
-        }
-
-        Utils.startWebActivityWithUrl(this, title, srv, script, isNoHead, isDrawer);
-
-        /*hd.postDelayed(new Runnable() {
-            @Override
-            public void run() {
-                startWebApp(title, srv, script);
-            }
-        }, 1000);
-        String documentLink = "file:///android_asset/html/index.html";*/
-        //Uri.Builder b = Uri.parse(documentLink).buildUpon();
-        //Toast.makeText(this, "PlayWebApp", Toast.LENGTH_LONG).show();
-
-        //Intent intent = NAction.openRemoteLink(getApplicationContext(), documentLink);
-//        Intent intent = new Intent(getApplicationContext(), FinestWebViewActivity.class);
-//        intent.putExtra(PythonActivity.EXTRA_CONTENT_URL1, "main");
-//        intent.putExtra(PythonActivity.EXTRA_CONTENT_URL2, title);
-//        intent.putExtra(PythonActivity.EXTRA_CONTENT_URL3, srv);
-//        intent.putExtra(PythonActivity.EXTRA_CONTENT_URL4, script);
-//        intent.putExtra(PythonActivity.EXTRA_CONTENT_URL5, isNoHead?"1":"0");
-//        intent.putExtra(PythonActivity.EXTRA_CONTENT_URL6, isDrawer?"drawer":"");
-
-
-
-//        intent.setData(b.build());
-//        startActivity(intent);
-    }
-
-    protected void playWebViewSrv(String script, String arg, boolean flag) {
-        mPrefs = PreferenceManager.getDefaultSharedPreferences(this);
-        mSettings = new TermSettings(getResources(), mPrefs);
-        //String[] mArgs = this.getIntent().getStringArrayExtra("PYTHONARGS");
-        //Log.d(TAG, "found srv:"+script);
-        File logFile;
-        if (flag) {
-            logFile = new File(Environment.getExternalStorageDirectory(), "qpython/log/last.log");
-        } else {
-            File f = new File(script).getParentFile();
-            logFile = new File(f.toString() + "/last.log");
-        }
-        if (!logFile.getAbsoluteFile().getParentFile().exists()) {
-            logFile.getAbsoluteFile().getParentFile().mkdirs();
-        }
-
-        String[] mArgs = {script, " " + (arg != null ? arg : "") + " >" + logFile.getAbsoluteFile() + " 2>&1"};
-        createWebTermSession(mArgs);
-
-    }
-
-    public void execPyInConsole(String[] args) {
-        Intent intent = new Intent(this, TermActivity.class);
-//            intent.setClassName(this.getPackageName(), "jackpal.androidterm.Term");
-        intent.putExtra(PythonActivity.EXTRA_CONTENT_URL0, "main");
-        intent.putExtra("PYTHONARGS", args);
-        startActivityForResult(intent, SCRIPT_CONSOLE_CODE);
-
-    }
-
-    public void playQScript(final String script, String argv1, boolean notify) {
-        String binaryPath = "";
-
-        File f = new File(script);
-
-        if (Build.VERSION.SDK_INT >= 20) {
-            binaryPath = getApplicationContext().getFilesDir() + "/bin/python-android5";
-            ;
-        } else {
-            binaryPath = getApplicationContext().getFilesDir() + "/bin/python";
-            ;
-        }
-
-
-        int[] pid = new int[1];
-
-        mArguments.add(script);
-        if (argv1 != null) {
-            mArguments.add(argv1);
-        }
-        String[] argumentsArray = mArguments.toArray(new String[mArguments.size()]);
-
-        final File mLog;
-        String bpath = getApplication().getFilesDir().getAbsolutePath();
-        if (script.startsWith(bpath)) {
-            mLog = new File(String.format("%s", Environment.getExternalStorageDirectory() + "/qpython/log/" + f.getName() + ".last.log"));
-
-        } else {
-            mLog = new File(String.format("%s", Environment.getExternalStorageDirectory() + "/qpython/log/last.log"));
-
-        }
-        File logDir = mLog.getParentFile();
-        if (!logDir.exists()) {
-            FileHelper.createDirIfNExists(logDir.getAbsolutePath());
-        }
-        //mLog = new File( Environment.getExternalStorageDirectory()+"/"+getName()+".log" );
-        //Log.d("Process", "logFile:"+mLog.getAbsolutePath());
-
-        mFd = com.googlecode.android_scripting.Exec.createSubprocess(binaryPath, argumentsArray, getEnvironmentArray(f.getParentFile() + ""), getWorkingDirectory(), pid);
-        //Log.d("QPY", "binaryPath:"+binaryPath+"-argumentsArray:"+argumentsArray+"-getEnvironmentArray:"+getEnvironmentArray()+"-getWorkingDirectory:"+getWorkingDirectory()+"-pid:"+pid);
-        final AtomicInteger mPid = new AtomicInteger(PID_INIT_VALUE);
-
-        mPid.set(pid[0]);
-        mOut = new FileOutputStream(mFd);
-        mIn = new StreamGobbler(new FileInputStream(mFd), mLog, DEFAULT_BUFFER_SIZE);
-        long mStartTime = System.currentTimeMillis();
-
-        Message msg = new Message();
-        msg.obj = mArguments.get(0);
-        logHandler.sendMessage(msg);
-
-        new Thread(new Runnable() {
-            public void run() {
-                int returnValue = com.googlecode.android_scripting.Exec.waitFor(mPid.get());
-                //long mEndTime = System.currentTimeMillis();
-                int pid = mPid.getAndSet(PID_INIT_VALUE);
-                //Log.d("", "out:"+mFd.out.toString());
-
-                Message msg = new Message();
-                msg.what = returnValue;
-                msg.obj = mArguments.get(0);
-
-                Log.d("QPY", "Process " + pid + " exited with result code " + returnValue + ".");
-
-                try {
-                    mIn.close();
-                } catch (IOException e) {
-                    Log.e("QPY", e.getMessage());
-                }
-
-                try {
-                    mOut.close();
-                } catch (IOException e) {
-                    Log.e("QPY", e.getMessage());
-                }
-
-                //context.updateNotify(msg);
-
-            }
-        }).start();
-    }
-
-    public void playProject(String project, boolean notify) {
-        Log.d("BaseActivity", "playProject:"+project);
-        String script = project + "/main.py";
-        String script2 = project + "/main.pyo";
-        File sf = new File(script);
-        File sf2 = new File(script2);
-        if (sf.exists()) {
-            if (Utils.isOpenGL2supported(this)) {
-                //Log.d(TAG, "project:"+script);
-                String content = FileHelper.getFileContents(script);
-                boolean isQApp = content.contains("#qpy:qpyapp");
-
-                boolean isCons = !content.contains("#qpy:kivy") && !isQApp;
-                boolean isWeb = content.contains("#qpy:webapp");
-
-                if (isWeb) {
-                    boolean isNoHead = content.contains("#qpy:fullscreen");
-                    boolean isDrawer = content.contains("#qpy:drawer");
-
-                    String title = "QWebApp";
-                    Pattern titlePattern = Pattern.compile("#qpy:webapp:(.+)", Pattern.CASE_INSENSITIVE);
-                    Matcher matcher0 = titlePattern.matcher(content);
-                    if (matcher0.find()) {
-                        title = matcher0.group(1);
-                    }
-
-                    String srv = "http://localhost";
-                    Pattern srvPattern = Pattern.compile("#qpy://(.+)[\\s]+", Pattern.CASE_INSENSITIVE);
-                    Matcher matcher1 = srvPattern.matcher(content);
-
-                    if (matcher1.find()) {
-
-                        srv = "http://" + matcher1.group(1);
-                    }
-                    //Log.d(TAG, "title:"+title+"-srv:"+srv);
-                    playWebApp(title, sf.getAbsolutePath(), srv, null, isNoHead, isDrawer);
-
-                } else if (isCons) {
-                    playScript(script, null, notify);
-                } else if (isQApp) {
-                    // TODO
-                    playQScript(script, null, notify);
-
-                } else {
-
-                    Intent intent = new Intent(this, PythonActivity.class);
-                    intent.putExtra(PythonActivity.EXTRA_CONTENT_URL1, "execute");
-                    intent.putExtra(PythonActivity.EXTRA_CONTENT_URL2, project);
-                    intent.putExtra(PythonActivity.EXTRA_CONTENT_URL5, notify ? "1" : "0");
-
-                    startActivity(intent);
-                }
-            } else {
-                String content = FileHelper.getFileContents(script);
-                boolean isWeb = content.contains("#qpy:webapp");
-                if (isWeb) {
-                    boolean isNoHead = content.contains("#qpy:fullscreen");
-                    boolean isDrawer = content.contains("#qpy:drawer");
-                    String title = "QWebApp";
-                    Pattern titlePattern = Pattern.compile("#qpy:webapp:(.+)", Pattern.CASE_INSENSITIVE);
-                    Matcher matcher0 = titlePattern.matcher(content);
-                    if (matcher0.find()) {
-
-                        title = matcher0.group(1);
-                    }
-
-                    String srv = "http://localhost";
-                    Pattern srvPattern = Pattern.compile("#qpy://(.+)[\\s]+", Pattern.CASE_INSENSITIVE);
-                    Matcher matcher1 = srvPattern.matcher(content);
-
-                    if (matcher1.find()) {
-
-                        srv = "http://" + matcher1.group(1);
-                    }
-                    //Log.d(TAG, "title:"+title+"-srv:"+srv);
-                    playWebApp(title, sf.getAbsolutePath(), srv, null, isNoHead, isDrawer);
-                } else {
-
-                    Toast.makeText(this, "OpenGL2 is not supported", Toast.LENGTH_SHORT).show();
-                    String[] args = {project + "/main.py", project};
-                    execPyInConsole(args);
-                }
-            }
-
-        } else if (sf2.exists()) {
-            Intent intent = new Intent(this, PythonActivity.class);
-            intent.putExtra(PythonActivity.EXTRA_CONTENT_URL1, "execute");
-            intent.putExtra(PythonActivity.EXTRA_CONTENT_URL2, project);
-            intent.putExtra(PythonActivity.EXTRA_CONTENT_URL5, notify ? "1" : "0");
-
-            startActivity(intent);
-        } else {
-            Toast.makeText(this, "Project file doesn't exit", Toast.LENGTH_SHORT).show();
-        }
-
-    }
-
-    private void createWebTermSession(String[] mArgs) {
-        TermSettings settings = mSettings;
-        //ShellTermSession session;
-        String scmd = getApplicationContext().getFilesDir() + "/bin/qpython.sh";
-
-        if (Build.VERSION.SDK_INT >= 20) {
-            scmd = getApplicationContext().getFilesDir() + "/bin/qpython-android5.sh";
-        }
-
-        session = createTermSession(this, settings, scmd + " \"" + mArgs[0] + "\"  " + mArgs[1], "");
-        mArgs = null;
-
-        session.setFinishCallback(null);
-        session.shellRun();
-        //}
-    }
-
-    private String[] getEnvironmentArray(String pyPath) {
-
-        String path = System.getenv("PATH");
-        String[] env = new String[18];
-
-        File filesDir = getFilesDir();
-
-        List<String> environmentVariables = new ArrayList<String>();
-
-        environmentVariables.add("PATH=" + filesDir + "/bin" + ":" + path);
-        environmentVariables.add("LD_LIBRARY_PATH=" + ".:" + filesDir + "/lib/" + ":" + filesDir + "/:" + filesDir.getParentFile() + "/lib/");
-        environmentVariables.add("PYTHONHOME=" + filesDir);
-        environmentVariables.add("ANDROID_PRIVATE=" + filesDir);
-
-        //environmentVariables.put("PYTHONHOME", this.getFilesDir().getAbsolutePath() + "/python");
-        //environmentVariables.put("LD_LIBRARY_PATH", this.getFilesDir().getAbsolutePath() + "/python/lib" + ":" + this.getFilesDir().getAbsolutePath() + "/python/lib/python2.7/lib-dynload");
-
-        File externalStorage = new File(Environment.getExternalStorageDirectory(), "qpython");
-
-        if (!externalStorage.exists()) {
-            externalStorage.mkdir();
-        }
-//        if (isQPy3) {
-//            environmentVariables.add("PYTHONPATH="+externalStorage+"/lib/python3.2/site-packages/:"
-//                    +filesDir+"/lib/python3.2/lib/:"
-//                    +filesDir+"/lib/python3.2/site-packages/:"
-//                    +filesDir+"/lib/python3.2/python32.zip:"
-//                    +filesDir+"/lib/python3.2/lib-dynload/:"
-//                    +pyPath);
-//
-//            environmentVariables.add("IS_QPY3=1");
-//
-//
-//        } else {
-
-        environmentVariables.add("PYTHONPATH=" + externalStorage + "/lib/python2.7/site-packages/:"
-                + filesDir + "/lib/python2.7/site-packages/:"
-                + filesDir + "/lib/python2.7/:"
-                + filesDir + "/lib/python27.zip:"
-                + filesDir + "/lib/python2.7/lib-dynload/:"
-                + pyPath);
-
-
-        //environmentVariables.add("PYTHONSTARTUP="+externalStorage+"/lib/python2.7/site-packages/qpythoninit.py");
-
-        //}
-
-        environmentVariables.add("PYTHONOPTIMIZE=2");
-
-        environmentVariables.add("TMPDIR=" + externalStorage + "/cache");
-        environmentVariables.add("TEMP=" + externalStorage + "/cache");
-
-        File td = new File(externalStorage + "/cache");
-        if (!td.exists()) {
-            td.mkdir();
-        }
-
-        environmentVariables.add("AP_HOST="+ SPFUtils.getSP(this, "sl4a.hostname"));
-        environmentVariables.add("AP_PORT="+SPFUtils.getSP(this, "sl4a.port"));
-        environmentVariables.add("AP_HANDSHAKE="+SPFUtils.getSP(this, "sl4a.secue"));
-
-        environmentVariables.add("ANDROID_PUBLIC=" + externalStorage);
-        environmentVariables.add("ANDROID_PRIVATE=" + this.getFilesDir().getAbsolutePath());
-        environmentVariables.add("ANDROID_ARGUMENT=" + pyPath);
-        environmentVariables.add("QPY_USERNO="+SPFUtils.getUserNoId(this));
-        environmentVariables.add("QPY_ARGUMENT="+SPFUtils.getExtConf(this));
-        environmentVariables.add("PYTHONDONTWRITEBYTECODE=1");
-
-        for (Map.Entry<String, String> entry : System.getenv().entrySet()) {
-            environmentVariables.add(entry.getKey() + "=" + entry.getValue());
-        }
-        
-        String[] environment = environmentVariables.toArray(new String[environmentVariables.size()]);
-        return environment;
-    }
-
-    public String getWorkingDirectory() {
-        return Environment.getExternalStorageDirectory() + "/qpython/";
-    }
-
-    public String getName() {
-        return "QPython";
-    }
-
-    private Handler logHandler = new Handler() {
-        @Override
-        public void handleMessage(Message msg) {
-            notifyLog(FileHelper.getFileName(mArguments.get(0)));
-        }
-    };
-
-    public void notifyLog(String title) {
-        NotificationManager notificationManager = (NotificationManager) this.getSystemService(Context.NOTIFICATION_SERVICE);
-
-//        Intent updateIntent = new Intent(this, OLogAct.class);
-//        updateIntent.putExtra(CONF.EXTRA_CONTENT_URL2, title);
-//
-//        PendingIntent updatePendingIntent = PendingIntent.getActivity(this, DateTimeHelper.getTimeAsInt(),updateIntent,0);
-//        Notification notification = new Notification(R.drawable.ic_about, this.getString(R.string.m_title_log), 1000);
-//        notification.contentIntent = updatePendingIntent;
-//        notification.setLatestEventInfo(this, this.getString(R.string.app_name), this.getString(R.string.m_title_log), updatePendingIntent);
-//        notification.flags = Notification.FLAG_AUTO_CANCEL;
-//        notificationManager.notify(CONF.PY_NOTI_FLAG, notification);
-    }
-
-    protected static ShellTermSession createTermSession(Context context, TermSettings settings, String initialCommand, String path) {
-        ShellTermSession session = null;
-        try {
-            session = new ShellTermSession(context,settings, initialCommand, path);
-            session.setProcessExitMessage(context.getString(R.string.process_exit_message));
-
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-
-        return session;
-    }
-
-
-}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/activity/CodeDetailActivity.java b/qpython/src/main/java/org/qpython/qpy/main/activity/CodeDetailActivity.java
new file mode 100644
index 00000000..c8ff7ba6
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/activity/CodeDetailActivity.java
@@ -0,0 +1,132 @@
+package org.qpython.qpy.main.activity;
+
+import android.app.Fragment;
+import android.app.FragmentTransaction;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.databinding.DataBindingUtil;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.LinearLayoutManager;
+import android.view.View;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.codeshare.pojo.Gist;
+import org.qpython.qpy.databinding.ActivityCodeDetailBinding;
+import org.qpython.qpy.main.adapter.CodeCommentAdapter;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.widget.CodeSendComment;
+import org.qpython.qpy.texteditor.EditorActivity;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+public class CodeDetailActivity extends AppCompatActivity implements DialogInterface.OnDismissListener {
+    private static final String GIST_ID      = "gist_id";
+    private static final String IS_PROJ      = "is_proj";
+    private static final int    SCROOL_RANGE = 30;
+    private ActivityCodeDetailBinding binding;
+    private List<Gist.CommentBean>    comments;
+    private CodeCommentAdapter        adapter;
+    private CodeSendComment           sendDialog;
+    private String                    gistId;
+    private boolean                   isProj;
+
+    public static void start(Context context, String gistId, boolean isProj) {
+        Intent starter = new Intent(context, CodeDetailActivity.class);
+        starter.putExtra(GIST_ID, gistId);
+        starter.putExtra(IS_PROJ, isProj);
+        context.startActivity(starter);
+    }
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        gistId = getIntent().getStringExtra(GIST_ID);
+        isProj = getIntent().getBooleanExtra(IS_PROJ, false);
+        initView();
+        initData();
+        initListener();
+    }
+
+    private void initView() {
+        binding = DataBindingUtil.setContentView(this, R.layout.activity_code_detail);
+        setSupportActionBar(binding.lt.toolbar);
+        setTitle(R.string.community);
+        binding.lt.toolbar.setNavigationIcon(R.drawable.ic_back);
+        binding.lt.toolbar.setNavigationOnClickListener(v -> finish());
+        if (App.getUser() == null) {
+            return;
+        }
+        sendDialog = CodeSendComment.newInstance(gistId, isProj);
+        sendDialog.setCallback(comment -> {
+            if (binding.emptyHint.getVisibility() == View.VISIBLE) {
+                binding.emptyHint.setVisibility(View.GONE);
+                comments = new ArrayList<>();
+                adapter = new CodeCommentAdapter(comments);
+                adapter.setItemClickListener((to, reComment) -> sendDialog.setReply(to, reComment));
+                binding.recyclerView.setLayoutManager(new LinearLayoutManager(CodeDetailActivity.this));
+                binding.recyclerView.setAdapter(adapter);
+            }
+            comments.add(0, comment);
+            adapter.notifyItemInserted(0);
+            binding.commentCount.setText(Integer.parseInt(binding.commentCount.getText().toString()) + 1 + "");
+        });
+        FragmentTransaction ft = getFragmentManager().beginTransaction();
+        Fragment prev = getFragmentManager().findFragmentByTag("dialog");
+        if (prev != null) {
+            ft.remove(prev);
+        }
+        ft.addToBackStack(null);
+        sendDialog.setCancelable(false);
+        sendDialog.show(ft, "dialog");
+    }
+
+    private void initData() {
+//        ShareCodeUtil.getInstance().getGistDetail(gist_id, isProj, gist -> {
+//            binding.name.setText(gist.getAuthor());
+//            binding.title.setText(gist.getTitle());
+//            binding.description.setText(gist.getDescribe());
+//            binding.bookmarkCount.setText(gist.getBookmarkerCount());
+//            binding.commentCount.setText(gist.getCommentCount());
+//            binding.code.setText(gist.getLastCommitCode());
+//            ImageDownLoader.setImageFromUrl(CodeDetailActivity.this, binding.avatar, gist.getAvatar());
+//
+//            if (gist.getFrom_content() != null) {
+//                comments = new ArrayList<>();
+//                comments.addAll(gist.getFrom_content());
+//                adapter = new CodeCommentAdapter(comments);
+//                adapter.setItemClickListener((to, reComment) -> sendDialog.setReply(to, reComment));
+//                binding.recyclerView.setLayoutManager(new LinearLayoutManager(CodeDetailActivity.this));
+//                binding.recyclerView.setAdapter(adapter);
+//                binding.recyclerView.setNestedScrollingEnabled(false);
+//            } else {
+//                binding.emptyHint.setVisibility(View.VISIBLE);
+//            }
+//        });
+    }
+
+    private void initListener() {
+        binding.btnCopy.setOnClickListener(v -> EditorActivity.start(this, binding.code.getText().toString()));
+        binding.bookmarkCount.setOnClickListener(v -> {
+            v.setSelected(!v.isSelected());
+//            if (v.isSelected()) {
+//                ShareCodeUtil.getInstance().bookmark(gist_id);
+//                binding.bookmarkCount.setText(Integer.parseInt(binding.bookmarkCount.getText().toString()) + 1 + "");
+//                binding.bookmarkCount.setCompoundDrawablesWithIntrinsicBounds(R.drawable.ic_com_liked, 0, 0, 0);
+//            } else {
+//                ShareCodeUtil.getInstance().cancelBookmark(gist_id);
+//                binding.bookmarkCount.setText(Integer.parseInt(binding.bookmarkCount.getText().toString()) - 1 + "");
+//                binding.bookmarkCount.setCompoundDrawablesWithIntrinsicBounds(R.drawable.ic_com_like, 0, 0, 0);
+//            }
+        });
+    }
+
+    @Override
+    public void onDismiss(DialogInterface dialog) {
+        finish();
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/activity/CodeShareActivity.java b/qpython/src/main/java/org/qpython/qpy/main/activity/CodeShareActivity.java
new file mode 100644
index 00000000..1a75bffb
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/activity/CodeShareActivity.java
@@ -0,0 +1,88 @@
+package org.qpython.qpy.main.activity;
+
+import android.animation.ArgbEvaluator;
+import android.content.Context;
+import android.content.Intent;
+import android.databinding.DataBindingUtil;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v4.view.ViewPager;
+import android.support.v7.app.AppCompatActivity;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.databinding.ActivityCodeShareBinding;
+import org.qpython.qpy.main.adapter.ViewPagerAdapter;
+import org.qpython.qpy.main.fragment.CodeFragment;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class CodeShareActivity extends AppCompatActivity {
+    ActivityCodeShareBinding binding;
+    ArgbEvaluator evaluator = new ArgbEvaluator();
+
+    public static void start(Context context) {
+        Intent starter = new Intent(context, CodeShareActivity.class);
+        context.startActivity(starter);
+    }
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        binding = DataBindingUtil.setContentView(this, R.layout.activity_code_share);
+        initView();
+        initFragment();
+    }
+
+    private void initView() {
+        setSupportActionBar(binding.lt.toolbar);
+        binding.lt.toolbar.setNavigationIcon(R.drawable.ic_back);
+        binding.lt.toolbar.setNavigationOnClickListener(v -> finish());
+        setTitle(R.string.community);
+    }
+
+    private void initFragment() {
+        binding.btnProject.setOnClickListener(v -> binding.viewPager.setCurrentItem(0));
+        binding.btnScript.setOnClickListener(v -> binding.viewPager.setCurrentItem(1));
+
+        List<CodeFragment> fragments = new ArrayList<>();
+        fragments.add(CodeFragment.newInstance(CodeFragment.PROGRAM));
+        fragments.add(CodeFragment.newInstance(CodeFragment.SCRIPT));
+        binding.viewPager.setAdapter(new ViewPagerAdapter<>(getSupportFragmentManager(), fragments));
+        binding.viewPager.addOnPageChangeListener(new ViewPager.SimpleOnPageChangeListener() {
+            @Override
+            public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
+                super.onPageScrolled(position, positionOffset, positionOffsetPixels);
+                int showColor = (int) evaluator.evaluate(positionOffset, 0XFF4A4A4A, 0XFF4BAC07);
+                int dismissColor = (int) evaluator.evaluate(positionOffset, 0XFF4BAC07, 0XFF4A4A4A);
+                int textShowColor = (int) evaluator.evaluate(positionOffset, 0XFFFFFFFF, 0XFF4BAC07);
+                int textDismissColor = (int) evaluator.evaluate(positionOffset, 0XFF4BAC07, 0XFFFFFFFF);
+                if (position == 0) {
+                    binding.btnProject.setTextColor(textDismissColor);
+                    binding.btnScript.setTextColor(textShowColor);
+                    binding.lineOne.setBackgroundColor(dismissColor);
+                    binding.lineTwo.setBackgroundColor(showColor);
+                } else {
+                    binding.btnProject.setTextColor(textShowColor);
+                    binding.btnScript.setTextColor(textDismissColor);
+                    binding.lineOne.setBackgroundColor(showColor);
+                    binding.lineTwo.setBackgroundColor(dismissColor);
+                }
+            }
+
+            @Override
+            public void onPageSelected(int position) {
+                switch (position) {
+                    case 0:
+                        binding.btnProject.setSelected(true);
+                        binding.btnScript.setSelected(false);
+                        break;
+                    case 1:
+                        binding.btnProject.setSelected(false);
+                        binding.btnScript.setSelected(true);
+                        break;
+                }
+            }
+        });
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/activity/CourseActivity.java b/qpython/src/main/java/org/qpython/qpy/main/activity/CourseActivity.java
new file mode 100644
index 00000000..3a8ff90d
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/activity/CourseActivity.java
@@ -0,0 +1,213 @@
+package org.qpython.qpy.main.activity;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.databinding.DataBindingUtil;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.design.widget.TabLayout;
+import android.support.v4.app.Fragment;
+import android.support.v4.widget.NestedScrollView;
+import android.support.v7.app.AppCompatActivity;
+import android.view.View;
+
+import com.quseit.util.ACache;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.databinding.ActivityCourseBinding;
+import org.qpython.qpy.main.adapter.ViewPagerAdapter;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.fragment.CourseFragment;
+import org.qpython.qpy.main.fragment.MyCourseFragment;
+import org.qpython.qpy.main.server.CacheKey;
+import org.qpython.qpy.main.server.MySubscriber;
+import org.qpython.qpy.main.server.model.CourseAdModel;
+import org.qpython.qpy.main.server.model.CourseModel;
+import org.qpython.qsl4a.qsl4a.LogUtil;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import rx.Observable;
+import rx.Subscriber;
+import rx.android.schedulers.AndroidSchedulers;
+import rx.schedulers.Schedulers;
+
+/**
+ * Course
+ * Created by Hmei on 2017-06-28.
+ */
+
+public class CourseActivity extends AppCompatActivity {
+    private ActivityCourseBinding binding;
+    private CourseFragment        recommend, latest;
+    private MyCourseFragment my;
+    private String TAG = "CourseActivity";
+
+    private int scrollHeight;// 记录滚动超出多少后显示顶部的Tab
+    private List<CourseModel> recommendList = new ArrayList<>(), latestList = new ArrayList<>();
+
+    public static void start(Context context) {
+        Intent starter = new Intent(context, CourseActivity.class);
+        context.startActivity(starter);
+    }
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        binding = DataBindingUtil.setContentView(this, R.layout.activity_course);
+        binding.topTabs.root.setVisibility(View.GONE);
+        setSupportActionBar(binding.lt.toolbar);
+        binding.lt.toolbar.setNavigationIcon(R.drawable.ic_back);
+        binding.lt.toolbar.setNavigationOnClickListener(v -> finish());
+
+        setTitle(getString(R.string.course));
+        initTab(binding.tabs.root);
+        initTab(binding.topTabs.root);
+        initFragment();
+        initListener();
+        initData();
+        initAD();
+    }
+
+    @Override
+    protected void onDestroy() {
+        LogUtil.d("onDestroy");
+        binding.adSlide.stop();
+        super.onDestroy();
+        //binding.adSlide;
+    }
+
+    private void initTab(TabLayout tabLayout) {
+        tabLayout.addTab(tabLayout.newTab().setText(R.string.newest_course));
+        tabLayout.addTab(tabLayout.newTab().setText(R.string.featured));
+        tabLayout.addTab(tabLayout.newTab().setText(R.string.my));
+        tabLayout.setTabTextColors(getResources().getColor(R.color.white), getResources().getColor(R.color.colorAccent));
+        tabLayout.setSelectedTabIndicatorColor(getResources().getColor(R.color.colorAccent));
+
+        binding.vp.addOnPageChangeListener(new TabLayout.TabLayoutOnPageChangeListener(tabLayout));
+        tabLayout.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
+            @Override
+            public void onTabSelected(TabLayout.Tab tab) {
+                binding.vp.setCurrentItem(tab.getPosition());
+            }
+
+            @Override
+            public void onTabUnselected(TabLayout.Tab tab) {
+            }
+
+            @Override
+            public void onTabReselected(TabLayout.Tab tab) {
+            }
+        });
+    }
+
+    private void initFragment() {
+        recommend = new CourseFragment();
+        recommend.setTypeVisible(true);
+        latest = new CourseFragment();
+        latest.setTypeVisible(false);
+        my = new MyCourseFragment();
+
+        List<Fragment> fragments = new ArrayList<>();
+        fragments.add(latest);
+        fragments.add(recommend);
+        fragments.add(my);
+
+        ViewPagerAdapter adapter = new ViewPagerAdapter<>(getSupportFragmentManager(), fragments);
+        binding.vp.setAdapter(adapter);
+        binding.vp.setOffscreenPageLimit(3);
+    }
+
+    private void initListener() {
+
+        binding.root.getViewTreeObserver().addOnGlobalLayoutListener(() -> scrollHeight =
+                binding.adSlide.getHeight());
+
+        binding.scroll.setOnScrollChangeListener((NestedScrollView.OnScrollChangeListener) (v, scrollX, scrollY, oldScrollX, oldScrollY) -> {
+            if (scrollY > scrollHeight) {
+                binding.topTabs.root.setVisibility(View.VISIBLE);
+            } else {
+                binding.topTabs.root.setVisibility(View.GONE);
+            }
+        });
+    }
+
+    private void initData() {
+        App.getService().getCourse()
+                .subscribeOn(Schedulers.io())
+                .flatMap(Observable::from)
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new MySubscriber<CourseModel>() {
+                    @Override
+                    public void onNext(CourseModel o) {
+                        switch (o.getCat()) {
+                            case "new":
+                                latestList.add(o);
+                                break;
+                            case "featured":
+                                recommendList.add(o);
+                                break;
+                        }
+                    }
+
+                    @Override
+                    public void onCompleted() {
+                        ACache.get(CourseActivity.this).put(CacheKey.COURSE_RECOMMEND, App.getGson().toJson(recommendList), ACache.TIME_HOUR);
+                        ACache.get(CourseActivity.this).put(CacheKey.COURSE_LATEST, App.getGson().toJson(latestList), ACache.TIME_HOUR);
+                        binding.progressBar.setVisibility(View.GONE);
+                        recommend.setDataList(recommendList);
+                        latest.setDataList(latestList);
+                    }
+
+                    @Override
+                    public void onError(Throwable e) {
+                        binding.progressBar.setVisibility(View.GONE);
+                        recommend.setDataList(recommendList);
+                        latest.setDataList(latestList);
+                    }
+                });
+    }
+
+    private void initAD() {
+        List<String> url = new ArrayList<>(), imageUrl = new ArrayList<>(), title = new ArrayList<>();
+        App.getService().getCourseAd()
+                .subscribeOn(Schedulers.io())
+                .flatMap(courseAdModel -> Observable.from(courseAdModel.getQpy().getExt_ad().getFeatured()))
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Subscriber<CourseAdModel.QpyBean.ExtAdBean.FeaturedBean>() {
+                    @Override
+                    public void onCompleted() {
+                        binding.adSlide.setImagesFromUrl(imageUrl);
+                        binding.adSlide.setOnUrlBackCall(i -> QWebViewActivity.start(CourseActivity.this, getString(R.string.qpy_featured), url.get(i)));
+                    }
+
+                    @Override
+                    public void onError(Throwable e) {
+                        binding.adSlide.setVisibility(View.GONE);
+                    }
+
+                    @Override
+                    public void onNext(CourseAdModel.QpyBean.ExtAdBean.FeaturedBean featuredBean) {
+                        title.add(featuredBean.getAd_link());
+                        imageUrl.add(featuredBean.getAd_img());
+                        url.add(featuredBean.getAd_link());
+                    }
+                });
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        switch (requestCode) {
+            case MyCourseFragment.REQUEST_CODE:
+                if (resultCode == Activity.RESULT_OK) my.getDataList();
+                break;
+        }
+    }
+
+    public void switchToFeature() {
+        binding.tabs.root.getTabAt(1).select();
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/activity/CourseIndexActivity.java b/qpython/src/main/java/org/qpython/qpy/main/activity/CourseIndexActivity.java
new file mode 100644
index 00000000..e4f6425c
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/activity/CourseIndexActivity.java
@@ -0,0 +1,78 @@
+package org.qpython.qpy.main.activity;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.databinding.DataBindingUtil;
+import android.os.Build;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.annotation.RequiresApi;
+import android.support.v4.app.ActivityOptionsCompat;
+import android.support.v4.util.Pair;
+import android.support.v7.app.AppCompatActivity;
+import android.view.View;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+
+import com.quseit.util.ImageDownLoader;
+
+import org.qpython.qpy.BR;
+import org.qpython.qpy.R;
+import org.qpython.qpy.databinding.ActivityCourseIndexBinding;
+import org.qpython.qpy.main.server.model.CourseModel;
+
+import java.util.List;
+
+
+public class CourseIndexActivity extends AppCompatActivity {
+    private static final String COURSE = "COURSE";
+
+    @RequiresApi(api = Build.VERSION_CODES.JELLY_BEAN)
+    public static void start(Activity context, Pair<View, String>[] pairs, CourseModel courseModel) {
+        Intent starter = new Intent(context, CourseIndexActivity.class);
+        starter.putExtra(COURSE, courseModel);
+        ActivityOptionsCompat options = ActivityOptionsCompat.
+                makeSceneTransitionAnimation(context, pairs);
+        context.startActivity(starter, options.toBundle());
+    }
+
+    public static void start(Context context, CourseModel courseModel) {
+        Intent starter = new Intent(context, CourseIndexActivity.class);
+        starter.putExtra(COURSE, courseModel);
+        context.startActivity(starter);
+    }
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        ActivityCourseIndexBinding binding = DataBindingUtil.setContentView(this, R.layout.activity_course_index);
+        CourseModel course = (CourseModel) getIntent().getSerializableExtra(COURSE);
+        binding.setCourse(course);
+        binding.item.free.setVisibility(View.GONE);
+
+        setSupportActionBar(binding.tl.toolbar);
+        setTitle(course.getTitle());
+        binding.tl.toolbar.setNavigationIcon(R.drawable.ic_back);
+        binding.tl.toolbar.setNavigationOnClickListener(v -> {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                finishAfterTransition();
+            } else {
+                finish();
+            }
+        });
+
+        binding.item.tvLevel.setText(getString(R.string.level, course.getLevel() + ""));
+        binding.item.tvView.setText(String.valueOf(course.getDownloads()));
+        binding.item.tvTitle.setText(course.getTitle());
+        binding.item.tvDate.setText(course.getRdate());
+        ImageDownLoader.setImageFromUrl(this, binding.item.ivTheme, course.getLogo());
+
+        ArrayAdapter<CourseModel.CoursesBean> adapter = new ArrayAdapter<>(this, R.layout.item_course_index, course.getCourses());
+        binding.rvIndex.setAdapter(adapter);
+        binding.rvIndex.setOnItemClickListener((parent, view, position, id) ->
+                QWebViewActivity.start(this, course.getCourses().get(position).getTitle(), course.getCourses().get(position).getLink()));
+
+        //binding.item.ivTheme.setOnClickListener(v -> QWebViewActivity.start(this, course.getTitle(), course.getLink()));
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/activity/CourseIndexFundingActivity.java b/qpython/src/main/java/org/qpython/qpy/main/activity/CourseIndexFundingActivity.java
new file mode 100644
index 00000000..6d1b4b6e
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/activity/CourseIndexFundingActivity.java
@@ -0,0 +1,266 @@
+package org.qpython.qpy.main.activity;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.databinding.DataBindingUtil;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.annotation.RequiresApi;
+import android.support.v4.app.ActivityOptionsCompat;
+import android.support.v4.util.Pair;
+import android.support.v7.app.AppCompatActivity;
+import android.text.TextUtils;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.ArrayAdapter;
+
+import com.quseit.util.ImageDownLoader;
+import com.quseit.util.VeDate;
+import com.quseit.util.NAction;
+
+import org.greenrobot.eventbus.EventBus;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.qpython.qpy.R;
+import org.qpython.qpy.databinding.ActivityCourseCrowdfundingBinding;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.server.MySubscriber;
+import org.qpython.qpy.main.server.model.CourseModel;
+import org.qpython.qpy.main.server.model.PayStatusModel;
+import org.qpython.qpy.main.widget.scheduleview.DotObj;
+import org.qpython.qpy.utils.UpdateHelper;
+
+import java.util.Map;
+
+
+public class CourseIndexFundingActivity extends AppCompatActivity {
+    private static final int SUPPORT_LOGIN_REQUEST_CODE = 2053;
+    private static final int COURSE_LOGIN_REQUEST_CODE  = 2030;
+
+    private static final String START_TO_LEARN_TYPE = "course_free";
+    private static final String COMMENT_HTML        = "http://edu.qpython.org/comments/%s.html?from=app";
+    private static final String STATUS              = "status";
+    private static final String COURSE              = "COURSE";
+
+    private ActivityCourseCrowdfundingBinding binding;
+
+    private CourseModel course;
+
+    @RequiresApi(api = Build.VERSION_CODES.JELLY_BEAN)
+    public static void start(Activity context, Pair<View, String>[] pairs, CourseModel courseModel, int status) {
+        Intent starter = new Intent(context, CourseIndexFundingActivity.class);
+        starter.putExtra(COURSE, courseModel);
+        starter.putExtra(STATUS, status);
+        ActivityOptionsCompat options = ActivityOptionsCompat.
+                makeSceneTransitionAnimation(context, pairs);
+        context.startActivity(starter, options.toBundle());
+    }
+
+    public static void start(Context context, CourseModel courseModel, int status) {
+        Intent starter = new Intent(context, CourseIndexFundingActivity.class);
+        starter.putExtra(COURSE, courseModel);
+        starter.putExtra(STATUS, status);
+        context.startActivity(starter);
+    }
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        binding = DataBindingUtil.setContentView(this, R.layout.activity_course_crowdfunding);
+        course = (CourseModel) getIntent().getSerializableExtra(COURSE);
+        binding.setCourse(course);
+        initToolbar();
+        initViewContent();
+        initListener();
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.comment_menu, menu);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.menu_comment:
+                startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(String.format(COMMENT_HTML, course.getSmodule()))));
+                break;
+        }
+        return true;
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+    }
+
+    private void initToolbar() {
+        setSupportActionBar(binding.tl.toolbar);
+        setTitle(course.getTitle());
+        binding.tl.toolbar.setNavigationIcon(R.drawable.ic_back);
+        binding.tl.toolbar.setNavigationOnClickListener(v -> {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                finishAfterTransition();
+            } else {
+                finish();
+            }
+        });
+    }
+
+    private void initViewContent() {
+        binding.tvLevel.setText(getString(R.string.level, course.getLevel() + ""));
+        binding.supportBtn.setText(binding.schedule.getVisibility() == View.VISIBLE ? R.string.support : R.string.buy_course);
+        ImageDownLoader.setImageFromUrl(this, binding.authorAvatar, course.getAuth_avatar());
+        ImageDownLoader.setImageFromUrl(this, binding.ivTheme, course.getLogo());
+
+        ArrayAdapter<CourseModel.CoursesBean> adapter = new ArrayAdapter<>(this, R.layout.item_course_funding_index, course.getCourses());
+        binding.rvIndex.setAdapter(adapter);
+
+        if (getIntent().getIntExtra(STATUS, 0) == 0 || getIntent().getIntExtra(STATUS, 0) == 4) {
+            //[0,不进行众筹/1,初级课程众筹/2, 中级课程众筹/3,高级课程众筹/4, 众筹完毕]
+            binding.schedule.setVisibility(View.GONE);
+            binding.explanation.setVisibility(View.GONE);
+            binding.more.setVisibility(View.GONE);
+            binding.supportBtn.setVisibility(View.GONE);
+
+            binding.thumbBtn.setVisibility(View.VISIBLE);
+            binding.supportPercent.setText(R.string.support_explanation);
+            binding.rvIndex.setOnItemClickListener((parent, view, position, id) ->
+                    QWebViewActivity.start(this, course.getCourses().get(position).getTitle(), course.getCourses().get(position).getLink()));
+        } else {
+            binding.thumbBtn.setVisibility(View.GONE);
+            binding.schedule.setDotObj(DotObj.getDefaultList(this));
+            binding.schedule.setPercent(course.getFunding_process());
+
+            String[] fundingPrice = getResources().getStringArray(R.array.funding_price);
+            binding.moreText.setText(getString(R.string.explanation_more, fundingPrice[0],
+                    fundingPrice[1],
+                    fundingPrice[2],
+                    fundingPrice[3]));
+            initSupportCount();
+        }
+    }
+
+    private void initSupportCount() {
+        App.getService().getArticleSupportNum(course.getSmodule(), new MySubscriber<Object>() {
+            @Override
+            public void onNext(Object o) {
+                String num = ((Double) ((Map) o).get("number")).intValue() + "";
+                if (TextUtils.isEmpty(num)) {
+                    binding.supportPercent.setVisibility(View.GONE);
+                } else {
+                    binding.supportPercent.setVisibility(View.VISIBLE);
+                    binding.supportPercent.setText(getString(R.string.support_count, num));
+                }
+            }
+        });
+    }
+
+    View.OnClickListener recordNIndex = (v -> {
+        if (App.getUser() != null) {
+            uploadMyCourse();
+            QWebViewActivity.start(this, course.getTitle(), course.getLink());
+        } else {
+            startActivityForResult(new Intent(this, SignInActivity.class), COURSE_LOGIN_REQUEST_CODE);
+        }
+    });
+
+    View.OnClickListener backThisProjectUnlogin = (v -> {
+
+        startActivityForResult(new Intent(this, SignInActivity.class), SUPPORT_LOGIN_REQUEST_CODE);
+    });
+
+    private void initListener() {
+        binding.more.setOnClickListener(v -> {
+            binding.explanationMore.toggle();
+            binding.more.setText(binding.explanationMore.isExpanded() ? R.string.more : R.string.hide);
+        });
+
+        //binding.ivTheme.setOnClickListener(v -> QWebViewActivity.start(this, course.getTitle(), course.getLink()));
+
+        binding.supportBtn.setOnClickListener(v -> {
+            if (App.getUser() != null) {
+                FundingPurchaseActivity.startSupport(this, course.getSmodule(), course.getFunding_process());
+            } else {
+                startActivityForResult(new Intent(this, SignInActivity.class), SUPPORT_LOGIN_REQUEST_CODE);
+            }
+        });
+
+        binding.thumbBtn.setOnClickListener(v -> PurchaseActivity.start(this, course.getSmodule()));
+
+        switch (getIntent().getIntExtra(STATUS, 0)) {
+            //[0,不进行众筹/1,初级课程众筹/2, 中级课程众筹/3,高级课程众筹/4, 众筹完毕]
+            case 0:
+                binding.btnStartLearn.setOnClickListener(recordNIndex);
+                break;
+            case 1:
+            case 2:
+            case 3:
+            case 4:
+                checkIsPayed();
+                break;
+        }
+    }
+
+    private void checkIsPayed() {
+        if (App.getUser() != null) {
+            App.getService().getPayStatus(App.getUser().getEmail(), course.getSmodule(), new
+                    MySubscriber<PayStatusModel>() {
+                        @Override
+                        public void onNext(PayStatusModel o) {
+                            if (o.getPayed() > 0) {
+                                binding.btnStartLearn.setText(R.string.start_learn);
+                                binding.btnStartLearn.setOnClickListener(recordNIndex);
+                            } else {
+                                binding.btnStartLearn.setText(R.string.back_course);
+                                binding.btnStartLearn.setOnClickListener(v -> FundingPurchaseActivity
+                                        .startSupport(CourseIndexFundingActivity.this, course
+                                                .getSmodule(), course
+                                                .getFunding_process()));
+                            }
+                        }
+                    });
+        } else {
+            binding.btnStartLearn.setText(R.string.back_course);
+            binding.btnStartLearn.setOnClickListener(backThisProjectUnlogin);
+
+
+            //startActivityForResult(new Intent(this, SignInActivity.class), SUPPORT_LOGIN_REQUEST_CODE);
+        }
+    }
+
+    private void uploadMyCourse() {
+        JSONObject jsonObject = new JSONObject();
+        try {
+            jsonObject.put("type", START_TO_LEARN_TYPE);
+            jsonObject.put("time", VeDate.getStringDateHourAsInt());
+            jsonObject.put("crowdfunding", 0);//0 非众筹/ 1: 0-100 /2: 100-500/3 500-2000
+            jsonObject.put("articleId", course.getSmodule());
+            jsonObject.put("account", App.getUser().getEmail());
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+        UpdateHelper.submitIAPLog(CourseIndexFundingActivity.this, NAction.getUserNoId(this),
+                App.getGson().toJson(jsonObject));
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        switch (requestCode) {
+            case SUPPORT_LOGIN_REQUEST_CODE:
+                if (resultCode == Activity.RESULT_OK) {
+                    FundingPurchaseActivity.startSupport(this, course.getSmodule(), course.getFunding_process());
+                }
+                break;
+            case COURSE_LOGIN_REQUEST_CODE:
+                // do nothing
+                break;
+        }
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/activity/FTPActivity.java b/qpython/src/main/java/org/qpython/qpy/main/activity/FTPActivity.java
new file mode 100644
index 00000000..d08f9d26
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/activity/FTPActivity.java
@@ -0,0 +1,31 @@
+package org.qpython.qpy.main.activity;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.database.DatabaseUtils;
+import android.databinding.DataBindingUtil;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.databinding.ActivityFtpBinding;
+
+/**
+ * FTP service setting page
+ * Created by Hmei on 2017-05-27.
+ */
+
+public class FTPActivity extends Activity {
+    ActivityFtpBinding binding;
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        binding = DataBindingUtil.setContentView(this, R.layout.activity_ftp);
+    }
+
+    public static void start(Context context) {
+        Intent starter = new Intent(context, FTPActivity.class);
+        context.startActivity(starter);
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/activity/GistActivity.java b/qpython/src/main/java/org/qpython/qpy/main/activity/GistActivity.java
new file mode 100644
index 00000000..0ad836c8
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/activity/GistActivity.java
@@ -0,0 +1,234 @@
+package org.qpython.qpy.main.activity;
+
+import android.content.Context;
+import android.content.Intent;
+import android.databinding.DataBindingUtil;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.design.widget.TabLayout;
+import android.support.v4.app.Fragment;
+import android.support.v4.widget.NestedScrollView;
+import android.text.TextUtils;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.Toast;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.databinding.ActivityCommunityBinding;
+import org.qpython.qpy.main.adapter.ViewPagerAdapter;
+import org.qpython.qpy.main.fragment.GistFragment;
+import org.qpython.qpy.main.server.gist.TokenManager;
+import org.qpython.qpy.main.server.gist.indexScreen.GistHomeControler;
+import org.qpython.qpy.main.server.gist.indexScreen.GistHomeView;
+import org.qpython.qpy.main.server.gist.response.GistBean;
+import org.qpython.qpy.main.server.model.CourseAdModel.QpyBean.ExtAdBean.FeaturedBean;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+/**
+ * 文 件 名: GistActivity
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2017/12/25 15:41
+ * 邮   箱: qq798435167@gmail.com
+ * 修改时间：
+ * 修改备注：
+ */
+
+public class GistActivity extends BaseActivity implements GistHomeView {
+
+    private ActivityCommunityBinding binding;
+    private List<FeaturedBean>       mADBeans;
+    private GistHomeControler        mGistHomeControler;
+    private GistFragment             latestFragment, featureFragment;
+    private int scrollHeight;// 记录滚动超出多少后显示顶部的Tab
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        binding = DataBindingUtil.setContentView(this, R.layout.activity_community);
+        mGistHomeControler = new GistHomeControler(this);
+        initToolbar(getString(R.string.gist));
+        initTab(binding.tabs.root);
+        initTab(binding.topTabs.root);
+        initFragment();
+        initListener();
+        getData();
+        getAD();
+    }
+
+    @Override
+    protected void onNewIntent(Intent intent) {
+        super.onNewIntent(intent);
+
+    }
+
+    @Override
+    protected void onStart() {
+        super.onStart();
+    }
+
+    @Override
+    protected void onStop() {
+        super.onStop();
+    }
+
+    private void loadMore() {
+        mGistHomeControler.loadMore();
+    }
+
+    private void initToolbar(String title) {
+        setSupportActionBar(binding.lt.toolbar);
+        binding.lt.toolbar.setNavigationIcon(R.drawable.ic_back);
+        binding.lt.toolbar.setNavigationOnClickListener(v -> finish());
+        setTitle(title);
+    }
+
+    private void initTab(TabLayout tabLayout) {
+        tabLayout.addTab(tabLayout.newTab().setText(R.string.newest_course));
+        tabLayout.addTab(tabLayout.newTab().setText(R.string.featured));
+        tabLayout.setTabTextColors(getResources().getColor(R.color.white), getResources().getColor(R.color.colorAccent));
+        tabLayout.setSelectedTabIndicatorColor(getResources().getColor(R.color.colorAccent));
+
+        binding.vp.addOnPageChangeListener(new TabLayout.TabLayoutOnPageChangeListener(tabLayout));
+        tabLayout.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
+            @Override
+            public void onTabSelected(TabLayout.Tab tab) {
+                binding.vp.setCurrentItem(tab.getPosition());
+            }
+
+            @Override
+            public void onTabUnselected(TabLayout.Tab tab) {
+            }
+
+            @Override
+            public void onTabReselected(TabLayout.Tab tab) {
+            }
+        });
+    }
+
+    private void initFragment() {
+        List<Fragment> fragments = new ArrayList<>();
+        latestFragment = new GistFragment();
+        featureFragment = new GistFragment();
+        fragments.add(latestFragment);
+        fragments.add(featureFragment);
+
+        ViewPagerAdapter adapter = new ViewPagerAdapter<>(getSupportFragmentManager(), fragments);
+        binding.vp.setAdapter(adapter);
+        binding.vp.setOffscreenPageLimit(2);
+    }
+
+    private void initListener() {
+        binding.adSlide.setOnUrlBackCall(i -> {
+            FeaturedBean bean = mADBeans.get(i);
+            QWebViewActivity.start(this, bean.getAd_man(), bean.getAd_link());
+        });
+        binding.getRoot().getViewTreeObserver().addOnGlobalLayoutListener(() -> scrollHeight = binding
+                .adSlide.getHeight());
+
+        binding.scroll.setOnScrollChangeListener((NestedScrollView.OnScrollChangeListener) (v, scrollX, scrollY, oldScrollX, oldScrollY) -> {
+            if (scrollY > scrollHeight) {
+                binding.topTabs.root.setVisibility(View.VISIBLE);
+            } else {
+                binding.topTabs.root.setVisibility(View.GONE);
+            }
+        });
+    }
+
+    public static void startCommunity(Context context) {
+        Intent intent = new Intent(context, GistActivity.class);
+        context.startActivity(intent);
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        if (!TextUtils.isEmpty(TokenManager.getToken())) {
+            getMenuInflater().inflate(R.menu.community_menu, menu);
+        }
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == R.id.news_edit) {
+            MyGistActivity.startMyShare(this);
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+    public void getData() {
+        mGistHomeControler.refresh();
+    }
+
+    public void getAD() {
+        mGistHomeControler.getAD();
+    }
+
+    @Override
+    public void showError(String msg) {
+    }
+
+    @Override
+    public void hideError() {
+    }
+
+    @Override
+    public void setAD(List<FeaturedBean> list) {
+        mADBeans = list;
+        List<String> urls = new ArrayList<>();
+        for (FeaturedBean featuredBean : list) {
+            urls.add(featuredBean.getAd_img());
+        }
+        binding.adSlide.setImagesFromUrl(urls);
+    }
+
+    @Override
+    public void hideAd() {
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+    }
+
+    @Override
+    public void showLoading() {
+    }
+
+    @Override
+    public void hideLoading() {
+        binding.progressBar.setVisibility(View.GONE);
+    }
+
+    @Override
+    public void showToast(String msg) {
+        Toast.makeText(this, msg, Toast.LENGTH_SHORT).show();
+    }
+
+    @Override
+    public void setData(List<GistBean> list) {
+        ArrayList<GistBean> latest = new ArrayList<>(), feature = new ArrayList<>();
+        for (GistBean gistBean : list) {
+            if (gistBean.isFeature()) {
+                feature.add(gistBean);
+            } else {
+                latest.add(gistBean);
+            }
+        }
+        latestFragment.setDataList(latest);
+        featureFragment.setDataList(feature);
+    }
+
+    @Override
+    public void loadMoreGist(List<GistBean> list) {
+//        mCommunityAdapter.loadMore(list);
+    }
+
+    @Override
+    public void favorite(boolean is) {
+
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/activity/GistDetailActivity.java b/qpython/src/main/java/org/qpython/qpy/main/activity/GistDetailActivity.java
new file mode 100644
index 00000000..01651226
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/activity/GistDetailActivity.java
@@ -0,0 +1,343 @@
+package org.qpython.qpy.main.activity;
+
+import android.content.Context;
+import android.content.Intent;
+import android.databinding.DataBindingUtil;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.Toast;
+
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.qpython.qpy.R;
+import org.qpython.qpy.databinding.ActivityNewsDetailBinding;
+import org.qpython.qpy.main.adapter.NewsDetailAdapter;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.listener.LoadmoreListener;
+import org.qpython.qpy.main.server.gist.GistEvent;
+import org.qpython.qpy.main.server.gist.detailScreen.DetailControler;
+import org.qpython.qpy.main.server.gist.detailScreen.DetailView;
+import org.qpython.qpy.main.server.gist.response.CommentBean;
+import org.qpython.qpy.main.server.gist.response.GistBean;
+import org.qpython.qpy.main.widget.CodeReviewDialog;
+import org.qpython.qpy.main.widget.ShareDialog;
+import org.qpython.qpy.texteditor.EditorActivity;
+import org.qpython.qpy.utils.OpenWebUtil;
+
+import java.util.List;
+
+import static org.qpython.qpy.main.server.gist.GistEvent.ADD_COMMENT;
+import static org.qpython.qpy.main.server.gist.GistEvent.CODE_REVIEW_EVENT;
+import static org.qpython.qpy.main.server.gist.GistEvent.COMMENT_EVENT;
+import static org.qpython.qpy.main.server.gist.GistEvent.DIVIDER;
+import static org.qpython.qpy.main.server.gist.GistEvent.FAVORITE_REQUEST;
+import static org.qpython.qpy.main.server.gist.GistEvent.FORK;
+import static org.qpython.qpy.main.server.gist.GistEvent.REPLY_EVENT;
+import static org.qpython.qpy.main.server.gist.GistEvent.RUN_NOTEBOOK;
+import static org.qpython.qpy.main.server.gist.GistEvent.RUN_SCRIPT;
+
+
+/**
+ * 文 件 名: GistDetailActivity
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2017/12/26 10:12
+ * 邮   箱: qq798435167@gmail.com
+ * 修改时间：
+ * 修改备注：
+ */
+
+public class GistDetailActivity extends BaseActivity implements DetailView {
+
+    private static final String GIST_ID = "gist_id";
+    //    public static final  String IS_EDITABLE = "is_editable";
+    private String                    id;
+    private String                    gistUserName;
+    private ActivityNewsDetailBinding mBinding;
+    private NewsDetailAdapter         mNewsDetailAdapter;
+    private ShareDialog               mShareDialog;
+
+    private CodeReviewDialog mCodeReviewDialog;
+
+    //    public static final String UPDATE_SHARE = "UPDATE_SHARE";
+    private DetailControler mDetailControler;
+    private String          toId;// reply comment
+    private String          commentUserName;//reply user name
+
+    public static void startNewsDetail(Context context, String id/*, boolean isEditable*/) {
+        Intent intent = new Intent(context, GistDetailActivity.class);
+        intent.putExtra(GIST_ID, id);
+//        intent.putExtra(IS_EDITABLE, isEditable);
+        context.startActivity(intent);
+    }
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        mBinding = DataBindingUtil.setContentView(this, R.layout.activity_news_detail);
+        initToolbar();
+        initView();
+        EventBus.getDefault().register(this);
+        mDetailControler = new DetailControler(this);
+        id = getIntent().getStringExtra(GIST_ID);
+        refresh(id);
+    }
+
+    private void initView() {
+        mNewsDetailAdapter = new NewsDetailAdapter(this);
+
+        mBinding.newsRv.setLayoutManager(new LinearLayoutManager(this));
+        mBinding.newsRv.setAdapter(mNewsDetailAdapter);
+
+        mCodeReviewDialog = new CodeReviewDialog(this);
+        mShareDialog = new ShareDialog(this);
+
+        initListener();
+    }
+
+    private void initListener() {
+        mBinding.newsRv.addOnItemTouchListener(new RecyclerView.OnItemTouchListener() {
+            @Override
+            public boolean onInterceptTouchEvent(RecyclerView rv, MotionEvent e) {
+                if (e.getAction() == MotionEvent.ACTION_DOWN) {
+                    mBinding.commentLayout.setVisibility(View.GONE);
+                    showSoftInput(false);
+                }
+                return false;
+            }
+
+            @Override
+            public void onTouchEvent(RecyclerView rv, MotionEvent e) {
+
+            }
+
+            @Override
+            public void onRequestDisallowInterceptTouchEvent(boolean disallowIntercept) {
+
+            }
+        });
+        mBinding.newsRv.addOnScrollListener(new LoadmoreListener() {
+            @Override
+            public void OnLoadmore() {
+                loadMore();
+            }
+        });
+        mBinding.refreshLayou.setOnRefreshListener(this::refresh);
+        mBinding.sendTv.setOnClickListener(v -> {
+            sendComment(mBinding.commentEdit.getText().toString());
+            showSoftInput(false);
+            mBinding.commentLayout.setVisibility(View.GONE);
+            mBinding.commentEdit.setText("");
+            toId = null;
+        });
+
+        mShareDialog.setOnClickListener(index -> {
+            switch (index) {
+                case ShareDialog.FACEBOOK: {
+                    OpenWebUtil.open(this, "https://www.facebook.com/qpython/");
+                    break;
+                }
+                case ShareDialog.TWITTER: {
+                    OpenWebUtil.open(this, "https://twitter.com/qpython");
+                    break;
+                }
+                case ShareDialog.COPY_LINK: {
+                    OpenWebUtil.open(this, "http://gist.qpy.io/share/"+getIntent().getStringExtra(GIST_ID));
+                    break;
+                }
+            }
+        });
+
+    }
+
+    private void refresh() {
+        mDetailControler.getDetail(id);
+    }
+
+    private void loadMore() {
+        mDetailControler.loadMoreComment(id);
+    }
+
+    private void initToolbar() {
+        setSupportActionBar(mBinding.lt.toolbar);
+        mBinding.lt.toolbar.setNavigationIcon(R.drawable.ic_back);
+        mBinding.lt.toolbar.setNavigationOnClickListener(v -> finish());
+//        setTitle(title);
+    }
+
+    @Subscribe
+    public void onEvent(GistEvent event) {
+        switch (event.name) {
+            case FORK:
+                ifLogin(this::fork);
+                break;
+            case COMMENT_EVENT: {
+                ifLogin(() -> {
+                    mBinding.commentLayout.setVisibility(View.VISIBLE);
+                    mBinding.commentEdit.requestFocus();
+                    showSoftInput(true);
+                });
+                break;
+            }
+
+            case FAVORITE_REQUEST: {
+                ifLogin(() -> mDetailControler.favoriteGist(id));
+                break;
+            }
+
+            case RUN_SCRIPT: {
+                String[] titleCode = event.content.split(DIVIDER);
+                EditorActivity.start(this, titleCode[1], titleCode[0]);
+                break;
+            }
+
+            case RUN_NOTEBOOK: {
+                // TODO: 2018/3/12 打开notebook
+                break;
+            }
+
+            case CODE_REVIEW_EVENT: {
+                mCodeReviewDialog.show();
+                break;
+            }
+
+            case REPLY_EVENT: {
+                ifLogin(() -> {
+                    toId = event.content.split(",")[0];
+                    commentUserName = event.content.split(",")[1];
+                    mBinding.commentLayout.setVisibility(View.VISIBLE);
+                    mBinding.commentEdit.requestFocus();
+                    showSoftInput(true);
+                });
+                break;
+            }
+
+        }
+
+    }
+
+    /**
+     * 发送评论
+     */
+    private void sendComment(String s) {
+        if (s.isEmpty()) {
+            Toast.makeText(this, R.string.empty_hint, Toast.LENGTH_SHORT).show();
+            return;
+        }
+        mDetailControler.comment(id, s, toId);
+    }
+
+    private void showSoftInput(boolean show) {
+        InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+        if (show) {
+            if (commentUserName != null) {
+                mBinding.commentEdit.setHint(getString(R.string.reply_to, commentUserName));
+            }
+            imm.showSoftInput(mBinding.commentEdit, 0);
+        } else {
+            commentUserName = null;
+            toId = null;
+            mBinding.commentEdit.setHint("");
+            imm.hideSoftInputFromWindow(mBinding.commentEdit.getWindowToken(), 0);
+        }
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.news_menu, menu);
+
+//        if (!getIntent().getBooleanExtra(IS_EDITABLE, false)) {
+        MenuItem item = menu.findItem(R.id.news_edit);
+        if (App.getUser() != null && App.getUser().getUserName().equals(gistUserName)) {
+            item.setVisible(true);
+        } else {
+            item.setVisible(false);
+        }
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.news_share:
+                mShareDialog.show();
+                mBinding.commentLayout.setVisibility(View.GONE);
+                break;
+            case R.id.news_edit:
+                mNewsDetailAdapter.startEdit();
+                break;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        EventBus.getDefault().unregister(this);
+        mDetailControler.onDestroy();
+    }
+
+    @Override
+    public void showLoading() {
+        mBinding.progressBar.setVisibility(View.VISIBLE);
+    }
+
+    @Override
+    public void hideLoading() {
+        mBinding.progressBar.setVisibility(View.GONE);
+        mBinding.refreshLayou.setRefreshing(false);
+    }
+
+    @Override
+    public void showToast(String msg) {
+        Toast.makeText(this, msg, Toast.LENGTH_SHORT).show();
+    }
+
+    @Override
+    public void setData(GistBean gistBean) {
+        setTitle(gistBean.getTitle());
+        mNewsDetailAdapter.setData(gistBean);
+        mCodeReviewDialog.setContent(gistBean.getSource());
+        gistUserName = gistBean.getUser().getUserName();
+        invalidateOptionsMenu();
+    }
+
+    @Override
+    public void loadMoreComments(List<CommentBean> list) {
+        mNewsDetailAdapter.loadMoreComment(list);
+    }
+
+    @Override
+    public void favorite(boolean is) {
+        mNewsDetailAdapter.favorite(is);
+    }
+
+    @Override
+    public void addComment(CommentBean comment) {
+        mNewsDetailAdapter.addComment(comment);
+        EventBus.getDefault().post(new GistEvent(ADD_COMMENT, id));
+    }
+
+    @Override
+    public void fork() {
+        mDetailControler.forkGist(id);
+    }
+
+    @Override
+    public void forkSuccess() {
+        MyGistActivity.startMyShare(this);
+//        Toast.makeText(this, R.string.fork_suc, Toast.LENGTH_SHORT).show();
+    }
+
+    @Override
+    public void refresh(String id) {
+        this.id = id;
+        refresh();
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/activity/GistEditActivity.java b/qpython/src/main/java/org/qpython/qpy/main/activity/GistEditActivity.java
new file mode 100644
index 00000000..15c2937f
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/activity/GistEditActivity.java
@@ -0,0 +1,267 @@
+package org.qpython.qpy.main.activity;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.content.Intent;
+import android.databinding.DataBindingUtil;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.app.AppCompatActivity;
+import android.text.Editable;
+import android.text.SpannableString;
+import android.text.TextUtils;
+import android.text.TextWatcher;
+import android.view.View;
+import android.widget.Toast;
+
+import org.greenrobot.eventbus.EventBus;
+import org.qpython.qpy.R;
+import org.qpython.qpy.databinding.ActivityAddGistBinding;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.app.User;
+import org.qpython.qpy.main.server.gist.GistEvent;
+import org.qpython.qpy.main.server.gist.createScreen.CreateGistControler;
+import org.qpython.qpy.main.server.gist.createScreen.CreateGistView;
+import org.qpython.qpy.texteditor.common.TextFileUtils;
+import org.qpython.qpy.utils.CodePattern;
+import org.qpython.qpy.utils.SolfKeybroadUtil;
+
+import java.io.File;
+
+import rx.Observable;
+import rx.Observer;
+import rx.android.schedulers.AndroidSchedulers;
+import rx.schedulers.Schedulers;
+
+public class GistEditActivity extends AppCompatActivity implements TextWatcher, CreateGistView {
+
+    public static final String GIST_ID = "gist_id";
+    public static final String TITLE   = "filename";
+    public static final String DESC    = "desc";
+    public static final String CODE    = "code";
+
+    public static final String TYPE   = "type";
+    public static final String UPDATE = "update";
+    public static final String NEW    = "new";
+
+    private static final int    DESCRIPTION_TEXT_MAX_LENGTH = 140;
+    private static final String PATH                        = "path";
+    private ActivityAddGistBinding binding;
+    private String                 path;
+
+    private CreateGistControler mCreateGistControler;
+    private String              type;
+    private String              filename;
+
+    public static void start(Context context, String path) {
+        Intent starter = new Intent(context, GistEditActivity.class);
+        starter.putExtra(PATH, path);
+        starter.putExtra(TYPE, NEW);
+        context.startActivity(starter);
+    }
+
+    public static void start(Context context, String gistId, String title, String desc, SpannableString
+            code) {
+        Intent starter = new Intent(context, GistEditActivity.class);
+        starter.putExtra(GIST_ID, gistId);
+        starter.putExtra(TITLE, title);
+        starter.putExtra(DESC, desc);
+        starter.putExtra(CODE, code.toString());
+        starter.putExtra(TYPE, UPDATE);
+
+        context.startActivity(starter);
+    }
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        binding = DataBindingUtil.setContentView(this, R.layout.activity_add_gist);
+        type = getIntent().getStringExtra(TYPE);
+        path = getIntent().getStringExtra(PATH);
+        filename = getIntent().getStringExtra(TITLE);
+        if (TextUtils.isEmpty(filename)) {
+            filename = new File(path).getName();
+        }
+
+        initView();
+        initListener();
+        mCreateGistControler = new CreateGistControler(this);
+    }
+
+    private void initView() {
+        setSupportActionBar(binding.toolbar);
+        setTitle(filename);
+        binding.toolbar.setNavigationIcon(R.drawable.ic_back);
+        binding.toolbar.setNavigationOnClickListener(v -> finish());
+
+        //加载代码数据
+        switch (type) {
+            case NEW:
+                loadCode();
+                break;
+            case UPDATE:
+                String desc = getIntent().getStringExtra(DESC);
+                String code = getIntent().getStringExtra(CODE);
+                binding.description.setText(desc);
+                binding.codeContentTv.setVisibility(View.VISIBLE);
+                binding.codeContentTv.setText(CodePattern.formatPyCode(code));
+                break;
+        }
+    }
+
+    /**
+     * 通过文件路径获取到文件内容
+     */
+    private void loadCode() {
+//        binding.filename.setText(new File(path).getName());
+        binding.progressBar.setVisibility(View.VISIBLE);
+        Observable
+                .create((Observable.OnSubscribe<String>) subscriber -> {
+                    File file = new File(path);
+                    String content = TextFileUtils.readTextFile(file);
+                    if (content == null) {
+                        subscriber.onError(new Throwable("no data"));
+                    }
+                    subscriber.onNext(content);
+                    subscriber.onCompleted();
+                })
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .doOnTerminate(() -> binding.progressBar.setVisibility(View.GONE))
+                .subscribe(new Observer<String>() {
+                    @Override
+                    public void onCompleted() {
+
+                    }
+
+                    @Override
+                    public void onError(Throwable e) {
+
+                    }
+
+                    @Override
+                    public void onNext(String s) {
+                        binding.codeContentTv.setVisibility(View.VISIBLE);
+                        binding.codeContentTv.setText(s);
+//                        mCodeReviewDialog.setContent(s);
+                    }
+                });
+    }
+
+    private void initListener() {
+        binding.description.addTextChangedListener(this);
+//        binding.filename.addTextChangedListener(this);
+        binding.sendBtn.setOnClickListener(v -> {
+            shareCode();
+            SolfKeybroadUtil.showSolfInput(binding.sendBtn, false);
+        });
+
+    }
+
+    @Override
+    public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+
+    }
+
+    @Override
+    public void onTextChanged(CharSequence s, int start, int before, int count) {
+
+    }
+
+    @SuppressLint("SetTextI18n")
+    @Override
+    public void afterTextChanged(Editable s) {
+        int length = binding.description.length();
+        binding.textCount.setText(DESCRIPTION_TEXT_MAX_LENGTH - length + "");
+        if (length > DESCRIPTION_TEXT_MAX_LENGTH) {
+            binding.textCount.setTextColor(getResources().getColor(R.color.error));
+            binding.description.setError(getString(R.string.too_long_hint));
+        } else {
+            binding.textCount.setTextColor(getResources().getColor(R.color.text_gray));
+            binding.description.setError(null);
+        }
+        if (binding.description.length() > 0
+                && binding.description.length() < 140) {
+            binding.sendBtn.setClickable(true);
+            binding.sendBtn.setTextColor(getResources().getColor(R.color.colorAccent));
+        } else {
+            binding.sendBtn.setClickable(false);
+            binding.sendBtn.setTextColor(getResources().getColor(R.color.text_gray));
+        }
+    }
+
+    /**
+     * 发布代码分享
+     */
+    private void shareCode() {
+        if (loginCheck()) {
+            String content = binding.codeContentTv.getText().toString();
+            String summary = binding.description.getText().toString();
+            boolean isSahre = binding.gistShare.isChecked();
+            if (checkData(filename, summary)) {
+                switch (type) {
+                    case NEW:
+                        mCreateGistControler.createGist(
+                                filename,
+                                summary,
+                                content,
+                                path.contains(".ipynb") ? "notebook" : "script",
+                                isSahre);
+                        break;
+                    case UPDATE:
+                        mCreateGistControler.updateGist(
+                                getIntent().getStringExtra(GIST_ID),
+                                filename,
+                                summary,
+                                content);
+                        break;
+                }
+            }
+        }
+    }
+
+    private boolean checkData(String title, String summary) {
+        if (TextUtils.isEmpty(title)) {
+            showToast("filename must be not empty!");
+            return false;
+        }
+        if (TextUtils.isEmpty(summary)) {
+            showToast("summary must be not empty!");
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public void showLoading() {
+        binding.progressBar.setVisibility(View.VISIBLE);
+    }
+
+    @Override
+    public void hideLoading() {
+        binding.progressBar.setVisibility(View.GONE);
+    }
+
+    @Override
+    public void showToast(String msg) {
+        Toast.makeText(this, msg, Toast.LENGTH_SHORT).show();
+    }
+
+    @Override
+    public void onSuccess(String id) {
+        EventBus.getDefault().post(new GistEvent(GistEvent.UPDATE_GIST_SUC));
+        //MyGistActivity.startMyShare(this);
+        //GistActivity.startCommunity(this);
+        finish();
+    }
+
+    private boolean loginCheck() {
+        User user = App.getUser();
+        if (user == null) {
+            showToast(getString(R.string.login_first));
+            return false;
+        } else {
+            return true;
+        }
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/activity/HomeMainActivity.java b/qpython/src/main/java/org/qpython/qpy/main/activity/HomeMainActivity.java
index 7d75ba65..c058e0cd 100644
--- a/qpython/src/main/java/org/qpython/qpy/main/activity/HomeMainActivity.java
+++ b/qpython/src/main/java/org/qpython/qpy/main/activity/HomeMainActivity.java
@@ -1,421 +1,473 @@
-package org.qpython.qpy.main.activity;
-
-import android.Manifest;
-import android.content.Intent;
-import android.content.res.Resources;
-import android.os.Bundle;
-import android.os.Environment;
-import android.support.design.widget.NavigationView;
-import android.support.v4.app.Fragment;
-import android.support.v4.view.GravityCompat;
-import android.support.v4.widget.DrawerLayout;
-import android.support.v7.app.ActionBarDrawerToggle;
-import android.support.v7.widget.Toolbar;
-import android.util.Log;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-import android.widget.LinearLayout;
-import android.widget.Toast;
-
-import com.quseit.common.updater.Updater;
-import com.quseit.common.updater.callback.DialogCallback;
-
-import org.greenrobot.eventbus.Subscribe;
-import org.qpython.qpy.R;
-import org.qpython.qpy.console.TermActivity;
-import org.qpython.qpy.main.dialog.LogoDialog;
-import org.qpython.qpy.main.dialog.RunProgramDialog;
-import org.qpython.qpy.main.event.RunProgramEvent;
-import org.qpython.qpy.main.utils.Bus;
-import org.qpython.qpy.main.utils.Utils;
-import org.qpython.qpysdk.QPySDK;
-import org.qpython.qpysdk.utils.FileHelper;
-import org.qpython.qsl4a.QPyScriptService;
-import org.renpy.android.ResourceManager;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-import butterknife.OnClick;
-import butterknife.Unbinder;
-import cn.jpush.android.api.JPushInterface;
-import de.hdodenhof.circleimageview.CircleImageView;
-
-public class HomeMainActivity extends BaseActivity implements NavigationView.OnNavigationItemSelectedListener {
-    private Unbinder mUnbinder;
-
-    public static final String URL_WIKI = "http://wiki.qpython.org";
-    public static final String URL_GROUP = "http://groups.google.com/group/qpython";
-    public static final String URL_DOCS = "http://docs.qpython.org";
-    public static final String URL_LIB_MANAGER = "http://qpypi.qpython.org";
-    public static final int REQUEST_OPEN_FILE = 1;
-
-    @BindView(R.id.toolbar)
-    Toolbar mToolbar;
-    @BindView(R.id.nav_view)
-    NavigationView mNavigationView;
-    @BindView(R.id.drawer_layout)
-    DrawerLayout mDrawerLayout;
-    @BindView(R.id.logo_image)
-    CircleImageView mLogoImage;
-    @BindView(R.id.item_lin_console)
-    LinearLayout mItemConsole;
-    @BindView(R.id.item_lin_editor)
-    LinearLayout mItemEditor;
-    @BindView(R.id.item_lin_program)
-    LinearLayout mItemProgram;
-    @BindView(R.id.item_lin_library_manager)
-    LinearLayout mItemLibraryManager;
-
-    private long mExitTime = 0;
-
-    @OnClick({R.id.logo_image, R.id.item_lin_console, R.id.item_lin_editor, R.id.item_lin_program, R.id.item_lin_library_manager})
-    public void onClick(View view) {
-        switch (view.getId()) {
-            case R.id.logo_image:
-                showLogoDialog();
-                break;
-            case R.id.item_lin_console:
-                TermActivity.startActivity(this);
-                break;
-            case R.id.item_lin_editor:
-                //EditorMainActivity.startActivity(this);
-                break;
-            case R.id.item_lin_program:
-                startProgramExplorerActivity();
-                break;
-            case R.id.item_lin_library_manager:
-                Utils.startWebActivityWithUrl(this, getString(R.string.lib_manager), URL_LIB_MANAGER,"",false, false);
-                break;
-        }
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_main);
-        mUnbinder = ButterKnife.bind(this);
-        startPyService();
-        Updater.checkUpdate(new DialogCallback(this, true));
-        Bus.getDefault().register(this);
-        init();
-    }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        Bus.getDefault().unregister(this);
-        mUnbinder.unbind();
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        JPushInterface.onResume(this);
-    }
-
-
-    @Override
-    protected void onPause() {
-        super.onPause();
-        JPushInterface.onPause(this);
-    }
-
-    private void startPyService() {
-        Intent intent = new Intent(this, QPyScriptService.class);
-        startService(intent);
-    }
-
-    private void openQpySDK() {
-        QPySDK qpysdk = new QPySDK(HomeMainActivity.this, HomeMainActivity.this);
-        File externalStorage = new File(Environment.getExternalStorageDirectory(), "qpython");
-
-        qpysdk.extractRes("private", HomeMainActivity.this.getFilesDir());
-        checkPermissionDo(Manifest.permission.WRITE_EXTERNAL_STORAGE , new BaseActivity.PermissionAction() {
-            @Override
-            public void onGrant() {
-                FileHelper.createDirIfNExists(externalStorage+"/cache");
-                qpysdk.extractRes("public", new File(externalStorage + "/lib"));
-                extractRes();
-
-            }
-
-            @Override
-            public void onDeny() {
-                Toast.makeText(HomeMainActivity.this, "Unable to extract python files", Toast.LENGTH_SHORT).show();
-            }
-        });
-    }
-
-    private boolean checkExpired(final String resource, String filesDir) {
-        ResourceManager resourceManager = new ResourceManager(this);
-
-        String data_version = resourceManager.getString(resource + "_version");
-        String disk_version = "0";
-
-        // If no version, no unpacking is necessary.
-        if (data_version == null) {
-            return false;
-        }
-
-        // Check the current disk version, if any.
-        String disk_version_fn = filesDir + "/" + resource + ".version";
-
-        try {
-            byte buf[] = new byte[64];
-            InputStream is = new FileInputStream(disk_version_fn);
-            int len = is.read(buf);
-            disk_version = new String(buf, 0, len);
-            is.close();
-        } catch (Exception e) {
-
-            disk_version = "0";
-            //Mint.logException(e);
-
-        }
-
-        //Log.d(TAG, "data_version:"+Math.round(Double.parseDouble(data_version))+"-disk_version:"+Math.round(Double.parseDouble(disk_version))+"-RET:"+(int)(Double.parseDouble(data_version)-Double.parseDouble(disk_version)));
-        if ((int)(Double.parseDouble(data_version)-Double.parseDouble(disk_version))>0 || disk_version.equals("0")) {
-            try {
-                FileOutputStream os = new FileOutputStream(disk_version_fn);
-                try {
-                    os.write(data_version.getBytes());
-                    os.close();
-
-                } catch (IOException e) {
-                    e.printStackTrace();
-                    //Mint.logException(e);
-
-                }
-
-            } catch (FileNotFoundException e) {
-                e.printStackTrace();
-                //Mint.logException(e);
-
-            }
-
-
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    public void extractRes() {
-        File externalStorage = new File(Environment.getExternalStorageDirectory(), "qpython");
-
-        //File res = new File(Environment.getExternalStorageDirectory().getAbsolutePath() + "/" + this.getPackageName() + "/"+(isQpy3?CONF.DFROM_QPY3:CONF.DFROM_QPY2));
-        if (checkExpired("public",new File(externalStorage+"").getAbsolutePath())) {
-            String name, sFileName;
-            InputStream content;
-
-            R.raw a = new R.raw();
-            java.lang.reflect.Field[] t = R.raw.class.getFields();
-            Resources resources = getResources();
-
-            boolean succeed = true;
-
-            for (int i = 0; i < t.length; i++) {
-                try {
-                    name = resources.getText(t[i].getInt(a)).toString();
-                    sFileName = name.substring(name.lastIndexOf('/') + 1, name.length());
-                    content = getResources().openRawResource(t[i].getInt(a));
-                    content.reset();
-
-                // python project
-                    if(sFileName.equals("sampleproject.zip")) {
-                        Utils.createDirectoryOnExternalStorage( "qpython" );
-                        Utils.createDirectoryOnExternalStorage( "qpython/projects");
-                        Utils.createDirectoryOnExternalStorage( "qpython/projects/Album Sample");
-
-                        Utils.unzip(content, Environment.getExternalStorageDirectory().getAbsolutePath() + "/qpython/projects/Album Sample/", false);
-
-                    } else if (sFileName.equals("showcase.zip")) {
-                        Utils.createDirectoryOnExternalStorage( "qpython" );
-                        Utils.createDirectoryOnExternalStorage( "qpython/projects" );
-                        Utils.createDirectoryOnExternalStorage( "qpython/projects/Kivy Showcase");
-
-                        Utils.unzip(content, Environment.getExternalStorageDirectory().getAbsolutePath() + "/qpython/projects/Kivy Showcase/", false);
-
-                    } else if (sFileName.equals("samplewebapp.zip")) {
-                        Utils.createDirectoryOnExternalStorage( "qpython" );
-                        Utils.createDirectoryOnExternalStorage( "qpython/projects");
-                        Utils.createDirectoryOnExternalStorage( "qpython/projects/WebApp Sample");
-
-                        Utils.unzip(content, Environment.getExternalStorageDirectory().getAbsolutePath() + "/qpython/projects/WebApp Sample/", false);
-
-                    } else if (sFileName.equals("scripts.zip")) {
-                        Utils.createDirectoryOnExternalStorage( "qpython" );
-                        Utils.createDirectoryOnExternalStorage( "qpython/scripts" );
-                        Utils.unzip(content, Environment.getExternalStorageDirectory().getAbsolutePath() + "/qpython/scripts/", false);
-                    }
-
-                } catch (Exception e) {
-                    Log.e("HomeMainActivity", "Failed to copyResourcesToLocal", e);
-                    //Mint.logException(e);
-
-                    succeed = false;
-                }
-            } // end for all files in res/raw
-        }
-    }
-
-    private void init() {
-        setSupportActionBar(mToolbar);
-        ActionBarDrawerToggle toggle = new ActionBarDrawerToggle(this, mDrawerLayout, mToolbar, R.string.navigation_drawer_open, R.string.navigation_drawer_close);
-        mDrawerLayout.addDrawerListener(toggle);
-        toggle.syncState();
-        mNavigationView.setNavigationItemSelectedListener(this);
-
-        openQpySDK();
-    }
-
-
-    @Override
-    public void onBackPressed() {
-        if (mDrawerLayout.isDrawerOpen(GravityCompat.START)) {
-            mDrawerLayout.closeDrawer(GravityCompat.START);
-            return;
-        }
-
-        if ((System.currentTimeMillis() - mExitTime) > 2000) {
-            Toast.makeText(this, getString(R.string.back_app), Toast.LENGTH_SHORT).show();
-            mExitTime = System.currentTimeMillis();
-            return;
-        }
-
-        super.onBackPressed();
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        getMenuInflater().inflate(R.menu.activity_main_menu, menu);
-        return true;
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case R.id.action_setting:
-                AboutActivity.startActivity(this);
-                break;
-        }
-        return super.onOptionsItemSelected(item);
-    }
-
-    @Override
-    public boolean onNavigationItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case R.id.nav_document:
-                Utils.startWebActivityWithUrl(this, getString(R.string.document), URL_DOCS,"", false, false);
-                break;
-            case R.id.nav_forum:
-                Utils.startWebActivityWithUrl(this, getString(R.string.forum), URL_GROUP,"",false, false);
-                break;
-            case R.id.nav_wiki:
-                Utils.startWebActivityWithUrl(this, getString(R.string.wiki), URL_WIKI,"",false, false);
-                break;
-        }
-        mDrawerLayout.closeDrawer(GravityCompat.START);
-        return true;
-    }
-
-    @Override
-    public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-        switch (resultCode) {
-            case RESULT_OK:
-                //打开文件
-                Log.e("------------------->>>>", data.getStringExtra("file"));
-                break;
-        }
-    }
-
-    private void showLogoDialog() {
-        LogoDialog.newInstance().show(getSupportFragmentManager(), LogoDialog.TAG);
-    }
-
-
-    @Subscribe
-    public void startQrCodeActivity(StartQrCodeActivityEvent event) {
-        checkPermissionDo(Manifest.permission.CAMERA, new BaseActivity.PermissionAction() {
-            @Override
-            public void onGrant() {
-                QrCodeActivity.start(HomeMainActivity.this);
-            }
-
-            @Override
-            public void onDeny() {
-                Toast.makeText(HomeMainActivity.this, getString(R.string.no_camera), Toast.LENGTH_SHORT).show();
-            }
-        });
-    }
-
-    @Subscribe
-    public void showProgramDialog(ShowProgramDialogEvent event) {
-        checkPermissionDo(Manifest.permission.READ_EXTERNAL_STORAGE, new PermissionAction() {
-            @Override
-            public void onGrant() {
-                if (event.isProject) {
-                    Fragment f = RunProgramDialog.newInstance(RunProgramDialog.TYPE_PROJECT);
-                    getSupportFragmentManager().beginTransaction()
-                            .add(f, RunProgramDialog.TAG)
-                            .commitAllowingStateLoss();
-                } else {
-                    Fragment f = RunProgramDialog.newInstance(RunProgramDialog.TYPE_SCRIPT);
-                    getSupportFragmentManager().beginTransaction()
-                            .add(f, RunProgramDialog.TAG)
-                            .commitAllowingStateLoss();
-                }
-            }
-
-            @Override
-            public void onDeny() {
-                Toast.makeText(HomeMainActivity.this, R.string.no_storage, Toast.LENGTH_SHORT).show();
-            }
-        });
-    }
-
-    @Subscribe
-    public void runProgram(RunProgramEvent event) {
-        Log.d("HomeMainActivity", "");
-        if (event.isProject) {
-            playProject(event.path, true);
-        } else {
-            playScript(event.path, null, true);
-        }
-    }
-
-    private void startProgramExplorerActivity() {
-        checkPermissionDo(Manifest.permission.READ_EXTERNAL_STORAGE, new PermissionAction() {
-            @Override
-            public void onGrant() {
-                //ProgramExplorerActivity.start(HomeMainActivity.this, REQUEST_OPEN_FILE);
-            }
-
-            @Override
-            public void onDeny() {
-                Toast.makeText(HomeMainActivity.this, getString(R.string.no_storage), Toast.LENGTH_SHORT).show();
-            }
-        });
-    }
-
-    public static class StartQrCodeActivityEvent {
-
-    }
-
-    public static class ShowProgramDialogEvent {
-        public final boolean isProject;
-
-        public ShowProgramDialogEvent(boolean isProject) {
-            this.isProject = isProject;
-        }
-    }
-}
+package org.qpython.qpy.main.activity;
+
+import android.Manifest;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.content.pm.PackageManager;
+import android.content.res.Resources;
+import android.databinding.DataBindingUtil;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.Environment;
+import android.preference.PreferenceManager;
+import android.support.v4.app.ActivityCompat;
+import android.support.v7.app.AlertDialog;
+import android.text.Html;
+import android.util.Log;
+import android.view.View;
+import android.widget.Toast;
+
+import com.quseit.util.NAction;
+import com.quseit.util.Utils;
+
+import org.greenrobot.eventbus.Subscribe;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.qpython.qpy.R;
+import org.qpython.qpy.console.TermActivity;
+import org.qpython.qpy.databinding.ActivityMainBinding;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.app.CONF;
+import org.qpython.qpy.main.server.MySubscriber;
+import org.qpython.qpy.main.server.model.CourseAdModel;
+import org.qpython.qpy.main.utils.Bus;
+import org.qpython.qpy.texteditor.EditorActivity;
+import org.qpython.qpy.texteditor.TedLocalActivity;
+import org.qpython.qpy.utils.UpdateHelper;
+import org.qpython.qpysdk.QPyConstants;
+import org.qpython.qpysdk.QPySDK;
+import org.qpython.qpysdk.utils.FileHelper;
+import org.qpython.qsl4a.QPyScriptService;
+
+import java.io.File;
+import java.io.InputStream;
+
+import rx.android.schedulers.AndroidSchedulers;
+import rx.schedulers.Schedulers;
+
+import static org.qpython.qpysdk.QPyConstants.PYTHON_2;
+
+public class HomeMainActivity extends BaseActivity {
+    private static final String URL_COMMUNITY = "https://www.qpython.org/community.html";
+    private static final String URL_COURSE    = "https://edu.qpython.org/?from=qpy2";
+    private static final String USER_NAME     = "username";
+    private static final String TAG = "HomeMainActivity";
+
+    private static final int LOGIN_REQUEST_CODE = 136;
+
+    private ActivityMainBinding binding;
+
+    public static void start(Context context) {
+        Intent starter = new Intent(context, HomeMainActivity.class);
+        context.startActivity(starter);
+    }
+
+    public static void start(Context context, String userName) {
+        Intent starter = new Intent(context, HomeMainActivity.class);
+        starter.putExtra(USER_NAME, userName);
+        context.startActivity(starter);
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        binding = DataBindingUtil.setContentView(this, R.layout.activity_main);
+        //App.setActivity(this);
+        startMain();
+        handlePython3(getIntent());
+        handleNotification(savedInstanceState);
+    }
+
+    private void initIcon() {
+        switch (NAction.getQPyInterpreter(this)) {
+            case "3.x":
+                binding.icon.setImageResource(R.drawable.img_home_logo_3);
+                break;
+            case "2.x":
+                binding.icon.setImageResource(R.drawable.img_home_logo);
+                break;
+        }
+    }
+
+    private void initUser() {
+        if (App.getUser() == null) {
+            binding.login.setVisibility(View.GONE);
+        } else {
+            binding.login.setText(Html.fromHtml(getString(R.string.welcome_s, App.getUser().getNick())));
+        }
+    }
+
+    private void startMain() {
+        initListener();
+        startPyService();
+        Bus.getDefault().register(this);
+        init();
+        if (ActivityCompat.checkSelfPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED) {
+            UpdateHelper.checkConfUpdate(this, QPyConstants.BASE_PATH);
+        }
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        initUser();
+        initIcon();
+        handleNotification();
+    }
+
+    @Override
+    protected void onNewIntent(Intent intent) {
+        super.onNewIntent(intent);
+        handlePython3(intent);
+    }
+
+    private void initListener() {
+        binding.ivScan.setOnClickListener(v -> Bus.getDefault().post(new StartQrCodeActivityEvent()));
+        binding.login.setOnClickListener(v -> {
+            if (App.getUser() == null) {
+                sendEvent(getString(R.string.event_login));
+                startActivityForResult(new Intent(this, SignInActivity.class), LOGIN_REQUEST_CODE);
+            } else {
+                sendEvent(getString(R.string.event_me));
+                UserActivity.start(this);
+            }
+        });
+
+        binding.llTerminal.setOnClickListener(v -> {
+            TermActivity.startActivity(HomeMainActivity.this);
+            sendEvent(getString(R.string.event_term));
+        });
+
+        binding.llTerminal.setOnLongClickListener(v -> {
+            CharSequence[] chars = new CharSequence[]{ this.getString(R.string.python_interpreter), this.getString(R.string.action_notebook), this.getString(R.string.shell_terminal)};
+            new AlertDialog.Builder(this, R.style.MyDialog)
+                    .setTitle(R.string.choose_action)
+                    .setItems(chars, (dialog, which) -> {
+                        switch (which) {
+                            case 0: // Create Shortcut
+                                TermActivity.startActivity(HomeMainActivity.this);
+                                break;
+                            case 1:
+                                NotebookActivity.start(HomeMainActivity.this, null, false);
+                                break;
+                            case 2:
+                                TermActivity.startShell(HomeMainActivity.this);
+                                break;
+                        }
+                    }).setNegativeButton(getString(R.string.close), new DialogInterface.OnClickListener() {
+
+                @Override
+                public void onClick(DialogInterface dialogInterface, int i) {
+                    dialogInterface.dismiss();
+                }
+            })
+                    .show();
+
+            return true;
+        });
+        binding.llEditor.setOnClickListener(v -> {
+            EditorActivity.start(this);
+            sendEvent(getString(R.string.event_editor));
+        });
+        binding.llLibrary.setOnClickListener(v -> {
+            LibActivity.start(this);
+            sendEvent(getString(R.string.event_qpypi));
+        });
+//        binding.llCommunity.setOnClickListener(v -> {
+//            startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(URL_COMMUNITY)));
+//            sendEvent(getString(R.string.event_commu));
+//        });
+//        binding.llGist.setOnClickListener(view -> GistActivity.startCommunity(HomeMainActivity.this)
+//        );
+        binding.llSetting.setOnClickListener(v -> {
+            SettingActivity.startActivity(this);
+            sendEvent(getString(R.string.event_setting));
+        });
+        binding.llFile.setOnClickListener(v -> {
+            TedLocalActivity.start(this, TedLocalActivity.REQUEST_HOME_PAGE);
+            sendEvent(getString(R.string.event_file));
+        });
+        binding.llQpyApp.setOnClickListener(v -> {
+                AppListActivity.start(this, AppListActivity.TYPE_SCRIPT);
+            overridePendingTransition(R.anim.fade_in, R.anim.fade_out);
+            sendEvent(getString(R.string.event_top));
+        });
+
+        binding.llCourse.setOnClickListener(v -> {
+            CourseActivity.start(HomeMainActivity.this);
+            sendEvent(getString(R.string.event_course));
+        });
+/*        binding.llCourse.setOnClickListener(v ->
+                QWebViewActivity.start(HomeMainActivity.this, getString(R.string.course), URL_COURSE));
+
+        initCourseListener();*/
+    }
+
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        Bus.getDefault().unregister(this);
+    }
+
+    private void handlePython3(Intent intent) {
+        String action = intent.getAction();
+        if (action != null && action.equals(getString(R.string.action_from_python_three))
+                && NAction.getQPyInterpreter(this).equals(PYTHON_2)) {
+            new AlertDialog.Builder(this)
+                    .setTitle(R.string.py2_now)
+                    .setMessage(R.string.switch_py3_hint)
+                    .setNegativeButton(R.string.no, (dialog, which) -> dialog.dismiss())
+                    .setPositiveButton(R.string.goto_setting, (dialog, which) -> SettingActivity.startActivity(this))
+                    .create()
+                    .show();
+        }
+    }
+
+    private void handleNotification(Bundle bundle) {
+        if (bundle == null) return;
+        if (!bundle.getBoolean("force") && !PreferenceManager.getDefaultSharedPreferences(this).getBoolean(getString(R.string.key_hide_push), true)) {
+            return;
+        }
+        String type = bundle.getString("type", "");
+        if (!type.equals("")) {
+            String link = bundle.getString("link", "");
+            String title = bundle.getString("title", "");
+
+            switch (type) {
+                case "in":
+                    QWebViewActivity.start(this, title, link);
+                    break;
+                case "ext":
+                    Intent starter = new Intent(Intent.ACTION_VIEW, Uri.parse(link));
+                    startActivity(starter);
+                    break;
+            }
+        }
+    }
+
+    private void handleNotification() {
+        if (!PreferenceManager.getDefaultSharedPreferences(this).getBoolean(getString(R.string.key_hide_push), true)) {
+            return;
+        }
+        SharedPreferences sharedPreferences = getSharedPreferences(CONF.NOTIFICATION_SP_NAME, MODE_PRIVATE);
+        try {
+            String notifString = sharedPreferences.getString(CONF.NOTIFICATION_SP_OBJ, "");
+            if ("".equals(notifString)) {
+                return;
+            }
+            JSONObject extra = new JSONObject(notifString);
+            String type = extra.getString("type");
+            String link = extra.getString("link");
+            String title = extra.getString("title");
+            switch (type) {
+                case "in":
+                    QWebViewActivity.start(this, title, link);
+                    break;
+                case "ext":
+                    Intent starter = new Intent(Intent.ACTION_VIEW, Uri.parse(link));
+                    startActivity(starter);
+                    break;
+            }
+            sharedPreferences.edit().clear().apply();
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+    }
+
+//    private void initCourseListener() {
+//        App.getService().getCourseAd().subscribeOn(Schedulers.io())
+//                .observeOn(AndroidSchedulers.mainThread())
+//                .subscribe(new MySubscriber<CourseAdModel>() {
+//                    @Override
+//                    public void onNext(CourseAdModel o) {
+//                        super.onNext(o);
+//                        if ("0".equals(o.getQpy().getCourse_open())) {
+//                            // open web
+//                            binding.llCourse.setOnClickListener(v ->
+//                                    QWebViewActivity.start(HomeMainActivity.this, getString(R.string.course), URL_COURSE));
+//                        } else {
+//                            // open with native
+//                            binding.llCourse.setOnClickListener(v -> {
+//                                CourseActivity.start(HomeMainActivity.this);
+//                                sendEvent(getString(R.string.event_course));
+//                            });
+//                        }
+//                    }
+//
+//                    @Override
+//                    public void onError(Throwable e) {
+//                        binding.llCourse.setOnClickListener(v ->
+//                                QWebViewActivity.start(HomeMainActivity.this, getString(R.string.course), URL_COURSE));
+//                    }
+//                });
+//    }
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+    }
+
+    private void startPyService() {
+        Log.d(TAG, "startPyService");
+        Intent intent = new Intent(this, QPyScriptService.class);
+        startService(intent);
+    }
+
+    private void openQpySDK() {
+        Log.d("HomeMainActivity", "openQpySDK");
+        String[] permssions = {Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE};
+        checkPermissionDo(permssions, new BaseActivity.PermissionAction() {
+            @Override
+            public void onGrant() {
+                //这里只执行一次做为初始化
+
+                if (!NAction.isQPyInterpreterSet(HomeMainActivity.this)) {
+                    new AlertDialog.Builder(HomeMainActivity.this, R.style.MyDialog)
+                            .setTitle(R.string.notice)
+                            .setMessage(R.string.py2_or_3)
+                            .setPositiveButton(R.string.use_py3, (dialog1, which) -> initQpySDK3())
+                            .setNegativeButton(R.string.use_py2, (dialog1, which) -> initQpySDK())
+                            .create()
+                            .show();
+                }
+            }
+
+            @Override
+            public void onDeny() {
+                Toast.makeText(HomeMainActivity.this,  getString(R.string.grant_storage_hint), Toast.LENGTH_SHORT).show();
+            }
+        });
+    }
+
+    /**
+     * 在工作线程中作初始化
+     */
+    private void initQpySDK3() {
+        Log.d(TAG, "initQpySDK3");
+        NAction.setQPyInterpreter(HomeMainActivity.this, "3.x");
+        initQPy(true);
+        initIcon();
+    }
+    private void initQpySDK() {
+        Log.d(TAG, "initQpySDK");
+        initQPy(false);
+        NAction.setQPyInterpreter(HomeMainActivity.this, "2.x");
+        initIcon();
+    }
+
+    private void initQPy(boolean py3) {
+        new Thread(() -> {
+            QPySDK qpysdk = new QPySDK(HomeMainActivity.this, HomeMainActivity.this);
+            //这里会在切换qpy3的时候再次释放相关资源
+            qpysdk.extractRes(py3?"private31":"private1", HomeMainActivity.this.getFilesDir());
+            qpysdk.extractRes(py3?"private32":"private2", HomeMainActivity.this.getFilesDir());
+            qpysdk.extractRes(py3?"private33":"private3", HomeMainActivity.this.getFilesDir());
+            if (py3) {
+                qpysdk.extractRes("notebook3", HomeMainActivity.this.getFilesDir());
+            }
+            File externalStorage = new File(Environment.getExternalStorageDirectory(), "qpython");
+            FileHelper.createDirIfNExists(externalStorage + "/cache");
+            FileHelper.createDirIfNExists(externalStorage + "/log");
+            FileHelper.createDirIfNExists(externalStorage + "/notebooks");
+
+            qpysdk.extractRes(py3?"public3":"public", new File(externalStorage + "/lib"));
+
+            qpysdk.extractRes("ipynb", new File(externalStorage + "/notebooks"));
+
+            extractRes();
+        }).start();
+    }
+
+
+    /**
+     * 初始化内置python项目
+     */
+    public void extractRes() {
+        File externalStorage = new File(QPyConstants.ABSOLUTE_PATH);
+        if (checkExpired("public", new File(externalStorage + "/lib").getAbsolutePath(), "programs"+NAction.getPyVer(this))) {
+            String name, sFileName;
+            InputStream content;
+
+            R.raw a = new R.raw();
+            java.lang.reflect.Field[] t = R.raw.class.getFields();
+            Resources resources = getResources();
+
+            for (int i = 0; i < t.length; i++) {
+                try {
+                    name = resources.getText(t[i].getInt(a)).toString();
+                    sFileName = name.substring(name.lastIndexOf('/') + 1, name.length());
+                    content = getResources().openRawResource(t[i].getInt(a));
+                    content.reset();
+
+                    if (sFileName.equals("projects2.zip")) {
+                        Utils.createDirectoryOnExternalStorage("qpython/projects/");
+                        Utils.unzip(content, Environment.getExternalStorageDirectory().getAbsolutePath() + "/qpython/projects/", false);
+
+                    } else if (sFileName.equals("scripts2.zip")) {
+                        Utils.unzip(content, Environment.getExternalStorageDirectory().getAbsolutePath() + "/qpython/scripts/", false);
+
+                    } else if (sFileName.equals("projects3.zip")) {
+                        Utils.createDirectoryOnExternalStorage("qpython/projects3/");
+                        Utils.unzip(content, Environment.getExternalStorageDirectory().getAbsolutePath() + "/qpython/projects3/", false);
+
+                    } else if (sFileName.equals("scripts3.zip")) {
+                        Utils.createDirectoryOnExternalStorage("qpython/scripts3/");
+                        Utils.unzip(content, Environment.getExternalStorageDirectory().getAbsolutePath() + "/qpython/scripts3/", false);
+
+                    } if (sFileName.equals("ipynb.zip")) {
+                        Utils.createDirectoryOnExternalStorage("qpython/notebooks/");
+                        Utils.unzip(content, Environment.getExternalStorageDirectory().getAbsolutePath() + "/qpython/notebooks/", false);
+                    }
+
+                } catch (Exception e) {
+                    Log.e("HomeMainActivity", "Failed to copyResourcesToLocal", e);
+
+                }
+            }
+        }
+    }
+
+    private void init() {
+        openQpySDK();
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (resultCode == RESULT_OK) {
+            switch (requestCode) {
+                case LOGIN_REQUEST_CODE:
+                    binding.login.setText(Html.fromHtml(getString(R.string.welcome_s, App.getUser().getNick())));
+                    break;
+            }
+        }
+    }
+
+    @Subscribe
+    public void startQrCodeActivity(StartQrCodeActivityEvent event) {
+        String[] permissions = {Manifest.permission.CAMERA};
+
+        checkPermissionDo(permissions, new BaseActivity.PermissionAction() {
+            @Override
+            public void onGrant() {
+                QrCodeActivity.start(HomeMainActivity.this);
+            }
+
+            @Override
+            public void onDeny() {
+                Toast.makeText(HomeMainActivity.this, getString(R.string.no_camera), Toast.LENGTH_SHORT).show();
+            }
+        });
+    }
+
+    public static class StartQrCodeActivityEvent {
+
+    }
+
+    private void sendEvent(String evenName) {
+
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/activity/LibActivity.java b/qpython/src/main/java/org/qpython/qpy/main/activity/LibActivity.java
new file mode 100644
index 00000000..f9b9315a
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/activity/LibActivity.java
@@ -0,0 +1,153 @@
+package org.qpython.qpy.main.activity;
+
+import android.app.DownloadManager;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.databinding.DataBindingUtil;
+import android.graphics.Color;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.design.widget.TabLayout;
+import android.support.v4.app.Fragment;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.Toolbar;
+import android.view.Menu;
+import android.view.MenuItem;
+
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
+import org.qpython.qpy.R;
+import org.qpython.qpy.databinding.ActivityLibBinding;
+import org.qpython.qpy.main.adapter.LibPagerAdapter;
+import org.qpython.qpy.main.fragment.RefreshFragment;
+import org.qpython.qpy.main.receiver.DownloadReceiver;
+
+/**
+ * Manager Lib
+ * Created by Hmei on 2017-05-27.
+ */
+
+public class LibActivity extends AppCompatActivity {
+    private static final String OPEN_AIPY_ACTION = "org.qpython.qpy.OPEN_AIPY_FRAGMENT";
+    private ActivityLibBinding binding;
+    private DownloadReceiver   receiver;
+    private int                position;
+    private LibPagerAdapter    adapter;
+
+    public static void start(Context context) {
+        Intent starter = new Intent(context, LibActivity.class);
+        context.startActivity(starter);
+    }
+
+    @Override
+    protected void onStart() {
+        super.onStart();
+        EventBus.getDefault().register(this);
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        registerReceiver(receiver, new IntentFilter(
+                DownloadManager.ACTION_DOWNLOAD_COMPLETE));
+    }
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        binding = DataBindingUtil.setContentView(this, R.layout.activity_lib);
+        receiver = new DownloadReceiver();
+
+        Toolbar toolbar = findViewById(R.id.toolbar);
+        toolbar.setTitleTextColor(Color.WHITE);
+        setSupportActionBar(toolbar);
+        setTitle(R.string.lib_manager);
+        toolbar.setNavigationIcon(R.drawable.ic_back);
+        toolbar.setNavigationOnClickListener(v -> finish());
+
+        initTabs();
+        handleIntent();
+    }
+
+    private void handleIntent() {
+        Intent intent = getIntent();
+        String action = intent.getAction() == null ? "" : intent.getAction();
+        switch (action) {
+            case OPEN_AIPY_ACTION:
+                binding.vp.setCurrentItem(2);
+                break;
+        }
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        EventBus.getDefault().unregister(this);
+        try {
+            if (receiver != null) {
+                unregisterReceiver(receiver);
+            }
+        } catch (IllegalArgumentException ignore) {
+            // TODO: 2017-06-21 reopen this activity may cause crash, have not find the reason yet
+        }
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.refresh_menu, menu);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == R.id.refresh_menu) {
+            Fragment currentFragment = adapter.getItem(position);
+            if (currentFragment instanceof RefreshFragment) {
+                ((RefreshFragment) currentFragment).refresh(true);
+            }
+        }
+        return true;
+    }
+
+    private void initTabs() {
+        binding.tabs.addTab(binding.tabs.newTab().setText(R.string.tools));
+        binding.tabs.addTab(binding.tabs.newTab().setText(R.string.qpypi));
+        binding.tabs.addTab(binding.tabs.newTab().setText(R.string.aipy));
+        binding.tabs.setTabGravity(TabLayout.GRAVITY_FILL);
+        binding.tabs.setTabTextColors(getResources().getColor(R.color.white), getResources().getColor(R.color.colorAccent));
+        binding.tabs.setSelectedTabIndicatorColor(getResources().getColor(R.color.colorAccent));
+        adapter = new LibPagerAdapter(getSupportFragmentManager());
+        binding.vp.setAdapter(adapter);
+
+        binding.vp.addOnPageChangeListener(new TabLayout.TabLayoutOnPageChangeListener(binding.tabs));
+        binding.tabs.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
+            @Override
+            public void onTabSelected(TabLayout.Tab tab) {
+                binding.vp.setCurrentItem(tab.getPosition());
+                position = tab.getPosition();
+            }
+
+            @Override
+            public void onTabUnselected(TabLayout.Tab tab) {
+            }
+
+            @Override
+            public void onTabReselected(TabLayout.Tab tab) {
+            }
+        });
+    }
+
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onMessageEvent(DownloadFinishedEvent event) {
+        if (receiver != null) {
+            receiver.setEnqueue(event.queueId);
+        }
+    }
+
+    public static class DownloadFinishedEvent {
+        public long queueId;
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/activity/LogActivity.java b/qpython/src/main/java/org/qpython/qpy/main/activity/LogActivity.java
new file mode 100644
index 00000000..b2a67421
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/activity/LogActivity.java
@@ -0,0 +1,80 @@
+package org.qpython.qpy.main.activity;
+
+import android.databinding.DataBindingUtil;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.view.Menu;
+import android.view.MenuItem;
+
+import com.quseit.util.FileHelper;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.databinding.AboutBinding;
+import org.qpython.qpysdk.utils.DateTimeHelper;
+
+/**
+ * LogUtil Activity
+ * Created by Hmei on 2017-06-22.
+ */
+
+public class LogActivity extends BaseActivity {
+
+    public static final String LOG_TITLE = "title";
+    public static final String LOG_PATH = "path";
+
+    AboutBinding binding;
+
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        binding = DataBindingUtil.setContentView(this, R.layout.about);
+        setSupportActionBar(binding.lt.toolbar);
+        setTitle(R.string.log_title);
+        binding.lt.toolbar.setNavigationIcon(R.drawable.ic_back);
+        binding.lt.toolbar.setNavigationOnClickListener(view -> finish());
+
+        binding.title.setText(getIntent().getStringExtra(LOG_TITLE));
+        binding.path.setText(getIntent().getStringExtra(LOG_PATH));
+        //binding.time.setText(getString(R.string.date_format, DateTimeHelper.getDate()));
+        String content = FileHelper.getFileContents(getIntent().getStringExtra(LOG_PATH));
+        binding.content.setText(content);
+
+//        binding.ibMail.setOnClickListener(v -> {
+//
+//        });
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.log_menu, menu);
+
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.menu_more:
+                binding.path.setText(getIntent().getStringExtra(LOG_PATH));
+                String content = FileHelper.getFileContents(getIntent().getStringExtra(LOG_PATH));
+                onFeedback(content);
+//                Intent intent = new Intent(Intent.ACTION_SENDTO, Uri.parse("mailto:" + getString(R.string.ui_feedback_mail)));
+//                String body = MessageFormat.format(getString(com.quseit.android.R.string.feedback_email_body), Build.PRODUCT,
+//                        Build.VERSION.RELEASE, Build.VERSION.SDK_INT, binding.content.getContext());
+//                String subject = getString(R.string.feedback_email_subject);
+//                intent.putExtra(Intent.EXTRA_SUBJECT, subject);
+//                intent.putExtra(Intent.EXTRA_TEXT, body);
+//                try {
+//                    startActivity(Intent.createChooser(intent,
+//                            getString(R.string.email_transcript_chooser_title)));
+//                } catch (ActivityNotFoundException e) {
+//                    Toast.makeText(this,
+//                            R.string.email_transcript_no_email_activity_found,
+//                            Toast.LENGTH_LONG)
+//                            .show();
+//                }
+
+        }
+        return true;
+    }
+}
\ No newline at end of file
diff --git a/qpython/src/main/java/org/qpython/qpy/main/activity/MyGistActivity.java b/qpython/src/main/java/org/qpython/qpy/main/activity/MyGistActivity.java
new file mode 100644
index 00000000..35ac71a2
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/activity/MyGistActivity.java
@@ -0,0 +1,65 @@
+package org.qpython.qpy.main.activity;
+
+import android.content.Context;
+import android.content.Intent;
+import android.databinding.DataBindingUtil;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.view.View;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.databinding.ActivityMyShareBinding;
+import org.qpython.qpy.main.adapter.MyShareFragmentAdapter;
+
+/**
+ * 文 件 名: MyGistActivity
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2017/12/26 14:32
+ * 邮   箱: qq798435167@gmail.com
+ * 修改时间：
+ * 修改备注：
+ */
+
+public class MyGistActivity extends BaseActivity {
+    private ActivityMyShareBinding binding;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        binding = DataBindingUtil.setContentView(this, R.layout.activity_my_share);
+        initToolbar();
+        initView();
+    }
+
+    private void initToolbar() {
+        setSupportActionBar(binding.lt.toolbar);
+        setTitle(R.string.my_share);
+        binding.lt.toolbar.setNavigationIcon(R.drawable.ic_back);
+        binding.lt.toolbar.setNavigationOnClickListener(v -> finish());
+    }
+
+    private void initView() {
+        MyShareFragmentAdapter mMyShareFragmentAdapter = new MyShareFragmentAdapter(getSupportFragmentManager());
+        binding.vp.setAdapter(mMyShareFragmentAdapter);
+        binding.tabs.setupWithViewPager(binding.vp);
+    }
+
+    public static void startMyShare(Context context) {
+        Intent intent = new Intent(context, MyGistActivity.class);
+        context.startActivity(intent);
+    }
+
+
+    public void showProgress(boolean show) {
+        if (show) {
+            binding.progressBar.setVisibility(View.VISIBLE);
+        } else {
+            binding.progressBar.setVisibility(View.GONE);
+        }
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/activity/NotebookActivity.java b/qpython/src/main/java/org/qpython/qpy/main/activity/NotebookActivity.java
new file mode 100644
index 00000000..38dbfe29
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/activity/NotebookActivity.java
@@ -0,0 +1,540 @@
+package org.qpython.qpy.main.activity;
+
+import android.annotation.SuppressLint;
+import android.app.AlertDialog;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.SharedPreferences;
+import android.content.pm.PackageManager;
+import android.content.res.Configuration;
+import android.databinding.DataBindingUtil;
+import android.graphics.Bitmap;
+import android.net.Uri;
+import android.os.AsyncTask;
+import android.os.Build;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.annotation.RequiresApi;
+import android.text.Html;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.webkit.WebChromeClient;
+import android.webkit.WebResourceError;
+import android.webkit.WebResourceRequest;
+import android.webkit.WebSettings;
+import android.webkit.WebView;
+import android.webkit.WebViewClient;
+import android.widget.Toast;
+
+import com.quseit.util.Log;
+import com.quseit.util.NAction;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.databinding.ActivityNotebookBinding;
+import org.qpython.qpy.main.event.Bean;
+import org.qpython.qpy.main.widget.LoadingDialog;
+import org.qpython.qpy.texteditor.ui.view.EnterDialog;
+import org.qpython.qpy.utils.NoteBookAction;
+import org.qpython.qpy.utils.NotebookUtil;
+import org.qpython.qpy.main.utils.Utils;
+
+import java.io.File;
+
+/**
+ * 文 件 名: NotebookActivity
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2018/2/5 11:12
+ * 修改时间：
+ * 修改备注：
+ */
+
+public class NotebookActivity extends BaseActivity implements View.OnClickListener {
+
+    private ActivityNotebookBinding mBinding;
+    private String lastNotebook;
+    private static final String TOKEN = "?token=qpythonotebook";
+    private SharedPreferences mSharedPreferences;
+    private static final String FILE_PATH = "FILEPATH";
+    public static final int REQUEST_SETTTING_CODE = 0X998;
+
+    private Bean mBean;
+    //关闭页面标识
+    private boolean needClose = true;
+
+    public static void start(Context context, String filePath, final boolean isNew) {
+        Log.d("NotebookActivity", "start:"+filePath);
+        Intent intent = new Intent(context, NotebookActivity.class);
+        if (isNew) {
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        }
+        intent.putExtra(FILE_PATH, filePath);
+        context.startActivity(intent);
+    }
+
+    public static void startFromUrl(Context context, String url, final boolean isNew) {
+        Log.d("NotebookActivity", "startFromUrl:"+url);
+        LoadingDialog loadingDialog = new LoadingDialog(context);
+        loadingDialog.show();
+        NotebookUtil.downloadFile(url, new NotebookUtil.DownloadCallback() {
+            @Override
+            public void onSuccess(String filePath) {
+                start(context, filePath, isNew);
+                loadingDialog.dismiss();
+            }
+
+            @Override
+            public void onFail(String msg) {
+                Toast.makeText(context, msg, Toast.LENGTH_SHORT).show();
+                loadingDialog.dismiss();
+            }
+        });
+    }
+
+    @RequiresApi(api = Build.VERSION_CODES.JELLY_BEAN_MR1)
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        mBinding = DataBindingUtil.setContentView(this, R.layout.activity_notebook);
+        mSharedPreferences = getSharedPreferences("data", MODE_PRIVATE);
+
+        initToolbar();
+        if (NotebookUtil.isNotebookLibInstall(this)) {
+            initNotebookRes();
+            initWebView();
+            initListener();
+        } else {
+            enableNotebookFromSetting();
+        }
+
+        IntentFilter filter = new IntentFilter(".QWebViewActivity");
+        registerReceiver(webviewActivityReceiver, filter);
+
+    }
+
+    @RequiresApi(api = Build.VERSION_CODES.JELLY_BEAN_MR1)
+    public void enableNotebookFromSetting() {
+        new AlertDialog.Builder(this)
+                .setTitle(R.string.dialog_alert)
+                .setMessage(R.string.ennable_notebook_first)
+                .setPositiveButton(R.string.ok, (dialog, which) -> {
+                    dialog.dismiss();
+                    startActivityForResult(new Intent(this,SettingActivity.class),REQUEST_SETTTING_CODE);
+                    needClose = false;
+                })
+                .setNegativeButton(R.string.cancel, (dialog, which) -> {
+                    dialog.dismiss();
+                    needClose = true;
+                })
+                .setOnDismissListener(dialog -> {
+                    if (needClose){
+                        finish();
+                    }
+                })
+                .show();
+    }
+    /**
+     * enable notebook 后加载资源
+     * */
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (requestCode == REQUEST_SETTTING_CODE && resultCode == RESULT_OK){
+            initNotebookRes();
+            NotebookUtil.startNotebookService2(this);
+            initWebView();
+            initListener();
+        }else {
+            finish();
+        }
+    }
+
+    /**
+     * 在该页面内的notebook文件选择
+     * */
+    @Override
+    protected void onNewIntent(Intent intent) {
+        super.onNewIntent(intent);
+        String filePath = intent.getStringExtra(FILE_PATH);
+        Log.d("NotebookActivity", "filePath:"+filePath);
+        if (filePath != null) {
+            lastNotebook = filePath;
+            loadNotebook("");
+        }
+    }
+
+    private String getFileName(String filePath) {
+        if (!filePath.contains("/")) {
+            return "";
+        }
+        String name = filePath.substring(filePath.lastIndexOf("/") + 1);
+
+        return name;
+    }
+
+    private String getRequestPath(String filePath) {
+        if (filePath==null || !filePath.contains(NotebookUtil.NOTEBOOK_DIR)) {
+            return "";
+        }
+        String path = filePath.substring(NotebookUtil.NOTEBOOK_DIR.length())+"";
+        return path;
+    }
+
+    private void initListener() {
+
+        mBinding.switchTerminalImg.setOnClickListener(this);
+        mBinding.stepinImg.setOnClickListener(this);
+        mBinding.saveImg.setOnClickListener(this);
+        mBinding.markdownAddImg.setOnClickListener(this);
+        mBinding.codeAddImg.setOnClickListener(this);
+        mBinding.playallImg.setOnClickListener(this);
+        mBinding.undoImg.setOnClickListener(this);
+        mBinding.refreshImg.setOnClickListener(this);
+        mBinding.deleteCellImg.setOnClickListener(this);
+        mBinding.cellUpImg.setOnClickListener(this);
+        mBinding.cellDownImg.setOnClickListener(this);
+        mBinding.switchCodeImg.setOnClickListener(this);
+        mBinding.switchMarkdownImg.setOnClickListener(this);
+
+    }
+
+    private void initNotebookRes() {
+        String filePath = getIntent().getStringExtra(FILE_PATH);
+        Log.d("NotebookActivity", "initNotebookRes:"+filePath);
+        //判断是否从文件列表打开
+        if (filePath == null) {
+            //打开最近一次编辑保存的文件
+            lastNotebook = mSharedPreferences.getString("last_notebook", null);
+            if (lastNotebook == null) {
+                String fileName = "Welcome.ipynb";
+                File file = new File(NotebookUtil.NOTEBOOK_DIR + "notebooks", fileName);
+                if (file.exists()) {
+                    lastNotebook = file.getAbsolutePath();
+                } else {
+                    lastNotebook = NotebookUtil.createNotebook(this, NotebookUtil.Untitled);
+                }
+            } else  {
+                Log.d(TAG, "lastNotebook:"+lastNotebook);
+            }
+        } else {
+            if (filePath.contains(NotebookUtil.NOTEBOOK_DIR)) {
+                lastNotebook = filePath;
+            } else {
+
+                Toast.makeText(this, "inalid file", Toast.LENGTH_SHORT).show();
+                return;
+            }
+        }
+        if (lastNotebook!=null) {
+            mBinding.toolbar.setTitle(getFileName(lastNotebook));
+        }
+//        if (checkNotebook()) {
+//            createServer();
+//        }
+    }
+
+    /**
+     * 开启notebook服务
+     */
+    private void createServer() {
+        //如果服务未开启则开启服务
+        AsyncTask.execute(() -> {
+            if (!Utils.httpPing(NotebookUtil.NB_SERVER, 3000)) {
+                runOnUiThread(() -> NotebookUtil.startNotebookService(getApplication()));
+            }
+        });
+
+    }
+
+    public static final  String URL          = "url";
+    public static final  String ACT          = "act";
+    protected static final String TAG        = "NotebookActivity";
+
+    protected final BroadcastReceiver webviewActivityReceiver = new BroadcastReceiver() {
+        @RequiresApi(api = Build.VERSION_CODES.JELLY_BEAN_MR1)
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            String act = intent.getExtras().getString(ACT);
+            String url = intent.getExtras().getString(URL);
+            android.util.Log.d(TAG, "BroadcastReceiver:" + act);
+            switch (act != null ? act : "") {
+                case "onnext": {
+                    enableNotebookFromSetting();
+
+                }
+            }
+        }
+    };
+
+    @SuppressLint("ClickableViewAccessibility")
+    private void initWebView() {
+        mBinding.WebViewProgress.setMax(100);
+        //设置js调用的javabean
+        mBean = new Bean(this, mBinding.webView);
+        mBean.setSrv(NotebookUtil.NOTEBOOK_SERVER + getRequestPath(lastNotebook) + TOKEN);
+        mBinding.webView.addJavascriptInterface(mBean, "milib");
+
+        mBinding.webView.getSettings().setSupportMultipleWindows(false);
+        mBinding.webView.getSettings().setCacheMode(WebSettings.LOAD_CACHE_ELSE_NETWORK);
+        //设置WebView属性，能够执行Javascript脚本
+        mBinding.webView.getSettings().setJavaScriptEnabled(true);
+        //设置可以访问文件
+        mBinding.webView.getSettings().setAllowFileAccess(true);
+        mBinding.webView.setWebViewClient(new WebViewClient() {
+
+            @SuppressWarnings("deprecation")
+            @Override
+            public boolean shouldOverrideUrlLoading(WebView view, String request) {
+                Log.d("WEBVIEW", "url:" + request);
+                view.loadUrl(request);
+//                if (request.endsWith(NotebookUtil.ext)) {
+//                    view.clearHistory();
+//                }
+                return true;
+            }
+
+            @Override
+            public void onPageStarted(WebView view, String url, Bitmap favicon) {
+                super.onPageStarted(view, url, favicon);
+            }
+
+            @Override
+            public void onPageFinished(WebView view, String url) {
+                super.onPageFinished(view, url);
+            }
+
+            @Override
+            public void onReceivedError(WebView view, WebResourceRequest request, WebResourceError error) {
+                super.onReceivedError(view, request, error);
+                Log.d("webview", error.toString());
+            }
+        });
+
+        mBinding.webView.setWebChromeClient(new WebChromeClient() {
+            @Override
+            public void onProgressChanged(WebView view, int newProgress) {
+                super.onProgressChanged(view, newProgress);
+                mBinding.WebViewProgress.setProgress(mBinding.webView.getProgress());
+            }
+        });
+
+        //设置默认的加载页面来处理url跳转
+        mBinding.webView.loadUrl("file:///android_asset/html/index.html");
+    }
+
+    private void initToolbar() {
+        setSupportActionBar(mBinding.toolbar);
+        getSupportActionBar().setDisplayShowTitleEnabled(false);
+        mBinding.toolbar.setNavigationIcon(R.drawable.ic_back);
+        mBinding.toolbar.setNavigationOnClickListener(v -> closeActivity());
+    }
+
+    private void closeActivity() {
+        doAction(NoteBookAction.SAVE_NOTEBOOK);
+        finish();
+    }
+
+    @Override
+    public void onClick(View v) {
+        switch (v.getId()) {
+            case R.id.switch_terminal_img:
+                NotebookListActivity.start(NotebookActivity.this);
+                break;
+            case R.id.stepin_img:
+                //运行并选择下一个cell
+                doAction(NoteBookAction.PLAY_CURRENT_CELL);
+                break;
+            case R.id.markdown_add_img:
+                //添加一个markdown
+                doAction(NoteBookAction.ADD_CELL_BELOW, NoteBookAction.SWITCH_MARKDOWN_TYPE);
+                break;
+            case R.id.code_add_img:
+                //添加一个code
+                doAction(NoteBookAction.ADD_CELL_BELOW);
+                break;
+            case R.id.playall_img:
+                //运行全部
+                doAction(NoteBookAction.PLAY_ALL_CELL);
+                break;
+            case R.id.undo_img:
+                //撤销修改
+                doAction(NoteBookAction.CELL_UNDO);
+                break;
+            case R.id.save_img:
+                //保存
+                saveFile();
+                break;
+            case R.id.delete_cell_img:
+                //删除cell
+                doAction(NoteBookAction.DELETE_CELL);
+                break;
+            case R.id.refresh_img:
+                //清空输出，重新加载
+                doAction(NoteBookAction.CLEAR_ALL_OUTPUT);
+                break;
+            case R.id.cell_down_img:
+                //移动到下一个cell
+                doAction(NoteBookAction.MOVE_CELL_DOWN);
+                break;
+            case R.id.cell_up_img:
+                //移动到上一个cell
+                doAction(NoteBookAction.MOVE_CELL_UP);
+                break;
+            case R.id.switch_code_img:
+                //移动到上一个cell
+                doAction(NoteBookAction.SWITCH_CODE_TYPE);
+                break;
+            case R.id.switch_markdown_img:
+                //移动到上一个cell
+                doAction(NoteBookAction.SWITCH_MARKDOWN_TYPE);
+                break;
+        }
+    }
+
+    private void srvManange() {
+        new AlertDialog.Builder(this, R.style.MyDialog)
+            .setTitle(R.string.notebook_service)
+            .setMessage(R.string.notebook_service_restart)
+
+            .setNegativeButton(R.string.notebook_restart, (dialog1, which) -> {
+                dialog1.dismiss();
+                NotebookUtil.killNBSrv(this);
+                NotebookUtil.startNotebookService2(this);
+                initWebView();
+            })
+            .setPositiveButton(R.string.notebook_reload, (dialog1, which) -> {
+                mBinding.webView.reload();
+
+            })
+            .create()
+            .show();
+    }
+
+    private void saveFile() {
+        if (lastNotebook.endsWith(NotebookUtil.Untitled + NotebookUtil.ext)) {
+            new EnterDialog(this)
+                .setTitle(getString(R.string.save))
+                .setHint(getString(R.string.file_name))
+                .setConfirmListener(new EnterDialog.ClickListener() {
+                    @Override
+                    public boolean OnClickListener(String name) {
+                        doAction(NoteBookAction.SAVE_NOTEBOOK);
+                        File file = new File(lastNotebook);
+                        File newFile = new File(NotebookUtil.NOTEBOOK_DIR + "notebooks/", name + NotebookUtil.ext);
+                        file.renameTo(newFile);
+                        lastNotebook = newFile.getAbsolutePath();
+                        mBinding.toolbar.setTitle(getFileName(lastNotebook));
+                        //toast("save file successful!");
+                        return true;
+                    }
+                }).show();
+        } else {
+            doAction(NoteBookAction.SAVE_NOTEBOOK);
+        }
+    }
+
+    public void toast(String msg) {
+        Toast.makeText(this, msg, Toast.LENGTH_SHORT).show();
+    }
+
+    public static final String JS_SUFFIX = "javascript:";
+
+    private void doAction(String... actions) {
+        for (String action : actions) {
+            mBinding.webView.loadUrl(JS_SUFFIX + action);
+        }
+    }
+
+    /**
+     * jupyter未安装则跳转应用市场安装
+     */
+    private void linkToStore() {
+        Intent intent = new Intent(Intent.ACTION_VIEW);
+        intent.setData(Uri.parse("http://nb.qpython.org/install.html"));
+        startActivity(intent);
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.notebook_menu, menu);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.menu_open:
+                //打开文件
+                NotebookListActivity.start(NotebookActivity.this);
+                break;
+
+            case R.id.menu_add:
+                //新增一个文件
+                createNewFile();
+                break;
+            case R.id.menu_new_more:
+                srvManange();
+                break;
+        }
+        return true;
+    }
+
+    /**
+     * 创建一个新的notebook文件
+     */
+    private void createNewFile() {
+        new EnterDialog(this)
+            .setTitle(getString(R.string.new_file))
+            .setHint(getString(R.string.file_name))
+            .setConfirmListener(name -> {
+                lastNotebook = NotebookUtil.createNotebook(NotebookActivity.this, name);
+                loadNotebook("?kernel_name=python"+ NAction.getPyVer(this));
+                return true;
+            }).show();
+    }
+
+    /**
+     * 加载文档
+     */
+    private void loadNotebook(String kernel) {
+        mBinding.toolbar.setTitle(getFileName(lastNotebook));
+        String url = NotebookUtil.NOTEBOOK_SERVER + getRequestPath(lastNotebook)+kernel;
+        Log.d("NotebookActivity", "loadNotebook:"+url);
+        mBinding.webView.loadUrl(url);
+    }
+
+    /**
+     * 退出时清除webview相关资源
+     */
+    @Override
+    protected void onDestroy() {
+        if (mBinding.webView != null) {
+            doAction(NoteBookAction.SHUTDOWN_KERNEL);
+            mBinding.webView.clearHistory();
+            //移除webview并注销
+            ((ViewGroup) mBinding.webView.getParent()).removeView(mBinding.webView);
+            mBinding.webView.destroy();
+        }
+        mSharedPreferences.edit().putString("last_notebook", lastNotebook).apply();
+        unregisterReceiver(webviewActivityReceiver);
+
+        super.onDestroy();
+    }
+
+    @Override
+    public void onConfigurationChanged(Configuration newConfig) {
+        super.onConfigurationChanged(newConfig);
+    }
+
+    /**
+     * 返回键控制webview回退
+     * 注：由于只会有一个编辑页，所以并不需要回退
+     */
+    @Override
+    public void onBackPressed() {
+        closeActivity();
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/activity/NotebookListActivity.java b/qpython/src/main/java/org/qpython/qpy/main/activity/NotebookListActivity.java
new file mode 100644
index 00000000..7e7bb75f
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/activity/NotebookListActivity.java
@@ -0,0 +1,98 @@
+package org.qpython.qpy.main.activity;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.res.Configuration;
+import android.databinding.DataBindingUtil;
+import android.os.Bundle;
+import android.os.Environment;
+import android.support.annotation.Nullable;
+import android.support.v7.widget.LinearLayoutManager;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.databinding.ActivityNotebooklistBinding;
+import org.qpython.qpy.main.adapter.NotebookAdapter;
+import org.qpython.qpysdk.QPyConstants;
+
+import java.io.File;
+
+/**
+ * 文 件 名: NotebookListActivity
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2018/2/8 15:38
+ * 修改时间：
+ * 修改备注：
+ */
+
+public class NotebookListActivity extends BaseActivity {
+
+    private ActivityNotebooklistBinding mBinding;
+    private NotebookAdapter mNotebookAdapter;
+    private File mRootFile;
+    private static final String sdcard = Environment.getExternalStorageDirectory().getAbsolutePath();
+
+    public static void start(Context context){
+        Intent intent = new Intent(context,NotebookListActivity.class);
+        context.startActivity(intent);
+    }
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        mBinding = DataBindingUtil.setContentView(this, R.layout.activity_notebooklist);
+        initRootDir();
+        initToolbar();
+        initRV();
+        setParentPath(mRootFile.getAbsolutePath());
+    }
+
+    private void initRootDir() {
+        mRootFile = new File(QPyConstants.ABSOLUTE_PATH+"/notebooks");
+        if (!mRootFile.exists()) {
+            mRootFile.mkdirs();
+        }
+    }
+
+    private void initRV() {
+        mBinding.rvFiles.setLayoutManager(new LinearLayoutManager(this));
+        mNotebookAdapter = new NotebookAdapter(this, mRootFile);
+        mNotebookAdapter.setOnItemClickCallback((filePath,isDir) -> {
+            if (isDir){
+                setParentPath(filePath);
+            }else {
+                NotebookActivity.start(this, filePath, false);
+                finish();
+            }
+        });
+        mBinding.rvFiles.setAdapter(mNotebookAdapter);
+    }
+
+    private void initToolbar() {
+        setSupportActionBar(mBinding.toolbar);
+        getSupportActionBar().setDisplayShowTitleEnabled(false);
+        mBinding.toolbar.setNavigationIcon(R.drawable.ic_back);
+        mBinding.toolbar.setNavigationOnClickListener(v -> finish());
+        mBinding.toolbar.setTitle("Notebooks");
+    }
+
+    private void setParentPath(String path){
+        if (path.contains(sdcard)){
+            String p = path.substring(sdcard.length());
+            mBinding.tvPath.setText(p);
+        }
+    }
+
+    @Override
+    public void onConfigurationChanged(Configuration newConfig) {
+        super.onConfigurationChanged(newConfig);
+    }
+
+    @Override
+    public void onBackPressed() {
+        if (mNotebookAdapter.getFile().getAbsoluteFile().equals(mRootFile.getAbsoluteFile())) {
+            finish();
+        } else {
+            mNotebookAdapter.setFile(mNotebookAdapter.getFile().getParentFile());
+        }
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/activity/QWebViewActivity.java b/qpython/src/main/java/org/qpython/qpy/main/activity/QWebViewActivity.java
index f17b561f..e901c85f 100644
--- a/qpython/src/main/java/org/qpython/qpy/main/activity/QWebViewActivity.java
+++ b/qpython/src/main/java/org/qpython/qpy/main/activity/QWebViewActivity.java
@@ -1,17 +1,21 @@
 package org.qpython.qpy.main.activity;
 
-import android.app.ProgressDialog;
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.DownloadManager;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.databinding.DataBindingUtil;
 import android.graphics.Bitmap;
 import android.net.Uri;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
-import android.support.v7.widget.Toolbar;
 import android.util.Log;
 import android.view.KeyEvent;
+import android.view.Menu;
+import android.view.MenuItem;
 import android.view.View;
 import android.webkit.JavascriptInterface;
 import android.webkit.ValueCallback;
@@ -20,165 +24,261 @@
 import android.webkit.WebSettings;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
-import android.widget.ProgressBar;
 import android.widget.Toast;
 
-import com.loopj.android.http.AsyncHttpClient;
+import java.net.MalformedURLException;
+import java.net.URL;
+
+
 import com.loopj.android.http.AsyncHttpResponseHandler;
+import com.quseit.base.QBaseApp;
+import com.quseit.util.NAction;
+import com.quseit.util.NUtil;
 
+import org.apache.http.Header;
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
 import org.qpython.qpy.R;
+import org.qpython.qpy.console.ScriptExec;
+import org.qpython.qpy.databinding.ActivityQwebviewBinding;
+import org.qpython.qpy.main.app.App;
 import org.qpython.qpy.main.event.Bean;
+import org.qpython.qpy.main.receiver.DownloadNotebookReceiver;
 import org.qpython.qpy.main.utils.Utils;
-import org.renpy.android.PythonActivity;
+import org.qpython.qpy.utils.NotebookUtil;
+import org.qpython.qpysdk.QPyConstants;
+import org.qpython.qpysdk.utils.FileHelper;
 
-import butterknife.BindView;
-import butterknife.ButterKnife;
-import butterknife.Unbinder;
-import cz.msebera.android.httpclient.Header;
+import java.io.File;
 
 
 /**
+ * inner web view
  * Created by yhc on 16/9/30.
  */
 
 public class QWebViewActivity extends BaseActivity {
-    protected static final String TAG = "QWebViewActivity";
+    protected static final String TAG                    = "QWebViewActivity";
+    protected final static int    FILECHOOSER_RESULTCODE = 1;
+    private static final   int    PURCHASE_REQUEST_CODE  = 233;
+
+    public static final String IS_NO_HEADER = "is_no_header";
+    public static final String IS_DRAWER    = "is_drawer";
+
+    private static final String TYPE         = "type";
+    public static final  String HTML         = "html";
+    public static final  String TITLE        = "title";
+    public static final  String URL          = "url";
+    public static final  String SRC          = "src";
+    public static final  String ACT          = "act";
+    public static final  String LOG_PATH     = "LOG_PATH";
+    protected            String wvCookie     = "";
+    protected            String wvDocument   = "";
+    private              String launchScript = "";
+    private DownloadNotebookReceiver receiver;
 
-    protected WebView wv;
-    protected String wvCookie = "";
-    protected String wvDocument = "";
-    protected ProgressBar wvProgressBar;
-    protected ProgressDialog pDialog;
-    private String launchScript = "";
+    protected ValueCallback<Uri> mUploadMessage;
 
+    protected final BroadcastReceiver webviewActivityReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            String act = intent.getExtras().getString(ACT);
+            String url = intent.getExtras().getString(URL);
+            Log.d(TAG, "BroadcastReceiver:"+act);
 
-    private Unbinder mUnbinder;
+            switch (act != null ? act : "") {
+                case "pipconsole": {
+                    String[] args = {getApplicationContext().getFilesDir() + "/bin/pip_console.py", getApplicationContext().getFilesDir().toString()};
+                    ScriptExec.getInstance().execPyInConsole((Activity) context, args);
 
-    @BindView(R.id.toolbar)
-    Toolbar mToolbar;
+                    break;
+                }
+                case "pipinstall": {
+                    String src = intent.getExtras().getString(QWebViewActivity.SRC);
+                    String[] args = {getApplicationContext().getFilesDir() + "/bin/pip"+ (NAction.isQPy3(getApplicationContext())?"3":""), "install", url, "-i", src, getApplicationContext().getFilesDir().toString()};
+                    ScriptExec.getInstance().execPyInConsole((Activity) context, args);
+                    break;
+                }
+                case "close":
+                    finish();
+                    break;
+                case "launchsrv":
+                    String script = getIntent().getStringExtra(LOG_PATH);
+                    if (script != null && !script.equals("")) {
+                        launchScript = script;
+                    }
+                    break;
+                case "opennotebook":
+                    String notebookurl = getIntent().getStringExtra(URL);
+                    String downloadDir = "qpython/notebooks";
+                    Log.d(TAG, "opennotebook:"+notebookurl);
+
+                    App.getService().downloadFile(getApplicationContext(), notebookurl, NUtil.getFileFromUrl(notebookurl), "", downloadDir);
+                    break;
+                case "onnext":
+                    break;
+                case "loadhtml":
+                    String data = getIntent().getStringExtra(HTML);
+                    binding.wv.loadDataWithBaseURL("file:///android_asset/", data, "text/html", "UTF-8", null);
+                    break;
 
+            }
+        }
+    };
+    private ActivityQwebviewBinding binding;
+
+    public static void start(Context context, String title, String url) {
+        Intent starter = new Intent(context, QWebViewActivity.class);
+        if (context == App.getContext()) {
+            starter.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        }
+        starter.putExtra(QWebViewActivity.TITLE, title);
+        starter.putExtra(QWebViewActivity.URL, url);
+        context.startActivity(starter);
+    }
+
+    public static void start(Context context, String act, String title, String url, String logPath) {
+        Intent starter = new Intent(context, QWebViewActivity.class);
+        if (context == App.getContext()) {
+            starter.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        }
+        starter.putExtra(QWebViewActivity.ACT, act);
+        starter.putExtra(QWebViewActivity.TITLE, title);
+        starter.putExtra(QWebViewActivity.SRC, url);
+        starter.putExtra(QWebViewActivity.LOG_PATH, logPath);
+        context.startActivity(starter);
+    }
+
+    public static void loadHtml(Context context, String html, String title) {
+        Intent starter = new Intent(context, QWebViewActivity.class);
+        starter.putExtra(TYPE, HTML);
+        starter.putExtra(HTML, html);
+        starter.putExtra(TITLE, title);
+        context.startActivity(starter);
+    }
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-//        mBinding = DataBindingUtil.setContentView(this, R.layout.activity_program_explorer);
-//        setSupportActionBar(mBinding.toolbar);
-
-        setContentView(R.layout.activity_qwebview);
-        mUnbinder = ButterKnife.bind(this);
+        binding = DataBindingUtil.setContentView(this, R.layout.activity_qwebview);
+        receiver = new DownloadNotebookReceiver();
 
         Intent i = getIntent();
-        String title = i.getStringExtra(PythonActivity.EXTRA_CONTENT_URL0);
-
-        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
-        setSupportActionBar(toolbar);
-        toolbar.setNavigationIcon(R.drawable.ic_arrow_back);
-        toolbar.setNavigationOnClickListener(view -> QWebViewActivity.this.finish());
+        String title = i.getStringExtra(TITLE);
+        String type = i.getStringExtra(TYPE);
+        if (launchScript == null || launchScript.isEmpty())
+            launchScript = i.getStringExtra(LOG_PATH);
 
+        setSupportActionBar(binding.lt.toolbar);
+        binding.lt.toolbar.setNavigationIcon(R.drawable.ic_back);
+        binding.lt.toolbar.setNavigationOnClickListener(view -> QWebViewActivity.this.finish());
 
-        if (title!=null) {
-            getSupportActionBar().setTitle(title);
-
+        if (title != null) {
+            setTitle(title);
         } else {
-            getSupportActionBar().setTitle(R.string.app_name);
+            setTitle(R.string.app_name);
+        }
 
+        switch (type == null ? "" : type) {
+            case HTML:
+                binding.wv.loadData(i.getStringExtra(HTML), "text/html", null);
+                break;
+            default:
+                initWebView();
+                accessUrl();
+                break;
         }
-        initWebView();
-        accessUrl();
 
-        IntentFilter filter = new IntentFilter(".QWebViewActivity");
+        IntentFilter filter = new IntentFilter();
         registerReceiver(webviewActivityReceiver, filter);
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+//        registerReceiver(receiver, new IntentFilter(
+//                DownloadManager.ACTION_DOWNLOAD_COMPLETE));
+    }
+
 
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.refresh_menu, menu);
+        if (launchScript != null && !launchScript.isEmpty()) {
+            MenuItem logItem = menu.findItem(R.id.log_menu);
+            logItem.setVisible(true);
+        }
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.refresh_menu:
+                binding.WebViewProgress.setVisibility(View.VISIBLE);
+                binding.wv.loadUrl("javascript:window.location.reload( true )");
+                break;
+            case R.id.log_menu:
+                String title = FileHelper.getFileName(launchScript);
+                Intent resultIntent = new Intent(this, LogActivity.class);
+                if (launchScript.contains("/scripts")) {
+                    String proj = new File(launchScript).getName();
+
+                    resultIntent.putExtra(LogActivity.LOG_PATH, QPyConstants.ABSOLUTE_LOG);
+                    resultIntent.putExtra(LogActivity.LOG_TITLE, proj);
+                } else {
+                    String proj = new File(launchScript).getParentFile().getName();
+                    resultIntent.putExtra(LogActivity.LOG_PATH, QPyConstants.ABSOLUTE_LOG);
+                    resultIntent.putExtra(LogActivity.LOG_TITLE, proj);
+                }
+
+                startActivity(resultIntent);
+                break;
+        }
+        return true;
     }
 
     public void onDestroy() {
         super.onDestroy();
         unregisterReceiver(webviewActivityReceiver);
-        //Log.d(TAG, "onDestroy:launchScript:"+launchScript);
-
-        if (launchScript!=null && !launchScript.equals("")) {
+        if (launchScript != null && !launchScript.equals("")) {
             endWebSrv(launchScript);
         }
     }
 
-//    OkHttpClient client = new OkHttpClient();
-//    @TargetApi(Build.VERSION_CODES.KITKAT)
-//    String okget(String url) throws IOException {
-//        Request request = new Request.Builder()
-//                .url(url)
-//                .build();
-//
-//        try (Response response = client.newCall(request).execute()) {
-//            return response.body().string();
-//        }
-//    }
     protected void endWebSrv(String script) {
-        AsyncHttpClient client = new AsyncHttpClient();
-        client.get(Utils.getSrv(script)+"/__exit", new AsyncHttpResponseHandler() {
+        QBaseApp.getInstance().getAsyncHttpClient().get(Utils.getSrv(script) + "/__exit", new AsyncHttpResponseHandler() {
 
             @Override
-            public void onStart() {
-                // called before request is started
-            }
+            public void onSuccess(int i, Header[] headers, byte[] bytes) {
 
-            @Override
-            public void onSuccess(int statusCode, Header[] headers, byte[] response) {
-                Toast.makeText(getApplicationContext(), "OK", Toast.LENGTH_SHORT).show();
             }
 
             @Override
-            public void onFailure(int statusCode, Header[] headers, byte[] errorResponse, Throwable e) {
-                Toast.makeText(getApplicationContext(), "Failure", Toast.LENGTH_SHORT).show();
-            }
+            public void onFailure(int i, Header[] headers, byte[] bytes, Throwable throwable) {
 
-            @Override
-            public void onRetry(int retryNo) {
-                // called when request is retried
             }
-        });
-//        try {
-//            String ret = okget(Utils.getSrv(script)+"/__exit");
-//        } catch (IOException e) {
-//            e.printStackTrace();
-//        }
-        //if (session!=null) {
-//        NRequest.get2(this, getSrv(script)+"/__exit", null, new AsyncHttpResponseHandler() {
-//            public void onSuccess(String response) {
-//                Log.d(TAG, "endWebSrv OK");
-//                if (session!=null) {
-//                    session.finish();
-//                    session = null;
-//                }
-//
-//            }
-//            public void onFailure(Throwable e) {
-//                //Log.d(TAG, "endWebSrv Failed:"+e.getLocalizedMessage());
-//
-//            }
-//        });
-
-        //}
 
+        });
     }
 
     public void accessUrl() {
         if (Utils.netOk(getApplicationContext())) {
-            String url = "http://qpython.org";
+            String url;
             Intent i = getIntent();
             if (i.getData() != null) {
                 url = i.getDataString();
-            } else {
-                url = "file:///android_asset/html/index.html";
+                Log.d(TAG, "accessUrl:"+url);
 
+            } else {
+                url = i.getStringExtra(URL) == null ?
+                        i.getStringExtra(Intent.EXTRA_TEXT) == null ?
+                                "file:///android_asset/html/index.html"
+                                : i.getStringExtra(Intent.EXTRA_TEXT)
+                        : i.getStringExtra(URL);
             }
 
-//            if (act!=null && act.equals("main")) {
-//                //
-//            } else {
-//                mediaUrl+="?q="+this.getApplicationContext().getPackageName()+"&lang="+Utils.getLang()+"&v="+Utils.getVersinoCode(this);
-//            }
-
-           loadurl(wv, url);
+            loadurl(binding.wv, url);
 
         } else {
             String url = "file:///android_asset/html/index.html";
@@ -186,162 +286,88 @@ public void accessUrl() {
             Intent i = getIntent();
             if (i.getData() != null) {
                 url = i.getDataString();
+                Log.d(TAG, "accessUrl:"+url);
+
             }
 
-            loadurl(wv, url);
+            loadurl(binding.wv, url);
         }
     }
 
+    private void writeWebLog(String data) {
+        FileHelper.writeToFile(QPyConstants.ABSOLUTE_LOG,data+"\n", true);
+    }
+
     //
     public void initWebView() {// 初始化
-        if (wvProgressBar == null) {
-            wvProgressBar = (ProgressBar) findViewById(R.id.WebViewProgress);
-        }
-        if (wvProgressBar != null)
-            wvProgressBar.setMax(100);
-
-        if (wv == null) {
-            wv = (WebView) findViewById(R.id.wv);
-        }
+        binding.WebViewProgress.setMax(100);
 
-        Bean bean = new Bean(this);
-        String act = getIntent().getStringExtra(PythonActivity.EXTRA_CONTENT_URL1);
+        Bean bean = new Bean(this, binding.wv);
+        String act = getIntent().getStringExtra(ACT);
 
-        if (act!=null && act.equals("main")) {
-            String title = getIntent().getStringExtra(PythonActivity.EXTRA_CONTENT_URL2);
-            String url = getIntent().getStringExtra(PythonActivity.EXTRA_CONTENT_URL3);
+        if (act != null && act.equals("main")) {
+            String url = getIntent().getStringExtra(QWebViewActivity.SRC);
             bean.setSrv(url);
 
-            launchScript = getIntent().getStringExtra(PythonActivity.EXTRA_CONTENT_URL4);
-
-            String isNoHead = getIntent().getStringExtra(PythonActivity.EXTRA_CONTENT_URL5);
-            String isDrawer = getIntent().getStringExtra(PythonActivity.EXTRA_CONTENT_URL6);
+            launchScript = getIntent().getStringExtra(LOG_PATH);
+//            String title = getIntent().getStringExtra(TITLE);
+//            String isNoHead = getIntent().getStringExtra(IS_NO_HEADER);
+//            String isDrawer = getIntent().getStringExtra(IS_DRAWER);
         }
 
-        // wv = new WebView(this);
-        wv.getSettings().setJavaScriptEnabled(true);// 可用JS
-        wv.addJavascriptInterface(bean, "milib");
-        wv.setScrollBarStyle(View.SCROLLBARS_INSIDE_OVERLAY);// 滚动条风格，为0就是不给滚动条留空间，滚动条覆盖在网页上
-        wv.getSettings().setRenderPriority(WebSettings.RenderPriority.HIGH);
-        wv.getSettings().setBlockNetworkImage(false);
-        wv.getSettings().setAllowFileAccess(true);
-		/*
-		 * try { wv.getSettings().setPluginsEnabled(true); } catch (Exception e) { }
-		 */
-        wv.setWebViewClient(new WebViewClient() {
+        binding.wv.setInitialScale(1);
+        binding.wv.getSettings().setAllowFileAccess(true);
+        binding.wv.getSettings().setPluginState(WebSettings.PluginState.ON);
+        binding.wv.getSettings().setPluginState(WebSettings.PluginState.ON_DEMAND);
+        binding.wv.getSettings().setLoadWithOverviewMode(true);
+        binding.wv.getSettings().setUseWideViewPort(true);
+
+        binding.wv.getSettings().setJavaScriptEnabled(true);// 可用JS
+        binding.wv.addJavascriptInterface(bean, "milib");
+        binding.wv.setScrollBarStyle(View.SCROLLBARS_INSIDE_OVERLAY);// 滚动条风格，为0就是不给滚动条留空间，滚动条覆盖在网页上
+        binding.wv.getSettings().setRenderPriority(WebSettings.RenderPriority.HIGH);
+        binding.wv.getSettings().setBlockNetworkImage(false);
+        binding.wv.getSettings().setAllowFileAccess(true);
+        binding.wv.setWebViewClient(new WebViewClient() {
             public boolean shouldOverrideUrlLoading(final WebView view, final String url) {
-                Log.d(TAG, "setWebViewClient URL:" + url);
+                writeWebLog("[Console] Loading URL:" + url);
                 loadurl(view, url);// 载入网页
                 return true;
             }
 
             @Override
             public void onReceivedError(WebView view, int errorCode, String description, String failingUrl) {
-                Log.d(TAG, "errcode:" + errorCode + "-desc:" + description + "-url:" + failingUrl);
-                // loadurl(wv,
-                // "file:///android_asset/mbox/md3.html?act=err&info="+description+"&"+NAction.getUserUrl(getApplicationContext()));
+                writeWebLog("[Console] Errorcode " + errorCode + " ("+failingUrl+")\n  Description:" + description);
             }
 
             @Override
             public void onPageFinished(WebView view, String url) {
+                writeWebLog("[Console] Load PageFinished URL:" + url);
+
                 super.onPageFinished(view, url);
-                //view.loadUrl("javascript:window.qpylib.processHTML(document.cookie, document.getElementsByTagName('html')[0].innerHTML);");
-                // view.loadUrl("javascript:(function(){document.getElementById('snapNSendBtn').onclick=function(){var bean=window.bean;var title=bean.getTitle();alert(title);}})()");
             }
 
             @Override
             public void onPageStarted(WebView view, String url, Bitmap favicon) {
-                wv.requestFocus();
-            }
+                writeWebLog("[Console] Load PageFinished start:" + url);
 
-        });
-
-        wv.setWebChromeClient(new WebChromeClient() {
-            public void onProgressChanged(WebView view, int progress) {// 载入进度改变而触发
-                if (progress == 100) {
-                    // handler.sendEmptyMessage(1);//如果全部载入,隐藏进度对话框
-                    // wvProgressBar.setVisibility(View.GONE);
-                }
-                if (wvProgressBar != null)
-                    wvProgressBar.setProgress(wv.getProgress());
-                super.onProgressChanged(view, progress);
+                binding.wv.requestFocus();
             }
-
         });
 
-//		wv.setOnLongClickListener(new OnLongClickListener() {
-//			@Override
-//			public boolean onLongClick(View v) {
-//				// Log.d(TAG, "click detected");
-//				return true;
-//			}
-//		});
-        // wv.setScrollBarStyle(View.SCROLLBARS_INSIDE_OVERLAY);
-        // wv.setScrollBarStyle(View.SCROLLBARS_OUTSIDE_OVERLAY);
-        wv.getSettings().setLoadWithOverviewMode(true);
-        // wv.getSettings().setJavaScriptEnabled(true);
-
-        // wv.addJavascriptInterface(new JavascriptInterface(MSearchAct.this),
-        // "bean");
-        // registerForContextMenu(wv);
-        // openWaitWindow();
-
-        wv.getSettings().setJavaScriptEnabled(true);// 可用JS
-        wv.addJavascriptInterface(new QPyLib(this), "qpylib");
-
-        wv.setScrollBarStyle(View.SCROLLBARS_INSIDE_OVERLAY);// 滚动条风格，为0就是不给滚动条留空间，滚动条覆盖在网页上
-        wv.getSettings().setRenderPriority(WebSettings.RenderPriority.HIGH);
-        wv.getSettings().setBlockNetworkImage(false);
-        wv.getSettings().setAllowFileAccess(true);
-        // wv.getSettings().setBuiltInZoomControls(true);// 设置支持缩放
-
-        String ua = wv.getSettings().getUserAgentString();
-        wv.getSettings().setUserAgentString(ua + " :QUSEIT");
-
-		/*
-		 * try { wv.getSettings().setPluginsEnabled(true); } catch (Exception e) { }
-		 */
-        wv.setWebViewClient(new WebViewClient() {
-            public boolean shouldOverrideUrlLoading(final WebView view, final String url) {
-                Log.d(TAG, "setWebViewClient URL:" + url);
-                loadurl(view, url);// 载入网页
-                return true;
-            }
+        binding.wv.setWebChromeClient(new WebChromeClient() {
 
             @Override
-            public void onReceivedError(WebView view, int errorCode, String description, String failingUrl) {
-                Log.d(TAG, "errcode:" + errorCode + "-desc:" + description + "-url:" + failingUrl);
-                // loadurl(wv,
-                // "file:///android_asset/mbox/md3.html?act=err&info="+description+"&"+NAction.getUserUrl(getApplicationContext()));
-            }
-
-            @Override
-            public void onPageFinished(WebView view, String url) {
-                super.onPageFinished(view, url);
-                view.loadUrl("javascript:window.qpylib.processHTML(document.cookie, document.getElementsByTagName('html')[0].innerHTML);");
-                // view.loadUrl("javascript:(function(){document.getElementById('snapNSendBtn').onclick=function(){var bean=window.bean;var title=bean.getTitle();alert(title);}})()");
-            }
-
-            @Override
-            public void onPageStarted(WebView view, String url, Bitmap favicon) {
-                wv.requestFocus();
-            }
-        });
-
-        wv.setWebChromeClient(new WebChromeClient() {
             public void onProgressChanged(WebView view, int progress) {// 载入进度改变而触发
-                if (progress == 100) {
-                    // handler.sendEmptyMessage(1);//如果全部载入,隐藏进度对话框
-                    // wvProgressBar.setVisibility(View.GONE);
-                }
-                if (wvProgressBar != null)
-                    wvProgressBar.setProgress(wv.getProgress());
+                if (binding.WebViewProgress != null)
+                    binding.WebViewProgress.setProgress(binding.wv.getProgress());
                 super.onProgressChanged(view, progress);
             }
 
-            // The undocumented magic method override
-            // Eclipse will swear at you if you try to put @Override here
-            // For Android 3.0+
+            @Override
+            public void onConsoleMessage(String message, int lineNumber, String sourceID) {
+                writeWebLog("[Console] Line "+lineNumber+ " ("+sourceID+")\n  Message:"+ message);
+            }
 
             public void openFileChooser(ValueCallback<Uri> uploadMsg) {
 
@@ -350,7 +376,6 @@ public void openFileChooser(ValueCallback<Uri> uploadMsg) {
                 i.addCategory(Intent.CATEGORY_OPENABLE);
                 i.setType("*/*");
                 startActivityForResult(Intent.createChooser(i, "File Chooser"), FILECHOOSER_RESULTCODE);
-
             }
 
             // For Android 3.0+
@@ -369,63 +394,88 @@ public void openFileChooser(ValueCallback<Uri> uploadMsg, String acceptType, Str
                 i.addCategory(Intent.CATEGORY_OPENABLE);
                 i.setType("*/*");
                 startActivityForResult(Intent.createChooser(i, "File Chooser"), FILECHOOSER_RESULTCODE);
-
             }
-
         });
 
-        // wv.setScrollBarStyle(View.SCROLLBARS_INSIDE_OVERLAY);
-        // wv.setScrollBarStyle(View.SCROLLBARS_OUTSIDE_OVERLAY);
-        wv.getSettings().setLoadWithOverviewMode(true);
-        // wv.getSettings().setJavaScriptEnabled(true);
-
-        // wv.addJavascriptInterface(new JavascriptInterface(MSearchAct.this), "bean");
-        // registerForContextMenu(wv);
-        // openWaitWindow();
+        binding.wv.getSettings().setLoadWithOverviewMode(true);
     }
 
     @Override
     public boolean onKeyDown(int keycode, KeyEvent event) {
         if (keycode == KeyEvent.KEYCODE_BACK) {
-            if (wv.canGoBack()) {
-                WebBackForwardList mWebBackForwardList = wv.copyBackForwardList();
-                String historyUrl = mWebBackForwardList.getItemAtIndex(mWebBackForwardList.getCurrentIndex()-1).getUrl();
+            if (binding.wv.canGoBack()) {
+                WebBackForwardList mWebBackForwardList = binding.wv.copyBackForwardList();
+                String historyUrl = mWebBackForwardList.getItemAtIndex(mWebBackForwardList.getCurrentIndex() - 1).getUrl();
                 if (historyUrl.startsWith("file:///android_asset/")) {
                     finish();
+                    return true;
                 } else {
-                    wv.goBack();
+                    binding.wv.goBack();
                     return false;
                 }
             } else {
                 finish();
+                return true;
             }
-
+        } else {
+            return super.onKeyDown(keycode, event);
         }
-        return super.onKeyDown(keycode, event);
     }
 
-
+    // if ext endswith .ipynb, you have option to open it with NotebookActivity
     public void loadurl(final WebView view, final String url) {
-        view.loadUrl(url);// 载入网页
-		/*
-		 * new Thread(){ public void run(){ //handler.sendEmptyMessage(0); try{ view.loadUrl(url);//载入网页 if (CONF.DEBUG)
-		 * Log.d(TAG, "load url:"+url); } catch (Exception e) { } } }.start();
-		 */
+        URL u = null;
+        try {
+            u = new URL(url);
+            String path = u.getPath();
+            if (path!=null
+                    && NotebookUtil.isNotebookLibInstall(this)
+                    && path.endsWith((NotebookUtil.ext))) {
+
+
+                new AlertDialog.Builder(this, R.style.MyDialog)
+                        .setTitle(R.string.confirm)
+                        .setMessage(R.string.notebook_open)
+                        .setPositiveButton(R.string.ok, (dialog1, which) -> {
+                            dialog1.dismiss();
+
+                            this.finish();
+
+                            NotebookUtil.killNBSrv(this);
+                            NotebookUtil.startNotebookService2(this);
+                            NotebookActivity.startFromUrl(this, url, true);
+                        })
+                        .setNegativeButton(R.string.no, (dialog1,which)-> {
+                            dialog1.dismiss();
+                            view.loadUrl(url);// 载入网页
+
+                        })
+                        .create()
+                        .show();
+            } else {
+                view.loadUrl(url);// 载入网页
+
+            }
+        } catch (MalformedURLException e) {
+            e.printStackTrace();
+            view.loadUrl(url);// 载入网页
+
+        }
+
     }
 
     public void loadContent(final WebView view, final String content, final String historyUrl) {
         new Thread() {
             public void run() {
-                // handler.sendEmptyMessage(0);
                 view.loadDataWithBaseURL("file:///android_asset/", content, "text/html", "UTF-8", historyUrl);
             }
         }.start();
     }
 
     public void onRefresh(View v) {
-        if (wv != null) {
+        if (binding.wv != null) {
             // openWaitWindow();
-            wv.reload();
+            binding.wv.reload();
         }
     }
 
@@ -435,48 +485,22 @@ public QPyLib(Context context) {
 
         @JavascriptInterface
         public void processHTML(String cookie, String data) {
-            // Log.d(TAG, "processHTML called(cookie):"+cookie);
-            // Log.d(TAG, "processHTML called(data):"+data);
+            // LogUtil.d(TAG, "processHTML called(cookie):"+cookie);
+            // LogUtil.d(TAG, "processHTML called(data):"+data);
             wvCookie = cookie;
             wvDocument = data;
 
         }
     }
 
-    protected ValueCallback<Uri> mUploadMessage;
-
-    protected final static int FILECHOOSER_RESULTCODE = 1;
-
-    protected final BroadcastReceiver webviewActivityReceiver = new BroadcastReceiver() {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            //Log.d(TAG, "downloadReceiver");
-            String act = intent.getExtras().getString(PythonActivity.EXTRA_CONTENT_URL1);
-            String url = intent.getExtras().getString(PythonActivity.EXTRA_CONTENT_URL2);
-
-            if (act.equals("pipconsole")) {
-                String[] args = {getApplicationContext().getFilesDir()+"/bin/pip_console.py", getApplicationContext().getFilesDir().toString()};
-                execPyInConsole(args);
-
-            } else if (act.equals("pipinstall")) {
-                String src = intent.getExtras().getString(PythonActivity.EXTRA_CONTENT_URL3);
-
-                String[] args = {getApplicationContext().getFilesDir()+"/bin/pip", "install", url, "-i", src, getApplicationContext().getFilesDir().toString()};
-                execPyInConsole(args);
-                //Toast.makeText(getApplicationContext(), url, Toast.LENGTH_SHORT).show();
-
-            } else if (act.equals("close")) {
-                finish();
-            } else if (act.equals("installqpylib")) {
-                //
-            } else if (act.equals("launchsrv")) {
-                String script = getIntent().getStringExtra(PythonActivity.EXTRA_CONTENT_URL4);
-                if (script != null && !script.equals("")) {
-                    launchScript = script;
-                }
-            }
-        }
-    };
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onMessageEvent(CreateNotebookDownloadFinishEvent event) {
+        String notebook = event.fileName;
+        Toast.makeText(this, notebook+" is downloaded", Toast.LENGTH_SHORT).show();
 
+    }
+    public static class CreateNotebookDownloadFinishEvent {
+        public String fileName;
+    }
 
 }
diff --git a/qpython/src/main/java/org/qpython/qpy/main/activity/QrCodeActivity.java b/qpython/src/main/java/org/qpython/qpy/main/activity/QrCodeActivity.java
index 585dc34b..7a3760f0 100644
--- a/qpython/src/main/java/org/qpython/qpy/main/activity/QrCodeActivity.java
+++ b/qpython/src/main/java/org/qpython/qpy/main/activity/QrCodeActivity.java
@@ -1,47 +1,120 @@
-package org.qpython.qpy.main.activity;
-
-
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-
-import com.google.zxing.Result;
-
-import me.dm7.barcodescanner.zxing.ZXingScannerView;
-
-public class QrCodeActivity extends BaseActivity implements ZXingScannerView.ResultHandler {
-    private static final String TAG = "QrCodeActivity";
-    private ZXingScannerView mScannerView;
-
-    public static void start(Context context) {
-        Intent starter = new Intent(context, QrCodeActivity.class);
-        context.startActivity(starter);
-    }
-
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        mScannerView = new ZXingScannerView(this);
-        setContentView(mScannerView);
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        mScannerView.setResultHandler(this);
-        mScannerView.startCamera();
-    }
-
-    @Override
-    protected void onPause() {
-        super.onPause();
-        mScannerView.stopCamera();
-    }
-
-    @Override
-    public void handleResult(Result result) {
-        //EditorMainActivity.startActivity(this, result.getText());
-        finish();
-    }
-}
+package org.qpython.qpy.main.activity;
+
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.app.AlertDialog;
+import android.support.v7.app.AppCompatActivity;
+import android.widget.Toast;
+import android.support.v7.widget.Toolbar;
+
+import com.google.zxing.Result;
+import com.loopj.android.http.AsyncHttpResponseHandler;
+import com.quseit.base.QBaseApp;
+import com.quseit.util.NUtil;
+
+import org.apache.http.Header;
+import org.qpython.qpy.R;
+import org.qpython.qpy.console.ScriptExec;
+import org.qpython.qpy.texteditor.EditorActivity;
+
+import java.util.List;
+import java.util.Map;
+
+import me.dm7.barcodescanner.zxing.ZXingScannerView;
+
+public class QrCodeActivity extends AppCompatActivity implements ZXingScannerView.ResultHandler {
+    private ZXingScannerView mScannerView;
+
+    public static void start(Context context) {
+        Intent starter = new Intent(context, QrCodeActivity.class);
+        context.startActivity(starter);
+    }
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_qrcode);
+        setTitle(R.string.read_script_from_qrcode);
+        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);
+        toolbar.setNavigationIcon(R.drawable.ic_back);
+        toolbar.setNavigationOnClickListener(v -> finish());
+        mScannerView = (ZXingScannerView) findViewById(R.id.scanner);
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        mScannerView.setResultHandler(this);
+        mScannerView.startCamera();
+    }
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+        mScannerView.stopCamera();
+    }
+
+    private void close() {
+        this.finish();
+    }
+    private void linkToScanURL(String scanResult) {
+        QrCodeActivity.this.close();
+
+        QWebViewActivity.start(this, "QWebView", scanResult);
+
+    }
+    @Override
+    public void handleResult(Result result) {
+        String scanResult = result.getText();
+        if (scanResult.startsWith("http://") || scanResult.startsWith("https://")) {
+            // Handle url
+            new AlertDialog.Builder(this)
+                    .setTitle(R.string.qr_info)
+                    .setMessage(getString(R.string.qr_goto)+"\n\n"+scanResult)
+                    .setNegativeButton(R.string.cancel, (dialog1, which) -> dialog1.dismiss())
+                    .setPositiveButton(R.string.ok, (dialog1, which) -> linkToScanURL(scanResult))
+                    .create()
+                    .show();
+
+        } else if (scanResult.startsWith("qwe://")) {
+            // start the qpy.io editor
+            if (scanResult.contains("token=")) {
+                String qweLink = scanResult.replace("qwe://", "http://") + "&ip=" + NUtil.getIPAddress(true) + ":10000";
+                Map<String, List<String>> ps = NUtil.getQueryParams(qweLink);
+                String token = "";
+                if (ps.get("token") != null) {
+                    token = ps.get("token").get(0);
+                }
+                ScriptExec.getInstance().playScript(this,getApplicationContext().getFilesDir() + "/bin/qedit4web.py", token, false);
+                QBaseApp.getInstance().getAsyncHttpClient().get(this, qweLink, null, new AsyncHttpResponseHandler() {
+
+                    @Override
+                    public void onSuccess(int i, Header[] headers, byte[] bytes) {
+                        Toast.makeText(getApplicationContext(), "QWE Service started", Toast.LENGTH_SHORT).show();
+
+                    }
+
+                    @Override
+                    public void onFailure(int i, Header[] headers, byte[] bytes, Throwable throwable) {
+                        Toast.makeText(getApplicationContext(), "QWE Service failed to start", Toast.LENGTH_SHORT).show();
+
+                    }
+
+                });
+            } else {
+                Toast.makeText(getApplicationContext(), "Failed to parse token", Toast.LENGTH_SHORT).show();
+            }
+            finish();
+
+        } else {
+            EditorActivity.start(this, result.getText(), "FromQRCode");
+
+            finish();
+
+        }
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/activity/SettingActivity.java b/qpython/src/main/java/org/qpython/qpy/main/activity/SettingActivity.java
new file mode 100644
index 00000000..62a109cc
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/activity/SettingActivity.java
@@ -0,0 +1,86 @@
+package org.qpython.qpy.main.activity;
+
+import android.app.AlarmManager;
+import android.app.PendingIntent;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.Toolbar;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.main.fragment.SettingFragment;
+import org.qpython.qpy.main.service.FTPServerService;
+import org.qpython.qpy.utils.NotebookUtil;
+import org.swiftp.Globals;
+
+
+public class SettingActivity extends AppCompatActivity {
+    SettingFragment fragment;
+
+    public static void startActivity(Context context) {
+        Intent intent = new Intent(context, SettingActivity.class);
+        context.startActivity(intent);
+    }
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_setting);
+        fragment = new SettingFragment();
+        getFragmentManager().beginTransaction()
+                .replace(R.id.setting_fragment, fragment)
+                .commit();
+        Globals.setContext(getApplicationContext());
+        init();
+        //Thread.setDefaultUncaughtExceptionHandler((t, e) -> SettingActivity.restartApp(SettingActivity.this));
+    }
+
+    public static void restartApp(Context context) {
+        Intent mStartActivity = new Intent(context, HomeMainActivity.class); //Replace StartActivity with the name of the first activity in your app
+        int mPendingIntentId = 123456;
+        PendingIntent mPendingIntent = PendingIntent.getActivity(context, mPendingIntentId, mStartActivity, PendingIntent.FLAG_CANCEL_CURRENT);
+        AlarmManager mgr = (AlarmManager)context.getSystemService(Context.ALARM_SERVICE);
+        mgr.set(AlarmManager.RTC, System.currentTimeMillis() + 100, mPendingIntent);
+        System.exit(0);
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        IntentFilter filter = new IntentFilter();
+        filter.addAction(FTPServerService.ACTION_STARTED);
+        filter.addAction(FTPServerService.ACTION_STOPPED);
+        filter.addAction(FTPServerService.ACTION_FAILEDTOSTART);
+        registerReceiver(fragment.getFtpServerReceiver(), filter);
+    }
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+        unregisterReceiver(fragment.getFtpServerReceiver());
+    }
+
+    @Override
+    public void onBackPressed() {
+        if (NotebookUtil.isNotebookEnable(this)){
+            setResult(RESULT_OK);
+        }
+        super.onBackPressed();
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+    }
+
+    private void init() {
+        Toolbar mToolbar = (Toolbar) findViewById(R.id.toolbar);
+        setSupportActionBar(mToolbar);
+        mToolbar.setTitle(getString(R.string.more));
+        mToolbar.setNavigationIcon(R.drawable.ic_back);
+        mToolbar.setNavigationOnClickListener(view -> SettingActivity.this.finish());
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/activity/SplashActivity.java b/qpython/src/main/java/org/qpython/qpy/main/activity/SplashActivity.java
new file mode 100644
index 00000000..4d9fdfd6
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/activity/SplashActivity.java
@@ -0,0 +1,30 @@
+package org.qpython.qpy.main.activity;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.app.AppCompatActivity;
+
+import org.qpython.qpy.R;
+
+import java.util.Timer;
+import java.util.TimerTask;
+
+public class SplashActivity extends AppCompatActivity {
+
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_splash);
+        new Timer().schedule(new TimerTask() {
+            @Override
+            public void run() {
+                Intent intent = new Intent(SplashActivity.this,HomeMainActivity.class);
+                intent.setAction(getIntent().getAction());
+                startActivity(intent);
+                finish();
+            }
+        },1000);
+    }
+
+}
\ No newline at end of file
diff --git a/qpython/src/main/java/org/qpython/qpy/main/adapter/AppListAdapter.java b/qpython/src/main/java/org/qpython/qpy/main/adapter/AppListAdapter.java
new file mode 100644
index 00000000..920a5d19
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/adapter/AppListAdapter.java
@@ -0,0 +1,232 @@
+package org.qpython.qpy.main.adapter;
+
+import android.app.Activity;
+import android.app.PendingIntent;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.pm.ShortcutInfo;
+import android.content.pm.ShortcutManager;
+import android.databinding.DataBindingUtil;
+import android.graphics.drawable.Icon;
+import android.net.Uri;
+import android.os.Build;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.RecyclerView;
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.ViewGroup;
+import android.widget.Toast;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.console.ScriptExec;
+import org.qpython.qpy.databinding.ItemAppListBinding;
+import org.qpython.qpy.main.activity.AppListActivity;
+import org.qpython.qpy.main.model.AppModel;
+import org.qpython.qpy.main.model.LocalAppModel;
+import org.qpython.qpy.main.model.QPyScriptModel;
+import org.qpython.qpy.texteditor.EditorActivity;
+import org.qpython.qpy.texteditor.ui.view.EnterDialog;
+import android.support.v7.app.AlertDialog;
+
+
+import java.util.List;
+
+/**
+ * App list adapter
+ * Created by Hmei on 2017-05-25.
+ */
+
+public class AppListAdapter extends RecyclerView.Adapter<MyViewHolder<ItemAppListBinding>> {
+    private static final String TYPE_SCRIPT = "script";
+    private static final String TAG = "AppListAdapter";
+
+    private List<AppModel> dataList;
+    private String         type;
+    private Context        context;
+    private Callback       callback;
+
+    public AppListAdapter(List<AppModel> dataList, String type, Context context) {
+        this.dataList = dataList;
+        this.type = type;
+        this.context = context;
+    }
+
+    @Override
+    public MyViewHolder<ItemAppListBinding> onCreateViewHolder(ViewGroup parent, int viewType) {
+        ItemAppListBinding binding = DataBindingUtil.inflate(LayoutInflater.from(context), R.layout.item_app_list, parent, false);
+        MyViewHolder<ItemAppListBinding> holder = new MyViewHolder<>(binding.getRoot());
+        holder.setBinding(binding);
+        return holder;
+    }
+
+    @Override
+    public void onBindViewHolder(MyViewHolder<ItemAppListBinding> holder, int position) {
+        ItemAppListBinding binding = holder.getBinding();
+        if (type.equals(TYPE_SCRIPT) & position == dataList.size()) {
+            binding.ciAppIcon.setImageResource(R.drawable.ic_home_qpy_add);
+            binding.tvAppName.setText(R.string.add);
+        } else {
+            binding.ciAppIcon.setImageDrawable(dataList.get(position).getIcon());
+            binding.tvAppName.setText(dataList.get(position).getLabel());
+        }
+        binding.getRoot().setOnClickListener(v -> {
+            if (position == dataList.size()) {
+                EditorActivity.start(context, "");
+            } else if (dataList.get(position) instanceof QPyScriptModel) {
+                QPyScriptModel qPyScriptItem = (QPyScriptModel) dataList.get(position);
+                if (qPyScriptItem.isProj()) {
+                    callback.runProject(qPyScriptItem);
+                } else {
+                    callback.runScript(qPyScriptItem);
+                }
+            } else if (dataList.get(position) instanceof LocalAppModel) {
+                LocalAppModel localAppItem = (LocalAppModel) dataList.get(position);
+                Intent intent = context.getPackageManager().getLaunchIntentForPackage(localAppItem.getApplicationPackageName());
+                if (intent != null) {
+                    context.startActivity(intent);
+                }
+            } else {
+
+                Log.d(TAG, "ONCLICK");
+                callback.exit();
+            }
+        });
+
+        binding.getRoot().setOnLongClickListener(v -> {
+            if (position != dataList.size()) {
+                CharSequence[] chars = new CharSequence[]{context.getString(R.string.create_shortcut), context.getString(R.string.run_with_params), context.getString(R.string.open_with_editor)};
+
+                final boolean[] isConsumed = new boolean[]{true};
+                new AlertDialog.Builder(context, R.style.MyDialog)
+                        .setTitle(R.string.choose_action)
+                        .setItems(chars, (dialog, which) -> {
+                            switch (which) {
+                                case 0: // Create Shortcut
+                                    isConsumed[0] = createShortCut(position);
+                                    dialog.dismiss();
+                                    break;
+                                case 1: // Run with params
+                                    runWithParams(position);
+                                    dialog.dismiss();
+                                    break;
+                                case 2:
+                                    openToEdit(position);
+                                    dialog.dismiss();
+
+                            }
+                        }).setNegativeButton("CLOSE", new DialogInterface.OnClickListener() {
+
+                    @Override
+                    public void onClick(DialogInterface dialogInterface, int i) {
+                        dialogInterface.dismiss();
+                    }
+                })
+                        .show();
+                return isConsumed[0];
+            } else {
+                return true;
+            }
+        });
+
+    }
+
+    @Override
+    public int getItemCount() {
+        return dataList == null ? 0 : type.equals(TYPE_SCRIPT) ? dataList.size() + 1 : dataList.size();
+    }
+
+    public void setCallback(Callback callback) {
+        this.callback = callback;
+    }
+
+    public interface Callback {
+        void runScript(QPyScriptModel item);
+
+        void runProject(QPyScriptModel item);
+
+        void exit();
+    }
+
+    private boolean createShortCut(int position) {
+        //最后一个为添加script，不用创建快键图标
+        if (position == dataList.size()) {
+            return false;
+        }
+        // Create shortcut
+        QPyScriptModel qPyScriptModel = (QPyScriptModel) dataList.get(position);
+        Intent intent = new Intent();
+        intent.setClass(context, AppListActivity.class);
+        intent.setAction(Intent.ACTION_VIEW);
+        intent.putExtra("type", "script");
+        intent.putExtra("path", qPyScriptModel.getPath());
+        intent.putExtra("isProj", qPyScriptModel.isProj());
+
+        if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            ShortcutManager mShortcutManager = context.getSystemService(ShortcutManager.class);
+            if (mShortcutManager.isRequestPinShortcutSupported()) {
+                ShortcutInfo pinShortcutInfo =
+                        new ShortcutInfo.Builder(context, dataList.get(position).getLabel())
+                                .setShortLabel(dataList.get(position).getLabel())
+                                .setLongLabel(dataList.get(position).getLabel())
+                                .setIcon(Icon.createWithResource(context, dataList.get(position).getIconRes()))
+                                .setIntent(intent)
+                                .build();
+                Intent pinnedShortcutCallbackIntent =
+                        mShortcutManager.createShortcutResultIntent(pinShortcutInfo);
+                PendingIntent successCallback = PendingIntent.getBroadcast(context, 0,
+                        pinnedShortcutCallbackIntent, 0);
+                mShortcutManager.requestPinShortcut(pinShortcutInfo,
+                        successCallback.getIntentSender());
+            }
+        } else {
+            //Adding shortcut for MainActivity
+            //on Home screen
+            Intent addIntent = new Intent();
+            addIntent.putExtra(Intent.EXTRA_SHORTCUT_INTENT, intent);
+            addIntent.putExtra(Intent.EXTRA_SHORTCUT_NAME, dataList.get(position).getLabel());
+            addIntent.putExtra(Intent.EXTRA_SHORTCUT_ICON_RESOURCE,
+                    Intent.ShortcutIconResource.fromContext(context.getApplicationContext(),
+                            dataList.get(position).getIconRes()));
+            addIntent.setAction("com.android.launcher.action.INSTALL_SHORTCUT");
+            context.getApplicationContext().sendBroadcast(addIntent);
+            Toast.makeText(context, context.getString(R.string.shortcut_create_suc, dataList.get(position).getLabel()), Toast.LENGTH_SHORT).show();
+        }
+        return true;
+    }
+
+    private void openToEdit(int position) {
+        QPyScriptModel model = (QPyScriptModel) dataList.get(position);
+        if (model.isProj()) {
+
+            EditorActivity.start(model.getPath(), context);
+
+        } else {
+            //Intent intent = new Intent();
+            //model.getPath()
+            EditorActivity.start(context, Uri.parse("file://"+model.getPath()));
+        }
+    }
+
+    private void runWithParams(int position) {
+        new EnterDialog(context)
+                .setTitle(context.getString(R.string.enter_u_params))
+                .setHint(context.getString(R.string.params))
+                .setConfirmListener(args -> {
+                    if (TextUtils.isEmpty(args)) {
+                        Toast.makeText(context, R.string.params_emp, Toast.LENGTH_SHORT).show();
+                        return false;
+                    }
+                    QPyScriptModel model = (QPyScriptModel) dataList.get(position);
+                    if (model.isProj()) {
+                        ScriptExec.getInstance().playProject(context, model.getPath(), args, false);
+                    } else {
+                        ScriptExec.getInstance().playScript(context, model.getPath(),
+                                args, false);
+                    }
+                    return true;
+                })
+                .show();
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/adapter/CloudScriptAdapter.java b/qpython/src/main/java/org/qpython/qpy/main/adapter/CloudScriptAdapter.java
new file mode 100644
index 00000000..7df33aca
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/adapter/CloudScriptAdapter.java
@@ -0,0 +1,69 @@
+package org.qpython.qpy.main.adapter;
+
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.codeshare.pojo.CloudFile;
+import org.qpython.qpy.databinding.ItemFolderBinding;
+import org.qpython.qpy.texteditor.ui.adapter.MyViewHolder;
+import org.qpython.qpysdk.QPyConstants;
+
+import java.io.File;
+import java.util.List;
+
+
+public class CloudScriptAdapter extends RecyclerView.Adapter<MyViewHolder<ItemFolderBinding>> {
+    private List<CloudFile> dataList;
+    private Callback        callback;
+
+    public CloudScriptAdapter(List<CloudFile> dataList) {
+        this.dataList = dataList;
+    }
+
+    public void setCallback(Callback callback) {
+        this.callback = callback;
+    }
+
+    @Override
+    public MyViewHolder<ItemFolderBinding> onCreateViewHolder(ViewGroup parent, int viewType) {
+        View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.item_folder, null);
+        return new MyViewHolder<>(view);
+    }
+
+    @Override
+    public void onBindViewHolder(MyViewHolder<ItemFolderBinding> holder, int position) {
+        ItemFolderBinding binding = holder.getBinding();
+        CloudFile cloudFile = dataList.get(position);
+        binding.tvPath.setText(cloudFile.getUploadTime());
+        binding.tvFileName.setText(cloudFile.getName());
+        binding.ivFileIcon.setImageResource(R.drawable.ic_editor_file);
+        binding.tvPath.setText(cloudFile.getPath());
+        binding.tvPath.setVisibility(View.VISIBLE);
+        binding.getRoot().setOnClickListener(v -> callback.onClick(position));
+
+        if (cloudFile.isUploading()) {
+            binding.uploading.setVisibility(View.VISIBLE);
+        } else {
+            binding.uploading.setVisibility(View.GONE);
+        }
+        if (new File(QPyConstants.ABSOLUTE_PATH + cloudFile.getPath()).exists()) {
+            binding.uploaded.setImageResource(R.drawable.ic_check_circle);
+            binding.uploaded.setVisibility(View.VISIBLE);
+        } else {
+            binding.uploaded.setVisibility(View.GONE);
+        }
+    }
+
+    @Override
+    public int getItemCount() {
+        return dataList == null ? 0 : dataList.size();
+    }
+
+    public interface Callback {
+        void onClick(int position);
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/adapter/CodeCommentAdapter.java b/qpython/src/main/java/org/qpython/qpy/main/adapter/CodeCommentAdapter.java
new file mode 100644
index 00000000..233b1aa0
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/adapter/CodeCommentAdapter.java
@@ -0,0 +1,78 @@
+package org.qpython.qpy.main.adapter;
+
+import android.content.Context;
+import android.databinding.DataBindingUtil;
+import android.support.v7.widget.RecyclerView;
+import android.text.Html;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.quseit.util.ImageDownLoader;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.codeshare.pojo.Gist;
+import org.qpython.qpy.databinding.ItemCommentBinding;
+
+import java.util.List;
+
+
+public class CodeCommentAdapter extends RecyclerView.Adapter<MyViewHolder<ItemCommentBinding>> {
+    private List<Gist.CommentBean> dataList;
+    private Reply                  callback;
+    private Context                context;
+
+    public CodeCommentAdapter(List<Gist.CommentBean> dataList) {
+        this.dataList = dataList;
+    }
+
+    public void setItemClickListener(Reply callback) {
+        this.callback = callback;
+    }
+
+    @Override
+    public MyViewHolder<ItemCommentBinding> onCreateViewHolder(ViewGroup parent, int viewType) {
+        context = parent.getContext();
+        ItemCommentBinding binding = DataBindingUtil.inflate(LayoutInflater.from(parent.getContext()), R.layout.item_comment, parent, false);
+        MyViewHolder<ItemCommentBinding> holder = new MyViewHolder<>(binding.getRoot());
+        holder.setBinding(binding);
+        return holder;
+    }
+
+    @Override
+    public void onBindViewHolder(MyViewHolder<ItemCommentBinding> holder, int position) {
+        ItemCommentBinding binding = holder.getBinding();
+        if (position == dataList.size()) {
+            binding.avatar.setImageResource(0);
+            binding.reComment.setVisibility(View.GONE);
+            binding.line.setVisibility(View.GONE);
+            return;
+        }
+        Gist.CommentBean item = dataList.get(position);
+        binding.date.setText(item.getData());
+        binding.name.setText(item.getFrom());
+        if (item.getAvatar() != null) {
+            ImageDownLoader.setImageFromUrl(context, binding.avatar, item.getAvatar());
+        }
+        if (TextUtils.isEmpty(item.getRe())) {
+            binding.fromContent.setText(item.getFrom_content());
+            binding.reComment.setVisibility(View.GONE);
+        } else {
+            binding.reComment.setVisibility(View.VISIBLE);
+            binding.fromContent.setText(Html.fromHtml(context.getString(R.string.re_format, item.getFrom(), item.getFrom_content())));
+            binding.reComment.setText(Html.fromHtml(context.getString(R.string.replied_format, item.getRe(), item.getRe_content())));
+        }
+
+        binding.getRoot().setOnClickListener(v -> callback.reply(item.getFrom(), item.getFrom_content()));
+    }
+
+    @Override
+    public int getItemCount() {
+        return dataList == null ? 0 : dataList.size() + 1;
+    }
+
+    public interface Reply {
+        void reply(String to, String reComment);
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/adapter/CodeShareAdapter.java b/qpython/src/main/java/org/qpython/qpy/main/adapter/CodeShareAdapter.java
new file mode 100644
index 00000000..a052f902
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/adapter/CodeShareAdapter.java
@@ -0,0 +1,58 @@
+package org.qpython.qpy.main.adapter;
+
+import android.content.Context;
+import android.databinding.DataBindingUtil;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.ViewGroup;
+
+import com.quseit.util.ImageDownLoader;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.codeshare.pojo.GistBase;
+import org.qpython.qpy.databinding.ItemShareCodeBinding;
+import org.qpython.qpy.main.activity.CodeDetailActivity;
+import org.qpython.qpy.main.activity.CodeShareActivity;
+
+import java.util.List;
+
+
+public class CodeShareAdapter extends RecyclerView.Adapter<MyViewHolder<ItemShareCodeBinding>> {
+
+    private List<GistBase> dataList;
+    private Context        context;
+    private boolean        isProj;
+
+    public CodeShareAdapter(List<GistBase> dataList, boolean isProj) {
+        this.dataList = dataList;
+        this.isProj = isProj;
+    }
+
+    @Override
+    public MyViewHolder<ItemShareCodeBinding> onCreateViewHolder(ViewGroup parent, int viewType) {
+        context = parent.getContext();
+        ItemShareCodeBinding binding = DataBindingUtil.inflate(LayoutInflater.from(parent.getContext()), R.layout.item_share_code, parent, false);
+        MyViewHolder<ItemShareCodeBinding> holder = new MyViewHolder<>(binding.getRoot());
+        holder.setBinding(binding);
+        return holder;
+    }
+
+    @Override
+    public void onBindViewHolder(MyViewHolder<ItemShareCodeBinding> holder, int position) {
+        ItemShareCodeBinding binding = holder.getBinding();
+        GistBase item = dataList.get(position);
+        ImageDownLoader.setImageFromUrl(context, binding.avatar, item.getAvatar());
+        binding.title.setText(item.getTitle());
+        binding.name.setText(item.getAuthor());
+        binding.date.setText(item.getDate());
+        binding.bookmarkCount.setText(item.getBookmaker_count() + "");
+        binding.commentCount.setText(item.getComment_count() + "");
+
+        binding.getRoot().setOnClickListener(v -> CodeDetailActivity.start(context, item.getId(), isProj));
+    }
+
+    @Override
+    public int getItemCount() {
+        return dataList == null ? 0 : dataList.size();
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/adapter/CourseAdapter.java b/qpython/src/main/java/org/qpython/qpy/main/adapter/CourseAdapter.java
new file mode 100644
index 00000000..1cc8fb63
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/adapter/CourseAdapter.java
@@ -0,0 +1,113 @@
+package org.qpython.qpy.main.adapter;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.databinding.DataBindingUtil;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.net.Uri;
+import android.os.Build;
+import android.support.v4.util.Pair;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.quseit.util.ImageDownLoader;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.databinding.ItemCourseBinding;
+import org.qpython.qpy.main.activity.CourseIndexFundingActivity;
+import org.qpython.qpy.main.activity.QWebViewActivity;
+import org.qpython.qpy.main.server.model.CourseModel;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+/**
+ * Course adapter
+ * Created by Hmei on 2017-06-29.
+ */
+
+public class CourseAdapter extends RecyclerView.Adapter<MyViewHolder<ItemCourseBinding>> {
+
+    private List<CourseModel> dataList;
+    private Activity          context;
+    private List<View> childViews = new ArrayList<>();
+
+    public CourseAdapter(Activity context, List<CourseModel> dataList) {
+        this.context = context;
+        this.dataList = dataList;
+    }
+
+    @Override
+    public MyViewHolder<ItemCourseBinding> onCreateViewHolder(ViewGroup parent, int viewType) {
+        ItemCourseBinding binding = DataBindingUtil.inflate(LayoutInflater.from(parent.getContext()), R.layout.item_course, parent, false);
+        MyViewHolder<ItemCourseBinding> holder = new MyViewHolder<>(binding.getRoot());
+        holder.setBinding(binding);
+        return holder;
+    }
+
+    @Override
+    public void onBindViewHolder(MyViewHolder<ItemCourseBinding> holder, int position) {
+        CourseModel item = dataList.get(position);
+        ItemCourseBinding binding = holder.getBinding();
+        binding.setCourse(item);
+
+        View.OnClickListener listener = v -> {
+            if (item.getOpen() == 0) {
+                // Open == 0 -> Not release yet
+                QWebViewActivity.start(context, item.getTitle(), item.getLink());
+            } else {
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                    initChildViews((ViewGroup) binding.getRoot());
+                    Pair<View, String>[] pairs = new Pair[childViews.size()];
+                    for (int i = 0; i < childViews.size(); i++) {
+                        pairs[i] = new Pair<>(childViews.get(i), childViews.get(i).getTransitionName());
+                    }
+                    CourseIndexFundingActivity.start(context, pairs, item, item.getCrowdfunding());
+                } else {
+                    CourseIndexFundingActivity.start(context, item, item.getCrowdfunding());
+                }
+            }
+        };
+
+        binding.tvLevel.setText(context.getString(R.string.level, item.getLevel() + ""));
+        if (item.getOpen() == 0) {
+            binding.free.setVisibility(View.GONE);
+        } else {
+            binding.free.setVisibility(View.VISIBLE);
+            if (item.getCrowdfunding() == 0) {
+                binding.free.setBackgroundColor(context.getResources().getColor(R.color.theme_green));
+                binding.free.setText(R.string.free);
+            } else {
+                // 众筹中
+                binding.free.setBackgroundColor(context.getResources().getColor(R.color.theme_yellow));
+                binding.free.setText(R.string.funding);
+                binding.free.setOnClickListener(listener);
+            }
+        }
+
+        ImageDownLoader.setImageFromUrl(context, binding.ivTheme, item.getLogo());
+        binding.getRoot().setOnClickListener(listener);
+    }
+
+    private void initChildViews(ViewGroup viewGroup) {
+        int count = viewGroup.getChildCount();
+        for (int i = 0; i < count; i++) {
+            View view = viewGroup.getChildAt(i);
+            if (view instanceof ViewGroup) {
+                initChildViews((ViewGroup) view);
+            } else {
+                childViews.add(view);
+            }
+        }
+    }
+
+    @Override
+    public int getItemCount() {
+        return dataList.size();
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/adapter/CoursePagerAdapter.java b/qpython/src/main/java/org/qpython/qpy/main/adapter/CoursePagerAdapter.java
new file mode 100644
index 00000000..0ea19bad
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/adapter/CoursePagerAdapter.java
@@ -0,0 +1,43 @@
+package org.qpython.qpy.main.adapter;
+
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentStatePagerAdapter;
+
+import org.qpython.qpy.main.fragment.CourseFragment;
+import org.qpython.qpy.main.fragment.LibAIPyFragment;
+import org.qpython.qpy.main.fragment.LibProjectFragment;
+import org.qpython.qpy.main.fragment.LibQPyPiFragment;
+
+
+public class CoursePagerAdapter extends FragmentStatePagerAdapter {
+    private int mNumOfTabs;
+
+    private CourseFragment recommend = new CourseFragment();
+    private CourseFragment latest    = new CourseFragment();
+    private CourseFragment my        = new CourseFragment();
+
+    public CoursePagerAdapter(FragmentManager fm) {
+        super(fm);
+        this.mNumOfTabs = 3;
+    }
+
+    @Override
+    public Fragment getItem(int position) {
+        switch (position) {
+            case 0:
+                return recommend;
+            case 1:
+                return latest;
+            case 2:
+                return my;
+            default:
+                return null;
+        }
+    }
+
+    @Override
+    public int getCount() {
+        return mNumOfTabs;
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/adapter/EditorFileTreeAdapter.java b/qpython/src/main/java/org/qpython/qpy/main/adapter/EditorFileTreeAdapter.java
new file mode 100644
index 00000000..1d5c8ba1
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/adapter/EditorFileTreeAdapter.java
@@ -0,0 +1,26 @@
+package org.qpython.qpy.main.adapter;
+
+import org.greenrobot.eventbus.EventBus;
+import org.qpython.qpy.R;
+import org.qpython.qpy.databinding.ItemFolderLittleBinding;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.texteditor.EditorActivity;
+
+public class EditorFileTreeAdapter extends FileTreeAdapter {
+    public EditorFileTreeAdapter(String rootPath) {
+        super(rootPath);
+
+    }
+
+    @Override
+    void itemClick(ItemFolderLittleBinding binding, FileTreeAdapter.FileTreeBean folderBean) {
+        String[] ext = App.getContext().getResources().getStringArray(R.array.text_ext);
+        EditorActivity.OpenFileEvent openFileEvent = new EditorActivity.OpenFileEvent();
+        for (String s : ext) {
+            if (folderBean.name.endsWith(s)) {
+                openFileEvent.filePath = folderBean.path;
+            }
+        }
+        EventBus.getDefault().post(openFileEvent);
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/adapter/FileTreeAdapter.java b/qpython/src/main/java/org/qpython/qpy/main/adapter/FileTreeAdapter.java
new file mode 100644
index 00000000..1130204b
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/adapter/FileTreeAdapter.java
@@ -0,0 +1,135 @@
+package org.qpython.qpy.main.adapter;
+
+import android.content.res.Resources;
+import android.databinding.DataBindingUtil;
+import android.support.v7.widget.RecyclerView;
+import android.util.TypedValue;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.databinding.ItemFolderLittleBinding;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import static com.quseit.util.FolderUtils.sortTypeByName;
+
+
+public abstract class FileTreeAdapter extends RecyclerView.Adapter<MyViewHolder<ItemFolderLittleBinding>> {
+    private   int                offsetX;
+    protected List<FileTreeBean> dataList;
+
+    FileTreeAdapter(String rootPath) {
+        dataList = new ArrayList<>();
+
+        File file = new File(rootPath);
+        dataList.add(new FileTreeBean(file, 0));
+
+        offsetX = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 15, Resources.getSystem().getDisplayMetrics());
+    }
+
+    @Override
+    public MyViewHolder<ItemFolderLittleBinding> onCreateViewHolder(ViewGroup parent, int viewType) {
+        ItemFolderLittleBinding binding = DataBindingUtil.inflate(LayoutInflater.from(parent.getContext()), R.layout.item_folder_little, parent, false);
+        MyViewHolder<ItemFolderLittleBinding> holder = new MyViewHolder<>(binding.getRoot());
+        holder.setBinding(binding);
+        return holder;
+    }
+
+    @Override
+    public void onBindViewHolder(MyViewHolder<ItemFolderLittleBinding> holder, int position) {
+        ItemFolderLittleBinding binding = holder.getBinding();
+        FileTreeBean file = dataList.get(position);
+
+        // initView
+        binding.getRoot().setPadding(offsetX * file.level, 0, 0, 0);
+
+        String fileName = file.name;
+        binding.item.setText(fileName);
+
+        boolean isDir = file.childList.size() != 0;
+        if (!isDir) {
+            binding.arrow.setVisibility(View.INVISIBLE);
+            binding.item.setCompoundDrawablesWithIntrinsicBounds(R.drawable.ic_editor_file_little, 0, 0, 0);
+        } else {
+            binding.arrow.setImageResource(file.isExpanded ? R.drawable.ic_arrow_drop_down_a : R.drawable.ic_arrow_drop_down_b);
+            binding.arrow.setVisibility(View.VISIBLE);
+            binding.item.setCompoundDrawablesWithIntrinsicBounds(R.drawable.ic_editor_folder_little, 0, 0, 0);
+        }
+
+        // initListener
+        binding.expandClickZone.setOnClickListener(v -> {
+            if (isDir) {
+                file.isExpanded = !file.isExpanded;
+                notifyItemChanged(position);
+                if (file.isExpanded) {
+                    dataList.addAll(position + 1, file.childList);
+                    notifyItemRangeInserted(position + 1, file.childList.size());
+                } else {
+                    notifyItemRangeRemoved(position + 1, file.childList.size());
+                    dataList.removeAll(file.childList);
+                }
+            } else {
+                itemClick(binding, file);
+            }
+        });
+    }
+
+    public void addNewFile(String path) {
+        File parentFile = new File(path).getParentFile();
+        String parentPath = parentFile.getAbsolutePath();
+        int level;
+        for (int i = 0; i < dataList.size(); i++) {
+            if (dataList.get(i).path.equals(parentPath)) {
+                level = dataList.get(i).level + 1;
+                FileTreeBean fileTreeBean = new FileTreeBean(new File(path), level);
+                dataList.get(i).childList.add(fileTreeBean);
+                if (dataList.get(i).isExpanded) {
+                    dataList.add(i + dataList.get(i).childList.size(), fileTreeBean);
+                    notifyItemInserted(i + dataList.get(i).childList.size());
+                }
+                break;
+            }
+        }
+    }
+
+    @Override
+    public int getItemCount() {
+        return dataList == null ? 0 : dataList.size();
+    }
+
+    abstract void itemClick(ItemFolderLittleBinding binding, FileTreeBean folderBean);
+
+    protected class FileTreeBean {
+        protected int    level;
+        protected String path;
+        protected String name;
+        boolean isExpanded, isCheck;
+        List<FileTreeBean> childList;
+
+        FileTreeBean(File file, int level) {
+            this.level = level;
+            this.path = file.getAbsolutePath();
+            this.name = file.getName();
+            this.childList = new ArrayList<>();
+            if (file.isDirectory()) {
+                File[] files = file.listFiles();
+                Arrays.sort(files, sortTypeByName);
+                for (File child : files) {
+                    if (!child.getName().startsWith(".")) {
+                        childList.add(new FileTreeBean(child, level + 1));
+                    }
+                }
+            }
+        }
+
+        protected boolean isDir() {
+            return childList.size() > 0;
+        }
+    }
+
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/adapter/GistAdapter.java b/qpython/src/main/java/org/qpython/qpy/main/adapter/GistAdapter.java
new file mode 100644
index 00000000..6bd5b80b
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/adapter/GistAdapter.java
@@ -0,0 +1,173 @@
+package org.qpython.qpy.main.adapter;
+
+import android.content.Context;
+import android.databinding.DataBindingUtil;
+import android.os.Build;
+import android.support.v7.app.AlertDialog;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.quseit.util.DateTimeHelper;
+import com.quseit.util.ImageDownLoader;
+
+import org.greenrobot.eventbus.EventBus;
+import org.qpython.qpy.R;
+import org.qpython.qpy.databinding.RvItemNewsBinding;
+import org.qpython.qpy.main.activity.GistDetailActivity;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.fragment.MyGistFragment;
+import org.qpython.qpy.main.server.gist.GistEvent;
+import org.qpython.qpy.main.server.gist.response.GistBean;
+
+import java.util.List;
+import java.util.Objects;
+
+import static org.qpython.qpy.main.server.gist.GistEvent.DELETE;
+
+
+/**
+ * 文 件 名: CommunityAdapter
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2017/12/25 17:21
+ * 邮   箱: qq798435167@gmail.com
+ * 修改时间：
+ * 修改备注：
+ */
+
+public class GistAdapter extends RecyclerView.Adapter<MyViewHolder<RvItemNewsBinding>> {
+
+    private boolean mShowDelete;
+
+    private List<GistBean> mGistBeans;
+    private Context        mContext;
+    private MyGistFragment fragment;
+
+    public GistAdapter(Context context) {
+        mContext = context;
+    }
+
+    public GistAdapter(Context context, MyGistFragment fragment) {
+        mContext = context;
+        this.fragment = fragment;
+    }
+
+    public void setData(List<GistBean> list) {
+        mGistBeans = list;
+        notifyDataSetChanged();
+    }
+
+    public void loadMore(List<GistBean> list) {
+        mGistBeans.addAll(list);
+        notifyDataSetChanged();
+    }
+
+
+    @Override
+    public MyViewHolder<RvItemNewsBinding> onCreateViewHolder(ViewGroup parent, int viewType) {
+        RvItemNewsBinding binding = DataBindingUtil.inflate(LayoutInflater.from(parent.getContext()),
+                R.layout.rv_item_news, parent, false);
+        MyViewHolder<RvItemNewsBinding> holder = new MyViewHolder<>(binding.getRoot());
+        holder.setBinding(binding);
+        return holder;
+    }
+
+
+    @Override
+    public void onBindViewHolder(MyViewHolder<RvItemNewsBinding> holder, int position) {
+        RvItemNewsBinding binding = holder.getBinding();
+        GistBean bean = mGistBeans.get(position);
+        //点击跳转详情
+        binding.rootLayout.setOnClickListener(view -> GistDetailActivity.startNewsDetail(mContext, bean.getId()));
+
+        //名字
+        binding.userNameTv.setText(bean.getUser().getUName());
+        //头像
+        ImageDownLoader.setImageFromUrl(mContext, binding.userAvatarIv, bean.getUser().getAvatar());
+        //时间
+        binding.commitTimeTv.setText(DateTimeHelper.converTime(bean.getCreateAt(), mContext.getResources()
+                .getStringArray(R.array.time_label)));
+        //标题
+        binding.contentTv.setText(bean.getDescription());
+        //收藏数
+        binding.starCountTv.setText(String.valueOf(bean.getStar()));
+        if (App.getFavorites().contains(bean.getId())) {
+            binding.starCountLayout.setSelected(true);
+        } else {
+            binding.starCountLayout.setSelected(false);
+        }
+        //评论数
+        binding.commentCountTv.setText(String.valueOf(bean.getComment()));
+
+        //删除
+        if (mShowDelete) {
+            binding.deleteIv.setVisibility(View.VISIBLE);
+            binding.deleteIv.setOnClickListener(v -> new AlertDialog.Builder(mContext, R.style.MyDialog)
+                    .setTitle(R.string.warning)
+                    .setMessage(R.string.delete_gist_hint)
+                    .setNegativeButton(R.string.no, (dialogInterface, i) -> dialogInterface.dismiss())
+                    .setPositiveButton(R.string.yes, (dialogInterface, i) ->
+                            EventBus.getDefault().post(new GistEvent(DELETE, bean.getId())))
+                    .create().show());
+        } else {
+            binding.deleteIv.setVisibility(View.GONE);
+        }
+    }
+
+    @Override
+    public int getItemCount() {
+        return mGistBeans == null ?
+                0 :
+                mGistBeans.size();
+
+    }
+
+    public void setShowDelete(boolean showDelete) {
+        mShowDelete = showDelete;
+    }
+
+
+    public void addCommentNum(String id) {
+        int position = getPositionById(id);
+        if (position != -1) {
+            mGistBeans.get(position).addCommentNum();
+            notifyItemChanged(position);
+        }
+    }
+
+    public void addFav(String id, boolean isAdd) {
+        int position = getPositionById(id);
+        if (position != -1) {
+            mGistBeans.get(position).changeStar(isAdd);
+            notifyItemChanged(position);
+        }
+    }
+
+    public void delete(String id) {
+        int position = getPositionById(id);
+        if (position != -1) {
+            notifyItemRemoved(position);
+            mGistBeans.remove(position);
+        }
+        if (mGistBeans.size() == 0 && fragment != null) {
+            fragment.showHint(true);
+        }
+    }
+
+    private int getPositionById(String id) {
+        GistBean posBean = null;
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            posBean = mGistBeans.stream().filter(bean -> Objects.equals(id, bean.getId()))
+                    .findFirst()
+                    .orElse(null);
+        } else {
+            for (GistBean mGistBean : mGistBeans) {
+                if (id.equals(mGistBean.getId())) {
+                    posBean = mGistBean;
+                }
+            }
+        }
+        return posBean == null ? -1 : mGistBeans.indexOf(posBean);
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/adapter/LibListAdapter.java b/qpython/src/main/java/org/qpython/qpy/main/adapter/LibListAdapter.java
new file mode 100644
index 00000000..bc243f30
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/adapter/LibListAdapter.java
@@ -0,0 +1,140 @@
+package org.qpython.qpy.main.adapter;
+
+import android.databinding.DataBindingUtil;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.databinding.ItemLibListBinding;
+import org.qpython.qpy.main.server.model.BaseLibModel;
+import org.qpython.qpy.main.server.model.LibModel;
+import org.qpython.qpy.texteditor.ui.adapter.MyViewHolder;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * lib list adapter
+ * Created by Hmei on 2017-05-27.
+ */
+
+public class LibListAdapter<T extends BaseLibModel> extends RecyclerView.Adapter<MyViewHolder<ItemLibListBinding>> {
+    private static Map<String, String> nameVer;
+
+    public static final int INSTALLED    = 0;
+    public static final int UN_INSTALLED = 1;
+    public static final int UPGRADE      = 2;
+
+    public static final String TAG = "LibListAdapter";
+
+    private List<T> dataList;
+    private Click   click;
+
+    public LibListAdapter(List<T> dataList) {
+        this.dataList = dataList;
+    }
+
+    @Override
+    public int getItemCount() {
+        return dataList == null ? 0 : dataList.size();
+    }
+
+    @Override
+    public MyViewHolder<ItemLibListBinding> onCreateViewHolder(ViewGroup parent, int viewType) {
+        View realContentView = LayoutInflater.from(parent.getContext()).inflate(R.layout.item_lib_list, parent, false);
+        MyViewHolder<ItemLibListBinding> holder = new MyViewHolder<>(realContentView);
+        holder.setBinding(DataBindingUtil.bind(realContentView));
+        return holder;
+    }
+
+    @Override
+    public void onBindViewHolder(org.qpython.qpy.texteditor.ui.adapter.MyViewHolder<ItemLibListBinding> holder, int position) {
+        ItemLibListBinding binding = holder.getBinding();
+        T item = dataList.get(position);
+        if (!item.isInstalled()) {
+            if (item instanceof LibModel) {
+                binding.ivIcon.setImageResource(R.drawable.ic_program);
+                binding.tvDescription.setText(item.getDescription());
+            } else {
+                binding.ivIcon.setImageResource(R.drawable.ic_library);
+                binding.tvDescription.setText(item.getVer());
+            }
+        } else {
+            if (item instanceof LibModel) {
+                binding.ivIcon.setImageResource(R.drawable.ic_program_install);
+                binding.tvDescription.setText(item.getDescription());
+            } else {
+                binding.ivIcon.setImageResource(R.drawable.ic_library_install);
+                binding.tvDescription.setText(item.getVer());
+            }
+        }
+        if (item.getDownloads().equals("-1")) {
+            binding.tvDownloadCount.setVisibility(View.GONE);
+        } else {
+            binding.tvDownloadCount.setText(String.valueOf(item.getDownloads()));
+        }
+        binding.tvName.setText(item.getTitle());
+        binding.llItem.setOnClickListener(v -> {
+            if (click != null) {
+                click.itemClick(position);
+            }
+        });
+    }
+
+    @Override
+    public int getItemViewType(int position) {
+        if (dataList.get(position) instanceof LibModel) {
+            // Project
+            return dataList.get(position).isInstalled() ? INSTALLED : UN_INSTALLED;
+        } else {
+            // QPYPI / AIPY
+            if (!dataList.get(position).isInstalled()) {
+                return UN_INSTALLED;
+            } else {
+//                String[] newVer = dataList.get(position).getVer().split("\\.");
+//                String[] curVer;
+//                String cur = getPackageVersion(dataList.get(position).getSmodule());
+//                if (cur != null) {
+//                    curVer = cur.split("\\.");
+//                } else {
+//                    return UN_INSTALLED;
+//                }
+//                for (int i = 0; i < newVer.length; i++) {
+//                    if (Integer.parseInt(newVer[i]) > Integer.parseInt(curVer[i])) {
+//                        return UPGRADE;
+//                    }
+//                }
+                return INSTALLED;
+            }
+        }
+    }
+
+    public void setClick(Click click) {
+        this.click = click;
+    }
+
+    public interface Click {
+        void itemClick(int position);
+    }
+
+//    private String getPackageVersion(String sModule) {
+//        if (nameVer == null) {
+//            initNameVer();
+//        }
+//        return nameVer.get(sModule);
+//    }
+//
+//    private void initNameVer() {
+//        nameVer = new HashMap<>();
+//        for (File file : new File(org.qpython.qpy.main.app.CONF.qpypiPath()).listFiles()) {
+//            LogUtil.d(TAG, file.getAbsolutePath());
+//            if (file.getName().endsWith("-py"+ CONF.PY_BRANCH+".egg")) {
+//                String name = file.getName();
+//                String[] splited = name.split("-");
+//                if (splited.length > 2) nameVer.put(splited[0].replace("_","-"), splited[1]);
+//            }
+//        }
+//    }
+}
\ No newline at end of file
diff --git a/qpython/src/main/java/org/qpython/qpy/main/adapter/LibPagerAdapter.java b/qpython/src/main/java/org/qpython/qpy/main/adapter/LibPagerAdapter.java
new file mode 100644
index 00000000..988cd282
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/adapter/LibPagerAdapter.java
@@ -0,0 +1,41 @@
+package org.qpython.qpy.main.adapter;
+
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentStatePagerAdapter;
+
+import org.qpython.qpy.main.fragment.LibAIPyFragment;
+import org.qpython.qpy.main.fragment.LibQPyPiFragment;
+import org.qpython.qpy.main.fragment.LibProjectFragment;
+
+
+public class LibPagerAdapter extends FragmentStatePagerAdapter {
+    private int mNumOfTabs;
+    private LibProjectFragment programFragment = new LibProjectFragment();
+    private LibQPyPiFragment   qPyPiFragment   = new LibQPyPiFragment();
+    private LibAIPyFragment    aiPyFragment    = new LibAIPyFragment();
+
+    public LibPagerAdapter(FragmentManager fm) {
+        super(fm);
+        this.mNumOfTabs = 3;
+    }
+
+    @Override
+    public Fragment getItem(int position) {
+        switch (position) {
+            case 0:
+                return programFragment;
+            case 1:
+                return qPyPiFragment;
+            case 2:
+                return aiPyFragment;
+            default:
+                return null;
+        }
+    }
+
+    @Override
+    public int getCount() {
+        return mNumOfTabs;
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/adapter/MyCourseAdapter.java b/qpython/src/main/java/org/qpython/qpy/main/adapter/MyCourseAdapter.java
new file mode 100644
index 00000000..8a0b9dac
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/adapter/MyCourseAdapter.java
@@ -0,0 +1,75 @@
+package org.qpython.qpy.main.adapter;
+
+import android.app.Activity;
+import android.databinding.DataBindingUtil;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.quseit.util.ImageDownLoader;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.databinding.ItemMyCourseBinding;
+import org.qpython.qpy.main.activity.QWebViewActivity;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.server.model.MyCourse;
+
+import java.util.List;
+
+/**
+ * Course adapter
+ * Created by Hmei on 2017-06-29.
+ */
+
+public class MyCourseAdapter extends RecyclerView.Adapter<MyViewHolder<ItemMyCourseBinding>> {
+
+    private List<MyCourse.DataBean> dataList;
+    private Activity                         context;
+
+    public MyCourseAdapter(Activity context, List<MyCourse.DataBean> dataList) {
+        this.context = context;
+        this.dataList = dataList;
+    }
+
+    @Override
+    public MyViewHolder<ItemMyCourseBinding> onCreateViewHolder(ViewGroup parent, int viewType) {
+        ItemMyCourseBinding binding = DataBindingUtil.inflate(LayoutInflater.from(parent.getContext()), R.layout.item_my_course, parent, false);
+        MyViewHolder<ItemMyCourseBinding> holder = new MyViewHolder<>(binding.getRoot());
+        holder.setBinding(binding);
+        return holder;
+    }
+
+    @Override
+    public void onBindViewHolder(MyViewHolder<ItemMyCourseBinding> holder, int position) {
+        ItemMyCourseBinding binding = holder.getBinding();
+        MyCourse.DataBean.InfoBean item = dataList.get(position).getInfo();
+        binding.setCourse(item);
+        binding.tvLevel.setText(context.getString(R.string.level, item.getLevel() + ""));
+        switch (dataList.get(position).getType()) {
+            case "free":
+                ImageDownLoader.setImageFromUrl(context, binding.ivTheme, item.getLogo());
+                binding.status.setVisibility(View.GONE);
+                binding.getRoot().setEnabled(true);
+                break;
+            case "crowdfunding":
+                if (item.getOpen() == 1) {
+                    ImageDownLoader.setImageFromUrl(context, binding.ivTheme, item.getLogo());
+                    binding.status.setVisibility(View.GONE);
+                    binding.getRoot().setEnabled(true);
+                } else {
+                    ImageDownLoader.setBlurImageFromUrl(context, binding.ivTheme, item.getLogo());
+                    binding.ivTheme.setAlpha(0.5f);
+                    binding.status.setVisibility(View.VISIBLE);
+                    binding.getRoot().setEnabled(false);
+                }
+                break;
+        }
+        binding.getRoot().setOnClickListener(v -> QWebViewActivity.start(context, item.getTitle(), item.getLink()));
+    }
+
+    @Override
+    public int getItemCount() {
+        return dataList.size();
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/adapter/MyShareFragmentAdapter.java b/qpython/src/main/java/org/qpython/qpy/main/adapter/MyShareFragmentAdapter.java
new file mode 100644
index 00000000..0f975d9b
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/adapter/MyShareFragmentAdapter.java
@@ -0,0 +1,51 @@
+package org.qpython.qpy.main.adapter;
+
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentPagerAdapter;
+
+import org.qpython.qpy.main.fragment.MyGistFragment;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 文 件 名: MyShareFragmentAdapter
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2017/12/26 14:58
+ * 邮   箱: qq798435167@gmail.com
+ * 修改时间：
+ * 修改备注：
+ */
+
+public class MyShareFragmentAdapter extends FragmentPagerAdapter {
+
+    public static final String[] titles     = new String[]{"My Gists","My Stars"};
+    public List<MyGistFragment>  mFragments = new ArrayList<>();
+
+    public MyShareFragmentAdapter(FragmentManager fm) {
+        super(fm);
+        initFragments();
+    }
+
+    private void initFragments() {
+        for (int i=0;i<titles.length;i++){
+            mFragments.add(MyGistFragment.newInstance(i));
+        }
+    }
+
+    @Override
+    public Fragment getItem(int position) {
+        return mFragments.get(position);
+    }
+
+    @Override
+    public int getCount() {
+        return titles.length;
+    }
+
+    @Override
+    public CharSequence getPageTitle(int position) {
+        return titles[position];
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/adapter/MyViewHolder.java b/qpython/src/main/java/org/qpython/qpy/main/adapter/MyViewHolder.java
new file mode 100644
index 00000000..d5891cce
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/adapter/MyViewHolder.java
@@ -0,0 +1,28 @@
+package org.qpython.qpy.main.adapter;
+
+import android.databinding.DataBindingUtil;
+import android.databinding.ViewDataBinding;
+import android.support.v7.widget.RecyclerView;
+import android.view.View;
+
+/**
+ * Custom View Holder for store data binding
+ * Created by Hmei on 2017-05-25.
+ */
+
+public class MyViewHolder<T extends ViewDataBinding> extends RecyclerView.ViewHolder {
+    private T binding;
+
+    public MyViewHolder(View itemView) {
+        super(itemView);
+        binding = DataBindingUtil.bind(itemView);
+    }
+
+    public T getBinding() {
+        return binding;
+    }
+
+    public void setBinding(T binding) {
+        this.binding = binding;
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/adapter/NewsDetailAdapter.java b/qpython/src/main/java/org/qpython/qpy/main/adapter/NewsDetailAdapter.java
new file mode 100644
index 00000000..58784e8f
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/adapter/NewsDetailAdapter.java
@@ -0,0 +1,195 @@
+package org.qpython.qpy.main.adapter;
+
+import android.app.Activity;
+import android.content.Context;
+import android.databinding.DataBindingUtil;
+import android.support.v7.widget.RecyclerView;
+import android.text.Html;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.quseit.util.DateTimeHelper;
+import com.quseit.util.ImageDownLoader;
+
+import org.greenrobot.eventbus.EventBus;
+import org.qpython.qpy.R;
+import org.qpython.qpy.databinding.ItemCommentBinding;
+import org.qpython.qpy.databinding.RvItemNewsHeadBinding;
+import org.qpython.qpy.main.activity.GistEditActivity;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.server.gist.GistEvent;
+import org.qpython.qpy.main.server.gist.response.CommentBean;
+import org.qpython.qpy.main.server.gist.response.GistBean;
+
+import java.util.List;
+
+import static org.qpython.qpy.main.server.gist.GistEvent.CODE_REVIEW_EVENT;
+import static org.qpython.qpy.main.server.gist.GistEvent.COMMENT_EVENT;
+import static org.qpython.qpy.main.server.gist.GistEvent.DIVIDER;
+import static org.qpython.qpy.main.server.gist.GistEvent.FAVORITE_REQUEST;
+import static org.qpython.qpy.main.server.gist.GistEvent.FORK;
+import static org.qpython.qpy.main.server.gist.GistEvent.REPLY_EVENT;
+import static org.qpython.qpy.main.server.gist.GistEvent.RUN_NOTEBOOK;
+import static org.qpython.qpy.main.server.gist.GistEvent.RUN_SCRIPT;
+
+/**
+ * 文 件 名: NewsDetailAdapter
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2017/12/26 11:25
+ * 邮   箱: qq798435167@gmail.com
+ * 修改时间：
+ * 修改备注：
+ */
+
+public class NewsDetailAdapter extends RecyclerView.Adapter<MyViewHolder> {
+    private GistBean mGistBean;
+    private Context  mContext;
+
+    public NewsDetailAdapter(Context context) {
+        mContext = context;
+    }
+
+    public void setData(GistBean bean) {
+        mGistBean = bean;
+        notifyDataSetChanged();
+    }
+
+    public void addComment(CommentBean bean) {
+        mGistBean.getComments().add(0, bean);
+        mGistBean.addCommentNum();
+        notifyDataSetChanged();
+    }
+
+    public void loadMoreComment(List<CommentBean> list) {
+        mGistBean.getComments().addAll(list);
+        notifyDataSetChanged();
+    }
+
+    public void favorite(boolean is) {
+        mGistBean.setFavorite(is);
+        mGistBean.changeStar(is);
+        notifyItemChanged(0);
+    }
+
+    public void startEdit() {
+        GistEditActivity.start(mContext, mGistBean.getId(), mGistBean.getTitle(), mGistBean
+                .getDescription(), mGistBean.getSource());
+        ((Activity)mContext).finish();
+    }
+
+    @Override
+    public MyViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+        if (viewType == 0) {
+            RvItemNewsHeadBinding binding = DataBindingUtil.inflate(LayoutInflater.from(parent.getContext()), R.layout.rv_item_news_head, parent, false);
+            MyViewHolder<RvItemNewsHeadBinding> holder = new MyViewHolder<>(binding.getRoot());
+            holder.setBinding(binding);
+            return holder;
+        } else {
+            ItemCommentBinding binding = DataBindingUtil.inflate(LayoutInflater.from(parent
+                    .getContext()), R.layout.item_comment, parent, false);
+            MyViewHolder<ItemCommentBinding> holder = new MyViewHolder<>(binding.getRoot());
+            holder.setBinding(binding);
+            return holder;
+        }
+    }
+
+    @Override
+    public void onBindViewHolder(MyViewHolder holder, int position) {
+        if (position == 0) {
+            RvItemNewsHeadBinding binding = (RvItemNewsHeadBinding) holder.getBinding();
+            initHead(binding);
+        } else {
+            ItemCommentBinding binding = (ItemCommentBinding) holder.getBinding();
+            initComments(position - 1, binding);
+        }
+    }
+
+    private void initComments(int position, ItemCommentBinding binding) {
+        CommentBean bean = mGistBean.getComments().get(position);
+//        名字
+        binding.name.setText(bean.getUserName());
+        //头像
+        ImageDownLoader.setImageFromUrl(mContext, binding.avatar, bean.getUserAvatar());
+        //时间
+        binding.date.setText(DateTimeHelper.converTime(bean.getCreateAt(), mContext.getResources()
+                .getStringArray(R.array.time_label)));
+        //评论
+        binding.fromContent.setText(bean.getComment());
+
+        if (bean.getReplies() != null) {
+            String htmlContent = mContext.getString(R.string.replied_format, bean.getReplies
+                    ().getUser_name(), bean.getReplies().getComment_content());
+            binding.reComment.setText(Html.fromHtml(htmlContent));
+            binding.reComment.setVisibility(View.VISIBLE);
+        } else {
+            binding.reComment.setVisibility(View.GONE);
+        }
+        //回复评论
+        binding.getRoot().setOnClickListener(v -> EventBus.getDefault().post(new GistEvent
+                (REPLY_EVENT, bean.getId() + "," + bean.getUserName())));
+    }
+
+    private void initHead(RvItemNewsHeadBinding binding) {
+        //头像
+        ImageDownLoader.setImageFromUrl(mContext, binding.userAvatarIv, mGistBean.getUser().getAvatar());
+        //名字
+        binding.userNameTv.setText(mGistBean.getUser().getUName());
+        //时间
+        binding.commitTimeTv.setText(DateTimeHelper.converTime(mGistBean.getCreateAt(), mContext.getResources()
+                .getStringArray(R.array.time_label)));
+        //收藏数
+        binding.starCountTv.setText(String.valueOf(mGistBean.getStar()));
+        binding.starCountLayout.setSelected(mGistBean.isFavorite());
+        binding.starCountLayout.setOnClickListener(v -> EventBus.getDefault().post(new GistEvent
+                (FAVORITE_REQUEST)));
+        //评论数
+        binding.commentCountTv.setText(String.valueOf(mGistBean.getComment()));
+        binding.commentCountLayout.setOnClickListener(v -> EventBus.getDefault().post(new GistEvent(COMMENT_EVENT)));
+        //空评论
+        binding.emptyTv.setOnClickListener(v -> EventBus.getDefault().post(new GistEvent(COMMENT_EVENT)));
+        if (mGistBean.getComments().size() > 0) binding.emptyTv.setVisibility(View.GONE);
+//        //标题
+//        binding.newsTitleTv.setText(mGistBean.getTitle());
+        //描述
+        binding.newsContentTv.setText(mGistBean.getDescription());
+        //代码
+        binding.codeContentTv.setText(mGistBean.getSource());
+        binding.codeContentTv.setOnClickListener(v -> EventBus.getDefault().post(new GistEvent(CODE_REVIEW_EVENT)));
+        //运行
+        binding.btnRun.setOnClickListener(v -> {
+            if (mGistBean.getSourceType().equals("notebook")) {
+                EventBus.getDefault().post(new GistEvent(RUN_NOTEBOOK, mGistBean.getSource().toString()));
+            } else if (mGistBean.getSourceType().equals("script")) {
+                EventBus.getDefault().post(new GistEvent(RUN_SCRIPT, mGistBean.getTitle() +
+                        DIVIDER + mGistBean.getSource()));
+            }
+        });
+        //fork
+        if (App.getUser() == null || mGistBean.getUser().getUserName().equals(App.getUser()
+                .getUserName())) {
+            binding.btnFork.setVisibility(View.GONE);
+        } else {
+            binding.btnFork.setVisibility(View.VISIBLE);
+            binding.btnFork.setOnClickListener(view -> EventBus.getDefault().post(new GistEvent(FORK)));
+        }
+    }
+
+    @Override
+    public int getItemCount() {
+        return mGistBean == null ?
+                0 :
+                mGistBean.getComments() == null ?
+                        1 :
+                        mGistBean.getComments().size() + 1;
+    }
+
+    @Override
+    public int getItemViewType(int position) {
+        if (position == 0) {
+            return 0;
+        } else {
+            return 1;
+        }
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/adapter/NotebookAdapter.java b/qpython/src/main/java/org/qpython/qpy/main/adapter/NotebookAdapter.java
new file mode 100644
index 00000000..566f0cae
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/adapter/NotebookAdapter.java
@@ -0,0 +1,92 @@
+package org.qpython.qpy.main.adapter;
+
+import android.content.Context;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import org.qpython.qpy.R;
+
+import java.io.File;
+import java.io.FileFilter;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+public class NotebookAdapter extends RecyclerView.Adapter {
+
+    private Context mContext;
+    private File mFile;
+    private List<File> mFileList;
+    private OnItemClickCallback mOnItemClickCallback;
+
+    public NotebookAdapter(Context context, File file) {
+        mContext = context;
+        getFileList(file);
+    }
+
+    private void getFileList(File file) {
+        mFile = file;
+        File[] files = mFile.listFiles();
+        if (files == null){
+            mFileList = new ArrayList<>();
+        }else {
+            mFileList = Arrays.asList(files);
+        }
+    }
+
+    public void setFile(File file) {
+        getFileList(file);
+        notifyDataSetChanged();
+    }
+
+
+
+    public File getFile() {
+        return mFile;
+    }
+
+    public void setOnItemClickCallback(OnItemClickCallback onItemClickCallback) {
+        mOnItemClickCallback = onItemClickCallback;
+    }
+
+    @Override
+    public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+        View view = LayoutInflater.from(mContext).inflate(R.layout.item_notebook, parent, false);
+        return new RecyclerView.ViewHolder(view) {
+        };
+    }
+
+    @Override
+    public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
+        File file = mFileList.get(position);
+        TextView tvFileName = holder.itemView.findViewById(R.id.file_name_tv);
+        tvFileName.setText(file.getName());
+        holder.itemView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+
+                if (mOnItemClickCallback != null) {
+                    if (file.isDirectory()) {
+                        setFile(file);
+                        mOnItemClickCallback.onClick(file.getAbsolutePath(), true);
+                    }else {
+                        mOnItemClickCallback.onClick(file.getAbsolutePath(), false);
+                    }
+                }
+
+            }
+        });
+    }
+
+    @Override
+    public int getItemCount() {
+        return mFileList.size();
+    }
+
+    public interface OnItemClickCallback {
+        void onClick(String filePath, boolean isDir);
+    }
+}
\ No newline at end of file
diff --git a/qpython/src/main/java/org/qpython/qpy/main/adapter/StatePagerAdapter.java b/qpython/src/main/java/org/qpython/qpy/main/adapter/StatePagerAdapter.java
new file mode 100644
index 00000000..b54915d9
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/adapter/StatePagerAdapter.java
@@ -0,0 +1,36 @@
+package org.qpython.qpy.main.adapter;
+
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentStatePagerAdapter;
+
+import org.qpython.qpy.main.fragment.FileFragment;
+
+
+public class StatePagerAdapter extends FragmentStatePagerAdapter {
+    private int mNumOfTabs;
+    private FileFragment projectFiles = FileFragment.newInstance(FileFragment.PROJECT);
+    private FileFragment scriptFiles  = FileFragment.newInstance(FileFragment.SCRIPT);
+
+    public StatePagerAdapter(FragmentManager fm, int NumOfTabs) {
+        super(fm);
+        this.mNumOfTabs = NumOfTabs;
+    }
+
+    @Override
+    public Fragment getItem(int position) {
+        switch (position) {
+            case 0:
+                return projectFiles;
+            case 1:
+                return scriptFiles;
+            default:
+                return null;
+        }
+    }
+
+    @Override
+    public int getCount() {
+        return mNumOfTabs;
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/adapter/UploadFileTreeAdapter.java b/qpython/src/main/java/org/qpython/qpy/main/adapter/UploadFileTreeAdapter.java
new file mode 100644
index 00000000..c6e6b058
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/adapter/UploadFileTreeAdapter.java
@@ -0,0 +1,88 @@
+package org.qpython.qpy.main.adapter;
+
+import android.os.Handler;
+import android.support.v7.widget.RecyclerView;
+import android.view.View;
+
+import org.qpython.qpy.databinding.ItemFolderLittleBinding;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class UploadFileTreeAdapter extends FileTreeAdapter {
+    private Handler handler = new Handler();
+    private List<String> checkedList;
+    private RecyclerView mRecyclerView;
+
+    public UploadFileTreeAdapter(String rootPath) {
+        super(rootPath);
+        checkedList = new ArrayList<>();
+    }
+
+    @Override
+    public void onAttachedToRecyclerView(RecyclerView recyclerView) {
+        super.onAttachedToRecyclerView(recyclerView);
+        mRecyclerView = recyclerView;
+    }
+
+    @Override
+    public void onBindViewHolder(MyViewHolder<ItemFolderLittleBinding> holder, int position) {
+        super.onBindViewHolder(holder, position);
+        ItemFolderLittleBinding binding = holder.getBinding();
+        FileTreeBean file = dataList.get(position);
+
+        binding.checkbox.setVisibility(View.VISIBLE);
+        binding.checkbox.setOnCheckedChangeListener(null);
+
+        binding.checkbox.setChecked(file.isCheck);
+
+        binding.checkbox.setOnCheckedChangeListener((buttonView, isChecked) -> {
+            if (file.isDir()) {
+                reverseCheck(file, isChecked);
+                return;
+            }
+            if (isChecked) {
+                checkedList.add(file.path);
+            } else {
+                checkedList.remove(file);
+            }
+        });
+    }
+
+    public List<String> getCheckedList() {
+        return checkedList;
+    }
+
+    private void reverseCheck(FileTreeBean file, boolean isChecked) {
+        file.isCheck = isChecked;
+        if (file.isDir()) {
+            for (FileTreeBean fileTreeBean : file.childList) {
+                fileTreeBean.isCheck = isChecked;
+                if (fileTreeBean.isDir()) {
+                    reverseCheck(fileTreeBean, isChecked);
+                }
+                if (isChecked) {
+                    checkedList.add(fileTreeBean.path);
+                } else {
+                    checkedList.remove(fileTreeBean.path);
+                }
+            }
+            postAndNotifyAdapter();
+        }
+    }
+
+    private void postAndNotifyAdapter() {
+        handler.post(() -> {
+            if (!mRecyclerView.isComputingLayout()) {
+                notifyDataSetChanged();
+            } else {
+                postAndNotifyAdapter();
+            }
+        });
+    }
+
+    @Override
+    void itemClick(ItemFolderLittleBinding binding, FileTreeBean folderBean) {
+        binding.checkbox.setChecked(!binding.checkbox.isChecked());
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/adapter/ViewPagerAdapter.java b/qpython/src/main/java/org/qpython/qpy/main/adapter/ViewPagerAdapter.java
new file mode 100644
index 00000000..b3b63d81
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/adapter/ViewPagerAdapter.java
@@ -0,0 +1,60 @@
+package org.qpython.qpy.main.adapter;
+
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentPagerAdapter;
+import android.view.ViewGroup;
+
+import com.google.common.collect.Lists;
+
+import org.qpython.qpy.main.widget.WrapContentHeightViewPager;
+
+import java.util.List;
+import java.util.Locale;
+
+
+public class ViewPagerAdapter<T extends Fragment> extends FragmentPagerAdapter {
+
+    private List<T> fragments;
+    private int mCurrentPosition = -1;
+
+    public ViewPagerAdapter(FragmentManager fm, List<T> fragments) {
+        super(fm);
+//        if (isRTL()) {
+//            this.fragments = Lists.reverse(fragments);
+//            return;
+//        }
+        this.fragments = fragments;
+    }
+
+    @Override
+    public void setPrimaryItem(ViewGroup container, int position, Object object) {
+        super.setPrimaryItem(container, position, object);
+        if (position != mCurrentPosition) {
+            Fragment fragment = (Fragment) object;
+            if (container instanceof WrapContentHeightViewPager) {
+                WrapContentHeightViewPager pager = (WrapContentHeightViewPager) container;
+                if (fragment != null && fragment.getView() != null) {
+                    mCurrentPosition = position;
+                    pager.measureCurrentView(fragment.getView());
+                }
+            }
+        }
+    }
+
+    @Override
+    public int getCount() {
+        return fragments.size();
+    }
+
+    @Override
+    public T getItem(int position) {
+        return fragments.get(position);
+    }
+
+//    private boolean isRTL() {
+//        final int directionality = Character.getDirectionality(Locale.getDefault().getDisplayName().charAt(0));
+//        return directionality == Character.DIRECTIONALITY_RIGHT_TO_LEFT ||
+//                directionality == Character.DIRECTIONALITY_RIGHT_TO_LEFT_ARABIC;
+//    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/app/App.java b/qpython/src/main/java/org/qpython/qpy/main/app/App.java
index 676e5349..95ea64e2 100644
--- a/qpython/src/main/java/org/qpython/qpy/main/app/App.java
+++ b/qpython/src/main/java/org/qpython/qpy/main/app/App.java
@@ -1,92 +1,228 @@
-package org.qpython.qpy.main.app;
-
-import android.content.Context;
-import android.os.Environment;
-import android.support.multidex.MultiDex;
-
-import com.google.gson.Gson;
-import com.quseit.common.updater.Updater;
-import com.quseit.common.updater.updatepkg.Apk;
-import com.quseit.common.updater.updatepkg.UpdatePackage;
-import com.umeng.analytics.MobclickAgent;
-
-import org.qpython.qpy.R;
-import org.qpython.qpy.main.model.UpdateJson;
-import org.qpython.qpy.plugin.model.CloudPluginBean;
-import org.qpython.qsl4a.QSL4APP;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import cn.jpush.android.api.JPushInterface;
-import io.realm.Realm;
-import io.realm.RealmConfiguration;
-
-public class App extends QSL4APP {
-    private static String sBaseDir;
-    private static Context sContext;
-    private static String sScriptPath;
-    private static String sProjectPath;
-
-    @Override
-    protected void attachBaseContext(Context base) {
-        super.attachBaseContext(base);
-        MultiDex.install(this);
-    }
-
-    @Override
-    public void onCreate() {
-        super.onCreate();
-        sContext = getApplicationContext();
-
-        MobclickAgent.setScenarioType(getApplicationContext(), MobclickAgent.EScenarioType.E_UM_NORMAL);
-
-        JPushInterface.setDebugMode(true);
-        JPushInterface.init(this);
-
-//        RealmConfiguration realmConfiguration = new RealmConfiguration.Builder(getApplicationContext()).build();
-//        Realm.setDefaultConfiguration(realmConfiguration);
-
-        Updater.init(this, "", response -> {
-            List<UpdatePackage> list = new ArrayList<>();
-            Gson gson = new Gson();
-            UpdateJson json = gson.fromJson(response, UpdateJson.class);
-            UpdateJson.AppBean bean = json.getApp();
-            String name = getResources().getString(R.string.app_name);
-            Apk apk = new Apk(name, bean.getVer_name(), Integer.valueOf(bean.getVer()), bean.getVer_desc(), bean.getLink());
-            list.add(apk);
-            for (UpdateJson.PluginsBean bean1 : json.getPlugins()) {
-                CloudPluginBean cloudPluginInfo =
-                        new CloudPluginBean(bean1.getPlugin()
-                                , bean1.getTitle(),
-                                bean1.getSrc(),
-                                bean1.getVer(),
-                                bean1.getVer_desc(),
-                                bean1.getDesc(),
-                                bean1.getDst(),
-                                bean1.getLink());
-                list.add(cloudPluginInfo);
-            }
-            return list;
-        });
-
-        String basePath = String.format("%s/%s", Environment.getExternalStorageDirectory().getAbsolutePath(),"qpython");
-        sProjectPath = String.format("%s/%s", basePath, "projects");
-        sScriptPath = String.format("%s/%s", basePath, "scripts");
-    }
-
-//    public static Context getContext() {
-//        return sContext;
-//    }
-    public static String getScriptPath() {
-        return sScriptPath;
-    }
-
-    public static String getProjectPath() {
-        return sProjectPath;
-    }
-
-    public static Context getContext() {
-        return sContext;
-    }
-}
+package org.qpython.qpy.main.app;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.content.res.Configuration;
+import android.content.res.Resources;
+import android.os.Build;
+import android.support.multidex.MultiDex;
+import android.support.v7.app.AppCompatActivity;
+
+import com.google.gson.Gson;
+import com.quseit.common.CrashHandler;
+import com.quseit.common.updater.downloader.DefaultDownloader;
+import com.squareup.leakcanary.LeakCanary;
+
+import org.qpython.qpy.main.server.Service;
+import org.qpython.qpy.main.server.gist.Api;
+import org.qpython.qpy.main.server.gist.TokenManager;
+import org.qpython.qpy.main.server.gist.response.GistBean;
+import org.qpython.qpy.main.server.http.Retrofitor;
+import org.qpython.qpy.utils.NotebookUtil;
+import org.qpython.qpysdk.QPyConstants;
+import org.qpython.qsl4a.QSL4APP;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
+import okhttp3.Cache;
+import okhttp3.OkHttpClient;
+import okhttp3.logging.HttpLoggingInterceptor;
+import retrofit2.Retrofit;
+import retrofit2.adapter.rxjava.RxJavaCallAdapterFactory;
+import retrofit2.converter.gson.GsonConverterFactory;
+
+public class App extends QSL4APP {
+
+    private static Context sContext;
+    private static String  sScriptPath;
+    private static String  sProjectPath;
+    //private static AppCompatActivity sActivity;
+
+    private static OkHttpClient           okHttpClient;
+    private static HttpLoggingInterceptor interceptor;
+    private static Gson                   gson;
+
+    private static DefaultDownloader downloader;
+
+    //保存user信息
+    private static SharedPreferences      mPreferences;
+
+    private static Retrofit.Builder retrofitBuilder;
+
+    private static Service mService;//本地retrofit方法
+
+    public static OkHttpClient getOkHttpClient() {
+        return okHttpClient;
+    }
+
+    public static HttpLoggingInterceptor getInterceptor() {
+        return interceptor;
+    }
+
+    public static Gson getGson() {
+        return gson;
+    }
+
+    public static Retrofit.Builder getRetrofit() {
+        return retrofitBuilder;
+    }
+
+    public static Service getService() {
+        return mService;
+    }
+
+    public static String getScriptPath() {
+        return sScriptPath;
+    }
+
+    public static String getProjectPath() {
+        return sProjectPath;
+    }
+
+    public static Context getContext() {
+        return sContext;
+    }
+
+//    public static AppCompatActivity getActivity() {
+//        return sActivity;
+//    }
+//
+//    public static void setActivity(AppCompatActivity activity) {
+//        sActivity = activity;
+//    }
+    public static User getUser() {
+        if (mPreferences.getString("email", null) == null) {
+            return null;
+        }
+        User user = new User();
+        user.setNick(mPreferences.getString("nick", ""));
+        user.setUserName(mPreferences.getString("name", ""));
+        user.setUserId(mPreferences.getString("id", ""));
+        user.setEmail(mPreferences.getString("email", ""));
+        user.setAvatarUrl(mPreferences.getString("avatar", ""));
+        return user;
+    }
+
+    public static DefaultDownloader getDownloader() {
+        return downloader;
+    }
+
+    public static void setUser(User user) {
+        SharedPreferences.Editor editor = mPreferences.edit();
+        if (user == null) {
+            editor.clear();
+            editor.apply();
+            return;
+        }
+        editor.putString("nick", user.getNick());
+        editor.putString("name", user.getUserName());
+        editor.putString("email", user.getEmail());
+        editor.putString("avatar", user.getAvatarUrl());
+        editor.putString("id", user.getUserId());
+        if (!editor.commit()) {
+            editor.apply();
+        }
+
+    }
+
+    private static List<String> favorites = new ArrayList<>();
+
+    public static List<String> getFavorites() {
+        return favorites;
+    }
+
+    public static void addFavorites(GistBean bean) {
+        favorites.add(bean.getId());
+    }
+
+    public static void setFavorites(List<GistBean> list) {
+        for (GistBean bean : list) {
+            favorites.add(bean.getId());
+        }
+    }
+
+    @Override
+    protected void attachBaseContext(Context base) {
+        super.attachBaseContext(base);
+        MultiDex.install(this);
+    }
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        if (LeakCanary.isInAnalyzerProcess(this)) {
+            // This process is dedicated to LeakCanary for heap analysis.
+            // You should not init your app in this process.
+            return;
+        }
+        LeakCanary.install(this);
+
+        sContext = getApplicationContext();
+        downloader = new DefaultDownloader(sContext);
+        // init retrofit relate
+        gson = new Gson();
+        interceptor = new HttpLoggingInterceptor();
+        interceptor.setLevel(HttpLoggingInterceptor.Level.BASIC);
+
+        int cacheSize = 10 * 1024 * 1024; // 10 MiB
+        Cache cache = new Cache(App.getContext().getCacheDir(), cacheSize);
+
+        okHttpClient = new OkHttpClient.Builder().cache(cache).addInterceptor(interceptor).build();
+        retrofitBuilder = new Retrofit.Builder()
+                .client(okHttpClient)
+                .addConverterFactory(GsonConverterFactory.create())
+                .addCallAdapterFactory(RxJavaCallAdapterFactory.create());
+        mService = new Service();
+
+        String basePath = QPyConstants.ABSOLUTE_PATH;
+        sProjectPath = String.format("%s/%s", basePath, "projects");
+        sScriptPath = String.format("%s/%s", basePath, "scripts");
+
+        initLayoutDir();
+        mPreferences = this.getSharedPreferences("user", 0);
+        CrashHandler.getInstance().init(this);
+        AppInit.init(this);
+
+        Map<String, String> header = new HashMap<>();
+        TokenManager.init(this);
+        header.put("Content-Type", "application/json");
+//        if (!TextUtils.isEmpty(TokenManager.getToken())) {
+//            header.put("HTTP_TOKEN", TokenManager.getToken());
+//        }
+        Retrofitor
+                .getInstance()
+                .setTimeOut(Retrofitor.DEFAULT_TIMEOUT)
+//                .openDebug(BuildConfig.DEBUG)
+  //              .supportSSL(!BuildConfig.DEBUG)
+                .addHeaders(header)
+                .init(Api.BASE_URL);
+
+//        if (NotebookUtil.isNotebookLibInstall(getActivity())) {
+//            if (Utils.httpPing(NotebookUtil.NB_SERVER, 300)) {
+//                NotebookUtil.startNotebookService(getActivity());
+//            }
+//        }
+
+        // restart Notebook
+        if (NotebookUtil.isNBSrvSet(this)) {
+
+            NotebookUtil.killNBSrv(this);
+            NotebookUtil.startNotebookService2(this);
+        }
+    }
+
+
+    private void initLayoutDir() {
+        if (Build.VERSION.SDK_INT >= 17) {
+            Resources resources = getResources();
+            Configuration config = resources.getConfiguration();
+            Locale locale = config.locale;
+            config.setLayoutDirection(locale);
+            resources.updateConfiguration(config, resources.getDisplayMetrics());
+        }
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/app/CONF.java b/qpython/src/main/java/org/qpython/qpy/main/app/CONF.java
new file mode 100644
index 00000000..6a37732c
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/app/CONF.java
@@ -0,0 +1,23 @@
+package org.qpython.qpy.main.app;
+
+import com.quseit.util.NAction;
+
+import org.qpython.qpysdk.QPyConstants;
+
+public class CONF implements QPyConstants {
+
+    public static final String LIB_DOWNLOAD_TEMP = QPyConstants.ABSOLUTE_PATH + "/cache";
+        public static final String QPYPI_URL         = "https://pypi.org/simple/";
+
+    public static final String NOTIFICATION_SP_NAME = "NOTIFICATION_EXTRA";
+    public static final String NOTIFICATION_SP_OBJ  = "NOTIFICATION_OBJ";
+
+    public static final String IAP_NUM_REQUEST_URL = "http://apu.quseit.com/conf/iaplognum/org.qpython.qpy/";
+    public static final String GOOGLE_ID_TOKEN     = "955258715976-i6t5usa0tjg8favq17lsfaj885l4lilv.apps.googleusercontent.com";
+
+    public static final String CLOUD_MAP_CACHE_PATH = QPyConstants.ABSOLUTE_PATH + "/lib/.cloud_cache";
+
+    public static String qpypiPath() {
+        return App.getContext().getFilesDir().getAbsolutePath() + "/lib/python"+(NAction.isQPy3(App.getContext())?"3.6":"2.7")+"/site-packages/";
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/app/User.java b/qpython/src/main/java/org/qpython/qpy/main/app/User.java
new file mode 100644
index 00000000..a74ed09b
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/app/User.java
@@ -0,0 +1,51 @@
+package org.qpython.qpy.main.app;
+
+
+public class User {
+    private String userId;
+    private String userName;
+    private String nick;
+
+    private String email;
+    private String avatarUrl;
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+
+    public String getNick() {
+        return nick == null ? "" : nick;
+    }
+
+    public String getUserName() {
+        return userName == null ? "" : userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setNick(String unick) {
+        this.nick = unick;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    public String getAvatarUrl() {
+        return avatarUrl;
+    }
+
+    public void setAvatarUrl(String avatarUrl) {
+        this.avatarUrl = avatarUrl;
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/dialog/LogoDialog.java b/qpython/src/main/java/org/qpython/qpy/main/dialog/LogoDialog.java
index bfebd394..4196ba97 100644
--- a/qpython/src/main/java/org/qpython/qpy/main/dialog/LogoDialog.java
+++ b/qpython/src/main/java/org/qpython/qpy/main/dialog/LogoDialog.java
@@ -1,44 +1,36 @@
-package org.qpython.qpy.main.dialog;
-
-import android.databinding.DataBindingUtil;
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.app.DialogFragment;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import org.qpython.qpy.R;
-//import org.qpython.qpy.databinding.DialogLogoBinding;
-import org.qpython.qpy.main.activity.HomeMainActivity;
-import org.qpython.qpy.main.utils.Bus;
-
-public class LogoDialog extends DialogFragment {
-    public static final String TAG = "LogoDialog";
-    //private DialogLogoBinding mBinding;
-
-    public static LogoDialog newInstance() {
-        return new LogoDialog();
-    }
-
-//    @Nullable
-//    @Override
-//    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-//        mBinding = DataBindingUtil.inflate(inflater, R.layout.dialog_logo, container, false);
-//
-//        mBinding.btnQrcode.setOnClickListener(v -> {
-//            Bus.getDefault().post(new HomeMainActivity.StartQrCodeActivityEvent());
-//            dismiss();
-//        });
-//        mBinding.btnScript.setOnClickListener(v -> {
-//            Bus.getDefault().post(new HomeMainActivity.ShowProgramDialogEvent(false));
-//            dismiss();
-//        });
-//        mBinding.btnProject.setOnClickListener(v -> {
-//            Bus.getDefault().post(new HomeMainActivity.ShowProgramDialogEvent(true));
-//            dismiss();
-//        });
-//
-//        return mBinding.getRoot();
-//    }
-}
+package org.qpython.qpy.main.dialog;
+
+import android.support.v4.app.DialogFragment;
+
+//import org.qpython.qpy.databinding.DialogLogoBinding;
+import org.qpython.qpy.main.activity.HomeMainActivity;
+
+public class LogoDialog extends DialogFragment {
+    public static final String TAG = "LogoDialog";
+    //private DialogLogoBinding mBinding;
+
+    public static LogoDialog newInstance() {
+        return new LogoDialog();
+    }
+
+//    @Nullable
+//    @Override
+//    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+//        mBinding = DataBindingUtil.inflate(inflater, R.layout.dialog_logo, container, false);
+//
+//        mBinding.btnQrcode.setOnClickListener(v -> {
+//            Bus.getDefault().post(new HomeMainActivity.StartQrCodeActivityEvent());
+//            dismiss();
+//        });
+//        mBinding.btnScript.setOnClickListener(v -> {
+//            Bus.getDefault().post(new HomeMainActivity.ShowProgramDialogEvent(false));
+//            dismiss();
+//        });
+//        mBinding.btnProject.setOnClickListener(v -> {
+//            Bus.getDefault().post(new HomeMainActivity.ShowProgramDialogEvent(true));
+//            dismiss();
+//        });
+//
+//        return mBinding.getRoot();
+//    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/dialog/RunProgramDialog.java b/qpython/src/main/java/org/qpython/qpy/main/dialog/RunProgramDialog.java
deleted file mode 100644
index f7c3b4e4..00000000
--- a/qpython/src/main/java/org/qpython/qpy/main/dialog/RunProgramDialog.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package org.qpython.qpy.main.dialog;
-
-import android.databinding.DataBindingUtil;
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.app.DialogFragment;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-
-import org.qpython.qpy.R;
-import org.qpython.qpy.databinding.DialogRunProgramBinding;
-import org.qpython.qpy.main.app.App;
-import org.qpython.qpy.main.event.RunProgramEvent;
-import org.qpython.qpy.main.utils.Bus;
-import org.qpython.qpy.plugin.SpaceItemDecoration;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-public class RunProgramDialog extends DialogFragment {
-    public static final String TAG = "RunProgramDialog";
-
-    public static final String PROGRAM_TYPE = "program_type";
-    public static final int TYPE_SCRIPT = 0;
-    public static final int TYPE_PROJECT = 1;
-    private int type;
-
-    private DialogRunProgramBinding mBinding;
-    private Adapter mAdapter;
-
-    public static RunProgramDialog newInstance(int type) {
-        Bundle args = new Bundle();
-        args.putInt(PROGRAM_TYPE, type);
-        RunProgramDialog fragment = new RunProgramDialog();
-        fragment.setArguments(args);
-        return fragment;
-    }
-
-    @Nullable
-    @Override
-    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        mBinding = DataBindingUtil.inflate(inflater, R.layout.dialog_run_program, container, false);
-        RecyclerView rv = mBinding.rvProgram;
-        rv.setLayoutManager(new LinearLayoutManager(getContext()));
-        rv.addItemDecoration(new SpaceItemDecoration(1));
-        mAdapter = new Adapter();
-        rv.setAdapter(mAdapter);
-        return mBinding.getRoot();
-    }
-
-    @Override
-    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-        type = getArguments().getInt(PROGRAM_TYPE);
-        File dir = null;
-        if (type == TYPE_SCRIPT) {
-            mBinding.tvTitle.setText(R.string.dialog_title_script);
-            dir = new File(App.getScriptPath());
-        }
-        if (type == TYPE_PROJECT) {
-            mBinding.tvTitle.setText(R.string.dialog_title_project);
-            dir = new File(App.getProjectPath());
-        }
-        if (!dir.exists()) {
-            dir.mkdirs();
-        }
-        mAdapter.setData(Arrays.asList(dir.listFiles()));
-    }
-
-    public class Adapter extends RecyclerView.Adapter<Holder> {
-        private List<File> mList = new ArrayList<>();
-
-        @Override
-        public Holder onCreateViewHolder(ViewGroup parent, int viewType) {
-            View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.item_run_program, parent, false);
-            return new Holder(v);
-        }
-
-        @Override
-        public void onBindViewHolder(Holder holder, int position) {
-            File file = mList.get(position);
-            holder.name.setText(file.getName());
-            holder.itemView.setOnClickListener(v -> {
-                if (type == TYPE_SCRIPT) {
-                    Bus.getDefault().post(new RunProgramEvent(file.getPath(), false));
-                }
-                if (type == TYPE_PROJECT) {
-                    Bus.getDefault().post(new RunProgramEvent(file.getPath(), true));
-                }
-                dismiss();
-            });
-        }
-
-        @Override
-        public int getItemCount() {
-            return mList.size();
-        }
-
-        public void setData(List<File> files) {
-            mList.clear();
-            mList.addAll(files);
-            notifyDataSetChanged();
-        }
-    }
-
-    public static class Holder extends RecyclerView.ViewHolder {
-        TextView name;
-
-        public Holder(View itemView) {
-            super(itemView);
-            name = (TextView) itemView.findViewById(R.id.tv_name);
-        }
-    }
-}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/event/AppsLoader.java b/qpython/src/main/java/org/qpython/qpy/main/event/AppsLoader.java
new file mode 100644
index 00000000..17eed0c7
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/event/AppsLoader.java
@@ -0,0 +1,152 @@
+package org.qpython.qpy.main.event;
+
+import android.content.AsyncTaskLoader;
+import android.content.Context;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+
+import org.qpython.qpy.main.model.AppModel;
+import org.qpython.qpy.main.model.LocalAppModel;
+
+import java.text.Collator;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+/**
+ * Load App list
+ * Created by Hmei on 2017-05-25.
+ */
+
+public class AppsLoader extends AsyncTaskLoader<ArrayList<AppModel>> {
+    ArrayList<AppModel> mInstalledApps;
+
+    final PackageManager mPm;
+
+    public AppsLoader(Context context) {
+        super(context);
+
+        mPm = context.getPackageManager();
+    }
+
+    @Override
+    public ArrayList<AppModel> loadInBackground() {
+        // retrieve the list of installed applications
+        List<ApplicationInfo> apps = mPm.getInstalledApplications(0);
+
+        if (apps == null) {
+            apps = new ArrayList<>();
+        }
+
+        final Context context = getContext();
+
+        // create corresponding apps and load their labels
+        ArrayList<AppModel> items = new ArrayList<>(apps.size());
+        for (int i = 0; i < apps.size(); i++) {
+            String pkg = apps.get(i).packageName;
+
+            // only apps which are launchable
+            if (context.getPackageManager().getLaunchIntentForPackage(pkg) != null) {
+                LocalAppModel app = new LocalAppModel(context, apps.get(i));
+                app.loadLabel(context);
+                items.add(app);
+            }
+        }
+
+        // sort the list
+        Collections.sort(items, ALPHA_COMPARATOR);
+        return items;
+    }
+
+    @Override
+    public void deliverResult(ArrayList<AppModel> apps) {
+        if (isReset()) {
+            // An async query came in while the loader is stopped.  We
+            // don't need the result.
+            if (apps != null) {
+                onReleaseResources(apps);
+            }
+        }
+
+        ArrayList<AppModel> oldApps = apps;
+        mInstalledApps = apps;
+
+        if (isStarted()) {
+            // If the Loader is currently started, we can immediately
+            // deliver its results.
+            super.deliverResult(apps);
+        }
+
+        // At this point we can release the resources associated with
+        // 'oldApps' if needed; now that the new result is delivered we
+        // know that it is no longer in use.
+        if (oldApps != null) {
+            onReleaseResources(oldApps);
+        }
+    }
+
+    @Override
+    protected void onStartLoading() {
+        if (mInstalledApps != null) {
+            // If we currently have a result available, deliver it
+            // immediately.
+            deliverResult(mInstalledApps);
+        }
+
+        if (takeContentChanged() || mInstalledApps == null ) {
+            // If the data has changed since the last time it was loaded
+            // or is not currently available, start a load.
+            forceLoad();
+        }
+    }
+
+    @Override
+    protected void onStopLoading() {
+        // Attempt to cancel the current load task if possible.
+        cancelLoad();
+    }
+
+    @Override
+    public void onCanceled(ArrayList<AppModel> apps) {
+        super.onCanceled(apps);
+
+        // At this point we can release the resources associated with 'apps'
+        // if needed.
+        onReleaseResources(apps);
+    }
+
+    @Override
+    protected void onReset() {
+        // Ensure the loader is stopped
+        onStopLoading();
+
+        // At this point we can release the resources associated with 'apps'
+        // if needed.
+        if (mInstalledApps != null) {
+            onReleaseResources(mInstalledApps);
+            mInstalledApps = null;
+        }
+    }
+
+    /**
+     * Helper method to do the cleanup work if needed, for example if we're
+     * using Cursor, then we should be closing it here
+     *
+     * @param apps
+     */
+    protected void onReleaseResources(ArrayList<AppModel> apps) {
+        // do nothing
+    }
+
+    /**
+     * Perform alphabetical comparison of application entry objects.
+     */
+    public static final Comparator<AppModel> ALPHA_COMPARATOR = new Comparator<AppModel>() {
+        private final Collator sCollator = Collator.getInstance();
+        @Override
+        public int compare(AppModel object1, AppModel object2) {
+            return sCollator.compare(object1.getLabel(), object2.getLabel());
+        }
+    };
+}
\ No newline at end of file
diff --git a/qpython/src/main/java/org/qpython/qpy/main/event/Bean.java b/qpython/src/main/java/org/qpython/qpy/main/event/Bean.java
index 7c7a8909..12076c31 100644
--- a/qpython/src/main/java/org/qpython/qpy/main/event/Bean.java
+++ b/qpython/src/main/java/org/qpython/qpy/main/event/Bean.java
@@ -4,13 +4,26 @@
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Environment;
+import android.util.Log;
 import android.webkit.JavascriptInterface;
+import android.webkit.WebView;
+import android.widget.Toast;
 
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.qpython.qpy.R;
+import org.qpython.qpy.main.activity.NotebookActivity;
+import org.qpython.qpy.main.activity.PurchaseActivity;
+import org.qpython.qpy.main.activity.QWebViewActivity;
+import org.qpython.qpy.main.activity.SettingActivity;
+import org.qpython.qpy.main.app.CONF;
 import org.qpython.qpy.main.utils.Utils;
-import org.qpython.qpysdk.utils.FileHelper;
-import org.renpy.android.PythonActivity;
+import org.qpython.qpy.texteditor.EditorActivity;
+
+import com.quseit.util.FileHelper;
+
+import org.qpython.qpy.utils.NotebookUtil;
+import org.qpython.qpysdk.QPyConstants;
 
 import java.io.File;
 import java.io.IOException;
@@ -19,350 +32,356 @@
 import java.net.URL;
 
 public class Bean {
-	protected String title;
+    private final String TAG = "BEAN";
+    protected String  title;
     protected Context context;
-    protected int dialogIndex;
-    protected String srv;
+    protected WebView webview;
+    protected int     dialogIndex;
+    protected String  srv;
 
-    private final String TAG = "BEAN";
- 
-    public Bean(Context context) {
-    	this.context = context;
+    public Bean(Context context, WebView webview) {
+        this.context = context;
+        this.webview = webview;
     }
 
-	@JavascriptInterface
-	public void setSrv(String srv) {
-    	this.srv = srv;
+    @JavascriptInterface
+    public String getSrv() {
+        return this.srv;
     }
-	@JavascriptInterface
-	public String getSrv() {
-    	return this.srv;
+
+    @JavascriptInterface
+    public void setSrv(String srv) {
+        this.srv = srv;
     }
-	@JavascriptInterface
+
+    @JavascriptInterface
     public void close() {
-		Intent intent1 = new Intent(".QWebViewActivity");
-		intent1.putExtra(PythonActivity.EXTRA_CONTENT_URL1, "close");
-    	context.sendBroadcast(intent1);
+        Intent intent1 = new Intent(".QWebViewActivity");
+        intent1.putExtra(QWebViewActivity.ACT, "close");
+        context.sendBroadcast(intent1);
     }
-	@JavascriptInterface
+
+    @JavascriptInterface
     public void alert(String info) {
-		Intent intent1 = new Intent(".QWebViewActivity");
-		intent1.putExtra(PythonActivity.EXTRA_CONTENT_URL1, "alert");
-		intent1.putExtra(PythonActivity.EXTRA_CONTENT_URL2, info);
+        Intent intent1 = new Intent(".QWebViewActivity");
+        intent1.putExtra(QWebViewActivity.ACT, "alert");
+        intent1.putExtra(QWebViewActivity.URL, info);
 
-		context.sendBroadcast(intent1);
+        context.sendBroadcast(intent1);
     }
 
-	@JavascriptInterface
+    @JavascriptInterface
     public void showWait() {
-		Intent intent1 = new Intent(".QWebViewActivity");
-		intent1.putExtra(PythonActivity.EXTRA_CONTENT_URL1, "showwait");
-    	context.sendBroadcast(intent1);
+        Intent intent1 = new Intent(".QWebViewActivity");
+        intent1.putExtra(QWebViewActivity.ACT, "showwait");
+        context.sendBroadcast(intent1);
     }
-	@JavascriptInterface
+
+    @JavascriptInterface
     public void closeWait() {
-		Intent intent1 = new Intent(".QWebViewActivity");
-		intent1.putExtra(PythonActivity.EXTRA_CONTENT_URL1, "closewait");
-    	context.sendBroadcast(intent1);
+        Intent intent1 = new Intent(".QWebViewActivity");
+        intent1.putExtra(QWebViewActivity.ACT, "closewait");
+        context.sendBroadcast(intent1);
     }
-	@JavascriptInterface
+
+    @JavascriptInterface
     public void pipConsole() {
-		Intent intent1 = new Intent(".QWebViewActivity");
-		intent1.putExtra(PythonActivity.EXTRA_CONTENT_URL1, "pipconsole");
-		context.sendBroadcast(intent1);
+        Intent intent1 = new Intent(".QWebViewActivity");
+        intent1.putExtra(QWebViewActivity.ACT, "pipconsole");
+        context.sendBroadcast(intent1);
     }
-	@JavascriptInterface
+
+    @JavascriptInterface
     public void pipInstall(String link, String src) {
-		Intent intent1 = new Intent(".QWebViewActivity");
-		intent1.putExtra(PythonActivity.EXTRA_CONTENT_URL1, "pipinstall");
-		intent1.putExtra(PythonActivity.EXTRA_CONTENT_URL2, link);
-		intent1.putExtra(PythonActivity.EXTRA_CONTENT_URL3, src);
-		context.sendBroadcast(intent1);
+        Intent intent1 = new Intent(".QWebViewActivity");
+        intent1.putExtra(QWebViewActivity.ACT, "pipinstall");
+        intent1.putExtra(QWebViewActivity.URL, link);
+        intent1.putExtra(QWebViewActivity.SRC, src);
+        context.sendBroadcast(intent1);
     }
-	@JavascriptInterface
+
+    @JavascriptInterface
     public void libMan() {
-		Intent intent1 = new Intent(".QWebViewActivity");
-		intent1.putExtra(PythonActivity.EXTRA_CONTENT_URL1, "libman");
-		
-		context.sendBroadcast(intent1);
+        Intent intent1 = new Intent(".QWebViewActivity");
+        intent1.putExtra(QWebViewActivity.ACT, "libman");
+
+        context.sendBroadcast(intent1);
     }
-	@JavascriptInterface
+
+    @JavascriptInterface
     public void showDrawerMenu(String menuPythonActivity) {
-		Intent intent1 = new Intent(".QWebViewActivity");
-		intent1.putExtra(PythonActivity.EXTRA_CONTENT_URL1, "showdrawermenu");
-		intent1.putExtra(PythonActivity.EXTRA_CONTENT_URL2, menuPythonActivity);
-		context.sendBroadcast(intent1);
+        Intent intent1 = new Intent(".QWebViewActivity");
+        intent1.putExtra(QWebViewActivity.ACT, "showdrawermenu");
+        intent1.putExtra(QWebViewActivity.URL, menuPythonActivity);
+        context.sendBroadcast(intent1);
     }
 
-	@JavascriptInterface
+    @JavascriptInterface
     public boolean isSrvOk(String srv) {
-    	try {
-			URL u = new URL(srv.equals("")?this.srv:srv);
-			int port = 80;
-			if (u.getPort() != -1) {
-				port = u.getPort();
-			}
-			String url = u.getProtocol() + "://" +u.getHost()+":"+port+"/";
-	    	boolean ret =  Utils.httpPing(url, 1000);
-			//Log.d("Bean", "isSrvOk:"+url+" - "+ret);
-			return ret;
-
-		} catch (MalformedURLException e) {
-			//Log.d("Bean", "MalformedURLException:"+e);
-			return false;
-		}
-    }
-
-
-	@JavascriptInterface
-    public void setTitle(String title){
-        this.title = title;
+        try {
+            URL u = new URL(srv.equals("") ? this.srv : srv);
+            int port = 80;
+            if (u.getPort() != -1) {
+                port = u.getPort();
+            }
+            String url = u.getProtocol() + "://" + u.getHost() + ":" + port + "/";
+            boolean ret = Utils.httpPing(url, 3000);
+            Log.d("Bean", "isSrvOk:"+url+" - "+ret);
+            return ret;
+
+        } catch (MalformedURLException e) {
+            //LogUtil.d("Bean", "MalformedURLException:"+e);
+            return false;
+        }
     }
 
-    /*public void a8viewChanel(String url, String nav, String act, String desc, String icon) {
-    	Intent intent = new Intent(context, MSearchAct.class);
-		intent.putExtra(PythonActivity.EXTRA_CONTENT_URL1, url);
-		intent.putExtra(PythonActivity.EXTRA_CONTENT_URL2, nav);
-		intent.putExtra(PythonActivity.EXTRA_CONTENT_URL3, "0");
-		intent.putExtra(PythonActivity.EXTRA_CONTENT_URL4, act);
-		intent.putExtra(PythonActivity.EXTRA_CONTENT_URL5, desc);
-		intent.putExtra(PythonActivity.EXTRA_CONTENT_URL6, icon);
-
-		context.startActivity(intent);
-    }*/
-
-	@JavascriptInterface
-    public void tbdownload(String title, String url, String cat) {
-    	
-		Intent intent1 = new Intent(".QWebViewActivity");
-		intent1.putExtra(PythonActivity.EXTRA_CONTENT_URL1, "download");
-
-		intent1.putExtra(PythonActivity.EXTRA_CONTENT_URL2, url);
-		intent1.putExtra(PythonActivity.EXTRA_CONTENT_URL3, cat);
-		intent1.putExtra(PythonActivity.EXTRA_CONTENT_URL4, title);
-
-    	context.sendBroadcast(intent1);
-    }
-	@JavascriptInterface
-    public void a8addChanel(String title, String link, String desc, String act, String theme) {
-    	JSONObject obj = new JSONObject();
-		try {
-			obj.put("title", title);
-    		obj.put("icon", "default");
-    		//"grey3"
-    		obj.put("theme", theme);
-    		//"milib:pyplugin"
-    		obj.put("act", act);
-    		obj.put("link", link);
-    		obj.put("desc", desc);
-    		
-		} catch (JSONException e) {
-			e.printStackTrace();
-		}
-
-		//CatMan.setChanel(context, obj, true, "");
-    }
-	@JavascriptInterface
+    @JavascriptInterface
     public void openUrl(String url) {
-		Intent intent = Utils.openRemoteLink(context, url);
-		context.startActivity(intent);
+        Intent intent = Utils.openRemoteLink(context, url);
+        context.startActivity(intent);
     }
-	@JavascriptInterface
+
+    @JavascriptInterface
     public void call(String number) {
-    	Intent phoneIntent = new Intent(Intent.ACTION_DIAL, Uri.parse("tel:" + number));
-    	context.startActivity(phoneIntent);
+        Intent phoneIntent = new Intent(Intent.ACTION_DIAL, Uri.parse("tel:" + number));
+        context.startActivity(phoneIntent);
     }
-	@JavascriptInterface
+
+    @JavascriptInterface
     public String isNetworkOk(Context context) {
-    	if (Utils.netOk(context)) {
-    		return "1";
-    	} else {
-    		return "0";
-    	}
-    }
-	@JavascriptInterface
-	public void a8removeChanel(String link) {
-		//CatMan.setChanel(context, null, false, link);
+        if (Utils.netOk(context)) {
+            return "1";
+        } else {
+            return "0";
+        }
     }
-	@JavascriptInterface
+
+    @JavascriptInterface
     public String returnTmpScript(String xcode, String flag, String param) {
-		try {
-			//
-			File root = new File(Environment.getExternalStorageDirectory()+"/qpython/cache");
-			if (root!=null) {
-				FileHelper.clearDir( root.toString(), 0, false);
-			}
-
-			//String py = FileHelper.getBasePath(MyApp.getInstance().getRoot(), PythonActivity.DFROM_QPY)+"/"+PythonActivity.API_SCRIPT;
-			String py;
-			String code;
-			if (flag.equals("qedit")) {
-				if (param!=null && !param.equals("")) {
-					File f = new File(param);
-					py = new File(f.getParentFile(), ".last_tmp.py").toString();
-				} else {
-					py = new File(root, ".last_tmp.py").toString();
-				}
-				if (xcode.contains("#{HEADER}")) {
-					code = xcode.replace("#{HEADER}", "");
-				} else {
-					code = xcode;
-				}
-
-			} else {
-				py = Environment.getExternalStorageDirectory()+"/qpython/cache/main.py";
-				if (xcode.contains("#{HEADER}")) {
-					code = xcode.replace("#{HEADER}", "PARAM = '"+param+"'");
-
-				} else {
-					code = "PARAM = '"+param+"'\n"+ xcode;
-				}
-			}
-			//Log.d(TAG, "py:"+py);
-	    	File pyCache = new File(py);
-	    	if (!pyCache.exists()) {
-	    		pyCache.createNewFile();
-	    	}
-	    	byte[] xcontent = code.getBytes();
-			RandomAccessFile accessFile = new RandomAccessFile(pyCache.getAbsoluteFile(), "rwd");
-			accessFile.setLength(xcontent.length);
-			accessFile.seek(0);
-			accessFile.write(xcontent, 0, xcontent.length);
-			accessFile.close();
-
-			return py;
-		} catch (IOException e) {
-			e.printStackTrace();
-			return "";
-		}
-    }
-
-
-	@JavascriptInterface
-    public void qeditor(String content) {
-    	
-    	String py = returnTmpScript(content, "qedit", null);
+        try {
+            //
+            File root = new File(QPyConstants.ABSOLUTE_PATH + "/cache");
+            if (root != null) {
+                FileHelper.clearDir(root.toString(), 0, false);
+            }
+
+            //String py = FileHelper.getBasePath(QBaseApp.getInstance().getRoot(), PythonActivity.DFROM_QPY)+"/"+PythonActivity.API_SCRIPT;
+            String py;
+            String code;
+            if (flag.equals("qedit")) {
+                if (param != null && !param.equals("")) {
+                    File f = new File(param);
+                    py = new File(f.getParentFile(), ".last_tmp.py").toString();
+                } else {
+                    py = new File(root, ".last_tmp.py").toString();
+                }
+                if (xcode.contains("#{HEADER}")) {
+                    code = xcode.replace("#{HEADER}", "");
+                } else {
+                    code = xcode;
+                }
+
+            } else {
+                py = QPyConstants.ABSOLUTE_PATH + "/cache/main.py";
+                if (xcode.contains("#{HEADER}")) {
+                    code = xcode.replace("#{HEADER}", "PARAM = '" + param + "'");
+
+                } else {
+                    code = "PARAM = '" + param + "'\n" + xcode;
+                }
+            }
+            //LogUtil.d(TAG, "py:"+py);
+            File pyCache = new File(py);
+            if (!pyCache.exists()) {
+                pyCache.createNewFile();
+            }
+            byte[] xcontent = code.getBytes();
+            RandomAccessFile accessFile = new RandomAccessFile(pyCache.getAbsoluteFile(), "rwd");
+            accessFile.setLength(xcontent.length);
+            accessFile.seek(0);
+            accessFile.write(xcontent, 0, xcontent.length);
+            accessFile.close();
+
+            return py;
+        } catch (IOException e) {
+            e.printStackTrace();
+            return "";
+        }
+    }
 
-		Intent intent = new Intent();
-		intent.setClassName(context, "com.hipipal.texteditor.TedActivity");
-		intent.setAction(Intent.ACTION_VIEW);
+    @JavascriptInterface
+    public void qeditor(String content) {
 
-		intent.putExtra(PythonActivity.EXTRA_CONTENT_URL0, "web");
+        String py = returnTmpScript(content, "qedit", null);
         Uri uri = Uri.fromFile(new File(py));
-        intent.setDataAndType(uri , "text/x-python");
-
-		context.startActivity(intent);
+        EditorActivity.start(context, uri);
     }
 
-	@JavascriptInterface
-	public String qpyChecklibinstall(String cat, String smodule) {
-    	final File libFile = getLibFile(smodule, cat);
+    @JavascriptInterface
+    public String qpyChecklibinstall(String cat, String smodule) {
+        final File libFile = getLibFile(smodule, cat);
 
-    	if (libFile.exists()) {
-        	return "1";
+        if (libFile.exists()) {
+            return "1";
         } else {
-        	return "0";
+            return "0";
         }
     }
 
-	@JavascriptInterface
-	public File getLibFile(String smodule, String cat) {
-		//String code = NAction.getCode(this);
-		boolean isQpy3 = Utils.isQPy3(context);
-    	String base = isQpy3?"python3.2/site-packages":"python2.7/site-packages";
-    	String sbase = isQpy3?"python3.2":"python2.7";
-    	String ubase = isQpy3?"scripts3":"scripts";
-    	String pbase = isQpy3?"projects3":"projects";
+    @JavascriptInterface
+    public File getLibFile(String smodule, String cat) {
+        //String code = NAction.getCode(this);
+        boolean isQpy3 = Utils.isQPy3(context);
+        String base = isQpy3 ? "python3.2/site-packages" : "python2.7/site-packages";
+        String sbase = isQpy3 ? "python3.2" : "python2.7";
+        String ubase = isQpy3 ? "scripts3" : "scripts";
+        String pbase = isQpy3 ? "projects3" : "projects";
 
-		File libFile;
-		if (cat.equals("script")) {
-            libFile = new File(Environment.getExternalStorageDirectory(), "qpython/"+ubase+"/"+smodule);
+        File libFile;
+        if (cat.equals("script")) {
+            libFile = new File(Environment.getExternalStorageDirectory(), "qpython/" + ubase + "/" + smodule);
 
-		} else if (cat.equals("user")) {
-            libFile = new File(Environment.getExternalStorageDirectory(),"qpython/"+pbase+"/"+smodule);
+        } else if (cat.equals("user")) {
+            libFile = new File(Environment.getExternalStorageDirectory(), "qpython/" + pbase + "/" + smodule);
 
-		} else if (cat.equals("component")) {
-            libFile = new File(Environment.getExternalStorageDirectory(), "qpython/lib/"+smodule);
+        } else if (cat.equals("component")) {
+            libFile = new File(Environment.getExternalStorageDirectory(), "qpython/lib/" + smodule);
 
-    	} else if (cat.equals("dev")) {
-            libFile = new File(context.getFilesDir(), "/lib/"+sbase+"/site-packages/"+smodule);
-            
+        } else {
+            libFile = new File(context.getFilesDir(), "/lib/" + sbase + "/site-packages/" + smodule);
 
-    	} else {
-            libFile = new File(Environment.getExternalStorageDirectory(), "qpython/"+PythonActivity.LIB_DIR+"/"+base+"/"+smodule);
 
-    	} 
-    	return libFile;
-	}
+        }
+        return libFile;
+    }
+
+    @JavascriptInterface
+    public void setQBTitle(String title) {
+        Intent intent1 = new Intent(".QWebViewActivity");
+        intent1.putExtra(QWebViewActivity.ACT, "settitle");
+        intent1.putExtra(QWebViewActivity.URL, title);
+        context.sendBroadcast(intent1);
 
-	@JavascriptInterface
-	public void qpylibinstall(String cat, String link, String target) {
-    	if (target.equals("commerce")) {
-    		context.startActivity(Utils.openRemoteLink(context, link));
-    		
-    	} else {
-	    	Intent intent = new Intent();
-	    	if (cat.equals("user") || cat.equals("script")) {
-	    		intent.setClassName(context.getPackageName(), context.getPackageName()+".UProfileAct");
-	    		intent.putExtra("from", cat);
-	
-	    	} else {
-	    		intent.setClassName(context.getPackageName(), context.getPackageName()+".MPyLibAct");
-	    	}
-	    	intent.putExtra(PythonActivity.EXTRA_CONTENT_URL0, "install");
-	    	intent.putExtra(PythonActivity.EXTRA_CONTENT_URL1, cat);
-	    	intent.putExtra(PythonActivity.EXTRA_CONTENT_URL2, link);
-	    	intent.putExtra(PythonActivity.EXTRA_CONTENT_URL3, target);
-	
-	    	context.startActivity(intent);
-    	}
-    	
     }
 
-	@JavascriptInterface
-	public void setQBTitle(String title) {
-		Intent intent1 = new Intent(".QWebViewActivity");
-		intent1.putExtra(PythonActivity.EXTRA_CONTENT_URL1, "settitle");
-		intent1.putExtra(PythonActivity.EXTRA_CONTENT_URL2, title);
-    	context.sendBroadcast(intent1);
+    @JavascriptInterface
+    public void showLog() {
+        Intent intent2 = new Intent(".QWebViewActivity");
+        intent2.putExtra(QWebViewActivity.ACT, "notifylog");
+        intent2.putExtra(QWebViewActivity.URL, "");
 
+        context.sendBroadcast(intent2);
     }
 
-	@JavascriptInterface
-	public void showLog() {
-		Intent intent2 = new Intent(".QWebViewActivity");
-		intent2.putExtra(PythonActivity.EXTRA_CONTENT_URL1, "notifylog");
-		intent2.putExtra(PythonActivity.EXTRA_CONTENT_URL2, "");
+    @JavascriptInterface
+    public void feedback(String logfile) {
+        Intent intent2 = new Intent(".QWebViewActivity");
+        intent2.putExtra(QWebViewActivity.ACT, "feedback");
+        intent2.putExtra(QWebViewActivity.URL, logfile);
 
-		context.sendBroadcast(intent2);
+        context.sendBroadcast(intent2);
     }
 
-	@JavascriptInterface
-	public void feedback(String logfile) {
-		Intent intent2 = new Intent(".QWebViewActivity");
-		intent2.putExtra(PythonActivity.EXTRA_CONTENT_URL1, "feedback");
-		intent2.putExtra(PythonActivity.EXTRA_CONTENT_URL2, logfile);
+    @JavascriptInterface
+    public void loadConsole(String script) {
+        //LogUtil.d(TAG, "loadConsole:"+script);
+        Intent intent1 = new Intent(".QWebViewActivity");
+        intent1.putExtra(QWebViewActivity.ACT, "launchsrv");
+        intent1.putExtra(QWebViewActivity.URL, script);
+        context.sendBroadcast(intent1);
 
-		context.sendBroadcast(intent2);
     }
 
-	@JavascriptInterface
-	public void loadConsole(String script) {
-    	//Log.d(TAG, "loadConsole:"+script);
-		Intent intent1 = new Intent(".QWebViewActivity");
-		intent1.putExtra(PythonActivity.EXTRA_CONTENT_URL1, "launchsrv");
-		intent1.putExtra(PythonActivity.EXTRA_CONTENT_URL2, script);
-    	context.sendBroadcast(intent1);
+    @JavascriptInterface
+    public void setActivityTitle(String title) {
+    }
 
+    @JavascriptInterface
+    public String getTitle() {
+        return this.title;
     }
 
-	@JavascriptInterface
-	public void setActivityTitle(String title) {
+    @JavascriptInterface
+    public void setTitle(String title) {
+        this.title = title;
     }
 
+    @JavascriptInterface
+    public void openPurchaseActivity(String articleID) {
+        PurchaseActivity.start(context, articleID);
+    }
 
-	@JavascriptInterface
-	public String getTitle(){
-        return this.title;
+    @JavascriptInterface
+    public String getPurchaseNumber(String articleID) {
+        JSONObject ret = FileHelper.getUrlAsJO(CONF.IAP_NUM_REQUEST_URL+articleID);
+        if (ret!=null) {
+            try {
+                int total = ret.getInt("number");
+                if (total>1000) {
+                    return "> 5,000";
+                } else if (total>500) {
+                    return "1000 - 5000";
+                } else if (total>100) {
+                    return "500 - 1000";
+                } else if (total>50) {
+                    return "100 - 500";
+                } else if (total>20) {
+                    return "50 - 100";
+                } else if (total>5) {
+                    return "10 - 50";
+                } else {
+                    return "1 - 10";
+                }
+            } catch (JSONException e) {
+                return "1 - 10";
+            }
+        } else {
+            return "1 - 10";
+        }
     }
+
+    @JavascriptInterface
+    public void qpynotebook(){
+        boolean notebookenable = NotebookUtil.isNotebookEnable(context);
+        if (notebookenable) {
+            Toast.makeText(context, R.string.ennable_notebook_first, Toast.LENGTH_SHORT).show();
+            return;
+        }
+        NotebookActivity.start(context,null, false);
+    }
+
+    @JavascriptInterface
+    public void onNext(String act) {
+        Log.d(TAG, "onNext");
+        Intent intent1 = new Intent(".QWebViewActivity");
+        intent1.putExtra(QWebViewActivity.ACT, "onnext");
+        intent1.putExtra(QWebViewActivity.URL, act);
+        context.sendBroadcast(intent1);
+    }
+
+    @JavascriptInterface
+    public void openNotebook(String url){
+        Log.d(TAG, "openNotebook:"+url);
+        boolean notebookenable = NotebookUtil.isNotebookEnable(context);
+        if (!notebookenable) {
+            Toast.makeText(context, R.string.ennable_notebook_first, Toast.LENGTH_SHORT).show();
+            SettingActivity.startActivity(context);
+            return;
+        }
+
+        NotebookActivity.startFromUrl(context,url, false);
+    }
+    // for debug
+    @JavascriptInterface
+    public void loadHtml(String data) {
+        Log.d(TAG, "loadHtml");
+        Intent intent1 = new Intent(".QWebViewActivity");
+        intent1.putExtra(QWebViewActivity.ACT, "loadhtml");
+        intent1.putExtra(QWebViewActivity.HTML, data);
+
+        context.sendBroadcast(intent1);
+
+        //this.webview.loadDataWithBaseURL("file:///android_asset/", data, mimeType, encoding, null);
+    }
+
 }
diff --git a/qpython/src/main/java/org/qpython/qpy/main/event/RunProgramEvent.java b/qpython/src/main/java/org/qpython/qpy/main/event/RunProgramEvent.java
deleted file mode 100644
index df82e2c5..00000000
--- a/qpython/src/main/java/org/qpython/qpy/main/event/RunProgramEvent.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.qpython.qpy.main.event;
-
-public class RunProgramEvent {
-    public final String path;
-    public final boolean isProject;
-
-    public RunProgramEvent( String path, boolean isProject) {
-        this.path = path;
-        this.isProject = isProject;
-    }
-
-}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/event/ShareCodeCallback.java b/qpython/src/main/java/org/qpython/qpy/main/event/ShareCodeCallback.java
new file mode 100644
index 00000000..35fe0d0d
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/event/ShareCodeCallback.java
@@ -0,0 +1,51 @@
+package org.qpython.qpy.main.event;
+
+import org.qpython.qpy.codeshare.pojo.BookmarkerList;
+import org.qpython.qpy.codeshare.pojo.CloudFile;
+import org.qpython.qpy.codeshare.pojo.Gist;
+import org.qpython.qpy.codeshare.pojo.GistBase;
+import org.qpython.qpy.codeshare.pojo.UploadedProject;
+
+import java.util.List;
+
+
+public class ShareCodeCallback {
+    public void getGistBaseList(List<GistBase> gistList) {
+
+    }
+    public void getGistDetail(Gist gistList) {
+    }
+
+    public void getNewestCommit(Gist.HistoryBean gist) {
+    }
+
+    public void getMyGistList(List<GistBase> gistBase) {
+    }
+
+    public  void getMyBookMarkList(List<BookmarkerList> bookmarkerList) {
+    }
+
+    public void getCommentList(List<Gist.CommentBean> commentList) {
+
+    }
+
+    public void getProjectsFileList(List<UploadedProject> projectList) {
+
+    }
+
+    public void getScriptsFileList(List<CloudFile> cloudFiles) {
+
+    }
+
+    public void getUsage(int usage) {
+
+    }
+
+    public void getFileContent(String content) {
+
+    }
+
+    public void getUsageSpace(String usage) {
+
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/fragment/CodeFragment.java b/qpython/src/main/java/org/qpython/qpy/main/fragment/CodeFragment.java
new file mode 100644
index 00000000..de7d2e94
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/fragment/CodeFragment.java
@@ -0,0 +1,93 @@
+package org.qpython.qpy.main.fragment;
+
+
+import android.databinding.DataBindingUtil;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.support.v7.widget.LinearLayoutManager;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.codeshare.pojo.GistBase;
+import org.qpython.qpy.databinding.FragmentRvBinding;
+import org.qpython.qpy.main.adapter.CodeShareAdapter;
+
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+import rx.Observable;
+import rx.android.schedulers.AndroidSchedulers;
+import rx.functions.Action1;
+
+public class CodeFragment extends Fragment {
+    public static final  String PROGRAM    = "program";
+    public static final  String SCRIPT     = "script";
+    public static final  String MY_PROGRAM = "my_program";
+    public static final  String MY_SCRIPT  = "my_script";
+    private static final String TAG        = "TAG";
+    private FragmentRvBinding binding;
+    private String            tag;
+
+    public static CodeFragment newInstance(String tag) {
+        CodeFragment myFragment = new CodeFragment();
+
+        Bundle args = new Bundle();
+        args.putString(TAG, tag);
+        myFragment.setArguments(args);
+
+        return myFragment;
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        binding = DataBindingUtil.inflate(inflater, R.layout.fragment_rv, container, false);
+        return binding.getRoot();
+    }
+
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        tag = getArguments().getString(TAG, "");
+        initData();
+    }
+
+    private void initData() {
+        binding.progressBar.setVisibility(View.VISIBLE);
+        Action1<List<GistBase>> callback = gistList -> {
+            CodeShareAdapter adapter = new CodeShareAdapter(gistList, tag.equals(PROGRAM) || tag.equals(MY_PROGRAM));
+            binding.swipeList.setLayoutManager(new LinearLayoutManager(getActivity()));
+            binding.swipeList.setAdapter(adapter);
+            binding.progressBar.setVisibility(View.GONE);
+            binding.emptyHint.setVisibility(View.GONE);
+        };
+
+        // Dismiss progress bar and show empty msg if no data after 5 seconds
+        Observable.just(null)
+                .delay(5, TimeUnit.SECONDS)
+                .observeOn(AndroidSchedulers.mainThread())
+                .doOnNext(o -> {
+                    if (binding.progressBar.getVisibility() == View.VISIBLE) {
+                        binding.progressBar.setVisibility(View.GONE);
+                        binding.emptyHint.setVisibility(View.VISIBLE);
+                    }
+                })
+                .subscribe();
+
+        switch (tag) {
+            case PROGRAM:
+//                ShareCodeUtil.getInstance().getBaseProjectGistList(callback);
+                break;
+            case SCRIPT:
+//                ShareCodeUtil.getInstance().getBaseScriptGistList(callback);
+                break;
+            case MY_PROGRAM:
+                break;
+            case MY_SCRIPT:
+                break;
+        }
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/fragment/CourseFragment.java b/qpython/src/main/java/org/qpython/qpy/main/fragment/CourseFragment.java
new file mode 100644
index 00000000..457292d0
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/fragment/CourseFragment.java
@@ -0,0 +1,156 @@
+package org.qpython.qpy.main.fragment;
+
+
+import android.content.res.Resources;
+import android.databinding.DataBindingUtil;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.support.v7.widget.LinearLayoutManager;
+import android.util.TypedValue;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.databinding.FragmentCourseBinding;
+import org.qpython.qpy.main.adapter.CourseAdapter;
+import org.qpython.qpy.main.server.model.CourseModel;
+import org.qpython.qpy.main.widget.GridSpace;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+public class CourseFragment extends Fragment {
+
+    private FragmentCourseBinding binding;
+    private CourseAdapter         adapter;
+    private boolean               isTypeVisible;
+    private List<CourseModel> basic = new ArrayList<>(),
+            web                     = new ArrayList<>(),
+            aipy                    = new ArrayList<>(),
+            arvr                    = new ArrayList<>(),
+            other                   = new ArrayList<>(),
+            dataList                = new ArrayList<>();
+
+    public float dp2px(float dp) {
+        Resources r = Resources.getSystem();
+        return TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dp, r.getDisplayMetrics());
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.fragment_course, null);
+    }
+
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        binding = DataBindingUtil.bind(view);
+        adapter = new CourseAdapter(getActivity(), dataList);
+        binding.swipeList.setLayoutManager(new LinearLayoutManager(getContext()) {
+            @Override
+            public boolean canScrollVertically() {
+                return false;
+            }
+        });
+        binding.swipeList.addItemDecoration(new GridSpace(1, (int) dp2px(10), false));
+        binding.swipeList.setNestedScrollingEnabled(false);
+        binding.swipeList.setAdapter(adapter);
+        binding.typeLayout.setVisibility(isTypeVisible ? View.VISIBLE : View.GONE);
+        if (isTypeVisible) initTypeLayout();
+    }
+
+    public void setDataList(List<CourseModel> data) {
+        if (data.size() == 0) {
+            binding.emptyHint.setVisibility(View.VISIBLE);
+            return;
+        }
+        for (CourseModel datum : data) {
+            switch (datum.getType()) {
+                case "basic":
+                    basic.add(datum);
+                    break;
+                case "web":
+                    web.add(datum);
+                    break;
+                case "aipy":
+                    aipy.add(datum);
+                    break;
+                case "arvr":
+                    arvr.add(datum);
+                    break;
+                case "other":
+                    other.add(datum);
+                    break;
+                default:
+                    basic.add(datum);
+                    break;
+            }
+        }
+        dataList.addAll(basic);
+        if (adapter != null)
+            adapter.notifyDataSetChanged();
+    }
+
+    private int selectedIndex;
+
+    private void initTypeLayout() {
+        for (int i = 0; i < binding.typeLayout.getChildCount(); i++) {
+            int finalI = i;
+            binding.typeLayout.getChildAt(i).setOnClickListener(v -> {
+                if (finalI != selectedIndex) {
+                    updateSelected(finalI, true);
+                    updateSelected(selectedIndex, false);
+                    selectedIndex = finalI;
+                }
+            });
+        }
+    }
+
+    private void updateSelected(int index, boolean isLight) {
+        int res;
+        List<CourseModel> typeList;
+        switch (index) {
+            case 0:
+                res = isLight ? R.drawable.basics_light : R.drawable.basics;
+                typeList = basic;
+                break;
+            case 1:
+                res = isLight ? R.drawable.database_light : R.drawable.database;
+                typeList = other;
+                break;
+            case 2:
+                res = isLight ? R.drawable.arvr_light : R.drawable.arvr;
+                typeList = arvr;
+                break;
+            case 3:
+                res = isLight ? R.drawable.aipy_light : R.drawable.aipy;
+                typeList = aipy;
+                break;
+            case 4:
+                res = isLight ? R.drawable.web_light : R.drawable.web;
+                typeList = web;
+                break;
+            default:
+                res = 0;
+                typeList = basic;
+                break;
+        }
+        ((TextView) binding.typeLayout.getChildAt(index)).setTextColor(getResources().getColor(isLight ? R.color.theme_green : R.color.white));
+        ((TextView) binding.typeLayout.getChildAt(index)).setCompoundDrawablesWithIntrinsicBounds(0, res, 0, 0);
+
+        if (isLight) {
+            dataList.clear();
+            dataList.addAll(typeList);
+            adapter.notifyDataSetChanged();
+        }
+    }
+
+    public void setTypeVisible(boolean typeVisible) {
+        isTypeVisible = typeVisible;
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/fragment/FileFragment.java b/qpython/src/main/java/org/qpython/qpy/main/fragment/FileFragment.java
new file mode 100644
index 00000000..2e14b019
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/fragment/FileFragment.java
@@ -0,0 +1,205 @@
+package org.qpython.qpy.main.fragment;
+
+import android.databinding.DataBindingUtil;
+import android.graphics.Color;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.support.v7.app.AlertDialog;
+import android.support.v7.widget.LinearLayoutManager;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Toast;
+
+import com.quseit.util.FileHelper;
+import com.quseit.util.ImageUtil;
+import com.quseit.util.NAction;
+import com.yanzhenjie.recyclerview.swipe.SwipeMenuCreator;
+import com.yanzhenjie.recyclerview.swipe.SwipeMenuItem;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.databinding.FragmentRefreshRvBinding;
+import org.qpython.qpy.texteditor.TedLocalActivity;
+import org.qpython.qpy.texteditor.ui.adapter.FolderAdapter;
+import org.qpython.qpy.texteditor.ui.adapter.bean.FolderBean;
+import org.qpython.qpy.texteditor.ui.view.EnterDialog;
+import org.qpython.qpysdk.QPyConstants;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+public class FileFragment extends Fragment {
+    private int WIDTH = (int) ImageUtil.dp2px(60);
+
+    private FragmentRefreshRvBinding binding;
+
+    private static final String TYPE    = "type";
+    public static final  String PROJECT = "projects";
+    public static final  String SCRIPT  = "scripts";
+
+    public static final  String PROJECT3 = "projects3";
+    public static final  String SCRIPT3  = "scripts3";
+
+    private static final String PROJECT_PATH = QPyConstants.ABSOLUTE_PATH + "/" + PROJECT;
+    private static final String SCRIPT_PATH  = QPyConstants.ABSOLUTE_PATH + "/" + SCRIPT;
+
+    private static final String PROJECT_PATH3 = QPyConstants.ABSOLUTE_PATH + "/" + PROJECT3;
+    private static final String SCRIPT_PATH3  = QPyConstants.ABSOLUTE_PATH + "/" + SCRIPT3;
+
+    private FolderAdapter    adapter;
+    private List<FolderBean> dataList;
+    private String           curPath;
+
+    public static FileFragment newInstance(String type) {
+        FileFragment myFragment = new FileFragment();
+
+        Bundle args = new Bundle();
+        args.putString(TYPE, type);
+        myFragment.setArguments(args);
+
+        return myFragment;
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        dataList = new ArrayList<>();
+        adapter = new FolderAdapter(dataList, false);
+        adapter.setClickListener(new FolderAdapter.Click() {
+            @Override
+            public void onItemClick(int position) {
+                switch (dataList.get(position).getFolder()) {
+                    case PROJECT:
+                        ((TedLocalActivity) getActivity()).finishForOpen(dataList.get(position).getPath(), true);
+                        break;
+                    case SCRIPT:
+                        ((TedLocalActivity) getActivity()).finishForOpen(dataList.get(position).getPath(), false);
+                        break;
+                }
+            }
+
+            @Override
+            public void onLongClick(int position) {
+
+            }
+        });
+        return inflater.inflate(R.layout.fragment_refresh_rv, null);
+    }
+
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        binding = DataBindingUtil.bind(view);
+        boolean isQPy = NAction.isQPy3(getContext());
+        initView();
+        initListener();
+        String type = getArguments().getString(TYPE);
+        switch (type != null ? type : SCRIPT) {
+            case SCRIPT:
+                curPath = isQPy?SCRIPT_PATH3:SCRIPT_PATH;
+                break;
+            case PROJECT:
+                curPath = isQPy?PROJECT_PATH3:PROJECT_PATH;
+                break;
+        }
+
+        File[] files = new File(curPath).listFiles();
+        boolean skip = false;
+        if (files != null){
+            for (File file : files) {
+                skip = true;
+                if (!file.getName().startsWith("."))
+                    if (type == SCRIPT) {
+                        if (file.isFile()) {
+                            skip = false;
+                        }
+                    } else {
+                        if (file.isDirectory()) {
+                            if (new File(file.getAbsoluteFile()+"/main.py").exists()) {
+                                skip = false;
+
+                            }
+                        }
+
+                    }
+                    if (!skip) {
+                        dataList.add(new FolderBean(file));
+                    }
+            }
+        }
+        Collections.sort(dataList, (FolderBean o1, FolderBean o2) -> {
+            String o1Up = o1.getName().toUpperCase();
+            String o2Up = o2.getName().toUpperCase();
+            return o1Up.compareTo(o2Up);
+        });
+        adapter.notifyDataSetChanged();
+    }
+
+    private void initView() {
+        binding.progressBar.setVisibility(View.GONE);
+
+        SwipeMenuCreator swipeMenuCreator = (leftMenu, rightMenu, viewType) -> {
+            SwipeMenuItem renameItem = new SwipeMenuItem(getContext())
+                    .setBackgroundColor(Color.parseColor("#FF4BAC07"))
+                    .setImage(R.drawable.ic_file_rename)
+                    .setHeight(ViewGroup.LayoutParams.MATCH_PARENT)
+                    .setWidth(WIDTH);
+
+            SwipeMenuItem deleteItem = new SwipeMenuItem(getContext())
+                    .setBackgroundColor(Color.parseColor("#FFD14136"))
+                    .setImage(R.drawable.ic_editor_filetree_close)
+                    .setHeight(ViewGroup.LayoutParams.MATCH_PARENT)
+                    .setWidth(WIDTH);
+            rightMenu.addMenuItem(renameItem);
+            rightMenu.addMenuItem(deleteItem);
+        };
+
+        binding.swipeList.setLayoutManager(new LinearLayoutManager(getContext()));
+        binding.swipeList.setSwipeMenuCreator(swipeMenuCreator);
+    }
+
+    private void initListener() {
+        binding.swipeList.setSwipeMenuItemClickListener(menuBridge -> {
+            menuBridge.closeMenu();
+            switch (menuBridge.getPosition()) {
+                case 0:
+                    // rename
+                    new EnterDialog(getContext())
+                            .setTitle(getString(R.string.rename))
+                            .setConfirmListener(name -> {
+                                File oldFile = dataList.get(menuBridge.getAdapterPosition()).getFile();
+                                File newFile = new File(oldFile.getParent(), name);
+                                boolean renameSuc = oldFile.renameTo(newFile);
+                                if (renameSuc) {
+                                    dataList.set(menuBridge.getAdapterPosition(), new FolderBean(newFile));
+                                    adapter.notifyItemChanged(menuBridge.getAdapterPosition());
+                                    return true;
+                                } else {
+                                    Toast.makeText(getActivity(), R.string.rename_fail, Toast.LENGTH_SHORT).show();
+                                    return false;
+                                }
+                            })
+                            .setText(dataList.get(menuBridge.getAdapterPosition()).getName())
+                            .show();
+                    break;
+                case 1:
+                    // delete
+                    AlertDialog.Builder builder = new AlertDialog.Builder(getActivity(), R.style.MyDialog);
+                    builder.setTitle(R.string.warning)
+                            .setMessage(R.string.delete_file_hint)
+                            .setNegativeButton(R.string.no, null)
+                            .setPositiveButton(R.string.yes, (dialog, which) -> {
+                                FileHelper.clearDir(dataList.get(menuBridge.getAdapterPosition()).getFile().getAbsolutePath(), 0, true);
+                                dataList.remove(menuBridge.getAdapterPosition());
+                                adapter.notifyItemRemoved(menuBridge.getAdapterPosition());
+                            })
+                            .show();
+                    break;
+            }
+        });
+        binding.swipeList.setAdapter(adapter);
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/fragment/GistFragment.java b/qpython/src/main/java/org/qpython/qpy/main/fragment/GistFragment.java
new file mode 100644
index 00000000..6951bd13
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/fragment/GistFragment.java
@@ -0,0 +1,107 @@
+package org.qpython.qpy.main.fragment;
+
+import android.content.Context;
+import android.databinding.DataBindingUtil;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.support.v7.widget.LinearLayoutManager;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.qpython.qpy.R;
+import org.qpython.qpy.databinding.FragmentRvBinding;
+import org.qpython.qpy.main.activity.GistActivity;
+import org.qpython.qpy.main.adapter.GistAdapter;
+import org.qpython.qpy.main.server.gist.GistEvent;
+import org.qpython.qpy.main.server.gist.response.GistBean;
+
+import java.util.List;
+
+import static org.qpython.qpy.main.server.gist.GistEvent.ADD_COMMENT;
+import static org.qpython.qpy.main.server.gist.GistEvent.DELETE_SUC;
+import static org.qpython.qpy.main.server.gist.GistEvent.FAVORITE;
+import static org.qpython.qpy.main.server.gist.GistEvent.UNFAVORITE;
+import static org.qpython.qpy.main.server.gist.GistEvent.UPDATE_GIST_SUC;
+
+/**
+ * Created by Hmei
+ * 2018/4/17.
+ */
+
+public class GistFragment extends Fragment {
+    private FragmentRvBinding binding;
+    private GistAdapter       adapter;
+    private GistActivity      activity;
+
+
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        activity = (GistActivity) context;
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        EventBus.getDefault().register(this);
+        return inflater.inflate(R.layout.fragment_rv, null);
+    }
+
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        binding = DataBindingUtil.bind(view);
+        adapter = new GistAdapter(getContext());
+        binding.swipeList.setLayoutManager(new LinearLayoutManager(getContext()) {
+            @Override
+            public boolean canScrollVertically() {
+                return false;
+            }
+        });
+        binding.swipeList.setNestedScrollingEnabled(false);
+        binding.swipeList.setAdapter(adapter);
+    }
+
+    @Subscribe
+    public void onEvent(GistEvent gistEvent) {
+        String event = gistEvent.name;
+        switch (event) {
+            case DELETE_SUC:
+                adapter.delete(gistEvent.content);
+                break;
+            case UNFAVORITE:
+                adapter.addFav(gistEvent.content, false);
+                break;
+            case FAVORITE:
+                adapter.addFav(gistEvent.content, true);
+                break;
+            case ADD_COMMENT:
+                adapter.addCommentNum(gistEvent.content);
+                break;
+            case UPDATE_GIST_SUC:
+                activity.getData();
+                break;
+        }
+    }
+
+    public void setDataList(List<GistBean> data) {
+        if (data.size() == 0) {
+            binding.emptyHint.setVisibility(View.VISIBLE);
+            return;
+        }
+        if (adapter != null) {
+            adapter.setData(data);
+            adapter.notifyDataSetChanged();
+        }
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        EventBus.getDefault().unregister(this);
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/fragment/LibAIPyFragment.java b/qpython/src/main/java/org/qpython/qpy/main/fragment/LibAIPyFragment.java
new file mode 100644
index 00000000..82edef36
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/fragment/LibAIPyFragment.java
@@ -0,0 +1,126 @@
+package org.qpython.qpy.main.fragment;
+
+
+import android.content.pm.PackageManager;
+import android.databinding.DataBindingUtil;
+import android.os.Bundle;
+import android.preference.PreferenceManager;
+import android.support.annotation.Nullable;
+import android.support.v7.widget.LinearLayoutManager;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.quseit.util.ACache;
+import com.quseit.util.NAction;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.databinding.FragmentRefreshRvBinding;
+import org.qpython.qpy.main.adapter.LibListAdapter;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.server.CacheKey;
+import org.qpython.qpy.main.server.model.BaseLibModel;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
+import rx.Subscriber;
+
+public class LibAIPyFragment extends RefreshFragment {
+
+    private LibListAdapter<BaseLibModel> adapter;
+    private FragmentRefreshRvBinding     binding;
+
+    private List<BaseLibModel> dataList;
+    private boolean            isSaverOn;
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.fragment_refresh_rv, null);
+    }
+
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        binding = DataBindingUtil.bind(view);
+        binding.progressBar.setVisibility(View.GONE);
+        dataList = new ArrayList<>();
+        isSaverOn = PreferenceManager.getDefaultSharedPreferences(getContext()).getBoolean(getString(R.string.key_saver), true);
+        binding.netError.setVisibility(View.GONE);
+        adapter = new LibListAdapter<>(dataList);
+        initList();
+        refresh(!isSaverOn);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        if (adapter == null) {
+            adapter = new LibListAdapter<>(dataList);
+            initList();
+            refresh(!isSaverOn);
+        }
+        //在下载完库之后刷新数据
+        else if (installPosition != -1) {
+            refresh(!isSaverOn);
+            //将其还原防止重复刷新
+            installPosition = -1;
+        }
+    }
+
+
+    private void initList() {
+        binding.swipeList.setLayoutManager(new LinearLayoutManager(getContext()));
+        binding.swipeList.setSwipeMenuCreator(getTypeMenu());
+
+//        if (isAIPyInstall()) {
+//            View description = getActivity().getLayoutInflater().inflate(R.layout.header_lib_description, binding.swipeList, false);
+//            binding.swipeList.addHeaderView(description);
+//        }
+
+        if (adapter != null) {
+            adapter.setClick(position -> binding.swipeList.smoothOpenRightMenu(position));
+            binding.swipeList.setSwipeMenuItemClickListener(getListener(dataList, adapter));
+            binding.swipeList.setAdapter(adapter);
+            adapter.notifyDataSetChanged();
+        }
+    }
+
+
+    @Override
+    public void refresh(boolean forceRefresh) {
+        binding.netError.setVisibility(View.GONE);
+        dataList.clear();
+        adapter.notifyDataSetChanged();
+        binding.progressBar.setVisibility(View.VISIBLE);
+        App.getService().getAIPyList(NAction.isQPy3(getActivity()),forceRefresh, new Subscriber<List<BaseLibModel>>() {
+            @Override
+            public void onCompleted() {
+                binding.swipeList.setVisibility(View.VISIBLE);
+                binding.progressBar.setVisibility(View.GONE);
+            }
+
+            @Override
+            public void onError(Throwable e) {
+                binding.swipeList.setVisibility(View.GONE);
+                binding.progressBar.setVisibility(View.GONE);
+                binding.netError.setVisibility(View.VISIBLE);
+            }
+
+            @Override
+            public void onNext(List<BaseLibModel> o) {
+                for (BaseLibModel lib : o) {
+                    if (new File(getDownloadPath(lib.getTmodule())).exists()) {
+                        lib.setInstalled(true);
+                    }
+                }
+                ACache.get(getContext()).put(CacheKey.AIPY, tostring(o));
+                dataList.addAll(o);
+                adapter.notifyDataSetChanged();
+            }
+        });
+    }
+
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/fragment/LibProjectFragment.java b/qpython/src/main/java/org/qpython/qpy/main/fragment/LibProjectFragment.java
new file mode 100644
index 00000000..d83dc827
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/fragment/LibProjectFragment.java
@@ -0,0 +1,320 @@
+package org.qpython.qpy.main.fragment;
+
+import android.os.Environment;
+import android.preference.PreferenceManager;
+import android.support.v7.app.AlertDialog;
+import android.content.Intent;
+import android.databinding.DataBindingUtil;
+import android.graphics.Color;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.widget.LinearLayoutManager;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import com.quseit.common.updater.downloader.Downloader;
+import com.quseit.util.ACache;
+import com.quseit.util.ImageUtil;
+import com.quseit.util.NAction;
+import com.quseit.util.NetStateUtil;
+import com.yanzhenjie.recyclerview.swipe.SwipeMenuCreator;
+import com.yanzhenjie.recyclerview.swipe.SwipeMenuItem;
+
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
+import org.qpython.qpy.R;
+import org.qpython.qpy.console.ScriptExec;
+import org.qpython.qpy.console.TermActivity;
+import org.qpython.qpy.databinding.FragmentRefreshRvBinding;
+import org.qpython.qpy.main.adapter.LibListAdapter;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.app.CONF;
+import org.qpython.qpy.main.server.CacheKey;
+import org.qpython.qpy.main.server.MySubscriber;
+import org.qpython.qpy.main.server.model.LibModel;
+import org.qpython.qpy.main.utils.Utils;
+import org.qpython.qpysdk.QPyConstants;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Lib/Component list Fragment
+ * Created by Hmei on 2017-05-27.
+ */
+
+public class LibProjectFragment extends RefreshFragment {
+    private static final int    SCRIPT_CONSOLE_CODE = 1237;
+    private static  String SCRIPT_DIR;       //   = QPyConstants.ABSOLUTE_PATH + "/" + QPyConstants.DFROM_QPY2 + "/";
+    private static  String PROJECT_DIR;      //  = QPyConstants.ABSOLUTE_PATH + "/" + QPyConstants.DFROM_PRJ2 + "/";
+
+    private List<LibModel>           dataList;
+    private LibListAdapter<LibModel> adapter;
+    private FragmentRefreshRvBinding binding;
+    private TextView                 header;
+
+    private int WIDTH = (int) ImageUtil.dp2px(60);
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        EventBus.getDefault().register(this);
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.fragment_refresh_rv, null);
+    }
+
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        binding = DataBindingUtil.bind(view);
+
+        SCRIPT_DIR = QPyConstants.ABSOLUTE_PATH + "/" + (NAction.isQPy3(getActivity())?QPyConstants.DFROM_QPY3:QPyConstants.DFROM_QPY2) +"/";
+        PROJECT_DIR = QPyConstants.ABSOLUTE_PATH + "/" + (NAction.isQPy3(getActivity())?QPyConstants.DFROM_PRJ3:QPyConstants.DFROM_PRJ2) +"/";
+
+        initDataList();
+        initView();
+        initListener();
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        EventBus.getDefault().unregister(this);
+    }
+
+    private void initDataList() {
+        boolean isSaverOn = PreferenceManager.getDefaultSharedPreferences(getContext()).getBoolean(getString(R.string.key_saver), true);
+        dataList = new ArrayList<>();
+        adapter = new LibListAdapter<>(dataList);
+        refresh(!isSaverOn);
+    }
+
+    @Override
+    public void refresh(boolean forceRefresh) {
+        dataList.clear();
+        adapter.notifyDataSetChanged();
+        binding.netError.setVisibility(View.GONE);
+        binding.progressBar.setVisibility(View.VISIBLE);
+        App.getService().getLibs(forceRefresh, new MySubscriber<List<LibModel>>() {
+            @Override
+            public void onCompleted() {
+                binding.progressBar.setVisibility(View.GONE);
+                binding.swipeList.setVisibility(View.VISIBLE);
+                if (header != null) {
+                    header.setText(getString(R.string.last_refresh, ACache.get(getContext()).getAsString(CacheKey.LIB_LAST_REFRESH)));
+                }
+            }
+
+            @Override
+            public void onError(Throwable e) {
+                binding.swipeList.setVisibility(View.GONE);
+                binding.progressBar.setVisibility(View.GONE);
+                binding.netError.setVisibility(View.VISIBLE);
+            }
+
+            @Override
+            public void onNext(List<LibModel> libModels) {
+                for (LibModel lib : libModels) {
+                    if (new File(SCRIPT_DIR + lib.getSmodule()).exists() || new File(PROJECT_DIR + lib.getSmodule()).exists()) {
+                        lib.setInstalled(true);
+                    }
+                }
+                ACache.get(getContext()).put(CacheKey.LIB, tostring(libModels));
+                dataList.addAll(libModels);
+                adapter.notifyDataSetChanged();
+            }
+        });
+    }
+
+    private void initView() {
+        binding.swipeList.setLayoutManager(new LinearLayoutManager(getContext()));
+        binding.swipeList.setSwipeMenuCreator(getMenu());
+
+        View installView = getActivity().getLayoutInflater().inflate(R.layout.header_lib_install, binding.swipeList, false);
+        installView.setOnClickListener(v -> {
+            if (NetStateUtil.isConnected(getContext())) {
+                openPip();
+            } else {
+                Toast.makeText(getContext(), R.string.pip_no_net, Toast.LENGTH_SHORT).show();
+            }
+        });
+        binding.swipeList.addHeaderView(installView);
+
+        binding.progressBar.getIndeterminateDrawable().setColorFilter(0xFF4BAC07, android.graphics.PorterDuff.Mode.MULTIPLY);
+    }
+
+    private void openPip() {
+        File pip = new File(getContext().getApplicationContext().getFilesDir() + "/bin/qpypi.py");
+        if (pip.exists()) {
+            String[] args = {getContext().getApplicationContext().getFilesDir() + "/bin/qpypi.py", getContext().getApplicationContext().getFilesDir().toString()};
+            Intent intent = new Intent(getContext(), TermActivity.class);
+            intent.putExtra(TermActivity.ARGS, args);
+            startActivity(intent);
+        }
+    }
+    private SwipeMenuCreator getMenu() {
+        SwipeMenuItem detail = new SwipeMenuItem(getContext())
+                .setBackgroundColor(Color.parseColor("#FF4A4A4A"))
+                .setImage(R.drawable.ic_library_detail)
+                .setHeight(ViewGroup.LayoutParams.MATCH_PARENT)
+                .setWidth(WIDTH);
+
+        return (swipeLeftMenu, swipeRightMenu, viewType) -> {
+            switch (viewType) {
+                case LibListAdapter.INSTALLED:
+                    SwipeMenuItem reInstall = new SwipeMenuItem(getContext())
+                            .setBackgroundColor(Color.parseColor("#FF595959"))
+                            .setImage(R.drawable.ic_library_run)
+                            .setHeight(ViewGroup.LayoutParams.MATCH_PARENT)
+                            .setWidth(WIDTH);
+
+                    SwipeMenuItem delete = new SwipeMenuItem(getContext())
+                            .setBackgroundColor(Color.parseColor("#FFD2483D"))
+                            .setImage(R.drawable.ic_library_delete)
+                            .setHeight(ViewGroup.LayoutParams.MATCH_PARENT)
+                            .setWidth(WIDTH);
+
+                    swipeRightMenu.addMenuItem(reInstall);
+                    swipeRightMenu.addMenuItem(detail);
+                    swipeRightMenu.addMenuItem(delete);
+                    break;
+                case LibListAdapter.UN_INSTALLED:
+                    SwipeMenuItem download = new SwipeMenuItem(getContext())
+                            .setBackgroundColor(Color.parseColor("#FFECCD00"))
+                            .setImage(R.drawable.ic_library_download)
+                            .setHeight(ViewGroup.LayoutParams.MATCH_PARENT)
+                            .setWidth(WIDTH);
+                    swipeRightMenu.addMenuItem(detail);
+                    swipeRightMenu.addMenuItem(download);
+                    break;
+            }
+        };
+    }
+
+
+
+    private void installTool(LibModel item) {
+        String downloadDir = null;
+        if (item.getCat().equals("script")) {
+            downloadDir = "qpython/"+(NAction.isQPy3(getActivity())?QPyConstants.DFROM_QPY3:QPyConstants.DFROM_QPY2);
+        } else if (item.getCat().equals("user")) {
+            downloadDir = "qpython/"+(NAction.isQPy3(getActivity())?QPyConstants.DFROM_QPY3:QPyConstants.DFROM_QPY2);
+        }
+
+        // Download
+        App.getDownloader().download(item.getTitle(),  item.getLink(), Environment.getExternalStorageDirectory()+"/"+downloadDir+"/"+item.getSmodule(),
+        new Downloader.Callback() {
+            @Override
+            public void pending(String name) {
+
+            }
+
+            @Override
+            public void complete(String name, File installer) {
+                refresh(true);
+            }
+
+            @Override
+            public void error(String err) {
+
+            }
+        });
+    }
+
+    private void initListener() {
+        adapter.setClick(position -> binding.swipeList.smoothOpenRightMenu(position));
+        binding.swipeList.setSwipeMenuItemClickListener(menuBridge -> {
+            menuBridge.closeMenu();
+            LibModel item = dataList.get(menuBridge.getAdapterPosition());
+            if (!dataList.get(menuBridge.getAdapterPosition()).isInstalled()) {
+                // UN INSTALL
+                switch (menuBridge.getPosition()) {
+                    case 0:
+                        // detail
+                        if (item.getSrc().equals("")) {
+                            AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
+                            AlertDialog alertDialog = builder.setTitle(R.string.location)
+                                    .setMessage(CONF.qpypiPath() + "/" + item.getTitle())
+                                    .setPositiveButton(R.string.confirm, null)
+                                    .create();
+                            alertDialog.show();
+                        } else {
+                            Utils.startWebActivityWithUrl(getActivity(), item.getTitle(), item.getSrc());
+
+                        }
+                        break;
+                    case 1:
+                        // download
+                        installTool(item);
+                        break;
+                }
+            } else {
+                // INSTALLED
+                switch (menuBridge.getPosition()) {
+                    case 0:
+                        // run
+                        String path = "";
+                        if (item.getCat().equals("script")) {
+                            path = SCRIPT_DIR + dataList.get(menuBridge.getAdapterPosition()).getSmodule();
+                        } else if (item.getCat().equals("user")) {
+                            path = PROJECT_DIR + dataList.get(menuBridge.getAdapterPosition()).getSmodule();
+                        }
+                        ScriptExec.getInstance().playScript(getContext(), path, "", true);
+                        break;
+                    case 1:
+                        // detail
+                        if (item.getSrc().equals("")) {
+                            AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
+                            AlertDialog alertDialog = builder.setTitle(R.string.location)
+                                    .setMessage(CONF.qpypiPath() + "/" + item.getTitle())
+                                    .setPositiveButton(R.string.confirm, null)
+                                    .create();
+                            alertDialog.show();
+                        } else {
+                            Utils.startWebActivityWithUrl(getActivity(), item.getTitle(), item.getSrc());
+
+                        }
+                        break;
+                    case 2:
+                        if (new File(SCRIPT_DIR + "/" + item.getSmodule()).delete()) {
+                            dataList.get(menuBridge.getAdapterPosition()).setInstalled(false);
+                            adapter.notifyItemChanged(menuBridge.getAdapterPosition());
+                        } else {
+                            Toast.makeText(getContext(), R.string.delete_fail, Toast.LENGTH_SHORT).show();
+                        }
+                        break;
+                }
+            }
+        });
+        binding.swipeList.setAdapter(adapter);
+    }
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onMessageEvent(CreateLibFinishEvent event) {
+        for (LibModel libModel : dataList) {
+            if (libModel.getSmodule().equals(event.fileName)) {
+                libModel.setInstalled(true);
+                adapter.notifyDataSetChanged();
+            }
+        }
+    }
+
+    public void execPyInConsole(String[] args) {
+        Intent intent = new Intent(getContext(), TermActivity.class);
+        intent.putExtra("PYTHONARGS", args);
+        startActivityForResult(intent, SCRIPT_CONSOLE_CODE);
+    }
+
+    public static class CreateLibFinishEvent {
+        public String fileName;
+    }
+}
\ No newline at end of file
diff --git a/qpython/src/main/java/org/qpython/qpy/main/fragment/LibQPyPiFragment.java b/qpython/src/main/java/org/qpython/qpy/main/fragment/LibQPyPiFragment.java
new file mode 100644
index 00000000..c91bd4e1
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/fragment/LibQPyPiFragment.java
@@ -0,0 +1,169 @@
+package org.qpython.qpy.main.fragment;
+
+import android.databinding.DataBindingUtil;
+import android.os.Bundle;
+import android.preference.PreferenceManager;
+import android.support.annotation.Nullable;
+import android.support.v7.widget.LinearLayoutManager;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import com.quseit.util.ACache;
+
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
+import org.qpython.qpy.R;
+import org.qpython.qpy.databinding.FragmentQpyPiBinding;
+import org.qpython.qpy.main.adapter.LibListAdapter;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.server.CacheKey;
+import org.qpython.qpy.main.server.MySubscriber;
+import org.qpython.qpy.main.server.model.QpypiModel;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
+
+/**
+ * Nested fragments only available after API 17,
+ * of course it can be work around but .. ha ha
+ * <p>
+ * Created by Hmei on 2017-06-07.
+ */
+
+public class LibQPyPiFragment extends RefreshFragment {
+
+    private List<QpypiModel>     dataList;
+    private LibListAdapter       adapter;
+    private FragmentQpyPiBinding binding;
+    private TextView             header;
+    private boolean              isSaverOn;
+    private final String         TAG = "LibQPyPiFragment";
+
+    @Override
+    public void onResume() {
+        super.onResume();
+//        if (installPosition != -1 && new File(getDownloadPath(
+//                dataList.get(installPosition).getSmodule(),
+//                dataList.get(installPosition).getVer()))
+//                .exists()) {
+//            dataList.get(installPosition).setInstalled(true);
+//            adapter.notifyItemChanged(installPosition);
+//        }
+        //在下载完库之后刷新数据
+        if (installPosition != -1 && adapter!=null){
+            refresh(!isSaverOn);
+            //将其还原防止重复刷新
+            installPosition = -1;
+        }
+        EventBus.getDefault().register(this);
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) {
+        binding = DataBindingUtil.inflate(inflater, R.layout.fragment_qpy_pi, container, false);
+        return binding.getRoot();
+    }
+
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        initDataList();
+        initView();
+        initListener();
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        EventBus.getDefault().unregister(this);
+    }
+
+    private void initDataList() {
+        Log.d(TAG, "initDataList");
+        isSaverOn = PreferenceManager.getDefaultSharedPreferences(getContext()).getBoolean(getString(R.string.key_saver), true);
+        dataList = new ArrayList<>();
+        adapter = new LibListAdapter<>(dataList);
+        refresh(!isSaverOn);
+    }
+
+    @Override
+    public void refresh(boolean forceRefresh) {
+        Log.d(TAG, "refresh:"+forceRefresh);
+        dataList.clear();
+        binding.progressBar.setVisibility(View.VISIBLE);
+        binding.netError.setVisibility(View.GONE);
+        adapter.notifyDataSetChanged();
+        App.getService().getQPyPi(forceRefresh, new MySubscriber<List<QpypiModel>>() {
+            @Override
+            public void onCompleted() {
+                binding.progressBar.setVisibility(View.GONE);
+                binding.swipeList.setVisibility(View.VISIBLE);
+                if (header != null) {
+                    header.setText(getString(R.string.last_refresh, ACache.get(getContext()).getAsString(CacheKey.QPYPI_LAST_REFRESH)));
+                }
+            }
+
+            @Override
+            public void onError(Throwable e) {
+                binding.progressBar.setVisibility(View.GONE);
+                binding.swipeList.setVisibility(View.GONE);
+                binding.netError.setVisibility(View.VISIBLE);
+            }
+
+            @Override
+            public void onNext(List<QpypiModel> libModels) {
+                String f;
+                for (QpypiModel lib : libModels) {
+                    f = getDownloadPath(lib.getTmodule());
+                    Log.d(TAG, "onNext:"+f);
+
+                    if (new File(f).exists()) {
+                        lib.setInstalled(true);
+                    }
+                }
+                ACache.get(getContext()).put(CacheKey.QPYPI, tostring(libModels));
+                dataList.addAll(libModels);
+                adapter.notifyDataSetChanged();
+            }
+        });
+    }
+
+    private void initView() {
+        binding.swipeList.setLayoutManager(new LinearLayoutManager(getContext()));
+        binding.swipeList.setSwipeMenuCreator(getTypeMenu());
+        binding.swipeList.setFocusable(false);
+
+//        String last_update = ACache.get(getContext()).getAsString(CacheKey.QPYPI_LAST_REFRESH);
+//        if (isSaverOn && last_update != null && !last_update.isEmpty()) {
+//            header = (TextView) getActivity().getLayoutInflater().inflate(R.layout.header_last_refresh_time, binding.swipeList, false);
+//            header.setText(getString(R.string.last_refresh, last_update));
+//            binding.swipeList.addHeaderView(header);
+//        }
+
+    }
+
+    private void initListener() {
+        adapter.setClick(position -> binding.swipeList.smoothOpenRightMenu(position));
+        binding.swipeList.setSwipeMenuItemClickListener(getListener(dataList, adapter));
+        binding.swipeList.setAdapter(adapter);
+    }
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onMessageEvent(LibProjectFragment.CreateLibFinishEvent event) {
+        for (QpypiModel libModel : dataList) {
+            if (libModel.getTitle().equals(event.fileName)) {
+                libModel.setInstalled(true);
+                adapter.notifyDataSetChanged();
+            }
+        }
+    }
+
+
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/fragment/LocalFragment.java b/qpython/src/main/java/org/qpython/qpy/main/fragment/LocalFragment.java
new file mode 100644
index 00000000..e017fd57
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/fragment/LocalFragment.java
@@ -0,0 +1,58 @@
+package org.qpython.qpy.main.fragment;
+
+import android.databinding.DataBindingUtil;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.design.widget.TabLayout;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.databinding.FragmentLocalBinding;
+import org.qpython.qpy.main.adapter.StatePagerAdapter;
+
+
+public class LocalFragment extends Fragment {
+    private FragmentLocalBinding binding;
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.fragment_local, null);
+    }
+
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        binding = DataBindingUtil.bind(view);
+        binding.tabs.addTab(binding.tabs.newTab().setText(R.string.project));
+        binding.tabs.addTab(binding.tabs.newTab().setText(R.string.script));
+        binding.tabs.setTabGravity(TabLayout.GRAVITY_FILL);
+        binding.tabs.setTabTextColors(getResources().getColor(R.color.white), getResources().getColor(R.color.colorAccent));
+        binding.tabs.setSelectedTabIndicatorColor(getResources().getColor(R.color.colorAccent));
+        StatePagerAdapter adapter = new StatePagerAdapter(getActivity().getSupportFragmentManager(), binding.tabs.getTabCount());
+        binding.vp.setAdapter(adapter);
+        initListener();
+    }
+
+
+    public void initListener() {
+        binding.vp.addOnPageChangeListener(new TabLayout.TabLayoutOnPageChangeListener(binding.tabs));
+        binding.tabs.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
+            @Override
+            public void onTabSelected(TabLayout.Tab tab) {
+                binding.vp.setCurrentItem(tab.getPosition());
+            }
+
+            @Override
+            public void onTabUnselected(TabLayout.Tab tab) {
+            }
+
+            @Override
+            public void onTabReselected(TabLayout.Tab tab) {
+            }
+        });
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/fragment/MyCourseFragment.java b/qpython/src/main/java/org/qpython/qpy/main/fragment/MyCourseFragment.java
new file mode 100644
index 00000000..2d90b0a0
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/fragment/MyCourseFragment.java
@@ -0,0 +1,191 @@
+package org.qpython.qpy.main.fragment;
+
+
+import android.content.Intent;
+import android.content.res.Resources;
+import android.databinding.DataBindingUtil;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.support.v7.widget.LinearLayoutManager;
+import android.util.TypedValue;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.qpython.qpy.R;
+import org.qpython.qpy.databinding.FragmentMyCourseBinding;
+import org.qpython.qpy.main.activity.CourseActivity;
+import org.qpython.qpy.main.activity.SignInActivity;
+import org.qpython.qpy.main.adapter.MyCourseAdapter;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.server.MySubscriber;
+import org.qpython.qpy.main.server.model.CourseModel;
+import org.qpython.qpy.main.server.model.MyCourse;
+import org.qpython.qpy.main.widget.GridSpace;
+
+import java.util.ArrayList;
+
+
+public class MyCourseFragment extends Fragment {
+    public static final int REQUEST_CODE = 4803;
+    private FragmentMyCourseBinding binding;
+    private MyCourseAdapter         adapter;
+    private ArrayList<MyCourse.DataBean> dataList = new ArrayList<>();
+    private boolean init;
+
+    public float dp2px(float dp) {
+        Resources r = Resources.getSystem();
+        return TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dp, r.getDisplayMetrics());
+    }
+
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        EventBus.getDefault().register(this);
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.fragment_my_course, null);
+    }
+
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        binding = DataBindingUtil.bind(view);
+        binding.explore.setOnClickListener(v -> ((CourseActivity) getActivity()).switchToFeature());
+        getDataList();
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        if (/*!init && */App.getUser() != null) {
+            getDataList();
+        }
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        EventBus.getDefault().unregister(this);
+    }
+
+    @Subscribe
+    public void needRefresh(boolean needRefresh) {
+        if (needRefresh) {
+            getDataList();
+        }
+    }
+
+    public void getDataList() {
+        if (App.getUser() != null) {
+            init = true;
+            binding.pb.setVisibility(View.VISIBLE);
+            App.getService().getMyCourse(App.getUser().getEmail(), new MySubscriber<MyCourse>() {
+                @Override
+                public void onNext(MyCourse o) {
+                    super.onNext(o);
+                    if (adapter == null) {
+                        adapter = new MyCourseAdapter(getActivity(), dataList);
+                        binding.swipeList.setLayoutManager(new LinearLayoutManager(getContext()) {
+                            @Override
+                            public boolean canScrollVertically() {
+                                return false;
+                            }
+                        });
+                        binding.swipeList.addItemDecoration(new GridSpace(1, (int) dp2px(10), false));
+                        binding.swipeList.setNestedScrollingEnabled(false);
+                        binding.swipeList.setAdapter(adapter);
+                    }
+                    dataList.clear();
+                    binding.pb.setVisibility(View.GONE);
+                    for (MyCourse.DataBean dataBean : o.getData()) {
+                        if (!"notready".equals(dataBean.getType())) {
+                            dataList.add(dataBean);
+                        }
+                    }
+//                    debugAddFakeData();
+                    if (dataList.size() == 0) {
+                        binding.emptyHint.setVisibility(View.VISIBLE);
+                        binding.explore.setVisibility(View.VISIBLE);
+                        binding.explore.setText(R.string.explore_course);
+                        binding.explore.setOnClickListener(v -> ((CourseActivity) getActivity()).switchToFeature());
+                    } else {
+                        binding.emptyHint.setVisibility(View.GONE);
+                        binding.explore.setVisibility(View.GONE);
+                        adapter.notifyDataSetChanged();
+                    }
+                }
+
+                @Override
+                public void onError(Throwable e) {
+                    binding.pb.setVisibility(View.GONE);
+                }
+            });
+        } else {
+            init = false;
+            binding.explore.setText(R.string.login_now);
+            binding.explore.setOnClickListener(v -> getActivity().
+                    startActivityForResult(new Intent(getActivity(), SignInActivity.class), REQUEST_CODE));
+            binding.explore.setVisibility(View.VISIBLE);
+            binding.emptyHint.setVisibility(View.VISIBLE);
+        }
+    }
+
+    private void debugAddFakeData() {
+
+        MyCourse.DataBean unFunding = App.getGson().fromJson("{\n" +
+                "            \"info\": {\n" +
+                "                \"description\": \"How to start QPython\",\n" +
+                "                \"title\": \"QPython Quick Start\",\n" +
+                "                \"open\": 0,\n" +
+                "                \"downloads\": \"10,000+\",\n" +
+                "                \"level\": 1,\n" +
+                "                \"rdate\": \"2017-06-15\",\n" +
+                "                \"link\": \"https://edu.qpython.org/qpython-quick-start/index.html\",\n" +
+                "                \"type\": \"free\",\n" +
+                "                \"logo\": \"https://edu.qpython.org/static/course-qpython-quick-start.png\",\n" +
+                "                \"smodule\": \"qpython-quick-start\"\n" +
+                "            },\n" +
+                "            \"list\": [\n" +
+                "                {\n" +
+                "                    \"gd\": \"course_free\",\n" +
+                "                    \"created\": \"2018021109\"\n" +
+                "                }\n" +
+                "            ],\n" +
+                "            \"type\": \"crowdfunding\",\n" +
+                "            \"course\": \"qpython-quick-start\"\n" +
+                "        }", MyCourse.DataBean.class);
+        MyCourse.DataBean funding = App.getGson().fromJson("{\n" +
+                "            \"info\": {\n" +
+                "                \"description\": \"How to start QPython\",\n" +
+                "                \"title\": \"QPython Quick Start\",\n" +
+                "                \"open\": 1,\n" +
+                "                \"downloads\": \"10,000+\",\n" +
+                "                \"level\": 1,\n" +
+                "                \"rdate\": \"2017-06-15\",\n" +
+                "                \"link\": \"https://edu.qpython.org/qpython-quick-start/index.html\",\n" +
+                "                \"type\": \"free\",\n" +
+                "                \"logo\": \"https://edu.qpython.org/static/course-qpython-quick-start.png\",\n" +
+                "                \"smodule\": \"qpython-quick-start\"\n" +
+                "            },\n" +
+                "            \"list\": [\n" +
+                "                {\n" +
+                "                    \"gd\": \"course_free\",\n" +
+                "                    \"created\": \"2018021109\"\n" +
+                "                }\n" +
+                "            ],\n" +
+                "            \"type\": \"crowdfunding\",\n" +
+                "            \"course\": \"qpython-quick-start\"\n" +
+                "        }", MyCourse.DataBean.class);
+        dataList.add(unFunding);
+        dataList.add(funding);
+    }
+
+
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/fragment/MyGistFragment.java b/qpython/src/main/java/org/qpython/qpy/main/fragment/MyGistFragment.java
new file mode 100644
index 00000000..f6dab74d
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/fragment/MyGistFragment.java
@@ -0,0 +1,173 @@
+package org.qpython.qpy.main.fragment;
+
+
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ProgressBar;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.qpython.qpy.R;
+import org.qpython.qpy.main.adapter.GistAdapter;
+import org.qpython.qpy.main.server.gist.GistEvent;
+import org.qpython.qpy.main.server.gist.myScreen.MyGistControler;
+import org.qpython.qpy.main.server.gist.myScreen.MyGistView;
+import org.qpython.qpy.main.server.gist.response.GistBean;
+
+import java.util.List;
+
+import static org.qpython.qpy.main.server.gist.GistEvent.ADD_COMMENT;
+import static org.qpython.qpy.main.server.gist.GistEvent.DELETE;
+import static org.qpython.qpy.main.server.gist.GistEvent.FAVORITE;
+import static org.qpython.qpy.main.server.gist.GistEvent.REFRESH_COLLECTION;
+import static org.qpython.qpy.main.server.gist.GistEvent.UNFAVORITE;
+import static org.qpython.qpy.main.server.gist.GistEvent.UPDATE_GIST_SUC;
+
+/**
+ * 文 件 名: MyGistFragment
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2017/12/26 14:45
+ * 邮   箱: qq798435167@gmail.com
+ * 修改时间：
+ * 修改备注：
+ */
+
+public class MyGistFragment extends Fragment implements MyGistView {
+    public static final String TYPE       = "TYPE";
+    public static final int    GIST       = 0;
+    public static final int    COLLECTION = 1;
+
+    private int             type;
+    private View            mView;
+    private GistAdapter     mNewsAdapter;
+    private MyGistControler mMyGistControler;
+
+    private TextView    hint;
+    private ProgressBar mProgressBar;
+
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        mMyGistControler = new MyGistControler(this);
+        EventBus.getDefault().register(this);
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        mMyGistControler.onDestroy();
+        EventBus.getDefault().unregister(this);
+    }
+
+    public static MyGistFragment newInstance(int type) {
+        MyGistFragment myShareFragment = new MyGistFragment();
+        Bundle data = new Bundle();
+        data.putInt(TYPE, type);
+        myShareFragment.setArguments(data);
+        return myShareFragment;
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        if (mView == null) {
+            type = getArguments().getInt(TYPE);
+            mView = inflater.inflate(R.layout.fragment_my_share, container, false);
+            mProgressBar = mView.findViewById(R.id.progress_bar);
+            hint = mView.findViewById(R.id.empty);
+            RecyclerView mRecyclerView = mView.findViewById(R.id.rv_myshare);
+            mRecyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
+            mNewsAdapter = new GistAdapter(getContext(), this);
+            mNewsAdapter.setShowDelete(type == GIST);
+            mRecyclerView.setAdapter(mNewsAdapter);
+        }
+        return mView;
+    }
+
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        refresh();
+    }
+
+    public void refresh() {
+        if (type == GIST) {
+            mMyGistControler.getMyGists();
+        } else if (type == COLLECTION) {
+            mMyGistControler.getMyFavorites();
+        }
+    }
+
+    @Subscribe
+    public void onEvent(GistEvent event) {
+        switch (event.name) {
+            case DELETE:
+                if (type == GIST) mMyGistControler.deleteGist(event.content);
+                break;
+            case ADD_COMMENT:
+                mNewsAdapter.addCommentNum(event.content);
+                break;
+            case REFRESH_COLLECTION:
+                if (type == COLLECTION) refresh();
+                break;
+            case FAVORITE:
+                if (type == COLLECTION) mNewsAdapter.addFav(event.content, true);
+                break;
+            case UNFAVORITE:
+                if (type == COLLECTION) mNewsAdapter.delete(event.content);
+                break;
+            case UPDATE_GIST_SUC:
+                if (type == GIST) refresh();
+                break;
+
+        }
+    }
+
+
+    @Override
+    public void showLoading() {
+        mProgressBar.setVisibility(View.VISIBLE);
+    }
+
+    @Override
+    public void hideLoading() {
+        mProgressBar.setVisibility(View.GONE);
+    }
+
+    @Override
+    public void showToast(String msg) {
+        Toast.makeText(getContext(), msg, Toast.LENGTH_SHORT).show();
+    }
+
+    @Override
+    public void deleteSuccess(String id) {
+        mNewsAdapter.delete(id);
+    }
+
+    @Override
+    public void addFavorites(List<GistBean> list) {
+        if (list == null || list.size() == 0) {
+            showHint(true);
+        } else {
+            showHint(false);
+            mNewsAdapter.setData(list);
+        }
+    }
+
+    public void showHint(boolean isShow) {
+        hint.setVisibility(isShow ? View.VISIBLE : View.GONE);
+    }
+
+    @Override
+    public void addGists(List<GistBean> list) {
+        addFavorites(list);
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/fragment/RefreshFragment.java b/qpython/src/main/java/org/qpython/qpy/main/fragment/RefreshFragment.java
new file mode 100644
index 00000000..309a1ed4
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/fragment/RefreshFragment.java
@@ -0,0 +1,179 @@
+package org.qpython.qpy.main.fragment;
+
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.graphics.Color;
+import android.net.Uri;
+import android.preference.PreferenceManager;
+import android.support.v4.app.Fragment;
+import android.support.v7.app.AlertDialog;
+import android.support.v7.widget.RecyclerView;
+import android.view.ViewGroup;
+
+import com.quseit.util.FileHelper;
+import com.quseit.util.ImageUtil;
+import com.quseit.util.NAction;
+import com.yanzhenjie.recyclerview.swipe.SwipeMenuBridge;
+import com.yanzhenjie.recyclerview.swipe.SwipeMenuCreator;
+import com.yanzhenjie.recyclerview.swipe.SwipeMenuItem;
+import com.yanzhenjie.recyclerview.swipe.SwipeMenuItemClickListener;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.console.TermActivity;
+import org.qpython.qpy.main.adapter.LibListAdapter;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.app.CONF;
+import org.qpython.qpy.main.server.model.BaseLibModel;
+import org.qpython.qpy.main.utils.Utils;
+
+import java.util.List;
+
+
+public abstract class RefreshFragment extends Fragment {
+    private static final int SCRIPT_CONSOLE_CODE = 1237;
+    private              int WIDTH               = (int) ImageUtil.dp2px(60);
+    public SwipeMenuItemClickListener listener;
+    public int installPosition = -1; // For update download state
+
+    public abstract void refresh(boolean forceRefresh);
+
+    String tostring(Object obj) {
+        return App.getGson().toJson(obj);
+    }
+
+    public String getDownloadPath(String sModule) {
+        return CONF.qpypiPath() +
+                sModule;
+    }
+
+    public SwipeMenuCreator getTypeMenu() {
+        SwipeMenuItem detail = new SwipeMenuItem(getContext())
+                .setBackgroundColor(Color.parseColor("#FF4A4A4A"))
+                .setImage(R.drawable.ic_library_detail)
+                .setHeight(ViewGroup.LayoutParams.MATCH_PARENT)
+                .setWidth(WIDTH);
+        SwipeMenuItem delete = new SwipeMenuItem(getContext())
+                .setBackgroundColor(Color.parseColor("#FFD2483D"))
+                .setImage(R.drawable.ic_library_delete)
+                .setHeight(ViewGroup.LayoutParams.MATCH_PARENT)
+                .setWidth(WIDTH);
+
+        return (swipeLeftMenu, swipeRightMenu, viewType) -> {
+            switch (viewType) {
+                case LibListAdapter.INSTALLED:
+                    swipeRightMenu.addMenuItem(detail);
+                    swipeRightMenu.addMenuItem(delete);
+                    break;
+                case LibListAdapter.UN_INSTALLED:
+                    SwipeMenuItem download = new SwipeMenuItem(getContext())
+                            .setBackgroundColor(Color.parseColor("#FFECCD00"))
+                            .setImage(R.drawable.ic_library_download)
+                            .setHeight(ViewGroup.LayoutParams.MATCH_PARENT)
+                            .setWidth(WIDTH);
+                    swipeRightMenu.addMenuItem(detail);
+                    swipeRightMenu.addMenuItem(download);
+                    break;
+                case LibListAdapter.UPGRADE:
+                    SwipeMenuItem upgrade = new SwipeMenuItem(getContext())
+                            .setBackgroundColor(Color.parseColor("#FF595959"))
+                            .setImage(R.drawable.ic_library_upgrade)
+                            .setHeight(ViewGroup.LayoutParams.MATCH_PARENT)
+                            .setWidth(WIDTH);
+                    swipeRightMenu.addMenuItem(upgrade);
+                    swipeRightMenu.addMenuItem(detail);
+                    swipeRightMenu.addMenuItem(delete);
+                    break;
+            }
+        };
+    }
+
+    public SwipeMenuItemClickListener getListener(List<? extends BaseLibModel> dataList, RecyclerView.Adapter adapter) {
+        return listener = menuBridge -> {
+            menuBridge.closeMenu();
+            BaseLibModel item = dataList.get(menuBridge.getAdapterPosition());
+            switch (adapter.getItemViewType(menuBridge.getAdapterPosition())) {
+                case LibListAdapter.INSTALLED:
+                    switch (menuBridge.getPosition()) {
+                        case 0:
+                            // detail
+                            openDetail(item);
+                            break;
+                        case 1:
+                            // delete
+                            FileHelper.clearDir(getDownloadPath(item.getTmodule()), 0, true);
+                            item.setInstalled(false);
+                            adapter.notifyItemChanged(menuBridge.getAdapterPosition());
+                            break;
+                    }
+                    break;
+                case LibListAdapter.UPGRADE:
+                    switch (menuBridge.getPosition()) {
+                        case 0:
+                            // upgrade
+                            FileHelper.clearDir(getDownloadPath(item.getTmodule()), 0, true);
+                            item.setInstalled(false);
+                            adapter.notifyItemChanged(menuBridge.getAdapterPosition());
+                            installPosition = menuBridge.getAdapterPosition();
+                            downloadLib(item);
+                            item.setInstalled(true);
+                            adapter.notifyItemChanged(menuBridge.getAdapterPosition());
+                            break;
+                        case 1:
+                            // detail
+                            openDetail(item);
+                            break;
+                        case 2:
+                            // delete
+                            FileHelper.clearDir(getDownloadPath(item.getSmodule()), 0, true);
+                            item.setInstalled(false);
+                            adapter.notifyItemChanged(menuBridge.getAdapterPosition());
+                    }
+                    break;
+                case LibListAdapter.UN_INSTALLED:
+                    // UN INSTALL
+                    switch (menuBridge.getPosition()) {
+                        case 0:
+                            // detail
+                            openDetail(item);
+                            break;
+                        case 1:
+                            // download
+                            installPosition = menuBridge.getAdapterPosition();
+                            downloadLib(item);
+                            break;
+                    }
+                    break;
+            }
+
+        };
+    }
+
+    private void openDetail(BaseLibModel item) {
+        if (item.getSrc().equals("")) {
+            AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
+            AlertDialog alertDialog = builder.setTitle(R.string.location)
+                    .setMessage(CONF.qpypiPath() + "/" + item.getTitle())
+                    .setPositiveButton(R.string.confirm, null)
+                    .create();
+            alertDialog.show();
+        } else {
+
+            Utils.startWebActivityWithUrl(getActivity(), item.getTitle(), item.getSrc());
+
+        }
+    }
+
+    private void downloadLib(BaseLibModel item) {
+        SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(getContext());
+        String DIR = getContext().getApplicationContext().getFilesDir().getAbsolutePath();
+        String[] args = {DIR+"/bin/qpypi.py", "install", item.getSmodule()};
+
+        execPyInConsole(args);
+    }
+
+    public void execPyInConsole(String[] args) {
+        Intent intent = new Intent(getContext(), TermActivity.class);
+        intent.putExtra(TermActivity.ARGS, args);
+        startActivityForResult(intent, SCRIPT_CONSOLE_CODE);
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/fragment/SettingFragment.java b/qpython/src/main/java/org/qpython/qpy/main/fragment/SettingFragment.java
new file mode 100644
index 00000000..f5624c51
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/fragment/SettingFragment.java
@@ -0,0 +1,995 @@
+package org.qpython.qpy.main.fragment;
+
+import android.app.ActivityManager;
+import android.app.AlarmManager;
+import android.app.PendingIntent;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.content.res.Resources;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Bundle;
+import android.os.Environment;
+import android.preference.CheckBoxPreference;
+import android.preference.Preference;
+import android.preference.PreferenceFragment;
+import android.preference.PreferenceManager;
+import android.preference.PreferenceScreen;
+import android.preference.SwitchPreference;
+import android.support.annotation.Nullable;
+import android.support.v7.app.AlertDialog;
+import android.text.InputType;
+import android.util.Log;
+import android.view.Gravity;
+import android.view.View;
+import android.widget.ListView;
+import android.widget.Toast;
+
+import com.loopj.android.http.JsonHttpResponseHandler;
+import com.quseit.base.QBaseApp;
+import com.quseit.common.updater.downloader.Downloader;
+import com.quseit.util.NAction;
+import com.quseit.util.NStorage;
+
+import org.apache.http.Header;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.qpython.qpy.R;
+import org.qpython.qpy.main.activity.AboutActivity;
+import org.qpython.qpy.main.activity.CourseActivity;
+import org.qpython.qpy.main.activity.HomeMainActivity;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.service.FTPServerService;
+import org.qpython.qpy.main.widget.LoadingDialog;
+import org.qpython.qpy.texteditor.ui.view.EnterDialog;
+import org.qpython.qpy.utils.NotebookUtil;
+import org.qpython.qpysdk.QPyConstants;
+import org.qpython.qpysdk.QPySDK;
+import org.qpython.qpysdk.utils.Utils;
+import org.qpython.qsl4a.QPyScriptService;
+import org.swiftp.Util;
+
+import java.io.File;
+import java.net.InetAddress;
+import java.text.MessageFormat;
+
+import rx.Observable;
+import rx.Observer;
+import rx.android.schedulers.AndroidSchedulers;
+import rx.schedulers.Schedulers;
+
+
+public class SettingFragment extends PreferenceFragment {
+    private static final String TAG = "SettingFragment";
+
+    private static final String URL_COMMUNITY = "https://www.qpython.org/community.html";
+
+    private LoadingDialog mLoadingDialog;
+
+    private SharedPreferences settings;
+    private Resources         resources;
+    private Preference        mPassWordPref, username_pref, portnum_pref, chroot_pref, lastlog;
+    private CheckBoxPreference sl4a, running_state, root, display_pwd, notebook_run;
+
+    private PreferenceScreen py_inter,notebook_page;
+    private Preference py3,py2; //notebook_res, py2compatible
+    //private Preference update_qpy3,update_qpy2compatible;
+
+    private SwitchPreference log, app;
+    private BroadcastReceiver ftpServerReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            Log.v(TAG, "FTPServerService action received: " + intent.getAction());
+            if (intent.getAction().equals(FTPServerService.ACTION_STARTED)) {
+                running_state.setChecked(true);
+                // Fill in the FTP server address
+                setFtpAddress();
+            } else if (intent.getAction().equals(FTPServerService.ACTION_STOPPED)) {
+                running_state.setChecked(false);
+                running_state.setSummary(org.swiftp.R.string.running_summary_stopped);
+            } else if (intent.getAction().equals(FTPServerService.ACTION_FAILEDTOSTART)) {
+                running_state.setChecked(false);
+                running_state.setSummary(org.swiftp.R.string.running_summary_failed);
+            }
+        }
+    };
+
+    static private String transformPassword(String password) {
+        StringBuilder sb = new StringBuilder(password.length());
+        for (int i = 0; i < password.length(); ++i)
+            sb.append('*');
+        return sb.toString();
+    }
+
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        addPreferencesFromResource(R.xml.qpython_setting);
+        settings = PreferenceManager.getDefaultSharedPreferences(getActivity());
+        resources = getResources();
+        initSettings();
+        initListener();
+    }
+
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        //Disable scrollbar
+        ListView listView = view.findViewById(android.R.id.list);
+        if (listView != null) {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                listView.setFocusedByDefault(false);
+            }
+        }
+        mLoadingDialog = new LoadingDialog(getActivity());
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+    }
+
+    private void initSettings() {
+        Preference ipaddress = findPreference("ipaddress");
+        InetAddress ip;
+        try {
+            ip = FTPServerService.getWifiIp();
+        } catch (NullPointerException e) {
+            ip = null;
+
+        }
+        if (ip!=null) {
+            ipaddress.setSummary(ip.getHostAddress());
+        } else {
+            ipaddress.setSummary(R.string.ip_address_need_wifi);
+        }
+        lastlog = (Preference) findPreference("lastlog");
+        py_inter = (PreferenceScreen) findPreference(getString(R.string.key_py_inter));
+        notebook_page = (PreferenceScreen) findPreference(getString(R.string.key_notebook_page));
+        notebook_page.setTitle(MessageFormat.format(getString(R.string.notebook_for_py), NAction.getPyVer(getActivity())));
+        if (NAction.isQPy3(getActivity())) {
+            notebook_page.setSummary(NotebookUtil.isNotebookLibInstall(getActivity()) ? R.string.notebook_installed : R.string.notebook_not_started);
+
+        } else {
+            notebook_page.setSummary( R.string.notebook_py3_support);
+
+        }
+
+        //notebook_res = (Preference) findPreference(getString(R.string.key_notebook));
+        //notebook_res.setSummary((NotebookUtil.isNotebookLibInstall(getActivity())||NotebookUtil.isNotebookInstall(getActivity()))?R.string.choose_notebook_inter:R.string.install_notebook_first);
+        notebook_run = (CheckBoxPreference) findPreference(getString(R.string.key_notebook_run));
+
+        //update_qpy3 = (Preference)findPreference(getString(R.string.key_update_qpy3));
+        //update_qpy2compatible = (Preference)findPreference(getString(R.string.key_update_qpy2compatible));
+        py2 = (Preference) findPreference(getString(R.string.key_py2));
+        //py2compatible = (Preference) findPreference(getString(R.string.key_py2compatible));
+        py3 = (Preference) findPreference(getString(R.string.key_py3));
+
+
+        root = (CheckBoxPreference) findPreference(resources.getString(R.string.key_root));
+        sl4a = (CheckBoxPreference) findPreference(resources.getString(R.string.key_sl4a));
+        app = (SwitchPreference) findPreference(getString(R.string.key_hide_push));
+        log = (SwitchPreference) findPreference(resources.getString(R.string.key_hide_noti));
+        //qpypi = findPreference(resources.getString(R.string.key_qpypi));
+        username_pref = findPreference(resources.getString(R.string.key_username));
+        running_state = (CheckBoxPreference) findPreference(resources.getString(R.string.key_ftp_state));
+        display_pwd = (CheckBoxPreference) findPreference(resources.getString(R.string.key_show_pwd));
+        mPassWordPref = findPreference(resources.getString(R.string.key_ftp_pwd));
+        portnum_pref = findPreference(resources.getString(R.string.key_port_num));
+        chroot_pref = findPreference(resources.getString(R.string.key_root_dir));
+
+        boolean isRoot, isRunning, isSaverOn;
+        isRoot = settings.getBoolean(getString(R.string.key_root), false);
+        root.setChecked(isRoot);
+        root.setSummary(isRoot ? R.string.enable_root : R.string.disable_root);
+
+        isRunning = isMyServiceRunning(QPyScriptService.class);
+        sl4a.setChecked(isRunning);
+        sl4a.setSummary(isRunning ? R.string.sl4a_running : R.string.sl4a_un_running);
+
+        app.setChecked(settings.getBoolean(getString(R.string.key_hide_push), true));
+        log.setChecked(settings.getBoolean(getString(R.string.key_hide_noti), true));
+
+        //qpypi.setSummary(settings.getString(getString(R.string.key_qpypi), org.qpython.qpy.main.app.CONF.QPYPI_URL));
+        username_pref.setSummary(settings.getString(resources.getString(R.string.key_username), resources.getString(org.swiftp.R.string.username_default)));
+        boolean isFTPRunning = FTPServerService.isRunning();
+        running_state.setChecked(isFTPRunning);
+        if (isFTPRunning) {
+            setFtpAddress();
+        } else {
+            running_state.setSummary(R.string.running_summary_stopped);
+        }
+        portnum_pref.setSummary(settings.getString(resources.getString(R.string.key_port_num),
+                resources.getString(org.swiftp.R.string.portnumber_default)));
+        chroot_pref.setSummary(settings.getString(resources.getString(R.string.key_root_dir),
+                Environment.getExternalStorageDirectory().getPath()));
+
+        py_inter.setSummary(NAction.isQPy3(getActivity()) ? R.string.py3_now : R.string.py2_now);
+        //setNotebookCheckbox();
+
+        SharedPreferences.Editor editor = settings.edit();
+        editor.putBoolean(getString(R.string.key_root), root.isChecked());
+        //editor.putString(getString(R.string.key_qpypi), qpypi.getSummary().toString());
+        editor.putString(getString(R.string.key_username), username_pref.getSummary().toString());
+        editor.putString(getString(R.string.key_ftp_pwd), settings.getString(mPassWordPref.getKey(), "ftp"));
+        editor.putString(getString(R.string.key_port_num), portnum_pref.getSummary().toString());
+        editor.putString(getString(R.string.key_root_dir), chroot_pref.getSummary().toString());
+        editor.putBoolean(getString(R.string.key_hide_noti), log.isChecked());
+        //editor.putBoolean(getString(R.string.key_py3), py3.isChecked());
+        editor.apply();
+    }
+
+    private void setFtpAddress() {
+        InetAddress address = FTPServerService.getWifiIp();
+        if (address == null) {
+            Log.v(TAG, "Unable to retreive wifi ip address");
+            running_state.setSummary(org.swiftp.R.string.cant_get_url);
+        } else {
+            String iptext = "ftp://" + address.getHostAddress() + ":"
+                    + FTPServerService.getPort() + "/";
+            String summary = getString(R.string.running_summary_started,
+                    iptext);
+            running_state.setSummary(summary);
+        }
+    }
+
+    private boolean isMyServiceRunning(Class<?> serviceClass) {
+        ActivityManager manager = (ActivityManager) getActivity().getSystemService(Context.ACTIVITY_SERVICE);
+        for (ActivityManager.RunningServiceInfo service : manager.getRunningServices(Integer.MAX_VALUE)) {
+            if (serviceClass.getName().equals(service.service.getClassName())) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+
+    private void initListener() {
+
+        lastlog.setOnPreferenceClickListener(preference -> {
+            Utils.checkRunTimeLog(getActivity(), getString(R.string.last_log), QPyConstants.ABSOLUTE_LOG);
+
+            return false;
+        });
+
+        if (!NAction.isQPy3(getActivity())) {
+            notebook_run.setSummary(getString(R.string.notebook_py3_support));
+            notebook_run.setEnabled(false);
+
+        } else {
+            notebook_run.setChecked(NotebookUtil.isNBSrvSet(getActivity()));
+
+            notebook_run.setOnPreferenceChangeListener((preference, newValue) -> {
+                if ((boolean)newValue) {
+                    NotebookUtil.startNotebookService2(getActivity());
+
+                } else {
+                    NotebookUtil.killNBSrv(getActivity());
+                }
+                notebook_page.setSummary(NotebookUtil.isNotebookEnable(getActivity())?R.string.notebook_installed : R.string.notebook_not_started);
+
+                return true;
+            });
+        }
+
+        py2.setOnPreferenceClickListener(preference -> {
+            Log.d(TAG, "py2.setOnPreferenceClickListener");
+            NotebookUtil.killNBSrv(getActivity());
+
+            releasePython2Standard(preference);
+            return false;
+        });
+
+        py3.setOnPreferenceClickListener(preference -> {
+            NotebookUtil.killNBSrv(getActivity());
+            releasePython3(preference);
+
+            return false;
+        });
+
+        root.setOnPreferenceChangeListener((preference, newValue) ->
+        {
+            if ((boolean) newValue) {
+                if (NAction.isRootSystem()) {
+                    NStorage.setSP(getActivity(), "app.root", "1");
+                    return true;
+                } else {
+                    Toast.makeText(getActivity(), R.string.not_root_yet, Toast.LENGTH_SHORT).show();
+                    return false;
+                }
+            } else {
+                NStorage.setSP(getActivity(), "app.root", "0");
+                return true;
+            }
+        });
+
+        sl4a.setOnPreferenceChangeListener((preference, newValue) ->
+
+        {
+            boolean isCheck = (boolean) newValue;
+            if (isCheck) {
+                getActivity().startService(new Intent(getActivity(), QPyScriptService.class));
+            } else {
+                getActivity().stopService(new Intent(getActivity(), QPyScriptService.class));
+            }
+            return true;
+        });
+
+        app.setOnPreferenceChangeListener((preference, newValue) ->
+
+        {
+            boolean isCheck = (boolean) newValue;
+            settings.edit().putBoolean(getString(R.string.key_hide_push), isCheck).apply();
+            return true;
+        });
+        log.setOnPreferenceChangeListener((preference, newValue) ->
+
+        {
+            boolean isCheck = (boolean) newValue;
+            settings.edit().putBoolean(getString(R.string.key_hide_noti), isCheck).apply();
+            return true;
+        });
+
+        findPreference(resources.getString(R.string.key_reset)).
+            setOnPreferenceClickListener(preference ->
+            {
+                NAction.startInstalledAppDetailsActivity(getActivity());
+                return false;
+            });
+
+        findPreference(resources.getString(R.string.key_about)).
+            setOnPreferenceClickListener(preference ->
+            {
+                AboutActivity.start(getActivity());
+                return true;
+            });
+
+        findPreference("course").
+            setOnPreferenceClickListener(preference ->
+            {
+                CourseActivity.start(getActivity());
+                return true;
+            });
+
+        findPreference("community").
+            setOnPreferenceClickListener(preference ->
+            {
+                startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(URL_COMMUNITY+"?from="+NAction.getCode(this.getActivity()))));
+                return true;
+            });
+        /*  ====================FTP====================   */
+        running_state.setOnPreferenceChangeListener((preference, newValue) ->
+        {
+            if ((Boolean) newValue) {
+                startServer();
+            } else {
+                stopServer();
+            }
+            return true;
+        });
+
+        username_pref.setOnPreferenceClickListener(preference ->
+
+        {
+            new EnterDialog(getActivity())
+                    .setTitle(preference.getKey())
+                    .setText(preference.getSummary().toString())
+                    .setConfirmListener(name -> {
+                        preference.setSummary(name);
+                        updatePreference(preference);
+                        stopServer();
+                        return true;
+                    })
+                    .show();
+            return true;
+        });
+
+        display_pwd.setOnPreferenceChangeListener(((preference, newValue) ->
+
+        {
+            boolean check = (boolean) newValue;
+            String pwd = settings.getString(getString(R.string.key_ftp_pwd), "ftp");
+            if (check) {
+                mPassWordPref.setSummary(pwd);
+            } else {
+                mPassWordPref.setSummary(transformPassword(pwd));
+            }
+            return true;
+        }));
+
+        String password = settings.getString(resources.getString(R.string.key_ftp_pwd), "ftp");
+        mPassWordPref.setSummary(display_pwd.isChecked() ? password :
+
+                transformPassword(password));
+        mPassWordPref.setOnPreferenceClickListener(preference ->
+
+        {
+            new EnterDialog(getActivity())
+                    .setTitle(mPassWordPref.getKey())
+                    .setText(password)
+                    .setEnterType(InputType.TYPE_TEXT_VARIATION_PASSWORD)
+                    .setConfirmListener(name -> {
+                        settings.edit().putString(mPassWordPref.getKey(), name).apply();
+                        mPassWordPref.setSummary(display_pwd.isChecked() ? name : transformPassword(name));
+                        stopServer();
+                        return true;
+                    })
+                    .show();
+            return true;
+        });
+
+        portnum_pref.setOnPreferenceClickListener(preference ->
+
+        {
+            new EnterDialog(getActivity())
+                    .setTitle(preference.getKey())
+                    .setText(preference.getSummary().toString())
+                    .setEnterType(InputType.TYPE_CLASS_NUMBER)
+                    .setConfirmListener(name -> {
+                        int portNum = Integer.parseInt(name);
+                        if (portNum <= 0 || portNum > 65535) {
+                            Toast.makeText(getActivity(), org.swiftp.R.string.port_validation_error, Toast.LENGTH_LONG).show();
+                            return false;
+                        }
+                        preference.setSummary(name);
+                        updatePreference(preference);
+                        stopServer();
+                        return true;
+                    })
+                    .show();
+            return true;
+        });
+
+        chroot_pref.setOnPreferenceClickListener(preference ->
+
+        {
+            new EnterDialog(getActivity())
+                    .setTitle(preference.getKey())
+                    .setText(preference.getSummary().toString())
+                    .setConfirmListener(name -> {
+                        if (preference.getSummary().equals(name)) {
+                            return true;
+                        }
+                        File chrootTest = new File(name);
+                        if (!chrootTest.isDirectory() || !chrootTest.canRead()) {
+                            Toast.makeText(getActivity(), R.string.dir_not_valid, Toast.LENGTH_SHORT).show();
+                            return false;
+                        }
+                        preference.setSummary(name);
+                        updatePreference(preference);
+                        stopServer();
+                        return true;
+                    })
+                    .show();
+            return true;
+
+        });
+
+        final CheckBoxPreference wakelock_pref = (CheckBoxPreference) findPreference(resources.getString(R.string.key_stay_awake));
+        wakelock_pref.setOnPreferenceChangeListener((preference, newValue) ->
+        {
+            stopServer();
+            return true;
+        });
+    }
+
+    private void releaseNotebook(Preference preference) {
+        Observable.create((Observable.OnSubscribe<Boolean>) subscriber -> {
+            try {
+                String nbfile = NStorage.getSP(App.getContext(), NotebookUtil.getNbResFk(getActivity()));
+                if (!nbfile.equals("") && new File(nbfile).exists()) {    //
+                    extractNotebookRes(nbfile);
+                }
+                if (!NotebookUtil.isNotebookLibInstall(getActivity())) {
+                    NotebookUtil.extraData(getActivity());
+                }
+
+                subscriber.onNext(true);
+                subscriber.onCompleted();
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+
+        })
+        .subscribeOn(Schedulers.io())
+        .doOnSubscribe(() -> mLoadingDialog.show())
+        .subscribeOn(AndroidSchedulers.mainThread())
+        .observeOn(AndroidSchedulers.mainThread())
+        .doOnTerminate(() -> mLoadingDialog.dismiss())
+        .subscribe(new Observer<Boolean>() {
+            @Override
+            public void onCompleted() {
+
+            }
+
+            @Override
+            public void onError(Throwable e) {
+
+            }
+
+            @Override
+            public void onNext(Boolean aBoolean) {
+                Log.d(TAG, "onNext");
+
+                NotebookUtil.startNotebookService2(getActivity());
+                notebook_page.setSummary(NotebookUtil.isNotebookLibInstall(getActivity())?R.string.notebook_installed : R.string.notebook_not_started);
+
+
+            }
+        });
+    }
+
+    private void installNotebook() {
+        new Thread(() -> {
+            QPySDK qpySDK = new QPySDK(App.getContext(), getActivity());
+            qpySDK.extractRes("notebook" + (NAction.isQPy3(getActivity()) ? "3" : "2"), new File(NotebookUtil.RELEASE_PATH));
+        }).run();
+//        new AlertDialog.Builder(getActivity(), R.style.MyDialog)
+//            .setTitle(R.string.notice)
+//            .setMessage(R.string.install_notebook_hint)
+//            .setPositiveButton(R.string.download_it, (dialog1, which)->getNotebook())
+//            .setNegativeButton(R.string.cancel, (dialog1, which) -> dialog1.dismiss())
+//            .create()
+//            .show();
+    }
+
+
+    private void extractNotebookRes(String path) {
+        final String extarget = NotebookUtil.RELEASE_PATH;
+
+        if (path!=null && !path.equals("")) {
+            File resf = new File(path);
+            if (resf.exists()) {
+                QPySDK qpySDK = new QPySDK(App.getContext(), getActivity());
+                qpySDK.extractRes(resf, new File(extarget), false);
+            }
+        }
+    }
+
+
+    private void releaseQPycRes(String path) {
+        final String extarget = QPyConstants.PY_CACHE_PATH;
+
+        if (path!=null && !path.equals("")) {
+            File res = new File(path);
+
+            if (res.exists()) {
+                QPySDK qpySDK = new QPySDK(App.getContext(), getActivity());
+                qpySDK.extractRes(res, new File(extarget), false);
+            }
+        }
+    }
+
+    private void releasePython2Standard(Preference preference) {
+        Observable.create((Observable.OnSubscribe<Boolean>) subscriber -> {
+            try {
+                //removeQPyc2Core();
+                QPySDK qpysdk = new QPySDK(getActivity(), getActivity());
+                qpysdk.extractRes("private1", getActivity().getFilesDir(), true);
+                qpysdk.extractRes("private2", getActivity().getFilesDir(), true);
+                qpysdk.extractRes("private3", getActivity().getFilesDir(),true);
+
+                subscriber.onNext(true);
+                subscriber.onCompleted();
+            } catch (Exception e) {
+                e.printStackTrace();
+                subscriber.onError(new Throwable("Failed to release Py2 resources"));
+            }
+        })
+        .subscribeOn(Schedulers.io())
+        .doOnSubscribe(() -> mLoadingDialog.show())
+        .subscribeOn(AndroidSchedulers.mainThread())
+        .observeOn(AndroidSchedulers.mainThread())
+        .doOnTerminate(() -> mLoadingDialog.dismiss())
+        .subscribe(new Observer<Boolean>() {
+            @Override
+            public void onCompleted() {
+
+            }
+
+            @Override
+            public void onError(Throwable e) {
+                Toast.makeText(getActivity(), "Faild to extract Py2 resource", Toast.LENGTH_SHORT).show();
+            }
+
+            @Override
+            public void onNext(Boolean aBoolean) {
+                NAction.setQPyInterpreter(getActivity(), "2.x");
+                py_inter.setSummary(R.string.py2_now);
+
+                getActivity().recreate();
+            }
+        });
+    }
+
+    private void releasePython2Compatable(Preference preference) {
+        Observable.create((Observable.OnSubscribe<Boolean>) subscriber -> {
+            try {
+
+                //removeQPyc2Core();
+
+                extractQPyCore(true);
+
+                subscriber.onNext(true);
+                subscriber.onCompleted();
+            } catch (Exception e) {
+                e.printStackTrace();
+                subscriber.onError(new Throwable("Failed to release Py2 resources"));
+            }
+        })
+        .subscribeOn(Schedulers.io())
+        .doOnSubscribe(() -> mLoadingDialog.show())
+        .subscribeOn(AndroidSchedulers.mainThread())
+        .observeOn(AndroidSchedulers.mainThread())
+        .doOnTerminate(() -> mLoadingDialog.dismiss())
+        .subscribe(new Observer<Boolean>() {
+            @Override
+            public void onCompleted() {
+
+            }
+
+            @Override
+            public void onError(Throwable e) {
+                Toast.makeText(getActivity(), "Faild to extract Py2 resource", Toast.LENGTH_SHORT).show();
+            }
+
+            @Override
+            public void onNext(Boolean aBoolean) {
+                NAction.setQPyInterpreter(getActivity(), "2.x");
+                py_inter.setSummary(R.string.py2_now);
+
+                getActivity().recreate();
+            }
+        });
+    }
+
+
+    private void releasePython3(Preference preference) {
+        QPySDK qpysdk = new QPySDK(this.getActivity(), this.getActivity());
+        Observable.create((Observable.OnSubscribe<Boolean>) subscriber -> {
+            try {
+                releaseQPycRes(NStorage.getSP(App.getContext(),QPyConstants.KEY_PY3_RES));
+                //extractQPyCore(false);
+
+                qpysdk.extractRes("private31", getActivity().getFilesDir(), true);
+                qpysdk.extractRes("private32", getActivity().getFilesDir(), true);
+                qpysdk.extractRes("private33", getActivity().getFilesDir(),true);
+                qpysdk.extractRes("notebook3", getActivity().getFilesDir(), true);
+
+                File externalStorage = new File(Environment.getExternalStorageDirectory(), "qpython");
+
+                qpysdk.extractRes("publi3c", new File(externalStorage + "/lib"));
+
+                subscriber.onNext(true);
+                subscriber.onCompleted();
+            } catch (Exception e) {
+                e.printStackTrace();
+                subscriber.onError(new Throwable("Failed to release Py3 resources"));
+            }
+        })
+        .subscribeOn(Schedulers.io())
+        .doOnSubscribe(() -> mLoadingDialog.show())
+        .subscribeOn(AndroidSchedulers.mainThread())
+        .observeOn(AndroidSchedulers.mainThread())
+        .doOnTerminate(() -> mLoadingDialog.dismiss())
+        .subscribe(new Observer<Boolean>() {
+            @Override
+            public void onCompleted() {
+
+            }
+
+            @Override
+            public void onError(Throwable e) {
+                Toast.makeText(getActivity(), "Faild to extract Py3 resource", Toast.LENGTH_SHORT).show();
+            }
+
+            @Override
+            public void onNext(Boolean aBoolean) {
+                NAction.setQPyInterpreter(getActivity(), "3.x");
+                py_inter.setSummary(R.string.py3_now);
+
+                getActivity().recreate();
+            }
+        });
+
+    }
+
+    private void updatePreference(Preference preference) {
+        SharedPreferences.Editor editor = settings.edit();
+        if (preference instanceof CheckBoxPreference) {
+            editor.putBoolean(preference.getKey(), ((CheckBoxPreference) preference).isChecked());
+        } else {
+            editor.putString(preference.getKey(), preference.getSummary().toString());
+        }
+        editor.apply();
+    }
+
+    private void restartApp() {
+        Intent mStartActivity = new Intent(getActivity(), HomeMainActivity.class);
+        int mPendingIntentId = 123456;
+        PendingIntent mPendingIntent = PendingIntent.getActivity(getActivity(), mPendingIntentId, mStartActivity, PendingIntent.FLAG_CANCEL_CURRENT);
+        AlarmManager mgr = (AlarmManager) getActivity().getSystemService(Context.ALARM_SERVICE);
+        mgr.set(AlarmManager.RTC, System.currentTimeMillis() + 100, mPendingIntent);
+        System.exit(0);
+    }
+
+    private void startServer() {
+        Context context = getActivity();
+        Intent serverService = new Intent(context, FTPServerService.class);
+        if (!FTPServerService.isRunning()) {
+            warnIfNoExternalStorage();
+            context.startService(serverService);
+        }
+    }
+
+    private void stopServer() {
+        Context context = getActivity();
+        Intent serverService = new Intent(context, FTPServerService.class);
+        context.stopService(serverService);
+    }
+
+    /**
+     * Will check if the device contains external storage (sdcard) and display a warning
+     * for the user if there is no external storage. Nothing more.
+     */
+    private void warnIfNoExternalStorage() {
+        String storageState = Environment.getExternalStorageState();
+        if (!storageState.equals(Environment.MEDIA_MOUNTED)) {
+            Log.v(TAG, "Warning due to storage state " + storageState);
+            Toast toast = Toast.makeText(getActivity(), org.swiftp.R.string.storage_warning,
+                    Toast.LENGTH_LONG);
+            toast.setGravity(Gravity.CENTER, 0, 0);
+            toast.show();
+        }
+    }
+
+    public BroadcastReceiver getFtpServerReceiver() {
+        return ftpServerReceiver;
+    }
+
+    /*
+    TODO: Make it configuration
+     */
+    private void getNotebook() {
+
+        mLoadingDialog.show();
+
+        QBaseApp.getInstance().getAsyncHttpClient().get(getActivity(), NotebookUtil.getNBLink(getActivity()),
+        null, new JsonHttpResponseHandler() {
+            @Override
+            public void onSuccess(int statusCode, Header[] headers, JSONObject result) {
+                final String KEY_RES = "setting.notebookresource.ver";
+
+                try {
+
+                    final String notebook_resource_ver = NStorage.getSP(getActivity(), KEY_RES);
+                    final String url = result.getString("link");
+                    final String target = result.getString("target");
+                    final String vercode = result.getString("vercode");
+                    final String title = result.getString("title");
+                    final String vername = result.getString("vername");
+                    final String path = NotebookUtil.RELEASE_PATH+"/"+target;
+
+                    NStorage.setSP(App.getContext(),  NotebookUtil.getNbResFk(getActivity()), path);
+
+                    Log.d(TAG, "getNotebook:onSuccess:"+notebook_resource_ver+"["+vercode+"]");
+
+                    if (notebook_resource_ver.equals(vercode) && new File(path).exists()) {
+                        mLoadingDialog.dismiss();
+
+                        new AlertDialog.Builder(getActivity(), R.style.MyDialog)
+                            .setTitle(title)
+                            .setMessage(R.string.newest_resource)
+                            .setPositiveButton(R.string.ok, (dialog1, which) -> {
+                                try {
+                                    extractNotebookRes(path);
+                                } catch (Exception e) {
+
+                                }
+                                dialog1.dismiss();
+                            })
+                            .create()
+                            .show();
+
+                    } else {
+                        App.getDownloader().download(getString(R.string.download_notebook), url, path, new Downloader.Callback() {
+
+                            @Override
+                            public void pending(String name) {
+                                mLoadingDialog.cancel();
+
+                                new AlertDialog.Builder(getActivity(), R.style.MyDialog)
+                                    .setTitle(R.string.notice)
+                                    .setMessage(R.string.download_progress_need_sometime)
+                                    .setPositiveButton(R.string.ok, (dialog1, which) -> {
+                                    })
+                                    .create()
+                                    .show();
+                            }
+
+                            @Override
+                            public void complete(String name, File installer) {
+
+                                Log.d(TAG, "getNotebook:complete:" + name + "[" + installer.getAbsolutePath() + "]");
+                                mLoadingDialog.dismiss();
+
+
+                                NStorage.setSP(App.getContext(),KEY_RES, vercode);
+
+                                // UNZIP resources && install
+                                try {
+                                    extractNotebookRes(installer.getAbsolutePath());
+                                    Toast.makeText(App.getContext(), R.string.file_downloaded, Toast.LENGTH_SHORT).show();
+
+                                } catch (Exception e) {
+
+                                }
+                            }
+
+                            @Override
+                            public void error(String err) {
+                                mLoadingDialog.cancel();
+                                try {
+                                    Toast.makeText(getActivity(), err, Toast.LENGTH_SHORT).show();
+                                } catch (Exception e) {
+
+                                }
+                            }
+                        });
+                    }
+                } catch (JSONException e) {
+                    e.printStackTrace();
+                }
+            }
+            @Override
+            public void onFailure(int statusCode, Header[] headers, String responseString, Throwable throwable) {
+                // waitingWindow.dismiss();
+                Log.d(TAG, "Error in checkConfUpdate:" + throwable.getMessage());
+            }
+        });
+
+    }
+    private void getQPYC(boolean ispy2compatible) {
+        mLoadingDialog.show();
+
+        String conf_url = (ispy2compatible?QPyConstants.QPYC2COMPATIBLE:QPyConstants.QPYC3)+"?"+NAction.getUserUrl(getActivity());
+
+        QBaseApp.getInstance().getAsyncHttpClient().get(getActivity(), conf_url,
+        null, new JsonHttpResponseHandler() {
+                @Override
+                public void onSuccess(int statusCode, Header[] headers, JSONObject result) {
+                    final String KEY_RES = ispy2compatible?QPyConstants.QPYC2COMPATIBLE_VER_KEY:QPyConstants.QPYC3_VER_KEY;
+
+                    try {
+
+                        final String py_resource_ver = NStorage.getSP(getActivity(), KEY_RES);
+
+                        final String url = result.getString("link");
+                        final String target = result.getString("target");
+                        final String vercode = result.getString("vercode");
+                        final String title = result.getString("title");
+                        final String vername = result.getString("vername");
+                        final String path = QPyConstants.PY_CACHE_PATH + "/" + target;
+
+                        NStorage.setSP(App.getContext(), QPyConstants.KEY_PY3_RES, path);
+
+                        Log.d(TAG, "getQPYC:onSuccess:"+py_resource_ver+"["+vercode+"]");
+
+                        if (py_resource_ver.equals(vercode) && new File(path).exists()) {
+                            mLoadingDialog.dismiss();
+
+                            new AlertDialog.Builder(getActivity(), R.style.MyDialog)
+                                .setTitle(title)
+                                .setMessage(R.string.newest_resource)
+                                .setPositiveButton(R.string.ok, (dialog1, which) -> {
+                                    try {
+                                        releaseQPycRes(path);
+                                    } catch (Exception e) {
+
+                                    }
+
+                                    dialog1.dismiss();
+                                })
+                                .create()
+                                .show();
+
+                        } else {
+
+                            App.getDownloader().download(getString(R.string.download_py), url, path, new Downloader.Callback() {
+
+                                @Override
+                                public void pending(String name) {
+                                    mLoadingDialog.cancel();
+
+                                    new AlertDialog.Builder(getActivity(), R.style.MyDialog)
+                                            .setTitle(R.string.notice)
+                                            .setMessage(R.string.download_progress_need_sometime)
+                                            //.setNegativeButton(R.string.cancel, (dialog1, which) -> dialog1.dismiss())
+                                            .setPositiveButton(R.string.ok, (dialog1, which) -> {
+                                            })
+                                            .create()
+                                            .show();
+                                }
+
+                                @Override
+                                public void complete(String name, File installer) {
+
+                                    Log.d(TAG, "getQPYC:complete:" + name + "[" + installer.getAbsolutePath() + "]");
+                                    mLoadingDialog.dismiss();
+
+                                    NStorage.setSP(App.getContext(),KEY_RES, vercode);
+                                    // UNZIP resources && install
+                                    try {
+                                        releaseQPycRes(installer.getAbsolutePath());
+
+                                    } catch (Exception e) {
+
+                                    }
+                                }
+
+                                @Override
+                                public void error(String err) {
+                                    mLoadingDialog.cancel();
+                                    try {
+                                        Toast.makeText(getActivity(), err, Toast.LENGTH_SHORT).show();
+                                    } catch (Exception e) {
+
+                                    }
+                                }
+                            });
+                        }
+                } catch (JSONException e) {
+                    e.printStackTrace();
+                }
+            }
+            @Override
+            public void onFailure(int statusCode, Header[] headers, String responseString, Throwable throwable) {
+                // waitingWindow.dismiss();
+                Log.d(TAG, "Error in getQPYC:" + throwable.getMessage());
+            }
+        });
+    }
+
+    private boolean isQPycRelease(boolean ispy2compatible) {
+        boolean isRelease = true;
+        String[] py3Mp3File = getActivity().getResources().getStringArray(ispy2compatible?R.array.qpy2compatible_zip:R.array.qpy3_zip);
+        for (String s : py3Mp3File) {
+            isRelease = isRelease && new File(QPyConstants.PY_CACHE_PATH + "/" + s).exists();
+        }
+        return isRelease;
+    }
+
+    private void removeQPyc2Core() {
+        Log.d(TAG, "removeQPyc2Core");
+        String files = getActivity().getFilesDir().getAbsolutePath();
+        String[] files2del = {files+"/lib/notebook.zip", files+"/lib/python27.zip", files+"/lib/python2.7"};
+        for (int i=0;i<files2del.length;i++) {
+            QPySDK.recursiveDelete(files2del[i]);
+        }
+    }
+
+    /**
+     * 应该在工作线程处理文件的解压释放
+     */
+    private void extractQPyCore(Boolean ispy2Compatible) {
+        QPySDK qpySDK = new QPySDK(getActivity(), getActivity());
+        File libFolder = new File(QPyConstants.ABSOLUTE_PATH, QPyConstants.PY_CACHE);
+        String[] pyMp3File = getActivity().getResources().getStringArray(ispy2Compatible?R.array.qpy2compatible_zip:R.array.qpy3_zip);
+
+        for (String s : pyMp3File) {
+
+            File unzipFile = new File(libFolder, s);
+            if (s.contains("public")) {
+                File externalStorage = new File(QPyConstants.ABSOLUTE_PATH);
+
+                qpySDK.extractRes(unzipFile, new File(externalStorage + "/lib"), false);
+
+            } else {
+                qpySDK.extractRes(unzipFile, getActivity().getFilesDir(), false);
+            }
+
+        }
+    }
+}
\ No newline at end of file
diff --git a/qpython/src/main/java/org/qpython/qpy/main/fragment/TedSettingFragment.java b/qpython/src/main/java/org/qpython/qpy/main/fragment/TedSettingFragment.java
new file mode 100644
index 00000000..e78341a3
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/fragment/TedSettingFragment.java
@@ -0,0 +1,101 @@
+package org.qpython.qpy.main.fragment;
+
+import android.app.Activity;
+import android.content.ActivityNotFoundException;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.preference.ListPreference;
+import android.preference.PreferenceFragment;
+import android.support.annotation.Nullable;
+import android.util.Log;
+import android.widget.Toast;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.texteditor.TedFontActivity;
+import org.qpython.qpy.texteditor.TedSettingsActivity;
+import org.qpython.qpy.texteditor.common.Settings;
+import org.qpython.qpy.texteditor.widget.crouton.Crouton;
+import org.qpython.qpy.texteditor.widget.crouton.Style;
+
+import static org.qpython.qpy.texteditor.common.Constants.PREFERENCE_COLOR_THEME;
+import static org.qpython.qpy.texteditor.common.Constants.PREFERENCE_MAX_LINES_NUM_WITH_SYNTAX;
+import static org.qpython.qpy.texteditor.common.Constants.PREFERENCE_SELECT_FONT;
+import static org.qpython.qpy.texteditor.common.Constants.PREFERENCE_TEXT_SIZE;
+import static org.qpython.qpy.texteditor.common.Constants.REQUEST_FONT;
+
+/**
+ * Created by Hmei
+ * 1/15/18.
+ */
+
+public class TedSettingFragment extends PreferenceFragment {
+    private TedSettingsActivity activity;
+    private String TAG = "TedSettingFragment";
+
+    @Override
+    public void onAttach(Activity activity) {
+        Log.d(TAG, "onAttach activity");
+        super.onAttach(activity);
+        this.activity = (TedSettingsActivity) activity;
+
+    }
+        @Override
+    public void onAttach(Context context) {
+        Log.d(TAG, "onAttach context");
+        super.onAttach(context);
+        activity = (TedSettingsActivity) context;
+    }
+
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        addPreferencesFromResource(R.xml.ted_prefs);
+
+        getPreferenceManager().getSharedPreferences()
+                .registerOnSharedPreferenceChangeListener(activity);
+
+        Settings.updateFromPreferences(getPreferenceManager()
+                .getSharedPreferences());
+
+        findPreference(PREFERENCE_SELECT_FONT).setOnPreferenceClickListener(
+                preference -> {
+                    try {
+                        Intent selectFont = new Intent();
+                        selectFont.setClass(this.getActivity().getApplicationContext(),
+                                TedFontActivity.class);
+                        try {
+                            startActivityForResult(selectFont, REQUEST_FONT);
+                        } catch (ActivityNotFoundException e) {
+                            Crouton.showText(this.getActivity(),
+                                    R.string.toast_activity_open, Style.ALERT);
+                        }
+                    } catch (Exception e) {
+                        Toast.makeText(this.getActivity(),"Exception occured when setting fonts, please retry or report to dev",Toast.LENGTH_SHORT).show();
+                    }
+                    return true;
+                });
+        updateSummaries();
+    }
+
+    public void updateSummaries() {
+        Log.d("TedSettingFragment", "updateSummaries");
+
+        ListPreference listPref = (ListPreference) findPreference(PREFERENCE_COLOR_THEME);
+        listPref.setSummary(listPref.getEntry());
+
+        ListPreference textSize = (ListPreference) findPreference(PREFERENCE_TEXT_SIZE);
+        textSize.setSummary(textSize.getEntry());
+
+        ListPreference maxLine = (ListPreference) findPreference(PREFERENCE_MAX_LINES_NUM_WITH_SYNTAX);
+
+        try {
+            // DON'T CHANGE THIS LINE
+            if (maxLine!=null) {
+                maxLine.setSummary(activity.getString(R.string.max_lines_num_with_syntax_summary, maxLine.getEntry()));
+            }
+        } catch (Exception ignore) {
+        }
+    }
+
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/listener/LoadmoreListener.java b/qpython/src/main/java/org/qpython/qpy/main/listener/LoadmoreListener.java
new file mode 100644
index 00000000..4d2ea764
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/listener/LoadmoreListener.java
@@ -0,0 +1,52 @@
+package org.qpython.qpy.main.listener;
+
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+
+/**
+ * 文 件 名: LoadmoreListener
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2017/12/29 10:51
+ * 邮   箱: qq798435167@gmail.com
+ * 修改时间：
+ * 修改备注：
+ */
+
+public abstract class LoadmoreListener extends RecyclerView.OnScrollListener {
+
+    //用来标记是否正在向最后一个滑动
+    boolean isSlidingToLast = false;
+
+    @Override
+    public void onScrollStateChanged(RecyclerView recyclerView, int newState) {
+        super.onScrollStateChanged(recyclerView, newState);
+        LinearLayoutManager manager = (LinearLayoutManager) recyclerView.getLayoutManager();
+        // 当不滚动时
+        if (newState == RecyclerView.SCROLL_STATE_IDLE) {
+            //获取最后一个完全显示的ItemPosition
+            int lastVisibleItem = manager.findLastCompletelyVisibleItemPosition();
+            int totalItemCount = manager.getItemCount();
+
+            // 判断是否滚动到底部，并且是向右滚动
+            if (lastVisibleItem == (totalItemCount - 1) && isSlidingToLast&&totalItemCount>0) {
+                //加载更多功能的代码
+                OnLoadmore();
+            }
+        }
+    }
+
+    @Override
+    public void onScrolled(RecyclerView recyclerView, int dx, int dy) {
+        super.onScrolled(recyclerView, dx, dy);
+        //dx用来判断横向滑动方向，dy用来判断纵向滑动方向
+        if (dy > 0) {
+            //大于0表示正在向上滚动
+            isSlidingToLast = true;
+        } else {
+            //小于等于0表示停止或向下滚动
+            isSlidingToLast = false;
+        }
+    }
+
+    public abstract void OnLoadmore();
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/model/AppModel.java b/qpython/src/main/java/org/qpython/qpy/main/model/AppModel.java
new file mode 100755
index 00000000..ecc60343
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/model/AppModel.java
@@ -0,0 +1,19 @@
+package org.qpython.qpy.main.model;
+
+import android.graphics.drawable.Drawable;
+import android.support.annotation.DrawableRes;
+
+import java.io.Serializable;
+
+/**
+ * @credit http://developer.android.com/reference/android/content/AsyncTaskLoader.html
+ */
+public abstract class AppModel implements Serializable{
+    String   mAppLabel;
+    Drawable mIcon;
+
+    public abstract Drawable getIcon();
+    public abstract String getLabel();
+
+    public abstract @DrawableRes int getIconRes();
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/model/LocalAppModel.java b/qpython/src/main/java/org/qpython/qpy/main/model/LocalAppModel.java
new file mode 100644
index 00000000..3e0bf9df
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/model/LocalAppModel.java
@@ -0,0 +1,78 @@
+package org.qpython.qpy.main.model;
+
+import android.content.Context;
+import android.content.pm.ApplicationInfo;
+import android.graphics.drawable.Drawable;
+
+import java.io.File;
+
+
+public class LocalAppModel extends AppModel {
+
+    private final Context         mContext;
+    private final ApplicationInfo mInfo;
+    private final File            mApkFile;
+    private       boolean         mMounted;
+
+    public LocalAppModel(Context context, ApplicationInfo info) {
+        mContext = context;
+        mInfo = info;
+        mApkFile = new File(info.sourceDir);
+    }
+
+    private ApplicationInfo getAppInfo() {
+        return mInfo;
+    }
+
+    public String getApplicationPackageName() {
+        return getAppInfo().packageName;
+    }
+
+    @Override
+    public String getLabel() {
+        return mAppLabel;
+    }
+
+    @Override
+    public int getIconRes() {
+        return 0;
+    }
+
+    @Override
+    public Drawable getIcon() {
+        if (mIcon == null) {
+            if (mApkFile.exists()) {
+                mIcon = mInfo.loadIcon(mContext.getPackageManager());
+                return mIcon;
+            } else {
+                mMounted = false;
+            }
+        } else if (!mMounted) {
+            // If the app wasn't mounted but is now mounted, reload
+            // its icon.
+            if (mApkFile.exists()) {
+                mMounted = true;
+                mIcon = mInfo.loadIcon(mContext.getPackageManager());
+                return mIcon;
+            }
+        } else {
+            return mIcon;
+        }
+
+        return mContext.getResources().getDrawable(android.R.drawable.sym_def_app_icon);
+    }
+
+
+    public void loadLabel(Context context) {
+        if (mAppLabel == null || !mMounted) {
+            if (!mApkFile.exists()) {
+                mMounted = false;
+                mAppLabel = mInfo.packageName;
+            } else {
+                mMounted = true;
+                CharSequence label = mInfo.loadLabel(context.getPackageManager());
+                mAppLabel = label != null ? label.toString() : mInfo.packageName;
+            }
+        }
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/model/QPyScriptModel.java b/qpython/src/main/java/org/qpython/qpy/main/model/QPyScriptModel.java
new file mode 100644
index 00000000..fba73205
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/model/QPyScriptModel.java
@@ -0,0 +1,94 @@
+package org.qpython.qpy.main.model;
+
+import android.graphics.drawable.Drawable;
+
+import com.quseit.util.FileHelper;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.main.app.App;
+
+import java.io.File;
+
+/**
+ * QPython script list item model
+ * Created by Hmei on 2017-05-25.
+ */
+
+public class QPyScriptModel extends AppModel {
+    private File    file;
+    private boolean isProj;
+    private int res = -1;
+
+    public QPyScriptModel(File file) {
+        this.file = file;
+    }
+
+
+    private int initRes() {
+        isProj = getPath().contains("/projects");
+        String content;
+        if (isProj) {
+            File mainPy = FileHelper.getMainFileByType(getFile());
+            if (mainPy == null) {
+                res = R.drawable.ic_project_qapp;
+                return res;
+            }
+            content = org.qpython.qpysdk.utils.FileHelper.getFileContents(mainPy.getAbsolutePath());
+        } else {
+            content = org.qpython.qpysdk.utils.FileHelper.getFileContents(getPath());
+        }
+        boolean isWeb = content.contains("#qpy:webapp");
+        boolean isQApp = content.contains("#qpy:quiet") || content.contains("#qpy:qpysrv");
+        boolean isKivy = content.contains("#qpy:kivy");
+        boolean isGame = content.contains("#qpy:pygame");
+        boolean isPy3 = content.contains("#qpy:3");
+
+        if (isWeb) {
+            if (isPy3) {
+                res = (isProj ? R.drawable.ic_project_webapp3 : R.drawable.ic_pyfile_webapp3);
+            } else {
+                res = (isProj ? R.drawable.ic_project_webapp : R.drawable.ic_pyfile_webapp);
+            }
+        } else if (isKivy || isGame) {
+            if (isPy3) {
+                res = (isProj ? R.drawable.ic_project_kivy3 : R.drawable.ic_pyfile_kivy3);
+            } else {
+                res = (isProj ? R.drawable.ic_project_kivy : R.drawable.ic_pyfile_kivy);
+            }
+        } else {
+            if (isPy3) {
+                res = (isProj ? R.drawable.ic_project_qapp3 : R.drawable.ic_pyfile_qapp3);
+            } else {
+                res = (isProj ? R.drawable.ic_project_qapp : R.drawable.ic_pyfile_qapp);
+            }
+        }
+        return res;
+    }
+
+    @Override
+    public Drawable getIcon() {
+        return App.getContext().getResources().getDrawable(res == -1 ? initRes() : res);
+    }
+
+    @Override
+    public String getLabel() {
+        return file.getName();
+    }
+
+    @Override
+    public int getIconRes() {
+        return res == -1 ? initRes() : res;
+    }
+
+    public String getPath() {
+        return file.getAbsolutePath();
+    }
+
+    public File getFile() {
+        return file;
+    }
+
+    public boolean isProj() {
+        return isProj;
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/model/UpdateJson.java b/qpython/src/main/java/org/qpython/qpy/main/model/UpdateJson.java
index 82854c44..3cac283d 100644
--- a/qpython/src/main/java/org/qpython/qpy/main/model/UpdateJson.java
+++ b/qpython/src/main/java/org/qpython/qpy/main/model/UpdateJson.java
@@ -1,139 +1,139 @@
-package org.qpython.qpy.main.model;
-
-import java.util.List;
-
-public class UpdateJson {
-    private AppBean app;
-
-    private List<PluginsBean> plugins;
-
-    public AppBean getApp() {
-        return app;
-    }
-
-    public void setApp(AppBean app) {
-        this.app = app;
-    }
-
-    public List<PluginsBean> getPlugins() {
-        return plugins;
-    }
-
-    public void setPlugins(List<PluginsBean> plugins) {
-        this.plugins = plugins;
-    }
-
-    public static class AppBean {
-        private String link;
-        private int ver;
-        private String ver_desc;
-        private String ver_name;
-
-        public String getLink() {
-            return link;
-        }
-
-        public void setLink(String link) {
-            this.link = link;
-        }
-
-        public int getVer() {
-            return ver;
-        }
-
-        public void setVer(int ver) {
-            this.ver = ver;
-        }
-
-        public String getVer_desc() {
-            return ver_desc;
-        }
-
-        public void setVer_desc(String ver_desc) {
-            this.ver_desc = ver_desc;
-        }
-
-        public String getVer_name() {
-            return ver_name;
-        }
-
-        public void setVer_name(String ver_name) {
-            this.ver_name = ver_name;
-        }
-    }
-
-    public static class PluginsBean {
-        private String src;
-        private int ver;
-        private String plugin;
-        private String link;
-        private String dst;
-        private String title;
-        private String ver_desc;
-        private String desc;
-
-        public String getSrc() {
-            return src;
-        }
-
-        public void setSrc(String src) {
-            this.src = src;
-        }
-
-        public int getVer() {
-            return ver;
-        }
-
-        public void setVer(int ver) {
-            this.ver = ver;
-        }
-
-        public String getPlugin() {
-            return plugin;
-        }
-
-        public void setPlugin(String plugin) {
-            this.plugin = plugin;
-        }
-
-        public String getLink() {
-            return link;
-        }
-
-        public void setLink(String link) {
-            this.link = link;
-        }
-
-        public String getDst() {
-            return dst;
-        }
-
-        public void setDst(String dst) {
-            this.dst = dst;
-        }
-
-        public String getTitle() {
-            return title;
-        }
-
-        public void setTitle(String title) {
-            this.title = title;
-        }
-
-        public String getVer_desc() {
-            return ver_desc;
-        }
-
-        public void setVer_desc(String ver_desc) {
-            this.ver_desc = ver_desc;
-        }
-
-        public String getDesc() {
-            return desc;
-        }
-
-        public void setDesc(String desc) {
-            this.desc = desc;
-        }
-    }
-}
+package org.qpython.qpy.main.model;
+
+import java.util.List;
+
+public class UpdateJson {
+    private AppBean app;
+
+    private List<PluginsBean> plugins;
+
+    public AppBean getApp() {
+        return app;
+    }
+
+    public void setApp(AppBean app) {
+        this.app = app;
+    }
+
+    public List<PluginsBean> getPlugins() {
+        return plugins;
+    }
+
+    public void setPlugins(List<PluginsBean> plugins) {
+        this.plugins = plugins;
+    }
+
+    public static class AppBean {
+        private String link;
+        private int ver;
+        private String ver_desc;
+        private String ver_name;
+
+        public String getLink() {
+            return link;
+        }
+
+        public void setLink(String link) {
+            this.link = link;
+        }
+
+        public int getVer() {
+            return ver;
+        }
+
+        public void setVer(int ver) {
+            this.ver = ver;
+        }
+
+        public String getVer_desc() {
+            return ver_desc;
+        }
+
+        public void setVer_desc(String ver_desc) {
+            this.ver_desc = ver_desc;
+        }
+
+        public String getVer_name() {
+            return ver_name;
+        }
+
+        public void setVer_name(String ver_name) {
+            this.ver_name = ver_name;
+        }
+    }
+
+    public static class PluginsBean {
+        private String src;
+        private int ver;
+        private String plugin;
+        private String link;
+        private String dst;
+        private String title;
+        private String ver_desc;
+        private String desc;
+
+        public String getSrc() {
+            return src;
+        }
+
+        public void setSrc(String src) {
+            this.src = src;
+        }
+
+        public int getVer() {
+            return ver;
+        }
+
+        public void setVer(int ver) {
+            this.ver = ver;
+        }
+
+        public String getPlugin() {
+            return plugin;
+        }
+
+        public void setPlugin(String plugin) {
+            this.plugin = plugin;
+        }
+
+        public String getLink() {
+            return link;
+        }
+
+        public void setLink(String link) {
+            this.link = link;
+        }
+
+        public String getDst() {
+            return dst;
+        }
+
+        public void setDst(String dst) {
+            this.dst = dst;
+        }
+
+        public String getTitle() {
+            return title;
+        }
+
+        public void setTitle(String title) {
+            this.title = title;
+        }
+
+        public String getVer_desc() {
+            return ver_desc;
+        }
+
+        public void setVer_desc(String ver_desc) {
+            this.ver_desc = ver_desc;
+        }
+
+        public String getDesc() {
+            return desc;
+        }
+
+        public void setDesc(String desc) {
+            this.desc = desc;
+        }
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/receiver/BootBroadcastReceiver.java b/qpython/src/main/java/org/qpython/qpy/main/receiver/BootBroadcastReceiver.java
new file mode 100644
index 00000000..c3bbb41c
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/receiver/BootBroadcastReceiver.java
@@ -0,0 +1,33 @@
+package org.qpython.qpy.main.receiver;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.util.Log;
+import android.os.Build;
+
+import org.qpython.qsl4a.QPyScriptService;
+
+
+public class BootBroadcastReceiver extends BroadcastReceiver {
+
+    private static final String TAG = "QPyScriptServiceR";
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+
+        Log.d(TAG, "BootReceiver.onReceive: " + intent.getAction());
+        System.out.println("QPYSL4A程序即将执行");
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+
+        } else {
+
+            try {
+                context.startService(new Intent(context, QPyScriptService.class));
+            } catch (RuntimeException e) {
+
+            }
+        }
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/receiver/DownloadNotebookReceiver.java b/qpython/src/main/java/org/qpython/qpy/main/receiver/DownloadNotebookReceiver.java
new file mode 100644
index 00000000..15bf2a13
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/receiver/DownloadNotebookReceiver.java
@@ -0,0 +1,52 @@
+package org.qpython.qpy.main.receiver;
+
+import android.app.DownloadManager;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.database.Cursor;
+import android.widget.Toast;
+
+import org.greenrobot.eventbus.EventBus;
+import org.qpython.qpy.R;
+import org.qpython.qpy.main.activity.QWebViewActivity;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.fragment.LibProjectFragment;
+
+/**
+ *
+ * Created by Hmei on 2017-06-09.
+ */
+
+public class DownloadNotebookReceiver extends BroadcastReceiver {
+    private long enqueue;
+
+    public DownloadNotebookReceiver() {
+    }
+
+    public void setEnqueue(long enqueue) {
+        this.enqueue = enqueue;
+    }
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        String action = intent.getAction();
+        if (DownloadManager.ACTION_DOWNLOAD_COMPLETE.equals(action)) {
+            DownloadManager.Query query = new DownloadManager.Query();
+            query.setFilterById(enqueue);
+            Cursor c = ((DownloadManager) App.getContext().getSystemService(Context.DOWNLOAD_SERVICE)).query(query);
+            if (c.moveToFirst()) {
+                int columnIndex = c.getColumnIndex(DownloadManager.COLUMN_STATUS);
+                if (DownloadManager.STATUS_SUCCESSFUL == c.getInt(columnIndex)) {
+                    String title = c.getString(c.getColumnIndex(DownloadManager.COLUMN_TITLE));
+
+                    QWebViewActivity.CreateNotebookDownloadFinishEvent event = new QWebViewActivity.CreateNotebookDownloadFinishEvent();
+                    event.fileName = title;
+                    EventBus.getDefault().post(event);
+                } else {
+                    Toast.makeText(context, R.string.download_fail, Toast.LENGTH_SHORT).show();
+                }
+            }
+        }
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/receiver/DownloadReceiver.java b/qpython/src/main/java/org/qpython/qpy/main/receiver/DownloadReceiver.java
new file mode 100644
index 00000000..60d4c610
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/receiver/DownloadReceiver.java
@@ -0,0 +1,51 @@
+package org.qpython.qpy.main.receiver;
+
+import android.app.DownloadManager;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.database.Cursor;
+import android.widget.Toast;
+
+import org.greenrobot.eventbus.EventBus;
+import org.qpython.qpy.R;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.fragment.LibProjectFragment;
+
+/**
+ *
+ * Created by Hmei on 2017-06-09.
+ */
+
+public class DownloadReceiver extends BroadcastReceiver {
+    private long enqueue;
+
+    public DownloadReceiver() {
+    }
+
+    public void setEnqueue(long enqueue) {
+        this.enqueue = enqueue;
+    }
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        String action = intent.getAction();
+        if (DownloadManager.ACTION_DOWNLOAD_COMPLETE.equals(action)) {
+            DownloadManager.Query query = new DownloadManager.Query();
+            query.setFilterById(enqueue);
+            Cursor c = ((DownloadManager) App.getContext().getSystemService(Context.DOWNLOAD_SERVICE)).query(query);
+            if (c.moveToFirst()) {
+                int columnIndex = c.getColumnIndex(DownloadManager.COLUMN_STATUS);
+                if (DownloadManager.STATUS_SUCCESSFUL == c.getInt(columnIndex)) {
+                    String title = c.getString(c.getColumnIndex(DownloadManager.COLUMN_TITLE));
+
+                    LibProjectFragment.CreateLibFinishEvent event = new LibProjectFragment.CreateLibFinishEvent();
+                    event.fileName = title;
+                    EventBus.getDefault().post(event);
+                } else {
+                    Toast.makeText(context, R.string.download_fail, Toast.LENGTH_SHORT).show();
+                }
+            }
+        }
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/receiver/NotificationBean.java b/qpython/src/main/java/org/qpython/qpy/main/receiver/NotificationBean.java
new file mode 100644
index 00000000..90b8661c
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/receiver/NotificationBean.java
@@ -0,0 +1,69 @@
+package org.qpython.qpy.main.receiver;
+
+
+public class NotificationBean {
+
+    /**
+     * type : <类型  ext/in 分别为外部浏览器打开或者系统内链接>
+     * title : <状态栏提示>
+     * msg : <详情>
+     * link : <打开的链接, http://xxx  或者 appname://somelink 这种>
+     * extra : <额外参数, | 分割 如果link为 appname://somelink 这种，这块可能就需要>
+     * force : <为true则关闭App notifications也仍然推送>
+     */
+
+    private String type;
+    private String title;
+    private String msg;
+    private String link;
+    private String extra;
+    private boolean force;
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+
+    public String getLink() {
+        return link;
+    }
+
+    public void setLink(String link) {
+        this.link = link;
+    }
+
+    public String getExtra() {
+        return extra;
+    }
+
+    public void setExtra(String extra) {
+        this.extra = extra;
+    }
+
+    public boolean isForce() {
+        return force;
+    }
+
+    public void setForce(boolean force) {
+        this.force = force;
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/server/CacheKey.java b/qpython/src/main/java/org/qpython/qpy/main/server/CacheKey.java
new file mode 100644
index 00000000..f87246b6
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/server/CacheKey.java
@@ -0,0 +1,17 @@
+package org.qpython.qpy.main.server;
+
+
+public class CacheKey {
+    public static final String LIB   = "lib";
+    public static final String QPYPI = "qpypi";
+    public static final String AIPY  = "aipy";
+
+    public static final String LIB_LAST_REFRESH   = "lib_last_refresh";
+    public static final String QPYPI_LAST_REFRESH = "qpypi_last_refresh";
+    public static final String AIPY_LAST_REFRESH  = "aipy_last_refresh";
+
+    public static final String COURSE_RECOMMEND = "course_recommend";
+    public static final String COURSE_LATEST    = "course_latest";
+
+    public static final String CLOUD_FILE = "cloud_file";
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/server/MySubscriber.java b/qpython/src/main/java/org/qpython/qpy/main/server/MySubscriber.java
new file mode 100644
index 00000000..ed639ac4
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/server/MySubscriber.java
@@ -0,0 +1,37 @@
+package org.qpython.qpy.main.server;
+
+import android.widget.Toast;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.main.app.App;
+
+import java.net.ConnectException;
+
+import retrofit2.adapter.rxjava.HttpException;
+import rx.Subscriber;
+
+/**
+ *
+ * Created by Hmei on 2017-06-29.
+ */
+
+public class MySubscriber<T> extends Subscriber<T> {
+    @Override
+    public void onCompleted() {
+
+    }
+
+    @Override
+    public void onError(Throwable e) {
+        if (e instanceof ConnectException | e instanceof HttpException) {
+            Toast.makeText(App.getContext(), R.string.lost_connect, Toast.LENGTH_SHORT).show();
+        } else {
+            Toast.makeText(App.getContext(), e.getMessage(), Toast.LENGTH_SHORT).show();
+        }
+    }
+
+    @Override
+    public void onNext(T o) {
+
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/server/Service.java b/qpython/src/main/java/org/qpython/qpy/main/server/Service.java
new file mode 100644
index 00000000..ed005d7d
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/server/Service.java
@@ -0,0 +1,189 @@
+package org.qpython.qpy.main.server;
+
+import android.app.DownloadManager;
+import android.content.Context;
+import android.net.Uri;
+import android.os.Environment;
+import android.util.Log;
+import android.widget.Toast;
+
+import com.google.gson.reflect.TypeToken;
+import com.quseit.util.ACache;
+import com.quseit.util.DateTimeHelper;
+import com.quseit.util.NAction;
+
+import org.greenrobot.eventbus.EventBus;
+import org.qpython.qpy.BuildConfig;
+import org.qpython.qpy.main.activity.LibActivity;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.server.model.BaseLibModel;
+import org.qpython.qpy.main.server.model.CourseAdModel;
+import org.qpython.qpy.main.server.model.CourseModel;
+import org.qpython.qpy.main.server.model.LibModel;
+import org.qpython.qpy.main.server.model.MyCourse;
+import org.qpython.qpy.main.server.model.PayStatusModel;
+import org.qpython.qpy.main.server.model.QpypiModel;
+import org.qpython.qpy.main.server.model.UpdateModel;
+import org.qpython.qpy.main.utils.Utils;
+
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.List;
+
+import rx.Observable;
+import rx.Subscriber;
+import rx.android.schedulers.AndroidSchedulers;
+import rx.schedulers.Schedulers;
+
+import static org.qpython.qpy.main.app.CONF.LIB_DOWNLOAD_TEMP;
+
+
+public class Service extends CacheKey {
+    private static final String BASE_URL = "https://";
+    private ServiceRequest request;
+    private ApuQuseit      apuQuseit;
+
+    public Service() {
+        request = App.getRetrofit()
+                .baseUrl(BASE_URL + "dl.qpy.io")
+                .build()
+                .create(ServiceRequest.class);
+
+        apuQuseit = App.getRetrofit()
+                .baseUrl(BASE_URL + "apu2.quseit.com/")
+                .build()
+                .create(ApuQuseit.class);
+    }
+
+    /**
+     * retrofit 线程管理
+     */
+    private static <T> void toSubscribe(Observable<T> o, Subscriber<T> s) {
+        o.subscribeOn(Schedulers.io())
+                .unsubscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(s);
+    }
+
+    public void getLibs(boolean forceRefresh, Subscriber<List<LibModel>> subscriber) {
+        List<LibModel> libList = getObject(new TypeToken<ArrayList<LibModel>>() {
+        }.getType(), LIB);
+        if (libList == null || forceRefresh) {
+            toSubscribe(NAction.isQPy3(App.getContext()) ? request.getLibs3() : request.getLibs(), subscriber);
+            ACache.get(App.getContext()).put(CacheKey.LIB_LAST_REFRESH, DateTimeHelper.getDate());
+        } else {
+            toSubscribe(Observable.just(libList), subscriber);
+        }
+    }
+
+    public void getQPyPi(boolean forceRefresh, Subscriber<List<QpypiModel>> subscriber) {
+        List<QpypiModel> qpypiList = getObject(new TypeToken<ArrayList<QpypiModel>>() {
+        }.getType(), QPYPI);
+        if (qpypiList == null || forceRefresh) {
+            toSubscribe(NAction.isQPy3(App.getContext()) ? request.getQPyPi3() : request.getQPyPi(), subscriber);
+            ACache.get(App.getContext()).put(CacheKey.QPYPI_LAST_REFRESH, DateTimeHelper.getDate());
+        } else {
+            toSubscribe(Observable.just(qpypiList), subscriber);
+        }
+    }
+
+    public void checkUpdate(Subscriber<UpdateModel> subscriber) {
+        toSubscribe(request.checkUpdate(), subscriber);
+    }
+
+    public Observable<List<CourseModel>> getCourse() {
+//        List<CourseModel> courseModels = new ArrayList<>();
+//        List<CourseModel> latest = getObject(new TypeToken<ArrayList<CourseModel>>() {
+//        }.getType(), COURSE_LATEST);
+//        List<CourseModel> recommend = getObject(new TypeToken<ArrayList<CourseModel>>() {
+//        }.getType(), COURSE_RECOMMEND);
+//        if (latest != null) courseModels.addAll(latest);
+//        if (recommend != null) courseModels.addAll(recommend);
+//        if (courseModels.size() != 0) {
+//            return Observable.just(courseModels);
+//        } else {
+        EduRequest eduRequest = App.getRetrofit()
+                .baseUrl(BASE_URL + "edu.qpython.org")
+                .build()
+                .create(EduRequest.class);
+        if (Utils.isZn()) {
+            return eduRequest.getCourseZn();
+        } else {
+            return eduRequest.getCourse();
+        }
+//        }
+    }
+
+    public void getMyCourse(String email, Subscriber<MyCourse> subscriber) {
+        toSubscribe(apuQuseit
+                        .getMyCourse(App.getContext().getPackageName(), email),
+                subscriber);
+    }
+
+    public Observable<CourseAdModel> getCourseAd() {
+        return apuQuseit.getCourseAd(BuildConfig.VERSION_CODE);
+    }
+
+    public void getArticleSupportNum(String articleId, Subscriber<Object> callback) {
+        toSubscribe(apuQuseit.getSupportNum(articleId), callback);
+    }
+
+    public void getAIPyList(boolean isQpy3, boolean forceRefresh, Subscriber<List<BaseLibModel>> subscriber) {
+        List<BaseLibModel> aipyList = getObject(new TypeToken<ArrayList<BaseLibModel>>() {
+        }.getType(), AIPY);
+        if (aipyList == null || forceRefresh) {
+            toSubscribe(isQpy3?request.getAIPy3():request.getAIPy(), subscriber);
+            ACache.get(App.getContext()).put(CacheKey.AIPY_LAST_REFRESH, DateTimeHelper.getDate());
+        } else {
+            toSubscribe(Observable.just(aipyList), subscriber);
+        }
+    }
+
+    public void downloadLib(String url, String fileName, String description) {
+        DownloadManager.Request request = new DownloadManager.Request(Uri.parse(url));
+        request.setDescription(description);
+        request.setTitle(fileName);
+        request.allowScanningByMediaScanner();
+        request.setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED);
+        request.setDestinationInExternalPublicDir(LIB_DOWNLOAD_TEMP, fileName);
+
+        // get download service and enqueue file
+        DownloadManager manager = (DownloadManager) App.getContext().getSystemService(Context.DOWNLOAD_SERVICE);
+        LibActivity.DownloadFinishedEvent event = new LibActivity.DownloadFinishedEvent();
+        event.queueId = manager.enqueue(request);
+        EventBus.getDefault().post(event);
+    }
+
+    public void downloadFile(String url, String fileName, String description) {
+        downloadFile(App.getContext(), url, fileName, description, null);
+    }
+
+    public void downloadFile(Context context, String url, String fileName, String description, String dir) {
+        Log.d("LOG", "DOWNLOAD CALLED:"+dir);
+        DownloadManager.Request request = new DownloadManager.Request(Uri.parse(url));
+        request.setDescription(description);
+        request.setTitle(fileName);
+        request.allowScanningByMediaScanner();
+        request.setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED);
+        request.setDestinationInExternalPublicDir(dir == null ? Environment.DIRECTORY_DOWNLOADS : dir, fileName);
+
+        // get download service and enqueue file
+        DownloadManager manager = (DownloadManager) App.getContext().getSystemService(Context.DOWNLOAD_SERVICE);
+        LibActivity.DownloadFinishedEvent event = new LibActivity.DownloadFinishedEvent();
+        try {
+            event.queueId = manager.enqueue(request);
+            EventBus.getDefault().post(event);
+        } catch (IllegalArgumentException e) {
+            Toast.makeText(App.getContext(), "Faile to download:"+url, Toast.LENGTH_SHORT).show();
+        }
+    }
+
+    public void getPayStatus(String account, String sModule, MySubscriber<PayStatusModel> callback) {
+        toSubscribe(apuQuseit.getPayStatus(account, sModule), callback);
+    }
+
+    private <T> T getObject(Type type, String key) {
+        String cacheStr = ACache.get(App.getContext()).getAsString(key);
+        return cacheStr == null ? null : App.getGson().fromJson(cacheStr, type);
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/server/ServiceRequest.java b/qpython/src/main/java/org/qpython/qpy/main/server/ServiceRequest.java
new file mode 100644
index 00000000..7dbdb267
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/server/ServiceRequest.java
@@ -0,0 +1,90 @@
+package org.qpython.qpy.main.server;
+
+import org.qpython.qpy.main.server.model.BaseLibModel;
+import org.qpython.qpy.main.server.model.CourseAdModel;
+import org.qpython.qpy.main.server.model.CourseModel;
+import org.qpython.qpy.main.server.model.LibModel;
+import org.qpython.qpy.main.server.model.MyCourse;
+import org.qpython.qpy.main.server.model.PayStatusModel;
+import org.qpython.qpy.main.server.model.QpypiModel;
+import org.qpython.qpy.main.server.model.UpdateModel;
+
+import java.util.List;
+
+import retrofit2.Call;
+import retrofit2.http.GET;
+import retrofit2.http.Path;
+import retrofit2.http.Url;
+import rx.Observable;
+
+/**
+ * Requests
+ * Created by Hmei on 2017-06-01.
+ */
+
+interface ServiceRequest {
+    /**
+     * Domain: http://dl.qpy.io
+     */
+
+    @GET("/libs-2x-715.json")
+    Observable<List<LibModel>> getLibs();
+
+    @GET("/libs-3x-66.json")
+    Observable<List<LibModel>> getLibs3();
+
+    @GET("/qpypi-2x-715.json")
+    Observable<List<QpypiModel>> getQPyPi();
+
+    @GET("/qpypi-3x-66.json")
+    Observable<List<QpypiModel>> getQPyPi3();
+
+    @GET("/aipy-2x-715.json")
+    Observable<List<BaseLibModel>> getAIPy();
+
+    @GET("/aipy-3x-66.json")
+    Observable<List<BaseLibModel>> getAIPy3();
+
+    @GET("/update.json")
+    Observable<UpdateModel> checkUpdate();
+
+    @GET("/courses-2x.json ")
+    Observable<List<CourseModel>> getCourse();
+
+
+}
+
+interface ApuQuseit {
+    /**
+     * Domain: http://apu.quseit.com/
+     */
+
+    @GET("/conf/update/org.qpython.qpy/{verCode}")
+    Observable<CourseAdModel> getCourseAd(@Path("verCode") int verCode);
+
+    @GET("conf/iaplognum/org.qpython.qpy/{articleId}")
+    Observable<Object> getSupportNum(@Path("articleId") String articleId);
+
+    @GET("/iap/items/{packageId}/{email}")
+    Observable<MyCourse> getMyCourse(@Path("packageId") String packageId, @Path("email") String email);
+
+    @GET("/iap/hasitem/org.qpython.qpy/{email}/{smodule}/")
+    Observable<PayStatusModel> getPayStatus(@Path("email") String email, @Path("smodule") String
+            smodule);
+}
+
+interface EduRequest {
+    /**
+     * Domain : http://edu.qpython.org
+     */
+
+    @GET("/index/default.json")
+    Observable<List<CourseModel>> getCourse();
+
+    @Deprecated
+    @GET("/index/zh.json")
+    Observable<List<CourseModel>> getZnCourse();
+
+    @GET("/index/zhv2.json")
+    Observable<List<CourseModel>> getCourseZn();
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/server/gist/Api.java b/qpython/src/main/java/org/qpython/qpy/main/server/gist/Api.java
new file mode 100644
index 00000000..dbeec056
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/server/gist/Api.java
@@ -0,0 +1,13 @@
+package org.qpython.qpy.main.server.gist;
+
+/**
+ * 文 件 名: Api
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2018/3/8 17:28
+ * 修改时间：
+ * 修改备注：
+ */
+
+public class Api {
+    public static final String BASE_URL = "http://gist.qpython.org";
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/server/gist/BaseView.java b/qpython/src/main/java/org/qpython/qpy/main/server/gist/BaseView.java
new file mode 100644
index 00000000..a2cf2a4d
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/server/gist/BaseView.java
@@ -0,0 +1,15 @@
+package org.qpython.qpy.main.server.gist;
+
+/**
+ * 文 件 名: BaseView
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2018/3/8 16:42
+ * 修改时间：
+ * 修改备注：
+ */
+
+public interface BaseView {
+    void showLoading();
+    void hideLoading();
+    void showToast(String msg);
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/server/gist/Controler.java b/qpython/src/main/java/org/qpython/qpy/main/server/gist/Controler.java
new file mode 100644
index 00000000..8eb05011
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/server/gist/Controler.java
@@ -0,0 +1,63 @@
+package org.qpython.qpy.main.server.gist;
+
+
+import org.qpython.qpy.main.server.gist.response.ResponseBean;
+import org.qpython.qpy.main.server.gist.service.GistService;
+import org.qpython.qpy.main.server.gist.service.GistServiceFactory;
+
+import java.util.LinkedList;
+import java.util.List;
+
+import rx.Observable;
+import rx.Subscription;
+import rx.android.schedulers.AndroidSchedulers;
+import rx.schedulers.Schedulers;
+
+/**
+ * 文 件 名: Controler
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2018/3/8 16:22
+ * 修改时间：
+ * 修改备注：
+ */
+
+public class Controler<V extends BaseView> {
+    protected GistService mGistService;
+    protected V mView;
+    private List<Subscription> mSubscriptions = new LinkedList<>();
+
+    public Controler(V view) {
+        mGistService = GistServiceFactory.gist();
+        mView = view;
+    }
+
+    protected  <T extends ResponseBean> void logic(Observable<T> observable, boolean loading,
+                                                   ResponseHandler<T>
+            handler) {
+        Subscription subscription = observable
+                .subscribeOn(Schedulers.io())
+                .doOnSubscribe(() -> {
+                    if (loading)
+                        mView.showLoading();
+                })
+                .subscribeOn(AndroidSchedulers.mainThread())
+                .observeOn(AndroidSchedulers.mainThread())
+                .doOnTerminate(() -> {
+                    if (loading)
+                        mView.hideLoading();
+                })
+                .subscribe(handler);
+        mSubscriptions.add(subscription);
+    }
+
+    public void onDestroy() {
+        //解除订阅
+        if (mSubscriptions != null)
+            for (Subscription subscription : mSubscriptions) {
+                if (subscription != null && !subscription.isUnsubscribed()) {
+                    subscription.unsubscribe();
+                }
+            }
+        mView = null;
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/server/gist/GistEvent.java b/qpython/src/main/java/org/qpython/qpy/main/server/gist/GistEvent.java
new file mode 100644
index 00000000..7306e49e
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/server/gist/GistEvent.java
@@ -0,0 +1,37 @@
+package org.qpython.qpy.main.server.gist;
+
+/**
+ * Created by Hmei
+ * 4/2/18.
+ */
+
+public class GistEvent {
+    public static final String FAVORITE_REQUEST   = "FAVORITE_REQUEST";
+    public static final String FAVORITE           = "FAVORITE";
+    public static final String UNFAVORITE         = "UNFAVORITE";
+    public static final String DELETE             = "DELETE";
+    public static final String DELETE_SUC         = "DELETE_SUC";
+    public static final String COMMENT_EVENT      = "COMMENT_EVENT";
+    public static final String FORK               = "FORK";
+    public static final String ADD_COMMENT        = "ADD_COMMENT";
+    public static final String RUN_SCRIPT         = "RUN_EVENT";
+    public static final String RUN_NOTEBOOK       = "RUN_NOTEBOOK";
+    public static final String CODE_REVIEW_EVENT  = "CODE_REVIEW_EVENT";
+    public static final String REPLY_EVENT        = "REPLY_EVENT";
+    public static final String DIVIDER            = "divider_string_distr";
+    public static final String UPDATE_GIST_SUC    = "update_gist_suc";
+    public static final String REFRESH_COLLECTION = "refresh_collection";
+
+
+    public String name;
+    public String content;
+
+    public GistEvent(String name) {
+        this.name = name;
+    }
+
+    public GistEvent(String name, String content) {
+        this.name = name;
+        this.content = content;
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/server/gist/ResponseHandler.java b/qpython/src/main/java/org/qpython/qpy/main/server/gist/ResponseHandler.java
new file mode 100644
index 00000000..2938a6ae
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/server/gist/ResponseHandler.java
@@ -0,0 +1,48 @@
+package org.qpython.qpy.main.server.gist;
+
+import org.qpython.qpy.main.server.gist.response.ResponseBean;
+
+import rx.Observer;
+
+/**
+ * 文 件 名: ResponseHandler
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2018/3/8 16:26
+ * 修改时间：
+ * 修改备注：
+ */
+
+public abstract class ResponseHandler<T extends ResponseBean> implements Observer<T> {
+    private BaseView baseView;
+
+    public ResponseHandler() {
+    }
+
+    public ResponseHandler(BaseView baseView) {
+        this.baseView = baseView;
+    }
+
+    @Override
+    public void onNext(T t) {
+        if (t.getCode() == 0) {
+            onSuccess(t);
+        } else {
+            onError(t.getMessage());
+        }
+    }
+
+    @Override
+    public void onCompleted() {
+    }
+
+    @Override
+    public void onError(Throwable e) {
+        e.getMessage();
+    }
+
+    public abstract void onSuccess(T t);
+
+    public void onError(String msg) {
+        if (baseView != null) baseView.showToast(msg);
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/server/gist/TokenManager.java b/qpython/src/main/java/org/qpython/qpy/main/server/gist/TokenManager.java
new file mode 100644
index 00000000..edbe18d9
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/server/gist/TokenManager.java
@@ -0,0 +1,30 @@
+package org.qpython.qpy.main.server.gist;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+
+/**
+ * 文 件 名: TokenManager
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2018/3/8 16:13
+ * 修改时间：
+ * 修改备注：
+ */
+
+public class TokenManager {
+    private static SharedPreferences sharedPreferences;
+    private static final String TOKEN_KEY = "token";
+    private static final String GIST_KEY = "gist";
+
+    public static void init(Context context){
+        sharedPreferences = context.getSharedPreferences(GIST_KEY,Context.MODE_PRIVATE);
+    }
+
+    public static String getToken(){
+        return sharedPreferences.getString(TOKEN_KEY,"");
+    }
+
+    public static void saveToken(String token){
+        sharedPreferences.edit().putString(TOKEN_KEY,token).apply();
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/server/gist/createScreen/CreateGistControler.java b/qpython/src/main/java/org/qpython/qpy/main/server/gist/createScreen/CreateGistControler.java
new file mode 100644
index 00000000..1588f82b
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/server/gist/createScreen/CreateGistControler.java
@@ -0,0 +1,60 @@
+package org.qpython.qpy.main.server.gist.createScreen;
+
+import android.util.Log;
+
+import org.qpython.qpy.main.server.gist.Controler;
+import org.qpython.qpy.main.server.gist.ResponseHandler;
+import org.qpython.qpy.main.server.gist.TokenManager;
+import org.qpython.qpy.main.server.gist.request.CreateRequest;
+import org.qpython.qpy.main.server.gist.request.UpdateGistRequest;
+import org.qpython.qpy.main.server.gist.response.ResponseBean;
+
+/**
+ * 文 件 名: PublishControler
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2018/3/9 10:32
+ * 修改时间：
+ * 修改备注：
+ */
+
+public class CreateGistControler extends Controler<CreateGistView> {
+
+    public CreateGistControler(CreateGistView view) {
+        super(view);
+    }
+
+    public void createGist(String title, String desc, String source, String sourceType, boolean isShare) {
+        Log.d("createGist", "T:"+TokenManager.getToken());
+        logic(mGistService.createGist(TokenManager.getToken(), new CreateRequest(title, source,
+                desc, TokenManager.getToken(), sourceType, isShare)), true, new ResponseHandler<ResponseBean<String>>() {
+            @Override
+            public void onSuccess(ResponseBean<String> responseBean) {
+                if (responseBean.success()) {
+                    mView.onSuccess(responseBean.getData());
+                } else {
+                    mView.showToast(responseBean.getMessage());
+                }
+            }
+
+            @Override
+            public void onError(String msg) {
+                mView.showToast(msg);
+            }
+        });
+    }
+
+    public void updateGist(String id, String title, String desc, String source) {
+        logic(mGistService.updateGist(TokenManager.getToken(), new UpdateGistRequest(id, title,
+                desc, source)), true, new ResponseHandler<ResponseBean<String>>(mView) {
+            @Override
+            public void onSuccess(ResponseBean<String> responseBean) {
+                mView.showToast(responseBean.getMessage());
+                if (responseBean.success()) {
+                    mView.onSuccess(responseBean.getData());
+                } else {
+                    mView.showToast(responseBean.getMessage());
+                }
+            }
+        });
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/server/gist/createScreen/CreateGistView.java b/qpython/src/main/java/org/qpython/qpy/main/server/gist/createScreen/CreateGistView.java
new file mode 100644
index 00000000..a5896758
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/server/gist/createScreen/CreateGistView.java
@@ -0,0 +1,15 @@
+package org.qpython.qpy.main.server.gist.createScreen;
+
+import org.qpython.qpy.main.server.gist.BaseView;
+
+/**
+ * 文 件 名: CreateView
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2018/3/9 10:50
+ * 修改时间：
+ * 修改备注：
+ */
+
+public interface CreateGistView extends BaseView {
+    void onSuccess(String id);
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/server/gist/detailScreen/DetailControler.java b/qpython/src/main/java/org/qpython/qpy/main/server/gist/detailScreen/DetailControler.java
new file mode 100644
index 00000000..0291be06
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/server/gist/detailScreen/DetailControler.java
@@ -0,0 +1,142 @@
+package org.qpython.qpy.main.server.gist.detailScreen;
+
+import org.greenrobot.eventbus.EventBus;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.server.gist.Controler;
+import org.qpython.qpy.main.server.gist.GistEvent;
+import org.qpython.qpy.main.server.gist.ResponseHandler;
+import org.qpython.qpy.main.server.gist.TokenManager;
+import org.qpython.qpy.main.server.gist.request.BaseRequest;
+import org.qpython.qpy.main.server.gist.request.CommentRequest;
+import org.qpython.qpy.main.server.gist.request.UpdateGistRequest;
+import org.qpython.qpy.main.server.gist.response.CommentBean;
+import org.qpython.qpy.main.server.gist.response.GistBean;
+import org.qpython.qpy.main.server.gist.response.ResponseBean;
+
+import java.util.List;
+
+/**
+ * 文 件 名: DetailControler
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2018/3/9 10:57
+ * 修改时间：
+ * 修改备注：
+ */
+
+public class DetailControler extends Controler<DetailView> {
+
+    private int page = 1;
+
+    public DetailControler(DetailView view) {
+        super(view);
+    }
+
+    public void getDetail(String id) {
+        logic(mGistService.getGistDetail(id), true, new ResponseHandler<ResponseBean<GistBean>>(mView) {
+            @Override
+            public void onSuccess(ResponseBean<GistBean> gistBeanResponseBean) {
+                if (gistBeanResponseBean.success()) {
+                    GistBean bean = gistBeanResponseBean.getData();
+                    bean.setFavorite(App.getFavorites().contains(bean.getId()));
+                    mView.setData(bean);
+                } else {
+                    mView.showToast(gistBeanResponseBean.getMessage());
+                }
+            }
+
+        });
+    }
+
+    public void loadMoreComment(String id) {
+        logic(mGistService.getCommentMore(id, page), true, new ResponseHandler<ResponseBean<List<CommentBean>>>(mView) {
+            @Override
+            public void onSuccess(ResponseBean<List<CommentBean>> listResponseBean) {
+                if (listResponseBean.success()) {
+                    mView.loadMoreComments(listResponseBean.getData());
+                    page++;
+                } else {
+                    mView.showToast(listResponseBean.getMessage());
+                }
+            }
+
+        });
+    }
+
+    public void refresh(String id) {
+        page = 1;
+        getDetail(id);
+    }
+
+    public void favoriteGist(String id) {
+        logic(mGistService.favoriteGist(TokenManager.getToken(), new BaseRequest(id)), false, new
+                ResponseHandler<ResponseBean>(mView) {
+                    @Override
+                    public void onSuccess(ResponseBean responseBean) {
+                        if (responseBean.success()) {
+                            boolean isFav = (Boolean) responseBean.getData();
+                            mView.favorite(isFav);
+                            if (isFav) {
+                                App.getFavorites().add(id);
+                                EventBus.getDefault().post(new GistEvent(GistEvent.FAVORITE,id));
+                            } else {
+                                App.getFavorites().remove(id);
+                                EventBus.getDefault().post(new GistEvent(GistEvent.UNFAVORITE,id));
+                            }
+                        }
+                    }
+                });
+    }
+
+    public void comment(String gistId, String comment, String toId) {
+        logic(mGistService.commentGist(TokenManager.getToken(), new CommentRequest(comment, toId, gistId)), true, new
+                ResponseHandler<ResponseBean<CommentBean>>(mView) {
+                    @Override
+                    public void onSuccess(ResponseBean<CommentBean> responseBean) {
+                        if (responseBean.success()) {
+                            mView.addComment(responseBean.getData());
+                        } else {
+                            mView.showToast(responseBean.getMessage());
+                        }
+                    }
+
+                });
+    }
+
+    public void forkGist(String id) {
+        logic(mGistService.forkGist(TokenManager.getToken(), new BaseRequest(id)), false, new ResponseHandler<ResponseBean>(mView) {
+            @Override
+            public void onSuccess(ResponseBean responseBean) {
+                if (responseBean.success()) {
+                    mView.forkSuccess();
+                } else {
+                    mView.showToast(responseBean.getMessage());
+                }
+            }
+
+        });
+    }
+
+    public void publishGist(String id) {
+        logic(mGistService.publishGist(TokenManager.getToken(), new BaseRequest(id)), true, new ResponseHandler<ResponseBean<String>>(mView) {
+            @Override
+            public void onSuccess(ResponseBean<String> responseBean) {
+                if (responseBean.success()) {
+                    mView.refresh(responseBean.getData());
+                } else {
+                    mView.showToast(responseBean.getMessage());
+                }
+            }
+
+        });
+    }
+
+//    public void updateGist(String id, String title, String desc, String source) {
+//        logic(mGistService.updateGist(TokenManager.getToken(), new UpdateGistRequest(id, title, desc, source)), true, new ResponseHandler<ResponseBean>(mView) {
+//            @Override
+//            public void onSuccess(ResponseBean responseBean) {
+//                mView.showToast(responseBean.getMessage());
+//            }
+//        });
+//    }
+
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/server/gist/detailScreen/DetailView.java b/qpython/src/main/java/org/qpython/qpy/main/server/gist/detailScreen/DetailView.java
new file mode 100644
index 00000000..5b609d82
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/server/gist/detailScreen/DetailView.java
@@ -0,0 +1,31 @@
+package org.qpython.qpy.main.server.gist.detailScreen;
+
+import org.qpython.qpy.main.server.gist.BaseView;
+import org.qpython.qpy.main.server.gist.response.CommentBean;
+import org.qpython.qpy.main.server.gist.response.GistBean;
+
+import java.util.List;
+
+/**
+ * 文 件 名: DetailView
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2018/3/9 10:57
+ * 修改时间：
+ * 修改备注：
+ */
+
+public interface DetailView extends BaseView {
+    void setData(GistBean gistBean);
+
+    void loadMoreComments(List<CommentBean> list);
+
+    void favorite(boolean is);
+
+    void addComment(CommentBean comment);
+
+    void fork();
+
+    void forkSuccess();
+
+    void refresh(String id);
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/server/gist/indexScreen/GistHomeControler.java b/qpython/src/main/java/org/qpython/qpy/main/server/gist/indexScreen/GistHomeControler.java
new file mode 100644
index 00000000..e7f127e3
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/server/gist/indexScreen/GistHomeControler.java
@@ -0,0 +1,134 @@
+package org.qpython.qpy.main.server.gist.indexScreen;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.server.gist.Controler;
+import org.qpython.qpy.main.server.gist.ResponseHandler;
+import org.qpython.qpy.main.server.gist.TokenManager;
+import org.qpython.qpy.main.server.gist.request.BaseRequest;
+import org.qpython.qpy.main.server.gist.response.ADBean;
+import org.qpython.qpy.main.server.gist.response.GistBean;
+import org.qpython.qpy.main.server.gist.response.ResponseBean;
+import org.qpython.qpy.main.server.model.CourseAdModel;
+
+import java.util.List;
+
+import rx.Subscriber;
+import rx.android.schedulers.AndroidSchedulers;
+import rx.schedulers.Schedulers;
+
+/**
+ * 文 件 名: GistHomeControler
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2018/3/9 11:47
+ * 修改时间：
+ * 修改备注：
+ */
+
+public class GistHomeControler extends Controler<GistHomeView> {
+
+    private int page = 0;
+
+    public GistHomeControler(GistHomeView view) {
+        super(view);
+    }
+
+    public void getAD() {
+        App.getService().getCourseAd()
+                .subscribeOn(Schedulers.io())
+                .flatMap(courseAdModel -> rx.Observable.just(courseAdModel.getQpy().getExt_ad()))
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Subscriber<CourseAdModel.QpyBean.ExtAdBean>() {
+                    @Override
+                    public void onCompleted() {
+                    }
+
+                    @Override
+                    public void onError(Throwable e) {
+                        mView.showToast(e.getMessage());
+                        mView.showError(e.getMessage());
+                    }
+
+                    @Override
+                    public void onNext(CourseAdModel.QpyBean.ExtAdBean adBean) {
+                        if (adBean.getGistshare() == null || adBean.getGistshare().size() == 0) {
+                            mView.hideAd();
+                        } else {
+                            mView.setAD(adBean.getGistshare());
+                        }
+                    }
+                });
+    }
+
+    public void getGist() {
+        logic(mGistService.getAllGists(/*page*/), true, new ResponseHandler<ResponseBean<List<GistBean>>>() {
+            @Override
+            public void onSuccess(ResponseBean<List<GistBean>> listResponseBean) {
+                if (listResponseBean.success()) {
+                    page++;
+                    if (listResponseBean.getData() == null || listResponseBean.getData().size() == 0) {
+                        mView.showError(App.getContext().getResources().getString(R.string.no_data));
+                    } else {
+                        mView.setData(listResponseBean.getData());
+                    }
+                } else {
+                    mView.showError(listResponseBean.getMessage());
+                }
+            }
+
+            @Override
+            public void onError(String msg) {
+                mView.showToast(msg);
+                mView.showError("net error");
+            }
+        });
+    }
+
+    public void refresh() {
+        page = 0;
+        getGist();
+    }
+
+    public void loadMore() {
+        if (page == -1) {
+            mView.showToast("no more");
+        } else {
+            logic(mGistService.getAllGists(/*page*/), false, new ResponseHandler<ResponseBean<List<GistBean>>>() {
+                @Override
+                public void onSuccess(ResponseBean<List<GistBean>> listResponseBean) {
+                    if (listResponseBean.success() && listResponseBean.getData().size() > 0) {
+                        page++;
+                        mView.loadMoreGist(listResponseBean.getData());
+                    } else {
+                        mView.showToast(listResponseBean.getMessage());
+                        page = -1;
+                    }
+                }
+
+                @Override
+                public void onError(String msg) {
+                    mView.showToast(msg);
+                }
+            });
+        }
+    }
+
+    public void favoriteGist(String id) {
+        logic(mGistService.favoriteGist(TokenManager.getToken(), new BaseRequest(id)), false, new
+                ResponseHandler<ResponseBean>(mView) {
+                    @Override
+                    public void onSuccess(ResponseBean responseBean) {
+                        if (responseBean.success()) {
+                            boolean isFav = (Boolean) responseBean.getData();
+                            mView.favorite(isFav);
+                            if (isFav) {
+                                App.getFavorites().add(id);
+                            } else {
+                                App.getFavorites().remove(id);
+                            }
+                        }
+
+                    }
+                });
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/server/gist/indexScreen/GistHomeView.java b/qpython/src/main/java/org/qpython/qpy/main/server/gist/indexScreen/GistHomeView.java
new file mode 100644
index 00000000..90c33bb9
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/server/gist/indexScreen/GistHomeView.java
@@ -0,0 +1,26 @@
+package org.qpython.qpy.main.server.gist.indexScreen;
+
+import org.qpython.qpy.main.server.gist.BaseView;
+import org.qpython.qpy.main.server.gist.response.ADBean;
+import org.qpython.qpy.main.server.gist.response.GistBean;
+import org.qpython.qpy.main.server.model.CourseAdModel;
+
+import java.util.List;
+
+/**
+ * 文 件 名: GistHomeView
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2018/3/9 11:47
+ * 修改时间：
+ * 修改备注：
+ */
+
+public interface GistHomeView extends BaseView {
+    void setData(List<GistBean> list);
+    void loadMoreGist(List<GistBean> list);
+    void favorite(boolean is);
+    void showError(String msg);
+    void hideError();
+    void setAD(List<CourseAdModel.QpyBean.ExtAdBean.FeaturedBean> list);
+    void hideAd();
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/server/gist/loginScreen/LoginControler.java b/qpython/src/main/java/org/qpython/qpy/main/server/gist/loginScreen/LoginControler.java
new file mode 100644
index 00000000..9764a998
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/server/gist/loginScreen/LoginControler.java
@@ -0,0 +1,69 @@
+package org.qpython.qpy.main.server.gist.loginScreen;
+
+import android.util.Log;
+
+import com.quseit.util.NUtil;
+
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.app.User;
+import org.qpython.qpy.main.server.gist.Controler;
+import org.qpython.qpy.main.server.gist.ResponseHandler;
+import org.qpython.qpy.main.server.gist.TokenManager;
+import org.qpython.qpy.main.server.gist.request.LoginRequest;
+import org.qpython.qpy.main.server.gist.response.LoginResponse;
+import org.qpython.qpy.main.server.gist.response.ResponseBean;
+
+
+/**
+ * 文 件 名: LoginControler
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2018/3/8 16:49
+ * 修改时间：
+ * 修改备注：
+ */
+
+public class LoginControler extends Controler<LoginView> {
+
+    public LoginControler(LoginView view) {
+        super(view);
+    }
+
+    public void login(User user){
+
+        String userName = user.getUserName();
+        String nick = user.getNick();
+        String userId = user.getUserId();
+        String email = user.getEmail();
+        String avatarUrl = user.getAvatarUrl();
+        String loginType = (email!=null && email.contains("@")?"google":"wechat");
+        //LoginRequest loginRequest = ;
+        //LogUtil.d("LoginControler", "login:username:"+userName+"-nick:"+nick+"-userId:"+userId+"-email:"+email+"-avatarUrl:"+avatarUrl+"-logintype:"+loginType);
+
+        LoginRequest lr2 = new LoginRequest(userName,nick, email ,userId,avatarUrl,loginType);
+        logic(mGistService.login(lr2),false,new ResponseHandler<ResponseBean<LoginResponse>>() {
+            @Override
+            public void onSuccess(ResponseBean<LoginResponse> loginResponseResponseBean) {
+                mView.hideLoading();
+
+                Log.d("login", "T:"+loginResponseResponseBean.getData().getToken());
+                if (loginResponseResponseBean.success()){
+                    App.setUser(user);
+                    TokenManager.saveToken(loginResponseResponseBean.getData().getToken());
+                    //LogUtil.d("login", "T:"+TokenManager.getToken());
+
+                    //mView.showToast("login successfully");
+                    //mView.hideLoading();
+                    mView.loginSuccess();
+                }else {
+                    mView.showToast("login fail,please retry later");
+                }
+            }
+
+            @Override
+            public void onError(String msg) {
+                mView.hideLoading();
+                mView.showToast(msg);
+            }
+        });
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/server/gist/loginScreen/LoginView.java b/qpython/src/main/java/org/qpython/qpy/main/server/gist/loginScreen/LoginView.java
new file mode 100644
index 00000000..5475c307
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/server/gist/loginScreen/LoginView.java
@@ -0,0 +1,15 @@
+package org.qpython.qpy.main.server.gist.loginScreen;
+
+import org.qpython.qpy.main.server.gist.BaseView;
+
+/**
+ * 文 件 名: LoginView
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2018/3/8 17:12
+ * 修改时间：
+ * 修改备注：
+ */
+
+public interface LoginView extends BaseView {
+    void loginSuccess();
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/server/gist/myScreen/MyGistControler.java b/qpython/src/main/java/org/qpython/qpy/main/server/gist/myScreen/MyGistControler.java
new file mode 100644
index 00000000..afb41ccd
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/server/gist/myScreen/MyGistControler.java
@@ -0,0 +1,83 @@
+package org.qpython.qpy.main.server.gist.myScreen;
+
+import org.greenrobot.eventbus.EventBus;
+import org.qpython.qpy.main.server.gist.Controler;
+import org.qpython.qpy.main.server.gist.GistEvent;
+import org.qpython.qpy.main.server.gist.ResponseHandler;
+import org.qpython.qpy.main.server.gist.TokenManager;
+import org.qpython.qpy.main.server.gist.request.BaseRequest;
+import org.qpython.qpy.main.server.gist.response.GistBean;
+import org.qpython.qpy.main.server.gist.response.ResponseBean;
+
+import java.util.List;
+
+/**
+ * 文 件 名: MyGistControler
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2018/3/9 17:19
+ * 修改时间：
+ * 修改备注：
+ */
+
+public class MyGistControler extends Controler<MyGistView> {
+    public MyGistControler(MyGistView view) {
+        super(view);
+    }
+
+    public void getMyFavorites() {
+        logic(mGistService.getMyFavorites(TokenManager.getToken()), true, new ResponseHandler<ResponseBean<List<GistBean>>>() {
+            @Override
+            public void onSuccess(ResponseBean<List<GistBean>> listResponseBean) {
+                if (listResponseBean.success()) {
+                    mView.addFavorites(listResponseBean.getData());
+                } else {
+                    mView.showToast(listResponseBean.getMessage());
+                }
+            }
+
+            @Override
+            public void onError(String msg) {
+                mView.showToast(msg);
+            }
+        });
+    }
+
+    public void getMyGists() {
+        logic(mGistService.getMyGists(TokenManager.getToken()), true, new ResponseHandler<ResponseBean<List<GistBean>>>() {
+            @Override
+            public void onSuccess(ResponseBean<List<GistBean>> listResponseBean) {
+                if (listResponseBean.success()) {
+                    mView.addGists(listResponseBean.getData());
+                } else {
+                    mView.showToast(listResponseBean.getMessage());
+                }
+            }
+
+            @Override
+            public void onError(String msg) {
+                mView.showToast(msg);
+            }
+        });
+    }
+
+    public void deleteGist(String id) {
+        logic(mGistService.deleteGist(TokenManager.getToken(), new BaseRequest(id)), true, new
+                ResponseHandler<ResponseBean>() {
+                    @Override
+                    public void onSuccess(ResponseBean responseBean) {
+                        if (responseBean.success()) {
+
+                            mView.deleteSuccess((String) responseBean.getData());
+                            EventBus.getDefault().post(new GistEvent(GistEvent.DELETE_SUC, (String) responseBean.getData()));
+                        } else {
+                            mView.showToast(responseBean.getMessage());
+                        }
+                    }
+
+                    @Override
+                    public void onError(String msg) {
+                        mView.showToast(msg);
+                    }
+                });
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/server/gist/myScreen/MyGistView.java b/qpython/src/main/java/org/qpython/qpy/main/server/gist/myScreen/MyGistView.java
new file mode 100644
index 00000000..770bf3cf
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/server/gist/myScreen/MyGistView.java
@@ -0,0 +1,20 @@
+package org.qpython.qpy.main.server.gist.myScreen;
+
+import org.qpython.qpy.main.server.gist.BaseView;
+import org.qpython.qpy.main.server.gist.response.GistBean;
+
+import java.util.List;
+
+/**
+ * 文 件 名: MyGistView
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2018/3/9 17:16
+ * 修改时间：
+ * 修改备注：
+ */
+
+public interface MyGistView extends BaseView {
+    void deleteSuccess(String id);
+    void addFavorites(List<GistBean> list);
+    void addGists(List<GistBean> list);
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/server/gist/request/BaseRequest.java b/qpython/src/main/java/org/qpython/qpy/main/server/gist/request/BaseRequest.java
new file mode 100644
index 00000000..baa43c86
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/server/gist/request/BaseRequest.java
@@ -0,0 +1,29 @@
+package org.qpython.qpy.main.server.gist.request;
+
+
+import java.io.Serializable;
+
+/**
+ * 文 件 名: BaseRequest
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2018/3/9 10:07
+ * 修改时间：
+ * 修改备注：
+ */
+
+public class BaseRequest extends Request implements Serializable{
+    public String gist_id;
+
+    public BaseRequest(String gistId) {
+        this.gist_id = gistId;
+    }
+
+    public String getGist_id() {
+        return gist_id;
+    }
+
+    public void setGist_id(String gist_id) {
+        this.gist_id = gist_id;
+    }
+
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/server/gist/request/CommentRequest.java b/qpython/src/main/java/org/qpython/qpy/main/server/gist/request/CommentRequest.java
new file mode 100644
index 00000000..ae267a48
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/server/gist/request/CommentRequest.java
@@ -0,0 +1,52 @@
+package org.qpython.qpy.main.server.gist.request;
+
+import com.google.gson.annotations.SerializedName;
+
+/**
+ * 文 件 名: CommentRequest
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2018/3/9 10:00
+ * 修改时间：
+ * 修改备注：
+ */
+
+public class CommentRequest {
+
+    @SerializedName("from_content")
+    private String from_content;
+    @SerializedName("to_id")
+    private String to_id;
+    @SerializedName("gist_id")
+    private String gist_id;
+
+    public String getGist_id() {
+        return gist_id;
+    }
+
+    public void setGist_id(String gist_id) {
+        this.gist_id = gist_id;
+    }
+
+
+    public CommentRequest(String from_content, String to_id, String gist_id) {
+        this.from_content = from_content;
+        this.to_id = to_id;
+        this.gist_id = gist_id;
+    }
+
+    public String getFrom_content() {
+        return from_content;
+    }
+
+    public void setFrom_content(String from_content) {
+        this.from_content = from_content;
+    }
+
+    public String getTo_id() {
+        return to_id;
+    }
+
+    public void setTo_id(String to_id) {
+        this.to_id = to_id;
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/server/gist/request/CreateRequest.java b/qpython/src/main/java/org/qpython/qpy/main/server/gist/request/CreateRequest.java
new file mode 100644
index 00000000..24c9c4af
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/server/gist/request/CreateRequest.java
@@ -0,0 +1,62 @@
+package org.qpython.qpy.main.server.gist.request;
+
+import com.google.gson.annotations.SerializedName;
+
+/**
+ * 文 件 名: CreateRequest
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2018/3/9 10:18
+ * 修改时间：
+ * 修改备注：
+ */
+
+public class CreateRequest {
+    private String title;
+    private String code;
+    private String desc;
+    @SerializedName(value = "source_type")
+    private String sourceType;
+
+    @SerializedName(value = "is_share")
+    private boolean isSahre;
+
+    public CreateRequest(String title, String source, String desc, String token, String sourceType, boolean isSahre) {
+        this.title = title;
+        this.code = source;
+        this.desc = desc;
+        this.sourceType = sourceType;
+        this.isSahre = isSahre;
+    }
+
+    public String getSourceType() {
+        return sourceType;
+    }
+
+    public void setSourceType(String sourceType) {
+        this.sourceType = sourceType;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+
+    public void setDesc(String desc) {
+        this.desc = desc;
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/server/gist/request/LoginRequest.java b/qpython/src/main/java/org/qpython/qpy/main/server/gist/request/LoginRequest.java
new file mode 100644
index 00000000..859beb7d
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/server/gist/request/LoginRequest.java
@@ -0,0 +1,101 @@
+package org.qpython.qpy.main.server.gist.request;
+
+import android.util.Log;
+
+import com.google.gson.annotations.SerializedName;
+
+import org.qpython.qpy.console.compont.Base64;
+
+/**
+ * 文 件 名: LoginRequest
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2018/3/8 14:53
+ * 修改时间：
+ * 修改备注：
+ */
+
+public class LoginRequest {
+    @SerializedName(value = "username")
+    private String userName;
+    @SerializedName(value = "email")
+    private String email;
+    @SerializedName(value = "profile")
+    private Profile profile;
+
+    class Profile {
+        @SerializedName(value = "utoken")
+        private String utoken;
+        @SerializedName(value = "avatar")
+        private String avatar;
+        @SerializedName(value = "login_type")
+        private String loginType;
+        @SerializedName(value = "uname")
+        private String uname;
+
+        public Profile(String userId, String uname, String avatar, String loginType) {
+            Log.d("Profile", "Profile:"+userId);
+            this.uname = uname;
+            this.utoken = com.quseit.util.Base64.encode(userId).trim();
+            this.avatar = avatar;
+            this.loginType = loginType;
+            Log.d("Profile", "utoken:"+utoken);
+        }
+
+        public String getUtoken() {
+            return utoken;
+        }
+
+        public void setUtoken(String utoken) {
+            this.utoken = utoken;
+        }
+
+        public String getAvatar() {
+            return avatar;
+        }
+
+        public void setAvatar(String avatar) {
+            this.avatar = avatar;
+        }
+
+        public String getLoginType() {
+            return loginType;
+        }
+
+        public void setLoginType(String loginType) {
+            this.loginType = loginType;
+        }
+
+    }
+    public LoginRequest(String userName, String nick, String email, String userId, String avatar, String loginType) {
+        this.userName = email;
+        this.email = email;
+        this.profile = new Profile(userId, nick, avatar, loginType);
+
+    }
+
+
+    public Profile getProfile() {
+        return profile;
+    }
+
+    public void setProfile(Profile profile) {
+        this.profile = profile;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/server/gist/request/Request.java b/qpython/src/main/java/org/qpython/qpy/main/server/gist/request/Request.java
new file mode 100644
index 00000000..8ef02071
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/server/gist/request/Request.java
@@ -0,0 +1,15 @@
+package org.qpython.qpy.main.server.gist.request;
+
+import java.io.Serializable;
+
+/**
+ * 文 件 名: Request
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2018/3/9 16:43
+ * 修改时间：
+ * 修改备注：
+ */
+
+public class Request implements Serializable{
+
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/server/gist/request/UpdateGistRequest.java b/qpython/src/main/java/org/qpython/qpy/main/server/gist/request/UpdateGistRequest.java
new file mode 100644
index 00000000..0940927c
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/server/gist/request/UpdateGistRequest.java
@@ -0,0 +1,47 @@
+package org.qpython.qpy.main.server.gist.request;
+
+/**
+ * 文 件 名: UpdateGistRequest
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2018/3/9 10:14
+ * 修改时间：
+ * 修改备注：
+ */
+
+public class UpdateGistRequest extends BaseRequest {
+
+    private String title;
+    private String code;
+    private String desc;
+
+    public UpdateGistRequest(String gistId, String title, String desc, String code) {
+        super(gistId);
+        this.title = title;
+        this.code = code;
+        this.desc = desc;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+
+    public void setDesc(String desc) {
+        this.desc = desc;
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/server/gist/response/ADBean.java b/qpython/src/main/java/org/qpython/qpy/main/server/gist/response/ADBean.java
new file mode 100644
index 00000000..e48bcde5
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/server/gist/response/ADBean.java
@@ -0,0 +1,39 @@
+package org.qpython.qpy.main.server.gist.response;
+
+/**
+ * 文 件 名: ADBean
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2018/3/12 17:47
+ * 修改时间：
+ * 修改备注：
+ */
+
+public class ADBean {
+    private String link;
+    private String imgUrl;
+    private String title;
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getLink() {
+        return link;
+    }
+
+    public void setLink(String link) {
+        this.link = link;
+    }
+
+    public String getImgUrl() {
+        return imgUrl;
+    }
+
+    public void setImgUrl(String imgUrl) {
+        this.imgUrl = imgUrl;
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/server/gist/response/CommentBean.java b/qpython/src/main/java/org/qpython/qpy/main/server/gist/response/CommentBean.java
new file mode 100644
index 00000000..5ef148e1
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/server/gist/response/CommentBean.java
@@ -0,0 +1,127 @@
+package org.qpython.qpy.main.server.gist.response;
+
+import com.google.gson.annotations.SerializedName;
+
+import java.util.List;
+
+/**
+ * 文 件 名: CommentBean
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2018/3/9 09:51
+ * 修改时间：
+ * 修改备注：
+ */
+
+public class CommentBean {
+
+    @SerializedName(value = "id")
+    private String  id;
+    @SerializedName(value = "user_name")
+    private String  userName;
+    @SerializedName(value = "uname")
+    private String  uname;
+
+    @SerializedName(value = "user_avatar")
+    private String  userAvatar;
+    @SerializedName(value = "from_content")
+    private String  comment;
+    @SerializedName(value = "create_at")
+    private long    createAt;
+    @SerializedName(value = "reply_to")
+    private String  replyTo;
+    @SerializedName(value = "replies")
+    private Replies replies;
+
+    public String getReplyTo() {
+        return replyTo;
+    }
+
+    public void setReplyTo(String replyTo) {
+        this.replyTo = replyTo;
+    }
+
+    public Replies getReplies() {
+        return replies;
+    }
+
+    public void setReplies(Replies replies) {
+        this.replies = replies;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+    public String getUName() {
+        return uname;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+    public void setUname(String uname) {
+        this.uname = uname;
+    }
+
+    public String getUserAvatar() {
+        return userAvatar;
+    }
+
+    public void setUserAvatar(String userAvatar) {
+        this.userAvatar = userAvatar;
+    }
+
+    public long getCreateAt() {
+        return createAt;
+    }
+
+    public void setCreateAt(long createAt) {
+        this.createAt = createAt;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getComment() {
+        return comment;
+    }
+
+    public void setComment(String comment) {
+        this.comment = comment;
+    }
+
+    public class Replies {
+        private int    id;
+        private String user_name;
+        private String comment_content;
+
+        public int getId() {
+            return id;
+        }
+
+        public void setId(int id) {
+            this.id = id;
+        }
+
+        public String getUser_name() {
+            return user_name;
+        }
+
+        public void setUser_name(String user_name) {
+            this.user_name = user_name;
+        }
+
+        public String getComment_content() {
+            return comment_content;
+        }
+
+        public void setComment_content(String comment_content) {
+            this.comment_content = comment_content;
+        }
+    }
+
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/server/gist/response/GistBean.java b/qpython/src/main/java/org/qpython/qpy/main/server/gist/response/GistBean.java
new file mode 100644
index 00000000..e43eeb0b
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/server/gist/response/GistBean.java
@@ -0,0 +1,184 @@
+package org.qpython.qpy.main.server.gist.response;
+
+import android.text.SpannableString;
+import android.text.Spanned;
+import android.text.style.ForegroundColorSpan;
+
+import com.google.gson.annotations.SerializedName;
+
+import java.util.List;
+import java.util.regex.Matcher;
+
+import static org.qpython.qpy.utils.CodePattern.COLOR_BUILTIN;
+import static org.qpython.qpy.utils.CodePattern.COLOR_COMMENT;
+import static org.qpython.qpy.utils.CodePattern.COLOR_KEYWORD;
+import static org.qpython.qpy.utils.CodePattern.PATTERN_PY_BUILD_IN;
+import static org.qpython.qpy.utils.CodePattern.PATTERN_PY_COMMENT;
+import static org.qpython.qpy.utils.CodePattern.PATTERN_PY_KEYWORD;
+
+/**
+ * 文 件 名: GistBean
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2018/3/9 09:36
+ * 修改时间：
+ * 修改备注：
+ */
+
+public class GistBean {
+    @SerializedName(value = "id")
+    private String            id;
+    @SerializedName(value = "title")
+    private String            title;
+    @SerializedName(value = "user")
+    private UserBean          user;
+    @SerializedName(value = "fav_count")
+    private int               star;
+    @SerializedName(value = "comment_count")
+    private int               comment;
+    @SerializedName(value = "create_at")
+    private long              createAt;
+    @SerializedName(value = "desc")
+    private String            description;
+    @SerializedName(value = "code")
+    private String            source;
+    @SerializedName(value = "source_type")
+    private String            sourceType;
+    @SerializedName(value = "is_feature")
+    private boolean           isFeature;
+    @SerializedName(value = "comments")
+    private List<CommentBean> comments;
+
+    private transient boolean isFavorite;
+
+    public boolean isFavorite() {
+        return isFavorite;
+    }
+
+    public void setFavorite(boolean favorite) {
+        isFavorite = favorite;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public SpannableString getSource() {
+        SpannableString sStr = new SpannableString(source);
+        for (Matcher m = PATTERN_PY_KEYWORD.matcher(sStr); m.find(); ) {
+            sStr.setSpan(
+                    new ForegroundColorSpan(COLOR_KEYWORD),
+                    m.start(),
+                    m.end(),
+                    Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+        }
+
+        for (Matcher m = PATTERN_PY_BUILD_IN.matcher(sStr); m.find(); ) {
+            sStr.setSpan(
+                    new ForegroundColorSpan(COLOR_BUILTIN),
+                    m.start(),
+                    m.end(),
+                    Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+        }
+
+        for (Matcher m = PATTERN_PY_COMMENT.matcher(sStr); m.find(); ) {
+            sStr.setSpan(
+                    new ForegroundColorSpan(COLOR_COMMENT),
+                    m.start(),
+                    m.end(),
+                    Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+        }
+        return sStr;
+    }
+
+    public void setSource(String source) {
+        this.source = source;
+    }
+
+    public List<CommentBean> getComments() {
+        return comments;
+    }
+
+    public void setComments(List<CommentBean> comments) {
+        this.comments = comments;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public UserBean getUser() {
+        return user;
+    }
+
+    public void setUser(UserBean user) {
+        this.user = user;
+    }
+
+    public int getStar() {
+        return star;
+    }
+
+    public void setStar(int star) {
+        this.star = star;
+    }
+
+    public void changeStar(boolean isAdd) {
+        if (isAdd) {
+            star++;
+        } else {
+            star--;
+        }
+    }
+
+    public int getComment() {
+        return comment;
+    }
+
+    public void addCommentNum() {
+        comment++;
+    }
+
+    public void setComment(int comment) {
+        this.comment = comment;
+    }
+
+    public long getCreateAt() {
+        return createAt;
+    }
+
+    public void setCreateAt(long createAt) {
+        this.createAt = createAt;
+    }
+
+    public String getSourceType() {
+        return sourceType;
+    }
+
+    public void setSourceType(String sourceType) {
+        this.sourceType = sourceType;
+    }
+
+    public boolean isFeature() {
+        return isFeature;
+    }
+
+    public void setFeature(boolean feature) {
+        isFeature = feature;
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/server/gist/response/LoginResponse.java b/qpython/src/main/java/org/qpython/qpy/main/server/gist/response/LoginResponse.java
new file mode 100644
index 00000000..431f0894
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/server/gist/response/LoginResponse.java
@@ -0,0 +1,24 @@
+package org.qpython.qpy.main.server.gist.response;
+
+import com.google.gson.annotations.SerializedName;
+
+/**
+ * 文 件 名: LoginResponse
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2018/3/8 16:09
+ * 修改时间：
+ * 修改备注：
+ */
+
+public class LoginResponse {
+    @SerializedName(value = "token")
+    private String token;
+
+    public String getToken() {
+        return token;
+    }
+
+    public void setToken(String token) {
+        this.token = token;
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/server/gist/response/ResponseBean.java b/qpython/src/main/java/org/qpython/qpy/main/server/gist/response/ResponseBean.java
new file mode 100644
index 00000000..32e181e6
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/server/gist/response/ResponseBean.java
@@ -0,0 +1,48 @@
+package org.qpython.qpy.main.server.gist.response;
+
+import com.google.gson.annotations.SerializedName;
+
+/**
+ * 文 件 名: ResponseBean
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2018/3/8 14:46
+ * 修改时间：
+ * 修改备注：
+ */
+
+public class ResponseBean<T> {
+    @SerializedName(value = "msg")
+    private String message;
+    @SerializedName(value = "errno")
+    private int code;
+    @SerializedName(value = "data")
+    private T data;
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+    public int getCode() {
+        return code;
+    }
+
+    public void setCode(int code) {
+        this.code = code;
+    }
+
+    public T getData() {
+        return data;
+    }
+
+    public void setData(T data) {
+        this.data = data;
+    }
+
+    public boolean success(){
+        return code == 0;
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/server/gist/response/UserBean.java b/qpython/src/main/java/org/qpython/qpy/main/server/gist/response/UserBean.java
new file mode 100644
index 00000000..435b3db3
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/server/gist/response/UserBean.java
@@ -0,0 +1,42 @@
+package org.qpython.qpy.main.server.gist.response;
+
+import com.google.gson.annotations.SerializedName;
+
+/**
+ * 文 件 名: UserBean
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2018/3/9 09:40
+ * 修改时间：
+ * 修改备注：
+ */
+
+public class UserBean {
+    @SerializedName(value = "uname")
+    private String uName;
+
+    @SerializedName(value = "username")
+    private String userName;
+    @SerializedName(value = "avatar")
+    private String avatar;
+
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public String getUName() {
+        return uName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getAvatar() {
+        return avatar;
+    }
+
+    public void setAvatar(String avatar) {
+        this.avatar = avatar;
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/server/gist/service/GistService.java b/qpython/src/main/java/org/qpython/qpy/main/server/gist/service/GistService.java
new file mode 100644
index 00000000..63dcdde9
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/server/gist/service/GistService.java
@@ -0,0 +1,81 @@
+package org.qpython.qpy.main.server.gist.service;
+
+import org.qpython.qpy.main.server.gist.request.BaseRequest;
+import org.qpython.qpy.main.server.gist.request.CommentRequest;
+import org.qpython.qpy.main.server.gist.request.CreateRequest;
+import org.qpython.qpy.main.server.gist.request.LoginRequest;
+import org.qpython.qpy.main.server.gist.request.UpdateGistRequest;
+import org.qpython.qpy.main.server.gist.response.ADBean;
+import org.qpython.qpy.main.server.gist.response.CommentBean;
+import org.qpython.qpy.main.server.gist.response.GistBean;
+import org.qpython.qpy.main.server.gist.response.LoginResponse;
+import org.qpython.qpy.main.server.gist.response.ResponseBean;
+
+import java.util.List;
+
+import retrofit2.http.Body;
+import retrofit2.http.GET;
+import retrofit2.http.Header;
+import retrofit2.http.POST;
+import retrofit2.http.Path;
+import retrofit2.http.Query;
+import rx.Observable;
+
+/**
+ * 文 件 名: GistService
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2018/3/8 16:04
+ * 修改时间：
+ * 修改备注：
+ */
+
+public interface GistService {
+
+    @POST("api/login/")
+    Observable<ResponseBean<LoginResponse>> login(@Body LoginRequest loginRequest);
+
+    @GET("api/ad")
+    Observable<ResponseBean<List<ADBean>>> getAD();
+
+    @GET("api/gist/getgist/")/*{page}*/
+    Observable<ResponseBean<List<GistBean>>> getAllGists(/*@Query("page") int page*/);
+
+    @GET("api/gist/mygist/")
+    Observable<ResponseBean<List<GistBean>>> getMyGists(@Header("TOKEN") String token);
+
+    @GET("api/gist/myfav")
+    Observable<ResponseBean<List<GistBean>>> getMyFavorites(@Header("TOKEN") String token);
+
+    @GET("api/gist/detail/{gist_id}")
+    Observable<ResponseBean<GistBean>> getGistDetail(@Path("gist_id") String id);
+
+    @GET("api/gist/comment/{gist_id}/{page}")
+    Observable<ResponseBean<List<CommentBean>>> getCommentMore(@Path("gist_id") String id, @Path("page") int page);
+
+    @POST("api/gist/fav/")
+    Observable<ResponseBean> favoriteGist(@Header("TOKEN") String token, @Body BaseRequest request);
+
+    @POST("api/gist/comment/")
+    Observable<ResponseBean<CommentBean>> commentGist(@Header("TOKEN") String token, @Body
+            CommentRequest request);
+
+    @POST("api/gist/fork/")
+    Observable<ResponseBean> forkGist(@Header("TOKEN") String token, @Body BaseRequest request);
+
+    @POST("api/gist/delete/")
+    Observable<ResponseBean> deleteGist(@Header("TOKEN") String token, @Body BaseRequest request);
+
+    @POST("api/gist/public/")
+    Observable<ResponseBean<String>> publishGist(@Header("TOKEN") String token, @Body BaseRequest
+            request);
+
+    @POST("api/gist/update/")
+    Observable<ResponseBean<String>> updateGist(@Header("TOKEN") String token, @Body
+            UpdateGistRequest
+            request);
+
+    @POST("api/gist/new/")
+    Observable<ResponseBean<String>> createGist(@Header("TOKEN") String token, @Body CreateRequest
+            request);
+
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/server/gist/service/GistServiceFactory.java b/qpython/src/main/java/org/qpython/qpy/main/server/gist/service/GistServiceFactory.java
new file mode 100644
index 00000000..95a8a077
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/server/gist/service/GistServiceFactory.java
@@ -0,0 +1,18 @@
+package org.qpython.qpy.main.server.gist.service;
+
+import org.qpython.qpy.main.server.http.Retrofitor;
+
+/**
+ * 文 件 名: GistServiceFactory
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2018/3/8 16:04
+ * 修改时间：
+ * 修改备注：
+ */
+
+public class GistServiceFactory {
+
+    public static GistService gist(){
+        return Retrofitor.getInstance().createService(GistService.class);
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/server/http/Retrofitor.java b/qpython/src/main/java/org/qpython/qpy/main/server/http/Retrofitor.java
new file mode 100644
index 00000000..742c3b9c
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/server/http/Retrofitor.java
@@ -0,0 +1,131 @@
+package org.qpython.qpy.main.server.http;
+
+
+import java.io.IOException;
+import java.security.GeneralSecurityException;
+import java.security.KeyStore;
+import java.util.Collections;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
+import javax.net.ssl.HostnameVerifier;
+import javax.net.ssl.SSLSession;
+
+import okhttp3.ConnectionSpec;
+import okhttp3.Interceptor;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
+import okhttp3.logging.HttpLoggingInterceptor;
+import retrofit2.Retrofit;
+import retrofit2.adapter.rxjava.RxJavaCallAdapterFactory;
+import retrofit2.converter.gson.GsonConverterFactory;
+
+
+/**
+ * 文 件 名: RetrofitManager
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2017/10/24 11:48
+ * 邮   箱: qq798435167@gmail.com
+ * 博   客: http://zzzzzzzz3.github.io
+ * 修改时间：
+ * 修改备注：网络访问封装类
+ */
+
+public class Retrofitor {
+    private static Retrofitor instance = null;
+    private Retrofit mRetrofit = null;
+    //超时时间
+    public static final int DEFAULT_TIMEOUT = 30;
+    private OkHttpClient.Builder mOkhttpBuilder;
+
+
+    private Retrofitor() {
+        mOkhttpBuilder = new OkHttpClient.Builder().retryOnConnectionFailure(true);
+    }
+
+    public Retrofitor setTimeOut(int timeOut) {
+        mOkhttpBuilder
+                .connectTimeout(timeOut, TimeUnit.SECONDS)
+                .readTimeout(timeOut, TimeUnit.SECONDS)
+                .writeTimeout(timeOut, TimeUnit.SECONDS);
+        return this;
+    }
+
+    public Retrofitor openDebug(boolean debug) {
+        if (debug){
+            HttpLoggingInterceptor interceptor = new HttpLoggingInterceptor();
+            interceptor.setLevel(HttpLoggingInterceptor.Level.BODY);
+            mOkhttpBuilder.addInterceptor(interceptor);
+        }
+        return this;
+    }
+
+    public Retrofitor supportSSL(boolean support) {
+        if (support){
+            //配置ssl
+            try {
+                KeyStore trustStore = KeyStore.getInstance(KeyStore.getDefaultType());
+                trustStore.load(null, null);
+                SSLSocketFactoryImp ssl = new SSLSocketFactoryImp(KeyStore.getInstance(KeyStore.getDefaultType()));
+                mOkhttpBuilder.sslSocketFactory(ssl.getSSLContext().getSocketFactory(), ssl.getTrustManager());
+            } catch (IOException | GeneralSecurityException e) {
+                e.printStackTrace();
+            }
+            HostnameVerifier hostnameVerifier = new HostnameVerifier() {
+                @Override
+                public boolean verify(String s, SSLSession sslSession) {
+                    return true;
+                }
+            };
+            mOkhttpBuilder.hostnameVerifier(hostnameVerifier);
+            //配置支持的协议
+            ConnectionSpec spec = new ConnectionSpec.Builder(ConnectionSpec.MODERN_TLS)
+                    .allEnabledCipherSuites()
+                    .allEnabledTlsVersions()
+                    .build();
+            mOkhttpBuilder.connectionSpecs(Collections.singletonList(spec));
+        }
+        return this;
+    }
+
+    public Retrofitor addHeaders(final Map<String,String> headers){
+        mOkhttpBuilder.addInterceptor(chain -> {
+            Request.Builder requestBuilder = chain.request().newBuilder();
+            for (String key:headers.keySet()){
+                requestBuilder.addHeader(key,headers.get(key));
+            }
+            return chain.proceed(requestBuilder.build());
+        });
+        return this;
+    }
+
+    /**
+     * 初始化retrofit
+     */
+    public void init(String url) {
+        Retrofit.Builder mBuilder = new Retrofit.Builder()
+                .baseUrl(url)
+                .client(mOkhttpBuilder.build())
+                .addConverterFactory(GsonConverterFactory.create())
+                .addCallAdapterFactory(RxJavaCallAdapterFactory.create());
+        mRetrofit = mBuilder.build();
+    }
+
+    public static Retrofitor getInstance() {
+        if (instance == null) {
+            synchronized (Retrofitor.class) {
+                instance = new Retrofitor();
+            }
+        }
+        return instance;
+    }
+
+    /**
+     * 获取到接口
+     */
+    public <T> T createService(Class<T> service) {
+        return mRetrofit.create(service);
+    }
+
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/server/http/SSLSocketFactoryImp.java b/qpython/src/main/java/org/qpython/qpy/main/server/http/SSLSocketFactoryImp.java
new file mode 100644
index 00000000..bedd0043
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/server/http/SSLSocketFactoryImp.java
@@ -0,0 +1,94 @@
+package org.qpython.qpy.main.server.http;
+
+
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.Socket;
+import java.net.UnknownHostException;
+import java.security.KeyManagementException;
+import java.security.KeyStore;
+import java.security.NoSuchAlgorithmException;
+import java.security.cert.CertificateException;
+import java.security.cert.X509Certificate;
+
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLSocketFactory;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.X509TrustManager;
+
+public class SSLSocketFactoryImp extends SSLSocketFactory {
+    private SSLContext sslContext = SSLContext.getInstance("SSL");
+    private TrustManager trustManager = null;
+
+
+    public SSLContext getSSLContext() {
+        return sslContext;
+    }
+
+    public X509TrustManager getTrustManager() {
+        return (X509TrustManager)trustManager;
+    }
+
+    public SSLSocketFactoryImp(KeyStore keyStore) throws NoSuchAlgorithmException, KeyManagementException {
+        trustManager = new X509TrustManager() {
+            @Override
+            public void checkClientTrusted(X509Certificate[] x509Certificates, String s) throws CertificateException {
+
+            }
+
+            @Override
+            public void checkServerTrusted(X509Certificate[] x509Certificates, String s) throws CertificateException {
+
+            }
+
+            @Override
+            public X509Certificate[] getAcceptedIssuers() {
+               //注意这里不能返回null，否则会报错,如下面错误[1]
+                X509Certificate[] x509Certificates = new X509Certificate[0];
+                return x509Certificates;
+            }
+        };
+
+        sslContext.init(null, new TrustManager[]{trustManager}, null);
+    }
+
+    @Override
+    public String[] getDefaultCipherSuites() {
+        return new String[0];
+    }
+
+    @Override
+    public String[] getSupportedCipherSuites() {
+        return new String[0];
+    }
+
+    @Override
+    public Socket createSocket() throws IOException {
+        return sslContext.getSocketFactory().createSocket();
+    }
+
+    @Override
+    public Socket createSocket(Socket socket, String host, int post, boolean autoClose) throws IOException {
+        return sslContext.getSocketFactory().createSocket(socket, host, post, autoClose);
+    }
+
+    @Override
+    public Socket createSocket(String s, int i) throws IOException, UnknownHostException {
+        return null;
+    }
+
+    @Override
+    public Socket createSocket(String s, int i, InetAddress inetAddress, int i1) throws IOException, UnknownHostException {
+        return null;
+    }
+
+    @Override
+    public Socket createSocket(InetAddress inetAddress, int i) throws IOException {
+        return null;
+    }
+
+    @Override
+    public Socket createSocket(InetAddress inetAddress, int i, InetAddress inetAddress1, int i1) throws IOException {
+        return null;
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/server/model/BaseLibModel.java b/qpython/src/main/java/org/qpython/qpy/main/server/model/BaseLibModel.java
new file mode 100644
index 00000000..24f93360
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/server/model/BaseLibModel.java
@@ -0,0 +1,114 @@
+package org.qpython.qpy.main.server.model;
+
+import java.io.Serializable;
+
+/**
+ * Created by Hmei on 2017-06-23.
+ */
+
+public class BaseLibModel implements Serializable{
+    protected String src;
+    protected String rdate;
+    protected String link;
+    protected String tmodule;
+    protected String smodule;
+    protected String title;
+    protected String ver;
+    protected String cat;
+    protected String downloads;
+    protected String description;
+
+    boolean installed;
+
+    public BaseLibModel(String title) {
+        this.title = title;
+    }
+
+    public String getSrc() {
+        return src;
+    }
+
+    public void setSrc(String src) {
+        this.src = src;
+    }
+
+    public String getRdate() {
+        return rdate;
+    }
+
+    public void setRdate(String rdate) {
+        this.rdate = rdate;
+    }
+
+    public String getLink() {
+        return link;
+    }
+
+    public void setLink(String link) {
+        this.link = link;
+    }
+
+    public String getTmodule() {
+        return tmodule;
+    }
+
+    public String getSmodule() {
+        return smodule;
+    }
+
+    public void setTmodule(String tmodule) {
+        this.tmodule = tmodule;
+    }
+
+    public void setSmodule(String smodule) {
+        this.smodule = smodule;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getVer() {
+        return ver;
+    }
+
+    public void setVer(String ver) {
+        this.ver = ver;
+    }
+
+    public String getDownloads() {
+        return downloads == null ? "-1" : downloads;
+    }
+
+    public void setDownloads(String downloads) {
+        this.downloads = downloads;
+    }
+
+    public String getCat() {
+        return cat;
+    }
+
+    public void setCat(String cat) {
+        this.cat = cat;
+    }
+
+    public boolean isInstalled() {
+        return installed;
+    }
+
+    public void setInstalled(boolean installed) {
+        this.installed = installed;
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/server/model/CourseAdModel.java b/qpython/src/main/java/org/qpython/qpy/main/server/model/CourseAdModel.java
new file mode 100644
index 00000000..190f9008
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/server/model/CourseAdModel.java
@@ -0,0 +1,403 @@
+package org.qpython.qpy.main.server.model;
+
+import java.util.List;
+
+/**
+ * Created by Hmei on 2017-08-01.
+ */
+
+public class CourseAdModel {
+
+    /**
+     * qpy : {"website":"http://qpython.org","feedback":"support@qpython.org","ext2":{"adx_setting":"pa|marquee","adx_splash":"pa|full"},"ext_ad":{"featured":[{"ad_man":"qpythonBLfb","ad_market":"Global","ad_link":"http://www.facebook.com/qpython","ad_code":"org.qpython.qpy.fb","ad_point":"10","ad_img":"http://apu.quseit.com/static/adimg/qpy-facebook.png","ad_logo":"","adLink_id":"9"},{"ad_man":"XSocksBL","ad_market":"Global","ad_link":"http://xsvpn.com/","ad_code":"com.quseit.xsocks2","ad_point":"10","ad_img":"http://apu.quseit.com/static/adimg/qpy-xsocks_bSO7gxh.png","ad_logo":"","adLink_id":"10"}],"full":[{"ad_man":"QPython","ad_market":"Global","ad_link":"http://www.qpython.org","ad_code":"org.qpython.qpy","ad_point":"10","ad_img":"http://apu.quseit.com/static/adimg/qpy-748x1062.png","ad_logo":"","adLink_id":"6"}],"marquee":[{"ad_man":"qpythonBLfb","ad_market":"Global","ad_link":"http://www.facebook.com/qpython","ad_code":"org.qpython.qpy.fb","ad_point":"10","ad_img":"http://apu.quseit.com/static/adimg/qpy-facebook.png","ad_logo":"","adLink_id":"9"},{"ad_man":"QPythonBLtw","ad_market":"Global","ad_link":"http://twitter.com/qpython","ad_code":"org.qpython.qpy.tw","ad_point":"10","ad_img":"http://apu.quseit.com/static/adimg/qpy-twitter.png","ad_logo":"","adLink_id":"11"}]}}
+     */
+
+    private QpyBean qpy;
+
+    public QpyBean getQpy() {
+        return qpy;
+    }
+
+    public void setQpy(QpyBean qpy) {
+        this.qpy = qpy;
+    }
+
+    public static class QpyBean {
+        /**
+         * website : http://qpython.org
+         * feedback : support@qpython.org
+         * ext2 : {"adx_setting":"pa|marquee","adx_splash":"pa|full"}
+         * ext_ad : {"featured":[{"ad_man":"qpythonBLfb","ad_market":"Global","ad_link":"http://www.facebook.com/qpython","ad_code":"org.qpython.qpy.fb","ad_point":"10","ad_img":"http://apu.quseit.com/static/adimg/qpy-facebook.png","ad_logo":"","adLink_id":"9"},{"ad_man":"XSocksBL","ad_market":"Global","ad_link":"http://xsvpn.com/","ad_code":"com.quseit.xsocks2","ad_point":"10","ad_img":"http://apu.quseit.com/static/adimg/qpy-xsocks_bSO7gxh.png","ad_logo":"","adLink_id":"10"}],"full":[{"ad_man":"QPython","ad_market":"Global","ad_link":"http://www.qpython.org","ad_code":"org.qpython.qpy","ad_point":"10","ad_img":"http://apu.quseit.com/static/adimg/qpy-748x1062.png","ad_logo":"","adLink_id":"6"}],"marquee":[{"ad_man":"qpythonBLfb","ad_market":"Global","ad_link":"http://www.facebook.com/qpython","ad_code":"org.qpython.qpy.fb","ad_point":"10","ad_img":"http://apu.quseit.com/static/adimg/qpy-facebook.png","ad_logo":"","adLink_id":"9"},{"ad_man":"QPythonBLtw","ad_market":"Global","ad_link":"http://twitter.com/qpython","ad_code":"org.qpython.qpy.tw","ad_point":"10","ad_img":"http://apu.quseit.com/static/adimg/qpy-twitter.png","ad_logo":"","adLink_id":"11"}]}
+         */
+
+        private String    website;
+        private String    feedback;
+        private Ext2Bean  ext2;
+        private ExtAdBean ext_ad;
+        private String    course_open;
+
+        public String getWebsite() {
+            return website;
+        }
+
+        public void setWebsite(String website) {
+            this.website = website;
+        }
+
+        public String getFeedback() {
+            return feedback;
+        }
+
+        public void setFeedback(String feedback) {
+            this.feedback = feedback;
+        }
+
+        public Ext2Bean getExt2() {
+            return ext2;
+        }
+
+        public void setExt2(Ext2Bean ext2) {
+            this.ext2 = ext2;
+        }
+
+        public ExtAdBean getExt_ad() {
+            return ext_ad;
+        }
+
+        public void setExt_ad(ExtAdBean ext_ad) {
+            this.ext_ad = ext_ad;
+        }
+
+        public String getCourse_open() {
+            return course_open == null ? "0" : course_open;
+        }
+
+        public void setCourse_open(String course_open) {
+            this.course_open = course_open;
+        }
+
+
+        public static class Ext2Bean {
+            /**
+             * adx_setting : pa|marquee
+             * adx_splash : pa|full
+             */
+
+            private String adx_setting;
+            private String adx_splash;
+
+            public String getAdx_setting() {
+                return adx_setting;
+            }
+
+            public void setAdx_setting(String adx_setting) {
+                this.adx_setting = adx_setting;
+            }
+
+            public String getAdx_splash() {
+                return adx_splash;
+            }
+
+            public void setAdx_splash(String adx_splash) {
+                this.adx_splash = adx_splash;
+            }
+        }
+
+        public static class ExtAdBean {
+            private List<FeaturedBean> featured;
+            private List<FullBean>     full;
+            private List<MarqueeBean>  marquee;
+            private List<FeaturedBean> gistshare;
+
+            public List<FeaturedBean> getFeatured() {
+                return featured;
+            }
+
+            public void setFeatured(List<FeaturedBean> featured) {
+                this.featured = featured;
+            }
+
+            public List<FullBean> getFull() {
+                return full;
+            }
+
+            public void setFull(List<FullBean> full) {
+                this.full = full;
+            }
+
+            public List<MarqueeBean> getMarquee() {
+                return marquee;
+            }
+
+            public void setMarquee(List<MarqueeBean> marquee) {
+                this.marquee = marquee;
+            }
+
+            public List<FeaturedBean> getGistshare() {
+                return gistshare;
+            }
+
+            public void setGistshare(List<FeaturedBean> gistshare) {
+                this.gistshare = gistshare;
+            }
+
+            public static class FeaturedBean {
+                /**
+                 * ad_man : qpythonBLfb
+                 * ad_market : Global
+                 * ad_link : http://www.facebook.com/qpython
+                 * ad_code : org.qpython.qpy.fb
+                 * ad_point : 10
+                 * ad_img : http://apu.quseit.com/static/adimg/qpy-facebook.png
+                 * ad_logo :
+                 * adLink_id : 9
+                 */
+
+                private String ad_man;
+                private String ad_market;
+                private String ad_link;
+                private String ad_code;
+                private String ad_point;
+                private String ad_img;
+                private String ad_logo;
+                private String adLink_id;
+
+                public String getAd_man() {
+                    return ad_man;
+                }
+
+                public void setAd_man(String ad_man) {
+                    this.ad_man = ad_man;
+                }
+
+                public String getAd_market() {
+                    return ad_market;
+                }
+
+                public void setAd_market(String ad_market) {
+                    this.ad_market = ad_market;
+                }
+
+                public String getAd_link() {
+                    return ad_link;
+                }
+
+                public void setAd_link(String ad_link) {
+                    this.ad_link = ad_link;
+                }
+
+                public String getAd_code() {
+                    return ad_code;
+                }
+
+                public void setAd_code(String ad_code) {
+                    this.ad_code = ad_code;
+                }
+
+                public String getAd_point() {
+                    return ad_point;
+                }
+
+                public void setAd_point(String ad_point) {
+                    this.ad_point = ad_point;
+                }
+
+                public String getAd_img() {
+                    return ad_img;
+                }
+
+                public void setAd_img(String ad_img) {
+                    this.ad_img = ad_img;
+                }
+
+                public String getAd_logo() {
+                    return ad_logo;
+                }
+
+                public void setAd_logo(String ad_logo) {
+                    this.ad_logo = ad_logo;
+                }
+
+                public String getAdLink_id() {
+                    return adLink_id;
+                }
+
+                public void setAdLink_id(String adLink_id) {
+                    this.adLink_id = adLink_id;
+                }
+            }
+
+            public static class FullBean {
+                /**
+                 * ad_man : QPython
+                 * ad_market : Global
+                 * ad_link : http://www.qpython.org
+                 * ad_code : org.qpython.qpy
+                 * ad_point : 10
+                 * ad_img : http://apu.quseit.com/static/adimg/qpy-748x1062.png
+                 * ad_logo :
+                 * adLink_id : 6
+                 */
+
+                private String ad_man;
+                private String ad_market;
+                private String ad_link;
+                private String ad_code;
+                private String ad_point;
+                private String ad_img;
+                private String ad_logo;
+                private String adLink_id;
+
+                public String getAd_man() {
+                    return ad_man;
+                }
+
+                public void setAd_man(String ad_man) {
+                    this.ad_man = ad_man;
+                }
+
+                public String getAd_market() {
+                    return ad_market;
+                }
+
+                public void setAd_market(String ad_market) {
+                    this.ad_market = ad_market;
+                }
+
+                public String getAd_link() {
+                    return ad_link;
+                }
+
+                public void setAd_link(String ad_link) {
+                    this.ad_link = ad_link;
+                }
+
+                public String getAd_code() {
+                    return ad_code;
+                }
+
+                public void setAd_code(String ad_code) {
+                    this.ad_code = ad_code;
+                }
+
+                public String getAd_point() {
+                    return ad_point;
+                }
+
+                public void setAd_point(String ad_point) {
+                    this.ad_point = ad_point;
+                }
+
+                public String getAd_img() {
+                    return ad_img;
+                }
+
+                public void setAd_img(String ad_img) {
+                    this.ad_img = ad_img;
+                }
+
+                public String getAd_logo() {
+                    return ad_logo;
+                }
+
+                public void setAd_logo(String ad_logo) {
+                    this.ad_logo = ad_logo;
+                }
+
+                public String getAdLink_id() {
+                    return adLink_id;
+                }
+
+                public void setAdLink_id(String adLink_id) {
+                    this.adLink_id = adLink_id;
+                }
+            }
+
+            public static class MarqueeBean {
+                /**
+                 * ad_man : qpythonBLfb
+                 * ad_market : Global
+                 * ad_link : http://www.facebook.com/qpython
+                 * ad_code : org.qpython.qpy.fb
+                 * ad_point : 10
+                 * ad_img : http://apu.quseit.com/static/adimg/qpy-facebook.png
+                 * ad_logo :
+                 * adLink_id : 9
+                 */
+
+                private String ad_man;
+                private String ad_market;
+                private String ad_link;
+                private String ad_code;
+                private String ad_point;
+                private String ad_img;
+                private String ad_logo;
+                private String adLink_id;
+
+                public String getAd_man() {
+                    return ad_man;
+                }
+
+                public void setAd_man(String ad_man) {
+                    this.ad_man = ad_man;
+                }
+
+                public String getAd_market() {
+                    return ad_market;
+                }
+
+                public void setAd_market(String ad_market) {
+                    this.ad_market = ad_market;
+                }
+
+                public String getAd_link() {
+                    return ad_link;
+                }
+
+                public void setAd_link(String ad_link) {
+                    this.ad_link = ad_link;
+                }
+
+                public String getAd_code() {
+                    return ad_code;
+                }
+
+                public void setAd_code(String ad_code) {
+                    this.ad_code = ad_code;
+                }
+
+                public String getAd_point() {
+                    return ad_point;
+                }
+
+                public void setAd_point(String ad_point) {
+                    this.ad_point = ad_point;
+                }
+
+                public String getAd_img() {
+                    return ad_img;
+                }
+
+                public void setAd_img(String ad_img) {
+                    this.ad_img = ad_img;
+                }
+
+                public String getAd_logo() {
+                    return ad_logo;
+                }
+
+                public void setAd_logo(String ad_logo) {
+                    this.ad_logo = ad_logo;
+                }
+
+                public String getAdLink_id() {
+                    return adLink_id;
+                }
+
+                public void setAdLink_id(String adLink_id) {
+                    this.adLink_id = adLink_id;
+                }
+            }
+        }
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/server/model/CourseModel.java b/qpython/src/main/java/org/qpython/qpy/main/server/model/CourseModel.java
new file mode 100644
index 00000000..f99d9101
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/server/model/CourseModel.java
@@ -0,0 +1,338 @@
+package org.qpython.qpy.main.server.model;
+
+import org.qpython.qpy.codeshare.pojo.Gist;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * Created by Hmei
+ * on 2017-06-29.
+ */
+
+public class CourseModel implements Serializable {
+
+    /**
+     * src : http://qpython.org
+     * rdate : 2017-06-15
+     * auth : River
+     * link : http://edu.qpython.org/qpython-quick-start/index.html
+     * smodule : qpython-quick-start
+     * description : QPython Quick Start
+     * title : QPython Quick Start
+     * ver : 1.0.0
+     * downloads : 10,000+
+     * cat : featured
+     * level : 1
+     * logo : http://www.qpython.org/images/bestpython.png
+     * open : 1
+     * courses : [{"rdate":"2017-06-15","link":"http://edu.qpython.org/qpython-quick-start/principles.html","smodule":"qpython-quick-start-principles","description":"Why QPython","title":"QPython Principles","downloads":"10,000+"},{"rdate":"2017-06-15","link":"http://edu.qpython.org/qpython-quick-start/terminal-howto.html","smodule":"qpython-quick-start-terminal-howto","description":"Explore to use QPython's Terminal","title":"Terminal howto","downloads":"10,000+"},{"rdate":"2017-06-15","link":"http://edu.qpython.org/qpython-quick-start/terminal-editor.html","smodule":"qpython-quick-start-editor-howto","description":"Develop with QPython's editor ","title":"Editor howto","downloads":"10,000+"},{"rdate":"2017-06-15","link":"http://edu.qpython.org/qpython-quick-start/qpypi-howto.html","smodule":"qpython-quick-start-qpypi-howto","description":"Install packages & programs on QPython","title":"QPYPI howto","downloads":"10,000+"},{"rdate":"2017-06-15","link":"http://edu.qpython.org/qpython-quick-start/community-howto.html","smodule":"qpython-quick-start-community-howto","description":"Join a QPython community","title":"Community howto","downloads":"10,000+"}]
+     * author : River
+     */
+
+    private String                 src;
+    private String                 rdate;
+    private String                 auth;
+    private String                 link;
+    private String                 smodule;
+    private String                 description;
+    private String                 title;
+    private String                 ver;
+    private String                 downloads;
+    private String                 cat;
+    private int                    level;
+    private String                 logo;
+    private int                    open;
+    private String                 author;
+    private List<CoursesBean>      courses;
+    private int                    crowdfunding;
+    private String                 auth_desc;
+    private String                 auth_avatar;
+    private int                    funding_process;
+    private List<FundingUserBean>  funding_user;
+    private List<Gist.CommentBean> comment;
+    private String                 type; // basic/web/aipy/arvr/database
+
+    public String getExplanation() {
+        return explanation;
+    }
+
+    public void setExplanation(String explanation) {
+        this.explanation = explanation;
+    }
+
+    private String explanation;
+
+    public String getSrc() {
+        return src;
+    }
+
+    public void setSrc(String src) {
+        this.src = src;
+    }
+
+    public String getRdate() {
+        return rdate;
+    }
+
+    public void setRdate(String rdate) {
+        this.rdate = rdate;
+    }
+
+    public String getAuth() {
+        return auth;
+    }
+
+    public void setAuth(String auth) {
+        this.auth = auth;
+    }
+
+    public String getLink() {
+        return link;
+    }
+
+    public void setLink(String link) {
+        this.link = link;
+    }
+
+    public String getSmodule() {
+        return smodule;
+    }
+
+    public void setSmodule(String smodule) {
+        this.smodule = smodule;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getVer() {
+        return ver;
+    }
+
+    public void setVer(String ver) {
+        this.ver = ver;
+    }
+
+    public String getDownloads() {
+        return downloads;
+    }
+
+    public void setDownloads(String downloads) {
+        this.downloads = downloads;
+    }
+
+    public String getCat() {
+        return cat;
+    }
+
+    public void setCat(String cat) {
+        this.cat = cat;
+    }
+
+    public int getLevel() {
+        return level;
+    }
+
+    public void setLevel(int level) {
+        this.level = level;
+    }
+
+    public String getLogo() {
+        return logo;
+    }
+
+    public void setLogo(String logo) {
+        this.logo = logo;
+    }
+
+    public int getOpen() {
+        return open;
+    }
+
+    public void setOpen(int open) {
+        this.open = open;
+    }
+
+    public String getAuthor() {
+        return author;
+    }
+
+    public void setAuthor(String author) {
+        this.author = author;
+    }
+
+    public List<CoursesBean> getCourses() {
+        return courses;
+    }
+
+    public void setCourses(List<CoursesBean> courses) {
+        this.courses = courses;
+    }
+
+    public int getCrowdfunding() {
+        return crowdfunding;
+    }
+
+    public void setCrowdfunding(int crowdfunding) {
+        this.crowdfunding = crowdfunding;
+    }
+
+    public String getAuth_desc() {
+        return auth_desc;
+    }
+
+    public void setAuth_desc(String auth_desc) {
+        this.auth_desc = auth_desc;
+    }
+
+    public String getAuth_avatar() {
+        return auth_avatar == null ? "" : auth_avatar;
+    }
+
+    public void setAuth_avatar(String auth_avatar) {
+        this.auth_avatar = auth_avatar;
+    }
+
+    public int getFunding_process() {
+        return funding_process;
+    }
+
+    public void setFunding_process(int funding_process) {
+        this.funding_process = funding_process;
+    }
+
+    public List<FundingUserBean> getFunding_user() {
+        return funding_user;
+    }
+
+    public void setFunding_user(List<FundingUserBean> funding_user) {
+        this.funding_user = funding_user;
+    }
+
+    public List<Gist.CommentBean> getComment() {
+        return comment;
+    }
+
+    public void setComment(List<Gist.CommentBean> comment) {
+        this.comment = comment;
+    }
+
+    public String getType() {
+        return type == null ? "" : type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public static class FundingUserBean implements Serializable {
+        /**
+         * avatar : data
+         * name : Zoe Saldana
+         */
+
+        private String avatar;
+        private String name;
+
+        public String getAvatar() {
+            return avatar;
+        }
+
+        public void setAvatar(String avatar) {
+            this.avatar = avatar;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public void setName(String name) {
+            this.name = name;
+        }
+    }
+
+    public static class CoursesBean implements Serializable {
+        /**
+         * rdate : 2017-06-15
+         * link : http://edu.qpython.org/qpython-quick-start/principles.html
+         * smodule : qpython-quick-start-principles
+         * description : Why QPython
+         * title : QPython Principles
+         * downloads : 10,000+
+         */
+
+        private String rdate;
+        private String link;
+        private String smodule;
+        private String description;
+        private String title;
+        private String downloads;
+
+        public String getRdate() {
+            return rdate;
+        }
+
+        public void setRdate(String rdate) {
+            this.rdate = rdate;
+        }
+
+        public String getLink() {
+            return link;
+        }
+
+        public void setLink(String link) {
+            this.link = link;
+        }
+
+        public String getSmodule() {
+            return smodule;
+        }
+
+        public void setSmodule(String smodule) {
+            this.smodule = smodule;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public void setDescription(String description) {
+            this.description = description;
+        }
+
+        public String getTitle() {
+            return title;
+        }
+
+        public void setTitle(String title) {
+            this.title = title;
+        }
+
+        public String getDownloads() {
+            return downloads;
+        }
+
+        public void setDownloads(String downloads) {
+            this.downloads = downloads;
+        }
+
+        @Override
+        public String toString() {
+            return title;
+        }
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/server/model/DownloadProgressModel.java b/qpython/src/main/java/org/qpython/qpy/main/server/model/DownloadProgressModel.java
new file mode 100644
index 00000000..64a6209c
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/server/model/DownloadProgressModel.java
@@ -0,0 +1,63 @@
+package org.qpython.qpy.main.server.model;
+
+import android.os.RecoverySystem;
+
+import java.io.IOException;
+
+import okhttp3.MediaType;
+import okhttp3.ResponseBody;
+import okio.Buffer;
+import okio.BufferedSource;
+import okio.ForwardingSource;
+import okio.Okio;
+import okio.Source;
+
+/**
+ * Created by Hmei on 2017-07-07.
+ */
+
+public class DownloadProgressModel extends ResponseBody {
+    private final ResponseBody                    responseBody;
+    private final RecoverySystem.ProgressListener progressListener;
+    private       BufferedSource                  bufferedSource;
+
+    public DownloadProgressModel(ResponseBody responseBody, RecoverySystem.ProgressListener progressListener) {
+        this.responseBody = responseBody;
+        //传入回调
+        this.progressListener = progressListener;
+    }
+
+    @Override
+    public MediaType contentType() {
+        return responseBody.contentType();
+    }
+
+    @Override
+    public long contentLength() {
+        return responseBody.contentLength();
+    }
+
+    @Override
+    public BufferedSource source() {
+        if (bufferedSource == null) {
+            bufferedSource = Okio.buffer(source(responseBody.source()));
+        }
+        return bufferedSource;
+    }
+
+    private Source source(Source source) {
+        return new ForwardingSource(source) {
+            long totalBytesRead = 0L;
+
+            @Override
+            public long read(Buffer sink, long byteCount) throws IOException {
+                long bytesRead = super.read(sink, byteCount);
+                // read() returns the number of bytes read, or -1 if this source is exhausted.
+                totalBytesRead += bytesRead != -1 ? bytesRead : 0;
+                //实现回调
+                progressListener.onProgress((int) (totalBytesRead / responseBody.contentLength() * 100));
+                return bytesRead;
+            }
+        };
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/server/model/GooglePurchaseModel.java b/qpython/src/main/java/org/qpython/qpy/main/server/model/GooglePurchaseModel.java
new file mode 100644
index 00000000..6dbf1944
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/server/model/GooglePurchaseModel.java
@@ -0,0 +1,82 @@
+package org.qpython.qpy.main.server.model;
+
+/**
+ * Created by Hmei on 2017-07-19.
+ */
+
+public class GooglePurchaseModel {
+
+    /**
+     * orderId : GPA.1234-5678-9012-34567
+     * packageName : com.example.app
+     * productId : exampleSku
+     * purchaseTime : 1345678900000
+     * purchaseState : 0
+     * developerPayload : bGoa+V7g/yqDXvKRqq+JTFn4uQZbPiQJo4pf9RzJ
+     * purchaseToken : opaque-token-up-to-1000-characters
+     */
+
+    private String orderId;
+    private String packageName;
+    private String productId;
+    private long   purchaseTime;
+    private int    purchaseState;
+    private String developerPayload;
+    private String purchaseToken;
+
+    public String getOrderId() {
+        return orderId;
+    }
+
+    public void setOrderId(String orderId) {
+        this.orderId = orderId;
+    }
+
+    public String getPackageName() {
+        return packageName;
+    }
+
+    public void setPackageName(String packageName) {
+        this.packageName = packageName;
+    }
+
+    public String getProductId() {
+        return productId;
+    }
+
+    public void setProductId(String productId) {
+        this.productId = productId;
+    }
+
+    public long getPurchaseTime() {
+        return purchaseTime;
+    }
+
+    public void setPurchaseTime(long purchaseTime) {
+        this.purchaseTime = purchaseTime;
+    }
+
+    public int getPurchaseState() {
+        return purchaseState;
+    }
+
+    public void setPurchaseState(int purchaseState) {
+        this.purchaseState = purchaseState;
+    }
+
+    public String getDeveloperPayload() {
+        return developerPayload;
+    }
+
+    public void setDeveloperPayload(String developerPayload) {
+        this.developerPayload = developerPayload;
+    }
+
+    public String getPurchaseToken() {
+        return purchaseToken;
+    }
+
+    public void setPurchaseToken(String purchaseToken) {
+        this.purchaseToken = purchaseToken;
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/server/model/LibModel.java b/qpython/src/main/java/org/qpython/qpy/main/server/model/LibModel.java
new file mode 100644
index 00000000..4fc49fe8
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/server/model/LibModel.java
@@ -0,0 +1,54 @@
+package org.qpython.qpy.main.server.model;
+
+import com.quseit.util.DateTimeHelper;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.main.app.App;
+
+import java.util.Date;
+
+/**
+ * Lib model
+ * Created by Hmei on 2017-05-27.
+ */
+
+public class LibModel extends BaseLibModel{
+
+    /**
+     * src : http://kivy.org
+     * rdate : 2017-06-15
+     * link : http://dl.qpy.io/2x/kivy/kivy-1.9.1.zip
+     * description : kivy 1.9.1 prebuild for qpython
+     * title : kivy
+     * ver : 1
+     * cat : dev
+     * md5sum :
+     * smodule : kivy
+     * icon :
+     */
+
+    private String md5sum;
+    private String icon;
+
+    public LibModel(String title, Date lastModify) {
+        super(title);
+        installed = true;
+        description = App.getContext().getString(R.string.update_time_hint, DateTimeHelper.formatData(lastModify,"yyyy-MM-dd"));
+    }
+
+    public String getMd5sum() {
+        return md5sum;
+    }
+
+    public void setMd5sum(String md5sum) {
+        this.md5sum = md5sum;
+    }
+
+    public String getIcon() {
+        return icon;
+    }
+
+    public void setIcon(String icon) {
+        this.icon = icon;
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/server/model/MyCourse.java b/qpython/src/main/java/org/qpython/qpy/main/server/model/MyCourse.java
new file mode 100644
index 00000000..8f5c8950
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/server/model/MyCourse.java
@@ -0,0 +1,373 @@
+package org.qpython.qpy.main.server.model;
+
+import java.util.List;
+
+/**
+ * Created by Hmei
+ * 1/22/18.
+ */
+
+public class MyCourse {
+    /**
+     * errorno : 0
+     * data : [{"info":{"src":"http://qpython.org","ver":"1.0.0","description":"Tensorflow Programming","crowdfunding":1,"title":"Tensorflow Programming","open":1,"downloads":"1,000+","level":1,"cat":"new","rdate":"2017-09-15","link":"http://edu.qpython.org/aipy-tensorflow/index.html","logo":"http://edu.qpython.org/static/course-tensorflow.png","funding_process":69,"smodule":"aipy-tensorflow"},"list":[{"gd":"course_0.99","created":"2017122712"}],"type":"notready","course":"aipy-tensorflow-index"},{"info":{"description":"How to start QPython","title":"QPython Quick Start","open":1,"downloads":"10,000+","level":1,"rdate":"2017-06-15","link":"http://edu.qpython.org/qpython-quick-start/index.html","type":"free","logo":"http://edu.qpython.org/static/course-qpython-quick-start.png","smodule":"qpython-quick-start"},"list":[{"gd":"course_free","created":"2018021109"}],"type":"free","course":"qpython-quick-start"}]
+     */
+
+    private int errorno;
+    private List<DataBean> data;
+
+    public int getErrorno() {
+        return errorno;
+    }
+
+    public void setErrorno(int errorno) {
+        this.errorno = errorno;
+    }
+
+    public List<DataBean> getData() {
+        return data;
+    }
+
+    public void setData(List<DataBean> data) {
+        this.data = data;
+    }
+
+    public static class DataBean {
+        /**
+         * info : {"src":"http://qpython.org","ver":"1.0.0","description":"Tensorflow Programming","crowdfunding":1,"title":"Tensorflow Programming","open":1,"downloads":"1,000+","level":1,"cat":"new","rdate":"2017-09-15","link":"http://edu.qpython.org/aipy-tensorflow/index.html","logo":"http://edu.qpython.org/static/course-tensorflow.png","funding_process":69,"smodule":"aipy-tensorflow"}
+         * list : [{"gd":"course_0.99","created":"2017122712"}]
+         * type : notready
+         * course : aipy-tensorflow-index
+         */
+
+        private InfoBean info;
+        private String         course;
+        private String type; // free/crowdfunding/notready
+        private List<ListBean> list;
+
+        public InfoBean getInfo() {
+            return info;
+        }
+
+        public void setInfo(InfoBean info) {
+            this.info = info;
+        }
+
+        public String getType() {
+            return type;
+        }
+
+        public void setType(String type) {
+            this.type = type;
+        }
+
+        public String getCourse() {
+            return course;
+        }
+
+        public void setCourse(String course) {
+            this.course = course;
+        }
+
+        public List<ListBean> getList() {
+            return list;
+        }
+
+        public void setList(List<ListBean> list) {
+            this.list = list;
+        }
+
+        public static class InfoBean {
+            /**
+             * src : http://qpython.org
+             * ver : 1.0.0
+             * description : Tensorflow Programming
+             * crowdfunding : 1
+             * title : Tensorflow Programming
+             * open : 1
+             * downloads : 1,000+
+             * level : 1
+             * cat : new
+             * rdate : 2017-09-15
+             * link : http://edu.qpython.org/aipy-tensorflow/index.html
+             * logo : http://edu.qpython.org/static/course-tensorflow.png
+             * funding_process : 69
+             * smodule : aipy-tensorflow
+             */
+
+            private String src;
+            private String ver;
+            private String description;
+            private int    crowdfunding;
+            private String title;
+            private int    open;
+            private String downloads;
+            private int    level;
+            private String cat;
+            private String rdate;
+            private String link;
+            private String logo;
+            private int    funding_process;
+            private String smodule;
+            private String auth;
+
+            public String getSrc() {
+                return src;
+            }
+
+            public void setSrc(String src) {
+                this.src = src;
+            }
+
+            public String getVer() {
+                return ver;
+            }
+
+            public void setVer(String ver) {
+                this.ver = ver;
+            }
+
+            public String getDescription() {
+                return description;
+            }
+
+            public void setDescription(String description) {
+                this.description = description;
+            }
+
+            public int getCrowdfunding() {
+                return crowdfunding;
+            }
+
+            public void setCrowdfunding(int crowdfunding) {
+                this.crowdfunding = crowdfunding;
+            }
+
+            public String getTitle() {
+                return title;
+            }
+
+            public void setTitle(String title) {
+                this.title = title;
+            }
+
+            public int getOpen() {
+                return open;
+            }
+
+            public void setOpen(int open) {
+                this.open = open;
+            }
+
+            public String getDownloads() {
+                return downloads;
+            }
+
+            public void setDownloads(String downloads) {
+                this.downloads = downloads;
+            }
+
+            public int getLevel() {
+                return level;
+            }
+
+            public void setLevel(int level) {
+                this.level = level;
+            }
+
+            public String getCat() {
+                return cat;
+            }
+
+            public void setCat(String cat) {
+                this.cat = cat;
+            }
+
+            public String getRdate() {
+                return rdate;
+            }
+
+            public void setRdate(String rdate) {
+                this.rdate = rdate;
+            }
+
+            public String getLink() {
+                return link;
+            }
+
+            public void setLink(String link) {
+                this.link = link;
+            }
+
+            public String getLogo() {
+                return logo;
+            }
+
+            public void setLogo(String logo) {
+                this.logo = logo;
+            }
+
+            public int getFunding_process() {
+                return funding_process;
+            }
+
+            public void setFunding_process(int funding_process) {
+                this.funding_process = funding_process;
+            }
+
+            public String getSmodule() {
+                return smodule;
+            }
+
+            public void setSmodule(String smodule) {
+                this.smodule = smodule;
+            }
+
+            public String getAuth() {
+                return auth;
+            }
+
+            public void setAuth(String auth) {
+                this.auth = auth;
+            }
+        }
+
+        public static class ListBean {
+            /**
+             * gd : course_0.99
+             * created : 2017122712
+             */
+
+            private String gd;
+            private String created;
+
+            public String getGd() {
+                return gd;
+            }
+
+            public void setGd(String gd) {
+                this.gd = gd;
+            }
+
+            public String getCreated() {
+                return created;
+            }
+
+            public void setCreated(String created) {
+                this.created = created;
+            }
+        }
+    }
+
+
+//
+//    /**
+//     * errorno : 0
+//     * data : [{"info":{"src":"http://qpython.org","ver":"1.0.0","description":"Python Basic","title":"Python Basic","open":0,"downloads":"1,000+","level":1,"cat":"new","rdate":"2017-09-15","link":"http://edu.qpython.org/python-base/index.html","logo":"http://edu.qpython.org/static/course-python-basic.png","smodule":"python-base"},"list":[{"gd":"course_4.99","created":"2018011017"},{"gd":"course_3.99","created":"2018011017"},{"gd":"course_2.99","created":"2018011017"},{"gd":"course_1.99","created":"2018011017"},{"gd":"course_0.99","created":"2018011017"}],"type":"course","course":"python-base-index"}]
+//     */
+//
+//    private int errorno;
+//    private List<DataBean> data;
+//
+//    public int getErrorno() {
+//        return errorno;
+//    }
+//
+//    public void setErrorno(int errorno) {
+//        this.errorno = errorno;
+//    }
+//
+//    public List<DataBean> getData() {
+//        return data;
+//    }
+//
+//    public void setData(List<DataBean> data) {
+//        this.data = data;
+//    }
+//
+//    public static class DataBean {
+//        /**
+//         * info : {"src":"http://qpython.org","ver":"1.0.0","description":"Python Basic","title":"Python Basic","open":0,"downloads":"1,000+","level":1,"cat":"new","rdate":"2017-09-15","link":"http://edu.qpython.org/python-base/index.html","logo":"http://edu.qpython.org/static/course-python-basic.png","smodule":"python-base"}
+//         * list : [{"gd":"course_4.99","created":"2018011017"},{"gd":"course_3.99","created":"2018011017"},{"gd":"course_2.99","created":"2018011017"},{"gd":"course_1.99","created":"2018011017"},{"gd":"course_0.99","created":"2018011017"}]
+//         * type : course
+//         * course : python-base-index
+//         */
+//
+//        private InfoBean info;
+//        private String         type;
+//        private String         course;
+//        private List<ListBean> list;
+//
+//        public InfoBean getInfo() {
+//            return info;
+//        }
+//
+//        public void setInfo(InfoBean info) {
+//            this.info = info;
+//        }
+//
+//        public String getType() {
+//            return type;
+//        }
+//
+//        public void setType(String type) {
+//            this.type = type;
+//        }
+//
+//        public String getCourse() {
+//            return course;
+//        }
+//
+//        public void setCourse(String course) {
+//            this.course = course;
+//        }
+//
+//        public List<ListBean> getList() {
+//            return list;
+//        }
+//
+//        public void setList(List<ListBean> list) {
+//            this.list = list;
+//        }
+//
+//        public static class InfoBean extends CourseModel{
+//            private String type; // free/crowdfunding/notready
+//
+//            @Override
+//            public String getType() {
+//                return type;
+//            }
+//
+//            @Override
+//            public void setType(String type) {
+//                this.type = type;
+//            }
+//        }
+//
+//        public static class ListBean {
+//            /**
+//             * gd : course_4.99
+//             * created : 2018011017
+//             */
+//
+//            private String gd;
+//            private String created;
+//
+//            public String getGd() {
+//                return gd;
+//            }
+//
+//            public void setGd(String gd) {
+//                this.gd = gd;
+//            }
+//
+//            public String getCreated() {
+//                return created;
+//            }
+//
+//            public void setCreated(String created) {
+//                this.created = created;
+//            }
+//        }
+//    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/server/model/PayStatusModel.java b/qpython/src/main/java/org/qpython/qpy/main/server/model/PayStatusModel.java
new file mode 100644
index 00000000..abae7359
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/server/model/PayStatusModel.java
@@ -0,0 +1,44 @@
+package org.qpython.qpy.main.server.model;
+
+/**
+ * Created by Hmei
+ * 2/11/18.
+ */
+
+public class PayStatusModel {
+
+
+    /**
+     * errorno : 0
+     * payed : 1
+     * msg :
+     */
+
+    private int errorno;
+    private int    payed; // >0 -> 已参与众筹/购买
+    private String msg;
+
+    public int getErrorno() {
+        return errorno;
+    }
+
+    public void setErrorno(int errorno) {
+        this.errorno = errorno;
+    }
+
+    public int getPayed() {
+        return payed;
+    }
+
+    public void setPayed(int payed) {
+        this.payed = payed;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/server/model/QpypiModel.java b/qpython/src/main/java/org/qpython/qpy/main/server/model/QpypiModel.java
new file mode 100644
index 00000000..0c1b00c3
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/server/model/QpypiModel.java
@@ -0,0 +1,19 @@
+package org.qpython.qpy.main.server.model;
+
+public class QpypiModel extends BaseLibModel{
+    public QpypiModel(String title) {
+        super(title);
+    }
+
+    /**
+     * src : http://qpypi.qpython.org/pyshop/package/numpy
+     * rdate : 2017-06-01
+     * link : http://pip:qpython@qpypi.qpython.org:11000/simple
+     * smodule : numpy
+     * description : numPy is the fundamental package needed for scientific computing with Python
+     * title : Numpy
+     * ver : 1.9.2
+     * downloads : 20229
+     * cat : qpypi
+     */
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/server/model/SettingModel.java b/qpython/src/main/java/org/qpython/qpy/main/server/model/SettingModel.java
new file mode 100644
index 00000000..807642b1
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/server/model/SettingModel.java
@@ -0,0 +1,208 @@
+package org.qpython.qpy.main.server.model;
+
+import java.util.List;
+
+/**
+ * Created by Hmei on 2017-06-29.
+ */
+
+public class SettingModel {
+    /**
+     * qpy : {"website":"http://qpython.org","feedback":"support@qpython.org","ext2":{"adx_setting":"pa|marquee","adx_splash":"pa|full"},"ext_ad":{"full":[{"ad_man":"QPython","ad_market":"Global","ad_link":"http://www.qpython.org","ad_code":"org.qpython.qpy","ad_point":"10","ad_img":"http://apu.quseit.com/static/adimg/qpy-748x1062.png","ad_logo":"","adLink_id":"6"}],"marquee":[{"ad_man":"QPython","ad_market":"Global","ad_link":"http://www.qpython.org","ad_code":"org.qpython.qpy","ad_point":"10","ad_img":"http://apu.quseit.com/static/adimg/qpy-600x200.png","ad_logo":"","adLink_id":"6"}]}}
+     */
+
+    private QpyBean      qpy;
+
+    public QpyBean getQpy() {
+        return qpy;
+    }
+
+    public void setQpy(QpyBean qpy) {
+        this.qpy = qpy;
+    }
+
+    public static class QpyBean {
+
+        /**
+         * website : http://qpython.org
+         * feedback : support@qpython.org
+         * ext2 : {"adx_setting":"pa|marquee","adx_splash":"pa|full"}
+         * ext_ad : {"full":[{"ad_man":"QPython","ad_market":"Global","ad_link":"http://www.qpython.org","ad_code":"org.qpython.qpy","ad_point":"10","ad_img":"http://apu.quseit.com/static/adimg/qpy-748x1062.png","ad_logo":"","adLink_id":"6"}],"marquee":[{"ad_man":"QPython","ad_market":"Global","ad_link":"http://www.qpython.org","ad_code":"org.qpython.qpy","ad_point":"10","ad_img":"http://apu.quseit.com/static/adimg/qpy-600x200.png","ad_logo":"","adLink_id":"6"}]}
+         */
+
+        private String website;
+        private String    feedback;
+        private Ext2Bean  ext2;
+        private ExtAdBean ext_ad;
+        public String getWebsite() {
+            return website;
+        }
+
+        public void setWebsite(String website) {
+            this.website = website;
+        }
+
+        public String getFeedback() {
+            return feedback;
+        }
+
+        public void setFeedback(String feedback) {
+            this.feedback = feedback;
+        }
+
+        public Ext2Bean getExt2() {
+            return ext2;
+        }
+
+        public void setExt2(Ext2Bean ext2) {
+            this.ext2 = ext2;
+        }
+
+        public ExtAdBean getExt_ad() {
+            return ext_ad;
+        }
+
+        public void setExt_ad(ExtAdBean ext_ad) {
+            this.ext_ad = ext_ad;
+        }
+
+        public static class Ext2Bean {
+
+            /**
+             * adx_setting : pa|marquee
+             * adx_splash : pa|full
+             */
+
+            private String adx_setting;
+            private String adx_splash;
+            public String getAdx_setting() {
+                return adx_setting;
+            }
+
+            public void setAdx_setting(String adx_setting) {
+                this.adx_setting = adx_setting;
+            }
+
+            public String getAdx_splash() {
+                return adx_splash;
+            }
+
+            public void setAdx_splash(String adx_splash) {
+                this.adx_splash = adx_splash;
+            }
+
+        }
+        public static class ExtAdBean {
+
+            private List<ADBean> full;
+            private List<ADBean> marquee;
+            public List<ADBean> getFull() {
+                return full;
+            }
+
+            public void setFull(List<ADBean> full) {
+                this.full = full;
+            }
+
+            public List<ADBean> getMarquee() {
+                return marquee;
+            }
+
+            public void setMarquee(List<ADBean> marquee) {
+                this.marquee = marquee;
+            }
+
+            public List<ADBean> getList(String name) {
+                if (name.equals("full"))
+                    return full;
+                else
+                    return marquee;
+            }
+        }
+    }
+    public static class ADBean {
+        /**
+         * ad_man : QPython
+         * ad_market : Global
+         * ad_link : http://www.qpython.org
+         * ad_code : org.qpython.qpy
+         * ad_point : 10
+         * ad_img : http://apu.quseit.com/static/adimg/qpy-748x1062.png
+         * ad_logo :
+         * adLink_id : 6
+         */
+
+        private String ad_man;
+        private String ad_market;
+        private String ad_link;
+        private String ad_code;
+        private String ad_point;
+        private String ad_img;
+        private String ad_logo;
+        private String adLink_id;
+
+        public String getAd_man() {
+            return ad_man;
+        }
+
+        public void setAd_man(String ad_man) {
+            this.ad_man = ad_man;
+        }
+
+        public String getAd_market() {
+            return ad_market;
+        }
+
+        public void setAd_market(String ad_market) {
+            this.ad_market = ad_market;
+        }
+
+        public String getAd_link() {
+            return ad_link;
+        }
+
+        public void setAd_link(String ad_link) {
+            this.ad_link = ad_link;
+        }
+
+        public String getAd_code() {
+            return ad_code;
+        }
+
+        public void setAd_code(String ad_code) {
+            this.ad_code = ad_code;
+        }
+
+        public String getAd_point() {
+            return ad_point;
+        }
+
+        public void setAd_point(String ad_point) {
+            this.ad_point = ad_point;
+        }
+
+        public String getAd_img() {
+            return ad_img;
+        }
+
+        public void setAd_img(String ad_img) {
+            this.ad_img = ad_img;
+        }
+
+        public String getAd_logo() {
+            return ad_logo;
+        }
+
+        public void setAd_logo(String ad_logo) {
+            this.ad_logo = ad_logo;
+        }
+
+        public String getAdLink_id() {
+            return adLink_id;
+        }
+
+        public void setAdLink_id(String adLink_id) {
+            this.adLink_id = adLink_id;
+        }
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/server/model/UpdateModel.java b/qpython/src/main/java/org/qpython/qpy/main/server/model/UpdateModel.java
new file mode 100644
index 00000000..c7a76d5d
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/server/model/UpdateModel.java
@@ -0,0 +1,90 @@
+package org.qpython.qpy.main.server.model;
+
+import java.util.List;
+
+/**
+ * Created by Hmei on 2017-06-27.
+ */
+
+public class UpdateModel {
+
+    /**
+     * app : {"link":"http://www.qpython.org","ver":200,"ver_plugin":"0","ver_desc":"Newest version you should upgrade","ver_name":"2.0.0"}
+     * plugins : []
+     */
+
+    private AppBean app;
+    private List<?> plugins;
+
+    public AppBean getApp() {
+        return app;
+    }
+
+    public void setApp(AppBean app) {
+        this.app = app;
+    }
+
+    public List<?> getPlugins() {
+        return plugins;
+    }
+
+    public void setPlugins(List<?> plugins) {
+        this.plugins = plugins;
+    }
+
+    public static class AppBean {
+        /**
+         * link : http://www.qpython.org
+         * ver : 200
+         * ver_plugin : 0
+         * ver_desc : Newest version you should upgrade
+         * ver_name : 2.0.0
+         */
+
+        private String link;
+        private int    ver;
+        private String ver_plugin;
+        private String ver_desc;
+        private String ver_name;
+
+        public String getLink() {
+            return link;
+        }
+
+        public void setLink(String link) {
+            this.link = link;
+        }
+
+        public int getVer() {
+            return ver;
+        }
+
+        public void setVer(int ver) {
+            this.ver = ver;
+        }
+
+        public String getVer_plugin() {
+            return ver_plugin;
+        }
+
+        public void setVer_plugin(String ver_plugin) {
+            this.ver_plugin = ver_plugin;
+        }
+
+        public String getVer_desc() {
+            return ver_desc;
+        }
+
+        public void setVer_desc(String ver_desc) {
+            this.ver_desc = ver_desc;
+        }
+
+        public String getVer_name() {
+            return ver_name;
+        }
+
+        public void setVer_name(String ver_name) {
+            this.ver_name = ver_name;
+        }
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/service/FTPServerService.java b/qpython/src/main/java/org/qpython/qpy/main/service/FTPServerService.java
new file mode 100644
index 00000000..a0e5c482
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/service/FTPServerService.java
@@ -0,0 +1,14 @@
+package org.qpython.qpy.main.service;
+
+import org.qpython.qpy.main.activity.SettingActivity;
+
+/**
+ * Created by Hmei on 2017-06-13.
+ */
+
+public class FTPServerService extends org.swiftp.FTPServerService {
+    @Override
+    protected Class<?> getSettingClass() {
+        return SettingActivity.class;
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/service/QPyService.java b/qpython/src/main/java/org/qpython/qpy/main/service/QPyService.java
new file mode 100644
index 00000000..0da10af6
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/service/QPyService.java
@@ -0,0 +1,26 @@
+package org.qpython.qpy.main.service;
+
+import android.app.IntentService;
+import android.content.Intent;
+import android.support.annotation.Nullable;
+
+/**
+ * Receive QPY broadcast and exec python programs
+ * Created by Hmei on 2017-07-25.
+ */
+
+public class QPyService extends IntentService {
+
+    /**
+     * Creates an IntentService.  Invoked by your subclass's constructor.
+     *
+//     * @param name Used to name the worker thread, important only for debugging.
+     */
+    public QPyService() {
+        super("QPyService");
+    }
+
+    @Override
+    protected void onHandleIntent(@Nullable Intent intent) {
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/utils/Bus.java b/qpython/src/main/java/org/qpython/qpy/main/utils/Bus.java
index 22a46daa..89cd731d 100644
--- a/qpython/src/main/java/org/qpython/qpy/main/utils/Bus.java
+++ b/qpython/src/main/java/org/qpython/qpy/main/utils/Bus.java
@@ -1,12 +1,12 @@
-package org.qpython.qpy.main.utils;
-
-
-import org.greenrobot.eventbus.EventBus;
-
-public class Bus {
-    private static final EventBus INSTANCE = new EventBus();
-
-    public static EventBus getDefault() {
-        return INSTANCE;
-    }
-}
+package org.qpython.qpy.main.utils;
+
+
+import org.greenrobot.eventbus.EventBus;
+
+public class Bus {
+    private static final EventBus INSTANCE = new EventBus();
+
+    public static EventBus getDefault() {
+        return INSTANCE;
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/utils/Utils.java b/qpython/src/main/java/org/qpython/qpy/main/utils/Utils.java
index 5ee033c7..0ffb03b8 100644
--- a/qpython/src/main/java/org/qpython/qpy/main/utils/Utils.java
+++ b/qpython/src/main/java/org/qpython/qpy/main/utils/Utils.java
@@ -12,22 +12,12 @@
 
 import org.qpython.qpy.main.activity.QWebViewActivity;
 import org.qpython.qpysdk.utils.FileHelper;
-import org.qpython.qpysdk.utils.FileUtils;
-import org.renpy.android.PythonActivity;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
 import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.InputStream;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Locale;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipInputStream;
 
 /**
  * Created by mathiasluo on 16-6-1.
@@ -35,167 +25,51 @@
 
 public class Utils extends org.qpython.qpysdk.utils.Utils {
     static final String TAG = "Utils";
-    public static void startWebActivityWithUrl(Context context, String title, String url, String script, boolean isNoHead, boolean isDrawer)  {
+
+    public static void startWebActivityWithUrl(Context context, String title, String url) {
+        Utils.startWebActivityWithUrl(context, title, url, "", false, false);
+    }
+    public static void startWebActivityWithUrl(Context context, String title, String url, String script, boolean isNoHead, boolean isDrawer) {
         Intent intent = new Intent(context, QWebViewActivity.class);
         if (script.equals("")) {
             Uri u = Uri.parse(url);
             intent.setData(u);
         }
 
-        intent.putExtra(PythonActivity.EXTRA_CONTENT_URL1, "main");
-        intent.putExtra(PythonActivity.EXTRA_CONTENT_URL2, title);
-        intent.putExtra(PythonActivity.EXTRA_CONTENT_URL3, url);
-        intent.putExtra(PythonActivity.EXTRA_CONTENT_URL4, script);
-        intent.putExtra(PythonActivity.EXTRA_CONTENT_URL5, isNoHead?"1":"0");
-        intent.putExtra(PythonActivity.EXTRA_CONTENT_URL6, isDrawer?"drawer":"");
-
+        intent.putExtra(QWebViewActivity.ACT, "main");
+        intent.putExtra(QWebViewActivity.TITLE, title);
+        intent.putExtra(QWebViewActivity.SRC, url);
+        intent.putExtra(QWebViewActivity.LOG_PATH, script);
+        intent.putExtra(QWebViewActivity.IS_NO_HEADER, isNoHead ? "1" : "0");
+        intent.putExtra(QWebViewActivity.IS_DRAWER, isDrawer ? "drawer" : "");
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
 
         context.startActivity(intent);
-        /*
-        new FinestWebView.Builder(context)
-                .theme(R.style.WebViewTheme)
-                .titleDefault(Title)
-                .webViewBuiltInZoomControls(true)
-                .webViewDisplayZoomControls(true)
-                .dividerHeight(0)
-                .gradientDivider(false)
-                .swipeRefreshColorRes(R.color.colorAccent)
-                .setCustomAnimations(R.anim.activity_open_enter, R.anim.activity_open_exit, R.anim.activity_close_enter, R.anim.activity_close_exit)
-                .show(url);
-                */
+
     }
 
     public static void createDirectoryOnExternalStorage(String path) {
         try {
-            if(Environment.getExternalStorageState().equalsIgnoreCase("mounted")) {
+            if (Environment.getExternalStorageState().equalsIgnoreCase("mounted")) {
                 File file = new File(Environment.getExternalStorageDirectory(), path);
                 if (!file.exists()) {
                     try {
                         file.mkdirs();
 
-                        Log.d(TAG, "createDirectoryOnExternalStorage created " + Environment.getExternalStorageDirectory().getAbsolutePath() + "/" +path);
+                        Log.d(TAG, "createDirectoryOnExternalStorage created " + Environment.getExternalStorageDirectory().getAbsolutePath() + "/" + path);
                     } catch (Exception e) {
-                        Log.e(TAG,"createDirectoryOnExternalStorage error: ", e);
+                        Log.e(TAG, "createDirectoryOnExternalStorage error: ", e);
                     }
                 }
-            }
-            else {
-                Log.e(TAG,"createDirectoryOnExternalStorage error: " + "External storage is not mounted");
+            } else {
+                Log.e(TAG, "createDirectoryOnExternalStorage error: " + "External storage is not mounted");
             }
         } catch (Exception e) {
-            Log.e(TAG,"createDirectoryOnExternalStorage error: " + e);
+            Log.e(TAG, "createDirectoryOnExternalStorage error: " + e);
         }
 
     }
 
-    public static boolean unzip(InputStream inputStream, String dest, boolean replaceIfExists) {
-        Log.d(TAG, "unzip:"+dest);
-        final int BUFFER_SIZE = 4096;
-
-        BufferedOutputStream bufferedOutputStream = null;
-
-        boolean succeed = true;
-
-        if (replaceIfExists) {
-            File file2 = new File(dest);
-            if (file2.exists()) {
-                try {
-                    boolean b = FileUtils.deleteDir(file2);
-                } catch (Exception e) {
-                }
-            }
-        }
-
-        try {
-            ZipInputStream zipInputStream = new ZipInputStream(new BufferedInputStream(inputStream));
-            ZipEntry zipEntry;
-
-            while ((zipEntry = zipInputStream.getNextEntry()) != null){
-
-                String zipEntryName = zipEntry.getName();
-                String fs = dest + zipEntryName;
-
-                if (!dest.endsWith("/")) {
-                    fs = dest;
-                }
-                //Log.d(TAG, "zipEntryName:"+zipEntryName+"-file2:"+fs+"-"+fs.indexOf('/'));
-
-//		       if(!zipEntry.isDirectory()) {
-//		 	       File fil = new File(dest + zipEntryName);
-//		 	       fil.getParent()
-//		       }
-
-                // file exists ? delete ?
-	 	       /*File file2 = new File(fs);
-	 	       if(file2.exists()) {
-	 		        if (replaceIfExists) {
-
-	 		 	       try {
-	 		 	    	  boolean b = deleteDir(file2);
-	 		 	    		  if(!b) {
-	 		 						Log.e(TAG, "Unzip failed to delete " + dest + zipEntryName);
-	 		 	    		  }
-	 		 	    		  else {
-	 		 						Log.d(TAG, "Unzip deleted " + dest + zipEntryName);
-	 		 	    		  }
-	 					} catch (Exception e) {
-	 						Log.e(TAG, "Unzip failed to delete " + dest + zipEntryName, e);
-	 					}
-	 		        }
-	 	       }*/
-
-                // extract
-                File file = new File(fs);
-
-                if (file.exists()){
-                    Log.d(TAG, "unzip exists");
-                } else {
-
-                    if(zipEntry.isDirectory()){
-                        file.mkdirs();
-                        FileUtils.chmod(file, 0755);
-
-                    }else{
-
-                        // create parent file folder if not exists yet
-                        if(!file.getParentFile().exists()) {
-                            file.getParentFile().mkdirs();
-                            FileUtils.chmod(file.getParentFile(), 0755);
-                        }
-
-                        byte buffer[] = new byte[BUFFER_SIZE];
-                        bufferedOutputStream = new BufferedOutputStream(new FileOutputStream(file), BUFFER_SIZE);
-                        int count;
-
-                        while ((count = zipInputStream.read(buffer, 0, BUFFER_SIZE)) != -1) {
-                            bufferedOutputStream.write(buffer, 0, count);
-                        }
-
-                        bufferedOutputStream.flush();
-                        bufferedOutputStream.close();
-                    }
-                }
-
-                // enable standalone python
-                if(file.getName().endsWith(".so")) {
-                    FileUtils.chmod(file, 0755);
-                }
-
-                Log.d(TAG,"Unzip extracted " + dest + zipEntryName);
-            }
-
-            zipInputStream.close();
-
-        } catch (FileNotFoundException e) {
-            Log.e(TAG,"Unzip error, file not found", e);
-            succeed = false;
-        }catch (Exception e) {
-            Log.e(TAG,"Unzip error: ", e);
-            succeed = false;
-        }
-
-        return succeed;
-    }
 
     public static boolean netOk(Context context) {
         try {
@@ -222,11 +96,11 @@ public static String getLang() {
         return Locale.getDefault().getLanguage();
     }
 
-    public static int getVersinoCode(Context context){
-        int intVersioinCode=0;
+    public static int getVersinoCode(Context context) {
+        int intVersioinCode = 0;
         try {
             PackageInfo info = context.getPackageManager().getPackageInfo(context.getPackageName(), 0);
-            intVersioinCode=info.versionCode;
+            intVersioinCode = info.versionCode;
         } catch (PackageManager.NameNotFoundException e) {
             e.printStackTrace();
         }
@@ -234,19 +108,19 @@ public static int getVersinoCode(Context context){
     }
 
     public static Intent openRemoteLink(Context context, String link) {
-        //Log.d(TAG, "openRemoteLink:"+link);
+        //LogUtil.d(TAG, "openRemoteLink:"+link);
         String vlowerFileName = link.toLowerCase();
         if (vlowerFileName.startsWith("lgmarket:")) {
             String[] xx = link.split(":");
-            //Log.d(TAG, "lgmarket:"+xx[1]);
+            //LogUtil.d(TAG, "lgmarket:"+xx[1]);
 
             Intent intent = new Intent("com.lge.lgworld.intent.action.VIEW");
             intent.setClassName("com.lge.lgworld", "com.lge.lgworld.LGReceiver");
-            intent.putExtra("lgworld.receiver","LGSW_INVOKE_DETAIL");
+            intent.putExtra("lgworld.receiver", "LGSW_INVOKE_DETAIL");
             intent.putExtra("APP_PID", xx[1]);
 
 			/*Intent intent = new Intent();
-			intent.setClassName("com.lg.apps.cubeapp", "com.lg.apps.cubeapp.PreIntroActivity");
+            intent.setClassName("com.lg.apps.cubeapp", "com.lg.apps.cubeapp.PreIntroActivity");
 			intent.putExtra("type", "APP_DETAIL ");
 			intent.putExtra("codeValue", ""); // value is not needed when moving to Detail page
 			intent.putExtra("content_id", xx[1]);   */
@@ -258,7 +132,7 @@ public static Intent openRemoteLink(Context context, String link) {
         } else {
             Uri uLink = Uri.parse(link);
 
-            Intent intent = new Intent( Intent.ACTION_VIEW, uLink );
+            Intent intent = new Intent(Intent.ACTION_VIEW, uLink);
 
             return intent;
         }
@@ -267,7 +141,7 @@ public static Intent openRemoteLink(Context context, String link) {
     public static String getCode(Context context) {
         String packageName = context.getPackageName();
         String[] xcode = packageName.split("\\.");
-        String code = xcode[xcode.length-1];
+        String code = xcode[xcode.length - 1];
         return code;
     }
 
@@ -281,7 +155,7 @@ public static boolean isQPy3(Context context) {
     }
 
     public static String getSrv(String script) {
-        //Log.d(TAG, "getSrv:"+script);
+        //LogUtil.d(TAG, "getSrv:"+script);
 
         String content = FileHelper.getFileContents(script);
 
@@ -290,20 +164,23 @@ public static String getSrv(String script) {
         Matcher matcher1 = srvPattern.matcher(content);
 
         if (matcher1.find()) {
-            srv = "http://"+matcher1.group(1);
+            srv = "http://" + matcher1.group(1);
 
-            //Log.d(TAG, "URL2:"+srv);
+            //LogUtil.d(TAG, "URL2:"+srv);
 
         }
         try {
             URL n = new URL(srv);
-            srv = n.getProtocol()+"://"+n.getHost()+":"+(n.getPort()>0?n.getPort():80);
-            //Log.d(TAG, "getsrv:"+srv);
+            srv = n.getProtocol() + "://" + n.getHost() + ":" + (n.getPort() > 0 ? n.getPort() : 80);
+            //LogUtil.d(TAG, "getsrv:"+srv);
         } catch (MalformedURLException e) {
             e.printStackTrace();
         }
         return srv;
     }
 
-
+    public static boolean isZn() {
+        String local = Locale.getDefault().getDisplayLanguage();
+        return "中文".equals(local);
+    }
 }
diff --git a/qpython/src/main/java/org/qpython/qpy/main/widget/CodeReviewDialog.java b/qpython/src/main/java/org/qpython/qpy/main/widget/CodeReviewDialog.java
new file mode 100644
index 00000000..8220a377
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/widget/CodeReviewDialog.java
@@ -0,0 +1,49 @@
+package org.qpython.qpy.main.widget;
+
+import android.app.Dialog;
+import android.content.Context;
+import android.support.annotation.NonNull;
+import android.text.SpannableString;
+import android.text.Spanned;
+import android.text.style.ForegroundColorSpan;
+import android.view.Gravity;
+import android.view.Window;
+import android.view.WindowManager;
+import android.widget.TextView;
+
+import org.qpython.qpy.R;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import static org.qpython.qpy.utils.CodePattern.COLOR_BUILTIN;
+import static org.qpython.qpy.utils.CodePattern.COLOR_COMMENT;
+import static org.qpython.qpy.utils.CodePattern.COLOR_KEYWORD;
+import static org.qpython.qpy.utils.CodePattern.PATTERN_PY_BUILD_IN;
+import static org.qpython.qpy.utils.CodePattern.PATTERN_PY_COMMENT;
+import static org.qpython.qpy.utils.CodePattern.PATTERN_PY_KEYWORD;
+
+/**
+ * 文 件 名: CodeReviewDialog
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2017/12/28 09:30
+ * 邮   箱: qq798435167@gmail.com
+ * 修改时间：
+ * 修改备注：
+ */
+
+public class CodeReviewDialog extends Dialog {
+    private TextView mTextView;
+
+    public CodeReviewDialog(@NonNull Context context) {
+        super(context, R.style.Dialog);
+        setContentView(R.layout.dialog_code_review);
+        mTextView = findViewById(R.id.code_content_tv);
+        findViewById(R.id.root_layout).setOnClickListener(v -> dismiss());
+
+    }
+
+    public void setContent(SpannableString content) {
+        mTextView.setText(content);
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/widget/CodeSendComment.java b/qpython/src/main/java/org/qpython/qpy/main/widget/CodeSendComment.java
new file mode 100644
index 00000000..99f1859d
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/widget/CodeSendComment.java
@@ -0,0 +1,139 @@
+package org.qpython.qpy.main.widget;
+
+import android.app.Dialog;
+import android.app.DialogFragment;
+import android.content.Context;
+import android.databinding.DataBindingUtil;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.text.Editable;
+import android.text.Html;
+import android.text.TextWatcher;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.Window;
+import android.view.WindowManager;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.RelativeLayout;
+import android.widget.Toast;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.codeshare.ShareCodeUtil;
+import org.qpython.qpy.databinding.WidgetSendCommentBinding;
+
+public class CodeSendComment extends DialogFragment {
+    private static final String GIST_ID = "gist_id", IS_PROJ = "is_proj";
+    private ShareCodeUtil.CommentCallback callback;
+    private WidgetSendCommentBinding      binding;
+    private String                        gistId, to, reComment;
+    private boolean isProj;
+
+    public static CodeSendComment newInstance(String gistId, boolean isProj) {
+        CodeSendComment f = new CodeSendComment();
+
+        Bundle args = new Bundle();
+        args.putString(GIST_ID, gistId);
+        args.putBoolean(IS_PROJ, isProj);
+        f.setArguments(args);
+
+        return f;
+    }
+
+    @Override
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        // the content
+        final RelativeLayout root = new RelativeLayout(getActivity());
+        root.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT));
+
+        // creating the fullscreen dialog
+        final Dialog dialog = new Dialog(getActivity());
+        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
+        dialog.setContentView(root);
+        dialog.getWindow().setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+        dialog.getWindow().getAttributes().windowAnimations = R.style.DialogAnimation;
+        return dialog;
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) {
+        gistId = getArguments().getString(GIST_ID);
+        isProj = getArguments().getBoolean(IS_PROJ);
+        View view = inflater.inflate(R.layout.widget_send_comment, container, false);
+        binding = DataBindingUtil.bind(view);
+        binding.btnSend.setOnClickListener(v -> {
+            String reply = binding.edit.getText().toString();
+            if (reply.length() == 0) {
+                Toast.makeText(getActivity(), R.string.null_comment_hint, Toast.LENGTH_SHORT).show();
+                return;
+            }
+            if (reply.startsWith(getString(R.string.re_format, to, ""))) {
+                reply = reply.replace(getString(R.string.re_format, to, ""), "");
+//                ShareCodeUtil.getInstance().sendComment(gist_id, to, reply, reComment, isProj, callback);
+//                binding.edit.setText("");
+            } else {
+//                ShareCodeUtil.getInstance().sendComment(gist_id, reply, isProj, callback);
+//                binding.edit.setText("");
+            }
+            InputMethodManager imm = (InputMethodManager) getActivity().getSystemService(Context.INPUT_METHOD_SERVICE);
+            imm.hideSoftInputFromWindow(binding.edit.getWindowToken(), 0);
+        });
+        getDialog().getWindow().setGravity(Gravity.BOTTOM);
+        getDialog().getWindow().setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+        return view;
+    }
+
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        getView().post(() -> {
+            Window dialogWindow = getDialog().getWindow();
+
+            // Make the dialog possible to be outside touch
+            dialogWindow.setFlags(WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL,
+                    WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL);
+            dialogWindow.clearFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND);
+
+            getView().invalidate();
+        });
+    }
+
+    public void setCallback(ShareCodeUtil.CommentCallback callback) {
+        this.callback = callback;
+    }
+
+    public void setReply(String toName, String reCommentContent) {
+        to = toName;
+        reComment = reCommentContent;
+
+        binding.edit.setText(Html.fromHtml(getString(R.string.re_format, to, "")));
+        binding.edit.setSelection(binding.edit.getText().length());
+        InputMethodManager imm = (InputMethodManager) getActivity().getSystemService(Context.INPUT_METHOD_SERVICE);
+        imm.showSoftInput(binding.edit, InputMethodManager.SHOW_IMPLICIT);
+
+        binding.edit.addTextChangedListener(new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+
+            }
+
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+
+            }
+
+            @Override
+            public void afterTextChanged(Editable s) {
+                if (!to.equals("")) {
+                    if (!s.toString().startsWith(getString(R.string.re_format, to, ""))) {
+                        to = "";
+                        binding.edit.setText(s.toString());
+                        binding.edit.setSelection(s.length());
+                    }
+                }
+            }
+        });
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/widget/GridSpace.java b/qpython/src/main/java/org/qpython/qpy/main/widget/GridSpace.java
new file mode 100644
index 00000000..08d64a55
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/widget/GridSpace.java
@@ -0,0 +1,44 @@
+package org.qpython.qpy.main.widget;
+
+import android.graphics.Rect;
+import android.support.v7.widget.RecyclerView;
+import android.view.View;
+
+/**
+ * Created by Hmei on 2017-07-19.
+ */
+
+public class GridSpace extends RecyclerView.ItemDecoration {
+
+    private int spanCount;
+    private int spacing;
+    private boolean includeEdge;
+
+    public GridSpace(int spanCount, int spacing, boolean includeEdge) {
+        this.spanCount = spanCount;
+        this.spacing = spacing;
+        this.includeEdge = includeEdge;
+    }
+
+    @Override
+    public void getItemOffsets(Rect outRect, View view, RecyclerView parent, RecyclerView.State state) {
+        int position = parent.getChildAdapterPosition(view); // item position
+        int column = position % spanCount; // item column
+
+        if (includeEdge) {
+            outRect.left = spacing - column * spacing / spanCount; // spacing - column * ((1f / spanCount) * spacing)
+            outRect.right = (column + 1) * spacing / spanCount; // (column + 1) * ((1f / spanCount) * spacing)
+
+            if (position < spanCount) { // top edge
+                outRect.top = spacing;
+            }
+            outRect.bottom = spacing; // item bottom
+        } else {
+            outRect.left = column * spacing / spanCount; // column * ((1f / spanCount) * spacing)
+            outRect.right = spacing - (column + 1) * spacing / spanCount; // spacing - (column + 1) * ((1f /    spanCount) * spacing)
+            if (position >= spanCount) {
+                outRect.top = spacing; // item top
+            }
+        }
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/widget/Indent.java b/qpython/src/main/java/org/qpython/qpy/main/widget/Indent.java
new file mode 100644
index 00000000..b70ed535
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/widget/Indent.java
@@ -0,0 +1,15 @@
+package org.qpython.qpy.main.widget;
+
+/**
+ * Created by Hmei
+ * 11/20/17
+ */
+public interface Indent {
+    void rightIndent();
+
+    void leftIndent();
+
+    void tabIndent();
+
+    void delIndent();
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/widget/LoadingDialog.java b/qpython/src/main/java/org/qpython/qpy/main/widget/LoadingDialog.java
new file mode 100644
index 00000000..b5abeb42
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/widget/LoadingDialog.java
@@ -0,0 +1,23 @@
+package org.qpython.qpy.main.widget;
+
+import android.app.Dialog;
+import android.content.Context;
+import android.support.annotation.NonNull;
+
+import org.qpython.qpy.R;
+
+/**
+ * 文 件 名: LoadingDialog
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2018/1/10 10:07
+ * 邮   箱: qq798435167@gmail.com
+ * 修改时间：
+ * 修改备注：
+ */
+
+public class LoadingDialog extends Dialog {
+    public LoadingDialog(@NonNull Context context) {
+        super(context, R.style.BaseDialog);
+        setContentView(R.layout.dialog_loading);
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/widget/MyNestedScrollView.java b/qpython/src/main/java/org/qpython/qpy/main/widget/MyNestedScrollView.java
new file mode 100644
index 00000000..5c192858
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/widget/MyNestedScrollView.java
@@ -0,0 +1,51 @@
+package org.qpython.qpy.main.widget;
+
+import android.content.Context;
+import android.support.v4.widget.NestedScrollView;
+import android.util.AttributeSet;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.ViewConfiguration;
+import android.view.ViewGroup;
+
+/**
+ * 替代ScrollView ,解决ScrollView 嵌套RecycleView滑动卡顿
+ * Created by Hmei on 16/11/29.
+ */
+
+public class MyNestedScrollView extends NestedScrollView {
+    private int downY;
+    private int mTouchSlop;
+
+    public MyNestedScrollView(Context context) {
+        super(context);
+        mTouchSlop = ViewConfiguration.get(context).getScaledTouchSlop();
+    }
+
+    public MyNestedScrollView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        mTouchSlop = ViewConfiguration.get(context).getScaledTouchSlop();
+    }
+
+    public MyNestedScrollView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        mTouchSlop = ViewConfiguration.get(context).getScaledTouchSlop();
+    }
+
+    @Override
+    public boolean onInterceptTouchEvent(MotionEvent e) {
+        int action = e.getAction();
+        switch (action) {
+            case MotionEvent.ACTION_DOWN:
+                downY = (int) e.getRawY();
+                break;
+            case MotionEvent.ACTION_MOVE:
+                int moveY = (int) e.getRawY();
+                if (Math.abs(moveY - downY) > mTouchSlop) {
+                    return true;
+                }
+        }
+        return super.onInterceptTouchEvent(e);
+    }
+
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/widget/NonScrollListView.java b/qpython/src/main/java/org/qpython/qpy/main/widget/NonScrollListView.java
new file mode 100644
index 00000000..de7b0584
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/widget/NonScrollListView.java
@@ -0,0 +1,36 @@
+package org.qpython.qpy.main.widget;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ListView;
+
+/**
+ * Created by Hmei
+ * 1/17/18.
+ */
+
+public class NonScrollListView extends ListView {
+
+    public NonScrollListView(Context context) {
+        super(context);
+    }
+
+    public NonScrollListView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public NonScrollListView(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+    }
+
+    @Override
+    public void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        int heightMeasureSpec_custom = View.MeasureSpec.makeMeasureSpec(
+                Integer.MAX_VALUE >> 2, View.MeasureSpec.AT_MOST);
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec_custom);
+        ViewGroup.LayoutParams params = getLayoutParams();
+        params.height = getMeasuredHeight();
+    }
+}
\ No newline at end of file
diff --git a/qpython/src/main/java/org/qpython/qpy/main/widget/NotebookDialog.java b/qpython/src/main/java/org/qpython/qpy/main/widget/NotebookDialog.java
new file mode 100644
index 00000000..ed55d5bd
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/widget/NotebookDialog.java
@@ -0,0 +1,64 @@
+package org.qpython.qpy.main.widget;
+
+import android.app.Dialog;
+import android.content.Context;
+import android.support.annotation.NonNull;
+import android.view.View;
+import android.widget.CheckBox;
+import android.widget.CompoundButton;
+import android.widget.TextView;
+
+import org.qpython.qpy.R;
+
+/**
+ * 文 件 名: NotebookDialog
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2018/2/7 18:25
+ * 修改时间：
+ * 修改备注：
+ */
+
+public class NotebookDialog extends Dialog {
+
+    private CheckBox app, libs;
+
+    public NotebookDialog(@NonNull Context context) {
+        super(context, R.style.BaseDialog);
+        setContentView(R.layout.dialog__setting_notebook);
+        app = findViewById(R.id.notebook_app);
+        libs = findViewById(R.id.notebook_lib);
+    }
+
+    public void show(boolean installApp, boolean installLib, InstallCallback callback) {
+        if (installApp) {
+            app.setChecked(true);
+            app.setEnabled(false);
+            if (installLib) {
+                libs.setChecked(true);
+                libs.setEnabled(false);
+            } else {
+                libs.setEnabled(true);
+                libs.setOnClickListener(v -> {
+                    dismiss();
+                    callback.installLibs();
+                });
+            }
+        } else {
+            libs.setChecked(false);
+            libs.setEnabled(false);
+            app.setEnabled(true);
+            app.setOnClickListener(v -> {
+                dismiss();
+                callback.installApp();
+            });
+        }
+
+        show();
+    }
+
+    public interface InstallCallback {
+        void installApp();
+
+        void installLibs();
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/widget/PercentView.java b/qpython/src/main/java/org/qpython/qpy/main/widget/PercentView.java
new file mode 100644
index 00000000..2a8370d1
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/widget/PercentView.java
@@ -0,0 +1,104 @@
+package org.qpython.qpy.main.widget;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.RectF;
+import android.support.annotation.Nullable;
+import android.util.AttributeSet;
+import android.view.View;
+
+import org.qpython.qpy.R;
+
+/**
+ * Created by Hmei
+ * 1/10/18.
+ */
+
+public class PercentView extends View {
+    public static final int CIRCLE_ANGLE = 360;
+
+    private int percent = 0;
+    private int   lightColor;
+    private int   dimColor;
+    private float width;
+    private float textSize;
+    private Paint paint;
+    private RectF rect;
+
+    {
+        paint = new Paint(Paint.ANTI_ALIAS_FLAG);
+        paint.setStyle(Paint.Style.STROKE);
+        rect = new RectF();
+    }
+
+    public PercentView(Context context) {
+        super(context);
+    }
+
+    public PercentView(Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+        TypedArray typedArray = getContext().obtainStyledAttributes(attrs, R.styleable.PercentView);
+        lightColor = typedArray.getInt(R.styleable.PercentView_pv_light_color, getResources().getColor(R.color.theme_yellow));
+        dimColor = typedArray.getInt(R.styleable.PercentView_pv_dim_color, getResources().getColor(R.color.white));
+        width = typedArray.getFloat(R.styleable.PercentView_pv_width, 10);
+        typedArray.recycle();
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+        int size = MeasureSpec.getSize(widthMeasureSpec);
+        setMeasuredDimension(size, size);
+        rect.set(width / 2, width / 2, size - width / 2, size - width / 2);
+        paint.setStrokeWidth(width);
+        textSize = size / 4;
+    }
+
+    @Override
+    protected void onDraw(Canvas canvas) {
+        super.onDraw(canvas);
+        float lightAngle = CIRCLE_ANGLE * (percent / 100.00f);
+
+        // draw circle
+        paint.setStyle(Paint.Style.STROKE);
+        paint.setColor(lightColor);
+        canvas.drawArc(rect, -90, lightAngle, false, paint);
+        paint.setColor(dimColor);
+        canvas.drawArc(rect, lightAngle - 90, CIRCLE_ANGLE - lightAngle, false, paint);
+
+        // draw text
+        paint.setColor(lightColor);
+        paint.setStyle(Paint.Style.FILL);
+        paint.setTextAlign(Paint.Align.CENTER);
+        paint.setTextSize(textSize);
+        paint.setFakeBoldText(true);
+        canvas.drawText(percent + "%", (rect.right - rect.left + width) / 2, (rect.bottom - rect.top - width) / 2 + paint.getFontSpacing() / 2, paint);
+    }
+
+    public int getPercent() {
+        return percent;
+    }
+
+    public void setPercent(int percent) {
+        this.percent = percent;
+        invalidate();
+    }
+
+    public int getLightColor() {
+        return lightColor;
+    }
+
+    public void setLightColor(int lightColor) {
+        this.lightColor = lightColor;
+    }
+
+    public int getDimColor() {
+        return dimColor;
+    }
+
+    public void setDimColor(int dimColor) {
+        this.dimColor = dimColor;
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/widget/RatioImageView.java b/qpython/src/main/java/org/qpython/qpy/main/widget/RatioImageView.java
new file mode 100644
index 00000000..ffc10a54
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/widget/RatioImageView.java
@@ -0,0 +1,31 @@
+package org.qpython.qpy.main.widget;
+
+import android.content.Context;
+import android.support.v7.widget.AppCompatImageView;
+import android.util.AttributeSet;
+
+/**
+ * Created by Hmei on 2017-08-04.
+ */
+
+public class RatioImageView extends AppCompatImageView {
+
+    public RatioImageView(Context context) {
+        super(context);
+    }
+
+    public RatioImageView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public RatioImageView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+        int measuredWidth = MeasureSpec.getSize(widthMeasureSpec);
+        setMeasuredDimension(measuredWidth, measuredWidth / 3);
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/widget/ShareDialog.java b/qpython/src/main/java/org/qpython/qpy/main/widget/ShareDialog.java
new file mode 100644
index 00000000..72b46623
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/widget/ShareDialog.java
@@ -0,0 +1,68 @@
+package org.qpython.qpy.main.widget;
+
+import android.app.Dialog;
+import android.content.Context;
+import android.support.annotation.NonNull;
+import android.view.Gravity;
+import android.view.Window;
+import android.view.WindowManager;
+
+import org.qpython.qpy.R;
+
+/**
+ * 文 件 名: ShareDialog
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2017/12/26 12:05
+ * 邮   箱: qq798435167@gmail.com
+ * 修改时间：
+ * 修改备注：
+ */
+
+public class ShareDialog extends Dialog{
+
+    public static final int FACEBOOK = 0X001;
+    public static final int TWITTER = 0X002;
+    public static final int COPY_LINK = 0X099;
+
+    public ShareDialog(@NonNull Context context) {
+        super(context, R.style.Dialog);
+        setContentView(R.layout.dialog_share);
+    }
+
+    public void setOnClickListener(OnClickListener listener) {
+        findViewById(R.id.facebook_iv).setOnClickListener(v -> {
+            dismiss();
+            if (listener!=null){
+                listener.onClick(FACEBOOK);
+            }
+        });
+        findViewById(R.id.twitter_iv).setOnClickListener(v -> {
+            dismiss();
+            if (listener!=null){
+                listener.onClick(TWITTER);
+            }
+        });
+        findViewById(R.id.copy_link_iv).setOnClickListener(v -> {
+            dismiss();
+            if (listener!=null){
+                listener.onClick(COPY_LINK);
+            }
+        });
+    }
+
+    public interface OnClickListener{
+        void onClick(int index);
+    }
+
+    @Override
+    public void show() {
+        super.show();
+        Window window = getWindow();
+        WindowManager.LayoutParams lp = window.getAttributes();
+        lp.gravity = Gravity.BOTTOM;
+        lp.width = WindowManager.LayoutParams.MATCH_PARENT;
+        lp.height = WindowManager.LayoutParams.WRAP_CONTENT;
+        window.setAttributes(lp);
+        window.setWindowAnimations(R.style.BottomAnim);
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/widget/ShortcutLayout.java b/qpython/src/main/java/org/qpython/qpy/main/widget/ShortcutLayout.java
new file mode 100644
index 00000000..815004c3
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/widget/ShortcutLayout.java
@@ -0,0 +1,166 @@
+package org.qpython.qpy.main.widget;
+
+import android.content.Context;
+import android.support.annotation.Nullable;
+import android.util.AttributeSet;
+import android.view.LayoutInflater;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.ImageButton;
+import android.widget.LinearLayout;
+
+import org.qpython.qpy.R;
+import jackpal.androidterm.emulatorview.ShortcutBean;
+
+/**
+ * Created by Hmei
+ * 11/20/17
+ */
+public class ShortcutLayout extends LinearLayout {
+    EditText editText;
+    Indent   indent;
+
+    public void init(EditText editText, Indent indent) {
+        this.editText = editText;
+        this.indent = indent;
+    }
+
+    public ShortcutLayout(Context context) {
+        super(context);
+    }
+
+    public ShortcutLayout(Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public ShortcutLayout(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    @Override
+    protected void onAttachedToWindow() {
+        super.onAttachedToWindow();
+        initShortcut();
+    }
+
+    private void initShortcut() {
+//        shortcutLayout = (LinearLayout) binding.control.vsShortcut.getViewStub().inflate();
+        LayoutInflater inflater = (LayoutInflater) getContext().getSystemService( Context.LAYOUT_INFLATER_SERVICE );
+        String[] shortcuts = getResources().getStringArray(R.array.term_shortcut);
+        for (String shortcut : shortcuts) {
+            ShortcutBean shortcutBean = new ShortcutBean(shortcut, true);
+            switch (shortcutBean.getName()) {
+                case "tab":
+                    shortcutBean.setListener(v -> editText.getText().insert(editText.getSelectionStart(), getContext().getString(R.string.insert_tab)));
+
+                    //shortcutBean.setListener(view -> indent.tabIndent());
+                    break;
+                case "del":
+                    shortcutBean.setListener(view -> indent.delIndent());
+                    break;
+                case "ltab":
+                    shortcutBean.setListener(v -> indent.leftIndent());
+                    break;
+                case "rtab":
+                    shortcutBean.setListener(v -> indent.rightIndent());
+                    break;
+                case "def":
+                    shortcutBean.setListener(v -> {
+                        int startIndex = editText.getSelectionStart();
+                        editText.getText().insert(startIndex, getContext().getString(R.string.insert_def));
+                        editText.setSelection(startIndex + shortcutBean.getName().length() + 1);
+                    });
+                    break;
+                case "if":
+                    shortcutBean.setListener(v -> {
+                        int startIndex = editText.getSelectionStart();
+                        editText.getText().insert(startIndex, getContext().getString(R.string.insert_if));
+                        editText.setSelection(startIndex + shortcutBean.getName().length() + 1);
+                    });
+                    break;
+                case "for":
+                    shortcutBean.setListener(v -> {
+                        int startIndex = editText.getSelectionStart();
+                        editText.getText().insert(startIndex, getContext().getString(R.string.insert_for));
+                        editText.setSelection(startIndex + shortcutBean.getName().length() + 1);
+                    });
+                    break;
+                case "imt":
+                    shortcutBean.setListener(v -> {
+                        final String IMPORT = "import ";
+                        String text = editText.getText().toString();
+                        if (text.contains(IMPORT)) {
+                            int index = text.indexOf(IMPORT);
+                            int lineEndIndex = text.indexOf("\n", index);
+                            editText.getText().insert(lineEndIndex + 1, getContext().getString(R.string.insert_import));
+                            editText.setSelection(lineEndIndex + 1 + IMPORT.length());
+                        } else {
+                            editText.getText().append(IMPORT);
+                        }
+                    });
+                    break;
+                case "imf":
+                    shortcutBean.setListener(v -> {
+                        final String FROM = "from ";
+                        String text = editText.getText().toString();
+                        if (text.contains(FROM)) {
+                            int index = text.indexOf(FROM);
+                            int lineEndIndex = text.indexOf("\n", index);
+                            editText.getText().insert(lineEndIndex + 1, getContext().getString(R.string.insert_import_f));
+                            editText.setSelection(lineEndIndex + 1 + FROM.length());
+                        } else {
+                            editText.getText().append(getContext().getString(R.string.insert_import_f));
+                        }
+                    });
+                    break;
+                case "clz":
+                    shortcutBean.setListener(v -> {
+                        int startIndex = editText.getSelectionStart();
+                        editText.getText().insert(startIndex, getContext().getString(R.string.insert_clz));
+                        editText.setSelection(startIndex + "class".length() + 1);
+                    });
+                    break;
+                case "ef":
+                    shortcutBean.setListener(v -> {
+                        int startIndex = editText.getSelectionStart();
+                        editText.getText().insert(startIndex, getContext().getString(R.string.insert_ef));
+                        editText.setSelection(startIndex + "elif".length() + 1);
+                    });
+                    break;
+                case "frm":
+                    shortcutBean.setListener(v -> editText.getText().insert(editText.getSelectionStart(), getContext().getString(R.string.insert_frm)));
+                    break;
+                case "el":
+                    shortcutBean.setListener(v -> editText.getText().insert(editText.getSelectionStart(), getContext().getString(R.string.insert_el)));
+                    break;
+                case "ret":
+                    shortcutBean.setListener(v -> editText.getText().insert(editText.getSelectionStart(), getContext().getString(R.string.insert_ret)));
+                    break;
+                default:
+                    shortcutBean.setListener(v -> editText.getText().insert(editText.getSelectionStart(), shortcutBean.getName()));
+                    break;
+            }
+
+            switch (shortcutBean.getName()) {
+                case "ltab":
+                    ImageButton tab = (ImageButton) inflater.inflate(R.layout.widget_shortcut_imgbtn, null);
+                    tab.setImageResource(R.drawable.tab1);
+                    tab.setOnClickListener(shortcutBean.getListener());
+                    addView(tab);
+                    break;
+                case "rtab":
+                    ImageButton rtab = (ImageButton) inflater.inflate(R.layout.widget_shortcut_imgbtn, null);
+                    rtab.setImageResource(R.drawable.tab2);
+                    rtab.setOnClickListener(shortcutBean.getListener());
+                    addView(rtab);
+                    break;
+                default:
+                    Button button = (Button)inflater.inflate(R.layout.widget_shortcut_btn, null);
+                    button.setText(shortcutBean.getName());
+                    button.setOnClickListener(shortcutBean.getListener());
+                    addView(button);
+                    break;
+            }
+        }
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/widget/ToggleView.java b/qpython/src/main/java/org/qpython/qpy/main/widget/ToggleView.java
new file mode 100644
index 00000000..9e436d4e
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/widget/ToggleView.java
@@ -0,0 +1,885 @@
+package org.qpython.qpy.main.widget;
+
+import android.animation.Animator;
+import android.animation.ArgbEvaluator;
+import android.animation.ValueAnimator;
+import android.content.Context;
+import android.content.res.Resources;
+import android.content.res.TypedArray;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.os.Build;
+import android.support.annotation.Nullable;
+import android.support.annotation.RequiresApi;
+import android.util.AttributeSet;
+import android.util.TypedValue;
+import android.view.MotionEvent;
+import android.view.View;
+import android.widget.Checkable;
+
+import org.qpython.qpy.R;
+
+/**
+ * Toggle button
+ * Created by Hmei on 2017-05-27.
+ */
+
+public class ToggleView extends View implements Checkable {
+
+    private static final int DEFAULT_WIDTH                = dp2pxInt(48);
+    private static final int DEFAULT_HEIGHT               = dp2pxInt(30);
+    /**
+     * 动画状态：
+     * 1.静止
+     * 2.进入拖动
+     * 3.处于拖动
+     * 4.拖动-复位
+     * 5.拖动-切换
+     * 6.点击切换
+     **/
+    private final        int ANIMATE_STATE_NONE           = 0;
+    private final        int ANIMATE_STATE_PENDING_DRAG   = 1;
+    private final        int ANIMATE_STATE_DRAGING        = 2;
+    private final        int ANIMATE_STATE_PENDING_RESET  = 3;
+    private final        int ANIMATE_STATE_PENDING_SETTLE = 4;
+    private final        int ANIMATE_STATE_SWITCH         = 5;
+    private final android.animation.ArgbEvaluator argbEvaluator
+            = new android.animation.ArgbEvaluator();
+    /**
+     * 阴影半径
+     */
+    private int shadowRadius;
+    /**
+     * 阴影Y偏移px
+     */
+    private int shadowOffset;
+    /**
+     * 阴影颜色
+     */
+    private int shadowColor;
+    /**
+     * 背景半径
+     */
+    private float viewRadius;
+    /**
+     * 按钮半径
+     */
+    private float buttonRadius;
+    /**
+     * 背景高
+     */
+    private float height;
+    /**
+     * 背景宽
+     */
+    private float width;
+    /**
+     * 背景位置
+     */
+    private float left;
+    private float top;
+    private float right;
+    private float bottom;
+    private float centerX;
+    private float centerY;
+    /**
+     * 背景底色
+     */
+    private int background;
+    /**
+     * 背景关闭颜色
+     */
+    private int uncheckColor;
+    /**
+     * 背景打开颜色
+     */
+    private int checkedColor;
+    /**
+     * 边框宽度px
+     */
+    private int borderWidth;
+    /**
+     * 打开指示线颜色
+     */
+    private int   checkLineColor;
+    /**
+     * 按钮最左边
+     */
+    private float buttonMinX;
+    /**
+     * 按钮最右边
+     */
+    private float buttonMaxX;
+    /**
+     * 按钮画笔
+     */
+    private Paint buttonPaint;
+    /**
+     * 背景画笔
+     */
+    private Paint paint;
+    /**
+     * 当前状态
+     */
+    private ViewState viewState;
+    private ViewState beforeState;
+    private ViewState afterState;
+    /**
+     * 动画状态
+     */
+    private int   animateState = ANIMATE_STATE_NONE;
+    /**
+     *
+     */
+    private ValueAnimator valueAnimator;
+    /**
+     * 是否选中
+     */
+    private boolean isChecked;
+    /**
+     * 是否启用动画
+     */
+    private boolean enableEffect;
+    /**
+     * 是否启用阴影效果
+     */
+    private boolean shadowEffect;
+    /**
+     * 收拾是否按下
+     */
+    private boolean isTouchingDown   = false;
+    /**
+     *
+     */
+    private boolean isUiInited       = false;
+    /**
+     *
+     */
+    private boolean isEventBroadcast = false;
+    /**
+     * 估值器
+     */
+    private ArgbEvaluator evaluator;
+    private OnCheckedChangeListener onCheckedChangeListener;
+    /*******************************************************/
+    /**
+     * 手势按下的时刻
+     */
+    private long touchDownTime;
+    private Runnable postPendingDrag = () -> {
+        if (!isInAnimating()) {
+            pendingDragState();
+        }
+    };
+    private ValueAnimator.AnimatorUpdateListener animatorUpdateListener
+            = new ValueAnimator.AnimatorUpdateListener() {
+        @Override
+        public void onAnimationUpdate(ValueAnimator animation) {
+            float value = (Float) animation.getAnimatedValue();
+            switch (animateState) {
+                case ANIMATE_STATE_PENDING_SETTLE: {
+                }
+                case ANIMATE_STATE_PENDING_RESET: {
+                }
+                case ANIMATE_STATE_PENDING_DRAG: {
+                    viewState.checkedLineColor = (int) argbEvaluator.evaluate(
+                            value,
+                            beforeState.checkedLineColor,
+                            afterState.checkedLineColor
+                    );
+
+                    viewState.radius = beforeState.radius
+                            + (afterState.radius - beforeState.radius) * value;
+
+                    if (animateState != ANIMATE_STATE_PENDING_DRAG) {
+                        viewState.buttonX = beforeState.buttonX
+                                + (afterState.buttonX - beforeState.buttonX) * value;
+                    }
+
+                    viewState.checkStateColor = (int) argbEvaluator.evaluate(
+                            value,
+                            beforeState.checkStateColor,
+                            afterState.checkStateColor
+                    );
+
+                    break;
+                }
+                case ANIMATE_STATE_SWITCH: {
+                    viewState.buttonX = beforeState.buttonX
+                            + (afterState.buttonX - beforeState.buttonX) * value;
+
+                    float fraction = (viewState.buttonX - buttonMinX) / (buttonMaxX - buttonMinX);
+
+                    viewState.checkStateColor = (int) argbEvaluator.evaluate(
+                            fraction,
+                            uncheckColor,
+                            checkedColor
+                    );
+
+                    viewState.radius = fraction * viewRadius;
+                    viewState.checkedLineColor = (int) argbEvaluator.evaluate(
+                            fraction,
+                            Color.TRANSPARENT,
+                            checkLineColor
+                    );
+                    break;
+                }
+                default:
+                case ANIMATE_STATE_DRAGING: {
+                }
+                case ANIMATE_STATE_NONE: {
+                    break;
+                }
+            }
+            postInvalidate();
+        }
+    };
+    private Animator.AnimatorListener animatorListener
+            = new Animator.AnimatorListener() {
+        @Override
+        public void onAnimationStart(Animator animation) {
+        }
+
+        @Override
+        public void onAnimationEnd(Animator animation) {
+            switch (animateState) {
+                case ANIMATE_STATE_DRAGING: {
+                    break;
+                }
+                case ANIMATE_STATE_PENDING_DRAG: {
+                    animateState = ANIMATE_STATE_DRAGING;
+                    viewState.checkedLineColor = Color.TRANSPARENT;
+                    viewState.radius = viewRadius;
+
+                    postInvalidate();
+                    break;
+                }
+                case ANIMATE_STATE_PENDING_RESET: {
+                    animateState = ANIMATE_STATE_NONE;
+                    postInvalidate();
+                    break;
+                }
+                case ANIMATE_STATE_PENDING_SETTLE: {
+                    animateState = ANIMATE_STATE_NONE;
+                    postInvalidate();
+                    broadcastEvent();
+                    break;
+                }
+                case ANIMATE_STATE_SWITCH: {
+                    isChecked = !isChecked;
+                    animateState = ANIMATE_STATE_NONE;
+                    postInvalidate();
+                    broadcastEvent();
+                    break;
+                }
+                default:
+                case ANIMATE_STATE_NONE: {
+                    break;
+                }
+            }
+        }
+
+        @Override
+        public void onAnimationCancel(Animator animation) {
+        }
+
+        @Override
+        public void onAnimationRepeat(Animator animation) {
+        }
+    };
+    public ToggleView(Context context) {
+        super(context);
+        init(context, null);
+    }
+
+    public ToggleView(Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+        init(context, attrs);
+    }
+    public ToggleView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init(context, attrs);
+    }
+    @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
+    public ToggleView(Context context, @Nullable AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+        init(context, attrs);
+    }
+
+    /*******************************************************/
+    private static float dp2px(float dp) {
+        Resources r = Resources.getSystem();
+        return TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dp, r.getDisplayMetrics());
+    }
+
+    private static int dp2pxInt(float dp) {
+        return (int) dp2px(dp);
+    }
+
+    private static int optInt(TypedArray typedArray, int index, int def) {
+        if (typedArray == null) {
+            return def;
+        }
+        return typedArray.getInt(index, def);
+    }
+
+    private static float optPixelSize(TypedArray typedArray,
+                                      int index,
+                                      float def) {
+        if (typedArray == null) {
+            return def;
+        }
+        return typedArray.getDimension(index, def);
+    }
+
+    private static int optPixelSize(TypedArray typedArray,
+                                    int index,
+                                    int def) {
+        if (typedArray == null) {
+            return def;
+        }
+        return typedArray.getDimensionPixelOffset(index, def);
+    }
+
+    private static int optColor(TypedArray typedArray, int index, int def) {
+        if (typedArray == null) {
+            return def;
+        }
+        return typedArray.getColor(index, def);
+    }
+
+    private static boolean optBoolean(TypedArray typedArray, int index, boolean def) {
+        if (typedArray == null) {
+            return def;
+        }
+        return typedArray.getBoolean(index, def);
+    }
+
+    @Override
+    public final void setPadding(int left, int top, int right, int bottom) {
+        super.setPadding(0, 0, 0, 0);
+    }
+
+    /**
+     * 初始化参数
+     */
+    private void init(Context context, AttributeSet attrs) {
+
+        TypedArray typedArray = null;
+        if (attrs != null) {
+            typedArray = context.obtainStyledAttributes(attrs, R.styleable.ToggleView);
+        }
+
+        shadowEffect = optBoolean(typedArray,
+                R.styleable.ToggleView_sb_shadow_effect,
+                true);
+
+        shadowRadius = optPixelSize(typedArray,
+                R.styleable.ToggleView_sb_shadow_radius,
+                dp2pxInt(2.5f));//dp2pxInt(2.5f);
+
+        shadowOffset = optPixelSize(typedArray,
+                R.styleable.ToggleView_sb_shadow_offset,
+                dp2pxInt(1.5f));//dp2pxInt(1.5f);
+
+        shadowColor = optColor(typedArray,
+                R.styleable.ToggleView_sb_shadow_color,
+                0X33000000);//0X33000000;
+
+        uncheckColor = optColor(typedArray,
+                R.styleable.ToggleView_sb_uncheck_color,
+                0XffDDDDDD);//0XffDDDDDD;
+
+        checkedColor = optColor(typedArray,
+                R.styleable.ToggleView_sb_checked_color,
+                0Xff51d367);//0Xff51d367;
+
+        borderWidth = optPixelSize(typedArray,
+                R.styleable.ToggleView_sb_border_width,
+                dp2pxInt(1));//dp2pxInt(1);
+
+        checkLineColor = optColor(typedArray,
+                R.styleable.ToggleView_sb_checkline_color,
+                Color.WHITE);//Color.WHITE;
+
+        int buttonColor = optColor(typedArray,
+                R.styleable.ToggleView_sb_button_color,
+                Color.WHITE);//Color.WHITE;
+
+        int effectDuration = optInt(typedArray,
+                R.styleable.ToggleView_sb_effect_duration,
+                300);//300;
+
+        isChecked = optBoolean(typedArray,
+                R.styleable.ToggleView_sb_checked,
+                false);
+
+        background = optColor(typedArray,
+                R.styleable.ToggleView_sb_background,
+                Color.WHITE);//Color.WHITE;
+
+        enableEffect = optBoolean(typedArray,
+                R.styleable.ToggleView_sb_enable_effect,
+                true);
+
+        evaluator = new ArgbEvaluator();
+
+        if (typedArray != null) {
+            typedArray.recycle();
+        }
+
+
+        paint = new Paint(Paint.ANTI_ALIAS_FLAG);
+        buttonPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
+        buttonPaint.setColor(buttonColor);
+
+        if (shadowEffect) {
+            buttonPaint.setShadowLayer(
+                    shadowRadius,
+                    0, shadowOffset,
+                    shadowColor);
+        }
+
+
+        viewState = new ViewState();
+        beforeState = new ViewState();
+        afterState = new ViewState();
+
+        valueAnimator = ValueAnimator.ofFloat(0f, 1f);
+        valueAnimator.setDuration(effectDuration);
+        valueAnimator.setRepeatCount(0);
+
+        valueAnimator.addUpdateListener(animatorUpdateListener);
+        valueAnimator.addListener(animatorListener);
+
+        super.setClickable(true);
+        this.setPadding(0, 0, 0, 0);
+        setLayerType(LAYER_TYPE_SOFTWARE, null);
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        final int widthMode = MeasureSpec.getMode(widthMeasureSpec);
+        final int heightMode = MeasureSpec.getMode(heightMeasureSpec);
+
+        if (widthMode == MeasureSpec.UNSPECIFIED
+                || widthMode == MeasureSpec.AT_MOST) {
+            widthMeasureSpec = MeasureSpec.makeMeasureSpec(DEFAULT_WIDTH, MeasureSpec.EXACTLY);
+        }
+        if (heightMode == MeasureSpec.UNSPECIFIED
+                || heightMode == MeasureSpec.AT_MOST) {
+            heightMeasureSpec = MeasureSpec.makeMeasureSpec(DEFAULT_HEIGHT, MeasureSpec.EXACTLY);
+        }
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+    }
+
+    @Override
+    protected void onSizeChanged(int w, int h, int oldw, int oldh) {
+        super.onSizeChanged(w, h, oldw, oldh);
+
+
+        float viewPadding = Math.max(shadowRadius + shadowOffset, borderWidth);
+
+        height = h - viewPadding - viewPadding;
+        width = w - viewPadding - viewPadding;
+
+        viewRadius = height * .5f;
+        buttonRadius = viewRadius;
+
+        left = viewPadding;
+        top = viewPadding;
+        right = w - viewPadding;
+        bottom = h - viewPadding;
+
+        centerX = (left + right) * .5f;
+        centerY = (top + bottom) * .5f;
+
+        buttonMinX = left + viewRadius;
+        buttonMaxX = right - viewRadius;
+
+        if (isChecked()) {
+            setCheckedViewState(viewState);
+        } else {
+            setUncheckViewState(viewState);
+        }
+
+        isUiInited = true;
+
+        postInvalidate();
+
+    }
+
+    /**
+     * @param viewState
+     */
+    private void setUncheckViewState(ViewState viewState) {
+        viewState.radius = 0;
+        viewState.checkStateColor = uncheckColor;
+        viewState.checkedLineColor = Color.TRANSPARENT;
+        viewState.buttonX = buttonMinX;
+    }
+
+    /**
+     * @param viewState
+     */
+    private void setCheckedViewState(ViewState viewState) {
+        viewState.radius = viewRadius;
+        viewState.checkStateColor = checkedColor;
+        viewState.checkedLineColor = checkLineColor;
+        viewState.buttonX = buttonMaxX;
+    }
+
+    @Override
+    protected void onDraw(Canvas canvas) {
+        super.onDraw(canvas);
+
+        paint.setStrokeWidth(5);
+        paint.setStyle(Paint.Style.FILL);
+        //绘制白色背景
+        paint.setColor(background);
+        canvas.drawLine(left, centerY, right, centerY, paint);
+
+        //绘制按钮
+        drawButton(canvas, viewState.buttonX, centerY);
+    }
+
+    /**
+     * @param canvas
+     * @param x      px
+     * @param y      px
+     */
+    private void drawButton(Canvas canvas, float x, float y) {
+        int btnColor = (int) evaluator.evaluate((x - buttonMinX) / (buttonMaxX - buttonMinX), 0XFF9B9B9B, 0XFF4BAC07);
+        buttonPaint.setColor(btnColor);
+        canvas.drawCircle(x, y, buttonRadius, buttonPaint);
+    }
+
+    @Override
+    public boolean isChecked() {
+        return isChecked;
+    }
+
+    @Override
+    public void setChecked(boolean checked) {
+        if (checked == isChecked()) {
+            postInvalidate();
+            return;
+        }
+        toggle(enableEffect, false);
+    }
+
+    @Override
+    public void toggle() {
+        toggle(true);
+    }
+
+    /**
+     * 切换状态
+     *
+     * @param animate
+     */
+    public void toggle(boolean animate) {
+        toggle(animate, true);
+    }
+
+    private void toggle(boolean animate, boolean broadcast) {
+        if (!isEnabled()) {
+            return;
+        }
+
+        if (isEventBroadcast) {
+            throw new RuntimeException("should NOT switch the state in method: [onCheckedChanged]!");
+        }
+        if (!isUiInited) {
+            isChecked = !isChecked;
+            if (broadcast) {
+                broadcastEvent();
+            }
+            return;
+        }
+
+        if (valueAnimator.isRunning()) {
+            valueAnimator.cancel();
+        }
+
+        if (!enableEffect || !animate) {
+            isChecked = !isChecked;
+            if (isChecked()) {
+                setCheckedViewState(viewState);
+            } else {
+                setUncheckViewState(viewState);
+            }
+            postInvalidate();
+            if (broadcast) {
+                broadcastEvent();
+            }
+            return;
+        }
+
+        animateState = ANIMATE_STATE_SWITCH;
+        beforeState.copy(viewState);
+
+        if (isChecked()) {
+            //切换到unchecked
+            setUncheckViewState(afterState);
+        } else {
+            setCheckedViewState(afterState);
+        }
+        valueAnimator.start();
+    }
+
+    /**
+     *
+     */
+    private void broadcastEvent() {
+        if (onCheckedChangeListener != null) {
+            isEventBroadcast = true;
+            onCheckedChangeListener.onCheckedChanged(this, isChecked());
+        }
+        isEventBroadcast = false;
+    }
+
+    @Override
+    public boolean onTouchEvent(MotionEvent event) {
+        if (!isEnabled()) {
+            return false;
+        }
+        int actionMasked = event.getActionMasked();
+
+        switch (actionMasked) {
+            case MotionEvent.ACTION_DOWN: {
+                isTouchingDown = true;
+                touchDownTime = System.currentTimeMillis();
+                //取消准备进入拖动状态
+                removeCallbacks(postPendingDrag);
+                //预设100ms进入拖动状态
+                postDelayed(postPendingDrag, 100);
+                break;
+            }
+            case MotionEvent.ACTION_MOVE: {
+                float eventX = event.getX();
+                if (isPendingDragState()) {
+                    //在准备进入拖动状态过程中，可以拖动按钮位置
+                    float fraction = eventX / getWidth();
+                    fraction = Math.max(0f, Math.min(1f, fraction));
+
+                    viewState.buttonX = buttonMinX
+                            + (buttonMaxX - buttonMinX)
+                            * fraction;
+
+                } else if (isDragState()) {
+                    //拖动按钮位置，同时改变对应的背景颜色
+                    float fraction = eventX / getWidth();
+                    fraction = Math.max(0f, Math.min(1f, fraction));
+
+                    viewState.buttonX = buttonMinX
+                            + (buttonMaxX - buttonMinX)
+                            * fraction;
+
+                    viewState.checkStateColor = (int) argbEvaluator.evaluate(
+                            fraction,
+                            uncheckColor,
+                            checkedColor
+                    );
+                    postInvalidate();
+
+                }
+                break;
+            }
+            case MotionEvent.ACTION_UP: {
+                isTouchingDown = false;
+                //取消准备进入拖动状态
+                removeCallbacks(postPendingDrag);
+
+                if (System.currentTimeMillis() - touchDownTime <= 300) {
+                    //点击时间小于300ms，认为是点击操作
+                    toggle();
+                } else if (isDragState()) {
+                    //在拖动状态，计算按钮位置，设置是否切换状态
+                    float eventX = event.getX();
+                    float fraction = eventX / getWidth();
+                    fraction = Math.max(0f, Math.min(1f, fraction));
+                    boolean newCheck = fraction > .5f;
+                    if (newCheck == isChecked()) {
+                        pendingCancelDragState();
+                    } else {
+                        isChecked = newCheck;
+                        pendingSettleState();
+                    }
+                } else if (isPendingDragState()) {
+                    //在准备进入拖动状态过程中，取消之，复位
+                    pendingCancelDragState();
+                }
+                break;
+            }
+            case MotionEvent.ACTION_CANCEL: {
+                isTouchingDown = false;
+
+                removeCallbacks(postPendingDrag);
+
+                if (isPendingDragState()
+                        || isDragState()) {
+                    //复位
+                    pendingCancelDragState();
+                }
+                break;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * 是否在动画状态
+     *
+     * @return
+     */
+    private boolean isInAnimating() {
+        return animateState != ANIMATE_STATE_NONE;
+    }
+
+    /**
+     * 是否在进入拖动或离开拖动状态
+     *
+     * @return
+     */
+    private boolean isPendingDragState() {
+        return animateState == ANIMATE_STATE_PENDING_DRAG
+                || animateState == ANIMATE_STATE_PENDING_RESET;
+    }
+
+    /**
+     * 是否在手指拖动状态
+     *
+     * @return
+     */
+    private boolean isDragState() {
+        return animateState == ANIMATE_STATE_DRAGING;
+    }
+
+    /**
+     * 开始进入拖动状态
+     */
+    private void pendingDragState() {
+        if (isInAnimating()) {
+            return;
+        }
+        if (!isTouchingDown) {
+            return;
+        }
+
+        if (valueAnimator.isRunning()) {
+            valueAnimator.cancel();
+        }
+
+        animateState = ANIMATE_STATE_PENDING_DRAG;
+
+        beforeState.copy(viewState);
+        afterState.copy(viewState);
+
+        if (isChecked()) {
+            afterState.checkStateColor = checkedColor;
+            afterState.buttonX = buttonMaxX;
+            afterState.checkedLineColor = checkedColor;
+        } else {
+            afterState.checkStateColor = uncheckColor;
+            afterState.buttonX = buttonMinX;
+            afterState.radius = viewRadius;
+        }
+
+        valueAnimator.start();
+    }
+
+    /**
+     * 取消拖动状态
+     */
+    private void pendingCancelDragState() {
+        if (isDragState() || isPendingDragState()) {
+            if (valueAnimator.isRunning()) {
+                valueAnimator.cancel();
+            }
+
+            animateState = ANIMATE_STATE_PENDING_RESET;
+            beforeState.copy(viewState);
+
+            if (isChecked()) {
+                setCheckedViewState(afterState);
+            } else {
+                setUncheckViewState(afterState);
+            }
+            valueAnimator.start();
+        }
+    }
+
+    /**
+     * 动画-设置新的状态
+     */
+    private void pendingSettleState() {
+        if (valueAnimator.isRunning()) {
+            valueAnimator.cancel();
+        }
+
+        animateState = ANIMATE_STATE_PENDING_SETTLE;
+        beforeState.copy(viewState);
+
+        if (isChecked()) {
+            setCheckedViewState(afterState);
+        } else {
+            setUncheckViewState(afterState);
+        }
+        valueAnimator.start();
+    }
+
+    @Override
+    public final void setOnClickListener(OnClickListener l) {
+    }
+
+    @Override
+    public final void setOnLongClickListener(OnLongClickListener l) {
+    }
+
+    public void setOnCheckedChangeListener(OnCheckedChangeListener l) {
+        onCheckedChangeListener = l;
+    }
+
+    public interface OnCheckedChangeListener {
+        void onCheckedChanged(ToggleView view, boolean isChecked);
+    }
+
+
+    /*******************************************************/
+
+    /**
+     * 保存动画状态
+     */
+    private static class ViewState {
+        /**
+         * 按钮x位置[buttonMinX-buttonMaxX]
+         */
+        float buttonX;
+        /**
+         * 状态背景颜色
+         */
+        int   checkStateColor;
+        /**
+         * 选中线的颜色
+         */
+        int   checkedLineColor;
+        /**
+         * 状态背景的半径
+         */
+        float radius;
+
+        ViewState() {
+        }
+
+        private void copy(ViewState source) {
+            this.buttonX = source.buttonX;
+            this.checkStateColor = source.checkStateColor;
+            this.checkedLineColor = source.checkedLineColor;
+            this.radius = source.radius;
+        }
+    }
+
+}
+
diff --git a/qpython/src/main/java/org/qpython/qpy/main/widget/WebviewEX.java b/qpython/src/main/java/org/qpython/qpy/main/widget/WebviewEX.java
new file mode 100644
index 00000000..7a1d095b
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/widget/WebviewEX.java
@@ -0,0 +1,41 @@
+package org.qpython.qpy.main.widget;
+
+import android.content.Context;
+//import android.os.Handler;
+//import android.os.Message;
+import android.util.AttributeSet;
+import android.view.MotionEvent;
+import android.webkit.WebView;
+
+//import com.liulishuo.filedownloader.i.IFileDownloadIPCCallback;
+
+import org.qpython.qpy.utils.SolfKeybroadUtil;
+
+/**
+ * 文 件 名: WebviewEX
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2018/2/10 15:21
+ * 修改时间：
+ * 修改备注：
+ */
+
+public class WebviewEX extends WebView {
+    public WebviewEX(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    @Override
+    public boolean onTouchEvent(MotionEvent event) {
+//        if (event.getAction() == MotionEvent.ACTION_UP && isSelected()){
+//            closeKeyboard();
+//            return true;
+//        }
+        return super.onTouchEvent(event);
+    }
+
+    private void closeKeyboard() {
+        SolfKeybroadUtil.showSolfInput(this,false);
+    }
+
+
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/widget/WrapContentHeightViewPager.java b/qpython/src/main/java/org/qpython/qpy/main/widget/WrapContentHeightViewPager.java
new file mode 100644
index 00000000..da17aa82
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/widget/WrapContentHeightViewPager.java
@@ -0,0 +1,41 @@
+package org.qpython.qpy.main.widget;
+
+import android.content.Context;
+import android.support.v4.view.ViewPager;
+import android.util.AttributeSet;
+import android.view.MotionEvent;
+import android.view.View;
+
+/**
+ * Created by Hmei
+ * on 2017-08-02.
+ */
+
+public class WrapContentHeightViewPager extends ViewPager {
+    private View mCurrentView;
+
+    public WrapContentHeightViewPager(Context context) {
+        super(context);
+    }
+
+    public WrapContentHeightViewPager(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        if (mCurrentView == null) {
+            super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+            return;
+        }
+        mCurrentView.measure(widthMeasureSpec, MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED));
+        int h = mCurrentView.getMeasuredHeight();
+        heightMeasureSpec = MeasureSpec.makeMeasureSpec(h > heightMeasureSpec ? h : heightMeasureSpec, MeasureSpec.EXACTLY);
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+    }
+
+    public void measureCurrentView(View currentView) {
+        mCurrentView = currentView;
+        requestLayout();
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/widget/expandableview/ExpandableLayout.java b/qpython/src/main/java/org/qpython/qpy/main/widget/expandableview/ExpandableLayout.java
new file mode 100644
index 00000000..0658f0f8
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/widget/expandableview/ExpandableLayout.java
@@ -0,0 +1,115 @@
+package org.qpython.qpy.main.widget.expandableview;
+
+import android.animation.TimeInterpolator;
+import android.support.annotation.IntDef;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+public interface ExpandableLayout {
+
+    /**
+     * Duration of expand animation
+     */
+    int DEFAULT_DURATION = 300;
+    /**
+     * Visibility of the layout when the layout attaches
+     */
+    boolean DEFAULT_EXPANDED = false;
+    /**
+     * Orientation of child views
+     */
+    int HORIZONTAL = 0;
+    /**
+     * Orientation of child views
+     */
+    int VERTICAL = 1;
+
+    /**
+     * Orientation of layout
+     */
+    @Retention(RetentionPolicy.SOURCE)
+    @IntDef({HORIZONTAL, VERTICAL})
+    @interface Orientation {
+    }
+
+    /**
+     * Starts animation the state of the view to the inverse of its current state.
+     */
+    void toggle();
+
+    /**
+     * Starts animation the state of the view to the inverse of its current state.
+     *
+     * @param duration
+     * @param interpolator use the default interpolator if the argument is null.
+     */
+    void toggle(final long duration, @Nullable final TimeInterpolator interpolator);
+
+    /**
+     * Starts expand animation.
+     */
+    void expand();
+
+    /**
+     * Starts expand animation.
+     *
+     * @param duration
+     * @param interpolator use the default interpolator if the argument is null.
+     */
+    void expand(final long duration, @Nullable final TimeInterpolator interpolator);
+
+    /**
+     * Starts collapse animation.
+     */
+    void collapse();
+
+    /**
+     * Starts collapse animation.
+     *
+     * @param duration
+     * @param interpolator use the default interpolator if the argument is null.
+     */
+    void collapse(final long duration, @Nullable final TimeInterpolator interpolator);
+
+    /**
+     * Sets the expandable layout listener.
+     *
+     * @param listener ExpandableLayoutListener
+     */
+    void setListener(@NonNull final ExpandableLayoutListener listener);
+
+    /**
+     * Sets the length of the animation.
+     * The default duration is 300 milliseconds.
+     *
+     * @param duration
+     */
+    void setDuration(final int duration);
+
+    /**
+     * Sets state of expanse.
+     *
+     * @param expanded The layout is visible if expanded is true
+     */
+    void setExpanded(final boolean expanded);
+
+    /**
+     * Gets state of expanse.
+     *
+     * @return true if the layout is visible
+     */
+    boolean isExpanded();
+
+    /**
+     * The time interpolator used in calculating the elapsed fraction of this animation. The
+     * interpolator determines whether the animation runs with linear or non-linear motion,
+     * such as acceleration and deceleration.
+     * The default value is  {@link android.view.animation.AccelerateDecelerateInterpolator}
+     *
+     * @param interpolator
+     */
+    void setInterpolator(@NonNull final TimeInterpolator interpolator);
+}
\ No newline at end of file
diff --git a/qpython/src/main/java/org/qpython/qpy/main/widget/expandableview/ExpandableLayoutListener.java b/qpython/src/main/java/org/qpython/qpy/main/widget/expandableview/ExpandableLayoutListener.java
new file mode 100644
index 00000000..75ec3b7a
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/widget/expandableview/ExpandableLayoutListener.java
@@ -0,0 +1,35 @@
+package org.qpython.qpy.main.widget.expandableview;
+
+public interface ExpandableLayoutListener {
+    /**
+     * Notifies the start of the animation.
+     * Sync from android.animation.Animator.AnimatorListener.onAnimationStart(Animator animation)
+     */
+    void onAnimationStart();
+
+    /**
+     * Notifies the end of the animation.
+     * Sync from android.animation.Animator.AnimatorListener.onAnimationEnd(Animator animation)
+     */
+    void onAnimationEnd();
+
+    /**
+     * Notifies the layout is going to open.
+     */
+    void onPreOpen();
+
+    /**
+     * Notifies the layout is going to equal close size.
+     */
+    void onPreClose();
+
+    /**
+     * Notifies the layout opened.
+     */
+    void onOpened();
+
+    /**
+     * Notifies the layout size equal closed size.
+     */
+    void onClosed();
+}
\ No newline at end of file
diff --git a/qpython/src/main/java/org/qpython/qpy/main/widget/expandableview/ExpandableRelativeLayout.java b/qpython/src/main/java/org/qpython/qpy/main/widget/expandableview/ExpandableRelativeLayout.java
new file mode 100644
index 00000000..13813d56
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/widget/expandableview/ExpandableRelativeLayout.java
@@ -0,0 +1,556 @@
+package org.qpython.qpy.main.widget.expandableview;
+
+import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
+import android.animation.TimeInterpolator;
+import android.animation.ValueAnimator;
+import android.annotation.TargetApi;
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.os.Build;
+import android.os.Parcelable;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.util.AttributeSet;
+import android.view.View;
+import android.view.ViewTreeObserver;
+import android.view.animation.LinearInterpolator;
+import android.widget.RelativeLayout;
+
+import org.qpython.qpy.R;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ExpandableRelativeLayout extends RelativeLayout implements ExpandableLayout {
+
+    private int duration;
+    private TimeInterpolator interpolator = new LinearInterpolator();
+    private int orientation;
+    /**
+     * Default state of expanse
+     *
+     * @see #defaultChildIndex
+     * @see #defaultPosition
+     */
+    private boolean defaultExpanded;
+    /**
+     * You cannot define {@link #defaultExpanded}, {@link #defaultChildIndex}
+     * and {@link #defaultPosition} at the same time.
+     * {@link #defaultPosition} has priority over {@link #defaultExpanded}
+     * and {@link #defaultChildIndex} if you set them at the same time.
+     * <p>
+     * <p>
+     * Priority
+     * {@link #defaultPosition} > {@link #defaultChildIndex} > {@link #defaultExpanded}
+     */
+    private int defaultChildIndex;
+    private int defaultPosition;
+    /**
+     * The close position is width from left of layout if orientation is horizontal.
+     * The close position is height from top of layout if orientation is vertical.
+     */
+    private int closePosition = 0;
+
+    private ExpandableLayoutListener listener;
+    private ExpandableSavedState savedState;
+    private boolean isExpanded;
+    private int layoutSize = 0;
+    private boolean isArranged = false;
+    private boolean isCalculatedSize = false;
+    private boolean isAnimating = false;
+    /**
+     * view size of children
+     **/
+    private List<Integer> childSizeList = new ArrayList<>();
+    /**
+     * view position top or left of children
+     **/
+    private List<Integer> childPositionList = new ArrayList<>();
+    private ViewTreeObserver.OnGlobalLayoutListener mGlobalLayoutListener;
+
+    public ExpandableRelativeLayout(final Context context) {
+        this(context, null);
+    }
+
+    public ExpandableRelativeLayout(final Context context, final AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public ExpandableRelativeLayout(final Context context, final AttributeSet attrs,
+                                    final int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init(context, attrs, defStyleAttr);
+    }
+
+    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
+    public ExpandableRelativeLayout(final Context context, final AttributeSet attrs,
+                                    final int defStyleAttr, final int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+        init(context, attrs, defStyleAttr);
+    }
+
+    private void init(final Context context, final AttributeSet attrs, final int defStyleAttr) {
+        final TypedArray a = context.obtainStyledAttributes(
+                attrs, R.styleable.expandableLayout, defStyleAttr, 0);
+        duration = a.getInteger(R.styleable.expandableLayout_ael_duration, DEFAULT_DURATION);
+        defaultExpanded = a.getBoolean(R.styleable.expandableLayout_ael_expanded, DEFAULT_EXPANDED);
+        orientation = a.getInteger(R.styleable.expandableLayout_ael_orientation, VERTICAL);
+        defaultChildIndex = a.getInteger(R.styleable.expandableLayout_ael_defaultChildIndex,
+                Integer.MAX_VALUE);
+        defaultPosition = a.getDimensionPixelSize(R.styleable.expandableLayout_ael_defaultPosition,
+                Integer.MIN_VALUE);
+        final int interpolatorType = a.getInteger(R.styleable.expandableLayout_ael_interpolator,
+                Utils.LINEAR_INTERPOLATOR);
+        a.recycle();
+        interpolator = Utils.createInterpolator(interpolatorType);
+        isExpanded = defaultExpanded;
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+
+        if (isCalculatedSize) return;
+
+        final int measureSpec = MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED);
+        if (isVertical()) {
+            int measuredHeight = getMeasuredHeight();
+
+            super.onMeasure(widthMeasureSpec, measureSpec);
+            layoutSize = getMeasuredHeight();
+
+            setMeasuredDimension(getMeasuredWidth(), measuredHeight);
+        } else {
+            int measuredWidth = getMeasuredWidth();
+
+            super.onMeasure(measureSpec, heightMeasureSpec);
+            layoutSize = getMeasuredWidth();
+
+            setMeasuredDimension(measuredWidth, getMeasuredHeight());
+        }
+
+        // calculate a size of children
+        childSizeList.clear();
+        View view;
+        LayoutParams params;
+        for (int i = 0; i < getChildCount(); i++) {
+            view = getChildAt(i);
+            params = (LayoutParams) view.getLayoutParams();
+
+            childSizeList.add(isVertical()
+                    ? view.getMeasuredHeight() + params.topMargin + params.bottomMargin
+                    : view.getMeasuredWidth() + params.leftMargin + params.rightMargin);
+        }
+        isCalculatedSize = true;
+    }
+
+    @Override
+    protected void onLayout(boolean changed, int l, int t, int r, int b) {
+        super.onLayout(changed, l, t, r, b);
+
+        if (isArranged) return;
+
+        childPositionList.clear();
+        // calculate a top position of children
+        for (int i = 0; i < getChildCount(); i++) {
+            childPositionList.add((int) (isVertical() ? getChildAt(i).getY() : getChildAt(i).getX()));
+        }
+
+        // adjust default position if a user set a value.
+        if (!defaultExpanded) {
+            setLayoutSize(closePosition);
+        }
+        final int childNumbers = childSizeList.size();
+        if (childNumbers > defaultChildIndex && childNumbers > 0) {
+            moveChild(defaultChildIndex, 0, null);
+        }
+        if (defaultPosition > 0 && layoutSize >= defaultPosition && layoutSize > 0) {
+            move(defaultPosition, 0, null);
+        }
+        isArranged = true;
+
+        if (savedState == null) return;
+        setLayoutSize(savedState.getSize());
+    }
+
+    @Override
+    protected Parcelable onSaveInstanceState() {
+        final Parcelable parcelable = super.onSaveInstanceState();
+        final ExpandableSavedState ss = new ExpandableSavedState(parcelable);
+        ss.setSize(getCurrentPosition());
+        return ss;
+    }
+
+    @Override
+    protected void onRestoreInstanceState(final Parcelable state) {
+        if (!(state instanceof ExpandableSavedState)) {
+            super.onRestoreInstanceState(state);
+            return;
+        }
+
+        final ExpandableSavedState ss = (ExpandableSavedState) state;
+        super.onRestoreInstanceState(ss.getSuperState());
+        savedState = ss;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void setListener(@NonNull ExpandableLayoutListener listener) {
+        this.listener = listener;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void toggle() {
+        toggle(duration, interpolator);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void toggle(final long duration, final @Nullable TimeInterpolator interpolator) {
+        if (closePosition < getCurrentPosition()) {
+            collapse(duration, interpolator);
+        } else {
+            expand(duration, interpolator);
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void expand() {
+        if (isAnimating) return;
+
+        createExpandAnimator(getCurrentPosition(), layoutSize, duration, interpolator).start();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void expand(final long duration, final @Nullable TimeInterpolator interpolator) {
+        if (isAnimating) return;
+
+        if (duration <= 0) {
+            move(layoutSize, duration, interpolator);
+            return;
+        }
+        createExpandAnimator(getCurrentPosition(), layoutSize, duration, interpolator).start();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void collapse() {
+        if (isAnimating) return;
+
+        createExpandAnimator(getCurrentPosition(), closePosition, duration, interpolator).start();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void collapse(final long duration, final @Nullable TimeInterpolator interpolator) {
+        if (isAnimating) return;
+
+        if (duration <= 0) {
+            move(closePosition, duration, interpolator);
+            return;
+        }
+        createExpandAnimator(getCurrentPosition(), closePosition, duration, interpolator).start();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void setDuration(final int duration) {
+        if (duration < 0) {
+            throw new IllegalArgumentException("Animators cannot have negative duration: " +
+                    duration);
+        }
+        this.duration = duration;
+    }
+
+    public int getDuration() {
+        return duration;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void setExpanded(boolean expanded) {
+        final int currentPosition = getCurrentPosition();
+        if ((expanded && (currentPosition == layoutSize))
+                || (!expanded && currentPosition == closePosition)) return;
+
+        isExpanded = expanded;
+        setLayoutSize(expanded ? layoutSize : closePosition);
+        requestLayout();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean isExpanded() {
+        return isExpanded;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void setInterpolator(@NonNull final TimeInterpolator interpolator) {
+        this.interpolator = interpolator;
+    }
+
+    /**
+     * @param position
+     *
+     * @see #move(int, long, TimeInterpolator)
+     */
+    public void move(int position) {
+        move(position, duration, interpolator);
+    }
+
+    /**
+     * Moves to position.
+     * Sets 0 to duration if you want to move immediately.
+     *
+     * @param position
+     * @param duration
+     * @param interpolator use the default interpolator if the argument is null.
+     */
+    public void move(int position, long duration, @Nullable TimeInterpolator interpolator) {
+        if (isAnimating || 0 > position || layoutSize < position) return;
+
+        if (duration <= 0) {
+            isExpanded = position > closePosition;
+            setLayoutSize(position);
+            requestLayout();
+            notifyListeners();
+            return;
+        }
+        createExpandAnimator(getCurrentPosition(), position, duration,
+                interpolator == null ? this.interpolator : interpolator).start();
+    }
+
+    /**
+     * @param index child view index
+     *
+     * @see #moveChild(int, long, TimeInterpolator)
+     */
+    public void moveChild(int index) {
+        moveChild(index, duration, interpolator);
+    }
+
+    /**
+     * Moves to bottom(VERTICAL) or right(HORIZONTAL) of child view
+     * Sets 0 to duration if you want to move immediately.
+     *
+     * @param index        index child view index
+     * @param duration
+     * @param interpolator use the default interpolator if the argument is null.
+     */
+    public void moveChild(int index, long duration, @Nullable TimeInterpolator interpolator) {
+        if (isAnimating) return;
+
+        final int destination = getChildPosition(index) +
+                (isVertical() ? getPaddingBottom() : getPaddingRight());
+        if (duration <= 0) {
+            isExpanded = destination > closePosition;
+            setLayoutSize(destination);
+            requestLayout();
+            notifyListeners();
+            return;
+        }
+        createExpandAnimator(getCurrentPosition(), destination,
+                duration, interpolator == null ? this.interpolator : interpolator).start();
+    }
+
+    /**
+     * Sets orientation of expanse animation.
+     *
+     * @param orientation Set 0 if orientation is horizontal, 1 if orientation is vertical
+     */
+    public void setOrientation(@Orientation final int orientation) {
+        this.orientation = orientation;
+    }
+
+    /**
+     * Gets the width from left of layout if orientation is horizontal.
+     * Gets the height from top of layout if orientation is vertical.
+     *
+     * @param index index of child view
+     *
+     * @return position from top or left
+     */
+    public int getChildPosition(final int index) {
+        if (0 > index || childSizeList.size() <= index) {
+            throw new IllegalArgumentException("There aren't the view having this index.");
+        }
+        return childPositionList.get(index) + childSizeList.get(index);
+    }
+
+    /**
+     * Gets the width from left of layout if orientation is horizontal.
+     * Gets the height from top of layout if orientation is vertical.
+     *
+     * @return
+     *
+     * @see #closePosition
+     */
+    public int getClosePosition() {
+        return closePosition;
+    }
+
+    /**
+     * Sets the close position directly.
+     *
+     * @param position
+     *
+     * @see #closePosition
+     * @see #setClosePositionIndex(int)
+     */
+    public void setClosePosition(final int position) {
+        this.closePosition = position;
+    }
+
+    /**
+     * Gets the current position.
+     *
+     * @return
+     */
+    public int getCurrentPosition() {
+        return isVertical() ? getMeasuredHeight() : getMeasuredWidth();
+    }
+
+    /**
+     * Sets close position using index of child view.
+     *
+     * @param childIndex
+     *
+     * @see #closePosition
+     * @see #setClosePosition(int)
+     */
+    public void setClosePositionIndex(final int childIndex) {
+        this.closePosition = getChildPosition(childIndex);
+    }
+
+    private boolean isVertical() {
+        return orientation == VERTICAL;
+    }
+
+    private void setLayoutSize(int size) {
+        if (isVertical()) {
+            getLayoutParams().height = size;
+        } else {
+            getLayoutParams().width = size;
+        }
+    }
+
+    /**
+     * Creates value animator.
+     * Expand the layout if {@param to} is bigger than {@param from}.
+     * Collapse the layout if {@param from} is bigger than {@param to}.
+     *
+     * @param from
+     * @param to
+     * @param duration
+     * @param interpolator
+     *
+     * @return
+     */
+    private ValueAnimator createExpandAnimator(
+            final int from, final int to, final long duration, final TimeInterpolator interpolator) {
+        final ValueAnimator valueAnimator = ValueAnimator.ofInt(from, to);
+        valueAnimator.setDuration(duration);
+        valueAnimator.setInterpolator(interpolator);
+        valueAnimator.addUpdateListener(animator -> {
+            if (isVertical()) {
+                getLayoutParams().height = (int) animator.getAnimatedValue();
+            } else {
+                getLayoutParams().width = (int) animator.getAnimatedValue();
+            }
+            requestLayout();
+        });
+        valueAnimator.addListener(new AnimatorListenerAdapter() {
+            @Override
+            public void onAnimationStart(Animator animator) {
+                isAnimating = true;
+                if (listener == null) return;
+
+                listener.onAnimationStart();
+                if (layoutSize == to) {
+                    listener.onPreOpen();
+                    return;
+                }
+                if (closePosition == to) {
+                    listener.onPreClose();
+                }
+            }
+
+            @Override
+            public void onAnimationEnd(Animator animator) {
+                isAnimating = false;
+                isExpanded = to > closePosition;
+
+                if (listener == null) return;
+
+                listener.onAnimationEnd();
+                if (to == layoutSize) {
+                    listener.onOpened();
+                    return;
+                }
+                if (to == closePosition) {
+                    listener.onClosed();
+                }
+            }
+        });
+        return valueAnimator;
+    }
+
+    /**
+     * Notify listeners
+     */
+    private void notifyListeners() {
+        if (listener == null) return;
+
+        listener.onAnimationStart();
+        if (isExpanded) {
+            listener.onPreOpen();
+        } else {
+            listener.onPreClose();
+        }
+        mGlobalLayoutListener = new ViewTreeObserver.OnGlobalLayoutListener() {
+            @Override
+            public void onGlobalLayout() {
+                if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN) {
+                    getViewTreeObserver().removeGlobalOnLayoutListener(mGlobalLayoutListener);
+                } else {
+                    getViewTreeObserver().removeOnGlobalLayoutListener(mGlobalLayoutListener);
+                }
+
+                listener.onAnimationEnd();
+                if (isExpanded) {
+                    listener.onOpened();
+                } else {
+                    listener.onClosed();
+                }
+            }
+        };
+        getViewTreeObserver().addOnGlobalLayoutListener(mGlobalLayoutListener);
+    }
+}
\ No newline at end of file
diff --git a/qpython/src/main/java/org/qpython/qpy/main/widget/expandableview/ExpandableSavedState.java b/qpython/src/main/java/org/qpython/qpy/main/widget/expandableview/ExpandableSavedState.java
new file mode 100644
index 00000000..d67b3d56
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/widget/expandableview/ExpandableSavedState.java
@@ -0,0 +1,54 @@
+package org.qpython.qpy.main.widget.expandableview;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.view.View;
+
+public class ExpandableSavedState extends View.BaseSavedState {
+    private int size;
+    private float weight;
+
+    ExpandableSavedState(Parcelable superState) {
+        super(superState);
+    }
+
+    private ExpandableSavedState(Parcel in) {
+        super(in);
+        this.size = in.readInt();
+        this.weight = in.readFloat();
+    }
+
+    public int getSize() {
+        return this.size;
+    }
+
+    public void setSize(int size) {
+        this.size = size;
+    }
+
+    public float getWeight() {
+        return this.weight;
+    }
+
+    public void setWeight(float weight) {
+        this.weight = weight;
+    }
+
+    @Override
+    public void writeToParcel(Parcel out, int flags) {
+        super.writeToParcel(out, flags);
+        out.writeInt(this.size);
+        out.writeFloat(this.weight);
+    }
+
+    public static final Creator<ExpandableSavedState> CREATOR =
+            new Creator<ExpandableSavedState>() {
+                public ExpandableSavedState createFromParcel(Parcel in) {
+                    return new ExpandableSavedState(in);
+                }
+
+                public ExpandableSavedState[] newArray(int size) {
+                    return new ExpandableSavedState[size];
+                }
+            };
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/widget/expandableview/Utils.java b/qpython/src/main/java/org/qpython/qpy/main/widget/expandableview/Utils.java
new file mode 100644
index 00000000..d14541b5
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/widget/expandableview/Utils.java
@@ -0,0 +1,65 @@
+package org.qpython.qpy.main.widget.expandableview;
+
+import android.animation.TimeInterpolator;
+import android.support.annotation.IntRange;
+import android.support.v4.view.animation.FastOutLinearInInterpolator;
+import android.support.v4.view.animation.FastOutSlowInInterpolator;
+import android.support.v4.view.animation.LinearOutSlowInInterpolator;
+import android.view.animation.AccelerateDecelerateInterpolator;
+import android.view.animation.AccelerateInterpolator;
+import android.view.animation.AnticipateInterpolator;
+import android.view.animation.AnticipateOvershootInterpolator;
+import android.view.animation.BounceInterpolator;
+import android.view.animation.DecelerateInterpolator;
+import android.view.animation.LinearInterpolator;
+import android.view.animation.OvershootInterpolator;
+
+public class Utils {
+
+    public static final int ACCELERATE_DECELERATE_INTERPOLATOR = 0;
+    public static final int ACCELERATE_INTERPOLATOR = 1;
+    public static final int ANTICIPATE_INTERPOLATOR = 2;
+    public static final int ANTICIPATE_OVERSHOOT_INTERPOLATOR = 3;
+    public static final int BOUNCE_INTERPOLATOR = 4;
+    public static final int DECELERATE_INTERPOLATOR = 5;
+    public static final int FAST_OUT_LINEAR_IN_INTERPOLATOR = 6;
+    public static final int FAST_OUT_SLOW_IN_INTERPOLATOR = 7;
+    public static final int LINEAR_INTERPOLATOR = 8;
+    public static final int LINEAR_OUT_SLOW_IN_INTERPOLATOR = 9;
+    public static final int OVERSHOOT_INTERPOLATOR = 10;
+
+    /**
+     * Creates interpolator.
+     *
+     * @param interpolatorType
+     * @return
+     */
+    public static TimeInterpolator createInterpolator(@IntRange(from = 0, to = 10) final int interpolatorType) {
+        switch (interpolatorType) {
+            case ACCELERATE_DECELERATE_INTERPOLATOR:
+                return new AccelerateDecelerateInterpolator();
+            case ACCELERATE_INTERPOLATOR:
+                return new AccelerateInterpolator();
+            case ANTICIPATE_INTERPOLATOR:
+                return new AnticipateInterpolator();
+            case ANTICIPATE_OVERSHOOT_INTERPOLATOR:
+                return new AnticipateOvershootInterpolator();
+            case BOUNCE_INTERPOLATOR:
+                return new BounceInterpolator();
+            case DECELERATE_INTERPOLATOR:
+                return new DecelerateInterpolator();
+            case FAST_OUT_LINEAR_IN_INTERPOLATOR:
+                return new FastOutLinearInInterpolator();
+            case FAST_OUT_SLOW_IN_INTERPOLATOR:
+                return new FastOutSlowInInterpolator();
+            case LINEAR_INTERPOLATOR:
+                return new LinearInterpolator();
+            case LINEAR_OUT_SLOW_IN_INTERPOLATOR:
+                return new LinearOutSlowInInterpolator();
+            case OVERSHOOT_INTERPOLATOR:
+                return new OvershootInterpolator();
+            default:
+                return new LinearInterpolator();
+        }
+    }
+}
\ No newline at end of file
diff --git a/qpython/src/main/java/org/qpython/qpy/main/widget/scheduleview/DotObj.java b/qpython/src/main/java/org/qpython/qpy/main/widget/scheduleview/DotObj.java
new file mode 100644
index 00000000..af57d023
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/widget/scheduleview/DotObj.java
@@ -0,0 +1,49 @@
+package org.qpython.qpy.main.widget.scheduleview;
+
+import android.content.Context;
+
+import org.qpython.qpy.R;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created by Hmei
+ * 1/9/18.
+ */
+
+public class DotObj {
+    private String dotName;
+    private String dotNum;
+
+    public DotObj(String dotName, String dotNum) {
+        this.dotName = dotName;
+        this.dotNum = dotNum;
+    }
+
+    public static List<DotObj> getDefaultList(Context context) {
+        List<DotObj> dotObjs = new ArrayList<>();
+        String[] name = context.getResources().getStringArray(R.array.funding_stage);
+        String[] count = context.getResources().getStringArray(R.array.funding_count_divider);
+        dotObjs.add(new DotObj(name[0], count[0]));
+        dotObjs.add(new DotObj(name[1], count[1]));
+        dotObjs.add(new DotObj(name[2], count[2]));
+        return dotObjs;
+    }
+
+    public String getDotName() {
+        return dotName;
+    }
+
+    public void setDotName(String dotName) {
+        this.dotName = dotName;
+    }
+
+    public String getDotNum() {
+        return dotNum;
+    }
+
+    public void setDotNum(String dotNum) {
+        this.dotNum = dotNum;
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/main/widget/scheduleview/ScheduleView.java b/qpython/src/main/java/org/qpython/qpy/main/widget/scheduleview/ScheduleView.java
new file mode 100644
index 00000000..aa698a22
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/main/widget/scheduleview/ScheduleView.java
@@ -0,0 +1,231 @@
+package org.qpython.qpy.main.widget.scheduleview;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.Rect;
+import android.support.annotation.Nullable;
+import android.util.AttributeSet;
+import android.view.View;
+
+import org.qpython.qpy.R;
+
+import java.util.List;
+
+/**
+ * Created by Hmei
+ * 1/9/18.
+ */
+public class ScheduleView extends View {
+    private Paint paint = new Paint(Paint.ANTI_ALIAS_FLAG);
+
+    private int   dotCount;
+    private int   lightColor;
+    private int   dimColor;
+    private float radius;
+    private float width;
+    private float margin;
+    private float textSize;
+
+    private int   lightDotCount;
+    private float linePercent;
+
+    private List<DotObj> dotObjs;
+
+
+    public ScheduleView(Context context) {
+        super(context);
+    }
+
+    public ScheduleView(Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+        TypedArray typedArray = getContext().obtainStyledAttributes(attrs, R.styleable.ScheduleView);
+        init(typedArray);
+        typedArray.recycle();
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        int measuredWidth = MeasureSpec.getSize(widthMeasureSpec);
+        int measuredHeight = (int) (2 * (paint.getFontSpacing() + radius + margin + 1));
+        measuredWidth = resolveSize(measuredWidth, widthMeasureSpec);
+        measuredHeight = resolveSize(measuredHeight, heightMeasureSpec);
+        setMeasuredDimension(measuredWidth, measuredHeight);
+    }
+
+    private void init(TypedArray typedArray) {
+        dotCount = typedArray.getInt(R.styleable.ScheduleView_dot_count, 3);
+        lightColor = typedArray.getInt(R.styleable.ScheduleView_light_color, getResources().getColor(R.color.theme_yellow));
+        dimColor = typedArray.getInt(R.styleable.ScheduleView_dim_color, getResources().getColor(R.color.theme_gray));
+        radius = typedArray.getDimensionPixelSize(R.styleable.ScheduleView_dot_radius, 20);
+        width = typedArray.getDimensionPixelSize(R.styleable.ScheduleView_line_width, 5);
+        margin = typedArray.getDimensionPixelSize(R.styleable.ScheduleView_margin, 8);
+        textSize = typedArray.getDimensionPixelSize(R.styleable.ScheduleView_text_size, 30);
+        paint.setTextSize(textSize);
+    }
+
+    @Override
+    protected void onDraw(Canvas canvas) {
+        super.onDraw(canvas);
+
+        if (dotObjs != null) {
+            drawText(canvas);
+        } else {
+            drawLine(canvas);
+            drawDots(canvas);
+        }
+    }
+
+    private void drawText(Canvas canvas) {
+        Rect textRect = new Rect();
+        paint.getTextBounds(dotObjs.get(dotObjs.size() - 1).getDotName(), 0, dotObjs.get(dotObjs.size() - 1).getDotName().length(), textRect);
+        float lastTextLength = textRect.right - textRect.left;
+
+        paint.getTextBounds(dotObjs.get(0).getDotName(), 0, dotObjs.get(0).getDotName().length(), textRect);
+        float firstTextLength = textRect.right - textRect.left;
+
+        float dotGap = (canvas.getWidth() - (firstTextLength + lastTextLength) / 2) / (dotCount - 1);
+        float[] centerTextX = new float[dotObjs.size()];
+
+        paint.setTextAlign(Paint.Align.CENTER);
+        paint.setTextSize(textSize);
+        invalidate();
+        paint.setColor(lightColor);
+
+        int i = 0;
+
+        for (DotObj dotObj : dotObjs) {
+            if (i == lightDotCount) {
+                paint.setColor(dimColor);
+            }
+            centerTextX[i] = firstTextLength / 2 + i * dotGap + getPaddingLeft();
+            canvas.drawText(dotObj.getDotName(), centerTextX[i], paint.getFontSpacing(), paint);
+            i++;
+        }
+
+        drawTextLine(canvas, centerTextX[0], centerTextX[dotObjs.size() - 1], paint.getFontSpacing());
+        drawTextDot(canvas, centerTextX, paint.getFontSpacing());
+        drawTextNum(canvas, centerTextX, paint.getFontSpacing());
+    }
+
+    private void drawTextLine(Canvas canvas, float start, float end, float textBottom) {
+        float divider = (end - start) * linePercent + start;
+        float top = textBottom + margin + radius;
+
+        paint.setStrokeWidth(width);
+        paint.setColor(lightColor);
+        canvas.drawLine(start, top, divider, top, paint);
+        paint.setColor(dimColor);
+        canvas.drawLine(divider, top, end, top, paint);
+    }
+
+    private void drawTextDot(Canvas canvas, float[] centerTextX, float textBottom) {
+        float cy = textBottom + margin + radius;
+        paint.setColor(lightColor);
+        for (int i = 0; i < centerTextX.length; i++) {
+            if (i == lightDotCount) {
+                paint.setColor(dimColor);
+            }
+            canvas.drawCircle(centerTextX[i], cy, radius, paint);
+        }
+    }
+
+    private void drawTextNum(Canvas canvas, float[] centerTextX, float textBottom) {
+        float startY = textBottom + 2 * (margin + radius) + paint.getFontSpacing();
+        paint.setColor(dimColor);
+        paint.setTextAlign(Paint.Align.CENTER);
+        for (int i = 0; i < centerTextX.length; i++) {
+            canvas.drawText(dotObjs.get(i).getDotNum(), centerTextX[i], startY, paint);
+        }
+    }
+
+    private void drawLine(Canvas canvas) {
+        float top = (canvas.getHeight() - width) / 2;
+        float bottom = (canvas.getHeight() + width) / 2;
+        float divider = canvas.getWidth() * linePercent;
+
+        paint.setColor(lightColor);
+        canvas.drawRect(0, top, divider, bottom, paint);
+        paint.setColor(dimColor);
+        canvas.drawRect(divider, top, canvas.getWidth(), bottom, paint);
+    }
+
+    private void drawDots(Canvas canvas) {
+        float dotGap = (canvas.getWidth() - radius * 2) / (dotCount - 1);
+        paint.setColor(lightColor);
+        for (int i = 0; i < dotCount; i++) {
+            if (i == lightDotCount) {
+                paint.setColor(dimColor);
+            }
+            canvas.drawCircle(radius + i * dotGap,
+                    canvas.getHeight() / 2,
+                    radius, paint);
+        }
+    }
+
+    public void setDotCount(int dotCount) {
+        this.dotCount = dotCount;
+        invalidate();
+        requestLayout();
+    }
+
+    public void setLightColor(int lightColor) {
+        this.lightColor = lightColor;
+        invalidate();
+        requestLayout();
+    }
+
+    public void setDimColor(int dimColor) {
+        this.dimColor = dimColor;
+        invalidate();
+        requestLayout();
+    }
+
+    public void setRadius(float radius) {
+        this.radius = radius;
+        invalidate();
+        requestLayout();
+    }
+
+    public void setWidth(float width) {
+        this.width = width;
+        invalidate();
+        requestLayout();
+    }
+
+    public void setMargin(float margin) {
+        this.margin = margin;
+        invalidate();
+        requestLayout();
+    }
+
+    public void setPercent(float fundingCount) {
+        int[] fundingNum = new int[dotObjs.size()];
+        for (int i = 0; i < dotObjs.size(); i++) {
+            fundingNum[i] = Integer.parseInt(dotObjs.get(i).getDotNum());
+        }
+
+        if (fundingCount < fundingNum[0]) {
+            linePercent = 0;
+            lightDotCount = 0;
+        } else if (fundingCount < fundingNum[1]) {
+            linePercent = (fundingCount - fundingNum[0]) / (fundingNum[1] - fundingNum[0]) / 2;
+            lightDotCount = 1;
+        } else if (fundingCount < fundingNum[2]) {
+            linePercent = 0.5f + ((fundingCount - fundingNum[1]) / (fundingNum[2] - fundingNum[1]) / 2);
+            lightDotCount = 2;
+        } else {
+            this.setVisibility(GONE);
+        }
+        invalidate();
+        requestLayout();
+    }
+
+    public void setDotObj(List<DotObj> dotObjs) {
+        this.dotCount = dotObjs.size();
+        this.dotObjs = dotObjs;
+        invalidate();
+        requestLayout();
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/plugin/CloudPluginManager.java b/qpython/src/main/java/org/qpython/qpy/plugin/CloudPluginManager.java
index bc3dd0ba..179a6676 100644
--- a/qpython/src/main/java/org/qpython/qpy/plugin/CloudPluginManager.java
+++ b/qpython/src/main/java/org/qpython/qpy/plugin/CloudPluginManager.java
@@ -1,200 +1,200 @@
-package org.qpython.qpy.plugin;
-
-import android.widget.Toast;
-
-import com.google.gson.Gson;
-import org.qpython.qpy.R;
-
-import org.qpython.qpy.main.app.App;
-import org.qpython.qpy.main.model.UpdateJson;
-import org.qpython.qpy.plugin.model.CloudPluginBean;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-import io.realm.Realm;
-import io.realm.RealmResults;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import rx.Observable;
-import rx.Subscriber;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
-
-import org.qpython.qpy.utils.FileUtils;
-
-public class CloudPluginManager {
-    private static final String INSTALL_DIR = App.getContext().getFilesDir().getAbsolutePath();
-    private static final String URL = "http://tubebook.net/tubebook/conf/";
-    private static OkHttpClient client = new OkHttpClient();
-
-    public static boolean checkInstalled(CloudPluginBean plugin) {
-        return query(plugin.getName()) != null;
-    }
-
-    public static boolean checkUpdate(CloudPluginBean remotePlugin) {
-        CloudPluginBean localPlugin = query(remotePlugin.getName());
-        return localPlugin != null && remotePlugin.getVersionCode() > localPlugin.getVersionCode();
-    }
-
-    public static void install(CloudPluginBean plugin, File file, boolean isSilence) {
-        String destPath = getCompletePath(plugin);
-        File dest = new File(destPath);
-
-        Realm realm = null;
-        try {
-            dest.getParentFile().mkdirs();
-            dest.createNewFile();
-            FileUtils.copyFile(file, dest);
-            realm = Realm.getDefaultInstance();
-            realm.beginTransaction();
-            realm.copyToRealmOrUpdate(plugin);
-            realm.commitTransaction();
-
-            if (!isSilence) {
-                Toast.makeText(App.getContext(), R.string.toast_plugin_install_complete, Toast.LENGTH_SHORT).show();
-            }
-        } catch (IOException e) {
-            e.printStackTrace();
-        } finally {
-            if (realm != null) {
-                realm.close();
-            }
-        }
-    }
-
-    private static CloudPluginBean query(String name) {
-        Realm realm = null;
-        try {
-            realm = Realm.getDefaultInstance();
-            CloudPluginBean cloudPluginBean = realm.where(CloudPluginBean.class)
-                    .equalTo("name", name)
-                    .findFirst();
-
-            if (cloudPluginBean == null) {
-                return null;
-            }
-
-            File file = new File(getCompletePath(cloudPluginBean));
-            if (!file.exists()) {
-                realm.beginTransaction();
-                cloudPluginBean.deleteFromRealm();
-                realm.commitTransaction();
-                return null;
-            }
-
-            // 创建不受 realm 监控的拷贝
-            return realm.copyFromRealm(cloudPluginBean);
-        } catch (Exception e) {
-            return null;
-        } finally {
-            if (realm != null) {
-                realm.close();
-            }
-        }
-    }
-
-    public static RealmResults<CloudPluginBean> queryAll(Realm realm) {
-        RealmResults<CloudPluginBean> plugins = realm.where(CloudPluginBean.class)
-                .findAll();
-
-        for (CloudPluginBean plugin : plugins) {
-            File file = new File(getCompletePath(plugin));
-            if (!file.exists()) {
-                realm.beginTransaction();
-                plugin.deleteFromRealm();
-                realm.commitTransaction();
-            }
-        }
-
-        return plugins;
-    }
-
-    public static void queryFromNet(Callback callback) {
-        Observable
-                .create(new Observable.OnSubscribe<String>() {
-                    @Override
-                    public void call(Subscriber<? super String> subscriber) {
-                        Request request = new Request.Builder()
-                                .url(URL)
-                                .build();
-                        try {
-                            String s = client.newCall(request).execute().body().string();
-                            subscriber.onNext(s);
-                        } catch (IOException e) {
-                            subscriber.onError(e);
-                        }
-                    }
-                })
-                .subscribeOn(Schedulers.io())
-                .observeOn(Schedulers.computation())
-                .map(s -> {
-                    List<CloudPluginBean> plugins = new ArrayList<>();
-                    Gson gson = new Gson();
-                    UpdateJson json = gson.fromJson(s, UpdateJson.class);
-                    for (UpdateJson.PluginsBean bean1 : json.getPlugins()) {
-                        CloudPluginBean cloudPluginBean =
-                                new CloudPluginBean(bean1.getPlugin(), bean1.getTitle(), bean1.getSrc(),
-                                        bean1.getVer(), bean1.getVer_desc(), bean1.getDesc(), bean1.getDst(), bean1.getLink());
-                        plugins.add(cloudPluginBean);
-                    }
-                    return plugins;
-                })
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(plugins -> callback.result(plugins),
-                        e -> e.printStackTrace());
-    }
-
-    public static long count() {
-        Realm realm = null;
-        try {
-            realm = Realm.getDefaultInstance();
-            return realm.where(CloudPluginBean.class)
-                    .count();
-        } finally {
-            if (realm != null) {
-                realm.close();
-            }
-        }
-    }
-
-    public static void uninstall(CloudPluginBean cloudPluginBean) {
-        CloudPluginBean local = query(cloudPluginBean.getName());
-        if (local == null) {
-            return;
-        }
-        Realm realm = null;
-        try {
-            // 清除本地文件
-            File file = new File(getCompletePath(local));
-            if (file.exists()) {
-                file.delete();
-            }
-
-            // 清除数据库数据
-            realm = Realm.getDefaultInstance();
-            realm.beginTransaction();
-            realm.where(CloudPluginBean.class)
-                    .equalTo("name", local.getName())
-                    .findFirst()
-                    .deleteFromRealm();
-            realm.commitTransaction();
-
-            Toast.makeText(App.getContext(), R.string.toast_plugin_uninstall_complete, Toast.LENGTH_SHORT).show();
-        } finally {
-            if (realm != null) {
-                realm.close();
-            }
-        }
-    }
-
-    public static String getCompletePath(CloudPluginBean cloudPluginBean) {
-        return String.format("%s%s%s", INSTALL_DIR, "/", cloudPluginBean.getPath());
-    }
-
-    public interface Callback {
-        void result(List<CloudPluginBean> plugins);
-    }
-}
+package org.qpython.qpy.plugin;
+
+import android.widget.Toast;
+
+import com.google.gson.Gson;
+import org.qpython.qpy.R;
+
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.model.UpdateJson;
+import org.qpython.qpy.plugin.model.CloudPluginBean;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import io.realm.Realm;
+import io.realm.RealmResults;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import rx.Observable;
+import rx.Subscriber;
+import rx.android.schedulers.AndroidSchedulers;
+import rx.schedulers.Schedulers;
+
+import org.qpython.qpy.utils.FileUtils;
+
+public class CloudPluginManager {
+    private static final String INSTALL_DIR = App.getContext().getFilesDir().getAbsolutePath();
+    private static final String URL = "https://www.qpython.org/conf/";
+    private static OkHttpClient client = new OkHttpClient();
+
+    public static boolean checkInstalled(CloudPluginBean plugin) {
+        return query(plugin.getName()) != null;
+    }
+
+    public static boolean checkUpdate(CloudPluginBean remotePlugin) {
+        CloudPluginBean localPlugin = query(remotePlugin.getName());
+        return localPlugin != null && remotePlugin.getVersionCode() > localPlugin.getVersionCode();
+    }
+
+    public static void install(CloudPluginBean plugin, File file, boolean isSilence) {
+        String destPath = getCompletePath(plugin);
+        File dest = new File(destPath);
+
+        Realm realm = null;
+        try {
+            dest.getParentFile().mkdirs();
+            dest.createNewFile();
+            FileUtils.copyFile(file, dest);
+            realm = Realm.getDefaultInstance();
+            realm.beginTransaction();
+            realm.copyToRealmOrUpdate(plugin);
+            realm.commitTransaction();
+
+            if (!isSilence) {
+                Toast.makeText(App.getContext(), R.string.toast_plugin_install_complete, Toast.LENGTH_SHORT).show();
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        } finally {
+            if (realm != null) {
+                realm.close();
+            }
+        }
+    }
+
+    private static CloudPluginBean query(String name) {
+        Realm realm = null;
+        try {
+            realm = Realm.getDefaultInstance();
+            CloudPluginBean cloudPluginBean = realm.where(CloudPluginBean.class)
+                    .equalTo("name", name)
+                    .findFirst();
+
+            if (cloudPluginBean == null) {
+                return null;
+            }
+
+            File file = new File(getCompletePath(cloudPluginBean));
+            if (!file.exists()) {
+                realm.beginTransaction();
+                cloudPluginBean.deleteFromRealm();
+                realm.commitTransaction();
+                return null;
+            }
+
+            // 创建不受 realm 监控的拷贝
+            return realm.copyFromRealm(cloudPluginBean);
+        } catch (Exception e) {
+            return null;
+        } finally {
+            if (realm != null) {
+                realm.close();
+            }
+        }
+    }
+
+    public static RealmResults<CloudPluginBean> queryAll(Realm realm) {
+        RealmResults<CloudPluginBean> plugins = realm.where(CloudPluginBean.class)
+                .findAll();
+
+        for (CloudPluginBean plugin : plugins) {
+            File file = new File(getCompletePath(plugin));
+            if (!file.exists()) {
+                realm.beginTransaction();
+                plugin.deleteFromRealm();
+                realm.commitTransaction();
+            }
+        }
+
+        return plugins;
+    }
+
+    public static void queryFromNet(Callback callback) {
+        Observable
+                .create(new Observable.OnSubscribe<String>() {
+                    @Override
+                    public void call(Subscriber<? super String> subscriber) {
+                        Request request = new Request.Builder()
+                                .url(URL)
+                                .build();
+                        try {
+                            String s = client.newCall(request).execute().body().string();
+                            subscriber.onNext(s);
+                        } catch (IOException e) {
+                            subscriber.onError(e);
+                        }
+                    }
+                })
+                .subscribeOn(Schedulers.io())
+                .observeOn(Schedulers.computation())
+                .map(s -> {
+                    List<CloudPluginBean> plugins = new ArrayList<>();
+                    Gson gson = new Gson();
+                    UpdateJson json = gson.fromJson(s, UpdateJson.class);
+                    for (UpdateJson.PluginsBean bean1 : json.getPlugins()) {
+                        CloudPluginBean cloudPluginBean =
+                                new CloudPluginBean(bean1.getPlugin(), bean1.getTitle(), bean1.getSrc(),
+                                        bean1.getVer(), bean1.getVer_desc(), bean1.getDesc(), bean1.getDst(), bean1.getLink());
+                        plugins.add(cloudPluginBean);
+                    }
+                    return plugins;
+                })
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(plugins -> callback.result(plugins),
+                        e -> e.printStackTrace());
+    }
+
+    public static long count() {
+        Realm realm = null;
+        try {
+            realm = Realm.getDefaultInstance();
+            return realm.where(CloudPluginBean.class)
+                    .count();
+        } finally {
+            if (realm != null) {
+                realm.close();
+            }
+        }
+    }
+
+    public static void uninstall(CloudPluginBean cloudPluginBean) {
+        CloudPluginBean local = query(cloudPluginBean.getName());
+        if (local == null) {
+            return;
+        }
+        Realm realm = null;
+        try {
+            // 清除本地文件
+            File file = new File(getCompletePath(local));
+            if (file.exists()) {
+                file.delete();
+            }
+
+            // 清除数据库数据
+            realm = Realm.getDefaultInstance();
+            realm.beginTransaction();
+            realm.where(CloudPluginBean.class)
+                    .equalTo("name", local.getName())
+                    .findFirst()
+                    .deleteFromRealm();
+            realm.commitTransaction();
+
+            Toast.makeText(App.getContext(), R.string.toast_plugin_uninstall_complete, Toast.LENGTH_SHORT).show();
+        } finally {
+            if (realm != null) {
+                realm.close();
+            }
+        }
+    }
+
+    public static String getCompletePath(CloudPluginBean cloudPluginBean) {
+        return String.format("%s%s%s", INSTALL_DIR, "/", cloudPluginBean.getPath());
+    }
+
+    public interface Callback {
+        void result(List<CloudPluginBean> plugins);
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/plugin/Common.java b/qpython/src/main/java/org/qpython/qpy/plugin/Common.java
index 6bbb9bab..80750800 100644
--- a/qpython/src/main/java/org/qpython/qpy/plugin/Common.java
+++ b/qpython/src/main/java/org/qpython/qpy/plugin/Common.java
@@ -1,7 +1,7 @@
-package org.qpython.qpy.plugin;
-
-public class Common {
-    public static class PluginChangeEvent {
-
-    }
-}
+package org.qpython.qpy.plugin;
+
+public class Common {
+    public static class PluginChangeEvent {
+
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/plugin/LocalPluginManager.java b/qpython/src/main/java/org/qpython/qpy/plugin/LocalPluginManager.java
index df1b1278..e46601ef 100644
--- a/qpython/src/main/java/org/qpython/qpy/plugin/LocalPluginManager.java
+++ b/qpython/src/main/java/org/qpython/qpy/plugin/LocalPluginManager.java
@@ -1,108 +1,108 @@
-package org.qpython.qpy.plugin;
-
-import android.widget.Toast;
-
-import org.qpython.qpy.R;
-import org.qpython.qpy.main.app.App;
-import org.qpython.qpy.plugin.model.LocalPluginBean;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-
-import io.realm.Realm;
-import io.realm.RealmResults;
-import org.qpython.qpy.utils.FileUtils;
-
-public class LocalPluginManager {
-    private static final String INSTALL_DIR = App.getContext().getFilesDir() + "/user";
-
-    public static boolean install(File plugin) {
-        Realm realm = null;
-        try {
-            LocalPluginBean pluginInfo = checkPluginValid(plugin);
-            File dest = new File(getCompletePath(pluginInfo));
-            dest.getParentFile().mkdirs();
-            dest.createNewFile();
-            FileUtils.copyFile(plugin, dest);
-            realm = Realm.getDefaultInstance();
-            realm.beginTransaction();
-            realm.copyToRealmOrUpdate(pluginInfo);
-            realm.commitTransaction();
-
-            Toast.makeText(App.getContext(), R.string.toast_plugin_install_complete, Toast.LENGTH_SHORT).show();
-            return true;
-        } catch (Exception e) {
-            e.printStackTrace();
-            Toast.makeText(App.getContext(), R.string.toast_plugin_install_failure, Toast.LENGTH_SHORT).show();
-            return false;
-        } finally {
-            if (realm != null) {
-                realm.close();
-            }
-        }
-    }
-
-    public static void uninstall(LocalPluginBean plugin) {
-        Realm realm = null;
-        try {
-            File file = new File(getCompletePath(plugin));
-            if (file.exists()) {
-                file.delete();
-            }
-
-            realm = Realm.getDefaultInstance();
-            realm.beginTransaction();
-            realm.where(LocalPluginBean.class)
-                    .equalTo("name", plugin.getName())
-                    .findFirst()
-                    .deleteFromRealm();
-            realm.commitTransaction();
-
-            Toast.makeText(App.getContext(), R.string.toast_plugin_uninstall_complete, Toast.LENGTH_SHORT).show();
-        } finally {
-            if (realm != null) {
-                realm.close();
-            }
-        }
-    }
-
-    public static RealmResults<LocalPluginBean> queryAll(Realm realm) {
-        return realm.where(LocalPluginBean.class).findAll();
-    }
-
-    public static String getCompletePath(LocalPluginBean pluginInfo) {
-        return INSTALL_DIR + "/" + pluginInfo.getName();
-    }
-
-    private static LocalPluginBean checkPluginValid(File file) {
-        BufferedReader reader = null;
-        try {
-            reader = new BufferedReader(new InputStreamReader(new FileInputStream(file)));
-            String head = reader.readLine();
-
-            if (!head.startsWith("#tbplugin")) {
-                throw new IllegalStateException(file.getName() + " is not a valid plugin");
-            }
-
-            String[] info = head.split("\\|\\|");
-            if (info.length != 3) {
-                throw new IllegalStateException(file.getName() + " is not a valid plugin");
-            }
-
-            return new LocalPluginBean(file.getName(), info[1], info[2]);
-        } catch (Exception e) {
-            e.printStackTrace();
-            return null;
-        } finally {
-            try {
-                reader.close();
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-
-        }
-    }
-}
+package org.qpython.qpy.plugin;
+
+import android.widget.Toast;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.plugin.model.LocalPluginBean;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+
+import io.realm.Realm;
+import io.realm.RealmResults;
+import org.qpython.qpy.utils.FileUtils;
+
+public class LocalPluginManager {
+    private static final String INSTALL_DIR = App.getContext().getFilesDir() + "/user";
+
+    public static boolean install(File plugin) {
+        Realm realm = null;
+        try {
+            LocalPluginBean pluginInfo = checkPluginValid(plugin);
+            File dest = new File(getCompletePath(pluginInfo));
+            dest.getParentFile().mkdirs();
+            dest.createNewFile();
+            FileUtils.copyFile(plugin, dest);
+            realm = Realm.getDefaultInstance();
+            realm.beginTransaction();
+            realm.copyToRealmOrUpdate(pluginInfo);
+            realm.commitTransaction();
+
+            Toast.makeText(App.getContext(), R.string.toast_plugin_install_complete, Toast.LENGTH_SHORT).show();
+            return true;
+        } catch (Exception e) {
+            e.printStackTrace();
+            Toast.makeText(App.getContext(), R.string.toast_plugin_install_failure, Toast.LENGTH_SHORT).show();
+            return false;
+        } finally {
+            if (realm != null) {
+                realm.close();
+            }
+        }
+    }
+
+    public static void uninstall(LocalPluginBean plugin) {
+        Realm realm = null;
+        try {
+            File file = new File(getCompletePath(plugin));
+            if (file.exists()) {
+                file.delete();
+            }
+
+            realm = Realm.getDefaultInstance();
+            realm.beginTransaction();
+            realm.where(LocalPluginBean.class)
+                    .equalTo("name", plugin.getName())
+                    .findFirst()
+                    .deleteFromRealm();
+            realm.commitTransaction();
+
+            Toast.makeText(App.getContext(), R.string.toast_plugin_uninstall_complete, Toast.LENGTH_SHORT).show();
+        } finally {
+            if (realm != null) {
+                realm.close();
+            }
+        }
+    }
+
+    public static RealmResults<LocalPluginBean> queryAll(Realm realm) {
+        return realm.where(LocalPluginBean.class).findAll();
+    }
+
+    public static String getCompletePath(LocalPluginBean pluginInfo) {
+        return INSTALL_DIR + "/" + pluginInfo.getName();
+    }
+
+    private static LocalPluginBean checkPluginValid(File file) {
+        BufferedReader reader = null;
+        try {
+            reader = new BufferedReader(new InputStreamReader(new FileInputStream(file)));
+            String head = reader.readLine();
+
+            if (!head.startsWith("#tbplugin")) {
+                throw new IllegalStateException(file.getName() + " is not a valid plugin");
+            }
+
+            String[] info = head.split("\\|\\|");
+            if (info.length != 3) {
+                throw new IllegalStateException(file.getName() + " is not a valid plugin");
+            }
+
+            return new LocalPluginBean(file.getName(), info[1], info[2]);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        } finally {
+            try {
+                reader.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+
+        }
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/plugin/PluginDetailDialogFragment.java b/qpython/src/main/java/org/qpython/qpy/plugin/PluginDetailDialogFragment.java
index acdf1fd9..fbf68c06 100644
--- a/qpython/src/main/java/org/qpython/qpy/plugin/PluginDetailDialogFragment.java
+++ b/qpython/src/main/java/org/qpython/qpy/plugin/PluginDetailDialogFragment.java
@@ -1,38 +1,38 @@
-package org.qpython.qpy.plugin;
-
-
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.os.Bundle;
-import android.support.v4.app.DialogFragment;
-
-import org.qpython.qpy.R;
-
-
-
-public class PluginDetailDialogFragment extends DialogFragment {
-    public static final String TAG = "PluginDetailDialogFragment";
-    private static final String TITLE = "title";
-    private static final String MSG = "msg";
-
-    public static PluginDetailDialogFragment newInstance(String title, String msg) {
-        Bundle args = new Bundle();
-        args.putString(TITLE, title);
-        args.putString(MSG, msg);
-        PluginDetailDialogFragment fragment = new PluginDetailDialogFragment();
-        fragment.setArguments(args);
-        return fragment;
-    }
-
-    @Override
-    public Dialog onCreateDialog(Bundle savedInstanceState) {
-        String title = getArguments().getString(TITLE);
-        String msg = getArguments().getString(MSG);
-
-        return new AlertDialog.Builder(getActivity())
-                .setTitle(title)
-                .setMessage(msg)
-                .setPositiveButton(R.string.dialog_plugin_detail_positive, (dialog, which) -> dismiss())
-                .create();
-    }
-}
+package org.qpython.qpy.plugin;
+
+
+import android.support.v7.app.AlertDialog;
+import android.app.Dialog;
+import android.os.Bundle;
+import android.support.v4.app.DialogFragment;
+
+import org.qpython.qpy.R;
+
+
+
+public class PluginDetailDialogFragment extends DialogFragment {
+    public static final String TAG = "PluginDetailDialogFragment";
+    private static final String TITLE = "title";
+    private static final String MSG = "msg";
+
+    public static PluginDetailDialogFragment newInstance(String title, String msg) {
+        Bundle args = new Bundle();
+        args.putString(TITLE, title);
+        args.putString(MSG, msg);
+        PluginDetailDialogFragment fragment = new PluginDetailDialogFragment();
+        fragment.setArguments(args);
+        return fragment;
+    }
+
+    @Override
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        String title = getArguments().getString(TITLE);
+        String msg = getArguments().getString(MSG);
+
+        return new AlertDialog.Builder(getActivity())
+                .setTitle(title)
+                .setMessage(msg)
+                .setPositiveButton(R.string.dialog_plugin_detail_positive, (dialog, which) -> dismiss())
+                .create();
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/plugin/SpaceItemDecoration.java b/qpython/src/main/java/org/qpython/qpy/plugin/SpaceItemDecoration.java
index d1915a9a..5ef017d0 100644
--- a/qpython/src/main/java/org/qpython/qpy/plugin/SpaceItemDecoration.java
+++ b/qpython/src/main/java/org/qpython/qpy/plugin/SpaceItemDecoration.java
@@ -1,18 +1,18 @@
-package org.qpython.qpy.plugin;
-
-import android.graphics.Rect;
-import android.support.v7.widget.RecyclerView;
-import android.view.View;
-
-public class SpaceItemDecoration extends RecyclerView.ItemDecoration {
-    private final int mSpace;
-
-    public SpaceItemDecoration(int space) {
-        mSpace = space;
-    }
-
-    @Override
-    public void getItemOffsets(Rect outRect, View view, RecyclerView parent, RecyclerView.State state) {
-        outRect.top = mSpace;
-    }
-}
+package org.qpython.qpy.plugin;
+
+import android.graphics.Rect;
+import android.support.v7.widget.RecyclerView;
+import android.view.View;
+
+public class SpaceItemDecoration extends RecyclerView.ItemDecoration {
+    private final int mSpace;
+
+    public SpaceItemDecoration(int space) {
+        mSpace = space;
+    }
+
+    @Override
+    public void getItemOffsets(Rect outRect, View view, RecyclerView parent, RecyclerView.State state) {
+        outRect.top = mSpace;
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/plugin/activity/LocalPluginInstallActivity.java b/qpython/src/main/java/org/qpython/qpy/plugin/activity/LocalPluginInstallActivity.java
index 5cddac5d..3776ca18 100644
--- a/qpython/src/main/java/org/qpython/qpy/plugin/activity/LocalPluginInstallActivity.java
+++ b/qpython/src/main/java/org/qpython/qpy/plugin/activity/LocalPluginInstallActivity.java
@@ -1,108 +1,109 @@
-package org.qpython.qpy.plugin.activity;
-
-import android.Manifest;
-import android.content.pm.PackageManager;
-import android.os.Build;
-import android.os.Bundle;
-import android.os.Environment;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.widget.Toolbar;
-import android.widget.FrameLayout;
-import android.widget.Toast;
-
-import org.qpython.qpy.R;
-
-import org.qpython.qpy.main.activity.BaseActivity;
-import org.qpython.qpy.plugin.LocalPluginManager;
-import org.qpython.qpy.plugin.view.FileSelectView;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-import butterknife.Unbinder;
-
-public class LocalPluginInstallActivity extends BaseActivity {
-    private static final String sPath = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS).getAbsolutePath();
-    private static final int REQUEST_READ_EXTERNAL_STORAGE = 0;
-
-    FileSelectView mFileSelectView;
-    private Unbinder mUnbinder;
-
-    @BindView(R.id.container)
-    FrameLayout mContainer;
-
-    @BindView(R.id.toolbar)
-    Toolbar mToolbar;
-
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_local_plugin_install);
-        mUnbinder = ButterKnife.bind(this);
-
-        mToolbar.setNavigationIcon(R.drawable.ic_arrow_back_white);
-        mToolbar.setNavigationOnClickListener(v -> finish());
-        mToolbar.setTitle(R.string.title_select_plugin);
-    }
-
-    @Override
-    protected void onStart() {
-        super.onStart();
-        checkPermission();
-    }
-
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        mUnbinder.unbind();
-    }
-
-    @Override
-    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
-        if (requestCode == REQUEST_READ_EXTERNAL_STORAGE) {
-            if (grantResults[0] != PackageManager.PERMISSION_GRANTED) {
-                Toast.makeText(this, R.string.toast_read_permission_deny, Toast.LENGTH_SHORT).show();
-                finish();
-            } else {
-                show();
-            }
-        }
-    }
-
-    private void checkPermission() {
-        if (Build.VERSION.SDK_INT >= 23) {
-            int checkPermission = ContextCompat.checkSelfPermission(this, Manifest.permission.READ_EXTERNAL_STORAGE);
-            if (checkPermission != PackageManager.PERMISSION_GRANTED) {
-                ActivityCompat.requestPermissions(this, new String[]{Manifest.permission.READ_EXTERNAL_STORAGE}, REQUEST_READ_EXTERNAL_STORAGE);
-            } else {
-                show();
-            }
-        } else {
-            show();
-        }
-    }
-
-    private void show() {
-        // 初始化文件浏览器
-        Map<String, Integer> icon = new HashMap<>();
-
-        icon.put(FileSelectView.PARENT_DIR, R.drawable.ic_file_back);//返回上一层的图标
-        icon.put(FileSelectView.FOLDER, R.drawable.ic_file_dir);//文件夹图标
-        icon.put("py", R.drawable.ic_plugin_blue);
-
-        mFileSelectView = new FileSelectView(this, file -> {
-            if (LocalPluginManager.install(file)) {
-                LocalPluginInstallActivity.this.finish();
-            }
-        }, icon);
-
-        mFileSelectView.setPath(sPath);
-        mContainer.addView(mFileSelectView);
-    }
-}
+package org.qpython.qpy.plugin.activity;
+
+import android.Manifest;
+import android.content.pm.PackageManager;
+import android.os.Build;
+import android.os.Bundle;
+import android.os.Environment;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v4.app.ActivityCompat;
+import android.support.v4.content.ContextCompat;
+import android.support.v7.widget.Toolbar;
+import android.widget.FrameLayout;
+import android.widget.Toast;
+
+import org.qpython.qpy.R;
+
+import org.qpython.qpy.main.activity.BaseActivity;
+import org.qpython.qpy.plugin.LocalPluginManager;
+import org.qpython.qpy.plugin.view.FileSelectView;
+
+import java.util.HashMap;
+import java.util.Map;
+
+//import butterknife.BindView;
+//import butterknife.ButterKnife;
+//import butterknife.Unbinder;
+
+public class LocalPluginInstallActivity extends BaseActivity {
+    private static final String sPath                         = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS).getAbsolutePath();
+    private static final int    REQUEST_READ_EXTERNAL_STORAGE = 0;
+
+    FileSelectView mFileSelectView;
+//    private Unbinder mUnbinder;
+
+    //    @BindView(R.id.container)
+    FrameLayout mContainer;
+
+    //    @BindView(R.id.toolbar)
+    Toolbar mToolbar;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_local_plugin_install);
+//        mUnbinder = ButterKnife.bind(this);
+        mContainer = (FrameLayout) findViewById(R.id.container);
+        mToolbar = (Toolbar) findViewById(R.id.toolbar);
+
+        mToolbar.setNavigationIcon(R.drawable.ic_back);
+        mToolbar.setNavigationOnClickListener(v -> finish());
+        mToolbar.setTitle(R.string.title_select_plugin);
+    }
+
+    @Override
+    protected void onStart() {
+        super.onStart();
+        checkPermission();
+    }
+
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+    }
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+        if (requestCode == REQUEST_READ_EXTERNAL_STORAGE) {
+            if (grantResults[0] != PackageManager.PERMISSION_GRANTED) {
+                Toast.makeText(this, R.string.toast_read_permission_deny, Toast.LENGTH_SHORT).show();
+                finish();
+            } else {
+                show();
+            }
+        }
+    }
+
+    private void checkPermission() {
+        if (Build.VERSION.SDK_INT >= 23) {
+            int checkPermission = ContextCompat.checkSelfPermission(this, Manifest.permission.READ_EXTERNAL_STORAGE);
+            if (checkPermission != PackageManager.PERMISSION_GRANTED) {
+                ActivityCompat.requestPermissions(this, new String[]{Manifest.permission.READ_EXTERNAL_STORAGE}, REQUEST_READ_EXTERNAL_STORAGE);
+            } else {
+                show();
+            }
+        } else {
+            show();
+        }
+    }
+
+    private void show() {
+        // 初始化文件浏览器
+        Map<String, Integer> icon = new HashMap<>();
+
+        icon.put(FileSelectView.PARENT_DIR, R.drawable.prev);//返回上一层的图标
+        icon.put(FileSelectView.FOLDER, R.drawable.ic_editor_folder);//文件夹图标
+        icon.put("py", R.drawable.ic_home_program);
+
+        mFileSelectView = new FileSelectView(this, file -> {
+            if (LocalPluginManager.install(file)) {
+                LocalPluginInstallActivity.this.finish();
+            }
+        }, icon);
+
+        mFileSelectView.setPath(sPath);
+        mContainer.addView(mFileSelectView);
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/plugin/activity/PluginManagerActivity.java b/qpython/src/main/java/org/qpython/qpy/plugin/activity/PluginManagerActivity.java
index 5e6e65ad..cfdd388c 100644
--- a/qpython/src/main/java/org/qpython/qpy/plugin/activity/PluginManagerActivity.java
+++ b/qpython/src/main/java/org/qpython/qpy/plugin/activity/PluginManagerActivity.java
@@ -1,61 +1,54 @@
-package org.qpython.qpy.plugin.activity;
-
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.design.widget.TabLayout;
-import android.support.v4.view.PagerAdapter;
-import android.support.v4.view.ViewPager;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
-
-import org.qpython.qpy.R;
-
-import org.qpython.qpy.plugin.adapter.PluginPagerAdapter;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-import butterknife.Unbinder;
-
-public class PluginManagerActivity extends AppCompatActivity {
-
-    private Unbinder mUnbinder;
-
-    @BindView(R.id.toolbar)
-    Toolbar mToolbar;
-
-    @BindView(R.id.tab_layout)
-    TabLayout mTabLayout;
-
-    @BindView(R.id.view_pager)
-    ViewPager mViewPager;
-
-    public static void start(Context context) {
-        Intent starter = new Intent(context, PluginManagerActivity.class);
-        context.startActivity(starter);
-    }
-
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_plugin_manager);
-        mUnbinder = ButterKnife.bind(this);
-        setSupportActionBar(mToolbar);
-        mToolbar.setNavigationOnClickListener(v -> finish());
-    }
-
-    @Override
-    protected void onStart() {
-        super.onStart();
-        PagerAdapter adapter = new PluginPagerAdapter(getSupportFragmentManager());
-        mViewPager.setAdapter(adapter);
-        mTabLayout.setupWithViewPager(mViewPager);
-    }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        mUnbinder.unbind();
-    }
-}
+package org.qpython.qpy.plugin.activity;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.design.widget.TabLayout;
+import android.support.v4.view.PagerAdapter;
+import android.support.v4.view.ViewPager;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.Toolbar;
+
+import org.qpython.qpy.R;
+
+import org.qpython.qpy.plugin.adapter.PluginPagerAdapter;
+
+public class PluginManagerActivity extends AppCompatActivity {
+
+    Toolbar mToolbar;
+
+    TabLayout mTabLayout;
+
+    ViewPager mViewPager;
+
+    public static void start(Context context) {
+        Intent starter = new Intent(context, PluginManagerActivity.class);
+        context.startActivity(starter);
+    }
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_plugin_manager);
+        mToolbar = (Toolbar) findViewById(R.id.toolbar);
+        mTabLayout = (TabLayout) findViewById(R.id.tab_layout);
+        mViewPager = (ViewPager) findViewById(R.id.view_pager);
+
+        setSupportActionBar(mToolbar);
+        mToolbar.setNavigationOnClickListener(v -> finish());
+    }
+
+    @Override
+    protected void onStart() {
+        super.onStart();
+        PagerAdapter adapter = new PluginPagerAdapter(getSupportFragmentManager());
+        mViewPager.setAdapter(adapter);
+        mTabLayout.setupWithViewPager(mViewPager);
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/plugin/adapter/CloudPluginAdapter.java b/qpython/src/main/java/org/qpython/qpy/plugin/adapter/CloudPluginAdapter.java
index 42b9ad2b..a6f1e2fc 100644
--- a/qpython/src/main/java/org/qpython/qpy/plugin/adapter/CloudPluginAdapter.java
+++ b/qpython/src/main/java/org/qpython/qpy/plugin/adapter/CloudPluginAdapter.java
@@ -1,144 +1,142 @@
-package org.qpython.qpy.plugin.adapter;
-
-import android.content.Context;
-import android.support.v4.app.FragmentManager;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.PopupMenu;
-import android.support.v7.widget.RecyclerView;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import com.quseit.common.updater.Updater;
-import org.qpython.qpy.R;
-
-import org.qpython.qpy.plugin.CloudPluginManager;
-import org.qpython.qpy.plugin.PluginDetailDialogFragment;
-import org.qpython.qpy.plugin.model.CloudPluginBean;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-
-public class CloudPluginAdapter extends RecyclerView.Adapter<CloudPluginAdapter.PluginHolder> {
-    private Context mContext;
-    private List<CloudPluginBean> mPluginBeen;
-
-    public CloudPluginAdapter(Context context) {
-        mContext = context;
-        mPluginBeen = new ArrayList<>();
-    }
-
-    @Override
-    public PluginHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-        LayoutInflater inflater = LayoutInflater.from(mContext);
-        View v = inflater.inflate(R.layout.item_plugin_cloud, null);
-        return new PluginHolder(v);
-    }
-
-    @Override
-    public void onBindViewHolder(PluginHolder holder, int position) {
-        CloudPluginBean bean = mPluginBeen.get(position);
-        holder.name.setText(bean.getName());
-        holder.description.setText(bean.getDescription());
-
-        PopupMenu menu = new PopupMenu(mContext, holder.menu);
-        boolean install = CloudPluginManager.checkInstalled(bean);
-        boolean update = CloudPluginManager.checkUpdate(bean);
-        if (install && !update) {
-            holder.menu.setImageResource(R.drawable.ic_plugin);
-            menu.inflate(R.menu.plugin_installed_menu);
-            menu.setOnMenuItemClickListener(item -> {
-                        switch (item.getItemId()) {
-                            case R.id.detail:
-                                showDetail(bean);
-                                break;
-                            case R.id.uninstall:
-                                uninstall(bean);
-                                break;
-                        }
-                        return true;
-                    }
-            );
-        } else if (install) {
-            holder.menu.setImageResource(R.drawable.ic_update);
-            menu.inflate(R.menu.plugin_update_menu);
-            menu.setOnMenuItemClickListener(item -> {
-                switch (item.getItemId()) {
-                    case R.id.detail:
-                        showDetail(bean);
-                        break;
-                    case R.id.update:
-                        update(bean);
-                        break;
-                    case R.id.uninstall:
-                        uninstall(bean);
-                        break;
-                }
-                return true;
-            });
-        } else {
-            holder.menu.setImageResource(R.drawable.ic_install);
-            menu.inflate(R.menu.plugin_uninstalled_menu);
-            menu.setOnMenuItemClickListener(item -> {
-                switch (item.getItemId()) {
-                    case R.id.install:
-                        install(bean);
-                        break;
-                }
-                return true;
-            });
-        }
-        holder.itemView.setOnClickListener(v -> menu.show());
-    }
-
-    private void showDetail(CloudPluginBean plugin) {
-        FragmentManager manager = ((AppCompatActivity) mContext).getSupportFragmentManager();
-        PluginDetailDialogFragment.newInstance(plugin.getName(), CloudPluginManager.getCompletePath(plugin))
-                .show(manager, PluginDetailDialogFragment.TAG);
-    }
-
-    private void install(CloudPluginBean plugin) {
-        update(plugin);
-    }
-
-    private void update(CloudPluginBean plugin) {
-        Updater.update(plugin);
-    }
-
-    private void uninstall(CloudPluginBean plugin) {
-        mPluginBeen.remove(plugin);
-        CloudPluginManager.uninstall(plugin);
-    }
-
-    @Override
-    public int getItemCount() {
-        return mPluginBeen == null ? 0 : mPluginBeen.size();
-    }
-
-    public void setData(List<CloudPluginBean> plugins) {
-        mPluginBeen.clear();
-        mPluginBeen.addAll(plugins);
-        notifyDataSetChanged();
-    }
-
-    public static class PluginHolder extends RecyclerView.ViewHolder {
-        @BindView(R.id.plugin_name)
-        TextView name;
-
-        @BindView(R.id.plugin_description)
-        TextView description;
-
-        @BindView(R.id.plugin_menu)
-        ImageView menu;
-
-        public PluginHolder(View itemView) {
-            super(itemView);
-            ButterKnife.bind(this, itemView);
-        }
-    }
-}
+package org.qpython.qpy.plugin.adapter;
+
+import android.content.Context;
+import android.support.v4.app.FragmentManager;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.PopupMenu;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.quseit.common.updater.Updater;
+
+import org.qpython.qpy.R;
+
+import org.qpython.qpy.plugin.CloudPluginManager;
+import org.qpython.qpy.plugin.PluginDetailDialogFragment;
+import org.qpython.qpy.plugin.model.CloudPluginBean;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+public class CloudPluginAdapter extends RecyclerView.Adapter<CloudPluginAdapter.PluginHolder> {
+    private Context               mContext;
+    private List<CloudPluginBean> mPluginBeen;
+
+    public CloudPluginAdapter(Context context) {
+        mContext = context;
+        mPluginBeen = new ArrayList<>();
+    }
+
+    @Override
+    public PluginHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+        LayoutInflater inflater = LayoutInflater.from(mContext);
+        View v = inflater.inflate(R.layout.item_plugin_cloud, null);
+        return new PluginHolder(v);
+    }
+
+    @Override
+    public void onBindViewHolder(PluginHolder holder, int position) {
+        CloudPluginBean bean = mPluginBeen.get(position);
+        holder.name.setText(bean.getName());
+        holder.description.setText(bean.getDescription());
+
+        PopupMenu menu = new PopupMenu(mContext, holder.menu);
+        boolean install = CloudPluginManager.checkInstalled(bean);
+        boolean update = CloudPluginManager.checkUpdate(bean);
+        if (install && !update) {
+            holder.menu.setImageResource(R.drawable.ic_plugin);
+            menu.inflate(R.menu.plugin_installed_menu);
+            menu.setOnMenuItemClickListener(item -> {
+                        switch (item.getItemId()) {
+                            case R.id.detail:
+                                showDetail(bean);
+                                break;
+                            case R.id.uninstall:
+                                uninstall(bean);
+                                break;
+                        }
+                        return true;
+                    }
+            );
+        } else if (install) {
+            holder.menu.setImageResource(R.drawable.ic_library_upgrade);
+            menu.inflate(R.menu.plugin_update_menu);
+            menu.setOnMenuItemClickListener(item -> {
+                switch (item.getItemId()) {
+                    case R.id.detail:
+                        showDetail(bean);
+                        break;
+                    case R.id.update:
+                        update(bean);
+                        break;
+                    case R.id.uninstall:
+                        uninstall(bean);
+                        break;
+                }
+                return true;
+            });
+        } else {
+            holder.menu.setImageResource(R.drawable.ic_library_download);
+            menu.inflate(R.menu.plugin_uninstalled_menu);
+            menu.setOnMenuItemClickListener(item -> {
+                switch (item.getItemId()) {
+                    case R.id.install:
+                        install(bean);
+                        break;
+                }
+                return true;
+            });
+        }
+        holder.itemView.setOnClickListener(v -> menu.show());
+    }
+
+    private void showDetail(CloudPluginBean plugin) {
+        FragmentManager manager = ((AppCompatActivity) mContext).getSupportFragmentManager();
+        PluginDetailDialogFragment.newInstance(plugin.getName(), CloudPluginManager.getCompletePath(plugin))
+                .show(manager, PluginDetailDialogFragment.TAG);
+    }
+
+    private void install(CloudPluginBean plugin) {
+        update(plugin);
+    }
+
+    private void update(CloudPluginBean plugin) {
+        Updater.update(plugin);
+    }
+
+    private void uninstall(CloudPluginBean plugin) {
+        mPluginBeen.remove(plugin);
+        CloudPluginManager.uninstall(plugin);
+    }
+
+    @Override
+    public int getItemCount() {
+        return mPluginBeen == null ? 0 : mPluginBeen.size();
+    }
+
+    public void setData(List<CloudPluginBean> plugins) {
+        mPluginBeen.clear();
+        mPluginBeen.addAll(plugins);
+        notifyDataSetChanged();
+    }
+
+    public static class PluginHolder extends RecyclerView.ViewHolder {
+        TextView name;
+
+        TextView description;
+
+        ImageView menu;
+
+        public PluginHolder(View itemView) {
+            super(itemView);
+            name = (TextView) itemView.findViewById(R.id.plugin_name);
+            description = (TextView) itemView.findViewById(R.id.plugin_description);
+            menu = (ImageView) itemView.findViewById(R.id.plugin_menu);
+        }
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/plugin/adapter/LocalPluginAdapter.java b/qpython/src/main/java/org/qpython/qpy/plugin/adapter/LocalPluginAdapter.java
index d5c483d0..4f14ae41 100644
--- a/qpython/src/main/java/org/qpython/qpy/plugin/adapter/LocalPluginAdapter.java
+++ b/qpython/src/main/java/org/qpython/qpy/plugin/adapter/LocalPluginAdapter.java
@@ -1,101 +1,97 @@
-package org.qpython.qpy.plugin.adapter;
-
-import android.content.Context;
-import android.support.v4.app.FragmentManager;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.PopupMenu;
-import android.support.v7.widget.RecyclerView;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import org.qpython.qpy.R;
-
-import org.qpython.qpy.plugin.LocalPluginManager;
-import org.qpython.qpy.plugin.PluginDetailDialogFragment;
-import org.qpython.qpy.plugin.model.LocalPluginBean;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-
-public class LocalPluginAdapter extends RecyclerView.Adapter<LocalPluginAdapter.PluginHolder> {
-    private Context mContext;
-    private List<LocalPluginBean> mList;
-
-    public LocalPluginAdapter(Context context) {
-        mContext = context;
-        mList = new ArrayList<>();
-    }
-
-    @Override
-    public PluginHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-        View v = LayoutInflater.from(mContext).inflate(R.layout.item_plugin_local, null);
-        return new PluginHolder(v);
-    }
-
-    @Override
-    public void onBindViewHolder(PluginHolder holder, int position) {
-        LocalPluginBean pluginInfo = mList.get(position);
-        holder.name.setText(pluginInfo.getName());
-        holder.description.setText(pluginInfo.getTitle());
-        PopupMenu menu = new PopupMenu(mContext, holder.menu);
-        menu.inflate(R.menu.plugin_installed_menu);
-        menu.setOnMenuItemClickListener(item -> {
-            switch (item.getItemId()) {
-                case R.id.detail:
-                    showDetail(pluginInfo);
-                    break;
-                case R.id.uninstall:
-                    uninstall(pluginInfo);
-                    break;
-            }
-
-            return true;
-        });
-
-        holder.itemView.setOnClickListener(v -> menu.show());
-    }
-
-    @Override
-    public int getItemCount() {
-        return mList == null ? 0 : mList.size();
-    }
-
-    private void showDetail(LocalPluginBean plugin) {
-        FragmentManager manager = ((AppCompatActivity) mContext).getSupportFragmentManager();
-        PluginDetailDialogFragment.newInstance(plugin.getName(), LocalPluginManager.getCompletePath(plugin))
-                .show(manager, PluginDetailDialogFragment.TAG);
-    }
-
-    private void uninstall(LocalPluginBean plugin) {
-        mList.remove(plugin);
-        LocalPluginManager.uninstall(plugin);
-    }
-
-    public void setData(List<LocalPluginBean> data) {
-        mList.clear();
-        mList.addAll(data);
-        notifyDataSetChanged();
-    }
-
-    public static class PluginHolder extends RecyclerView.ViewHolder {
-        @BindView(R.id.plugin_name)
-        TextView name;
-
-        @BindView(R.id.plugin_description)
-        TextView description;
-
-        @BindView(R.id.plugin_menu)
-        ImageView menu;
-
-        public PluginHolder(View itemView) {
-            super(itemView);
-            ButterKnife.bind(this, itemView);
-        }
-    }
-}
+package org.qpython.qpy.plugin.adapter;
+
+import android.content.Context;
+import android.support.v4.app.FragmentManager;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.PopupMenu;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import org.qpython.qpy.R;
+
+import org.qpython.qpy.plugin.LocalPluginManager;
+import org.qpython.qpy.plugin.PluginDetailDialogFragment;
+import org.qpython.qpy.plugin.model.LocalPluginBean;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class LocalPluginAdapter extends RecyclerView.Adapter<LocalPluginAdapter.PluginHolder> {
+    private Context               mContext;
+    private List<LocalPluginBean> mList;
+
+    public LocalPluginAdapter(Context context) {
+        mContext = context;
+        mList = new ArrayList<>();
+    }
+
+    @Override
+    public PluginHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+        View v = LayoutInflater.from(mContext).inflate(R.layout.item_plugin_local, null);
+        return new PluginHolder(v);
+    }
+
+    @Override
+    public void onBindViewHolder(PluginHolder holder, int position) {
+        LocalPluginBean pluginInfo = mList.get(position);
+        holder.name.setText(pluginInfo.getName());
+        holder.description.setText(pluginInfo.getTitle());
+        PopupMenu menu = new PopupMenu(mContext, holder.menu);
+        menu.inflate(R.menu.plugin_installed_menu);
+        menu.setOnMenuItemClickListener(item -> {
+            switch (item.getItemId()) {
+                case R.id.detail:
+                    showDetail(pluginInfo);
+                    break;
+                case R.id.uninstall:
+                    uninstall(pluginInfo);
+                    break;
+            }
+
+            return true;
+        });
+
+        holder.itemView.setOnClickListener(v -> menu.show());
+    }
+
+    @Override
+    public int getItemCount() {
+        return mList == null ? 0 : mList.size();
+    }
+
+    private void showDetail(LocalPluginBean plugin) {
+        FragmentManager manager = ((AppCompatActivity) mContext).getSupportFragmentManager();
+        PluginDetailDialogFragment.newInstance(plugin.getName(), LocalPluginManager.getCompletePath(plugin))
+                .show(manager, PluginDetailDialogFragment.TAG);
+    }
+
+    private void uninstall(LocalPluginBean plugin) {
+        mList.remove(plugin);
+        LocalPluginManager.uninstall(plugin);
+    }
+
+    public void setData(List<LocalPluginBean> data) {
+        mList.clear();
+        mList.addAll(data);
+        notifyDataSetChanged();
+    }
+
+    public static class PluginHolder extends RecyclerView.ViewHolder {
+        TextView name;
+
+        TextView description;
+
+        ImageView menu;
+
+        public PluginHolder(View itemView) {
+            super(itemView);
+            name = (TextView) itemView.findViewById(R.id.plugin_name);
+            description = (TextView) itemView.findViewById(R.id.plugin_description);
+            menu = (ImageView) itemView.findViewById(R.id.plugin_menu);
+        }
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/plugin/adapter/PluginPagerAdapter.java b/qpython/src/main/java/org/qpython/qpy/plugin/adapter/PluginPagerAdapter.java
index e2ac5376..5a0ef67f 100644
--- a/qpython/src/main/java/org/qpython/qpy/plugin/adapter/PluginPagerAdapter.java
+++ b/qpython/src/main/java/org/qpython/qpy/plugin/adapter/PluginPagerAdapter.java
@@ -1,45 +1,45 @@
-package org.qpython.qpy.plugin.adapter;
-
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentPagerAdapter;
-
-
-import org.qpython.qpy.R;
-
-import org.qpython.qpy.main.app.App;
-import org.qpython.qpy.plugin.fragment.CloudPluginFragment;
-import org.qpython.qpy.plugin.fragment.LocalPluginFragment;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class PluginPagerAdapter extends FragmentPagerAdapter {
-    private String[] mTitles;
-    private List<Fragment> mFragments;
-
-
-    public PluginPagerAdapter(FragmentManager fm) {
-        super(fm);
-
-        mTitles = App.getContext().getResources().getStringArray(R.array.plugin_tab);
-        mFragments = new ArrayList<>();
-        mFragments.add(LocalPluginFragment.newInstance());
-        mFragments.add(CloudPluginFragment.newInstance());
-    }
-
-    @Override
-    public Fragment getItem(int position) {
-        return mFragments.get(position);
-    }
-
-    @Override
-    public int getCount() {
-        return mFragments.size();
-    }
-
-    @Override
-    public CharSequence getPageTitle(int position) {
-        return mTitles[position];
-    }
-}
+package org.qpython.qpy.plugin.adapter;
+
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentPagerAdapter;
+
+
+import org.qpython.qpy.R;
+
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.plugin.fragment.CloudPluginFragment;
+import org.qpython.qpy.plugin.fragment.LocalPluginFragment;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PluginPagerAdapter extends FragmentPagerAdapter {
+    private String[] mTitles;
+    private List<Fragment> mFragments;
+
+
+    public PluginPagerAdapter(FragmentManager fm) {
+        super(fm);
+
+        mTitles = App.getContext().getResources().getStringArray(R.array.plugin_tab);
+        mFragments = new ArrayList<>();
+        mFragments.add(LocalPluginFragment.newInstance());
+        mFragments.add(CloudPluginFragment.newInstance());
+    }
+
+    @Override
+    public Fragment getItem(int position) {
+        return mFragments.get(position);
+    }
+
+    @Override
+    public int getCount() {
+        return mFragments.size();
+    }
+
+    @Override
+    public CharSequence getPageTitle(int position) {
+        return mTitles[position];
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/plugin/fragment/CloudPluginFragment.java b/qpython/src/main/java/org/qpython/qpy/plugin/fragment/CloudPluginFragment.java
index 23d51a12..75a5cca9 100644
--- a/qpython/src/main/java/org/qpython/qpy/plugin/fragment/CloudPluginFragment.java
+++ b/qpython/src/main/java/org/qpython/qpy/plugin/fragment/CloudPluginFragment.java
@@ -1,91 +1,84 @@
-package org.qpython.qpy.plugin.fragment;
-
-
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.LinearLayout;
-
-import org.qpython.qpy.R;
-
-import org.qpython.qpy.plugin.CloudPluginManager;
-import org.qpython.qpy.plugin.SpaceItemDecoration;
-import org.qpython.qpy.plugin.adapter.CloudPluginAdapter;
-import org.qpython.qpy.plugin.model.CloudPluginBean;
-
-import java.util.List;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-import butterknife.Unbinder;
-import io.realm.Realm;
-import rx.Subscription;
-
-public class CloudPluginFragment extends Fragment {
-    private Unbinder mUnbinder;
-    private CloudPluginAdapter mCloudPluginAdapter;
-    private Realm mRealm;
-    private Subscription mRefreshDataSubscription;
-
-    @BindView(R.id.rv_plugin)
-    RecyclerView rvPlugin;
-
-    @BindView(R.id.none_item_bg)
-    LinearLayout noneItemBackground;
-
-    public static CloudPluginFragment newInstance() {
-        return new CloudPluginFragment();
-    }
-
-    @Nullable
-    @Override
-    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        View v = inflater.inflate(R.layout.fragment_plugin_cloud, container, false);
-        mUnbinder = ButterKnife.bind(this, v);
-        mRealm = Realm.getDefaultInstance();
-        return v;
-    }
-
-    @Override
-    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
-        mCloudPluginAdapter = new CloudPluginAdapter(getActivity());
-        rvPlugin.addItemDecoration(new SpaceItemDecoration(1));
-        rvPlugin.setLayoutManager(new LinearLayoutManager(getContext()));
-        rvPlugin.setAdapter(mCloudPluginAdapter);
-
-        mRefreshDataSubscription = CloudPluginManager.queryAll(mRealm).asObservable()
-                .subscribe(this::showData);
-    }
-
-    @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-        mUnbinder.unbind();
-        mRealm.close();
-        mRefreshDataSubscription.unsubscribe();
-    }
-
-    private void showData(List<CloudPluginBean> local) {
-        if (local == null || local.isEmpty()) {
-            noneItemBackground.setVisibility(View.VISIBLE);
-        } else {
-            noneItemBackground.setVisibility(View.GONE);
-        }
-
-        mCloudPluginAdapter.setData(local);
-
-        CloudPluginManager.queryFromNet(plugins -> {
-            if (plugins == null || plugins.isEmpty()) {
-                noneItemBackground.setVisibility(View.VISIBLE);
-            } else {
-                noneItemBackground.setVisibility(View.GONE);
-            }
-            mCloudPluginAdapter.setData(plugins);
-        });
-    }
-}
+package org.qpython.qpy.plugin.fragment;
+
+
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.LinearLayout;
+
+import org.qpython.qpy.R;
+
+import org.qpython.qpy.plugin.CloudPluginManager;
+import org.qpython.qpy.plugin.SpaceItemDecoration;
+import org.qpython.qpy.plugin.adapter.CloudPluginAdapter;
+import org.qpython.qpy.plugin.model.CloudPluginBean;
+
+import java.util.List;
+
+import io.realm.Realm;
+import rx.Subscription;
+
+public class CloudPluginFragment extends Fragment {
+    RecyclerView rvPlugin;
+    LinearLayout noneItemBackground;
+    private CloudPluginAdapter mCloudPluginAdapter;
+    private Realm mRealm;
+    private Subscription mRefreshDataSubscription;
+
+    public static CloudPluginFragment newInstance() {
+        return new CloudPluginFragment();
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        View v = inflater.inflate(R.layout.fragment_plugin_cloud, container, false);
+        rvPlugin = (RecyclerView) v.findViewById(R.id.rv_plugin);
+        noneItemBackground = (LinearLayout) v.findViewById(R.id.none_item_bg);
+
+        mRealm = Realm.getDefaultInstance();
+        return v;
+    }
+
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        mCloudPluginAdapter = new CloudPluginAdapter(getActivity());
+        rvPlugin.addItemDecoration(new SpaceItemDecoration(1));
+        rvPlugin.setLayoutManager(new LinearLayoutManager(getContext()));
+        rvPlugin.setAdapter(mCloudPluginAdapter);
+
+        mRefreshDataSubscription = CloudPluginManager.queryAll(mRealm).asObservable()
+                .subscribe(this::showData);
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        mRealm.close();
+        mRefreshDataSubscription.unsubscribe();
+    }
+
+    private void showData(List<CloudPluginBean> local) {
+        if (local == null || local.isEmpty()) {
+            noneItemBackground.setVisibility(View.VISIBLE);
+        } else {
+            noneItemBackground.setVisibility(View.GONE);
+        }
+
+        mCloudPluginAdapter.setData(local);
+
+        CloudPluginManager.queryFromNet(plugins -> {
+            if (plugins == null || plugins.isEmpty()) {
+                noneItemBackground.setVisibility(View.VISIBLE);
+            } else {
+                noneItemBackground.setVisibility(View.GONE);
+            }
+            mCloudPluginAdapter.setData(plugins);
+        });
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/plugin/fragment/LocalPluginFragment.java b/qpython/src/main/java/org/qpython/qpy/plugin/fragment/LocalPluginFragment.java
index 6304575c..f2c8d3a1 100644
--- a/qpython/src/main/java/org/qpython/qpy/plugin/fragment/LocalPluginFragment.java
+++ b/qpython/src/main/java/org/qpython/qpy/plugin/fragment/LocalPluginFragment.java
@@ -1,89 +1,77 @@
-package org.qpython.qpy.plugin.fragment;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.LinearLayout;
-
-import org.qpython.qpy.R;
-
-import org.qpython.qpy.plugin.LocalPluginManager;
-import org.qpython.qpy.plugin.activity.LocalPluginInstallActivity;
-import org.qpython.qpy.plugin.adapter.LocalPluginAdapter;
-import org.qpython.qpy.plugin.model.LocalPluginBean;
-
-import java.util.List;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-import butterknife.OnClick;
-import butterknife.Unbinder;
-import io.realm.Realm;
-import rx.Subscription;
-
-public class LocalPluginFragment extends Fragment {
-    private Unbinder mUnbinder;
-    private LocalPluginAdapter mLocalPluginAdapter;
-    private Realm mRealm;
-    private Subscription mRefreshDataSubscription;
-
-    @BindView(R.id.rv_plugin)
-    RecyclerView mRvPlugin;
-
-    @BindView(R.id.none_item_bg)
-    LinearLayout noneItemBackground;
-
-    public static LocalPluginFragment newInstance() {
-        return new LocalPluginFragment();
-    }
-
-    @Nullable
-    @Override
-    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        View v = inflater.inflate(R.layout.fragment_plugin_local, container, false);
-        mUnbinder = ButterKnife.bind(this, v);
-        mRealm = Realm.getDefaultInstance();
-        return v;
-    }
-
-    @Override
-    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-        mLocalPluginAdapter = new LocalPluginAdapter(getContext());
-        mRvPlugin.setLayoutManager(new LinearLayoutManager(getContext()));
-        mRvPlugin.setAdapter(mLocalPluginAdapter);
-        mRefreshDataSubscription = LocalPluginManager.queryAll(mRealm).asObservable()
-                .subscribe(this::showData);
-    }
-
-    @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-        mUnbinder.unbind();
-        mRealm.close();
-        mRefreshDataSubscription.unsubscribe();
-    }
-
-
-    @OnClick(R.id.fab)
-    void startLocalPluginInstallActivity() {
-        Intent intent = new Intent(getActivity(), LocalPluginInstallActivity.class);
-        startActivity(intent);
-    }
-
-
-    private void showData(List<LocalPluginBean> list) {
-        if (list == null || list.isEmpty()) {
-            noneItemBackground.setVisibility(View.VISIBLE);
-        } else {
-            noneItemBackground.setVisibility(View.GONE);
-        }
-        mLocalPluginAdapter.setData(list);
-    }
-}
+package org.qpython.qpy.plugin.fragment;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.LinearLayout;
+
+import org.qpython.qpy.R;
+
+import org.qpython.qpy.plugin.LocalPluginManager;
+import org.qpython.qpy.plugin.activity.LocalPluginInstallActivity;
+import org.qpython.qpy.plugin.adapter.LocalPluginAdapter;
+import org.qpython.qpy.plugin.model.LocalPluginBean;
+
+import java.util.List;
+
+import io.realm.Realm;
+import rx.Subscription;
+
+public class LocalPluginFragment extends Fragment {
+    RecyclerView mRvPlugin;
+    LinearLayout noneItemBackground;
+    private LocalPluginAdapter mLocalPluginAdapter;
+    private Realm              mRealm;
+    private Subscription       mRefreshDataSubscription;
+
+    public static LocalPluginFragment newInstance() {
+        return new LocalPluginFragment();
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        View v = inflater.inflate(R.layout.fragment_plugin_local, container, false);
+        mRvPlugin = (RecyclerView) v.findViewById(R.id.rv_plugin);
+        noneItemBackground = (LinearLayout) v.findViewById(R.id.none_item_bg);
+        mRealm = Realm.getDefaultInstance();
+
+        v.findViewById(R.id.fab).setOnClickListener(v1 -> {
+            Intent intent = new Intent(getActivity(), LocalPluginInstallActivity.class);
+            startActivity(intent);
+        });
+        return v;
+    }
+
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        mLocalPluginAdapter = new LocalPluginAdapter(getContext());
+        mRvPlugin.setLayoutManager(new LinearLayoutManager(getContext()));
+        mRvPlugin.setAdapter(mLocalPluginAdapter);
+        mRefreshDataSubscription = LocalPluginManager.queryAll(mRealm).asObservable()
+                .subscribe(this::showData);
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        mRealm.close();
+        mRefreshDataSubscription.unsubscribe();
+    }
+
+    private void showData(List<LocalPluginBean> list) {
+        if (list == null || list.isEmpty()) {
+            noneItemBackground.setVisibility(View.VISIBLE);
+        } else {
+            noneItemBackground.setVisibility(View.GONE);
+        }
+        mLocalPluginAdapter.setData(list);
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/plugin/model/CloudPluginBean.java b/qpython/src/main/java/org/qpython/qpy/plugin/model/CloudPluginBean.java
index 2733a890..15e7bac1 100644
--- a/qpython/src/main/java/org/qpython/qpy/plugin/model/CloudPluginBean.java
+++ b/qpython/src/main/java/org/qpython/qpy/plugin/model/CloudPluginBean.java
@@ -1,131 +1,131 @@
-package org.qpython.qpy.plugin.model;
-
-import com.quseit.common.updater.updatepkg.UpdatePackage;
-import org.qpython.qpy.plugin.CloudPluginManager;
-
-import java.io.File;
-
-import io.realm.RealmObject;
-import io.realm.annotations.Ignore;
-import io.realm.annotations.PrimaryKey;
-
-public class CloudPluginBean extends RealmObject implements UpdatePackage {
-    @PrimaryKey
-    private String name;
-
-    private String title;
-
-    private String src;
-
-    private int versionCode;
-
-    private String versionDescription;
-
-    private String description;
-
-    private String path;
-
-    @Ignore
-    private String url;
-
-    public CloudPluginBean() {
-
-    }
-
-    public CloudPluginBean(String name, String title, String src, int versionCode,
-                           String versionDescription, String description, String path, String url) {
-        this.name = name;
-        this.title = title;
-        this.src = src;
-        this.versionCode = versionCode;
-        this.versionDescription = versionDescription;
-        this.path = path;
-        this.url = url;
-        this.description = description;
-    }
-
-    @Override
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public String getSrc() {
-        return src;
-    }
-
-    public void setSrc(String src) {
-        this.src = src;
-    }
-
-    public int getVersionCode() {
-        return versionCode;
-    }
-
-    public void setVersionCode(int versionCode) {
-        this.versionCode = versionCode;
-    }
-
-    public void setVersionDescription(String versionDescription) {
-        this.versionDescription = versionDescription;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public String getPath() {
-        return path;
-    }
-
-    public void setPath(String path) {
-        this.path = path;
-    }
-
-    public String getUrl() {
-        return url;
-    }
-
-    public void setUrl(String url) {
-        this.url = url;
-    }
-
-    @Override
-    public String getVersion() {
-        return String.valueOf(versionCode);
-    }
-
-    public String getVersionDescription() {
-        return versionDescription;
-    }
-
-    @Override
-    public String getDownloadUrl() {
-        return url;
-    }
-
-    @Override
-    public boolean checkVersion() {
-        return CloudPluginManager.checkUpdate(this);
-    }
-
-    @Override
-    public void install(File file) {
-        CloudPluginManager.install(this, file, false);
-    }
-}
+package org.qpython.qpy.plugin.model;
+
+import com.quseit.common.updater.updatepkg.UpdatePackage;
+import org.qpython.qpy.plugin.CloudPluginManager;
+
+import java.io.File;
+
+import io.realm.RealmObject;
+import io.realm.annotations.Ignore;
+import io.realm.annotations.PrimaryKey;
+
+public class CloudPluginBean extends RealmObject implements UpdatePackage {
+    @PrimaryKey
+    private String name;
+
+    private String title;
+
+    private String src;
+
+    private int versionCode;
+
+    private String versionDescription;
+
+    private String description;
+
+    private String path;
+
+    @Ignore
+    private String url;
+
+    public CloudPluginBean() {
+
+    }
+
+    public CloudPluginBean(String name, String title, String src, int versionCode,
+                           String versionDescription, String description, String path, String url) {
+        this.name = name;
+        this.title = title;
+        this.src = src;
+        this.versionCode = versionCode;
+        this.versionDescription = versionDescription;
+        this.path = path;
+        this.url = url;
+        this.description = description;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getSrc() {
+        return src;
+    }
+
+    public void setSrc(String src) {
+        this.src = src;
+    }
+
+    public int getVersionCode() {
+        return versionCode;
+    }
+
+    public void setVersionCode(int versionCode) {
+        this.versionCode = versionCode;
+    }
+
+    public void setVersionDescription(String versionDescription) {
+        this.versionDescription = versionDescription;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public String getPath() {
+        return path;
+    }
+
+    public void setPath(String path) {
+        this.path = path;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    @Override
+    public String getVersion() {
+        return String.valueOf(versionCode);
+    }
+
+    public String getVersionDescription() {
+        return versionDescription;
+    }
+
+    @Override
+    public String getDownloadUrl() {
+        return url;
+    }
+
+    @Override
+    public boolean checkVersion() {
+        return CloudPluginManager.checkUpdate(this);
+    }
+
+    @Override
+    public void install(File file) {
+        CloudPluginManager.install(this, file, false);
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/plugin/model/LocalPluginBean.java b/qpython/src/main/java/org/qpython/qpy/plugin/model/LocalPluginBean.java
index 4a5b82da..e00b4f21 100644
--- a/qpython/src/main/java/org/qpython/qpy/plugin/model/LocalPluginBean.java
+++ b/qpython/src/main/java/org/qpython/qpy/plugin/model/LocalPluginBean.java
@@ -1,47 +1,47 @@
-package org.qpython.qpy.plugin.model;
-
-import io.realm.RealmObject;
-import io.realm.annotations.PrimaryKey;
-
-public class LocalPluginBean extends RealmObject {
-
-    @PrimaryKey
-    private String name;
-
-    private String title;
-
-    private String src;
-
-    public LocalPluginBean() {
-    }
-
-    public LocalPluginBean(String name, String title, String src) {
-        this.name = name;
-        this.title = title;
-        this.src = src;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public String getSrc() {
-        return src;
-    }
-
-    public void setSrc(String src) {
-        this.src = src;
-    }
-}
+package org.qpython.qpy.plugin.model;
+
+import io.realm.RealmObject;
+import io.realm.annotations.PrimaryKey;
+
+public class LocalPluginBean extends RealmObject {
+
+    @PrimaryKey
+    private String name;
+
+    private String title;
+
+    private String src;
+
+    public LocalPluginBean() {
+    }
+
+    public LocalPluginBean(String name, String title, String src) {
+        this.name = name;
+        this.title = title;
+        this.src = src;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getSrc() {
+        return src;
+    }
+
+    public void setSrc(String src) {
+        this.src = src;
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/plugin/view/FileSelectView.java b/qpython/src/main/java/org/qpython/qpy/plugin/view/FileSelectView.java
index a1cc3b56..a9c60780 100644
--- a/qpython/src/main/java/org/qpython/qpy/plugin/view/FileSelectView.java
+++ b/qpython/src/main/java/org/qpython/qpy/plugin/view/FileSelectView.java
@@ -1,203 +1,203 @@
-package org.qpython.qpy.plugin.view;
-
-import android.content.Context;
-import android.os.Environment;
-import android.view.View;
-import android.widget.AdapterView;
-import android.widget.ListView;
-import android.widget.SimpleAdapter;
-import android.widget.Toast;
-
-import org.qpython.qpy.R;
-
-
-import java.io.File;
-import java.util.ArrayDeque;
-import java.util.ArrayList;
-import java.util.Deque;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class FileSelectView extends ListView implements AdapterView.OnItemClickListener {
-
-    public final static String TAG = "FileSelectView";
-    public static final String ON_ERROR_MSG = "No rights to access!";
-
-    private static final String sRoot = Environment.getExternalStorageDirectory().getAbsolutePath();
-    public static final String PARENT_DIR = "..";
-    public static final String FOLDER = ".";
-    public static final String EMPTY = "";
-
-    private Deque<Integer> mTopStack = new ArrayDeque<>();
-    private Deque<Integer> mPositionStack = new ArrayDeque<>();
-    private Callback mCallback = null;
-    private String mPath = sRoot;
-    private List<Map<String, Object>> list = null;
-    private Map<String, Integer> mIconMap = null;
-
-
-    // 参数说明
-    // context:上下文
-    // mCallback:一个传递Bundle参数的回调接口
-    // iconMap:用来根据后缀显示的图标资源ID。
-    //  根目录图标的索引为sRoot;
-    //  父目录的索引为sParent;
-    //  文件夹的索引为sFolder;
-    //  默认图标的索引为sEmpty;
-    //  其他的直接根据后缀进行索引，比如.wav文件图标的索引为"wav"
-    public FileSelectView(Context context, Callback callback, Map<String, Integer> iconMap) {
-        super(context);
-
-        mIconMap = new HashMap<>();
-        for (Map.Entry<String, Integer> entry : iconMap.entrySet()) {
-            mIconMap.put(entry.getKey().toLowerCase(), entry.getValue());
-        }
-
-        mCallback = callback;
-        setOnItemClickListener(this);
-        refreshFileList();
-    }
-
-    public void setPath(String mPath) {
-        this.mPath = mPath;
-        refreshFileList();
-    }
-
-    private String getSuffix(String filename) {
-        int dix = filename.lastIndexOf('.');
-        if (dix < 0) {
-            return "";
-        } else {
-            return filename.substring(dix + 1);
-        }
-    }
-
-    private int getImageId(String s) {
-        if (mIconMap == null) {
-            return 0;
-        } else if (mIconMap.containsKey(s)) {
-            return mIconMap.get(s);
-        } else if (mIconMap.containsKey(EMPTY)) {
-            return mIconMap.get(EMPTY);
-        } else {
-            return 0;
-        }
-    }
-
-    public int refreshFileList() {
-        // 刷新文件列表
-        File[] files = null;
-        try {
-            files = new File(mPath).listFiles();
-        } catch (Exception e) {
-            files = null;
-        }
-        if (files == null) {
-            // 访问出错
-            Toast.makeText(getContext(), ON_ERROR_MSG, Toast.LENGTH_SHORT).show();
-            return -1;
-        }
-        if (list != null) {
-            list.clear();
-        } else {
-            list = new ArrayList<>(files.length);
-        }
-        // 用来先保存文件夹和文件夹的两个列表
-        ArrayList<Map<String, Object>> folderList = new ArrayList<>();
-        ArrayList<Map<String, Object>> fileList = new ArrayList<>();
-
-        // 顶级目录不显示上一级
-        if (!this.mPath.equals(sRoot)) {
-            Map<String, Object> map = new HashMap<>();
-            map.put("name", PARENT_DIR);
-            map.put("mPath", mPath);
-            map.put("img", getImageId(PARENT_DIR));
-            list.add(map);
-        }
-
-        for (File file : files) {
-            // 空文件夹不显示
-            if (file.isDirectory() && !(file.listFiles().length == 0)) {
-                // 添加有目录或含有指定文件类型的文件夹
-                for (File subFile : file.listFiles()) {
-                    if (subFile.isDirectory() || mIconMap.containsKey(getSuffix(subFile.getName()))) {
-                        Map<String, Object> map = new HashMap<>();
-                        map.put("name", file.getName());
-                        map.put("mPath", file.getPath());
-                        map.put("img", getImageId(FOLDER));
-                        folderList.add(map);
-                        break;
-                    }
-                }
-            } else if (file.isFile()) {
-                // 添加文件
-                String sf = getSuffix(file.getName()).toLowerCase();
-                if (mIconMap.containsKey(sf.toLowerCase())) {
-                    Map<String, Object> map = new HashMap<>();
-                    map.put("name", file.getName());
-                    map.put("mPath", file.getPath());
-                    map.put("img", getImageId(sf));
-                    fileList.add(map);
-                }
-            }
-        }
-
-        //移除根目录
-        list.addAll(folderList); // 先添加文件夹，确保文件夹显示在上面
-        list.addAll(fileList);    //再添加文件
-
-        SimpleAdapter adapter = new SimpleAdapter(getContext(), list, R.layout.list_file_item,
-                new String[]{"img", "name", "mPath"},
-                new int[]{R.id.file_dialog_item_img, R.id.file_dialog_item_name, R.id.file_dialog_item_path});
-        this.setAdapter(adapter);
-        return files.length;
-    }
-
-    @Override
-    public void onItemClick(AdapterView<?> parent, View v, int position, long id) {
-        int lastPosition = 0;
-        int lastTop = 0;
-
-        // 条目选择  ?
-        String pt = (String) list.get(position).get("mPath");
-        String fn = (String) list.get(position).get("name");
-        if (fn.equals(sRoot) || fn.equals(PARENT_DIR)) {
-            // 如果是更目录或者上一层
-            File fl = new File(pt);
-            String ppt = fl.getParent();
-            if (ppt != null) {
-                // 返回上一层
-                mPath = ppt;
-                if (!mPositionStack.isEmpty() && !mTopStack.isEmpty()) {
-                    lastPosition = mPositionStack.pop();
-                    lastTop = mTopStack.pop();
-                }
-            } else {
-                // 返回根目录
-                mPath = sRoot;
-                mPositionStack.clear();
-                mTopStack.clear();
-            }
-        } else {
-            File fl = new File(pt);
-            if (fl.isFile()) {
-                mCallback.onSelect(fl);
-                return;
-            } else if (fl.isDirectory()) {
-                // 如果是文件夹
-                // 那么进入选中的文件夹
-                mPath = pt;
-                mPositionStack.push(position);
-                mTopStack.push(v.getTop());
-            }
-        }
-
-        refreshFileList();
-        setSelectionFromTop(lastPosition, lastTop);
-    }
-
-    public interface Callback {
-        void onSelect(File file);
-    }
-}
+package org.qpython.qpy.plugin.view;
+
+import android.content.Context;
+import android.os.Environment;
+import android.view.View;
+import android.widget.AdapterView;
+import android.widget.ListView;
+import android.widget.SimpleAdapter;
+import android.widget.Toast;
+
+import org.qpython.qpy.R;
+
+
+import java.io.File;
+import java.util.ArrayDeque;
+import java.util.ArrayList;
+import java.util.Deque;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class FileSelectView extends ListView implements AdapterView.OnItemClickListener {
+
+    public final static String TAG = "FileSelectView";
+    public static final String ON_ERROR_MSG = "No rights to access!";
+
+    private static final String sRoot = Environment.getExternalStorageDirectory().getAbsolutePath();
+    public static final String PARENT_DIR = "..";
+    public static final String FOLDER = ".";
+    public static final String EMPTY = "";
+
+    private Deque<Integer> mTopStack = new ArrayDeque<>();
+    private Deque<Integer> mPositionStack = new ArrayDeque<>();
+    private Callback mCallback = null;
+    private String mPath = sRoot;
+    private List<Map<String, Object>> list = null;
+    private Map<String, Integer> mIconMap = null;
+
+
+    // 参数说明
+    // context:上下文
+    // mCallback:一个传递Bundle参数的回调接口
+    // iconMap:用来根据后缀显示的图标资源ID。
+    //  根目录图标的索引为sRoot;
+    //  父目录的索引为sParent;
+    //  文件夹的索引为sFolder;
+    //  默认图标的索引为sEmpty;
+    //  其他的直接根据后缀进行索引，比如.wav文件图标的索引为"wav"
+    public FileSelectView(Context context, Callback callback, Map<String, Integer> iconMap) {
+        super(context);
+
+        mIconMap = new HashMap<>();
+        for (Map.Entry<String, Integer> entry : iconMap.entrySet()) {
+            mIconMap.put(entry.getKey().toLowerCase(), entry.getValue());
+        }
+
+        mCallback = callback;
+        setOnItemClickListener(this);
+        refreshFileList();
+    }
+
+    public void setPath(String mPath) {
+        this.mPath = mPath;
+        refreshFileList();
+    }
+
+    private String getSuffix(String filename) {
+        int dix = filename.lastIndexOf('.');
+        if (dix < 0) {
+            return "";
+        } else {
+            return filename.substring(dix + 1);
+        }
+    }
+
+    private int getImageId(String s) {
+        if (mIconMap == null) {
+            return 0;
+        } else if (mIconMap.containsKey(s)) {
+            return mIconMap.get(s);
+        } else if (mIconMap.containsKey(EMPTY)) {
+            return mIconMap.get(EMPTY);
+        } else {
+            return 0;
+        }
+    }
+
+    public int refreshFileList() {
+        // 刷新文件列表
+        File[] files = null;
+        try {
+            files = new File(mPath).listFiles();
+        } catch (Exception e) {
+            files = null;
+        }
+        if (files == null) {
+            // 访问出错
+            Toast.makeText(getContext(), ON_ERROR_MSG, Toast.LENGTH_SHORT).show();
+            return -1;
+        }
+        if (list != null) {
+            list.clear();
+        } else {
+            list = new ArrayList<>(files.length);
+        }
+        // 用来先保存文件夹和文件夹的两个列表
+        ArrayList<Map<String, Object>> folderList = new ArrayList<>();
+        ArrayList<Map<String, Object>> fileList = new ArrayList<>();
+
+        // 顶级目录不显示上一级
+        if (!this.mPath.equals(sRoot)) {
+            Map<String, Object> map = new HashMap<>();
+            map.put("name", PARENT_DIR);
+            map.put("mPath", mPath);
+            map.put("img", getImageId(PARENT_DIR));
+            list.add(map);
+        }
+
+        for (File file : files) {
+            // 空文件夹不显示
+            if (file.isDirectory() && !(file.listFiles().length == 0)) {
+                // 添加有目录或含有指定文件类型的文件夹
+                for (File subFile : file.listFiles()) {
+                    if (subFile.isDirectory() || mIconMap.containsKey(getSuffix(subFile.getName()))) {
+                        Map<String, Object> map = new HashMap<>();
+                        map.put("name", file.getName());
+                        map.put("mPath", file.getPath());
+                        map.put("img", getImageId(FOLDER));
+                        folderList.add(map);
+                        break;
+                    }
+                }
+            } else if (file.isFile()) {
+                // 添加文件
+                String sf = getSuffix(file.getName()).toLowerCase();
+                if (mIconMap.containsKey(sf.toLowerCase())) {
+                    Map<String, Object> map = new HashMap<>();
+                    map.put("name", file.getName());
+                    map.put("mPath", file.getPath());
+                    map.put("img", getImageId(sf));
+                    fileList.add(map);
+                }
+            }
+        }
+
+        //移除根目录
+        list.addAll(folderList); // 先添加文件夹，确保文件夹显示在上面
+        list.addAll(fileList);    //再添加文件
+
+        SimpleAdapter adapter = new SimpleAdapter(getContext(), list, R.layout.list_file_item,
+                new String[]{"img", "name", "mPath"},
+                new int[]{R.id.file_dialog_item_img, R.id.file_dialog_item_name, R.id.file_dialog_item_path});
+        this.setAdapter(adapter);
+        return files.length;
+    }
+
+    @Override
+    public void onItemClick(AdapterView<?> parent, View v, int position, long id) {
+        int lastPosition = 0;
+        int lastTop = 0;
+
+        // 条目选择  ?
+        String pt = (String) list.get(position).get("mPath");
+        String fn = (String) list.get(position).get("name");
+        if (fn.equals(sRoot) || fn.equals(PARENT_DIR)) {
+            // 如果是更目录或者上一层
+            File fl = new File(pt);
+            String ppt = fl.getParent();
+            if (ppt != null) {
+                // 返回上一层
+                mPath = ppt;
+                if (!mPositionStack.isEmpty() && !mTopStack.isEmpty()) {
+                    lastPosition = mPositionStack.pop();
+                    lastTop = mTopStack.pop();
+                }
+            } else {
+                // 返回根目录
+                mPath = sRoot;
+                mPositionStack.clear();
+                mTopStack.clear();
+            }
+        } else {
+            File fl = new File(pt);
+            if (fl.isFile()) {
+                mCallback.onSelect(fl);
+                return;
+            } else if (fl.isDirectory()) {
+                // 如果是文件夹
+                // 那么进入选中的文件夹
+                mPath = pt;
+                mPositionStack.push(position);
+                mTopStack.push(v.getTop());
+            }
+        }
+
+        refreshFileList();
+        setSelectionFromTop(lastPosition, lastTop);
+    }
+
+    public interface Callback {
+        void onSelect(File file);
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/program/BindingHolder.java b/qpython/src/main/java/org/qpython/qpy/program/BindingHolder.java
index ebda807e..7f9e7761 100644
--- a/qpython/src/main/java/org/qpython/qpy/program/BindingHolder.java
+++ b/qpython/src/main/java/org/qpython/qpy/program/BindingHolder.java
@@ -1,14 +1,14 @@
-package org.qpython.qpy.program;
-
-
-import android.databinding.ViewDataBinding;
-import android.support.v7.widget.RecyclerView;
-
-public class BindingHolder<T extends ViewDataBinding> extends RecyclerView.ViewHolder {
-    public final T binding;
-
-    public BindingHolder(T binding) {
-        super(binding.getRoot());
-        this.binding = binding;
-    }
-}
+package org.qpython.qpy.program;
+
+
+import android.databinding.ViewDataBinding;
+import android.support.v7.widget.RecyclerView;
+
+public class BindingHolder<T extends ViewDataBinding> extends RecyclerView.ViewHolder {
+    public final T binding;
+
+    public BindingHolder(T binding) {
+        super(binding.getRoot());
+        this.binding = binding;
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/program/ItemMenuLayout.java b/qpython/src/main/java/org/qpython/qpy/program/ItemMenuLayout.java
index 52dd6c41..aa3f4f0f 100644
--- a/qpython/src/main/java/org/qpython/qpy/program/ItemMenuLayout.java
+++ b/qpython/src/main/java/org/qpython/qpy/program/ItemMenuLayout.java
@@ -1,130 +1,130 @@
-package org.qpython.qpy.program;
-
-import android.content.Context;
-import android.util.AttributeSet;
-import android.view.Gravity;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.animation.Animation;
-import android.view.animation.TranslateAnimation;
-import android.widget.FrameLayout;
-
-public class ItemMenuLayout extends FrameLayout {
-    private static final String TAG = "ItemMenuLayout";
-
-    private static ItemMenuLayout sOpenMenuView = null;
-    private View mMenu;
-    private OnClickListener mListener;
-    private int mDuration = 300;
-
-    public ItemMenuLayout(Context context) {
-        super(context);
-    }
-
-    public ItemMenuLayout(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    public ItemMenuLayout(Context context, AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-    }
-
-    @Override
-    protected void onFinishInflate() {
-        super.onFinishInflate();
-
-        if (getChildCount() != 2) {
-            throw new IllegalStateException("Must be have two child view");
-        }
-
-        mMenu = getChildAt(1);
-        LayoutParams params = (LayoutParams) mMenu.getLayoutParams();
-        params.gravity = Gravity.RIGHT;
-        mMenu.setLayoutParams(params);
-
-        super.setOnClickListener(new OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                if (mListener != null) {
-                    mListener.onClick(v);
-                } else {
-                    if (!isMenuVisible()) {
-                        showMenu();
-                    }
-                }
-            }
-        });
-    }
-
-    @Override
-    protected void onAttachedToWindow() {
-        super.onAttachedToWindow();
-        mMenu.setVisibility(GONE);
-    }
-
-    @Override
-    public boolean onInterceptTouchEvent(MotionEvent ev) {
-        if (MotionEvent.ACTION_UP == ev.getAction()) {
-            if (sOpenMenuView != null) {
-                sOpenMenuView.hideMenu();
-            }
-        }
-
-        return super.onInterceptTouchEvent(ev);
-    }
-
-    @Override
-    public boolean onTouchEvent(MotionEvent event) {
-        if (sOpenMenuView != null) {
-            sOpenMenuView.hideMenu();
-            ;
-        }
-        return super.onTouchEvent(event);
-    }
-
-    @Override
-    public void setOnClickListener(OnClickListener l) {
-        mListener = l;
-    }
-
-    private boolean isMenuVisible() {
-        return mMenu.getVisibility() == View.VISIBLE;
-    }
-
-    private void showMenu() {
-        sOpenMenuView = this;
-        mMenu.setVisibility(VISIBLE);
-        Animation anim = new TranslateAnimation(Animation.RELATIVE_TO_SELF, 1.0f,
-                Animation.RELATIVE_TO_SELF, 0,
-                Animation.RELATIVE_TO_SELF, 0,
-                Animation.RELATIVE_TO_SELF, 0);
-        anim.setDuration(mDuration);
-        mMenu.startAnimation(anim);
-    }
-
-    private void hideMenu() {
-        sOpenMenuView = null;
-        Animation anim = new TranslateAnimation(Animation.RELATIVE_TO_SELF, 0,
-                Animation.RELATIVE_TO_SELF, 1.0f,
-                Animation.RELATIVE_TO_SELF, 0,
-                Animation.RELATIVE_TO_SELF, 0);
-        anim.setDuration(mDuration);
-        anim.setAnimationListener(new Animation.AnimationListener() {
-            @Override
-            public void onAnimationStart(Animation animation) {
-
-            }
-
-            @Override
-            public void onAnimationEnd(Animation animation) {
-                mMenu.setVisibility(GONE);
-            }
-
-            @Override
-            public void onAnimationRepeat(Animation animation) {
-
-            }
-        });
-        mMenu.startAnimation(anim);
-    }
-}
+package org.qpython.qpy.program;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.Gravity;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.animation.Animation;
+import android.view.animation.TranslateAnimation;
+import android.widget.FrameLayout;
+
+public class ItemMenuLayout extends FrameLayout {
+    private static final String TAG = "ItemMenuLayout";
+
+    private static ItemMenuLayout sOpenMenuView = null;
+    private View mMenu;
+    private OnClickListener mListener;
+    private int mDuration = 300;
+
+    public ItemMenuLayout(Context context) {
+        super(context);
+    }
+
+    public ItemMenuLayout(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public ItemMenuLayout(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    @Override
+    protected void onFinishInflate() {
+        super.onFinishInflate();
+
+        if (getChildCount() != 2) {
+            throw new IllegalStateException("Must be have two child view");
+        }
+
+        mMenu = getChildAt(1);
+        LayoutParams params = (LayoutParams) mMenu.getLayoutParams();
+        params.gravity = Gravity.RIGHT;
+        mMenu.setLayoutParams(params);
+
+        super.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (mListener != null) {
+                    mListener.onClick(v);
+                } else {
+                    if (!isMenuVisible()) {
+                        showMenu();
+                    }
+                }
+            }
+        });
+    }
+
+    @Override
+    protected void onAttachedToWindow() {
+        super.onAttachedToWindow();
+        mMenu.setVisibility(GONE);
+    }
+
+    @Override
+    public boolean onInterceptTouchEvent(MotionEvent ev) {
+        if (MotionEvent.ACTION_UP == ev.getAction()) {
+            if (sOpenMenuView != null) {
+                sOpenMenuView.hideMenu();
+            }
+        }
+
+        return super.onInterceptTouchEvent(ev);
+    }
+
+    @Override
+    public boolean onTouchEvent(MotionEvent event) {
+        if (sOpenMenuView != null) {
+            sOpenMenuView.hideMenu();
+            ;
+        }
+        return super.onTouchEvent(event);
+    }
+
+    @Override
+    public void setOnClickListener(OnClickListener l) {
+        mListener = l;
+    }
+
+    private boolean isMenuVisible() {
+        return mMenu.getVisibility() == View.VISIBLE;
+    }
+
+    private void showMenu() {
+        sOpenMenuView = this;
+        mMenu.setVisibility(VISIBLE);
+        Animation anim = new TranslateAnimation(Animation.RELATIVE_TO_SELF, 1.0f,
+                Animation.RELATIVE_TO_SELF, 0,
+                Animation.RELATIVE_TO_SELF, 0,
+                Animation.RELATIVE_TO_SELF, 0);
+        anim.setDuration(mDuration);
+        mMenu.startAnimation(anim);
+    }
+
+    private void hideMenu() {
+        sOpenMenuView = null;
+        Animation anim = new TranslateAnimation(Animation.RELATIVE_TO_SELF, 0,
+                Animation.RELATIVE_TO_SELF, 1.0f,
+                Animation.RELATIVE_TO_SELF, 0,
+                Animation.RELATIVE_TO_SELF, 0);
+        anim.setDuration(mDuration);
+        anim.setAnimationListener(new Animation.AnimationListener() {
+            @Override
+            public void onAnimationStart(Animation animation) {
+
+            }
+
+            @Override
+            public void onAnimationEnd(Animation animation) {
+                mMenu.setVisibility(GONE);
+            }
+
+            @Override
+            public void onAnimationRepeat(Animation animation) {
+
+            }
+        });
+        mMenu.startAnimation(anim);
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/program/ProgramUtils.java b/qpython/src/main/java/org/qpython/qpy/program/ProgramUtils.java
deleted file mode 100644
index 856b6ad0..00000000
--- a/qpython/src/main/java/org/qpython/qpy/program/ProgramUtils.java
+++ /dev/null
@@ -1,89 +0,0 @@
-package org.qpython.qpy.program;
-
-import org.qpython.qpy.R;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-
-public class ProgramUtils {
-    public static int scriptType(String path, boolean p) {
-        String content;
-        if (p) {
-            content = getFileContents(path + "/main.py", 64);
-        } else {
-            content = getFileContents(path, 64);
-        }
-        boolean isQApp = content.contains("#qpy:qpyapp");
-        boolean isCons = (!content.contains("#qpy:kivy") && !isQApp);
-        boolean isWeb = content.contains("#qpy:webapp");
-        boolean isKivy = content.contains("#qpy:kivy");
-
-        if (isWeb) {
-            return p ? R.drawable.ic_project_webapp : R.drawable.ic_script_webapp;
-        } else if (isCons) {
-            return p ? R.drawable.ic_project_console : R.drawable.ic_script_console;
-        } else if (isQApp) {
-            return p ? R.drawable.ic_project_qscript : R.drawable.ic_script_qscript;
-        } else if (isKivy) {
-            return p ? R.drawable.ic_project_kivyapp : R.drawable.ic_script_kivyapp;
-        } else {
-            return p ? R.drawable.ic_project_console : R.drawable.ic_script_console;
-        }
-    }
-
-    private static String getFileContents(String path, int pos) {
-
-        File scriptFile = new File(path);
-        String tContent = "";
-        if (scriptFile.exists()) {
-            BufferedReader in;
-            try {
-                in = new BufferedReader(new FileReader(scriptFile));
-                String line;
-
-                while ((line = in.readLine()) != null) {
-                    tContent += line + "\n";
-                    if (tContent.length() >= pos) {
-                        in.close();
-                        return tContent;
-                    }
-                }
-                in.close();
-            } catch (FileNotFoundException e) {
-                // TODO Auto-generated catch block
-                e.printStackTrace();
-            } catch (IOException e) {
-                // TODO Auto-generated catch block
-                e.printStackTrace();
-            }
-        }
-        return tContent;
-    }
-
-    public static String getFileTxt(File file) {
-        BufferedReader reader = null;
-        try {
-            reader = new BufferedReader(new InputStreamReader(new FileInputStream(file)));
-            StringBuilder sb = new StringBuilder();
-            String line;
-            while ((line = reader.readLine()) != null) {
-                sb.append(line+"\n");
-            }
-            return sb.toString();
-        } catch (Exception e) {
-            e.printStackTrace();
-        } finally {
-            try {
-                reader.close();
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
-        return null;
-    }
-}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/AndroidCompat.java b/qpython/src/main/java/org/qpython/qpy/texteditor/AndroidCompat.java
new file mode 100644
index 00000000..e7fec546
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/AndroidCompat.java
@@ -0,0 +1,38 @@
+package org.qpython.qpy.texteditor;
+
+/**
+ * The classes in this package take advantage of the fact that the VM does
+ * not attempt to load a class until it's accessed, and the verifier
+ * does not run until a class is loaded.  By keeping the methods which
+ * are unavailable on older platforms in subclasses which are only ever
+ * accessed on platforms where they are available, we can preserve
+ * compatibility with older platforms without resorting to reflection.
+ *
+ * See http://developer.android.com/resources/articles/backward-compatibility.html
+ * and http://android-developers.blogspot.com/2010/07/how-to-have-your-cupcake-and-eat-it-too.html
+ * for further discussion of this technique.
+ */
+
+public class AndroidCompat {
+    public final static int SDK = getSDK();
+
+    private final static int getSDK() {
+        int result;
+        try {
+            result = AndroidLevel4PlusCompat.getSDKInt();
+        } catch (VerifyError e) {
+            try {
+                result = Integer.valueOf(android.os.Build.VERSION.SDK);
+            } catch (NumberFormatException e2) {
+                result = 1;
+            }
+        }
+        return result;
+    }
+}
+
+class AndroidLevel4PlusCompat {
+    static int getSDKInt() {
+        return android.os.Build.VERSION.SDK_INT;
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/ApplicationAdapter.java b/qpython/src/main/java/org/qpython/qpy/texteditor/ApplicationAdapter.java
new file mode 100644
index 00000000..edc792f4
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/ApplicationAdapter.java
@@ -0,0 +1,73 @@
+package org.qpython.qpy.texteditor;
+
+import java.util.List;
+
+import android.content.Context;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import org.qpython.qpy.R;
+
+// http://javatechig.com/android/how-to-get-list-of-installed-apps-in-android 
+
+public class ApplicationAdapter extends ArrayAdapter<ApplicationInfo> {
+    private List<ApplicationInfo> appsList = null;
+    private Context context;
+    private PackageManager packageManager;
+ 
+    /**
+     * @param context
+     * @param textViewResourceId
+     * @param appsList
+     */
+    public ApplicationAdapter(Context context, int textViewResourceId,
+            List<ApplicationInfo> appsList) {
+        super(context, textViewResourceId, appsList);
+        this.context = context;
+        this.appsList = appsList;
+        packageManager = context.getPackageManager();
+    }
+ 
+    @Override
+    public int getCount() {
+        return ((null != appsList) ? appsList.size() : 0);
+    }
+ 
+    @Override
+    public ApplicationInfo getItem(int position) {
+        return ((null != appsList) ? appsList.get(position) : null);
+    }
+ 
+    @Override
+    public long getItemId(int position) {
+        return position;
+    }
+ 
+    @Override
+    public View getView(int position, View convertView, ViewGroup parent) {
+        View view = convertView;
+        if (null == view) {
+            LayoutInflater layoutInflater = (LayoutInflater) context
+                    .getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+            view = layoutInflater.inflate(R.layout.snippet_list_row, null);
+        }
+ 
+        ApplicationInfo data = appsList.get(position);
+        if (null != data) {
+            TextView appName = (TextView) view.findViewById(R.id.app_name);
+            TextView packageName = (TextView) view.findViewById(R.id.app_paackage);
+            ImageView iconview = (ImageView) view.findViewById(R.id.app_icon);
+ 
+            appName.setText(data.loadLabel(packageManager));
+            packageName.setText(data.packageName);
+            iconview.setImageDrawable(data.loadIcon(packageManager));
+        }
+        return view;
+    }
+};
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/BaseActivity.java b/qpython/src/main/java/org/qpython/qpy/texteditor/BaseActivity.java
new file mode 100644
index 00000000..26c2728a
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/BaseActivity.java
@@ -0,0 +1,45 @@
+package org.qpython.qpy.texteditor;
+
+import android.content.res.Configuration;
+import android.view.View;
+import com.quseit.base.QBaseActivity;
+import com.quseit.util.NAction;
+import com.quseit.util.NUtil;
+
+import org.qpython.qpysdk.QPyConstants;
+
+public class BaseActivity extends QBaseActivity {
+    protected static final int SCRIPT_EXEC_PY = 2235;  
+    protected static final int SCRIPT_EXEC_CODE = 1235;
+    private static final int SCRIPT_CONSOLE_CODE = 1237;
+
+    @Override
+    protected void onDestroy() {
+    	super.onDestroy();
+    }
+
+    @Override
+	public void onConfigurationChanged(Configuration newConfig) {
+    	super.onConfigurationChanged(newConfig);
+    }
+
+	@Override
+	public Class<?> getUpdateSrv() {
+		return null;
+	}
+	
+
+	@Override
+	public String confGetUpdateURL(int flag) {
+		if (flag == 2) {
+			return QPyConstants.LOG_URL+this.getPackageName()+"/"+NUtil.getVersinoCode(this);
+		} else if (flag == 3) {
+			return QPyConstants.AD_URL+this.getPackageName()+"/"+NUtil.getVersinoCode(this)+"?"
+					+ NAction.getUserUrl(getApplicationContext());
+
+		} else {
+			return QPyConstants.UPDATE_URL+this.getPackageName()+"/"+NUtil.getVersinoCode(this);
+
+		}
+	}
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/Bean.java b/qpython/src/main/java/org/qpython/qpy/texteditor/Bean.java
new file mode 100644
index 00000000..82516919
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/Bean.java
@@ -0,0 +1,21 @@
+package org.qpython.qpy.texteditor;
+
+import android.content.Context;
+
+public class Bean{
+	protected String title;
+    protected Context context;
+    //private final String TAG = "BEAN";
+ 
+    public Bean(Context context) {
+    	this.context = context;
+    }
+
+    public String getTitle(){
+        return this.title;
+    }
+
+    public void setTitle(String title){
+        this.title = title;
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/EditorActivity.java b/qpython/src/main/java/org/qpython/qpy/texteditor/EditorActivity.java
new file mode 100644
index 00000000..db16f157
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/EditorActivity.java
@@ -0,0 +1,959 @@
+package org.qpython.qpy.texteditor;
+
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.content.res.Configuration;
+import android.database.Cursor;
+import android.databinding.DataBindingUtil;
+import android.graphics.Rect;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.Environment;
+import android.preference.PreferenceManager;
+import android.provider.MediaStore;
+import android.provider.OpenableColumns;
+import android.support.annotation.Nullable;
+import android.support.v4.widget.DrawerLayout;
+import android.support.v7.app.ActionBarDrawerToggle;
+import android.support.v7.app.AlertDialog;
+import android.support.v7.widget.LinearLayoutManager;
+import android.text.TextUtils;
+import android.util.DisplayMetrics;
+import android.util.Log;
+import android.view.Gravity;
+import android.view.KeyEvent;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewTreeObserver;
+import android.view.inputmethod.InputMethodManager;
+
+import com.quseit.util.FileHelper;
+import com.quseit.util.NAction;
+import com.quseit.util.NStorage;
+
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
+import org.qpython.qpy.R;
+import org.qpython.qpy.console.ScriptExec;
+import org.qpython.qpy.databinding.DrawerEditorBinding;
+import org.qpython.qpy.main.activity.BaseActivity;
+import org.qpython.qpy.main.activity.GistEditActivity;
+import org.qpython.qpy.main.adapter.EditorFileTreeAdapter;
+import org.qpython.qpy.texteditor.common.RecentFiles;
+import org.qpython.qpy.texteditor.common.Settings;
+import org.qpython.qpy.texteditor.common.TextFileUtils;
+import org.qpython.qpy.texteditor.ui.adapter.bean.PopupItemBean;
+import org.qpython.qpy.texteditor.ui.view.EditorPopUp;
+import org.qpython.qpy.texteditor.ui.view.EnterDialog;
+import org.qpython.qpy.texteditor.widget.crouton.Crouton;
+import org.qpython.qpy.texteditor.widget.crouton.Style;
+import org.qpython.qpysdk.QPyConstants;
+import org.qpython.qpysdk.utils.Utils;
+import org.swiftp.Util;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Stack;
+import java.util.concurrent.TimeUnit;
+
+import rx.Observable;
+import rx.android.schedulers.AndroidSchedulers;
+import rx.schedulers.Schedulers;
+
+import static com.quseit.util.FileHelper.LoadDataFromAssets;
+import static com.quseit.util.FileHelper.writeToFile;
+import static org.qpython.qpy.texteditor.TedFragment.LOGIN_REQUEST_CODE;
+import static org.qpython.qpy.texteditor.TedLocalActivity.REQUEST_OPEN;
+import static org.qpython.qpy.texteditor.TedLocalActivity.REQUEST_RECENT;
+import static org.qpython.qpy.texteditor.TedLocalActivity.REQUEST_SAVE_AS;
+import static org.qpython.qpy.texteditor.androidlib.data.FileUtils.deleteItem;
+import static org.qpython.qpy.texteditor.androidlib.data.FileUtils.getCanonizePath;
+import static org.qpython.qpy.texteditor.androidlib.data.FileUtils.renameItem;
+import static org.qpython.qpy.texteditor.common.Constants.ACTION_WIDGET_OPEN;
+import static org.qpython.qpy.texteditor.common.Constants.EXTRA_FORCE_READ_ONLY;
+
+public class EditorActivity extends BaseActivity implements ViewTreeObserver.OnGlobalLayoutListener {
+    private DrawerEditorBinding   binding;
+    private TedFragment           textFragment;
+    private EditorFileTreeAdapter fileTreeAdapter;
+    private final String TAG = "EditorActivity";
+
+    private static final int OPEN_REQUEST_CODE = 5233;
+
+    private static final String DEFAULT_ACTION = "empty";
+    private static final String TEXT_ACTION    = "text";
+    private static final String QR_CODE_ACTION = "qrcode";
+    private static final String FILE_ACTION    = "file";
+    private static final String PROJECT_ACTION = "project";
+
+    private static final String EXTRA_PROJECT_PATH = "project_path";
+    private static final String EXTRA_TEXT         = "EXTRA_TEXT";
+    public static final  String EXTRA_TITLE        = "EXTRA_TITLE";
+
+    protected String mCurrentFilePath;
+    protected String mCurrentFileName;
+
+    protected boolean mReadOnly;
+    protected boolean mDirty;
+    protected boolean isKeyboardVisible;
+
+    private boolean isDrawerShowing = false;
+    private String  projPath        = "";
+
+    private EditorPopUp editorPopUp;
+
+    private int height;
+
+    public static void start(Context context) {
+        Intent starter = new Intent(context, EditorActivity.class);
+        starter.setAction(DEFAULT_ACTION);
+        context.startActivity(starter);
+    }
+
+    public static void start(Context context, String text) {
+        Intent starter = new Intent(context, EditorActivity.class);
+        starter.putExtra(EXTRA_TEXT, text);
+        starter.setAction(TEXT_ACTION);
+        context.startActivity(starter);
+    }
+
+    public static void start(Context context, String text, String title) {
+        Intent starter = new Intent(context, EditorActivity.class);
+        starter.putExtra(EXTRA_TEXT, text);
+        starter.putExtra(EXTRA_TITLE, title);
+        starter.setAction(QR_CODE_ACTION);
+        context.startActivity(starter);
+    }
+
+    public static void start(Context context, Uri path) {
+        Intent starter = new Intent(context, EditorActivity.class);
+        starter.setAction(FILE_ACTION);
+        starter.setData(path);
+        context.startActivity(starter);
+    }
+
+    public static void start(String projectPath, Context context) {
+        Intent starter = new Intent(context, EditorActivity.class);
+        starter.putExtra(EXTRA_PROJECT_PATH, projectPath);
+        starter.setAction(PROJECT_ACTION);
+        context.startActivity(starter);
+    }
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        EventBus.getDefault().register(this);
+        binding = DataBindingUtil.setContentView(this, R.layout.drawer_editor);
+
+        DisplayMetrics displayMetrics = new DisplayMetrics();
+        getWindowManager().getDefaultDisplay().getMetrics(displayMetrics);
+        height = displayMetrics.heightPixels;
+
+        initView();
+        initListener();
+        updateSetting();
+        initFiles();
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        if (needLog && event != null) {
+            showLogDialog(event);
+            needLog = false;
+        }
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        EventBus.getDefault().unregister(this);
+    }
+
+    @Override
+    public void onConfigurationChanged(Configuration newConfig) {
+        super.onConfigurationChanged(newConfig);
+    }
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onOpenFileEvent(OpenFileEvent openFileEvent) {
+        binding.drawerLayout.closeDrawer(Gravity.START);
+        if (openFileEvent.filePath == null) {
+            Crouton.showText(this, R.string.not_support_yet, Style.ALERT);
+
+            return;
+        }
+        mCurrentFilePath = openFileEvent.filePath;
+        mCurrentFileName = new File(openFileEvent.filePath).getName();
+        doOpenFile(new File(mCurrentFilePath), mReadOnly);
+    }
+
+    public static class OpenFileEvent {
+        public String filePath;
+    }
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+        SharedPreferences preferences = getPreferences(MODE_PRIVATE);
+        SharedPreferences.Editor editor = preferences.edit();
+        editor.putString("LAST_OPEN_PATH", mCurrentFilePath);
+        editor.apply();
+    }
+
+    private void initView() {
+        setSupportActionBar(binding.lt.toolbar);
+        binding.lt.toolbar.setNavigationIcon(R.drawable.ic_back);
+
+        switch (getIntent().getAction() == null ? DEFAULT_ACTION : getIntent().getAction()) {
+            case DEFAULT_ACTION:
+                textFragment = TedFragment.newInstance(openLastFile());
+                if (!projPath.isEmpty()) {
+                    fileTreeAdapter = new EditorFileTreeAdapter(projPath);
+                    binding.leftDrawer.setLayoutManager(new LinearLayoutManager(this));
+                    binding.leftDrawer.setAdapter(fileTreeAdapter);
+                } else {
+                    binding.drawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED);
+                }
+                break;
+            case TEXT_ACTION:
+                textFragment = TedFragment.newInstance(getIntent().getStringExtra(EXTRA_TEXT));
+                binding.drawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED);
+                mDirty = true;
+                break;
+            case QR_CODE_ACTION:
+                textFragment = TedFragment.newInstance(getIntent().getStringExtra(EXTRA_TEXT));
+                binding.drawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED);
+                mCurrentFileName = getIntent().getStringExtra(EXTRA_TITLE);
+                mDirty = true;
+                break;
+            case FILE_ACTION:
+                try {
+                    String uri = getIntent().getDataString();
+                    if (uri != null) {
+                        File file = new File(new URI(uri));
+                        textFragment = TedFragment.newInstance(doOpenFile(file, false));
+                        binding.drawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED);
+                    } else {
+                        Crouton.showText(this, R.string.toast_intent_invalid_uri, Style.ALERT);
+
+                        return;
+                    }
+                } catch (URISyntaxException ignore) {
+                }
+                break;
+            case PROJECT_ACTION:
+                projPath = getIntent().getStringExtra(EXTRA_PROJECT_PATH);
+                fileTreeAdapter = new EditorFileTreeAdapter(projPath);
+                binding.leftDrawer.setLayoutManager(new LinearLayoutManager(this));
+                binding.leftDrawer.setAdapter(fileTreeAdapter);
+                break;
+            case Intent.ACTION_VIEW:
+            case Intent.ACTION_EDIT:
+                if (textFragment == null) textFragment = TedFragment.newInstance("");
+                binding.drawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED);
+                Uri uri = getIntent().getData();
+                if (uri == null) {
+                    doDefaultAction();
+                } else if ("file".equals(uri.getScheme())) {
+                    doOpenFile(new File(uri.getPath()), false);
+                } else if ("content".equals(uri.getScheme())) {
+                    //LogUtil.d(TAG, "");
+                    openFromOther(uri);
+                }
+                break;
+            case ACTION_WIDGET_OPEN:
+                if (textFragment == null) textFragment = TedFragment.newInstance("");
+                try {
+                    binding.drawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED);
+                    File file = new File(new URI(getIntent().getData().toString()));
+                    doOpenFile(file, getIntent().getBooleanExtra(EXTRA_FORCE_READ_ONLY, false));
+                } catch (URISyntaxException e) {
+                    Crouton.showText(this, R.string.toast_intent_invalid_uri, Style.ALERT);
+                    return;
+                } catch (IllegalArgumentException e) {
+                    Crouton.showText(this, R.string.toast_intent_illegal, Style.ALERT);
+                    return;
+                }
+                break;
+        }
+
+        if (textFragment == null) {
+            textFragment = TedFragment.newInstance(openLastFile());
+        }
+        getSupportFragmentManager()
+                .beginTransaction()
+                .add(R.id.content_frame, textFragment, "TED")
+                .commit();
+        updateTitle();
+    }
+
+    private void initListener() {
+        binding.lt.toolbar.setNavigationOnClickListener((View v) -> {
+            if (isDrawerShowing) {
+                binding.drawerLayout.closeDrawer(Gravity.START);
+            } else {
+                finishEdit();
+            }
+        });
+
+        binding.drawerLayout.addDrawerListener(new ActionBarDrawerToggle(this, binding.drawerLayout, R.string.toolbar_showing, R.string.toolbar_close) {
+            @Override
+            public void onDrawerOpened(View drawerView) {
+                super.onDrawerOpened(drawerView);
+                isDrawerShowing = true;
+            }
+
+            @Override
+            public void onDrawerClosed(View drawerView) {
+                super.onDrawerClosed(drawerView);
+                isDrawerShowing = false;
+            }
+        });
+    }
+
+
+    private void openFromOther(Uri uri) {
+        Cursor returnCursor =
+                getContentResolver().query(uri, null, null, null, null);
+        try {
+            returnCursor.moveToFirst();
+            int column_index = returnCursor.getColumnIndexOrThrow(MediaStore.Images.Media.DATA);//Instead of "MediaStore.Images.Media.DATA" can be used "_data"
+            //表中可能没有数据
+            if (null == returnCursor.getString(column_index)) {
+                return;
+            }
+            Uri filePathUri = Uri.parse(returnCursor.getString(column_index));
+            String path = filePathUri.getPath();
+            doOpenFile(new File(path), false);
+        } catch (IllegalArgumentException e) {
+            Crouton.showText(this, R.string.read_only, Style.INFO);
+            InputStream inputStream = null;
+            try {
+                inputStream = getContentResolver().openInputStream(uri);
+            } catch (FileNotFoundException e1) {
+                e1.printStackTrace();
+            }
+            BufferedReader r = new BufferedReader(new InputStreamReader(inputStream));
+            StringBuilder total = new StringBuilder();
+            String line;
+            try {
+                while ((line = r.readLine()) != null) {
+                    total.append(line).append('\n');
+                }
+                mCurrentFileName = returnCursor.getString(returnCursor.getColumnIndex(OpenableColumns.DISPLAY_NAME)).replace("[", "").replace("]", "");
+                mReadOnly = true;
+                textFragment = TedFragment.newInstance(total.toString());
+                mReadOnly = true;
+            } catch (IOException e1) {
+                e1.printStackTrace();
+            }
+        }
+    }
+
+    private void updateSetting() {
+        Settings.updateFromPreferences(PreferenceManager.getDefaultSharedPreferences(this));
+    }
+
+    private void initFiles() {
+        //File externalStorage = new File(Environment.getExternalStorageDirectory(), "qpython");
+
+        //if (checkExpired("public", new File(externalStorage + "/lib").getAbsolutePath(), "programs"+NAction.getPyVer(this))) {
+
+            //String code = NAction.getCode(this);
+        boolean isQpy3 = NAction.isQPy3(getApplication());
+        String baseDir = QPyConstants.ABSOLUTE_PATH;
+        File root = new File(baseDir);
+        if (!(root.exists() && root.isDirectory())) {
+            root.mkdir();
+        }
+        String path = baseDir + (isQpy3 ? "/snippets3" : "/snippets");
+        File folder = new File(path);
+        if (!(folder.exists() && folder.isDirectory())) {
+            folder.mkdir();
+        }
+
+        // init snipples
+        String[] filesList = {"Apache_License", "The_MIT_License", "QPy_WebApp", "QPy_ConsoleApp", "QPy_SL4AApp", "QPy_PygameApp"};
+        for (int i=0;i<filesList.length;i++) {
+            String fn = filesList[i];
+            File f = new File(path + "/" + fn);
+            if (!f.exists()) {
+                String file1 = LoadDataFromAssets(this, fn);
+                writeToFile(path + "/" + fn, file1);
+            }
+
+        }
+
+        //}
+    }
+
+    private String openLastFile() {
+        String lastFile = NStorage.getSP(this, "qedit.last_filename");
+        Log.d(TAG, "openLastFile:"+lastFile);
+
+        if (!lastFile.equals("")) {
+            File f2 = new File(lastFile);
+            if (f2.exists()) {
+                mCurrentFileName = f2.getName();
+                if (mCurrentFileName.equals("main.py")) {
+                    projPath = f2.getParent();
+
+                }
+
+                return doOpenFile(f2, false);
+            }
+        }
+        return "";
+    }
+
+    protected void updateTitle() {
+        String title;
+        String name = getString(R.string.title_untitled);
+        if ((mCurrentFileName != null) && (mCurrentFileName.length() > 0))
+            name = mCurrentFileName;
+
+        if (mReadOnly) {
+            title = getString(R.string.title_editor_readonly, name);
+        } else if (mDirty) {
+            title = getString(R.string.title_editor_dirty, name);
+        } else {
+            title = getString(R.string.title_editor, name);
+        }
+
+        setTitle(title);
+        supportInvalidateOptionsMenu();
+    }
+
+    protected String doOpenFile(File file, boolean forceReadOnly) {
+        Log.d(TAG, "doOpenFile:"+file);
+        if (file == null) {
+            return "";
+        } else {
+            String text = TextFileUtils.readTextFile(file);
+            mCurrentFilePath = getCanonizePath(file);
+            mCurrentFileName = file.getName();
+            mReadOnly = !(file.canWrite() && (!forceReadOnly));
+            if (textFragment != null) {
+                if (text != null) {
+                    textFragment.setEditorText(text);
+                    NStorage.setSP(this, "qedit.last_filename", mCurrentFilePath);
+                } else {
+                    Crouton.showText(this, R.string.toast_file_cant_read, Style.ALERT);
+
+
+                }
+            }
+            updateTitle();
+            return text != null ? text : "";
+        }
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.editor_menu, menu);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.menu_add:
+                if (binding.drawerLayout.isDrawerOpen(binding.leftDrawer)) {
+                    binding.drawerLayout.closeDrawer(binding.leftDrawer);
+                }
+                if (editorPopUp == null) {
+                    List<PopupItemBean> itemBeanList = new ArrayList<>();
+                    itemBeanList.add(new PopupItemBean(getString(R.string.file_new), v -> {
+                        if (mDirty) {
+                            promptSaveDirty(((dialog, which) -> newContent()));
+                        } else {
+                            newContent();
+                        }
+                    }));
+
+
+                    itemBeanList.add(new PopupItemBean(getString(R.string.console_app_project), v -> {
+                        if (mDirty) {
+                            promptSaveDirty(((dialog, which) -> newProject(QPyConstants.CONSOLE_PROJECT)));
+                        } else {
+                            newProject(QPyConstants.CONSOLE_PROJECT);
+                        }
+                    }));
+                    itemBeanList.add(new PopupItemBean(getString(R.string.webapp_project), v -> {
+                        if (mDirty) {
+                            promptSaveDirty(((dialog, which) -> newProject(QPyConstants.WEB_PROJECT)));
+                        } else {
+                            newProject(QPyConstants.WEB_PROJECT);
+                        }
+                    }));
+                    itemBeanList.add(new PopupItemBean(getString(R.string.qsl4a_app_project), v -> {
+                        if (mDirty) {
+                            promptSaveDirty(((dialog, which) -> newProject(QPyConstants.QSL4A_PROJECT)));
+                        } else {
+                            newProject(QPyConstants.QSL4A_PROJECT);
+                        }
+                    }));
+
+                    itemBeanList.add(new PopupItemBean(getString(R.string.pygame_app_project), v -> {
+                        if (mDirty) {
+                            promptSaveDirty(((dialog, which) -> newProject(QPyConstants.PYGAME_PROJECT)));
+                        } else {
+                            newProject(QPyConstants.PYGAME_PROJECT);
+                        }
+                    }));
+
+//                    itemBeanList.add(new PopupItemBean(getString(R.string.kivy_app_project), v -> {
+//                        if (mDirty) {
+//                            promptSaveDirty(((dialog, which) -> newProject(QPyConstants.KIVY_PROJECT)));
+//                        } else {
+//                            newProject(QPyConstants.KIVY_PROJECT);
+//                        }
+//                    }));
+
+                    editorPopUp = new EditorPopUp(this, itemBeanList);
+                }
+                editorPopUp.show(binding.lt.toolbar);
+                break;
+            case R.id.menu_open:
+                TedLocalActivity.start(this, REQUEST_OPEN, OPEN_REQUEST_CODE,"");
+                break;
+            case R.id.menu_more:
+                TedSettingsActivity.start(this);
+                break;
+        }
+        return true;
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        Bundle extras;
+        if (resultCode == RESULT_CANCELED) {
+            return;
+        }
+
+        if ((resultCode != RESULT_OK) || (data == null)) {
+            return;
+        }
+
+        extras = data.getExtras();
+        if (extras == null) {
+            return;
+        }
+
+        switch (requestCode) {
+            case REQUEST_SAVE_AS:
+                doSaveFile(extras.getString("path"), true);
+                break;
+            case REQUEST_OPEN:
+                doOpenFile(new File(extras.getString("path")), false);
+                break;
+            case REQUEST_RECENT:
+                if (extras.getString("path") == null) {
+                    return;
+                }
+                doOpenFile(new File(extras.getString("path")), false);
+                break;
+            case LOGIN_REQUEST_CODE:
+                GistEditActivity.start(this, mCurrentFilePath);
+                break;
+            case OPEN_REQUEST_CODE:
+                if (extras.getBoolean("isProj")) {
+                    projPath = extras.getString("path");
+                    fileTreeAdapter = new EditorFileTreeAdapter(projPath);
+                    binding.leftDrawer.setLayoutManager(new LinearLayoutManager(this));
+                    binding.leftDrawer.setAdapter(fileTreeAdapter);
+                    binding.drawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_UNLOCKED);
+
+                    doOpenFile(FileHelper.findFile(new File(projPath), "main.py"), false);
+                } else {
+                    binding.drawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED);
+                    doOpenFile(new File(extras.getString("path")), false);
+                }
+                break;
+        }
+    }
+
+    boolean              needLog;
+    ScriptExec.LogDialog event;
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onEventMainThread(ScriptExec.LogDialog event) {
+        this.event = event;
+        needLog = true;
+    }
+
+    public void showLogDialog(ScriptExec.LogDialog event) {
+        new android.app.AlertDialog.Builder(this)
+                .setTitle(R.string.last_log)
+                .setMessage(com.quseit.qpyengine.R.string.open_log)
+                .setNegativeButton(R.string.no, ((dialog, which) -> dialog.dismiss()))
+                .setPositiveButton(R.string.ok, (dialog, which) -> {
+                    dialog.dismiss();
+                    Utils.checkRunTimeLog(this, event.title, event.path);
+                })
+                .create()
+                .show();
+    }
+
+    /**
+     * 一个work around，点击返回时软键盘的事件会先触发，所以延迟0.2秒更新状态
+     */
+    @Override
+    public void onGlobalLayout() {
+        Rect bottom = new Rect();
+        binding.drawerLayout.getWindowVisibleDisplayFrame(bottom);
+        Observable.just(null)
+                .delay(200, TimeUnit.MICROSECONDS)
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribeOn(Schedulers.newThread())
+                .subscribe(o -> isKeyboardVisible = bottom.bottom < height);
+    }
+
+    protected void hideKeyboard() {
+        ((InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE)).hideSoftInputFromWindow(getCurrentFocus().getWindowToken(), 0);
+    }
+
+    @Override
+    public boolean onKeyDown(int keyCoder, KeyEvent event) {
+        boolean isCtr = event.isCtrlPressed();
+        if (keyCoder == KeyEvent.KEYCODE_BACK) {
+            if (textFragment.isSearchShowing()) {
+                textFragment.setSearchState();
+            } else if (isKeyboardVisible) {
+                hideKeyboard();
+            } else if (binding.drawerLayout.isDrawerOpen(binding.leftDrawer)) {
+                binding.drawerLayout.closeDrawer(binding.leftDrawer);
+            } else {
+                finishEdit();
+            }
+            return true;
+        } else if (isCtr) {
+            switch (keyCoder) {
+                case KeyEvent.KEYCODE_F:
+                    textFragment.setSearch();
+                    break;
+                case KeyEvent.KEYCODE_S:
+                    saveContent(true, false);
+                    break;
+                case KeyEvent.KEYCODE_O:
+//                    openFile();
+                    break;
+                case KeyEvent.KEYCODE_Z:
+                    textFragment.undo();
+                    break;
+                case KeyEvent.KEYCODE_L:
+                    textFragment.goToLine();
+                    break;
+                case KeyEvent.KEYCODE_LEFT_BRACKET:
+                    textFragment.leftIndent();
+                    break;
+                case KeyEvent.KEYCODE_RIGHT_BRACKET:
+                    textFragment.rightIndent();
+                    break;
+                case KeyEvent.KEYCODE_R:
+//                    runScript();
+                    break;
+                case KeyEvent.KEYCODE_SOFT_LEFT:
+
+                default:
+                    break;
+            }
+        } else {
+            switch (keyCoder) {
+                // F5 ,run the code
+                case KeyEvent.KEYCODE_F5:
+                    // Toast.makeText(this,"f5 f5 f5", Toast.LENGTH_SHORT).show();
+//                    runScript();
+                    break;
+                case KeyEvent.KEYCODE_TAB:
+                    textFragment.rightIndent();
+                    break;
+                case KeyEvent.KEYCODE_SEARCH:
+                    textFragment.setSearchState();
+                    break;
+            }
+        }
+
+        return super.onKeyDown(keyCoder, event);
+    }
+
+    private void finishEdit() {
+        if (NAction.getCode(this).contains("qedit")) {
+            if (mCurrentFilePath == null) {
+                if (mDirty) {
+                    promptSaveDirty();
+                } else {
+                    finish();
+                }
+            } else {
+                Intent intent = getIntent();
+                String action = intent.getAction();
+                if (action == null) {
+                    newContent();
+                } else {
+                    if (mDirty) {
+                        promptSaveDirty();
+                    } else {
+                        finish();
+                    }
+                }
+            }
+        } else {
+            if (mDirty) {
+                promptSaveDirty();
+            } else {
+                finish();
+            }
+        }
+    }
+
+    protected boolean doOpenBackup() {
+        try {
+            String text = TextFileUtils.readInternal(this);
+            if (!TextUtils.isEmpty(text)) {
+                textFragment = TedFragment.newInstance(text);
+                mCurrentFilePath = getPreferences(MODE_PRIVATE).getString("LAST_OPEN_PATH", "");
+                String[] findName = mCurrentFilePath.split("/");
+                mCurrentFileName = findName.length == 0 ? "" : findName[findName.length - 1];
+                mDirty = false;
+                mReadOnly = false;
+                return true;
+            } else {
+                return false;
+            }
+        } catch (OutOfMemoryError e) {
+            Crouton.showText(this, R.string.toast_memory_open, Style.ALERT);
+
+        }
+
+        return true;
+    }
+
+    protected void doDefaultAction() {
+        File file;
+        boolean loaded;
+        loaded = doOpenBackup();
+
+        if ((!loaded) && Settings.USE_HOME_PAGE) {
+            file = new File(Settings.HOME_PAGE_PATH);
+            if (!file.exists()) {
+                Crouton.showText(this, R.string.toast_open_home_page_error, Style.ALERT);
+
+            } else if (!file.canRead()) {
+                Crouton.showText(this, R.string.toast_home_page_cant_read, Style.ALERT);
+
+            } else {
+                doOpenFile(file, false);
+            }
+        }
+
+//        if (!loaded) doClearContents(); todo
+    }
+
+    protected void promptSaveDirty() {
+        promptSaveDirty(((dialog, which) -> finish()));
+    }
+
+    protected void promptSaveDirty(DialogInterface.OnClickListener listener) {
+        AlertDialog.Builder builder;
+
+        builder = new AlertDialog.Builder(this, R.style.MyDialog);
+        builder.setTitle(R.string.warning);
+        builder.setMessage(R.string.ui_save_text);
+
+        builder.setPositiveButton(R.string.ui_save, (dialog, which) -> {
+            saveContent(true, false);
+            listener.onClick(dialog, which);
+        });
+        builder.setNegativeButton(R.string.ui_cancel, null);
+        builder.setNeutralButton(R.string.ui_no_save, listener);
+
+        builder.create().show();
+    }
+
+    protected void doSaveFile(String path, boolean showToast) {
+        if (path == null) {
+            Crouton.showText(this, R.string.toast_save_null, Style.ALERT);
+
+            return;
+        }
+        String content = textFragment.getEditorString();
+        if (!TextFileUtils.writeTextFile(path + ".tmp", content)) {
+            Crouton.showText(this, R.string.toast_save_temp, Style.ALERT);
+
+            return;
+        }
+
+        if (!deleteItem(path)) {
+            Crouton.showText(this, R.string.toast_save_delete, Style.ALERT);
+
+            return;
+        }
+
+        if (!renameItem(path + ".tmp", path)) {
+            Crouton.showText(this, R.string.toast_save_rename, Style.ALERT);
+
+            return;
+        }
+
+        mCurrentFilePath = getCanonizePath(new File(path));
+        mCurrentFileName = (new File(path)).getName();
+        RecentFiles.updateRecentList(path);
+        RecentFiles.saveRecentList(PreferenceManager.getDefaultSharedPreferences(this));
+        mReadOnly = false;
+        mDirty = false;
+        updateTitle();
+
+        NStorage.setSP(this, "qedit.last_filename", mCurrentFilePath);
+        if (showToast) {
+            Crouton.showText(this, R.string.toast_save_success, Style.INFO);
+        }
+    }
+
+    protected void saveAs() {
+        TedLocalActivity.start(this, TedLocalActivity.REQUEST_SAVE_AS, REQUEST_SAVE_AS,mCurrentFileName!=null?mCurrentFileName:".py");
+    }
+
+    protected void saveContent(boolean showToast, boolean auto) {
+        if (!mDirty) {
+            if (showToast)  {
+                Crouton.showText(this, R.string.no_change, Style.INFO);
+            }
+            return;
+        }
+        if ((mCurrentFilePath == null) || (mCurrentFilePath.length() == 0)) {
+            if (auto) {
+                //when edit, if didn't save before, it wont save still
+            } else {
+                TedLocalActivity.start(this, TedLocalActivity.REQUEST_SAVE_AS, REQUEST_SAVE_AS, mCurrentFileName!=null?mCurrentFileName:".py");
+            }
+        } else {
+            doSaveFile(mCurrentFilePath, showToast);
+        }
+    }
+
+    protected void newContentInProject() {
+        if (projPath != null && !projPath.equals("")) {
+            new EnterDialog(this)
+                    .setTitle(getString(R.string.new_file))
+                    .setExt(".py")
+                    .setConfirmListener(name -> {
+                        String path = new File(mCurrentFilePath).getParent() + "/" + name;
+                        File file = new File(path);
+                        if (file.exists()) {
+                            Crouton.showText(this, R.string.file_exists, Style.ALERT);
+
+                            return false;
+                        }
+                        updateTitle();
+                        try {
+                            file.createNewFile();
+                            mCurrentFilePath = file.getAbsolutePath();
+                            doOpenFile(file, false);
+                            fileTreeAdapter.addNewFile(path);
+                            return true;
+                        } catch (IOException e) {
+                            e.printStackTrace();
+                            return false;
+                        }
+                    })
+                    .show();
+        }
+    }
+    protected void newContent() {
+
+        mCurrentFileName = null;
+        mCurrentFilePath = null;
+        textFragment.setEditorText("");
+        binding.drawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED);
+        updateTitle();
+    }
+
+    protected void newScript() {
+        final boolean isQpy3 = NAction.isQPy3(getApplicationContext());
+
+        new EnterDialog(this)
+                .setTitle(getString(R.string.new_script))
+                .setExt(".py")
+                .setConfirmListener(name -> {
+                    File file = new File(QPyConstants.ABSOLUTE_PATH + "/" + (isQpy3? QPyConstants.DFROM_QPY3:QPyConstants.DFROM_QPY2) + "/" + name);
+                    if (file.exists()) {
+                        Crouton.showText(this, R.string.file_exists, Style.ALERT);
+
+                        return false;
+                    }
+                    mCurrentFileName = null;
+                    mCurrentFilePath = null;
+                    textFragment.setEditorText("");
+                    binding.drawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED);
+                    try {
+                        file.createNewFile();
+                        mCurrentFilePath = file.getAbsolutePath();
+                        doOpenFile(file, false);
+                        return true;
+                    } catch (IOException e) {
+                        e.printStackTrace();
+                        return false;
+                    }
+                })
+                .show();
+    }
+
+    /**
+     * @param type WEB_PROJECT/CONSOLE_PROJECT/QSL4A_PROJECT
+     */
+    protected void newProject(final String type) {
+        NStorage.setSP(getApplicationContext(), "qedit.last_filename", "");
+        new EnterDialog(this)
+            .setTitle(getString(R.string.new_project))
+            .setHint(getString(R.string.project_name))
+            .setConfirmListener(name -> {
+                Stack<String> curArtistDir = new Stack<>();
+                final boolean isQpy3 = NAction.isQPy3(getApplicationContext());
+
+                curArtistDir.push(QPyConstants.ABSOLUTE_PATH
+                        + "/" + (isQpy3 ? QPyConstants.DFROM_PRJ3 : QPyConstants.DFROM_PRJ2) + "/" + name);
+
+                File fileN = new File(curArtistDir.peek());
+                if (fileN.exists()) {
+                    Crouton.showText(this, R.string.file_exists, Style.ALERT);
+
+                    return false;
+                } else {
+                    try {
+                        if (fileN.mkdirs()) {
+                            File mainPy = new File(fileN.getAbsolutePath(), "main.py");
+                            if (mainPy.createNewFile()) {
+                                mCurrentFilePath = mainPy.getAbsolutePath();
+                                doOpenFile(mainPy, false);
+                                textFragment.insertSnippet(type);
+                                saveContent(true, false);
+                            }
+                        }
+                    } catch (IOException e) {
+                        Crouton.showText(this, R.string.error_dont_kn, Style.ALERT);
+
+                        e.printStackTrace();
+                        return false;
+                    }
+                    Crouton.showText(this, R.string.success, Style.INFO);
+
+                    return true;
+                }
+            })
+            .show();
+    }
+}
\ No newline at end of file
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/FTPServerService.java b/qpython/src/main/java/org/qpython/qpy/texteditor/FTPServerService.java
new file mode 100644
index 00000000..033ac22e
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/FTPServerService.java
@@ -0,0 +1,9 @@
+package org.qpython.qpy.texteditor;
+
+public class FTPServerService extends org.swiftp.FTPServerService {
+
+	@Override
+	protected Class<?> getSettingClass() {
+		return MFTPSettingActivity.class;
+	}
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/MFTPSettingActivity.java b/qpython/src/main/java/org/qpython/qpy/texteditor/MFTPSettingActivity.java
new file mode 100644
index 00000000..b3b45626
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/MFTPSettingActivity.java
@@ -0,0 +1,225 @@
+package org.qpython.qpy.texteditor;
+
+import android.support.v7.app.AlertDialog;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.res.Resources;
+import android.os.Bundle;
+import android.os.Environment;
+import android.util.Log;
+import android.view.View;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import com.quseit.base.QBaseDialog;
+import com.quseit.util.NAction;
+import com.quseit.util.NUtil;
+
+import org.qpython.qpy.R;
+import org.qpython.qpysdk.QPyConstants;
+import org.swiftp.Defaults;
+
+import java.io.File;
+import java.net.InetAddress;
+import java.text.MessageFormat;
+
+public class MFTPSettingActivity extends BaseActivity {
+	private static final String TAG = "MSettingActivity";
+    //private static final int SCRIPT_EXEC_CODE = 1235;  
+    BroadcastReceiver ftpServerReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            Log.v(TAG, "FTPServerService action received: " + intent.getAction());
+            TextView running_state = (TextView) findViewById(R.id.ftp_service_value);
+            Button ftpOpBtn = (Button)findViewById(R.id.ftp_op_btn);
+
+            if (intent.getAction().equals(org.swiftp.FTPServerService.ACTION_STARTED)) {
+                // Fill in the FTP server address
+                InetAddress address = org.swiftp.FTPServerService.getWifiIp();
+                if (address == null) {
+                    Log.v(TAG, "Unable to retreive wifi ip address");
+                    running_state.setText(getString(R.string.cant_get_url));
+                    return;
+                }
+                String iptext = "ftp://" + address.getHostAddress() + ":"
+                        + org.swiftp.FTPServerService.getPort() + "/";
+                Resources resources = getResources();
+                String summary = resources.getString(R.string.running_summary_started, iptext);
+                running_state.setText(summary);
+
+                ftpOpBtn.setText(getString(R.string.ftp_stop));
+
+            } else if (intent.getAction().equals(org.swiftp.FTPServerService.ACTION_STOPPED)) {
+                running_state.setText("");
+                running_state.setText(R.string.running_summary_stopped);
+
+                ftpOpBtn.setText(getString(R.string.ftp_start));
+
+            } else if (intent.getAction().equals(org.swiftp.FTPServerService.ACTION_FAILEDTOSTART)) {
+                running_state.setText(R.string.running_summary_failed);
+            	ftpOpBtn.setText(getString(R.string.ftp_start));
+            }
+        }
+    };
+    
+    public static void start(Context context) {
+        Intent starter = new Intent(context, MFTPSettingActivity.class);
+        context.startActivity(starter);
+    }
+    
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.m_ftp_setting);
+        setTitle(R.string.swiftp_name);
+
+        //initWidgetTabItem(4);
+
+        String externalStorage = new File(Environment.getExternalStorageDirectory(), QPyConstants.BASE_PATH).getAbsolutePath();
+        String frv = MessageFormat.format(getString(R.string.ftp_root), externalStorage);
+        TextView fr = (TextView)findViewById(R.id.ftp_root_value);
+        fr.setText(frv);
+
+        displayAccount();
+        //
+        Button ftpOpBtn = (Button)findViewById(R.id.ftp_op_btn);
+        if (org.swiftp.FTPServerService.isRunning()) {
+        	ftpOpBtn.setText(getString(R.string.ftp_stop));
+
+        } else {
+        	ftpOpBtn.setText(getString(R.string.ftp_start));
+
+        }
+        IntentFilter filter = new IntentFilter();
+        filter.addAction(org.swiftp.FTPServerService.ACTION_STARTED);
+        filter.addAction(org.swiftp.FTPServerService.ACTION_STOPPED);
+        filter.addAction(org.swiftp.FTPServerService.ACTION_FAILEDTOSTART);
+        registerReceiver(ftpServerReceiver, filter);
+
+//        MNApp mnApp = (MNApp) this.getApplication();
+//
+//        QBaseApp.getInstance().addActivity(this);
+    }
+    
+    @Override
+	public void onDestroy() {
+        Log.v(TAG, "onPause");
+        super.onDestroy();
+
+        Log.v(TAG, "Unregistering the FTPServer actions");
+        unregisterReceiver(ftpServerReceiver);
+    }
+
+    public void onFTPOp(View v) {
+    	if (org.swiftp.FTPServerService.isRunning()) {
+    		stopServer();
+    	} else {
+    		startServer();
+    	}
+    }
+    
+    private void startServer() {
+        Context context = getApplicationContext();
+        NAction.setFtpRoot(context, Environment.getExternalStorageDirectory()+"/"+ QPyConstants.BASE_PATH);
+        Intent serverService = new Intent(context, FTPServerService.class);
+        if (!org.swiftp.FTPServerService.isRunning()) {
+            startService(serverService);
+        }
+    }
+   
+    private void stopServer() {
+        Context context = getApplicationContext();
+        Intent serverService = new Intent(context, FTPServerService.class);
+        stopService(serverService);
+    }
+ 
+    public void displayAccount() {
+    	String ftpPort = NAction.getFtpPort(getApplicationContext());
+    	if (ftpPort.equals("")) {
+    		ftpPort = String.valueOf(Defaults.getPortNumber());
+    	}
+    	String ftpUsername = NAction.getFtpUsername(getApplicationContext());
+    	if (ftpUsername.equals("")) {
+    		ftpUsername = NAction.getCode(getApplicationContext());
+    	}
+    	String ftpPwd = NAction.getFtpPwd(getApplicationContext());
+    	if (ftpPwd.equals("")) {
+    		ftpPwd = NAction.getCode(getApplicationContext());
+    	}
+
+    	TextView ftpPortValue = (TextView)findViewById(R.id.ftp_port_value);
+    	ftpPortValue.setText(ftpPort);
+
+    	TextView ftpAccountValue = (TextView)findViewById(R.id.plugin_ftp_account_value);
+    	ftpAccountValue.setText(ftpUsername+" / "+ftpPwd);
+    }
+	
+    @SuppressWarnings("deprecation")
+	public void onFtpAccountSetting(View v) {
+    	String ftpUsername = NAction.getFtpUsername(getApplicationContext());
+    	if (ftpUsername.equals("")) {
+    		ftpUsername = NAction.getCode(getApplicationContext());
+    	}
+    	String ftpPwd = NAction.getFtpPwd(getApplicationContext());
+    	if (ftpPwd.equals("")) {
+    		ftpPwd = NAction.getCode(getApplicationContext());
+    	}
+
+		WBase.setTxtDialogParam2(0, R.string.ftp_account_setting, getString(R.string.ftp_username), getString(R.string.ftp_pwd), ftpUsername, ftpPwd,
+				(dialog, which) -> {
+                    AlertDialog ad = (AlertDialog) dialog;
+                    EditText t1 = (EditText) ad.findViewById(R.id.editText_prompt1);
+                    EditText t2 = (EditText) ad.findViewById(R.id.editText_prompt2);
+
+                    String username = t1.getText().toString();
+                    String pwd = t2.getText().toString();
+                    if (!username.equals("") && !pwd.equals("")) {
+                        NAction.setFtpUsername(getApplicationContext(), username);
+                        NAction.setFtpPwd(getApplicationContext(), pwd);
+
+                    } else {
+                        Toast.makeText(getApplicationContext(), R.string.err_need_input, Toast.LENGTH_SHORT).show();
+
+                    }
+
+                    displayAccount();
+
+                },null);
+		showDialog(QBaseDialog.DIALOG_TEXT_ENTRY2+dialogIndex);
+		dialogIndex++;
+    }
+
+	@SuppressWarnings("deprecation")
+	public void onFtpPortSetting(View v) {
+		final TextView port = (TextView)findViewById(R.id.ftp_port_value);
+		String portVal = port.getText().toString();
+		WBase.setTxtDialogParam(0, R.string.ftp_port, portVal,
+				new DialogInterface.OnClickListener() {
+					@Override
+					public void onClick(DialogInterface dialog, int which) {
+				        AlertDialog ad = (AlertDialog) dialog;
+				        EditText t = (EditText) ad.findViewById(R.id.editText_prompt);
+				        String content = t.getText().toString();
+
+				        if (!content.equals("")) {
+					        if (NUtil.isInt(content)) {
+					        	NAction.setFtpPort(getApplicationContext(), content);
+					        	displayAccount();
+					        } else {
+					        	Toast.makeText(getApplicationContext(), R.string.err_need_int, Toast.LENGTH_SHORT).show();
+					        }
+				        } else {
+					        NAction.setProxyPort(getApplicationContext(), "");
+							port.setText("");
+				        }
+					}
+				},null);
+		showDialog(QBaseDialog.DIALOG_TEXT_ENTRY+dialogIndex);
+		dialogIndex++;
+	}
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/MNApp.java b/qpython/src/main/java/org/qpython/qpy/texteditor/MNApp.java
new file mode 100644
index 00000000..c30486d7
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/MNApp.java
@@ -0,0 +1,41 @@
+package org.qpython.qpy.texteditor;
+
+import android.app.Application;
+import android.content.Context;
+import android.content.Intent;
+
+import com.quseit.common.CrashHandler;
+
+//import greendroid.app.GDApplication;
+
+public class MNApp extends Application {
+
+	//Map<String, Integer> movieDirs = null;
+
+	//GoogleAnalyticsTracker tracker;
+
+	@Override  
+    public void onCreate() {  
+        super.onCreate();  
+        CrashHandler crashHandler = CrashHandler.getInstance();
+        //注册crashHandler类  
+        crashHandler.init(getApplicationContext());
+    	//tracker = GoogleAnalyticsTracker.getInstance();
+//    	String x = NAction.getExtP(getApplicationContext(), "ga_gap");
+//    	int xq = 30;
+//    	if (!x.equals("")) {
+//    		xq = Integer.valueOf(x);
+//    	}
+//    	String gtid = CONF.GOOGLE_TRACKER_ID;
+//    	String gtid2 = NAction.getExtP(getApplicationContext(), "ga_gtid");
+//    	if (!gtid2.equals("")) {
+//    		gtid = gtid2;
+//    	}
+        //tracker.startNewSession(gtid, xq, getApplicationContext());
+    }  
+
+    public void logout(Context context) {
+    }
+
+
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/RunRules.java b/qpython/src/main/java/org/qpython/qpy/texteditor/RunRules.java
new file mode 100644
index 00000000..230e903f
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/RunRules.java
@@ -0,0 +1,192 @@
+package org.qpython.qpy.texteditor;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+import android.support.v7.app.AlertDialog;
+import android.app.ListActivity;
+import android.app.ProgressDialog;
+import android.content.ActivityNotFoundException;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.os.AsyncTask;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.ListView;
+import android.widget.Toast;
+
+import org.qpython.qpy.R;
+
+/**
+ * @author kyle kersey
+ *
+ */
+public class RunRules extends ListActivity {
+    private PackageManager packageManager = null;
+    private List<ApplicationInfo> applist = null;
+    private ApplicationAdapter listadaptor = null;
+ 
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.run_rules);
+        
+        Button addRuleButton = (Button) findViewById(R.id.add_rule_button);
+        addRuleButton.setOnClickListener(new OnClickListener() {
+			
+			@Override
+			public void onClick(View v) {
+				// uncomment this PATTERN_LINE to see the application picker
+				//new LoadApplications().execute();
+				startRunRuleDialog();
+			}
+		});
+        
+        packageManager = getPackageManager();        
+        //new LoadApplications().execute();
+    }
+ 
+ 
+    @Override
+    protected void onListItemClick(ListView l, View v, int position, long id) {
+        super.onListItemClick(l, v, position, id);
+ 
+        ApplicationInfo app = applist.get(position);
+        try {
+            Intent intent = packageManager
+                    .getLaunchIntentForPackage(app.packageName);
+ 
+            if (null != intent) {
+                startActivity(intent);
+            }
+        } catch (ActivityNotFoundException e) {
+            Toast.makeText(RunRules.this, e.getMessage(),
+                    Toast.LENGTH_LONG).show();
+        } catch (Exception e) {
+            Toast.makeText(RunRules.this, e.getMessage(),
+                    Toast.LENGTH_LONG).show();
+        }
+    }
+ 
+    private List<ApplicationInfo> checkForLaunchIntent(List<ApplicationInfo> list) {
+        ArrayList<ApplicationInfo> applist = new ArrayList<ApplicationInfo>();
+        for (ApplicationInfo info : list) {
+            try {
+                if (null != packageManager.getLaunchIntentForPackage(info.packageName)) {
+                    applist.add(info);
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+ 
+        return applist;
+    }
+ 
+    public void startRunRuleDialog() {
+    	final Context context = this;
+    	LayoutInflater li = LayoutInflater.from(context);
+		View promptsView = li.inflate(R.layout.new_rule_dialog, null);
+
+		AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(
+				context);
+
+		// set prompts.xml to alertdialog builder
+		alertDialogBuilder.setView(promptsView);
+
+		final EditText shouldEndWith = (EditText) promptsView.findViewById(R.id.should_endwith);
+		final Button pickAppButton = (Button) promptsView.findViewById(R.id.pick_app_button);
+		pickAppButton.setOnClickListener(new OnClickListener() {
+
+			@Override
+			public void onClick(View v) {
+				// TODO Auto-generated method stub
+				Intent mainIntent = new Intent(Intent.ACTION_MAIN, null);
+
+				// http://developer.android.com/training/basics/intents/sending.html
+				// Verify it resolves
+				PackageManager packageManager = getPackageManager();
+				List<ResolveInfo> activities = packageManager.queryIntentActivities(mainIntent, 0);
+				boolean isIntentSafe = activities.size() > 0;
+				Intent chooser = Intent.createChooser(mainIntent, "Pick a App");
+
+				// Start an activity if it's safe
+				if (isIntentSafe) {
+				    startActivity(mainIntent);
+				}
+			}
+		});
+
+
+		// set dialog message
+		alertDialogBuilder
+			.setCancelable(false)
+			.setPositiveButton("OK",
+			  new DialogInterface.OnClickListener() {
+			    public void onClick(DialogInterface dialog,int id) {
+
+			    }
+			  })
+			.setNegativeButton("Cancel",
+			  new DialogInterface.OnClickListener() {
+			    public void onClick(DialogInterface dialog,int id) {
+				dialog.cancel();
+			    }
+			  });
+
+		// create alert dialog
+		AlertDialog alertDialog = alertDialogBuilder.create();
+
+		// show it
+		alertDialog.show();
+
+    }
+
+    private class LoadApplications extends AsyncTask<Void, Void, Void> {
+        private ProgressDialog progress = null;
+
+        @Override
+        protected Void doInBackground(Void... params) {
+            applist = checkForLaunchIntent(packageManager.getInstalledApplications(PackageManager.GET_META_DATA));
+            listadaptor = new ApplicationAdapter(RunRules.this,
+                    R.layout.snippet_list_row, applist);
+
+            return null;
+        }
+
+        @Override
+        protected void onCancelled() {
+            super.onCancelled();
+        }
+
+        @Override
+        protected void onPostExecute(Void result) {
+            setListAdapter(listadaptor);
+            progress.dismiss();
+            super.onPostExecute(result);
+        }
+
+        @Override
+        protected void onPreExecute() {
+            progress = ProgressDialog.show(RunRules.this, null,
+                    "Loading application info...");
+            super.onPreExecute();
+        }
+
+        @Override
+        protected void onProgressUpdate(Void... values) {
+            super.onProgressUpdate(values);
+        }
+
+
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/TedAppWidgetProvider.java b/qpython/src/main/java/org/qpython/qpy/texteditor/TedAppWidgetProvider.java
new file mode 100644
index 00000000..7e78751f
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/TedAppWidgetProvider.java
@@ -0,0 +1,89 @@
+package org.qpython.qpy.texteditor;
+
+import java.io.File;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.texteditor.common.Constants;
+import org.qpython.qpy.texteditor.common.WidgetPrefs;
+
+import android.app.PendingIntent;
+import android.appwidget.AppWidgetManager;
+import android.appwidget.AppWidgetProvider;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.util.Log;
+import android.widget.RemoteViews;
+import org.qpython.qpy.BuildConfig;
+
+public class TedAppWidgetProvider extends AppWidgetProvider implements Constants {
+
+	public static void updateWidget(Context context, AppWidgetManager manager, int widgetId) {
+		Intent intent;
+		PendingIntent pendingIntent;
+		RemoteViews views;
+		WidgetPrefs pref;
+		File targetFile;
+
+		pref = new WidgetPrefs();
+		pref.load(context, widgetId);
+
+		if (BuildConfig.DEBUG)
+			Log.i(TAG, "Updating widgetId " + String.valueOf(widgetId));
+
+		targetFile = new File(pref.mTargetPath);
+
+		intent = new Intent(context, TedFragment.class);
+		intent.setAction(ACTION_WIDGET_OPEN);
+		intent.setData(Uri.fromFile(targetFile));
+		intent.putExtra(EXTRA_FORCE_READ_ONLY, pref.mReadOnly);
+
+		pendingIntent = PendingIntent.getActivity(context, 0, intent, 0);
+
+		views = new RemoteViews(context.getPackageName(), R.layout.widget);
+
+		views.setOnClickPendingIntent(R.id.widgetLayout, pendingIntent);
+		if (pref.mReadOnly)
+			views.setImageViewResource(R.id.icon, R.drawable.ic_editor_file);
+		else
+			views.setImageViewResource(R.id.icon, R.drawable.ic_editor_unknown);
+		views.setTextViewText(R.id.textFileName, targetFile.getName());
+
+		manager.updateAppWidget(widgetId, views);
+	}
+
+	/**
+	 * @see android.appwidget.AppWidgetProvider#onUpdate(android.content.Context,
+	 *      android.appwidget.AppWidgetManager, int[])
+	 */
+	@Override
+	public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) {
+
+		AppWidgetManager manager;
+		ComponentName widgetName;
+
+		if (BuildConfig.DEBUG)
+			Log.i(TAG, "onUpdate widgets");
+
+		manager = AppWidgetManager.getInstance(context);
+		widgetName = new ComponentName(context, TedAppWidgetProvider.class);
+		int[] widgetIds = manager.getAppWidgetIds(widgetName);
+
+		for (int widgetId : widgetIds) {
+			updateWidget(context, manager, widgetId);
+		}
+	}
+
+	/**
+	 * @see android.appwidget.AppWidgetProvider#onDeleted(android.content.Context,
+	 *      int[])
+	 */
+	@Override
+	public void onDeleted(Context context, int[] appWidgetIds) {
+
+		for (int widgetId : appWidgetIds) {
+			WidgetPrefs.delete(context, widgetId);
+		}
+	}
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/TedFontActivity.java b/qpython/src/main/java/org/qpython/qpy/texteditor/TedFontActivity.java
new file mode 100644
index 00000000..7fe46a28
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/TedFontActivity.java
@@ -0,0 +1,97 @@
+package org.qpython.qpy.texteditor;
+
+import java.io.File;
+import java.util.LinkedList;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.texteditor.ui.adapter.FontListAdapter;
+
+import org.qpython.qpy.texteditor.widget.crouton.Crouton;
+import org.qpython.qpy.texteditor.widget.crouton.Style;
+
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+import android.view.KeyEvent;
+import android.view.View;
+import android.view.View.OnClickListener;
+
+import org.qpython.qpy.texteditor.androidlib.ui.activity.BrowsingActivity;
+
+public class TedFontActivity extends BrowsingActivity implements
+        OnClickListener {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        setContentView(R.layout.layout_open);
+        mExtensionsWhiteList.add("ttf");
+
+        // set default result
+        setResult(RESULT_CANCELED, null);
+
+        // buttons
+        findViewById(R.id.buttonCancel).setOnClickListener(this);
+
+        mListAdapter = new FontListAdapter(this, new LinkedList<>());
+    }
+
+    @Override
+    protected void onFileClick(File file) {
+        if (setOpenResult(file))
+            finish();
+    }
+
+    @Override
+    protected boolean onFolderClick(File folder) {
+        return true;
+    }
+
+    @Override
+    protected void onFolderViewFilled() {
+
+    }
+
+    @Override
+    public boolean onKeyUp(int keyCode, KeyEvent event) {
+        if (event.getKeyCode() == KeyEvent.KEYCODE_BACK) {
+            // navigate to parent folder
+            if (!mCurrentFolder.getPath().equals("/storage/emulated/0")) {
+                File parent = mCurrentFolder.getParentFile();
+                if ((parent != null) && (parent.exists())) {
+                    fillFolderView(parent);
+                    return true;
+                }
+            }
+        }
+        return super.onKeyUp(keyCode, event);
+    }
+
+    @Override
+    public void onClick(View v) {
+        if (v.getId() == R.id.buttonCancel) {
+            setResult(RESULT_CANCELED);
+            finish();
+        }
+    }
+
+    /**
+     * @param file the file to return
+     * @return if the result was set correctly
+     */
+    protected boolean setOpenResult(File file) {
+        Intent result;
+
+        if (!file.canRead()) {
+            Crouton.showText(this, R.string.toast_file_cant_read, Style.ALERT);
+            return false;
+        }
+
+        result = new Intent();
+        result.setData(Uri.fromFile(file));
+
+        setResult(RESULT_OK, result);
+        return true;
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/TedFragment.java b/qpython/src/main/java/org/qpython/qpy/texteditor/TedFragment.java
new file mode 100644
index 00000000..7b1ee0ce
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/TedFragment.java
@@ -0,0 +1,814 @@
+package org.qpython.qpy.texteditor;
+
+import android.animation.Animator;
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.content.Intent;
+import android.databinding.DataBindingUtil;
+import android.net.Uri;
+import android.os.Build.VERSION;
+import android.os.Build.VERSION_CODES;
+import android.os.Bundle;
+import android.os.Environment;
+import android.support.annotation.Nullable;
+import android.support.annotation.RequiresApi;
+import android.support.v4.app.Fragment;
+import android.support.v7.app.AlertDialog;
+import android.text.Editable;
+import android.text.InputType;
+import android.text.TextWatcher;
+import android.util.DisplayMetrics;
+import android.view.KeyEvent;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewAnimationUtils;
+import android.view.ViewGroup;
+import android.widget.Toast;
+
+import com.quseit.util.NAction;
+import com.quseit.util.NStorage;
+
+import org.markdown4j.Markdown4jProcessor;
+import org.qpython.qpy.R;
+import org.qpython.qpy.console.ScriptExec;
+import org.qpython.qpy.databinding.LayoutEditorBinding;
+import org.qpython.qpy.databinding.SearchTopBinding;
+import org.qpython.qpy.main.activity.GistEditActivity;
+import org.qpython.qpy.main.activity.QWebViewActivity;
+import org.qpython.qpy.main.activity.SignInActivity;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.widget.Indent;
+import org.qpython.qpy.main.widget.ShortcutLayout;
+import org.qpython.qpy.texteditor.common.Constants;
+import org.qpython.qpy.texteditor.common.RecentFiles;
+import org.qpython.qpy.texteditor.common.Settings;
+import org.qpython.qpy.texteditor.ui.view.EnterDialog;
+import org.qpython.qpy.texteditor.undo.TextChangeWatcher;
+import org.qpython.qpy.texteditor.widget.crouton.Crouton;
+import org.qpython.qpy.texteditor.widget.crouton.Style;
+import org.qpython.qpysdk.QPyConstants;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Scanner;
+
+import static android.content.Context.MODE_PRIVATE;
+import static org.qpython.qpy.texteditor.androidlib.data.FileUtils.deleteItem;
+import static org.qpython.qpy.texteditor.androidlib.data.FileUtils.renameItem;
+import static org.qpython.qpy.texteditor.androidlib.ui.Toaster.showToast;
+
+/**
+ * @author River
+ */
+
+public class TedFragment extends Fragment implements Constants, TextWatcher, Indent {
+    public static final String TAG                = "TED";
+    public static final int    LOGIN_REQUEST_CODE = 5106;
+    public static final int    OPEN_REQUEST_CODE  = 5233;
+
+
+    private static final String Apache_License  = "Apache_License";
+    private static final String The_MIT_License = "The_MIT_License";
+
+    final int DOC_FLAG = 10001;
+
+    protected boolean mInUndo;
+    protected boolean mDoNotBackup;
+
+    protected TextChangeWatcher mWatcher = new TextChangeWatcher();
+    private EditorActivity activity;
+
+    private LayoutEditorBinding binding;
+    private SearchTopBinding    searchTopBinding;
+    private ShortcutLayout      shortcutLayout;
+
+    public static TedFragment newInstance(String content) {
+        TedFragment myFragment = new TedFragment();
+
+        Bundle args = new Bundle();
+        args.putString(TAG, content);
+        myFragment.setArguments(args);
+
+        return myFragment;
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.layout_editor, null);
+    }
+
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        binding = DataBindingUtil.bind(view);
+        if (activity.mReadOnly) {
+            binding.editor.setEnabled(false);
+        }
+        initListener();
+        initContent();
+    }
+
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        activity = (EditorActivity) context;
+        //此处view未进行初始化不应该对view进行操作
+    }
+
+    @SuppressLint("RestrictedApi")
+    @Override
+    public void onResume() {
+        super.onResume();
+        if (binding != null) {
+            binding.editor.updateFromSettings("");
+
+            if (Settings.SHOW_GIST) {
+                //binding.share.setVisibility(View.VISIBLE);
+
+            } else {
+                binding.share.setVisibility(View.GONE);
+
+            }
+        }
+    }
+
+    private void initListener() {
+        binding.ibMore.setOnClickListener(view -> {
+            if (view.isSelected()) {
+                shortcutLayout.setVisibility(View.GONE);
+                binding.control.llControl.setVisibility(View.VISIBLE);
+                binding.ibMore.setImageResource(R.drawable.ic_editcode);
+            } else {
+                if (!binding.control.vsShortcut.isInflated()) {
+                    shortcutLayout = (ShortcutLayout) binding.control.vsShortcut.getViewStub().inflate();
+                    shortcutLayout.init(binding.editor,this);
+                }
+                if (binding.control.ibLock.isSelected()) {
+                    binding.control.ibLock.setSelected(false);
+                    binding.control.ibLock.setImageResource(R.drawable.ic_editor_keyboard);
+                    binding.editor.setEnabled(true);
+                }
+                shortcutLayout.setVisibility(View.VISIBLE);
+                binding.control.llControl.setVisibility(View.GONE);
+                binding.ibMore.setImageResource(R.drawable.ic_edittext);
+            }
+            view.setSelected(!view.isSelected());
+        });
+        binding.control.ibSave.setOnClickListener(v -> ((EditorActivity) getActivity()).saveContent(true, false));
+        binding.control.ibSaveAs.setOnClickListener(v -> ((EditorActivity) getActivity()).saveAs());
+
+
+        binding.control.ibSave.setOnLongClickListener(v -> {
+            TedLocalActivity.start(getActivity(), TedLocalActivity.REQUEST_SAVE_AS, REQUEST_SAVE_AS,"");
+            return true;
+        });
+        binding.control.ibSnippet.setOnClickListener(v -> onSnippets());
+        binding.control.ibRecent.setOnClickListener(v -> {
+            TedLocalActivity.start(getActivity(), TedLocalActivity.REQUEST_RECENT, OPEN_REQUEST_CODE,"");
+            binding.ibMore.setImageResource(R.drawable.ic_editor_more_horiz);
+            binding.ibMore.setSelected(false);
+        });
+        binding.control.ibSave.setOnClickListener(v -> ((EditorActivity) getActivity()).saveContent(true, false));
+        binding.control.ibJumpTo.setOnClickListener(v -> goToLine());
+        binding.control.playBtn.setOnClickListener(view -> {
+            if (activity.mDirty) {
+                AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
+                builder.setTitle(R.string.warning)
+                        .setMessage(R.string.run_dirty_hint)
+                        .setPositiveButton(R.string.yes, (dialog, which) -> {
+                            ((EditorActivity) getActivity()).saveContent(false, false);
+                            runFile();
+                        })
+                        .setNegativeButton(R.string.no_im_good, ((dialog, which) -> runFile()))
+                        .show();
+            } else {
+                runFile();
+            }
+        });
+        binding.control.ibSearch.setOnClickListener(view -> {
+            if (!binding.vsSearchTop.isInflated()) {
+                searchTopBinding = DataBindingUtil.bind(binding.vsSearchTop.getViewStub().inflate());
+                initSearchBarListener();
+                setSearchState();
+            }
+            if (VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP) {
+                startAnim();
+            }
+            binding.searchBottom.rlSearchBottom.setVisibility(View.VISIBLE);
+            searchTopBinding.llSearch.setVisibility(View.VISIBLE);
+            searchTopBinding.textSearch.requestFocus();
+        });
+        binding.control.ibUndo.setOnClickListener(v -> undo());
+        binding.control.ibRedo.setOnClickListener(v -> redo());
+        binding.getRoot().getViewTreeObserver().addOnGlobalLayoutListener((EditorActivity) getActivity());
+
+        if (Settings.SHOW_GIST) {
+            binding.share.setOnClickListener(v -> {
+                if (activity.mCurrentFilePath == null) {
+                    Toast.makeText(getContext(), R.string.share_empty_hint, Toast.LENGTH_SHORT).show();
+                    return;
+                }
+                if (activity.mDirty) {
+                    ((EditorActivity) getActivity()).promptSaveDirty();
+                    return;
+                }
+                if (App.getUser() != null) {
+                    GistEditActivity.start(getContext(), activity.mCurrentFilePath);
+                } else {
+                    Intent intent = new Intent(getContext(), SignInActivity.class);
+                    startActivityForResult(intent, LOGIN_REQUEST_CODE);
+                }
+            });
+        } else {
+            binding.share.setVisibility(View.GONE);
+        }
+
+        binding.control.ibLock.setOnClickListener(v -> {
+            if (v.isSelected()) {
+                binding.control.ibLock.setImageResource(R.drawable.ic_editor_keyboard);
+                binding.editor.setEnabled(true);
+            } else {
+                binding.control.ibLock.setImageResource(R.drawable.ic_editor_keyboardlock);
+                binding.editor.setEnabled(false);
+            }
+
+            v.setSelected(!v.isSelected());
+        });
+    }
+
+    private void initContent() {
+        binding.editor.setText(getArguments().getString(TAG));
+        binding.editor.setEnabled(!activity.mReadOnly);
+        binding.editor.addTextChangedListener(this);
+        binding.editor.setOnKeyListener(((v, keyCode, event) -> {
+            if (KeyEvent.ACTION_UP == event.getAction()
+                    && (KeyEvent.KEYCODE_NUMPAD_ENTER == event.getKeyCode()
+                    || KeyEvent.KEYCODE_ENTER == event.getKeyCode())) {
+                activity.saveContent(false, true);
+            }
+            return false;
+        }));
+        updateType();
+    }
+
+    private void runFile() {
+        if (activity.mCurrentFilePath != null
+                && (activity.mCurrentFilePath.endsWith(".py") || activity.mCurrentFilePath.endsWith(".md")
+                || activity.mCurrentFilePath.endsWith(".html") || activity.mCurrentFilePath.endsWith(".htm")
+                || activity.mCurrentFilePath.endsWith(".lua") || activity.mCurrentFilePath.endsWith(".sh"))) {
+            if (activity.mCurrentFileName.endsWith(".html")) {
+                String content = binding.editor.getText().toString();
+                QWebViewActivity.loadHtml(getContext(), content, activity.mCurrentFileName);
+            } else if (activity.mCurrentFileName.endsWith(".md")) {
+                String content = binding.editor.getText().toString();
+                try {
+                    String markdown = new Markdown4jProcessor().process(content);
+                    QWebViewActivity.loadHtml(getContext(), markdown, activity.mCurrentFileName);
+                } catch (IOException e) {
+                    e.printStackTrace();
+                    Crouton.showText(getActivity(), getResources().getString(R.string.convert_fail), Style.ALERT);
+                }
+            } else {
+                if (activity.mCurrentFilePath.contains("/projects")) {
+                    ScriptExec.getInstance().playProject(getActivity(), activity.mCurrentFilePath.replace("/main.py", ""), false);
+                } else {
+                    ScriptExec.getInstance().playScript(getActivity(), activity.mCurrentFilePath, null, false);
+                }
+            }
+        } else {
+            Toast.makeText(getContext(), R.string.qedit_not_support, Toast.LENGTH_SHORT).show();
+        }
+    }
+
+    protected void updateType() {
+        if (activity.mCurrentFileName != null) {
+            String[] syntaxExts = getResources().getStringArray(R.array.syntax_ext);
+            for (String syntaxExt : syntaxExts) {
+                if (activity.mCurrentFileName.endsWith(syntaxExt)) {
+                    binding.editor.updateFromSettings(syntaxExt);
+                }
+            }
+
+            if (activity.mCurrentFileName.endsWith(".py") || activity.mCurrentFileName.endsWith(".sh")) {
+                binding.control.playBtn.setImageResource(R.drawable.ic_editor_run);
+            } else if (activity.mCurrentFileName.endsWith(".md")
+                    || activity.mCurrentFileName.endsWith(".html") || activity.mCurrentFileName.endsWith(".htm")) {
+                binding.control.playBtn.setImageResource(R.drawable.ic_editor_web);
+            }
+        }
+    }
+
+    @RequiresApi(api = VERSION_CODES.LOLLIPOP)
+    private void startAnim() {
+        DisplayMetrics displayMetrics = new DisplayMetrics();
+        getActivity().getWindowManager().getDefaultDisplay().getMetrics(displayMetrics);
+        int width = displayMetrics.widthPixels;
+        Animator anim = ViewAnimationUtils.createCircularReveal(searchTopBinding.getRoot(), width, 0, 0, width);
+        anim.start();
+    }
+
+    private void initSearchBarListener() {
+        searchTopBinding.ibClear.setOnClickListener(v -> searchTopBinding.textSearch.setText(""));
+        searchTopBinding.ibClose.setOnClickListener(v -> {
+            searchTopBinding.llSearch.setVisibility(View.GONE);
+            binding.searchBottom.rlSearchBottom.setVisibility(View.GONE);
+        });
+
+        binding.searchBottom.ivSearch.setOnClickListener(v -> searchNext());
+        binding.searchBottom.buttonSearchNext.setOnClickListener(v -> searchNext());
+
+        binding.searchBottom.buttonSearchPrev.setOnClickListener(v -> searchPrevious());
+    }
+
+    /**
+     * Create a list of snippet
+     */
+    public void SnippetsList() {
+        boolean isQpy3 = NAction.isQPy3(getContext());
+        List<String> listItems = new ArrayList<>();
+        String baseDir = Environment.getExternalStorageDirectory().getAbsolutePath()
+                + "/" + QPyConstants.BASE_PATH;
+        String path = baseDir + (isQpy3 ? "/snippets3/" : "/snippets/");
+        String files;
+        File folder = new File(path);
+        if (folder.exists()) {
+            File[] listOfFiles = folder.listFiles();
+            if (listOfFiles != null) {
+                for (File listOfFile : listOfFiles) {
+                    if (listOfFile.isFile()) {
+                        files = listOfFile.getName();
+                        listItems.add(files);
+                    }
+                }
+            }
+        }
+
+        final CharSequence colors[] = listItems.toArray(new CharSequence[listItems.size()]);
+        AlertDialog.Builder builder = new AlertDialog.Builder(getContext(), R.style.MyDialog);
+        builder.setTitle(R.string.info_snippets);
+
+        builder.setItems(colors, (dialog, which) -> {
+            try {
+                insertSnippet("" + colors[which]);
+            } catch (IOException e) {
+                Toast.makeText(getContext().getApplicationContext(), R.string.fail_to_insert, Toast.LENGTH_SHORT).show();
+                e.printStackTrace();
+            }
+        });
+        builder.show();
+    }
+
+    /**
+     * @param snippetName Apache_License/The_MIT_License/WEB_PROJECT/CONSOLE_PROJECT/KIVY_PROJECT
+     */
+    public void insertSnippet(String snippetName) throws IOException {
+        boolean isQPy3 = NAction.isQPy3(getContext());
+        String baseDir = Environment.getExternalStorageDirectory().getAbsolutePath()
+                + "/" + QPyConstants.BASE_PATH;
+        String path = baseDir + (isQPy3 ? "/snippets3/" : "/snippets/");
+        String s;
+        switch (snippetName) {
+            case Apache_License:
+                s = readFile(path + Apache_License);
+                break;
+            case The_MIT_License:
+                s = readFile(path + The_MIT_License);
+                break;
+            case QPyConstants.WEB_PROJECT:
+                s = readFile(path + "QPy_WebApp");
+                break;
+            case QPyConstants.CONSOLE_PROJECT:
+                s = readFile(path + "QPy_ConsoleApp");
+                break;
+//            case QPyConstants.KIVY_PROJECT:
+//                s = readFile(path + "QPy_KivyApp");
+//                break;
+            case QPyConstants.PYGAME_PROJECT:
+                s = readFile(path + "QPy_PygameApp");
+                break;
+            case QPyConstants.QSL4A_PROJECT:
+                s = readFile(path + "QPy_SL4AApp");
+                break;
+            default:
+                s = readFile(path + "QPy_ConsoleApp");
+        }
+        binding.editor.getText().insert(0, s);
+    }
+
+    public void saveCodeSnippet(String selectText) {
+        boolean isQPy3 = NAction.isQPy3(getContext());
+        String baseDir = Environment.getExternalStorageDirectory().getAbsolutePath()
+                + "/" + QPyConstants.BASE_PATH;
+        String path = baseDir + (isQPy3 ? "/snippets3/" : "/snippets/");
+
+        new EnterDialog(getContext())
+                .setTitle(getString(R.string.save_as_snippets))
+                .setHint(getString(R.string.enter_snippet))
+                .setConfirmListener(name -> {
+                    String dir = path + name;
+                    File f = new File(dir);
+                    if (f.exists()) {
+                        Toast.makeText(getContext(), R.string.snippet_exist, Toast.LENGTH_SHORT).show();
+                        return false;
+                    } else {
+                        writeToFile(name, selectText);
+                        Toast.makeText(getContext().getApplicationContext(), getString(R.string.save_as_snippets_1) + name,
+                                Toast.LENGTH_SHORT).show();
+                        return true;
+                    }
+                })
+                .show();
+    }
+
+    public void setSearch() {
+        setSearchState();
+
+        int startSelection = binding.editor.getSelectionStart();
+        int endSelection = binding.editor.getSelectionEnd();
+        String selectedText = binding.editor.getText().toString().substring(startSelection, endSelection);
+        if (selectedText.length() != 0) {
+            searchTopBinding.textSearch.setText(selectedText);
+        }
+    }
+
+    @Override
+    public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+        if (Settings.UNDO && (!mInUndo) && (mWatcher != null))
+            mWatcher.beforeChange(s, start, count, after);
+    }
+
+    @Override
+    public void onTextChanged(CharSequence s, int start, int before, int count) {
+        if (mInUndo)
+            return;
+
+        if (Settings.UNDO && (!mInUndo) && (mWatcher != null))
+            mWatcher.afterChange(s, start, before, count);
+    }
+
+    @Override
+    public void afterTextChanged(Editable s) {
+        if (!activity.mDirty) {
+            activity.mDirty = true;
+            ((EditorActivity) getActivity()).updateTitle();
+        }
+    }
+
+    public boolean setEditorText(String text) {
+        if (text != null) {
+            //view未初始化调用该方法导致空指针
+            if (binding == null){
+                Bundle args = new Bundle();
+                args.putString(TAG, text);
+                setArguments(args);
+                return false;
+            }
+            binding.editor.removeTextChangedListener(this);
+            mInUndo = true;
+            binding.editor.setText(text);
+            binding.editor.setOnKeyListener(null);
+            binding.editor.setEnabled(!activity.mReadOnly);
+            mWatcher = new TextChangeWatcher();
+            if (activity.mCurrentFilePath != null) {
+                RecentFiles.updateRecentList(activity.mCurrentFilePath);
+                RecentFiles.saveRecentList(getContext().getSharedPreferences(PREFERENCES_NAME, MODE_PRIVATE));
+            }
+            activity.mDirty = false;
+            mInUndo = false;
+            mDoNotBackup = false;
+            NStorage.setSP(getContext().getApplicationContext(), "qedit.last_filename", activity.mCurrentFilePath);
+            updateType();
+            binding.editor.addTextChangedListener(this);
+            binding.editor.setOnKeyListener(((v, keyCode, event) -> {
+                if (KeyEvent.ACTION_UP == event.getAction() && (KeyEvent.KEYCODE_NUMPAD_ENTER == event.getKeyCode()
+                        || KeyEvent.KEYCODE_ENTER == event.getKeyCode())) {
+
+                    activity.saveContent(false, true);
+                }
+                return false;
+            }));
+            return true;
+        } else {
+            Toast.makeText(getContext(), R.string.toast_open_error, Toast.LENGTH_SHORT).show();
+            return false;
+        }
+    }
+
+    /**
+     * Undo the last change
+     *
+     * @return if an undo was don
+     */
+    protected boolean undo() {
+        boolean didUndo = false;
+        mInUndo = true;
+        int caret;
+        caret = mWatcher.undo(binding.editor.getText());
+        if (caret >= 0) {
+            binding.editor.setSelection(caret, caret);
+            didUndo = true;
+        }
+        mInUndo = false;
+
+        return didUndo;
+    }
+
+    protected boolean redo() {
+        boolean didRedo = false;
+        int caret;
+        caret = mWatcher.redo(binding.editor.getText());
+        if (caret >= 0) {
+            binding.editor.setSelection(caret);
+            didRedo = true;
+        }
+        return didRedo;
+    }
+
+    protected boolean isSearchShowing() {
+        return searchTopBinding != null && searchTopBinding.llSearch.getVisibility() == View.VISIBLE;
+    }
+
+    protected String getEditorString() {
+        return binding.editor.getText().toString();
+    }
+
+    public void onSnippets() {
+        int startSelection = binding.editor.getSelectionStart();
+        int endSelection = binding.editor.getSelectionEnd();
+        String selectedText = binding.editor.getText().toString().substring(startSelection, endSelection);
+        /**
+         * Detect if the text is selected
+         */
+        if (selectedText.length() != 0) {
+            saveCodeSnippet(selectedText);
+        } else {
+            SnippetsList();
+        }
+    }
+
+    /**
+     * Opens / close the setSearchState interface
+     */
+    protected void setSearchState() {
+        if (searchTopBinding.llSearch!=null) {
+            switch (searchTopBinding.llSearch.getVisibility()) {
+                case View.GONE:
+                    binding.returnBarBox.setVisibility(View.GONE);
+                    searchTopBinding.llSearch.setVisibility(View.VISIBLE);
+                    binding.searchBottom.rlSearchBottom.setVisibility(View.VISIBLE);
+                    searchTopBinding.textSearch.requestFocus();
+                    break;
+                case View.INVISIBLE:
+                    break;
+                case View.VISIBLE:
+                default:
+                    searchTopBinding.llSearch.setVisibility(View.GONE);
+                    binding.searchBottom.rlSearchBottom.setVisibility(View.GONE);
+                    binding.returnBarBox.setVisibility(View.VISIBLE);
+                    break;
+            }
+        }
+        binding.editor.setEnabled(true);
+    }
+
+    /**
+     * Uses the user input to setSearchState a file
+     */
+    @SuppressLint("DefaultLocale")
+    protected void searchNext() {
+        String search, text;
+        int selection, next;
+
+        search = searchTopBinding.textSearch.getText().toString();
+        text = binding.editor.getText().toString();
+        selection = binding.editor.getSelectionEnd();
+
+        if (!Settings.SEARCHMATCHCASE) {
+            search = search.toLowerCase();
+            text = text.toLowerCase();
+        }
+
+        next = text.indexOf(search, selection);
+        if (next > -1) {
+            binding.editor.setSelection(next, next + search.length());
+            if (!binding.editor.isFocused())
+                binding.editor.requestFocus();
+        } else {
+            if (Settings.SEARCHWRAP) {
+                next = text.indexOf(search);
+                if (next > -1) {
+                    binding.editor.setSelection(next, next + search.length());
+                    if (!binding.editor.isFocused())
+                        binding.editor.requestFocus();
+                } else {
+                    Crouton.showText(getActivity(), R.string.toast_search_not_found, Style.ALERT);
+                }
+            } else {
+                Crouton.showText(getActivity(), R.string.toast_search_eof, Style.ALERT);
+            }
+        }
+    }
+
+    /**
+     * Uses the user input to setSearchState a file
+     */
+    @SuppressLint("DefaultLocale")
+    protected void searchPrevious() {
+        String search, text;
+        int selection, next;
+
+        search = searchTopBinding.textSearch.getText().toString();
+        text = binding.editor.getText().toString();
+        selection = binding.editor.getSelectionStart() - 1;
+
+        if (search.length() == 0) {
+            Crouton.showText(getActivity(), R.string.toast_search_no_input, Style.ALERT);
+            return;
+        }
+
+        if (!Settings.SEARCHMATCHCASE) {
+            search = search.toLowerCase();
+            text = text.toLowerCase();
+        }
+
+        next = text.lastIndexOf(search, selection);
+
+        if (next > -1) {
+            binding.editor.setSelection(next, next + search.length());
+            if (!binding.editor.isFocused())
+                binding.editor.requestFocus();
+        } else {
+            if (Settings.SEARCHWRAP) {
+                next = text.lastIndexOf(search);
+                if (next > -1) {
+                    binding.editor.setSelection(next, next + search.length());
+                    if (!binding.editor.isFocused())
+                        binding.editor.requestFocus();
+                } else {
+                    Crouton.showText(getActivity(), R.string.toast_search_not_found, Style.INFO);
+                }
+            } else {
+                Crouton.showText(getActivity(), R.string.toast_search_eof, Style.INFO);
+            }
+        }
+    }
+
+    /**
+     * Indent the text left
+     */
+    @Override
+    public void leftIndent() {
+        int index = binding.editor.getSelectionStart();
+        Editable editable = binding.editor.getText();
+        if (index >= 4) {
+            if (editable.subSequence(index - 4, index).toString().equals("    ")) {
+                editable.delete(index - 4, index);
+            }
+        }
+    }
+
+
+    // same as rightIndent
+    public void tabIndent() {
+        int startSelection = binding.editor.getSelectionStart();
+        int endSelection = binding.editor.getSelectionEnd();
+        String selectedText = binding.editor.getText().toString().substring(startSelection, endSelection);
+        Editable editable = binding.editor.getText();
+        if (selectedText.length() != 0) {
+            String startData = binding.editor.getText().toString();
+            String textData = startData.substring(0, startSelection);
+            if (textData.contains("\n")) {
+                int newLineIndex = textData.lastIndexOf("\n");
+                editable.replace(newLineIndex, newLineIndex, "\n\t");
+            } else {
+                editable.insert(0, "\t");
+            }
+            String indentedText = selectedText.replace("\n", "\n\t");
+            editable.replace(startSelection, endSelection, indentedText);
+        } else {
+            int index = binding.editor.getSelectionStart();
+            editable.insert(index, "\t");
+        }
+
+        binding.editor.setFocusable(true);
+        binding.editor.setFocusableInTouchMode(true);
+        binding.editor.requestFocus();
+        binding.editor.requestFocusFromTouch();
+        binding.editor.findFocus();
+    }
+    //same as leftIndentss
+    public void delIndent() {
+        int index = binding.editor.getSelectionStart();
+        Editable editable = binding.editor.getText();
+        if (index >= 1) {
+            if (editable.subSequence(index - 1, index).toString().equals("    ")) {
+                editable.delete(index - 1, index);
+            }
+        }
+    }
+    /**
+     *
+     * Indent the text right
+     */
+    @Override
+    public void rightIndent() {
+        int startSelection = binding.editor.getSelectionStart();
+        int endSelection = binding.editor.getSelectionEnd();
+        String selectedText = binding.editor.getText().toString().substring(startSelection, endSelection);
+        Editable editable = binding.editor.getText();
+        if (selectedText.length() != 0) {
+            String startData = binding.editor.getText().toString();
+            String textData = startData.substring(0, startSelection);
+            if (textData.contains("\n")) {
+                int newLineIndex = textData.lastIndexOf("\n");
+                editable.replace(newLineIndex, newLineIndex, "\n    ");
+            } else {
+                editable.insert(0, "    ");
+            }
+            String indentedText = selectedText.replace("\n", "\n    ");
+            editable.replace(startSelection, endSelection, indentedText);
+        } else {
+            int index = binding.editor.getSelectionStart();
+            editable.insert(index, "    ");
+        }
+
+        binding.editor.setFocusable(true);
+        binding.editor.setFocusableInTouchMode(true);
+        binding.editor.requestFocus();
+        binding.editor.requestFocusFromTouch();
+        binding.editor.findFocus();
+    }
+
+    /**
+     * Calculate the index of the Nth new PATTERN_LINE
+     *
+     * @param indexNewLine New PATTERN_LINE to find
+     * @return Gives the position of the Nth new PATTERN_LINE
+     */
+    public int NewLineIndex(int indexNewLine) {
+        String data = binding.editor.getText().toString();
+        final StringBuffer sb = new StringBuffer(data);
+        List<Integer> myList = new ArrayList<Integer>();
+        myList.add(0);
+        for (int i = 0; i < sb.length(); i++) {
+            if (sb.charAt(i) == '\n')
+                myList.add(i + 1);
+        }
+        return myList.get(indexNewLine - 1);
+    }
+
+    public void goToLine() {
+        new EnterDialog(getContext()).setTitle(getString(R.string.jump_to))
+                .setEnterType(InputType.TYPE_CLASS_NUMBER)
+                .setHint("Line : 1 - " + binding.editor.getLineCount())
+                .setConfirmListener(content -> {
+                    int line;
+                    try {
+                        line = Integer.parseInt(content);
+                        if (line > binding.editor.getLineCount()) {
+                            Toast.makeText(getContext(), R.string.fail_to_goto, Toast.LENGTH_SHORT).show();
+                            return false;
+                        }
+                        int position = NewLineIndex(line);
+                        binding.editor.setSelection(position);
+
+                    } catch (Exception e) {
+                        Toast.makeText(getContext(), R.string.fail_to_goto, Toast.LENGTH_SHORT).show();
+
+                    }
+                    return true;
+                })
+                .show();
+    }
+
+    private String readFile(String pathname) throws IOException {
+
+        File file = new File(pathname);
+        StringBuilder fileContents = new StringBuilder((int) file.length());
+        String lineSeparator = System.getProperty("PATTERN_LINE.separator");
+        if (lineSeparator==null) {
+            lineSeparator = "\n";
+        }
+        try (Scanner scanner = new Scanner(file)) {
+            while (scanner.hasNextLine()) {
+                fileContents.append(scanner.nextLine()).append(lineSeparator);
+            }
+            return fileContents.toString();
+        }
+    }
+
+    public void writeToFile(String filePath, String data) {
+        try {
+            FileOutputStream fOut = new FileOutputStream(filePath);
+            fOut.write(data.getBytes());
+            fOut.flush();
+            fOut.close();
+        } catch (IOException iox) {
+            iox.printStackTrace();
+        }
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/TedOpenRecentActivity.java b/qpython/src/main/java/org/qpython/qpy/texteditor/TedOpenRecentActivity.java
new file mode 100644
index 00000000..ea58d9a6
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/TedOpenRecentActivity.java
@@ -0,0 +1,170 @@
+package org.qpython.qpy.texteditor;
+
+import java.io.File;
+import java.util.ArrayList;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.texteditor.common.Constants;
+import org.qpython.qpy.texteditor.common.RecentFiles;
+import org.qpython.qpy.texteditor.ui.adapter.PathListAdapter;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.ContextMenu;
+import android.view.ContextMenu.ContextMenuInfo;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.AdapterView;
+import android.widget.AdapterView.AdapterContextMenuInfo;
+import android.widget.AdapterView.OnItemClickListener;
+import android.widget.ListAdapter;
+import android.widget.ListView;
+import org.qpython.qpy.texteditor.androidlib.ui.Toaster;
+
+@SuppressWarnings("deprecation")
+public class TedOpenRecentActivity extends Activity implements Constants, OnClickListener,
+		OnItemClickListener {
+
+	protected String mContextPath;
+	/** the dialog's list view */
+	protected ListView mFilesList;
+	/** the list of recent files */
+	protected ArrayList<String> mList;
+
+	/**
+	 * @see android.app.Activity#onCreate(android.os.Bundle)
+	 */
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+
+		// Setup content view
+		setContentView(R.layout.layout_open);
+        setTitle(R.string.ui_history);
+
+		// buttons
+		findViewById(R.id.buttonCancel).setOnClickListener(this);
+
+		// widgets
+		mFilesList = (ListView) findViewById(android.R.id.list);
+		mFilesList.setOnItemClickListener(this);
+		mFilesList.setOnCreateContextMenuListener(this);
+	}
+
+	/**
+	 * @see android.app.Activity#onResume()
+	 */
+	@Override
+	protected void onResume() {
+		super.onResume();
+
+		fillRecentFilesView();
+	}
+
+	/**
+	 * @see android.app.Activity#onCreateContextMenu(android.view.ContextMenu,
+	 *      android.view.View, android.view.ContextMenu.ContextMenuInfo)
+	 */
+	@Override
+	public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) {
+		super.onCreateContextMenu(menu, v, menuInfo);
+		AdapterContextMenuInfo info = (AdapterContextMenuInfo) menuInfo;
+		mContextPath = (String) mFilesList.getAdapter().getItem(info.position);
+
+		menu.setHeaderTitle(mContextPath);
+		menu.add(Menu.NONE, 0, Menu.NONE, R.string.ui_delete);
+	}
+
+	/**
+	 * @see android.app.Activity#onContextItemSelected(android.view.MenuItem)
+	 */
+	@Override
+	public boolean onContextItemSelected(MenuItem item) {
+
+		RecentFiles.removePath(mContextPath);
+		RecentFiles.saveRecentList(getSharedPreferences(PREFERENCES_NAME, MODE_PRIVATE));
+
+		fillRecentFilesView();
+		Toaster.showToast(this, R.string.toast_recent_files_deleted, false);
+
+		return true;
+	}
+
+	/**
+	 * @see android.view.View.OnClickListener#onClick(android.view.View)
+	 */
+	@Override
+	public void onClick(View v) {
+		if (v.getId() == R.id.buttonCancel) {
+			setResult(RESULT_CANCELED);
+			finish();
+		}
+	}
+
+	/**
+	 * @see android.widget.AdapterView.OnItemClickListener#onItemClick(android.widget.AdapterView,
+	 *      android.view.View, int, long)
+	 */
+	@Override
+	public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+		String path;
+
+		path = mList.get(position);
+
+		if (setOpenResult(new File(path))) {
+			finish();
+		} else {
+			RecentFiles.removePath(path);
+			RecentFiles.saveRecentList(getSharedPreferences(PREFERENCES_NAME, MODE_PRIVATE));
+//			((PathListAdapter) mListAdapter).notifyDataSetChanged();
+			Toaster.showToast(this, R.string.toast_recent_files_invalid, true);
+		}
+
+	}
+
+	/**
+	 * Fills the files list with the recent files
+	 *
+	 */
+	protected void fillRecentFilesView() {
+		mList = RecentFiles.getRecentFiles();
+
+		if (mList.size() == 0) {
+			setResult(RESULT_CANCELED);
+			finish();
+			return;
+		}
+
+		// create string list adapter
+//		mListAdapter = new PathListAdapter(this, mList);
+
+		// set adpater
+//		mFilesList.setAdapter(mListAdapter);
+	}
+	/** The list adapter */
+//	protected ListAdapter mListAdapter;
+
+	/**
+	 * Set the result of this activity to open a file
+	 *
+	 * @param file
+	 *            the file to return
+	 * @return if the result was set correctly
+	 */
+	protected boolean setOpenResult(File file) {
+		Intent result;
+
+		if ((file == null) || (!file.isFile()) || (!file.canRead())) {
+			return false;
+		}
+
+		result = new Intent();
+		result.putExtra("path", file.getAbsolutePath());
+
+		setResult(RESULT_OK, result);
+		return true;
+	}
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/TedSaveAsActivity.java b/qpython/src/main/java/org/qpython/qpy/texteditor/TedSaveAsActivity.java
new file mode 100644
index 00000000..c31125a9
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/TedSaveAsActivity.java
@@ -0,0 +1,121 @@
+package org.qpython.qpy.texteditor;
+
+import static org.qpython.qpy.texteditor.androidlib.ui.Toaster.showToast;
+
+import java.io.File;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.texteditor.common.Constants;
+
+import android.content.Intent;
+import android.graphics.drawable.Drawable;
+import android.os.Bundle;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.Button;
+import android.widget.EditText;
+import org.qpython.qpy.texteditor.androidlib.ui.activity.BrowsingActivity;
+
+public class TedSaveAsActivity extends BrowsingActivity implements Constants, OnClickListener {
+
+	/** the edit text input */
+	protected EditText mFileName;
+	/** */
+	protected Drawable mWriteable;
+	/** */
+	protected Drawable mLocked;
+
+	/**
+	 * @see android.app.Activity#onCreate(android.os.Bundle)
+	 */
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+
+		// Setup content view
+		setContentView(R.layout.layout_save_as);
+
+		// buttons
+		findViewById(R.id.buttonCancel).setOnClickListener(this);
+		findViewById(R.id.buttonOk).setOnClickListener(this);
+		((Button) findViewById(R.id.buttonOk)).setText(R.string.ui_save);
+
+		// widgets
+		mFileName = (EditText) findViewById(R.id.editFileName);
+
+		// drawables
+		mWriteable = getResources().getDrawable(R.drawable.checked);
+		mLocked = getResources().getDrawable(R.drawable.ic_editor_file_little);
+	}
+
+	/**
+	 * @see android.view.View.OnClickListener#onClick(android.view.View)
+	 */
+	@Override
+	public void onClick(View v) {
+		if (v.getId() == R.id.buttonCancel) {
+			setResult(RESULT_CANCELED);
+			finish();
+		} else if (v.getId() == R.id.buttonOk) {
+			if (setSaveResult())
+				finish();
+		}
+	}
+
+	/**
+	 */
+	@Override
+	protected void onFileClick(File file) {
+		if (file.canWrite())
+			mFileName.setText(file.getName());
+	}
+
+	/**
+	 */
+	@Override
+	protected boolean onFolderClick(File folder) {
+		return true;
+	}
+
+	/**
+	 */
+	@Override
+	protected void onFolderViewFilled() {
+
+	}
+
+	/**
+	 * Sets the result data when the user presses save
+	 *
+	 * @return if the result is OK (if not, it means the user must change its
+	 *         selection / input)
+	 */
+	@SuppressWarnings("deprecation")
+	protected boolean setSaveResult() {
+		Intent result;
+		String fileName;
+
+		if ((mCurrentFolder == null) || (!mCurrentFolder.exists())) {
+			showToast(this, R.string.toast_folder_doesnt_exist, true);
+			return false;
+		}
+
+		if (!mCurrentFolder.canWrite()) {
+			showToast(this, R.string.toast_folder_cant_write, true);
+			return false;
+		}
+
+		fileName = mFileName.getText().toString();
+		if (fileName.length() == 0) {
+			showToast(this, R.string.toast_filename_empty, true);
+			return false;
+		}
+
+		result = new Intent();
+		result.putExtra("path", mCurrentFolder.getAbsolutePath() + File.separator + fileName);
+
+		setResult(RESULT_OK, result);
+		return true;
+	}
+
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/TedSettingsActivity.java b/qpython/src/main/java/org/qpython/qpy/texteditor/TedSettingsActivity.java
new file mode 100644
index 00000000..db846762
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/TedSettingsActivity.java
@@ -0,0 +1,88 @@
+package org.qpython.qpy.texteditor;
+
+import android.content.ActivityNotFoundException;
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
+import android.databinding.DataBindingUtil;
+import android.os.Build;
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+import android.util.Log;
+import android.view.WindowManager;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.databinding.LayoutPrefsBinding;
+import org.qpython.qpy.main.fragment.TedSettingFragment;
+import org.qpython.qpy.texteditor.common.Constants;
+import org.qpython.qpy.texteditor.common.Settings;
+import org.qpython.qpy.texteditor.widget.crouton.Crouton;
+import org.qpython.qpy.texteditor.widget.crouton.Style;
+
+public class TedSettingsActivity extends AppCompatActivity implements
+		Constants, OnSharedPreferenceChangeListener {
+
+    private TedSettingFragment fragment;
+    protected boolean mPreviousHP;
+    private LayoutPrefsBinding binding;
+    private final String TAG = "TedSettingsActivity";
+
+    public static void start(Context context) {
+        Intent starter = new Intent(context, TedSettingsActivity.class);
+        context.startActivity(starter);
+    }
+
+    /**
+     * @see android.preference.PreferenceActivity#onCreate(android.os.Bundle)
+     */
+
+    @Override
+    protected void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+            WindowManager.LayoutParams localLayoutParams = getWindow().getAttributes();
+            localLayoutParams.flags = (WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS | localLayoutParams.flags);
+        }
+        binding = DataBindingUtil.setContentView(this, R.layout.layout_prefs);
+        binding.topBar.toolbar.setTitle(R.string.settings_label);
+        binding.topBar.toolbar.setNavigationIcon(R.drawable.ic_back);
+        binding.topBar.toolbar.setNavigationOnClickListener(v -> finish());
+
+        binding.sampleEditor.updateFromSettings("");
+        binding.sampleEditor.setEnabled(false);
+
+        fragment = new TedSettingFragment();
+
+        getFragmentManager().beginTransaction()
+                .replace(R.id.setting_fragment, fragment)
+                .commit();
+    }
+
+    @Override
+    public void onSharedPreferenceChanged(SharedPreferences sharedPreferences,
+                                          String key) {
+        Log.d(TAG, "onSharedPreferenceChanged");
+        Settings.updateFromPreferences(sharedPreferences);
+        binding.sampleEditor.updateFromSettings("");
+        fragment.updateSummaries();
+
+        //CheckBoxPreference checkBox = (CheckBoxPreference) findPreference(PREFERENCE_USE_HOME_PAGE);
+        //checkBox.setSummaryOn(Settings.HOME_PAGE_PATH);
+
+        //CheckBoxPreference shareCheck = (CheckBoxPreference) fragment.findPreference(PREFERENCES_GIST);
+//        if (Settings.USE_HOME_PAGE && !mPreviousHP) {
+//            Intent setHomePage = new Intent();
+//            setHomePage.setClass(this, TedOpenActivity.class);
+//            setHomePage.putExtra(EXTRA_REQUEST_CODE, REQUEST_HOME_PAGE);
+//            try {
+//                startActivityForResult(setHomePage, REQUEST_HOME_PAGE);
+//            } catch (ActivityNotFoundException e) {
+//                Crouton.showText(this, R.string.toast_activity_open,
+//                        Style.ALERT);
+//            }
+//        }
+
+        mPreviousHP = Settings.USE_HOME_PAGE;
+    }
+}
\ No newline at end of file
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/TedWidgetConfigActivity.java b/qpython/src/main/java/org/qpython/qpy/texteditor/TedWidgetConfigActivity.java
new file mode 100644
index 00000000..86fd3d3d
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/TedWidgetConfigActivity.java
@@ -0,0 +1,120 @@
+package org.qpython.qpy.texteditor;
+
+import java.io.File;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.texteditor.common.Constants;
+import org.qpython.qpy.texteditor.common.WidgetPrefs;
+
+import android.appwidget.AppWidgetManager;
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.CheckBox;
+import org.qpython.qpy.texteditor.androidlib.data.FileUtils;
+import org.qpython.qpy.texteditor.androidlib.ui.Toaster;
+import org.qpython.qpy.texteditor.androidlib.ui.activity.BrowsingActivity;
+
+@SuppressWarnings("deprecation")
+public class TedWidgetConfigActivity extends BrowsingActivity implements Constants, OnClickListener {
+
+	/** the id of the widget being configured */
+	protected int mAppWidgetId;
+	/** the selected file */
+	protected File mSelectedFile;
+
+	/**
+	 * @see android.app.Activity#onCreate(android.os.Bundle)
+	 */
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		setContentView(R.layout.layout_widget_config);
+
+		setResult(RESULT_CANCELED, null);
+
+		// buttons
+		findViewById(R.id.buttonCancel).setOnClickListener(this);
+
+		Toaster.showToast(this, R.string.toast_widget_select, false);
+	}
+
+	/**
+	 * @see android.app.Activity#onResume()
+	 */
+	@Override
+	protected void onResume() {
+		super.onResume();
+
+		// get widget id
+		Intent intent = getIntent();
+		Bundle extras = intent.getExtras();
+		if (extras != null) {
+			mAppWidgetId = extras.getInt(AppWidgetManager.EXTRA_APPWIDGET_ID,
+					AppWidgetManager.INVALID_APPWIDGET_ID);
+		}
+	}
+
+	/**
+	 * @see android.view.View.OnClickListener#onClick(android.view.View)
+	 */
+	@Override
+	public void onClick(View v) {
+		if (v.getId() == R.id.buttonCancel) {
+			setResult(RESULT_CANCELED);
+			finish();
+		}
+	}
+
+	/**
+	 */
+	@Override
+	protected void onFileClick(File file) {
+		if (file.canRead()) {
+			mSelectedFile = file;
+			setResultComplete();
+		}
+	}
+
+	/**
+	 */
+	@Override
+	protected boolean onFolderClick(File folder) {
+		mSelectedFile = null;
+		return true;
+	}
+
+	/**
+	 */
+	@Override
+	protected void onFolderViewFilled() {
+
+	}
+
+	/**
+	 *
+	 */
+	protected void setResultComplete() {
+		AppWidgetManager appWidgetManager;
+		Intent resultValue;
+		WidgetPrefs prefs;
+		boolean readOnly;
+
+		readOnly = ((CheckBox) findViewById(R.id.readOnly)).isChecked();
+
+		prefs = new WidgetPrefs();
+		prefs.mTargetPath = FileUtils.getCanonizePath(mSelectedFile);
+		prefs.mReadOnly = readOnly;
+		prefs.store(this, mAppWidgetId);
+
+		appWidgetManager = AppWidgetManager.getInstance(this);
+		TedAppWidgetProvider.updateWidget(this, appWidgetManager, mAppWidgetId);
+
+		//
+		resultValue = new Intent();
+		resultValue.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, mAppWidgetId);
+		setResult(RESULT_OK, resultValue);
+		finish();
+	}
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/androidlib/common/ChangeLog.java b/qpython/src/main/java/org/qpython/qpy/texteditor/androidlib/common/ChangeLog.java
new file mode 100644
index 00000000..99fba672
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/androidlib/common/ChangeLog.java
@@ -0,0 +1,162 @@
+package org.qpython.qpy.texteditor.androidlib.common;
+
+import android.app.AlertDialog.Builder;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.SharedPreferences;
+import android.content.SharedPreferences.Editor;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.util.Log;
+
+import org.qpython.qpy.R;
+
+
+/**
+ *  
+ */
+public abstract class ChangeLog {
+
+	private static final String PREFERENCE_LAST_VERSION = "previous_version";
+	private int mCurrentVersion = -1;
+
+	public boolean displayChangeLog(Context context, SharedPreferences prefs) {
+
+		boolean firstLaunch = false;
+
+		if (isFirstLaunch(context, prefs)) {
+			firstLaunch = true;
+
+			Builder builder = new Builder(context);
+
+			String message = context.getString(getTitleResource(context))
+					+ "\n\n" + context.getString(getChangeLogResource(context));
+			builder.setTitle(R.string.ui_whats_new);
+			builder.setMessage(message);
+			builder.setCancelable(true);
+			builder.setPositiveButton(android.R.string.ok,
+					new DialogInterface.OnClickListener() {
+						public void onClick(DialogInterface dialog, int which) {
+							dialog.dismiss();
+						}
+					});
+
+			builder.create().show();
+
+		}
+
+		saveCurrentVersion(context, prefs);
+
+		return firstLaunch;
+	}
+
+	/**
+	 * @param version
+	 *            the version code of the application
+	 * @return the string resource for the title to display in the change log
+	 */
+	public abstract int getTitleResourceForVersion(int version);
+
+	/**
+	 * @param context
+	 *            the current application context
+	 * @return the string resource for the title to display in the change log
+	 */
+	public int getTitleResource(Context context) {
+		int version = getCurrentVersion(context);
+		return getTitleResourceForVersion(version);
+	}
+
+	/**
+	 * @param version
+	 *            the version code of the application
+	 * @return the string resource for the changelog to display in the change
+	 *         log
+	 */
+	public abstract int getChangeLogResourceForVersion(int version);
+
+	/**
+	 * @param context
+	 *            the current application context
+	 * @return the string resource for the changelog to display in the change
+	 *         log
+	 */
+	public int getChangeLogResource(Context context) {
+		int version = getCurrentVersion(context);
+		return getChangeLogResourceForVersion(version);
+	}
+
+	/**
+	 * Warning, this automatically saves the current version, so you only get
+	 * one shot. Then again, I guess that's the idea...
+	 *
+	 * @param context
+	 *            the current application context
+	 * @param prefs
+	 *            the shared preferences to use
+	 * @return if this is the first launch since last update
+	 */
+	public boolean isFirstLaunch(Context context, SharedPreferences prefs) {
+		int previous, current;
+
+		previous = getPreviousVersion(context, prefs);
+		current = getCurrentVersion(context);
+
+		return (previous < current);
+	}
+
+	/**
+	 * @param context
+	 *            the current application context
+	 * @param prefs
+	 *            the shared preferences to use
+	 * @return the previously opened version of the application
+	 */
+	protected int getPreviousVersion(Context context, SharedPreferences prefs) {
+
+		int version = prefs.getInt(PREFERENCE_LAST_VERSION, -1);
+
+		return version;
+	}
+
+	/**
+	 * @param context
+	 *            the current application context
+	 * @return the current installed application version
+	 */
+	protected int getCurrentVersion(Context context) {
+		int version = mCurrentVersion;
+
+		if (version < 0) {
+			try {
+				version = context.getPackageManager().getPackageInfo(
+						context.getPackageName(), 0).versionCode;
+			} catch (NameNotFoundException e) {
+				Log.e("Felix", "Unable to get package info for package name "
+						+ context.getPackageName());
+				version = -1;
+			}
+		}
+
+		if (version >= 0) {
+			mCurrentVersion = version;
+		}
+
+		return version;
+	}
+
+	/**
+	 * Saves the current version for next launch
+	 *
+	 * @param context
+	 *            the current application context
+	 * @param prefs
+	 *            the shared preferences for this app
+	 */
+	public void saveCurrentVersion(Context context, SharedPreferences prefs) {
+		Editor editor = prefs.edit();
+
+		editor.putInt(PREFERENCE_LAST_VERSION, getCurrentVersion(context));
+
+		editor.commit();
+	}
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/androidlib/common/MiscUtils.java b/qpython/src/main/java/org/qpython/qpy/texteditor/androidlib/common/MiscUtils.java
new file mode 100644
index 00000000..38dd070b
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/androidlib/common/MiscUtils.java
@@ -0,0 +1,92 @@
+package org.qpython.qpy.texteditor.androidlib.common;
+
+import android.app.Activity;
+import android.content.ActivityNotFoundException;
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.texteditor.widget.crouton.Crouton;
+import org.qpython.qpy.texteditor.widget.crouton.Style;
+
+//import static com.thefinestartist.utils.content.ContextUtil.getPackageManager;
+//import static com.thefinestartist.utils.content.ContextUtil.startActivity;
+
+/**
+ *
+ */
+public class MiscUtils {
+
+    /**
+     * Start an email composer to send an email
+     *
+     * @param ctx    the current context
+     * @param object the title of the mail to compose
+     */
+    public static void sendEmail(Context ctx, CharSequence object) {
+        Intent email = new Intent(Intent.ACTION_SEND);
+        email.setType("text/plain");
+        email.putExtra(Intent.EXTRA_EMAIL, new String[]{ctx.getResources()
+                .getString(R.string.ui_mail)});
+        email.putExtra(Intent.EXTRA_SUBJECT, object);
+        ctx.startActivity(Intent.createChooser(email,
+                ctx.getString(R.string.ui_choose_mail)));
+    }
+
+    public static void sendEMailTo(Context ctx,String toAdd, String defaultText) {
+        Intent emailIntent = new Intent(Intent.ACTION_SEND);
+        emailIntent.setType("text/plain");
+//        emailIntent.setData(Uri.parse("mailto:"));
+        emailIntent.putExtra(Intent.EXTRA_EMAIL, toAdd);
+        emailIntent.putExtra(Intent.EXTRA_SUBJECT, defaultText);
+        if (emailIntent.resolveActivity(ctx.getPackageManager()) != null) {
+            ctx.startActivity(emailIntent);
+        }
+    }
+
+    /**
+     * Open the market on my apps
+     *
+     * @param activity the calling activity
+     */
+    public static void openMarket(Activity activity) {
+        String url;
+        Intent market = new Intent(Intent.ACTION_VIEW);
+        // market.setData(Uri.parse("market://search?q=pub:Xavier Gouchet"));
+        url = activity.getResources().getString(R.string.ui_market_url);
+        market.setData(Uri.parse(url));
+        try {
+            activity.startActivity(market);
+        } catch (ActivityNotFoundException e) {
+            Crouton.showText(activity, R.string.toast_no_market, Style.ALERT);
+        }
+    }
+
+    /**
+     * Open the market on this app
+     *
+     * @param activity   the calling activity
+     * @param appPackage the application package name
+     */
+    public static void openMarketApp(Activity activity, CharSequence appPackage) {
+        String url;
+        Intent market = new Intent(Intent.ACTION_VIEW);
+        url = activity.getResources().getString(R.string.ui_market_app_url,
+                appPackage);
+        market.setData(Uri.parse(url));
+        try {
+            activity.startActivity(market);
+        } catch (ActivityNotFoundException e) {
+            Crouton.showText(activity, R.string.toast_no_market, Style.ALERT);
+        }
+    }
+
+    public static void share(Context context,String text) {
+        Intent sendIntent = new Intent();
+        sendIntent.setAction(Intent.ACTION_SEND);
+        sendIntent.putExtra(Intent.EXTRA_TEXT, text);
+        sendIntent.setType("text/plain");
+        context.startActivity(sendIntent);
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/androidlib/common/UIUtils.java b/qpython/src/main/java/org/qpython/qpy/texteditor/androidlib/common/UIUtils.java
new file mode 100644
index 00000000..c188acb9
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/androidlib/common/UIUtils.java
@@ -0,0 +1,23 @@
+package org.qpython.qpy.texteditor.androidlib.common;
+
+import android.content.Context;
+
+/**
+ * 
+ */
+public class UIUtils {
+
+	/**
+	 * @param context
+	 *            the current application context
+	 * @param dp
+	 *            the dip value to convert
+	 * @return the px value corresponding to the given dip
+	 */
+	public static int getPxFromDp(Context context, int dp) {
+		float scale = context.getResources().getDisplayMetrics().density;
+
+		return ((int) ((dp * scale) + 0.5f));
+
+	}
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/androidlib/comparator/ComparatorFilesAlpha.java b/qpython/src/main/java/org/qpython/qpy/texteditor/androidlib/comparator/ComparatorFilesAlpha.java
new file mode 100644
index 00000000..bc5f954b
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/androidlib/comparator/ComparatorFilesAlpha.java
@@ -0,0 +1,36 @@
+package org.qpython.qpy.texteditor.androidlib.comparator;
+
+import android.annotation.SuppressLint;
+import java.io.File;
+import java.util.Comparator;
+
+/**
+ * Compare files Alphabetically (w/ folders listed first)
+ * 
+ * @author x.gouchet
+ * 
+ */
+@SuppressLint("DefaultLocale")
+public class ComparatorFilesAlpha implements Comparator<File> {
+
+	/**
+	 * @see Comparator#compare(Object, Object)
+	 */
+	public int compare(File file1, File file2) {
+		int result;
+
+		// sort folders first
+		if ((file1.isDirectory()) && (!file2.isDirectory())) {
+			result = -1;
+		} else if ((!file1.isDirectory()) && (file2.isDirectory())) {
+			result = 1;
+		} else {
+			// here both are folders or both are files : sort alpha
+			result = file1.getName().toLowerCase()
+					.compareTo(file2.getName().toLowerCase());
+		}
+
+		return result;
+	}
+
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/androidlib/comparator/ComparatorFilesDate.java b/qpython/src/main/java/org/qpython/qpy/texteditor/androidlib/comparator/ComparatorFilesDate.java
new file mode 100644
index 00000000..29fcdf62
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/androidlib/comparator/ComparatorFilesDate.java
@@ -0,0 +1,44 @@
+package org.qpython.qpy.texteditor.androidlib.comparator;
+
+import android.annotation.SuppressLint;
+import java.io.File;
+import java.util.Comparator;
+
+/**
+ * Compare files by date (w/ folders listed first)
+ * 
+ * @author x.gouchet
+ * 
+ */
+@SuppressLint("DefaultLocale")
+public class ComparatorFilesDate implements Comparator<File> {
+	/**
+	 * @see Comparator#compare(Object, Object)
+	 */
+	public int compare(File file1, File file2) {
+		int result;
+
+		// sort folders first
+		if ((file1.isDirectory()) && (!file2.isDirectory())) {
+			result = -1;
+		} else if ((!file1.isDirectory()) && (file2.isDirectory())) {
+			result = 1;
+		} else {
+
+			// both are files, or both are folders...
+			// get modif date
+			long modif1 = file1.lastModified();
+			long modif2 = file2.lastModified();
+
+			// same extension, we sort alphabetically
+			if (modif1 == modif2) {
+				result = file1.getName().toLowerCase()
+						.compareTo(file2.getName().toLowerCase());
+			} else {
+				result = (int) (modif1 - modif2);
+			}
+		}
+
+		return result;
+	}
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/androidlib/comparator/ComparatorFilesSize.java b/qpython/src/main/java/org/qpython/qpy/texteditor/androidlib/comparator/ComparatorFilesSize.java
new file mode 100644
index 00000000..fc128139
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/androidlib/comparator/ComparatorFilesSize.java
@@ -0,0 +1,47 @@
+package org.qpython.qpy.texteditor.androidlib.comparator;
+
+import android.annotation.SuppressLint;
+import java.io.File;
+import java.util.Comparator;
+
+/**
+ * Compare files by size (w/ folders listed first)
+ * 
+ * @author x.gouchet
+ * 
+ */
+@SuppressLint("DefaultLocale")
+public class ComparatorFilesSize implements Comparator<File> {
+	/**
+	 * @see Comparator#compare(Object, Object)
+	 */
+	public int compare(File file1, File file2) {
+		int result;
+
+		// sort folders first
+		if ((file1.isDirectory()) && (!file2.isDirectory())) {
+			result = -1;
+		} else if ((!file1.isDirectory()) && (file2.isDirectory())) {
+			result = 1;
+		} else if ((file1.isDirectory()) && (file2.isDirectory())) {
+			// if both are folders
+			result = file1.getName().toLowerCase()
+					.compareTo(file2.getName().toLowerCase());
+		} else {
+
+			// both are files, we get the sizes
+			long size1 = file1.length();
+			long size2 = file2.length();
+
+			// same extension, we sort alphabetically
+			if (size1 == size2) {
+				result = file1.getName().toLowerCase()
+						.compareTo(file2.getName().toLowerCase());
+			} else {
+				result = (int) (size1 - size2);
+			}
+		}
+
+		return result;
+	}
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/androidlib/comparator/ComparatorFilesType.java b/qpython/src/main/java/org/qpython/qpy/texteditor/androidlib/comparator/ComparatorFilesType.java
new file mode 100644
index 00000000..db7278da
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/androidlib/comparator/ComparatorFilesType.java
@@ -0,0 +1,48 @@
+package org.qpython.qpy.texteditor.androidlib.comparator;
+
+import android.annotation.SuppressLint;
+import java.io.File;
+import java.util.Comparator;
+
+/**
+ * Compare files by type (w/ folders listed first)
+ * 
+ * @author x.gouchet
+ * 
+ */
+@SuppressLint("DefaultLocale")
+public class ComparatorFilesType implements Comparator<File> {
+	/**
+	 * @see Comparator#compare(Object, Object)
+	 */
+	public int compare(File file1, File file2) {
+		int result;
+
+		// sort folders first
+		if ((file1.isDirectory()) && (!file2.isDirectory())) {
+			result = -1;
+		} else if ((!file1.isDirectory()) && (file2.isDirectory())) {
+			result = 1;
+		} else if ((file1.isDirectory()) && (file2.isDirectory())) {
+			// if both are folders
+			result = file1.getName().toLowerCase()
+					.compareTo(file2.getName().toLowerCase());
+		} else {
+			// both are files, we get the extension
+			String ext1 = file1.getName().substring(
+					file1.getName().lastIndexOf('.') + 1);
+			String ext2 = file2.getName().substring(
+					file2.getName().lastIndexOf('.') + 1);
+
+			// same extension, we sort alphabetically
+			if (ext1.equalsIgnoreCase(ext2)) {
+				result = file1.getName().toLowerCase()
+						.compareTo(file2.getName().toLowerCase());
+			} else {
+				result = ext1.toLowerCase().compareTo(ext2.toLowerCase());
+			}
+		}
+
+		return result;
+	}
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/androidlib/data/FileUtils.java b/qpython/src/main/java/org/qpython/qpy/texteditor/androidlib/data/FileUtils.java
new file mode 100644
index 00000000..58b343f4
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/androidlib/data/FileUtils.java
@@ -0,0 +1,531 @@
+package org.qpython.qpy.texteditor.androidlib.data;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.channels.FileChannel;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.content.res.AssetManager;
+import android.os.Environment;
+import android.util.Log;
+import android.webkit.MimeTypeMap;
+
+@SuppressLint("DefaultLocale")
+public class FileUtils {
+	/** File of the external storage data */
+	public static final File STORAGE = Environment
+			.getExternalStorageDirectory();
+	/** Path to the external storage data */
+	public static final String STORAGE_PATH = STORAGE.getAbsolutePath();
+
+	/** default android Download folder */
+	public static final String DOWNLOAD_FOLDER = (STORAGE.getAbsolutePath()
+			+ File.separator + "Download");
+
+	/**
+	 * Copy all files in the given asset folder to the destination folder (must
+	 * be in the app's sandbox, unless the app has the write to external storage
+	 * permission)
+	 * 
+	 * @param ctx
+	 *            the current application context
+	 * @param destFolder
+	 *            the destination folder
+	 * @param assetFolder
+	 *            the source folder path (from the asset folder)
+	 */
+	public static void copyAssetsToAppData(Context ctx, File destFolder,
+			String assetFolder) {
+
+		String files[] = null;
+		InputStream assetStream;
+		File file;
+		String assetFile;
+
+		AssetManager assets = ctx.getAssets();
+
+		try {
+			files = assets.list(assetFolder);
+		} catch (IOException e) {
+			Log.w("AndroidLib", "Asset folder not found");
+		}
+
+		if (files != null) {
+			for (String fileName : files) {
+				file = new File(destFolder, fileName);
+
+				assetFile = assetFolder + File.separatorChar + fileName;
+				try {
+					file.getParentFile().mkdirs();
+					assetStream = assets.open(assetFile);
+					FileUtils.copyFile(assetStream, file);
+				} catch (IOException e) {
+					Log.w("AndroidLib", "unable to copy file " + fileName);
+				}
+			}
+		}
+	}
+
+	/**
+	 * 
+	 * @param file
+	 *            the file to test
+	 * @return if a file is a symbolic link
+	 */
+	public static boolean isSymLink(File file) {
+		boolean result;
+		result = false;
+
+		if ((file != null) && file.exists()) {
+			File canon, canonParent;
+			if (file.getParent() == null) {
+				canon = file;
+			} else {
+				try {
+					canonParent = file.getParentFile().getCanonicalFile();
+					canon = new File(canonParent, file.getName());
+				} catch (IOException e) {
+					canon = null;
+				}
+			}
+
+			try {
+				if (canon != null) {
+					result = !canon.getCanonicalFile().equals(
+							canon.getAbsoluteFile());
+				}
+			} catch (IOException e) {
+				result = false;
+			}
+		}
+
+		return result;
+	}
+
+	/**
+	 * 
+	 * @param file
+	 *            the symbolic link file
+	 * @return the target of the link
+	 */
+	public static File getSymLinkTarget(File file) {
+		File result;
+
+		result = file;
+
+		if ((file != null) && file.exists()) {
+			File canon, canonParent;
+			if (file.getParent() == null) {
+				canon = file;
+			} else {
+				try {
+					canonParent = file.getParentFile().getCanonicalFile();
+					canon = new File(canonParent, file.getName());
+				} catch (IOException e) {
+					canon = null;
+				}
+			}
+
+			try {
+				if (canon != null) {
+					result = canon.getCanonicalFile();
+				}
+			} catch (IOException e) {
+				result = file;
+			}
+		}
+
+		return result;
+	}
+
+	/**
+	 * 
+	 * @param file
+	 *            the file
+	 * @return the file extension (folders return an empty extension, whatever
+	 *         the name)
+	 */
+	public static String getFileExtension(File file) {
+		String ext, name;
+		int index;
+
+		ext = "";
+		if (!file.isDirectory()) {
+			name = file.getName();
+			index = name.lastIndexOf(".");
+			if (index != -1) {
+				ext = name.substring(index + 1).toLowerCase();
+			}
+		}
+		return ext;
+	}
+
+	/**
+	 * 
+	 * @param file
+	 *            the file
+	 * @return the file extension (folders return an empty extension, whatever
+	 *         the name)
+	 */
+	public static String getFileExtension(String filename) {
+		String ext;
+		int index;
+
+		ext = "";
+		if (filename != null) {
+			index = filename.lastIndexOf(".");
+			if (index != -1) {
+				ext = filename.substring(index + 1).toLowerCase();
+			}
+		}
+		return ext;
+	}
+
+	/**
+	 * 
+	 * @param file
+	 *            the file
+	 * @return the file prefix or the name if the file is a directory
+	 */
+	public static String getFilePrefix(File file) {
+		String prefix, name;
+		int index;
+
+		prefix = file.getName();
+		name = file.getName();
+		if (!file.isDirectory()) {
+			index = name.lastIndexOf(".");
+			if (index != -1) {
+				prefix = name.substring(0, index);
+			}
+		}
+		return prefix;
+	}
+
+	/**
+	 * @param file
+	 *            the file name
+	 * @return the Mime Type
+	 */
+	public static String getMimeType(File file) {
+
+		String type;
+		String ext;
+
+		ext = getFileExtension(file);
+		type = MimeTypeMap.getSingleton().getMimeTypeFromExtension(
+				ext.toLowerCase());
+		if (type == null) {
+			type = MimeTypeMapEnhanced.getMimeTypeFromExtension(ext
+					.toLowerCase());
+		}
+
+		if (type == null) {
+			type = "?/?";
+		}
+
+		return type;
+	}
+
+	/**
+	 * @param f
+	 *            a file
+	 * @return the canonical path of the file if possible, or the uncanonized
+	 *         path
+	 */
+	public static String getCanonizePath(File f) {
+		String path;
+		try {
+			path = f.getCanonicalPath();
+		} catch (IOException e) {
+			path = f.getPath();
+			Log.w("AndroidLib",
+					"Error while canonizing file path, using raw path instead : \""
+							+ path + "\"");
+		}
+		return path;
+	}
+
+	/**
+	 * Creates a new folder in the given parent folder
+	 * 
+	 * @param parent
+	 *            the parent file for the folder
+	 * @param name
+	 *            the name of the folder to create
+	 * @return if the folder was created
+	 */
+	public static boolean createFolder(File parent, String name) {
+		File folder;
+		boolean created;
+
+		created = false;
+		folder = new File(parent, name);
+		if (parent.canWrite() && folder.mkdirs()) {
+			created = true;
+		}
+
+		return created;
+	}
+
+	/**
+	 * Creates a new file in the given parent folder
+	 * 
+	 * @param parent
+	 *            the parent file for the folder
+	 * @param name
+	 *            the name of the file to create
+	 * @return if the file was created
+	 */
+	public static boolean createFile(File parent, String name) {
+		File file;
+		boolean created;
+
+		created = false;
+		file = new File(parent, name);
+		if (parent.canWrite()) {
+			try {
+				file.createNewFile();
+				created = true;
+			} catch (IOException e) {
+				e.printStackTrace();
+			}
+		}
+
+		return created;
+	}
+
+	/**
+	 * Delete the given file/folder
+	 * 
+	 * @param file
+	 *            the file/folder to delete
+	 * @return if the file/folder was deleted successfully
+	 */
+	public static boolean deleteItem(File file) {
+		boolean result;
+
+		if (!file.exists()) {
+			result = true;
+		} else if (!file.canWrite()) {
+			result = false;
+		} else {
+			result = file.delete();
+		}
+
+		return result;
+	}
+
+	/**
+	 * Delete the given folder with all its content
+	 * 
+	 * @param folder
+	 *            the folder to delete
+	 * @return if the folder was deleted successfully
+	 */
+	public static boolean deleteRecursiveFolder(File folder) {
+		boolean result;
+
+		if (folder == null) {
+			result = false;
+		} else {
+
+			File[] files = folder.listFiles();
+			// usually if the folder is a file or has no children
+			if (files == null) {
+				result = folder.delete();
+			} else {
+				boolean ok = true;
+				boolean fileOk;
+				for (File child : files) {
+					if (child.isDirectory()) {
+						fileOk = deleteRecursiveFolder(child);
+					} else {
+						fileOk = child.delete();
+					}
+
+					if (!fileOk) {
+						Log.w("", "Error deleting file " + child.getName());
+					}
+					ok = ok && fileOk;
+				}
+				if (ok) {
+					result = folder.delete();
+				} else {
+					result = false;
+				}
+			}
+		}
+
+		return result;
+	}
+
+	/**
+	 * Delete the file/folder at the given path
+	 * 
+	 * @param path
+	 *            the path of the file/folder to delete
+	 * @return if the file/folder was deleted successfully
+	 */
+	public static boolean deleteItem(String path) {
+		File file;
+		boolean result;
+
+		file = new File(path);
+
+		if (!file.exists()) {
+			result = true;
+		} else if (!file.canWrite()) {
+			result = false;
+		} else {
+			result = file.delete();
+		}
+
+		return result;
+	}
+
+	/**
+	 * 
+	 * @param src
+	 *            the source file
+	 * @param dst
+	 *            the destination file
+	 * @return if the copy was successfull
+	 */
+	public static boolean copyFile(File src, File dst) {
+
+		FileChannel inChannel = null;
+		FileChannel outChannel = null;
+
+		boolean complete = true;
+
+		try {
+			inChannel = new FileInputStream(src).getChannel();
+			outChannel = new FileOutputStream(dst).getChannel();
+		} catch (FileNotFoundException e) {
+			Log.w("AndroidLib", "File not found or no R/W permission", e);
+			complete = false;
+		}
+
+		try {
+			inChannel.transferTo(0, inChannel.size(), outChannel);
+		} catch (Exception e) {
+			Log.w("AndroidLib", "Error during copy", e);
+			complete = false;
+		}
+
+		try {
+			if (inChannel != null) {
+				inChannel.close();
+			}
+			if (outChannel != null) {
+				outChannel.close();
+			}
+		} catch (IOException e) {
+			Log.w("AndroidLib", "Error when closing files", e);
+			complete = false;
+		}
+
+		return complete;
+	}
+
+	/**
+	 * 
+	 * @param src
+	 *            the source input stream
+	 * @param dst
+	 *            the destination output
+	 * @return if the copy was successfull
+	 */
+	public static boolean copyFile(InputStream inputStream, File dst) {
+
+		FileOutputStream outputStream = null;
+		byte[] buf = new byte[1024];
+		int len;
+
+		boolean complete = true;
+
+		try {
+			outputStream = new FileOutputStream(dst);
+		} catch (FileNotFoundException e) {
+			Log.w("AndroidLib", "File not found or no R/W permission", e);
+			complete = false;
+		}
+
+		try {
+			while ((len = inputStream.read(buf)) > 0) {
+				outputStream.write(buf, 0, len);
+			}
+		} catch (Exception e) {
+			Log.w("AndroidLib", "Error during copy", e);
+			complete = false;
+		}
+
+		try {
+			if (inputStream != null) {
+				inputStream.close();
+			}
+			if (outputStream != null) {
+				outputStream.close();
+			}
+		} catch (IOException e) {
+			Log.w("AndroidLib", "Error when closing files", e);
+			complete = false;
+		}
+
+		return complete;
+	}
+
+	/**
+	 * Rename a file
+	 * 
+	 * @param file
+	 *            the file/folder to rename
+	 * @param newName
+	 *            the new name to the file
+	 * @return if the rename was succesfull
+	 */
+	public static boolean renameItem(File file, String newName) {
+		File newFile;
+		boolean result;
+
+		if ((!file.exists()) || (!file.canWrite())) {
+			result = false;
+		} else {
+			newFile = new File(file.getParentFile(), newName);
+			result = file.renameTo(newFile);
+		}
+
+		return result;
+	}
+
+	/**
+	 * Rename a file
+	 * 
+	 * @param oldPath
+	 *            the path of the file/folder to rename
+	 * @param newPath
+	 *            the new path to the file/folder
+	 * @return if the rename was succesfull
+	 */
+	public static boolean renameItem(String oldPath, String newPath) {
+		File file, newFile;
+		boolean result;
+
+		file = new File(oldPath);
+
+		if ((!file.exists()) || (!file.canWrite())) {
+			result = false;
+		} else {
+			newFile = new File(newPath);
+			result = file.renameTo(newFile);
+		}
+
+		return result;
+	}
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/androidlib/data/MimeTypeMapEnhanced.java b/qpython/src/main/java/org/qpython/qpy/texteditor/androidlib/data/MimeTypeMapEnhanced.java
new file mode 100644
index 00000000..38d1d7cb
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/androidlib/data/MimeTypeMapEnhanced.java
@@ -0,0 +1,684 @@
+package org.qpython.qpy.texteditor.androidlib.data;
+
+import java.util.Hashtable;
+
+/**
+ * Enhanced myme types detection
+ */
+public class MimeTypeMapEnhanced {
+
+	/** map */
+	private static Hashtable<String, String> MAP;
+
+	/**
+	 * Constructor (private)
+	 */
+	private MimeTypeMapEnhanced() {
+	}
+
+	/**
+	 * @return the binding between file extension and Mime type
+	 */
+	private static Hashtable<String, String> getMap() {
+		if (MAP == null) {
+			MAP = new Hashtable<String, String>();
+			MAP.put("3dm", "x-world/x-3dmf");
+			MAP.put("3dmf", "x-world/x-3dmf");
+			MAP.put("7z", "application/x-compressed");
+			MAP.put("a", "application/octet-stream");
+			MAP.put("aab", "application/x-authorware-bin");
+			MAP.put("aam", "application/x-authorware-map");
+			MAP.put("aas", "application/x-authorware-seg");
+			MAP.put("abc", "text/vnd.abc");
+			MAP.put("acgi", "text/html");
+			MAP.put("afl", "video/animaflex");
+			MAP.put("ai", "application/postscript");
+			MAP.put("aif", "audio/aiff");
+			MAP.put("aif", "audio/x-aiff");
+			MAP.put("aifc", "audio/aiff");
+			MAP.put("aifc", "audio/x-aiff");
+			MAP.put("aiff", "audio/aiff");
+			MAP.put("aiff", "audio/x-aiff");
+			MAP.put("aim", "application/x-aim");
+			MAP.put("aip", "text/x-audiosoft-intra");
+			MAP.put("aks", "text/x-alkwarel-src");
+			MAP.put("ani", "application/x-navi-animation");
+			MAP.put("aos",
+					"application/x-nokia-9000-communicator-add-on-software");
+			MAP.put("aps", "application/mime");
+			MAP.put("arc", "application/octet-stream");
+			MAP.put("arj", "application/arj");
+			MAP.put("arj", "application/octet-stream");
+			MAP.put("art", "image/x-jg");
+			MAP.put("asf", "video/x-ms-asf");
+			MAP.put("asm", "text/x-asm");
+			MAP.put("asp", "text/asp");
+			MAP.put("asx", "application/x-mplayer2");
+			MAP.put("asx", "video/x-ms-asf");
+			MAP.put("asx", "video/x-ms-asf-plugin");
+			MAP.put("au", "audio/basic");
+			MAP.put("au", "audio/x-au");
+			MAP.put("avi", "application/x-troff-msvideo");
+			MAP.put("avi", "video/avi");
+			MAP.put("avi", "video/msvideo");
+			MAP.put("avi", "video/x-msvideo");
+			MAP.put("avs", "video/avs-video");
+			MAP.put("bcpio", "application/x-bcpio");
+			MAP.put("bin", "application/mac-binary");
+			MAP.put("bin", "application/macbinary");
+			MAP.put("bin", "application/octet-stream");
+			MAP.put("bin", "application/x-binary");
+			MAP.put("bin", "application/x-macbinary");
+			MAP.put("bm", "image/bmp");
+			MAP.put("bmp", "image/bmp");
+			MAP.put("bmp", "image/x-windows-bmp");
+			MAP.put("boo", "application/book");
+			MAP.put("book", "application/book");
+			MAP.put("boz", "application/x-bzip2");
+			MAP.put("bsh", "application/x-bsh");
+			MAP.put("bz", "application/x-bzip");
+			MAP.put("bz2", "application/x-bzip2");
+			MAP.put("c", "text/plain");
+			MAP.put("c", "text/x-c");
+			MAP.put("c++", "text/plain");
+			MAP.put("cat", "application/vnd.ms-pki.seccat");
+			MAP.put("cc", "text/plain");
+			MAP.put("cc", "text/x-c");
+			MAP.put("ccad", "application/clariscad");
+			MAP.put("cco", "application/x-cocoa");
+			MAP.put("cdf", "application/cdf");
+			MAP.put("cdf", "application/x-cdf");
+			MAP.put("cdf", "application/x-netcdf");
+			MAP.put("cer", "application/pkix-cert");
+			MAP.put("cer", "application/x-x509-ca-cert");
+			MAP.put("cha", "application/x-chat");
+			MAP.put("chat", "application/x-chat");
+			MAP.put("class", "application/java");
+			MAP.put("class", "application/java-byte-code");
+			MAP.put("class", "application/x-java-class");
+			MAP.put("com", "application/octet-stream");
+			MAP.put("com", "text/plain");
+			MAP.put("conf", "text/plain");
+			MAP.put("cpio", "application/x-cpio");
+			MAP.put("cpp", "text/x-c");
+			MAP.put("cpt", "application/mac-compactpro");
+			MAP.put("cpt", "application/x-compactpro");
+			MAP.put("cpt", "application/x-cpt");
+			MAP.put("crl", "application/pkcs-crl");
+			MAP.put("crl", "application/pkix-crl");
+			MAP.put("crt", "application/pkix-cert");
+			MAP.put("crt", "application/x-x509-ca-cert");
+			MAP.put("crt", "application/x-x509-user-cert");
+			MAP.put("csh", "application/x-csh");
+			MAP.put("csh", "text/x-script.csh");
+			MAP.put("css", "application/x-pointplus");
+			MAP.put("css", "text/css");
+			MAP.put("cxx", "text/plain");
+			MAP.put("dcr", "application/x-director");
+			MAP.put("db", "application/octet-stream");
+			MAP.put("deepv", "application/x-deepv");
+			MAP.put("def", "text/plain");
+			MAP.put("der", "application/x-x509-ca-cert");
+			MAP.put("dif", "video/x-dv");
+			MAP.put("dir", "application/x-director");
+			MAP.put("dl", "video/dl");
+			MAP.put("dl", "video/x-dl");
+			MAP.put("doc", "application/msword");
+			MAP.put("dot", "application/msword");
+			MAP.put("dp", "application/commonground");
+			MAP.put("drw", "application/drafting");
+			MAP.put("dtd", "application/xml-dtd");
+			MAP.put("dump", "application/octet-stream");
+			MAP.put("dv", "video/x-dv");
+			MAP.put("dvi", "application/x-dvi");
+			MAP.put("dwf", "drawing/x-dwf (old)");
+			MAP.put("dwf", "model/vnd.dwf");
+			MAP.put("dwg", "application/acad");
+			MAP.put("dwg", "image/vnd.dwg");
+			MAP.put("dwg", "image/x-dwg");
+			MAP.put("dxf", "application/dxf");
+			MAP.put("dxf", "image/vnd.dwg");
+			MAP.put("dxf", "image/x-dwg");
+			MAP.put("dxr", "application/x-director");
+			MAP.put("el", "text/x-script.elisp");
+			MAP.put("elc", "application/x-bytecode.elisp (compiled elisp)");
+			MAP.put("elc", "application/x-elc");
+			MAP.put("env", "application/x-envoy");
+			MAP.put("eps", "application/postscript");
+			MAP.put("es", "application/x-esrehber");
+			MAP.put("etx", "text/x-setext");
+			MAP.put("evy", "application/envoy");
+			MAP.put("evy", "application/x-envoy");
+			MAP.put("exe", "application/octet-stream");
+			MAP.put("f", "text/plain");
+			MAP.put("f", "text/x-fortran");
+			MAP.put("f77", "text/x-fortran");
+			MAP.put("f90", "text/plain");
+			MAP.put("f90", "text/x-fortran");
+			MAP.put("fdf", "application/vnd.fdf");
+			MAP.put("fif", "application/fractals");
+			MAP.put("fif", "image/fif");
+			MAP.put("fli", "video/fli");
+			MAP.put("fli", "video/x-fli");
+			MAP.put("flo", "image/florian");
+			MAP.put("flx", "text/vnd.fmi.flexstor");
+			MAP.put("fmf", "video/x-atomic3d-feature");
+			MAP.put("for", "text/plain");
+			MAP.put("for", "text/x-fortran");
+			MAP.put("fpx", "image/vnd.fpx");
+			MAP.put("fpx", "image/vnd.net-fpx");
+			MAP.put("frl", "application/freeloader");
+			MAP.put("funk", "audio/make");
+			MAP.put("g", "text/plain");
+			MAP.put("g3", "image/g3fax");
+			MAP.put("gif", "image/gif");
+			MAP.put("gl", "video/gl");
+			MAP.put("gl", "video/x-gl");
+			MAP.put("gsd", "audio/x-gsm");
+			MAP.put("gsm", "audio/x-gsm");
+			MAP.put("gsp", "application/x-gsp");
+			MAP.put("gss", "application/x-gss");
+			MAP.put("gtar", "application/x-gtar");
+			MAP.put("gz", "application/x-compressed");
+			MAP.put("gzip", "application/x-compressed");
+			MAP.put("h", "text/plain");
+			MAP.put("h", "text/x-h");
+			MAP.put("hdf", "application/x-hdf");
+			MAP.put("help", "application/x-helpfile");
+			MAP.put("hgl", "application/vnd.hp-hpgl");
+			MAP.put("hh", "text/plain");
+			MAP.put("hh", "text/x-h");
+			MAP.put("hlb", "text/x-script");
+			MAP.put("hlp", "application/hlp");
+			MAP.put("hlp", "application/x-helpfile");
+			MAP.put("hlp", "application/x-winhelp");
+			MAP.put("hpg", "application/vnd.hp-hpgl");
+			MAP.put("hpgl", "application/vnd.hp-hpgl");
+			MAP.put("hqx", "application/binhex");
+			MAP.put("hqx", "application/binhex4");
+			MAP.put("hqx", "application/mac-binhex");
+			MAP.put("hqx", "application/mac-binhex40");
+			MAP.put("hqx", "application/x-binhex40");
+			MAP.put("hqx", "application/x-mac-binhex40");
+			MAP.put("hta", "application/hta");
+			MAP.put("htc", "text/x-component");
+			MAP.put("htm", "text/html");
+			MAP.put("html", "text/html");
+			MAP.put("htmls", "text/html");
+			MAP.put("htt", "text/webviewhtml");
+			MAP.put("htx", "text/html");
+			MAP.put("ice", "x-conference/x-cooltalk");
+			MAP.put("ico", "image/x-icon");
+			MAP.put("idc", "text/plain");
+			MAP.put("ief", "image/ief");
+			MAP.put("iefs", "image/ief");
+			MAP.put("iges", "application/iges");
+			MAP.put("iges", "model/iges");
+			MAP.put("igs", "application/iges");
+			MAP.put("igs", "model/iges");
+			MAP.put("ima", "application/x-ima");
+			MAP.put("imap", "application/x-httpd-imap");
+			MAP.put("inf", "application/inf");
+			MAP.put("ins", "application/x-internett-signup");
+			MAP.put("ip", "application/x-ip2");
+			MAP.put("isu", "video/x-isvideo");
+			MAP.put("it", "audio/it");
+			MAP.put("iv", "application/x-inventor");
+			MAP.put("ivr", "i-world/i-vrml");
+			MAP.put("ivy", "application/x-livescreen");
+			MAP.put("jam", "audio/x-jam");
+			MAP.put("jar", "application/java-archive");
+			MAP.put("jav", "text/plain");
+			MAP.put("jav", "text/x-java-source");
+			MAP.put("java", "text/plain");
+			MAP.put("java", "text/x-java-source");
+			MAP.put("jcm", "application/x-java-commerce");
+			MAP.put("jfif", "image/jpeg");
+			MAP.put("jfif", "image/pjpeg");
+			MAP.put("jfif-tbnl", "image/jpeg");
+			MAP.put("jpe", "image/jpeg");
+			MAP.put("jpe", "image/pjpeg");
+			MAP.put("jpeg", "image/jpeg");
+			MAP.put("jpeg", "image/pjpeg");
+			MAP.put("jpg", "image/jpeg");
+			MAP.put("jpg", "image/pjpeg");
+			MAP.put("jps", "image/x-jps");
+			MAP.put("js", "application/x-javascript");
+			MAP.put("jut", "image/jutvision");
+			MAP.put("kar", "audio/midi");
+			MAP.put("kar", "music/x-karaoke");
+			MAP.put("ksh", "application/x-ksh");
+			MAP.put("ksh", "text/x-script.ksh");
+			MAP.put("la", "audio/nspaudio");
+			MAP.put("la", "audio/x-nspaudio");
+			MAP.put("lam", "audio/x-liveaudio");
+			MAP.put("latex", "application/x-latex");
+			MAP.put("lha", "application/lha");
+			MAP.put("lha", "application/octet-stream");
+			MAP.put("lha", "application/x-lha");
+			MAP.put("lhx", "application/octet-stream");
+			MAP.put("list", "text/plain");
+			MAP.put("lma", "audio/nspaudio");
+			MAP.put("lma", "audio/x-nspaudio");
+			MAP.put("log", "text/plain");
+			MAP.put("lsp", "application/x-lisp");
+			MAP.put("lsp", "text/x-script.lisp");
+			MAP.put("lst", "text/plain");
+			MAP.put("lsx", "text/x-la-asf");
+			MAP.put("ltx", "application/x-latex");
+			MAP.put("lzh", "application/octet-stream");
+			MAP.put("lzh", "application/x-lzh");
+			MAP.put("lzx", "application/lzx");
+			MAP.put("lzx", "application/octet-stream");
+			MAP.put("lzx", "application/x-lzx");
+			MAP.put("m", "text/plain");
+			MAP.put("m", "text/x-m");
+			MAP.put("m1v", "video/mpeg");
+			MAP.put("m2a", "audio/mpeg");
+			MAP.put("m2v", "video/mpeg");
+			MAP.put("m3u", "audio/x-mpegurl");
+			MAP.put("man", "application/x-troff-man");
+			MAP.put("map", "application/x-navimap");
+			MAP.put("mar", "text/plain");
+			MAP.put("mbd", "application/mbedlet");
+			MAP.put("mc$", "application/x-magic-cap-package-1.0");
+			MAP.put("mcd", "application/mcad");
+			MAP.put("mcd", "application/x-mathcad");
+			MAP.put("mcf", "image/vasa");
+			MAP.put("mcf", "text/mcf");
+			MAP.put("mcp", "application/netmc");
+			MAP.put("me", "application/x-troff-me");
+			MAP.put("mht", "message/rfc822");
+			MAP.put("mhtml", "message/rfc822");
+			MAP.put("mid", "application/x-midi");
+			MAP.put("mid", "audio/midi");
+			MAP.put("mid", "audio/x-mid");
+			MAP.put("mid", "audio/x-midi");
+			MAP.put("mid", "music/crescendo");
+			MAP.put("mid", "x-music/x-midi");
+			MAP.put("midi", "application/x-midi");
+			MAP.put("midi", "audio/midi");
+			MAP.put("midi", "audio/x-mid");
+			MAP.put("midi", "audio/x-midi");
+			MAP.put("midi", "music/crescendo");
+			MAP.put("midi", "x-music/x-midi");
+			MAP.put("mif", "application/x-frame");
+			MAP.put("mif", "application/x-mif");
+			MAP.put("mime", "message/rfc822");
+			MAP.put("mime", "www/mime");
+			MAP.put("mjf", "audio/x-vnd.audioexplosion.mjuicemediafile");
+			MAP.put("mjpg", "video/x-motion-jpeg");
+			MAP.put("mm", "application/base64");
+			MAP.put("mm", "application/x-meme");
+			MAP.put("mme", "application/base64");
+			MAP.put("mod", "audio/mod");
+			MAP.put("mod", "audio/x-mod");
+			MAP.put("moov", "video/quicktime");
+			MAP.put("mov", "video/quicktime");
+			MAP.put("movie", "video/x-sgi-movie");
+			MAP.put("mp2", "audio/mpeg");
+			MAP.put("mp2", "audio/x-mpeg");
+			MAP.put("mp2", "video/mpeg");
+			MAP.put("mp2", "video/x-mpeg");
+			MAP.put("mp2", "video/x-mpeq2a");
+			MAP.put("mp3", "audio/mpeg3");
+			MAP.put("mp3", "audio/x-mpeg-3");
+			MAP.put("mp3", "video/mpeg");
+			MAP.put("mp3", "video/x-mpeg");
+			MAP.put("mpa", "audio/mpeg");
+			MAP.put("mpa", "video/mpeg");
+			MAP.put("mpc", "application/x-project");
+			MAP.put("mpe", "video/mpeg");
+			MAP.put("mpeg", "video/mpeg");
+			MAP.put("mpg", "audio/mpeg");
+			MAP.put("mpg", "video/mpeg");
+			MAP.put("mpga", "audio/mpeg");
+			MAP.put("mpp", "application/vnd.ms-project");
+			MAP.put("mpt", "application/x-project");
+			MAP.put("mpv", "application/x-project");
+			MAP.put("mpx", "application/x-project");
+			MAP.put("mrc", "application/marc");
+			MAP.put("ms", "application/x-troff-ms");
+			MAP.put("mv", "video/x-sgi-movie");
+			MAP.put("my", "audio/make");
+			MAP.put("mzz", "application/x-vnd.audioexplosion.mzz");
+			MAP.put("nap", "image/naplps");
+			MAP.put("naplps", "image/naplps");
+			MAP.put("nc", "application/x-netcdf");
+			MAP.put("ncm", "application/vnd.nokia.configuration-message");
+			MAP.put("nif", "image/x-niff");
+			MAP.put("niff", "image/x-niff");
+			MAP.put("nix", "application/x-mix-transfer");
+			MAP.put("nsc", "application/x-conference");
+			MAP.put("nvd", "application/x-navidoc");
+			MAP.put("o", "application/octet-stream");
+			MAP.put("oda", "application/oda");
+			MAP.put("odb", "application/octet-stream");
+			MAP.put("omc", "application/x-omc");
+			MAP.put("omcd", "application/x-omcdatamaker");
+			MAP.put("omcr", "application/x-omcregerator");
+			MAP.put("p", "text/x-pascal");
+			MAP.put("p10", "application/pkcs10");
+			MAP.put("p10", "application/x-pkcs10");
+			MAP.put("p12", "application/pkcs-12");
+			MAP.put("p12", "application/x-pkcs12");
+			MAP.put("p7a", "application/x-pkcs7-signature");
+			MAP.put("p7c", "application/pkcs7-mime");
+			MAP.put("p7c", "application/x-pkcs7-mime");
+			MAP.put("p7m", "application/pkcs7-mime");
+			MAP.put("p7m", "application/x-pkcs7-mime");
+			MAP.put("p7r", "application/x-pkcs7-certreqresp");
+			MAP.put("p7s", "application/pkcs7-signature");
+			MAP.put("part", "application/pro_eng");
+			MAP.put("pas", "text/pascal");
+			MAP.put("pbm", "image/x-portable-bitmap");
+			MAP.put("pcl", "application/vnd.hp-pcl");
+			MAP.put("pcl", "application/x-pcl");
+			MAP.put("pct", "image/x-pict");
+			MAP.put("pcx", "image/x-pcx");
+			MAP.put("pdb", "application/octet-stream");
+			MAP.put("pdf", "application/pdf");
+			MAP.put("pfunk", "audio/make");
+			MAP.put("pfunk", "audio/make.my.funk");
+			MAP.put("pgm", "image/x-portable-graymap");
+			MAP.put("pgm", "image/x-portable-greymap");
+			MAP.put("pic", "image/pict");
+			MAP.put("pict", "image/pict");
+			MAP.put("pkg", "application/x-newton-compatible-pkg");
+			MAP.put("pko", "application/vnd.ms-pki.pko");
+			MAP.put("pl", "text/plain");
+			MAP.put("pl", "text/x-script.perl");
+			MAP.put("plist", "text/xml");
+			MAP.put("plx", "application/x-pixclscript");
+			MAP.put("pm", "image/x-xpixmap");
+			MAP.put("pm", "text/x-script.perl-module");
+			MAP.put("pm4", "application/x-pagemaker");
+			MAP.put("pm5", "application/x-pagemaker");
+			MAP.put("png", "image/png");
+			MAP.put("pnm", "application/x-portable-anymap");
+			MAP.put("pnm", "image/x-portable-anymap");
+			MAP.put("pot", "application/mspowerpoint");
+			MAP.put("pot", "application/vnd.ms-powerpoint");
+			MAP.put("pov", "model/x-pov");
+			MAP.put("ppa", "application/vnd.ms-powerpoint");
+			MAP.put("ppm", "image/x-portable-pixmap");
+			MAP.put("pps", "application/mspowerpoint");
+			MAP.put("pps", "application/vnd.ms-powerpoint");
+			MAP.put("ppt", "application/mspowerpoint");
+			MAP.put("ppt", "application/powerpoint");
+			MAP.put("ppt", "application/vnd.ms-powerpoint");
+			MAP.put("ppt", "application/x-mspowerpoint");
+			MAP.put("ppz", "application/mspowerpoint");
+			MAP.put("pre", "application/x-freelance");
+			MAP.put("prt", "application/pro_eng");
+			MAP.put("ps", "application/postscript");
+			MAP.put("psd", "application/octet-stream");
+			MAP.put("pvu", "paleovu/x-pv");
+			MAP.put("pwz", "application/vnd.ms-powerpoint");
+			MAP.put("py", "text/x-script.phyton");
+			MAP.put("pyc", "application/x-bytecode.python");
+			MAP.put("qcp", "audio/vnd.qcelp");
+			MAP.put("qd3", "x-world/x-3dmf");
+			MAP.put("qd3d", "x-world/x-3dmf");
+			MAP.put("qif", "image/x-quicktime");
+			MAP.put("qt", "video/quicktime");
+			MAP.put("qtc", "video/x-qtc");
+			MAP.put("qti", "image/x-quicktime");
+			MAP.put("qtif", "image/x-quicktime");
+			MAP.put("ra", "audio/x-pn-realaudio");
+			MAP.put("ra", "audio/x-pn-realaudio-plugin");
+			MAP.put("ra", "audio/x-realaudio");
+			MAP.put("ram", "audio/x-pn-realaudio");
+			MAP.put("ras", "application/x-cmu-raster");
+			MAP.put("ras", "image/cmu-raster");
+			MAP.put("ras", "image/x-cmu-raster");
+			MAP.put("rast", "image/cmu-raster");
+			MAP.put("rexx", "text/x-script.rexx");
+			MAP.put("rf", "image/vnd.rn-realflash");
+			MAP.put("rgb", "image/x-rgb");
+			MAP.put("rm", "application/vnd.rn-realmedia");
+			MAP.put("rm", "audio/x-pn-realaudio");
+			MAP.put("rmi", "audio/mid");
+			MAP.put("rmm", "audio/x-pn-realaudio");
+			MAP.put("rmp", "audio/x-pn-realaudio");
+			MAP.put("rmp", "audio/x-pn-realaudio-plugin");
+			MAP.put("rng", "application/ringing-tones");
+			MAP.put("rng", "application/vnd.nokia.ringing-tone");
+			MAP.put("rnx", "application/vnd.rn-realplayer");
+			MAP.put("roff", "application/x-troff");
+			MAP.put("rp", "image/vnd.rn-realpix");
+			MAP.put("rpm", "audio/x-pn-realaudio-plugin");
+			MAP.put("rt", "text/richtext");
+			MAP.put("rt", "text/vnd.rn-realtext");
+			MAP.put("rtf", "application/rtf");
+			MAP.put("rtf", "application/x-rtf");
+			MAP.put("rtf", "text/richtext");
+			MAP.put("rtx", "application/rtf");
+			MAP.put("rtx", "text/richtext");
+			MAP.put("rv", "video/vnd.rn-realvideo");
+			MAP.put("s", "text/x-asm");
+			MAP.put("s3m", "audio/s3m");
+			MAP.put("saveme", "application/octet-stream");
+			MAP.put("sbk", "application/x-tbook");
+			MAP.put("scm", "application/x-lotusscreencam");
+			MAP.put("scm", "text/x-script.guile");
+			MAP.put("scm", "text/x-script.scheme");
+			MAP.put("scm", "video/x-scm");
+			MAP.put("sdml", "text/plain");
+			MAP.put("sdp", "application/sdp");
+			MAP.put("sdp", "application/x-sdp");
+			MAP.put("sdr", "application/sounder");
+			MAP.put("sea", "application/sea");
+			MAP.put("sea", "application/x-sea");
+			MAP.put("set", "application/set");
+			MAP.put("sgm", "text/sgml");
+			MAP.put("sgm", "text/x-sgml");
+			MAP.put("sgml", "text/sgml");
+			MAP.put("sgml", "text/x-sgml");
+			MAP.put("sh", "application/x-bsh");
+			MAP.put("sh", "application/x-sh");
+			MAP.put("sh", "application/x-shar");
+			MAP.put("sh", "text/x-script.sh");
+			MAP.put("shar", "application/x-bsh");
+			MAP.put("shar", "application/x-shar");
+			MAP.put("shtml", "text/html");
+			MAP.put("shtml", "text/x-server-parsed-html");
+			MAP.put("sid", "audio/x-psid");
+			MAP.put("sit", "application/x-sit");
+			MAP.put("sit", "application/x-stuffit");
+			MAP.put("skd", "application/x-koan");
+			MAP.put("skm", "application/x-koan");
+			MAP.put("skp", "application/x-koan");
+			MAP.put("skt", "application/x-koan");
+			MAP.put("sl", "application/x-seelogo");
+			MAP.put("smi", "application/smil");
+			MAP.put("smil", "application/smil");
+			MAP.put("snd", "audio/basic");
+			MAP.put("snd", "audio/x-adpcm");
+			MAP.put("sol", "application/solids");
+			MAP.put("spc", "application/x-pkcs7-certificates");
+			MAP.put("spc", "text/x-speech");
+			MAP.put("spl", "application/futuresplash");
+			MAP.put("spr", "application/x-sprite");
+			MAP.put("sprite", "application/x-sprite");
+			MAP.put("src", "application/x-wais-source");
+			MAP.put("ssi", "text/x-server-parsed-html");
+			MAP.put("ssm", "application/streamingmedia");
+			MAP.put("sst", "application/vnd.ms-pki.certstore");
+			MAP.put("step", "application/step");
+			MAP.put("stl", "application/sla");
+			MAP.put("stl", "application/vnd.ms-pki.stl");
+			MAP.put("stl", "application/x-navistyle");
+			MAP.put("stp", "application/step");
+			MAP.put("sv4cpio", "application/x-sv4cpio");
+			MAP.put("sv4crc", "application/x-sv4crc");
+			MAP.put("svf", "image/vnd.dwg");
+			MAP.put("svf", "image/x-dwg");
+			MAP.put("svr", "application/x-world");
+			MAP.put("svr", "x-world/x-svr");
+			MAP.put("swf", "application/x-shockwave-flash");
+			MAP.put("t", "application/x-troff");
+			MAP.put("talk", "text/x-speech");
+			MAP.put("", "application/x-tar");
+			MAP.put("tbk", "application/toolbook");
+			MAP.put("tbk", "application/x-tbook");
+			MAP.put("tcl", "application/x-tcl");
+			MAP.put("tcl", "text/x-script.tcl");
+			MAP.put("tcsh", "text/x-script.tcsh");
+			MAP.put("tex", "application/x-tex");
+			MAP.put("texi", "application/x-texinfo");
+			MAP.put("texinfo", "application/x-texinfo");
+			MAP.put("text", "application/plain");
+			MAP.put("text", "text/plain");
+			MAP.put("tgz", "application/gnutar");
+			MAP.put("tgz", "application/x-compressed");
+			MAP.put("tif", "image/tiff");
+			MAP.put("tif", "image/x-tiff");
+			MAP.put("tiff", "image/tiff");
+			MAP.put("tiff", "image/x-tiff");
+			MAP.put("tr", "application/x-troff");
+			MAP.put("tsi", "audio/tsp-audio");
+			MAP.put("tsp", "application/dsptype");
+			MAP.put("tsp", "audio/tsplayer");
+			MAP.put("tsv", "text/tab-separated-values");
+			MAP.put("turbot", "image/florian");
+			MAP.put("txt", "text/plain");
+			MAP.put("uil", "text/x-uil");
+			MAP.put("uni", "text/uri-list");
+			MAP.put("unis", "text/uri-list");
+			MAP.put("unv", "application/i-deas");
+			MAP.put("uri", "text/uri-list");
+			MAP.put("uris", "text/uri-list");
+			MAP.put("ustar", "application/x-ustar");
+			MAP.put("ustar", "multipart/x-ustar");
+			MAP.put("uu", "application/octet-stream");
+			MAP.put("uu", "text/x-uuencode");
+			MAP.put("uue", "text/x-uuencode");
+			MAP.put("vcd", "application/x-cdlink");
+			MAP.put("vcs", "text/x-vcalendar");
+			MAP.put("vda", "application/vda");
+			MAP.put("vdo", "video/vdo");
+			MAP.put("vew", "application/groupwise");
+			MAP.put("viv", "video/vivo");
+			MAP.put("viv", "video/vnd.vivo");
+			MAP.put("vivo", "video/vivo");
+			MAP.put("vivo", "video/vnd.vivo");
+			MAP.put("vmd", "application/vocaltec-media-desc");
+			MAP.put("vmf", "application/vocaltec-media-file");
+			MAP.put("voc", "audio/voc");
+			MAP.put("voc", "audio/x-voc");
+			MAP.put("vos", "video/vosaic");
+			MAP.put("vox", "audio/voxware");
+			MAP.put("vqe", "audio/x-twinvq-plugin");
+			MAP.put("vqf", "audio/x-twinvq");
+			MAP.put("vql", "audio/x-twinvq-plugin");
+			MAP.put("vrml", "application/x-vrml");
+			MAP.put("vrml", "model/vrml");
+			MAP.put("vrml", "x-world/x-vrml");
+			MAP.put("vrt", "x-world/x-vrt");
+			MAP.put("vsd", "application/x-visio");
+			MAP.put("vst", "application/x-visio");
+			MAP.put("vsw", "application/x-visio");
+			MAP.put("w60", "application/wordperfect6.0");
+			MAP.put("w61", "application/wordperfect6.1");
+			MAP.put("w6w", "application/msword");
+			MAP.put("wav", "audio/wav");
+			MAP.put("wav", "audio/x-wav");
+			MAP.put("wb1", "application/x-qpro");
+			MAP.put("wbmp", "image/vnd.wap.wbmp");
+			MAP.put("web", "application/vnd.xara");
+			MAP.put("wiz", "application/msword");
+			MAP.put("wk1", "application/x-123");
+			MAP.put("wmf", "windows/metafile");
+			MAP.put("wml", "text/vnd.wap.wml");
+			MAP.put("wmlc", "application/vnd.wap.wmlc");
+			MAP.put("wmls", "text/vnd.wap.wmlscript");
+			MAP.put("wmlsc", "application/vnd.wap.wmlscriptc");
+			MAP.put("word", "application/msword");
+			MAP.put("wp", "application/wordperfect");
+			MAP.put("wp5", "application/wordperfect");
+			MAP.put("wp5", "application/wordperfect6.0");
+			MAP.put("wp6", "application/wordperfect");
+			MAP.put("wpd", "application/wordperfect");
+			MAP.put("wpd", "application/x-wpwin");
+			MAP.put("wq1", "application/x-lotus");
+			MAP.put("wri", "application/mswrite");
+			MAP.put("wri", "application/x-wri");
+			MAP.put("wrl", "application/x-world");
+			MAP.put("wrl", "model/vrml");
+			MAP.put("wrl", "x-world/x-vrml");
+			MAP.put("wrz", "model/vrml");
+			MAP.put("wrz", "x-world/x-vrml");
+			MAP.put("wsc", "text/scriplet");
+			MAP.put("wsrc", "application/x-wais-source");
+			MAP.put("wtk", "application/x-wintalk");
+			MAP.put("xbm", "image/x-xbitmap");
+			MAP.put("xbm", "image/x-xbm");
+			MAP.put("xbm", "image/xbm");
+			MAP.put("xdr", "video/x-amt-demorun");
+			MAP.put("xgz", "xgl/drawing");
+			MAP.put("xif", "image/vnd.xiff");
+			MAP.put("xl", "application/excel");
+			MAP.put("xla", "application/excel");
+			MAP.put("xla", "application/x-excel");
+			MAP.put("xla", "application/x-msexcel");
+			MAP.put("xlb", "application/excel");
+			MAP.put("xlb", "application/vnd.ms-excel");
+			MAP.put("xlb", "application/x-excel");
+			MAP.put("xlc", "application/excel");
+			MAP.put("xlc", "application/vnd.ms-excel");
+			MAP.put("xlc", "application/x-excel");
+			MAP.put("xld", "application/excel");
+			MAP.put("xld", "application/x-excel");
+			MAP.put("xlk", "application/excel");
+			MAP.put("xlk", "application/x-excel");
+			MAP.put("xll", "application/excel");
+			MAP.put("xll", "application/vnd.ms-excel");
+			MAP.put("xll", "application/x-excel");
+			MAP.put("xlm", "application/excel");
+			MAP.put("xlm", "application/vnd.ms-excel");
+			MAP.put("xlm", "application/x-excel");
+			MAP.put("xls", "application/excel");
+			MAP.put("xls", "application/vnd.ms-excel");
+			MAP.put("xls", "application/x-excel");
+			MAP.put("xls", "application/x-msexcel");
+			MAP.put("xlt", "application/excel");
+			MAP.put("xlt", "application/x-excel");
+			MAP.put("xlv", "application/excel");
+			MAP.put("xlv", "application/x-excel");
+			MAP.put("xlw", "application/excel");
+			MAP.put("xlw", "application/vnd.ms-excel");
+			MAP.put("xlw", "application/x-excel");
+			MAP.put("xlw", "application/x-msexcel");
+			MAP.put("xm", "audio/xm");
+			MAP.put("xml", "application/xml");
+			MAP.put("xml", "text/xml");
+			MAP.put("xsd", "application/xml");
+			MAP.put("xsd", "text/xml");
+			MAP.put("xmz", "xgl/movie");
+			MAP.put("xpix", "application/x-vnd.ls-xpix");
+			MAP.put("xpm", "image/x-xpixmap");
+			MAP.put("xpm", "image/xpm");
+			MAP.put("x-png", "image/png");
+			MAP.put("xsr", "video/x-amt-showrun");
+			MAP.put("xwd", "image/x-xwd");
+			MAP.put("xwd", "image/x-xwindowdump");
+			MAP.put("xyz", "chemical/x-pdb");
+			MAP.put("z", "application/x-compress");
+			MAP.put("z", "application/x-compressed");
+			MAP.put("zip", "application/x-compressed");
+			MAP.put("zoo", "application/octet-stream");
+			MAP.put("zsh", "text/x-script.zsh");
+		}
+		return MAP;
+	}
+
+	/**
+	 * @param ext
+	 *            the extension
+	 * @return the mime type
+	 */
+	public static String getMimeTypeFromExtension(String ext) {
+		return getMap().get(ext);
+	}
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/androidlib/data/RootFileUtils.java b/qpython/src/main/java/org/qpython/qpy/texteditor/androidlib/data/RootFileUtils.java
new file mode 100644
index 00000000..7b913a94
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/androidlib/data/RootFileUtils.java
@@ -0,0 +1,50 @@
+package org.qpython.qpy.texteditor.androidlib.data;
+
+import java.io.BufferedReader;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.File;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.util.List;
+
+public class RootFileUtils {
+
+	public static List<File> listFiles(File folder) {
+
+		Process suProcess;
+		DataOutputStream os;
+		DataInputStream is;
+		StringBuffer text = new StringBuffer();
+		int c;
+
+		try {
+			suProcess = Runtime.getRuntime().exec("su");
+
+			os = new DataOutputStream(suProcess.getOutputStream());
+			is = new DataInputStream(suProcess.getInputStream());
+
+			os.writeBytes("ls " + FileUtils.getCanonizePath(folder) + "\n");
+			os.flush();
+
+			os.writeBytes("exit \n");
+			os.flush();
+
+			int suProcessRetVal = suProcess.waitFor();
+			byte buffer[] = new byte[1024];
+			Reader reader = new BufferedReader(new InputStreamReader(is));
+			do {
+				c = reader.read();
+				if (c != -1) {
+					text.append((char) c);
+				}
+			} while (c != -1);
+			reader.close();
+		} catch (Exception e) {
+
+		}
+
+		return null;
+
+	}
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/androidlib/ui/Toaster.java b/qpython/src/main/java/org/qpython/qpy/texteditor/androidlib/ui/Toaster.java
new file mode 100644
index 00000000..aa186286
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/androidlib/ui/Toaster.java
@@ -0,0 +1,104 @@
+package org.qpython.qpy.texteditor.androidlib.ui;
+
+import android.app.Activity;
+import android.content.Context;
+import android.graphics.Color;
+import android.widget.TextView;
+import android.widget.Toast;
+
+@Deprecated
+public class Toaster {
+
+	protected static final int mError = Color.rgb(255, 128, 64);
+
+	/**
+	 * Show a toast message to the user, ensuring the toast is called from the
+	 * main thread
+	 *
+	 * @param activity
+	 *            The activity to use
+	 * @param resId
+	 *            the id of the string to display
+	 * @param error
+	 *            is the message an error (changes the text to red)
+	 */
+	@Deprecated
+	public static void showToastOnMainThread(final Activity activity,
+			final int resId, final boolean error) {
+		activity.runOnUiThread(new Runnable() {
+			public void run() {
+				showToast(activity, resId, error);
+			}
+		});
+	}
+
+	/**
+	 * Show a toast message to the user, ensuring the toast is called from the
+	 * main thread
+	 *
+	 * @param activity
+	 *            The activity to use
+	 * @param message
+	 *            the string to display
+	 * @param error
+	 *            is the message an error (changes the text to red)
+	 */
+	@Deprecated
+	public static void showToastOnMainThread(final Activity activity,
+			final CharSequence message, final boolean error) {
+		activity.runOnUiThread(new Runnable() {
+			public void run() {
+				showToast(activity, message, error);
+			}
+		});
+	}
+
+	/**
+	 * Show a toast message to the user
+	 *
+	 * @param ctx
+	 *            The context to use
+	 * @param resId
+	 *            the id of the string to display
+	 * @param error
+	 *            is the message an error (changes the text to red)
+	 */
+	@Deprecated
+	public static void showToast(Context ctx, int resId, boolean error) {
+		Toast toast;
+		TextView v;
+
+		toast = Toast.makeText(ctx, resId, Toast.LENGTH_SHORT);
+		if (error) {
+			v = (TextView) toast.getView().findViewById(android.R.id.message);
+			v.setTextColor(mError);
+			toast.setDuration(Toast.LENGTH_LONG);
+		}
+		toast.show();
+	}
+
+	/**
+	 * Show a toast message to the user
+	 *
+	 * @param ctx
+	 *            The context to use
+	 * @param message
+	 *            the string to display
+	 * @param error
+	 *            is the message an error (changes the text to red)
+	 */
+	@Deprecated
+	public static void showToast(Context ctx, CharSequence message,
+			boolean error) {
+		Toast toast;
+		TextView v;
+
+		toast = Toast.makeText(ctx, message, Toast.LENGTH_SHORT);
+		if (error) {
+			v = (TextView) toast.getView().findViewById(android.R.id.message);
+			v.setTextColor(mError);
+			toast.setDuration(Toast.LENGTH_LONG);
+		}
+		toast.show();
+	}
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/androidlib/ui/activity/ActivityDecorator.java b/qpython/src/main/java/org/qpython/qpy/texteditor/androidlib/ui/activity/ActivityDecorator.java
new file mode 100644
index 00000000..f28a051b
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/androidlib/ui/activity/ActivityDecorator.java
@@ -0,0 +1,53 @@
+package org.qpython.qpy.texteditor.androidlib.ui.activity;
+
+import android.annotation.TargetApi;
+import android.os.Build.VERSION;
+import android.os.Build.VERSION_CODES;
+import android.view.Menu;
+import android.view.MenuItem;
+
+public class ActivityDecorator {
+
+	/**
+	 * Adds a Menu item either in the Option Menu (pre Honeycomb) or in the
+	 * action bar
+	 * 
+	 * @param menu
+	 *            the menu to fill
+	 * @param id
+	 *            the id of this item
+	 * @param title
+	 *            the title resource
+	 * @param icon
+	 *            the drawable (for pre honeycomb option menu)
+	 * @return the menu item
+	 */
+	public static MenuItem addMenuItem(Menu menu, int id, int title, int icon) {
+		MenuItem item;
+
+		item = menu.add(0, id, Menu.NONE, title);
+		if ((icon != -1) && (VERSION.SDK_INT < VERSION_CODES.HONEYCOMB)) {
+			item.setIcon(icon);
+		}
+		return item;
+	}
+
+	/**
+	 * Show the menu item as an action in the action bar
+	 * 
+	 * @param item
+	 *            the item to show
+	 * @param icon
+	 *            the item icon resource
+	 * 
+	 */
+	@TargetApi(11)
+	public static void showMenuItemAsAction(MenuItem item, int icon) {
+		if (VERSION.SDK_INT >= VERSION_CODES.HONEYCOMB) {
+			if (icon != -1) {
+				item.setIcon(icon);
+			}
+			item.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
+		}
+	}
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/androidlib/ui/activity/BrowsingActivity.java b/qpython/src/main/java/org/qpython/qpy/texteditor/androidlib/ui/activity/BrowsingActivity.java
new file mode 100644
index 00000000..c1058cc9
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/androidlib/ui/activity/BrowsingActivity.java
@@ -0,0 +1,264 @@
+package org.qpython.qpy.texteditor.androidlib.ui.activity;
+
+import android.annotation.TargetApi;
+import android.app.Activity;
+import android.os.Build;
+import android.os.Build.VERSION;
+import android.os.Build.VERSION_CODES;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.AdapterView;
+import android.widget.AdapterView.OnItemClickListener;
+import android.widget.ListView;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.texteditor.androidlib.comparator.ComparatorFilesAlpha;
+import org.qpython.qpy.texteditor.androidlib.data.FileUtils;
+import org.qpython.qpy.texteditor.androidlib.ui.adapter.FileListAdapter;
+import org.qpython.qpy.texteditor.widget.crouton.Crouton;
+import org.qpython.qpy.texteditor.widget.crouton.Style;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.LinkedList;
+import java.util.List;
+
+/**
+ * 
+ */
+public abstract class BrowsingActivity extends Activity implements
+		OnItemClickListener {
+
+	/** The list of files to display */
+	protected ArrayList<File> mList;
+	/** the dialog's list view */
+	protected ListView mFilesList;
+	/** The list adapter */
+	protected FileListAdapter mListAdapter;
+
+	/** the current folder */
+	protected File mCurrentFolder;
+
+	/** the current file sort */
+	protected Comparator<File> mComparator;
+
+	protected boolean mShowFoldersOnly = false;
+	protected boolean mShowHiddenFiles = true;
+	protected boolean mHideNonWriteableFiles = false;
+	protected List<String> mExtensionsWhiteList;
+	protected List<String> mExtensionsBlackList;
+
+	/**
+	 * @see android.app.Activity#onCreate(android.os.Bundle)
+	 */
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+
+		mExtensionsWhiteList = new ArrayList<>();
+		mExtensionsBlackList = new ArrayList<>();
+		mComparator = new ComparatorFilesAlpha();
+		mListAdapter = new FileListAdapter(this, new LinkedList<>(), null);
+	}
+
+	/**
+	 * @see android.app.Activity#onResume()
+	 */
+	protected void onResume() {
+		super.onResume();
+
+		// Setup the widget
+		mFilesList = findViewById(android.R.id.list);
+		mFilesList.setOnItemClickListener(this);
+
+		// set adapter
+		mFilesList.setAdapter(mListAdapter);
+
+		// initial folder
+		File folder;
+		if (mCurrentFolder != null) {
+			folder = mCurrentFolder;
+		} else if ((FileUtils.STORAGE.exists())
+				&& (FileUtils.STORAGE.canRead())) {
+			folder = FileUtils.STORAGE;
+		} else {
+			folder = new File("/");
+		}
+
+		fillFolderView(folder);
+	}
+
+	/**
+	 * @see android.widget.AdapterView.OnItemClickListener#onItemClick(android.widget.AdapterView,
+	 *      android.view.View, int, long)
+	 */
+	public void onItemClick(AdapterView<?> parent, View view, int position,
+			long id) {
+		File file, canon;
+
+		file = mList.get(position);
+		canon = new File(FileUtils.getCanonizePath(file));
+
+		// safe check : file exists
+		if (file.exists()) {
+			if (file.isDirectory()) {
+				if (onFolderClick(file)) {
+					fillFolderView(canon);
+				}
+			} else {
+				onFileClick(canon);
+			}
+		}
+	}
+
+	/**
+	 * @param folder
+	 *            the folder being clicked
+	 * @return if the folder should be opened in the browsing list view
+	 */
+	protected abstract boolean onFolderClick(File folder);
+
+	/**
+	 * @param file
+	 *            the file being clicked (it is not a folder)
+	 */
+	protected abstract void onFileClick(File file);
+
+	/**
+	 * Folder view has been filled
+	 */
+	protected abstract void onFolderViewFilled();
+
+	/**
+	 * Fills the files list with the specified folder
+	 * 
+	 * @param file
+	 *            the file of the folder to display
+	 */
+	@TargetApi(Build.VERSION_CODES.HONEYCOMB)
+	protected void fillFolderView(File file) {
+		file = new File(FileUtils.getCanonizePath(file));
+
+		if (!file.exists()) {
+			Crouton.makeText(this, R.string.toast_folder_doesnt_exist,
+					Style.ALERT).show();
+			return;
+		}
+
+		if (!file.isDirectory()) {
+			Crouton.makeText(this, R.string.toast_folder_not_folder,
+					Style.ALERT).show();
+			return;
+		}
+
+		if (!file.canRead()) {
+			Crouton.makeText(this, R.string.toast_folder_cant_read, Style.ALERT)
+					.show();
+			return;
+		}
+
+		listFiles(file);
+
+		// create string list adapter
+		// mListAdapter = new FileListAdapter(this, mList, file);
+		mListAdapter.clear();
+		mListAdapter.setCurrentFolder(file);
+		mListAdapter.addAll(mList);
+		mFilesList.scrollTo(0, 0);
+
+		// update path
+		mCurrentFolder = file;
+		setTitle(file.getName());
+
+		onFolderViewFilled();
+	}
+
+	/**
+	 * List the files in the given folder and store them in the list of files to
+	 * display
+	 * 
+	 * @param folder
+	 *            the folder to analyze
+	 */
+	protected void listFiles(File folder) {
+		File file;
+
+		// get files list as array list
+		if ((folder == null) || (!folder.isDirectory())) {
+			mList = new ArrayList<>();
+			return;
+		}
+
+		mList = new ArrayList<>(Arrays.asList(folder.listFiles()));
+
+		// filter files
+		for (int i = (mList.size() - 1); i >= 0; i--) {
+			file = mList.get(i);
+
+			// remove
+			if (!(isFileVisible(file) && isFileTypeAllowed(file))) {
+				mList.remove(i);
+			}
+		}
+
+		// Sort list
+		if (mComparator != null) {
+			Collections.sort(mList, mComparator);
+		}
+
+		// Add parent folder
+		if (!folder.getPath().equals("/")) {
+			mList.add(0, folder.getParentFile());
+		}
+	}
+
+	protected boolean isFileVisible(File file) {
+
+		boolean visible = true;
+
+		// filter hidden files
+		if ((!mShowHiddenFiles) && (file.getName().startsWith("."))) {
+			visible = false;
+		}
+
+		// filter non folders
+		if (mShowFoldersOnly && (!file.isDirectory())) {
+			visible = false;
+		}
+
+		return visible;
+	}
+
+	/**
+	 * Filters files based on their extensions and white list / black list
+	 * 
+	 * @param file
+	 *            the file to test
+	 * @return if the file can be shown (either appear in white list or doesn't
+	 *         appear on blacklist)
+	 */
+	protected boolean isFileTypeAllowed(File file) {
+		boolean allow = true;
+		String ext;
+
+		if (file.isFile()) {
+			ext = FileUtils.getFileExtension(file);
+			if ((mExtensionsWhiteList != null)
+					&& (mExtensionsWhiteList.size() > 0)
+					&& (!mExtensionsWhiteList.contains(ext))) {
+				allow = false;
+			}
+
+			if ((mExtensionsBlackList != null)
+					&& (mExtensionsBlackList.size() > 0)
+					&& (mExtensionsBlackList.contains(ext))) {
+				allow = false;
+			}
+		}
+
+		return allow;
+	}
+
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/androidlib/ui/adapter/FileListAdapter.java b/qpython/src/main/java/org/qpython/qpy/texteditor/androidlib/ui/adapter/FileListAdapter.java
new file mode 100644
index 00000000..9c7de160
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/androidlib/ui/adapter/FileListAdapter.java
@@ -0,0 +1,208 @@
+package org.qpython.qpy.texteditor.androidlib.ui.adapter;
+
+
+import android.content.Context;
+import android.graphics.Color;
+import android.graphics.Typeface;
+import android.graphics.drawable.Drawable;
+import android.text.TextUtils.TruncateAt;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
+import android.widget.TextView;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.texteditor.androidlib.common.UIUtils;
+import org.qpython.qpy.texteditor.androidlib.data.FileUtils;
+
+import java.io.File;
+import java.util.List;
+
+
+/**
+ * A File List Adapter used to display folders and files
+ */
+public class FileListAdapter extends ArrayAdapter<File> {
+
+    private int               mLayout;
+    private boolean           mIconOnTop;
+    private File              mFolder;
+    private ThumbnailProvider mThumbnailProvider;
+    private List<File>        mSelection;
+
+    /**
+     * Constructor
+     *
+     * @param context The current context
+     * @param objects The objects to represent in the ListView.
+     * @param folder  the parent folder of the items presented, or null if the top
+     *                folder should not be displayed as up
+     */
+    public FileListAdapter(Context context, List<File> objects, File folder) {
+        this(context, objects, folder, R.layout.item_file);
+    }
+
+    /**
+     * Constructor
+     *
+     * @param context The current context
+     * @param objects The objects to represent in the ListView.
+     * @param folder  the parent folder of the items presented, or null if the top
+     *                folder should not be displayed as up
+     * @param layout  the layout to use
+     */
+    private FileListAdapter(Context context, List<File> objects, File folder,
+                            int layout) {
+        super(context, layout, objects);
+        mLayout = layout;
+        mFolder = folder;
+    }
+
+    private static int getIconForFile(File file) {
+        if (file.isDirectory()) {
+            return R.drawable.ic_editor_folder;
+        } else {
+            return R.drawable.ic_editor_file;
+        }
+    }
+
+    /**
+     * @see ArrayAdapter#getView(int, View, ViewGroup)
+     */
+    public View getView(int position, View convertView, ViewGroup parent) {
+        File file;
+        View v;
+        TextView textView;
+        String text;
+        int icon, style;
+
+        // recycle the view
+        v = convertView;
+        if (v == null) {
+            LayoutInflater vi = (LayoutInflater) getContext().getSystemService(
+                    Context.LAYOUT_INFLATER_SERVICE);
+            v = vi.inflate(R.layout.item_file, null);
+        }
+
+        // get the file infos
+        file = getItem(position);
+        style = Typeface.BOLD;
+        if (file != null) {
+            text = file.getName();
+
+//            if ((position == 0) && (mFolder != null)
+//                    && (file.equals(mFolder.getParentFile()))
+//                    && (!mFolder.getPath().equals("/"))) {
+//                icon = R.drawable.up;
+//                text = "";
+//            } else {
+            if (FileUtils.isSymLink(file)) {
+                File target = FileUtils.getSymLinkTarget(file);
+                if (target.equals(FileUtils.STORAGE)) {
+                    icon = R.drawable.prev;
+                } else if (target.isDirectory()) {
+                    icon = R.drawable.ic_editor_folder_little;
+                } else {
+                    icon = R.drawable.ic_editor_file_little;
+                }
+            } else {
+                if (position == 0) {
+                    icon = R.drawable.prev;
+                } else {
+                    icon = getIconForFile(file);
+                }
+            }
+//            }
+        } else {
+            text = "";
+            icon = R.drawable.ic_editor_file_little;
+        }
+
+        Drawable thumbnail = null;
+        Drawable selectedIcon = null;
+
+        // File Icon / Thumbnail
+        if (mThumbnailProvider != null) {
+            thumbnail = mThumbnailProvider.getThumbnailForFile(getContext(),
+                    file);
+        }
+        if (thumbnail == null) {
+            thumbnail = getContext().getResources().getDrawable(icon);
+        }
+
+        int size = UIUtils.getPxFromDp(getContext(), 38);
+
+        if (thumbnail != null) {
+            double ratio = ((double) thumbnail.getIntrinsicWidth())
+                    / ((double) thumbnail.getIntrinsicHeight());
+            if (ratio > 1) {
+                thumbnail.setBounds(0, 0, size, (int) (size / ratio));
+            } else {
+                thumbnail.setBounds(0, 0, (int) (size * ratio), size);
+            }
+        }
+
+        // Handle selection
+        int color = Color.LTGRAY;
+        if ((mSelection != null) && (mSelection.contains(file))) {
+            selectedIcon = getContext().getResources().getDrawable(
+                    R.drawable.ic_program_install);
+            selectedIcon.setBounds(0, 0, size, size);
+            style = Typeface.BOLD_ITALIC;
+            color = Color.rgb(0, 192, 0);
+        }
+
+        // Setup name and icon
+        textView = (TextView) v.findViewById(R.id.textFileName);
+        if (textView != null) {
+            textView.setText(text);
+
+            if (mIconOnTop) {
+                textView.setCompoundDrawables(null, thumbnail, null, null);
+                textView.setGravity(Gravity.CENTER);
+            } else {
+                textView.setCompoundDrawables(thumbnail, null, selectedIcon,
+                        null);
+                textView.setGravity(Gravity.CENTER_VERTICAL | Gravity.LEFT);
+            }
+
+            textView.setTypeface(Typeface.DEFAULT, style);
+
+            textView.setEllipsize(TruncateAt.MIDDLE);
+            textView.setSingleLine();
+            textView.setTextColor(color);
+        }
+
+        return v;
+    }
+
+    /**
+     * @param folder the current parent folder for displayed files
+     */
+    public void setCurrentFolder(File folder) {
+        mFolder = folder;
+    }
+
+    /**
+     * @param iconOnTop let the icon be above the file name
+     */
+    public void setIconOnTop(boolean iconOnTop) {
+        mIconOnTop = iconOnTop;
+    }
+
+    /**
+     * @param provider the {@link ThumbnailProvider} for this adapter
+     */
+    public void setThumbnailProvider(ThumbnailProvider provider) {
+        mThumbnailProvider = provider;
+    }
+
+    /**
+     * @param selection the list of selected files
+     */
+    public void setSelection(List<File> selection) {
+        mSelection = selection;
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/androidlib/ui/adapter/ThumbnailProvider.java b/qpython/src/main/java/org/qpython/qpy/texteditor/androidlib/ui/adapter/ThumbnailProvider.java
new file mode 100644
index 00000000..7397dfc5
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/androidlib/ui/adapter/ThumbnailProvider.java
@@ -0,0 +1,11 @@
+package org.qpython.qpy.texteditor.androidlib.ui.adapter;
+
+import android.content.Context;
+import android.graphics.drawable.Drawable;
+
+import java.io.File;
+
+public interface ThumbnailProvider {
+
+	public Drawable getThumbnailForFile(Context context, File file);
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/common/CommonEnums.java b/qpython/src/main/java/org/qpython/qpy/texteditor/common/CommonEnums.java
new file mode 100644
index 00000000..707c5c0d
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/common/CommonEnums.java
@@ -0,0 +1,14 @@
+package org.qpython.qpy.texteditor.common;
+
+/**
+ * Created by Hmei on 2017-05-11.
+ */
+
+public class CommonEnums {
+    public enum FileType {
+        FOLDER,
+        FILE,
+        PROJECT,
+        SCRIPT
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/common/ComparatorFilesAlpha.java b/qpython/src/main/java/org/qpython/qpy/texteditor/common/ComparatorFilesAlpha.java
new file mode 100644
index 00000000..be7f331a
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/common/ComparatorFilesAlpha.java
@@ -0,0 +1,30 @@
+package org.qpython.qpy.texteditor.common;
+
+import java.io.File;
+import java.util.Comparator;
+
+/**
+ * Compare files Alphabetically (w/ folders listed first)
+ * 
+ * @author x.gouchet
+ * 
+ */
+public class ComparatorFilesAlpha implements Comparator<File> {
+
+	/**
+	 * @see Comparator#compare(Object, Object)
+	 */
+	@Override
+	public int compare(File file1, File file2) {
+		// sort folders first
+		if ((file1.isDirectory()) && (!file2.isDirectory()))
+			return -1;
+		if ((!file1.isDirectory()) && (file2.isDirectory()))
+			return 1;
+
+		// here both are folders or both are files : sort alpha
+		return file1.getName().toLowerCase().compareTo(
+				file2.getName().toLowerCase());
+	}
+
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/common/Constants.java b/qpython/src/main/java/org/qpython/qpy/texteditor/common/Constants.java
new file mode 100644
index 00000000..19581089
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/common/Constants.java
@@ -0,0 +1,276 @@
+package org.qpython.qpy.texteditor.common;
+
+import java.io.File;
+
+import android.os.Environment;
+
+/**
+ * @author x.gouchet
+ */
+public interface Constants {
+
+    /**
+     * Tag for the log ( = {@value} )
+     */
+     String TAG = "TED";
+
+     String ACTION_WIDGET_OPEN = "org.qpython.qpy.texteditor.ACTION_TED_WIDGET_OPEN";
+
+    String ACTION_WIDGET_TEXT = "org.qpython.qpy.texteditor.ACTION_TED_WIDGET_TEXT";
+
+    /**
+     * Fonts folder
+     */
+     String FONT_FOLDER_NAME = "fonts";
+    /**
+     * Font file
+     */
+     String FONT_FILE_NAME   = "ted_font.ttf";
+
+    /**
+     * clears the current text ( = {@value} )
+     */
+     int MENU_ID_NEW         = 0;
+    /**
+     * Saves the file ( = {@value} )
+     */
+     int MENU_ID_SAVE        = 1;
+    /**
+     * Savesas a new file ( = {@value} )
+     */
+     int MENU_ID_SAVE_AS     = 2;
+    /**
+     * open an existing file
+     */
+     int MENU_ID_OPEN        = 3;
+    /**
+     * open an existing file ( = {@value} )
+     */
+     int MENU_ID_OPEN_RECENT = 4;
+    /**
+     * open the settings ( = {@value} )
+     */
+     int MENU_ID_SETTINGS    = 5;
+    /**
+     * open the about page ( = {@value} )
+     */
+     int MENU_ID_ABOUT       = 6;
+    /**
+     * Search a string in the file ( = {@value} )
+     */
+     int MENU_ID_SEARCH      = 7;
+    /**
+     * undo last change ( = {@value} )
+     */
+     int MENU_ID_UNDO        = 8;
+    /**
+     * redo last change ( = {@value} )
+     */
+     int MENU_ID_REDO        = 9;
+    /**
+     * Quit the app ( = {@value} )
+     */
+     int MENU_ID_QUIT        = 666;
+
+    /**
+     * File of the external storage data
+     */
+     File   STORAGE          = Environment
+            .getExternalStorageDirectory();
+    /**
+     * Path to the external storage data
+     */
+     String STORAGE_PATH     = STORAGE.getAbsolutePath();
+    /**
+     * name of the backup file
+     */
+     String BACKUP_FILE_NAME = "temp.bak";
+
+    String PREFERENCES_GIST                     = "show_gist";
+
+    /**
+     * name of the shared preferences for this app ( = {@value} )
+     */
+     String PREFERENCES_NAME                     = "org.qpython.qpy.texteditor";
+    /**
+     * Preference tag to retrieve the recent files ( = {@value} )
+     */
+     String PREFERENCE_RECENTS                   = "recent_files";
+    /**
+     * Preference tag to retrieve the recent files ( = {@value} )
+     */
+     String PREFERENCE_MAX_RECENTS               = "max_recent_files";
+     String PREFERENCE_MAX_LINES_NUM_WITH_SYNTAX = "max_lines_num_with_syntax";
+
+    /**
+     * Preference tag to retrieve the show PATTERN_LINE number ( = {@value} )
+     */
+     String PREFERENCE_SHOW_LINE_NUMBERS   = "show_line_numbers";
+    /**
+     * Preference tag to retrieve the wordwrap ( = {@value} )
+     */
+     String PREFERENCE_WORDWRAP            = "auto_break_lines";
+    /**
+     * Preference tag to retrieve the searchwrap ( = {@value} )
+     */
+     String PREFERENCE_SEARCHWRAP          = "search_wrap";
+    /**
+     * Preference tag to retrieve the setSearchState match case ( = {@value} )
+     */
+     String PREFERENCE_SEARCH_MATCH_CASE   = "search_match_case";
+    /**
+     * Preference tag to retrieve the Syntax Highlight ( = {@value} )
+     */
+     String PREFERENCE_HIGHLIGHT           = "highlight_syntax";
+    /**
+     * Preference tag to retrieve the Text Size ( = {@value} )
+     */
+     String PREFERENCE_TEXT_SIZE           = "text_size";
+    /**
+     * Preference tag to retrieve the End of lines pref ( = {@value} )
+     */
+     String PREFERENCE_END_OF_LINES        = "end_of_lines";
+    /**
+     * Preference tag to retrieve the Encoding pref ( = {@value} )
+     */
+     String PREFERENCE_ENCODING            = "encoding";
+    /**
+     * Preference tag to retrieve the Auto mode ( = {@value} )
+     */
+     String PREFERENCE_AUTO_SAVE           = "force_auto_save";
+    /**
+     * Preference tag to retrieve the Auto mode ( = {@value} )
+     */
+     String PREFERENCE_AUTO_SAVE_OVERWRITE = "auto_save_overwrite";
+    /**
+     * Preference tag to retrieve the Color Theme ( = {@value} )
+     */
+     String PREFERENCE_COLOR_THEME         = "color_theme";
+    /**
+     * Preference tag to retrieve the fling to scroll ( = {@value} )
+     */
+     String PREFERENCE_FLING_TO_SCROLL     = "fling_to_scroll";
+    /**
+     * Preference tag to retrieve if undo history is allowed ( = {@value} )
+     */
+     String PREFERENCE_ALLOW_UNDO          = "allow_undo";
+    /**
+     * Preference tag to retrieve the max undo stack ( = {@value} )
+     */
+     String PREFERENCE_MAX_UNDO_STACK      = "max_undo_stack";
+    /**
+     * Preference tag to retrieve the back button as undo ( = {@value} )
+     */
+     String PREFERENCE_BACK_BUTTON_AS_UNDO = "back_button_as_undo";
+    /**
+     * Preference tag to retrieve the use home page ( = {@value} )
+     */
+     String PREFERENCE_USE_HOME_PAGE       = "use_home_page";
+    /**
+     * Preference tag to retrieve the home page path ( = {@value} )
+     */
+     String PREFERENCE_HOME_PAGE_PATH      = "home_page_path";
+    /**
+     * Preference tag to select the font ( = {@value} )
+     */
+     String PREFERENCE_SELECT_FONT         = "select_font";
+    /**
+     * Preference tag to the text font ( = {@value} )
+     */
+     String PREFERENCE_FONT                = "text_font";
+
+    /**
+     * minimum text size
+     */
+     int TEXT_SIZE_MIN = 9;
+    /**
+     * maximum text size
+     */
+     int TEXT_SIZE_MAX = 40;
+
+    /**
+     * End of PATTERN_LINE setting for Linux files ( = {@value} )
+     */
+     int EOL_LINUX   = 0;
+    /**
+     * End of PATTERN_LINE setting for Windows files ( = {@value} )
+     */
+     int EOL_WINDOWS = 1;
+    /**
+     * End of PATTERN_LINE setting for Mac files ( = {@value} )
+     */
+     int EOL_MAC     = 2;
+
+    /**
+     * Encoding : 7 bit ASCII ( = {@value} )
+     */
+     String ENC_ASCII = "US-ASCII";
+    /**
+     * Encoding : ISO Latin Alphabet, aka ISO-LATIN-1 ( = {@value} )
+     */
+     String ENC_LATIN = "ISO-8859-1";
+    /**
+     * Encoding : 8 bit UCS Transformation Format ( = {@value} )
+     */
+     String ENC_UTF8  = "UTF-8";
+
+    /**
+     * color theme default : black on white ( = {@value} )
+     */
+     int COLOR_CLASSIC  = 0;
+    /**
+     * color theme negative : white on black ( = {@value} )
+     */
+     int COLOR_NEGATIVE = 1;
+    /**
+     * color theme matrix : green on dark green ( = {@value} )
+     */
+     int COLOR_MATRIX   = 2;
+    /**
+     * color theme sky : darkblue on skyblue ( = {@value} )
+     */
+     int COLOR_SKY      = 3;
+    /**
+     * color theme dracula : red on black ( = {@value} )
+     */
+     int COLOR_DRACULA  = 4;
+
+    /**
+     * Request code for Save As Activity
+     */
+     int REQUEST_SAVE_AS   = 107;
+    /**
+     * Request code for Open Activity
+     */
+     int REQUEST_OPEN      = 108;
+    /**
+     * Request code for Home Page Activity
+     */
+     int REQUEST_HOME_PAGE = 109;
+    /**
+     * Request code for Font Activity
+     */
+     int REQUEST_FONT      = 110;
+
+     int REQUEST_RECENT = 111;
+
+    /**
+     * extra when browsing for file
+     */
+     String EXTRA_REQUEST_CODE    = "request_code";
+    /**
+     * Extra to force read only from widget
+     */
+     String EXTRA_FORCE_READ_ONLY = "force_read_only";
+
+    /**
+     * an error result
+     */
+     int RESULT_ERROR = 1;
+
+    /**
+     * Editor(TedFragment.java)
+     */
+    int REQUEST_FILE    = 112;
+    int REQUEST_PROJECT = 113;
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/common/FontUtils.java b/qpython/src/main/java/org/qpython/qpy/texteditor/common/FontUtils.java
new file mode 100644
index 00000000..c37f13dd
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/common/FontUtils.java
@@ -0,0 +1,17 @@
+package org.qpython.qpy.texteditor.common;
+
+import java.io.File;
+
+import android.content.Context;
+
+public class FontUtils {
+
+	/**
+	 * @param ctx
+	 *            the current application context
+	 * @return the app folder for fonts
+	 */
+	public static File getAppFontFolder(Context ctx) {
+		return ctx.getDir(Constants.FONT_FOLDER_NAME, Context.MODE_PRIVATE);
+	}
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/common/RecentFiles.java b/qpython/src/main/java/org/qpython/qpy/texteditor/common/RecentFiles.java
new file mode 100644
index 00000000..0648b000
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/common/RecentFiles.java
@@ -0,0 +1,100 @@
+package org.qpython.qpy.texteditor.common;
+
+import android.content.SharedPreferences;
+import android.content.SharedPreferences.Editor;
+import android.util.Log;
+
+import org.qpython.qpy.BuildConfig;
+
+import java.io.File;
+import java.util.ArrayList;
+
+/**
+ * Storage for a recent files list
+ * 
+ * TODO code review
+ */
+public class RecentFiles implements Constants {
+
+	/** the list of paths in the recent list */
+	private static ArrayList<String> PATHS;
+
+	/**
+	 * loads the recent files from shared preferences
+	 *
+	 * @param saved
+	 *            the previously saved string
+	 */
+	public static void loadRecentFiles(String saved) {
+		PATHS = new ArrayList<>();
+		String[] paths = saved.split(File.pathSeparator);
+		for (String path : paths) {
+			if (path.length() > 0) {
+				PATHS.add(path);
+			}
+			if (PATHS.size() == Settings.MAX_RECENT_FILES) {
+				break;
+			}
+		}
+	}
+
+	/**
+	 * Saves the preferences when they have been edited
+	 *
+	 * @param prefs
+	 *            the preferences to save to
+	 */
+	public static void saveRecentList(SharedPreferences prefs) {
+		String str = "";
+		Editor editor;
+
+		for (String path : PATHS) {
+			str += path;
+			str += File.pathSeparator;
+		}
+
+		editor = prefs.edit();
+		editor.putString(PREFERENCE_RECENTS, str);
+		editor.commit();
+	}
+
+	/**
+	 * @return the list of most recent files
+	 */
+	public static ArrayList<String> getRecentFiles() {
+		return PATHS;
+	}
+
+	/**
+	 * Updates the recent list with a path. If the path is already in the list,
+	 * bring it back to top, else add it.
+	 *
+	 * @param path
+	 *            the path to insert
+	 */
+	public static void updateRecentList(String path) {
+		if (PATHS.contains(path)) {
+			PATHS.remove(path);
+		}
+
+		PATHS.add(0, path);
+		while (PATHS.size() > Settings.MAX_RECENT_FILES) {
+			PATHS.remove(Settings.MAX_RECENT_FILES);
+		}
+		if (BuildConfig.DEBUG) {
+			Log.d(TAG, "added path to recent files : " + path);
+		}
+	}
+
+	/**
+	 * Removes a path from the recent files list
+	 *
+	 * @param path
+	 *            the path to remove
+	 */
+	public static void removePath(String path) {
+		if (PATHS.contains(path)) {
+			PATHS.remove(path);
+		}
+	}
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/common/Settings.java b/qpython/src/main/java/org/qpython/qpy/texteditor/common/Settings.java
new file mode 100644
index 00000000..a58ac42d
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/common/Settings.java
@@ -0,0 +1,179 @@
+package org.qpython.qpy.texteditor.common;
+
+import java.io.File;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.content.SharedPreferences.Editor;
+import android.graphics.Typeface;
+
+public class Settings implements Constants {
+
+	/** Number of recent files to remember */
+	public static int MAX_RECENT_FILES = 10;
+	
+	public static int MAX_LINES_NUM_WITH_SYNTAX = 300;
+
+	/** Show the lines PATTERN_NUMBER */
+	public static boolean SHOW_LINE_NUMBERS = true;
+	/** automatic break PATTERN_LINE to fit one page */
+	public static boolean WORDWRAP = false;
+
+	public static boolean SHOW_GIST = true;
+
+	/** color setting */
+	public static int COLOR = COLOR_CLASSIC;
+
+	/** when setSearchState reaches the end of a file, setSearchState wrap */
+	public static boolean SEARCHWRAP = false;
+	/** only setSearchState for matchin case */
+	public static boolean SEARCHMATCHCASE = false;
+
+	/** Text size setting */
+	public static int TEXT_SIZE = 14;
+
+	/** Default end of PATTERN_LINE */
+	public static int DEFAULT_END_OF_LINE = EOL_LINUX;
+	/** End Of Line style */
+	public static int END_OF_LINE = EOL_LINUX;
+	/** Encoding */
+	public static String ENCODING = ENC_UTF8;
+
+	/** Let auto save on quit be triggered */
+	public static boolean FORCE_AUTO_SAVE = true;
+	public static boolean AUTO_SAVE_OVERWRITE = false;
+
+	/** enable fling to scroll */
+	public static boolean FLING_TO_SCROLL = false;
+
+	/** Use Undo instead of quit ? */
+	public static boolean UNDO = true;
+	/** Undo stack capacity */
+	public static int UNDO_MAX_STACK = 25;
+	/** Use back button as undo */
+	public static boolean BACK_BTN_AS_UNDO = false;
+
+	/** Use a Home Page */
+	public static boolean USE_HOME_PAGE = false;
+	/** Home Page Path */
+	public static String HOME_PAGE_PATH = "";
+
+	/**
+	 * @return the end of PATTERN_LINE characters according to the current settings
+	 */
+	public static String getEndOfLine() {
+		switch (END_OF_LINE) {
+		case EOL_MAC: // Mac OS
+			return "\r";
+		case EOL_WINDOWS: // Windows
+			return "\r\n";
+		case EOL_LINUX: // Linux / Android
+		default:
+			return "\n";
+		}
+	}
+
+	/**
+	 * Update the settings from the given {@link SharedPreferences}
+	 * 
+	 * @param settings
+	 *            the settings to read from
+	 */
+	public static void updateFromPreferences(SharedPreferences settings) {
+
+		MAX_RECENT_FILES = getStringPreferenceAsInteger(settings,
+				PREFERENCE_MAX_RECENTS, "10");
+		MAX_LINES_NUM_WITH_SYNTAX = getStringPreferenceAsInteger(settings,
+				PREFERENCE_MAX_LINES_NUM_WITH_SYNTAX, "300");
+
+		SHOW_LINE_NUMBERS = settings.getBoolean(PREFERENCE_SHOW_LINE_NUMBERS,
+				true);
+		SHOW_GIST = settings.getBoolean(PREFERENCES_GIST, true);
+		WORDWRAP = settings.getBoolean(PREFERENCE_WORDWRAP, false);
+		TEXT_SIZE = getStringPreferenceAsInteger(settings,
+				PREFERENCE_TEXT_SIZE, "14");
+		DEFAULT_END_OF_LINE = getStringPreferenceAsInteger(settings,
+				PREFERENCE_END_OF_LINES, ("" + EOL_LINUX));
+//		FORCE_AUTO_SAVE = settings.getBoolean(PREFERENCE_AUTO_SAVE, false);
+		FORCE_AUTO_SAVE = true;// 自动保存
+		AUTO_SAVE_OVERWRITE = settings.getBoolean(
+				PREFERENCE_AUTO_SAVE_OVERWRITE, false);
+		COLOR = getStringPreferenceAsInteger(settings, PREFERENCE_COLOR_THEME,
+				("" + COLOR_CLASSIC));
+		SEARCHWRAP = settings.getBoolean(PREFERENCE_SEARCHWRAP, false);
+		SEARCHMATCHCASE = settings.getBoolean(PREFERENCE_SEARCH_MATCH_CASE,
+				false);
+		ENCODING = settings.getString(PREFERENCE_ENCODING, ENC_UTF8);
+		FLING_TO_SCROLL = settings.getBoolean(PREFERENCE_FLING_TO_SCROLL, true);
+
+		BACK_BTN_AS_UNDO = settings.getBoolean(PREFERENCE_BACK_BUTTON_AS_UNDO,
+				false);
+		UNDO = settings.getBoolean(PREFERENCE_ALLOW_UNDO, true);
+		UNDO_MAX_STACK = getStringPreferenceAsInteger(settings,
+				PREFERENCE_MAX_UNDO_STACK, "25");
+
+		USE_HOME_PAGE = settings.getBoolean(PREFERENCE_USE_HOME_PAGE, false);
+		HOME_PAGE_PATH = settings.getString(PREFERENCE_HOME_PAGE_PATH, "");
+
+		RecentFiles.loadRecentFiles(settings.getString(PREFERENCE_RECENTS, ""));
+	}
+
+	/**
+	 * Reads a preference stored as a string and returns the numeric value
+	 * 
+	 * @param prefs
+	 *            the prefernce to read from
+	 * @param key
+	 *            the key
+	 * @param def
+	 *            the default value
+	 * @return the value as an int
+	 */
+	protected static int getStringPreferenceAsInteger(SharedPreferences prefs,
+			String key, String def) {
+		String strVal;
+		int intVal;
+
+		strVal = null;
+		try {
+			strVal = prefs.getString(key, def);
+		} catch (Exception e) {
+			strVal = def;
+		}
+
+		try {
+			intVal = Integer.parseInt(strVal);
+		} catch (NumberFormatException e) {
+			intVal = 0;
+		}
+
+		return intVal;
+	}
+
+	/**
+	 * Save the Home page settings
+	 * 
+	 * @param settings
+	 *            the settings to write to
+	 */
+	public static void saveHomePage(SharedPreferences settings) {
+		Editor editor = settings.edit();
+		editor.putString(PREFERENCE_HOME_PAGE_PATH, HOME_PAGE_PATH);
+		editor.commit();
+
+	}
+
+	public static File getFontFile(Context ctx) {
+		return new File(ctx.getDir(FONT_FOLDER_NAME, Context.MODE_PRIVATE),
+				FONT_FILE_NAME);
+	}
+
+	public static Typeface getTypeface(Context ctx) {
+		File fontFile = getFontFile(ctx);
+		Typeface res = Typeface.MONOSPACE;
+		if (fontFile.exists() && fontFile.canRead()) {
+			res = Typeface.createFromFile(getFontFile(ctx));
+		}
+		return res;
+	}
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/common/TedChangelog.java b/qpython/src/main/java/org/qpython/qpy/texteditor/common/TedChangelog.java
new file mode 100644
index 00000000..a8a07559
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/common/TedChangelog.java
@@ -0,0 +1,35 @@
+package org.qpython.qpy.texteditor.common;
+
+import org.qpython.qpy.R;
+
+public class TedChangelog extends org.qpython.qpy.texteditor.androidlib.common.ChangeLog {
+
+	/**
+	 * @see fr.xgouchet.androidlib.common.ChangeLog#getTitleResourceForVersion(int)
+	 */
+	@Override
+	public int getTitleResourceForVersion(int version) {
+		int res = 0;
+		switch (version) {
+		case 18:
+		default:
+			res = R.string.release18;
+		}
+		return res;
+	}
+
+	/**
+	 * @see fr.xgouchet.androidlib.common.ChangeLog#getChangeLogResourceForVersion(int)
+	 */
+	@Override
+	public int getChangeLogResourceForVersion(int version) {
+		int res = 0;
+		switch (version) {
+		case 18:
+		default:
+			res = R.string.release18_log;
+		}
+		return res;
+	}
+
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/common/TextFileUtils.java b/qpython/src/main/java/org/qpython/qpy/texteditor/common/TextFileUtils.java
new file mode 100644
index 00000000..5416ce8d
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/common/TextFileUtils.java
@@ -0,0 +1,168 @@
+package org.qpython.qpy.texteditor.common;
+
+import android.content.Context;
+import android.util.Log;
+
+import org.qpython.qpy.BuildConfig;
+
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
+
+/**
+ * Misc file utilities
+ * 
+ * TODO code review
+ * 
+ */
+public class TextFileUtils implements Constants {
+
+	/**
+	 * @param path
+	 *            the absolute path to the file to save
+	 * @param text
+	 *            the text to write
+	 * @return if the file was saved successfully
+	 */
+	public static boolean writeTextFile(String path, String text) {
+		File file = new File(path);
+		OutputStreamWriter writer;
+		BufferedWriter out;
+		String eol_text = text;
+		try {
+			if (Settings.END_OF_LINE != EOL_LINUX) {
+				eol_text = eol_text.replaceAll("\n", Settings.getEndOfLine());
+			}
+			writer = new OutputStreamWriter(new FileOutputStream(file),
+					Settings.ENCODING);
+			out = new BufferedWriter(writer);
+			out.write(eol_text);
+			out.close();
+		} catch (OutOfMemoryError e) {
+			Log.w(TAG, "Out of memory error", e);
+			return false;
+		} catch (IOException e) {
+			Log.w(TAG, "Can't write to file " + path, e);
+			return false;
+		}
+		return true;
+	}
+
+	/**
+	 * @param file
+	 *            the file to read
+	 * @return the content of the file as text
+	 */
+	public static String readTextFile(File file) {
+		InputStreamReader reader;
+		BufferedReader in;
+		StringBuffer text = new StringBuffer();
+		int c;
+		try {
+			reader = new InputStreamReader(new FileInputStream(file),
+					Settings.ENCODING);
+			in = new BufferedReader(reader);
+			do {
+				c = in.read();
+				if (c != -1) {
+					text.append((char) c);
+				}
+			} while (c != -1);
+			in.close();
+		} catch (IOException e) {
+			Log.w(TAG, "Can't read file " + file.getName(), e);
+			return null;
+		} catch (OutOfMemoryError e) {
+			Log.w(TAG, "File is to big to read", e);
+			return null;
+		}
+
+		// detect end of lines
+		String content = text.toString();
+		int windows = content.indexOf("\r\n");
+		int macos = content.indexOf("\r");
+
+		if (windows != -1) {
+			Settings.END_OF_LINE = EOL_WINDOWS;
+			content = content.replaceAll("\r\n", "\n");
+		} else {
+			if (macos != -1) {
+				Settings.END_OF_LINE = EOL_MAC;
+				content = content.replaceAll("\r", "\n");
+			} else {
+				Settings.END_OF_LINE = EOL_LINUX;
+			}
+		}
+
+		if (BuildConfig.DEBUG) {
+			Log.d(TAG, "Using End of Line : " + Settings.END_OF_LINE);
+		}
+		return content;
+	}
+
+	/**
+	 * @param context
+	 *            the current context
+	 * @param text
+	 *            the text to write
+	 * @return if the file was saved successfully
+	 */
+	public static boolean writeInternal(Context context, String text) {
+		FileOutputStream fos;
+		try {
+			fos = context
+					.openFileOutput(BACKUP_FILE_NAME, Context.MODE_PRIVATE);
+			fos.write(text.getBytes());
+			fos.close();
+			if (BuildConfig.DEBUG) {
+				Log.i(TAG, "Saved to file " + context.getFilesDir().getPath()
+						+ File.separator + BACKUP_FILE_NAME);
+			}
+		} catch (FileNotFoundException e) {
+			Log.w(TAG, "Couldn't write to internal storage ", e);
+			return false;
+		} catch (IOException e) {
+			Log.w(TAG, "Error occured while writing to internal storage ", e);
+			return false;
+		}
+		return true;
+	}
+
+	/**
+	 * @param context
+	 *            the current context
+	 * @return the content of the file as text
+	 */
+	public static String readInternal(Context context) {
+		FileInputStream fis;
+		StringBuffer text = new StringBuffer();
+
+		try {
+			fis = context.openFileInput(BACKUP_FILE_NAME);
+			while (fis.available() > 0) {
+				text.append((char) fis.read());
+			}
+		} catch (FileNotFoundException e) {
+			Log.w(TAG, "No backup file available", e);
+			return null;
+		} catch (IOException e) {
+			Log.w(TAG, "Can't read backup file ", e);
+			return null;
+		}
+		return text.toString();
+	}
+
+	/**
+	 * @param context
+	 *            the current context
+	 */
+	public static void clearInternal(Context context) {
+		writeInternal(context, "");
+	}
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/common/WidgetPrefs.java b/qpython/src/main/java/org/qpython/qpy/texteditor/common/WidgetPrefs.java
new file mode 100644
index 00000000..26fe12b7
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/common/WidgetPrefs.java
@@ -0,0 +1,120 @@
+package org.qpython.qpy.texteditor.common;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.content.SharedPreferences.Editor;
+
+public class WidgetPrefs {
+
+	public final static String WIDGET_PREFERENCES = "fr.xgouchet.texteditor.widget";
+
+	public final static String WIDGET_TARGET_PATH = "target_path_";
+
+	public final static String WIDGET_READ_ONLY = "read_only_";
+
+	public final static String WIDGET_PRESENT_KEY = "widget_present_";
+
+	public String mTargetPath;
+	public boolean mReadOnly;
+
+	public WidgetPrefs() {
+		mTargetPath = "";
+	}
+
+	/**
+	 * Delete the data associated with a widget ID
+	 *
+	 * @param context
+	 *            the current context
+	 * @param widgetId
+	 *            the id to delete
+	 */
+	public static void delete(Context context, int widgetId) {
+		String key;
+		SharedPreferences prefs;
+		Editor edit;
+
+		prefs = context.getSharedPreferences(WIDGET_PREFERENCES,
+				Context.MODE_PRIVATE);
+		if (prefs != null) {
+			edit = prefs.edit();
+
+			if (edit != null) {
+				key = WIDGET_TARGET_PATH + String.valueOf(widgetId);
+				edit.remove(key);
+
+				key = WIDGET_READ_ONLY + String.valueOf(widgetId);
+				edit.remove(key);
+
+				key = WIDGET_PRESENT_KEY + String.valueOf(widgetId);
+				edit.remove(key);
+
+				edit.commit();
+			}
+		}
+	}
+
+	/**
+	 * Loads the widget prefs from the shared preferences
+	 *
+	 * @param context
+	 *            the current context
+	 * @param widgetId
+	 *            this widget id
+	 * @return if the widget is still present
+	 */
+	public boolean load(Context context, int widgetId) {
+		String key;
+		SharedPreferences prefs;
+
+		prefs = context.getSharedPreferences(WIDGET_PREFERENCES,
+				Context.MODE_PRIVATE);
+
+		if (prefs != null) {
+			key = WIDGET_TARGET_PATH + String.valueOf(widgetId);
+			mTargetPath = prefs.getString(key, "");
+
+			key = WIDGET_READ_ONLY + String.valueOf(widgetId);
+			mReadOnly = prefs.getBoolean(key, false);
+
+			key = WIDGET_PRESENT_KEY + String.valueOf(widgetId);
+			return prefs.getBoolean(key, false);
+		}
+
+		return false;
+	}
+
+	/**
+	 * Store this widget prefs in the shared preferences
+	 *
+	 * @param context
+	 *            the current context
+	 * @param widgetId
+	 *            this widget id
+	 */
+	public void store(Context context, int widgetId) {
+		String key;
+		SharedPreferences prefs;
+		Editor edit;
+
+		prefs = context.getSharedPreferences(WIDGET_PREFERENCES,
+				Context.MODE_PRIVATE);
+
+		if (prefs != null) {
+			edit = prefs.edit();
+
+			if (edit != null) {
+				key = WIDGET_TARGET_PATH + String.valueOf(widgetId);
+				edit.putString(key, mTargetPath);
+
+				key = WIDGET_READ_ONLY + String.valueOf(widgetId);
+				edit.putBoolean(key, mReadOnly);
+
+				key = WIDGET_PRESENT_KEY + String.valueOf(widgetId);
+				edit.putBoolean(key, true);
+
+				edit.commit();
+			}
+		}
+	}
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/newtexteditor/AfterTextChangeListener.java b/qpython/src/main/java/org/qpython/qpy/texteditor/newtexteditor/AfterTextChangeListener.java
new file mode 100755
index 00000000..e8066a30
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/newtexteditor/AfterTextChangeListener.java
@@ -0,0 +1,3 @@
+public interface AfterTextChangeListener {
+	public void afterTextChange();
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/newtexteditor/EditableWithLayout.java b/qpython/src/main/java/org/qpython/qpy/texteditor/newtexteditor/EditableWithLayout.java
new file mode 100755
index 00000000..538ca4d5
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/newtexteditor/EditableWithLayout.java
@@ -0,0 +1,931 @@
+package org.qpython.qpy.texteditor.newtexteditor;
+
+import java.lang.reflect.Array;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Stack;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.graphics.Rect;
+import android.text.Editable;
+import android.text.InputFilter;
+import android.text.Selection;
+import android.text.TextPaint;
+import android.text.TextUtils;
+import android.text.TextWatcher;
+import android.text.style.ForegroundColorSpan;
+import android.util.Log;
+
+public class EditableWithLayout implements Editable,MyLayout {
+	protected static final String TAG="EditableWithLayout";
+	public static boolean mEnableHightLight=true;
+    List<LineBody> mLineBodies=new ArrayList<LineBody>();
+    List<SpanBody> mSpanBodies=new ArrayList<SpanBody>();
+	private int mLength=0;
+	private char []mText=new char[0];
+	private TextPaint mTextPaint ;
+	private TextPaint mSpanPaint ;
+	private TextWatcher mTextWatcher=null;
+    private int mSelectionStart=0;
+    private int mSelectionEnd=0;
+    private int mComposingStart=0;
+    private int mComposingEnd=0;
+    private Rect mRect=new Rect();
+    private Rect mRectLine=new Rect();
+    private float mLineHeight;
+    private float mTabWidth;
+    private ForegroundColorSpan mDefaultColorSpan;
+	private int mMaxSaveHistory;
+	private Stack<ReplaceBody> mUndoBodies = new Stack<ReplaceBody>();
+	private Stack<ReplaceBody> mRedoBodies = new Stack<ReplaceBody>();
+	public EditableWithLayout() {
+		setPaint(new TextPaint());
+		analysisLines();
+	}
+	
+	static void charsCopyStartToEnd(char []src,int where,char []dst,int start,int end){
+		for(;start<end;start++,where++){
+			dst[start]=src[where];
+		}
+	}
+	
+	static void charsCopyEndToStart(char []src,int where,char []dst,int start,int end){
+		int srcend=where+end-start;
+		for(;end>=start;end--,srcend--){
+			dst[end]=src[srcend];
+		}
+	}
+
+	@Override
+	public float getLineHeight() {
+		Log.i(TAG, "getLineHeight:"+mLineHeight);
+		return mLineHeight;
+	}
+
+	public void setLineHeight(float lineHeight){
+		Log.i(TAG, "setLineHeight:"+lineHeight);
+		mLineHeight=lineHeight;
+	}
+	
+	@Override
+	public int length() {
+		return mLength;
+	}
+	
+	private void resizeTo(int size){
+		if(mText.length>size)
+			return ;
+		char[] text=new char[size+4096];
+		System.arraycopy(mText, 0, text, 0, length());
+		mText=text;
+	}
+
+	@Override
+	public char charAt(int index) {
+		return mText[index];
+	}
+
+	@Override
+	public CharSequence subSequence(int start, int end) {
+		return String.copyValueOf(mText, start, end-start);
+	}
+	
+	@Override
+	public void getChars(int start, int end, char[] dest, int destoff) {
+        for (int i = start; i < end; i++)
+            dest[destoff++] = mText[i];
+	}
+
+	@Override
+	public void setSpan(Object what, int start, int end, int flags) {
+		if( what instanceof TextWatcher )
+		{
+			mTextWatcher=(TextWatcher) what;
+		}
+		else
+		if( what == Selection.SELECTION_START )
+		{
+			Log.i(TAG, "set SELECTION_START");
+			mSelectionStart=start;
+		}
+		else
+		if( what == Selection.SELECTION_END )
+		{
+			Log.i(TAG, "set SELECTION_END");
+			mSelectionEnd=start;
+		}
+		else
+		if( what instanceof ForegroundColorSpan ){
+		}
+		else
+		if( what == MyInputConnection.COMPOSING  )
+		{
+			Log.i(TAG, "set COMPOSING");
+			mComposingStart=start;
+			mComposingEnd=end;
+		}
+	}
+	
+	public void sendTextBeforeChanged(CharSequence s,int start,int count,int after){
+		if(mTextWatcher!=null)
+			mTextWatcher.beforeTextChanged(s, start, count, after);
+	}
+	
+	public void sendOnTextChanged(CharSequence s,int start,int before,int count){
+		for(int i=0;i<mSpanBodies.size();i++)
+		{
+			SpanBody spanBody=mSpanBodies.get(i);
+			if(spanBody.mEnd>start){
+				spanBody.mEnd+=count;
+			}
+			if(spanBody.mStart>start){
+				spanBody.mStart+=count;
+			}
+			if(spanBody.length()<=0)
+			{
+				mSpanBodies.remove(i);
+				i--;
+			}
+		}
+		if(mTextWatcher!=null)
+			mTextWatcher.onTextChanged(s, start, before, count);
+	}
+	
+	public void sendTextAfterChanged(){
+		if(mTextWatcher!=null)
+		{
+			mTextWatcher.afterTextChanged(this);
+		}
+	}
+
+	@Override
+	public void removeSpan(Object what) {
+	}
+	
+	@SuppressWarnings("unchecked")
+	@Override
+	public <T> T[] getSpans(int start, int end, Class<T> type) {
+
+		return (T[]) Array.newInstance(type, 0);
+	}
+	
+	private List<SpanBody> getColorSpanBodies(int start, int end){
+		LinkedList<SpanBody> bodies=new LinkedList<SpanBody>();
+		int startSpan=0;
+		int endSpan=mSpanBodies.size()-1;
+		int pos=0;
+		if(endSpan>=0)
+		while(true)
+		{
+			int center=(startSpan+endSpan)/2;
+			SpanBody centerBody=mSpanBodies.get(center);
+			int ret=centerBody.compileTo(start);
+			if(ret==0){
+				pos=center;
+				break;
+			}
+			if(center >= endSpan){
+				pos=center;
+				break;
+			}
+			if(ret>0)
+			{
+				startSpan=center+1;
+			}else{
+				endSpan=center-1;
+			}
+		}
+
+		int proStart=start;
+		for(;pos<mSpanBodies.size();pos++){
+			SpanBody body=mSpanBodies.get(pos);
+			if(body.mStart>=end)
+				break;
+			if(body.hasSub(start, end))
+			{
+				if(body.mStart>proStart){
+					bodies.add(new SpanBody(mDefaultColorSpan, proStart, body.mStart, 0));
+				}
+				int tend=body.mEnd<=end?body.mEnd:end;
+				int tstart=body.mStart>=start?body.mStart:start;
+				if(tend-tstart>0)
+					bodies.add(new SpanBody(body.mSpan, tstart, tend, 0));
+				proStart=tend;
+				if(proStart>=end)
+					break;
+			}
+		}
+		if(proStart<end)
+			bodies.add(new SpanBody(mDefaultColorSpan, proStart, end, 0));
+		/*
+		if(mSpanBodies!=null)
+		{
+			Iterator<SpanBody> iterator=mSpanBodies.iterator();
+			int proStart=start;
+			while(iterator.hasNext()){
+				SpanBody body=iterator.next();
+				if(body.hasSub(start, end))
+				{
+					if(body.mStart>proStart){
+						bodies.add(new SpanBody(mDefaultColorSpan, proStart, body.mStart, 0));
+					}
+					int tend=body.mEnd<=end?body.mEnd:end;
+					int tstart=body.mStart>=start?body.mStart:start;
+					if(tend-tstart>0)
+						bodies.add(new SpanBody(body.mSpan, tstart, tend, 0));
+					proStart=tend;
+					if(proStart>=end)
+						break;
+				}
+			}
+			if(proStart<end)
+				bodies.add(new SpanBody(mDefaultColorSpan, proStart, end, 0));
+
+		}
+		else{
+			bodies.add(new SpanBody(mDefaultColorSpan, start, end, 0));
+		}
+		*/
+		//LogUtil.i(TAG, "sumLoop:"+sumLoop);
+		return bodies;
+	}
+
+	@Override
+	public int getSpanStart(Object tag) {
+		if(tag == Selection.SELECTION_START)
+			return mSelectionStart;
+		if(tag == Selection.SELECTION_END)
+			return mSelectionEnd;
+		if(tag == MyInputConnection.COMPOSING )
+			return mComposingStart;
+		return 0;
+	}
+
+	@Override
+	public int getSpanEnd(Object tag) {
+		if(tag == Selection.SELECTION_END)
+			return mSelectionEnd;
+		if(tag == Selection.SELECTION_START)
+			return mSelectionStart;
+		if(tag == MyInputConnection.COMPOSING )
+			return mComposingEnd;
+		return 0;
+	}
+
+	@Override
+	public int getSpanFlags(Object tag) {
+		return 0;
+	}
+
+	@SuppressWarnings("rawtypes")
+	@Override
+	public int nextSpanTransition(int start, int limit, Class type) {
+		return 0;
+	}
+	
+	@Override
+	public Editable replace(int st, int en, CharSequence text, int start,int end) {
+		cleanRedo();
+		return replace(st,en,text,start,end,true);
+	}
+
+	public Editable replace(int st, int en, CharSequence text, int start,int end,boolean saveToUndo) {
+		int deleteLen=en-st;
+		int insertLen=end-start;
+		int addLen=insertLen-deleteLen;
+		resizeTo(length()+addLen);
+		if(deleteLen<0||insertLen<0)
+			return this;
+		if(deleteLen==0&&insertLen==0)
+			return this;
+		if(saveToUndo){
+			if(mMaxSaveHistory>0){
+				if(mUndoBodies.size()>mMaxSaveHistory)
+					mUndoBodies.remove(0);
+				ReplaceBody body=new ReplaceBody(st, en, subSequence(st, en),text, start, end, mSelectionStart, mSelectionEnd);
+				if(!mUndoBodies.isEmpty() && mUndoBodies.peek().addBody(body))
+				{
+				}
+				else
+					mUndoBodies.push(body);
+			}
+		}
+
+		sendOnTextChanged(this, st, length(), addLen);
+		sendTextBeforeChanged(this, st,addLen ,length()+addLen);
+
+		if(mSelectionStart==st && mSelectionEnd==en){
+			mSelectionStart=mSelectionEnd=en+addLen;
+		}
+		else
+		{
+			if(mSelectionStart>=st){
+				mSelectionStart+=addLen;
+				if(mSelectionStart<st)
+					mSelectionStart=st;
+			}
+			if(mSelectionEnd>=st){
+				mSelectionEnd+=addLen;
+				if(mSelectionEnd<st)
+					mSelectionEnd=st;
+			}
+		}
+
+		if(addLen>0)
+			charsCopyEndToStart(mText, en, mText, en+addLen, length()+addLen);
+		else
+		if(addLen<0)
+			charsCopyStartToEnd(mText, en, mText, en+addLen, length()+addLen);
+		if(insertLen>0)
+			TextUtils.getChars(text, start, end, mText, st);
+		mLength+=addLen;
+		if(mSelectionStart<0)
+			mSelectionStart=0;
+		if(mSelectionEnd<0)
+			mSelectionEnd=0;
+		if(mSelectionStart>mLength)
+			mSelectionStart=mLength;
+		if(mSelectionEnd>mLength)
+			mSelectionEnd=mLength;
+
+		analysisLines();
+		sendTextAfterChanged();
+		return this;
+	}
+
+	@Override
+	public Editable replace(int st, int en, CharSequence text) {
+		return replace(st, en, text, 0, text.length());
+	}
+
+	@Override
+	public Editable insert(int where, CharSequence text, int start, int end) {
+		int len = end-start;
+		if(where<0 || where>length() || len<=0)
+			return this;
+		return replace(where,where, text, start, end);
+	}
+
+	@Override
+	public Editable insert(int where, CharSequence text) {
+		return insert(where,text,0,text.length());
+	}
+	
+	@Override
+	public Editable delete(int st, int en) {
+		return replace(st, en, null, 0, 0);
+	}
+
+	@Override
+	public Editable append(CharSequence text) {
+		return null;
+	}
+
+	@Override
+	public Editable append(CharSequence text, int start, int end) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public Editable append(char text) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public void clear() {
+		sendOnTextChanged(this, 0, length(), length());
+		sendTextBeforeChanged(this, 0, length(), 0);
+		mLength=0;
+		sendTextAfterChanged();
+	}
+
+	@Override
+	public void clearSpans() {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public InputFilter[] getFilters() {
+		return null;
+	}
+
+	@Override
+	public void setFilters(InputFilter[] filters) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public int getLineForOffset(int offset) {
+		if(mLineBodies.isEmpty())
+			return 0;
+		int startLine=0;
+		int endLine=getLineCount()-1;
+		if(mLineBodies instanceof ArrayList )
+		{
+			while(true){
+				int centerLine=(startLine+endLine)/2;
+				LineBody bodyCenter=mLineBodies.get(centerLine);
+				int ret=bodyCenter.compileTo(offset);
+				if(ret==0)
+					return centerLine;
+				if(centerLine>=endLine)
+					break;
+				if(ret<0)
+					endLine=centerLine-1;
+				else
+					startLine=centerLine+1;
+			}
+		}
+		else
+		{
+			for(int i=0;i<mLineBodies.size();i++)
+			{
+				LineBody body=mLineBodies.get(i);
+				if(body.in(offset))
+					return i;
+			}
+		}
+		return endLine;
+	}
+
+	@Override
+	public float getPrimaryHorizontal(int start) {
+		int line=getLineForOffset(start);
+		LineBody body= mLineBodies.get(line);
+		Paint paint=getPaint();
+		float horizontal=0f;
+		for(int offset=body.mStart;offset<start;offset++){
+			float tx=0;
+			if(mText[offset]=='\t')
+				tx=mTabWidth - (horizontal % mTabWidth);
+			else
+				tx=paint.measureText(mText, offset, 1);
+			horizontal+=tx;
+		}
+		/*
+		try {
+			//horizontal=getPaint().measureText(this, body.mStart, start);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}*/
+		return horizontal;
+	}
+
+	@Override
+	public void getLineBounds(int line, Rect rect) {
+		rect.left=0;
+		rect.right=Integer.MAX_VALUE/2;
+		float top=line*mLineHeight;
+		rect.top=(int) top;
+		rect.bottom=(int) (top+mLineHeight);
+	}
+
+	@Override
+	public int getLineForVertical(int top) {
+		int line=(int) (top/mLineHeight);
+		if(line<0)
+			line=0;
+		if(line>=getLineCount())
+			line=getLineCount()-1;
+		return line;
+	}
+
+	public void draw(Canvas canvas) {
+		long timeStart = System.currentTimeMillis();
+		canvas.getClipBounds(mRect);
+		int lastLine=getLineCount()-1;
+		int startLine=getLineForVertical(mRect.top);
+		int endLine=getLineForVertical(mRect.bottom);
+		float descent=mTextPaint.getFontMetrics().descent;
+		for(int i=startLine;i<=endLine;i++)
+		{
+			getLineBounds(i, mRectLine);
+			LineBody body=mLineBodies.get(i);
+			int proTab=body.mStart;
+			int nextTab;
+			float startX=0;
+			float lineY=mRectLine.bottom-descent;
+			int start;
+			int count;
+			while(true){
+				nextTab=getNextTab(proTab);
+				if(nextTab==-1)
+					break;
+				if( proTab!=nextTab ){
+					start=proTab;
+					count=nextTab-proTab;
+					List<SpanBody> bodies=getColorSpanBodies(start, start+count);
+					Iterator<SpanBody> iterator=bodies.iterator();
+					while(iterator.hasNext()){
+						SpanBody spanBody=iterator.next();
+						mSpanPaint.setColor( ((ForegroundColorSpan)spanBody.mSpan).getForegroundColor() );
+						float tstartX=startX+measureText(mText, spanBody.mStart, spanBody.length());
+						if(tstartX>mRect.left)
+							canvas.drawText(mText, spanBody.mStart, spanBody.length(), startX, lineY, mSpanPaint);
+						startX=tstartX;
+						if(startX>mRect.right)
+							break;
+					}
+					if(startX>mRect.right)
+						break;
+				}
+				startX+=mTabWidth-(startX % mTabWidth);
+				proTab=nextTab+1;
+			}
+
+			start=proTab;
+			if(lastLine==i)
+				count=body.mEnd-proTab;
+			else
+				count=body.mEnd-proTab-1;
+
+			if(count>0)
+			{
+				List<SpanBody> bodies=getColorSpanBodies(start, start+count);
+				Iterator<SpanBody> iterator=bodies.iterator();
+				while(iterator.hasNext()){
+					SpanBody spanBody=iterator.next();
+					mSpanPaint.setColor( ((ForegroundColorSpan)spanBody.mSpan).getForegroundColor() );
+					float tstartX=startX+measureText(mText, spanBody.mStart, spanBody.length());
+					if(tstartX>mRect.left)
+						canvas.drawText(mText, spanBody.mStart, spanBody.length(), startX, lineY, mSpanPaint);
+					startX=tstartX;
+					if(startX>mRect.right)
+						break;
+				}
+			}
+
+		}
+		long timeEnd = System.currentTimeMillis();
+	}
+	
+	/*
+	Bitmap mCacheBitmap=null;
+	Bitmap mCacheBitmapBk=null;
+	Rect mPerRect=new Rect();
+	Rect mNowRect=new Rect();
+	@Override
+	public void draw(Canvas canvas)
+	{
+		canvas.getClipBounds(mNowRect);
+		if( mCacheBitmap==null || mPerRect.width()!=mNowRect.width() || mPerRect.height()!=mNowRect.height() )
+		{//size change 
+			mPerRect.set(0, 0, 0, 0);
+			try {
+				mCacheBitmap=null;
+				mCacheBitmapBk=null;
+				mCacheBitmap=Bitmap.createBitmap(mNowRect.width(), mNowRect.height(), Config.ARGB_4444);
+				mCacheBitmapBk=Bitmap.createBitmap(mNowRect.width(), mNowRect.height(), Config.ARGB_4444);
+			} catch (Exception e) {
+				mCacheBitmap=null;
+				mCacheBitmapBk=null;
+			} catch (Error e) {
+				mCacheBitmap=null;
+				mCacheBitmapBk=null;
+			}
+		}
+		if(mCacheBitmap!=null)
+		{
+			Bitmap tempBitmap=mCacheBitmap;
+			mCacheBitmap=mCacheBitmapBk;
+			mCacheBitmapBk=tempBitmap;
+			
+			Canvas canvas2=new Canvas(mCacheBitmap);
+			canvas2.drawColor(Color.TRANSPARENT, Mode.CLEAR);
+			if(mPerRect.width()>0||mPerRect.height()>0)
+			{
+				int dx=mPerRect.left-mNowRect.left;
+				int dy=mPerRect.top-mNowRect.top;
+				canvas2.drawBitmap(mCacheBitmapBk, dx, dy, mSpanPaint);
+				canvas2.translate(-mNowRect.left, -mNowRect.top);
+				if(dy>0)
+				{
+					canvas2.save();
+					canvas2.clipRect(mNowRect.left, mNowRect.top, mNowRect.right, mPerRect.top);
+					drawReal(canvas2);
+					canvas2.restore();
+				}
+				else
+				if(dy<0)
+				{
+					canvas2.save();
+					canvas2.clipRect(mNowRect.left, mPerRect.bottom, mNowRect.right, mNowRect.bottom);
+					drawReal(canvas2);
+					canvas2.restore();
+				}
+				else  //if(dy==0)
+				{
+					LogUtil.i(TAG, "if(dy==0)");
+					if(dx>0)
+					{
+						canvas2.clipRect(mNowRect.left, mNowRect.top, mPerRect.left, mNowRect.bottom );
+						drawReal(canvas2);
+					}
+					else
+					if(dx<0)
+					{
+						canvas2.clipRect(mPerRect.right, mNowRect.top,mNowRect.right, mNowRect.bottom );
+						drawReal(canvas2);
+					}
+				}
+			}
+			else
+			{
+				canvas2.translate(-mNowRect.left, -mNowRect.top);
+				drawReal(canvas2);
+			}
+			canvas.drawBitmap(mCacheBitmap, mNowRect.left, mNowRect.top, mSpanPaint);
+			mPerRect.set(mNowRect);
+		}
+		else
+			drawReal(canvas);
+	}
+	*/
+	
+	@SuppressWarnings("unused")
+	private void drawTest(Canvas canvas)
+	{
+		float startY=0;
+		for(int y=0;y<40;y++)
+		{
+			float startX=0;
+			for(int x=0;x<18;x++)
+			{
+				String text=""+x;
+				mSpanPaint.setColor(Color.rgb(255, 0, 0));
+				canvas.drawText(text, startX, startY, mSpanPaint);
+				startX+=mSpanPaint.measureText(text);
+
+				text=",";
+				mSpanPaint.setColor(Color.rgb(0, 0, 0));
+				canvas.drawText(text, startX, startY, mSpanPaint);
+				startX+=mSpanPaint.measureText(text);
+
+			}
+			startY+=mSpanPaint.getTextSize();
+		}
+	}
+	
+	public float measureText(char []text,int index,int count)
+	{
+		return mSpanPaint.measureText(text,index,count);
+	}
+	
+	private int getNextTab(int offset){
+		int len=length();
+		while(offset<len ){
+			if(mText[offset]=='\n')
+				return -1;
+			if(mText[offset]=='\t')
+				return offset;
+			offset++;
+		}
+		return -1;
+	}
+
+	private void analysisLines(){
+		mLineBodies.clear();
+		int start=0;
+		for(int i=0;i<mLength;i++){
+			if(mText[i]=='\n'){
+				mLineBodies.add(new LineBody(start, i+1));
+				start=i+1;
+			}
+		}
+		mLineBodies.add(new LineBody(start, mLength));
+	}
+	
+	@Override
+	public int getLineCount() {
+		return mLineBodies.size();
+	}
+	
+	@Override
+	public Paint getPaint() {
+		return mTextPaint;
+	}
+
+	public void setPaint(TextPaint paint){
+		mTextPaint=paint;
+		mLineHeight=paint.getTextSize();
+		mTabWidth=mTextPaint.measureText("0000");
+		mSpanPaint=new TextPaint(paint);
+		mDefaultColorSpan=new ForegroundColorSpan(mTextPaint.getColor());
+	}
+	
+	@Override
+	public int getOffsetForHorizontal(int line, float x) {
+		LineBody body=mLineBodies.get(line);
+		Paint paint = getPaint();
+		float sumx=0;
+		int pos=body.mStart;
+		if(x<=0)
+			return pos;
+		for(;pos<body.mEnd;pos++){
+			float tx=0;
+			if(mText[pos]=='\t')
+				tx=mTabWidth - (sumx % mTabWidth);
+			else
+				tx=paint.measureText(mText, pos, 1);
+			if(x<=sumx+tx/2)
+				return pos;
+			sumx+=tx;
+		}
+		int lineCount=getLineCount();
+		if(line==lineCount-1)
+			return body.mEnd;
+		return body.mEnd-1;
+	}
+
+	@Override
+	public int getHeight() {
+		return (int) (getLineCount()*mLineHeight);
+	}	
+
+	@Override
+	public String toString() {
+		return String.copyValueOf(mText, 0, length());
+	}
+	public void applyColorSpans(List<SpanBody> spans){
+		if(mEnableHightLight)
+			mSpanBodies=spans;
+	}
+
+	public void addColorSpan(SpanBody spanBody){
+		if(mEnableHightLight)
+			mSpanBodies.add(spanBody);
+	}
+	@Override
+	public int getLineOffset(int line) {
+		return mLineBodies.get(line).mStart;
+	}
+	
+	public void setMaxSaveHistory(int maxSaveHistory){
+		mMaxSaveHistory=maxSaveHistory;
+	}
+
+	public void cleanUndo(){
+		mUndoBodies.clear();
+	}
+	
+	public boolean canUndo(){
+		Log.i(TAG, "canUndo :"+!mUndoBodies.isEmpty());
+		return !mUndoBodies.isEmpty();
+	}
+	
+	public boolean undo(){
+		if(!canUndo())
+			return false;
+		ReplaceBody body=mUndoBodies.pop();
+		ReplaceBody replaceBody=body.getUndoBody();
+		if(mMaxSaveHistory>0){
+			if(mRedoBodies.size()>mMaxSaveHistory)
+				mRedoBodies.remove(0);
+			mRedoBodies.push(body);
+		}
+		replace(replaceBody.mSt, replaceBody.mEn, replaceBody.mText, replaceBody.mStart, replaceBody.mEnd, false);
+		if(replaceBody.mText==null || replaceBody.mText.length()==0 || replaceBody.mEnd-replaceBody.mStart==0 )
+		{
+			mSelectionStart=replaceBody.mSt;
+			mSelectionEnd=mSelectionStart;
+		}
+		else
+		{
+			mSelectionStart=replaceBody.mSt;
+			mSelectionEnd=replaceBody.mSt+replaceBody.mEnd-replaceBody.mStart;
+		}
+		return true;
+	}
+	
+	public void cleanRedo(){
+		mRedoBodies.clear();
+	}
+	
+	public boolean canRedo(){
+		Log.i(TAG, "canRedo :"+!mRedoBodies.isEmpty());
+		return !mRedoBodies.isEmpty();
+		
+	}
+	
+	public boolean redo(){
+		if(!canRedo())
+			return false;
+		ReplaceBody body=mRedoBodies.pop();
+		ReplaceBody replaceBody=body.getRedoBody();
+		if(mMaxSaveHistory>0){
+			if(mUndoBodies.size()>mMaxSaveHistory)
+				mUndoBodies.remove(0);
+			mUndoBodies.push(body);
+		}
+		replace(replaceBody.mSt, replaceBody.mEn, replaceBody.mText, replaceBody.mStart, replaceBody.mEnd, false);
+		if(replaceBody.mText==null || replaceBody.mText.length()==0 || replaceBody.mEnd-replaceBody.mStart==0 )
+		{
+			mSelectionStart=replaceBody.mSt;
+			mSelectionEnd=mSelectionStart;
+		}
+		else
+		{
+			mSelectionStart=replaceBody.mSt;
+			mSelectionEnd=replaceBody.mSt+replaceBody.mEnd-replaceBody.mStart;
+		}
+		return true;
+	}
+	
+}
+
+
+class LineBody{
+	int mStart;
+	int mEnd;
+	public LineBody(int start,int end) {
+		mStart=start;
+		mEnd=end;
+	}
+	public boolean in(int pos){
+		if(pos>=mStart && pos<mEnd)
+			return true;
+		return false;
+	}
+	public int compileTo(int pos){
+		if(pos<mStart)
+			return -1;
+		if(pos>=mEnd)
+			return 1;
+		return 0;
+	}
+	public int length()
+	{
+		return mEnd-mStart-1;
+	}	
+}
+
+
+
+class ReplaceBody{
+	int mSt;
+	int mEn;
+	CharSequence mSubtext;
+	CharSequence mText;
+	int mStart;
+	int mEnd;
+	int mSelectionStart;
+	int mSelectionEnd;
+	public ReplaceBody(int st, int en,CharSequence subtext, CharSequence text, int start,int end,int selectionStart,int selectionEnd) {
+		mSt=st;
+		mEn=en;
+		mSubtext=subtext;
+		mText=text;
+		mStart=start;
+		mEnd=end;
+		mSelectionStart=selectionStart;
+		mSelectionEnd=selectionEnd;
+	}
+	
+	public ReplaceBody getUndoBody(){
+		return new ReplaceBody(mSt, mSt+mEnd-mStart, mText,mSubtext, 0, mSubtext.length(), mSelectionStart, mSelectionEnd);
+	}
+	
+	public ReplaceBody getRedoBody(){
+		return this;
+	}
+	
+	public boolean isDelete(){
+		if(mEn-mSt>0&&mStart==0&&mEnd==0)
+			return true;
+		return false;
+	}
+	
+	public boolean isInsert(){
+		if(mSt==mEn && mText!=null && mText.length()!=0 &&mEnd-mStart>0)
+			return true;
+		Log.i("isInsert", "false");
+		return false;
+	}
+	
+	public boolean addBody(ReplaceBody body){
+		if( isDelete() && body.isDelete() && mSt==body.mEn )
+		{
+			this.mSt=body.mSt;
+			this.mSubtext=body.mSubtext.toString()+this.mSubtext;
+			this.mSelectionStart=body.mSelectionStart;
+			return true;
+		}
+		Log.i("addBody", "addBody");
+		if( isInsert() && body.isInsert() && mSt+mText.length()==body.mSt) 
+		{
+			Log.i("addBody", "�ϲ�����IJ��� ");
+			this.mText=this.mText+body.mText.subSequence(body.mStart, body.mEnd).toString();
+			this.mEnd+=body.mEnd-body.mStart;
+			this.mSelectionEnd = body.mSelectionEnd;
+			return true;
+		}
+		return false;
+	}
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/newtexteditor/MyEditText.java b/qpython/src/main/java/org/qpython/qpy/texteditor/newtexteditor/MyEditText.java
new file mode 100755
index 00000000..f7b97e85
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/newtexteditor/MyEditText.java
@@ -0,0 +1,961 @@
+package org.qpython.qpy.texteditor.newtexteditor;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.graphics.Rect;
+import android.graphics.Typeface;
+import android.text.ClipboardManager;
+import android.text.Editable;
+import android.text.Selection;
+import android.text.TextPaint;
+import android.text.TextWatcher;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.view.GestureDetector;
+import android.view.GestureDetector.OnGestureListener;
+import android.view.KeyEvent;
+import android.view.MotionEvent;
+import android.view.ScaleGestureDetector;
+import android.view.ScaleGestureDetector.OnScaleGestureListener;
+import android.view.View;
+import android.view.inputmethod.EditorInfo;
+import android.view.inputmethod.InputConnection;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.Scroller;
+
+public class MyEditText extends View implements OnGestureListener,TextWatcher, OnScaleGestureListener {
+	protected static final String TAG="MyEditText";
+	
+	public static float mFontScale = 1.0f;
+	public static float mLineScale = 1.0f;
+	public static int mBackGroundColor = Color.TRANSPARENT;
+	public static int mBaseFontColor = Color.BLACK;
+	protected MyInputConnection mBaseInputConnection;
+	protected int mDownState=0;
+	MyLayout mLayout;
+	Paint mCursorPaint=new Paint();
+	Paint mSelectionPaint=new Paint();
+	Paint mSelectionBackgroundPaint=new Paint();
+	TextPaint mTextPaint=new TextPaint();
+	TextPaint mLineNumberPaint=new TextPaint();
+	int i=0;
+	private GestureDetector mGestureDetector;
+	private ScaleGestureDetector mScaleGestureDetector;
+	private Scroller mScroller;
+	private ScrollBar mScrollBar;
+	private float mSelectBarRadius = 1;
+	private Rect mBoundsOfCursor=new Rect();
+	private Rect mBounds=new Rect();
+
+	
+	public MyEditText(Context context) {
+		super(context);
+		init();
+	}
+
+	public MyEditText(Context context, AttributeSet attrs) {
+		super(context, attrs);
+		init();
+	}
+	
+	public void insertText(CharSequence charSequence){
+		mBaseInputConnection.commitText(charSequence, getCursor());
+	}
+	
+	public void setTextSize(float size){
+		mTextPaint.setTextSize(size*mFontScale);
+		mTextPaint.setTypeface(Typeface.MONOSPACE);
+		mLineNumberPaint=new TextPaint(mTextPaint);
+		mLineNumberPaint.setColor(Color.GRAY);
+		mLineNumberPaint.setTypeface(Typeface.MONOSPACE);
+		getLayout().setPaint(mTextPaint);
+		getLayout().setLineHeight(size*mFontScale*1.2f*mLineScale);
+	}
+	
+	public Editable getText(){
+		return mBaseInputConnection.getEditable();
+	}
+	
+	public void setText(CharSequence charSequence){
+		if(mBaseInputConnection==null)
+			mBaseInputConnection=new MyInputConnection(this)
+		{
+		    public boolean clearMetaKeyStates(int states) {
+		    	mDownState=0;
+		    	return super.clearMetaKeyStates(states);
+		    }
+
+			@Override
+		    public boolean performContextMenuAction(int id) {
+				MyEditText.this.performContextMenuAction(id);
+		        return super.performContextMenuAction(id);
+		    }
+
+			@Override
+			public boolean setSelection(int start, int end) {
+
+				if(start==end){
+					post(new Runnable() {
+						@Override
+						public void run() {
+							bringPosToVisible(getCursor());
+						}
+					});
+				}
+				else
+				if(isMoveSelectionStart()){
+					postDelayed(new Runnable() {
+						@Override
+						public void run() {
+							bringPosToVisible(getSelectionStart());
+						}
+					},100);
+				}else
+				if(isMoveSelectionEnd()){
+					postDelayed(new Runnable() {
+						@Override
+						public void run() {
+							bringPosToVisible(getSelectionEnd());
+						}
+					},100);
+				}else{
+					postDelayed(new Runnable() {
+						@Override
+						public void run() {
+							bringPosToVisible(getSelectionEnd());
+						}
+					},100);
+				}
+				return super.setSelection(start, end);
+			}
+		};
+
+		mBaseInputConnection.getEditable().clear();
+		if(charSequence!=null){
+			mBaseInputConnection.getEditable().insert(0, charSequence);
+		}
+		else{
+		}
+
+		if(getCursor()>mBaseInputConnection.getEditable().length())
+			setCursor(mBaseInputConnection.getEditable().length());
+
+		cleanRedo();
+		cleanUndo();
+		makeLayout();
+	}
+	
+	public MyLayout getLayout(){
+		if(mBaseInputConnection==null)
+			return null;
+		return mBaseInputConnection.getLayout();
+	}
+
+	private void init()
+	{
+		setWillNotCacheDrawing(true);
+		setText("");
+		mTextPaint.setColor(mBaseFontColor);
+		setBackgroundColor(mBackGroundColor);
+
+		mScroller=new Scroller(getContext());
+		mGestureDetector=new GestureDetector(getContext(), this);
+		mScaleGestureDetector=new ScaleGestureDetector(getContext(), this);
+		mScrollBar=new ScrollBar();
+		float density=getContext().getResources().getDisplayMetrics().density;
+		mScrollBar.setSize(getHeight(),density*4);
+		float size=density*12f;
+		setTextSize(size);
+		mSelectionBackgroundPaint.setColor(Color.argb(0x60, 0x80, 0xf8, 0x80));
+		mSelectionPaint.setColor(Color.argb(0xff, 0x80, 0x88, 0xff));
+		mLineNumberPaint.setTypeface(Typeface.MONOSPACE);
+		float strokeWidth=getContext().getResources().getDisplayMetrics().density;
+		mSelectBarRadius=strokeWidth*18;
+		if(strokeWidth<1)
+			strokeWidth=1;
+		mCursorPaint.setStrokeWidth(strokeWidth);
+		setScrollContainer(true);
+		this.post(new Runnable(){
+			int colors[]={
+					Color.BLACK,Color.argb(0x80, 0xF0, 0x80, 0x80),
+					};
+			int num=0;
+			@Override
+			public void run() {
+				if(num>=colors.length)
+					num=0;
+				mCursorPaint.setColor(colors[num]);
+				MyEditText.this.postDelayed(this, 360);
+				postInvalidate();
+				num++;
+			}
+		});
+		setScrollbarFadingEnabled(true);
+	}
+
+	@Override
+	public InputConnection onCreateInputConnection(EditorInfo outAttrs) {
+		outAttrs.imeOptions=EditorInfo.IME_FLAG_NO_ENTER_ACTION | EditorInfo.IME_ACTION_DONE | EditorInfo.IME_FLAG_NO_EXTRACT_UI;
+		outAttrs.inputType=EditorInfo.TYPE_CLASS_TEXT ;//1310738;
+		return mBaseInputConnection;
+	}
+
+	@Override
+	protected void onSizeChanged(int w, int h, int oldw, int oldh) {
+		post(new Runnable() {
+			@Override
+			public void run() {
+				setCursor(getCursor());
+				bringPosToVisible(getCursor());
+			}
+		});
+		float density=getContext().getResources().getDisplayMetrics().density;
+		mScrollBar.setSize(getHeight(),density*4);
+		//mEdgeEffectLeft.setSize(getHeight(),getWidth());
+		super.onSizeChanged(w, h, oldw, oldh);
+	}
+
+	@Override
+	public boolean onTouchEvent(MotionEvent event) {
+		if(event.getAction()==MotionEvent.ACTION_DOWN)
+		{
+			mScroller.abortAnimation();
+		}
+		mGestureDetector.onTouchEvent(event);
+		mScaleGestureDetector.onTouchEvent(event);
+		return true;
+	}
+	
+	@Override
+	protected void onDraw(Canvas canvas) {
+		if(mLayout!=null)
+		{
+			int selectLineStart=0;
+			int selectLineEnd=0;
+			float selectStartX=0;
+			float selectEndX=0;
+			if(isSelection())
+			{
+				int start=getSelectionStart();
+				int end=getSelectionEnd();
+				selectLineStart=mLayout.getLineForOffset(start);
+				selectLineEnd=mLayout.getLineForOffset(end);
+				selectStartX=mLayout.getPrimaryHorizontal(start);
+				selectEndX=mLayout.getPrimaryHorizontal(end);
+			}
+
+			int cursor=getCursor();
+			float x=mLayout.getPrimaryHorizontal(cursor);
+			int line=mLayout.getLineForOffset(cursor);
+			mLayout.getLineBounds(line, mBoundsOfCursor);
+			canvas.drawLine(x, mBoundsOfCursor.top, x, mBoundsOfCursor.bottom, mCursorPaint);
+
+			canvas.getClipBounds(mBounds);
+			int lineStart=mLayout.getLineForVertical(mBounds.top);
+			int lineEnd=mLayout.getLineForVertical(mBounds.bottom);
+			float descent=mLayout.getPaint().getFontMetrics().descent;
+			for(int i=lineStart;i<=lineEnd;i++){
+
+				mLayout.getLineBounds(i, mBounds);
+				if(mBounds.left>=0)
+				{
+					String value=String.valueOf(i+1);
+					canvas.drawText(value, mBounds.left-mLineNumberPaint.measureText(value+"0"), mBounds.bottom - descent , mLineNumberPaint);
+				}
+				if(isSelection())
+				{
+					if(i>selectLineStart && i<selectLineEnd){
+						canvas.drawRect(mBounds, mSelectionBackgroundPaint);
+					}
+					else
+					if(i==selectLineStart )
+					{
+						if(i==selectLineEnd){
+							canvas.drawRect(selectStartX, mBounds.top, selectEndX, mBounds.bottom, mSelectionBackgroundPaint);
+						}
+						else{
+							canvas.drawRect(selectStartX, mBounds.top, mBounds.right, mBounds.bottom, mSelectionBackgroundPaint);
+						}
+					}
+					else
+					if(i==selectLineEnd )
+					{
+						canvas.drawRect(0, mBounds.top, selectEndX, mBounds.bottom, mSelectionBackgroundPaint);
+					}
+				}
+			}
+
+			try {
+				mLayout.draw(canvas);
+			} catch (OutOfMemoryError e) {
+				e.printStackTrace();
+			}
+
+			if(isSelection()){
+				int r=(int) mSelectBarRadius;
+				canvas.drawCircle(x, mBoundsOfCursor.bottom + r, r, mSelectionPaint);
+
+				cursor=getSelectionStart();
+				x=mLayout.getPrimaryHorizontal(cursor);
+				line=mLayout.getLineForOffset(cursor);
+				mLayout.getLineBounds(line, mBoundsOfCursor);
+				canvas.drawLine(x, mBoundsOfCursor.top, x, mBoundsOfCursor.bottom, mCursorPaint);
+
+				canvas.drawCircle(x, mBoundsOfCursor.bottom + r, r, mSelectionPaint);
+			}
+		}
+		canvas.save();
+		canvas.rotate(90);
+		canvas.translate( getScrollY(),-(getScrollX()+getWidth()) );
+		mScrollBar.draw(canvas);
+		canvas.save();
+		/*
+		canvas.restore();
+		canvas.save();
+		canvas.translate(getScrollX(), getScrollY());
+		mEdgeEffectTop.draw(canvas);
+		canvas.restore();
+		canvas.save();
+		canvas.rotate(180);
+		canvas.translate( -(getScrollX()+getWidth()), -(getScrollY()+getHeight()) );
+		mEdgeEffectBottom.draw(canvas);
+		canvas.restore();
+		canvas.rotate(-90);
+		canvas.translate( -(getScrollY()+getHeight()) ,getScrollX() );
+		//mEdgeEffectLeft.draw(canvas);
+		canvas.restore();
+		canvas.save();
+		*/
+	}
+
+	protected void makeLayout(){
+		if(getText()!=null)
+		{
+			mLayout=mBaseInputConnection.getLayout();
+			//mLayout=new StaticLayout(mEditable, mTextPaint, Integer.MAX_VALUE,Layout.Alignment.ALIGN_NORMAL,1f,0f,false);
+			//mLayout=new DynamicLayout(getText(),mTextPaint,Integer.MAX_VALUE,Layout.Alignment.ALIGN_NORMAL,1f,0f,false);
+		}
+	}
+	
+	public TextPaint getPaint(){
+		return mTextPaint;
+	}
+
+	private float getWidthOfBit(int bit)
+	{
+		String str="";
+		for(int i=0;i<bit;i++)
+		{
+			str+='0';
+		}
+		return getPaint().measureText(str);
+	}
+
+	public int getBoundOfLeft(){
+		int left=(int) getWidthOfBit(1+getBitOfNum(getLineCount()));
+		return -(left);
+	}
+	
+	public int getBoundOfRight(){
+		if(mLayout==null)
+			return getWidth();
+		return Integer.MAX_VALUE/2;
+	}
+	
+	public int getBoundOfTop(){
+		return 0;
+	}
+	
+	public int getBoundOfBottom(){
+		if(mLayout==null)
+			return getHeight();
+		int h1=mLayout.getHeight();
+		int h2=getHeight();
+		return h1>h2?h1:h2;
+	}
+	
+	@Override
+	public void scrollTo(int x, int y) {
+		int left=getBoundOfLeft();
+		int right=getBoundOfRight();
+		int top=getBoundOfTop();
+		int bottom=getBoundOfBottom();
+		if(x<left)
+		{
+			x=left;
+		}
+		if(x>right)
+			x=right;
+		if(y<top)
+		{
+			y=top;
+		}
+		if(y>bottom)
+		{
+			y=bottom;
+		}
+		mScrollBar.setPosition(bottom-top+getHeight(), y-top, y-top+getHeight());
+		super.scrollTo(x, y);
+	}
+
+	private int getBitOfNum(int num)
+	{
+		if(num<10)
+			return 1;
+		if(num<100)
+			return 2;
+		if(num<1000)
+			return 3;
+		if(num<10000)
+			return 4;
+		if(num<100000)
+			return 5;
+		if(num<1000000)
+			return 6;
+		if(num<10000000)
+			return 7;
+		if(num<100000000)
+			return 8;
+		return 0;
+	}
+
+    public int getLineCount() {
+        return mLayout != null ? mLayout.getLineCount() : 0;
+    }
+
+    public boolean isSelection(){
+    	return getSelectionStart()!=getSelectionEnd();
+    }
+    
+    public int getSelectionStart(){
+    	return Selection.getSelectionStart(mBaseInputConnection.getEditable());
+    }
+    
+    public int getSelectionEnd(){
+    	return Selection.getSelectionEnd(mBaseInputConnection.getEditable());
+    }
+    
+    public int getCursor(){
+    	return getSelectionEnd();
+    }
+    
+    public void bringPosToVisible(int pos){
+    	if(mLayout!=null){
+    		if(pos>=0 && pos<=getText().length()){
+    			float x=mLayout.getPrimaryHorizontal(pos);
+    			int line=mLayout.getLineForOffset(pos);
+    			mLayout.getLineBounds(line, mBoundsOfCursor);
+    			int scrollX=getScrollX();
+    			int scrollY=getScrollY();
+    			if(mBoundsOfCursor.top<scrollY){
+    				scrollY=mBoundsOfCursor.top;
+    			}
+    			if(mBoundsOfCursor.bottom>scrollY+getHeight())
+    				scrollY=mBoundsOfCursor.bottom-getHeight();
+
+    			if(x<scrollX+mTextPaint.getTextSize())
+    				scrollX= (int)( x-mTextPaint.getTextSize());
+
+    			if(x>scrollX+getWidth()-mTextPaint.getTextSize())
+    				scrollX=(int) (x-getWidth()+mTextPaint.getTextSize());
+
+    			scrollTo(scrollX, scrollY);
+    			postInvalidate();
+    		}
+    	}
+    }
+    
+    public boolean setCursor(int cursor){
+    	return setSelection(cursor, cursor);
+    }
+	
+	public void showSoftKeyboard(){
+		setFocusableInTouchMode(true);
+		requestFocus();
+		InputMethodManager inputMethodManager=(InputMethodManager) getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
+		inputMethodManager.showSoftInput(this,InputMethodManager.SHOW_FORCED);
+	}
+
+	public boolean isMoveSelectionStart(){
+		return mDownState==1;
+	}
+	
+	public boolean isMoveSelectionEnd(){
+		return mDownState==2;
+	}
+	
+	private boolean isMoveSelection(){
+		return mDownState!=0;
+	}
+	
+	@Override
+	public boolean onDown(MotionEvent e) {
+		mDownState=0;
+		if(isSelection())
+		{	
+			int cursor=getCursor();
+			float x=mLayout.getPrimaryHorizontal(cursor);
+			int line=mLayout.getLineForOffset(cursor);
+			mLayout.getLineBounds(line, mBoundsOfCursor); 
+			int r=(int) mSelectBarRadius;
+			int y=mBoundsOfCursor.bottom + r;
+			if( Math.sqrt( Math.pow(getScrollX()+e.getX()-x, 2f) + Math.pow(getScrollY()+e.getY()-y, 2f)  ) <= r){
+				mDownState=2;
+			}
+
+			cursor=getSelectionStart();
+			x=mLayout.getPrimaryHorizontal(cursor);
+			line=mLayout.getLineForOffset(cursor);
+			mLayout.getLineBounds(line, mBoundsOfCursor); 
+			r=(int) mSelectBarRadius;
+			y=mBoundsOfCursor.bottom + r;
+			if( Math.sqrt( Math.pow(getScrollX()+e.getX()-x, 2f) + Math.pow(getScrollY()+e.getY()-y, 2f)  ) <= r){
+				mDownState=1;
+			}
+		}
+		return true;
+	}
+
+	@Override
+	public void onShowPress(MotionEvent e) {
+	}
+
+	@Override
+	public boolean onSingleTapUp(MotionEvent e) {
+		if(mLayout!=null){
+			int line=mLayout.getLineForVertical(getScrollY()+(int) e.getY());
+			int offset=mLayout.getOffsetForHorizontal(line, getScrollX()+(int)e.getX());
+			setCursor(offset);
+		}
+		showSoftKeyboard();
+		return false;
+	}
+	@Override
+	public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX,
+			float distanceY) {
+		if(!isMoveSelection())
+		{
+			scrollBy((int)distanceX, (int )distanceY);
+			invalidate();  
+		}
+		else{
+			int line=mLayout.getLineForVertical(getScrollY()+(int) e2.getY()-(int)(1.5f*mLayout.getLineHeight()) );
+			int offset=mLayout.getOffsetForHorizontal(line, getScrollX()+(int)e2.getX());
+			int start=getSelectionStart();
+			int end=getSelectionEnd();
+			if(isMoveSelectionEnd()){
+				if(offset<=start)
+					offset=start+1;
+				if(offset<=getText().length())
+				{
+					setSelection(start, offset);
+					postInvalidate();
+				}
+			}else
+			if(isMoveSelectionStart()){
+				if(offset>=end)
+					offset=end-1;
+				if(offset>=0){
+					setSelection(offset, end);
+					postInvalidate();
+				}
+			}
+		}
+		return true;
+	}
+
+	@Override
+	public void onLongPress(MotionEvent e) {
+		if(isSelection()){
+			/*
+			PopupMenu popupMenu=new PopupMenu(getContext(), this );
+			Menu menu=popupMenu.getMenu();
+			menu.add(0, android.R.id.copy, 0, android.R.string.copy);
+			menu.add(0, android.R.id.cut, 0, android.R.string.cut);
+			menu.add(0, android.R.id.selectAll, 0, android.R.string.selectAll);
+			menu.add(0, android.R.id.paste, 0, android.R.string.paste);
+			popupMenu.setOnMenuItemClickListener(new OnMenuItemClickListener() {
+				public boolean onMenuItemClick(MenuItem arg0) {
+					int id=arg0.getItemId();
+					if(id==android.R.id.paste)
+						setCursor(getCursor());
+					return performContextMenuAction(id);
+				}
+			});
+			popupMenu.show();*/
+		}else
+		if(mLayout!=null){
+			int line=mLayout.getLineForVertical(getScrollY()+(int) e.getY());
+			int offset=mLayout.getOffsetForHorizontal(line, getScrollX()+(int)e.getX());
+			if(!selectAtPosition(offset)){
+				int start=offset-1;
+				if(start<0)
+					start=0;
+				setSelection(start, offset);
+			}
+		}
+	}
+
+	private boolean selectAtPosition(int position){
+		int start=position;
+		int end=position;
+		Editable editable=getText();
+		if(position<0 || position>=editable.length())
+			return false;
+		char ch=editable.charAt(position);
+		if( !(Character.isLetterOrDigit(ch) || ch=='_') )
+			return false;
+		for(start=position;start>0;start--){
+			char indexCh=editable.charAt(start);
+			if(!(Character.isLetterOrDigit(indexCh) || indexCh=='_') ){
+				start++;
+				break;
+			}
+		}
+		
+		for(end=position;end<editable.length()-1;end++){
+			char indexCh=editable.charAt(end);
+			if(!(Character.isLetterOrDigit(indexCh) || indexCh=='_') ){
+				break;
+			}
+		}
+		if(start>=end)
+			return false;
+		setSelection(start, end);
+		return true;
+	}
+	
+	@Override
+	public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX,
+			float velocityY) {
+		if(!isMoveSelection())
+		{
+			mScroller.fling(getScrollX(), getScrollY(), -(int)velocityX , -(int)velocityY, Integer.MIN_VALUE, Integer.MAX_VALUE, Integer.MIN_VALUE,  Integer.MAX_VALUE);
+    		postInvalidate();  
+		}
+		return true;
+	}
+	
+    @Override  
+    public void computeScroll() {  
+    	if (mScroller.computeScrollOffset()) 
+    	{
+    		scrollTo(mScroller.getCurrX(), mScroller.getCurrY());  
+    	}  
+    }
+    
+	public boolean setSelection(int start, int end) {
+		mScroller.abortAnimation();
+    	return mBaseInputConnection.setSelection(start, end);
+	}
+	
+	@Override
+	public boolean onKeyDown(int keyCode, KeyEvent event) {
+		switch(event.getKeyCode()){
+		case KeyEvent.KEYCODE_SHIFT_LEFT:
+			mDownState=1;
+			break;
+		case KeyEvent.KEYCODE_SHIFT_RIGHT:
+			mDownState=2;
+			break;
+		default:
+			return false;	
+		}
+		return true;
+	}
+	
+	@Override
+	public boolean onKeyUp(int keyCode, KeyEvent event) {
+		Editable editable=getText();
+		int start=Selection.getSelectionStart(editable);
+		int end=Selection.getSelectionEnd(editable);
+		if(event.getAction()==KeyEvent.ACTION_UP)
+		switch(event.getKeyCode()){
+		case KeyEvent.KEYCODE_DEL:
+			if(start>=end)
+				start=end-1;
+			if(start>=0)
+			editable.delete(start, end);
+			break;
+		case KeyEvent.KEYCODE_ENTER:
+			editable.replace(start, end, "\n");
+			setSelection(start+1, start+1);
+			break;
+		case KeyEvent.KEYCODE_DPAD_LEFT:
+			if(isMoveSelectionStart()){
+				start--;
+				if(start>=0)
+					setSelection(start, end);
+			}else if(isMoveSelectionEnd()){
+				end--;
+				if(end>start)
+					setSelection(start, end);
+			}else {
+				end--;
+				if(end>=0)
+					setSelection(end, end);
+			}
+			break;
+		case KeyEvent.KEYCODE_DPAD_RIGHT:
+			if(isMoveSelectionStart()){
+				start++;
+				if(start<end)
+					setSelection(start, end);
+			}else if(isMoveSelectionEnd()){
+				end++;
+				if(end<=editable.length())
+					setSelection(start, end);
+			}else {
+				end++;
+				if(end<=editable.length())
+					setSelection(end, end);
+			}
+			break;
+		case KeyEvent.KEYCODE_DPAD_UP :
+			if(isMoveSelectionStart()){
+				int line=mLayout.getLineForOffset(start);
+				float x=mLayout.getPrimaryHorizontal(start);
+				if(line>0)
+				{
+					int position=mLayout.getOffsetForHorizontal(line-1, x);
+					if(position>=0 && position < end)
+						setSelection(position, end);
+				}
+			}
+			else
+			{
+				int line=mLayout.getLineForOffset(end);
+				if(line>0){
+					float x=mLayout.getPrimaryHorizontal(end);
+					int position=mLayout.getOffsetForHorizontal(line-1, x);
+					if(isMoveSelectionEnd()){
+						if(position>start && position<=editable.length())
+							setSelection(start, position);
+					}
+					else{
+						setCursor(position);
+					}
+				}
+			}
+			break;
+		case KeyEvent.KEYCODE_DPAD_DOWN:
+			if(isMoveSelectionStart()){
+				int line=mLayout.getLineForOffset(start);
+				if(line<mLayout.getLineCount()-1){
+					float x=mLayout.getPrimaryHorizontal(start);
+					int position=mLayout.getOffsetForHorizontal(line+1, x);
+					if(position>=0 && position < end)
+						setSelection(position, end);
+				}
+			}else{
+				int line=mLayout.getLineForOffset(end);
+				if(line<mLayout.getLineCount()-1){
+					float x=mLayout.getPrimaryHorizontal(end);
+					int position=mLayout.getOffsetForHorizontal(line+1, x);
+					if(isMoveSelectionEnd()){
+						if(position>start && position<=editable.length())
+							setSelection(start, position);
+					}
+					else
+						setCursor(position);
+				}
+			}
+			break;
+		default:
+			return false;	
+		}
+		return true;
+	}
+
+	public boolean performContextMenuAction(int id) {
+		Editable editable=getText();
+		int start=Selection.getSelectionStart(editable);
+		int end=Selection.getSelectionEnd(editable);
+		switch (id) {
+		case android.R.id.selectAll:
+			setSelection(0, editable.length());
+			break;
+		case android.R.id.cut:
+			try {
+				ClipboardManager clipboardManager= (ClipboardManager) getContext().getSystemService(Context.CLIPBOARD_SERVICE);
+				clipboardManager.setText(editable.subSequence(start, end));
+				editable.delete(start, end);
+				setSelection(start, start);
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+			break;
+		case android.R.id.copy:
+			try {
+				ClipboardManager clipboardManager= (ClipboardManager) getContext().getSystemService(Context.CLIPBOARD_SERVICE);
+				clipboardManager.setText(editable.subSequence(start, end));
+				setSelection(end, end);
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+			break;
+		case android.R.id.paste:
+			try {
+				ClipboardManager clipboardManager= (ClipboardManager) getContext().getSystemService(Context.CLIPBOARD_SERVICE);
+				CharSequence charSequence=clipboardManager.getText();
+				editable.replace(start, end, charSequence);
+				int t=start+charSequence.length();
+				setSelection(t,t);
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+			break;
+		default:
+			return false;
+		}
+		return true;
+	}
+
+
+	@Override
+	public void beforeTextChanged(CharSequence s, int start, int count,int after) {
+	}
+
+
+	@Override
+	public void onTextChanged(CharSequence s, int start, int before, int count) {
+	}
+
+
+	@Override
+	public void afterTextChanged(Editable s) {
+		post(new Runnable() {
+			@Override
+			public void run() {
+				bringPosToVisible(getCursor());
+			}
+		});
+	}
+
+	public void closeInputMethod() {
+		Log.i(TAG, "closeInputMethod");
+		View editView=this;
+	    InputMethodManager imm = (InputMethodManager) getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
+	    boolean isOpen = imm.isActive();
+	    if (isOpen) {
+	        imm.hideSoftInputFromWindow(editView.getApplicationWindowToken(), 0 );
+	    }
+	}
+
+	public void setMaxSaveHistory(int maxSaveHistory){
+		if(getLayout() instanceof EditableWithLayout)
+		{
+			((EditableWithLayout)getLayout()).setMaxSaveHistory(maxSaveHistory);
+		}
+	}
+
+	public void cleanUndo(){
+		if(getLayout() instanceof EditableWithLayout)
+		{
+			((EditableWithLayout)getLayout()).cleanUndo();
+		}
+	}
+	
+	public boolean canUndo(){
+		if(getLayout() instanceof EditableWithLayout)
+		{
+			return ((EditableWithLayout)getLayout()).canUndo();
+		}
+		return false;
+	}
+	
+	public boolean undo(){
+		if(getLayout() instanceof EditableWithLayout)
+		{
+			return ((EditableWithLayout)getLayout()).undo();
+		}
+		return false;
+	}
+	
+	public void cleanRedo(){
+		if(getLayout() instanceof EditableWithLayout)
+		{
+			((EditableWithLayout)getLayout()).cleanRedo();
+		}
+	}
+	
+	public boolean canRedo(){
+		if(getLayout() instanceof EditableWithLayout)
+		{
+			return ((EditableWithLayout)getLayout()).canRedo();
+		}
+		return false;
+		
+	}
+	
+	public boolean redo(){
+		if(getLayout() instanceof EditableWithLayout)
+		{
+			return ((EditableWithLayout)getLayout()).redo();
+		}
+		return false;
+	}
+	
+	public boolean findString(String str){
+		int index=getText().toString().indexOf(str, getCursor());
+		if(index == -1)
+			return false;
+		return setSelection(index, index+str.length());
+	}
+	
+	public boolean replaceString(String str){
+		getText().replace(getSelectionStart(), getSelectionEnd(), str);
+		return true;
+	}
+	
+	public boolean replaceFindString(String find,String replace){
+		if(find.length() <= 0)
+			return false;
+		setCursor(getSelectionStart());
+		if(!findString(find))
+			return false;
+		replaceString(replace);
+		return true;
+	}
+	
+	public boolean replaceAll(String find,String replace){
+		int start=getSelectionStart();
+		int end = getSelectionEnd();
+		boolean finded=false;
+		setCursor(0);
+		while(replaceFindString(find,replace))
+		{
+			finded=true;
+		}
+		if(!finded)
+			setSelection(start, end);
+		return finded;
+	}
+
+
+	@Override
+	public boolean onScale(ScaleGestureDetector detector) {
+		float size=mTextPaint.getTextSize();
+		float scale=detector.getScaleFactor();
+		size*=scale;
+		if(size<8)
+			return true;
+		setTextSize(size);
+		scrollTo((int)(getScrollX()*scale),(int)( getScrollY()*scale) );
+		postInvalidate();
+		return true;
+	}
+
+
+	@Override
+	public boolean onScaleBegin(ScaleGestureDetector detector) {
+		return true;
+	}
+
+
+	@Override
+	public void onScaleEnd(ScaleGestureDetector detector) {
+	}
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/newtexteditor/MyInputConnection.java b/qpython/src/main/java/org/qpython/qpy/texteditor/newtexteditor/MyInputConnection.java
new file mode 100755
index 00000000..b338a91e
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/newtexteditor/MyInputConnection.java
@@ -0,0 +1,507 @@
+package org.qpython.qpy.texteditor.newtexteditor;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.SystemClock;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.text.Editable;
+import android.text.NoCopySpan;
+import android.text.Selection;
+import android.text.Spannable;
+import android.text.Spanned;
+import android.text.TextUtils;
+import android.text.TextWatcher;
+import android.text.method.MetaKeyKeyListener;
+import android.util.Log;
+import android.view.KeyEvent;
+import android.view.View;
+import android.view.inputmethod.CompletionInfo;
+import android.view.inputmethod.CorrectionInfo;
+import android.view.inputmethod.ExtractedText;
+import android.view.inputmethod.ExtractedTextRequest;
+import android.view.inputmethod.InputConnection;
+import android.view.inputmethod.InputContentInfo;
+import android.view.inputmethod.InputMethodManager;
+
+
+public class MyInputConnection implements InputConnection {
+    protected static final String  TAG                     = "MyInputConnection";
+    static final Object COMPOSING = new ComposingText();
+    public Editable mEditable = new EditableWithLayout();//new SpannableStringBuilder();
+    protected InputMethodManager mIMM;
+    int mBatchEditNum = 0;
+    private                boolean mIsFristCallGetEditable = true;
+    private   View               mView;
+    private Object[] mDefaultComposingSpans;
+
+    public MyInputConnection(View view) {
+        mView = view;
+        mIMM = (InputMethodManager) view.getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
+    }
+
+    public static int getComposingSpanStart(Spannable text) {
+        //LogUtil.i(TAG, "getComposingSpanStart:"+text);
+        return text.getSpanStart(COMPOSING);
+    }
+
+    public static int getComposingSpanEnd(Spannable text) {
+        //LogUtil.i(TAG, "getComposingSpanEnd:"+text);
+        return text.getSpanEnd(COMPOSING);
+    }
+
+    public static final void removeComposingSpans(Spannable text) {
+        text.removeSpan(COMPOSING);
+        Object[] sps = text.getSpans(0, text.length(), Object.class);
+        if (sps != null) {
+            for (int i = sps.length - 1; i >= 0; i--) {
+                Object o = sps[i];
+                if ((text.getSpanFlags(o) & Spanned.SPAN_COMPOSING) != 0) {
+                    text.removeSpan(o);
+                }
+            }
+        }
+    }
+
+    public Editable getEditable() {
+        if (mIsFristCallGetEditable) {
+            mIsFristCallGetEditable = false;
+            if (mView instanceof TextWatcher)
+                mEditable.setSpan(mView, 0, mEditable.length(), Spanned.SPAN_INCLUSIVE_INCLUSIVE);
+        }
+        return mEditable;
+    }
+
+    public MyLayout getLayout() {
+        if (getEditable() instanceof MyLayout)
+            return (MyLayout) getEditable();
+        return null;//new DynamicLayout(getText(),mTextPaint,Integer.MAX_VALUE,Layout.Alignment.ALIGN_NORMAL,1f,0f,false);
+    }
+
+    @Override
+    public ExtractedText getExtractedText(ExtractedTextRequest request, int flags) {
+
+        //LogUtil.i(TAG, "getExtractedText"+" flags:"+request.flags+" hitMaxC"+request.hintMaxChars+
+        //		" hintMaxLines:"+request.hintMaxLines+" token"+request.token
+        //		+" describeContents:"+request.describeContents()
+        //		);
+        //return null;
+
+        if (mBatchEditNum != 0)
+            return null;
+        ExtractedText extractedText = new ExtractedText();
+        Editable editable = getEditable();
+        extractedText.startOffset = 0;
+        extractedText.selectionStart = Selection.getSelectionStart(editable);
+        extractedText.selectionEnd = Selection.getSelectionEnd(editable);
+        extractedText.partialEndOffset = -1;
+        extractedText.partialStartOffset = -1;
+
+        int retLen = editable.length();
+        int maxLength = 128 * 1024;
+        if (retLen > maxLength)
+            retLen = maxLength;
+        try {
+            extractedText.text = editable.subSequence(0, retLen);
+        } catch (OutOfMemoryError e) {
+            e.printStackTrace();
+        }
+        return extractedText;
+
+    }
+
+    @Override
+    public boolean beginBatchEdit() {
+        Log.i(TAG, "beginBatchEdit");
+        mBatchEditNum++;
+        return true;
+    }
+
+    @Override
+    public boolean endBatchEdit() {
+        Log.i(TAG, "endBatchEdit");
+        mBatchEditNum--;
+        return true;
+    }
+
+    @Override
+    public boolean commitCompletion(CompletionInfo text) {
+        Log.i(TAG, "commitCompletion:" + text);
+        return true;
+    }
+
+    @Override
+    public boolean commitCorrection(CorrectionInfo correctionInfo) {
+        return false;
+    }
+
+    @Override
+    public boolean performPrivateCommand(String action, Bundle data) {
+        Log.i(TAG, "performPrivateCommand:" + action + " " + data);
+        return true;
+    }
+
+    public boolean requestCursorUpdates(int cursorUpdateMode) {
+        Log.i(TAG, "requestCursorUpdates:" + cursorUpdateMode);
+        return true;
+    }
+
+    @Override
+    public Handler getHandler() {
+        return null;
+    }
+
+    @Override
+    public void closeConnection() {
+
+    }
+
+    @Override
+    public boolean commitContent(@NonNull InputContentInfo inputContentInfo, int flags, @Nullable Bundle opts) {
+        return false;
+    }
+
+    @Override
+    public CharSequence getTextBeforeCursor(int length, int flags) {
+        Log.i(TAG, "getTextBeforeCursor:" + length);
+        final Editable content = getEditable();
+        if (content == null) return null;
+
+        int a = Selection.getSelectionStart(content);
+        int b = Selection.getSelectionEnd(content);
+
+        if (a > b) {
+            int tmp = a;
+            a = b;
+            b = tmp;
+        }
+
+        if (a <= 0) {
+            return "";
+        }
+
+        if (length > a) {
+            length = a;
+        }
+
+        if ((flags & GET_TEXT_WITH_STYLES) != 0) {
+            return content.subSequence(a - length, a);
+        }
+        return TextUtils.substring(content, a - length, a);
+    }
+
+    @Override
+    public CharSequence getTextAfterCursor(int length, int flags) {
+        Log.i(TAG, "getTextAfterCursor:" + length);
+        final Editable content = getEditable();
+        if (content == null) return null;
+
+        int a = Selection.getSelectionStart(content);
+        int b = Selection.getSelectionEnd(content);
+
+        if (a > b) {
+            int tmp = a;
+            a = b;
+            b = tmp;
+        }
+        if (b < 0) {
+            b = 0;
+        }
+
+        if (b + length > content.length()) {
+            length = content.length() - b;
+        }
+
+
+        if ((flags & GET_TEXT_WITH_STYLES) != 0) {
+            return content.subSequence(b, b + length);
+        }
+        return TextUtils.substring(content, b, b + length);
+    }
+
+    public CharSequence getSelectedText(int flags) {
+        Log.i(TAG, "getSelectedText:" + flags);
+        final Editable content = getEditable();
+        if (content == null) return null;
+
+        int a = Selection.getSelectionStart(content);
+        int b = Selection.getSelectionEnd(content);
+
+        if (a > b) {
+            int tmp = a;
+            a = b;
+            b = tmp;
+        }
+
+        if (a == b) return null;
+
+        if ((flags & GET_TEXT_WITH_STYLES) != 0) {
+            return content.subSequence(a, b);
+        }
+        return TextUtils.substring(content, a, b);
+    }
+
+    @Override
+    public int getCursorCapsMode(int reqModes) {
+        Log.i(TAG, "getCursorCapsMode:" + reqModes);
+        return 0;
+        /*
+        if (mDummyMode) return 0;
+
+        final Editable content = getEditable();
+        if (content == null) return 0;
+
+        int a = Selection.getSelectionStart(content);
+        int b = Selection.getSelectionEnd(content);
+
+        if (a > b) {
+            int tmp = a;
+            a = b;
+            b = tmp;
+        }
+
+        return TextUtils.getCapsMode(content, a, reqModes);
+        */
+    }
+
+    @Override
+    public boolean deleteSurroundingText(int beforeLength, int afterLength) {
+        Log.i(TAG, "deleteSurroundingText:" + beforeLength);
+        final Editable content = getEditable();
+        if (content == null) return false;
+
+        beginBatchEdit();
+
+        int a = Selection.getSelectionStart(content);
+        int b = Selection.getSelectionEnd(content);
+
+        if (a > b) {
+            int tmp = a;
+            a = b;
+            b = tmp;
+        }
+
+        int ca = getComposingSpanStart(content);
+        int cb = getComposingSpanEnd(content);
+        if (cb < ca) {
+            int tmp = ca;
+            ca = cb;
+            cb = tmp;
+        }
+        if (ca != -1 && cb != -1) {
+            if (ca < a) a = ca;
+            if (cb > b) b = cb;
+        }
+
+        int deleted = 0;
+
+        if (beforeLength > 0) {
+            int start = a - beforeLength;
+            if (start < 0) start = 0;
+            content.delete(start, a);
+            deleted = a - start;
+        }
+
+        if (afterLength > 0) {
+            b = b - deleted;
+
+            int end = b + afterLength;
+            if (end > content.length()) end = content.length();
+
+            content.delete(b, end);
+        }
+
+        endBatchEdit();
+
+        return true;
+    }
+
+    @Override
+    public boolean deleteSurroundingTextInCodePoints(int beforeLength, int afterLength) {
+        return false;
+    }
+
+    @Override
+    public boolean setComposingText(CharSequence text, int newCursorPosition) {
+        Log.i(TAG, "setComposingText:" + text);
+        //replaceText(text, newCursorPosition, true);
+        return true;
+    }
+
+    public boolean setComposingRegion(int start, int end) {
+        Log.i(TAG, "setComposingRegion:" + start);
+        final Editable content = getEditable();
+        if (content != null) {
+            beginBatchEdit();
+            removeComposingSpans(content);
+            int a = start;
+            int b = end;
+            if (a > b) {
+                int tmp = a;
+                a = b;
+                b = tmp;
+            }
+            final int length = content.length();
+            if (a < 0) a = 0;
+            if (b < 0) b = 0;
+            if (a > length) a = length;
+            if (b > length) b = length;
+
+            if (mDefaultComposingSpans != null) {
+                for (int i = 0; i < mDefaultComposingSpans.length; ++i) {
+                    content.setSpan(mDefaultComposingSpans[i], a, b,
+                            Spanned.SPAN_EXCLUSIVE_EXCLUSIVE | Spanned.SPAN_COMPOSING);
+                }
+            }
+
+            content.setSpan(COMPOSING, a, b,
+                    Spanned.SPAN_EXCLUSIVE_EXCLUSIVE | Spanned.SPAN_COMPOSING);
+            endBatchEdit();
+        }
+        return true;
+    }
+
+    @Override
+    public boolean finishComposingText() {
+        Log.i(TAG, "finishComposingText:");
+        final Editable content = getEditable();
+        if (content != null) {
+            beginBatchEdit();
+            removeComposingSpans(content);
+            endBatchEdit();
+        }
+        return true;
+    }
+
+    @Override
+    public boolean commitText(CharSequence text, int newCursorPosition) {
+        Log.i(TAG, "commitText:" + text);
+        //replaceText(text, newCursorPosition, false);
+        Editable content = getEditable();
+        content.replace(Selection.getSelectionStart(content), Selection.getSelectionEnd(content), text);
+        //int cursor=Selection.getSelectionEnd(content);
+        //content.replace(cursor, cursor, text);
+        //Selection.setSelection(content, cursor+text.length());
+        return true;
+    }
+
+    @Override
+    public boolean setSelection(int start, int end) {
+        Log.i(TAG, "setSelection:" + start + end);
+        final Editable content = getEditable();
+        if (content == null) return false;
+        if (start == end && MetaKeyKeyListener.getMetaState(content, 0x800) != 0) {
+            Selection.extendSelection(content, start);
+        } else {
+            Selection.setSelection(content, start, end);
+        }
+        return true;
+    }
+
+    @Override
+    public boolean performEditorAction(int editorAction) {
+        //LogUtil.i(TAG, "performEditorAction:"+editorAction);
+        long eventTime = SystemClock.uptimeMillis();
+        sendKeyEvent(new KeyEvent(eventTime, eventTime,
+                KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_ENTER, 0, 0,
+                /*KeyCharacterMap.VIRTUAL_KEYBOARD*/-1, 0,
+                KeyEvent.FLAG_SOFT_KEYBOARD | KeyEvent.FLAG_KEEP_TOUCH_MODE
+                        | KeyEvent.FLAG_EDITOR_ACTION));
+        sendKeyEvent(new KeyEvent(SystemClock.uptimeMillis(), eventTime,
+                KeyEvent.ACTION_UP, KeyEvent.KEYCODE_ENTER, 0, 0,
+                /*KeyCharacterMap.VIRTUAL_KEYBOARD*/-1, 0,
+                KeyEvent.FLAG_SOFT_KEYBOARD | KeyEvent.FLAG_KEEP_TOUCH_MODE
+                        | KeyEvent.FLAG_EDITOR_ACTION));
+        return true;
+    }
+
+    @Override
+    public boolean performContextMenuAction(int id) {
+        Log.i(TAG, "performContextMenuAction:" + id);
+        return false;
+    }
+
+    @Override
+    public boolean sendKeyEvent(KeyEvent event) {
+        Log.i(TAG, "sendKeyEvent:" + event);
+        if (mView != null)
+            switch (event.getAction()) {
+                case KeyEvent.ACTION_DOWN:
+                    mView.onKeyDown(event.getKeyCode(), event);
+                    break;
+                case KeyEvent.ACTION_UP:
+                    mView.onKeyUp(event.getKeyCode(), event);
+                    break;
+            }
+        return false;
+    }
+
+    @Override
+    public boolean clearMetaKeyStates(int states) {
+        Log.i(TAG, "clearMetaKeyStates:" + states);
+        return false;
+    }
+
+    @Override
+    public boolean reportFullscreenMode(boolean enabled) {
+        Log.i(TAG, "reportFullscreenMode:" + enabled);
+        return false;
+    }
+
+    @SuppressWarnings("unused")
+    private void replaceText(CharSequence text, int newCursorPosition,
+                             boolean composing) {
+        final Editable content = getEditable();
+        if (content == null) {
+            return;
+        }
+
+        beginBatchEdit();
+
+        int a = getComposingSpanStart(content);
+        int b = getComposingSpanEnd(content);
+
+
+        if (b < a) {
+            int tmp = a;
+            a = b;
+            b = tmp;
+        }
+
+        if (a != -1 && b != -1) {
+            removeComposingSpans(content);
+        } else {
+            a = Selection.getSelectionStart(content);
+            b = Selection.getSelectionEnd(content);
+            if (a < 0) a = 0;
+            if (b < 0) b = 0;
+            if (b < a) {
+                int tmp = a;
+                a = b;
+                b = tmp;
+            }
+        }
+
+        if (newCursorPosition > 0) {
+            newCursorPosition += b - 1;
+        } else {
+            newCursorPosition += a;
+        }
+        Log.i(TAG, "replaceText:" + newCursorPosition);
+        if (newCursorPosition < 0) newCursorPosition = 0;
+        if (newCursorPosition > content.length())
+            newCursorPosition = content.length();
+        content.setSpan(COMPOSING, a, b, 0);
+        Selection.setSelection(content, newCursorPosition);
+
+        Log.i(TAG, "replaceText:" + newCursorPosition);
+        content.replace(a, b, text);
+
+        endBatchEdit();
+    }
+
+}
+
+class ComposingText implements NoCopySpan {
+}
\ No newline at end of file
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/newtexteditor/MyLayout.java b/qpython/src/main/java/org/qpython/qpy/texteditor/newtexteditor/MyLayout.java
new file mode 100755
index 00000000..9793031f
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/newtexteditor/MyLayout.java
@@ -0,0 +1,34 @@
+package org.qpython.qpy.texteditor.newtexteditor;
+
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.Rect;
+import android.text.TextPaint;
+
+public interface MyLayout {
+	public float getLineHeight();
+
+	public void setLineHeight(float lineHeight);
+	
+	public int getLineForOffset(int start);
+
+	public int getLineOffset(int line);
+	
+	public float getPrimaryHorizontal(int start);
+
+	public void getLineBounds(int line, Rect mBoundsOfCursor);
+
+	public int getLineForVertical(int top);
+
+	public void draw(Canvas canvas);
+
+	public int getLineCount();
+
+	public Paint getPaint();
+
+	public void setPaint(TextPaint paint);
+
+	public int getOffsetForHorizontal(int line, float x);
+
+	public int getHeight();
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/newtexteditor/ScrollBar.java b/qpython/src/main/java/org/qpython/qpy/texteditor/newtexteditor/ScrollBar.java
new file mode 100755
index 00000000..e1f773fe
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/newtexteditor/ScrollBar.java
@@ -0,0 +1,44 @@
+package org.qpython.qpy.texteditor.newtexteditor;
+
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+
+public class ScrollBar {
+	final static float MINI_SCALE=0.1f;
+	float mAll=100;
+	float mStart=8;
+	float mEnd=9;
+	float mWidth;
+	float mHeight;
+	Paint mPaint=new Paint();
+	public ScrollBar() {
+		mPaint.setColor(Color.GRAY);
+	}
+	
+	public void draw(Canvas canvas){
+		float x=mWidth*(mStart/mAll);
+		float y=mWidth*(mEnd/mAll);
+		canvas.drawRect(x, 0, y, mHeight, mPaint);
+	}
+	
+	public void setSize(float width,float height)
+	{
+		mWidth=width;
+		mHeight=height;
+	}
+	
+	public void setPosition(float all,float start,float end){
+		mAll=all;
+		if(mAll<=0)
+			mAll=1;
+		mStart=start;
+		mEnd=end;
+		float scale=(mEnd-mStart)/mAll;
+		if(scale<MINI_SCALE)
+		{
+			mStart-=mAll*(MINI_SCALE-scale)/2;
+			mEnd+=mAll*(MINI_SCALE-scale)/2;
+		}
+	}
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/newtexteditor/SpanBody.java b/qpython/src/main/java/org/qpython/qpy/texteditor/newtexteditor/SpanBody.java
new file mode 100755
index 00000000..9a1f9c6f
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/newtexteditor/SpanBody.java
@@ -0,0 +1,47 @@
+package org.qpython.qpy.texteditor.newtexteditor;
+
+public class SpanBody{
+	Object mSpan;
+	int mStart;
+	int mEnd;
+	int mFlag;
+	public SpanBody(Object span,int start,int end,int flag) {
+		mSpan=span;
+		mStart=start;
+		mEnd=end;
+		mFlag=flag;
+	}
+	public boolean hasSub(int start,int end){
+		if(start<mStart)
+		{
+			if(end>mStart)
+				return true;
+		}
+		else
+		if(start>=mEnd){
+			return false;
+		}
+		else{
+			return true;
+		}
+		return false;
+	}
+	
+	public boolean in(int pos){
+		if(pos>=mStart && pos<mEnd)
+			return true;
+		return false;
+	}
+	
+	public int compileTo(int pos){
+		if(pos<mStart)
+			return -1;
+		if(pos>=mEnd)
+			return 1;
+		return 0;
+	}
+	public int length()
+	{
+		return mEnd-mStart;
+	}
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/ui/adapter/FolderAdapter.java b/qpython/src/main/java/org/qpython/qpy/texteditor/ui/adapter/FolderAdapter.java
new file mode 100644
index 00000000..e2b7fb8f
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/ui/adapter/FolderAdapter.java
@@ -0,0 +1,102 @@
+package org.qpython.qpy.texteditor.ui.adapter;
+
+import android.support.v7.widget.RecyclerView;
+import android.view.View;
+import android.view.ViewGroup;
+
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.databinding.ItemFolderBinding;
+import org.qpython.qpy.texteditor.ui.adapter.bean.FolderBean;
+
+import java.util.List;
+import java.util.Map;
+
+
+public class FolderAdapter extends RecyclerView.Adapter<MyViewHolder<ItemFolderBinding>> {
+    private List<FolderBean>     dataList;
+    private Map<String, Boolean> cloudMap;
+    private boolean              showPath;
+    private Click                clickListener;
+
+    public FolderAdapter(List<FolderBean> dataList, boolean showPath) {
+        this.dataList = dataList;
+        this.showPath = showPath;
+    }
+
+    public void setClickListener(Click clickListener) {
+        this.clickListener = clickListener;
+    }
+
+    @Override
+    public MyViewHolder<ItemFolderBinding> onCreateViewHolder(ViewGroup parent, int viewType) {
+        View view = View.inflate(parent.getContext(), R.layout.item_folder, null);
+        return new MyViewHolder<>(view);
+    }
+
+    @Override
+    public void onBindViewHolder(MyViewHolder<ItemFolderBinding> holder, final int position) {
+        ItemFolderBinding binding = holder.getBinding();
+        FolderBean item = dataList.get(position);
+        if (showPath) {
+            binding.tvPath.setVisibility(View.VISIBLE);
+            if (item.getPath().contains("/qpython")) {
+                binding.tvPath.setText(item.getPath().substring(item.getPath().indexOf("/qpython"), item.getPath().length()));
+            } else {
+                binding.tvPath.setText(item.getPath());
+            }
+        }
+        binding.tvFileName.setText(item.getName());
+        switch (item.getType()) {
+            case FILE:
+                binding.ivFileIcon.setImageResource(R.drawable.ic_editor_file);
+                break;
+            case FOLDER:
+                binding.ivFileIcon.setImageResource(R.drawable.ic_editor_folder);
+                break;
+        }
+        if (cloudMap != null) {
+            if (cloudMap.containsKey(item.getPath())) {
+                if (item.getFile().isDirectory()) {
+                    if (item.getFile().getParent().contains("projects"))
+                        binding.uploaded.setImageResource(R.drawable.ic_cloud_notdone);
+                } else {
+                    binding.uploaded.setImageResource(R.drawable.ic_cloud_done);
+                }
+                binding.uploaded.setVisibility(View.VISIBLE);
+            } else {
+                binding.uploaded.setVisibility(View.GONE);
+            }
+        }
+        binding.llFolderItem.setOnClickListener(v -> clickListener.onItemClick(position));
+        binding.llFolderItem.setOnLongClickListener(v -> {
+            clickListener.onLongClick(position);
+            return true;
+        });
+        binding.uploading.setVisibility(item.isUploading() ? View.VISIBLE : View.GONE);
+    }
+
+    @Override
+    public long getItemId(int position) {
+        return position;
+    }
+
+    @Override
+    public int getItemCount() {
+        return dataList == null ? 0 : dataList.size();
+    }
+
+    public void setCloudMap(Map<String, Boolean> cloudMap) {
+        this.cloudMap = cloudMap;
+    }
+
+    public void setUploadFile(int position) {
+        cloudMap.put(dataList.get(position).getPath(), true);
+    }
+
+    public interface Click {
+        void onItemClick(int position);
+
+        void onLongClick(int position);
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/ui/adapter/FontListAdapter.java b/qpython/src/main/java/org/qpython/qpy/texteditor/ui/adapter/FontListAdapter.java
new file mode 100644
index 00000000..f016f65a
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/ui/adapter/FontListAdapter.java
@@ -0,0 +1,57 @@
+package org.qpython.qpy.texteditor.ui.adapter;
+
+import android.content.Context;
+import android.graphics.Typeface;
+import android.util.Log;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.texteditor.androidlib.data.FileUtils;
+import org.qpython.qpy.texteditor.androidlib.ui.adapter.FileListAdapter;
+
+import java.io.File;
+import java.util.List;
+
+public class FontListAdapter extends FileListAdapter {
+
+	/**
+	 * Constructor
+	 * 
+	 * @param context
+	 *            The current context
+	 * @param objects
+	 *            The objects to represent in the ListView.
+	 * @param folder
+	 *            the parent folder of the items presented, or null if the top
+	 *            folder should not be displayed as up
+	 */
+	public FontListAdapter(Context context, List<File> objects) {
+		super(context, objects, null);
+	}
+
+	/**
+	 * @see fr.xgouchet.androidlib.ui.adapter.FileListAdapter#getView(int,
+	 *      android.view.View, android.view.ViewGroup)
+	 */
+	@Override
+	public View getView(int position, View convertView, ViewGroup parent) {
+		View v = super.getView(position, convertView, parent);
+
+		File f = getItem(position);
+
+		if (FileUtils.getFileExtension(f).equalsIgnoreCase("ttf")) {
+			TextView t = (TextView) v.findViewById(R.id.textFileName);
+			Typeface font = Typeface.DEFAULT;
+			try {
+				font = Typeface.createFromFile(f);
+				t.setTypeface(font);
+			} catch (RuntimeException e) {
+				Log.w("TED", "Unable to create a font from " + f.getName());
+			}
+		}
+
+		return v;
+	}
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/ui/adapter/MyViewHolder.java b/qpython/src/main/java/org/qpython/qpy/texteditor/ui/adapter/MyViewHolder.java
new file mode 100644
index 00000000..42294f22
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/ui/adapter/MyViewHolder.java
@@ -0,0 +1,25 @@
+package org.qpython.qpy.texteditor.ui.adapter;
+
+import android.databinding.DataBindingUtil;
+import android.databinding.ViewDataBinding;
+import android.support.v7.widget.RecyclerView;
+import android.view.View;
+import android.view.ViewGroup;
+
+
+public class MyViewHolder<B extends ViewDataBinding> extends RecyclerView.ViewHolder {
+    private B binding;
+
+    public MyViewHolder(View itemView) {
+        super(itemView);
+        binding = DataBindingUtil.bind(itemView);
+    }
+
+    public B getBinding() {
+        return binding;
+    }
+
+    public void setBinding(B binding) {
+        this.binding = binding;
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/ui/adapter/PathListAdapter.java b/qpython/src/main/java/org/qpython/qpy/texteditor/ui/adapter/PathListAdapter.java
new file mode 100644
index 00000000..94b80514
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/ui/adapter/PathListAdapter.java
@@ -0,0 +1,156 @@
+package org.qpython.qpy.texteditor.ui.adapter;
+
+import android.content.Context;
+import android.databinding.DataBindingUtil;
+import android.databinding.ViewDataBinding;
+import android.graphics.Color;
+import android.os.Handler;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.databinding.ItemFolderBinding;
+import org.qpython.qpy.texteditor.ui.adapter.bean.FolderBean;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * A File List Adapter
+ *
+ * @author Hmei
+ */
+public class PathListAdapter extends RecyclerView.Adapter<PathListAdapter.MyViewHolder> {
+    private static final int PENDING_REMOVAL_TIMEOUT = 3000; // 3sec
+    HashMap<FolderBean, Runnable> pendingRunnables = new HashMap<>(); // map of items to pending runnables, so we can cancel a removal if need be
+    private List<FolderBean> dataList;
+    private List<FolderBean> itemsPendingRemoval;
+    private Context          context;
+    private boolean showPath;
+    private Callback callback;
+    private Handler handler = new Handler(); // hanlder for running delayed runnables
+
+
+    public PathListAdapter(List<FolderBean> dataList, Context context, boolean showPath, Callback callback) {
+        this.dataList = dataList;
+        this.context = context;
+        this.showPath = showPath;
+        this.callback = callback;
+        this.itemsPendingRemoval = new ArrayList<>();
+    }
+
+    @Override
+    public MyViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+        ItemFolderBinding binding = DataBindingUtil.inflate(LayoutInflater.from(context), R.layout.item_folder, parent, false);
+        MyViewHolder holder = new MyViewHolder(binding.getRoot());
+        holder.setBinding(binding);
+        return holder;
+    }
+
+    @Override
+    public void onBindViewHolder(MyViewHolder holder, final int position) {
+        final FolderBean item = dataList.get(position);
+        ItemFolderBinding binding = holder.getBinding();
+        if (itemsPendingRemoval.contains(item)) {
+            // undo state
+            holder.itemView.setBackgroundColor(Color.parseColor("#FFD14136"));
+            binding.ivFileIcon.setVisibility(View.GONE);
+            binding.tvFileName.setVisibility(View.GONE);
+//            binding.btnUndo.setVisibility(View.VISIBLE);
+//            binding.btnUndo.setOnClickListener(v -> {
+//                Runnable pendingRemovalRunnable = pendingRunnables.get(item);
+//                pendingRunnables.remove(item);
+//                if (pendingRemovalRunnable != null)
+//                    handler.removeCallbacks(pendingRemovalRunnable);
+//                itemsPendingRemoval.remove(item);
+//                // this will rebind the row in "normal" state
+//                notifyItemChanged(dataList.indexOf(item));
+//            });
+        } else {
+//            binding.btnUndo.setVisibility(View.GONE);
+            binding.tvFileName.setText(item.getName());
+            if (showPath) {
+                binding.tvPath.setVisibility(View.VISIBLE);
+                binding.tvPath.setText(item.getPath().substring(item.getPath().indexOf("/qpython"), item.getPath().length()));
+            }
+            switch (item.getType()) {
+                case FILE:
+                    binding.ivFileIcon.setImageResource(R.drawable.ic_editor_file);
+                    break;
+                case FOLDER:
+                    binding.ivFileIcon.setImageResource(R.drawable.ic_editor_folder);
+                    break;
+            }
+
+            binding.llFolderItem.setOnClickListener(v -> callback.click(position));
+        }
+    }
+
+    @Override
+    public int getItemCount() {
+        return dataList == null ? 0 : (dataList.size() == 0 ? 0 : dataList.size());
+    }
+
+    public void pendingRemoval(int position) {
+        final FolderBean item = dataList.get(position);
+        if (!itemsPendingRemoval.contains(item)) {
+            itemsPendingRemoval.add(item);
+            // this will redraw row in "undo" state
+            notifyItemChanged(position);
+            // let's create, store and post a runnable to remove the item
+            Runnable pendingRemovalRunnable = new Runnable() {
+                @Override
+                public void run() {
+                    remove(dataList.indexOf(item));
+                }
+            };
+            handler.postDelayed(pendingRemovalRunnable, PENDING_REMOVAL_TIMEOUT);
+            pendingRunnables.put(item, pendingRemovalRunnable);
+        }
+    }
+
+    public void remove(int position) {
+        FolderBean item = dataList.get(position);
+        if (itemsPendingRemoval.contains(item)) {
+            itemsPendingRemoval.remove(item);
+        }
+        if (dataList.contains(item)) {
+            dataList.remove(position);
+            notifyItemRemoved(position);
+        }
+    }
+
+    public boolean isPendingRemoval(int position) {
+        FolderBean item = dataList.get(position);
+        return itemsPendingRemoval.contains(item);
+    }
+
+
+    public interface Callback {
+        void click(int position);
+    }
+
+    static class MyViewHolder extends RecyclerView.ViewHolder {
+        private ItemFolderBinding binding;
+
+        MyViewHolder(View itemView) {
+            super(itemView);
+        }
+
+        public ItemFolderBinding getBinding() {
+            return binding;
+        }
+
+        public void setBinding(ItemFolderBinding binding) {
+            this.binding = binding;
+        }
+    }
+
+}
+
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/ui/adapter/bean/FolderBean.java b/qpython/src/main/java/org/qpython/qpy/texteditor/ui/adapter/bean/FolderBean.java
new file mode 100644
index 00000000..8b828664
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/ui/adapter/bean/FolderBean.java
@@ -0,0 +1,89 @@
+package org.qpython.qpy.texteditor.ui.adapter.bean;
+
+import org.qpython.qpy.texteditor.common.CommonEnums.FileType;
+
+import java.io.File;
+
+/**
+ * To store path list's item data
+ * Created by Hmei on 2017-05-11.
+ */
+
+public class FolderBean {
+    private File     file;
+    private FileType type;
+    private String   name;
+    private String   path;
+    private boolean  isUploading;
+
+    public FolderBean(File file) {
+        this.file = file;
+        type = file.isDirectory() ? FileType.FOLDER : FileType.FILE;
+        name = file.getName();
+        path = file.getAbsolutePath();
+    }
+
+    public FileType getFolder() {
+        return path.contains("/projects") ? FileType.PROJECT : FileType.SCRIPT;
+    }
+
+    public String getProjectPath() {
+        if (getFolder().equals(FileType.PROJECT)) {
+            String[] nodes = path.split("/");
+            StringBuilder sb = new StringBuilder();
+            boolean isProjNode = false;
+            for (String node : nodes) {
+                if (!isProjNode) {
+                    sb.append(node).append("/");
+                    isProjNode = node.startsWith("projects");
+                } else {
+                    sb.append(node);
+                    return sb.toString();
+                }
+            }
+            return "";
+        } else {
+            return "";
+        }
+    }
+
+    public FileType getType() {
+        return type;
+    }
+
+    public void setType(FileType type) {
+        this.type = type;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getPath() {
+        return path;
+    }
+
+    public void setPath(String path) {
+        this.path = path;
+    }
+
+    public File getFile() {
+        return file;
+    }
+
+    public void setFile(File file) {
+        this.file = file;
+    }
+
+    public boolean isUploading() {
+        return isUploading;
+    }
+
+    public void setUploading(boolean uploading) {
+        isUploading = uploading;
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/ui/adapter/bean/PopupItemBean.java b/qpython/src/main/java/org/qpython/qpy/texteditor/ui/adapter/bean/PopupItemBean.java
new file mode 100644
index 00000000..d4c79f8e
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/ui/adapter/bean/PopupItemBean.java
@@ -0,0 +1,47 @@
+package org.qpython.qpy.texteditor.ui.adapter.bean;
+
+import android.view.View;
+import android.widget.TextView;
+
+/**
+ * A bean class that describe popup item
+ * Created by Hmei on 2017-05-31.
+ */
+
+public class PopupItemBean {
+    private boolean isDisable = false;
+    private String title1, title2;
+    private View.OnClickListener clickListener;
+
+    public PopupItemBean(String title, View.OnClickListener clickListener) {
+        this.title1 = title;
+        this.clickListener = clickListener;
+    }
+
+
+    public View.OnClickListener getClickListener() {
+        return v -> {
+            clickListener.onClick(v);
+            if (title2 != null) {
+                TextView tv = (TextView) v;
+                isDisable = !isDisable;
+                if (isDisable) {
+                    tv.setText(title2);
+                } else {
+                    tv.setText(title1);
+                }
+            }
+
+        };
+    }
+
+    @Override
+    public String toString() {
+        return isDisable ? title2 : title1;
+    }
+
+    public PopupItemBean setTitle2(String title2) {
+        this.title2 = title2;
+        return this;
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/ui/view/AdvancedEditText.java b/qpython/src/main/java/org/qpython/qpy/texteditor/ui/view/AdvancedEditText.java
new file mode 100644
index 00000000..80e2a883
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/ui/view/AdvancedEditText.java
@@ -0,0 +1,760 @@
+package org.qpython.qpy.texteditor.ui.view;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.graphics.Point;
+import android.graphics.Rect;
+import android.graphics.Typeface;
+import android.os.Handler;
+import android.text.Editable;
+import android.text.InputFilter;
+import android.text.InputType;
+import android.text.SpannableStringBuilder;
+import android.text.Spanned;
+import android.text.TextUtils;
+import android.text.TextWatcher;
+import android.text.style.BackgroundColorSpan;
+import android.text.style.ForegroundColorSpan;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.view.GestureDetector;
+import android.view.GestureDetector.OnGestureListener;
+import android.view.MotionEvent;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.Scroller;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.texteditor.common.Constants;
+import org.qpython.qpy.texteditor.common.Settings;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import static org.qpython.qpy.utils.CodePattern.COLOR_BUILTIN;
+import static org.qpython.qpy.utils.CodePattern.COLOR_COMMENT;
+import static org.qpython.qpy.utils.CodePattern.COLOR_ERROR;
+import static org.qpython.qpy.utils.CodePattern.COLOR_KEYWORD;
+import static org.qpython.qpy.utils.CodePattern.COLOR_QUOTE;
+import static org.qpython.qpy.utils.CodePattern.PATTERN_LINE;
+import static org.qpython.qpy.utils.CodePattern.PATTERN_LUA_BUILD_IN;
+import static org.qpython.qpy.utils.CodePattern.PATTERN_LUA_KEYWORD;
+import static org.qpython.qpy.utils.CodePattern.PATTERN_PY_BUILD_IN;
+import static org.qpython.qpy.utils.CodePattern.PATTERN_PY_COMMENT;
+import static org.qpython.qpy.utils.CodePattern.PATTERN_PY_KEYWORD;
+
+/**
+ * TODO create a syntax highlighter
+ */
+public class AdvancedEditText extends android.support.v7.widget.AppCompatEditText implements Constants, OnGestureListener {
+//		OnKeyListener{
+
+
+    private static final Pattern               luaComments           = Pattern.compile(
+            "--.*\n");
+    private static final Pattern               trailingWhiteSpace    = Pattern.compile(
+            "[\\t ]+$",
+            Pattern.MULTILINE);
+    private static final Pattern               quotes                = Pattern.compile(
+            "\"([^[\"\\n]])+\"|" +
+                    "\'([^[\'\\n]])+\'"
+    );
+    private final        Handler               updateHandler         = new Handler();
+    public               OnTextChangedListener onTextChangedListener = null;
+    public               int                   updateDelay           = 1000;
+    public               int                   errorLine             = 0;
+    public               boolean               dirty                 = false;
+    /**
+     * The PATTERN_LINE PATTERN_NUMBER paint
+     */
+    protected Paint mPaintNumbers;
+    /**
+     * The PATTERN_LINE PATTERN_NUMBER paint
+     */
+    protected Paint mPaintHighlight;
+    /**
+     * the offset value in dp
+     */
+    protected int mPaddingDP = 6;
+    /**
+     * the padding scaled
+     */
+    protected int      mPadding;
+    /**
+     * the scale for desnity pixels
+     */
+    protected float    mScale;
+    /**
+     * the scroller instance
+     */
+    protected Scroller mTedScroller;
+
+
+    /////////
+    /**
+     * the velocity tracker
+     */
+    protected GestureDetector mGestureDetector;
+    /**
+     * the Max size of the view
+     */
+    protected Point           mMaxSize;
+    /**
+     * the highlighted PATTERN_LINE index
+     */
+    protected int             mHighlightedLine;
+    protected int             mHighlightStart;
+    protected Rect            mDrawingRect, mLineBounds;
+    String  fileType = "";
+    Boolean isWatch  = true;
+    private       boolean  modified       = true;
+    private final Runnable updateRunnable =
+            () -> {
+                Editable e = getText();
+
+                if (onTextChangedListener != null)
+                    onTextChangedListener.onTextChanged(e.toString());
+
+                highlightWithoutChange(e);
+            };
+
+    /**
+     * @param context the current context
+     * @param attrs   some attributes
+     * @category ObjectLifecycle
+     */
+    public AdvancedEditText(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        setInputType(InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS | InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_FLAG_MULTI_LINE);
+
+        mPaintNumbers = new Paint();
+        mPaintNumbers.setTypeface(Typeface.MONOSPACE);
+        mPaintNumbers.setAntiAlias(true);
+
+        mPaintHighlight = new Paint();
+
+        mScale = context.getResources().getDisplayMetrics().density;
+        mPadding = (int) (mPaddingDP * mScale);
+
+        mHighlightedLine = mHighlightStart = -1;
+
+        mDrawingRect = new Rect();
+        mLineBounds = new Rect();
+
+        mGestureDetector = new GestureDetector(getContext(), this);
+
+        updateFromSettings("");
+
+    }
+
+    /**
+     * @category View
+     * @see android.widget.TextView#computeScroll()
+     */
+    @Override
+    public void computeScroll() {
+
+        if (mTedScroller != null) {
+            if (mTedScroller.computeScrollOffset()) {
+                scrollTo(mTedScroller.getCurrX(), mTedScroller.getCurrY());
+            }
+        } else {
+            super.computeScroll();
+        }
+    }
+
+    /**
+     * @category View
+     * @see EditText#onDraw(Canvas)
+     */
+    @Override
+    public void onDraw(Canvas canvas) {
+        int count, padding, lineX, baseline;
+
+        // padding
+        padding = mPadding;
+        count = getLineCount();
+        if (Settings.SHOW_LINE_NUMBERS) {
+            padding = (int) (Math.floor(Math.log10(count)) + 1);
+            padding = (int) ((padding * mPaintNumbers.getTextSize()) + mPadding + (Settings.TEXT_SIZE
+                    * mScale * 0.5));
+            setPadding(padding, mPadding, mPadding, mPadding);
+        } else {
+            setPadding(mPadding, mPadding, mPadding, mPadding);
+        }
+
+        // get the drawing boundaries
+        getDrawingRect(mDrawingRect);
+
+        // display current PATTERN_LINE
+        computeLineHighlight();
+
+        // draw PATTERN_LINE PATTERN_NUMBER
+        count = getLineCount();
+        lineX = (int) (mDrawingRect.left + padding - (Settings.TEXT_SIZE
+                * mScale * 0.5));
+
+        for (int i = 0; i < count; i++) {
+            baseline = getLineBounds(i, mLineBounds);
+            if ((mMaxSize != null) && (mMaxSize.x < mLineBounds.right)) {
+                mMaxSize.x = mLineBounds.right;
+            }
+
+            if ((mLineBounds.bottom < mDrawingRect.top)
+                    || (mLineBounds.top > mDrawingRect.bottom)) {
+                continue;
+            }
+
+            if ((i == mHighlightedLine) && (!Settings.WORDWRAP)) {
+                canvas.drawRect(mLineBounds, mPaintHighlight);
+            }
+
+            if (Settings.SHOW_LINE_NUMBERS) {
+                canvas.drawText("" + (i + 1), mDrawingRect.left + mPadding,
+                        baseline, mPaintNumbers);
+            }
+            if (Settings.SHOW_LINE_NUMBERS) {
+                canvas.drawLine(lineX, mDrawingRect.top, lineX,
+                        mDrawingRect.bottom, mPaintNumbers);
+            }
+        }
+
+        if (mMaxSize != null) {
+            mMaxSize.y = mLineBounds.bottom;
+            mMaxSize.x = Math.max(mMaxSize.x + mPadding - mDrawingRect.width(),
+                    0);
+            mMaxSize.y = Math.max(
+                    mMaxSize.y + mPadding - mDrawingRect.height(), 0);
+        }
+        super.onDraw(canvas);
+    }
+
+//	/**
+//	 * @see android.view.View.OnKeyListener#onKey(android.view.View, int,
+//	 *      android.view.KeyEvent)
+//	 */
+//	@Override
+//	public boolean onKey(View v, int keyCode, KeyEvent event) {
+//		return false;
+//	}
+
+    /**
+     * @category GestureDetection
+     * @see android.widget.TextView#onTouchEvent(android.view.MotionEvent)
+     */
+    @Override
+    public boolean onTouchEvent(MotionEvent event) {
+
+        super.onTouchEvent(event);
+        if (mGestureDetector != null) {
+            return mGestureDetector.onTouchEvent(event);
+        }
+
+        return true;
+    }
+
+    /**
+     * @category GestureDetection
+     * @see android.view.GestureDetector.OnGestureListener#onDown(android.view.MotionEvent)
+     */
+    @Override
+    public boolean onDown(MotionEvent e) {
+        return true;
+    }
+
+    /**
+     * @category GestureDetection
+     * @see android.view.GestureDetector.OnGestureListener#onSingleTapUp(android.view.MotionEvent)
+     */
+    @Override
+    public boolean onSingleTapUp(MotionEvent e) {
+        if (isEnabled()) {
+            ((InputMethodManager) getContext().getSystemService(
+                    Context.INPUT_METHOD_SERVICE)).showSoftInput(this,
+                    InputMethodManager.SHOW_IMPLICIT);
+        }
+        return true;
+    }
+
+    /**
+     * @category GestureDetection
+     * @see android.view.GestureDetector.OnGestureListener#onShowPress(android.view.MotionEvent)
+     */
+    @Override
+    public void onShowPress(MotionEvent e) {
+    }
+
+    /**
+     * @see android.view.GestureDetector.OnGestureListener#onLongPress(android.view.MotionEvent)
+     */
+    @Override
+    public void onLongPress(MotionEvent e) {
+
+    }
+
+    /**
+     * @see android.view.GestureDetector.OnGestureListener#onScroll(android.view.MotionEvent,
+     * android.view.MotionEvent, float, float)
+     */
+    @Override
+    public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX,
+                            float distanceY) {
+        // mTedScroller.setFriction(0);
+        return true;
+    }
+
+    /**
+     * @see android.view.GestureDetector.OnGestureListener#onFling(android.view.MotionEvent,
+     * android.view.MotionEvent, float, float)
+     */
+    @Override
+    public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX,
+                           float velocityY) {
+        if (!Settings.FLING_TO_SCROLL) {
+            return true;
+        }
+
+        if (mTedScroller != null) {
+            mTedScroller.fling(getScrollX(), getScrollY(), -(int) velocityX,
+                    -(int) velocityY, 0, mMaxSize.x, 0, mMaxSize.y);
+        }
+        return true;
+    }
+
+    /**
+     * Update view settings from the app preferences
+     *
+     * @category Custom
+     */
+    public void updateFromSettings(String fileType) {
+        Log.d(TAG, "updateFromSettings:" + fileType);
+
+        this.fileType = TextUtils.isEmpty(fileType) ? this.fileType : fileType;
+
+        if (isInEditMode()) {
+            return;
+        }
+
+        setTypeface(Settings.getTypeface(getContext()));
+
+        // wordwrap
+        setHorizontallyScrolling(!Settings.WORDWRAP);
+
+        // color Theme
+        switch (Settings.COLOR) {
+            case COLOR_NEGATIVE:
+                setBackgroundResource(R.drawable.textfield_black);
+                setTextColor(Color.WHITE);
+                mPaintHighlight.setColor(Color.WHITE);
+                mPaintNumbers.setColor(Color.GRAY);
+                break;
+            case COLOR_MATRIX:
+                setBackgroundResource(R.drawable.textfield_matrix);
+                setTextColor(Color.GREEN);
+                mPaintHighlight.setColor(Color.GREEN);
+                mPaintNumbers.setColor(Color.rgb(0, 128, 0));
+                break;
+            case COLOR_SKY:
+                setBackgroundResource(R.drawable.textfield_sky);
+                setTextColor(Color.rgb(0, 0, 64));
+                mPaintHighlight.setColor(Color.rgb(0, 0, 64));
+                mPaintNumbers.setColor(Color.rgb(0, 128, 255));
+                break;
+            case COLOR_DRACULA:
+                setBackgroundResource(R.drawable.textfield_dracula);
+                setTextColor(Color.RED);
+                mPaintHighlight.setColor(Color.RED);
+                mPaintNumbers.setColor(Color.rgb(192, 0, 0));
+                break;
+            case COLOR_CLASSIC:
+            default:
+                setBackgroundResource(R.drawable.textfield_white);
+                setTextColor(Color.BLACK);
+                mPaintHighlight.setColor(Color.BLACK);
+                mPaintNumbers.setColor(Color.GRAY);
+                break;
+        }
+        mPaintHighlight.setAlpha(48);
+
+        // text size
+        setTextSize(Settings.TEXT_SIZE);
+        mPaintNumbers.setTextSize(Settings.TEXT_SIZE * mScale * 0.85f);
+
+        // refresh view
+        postInvalidate();
+        refreshDrawableState();
+
+        // use Fling when scrolling settings ?
+        if (Settings.FLING_TO_SCROLL) {
+            mTedScroller = new Scroller(getContext());
+            mMaxSize = new Point();
+        } else {
+            mTedScroller = null;
+            mMaxSize = null;
+        }
+
+
+        if (true
+            /*
+                (this.fileType.equals("py") || this.fileType.equals("lua")) &&
+                        this.getLineCount() < Settings.MAX_LINES_NUM_WITH_SYNTAX*/) {
+            isWatch = true;
+            init();
+            refresh();
+        } else {
+            isWatch = false;
+            cancelUpdate();
+            unHightlight();
+        }
+        //}
+    }
+
+    /**
+     * Compute the PATTERN_LINE to highlight based on selection
+     */
+    protected void computeLineHighlight() {
+        int i, line, selStart;
+        String text;
+
+        if (!isEnabled()) {
+            mHighlightedLine = -1;
+            return;
+        }
+
+        selStart = getSelectionStart();
+        if (mHighlightStart != selStart) {
+            text = getText().toString();
+
+            line = i = 0;
+            while (i < selStart) {
+                i = text.indexOf("\n", i);
+                if (i < 0) {
+                    break;
+                }
+                if (i < selStart) {
+                    ++line;
+                }
+                ++i;
+            }
+
+            mHighlightedLine = line;
+        }
+    }
+
+    private Pattern getKw() {
+        if (fileType.equals("py")) {
+            return PATTERN_PY_KEYWORD;
+        } else if (fileType.equals("lua")) {
+            return PATTERN_LUA_KEYWORD;
+        } else {
+            return Pattern.compile(
+                    "\\b()\\b");
+        }
+    }
+
+    private Pattern getBuiltins() {
+        if (fileType.equals("py")) {
+            return PATTERN_PY_BUILD_IN;
+        } else if (fileType.equals("lua")) {
+            return PATTERN_LUA_BUILD_IN;
+
+        } else {
+            return Pattern.compile(
+                    "\\b()\\b");
+        }
+    }
+
+    private Pattern getComments() {
+        if (fileType.equals("py")) {
+            return PATTERN_PY_COMMENT;
+        } else if (fileType.equals("lua")) {
+            return luaComments;
+        } else {
+            return Pattern.compile(
+                    "");
+
+        }
+    }
+
+    public void setTextHighlighted(CharSequence text) {
+        cancelUpdate();
+
+        errorLine = 0;
+        dirty = false;
+
+        modified = false;
+        setText(highlight(new SpannableStringBuilder(text)));
+        modified = true;
+
+        if (onTextChangedListener != null)
+            onTextChangedListener.onTextChanged(text.toString());
+    }
+
+    public String getCleanText() {
+        return trailingWhiteSpace
+                .matcher(getText())
+                .replaceAll("");
+    }
+
+    public void refresh() {
+        highlightWithoutChange(getText());
+    }
+
+    public void unHightlight() {
+        unHightWithoutChange(getText());
+    }
+
+    private void init() {
+        setHorizontallyScrolling(true);
+
+        setFilters(new InputFilter[]{
+                (source, start, end, dest, dstart, dend) -> {
+                    //LogUtil.d(TAG, "end:"+end+"-start:"+start+"-dstart:"+dstart+"-dend:"+dend+"-"+modified+"-dlen:"+dest.length()+"-slen:"+source.length());
+                    if (modified &&
+                            end - start == 1 &&
+                            start < source.length() &&
+                            dstart <= dest.length()) {
+                        char c = source.charAt(start);
+
+                        //LogUtil.d(TAG, "c:"+c);
+                        if (c == '\n')
+                            return autoIndent(
+                                    source,
+                                    start,
+                                    end,
+                                    dest,
+                                    dstart,
+                                    dend);
+                    }
+
+                    return source;
+                }});
+
+        addTextChangedListener(
+                new TextWatcher() {
+                    @Override
+                    public void onTextChanged(
+                            CharSequence s,
+                            int start,
+                            int before,
+                            int count) {
+                    }
+
+                    @Override
+                    public void beforeTextChanged(
+                            CharSequence s,
+                            int start,
+                            int count,
+                            int after) {
+                    }
+
+                    @Override
+                    public void afterTextChanged(Editable e) {
+                        if (isWatch) {
+                            cancelUpdate();
+
+                            if (!modified)
+                                return;
+
+                            dirty = true;
+                            updateHandler.postDelayed(
+                                    updateRunnable,
+                                    updateDelay);
+                        }
+                    }
+                });
+    }
+
+    private void cancelUpdate() {
+        updateHandler.removeCallbacks(updateRunnable);
+    }
+
+    private void highlightWithoutChange(Editable e) {
+        modified = false;
+        highlight(e);
+        modified = true;
+    }
+
+    public void unHightWithoutChange(Editable e) {
+        Log.d(TAG, "unHightWithoutChange");
+        modified = false;
+        clearSpans(e);
+        modified = true;
+
+    }
+
+    private Editable highlight(Editable e) {
+        try {
+            // don't use e.clearSpans() because it will remove
+            // too much
+            clearSpans(e);
+
+            if (e.length() == 0)
+                return e;
+
+            if (errorLine > 0) {
+                Matcher m = PATTERN_LINE.matcher(e);
+
+                for (int n = errorLine;
+                     n-- > 0 && m.find(); )
+                    ;
+
+                e.setSpan(
+                        new BackgroundColorSpan(COLOR_ERROR),
+                        m.start(),
+                        m.end(),
+                        Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+            }
+
+			/*for( Matcher m = PATTERN_NUMBER.matcher( e );
+                m.find(); )
+				e.setSpan(
+					new ForegroundColorSpan( COLOR_NUMBER ),
+					m.start(),
+					m.end(),
+					Spanned.SPAN_EXCLUSIVE_EXCLUSIVE );*/
+
+            for (Matcher m = getKw().matcher(e);
+                 m.find(); )
+                e.setSpan(
+                        new ForegroundColorSpan(COLOR_KEYWORD),
+                        m.start(),
+                        m.end(),
+                        Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+
+            for (Matcher m = getBuiltins().matcher(e);
+                 m.find(); )
+                e.setSpan(
+                        new ForegroundColorSpan(COLOR_BUILTIN),
+                        m.start(),
+                        m.end(),
+                        Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+
+            for (Matcher m = getComments().matcher(e);
+                 m.find(); )
+                e.setSpan(
+                        new ForegroundColorSpan(COLOR_COMMENT),
+                        m.start(),
+                        m.end(),
+                        Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+
+            for (Matcher m = quotes.matcher(e);
+                 m.find(); )
+                e.setSpan(
+                        new ForegroundColorSpan(COLOR_QUOTE),
+                        m.start(),
+                        m.end(),
+                        Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+        } catch (Exception ex) {
+        }
+
+        return e;
+    }
+
+    private void clearSpans(Editable e) {
+        // remove foreground color spans
+        {
+            ForegroundColorSpan spans[] = e.getSpans(
+                    0,
+                    e.length(),
+                    ForegroundColorSpan.class);
+
+            for (int n = spans.length; n-- > 0; )
+                e.removeSpan(spans[n]);
+        }
+
+        // remove background color spans
+        {
+            BackgroundColorSpan spans[] = e.getSpans(
+                    0,
+                    e.length(),
+                    BackgroundColorSpan.class);
+
+            for (int n = spans.length; n-- > 0; )
+                e.removeSpan(spans[n]);
+        }
+    }
+
+    private CharSequence autoIndent(CharSequence source, int start, int end, Spanned dest, int dstart, int dend) {
+        String indent = "";
+        int istart = dstart - 1;
+        int iend = -1;
+
+        //LogUtil.d(TAG, "dstart:"+dstart+"-istart:"+istart);
+
+        if (istart > 0) {
+
+            if (dest.charAt(istart) == ':') indent += "    ";
+        }
+
+        // find start of this PATTERN_LINE
+        boolean dataBefore = false;
+        int pt = 0;
+
+        for (; istart > -1; --istart) {
+            char c = dest.charAt(istart);
+
+            if (c == '\n')
+                break;
+
+            if (c != ' ' && c != '\t') {
+                if (!dataBefore) {
+                    // indent always after those characters
+                    if (c == '{' ||
+                            c == '+' ||
+                            c == '-' ||
+                            c == '*' ||
+                            c == '/' ||
+                            c == '%' ||
+                            c == '^' ||
+                            c == '=')
+                        --pt;
+
+                    dataBefore = true;
+                }
+
+                // parenthesis counter
+                if (c == '(')
+                    --pt;
+                else if (c == ')')
+                    ++pt;
+            }
+        }
+
+        // copy indent of this PATTERN_LINE into the next
+        if (istart > -1) {
+
+            char charAtCursor = dest.charAt(istart);
+
+            for (iend = ++istart; iend < dend; ++iend) {
+                char c = dest.charAt(iend);
+
+                // auto expand comments
+                if (charAtCursor != '\n' &&
+                        c == '/' &&
+                        iend + 1 < dend &&
+                        dest.charAt(iend) == c) {
+                    iend += 2;
+                    break;
+                }
+
+                if (c != ' ' && c != '\t')
+                    break;
+            }
+
+            indent += dest.subSequence(istart, iend);
+        }
+
+        // add new indent
+        if (pt < 0)
+            indent += "\t";
+
+        // append white space of previous PATTERN_LINE and new indent
+        return source + indent;
+    }
+
+    public interface OnTextChangedListener {
+        public void onTextChanged(String text);
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/ui/view/EditorPopUp.java b/qpython/src/main/java/org/qpython/qpy/texteditor/ui/view/EditorPopUp.java
new file mode 100644
index 00000000..ae2b75d7
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/ui/view/EditorPopUp.java
@@ -0,0 +1,56 @@
+package org.qpython.qpy.texteditor.ui.view;
+
+import android.content.Context;
+import android.graphics.drawable.BitmapDrawable;
+import android.os.Build;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
+import android.widget.FrameLayout;
+import android.widget.ListView;
+import android.widget.PopupWindow;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.texteditor.ui.adapter.bean.PopupItemBean;
+
+import java.util.List;
+
+public class EditorPopUp {
+    private PopupWindow popupWindow;
+
+    public EditorPopUp(Context context, final List<PopupItemBean> itemBeanList) {
+        FrameLayout root = (FrameLayout) LayoutInflater.from(context).inflate(R.layout.popup_add_editor, null);
+        ListView listView = root.findViewById(R.id.list_view);
+
+        ArrayAdapter<PopupItemBean> adapter = new ArrayAdapter<>(context, R.layout.item_pop_up, itemBeanList);
+        listView.setAdapter(adapter);
+        listView.setOnItemClickListener((parent, view, position, id) -> {
+            itemBeanList.get(position).getClickListener().onClick(view);
+            adapter.notifyDataSetChanged();
+            popupWindow.dismiss();
+        });
+
+        popupWindow = new PopupWindow(root, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+        popupWindow.setBackgroundDrawable(new BitmapDrawable());
+        popupWindow.setFocusable(true);
+        popupWindow.setOutsideTouchable(true);
+    }
+
+    public void show(View view, int gravity, int x, int y) {
+        popupWindow.showAtLocation(view, gravity, x, y);
+    }
+
+    public void show(View view) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+            popupWindow.showAsDropDown(view, 0, 0, Gravity.END);
+        } else {
+            popupWindow.showAtLocation(view, Gravity.TOP | Gravity.END, 0, view.getHeight());
+        }
+    }
+
+    public void dismiss() {
+        popupWindow.dismiss();
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/ui/view/EnterDialog.java b/qpython/src/main/java/org/qpython/qpy/texteditor/ui/view/EnterDialog.java
new file mode 100644
index 00000000..07db3b2c
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/ui/view/EnterDialog.java
@@ -0,0 +1,95 @@
+package org.qpython.qpy.texteditor.ui.view;
+
+import android.support.v7.app.AlertDialog;
+import android.app.Dialog;
+import android.content.Context;
+import android.databinding.DataBindingUtil;
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.Window;
+import android.view.WindowManager;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.databinding.DialogEnterBinding;
+
+/**
+ * A Dialog Contain EditText
+ * Created by Hmei on 2017-05-18.
+ */
+
+public class EnterDialog {
+    private DialogEnterBinding binding;
+
+    private AlertDialog dialog;
+
+    public EnterDialog(Context context) {
+        binding = DataBindingUtil.inflate(LayoutInflater.from(context), R.layout.dialog_enter, null, false);
+
+        AlertDialog.Builder builder = new AlertDialog.Builder(context, R.style.MyDialog);
+        builder.setView(binding.getRoot());
+        dialog = builder.create();
+
+        Window window = dialog.getWindow();
+        if (window != null) {
+            window.setGravity(Gravity.CENTER);
+            window.setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
+            window.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+            window.setSoftInputMode(
+                    WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
+        }
+
+        binding.tvNegative.setOnClickListener(v -> dialog.dismiss());
+    }
+
+    public EnterDialog setTitle(String title) {
+        binding.tvTitle.setText(title);
+        return this;
+    }
+
+    public EnterDialog setText(String text) {
+        binding.etEnter.setText(text);
+        binding.etEnter.setSelection(text.length());
+        return this;
+    }
+
+    public EnterDialog setExt(String ext) {
+        binding.etEnter.setText(ext);
+        return this;
+    }
+
+    public EnterDialog setHint(String hint) {
+        binding.etEnter.setHint(hint);
+        return this;
+    }
+
+    public EnterDialog setConfirmListener(final ClickListener listener) {
+        binding.tvPositive.setOnClickListener(v -> {
+            if (listener.OnClickListener(binding.etEnter.getText().toString())) {
+                dialog.dismiss();
+            }
+        });
+        return this;
+    }
+
+    public EnterDialog setEnterType(int type) {
+        binding.etEnter.setInputType(type);
+        return this;
+    }
+
+    public void show() {
+        dialog.show();
+    }
+
+    public interface ClickListener {
+        /**
+         * @param name Project/script name
+         * @return true if the dialog should be dismissed
+         */
+        boolean OnClickListener(String name);
+    }
+
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/ui/view/MyEditTextPreference.java b/qpython/src/main/java/org/qpython/qpy/texteditor/ui/view/MyEditTextPreference.java
new file mode 100644
index 00000000..6d017c6e
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/ui/view/MyEditTextPreference.java
@@ -0,0 +1,32 @@
+package org.qpython.qpy.texteditor.ui.view;
+
+import android.support.v7.app.AlertDialog;
+import android.content.Context;
+import android.os.Bundle;
+import android.preference.EditTextPreference;
+import android.util.AttributeSet;
+import android.view.View;
+
+/**
+ * Created by Hmei on 2017-06-14.
+ */
+
+public class MyEditTextPreference extends EditTextPreference {
+    public MyEditTextPreference(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    public MyEditTextPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public MyEditTextPreference(Context context) {
+        super(context);
+    }
+
+    @Override
+    protected void showDialog(Bundle state) {
+
+        super.showDialog(state);
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/ui/view/MyItemDecoration.java b/qpython/src/main/java/org/qpython/qpy/texteditor/ui/view/MyItemDecoration.java
new file mode 100644
index 00000000..70746e7d
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/ui/view/MyItemDecoration.java
@@ -0,0 +1,89 @@
+package org.qpython.qpy.texteditor.ui.view;
+
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
+import android.graphics.drawable.Drawable;
+import android.support.v7.widget.RecyclerView;
+import android.view.View;
+
+/**
+ *
+ * Created by Hmei on 2017-05-23.
+ */
+
+public class MyItemDecoration extends RecyclerView.ItemDecoration {
+    // we want to cache this and not allocate anything repeatedly in the onDraw method
+    private Drawable background;
+    private boolean  initiated;
+
+    private void init() {
+        background = new ColorDrawable(Color.parseColor("#FFD14136"));
+        initiated = true;
+    }
+
+    @Override
+    public void onDraw(Canvas c, RecyclerView parent, RecyclerView.State state) {
+
+        if (!initiated) {
+            init();
+        }
+
+        // only if animation is in progress
+        if (parent.getItemAnimator().isRunning()) {
+
+            // some items might be animating down and some items might be animating up to close the gap left by the removed item
+            // this is not exclusive, both movement can be happening at the same time
+            // to reproduce this leave just enough items so the first one and the last one would be just a little off screen
+            // then remove one from the middle
+
+            // find first child with translationY > 0
+            // and last one with translationY < 0
+            // we're after a rect that is not covered in recycler-view views at this point in time
+            View lastViewComingDown = null;
+            View firstViewComingUp = null;
+
+            // this is fixed
+            int left = 0;
+            int right = parent.getWidth();
+
+            // this we need to find out
+            int top = 0;
+            int bottom = 0;
+
+            // find relevant translating views
+            int childCount = parent.getLayoutManager().getChildCount();
+            for (int i = 0; i < childCount; i++) {
+                View child = parent.getLayoutManager().getChildAt(i);
+                if (child.getTranslationY() < 0) {
+                    // view is coming down
+                    lastViewComingDown = child;
+                } else if (child.getTranslationY() > 0) {
+                    // view is coming up
+                    if (firstViewComingUp == null) {
+                        firstViewComingUp = child;
+                    }
+                }
+            }
+
+            if (lastViewComingDown != null && firstViewComingUp != null) {
+                // views are coming down AND going up to fill the void
+                top = lastViewComingDown.getBottom() + (int) lastViewComingDown.getTranslationY();
+                bottom = firstViewComingUp.getTop() + (int) firstViewComingUp.getTranslationY();
+            } else if (lastViewComingDown != null) {
+                // views are going down to fill the void
+                top = lastViewComingDown.getBottom() + (int) lastViewComingDown.getTranslationY();
+                bottom = lastViewComingDown.getBottom();
+            } else if (firstViewComingUp != null) {
+                // views are coming up to fill the void
+                top = firstViewComingUp.getTop();
+                bottom = firstViewComingUp.getTop() + (int) firstViewComingUp.getTranslationY();
+            }
+
+            background.setBounds(left, top, right, bottom);
+            background.draw(c);
+
+        }
+        super.onDraw(c, parent, state);
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/ui/view/MyTouchHelperCallback.java b/qpython/src/main/java/org/qpython/qpy/texteditor/ui/view/MyTouchHelperCallback.java
new file mode 100644
index 00000000..30a8e03b
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/ui/view/MyTouchHelperCallback.java
@@ -0,0 +1,101 @@
+package org.qpython.qpy.texteditor.ui.view;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.PorterDuff;
+import android.graphics.drawable.ColorDrawable;
+import android.graphics.drawable.Drawable;
+import android.support.v4.content.ContextCompat;
+import android.support.v7.widget.RecyclerView;
+import android.support.v7.widget.helper.ItemTouchHelper;
+import android.view.View;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.texteditor.ui.adapter.PathListAdapter;
+
+import static android.support.v7.widget.helper.ItemTouchHelper.ACTION_STATE_IDLE;
+
+/**
+ * To
+ * Created by Hmei on 2017-05-23.
+ */
+
+public class MyTouchHelperCallback extends ItemTouchHelper.SimpleCallback {
+
+    // we want to cache these and not allocate anything repeatedly in the onChildDraw method
+    private Drawable        background;
+    private Drawable        xMark;
+    private int             xMarkMargin;
+    private boolean         initiated;
+    private Context         context;
+    private PathListAdapter adapter;
+    public MyTouchHelperCallback(int dragDirs, int swipeDirs, PathListAdapter adapter,Context context) {
+        super(dragDirs, swipeDirs);
+        this.adapter = adapter;
+        this.context = context;
+    }
+
+    private void init() {
+        background = new ColorDrawable(Color.RED);
+        xMark = ContextCompat.getDrawable(context, R.drawable.ic_clear_24dp);
+        xMark.setColorFilter(Color.WHITE, PorterDuff.Mode.SRC_ATOP);
+        xMarkMargin = (int) context.getResources().getDimension(R.dimen.default_margin);
+        initiated = true;
+    }
+
+    @Override
+    public int getSwipeDirs(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder) {
+        int position = viewHolder.getAdapterPosition();
+        if (adapter.isPendingRemoval(position)) {
+            return ACTION_STATE_IDLE;
+        }
+        return super.getSwipeDirs(recyclerView, viewHolder);
+    }
+
+    @Override
+    public void onSwiped(RecyclerView.ViewHolder viewHolder, int swipeDir) {
+        int swipedPosition = viewHolder.getAdapterPosition();
+        adapter.pendingRemoval(swipedPosition);
+    }
+
+    @Override
+    public void onChildDraw(Canvas c, RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder, float dX, float dY, int actionState, boolean isCurrentlyActive) {
+        View itemView = viewHolder.itemView;
+
+        // not sure why, but this method get's called for viewholder that are already swiped away
+        if (viewHolder.getAdapterPosition() == -1) {
+            // not interested in those
+            return;
+        }
+
+        if (!initiated) {
+            init();
+        }
+
+        // draw red background
+        background.setBounds(itemView.getRight() + (int) dX, itemView.getTop(), itemView.getRight(), itemView.getBottom());
+        background.draw(c);
+
+        // draw x mark
+        int itemHeight = itemView.getBottom() - itemView.getTop();
+        int intrinsicWidth = xMark.getIntrinsicWidth();
+        int intrinsicHeight = xMark.getIntrinsicWidth();
+
+        int xMarkLeft = itemView.getRight() - xMarkMargin - intrinsicWidth;
+        int xMarkRight = itemView.getRight() - xMarkMargin;
+        int xMarkTop = itemView.getTop() + (itemHeight - intrinsicHeight) / 2;
+        int xMarkBottom = xMarkTop + intrinsicHeight;
+        xMark.setBounds(xMarkLeft, xMarkTop, xMarkRight, xMarkBottom);
+
+        xMark.draw(c);
+
+        super.onChildDraw(c, recyclerView, viewHolder, dX, dY, actionState, isCurrentlyActive);
+    }
+
+
+    @Override
+    public boolean onMove(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder, RecyclerView.ViewHolder target) {
+        return false;
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/ui/view/TopSearchDialog.java b/qpython/src/main/java/org/qpython/qpy/texteditor/ui/view/TopSearchDialog.java
new file mode 100644
index 00000000..d95bd53c
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/ui/view/TopSearchDialog.java
@@ -0,0 +1,82 @@
+//package org.qpython.qpy.texteditor.ui.view;
+//
+//import android.app.Dialog;
+//import android.content.Context;
+//import android.databinding.DataBindingUtil;
+//import android.graphics.Color;
+//import android.graphics.drawable.ColorDrawable;
+//import android.text.TextWatcher;
+//import android.view.Gravity;
+//import android.view.LayoutInflater;
+//import android.view.View;
+//import android.view.ViewGroup;
+//import android.view.Window;
+//
+//import org.qpython.qpy.texteditor.R;
+//import org.qpython.qpy.texteditor.databinding.DialogSearchTopBinding;
+//
+///**
+// * Top search dialog
+// * Created by Hmei on 2017-05-10.
+// */
+//
+//public class TopSearchDialog {
+//
+//    private static Dialog searchDialog;
+//    private Callback callback;
+//    private DialogSearchTopBinding binding;
+//
+//    public TopSearchDialog(Context context) {
+//        searchDialog = new Dialog(context);
+//        binding = DataBindingUtil.inflate(LayoutInflater.from(context), R.layout.dialog_search_top, null, false);
+//        initWindow();
+//        initListener();
+//    }
+//
+//    private void initWindow() {
+//        Window window = searchDialog.getWindow();
+//        window.setGravity( Gravity.TOP);
+//        window.setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
+//        window.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+//    }
+//
+//    private void initListener() {
+//        binding.ibClear.setOnClickListener(new View.OnClickListener() {
+//            @Override
+//            public void onClick(View view) {
+//                binding.textSearch.setText("");
+//            }
+//        });
+//        binding.ibClose.setOnClickListener(new View.OnClickListener() {
+//            @Override
+//            public void onClick(View view) {
+//                dismiss();
+//            }
+//        });
+//    }
+//
+//    public TopSearchDialog addTextChangeListener(TextWatcher textWatcher) {
+//        binding.textSearch.addTextChangedListener(textWatcher);
+//        return this;
+//    }
+//
+//    public TopSearchDialog addCallback(Callback callback) {
+//        this.callback = callback;
+//        return this;
+//    }
+//
+//    public void show() {
+//        searchDialog.show();
+//    }
+//
+//    public void dismiss() {
+//        searchDialog.dismiss();
+//        if (callback != null) {
+//            callback.dismiss();
+//        }
+//    }
+//
+//    interface Callback{
+//        void dismiss();
+//    }
+//}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/undo/TextChange.java b/qpython/src/main/java/org/qpython/qpy/texteditor/undo/TextChange.java
new file mode 100644
index 00000000..16756bda
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/undo/TextChange.java
@@ -0,0 +1,83 @@
+package org.qpython.qpy.texteditor.undo;
+
+
+import android.text.Editable;
+
+import org.qpython.qpy.texteditor.common.Constants;
+
+public interface TextChange extends Constants {
+
+	/**
+	 * Undo this change
+	 * 
+	 * @param text
+	 *            the editable object on which the undo is done
+	 * @return the caret position after the undo
+	 */
+	int undo(Editable text);
+
+	/**
+	 * Redo the undo
+	 * @param text the editable object on which the undo is done
+	 * @return the caret position after the undo
+	 */
+	int redo(Editable text);
+
+	/**
+	 * Method is deprecated, you should use the canMergeXXX methods instead
+	 * 
+	 * @return the caret position after this change
+	 */
+	@Deprecated
+	int getCaret();
+
+	/**
+	 * Method is deprecated, you should use the canMergeXXX methods instead
+	 * 
+	 * @param sequence
+	 *            the sequence being appended to this {@link TextChange}
+	 */
+	@Deprecated
+	void append(CharSequence sequence);
+
+	/**
+	 * A change to the text {@linkplain s} will be made, where the
+	 * {@linkplain count} characters starting at {@linkplain start} will be
+	 * replaced by {@linkplain after} characters
+	 * 
+	 * If possible, this change is merged in this {@link TextChange}
+	 * 
+	 * @param s
+	 *            the sequence being changed
+	 * @param start
+	 *            the start index
+	 * @param count
+	 *            the number of characters that will change
+	 * @param after
+	 *            the number of characters that will replace the old ones
+	 * @return if the change can be merged with this {@link TextChange}
+	 */
+	boolean canMergeChangeBefore(CharSequence s, int start, int count,
+								 int after);
+
+	/**
+	 * A change to the text {@linkplain s} has been made, where the
+	 * {@linkplain count} characters starting at {@linkplain start} have
+	 * replaced the substring of length {@linkplain before}
+	 * 
+	 * If possible, this change is merged in this {@link TextChange}
+	 * 
+	 * @param s
+	 *            the sequence being changed
+	 * @param start
+	 *            the start index
+	 * @param before
+	 *            the number of character that were replaced
+	 * @param count
+	 *            the number of characters that will change
+	 * @return if the change can be merged with this {@link TextChange}
+	 */
+	boolean canMergeChangeAfter(CharSequence s, int start, int before,
+								int count);
+
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/undo/TextChangeDelete.java b/qpython/src/main/java/org/qpython/qpy/texteditor/undo/TextChangeDelete.java
new file mode 100644
index 00000000..80de2ea8
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/undo/TextChangeDelete.java
@@ -0,0 +1,77 @@
+package org.qpython.qpy.texteditor.undo;
+
+import android.text.Editable;
+import android.util.Log;
+
+import org.qpython.qpy.BuildConfig;
+
+public class TextChangeDelete implements TextChange {
+
+    private StringBuffer mSequence;
+    private int          mStart;
+
+    /**
+     * @param seq   the sequence being deleted
+     * @param start the start index
+     */
+    TextChangeDelete(CharSequence seq, int start) {
+        mSequence = new StringBuffer();
+        mSequence.append(seq);
+        mStart = start;
+    }
+
+    @Override
+    public int undo(Editable s) {
+        s.insert(mStart, mSequence);
+        return mStart + mSequence.length();
+    }
+
+    @Override
+    public int redo(Editable text) {
+        text.replace(mStart, mStart + mSequence.length(), "");
+        return mStart;
+    }
+
+    @Override
+    public int getCaret() {
+        if (mSequence.toString().contains(" "))
+            return -1;
+        if (mSequence.toString().contains("\n"))
+            return -1;
+        return mStart;
+    }
+
+    @Override
+    public void append(CharSequence seq) {
+        mSequence.insert(0, seq);
+        if (BuildConfig.DEBUG)
+            Log.d(TAG, mSequence.toString());
+        mStart -= seq.length();
+    }
+
+    @Override
+    public boolean canMergeChangeBefore(CharSequence s, int start, int count, int after) {
+        CharSequence sub;
+        if (mSequence.toString().contains(" "))
+            return false;
+        if (mSequence.toString().contains("\n"))
+            return false;
+        if ((count != 1) || (start + count != mStart))
+            return false;
+
+        sub = s.subSequence(start, start + count);
+        append(sub);
+        return true;
+    }
+
+    @Override
+    public boolean canMergeChangeAfter(CharSequence s, int start, int before, int count) {
+        return false;
+    }
+
+    @Override
+    public String toString() {
+        return "-\"" + mSequence.toString().replaceAll("\n", "~") + "\" @" + mStart;
+    }
+
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/undo/TextChangeInsert.java b/qpython/src/main/java/org/qpython/qpy/texteditor/undo/TextChangeInsert.java
new file mode 100644
index 00000000..7c6becdd
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/undo/TextChangeInsert.java
@@ -0,0 +1,110 @@
+package org.qpython.qpy.texteditor.undo;
+
+import android.text.Editable;
+import android.util.Log;
+
+import org.qpython.qpy.BuildConfig;
+
+public class TextChangeInsert implements TextChange {
+
+	private StringBuffer mSequence;
+	private int          mStart;
+
+	TextChangeInsert(CharSequence seq, int start) {
+		mSequence = new StringBuffer();
+		mSequence.append(seq);
+		mStart = start;
+	}
+
+	@Override
+	public int getCaret() {
+		if (mSequence.toString().contains(" "))
+			return -1;
+		if (mSequence.toString().contains("\n"))
+			return -1;
+		return mStart + mSequence.length();
+	}
+
+	@Override
+	public void append(CharSequence seq) {
+		mSequence.append(seq);
+	}
+
+	@Override
+	public boolean canMergeChangeBefore(CharSequence s, int start, int count, int after) {
+
+		CharSequence sub;
+		boolean append, replace;
+
+		if (mSequence.toString().contains(" "))
+			return false;
+		if (mSequence.toString().contains("\n"))
+			return false;
+
+		sub = s.subSequence(start, start + count);
+		append = (start == mStart + mSequence.length());
+		replace = (start == mStart) && (after >= mSequence.length())
+				&& (sub.toString().startsWith(mSequence.toString()));
+
+		if (append) {
+			// mSequence.append(sub);
+			return true;
+		}
+
+		if (replace) {
+			// mSequence = new StringBuffer();
+			// mSequence.append(sub);
+			return true;
+		}
+		return false;
+	}
+
+	@Override
+	public boolean canMergeChangeAfter(CharSequence s, int start, int before, int count) {
+		CharSequence sub;
+		boolean append, replace;
+
+		if (mSequence.toString().contains(" "))
+			return false;
+		if (mSequence.toString().contains("\n"))
+			return false;
+
+		sub = s.subSequence(start, start + count);
+		append = (start == mStart + mSequence.length());
+		replace = (start == mStart) && (count >= mSequence.length())
+				&& (sub.toString().startsWith(mSequence.toString()));
+
+		if (append) {
+			mSequence.append(sub);
+			return true;
+		}
+
+		if (replace) {
+			mSequence = new StringBuffer();
+			mSequence.append(sub);
+			return true;
+		}
+
+		return false;
+	}
+
+	@Override
+	public int undo(Editable s) {
+		if (BuildConfig.DEBUG)
+			Log.i(TAG, "Undo Insert : deleting " + mStart + " to " + (mStart + mSequence.length()));
+		s.replace(mStart, mStart + mSequence.length(), "");
+		return mStart;
+	}
+
+	@Override
+	public int redo(Editable text) {
+		text.insert(mStart, mSequence);
+		return mStart + mSequence.length();
+	}
+
+	@Override
+	public String toString() {
+		return "+\"" + mSequence.toString().replaceAll("\n", "~") + "\" @" + mStart;
+	}
+
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/undo/TextChangeWatcher.java b/qpython/src/main/java/org/qpython/qpy/texteditor/undo/TextChangeWatcher.java
new file mode 100644
index 00000000..33e40ce4
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/undo/TextChangeWatcher.java
@@ -0,0 +1,183 @@
+package org.qpython.qpy.texteditor.undo;
+
+import android.text.Editable;
+import android.util.Log;
+
+import org.qpython.qpy.BuildConfig;
+import org.qpython.qpy.texteditor.common.Constants;
+import org.qpython.qpy.texteditor.common.Settings;
+
+import java.util.Stack;
+
+public class TextChangeWatcher implements Constants {
+
+    private final Stack<TextChange> history;
+    private final Stack<TextChange> future;
+    private boolean isRedo = false;
+
+    private TextChange mCurrentChange;
+
+    /**
+     *
+     */
+    public TextChangeWatcher() {
+        history = new Stack<>();
+        future = new Stack<>();
+    }
+
+    /**
+     * Undo the last operation
+     *
+     * @param text the text to undo on
+     * @return the caret position
+     */
+    public int undo(Editable text) {
+        pushCurrentChange();
+
+        if (history.size() == 0) {
+            if (BuildConfig.DEBUG)
+                Log.i(TAG, "Nothing to undo");
+            return -1;
+        }
+
+        TextChange change = history.pop();
+        future.push(change);
+        if (change != null)
+            return change.undo(text);
+        else if (BuildConfig.DEBUG)
+            Log.w(TAG, "Null change ?!");
+
+        return -1;
+    }
+
+    public int redo(Editable text) {
+        isRedo = true;
+        if (future.size() == 0) return -1;
+
+        TextChange change = future.pop();
+        if (change != null) {
+            return change.redo(text);
+        } else {
+            return -1;
+        }
+    }
+
+    /**
+     * A change to the text {@param s} will be made, where the
+     * {@param count} characters starting at {@param start} will be
+     * replaced by {@param after} characters
+     *
+     * @param s     the sequence being changed
+     * @param start the start index
+     * @param count the number of characters that will change
+     * @param after the number of characters that will replace the old ones
+     */
+    public void beforeChange(CharSequence s, int start, int count, int after) {
+        if ((mCurrentChange != null)
+                && (mCurrentChange.canMergeChangeBefore(s, start, count, after))) {
+        } else {
+            if (count == 0) {
+                // no existing character changed
+                // ignore, will be processed after
+            } else if (after == 0) {
+                // existing character replaced by none => delete
+                processDelete(s, start, count);
+            } else {
+                // n chars replaced by m other chars => replace
+                // replace is a delete AND an insert...
+                processDelete(s, start, count);
+            }
+        }
+    }
+
+    /**
+     * A change to the text {@param s} has been made, where the
+     * {@param count} characters starting at {@param start} have
+     * replaced the substring of length {@param before}
+     *
+     * @param s      the sequence being changed
+     * @param start  the start index
+     * @param before the number of character that were replaced
+     * @param count  the number of characters that will change
+     */
+    public void afterChange(CharSequence s, int start, int before, int count) {
+        if ((mCurrentChange != null)
+                && (mCurrentChange.canMergeChangeAfter(s, start, before, count))) {
+
+        } else {
+            if (before == 0) {
+                // 0 charactes replaced by count => insert
+                processInsert(s, start, count);
+            } else if (count == 0) {
+                // existing character replaced by none => delete, already done
+                // before
+            } else {
+                // n chars replaced by m other chars => replace
+                // replace is a delete AND an insert...
+                processInsert(s, start, count);
+            }
+        }
+        if (!isRedo) {
+            future.clear();
+        } else {
+            isRedo = false;
+        }
+        // printStack();
+    }
+
+    /**
+     * @param s     the sequence being modified
+     * @param start the first character index
+     * @param count the number of inserted text
+     */
+    public void processInsert(CharSequence s, int start, int count) {
+        CharSequence sub = s.subSequence(start, start + count);
+
+        if (mCurrentChange != null)
+            pushCurrentChange();
+
+        mCurrentChange = new TextChangeInsert(sub, start);
+    }
+
+    /**
+     * @param s     the sequence being modified
+     * @param start the first character index
+     * @param count the number of inserted text
+     */
+    public void processDelete(CharSequence s, int start, int count) {
+        CharSequence sub = s.subSequence(start, start + count);
+
+        if (mCurrentChange != null)
+            pushCurrentChange();
+
+        mCurrentChange = new TextChangeDelete(sub, start);
+    }
+
+    /**
+     * Pushes the current change on top of the stack
+     */
+    protected void pushCurrentChange() {
+        if (mCurrentChange == null)
+            return;
+
+        history.push(mCurrentChange);
+        while (history.size() > Settings.UNDO_MAX_STACK) {
+            history.remove(0);
+        }
+        mCurrentChange = null;
+    }
+
+    /**
+     * Prints the current stack
+     */
+    public void printStack() {
+        if (!BuildConfig.DEBUG)
+            return;
+        Log.i(TAG, "STACK");
+        for (TextChange change : history) {
+            Log.d(TAG, change.toString());
+        }
+        Log.d(TAG, "Current change : " + mCurrentChange.toString());
+    }
+
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/widget/crouton/AnimationsBuilder.java b/qpython/src/main/java/org/qpython/qpy/texteditor/widget/crouton/AnimationsBuilder.java
new file mode 100644
index 00000000..1ec27c23
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/widget/crouton/AnimationsBuilder.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2012 Benjamin Weiss
+ * Copyright 2012 Neofonie Mobile GmbH
+ *
+ * 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.
+ */
+
+package org.qpython.qpy.texteditor.widget.crouton;
+
+import android.view.animation.Animation;
+import android.view.animation.TranslateAnimation;
+
+final class AnimationsBuilder {
+
+  private static Animation slideInDownAnimation, slideOutUpAnimation;
+
+  private AnimationsBuilder() {
+  }
+
+  public static Animation buildSlideInDownAnimation() {
+    if (slideInDownAnimation == null) {
+      slideInDownAnimation = new TranslateAnimation(SlideInDownAnimationParameters.FROM_X_DELTA, SlideInDownAnimationParameters.TO_X_DELTA,
+          SlideInDownAnimationParameters.FROM_Y_DELTA, SlideInDownAnimationParameters.TO_Y_DELTA);
+      slideInDownAnimation.setDuration(SlideInDownAnimationParameters.DURATION);
+    }
+
+    return slideInDownAnimation;
+  }
+
+  public static Animation buildSlideOutUpAnimation() {
+    if (slideOutUpAnimation == null) {
+      slideOutUpAnimation = new TranslateAnimation(SlideOutUpAnimationParameters.FROM_X_DELTA, SlideOutUpAnimationParameters.TO_X_DELTA,
+          SlideOutUpAnimationParameters.FROM_Y_DELTA, SlideOutUpAnimationParameters.TO_Y_DELTA);
+      slideOutUpAnimation.setDuration(SlideOutUpAnimationParameters.DURATION);
+    }
+    return slideOutUpAnimation;
+  }
+
+  private static final class SlideInDownAnimationParameters {
+    public static final float FROM_X_DELTA = 0;
+    public static final float TO_X_DELTA = 0;
+    public static final float FROM_Y_DELTA = -50;
+    public static final float TO_Y_DELTA = 0;
+    public static final long DURATION = 400;
+
+    private SlideInDownAnimationParameters() {
+    }
+  }
+
+  private static final class SlideOutUpAnimationParameters {
+    public static final float FROM_X_DELTA = 0;
+    public static final float TO_X_DELTA = 0;
+    public static final float FROM_Y_DELTA = 0;
+    public static final float TO_Y_DELTA = -50;
+    public static final long DURATION = 400;
+
+    private SlideOutUpAnimationParameters() {
+    }
+  }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/widget/crouton/Crouton.java b/qpython/src/main/java/org/qpython/qpy/texteditor/widget/crouton/Crouton.java
new file mode 100644
index 00000000..8b4754e0
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/widget/crouton/Crouton.java
@@ -0,0 +1,456 @@
+/*
+ * Copyright 2012 Benjamin Weiss
+ * Copyright 2012 Neofonie Mobile GmbH
+ *
+ * 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.
+ */
+
+package org.qpython.qpy.texteditor.widget.crouton;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.res.Resources;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.Shader;
+import android.graphics.Typeface;
+import android.graphics.drawable.BitmapDrawable;
+import android.util.TypedValue;
+import android.view.View;
+import android.view.animation.Animation;
+import android.view.animation.AnimationUtils;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+import android.widget.Toast;
+
+/*
+ * Based on an article by Cyril Mottier (http://android.cyrilmottier.com/?p=773) <br>
+ */
+
+/**
+ * Displays information in a non-invasive context related manner. Like
+ * {@link Toast}, but better.
+ * <p/>
+ * Call {@link Manager#clearCroutonsForActivity(Activity)} within your
+ * Activitie's onDestroy method to avoid {@link Context} leaks.
+ * 
+ */
+public final class Crouton {
+	private static final int IMAGE_ID = 0x100;
+	private static final int TEXT_ID = 0x101;
+	private final CharSequence text;
+	private final Style style;
+	private final View customView;
+
+	private Activity activity;
+	private FrameLayout croutonView;
+	private Animation inAnimation;
+	private Animation outAnimation;
+
+	/**
+	 * Creates the {@link Crouton}.
+	 *
+	 * @param activity
+	 *            The {@link Activity} that the {@link Crouton} should be
+	 *            attached to.
+	 * @param text
+	 *            The text you want to display.
+	 * @param style
+	 *            The style that this {@link Crouton} should be created with.
+	 */
+	private Crouton(Activity activity, CharSequence text, Style style) {
+		if ((activity == null) || (text == null) || (style == null)) {
+			throw new IllegalArgumentException(
+					"Null parameters are not accepted");
+		}
+
+		this.activity = activity;
+		this.text = text;
+		this.style = style;
+		this.customView = null;
+	}
+
+	/**
+	 * Creates the {@link Crouton}.
+	 *
+	 * @param activity
+	 *            The {@link Activity} that the {@link Crouton} should be
+	 *            attached to.
+	 * @param customView
+	 *            The custom {@link View} to display
+	 */
+	private Crouton(Activity activity, View customView) {
+		if ((activity == null) || (customView == null)) {
+			throw new IllegalArgumentException(
+					"Null parameters are not accepted");
+		}
+
+		this.activity = activity;
+		this.customView = customView;
+		this.style = new Style.Builder().build();
+		this.text = null;
+	}
+
+	/**
+	 * Creates a {@link Crouton} with provided text and style for a given
+	 * activity.
+	 *
+	 * @param activity
+	 *            The {@link Activity} that the {@link Crouton} should be
+	 *            attached to.
+	 * @param text
+	 *            The text you want to display.
+	 * @param style
+	 *            The style that this {@link Crouton} should be created with.
+	 * @return The created {@link Crouton}.
+	 */
+	public static Crouton makeText(Activity activity, CharSequence text,
+			Style style) {
+		return new Crouton(activity, text, style);
+	}
+
+	/**
+	 * Creates a {@link Crouton} with provided text-resource and style for a
+	 * given activity.
+	 *
+	 * @param activity
+	 *            The {@link Activity} that the {@link Crouton} should be
+	 *            attached to.
+	 * @param textResourceId
+	 *            The resource id of the text you want to display.
+	 * @param style
+	 *            The style that this {@link Crouton} should be created with.
+	 * @return The created {@link Crouton}.
+	 */
+	public static Crouton makeText(Activity activity, int textResourceId,
+			Style style) {
+		return makeText(activity, activity.getString(textResourceId), style);
+	}
+
+	/**
+	 * Creates a {@link Crouton} with provided text-resource and style for a
+	 * given activity.
+	 *
+	 * @param activity
+	 *            The {@link Activity} that the {@link Crouton} should be
+	 *            attached to.
+	 * @param customView
+	 *            The custom {@link View} to display
+	 * @return The created {@link Crouton}.
+	 */
+	public static Crouton make(Activity activity, View customView) {
+		return new Crouton(activity, customView);
+	}
+
+	/**
+	 * Creates a {@link Crouton} with provided text and style for a given
+	 * activity and displays it directly.
+	 *
+	 * @param activity
+	 *            The {@link android.app.Activity} that the {@link Crouton}
+	 *            should be attached to.
+	 * @param text
+	 *            The text you want to display.
+	 * @param style
+	 *            The style that this {@link Crouton} should be created with.
+	 *
+	 */
+	public static void showText(Activity activity, CharSequence text,
+			Style style) {
+		makeText(activity, text, style).show();
+	}
+
+	/**
+	 * Creates a {@link Crouton} with provided text and style for a given
+	 * activity and displays it directly.
+	 *
+	 * @param activity
+	 *            The {@link android.app.Activity} that the {@link Crouton}
+	 *            should be attached to.
+	 * @param customView
+	 *            The custom {@link View} to display
+	 *
+	 */
+	public static void show(Activity activity, View customView) {
+		make(activity, customView).show();
+	}
+
+	/**
+	 * Creates a {@link Crouton} with provided text-resource and style for a
+	 * given activity and displays it directly.
+	 *
+	 * @param activity
+	 *            The {@link Activity} that the {@link Crouton} should be
+	 *            attached to.
+	 * @param textResourceId
+	 *            The resource id of the text you want to display.
+	 * @param style
+	 *            The style that this {@link Crouton} should be created with.
+	 *
+	 */
+	public static void showText(Activity activity, int textResourceId,
+			Style style) {
+		showText(activity, activity.getString(textResourceId), style);
+	}
+
+	/**
+	 * Cancels all queued {@link Crouton}s. If there is a {@link Crouton}
+	 * displayed currently, it will be the last one displayed.
+	 */
+	public static void cancelAllCroutons() {
+		Manager.getInstance().clearCroutonQueue();
+	}
+
+	/**
+	 * Clears (and removes from {@link Activity}'s content view, if necessary)
+	 * all croutons for the provided activity
+	 *
+	 * @param activity
+	 *            - The {@link} Activity to clear the croutons for
+	 */
+	public static void clearCroutonsForActivity(Activity activity) {
+		Manager.getInstance().clearCroutonsForActivity(activity);
+	}
+
+	/**
+	 * Cancels a {@link Crouton} immediately.
+	 */
+	public void cancel() {
+		Manager manager = Manager.getInstance();
+		manager.removeCroutonImmediately(this);
+	}
+
+	/**
+	 * Displays the {@link Crouton}. If there's another {@link Crouton} visible
+	 * at the time, this {@link Crouton} will be displayed afterwards.
+	 */
+	public void show() {
+		Manager.getInstance().add(this);
+	}
+
+	/**
+	 * @return <code>true</code> if the {@link Crouton} is being displayed, else
+	 *         <code>false</code>.
+	 */
+	boolean isShowing() {
+		return (activity != null) && (croutonView != null)
+				&& (croutonView.getParent() != null);
+	}
+
+	/**
+	 * Removes the activity reference this {@link Crouton} is holding
+	 */
+	void detachActivity() {
+		activity = null;
+	}
+
+	/**
+	 * @return the style
+	 */
+	Style getStyle() {
+		return style;
+	}
+
+	/**
+	 * @return the activity
+	 */
+	Activity getActivity() {
+		return activity;
+	}
+
+	/**
+	 * @return the text
+	 */
+	CharSequence getText() {
+		return text;
+	}
+
+	/**
+	 * @return the view
+	 */
+	View getView() {
+		// return the custom view if one exists
+		if (this.customView != null) {
+			return this.customView;
+		}
+
+		// if already setup return the view
+		if (this.croutonView == null) {
+			initializeCroutonView();
+		}
+
+		return croutonView;
+	}
+
+	@SuppressWarnings("deprecation")
+	private void initializeCroutonView() {
+		Resources resources = this.activity.getResources();
+
+		// create outer frame
+		this.croutonView = new FrameLayout(this.activity);
+
+		int height = this.style.heightInPixels;
+
+		// if a height dimension has been set, this will overwrite any height in
+		// pixels
+		if (this.style.heightDimensionResId > 0) {
+			height = resources
+					.getDimensionPixelSize(this.style.heightDimensionResId);
+		}
+		this.croutonView.setLayoutParams(new FrameLayout.LayoutParams(
+				FrameLayout.LayoutParams.MATCH_PARENT, height));
+
+		// set background
+		if (this.style.backgroundColorValue != -1) {
+			this.croutonView
+					.setBackgroundColor(this.style.backgroundColorValue);
+		} else {
+			this.croutonView.setBackgroundColor(resources
+					.getColor(this.style.backgroundColorResourceId));
+		}
+
+		// set the background drawable if set. This will override the background
+		// color.
+		if (this.style.backgroundDrawableResourceId != 0) {
+			Bitmap background = BitmapFactory.decodeResource(resources,
+					this.style.backgroundDrawableResourceId);
+			BitmapDrawable drawable = new BitmapDrawable(resources, background);
+			if (this.style.isTileEnabled) {
+				drawable.setTileModeXY(Shader.TileMode.REPEAT,
+						Shader.TileMode.REPEAT);
+			}
+			this.croutonView.setBackgroundDrawable(drawable);
+		}
+
+		// create content view
+		RelativeLayout contentView = new RelativeLayout(this.activity);
+		contentView.setLayoutParams(new RelativeLayout.LayoutParams(
+				RelativeLayout.LayoutParams.MATCH_PARENT,
+				RelativeLayout.LayoutParams.WRAP_CONTENT));
+
+		// set padding
+		int padding = this.style.paddingInPixels;
+
+		// if a padding dimension has been set, this will overwrite any padding
+		// in pixels
+		if (this.style.paddingDimensionResId > 0) {
+			padding = resources
+					.getDimensionPixelSize(this.style.paddingDimensionResId);
+		}
+		contentView.setPadding(padding, padding, padding, padding);
+
+		// only setup image if one is requested
+		ImageView image = null;
+		if ((this.style.imageDrawable != null) || (this.style.imageResId != 0)) {
+			image = new ImageView(this.activity);
+			image.setId(IMAGE_ID);
+			image.setAdjustViewBounds(true);
+			image.setScaleType(this.style.imageScaleType);
+
+			// set the image drawable if not null
+			if (this.style.imageDrawable != null) {
+				image.setImageDrawable(this.style.imageDrawable);
+			}
+
+			// set the image resource if not 0. This will overwrite the drawable
+			// if both are set
+			if (this.style.imageResId != 0) {
+				image.setImageResource(this.style.imageResId);
+			}
+
+			RelativeLayout.LayoutParams imageParams = new RelativeLayout.LayoutParams(
+					RelativeLayout.LayoutParams.WRAP_CONTENT,
+					RelativeLayout.LayoutParams.WRAP_CONTENT);
+			imageParams.addRule(RelativeLayout.ALIGN_PARENT_LEFT,
+					RelativeLayout.TRUE);
+			imageParams.addRule(RelativeLayout.CENTER_VERTICAL,
+					RelativeLayout.TRUE);
+			contentView.addView(image, imageParams);
+		}
+
+		TextView text = new TextView(this.activity);
+		text.setId(TEXT_ID);
+		text.setText(this.text);
+		text.setTypeface(Typeface.DEFAULT);
+		text.setGravity(this.style.gravity);
+
+		// set the text color if set
+		if (this.style.textColorResourceId != 0) {
+			text.setTextColor(resources
+					.getColor(this.style.textColorResourceId));
+		}
+
+		// Set the text size. If the user has set a text size and text
+		// appearance, the text size in the text appearance
+		// will override this.
+		if (this.style.textSize != 0) {
+			text.setTextSize(TypedValue.COMPLEX_UNIT_SP, this.style.textSize);
+		}
+
+		// Setup the shadow if requested
+		if (this.style.textShadowColorResId != 0) {
+			int textShadowColor = resources
+					.getColor(this.style.textShadowColorResId);
+			float textShadowRadius = this.style.textShadowRadius;
+			float textShadowDx = this.style.textShadowDx;
+			float textShadowDy = this.style.textShadowDy;
+			text.setShadowLayer(textShadowRadius, textShadowDx, textShadowDy,
+					textShadowColor);
+		}
+
+		// Set the text appearance
+		if (this.style.textAppearanceResId != 0) {
+			text.setTextAppearance(this.activity,
+					this.style.textAppearanceResId);
+		}
+
+		RelativeLayout.LayoutParams textParams = new RelativeLayout.LayoutParams(
+				RelativeLayout.LayoutParams.MATCH_PARENT,
+				RelativeLayout.LayoutParams.WRAP_CONTENT);
+		if (image != null) {
+			textParams.addRule(RelativeLayout.RIGHT_OF, image.getId());
+		}
+		contentView.addView(text, textParams);
+		this.croutonView.addView(contentView);
+	}
+
+	public Animation getInAnimation() {
+		if ((this.inAnimation == null) && (this.activity != null)) {
+			if (getStyle().inAnimationResId > 0) {
+				this.inAnimation = AnimationUtils.loadAnimation(getActivity(),
+						getStyle().inAnimationResId);
+			} else {
+				this.inAnimation = AnimationsBuilder
+						.buildSlideInDownAnimation();
+			}
+		}
+
+		return inAnimation;
+	}
+
+	public Animation getOutAnimation() {
+		if ((this.outAnimation == null) && (this.activity != null)) {
+			if (getStyle().outAnimationResId > 0) {
+				this.outAnimation = AnimationUtils.loadAnimation(getActivity(),
+						getStyle().outAnimationResId);
+			} else {
+				this.outAnimation = AnimationsBuilder
+						.buildSlideOutUpAnimation();
+			}
+		}
+
+		return outAnimation;
+	}
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/widget/crouton/Manager.java b/qpython/src/main/java/org/qpython/qpy/texteditor/widget/crouton/Manager.java
new file mode 100644
index 00000000..5dfe66c0
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/widget/crouton/Manager.java
@@ -0,0 +1,306 @@
+/*
+ * Copyright 2012 Benjamin Weiss
+ * Copyright 2012 Neofonie Mobile GmbH
+ *
+ * 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.
+ */
+
+package org.qpython.qpy.texteditor.widget.crouton;
+
+import java.util.Iterator;
+import java.util.Queue;
+import java.util.concurrent.LinkedBlockingQueue;
+
+import android.app.Activity;
+import android.os.Handler;
+import android.os.Message;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.ViewParent;
+
+/**
+ * Manages the lifecycle of {@link Crouton}s.
+ */
+final class Manager extends Handler {
+
+  private static Manager INSTANCE;
+  private Queue<Crouton> croutonQueue;
+
+  private Manager() {
+    croutonQueue = new LinkedBlockingQueue<Crouton>();
+  }
+
+  /**
+   * @return The currently used instance of the {@link Manager}.
+   */
+  static synchronized Manager getInstance() {
+    if (INSTANCE == null) {
+      INSTANCE = new Manager();
+    }
+
+    return INSTANCE;
+  }
+
+  /**
+   * Inserts a {@link Crouton} to be displayed.
+   *
+   * @param crouton
+   *          The {@link Crouton} to be displayed.
+   */
+  void add(Crouton crouton) {
+    croutonQueue.add(crouton);
+    displayCrouton();
+  }
+
+  /**
+   * Displays the next {@link Crouton} within the queue.
+   */
+  private void displayCrouton() {
+    if (croutonQueue.isEmpty()) {
+      return;
+    }
+
+    // First peek whether the Crouton has an activity.
+    final Crouton currentCrouton = croutonQueue.peek();
+
+    // If the activity is null we poll the Crouton off the queue.
+    if (currentCrouton.getActivity() == null) {
+      croutonQueue.poll();
+    }
+
+    if (!currentCrouton.isShowing()) {
+      // Display the Crouton
+      sendMessage(currentCrouton, Messages.ADD_CROUTON_TO_VIEW);
+    } else {
+      sendMessageDelayed(currentCrouton, Messages.DISPLAY_CROUTON, calculateCroutonDuration(currentCrouton));
+    }
+  }
+
+  private long calculateCroutonDuration(Crouton crouton) {
+    long croutonDuration = 0;
+    croutonDuration += crouton.getStyle().durationInMilliseconds;
+    croutonDuration += crouton.getInAnimation().getDuration();
+    croutonDuration += crouton.getOutAnimation().getDuration();
+    return croutonDuration;
+  }
+
+  /**
+   * Sends a {@link Crouton} within a {@link Message}.
+   *
+   * @param crouton
+   *          The {@link Crouton} that should be sent.
+   * @param messageId
+   *          The {@link Message} id.
+   */
+  private void sendMessage(Crouton crouton, final int messageId) {
+    final Message message = obtainMessage(messageId);
+    message.obj = crouton;
+    sendMessage(message);
+  }
+
+  /**
+   * Sends a {@link Crouton} within a delayed {@link Message}.
+   *
+   * @param crouton
+   *          The {@link Crouton} that should be sent.
+   * @param messageId
+   *          The {@link Message} id.
+   * @param delay
+   *          The delay in milliseconds.
+   */
+  private void sendMessageDelayed(Crouton crouton, final int messageId, final long delay) {
+    Message message = obtainMessage(messageId);
+    message.obj = crouton;
+    sendMessageDelayed(message, delay);
+  }
+
+  /*
+   * (non-Javadoc)
+   *
+   * @see android.os.Handler#handleMessage(android.os.Message)
+   */
+  @Override
+  public void handleMessage(Message message) {
+    final Crouton crouton = (Crouton) message.obj;
+
+    switch (message.what) {
+      case Messages.DISPLAY_CROUTON : {
+        displayCrouton();
+        break;
+      }
+
+      case Messages.ADD_CROUTON_TO_VIEW : {
+        addCroutonToView(crouton);
+        break;
+      }
+
+      case Messages.REMOVE_CROUTON : {
+        removeCrouton(crouton);
+        break;
+      }
+
+      default : {
+        super.handleMessage(message);
+        break;
+      }
+    }
+  }
+
+  /**
+   * Adds a {@link Crouton} to the {@link ViewParent} of it's {@link Activity}.
+   *
+   * @param crouton
+   *          The {@link Crouton} that should be added.
+   */
+  private void addCroutonToView(Crouton crouton) {
+    // don't add if it is already showing
+    if (crouton.isShowing()) {
+      return;
+    }
+
+    View croutonView = crouton.getView();
+    if (croutonView.getParent() == null) {
+      ViewGroup.LayoutParams params = croutonView.getLayoutParams();
+      if (params == null) {
+        params = new ViewGroup.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+      }
+      crouton.getActivity().addContentView(croutonView, params);
+    }
+    croutonView.startAnimation(crouton.getInAnimation());
+    sendMessageDelayed(crouton, Messages.REMOVE_CROUTON, crouton.getStyle().durationInMilliseconds + +crouton.getInAnimation().getDuration());
+  }
+
+  /**
+   * Removes the {@link Crouton}'s view after it's display
+   * durationInMilliseconds.
+   *
+   * @param crouton
+   *          The {@link Crouton} added to a {@link ViewGroup} and should be
+   *          removed.
+   */
+  private void removeCrouton(Crouton crouton) {
+    View croutonView = crouton.getView();
+    ViewGroup croutonParentView = (ViewGroup) croutonView.getParent();
+
+    if (croutonParentView != null) {
+      croutonView.startAnimation(crouton.getOutAnimation());
+
+      // Remove the Crouton from the queue.
+      Crouton removed = croutonQueue.poll();
+
+      // Remove the crouton from the view's parent.
+      croutonParentView.removeView(croutonView);
+      if (removed != null) {
+        removed.detachActivity();
+      }
+
+      // Send a message to display the next crouton but delay it by the out
+      // animation duration to make sure it finishes
+      sendMessageDelayed(crouton, Messages.DISPLAY_CROUTON, crouton.getOutAnimation().getDuration());
+    }
+  }
+
+  /**
+   * Removes a {@link Crouton} immediately, even when it's currently being
+   * displayed.
+   *
+   * @param crouton
+   *          The {@link Crouton} that should be removed.
+   */
+  void removeCroutonImmediately(Crouton crouton) {
+    if (croutonQueue != null) {
+      final Iterator<Crouton> croutonIterator = croutonQueue.iterator();
+      while (croutonIterator.hasNext()) {
+        final Crouton c = croutonIterator.next();
+        if (c.equals(crouton) && (c.getActivity() != null)) {
+          // remove the crouton from the content view
+          if (crouton.isShowing()) {
+            ((ViewGroup) c.getView().getParent()).removeView(c.getView());
+          }
+
+          // remove any messages pending for the crouton
+          removeAllMessagesForCrouton(c);
+
+          // remove the crouton from the queue
+          croutonIterator.remove();
+
+          // we have found our crouton so just break
+          break;
+        }
+      }
+    }
+  }
+
+  /**
+   * Removes all {@link Crouton}s from the queue.
+   */
+  void clearCroutonQueue() {
+    removeAllMessages();
+
+    if (croutonQueue != null) {
+      // remove any views that may already have been added to the activity's
+      // content view
+      for (Crouton crouton : croutonQueue) {
+        if (crouton.isShowing()) {
+          ((ViewGroup) crouton.getView().getParent()).removeView(crouton.getView());
+        }
+      }
+      croutonQueue.clear();
+    }
+  }
+
+  /**
+   * Removes all {@link Crouton}s for the provided activity. This will remove
+   * crouton from {@link Activity}s content view immediately.
+   */
+  void clearCroutonsForActivity(Activity activity) {
+    if (croutonQueue != null) {
+      Iterator<Crouton> croutonIterator = croutonQueue.iterator();
+      while (croutonIterator.hasNext()) {
+        Crouton crouton = croutonIterator.next();
+        if ((crouton.getActivity() != null) && crouton.getActivity().equals(activity)) {
+          // remove the crouton from the content view
+          if (crouton.isShowing()) {
+            ((ViewGroup) crouton.getView().getParent()).removeView(crouton.getView());
+          }
+
+          removeAllMessagesForCrouton(crouton);
+
+          // remove the crouton from the queue
+          croutonIterator.remove();
+        }
+      }
+    }
+  }
+
+  private void removeAllMessages() {
+    removeMessages(Messages.ADD_CROUTON_TO_VIEW);
+    removeMessages(Messages.DISPLAY_CROUTON);
+    removeMessages(Messages.REMOVE_CROUTON);
+  }
+
+  private void removeAllMessagesForCrouton(Crouton crouton) {
+    removeMessages(Messages.ADD_CROUTON_TO_VIEW, crouton);
+    removeMessages(Messages.DISPLAY_CROUTON, crouton);
+    removeMessages(Messages.REMOVE_CROUTON, crouton);
+
+  }
+
+  private static final class Messages {
+    public static final int DISPLAY_CROUTON = 0xc2007;
+    public static final int ADD_CROUTON_TO_VIEW = 0xc20074dd;
+    public static final int REMOVE_CROUTON = 0xc2007de1;
+    private Messages() { /* noop */
+    }
+  }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/widget/crouton/Style.java b/qpython/src/main/java/org/qpython/qpy/texteditor/widget/crouton/Style.java
new file mode 100644
index 00000000..aa9d8a0e
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/widget/crouton/Style.java
@@ -0,0 +1,487 @@
+/*
+ * Copyright 2012 Benjamin Weiss
+ * Copyright 2012 Neofonie Mobile GmbH
+ *
+ * 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.
+ */
+
+package org.qpython.qpy.texteditor.widget.crouton;
+
+import android.graphics.drawable.Drawable;
+import android.view.Gravity;
+import android.view.ViewGroup;
+import android.view.ViewGroup.LayoutParams;
+import android.widget.ImageView;
+
+/**
+ * The style for a {@link Crouton}.
+ */
+
+public class Style {
+	public static final Style ALERT;
+	public static final Style CONFIRM;
+	public static final Style INFO;
+
+	public static final int holoRedLight = 0xffeccd00;
+	public static final int holoGreenLight = 0xff4bac07;
+	public static final int holoBlueLight = 0xffeccd00;
+
+	static {
+		ALERT = new Builder().setDuration(3500)
+				.setBackgroundColorValue(holoRedLight)
+				.setHeight(LayoutParams.WRAP_CONTENT).build();
+		CONFIRM = new Builder().setDuration(2000)
+				.setBackgroundColorValue(holoBlueLight)
+				.setHeight(LayoutParams.WRAP_CONTENT).build();
+		INFO = new Builder().setDuration(2000)
+				.setBackgroundColorValue(holoGreenLight)
+				.setHeight(LayoutParams.WRAP_CONTENT).build();
+	}
+
+	/**
+	 * The durationInMilliseconds the {@link Crouton} will be displayed in
+	 * milliseconds.
+	 */
+	final int durationInMilliseconds;
+
+	/**
+	 * The resource id of the backgroundResourceId.
+	 * <p/>
+	 * 0 for no backgroundResourceId.
+	 */
+	final int backgroundColorResourceId;
+
+	/**
+	 * The resource id of the backgroundDrawableResourceId.
+	 * <p/>
+	 * 0 for no backgroundDrawableResourceId.
+	 */
+	final int backgroundDrawableResourceId;
+
+	/**
+	 * The backgroundColorResourceValue's e.g. 0xffff4444;
+	 * <p/>
+	 * -1 for no value.
+	 */
+	final int backgroundColorValue;
+
+	/**
+	 * Whether we should isTileEnabled the backgroundResourceId or not.
+	 */
+	final boolean isTileEnabled;
+
+	/**
+	 * The text colorResourceId's resource id.
+	 * <p/>
+	 * 0 sets the text colorResourceId to the system theme default.
+	 */
+	final int textColorResourceId;
+
+	/**
+	 * The height of the {@link Crouton} in pixels.
+	 */
+	final int heightInPixels;
+
+	/**
+	 * Resource ID for the height of the {@link Crouton}.
+	 */
+	final int heightDimensionResId;
+
+	/**
+	 * The text's gravity as provided by {@link Gravity}.
+	 */
+	final int gravity;
+
+	/**
+	 * An additional image to display in the {@link Crouton}.
+	 */
+	final Drawable imageDrawable;
+
+	/**
+	 * An additional image to display in the {@link Crouton}.
+	 */
+	final int imageResId;
+
+	/**
+	 * The {@link ImageView.ScaleType} for the image to display in the
+	 * {@link Crouton}.
+	 */
+	final ImageView.ScaleType imageScaleType;
+
+	/**
+	 * The text size in sp
+	 * <p/>
+	 * 0 sets the text size to the system theme default
+	 */
+	final int textSize;
+
+	/**
+	 * The text shadow color's resource id
+	 */
+	final int textShadowColorResId;
+
+	/**
+	 * The text shadow radius
+	 */
+	final float textShadowRadius;
+
+	/**
+	 * The text shadow vertical offset
+	 */
+	final float textShadowDy;
+
+	/**
+	 * The text shadow horizontal offset
+	 */
+	final float textShadowDx;
+
+	/**
+	 * The text appearance resource id for the text.
+	 */
+	final int textAppearanceResId;
+
+	/**
+	 * The resource id for the in animation
+	 */
+	final int inAnimationResId;
+
+	/**
+	 * The resource id for the out animation
+	 */
+	final int outAnimationResId;
+
+	/**
+	 * The padding for the crouton view content in pixels
+	 */
+	final int paddingInPixels;
+
+	/**
+	 * The resource id for the padding for the view content
+	 */
+	final int paddingDimensionResId;
+
+	private Style(final Builder builder) {
+		this.durationInMilliseconds = builder.durationInMilliseconds;
+		this.backgroundColorResourceId = builder.backgroundColorResourceId;
+		this.backgroundDrawableResourceId = builder.backgroundDrawableResourceId;
+		this.isTileEnabled = builder.isTileEnabled;
+		this.textColorResourceId = builder.textColorResourceId;
+		this.heightInPixels = builder.heightInPixels;
+		this.heightDimensionResId = builder.heightDimensionResId;
+		this.gravity = builder.gravity;
+		this.imageDrawable = builder.imageDrawable;
+		this.textSize = builder.textSize;
+		this.textShadowColorResId = builder.textShadowColorResId;
+		this.textShadowRadius = builder.textShadowRadius;
+		this.textShadowDx = builder.textShadowDx;
+		this.textShadowDy = builder.textShadowDy;
+		this.textAppearanceResId = builder.textAppearanceResId;
+		this.inAnimationResId = builder.inAnimationResId;
+		this.outAnimationResId = builder.outAnimationResId;
+		this.imageResId = builder.imageResId;
+		this.imageScaleType = builder.imageScaleType;
+		this.paddingInPixels = builder.paddingInPixels;
+		this.paddingDimensionResId = builder.paddingDimensionResId;
+		this.backgroundColorValue = builder.backgroundColorValue;
+	}
+
+	/**
+	 * Builder for the {@link Style} object.
+	 */
+	public static class Builder {
+		private int durationInMilliseconds;
+		private int backgroundColorValue;
+		private int backgroundColorResourceId;
+		private int backgroundDrawableResourceId;
+		private boolean isTileEnabled;
+		private int textColorResourceId;
+		private int heightInPixels;
+		private int heightDimensionResId;
+		private int gravity;
+		private Drawable imageDrawable;
+		private int textSize;
+		private int textShadowColorResId;
+		private float textShadowRadius;
+		private float textShadowDx;
+		private float textShadowDy;
+		private int textAppearanceResId;
+		private int inAnimationResId;
+		private int outAnimationResId;
+		private int imageResId;
+		private ImageView.ScaleType imageScaleType;
+		private int paddingInPixels;
+		private int paddingDimensionResId;
+
+		public Builder() {
+			durationInMilliseconds = 2000;
+			heightInPixels = ViewGroup.LayoutParams.WRAP_CONTENT;
+			paddingInPixels = 40;
+			backgroundColorResourceId = android.R.color.holo_blue_light;
+			backgroundDrawableResourceId = 0;
+			backgroundColorValue = -1;
+			isTileEnabled = false;
+			textColorResourceId = android.R.color.white;
+			heightInPixels = ViewGroup.LayoutParams.WRAP_CONTENT;
+			gravity = Gravity.CENTER;
+			imageDrawable = null;
+			inAnimationResId = 0;
+			outAnimationResId = 0;
+			imageResId = 0;
+			textSize = 14;
+			imageScaleType = ImageView.ScaleType.FIT_XY;
+		}
+
+		/**
+		 * Set the durationInMilliseconds option of the {@link Crouton}.
+		 * 
+		 * @param duration
+		 *            The durationInMilliseconds the crouton will be displayed
+		 *            {@link Crouton} in milliseconds.
+		 * @return the {@link Builder}.
+		 */
+		public Builder setDuration(int duration) {
+			this.durationInMilliseconds = duration;
+
+			return this;
+		}
+
+		/**
+		 * Set the backgroundColorResourceId option of the {@link Crouton}.
+		 * 
+		 * @param backgroundColorResourceId
+		 *            The backgroundColorResourceId's resource id.
+		 * @return the {@link Builder}.
+		 */
+		public Builder setBackgroundColor(int backgroundColorResourceId) {
+			this.backgroundColorResourceId = backgroundColorResourceId;
+
+			return this;
+		}
+
+		/**
+		 * Set the backgroundColorResourceValue option of the {@link Crouton}.
+		 * 
+		 * @param backgroundColorResourceValue
+		 *            The backgroundColorResourceValue's e.g. 0xffff4444;
+		 * @return the {@link Builder}.
+		 */
+		public Builder setBackgroundColorValue(int backgroundColorValue) {
+			this.backgroundColorValue = backgroundColorValue;
+			return this;
+		}
+
+		/**
+		 * Set the backgroundDrawableResourceId option for the {@link Crouton}.
+		 * 
+		 * @param backgroundDrawableResourceId
+		 *            Resource ID of a backgroundDrawableResourceId image
+		 *            drawable.
+		 * @return the {@link Builder}.
+		 */
+		public Builder setBackgroundDrawable(int backgroundDrawableResourceId) {
+			this.backgroundDrawableResourceId = backgroundDrawableResourceId;
+
+			return this;
+		}
+
+		/**
+		 * Set the heightInPixels option for the {@link Crouton}.
+		 * 
+		 * @param height
+		 *            The height of the {@link Crouton} in pixel. Can also be
+		 *            {@link LayoutParams#MATCH_PARENT} or
+		 *            {@link LayoutParams#WRAP_CONTENT}.
+		 * @return the {@link Builder}.
+		 */
+		public Builder setHeight(int height) {
+			this.heightInPixels = height;
+
+			return this;
+		}
+
+		/**
+		 * Set the resource id for the height option for the {@link Crouton}.
+		 * 
+		 * @param heightDimensionResId
+		 *            Resource ID of a dimension for the height of the
+		 *            {@link Crouton} .
+		 * @return the {@link Builder}.
+		 */
+		public Builder setHeightDimensionResId(int heightDimensionResId) {
+			this.heightDimensionResId = heightDimensionResId;
+
+			return this;
+		}
+
+		/**
+		 * Set the isTileEnabled option for the {@link Crouton}.
+		 * 
+		 * @param isTileEnabled
+		 *            <code>true</code> if you want the backgroundResourceId to
+		 *            be tiled, else <code>false</code>.
+		 * @return the {@link Builder}.
+		 */
+		public Builder setTileEnabled(boolean isTileEnabled) {
+			this.isTileEnabled = isTileEnabled;
+
+			return this;
+		}
+
+		/**
+		 * Set the textColorResourceId option for the {@link Crouton}.
+		 * 
+		 * @param textColor
+		 *            The resource id of the text colorResourceId.
+		 * @return the {@link Builder}.
+		 */
+		public Builder setTextColor(int textColor) {
+			this.textColorResourceId = textColor;
+
+			return this;
+		}
+
+		/**
+		 * Set the gravity option for the {@link Crouton}.
+		 * 
+		 * @param gravity
+		 *            The text's gravity as provided by {@link Gravity}.
+		 * @return the {@link Builder}.
+		 */
+		public Builder setGravity(int gravity) {
+			this.gravity = gravity;
+
+			return this;
+		}
+
+		/**
+		 * Set the image option for the {@link Crouton}.
+		 * 
+		 * @param imageDrawable
+		 *            An additional image to display in the {@link Crouton}.
+		 * @return the {@link Builder}.
+		 */
+		public Builder setImageDrawable(Drawable imageDrawable) {
+			this.imageDrawable = imageDrawable;
+
+			return this;
+		}
+
+		/**
+		 * Set the image resource option for the {@link Crouton}.
+		 * 
+		 * @param imageResId
+		 *            An additional image to display in the {@link Crouton}.
+		 * @return the {@link Builder}.
+		 */
+		public Builder setImageResource(int imageResId) {
+			this.imageResId = imageResId;
+
+			return this;
+		}
+
+		/**
+		 * The text size in sp
+		 */
+		public Builder setTextSize(int textSize) {
+			this.textSize = textSize;
+			return this;
+		}
+
+		/**
+		 * The text shadow color's resource id
+		 */
+		public Builder setTextShadowColor(int textShadowColorResId) {
+			this.textShadowColorResId = textShadowColorResId;
+			return this;
+		}
+
+		/**
+		 * The text shadow radius
+		 */
+		public Builder setTextShadowRadius(float textShadowRadius) {
+			this.textShadowRadius = textShadowRadius;
+			return this;
+		}
+
+		/**
+		 * The text shadow horizontal offset
+		 */
+		public Builder setTextShadowDx(float textShadowDx) {
+			this.textShadowDx = textShadowDx;
+			return this;
+		}
+
+		/**
+		 * The text shadow vertical offset
+		 */
+		public Builder setTextShadowDy(float textShadowDy) {
+			this.textShadowDy = textShadowDy;
+			return this;
+		}
+
+		/**
+		 * The text appearance resource id for the text.
+		 */
+		public Builder setTextAppearance(int textAppearanceResId) {
+			this.textAppearanceResId = textAppearanceResId;
+			return this;
+		}
+
+		/**
+		 * The resource id for the in animation
+		 */
+		public Builder setInAnimation(int inAnimationResId) {
+			this.inAnimationResId = inAnimationResId;
+			return this;
+		}
+
+		/**
+		 * The resource id for the out animation
+		 */
+		public Builder setOutAnimation(int outAnimationResId) {
+			this.outAnimationResId = outAnimationResId;
+			return this;
+		}
+
+		/**
+		 * The {@link ImageView.ScaleType} for the image
+		 */
+		public Builder setImageScaleType(ImageView.ScaleType imageScaleType) {
+			this.imageScaleType = imageScaleType;
+			return this;
+		}
+
+		/**
+		 * The padding for the crouton view's content in pixels
+		 */
+		public Builder setPaddingInPixels(int padding) {
+			this.paddingInPixels = padding;
+			return this;
+		}
+
+		/**
+		 * The resource id for the padding for the crouton view's content
+		 */
+		public Builder setPaddingDimensionResId(int paddingResId) {
+			this.paddingDimensionResId = paddingResId;
+			return this;
+		}
+
+		/**
+		 * @return a configured {@link Style} object.
+		 */
+		public Style build() {
+			return new Style(this);
+		}
+	}
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/utils/CodePattern.java b/qpython/src/main/java/org/qpython/qpy/utils/CodePattern.java
new file mode 100644
index 00000000..78d274cd
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/utils/CodePattern.java
@@ -0,0 +1,112 @@
+package org.qpython.qpy.utils;
+
+import android.text.SpannableString;
+import android.text.Spanned;
+import android.text.style.ForegroundColorSpan;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Created by Hmei
+ * 2018/4/19.
+ */
+
+public class CodePattern {
+    public static final int COLOR_ERROR   = 0x80ff0000;
+    public static final int COLOR_NUMBER  = 0xff7ba212;
+    public static final int COLOR_KEYWORD = 0xff7ba212;
+    public static final int COLOR_BUILTIN = 0xffd79e39;
+    public static final int COLOR_COMMENT = 0xff808080;
+    public static final int COLOR_QUOTE   = 0xff399ed7;
+    
+    public static final Pattern PATTERN_LINE       = Pattern.compile(
+            ".*\\n");
+    public static final Pattern PATTERN_NUMBER     = Pattern.compile(
+            "\\b(\\d*[.]?\\d+)\\b");
+    public static final Pattern PATTERN_PY_KEYWORD   = Pattern.compile(
+            "\\b(break|continue|del|" +
+                    "except|exec|finally|" +
+                    "pass|print|raise|" +
+                    "return|try|with|" +
+                    "global|assert|" +
+                    "lambda|yield|" +
+                    "def|class|self|" +
+                    "for|while|" +
+                    "if|elif|else|" +
+                    "and|in|is|not|or|" +
+                    "import|from|as)\\b");
+    public static final Pattern PATTERN_LUA_KEYWORD  = Pattern.compile(
+            "\\b(and|break|do|" +
+                    "else|elseif|end|" +
+                    "for|function|" +
+                    "goto|if|in|" +
+                    "local|" +
+                    "not|or|" +
+                    "repeat|return|then|" +
+                    "until|" +
+                    "while)\\b");
+    public static final Pattern PATTERN_LUA_BUILD_IN = Pattern.compile(
+            "\\b(print|false|true|nil)\\b");
+    public static final Pattern PATTERN_PY_BUILD_IN = Pattern.compile(
+            "\\b(True|False|bool|enumerate|set|frozenset|help|" +
+                    "reversed|sorted|sum|" +
+                    "Ellipsis|None|NotImplemented|__import__|abs|" +
+                    "apply|buffer|callable|chr|classmethod|cmp|" +
+                    "coerce|compile|complex|delattr|dict|dir|divmod|" +
+                    "eval|execfile|file|filter|float|getattr|globals|" +
+                    "hasattr|hash|hex|id|input|int|intern|isinstance|" +
+                    "issubclass|iter|len|list|locals|long|map|max|" +
+                    "min|object|oct|open|ord|pow|property|range|" +
+                    "raw_input|reduce|reload|repr|round|setattr|" +
+                    "slice|staticmethod|str|super|tuple|type|unichr|" +
+                    "unicode|vars|xrange|zip|" +
+                    "ArithmeticError|AssertionError|AttributeError|" +
+                    "DeprecationWarning|EOFError|EnvironmentError|" +
+                    "Exception|FloatingPointError|IOError|" +
+                    "ImportError|IndentationError|IndexError|" +
+                    "KeyError|KeyboardInterrupt|LookupError|" +
+                    "MemoryError|NameError|NotImplementedError|" +
+                    "OSError|OverflowError|OverflowWarning|" +
+                    "ReferenceError|RuntimeError|RuntimeWarning|" +
+                    "StandardError|StopIteration|SyntaxError|" +
+                    "SyntaxWarning|SystemError|SystemExit|TabError|" +
+                    "TypeError|UnboundLocalError|UnicodeError|" +
+                    "UnicodeEncodeError|UnicodeDecodeError|" +
+                    "UnicodeTranslateError|" +
+                    "UserWarning|ValueError|Warning|WindowsError|" +
+                    "ZeroDivisionError)\\b");
+    public static final Pattern PATTERN_PY_COMMENT  = Pattern.compile(
+            "/\\*(?:.|[\\n\\r])*?\\*/|" +
+                    "#.*\n|" +
+                    "\"\"\"(?:.|[\\n\\r])*?\"\"\"|" +
+                    "\'\'\'(?:.|[\\n\\r])*?\'\'\'");
+
+    public static SpannableString formatPyCode(String code) {
+        SpannableString sStr = new SpannableString(code);
+        for (Matcher m = PATTERN_PY_KEYWORD.matcher(sStr); m.find(); ) {
+            sStr.setSpan(
+                    new ForegroundColorSpan(COLOR_KEYWORD),
+                    m.start(),
+                    m.end(),
+                    Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+        }
+
+        for (Matcher m = PATTERN_PY_BUILD_IN.matcher(sStr); m.find(); ) {
+            sStr.setSpan(
+                    new ForegroundColorSpan(COLOR_BUILTIN),
+                    m.start(),
+                    m.end(),
+                    Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+        }
+
+        for (Matcher m = PATTERN_PY_COMMENT.matcher(sStr); m.find(); ) {
+            sStr.setSpan(
+                    new ForegroundColorSpan(COLOR_COMMENT),
+                    m.start(),
+                    m.end(),
+                    Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+        }
+        return sStr;
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/utils/DateTimeUtil.java b/qpython/src/main/java/org/qpython/qpy/utils/DateTimeUtil.java
new file mode 100644
index 00000000..0c3b6c78
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/utils/DateTimeUtil.java
@@ -0,0 +1,51 @@
+package org.qpython.qpy.utils;
+
+import android.annotation.SuppressLint;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.TimeZone;
+
+/**
+ * 文 件 名: DateTimeUtil
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2017/12/28 10:15
+ * 邮   箱: qq798435167@gmail.com
+ * 修改时间：
+ * 修改备注：
+ */
+
+public class DateTimeUtil {
+
+    public static String format(Date remoteDate) {
+        Date date = remoteDate;
+        String result = null;
+        long creatTime = date.getTime();
+        long currentTime = System.currentTimeMillis();
+        //间隔时间秒
+        long detalTimeS = (currentTime - creatTime) / 1000;
+        long detalTimeM = detalTimeS / 60;
+        long detalTimeH = detalTimeM / 60;
+        long detalTimeDay = detalTimeH / 24;
+        if (detalTimeS < 60) {
+            result = "just moment";
+        } else if (detalTimeS >= 60 && detalTimeM < 60) {
+            result = detalTimeM + " minutes ago";
+        } else if (detalTimeM >= 60 && detalTimeH <= 10) {
+            result = detalTimeH + " hours ago";
+        } else if (detalTimeH > 10) {
+            result = dateFormat("M-d HH:mm", date);
+        } else if (detalTimeDay >= 1 && detalTimeDay < 365) {
+            result = dateFormat("M-d", date);
+        } else {
+            result = dateFormat("yyyy-M-d", date);
+        }
+        return result;
+    }
+
+    @SuppressLint("SimpleDateFormat")
+    public static String dateFormat(String reg, Date date) {
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat(reg);
+        return simpleDateFormat.format(date);
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/utils/FileUtils.java b/qpython/src/main/java/org/qpython/qpy/utils/FileUtils.java
index 19001701..d5d1b718 100644
--- a/qpython/src/main/java/org/qpython/qpy/utils/FileUtils.java
+++ b/qpython/src/main/java/org/qpython/qpy/utils/FileUtils.java
@@ -1,5 +1,12 @@
 package org.qpython.qpy.utils;
 
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.widget.Toast;
+
+import org.qpython.qpy.R;
+
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
@@ -8,7 +15,7 @@
 import java.io.OutputStream;
 
 public class FileUtils {
-    public static boolean copyToFile (InputStream inputStream, File destFile) {
+    public static boolean copyToFile(InputStream inputStream, File destFile) {
         try {
             if (destFile.exists()) {
                 destFile.delete();
@@ -35,7 +42,7 @@ public static boolean copyFile(File srcFile, File destFile) {
             InputStream in = new FileInputStream(srcFile);
             try {
                 result = copyToFile(in, destFile);
-            } finally  {
+            } finally {
                 in.close();
             }
         } catch (IOException e) {
@@ -43,4 +50,109 @@ public static boolean copyFile(File srcFile, File destFile) {
         }
         return result;
     }
+
+    /**
+     * 调用系统应用打开文件
+     */
+    public static void openFile(Context context, File file) {
+        Intent intent = new Intent();
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        //设置intent的Action属性
+        intent.setAction(Intent.ACTION_VIEW);
+        //获取文件file的MIME类型
+        String type = getMIMEType(file);
+        //设置intent的data和Type属性。
+        intent.setDataAndType(Uri.fromFile(file), type);
+        //跳转
+        try {
+            context.startActivity(intent);
+        } catch (Exception e) {
+            e.printStackTrace();
+            Toast.makeText(context, R.string.cant_open, Toast.LENGTH_SHORT).show();
+        }
+    }
+
+    /***根据文件后缀回去MIME类型****/
+
+    private static String getMIMEType(File file) {
+        String type = "*/*";
+        String fName = file.getName();
+        //获取后缀名前的分隔符"."在fName中的位置。
+        int dotIndex = fName.lastIndexOf(".");
+        if (dotIndex < 0) {
+            return type;
+        }
+        String end = fName.substring(dotIndex, fName.length()).toLowerCase();
+        if (end == "") return type;
+        //在MIME和文件类型的匹配表中找到对应的MIME类型。
+        for (int i = 0; i < MIME_MapTable.length; i++) {
+            if (end.equals(MIME_MapTable[i][0]))
+                type = MIME_MapTable[i][1];
+        }
+        return type;
+    }
+
+    private static final String[][] MIME_MapTable = {
+            // {后缀名，MIME类型}
+            {".3gp", "video/3gpp"},
+            {".apk", "application/vnd.android.package-archive"},
+            {".asf", "video/x-ms-asf"},
+            {".avi", "video/x-msvideo"},
+            {".bin", "application/octet-stream"},
+            {".bmp", "image/bmp"},
+            {".c", "text/plain"},
+            {".class", "application/octet-stream"},
+            {".conf", "text/plain"},
+            {".cpp", "text/plain"},
+            {".doc", "application/msword"},
+            {".docx",
+                    "application/vnd.openxmlformats-officedocument.wordprocessingml.document"},
+            {".xls", "application/vnd.ms-excel"},
+            {".xlsx",
+                    "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"},
+            {".exe", "application/octet-stream"},
+            {".gif", "image/gif"},
+            {".gtar", "application/x-gtar"},
+            {".gz", "application/x-gzip"},
+            {".h", "text/plain"},
+            {".htm", "text/html"},
+            {".html", "text/html"},
+            {".jar", "application/java-archive"},
+            {".java", "text/plain"},
+            {".jpeg", "image/jpeg"},
+            {".jpg", "image/jpeg"},
+            {".js", "application/x-javascript"},
+            {".log", "text/plain"},
+            {".m3u", "audio/x-mpegurl"},
+            {".m4a", "audio/mp4a-latm"},
+            {".m4b", "audio/mp4a-latm"},
+            {".m4p", "audio/mp4a-latm"},
+            {".m4u", "video/vnd.mpegurl"},
+            {".m4v", "video/x-m4v"},
+            {".mov", "video/quicktime"},
+            {".mp2", "audio/x-mpeg"},
+            {".mp3", "audio/x-mpeg"},
+            {".mp4", "video/mp4"},
+            {".mpc", "application/vnd.mpohun.certificate"},
+            {".mpe", "video/mpeg"},
+            {".mpeg", "video/mpeg"},
+            {".mpg", "video/mpeg"},
+            {".mpg4", "video/mp4"},
+            {".mpga", "audio/mpeg"},
+            {".msg", "application/vnd.ms-outlook"},
+            {".ogg", "audio/ogg"},
+            {".pdf", "application/pdf"},
+            {".png", "image/png"},
+            {".pps", "application/vnd.ms-powerpoint"},
+            {".ppt", "application/vnd.ms-powerpoint"},
+            {".pptx", "application/vnd.openxmlformats-officedocument.presentationml.presentation"},
+            {".prop", "text/plain"}, {".rc", "text/plain"},
+            {".rmvb", "audio/x-pn-realaudio"}, {".rtf", "application/rtf"},
+            {".sh", "text/plain"}, {".tar", "application/x-tar"},
+            {".tgz", "application/x-compressed"}, {".txt", "text/plain"},
+            {".wav", "audio/x-wav"}, {".wma", "audio/x-ms-wma"},
+            {".wmv", "audio/x-ms-wmv"},
+            {".wps", "application/vnd.ms-works"}, {".xml", "text/plain"},
+            {".z", "application/x-compress"},
+            {".zip", "application/x-zip-compressed"}, {"", "*/*"}};
 }
\ No newline at end of file
diff --git a/qpython/src/main/java/org/qpython/qpy/utils/NoteBookAction.java b/qpython/src/main/java/org/qpython/qpy/utils/NoteBookAction.java
new file mode 100644
index 00000000..3eb4d2cb
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/utils/NoteBookAction.java
@@ -0,0 +1,67 @@
+package org.qpython.qpy.utils;
+
+/**
+ * 文 件 名: NoteBookAction
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2018/2/8 11:27
+ * 修改时间：
+ * 修改备注：
+ */
+
+public class NoteBookAction {
+    //运行全部cell
+    public static final String PLAY_ALL_CELL = "$('li#run_all_cells').click()";
+    //清空当前输出
+    public static final String CLEAR_CURRENT_OUTPUT = "$('li#clear_current_output').click()";
+
+    //从底部添加一个cell
+    public static final String ADD_CELL_BELOW = "$('li#insert_cell_below').click()";
+
+    //切换cell为code类型
+    public static final String SWITCH_CODE_TYPE = "$('select#cell_type').val('code').change()";
+
+    //切换cell为markdown类型
+    public static final String SWITCH_MARKDOWN_TYPE = "$('select#cell_type').val('markdown').change()";
+
+    //删除一个cell
+    public static final String DELETE_CELL = "$('li#delete_cell').click()";
+
+    //取消删除cell
+    public static final String UNDELETE_CELL = "$('li#undelete_cell').click()";
+
+    //保存文档
+    public static final String SAVE_NOTEBOOK = "$('button[data-jupyter-action=\"jupyter-notebook:save-notebook\"]')[0].click()";
+
+    //undo
+    public static final String CELL_UNDO = "";
+
+    //redo
+    public static final String CELL_REDO = "";
+
+    //运行当前cell并选择下一个cell
+    public static final String PLAY_CURRENT_CELL = "$('button[data-jupyter-action=\"jupyter-notebook:run-cell-and-select-next\"]')[0].click()";
+
+    //运行全部cell
+    public static final String RUN_ALL = "";
+
+    //清空输出 & 重启kernel
+    public static final String CLEAR_ALL_OUTPUT = "$('li#clear_all_output').click()";
+
+    //shutdown
+    public static final String SHUTDOWN_KERNEL = "$('li#shutdown_kernel').click()";
+
+    //移动cell到下一个cell
+    public static final String MOVE_CELL_DOWN = "$('button[data-jupyter-action=\"jupyter-notebook:move-cell-down\"]')[0].click()";
+
+    //移动cell到上一个cell
+    public static final String MOVE_CELL_UP = "$('button[data-jupyter-action=\"jupyter-notebook:move-cell-up\"]')[0].click()";
+
+    //剪切
+    public static final String CELL_CUT = "";
+
+    //复制
+    public static final String CELL_COPY = "";
+
+    //粘贴
+    public static final String CELL_PASTE = "";
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/utils/NotebookUtil.java b/qpython/src/main/java/org/qpython/qpy/utils/NotebookUtil.java
new file mode 100644
index 00000000..1717f9e5
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/utils/NotebookUtil.java
@@ -0,0 +1,309 @@
+package org.qpython.qpy.utils;
+
+import android.app.Activity;
+import android.content.Context;
+import android.os.Handler;
+import android.os.Looper;
+import android.util.Log;
+
+import com.loopj.android.http.AsyncHttpResponseHandler;
+import com.quseit.base.QBaseApp;
+import com.quseit.util.NAction;
+import com.quseit.util.NStorage;
+import com.quseit.util.NUtil;
+
+import org.apache.http.Header;
+import org.qpython.qpy.R;
+import org.qpython.qpy.console.ScriptExec;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpysdk.QPyConstants;
+import org.qpython.qpysdk.QPySDK;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+import okhttp3.Call;
+import okhttp3.Callback;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
+
+/**
+ * 文 件 名: NotebookCheckUtil
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2018/2/8 09:35
+ * 修改时间：
+ * 修改备注：
+ */
+
+public class NotebookUtil {
+
+    private static final String TAG = "NotebookUtil";
+    public static final String RELEASE_PATH = QPyConstants.ABSOLUTE_PATH + "/.notebook";
+    public static final String NB_SERVER = "http://127.0.0.1:13000";
+    public static final String KILL_SERVER = NB_SERVER + "/__exit";
+    public static final String NOTEBOOK_SERVER = NB_SERVER + "/notebooks/";
+
+    public static final String NOTEBOOK_DIR = QPyConstants.ABSOLUTE_PATH+"/";
+    public static final String ext = ".ipynb";
+    public static final String Untitled = "Untitled";
+
+    public static boolean isNotebookEnable(Context context) {
+        boolean isNLI = isNotebookLibInstall(context);
+        Log.d("NotebookUtil", "isNotebookEnable:" + "-" + isNLI);
+        return isNLI;
+    }
+
+
+
+    /**
+     * 检查notebook库是否安装
+     */
+    public static boolean isNotebookLibInstall(Context context) {
+        boolean common = new File(context.getFilesDir().getAbsolutePath() + "/lib/notebook.zip").exists();
+        if (NAction.isQPy3(context)) {
+            return common & new File(context.getFilesDir().getAbsoluteFile()+"/bin/jupyter").exists();
+        } else {
+            return common & new File(context.getFilesDir().getAbsoluteFile()+"/bin/jupyter2").exists();
+        }
+    }
+
+    /**
+     * 释放相关资源
+     */
+    public static boolean extraData(Context context) {
+        //如果解压成功则lib目录下回出现libzmq.so文件
+        if (new File(context.getFilesDir().getAbsolutePath() + "/lib", "notebook.zip").exists()) {
+            //对bin目录下的文件修改执行权限
+            File bind = new File(context.getFilesDir().getAbsolutePath() + "/bin");
+            if (bind.listFiles() != null) {
+                for (File bin : bind.listFiles()) {
+                    try {
+                        org.qpython.qpysdk.utils.FileUtils.chmod(bin, 0755);
+                    } catch (Exception e1) {
+                        e1.printStackTrace();
+                    }
+                }
+            }
+            if (context.getPackageName().equals("com.hipipal.qpyplus")) {  // old version
+                // Rename correct files to
+                String[] list = {"jupyter-chq", "jupyter2-chq", "jupyter-notebook-chq", "jupyter2-notebook-chq"};
+                for (int i=0;i<list.length;i++) {
+                    String f = list[i];
+                    String t = f.replace("-chq","");
+
+                    File ff = new File(context.getFilesDir().getAbsolutePath() + "/bin", f);
+                    File tf = new File(context.getFilesDir().getAbsolutePath() + "/bin", t);
+                    if (ff.exists()) {
+                        ff.renameTo(tf);
+
+                    }
+                }
+            }
+
+        } else {
+            return false;
+        }
+        return true;
+    }
+
+
+
+    /**
+     * 创建一个的notebook
+     */
+    @SuppressWarnings("ResultOfMethodCallIgnored")
+    public static String createNotebook(Context context, String fileName) {
+        InputStream is = null;
+        FileOutputStream fileOutputStream = null;
+        File file = new File(NOTEBOOK_DIR + "notebooks/", fileName + ext);
+        try {
+            if (!file.exists()) {
+                file.getParentFile().mkdirs();
+                file.createNewFile();
+            }
+            fileOutputStream = new FileOutputStream(file);
+            is = context.getAssets().open(Untitled + ext);
+
+            int lenght = is.available();
+            byte[] buffer = new byte[lenght];
+            is.read(buffer);
+            fileOutputStream.write(buffer);
+            fileOutputStream.flush();
+            return file.getAbsolutePath();
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        } finally {
+            try {
+                if (is != null)
+                    is.close();
+                if (fileOutputStream != null)
+                    fileOutputStream.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+    /**
+     * 关闭后台服务
+     */
+    public static void killServer() {
+        QBaseApp.getInstance().getAsyncHttpClient().get(KILL_SERVER, new AsyncHttpResponseHandler() {
+            @Override
+            public void onSuccess(int i, Header[] headers, byte[] bytes) {
+
+            }
+
+            @Override
+            public void onFailure(int i, Header[] headers, byte[] bytes, Throwable throwable) {
+
+            }
+        });
+    }
+
+    /**
+     * 下载文件
+     */
+    public static void downloadFile(String url, DownloadCallback callback) {
+        Log.d("NotebookUtil", "downloadFile:" + url);
+        final Handler handler = new Handler(Looper.getMainLooper());
+        OkHttpClient client = App.getOkHttpClient();
+        Request request = new Request.Builder().url(url).build();
+        client.newCall(request).enqueue(new Callback() {
+            @Override
+            public void onFailure(Call call, IOException e) {
+                e.printStackTrace();
+                handler.post(() -> {
+                    callback.onFail(e.getMessage());
+                });
+            }
+
+            @Override
+            public void onResponse(Call call, Response response) throws IOException {
+                InputStream is = null;
+                FileOutputStream fos = null;
+                byte[] buff = new byte[2048];
+                int len = -1;
+                try {
+                    String filePath = getTempFilePath(url);
+                    Log.d("NotebookUtil", "onResponse:downloadFile:" + filePath);
+                    if (filePath == null) {
+                        handler.post(() -> {
+                            callback.onFail("Failed to download " + url);
+                        });
+                        return;
+                    }
+                    fos = new FileOutputStream(filePath);
+                    is = response.body().byteStream();
+                    while ((len = is.read(buff)) != -1) {
+                        fos.write(buff, 0, len);
+                    }
+                    fos.flush();
+                    handler.post(() -> {
+                        callback.onSuccess(filePath);
+                    });
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    handler.post(() -> {
+                        callback.onFail(e.getMessage());
+                    });
+                } finally {
+                    if (is != null) {
+                        is.close();
+                    }
+                    if (fos != null) {
+                        fos.close();
+                    }
+                }
+            }
+        });
+
+    }
+
+    private static String getTempFilePath(String url) {
+        //LogUtil.d("NotebookUtil", "getTempFilePath:"+url);
+        File dir = new File(QPyConstants.ABSOLUTE_PATH, "notebooks");
+        if (!dir.exists()) {
+            dir.mkdirs();
+        }
+        String fileName = NUtil.getFileFromUrl(url);
+        File file = new File(dir, fileName);
+        Log.d("NotebookUtil", "getTempFilePath:" + file);
+
+        try {
+            if (!file.exists()) {
+                file.createNewFile();
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+            return null;
+        }
+        return file.getAbsolutePath();
+    }
+
+    public interface DownloadCallback {
+        void onSuccess(String filePath);
+
+        void onFail(String msg);
+    }
+
+    public static void startNotebookService2(Context context) {
+        int notebookPid;
+        if (NAction.isQPy3(context)) {
+            notebookPid = ScriptExec.getInstance().playQScript(context, context.getFilesDir().getAbsolutePath() + "/bin/nb_man.py", null,false);
+
+        } else {
+            notebookPid = ScriptExec.getInstance().playQScript(context, context.getFilesDir().getAbsolutePath() + "/bin/nb2_man.py", null,false);
+        }
+        Log.d("NotebookUtil", "startNotebookService2:"+notebookPid);
+        NStorage.setSP(context, "notebook.pid", ""+notebookPid);
+    }
+
+    public static void startNotebookService(Context context) {
+        if (NAction.isQPy3(context)) {
+            ScriptExec.getInstance().playDScript(context, context.getFilesDir().getAbsolutePath() + "/bin/nb_man.py", null,false);
+        } else {
+            ScriptExec.getInstance().playDScript(context, context.getFilesDir().getAbsolutePath() + "/bin/nb2_man.py", null,false);
+        }
+    }
+
+    public static boolean isNBSrvSet(Context context) {
+        boolean isset = getNBPid2(context) != -1;
+        Log.d(TAG, "isNBSrvSet:"+(isset?"yes":"no"));
+        return isset;
+    }
+
+    public static void killNBSrv(Context context) {
+        int pid = getNBPid2(context);
+
+        Log.d(TAG, "killNBSrv:"+pid);
+
+        if (pid!=-1) {
+            android.os.Process.killProcess(pid);
+        }
+        NStorage.setSP(context, "notebook.pid", "");
+
+    }
+
+    public static int getNBPid2(Context context) {
+        String _pid = NStorage.getSP(context, "notebook.pid");
+        if (!_pid.equals("")) {
+            return Integer.valueOf(_pid);
+        } else {
+            return -1;
+        }
+    }
+
+    public static String getNbResFk(Context context) {
+        return NAction.isQPy3(context)?QPyConstants.KEY_NOTEBOOK_RES: QPyConstants.KEY_NOTEBOOK2_RES;
+    }
+    public static String getNBLink(Context context) {
+        String nb_link = NAction.isQPy3(context)?"https://dl.qpy.io/notebook3.json":"https://dl.qpy.io/notebook2.json";
+        return nb_link+"?"+NAction.getUserUrl(context);
+    }
+
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/utils/OpenWebUtil.java b/qpython/src/main/java/org/qpython/qpy/utils/OpenWebUtil.java
new file mode 100644
index 00000000..4d9203fb
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/utils/OpenWebUtil.java
@@ -0,0 +1,24 @@
+package org.qpython.qpy.utils;
+
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+
+/**
+ * 文 件 名: OpenWebUtil
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2017/12/29 12:18
+ * 邮   箱: qq798435167@gmail.com
+ * 修改时间：
+ * 修改备注：
+ */
+
+public class OpenWebUtil {
+    public static void open(Context context,String url){
+        Intent intent = new Intent();
+        intent.setAction(Intent.ACTION_VIEW);
+        Uri content_url = Uri.parse(url);
+        intent.setData(content_url);
+        context.startActivity(Intent.createChooser(intent, "Please select your browser"));
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/utils/SolfKeybroadUtil.java b/qpython/src/main/java/org/qpython/qpy/utils/SolfKeybroadUtil.java
new file mode 100644
index 00000000..5e5ee738
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/utils/SolfKeybroadUtil.java
@@ -0,0 +1,25 @@
+package org.qpython.qpy.utils;
+
+import android.content.Context;
+import android.view.View;
+import android.view.inputmethod.InputMethodManager;
+
+/**
+ * 文 件 名: SolfKeybroadUtil
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2017/12/28 11:24
+ * 邮   箱: qq798435167@gmail.com
+ * 修改时间：
+ * 修改备注：
+ */
+
+public class SolfKeybroadUtil {
+    public static void showSolfInput(View view , boolean show) {
+        InputMethodManager imm = (InputMethodManager) view.getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
+        if (show) {
+            imm.showSoftInput(view, 0);
+        } else {
+            imm.hideSoftInputFromWindow(view.getWindowToken(), 0);
+        }
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/utils/UpdateHelper.java b/qpython/src/main/java/org/qpython/qpy/utils/UpdateHelper.java
new file mode 100644
index 00000000..8b221d3b
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/utils/UpdateHelper.java
@@ -0,0 +1,383 @@
+package org.qpython.qpy.utils;
+
+import android.support.v7.app.AlertDialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Environment;
+import android.util.Log;
+import android.widget.Toast;
+
+import com.google.gson.Gson;
+
+import com.loopj.android.http.AsyncHttpClient;
+import com.loopj.android.http.JsonHttpResponseHandler;
+import com.loopj.android.http.RequestParams;
+import com.quseit.base.QBaseApp;
+import com.quseit.config.BASE_CONF;
+import com.quseit.common.db.AppLog;
+import com.quseit.common.db.CacheLog;
+import com.quseit.common.db.UserLog;
+import com.quseit.util.DateTimeHelper;
+import com.quseit.util.FileHelper;
+import com.quseit.util.NAction;
+import com.quseit.util.NUtil;
+import com.quseit.util.VeDate;
+
+import org.apache.http.Header;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.qpython.qpy.R;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.server.model.SettingModel;
+import org.qpython.qpysdk.QPyConstants;
+
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+
+public class UpdateHelper {
+
+    private static final String TAG = "UpdateHelper";
+
+    private static void checkConfUpdate(final Context context) {
+        if (NUtil.netCheckin(context.getApplicationContext())) {
+            // clear db cache
+            CacheLog cDB = new CacheLog(context);
+            cDB.cleanCache();
+
+            RequestParams myParam = new RequestParams();
+            String types = "11,12,13";
+            String limit = BASE_CONF.LOG_LIMIT;
+            UserLog userLog = new UserLog(context.getApplicationContext());
+            String xlogs = "";
+            try {
+                xlogs = userLog.getLogs(types, 0, limit, "ASC");
+            } catch (OutOfMemoryError e) {
+                Log.d(TAG, "err when getLogs:" + e.getMessage());
+                xlogs = "";
+                userLog.deleteAllStat_0_Log();
+            }
+            final String logs = xlogs;
+            myParam.put("time", DateTimeHelper.getDateMin());
+            myParam.put("logs", logs);
+
+			/* 手机客户信息 */
+            String collectInfos = BASE_CONF.COLLECT_INFO;
+
+            Field[] fields = Build.class.getDeclaredFields();
+            for (Field field : fields) {
+                try {
+                    field.setAccessible(true);
+                    String k = field.getName();
+                    if (k != null) {
+                        k = k.toLowerCase().trim();
+                    }
+                    if (collectInfos.contains("#" + k + "#")) {
+                        myParam.put(k, field.get(null).toString());
+                    }
+
+                } catch (Exception e) {
+                    Log.e(TAG, "Error occured when collect crash info", e);
+                }
+            }
+
+            if (BASE_CONF.DEBUG)
+                Log.d(TAG, "checkUpdate:" + logs);
+            String updateUrl = NAction.getUpdateHost(context.getApplicationContext());
+            if (updateUrl.equals("")) {
+                updateUrl = confGetUpdateURL(context, 1);
+            }
+            if (!BASE_CONF.DEBUG)
+                Log.d(TAG, "checkUpdate:" + updateUrl + "?" + NAction.getUserUrl(context.getApplicationContext()));
+
+            QBaseApp.getInstance().getAsyncHttpClient().post(context.getApplicationContext(), updateUrl + "?" + NAction.getUserUrl(context.getApplicationContext()),
+                    myParam, new JsonHttpResponseHandler() {
+                        @Override
+                        public void onSuccess(int statusCode, Header[] headers, JSONObject result) {
+                            if (result == null) {
+                                return;
+                            }
+                            if (BASE_CONF.DEBUG)
+                                Log.d(TAG, "checkUpdate-result:" + result.toString());
+                            UserLog log = new UserLog(context);
+                            log.deleteAllStat_0_Log();
+
+                            Gson gson = App.getGson();
+                            SettingModel settings = gson.fromJson(result.toString(), SettingModel.class);
+                            try {
+                                NAction.setExtConf(context, gson.toJson(settings.getQpy().getExt2()));
+                                NAction.setExtAdConf(context, gson.toJson(settings.getQpy().getExt_ad()));
+                                NAction.setUpdateCheckTime(context);
+                            } catch (NullPointerException e) {
+                                //Toast.makeText(context, R.string.get_setting_data_fail+"(e)"+e.getLocalizedMessage(), Toast.LENGTH_SHORT).show();
+                            }
+                        }
+                        @Override
+                        public void onFailure(int statusCode, Header[] headers, String responseString, Throwable throwable) {
+                            // waitingWindow.dismiss();
+                            Log.d(TAG, "Error in checkConfUpdate:" + throwable.getMessage());
+                        }
+                    });
+        }
+    }
+
+    private static String confGetUpdateURL(Context context, int flag) {
+        if (flag == 2) {
+            return QPyConstants.LOG_URL + context.getPackageName() + "/" + NUtil.getVersinoCode(context);
+        } else if (flag == 3) {
+            return QPyConstants.AD_URL + context.getPackageName() + "/" + NUtil.getVersinoCode(context) + "?"
+                    + NAction.getUserUrl(context.getApplicationContext());
+        } else if (flag == 5) {
+            return QPyConstants.IAP_LOG_URL + context.getPackageName() + "/" + NUtil.getVersinoCode(context) + "?"
+                    + NAction.getUserUrl(context.getApplicationContext());
+
+        } else {
+            return QPyConstants.UPDATE_URL + context.getPackageName() + "/" + NUtil.getVersinoCode(context);
+
+        }
+    }
+
+    public static void checkConfUpdate(Context context, String root) {
+        int now = VeDate.getStringDateHourAsInt();
+        int lastCheck = NAction.getUpdateCheckTime(context);
+        PackageInfo pInfo = null;
+        try {
+            pInfo = context.getPackageManager().getPackageInfo(context.getPackageName(), 0);
+        } catch (PackageManager.NameNotFoundException e) {
+            e.printStackTrace();
+        }
+        if ((pInfo == null ? 0 : pInfo.versionCode) < BASE_CONF.UPDATE_VER) {
+            NAction.setUpdateHost(context, "");
+            checkConfUpdate(context.getApplicationContext());
+
+        } else {
+            if (!sendCrashLog(context.getApplicationContext())) {
+
+                int q = NAction.getUpdateQ(context.getApplicationContext());
+                if (q == 0) {
+                    q = BASE_CONF.UPDATEQ;
+                }
+
+                if ((now - lastCheck) >= q) { // 每q小时检查一次更新/清空一下不必要的cache
+                    checkUpdate(context, true);
+
+                    checkConfUpdate(context.getApplicationContext());
+
+                    // 清空图片目录的缓存
+                    String cacheDir = Environment.getExternalStorageDirectory() + "/" + root + "/" + BASE_CONF.DCACHE + "/";
+                    FileHelper.clearDir(cacheDir, 0, false);
+
+                }
+            }
+        }
+
+    }
+
+    private static boolean sendCrashLog(final Context context) {
+        if (NUtil.netCheckin(context.getApplicationContext())) {
+            Log.d(TAG, "notifyErr");
+
+            RequestParams myParam = new RequestParams();
+            //String updateUrl = NAction.getUpdateHost(context.getApplicationContext());
+            //if (updateUrl.equals("")) {
+            String   updateUrl = confGetUpdateURL(context, 2);
+            //}
+//            else {
+//                updateUrl = NAction.getExtP(context, "conf_send_log_host");
+//            }
+
+            String collectInfos = NAction.getExtP(context, "conf_get_log_cls");
+            if (collectInfos.equals("")) {
+                collectInfos = BASE_CONF.COLLECT_INFO;
+            }
+            Field[] fields = Build.class.getDeclaredFields();
+            for (Field field : fields) {
+                try {
+                    field.setAccessible(true);
+                    String k = field.getName();
+                    if (k != null) {
+                        k = k.toLowerCase().trim();
+                    }
+                    if (collectInfos.contains("#" + k + "#")) {
+                        myParam.put(k, field.get(null).toString());
+                    }
+                    // LogUtil.d(TAG, field.getName() + " : " + field.get(null));
+
+                } catch (Exception e) {
+                    Log.e(TAG, "an error occured when collect crash info", e);
+                }
+            }
+
+            AppLog appDB = new AppLog(context);
+            final ArrayList<String[]> logs = appDB.getLogs(0);
+            if (logs.size() != 0) {
+                JSONArray descArray = new JSONArray();
+                // LogUtil.d(TAG, "notifyErr:"+logs);
+                for (int i = 0; i < logs.size(); i++) {
+                    String[] items = logs.get(i);
+                    myParam.put("act", "report_err");
+                    descArray.put(items[5]);
+
+					/*
+                     * myParam.put("report_id", items[0]); myParam.put("report_title", items[1]);
+					 * myParam.put("report_ver", items[2]); myParam.put("report_time", items[3]);
+					 * myParam.put("report_stat", items[4]); myParam.put("report_desc", items[5]);
+					 * myParam.put("report_userno", items[6]); myParam.put("report_id", items[0]);
+					 * myParam.put("report_title", items[1]); myParam.put("report_ver", items[2]);
+					 * myParam.put("report_time", items[3]); myParam.put("report_stat", items[4]);
+					 * myParam.put("report_desc", items[5]); myParam.put("report_userno", items[6]);
+					 */
+
+                    appDB.deleteLog(Long.parseLong(items[0]));
+                }
+                myParam.put("report_desc", descArray.toString());
+
+                new AsyncHttpClient().post(context.getApplicationContext(), updateUrl + "?" + NAction.getUserUrl(context.getApplicationContext()),
+                        myParam, new JsonHttpResponseHandler() { });
+                return true;
+            } else {
+                // LogUtil.d(TAG, "notifyErr no need");
+                return false;
+            }
+        } else {
+            return false;
+        }
+    }
+
+    private static void checkUpdate(final Context context, final boolean isAuto) {
+        QBaseApp.getInstance().getAsyncHttpClient().post(context, BASE_CONF.UPDATER_URL, null, new JsonHttpResponseHandler() {
+            @Override
+            public void onSuccess(int statusCode, Header[] headers, JSONObject response) {
+                int ver = 0;
+                String downloadUrl = "";
+                String verName = "";
+                String desc = "";
+
+                int lastPluginVer = 0;
+                int currentPluginVer = 0;
+                String jsonPlugin = NAction.getExtPluginsConf(context);
+                try {
+                    JSONObject app = response.getJSONObject(BASE_CONF.APP_KEY);
+                    ver = app.getInt(BASE_CONF.VERSION_KEY);
+                    verName = app.getString(BASE_CONF.VERSION_NAME_KEY);
+                    downloadUrl = app.getString(BASE_CONF.DOWNLOAD_LINK_KEY);
+                    desc = app.getString(BASE_CONF.VERIOSN_DESC_KEY);
+                } catch (JSONException e) {
+                    e.printStackTrace();
+                }
+
+                try {
+                    if ("".equals(jsonPlugin)) {
+                        lastPluginVer = BASE_CONF.plugin_ver;
+                    } else {
+                        lastPluginVer = new JSONObject(jsonPlugin).getJSONObject(BASE_CONF.APP_KEY).getInt(BASE_CONF.VERSION_PLUGIN_KEY);
+                    }
+                    currentPluginVer = response.getJSONObject(BASE_CONF.APP_KEY).getInt(BASE_CONF.VERSION_PLUGIN_KEY);
+                } catch (JSONException e) {
+                    e.printStackTrace();
+                }
+                if (lastPluginVer < currentPluginVer || NUtil.getVersinoCode(context.getApplicationContext()) < ver) {
+                    //弹出提示更新
+                    AlertDialog.Builder alert = new AlertDialog.Builder(context);
+                    final String finalDownloadUrl = downloadUrl;
+                    final int finalVer = ver;
+                    final int finalLastPluginVer = lastPluginVer;
+                    final int finalCurrentPluginVer = currentPluginVer;
+                    alert.setTitle(com.quseit.android.R.string.up_soft_state_found)
+                            .setMessage(verName + "\n" + desc)
+                            .setPositiveButton(context.getString(com.quseit.android.R.string.up_soft), new DialogInterface.OnClickListener() {
+                                public void onClick(DialogInterface dialog, int which) {
+                                    if (NUtil.getVersinoCode(context.getApplicationContext()) < finalVer) {
+                                        //app更新
+                                        Intent intent = new Intent();
+                                        intent.setAction("android.intent.action.VIEW");
+                                        Uri content_url = Uri.parse(finalDownloadUrl);
+                                        intent.setData(content_url);
+                                        context.startActivity(intent);
+                                    }
+
+                                    if (finalLastPluginVer < finalCurrentPluginVer) {
+                                        //插件更新
+                                        JSONArray plugins = null;
+                                        try {
+                                            plugins = response.getJSONArray(BASE_CONF.PLUGIN_KEY);
+                                        } catch (JSONException e) {
+                                            e.printStackTrace();
+                                        }
+                                        for (int i = 0; i < plugins.length(); i++) {
+                                            JSONObject plugin = null;
+                                            try {
+                                                plugin = plugins.getJSONObject(i);
+                                            } catch (JSONException e) {
+                                                e.printStackTrace();
+                                            }
+                                            if (!(plugin == null)) {
+                                                try {
+                                                    final String dst = plugin.getString("dst");
+                                                    final String link = plugin.getString("link");
+                                                    new Thread(new Runnable() {
+                                                        @Override
+                                                        public void run() {
+                                                            boolean ret = FileHelper.getUrlAsFile(link, context.getApplicationContext().getFilesDir() + "/" + dst);
+                                                            if (ret) {
+//                                                                runOnUiThread(new Runnable() {
+//                                                                    @Override
+//                                                                    public void run() {
+//                                                                        Toast.makeText(context, "插件已更新，请重启app", Toast.LENGTH_SHORT).show();
+//                                                                    }
+//                                                                });
+                                                            } else {
+//                                                                runOnUiThread(new Runnable() {
+//                                                                    @Override
+//                                                                    public void run() {
+//                                                                        Toast.makeText(context, "插件更新失败", Toast.LENGTH_SHORT).show();
+//                                                                    }
+//                                                                });
+                                                            }
+                                                        }
+                                                    }).start();
+                                                } catch (JSONException e) {
+                                                    e.printStackTrace();
+                                                }
+                                            }
+                                        }
+                                        NAction.setExtPluginsConf(context, response.toString());
+                                    }
+                                }
+                            }).setNegativeButton(context.getString(com.quseit.android.R.string.promote_cancel), new DialogInterface.OnClickListener() {
+                        public void onClick(DialogInterface dialog, int which) {
+                            dialog.dismiss();
+                        }
+                    });
+                    alert.create().show();
+                } else {
+                    if (!isAuto) {
+//                        closeWaitWindow();
+//                        alertUpdateDialog2(verName);
+                    }
+
+                }
+            }
+        });
+
+    }
+
+    /*
+
+        key: 16 bit string
+        param: 64 bit string
+     */
+    public static void submitIAPLog(final Context context, String key, String param) {
+        RequestParams myParam = new RequestParams();
+        myParam.put("idt", key);
+        myParam.put("param", param);
+        new AsyncHttpClient().post(context, confGetUpdateURL(context, 5),
+                myParam, new JsonHttpResponseHandler() { }
+        );
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/utils/iap/IabBroadcastReceiver.java b/qpython/src/main/java/org/qpython/qpy/utils/iap/IabBroadcastReceiver.java
new file mode 100644
index 00000000..eea604d6
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/utils/iap/IabBroadcastReceiver.java
@@ -0,0 +1,59 @@
+/* Copyright (c) 2014 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.
+ */
+
+package org.qpython.qpy.utils.iap;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+
+/**
+ * Receiver for the "com.android.vending.billing.PURCHASES_UPDATED" Action
+ * from the Play Store.
+ *
+ * <p>It is possible that an in-app item may be acquired without the
+ * application calling getBuyIntent(), for example if the item can be
+ * redeemed from inside the Play Store using a promotional code. If this
+ * application isn't running at the time, then when it is started a call
+ * to getPurchases() will be sufficient notification. However, if the
+ * application is already running in the background when the item is acquired,
+ * a message to this BroadcastReceiver will indicate that the an item
+ * has been acquired.</p>
+ */
+public class IabBroadcastReceiver extends BroadcastReceiver {
+    /**
+     * The Intent action that this Receiver should filter for.
+     */
+    public static final String ACTION = "com.android.vending.billing.PURCHASES_UPDATED";
+    private final IabBroadcastListener mListener;
+
+    public IabBroadcastReceiver(IabBroadcastListener listener) {
+        mListener = listener;
+    }
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        if (mListener != null) {
+            mListener.receivedBroadcast();
+        }
+    }
+
+    /**
+     * Listener interface for received broadcast messages.
+     */
+    public interface IabBroadcastListener {
+        void receivedBroadcast();
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/utils/iap/IabException.java b/qpython/src/main/java/org/qpython/qpy/utils/iap/IabException.java
new file mode 100644
index 00000000..ec66b0a6
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/utils/iap/IabException.java
@@ -0,0 +1,43 @@
+/* Copyright (c) 2012 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.
+ */
+
+package org.qpython.qpy.utils.iap;
+
+/**
+ * Exception thrown when something went wrong with in-app billing.
+ * An IabException has an associated IabResult (an error).
+ * To get the IAB result that caused this exception to be thrown,
+ * call {@link #getResult()}.
+ */
+public class IabException extends Exception {
+    IabResult mResult;
+
+    public IabException(IabResult r) {
+        this(r, null);
+    }
+    public IabException(int response, String message) {
+        this(new IabResult(response, message));
+    }
+    public IabException(IabResult r, Exception cause) {
+        super(r.getMessage(), cause);
+        mResult = r;
+    }
+    public IabException(int response, String message, Exception cause) {
+        this(new IabResult(response, message), cause);
+    }
+
+    /** Returns the IAB result (error) that this exception signals. */
+    public IabResult getResult() { return mResult; }
+}
\ No newline at end of file
diff --git a/qpython/src/main/java/org/qpython/qpy/utils/iap/IabHelper.java b/qpython/src/main/java/org/qpython/qpy/utils/iap/IabHelper.java
new file mode 100755
index 00000000..cc0c3334
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/utils/iap/IabHelper.java
@@ -0,0 +1,1095 @@
+/* Copyright (c) 2012 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.
+ */
+
+package org.qpython.qpy.utils.iap;
+
+import android.app.Activity;
+import android.app.PendingIntent;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentSender.SendIntentException;
+import android.content.ServiceConnection;
+import android.content.pm.ResolveInfo;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.IBinder;
+import android.os.RemoteException;
+import android.text.TextUtils;
+import android.util.Log;
+
+
+import com.android.vending.billing.IInAppBillingService;
+
+import org.json.JSONException;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+/**
+ * Provides convenience methods for in-app billing. You can create one instance of this
+ * class for your application and use it to process in-app billing operations.
+ * It provides synchronous (blocking) and asynchronous (non-blocking) methods for
+ * many common in-app billing operations, as well as automatic signature
+ * verification.
+ *
+ * After instantiating, you must perform setup in order to start using the object.
+ * To perform setup, call the {@link #startSetup} method and provide a listener;
+ * that listener will be notified when setup is complete, after which (and not before)
+ * you may call other methods.
+ *
+ * After setup is complete, you will typically want to request an inventory of owned
+ * items and subscriptions. See {@link #queryInventory}, {@link #queryInventoryAsync}
+ * and related methods.
+ *
+ * When you are done with this object, don't forget to call {@link #dispose}
+ * to ensure proper cleanup. This object holds a binding to the in-app billing
+ * service, which will leak unless you dispose of it correctly. If you created
+ * the object on an Activity's onCreate method, then the recommended
+ * place to dispose of it is the Activity's onDestroy method. It is invalid to
+ * dispose the object while an asynchronous operation is in progress. You can
+ * call {@link #disposeWhenFinished()} to ensure that any in-progress operation
+ * completes before the object is disposed.
+ *
+ * A note about threading: When using this object from a background thread, you may
+ * call the blocking versions of methods; when using from a UI thread, call
+ * only the asynchronous versions and handle the results via callbacks.
+ * Also, notice that you can only call one asynchronous operation at a time;
+ * attempting to start a second asynchronous operation while the first one
+ * has not yet completed will result in an exception being thrown.
+ *
+ */
+public class IabHelper {
+    // Billing response codes
+    public static final int BILLING_RESPONSE_RESULT_OK = 0;
+    public static final int BILLING_RESPONSE_RESULT_USER_CANCELED = 1;
+    public static final int BILLING_RESPONSE_RESULT_SERVICE_UNAVAILABLE = 2;
+    public static final int BILLING_RESPONSE_RESULT_BILLING_UNAVAILABLE = 3;
+    public static final int BILLING_RESPONSE_RESULT_ITEM_UNAVAILABLE = 4;
+    public static final int BILLING_RESPONSE_RESULT_DEVELOPER_ERROR = 5;
+    public static final int BILLING_RESPONSE_RESULT_ERROR = 6;
+    public static final int BILLING_RESPONSE_RESULT_ITEM_ALREADY_OWNED = 7;
+    public static final int BILLING_RESPONSE_RESULT_ITEM_NOT_OWNED = 8;
+    // IAB Helper error codes
+    public static final int IABHELPER_ERROR_BASE = -1000;
+    public static final int IABHELPER_REMOTE_EXCEPTION = -1001;
+    public static final int IABHELPER_BAD_RESPONSE = -1002;
+    public static final int IABHELPER_VERIFICATION_FAILED = -1003;
+    public static final int IABHELPER_SEND_INTENT_FAILED = -1004;
+    public static final int IABHELPER_USER_CANCELLED = -1005;
+    public static final int IABHELPER_UNKNOWN_PURCHASE_RESPONSE = -1006;
+    public static final int IABHELPER_MISSING_TOKEN = -1007;
+    public static final int IABHELPER_UNKNOWN_ERROR = -1008;
+    public static final int IABHELPER_SUBSCRIPTIONS_NOT_AVAILABLE = -1009;
+    public static final int IABHELPER_INVALID_CONSUMPTION = -1010;
+    public static final int IABHELPER_SUBSCRIPTION_UPDATE_NOT_AVAILABLE = -1011;
+    // Keys for the responses from InAppBillingService
+    public static final String RESPONSE_CODE = "RESPONSE_CODE";
+    public static final String RESPONSE_GET_SKU_DETAILS_LIST = "DETAILS_LIST";
+    public static final String RESPONSE_BUY_INTENT = "BUY_INTENT";
+    public static final String RESPONSE_INAPP_PURCHASE_DATA = "INAPP_PURCHASE_DATA";
+    public static final String RESPONSE_INAPP_SIGNATURE = "INAPP_DATA_SIGNATURE";
+    public static final String RESPONSE_INAPP_ITEM_LIST = "INAPP_PURCHASE_ITEM_LIST";
+    public static final String RESPONSE_INAPP_PURCHASE_DATA_LIST = "INAPP_PURCHASE_DATA_LIST";
+    public static final String RESPONSE_INAPP_SIGNATURE_LIST = "INAPP_DATA_SIGNATURE_LIST";
+    public static final String INAPP_CONTINUATION_TOKEN = "INAPP_CONTINUATION_TOKEN";
+    // Item types
+    public static final String ITEM_TYPE_INAPP = "inapp";
+    public static final String ITEM_TYPE_SUBS = "subs";
+    // some fields on the getSkuDetails response bundle
+    public static final String GET_SKU_DETAILS_ITEM_LIST = "ITEM_ID_LIST";
+    public static final String GET_SKU_DETAILS_ITEM_TYPE_LIST = "ITEM_TYPE_LIST";
+    // Ensure atomic access to mAsyncInProgress and mDisposeAfterAsync.
+    private final Object mAsyncInProgressLock = new Object();
+    // Is debug logging enabled?
+    boolean mDebugLog = false;
+    String mDebugTag = "IabHelper";
+    // Is setup done?
+    boolean mSetupDone = false;
+    // Has this object been disposed of? (If so, we should ignore callbacks, etc)
+    boolean mDisposed = false;
+    // Do we need to dispose this object after an in-progress asynchronous operation?
+    boolean mDisposeAfterAsync = false;
+    // Are subscriptions supported?
+    boolean mSubscriptionsSupported = false;
+    // Is subscription update supported?
+    boolean mSubscriptionUpdateSupported = false;
+    // Is an asynchronous operation in progress?
+    // (only one at a time can be in progress)
+    boolean mAsyncInProgress = false;
+    // (for logging/debugging)
+    // if mAsyncInProgress == true, what asynchronous operation is in progress?
+    String mAsyncOperation = "";
+    // Context we were passed during initialization
+    Context mContext;
+    // Connection to the service
+    IInAppBillingService mService;
+    ServiceConnection    mServiceConn;
+    // The request code used to launch purchase flow
+    int mRequestCode;
+    // The item type of the current purchase flow
+    String mPurchasingItemType;
+    // Public key for verifying signature, in base64 encoding
+    String mSignatureBase64 = null;
+    // The listener registered on launchPurchaseFlow, which we have to call back when
+    // the purchase finishes
+    OnIabPurchaseFinishedListener mPurchaseListener;
+
+    /**
+     * Creates an instance. After creation, it will not yet be ready to use. You must perform
+     * setup by calling {@link #startSetup} and wait for setup to complete. This constructor does not
+     * block and is safe to call from a UI thread.
+     *
+     * @param ctx Your application or Activity context. Needed to bind to the in-app billing service.
+     * @param base64PublicKey Your application's public key, encoded in base64.
+     *     This is used for verification of purchase signatures. You can find your app's base64-encoded
+     *     public key in your application's page on Google Play Developer Console. Note that this
+     *     is NOT your "developer public key".
+     */
+    public IabHelper(Context ctx, String base64PublicKey) {
+        mContext = ctx.getApplicationContext();
+        mSignatureBase64 = base64PublicKey;
+        logDebug("IAB helper created.");
+    }
+
+    /**
+     * Returns a human-readable description for the given response code.
+     *
+     * @param code The response code
+     * @return A human-readable string explaining the result code.
+     *     It also includes the result code numerically.
+     */
+    public static String getResponseDesc(int code) {
+        String[] iab_msgs = ("0:OK/1:User Canceled/2:Unknown/" +
+                "3:Billing Unavailable/4:Item unavailable/" +
+                "5:Developer Error/6:Error/7:Item Already Owned/" +
+                "8:Item not owned").split("/");
+        String[] iabhelper_msgs = ("0:OK/-1001:Remote exception during initialization/" +
+                                   "-1002:Bad response received/" +
+                                   "-1003:Purchase signature verification failed/" +
+                                   "-1004:Send intent failed/" +
+                                   "-1005:User cancelled/" +
+                                   "-1006:Unknown purchase response/" +
+                                   "-1007:Missing token/" +
+                                   "-1008:Unknown error/" +
+                                   "-1009:Subscriptions not available/" +
+                                   "-1010:Invalid consumption attempt").split("/");
+
+        if (code <= IABHELPER_ERROR_BASE) {
+            int index = IABHELPER_ERROR_BASE - code;
+            if (index >= 0 && index < iabhelper_msgs.length) return iabhelper_msgs[index];
+            else return String.valueOf(code) + ":Unknown IAB Helper Error";
+        }
+        else if (code < 0 || code >= iab_msgs.length)
+            return String.valueOf(code) + ":Unknown";
+        else
+            return iab_msgs[code];
+    }
+
+    /**
+     * Enables or disable debug logging through LogCat.
+     */
+    public void enableDebugLogging(boolean enable, String tag) {
+        checkNotDisposed();
+        mDebugLog = enable;
+        mDebugTag = tag;
+    }
+
+    public void enableDebugLogging(boolean enable) {
+        checkNotDisposed();
+        mDebugLog = enable;
+    }
+
+    /**
+     * Starts the setup process. This will start up the setup process asynchronously.
+     * You will be notified through the listener when the setup process is complete.
+     * This method is safe to call from a UI thread.
+     *
+     * @param listener The listener to notify when the setup process is complete.
+     */
+    public void startSetup(final OnIabSetupFinishedListener listener) {
+        // If already set up, can't do it again.
+        checkNotDisposed();
+        if (mSetupDone) throw new IllegalStateException("IAB helper is already set up.");
+
+        // Connection to IAB service
+        logDebug("Starting in-app billing setup.");
+        mServiceConn = new ServiceConnection() {
+            @Override
+            public void onServiceDisconnected(ComponentName name) {
+                logDebug("Billing service disconnected.");
+                mService = null;
+            }
+
+            @Override
+            public void onServiceConnected(ComponentName name, IBinder service) {
+                if (mDisposed) return;
+                logDebug("Billing service connected.");
+                mService = IInAppBillingService.Stub.asInterface(service);
+                String packageName = mContext.getPackageName();
+                try {
+                    logDebug("Checking for in-app billing 3 support.");
+
+                    // check for in-app billing v3 support
+                    int response = mService.isBillingSupported(3, packageName, ITEM_TYPE_INAPP);
+                    if (response != BILLING_RESPONSE_RESULT_OK) {
+                        if (listener != null) listener.onIabSetupFinished(new IabResult(response,
+                                "Error checking for billing v3 support."));
+
+                        // if in-app purchases aren't supported, neither are subscriptions
+                        mSubscriptionsSupported = false;
+                        mSubscriptionUpdateSupported = false;
+                        return;
+                    } else {
+                        logDebug("In-app billing version 3 supported for " + packageName);
+                    }
+
+                    // Check for v5 subscriptions support. This is needed for
+                    // getBuyIntentToReplaceSku which allows for subscription update
+                    response = mService.isBillingSupported(5, packageName, ITEM_TYPE_SUBS);
+                    if (response == BILLING_RESPONSE_RESULT_OK) {
+                        logDebug("Subscription re-signup AVAILABLE.");
+                        mSubscriptionUpdateSupported = true;
+                    } else {
+                        logDebug("Subscription re-signup not available.");
+                        mSubscriptionUpdateSupported = false;
+                    }
+
+                    if (mSubscriptionUpdateSupported) {
+                        mSubscriptionsSupported = true;
+                    } else {
+                        // check for v3 subscriptions support
+                        response = mService.isBillingSupported(3, packageName, ITEM_TYPE_SUBS);
+                        if (response == BILLING_RESPONSE_RESULT_OK) {
+                            logDebug("Subscriptions AVAILABLE.");
+                            mSubscriptionsSupported = true;
+                        } else {
+                            logDebug("Subscriptions NOT AVAILABLE. Response: " + response);
+                            mSubscriptionsSupported = false;
+                            mSubscriptionUpdateSupported = false;
+                        }
+                    }
+
+                    mSetupDone = true;
+                }
+                catch (RemoteException e) {
+                    if (listener != null) {
+                        listener.onIabSetupFinished(new IabResult(IABHELPER_REMOTE_EXCEPTION,
+                                "RemoteException while setting up in-app billing."));
+                    }
+                    e.printStackTrace();
+                    return;
+                }
+
+                if (listener != null) {
+                    listener.onIabSetupFinished(new IabResult(BILLING_RESPONSE_RESULT_OK, "Setup successful."));
+                }
+            }
+        };
+
+        Intent serviceIntent = new Intent("com.android.vending.billing.InAppBillingService.BIND");
+        serviceIntent.setPackage("com.android.vending");
+        List<ResolveInfo> intentServices = mContext.getPackageManager().queryIntentServices(serviceIntent, 0);
+        if (intentServices != null && !intentServices.isEmpty()) {
+            // service available to handle that Intent
+            mContext.bindService(serviceIntent, mServiceConn, Context.BIND_AUTO_CREATE);
+        }
+        else {
+            // no service available to handle that Intent
+            if (listener != null) {
+                listener.onIabSetupFinished(
+                        new IabResult(BILLING_RESPONSE_RESULT_BILLING_UNAVAILABLE,
+                                "Billing service unavailable on device."));
+            }
+        }
+    }
+
+    /**
+     * Dispose of object, releasing resources. It's very important to call this
+     * method when you are done with this object. It will release any resources
+     * used by it such as service connections. Naturally, once the object is
+     * disposed of, it can't be used again.
+     */
+    public void dispose() throws IabAsyncInProgressException {
+        synchronized (mAsyncInProgressLock) {
+            if (mAsyncInProgress) {
+                throw new IabAsyncInProgressException("Can't dispose because an async operation " +
+                    "(" + mAsyncOperation + ") is in progress.");
+            }
+        }
+        logDebug("Disposing.");
+        mSetupDone = false;
+        if (mServiceConn != null) {
+            logDebug("Unbinding from service.");
+            if (mContext != null) mContext.unbindService(mServiceConn);
+        }
+        mDisposed = true;
+        mContext = null;
+        mServiceConn = null;
+        mService = null;
+        mPurchaseListener = null;
+    }
+
+    /**
+     * Disposes of object, releasing resources. If there is an in-progress async operation, this
+     * method will queue the dispose to occur after the operation has finished.
+     */
+    public void disposeWhenFinished() {
+        synchronized (mAsyncInProgressLock) {
+            if (mAsyncInProgress) {
+                logDebug("Will dispose after async operation finishes.");
+                mDisposeAfterAsync = true;
+            } else {
+                try {
+                    dispose();
+                } catch (IabAsyncInProgressException e) {
+                    // Should never be thrown, because we call dispose() only after checking that
+                    // there's not already an async operation in progress.
+                }
+            }
+        }
+    }
+
+    private void checkNotDisposed() {
+        if (mDisposed) throw new IllegalStateException("IabHelper was disposed of, so it cannot be used.");
+    }
+
+    /** Returns whether subscriptions are supported. */
+    public boolean subscriptionsSupported() {
+        checkNotDisposed();
+        return mSubscriptionsSupported;
+    }
+
+    public void launchPurchaseFlow(Activity act, String sku, int requestCode, OnIabPurchaseFinishedListener listener)
+        throws IabAsyncInProgressException {
+        launchPurchaseFlow(act, sku, requestCode, listener, "");
+    }
+
+    public void launchPurchaseFlow(Activity act, String sku, int requestCode,
+            OnIabPurchaseFinishedListener listener, String extraData)
+        throws IabAsyncInProgressException {
+        launchPurchaseFlow(act, sku, ITEM_TYPE_INAPP, null, requestCode, listener, extraData);
+    }
+
+    public void launchSubscriptionPurchaseFlow(Activity act, String sku, int requestCode,
+            OnIabPurchaseFinishedListener listener) throws IabAsyncInProgressException {
+        launchSubscriptionPurchaseFlow(act, sku, requestCode, listener, "");
+    }
+
+    public void launchSubscriptionPurchaseFlow(Activity act, String sku, int requestCode,
+            OnIabPurchaseFinishedListener listener, String extraData)
+        throws IabAsyncInProgressException {
+        launchPurchaseFlow(act, sku, ITEM_TYPE_SUBS, null, requestCode, listener, extraData);
+    }
+
+    /**
+     * Initiate the UI flow for an in-app purchase. Call this method to initiate an in-app purchase,
+     * which will involve bringing up the Google Play screen. The calling activity will be paused
+     * while the user interacts with Google Play, and the result will be delivered via the
+     * activity's {@link Activity#onActivityResult} method, at which point you must call
+     * this object's {@link #handleActivityResult} method to continue the purchase flow. This method
+     * MUST be called from the UI thread of the Activity.
+     *
+     * @param act The calling activity.
+     * @param sku The sku of the item to purchase.
+     * @param itemType indicates if it's a product or a subscription (ITEM_TYPE_INAPP or
+     *      ITEM_TYPE_SUBS)
+     * @param oldSkus A list of SKUs which the new SKU is replacing or null if there are none
+     * @param requestCode A request code (to differentiate from other responses -- as in
+     *      {@link Activity#startActivityForResult}).
+     * @param listener The listener to notify when the purchase process finishes
+     * @param extraData Extra data (developer payload), which will be returned with the purchase
+     *      data when the purchase completes. This extra data will be permanently bound to that
+     *      purchase and will always be returned when the purchase is queried.
+     */
+    public void launchPurchaseFlow(Activity act, String sku, String itemType, List<String> oldSkus,
+            int requestCode, OnIabPurchaseFinishedListener listener, String extraData)
+        throws IabAsyncInProgressException {
+        checkNotDisposed();
+        checkSetupDone("launchPurchaseFlow");
+        flagStartAsync("launchPurchaseFlow");
+        IabResult result;
+
+        if (itemType.equals(ITEM_TYPE_SUBS) && !mSubscriptionsSupported) {
+            IabResult r = new IabResult(IABHELPER_SUBSCRIPTIONS_NOT_AVAILABLE,
+                    "Subscriptions are not available.");
+            flagEndAsync();
+            if (listener != null) listener.onIabPurchaseFinished(r, null);
+            return;
+        }
+
+        try {
+            logDebug("Constructing buy intent for " + sku + ", item type: " + itemType);
+            Bundle buyIntentBundle;
+            if (oldSkus == null || oldSkus.isEmpty()) {
+                // Purchasing a new item or subscription re-signup
+                buyIntentBundle = mService.getBuyIntent(3, mContext.getPackageName(), sku, itemType,
+                        extraData);
+            } else {
+                // Subscription upgrade/downgrade
+                if (!mSubscriptionUpdateSupported) {
+                    IabResult r = new IabResult(IABHELPER_SUBSCRIPTION_UPDATE_NOT_AVAILABLE,
+                            "Subscription updates are not available.");
+                    flagEndAsync();
+                    if (listener != null) listener.onIabPurchaseFinished(r, null);
+                    return;
+                }
+                buyIntentBundle = mService.getBuyIntentToReplaceSkus(5, mContext.getPackageName(),
+                        oldSkus, sku, itemType, extraData);
+            }
+            int response = getResponseCodeFromBundle(buyIntentBundle);
+            if (response != BILLING_RESPONSE_RESULT_OK) {
+                logError("Unable to buy item, Error response: " + getResponseDesc(response));
+                flagEndAsync();
+                result = new IabResult(response, "Unable to buy item");
+                if (listener != null) listener.onIabPurchaseFinished(result, null);
+                return;
+            }
+
+            PendingIntent pendingIntent = buyIntentBundle.getParcelable(RESPONSE_BUY_INTENT);
+            logDebug("Launching buy intent for " + sku + ". Request code: " + requestCode);
+            mRequestCode = requestCode;
+            mPurchaseListener = listener;
+            mPurchasingItemType = itemType;
+            act.startIntentSenderForResult(pendingIntent.getIntentSender(),
+                    requestCode, new Intent(),
+                    Integer.valueOf(0), Integer.valueOf(0),
+                    Integer.valueOf(0));
+        }
+        catch (SendIntentException e) {
+            logError("SendIntentException while launching purchase flow for sku " + sku);
+            e.printStackTrace();
+            flagEndAsync();
+
+            result = new IabResult(IABHELPER_SEND_INTENT_FAILED, "Failed to send intent.");
+            if (listener != null) listener.onIabPurchaseFinished(result, null);
+        }
+        catch (RemoteException e) {
+            logError("RemoteException while launching purchase flow for sku " + sku);
+            e.printStackTrace();
+            flagEndAsync();
+
+            result = new IabResult(IABHELPER_REMOTE_EXCEPTION, "Remote exception while starting purchase flow");
+            if (listener != null) listener.onIabPurchaseFinished(result, null);
+        }
+    }
+
+    /**
+     * Handles an activity result that's part of the purchase flow in in-app billing. If you
+     * are calling {@link #launchPurchaseFlow}, then you must call this method from your
+     * Activity's {@link Activity@onActivityResult} method. This method
+     * MUST be called from the UI thread of the Activity.
+     *
+     * @param requestCode The requestCode as you received it.
+     * @param resultCode The resultCode as you received it.
+     * @param data The data (Intent) as you received it.
+     * @return Returns true if the result was related to a purchase flow and was handled;
+     *     false if the result was not related to a purchase, in which case you should
+     *     handle it normally.
+     */
+    public boolean handleActivityResult(int requestCode, int resultCode, Intent data) {
+        IabResult result;
+        if (requestCode != mRequestCode) return false;
+
+        checkNotDisposed();
+        checkSetupDone("handleActivityResult");
+
+        // end of async purchase operation that started on launchPurchaseFlow
+        flagEndAsync();
+
+        if (data == null) {
+            logError("Null data in IAB activity result.");
+            result = new IabResult(IABHELPER_BAD_RESPONSE, "Null data in IAB result");
+            if (mPurchaseListener != null) mPurchaseListener.onIabPurchaseFinished(result, null);
+            return true;
+        }
+
+        int responseCode = getResponseCodeFromIntent(data);
+        String purchaseData = data.getStringExtra(RESPONSE_INAPP_PURCHASE_DATA);
+        String dataSignature = data.getStringExtra(RESPONSE_INAPP_SIGNATURE);
+
+        if (resultCode == Activity.RESULT_OK && responseCode == BILLING_RESPONSE_RESULT_OK) {
+            logDebug("Successful resultcode from purchase activity.");
+            logDebug("Purchase data: " + purchaseData);
+            logDebug("Data signature: " + dataSignature);
+            logDebug("Extras: " + data.getExtras());
+            logDebug("Expected item type: " + mPurchasingItemType);
+
+            if (purchaseData == null || dataSignature == null) {
+                logError("BUG: either purchaseData or dataSignature is null.");
+                logDebug("Extras: " + data.getExtras().toString());
+                result = new IabResult(IABHELPER_UNKNOWN_ERROR, "IAB returned null purchaseData or dataSignature");
+                if (mPurchaseListener != null) mPurchaseListener.onIabPurchaseFinished(result, null);
+                return true;
+            }
+
+            Purchase purchase = null;
+            try {
+                purchase = new Purchase(mPurchasingItemType, purchaseData, dataSignature);
+                String sku = purchase.getSku();
+
+                // Verify signature
+                if (!Security.verifyPurchase(mSignatureBase64, purchaseData, dataSignature)) {
+                    logError("Purchase signature verification FAILED for sku " + sku);
+                    result = new IabResult(IABHELPER_VERIFICATION_FAILED, "Signature verification failed for sku " + sku);
+                    if (mPurchaseListener != null) mPurchaseListener.onIabPurchaseFinished(result, purchase);
+                    return true;
+                }
+                logDebug("Purchase signature successfully verified.");
+            }
+            catch (JSONException e) {
+                logError("Failed to parse purchase data.");
+                e.printStackTrace();
+                result = new IabResult(IABHELPER_BAD_RESPONSE, "Failed to parse purchase data.");
+                if (mPurchaseListener != null) mPurchaseListener.onIabPurchaseFinished(result, null);
+                return true;
+            }
+
+            if (mPurchaseListener != null) {
+                mPurchaseListener.onIabPurchaseFinished(new IabResult(BILLING_RESPONSE_RESULT_OK, "Success"), purchase);
+            }
+        }
+        else if (resultCode == Activity.RESULT_OK) {
+            // result code was OK, but in-app billing response was not OK.
+            logDebug("Result code was OK but in-app billing response was not OK: " + getResponseDesc(responseCode));
+            if (mPurchaseListener != null) {
+                result = new IabResult(responseCode, "Problem purchashing item.");
+                mPurchaseListener.onIabPurchaseFinished(result, null);
+            }
+        }
+        else if (resultCode == Activity.RESULT_CANCELED) {
+            logDebug("Purchase canceled - Response: " + getResponseDesc(responseCode));
+            result = new IabResult(IABHELPER_USER_CANCELLED, "User canceled.");
+            if (mPurchaseListener != null) mPurchaseListener.onIabPurchaseFinished(result, null);
+        }
+        else {
+            logError("Purchase failed. Result code: " + Integer.toString(resultCode)
+                    + ". Response: " + getResponseDesc(responseCode));
+            result = new IabResult(IABHELPER_UNKNOWN_PURCHASE_RESPONSE, "Unknown purchase response.");
+            if (mPurchaseListener != null) mPurchaseListener.onIabPurchaseFinished(result, null);
+        }
+        return true;
+    }
+
+    public Inventory queryInventory() throws IabException {
+        return queryInventory(false, null, null);
+    }
+
+    /**
+     * Queries the inventory. This will query all owned items from the server, as well as
+     * information on additional skus, if specified. This method may block or take long to execute.
+     * Do not call from a UI thread. For that, use the non-blocking version {@link #queryInventoryAsync}.
+     *
+     * @param querySkuDetails if true, SKU details (price, description, etc) will be queried as well
+     *     as purchase information.
+     * @param moreItemSkus additional PRODUCT skus to query information on, regardless of ownership.
+     *     Ignored if null or if querySkuDetails is false.
+     * @param moreSubsSkus additional SUBSCRIPTIONS skus to query information on, regardless of ownership.
+     *     Ignored if null or if querySkuDetails is false.
+     * @throws IabException if a problem occurs while refreshing the inventory.
+     */
+    public Inventory queryInventory(boolean querySkuDetails, List<String> moreItemSkus,
+            List<String> moreSubsSkus) throws IabException {
+        checkNotDisposed();
+        checkSetupDone("queryInventory");
+        try {
+            Inventory inv = new Inventory();
+            int r = queryPurchases(inv, ITEM_TYPE_INAPP);
+            if (r != BILLING_RESPONSE_RESULT_OK) {
+                throw new IabException(r, "Error refreshing inventory (querying owned items).");
+            }
+
+            if (querySkuDetails) {
+                r = querySkuDetails(ITEM_TYPE_INAPP, inv, moreItemSkus);
+                if (r != BILLING_RESPONSE_RESULT_OK) {
+                    throw new IabException(r, "Error refreshing inventory (querying prices of items).");
+                }
+            }
+
+            // if subscriptions are supported, then also query for subscriptions
+            if (mSubscriptionsSupported) {
+                r = queryPurchases(inv, ITEM_TYPE_SUBS);
+                if (r != BILLING_RESPONSE_RESULT_OK) {
+                    throw new IabException(r, "Error refreshing inventory (querying owned subscriptions).");
+                }
+
+                if (querySkuDetails) {
+                    r = querySkuDetails(ITEM_TYPE_SUBS, inv, moreSubsSkus);
+                    if (r != BILLING_RESPONSE_RESULT_OK) {
+                        throw new IabException(r, "Error refreshing inventory (querying prices of subscriptions).");
+                    }
+                }
+            }
+
+            return inv;
+        }
+        catch (RemoteException e) {
+            throw new IabException(IABHELPER_REMOTE_EXCEPTION, "Remote exception while refreshing inventory.", e);
+        }
+        catch (JSONException e) {
+            throw new IabException(IABHELPER_BAD_RESPONSE, "Error parsing JSON response while refreshing inventory.", e);
+        }
+    }
+
+    /**
+     * Asynchronous wrapper for inventory query. This will perform an inventory
+     * query as described in {@link #queryInventory}, but will do so asynchronously
+     * and call back the specified listener upon completion. This method is safe to
+     * call from a UI thread.
+     *
+     * @param querySkuDetails as in {@link #queryInventory}
+     * @param moreItemSkus as in {@link #queryInventory}
+     * @param moreSubsSkus as in {@link #queryInventory}
+     * @param listener The listener to notify when the refresh operation completes.
+     */
+    public void queryInventoryAsync(final boolean querySkuDetails, final List<String> moreItemSkus,
+            final List<String> moreSubsSkus, final QueryInventoryFinishedListener listener)
+        throws IabAsyncInProgressException {
+        final Handler handler = new Handler();
+        checkNotDisposed();
+        checkSetupDone("queryInventory");
+        flagStartAsync("refresh inventory");
+        (new Thread(new Runnable() {
+            public void run() {
+                IabResult result = new IabResult(BILLING_RESPONSE_RESULT_OK, "Inventory refresh successful.");
+                Inventory inv = null;
+                try {
+                    inv = queryInventory(querySkuDetails, moreItemSkus, moreSubsSkus);
+                }
+                catch (IabException ex) {
+                    result = ex.getResult();
+                }
+
+                flagEndAsync();
+
+                final IabResult result_f = result;
+                final Inventory inv_f = inv;
+                if (!mDisposed && listener != null) {
+                    handler.post(new Runnable() {
+                        public void run() {
+                            listener.onQueryInventoryFinished(result_f, inv_f);
+                        }
+                    });
+                }
+            }
+        })).start();
+    }
+
+    public void queryInventoryAsync(QueryInventoryFinishedListener listener)
+        throws IabAsyncInProgressException{
+        queryInventoryAsync(false, null, null, listener);
+    }
+
+    /**
+     * Consumes a given in-app product. Consuming can only be done on an item
+     * that's owned, and as a result of consumption, the user will no longer own it.
+     * This method may block or take long to return. Do not call from the UI thread.
+     * For that, see {@link #consumeAsync}.
+     *
+     * @param itemInfo The PurchaseInfo that represents the item to consume.
+     * @throws IabException if there is a problem during consumption.
+     */
+    void consume(Purchase itemInfo) throws IabException {
+        checkNotDisposed();
+        checkSetupDone("consume");
+
+        if (!itemInfo.mItemType.equals(ITEM_TYPE_INAPP)) {
+            throw new IabException(IABHELPER_INVALID_CONSUMPTION,
+                    "Items of type '" + itemInfo.mItemType + "' can't be consumed.");
+        }
+
+        try {
+            String token = itemInfo.getToken();
+            String sku = itemInfo.getSku();
+            if (token == null || token.equals("")) {
+                logError("Can't consume "+ sku + ". No token.");
+                throw new IabException(IABHELPER_MISSING_TOKEN, "PurchaseInfo is missing token for sku: "
+                        + sku + " " + itemInfo);
+            }
+
+            logDebug("Consuming sku: " + sku + ", token: " + token);
+            int response = mService.consumePurchase(3, mContext.getPackageName(), token);
+            if (response == BILLING_RESPONSE_RESULT_OK) {
+                logDebug("Successfully consumed sku: " + sku);
+            }
+            else {
+                logDebug("Error consuming consuming sku " + sku + ". " + getResponseDesc(response));
+                throw new IabException(response, "Error consuming sku " + sku);
+            }
+        }
+        catch (RemoteException e) {
+            throw new IabException(IABHELPER_REMOTE_EXCEPTION, "Remote exception while consuming. PurchaseInfo: " + itemInfo, e);
+        }
+    }
+
+    /**
+     * Asynchronous wrapper to item consumption. Works like {@link #consume}, but
+     * performs the consumption in the background and notifies completion through
+     * the provided listener. This method is safe to call from a UI thread.
+     *
+     * @param purchase The purchase to be consumed.
+     * @param listener The listener to notify when the consumption operation finishes.
+     */
+    public void consumeAsync(Purchase purchase, OnConsumeFinishedListener listener)
+        throws IabAsyncInProgressException {
+        checkNotDisposed();
+        checkSetupDone("consume");
+        List<Purchase> purchases = new ArrayList<Purchase>();
+        purchases.add(purchase);
+        consumeAsyncInternal(purchases, listener, null);
+    }
+
+    /**
+     * Same as {@link #consumeAsync}, but for multiple items at once.
+     * @param purchases The list of PurchaseInfo objects representing the purchases to consume.
+     * @param listener The listener to notify when the consumption operation finishes.
+     */
+    public void consumeAsync(List<Purchase> purchases, OnConsumeMultiFinishedListener listener)
+        throws IabAsyncInProgressException {
+        checkNotDisposed();
+        checkSetupDone("consume");
+        consumeAsyncInternal(purchases, null, listener);
+    }
+
+    // Checks that setup was done; if not, throws an exception.
+    void checkSetupDone(String operation) {
+        if (!mSetupDone) {
+            logError("Illegal state for operation (" + operation + "): IAB helper is not set up.");
+            throw new IllegalStateException("IAB helper is not set up. Can't perform operation: " + operation);
+        }
+    }
+
+    // Workaround to bug where sometimes response codes come as Long instead of Integer
+    int getResponseCodeFromBundle(Bundle b) {
+        Object o = b.get(RESPONSE_CODE);
+        if (o == null) {
+            logDebug("Bundle with null response code, assuming OK (known issue)");
+            return BILLING_RESPONSE_RESULT_OK;
+        }
+        else if (o instanceof Integer) return ((Integer)o).intValue();
+        else if (o instanceof Long) return (int)((Long)o).longValue();
+        else {
+            logError("Unexpected type for bundle response code.");
+            logError(o.getClass().getName());
+            throw new RuntimeException("Unexpected type for bundle response code: " + o.getClass().getName());
+        }
+    }
+
+    // Workaround to bug where sometimes response codes come as Long instead of Integer
+    int getResponseCodeFromIntent(Intent i) {
+        Object o = i.getExtras().get(RESPONSE_CODE);
+        if (o == null) {
+            logError("Intent with no response code, assuming OK (known issue)");
+            return BILLING_RESPONSE_RESULT_OK;
+        }
+        else if (o instanceof Integer) return ((Integer)o).intValue();
+        else if (o instanceof Long) return (int)((Long)o).longValue();
+        else {
+            logError("Unexpected type for intent response code.");
+            logError(o.getClass().getName());
+            throw new RuntimeException("Unexpected type for intent response code: " + o.getClass().getName());
+        }
+    }
+
+    void flagStartAsync(String operation) throws IabAsyncInProgressException {
+        synchronized (mAsyncInProgressLock) {
+            if (mAsyncInProgress) {
+                throw new IabAsyncInProgressException("Can't start async operation (" +
+                    operation + ") because another async operation (" + mAsyncOperation +
+                    ") is in progress.");
+            }
+            mAsyncOperation = operation;
+            mAsyncInProgress = true;
+            logDebug("Starting async operation: " + operation);
+        }
+    }
+
+    void flagEndAsync() {
+        synchronized (mAsyncInProgressLock) {
+            logDebug("Ending async operation: " + mAsyncOperation);
+            mAsyncOperation = "";
+            mAsyncInProgress = false;
+            if (mDisposeAfterAsync) {
+                try {
+                    dispose();
+                } catch (IabAsyncInProgressException e) {
+                    // Should not be thrown, because we reset mAsyncInProgress immediately before
+                    // calling dispose().
+                }
+            }
+        }
+    }
+
+    int queryPurchases(Inventory inv, String itemType) throws JSONException, RemoteException {
+        // Query purchases
+        logDebug("Querying owned items, item type: " + itemType);
+        logDebug("Package name: " + mContext.getPackageName());
+        boolean verificationFailed = false;
+        String continueToken = null;
+
+        do {
+            logDebug("Calling getPurchases with continuation token: " + continueToken);
+            Bundle ownedItems = mService.getPurchases(3, mContext.getPackageName(),
+                    itemType, continueToken);
+
+            int response = getResponseCodeFromBundle(ownedItems);
+            logDebug("Owned items response: " + String.valueOf(response));
+            if (response != BILLING_RESPONSE_RESULT_OK) {
+                logDebug("getPurchases() failed: " + getResponseDesc(response));
+                return response;
+            }
+            if (!ownedItems.containsKey(RESPONSE_INAPP_ITEM_LIST)
+                    || !ownedItems.containsKey(RESPONSE_INAPP_PURCHASE_DATA_LIST)
+                    || !ownedItems.containsKey(RESPONSE_INAPP_SIGNATURE_LIST)) {
+                logError("Bundle returned from getPurchases() doesn't contain required fields.");
+                return IABHELPER_BAD_RESPONSE;
+            }
+
+            ArrayList<String> ownedSkus = ownedItems.getStringArrayList(
+                    RESPONSE_INAPP_ITEM_LIST);
+            ArrayList<String> purchaseDataList = ownedItems.getStringArrayList(
+                    RESPONSE_INAPP_PURCHASE_DATA_LIST);
+            ArrayList<String> signatureList = ownedItems.getStringArrayList(
+                    RESPONSE_INAPP_SIGNATURE_LIST);
+
+            for (int i = 0; i < purchaseDataList.size(); ++i) {
+                String purchaseData = purchaseDataList.get(i);
+                String signature = signatureList.get(i);
+                String sku = ownedSkus.get(i);
+                if (Security.verifyPurchase(mSignatureBase64, purchaseData, signature)) {
+                    logDebug("Sku is owned: " + sku);
+                    Purchase purchase = new Purchase(itemType, purchaseData, signature);
+
+                    if (TextUtils.isEmpty(purchase.getToken())) {
+                        logWarn("BUG: empty/null token!");
+                        logDebug("Purchase data: " + purchaseData);
+                    }
+
+                    // Record ownership and token
+                    inv.addPurchase(purchase);
+                }
+                else {
+                    logWarn("Purchase signature verification **FAILED**. Not adding item.");
+                    logDebug("   Purchase data: " + purchaseData);
+                    logDebug("   Signature: " + signature);
+                    verificationFailed = true;
+                }
+            }
+
+            continueToken = ownedItems.getString(INAPP_CONTINUATION_TOKEN);
+            logDebug("Continuation token: " + continueToken);
+        } while (!TextUtils.isEmpty(continueToken));
+
+        return verificationFailed ? IABHELPER_VERIFICATION_FAILED : BILLING_RESPONSE_RESULT_OK;
+    }
+
+    int querySkuDetails(String itemType, Inventory inv, List<String> moreSkus)
+            throws RemoteException, JSONException {
+        logDebug("Querying SKU details.");
+        ArrayList<String> skuList = new ArrayList<String>();
+        skuList.addAll(inv.getAllOwnedSkus(itemType));
+        if (moreSkus != null) {
+            for (String sku : moreSkus) {
+                if (!skuList.contains(sku)) {
+                    skuList.add(sku);
+                }
+            }
+        }
+
+        if (skuList.size() == 0) {
+            logDebug("queryPrices: nothing to do because there are no SKUs.");
+            return BILLING_RESPONSE_RESULT_OK;
+        }
+
+        // Split the sku list in blocks of no more than 20 elements.
+        ArrayList<ArrayList<String>> packs = new ArrayList<ArrayList<String>>();
+        ArrayList<String> tempList;
+        int n = skuList.size() / 20;
+        int mod = skuList.size() % 20;
+        for (int i = 0; i < n; i++) {
+            tempList = new ArrayList<String>();
+            for (String s : skuList.subList(i * 20, i * 20 + 20)) {
+                tempList.add(s);
+            }
+            packs.add(tempList);
+        }
+        if (mod != 0) {
+            tempList = new ArrayList<String>();
+            for (String s : skuList.subList(n * 20, n * 20 + mod)) {
+                tempList.add(s);
+            }
+            packs.add(tempList);
+        }
+
+        for (ArrayList<String> skuPartList : packs) {
+            Bundle querySkus = new Bundle();
+            querySkus.putStringArrayList(GET_SKU_DETAILS_ITEM_LIST, skuPartList);
+            Bundle skuDetails = mService.getSkuDetails(3, mContext.getPackageName(),
+                    itemType, querySkus);
+
+            if (!skuDetails.containsKey(RESPONSE_GET_SKU_DETAILS_LIST)) {
+                int response = getResponseCodeFromBundle(skuDetails);
+                if (response != BILLING_RESPONSE_RESULT_OK) {
+                    logDebug("getSkuDetails() failed: " + getResponseDesc(response));
+                    return response;
+                } else {
+                    logError("getSkuDetails() returned a bundle with neither an error nor a detail list.");
+                    return IABHELPER_BAD_RESPONSE;
+                }
+            }
+
+            ArrayList<String> responseList = skuDetails.getStringArrayList(
+                    RESPONSE_GET_SKU_DETAILS_LIST);
+
+            for (String thisResponse : responseList) {
+                SkuDetails d = new SkuDetails(itemType, thisResponse);
+                logDebug("Got sku details: " + d);
+                inv.addSkuDetails(d);
+            }
+        }
+
+        return BILLING_RESPONSE_RESULT_OK;
+    }
+
+    void consumeAsyncInternal(final List<Purchase> purchases,
+                              final OnConsumeFinishedListener singleListener,
+                              final OnConsumeMultiFinishedListener multiListener)
+        throws IabAsyncInProgressException {
+        final Handler handler = new Handler();
+        flagStartAsync("consume");
+        (new Thread(new Runnable() {
+            public void run() {
+                final List<IabResult> results = new ArrayList<IabResult>();
+                for (Purchase purchase : purchases) {
+                    try {
+                        consume(purchase);
+                        results.add(new IabResult(BILLING_RESPONSE_RESULT_OK, "Successful consume of sku " + purchase.getSku()));
+                    }
+                    catch (IabException ex) {
+                        results.add(ex.getResult());
+                    }
+                }
+
+                flagEndAsync();
+                if (!mDisposed && singleListener != null) {
+                    handler.post(new Runnable() {
+                        public void run() {
+                            singleListener.onConsumeFinished(purchases.get(0), results.get(0));
+                        }
+                    });
+                }
+                if (!mDisposed && multiListener != null) {
+                    handler.post(new Runnable() {
+                        public void run() {
+                            multiListener.onConsumeMultiFinished(purchases, results);
+                        }
+                    });
+                }
+            }
+        })).start();
+    }
+
+    void logDebug(String msg) {
+        if (mDebugLog) Log.d(mDebugTag, msg);
+    }
+
+    void logError(String msg) {
+        Log.e(mDebugTag, "In-app billing error: " + msg);
+    }
+
+    void logWarn(String msg) {
+        Log.w(mDebugTag, "In-app billing warning: " + msg);
+    }
+
+    /**
+     * Callback for setup process. This listener's {@link #onIabSetupFinished} method is called
+     * when the setup process is complete.
+     */
+    public interface OnIabSetupFinishedListener {
+        /**
+         * Called to notify that setup is complete.
+         *
+         * @param result The result of the setup process.
+         */
+        void onIabSetupFinished(IabResult result);
+    }
+
+    /**
+     * Callback that notifies when a purchase is finished.
+     */
+    public interface OnIabPurchaseFinishedListener {
+        /**
+         * Called to notify that an in-app purchase finished. If the purchase was successful,
+         * then the sku parameter specifies which item was purchased. If the purchase failed,
+         * the sku and extraData parameters may or may not be null, depending on how far the purchase
+         * process went.
+         *
+         * @param result The result of the purchase.
+         * @param info The purchase information (null if purchase failed)
+         */
+        void onIabPurchaseFinished(IabResult result, Purchase info);
+    }
+
+    /**
+     * Listener that notifies when an inventory query operation completes.
+     */
+    public interface QueryInventoryFinishedListener {
+        /**
+         * Called to notify that an inventory query operation completed.
+         *
+         * @param result The result of the operation.
+         * @param inv The inventory.
+         */
+        void onQueryInventoryFinished(IabResult result, Inventory inv);
+    }
+
+    /**
+     * Callback that notifies when a consumption operation finishes.
+     */
+    public interface OnConsumeFinishedListener {
+        /**
+         * Called to notify that a consumption has finished.
+         *
+         * @param purchase The purchase that was (or was to be) consumed.
+         * @param result The result of the consumption operation.
+         */
+        void onConsumeFinished(Purchase purchase, IabResult result);
+    }
+
+    /**
+     * Callback that notifies when a multi-item consumption operation finishes.
+     */
+    public interface OnConsumeMultiFinishedListener {
+        /**
+         * Called to notify that a consumption of multiple items has finished.
+         *
+         * @param purchases The purchases that were (or were to be) consumed.
+         * @param results The results of each consumption operation, corresponding to each
+         *     sku.
+         */
+        void onConsumeMultiFinished(List<Purchase> purchases, List<IabResult> results);
+    }
+
+    /**
+     * Exception thrown when the requested operation cannot be started because an async operation
+     * is still in progress.
+     */
+    public static class IabAsyncInProgressException extends Exception {
+        public IabAsyncInProgressException(String message) {
+            super(message);
+        }
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/utils/iap/IabResult.java b/qpython/src/main/java/org/qpython/qpy/utils/iap/IabResult.java
new file mode 100644
index 00000000..3d149f20
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/utils/iap/IabResult.java
@@ -0,0 +1,45 @@
+/* Copyright (c) 2012 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.
+ */
+
+package org.qpython.qpy.utils.iap;
+
+/**
+ * Represents the result of an in-app billing operation.
+ * A result is composed of a response code (an integer) and possibly a
+ * message (String). You can get those by calling
+ * {@link #getResponse} and {@link #getMessage()}, respectively. You
+ * can also inquire whether a result is a success or a failure by
+ * calling {@link #isSuccess()} and {@link #isFailure()}.
+ */
+public class IabResult {
+    int mResponse;
+    String mMessage;
+
+    public IabResult(int response, String message) {
+        mResponse = response;
+        if (message == null || message.trim().length() == 0) {
+            mMessage = IabHelper.getResponseDesc(response);
+        }
+        else {
+            mMessage = message + " (response: " + IabHelper.getResponseDesc(response) + ")";
+        }
+    }
+    public int getResponse() { return mResponse; }
+    public String getMessage() { return mMessage; }
+    public boolean isSuccess() { return mResponse == IabHelper.BILLING_RESPONSE_RESULT_OK; }
+    public boolean isFailure() { return !isSuccess(); }
+    public String toString() { return "IabResult: " + getMessage(); }
+}
+
diff --git a/qpython/src/main/java/org/qpython/qpy/utils/iap/Inventory.java b/qpython/src/main/java/org/qpython/qpy/utils/iap/Inventory.java
new file mode 100644
index 00000000..456b600f
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/utils/iap/Inventory.java
@@ -0,0 +1,91 @@
+/* Copyright (c) 2012 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.
+ */
+
+package org.qpython.qpy.utils.iap;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Represents a block of information about in-app items.
+ * An Inventory is returned by such methods as {@link IabHelper#queryInventory}.
+ */
+public class Inventory {
+    Map<String,SkuDetails> mSkuMap = new HashMap<String,SkuDetails>();
+    Map<String,Purchase> mPurchaseMap = new HashMap<String,Purchase>();
+
+    Inventory() { }
+
+    /** Returns the listing details for an in-app product. */
+    public SkuDetails getSkuDetails(String sku) {
+        return mSkuMap.get(sku);
+    }
+
+    /** Returns purchase information for a given product, or null if there is no purchase. */
+    public Purchase getPurchase(String sku) {
+        return mPurchaseMap.get(sku);
+    }
+
+    /** Returns whether or not there exists a purchase of the given product. */
+    public boolean hasPurchase(String sku) {
+        return mPurchaseMap.containsKey(sku);
+    }
+
+    /** Return whether or not details about the given product are available. */
+    public boolean hasDetails(String sku) {
+        return mSkuMap.containsKey(sku);
+    }
+
+    /**
+     * Erase a purchase (locally) from the inventory, given its product ID. This just
+     * modifies the Inventory object locally and has no effect on the server! This is
+     * useful when you have an existing Inventory object which you know to be up to date,
+     * and you have just consumed an item successfully, which means that erasing its
+     * purchase data from the Inventory you already have is quicker than querying for
+     * a new Inventory.
+     */
+    public void erasePurchase(String sku) {
+        if (mPurchaseMap.containsKey(sku)) mPurchaseMap.remove(sku);
+    }
+
+    /** Returns a list of all owned product IDs. */
+    List<String> getAllOwnedSkus() {
+        return new ArrayList<String>(mPurchaseMap.keySet());
+    }
+
+    /** Returns a list of all owned product IDs of a given type */
+    List<String> getAllOwnedSkus(String itemType) {
+        List<String> result = new ArrayList<String>();
+        for (Purchase p : mPurchaseMap.values()) {
+            if (p.getItemType().equals(itemType)) result.add(p.getSku());
+        }
+        return result;
+    }
+
+    /** Returns a list of all purchases. */
+    List<Purchase> getAllPurchases() {
+        return new ArrayList<Purchase>(mPurchaseMap.values());
+    }
+
+    void addSkuDetails(SkuDetails d) {
+        mSkuMap.put(d.getSku(), d);
+    }
+
+    void addPurchase(Purchase p) {
+        mPurchaseMap.put(p.getSku(), p);
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/utils/iap/Purchase.java b/qpython/src/main/java/org/qpython/qpy/utils/iap/Purchase.java
new file mode 100644
index 00000000..5eb9c822
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/utils/iap/Purchase.java
@@ -0,0 +1,66 @@
+/* Copyright (c) 2012 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.
+ */
+
+package org.qpython.qpy.utils.iap;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+/**
+ * Represents an in-app billing purchase.
+ */
+public class Purchase {
+    String mItemType;  // ITEM_TYPE_INAPP or ITEM_TYPE_SUBS
+    String mOrderId;
+    String mPackageName;
+    String mSku;
+    long mPurchaseTime;
+    int mPurchaseState;
+    String mDeveloperPayload;
+    String mToken;
+    String mOriginalJson;
+    String mSignature;
+    boolean mIsAutoRenewing;
+
+    public Purchase(String itemType, String jsonPurchaseInfo, String signature) throws JSONException {
+        mItemType = itemType;
+        mOriginalJson = jsonPurchaseInfo;
+        JSONObject o = new JSONObject(mOriginalJson);
+        mOrderId = o.optString("orderId");
+        mPackageName = o.optString("packageName");
+        mSku = o.optString("productId");
+        mPurchaseTime = o.optLong("purchaseTime");
+        mPurchaseState = o.optInt("purchaseState");
+        mDeveloperPayload = o.optString("developerPayload");
+        mToken = o.optString("token", o.optString("purchaseToken"));
+        mIsAutoRenewing = o.optBoolean("autoRenewing");
+        mSignature = signature;
+    }
+
+    public String getItemType() { return mItemType; }
+    public String getOrderId() { return mOrderId; }
+    public String getPackageName() { return mPackageName; }
+    public String getSku() { return mSku; }
+    public long getPurchaseTime() { return mPurchaseTime; }
+    public int getPurchaseState() { return mPurchaseState; }
+    public String getDeveloperPayload() { return mDeveloperPayload; }
+    public String getToken() { return mToken; }
+    public String getOriginalJson() { return mOriginalJson; }
+    public String getSignature() { return mSignature; }
+    public boolean isAutoRenewing() { return mIsAutoRenewing; }
+
+    @Override
+    public String toString() { return "PurchaseInfo(type:" + mItemType + "):" + mOriginalJson; }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/utils/iap/Security.java b/qpython/src/main/java/org/qpython/qpy/utils/iap/Security.java
new file mode 100644
index 00000000..bff24e9c
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/utils/iap/Security.java
@@ -0,0 +1,121 @@
+/* Copyright (c) 2012 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.
+ */
+
+package org.qpython.qpy.utils.iap;
+
+import android.text.TextUtils;
+import android.util.Base64;
+import android.util.Log;
+
+import java.security.InvalidKeyException;
+import java.security.KeyFactory;
+import java.security.NoSuchAlgorithmException;
+import java.security.PublicKey;
+import java.security.Signature;
+import java.security.SignatureException;
+import java.security.spec.InvalidKeySpecException;
+import java.security.spec.X509EncodedKeySpec;
+
+/**
+ * Security-related methods. For a secure implementation, all of this code
+ * should be implemented on a server that communicates with the
+ * application on the device. For the sake of simplicity and clarity of this
+ * example, this code is included here and is executed on the device. If you
+ * must verify the purchases on the phone, you should obfuscate this code to
+ * make it harder for an attacker to replace the code with stubs that treat all
+ * purchases as verified.
+ */
+public class Security {
+    private static final String TAG = "IABUtil/Security";
+
+    private static final String KEY_FACTORY_ALGORITHM = "RSA";
+    private static final String SIGNATURE_ALGORITHM = "SHA1withRSA";
+
+    /**
+     * Verifies that the data was signed with the given signature, and returns
+     * the verified purchase. The data is in JSON format and signed
+     * with a private key. The data also contains the {@link PurchaseState}
+     * and product ID of the purchase.
+     * @param base64PublicKey the base64-encoded public key to use for verifying.
+     * @param signedData the signed JSON string (signed, not encrypted)
+     * @param signature the signature for the data, signed with the private key
+     */
+    public static boolean verifyPurchase(String base64PublicKey, String signedData, String signature) {
+        if (TextUtils.isEmpty(signedData) || TextUtils.isEmpty(base64PublicKey) ||
+                TextUtils.isEmpty(signature)) {
+            Log.e(TAG, "Purchase verification failed: missing data.");
+            return false;
+        }
+
+        PublicKey key = Security.generatePublicKey(base64PublicKey);
+        return Security.verify(key, signedData, signature);
+    }
+
+    /**
+     * Generates a PublicKey instance from a string containing the
+     * Base64-encoded public key.
+     *
+     * @param encodedPublicKey Base64-encoded public key
+     * @throws IllegalArgumentException if encodedPublicKey is invalid
+     */
+    public static PublicKey generatePublicKey(String encodedPublicKey) {
+        try {
+            byte[] decodedKey = Base64.decode(encodedPublicKey, Base64.DEFAULT);
+            KeyFactory keyFactory = KeyFactory.getInstance(KEY_FACTORY_ALGORITHM);
+            return keyFactory.generatePublic(new X509EncodedKeySpec(decodedKey));
+        } catch (NoSuchAlgorithmException e) {
+            throw new RuntimeException(e);
+        } catch (InvalidKeySpecException e) {
+            Log.e(TAG, "Invalid key specification.");
+            throw new IllegalArgumentException(e);
+        }
+    }
+
+    /**
+     * Verifies that the signature from the server matches the computed
+     * signature on the data.  Returns true if the data is correctly signed.
+     *
+     * @param publicKey public key associated with the developer account
+     * @param signedData signed data from server
+     * @param signature server signature
+     * @return true if the data and signature match
+     */
+    public static boolean verify(PublicKey publicKey, String signedData, String signature) {
+        byte[] signatureBytes;
+        try {
+            signatureBytes = Base64.decode(signature, Base64.DEFAULT);
+        } catch (IllegalArgumentException e) {
+            Log.e(TAG, "Base64 decoding failed.");
+            return false;
+        }
+        try {
+            Signature sig = Signature.getInstance(SIGNATURE_ALGORITHM);
+            sig.initVerify(publicKey);
+            sig.update(signedData.getBytes());
+            if (!sig.verify(signatureBytes)) {
+                Log.e(TAG, "Signature verification failed.");
+                return false;
+            }
+            return true;
+        } catch (NoSuchAlgorithmException e) {
+            Log.e(TAG, "NoSuchAlgorithmException.");
+        } catch (InvalidKeyException e) {
+            Log.e(TAG, "Invalid key specification.");
+        } catch (SignatureException e) {
+            Log.e(TAG, "Signature exception.");
+        }
+        return false;
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpy/utils/iap/SkuDetails.java b/qpython/src/main/java/org/qpython/qpy/utils/iap/SkuDetails.java
new file mode 100644
index 00000000..b48817e8
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpy/utils/iap/SkuDetails.java
@@ -0,0 +1,64 @@
+/* Copyright (c) 2012 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.
+ */
+
+package org.qpython.qpy.utils.iap;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+/**
+ * Represents an in-app product's listing details.
+ */
+public class SkuDetails {
+    private final String mItemType;
+    private final String mSku;
+    private final String mType;
+    private final String mPrice;
+    private final long mPriceAmountMicros;
+    private final String mPriceCurrencyCode;
+    private final String mTitle;
+    private final String mDescription;
+    private final String mJson;
+
+    public SkuDetails(String jsonSkuDetails) throws JSONException {
+        this(IabHelper.ITEM_TYPE_INAPP, jsonSkuDetails);
+    }
+
+    public SkuDetails(String itemType, String jsonSkuDetails) throws JSONException {
+        mItemType = itemType;
+        mJson = jsonSkuDetails;
+        JSONObject o = new JSONObject(mJson);
+        mSku = o.optString("productId");
+        mType = o.optString("type");
+        mPrice = o.optString("price");
+        mPriceAmountMicros = o.optLong("price_amount_micros");
+        mPriceCurrencyCode = o.optString("price_currency_code");
+        mTitle = o.optString("title");
+        mDescription = o.optString("description");
+    }
+
+    public String getSku() { return mSku; }
+    public String getType() { return mType; }
+    public String getPrice() { return mPrice; }
+    public long getPriceAmountMicros() { return mPriceAmountMicros; }
+    public String getPriceCurrencyCode() { return mPriceCurrencyCode; }
+    public String getTitle() { return mTitle; }
+    public String getDescription() { return mDescription; }
+
+    @Override
+    public String toString() {
+        return "SkuDetails:" + mJson;
+    }
+}
diff --git a/qpython/src/main/java/org/qpython/qpylib/MPyApi.java b/qpython/src/main/java/org/qpython/qpylib/MPyApi.java
new file mode 100644
index 00000000..c814676e
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpylib/MPyApi.java
@@ -0,0 +1,288 @@
+package org.qpython.qpylib;
+
+//package org.qpython.qpylib;
+//
+
+import android.app.NotificationManager;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.ServiceConnection;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.Environment;
+import android.os.Handler;
+import android.os.IBinder;
+import android.os.Message;
+import android.util.Log;
+import android.view.Window;
+
+import com.quseit.base.QBaseApp;
+
+import org.qpython.qpy.console.ScriptExec;
+
+import com.quseit.util.FileHelper;
+import com.quseit.util.NAction;
+import com.quseit.util.NUtil;
+
+import org.qpython.qpy.main.activity.BaseActivity;
+import org.qpython.qpysdk.QPyConstants;
+
+import java.io.File;
+
+public class MPyApi extends BaseActivity {
+    public static final    int    SleepFinish = 1;
+    protected static final String TAG         = "mpyapi";
+    protected String param;
+    protected String flag    = "";
+    protected int    runMode = 0;
+    Handler myHandler = new Handler() {
+        public void handleMessage(Message msg) {
+
+            if (msg.what == SleepFinish) {
+                finish();
+            }
+            super.handleMessage(msg);
+        }
+    };
+    private boolean           live       = false;
+    private String            logF       = QPyConstants.ABSOLUTE_LOG;
+    private Handler           handler    = new Handler() {
+        @Override
+        public void handleMessage(Message msg) {
+            Log.d(TAG, "process");
+            process();
+        }
+    };
+    @SuppressWarnings("unused")
+    private ServiceConnection connection = new ServiceConnection() {
+        @Override
+        public void onServiceConnected(ComponentName name, IBinder service) {
+            //if (!BASE_CONF.DEBUG)
+            Log.d(TAG, "onServiceConnected");
+            //binded = true;
+            handler.postDelayed(new Runnable() {
+
+                @Override
+                public void run() {
+                    handler.sendEmptyMessage(0);
+                }
+
+            }, 202);
+        }
+
+        @Override
+        public void onServiceDisconnected(ComponentName name) {
+            //if (!BASE_CONF.DEBUG)
+            Log.d(TAG, "onServiceDisconnected");
+            //binded = false;
+        }
+    };
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        requestWindowFeature(Window.FEATURE_NO_TITLE);
+
+        IntentFilter filter = new IntentFilter(".MPyApi");
+//        registerReceiver(mReceiver, filter);
+
+        if (!NUtil.isRunning(getApplicationContext(), "org.qpython.qsl4a.QPyScriptService")) {
+            Intent intent = new Intent();
+            intent.setClassName(this, "org.qpython.sl4alib.QPyScriptService");
+            startService(intent);
+        }
+
+        process();
+    }
+
+    private void process() {
+        Intent intent = this.getIntent();
+        String action = intent.getAction();
+        String xtype = intent.getType();
+
+        if (Intent.ACTION_SEND.equals(action) && xtype != null) {
+            if ("text/plain".equals(xtype)) {
+                handleSendText(intent);
+            } else if (xtype.startsWith("image/")) {
+                handleSendImage(intent);
+            }
+        } else if (Intent.ACTION_VIEW.equals(action)) {
+            handleSendUrl(intent);
+        } else {
+            Bundle bundle = intent.getExtras();
+            String param0 = intent.getStringExtra(QPyConstants.EXTRA_CONTENT_URL0);
+            if (param0 != null && param0.equals("shortcut")) {
+                String type = intent.getStringExtra(QPyConstants.EXTRA_CONTENT_URL1);
+                String path = intent.getStringExtra(QPyConstants.EXTRA_CONTENT_URL2);
+                if (type.equals("script")) {
+                    ScriptExec.getInstance().playScript(this,path, null, true);
+                } else if (type.equals("project")) {
+                    ScriptExec.getInstance().playProject(this,path, false);
+                }
+
+            } else if (bundle != null) {
+                String act = bundle.getString("act");
+                if (act != null) {
+                    if (act.equals("onPyApi")) {//
+                        String pycode = bundle.getString("pycode");
+                        String pyfile = bundle.getString("pyfile");
+                        param = bundle.getString("param");
+                        if (param != null && param.equals("fileapi")) {
+                            runMode = 2;
+                            ScriptExec.getInstance().playScript(this,pyfile, null, false);
+                        } else {
+                            // Compatibility Mode
+                            if (pycode.contains("#qpy:console\n") || NAction.isQPy3(getApplicationContext())) {
+                                runMode = 3;
+                            } else {
+                                runMode = 1;
+                            }
+                            String script = QPyConstants.ABSOLUTE_PATH + "/cache/last.py";
+                            FileHelper.putFileContents(this, script, pycode);
+                            ScriptExec.getInstance().playScript(this,script, null, false);
+                        }
+                    }
+                }
+            }
+        }
+        new SleepThread().start();
+    }
+
+    void handleSendUrl(Intent intent) {
+        Uri myURI = intent.getData();
+
+        if (myURI != null) {
+            String script = getApplicationContext().getFilesDir() + "/bin/share.py";
+            String param = myURI.toString();
+            ScriptExec.getInstance().playQScript(this,script, param, false);
+        }
+    }
+
+    void handleSendText(Intent intent) {
+        String sharedText = intent.getStringExtra(Intent.EXTRA_TEXT);
+        if (sharedText != null) {
+            //Toast.makeText(this,"sharedText:"+sharedText, Toast.LENGTH_SHORT).show();
+            //onMenu();
+            String script = getApplicationContext().getFilesDir() + "/bin/share.py";
+            String param = sharedText;
+            //new QPyTask().execute(script, param);
+            ScriptExec.getInstance().playQScript(this,script, param, false);
+
+            // Update UI to reflect text being shared
+        }
+    }
+
+    void handleSendImage(Intent intent) {
+        Uri imageUri = (Uri) intent.getParcelableExtra(Intent.EXTRA_STREAM);
+        if (imageUri != null) {
+            //onMenu();
+            ScriptExec.getInstance().playQScript(this, getApplicationContext().getFilesDir() + "/bin/share.py", imageUri.toString(), false);
+
+            // Update UI to reflect image being shared
+        }
+    }
+
+    @Override
+    public void onDestroy() {
+        Log.d(TAG, "onDestroy");
+        onAPIEnd();
+        super.onDestroy();
+    }
+
+    @Override
+    public void onResume() {
+        Log.d(TAG, "onResume");
+        //onAPIEnd();
+        onAPIEnd();
+        super.onResume();
+
+        Intent intent = this.getIntent();
+        String param0 = intent.getStringExtra(QPyConstants.EXTRA_CONTENT_URL0);
+        if (param0 != null && param0.equals("shortcut")) {
+
+            finish();
+
+        } else {
+//    		viewLog();
+            new SleepThread().start();
+
+
+        }
+        //flag = "end";
+    }
+
+    @SuppressWarnings("deprecation")
+    protected void onAPIEnd() {
+
+        if (!live) {
+            Intent rIntent = new Intent();
+            Bundle rBundle = new Bundle();
+
+            if (flag.equals("qedit")) {
+
+                if (param != null && !param.equals("")) {
+
+                } else {
+                    try {
+                        String root = QBaseApp.getInstance().getOrCreateRoot(QPyConstants.DFROM_RUN);
+                        File f = new File(root, ".last_tmp.py");
+                        param = f.getAbsolutePath().toString();
+                    } catch (Exception e) {
+                        e.printStackTrace();
+
+                    }
+                }
+
+            }
+
+            String result = FileHelper.getFileContents(logF);
+
+            rBundle.putString("result", result);
+            rBundle.putString("param", param);
+            rBundle.putString("flag", flag);
+            rBundle.putString("log", QPyConstants.ABSOLUTE_LOG);
+
+            rIntent.putExtras(rBundle);
+
+            //NotificationManager notificationManager = (NotificationManager)this.getSystemService(Context.NOTIFICATION_SERVICE);
+            //notificationManager.cancel(1000);
+            //LogUtil.d(TAG, "onAPIEnd:"+logF);
+
+            File logFile = new File(logF);
+
+            if (logFile.exists()) {
+                live = true;
+
+                NotificationManager notificationManager = (NotificationManager) this.getSystemService(Context.NOTIFICATION_SERVICE);
+
+                MPyApi.this.setResult(RESULT_OK, rIntent);
+                MPyApi.this.finish();
+
+            } else {
+                if (runMode == 3) { // console 模式
+                    MPyApi.this.setResult(RESULT_OK, rIntent);
+                    MPyApi.this.finish();
+                }
+
+            }
+        }
+    }
+
+    class SleepThread extends Thread implements Runnable {
+
+        @Override
+        public void run() {
+            try {
+                sleep(3000);
+            } catch (InterruptedException e) {
+                // TODO Auto-generated catch block
+                e.printStackTrace();
+            }
+            Message msg = new Message();
+            msg.what = SleepFinish;
+            MPyApi.this.myHandler.sendMessage(msg);
+        }
+    }
+}
\ No newline at end of file
diff --git a/qpython/src/main/java/org/qpython/qpylib/MPyService.java b/qpython/src/main/java/org/qpython/qpylib/MPyService.java
new file mode 100644
index 00000000..d0b6dc58
--- /dev/null
+++ b/qpython/src/main/java/org/qpython/qpylib/MPyService.java
@@ -0,0 +1,128 @@
+package org.qpython.qpylib;
+
+import android.app.Service;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.IBinder;
+import android.support.annotation.Nullable;
+
+import com.quseit.util.FileHelper;
+import com.quseit.util.NAction;
+import com.quseit.util.NUtil;
+
+import org.qpython.qpy.console.ScriptExec;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpysdk.QPyConstants;
+
+public class MPyService extends Service {
+    protected static final String TAG = "mpyapi";
+    protected String param;
+    protected String flag    = "";
+    protected int    runMode = 0;
+
+    @Override
+    public void onCreate() {
+        if (!NUtil.isRunning(getApplicationContext(), "org.qpython.qsl4a.QPyScriptService")) {
+            Intent intent = new Intent();
+            intent.setClassName(this, "org.qpython.sl4alib.QPyScriptService");
+            startService(intent);
+        }
+    }
+
+
+    private void process(Intent intent) {
+        String action = intent.getAction();
+        String xtype = intent.getType();
+
+
+        if (Intent.ACTION_SEND.equals(action) && xtype != null) {
+            if ("text/plain".equals(xtype)) {
+                handleSendText(intent);
+            } else if (xtype.startsWith("image/")) {
+                handleSendImage(intent);
+            }
+        } else if (Intent.ACTION_VIEW.equals(action)) {
+            handleSendUrl(intent);
+        } else {
+
+            Bundle bundle = intent.getExtras();
+            String param0 = intent.getStringExtra(QPyConstants.EXTRA_CONTENT_URL0);
+            if (param0 != null && param0.equals("shortcut")) {
+
+                String type = intent.getStringExtra(QPyConstants.EXTRA_CONTENT_URL1);
+                String path = intent.getStringExtra(QPyConstants.EXTRA_CONTENT_URL2);
+                if (type.equals("script")) {
+                    ScriptExec.getInstance().playScript(MPyService.this, path, null, true);
+
+                } else if (type.equals("project")) {
+                    ScriptExec.getInstance().playProject(MPyService.this, path, false);
+                }
+
+            } else if (bundle != null) {
+                String act = bundle.getString("act");
+                if (act != null) {
+                    if (act.equals("onPyApi")) {//
+                        String pycode = bundle.getString("pycode");
+                        String pyfile = bundle.getString("pyfile");
+                        param = bundle.getString("param");
+
+                        if (param != null && param.equals("fileapi")) {
+                            runMode = 2;
+
+                            ScriptExec.getInstance().playScript(MPyService.this, pyfile, null, false);
+
+                        } else {
+                            // Compatibility Mode
+                            if (pycode != null && pycode.contains("#qpy:console\n") || NAction.isQPy3(getApplicationContext())) {
+                                runMode = 3;
+                            } else {
+                                runMode = 1;
+                            }
+                            String script = QPyConstants.ABSOLUTE_PATH + "/cache/last.py";
+                            FileHelper.putFileContents(this, script, pycode);
+                            ScriptExec.getInstance().playScript(MPyService.this, script, null, false);
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    void handleSendUrl(Intent intent) {
+        Uri myURI = intent.getData();
+        if (myURI != null) {
+            String script = getApplicationContext().getFilesDir() + "/bin/share.py";
+            String param = myURI.toString();
+            ScriptExec.getInstance().playScript(MPyService.this, script, param, false);
+        }
+    }
+
+    void handleSendText(Intent intent) {
+        String sharedText = intent.getStringExtra(Intent.EXTRA_TEXT);
+        if (sharedText != null) {
+            String script = getApplicationContext().getFilesDir() + "/bin/share.py";
+            ScriptExec.getInstance().playScript(MPyService.this, script, sharedText, false);
+        }
+    }
+
+    void handleSendImage(Intent intent) {
+        Uri imageUri = intent.getParcelableExtra(Intent.EXTRA_STREAM);
+        if (imageUri != null) {
+            ScriptExec.getInstance().playQScript(MPyService.this, getApplicationContext().getFilesDir() + "/bin/share.py", imageUri.toString(), false);
+        }
+    }
+
+    @Nullable
+    @Override
+    public IBinder onBind(Intent intent) {
+        return null;
+    }
+
+    @Override
+    public int onStartCommand(Intent intent, int flags, int startId) {
+        process(intent);
+        return super.onStartCommand(intent, flags, startId);
+    }
+
+}
\ No newline at end of file
diff --git a/qpython/src/main/res/anim/fade_in.xml b/qpython/src/main/res/anim/fade_in.xml
new file mode 100644
index 00000000..6243b9b6
--- /dev/null
+++ b/qpython/src/main/res/anim/fade_in.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<alpha xmlns:android="http://schemas.android.com/apk/res/android"
+       android:duration="300"
+       android:fromAlpha="0.0" android:interpolator="@android:anim/accelerate_interpolator"
+       android:toAlpha="1.0" />
\ No newline at end of file
diff --git a/qpython/src/main/res/anim/fade_out.xml b/qpython/src/main/res/anim/fade_out.xml
new file mode 100644
index 00000000..b3cebea4
--- /dev/null
+++ b/qpython/src/main/res/anim/fade_out.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<alpha xmlns:android="http://schemas.android.com/apk/res/android"
+       android:duration="300"
+       android:fillAfter="true" android:fromAlpha="1.0"
+       android:interpolator="@android:anim/accelerate_interpolator"
+       android:toAlpha="0.0" />
\ No newline at end of file
diff --git a/qpython/src/main/res/anim/slide_down.xml b/qpython/src/main/res/anim/slide_down.xml
new file mode 100644
index 00000000..cf513c7e
--- /dev/null
+++ b/qpython/src/main/res/anim/slide_down.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate
+        android:duration="@android:integer/config_mediumAnimTime"
+        android:fromYDelta="0%p"
+        android:interpolator="@android:anim/accelerate_interpolator"
+        android:toYDelta="100%p">
+    </translate>
+</set>
\ No newline at end of file
diff --git a/qpython/src/main/res/anim/slide_in_bottom.xml b/qpython/src/main/res/anim/slide_in_bottom.xml
new file mode 100644
index 00000000..32e3dcc7
--- /dev/null
+++ b/qpython/src/main/res/anim/slide_in_bottom.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate
+        android:fromYDelta="100%p"
+        android:toYDelta="0.0"
+        android:duration="200"
+        />
+</set>
\ No newline at end of file
diff --git a/qpython/src/main/res/anim/slide_out_bottom.xml b/qpython/src/main/res/anim/slide_out_bottom.xml
new file mode 100644
index 00000000..072ab3d8
--- /dev/null
+++ b/qpython/src/main/res/anim/slide_out_bottom.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate
+        android:fromYDelta="0.0"
+        android:toYDelta="100%p"
+        android:duration="200"
+        />
+</set>
\ No newline at end of file
diff --git a/qpython/src/main/res/anim/slide_up.xml b/qpython/src/main/res/anim/slide_up.xml
new file mode 100644
index 00000000..c8e8c99c
--- /dev/null
+++ b/qpython/src/main/res/anim/slide_up.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate
+        android:duration="@android:integer/config_mediumAnimTime"
+        android:fromYDelta="100%"
+        android:interpolator="@android:anim/accelerate_interpolator"
+        android:toXDelta="0">
+    </translate>
+</set>
\ No newline at end of file
diff --git a/qpython/src/main/res/drawable-hdpi-v11/ic_menu_add.png b/qpython/src/main/res/drawable-hdpi-v11/ic_menu_add.png
deleted file mode 100644
index 444e8a5e..00000000
Binary files a/qpython/src/main/res/drawable-hdpi-v11/ic_menu_add.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-hdpi-v11/ic_menu_back.png b/qpython/src/main/res/drawable-hdpi-v11/ic_menu_back.png
deleted file mode 100644
index 661a4ae9..00000000
Binary files a/qpython/src/main/res/drawable-hdpi-v11/ic_menu_back.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-hdpi-v11/ic_menu_close_clear_cancel.png b/qpython/src/main/res/drawable-hdpi-v11/ic_menu_close_clear_cancel.png
deleted file mode 100644
index 778c7f08..00000000
Binary files a/qpython/src/main/res/drawable-hdpi-v11/ic_menu_close_clear_cancel.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-hdpi-v11/ic_menu_forward.png b/qpython/src/main/res/drawable-hdpi-v11/ic_menu_forward.png
deleted file mode 100644
index b1b0c89d..00000000
Binary files a/qpython/src/main/res/drawable-hdpi-v11/ic_menu_forward.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-hdpi-v11/ic_stat_service_notification_icon.png b/qpython/src/main/res/drawable-hdpi-v11/ic_stat_service_notification_icon.png
deleted file mode 100644
index 17a215b0..00000000
Binary files a/qpython/src/main/res/drawable-hdpi-v11/ic_stat_service_notification_icon.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-hdpi/checkbox_checked.png b/qpython/src/main/res/drawable-hdpi/checkbox_checked.png
deleted file mode 100644
index 52bb32b8..00000000
Binary files a/qpython/src/main/res/drawable-hdpi/checkbox_checked.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-hdpi/checkbox_normal.png b/qpython/src/main/res/drawable-hdpi/checkbox_normal.png
deleted file mode 100644
index 88cf6027..00000000
Binary files a/qpython/src/main/res/drawable-hdpi/checkbox_normal.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-hdpi/ic_arrow_drop_down_circle_white_24dp.png b/qpython/src/main/res/drawable-hdpi/ic_arrow_drop_down_circle_white_24dp.png
deleted file mode 100644
index 4634f93f..00000000
Binary files a/qpython/src/main/res/drawable-hdpi/ic_arrow_drop_down_circle_white_24dp.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-hdpi/ic_cancel_white_24dp.png b/qpython/src/main/res/drawable-hdpi/ic_cancel_white_24dp.png
deleted file mode 100644
index 73f5116b..00000000
Binary files a/qpython/src/main/res/drawable-hdpi/ic_cancel_white_24dp.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-hdpi/ic_console_normal.png b/qpython/src/main/res/drawable-hdpi/ic_console_normal.png
deleted file mode 100644
index 80fa4bf6..00000000
Binary files a/qpython/src/main/res/drawable-hdpi/ic_console_normal.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-hdpi/ic_console_pressed.png b/qpython/src/main/res/drawable-hdpi/ic_console_pressed.png
deleted file mode 100644
index e39ca76a..00000000
Binary files a/qpython/src/main/res/drawable-hdpi/ic_console_pressed.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-hdpi/ic_document.png b/qpython/src/main/res/drawable-hdpi/ic_document.png
deleted file mode 100644
index 4b2f26f6..00000000
Binary files a/qpython/src/main/res/drawable-hdpi/ic_document.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-hdpi/ic_drawer_raw.png b/qpython/src/main/res/drawable-hdpi/ic_drawer_raw.png
deleted file mode 100644
index dde49488..00000000
Binary files a/qpython/src/main/res/drawable-hdpi/ic_drawer_raw.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-hdpi/ic_editor_normal.png b/qpython/src/main/res/drawable-hdpi/ic_editor_normal.png
deleted file mode 100644
index 36919db3..00000000
Binary files a/qpython/src/main/res/drawable-hdpi/ic_editor_normal.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-hdpi/ic_editor_pressed.png b/qpython/src/main/res/drawable-hdpi/ic_editor_pressed.png
deleted file mode 100644
index b81eca3d..00000000
Binary files a/qpython/src/main/res/drawable-hdpi/ic_editor_pressed.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-hdpi/ic_file_back.png b/qpython/src/main/res/drawable-hdpi/ic_file_back.png
deleted file mode 100644
index 9fc66b8e..00000000
Binary files a/qpython/src/main/res/drawable-hdpi/ic_file_back.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-hdpi/ic_file_dir.png b/qpython/src/main/res/drawable-hdpi/ic_file_dir.png
deleted file mode 100644
index 03f88a41..00000000
Binary files a/qpython/src/main/res/drawable-hdpi/ic_file_dir.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-hdpi/ic_file_download_black.png b/qpython/src/main/res/drawable-hdpi/ic_file_download_black.png
deleted file mode 100644
index d9aacea4..00000000
Binary files a/qpython/src/main/res/drawable-hdpi/ic_file_download_black.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-hdpi/ic_folder.png b/qpython/src/main/res/drawable-hdpi/ic_folder.png
deleted file mode 100644
index 13016013..00000000
Binary files a/qpython/src/main/res/drawable-hdpi/ic_folder.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-hdpi/ic_folderup.png b/qpython/src/main/res/drawable-hdpi/ic_folderup.png
deleted file mode 100644
index d9f53d46..00000000
Binary files a/qpython/src/main/res/drawable-hdpi/ic_folderup.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-hdpi/ic_forum.png b/qpython/src/main/res/drawable-hdpi/ic_forum.png
deleted file mode 100644
index a63ef77d..00000000
Binary files a/qpython/src/main/res/drawable-hdpi/ic_forum.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-hdpi/ic_install.png b/qpython/src/main/res/drawable-hdpi/ic_install.png
deleted file mode 100644
index fad92ee8..00000000
Binary files a/qpython/src/main/res/drawable-hdpi/ic_install.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-hdpi/ic_launcher.png b/qpython/src/main/res/drawable-hdpi/ic_launcher.png
index 4d8141fb..917e7d2c 100644
Binary files a/qpython/src/main/res/drawable-hdpi/ic_launcher.png and b/qpython/src/main/res/drawable-hdpi/ic_launcher.png differ
diff --git a/qpython/src/main/res/drawable-hdpi/ic_libraries_normal.png b/qpython/src/main/res/drawable-hdpi/ic_libraries_normal.png
deleted file mode 100644
index d8b49683..00000000
Binary files a/qpython/src/main/res/drawable-hdpi/ic_libraries_normal.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-hdpi/ic_libraries_pressed.png b/qpython/src/main/res/drawable-hdpi/ic_libraries_pressed.png
deleted file mode 100644
index 98a60836..00000000
Binary files a/qpython/src/main/res/drawable-hdpi/ic_libraries_pressed.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-hdpi/ic_logo_button_normal.png b/qpython/src/main/res/drawable-hdpi/ic_logo_button_normal.png
deleted file mode 100644
index 61e525c4..00000000
Binary files a/qpython/src/main/res/drawable-hdpi/ic_logo_button_normal.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-hdpi/ic_logo_button_pressed.png b/qpython/src/main/res/drawable-hdpi/ic_logo_button_pressed.png
deleted file mode 100644
index f310b3e0..00000000
Binary files a/qpython/src/main/res/drawable-hdpi/ic_logo_button_pressed.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-hdpi/ic_menu_add.png b/qpython/src/main/res/drawable-hdpi/ic_menu_add.png
deleted file mode 100644
index 57a4099b..00000000
Binary files a/qpython/src/main/res/drawable-hdpi/ic_menu_add.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-hdpi/ic_menu_back.png b/qpython/src/main/res/drawable-hdpi/ic_menu_back.png
deleted file mode 100644
index 91fa3e74..00000000
Binary files a/qpython/src/main/res/drawable-hdpi/ic_menu_back.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-hdpi/ic_menu_close_clear_cancel.png b/qpython/src/main/res/drawable-hdpi/ic_menu_close_clear_cancel.png
deleted file mode 100644
index 04a76b58..00000000
Binary files a/qpython/src/main/res/drawable-hdpi/ic_menu_close_clear_cancel.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-hdpi/ic_menu_forward.png b/qpython/src/main/res/drawable-hdpi/ic_menu_forward.png
deleted file mode 100644
index 632e4f6d..00000000
Binary files a/qpython/src/main/res/drawable-hdpi/ic_menu_forward.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-hdpi/ic_menu_preferences.png b/qpython/src/main/res/drawable-hdpi/ic_menu_preferences.png
deleted file mode 100644
index 2f34c769..00000000
Binary files a/qpython/src/main/res/drawable-hdpi/ic_menu_preferences.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-hdpi/ic_more.png b/qpython/src/main/res/drawable-hdpi/ic_more.png
deleted file mode 100644
index 25cae5a9..00000000
Binary files a/qpython/src/main/res/drawable-hdpi/ic_more.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-hdpi/ic_my_qpy_normal.png b/qpython/src/main/res/drawable-hdpi/ic_my_qpy_normal.png
deleted file mode 100644
index 567f1d61..00000000
Binary files a/qpython/src/main/res/drawable-hdpi/ic_my_qpy_normal.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-hdpi/ic_my_qpy_pressed.png b/qpython/src/main/res/drawable-hdpi/ic_my_qpy_pressed.png
deleted file mode 100644
index 410ccd41..00000000
Binary files a/qpython/src/main/res/drawable-hdpi/ic_my_qpy_pressed.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-hdpi/ic_open_in_browser.png b/qpython/src/main/res/drawable-hdpi/ic_open_in_browser.png
deleted file mode 100644
index 90e5f3cb..00000000
Binary files a/qpython/src/main/res/drawable-hdpi/ic_open_in_browser.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-hdpi/ic_plugin.png b/qpython/src/main/res/drawable-hdpi/ic_plugin.png
deleted file mode 100644
index faaef54a..00000000
Binary files a/qpython/src/main/res/drawable-hdpi/ic_plugin.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-hdpi/ic_plugin_blue.png b/qpython/src/main/res/drawable-hdpi/ic_plugin_blue.png
deleted file mode 100644
index dd53e788..00000000
Binary files a/qpython/src/main/res/drawable-hdpi/ic_plugin_blue.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-hdpi/ic_project_console.png b/qpython/src/main/res/drawable-hdpi/ic_project_console.png
deleted file mode 100644
index 46fe4b5e..00000000
Binary files a/qpython/src/main/res/drawable-hdpi/ic_project_console.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-hdpi/ic_project_kivyapp.png b/qpython/src/main/res/drawable-hdpi/ic_project_kivyapp.png
deleted file mode 100644
index bb1e32a1..00000000
Binary files a/qpython/src/main/res/drawable-hdpi/ic_project_kivyapp.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-hdpi/ic_project_qscript.png b/qpython/src/main/res/drawable-hdpi/ic_project_qscript.png
deleted file mode 100644
index 05a88795..00000000
Binary files a/qpython/src/main/res/drawable-hdpi/ic_project_qscript.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-hdpi/ic_project_webapp.png b/qpython/src/main/res/drawable-hdpi/ic_project_webapp.png
deleted file mode 100644
index 55ce9484..00000000
Binary files a/qpython/src/main/res/drawable-hdpi/ic_project_webapp.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-hdpi/ic_right_menu.png b/qpython/src/main/res/drawable-hdpi/ic_right_menu.png
deleted file mode 100644
index b159da40..00000000
Binary files a/qpython/src/main/res/drawable-hdpi/ic_right_menu.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-hdpi/ic_script_console.png b/qpython/src/main/res/drawable-hdpi/ic_script_console.png
deleted file mode 100644
index 639e7712..00000000
Binary files a/qpython/src/main/res/drawable-hdpi/ic_script_console.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-hdpi/ic_script_kivyapp.png b/qpython/src/main/res/drawable-hdpi/ic_script_kivyapp.png
deleted file mode 100644
index 5bd7ca43..00000000
Binary files a/qpython/src/main/res/drawable-hdpi/ic_script_kivyapp.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-hdpi/ic_script_qscript.png b/qpython/src/main/res/drawable-hdpi/ic_script_qscript.png
deleted file mode 100644
index 8e10052a..00000000
Binary files a/qpython/src/main/res/drawable-hdpi/ic_script_qscript.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-hdpi/ic_script_webapp.png b/qpython/src/main/res/drawable-hdpi/ic_script_webapp.png
deleted file mode 100644
index 733a9819..00000000
Binary files a/qpython/src/main/res/drawable-hdpi/ic_script_webapp.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-hdpi/ic_stat_service_notification_icon.png b/qpython/src/main/res/drawable-hdpi/ic_stat_service_notification_icon.png
deleted file mode 100644
index 635c6fe8..00000000
Binary files a/qpython/src/main/res/drawable-hdpi/ic_stat_service_notification_icon.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-hdpi/ic_update.png b/qpython/src/main/res/drawable-hdpi/ic_update.png
deleted file mode 100644
index c6964e32..00000000
Binary files a/qpython/src/main/res/drawable-hdpi/ic_update.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-hdpi/ic_wiki.png b/qpython/src/main/res/drawable-hdpi/ic_wiki.png
deleted file mode 100644
index e92e7d36..00000000
Binary files a/qpython/src/main/res/drawable-hdpi/ic_wiki.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-hdpi/micon.png b/qpython/src/main/res/drawable-hdpi/micon.png
deleted file mode 100644
index 2ae39b57..00000000
Binary files a/qpython/src/main/res/drawable-hdpi/micon.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-hdpi/round_close.9.png b/qpython/src/main/res/drawable-hdpi/round_close.9.png
deleted file mode 100644
index 10f40123..00000000
Binary files a/qpython/src/main/res/drawable-hdpi/round_close.9.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-hdpi/test.jpg b/qpython/src/main/res/drawable-hdpi/test.jpg
deleted file mode 100644
index 3544cee1..00000000
Binary files a/qpython/src/main/res/drawable-hdpi/test.jpg and /dev/null differ
diff --git a/qpython/src/main/res/drawable-hdpi/text_cursor_mtrl_alpha.9.png b/qpython/src/main/res/drawable-hdpi/text_cursor_mtrl_alpha.9.png
deleted file mode 100644
index 01be09f8..00000000
Binary files a/qpython/src/main/res/drawable-hdpi/text_cursor_mtrl_alpha.9.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-hdpi/text_edit_paste_window.9.png b/qpython/src/main/res/drawable-hdpi/text_edit_paste_window.9.png
deleted file mode 100644
index 259a3d62..00000000
Binary files a/qpython/src/main/res/drawable-hdpi/text_edit_paste_window.9.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-hdpi/text_select_handle_left_mtrl_alpha.png b/qpython/src/main/res/drawable-hdpi/text_select_handle_left_mtrl_alpha.png
deleted file mode 100644
index 5af30d46..00000000
Binary files a/qpython/src/main/res/drawable-hdpi/text_select_handle_left_mtrl_alpha.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-hdpi/text_select_handle_middle_mtrl_alpha.png b/qpython/src/main/res/drawable-hdpi/text_select_handle_middle_mtrl_alpha.png
deleted file mode 100644
index 3a178c61..00000000
Binary files a/qpython/src/main/res/drawable-hdpi/text_select_handle_middle_mtrl_alpha.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-hdpi/text_select_handle_right_mtrl_alpha.png b/qpython/src/main/res/drawable-hdpi/text_select_handle_right_mtrl_alpha.png
deleted file mode 100644
index 998feb60..00000000
Binary files a/qpython/src/main/res/drawable-hdpi/text_select_handle_right_mtrl_alpha.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-ldpi-v11/ic_menu_add.png b/qpython/src/main/res/drawable-ldpi-v11/ic_menu_add.png
deleted file mode 100644
index 89620af8..00000000
Binary files a/qpython/src/main/res/drawable-ldpi-v11/ic_menu_add.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-ldpi-v11/ic_menu_back.png b/qpython/src/main/res/drawable-ldpi-v11/ic_menu_back.png
deleted file mode 100644
index 71eb533a..00000000
Binary files a/qpython/src/main/res/drawable-ldpi-v11/ic_menu_back.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-ldpi-v11/ic_menu_close_clear_cancel.png b/qpython/src/main/res/drawable-ldpi-v11/ic_menu_close_clear_cancel.png
deleted file mode 100644
index 760b9254..00000000
Binary files a/qpython/src/main/res/drawable-ldpi-v11/ic_menu_close_clear_cancel.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-ldpi-v11/ic_menu_forward.png b/qpython/src/main/res/drawable-ldpi-v11/ic_menu_forward.png
deleted file mode 100644
index 554cfb7b..00000000
Binary files a/qpython/src/main/res/drawable-ldpi-v11/ic_menu_forward.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-ldpi-v11/ic_menu_preferences.png b/qpython/src/main/res/drawable-ldpi-v11/ic_menu_preferences.png
deleted file mode 100644
index efc2f3e4..00000000
Binary files a/qpython/src/main/res/drawable-ldpi-v11/ic_menu_preferences.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-ldpi-v11/ic_stat_service_notification_icon.png b/qpython/src/main/res/drawable-ldpi-v11/ic_stat_service_notification_icon.png
deleted file mode 100644
index 07769a9e..00000000
Binary files a/qpython/src/main/res/drawable-ldpi-v11/ic_stat_service_notification_icon.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-ldpi-v9/ic_stat_service_notification_icon.png b/qpython/src/main/res/drawable-ldpi-v9/ic_stat_service_notification_icon.png
deleted file mode 100644
index f9f416e3..00000000
Binary files a/qpython/src/main/res/drawable-ldpi-v9/ic_stat_service_notification_icon.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-ldpi/ic_launcher.png b/qpython/src/main/res/drawable-ldpi/ic_launcher.png
deleted file mode 100644
index ec8a6ed1..00000000
Binary files a/qpython/src/main/res/drawable-ldpi/ic_launcher.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-ldpi/ic_menu_add.png b/qpython/src/main/res/drawable-ldpi/ic_menu_add.png
deleted file mode 100644
index 89620af8..00000000
Binary files a/qpython/src/main/res/drawable-ldpi/ic_menu_add.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-ldpi/ic_menu_close_clear_cancel.png b/qpython/src/main/res/drawable-ldpi/ic_menu_close_clear_cancel.png
deleted file mode 100644
index 760b9254..00000000
Binary files a/qpython/src/main/res/drawable-ldpi/ic_menu_close_clear_cancel.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-ldpi/ic_menu_preferences.png b/qpython/src/main/res/drawable-ldpi/ic_menu_preferences.png
deleted file mode 100644
index efc2f3e4..00000000
Binary files a/qpython/src/main/res/drawable-ldpi/ic_menu_preferences.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-ldpi/ic_stat_service_notification_icon.png b/qpython/src/main/res/drawable-ldpi/ic_stat_service_notification_icon.png
deleted file mode 100644
index 356832d0..00000000
Binary files a/qpython/src/main/res/drawable-ldpi/ic_stat_service_notification_icon.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-mdpi-v11/ic_menu_add.png b/qpython/src/main/res/drawable-mdpi-v11/ic_menu_add.png
deleted file mode 100644
index 361c7c46..00000000
Binary files a/qpython/src/main/res/drawable-mdpi-v11/ic_menu_add.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-mdpi-v11/ic_menu_back.png b/qpython/src/main/res/drawable-mdpi-v11/ic_menu_back.png
deleted file mode 100644
index bb692455..00000000
Binary files a/qpython/src/main/res/drawable-mdpi-v11/ic_menu_back.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-mdpi-v11/ic_menu_close_clear_cancel.png b/qpython/src/main/res/drawable-mdpi-v11/ic_menu_close_clear_cancel.png
deleted file mode 100644
index 1161a7cc..00000000
Binary files a/qpython/src/main/res/drawable-mdpi-v11/ic_menu_close_clear_cancel.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-mdpi-v11/ic_menu_forward.png b/qpython/src/main/res/drawable-mdpi-v11/ic_menu_forward.png
deleted file mode 100644
index 4a0b6ef6..00000000
Binary files a/qpython/src/main/res/drawable-mdpi-v11/ic_menu_forward.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-mdpi-v11/ic_menu_preferences.png b/qpython/src/main/res/drawable-mdpi-v11/ic_menu_preferences.png
deleted file mode 100644
index ccc50e66..00000000
Binary files a/qpython/src/main/res/drawable-mdpi-v11/ic_menu_preferences.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-mdpi-v11/ic_stat_service_notification_icon.png b/qpython/src/main/res/drawable-mdpi-v11/ic_stat_service_notification_icon.png
deleted file mode 100644
index 4f7b0dfc..00000000
Binary files a/qpython/src/main/res/drawable-mdpi-v11/ic_stat_service_notification_icon.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-mdpi-v11/text_cursor_mtrl_alpha.9.png b/qpython/src/main/res/drawable-mdpi-v11/text_cursor_mtrl_alpha.9.png
deleted file mode 100644
index 01be09f8..00000000
Binary files a/qpython/src/main/res/drawable-mdpi-v11/text_cursor_mtrl_alpha.9.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-mdpi-v11/text_edit_paste_window.9.png b/qpython/src/main/res/drawable-mdpi-v11/text_edit_paste_window.9.png
deleted file mode 100644
index 259a3d62..00000000
Binary files a/qpython/src/main/res/drawable-mdpi-v11/text_edit_paste_window.9.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-mdpi-v11/text_select_handle_left_mtrl_alpha.png b/qpython/src/main/res/drawable-mdpi-v11/text_select_handle_left_mtrl_alpha.png
deleted file mode 100644
index 5af30d46..00000000
Binary files a/qpython/src/main/res/drawable-mdpi-v11/text_select_handle_left_mtrl_alpha.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-mdpi-v11/text_select_handle_middle_mtrl_alpha.png b/qpython/src/main/res/drawable-mdpi-v11/text_select_handle_middle_mtrl_alpha.png
deleted file mode 100644
index 3a178c61..00000000
Binary files a/qpython/src/main/res/drawable-mdpi-v11/text_select_handle_middle_mtrl_alpha.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-mdpi-v11/text_select_handle_right_mtrl_alpha.png b/qpython/src/main/res/drawable-mdpi-v11/text_select_handle_right_mtrl_alpha.png
deleted file mode 100644
index 998feb60..00000000
Binary files a/qpython/src/main/res/drawable-mdpi-v11/text_select_handle_right_mtrl_alpha.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-mdpi/btn_close_window.png b/qpython/src/main/res/drawable-mdpi/btn_close_window.png
deleted file mode 100644
index 53f878be..00000000
Binary files a/qpython/src/main/res/drawable-mdpi/btn_close_window.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-mdpi/ic_launcher.png b/qpython/src/main/res/drawable-mdpi/ic_launcher.png
index 4d8141fb..3e46b273 100644
Binary files a/qpython/src/main/res/drawable-mdpi/ic_launcher.png and b/qpython/src/main/res/drawable-mdpi/ic_launcher.png differ
diff --git a/qpython/src/main/res/drawable-mdpi/ic_menu_add.png b/qpython/src/main/res/drawable-mdpi/ic_menu_add.png
deleted file mode 100644
index 57a4099b..00000000
Binary files a/qpython/src/main/res/drawable-mdpi/ic_menu_add.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-mdpi/ic_menu_back.png b/qpython/src/main/res/drawable-mdpi/ic_menu_back.png
deleted file mode 100644
index 91fa3e74..00000000
Binary files a/qpython/src/main/res/drawable-mdpi/ic_menu_back.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-mdpi/ic_menu_close_clear_cancel.png b/qpython/src/main/res/drawable-mdpi/ic_menu_close_clear_cancel.png
deleted file mode 100644
index 04a76b58..00000000
Binary files a/qpython/src/main/res/drawable-mdpi/ic_menu_close_clear_cancel.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-mdpi/ic_menu_forward.png b/qpython/src/main/res/drawable-mdpi/ic_menu_forward.png
deleted file mode 100644
index 632e4f6d..00000000
Binary files a/qpython/src/main/res/drawable-mdpi/ic_menu_forward.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-mdpi/ic_menu_preferences.png b/qpython/src/main/res/drawable-mdpi/ic_menu_preferences.png
deleted file mode 100644
index 2f34c769..00000000
Binary files a/qpython/src/main/res/drawable-mdpi/ic_menu_preferences.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-mdpi/ic_menu_windows.png b/qpython/src/main/res/drawable-mdpi/ic_menu_windows.png
deleted file mode 100644
index c33de2b0..00000000
Binary files a/qpython/src/main/res/drawable-mdpi/ic_menu_windows.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-mdpi/ic_stat_service_notification_icon.png b/qpython/src/main/res/drawable-mdpi/ic_stat_service_notification_icon.png
deleted file mode 100644
index 635c6fe8..00000000
Binary files a/qpython/src/main/res/drawable-mdpi/ic_stat_service_notification_icon.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-xhdpi-v11/divider_horizontal_dark_opaque.9.png b/qpython/src/main/res/drawable-xhdpi-v11/divider_horizontal_dark_opaque.9.png
deleted file mode 100644
index 60e2cb2d..00000000
Binary files a/qpython/src/main/res/drawable-xhdpi-v11/divider_horizontal_dark_opaque.9.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-xhdpi-v11/down.png b/qpython/src/main/res/drawable-xhdpi-v11/down.png
deleted file mode 100644
index 4acbd3cf..00000000
Binary files a/qpython/src/main/res/drawable-xhdpi-v11/down.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-xhdpi-v11/ic_drawer_raw.png b/qpython/src/main/res/drawable-xhdpi-v11/ic_drawer_raw.png
deleted file mode 100644
index afea5a18..00000000
Binary files a/qpython/src/main/res/drawable-xhdpi-v11/ic_drawer_raw.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-xhdpi-v11/ic_launcher.png b/qpython/src/main/res/drawable-xhdpi-v11/ic_launcher.png
deleted file mode 100644
index 7df4c35b..00000000
Binary files a/qpython/src/main/res/drawable-xhdpi-v11/ic_launcher.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-xhdpi-v11/ic_menu_add.png b/qpython/src/main/res/drawable-xhdpi-v11/ic_menu_add.png
deleted file mode 100644
index 7d498a96..00000000
Binary files a/qpython/src/main/res/drawable-xhdpi-v11/ic_menu_add.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-xhdpi-v11/ic_menu_back.png b/qpython/src/main/res/drawable-xhdpi-v11/ic_menu_back.png
deleted file mode 100644
index 8ac4f649..00000000
Binary files a/qpython/src/main/res/drawable-xhdpi-v11/ic_menu_back.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-xhdpi-v11/ic_menu_close_clear_cancel.png b/qpython/src/main/res/drawable-xhdpi-v11/ic_menu_close_clear_cancel.png
deleted file mode 100644
index d743d752..00000000
Binary files a/qpython/src/main/res/drawable-xhdpi-v11/ic_menu_close_clear_cancel.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-xhdpi-v11/ic_menu_forward.png b/qpython/src/main/res/drawable-xhdpi-v11/ic_menu_forward.png
deleted file mode 100644
index 6463e7a4..00000000
Binary files a/qpython/src/main/res/drawable-xhdpi-v11/ic_menu_forward.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-xhdpi-v11/ic_menu_preferences.png b/qpython/src/main/res/drawable-xhdpi-v11/ic_menu_preferences.png
deleted file mode 100644
index 02cfbad0..00000000
Binary files a/qpython/src/main/res/drawable-xhdpi-v11/ic_menu_preferences.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-xhdpi-v11/ic_more_horiz_grey600_24dp.png b/qpython/src/main/res/drawable-xhdpi-v11/ic_more_horiz_grey600_24dp.png
deleted file mode 100644
index 4f32d1c5..00000000
Binary files a/qpython/src/main/res/drawable-xhdpi-v11/ic_more_horiz_grey600_24dp.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-xhdpi-v11/ic_open_in_browser.png b/qpython/src/main/res/drawable-xhdpi-v11/ic_open_in_browser.png
deleted file mode 100644
index cf869277..00000000
Binary files a/qpython/src/main/res/drawable-xhdpi-v11/ic_open_in_browser.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-xhdpi-v11/ic_right_menu.png b/qpython/src/main/res/drawable-xhdpi-v11/ic_right_menu.png
deleted file mode 100644
index b56179e6..00000000
Binary files a/qpython/src/main/res/drawable-xhdpi-v11/ic_right_menu.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-xhdpi-v11/ic_stat_service_notification_icon.png b/qpython/src/main/res/drawable-xhdpi-v11/ic_stat_service_notification_icon.png
deleted file mode 100644
index a0e4f60c..00000000
Binary files a/qpython/src/main/res/drawable-xhdpi-v11/ic_stat_service_notification_icon.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-xhdpi-v11/keyboard.png b/qpython/src/main/res/drawable-xhdpi-v11/keyboard.png
deleted file mode 100644
index 4c543829..00000000
Binary files a/qpython/src/main/res/drawable-xhdpi-v11/keyboard.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-xhdpi-v11/m_auto_wrap.png b/qpython/src/main/res/drawable-xhdpi-v11/m_auto_wrap.png
deleted file mode 100644
index 853b01d6..00000000
Binary files a/qpython/src/main/res/drawable-xhdpi-v11/m_auto_wrap.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-xhdpi-v11/m_back.png b/qpython/src/main/res/drawable-xhdpi-v11/m_back.png
deleted file mode 100644
index c9a09c5c..00000000
Binary files a/qpython/src/main/res/drawable-xhdpi-v11/m_back.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-xhdpi-v11/m_color.png b/qpython/src/main/res/drawable-xhdpi-v11/m_color.png
deleted file mode 100644
index 09393147..00000000
Binary files a/qpython/src/main/res/drawable-xhdpi-v11/m_color.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-xhdpi-v11/m_copy.png b/qpython/src/main/res/drawable-xhdpi-v11/m_copy.png
deleted file mode 100644
index faa23532..00000000
Binary files a/qpython/src/main/res/drawable-xhdpi-v11/m_copy.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-xhdpi-v11/m_cut.png b/qpython/src/main/res/drawable-xhdpi-v11/m_cut.png
deleted file mode 100644
index 22ae06b8..00000000
Binary files a/qpython/src/main/res/drawable-xhdpi-v11/m_cut.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-xhdpi-v11/m_datetime.png b/qpython/src/main/res/drawable-xhdpi-v11/m_datetime.png
deleted file mode 100644
index eb0023db..00000000
Binary files a/qpython/src/main/res/drawable-xhdpi-v11/m_datetime.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-xhdpi-v11/m_duplication.png b/qpython/src/main/res/drawable-xhdpi-v11/m_duplication.png
deleted file mode 100644
index 657f86ea..00000000
Binary files a/qpython/src/main/res/drawable-xhdpi-v11/m_duplication.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-xhdpi-v11/m_editmode.png b/qpython/src/main/res/drawable-xhdpi-v11/m_editmode.png
deleted file mode 100644
index 32665956..00000000
Binary files a/qpython/src/main/res/drawable-xhdpi-v11/m_editmode.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-xhdpi-v11/m_encoding.png b/qpython/src/main/res/drawable-xhdpi-v11/m_encoding.png
deleted file mode 100644
index c18f5330..00000000
Binary files a/qpython/src/main/res/drawable-xhdpi-v11/m_encoding.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-xhdpi-v11/m_expand_less.png b/qpython/src/main/res/drawable-xhdpi-v11/m_expand_less.png
deleted file mode 100644
index 0008f33b..00000000
Binary files a/qpython/src/main/res/drawable-xhdpi-v11/m_expand_less.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-xhdpi-v11/m_expand_more.png b/qpython/src/main/res/drawable-xhdpi-v11/m_expand_more.png
deleted file mode 100644
index 5b6136fc..00000000
Binary files a/qpython/src/main/res/drawable-xhdpi-v11/m_expand_more.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-xhdpi-v11/m_find_in_file.png b/qpython/src/main/res/drawable-xhdpi-v11/m_find_in_file.png
deleted file mode 100644
index 6bffb223..00000000
Binary files a/qpython/src/main/res/drawable-xhdpi-v11/m_find_in_file.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-xhdpi-v11/m_forward.png b/qpython/src/main/res/drawable-xhdpi-v11/m_forward.png
deleted file mode 100644
index 33847eef..00000000
Binary files a/qpython/src/main/res/drawable-xhdpi-v11/m_forward.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-xhdpi-v11/m_goto_line.png b/qpython/src/main/res/drawable-xhdpi-v11/m_goto_line.png
deleted file mode 100644
index 652a5ffd..00000000
Binary files a/qpython/src/main/res/drawable-xhdpi-v11/m_goto_line.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-xhdpi-v11/m_highlight.png b/qpython/src/main/res/drawable-xhdpi-v11/m_highlight.png
deleted file mode 100644
index d4f6bc88..00000000
Binary files a/qpython/src/main/res/drawable-xhdpi-v11/m_highlight.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-xhdpi-v11/m_history.png b/qpython/src/main/res/drawable-xhdpi-v11/m_history.png
deleted file mode 100644
index cdec79cd..00000000
Binary files a/qpython/src/main/res/drawable-xhdpi-v11/m_history.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-xhdpi-v11/m_info.png b/qpython/src/main/res/drawable-xhdpi-v11/m_info.png
deleted file mode 100644
index 5d93913a..00000000
Binary files a/qpython/src/main/res/drawable-xhdpi-v11/m_info.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-xhdpi-v11/m_jump_to_end.png b/qpython/src/main/res/drawable-xhdpi-v11/m_jump_to_end.png
deleted file mode 100644
index 213a9a35..00000000
Binary files a/qpython/src/main/res/drawable-xhdpi-v11/m_jump_to_end.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-xhdpi-v11/m_jump_to_start.png b/qpython/src/main/res/drawable-xhdpi-v11/m_jump_to_start.png
deleted file mode 100644
index 8b717e9e..00000000
Binary files a/qpython/src/main/res/drawable-xhdpi-v11/m_jump_to_start.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-xhdpi-v11/m_lowercase.png b/qpython/src/main/res/drawable-xhdpi-v11/m_lowercase.png
deleted file mode 100644
index ff3b6a19..00000000
Binary files a/qpython/src/main/res/drawable-xhdpi-v11/m_lowercase.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-xhdpi-v11/m_new.png b/qpython/src/main/res/drawable-xhdpi-v11/m_new.png
deleted file mode 100644
index 1d683b99..00000000
Binary files a/qpython/src/main/res/drawable-xhdpi-v11/m_new.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-xhdpi-v11/m_new_white.png b/qpython/src/main/res/drawable-xhdpi-v11/m_new_white.png
deleted file mode 100644
index 514bf737..00000000
Binary files a/qpython/src/main/res/drawable-xhdpi-v11/m_new_white.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-xhdpi-v11/m_open.png b/qpython/src/main/res/drawable-xhdpi-v11/m_open.png
deleted file mode 100644
index 03f51107..00000000
Binary files a/qpython/src/main/res/drawable-xhdpi-v11/m_open.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-xhdpi-v11/m_open_white.png b/qpython/src/main/res/drawable-xhdpi-v11/m_open_white.png
deleted file mode 100644
index bf45a11e..00000000
Binary files a/qpython/src/main/res/drawable-xhdpi-v11/m_open_white.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-xhdpi-v11/m_paste.png b/qpython/src/main/res/drawable-xhdpi-v11/m_paste.png
deleted file mode 100644
index d9d32167..00000000
Binary files a/qpython/src/main/res/drawable-xhdpi-v11/m_paste.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-xhdpi-v11/m_readonly.png b/qpython/src/main/res/drawable-xhdpi-v11/m_readonly.png
deleted file mode 100644
index 9c7bb737..00000000
Binary files a/qpython/src/main/res/drawable-xhdpi-v11/m_readonly.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-xhdpi-v11/m_redo.png b/qpython/src/main/res/drawable-xhdpi-v11/m_redo.png
deleted file mode 100644
index 21cde235..00000000
Binary files a/qpython/src/main/res/drawable-xhdpi-v11/m_redo.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-xhdpi-v11/m_redo_white.png b/qpython/src/main/res/drawable-xhdpi-v11/m_redo_white.png
deleted file mode 100644
index f51f73a3..00000000
Binary files a/qpython/src/main/res/drawable-xhdpi-v11/m_redo_white.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-xhdpi-v11/m_replace.png b/qpython/src/main/res/drawable-xhdpi-v11/m_replace.png
deleted file mode 100644
index 23d6800b..00000000
Binary files a/qpython/src/main/res/drawable-xhdpi-v11/m_replace.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-xhdpi-v11/m_run.png b/qpython/src/main/res/drawable-xhdpi-v11/m_run.png
deleted file mode 100644
index 3a30378d..00000000
Binary files a/qpython/src/main/res/drawable-xhdpi-v11/m_run.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-xhdpi-v11/m_save.png b/qpython/src/main/res/drawable-xhdpi-v11/m_save.png
deleted file mode 100644
index 1c15994d..00000000
Binary files a/qpython/src/main/res/drawable-xhdpi-v11/m_save.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-xhdpi-v11/m_save_all.png b/qpython/src/main/res/drawable-xhdpi-v11/m_save_all.png
deleted file mode 100644
index 6285b5e6..00000000
Binary files a/qpython/src/main/res/drawable-xhdpi-v11/m_save_all.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-xhdpi-v11/m_save_as.png b/qpython/src/main/res/drawable-xhdpi-v11/m_save_as.png
deleted file mode 100644
index 49ec254a..00000000
Binary files a/qpython/src/main/res/drawable-xhdpi-v11/m_save_as.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-xhdpi-v11/m_save_white.png b/qpython/src/main/res/drawable-xhdpi-v11/m_save_white.png
deleted file mode 100644
index 59cf39b5..00000000
Binary files a/qpython/src/main/res/drawable-xhdpi-v11/m_save_white.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-xhdpi-v11/m_select_all.png b/qpython/src/main/res/drawable-xhdpi-v11/m_select_all.png
deleted file mode 100644
index 213a7abd..00000000
Binary files a/qpython/src/main/res/drawable-xhdpi-v11/m_select_all.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-xhdpi-v11/m_settings.png b/qpython/src/main/res/drawable-xhdpi-v11/m_settings.png
deleted file mode 100644
index 11df9709..00000000
Binary files a/qpython/src/main/res/drawable-xhdpi-v11/m_settings.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-xhdpi-v11/m_symbol.png b/qpython/src/main/res/drawable-xhdpi-v11/m_symbol.png
deleted file mode 100644
index ce2c1575..00000000
Binary files a/qpython/src/main/res/drawable-xhdpi-v11/m_symbol.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-xhdpi-v11/m_tab.9.png b/qpython/src/main/res/drawable-xhdpi-v11/m_tab.9.png
deleted file mode 100644
index 2ec88ace..00000000
Binary files a/qpython/src/main/res/drawable-xhdpi-v11/m_tab.9.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-xhdpi-v11/m_undo.png b/qpython/src/main/res/drawable-xhdpi-v11/m_undo.png
deleted file mode 100644
index e5327a4d..00000000
Binary files a/qpython/src/main/res/drawable-xhdpi-v11/m_undo.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-xhdpi-v11/m_undo_white.png b/qpython/src/main/res/drawable-xhdpi-v11/m_undo_white.png
deleted file mode 100644
index f458c049..00000000
Binary files a/qpython/src/main/res/drawable-xhdpi-v11/m_undo_white.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-xhdpi-v11/m_uppercase.png b/qpython/src/main/res/drawable-xhdpi-v11/m_uppercase.png
deleted file mode 100644
index b9e929d7..00000000
Binary files a/qpython/src/main/res/drawable-xhdpi-v11/m_uppercase.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-xhdpi-v11/m_wrap.png b/qpython/src/main/res/drawable-xhdpi-v11/m_wrap.png
deleted file mode 100644
index 853b01d6..00000000
Binary files a/qpython/src/main/res/drawable-xhdpi-v11/m_wrap.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-xhdpi-v11/menu.png b/qpython/src/main/res/drawable-xhdpi-v11/menu.png
deleted file mode 100644
index 886a3d17..00000000
Binary files a/qpython/src/main/res/drawable-xhdpi-v11/menu.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-xhdpi-v11/o_down_arrow.png b/qpython/src/main/res/drawable-xhdpi-v11/o_down_arrow.png
deleted file mode 100644
index f6ad02ac..00000000
Binary files a/qpython/src/main/res/drawable-xhdpi-v11/o_down_arrow.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-xhdpi-v11/round_close.9.png b/qpython/src/main/res/drawable-xhdpi-v11/round_close.9.png
deleted file mode 100644
index 2594bcc7..00000000
Binary files a/qpython/src/main/res/drawable-xhdpi-v11/round_close.9.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-xhdpi-v11/shadow_down.png b/qpython/src/main/res/drawable-xhdpi-v11/shadow_down.png
deleted file mode 100644
index 53c7b242..00000000
Binary files a/qpython/src/main/res/drawable-xhdpi-v11/shadow_down.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-xhdpi-v11/shadow_up.png b/qpython/src/main/res/drawable-xhdpi-v11/shadow_up.png
deleted file mode 100644
index 439e39fa..00000000
Binary files a/qpython/src/main/res/drawable-xhdpi-v11/shadow_up.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-xhdpi-v11/tab_close.png b/qpython/src/main/res/drawable-xhdpi-v11/tab_close.png
deleted file mode 100644
index a6dec2bb..00000000
Binary files a/qpython/src/main/res/drawable-xhdpi-v11/tab_close.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-xhdpi-v11/text_edit_side_paste_window.9.png b/qpython/src/main/res/drawable-xhdpi-v11/text_edit_side_paste_window.9.png
deleted file mode 100644
index b32b0b0b..00000000
Binary files a/qpython/src/main/res/drawable-xhdpi-v11/text_edit_side_paste_window.9.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/aipy.png b/qpython/src/main/res/drawable-xxhdpi/aipy.png
new file mode 100644
index 00000000..d2863734
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/aipy.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/aipy_light.png b/qpython/src/main/res/drawable-xxhdpi/aipy_light.png
new file mode 100644
index 00000000..7ca50a5a
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/aipy_light.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/arrow_up.png b/qpython/src/main/res/drawable-xxhdpi/arrow_up.png
new file mode 100644
index 00000000..9cd300be
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/arrow_up.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/arvr.png b/qpython/src/main/res/drawable-xxhdpi/arvr.png
new file mode 100644
index 00000000..13eccc2d
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/arvr.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/arvr_light.png b/qpython/src/main/res/drawable-xxhdpi/arvr_light.png
new file mode 100644
index 00000000..4f51596d
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/arvr_light.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/basics.png b/qpython/src/main/res/drawable-xxhdpi/basics.png
new file mode 100644
index 00000000..92b2e2d9
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/basics.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/basics_light.png b/qpython/src/main/res/drawable-xxhdpi/basics_light.png
new file mode 100644
index 00000000..6c11f8e8
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/basics_light.png differ
diff --git a/qpython/src/main/res/drawable-hdpi/btn_close_window.png b/qpython/src/main/res/drawable-xxhdpi/btn_close_window.png
similarity index 100%
rename from qpython/src/main/res/drawable-hdpi/btn_close_window.png
rename to qpython/src/main/res/drawable-xxhdpi/btn_close_window.png
diff --git a/qpython/src/main/res/drawable-xxhdpi/checked.png b/qpython/src/main/res/drawable-xxhdpi/checked.png
new file mode 100644
index 00000000..e3357173
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/checked.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/database.png b/qpython/src/main/res/drawable-xxhdpi/database.png
new file mode 100644
index 00000000..1aec6985
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/database.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/database_light.png b/qpython/src/main/res/drawable-xxhdpi/database_light.png
new file mode 100644
index 00000000..806b69a2
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/database_light.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/download.png b/qpython/src/main/res/drawable-xxhdpi/download.png
new file mode 100644
index 00000000..99ae4cdb
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/download.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/editor_qrcode.png b/qpython/src/main/res/drawable-xxhdpi/editor_qrcode.png
new file mode 100644
index 00000000..5526cfc0
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/editor_qrcode.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/empty.png b/qpython/src/main/res/drawable-xxhdpi/empty.png
new file mode 100644
index 00000000..052fe13e
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/empty.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/gist_editor.png b/qpython/src/main/res/drawable-xxhdpi/gist_editor.png
new file mode 100644
index 00000000..2aca5a8e
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/gist_editor.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/horizontal_separation_line.png b/qpython/src/main/res/drawable-xxhdpi/horizontal_separation_line.png
new file mode 100644
index 00000000..fd5a8725
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/horizontal_separation_line.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_about_mail.png b/qpython/src/main/res/drawable-xxhdpi/ic_about_mail.png
new file mode 100644
index 00000000..797945cf
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_about_mail.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_about_new.png b/qpython/src/main/res/drawable-xxhdpi/ic_about_new.png
new file mode 100644
index 00000000..4a3e2416
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_about_new.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_about_share.png b/qpython/src/main/res/drawable-xxhdpi/ic_about_share.png
new file mode 100644
index 00000000..49b377bf
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_about_share.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_add.png b/qpython/src/main/res/drawable-xxhdpi/ic_add.png
new file mode 100644
index 00000000..344ec159
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_add.png differ
diff --git a/qpython/src/main/res/drawable-hdpi/ic_arrow_back.png b/qpython/src/main/res/drawable-xxhdpi/ic_arrow_back.png
similarity index 100%
rename from qpython/src/main/res/drawable-hdpi/ic_arrow_back.png
rename to qpython/src/main/res/drawable-xxhdpi/ic_arrow_back.png
diff --git a/qpython/src/main/res/drawable-hdpi/ic_arrow_back_white.png b/qpython/src/main/res/drawable-xxhdpi/ic_arrow_back_white.png
similarity index 100%
rename from qpython/src/main/res/drawable-hdpi/ic_arrow_back_white.png
rename to qpython/src/main/res/drawable-xxhdpi/ic_arrow_back_white.png
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_arrow_drop_down_a.png b/qpython/src/main/res/drawable-xxhdpi/ic_arrow_drop_down_a.png
new file mode 100644
index 00000000..b2013a0a
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_arrow_drop_down_a.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_arrow_drop_down_b.png b/qpython/src/main/res/drawable-xxhdpi/ic_arrow_drop_down_b.png
new file mode 100644
index 00000000..50ce6e73
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_arrow_drop_down_b.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_back.png b/qpython/src/main/res/drawable-xxhdpi/ic_back.png
new file mode 100644
index 00000000..dc10e323
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_back.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_cloud_done.png b/qpython/src/main/res/drawable-xxhdpi/ic_cloud_done.png
new file mode 100644
index 00000000..3b7c08f6
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_cloud_done.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_cloud_download.png b/qpython/src/main/res/drawable-xxhdpi/ic_cloud_download.png
new file mode 100644
index 00000000..2528694d
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_cloud_download.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_cloud_list.png b/qpython/src/main/res/drawable-xxhdpi/ic_cloud_list.png
new file mode 100644
index 00000000..3ea67e1f
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_cloud_list.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_cloud_notdone.png b/qpython/src/main/res/drawable-xxhdpi/ic_cloud_notdone.png
new file mode 100644
index 00000000..1eb40fbf
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_cloud_notdone.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_cloud_upload.png b/qpython/src/main/res/drawable-xxhdpi/ic_cloud_upload.png
new file mode 100644
index 00000000..308aed61
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_cloud_upload.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_com_comment.png b/qpython/src/main/res/drawable-xxhdpi/ic_com_comment.png
new file mode 100644
index 00000000..387eb567
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_com_comment.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_com_copylink.png b/qpython/src/main/res/drawable-xxhdpi/ic_com_copylink.png
new file mode 100644
index 00000000..dec41ab3
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_com_copylink.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_com_delete.png b/qpython/src/main/res/drawable-xxhdpi/ic_com_delete.png
new file mode 100644
index 00000000..a47e919f
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_com_delete.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_com_facebook.png b/qpython/src/main/res/drawable-xxhdpi/ic_com_facebook.png
new file mode 100644
index 00000000..84bf3691
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_com_facebook.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_com_like.png b/qpython/src/main/res/drawable-xxhdpi/ic_com_like.png
new file mode 100644
index 00000000..1b572830
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_com_like.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_com_liked.png b/qpython/src/main/res/drawable-xxhdpi/ic_com_liked.png
new file mode 100644
index 00000000..2110fbed
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_com_liked.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_com_share.png b/qpython/src/main/res/drawable-xxhdpi/ic_com_share.png
new file mode 100644
index 00000000..0b6dca8e
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_com_share.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_com_sharecode.png b/qpython/src/main/res/drawable-xxhdpi/ic_com_sharecode.png
new file mode 100644
index 00000000..8f927d78
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_com_sharecode.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_com_twitter.png b/qpython/src/main/res/drawable-xxhdpi/ic_com_twitter.png
new file mode 100644
index 00000000..d2987757
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_com_twitter.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_cou_share.png b/qpython/src/main/res/drawable-xxhdpi/ic_cou_share.png
new file mode 100644
index 00000000..01560bf3
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_cou_share.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_course_clicks.png b/qpython/src/main/res/drawable-xxhdpi/ic_course_clicks.png
new file mode 100644
index 00000000..c1b25789
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_course_clicks.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_delete.png b/qpython/src/main/res/drawable-xxhdpi/ic_delete.png
new file mode 100644
index 00000000..c3104b55
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_delete.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_editcode.png b/qpython/src/main/res/drawable-xxhdpi/ic_editcode.png
new file mode 100644
index 00000000..dc911d52
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_editcode.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_editcode_add.png b/qpython/src/main/res/drawable-xxhdpi/ic_editcode_add.png
new file mode 100644
index 00000000..1185fe6a
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_editcode_add.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_editor_arrow_down.png b/qpython/src/main/res/drawable-xxhdpi/ic_editor_arrow_down.png
new file mode 100644
index 00000000..dc0dda5f
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_editor_arrow_down.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_editor_arrow_left.png b/qpython/src/main/res/drawable-xxhdpi/ic_editor_arrow_left.png
new file mode 100644
index 00000000..37ca0d9e
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_editor_arrow_left.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_editor_arrow_right.png b/qpython/src/main/res/drawable-xxhdpi/ic_editor_arrow_right.png
new file mode 100644
index 00000000..7c134d79
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_editor_arrow_right.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_editor_arrow_up.png b/qpython/src/main/res/drawable-xxhdpi/ic_editor_arrow_up.png
new file mode 100644
index 00000000..8bb0d655
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_editor_arrow_up.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_editor_delete_name.png b/qpython/src/main/res/drawable-xxhdpi/ic_editor_delete_name.png
new file mode 100644
index 00000000..1d787e6e
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_editor_delete_name.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_editor_file.png b/qpython/src/main/res/drawable-xxhdpi/ic_editor_file.png
new file mode 100644
index 00000000..c567f4c3
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_editor_file.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_editor_file_little.png b/qpython/src/main/res/drawable-xxhdpi/ic_editor_file_little.png
new file mode 100644
index 00000000..7ef5f678
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_editor_file_little.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_editor_filetree_close.png b/qpython/src/main/res/drawable-xxhdpi/ic_editor_filetree_close.png
new file mode 100644
index 00000000..3a3bd293
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_editor_filetree_close.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_editor_folder.png b/qpython/src/main/res/drawable-xxhdpi/ic_editor_folder.png
new file mode 100644
index 00000000..f28e0f8d
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_editor_folder.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_editor_folder_little.png b/qpython/src/main/res/drawable-xxhdpi/ic_editor_folder_little.png
new file mode 100644
index 00000000..a600aa1a
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_editor_folder_little.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_editor_gist.png b/qpython/src/main/res/drawable-xxhdpi/ic_editor_gist.png
new file mode 100644
index 00000000..2399205b
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_editor_gist.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_editor_keyboard.png b/qpython/src/main/res/drawable-xxhdpi/ic_editor_keyboard.png
new file mode 100644
index 00000000..fac87e45
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_editor_keyboard.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_editor_keyboardlock.png b/qpython/src/main/res/drawable-xxhdpi/ic_editor_keyboardlock.png
new file mode 100644
index 00000000..f2e7dd20
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_editor_keyboardlock.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_editor_more_horiz.png b/qpython/src/main/res/drawable-xxhdpi/ic_editor_more_horiz.png
new file mode 100644
index 00000000..216edaa9
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_editor_more_horiz.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_editor_newfolder.png b/qpython/src/main/res/drawable-xxhdpi/ic_editor_newfolder.png
new file mode 100644
index 00000000..fc775036
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_editor_newfolder.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_editor_next.png b/qpython/src/main/res/drawable-xxhdpi/ic_editor_next.png
new file mode 100644
index 00000000..f5f6081c
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_editor_next.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_editor_open.png b/qpython/src/main/res/drawable-xxhdpi/ic_editor_open.png
new file mode 100644
index 00000000..899ebe1a
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_editor_open.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_editor_recent.png b/qpython/src/main/res/drawable-xxhdpi/ic_editor_recent.png
new file mode 100644
index 00000000..d3696ca1
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_editor_recent.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_editor_run.png b/qpython/src/main/res/drawable-xxhdpi/ic_editor_run.png
new file mode 100644
index 00000000..7f0de914
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_editor_run.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_editor_save.png b/qpython/src/main/res/drawable-xxhdpi/ic_editor_save.png
new file mode 100644
index 00000000..396d137e
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_editor_save.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_editor_saveas.png b/qpython/src/main/res/drawable-xxhdpi/ic_editor_saveas.png
new file mode 100644
index 00000000..91277e04
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_editor_saveas.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_editor_saveup.png b/qpython/src/main/res/drawable-xxhdpi/ic_editor_saveup.png
new file mode 100644
index 00000000..4d80e31c
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_editor_saveup.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_editor_search.png b/qpython/src/main/res/drawable-xxhdpi/ic_editor_search.png
new file mode 100644
index 00000000..dedbf806
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_editor_search.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_editor_sharecode.png b/qpython/src/main/res/drawable-xxhdpi/ic_editor_sharecode.png
new file mode 100644
index 00000000..e4b2993c
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_editor_sharecode.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_editor_snippet.png b/qpython/src/main/res/drawable-xxhdpi/ic_editor_snippet.png
new file mode 100644
index 00000000..e4b2993c
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_editor_snippet.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_editor_undo.png b/qpython/src/main/res/drawable-xxhdpi/ic_editor_undo.png
new file mode 100644
index 00000000..b0563a32
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_editor_undo.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_editor_unknown.png b/qpython/src/main/res/drawable-xxhdpi/ic_editor_unknown.png
new file mode 100644
index 00000000..8a1853a1
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_editor_unknown.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_editor_web.png b/qpython/src/main/res/drawable-xxhdpi/ic_editor_web.png
new file mode 100644
index 00000000..75d055b3
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_editor_web.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_edittext.png b/qpython/src/main/res/drawable-xxhdpi/ic_edittext.png
new file mode 100644
index 00000000..02f574fa
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_edittext.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_edittext_add.png b/qpython/src/main/res/drawable-xxhdpi/ic_edittext_add.png
new file mode 100644
index 00000000..50b2a805
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_edittext_add.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_file_rename.png b/qpython/src/main/res/drawable-xxhdpi/ic_file_rename.png
new file mode 100644
index 00000000..c6875066
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_file_rename.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_folder_open.png b/qpython/src/main/res/drawable-xxhdpi/ic_folder_open.png
new file mode 100644
index 00000000..a14d8952
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_folder_open.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_gist.png b/qpython/src/main/res/drawable-xxhdpi/ic_gist.png
new file mode 100644
index 00000000..a1dcdee7
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_gist.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_go.png b/qpython/src/main/res/drawable-xxhdpi/ic_go.png
new file mode 100644
index 00000000..e70f0413
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_go.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_home_club.png b/qpython/src/main/res/drawable-xxhdpi/ic_home_club.png
new file mode 100644
index 00000000..677c135a
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_home_club.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_home_course.png b/qpython/src/main/res/drawable-xxhdpi/ic_home_course.png
new file mode 100644
index 00000000..ec1b26df
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_home_course.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_home_editor.png b/qpython/src/main/res/drawable-xxhdpi/ic_home_editor.png
new file mode 100644
index 00000000..5b0bb3f5
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_home_editor.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_home_file.png b/qpython/src/main/res/drawable-xxhdpi/ic_home_file.png
new file mode 100644
index 00000000..30e9cc42
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_home_file.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_home_gist.png b/qpython/src/main/res/drawable-xxhdpi/ic_home_gist.png
new file mode 100644
index 00000000..b0160188
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_home_gist.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_home_library.png b/qpython/src/main/res/drawable-xxhdpi/ic_home_library.png
new file mode 100644
index 00000000..a04e9b1a
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_home_library.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_home_more.png b/qpython/src/main/res/drawable-xxhdpi/ic_home_more.png
new file mode 100644
index 00000000..d7820c4e
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_home_more.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_home_program.png b/qpython/src/main/res/drawable-xxhdpi/ic_home_program.png
new file mode 100644
index 00000000..69171cd3
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_home_program.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_home_qpy_add.png b/qpython/src/main/res/drawable-xxhdpi/ic_home_qpy_add.png
new file mode 100644
index 00000000..d6997c9e
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_home_qpy_add.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_home_qpyapp.png b/qpython/src/main/res/drawable-xxhdpi/ic_home_qpyapp.png
new file mode 100644
index 00000000..c0a2e09a
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_home_qpyapp.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_home_scan.png b/qpython/src/main/res/drawable-xxhdpi/ic_home_scan.png
new file mode 100644
index 00000000..da238acc
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_home_scan.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_home_terminal.png b/qpython/src/main/res/drawable-xxhdpi/ic_home_terminal.png
new file mode 100644
index 00000000..7b8e04b1
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_home_terminal.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_ipynb.png b/qpython/src/main/res/drawable-xxhdpi/ic_ipynb.png
new file mode 100644
index 00000000..d9eeafa6
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_ipynb.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_keyboard_arrow_right_white.png b/qpython/src/main/res/drawable-xxhdpi/ic_keyboard_arrow_right_white.png
new file mode 100644
index 00000000..b14e8bb5
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_keyboard_arrow_right_white.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_keyboard_hide_black.png b/qpython/src/main/res/drawable-xxhdpi/ic_keyboard_hide_black.png
new file mode 100644
index 00000000..7d336eaa
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_keyboard_hide_black.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_launcher.png b/qpython/src/main/res/drawable-xxhdpi/ic_launcher.png
new file mode 100644
index 00000000..e25ce77f
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_launcher.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_library.png b/qpython/src/main/res/drawable-xxhdpi/ic_library.png
new file mode 100644
index 00000000..78597092
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_library.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_library_delete.png b/qpython/src/main/res/drawable-xxhdpi/ic_library_delete.png
new file mode 100644
index 00000000..3a3bd293
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_library_delete.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_library_detail.png b/qpython/src/main/res/drawable-xxhdpi/ic_library_detail.png
new file mode 100644
index 00000000..4e00c01f
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_library_detail.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_library_download.png b/qpython/src/main/res/drawable-xxhdpi/ic_library_download.png
new file mode 100644
index 00000000..62fc4a28
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_library_download.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_library_install.png b/qpython/src/main/res/drawable-xxhdpi/ic_library_install.png
new file mode 100644
index 00000000..00c6a3f9
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_library_install.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_library_reinstall.png b/qpython/src/main/res/drawable-xxhdpi/ic_library_reinstall.png
new file mode 100644
index 00000000..9012d4cc
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_library_reinstall.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_library_run.png b/qpython/src/main/res/drawable-xxhdpi/ic_library_run.png
new file mode 100644
index 00000000..adce51b6
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_library_run.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_library_upgrade.png b/qpython/src/main/res/drawable-xxhdpi/ic_library_upgrade.png
new file mode 100644
index 00000000..1505ffc5
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_library_upgrade.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_login.png b/qpython/src/main/res/drawable-xxhdpi/ic_login.png
new file mode 100644
index 00000000..a3834f3d
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_login.png differ
diff --git a/qpython/src/main/res/drawable-hdpi-v11/ic_menu_preferences.png b/qpython/src/main/res/drawable-xxhdpi/ic_menu_preferences.png
similarity index 100%
rename from qpython/src/main/res/drawable-hdpi-v11/ic_menu_preferences.png
rename to qpython/src/main/res/drawable-xxhdpi/ic_menu_preferences.png
diff --git a/qpython/src/main/res/drawable-hdpi/ic_menu_windows.png b/qpython/src/main/res/drawable-xxhdpi/ic_menu_windows.png
similarity index 100%
rename from qpython/src/main/res/drawable-hdpi/ic_menu_windows.png
rename to qpython/src/main/res/drawable-xxhdpi/ic_menu_windows.png
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_more.png b/qpython/src/main/res/drawable-xxhdpi/ic_more.png
new file mode 100644
index 00000000..ad8711c4
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_more.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_notebook.png b/qpython/src/main/res/drawable-xxhdpi/ic_notebook.png
new file mode 100644
index 00000000..c6298d4a
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_notebook.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_open.png b/qpython/src/main/res/drawable-xxhdpi/ic_open.png
new file mode 100644
index 00000000..6b8ae463
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_open.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_play.png b/qpython/src/main/res/drawable-xxhdpi/ic_play.png
new file mode 100644
index 00000000..d8b95c84
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_play.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_program.png b/qpython/src/main/res/drawable-xxhdpi/ic_program.png
new file mode 100644
index 00000000..9d6daca3
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_program.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_program_install.png b/qpython/src/main/res/drawable-xxhdpi/ic_program_install.png
new file mode 100644
index 00000000..eed716f9
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_program_install.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_project_console.png b/qpython/src/main/res/drawable-xxhdpi/ic_project_console.png
new file mode 100644
index 00000000..d9450b08
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_project_console.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_project_kivy.png b/qpython/src/main/res/drawable-xxhdpi/ic_project_kivy.png
new file mode 100644
index 00000000..c361c2e9
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_project_kivy.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_project_kivy3.png b/qpython/src/main/res/drawable-xxhdpi/ic_project_kivy3.png
new file mode 100644
index 00000000..2c6e613d
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_project_kivy3.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_project_qapp.png b/qpython/src/main/res/drawable-xxhdpi/ic_project_qapp.png
new file mode 100644
index 00000000..d6b9f9d7
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_project_qapp.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_project_qapp3.png b/qpython/src/main/res/drawable-xxhdpi/ic_project_qapp3.png
new file mode 100644
index 00000000..0b57f976
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_project_qapp3.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_project_webapp.png b/qpython/src/main/res/drawable-xxhdpi/ic_project_webapp.png
new file mode 100644
index 00000000..291f57ee
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_project_webapp.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_project_webapp3.png b/qpython/src/main/res/drawable-xxhdpi/ic_project_webapp3.png
new file mode 100644
index 00000000..6841eeb0
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_project_webapp3.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_pyfile_kivy.png b/qpython/src/main/res/drawable-xxhdpi/ic_pyfile_kivy.png
new file mode 100644
index 00000000..52144a96
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_pyfile_kivy.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_pyfile_kivy3.png b/qpython/src/main/res/drawable-xxhdpi/ic_pyfile_kivy3.png
new file mode 100644
index 00000000..66c2739e
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_pyfile_kivy3.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_pyfile_qapp.png b/qpython/src/main/res/drawable-xxhdpi/ic_pyfile_qapp.png
new file mode 100644
index 00000000..ef2e33d7
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_pyfile_qapp.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_pyfile_qapp3.png b/qpython/src/main/res/drawable-xxhdpi/ic_pyfile_qapp3.png
new file mode 100644
index 00000000..fcc771ae
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_pyfile_qapp3.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_pyfile_webapp.png b/qpython/src/main/res/drawable-xxhdpi/ic_pyfile_webapp.png
new file mode 100644
index 00000000..4d5ff967
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_pyfile_webapp.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_pyfile_webapp3.png b/qpython/src/main/res/drawable-xxhdpi/ic_pyfile_webapp3.png
new file mode 100644
index 00000000..11f4e4da
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_pyfile_webapp3.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_qpypi_download.png b/qpython/src/main/res/drawable-xxhdpi/ic_qpypi_download.png
new file mode 100644
index 00000000..1cbfa0cd
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_qpypi_download.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_recent.png b/qpython/src/main/res/drawable-xxhdpi/ic_recent.png
new file mode 100644
index 00000000..756adb0e
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_recent.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_remove.png b/qpython/src/main/res/drawable-xxhdpi/ic_remove.png
new file mode 100644
index 00000000..cde36e1f
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_remove.png differ
diff --git a/qpython/src/main/res/drawable-hdpi/ic_richpush_actionbar_back.png b/qpython/src/main/res/drawable-xxhdpi/ic_richpush_actionbar_back.png
similarity index 100%
rename from qpython/src/main/res/drawable-hdpi/ic_richpush_actionbar_back.png
rename to qpython/src/main/res/drawable-xxhdpi/ic_richpush_actionbar_back.png
diff --git a/qpython/src/main/res/drawable-hdpi/ic_richpush_actionbar_divider.png b/qpython/src/main/res/drawable-xxhdpi/ic_richpush_actionbar_divider.png
similarity index 100%
rename from qpython/src/main/res/drawable-hdpi/ic_richpush_actionbar_divider.png
rename to qpython/src/main/res/drawable-xxhdpi/ic_richpush_actionbar_divider.png
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_right.png b/qpython/src/main/res/drawable-xxhdpi/ic_right.png
new file mode 100644
index 00000000..e6495b29
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_right.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_save1.png b/qpython/src/main/res/drawable-xxhdpi/ic_save1.png
new file mode 100644
index 00000000..38e63c25
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_save1.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_save2.png b/qpython/src/main/res/drawable-xxhdpi/ic_save2.png
new file mode 100644
index 00000000..991e3ff7
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_save2.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_stepin.png b/qpython/src/main/res/drawable-xxhdpi/ic_stepin.png
new file mode 100644
index 00000000..a7685fd7
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_stepin.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_tab2.png b/qpython/src/main/res/drawable-xxhdpi/ic_tab2.png
new file mode 100644
index 00000000..c229624c
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_tab2.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_terminal.png b/qpython/src/main/res/drawable-xxhdpi/ic_terminal.png
new file mode 100644
index 00000000..f4c8867c
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_terminal.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_thumb_up.png b/qpython/src/main/res/drawable-xxhdpi/ic_thumb_up.png
new file mode 100644
index 00000000..bf9d1377
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_thumb_up.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_undo.png b/qpython/src/main/res/drawable-xxhdpi/ic_undo.png
new file mode 100644
index 00000000..d29d41e4
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_undo.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_undo_2.png b/qpython/src/main/res/drawable-xxhdpi/ic_undo_2.png
new file mode 100644
index 00000000..8c1b4512
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_undo_2.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_white_arrow_right.png b/qpython/src/main/res/drawable-xxhdpi/ic_white_arrow_right.png
new file mode 100644
index 00000000..c7b2bdf7
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_white_arrow_right.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/img_course.png b/qpython/src/main/res/drawable-xxhdpi/img_course.png
new file mode 100644
index 00000000..67ac3505
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/img_course.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/img_empty_net.png b/qpython/src/main/res/drawable-xxhdpi/img_empty_net.png
new file mode 100644
index 00000000..0aaf497c
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/img_empty_net.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/img_emptycourse.png b/qpython/src/main/res/drawable-xxhdpi/img_emptycourse.png
new file mode 100644
index 00000000..1e047c56
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/img_emptycourse.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/img_home_bg.png b/qpython/src/main/res/drawable-xxhdpi/img_home_bg.png
new file mode 100644
index 00000000..d462445f
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/img_home_bg.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/img_home_bg_land.png b/qpython/src/main/res/drawable-xxhdpi/img_home_bg_land.png
new file mode 100644
index 00000000..e032af8e
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/img_home_bg_land.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/img_home_logo.png b/qpython/src/main/res/drawable-xxhdpi/img_home_logo.png
new file mode 100644
index 00000000..da6fed3c
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/img_home_logo.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/img_home_logo_3.png b/qpython/src/main/res/drawable-xxhdpi/img_home_logo_3.png
new file mode 100644
index 00000000..02e01bf8
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/img_home_logo_3.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/img_homebar_bg.png b/qpython/src/main/res/drawable-xxhdpi/img_homebar_bg.png
new file mode 100644
index 00000000..a3130737
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/img_homebar_bg.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/img_me_bg.png b/qpython/src/main/res/drawable-xxhdpi/img_me_bg.png
new file mode 100644
index 00000000..4bc48955
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/img_me_bg.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/mohu.png b/qpython/src/main/res/drawable-xxhdpi/mohu.png
new file mode 100644
index 00000000..3b55f3d8
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/mohu.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/panel_bg.9.png b/qpython/src/main/res/drawable-xxhdpi/panel_bg.9.png
new file mode 100644
index 00000000..725a60df
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/panel_bg.9.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/prev.png b/qpython/src/main/res/drawable-xxhdpi/prev.png
new file mode 100644
index 00000000..34792177
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/prev.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/redo.png b/qpython/src/main/res/drawable-xxhdpi/redo.png
new file mode 100644
index 00000000..ec605c8a
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/redo.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/scan_image.png b/qpython/src/main/res/drawable-xxhdpi/scan_image.png
new file mode 100644
index 00000000..fec53c8f
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/scan_image.png differ
diff --git a/qpython/src/main/res/drawable-hdpi/sorry.png b/qpython/src/main/res/drawable-xxhdpi/sorry.png
similarity index 100%
rename from qpython/src/main/res/drawable-hdpi/sorry.png
rename to qpython/src/main/res/drawable-xxhdpi/sorry.png
diff --git a/qpython/src/main/res/drawable-xxhdpi/terminal_mini_icon.png b/qpython/src/main/res/drawable-xxhdpi/terminal_mini_icon.png
new file mode 100644
index 00000000..e55a8fba
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/terminal_mini_icon.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/textfield_black.9.png b/qpython/src/main/res/drawable-xxhdpi/textfield_black.9.png
new file mode 100644
index 00000000..daaa087b
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/textfield_black.9.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/textfield_dracula.9.png b/qpython/src/main/res/drawable-xxhdpi/textfield_dracula.9.png
new file mode 100644
index 00000000..9d284d29
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/textfield_dracula.9.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/textfield_matrix.9.png b/qpython/src/main/res/drawable-xxhdpi/textfield_matrix.9.png
new file mode 100644
index 00000000..5edb5c44
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/textfield_matrix.9.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/textfield_sky.9.png b/qpython/src/main/res/drawable-xxhdpi/textfield_sky.9.png
new file mode 100644
index 00000000..878d1c61
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/textfield_sky.9.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/textfield_white.9.png b/qpython/src/main/res/drawable-xxhdpi/textfield_white.9.png
new file mode 100644
index 00000000..c8e5abab
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/textfield_white.9.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/transparent.png b/qpython/src/main/res/drawable-xxhdpi/transparent.png
new file mode 100644
index 00000000..3411463c
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/transparent.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/undo.png b/qpython/src/main/res/drawable-xxhdpi/undo.png
new file mode 100644
index 00000000..12489094
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/undo.png differ
diff --git a/qpython/src/main/res/drawable-xhdpi-v11/up.png b/qpython/src/main/res/drawable-xxhdpi/up.png
similarity index 100%
rename from qpython/src/main/res/drawable-xhdpi-v11/up.png
rename to qpython/src/main/res/drawable-xxhdpi/up.png
diff --git a/qpython/src/main/res/drawable-xxhdpi/web.png b/qpython/src/main/res/drawable-xxhdpi/web.png
new file mode 100644
index 00000000..3eb5647c
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/web.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/web_light.png b/qpython/src/main/res/drawable-xxhdpi/web_light.png
new file mode 100644
index 00000000..a0f8bb46
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/web_light.png differ
diff --git a/qpython/src/main/res/drawable/bg_item.xml b/qpython/src/main/res/drawable/bg_item.xml
index bf1f44f7..1d513895 100644
--- a/qpython/src/main/res/drawable/bg_item.xml
+++ b/qpython/src/main/res/drawable/bg_item.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true">
-        <shape android:shape="rectangle">
-            <solid android:color="@android:color/holo_orange_dark" />
-        </shape>
-    </item>
-    <item>
-        <shape android:shape="rectangle">
-            <solid android:color="@android:color/white" />
-        </shape>
-    </item>
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true">
+        <shape android:shape="rectangle">
+            <solid android:color="@android:color/holo_orange_dark" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="@android:color/white" />
+        </shape>
+    </item>
 </selector>
\ No newline at end of file
diff --git a/qpython/src/main/res/drawable/checkbox_selector.xml b/qpython/src/main/res/drawable/checkbox_selector.xml
deleted file mode 100644
index 64ab570d..00000000
--- a/qpython/src/main/res/drawable/checkbox_selector.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!--
-  ~ Copyright (C) 2016 Jecelyin Peng <jecelyin@gmail.com>
-  ~
-  ~ This file is part of 920 Text Editor.
-  ~
-  ~ 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.
-  -->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/checkbox_normal" android:state_checked="false" />
-    <item android:drawable="@drawable/checkbox_checked" android:state_checked="true" />
-</selector>
diff --git a/qpython/src/main/res/drawable-hdpi/close_background.xml b/qpython/src/main/res/drawable/close_background.xml
similarity index 100%
rename from qpython/src/main/res/drawable-hdpi/close_background.xml
rename to qpython/src/main/res/drawable/close_background.xml
diff --git a/qpython/src/main/res/drawable/corners_5_white_bg.xml b/qpython/src/main/res/drawable/corners_5_white_bg.xml
new file mode 100644
index 00000000..0efd639c
--- /dev/null
+++ b/qpython/src/main/res/drawable/corners_5_white_bg.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <corners android:radius="5dp"/>
+    <solid android:color="@color/white"/>
+</shape>
\ No newline at end of file
diff --git a/qpython/src/main/res/drawable/drawer_tab_item_background.xml b/qpython/src/main/res/drawable/drawer_tab_item_background.xml
deleted file mode 100644
index 208fc2af..00000000
--- a/qpython/src/main/res/drawable/drawer_tab_item_background.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (C) 2016 Jecelyin Peng <jecelyin@gmail.com>
-  ~
-  ~ This file is part of 920 Text Editor.
-  ~
-  ~ 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.
-  -->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" android:drawable="@drawable/drawer_tab_item_bg_pressed" />
-    <item android:drawable="@drawable/drawer_tab_item_bg_normal" />
-</selector>
\ No newline at end of file
diff --git a/qpython/src/main/res/drawable/drawer_tab_item_bg_normal.xml b/qpython/src/main/res/drawable/drawer_tab_item_bg_normal.xml
deleted file mode 100644
index ab82e86c..00000000
--- a/qpython/src/main/res/drawable/drawer_tab_item_bg_normal.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (C) 2016 Jecelyin Peng <jecelyin@gmail.com>
-  ~
-  ~ This file is part of 920 Text Editor.
-  ~
-  ~ 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.
-  -->
-
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="rectangle">
-            <solid android:color="@color/editor_accent" />
-        </shape>
-    </item>
-    <item android:left="5dp">
-        <shape android:shape="rectangle">
-            <solid android:color="#fff" />
-        </shape>
-    </item>
-</layer-list>
\ No newline at end of file
diff --git a/qpython/src/main/res/drawable/drawer_tab_item_bg_pressed.xml b/qpython/src/main/res/drawable/drawer_tab_item_bg_pressed.xml
deleted file mode 100644
index 62299dad..00000000
--- a/qpython/src/main/res/drawable/drawer_tab_item_bg_pressed.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (C) 2016 Jecelyin Peng <jecelyin@gmail.com>
-  ~
-  ~ This file is part of 920 Text Editor.
-  ~
-  ~ 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.
-  -->
-
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="rectangle">
-            <solid android:color="@color/editor_accent" />
-        </shape>
-    </item>
-    <item android:left="5dp">
-        <shape android:shape="rectangle">
-            <solid android:color="#dfdfdf" />
-        </shape>
-    </item>
-</layer-list>
\ No newline at end of file
diff --git a/qpython/src/main/res/drawable/edit_text_background.xml b/qpython/src/main/res/drawable/edit_text_background.xml
new file mode 100644
index 00000000..af844f4a
--- /dev/null
+++ b/qpython/src/main/res/drawable/edit_text_background.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:left="-2dp"
+        android:right="-2dp"
+        android:top="-2dp">
+        <shape>
+            <solid android:color="@android:color/transparent"/>
+            <stroke
+                android:width="1dp"
+                android:color="#FFE4E4E4"/>
+        </shape>
+    </item>
+
+</layer-list>
\ No newline at end of file
diff --git a/qpython/src/main/res/drawable/edit_text_cursor.xml b/qpython/src/main/res/drawable/edit_text_cursor.xml
new file mode 100644
index 00000000..f516179c
--- /dev/null
+++ b/qpython/src/main/res/drawable/edit_text_cursor.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" >
+    <size android:width="3dp" />
+    <solid android:color="#FF4BAC07"  />
+</shape>
\ No newline at end of file
diff --git a/qpython/src/main/res/drawable/edit_text_green_bg.xml b/qpython/src/main/res/drawable/edit_text_green_bg.xml
new file mode 100644
index 00000000..b63f9896
--- /dev/null
+++ b/qpython/src/main/res/drawable/edit_text_green_bg.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:left="-4dp"
+        android:right="-4dp"
+        android:top="-4dp">
+        <shape>
+            <solid android:color="@android:color/transparent"/>
+            <stroke
+                android:width="2dp"
+                android:color="#FF4BAC07"/>
+        </shape>
+    </item>
+
+</layer-list>
\ No newline at end of file
diff --git a/qpython/src/main/res/drawable/gray_btn_rect.xml b/qpython/src/main/res/drawable/gray_btn_rect.xml
new file mode 100644
index 00000000..17597226
--- /dev/null
+++ b/qpython/src/main/res/drawable/gray_btn_rect.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    >
+    <solid
+        android:color="@color/text_gray"/>
+    <corners
+        android:radius="3dp"/>
+</shape>
\ No newline at end of file
diff --git a/qpython/src/main/res/drawable/gray_line_btn_bg.xml b/qpython/src/main/res/drawable/gray_line_btn_bg.xml
new file mode 100644
index 00000000..3621343c
--- /dev/null
+++ b/qpython/src/main/res/drawable/gray_line_btn_bg.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <stroke
+        android:width="1dp"
+        android:color="@color/text_gray"/>
+</shape>
\ No newline at end of file
diff --git a/qpython/src/main/res/drawable/green_btn_bg.xml b/qpython/src/main/res/drawable/green_btn_bg.xml
new file mode 100644
index 00000000..bce26f9d
--- /dev/null
+++ b/qpython/src/main/res/drawable/green_btn_bg.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    >
+    <solid
+        android:color="#FF4BAC07"/>
+    <corners
+        android:radius="100dp"/>
+</shape>
\ No newline at end of file
diff --git a/qpython/src/main/res/drawable/green_btn_rect.xml b/qpython/src/main/res/drawable/green_btn_rect.xml
new file mode 100644
index 00000000..92951483
--- /dev/null
+++ b/qpython/src/main/res/drawable/green_btn_rect.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    >
+    <solid
+        android:color="#FF4BAC07"/>
+    <corners
+        android:radius="3dp"/>
+</shape>
\ No newline at end of file
diff --git a/qpython/src/main/res/drawable/green_dot_shape.xml b/qpython/src/main/res/drawable/green_dot_shape.xml
new file mode 100644
index 00000000..b21d95ab
--- /dev/null
+++ b/qpython/src/main/res/drawable/green_dot_shape.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+<solid android:color="@color/theme_green"/>
+    <size android:height="5dp" android:width="5dp"/>
+</shape>
\ No newline at end of file
diff --git a/qpython/src/main/res/drawable/green_gray_btn.xml b/qpython/src/main/res/drawable/green_gray_btn.xml
new file mode 100644
index 00000000..39a58fac
--- /dev/null
+++ b/qpython/src/main/res/drawable/green_gray_btn.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:drawable="@drawable/green_btn_rect"
+        android:state_enabled="true"/>
+    <item
+        android:drawable="@drawable/gray_btn_rect"
+        android:state_enabled="false"/>
+
+</selector>
\ No newline at end of file
diff --git a/qpython/src/main/res/drawable/green_rect_line.xml b/qpython/src/main/res/drawable/green_rect_line.xml
new file mode 100644
index 00000000..9272d5c3
--- /dev/null
+++ b/qpython/src/main/res/drawable/green_rect_line.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <stroke
+        android:width="2dp"
+        android:color="@color/theme_green"/>
+</shape>
diff --git a/qpython/src/main/res/drawable/ic_check_circle.xml b/qpython/src/main/res/drawable/ic_check_circle.xml
new file mode 100644
index 00000000..5bd94ed2
--- /dev/null
+++ b/qpython/src/main/res/drawable/ic_check_circle.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="18dp"
+        android:height="18dp"
+        android:viewportHeight="24.0"
+        android:viewportWidth="24.0">
+    <path
+        android:fillColor="@color/colorAccent"
+        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM10,17l-5,-5 1.41,-1.41L10,14.17l7.59,-7.59L19,8l-9,9z"/>
+</vector>
diff --git a/qpython/src/main/res/drawable/ic_clear_24dp.xml b/qpython/src/main/res/drawable/ic_clear_24dp.xml
new file mode 100644
index 00000000..c8204159
--- /dev/null
+++ b/qpython/src/main/res/drawable/ic_clear_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
+</vector>
diff --git a/qpython/src/main/res/drawable/ic_console.xml b/qpython/src/main/res/drawable/ic_console.xml
deleted file mode 100644
index 8d0639fe..00000000
--- a/qpython/src/main/res/drawable/ic_console.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/ic_console_pressed" android:state_pressed="true" />
-    <item android:drawable="@drawable/ic_console_normal" />
-</selector>
\ No newline at end of file
diff --git a/qpython/src/main/res/drawable/ic_editor.xml b/qpython/src/main/res/drawable/ic_editor.xml
deleted file mode 100644
index be64f6c5..00000000
--- a/qpython/src/main/res/drawable/ic_editor.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/ic_editor_pressed" android:state_pressed="true" />
-    <item android:drawable="@drawable/ic_editor_normal" />
-</selector>
\ No newline at end of file
diff --git a/qpython/src/main/res/drawable/ic_libraries.xml b/qpython/src/main/res/drawable/ic_libraries.xml
deleted file mode 100644
index daa6e676..00000000
--- a/qpython/src/main/res/drawable/ic_libraries.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/ic_libraries_pressed" android:state_pressed="true" />
-    <item android:drawable="@drawable/ic_libraries_normal" />
-</selector>
\ No newline at end of file
diff --git a/qpython/src/main/res/drawable/ic_logo_button.xml b/qpython/src/main/res/drawable/ic_logo_button.xml
deleted file mode 100644
index 50587aed..00000000
--- a/qpython/src/main/res/drawable/ic_logo_button.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/ic_logo_button_pressed" android:state_pressed="true" />
-    <item android:drawable="@drawable/ic_logo_button_normal" />
-</selector>
\ No newline at end of file
diff --git a/qpython/src/main/res/drawable/ic_my_qpy.xml b/qpython/src/main/res/drawable/ic_my_qpy.xml
deleted file mode 100644
index 78ec997b..00000000
--- a/qpython/src/main/res/drawable/ic_my_qpy.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/ic_my_qpy_pressed" android:state_pressed="true" />
-    <item android:drawable="@drawable/ic_my_qpy_normal" />
-</selector>
\ No newline at end of file
diff --git a/qpython/src/main/res/drawable/ic_right_a.xml b/qpython/src/main/res/drawable/ic_right_a.xml
new file mode 100644
index 00000000..2972f8ab
--- /dev/null
+++ b/qpython/src/main/res/drawable/ic_right_a.xml
@@ -0,0 +1,9 @@
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+<item android:state_pressed="true" android:drawable="@drawable/ic_right" />
+
+<item android:drawable="@drawable/ic_right" />
+
+<item android:state_checked="true" android:drawable="@drawable/ic_right" />
+
+</selector>
\ No newline at end of file
diff --git a/qpython/src/main/res/drawable/item_background_borderless_material.xml b/qpython/src/main/res/drawable/item_background_borderless_material.xml
deleted file mode 100644
index 322ea7d6..00000000
--- a/qpython/src/main/res/drawable/item_background_borderless_material.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2014 The Android Open Source Project
-
-     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.
--->
-
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="@color/colorControlHighlight" />
diff --git a/qpython/src/main/res/drawable/m_tab_bg.xml b/qpython/src/main/res/drawable/m_tab_bg.xml
deleted file mode 100644
index 66fc4f3d..00000000
--- a/qpython/src/main/res/drawable/m_tab_bg.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (C) 2016 Jecelyin Peng <jecelyin@gmail.com>
-  ~
-  ~ This file is part of 920 Text Editor.
-  ~
-  ~ 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.
-  -->
-
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/item_background_borderless_material" />
-    <item android:drawable="@drawable/m_tab" />
-</layer-list>
diff --git a/qpython/src/main/res/drawable/nav_menu_bg.xml b/qpython/src/main/res/drawable/nav_menu_bg.xml
deleted file mode 100644
index 6c08193e..00000000
--- a/qpython/src/main/res/drawable/nav_menu_bg.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android"></selector>
\ No newline at end of file
diff --git a/qpython/src/main/res/drawable/notebook_checkbox.xml b/qpython/src/main/res/drawable/notebook_checkbox.xml
new file mode 100644
index 00000000..515d6924
--- /dev/null
+++ b/qpython/src/main/res/drawable/notebook_checkbox.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/checked" android:state_checked="true"/>
+    <item android:drawable="@drawable/download"/>
+</selector>
\ No newline at end of file
diff --git a/qpython/src/main/res/drawable/purchase_bg.xml b/qpython/src/main/res/drawable/purchase_bg.xml
new file mode 100644
index 00000000..63e66340
--- /dev/null
+++ b/qpython/src/main/res/drawable/purchase_bg.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <stroke
+        android:width="2dp"
+        android:color="@color/theme_yellow"/>
+</shape>
diff --git a/qpython/src/main/res/drawable/red_line.png b/qpython/src/main/res/drawable/red_line.png
deleted file mode 100644
index 21a2a911..00000000
Binary files a/qpython/src/main/res/drawable/red_line.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-hdpi/richpush_btn_selector.xml b/qpython/src/main/res/drawable/richpush_btn_selector.xml
similarity index 100%
rename from qpython/src/main/res/drawable-hdpi/richpush_btn_selector.xml
rename to qpython/src/main/res/drawable/richpush_btn_selector.xml
diff --git a/qpython/src/main/res/drawable/rotate_arrow.xml b/qpython/src/main/res/drawable/rotate_arrow.xml
new file mode 100644
index 00000000..8e634521
--- /dev/null
+++ b/qpython/src/main/res/drawable/rotate_arrow.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <rotate
+            android:drawable="@drawable/ic_arrow_drop_down_a"
+            android:pivotX="50%"
+            android:pivotY="50%"
+            android:fromDegrees="0"
+            android:toDegrees="180" />
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/qpython/src/main/res/drawable/scrollbar_handle_accelerated_anim2.9.png b/qpython/src/main/res/drawable/scrollbar_handle_accelerated_anim2.9.png
deleted file mode 100644
index 0a28223c..00000000
Binary files a/qpython/src/main/res/drawable/scrollbar_handle_accelerated_anim2.9.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable/select_green_text.xml b/qpython/src/main/res/drawable/select_green_text.xml
new file mode 100644
index 00000000..b524eecf
--- /dev/null
+++ b/qpython/src/main/res/drawable/select_green_text.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@color/Color_White"/>
+    <item android:state_selected="true" android:color="@color/theme_green" />
+</selector>
\ No newline at end of file
diff --git a/qpython/src/main/res/drawable/select_tab_indicator.xml b/qpython/src/main/res/drawable/select_tab_indicator.xml
new file mode 100644
index 00000000..92273b4e
--- /dev/null
+++ b/qpython/src/main/res/drawable/select_tab_indicator.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- UNSELECTED TAB STATE -->
+    <item android:state_pressed="false" android:state_selected="false">
+        <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+            <!-- Bottom indicator color for the UNSELECTED tab state -->
+            <item android:left="-5dp" android:right="-5dp" android:top="-5dp">
+                <shape android:shape="rectangle">
+                    <stroke android:width="2dp" android:color="@color/colorPrimary"/>
+                </shape>
+            </item>
+        </layer-list>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/qpython/src/main/res/drawable/side_nav_bar.xml b/qpython/src/main/res/drawable/side_nav_bar.xml
deleted file mode 100644
index b241f6f5..00000000
--- a/qpython/src/main/res/drawable/side_nav_bar.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <gradient
-        android:angle="135"
-        android:centerColor="#19aafe"
-        android:endColor="#01b1f4"
-        android:startColor="#49b4fc"
-        android:type="linear" />
-</shape>
\ No newline at end of file
diff --git a/qpython/src/main/res/drawable/silver_button.xml b/qpython/src/main/res/drawable/silver_button.xml
new file mode 100644
index 00000000..2885a5b6
--- /dev/null
+++ b/qpython/src/main/res/drawable/silver_button.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true" android:drawable="@drawable/btn_silver_press" />
+    <item android:state_focused="true" android:drawable="@drawable/btn_silver_focus" />
+    <item android:drawable="@drawable/btn_silver" />
+</selector>
diff --git a/qpython/src/main/res/drawable/star_selector.xml b/qpython/src/main/res/drawable/star_selector.xml
new file mode 100644
index 00000000..6b4731a6
--- /dev/null
+++ b/qpython/src/main/res/drawable/star_selector.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_selected="true" android:drawable="@drawable/ic_com_liked"/>
+    <item android:drawable="@drawable/ic_com_like"/>
+</selector>
\ No newline at end of file
diff --git a/qpython/src/main/res/drawable/web_edit_bg.xml b/qpython/src/main/res/drawable/web_edit_bg.xml
deleted file mode 100644
index 90acac7a..00000000
--- a/qpython/src/main/res/drawable/web_edit_bg.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <corners android:radius="4dp" />
-    <solid android:color="@color/white" />
-    <stroke
-        android:width="1dp"
-        android:color="#DDDEE1" />
-    <padding
-        android:bottom="4dp"
-        android:left="4dp"
-        android:right="4dp"
-        android:top="4dp" />
-</shape>
\ No newline at end of file
diff --git a/qpython/src/main/res/drawable/white_dot_shape.xml b/qpython/src/main/res/drawable/white_dot_shape.xml
new file mode 100644
index 00000000..b1c67e16
--- /dev/null
+++ b/qpython/src/main/res/drawable/white_dot_shape.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+<solid android:color="@color/white"/>
+    <size android:height="5dp" android:width="5dp"/>
+</shape>
\ No newline at end of file
diff --git a/qpython/src/main/res/drawable/white_rect_stroke.xml b/qpython/src/main/res/drawable/white_rect_stroke.xml
new file mode 100644
index 00000000..97556408
--- /dev/null
+++ b/qpython/src/main/res/drawable/white_rect_stroke.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <stroke
+        android:width="2dp"
+        android:color="#FFF"/>
+</shape>
\ No newline at end of file
diff --git a/qpython/src/main/res/drawable/white_selectable_item_background.xml b/qpython/src/main/res/drawable/white_selectable_item_background.xml
deleted file mode 100644
index 76f9bd6c..00000000
--- a/qpython/src/main/res/drawable/white_selectable_item_background.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (C) 2016 Jecelyin Peng <jecelyin@gmail.com>
-  ~
-  ~ This file is part of 920 Text Editor.
-  ~
-  ~ 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.
-  -->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" android:drawable="@color/white_selectable_pressed_bg" />
-    <item android:drawable="@color/white_selectable_bg" />
-</selector>
\ No newline at end of file
diff --git a/qpython/src/main/res/drawable/widget_title_background.xml b/qpython/src/main/res/drawable/widget_title_background.xml
new file mode 100644
index 00000000..9f4efaef
--- /dev/null
+++ b/qpython/src/main/res/drawable/widget_title_background.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <solid android:color="#88000000" />
+
+    <padding
+        android:bottom="2dp"
+        android:left="6dp"
+        android:right="6dp"
+        android:top="2dp" />
+
+    <corners android:radius="8dp" />
+
+</shape>
\ No newline at end of file
diff --git a/qpython/src/main/res/drawable/yellow_bg_thumbs_up.xml b/qpython/src/main/res/drawable/yellow_bg_thumbs_up.xml
new file mode 100644
index 00000000..7fa79c9a
--- /dev/null
+++ b/qpython/src/main/res/drawable/yellow_bg_thumbs_up.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape
+            android:shape="oval">
+            <solid
+                android:color="@color/theme_yellow"
+                />
+            <size
+                android:width="50dp"
+                android:height="50dp"/>
+        </shape>
+    </item>
+    <item android:drawable="@drawable/ic_thumb_up"
+          android:bottom="10dp"
+          android:left="10dp"
+          android:right="10dp"
+          android:top="10dp"/>
+</layer-list>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout-land/activity_main.xml b/qpython/src/main/res/layout-land/activity_main.xml
new file mode 100644
index 00000000..daeca16c
--- /dev/null
+++ b/qpython/src/main/res/layout-land/activity_main.xml
@@ -0,0 +1,241 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@drawable/img_home_bg_land"
+        android:orientation="horizontal">
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:gravity="center"
+            android:orientation="vertical">
+
+            <ImageView
+                android:id="@+id/icon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="50dp"
+                android:src="@drawable/img_home_logo"/>
+
+            <ImageView
+                android:id="@+id/ll_qpy_app"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/ic_home_qpyapp"/>
+
+            <TextView
+                android:id="@+id/login"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/login"
+                android:textColor="#FFF"/>
+            <!--<TextView-->
+            <!--android:layout_width="wrap_content"-->
+            <!--android:layout_height="wrap_content"-->
+            <!--android:text="@string/read_from_QR"-->
+            <!--android:textColor="#9B9B9B"/>-->
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_margin="25dp"
+            android:layout_weight="1.2"
+            android:background="#4A4A4A"
+            android:elevation="2dp"
+            android:orientation="vertical">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <LinearLayout
+                    android:id="@+id/ll_terminal"
+                    style="@style/grid_item">
+
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:src="@drawable/ic_home_terminal"/>
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/icon_margin_top"
+                        android:text="@string/terminal"
+                        android:textColor="#FFF"/>
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/ll_editor"
+                    style="@style/grid_item">
+
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:src="@drawable/ic_home_editor"/>
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/icon_margin_top"
+                        android:text="@string/editor"
+                        android:textColor="#FFF"/>
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/ll_file"
+                    style="@style/grid_item">
+
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:src="@drawable/ic_home_file"/>
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/icon_margin_top"
+                        android:text="@string/file"
+                        android:textColor="#FFF"/>
+                </LinearLayout>
+
+
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <LinearLayout
+                    android:id="@+id/iv_scan"
+                    style="@style/grid_item">
+
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:src="@drawable/ic_home_scan"/>
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/icon_margin_top"
+                        android:text="@string/scan"
+                        android:textColor="#FFF"/>
+                </LinearLayout>
+
+
+
+                <LinearLayout
+                    android:id="@+id/ll_library"
+                    style="@style/grid_item">
+
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:src="@drawable/ic_home_library"/>
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/icon_margin_top"
+                        android:text="@string/qpypi_up"
+                        android:textColor="#FFF"/>
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/ll_gist"
+                    style="@style/grid_item">
+
+                    <!--ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:src="@drawable/ic_home_gist"/>
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/icon_margin_top"
+                        android:text="@string/gist"
+                        android:textColor="#FFF"/-->
+                </LinearLayout>
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <LinearLayout
+                    android:id="@+id/ll_setting"
+                    style="@style/grid_item">
+
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:src="@drawable/ic_home_more"/>
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/icon_margin_top"
+                        android:text="@string/more"
+                        android:textColor="#FFF"/>
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/ll_course"
+                    style="@style/row_ll">
+
+                    <!--ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:src="@drawable/ic_home_course"/>
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/icon_margin_top"
+                        android:text="@string/course"
+                        android:textColor="#FFF"/-->
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/ll_community"
+                    style="@style/grid_item">
+
+                    <!--ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:src="@drawable/ic_home_club"/>
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/icon_margin_top"
+                        android:text="@string/community"
+                        android:textColor="#FFF"/-->
+                </LinearLayout>
+
+
+
+
+            </LinearLayout>
+        </LinearLayout>
+    </LinearLayout>
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout-land/include_main_layout.xml b/qpython/src/main/res/layout-land/include_main_layout.xml
deleted file mode 100644
index 4af3ae74..00000000
--- a/qpython/src/main/res/layout-land/include_main_layout.xml
+++ /dev/null
@@ -1,163 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <include layout="@layout/layout_toolbar" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="horizontal">
-
-        <RelativeLayout
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="2"
-            android:background="@color/colorPrimary">
-
-            <de.hdodenhof.circleimageview.CircleImageView
-                android:id="@+id/logo_image"
-                android:layout_width="@dimen/main_logo_img_size"
-                android:layout_height="@dimen/main_logo_img_size"
-                android:layout_centerInParent="true"
-                android:background="@drawable/ic_logo_button" />
-        </RelativeLayout>
-
-
-        <LinearLayout
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:orientation="vertical">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="1"
-                android:orientation="vertical">
-
-                <RelativeLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="0dp"
-                    android:layout_weight="1">
-
-                    <LinearLayout
-                        android:id="@+id/item_lin_console"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_centerInParent="true"
-                        android:orientation="vertical">
-
-                        <ImageView
-                            android:layout_width="@dimen/main_icon_size"
-                            android:layout_height="@dimen/main_icon_size"
-                            android:layout_gravity="center_horizontal"
-                            android:layout_marginTop="@dimen/main_icon_margin_top"
-                            android:src="@drawable/ic_console" />
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center_horizontal"
-                            android:text="@string/console" />
-                    </LinearLayout>
-                </RelativeLayout>
-
-                <RelativeLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="0dp"
-                    android:layout_weight="1">
-
-                    <LinearLayout
-                        android:id="@+id/item_lin_editor"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_centerInParent="true"
-                        android:orientation="vertical">
-
-                        <ImageView
-                            android:layout_width="@dimen/main_icon_size"
-                            android:layout_height="@dimen/main_icon_size"
-                            android:layout_gravity="center_horizontal"
-                            android:layout_marginTop="@dimen/main_icon_margin_top"
-                            android:src="@drawable/ic_editor" />
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center_horizontal"
-                            android:text="@string/editor" />
-                    </LinearLayout>
-                </RelativeLayout>
-            </LinearLayout>
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:orientation="vertical">
-
-            <RelativeLayout
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="1">
-
-                <LinearLayout
-                    android:id="@+id/item_lin_program"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_centerInParent="true"
-                    android:orientation="vertical">
-
-                    <ImageView
-                        android:layout_width="@dimen/main_icon_size"
-                        android:layout_height="@dimen/main_icon_size"
-                        android:layout_gravity="center_horizontal"
-                        android:layout_marginTop="@dimen/main_icon_margin_top"
-                        android:src="@drawable/ic_my_qpy" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_horizontal"
-                        android:text="@string/program" />
-                </LinearLayout>
-
-
-            </RelativeLayout>
-
-            <RelativeLayout
-
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="1">
-
-                <LinearLayout
-                    android:id="@+id/item_lin_library_manager"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_centerInParent="true"
-                    android:orientation="vertical">
-
-                    <ImageView
-                        android:layout_width="@dimen/main_icon_size"
-                        android:layout_height="@dimen/main_icon_size"
-                        android:layout_gravity="center_horizontal"
-                        android:layout_marginTop="@dimen/main_icon_margin_top"
-                        android:src="@drawable/ic_libraries" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_horizontal"
-                        android:text="@string/library_manager" />
-                </LinearLayout>
-            </RelativeLayout>
-        </LinearLayout>
-    </LinearLayout>
-
-
-</LinearLayout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout-v11/widget.xml b/qpython/src/main/res/layout-v11/widget.xml
new file mode 100644
index 00000000..761fac16
--- /dev/null
+++ b/qpython/src/main/res/layout-v11/widget.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/widgetLayout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:padding="@dimen/widget_margin" >
+
+    <ImageView
+        android:id="@+id/icon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal|top"
+        android:padding="2dp"
+        android:src="@null" />
+
+    <TextView
+        android:id="@+id/textFileName"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom|center_horizontal"
+        android:layout_marginBottom="8dp"
+        android:ellipsize="end"
+        android:gravity="center_horizontal|bottom"
+        android:shadowColor="#000000"
+        android:shadowDy="2"
+        android:shadowRadius="4"
+        android:singleLine="true"
+        android:text=""
+        android:textColor="#ffffff"
+        android:textSize="12dp" />
+
+</FrameLayout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout-v14/buttons_ok_cancel.xml b/qpython/src/main/res/layout-v14/buttons_ok_cancel.xml
new file mode 100644
index 00000000..88f2629e
--- /dev/null
+++ b/qpython/src/main/res/layout-v14/buttons_ok_cancel.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal" >
+
+    <Button
+        android:id="@+id/buttonCancel"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:text="@string/ui_cancel" />
+
+    <View
+        android:layout_width="@dimen/dialog_buttons_margin"
+        android:layout_height="match_parent" />
+
+    <Button
+        android:id="@+id/buttonOk"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:text="@string/ui_ok" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/about.xml b/qpython/src/main/res/layout/about.xml
new file mode 100644
index 00000000..3c376a0c
--- /dev/null
+++ b/qpython/src/main/res/layout/about.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <RelativeLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/about_box"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:background="@color/colorPrimary"
+        android:orientation="vertical">
+        <FrameLayout
+            android:layout_height="wrap_content"
+            android:layout_width="fill_parent"
+            android:layout_weight="1"
+            >
+        <ScrollView
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            >
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
+
+            <include
+                android:id="@+id/lt"
+                layout="@layout/layout_toolbar"/>
+
+            <TextView
+                android:id="@+id/title"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="5dp"
+                android:paddingLeft="10dp"
+                android:paddingRight="10dp"
+                android:text="@string/log"
+                android:textColor="@color/colorAccent"
+                android:textSize="17sp"/>
+
+            <TextView
+                android:id="@+id/time"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="5dp"
+                android:paddingLeft="10dp"
+                android:paddingRight="10dp"
+                android:textColor="@color/colorAccent"
+                android:visibility="gone"
+                />
+
+            <TextView
+                android:id="@+id/path"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="5dp"
+                android:paddingLeft="10dp"
+                android:paddingRight="10dp"
+                android:textColor="@color/colorAccent"
+                />
+
+            <View
+                android:id="@+id/about_line"
+                style="@style/p_line"
+                />
+
+            <TextView
+                android:id="@+id/content"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:paddingLeft="10dp"
+                android:paddingRight="10dp"
+                android:text="@string/about_content"
+                android:textColor="#FFF"
+                />
+        </LinearLayout>
+        </ScrollView>
+        </FrameLayout>>
+
+
+        <!--ImageButton
+            android:id="@+id/ib_mail"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:background="@color/colorPrimaryDark"
+            android:padding="5.0dip"
+            android:src="@drawable/ic_action_mail"
+            /-->
+
+    </RelativeLayout>
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/about_generic.xml b/qpython/src/main/res/layout/about_generic.xml
new file mode 100644
index 00000000..66733bca
--- /dev/null
+++ b/qpython/src/main/res/layout/about_generic.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+    <TextView
+        style="@style/TextTitle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:text="@string/ui_contact_title" />
+
+    <TextView
+        style="@style/TextContent"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/ui_feedback" />
+
+
+    <Button
+        android:id="@+id/buttonRate"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="@dimen/dialog_buttons_margin"
+        android:text="@string/ui_app_rating" />
+
+
+    <TextView
+        style="@style/TextTitle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:text="@string/ui_licence_title" />
+
+    <TextView
+        style="@style/TextContent"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:autoLink="email"
+        android:text="@string/ui_licence_content" />
+
+    <TextView
+        style="@style/TextTitle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:text="@string/ui_art_licence_title" />
+
+    <TextView
+        style="@style/TextContent"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:autoLink="email"
+        android:text="@string/ui_art_licence_content" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/activity_about.xml b/qpython/src/main/res/layout/activity_about.xml
index b7df01a9..5bd4ddb6 100644
--- a/qpython/src/main/res/layout/activity_about.xml
+++ b/qpython/src/main/res/layout/activity_about.xml
@@ -1,307 +1,111 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/background_grey"
-    android:orientation="vertical">
+<layout>
 
-    <android.support.design.widget.AppBarLayout
+    <ScrollView
+        xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize">
+        android:layout_height="match_parent"
+        android:scrollbars="none">
 
-        <include layout="@layout/layout_toolbar" />
-    </android.support.design.widget.AppBarLayout>
-
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_margin="8dp"
-        android:text="@string/setting_about_all" />
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="0.5dp"
-        android:background="@color/divider" />
-
-    <RelativeLayout
-        android:id="@+id/setting_about_layout"
-        android:layout_width="match_parent"
-        android:layout_height="40dp"
-        android:background="@drawable/bg_layout"
-        android:orientation="vertical">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_marginLeft="14dp"
-            android:layout_marginStart="14dp"
-            android:text="@string/setting_about"
-            android:textColor="@color/text_dark"
-            android:textSize="14sp" />
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="0.5dp"
-            android:layout_alignParentBottom="true"
-            android:layout_marginLeft="14dp"
-            android:layout_marginStart="14dp"
-            android:background="@color/divider_light" />
-
-    </RelativeLayout>
-
-    <RelativeLayout
-        android:id="@+id/setting_feedback_layout"
-        android:layout_width="match_parent"
-        android:layout_height="40dp"
-        android:background="@drawable/bg_layout"
-        android:orientation="vertical">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_marginLeft="14dp"
-            android:layout_marginStart="14dp"
-            android:text="@string/setting_back"
-            android:textColor="@color/text_dark"
-            android:textSize="14sp" />
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="0.5dp"
-            android:layout_alignParentBottom="true"
-            android:layout_marginLeft="14dp"
-            android:layout_marginStart="14dp"
-            android:background="@color/divider_light" />
-
-    </RelativeLayout>
-
-    <RelativeLayout
-        android:id="@+id/setting_mark_layout"
-        android:layout_width="match_parent"
-        android:layout_height="40dp"
-        android:background="@drawable/bg_layout"
-        android:orientation="vertical">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_marginLeft="14dp"
-            android:layout_marginStart="14dp"
-            android:text="@string/setting_mark"
-            android:textColor="@color/text_dark"
-            android:textSize="14sp" />
-
-    </RelativeLayout>
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="0.5dp"
-        android:background="@color/divider" />
-
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_margin="8dp"
-        android:text="@string/more" />
-
-
-    <RelativeLayout
-        android:id="@+id/setting_lib_manager"
-        android:layout_width="match_parent"
-        android:layout_height="40dp"
-        android:background="@drawable/bg_layout"
-        android:orientation="vertical">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_marginLeft="14dp"
-            android:layout_marginStart="14dp"
-            android:text="@string/lib_manager"
-            android:textColor="@color/text_dark"
-            android:textSize="14sp" />
-
-        <View
+        <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="0.5dp"
-            android:layout_alignParentBottom="true"
-            android:layout_marginLeft="14dp"
-            android:layout_marginStart="14dp"
-            android:background="@color/divider_light" />
-
-    </RelativeLayout>
-
-
-    <RelativeLayout
-        android:id="@+id/setting_sl4a_server"
-        android:layout_width="match_parent"
-        android:layout_height="40dp"
-        android:background="@drawable/bg_layout"
-        android:orientation="vertical">
-
-        <TextView
-            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_marginLeft="14dp"
-            android:layout_marginStart="14dp"
-            android:text="@string/sl4a_server"
-            android:textColor="@color/text_dark"
-            android:textSize="14sp" />
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="0.5dp"
-            android:layout_alignParentBottom="true"
-            android:layout_marginLeft="14dp"
-            android:layout_marginStart="14dp"
-            android:background="@color/divider_light" />
-
-    </RelativeLayout>
-
-
-    <RelativeLayout
-        android:id="@+id/setting_normal_program"
-        android:layout_width="match_parent"
-        android:layout_height="40dp"
-        android:background="@drawable/bg_layout"
-        android:orientation="vertical">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_marginLeft="14dp"
-            android:layout_marginStart="14dp"
-            android:text="@string/normal_program"
-            android:textColor="@color/text_dark"
-            android:textSize="14sp" />
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="0.5dp"
-            android:layout_alignParentBottom="true"
-            android:layout_marginLeft="14dp"
-            android:layout_marginStart="14dp"
-            android:background="@color/divider_light" />
-
-    </RelativeLayout>
-
-
-    <RelativeLayout
-        android:id="@+id/setting_qpypi"
-        android:layout_width="match_parent"
-        android:layout_height="40dp"
-        android:background="@drawable/bg_layout"
-        android:orientation="vertical">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_marginLeft="14dp"
-            android:layout_marginStart="14dp"
-            android:text="@string/qpypi"
-            android:textColor="@color/text_dark"
-            android:textSize="14sp" />
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="0.5dp"
-            android:layout_alignParentBottom="true"
-            android:layout_marginLeft="14dp"
-            android:layout_marginStart="14dp"
-            android:background="@color/divider_light" />
-
-    </RelativeLayout>
-
-
-    <RelativeLayout
-        android:id="@+id/setting_internal_space"
-        android:layout_width="match_parent"
-        android:layout_height="40dp"
-        android:background="@drawable/bg_layout"
-        android:orientation="vertical">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_marginLeft="14dp"
-            android:layout_marginStart="14dp"
-            android:text="@string/internal_space"
-            android:textColor="@color/text_dark"
-            android:textSize="14sp" />
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="0.5dp"
-            android:layout_alignParentBottom="true"
-            android:layout_marginLeft="14dp"
-            android:layout_marginStart="14dp"
-            android:background="@color/divider_light" />
-
-    </RelativeLayout>
-
-
-    <RelativeLayout
-        android:id="@+id/setting_ftp_server"
-        android:layout_width="match_parent"
-        android:layout_height="40dp"
-        android:background="@drawable/bg_layout"
-        android:orientation="vertical">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_marginLeft="14dp"
-            android:layout_marginStart="14dp"
-            android:text="@string/ftp_server"
-            android:textColor="@color/text_dark"
-            android:textSize="14sp" />
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="0.5dp"
-            android:layout_alignParentBottom="true"
-            android:layout_marginLeft="14dp"
-            android:layout_marginStart="14dp"
-            android:background="@color/divider_light" />
-
-    </RelativeLayout>
-
-
-    <RelativeLayout
-        android:id="@+id/setting_update"
-        android:layout_width="match_parent"
-        android:layout_height="40dp"
-        android:layout_marginTop="15dp"
-        android:background="@drawable/bg_layout"
-        android:orientation="vertical">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
-            android:layout_marginLeft="14dp"
-            android:layout_marginStart="14dp"
-            android:text="@string/setting_update"
-            android:textColor="@color/text_dark"
-            android:textSize="14sp" />
-
-    </RelativeLayout>
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="0.5dp"
-        android:background="@color/divider" />
-
-
-</LinearLayout>
\ No newline at end of file
+            android:background="@color/colorPrimaryDark"
+            android:orientation="vertical">
+
+            <include
+                layout="@layout/layout_toolbar"/>
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginTop="40dp"
+                android:src="@drawable/img_home_logo"/>
+
+            <TextView
+                android:id="@+id/version"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginTop="30dp"
+                android:textColor="#FFF"/>
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="30dp"
+                android:background="@drawable/white_rect_stroke"
+                android:padding="@dimen/default_margin"
+                android:text="@string/qpy_description"
+                android:textColor="#FFF"
+                android:textSize="18sp"/>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:background="@color/toolbar"/>
+
+            <TextView
+                android:id="@+id/tv_privacy"
+                style="@style/setting_tv"
+                android:text="@string/privacy_title"/>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:background="@color/toolbar"/>
+
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <TextView
+                    android:id="@+id/tv_update"
+                    style="@style/setting_tv"
+                    android:text="@string/check_update"/>
+
+                <TextView
+                    android:id="@+id/tv_new_hint"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+                    android:layout_marginRight="60dp"
+                    android:gravity="center_vertical"
+                    android:text="@string/already_newest"
+                    android:textColor="@color/text_color_hint"/>
+            </RelativeLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:background="@color/toolbar"/>
+
+            <TextView
+                android:id="@+id/tv_star"
+                style="@style/setting_tv"
+                android:text="@string/star_it"/>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:background="@color/toolbar"/>
+
+            <TextView
+                android:id="@+id/tv_feedback"
+                style="@style/setting_tv"
+                android:text="@string/feedback"/>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:background="@color/toolbar"/>
+
+            <TextView
+                android:id="@+id/tv_thanks"
+                style="@style/setting_tv"
+                android:text="@string/thank"/>
+        </LinearLayout>
+    </ScrollView>
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/activity_add_gist.xml b/qpython/src/main/res/layout/activity_add_gist.xml
new file mode 100644
index 00000000..297c3fa4
--- /dev/null
+++ b/qpython/src/main/res/layout/activity_add_gist.xml
@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    >
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <android.support.design.widget.AppBarLayout
+            xmlns:android="http://schemas.android.com/apk/res/android"
+            xmlns:app="http://schemas.android.com/apk/res-auto"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize">
+
+            <android.support.v7.widget.Toolbar
+                android:id="@+id/toolbar"
+                style="@style/Toolbar"
+                android:layout_width="match_parent"
+                android:layout_height="?attr/actionBarSize"
+                android:background="#FF4A4A4A"
+                android:elevation="2dp"
+                app:contentInsetEnd="0dp"
+                app:popupTheme="@style/DefaultBlueToolbar"
+                app:theme="@style/ToolbarTheme">
+
+                <Button
+                    android:id="@+id/send_btn"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="end"
+                    android:background="@null"
+                    android:text="@string/post"
+                    android:textColor="@color/text_gray"/>
+            </android.support.v7.widget.Toolbar>
+
+        </android.support.design.widget.AppBarLayout>
+
+        <ScrollView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+                <!--<android.support.design.widget.TextInputLayout-->
+                <!--android:layout_width="match_parent"-->
+                <!--android:layout_height="wrap_content"-->
+                <!--android:layout_marginTop="20dp">-->
+
+                <!--<android.support.design.widget.TextInputEditText-->
+                <!--android:id="@+id/title"-->
+                <!--android:layout_width="match_parent"-->
+                <!--android:layout_height="wrap_content"-->
+                <!--android:layout_margin="@dimen/default_margin"-->
+                <!--android:hint="@string/gist_title"-->
+                <!--/>-->
+                <!--</android.support.design.widget.TextInputLayout>-->
+
+                <android.support.design.widget.TextInputLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="10dp">
+
+                    <android.support.design.widget.TextInputEditText
+                        android:id="@+id/description"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_margin="@dimen/default_margin"
+                        android:layout_marginTop="10dp"
+                        android:hint="@string/summary"
+                        />
+                </android.support.design.widget.TextInputLayout>
+
+                <TextView
+                    android:id="@+id/text_count"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="end"
+                    android:layout_marginEnd="@dimen/default_margin"
+                    android:layout_marginRight="@dimen/default_margin"
+                    android:textColor="@color/text_gray"/>
+
+                <FrameLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="200dp"
+                    android:padding="@dimen/default_margin">
+
+                    <org.qpython.qpy.texteditor.ui.view.AdvancedEditText
+                        android:id="@+id/code_content_tv"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:background="@color/white"
+                        android:gravity="top|start"
+                        android:imeOptions="flagNoFullscreen"
+                        android:inputType="textMultiLine|textNoSuggestions"
+                        android:padding="@dimen/default_margin"
+                        android:scrollbarAlwaysDrawHorizontalTrack="true"
+                        android:scrollbarAlwaysDrawVerticalTrack="true"
+                        android:scrollbarSize="5dp"
+                        android:scrollbars="horizontal|vertical"
+                        android:typeface="monospace"
+                        />
+
+                    <ProgressBar
+                        android:id="@+id/progress_bar"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_horizontal"
+                        android:visibility="gone"/>
+
+                </FrameLayout>
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_gravity="center"
+                android:orientation="vertical"
+                android:padding="@dimen/default_margin">
+
+
+                <CheckBox
+                    android:id="@+id/dess"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_gravity="center"
+
+                    android:text="@string/gist_own"
+                    android:textColor="@color/text_gray"
+                    android:checked="true"
+                    android:clickable="false"/>
+
+                <CheckBox
+                    android:id="@+id/gist_share"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_gravity="center"
+
+                    android:text="@string/gist_intro"
+                    android:textColor="@color/text_gray"/>
+
+
+            </LinearLayout>
+
+            </LinearLayout>
+        </ScrollView>
+    </LinearLayout>
+
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/activity_code_detail.xml b/qpython/src/main/res/layout/activity_code_detail.xml
new file mode 100644
index 00000000..1dc341ae
--- /dev/null
+++ b/qpython/src/main/res/layout/activity_code_detail.xml
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <android.support.v4.widget.NestedScrollView
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/scroll"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
+
+            <include
+                android:id="@+id/lt"
+                layout="@layout/layout_toolbar"/>
+
+            <RelativeLayout
+                android:id="@+id/top"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/lt"
+                android:padding="@dimen/default_margin">
+
+                <ImageView
+                    android:id="@+id/avatar"
+                    android:layout_width="30dp"
+                    android:layout_height="30dp"
+                    android:layout_marginBottom="10dp"
+                    android:layout_marginEnd="@dimen/default_margin"
+                    android:layout_marginRight="@dimen/default_margin"
+                    android:src="@drawable/empty"/>
+
+                <TextView
+                    android:id="@+id/name"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_toEndOf="@id/avatar"
+                    android:layout_toRightOf="@id/avatar"
+                    android:textColor="#FFF"
+                    android:textSize="12sp"/>
+
+                <TextView
+                    android:id="@+id/date"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignBottom="@id/avatar"
+                    android:layout_toEndOf="@id/avatar"
+                    android:layout_toRightOf="@id/avatar"
+                    android:textSize="12sp"/>
+
+                <TextView
+                    android:id="@+id/bookmark_count"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentEnd="true"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+                    android:drawableLeft="@drawable/ic_com_like"
+                    android:drawablePadding="5dp"
+                    android:drawableStart="@drawable/ic_com_like"
+                    android:textSize="12sp"/>
+
+            </RelativeLayout>
+
+
+            <TextView
+                android:id="@+id/title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/top"
+                android:layout_marginBottom="10dp"
+                android:layout_marginLeft="@dimen/default_margin"
+                android:layout_marginRight="@dimen/default_margin"
+                android:ellipsize="end"
+                android:maxLines="3"
+                android:textColor="#FFF"/>
+
+            <TextView
+                android:id="@+id/description"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/title"
+                android:layout_marginLeft="@dimen/default_margin"
+                android:layout_marginRight="@dimen/default_margin"
+                android:layout_marginTop="10dp"
+                android:textColor="#FFF"/>
+
+            <TextView
+                android:id="@+id/code"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/description"
+                android:layout_margin="@dimen/default_margin"
+                android:layout_marginLeft="@dimen/default_margin"
+                android:layout_marginStart="@dimen/default_margin"
+                android:background="#FFF"
+                android:padding="10dp"
+                android:textColor="@color/text_gray"/>
+
+            <Button
+                android:id="@+id/btn_copy"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/code"
+                android:layout_centerHorizontal="true"
+                android:layout_gravity="center_horizontal"
+                android:background="@drawable/green_btn_rect"
+                android:padding="10dp"
+                android:text="@string/copy_hint"/>
+
+            <TextView
+                android:id="@+id/comment_count"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentEnd="true"
+                android:layout_alignParentRight="true"
+                android:layout_below="@id/btn_copy"
+                android:layout_marginEnd="@dimen/default_margin"
+                android:layout_marginRight="@dimen/default_margin"
+                android:layout_marginTop="10dp"
+                android:drawableLeft="@drawable/ic_com_comment"
+                android:drawablePadding="5dp"
+                android:drawableStart="@drawable/ic_com_comment"
+                android:textSize="12sp"/>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_below="@id/comment_count"
+                android:layout_marginTop="10dp"
+                android:background="@color/colorPrimary"/>
+
+            <TextView
+                android:id="@+id/empty_hint"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/comment_count"
+                android:layout_centerInParent="true"
+                android:layout_marginTop="30dp"
+                android:drawablePadding="5dp"
+                android:drawableTop="@drawable/empty"
+                android:paddingBottom="100dp"
+                android:text="@string/sofa_hint"/>
+
+            <android.support.v7.widget.RecyclerView
+                android:id="@+id/recyclerView"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_below="@id/comment_count"
+                android:layout_marginTop="11dp"/>
+        </RelativeLayout>
+    </android.support.v4.widget.NestedScrollView>
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/activity_code_share.xml b/qpython/src/main/res/layout/activity_code_share.xml
new file mode 100644
index 00000000..20876a84
--- /dev/null
+++ b/qpython/src/main/res/layout/activity_code_share.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <include
+            android:id="@+id/lt"
+            layout="@layout/layout_toolbar"/>
+
+        <LinearLayout
+            xmlns:android="http://schemas.android.com/apk/res/android"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <LinearLayout
+                android:id="@+id/btns"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+                <Button
+                    android:id="@+id/btn_project"
+                    style="@style/tab_btn"
+                    android:text="@string/project"/>
+
+                <Button
+                    android:id="@+id/btn_script"
+                    style="@style/tab_btn"
+                    android:text="@string/script"/>
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/lines"
+                android:layout_width="match_parent"
+                android:layout_height="3dp"
+                android:orientation="horizontal">
+
+                <View
+                    android:id="@+id/line_one"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:background="#FF4BAC07"/>
+
+                <View
+                    android:id="@+id/line_two"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:background="@color/theme_bg"/>
+            </LinearLayout>
+        </LinearLayout>
+
+
+        <android.support.v4.view.ViewPager
+            android:id="@+id/viewPager"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"/>
+
+    </LinearLayout>
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/activity_community.xml b/qpython/src/main/res/layout/activity_community.xml
new file mode 100644
index 00000000..c1cbe5f4
--- /dev/null
+++ b/qpython/src/main/res/layout/activity_community.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <include
+            android:id="@+id/lt"
+            layout="@layout/layout_toolbar"/>
+
+        <org.qpython.qpy.main.widget.MyNestedScrollView
+            android:id="@+id/scroll"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_below="@id/lt"
+            android:fillViewport="true">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+                <com.quseit.view.AdSlidShowView
+                    android:id="@+id/ad_slide"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:focusable="true"
+                    android:focusableInTouchMode="true"/>
+
+                <include
+                    android:id="@+id/tabs"
+                    layout="@layout/tabs"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"/>
+
+                <org.qpython.qpy.main.widget.WrapContentHeightViewPager
+                    android:id="@+id/vp"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"/>
+            </LinearLayout>
+        </org.qpython.qpy.main.widget.MyNestedScrollView>
+
+        <ProgressBar
+            android:id="@+id/progress_bar"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"/>
+
+        <include
+            android:id="@+id/top_tabs"
+            layout="@layout/tabs"
+            android:layout_width="match_parent"
+            android:visibility="gone"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/lt"/>
+    </RelativeLayout>
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/activity_course.xml b/qpython/src/main/res/layout/activity_course.xml
new file mode 100644
index 00000000..517c9092
--- /dev/null
+++ b/qpython/src/main/res/layout/activity_course.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <RelativeLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/root"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        >
+
+        <include
+            android:id="@+id/lt"
+            layout="@layout/layout_toolbar"/>
+
+        <org.qpython.qpy.main.widget.MyNestedScrollView
+            android:id="@+id/scroll"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_below="@id/lt"
+            android:fillViewport="true">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+                <com.quseit.view.AdSlidShowView
+                    android:id="@+id/ad_slide"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:focusable="true"
+                    android:focusableInTouchMode="true"/>
+
+                <include
+                    android:id="@+id/tabs"
+                    layout="@layout/tabs"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"/>
+
+                <org.qpython.qpy.main.widget.WrapContentHeightViewPager
+                    android:id="@+id/vp"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"/>
+            </LinearLayout>
+        </org.qpython.qpy.main.widget.MyNestedScrollView>
+
+        <ProgressBar
+            android:id="@+id/progress_bar"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"/>
+
+        <include
+            android:id="@+id/top_tabs"
+            layout="@layout/tabs"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/lt"/>
+    </RelativeLayout>
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/activity_course_crowdfunding.xml b/qpython/src/main/res/layout/activity_course_crowdfunding.xml
new file mode 100644
index 00000000..04199e2d
--- /dev/null
+++ b/qpython/src/main/res/layout/activity_course_crowdfunding.xml
@@ -0,0 +1,284 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    >
+
+    <data>
+
+        <variable
+            name="course"
+            type="org.qpython.qpy.main.server.model.CourseModel"/>
+    </data>
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/colorPrimaryDark"
+        android:orientation="vertical">
+
+        <include
+            android:id="@+id/tl"
+            layout="@layout/layout_toolbar"/>
+
+        <org.qpython.qpy.main.widget.MyNestedScrollView
+            android:id="@+id/scroll"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_below="@id/tl"
+            android:layout_marginBottom="40dp">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="vertical">
+
+
+                <RelativeLayout
+                    android:id="@+id/img"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+
+                    <org.qpython.qpy.main.widget.RatioImageView
+                        android:id="@+id/iv_theme"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:background="@color/white"
+                        android:scaleType="fitXY"
+                        android:src="@drawable/img_course"
+                        android:transitionName="img"/>
+
+                    <TextView
+                        android:id="@+id/tv_level"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignBottom="@id/iv_theme"
+                        android:layout_alignEnd="@id/iv_theme"
+                        android:layout_alignRight="@id/iv_theme"
+                        android:background="@color/theme_yellow"
+                        android:paddingBottom="3dp"
+                        android:paddingLeft="5dp"
+                        android:paddingRight="5dp"
+                        android:paddingTop="3dp"
+                        android:textColor="#FFF"
+                        android:textSize="12sp"
+                        android:textStyle="bold"
+                        android:transitionName="level"/>
+                </RelativeLayout>
+
+                <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+
+                    <TextView
+                        android:id="@+id/tv_title"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:ellipsize="end"
+                        android:maxLines="1"
+                        android:paddingLeft="@dimen/default_margin"
+                        android:paddingRight="@dimen/default_margin"
+                        android:paddingTop="@dimen/default_margin"
+                        android:text="@{course.title}"
+                        android:textColor="#FFF"
+                        android:textSize="16sp"
+                        android:textStyle="bold"
+                        android:transitionName="title"/>
+
+                </RelativeLayout>
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="@dimen/default_margin"
+                    android:layout_marginStart="@dimen/default_margin"
+                    android:layout_marginTop="@dimen/default_margin"
+                    android:text="@string/course_introduction"
+                    android:textColor="#FFF"/>
+
+                <TextView
+                    android:id="@+id/course_desc"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="@dimen/default_margin"
+                    android:layout_marginStart="@dimen/default_margin"
+                    android:text="@{course.description}"/>
+
+                <TextView
+                    android:id="@+id/author_text"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="@dimen/default_margin"
+                    android:layout_marginStart="@dimen/default_margin"
+                    android:layout_marginTop="10dp"
+                    android:text="@string/author"
+                    android:textColor="#FFF"/>
+
+                <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingBottom="@dimen/default_margin"
+                    android:paddingLeft="@dimen/default_margin"
+                    android:paddingRight="@dimen/default_margin"
+                    android:paddingTop="5dp">
+
+
+                    <ImageView
+                        android:id="@+id/author_avatar"
+                        android:layout_width="60dp"
+                        android:layout_height="60dp"
+                        android:layout_marginEnd="@dimen/default_margin"
+                        android:layout_marginRight="@dimen/default_margin"
+                        android:src="@drawable/img_home_logo"/>
+
+                    <TextView
+                        android:id="@+id/author_desc"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignBottom="@id/author_avatar"
+                        android:layout_marginTop="10dp"
+                        android:layout_toEndOf="@id/author_avatar"
+                        android:layout_toRightOf="@id/author_avatar"
+                        android:text="@{course.auth_desc}"/>
+
+                    <TextView
+                        android:id="@+id/author_name"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_above="@id/author_desc"
+                        android:layout_toEndOf="@id/author_avatar"
+                        android:layout_toRightOf="@id/author_avatar"
+                        android:text="@{course.auth}"
+                        android:textColor="#FFF"
+                        android:textStyle="bold"/>
+                </RelativeLayout>
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:padding="@dimen/default_margin"
+                    android:text="@string/course_content"
+                    android:textColor="#FFF"
+                    android:textSize="16sp"
+                    android:textStyle="bold"/>
+
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:background="@color/colorPrimary"/>
+
+
+                <org.qpython.qpy.main.widget.NonScrollListView
+                    android:id="@+id/rv_index"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:scrollbars="none"/>
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="10dp"
+                    android:background="@color/colorPrimary"/>
+
+                <org.qpython.qpy.main.widget.scheduleview.ScheduleView
+                    android:id="@+id/schedule"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="46dp"
+                    android:layout_marginRight="46dp"
+                    android:layout_marginTop="@dimen/default_margin"
+                    app:dot_radius="8dp"
+                    app:margin="15dp"
+                    app:text_size="14sp"/>
+
+                <RelativeLayout
+                    android:id="@+id/purchase"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
+                    android:layout_marginTop="10dp">
+
+                    <Button
+                        android:id="@+id/support_btn"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:background="@color/theme_yellow"
+                        android:paddingLeft="@dimen/default_margin"
+                        android:paddingRight="@dimen/default_margin"
+                        android:text="@string/funding"
+                        android:textColor="#000"
+                        android:textSize="16sp"/>
+
+                    <ImageButton
+                        android:id="@+id/thumb_btn"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/default_margin"
+                        android:background="@drawable/yellow_bg_thumbs_up"
+                        android:visibility="gone"/>
+                </RelativeLayout>
+
+                <TextView
+                    android:id="@+id/support_percent"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:paddingLeft="@dimen/default_margin"
+                    android:paddingRight="@dimen/default_margin"
+                    android:layout_gravity="center_horizontal"
+                    android:layout_marginBottom="@dimen/default_margin"
+                    android:layout_marginTop="5dp"
+                    android:textColor="#FFF"/>
+
+                <TextView
+                    android:id="@+id/explanation"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingBottom="@dimen/default_margin"
+                    android:paddingLeft="@dimen/default_margin"
+                    android:paddingRight="@dimen/default_margin"
+                    android:text="@string/explanation"
+                    android:textColor="#FF9B9B9B"/>
+
+                <org.qpython.qpy.main.widget.expandableview.ExpandableRelativeLayout
+                    android:id="@+id/explanation_more"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+
+                    <TextView
+                        android:id="@+id/more_text"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:paddingLeft="@dimen/default_margin"
+                        android:paddingRight="@dimen/default_margin"
+                        android:text="@string/explanation_more"
+                        android:textColor="#FF9B9B9B"/>
+                </org.qpython.qpy.main.widget.expandableview.ExpandableRelativeLayout>
+
+                <TextView
+                    android:id="@+id/more"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="end"
+                    android:paddingBottom="@dimen/default_margin"
+                    android:paddingLeft="@dimen/default_margin"
+                    android:paddingRight="@dimen/default_margin"
+                    android:text="@string/more"/>
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="10dp"
+                    android:background="@color/colorPrimary"/>
+            </LinearLayout>
+
+        </org.qpython.qpy.main.widget.MyNestedScrollView>
+
+        <Button
+            android:id="@+id/btn_start_learn"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:background="@drawable/green_gray_btn"
+            android:text="@string/start_learn"/>
+    </RelativeLayout>
+
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/activity_course_index.xml b/qpython/src/main/res/layout/activity_course_index.xml
new file mode 100644
index 00000000..daedea95
--- /dev/null
+++ b/qpython/src/main/res/layout/activity_course_index.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    >
+
+    <data>
+
+        <variable
+            name="course"
+            type="org.qpython.qpy.main.server.model.CourseModel"/>
+    </data>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/colorPrimary"
+        android:orientation="vertical">
+
+        <include
+            android:id="@+id/tl"
+            layout="@layout/layout_toolbar"/>
+
+        <include
+            android:id="@+id/item"
+            app:course="@{course}"
+            layout="@layout/item_course"/>
+
+        <ListView
+            android:id="@+id/rv_index"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginTop="10dp"
+            android:background="@color/colorPrimaryDark"
+            android:scrollbars="none"/>
+
+    </LinearLayout>
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/activity_decoder.xml b/qpython/src/main/res/layout/activity_decoder.xml
deleted file mode 100644
index 2fe7981e..00000000
--- a/qpython/src/main/res/layout/activity_decoder.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <com.dlazaro66.qrcodereaderview.QRCodeReaderView
-        android:id="@+id/qrdecoderview"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentTop="true" />
-
-    <TextView
-        android:id="@+id/exampleTextView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentTop="true"
-        android:layout_centerHorizontal="true"
-        android:layout_marginTop="20dp"
-        android:text="Large Text"
-        android:textAppearance="?android:attr/textAppearanceLarge" />
-
-    <com.quseit.qpython.zxing.activity.FinderView
-        android:id="@+id/capture_viewfinder_view"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_gravity="center"
-        android:background="@android:color/transparent" />
-
-    <ImageView
-        android:id="@+id/red_line_image"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:src="@mipmap/scan_laser" />
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/activity_down.xml b/qpython/src/main/res/layout/activity_down.xml
deleted file mode 100644
index 629f7498..00000000
--- a/qpython/src/main/res/layout/activity_down.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <android.support.design.widget.AppBarLayout
-        android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize">
-
-        <include layout="@layout/layout_toolbar" />
-    </android.support.design.widget.AppBarLayout>
-
-    <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <ProgressBar
-            android:id="@+id/progressbar"
-            style="?android:attr/progressBarStyleLarge"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:visibility="gone" />
-
-        <TextView
-            android:id="@+id/tv_load_failed"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:text="@string/download_error"
-            android:visibility="gone" />
-
-
-        <android.support.v4.widget.SwipeRefreshLayout
-            android:id="@+id/swipeRefreshLayout"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-            <android.support.v7.widget.RecyclerView
-                android:id="@+id/recyclerView"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent" />
-
-        </android.support.v4.widget.SwipeRefreshLayout>
-    </FrameLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/activity_free_course.xml b/qpython/src/main/res/layout/activity_free_course.xml
new file mode 100644
index 00000000..a735634f
--- /dev/null
+++ b/qpython/src/main/res/layout/activity_free_course.xml
@@ -0,0 +1,326 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <android.support.constraint.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <include
+            android:id="@+id/tl"
+            layout="@layout/layout_toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="0.0"/>
+
+        <org.qpython.qpy.main.widget.RatioImageView
+            android:id="@+id/iv_theme"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:background="@color/white"
+            android:scaleType="fitXY"
+            android:src="@drawable/img_course"
+            android:transitionName="img"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/tl"/>
+
+        <TextView
+            android:id="@+id/tv_level"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignBottom="@id/iv_theme"
+            android:layout_alignEnd="@id/iv_theme"
+            android:layout_alignRight="@id/iv_theme"
+            android:background="@color/theme_yellow"
+            android:paddingBottom="3dp"
+            android:paddingLeft="5dp"
+            android:paddingRight="5dp"
+            android:paddingTop="3dp"
+            android:textColor="#FFF"
+            android:textSize="12sp"
+            android:textStyle="bold"
+            android:transitionName="level"
+            app:layout_constraintBottom_toBottomOf="@+id/iv_theme"
+            app:layout_constraintEnd_toEndOf="@+id/iv_theme"
+            app:layout_constraintHorizontal_bias="1.0"
+            app:layout_constraintStart_toStartOf="@+id/iv_theme"
+            app:layout_constraintTop_toTopOf="@+id/iv_theme"
+            app:layout_constraintVertical_bias="1.0"/>
+
+        <TextView
+            android:id="@+id/tv_title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:ellipsize="end"
+            android:maxLines="1"
+            android:padding="@dimen/default_margin"
+            android:textColor="#FFF"
+            android:textSize="16sp"
+            android:textStyle="bold"
+            android:transitionName="title"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/iv_theme"
+            app:layout_constraintVertical_bias="0.0"/>
+
+        <TextView
+            android:id="@+id/textView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="8dp"
+            android:layout_marginEnd="16dp"
+            android:layout_marginRight="16dp"
+            android:layout_marginTop="8dp"
+            android:drawableTop="@drawable/ic_com_share"
+            android:text="@string/share"
+            android:textColor="@color/text_gray"
+            app:layout_constraintBottom_toBottomOf="@+id/tv_title"
+            app:layout_constraintEnd_toEndOf="@+id/tv_title"
+            app:layout_constraintTop_toTopOf="@+id/tv_title"/>
+
+        <TextView
+            android:id="@+id/author"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="8dp"
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="8dp"
+            android:text="@string/author"
+            android:textColor="#FFF"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.023"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/tv_title"/>
+
+        <TextView
+            android:id="@+id/textView5"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="8dp"
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="8dp"
+            android:text="@string/course_introduction"
+            android:textColor="#FFF"
+            android:textSize="16sp"
+            android:textStyle="bold"
+            app:layout_constraintEnd_toStartOf="@+id/intro_expand"
+            app:layout_constraintHorizontal_bias="0.038"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/author"/>
+
+        <TextView
+            android:id="@+id/intro_expand"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentEnd="true"
+            android:layout_alignParentRight="true"
+            android:layout_marginBottom="8dp"
+            android:layout_marginEnd="16dp"
+            android:layout_marginRight="16dp"
+            android:text="@string/show"
+            android:textColor="#FF9B9B9B"
+            app:layout_constraintBottom_toBottomOf="@+id/textView5"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="@+id/textView5"/>
+
+        <org.qpython.qpy.main.widget.expandableview.ExpandableRelativeLayout
+            android:id="@+id/intro_content"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/colorPrimaryDark"
+            android:paddingEnd="@dimen/default_margin"
+            android:paddingLeft="@dimen/default_margin"
+            android:paddingRight="@dimen/default_margin"
+            android:paddingStart="@dimen/default_margin"
+            app:ael_interpolator="fastOutSlowIn"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/textView5">
+
+            <TextView
+                android:id="@+id/course_desc"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textColor="#FFF"/>
+
+            <TextView
+                android:id="@+id/author_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/course_desc"
+                android:layout_marginTop="10dp"
+                android:text="@string/about_the_author"
+                android:textColor="#FFF"
+                android:textSize="16sp"
+                android:textStyle="bold"/>
+
+            <ImageView
+                android:id="@+id/author_avatar"
+                android:layout_width="60dp"
+                android:layout_height="60dp"
+                android:layout_below="@id/author_text"
+                android:layout_marginTop="10dp"/>
+
+            <TextView
+                android:id="@+id/author_name"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignTop="@id/author_avatar"
+                android:layout_toEndOf="@id/author_avatar"
+                android:layout_toRightOf="@id/author_avatar"
+                android:textColor="#FFF"
+                android:textStyle="bold"/>
+
+            <TextView
+                android:id="@+id/author_desc"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/author_name"
+                android:layout_marginTop="10dp"
+                android:layout_toEndOf="@id/author_avatar"
+                android:layout_toRightOf="@id/author_avatar"/>
+        </org.qpython.qpy.main.widget.expandableview.ExpandableRelativeLayout>
+
+        <TextView
+            android:id="@+id/textView6"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="16dp"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="8dp"
+            android:text="@string/course_content"
+            android:textColor="#FFF"
+            android:textSize="16sp"
+            android:textStyle="bold"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/intro_content"/>
+
+        <TextView
+            android:id="@+id/content_expand"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentEnd="true"
+            android:layout_alignParentRight="true"
+            android:layout_marginBottom="8dp"
+            android:layout_marginEnd="8dp"
+            android:layout_marginStart="8dp"
+            android:text="@string/show"
+            android:textColor="#FF9B9B9B"
+            app:layout_constraintBottom_toBottomOf="@+id/textView6"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.966"
+            app:layout_constraintStart_toEndOf="@+id/textView6"
+            app:layout_constraintTop_toTopOf="@+id/textView6"
+            app:layout_constraintVertical_bias="0.0"/>
+
+        <org.qpython.qpy.main.widget.expandableview.ExpandableRelativeLayout
+            android:id="@+id/course_content"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="8dp"
+            android:layout_marginEnd="8dp"
+            android:layout_marginStart="8dp"
+            android:background="@color/colorPrimaryDark"
+            app:ael_interpolator="fastOutSlowIn"
+            app:layout_constraintBottom_toTopOf="@+id/view"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/textView6"
+            app:layout_constraintVertical_bias="0.0">
+
+            <org.qpython.qpy.main.widget.NonScrollListView
+                android:id="@+id/rv_index"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:scrollbars="none"/>
+        </org.qpython.qpy.main.widget.expandableview.ExpandableRelativeLayout>
+
+        <View
+            android:id="@+id/view"
+            android:layout_width="match_parent"
+            android:layout_height="8dp"
+            android:layout_marginTop="8dp"
+            android:background="@color/colorPrimary"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/textView6"/>
+
+        <View
+            android:id="@+id/view2"
+            android:layout_width="match_parent"
+            android:layout_height="10dp"
+            android:layout_marginTop="20dp"
+            android:background="@color/colorPrimary"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/textView7"/>
+
+        <TextView
+            android:id="@+id/textView7"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="8dp"
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="28dp"
+            android:drawablePadding="16dp"
+            android:drawableTop="@drawable/yellow_bg_thumbs_up"
+            android:text="@string/crowdfunding"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/view"/>
+
+
+        <WebView
+            android:id="@+id/from_content"
+            android:layout_width="match_parent"
+            android:layout_height="17dp"
+            android:layout_marginBottom="8dp"
+            android:background="@color/colorPrimaryDark"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/view2"
+            app:layout_constraintVertical_bias="0.0"/>
+
+        <ProgressBar
+            android:id="@+id/progress_bar"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:layout_margin="@dimen/default_margin"
+            android:layout_marginBottom="8dp"
+            android:layout_marginEnd="8dp"
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="16dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="@+id/from_content"
+            app:layout_constraintHorizontal_bias="0.498"
+            app:layout_constraintStart_toStartOf="@+id/from_content"
+            app:layout_constraintTop_toTopOf="@+id/from_content"/>
+
+        <TextView
+            android:id="@+id/author_name_top"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="8dp"
+            android:layout_marginLeft="4dp"
+            android:layout_marginStart="4dp"
+            app:layout_constraintBottom_toBottomOf="@+id/author"
+            app:layout_constraintStart_toEndOf="@+id/author"
+            app:layout_constraintTop_toTopOf="@+id/author"
+            app:layout_constraintVertical_bias="0.0"/>
+    </android.support.constraint.ConstraintLayout>
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/activity_ftp.xml b/qpython/src/main/res/layout/activity_ftp.xml
new file mode 100644
index 00000000..38234206
--- /dev/null
+++ b/qpython/src/main/res/layout/activity_ftp.xml
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/theme_bg"
+        android:orientation="vertical">
+
+        <include
+            layout="@layout/layout_toolbar"/>
+
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/theme_bg"
+            android:gravity="center"
+            android:padding="@dimen/default_margin"
+            android:textColor="#FFF"/>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="@color/toolbar"/>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:padding="@dimen/default_margin">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:text="@string/service_toggle"
+                android:textColor="#FFF"/>
+
+            <org.qpython.qpy.main.widget.ToggleView
+                android:id="@+id/tb_open"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"/>
+        </RelativeLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="@color/toolbar"/>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:padding="@dimen/default_margin">
+
+            <TextView
+                style="@style/param_hint"
+                android:text="@string/ftp_root"/>
+
+            <TextView
+                android:id="@+id/tv_path"
+                style="@style/param_text"/>
+        </RelativeLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="@color/toolbar"/>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:padding="@dimen/default_margin">
+
+            <TextView
+                style="@style/param_hint"
+                android:text="@string/port_hint"/>
+
+            <TextView
+                android:id="@+id/tv_port"
+                style="@style/param_text"/>
+        </RelativeLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="@color/toolbar"/>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:padding="@dimen/default_margin">
+
+            <TextView
+                style="@style/param_hint"
+                android:text="@string/ftp_account"/>
+
+            <TextView
+                android:id="@+id/tv_account"
+                style="@style/param_text"/>
+        </RelativeLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="@color/toolbar"/>
+    </LinearLayout>
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/activity_funding_purchase.xml b/qpython/src/main/res/layout/activity_funding_purchase.xml
new file mode 100644
index 00000000..ca015ba0
--- /dev/null
+++ b/qpython/src/main/res/layout/activity_funding_purchase.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <android.support.constraint.ConstraintLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <include
+            android:id="@+id/lt"
+            layout="@layout/layout_toolbar"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"/>
+
+
+        <TextView
+            android:id="@+id/tv_thanks"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginEnd="8dp"
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="56dp"
+            android:text="@string/thanks"
+            android:textColor="#FFF"
+            android:textSize="24sp"
+            android:visibility="gone"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/lt"/>
+
+        <TextView
+            android:id="@+id/price"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="8dp"
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="64dp"
+            android:background="@drawable/purchase_bg"
+            android:gravity="center"
+            android:padding="@dimen/default_margin"
+            android:textColor="@color/theme_yellow"
+            android:textStyle="bold"
+            android:visibility="gone"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/tv_thanks"/>
+
+        <include
+            android:id="@+id/no_data"
+            layout="@layout/widget_no_net"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:layout_marginBottom="8dp"
+            android:layout_marginEnd="8dp"
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="8dp"
+            android:visibility="gone"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"/>
+
+        <ProgressBar
+            android:id="@+id/pb"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:visibility="gone"/>
+    </android.support.constraint.ConstraintLayout>
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/activity_lib.xml b/qpython/src/main/res/layout/activity_lib.xml
new file mode 100644
index 00000000..a041be94
--- /dev/null
+++ b/qpython/src/main/res/layout/activity_lib.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:app="http://schemas.android.com/apk/res-auto"
+        xmlns:android="http://schemas.android.com/apk/res/android"
+    >
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/colorPrimary"
+        android:orientation="vertical">
+
+
+        <include
+            layout="@layout/layout_toolbar"/>
+
+        <android.support.design.widget.TabLayout
+            android:id="@+id/tabs"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/colorPrimaryDark"
+            android:textSize="16sp"
+            app:tabBackground="@drawable/select_tab_indicator"/>
+
+        <android.support.v4.view.ViewPager
+            android:id="@+id/vp"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@color/colorPrimaryDark"/>
+    </LinearLayout>
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/activity_local_app.xml b/qpython/src/main/res/layout/activity_local_app.xml
new file mode 100644
index 00000000..ef51f7e5
--- /dev/null
+++ b/qpython/src/main/res/layout/activity_local_app.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/rootView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@drawable/mohu"
+        android:orientation="vertical"
+        android:padding="@dimen/default_margin">
+
+        <TextView
+            android:id="@+id/tv_folder_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:text="@string/qpy_app"
+            android:textColor="#FFF"
+            android:textSize="28sp"/>
+
+        <android.support.v7.widget.RecyclerView
+            android:id="@+id/rv_app"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginTop="40dp"
+            android:background="@null"/>
+    </LinearLayout>
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/activity_local_plugin_install.xml b/qpython/src/main/res/layout/activity_local_plugin_install.xml
index 3e8df8a1..ebd57e37 100644
--- a/qpython/src/main/res/layout/activity_local_plugin_install.xml
+++ b/qpython/src/main/res/layout/activity_local_plugin_install.xml
@@ -1,22 +1,23 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <android.support.v7.widget.Toolbar
-        android:id="@+id/toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        android:background="?attr/colorPrimary"
-        app:popupTheme="@style/DefaultBlueToolbar"
-        app:titleTextColor="@color/white" />
-
-
-    <FrameLayout
-        android:id="@+id/container"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              xmlns:app="http://schemas.android.com/apk/res-auto"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:orientation="vertical">
+
+    <!--<android.support.v7.widget.Toolbar-->
+    <!--android:id="@+id/toolbar"-->
+    <!--android:layout_width="match_parent"-->
+    <!--android:layout_height="?attr/actionBarSize"-->
+    <!--android:background="?attr/colorPrimary"-->
+    <!--app:popupTheme="@style/DefaultBlueToolbar"-->
+    <!--app:titleTextColor="@color/white" />-->
+    <include
+        layout="@layout/layout_toolbar"/>
+
+    <FrameLayout
+        android:id="@+id/container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+
 </LinearLayout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/activity_main.xml b/qpython/src/main/res/layout/activity_main.xml
index 458eaddc..265907b4 100644
--- a/qpython/src/main/res/layout/activity_main.xml
+++ b/qpython/src/main/res/layout/activity_main.xml
@@ -1,29 +1,256 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/drawer_layout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:fitsSystemWindows="true"
-    tools:openDrawer="start">
-
-    <include
-        layout="@layout/include_main_layout"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+<layout>
 
-    <android.support.design.widget.NavigationView
-        android:id="@+id/nav_view"
-        android:layout_width="wrap_content"
+    <LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_gravity="start"
-        android:fitsSystemWindows="true"
-        android:theme="@style/nav_menu_style"
-        app:headerLayout="@layout/nav_header_main"
-        app:itemTextColor="@color/gray"
-        app:menu="@menu/activity_main_drawer" />
+        android:background="@drawable/img_home_bg"
+        android:gravity="center_horizontal"
+        android:orientation="vertical">
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            android:background="@drawable/img_homebar_bg"
+            android:padding="@dimen/layout_padding">
+
+            <ImageView
+                android:id="@+id/icon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerHorizontal="true"
+                android:layout_marginTop="@dimen/layout_padding"
+                android:src="@drawable/img_home_logo"/>
+        </RelativeLayout>
+
+        <ImageView
+            android:id="@+id/ll_qpy_app"
+            android:layout_width="wrap_content"
+            android:layout_height="0dp"
+            android:layout_weight="2"
+            android:src="@drawable/ic_home_qpyapp"/>
+
+        <TextView
+            android:id="@+id/login"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/login"
+            android:textColor="#FFF"/>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_margin="25dp"
+            android:layout_weight="5"
+            android:background="#4A4A4A"
+            android:orientation="vertical">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <LinearLayout
+                    android:id="@+id/ll_terminal"
+                    style="@style/row_ll">
+
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:src="@drawable/ic_home_terminal"/>
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/icon_margin_top"
+                        android:text="@string/terminal"
+                        android:textColor="#FFF"/>
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/ll_editor"
+                    style="@style/row_ll">
+
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:src="@drawable/ic_home_editor"/>
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/icon_margin_top"
+                        android:text="@string/editor"
+                        android:textColor="#FFF"/>
+                </LinearLayout>
+
+
+                <LinearLayout
+                    android:id="@+id/ll_file"
+                    style="@style/row_ll">
+
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:src="@drawable/ic_home_file"/>
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/icon_margin_top"
+                        android:text="@string/file"
+                        android:textColor="#FFF"/>
+                </LinearLayout>
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <LinearLayout
+                    android:id="@+id/iv_scan"
+                    style="@style/row_ll">
+
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:src="@drawable/ic_home_scan"/>
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/icon_margin_top"
+                        android:text="@string/scan"
+                        android:textColor="#FFF"/>
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/ll_library"
+                    style="@style/row_ll">
+
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:src="@drawable/ic_home_library"/>
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/icon_margin_top"
+                        android:text="@string/qpypi_up"
+                        android:textColor="#FFF"/>
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/ll_gist"
+                    style="@style/row_ll">
+
+                    <!--ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:src="@drawable/ic_home_gist"/>
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/icon_margin_top"
+                        android:text="@string/gist"
+                        android:textColor="#FFF"/-->
+                </LinearLayout>
+
+                <!--<LinearLayout-->
+                <!--android:id="@+id/ll_local_app"-->
+                <!--style="@style/row_ll">-->
+
+                <!--<ImageView-->
+                <!--android:layout_width="wrap_content"-->
+                <!--android:layout_height="wrap_content"-->
+                <!--android:src="@drawable/ic_home_app"/>-->
+
+                <!--<TextView-->
+                <!--android:layout_width="wrap_content"-->
+                <!--android:layout_height="wrap_content"-->
+                <!--android:layout_marginTop="@dimen/icon_margin_top"-->
+                <!--android:text="@string/local_app"-->
+                <!--android:textColor="#FFF"/>-->
+                <!--</LinearLayout>-->
+
+
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <LinearLayout
+                    android:id="@+id/ll_setting"
+                    style="@style/row_ll">
+
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:src="@drawable/ic_home_more"/>
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/icon_margin_top"
+                        android:text="@string/more"
+                        android:textColor="#FFF"/>
+                </LinearLayout>
+
+
+                <LinearLayout
+                    android:id="@+id/ll_course"
+                    style="@style/row_ll">
+
+                    <!--ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:src="@drawable/ic_home_course"/>
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/icon_margin_top"
+                        android:text="@string/course"
+                        android:textColor="#FFF"/-->
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/ll_community"
+                    style="@style/row_ll">
+
+                    <!--ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:src="@drawable/ic_home_club"/>
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/icon_margin_top"
+                        android:text="@string/community"
+                        android:textColor="#FFF"/-->
+                </LinearLayout>
+
+
 
 
-</android.support.v4.widget.DrawerLayout>
+            </LinearLayout>
+        </LinearLayout>
+    </LinearLayout>
 
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/activity_my_share.xml b/qpython/src/main/res/layout/activity_my_share.xml
new file mode 100644
index 00000000..bc35a42e
--- /dev/null
+++ b/qpython/src/main/res/layout/activity_my_share.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <include
+            android:id="@+id/lt"
+            layout="@layout/layout_toolbar"/>
+
+        <android.support.design.widget.TabLayout
+            android:id="@+id/tabs"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/colorPrimaryDark"
+            android:textSize="16sp"
+            app:tabBackground="@drawable/select_tab_indicator"
+            app:tabSelectedTextColor="@color/theme_green"
+            app:tabTextColor="@color/white"/>
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+            <android.support.v4.view.ViewPager
+                android:id="@+id/vp"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"/>
+            <ProgressBar
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:id="@+id/progress_bar"
+                android:visibility="gone"/>
+        </FrameLayout>
+
+    </LinearLayout>
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/activity_news_detail.xml b/qpython/src/main/res/layout/activity_news_detail.xml
new file mode 100644
index 00000000..6f6734cc
--- /dev/null
+++ b/qpython/src/main/res/layout/activity_news_detail.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <include
+            android:id="@+id/lt"
+            layout="@layout/layout_toolbar"/>
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+            <android.support.v4.widget.SwipeRefreshLayout
+                android:id="@+id/refresh_layou"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+                <android.support.v7.widget.RecyclerView
+                    android:id="@+id/news_rv"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"/>
+            </android.support.v4.widget.SwipeRefreshLayout>
+
+            <LinearLayout
+                android:id="@+id/comment_layout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="bottom"
+                android:background="@color/colorPrimary"
+                android:gravity="center_vertical"
+                android:orientation="horizontal"
+                android:paddingBottom="10dp"
+                android:paddingLeft="20dp"
+                android:paddingRight="20dp"
+                android:paddingTop="10dp"
+                android:visibility="gone">
+
+                <EditText
+                    android:id="@+id/comment_edit"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:hint="input"
+                    android:textColor="@color/white"
+                    android:textColorHint="@color/text_gray"
+                    />
+
+                <TextView
+                    android:id="@+id/send_tv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="20dp"
+                    android:text="SEND"
+                    android:textColor="@color/theme_green"
+                    android:textSize="16sp"
+                    android:layout_marginStart="20dp"/>
+            </LinearLayout>
+
+            <ProgressBar
+                android:id="@+id/progress_bar"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:visibility="gone"/>
+        </FrameLayout>
+    </LinearLayout>
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/activity_notebook.xml b/qpython/src/main/res/layout/activity_notebook.xml
new file mode 100644
index 00000000..53c50dde
--- /dev/null
+++ b/qpython/src/main/res/layout/activity_notebook.xml
@@ -0,0 +1,237 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <ProgressBar
+            android:id="@+id/WebViewProgress"
+            style="?android:attr/progressBarStyleHorizontal"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/toolbar_layout"
+            android:layout_marginLeft="0dip"
+            android:layout_marginRight="0dip"
+            android:elevation="2dp"
+            android:indeterminate="false"
+            android:maxHeight="3dp"
+            android:minHeight="3dp"/>
+
+        <android.support.design.widget.AppBarLayout
+            xmlns:app="http://schemas.android.com/apk/res-auto"
+            android:id="@+id/toolbar_layout"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize">
+
+            <android.support.v7.widget.Toolbar
+                android:id="@+id/toolbar"
+                style="@style/Toolbar"
+                android:layout_width="match_parent"
+                android:layout_height="?attr/actionBarSize"
+                android:background="#FF4A4A4A"
+                android:elevation="2dp"
+                app:popupTheme="@style/DefaultBlueToolbar"
+                app:theme="@style/ToolbarTheme">
+
+                <Spinner
+                    android:id="@+id/spinner_toolbar"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:visibility="gone"/>
+            </android.support.v7.widget.Toolbar>
+
+        </android.support.design.widget.AppBarLayout>
+
+        <org.qpython.qpy.main.widget.WebviewEX
+            android:id="@+id/web_view"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_above="@+id/bottom_layout"
+            android:layout_below="@+id/toolbar_layout"
+            >
+
+        </org.qpython.qpy.main.widget.WebviewEX>
+
+        <ProgressBar
+            android:id="@+id/progress_bar"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:visibility="gone"/>
+
+        <TextView
+            android:id="@+id/error_tv"
+            android:layout_width="250dp"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:text="Notebook resource is not released"
+            android:textColor="@color/black"
+            android:visibility="gone"/>
+
+        <LinearLayout
+            android:id="@+id/bottom_layout"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/shortcut_height"
+            android:layout_alignParentBottom="true"
+            android:background="#FFE8E8E8"
+            android:orientation="horizontal">
+
+
+            <ImageView
+                android:id="@+id/switch_terminal_img"
+                android:layout_width="47dp"
+                android:layout_height="47dp"
+                android:layout_gravity="center_vertical"
+                android:padding="6dp"
+                android:src="@drawable/ic_open"
+                />
+
+            <View
+                android:layout_width="2dp"
+                android:layout_height="21dp"
+                android:layout_gravity="center_vertical"
+                android:layout_marginLeft="5dp"
+                android:layout_marginRight="5dp"
+                android:background="#FFD5D5D5"/>
+
+            <HorizontalScrollView
+                android:id="@+id/hs_shortcut"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="#FFE8E8E8"
+                android:baselineAligned="false"
+                android:fadingEdgeLength="30dp"
+                android:requiresFadingEdge="horizontal">
+
+                <LinearLayout
+                    xmlns:android="http://schemas.android.com/apk/res/android"
+                    android:id="@+id/ll_control"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+
+                    <ImageView
+                        android:id="@+id/markdown_add_img"
+                        android:layout_width="47dp"
+                        android:layout_height="47dp"
+                        android:layout_gravity="center_vertical"
+                        android:padding="6dp"
+                        android:src="@drawable/ic_edittext_add"
+                        />
+
+                    <ImageView
+                        android:id="@+id/code_add_img"
+                        android:layout_width="47dp"
+                        android:layout_height="47dp"
+                        android:layout_gravity="center_vertical"
+                        android:padding="6dp"
+                        android:src="@drawable/ic_editcode_add"
+                        />
+
+                    <ImageView
+                        android:id="@+id/save_img"
+                        android:layout_width="47dp"
+                        android:layout_height="47dp"
+                        android:layout_gravity="center_vertical"
+                        android:padding="6dp"
+                        android:src="@drawable/ic_save2"
+                        />
+
+
+                    <ImageView
+                        android:id="@+id/stepin_img"
+                        android:layout_width="47dp"
+                        android:layout_height="47dp"
+                        android:layout_gravity="center_vertical"
+                        android:padding="6dp"
+                        android:src="@drawable/ic_stepin"
+                        />
+
+
+
+                    <ImageView
+                        android:id="@+id/undo_img"
+                        android:layout_width="47dp"
+                        android:layout_height="47dp"
+                        android:layout_gravity="center_vertical"
+                        android:padding="6dp"
+                        android:src="@drawable/ic_undo"
+                        android:visibility="gone"
+                        />
+
+                    <ImageView
+                        android:id="@+id/switch_code_img"
+                        android:layout_width="47dp"
+                        android:layout_height="47dp"
+                        android:layout_gravity="center_vertical"
+                        android:padding="6dp"
+                        android:src="@drawable/ic_editcode"
+                        />
+
+                    <ImageView
+                        android:id="@+id/switch_markdown_img"
+                        android:layout_width="47dp"
+                        android:layout_height="47dp"
+                        android:layout_gravity="center_vertical"
+                        android:padding="6dp"
+                        android:src="@drawable/ic_edittext"
+                        />
+
+                    <ImageView
+                        android:id="@+id/playall_img"
+                        android:layout_width="47dp"
+                        android:layout_height="47dp"
+                        android:layout_gravity="center_vertical"
+                        android:padding="6dp"
+                        android:src="@drawable/ic_play"
+                        />
+
+                    <ImageView
+                        android:id="@+id/refresh_img"
+                        android:layout_width="47dp"
+                        android:layout_height="47dp"
+                        android:layout_gravity="center_vertical"
+                        android:padding="12dp"
+                        android:src="@drawable/ic_library_reinstall"
+                        android:tint="@color/colorPrimary"
+                        />
+
+
+                    <ImageView
+                        android:id="@+id/cell_down_img"
+                        android:layout_width="47dp"
+                        android:layout_height="47dp"
+                        android:layout_gravity="center_vertical"
+                        android:padding="6dp"
+                        android:src="@drawable/ic_editor_arrow_down"
+                        />
+
+                    <ImageView
+                        android:id="@+id/cell_up_img"
+                        android:layout_width="47dp"
+                        android:layout_height="47dp"
+                        android:layout_gravity="center_vertical"
+                        android:padding="6dp"
+                        android:src="@drawable/ic_editor_arrow_up"
+                        />
+
+
+                    <ImageView
+                        android:id="@+id/delete_cell_img"
+                        android:layout_width="47dp"
+                        android:layout_height="47dp"
+                        android:layout_gravity="center_vertical"
+                        android:padding="14dp"
+                        android:src="@drawable/ic_com_delete"
+                        android:tint="@color/colorPrimary"
+                        />
+
+    
+                </LinearLayout>
+            </HorizontalScrollView>
+        </LinearLayout>
+    </RelativeLayout>
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/activity_notebooklist.xml b/qpython/src/main/res/layout/activity_notebooklist.xml
new file mode 100644
index 00000000..b3685534
--- /dev/null
+++ b/qpython/src/main/res/layout/activity_notebooklist.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+        <android.support.design.widget.AppBarLayout
+            xmlns:android="http://schemas.android.com/apk/res/android"
+            xmlns:app="http://schemas.android.com/apk/res-auto"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize">
+
+            <android.support.v7.widget.Toolbar
+                android:id="@+id/toolbar"
+                style="@style/Toolbar"
+                android:layout_width="match_parent"
+                android:layout_height="?attr/actionBarSize"
+                android:background="#FF4A4A4A"
+                android:elevation="2dp"
+                app:popupTheme="@style/DefaultBlueToolbar"
+                app:theme="@style/ToolbarTheme"/>
+        </android.support.design.widget.AppBarLayout>
+        <RelativeLayout
+            android:id="@+id/rl_path"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="#FF363636">
+
+            <TextView
+                android:id="@+id/tv_path"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentLeft="true"
+                android:layout_alignParentStart="true"
+                android:layout_centerVertical="true"
+                android:layout_marginLeft="@dimen/default_margin"
+                android:layout_marginRight="@dimen/default_margin"
+                android:layout_toLeftOf="@+id/iv_new_folder"
+                android:layout_toStartOf="@+id/iv_new_folder"
+                android:ellipsize="start"
+                android:gravity="start"
+                android:singleLine="true"
+                android:textColor="#FF9B9B9B"
+                android:text="/"/>
+
+            <ImageView
+                android:id="@+id/iv_new_folder"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentEnd="true"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:layout_marginEnd="@dimen/default_margin"
+                android:layout_marginRight="@dimen/default_margin"
+                android:src="@drawable/ic_editor_newfolder"
+                android:visibility="gone"/>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_alignParentBottom="true"
+                android:background="@color/colorPrimary"/>
+        </RelativeLayout>
+        <android.support.v7.widget.RecyclerView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:id="@+id/rv_files"/>
+    </LinearLayout>
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/activity_plugin_manager.xml b/qpython/src/main/res/layout/activity_plugin_manager.xml
index 20da2d39..739de711 100644
--- a/qpython/src/main/res/layout/activity_plugin_manager.xml
+++ b/qpython/src/main/res/layout/activity_plugin_manager.xml
@@ -1,32 +1,32 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <android.support.v7.widget.Toolbar
-
-        android:id="@+id/toolbar"
-        style="@style/AppTheme.AppBarOverlay"
-        android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        android:background="@color/colorPrimary"
-        android:title="@string/title_plugin_manage"
-        app:navigationIcon="@drawable/ic_arrow_back" />
-
-    <android.support.design.widget.TabLayout
-        android:id="@+id/tab_layout"
-        android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        app:tabBackground="@android:color/white"
-        app:tabIndicatorColor="@color/colorPrimary"
-        app:tabMode="fixed"
-        app:tabSelectedTextColor="@color/colorPrimary"
-        app:tabTextColor="@android:color/black" />
-
-    <android.support.v4.view.ViewPager
-        android:id="@+id/view_pager"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <android.support.v7.widget.Toolbar
+
+        android:id="@+id/toolbar"
+        style="@style/AppTheme.AppBarOverlay"
+        android:layout_width="match_parent"
+        android:layout_height="?attr/actionBarSize"
+        android:background="@color/colorPrimary"
+        android:title="@string/title_plugin_manage"
+        app:navigationIcon="@drawable/ic_arrow_back" />
+
+    <android.support.design.widget.TabLayout
+        android:id="@+id/tab_layout"
+        android:layout_width="match_parent"
+        android:layout_height="?attr/actionBarSize"
+        app:tabBackground="@android:color/white"
+        app:tabIndicatorColor="@color/colorPrimary"
+        app:tabMode="fixed"
+        app:tabSelectedTextColor="@color/colorPrimary"
+        app:tabTextColor="@android:color/black" />
+
+    <android.support.v4.view.ViewPager
+        android:id="@+id/view_pager"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
 </LinearLayout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/activity_program_explorer.xml b/qpython/src/main/res/layout/activity_program_explorer.xml
deleted file mode 100644
index df0a9e87..00000000
--- a/qpython/src/main/res/layout/activity_program_explorer.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
-
-        <android.support.design.widget.AppBarLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <android.support.v7.widget.Toolbar
-                android:id="@+id/toolbar"
-                style="@style/DefaultBlueToolbar"
-                android:layout_width="match_parent"
-                android:layout_height="?attr/actionBarSize"
-                app:theme="@style/Toolbar" />
-
-            <android.support.design.widget.TabLayout
-                android:id="@+id/tab_layout"
-                android:layout_width="match_parent"
-                android:layout_height="36dp" />
-        </android.support.design.widget.AppBarLayout>
-
-
-        <android.support.v4.view.ViewPager
-            android:id="@+id/viewPager"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-    </LinearLayout>
-</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/activity_purchase.xml b/qpython/src/main/res/layout/activity_purchase.xml
new file mode 100644
index 00000000..96832249
--- /dev/null
+++ b/qpython/src/main/res/layout/activity_purchase.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <LinearLayout
+            xmlns:android="http://schemas.android.com/apk/res/android"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
+
+            <include
+                android:id="@+id/lt"
+                layout="@layout/layout_toolbar"/>
+
+            <TextView
+                android:id="@+id/tv_thanks"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginTop="40dp"
+                android:text="@string/thanks"
+                android:textColor="#FFF"
+                android:textSize="24sp"
+                android:visibility="gone"/>
+
+            <android.support.v7.widget.RecyclerView
+                android:id="@+id/list"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_marginTop="@dimen/default_margin"
+                android:padding="40dp"
+                android:visibility="gone"/>
+        </LinearLayout>
+
+        <include
+            android:id="@+id/no_data"
+            layout="@layout/widget_no_net"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"/>
+
+        <ProgressBar
+            android:id="@+id/pb"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:visibility="gone"/>
+    </RelativeLayout>
+
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/activity_qrcode.xml b/qpython/src/main/res/layout/activity_qrcode.xml
new file mode 100644
index 00000000..0a3ce940
--- /dev/null
+++ b/qpython/src/main/res/layout/activity_qrcode.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <include
+        android:id="@+id/lt"
+        layout="@layout/layout_toolbar"/>
+
+    <me.dm7.barcodescanner.zxing.ZXingScannerView
+        android:id="@+id/scanner"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/activity_qwebview.xml b/qpython/src/main/res/layout/activity_qwebview.xml
index 3780ba6a..e3199444 100644
--- a/qpython/src/main/res/layout/activity_qwebview.xml
+++ b/qpython/src/main/res/layout/activity_qwebview.xml
@@ -1,57 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-    <android.support.design.widget.AppBarLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+<layout>
 
-    <android.support.v7.widget.Toolbar
-        android:id="@+id/toolbar"
-        style="@style/Toolbar"
+    <LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        app:theme="@style/ToolbarTheme" />
-    </android.support.design.widget.AppBarLayout>
+        android:layout_height="match_parent"
+        android:orientation="vertical">
 
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        >
-        <ProgressBar android:id="@+id/WebViewProgress"
-            android:layout_height="wrap_content"
-            android:layout_width="fill_parent"
-            android:indeterminate="false"
+        <include
+            android:id="@+id/lt"
+            layout="@layout/layout_toolbar"/>
+
+        <ProgressBar
+            android:id="@+id/WebViewProgress"
             style="?android:attr/progressBarStyleHorizontal"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
             android:layout_marginLeft="0dip"
             android:layout_marginRight="0dip"
-            android:layout_marginTop="0dip"
-            android:maxHeight="3px"
-            android:minHeight="3px"></ProgressBar>
-
-    </LinearLayout>
+            android:elevation="2dp"
+            android:indeterminate="false"
+            android:maxHeight="3dp"
+            android:minHeight="3dp"/>
 
-    <FrameLayout
-        android:layout_height="wrap_content"
-        android:layout_width="fill_parent"
-        android:layout_weight="1"
-        >
 
-        <LinearLayout
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
-            android:orientation="vertical"
-            >
-            <WebView android:id="@+id/wv"
-                android:layout_width="fill_parent"
-                android:layout_height="fill_parent"
-                android:layout_x="0.0dip"
-                android:layout_y="0.0dip"
-                android:layout_weight="1.0" />
-        </LinearLayout>
-    </FrameLayout>
+        <WebView
+            android:id="@+id/wv"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"/>
 
-</LinearLayout>
\ No newline at end of file
+    </LinearLayout>
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/activity_setting.xml b/qpython/src/main/res/layout/activity_setting.xml
new file mode 100644
index 00000000..fce170fa
--- /dev/null
+++ b/qpython/src/main/res/layout/activity_setting.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                xmlns:app="http://schemas.android.com/apk/res-auto"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="@color/colorPrimaryDark"
+                android:orientation="vertical">
+
+    <android.support.design.widget.AppBarLayout
+        android:id="@+id/app_bar"
+        android:layout_width="match_parent"
+        android:layout_height="?attr/actionBarSize">
+
+        <android.support.v7.widget.Toolbar
+            android:id="@+id/toolbar"
+            style="@style/Toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="#FF4A4A4A"
+            android:elevation="2dp"
+            app:popupTheme="@style/DefaultBlueToolbar"
+            app:theme="@style/ToolbarTheme"/>
+    </android.support.design.widget.AppBarLayout>
+
+    <FrameLayout
+        android:id="@+id/setting_fragment"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@id/app_bar"
+        android:orientation="vertical"/>
+</RelativeLayout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/activity_sign_in.xml b/qpython/src/main/res/layout/activity_sign_in.xml
new file mode 100644
index 00000000..952bf46b
--- /dev/null
+++ b/qpython/src/main/res/layout/activity_sign_in.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+    >
+
+    <android.support.constraint.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@drawable/img_home_bg"
+        android:orientation="vertical">
+
+        <ImageView
+            android:id="@+id/logo"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerHorizontal="true"
+            android:layout_marginLeft="8dp"
+            android:layout_marginRight="8dp"
+            android:layout_marginTop="78dp"
+            android:contentDescription="@string/logo"
+            android:src="@drawable/img_home_logo"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent"/>
+
+        <TextView
+            android:id="@+id/google"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/logo"
+            android:layout_centerHorizontal="true"
+            android:layout_marginBottom="8dp"
+            android:layout_marginLeft="8dp"
+            android:layout_marginRight="8dp"
+            android:layout_marginTop="8dp"
+            android:gravity="center_horizontal"
+            android:text="@string/best_python_development_ide_non_mobile"
+            android:textColor="#949494"
+            app:layout_constraintBottom_toTopOf="@+id/button2"
+            app:layout_constraintHorizontal_bias="0.503"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/logo"
+            app:layout_constraintVertical_bias="0.407"
+            app:layout_constraintVertical_chainStyle="spread"/>
+
+        <Button
+            android:id="@+id/button2"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/google"
+            android:layout_centerHorizontal="true"
+            android:layout_marginBottom="8dp"
+            android:layout_marginLeft="8dp"
+            android:layout_marginRight="8dp"
+            android:layout_marginTop="8dp"
+            android:background="#FFF"
+            android:drawableLeft="@drawable/ic_login"
+            android:drawablePadding="@dimen/default_margin"
+            android:drawableStart="@drawable/ic_login"
+            android:paddingLeft="@dimen/default_margin"
+            android:paddingRight="@dimen/default_margin"
+            android:text="@string/sign_in_with_google"
+            android:textAllCaps="false"
+            android:textColor="@color/black"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent"/>
+
+        <TextView
+            android:id="@+id/textView3"
+            android:layout_width="wrap_content"
+            android:layout_height="68dp"
+            android:layout_marginEnd="8dp"
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="41dp"
+            android:maxWidth="300dp"
+            android:gravity="center"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/button2"/>
+
+        <ImageButton
+            android:id="@+id/button3"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@color/transparency"
+            android:padding="8dp"
+            android:src="@drawable/ic_library_delete"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.962"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="0.017"/>
+
+        <ProgressBar
+            android:id="@+id/progressBar2"
+            style="?android:attr/progressBarStyle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="8dp"
+            android:layout_marginLeft="8dp"
+            android:layout_marginRight="8dp"
+            android:layout_marginTop="8dp"
+            android:visibility="gone"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintHorizontal_bias="0.498"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="0.418"/>
+
+    </android.support.constraint.ConstraintLayout>
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/activity_splash.xml b/qpython/src/main/res/layout/activity_splash.xml
new file mode 100644
index 00000000..ce6f6cd4
--- /dev/null
+++ b/qpython/src/main/res/layout/activity_splash.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <RelativeLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:background="#103606"
+        android:layout_height="match_parent">
+
+        <ImageView
+            android:layout_width="70dp"
+            android:layout_height="50dp"
+            android:layout_centerInParent="true"
+            android:src="@drawable/img_home_logo"/>
+    </RelativeLayout>
+</layout>       
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/activity_user.xml b/qpython/src/main/res/layout/activity_user.xml
new file mode 100644
index 00000000..a69c140a
--- /dev/null
+++ b/qpython/src/main/res/layout/activity_user.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    >
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingBottom="@dimen/default_margin">
+
+        <android.support.design.widget.AppBarLayout
+            android:id="@+id/appbar_layout"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="#00ffffff">
+
+            <android.support.v7.widget.Toolbar
+                android:id="@+id/toolbar"
+                style="@style/Toolbar"
+                android:layout_width="match_parent"
+                android:layout_height="?attr/actionBarSize"
+                android:background="#00ffffff"/>
+
+        </android.support.design.widget.AppBarLayout>
+
+        <ImageView
+            android:id="@+id/bg"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:scaleType="fitXY"
+            android:src="@drawable/img_me_bg"/>
+
+        <ImageView
+            android:id="@+id/avatar"
+            android:layout_width="70dp"
+            android:layout_height="70dp"
+            android:layout_below="@id/appbar_layout"
+            android:layout_margin="@dimen/default_margin"
+            android:src="@drawable/empty"/>
+
+        <!--<TextView-->
+            <!--android:id="@+id/email"-->
+            <!--android:layout_width="wrap_content"-->
+            <!--android:layout_height="wrap_content"-->
+            <!--android:layout_alignBottom="@id/avatar"-->
+            <!--android:layout_marginLeft="@dimen/default_margin"-->
+            <!--android:layout_marginStart="@dimen/default_margin"-->
+            <!--android:layout_toEndOf="@id/avatar"-->
+            <!--android:layout_toRightOf="@id/avatar"-->
+            <!--android:textColor="#FFF"/>-->
+
+        <TextView
+            android:id="@+id/name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="10dp"
+            android:layout_alignTop="@id/avatar"
+            android:layout_marginLeft="@dimen/default_margin"
+            android:layout_marginStart="@dimen/default_margin"
+            android:layout_toEndOf="@id/avatar"
+            android:layout_toRightOf="@id/avatar"
+            android:textColor="#FFF"
+            android:textSize="18sp"
+            android:textStyle="bold"/>
+
+        <TextView
+            android:id="@+id/usage"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/bg"
+            android:layout_margin="@dimen/default_margin"
+            android:text="@string/my_space_empty"/>
+
+        <LinearLayout
+            android:id="@+id/my_share_layout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/usage"
+            android:layout_marginLeft="16dp"
+            android:layout_marginRight="16dp"
+            android:gravity="center_vertical"
+            android:orientation="horizontal"
+            >
+
+            <ImageView
+                android:layout_width="24dp"
+                android:layout_height="24dp"
+                android:src="@drawable/empty"
+                />
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="5dp"
+                android:layout_marginStart="5dp"
+                android:layout_weight="1"
+                android:text="@string/my_share"/>
+
+            <ImageView
+                android:layout_width="24dp"
+                android:layout_height="24dp"
+                android:src="@drawable/ic_editor_arrow_right"
+                android:tint="@color/white"
+                android:visibility="gone"/>
+        </LinearLayout>
+
+        <Button
+            android:id="@+id/logout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:layout_margin="@dimen/default_margin"
+            android:background="@drawable/gray_line_btn_bg"
+            android:text="@string/log_out"
+            android:textAllCaps="false"
+            android:textColor="@color/text_gray"
+            />
+    </RelativeLayout>
+</layout>
diff --git a/qpython/src/main/res/layout/buttons_ok_cancel.xml b/qpython/src/main/res/layout/buttons_ok_cancel.xml
new file mode 100644
index 00000000..19e12553
--- /dev/null
+++ b/qpython/src/main/res/layout/buttons_ok_cancel.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal" >
+
+    <Button
+        android:id="@+id/buttonOk"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:text="@string/ui_ok" />
+
+    <View
+        android:layout_width="@dimen/dialog_buttons_margin"
+        android:layout_height="match_parent" />
+
+    <Button
+        android:id="@+id/buttonCancel"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:text="@string/ui_cancel" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/color_picker_layout.xml b/qpython/src/main/res/layout/color_picker_layout.xml
deleted file mode 100644
index 0bf48a06..00000000
--- a/qpython/src/main/res/layout/color_picker_layout.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:gravity="center"
-    android:orientation="vertical">
-
-    <com.larswerkman.holocolorpicker.ColorPicker
-        android:id="@+id/picker"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-    <com.larswerkman.holocolorpicker.SVBar
-        android:id="@+id/svbar"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-    <com.larswerkman.holocolorpicker.OpacityBar
-        android:id="@+id/opacitybar"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-    <LinearLayout
-        android:gravity="center_horizontal"
-        android:layout_marginTop="10dp"
-        android:orientation="horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="40dp">
-
-        <TextView
-            android:text="@string/hex_color_char"
-            android:gravity="center_vertical"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent" />
-
-        <EditText
-            android:id="@+id/hexColorValueEditText"
-            android:singleLine="true"
-            android:textSize="12sp"
-            android:layout_width="60dp"
-            android:layout_height="match_parent" />
-
-        <TextView
-            android:text="@string/color_R"
-            android:layout_marginStart="10dp"
-            android:gravity="center_vertical"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent" />
-
-        <EditText
-            android:id="@+id/rgbColorRValueEditText"
-            android:singleLine="true"
-            android:textSize="12sp"
-            android:layout_width="40dp"
-            android:layout_height="match_parent" />
-
-        <TextView
-            android:text="@string/color_G"
-            android:layout_marginStart="10dp"
-            android:gravity="center_vertical"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent" />
-
-        <EditText
-            android:id="@+id/rgbColorGValueEditText"
-            android:singleLine="true"
-            android:textSize="12sp"
-            android:layout_width="40dp"
-            android:layout_height="match_parent" />
-
-        <TextView
-            android:text="@string/color_B"
-            android:layout_marginStart="10dp"
-            android:gravity="center_vertical"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent" />
-
-        <EditText
-            android:id="@+id/rgbColorBValueEditText"
-            android:singleLine="true"
-            android:textSize="12sp"
-            android:layout_width="40dp"
-            android:layout_height="match_parent" />
-    </LinearLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/dialog__setting_notebook.xml b/qpython/src/main/res/layout/dialog__setting_notebook.xml
new file mode 100644
index 00000000..d558724a
--- /dev/null
+++ b/qpython/src/main/res/layout/dialog__setting_notebook.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              xmlns:tools="http://schemas.android.com/tools"
+              android:layout_width="300dp"
+              android:layout_height="wrap_content"
+              android:layout_gravity="center"
+              android:background="@color/colorPrimary"
+              android:orientation="vertical"
+              android:padding="14dp">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="10dp"
+        android:text="Enable QPyNotebook"
+        android:textColor="@color/theme_green"
+        android:textSize="18sp"/>
+
+    <CheckBox
+        android:id="@+id/notebook_app"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:button="@drawable/notebook_checkbox"
+        android:buttonTint="@color/theme_green"
+        android:text="Install QPyNotebook Plugin"
+        android:textColor="@color/white"
+        android:textSize="16sp"
+        />
+
+    <CheckBox
+        android:id="@+id/notebook_lib"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:button="@drawable/notebook_checkbox"
+        android:buttonTint="@color/theme_green"
+        android:text="Install Related Libraries"
+        android:textColor="@color/white"
+        android:textSize="16sp"
+        android:layout_marginTop="5dp"
+        />
+</LinearLayout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/dialog_code_review.xml b/qpython/src/main/res/layout/dialog_code_review.xml
new file mode 100644
index 00000000..944aa5a3
--- /dev/null
+++ b/qpython/src/main/res/layout/dialog_code_review.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+             android:layout_width="match_parent"
+             android:layout_height="match_parent"
+             android:id="@+id/root_layout">
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="400dp"
+        android:background="@drawable/corners_5_white_bg"
+        android:layout_gravity="center"
+        android:layout_marginLeft="20dp"
+        android:layout_marginRight="20dp">
+        <HorizontalScrollView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+            <TextView
+                android:id="@+id/code_content_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:padding="@dimen/default_margin"
+                android:textColor="@color/black"
+                />
+        </HorizontalScrollView>
+    </ScrollView>
+</FrameLayout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/dialog_enter.xml b/qpython/src/main/res/layout/dialog_enter.xml
new file mode 100644
index 00000000..b29f1895
--- /dev/null
+++ b/qpython/src/main/res/layout/dialog_enter.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="60dp"
+        android:background="#FF4A4A4A"
+        android:orientation="vertical"
+        android:padding="@dimen/default_margin">
+
+        <TextView
+            android:id="@+id/tv_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="标题"
+            android:textColor="@color/colorAccent"
+            android:textSize="18sp"
+            android:textStyle="bold"/>
+
+        <EditText
+            android:id="@+id/et_enter"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="30dp"
+            android:layout_marginTop="30dp"
+            android:background="@drawable/edit_text_green_bg"
+            android:padding="5dp"
+            android:textColor="#FFF"
+            android:textColorHint="@color/text_gray"
+            android:textCursorDrawable="@drawable/edit_text_cursor"/>
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="right"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/tv_negative"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginRight="25dp"
+                android:text="@string/cancel"
+                android:textColor="@color/colorAccent"/>
+
+            <TextView
+                android:id="@+id/tv_positive"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/confirm"
+                android:textColor="@color/colorAccent"/>
+        </LinearLayout>
+
+    </LinearLayout>
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/dialog_feedback.xml b/qpython/src/main/res/layout/dialog_feedback.xml
new file mode 100644
index 00000000..e664e543
--- /dev/null
+++ b/qpython/src/main/res/layout/dialog_feedback.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+          android:id="@android:id/text1"
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:layout_marginLeft="@dimen/default_margin"
+          android:layout_marginStart="@dimen/default_margin"
+          android:ellipsize="marquee"
+          android:gravity="center_vertical"
+          android:padding="8dp"
+          android:paddingEnd="@dimen/default_margin"
+          android:paddingLeft="32dp"
+          android:paddingRight="@dimen/default_margin"
+          android:paddingStart="32dp"
+          android:textAppearance="?android:attr/textAppearanceLarge"
+          android:textColor="?android:attr/textColorAlertDialogListItem"
+          android:textSize="16sp"/>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/dialog_history.xml b/qpython/src/main/res/layout/dialog_history.xml
new file mode 100644
index 00000000..a3a8df5d
--- /dev/null
+++ b/qpython/src/main/res/layout/dialog_history.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+          android:id="@android:id/text1"
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:layout_marginLeft="@dimen/default_margin"
+          android:layout_marginStart="@dimen/default_margin"
+          android:ellipsize="marquee"
+          android:gravity="center_vertical"
+          android:padding="8dp"
+          android:paddingEnd="@dimen/default_margin"
+          android:paddingLeft="32dp"
+          android:paddingRight="@dimen/default_margin"
+          android:paddingStart="32dp"
+          android:textAppearance="?android:attr/textAppearanceLarge"
+          android:textColor="?android:attr/textColorAlertDialogListItem"
+          android:textSize="14sp"/>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/dialog_list_item.xml b/qpython/src/main/res/layout/dialog_list_item.xml
deleted file mode 100644
index 923eebc3..00000000
--- a/qpython/src/main/res/layout/dialog_list_item.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/title"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_gravity="start"
-    android:gravity="center_vertical"
-    android:minHeight="@dimen/md_listitem_height"
-    android:textSize="@dimen/md_listitem_textsize"
-    tools:text="Item" />
diff --git a/qpython/src/main/res/layout/dialog_loading.xml b/qpython/src/main/res/layout/dialog_loading.xml
new file mode 100644
index 00000000..ffae18c0
--- /dev/null
+++ b/qpython/src/main/res/layout/dialog_loading.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+             android:layout_width="match_parent"
+             android:layout_height="match_parent">
+
+    <ProgressBar
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        />
+</FrameLayout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/dialog_logo.xml b/qpython/src/main/res/layout/dialog_logo.xml
deleted file mode 100644
index 6dd75802..00000000
--- a/qpython/src/main/res/layout/dialog_logo.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout>
-
-    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
-
-        <TextView
-            android:layout_width="300dp"
-            android:layout_height="wrap_content"
-            android:background="@color/colorPrimary"
-            android:padding="8dp"
-            android:text="@string/dialog_title_menu"
-            android:textColor="@color/white"
-            android:textSize="24sp" />
-
-        <TextView
-            android:id="@+id/btn_qrcode"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@drawable/bg_item"
-            android:gravity="center_vertical"
-            android:padding="8dp"
-            android:text="@string/dialog_item_qrcode"
-            android:textSize="24sp" />
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1px"
-            android:background="@android:color/darker_gray" />
-
-        <TextView
-            android:id="@+id/btn_script"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@drawable/bg_item"
-            android:gravity="center_vertical"
-            android:padding="8dp"
-            android:text="@string/dialog_item_script"
-            android:textSize="24sp" />
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1px"
-            android:background="@android:color/darker_gray" />
-
-        <TextView
-            android:id="@+id/btn_project"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@drawable/bg_item"
-            android:gravity="center_vertical"
-            android:padding="8dp"
-            android:text="@string/dialog_item_project"
-            android:textSize="24sp" />
-    </LinearLayout>
-</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/dialog_run_program.xml b/qpython/src/main/res/layout/dialog_run_program.xml
deleted file mode 100644
index c05acf15..00000000
--- a/qpython/src/main/res/layout/dialog_run_program.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout>
-
-    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
-
-        <TextView
-            android:id="@+id/tv_title"
-            android:layout_width="300dp"
-            android:layout_height="wrap_content"
-            android:background="@color/colorPrimary"
-            android:padding="8dp"
-            android:textColor="@color/white"
-            android:textSize="24sp" />
-
-        <android.support.v7.widget.RecyclerView
-            android:id="@+id/rv_program"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@android:color/darker_gray" />
-    </LinearLayout>
-</layout>
diff --git a/qpython/src/main/res/layout/dialog_share.xml b/qpython/src/main/res/layout/dialog_share.xml
new file mode 100644
index 00000000..13f43fca
--- /dev/null
+++ b/qpython/src/main/res/layout/dialog_share.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:layout_width="match_parent"
+              android:layout_height="130dp"
+              android:background="@color/white"
+              android:orientation="vertical"
+    >
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:layout_margin="20dp"
+        android:text="SHARE TO"
+        android:textColor="@color/black"
+        android:textSize="16sp"/>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="48dp"
+        android:gravity="center"
+        android:orientation="horizontal"
+        >
+
+        <ImageView
+            android:id="@+id/facebook_iv"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:visibility="gone"
+            android:src="@drawable/ic_com_facebook"/>
+
+        <ImageView
+            android:id="@+id/twitter_iv"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:layout_marginLeft="30dp"
+            android:layout_marginRight="30dp"
+            android:visibility="gone"
+            android:src="@drawable/ic_com_twitter"/>
+
+        <ImageView
+            android:id="@+id/copy_link_iv"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:src="@drawable/ic_com_copylink"/>
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/document_info.xml b/qpython/src/main/res/layout/document_info.xml
deleted file mode 100644
index 590a33ca..00000000
--- a/qpython/src/main/res/layout/document_info.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:paddingStart="12dp"
-    android:paddingEnd="12dp"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <TextView
-        android:id="@+id/path_textView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-    <TextView
-        android:id="@+id/encoding_textView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-    <TextView
-        android:id="@+id/word_count_textView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-    <TextView
-        android:id="@+id/char_count_textView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-    <TextView
-        android:id="@+id/line_count_textView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-</LinearLayout>
diff --git a/qpython/src/main/res/layout/drawer_editor.xml b/qpython/src/main/res/layout/drawer_editor.xml
new file mode 100644
index 00000000..c52e1bee
--- /dev/null
+++ b/qpython/src/main/res/layout/drawer_editor.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    >
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <include
+            android:id="@+id/lt"
+            layout="@layout/layout_toolbar"/>
+
+        <android.support.v4.widget.DrawerLayout
+            android:id="@+id/drawer_layout"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+            <!-- The main content view -->
+            <FrameLayout
+                android:id="@+id/content_frame"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"/>
+            <!-- The navigation drawer -->
+            <android.support.v7.widget.RecyclerView
+                android:id="@+id/left_drawer"
+                android:layout_width="240dp"
+                android:layout_height="match_parent"
+                android:layout_gravity="start"
+                android:background="@color/colorPrimary"
+                android:choiceMode="singleChoice"
+                android:divider="@android:color/transparent"
+                android:dividerHeight="0dp"/>
+        </android.support.v4.widget.DrawerLayout>
+    </LinearLayout>
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/editor.xml b/qpython/src/main/res/layout/editor.xml
deleted file mode 100644
index 4de713d1..00000000
--- a/qpython/src/main/res/layout/editor.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<org.qpython.qpy.editor2.view.EditorView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <org.qpython.qpy.editor2.core.widget.JecEditText
-        android:id="@+id/edit_text"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="#ffffffff"
-        android:inputType="textMultiLine"
-        android:scrollbars="vertical"
-        android:scrollbarAlwaysDrawVerticalTrack="false"
-        android:scrollbarThumbVertical="@android:color/transparent"
-        android:scrollbarTrackVertical="@null"
-        android:padding="5dp"
-        android:enabled="false"
-        android:gravity="start|top" />
-
-    <me.zhanghai.android.materialprogressbar.MaterialProgressBar
-        android:id="@+id/progress_view"
-        android:layout_centerHorizontal="true"
-        android:layout_marginTop="90dp"
-        android:layout_width="40dp"
-        android:layout_height="40dp"
-        android:visibility="gone"
-        android:indeterminate="true" />
-
-</org.qpython.qpy.editor2.view.EditorView>
-
diff --git a/qpython/src/main/res/layout/editor_main_activity.xml b/qpython/src/main/res/layout/editor_main_activity.xml
deleted file mode 100644
index 883db6e0..00000000
--- a/qpython/src/main/res/layout/editor_main_activity.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/drawer_layout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:fitsSystemWindows="false">
-
-    <RelativeLayout xmlns:tools="http://schemas.android.com/tools"
-        android:id="@+id/mainLayout"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="#fff"
-        android:orientation="vertical"
-        tools:context=".EditorMainActivity">
-
-        <org.qpython.qpy.editor2.widget.EditorToolbar
-            android:id="@+id/toolbar"
-            style="@style/Toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
-
-        <include
-            layout="@layout/loading_layout"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_centerInParent="true" />
-
-        <org.qpython.qpy.editor2.view.TabViewPager
-            android:id="@+id/tab_pager"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_below="@id/toolbar"
-            android:visibility="gone" />
-
-    </RelativeLayout>
-
-    <include layout="@layout/main_tab_layout" />
-
-    <android.support.design.widget.NavigationView
-        android:id="@+id/menuNavView"
-        android:layout_width="180dp"
-        android:layout_height="match_parent"
-        android:layout_gravity="end|right">
-
-        <android.support.v7.widget.RecyclerView
-            android:id="@+id/menuRecyclerView"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-    </android.support.design.widget.NavigationView>
-</android.support.v4.widget.DrawerLayout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/find_in_files_item.xml b/qpython/src/main/res/layout/find_in_files_item.xml
deleted file mode 100644
index 526aa5bf..00000000
--- a/qpython/src/main/res/layout/find_in_files_item.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:padding="8dp"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="New Text"
-        android:id="@+id/file_text_view"
-        android:singleLine="true"
-        android:ellipsize="middle"
-        android:textStyle="bold" />
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="New Text"
-        android:id="@+id/match_line_text_view" />
-</LinearLayout>
diff --git a/qpython/src/main/res/layout/fragment_course.xml b/qpython/src/main/res/layout/fragment_course.xml
new file mode 100644
index 00000000..d08cad7e
--- /dev/null
+++ b/qpython/src/main/res/layout/fragment_course.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <RelativeLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/root"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/colorPrimary">
+
+        <LinearLayout
+            android:id="@+id/type_layout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="2dp"
+            android:background="@color/colorPrimaryDark"
+            android:orientation="horizontal"
+            android:padding="@dimen/default_margin">
+
+            <TextView
+                android:id="@+id/basic"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:drawableTop="@drawable/basics_light"
+                android:gravity="center_horizontal"
+                android:text="@string/basics"
+                android:textColor="@color/theme_green"/>
+
+            <TextView
+                android:id="@+id/database"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:drawableTop="@drawable/database"
+                android:gravity="center_horizontal"
+                android:text="@string/tools"/>
+
+            <TextView
+                android:id="@+id/arvr"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:drawableTop="@drawable/arvr"
+                android:gravity="center_horizontal"
+                android:text="@string/funny"/>
+
+            <TextView
+                android:id="@+id/aipy"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:drawableTop="@drawable/aipy"
+                android:gravity="center_horizontal"
+                android:text="@string/aipy"/>
+
+            <TextView
+                android:id="@+id/web"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:drawableTop="@drawable/web"
+                android:gravity="center_horizontal"
+                android:text="@string/other"/>
+        </LinearLayout>
+
+        <android.support.v7.widget.RecyclerView
+            android:id="@+id/swipe_list"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_below="@id/type_layout"
+            android:background="@color/colorPrimaryDark"/>
+
+        <TextView
+            android:id="@+id/empty_hint"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:drawablePadding="10dp"
+            android:drawableTop="@drawable/empty"
+            android:gravity="center_horizontal"
+            android:text="@string/nothing_here_yet"
+            android:textColor="#FFF"
+            android:visibility="gone"/>
+
+        <ProgressBar
+            android:id="@+id/progress_bar"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:visibility="gone"/>
+    </RelativeLayout>
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/fragment_explorer.xml b/qpython/src/main/res/layout/fragment_explorer.xml
new file mode 100644
index 00000000..57f88090
--- /dev/null
+++ b/qpython/src/main/res/layout/fragment_explorer.xml
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    >
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <RelativeLayout
+            android:id="@+id/rl_path"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="#FF363636">
+
+            <TextView
+                android:id="@+id/tv_path"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentLeft="true"
+                android:layout_alignParentStart="true"
+                android:layout_centerVertical="true"
+                android:layout_marginLeft="@dimen/default_margin"
+                android:layout_marginRight="@dimen/default_margin"
+                android:layout_toLeftOf="@+id/iv_new_folder"
+                android:layout_toStartOf="@+id/iv_new_folder"
+                android:ellipsize="start"
+                android:gravity="start"
+                android:singleLine="true"
+                android:textColor="#FF9B9B9B"/>
+
+            <ImageView
+                android:id="@+id/iv_new_folder"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentEnd="true"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:layout_marginEnd="@dimen/default_margin"
+                android:layout_marginRight="@dimen/default_margin"
+                android:src="@drawable/ic_editor_newfolder"/>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_alignParentBottom="true"
+                android:background="@color/colorPrimary"/>
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:id="@+id/prev_folder"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content">
+
+            <ImageView
+                android:id="@+id/iv_file_icon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_marginEnd="@dimen/default_margin"
+                android:layout_marginLeft="@dimen/default_margin"
+                android:layout_marginRight="16dp"
+                android:layout_marginStart="@dimen/default_margin"
+                android:src="@drawable/prev"/>
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_toEndOf="@id/iv_file_icon"
+                android:layout_toRightOf="@id/iv_file_icon"
+                android:text=".."
+                android:textColor="#FFF"
+                android:textSize="18sp"
+                android:textStyle="bold"
+                tools:ignore="HardcodedText"/>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_below="@id/iv_file_icon"
+                android:layout_marginTop="@dimen/default_margin"
+                android:background="@color/colorPrimary"/>
+        </RelativeLayout>
+
+        <TextView
+            android:id="@+id/net_error_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="50dp"
+            android:drawablePadding="10dp"
+            android:drawableTop="@drawable/img_empty_net"
+            android:text="@string/net_error"
+            android:visibility="gone"
+            />
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <com.yanzhenjie.recyclerview.swipe.SwipeMenuRecyclerView
+                android:id="@+id/swipe_list"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                />
+
+            <TextView
+                android:id="@+id/empty_hint"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerInParent="true"
+                android:drawablePadding="10dp"
+                android:drawableTop="@drawable/empty"
+                android:text="@string/no_recent_file"
+                android:textColor="#FFF"
+                android:visibility="gone"/>
+        </RelativeLayout>
+
+    </LinearLayout>
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/fragment_local.xml b/qpython/src/main/res/layout/fragment_local.xml
new file mode 100644
index 00000000..79822280
--- /dev/null
+++ b/qpython/src/main/res/layout/fragment_local.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <android.support.design.widget.TabLayout
+            android:id="@+id/tabs"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/colorPrimaryDark"
+            android:textSize="16sp"
+            app:tabBackground="@drawable/select_tab_indicator"/>
+
+        <android.support.v4.view.ViewPager
+            android:id="@+id/vp"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"/>
+    </LinearLayout>
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/fragment_my_course.xml b/qpython/src/main/res/layout/fragment_my_course.xml
new file mode 100644
index 00000000..03ed944e
--- /dev/null
+++ b/qpython/src/main/res/layout/fragment_my_course.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <RelativeLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/root"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <android.support.v7.widget.RecyclerView
+            android:id="@+id/swipe_list"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"/>
+
+        <Button
+            android:id="@+id/explore"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:background="@drawable/green_rect_line"
+            android:paddingLeft="@dimen/default_margin"
+            android:paddingRight="@dimen/default_margin"
+            android:text="@string/explore_course"
+            android:textColor="@color/theme_green"/>
+
+        <ImageView
+            android:id="@+id/empty_hint"
+            android:layout_centerHorizontal="true"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_above="@id/explore"
+            android:drawablePadding="10dp"
+            android:gravity="center_horizontal"
+            android:src="@drawable/img_emptycourse"/>
+
+        <ProgressBar
+            android:id="@+id/pb"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:visibility="gone"/>
+    </RelativeLayout>
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/fragment_my_share.xml b/qpython/src/main/res/layout/fragment_my_share.xml
new file mode 100644
index 00000000..ccaaf764
--- /dev/null
+++ b/qpython/src/main/res/layout/fragment_my_share.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+             android:layout_width="match_parent"
+             android:layout_height="match_parent"
+             android:orientation="vertical">
+
+    <android.support.v7.widget.RecyclerView
+        android:id="@+id/rv_myshare"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+
+    <ProgressBar
+        android:id="@+id/progress_bar"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:visibility="gone"/>
+
+    <TextView
+        android:id="@+id/empty"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:drawablePadding="10dp"
+        android:drawableTop="@drawable/empty"
+        android:text="@string/no_data"
+        android:visibility="gone"/>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/fragment_plugin_cloud.xml b/qpython/src/main/res/layout/fragment_plugin_cloud.xml
index 7dd5f518..919d945c 100644
--- a/qpython/src/main/res/layout/fragment_plugin_cloud.xml
+++ b/qpython/src/main/res/layout/fragment_plugin_cloud.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <android.support.v7.widget.RecyclerView
-            android:id="@+id/rv_plugin"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-
-        <LinearLayout
-            android:id="@+id/none_item_bg"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical">
-
-
-            <ImageView
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="3"
-                android:adjustViewBounds="true"
-                android:scaleType="center"
-                android:src="@drawable/sorry" />
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="1" />
-        </LinearLayout>
-    </FrameLayout>
-
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <android.support.v7.widget.RecyclerView
+            android:id="@+id/rv_plugin"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+
+        <LinearLayout
+            android:id="@+id/none_item_bg"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
+
+
+            <ImageView
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="3"
+                android:adjustViewBounds="true"
+                android:scaleType="center"
+                android:src="@drawable/sorry" />
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1" />
+        </LinearLayout>
+    </FrameLayout>
+
 </FrameLayout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/fragment_plugin_local.xml b/qpython/src/main/res/layout/fragment_plugin_local.xml
index 11c00f21..049cedb8 100644
--- a/qpython/src/main/res/layout/fragment_plugin_local.xml
+++ b/qpython/src/main/res/layout/fragment_plugin_local.xml
@@ -1,49 +1,49 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <android.support.v7.widget.RecyclerView
-            android:id="@+id/rv_plugin"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-
-        <LinearLayout
-            android:id="@+id/none_item_bg"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical">
-
-
-            <ImageView
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="3"
-                android:adjustViewBounds="true"
-                android:scaleType="center"
-                android:src="@drawable/sorry" />
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="1" />
-        </LinearLayout>
-    </FrameLayout>
-
-
-    <android.support.design.widget.FloatingActionButton
-        android:id="@+id/fab"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentRight="true"
-        android:layout_marginBottom="16dp"
-        android:layout_marginRight="16dp"
-        android:src="@android:drawable/ic_input_add"
-        app:backgroundTint="@color/white" />
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <android.support.v7.widget.RecyclerView
+            android:id="@+id/rv_plugin"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+
+        <LinearLayout
+            android:id="@+id/none_item_bg"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
+
+
+            <ImageView
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="3"
+                android:adjustViewBounds="true"
+                android:scaleType="center"
+                android:src="@drawable/sorry" />
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1" />
+        </LinearLayout>
+    </FrameLayout>
+
+
+    <android.support.design.widget.FloatingActionButton
+        android:id="@+id/fab"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentRight="true"
+        android:layout_marginBottom="16dp"
+        android:layout_marginRight="16dp"
+        android:src="@android:drawable/ic_input_add"
+        app:backgroundTint="@color/white" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/fragment_qpy_pi.xml b/qpython/src/main/res/layout/fragment_qpy_pi.xml
new file mode 100644
index 00000000..32502ecc
--- /dev/null
+++ b/qpython/src/main/res/layout/fragment_qpy_pi.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/colorPrimaryDark">
+
+        <com.yanzhenjie.recyclerview.swipe.SwipeMenuRecyclerView
+            android:id="@+id/swipe_list"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"/>
+
+        <ProgressBar
+            android:id="@+id/progress_bar"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:visibility="gone"/>
+
+        <TextView
+            android:id="@+id/net_error"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:layout_marginTop="50dp"
+            android:drawablePadding="10dp"
+            android:drawableTop="@drawable/img_empty_net"
+            android:text="@string/net_error"
+            android:textColor="#FFF"
+            android:visibility="gone"
+            />
+    </RelativeLayout>
+</layout>
diff --git a/qpython/src/main/res/layout/fragment_refresh_rv.xml b/qpython/src/main/res/layout/fragment_refresh_rv.xml
new file mode 100644
index 00000000..3dee4be2
--- /dev/null
+++ b/qpython/src/main/res/layout/fragment_refresh_rv.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <RelativeLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/colorPrimaryDark"
+        android:orientation="vertical">
+
+        <com.yanzhenjie.recyclerview.swipe.SwipeMenuRecyclerView
+            android:id="@+id/swipe_list"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"/>
+
+        <TextView
+            android:id="@+id/net_error"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:drawablePadding="10dp"
+            android:drawableTop="@drawable/img_empty_net"
+            android:gravity="center"
+            android:padding="@dimen/default_margin"
+            android:text="@string/net_error"
+            android:textColor="#FFF"
+            android:visibility="gone"
+            />
+
+        <ProgressBar
+            android:id="@+id/progress_bar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"/>
+    </RelativeLayout>
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/fragment_rv.xml b/qpython/src/main/res/layout/fragment_rv.xml
new file mode 100644
index 00000000..7c07025f
--- /dev/null
+++ b/qpython/src/main/res/layout/fragment_rv.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <RelativeLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/root"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <android.support.v7.widget.RecyclerView
+            android:id="@+id/swipe_list"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"/>
+
+        <TextView
+            android:id="@+id/empty_hint"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:drawablePadding="10dp"
+            android:drawableTop="@drawable/empty"
+            android:gravity="center_horizontal"
+            android:text="@string/nothing_here_yet"
+            android:textColor="#FFF"
+            android:visibility="gone"/>
+
+        <TextView
+            android:id="@+id/net_error_hint"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:drawablePadding="10dp"
+            android:drawableTop="@drawable/empty"
+            android:gravity="center_horizontal"
+            android:padding="@dimen/default_margin"
+            android:text="@string/net_error"
+            android:textColor="#FFF"
+            android:visibility="gone"/>
+
+        <ProgressBar
+            android:id="@+id/progress_bar"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:visibility="gone"/>
+    </RelativeLayout>
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/header_last_refresh_time.xml b/qpython/src/main/res/layout/header_last_refresh_time.xml
new file mode 100644
index 00000000..10eaf341
--- /dev/null
+++ b/qpython/src/main/res/layout/header_last_refresh_time.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@color/colorPrimary"
+    android:gravity="center"
+    android:padding="5dp"
+    android:text="@string/last_refresh"
+    android:textColor="#FFF"
+    android:textSize="12sp"/>
diff --git a/qpython/src/main/res/layout/header_lib_description.xml b/qpython/src/main/res/layout/header_lib_description.xml
new file mode 100644
index 00000000..0697ced1
--- /dev/null
+++ b/qpython/src/main/res/layout/header_lib_description.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <TextView
+        android:id="@+id/lib_description"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/colorPrimaryDark"
+        android:padding="@dimen/default_margin"
+        android:text="@string/aipy_lib_hint"
+        android:textColor="#FFF"/>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="10dp"
+        android:background="@color/colorPrimary"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/header_lib_install.xml b/qpython/src/main/res/layout/header_lib_install.xml
new file mode 100644
index 00000000..dc855ecd
--- /dev/null
+++ b/qpython/src/main/res/layout/header_lib_install.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <TextView
+        android:id="@+id/tv_open_pypi"
+        style="@style/top_hint"
+        android:drawableEnd="@drawable/ic_keyboard_arrow_right_white"
+        android:drawableRight="@drawable/ic_keyboard_arrow_right_white"
+        android:text="@string/install_with_python_s_pypi"/>
+
+    <TextView
+        style="@style/top_describe"
+        android:text="@string/py_pi"/>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="10dp"
+        android:background="@color/colorPrimary"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/include_main_layout.xml b/qpython/src/main/res/layout/include_main_layout.xml
deleted file mode 100644
index fd9b9cdd..00000000
--- a/qpython/src/main/res/layout/include_main_layout.xml
+++ /dev/null
@@ -1,141 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <include layout="@layout/layout_toolbar" />
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@color/colorPrimary"
-        android:paddingBottom="50dp"
-        android:paddingTop="30dp">
-
-        <de.hdodenhof.circleimageview.CircleImageView
-            android:id="@+id/logo_image"
-            android:layout_width="@dimen/main_logo_img_size"
-            android:layout_height="@dimen/main_logo_img_size"
-            android:layout_centerHorizontal="true"
-            android:background="@drawable/ic_logo_button" />
-    </RelativeLayout>
-
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_weight="1"
-            android:orientation="horizontal">
-
-            <LinearLayout
-                android:id="@+id/item_lin_console"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:orientation="vertical">
-
-                <ImageView
-                    android:layout_width="@dimen/main_icon_size"
-                    android:layout_height="@dimen/main_icon_size"
-                    android:layout_gravity="center_horizontal"
-                    android:layout_marginTop="@dimen/main_icon_margin_top"
-                    android:src="@drawable/ic_console" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal"
-                    android:text="@string/console" />
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:id="@+id/item_lin_editor"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:orientation="vertical">
-
-                <ImageView
-                    android:layout_width="@dimen/main_icon_size"
-                    android:layout_height="@dimen/main_icon_size"
-                    android:layout_gravity="center_horizontal"
-                    android:layout_marginTop="@dimen/main_icon_margin_top"
-                    android:src="@drawable/ic_editor" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal"
-                    android:text="@string/editor" />
-
-            </LinearLayout>
-
-
-        </LinearLayout>
-
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_weight="1"
-            android:orientation="horizontal">
-
-            <LinearLayout
-                android:id="@+id/item_lin_program"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:orientation="vertical">
-
-                <ImageView
-                    android:layout_width="@dimen/main_icon_size"
-                    android:layout_height="@dimen/main_icon_size"
-                    android:layout_gravity="center_horizontal"
-                    android:layout_marginTop="@dimen/main_icon_margin_top"
-                    android:src="@drawable/ic_my_qpy" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal"
-                    android:text="@string/program" />
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:id="@+id/item_lin_library_manager"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:orientation="vertical">
-
-                <ImageView
-                    android:layout_width="@dimen/main_icon_size"
-                    android:layout_height="@dimen/main_icon_size"
-                    android:layout_gravity="center_horizontal"
-                    android:layout_marginTop="@dimen/main_icon_margin_top"
-                    android:src="@drawable/ic_libraries" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal"
-                    android:text="@string/library_manager" />
-
-            </LinearLayout>
-
-
-        </LinearLayout>
-
-
-    </LinearLayout>
-
-
-</LinearLayout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/insert_datetime_layout.xml b/qpython/src/main/res/layout/insert_datetime_layout.xml
deleted file mode 100644
index 570d2bcb..00000000
--- a/qpython/src/main/res/layout/insert_datetime_layout.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:paddingLeft="@dimen/md_dialog_frame_margin"
-    android:paddingRight="@dimen/md_dialog_frame_margin"
-    android:orientation="vertical">
-
-    <Spinner
-        android:id="@+id/langSpinner"
-        android:layout_width="match_parent"
-        android:layout_height="48dp"
-        android:spinnerMode="dropdown"
-        android:entries="@array/insert_datetime_lang" />
-
-    <ListView
-        android:id="@+id/formatListView"
-        android:layout_width="match_parent"
-        android:layout_height="300dp" />
-</LinearLayout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/item_app_list.xml b/qpython/src/main/res/layout/item_app_list.xml
new file mode 100644
index 00000000..55dd347c
--- /dev/null
+++ b/qpython/src/main/res/layout/item_app_list.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="5dp"
+        android:orientation="vertical">
+
+        <ImageView
+            android:id="@+id/ci_app_icon"
+            android:layout_width="@dimen/icon_size"
+            android:layout_height="@dimen/icon_size"
+            android:layout_gravity="center_horizontal"/>
+
+        <TextView
+            android:id="@+id/tv_app_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginBottom="5dp"
+            android:layout_marginTop="3dp"
+            android:ellipsize="middle"
+            android:gravity="center"
+            android:maxLines="2"
+            android:textColor="#FFF"/>
+    </LinearLayout>
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/item_comment.xml b/qpython/src/main/res/layout/item_comment.xml
new file mode 100644
index 00000000..dbee9b12
--- /dev/null
+++ b/qpython/src/main/res/layout/item_comment.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <RelativeLayout
+            xmlns:android="http://schemas.android.com/apk/res/android"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:padding="@dimen/default_margin">
+
+            <ImageView
+                android:id="@+id/avatar"
+                android:layout_width="40dp"
+                android:layout_height="40dp"
+                android:layout_marginBottom="10dp"
+                android:layout_marginEnd="@dimen/default_margin"
+                android:layout_marginRight="@dimen/default_margin"
+                android:src="@drawable/empty"/>
+
+            <TextView
+                android:id="@+id/name"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_toEndOf="@id/avatar"
+                android:layout_toRightOf="@id/avatar"
+                android:textColor="#FFF"
+                android:textSize="12sp"/>
+
+            <TextView
+                android:id="@+id/date"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignBottom="@id/avatar"
+                android:layout_toEndOf="@id/avatar"
+                android:layout_toRightOf="@id/avatar"
+                android:textSize="12sp"/>
+
+            <TextView
+                android:id="@+id/from_content"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/avatar"
+                android:layout_toEndOf="@id/avatar"
+                android:layout_toRightOf="@id/avatar"
+                android:textColor="#FFF"/>
+
+            <TextView
+                android:id="@+id/re_comment"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/from_content"
+                android:layout_marginTop="5dp"
+                android:layout_toEndOf="@id/avatar"
+                android:layout_toRightOf="@id/avatar"
+                android:background="@color/colorPrimary"
+                android:padding="10dp"
+                android:textColor="#FFF"/>
+        </RelativeLayout>
+
+        <View
+            android:id="@+id/line"
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_marginTop="6dp"
+            android:background="@color/colorPrimary"/>
+    </LinearLayout>
+
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/item_course.xml b/qpython/src/main/res/layout/item_course.xml
new file mode 100644
index 00000000..b424349a
--- /dev/null
+++ b/qpython/src/main/res/layout/item_course.xml
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+
+        <variable
+            name="course"
+            type="org.qpython.qpy.main.server.model.CourseModel"/>
+    </data>
+
+    <LinearLayout
+        android:id="@+id/root"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/colorPrimaryDark"
+        android:elevation="2dp"
+        android:orientation="vertical"
+        android:paddingBottom="5dp"
+        tools:ignore="UnusedAttribute">
+
+        <RelativeLayout
+            android:id="@+id/img"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <org.qpython.qpy.main.widget.RatioImageView
+                android:id="@+id/iv_theme"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@color/white"
+                android:scaleType="fitXY"
+                android:src="@drawable/img_course"
+                android:transitionName="img"/>
+
+            <TextView
+                android:id="@+id/tv_level"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignBottom="@id/iv_theme"
+                android:layout_alignEnd="@id/iv_theme"
+                android:layout_alignRight="@id/iv_theme"
+                android:background="@color/theme_yellow"
+                android:paddingBottom="3dp"
+                android:paddingLeft="5dp"
+                android:paddingRight="5dp"
+                android:paddingTop="3dp"
+                android:textColor="#FFF"
+                android:textSize="12sp"
+                android:textStyle="bold"
+                android:transitionName="level"/>
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <TextView
+                android:id="@+id/tv_title"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_toLeftOf="@+id/free"
+                android:layout_toStartOf="@+id/free"
+                android:text="@{course.title}"
+                android:ellipsize="end"
+                android:maxLines="1"
+                android:padding="@dimen/default_margin"
+                android:textColor="#FFF"
+                android:textSize="16sp"
+                android:textStyle="bold"
+                android:transitionName="title"/>
+
+            <TextView
+                android:id="@+id/free"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignBottom="@id/tv_title"
+                android:layout_alignParentEnd="true"
+                android:layout_alignParentRight="true"
+                android:layout_alignTop="@id/tv_title"
+                android:layout_marginBottom="10dp"
+                android:layout_marginEnd="10dp"
+                android:layout_marginLeft="@dimen/default_margin"
+                android:layout_marginRight="@dimen/default_margin"
+                android:layout_marginTop="10dp"
+                android:background="@color/theme_green"
+                android:gravity="center"
+                android:visibility="gone"
+                android:paddingBottom="5dp"
+                android:paddingLeft="@dimen/default_margin"
+                android:paddingRight="@dimen/default_margin"
+                android:paddingTop="5dp"
+                android:text="@string/free"
+                android:textStyle="bold"
+                android:transitionName="free"/>
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:id="@+id/view_count"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="5dp"
+            android:gravity="center_vertical"
+            android:orientation="horizontal"
+            android:paddingLeft="@dimen/default_margin"
+            android:paddingRight="@dimen/default_margin">
+
+            <TextView
+                android:id="@+id/tv_date"
+                android:layout_width="wrap_content"
+                android:text="@{course.rdate}"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="@dimen/course_gap"
+                android:layout_marginRight="@dimen/course_gap"
+                android:textColor="@color/text_gray"
+                android:textSize="12sp"
+                android:transitionName="date"/>
+
+            <TextView
+                android:id="@+id/tv_author"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@{course.auth}"
+                android:layout_marginEnd="@dimen/course_gap"
+                android:layout_marginLeft="@dimen/default_margin"
+                android:layout_marginRight="@dimen/course_gap"
+                android:layout_marginStart="@dimen/default_margin"
+                android:layout_toEndOf="@id/tv_date"
+                android:layout_toRightOf="@id/tv_date"
+                android:textColor="#FFF"
+                android:textSize="12sp"
+                android:transitionName="author"/>
+
+            <TextView
+                android:id="@+id/tv_view"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentEnd="true"
+                android:layout_alignParentRight="true"
+                android:drawableLeft="@drawable/ic_course_clicks"
+                android:text="@{course.downloads}"
+                android:drawableStart="@drawable/ic_course_clicks"
+                android:gravity="center"
+                android:textSize="12sp"
+                android:transitionName="view"/>
+        </RelativeLayout>
+    </LinearLayout>
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/item_course_funding_index.xml b/qpython/src/main/res/layout/item_course_funding_index.xml
new file mode 100644
index 00000000..87e5dea6
--- /dev/null
+++ b/qpython/src/main/res/layout/item_course_funding_index.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:gravity="center_vertical"
+    android:padding="@dimen/default_margin"
+    android:textColor="#FFF"/>
diff --git a/qpython/src/main/res/layout/item_course_index.xml b/qpython/src/main/res/layout/item_course_index.xml
new file mode 100644
index 00000000..5fb95c84
--- /dev/null
+++ b/qpython/src/main/res/layout/item_course_index.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:drawableEnd="@drawable/ic_white_arrow_right"
+    android:drawableRight="@drawable/ic_white_arrow_right"
+    android:gravity="center_vertical"
+    android:padding="@dimen/default_margin"
+    android:textColor="#FFF"
+    android:textSize="16sp"
+    android:textStyle="bold"/>
diff --git a/qpython/src/main/res/layout/item_file.xml b/qpython/src/main/res/layout/item_file.xml
new file mode 100644
index 00000000..6db31e23
--- /dev/null
+++ b/qpython/src/main/res/layout/item_file.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="#FF363636"
+        android:gravity="center_vertical"
+        android:orientation="horizontal"
+        android:padding="@dimen/default_margin">
+
+        <TextView
+            android:id="@+id/textFileName"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:drawablePadding="@dimen/default_margin"
+            android:gravity="center_vertical"
+            android:textColor="#FFF"
+            android:typeface="sans">
+        </TextView>
+
+    </LinearLayout>
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/item_folder.xml b/qpython/src/main/res/layout/item_folder.xml
new file mode 100644
index 00000000..ba60aafa
--- /dev/null
+++ b/qpython/src/main/res/layout/item_folder.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    >
+
+    <RelativeLayout
+        android:id="@+id/ll_folder_item"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/colorPrimaryDark"
+        android:paddingLeft="@dimen/default_margin"
+        android:paddingRight="@dimen/default_margin"
+        android:paddingTop="@dimen/default_margin">
+
+        <ImageView
+            android:id="@+id/iv_file_icon"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="@dimen/default_margin"
+            android:layout_marginRight="16dp"
+            android:src="@drawable/ic_editor_folder"/>
+
+        <ImageView
+            android:id="@+id/uploaded"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignBottom="@id/iv_file_icon"
+            android:layout_marginEnd="10dp"
+            android:layout_marginRight="10dp"
+            android:layout_toLeftOf="@+id/rl"
+            android:layout_toStartOf="@+id/rl"
+            android:visibility="gone"
+            />
+
+        <ProgressBar
+            android:id="@+id/uploading"
+            android:layout_width="25dp"
+            android:layout_height="25dp"
+            android:layout_alignParentEnd="true"
+            android:layout_alignParentRight="true"
+            android:layout_centerVertical="true"
+            android:visibility="gone"
+            />
+
+        <RelativeLayout
+            android:id="@+id/rl"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_toEndOf="@id/iv_file_icon"
+            android:layout_toRightOf="@id/iv_file_icon"
+            >
+
+            <TextView
+                android:id="@+id/tv_file_name"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textColor="#FFF"/>
+
+            <TextView
+                android:id="@+id/tv_path"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/tv_file_name"
+                android:textColor="@color/text_color_hint"
+                android:textSize="12sp"
+                android:visibility="gone"/>
+        </RelativeLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_below="@id/iv_file_icon"
+            android:layout_marginTop="@dimen/default_margin"
+            android:background="@color/colorPrimary"/>
+
+    </RelativeLayout>
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/item_folder_little.xml b/qpython/src/main/res/layout/item_folder_little.xml
new file mode 100644
index 00000000..6ad392ae
--- /dev/null
+++ b/qpython/src/main/res/layout/item_folder_little.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <RelativeLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="5dp"
+        android:orientation="horizontal">
+
+        <LinearLayout
+            android:id="@+id/expand_click_zone"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <ImageButton
+                android:id="@+id/arrow"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_marginEnd="5dp"
+                android:layout_marginRight="5dp"
+                android:background="@null"
+                android:src="@drawable/ic_arrow_drop_down_b"/>
+
+            <TextView
+                android:id="@+id/item"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:drawablePadding="5dp"
+                android:textSize="16sp"
+                android:gravity="center_vertical"
+                android:textColor="#FFF"/>
+        </LinearLayout>
+
+
+        <CheckBox
+            android:id="@+id/checkbox"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentEnd="true"
+            android:visibility="gone"
+            android:layout_alignParentRight="true"
+            android:layout_centerVertical="true"/>
+    </RelativeLayout>
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/item_lib_list.xml b/qpython/src/main/res/layout/item_lib_list.xml
new file mode 100644
index 00000000..41f3b960
--- /dev/null
+++ b/qpython/src/main/res/layout/item_lib_list.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/ll_item"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        >
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/colorPrimaryDark"
+            >
+
+            <ImageView
+                android:id="@+id/iv_icon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_marginBottom="@dimen/default_margin"
+                android:layout_marginLeft="@dimen/default_margin"
+                android:layout_marginStart="@dimen/default_margin"
+                android:layout_marginTop="@dimen/default_margin"
+                android:src="@drawable/ic_program"/>
+
+
+            <TextView
+                android:id="@+id/tv_download_count"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignBottom="@+id/tv_description"
+                android:layout_alignParentEnd="true"
+                android:layout_alignParentRight="true"
+                android:layout_marginEnd="@dimen/default_margin"
+                android:layout_marginRight="@dimen/default_margin"
+                android:drawablePadding="5dp"
+                android:textColor="#FF9B9B9B"/>
+
+
+            <TextView
+                android:id="@+id/tv_name"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignTop="@id/iv_icon"
+                android:layout_marginBottom="5dp"
+                android:layout_marginLeft="@dimen/default_margin"
+                android:layout_marginStart="@dimen/default_margin"
+                android:layout_toEndOf="@id/iv_icon"
+                android:layout_toRightOf="@id/iv_icon"
+                android:textColor="#FFF"/>
+
+
+            <TextView
+                android:id="@+id/tv_description"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/tv_name"
+                android:layout_marginLeft="@dimen/default_margin"
+                android:layout_marginRight="@dimen/default_margin"
+                android:layout_toEndOf="@id/iv_icon"
+                android:layout_toLeftOf="@id/tv_download_count"
+                android:layout_toRightOf="@id/iv_icon"
+                android:layout_toStartOf="@id/tv_download_count"
+                android:ellipsize="end"
+                android:gravity="start"
+                android:maxLines="2"
+                android:textColor="#FF9B9B9B"/>
+        </RelativeLayout>
+
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_marginTop="5dp"
+            android:background="#FF4A4A4A"/>
+    </LinearLayout>
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/item_my_course.xml b/qpython/src/main/res/layout/item_my_course.xml
new file mode 100644
index 00000000..2e85dce8
--- /dev/null
+++ b/qpython/src/main/res/layout/item_my_course.xml
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+
+        <variable
+            name="course"
+            type="org.qpython.qpy.main.server.model.MyCourse.DataBean.InfoBean"/>
+    </data>
+
+    <LinearLayout
+        android:id="@+id/root"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/colorPrimaryDark"
+        android:elevation="2dp"
+        android:orientation="vertical"
+        android:paddingBottom="5dp"
+        tools:ignore="UnusedAttribute">
+
+        <RelativeLayout
+            android:id="@+id/img"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <org.qpython.qpy.main.widget.RatioImageView
+                android:id="@+id/iv_theme"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@color/white"
+                android:scaleType="fitXY"
+                android:transitionName="img"/>
+
+            <TextView
+                android:id="@+id/status"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textStyle="bold"
+                android:layout_centerInParent="true"
+                android:text="@string/c_funding"
+                android:textColor="@color/theme_yellow"/>
+
+            <TextView
+                android:id="@+id/tv_level"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignBottom="@id/iv_theme"
+                android:layout_alignEnd="@id/iv_theme"
+                android:layout_alignRight="@id/iv_theme"
+                android:background="@color/theme_yellow"
+                android:paddingBottom="3dp"
+                android:paddingLeft="5dp"
+                android:paddingRight="5dp"
+                android:paddingTop="3dp"
+                android:textColor="#FFF"
+                android:textSize="12sp"
+                android:textStyle="bold"
+                android:transitionName="level"/>
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <TextView
+                android:id="@+id/tv_title"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:ellipsize="end"
+                android:maxLines="1"
+                android:padding="@dimen/default_margin"
+                android:text="@{course.title}"
+                android:textColor="#FFF"
+                android:textSize="16sp"
+                android:textStyle="bold"
+                android:transitionName="title"/>
+
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:id="@+id/view_count"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="5dp"
+            android:gravity="center_vertical"
+            android:orientation="horizontal"
+            android:paddingLeft="@dimen/default_margin"
+            android:paddingRight="@dimen/default_margin">
+
+            <TextView
+                android:id="@+id/tv_date"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="@dimen/course_gap"
+                android:layout_marginRight="@dimen/course_gap"
+                android:text="@{course.rdate}"
+                android:textColor="@color/text_gray"
+                android:textSize="12sp"
+                android:transitionName="date"/>
+
+            <TextView
+                android:id="@+id/tv_author"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="@dimen/course_gap"
+                android:layout_marginLeft="@dimen/default_margin"
+                android:layout_marginRight="@dimen/course_gap"
+                android:layout_marginStart="@dimen/default_margin"
+                android:layout_toEndOf="@id/tv_date"
+                android:layout_toRightOf="@id/tv_date"
+                android:text="@{course.auth}"
+                android:textColor="#FFF"
+                android:textSize="12sp"
+                android:transitionName="author"/>
+
+            <TextView
+                android:id="@+id/tv_view"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentEnd="true"
+                android:layout_alignParentRight="true"
+                android:drawableLeft="@drawable/ic_course_clicks"
+                android:drawableStart="@drawable/ic_course_clicks"
+                android:gravity="center"
+                android:text="@{course.downloads}"
+                android:textSize="12sp"
+                android:transitionName="view"/>
+        </RelativeLayout>
+    </LinearLayout>
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/item_notebook.xml b/qpython/src/main/res/layout/item_notebook.xml
new file mode 100644
index 00000000..43682725
--- /dev/null
+++ b/qpython/src/main/res/layout/item_notebook.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="vertical"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+    >
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:padding="14dp"
+        android:gravity="center_vertical">
+        <ImageView
+            android:layout_width="36dp"
+            android:layout_height="36dp"
+            android:src="@drawable/ic_ipynb"
+            android:layout_marginRight="10dp"/>
+        <TextView
+            android:id="@+id/file_name_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@color/white"
+            android:text="file"/>
+    </LinearLayout>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1px"
+        android:background="@color/colorPrimary"
+        android:layout_marginLeft="10dp"
+        android:layout_marginRight="10dp"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/item_plugin_cloud.xml b/qpython/src/main/res/layout/item_plugin_cloud.xml
index ee5da287..6ad668da 100644
--- a/qpython/src/main/res/layout/item_plugin_cloud.xml
+++ b/qpython/src/main/res/layout/item_plugin_cloud.xml
@@ -1,42 +1,44 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    app:cardElevation="1dp">
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="10dp"
-        android:layout_marginRight="10dp">
-
-
-        <TextView
-            android:textColor="@android:color/black"
-            android:id="@+id/plugin_name"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentLeft="true"
-            android:layout_margin="5dp"
-            android:textAppearance="@style/TextAppearance.AppCompat.Title" />
-
-        <TextView
-            android:textColor="@android:color/black"
-            android:id="@+id/plugin_description"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/plugin_name"
-            android:layout_margin="5dp"
-            android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
-
-        <ImageView
-            android:id="@+id/plugin_menu"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
-            android:layout_centerVertical="true"
-            android:src="@drawable/ic_plugin" />
-    </RelativeLayout>
+<?xml version="1.0" encoding="utf-8"?>
+
+<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    app:cardElevation="1dp">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="10dp"
+        android:layout_marginRight="10dp">
+
+
+        <TextView
+            android:id="@+id/plugin_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"
+            android:layout_margin="5dp"
+            android:textAppearance="@style/TextAppearance.AppCompat.Title"
+            android:textColor="@android:color/black" />
+
+        <TextView
+            android:id="@+id/plugin_description"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/plugin_name"
+            android:layout_margin="5dp"
+            android:textAppearance="@style/TextAppearance.AppCompat.Body1"
+            android:textColor="@android:color/black" />
+
+        <ImageView
+            android:id="@+id/plugin_menu"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentEnd="true"
+            android:layout_alignParentRight="true"
+            android:layout_centerVertical="true"
+            android:src="@drawable/ic_plugin" />
+    </RelativeLayout>
 </android.support.v7.widget.CardView>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/item_plugin_local.xml b/qpython/src/main/res/layout/item_plugin_local.xml
index 1ec70408..2e4da55c 100644
--- a/qpython/src/main/res/layout/item_plugin_local.xml
+++ b/qpython/src/main/res/layout/item_plugin_local.xml
@@ -1,41 +1,43 @@
-<?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    app:cardElevation="1dp">
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="10dp"
-        android:layout_marginRight="10dp">
-
-
-        <TextView
-            android:id="@+id/plugin_name"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentLeft="true"
-            android:layout_margin="5dp"
-            android:textAppearance="@style/TextAppearance.AppCompat.Title"
-            android:textColor="@android:color/black" />
-
-        <TextView
-            android:textColor="@android:color/black"
-            android:id="@+id/plugin_description"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/plugin_name"
-            android:layout_margin="5dp"
-            android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
-
-        <ImageView
-            android:id="@+id/plugin_menu"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
-            android:layout_centerVertical="true"
-            android:src="@drawable/ic_plugin" />
-    </RelativeLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    app:cardElevation="1dp">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="10dp"
+        android:layout_marginRight="10dp">
+
+
+        <TextView
+            android:id="@+id/plugin_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"
+            android:layout_margin="5dp"
+            android:textAppearance="@style/TextAppearance.AppCompat.Title"
+            android:textColor="@android:color/black" />
+
+        <TextView
+            android:id="@+id/plugin_description"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/plugin_name"
+            android:layout_margin="5dp"
+            android:textAppearance="@style/TextAppearance.AppCompat.Body1"
+            android:textColor="@android:color/black" />
+
+        <ImageView
+            android:id="@+id/plugin_menu"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentEnd="true"
+            android:layout_alignParentRight="true"
+            android:layout_centerVertical="true"
+            android:src="@drawable/ic_plugin" />
+    </RelativeLayout>
 </android.support.v7.widget.CardView>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/item_pop_up.xml b/qpython/src/main/res/layout/item_pop_up.xml
new file mode 100644
index 00000000..415e46f1
--- /dev/null
+++ b/qpython/src/main/res/layout/item_pop_up.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/title"
+    android:descendantFocusability="blocksDescendants"
+    style="@style/dialog_item"/>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/item_price.xml b/qpython/src/main/res/layout/item_price.xml
new file mode 100644
index 00000000..20019d7f
--- /dev/null
+++ b/qpython/src/main/res/layout/item_price.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    >
+
+    <TextView
+        android:id="@+id/tv_prices"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@drawable/purchase_bg"
+        android:gravity="center"
+        android:padding="@dimen/default_margin"
+        android:textColor="@color/theme_yellow"
+        android:textStyle="bold"/>
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/item_program.xml b/qpython/src/main/res/layout/item_program.xml
deleted file mode 100644
index 119ef0af..00000000
--- a/qpython/src/main/res/layout/item_program.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <org.qpython.qpy.program.ItemMenuLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@drawable/white_selectable_item_background"
-            android:minHeight="72dp"
-            android:orientation="horizontal"
-            android:paddingLeft="16dp"
-            android:paddingRight="16dp">
-
-            <ImageView
-                android:id="@+id/iconImage"
-                android:layout_width="40dp"
-                android:layout_height="40dp"
-                android:layout_gravity="center_vertical"
-                android:layout_marginRight="16dp" />
-
-            <RelativeLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical">
-
-                <TextView
-                    android:id="@+id/nameTextView"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:clickable="false"
-                    android:ellipsize="middle"
-                    android:gravity="center_vertical"
-                    android:singleLine="true"
-                    android:textColor="@android:color/black"
-                    android:textSize="17sp" />
-
-                <TextView
-                    android:id="@+id/dateTextView"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentLeft="true"
-                    android:layout_below="@id/nameTextView"
-                    android:layout_marginTop="5dp"
-                    android:textColor="?android:attr/textColorTertiary"
-                    android:textSize="13sp" />
-            </RelativeLayout>
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:orientation="horizontal">
-
-            <TextView
-                android:id="@+id/menu_run"
-                style="@style/ItemMenuTheme"
-                android:text="@string/program_item_menu_run"
-                android:background="@color/Color_Red"/>
-
-            <TextView
-                android:id="@+id/menu_open"
-                style="@style/ItemMenuTheme"
-                android:text="@string/program_item_menu_open"
-                android:background="@color/Color_Green"/>
-
-            <TextView
-                android:background="@color/colorPrimary"
-                android:id="@+id/menu_delete"
-                style="@style/ItemMenuTheme"
-                android:text="@string/program_item_menu_delete" />
-        </LinearLayout>
-    </org.qpython.qpy.program.ItemMenuLayout>
-</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/item_run_program.xml b/qpython/src/main/res/layout/item_run_program.xml
index 4a3a2448..d67c6ba7 100644
--- a/qpython/src/main/res/layout/item_run_program.xml
+++ b/qpython/src/main/res/layout/item_run_program.xml
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/tv_name"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="@drawable/bg_item"
-    android:gravity="center_vertical"
-    android:padding="8dp"
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/tv_name"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/bg_item"
+    android:gravity="center_vertical"
+    android:padding="8dp"
     android:textSize="24sp" />
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/item_share_code.xml b/qpython/src/main/res/layout/item_share_code.xml
new file mode 100644
index 00000000..3bdff9c7
--- /dev/null
+++ b/qpython/src/main/res/layout/item_share_code.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <RelativeLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:padding="@dimen/default_margin">
+
+        <ImageView
+            android:id="@+id/avatar"
+            android:layout_width="30dp"
+            android:layout_height="30dp"
+            android:layout_marginBottom="10dp"
+            android:layout_marginRight="@dimen/default_margin"
+            android:src="@drawable/empty"/>
+
+        <TextView
+            android:id="@+id/name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_toRightOf="@id/avatar"
+            android:textColor="#FFF"
+            android:textSize="12sp"/>
+
+        <TextView
+            android:id="@+id/date"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignBottom="@id/avatar"
+            android:layout_toRightOf="@id/avatar"
+            android:textSize="12sp"/>
+
+        <ImageButton
+            android:id="@+id/delete"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignBottom="@id/avatar"
+            android:layout_alignParentRight="true"
+            android:layout_alignTop="@id/avatar"
+            android:background="@null"
+            android:src="@drawable/ic_com_delete"
+            android:visibility="gone"/>
+
+        <TextView
+            android:id="@+id/title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/avatar"
+            android:layout_marginBottom="10dp"
+            android:ellipsize="end"
+            android:maxLines="3"
+            android:textColor="#FFF"/>
+
+
+        <TextView
+            android:id="@+id/bookmark_count"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_below="@id/title"
+            android:drawableLeft="@drawable/ic_com_like"
+            android:drawablePadding="5dp"
+            android:textSize="12sp"/>
+
+        <TextView
+            android:id="@+id/comment_count"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignBottom="@id/bookmark_count"
+            android:layout_marginRight="@dimen/default_margin"
+            android:layout_toLeftOf="@id/bookmark_count"
+            android:drawableLeft="@drawable/ic_com_comment"
+            android:drawablePadding="5dp"
+            android:textSize="12sp"/>
+    </RelativeLayout>
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/item_square_img.xml b/qpython/src/main/res/layout/item_square_img.xml
new file mode 100644
index 00000000..793c6e37
--- /dev/null
+++ b/qpython/src/main/res/layout/item_square_img.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <ImageView
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/item_img"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:layout_marginRight="7dp"/>
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/jpush_popwin_layout.xml b/qpython/src/main/res/layout/jpush_popwin_layout.xml
index f43e4783..64e5d0c9 100644
--- a/qpython/src/main/res/layout/jpush_popwin_layout.xml
+++ b/qpython/src/main/res/layout/jpush_popwin_layout.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/popLayoutId"
     style="@style/MyDialogStyle"
     android:orientation="vertical"
     android:layout_width="280dp"
@@ -10,6 +9,6 @@
         <WebView
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:id="@+id/wvPopwin"/>
+            />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/jpush_webview_layout.xml b/qpython/src/main/res/layout/jpush_webview_layout.xml
index 19faa435..07c6fc77 100644
--- a/qpython/src/main/res/layout/jpush_webview_layout.xml
+++ b/qpython/src/main/res/layout/jpush_webview_layout.xml
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <cn.jpush.android.ui.FullScreenView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/actionbarLayoutId"
-    android:layout_width="match_parent"
+                                    android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical" >
 
     <RelativeLayout
-        android:id="@+id/rlRichpushTitleBar"
         android:layout_width="match_parent"
         android:layout_height="40.0dp"
         android:background="#29313a">
@@ -30,7 +28,6 @@
             android:src="@drawable/ic_richpush_actionbar_divider" />
 
         <TextView
-            android:id="@+id/tvRichpushTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
@@ -45,7 +42,6 @@
     <WebView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:id="@+id/fullWebView"
         android:background="#000000" />
 
 </cn.jpush.android.ui.FullScreenView>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/layout_about.xml b/qpython/src/main/res/layout/layout_about.xml
new file mode 100644
index 00000000..82e32fbc
--- /dev/null
+++ b/qpython/src/main/res/layout/layout_about.xml
@@ -0,0 +1,215 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:padding="4dp" >
+
+        <include layout="@layout/about_generic" />
+
+        <TextView
+            style="@style/TextTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:text="@string/ui_history" />
+
+        <TextView
+            style="@style/TextSubTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/release18" />
+
+        <TextView
+            style="@style/TextContent"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/release18_log" />
+
+        <TextView
+            style="@style/TextSubTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/release17" />
+
+        <TextView
+            style="@style/TextContent"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/release17_log" />
+
+        <TextView
+            style="@style/TextSubTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/release16" />
+
+        <TextView
+            style="@style/TextContent"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/release16_log" />
+
+        <TextView
+            style="@style/TextSubTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/release15" />
+
+        <TextView
+            style="@style/TextContent"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/release15_log" />
+
+        <TextView
+            style="@style/TextSubTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/release13" />
+
+        <TextView
+            style="@style/TextContent"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/release13_log" />
+
+        <TextView
+            style="@style/TextSubTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/release12" />
+
+        <TextView
+            style="@style/TextContent"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/release12_log" />
+
+        <TextView
+            style="@style/TextSubTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/release11" />
+
+        <TextView
+            style="@style/TextContent"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/release11_log" />
+
+        <TextView
+            style="@style/TextSubTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/release1" />
+
+        <TextView
+            style="@style/TextContent"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/release1_log" />
+
+        <TextView
+            style="@style/TextSubTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/beta9" />
+
+        <TextView
+            style="@style/TextContent"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/beta9_log" />
+
+        <TextView
+            style="@style/TextSubTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/beta8" />
+
+        <TextView
+            style="@style/TextContent"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/beta8_log" />
+
+        <TextView
+            style="@style/TextSubTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/beta7" />
+
+        <TextView
+            style="@style/TextContent"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/beta7_log" />
+
+        <TextView
+            style="@style/TextSubTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/beta6" />
+
+        <TextView
+            style="@style/TextContent"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/beta6_log" />
+
+        <TextView
+            style="@style/TextSubTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/beta5" />
+
+        <TextView
+            style="@style/TextContent"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/beta5_log" />
+
+        <TextView
+            style="@style/TextSubTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/beta4" />
+
+        <TextView
+            style="@style/TextContent"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/beta4_log" />
+
+        <TextView
+            style="@style/TextSubTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/beta3" />
+
+        <TextView
+            style="@style/TextContent"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/beta3_log" />
+
+        <TextView
+            style="@style/TextSubTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/beta2" />
+
+        <TextView
+            style="@style/TextContent"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/beta2_log" />
+    </LinearLayout>
+
+</ScrollView>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/layout_editor.xml b/qpython/src/main/res/layout/layout_editor.xml
new file mode 100644
index 00000000..3b75221c
--- /dev/null
+++ b/qpython/src/main/res/layout/layout_editor.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/editor_layout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <ViewStub
+            android:id="@+id/vs_search_top"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:inflatedId="@+id/ii_search_top"
+            android:layout="@layout/search_top"/>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="4">
+
+            <org.qpython.qpy.texteditor.ui.view.AdvancedEditText
+                android:id="@+id/editor"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:gravity="top|start"
+                android:imeOptions="flagNoFullscreen"
+                android:inputType="textMultiLine|textNoSuggestions"
+                android:scrollbarAlwaysDrawHorizontalTrack="true"
+                android:scrollbarAlwaysDrawVerticalTrack="true"
+                android:scrollbarSize="5dp"
+                android:scrollbars="horizontal|vertical"
+                android:typeface="monospace">
+
+                <requestFocus/>
+            </org.qpython.qpy.texteditor.ui.view.AdvancedEditText>
+
+            <android.support.design.widget.FloatingActionButton
+                android:id="@+id/share"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentBottom="true"
+                android:layout_alignParentEnd="true"
+                android:layout_alignParentRight="true"
+                android:layout_margin="@dimen/default_margin"
+                android:src="@drawable/ic_gist"
+                android:visibility="gone"
+                />
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <LinearLayout
+                android:id="@+id/return_bar_box"
+                android:layout_width="match_parent"
+                android:layout_height="?attr/actionBarSize"
+                android:background="#FFE8E8E8"
+                android:gravity="center_vertical"
+                android:orientation="horizontal"
+                >
+
+                <ImageButton
+                    android:id="@+id/ib_more"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="5dp"
+                    android:layout_marginStart="5dp"
+                    android:background="@null"
+                    android:clickable="true"
+                    android:focusable="true"
+                    android:padding="5dp"
+                    android:src="@drawable/ic_editcode"
+                    />
+
+                <View
+                    android:layout_width="2dp"
+                    android:layout_height="21dp"
+                    android:layout_marginLeft="5dp"
+                    android:layout_marginRight="5dp"
+                    android:background="#FFD5D5D5"/>
+
+                <HorizontalScrollView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:fadingEdgeLength="30dp"
+                    android:requiresFadingEdge="horizontal">
+
+                    <include
+                        android:id="@+id/control"
+                        layout="@layout/widget_editor_control"/>
+
+                </HorizontalScrollView>
+
+            </LinearLayout>
+
+            <include
+                android:id="@+id/search_bottom"
+                layout="@layout/search"/>
+        </RelativeLayout>
+    </LinearLayout>
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/layout_open.xml b/qpython/src/main/res/layout/layout_open.xml
new file mode 100644
index 00000000..97c2d324
--- /dev/null
+++ b/qpython/src/main/res/layout/layout_open.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:orientation="vertical">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="?attr/actionBarSize"
+        android:background="@color/toolbar">
+
+        <TextView
+            android:id="@+id/tv_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:text="@string/choose_ttf"
+            android:textColor="#FFF"
+            android:textSize="18sp"/>
+
+        <ImageView
+            android:id="@+id/buttonCancel"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_centerVertical="true"
+            android:layout_margin="@dimen/default_margin"
+            android:src="@drawable/ic_editor_filetree_close"
+            android:layout_alignParentEnd="true"/>
+    </RelativeLayout>
+
+    <ListView
+        android:id="@android:id/list"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:background="@color/toolbar">
+    </ListView>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/layout_prefs.xml b/qpython/src/main/res/layout/layout_prefs.xml
new file mode 100644
index 00000000..6dbf8ea1
--- /dev/null
+++ b/qpython/src/main/res/layout/layout_prefs.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:paddingTop="25dp"
+        android:background="@color/colorPrimary">
+
+        <include
+            android:id="@+id/top_bar"
+            layout="@layout/layout_toolbar"/>
+
+        <org.qpython.qpy.texteditor.ui.view.AdvancedEditText
+            android:id="@+id/sample_editor"
+            android:layout_width="match_parent"
+            android:layout_height="64dp"
+            android:layout_margin="2dp"
+            android:gravity="top|start"
+            android:scrollbarAlwaysDrawHorizontalTrack="true"
+            android:scrollbarAlwaysDrawVerticalTrack="true"
+            android:scrollbarSize="5dp"
+            android:scrollbars="horizontal|vertical"
+            android:text="@string/lorem_ipsum"
+            android:typeface="monospace"/>
+
+
+        <FrameLayout
+            android:id="@+id/setting_fragment"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_below="@id/app_bar"
+            android:orientation="vertical"/>
+        <!--<ListView-->
+            <!--android:id="@android:id/list"-->
+            <!--android:layout_width="match_parent"-->
+            <!--android:layout_height="match_parent"-->
+            <!--android:background="@color/colorPrimaryDark"/>-->
+
+    </LinearLayout>
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/layout_save_as.xml b/qpython/src/main/res/layout/layout_save_as.xml
new file mode 100644
index 00000000..3062a049
--- /dev/null
+++ b/qpython/src/main/res/layout/layout_save_as.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:orientation="horizontal" >
+
+        <EditText
+            android:id="@+id/editFileName"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:drawablePadding="8dp"
+            android:hint="@string/ui_hint_file_name"
+            android:inputType="text" >
+        </EditText>
+    </LinearLayout>
+
+    <ListView
+        android:id="@android:id/list"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1" >
+    </ListView>
+
+    <include layout="@layout/buttons_ok_cancel" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/layout_toolbar.xml b/qpython/src/main/res/layout/layout_toolbar.xml
index 946cd134..3d412267 100644
--- a/qpython/src/main/res/layout/layout_toolbar.xml
+++ b/qpython/src/main/res/layout/layout_toolbar.xml
@@ -1,8 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/toolbar"
-    android:layout_width="match_parent"
-    android:layout_height="?attr/actionBarSize"
-    android:background="@color/colorPrimary"
-    app:popupTheme="@style/DefaultBlueToolbar" />
+<layout>
+
+    <android.support.design.widget.AppBarLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:layout_width="match_parent"
+        android:layout_height="?attr/actionBarSize">
+
+        <android.support.v7.widget.Toolbar
+            android:id="@+id/toolbar"
+            style="@style/Toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="#FF4A4A4A"
+            android:elevation="2dp"
+            app:popupTheme="@style/DefaultBlueToolbar"
+            app:theme="@style/ToolbarTheme"/>
+    </android.support.design.widget.AppBarLayout>
+
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/layout_widget_config.xml b/qpython/src/main/res/layout/layout_widget_config.xml
new file mode 100644
index 00000000..15281884
--- /dev/null
+++ b/qpython/src/main/res/layout/layout_widget_config.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+    <CheckBox
+        android:id="@+id/readOnly"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:checked="false"
+        android:gravity="center_vertical|right"
+        android:padding="4dp"
+        android:text="@string/ui_force_read_only" />
+
+    <ListView
+        android:id="@android:id/list"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1" >
+    </ListView>
+
+    <Button
+        android:id="@+id/buttonCancel"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:text="@string/ui_cancel" >
+    </Button>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/list_file_item.xml b/qpython/src/main/res/layout/list_file_item.xml
index ea301e61..d615cf70 100644
--- a/qpython/src/main/res/layout/list_file_item.xml
+++ b/qpython/src/main/res/layout/list_file_item.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/vw1"
-    android:layout_width="match_parent"
+              android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="@drawable/bg_layout"
     android:orientation="horizontal"
diff --git a/qpython/src/main/res/layout/loading_layout.xml b/qpython/src/main/res/layout/loading_layout.xml
deleted file mode 100644
index 1daf5397..00000000
--- a/qpython/src/main/res/layout/loading_layout.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/loading_layout"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:gravity="center">
-
-    <me.zhanghai.android.materialprogressbar.MaterialProgressBar
-        android:id="@+id/progress_view"
-        android:layout_centerHorizontal="true"
-        android:layout_width="48dp"
-        android:layout_height="48dp"
-        android:visibility="gone"
-        android:indeterminate="true" />
-
-    <TextView
-        android:id="@+id/loading_text_view"
-        android:layout_marginTop="8dp"
-        android:gravity="center_horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
-</LinearLayout>
diff --git a/qpython/src/main/res/layout/main_menu_group.xml b/qpython/src/main/res/layout/main_menu_group.xml
deleted file mode 100644
index e1937f60..00000000
--- a/qpython/src/main/res/layout/main_menu_group.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical">
-
-    <TextView
-        android:id="@+id/nameTextView"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="8dp"
-        android:padding="5dp"
-        android:text="Name"
-        android:textColor="?attr/colorAccent"
-        android:textSize="12sp" />
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/divider_height"
-        android:background="@color/divider" />
-</LinearLayout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/main_menu_item.xml b/qpython/src/main/res/layout/main_menu_item.xml
deleted file mode 100644
index 3af36a2e..00000000
--- a/qpython/src/main/res/layout/main_menu_item.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="horizontal">
-
-    <TextView
-        android:id="@+id/textView"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:background="?android:attr/selectableItemBackground"
-        android:drawablePadding="5dp"
-        android:gravity="center_vertical|start"
-        android:paddingBottom="10dp"
-        android:paddingLeft="20dp"
-        android:paddingRight="10dp"
-        android:paddingTop="10dp"
-        android:text="menu" />
-
-    <com.jecelyin.common.widget.CheckableImageView
-        android:id="@+id/checkbox"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="10dp"
-        android:layout_gravity="center_vertical"
-        android:src="@drawable/checkbox_selector"
-        android:visibility="gone" />
-</LinearLayout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/main_tab_layout.xml b/qpython/src/main/res/layout/main_tab_layout.xml
deleted file mode 100644
index 699fea85..00000000
--- a/qpython/src/main/res/layout/main_tab_layout.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <android.support.design.widget.NavigationView
-        android:id="@+id/tabNavView"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_gravity="start|left">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="?attr/actionBarSize"
-                android:background="?attr/colorPrimaryDark"
-                android:gravity="center_vertical"
-                android:orientation="horizontal"
-                android:translationZ="3dp">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="15dp"
-                    android:layout_marginStart="15dp"
-                    android:text="@string/app_name"
-                    android:textColor="#fff"
-                    android:textSize="18sp" />
-
-                <TextView
-                    android:id="@+id/versionTextView"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:paddingLeft="10dp"
-                    android:text="16.1.1"
-                    android:textColor="#fff" />
-
-            </LinearLayout>
-
-            <android.support.v7.widget.RecyclerView
-                android:id="@+id/tabRecyclerView"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent" />
-        </LinearLayout>
-
-    </android.support.design.widget.NavigationView>
-
-</merge>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/nav_header_main.xml b/qpython/src/main/res/layout/nav_header_main.xml
deleted file mode 100644
index 98b5734a..00000000
--- a/qpython/src/main/res/layout/nav_header_main.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="@color/colorPrimary"
-    android:gravity="bottom"
-    android:orientation="horizontal"
-    android:paddingBottom="@dimen/activity_vertical_margin"
-    android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
-    android:theme="@style/ThemeOverlay.AppCompat.Dark">
-
-    <de.hdodenhof.circleimageview.CircleImageView
-        android:id="@+id/profile_image"
-        android:layout_width="@dimen/nav_header_img_size"
-        android:layout_height="@dimen/nav_header_img_size"
-        android:layout_marginTop="@dimen/activity_vertical_margin"
-        android:src="@drawable/micon" />
-
-    <LinearLayout
-        android:layout_marginLeft="16dp"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
-
-        <TextView
-            android:id="@+id/nav_header_name"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingTop="@dimen/nav_header_vertical_spacing"
-            android:text="@string/nav_header_name"
-            android:textAppearance="@style/TextAppearance.AppCompat.Title" />
-
-        <TextView
-            android:layout_marginTop="8dp"
-            android:text="@string/nav_header_link"
-            android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
-    </LinearLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/new_rule_dialog.xml b/qpython/src/main/res/layout/new_rule_dialog.xml
new file mode 100644
index 00000000..45860c43
--- /dev/null
+++ b/qpython/src/main/res/layout/new_rule_dialog.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+    <TextView
+        android:id="@+id/If"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentTop="true"
+        android:text="If file ends with:"
+        android:textAppearance="?android:attr/textAppearanceMedium" />
+
+    <EditText
+        android:id="@+id/should_endwith"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentRight="true"
+        android:layout_below="@+id/If"
+        android:ems="10" >
+
+        <requestFocus />
+    </EditText>
+
+    <TextView
+        android:id="@+id/textView1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
+        android:layout_below="@+id/should_endwith"
+        android:text="Send to app:"
+        android:textAppearance="?android:attr/textAppearanceMedium" />
+
+    <Button
+        android:id="@+id/pick_app_button"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
+        android:layout_below="@+id/textView1"
+        android:text="Pick App" />
+
+    <TextView
+        android:id="@+id/textView2"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
+        android:layout_below="@+id/pick_app_button"
+        android:text="Send as:"
+        android:textAppearance="?android:attr/textAppearanceMedium" />
+
+     <RadioGroup
+         android:layout_width="wrap_content"
+         android:layout_height="wrap_content"
+         android:layout_alignParentLeft="true"
+         android:layout_below="@+id/textView2" >
+
+         <RadioButton
+             android:layout_width="wrap_content"
+             android:layout_height="wrap_content"
+             android:checked="true"
+             android:text="File" />
+
+         <RadioButton
+             android:layout_width="wrap_content"
+             android:layout_height="wrap_content"
+             android:text="String" />
+
+     </RadioGroup>
+
+</RelativeLayout>
diff --git a/qpython/src/main/res/layout/popup_add_editor.xml b/qpython/src/main/res/layout/popup_add_editor.xml
new file mode 100644
index 00000000..ab24fab4
--- /dev/null
+++ b/qpython/src/main/res/layout/popup_add_editor.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="180dp"
+    android:layout_height="wrap_content">
+
+    <ListView
+        android:id="@+id/list_view"
+        android:layout_width="180dp"
+        android:layout_height="wrap_content"
+        android:clickable="true"
+        android:focusable="true"/>
+</FrameLayout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/pref_cursor_width_layout.xml b/qpython/src/main/res/layout/pref_cursor_width_layout.xml
deleted file mode 100644
index ba472c7f..00000000
--- a/qpython/src/main/res/layout/pref_cursor_width_layout.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="42dp"
-    android:padding="10dp"
-    android:orientation="horizontal">
-
-    <TextView
-        android:id="@+id/title"
-        android:text="1 sp"
-        android:textSize="15sp"
-        android:textColor="#333"
-        android:layout_gravity="center_vertical"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-    <View
-        android:id="@+id/cursorView"
-        android:layout_marginLeft="10dp"
-        android:background="#000"
-        android:layout_width="1dp"
-        android:layout_height="match_parent" />
-</LinearLayout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/run_rules.xml b/qpython/src/main/res/layout/run_rules.xml
new file mode 100644
index 00000000..19c1d2ce
--- /dev/null
+++ b/qpython/src/main/res/layout/run_rules.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" >
+
+        <!--
+             <TextView
+            android:id="@+id/textView1"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerHorizontal="true"
+            android:layout_centerVertical="true"
+            android:text="hello world" />
+        -->
+        
+        <ListView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_above="@+id/add_rule_button"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentTop="true" >
+        </ListView>
+
+        <ListView
+            android:id="@android:id/list"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_above="@+id/add_rule_button" />
+
+        <Button
+            android:id="@+id/add_rule_button"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:layout_centerHorizontal="true"
+            android:text="Add Rule" />
+        
+    </RelativeLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/rv_item_news.xml b/qpython/src/main/res/layout/rv_item_news.xml
new file mode 100644
index 00000000..e92346a9
--- /dev/null
+++ b/qpython/src/main/res/layout/rv_item_news.xml
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <LinearLayout
+        android:id="@+id/root_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:paddingTop="@dimen/default_margin"
+        >
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingLeft="20dp"
+            android:paddingRight="20dp">
+
+            <ImageView
+                android:id="@+id/user_avatar_iv"
+                android:layout_width="35dp"
+                android:layout_height="35dp"
+                android:src="@drawable/empty"
+                />
+
+            <TextView
+                android:id="@+id/user_name_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="10dp"
+                android:layout_marginStart="10dp"
+                android:includeFontPadding="false"
+                android:layout_toEndOf="@+id/user_avatar_iv"
+                android:layout_toRightOf="@+id/user_avatar_iv"
+                android:textColor="@color/white"/>
+
+            <TextView
+                android:id="@+id/commit_time_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignBottom="@+id/user_avatar_iv"
+                android:layout_marginLeft="10dp"
+                android:includeFontPadding="false"
+                android:layout_marginStart="10dp"
+                android:layout_toEndOf="@+id/user_avatar_iv"
+                android:layout_toRightOf="@+id/user_avatar_iv"/>
+
+            <ImageView
+                android:id="@+id/delete_iv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentEnd="true"
+                android:layout_alignParentRight="true"
+                android:layout_alignTop="@+id/user_name_tv"
+                android:padding="10dp"
+                android:src="@drawable/ic_com_delete"/>
+        </RelativeLayout>
+
+        <TextView
+            android:id="@+id/content_tv"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:paddingLeft="20dp"
+            android:paddingRight="20dp"
+            android:textColor="@color/white"
+            android:textSize="16sp"/>
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:paddingLeft="20dp"
+            android:paddingRight="20dp">
+
+            <LinearLayout
+                android:id="@+id/comment_count_layout"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="end"
+                android:layout_marginEnd="60dp"
+                android:layout_marginRight="60dp"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:layout_width="18dp"
+                    android:layout_height="18dp"
+                    android:src="@drawable/ic_com_comment"/>
+
+                <TextView
+                    android:id="@+id/comment_count_tv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="4dp"
+                    android:layout_marginStart="4dp"
+                    android:maxLines="1"/>
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/star_count_layout"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="end"
+                android:gravity="start"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:layout_width="18dp"
+                    android:layout_height="18dp"
+                    android:src="@drawable/star_selector"/>
+
+                <TextView
+                    android:id="@+id/star_count_tv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="4dp"
+                    android:layout_marginStart="4dp"/>
+            </LinearLayout>
+        </FrameLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_marginTop="10dp"
+            android:background="@color/colorPrimary"/>
+    </LinearLayout>
+</layout>
diff --git a/qpython/src/main/res/layout/rv_item_news_comment.xml b/qpython/src/main/res/layout/rv_item_news_comment.xml
new file mode 100644
index 00000000..69831396
--- /dev/null
+++ b/qpython/src/main/res/layout/rv_item_news_comment.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <LinearLayout
+        android:id="@+id/root_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:paddingTop="15dp"
+        >
+
+
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingLeft="20dp"
+            android:paddingRight="20dp">
+
+            <ImageView
+                android:id="@+id/user_avatar_iv"
+                android:layout_width="38dp"
+                android:layout_height="38dp"
+                android:src="@drawable/empty"/>
+
+            <TextView
+                android:id="@+id/user_name_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="10dp"
+                android:layout_toRightOf="@+id/user_avatar_iv"
+                android:text="JACK"
+                android:textColor="@color/white"
+                />
+
+            <TextView
+                android:id="@+id/commit_time_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignBottom="@+id/user_avatar_iv"
+                android:layout_marginLeft="10dp"
+                android:layout_toRightOf="@+id/user_avatar_iv"
+                android:text="1h ago"
+                />
+
+            <TextView
+                android:id="@+id/comment_content_tv"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignLeft="@+id/commit_time_tv"
+                android:layout_below="@+id/commit_time_tv"
+                android:layout_marginBottom="10dp"
+                android:layout_marginTop="10dp"
+                android:text="Re @jack: hello world"
+                android:textColor="@color/white"
+                android:textSize="16sp"/>
+            <TextView
+                android:id="@+id/reply_content_tv"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:maxHeight="250dp"
+                android:padding="@dimen/default_margin"
+                android:textColor="@color/white"
+                android:background="@color/colorPrimary"
+                android:text="Hello world Hello world Hello world Hello world Hello world Hello world"
+                android:layout_alignLeft="@+id/comment_content_tv"
+                android:layout_below="@+id/comment_content_tv"
+                android:visibility="gone"
+                />
+
+        </RelativeLayout>
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_marginTop="10dp"
+            android:background="@color/colorPrimary"/>
+    </LinearLayout>
+</layout>
diff --git a/qpython/src/main/res/layout/rv_item_news_head.xml b/qpython/src/main/res/layout/rv_item_news_head.xml
new file mode 100644
index 00000000..26826b52
--- /dev/null
+++ b/qpython/src/main/res/layout/rv_item_news_head.xml
@@ -0,0 +1,165 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        >
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:paddingLeft="20dp"
+            android:paddingRight="20dp"
+            android:paddingTop="15dp">
+
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <ImageView
+                    android:id="@+id/user_avatar_iv"
+                    android:layout_width="38dp"
+                    android:layout_height="38dp"
+                    android:src="@drawable/empty"/>
+
+                <TextView
+                    android:id="@+id/user_name_tv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="10dp"
+                    android:layout_marginStart="10dp"
+                    android:layout_toRightOf="@+id/user_avatar_iv"
+                    android:textColor="@color/white"/>
+
+                <TextView
+                    android:id="@+id/commit_time_tv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignBottom="@+id/user_avatar_iv"
+                    android:layout_marginLeft="10dp"
+                    android:layout_marginStart="10dp"
+                    android:layout_toEndOf="@+id/user_avatar_iv"
+                    android:layout_toRightOf="@+id/user_avatar_iv"/>
+
+                <LinearLayout
+                    android:id="@+id/star_count_layout"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentEnd="true"
+                    android:layout_alignParentRight="true"
+                    android:gravity="start|center_vertical"
+                    android:orientation="horizontal">
+
+                    <ImageView
+                        android:layout_width="20dp"
+                        android:layout_height="match_parent"
+                        android:src="@drawable/star_selector"/>
+
+                    <TextView
+                        android:id="@+id/star_count_tv"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="5dp"
+                        android:layout_marginStart="5dp"/>
+                </LinearLayout>
+            </RelativeLayout>
+
+            <TextView
+                android:id="@+id/news_content_tv"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="10dp"
+                android:layout_marginTop="10dp"
+                android:textColor="@color/white"
+                android:textSize="18sp"
+                android:textStyle="bold"/>
+
+            <!--<TextView-->
+            <!--android:id="@+id/news_content_tv"-->
+            <!--android:layout_width="match_parent"-->
+            <!--android:layout_height="wrap_content"-->
+            <!--android:textColor="@color/white"/>-->
+
+            <TextView
+                android:id="@+id/code_content_tv"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
+                android:background="@color/white"
+                android:maxHeight="250dp"
+                android:padding="@dimen/default_margin"
+                android:textColor="@color/black"
+                />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_marginTop="20dp"
+                android:gravity="center"
+                android:orientation="horizontal">
+
+                <Button
+                    android:id="@+id/btn_run"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:background="@color/theme_green"
+                    android:text="@string/view_code"
+                    android:textAllCaps="false"/>
+
+                <Button
+                    android:id="@+id/btn_fork"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="20dp"
+                    android:layout_marginStart="20dp"
+                    android:layout_weight="1"
+                    android:background="@color/theme_yellow"
+                    android:text="@string/fork_code"
+                    android:textAllCaps="false"/>
+            </LinearLayout>
+
+
+            <LinearLayout
+                android:id="@+id/comment_count_layout"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="end"
+                android:layout_marginBottom="14dp"
+                android:layout_marginTop="14dp"
+                android:gravity="start|center_vertical"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="20dp"
+                    android:src="@drawable/ic_com_comment"/>
+
+                <TextView
+                    android:id="@+id/comment_count_tv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_marginLeft="5dp"
+                    android:layout_marginStart="5dp"
+                    android:text="@string/default_text"/>
+            </LinearLayout>
+        </LinearLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="5dp"
+            android:background="@color/colorPrimary"/>
+
+        <TextView
+            android:id="@+id/empty_tv"
+            android:layout_width="match_parent"
+            android:layout_height="200dp"
+            android:gravity="center"
+            android:text="@string/write_a_response"
+            />
+    </LinearLayout>
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/search.xml b/qpython/src/main/res/layout/search.xml
new file mode 100644
index 00000000..bdf68a2e
--- /dev/null
+++ b/qpython/src/main/res/layout/search.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <RelativeLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/rl_search_bottom"
+        android:layout_width="match_parent"
+        android:layout_height="?attr/actionBarSize"
+        android:background="@color/search_bottom"
+        android:gravity="center_vertical"
+        android:padding="5dp"
+        android:visibility="gone">
+
+        <ImageButton
+            android:id="@+id/buttonSearchPrev"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@drawable/transparent"
+            android:padding="5dp"
+            android:src="@drawable/ic_editor_arrow_left"/>
+
+        <ImageView
+            android:id="@+id/iv_search"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:src="@drawable/ic_editor_search"/>
+
+
+        <ImageButton
+            android:id="@+id/buttonSearchNext"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:background="@color/transparency"
+            android:padding="5dp"
+            android:src="@drawable/ic_editor_arrow_right"/>
+
+    </RelativeLayout>
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/search_top.xml b/qpython/src/main/res/layout/search_top.xml
new file mode 100644
index 00000000..c9bb1cf6
--- /dev/null
+++ b/qpython/src/main/res/layout/search_top.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/ll_search"
+        android:layout_width="match_parent"
+        android:layout_height="?attr/actionBarSize"
+        android:background="@color/toolbar"
+        android:clickable="true"
+        android:gravity="center_vertical"
+        android:padding="5dp">
+
+        <ImageButton
+            android:id="@+id/ib_close"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="#0FFF"
+            android:padding="5dp"
+            android:src="@drawable/ic_arrow_back_white"/>
+
+        <EditText
+            android:id="@+id/textSearch"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_marginLeft="5dp"
+            android:layout_weight="1"
+            android:background="#0FFF"
+            android:drawablePadding="8dp"
+            android:hint="@string/ui_hint_search"
+            android:inputType="text"
+            android:textColor="#FFF"
+            android:textColorHint="@color/text_color_hint"/>
+
+        <ImageButton
+            android:id="@+id/ib_clear"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="#0FFF"
+            android:padding="5dp"
+            android:src="@drawable/ic_delete"/>
+
+    </LinearLayout>
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/setting_activity.xml b/qpython/src/main/res/layout/setting_activity.xml
deleted file mode 100644
index 60fe8a33..00000000
--- a/qpython/src/main/res/layout/setting_activity.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <include layout="@layout/layout_toolbar" />
-
-    <FrameLayout
-        android:id="@+id/content"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/snippet_list_row.xml b/qpython/src/main/res/layout/snippet_list_row.xml
new file mode 100644
index 00000000..03637d96
--- /dev/null
+++ b/qpython/src/main/res/layout/snippet_list_row.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content" >
+ 
+    <ImageView
+        android:id="@+id/app_icon"
+        android:layout_width="50dp"
+        android:layout_height="50dp"
+        android:padding="3dp"
+        android:scaleType="centerCrop" />
+ 
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:gravity="center_vertical"
+        android:orientation="vertical"
+        android:paddingLeft="5dp" >
+ 
+        <TextView
+            android:id="@+id/app_name"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical"
+            android:textStyle="bold" />
+ 
+        <TextView
+            android:id="@+id/app_paackage"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical" />
+    </LinearLayout>
+ 
+</LinearLayout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/symbol_item.xml b/qpython/src/main/res/layout/symbol_item.xml
deleted file mode 100644
index 5652f435..00000000
--- a/qpython/src/main/res/layout/symbol_item.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:background="?android:attr/selectableItemBackground"
-    android:gravity="center"
-    android:layout_width="42dp"
-    android:layout_height="42dp">
-
-</TextView>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/symbol_layout.xml b/qpython/src/main/res/layout/symbol_layout.xml
deleted file mode 100644
index 630b47ee..00000000
--- a/qpython/src/main/res/layout/symbol_layout.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="3dp"
-        android:background="@drawable/shadow_up" />
-
-    <org.apmem.tools.layouts.FlowLayout
-        android:id="@+id/char_list_layout"
-        android:background="#f0e1e1e1"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/tab_item.xml b/qpython/src/main/res/layout/tab_item.xml
deleted file mode 100644
index 70861953..00000000
--- a/qpython/src/main/res/layout/tab_item.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:background="?attr/selectableItemBackground"
-    android:paddingStart="18dp"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <TextView
-        android:id="@+id/title_text_view"
-        android:singleLine="true"
-        android:textSize="14sp"
-        android:textColor="#333"
-        android:layout_marginTop="8dp"
-        android:layout_marginRight="45dp"
-        android:layout_marginEnd="45dp"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-    <TextView
-        android:id="@+id/file_text_view"
-        android:layout_below="@id/title_text_view"
-        android:layout_marginRight="45dp"
-        android:layout_marginEnd="45dp"
-        android:textSize="12sp"
-        android:textColor="#666"
-        android:layout_marginBottom="8dp"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-    <ImageView
-        android:id="@+id/close_image_view"
-        android:layout_centerHorizontal="true"
-        android:layout_alignParentEnd="true"
-        android:layout_marginEnd="12dp"
-        android:layout_marginTop="6dp"
-        android:scaleType="center"
-        android:src="@drawable/tab_close"
-        android:layout_width="40dp"
-        android:layout_height="40dp" />
-</RelativeLayout>
diff --git a/qpython/src/main/res/layout/tabs.xml b/qpython/src/main/res/layout/tabs.xml
new file mode 100644
index 00000000..1e499d64
--- /dev/null
+++ b/qpython/src/main/res/layout/tabs.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <android.support.design.widget.TabLayout
+        android:id="@+id/root"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+    </android.support.design.widget.TabLayout>
+    <!--<LinearLayout-->
+    <!--xmlns:android="http://schemas.android.com/apk/res/android"-->
+    <!--android:id="@+id/root"-->
+    <!--android:layout_width="match_parent"-->
+    <!--android:layout_height="match_parent"-->
+    <!--android:orientation="vertical">-->
+
+    <!--<LinearLayout-->
+    <!--android:id="@+id/btns"-->
+    <!--android:layout_width="match_parent"-->
+    <!--android:layout_height="wrap_content"-->
+    <!--android:orientation="horizontal">-->
+
+    <!--<Button-->
+    <!--android:id="@+id/latestBtn"-->
+    <!--style="@style/tab_btn"-->
+    <!--android:text="@string/newest_course"/>-->
+
+    <!--<Button-->
+    <!--android:id="@+id/recommendBtn"-->
+    <!--style="@style/tab_btn"-->
+    <!--android:text="@string/recommend"/>-->
+    <!--</LinearLayout>-->
+
+    <!--<LinearLayout-->
+    <!--android:id="@+id/lines"-->
+    <!--android:layout_width="match_parent"-->
+    <!--android:layout_height="3dp"-->
+    <!--android:orientation="horizontal">-->
+
+    <!--<View-->
+    <!--android:id="@+id/line_latest"-->
+    <!--android:layout_width="0dp"-->
+    <!--android:layout_height="match_parent"-->
+    <!--android:layout_weight="1"-->
+    <!--android:background="#FF4BAC07"/>-->
+
+    <!--<View-->
+    <!--android:id="@+id/line_recommend"-->
+    <!--android:layout_width="0dp"-->
+    <!--android:layout_height="match_parent"-->
+    <!--android:layout_weight="1"-->
+    <!--android:background="@color/theme_bg"/>-->
+    <!--</LinearLayout>-->
+    <!--</LinearLayout>-->
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/term_activity.xml b/qpython/src/main/res/layout/term_activity.xml
index a122100f..adecbf92 100644
--- a/qpython/src/main/res/layout/term_activity.xml
+++ b/qpython/src/main/res/layout/term_activity.xml
@@ -15,8 +15,101 @@
 */
 -->
 
-<org.qpython.qpy.console.TermViewFlipper xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/view_flipper"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:background="@android:color/black" />
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:fitsSystemWindows="true"
+    android:orientation="vertical">
+
+    <android.support.design.widget.AppBarLayout
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:id="@+id/toolbar_layout"
+        android:layout_width="match_parent"
+        android:layout_height="?attr/actionBarSize">
+
+        <android.support.v7.widget.Toolbar
+            android:id="@+id/toolbar"
+            style="@style/Toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="#FF4A4A4A"
+            android:elevation="2dp"
+            app:popupTheme="@style/DefaultBlueToolbar"
+            app:theme="@style/ToolbarTheme">
+
+            <Spinner
+                android:id="@+id/spinner_toolbar"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"/>
+        </android.support.v7.widget.Toolbar>
+
+    </android.support.design.widget.AppBarLayout>
+
+    <!--android:layout_above="@+id/bottom_layout"-->
+
+    <org.qpython.qpy.console.TermViewFlipper
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/view_flipper"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_above="@+id/bottom_layout"
+        android:layout_below="@id/toolbar_layout"
+        android:background="@android:color/black"/>
+
+    <LinearLayout
+        android:id="@+id/bottom_layout"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/shortcut_height"
+        android:layout_alignParentBottom="true"
+        android:background="#FFE8E8E8"
+        android:orientation="horizontal">
+
+
+        <ImageView
+            android:id="@+id/switch_notebook_img"
+            android:layout_width="47dp"
+            android:layout_height="47dp"
+            android:src="@drawable/ic_notebook"
+            android:layout_gravity="center_vertical"
+            android:padding="6dp"
+            android:visibility="gone"
+            />
+
+        <View
+            android:layout_width="2dp"
+            android:layout_height="21dp"
+            android:layout_marginLeft="5dp"
+            android:layout_marginRight="5dp"
+            android:background="#FFD5D5D5"
+            android:layout_gravity="center_vertical"
+            android:visibility="gone"/>
+
+        <ImageButton
+            android:id="@+id/notebook"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:padding="@dimen/default_margin"
+            android:background="@color/transparency"
+            android:src="@drawable/ic_terminal"
+            />
+
+        <HorizontalScrollView
+            android:id="@+id/hs_shortcut"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="#FFE8E8E8"
+            android:baselineAligned="false"
+            android:fadingEdgeLength="30dp"
+            android:requiresFadingEdge="horizontal">
+
+            <jackpal.androidterm.emulatorview.TermShortcutLayout
+                android:id="@+id/term_shortcut"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="@null"/>
+        </HorizontalScrollView>
+    </LinearLayout>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/text_drag_thumbnail.xml b/qpython/src/main/res/layout/text_drag_thumbnail.xml
deleted file mode 100644
index 8cf85626..00000000
--- a/qpython/src/main/res/layout/text_drag_thumbnail.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:gravity="center"
-    android:textAppearance="@style/TextAppearanceLarge" />
diff --git a/qpython/src/main/res/layout/text_edit_action_popup_text.xml b/qpython/src/main/res/layout/text_edit_action_popup_text.xml
deleted file mode 100644
index 75a3ba24..00000000
--- a/qpython/src/main/res/layout/text_edit_action_popup_text.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:gravity="center"
-    android:paddingBottom="8.0dip"
-    android:paddingEnd="16.0dip"
-    android:paddingStart="16.0dip"
-    android:paddingTop="8.0dip"
-    android:textAllCaps="true"
-    android:textColor="#000"
-    android:textStyle="bold" />
diff --git a/qpython/src/main/res/layout/view_stub_save_prompt.xml b/qpython/src/main/res/layout/view_stub_save_prompt.xml
new file mode 100644
index 00000000..eca410d8
--- /dev/null
+++ b/qpython/src/main/res/layout/view_stub_save_prompt.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="#FFF"
+        android:gravity="center_vertical"
+        android:orientation="horizontal"
+        android:padding="@dimen/default_margin"
+        android:visibility="gone">
+
+        <EditText
+            android:id="@+id/et_name"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="8"
+            android:background="@drawable/edit_text_background"
+            android:drawableEnd="@drawable/ic_editor_delete_name"
+            android:drawableRight="@drawable/ic_editor_delete_name"
+            android:hint="@string/file_name"
+            android:textColor="@color/black"/>
+
+        <Button
+            android:id="@+id/btn_save"
+            style="@style/green_btn"
+            android:layout_gravity="end"
+            android:layout_marginLeft="@dimen/default_margin"
+            android:layout_marginStart="@dimen/default_margin"
+            android:layout_weight="1"
+            android:text="@string/save"/>
+    </LinearLayout>
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/widget.xml b/qpython/src/main/res/layout/widget.xml
new file mode 100644
index 00000000..9fed17de
--- /dev/null
+++ b/qpython/src/main/res/layout/widget.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/widgetLayout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:padding="@dimen/widget_margin" >
+
+    <ImageView
+        android:id="@+id/icon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal|top"
+        android:layout_marginTop="8dp"
+        android:padding="12dp"
+        android:src="@drawable/file_qpy" />
+
+    <TextView
+        android:id="@+id/textFileName"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom|center_horizontal"
+        android:layout_marginBottom="4dp"
+        android:background="@drawable/widget_title_background"
+        android:ellipsize="end"
+        android:gravity="center_horizontal|bottom"
+        android:shadowColor="#000000"
+        android:shadowDy="2"
+        android:shadowRadius="4"
+        android:singleLine="true"
+        android:text="filename.ext"
+        android:textColor="#ffffff"
+        android:textSize="12dp" />
+
+</FrameLayout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/widget_banner.xml b/qpython/src/main/res/layout/widget_banner.xml
new file mode 100644
index 00000000..aa431b47
--- /dev/null
+++ b/qpython/src/main/res/layout/widget_banner.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <com.youth.banner.Banner
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:id="@+id/banner"
+        android:layout_width="match_parent"
+        android:layout_height="150dp"
+        app:delay_time="3000"
+        app:indicator_drawable_selected="@drawable/green_dot_shape"
+        app:indicator_drawable_unselected="@drawable/white_dot_shape"
+        app:indicator_height="8dp"
+        app:indicator_margin="4dp"
+        app:indicator_width="8dp"/>
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/widget_editor_control.xml b/qpython/src/main/res/layout/widget_editor_control.xml
new file mode 100644
index 00000000..27139a3b
--- /dev/null
+++ b/qpython/src/main/res/layout/widget_editor_control.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <RelativeLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:background="#FFE8E8E8">
+
+        <LinearLayout
+            xmlns:android="http://schemas.android.com/apk/res/android"
+            android:id="@+id/ll_control"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <ImageButton
+                android:id="@+id/ib_lock"
+                style="@style/editor_bottom_btn"
+                android:src="@drawable/ic_editor_keyboard"/>
+
+            <ImageButton
+                android:id="@+id/ib_jump_to"
+                style="@style/editor_bottom_btn"
+                android:src="@drawable/ic_editor_next"
+                />
+
+            <ImageButton
+                android:id="@+id/ib_save"
+                style="@style/editor_bottom_btn"
+                android:src="@drawable/ic_editor_save"
+                />
+
+            <ImageButton
+                android:id="@+id/play_btn"
+                style="@style/editor_bottom_btn"
+                android:src="@drawable/ic_editor_run"/>
+
+
+            <ImageButton
+                android:id="@+id/ib_search"
+                style="@style/editor_bottom_btn"
+                android:src="@drawable/ic_editor_search"
+                />
+
+            <ImageButton
+                android:id="@+id/ib_undo"
+                style="@style/editor_bottom_btn"
+                android:src="@drawable/undo"/>
+
+            <ImageButton
+                android:id="@+id/ib_redo"
+                style="@style/editor_bottom_btn"
+                android:src="@drawable/redo"/>
+
+            <ImageButton
+                android:id="@+id/ib_save_as"
+                style="@style/editor_bottom_btn"
+                android:src="@drawable/ic_editor_saveas"
+                />
+
+            <ImageButton
+                android:id="@+id/ib_recent"
+                style="@style/editor_bottom_btn"
+                android:src="@drawable/ic_recent"/>
+
+            <ImageButton
+                android:id="@+id/ib_snippet"
+                style="@style/editor_bottom_btn"
+                android:src="@drawable/ic_editor_sharecode"/>
+        </LinearLayout>
+
+        <ViewStub
+            android:id="@+id/vs_shortcut"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:inflatedId="@+id/vs_shortcut"
+            android:layout="@layout/widget_shortcut"/>
+    </RelativeLayout>
+
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/widget_no_net.xml b/qpython/src/main/res/layout/widget_no_net.xml
new file mode 100644
index 00000000..3ee029f9
--- /dev/null
+++ b/qpython/src/main/res/layout/widget_no_net.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    >
+
+    <LinearLayout
+        android:id="@+id/ll_root"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:src="@drawable/img_empty_net"/>
+
+        <TextView
+            android:id="@+id/tv_hint"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/default_margin"
+            android:gravity="center_horizontal"
+            android:text="@string/oops_seems_like_your_net_have_some_trouble"/>
+    </LinearLayout>
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/widget_save.xml b/qpython/src/main/res/layout/widget_save.xml
new file mode 100644
index 00000000..9a8b1c53
--- /dev/null
+++ b/qpython/src/main/res/layout/widget_save.xml
@@ -0,0 +1,194 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/ll_root"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="#FFF"
+        android:orientation="vertical">
+
+        <RelativeLayout
+            android:id="@+id/rl_save"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/list_item_height"
+            android:paddingLeft="5dp"
+            android:visibility="gone"
+            >
+
+            <ImageView
+                android:id="@+id/ib_save"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_marginEnd="5dp"
+                android:layout_marginRight="5dp"
+                android:src="@drawable/ic_editor_save"/>
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_toEndOf="@id/ib_save"
+                android:layout_toRightOf="@id/ib_save"
+                android:text="@string/save"
+                android:textColor="@color/text_dark"/>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_alignParentBottom="true"
+                android:layout_toEndOf="@id/ib_save"
+                android:layout_toRightOf="@id/ib_save"
+                android:background="@color/divide_line"/>
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:id="@+id/rl_saveas"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/list_item_height"
+            android:paddingLeft="5dp"
+            android:paddingRight="5dp"
+            android:paddingStart="5dp"
+            >
+
+            <ImageView
+                android:id="@+id/iv_saveas_icon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_marginEnd="5dp"
+                android:layout_marginRight="5dp"
+                android:src="@drawable/ic_editor_saveas"/>
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_toEndOf="@id/iv_saveas_icon"
+                android:layout_toRightOf="@id/iv_saveas_icon"
+                android:text="@string/save_as"
+                android:textColor="@color/text_dark"/>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_alignParentBottom="true"
+                android:layout_toEndOf="@id/iv_saveas_icon"
+                android:layout_toRightOf="@id/iv_saveas_icon"
+                android:background="@color/divide_line"/>
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:id="@+id/rl_save_push"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/list_item_height"
+            android:paddingLeft="5dp"
+            android:paddingRight="5dp"
+            android:visibility="gone"
+            >
+
+            <ImageView
+                android:id="@+id/iv_save_push"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_marginEnd="5dp"
+                android:layout_marginRight="5dp"
+                android:src="@drawable/ic_editor_saveup"/>
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_toEndOf="@id/iv_save_push"
+                android:layout_toRightOf="@id/iv_save_push"
+                android:text="@string/save_amp_push"
+                android:textColor="@color/text_dark"/>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_alignParentBottom="true"
+                android:layout_toEndOf="@id/iv_save_push"
+                android:layout_toRightOf="@id/iv_save_push"
+                android:background="@color/divide_line"/>
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:id="@+id/rl_recent"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/list_item_height"
+            android:paddingLeft="5dp"
+            android:paddingRight="5dp"
+            >
+
+            <ImageView
+                android:id="@+id/iv_recent"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_marginEnd="5dp"
+                android:layout_marginRight="5dp"
+                android:src="@drawable/ic_editor_recent"/>
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_toEndOf="@id/iv_recent"
+                android:layout_toRightOf="@id/iv_recent"
+                android:text="@string/recent"
+                android:textColor="@color/text_dark"/>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_alignParentBottom="true"
+                android:layout_toEndOf="@id/iv_recent"
+                android:layout_toRightOf="@id/iv_recent"
+                android:background="@color/divide_line"/>
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:id="@+id/rl_share_code"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/list_item_height"
+            android:paddingLeft="5dp"
+            android:paddingRight="5dp"
+            >
+
+            <ImageView
+                android:id="@+id/ib_share_code"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_marginEnd="5dp"
+                android:layout_marginRight="5dp"
+                android:src="@drawable/ic_editor_snippet"
+                />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_toEndOf="@id/ib_share_code"
+                android:layout_toRightOf="@id/ib_share_code"
+                android:text="@string/snippet"
+                android:textColor="@color/text_dark"/>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_alignParentBottom="true"
+                android:layout_toEndOf="@id/ib_share_code"
+                android:layout_toRightOf="@id/ib_share_code"
+                android:background="@color/divide_line"/>
+        </RelativeLayout>
+
+        <ImageButton
+            style="@style/editor_bottom_btn"
+            />
+    </LinearLayout>
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/widget_send_comment.xml b/qpython/src/main/res/layout/widget_send_comment.xml
new file mode 100644
index 00000000..62b34052
--- /dev/null
+++ b/qpython/src/main/res/layout/widget_send_comment.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/colorPrimary"
+        android:orientation="horizontal"
+        android:paddingLeft="@dimen/default_margin"
+        android:paddingStart="@dimen/default_margin">
+
+        <EditText
+            android:id="@+id/edit"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="9"
+            android:maxLines="5"/>
+
+        <Button
+            android:id="@+id/btn_send"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:background="@null"
+            android:text="@string/send"
+            android:textAllCaps="false"
+            android:textColor="@color/colorAccent"
+            android:textSize="18sp"/>
+    </LinearLayout>
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/widget_shortcut.xml b/qpython/src/main/res/layout/widget_shortcut.xml
new file mode 100644
index 00000000..d37b2fa4
--- /dev/null
+++ b/qpython/src/main/res/layout/widget_shortcut.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<org.qpython.qpy.main.widget.ShortcutLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/root_shortcut"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="horizontal"/>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/widget_shortcut_btn.xml b/qpython/src/main/res/layout/widget_shortcut_btn.xml
new file mode 100644
index 00000000..ed920fb8
--- /dev/null
+++ b/qpython/src/main/res/layout/widget_shortcut_btn.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Button
+    style="@style/editor_marks_btn"/>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/widget_shortcut_imgbtn.xml b/qpython/src/main/res/layout/widget_shortcut_imgbtn.xml
new file mode 100644
index 00000000..32bfbf2c
--- /dev/null
+++ b/qpython/src/main/res/layout/widget_shortcut_imgbtn.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ImageButton
+    style="@style/editor_bottom_btn"/>
\ No newline at end of file
diff --git a/qpython/src/main/res/layout/window_list_item.xml b/qpython/src/main/res/layout/window_list_item.xml
index 1e6ff7e7..74894ece 100644
--- a/qpython/src/main/res/layout/window_list_item.xml
+++ b/qpython/src/main/res/layout/window_list_item.xml
@@ -15,39 +15,44 @@
 ** limitations under the License.
 */
 -->
+<layout>
 
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="horizontal">
-
-    <TextView
-        android:id="@+id/window_list_label"
+    <LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="wrap_content"
-        android:layout_height="fill_parent"
-        android:layout_weight="1"
-        android:maxLines="1"
-        android:padding="15dp"
-        android:singleLine="true"
-        android:textAppearance="?android:attr/textAppearanceLarge" />
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
 
-    <View
-        android:id="@+id/window_list_separator"
-        android:layout_width="1dp"
-        android:layout_height="fill_parent"
-        android:layout_marginBottom="5dp"
-        android:layout_marginLeft="8dp"
-        android:layout_marginTop="5dp"
-        android:background="#ff313431" />
+        <TextView
+            android:id="@+id/window_list_label"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:maxLines="1"
+            android:padding="15dp"
+            android:singleLine="true"
+            android:text="#FFF"
+            />
+        <!--android:textAppearance="?android:attr/textAppearanceLarge"-->
 
-    <view
-        android:id="@+id/window_list_close"
-        class="org.qpython.qpy.console.WindowList$CloseButton"
-        android:layout_width="wrap_content"
-        android:layout_height="fill_parent"
-        android:background="@drawable/close_background"
-        android:paddingLeft="15dp"
-        android:paddingRight="15dp"
-        android:scaleType="center"
-        android:src="@drawable/btn_close_window" />
-</LinearLayout>
+        <View
+            android:id="@+id/window_list_separator"
+            android:layout_width="1dp"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="5dp"
+            android:layout_marginLeft="8dp"
+            android:layout_marginTop="5dp"
+            android:background="#ff313431"/>
+
+        <ImageView
+            android:id="@+id/window_list_close"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@drawable/close_background"
+            android:paddingLeft="15dp"
+            android:paddingRight="15dp"
+            android:scaleType="center"
+            android:src="@drawable/btn_close_window"/>
+    </LinearLayout>
+</layout>
\ No newline at end of file
diff --git a/qpython/src/main/res/menu/about_menu.xml b/qpython/src/main/res/menu/about_menu.xml
new file mode 100644
index 00000000..fc17a17e
--- /dev/null
+++ b/qpython/src/main/res/menu/about_menu.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+      xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/menu_mail"
+        android:icon="@drawable/ic_about_mail"
+        android:title="@string/feed_back"
+        app:showAsAction="ifRoom"/>
+    <item
+        android:id="@+id/menu_share"
+        android:icon="@drawable/ic_about_share"
+        android:title="@string/share"
+        app:showAsAction="always"/>
+</menu>
\ No newline at end of file
diff --git a/qpython/src/main/res/menu/activity_console_menu.xml b/qpython/src/main/res/menu/activity_console_menu.xml
index 6576fb78..12a3e01d 100644
--- a/qpython/src/main/res/menu/activity_console_menu.xml
+++ b/qpython/src/main/res/menu/activity_console_menu.xml
@@ -1,41 +1,54 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+      xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/menu_new_window"
-        android:icon="@drawable/ic_menu_add"
-        android:title="@string/new_window" />
-    <item
-        android:id="@+id/menu_close_window"
-        android:icon="@drawable/ic_menu_close_clear_cancel"
-        android:title="@string/close_window" />
-    <item
-        android:id="@+id/menu_window_list"
-        android:icon="@drawable/ic_menu_windows"
-        android:title="@string/window_list" />
-    <item
-        android:id="@+id/menu_toggle_soft_keyboard"
-        android:title="@string/toggle_soft_keyboard" />
-    <item
-        android:id="@+id/menu_special_keys"
-        android:title="@string/special_keys" />
-    <item
-        android:id="@+id/menu_preferences"
-        android:icon="@drawable/ic_menu_preferences"
-        android:title="@string/preferences" />
-    <item
-        android:id="@+id/menu_reset"
-        android:title="@string/reset" />
-    <item
-        android:id="@+id/menu_send_email"
-        android:title="@string/send_email" />
-    <item
-        android:id="@+id/menu_toggle_wakelock"
-        android:title="@string/enable_wakelock" />
-    <item
-        android:id="@+id/menu_toggle_wifilock"
-        android:title="@string/enable_wifilock" />
-    <item
-        android:id="@+id/action_help"
-        android:title="@string/help" />
+        android:icon="@drawable/ic_add"
+        app:showAsAction="ifRoom"
+        android:title="@string/new_window"/>
+    <item
+        android:id="@+id/menu_new_more"
+        android:icon="@drawable/ic_more"
+        android:title="@string/more"
+        app:showAsAction="always"/>
+
+    <!--<item-->
+        <!--android:id="@+id/menu_close_window"-->
+        <!--android:visible="false"-->
+        <!--android:icon="@drawable/ic_editor_filetree_close"-->
+        <!--android:title="@string/close_window"/>-->
+    <!--<item-->
+        <!--android:id="@+id/menu_window_list"-->
+        <!--android:icon="@drawable/ic_menu_windows"-->
+        <!--android:title="@string/window_list"/>-->
+    <!--<item-->
+        <!--android:id="@+id/menu_toggle_soft_keyboard"-->
+        <!--android:visible="false"-->
+        <!--android:title="@string/toggle_soft_keyboard"/>-->
+    <!--<item-->
+        <!--android:id="@+id/menu_special_keys"-->
+        <!--android:visible="false"-->
+        <!--android:title="@string/special_keys"/>-->
+    <!--<item-->
+        <!--android:id="@+id/menu_preferences"-->
+        <!--android:icon="@drawable/ic_menu_preferences"-->
+        <!--android:title="@string/preferences"/>-->
+    <!--<item-->
+        <!--android:id="@+id/menu_reset"-->
+        <!--android:visible="false"-->
+        <!--android:title="@string/reset"/>-->
+    <!--<item-->
+        <!--android:id="@+id/menu_send_email"-->
+        <!--android:title="@string/send_email"/>-->
+    <!--<item-->
+        <!--android:id="@+id/menu_toggle_wakelock"-->
+        <!--android:title="@string/enable_wakelock"/>-->
+    <!--<item-->
+        <!--android:id="@+id/menu_toggle_wifilock"-->
+        <!--android:title="@string/enable_wifilock"/>-->
+    <!--<item-->
+        <!--android:visible="false"-->
+        <!--android:id="@+id/action_help"-->
+        <!--android:title="@string/help"/>-->
 </menu>
\ No newline at end of file
diff --git a/qpython/src/main/res/menu/activity_main_drawer.xml b/qpython/src/main/res/menu/activity_main_drawer.xml
deleted file mode 100644
index ac3dbed9..00000000
--- a/qpython/src/main/res/menu/activity_main_drawer.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <group android:id="@+id/grp1">
-
-        <item
-            android:id="@+id/nav_document"
-            android:icon="@drawable/ic_document"
-            android:title="@string/document" />
-        <item
-            android:id="@+id/nav_forum"
-            android:icon="@drawable/ic_forum"
-            android:title="@string/forum" />
-
-        <item
-            android:id="@+id/nav_wiki"
-            android:icon="@drawable/ic_wiki"
-            android:title="@string/wiki" />
-    </group>
-
-</menu>
\ No newline at end of file
diff --git a/qpython/src/main/res/menu/activity_main_menu.xml b/qpython/src/main/res/menu/activity_main_menu.xml
deleted file mode 100644
index f0c498f6..00000000
--- a/qpython/src/main/res/menu/activity_main_menu.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item
-        android:id="@+id/action_setting"
-        android:icon="@drawable/ic_more"
-        android:title="@string/setting"
-        app:showAsAction="ifRoom" />
-</menu>
\ No newline at end of file
diff --git a/qpython/src/main/res/menu/browser_menu.xml b/qpython/src/main/res/menu/browser_menu.xml
deleted file mode 100644
index 15a7abed..00000000
--- a/qpython/src/main/res/menu/browser_menu.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (C) 2016 Jecelyin Peng <jecelyin@gmail.com>
-  ~
-  ~ This file is part of 920 Text Editor.
-  ~
-  ~ 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.
-  -->
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item
-        android:id="@+id/open_with_browser"
-        android:title="@string/open_with_external_browser"
-        android:icon="@drawable/ic_open_in_browser"
-        app:showAsAction="always" />
-</menu>
\ No newline at end of file
diff --git a/qpython/src/main/res/menu/comment_menu.xml b/qpython/src/main/res/menu/comment_menu.xml
new file mode 100644
index 00000000..5e5229d0
--- /dev/null
+++ b/qpython/src/main/res/menu/comment_menu.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+      xmlns:app="http://schemas.android.com/apk/res-auto">
+<item
+    android:id="@+id/menu_comment"
+    android:title="@string/from_content"
+    app:showAsAction="ifRoom"/>
+</menu>
\ No newline at end of file
diff --git a/qpython/src/main/res/menu/community_menu.xml b/qpython/src/main/res/menu/community_menu.xml
new file mode 100644
index 00000000..9d97789a
--- /dev/null
+++ b/qpython/src/main/res/menu/community_menu.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+      xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/news_edit"
+        app:showAsAction="always"
+        android:title="@string/my"/>
+</menu>
\ No newline at end of file
diff --git a/qpython/src/main/res/menu/editor_menu.xml b/qpython/src/main/res/menu/editor_menu.xml
new file mode 100644
index 00000000..542d5c13
--- /dev/null
+++ b/qpython/src/main/res/menu/editor_menu.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+      xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/menu_open"
+        android:icon="@drawable/ic_editor_open"
+        android:title="@string/open"
+        app:showAsAction="always"/>
+    <item
+        android:id="@+id/menu_add"
+        android:icon="@drawable/ic_add"
+        android:title="@string/share"
+        app:showAsAction="always"/>
+    <item
+        android:id="@+id/menu_more"
+        android:icon="@drawable/ic_more"
+        android:title="@string/share"
+        app:showAsAction="always"/>
+</menu>
\ No newline at end of file
diff --git a/qpython/src/main/res/menu/feedback_menu.xml b/qpython/src/main/res/menu/feedback_menu.xml
deleted file mode 100644
index 39cce4a2..00000000
--- a/qpython/src/main/res/menu/feedback_menu.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (C) 2016 Jecelyin Peng <jecelyin@gmail.com>
-  ~
-  ~ This file is part of 920 Text Editor.
-  ~
-  ~ 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.
-  -->
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item
-        android:id="@+id/send"
-        android:title="@string/send"
-        app:showAsAction="always" />
-</menu>
\ No newline at end of file
diff --git a/qpython/src/main/res/menu/log_menu.xml b/qpython/src/main/res/menu/log_menu.xml
new file mode 100644
index 00000000..e12d727d
--- /dev/null
+++ b/qpython/src/main/res/menu/log_menu.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/menu_more"
+        android:icon="@drawable/ic_about_mail"
+        android:title="@string/feed_back"
+        app:showAsAction="always"/>
+</menu>
\ No newline at end of file
diff --git a/qpython/src/main/res/menu/news_menu.xml b/qpython/src/main/res/menu/news_menu.xml
new file mode 100644
index 00000000..718347c6
--- /dev/null
+++ b/qpython/src/main/res/menu/news_menu.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+      xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/news_share"
+        android:icon="@drawable/ic_com_share"
+        android:title="@string/share"
+        app:showAsAction="always"/>
+
+    <item
+        android:id="@+id/news_edit"
+        android:icon="@drawable/gist_editor"
+        app:showAsAction="always"
+        android:title="Edit"/>
+</menu>
\ No newline at end of file
diff --git a/qpython/src/main/res/menu/notebook_menu.xml b/qpython/src/main/res/menu/notebook_menu.xml
new file mode 100644
index 00000000..4028024f
--- /dev/null
+++ b/qpython/src/main/res/menu/notebook_menu.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+      xmlns:app="http://schemas.android.com/apk/res-auto">
+    <!--item
+        android:id="@+id/menu_open"
+        android:icon="@drawable/ic_editor_open"
+        android:title="@string/open"
+        app:showAsAction="always"/-->
+    <item
+        android:id="@+id/menu_add"
+        android:icon="@drawable/ic_add"
+        android:title="@string/share"
+        app:showAsAction="always"/>
+
+    <item
+        android:id="@+id/menu_new_more"
+        android:icon="@drawable/ic_more"
+        android:title="@string/more"
+        app:showAsAction="always"/>
+</menu>
\ No newline at end of file
diff --git a/qpython/src/main/res/menu/plugin_installed_menu.xml b/qpython/src/main/res/menu/plugin_installed_menu.xml
index f3b42842..68910a29 100644
--- a/qpython/src/main/res/menu/plugin_installed_menu.xml
+++ b/qpython/src/main/res/menu/plugin_installed_menu.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item
-        android:id="@+id/detail"
-        android:title="@string/plugin_detail" />
-
-    <item
-        android:id="@+id/uninstall"
-        android:title="@string/plugin_uninstall" />
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:id="@+id/detail"
+        android:title="@string/plugin_detail" />
+
+    <item
+        android:id="@+id/uninstall"
+        android:title="@string/plugin_uninstall" />
 </menu>
\ No newline at end of file
diff --git a/qpython/src/main/res/menu/plugin_uninstalled_menu.xml b/qpython/src/main/res/menu/plugin_uninstalled_menu.xml
index 5ebcd651..5dfd6956 100644
--- a/qpython/src/main/res/menu/plugin_uninstalled_menu.xml
+++ b/qpython/src/main/res/menu/plugin_uninstalled_menu.xml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:id="@+id/install"
-        android:title="@string/plugin_install" />
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:id="@+id/install"
+        android:title="@string/plugin_install" />
 </menu>
\ No newline at end of file
diff --git a/qpython/src/main/res/menu/plugin_update_menu.xml b/qpython/src/main/res/menu/plugin_update_menu.xml
index a870ff1f..b722dcc1 100644
--- a/qpython/src/main/res/menu/plugin_update_menu.xml
+++ b/qpython/src/main/res/menu/plugin_update_menu.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:id="@+id/detail"
-        android:title="@string/plugin_detail" />
-
-    <item
-        android:id="@+id/update"
-        android:title="@string/plugin_update" />
-
-    <item
-        android:id="@+id/uninstall"
-        android:title="@string/plugin_uninstall" />
-
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:id="@+id/detail"
+        android:title="@string/plugin_detail" />
+
+    <item
+        android:id="@+id/update"
+        android:title="@string/plugin_update" />
+
+    <item
+        android:id="@+id/uninstall"
+        android:title="@string/plugin_uninstall" />
+
 </menu>
\ No newline at end of file
diff --git a/qpython/src/main/res/menu/qr_menu.xml b/qpython/src/main/res/menu/qr_menu.xml
new file mode 100644
index 00000000..19b623ea
--- /dev/null
+++ b/qpython/src/main/res/menu/qr_menu.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+      xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/album"
+        android:icon="@drawable/scan_image"
+        android:title="@string/album"
+        app:showAsAction="always"/>
+</menu>
\ No newline at end of file
diff --git a/qpython/src/main/res/menu/refresh_menu.xml b/qpython/src/main/res/menu/refresh_menu.xml
new file mode 100644
index 00000000..e7f4f967
--- /dev/null
+++ b/qpython/src/main/res/menu/refresh_menu.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+      xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/log_menu"
+        android:title="@string/log"
+        android:visible="false"
+        app:showAsAction="ifRoom"/>
+
+    <item
+        android:id="@+id/refresh_menu"
+        android:icon="@drawable/ic_library_reinstall"
+        android:title="@string/refresh"
+        app:showAsAction="ifRoom"/>
+</menu>
\ No newline at end of file
diff --git a/qpython/src/main/res/mipmap-hdpi/ic_launcher.png b/qpython/src/main/res/mipmap-hdpi/ic_launcher.png
deleted file mode 100644
index cde69bcc..00000000
Binary files a/qpython/src/main/res/mipmap-hdpi/ic_launcher.png and /dev/null differ
diff --git a/qpython/src/main/res/mipmap-hdpi/scan_corner_bottom_left.png b/qpython/src/main/res/mipmap-hdpi/scan_corner_bottom_left.png
deleted file mode 100644
index 52e991e1..00000000
Binary files a/qpython/src/main/res/mipmap-hdpi/scan_corner_bottom_left.png and /dev/null differ
diff --git a/qpython/src/main/res/mipmap-hdpi/scan_corner_bottom_right.png b/qpython/src/main/res/mipmap-hdpi/scan_corner_bottom_right.png
deleted file mode 100644
index bd45373c..00000000
Binary files a/qpython/src/main/res/mipmap-hdpi/scan_corner_bottom_right.png and /dev/null differ
diff --git a/qpython/src/main/res/mipmap-hdpi/scan_corner_top_left.png b/qpython/src/main/res/mipmap-hdpi/scan_corner_top_left.png
deleted file mode 100644
index bfc445a0..00000000
Binary files a/qpython/src/main/res/mipmap-hdpi/scan_corner_top_left.png and /dev/null differ
diff --git a/qpython/src/main/res/mipmap-hdpi/scan_corner_top_right.png b/qpython/src/main/res/mipmap-hdpi/scan_corner_top_right.png
deleted file mode 100644
index b1582e68..00000000
Binary files a/qpython/src/main/res/mipmap-hdpi/scan_corner_top_right.png and /dev/null differ
diff --git a/qpython/src/main/res/mipmap-hdpi/scan_laser.png b/qpython/src/main/res/mipmap-hdpi/scan_laser.png
deleted file mode 100644
index 75e481aa..00000000
Binary files a/qpython/src/main/res/mipmap-hdpi/scan_laser.png and /dev/null differ
diff --git a/qpython/src/main/res/mipmap-mdpi/ic_launcher.png b/qpython/src/main/res/mipmap-mdpi/ic_launcher.png
deleted file mode 100644
index c133a0cb..00000000
Binary files a/qpython/src/main/res/mipmap-mdpi/ic_launcher.png and /dev/null differ
diff --git a/qpython/src/main/res/mipmap-xhdpi/ic_launcher.png b/qpython/src/main/res/mipmap-xhdpi/ic_launcher.png
deleted file mode 100644
index bfa42f0e..00000000
Binary files a/qpython/src/main/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ
diff --git a/qpython/src/main/res/mipmap-xxhdpi/ic_launcher.png b/qpython/src/main/res/mipmap-xxhdpi/ic_launcher.png
deleted file mode 100644
index 324e72cd..00000000
Binary files a/qpython/src/main/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ
diff --git a/qpython/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/qpython/src/main/res/mipmap-xxxhdpi/ic_launcher.png
deleted file mode 100644
index aee44e13..00000000
Binary files a/qpython/src/main/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ
diff --git a/qpython/src/main/res/raw/projects2.zip b/qpython/src/main/res/raw/projects2.zip
new file mode 100644
index 00000000..1ae44ac1
Binary files /dev/null and b/qpython/src/main/res/raw/projects2.zip differ
diff --git a/qpython/src/main/res/raw/projects3.zip b/qpython/src/main/res/raw/projects3.zip
new file mode 100644
index 00000000..862aacb1
Binary files /dev/null and b/qpython/src/main/res/raw/projects3.zip differ
diff --git a/qpython/src/main/res/raw/samplewebapp.zip b/qpython/src/main/res/raw/samplewebapp.zip
deleted file mode 100644
index 65fa894a..00000000
Binary files a/qpython/src/main/res/raw/samplewebapp.zip and /dev/null differ
diff --git a/qpython/src/main/res/raw/scripts.zip b/qpython/src/main/res/raw/scripts.zip
deleted file mode 100644
index 3ee08e51..00000000
Binary files a/qpython/src/main/res/raw/scripts.zip and /dev/null differ
diff --git a/qpython/src/main/res/raw/scripts2.zip b/qpython/src/main/res/raw/scripts2.zip
new file mode 100644
index 00000000..0a99086e
Binary files /dev/null and b/qpython/src/main/res/raw/scripts2.zip differ
diff --git a/qpython/src/main/res/raw/scripts3.zip b/qpython/src/main/res/raw/scripts3.zip
new file mode 100644
index 00000000..5c454290
Binary files /dev/null and b/qpython/src/main/res/raw/scripts3.zip differ
diff --git a/qpython/src/main/res/values-ja/arrays.xml b/qpython/src/main/res/values-ja/arrays.xml
new file mode 100644
index 00000000..f917ed87
--- /dev/null
+++ b/qpython/src/main/res/values-ja/arrays.xml
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+ * Copyright (C) 2007 The Android Open Source Project
+ *
+ * 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.
+ -->
+
+<resources>
+    <string-array name="entries_statusbar_preference">
+        <item>ステータスバーを表示</item>
+        <item>ステータスバーを隠す</item>
+    </string-array>
+
+    <string-array name="entries_actionbar_preference">
+        <!-- <item>Action bar disabled</item> -->
+        <item>アクションバーを表示</item>
+        <item>アクションバーを隠す(画面の上部かメニューボタンを押すと再表示)</item>
+    </string-array>
+
+    <string-array name="entries_orientation_preference">
+        <item>自動</item>
+        <item>水平</item>
+        <item>垂直</item>
+    </string-array>
+
+    <string-array name="entries_fontsize_preference">
+        <item>4 x 8px</item>
+        <item>6 pt</item>
+        <item>7 pt</item>
+        <item>8 pt</item>
+        <item>9 pt</item>
+        <item>10 pt</item>
+        <item>12 pt</item>
+        <item>14 pt</item>
+        <item>16 pt</item>
+        <item>20 pt</item>
+        <item>24 pt</item>
+        <item>28 pt</item>
+        <item>32 pt</item>
+        <item>36 pt</item>
+        <item>42 pt</item>
+        <item>48 pt</item>
+        <item>64 pt</item>
+        <item>72 pt</item>
+        <item>96 pt</item>
+        <item>144 pt</item>
+        <item>288 pt</item>
+    </string-array>
+
+    <string-array name="entries_color_preference">
+        <item>白の背景・黒の文字</item>
+        <item>黒の背景・白の文字</item>
+        <item>青の背景・白の文字</item>
+        <item>黒の背景・緑の文字</item>
+        <item>黒の背景・黄の文字</item>
+        <item>黒の背景・赤の文字</item>
+        <item>ホログラム</item>
+        <item>高露光</item>
+        <item>低露光</item>
+        <item>Linuxスタイル</item>
+    </string-array>
+
+    <string-array name="entries_backaction_preference">
+        <item>すべてのウィンドウを閉じる</item>
+        <item>現在のウィンドウを閉じる</item>
+        <item>セッションを維持したまま現在のウィンドウを閉じる</item>
+        <item>ESCをコンソールに送る</item>
+        <item>TABをコンソールに送る</item>
+    </string-array>
+
+    <string-array name="entries_controlkey_preference">
+        <item>Ball</item>
+        <item>\@</item>
+        <item>左Alt</item>
+        <item>右Alt</item>
+        <item>音量上げボタン</item>
+        <item>音量下げボタン</item>
+        <item>カメラボタン</item>
+        <item>無し</item>
+    </string-array>
+
+    <string-array name="entries_fnkey_preference">
+        <item>Ball</item>
+        <item>\@</item>
+        <item>左Alt</item>
+        <item>右Alt</item>
+        <item>音量上げボタン</item>
+        <item>音量下げボタン</item>
+        <item>カメラボタン</item>
+        <item>無し</item>
+    </string-array>
+
+    <string-array name="entries_ime_preference">
+        <item>文字</item>
+        <item>単語</item>
+    </string-array>
+
+
+    <!-- These are the 'short' names for the control keys. They are used in the special keys dialog. -->
+    <string-array name="control_keys_short_names">
+        <item>Ball</item>
+        <item>\@</item>
+        <item>左Alt</item>
+        <item>右Alt</item>
+        <item>音量上げボタン</item>
+        <item>音量下げボタン</item>
+        <item>カメラボタン</item>
+        <item>無し</item>
+    </string-array>
+
+    <!-- These are the 'short' names for the Fn keys. They are used in the special keys dialog. -->
+    <string-array name="fn_keys_short_names">
+        <item>Ball</item>
+        <item>\@</item>
+        <item>左Alt</item>
+        <item>右Alt</item>
+        <item>音量上げボタン</item>
+        <item>音量下げボタン</item>
+        <item>カメラボタン</item>
+        <item>無し</item>
+    </string-array>
+
+
+    <!-- Color themes -->
+
+
+    <string-array name="color_theme_names">
+        <item>クラシック</item>
+        <item>ダーク</item>
+        <item>マトリクス</item>
+        <item>スカイ</item>
+        <item>ドラキュラ</item>
+    </string-array>
+
+</resources>
\ No newline at end of file
diff --git a/qpython/src/main/res/values-ja/strings.xml b/qpython/src/main/res/values-ja/strings.xml
new file mode 100644
index 00000000..18a6d9fb
--- /dev/null
+++ b/qpython/src/main/res/values-ja/strings.xml
@@ -0,0 +1,489 @@
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="ExtraTranslation">
+
+    <string name="terminal">コンソール</string>
+    <string name="recent">最近</string>
+    <string name="snippet">スニペット</string>
+    <string name="script">スクリプト</string>
+    <string name="project">プロジェクト</string>
+
+    <string name="setting">設定</string>
+    <string name="editor">エディタ</string>
+    <string name="community">コミュニティ</string>
+
+    <string name="more">さらに</string>
+    <string name="sl4a_server">SL4Aサーバー</string>
+    <string name="ftp_server">FTPサーバー</string>
+
+
+    <!---->
+    <string name="application_terminal">コンソール</string>
+    <string name="preferences">設定</string>
+    <string name="new_window">新しくコンソールを開始</string>
+    <string name="close_window">コンソールを閉じる</string>
+    <string name="window_list">現在のコンソール一覧</string>
+    <string name="reset">コンソールをリセット</string>
+    <string name="send_email">メールを送る...</string>
+    <string name="special_keys">特殊キー</string>
+    <string name="toggle_soft_keyboard">仮想キーボードを表示・非表示</string>
+
+    <string name="reset_toast_notification">現在の状態はリセットされます。</string>
+
+    <string name="enable_wakelock">wakelockを有効化</string>
+    <string name="disable_wakelock">wakelockを無効化</string>
+    <string name="enable_wifilock">WIFI lockを有効化</string>
+    <string name="disable_wifilock">WIFI lockを無効化</string>
+
+    <string name="edit_text">テキストの編集</string>
+    <string name="select_text">テキストを選択</string>
+    <string name="copy_all">すべてコピー</string>
+    <string name="send_control_key">Ctrlキーを送信</string>
+    <string name="send_fn_key">Fnキーを送信</string>
+
+    <string name="window_title">コンソール%1$d</string>
+
+    <string name="process_exit_message">セッションは終了しました。</string>
+
+    <!-- Preference dialog -->
+    <string name="screen_preferences">画面</string>
+
+    <string name="title_statusbar_preference">ステータスバー</string>
+    <string name="summary_statusbar_preference">ステータスバーの表示・非表示</string>
+    <string name="dialog_title_statusbar_preference">ステータスバー</string>
+
+    <string name="title_actionbar_preference">アクションバー</string>
+    <string name="summary_actionbar_preference">アクションバーの動作を選択(Android 3.0以上)</string>
+    <string name="dialog_title_actionbar_preference">アクションバーの動作</string>
+
+    <string name="title_orientation_preference">画面の向き</string>
+    <string name="summary_orientation_preference">画面の向きの動作を選択</string>
+    <string name="dialog_title_orientation_preference">画面の向きの動作</string>
+
+    <string name="text_preferences">テキスト</string>
+
+    <string name="title_utf8_by_default_preference">デフォルトでUTF-8を使用</string>
+    <string name="summary_utf8_by_default_preference">デフォルトでUTF-8を使用中</string>
+
+    <string name="title_fontsize_preference">文字の大きさ</string>
+    <string name="summary_fontsize_preference">文字サイズを選択</string>
+    <string name="dialog_title_fontsize_preference">文字の大きさ</string>
+
+    <string name="title_color_preference">文字色</string>
+    <string name="summary_color_preference">文字の色を選択</string>
+    <string name="dialog_title_color_preference">文字色</string>
+
+    <string name="keyboard_preferences">キーボード</string>
+
+    <string name="title_backaction_preference">戻るボタンの動作</string>
+    <string name="summary_backaction_preference">戻るボタンの動作を選択</string>
+    <string name="dialog_title_backaction_preference">戻るボタンの動作</string>
+
+    <string name="title_controlkey_preference">Ctrlキー</string>
+    <string name="summary_controlkey_preference">Ctrlキーの動作を選択</string>
+    <string name="dialog_title_controlkey_preference">Ctrlキー</string>
+
+    <string name="title_fnkey_preference">Fnキー</string>
+    <string name="summary_fnkey_preference">Fnキーの動作を選択</string>
+    <string name="dialog_title_fnkey_preference">Fnキー</string>
+
+    <string name="title_ime_preference">入力方式</string>
+    <string name="summary_ime_preference">入力方式を選択</string>
+    <string name="dialog_title_ime_preference">入力方式</string>
+
+    <string name="shell_preferences">シェル</string>
+    <string name="title_shell_preference">コンソール</string>
+    <string name="summary_shell_preference">シェルを選択</string>
+    <string name="dialog_title_shell_preference">シェル</string>
+
+    <string name="title_initialcommand_preference">自動実行コマンド</string>
+    <string name="summary_initialcommand_preference">スタート時に自動実行するコマンドを設定</string>
+    <string name="dialog_title_initialcommand_preference">自動実行コマンド</string>
+
+    <string name="title_termtype_preference">コンソールのタイプ</string>
+    <string name="summary_termtype_preference">コンソールのタイプを設定</string>
+    <string name="dialog_title_termtype_preference">コンソールのタイプ</string>
+
+    <string name="title_close_window_on_process_exit_preference">終了時にコンソールを閉じる</string>
+    <string name="summary_close_window_on_process_exit_preference">終了時にコンソールを閉じる</string>
+
+    <string name="title_verify_path_preference">PATHを検証</string>
+    <string name="summary_verify_path_preference">不正なPATHを削除</string>
+
+    <string name="title_do_path_extensions_preference">PATHの拡張を許可</string>
+    <string name="summary_do_path_extensions_preference">PATHへのコマンドの追加を許可</string>
+
+    <string name="title_allow_prepend_path_preference">PATHの先頭に追加することを許可</string>
+    <string name="summary_allow_prepend_path_preference">PATH既存のコマンドの上書を許可</string>
+
+    <string name="title_home_path_preference">HOMEディレクトリ</string>
+    <string name="summary_home_path_preference">HOMEディレクトリとして使用する書き込み可能なディレクトリ</string>
+
+    <string name="control_key_dialog_title">CtrlとFnキー</string>
+    <string name="control_key_dialog_control_text">CTRL+Space : Control-@ (NUL)\nCTRL+A..Z : Control-A..Z\nCTRL+5 : Control-]\nCTRL+6 : Control-^\nCTRL+7 : Control-_\nCTRL+9 : F11\nCTRL+0 : F12</string>
+    <string name="control_key_dialog_control_disabled_text">Ctrl キー unset</string>
+    <string name="control_key_dialog_fn_text">FN+1..9 : F1-F9\nFN+0 : F10\nFN+W : Up\nFN+A : Left\nFN+S : Down\nFN+D : Right\nFN+P : PageUp\nFN+N : PageDown\nFN+T : Tab\nFN+L : | (pipe)\nFN+U : _ (アンダースコア)\nFN+E : Control-[ (ESC)\nFN+X : Delete\nFN+I : Insert\nFN+H : Home\nFN+F : End\nFN+. : Control-\\\n</string>
+    <string name="control_key_dialog_fn_disabled_text">Fnキーの設定を削除</string>
+
+    <string name="confirm_window_close_message">コンソールを閉じますか?</string>
+
+    <string name="email_transcript_subject">コンソールのコピー</string>
+    <string name="feedback_email_subject">QPythonのフィードバック</string>
+    <string name="email_transcript_chooser_title">フィードバック...</string>
+    <string name="email_transcript_no_email_activity_found">メーラーアプリが見つかりませんでした。</string>
+
+    <string name="alt_sends_esc">AltキーをESCとして使う</string>
+    <string name="alt_sends_esc_summary_on">AltキーをESCとして使用中</string>
+    <string name="alt_sends_esc_summary_off">AltキーのESCとしての使用をやめる</string>
+
+    <string name="title_mouse_tracking_preference">マウスイベントの送信</string>
+    <string name="summary_mouse_tracking_preference">タッチとスクロールを無視しますか?</string>
+
+    <string name="dialog_title_script">スクリプト</string>
+    <string name="dialog_title_project">プロジェクト</string>
+
+
+    <string name="title_use_keyboard_shortcuts">キーボードショートカットを使用</string>
+    <string name="use_keyboard_shortcuts_summary_on">Ctrl-Tab: コンソールの切り替え、 Ctrl-Shift-N: 新規コンソール、 Ctrl-Shift-V: 貼り付け</string>
+    <string name="use_keyboard_shortcuts_summary_off">キーボードショートカットが無効になっています</string>
+    <string name="help">ヘルプ</string>
+    <string name="activity_term_here_title">活動期間</string>
+    <!-- BEGIN SHORTCUT RELATED STRINGS -->
+    <!-- AndroidManifest.xml -->
+    <string name="activity_shortcut_create">"Term shortcut"</string>
+    <string name="addshortcut_button_find_command">Find command</string>
+    <string name="addshortcut_command_hint">command</string>
+    <string name="addshortcut_example_hint">--example=\""a\"</string>
+    <string name="addshortcut_navigator_title">SELECT SHORTCUT TARGET</string>
+    <string name="addshortcut_command_window_instructions">Command terminal requires full mPath, no arguments. For other commands use Arguments terminal (ex: cd /sdcard).</string>
+    <string name="addshortcut_arguments_label">Add to dictionary</string>
+    <string name="addshortcut_shortcut_label">Shortcut label\:</string>
+    <string name="addshortcut_button_text_icon">Text icon</string>
+    <string name="addshortcut_make_text_icon">MAKE TEXT ICON</string>
+    <string name="addshortcut_text_icon_instructions"></string>
+    <string name="addshortcut_title">Term shortcut</string>
+    <!-- FSNavigator.java -->
+    <string name="fsnavigator_title">FILE SELECTOR</string>
+    <string name="fsnavigator_no_external_storage">External storage not available</string>
+    <string name="fsnavigator_optional_enter_path">Or enter mPath here.</string>
+    <string name="fsnavigator_change_theme">Change theme</string>
+    <!-- ColorValue.java -->
+    <string name="colorvalue_label_lock_button_column">LOCK</string>
+    <string name="colorvalue_icon_text_entry_hint">Enter icon text</string>
+
+    <string name="help_url">https://www.qpython.org</string>
+
+    <string name="read_only">読み取り専用</string>
+    <string name="file">探索</string>
+    <string name="yes">はい</string>
+    <string name="no">いいえ</string>
+    <string name="ok">了解</string>
+    <string name="close">閉じる</string>
+    <string name="no_change">変更なし</string>
+    <string name="feedback">フィードバック</string>
+    <string name="about">QPythonについて</string>
+    <string name="file_not_exists">ファイルが見つかりません</string>
+    <string name="enable_root">rootモードを有効にする</string>
+    <string name="send">送信</string>
+    <string name="no_camera">有効なカメラが見つかりませんでした。カメラへのアクセス権限を確認してください。</string>
+    <string name="no_storage">ストレージの読み取り権限がありません。</string>
+
+
+    <string name="pref_initialcommand_default_qpython">python</string>
+    <string name="qpy_app">QPY</string>
+    <string name="local_app">ローカルアプリ</string>
+    <string name="task">タスク</string>
+    <string name="root_mode">rootモード</string>
+    <string name="star_it">評価する</string>
+    <string name="disable_root">無効化</string>
+    <string name="http_qpypi_qpython_org">https://pypi.python.org/simple/</string>
+    <string name="add">add</string>
+    <string name="sl4a_running">SL4Aは動作中です</string>
+    <string name="sl4a_un_running">SL4Aは動作していません。</string>
+    <string name="service_toggle">Server taggle</string>
+    <string name="qpy_description">QPythonはAndroidデバイス上で動作するスクリプトエンジンです。QPythonはAndoidのタブレットやスマートホン上で動作します。</string>
+    <string name="warning">警告</string>
+    <string name="reset_warning">この操作を続行すると、設定やダウンロードしたライブラリがすべて失われます。続行しますか?</string>
+    <string name="downloading">ライブラリ</string>
+    <string name="location">ロケーション</string>
+
+
+    <!-- Titles -->
+    <string name="title_untitled">名称未設定</string>
+    <string name="title_editor">%1$s</string>
+    <string name="title_editor_dirty">%1$s *</string>
+    <string name="title_editor_readonly">[%1$s]</string>
+
+    <string name="title_settings">設定</string>
+
+    <!-- Config screen strings -->
+    <string name="config_cat_display">表示</string>
+    <string name="config_title_line_numbers">行番号を表示</string>
+    <string name="config_title_word_wrap">文字を折り返す</string>
+    <string name="config_title_font">フォントの変更</string>
+    <string name="config_title_text_size">文字の大きさ</string>
+    <string name="config_title_color_theme">色のテーマ</string>
+    <string name="config_title_scroll_fling">スクロースの高速化のために整理する</string>
+    <string name="config_summary_line_numbers">ページの左側に行番号を表示</string>
+    <string name="config_summary_word_wrap">長すぎる行を折り返す</string>
+    <string name="config_summary_scroll_fling">パフォーマンスを検証しない</string>
+
+    <!-- Options Menu in QEdit -->
+
+    <!-- Misc UI strings -->
+    <string name="ui_save_text">"保存しますか? 保存していない内容は失われます。"</string>
+    <string name="ui_save">保存</string>
+    <string name="ui_delete">削除</string>
+    <string name="ui_no_save">保存しない</string>
+    <string name="ui_cancel">取り消し</string>
+    <string name="ui_hint_file_name">ファイル名</string>
+    <string name="ui_hint_search">検索</string>
+    <string name="ui_history">履歴</string>
+    <string name="ui_force_read_only">読み取り専用で開く</string>
+    <string name="about_content">QEditはAndroid用のテキストエディタです。Python / HTMLの編集に特化しており、使いやすいエディタです。</string>
+
+    <!-- Misc Strings -->
+    <string name="lorem_ipsum">"QEditは素晴らしいテキストエディタです。"</string>
+
+    <string name="file_exists">ファイルが既に存在します。別の名前にしてください。</string>
+
+    <string name="video_src">動画 {0}</string>
+    <string name="play_video">再生</string>
+    <string name="no_videos_found">このページに動画はありません。</string>
+    <string name="pls_install_a8_play">A8 Video Playerを先にインストールしてください。</string>
+    <string name="download_as">ダウンロードして保存</string>
+    <string name="info_browser">QBrowser</string>
+
+    <!--  added by kyle -->
+    <string name="share">共有</string>
+    <string name="save_as_snippets">スニペットとして保存</string>
+    <string name="snippet_exist">すでにスニペットが存在します。別の名前で試してください。</string>
+    <string name="save_as_snippets_1">スニペットが次の名前で保存されました: </string>
+    <string name="fail_to_insert">スニペットの挿入に失敗しました</string>
+    <string name="fail_to_goto">有効な数字を入力してください。</string>
+    <string name="max_lines_num_with_syntax_title">行を自動ハイライト</string>
+    <string name="max_lines_num_with_syntax_summary">%s行より少なければ自動ハイライト</string>
+    <string name="qedit_not_support">QEditは以下のタイプのファイルのみプレビュー・実行をサポートします。\n.py, .sh, .lua, .html, .md.</string>
+
+    <string name="pls_install_lua">Luaを実行するにはQLuaを先にインストールする必要があります。</string>
+    <string name="pls_install_qpy">Pythonを実行するにはQPythonを先にインストールする必要があります。</string>
+    <string name="info_snippets">スニペット</string>
+
+    <string name="ui_ok">OK</string>
+    <string name="ui_contact_title">連絡を取る</string>
+    <string name="ui_licence_title">ライセンス</string>
+    <string name="ui_mail">support@qpython.org</string>
+    <string name="ui_choose_mail">メールを開く...</string>
+    <string name="ui_market_url">"https://market.android.com/developer?pub=Xavier+Gouchet"</string>
+    <string name="ui_market_app_url">"https://play.google.com/store/apps/details?id=%s"</string>
+    <string name="ui_market">"ほかのアプリ"</string>
+    <string name="ui_app_rating">"このアプリを評価する \n フィードバックを残す"</string>
+    <string name="ui_feedback">"どうぞご遠慮なくフィードバック、機能提案、または不具合報告をしてください。. "</string>
+    <string name="ui_licence_content">"このソフトウエアは現状のまま提供されており、いかなる保証もありません。このソフトウエアの著作者は、このソフトウエアを利用したことによって発生したいかなる損害でもその責任を負いません。"</string>
+    <string name="ui_art_licence_title">Artistic Licence</string>
+    <string name="ui_art_licence_content">"このアプリに使用されているアイコンはQPythonの著作者の製作であり、その権利はその著作者に帰属します。"</string>
+    <string name="ui_whats_new">"最新情報"</string>
+    <string name="save">保存</string>
+    <string name="save_as">ファイル名を指定して保存</string>
+    <string name="open">開く</string>
+    <string name="file_name">ファイル名</string>
+    <string name="file_exist_hint">そのファイルは既に存在します。名前を変えてください。</string>
+    <string name="empty_file">空ファイル</string>
+    <string name="confirm">確認</string>
+    <string name="cancel">取り消し</string>
+    <string name="new_project">新規プロジェクト</string>
+    <string name="error_dont_kn">エラーが発生しました。</string>
+    <string name="project_name">プロジェクト名</string>
+    <string name="jump_to">移動する</string>
+    <string name="choose_ttf">フォントファイルを選択(.ttf)</string>
+    <string name="explorer">エクスプローラ</string>
+    <string name="new_script">新規スクリプト</string>
+    <string name="enter_name_hint">スクリプト名を入力</string>
+
+    <string name="paste">貼り付け</string>
+    <string name="download_fail">ダウンロード失敗</string>
+    <string name="key_reset">reset_storage</string>
+    <string name="key_ftp_state">running_state</string>
+    <string name="key_username">username</string>
+    <string name="key_ftp_pwd">password</string>
+    <string name="key_port_num">portNum</string>
+    <string name="key_show_pwd">show_password</string>
+    <string name="key_root_dir">chrootDir</string>
+    <string name="key_stay_awake">stayAwake</string>
+    <string name="key_about">about</string>
+    <string name="dir_not_valid">不正なディレクトリです</string>
+    <string name="already_newest">すでに最新です</string>
+    <string name="share_text">QPythonはAndroidデバイス上で動作するスクリプトエンジンです。Pythonインタプリタ、コンソール、エディタ、SL4Aライブラリを組み込みで持っており、それらはAndroid上でのPythonの実行を可能にします。https://www.qpython.com/privacy.html</string>
+    <string name="new_folder">新規フォルダ</string>
+    <string name="folder_name">フォルダ名</string>
+    <string name="untitled_folder">名称未設定フォルダ</string>
+    <string name="toast_folder_exist">操作に失敗しました。別の名前で再度お試しください。</string>
+    <string name="fail_open_file">ファイルが存在しないため、ファイルを開けません。</string>
+    <string name="run_dirty_hint">先に保存しますか?</string>
+    <string name="no_im_good">必要ありません。</string>
+    <string name="convert_fail">変換に失敗しました。</string>
+    <string name="delete_file_hint">このファイルを消去しますか?</string>
+    <string name="rename">名前の変更</string>
+    <string name="rename_fail">名前を変更できませんでした。</string>
+    <string name="delete_fail">削除できませんでした。</string>
+    <string name="runtime_log">実行時ログ: %s</string>
+    <string name="fedback_mail">[フィードバック]\n\n</string>
+    <string name="log_title">実行時ログ</string>
+
+    <string name="date_format">[ %s ]</string>
+    <string name="not_root_yet">このデバイスはルート化されていません。</string>
+    <string name="download_apk">APKをダウンロードしますか?</string>
+    <string name="download_apk_hint">WiFi未接続の場合、モバイル通信料がかかる可能性があります。</string>
+    <string name="downloading_new_apk">新規パッケージをダウンロード</string>
+    <string name="checking_update">アップデートの確認</string>
+    <string name="run_bg_title">バックグラウンドで実行する</string>
+    <string name="scan">スキャン</string>
+    <string name="read_script_from_qrcode">QRCodeからコードを読み込み</string>
+
+    <string name="course">コース</string>
+    <string name="lost_connect">接続失敗</string>
+    <string name="featured_courses">コース</string>
+    <string name="programs">プログラム</string>
+    <string name="open_gl2_is_not_supported">OpenGL2はサポートされていません。</string>
+    <string name="unable_extract">Pythonコードを抽出できません。</string>
+    <string name="get_setting_data_fail">設定を読み込めませんでした。</string>
+    <string name="terminal_bg_hint">コンソールをバックグラウンドで続行しますか?</string>
+    <string name="thanks">ありがとうございます!</string>
+    <string name="extra_pypi">PYPIを設定</string>
+    <string name="already_newest_current_version">すでに最新です。現在のバージョンは</string>
+    <string name="reward">報酬</string>
+    <string name="oops_seems_like_your_net_have_some_trouble">しまった! \nインターネット接続に問題があるようです!</string>
+    <string name="lose_google_server">Google Playに接続できませんでした。ネットワークを確認してください。</string>
+    <string name="thanks_your_support">応援してくださってありがとうございます!</string>
+    <string name="under_16_status_bar_hint">ステータスバーの表示・非表示はコンソールを再起動すると適用されます。</string>
+    <string name="refresh">最新の状態に更新する</string>
+    <string name="reset_suc">リセットに成功しました。</string>
+    <string name="reset_hint">この操作はアプリの再起動後に適用されます。</string>
+    <string name="restart">アプリを再起動</string>
+    <string name="fail_resume_console">コンソールを続行できません。</string>
+    <string name="failed_bind_term">TermServiceに接続できませんでした。!</string>
+    <string name="console_running">QPythonコンソール動作中</string>
+    <string name="qpy_console">QPythonコンソール</string>
+    <string name="recommend">推奨</string>
+    <string name="newest_course">最新</string>
+    <string name="best_python_development_ide_non_mobile">モバイル上の最高のPythonアプリケーション</string>
+    <string name="sign_in_with_google">Googleでサインイン</string>
+    <string name="by_signing_in_you_agree_to_out_privacy_policy_term_of_service"><![CDATA[サインインするには、当サービスの<font color="#4BAC07">プライバシーポリシー</font>に同意する必要があります。]]></string>
+    <string name="copy_hint">実行のため、エディタにコピーします</string>
+    <string name="my_scripts">スクリプト</string>
+    <string name="my_share">共有済み</string>
+    <string name="gist_title">Gistのタイトル</string>
+    <string name="description">説明</string>
+    <string name="too_long_hint">値が長すぎます。140文字以内にしてください。</string>
+    <string name="enter_snippet">スニペットの名前を入力</string>
+    <string name="welcome_s">ようこそ、<![CDATA[<font color="#4BAC07"><u>%s</u></font>]]>さん</string>
+    <string name="re_format">Re <![CDATA[<font color="#ECCD00">@%1$s</font>]]>:\u0020 %2$s</string>
+    <string name="replied_format"><![CDATA[<font color="#ECCD00">@%1$s</font>]]>:\u0020 %2$s</string>
+    <string name="login"><u>サインイン</u></string>
+    <string name="auth_failed">認証に失敗しました。</string>
+    <string name="log_out">サインアウト</string>
+    <string name="me">Me</string>
+    <string name="grant_storage_hint">ストレージへのアクセスを許可をする必要があります。</string>
+    <string name="lost_google_hint">Googleのサーバーに接続できませんでした。ネットワークを確認してください。</string>
+    <string name="upload_suc">正常にコードをアップロードしました。</string>
+    <string name="upload_fail">コードをアップロードできませんでした。</string>
+    <string name="my_program">プログラム</string>
+    <string name="nothing_here_yet">まだ何もありません。 :(</string>
+    <string name="sofa_hint">初めにコメントしますか?</string>
+    <string name="null_comment_hint">コメントに内容がありません。</string>
+    <string name="initial">初期</string>
+    <string name="share_empty_hint">共有前に保存する必要があります。</string>
+    <string name="need_login">サインインしてください。</string>
+    <string name="upload_login_hint">サインインせずにコードをアップロードすることはできません。</string>
+    <string name="login_now">ログインする</string>
+    <string name="cloud_empty_hint">クラウド上にコードがありません。</string>
+    <string name="mkdir_fail">ディレクトリの作成に失敗しました。</string>
+    <string name="not_support_type_hint">このファイルタイプのアップロードはサポートされていません。</string>
+    <string name="conflict_hint"><Data>
+        <![CDATA[ <b>オンラインのファイル:</b>   <br/>
+    <u>サイズ:</u>  %4$s   <br/>
+    <u>最終更新:</u> %3$s   <br/><br/>
+    <b>ローカルのファイル:</b><br/>
+    <u>大きさ:</u> %2$s<br/>
+    <u>最終更新:</u> %1$s <br/><br/>
+    上書きしますか?]]></Data></string>
+    <string name="override_fail_hint">上書きできませんでした。時間をおいて再度お試しください。</string>
+    <string name="delete_remote_suc">オンラインのファイルを正常に削除しました。</string>
+    <string name="delete_suc">ファイルを正常に削除しました。</string>
+    <string name="click_retry">リクエストに失敗しました。画面をタップして再試行します。</string>
+    <string name="lout">ログアウトしますか?</string>
+    <string name="log_noti">ログ通知</string>
+    <string name="app_noti">アプリの通知</string>
+    <string name="override_hint">ローカルのファイルを上書きしますか?</string>
+    <string name="file_downloaded">ファイルがダウンロードされました。</string>
+    <string name="login_error">ログイン中にエラーが発生しました。</string>
+    <string name="my_space">容量 (%d / 100文件)</string>
+    <string name="my_space_empty">空き容量 (? / 10文件)</string>
+    <string name="save_amp_push"><![CDATA[保存して上書き]]></string>
+    <string name="shortcut_create_suc">ショートカット%sは正常に作成されました。</string>
+    <string name="need_grant">これらの権限を許可する必要があります。</string>
+    <string name="no_space">容量が足りません。</string>
+    <string name="no_file">このフォルダにはファイルが存在しません。</string>
+    <string name="no_recent_file">最近ファイルを開いていません。</string>
+    <string name="cant_open">このファイルは開けません。</string>
+    <string name="toolbar_showing">プロジェクトの構造</string>
+    <string name="toolbar_close">エディタ</string>
+    <string name="not_support_yet">まだサポートされていません。</string>
+    <string name="new_file">新規ファイル</string>
+    <string name="tools">ツール</string>
+    <string name="aipy_not_install"><![CDATA[<font color="#4BAC07">依存しているパッケージ</font>をインストールしてからAIPYをインストールしてください。]]></string>
+
+    <!--color string-->
+
+    <string name="update_time_hint">更新: %s</string>
+    <string name="aipy_list_empty_hint">AIPyが見つかりません。AIPyを探すか、以下の手順でインストールしてください。\n
+        1. AIPyアプリをインストール\n
+        2. QPythonにファイル書き込みを許可\n
+        3. 右上部の角にあるボタンを押して最新の状態に更新\n\n
+        動かない場合は遠慮なくメールかGithubに連絡してください。
+    </string>
+    <string name="package_installed">このパッケージは既にインストールされています。</string>
+    <string name="install_suc">インストール成功</string>
+    <string name="install_fail">インストールに失敗しました。時間をおいて再度お試しください。</string>
+    <string name="install_package_fail">パッケージのインストールに失敗しました。時間をおいて再度お試しください。</string>
+    <string name="aipy_not_release">AIPyのアプリからインストールとセットアップをしてください。</string>
+    <string name="aipy_not_support">AIPyはQPY3をまだサポートしていません。</string>
+
+    <string name="album">アルバム</string>
+    <string name="last_refresh">最終更新: %s</string>
+    <string name="data_saver">データサーバー</string>
+    <string name="saver_on">ローカルのキャッシュを使う</string>
+    <string name="saver_off">毎回再読み込みする</string>
+    <string name="library">ライブラリ</string>
+    <string name="run">実行</string>
+
+    <string name="insert_if">if :\n</string>
+    <string name="insert_def">def ():\n</string>
+    <string name="insert_for">for\u0020\u0020in :\n</string>
+    <string name="insert_import">import\u0020\n</string>
+    <string name="insert_import_f">from\u0020\u0020import\u0020\n</string>
+    <string name="insert_clz">class\u0020\u0020:</string>
+    <string name="insert_ef">elif\u0020\u0020:\n</string>
+    <string name="insert_el">else:\n</string>
+    <string name="insert_ret">return\n</string>
+
+    <string name="file_new">ファイル</string>
+    <string name="install_py3">Python 3をインストール</string>
+    <string name="py2_now">現在Python 2を使用中</string>
+    <string name="py3_now">現在Python 3を使用中</string>
+    <string name="switch_py3">Python 3に切り替え</string>
+    <string name="enter_history">履歴</string>
+    <string name="qpy_featured">QPythonの特集</string>
+    <string name="history_emp">履歴はありません</string>
+    <string name="no_google">Googleサービスなしでログインできません。</string>
+    <string name="pip_no_net">ネットワークなしでpipを開くことはできません。</string>
+    <string name="py3_not_install">QPY3はインストールされていません。</string>
+    <string name="open_app_market">アプリマーケットに移動</string>
+    <string name="release_error">パッケージが解放されていません。</string>
+    <string name="open_py3_hint">先にPython3からパッケージを開放してください。</string>
+    <string name="open_py3">Python3を開く</string>
+    <string name="unzip_pac_fail">zipの解凍に失敗しました。</string>
+    <string name="retry_hint">再試行してください。</string>
+    <string name="browser">ブラウザ</string>
+    <string name="switch_py3_hint">現在Python2を使用中です。Python3に切り替えますか?</string>
+    <string name="goto_setting">設定に移動</string>
+    <string name="net_lagging">ネットワークにラグが発生しています。しばらくお待ちください。</string>
+</resources>
diff --git a/qpython/src/main/res/values-ja/toasts.xml b/qpython/src/main/res/values-ja/toasts.xml
new file mode 100644
index 00000000..440eb69a
--- /dev/null
+++ b/qpython/src/main/res/values-ja/toasts.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="toast_recent_files_invalid">"ファイルが見つかりませんでした。最近使ったファイルの項目から削除します。"</string>
+    <string name="toast_recent_files_deleted">最近使ったファイルの項目から削除しました。</string>
+    <string name="toast_intent_invalid_uri">ファイルが開けません。URIが不正です。</string>
+    <string name="toast_intent_illegal">ファイルが開けません。</string>
+    <string name="toast_activity_open">ファイルブラウザを読み込めません。</string>
+    <string name="toast_memory_open">メモリ不足のため、ファイルが開けません。</string>
+    <string name="toast_open_error">ファイルが開けません。 (ファイルが大きすぎるか、破損しています)</string>
+    <string name="toast_save_null">パスがnullのため、保存できません。</string>
+    <string name="toast_save_temp">一時ファイルに保存することはできません。</string>
+    <string name="toast_save_delete">保存できません (一時ファイルのコピーでエラーが発生しました。)</string>
+    <string name="toast_save_rename">保存できません (一時ファイルのコピーでエラーが発生しました。)</string>
+    <string name="toast_save_success">保存しました。</string>
+    <string name="toast_folder_cant_write">"このフォルダは書き込み可能ではないため使用できません。"</string>
+    <string name="toast_file_cant_read">"このファイルは読み取り可能ではないため使用できません。"</string>
+    <string name="toast_search_not_found">ファイルが見つかりませんでした。</string>
+    <string name="toast_search_eof">これ以上ファイルが見つかりませんでした。</string>
+    <string name="toast_search_no_input">検索バーに入力すると検索できます。</string>
+    <string name="toast_filename_empty">ファイル名を空にすることはできません。</string>
+    <string name="toast_warn_no_undo">これ以上元に戻せません。</string>
+    <string name="toast_open_home_page_error">既定のファイルが見つかりません。設定から新たに選択してください。</string>
+    <string name="toast_home_page_cant_read">"既定のファイルが読み込み可能ではないため使用できません"</string>
+    <string name="toast_widget_select">新しいウィジェットに関連付けるファイルを選択してください。</string>
+    <string name="toast_open_select">ファイルを選択して開きます。</string>
+    <string name="toast_home_page_select">ホーム画面からTedを起動したときに開くファイルを選択してください。</string>
+    <string name="toast_file_saved_auto">"現在開いているファイルは自動保存されました。次回起動時はこのファイルが自動で開かれます。"</string>
+
+
+    <!--  -->
+    <string name="toast_folder_doesnt_exist">"フォルダが存在していません。"</string>
+    <string name="toast_folder_not_folder">フォルダではありません。</string>
+    <string name="toast_folder_cant_read">"読み取り可能なフォルダではありません。"</string>
+    <string name="toast_no_market">このデバイス上にPlay Storeが存在しません。</string>
+
+</resources>
\ No newline at end of file
diff --git a/qpython/src/main/res/values-ru/arrays.xml b/qpython/src/main/res/values-ru/arrays.xml
new file mode 100644
index 00000000..28ea4ea9
--- /dev/null
+++ b/qpython/src/main/res/values-ru/arrays.xml
@@ -0,0 +1,191 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+ * Copyright (C) 2007 The Android Open Source Project
+ *
+ * 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.
+ -->
+
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="ExtraTranslation">
+    <string-array name="entries_statusbar_preference">
+        <item>Показать Status bar</item>
+        <item>Скрыть Status bar</item>
+    </string-array>
+
+    <string-array name="entries_actionbar_preference">
+        <!-- <item>Action bar disabled</item> -->
+        <item>Показать Панель действий</item>
+        <item>Скрыть Панель действий(Нажмите на верхнюю часть экрана или кнопку меню, чтобы показать снова)</item>
+    </string-array>
+
+    <string-array name="entries_orientation_preference">
+        <item>Автоматически</item>
+        <item>Горизонтальная</item>
+        <item>Вертикальная</item>
+    </string-array>
+
+    <string-array name="entries_fontsize_preference">
+        <item>4 x 8 Pixel</item>
+        <item>6 point type</item>
+        <item>7 point type</item>
+        <item>8 point type</item>
+        <item>9 point type</item>
+        <item>10 point type</item>
+        <item>12 point type</item>
+        <item>14 point type</item>
+        <item>16 point type</item>
+        <item>20 point type</item>
+        <item>24 point type</item>
+        <item>28 point type</item>
+        <item>32 point type</item>
+        <item>36 point type</item>
+        <item>42 point type</item>
+        <item>48 point type</item>
+        <item>64 point type</item>
+        <item>72 point type</item>
+        <item>96 point type</item>
+        <item>144 point type</item>
+        <item>288 point type</item>
+    </string-array>
+
+    <string-array name="entries_color_preference">
+        <item>Чёрные символы на белом фоне</item>
+        <item>Белые символы на чёрном фоне</item>
+        <item>Белые символы на голубом фоне</item>
+        <item>Зелёные символы на чёрном фоне</item>
+        <item>Жёлтые символы на чёрном фоне</item>
+        <item>Красные символы на чёрном фоне</item>
+        <item>Стиль Holo</item>
+        <item>over-exposed</item>
+        <item>lack-exposed</item>
+        <item>Стиль Linux</item>
+    </string-array>
+
+    <string-array name="entries_backaction_preference">
+        <item>Закрыть все окна</item>
+        <item>Закрыть текущее окно</item>
+        <item>Закрыть текущее окно, но оставить сессии работать</item>
+        <item>Отправить ESC в терминал</item>
+        <item>Отправить TAB в терминал</item>
+    </string-array>
+
+    <string-array name="entries_controlkey_preference">
+        <item>Ball</item>
+        <item>\@</item>
+        <item>Left-Alt</item>
+        <item>Right-Alt</item>
+        <item>Vol-Up</item>
+        <item>Vol-Dn</item>
+        <item>Camera</item>
+        <item>None</item>
+    </string-array>
+
+    <string-array name="entries_fnkey_preference">
+        <item>Ball</item>
+        <item>\@</item>
+        <item>Left-Alt</item>
+        <item>Right-Alt</item>
+        <item>Vol-Up</item>
+        <item>Vol-Dn</item>
+        <item>Camera</item>
+        <item>None</item>
+    </string-array>
+
+    <string-array name="entries_ime_preference">
+        <item>Символьный</item>
+        <item>Слова</item>
+    </string-array>
+
+    <string name="list_select">
+        <item>Открыть оедактором</item>
+        <item>Открыть в ...</item>
+         <item>Сканировать заново</item>
+    </string>
+
+
+    <!-- These are the 'short' names for the control keys. They are used in the special keys dialog. -->
+    <string-array name="control_keys_short_names">
+        <item>Ball</item>
+        <item>\@</item>
+        <item>Left-Alt</item>
+        <item>Right-Alt</item>
+        <item>Vol-Up</item>
+        <item>Vol-Dn</item>
+        <item>Camera</item>
+        <item>None</item>
+    </string-array>
+
+    <!-- These are the 'short' names for the Fn keys. They are used in the special keys dialog. -->
+    <string-array name="fn_keys_short_names">
+        <item>Ball</item>
+        <item>\@</item>
+        <item>Left-Alt</item>
+        <item>Right-Alt</item>
+        <item>Vol-Up</item>
+        <item>Vol-Dn</item>
+        <item>Camera</item>
+        <item>None</item>
+    </string-array>
+
+    <string-array name="screen_orientation_values" translatable="false">
+        <item>auto</item>
+        <item>landscape</item>
+        <item>portrait</item>
+    </string-array>
+
+    <string-array name="file_explorer_tab">
+        <item>Скрипт</item>
+        <item>Проект</item>
+    </string-array>
+
+
+    <!-- Color themes -->
+    <string-array name="files_new">
+        <item>Пустой файл</item>
+        <item>Скрипт</item>
+        <item>Веб-приложение (Проект)</item>
+        <item>Консольное приложение (Проект)</item>
+        <item>Приложение Kivy (Проект)</item>
+    </string-array>
+
+
+    <string-array name="color_theme_names">
+        <item>Классическая</item>
+        <item>Негатив</item>
+        <item>Матрица</item>
+        <item>Небесная</item>
+        <item>Дракула</item>
+    </string-array>
+    <string-array name="color_theme_values">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+    </string-array>
+
+    <!-- End of lines -->
+
+    <!-- Recent files -->
+
+    <!-- Recent files -->
+
+    <!-- Encoding -->
+
+    <string-array name="max_lines_num_with_syntax_values">
+        <item>100</item>
+        <item>300</item>
+        <item>600</item>
+        <item>1000</item>
+        <item>2000</item>
+    </string-array>
+
+</resources>
diff --git a/qpython/src/main/res/values-ru/strings.xml b/qpython/src/main/res/values-ru/strings.xml
new file mode 100644
index 00000000..33a26d74
--- /dev/null
+++ b/qpython/src/main/res/values-ru/strings.xml
@@ -0,0 +1,433 @@
+<resources tools:ignore="ExtraTranslation" xmlns:tools="http://schemas.android.com/tools">
+    <string name="terminal">Терминал</string>
+    <string name="library">Библиотека</string>
+    <string name="recent">Недавние</string>
+    <string name="script">Скрипт</string>
+    <string name="project">Проект</string>
+
+    <string name="setting">Настройки</string>
+    <string name="editor">Редактор</string>
+    <string name="community">Сообщество</string>
+
+    <string name="more">Больше</string>
+    <string name="sl4a_server">SL4A Сервер</string>
+    <string name="ftp_server">FTP сервер</string>
+
+    <!---->
+    <string name="application_terminal">Терминал</string>
+    <string name="preferences">Настройки</string>
+    <string name="new_window">Открыть новое терминал</string>
+    <string name="close_window">Закрыть терминал</string>
+    <string name="window_list">Список окон</string>
+    <string name="reset">Перезапустить терминал</string>
+    <string name="send_email">Отправить email на…</string>
+    <string name="special_keys">Особые ключи</string>
+    <string name="toggle_soft_keyboard">Открыть/Закрыть клавиатуру</string>
+
+    <string name="reset_toast_notification">The state at present will be reset.</string>
+
+    <string name="enable_wakelock">Включить блокировку сна</string>
+    <string name="disable_wakelock">Отключить блокировку сна</string>
+    <string name="enable_wifilock">Включить блокировку WIFI</string>
+    <string name="disable_wifilock">Отключить блокировку WIFI</string>
+
+    <string name="edit_text">Редактировать текст</string>
+    <string name="select_text">Выбрать текст</string>
+    <string name="copy_all">Копировать всё</string>
+    <string name="send_control_key">Нажать клавишу control</string>
+    <string name="send_fn_key">Нажать клавишу Fn</string>
+
+    <string name="window_title">Окно %1$d</string>
+
+    <string name="process_exit_message">Сессия не активна</string>
+
+    <!-- Preference dialog -->
+    <string name="screen_preferences">Экран</string>
+
+    <string name="title_statusbar_preference">Статусбар</string>
+    <string name="summary_statusbar_preference">Показать/Скрыть статусбар</string>
+    <string name="dialog_title_statusbar_preference">Статусбар</string>
+
+    <string name="title_actionbar_preference">Action Bar</string>
+    <string name="summary_actionbar_preference">Выберите поведение панели действий(Android 3.0 и выше)</string>
+    <string name="dialog_title_actionbar_preference">Поведение панели действий</string>
+
+    <string name="title_orientation_preference">Ориентация экрана</string>
+    <string name="summary_orientation_preference">Выберите ориентацию экрана</string>
+    <string name="dialog_title_orientation_preference">ориентация экрана</string>
+
+    <string name="text_preferences">Текст</string>
+
+    <string name="title_utf8_by_default_preference">Использовать UTF-8 по умолчанию</string>
+    <string name="summary_utf8_by_default_preference">Использовать UTF-8 по умолчанию</string>
+
+    <string name="title_fontsize_preference">Размер шрифта</string>
+    <string name="summary_fontsize_preference">Выберите размер шрифта</string>
+    <string name="dialog_title_fontsize_preference">Размер шрифта</string>
+
+    <string name="title_color_preference">Цвет текста</string>
+    <string name="summary_color_preference">Выберите цвет текста</string>
+    <string name="dialog_title_color_preference">Цвет текста</string>
+
+    <string name="keyboard_preferences">Клавиатура</string>
+
+    <string name="title_backaction_preference">Поведение кнопки назад</string>
+    <string name="summary_backaction_preference">Выберите поведение кнопки назад</string>
+    <string name="dialog_title_backaction_preference">Поведение кнопки назад</string>
+
+    <string name="title_controlkey_preference">Клавиша Ctrl</string>
+    <string name="summary_controlkey_preference">Выберите поведение клавиши Ctrl</string>
+    <string name="dialog_title_controlkey_preference">Клавиша Ctrl</string>
+
+    <string name="title_fnkey_preference">Клавиша Fn</string>
+    <string name="summary_fnkey_preference">Выберите поведение клавиши Fn</string>
+    <string name="dialog_title_fnkey_preference">Клавиша Fn</string>
+
+    <string name="title_ime_preference">Способ ввода</string>
+    <string name="summary_ime_preference">Выберите способ ввода</string>
+    <string name="dialog_title_ime_preference">Способ ввода</string>
+
+    <string name="shell_preferences">Оболочка</string>
+    <string name="title_shell_preference">Терминал</string>
+    <string name="summary_shell_preference">Выберите оболочку</string>
+    <string name="dialog_title_shell_preference">Оболочка</string>
+
+    <string name="title_initialcommand_preference">Команда инициализации</string>
+    <string name="summary_initialcommand_preference">Автоматическое выполнение команды инициализации при запуске</string>
+    <string name="dialog_title_initialcommand_preference">Команда инициализации</string>
+
+    <string name="title_termtype_preference">Тип терминала</string>
+    <string name="summary_termtype_preference">Установить оболочку терминала</string>
+    <string name="dialog_title_termtype_preference">Тип терминала</string>
+
+    <string name="title_close_window_on_process_exit_preference">Закрывать терминал при выходе</string>
+    <string name="summary_close_window_on_process_exit_preference">Закрывать терминал при выходе</string>
+
+    <string name="title_verify_path_preference">проверить PATH</string>
+    <string name="summary_verify_path_preference">Очистить неправильный PATH</string>
+
+    <string name="title_do_path_extensions_preference">Разрешить расширение PATH</string>
+    <string name="summary_do_path_extensions_preference">Разрешать добавлять команды к PATH</string>
+
+    <string name="title_allow_prepend_path_preference">Разрешить препозицию PATH</string>
+    <string name="summary_allow_prepend_path_preference">Разрешить перезапись существующих команд в PATH</string>
+
+    <string name="title_home_path_preference">Домашняя папка</string>
+    <string name="summary_home_path_preference">Использовать как переменную пути PATH</string>
+
+    <string name="control_key_dialog_title">Клавиши Ctrl и Fn</string>
+    <string name="control_key_dialog_control_text">CTRLKEY Пробел : Control-@ (NUL)\nCTRLKEY A..Z : Control-A..Z\nCTRLKEY 5 : Control-]\nCTRLKEY 6 : Control-^\nCTRLKEY 7 : Control-_\nCTRLKEY 9 : F11\nCTRLKEY 0 : F12</string>
+    <string name="control_key_dialog_control_disabled_text">Разбиндить клавишу Ctrl</string>
+    <string name="control_key_dialog_fn_text">FNKEY 1..9 : F1-F9\nFNKEY 0 : F10\nFNKEY W : Up\nFNKEY A : Left\nFNKEY S : Down\nFNKEY D : Right\nFNKEY P : PageUp\nFNKEY N : PageDown\nFNKEY T : Tab\nFNKEY L : | (столбик)\nFNKEY U : _ (нижнее подчёркивание)\nFNKEY E : Control-[ (ESC)\nFNKEY X : Delete\nFNKEY I : Insert\nFNKEY H : Home\nFNKEY F : End\nFNKEY . : Control-\\\n</string>
+    <string name="control_key_dialog_fn_disabled_text">Fn key unset</string>
+
+    <string name="confirm_window_close_message">Закрыть терминал?</string>
+
+    <string name="email_transcript_subject">Копия терминала</string>
+    <string name="feedback_email_subject">Обратная связь - QPython</string>
+    <string name="email_transcript_chooser_title">Обратная связь ...</string>
+    <string name="email_transcript_no_email_activity_found">Не удалось найти подходящее приложение для отправки E-mail</string>
+
+    <string name="alt_sends_esc">Использовать Alt как ESC</string>
+    <string name="alt_sends_esc_summary_on">Используется Alt как ESC</string>
+    <string name="alt_sends_esc_summary_off">Отменить использование Alt как ESC</string>
+
+    <string name="title_mouse_tracking_preference">Отправить событие мыши</string>
+    <string name="summary_mouse_tracking_preference">События касания и прокрутки игнорируются?</string>
+
+    <string name="dialog_title_script">скрипт</string>
+    <string name="dialog_title_project">проект</string>
+
+
+    <string name="title_use_keyboard_shortcuts">Use Keyboard Shortcuts</string>
+    <string name="use_keyboard_shortcuts_summary_on">Ctrl-Tab: пролистнуть терминал, Ctrl-Shift-N: новое терминал, Ctrl-Shift-V: вставить.</string>
+    <string name="use_keyboard_shortcuts_summary_off">Сокращения для клавиатуры отключены.</string>
+    <string name="help">Помощь</string>
+    <string name="activity_term_here_title">Называть здесь</string>
+    <!-- BEGIN SHORTCUT RELATED STRINGS -->
+    <!-- AndroidManifest.xml -->
+    <string name="activity_shortcut_create">"Временный ярлык"</string>
+    <string name="addshortcut_button_find_command">Команда поиска</string>
+    <string name="addshortcut_command_hint">команда</string>
+    <string name="addshortcut_example_hint">--пример=\""a\"</string>
+    <string name="addshortcut_navigator_title">ВЫБЕРИТЕ ЦЕЛЬ ДЛЯ ЯРЛЫКА</string>
+    <string name="addshortcut_command_window_instructions">Command window requires full mPath, no arguments. For other commands use Arguments window (ex: cd /sdcard).</string>
+    <string name="addshortcut_arguments_label">Добавить в директорию</string>
+    <string name="addshortcut_shortcut_label">Надпись ярлыка\:</string>
+    <string name="addshortcut_button_text_icon">Текстовая иконка</string>
+    <string name="addshortcut_make_text_icon">СДЕЛАТЬ ТЕКСТОВУЮ ИКОНКУ</string>
+    <string name="addshortcut_text_icon_instructions"></string>
+    <string name="addshortcut_title">Временный ярлык</string>
+    <!-- FSNavigator.java -->
+    <string name="fsnavigator_title">ВЫБОР ФАЙЛА</string>
+    <string name="fsnavigator_no_external_storage">Внешнее хранилище недоступно</string>
+    <string name="fsnavigator_optional_enter_path">Or enter mPath here.</string>
+    <string name="fsnavigator_change_theme">Изменить тему</string>
+    <!-- ColorValue.java -->
+    <string name="colorvalue_label_lock_button_column">БЛОКИРОВКА</string>
+    <string name="colorvalue_icon_text_entry_hint">Введите текст иконк </string>
+
+    <string name="help_url">https://www.qpython.org</string>
+
+    <string name="new_file">Новый файл</string>
+    <string name="read_only">Только чтение</string>
+    <string name="file">Файловый менеджер</string>
+    <string name="yes">Да</string>
+    <string name="no">Нет</string>
+    <string name="ok">ОК</string>
+    <string name="close">Закрыть</string>
+    <string name="no_change">Нет изменений</string>
+    <string name="feedback">Обратная свзяь</string>
+    <string name="about">О приложении</string>
+    <string name="file_not_exists">Файл не существует</string>
+    <string name="enable_root">Включён</string>
+    <!--<string name="my_name">作者：彭春瑜</string>-->
+    <!--<string name="qq_group">QQ群：87272821</string>-->
+    <string name="send">Отправить</string>
+    <string name="no_camera">Не удаётся подключиться к камере. Проверьте соответствующее разрешение для приложения.</string>
+    <string name="no_storage">Нет разрешения для доступа к хранилищу</string>
+    <plurals name="x_text_replaced">
+        <item quantity="zero">0 найдено</item>
+        <item quantity="other">%d текст заменён</item>
+    </plurals>
+    <string-array name="insert_datetime_lang">
+        <item>English</item>
+        <item>Chinese</item>
+    </string-array>
+    <string-array name="wrap_char_list">
+        <item>Использовать \\n（Linux/OSX）</item>
+        <item>Использовать \\r\\n（Windows）</item>
+    </string-array>
+    <string-array name="date_number">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+        <item>5</item>
+        <item>6</item>
+        <item>7</item>
+        <item>8</item>
+        <item>9</item>
+        <item>100</item>
+    </string-array>
+    <string-array name="screen_orientation">
+        <item>Автоматически</item>
+        <item>Горизонтальная</item>
+        <item>Вертикальная</item>
+    </string-array>
+
+    <string-array name="list_select">
+        <item>Открыть в редакторе</item>
+        <item>Открыть в .....</item>
+        <item>Мканировать заново</item>
+    </string-array>
+
+
+    <array name="library">Net библиотека</array>
+
+
+    <string-array name="tab_string">
+        <item>Net библиотека</item>
+        <item>Загружено</item>
+    </string-array>
+
+
+    <string name="pref_initialcommand_default_qpython">python</string>
+    <string name="qpy_app">QPY</string>
+    <string name="local_app">Локальное приложение</string>
+    <string name="task">Задача</string>
+    <string name="root_mode">Root режим</string>
+    <string name="star_it">Оценить</string>
+    <string name="disable_root">Отключён</string>
+    <string name="http_qpypi_qpython_org">https://pypi.python.org/simple/</string>
+    <string name="add">добавить</string>
+    <string name="sl4a_running">SL4A сервер запущен</string>
+    <string name="sl4a_un_running">SL4A сеовер не активен</string>
+    <string name="service_toggle">Переключить сервер</string>
+    <string name="qpy_description">QPython это движок для скриптов, запускаемый на устройствах Android, таких, как телефоны и планшеты.</string>
+    <string name="warning">Предупреждение</string>
+    <string name="reset_warning">Сброс удалит все данные и загруженные библиотеки. Вы уверены, что хотите продолжить?</string>
+    <string name="downloading">Библиотека</string>
+    <string name="location">Расположение</string>
+
+
+    <!--  -->
+
+    <!-- Titles -->
+    <string name="title_editor">QEdit - %1$s</string>
+    <string name="title_editor_dirty">QEdit - %1$s *</string>
+    <string name="title_editor_readonly">QEdit - [%1$s]</string>
+
+    <string name="title_settings">QEdit - Настройки</string>
+
+    <!-- Config screen strings -->
+    <string name="config_cat_display">Дисплей</string>
+    <string name="config_title_line_numbers">Показывать номера строк</string>
+    <string name="config_title_word_wrap">Перенос слов</string>
+    <string name="config_title_font">Изменить шрифт</string>
+    <string name="config_title_text_size">Размер текста</string>
+    <string name="config_title_color_theme">Цветовая схема</string>
+    <string name="config_title_scroll_fling">Бросьте для быстрой прокрутки</string>
+    <string name="config_summary_line_numbers">Отображать номера строк слева</string>
+    <string name="config_summary_word_wrap">Строки будут делиться, если они не умещаются на экран</string>
+    <string name="config_summary_scroll_fling">Выключите, если у вас проблемы с производительностью</string>
+
+    <!-- Options Menu in QEdit -->
+
+    <!-- Misc UI strings -->
+    <string name="ui_save_text">"Хотите сохранить файл? \nНесохранённые изменения будут потеряны."</string>
+    <string name="ui_save">Сохранить</string>
+    <string name="ui_delete">Удалить</string>
+    <string name="ui_no_save">"Не сохранять"</string>
+    <string name="ui_cancel">Отмена</string>
+    <string name="ui_hint_file_name">Имя файла</string>
+    <string name="ui_hint_search">Поиск</string>
+    <string name="ui_history">История</string>
+    <string name="ui_force_read_only">Открыть только для чтения</string>
+    <string name="about_content">QEdit это текстовый редактор для планшетов и телеыонов на платформе Android. Кроме редактирования теста, он может сделать разработку на python / HTML on гораздо более интересной и очень удобной.</string>
+
+    <!-- Misc Strings -->
+    <string name="lorem_ipsum">"QEdit отличный редактор кода."</string>
+
+    <string name="file_exists">Файл существует. Пожалуйста, измените название</string>
+    <string name="search_hint"></string>
+
+    <string name="video_src">Видео {0}</string>
+    <string name="play_video">Запустить видео</string>
+    <string name="no_videos_found">На странице не найдены видео</string>
+    <string name="pls_install_a8_play">Пожалуйста, установите A8 Video Player</string>
+    <string name="download_as">Загрузить и сохранить как</string>
+    <string name="info_browser">QBrowser</string>
+
+    <!--  added by kyle -->
+    <string name="share">Расшарить</string>
+    <string name="save_as_snippets">Сохранить как фоагмент</string>
+    <string name="snippet_exist">Фрагменты существуют. Пожалуйста, измените название.</string>
+    <string name="save_as_snippets_1">Фрагменты были сохранены как: </string>
+    <string name="fail_to_insert">Не удалось вставить фрагмент</string>
+    <string name="fail_to_goto">Пожалуйста, введите корректное число</string>
+    <string name="max_lines_num_with_syntax_title">Авто-подсветка строк</string>
+    <string name="max_lines_num_with_syntax_summary">Авто-подсветка при количестве строк меньше, чем %s</string>
+    <string name="qedit_not_support">QEdit поддерживает просмотр/запуск форматов\n.py, .sh, .lua, .html, .md.</string>
+
+    <string name="pls_install_lua">Пожалуйста, установите QLua для запуска скрипта</string>
+    <string name="pls_install_qpy">Пожалуйста, установите QPython для запуска скрипта</string>
+    <string name="info_snippets">Snippets</string>
+
+    <string name="ui_ok">ОК</string>
+    <string name="ui_contact_title">Контакты</string>
+    <string name="ui_licence_title">Лицензия</string>
+    <string name="ui_mail">support@qpython.org</string>
+    <string name="ui_choose_mail">Открыть почту, используя &#8230; </string>
+    <string name="ui_market_url">"https://market.android.com/developer?pub=Xavier+Gouchet"</string>
+    <string name="ui_market_app_url">"https://play.google.com/store/apps/details?id=%s"</string>
+    <string name="ui_market">"Взгляните на другие приложения от меня"</string>
+    <string name="ui_app_rating">"Оценить приложение \n Оставить отзыв"</string>
+    <string name="ui_feedback">"Вы можете связаться со мной для обсуждения любого бага или новой фнкции. "</string>
+    <string name="ui_licence_content">"Это программное обеспечение предоставляется 'как есть', без каких-либо гарантий явно выраженных или подразумеваемых. Ни при каких обстоятельствах автор не несет ответственности за любой ущерб, возникший в результате использования этого программного обеспечения."</string>
+    <string name="ui_art_licence_title">Художественная лицензия</string>
+    <string name="ui_art_licence_content">"Все иконки для этого приложения были созданы и принадлежат его автору: QPython."</string>
+    <string name="ui_whats_new">"Что нового"</string>
+    <string name="save">Сохранить</string>
+    <string name="save_as">Сохранить как</string>
+    <string name="open">Открыть</string>
+    <string name="file_name">Имя файла</string>
+    <string name="file_exist_hint">Файл сушествует. Пожалуйста, переименуйте его.</string>
+    <string name="empty_file">Пустой файл</string>
+w    <string name="confirm">Подтвердить</string>
+    <string name="cancel">Отмена</string>
+    <string name="new_project">Новый проект</string>
+    <string name="error_dont_kn">Возникла ошибка.</string>
+    <string name="project_name">Имя проекта</string>
+    <string name="jump_to">Переместиться к</string>
+    <string name="choose_ttf">Выберите файл шрифта(.ttf)</string>
+    <string name="explorer">Файловый менеджер</string>
+    <string name="new_script">Новый скрипт</string>
+    <string name="enter_name_hint">Ваедите имя скрипта</string>
+
+    <string name="paste">Вставить</string>
+    <string name="download_fail">Не удалось загрузить</string>
+    <string name="key_reset">reset_storage</string>
+    <string name="key_ftp_state">running_state</string>
+    <string name="key_username">username</string>
+    <string name="key_ftp_pwd">password</string>
+    <string name="key_port_num">portNum</string>
+    <string name="key_show_pwd">show_password</string>
+    <string name="key_root_dir">chrootDir</string>
+    <string name="key_stay_awake">stayAwake</string>
+    <string name="key_about">about</string>
+    <string name="dir_not_valid">Недоступная директория</string>
+    <string name="already_newest">Уже последняя</string>
+    <string name="share_text">QPython это движок скриптов, работающий на устройствах Android, таких как телефон или планшет. Он включает в себя интерпретатор Python, консоль, редактор, библиотеку SL4A для Android, что позволяет вашему устройству Android работать с Python\'ом https://www.qpython.com/privacy.html</string>
+    <string name="new_folder">Новая папка</string>
+    <string name="folder_name">Название папки</string>
+    <string name="untitled_folder">untitled folder</string>
+    <string name="toast_folder_exist">Операция провалена! Пожалуйста, выберите другое имя папки</string>
+    <string name="fail_open_file">Не удалось открыть файл. Файл не существует</string>
+    <string name="run_dirty_hint">Сохранить изменения?</string>
+    <string name="no_im_good">Нет, и так сойдёт</string>
+    <string name="convert_fail">Не удалось конвертировать</string>
+    <string name="delete_file_hint">Вы хотите удалить этот файл?</string>
+    <string name="rename">Переименовать</string>
+    <string name="rename_fail">Не удалось переименовать</string>
+    <string name="delete_fail">Не удалось удалить</string>
+    <string name="runtime_log">Лог: %s</string>
+    <string name="log_title">Лог</string>
+
+    <string name="fedback_mail">[Обоатная связь]\n\n</string>
+    <string name="date_format">[ %s ]</string>
+    <string name="not_root_yet">Устройство ещё не рутировано</string>
+    <string name="download_apk">Загрузить APK?</string>
+    <string name="download_apk_hint">Загрузка может быть платной, если вы не используете WIFI</string>
+    <string name="downloading_new_apk">Загрузка нового пакета</string>
+    <string name="checking_update">Проверка обновлений</string>
+    <string name="run_bg_title">Запустить в фоновом режиме</string>
+    <string name="scan">Сканировать</string>
+    <string name="read_script_from_qrcode">Чтение кода с QRCode</string>
+
+    <string name="course">Курсы</string>
+    <string name="lost_connect">Потеряно соединение</string>
+    <string name="featured_courses">Курсы</string>
+    <string name="programs">Программы</string>
+    <string name="open_gl2_is_not_supported">OpenGL2 не поддерживается</string>
+    <string name="unable_extract">Невозможно извлечь файлы python</string>
+    <string name="get_setting_data_fail">Не удалось получить данные ностроек</string>
+    <string name="terminal_bg_hint">Оставить терминал работать в фоновом режиме?</string>
+    <string name="thanks">СПАСИБО!</string>
+    <string name="extra_pypi">Установить PYPI</string>
+    <string name="already_newest_current_version">Установлена последняя версия. Номер версии: </string>
+    <string name="reward">Reward</string>
+    <string name="oops_seems_like_your_net_have_some_trouble">Ой! \n Похоже, у вас пробелмы с сетью…</string>
+    <string name="lose_google_server">Не удаётся подключиться к сервисам Google Play. Пожалуйста, проверьте ваше соединение.</string>
+    <string name="thanks_your_support">Спасибо за вашу помощь!</string>
+    <string name="under_16_status_bar_hint">Изменение праметра видимости статус-бара будет применено только при следующем запуске терминала.</string>
+    <string name="refresh">Обновить</string>
+    <string name="reset_suc">Успешный перезапуск</string>
+    <string name="reset_hint">Эта операция будет актовной только после перезапуска</string>
+    <string name="restart">Перезапуск</string>
+    <string name="fail_resume_console">Не удалось восстановить консоль</string>
+    <string name="failed_bind_term">Не удалось забиндить TermService!</string>
+    <string name="console_running">Консоль QPython запущена</string>
+    <string name="qpy_console">Консоль QPython</string>
+    <string name="recommend">Рекомендованное</string>
+    <string name="newest_course">Последнее</string>
+    <string name="best_python_development_ide_non_mobile">Лучшее приложение Python на мобильных устройствах</string>
+    <string name="sign_in_with_google">Войти через Google</string>
+    <string name="by_signing_in_you_agree_to_out_privacy_policy_term_of_service"><![CDATA[By signing in you agree to out privacy policy & term of service]]></string>
+    <string name="copy_hint">Скопируйте в редактор, чтобы запустить</string>
+    <string name="my_scripts">Мои скрипты</string>
+    <string name="my_share">Моё расшаренное</string>
+    <string name="snippet">Фрагмент</string>
+    <string name="gist_title">Gist заголовок</string>
+    <string name="description">Описание</string>
+    <string name="too_long_hint">Текст должен включать 140 или меньше символов.</string>
+    <string name="enter_snippet">Введите имя фрагмента</string>
+    <string name="welcome_s">Приветствую, <![CDATA[<font color="#4BAC07"><u>%s</u></font>]]></string>
+    <string name="login"><u>войти</u></string>
+    <string name="auth_failed">Неудачная аторизация.</string>
+    <string name="log_out">выйти</string>
+    <string name="me">Я</string>
+    <string name="grant_storage_hint">Необходимо получить разрешение для доступа к хранилищу.</string>
+    <string name="lost_google_hint">Не могу подключиться к серверу Google. Пожалуйста, проверьте ваше соединение.</string>
+</resources>
\ No newline at end of file
diff --git a/qpython/src/main/res/values-v11/dimens.xml b/qpython/src/main/res/values-v11/dimens.xml
new file mode 100644
index 00000000..20a66d10
--- /dev/null
+++ b/qpython/src/main/res/values-v11/dimens.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<!-- V14 -->
+    <dimen name="widget_margin">4dp</dimen>
+
+</resources>
\ No newline at end of file
diff --git a/qpython/src/main/res/values-v11/styles.xml b/qpython/src/main/res/values-v11/styles.xml
index df57dd53..1b541abc 100644
--- a/qpython/src/main/res/values-v11/styles.xml
+++ b/qpython/src/main/res/values-v11/styles.xml
@@ -4,34 +4,53 @@
  -->
 
 <resources>
+
+    <style name="TransparentTheme" parent="@style/Theme.AppCompat">
+
+        <item name="android:background">@android:color/transparent</item>
+        <item name="background">@android:color/transparent</item>
+
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:colorBackgroundCacheHint">@android:color/transparent</item>
+        <item name="android:windowContentOverlay">@android:color/transparent</item>
+        <item name="android:windowIsTranslucent">@android:color/transparent</item>
+        <item name="android:windowAnimationStyle">@android:color/transparent</item>
+    </style>
+
+    <style name="AppTheme" parent="Theme.AppCompat.NoActionBar">
+
+        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+        <item name="android:textColorPrimary">@color/white</item>
+        <item name="android:textColorSecondary">#FF9B9B9B</item>
+        <item name="colorControlNormal">@color/white</item>
+        <item name="android:dialogPreferenceStyle">@style/MyDialog</item>
+        <item name="android:windowBackground">@color/colorPrimaryDark</item>
+        <item name="selectableItemBackground">@drawable/toolbar_button_bg</item>
+        <item name="android:textAppearanceSmallPopupMenu">@style/popupMenuTextAppearanceSmall</item>
+        <item name="android:textAppearanceLargePopupMenu">@style/popupMenuTextAppearanceLarge</item>
+        <item name="android:colorBackground">@color/colorPrimaryDark</item>
+    </style>
     <!-- This style is used for all activities except the main terminal
          window. (Example: console_preferences.)
      -->
-    <style name="ConsoleTheme" parent="@android:style/Theme.Holo">
+    <style name="ConsoleTheme" parent="Theme.AppCompat.Light.DarkActionBar">
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
         <item name="android:windowNoTitle">true</item>
+        <item name="android:colorBackground">@color/colorPrimaryDark</item>
+        <item name="android:textColor">@color/Color_White</item>
         <item name="android:windowFrame">@null</item>
         <item name="android:windowContentOverlay">@null</item>
     </style>
     <!-- This style is used for the main terminal window when the action bar
          is visible. It is set programmatically at run time.
      -->
-    <style name="Theme.Holo" parent="@android:style/Theme.Holo">
-        <item name="android:windowFrame">@null</item>
-        <item name="android:windowContentOverlay">@null</item>
-    </style>
     <!-- This style is used for the main terminal window when the action bar
          is hidden. It is set programmatically at run time.
      -->
-    <style name="Theme.Holo.ActionBarOverlay" parent="@style/Theme.Holo">
-        <item name="android:windowActionBarOverlay">true</item>
-        <item name="android:actionBarStyle">@style/Widget.ActionBarOverlay</item>
-    </style>
-
-    <style name="Widget.ActionBarOverlay" parent="@android:style/Widget.Holo.ActionBar">
-        <item name="android:background">#a0000000</item>
-    </style>
 </resources>
 
diff --git a/qpython/src/main/res/values-v21/colors.xml b/qpython/src/main/res/values-v21/colors.xml
index 2f934d5a..ba378432 100644
--- a/qpython/src/main/res/values-v21/colors.xml
+++ b/qpython/src/main/res/values-v21/colors.xml
@@ -1,5 +1,3 @@
 <resources>
-    <color name="primary">#607D8B</color>
-    <color name="primary_dark">#455A64</color>
     <color name="accent">#8BC34A</color>
 </resources>
diff --git a/qpython/src/main/res/values-v21/styles.xml b/qpython/src/main/res/values-v21/styles.xml
index f13e473e..54ce51a2 100644
--- a/qpython/src/main/res/values-v21/styles.xml
+++ b/qpython/src/main/res/values-v21/styles.xml
@@ -4,6 +4,35 @@
  -->
 
 <resources>
+
+    <style name="TransparentTheme" parent="@style/Theme.AppCompat">
+
+        <item name="android:background">@android:color/transparent</item>
+        <item name="background">@android:color/transparent</item>
+
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:colorBackgroundCacheHint">@android:color/transparent</item>
+        <item name="android:windowContentOverlay">@android:color/transparent</item>
+        <item name="android:windowIsTranslucent">@android:color/transparent</item>
+        <item name="android:windowAnimationStyle">@android:color/transparent</item>
+    </style>
+
+    <style name="AppTheme" parent="Theme.AppCompat.NoActionBar">
+        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+        <item name="android:textColorPrimary">@color/white</item>
+        <item name="android:textColorSecondary">#FF9B9B9B</item>
+        <item name="colorControlNormal">@color/white</item>
+        <item name="android:dialogPreferenceStyle">@style/MyDialog</item>
+        <item name="android:windowBackground">@color/colorPrimaryDark</item>
+        <item name="android:windowContentTransitions">true</item>
+        <item name="selectableItemBackground">@drawable/toolbar_button_bg</item>
+        <item name="android:textAppearanceSmallPopupMenu">@style/popupMenuTextAppearanceSmall</item>
+        <item name="android:textAppearanceLargePopupMenu">@style/popupMenuTextAppearanceLarge</item>
+        <item name="android:colorBackground">@color/colorPrimaryDark</item>
+    </style>
     <!-- This style is used for all activities.
      -->
     <style name="ConsoleTheme" parent="@android:style/Theme.DeviceDefault">
@@ -21,5 +50,6 @@
         <!--   theme UI controls like checkboxes and text fields -->
         <item name="android:colorAccent">@color/accent</item>
     </style>
+
 </resources>
 
diff --git a/qpython/src/main/res/values-zh-rCN/arrays.xml b/qpython/src/main/res/values-zh-rCN/arrays.xml
new file mode 100644
index 00000000..496694bb
--- /dev/null
+++ b/qpython/src/main/res/values-zh-rCN/arrays.xml
@@ -0,0 +1,179 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+ * Copyright (C) 2007 The Android Open Source Project
+ *
+ * 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.
+ -->
+
+<resources>
+    <string-array name="entries_statusbar_preference">
+        <item>显示状态栏</item>
+        <item>隐藏状态栏</item>
+    </string-array>
+
+    <string-array name="entries_actionbar_preference">
+        <!-- <item>Action bar disabled</item> -->
+        <item>显示操作栏</item>
+        <item>隐藏操作栏 (点击屏幕上方或按菜单键显示)</item>
+    </string-array>
+
+    <string-array name="entries_orientation_preference">
+        <item>自动</item>
+        <item>横屏</item>
+        <item>竖屏</item>
+    </string-array>
+
+    <string-array name="entries_fontsize_preference">
+        <item>4 x 8 像素</item>
+        <item>6 磅</item>
+        <item>7 磅</item>
+        <item>8 磅</item>
+        <item>9 磅</item>
+        <item>10 磅</item>
+        <item>12 磅</item>
+        <item>14 磅</item>
+        <item>16 磅</item>
+        <item>20 磅</item>
+        <item>24 磅</item>
+        <item>28 磅</item>
+        <item>32 磅</item>
+        <item>36 磅</item>
+        <item>42 磅</item>
+        <item>48 磅</item>
+        <item>64 磅</item>
+        <item>72 磅</item>
+        <item>96 磅</item>
+        <item>144 磅</item>
+        <item>288 磅</item>
+    </string-array>
+
+    <string-array name="entries_color_preference">
+        <item>白底黑字</item>
+        <item>黑底白字</item>
+        <item>蓝底白字</item>
+        <item>黑底绿字</item>
+        <item>黑底黄字</item>
+        <item>黑底红字</item>
+        <item>Holo 风格</item>
+        <item>爆光过度</item>
+        <item>爆光不足</item>
+        <item>Linux 终端</item>
+    </string-array>
+
+    <string-array name="entries_backaction_preference">
+        <item>关闭所有窗口</item>
+        <item>关闭当前窗口</item>
+        <item>关闭当前实例，保留正在运行的会话</item>
+        <item>给终端发送 ESC</item>
+        <item>给终端发送 TAB</item>
+    </string-array>
+
+    <string-array name="entries_controlkey_preference">
+        <item>轨迹球</item>
+        <item>\@ 键</item>
+        <item>左 Alt 键</item>
+        <item>右 Alt 键</item>
+        <item>提升音量键</item>
+        <item>降低音量键</item>
+        <item>相机快门键</item>
+        <item>无</item>
+    </string-array>
+
+    <string-array name="entries_fnkey_preference">
+        <item>轨迹球</item>
+        <item>\@ 键</item>
+        <item>左 Alt 键</item>
+        <item>右 Alt 键</item>
+        <item>提升音量键</item>
+        <item>降低音量键</item>
+        <item>相机快门键</item>
+        <item>无</item>
+    </string-array>
+
+    <string-array name="entries_ime_preference">
+        <item>字本</item>
+        <item>词本</item>
+    </string-array>
+
+
+    <!-- These are the 'short' names for the control keys. They are used in the special keys dialog. -->
+    <string-array name="control_keys_short_names">
+        <item>Ball</item>
+        <item>\@</item>
+        <item>Left-Alt</item>
+        <item>Right-Alt</item>
+        <item>Vol-Up</item>
+        <item>Vol-Dn</item>
+        <item>Camera</item>
+        <item>None</item>
+    </string-array>
+
+    <!-- These are the 'short' names for the Fn keys. They are used in the special keys dialog. -->
+    <string-array name="fn_keys_short_names">
+        <item>Ball</item>
+        <item>\@</item>
+        <item>Left-Alt</item>
+        <item>Right-Alt</item>
+        <item>Vol-Up</item>
+        <item>Vol-Dn</item>
+        <item>Camera</item>
+        <item>None</item>
+    </string-array>
+
+
+    <!-- Color themes -->
+
+
+    <string-array name="color_theme_names">
+        <item>Classic</item>
+        <item>Negative</item>
+        <item>Matrix</item>
+        <item>Sky</item>
+        <item>Dracula</item>
+    </string-array>
+    <string-array name="color_theme_values">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+    </string-array>
+
+    <!-- End of lines -->
+
+    <!-- Recent files -->
+
+    <!-- Recent files -->
+
+    <!-- Encoding -->
+
+    <string-array name="max_lines_num_with_syntax_values">
+        <item>100</item>
+        <item>300</item>
+        <item>600</item>
+        <item>1000</item>
+        <item>2000</item>
+    </string-array>
+
+    <string-array name="funding_price">
+        <item>36</item>
+        <item>48</item>
+        <item>60</item>
+        <item>96</item>
+    </string-array>
+
+    <string-array name="funding_stage">
+        <item>初级课程</item>
+        <item>中级课程</item>
+        <item>高级课程</item>
+    </string-array>
+</resources>
diff --git a/qpython/src/main/res/values-zh-rCN/strings.xml b/qpython/src/main/res/values-zh-rCN/strings.xml
new file mode 100644
index 00000000..aeff98b2
--- /dev/null
+++ b/qpython/src/main/res/values-zh-rCN/strings.xml
@@ -0,0 +1,454 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Titles -->
+    <string name="title_editor">%1$s</string>
+    <string name="title_editor_dirty">%1$s *</string>
+    <string name="title_editor_readonly">[%1$s]</string>
+    <string name="title_settings">设置</string>
+    <!-- Config screen strings -->
+    <string name="config_cat_display">显示(改变后请重新启动编辑器)</string>
+    <string name="config_title_line_numbers">显示行号</string>
+    <string name="config_title_word_wrap">自动换行</string>
+    <string name="config_title_font">更改文本字体</string>
+    <string name="config_title_text_size">文字大小</string>
+    <string name="config_title_color_theme">颜色主题</string>
+    <string name="config_title_scroll_fling">快速滚动</string>
+    <string name="config_summary_line_numbers">在左侧显示的行号</string>
+    <string name="config_summary_word_wrap">如果某行对于屏幕太宽时，自动换行</string>
+    <string name="config_summary_scroll_fling">如果有性能问题，不要选中</string>
+
+    <string name="config_gist_icon"></string>
+    <string name="config_title_gist">显示Gist按钮</string>
+
+    <!-- Options Menu in QEdit -->
+    <!-- Misc UI strings -->
+    <string name="ui_save_text">保存文档？\n任何未保存更改将丢失。</string>
+    <string name="ui_save">保存</string>
+    <string name="ui_delete">删除</string>
+    <string name="ui_no_save">不保存</string>
+    <string name="ui_cancel">取消</string>
+    <string name="ui_hint_file_name">文件名</string>
+    <string name="ui_hint_search">搜索</string>
+    <string name="ui_history">历史</string>
+    <string name="ui_force_read_only">打开为只读</string>
+    <string name="about_content">QEdit 是一个文本编辑器，针对Android平板电脑和手机，除了文本编辑，它可以使安卓上的Python/HTML 开发更方便和有趣。 </string>
+    <!-- Misc Strings -->
+    <string name="lorem_ipsum">“QEdit 是一个伟大的脚本编辑器”</string>
+    <string name="file_exists">文件已存在，请重命名</string>
+    <string name="video_src">视频{0}</string>
+    <string name="play_video">播放</string>
+    <string name="no_videos_found">没有发现影片在本页面</string>
+    <string name="pls_install_a8_play">请首先安装A8视频播放器</string>
+    <string name="download_as">下载并保存为</string>
+    <string name="info_browser">QBrowser</string>
+    <!-- added by kyle -->
+    <string name="share">分享</string>
+    <string name="save_as_snippets">另存为片段</string>
+    <string name="info_snippets">片段</string>
+    <string name="save_as_snippets_1">片段已另存为： </string>
+    <string name="fail_to_insert">无法插入片段</string>
+    <string name="fail_to_goto">请输入正确的号码</string>
+    <string name="max_lines_num_with_syntax_title">自动高亮</string>
+    <string name="max_lines_num_with_syntax_summary">自动突出显示，如果行数少于%s</string>
+    <string name="qedit_not_support">QEdit 仅仅支持预览或执行以下类型的文件\n.py，.sh，.lua，html，.md, .log, .kv。 </string>
+    <string name="pls_install_lua">请安装QLua 运行LUA 脚本</string>
+    <string name="pls_install_qpy">请安装QPython 运行python 脚本</string>
+    <string name="ui_ok">OK</string>
+    <string name="ui_contact_title">联系</string>
+    <string name="ui_licence_title">授权</string>
+    <string name="ui_mail">support@quseit.com</string>
+    <string name="ui_choose_mail">打开邮件… </string>
+    <string name="ui_market_url">http://quseit.com"</string>
+    <string name="ui_market_app_url">"https://play.google.com/store/apps/details?id=%s"</string>
+    <string name="ui_market">“看看我们的其他应用程序”</string>
+    <string name="ui_app_rating">“评价我们的应用程序\n留下您的反馈”</string>
+    <string name="ui_feedback">“请随时联系我们不管是反馈，功能要求或错误报告等。”</string>
+    <string name="ui_licence_content">“本软件提供“原样”,无任何明示或暗示的保证。不管在任何情况下，笔者应该对因使用本软件所引起的任何损失负责。”</string>
+    <string name="ui_art_licence_title">设计授权</string>
+    <string name="ui_art_licence_content">“创建所有的图标为这个应用程序，并属于该应用程序的作者：QPython."</string>
+    <string name="ui_whats_new">“有什么新闻？”</string>
+    <string name="addshortcut_arguments_label">添加到字典</string>
+    <string name="alt_sends_esc">Ale 键发送 ESC</string>
+    <string name="alt_sends_esc_summary_off">关闭Alt 键发送 ESC</string>
+    <string name="alt_sends_esc_summary_on">使用Alt 键发送ESC</string>
+    <string name="application_terminal">终端模拟器</string>
+    <string name="choose_ttf">选择字体文件(.ttf)</string>
+    <string name="close_window">关闭终端</string>
+    <string name="use_keyboard_shortcuts_summary_off">禁用键盘快捷键</string>
+    <string name="toggle_soft_keyboard">打开/关闭软键盘</string>
+    <string name="toast_plugin_uninstall_complete">插件删除成功</string>
+    <string name="toast_plugin_install_failure">插件安装失败</string>
+    <string name="tools">工具</string>
+    <string name="toast_plugin_install_complete">插件安装完成</string>
+    <string name="title_verify_path_preference">验证PATH路径</string>
+    <string name="title_utf8_by_default_preference">默认 UTF-8</string>
+    <string name="title_termtype_preference">终端类型</string>
+    <string name="title_statusbar_preference">状态栏</string>
+    <string name="title_shell_preference">命令行</string>
+    <string name="title_select_plugin">选择插件</string>
+    <string name="title_plugin_manage">插件管理</string>
+    <string name="title_orientation_preference">屏幕方位</string>
+    <string name="title_mouse_tracking_preference">发送鼠标事件</string>
+    <string name="title_initialcommand_preference">初始命令</string>
+    <string name="title_ime_preference">输入方式</string>
+    <string name="title_home_path_preference">HOME 文件夹</string>
+    <string name="title_fontsize_preference">文本大小</string>
+    <string name="title_fnkey_preference">Fn 键</string>
+    <string name="title_do_path_extensions_preference">允许PATH后扩</string>
+    <string name="title_controlkey_preference">Ctrl 键</string>
+    <string name="title_color_preference">颜色</string>
+    <string name="title_close_window_on_process_exit_preference">退出时关闭终端</string>
+    <string name="title_backaction_preference">返回键行为</string>
+    <string name="title_allow_prepend_path_preference">允许PATH前置</string>
+    <string name="title_actionbar_preference">操作栏</string>
+    <string name="text_preferences">文本</string>
+    <string name="terminal">终端</string>
+    <string name="summary_verify_path_preference">是否将PATH中无效d路径清除</string>
+    <string name="summary_utf8_by_default_preference">是否将UTF-8模式设为默认</string>
+    <string name="summary_termtype_preference">设置 Shell 的终端类型</string>
+    <string name="summary_statusbar_preference">显示/隐藏状态栏</string>
+    <string name="summary_shell_preference">指定命令行使用的 Shell</string>
+    <string name="summary_orientation_preference">选择屏幕方位行为</string>
+    <string name="read_only">只读模式</string>
+    <string name="file">文件</string>
+    <string name="yes">是</string>
+    <string name="no">否</string>
+    <string name="ok">确定</string>
+    <string name="close">关闭</string>
+    <string name="no_change">没有任何改变</string>
+    <string name="feedback">意见反馈</string>
+    <string name="about">关于</string>
+    <string name="file_not_exists">文件不存在</string>
+    m
+    <string name="enable_root">启用Root权限</string>
+    <string name="send">发送</string>
+    <string name="no_camera">没有发现可用的摄像头，请查看是否开启摄像头权限</string>
+    <string name="no_storage">没有文件读取权限</string>
+
+
+    <string name="pref_initialcommand_default_qpython">python</string>
+    <string name="qpy_app">QPY</string>
+    <string name="local_app">本机应用</string>
+    <string name="root_mode">Root模式</string>
+    <string name="star_it">点评</string>
+    <string name="disable_root">已禁用</string>
+    <string name="http_qpypi_qpython_org">https://pypi.python.org/simple/</string>
+    <string name="add">添加</string>
+    <string name="sl4a_running">SL4A服务运行中</string>
+    <string name="service_toggle">服务开关</string>
+    <string name="qpy_description">QPython is a script engine running on android devices like phone or tablet.QPython is a script engine running on android devices like phone or tablet.</string>
+    <string name="warning">警告</string>
+    <string name="reset_warning">将重置所有设置并删除已下载的库,确定重置吗?</string>
+    <string name="downloading">库文件</string>
+    <string name="save">保存</string>
+    <string name="save_as">另存为</string>
+    <string name="open">打开</string>
+    <string name="file_name">File Name</string>
+    <string name="empty_file">空白文件</string>
+    <string name="confirm">确定</string>
+    <string name="cancel">取消</string>
+    <string name="new_project">新建项目</string>
+    <string name="error_dont_kn">发生了某些错误</string>
+    <string name="project_name">项目名</string>
+    <string name="jump_to">转至某行</string>
+    <string name="explorer">文件夹</string>
+    <string name="new_script">新建脚本</string>
+    <string name="enter_name_hint">请输入文件名</string>
+
+    <string name="paste">粘贴</string>
+    <string name="install_with_python_s_pypi">QPYPI客户端</string>
+    <string name="py_pi">你可以管理、通过从QPYPI或者Python的PYPI来安装或升级Python包</string>
+    <string name="download_fail">下载失败</string>
+    <string name="activity_shortcut_create">终端快捷方式</string>
+    <string name="activity_term_here_title">在此处运行终端</string>
+    <string name="addshortcut_button_find_command">查找命令</string>
+    <string name="addshortcut_button_text_icon">文字图标</string>
+    <string name="addshortcut_command_hint">命令</string>
+    <string name="addshortcut_example_hint">--示例=\"\"a\"</string>
+    <string name="addshortcut_make_text_icon">制作文字图标</string>
+    <string name="addshortcut_navigator_title">选择快捷方式文件</string>
+    <string name="addshortcut_shortcut_label">快捷方式标签</string>
+    <string name="addshortcut_title">终端快捷方式</string>
+    <string name="colorvalue_icon_text_entry_hint">输入标签文字</string>
+    <string name="colorvalue_label_lock_button_column">锁</string>
+    <string name="control_key_dialog_control_disabled_text">Crtl 键未设置</string>
+    <string name="control_key_dialog_fn_disabled_text">Fn 键未设置</string>
+    <string name="control_key_dialog_title">Ctrl 和 Fn 键</string>
+    <string name="copy_all">复制全部</string>
+    <string name="dialog_plugin_detail_positive">确定</string>
+    <string name="dialog_title_actionbar_preference">操作栏行为</string>
+    <string name="dialog_title_backaction_preference">返回键行为</string>
+    <string name="dialog_title_color_preference">文字颜色</string>
+    <string name="dialog_title_controlkey_preference">Ctrl 键</string>
+    <string name="dialog_title_fnkey_preference">Fn 键</string>
+    <string name="dialog_title_fontsize_preference">文字大小</string>
+    <string name="dialog_title_ime_preference">输入方式</string>
+    <string name="dialog_title_initialcommand_preference">初始化命令</string>
+    <string name="dialog_title_orientation_preference">屏幕方向事件</string>
+    <string name="dialog_title_project">项目</string>
+    <string name="dialog_title_script">脚本</string>
+    <string name="dialog_title_shell_preference">Shell</string>
+    <string name="dialog_title_statusbar_preference">状态栏</string>
+    <string name="dialog_title_termtype_preference">终端类型</string>
+    <string name="disable_wakelock">禁用弱锁</string>
+    <string name="disable_wifilock">禁用Wifi 锁</string>
+    <string name="edit_text">编辑文字</string>
+    <string name="editor">编辑器</string>
+    <string name="email_transcript_chooser_title">反馈 ...</string>
+    <string name="email_transcript_no_email_activity_found">找不到邮件实例发送</string>
+    <string name="email_transcript_subject">复製终端</string>
+    <string name="enable_wakelock">启用弱锁模式</string>
+    <string name="enable_wifilock">启用Wifi 锁</string>
+    <string name="fsnavigator_change_theme">选择主题</string>
+    <string name="fsnavigator_no_external_storage">内存无法访问</string>
+    <string name="fsnavigator_optional_enter_path">或在此输入mPath</string>
+    <string name="fsnavigator_title">文件选择器</string>
+    <string name="ftp_server">FTP服务</string>
+    <string name="help">帮助</string>
+    <string name="help_url">http://jackpal.github.com/Android-Terminal-Emulator/help/index.html</string>
+    <string name="internal_space"><![CDATA[权限 & 存储]]></string>
+    <string name="keyboard_preferences">键盘</string>
+    <string name="qpypi">精选</string>
+    <string name="location">位置</string>
+    <string name="more">更多</string>
+    <string name="new_window">打开新终端</string>
+    <string name="already_newest">当前已是最新版本</string>
+    <string name="checking_update">检查更新</string>
+    <string name="confirm_window_close_message">确定要关闭终端吗？</string>
+    <string name="convert_fail">转换失败</string>
+    <string name="course">课程</string>
+    <string name="date_format">[ %s ]</string>
+    <string name="delete_fail">删除失败</string>
+    <string name="delete_file_hint">确定要删除该文件吗？</string>
+    <string name="dir_not_valid">该目录不可用</string>
+    <string name="download_apk">下载最新安装包</string>
+    <string name="download_apk_hint">下载可能会消耗运营商流量，确认下载吗？</string>
+    <string name="downloading_new_apk">下载新的包</string>
+    <string name="fail_open_file">无法打开，该文件不存在</string>
+    <string name="featured_courses">课程中心</string>
+    <string name="folder_name">文件夹名</string>
+    <string name="get_setting_data_fail">获取设置信息失败</string>
+    <string name="key_about">关于</string>
+    <string name="key_ftp_pwd">密码</string>
+    <string name="key_ftp_state">运行状态</string>
+    <string name="key_port_num">端口号</string>
+    <string name="key_reset">重置内存空间</string>
+    <string name="key_root_dir">根目录</string>
+    <string name="key_show_pwd">显示密码</string>
+    <string name="key_stay_awake">保持唤醒</string>
+    <string name="key_username">用户名</string>
+    <string name="new_folder">新建文件夹</string>
+    <string name="not_root_yet">该设备未进入Root模式</string>
+    <string name="open_gl2_is_not_supported">当前设备不支持OpenGL2</string>
+    <string name="plugin_detail">详情</string>
+    <string name="plugin_install">安装</string>
+    <string name="plugin_uninstall">卸载</string>
+    <string name="plugin_update">更新</string>
+    <string name="pref_termtype_default">屏幕</string>
+    <string name="process_exit_message">会话已结束</string>
+    <string name="programs">程序</string>
+    <string name="project">项目</string>
+    <string name="recent">最近</string>
+    <string name="rename">重命名</string>
+    <string name="rename_fail">重命名失败</string>
+    <string name="reset">重置Terminal</string>
+    <string name="reset_toast_notification">当前状态将被重置</string>
+    <string name="run_bg_title">在后台运行</string>
+    <string name="run_dirty_hint">保存当前修改吗？</string>
+    <string name="runtime_log">运行日誌 : %s</string>
+    <string name="log_title">运行日誌</string>
+
+    <string name="scan">二维码</string>
+    <string name="read_script_from_qrcode">从二维码中读取代码</string>
+
+    <string name="screen_preferences">屏幕</string>
+    <string name="script">脚本</string>
+    <string name="select_text">选择文字</string>
+    <string name="send_email">发送邮件至…</string>
+    <string name="setting">设置</string>
+    <string name="sl4a_server">SL4A服务</string>
+    <string name="sl4a_un_running">SL4A服务未启动</string>
+    <string name="special_keys">特殊键</string>
+    <string name="task">Task</string>
+    <string name="title_use_keyboard_shortcuts">使用键盘快捷键</string>
+    <string name="unable_extract">解压python文件失败，可能影响部分功能使用</string>
+    <string name="untitled_folder">未命名文件夹</string>
+    <string name="window_list">终端列表</string>
+    <string name="window_title">终端 %1$d</string>
+    <string name="file_exist_hint">文件已存在，请重命名</string>
+    <string name="community">社区</string>
+    <string name="terminal_bg_hint">在后台运行此控制台？</string>
+    <string name="preferences">偏好</string>
+    <string name="toast_folder_doesnt_exist">无法显示列表, 文件不存在</string>
+    <string name="library">库</string>
+    <string name="summary_fontsize_preference">选择字体大小</string>
+    <string name="summary_color_preference">选择字体颜色</string>
+    <string name="summary_backaction_preference">选择返回键行为</string>
+    <string name="summary_controlkey_preference">选择Ctrl键行为</string>
+    <string name="summary_fnkey_preference">选择Fn键行为</string>
+    <string name="thanks">十分感谢!</string>
+    <string name="extra_pypi">设置PYPI</string>
+    <string name="already_newest_current_version">"已是最新, 目前的版本是: "</string>
+    <string name="reward">赞赏</string>
+    <string name="lose_google_server">无法连接到Google服务器, 请检查您的网络</string>
+    <string name="thanks_your_support">感谢你的支持!</string>
+    <string name="under_16_status_bar_hint">状态栏的显示状态将会在下一次打开时更新</string>
+    <string name="refresh">刷新</string>
+    <string name="reset_suc">重置成功</string>
+    <string name="reset_hint">重启后操作生效</string>
+    <string name="restart">重启</string>
+    <string name="fail_resume_console">重启Console失败</string>
+    <string name="failed_bind_term">绑定TermService失败</string>
+    <string name="console_running">QPython Console正在后台运行</string>
+    <string name="qpy_console">QPython Console</string>
+    <string name="not_support_yet">无法打开该类型文件</string>
+    <string name="last_refresh">上一次更新: %s</string>
+    <string name="data_saver">省流量模式</string>
+    <string name="saver_on">使用本地缓存</string>
+    <string name="saver_off">使用最新数据</string>
+    <string name="aipy_lib_hint">你可以安装或更新AIPY应用获得更多功能</string>
+    <string name="aipy_not_release">请先安装并运行AIPY</string>
+    <string name="aipy_not_support">AIPy尚未支持QPY3</string>
+    <string name="install_package_fail">安装库文件失败, 请稍后重试</string>
+    <string name="install_fail">安装失败, 请稍后重试</string>
+    <string name="install_suc">安装成功</string>
+    <string name="package_installed">这个库文件已存在</string>
+    <string name="update_time_hint">更新: %s</string>
+    <string name="toolbar_close">编辑器</string>
+    <string name="toolbar_showing">项目结构</string>
+    <string name="cant_open">该文件无法打开</string>
+    <string name="no_recent_file">您最近未打开任何文件</string>
+    <string name="no_file">该文件夹里没有任何文件</string>
+    <string name="no_space">上传空间已达10M, 无法继续上传</string>
+    <string name="need_grant">使用功能前你需要授予权限</string>
+    <string name="shortcut_create_suc">快捷方式 %s 已创建</string>
+    <string name="save_amp_push"><![CDATA[保存 & 上传]]></string>
+    <string name="my_space_empty">我的空间 (— / 100 文件)</string>
+    <string name="my_space">我的空间 (%d / 100 文件)</string>
+    <string name="login_error">登录失败</string>
+    <string name="file_downloaded">文件已下载</string>
+    <string name="override_hint">覆写本地文件?</string>
+    <string name="app_noti">应用消息推送</string>
+    <string name="log_noti">Log消息推送</string>
+    <string name="lout">退出吗?</string>
+    <string name="delete_suc">删除文件成功</string>
+    <string name="delete_remote_suc">删除远程文件成功</string>
+    <string name="override_fail_hint">覆写失败, 请稍后重试</string>
+    <string name="not_support_type_hint">现在还不支持上传该类型文件</string>
+    <string name="mkdir_fail">创建文件夹失败</string>
+    <string name="cloud_empty_hint">你还未上传任何文件</string>
+    <string name="login_now">现在登录</string>
+    <string name="upload_login_hint">上传文件前需要登录</string>
+    <string name="need_login">登录</string>
+    <string name="share_empty_hint">分享前请先保存</string>
+    <string name="initial">初始化</string>
+    <string name="null_comment_hint">没有评论内容…</string>
+    <string name="title_untitled">未命名</string>
+    <string name="sofa_hint">抢个沙发吗?</string>
+    <string name="nothing_here_yet">这里还没有东西.. :(</string>
+    <string name="my_program">我的程序</string>
+    <string name="upload_fail">上传代码失败</string>
+    <string name="upload_suc">上传代码成功</string>
+    <string name="lost_google_hint">无法连接Google服务器, 请检查您的网络</string>
+    <string name="grant_storage_hint">进行该操作前您需要授予存储权限</string>
+    <string name="me">我的</string>
+    <string name="log_out">退出登录</string>
+    <string name="auth_failed">认证失败</string>
+    <string name="login"><u>登录</u></string>
+    <string name="welcome_s">欢迎, <![CDATA[<font color="#4BAC07"><u>%s</u></font>]]></string>
+    <string name="enter_snippet">输入片段名</string>
+    <string name="too_long_hint">输入文字过长</string>
+    <string name="description">描述</string>
+    <string name="gist_title">片段标题</string>
+    <string name="snippet">片段</string>
+    <string name="my_share">我的GIST</string>
+    <string name="my_scripts">我的代码</string>
+    <string name="copy_hint">使用编辑器打开该段代码</string>
+    <string name="newest_course">最新</string>
+    <string name="recommend">推荐</string>
+    <string name="lost_connect">失去连接</string>
+    <string name="no_im_good">不用了</string>
+    <string name="toast_folder_exist">操作失败, 请重新命名</string>
+    <string name="snippet_exist">该片段已存在, 请重新命名</string>
+    <string name="new_file">新文件</string>
+    <string name="feedback_email_subject">反馈 - QPython</string>
+    <string name="toast_intent_invalid_uri">无法打开该文件, URI无效</string>
+    <string name="toast_intent_illegal">无法打开该文件</string>
+    <string name="toast_save_success">文件已保存</string>
+    <string name="share_body">Share the body</string>
+
+    <string name="by_signing_in_you_agree_to_out_privacy_policy_term_of_service"><![CDATA[登录即表示您同意我们的<font color="#4BAC07">隐私政策和服务条款</font>]]></string>
+    <string name="about_the_author">作者简介</string>
+    <string name="course_content">课程内容</string>
+    <string name="show">展开</string>
+    <string name="course_introduction">课程简介</string>
+    <string name="my">我的</string>
+    <string name="support">支持</string>
+    <string name="crowdfunding">众筹中%d%%</string>
+    <string name="hide">收起</string>
+    <string name="support_count">已有%s人支持</string>
+    <string name="free">学习</string>
+    <string name="free_plan">套餐类型: 免费(10M Max)</string>
+    <string name="author">作者</string>
+    <string name="from_content">评论&amp;提问</string>
+    <string name="other">其他</string>
+    <string name="featured">推荐</string>
+    <string name="explore_course">探索更多课程</string>
+    <string name="database">数据库</string>
+    <string name="basics">基础</string>
+    <string name="funding">众筹</string>
+    <string name="explanation">众筹说明：\n\n\u0020\u0020欢迎参与QPython精品课程众筹，QPython通过众筹能鼓励优质原创的Python教材内容产生，方便您的学习。</string>
+    <string name="explanation_more">\u0020\u0020超100人完成众筹，作者会在1星期之内推出精品初级学习课程；超500人完成众筹，作者会在2个星期之内推出中级学习课程；超过2000人完成众筹，作者会在3个星期内推出高级学习课程。\n\n\u0020\u0020不同阶段众筹所需要的费用是不一样的，在前100人的初级阶段，您只需要 %1$s，中级阶段，您就需要 %2$s，在高级阶段，您需要 %3$s，众筹完成后如果你想参与学习，您需要支付至少 %4$s。\n\n\u0020\u0020您可以在任何一阶段参与众筹，之后您就有权利参与对应课程的学习。您可以阅读学习材料，练习编程，分享程序以及获得更多有趣的学习体验。如果你感兴趣这门课程，欢迎尽快参与。</string>
+    <string name="support_explanation">您的赞赏是我们持续写出好教材的驱动力</string>
+    <string name="rmb">¥ %s </string>
+    <string name="thank">致谢</string>
+    <string name="notebook_installed">启动QPyNotebook服务后，你可以从文件中打开后缀为.ipynb的文件了</string>
+    <string name="jupyter_not_release">请先安装并运行Jupyter</string>
+    <string name="jupyter_not_support">Jupyter暂时未支持Python 3</string>
+    <string name="aipy_install">安装AIPY</string>
+    <string name="aipy_installed">AIPY已安装</string>
+    <string name="install_aipy">启用AIPY</string>
+    <string name="install_notebook">安装 QPyNotebook</string>
+    <string name="support_us">支持我们</string>
+    <string name="start">开始</string>
+    <string name="buy_course">购买课程</string>
+    <string name="start_learn">开始学习</string>
+    <string name="entertainment">娱乐</string>
+    <string name="ennable_notebook_first">请先在设置中启用QPyNotebook</string>
+    <string name="funny">有趣</string>
+    <string name="c_funding">众筹中</string>
+    <string name="back_course">众筹该课程</string>
+    <string name="dialog_alert">提示</string>
+    <string name="conn_error">无法连接服务器</string>
+    <string name="jupyter_not_install"><![CDATA[请<font color="#4BAC07">安装基础库</font> ]]></string>
+    <string name="elementary">初级课程</string>
+    <string name="intermediate">中级课程</string>
+    <string name="advanced">高级课程</string>
+    <string name="goto_setting">去设置</string>
+    <string name="switch_py3_hint">编译器目前正在使用的是Python2, 是否切换成Python 3?</string>
+    <string name="browser">浏览器</string>
+    <string name="retry_hint">请重试</string>
+    <string name="unzip_pac_fail">解压失败</string>
+    <string name="open_py3">打开Python 3应用</string>
+    <string name="open_py3_hint">请先打开QPY3应用释放相关资源</string>
+    <string name="release_error">资源未释放</string>
+    <string name="open_app_market">从应用商店安装</string>
+    <string name="install_py3_hint">确认下载 Python 3 资源?</string>
+    <string name="py3_not_install">Python 3未安装</string>
+    <string name="pip_no_net">当前无网络, 无法打开pip</string>
+    <string name="no_google">无法连接Google</string>
+    <string name="history_emp">历史记录为空</string>
+    <string name="enter_history">历史记录</string>
+    <string name="switch_py3">切换到Python 3</string>
+    <string name="switch_py2">切换到Python 2</string>
+    <string name="update_py3"><![CDATA[安装 或 升级 Python 3 资源]]></string>
+
+    <string name="py3_now">目前使用Python 3</string>
+    <string name="py2_now">目前使用Python 2</string>
+    <string name="install_py3">安装Python 3</string>
+    <string name="file_new">文件</string>
+    <string name="run">运行</string>
+    <string name="install_kivy_first">请先从QPYPI中安装kivy库</string>
+    <string name="get_help">获得帮助</string>
+
+</resources>
diff --git a/qpython/src/main/res/values-zh-rCN/toasts.xml b/qpython/src/main/res/values-zh-rCN/toasts.xml
new file mode 100644
index 00000000..b4aa336d
--- /dev/null
+++ b/qpython/src/main/res/values-zh-rCN/toasts.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="toast_recent_files_invalid">文件不存在</string>
+    <string name="toast_recent_files_deleted">文件已经从最近编辑中移除</string>
+</resources>
\ No newline at end of file
diff --git a/qpython/src/main/res/values-zh-rTW/strings.xml b/qpython/src/main/res/values-zh-rTW/strings.xml
new file mode 100644
index 00000000..6677a532
--- /dev/null
+++ b/qpython/src/main/res/values-zh-rTW/strings.xml
@@ -0,0 +1,295 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Titles -->
+    <string name="title_editor">%1$s</string>
+    <string name="title_editor_dirty">%1$s *</string>
+    <string name="title_editor_readonly">[%1$s]</string>
+    <string name="title_settings">設置</string>
+    <!-- Config screen strings -->
+    <string name="config_cat_display">顯示</string>
+    <string name="config_title_line_numbers">顯示行號</string>
+    <string name="config_title_word_wrap">自動換行</string>
+    <string name="config_title_font">更改文本字體</string>
+    <string name="config_title_text_size">文字大小</string>
+    <string name="config_title_color_theme">顏色主題</string>
+    <string name="config_title_scroll_fling">快速滾動</string>
+    <string name="config_summary_line_numbers">在左側顯示的行號</string>
+    <string name="config_summary_word_wrap">如果某行對於屏幕太寬時，自動換行</string>
+    <string name="config_summary_scroll_fling">如果有性能問題，不要選中</string>
+    <!-- Options Menu in QEdit -->
+    <!-- Misc UI strings -->
+    <string name="ui_save_text">“你想保存文檔？\n任何未保存更改將丟失。”</string>
+    <string name="ui_save">保存</string>
+    <string name="ui_delete">刪除</string>
+    <string name="ui_no_save">不保存</string>
+    <string name="ui_cancel">取消</string>
+    <string namfe="ui_hint_file_name">文件名</string>
+    <string name="ui_hint_search">搜索</string>
+    <string name="ui_history">歷史</string>
+    <string name="ui_force_read_only">打開為只讀</string>
+    <string name="about_content">QEdit 是一個文本編輯器，針對Android平板電腦和手機，除了文本編輯，它可以使安卓上的Python/HTML 開發更方便和有趣。 </string>
+    <!-- Misc Strings -->
+    <string name="lorem_ipsum">“QEdit 是一個偉大的腳本編輯器”</string>
+    <string name="file_exists">文件已存在，請重命名</string>
+    <string name="video_src">視頻{0}</string>
+    <string name="play_video">播放</string>
+    <string name="no_videos_found">沒有發現影片在本頁面</string>
+    <string name="pls_install_a8_play">請首先安裝A8視頻播放器</string>
+    <string name="download_as">下載並保存為</string>
+    <string name="info_browser">QBrowser</string>
+    <!-- added by kyle -->
+    <string name="share">分享</string>
+    <string name="save_as_snippets">另存為片段</string>
+    <string name="info_snippets">片段</string>
+    <string name="save_as_snippets_1">片段已另存為： </string>
+    <string name="fail_to_insert">無法插入片段</string>
+    <string name="fail_to_goto">請輸入正確的號碼</string>
+    <string name="max_lines_num_with_syntax_title">自動高亮</string>
+    <string name="max_lines_num_with_syntax_summary">自動突出顯示，如果行數少於%s</string>
+    <string name="qedit_not_support">QEdit 僅僅支持預覽或執行以下類型的文件\n.py，.SH，.lua，html，.md。 </string>
+    <string name="pls_install_lua">請安裝QLua 運行LUA 腳本</string>
+    <string name="pls_install_qpy">請安裝QPython 運行python 腳本</string>
+    <string name="ui_ok">OK</string>
+    <string name="ui_contact_title">聯繫</string>
+    <string name="ui_licence_title">授權</string>
+    <string name="ui_mail">support@quseit.com</string>
+    <string name="ui_choose_mail">打開郵件… </string>
+    <string name="ui_market_url">http://quseit.com"</string>
+    <string name="ui_market_app_url">"https://play.google.com/store/apps/details?id=%s"</string>
+    <string name="ui_market">“看看我們的其他應用程序”</string>
+    <string name="ui_app_rating">“評價我們的應用程序\n留下您的反饋”</string>
+    <string name="ui_feedback">“請隨時聯繫我們不管是反饋，功能要求或錯誤報告等。”</string>
+    <string name="ui_licence_content">“本軟件提供“原樣”,無任何明示或暗示的保證。不管在任何情況下，筆者應該對因使用本軟件所引起的任何損失負責。”</string>
+    <string name="ui_art_licence_title">設計授權</string>
+    <string name="ui_art_licence_content">“創建所有的圖標為這個應用程序，並屬於該應用程序的作者： QPython."</string>
+    <string name="ui_whats_new">“有什麼新聞？”</string>
+    <string name="addshortcut_arguments_label">添加到字典</string>
+    <string name="alt_sends_esc">Ale 鍵發送 ESC</string>
+    <string name="alt_sends_esc_summary_off">關閉Alt 鍵發送 ESC</string>
+    <string name="alt_sends_esc_summary_on">使用Alt 鍵發送ESC</string>
+    <string name="application_terminal">終端模擬器</string>
+    <string name="choose_ttf">選擇字體文件(.ttf)</string>
+    <string name="close_window">關閉終端</string>
+    <string name="use_keyboard_shortcuts_summary_off">禁用鍵盤快捷鍵</string>
+    <string name="toggle_soft_keyboard">打開/關閉軟鍵盤</string>
+    <string name="toast_plugin_uninstall_complete">插件刪除成功</string>
+    <string name="toast_plugin_install_failure">插件安裝失敗</string>
+    <string name="toast_plugin_install_complete">插件安裝完成</string>
+    <string name="title_verify_path_preference">驗證PATH路徑</string>
+    <string name="title_utf8_by_default_preference">默認 UTF-8</string>
+    <string name="title_termtype_preference">終端類型</string>
+    <string name="title_statusbar_preference">狀態欄</string>
+    <string name="title_shell_preference">命令行</string>
+    <string name="title_select_plugin">選擇插件</string>
+    <string name="title_plugin_manage">插件管理</string>
+    <string name="title_orientation_preference">屏幕方位</string>
+    <string name="title_mouse_tracking_preference">發送鼠標事件</string>
+    <string name="title_initialcommand_preference">初始命令</string>
+    <string name="title_ime_preference">輸入方式</string>
+    <string name="title_home_path_preference">HOME 文件夾</string>
+    <string name="title_fontsize_preference">文本大小</string>
+    <string name="title_fnkey_preference">Fn 鍵</string>
+    <string name="title_do_path_extensions_preference">允許PATH後擴</string>
+    <string name="title_controlkey_preference">Ctrl 鍵</string>
+    <string name="title_color_preference">顏色</string>
+    <string name="title_close_window_on_process_exit_preference">退出時關閉終端</string>
+    <string name="title_backaction_preference">返回鍵行爲</string>
+    <string name="title_allow_prepend_path_preference">允許PATH前置</string>
+    <string name="title_actionbar_preference">操作欄</string>
+    <string name="text_preferences">文本</string>
+    <string name="terminal">終端</string>
+    <string name="summary_verify_path_preference">是否將PATH中無效d路徑清除</string>
+    <string name="summary_utf8_by_default_preference">是否將UTF-8模式設爲默認</string>
+    <string name="summary_termtype_preference">設置 Shell 的終端類型</string>
+    <string name="summary_statusbar_preference">顯示/隱藏狀態欄</string>
+    <string name="summary_shell_preference">指定命令行使用的 Shell</string>
+    <string name="summary_orientation_preference">選擇屏幕方位行爲</string>
+    <string name="read_only">只讀模式</string>
+    <string name="file">文件</string>
+    <string name="yes">是</string>
+    <string name="no">否</string>
+    <string name="ok">確定</string>
+    <string name="close">關閉</string>
+    <string name="no_change">沒有任何改變</string>
+    <string name="feedback">意見反饋</string>
+    <string name="about">關於</string>
+    <string name="file_not_exists">文件不存在</string>
+    m
+    <string name="enable_root">啟用Root權限</string>
+    <string name="send">發送</string>
+    <string name="no_camera">沒有發現可用的攝像頭，請查看是否開啟攝像頭權限</string>
+    <string name="no_storage">沒有文件讀取權限</string>
+
+
+    <string name="pref_initialcommand_default_qpython">python</string>
+    <string name="qpy_app">QPY</string>
+    <string name="local_app">本機應用</string>
+    <string name="root_mode">Root模式</string>
+    <string name="star_it">點評</string>
+    <string name="disable_root">已禁用</string>
+    <string name="http_qpypi_qpython_org">https://pypi.python.org/simple/</string>
+    <string name="add">添加</string>
+    <string name="sl4a_running">SL4A服務運行中</string>
+    <string name="service_toggle">服務開關</string>
+    <string name="qpy_description">QPython is a script engine running on android devices like phone or tablet.QPython is a script engine running on android devices like phone or tablet.</string>
+    <string name="warning">警告</string>
+    <string name="reset_warning">重置空間將刪除所有在/qpython下的文件,包括您新建的文件,確定重置嗎?</string>
+    <string name="downloading">庫文件</string>
+    <string name="save">保存</string>
+    <string name="save_as">另存為</string>
+    <string name="open">打開</string>
+    <string name="file_name">File Name</string>
+    <string name="empty_file">空白文件</string>
+    <string name="confirm">確定</string>
+    <string name="cancel">取消</string>
+    <string name="new_project">新建項目</string>
+    <string name="error_dont_kn">發生了某些錯誤</string>
+    <string name="project_name">項目名</string>
+    <string name="jump_to">轉至某行</string>
+    <string name="explorer">文件夾</string>
+    <string name="new_script">新建腳本</string>
+    <string name="enter_name_hint">請輸入文件名</string>
+
+    <string name="paste">粘貼</string>
+    <string name="download_fail">下載失敗</string>
+    <string name="activity_shortcut_create">終端快捷方式</string>
+    <string name="activity_term_here_title">在此處運行終端</string>
+    <string name="addshortcut_button_find_command">查找命令</string>
+    <string name="addshortcut_button_text_icon">文字圖標</string>
+    <string name="addshortcut_command_hint">命令</string>
+    <string name="addshortcut_example_hint">--示例=\"\"a\"</string>
+    <string name="addshortcut_make_text_icon">製作文字圖標</string>
+    <string name="addshortcut_navigator_title">選擇快捷方式文件</string>
+    <string name="addshortcut_shortcut_label">快捷方式標籤</string>
+    <string name="addshortcut_title">終端快捷方式</string>
+    <string name="colorvalue_icon_text_entry_hint">輸入標籤文字</string>
+    <string name="colorvalue_label_lock_button_column">鎖</string>
+    <string name="control_key_dialog_control_disabled_text">Crtl 鍵未設置</string>
+    <string name="control_key_dialog_fn_disabled_text">Fn 鍵未設置</string>
+    <string name="control_key_dialog_title">Ctrl 和 Fn 鍵</string>
+    <string name="copy_all">複製全部</string>
+    <string name="dialog_plugin_detail_positive">確定</string>
+    <string name="dialog_title_actionbar_preference">操作欄行爲</string>
+    <string name="dialog_title_backaction_preference">返回鍵行爲</string>
+    <string name="dialog_title_color_preference">文字顏色</string>
+    <string name="dialog_title_controlkey_preference">Ctrl 鍵</string>
+    <string name="dialog_title_fnkey_preference">Fn 鍵</string>
+    <string name="dialog_title_fontsize_preference">文字大小</string>
+    <string name="dialog_title_ime_preference">輸入方式</string>
+    <string name="dialog_title_initialcommand_preference">初始化命令</string>
+    <string name="dialog_title_orientation_preference">屏幕方向事件</string>
+    <string name="dialog_title_project">項目</string>
+    <string name="dialog_title_script">腳本</string>
+    <string name="dialog_title_shell_preference">Shell</string>
+    <string name="dialog_title_statusbar_preference">狀態欄</string>
+    <string name="dialog_title_termtype_preference">終端類型</string>
+    <string name="disable_wakelock">禁用弱鎖</string>
+    <string name="disable_wifilock">禁用Wifi 鎖</string>
+    <string name="edit_text">編輯文字</string>
+    <string name="editor">編輯器</string>
+    <string name="email_transcript_chooser_title">反饋 ...</string>
+    <string name="email_transcript_no_email_activity_found">找不到郵件實例發送</string>
+    <string name="email_transcript_subject">複製終端</string>
+    <string name="enable_wakelock">啓用Root模式</string>
+    <string name="enable_wifilock">啓用Wifi 鎖</string>
+    <string name="fsnavigator_change_theme">選擇主題</string>
+    <string name="fsnavigator_no_external_storage">內存無法訪問</string>
+    <string name="fsnavigator_optional_enter_path">或在此輸入mPath</string>
+    <string name="fsnavigator_title">文件選擇器</string>
+    <string name="ftp_server">FTP服務</string>
+    <string name="help">幫助</string>
+    <string name="help_url">http://jackpal.github.com/Android-Terminal-Emulator/help/index.html</string>
+    <string name="internal_space"><![CDATA[許可權 & 存儲]]></string>
+    <string name="keyboard_preferences">鍵盤</string>
+    <string name="location">位置</string>
+    <string name="more">更多</string>
+    <string name="new_window">打開新終端</string>
+    <string name="already_newest">當前已是最新版本</string>
+    <string name="extra_pypi">設置PYPI</string>
+
+    <string name="checking_update">檢查更新</string>
+    <string name="confirm_window_close_message">確定要關閉終端嗎？</string>
+    <string name="convert_fail">轉換失敗</string>
+    <string name="course">課程</string>
+    <string name="date_format">[ %s ]</string>
+    <string name="delete_fail">刪除失敗</string>
+    <string name="delete_file_hint">確定要刪除該文件嗎？</string>
+    <string name="dir_not_valid">該目錄不可用</string>
+    <string name="download_apk">下載最新安裝包</string>
+    <string name="download_apk_hint">下載可能會消耗運營商流量，確認下載嗎？</string>
+    <string name="downloading_new_apk">下載新的包</string>
+    <string name="fail_open_file">無法打開，該文件不存在</string>
+    <string name="featured_courses">課程中心</string>
+    <string name="folder_name">文件夾名</string>
+    <string name="get_setting_data_fail">獲取設置信息失敗</string>
+    <string name="key_about">關於</string>
+    <string name="key_ftp_pwd">密碼</string>
+    <string name="key_ftp_state">運行狀態</string>
+    <string name="key_port_num">端口號</string>
+    <string name="key_reset">重置內存空間</string>
+    <string name="key_root_dir">根目錄</string>
+    <string name="key_show_pwd">顯示密碼</string>
+    <string name="key_stay_awake">保持喚醒</string>
+    <string name="key_username">用戶名</string>
+    <string name="new_folder">新建文件夾</string>
+    <string name="not_root_yet">該設備未進入Root模式</string>
+    <string name="open_gl2_is_not_supported">當前設備不支持OpenGL2</string>
+    <string name="plugin_detail">詳情</string>
+    <string name="plugin_install">安裝</string>
+    <string name="plugin_uninstall">卸載</string>
+    <string name="plugin_update">更新</string>
+    <string name="pref_termtype_default">屏幕</string>
+    <string name="process_exit_message">會話已結束</string>
+    <string name="programs">程序</string>
+    <string name="project">項目</string>
+    <string name="recent">最近</string>
+    <string name="rename">重命名</string>
+    <string name="rename_fail">重命名失敗</string>
+    <string name="reset">重置Terminal</string>
+    <string name="reset_toast_notification">當前狀態將被重置</string>
+    <string name="run_bg_title">在後臺運行</string>
+    <string name="run_dirty_hint">保存當前修改嗎？</string>
+    <string name="runtime_log">運行日誌 : %s</string>
+    <string name="log_title">運行日誌</string>
+
+    <string name="scan">二維碼</string>
+    <string name="read_script_from_qrcode">從二維碼中讀取代碼</string>
+
+    <string name="screen_preferences">屏幕</string>
+    <string name="script">腳本</string>
+    <string name="select_text">選擇文字</string>
+    <string name="send_email">發送郵件至…</string>
+    <string name="setting">設置</string>
+    <string name="sl4a_server">SL4A服務</string>
+    <string name="sl4a_un_running">SL4A服務未啓動</string>
+    <string name="special_keys">特殊鍵</string>
+    <string name="task">Task</string>
+    <string name="title_use_keyboard_shortcuts">使用鍵盤快捷鍵</string>
+    <string name="unable_extract">解壓python文件失敗，可能影響部分功能使用</string>
+    <string name="untitled_folder">未命名文件夾</string>
+    <string name="window_list">終端列表</string>
+    <string name="window_title">終端 %1$d</string>
+    <string name="file_exist_hint">文件已存在，請重命名</string>
+    <string name="community">社區</string>
+    <string name="terminal_bg_hint">在後臺運行此控制臺？</string>
+    <string name="preferences">偏好</string>
+    <string name="crowdfunding">衆籌中%d%%</string>
+    <string name="support">支持</string>
+    <string name="my">我的</string>
+    <string name="course_introduction">課程簡介</string>
+    <string name="show">展開</string>
+    <string name="course_content">課程內容</string>
+    <string name="elementary">初級課程</string>
+    <string name="intermediate">中級課程</string>
+    <string name="advanced">高級課程</string>
+    <string name="about_the_author">作者簡介</string>
+    <string name="support_count">已有%s人支持</string>
+    <string name="free">學習</string>
+    <string name="hide">收起</string>
+    <string name="author">作者</string>
+    <string name="from_content">評論&amp;提問</string>
+    <string name="funding">衆籌</string>
+    <string name="c_funding">衆籌中</string>
+    <string name="get_help">獲得幫助</string>
+
+</resources>
\ No newline at end of file
diff --git a/qpython/src/main/res/values-zh-rTW/toasts.xml b/qpython/src/main/res/values-zh-rTW/toasts.xml
new file mode 100644
index 00000000..f937668a
--- /dev/null
+++ b/qpython/src/main/res/values-zh-rTW/toasts.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="toast_recent_files_invalid">文件不存在</string>
+<string name="toast_recent_files_deleted">文件已經從最近編輯中移除</string>
+</resources>
diff --git a/qpython/src/main/res/values/arrays.xml b/qpython/src/main/res/values/arrays.xml
index 9ca359ed..c24b108a 100644
--- a/qpython/src/main/res/values/arrays.xml
+++ b/qpython/src/main/res/values/arrays.xml
@@ -16,111 +16,94 @@
 
 <resources>
     <string-array name="entries_statusbar_preference">
-        <item>显示状态栏</item>
-        <item>隐藏状态栏</item>
+        <item>Show Status bar</item>
+        <item>Hide Status bar</item>
     </string-array>
 
     <string-array name="entries_actionbar_preference">
         <!-- <item>Action bar disabled</item> -->
-        <item>显示操作栏</item>
-        <item>隐藏操作栏 (点击屏幕上方或按菜单键显示)</item>
+        <item>Show Action Bar</item>
+        <item>Hide Action Bar(Click screen top or menu button to reshow)</item>
     </string-array>
 
     <string-array name="entries_orientation_preference">
-        <item>自动</item>
-        <item>横屏</item>
-        <item>竖屏</item>
-    </string-array>
-
-    <string-array name="entries_cursorblink_preference">
-        <item>非闪烁光标</item>
-        <item>闪烁光标</item>
-    </string-array>
-
-    <string-array name="entries_cursorstyle_preference">
-        <item>方块</item>
-        <item>下划线</item>
-        <item>竖线</item>
+        <item>Automate</item>
+        <item>Horizontal</item>
+        <item>Vertical</item>
     </string-array>
 
     <string-array name="entries_fontsize_preference">
-        <item>4 x 8 像素</item>
-        <item>6 磅</item>
-        <item>7 磅</item>
-        <item>8 磅</item>
-        <item>9 磅</item>
-        <item>10 磅</item>
-        <item>12 磅</item>
-        <item>14 磅</item>
-        <item>16 磅</item>
-        <item>20 磅</item>
-        <item>24 磅</item>
-        <item>28 磅</item>
-        <item>32 磅</item>
-        <item>36 磅</item>
-        <item>42 磅</item>
-        <item>48 磅</item>
-        <item>64 磅</item>
-        <item>72 磅</item>
-        <item>96 磅</item>
-        <item>144 磅</item>
-        <item>288 磅</item>
+        <item>4 x 8 Pixel</item>
+        <item>6 point type</item>
+        <item>7 point type</item>
+        <item>8 point type</item>
+        <item>9 point type</item>
+        <item>10 point type</item>
+        <item>12 point type</item>
+        <item>14 point type</item>
+        <item>16 point type</item>
+        <item>20 point type</item>
+        <item>24 point type</item>
+        <item>28 point type</item>
+        <item>32 point type</item>
+        <item>36 point type</item>
+        <item>42 point type</item>
+        <item>48 point type</item>
+        <item>64 point type</item>
+        <item>72 point type</item>
+        <item>96 point type</item>
+        <item>144 point type</item>
+        <item>288 point type</item>
     </string-array>
 
     <string-array name="entries_color_preference">
-        <item>白底黑字</item>
-        <item>黑底白字</item>
-        <item>蓝底白字</item>
-        <item>黑底绿字</item>
-        <item>黑底黄字</item>
-        <item>黑底红字</item>
-        <item>Holo 风格</item>
-        <item>爆光过度</item>
-        <item>爆光不足</item>
-        <item>Linux 终端</item>
+        <item>Black character on white background</item>
+        <item>White character on black background</item>
+        <item>White character on blue background</item>
+        <item>Green character on black background</item>
+        <item>Yellow character on black background</item>
+        <item>Red character on black background</item>
+        <item>Holo style</item>
+        <item>over-exposed</item>
+        <item>lack-exposed</item>
+        <item>Linux style</item>
     </string-array>
 
     <string-array name="entries_backaction_preference">
-        <item>关闭所有窗口</item>
-        <item>关闭当前窗口</item>
-        <item>关闭当前实例，保留正在运行的会话</item>
-        <item>给终端发送 ESC</item>
-        <item>给终端发送 TAB</item>
+        <item>Close all windows</item>
+        <item>Close current window</item>
+        <item>Close current window,but keep running sessions</item>
+        <item>Send ESC to Terminal</item>
+        <item>Send TAB to Terminal</item>
     </string-array>
 
     <string-array name="entries_controlkey_preference">
-        <item>轨迹球</item>
-        <item>\@ 键</item>
-        <item>左 Alt 键</item>
-        <item>右 Alt 键</item>
-        <item>提升音量键</item>
-        <item>降低音量键</item>
-        <item>相机快门键</item>
-        <item>无</item>
+        <item>Ball</item>
+        <item>\@</item>
+        <item>Left-Alt</item>
+        <item>Right-Alt</item>
+        <item>Vol-Up</item>
+        <item>Vol-Dn</item>
+        <item>Camera</item>
+        <item>None</item>
     </string-array>
 
     <string-array name="entries_fnkey_preference">
-        <item>轨迹球</item>
-        <item>\@ 键</item>
-        <item>左 Alt 键</item>
-        <item>右 Alt 键</item>
-        <item>提升音量键</item>
-        <item>降低音量键</item>
-        <item>相机快门键</item>
-        <item>无</item>
+        <item>Ball</item>
+        <item>\@</item>
+        <item>Left-Alt</item>
+        <item>Right-Alt</item>
+        <item>Vol-Up</item>
+        <item>Vol-Dn</item>
+        <item>Camera</item>
+        <item>None</item>
     </string-array>
 
     <string-array name="entries_ime_preference">
-        <item>字本</item>
-        <item>词本</item>
+        <item>Character</item>
+        <item>Word</item>
     </string-array>
 
-    <string name="list_select">
-        <item>在编辑器中打开</item>
-        <item>在.....打开</item>
-         <item>重新扫描</item>
-    </string>
-
 
     <!-- These are the 'short' names for the control keys. They are used in the special keys dialog. -->
     <string-array name="control_keys_short_names">
@@ -146,14 +129,185 @@
         <item>None</item>
     </string-array>
 
-    <string-array name="screen_orientation_values" translatable="false">
-        <item>auto</item>
-        <item>landscape</item>
-        <item>portrait</item>
+
+    <!-- Color themes -->
+
+
+    <string-array name="color_theme_names">
+        <item>Classic</item>
+        <item>Negative</item>
+        <item>Matrix</item>
+        <item>Sky</item>
+        <item>Dracula</item>
+    </string-array>
+    <string-array name="color_theme_values">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+    </string-array>
+
+    <!-- Text size -->
+    <string-array name="text_size_names">
+        <item>6 pt</item>
+        <item>8 pt</item>
+        <item>10 pt</item>
+        <item>12 pt</item>
+        <item>14 pt</item>
+        <item>16 pt</item>
+        <item>18 pt</item>
+        <item>24 pt</item>
+        <item>32 pt</item>
+        <item>48 pt</item>
+    </string-array>
+    <string-array name="text_size_values">
+        <item>6</item>
+        <item>8</item>
+        <item>10</item>
+        <item>12</item>
+        <item>14</item>
+        <item>16</item>
+        <item>18</item>
+        <item>24</item>
+        <item>32</item>
+        <item>48</item>
+    </string-array>
+
+    <!-- End of lines -->
+
+    <!-- Recent files -->
+
+    <!-- Recent files -->
+
+    <!-- Encoding -->
+
+    <string-array name="max_lines_num_with_syntax_values">
+        <item>100</item>
+        <item>300</item>
+        <item>600</item>
+        <item>1000</item>
+        <item>2000</item>
+    </string-array>
+
+    <string-array name="sku" translatable="false">
+        <item>course_0.99</item>
+        <item>course_1.99</item>
+        <item>course_2.99</item>
+        <item>course_3.99</item>
+        <item>course_4.99</item>
+    </string-array>
+
+    <string-array name="crowdfunding">
+        <item>crowdfunding_5.99</item>
+        <item>crowdfunding_7.99</item>
+        <item>crowdfunding_9.99</item>
+        <item>crowdfunding15.99</item>
+    </string-array>
+
+    <string-array name="support_file_ext" translatable="false">
+        <item>py</item>
+        <item>txt</item>
+        <item>kv</item>
+        <item>html</item>
+        <item>htm</item>
+        <item>js</item>
+        <item>css</item>
+        <item>less</item>
+        <item>vue</item>
+        <item>ini</item>
+        <item>md</item>
+        <item>pyx</item>
+        <item>png</item>
+        <item>jpg</item>
+        <item>ipynb</item>
+    </string-array>
+
+    <string-array name="text_ext" translatable="false">
+        <item>py</item>
+        <item>txt</item>
+        <item>kv</item>
+        <item>html</item>
+        <item>htm</item>
+        <item>js</item>
+        <item>css</item>
+        <item>md</item>
+        <item>pyx</item>
+        <item>log</item>
+        <item>c</item>
+        <item>h</item>
+
+    </string-array>
+
+    <string-array name="syntax_ext" translatable="false">
+        <item>css</item>
+        <item>html</item>
+        <item>htm</item>
+        <item>js</item>
+        <item>json</item>
+        <item>py</item>
+        <item>xml</item>
+        <item>log</item>
+        <item>kv</item>
+        <item>pyx</item>
+        <item>pxd</item>
+    </string-array>
+
+    <string-array name="qpy2compatible_zip" translatable="false">
+        <item>private21.mp3</item>
+        <item>private22.mp3</item>
+        <item>private23.mp3</item>
     </string-array>
 
-    <string-array name="file_explorer_tab">
-        <item>脚本</item>
-        <item>项目</item>
+
+    <string-array name="qpy3_zip" translatable="false">
+        <item>private31.mp3</item>
+        <item>private32.mp3</item>
+        <item>private33.mp3</item>
+    </string-array>
+
+    <string-array name="funding_count_divider" translatable="false">
+        <item>100</item>
+        <item>500</item>
+        <item>2000</item>
+    </string-array>
+
+    <string-array name="funding_price">
+        <item>5.99</item>
+        <item>7.99</item>
+        <item>9.99</item>
+        <item>15.99</item>
+    </string-array>
+
+     <!--CN Only-->
+    <string-array name="wechat_funding_price">
+        <item>36</item>
+        <item>48</item>
+        <item>60</item>
+        <item>96</item>
+    </string-array>
+
+    <string-array name="funding_stage">
+        <item>Elementary</item>
+        <item>Intermediate</item>
+        <item>Advanced</item>
+    </string-array>
+
+    <string-array name="time_label">
+        <item> month ago</item>
+        <item> days ago</item>
+        <item> hours ago</item>
+        <item> minutes ago</item>
+        <item> secs ago</item>
+    </string-array>
+
+
+    <string-array name="switch_py_inters_val">
+        <item>0</item>
+        <item>1</item>
+    </string-array>
+    <string-array name="switch_py_inters">
+        <item>Switch to Python 3</item>
+        <item>Switch to Python 2</item>
     </string-array>
-</resources>
+</resources>
\ No newline at end of file
diff --git a/qpython/src/main/res/values/arraysNoLocalize.xml b/qpython/src/main/res/values/arraysNoLocalize.xml
index dc75c7da..6ffc5cdb 100644
--- a/qpython/src/main/res/values/arraysNoLocalize.xml
+++ b/qpython/src/main/res/values/arraysNoLocalize.xml
@@ -34,17 +34,6 @@
         <item>2</item>
     </string-array>
 
-    <string-array name="entryvalues_cursorblink_preference">
-        <item>0</item>
-        <item>1</item>
-    </string-array>
-
-    <string-array name="entryvalues_cursorstyle_preference">
-        <item>0</item>
-        <item>1</item>
-        <item>2</item>
-    </string-array>
-
     <!-- Note: Must also modify the maximum allowed editor_preference value in TermSettings.readPrefs -->
     <string-array name="entryvalues_fontsize_preference">
         <item>0</item>
diff --git a/qpython/src/main/res/values/attrs.xml b/qpython/src/main/res/values/attrs.xml
index 8ee15d12..89100483 100644
--- a/qpython/src/main/res/values/attrs.xml
+++ b/qpython/src/main/res/values/attrs.xml
@@ -1,16 +1,80 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <declare-styleable name="PagerSlidingTabStrip">
-        <attr name="pstsIndicatorColor" format="color" />
-        <attr name="pstsUnderlineColor" format="color" />
-        <attr name="pstsDividerColor" format="color" />
-        <attr name="pstsIndicatorHeight" format="dimension" />
-        <attr name="pstsUnderlineHeight" format="dimension" />
-        <attr name="pstsDividerPadding" format="dimension" />
-        <attr name="pstsTabPaddingLeftRight" format="dimension" />
-        <attr name="pstsScrollOffset" format="dimension" />
-        <attr name="pstsTabBackground" format="reference" />
-        <attr name="pstsShouldExpand" format="boolean" />
-        <attr name="pstsTextAllCaps" format="boolean" />
+        <attr name="pstsIndicatorColor" format="color"/>
+        <attr name="pstsUnderlineColor" format="color"/>
+        <attr name="pstsDividerColor" format="color"/>
+        <attr name="pstsIndicatorHeight" format="dimension"/>
+        <attr name="pstsUnderlineHeight" format="dimension"/>
+        <attr name="pstsDividerPadding" format="dimension"/>
+        <attr name="pstsTabPaddingLeftRight" format="dimension"/>
+        <attr name="pstsScrollOffset" format="dimension"/>
+        <attr name="pstsTabBackground" format="reference"/>
+        <attr name="pstsShouldExpand" format="boolean"/>
+        <attr name="pstsTextAllCaps" format="boolean"/>
+    </declare-styleable>
+
+    <declare-styleable name="ToggleView">
+        <attr name="sb_shadow_radius" format="reference|dimension"/>
+        <attr name="sb_shadow_offset" format="reference|dimension"/>
+        <attr name="sb_shadow_color" format="reference|color"/>
+        <attr name="sb_uncheck_color" format="reference|color"/>
+        <attr name="sb_checked_color" format="reference|color"/>
+
+        <attr name="sb_border_width" format="reference|dimension"/>
+        <attr name="sb_checkline_color" format="reference|color"/>
+        <attr name="sb_checkline_width" format="reference|dimension"/>
+        <attr name="sb_uncheckcircle_color" format="reference|color"/>
+        <attr name="sb_uncheckcircle_width" format="reference|dimension"/>
+        <attr name="sb_uncheckcircle_radius" format="reference|dimension"/>
+
+        <attr name="sb_checked" format="reference|boolean"/>
+        <attr name="sb_shadow_effect" format="reference|boolean"/>
+        <attr name="sb_effect_duration" format="reference|integer"/>
+        <attr name="sb_button_color" format="reference|color"/>
+        <attr name="sb_show_indicator" format="reference|boolean"/>
+        <attr name="sb_background" format="reference|color"/>
+        <attr name="sb_enable_effect" format="reference|boolean"/>
+    </declare-styleable>
+
+    <declare-styleable name="ScheduleView">
+        <attr name="dot_count" format="reference|integer"/>
+        <attr name="light_color" format="reference|color"/>
+        <attr name="dim_color" format="reference|color"/>
+        <attr name="dot_radius" format="reference|dimension"/>
+        <attr name="line_width" format="reference|dimension"/>
+        <attr name="margin" format="reference|dimension"/>
+        <attr name="text_size" format="reference|dimension"/>
+    </declare-styleable>
+
+    <declare-styleable name="PercentView">
+        <attr name="pv_light_color" format="reference|color"/>
+        <attr name="pv_dim_color" format="reference|color"/>
+        <attr name="pv_width" format="reference|dimension"/>
+        <attr name="pv_text_size" format="reference|dimension"/>
+    </declare-styleable>
+
+    <declare-styleable name="expandableLayout">
+        <attr name="ael_duration" format="integer" />
+        <attr name="ael_expanded" format="boolean" />
+        <attr name="ael_defaultChildIndex" format="integer" />
+        <attr name="ael_defaultPosition" format="dimension" />
+        <attr name="ael_orientation" format="enum">
+            <enum name="horizontal" value="0" />
+            <enum name="vertical" value="1" />
+        </attr>
+        <attr name="ael_interpolator" format="enum">
+            <enum name="accelerateDecelerate" value="0" />
+            <enum name="accelerate" value="1" />
+            <enum name="anticipate" value="2" />
+            <enum name="anticipateOvershoot" value="3" />
+            <enum name="bounce" value="4" />
+            <enum name="decelerate" value="5" />
+            <enum name="fastOutLinearIn" value="6" />
+            <enum name="fastOutSlowIn" value="7" />
+            <enum name="linear" value="8" />
+            <enum name="linearOutSlowIn" value="9" />
+            <enum name="overshoot" value="10" />
+        </attr>
     </declare-styleable>
 </resources>
\ No newline at end of file
diff --git a/qpython/src/main/res/values/colors.xml b/qpython/src/main/res/values/colors.xml
index 3fdd9bf3..2516e6f8 100644
--- a/qpython/src/main/res/values/colors.xml
+++ b/qpython/src/main/res/values/colors.xml
@@ -1,27 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="colorPrimary">#313131</color>
-    <color name="colorPrimaryDark">#313131</color>
-    <color name="colorAccent">#FF4081</color>
-    <color name="white">#ffffff</color>
-    <color name="gray">#FF707070</color>
-
+    <color name="colorPrimary">#FF4A4A4A</color>
+    <color name="colorPrimaryDark">#FF363636</color>
+    <color name="colorAccent">#FF4BAC07</color>
+    <color name="theme_yellow">#ECCD00</color>
+    <color name="theme_bg">#FF4A4A4A</color>
+    <color name="theme_gray">#c5c5c5</color>
+    <!--<color name="white">#ffffff</color>-->
 
+    <color name="error">#D2483D</color>
+    <color name="Color_White">#FFF</color>
     <color name="ripple_normal">#CACCCB</color>
-    <color name="ripple_dark">#B0B2B1</color>
-    <color name="divider_light">#e0e0e0</color>
     <color name="text_dark">#333333</color>
 
-    <color name="background_grey">#efeff4</color>
-    <color name="divider">#e3e3e8</color>
-
 
-    <color name="scrollbar_track">#85cccccc</color>
-    <color name="colorControlHighlight">@color/ripple_material_light</color>
     <color name="ripple_material_light">#40000000</color>
-    <color name="tool_layout_bg">#F4F4F4</color>
-    <color name="main_menu_bg">#f0f2f5f8</color>
 
-    <color name="gary">#30ac93</color>
-    <color name="editor_accent">#009688</color>
+    <color name="topbar">#1f1f1f</color>
+    <color name="divide_line">#FFE4E4E4</color>
+    <color name="link">#FF0066CC</color>
+    <!--<color name="divider">#fef8ec</color>-->
+
+    <color name="cmain3">#c8c800</color>
+
+    <color name="cmain8">#2eb3e4</color>
+
+    <color name="cwhite">#ffffff</color>
+    <color name="cwhite3">#fbfbfb</color>
+
+    <color name="cgrey6">#e8e8e8</color>
+    \
+
+    <color name="white">#ffffff</color>
+    <color name="black">#000000</color>
 </resources>
diff --git a/qpython/src/main/res/values/defaults.xml b/qpython/src/main/res/values/defaults.xml
index f9407720..fa95f180 100644
--- a/qpython/src/main/res/values/defaults.xml
+++ b/qpython/src/main/res/values/defaults.xml
@@ -6,9 +6,9 @@
     <integer name="pref_orientation_default">0</integer>
     <string name="pref_cursorstyle_default" translatable="false">0</string>
     <string name="pref_cursorblink_default" translatable="false">0</string>
-    <string name="pref_fontsize_default" translatable="false">10</string>
+    <string name="pref_fontsize_default" translatable="false">14</string>
     <string name="pref_color_default" translatable="false">1</string>
-    <bool name="pref_utf8_by_default_default">false</bool>
+    <bool name="pref_utf8_by_default_default">true</bool>
     <string name="pref_backaction_default" translatable="false">2</string>
     <string name="pref_controlkey_default" translatable="false">5</string>
     <string name="pref_fnkey_default" translatable="false">4</string>
@@ -16,7 +16,7 @@
     <bool name="pref_alt_sends_esc_default">false</bool>
     <string name="pref_shell_default" translatable="false">/system/bin/sh -</string>
     <string name="pref_initialcommand_default" translatable="false"></string>
-    <string name="pref_termtype_default" translatable="false">screen</string>
+    <string name="pref_termtype_default" >screen</string>
     <bool name="pref_close_window_on_process_exit_default">true</bool>
     <bool name="pref_verify_path_default">true</bool>
     <bool name="pref_do_path_extensions_default">true</bool>
diff --git a/qpython/src/main/res/values/dimens.xml b/qpython/src/main/res/values/dimens.xml
index d164b3b9..54cc8de3 100644
--- a/qpython/src/main/res/values/dimens.xml
+++ b/qpython/src/main/res/values/dimens.xml
@@ -3,15 +3,19 @@
     <dimen name="activity_horizontal_margin">16dp</dimen>
     <dimen name="activity_vertical_margin">16dp</dimen>
 
-    <dimen name="nav_header_vertical_spacing">16dp</dimen>
-    <dimen name="nav_header_img_size">66dp</dimen>
 
+    <dimen name="layout_padding">16dp</dimen>
+    <dimen name="icon_margin_top">5dp</dimen>
+    <!--<dimen name="default_margin">16dp</dimen>-->
+    <dimen name="icon_size">60dp</dimen>
 
-    <dimen name="main_logo_img_size">200dp</dimen>
-    <dimen name="main_icon_size">54dp</dimen>
-    <dimen name="main_icon_margin_top">10dp</dimen>
+    
+    <dimen name="dialog_buttons_margin">16dp</dimen>
 
+    <dimen name="widget_margin">4dp</dimen>
 
-    <dimen name="divider_height">0.5dp</dimen>
-    <dimen name="tab_text_size">9sp</dimen>
+    <dimen name="list_item_height">45dp</dimen>
+    <dimen name="default_margin">16dp</dimen>
+    <dimen name="course_gap">6dp</dimen>
+    <dimen name="shortcut_height">45dp</dimen>
 </resources>
diff --git a/qpython/src/main/res/values/history.xml b/qpython/src/main/res/values/history.xml
new file mode 100644
index 00000000..0b4b4892
--- /dev/null
+++ b/qpython/src/main/res/values/history.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- EN -->
+    <!--  -->
+    <string name="release18" translatable="false">1.8 (10 nov 2012)</string>
+    <string name="release18_log" translatable="false">"- Bug fixed : current file / last loaded file
+- Updated notification system
+- Possibility to modify the text font used by the editor (You can use any ttf font located on your device's internal and/or external storage)"</string>
+
+    <!--  -->
+    <string name="release17" translatable="false">1.7 (16 july 2012)</string>
+    <string name="release17_log" translatable="false">"- Bug fixed : Save/Save As crash on some phone
+- Added option to disable autosave on existing files"</string>
+
+    <!--  -->
+    <string name="release16" translatable="false">1.6 (9 july 2012)</string>
+    <string name="release16_log" translatable="false">"- Added the Auto Save feature
+- fixed the bug with Search case "</string>
+
+    <!--  -->
+    <string name="release15" translatable="false">1.5 (21 june 2012)</string>
+    <string name="release15_log" translatable="false">"- Adapted for Ice Cream Sandwich
+- Improved the Undo option (bugs with suggestions) 
+- Added a Home Screen Widgets (shortcut to favorite files)
+- Added option to open a file by default when starting Ted
+- New Graphics (all made by myself ^^)"</string>
+
+    <!--  -->
+    <string name="release13" translatable="false">1.3 (5 may 2012)</string>
+    <string name="release13_log" translatable="false">"- Added an undo option (check the settings)
+- Added some performance tweaks"</string>
+
+    <!--  -->
+    <string name="release12" translatable="false">1.2 (18 apr. 2012)</string>
+    <string name="release12_log" translatable="false">"- Fixed the scroll bug since last update
+- fixed the fling options in the settings (option was always active)"</string>
+
+    <!--  -->
+    <string name="release11" translatable="false">1.1 (10 apr. 2012)</string>
+    <string name="release11_log" translatable="false">"- Fixed the crash at start caused by the last update
+- Added Fling to Scroll (launches the scroll to navigate in large files)
+- Display the active line
+- Added new color theme (ask for more if needed)"</string>
+    <string name="release1" translatable="false">1.0 (27 feb. 2012)</string>
+    <string name="release1_log" translatable="false">"- Brand new release version
+- Supports multiple encoding (including UTF-8)
+- Prevent data loss when saving really big files (note that Ted is not meant to open big files though)
+- Added new color theme (ask for more if needed)
+- Replaced the autosave with a warning and popup (prevent saving unwanted changes)"</string>
+    <string name="beta9" translatable="false">βetα 0.9 (7 jan. 2010)</string>
+    <string name="beta9_log" translatable="false">"- Bug fixed : severall crash on start
+- Added a search tool
+- Ted is listed when opening html, rss, css, php and xml files from any file browser (ask for other types if needed)"</string>
+    <string name="beta8" translatable="false">βetα 0.8 (23 dec. 2010)</string>
+    <string name="beta8_log" translatable="false">"- Automatic save can be disabled in the settings"</string>
+    <string name="beta7" translatable="false">βetα 0.7 (19 dec. 2010)</string>
+    <string name="beta7_log" translatable="false">"- App can be installed on the SD Card (on Android 2.2)
+- Automatic detection of end of line in opened files, possibility to define a default end of line for new files 
+- Bigger dialog boxes
+- Bug fixed when openning big files"</string>
+    <string name="beta6" translatable="false">βetα 0.6 (8 dec. 2010)</string>
+    <string name="beta6_log" translatable="false">"- Possibility to change text size in the settings.
+- Possibility to open read-only text files from other location than the SD card 
+- Added a backup function for unsaved text "</string>
+    <string name="beta5" translatable="false">βetα 0.5 (29 nov. 2010)</string>
+    <string name="beta5_log" translatable="false">"- Bug fixed while opening some files
+- New Graphics"</string>
+    <string name="beta4" translatable="false">βetα 0.4 (27 nov. 2010)</string>
+    <string name="beta4_log" translatable="false">"- Remembers the files opened recently (number of recent files can be changed)
+- display lines numbers (can be changed in the settings)
+- automatically break lines to keep a width of one page (can be changed in the settings)"</string>
+    <string name="beta3" translatable="false">βetα 0.3 (25 nov. 2010)</string>
+    <string name="beta3_log" translatable="false">"- Bug fixed : crash when trying to open online files"</string>
+    <string name="beta2" translatable="false">βetα 0.2 (13 nov. 2010)</string>
+    <string name="beta2_log" translatable="false">"- Open existing files - Save and save as"</string>
+
+</resources>
\ No newline at end of file
diff --git a/qpython/src/main/res/values/ids.xml b/qpython/src/main/res/values/ids.xml
index 82808ead..045e125f 100644
--- a/qpython/src/main/res/values/ids.xml
+++ b/qpython/src/main/res/values/ids.xml
@@ -1,35 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <item name="m_new" type="id" />
-    <item name="m_open" type="id" />
-    <item name="m_save" type="id" />
-    <item name="m_save_all" type="id" />
-    <item name="m_save_as" type="id" />
-    <item name="m_history" type="id" />
-    <item name="m_cut" type="id" />
-    <item name="m_copy" type="id" />
-    <item name="m_paste" type="id" />
-    <item name="m_select_all" type="id" />
-    <item name="m_undo" type="id" />
-    <item name="m_redo" type="id" />
-    <item name="m_wrap" type="id" />
-    <item name="m_duplication" type="id" />
-    <item name="m_find_replace" type="id" />
-    <item name="m_goto_top" type="id" />
-    <item name="m_goto_end" type="id" />
-    <item name="m_goto_line" type="id" />
-    <item name="m_back" type="id" />
-    <item name="m_forward" type="id" />
-    <item name="m_info" type="id" />
-    <item name="m_symbol" type="id" />
-    <item name="m_readonly" type="id" />
-    <item name="m_highlight" type="id" />
-    <item name="m_encoding" type="id" />
-    <item name="m_color" type="id" />
-    <item name="m_datetime" type="id" />
-    <item name="m_run" type="id" />
-    <item name="m_menu" type="id" />
-    <item name="m_settings" type="id" />
-    <item name="m_convert_to_uppercase" type="id" />
-    <item name="m_convert_to_lowercase" type="id" />
 </resources>
diff --git a/qpython/src/main/res/values/selectable_item_selector_colors.xml b/qpython/src/main/res/values/selectable_item_selector_colors.xml
index 4ed2c5e0..55344e51 100644
--- a/qpython/src/main/res/values/selectable_item_selector_colors.xml
+++ b/qpython/src/main/res/values/selectable_item_selector_colors.xml
@@ -1,5 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="white_selectable_bg">#ffffff</color>
-    <color name="white_selectable_pressed_bg">#1f000000</color>
 </resources>
\ No newline at end of file
diff --git a/qpython/src/main/res/values/string_program_explorer.xml b/qpython/src/main/res/values/string_program_explorer.xml
index b09d17e6..55344e51 100644
--- a/qpython/src/main/res/values/string_program_explorer.xml
+++ b/qpython/src/main/res/values/string_program_explorer.xml
@@ -1,7 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="program_explorer_back">上一级</string>
-    <string name="program_item_menu_open">打开</string>
-    <string name="program_item_menu_run">运行</string>
-    <string name="program_item_menu_delete">删除</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
\ No newline at end of file
diff --git a/qpython/src/main/res/values/strings.xml b/qpython/src/main/res/values/strings.xml
index 15dc5561..1c38275b 100644
--- a/qpython/src/main/res/values/strings.xml
+++ b/qpython/src/main/res/values/strings.xml
@@ -1,188 +1,191 @@
-<resources>
-    <string name="app_name">QPython</string>
-    <string name="nav_header_name">QPython</string>
-    <string name="nav_header_link">www.qpython.org</string>
-
-    <string name="document">文档</string>
-    <string name="forum">论坛</string>
-    <string name="wiki">Wiki</string>
-    <string name="back_app">再按一次退出程序</string>
-
-
-    <string name="navigation_drawer_open">Open navigation drawer</string>
-    <string name="navigation_drawer_close">Close navigation drawer</string>
-    <string name="setting">设置</string>
-    <string name="console">终端</string>
-    <string name="editor">编辑器</string>
-    <string name="program">程序</string>
-    <string name="community">社区</string>
-    <string name="library_manager">库管理</string>
-
-    <string name="setting_about">关于</string>
-    <string name="setting_update">检查新版本</string>
-    <string name="setting_mark">为它打分</string>
-    <string name="setting_back">反馈</string>
-    <string name="setting_about_all">相关</string>
-    <string name="more">更多</string>
-    <string name="lib_manager">库管理</string>
-    <string name="sl4a_server">SL4A服务</string>
-    <string name="normal_program">默认程序</string>
-    <string name="qpypi">QPypi</string>
-    <string name="internal_space">重置内部空间</string>
-    <string name="ftp_server">FTP服务</string>
-
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="ExtraTranslation">
+    <string name="private1_version" translatable="false">1347438995.05</string>
+    <string name="private2_version" translatable="false">1347438995.05</string>
+    <string name="private3_version" translatable="false">1347438995.05</string>
+    <string name="private31_version" translatable="false">1347438791.05</string>
+    <string name="private32_version" translatable="false">1347438791.05</string>
+    <string name="private33_version" translatable="false">1347438791.05</string>
+    <string name="public_version" translatable="false">12500</string>
+    <string name="public3_version" translatable="false">1347438610.05</string>
+    <string name="notebook3_version" translatable="false">20200206.1205</string>
+    <string name="ipynb_version" translatable="false">20200207.1205</string>
+
+    <string name="privacy_html" translatable="false">https://www.qpython.org/privacy.html</string>
+    <string name="thanks_link" translatable="false">https://www.qpython.org/contributors.html</string>
+    <string name="lower_project" translatable="false">projects</string>
+    <string name="lib_manager" translatable="false">QPYPI</string>
+    <string name="qpypi_up" translatable="false">QPYPI</string>
+    <!-- ColorValue.java -->
+    <string name="colorvalue_letter_alpha" translatable="false">α</string>
+    <string name="colorvalue_letter_red" translatable="false">R</string>
+    <string name="colorvalue_letter_green" translatable="false">G</string>
+    <string name="colorvalue_letter_blue" translatable="false">B</string>
+
+    <string name="ui_feedback_mail" translatable="false">support@qpython.org</string>
+    <string name="log" translatable="false">Log</string>
+    <string name="v_version" translatable="false">v %s</string>
+    <string name="web" translatable="false">Web</string>
+    <string name="arvr" translatable="false">AR/VR</string>
+    <string name="action_from_python_three" translatable="false">from_python_three</string>
+    <string name="key_saver" translatable="false">saver</string>
+    <string name="lib_cache_folder_name" translatable="false">.lib_cache</string>
+    <string name="aipy" translatable="false">AIPy</string>
+    <string name="slash_project_node" translatable="false">/projects</string>
+    <string name="key_hide_noti" translatable="false">hide_noti</string>
+    <string name="key_hide_push" translatable="false">hide_push</string>
+    <string name="logo" translatable="false">logo</string>
+    <string name="level" translatable="false">lv %s</string>
+    <!--color string-->
+    <string name="color_red" translatable="false">#FFD2483D</string>
+    <string name="color_light_gray" translatable="false">#FF595959</string>
+    <string name="color_dark_gray" translatable="false">#FF4A4A4A</string>
+    <string name="color_yellow" translatable="false">#FFECCD00</string>
+
+    <string name="terminal">Terminal</string>
+    <string name="recent">Recent</string>
+    <string name="snippet">Snippet</string>
+    <string name="script">Script</string>
+    <string name="project">Project</string>
+
+    <string name="setting">Setting</string>
+    <string name="editor">Editor</string>
+    <string name="community">Community</string>
+    <string name="gist">Gist</string>
+
+    <string name="more">More</string>
+    <string name="qpypi">Featured</string>
+    <string name="sl4a_server">SL4A Server</string>
+    <string name="internal_space"><![CDATA[Permissions & Storage]]></string>
+    <string name="ftp_server">FTP Server</string>
 
     <!---->
-    <string name="application_terminal">终端模拟器</string>
-    <string name="preferences">首选项</string>
-    <string name="new_window">新窗口</string>
-    <string name="close_window">关闭窗口</string>
-    <string name="window_list">窗口列表</string>
-    <string name="prev_window">前一窗口</string>
-    <string name="next_window">后一窗口</string>
-    <string name="reset">重置终端</string>
-    <string name="send_email">发送电子邮件到...</string>
-    <string name="special_keys">特殊键</string>
-    <string name="toggle_soft_keyboard">打开/关闭软键盘</string>
-
-    <string name="reset_toast_notification">当前窗口终端状态将被重置</string>
+    <string name="application_terminal">Terminal</string>
+    <string name="preferences">Preference</string>
+    <string name="new_window">Open new terminal</string>
+    <string name="close_window">Close terminal</string>
+    <string name="window_list">Terminal list</string>
+    <string name="reset">Reset Terminal</string>
+    <string name="send_email">Send mail to…</string>
+    <string name="special_keys">Special keys</string>
+    <string name="toggle_soft_keyboard">Open/Close soft keyboard</string>
 
-    <string name="enable_wakelock">开启唤醒锁</string>
-    <string name="disable_wakelock">关闭唤醒锁</string>
-    <string name="enable_wifilock">开启 Wifi 锁</string>
-    <string name="disable_wifilock">关闭 Wifi 锁</string>
+    <string name="reset_toast_notification">The state at present will be reset.</string>
 
-    <string name="edit_text">编辑文本</string>
-    <string name="select_text">选择文本</string>
-    <string name="copy_all">全部复制</string>
-    <string name="send_control_key">发送 Ctrl 键</string>
-    <string name="send_fn_key">发送 Fn 键</string>
+    <string name="enable_wakelock">Enable wakelock</string>
+    <string name="disable_wakelock">Disable wakelock</string>
+    <string name="enable_wifilock">Enable WIFI lock</string>
+    <string name="disable_wifilock">Disable WIFI lock</string>
 
-    <string name="window_title">窗口 %1$d</string>
+    <string name="edit_text">Edit text</string>
+    <string name="select_text">Select text</string>
+    <string name="copy_all">Copy all</string>
+    <string name="send_control_key">Send control key</string>
+    <string name="send_fn_key">Send Fn key</string>
 
-    <string name="service_notify_text">会话正在运行</string>
+    <string name="window_title">Terminal %1$d</string>
 
-    <string name="process_exit_message">会话已结束</string>
+    <string name="process_exit_message">Session is over</string>
 
     <!-- Preference dialog -->
-    <string name="screen_preferences">屏幕</string>
+    <string name="screen_preferences">Screen</string>
 
-    <string name="title_statusbar_preference">状态栏</string>
-    <string name="summary_statusbar_preference">显示/隐藏状态栏。</string>
-    <string name="dialog_title_statusbar_preference">状态栏</string>
+    <string name="title_statusbar_preference">Status bar</string>
+    <string name="summary_statusbar_preference">Show/Hide Status bar</string>
+    <string name="dialog_title_statusbar_preference">Status bar</string>
 
-    <string name="title_actionbar_preference">操作栏</string>
-    <string name="summary_actionbar_preference">选择操作栏行为 (Android 3.0 及以上)</string>
-    <string name="dialog_title_actionbar_preference">操作栏行为</string>
+    <string name="title_actionbar_preference">Action Bar</string>
+    <string name="summary_actionbar_preference">Choose Action bar\'s behavior(Android 3.0 and above)</string>
+    <string name="dialog_title_actionbar_preference">Action bar\'s behavior</string>
 
-    <string name="title_orientation_preference">屏幕方位</string>
-    <string name="summary_orientation_preference">选择屏幕方位行为</string>
-    <string name="dialog_title_orientation_preference">屏幕方位行为</string>
+    <string name="title_orientation_preference">Screen orientation</string>
+    <string name="summary_orientation_preference">Choose screen orientation action</string>
+    <string name="dialog_title_orientation_preference">screen orientation action</string>
 
-    <string name="title_cursorstyle_preference">光标样式</string>
-    <string name="summary_cursorstyle_preference">选择光标样式</string>
-    <string name="dialog_title_cursorstyle_preference">光标样式</string>
+    <string name="text_preferences">Text</string>
 
-    <string name="title_cursorblink_preference">光标闪烁</string>
-    <string name="summary_cursorblink_preference">选择光标闪烁模式</string>
-    <string name="dialog_title_cursorblink_preference">光标闪烁</string>
+    <string name="title_utf8_by_default_preference">Default use UTF-8</string>
+    <string name="summary_utf8_by_default_preference">Using UTF-8 as default</string>
 
-    <string name="text_preferences">文本</string>
+    <string name="title_fontsize_preference">Text size</string>
+    <string name="summary_fontsize_preference">Choose text size</string>
+    <string name="dialog_title_fontsize_preference">Text size</string>
 
-    <string name="title_utf8_by_default_preference">默认 UTF-8</string>
-    <string name="summary_utf8_by_default_preference">是否将 UTF-8 模式设为默认</string>
+    <string name="title_color_preference">Text color</string>
+    <string name="summary_color_preference">Choose text color</string>
+    <string name="dialog_title_color_preference">Text color</string>
 
-    <string name="title_fontsize_preference">文本大小</string>
-    <string name="summary_fontsize_preference">选择文本大小</string>
-    <string name="dialog_title_fontsize_preference">文本大小</string>
+    <string name="keyboard_preferences">Keyboard</string>
 
-    <string name="title_color_preference">颜色</string>
-    <string name="summary_color_preference">选择文本颜色</string>
-    <string name="dialog_title_color_preference">文本颜色</string>
+    <string name="title_backaction_preference">Back key behavior</string>
+    <string name="summary_backaction_preference">Choose Back key behavior</string>
+    <string name="dialog_title_backaction_preference">Back key behavior</string>
 
-    <string name="keyboard_preferences">键盘</string>
+    <string name="title_controlkey_preference">Ctrl key</string>
+    <string name="summary_controlkey_preference">Choose Ctrl key behavior</string>
+    <string name="dialog_title_controlkey_preference">Ctrl key</string>
 
-    <string name="title_backaction_preference">返回键行为</string>
-    <string name="summary_backaction_preference">选择返回键行为</string>
-    <string name="dialog_title_backaction_preference">返回键行为</string>
+    <string name="title_fnkey_preference">Fn key</string>
+    <string name="summary_fnkey_preference">Choose Fn key behavior</string>
+    <string name="dialog_title_fnkey_preference">Fn key</string>
 
-    <string name="title_controlkey_preference">Ctrl 键</string>
-    <string name="summary_controlkey_preference">设置 Ctrl 键</string>
-    <string name="dialog_title_controlkey_preference">Ctrl 键</string>
-
-    <string name="title_fnkey_preference">Fn 键</string>
-    <string name="summary_fnkey_preference">设置 Fn 键</string>
-    <string name="dialog_title_fnkey_preference">Fn 键</string>
-
-    <string name="title_ime_preference">输入方式</string>
-    <string name="summary_ime_preference">选择输入方式或软键盘</string>
-    <string name="dialog_title_ime_preference">输入方式</string>
+    <string name="title_ime_preference">Input method</string>
+    <string name="summary_ime_preference">Choose input method</string>
+    <string name="dialog_title_ime_preference">Input method</string>
 
     <string name="shell_preferences">Shell</string>
-    <string name="title_shell_preference">命令行</string>
-    <string name="summary_shell_preference">指定命令行使用的 Shell</string>
+    <string name="title_shell_preference">Terminal</string>
+    <string name="summary_shell_preference">Choose Shell</string>
     <string name="dialog_title_shell_preference">Shell</string>
 
-    <string name="title_initialcommand_preference">初始命令</string>
-    <string name="summary_initialcommand_preference">启动 Shell 时自动执行的命令</string>
-    <string name="dialog_title_initialcommand_preference">初始命令</string>
+    <string name="title_initialcommand_preference">Initial command</string>
+    <string name="summary_initialcommand_preference">Automatic performance initial command when start</string>
+    <string name="dialog_title_initialcommand_preference">Initial command</string>
 
-    <string name="title_termtype_preference">终端类型</string>
-    <string name="summary_termtype_preference">设置 Shell 的终端类型</string>
-    <string name="dialog_title_termtype_preference">终端类型</string>
+    <string name="title_termtype_preference">Terminal type</string>
+    <string name="summary_termtype_preference">Set Shell\'s Terminal type</string>
+    <string name="dialog_title_termtype_preference">Terminal type</string>
 
-    <string name="title_close_window_on_process_exit_preference">退出时关闭窗口</string>
-    <string name="summary_close_window_on_process_exit_preference">退出 Shell 时是否关闭窗口</string>
+    <string name="title_close_window_on_process_exit_preference">Close terminal when exit</string>
+    <string name="summary_close_window_on_process_exit_preference">Close terminal when exit</string>
 
-    <string name="title_verify_path_preference">验证 PATH 路径</string>
-    <string name="summary_verify_path_preference">是否将 PATH 中无效的路径清除</string>
+    <string name="title_verify_path_preference">verify PATH</string>
+    <string name="summary_verify_path_preference">Clear invalid PATH</string>
 
-    <string name="title_do_path_extensions_preference">允许 PATH 后扩</string>
-    <string name="summary_do_path_extensions_preference">是否允许程序添加额外命令到 PATH</string>
+    <string name="title_do_path_extensions_preference">Allow PATH expand</string>
+    <string name="summary_do_path_extensions_preference">Allow add command to PATH</string>
 
-    <string name="title_allow_prepend_path_preference">允许 PATH 前置</string>
-    <string name="summary_allow_prepend_path_preference">是否允许程序覆盖 PATH 中已有命令</string>
+    <string name="title_allow_prepend_path_preference">Allow preposition PATH</string>
+    <string name="summary_allow_prepend_path_preference">Allow override exist command in PATH</string>
 
-    <string name="title_home_path_preference">HOME 文件夹</string>
-    <string name="summary_home_path_preference">用作 HOME 的可写文件夹路径</string>
+    <string name="title_home_path_preference">HOME Folder</string>
+    <string name="summary_home_path_preference">Use as HOME\'s writable path</string>
 
-    <string name="control_key_dialog_title">Ctrl 与 Fn 键</string>
+    <string name="control_key_dialog_title">Ctrl and Fn key</string>
     <string name="control_key_dialog_control_text">CTRLKEY Space : Control-@ (NUL)\nCTRLKEY A..Z : Control-A..Z\nCTRLKEY 5 : Control-]\nCTRLKEY 6 : Control-^\nCTRLKEY 7 : Control-_\nCTRLKEY 9 : F11\nCTRLKEY 0 : F12</string>
-    <string name="control_key_dialog_control_disabled_text">未设置 Ctrl 键</string>
+    <string name="control_key_dialog_control_disabled_text">Ctrl key unset</string>
     <string name="control_key_dialog_fn_text">FNKEY 1..9 : F1-F9\nFNKEY 0 : F10\nFNKEY W : Up\nFNKEY A : Left\nFNKEY S : Down\nFNKEY D : Right\nFNKEY P : PageUp\nFNKEY N : PageDown\nFNKEY T : Tab\nFNKEY L : | (pipe)\nFNKEY U : _ (underscore)\nFNKEY E : Control-[ (ESC)\nFNKEY X : Delete\nFNKEY I : Insert\nFNKEY H : Home\nFNKEY F : End\nFNKEY . : Control-\\\n</string>
-    <string name="control_key_dialog_fn_disabled_text">未设置 Fn 键</string>
-
-    <string name="confirm_window_close_message">关闭窗口吗？</string>
+    <string name="control_key_dialog_fn_disabled_text">Fn key unset</string>
 
-    <string name="perm_run_script">在终端模拟器中运行命令</string>
-    <string name="permdesc_run_script">允许程序开启新窗口并运行包括与网络、存储卡相关命令在内的所有命令</string>
-    <string name="perm_append_to_path">添加命令到终端模拟器</string>
-    <string name="permdesc_append_to_path">允许程序添加额外命令</string>
-    <string name="perm_prepend_to_path">覆盖终端模拟器中已有命令</string>
-    <string name="permdesc_prepend_to_path">允许程序覆盖终端模拟器中已有命令</string>
+    <string name="confirm_window_close_message">Close terminal?</string>
 
-    <string name="email_transcript_subject">终端模拟器副本</string>
-    <string name="email_transcript_chooser_title">发送副本的邮件实例：</string>
-    <string name="email_transcript_no_email_activity_found">找不到邮件实例发送副本</string>
+    <string name="email_transcript_subject">Copy terminal</string>
+    <string name="feedback_email_subject">Feedback - QPython</string>
+    <string name="email_transcript_chooser_title">Feedback …</string>
+    <string name="email_transcript_no_email_activity_found">Can not find propriety App to send E-mail</string>
 
-    <string name="alt_sends_esc">Alt 键发送 ESC</string>
-    <string name="alt_sends_esc_summary_on">开启 Alt 键发送 ESC</string>
-    <string name="alt_sends_esc_summary_off">关闭 Alt 键发送 ESC</string>
+    <string name="alt_sends_esc">Use Alt as ESC</string>
+    <string name="alt_sends_esc_summary_on">Using Alt as ESC</string>
+    <string name="alt_sends_esc_summary_off">Cancel using Alt as ESC</string>
 
-    <string name="title_mouse_tracking_preference">发送鼠标事件</string>
-    <string name="summary_mouse_tracking_preference">触摸与滚屏事件是否被终端忽略</string>
+    <string name="title_mouse_tracking_preference">Send mouse event</string>
+    <string name="summary_mouse_tracking_preference">Are touch and scroll event ignored?</string>
 
-    <string name="dialog_title_menu">菜单</string>
-    <string name="dialog_item_qrcode">扫描二维码</string>
-    <string name="dialog_item_script">运行脚本</string>
-    <string name="dialog_item_project">运行项目</string>
-
-    <string name="dialog_title_script">脚本</string>
-    <string name="dialog_title_project">项目</string>
+    <string name="dialog_title_script">script</string>
+    <string name="dialog_title_project">project</string>
 
 
     <string name="title_use_keyboard_shortcuts">Use Keyboard Shortcuts</string>
-    <string name="use_keyboard_shortcuts_summary_on">Ctrl-Tab: cycle window, Ctrl-Shift-N: new window, Ctrl-Shift-V: paste.</string>
+    <string name="use_keyboard_shortcuts_summary_on">Ctrl-Tab: cycle terminal, Ctrl-Shift-N: new terminal, Ctrl-Shift-V: paste.</string>
     <string name="use_keyboard_shortcuts_summary_off">Keyboard shortcuts disabled.</string>
     <string name="help">Help</string>
     <string name="activity_term_here_title">Term here</string>
@@ -193,8 +196,8 @@
     <string name="addshortcut_command_hint">command</string>
     <string name="addshortcut_example_hint">--example=\""a\"</string>
     <string name="addshortcut_navigator_title">SELECT SHORTCUT TARGET</string>
-    <string name="addshortcut_command_window_instructions">Command window requires full mPath, no arguments. For other commands use Arguments window (ex: cd /sdcard).</string>
-    <string name="addshortcut_arguments_label">Arguments\:</string>
+    <string name="addshortcut_command_window_instructions">Command terminal requires full mPath, no arguments. For other commands use Arguments terminal (ex: cd /sdcard).</string>
+    <string name="addshortcut_arguments_label">Add to dictionary</string>
     <string name="addshortcut_shortcut_label">Shortcut label\:</string>
     <string name="addshortcut_button_text_icon">Text icon</string>
     <string name="addshortcut_make_text_icon">MAKE TEXT ICON</string>
@@ -205,229 +208,531 @@
     <string name="fsnavigator_no_external_storage">External storage not available</string>
     <string name="fsnavigator_optional_enter_path">Or enter mPath here.</string>
     <string name="fsnavigator_change_theme">Change theme</string>
-    <!-- ColorValue.java -->
-    <string name="colorvalue_letter_alpha">α</string>
-    <string name="colorvalue_letter_red">R</string>
-    <string name="colorvalue_letter_green">G</string>
-    <string name="colorvalue_letter_blue">B</string>
     <string name="colorvalue_label_lock_button_column">LOCK</string>
     <string name="colorvalue_icon_text_entry_hint">Enter icon text</string>
 
-    <string name="help_url" translatable="false">http://jackpal.github.com/Android-Terminal-Emulator/help/index.html</string>
-
-
-    <string name="new_file">新建</string>
-    <string name="open">打开</string>
-    <string name="save">保存</string>
-    <string name="undo">撤销</string>
-    <string name="redo">重做</string>
-    <string name="save_all">全部保存</string>
-    <string name="save_as">另存为</string>
-    <string name="recent_files">最近打开</string>
-    <string name="line_separator">换行符</string>
-    <string name="select_all">全选</string>
-    <string name="duplication_line">重复行</string>
-    <string name="find_in_files">搜索文件</string>
-    <string name="jump_to_start">跳到开始</string>
-    <string name="jump_to_end">跳到结束</string>
-    <string name="goto_line">跳到行</string>
-    <string name="back">上个位置</string>
-    <string name="forward">下个位置</string>
-    <string name="document_info">文档信息</string>
-    <string name="symbol">符号</string>
-    <string name="insert_color">插入颜色</string>
-    <string name="highlight_language">高亮语言</string>
-    <string name="encoding">编码</string>
-    <string name="read_only">只读模式</string>
-    <string name="insert_datetime">插入时间</string>
-    <string name="edit_mode">编辑模式</string>
-    <string name="run">运行</string>
-    <string name="file">文件</string>
-    <string name="other">其它</string>
-    <string name="view">查看</string>
-    <string name="edit">编辑</string>
-    <string name="new_filename">无标题 %d</string>
-    <string name="confirm_save">确认保存</string>
-    <string name="confirm_save_msg">文档 %s 尚未保存，是否保存并关闭</string>
-    <string name="yes">是</string>
-    <string name="no">否</string>
-    <string name="cannt_access_file">文件 %s 无法访问</string>
-    <string name="cannt_read_file">无法读取文件 %s</string>
-    <string name="ok">确定</string>
-    <string name="read_file_exception">读取文件时发生异常</string>
-    <string name="init_syntax_msg">正在初始化语法高亮…</string>
-    <string name="init_syntax_error">初始化语法文件失败，请检查是否有足够的存储空间</string>
-    <string name="init_build_index_error">建立索引失败</string>
-    <string name="close">关闭</string>
-    <string name="cancel">取消</string>
-    <string name="convert_wrap_char">转换换行符</string>
-    <string name="path_x">路径：%s</string>
-    <string name="char_x">字符数：%d</string>
-    <string name="word_x">单词数：%d</string>
-    <string name="line_number_x">行数：%d</string>
-    <string name="encoding_x">编码：%s</string>
-    <string name="tab">标签</string>
-    <string name="no_change">没有任何改变</string>
-    <string name="save_success">保存成功</string>
-    <string name="find_label">Find What:</string>
-    <string name="replace_label">Replace With:</string>
-    <string name="case_sensitive">Case sensitive</string>
-    <string name="whole_words_only">Whole words only</string>
-    <string name="regex">Regular expression</string>
-    <string name="in_path">In Path:</string>
-    <string name="recursively">Recursively</string>
-    <string name="cannot_be_empty">不能为空</string>
-    <string name="path_not_exists">路径不存在</string>
-    <string name="find_not_found">找不到结果</string>
-    <string name="previous_occurrence">向上查找</string>
-    <string name="next_occurrence">查找下一个</string>
-    <string name="replace_all">替换全部</string>
-    <string name="searching">搜索中…</string>
-    <string name="select_lang_to_highlight">Select a language to highlight</string>
-    <string name="more_menu">更多菜单</string>
-    <string name="reopen_with_encoding">使用该编码重新打开</string>
-    <string name="save_as_file_first">请先保存为文件</string>
-    <string name="document_changed">文档已经改变</string>
-    <string name="give_up_document_changed_message">文档已经改变，重新打开将放弃改变，确认要放弃？</string>
-    <string name="preview_in_browser">在浏览器预览</string>
-    <string name="use_sl4a_in_background_run_script">调用SL4A在后台运行脚本</string>
-    <string name="use_sl4a_in_terminal_run_script">调用SL4A在命令行运行脚本</string>
-    <string name="please_save_as_file_first">请先保存为文件</string>
-    <string name="run_fail_message">调用外部应用失败</string>
-    <string name="settings">设置</string>
-    <string name="font">字体</string>
-    <string name="default_value">默认值</string>
-    <string name="font_size">字体大小</string>
-    <string name="cursor_width">光标宽度</string>
-    <string name="touch_to_adjust_text_size">多点触摸缩放字体大小</string>
-    <string name="word_wrap_in_editor">自动换行</string>
-    <string name="show_linenumber">显示行号</string>
-    <string name="show_whitespace">显示空白字符</string>
-    <string name="auto_indent">自动缩进</string>
-    <string name="insert_space_for_tab">使用空格代替制表符</string>
-    <string name="indent_size">缩进大小</string>
-    <string name="highlight_and_theme">高亮和主题</string>
-    <string name="highlight_the_file_size_limit">限制高亮的文件大小</string>
-    <string name="select_theme">选择主题（待开发）</string>
-    <string name="auto_save">自动保存文档</string>
-    <string name="remember_last_opened_files">记住最后打开的文件</string>
-    <string name="remember_last_opened_files_summary">启动编辑器时自动打开上次打开的文件</string>
-    <string name="screen_orientation">屏幕方向</string>
-    <string name="keep_screen_on">保持屏幕常亮</string>
-    <string name="auto_capitalize">首字母自动大写</string>
-    <string name="feedback">意见反馈</string>
-    <string name="donate">捐赠</string>
-    <string name="help_translate">翻译本应用</string>
-    <string name="about">关于</string>
-    <string name="enable_highlight">启用语法高亮</string>
-    <string name="version_x">版本：%s</string>
-    <string name="need_to_enable_read_storage_permissions">需要打开读取存储器权限</string>
-    <string name="file_not_exists">文件不存在</string>
-    <string name="cannt_handle_intent_x">无法处理来源信息：%s</string>
-    <string name="handle_intent_x_error">处理来源：%s 时发生错误</string>
-    <string name="hex_color_char" translatable="false">#</string>
-    <string name="color_R" translatable="false">R:</string>
-    <string name="color_G" translatable="false">G:</string>
-    <string name="color_B" translatable="false">B:</string>
-    <string name="verify_sign_failure">你当前使用的是非官方发布的应用，请转到 https://github.com/jecelyin/920-text-editor-v2/releases 下载官方发布的应用。</string>
-    <string name="press_again_will_exit">再按一次返回按钮将退出程序</string>
-    <string name="find_replace">查找/替换</string>
-    <string name="find_title">\"%s\" Find Results</string>
-    <string name="zero_matches">0 matches</string>
-    <string name="chooser_browser">选择一个浏览器</string>
-    <string name="find_or_replace">查找/替换…</string>
-    <string name="other_application">其它程序…</string>
-    <string name="chooser_application">选择程序</string>
-    <string name="editor_create_unknown_exception">创建编辑器时发生未知异常</string>
-    <string name="convert_to_uppercase">转换为大写</string>
-    <string name="convert_to_lowercase">转换为小写</string>
-    <string name="duplication_text">重复选中文本</string>
-    <string name="tab_size">制表符大小</string>
-    <string name="new_version_available">发现新版本</string>
-    <string name="install">安装</string>
-    <string name="new_version_update_content">Latest Version: %1$s\n\nWhat\'s New:\n%2$s</string>
-    <string name="download_progress">正在下载：%1$d%%</string>
-    <string name="download_failure_x">下载失败：%s</string>
-    <string name="start_download">开始下载</string>
-    <string name="auto_check_updates">自动检查更新</string>
-    <string name="cannt_download">无法下载</string>
-    <string name="readonly_mode_not_support_this_action">Read-only mode does not support this action</string>
-    <string name="x_text_replaced">%d text has been replaced</string>
-    <string name="enable_root">启用Root权限</string>
-    <string name="my_name">作者：彭春瑜</string>
-    <string name="my_email" translatable="false"><![CDATA[Email：<a href="mailto:jecelyin@gmail.com">jecelyin@gmail.com</a>]]></string>
-    <string name="project_url" translatable="false"><![CDATA[URL：<a href="https://github.com/jecelyin/920-text-editor-v2/">https://github.com/jecelyin/920-text-editor-v2/</a>]]></string>
-    <string name="qq_group">QQ群：87272821</string>
-    <string name="license"><![CDATA[Copyright (C) 2016 Jecelyin Peng,\n\n920 Text Editor open source software is licensed under the Apache License 2.0]]></string>
-    <string name="open_with_external_browser">使用外部浏览器打开</string>
-    <string name="contact_email_optional">联系Email（可选）</string>
-    <string name="with_error_logs">错误日志</string>
-    <string name="content">内容</string>
-    <string name="send">发送</string>
-    <string name="feedback_content_length_must_be_greater_than_x_char">反馈内容长度必须大于%d个字</string>
-    <string name="feedback_submit_error_x">提交反馈失败：%s</string>
-    <string name="submit_success">提交成功</string>
-    <string name="agree">返回</string>
-    <string name="alert">提示</string>
-    <string name="no_find_img">没有扫描到二维码信息</string>
-    <string name="no_camera">没有发现可用的摄像头，请查看是否开启摄像头权限</string>
-    <string name="no_storage">没有文件读取权限</string>
-    <string name="list_alert">扫描到了二维码</string>
-    <plurals name="x_text_replaced">
-        <item quantity="zero">0 found</item>
-        <item quantity="other">%d text replaced</item>
-    </plurals>
-    <string-array name="insert_datetime_lang">
-        <item>英语</item>
-        <item>中文</item>
-    </string-array>
-    <string-array name="wrap_char_list">
-        <item>转换为 \\n（Linux/OSX）</item>
-        <item>转换为 \\r\\n（Windows）</item>
-    </string-array>
-    <string-array name="date_number">
-        <item>〇</item>
-        <item>一</item>
-        <item>二</item>
-        <item>三</item>
-        <item>四</item>
-        <item>五</item>
-        <item>六</item>
-        <item>七</item>
-        <item>八</item>
-        <item>九</item>
-        <item>十</item>
-    </string-array>
-    <string-array name="screen_orientation">
-        <item>自动</item>
-        <item>横屏</item>
-        <item>竖屏</item>
-    </string-array>
-
-    <string-array name="list_select">
-        <item>在编辑器中打开</item>
-        <item>在.....打开</item>
-        <item>重新扫描</item>
-    </string-array>
-
-
-    <string name="recent_download">已下载</string>
-    <array name="library">网络库</array>
-
-    <string name="load_failed">加载失败，点击重新加载</string>
-    <string name="download_error">加载出现了问题，点击文字，重新加载</string>
-    <string name="download">下载</string>
-
-
-    <string-array name="tab_string">
-        <item>网络库</item>
-        <item>已下载</item>
-    </string-array>
-
-
-    <string name="private_version">10000</string>
-    <string name="public_version">10000</string>
+    <string name="help_url">https://www.qpython.org</string>
+
+    <string name="read_only">Read only</string>
+    <string name="file">Explorer</string>
+    <string name="yes">Yes</string>
+    <string name="no">No</string>
+    <string name="ok">OK</string>
+    <string name="close">close</string>
+    <string name="no_change">No change</string>
+    <string name="feedback">Feedback</string>
+    <string name="about">About</string>
+    <string name="file_not_exists">File did not exist</string>
+    <string name="enable_root">Enable root</string>
+    <string name="send">Send</string>
+    <string name="no_camera">Can not find the available camera, please check if the camera permissions is granted</string>
+    <string name="no_storage">No read storage permission</string>
+
+
     <string name="pref_initialcommand_default_qpython">python</string>
-    <string name="use_qpython_run_script">调用QPython运行</string>
+    <string name="qpy_app">QPY</string>
+    <string name="local_app">Local APP</string>
+    <string name="task">Task</string>
+    <string name="root_mode">Root mode</string>
+    <string name="star_it">Rate it</string>
+    <string name="disable_root">Disable</string>
+    <string name="http_qpypi_qpython_org">https://pypi.python.org/simple/</string>
+    <string name="add">add</string>
+    <string name="sl4a_running">SL4A server is running</string>
+    <string name="sl4a_un_running">SL4A server is not running</string>
+    <string name="service_toggle">Server taggle</string>
+    <string name="qpy_description">QPython is a script engine running on android devices like phone or tablet.</string>
+    <string name="warning">Warning</string>
+    <string name="reset_warning">Reset storage will lost all setting and downloaded libs, are you sure you want to reset?</string>
+    <string name="downloading">Library</string>
+    <string name="location">Location</string>
+
+
+    <!--  -->
+
+    <!-- Titles -->
+    <string name="title_untitled">untitled</string>
+    <string name="title_editor">%1$s</string>
+    <string name="title_editor_dirty">%1$s *</string>
+    <string name="title_editor_readonly">[%1$s]</string>
+
+    <string name="title_settings">Settings </string>
+
+    <!-- Config screen strings -->
+    <string name="config_cat_display">Display(Please restart the editor after changing)</string>
+    <string name="config_title_line_numbers">Show line numbers</string>
+    <string name="config_title_word_wrap">Word wrap</string>
+    <string name="config_title_font">Change text font</string>
+    <string name="config_title_text_size">Text size</string>
+    <string name="config_title_color_theme">Color theme</string>
+    <string name="config_title_scroll_fling">Fling to scroll faster</string>
+    <string name="config_gist_icon"></string>
+    <string name="config_title_gist">Show Gist button</string>
+
+    <string name="config_summary_line_numbers">Display the line number at the left of the page</string>
+    <string name="config_summary_word_wrap">Lines will break in new lines if they are too wide for the screen</string>
+    <string name="config_summary_scroll_fling">Uncheck if you have performance issues</string>
+
+    <!-- Options Menu in QEdit -->
+
+    <!-- Misc UI strings -->
+    <string name="ui_save_text">"Do you want to save your document? \nAny unsaved changes will be lost. "</string>
+    <string name="ui_save">Save</string>
+    <string name="ui_delete">Delete</string>
+    <string name="ui_no_save">"Don't save"</string>
+    <string name="ui_cancel">Cancel</string>
+    <string name="ui_hint_file_name">File name</string>
+    <string name="ui_hint_search">Search</string>
+    <string name="ui_history">History</string>
+    <string name="ui_force_read_only">Open as read only</string>
+    <string name="about_content">QEdit is a text editor for android tablets and phones, besides text edit, it can make python / HTML development on android more fun and convenient especially.</string>
+
+    <!-- Misc Strings -->
+    <string name="lorem_ipsum">"QEdit is a great script editor."</string>
+
+    <string name="file_exists">File or project exists, please rename</string>
+
+    <string name="video_src">Video {0}</string>
+    <string name="play_video">Play</string>
+    <string name="no_videos_found">No videos found in this page</string>
+    <string name="pls_install_a8_play">Please install A8 Video Player first</string>
+    <string name="download_as">Download and save as</string>
+    <string name="info_browser">QBrowser</string>
+
+    <!--  added by kyle -->
+    <string name="share">Share</string>
+    <string name="save_as_snippets">Save as snippet</string>
+    <string name="snippet_exist">Snippet exists, please change to another name.</string>
+    <string name="save_as_snippets_1">Snippets has been saved as: </string>
+    <string name="fail_to_insert">Fail to insert snippet</string>
+    <string name="fail_to_goto">Please input correct number</string>
+    <string name="max_lines_num_with_syntax_title">Auto-highlight lines</string>
+    <string name="max_lines_num_with_syntax_summary">Auto-highlight if lines less than %s</string>
+    <string name="qedit_not_support">QEdit only support to preview/execute the following file types\n.py, .sh, .lua, .html, .md.</string>
+
+    <string name="pls_install_lua">Please install the QLua to run lua script</string>
+    <string name="pls_install_qpy">Please install the QPython to run python script</string>
+    <string name="info_snippets">Snippets</string>
+
+    <string name="ui_ok">OK</string>
+    <string name="ui_contact_title">Contact</string>
+    <string name="ui_licence_title">Licence</string>
+    <string name="ui_mail">support@qpython.org</string>
+    <string name="ui_choose_mail">Open mail using &#8230; </string>
+    <string name="ui_market_url">"https://market.android.com/developer?pub=Xavier+Gouchet"</string>
+    <string name="ui_market_app_url">"https://play.google.com/store/apps/details?id=%s"</string>
+    <string name="ui_market">"Take a look at my other apps"</string>
+    <string name="ui_app_rating">"Rate this app \n Leave a feedback"</string>
+    <string name="ui_feedback">"Please feel free to contact me for any feedback, feature request or bug report. "</string>
+    <string name="ui_licence_content">"This software is provided 'as-is', without any express or implied warranty.  In no event will the author be held liable for any damages arising from the use of this software."</string>
+    <string name="ui_art_licence_title">Artistic Licence</string>
+    <string name="ui_art_licence_content">"All icons for this app were created and belong to the author of the app : QPython."</string>
+    <string name="ui_whats_new">"What's new"</string>
+    <string name="save">Save</string>
+    <string name="save_as">Save as</string>
+    <string name="open">Open</string>
+    <string name="file_name">File Name</string>
+    <string name="file_exist_hint">This file is exist, please rename.</string>
+    <string name="empty_file">Blank file</string>
+    <string name="webapp_project">WebApp</string>
+    <string name="console_app_project">ConsoleApp</string>
+    <string name="kivy_app_project">KivyApp</string>
+    <string name="pygame_app_project">PygameApp</string>
+    <string name="qsl4a_app_project">QSL4AApp</string>
+
+    <string name="confirm">Confirm</string>
+    <string name="cancel">Cancel</string>
+    <string name="new_project">New project</string>
+    <string name="error_dont_kn">Unkown error occurred.</string>
+    <string name="project_name">Project name</string>
+    <string name="jump_to">Jump to</string>
+    <string name="choose_ttf">Choose font file(.ttf)</string>
+    <string name="explorer">Explorer</string>
+    <string name="new_script">New script</string>
+    <string name="enter_name_hint">Enter script name</string>
+
+    <string name="paste">Paste</string>
+    <string name="install_with_python_s_pypi">QPYPI CLIENT</string>
+    <string name="py_pi"><![CDATA[You can manager and install Python packages from QPYPI and Python\'s PYPI]]></string>
+    <string name="download_fail">Download fail</string>
+    <string name="key_reset">reset_storage</string>
+    <string name="key_ftp_state">running_state</string>
+    <string name="key_username">username</string>
+    <string name="key_ftp_pwd">password</string>
+    <string name="key_port_num">portNum</string>
+    <string name="key_show_pwd">show_password</string>
+    <string name="key_root_dir">chrootDir</string>
+    <string name="key_stay_awake">stayAwake</string>
+    <string name="key_about">about</string>
+    <string name="dir_not_valid">The direction is not valid</string>
+    <string name="already_newest">Already newest</string>
+    <string name="share_text">QPython is a script engine running on android devices like phone or tablet, It embeds the Python interpreter, console, editor, SL4A Library for Android, which can make your android device run Python https://www.qpython.com/privacy.html</string>
+    <string name="new_folder">New Folder</string>
+    <string name="folder_name">Folder name</string>
+    <string name="untitled_folder">untitled folder</string>
+    <string name="toast_folder_exist">Operation failed! Please use a different name</string>
+    <string name="fail_open_file">Unable to open the file, the file is not exists</string>
+    <string name="run_dirty_hint">Do you want to save the change first?</string>
+    <string name="no_im_good">No, I\'m good</string>
+    <string name="convert_fail">Convert fail</string>
+    <string name="delete_file_hint">Do you want to delete this file?</string>
+    <string name="rename">Rename</string>
+    <string name="rename_fail">Rename fail</string>
+    <string name="delete_fail">Delete fail</string>
+    <string name="runtime_log">Runtime Log: %s</string>
+    <string name="fedback_mail">[Feedback]\n\n</string>
+    <string name="log_title">Runtime Log</string>
+
+    <string name="date_format">[ %s ]</string>
+    <string name="not_root_yet">This device is not rooted yet</string>
+    <string name="download_apk">Download APK?</string>
+    <string name="download_apk_hint">This operation may charge if you ain\'t in wifi state</string>
+    <string name="downloading_new_apk">Downloading new package</string>
+    <string name="checking_update">Checking update</string>
+    <string name="run_bg_title">Run on background</string>
+    <string name="scan">Scan</string>
+    <string name="read_script_from_qrcode">Read code from QRCode</string>
+
+    <string name="course">QPython Courses</string>
+    <string name="lost_connect">Lose Connect</string>
+    <string name="featured_courses">Courses</string>
+    <string name="programs">Programs</string>
+    <string name="open_gl2_is_not_supported">OpenGL2 is not supported</string>
+    <string name="unable_extract">Unable to extract python files</string>
+    <string name="get_setting_data_fail">Get setting data fail</string>
+    <string name="terminal_bg_hint">Do you want to keep terminal running on background?</string>
+    <string name="thanks">THANKS!</string>
+    <string name="extra_pypi">Set PYPI</string>
+    <string name="already_newest_current_version">Already newest, current version is </string>
+    <string name="reward">Reward</string>
+    <string name="oops_seems_like_your_net_have_some_trouble">Oops! \n Seems like your net has some trouble…</string>
+    <string name="lose_google_server">Can\'t connect to Google Play service, please check your network.</string>
+    <string name="thanks_your_support">Thanks for your support!</string>
+    <string name="under_16_status_bar_hint">The change of status bar\'s visibility will be apply after restart Terminal.</string>
+    <string name="refresh">Refresh</string>
+    <string name="reset_suc">Reset success</string>
+    <string name="reset_hint">This operation will only become effective after restart</string>
+    <string name="restart">Restart</string>
+    <string name="fail_resume_console">Fail to resume console</string>
+    <string name="failed_bind_term">Failed to bind to TermService!</string>
+    <string name="console_running">QPython Console is running</string>
+    <string name="qpy_console">QPython Console</string>
+    <string name="recommend">Recommend</string>
+    <string name="newest_course">Latest</string>
+    <string name="best_python_development_ide_non_mobile">Best Python Application on Mobile</string>
+    <string name="by_signing_in_you_agree_to_out_privacy_policy_term_of_service"><![CDATA[By signing in you agree with our <font color="#4BAC07">privacy policy & term </font>of service]]></string>
+    <string name="copy_hint">Copy to editor to run</string>
+    <string name="my_scripts">My Scripts</string>
+    <string name="my_share">My Gists</string>
+    <string name="gist_title">Title</string>
+    <string name="description">Description</string>
+    <string name="too_long_hint">This value is too long. It should have 140 characters or less.</string>
+    <string name="enter_snippet">Enter snippet name</string>
+    <string name="welcome_s">Welcome, <![CDATA[<font color="#4BAC07"><u>%s</u></font>]]></string>
+    <string name="re_format">Re <![CDATA[<font color="#ECCD00">@%1$s</font>]]>:\u0020 %2$s</string>
+    <string name="replied_format"><![CDATA[<font color="#ECCD00">@%1$s</font>]]>:\u0020 %2$s</string>
+    <string name="login"><u>Sign In</u></string>
+    <string name="auth_failed">Authentication failed.</string>
+    <string name="log_out">Sign Out</string>
+    <string name="me">Me</string>
+    <string name="grant_storage_hint">You need to grant storage permission</string>
+    <string name="lost_google_hint">Can not connect to google server, please check your internet</string>
+    <string name="upload_suc">Code upload successfully.</string>
+    <string name="upload_fail">Code could not be uploaded,</string>
+    <string name="my_program">My Program</string>
+    <string name="nothing_here_yet">Nothing here yet. :(</string>
+    <string name="sofa_hint">Do you want to be the first to from_content?</string>
+    <string name="null_comment_hint">Null from_content content…</string>
+    <string name="initial">Initial</string>
+    <string name="share_empty_hint">You need to save file before share.</string>
+    <string name="need_login">Need Sign in</string>
+    <string name="upload_login_hint">You have to Sign in before you could upload your code</string>
+    <string name="login_now">Login now</string>
+    <string name="cloud_empty_hint">You don\'t have any scripts on cloud yet</string>
+    <string name="mkdir_fail">Make direction fail.</string>
+    <string name="not_support_type_hint">Not support upload this type of file now</string>
+    <string name="conflict_hint"><Data>
+        <![CDATA[ <b>Remote file:</b>   <br/>
+
+                  <u>Last modified:</u> %s   <br/><br/>
+
+                  <b>Local file:</b><br/>
+
+                  <u>Last modified:</u> %s <br/><br/>
+        Do you want to override?]]></Data></string>
+    <string name="override_fail_hint">Override fail, please retry later</string>
+    <string name="delete_remote_suc">Delete remote file success</string>
+    <string name="delete_suc">Delete file success</string>
+    <string name="click_retry">Request timed out \nClick screen to retry</string>
+    <string name="lout">Do you want to sign out?</string>
+    <string name="log_noti">Log Notification</string>
+    <string name="app_noti">App Notifications</string>
+    <string name="override_hint">Override local file?</string>
+    <string name="file_downloaded">File downloaded</string>
+    <string name="login_error">Login error</string>
+    <string name="my_space">My Space (%d / 100 files)</string>
+    <string name="my_space_empty">My Space (— / 100 files)</string>
+    <string name="save_amp_push"><![CDATA[Save & Push]]></string>
+    <string name="shortcut_create_suc">Shortcut %s is created success</string>
+    <string name="need_grant">You need grant these permissions</string>
+    <string name="no_space">You don\'t have enough space to upload</string>
+    <string name="no_file">No file within this folder</string>
+    <string name="no_recent_file">You have not open any file recently</string>
+    <string name="cant_open">This file can not be opened.</string>
+    <string name="toolbar_showing">Project structure</string>
+    <string name="toolbar_close">Editor</string>
+    <string name="not_support_yet">Not support yet</string>
+    <string name="new_file">New file</string>
+    <string name="tools">Tools</string>
+    <string name="aipy_not_install"><![CDATA[Please <font color="#4BAC07">enable AIPY from setting</font>]]></string>
+    <string name="jupyter_not_install"><![CDATA[Please <font color="#4BAC07">install base packages</font> \n before install related Jupyter packages.]]></string>
+
+
+    <string name="update_time_hint">Update: %s</string>
+    <string name="aipy_list_empty_hint">Can\'t find any AIPy package, please locate the error by following the steps below.\n
+        1. Make sure you have installed AIPy application\n
+        2. Make sure QPython has the permission of write file\n
+        3. Try to refresh by clicking the upper right corner button\n\n
+        If that dose\'t work, feel free to contact us by Email or github
+    </string>
+    <string name="package_installed">This package already installed</string>
+    <string name="install_suc">Install success</string>
+    <string name="install_fail">Install fail, please try again later</string>
+    <string name="install_package_fail">Install package fail, please retry later</string>
+    <string name="aipy_not_release">Please Install AIPY Packages</string>
+    <string name="newest_resource">You have downloaded the newest resource</string>
+
+    <string name="jupyter_not_release">Please Install and run setup from QPyNotebook App</string>
+    <string name="aipy_not_support">AIPY does not support QPY3 yet</string>
+    <string name="jupyter_not_support">QPyNotebook do not support QPY3 yet</string>
+
+    <string name="aipy_lib_hint">You can install or upgrade AIPY App to get more features</string>
+    <string name="album">Album</string>
+    <string name="last_refresh">Last Refresh: %s</string>
+    <string name="last_log">Runtime log</string>
+    <string name="get_last_log">Check last runtime log</string>
+
+    <string name="data_saver">Data saver</string>
+    <string name="saver_on">Use local cache</string>
+    <string name="saver_off">Reload every time</string>
+    <string name="library">Library</string>
+    <string name="run">Run</string>
+
+    <string name="insert_tab">\u0009</string>
+
+    <string name="insert_if">if :\n</string>
+    <string name="insert_def">def ():\n</string>
+    <string name="insert_for">for\u0020\u0020in :\n</string>
+    <string name="insert_import">import\u0020\n</string>
+    <string name="insert_import_f">from\u0020\u0020import\u0020\n</string>
+    <string name="insert_clz">class\u0020\u0020:</string>
+    <string name="insert_ef">elif\u0020\u0020:\n</string>
+    <string name="insert_el">else:\n</string>
+    <string name="insert_ret">return\n</string>
+    <string name="insert_frm">from</string>
+
+    <string name="file_new">File</string>
+    <string name="install_py3">Install Python 3</string>
+    <string name="py2_or_3">Do you want to use Python 3 or 2 by default ?</string>
+    <string name="use_py2">Use Python 2</string>
+    <string name="use_py3">Use Python 3</string>
+    <string name="py2_now">Using Python 2 now</string>
+    <string name="py3_now">Using Python 3 now</string>
+    <string name="install_py3_first">To switch to Python 3, please download it\'s resource</string>
+    <string name="install_py2compatible_first">To switch to Python 2 Compatible, please download it\'s resource</string>
+
+    <string name="choose_py3_inter"><![CDATA[You have downloaded it, you can switch to Python 3 to use it\'s interpreter]]></string>
+    <string name="choose_py2compatible_inter"><![CDATA[You have downloaded it, you can switch to Python 2 Compatible to use it\'s interpreter]]></string>
+    <string name="install_notebook_first">To Start QPyNotebook Service, please install first</string>
+
+    <string name="choose_notebook_inter"><![CDATA[You can Start QPyNotebook Service now]]></string>
+
+    <string name="notebook_first">First run, it will extract the notebook resource</string>
+
+    <string name="py_resources">Download Python Resource</string>
+
+    <string name="aipy_install">Check to Install AIPY</string>
+    <string name="aipy_installed">AIPy is installed</string>
+    <string name="switch_py3">Switch to Python 3</string>
+    <string name="update_py3"><![CDATA[Download Py3 Resource]]></string>
+    <string name="update_py2compatible"><![CDATA[Download Py2 Compatible Resource]]></string>
+
+    <string name="switch_py2">Reset to Python 2 Standard</string>
+    <string name="switch_py2_libs">It will remove all Python 2 libraries you have installed</string>
+
+    <string name="switch_py2compatible">Reset to Python 2 Compatible</string>
+
+    <string name="py_inter">Choose Python Interpreter</string>
+    <string name="notebook_res">QPyNotebook Resource</string>
+
+    <string name="install_aipy">Enable AIPY</string>
+    <string name="notebook">QPyNotebook</string>
+    <string name="notebook_for_py">QPyNotebook for Python {0}</string>
+
+    <string name="install_notebook">Install QPyNotebook</string>
+    <string name="notebook_service">QPyNotebook Service</string>
+    <string name="notebook_service_not_ready">QPyNotebook Service is not ready, please retry</string>
+    <string name="notebook_service_restart">Do you want to reload this notebook or restart the service?</string>
+    <string name="notebook_restart">Restart</string>
+    <string name="notebook_reload">Reload</string>
+
+    <string name="notebook_open">Do you want to open it with QPyNotebook?</string>
+
+    <string name="notebook_explorer">Start QPyNotebook Service</string>
+    <string name="notebook_explorer_bg_start">It will run when QPython starts</string>
+
+    <string name="enter_history">History</string>
+    <string name="qpy_featured">QPython Featured</string>
+    <string name="history_emp">History is empty</string>
+    <string name="no_google">Can\'t login without Google service</string>
+    <string name="pip_no_net">Can\'t open pip without network</string>
+    <string name="key_py3" translatable="false">switch_py3</string>
+    <string name="key_py2" translatable="false">switch_py2</string>
+    <string name="key_py2compatible" translatable="false">switch_py2compatible</string>
+
+    <string name="key_py_inter" translatable="false">py_inter</string>
+    <string name="key_aipy" translatable="false">aipy</string>
+    <string name="key_notebook" translatable="false">notebook</string>
+    <string name="key_notebook_run" translatable="false">notebook_run</string>
+
+    <string name="key_notebook_page" translatable="false">notebook_page</string>
+
+    <string name="py3_not_install">QPY3 not install</string>
+    <string name="install_py3_hint">Confirm to download Python 3 Resource?</string>
+    <string name="install_py2compatible_hint">Confirm to download Python 2 Compatible Resource?</string>
+
+    <string name="install_notebook_hint">Install QPyNotebook</string>
+
+    <string name="open_app_market">Install with App</string>
+    <string name="download_it">Download it</string>
+    <string name="download_py">Download Python Resource</string>
+    <string name="download_progress_need_sometime">It may take some time, please check the progress from notification bar</string>
+
+    <string name="download_notebook">Download QPyNotebook Resource</string>
+
+    <string name="release_error">Packages not release</string>
+
+    <string name="open_py3_hint">Please release packages from Python 3 app first</string>
+    <string name="open_py3">Open Python 3 app</string>
+    <string name="unzip_pac_fail">Unzip packages fail</string>
+    <string name="retry_hint">Please retry</string>
+    <string name="event_login" translatable="false">LOGIN</string>
+    <string name="event_me" translatable="false">Open_Me</string>
+    <string name="event_term" translatable="false">Open_terminal</string>
+    <string name="event_editor" translatable="false">Open_editor</string>
+    <string name="event_qpypi" translatable="false">Open_QPYPI</string>
+    <string name="event_commu" translatable="false">Open_community</string>
+    <string name="event_setting" translatable="false">Open_setting</string>
+    <string name="event_file" translatable="false">Open_explorer</string>
+    <string name="event_course" translatable="false">Open_course</string>
+    <string name="event_top" translatable="false">Open_Top</string>
+    <string name="browser">QPyBrowser</string>
+    <string name="switch_py3_hint">The interpreter are using python 2 now, do you want to switch to python 3?</string>
+    <string name="goto_setting">Go to setting</string>
+    <string name="net_lagging">The net seems lagging, please wait with patience</string>
+    <string name="usage_not_init">Usage is not init, please wait with patient</string>
+    <string name="free_plan">My Space Plan : Free (10M Max)</string>
+    <string name="share_body">Share the body</string>
+    <string name="crowdfunding">Crowdfunding%d%%</string>
+    <string name="funding">Donate</string>
+    <string name="support">Support</string>
+    <string name="my">My</string>
+    <string name="course_introduction">Course Introduction</string>
+    <string name="show">Show</string>
+    <string name="course_content">Course Content</string>
+    <string name="about_the_author">About The Author</string>
+    <string name="hide">Hide</string>
+    <string name="support_count">%s person supported</string>
+    <string name="free">Learn</string>
+    <string name="explanation">Crowdfunding Description: ：\n\n\u0020\u0020Welcome to Crowdfunding QPython Premium Curriculum. QPython\'s crowdfunding encourages the creation of quality, original Python text content for your learning.</string>
+    <string name="explanation_more">\u0020\u0020Over 100 people complete the crowdfunding, the author will launch a quality beginner\'s program in less than a week. Over 500 people complete the crowdfunding, the author will launch an intermediate learning course within two weeks. When more than 2,000 people complete the crowdfunding, the author will launch an advanced learning course within three weeks. \n\n\u0020\u0020The cost of crowdfunding varies from stage to stage. For the first 100 people, you only need %1$s for the first stage. When in the medium stage you need %2$s, and %3$s for the advanced stage. If you want to participate in the learning after the crowdfunding is completed, you have to pay at least %4$s.\n\n\u0020\u0020You can participate in the crowdfunding at any stage, and after the crowdfunding you will have access to the corresponding course. You can read materials, practice programming, share programs and get a more interesting learning experience. If you are interested in this course, welcome to participate as soon as possible.</string>
+    <string name="support_explanation">Your reward is the motivation for us to continue to write good courses.</string>
+    <string name="from_content">Comment</string>
+    <string name="author">Author</string>
+    <string name="basics">Basics</string>
+    <string name="database">Database</string>
+    <string name="explore_course">Explore more courses</string>
+    <string name="featured">Featured</string>
+    <string name="other">Other</string>
+    <string name="support_us">Support Us</string>
+    <string name="thank">Thanks</string>
+    <string name="start">Start</string>
+    <string name="buy_course">Buy Course</string>
+    <string name="rmb">%s RMB</string>
+    <string name="notebook_installed">After starting QPyNotebook Service, you can browse the ipynb file from explorer</string>
+    <string name="notebook_not_started">QPyNotebook is not started</string>
+
+    <string name="notebook_py3_support">QPyNotebook only supports Python 3</string>
+    <string name="notebook_enable" translatable="false">notebook_enable</string>
+    <string name="start_learn">Start to learn</string>
+    <string name="entertainment">Entertainment</string>
+    <string name="ennable_notebook_first">Please enable QPyNotebook in setting.</string>
+    <string name="funny">Funny</string>
+    <string name="back_course">Back this course</string>
+    <string name="c_funding">Crowdfunding</string>
+
+    <string name="elementary">Primary course</string>
+    <string name="intermediate">Intermediate course</string>
+    <string name="advanced">Advanced course</string>
+    <string name="dialog_alert">Notice</string>
+    <string name="conn_error">connection error!</string>
+    <string name="create_shortcut">Create Shortcut</string>
+    <string name="run_with_params">Run with params</string>
+    <string name="open_with_editor">Edit</string>
+
+    <string name="enter_u_params">Enter your params</string>
+    <string name="params">Params</string>
+    <string name="params_emp">Params is Empty</string>
+    <string name="install_kivy_first">Please install kivy library from QPYPI first.</string>
+    <string name="login_to_comment_hint">You need to login before post comment.</string>
+    <string name="write_a_response">Write a response…</string>
+    <string name="default_text">--</string>
+    <string name="copy_to_editor_to_run">copy to editor to run</string>
+    <string name="empty_hint">Comment must be not empty</string>
+    <string name="login_first">Please login first</string>
+    <string name="reply_to">Reply to: %s</string>
+    <string name="reply_format"><![CDATA[<font color="#ECCD00">@ %1$s</font>: %2$s]]></string>
+    <string name="no_data">No data</string>
+    <string name="delete_gist_hint">Do you really want to delete this gist?</string>
+    <string name="view_code">View </string>
+    <string name="fork_code">Fork</string>
+    <string name="fork_suc">Fork Success, you can view it in [My Gist]</string>
+    <string name="post">post</string>
+    <string name="summary">Summary</string>
+    <!--ADD 265-->
+    <string name="choose_action">Choose action</string>
+    <string name="learn_course">Learn QPython with courses</string>
+    <string name="get_help">Get support</string>
+    <string name="get_support_from_community">Get support from community</string>
+    <string name="my_gists">My Gists</string>
+    <string name="my_stars">My Stars</string>
+    <string name="gist_intro">And I want to share my code to support forum</string>
+    <string name="gist_own">I will save the script to my gist repo</string>
+
+    <string name="login_successfully">Login successfully</string>
+    <string name="login_failed">Login failed</string>
+
+    <string name="qr_info">Confirm</string>
+    <string name="qr_goto">Do you want to visit this URL: </string>
+
+
+    <string name="signin_error">Error occured, please retry</string>
+    <string name="project_main_error"> Project\'s main.py does not exit</string>
+
+    <string name="key_root" translatable="false">root</string>
+    <string name="key_sl4a" translatable="false">sl4a</string>
+    <string name="key_qpypi" translatable="false">qpypi</string>
+    <string name="key_update_qpy3" translatable="false">update_py3</string>
+    <string name="key_update_qpy2compatible" translatable="false">update_py2compatible</string>
+
+    <string name="python_interpreter">Python Interpreter</string>
+    <string name="action_notebook">Notebook</string>
+
+    <string name="shell_terminal">Shell Terminal</string>
+    <string name="ip_address">My IP Adress</string>
+    <string name="ip_address_need_wifi">Please connect your wifi</string>
+
+
+    <string name="editor_override">Do you want to override?</string>
 
 </resources>
diff --git a/qpython/src/main/res/values/strings_activity_settings.xml b/qpython/src/main/res/values/strings_activity_settings.xml
index c894df1f..d019240e 100644
--- a/qpython/src/main/res/values/strings_activity_settings.xml
+++ b/qpython/src/main/res/values/strings_activity_settings.xml
@@ -1,61 +1,11 @@
 <resources>
-    <string name="title_activity_settings">设置</string>
 
     <!-- Strings related to Settings -->
 
     <!-- Example General settings -->
-    <string name="pref_header_general">General</string>
-
-    <string name="pref_title_social_recommendations">Enable social recommendations</string>
-    <string name="pref_description_social_recommendations">Recommendations for people to contact
-        based on your message history
-    </string>
-
-    <string name="pref_title_display_name">Display name</string>
-    <string name="pref_default_display_name">John Smith</string>
-
-    <string name="pref_title_add_friends_to_messages">Add friends to messages</string>
-    <string-array name="pref_example_list_titles">
-        <item>Always</item>
-        <item>When possible</item>
-        <item>Never</item>
-    </string-array>
-    <string-array name="pref_example_list_values">
-        <item>1</item>
-        <item>0</item>
-        <item>-1</item>
-    </string-array>
 
     <!-- Example settings for Data & Sync -->
-    <string name="pref_header_data_sync">Data &amp; sync</string>
-
-    <string name="pref_title_sync_frequency">Sync frequency</string>
-    <string-array name="pref_sync_frequency_titles">
-        <item>15 minutes</item>
-        <item>30 minutes</item>
-        <item>1 hour</item>
-        <item>3 hours</item>
-        <item>6 hours</item>
-        <item>Never</item>
-    </string-array>
-    <string-array name="pref_sync_frequency_values">
-        <item>15</item>
-        <item>30</item>
-        <item>60</item>
-        <item>180</item>
-        <item>360</item>
-        <item>-1</item>
-    </string-array>
-
-    <string name="pref_title_system_sync_settings">System sync settings</string>
 
     <!-- Example settings for Notifications -->
-    <string name="pref_header_notifications">Notifications</string>
-
-    <string name="pref_title_new_message_notifications">New message notifications</string>
-
-    <string name="pref_title_ringtone">Ringtone</string>
-    <string name="pref_ringtone_silent">Silent</string>
 
-    <string name="pref_title_vibrate">Vibrate</string>
 </resources>
diff --git a/qpython/src/main/res/values/strings_plugin_manager.xml b/qpython/src/main/res/values/strings_plugin_manager.xml
index e438923d..e6dd2c9f 100644
--- a/qpython/src/main/res/values/strings_plugin_manager.xml
+++ b/qpython/src/main/res/values/strings_plugin_manager.xml
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="toast_plugin_uninstall_complete">Plugin uninstall complete</string>
-    <string name="toast_plugin_install_complete">Plugin install complete</string>
-    <string name="toast_plugin_install_failure">Plugin install fail</string>
-    <string name="dialog_plugin_detail_positive">OK</string>
-    <string name="title_select_plugin">Select plugin</string>
-    <string name="title_plugin_manage">Plugin manager</string>
-    <string name="toast_read_permission_deny">Permission deny</string>
-
-    <string name="plugin_install">Install</string>
-    <string name="plugin_uninstall">UnInstall</string>
-    <string name="plugin_update">Update</string>
-    <string name="plugin_detail">Detail</string>
-
-    <string-array name="plugin_tab">
-        <item>Local plugin</item>
-        <item>Cloud plugin</item>
-    </string-array>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="toast_plugin_uninstall_complete">Plugin uninstall complete</string>
+    <string name="toast_plugin_install_complete">Plugin install complete</string>
+    <string name="toast_plugin_install_failure">Plugin install fail</string>
+    <string name="dialog_plugin_detail_positive">OK</string>
+    <string name="title_select_plugin">Select plugin</string>
+    <string name="title_plugin_manage">Plugin manager</string>
+    <string name="toast_read_permission_deny" translatable="false">Permission deny</string>
+
+    <string name="plugin_install">Install</string>
+    <string name="plugin_uninstall">UnInstall</string>
+    <string name="plugin_update">Update</string>
+    <string name="plugin_detail">Detail</string>
+
+    <string-array name="plugin_tab">
+        <item>Local plugin</item>
+        <item>Cloud plugin</item>
+    </string-array>
 </resources>
\ No newline at end of file
diff --git a/qpython/src/main/res/values/styles.xml b/qpython/src/main/res/values/styles.xml
index 4194a669..0f3672b1 100644
--- a/qpython/src/main/res/values/styles.xml
+++ b/qpython/src/main/res/values/styles.xml
@@ -1,18 +1,57 @@
-<resources>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
 
+    <style name="TransparentTheme" parent="@style/Theme.AppCompat">
+
+        <item name="android:background">@android:color/transparent</item>
+        <item name="background">@android:color/transparent</item>
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:colorBackgroundCacheHint">@android:color/transparent</item>
+        <item name="android:windowContentOverlay">@android:color/transparent</item>
+        <item name="android:windowIsTranslucent">@android:color/transparent</item>
+        <item name="android:windowAnimationStyle">@android:color/transparent</item>
+    </style>
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
+    <style name="AppTheme" parent="Theme.AppCompat.NoActionBar">
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
+        <item name="android:textColorTertiary">@color/white</item>
         <item name="android:textColorPrimary">@color/white</item>
         <item name="colorControlNormal">@color/white</item>
-        <item name="selectableItemBackground">@drawable/toolbar_button_bg</item>
+        <item name="colorAccent">@color/colorAccent</item>
+        <item name="android:background">@color/colorPrimaryDark</item>
+        <!--<item name="android:dialogPreferenceStyle">@style/MyAlertDialogStyle</item>-->
+        <!--<item name="android:dialogTheme">@style/MyAlertDialogStyle</item>-->
+        <item name="android:colorBackground">@color/colorPrimaryDark</item>
+        <item name="android:alertDialogTheme">@style/MyDialog</item>
+        <item name="android:windowBackground">@color/colorPrimaryDark</item>
+        <item name="android:actionMenuTextColor">@color/colorAccent</item>
+        <item name="actionMenuTextColor">@color/colorAccent</item>
         <item name="android:textAppearanceSmallPopupMenu">@style/popupMenuTextAppearanceSmall</item>
         <item name="android:textAppearanceLargePopupMenu">@style/popupMenuTextAppearanceLarge</item>
     </style>
 
+    <style name="SettingTheme" parent="Theme.AppCompat.NoActionBar">
+        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+        <item name="android:textColorSecondary">#FF9B9B9B</item>
+        <item name="textColorAlertDialogListItem">#EEEEEE</item>
+    </style>
+
+    <style name="FullscreenTheme" parent="Theme.AppCompat.NoActionBar">
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:windowFullscreen">?android:windowNoTitle</item>
+    </style>
+
+
+    <style name="DialogAnimation">
+        <item name="android:windowEnterAnimation">@anim/slide_up</item>
+        <item name="android:windowExitAnimation">@anim/slide_down</item>
+    </style>
+
     <style name="popupMenuTextAppearanceSmall" parent="@style/TextAppearance.AppCompat.Light.Widget.PopupMenu.Small">
         <item name="android:textColor">@android:color/black</item>
     </style>
@@ -24,10 +63,9 @@
 
     <style name="DefaultBlueToolbar" parent="@style/ThemeOverlay.AppCompat.Light">
         <item name="actionOverflowMenuStyle">@style/OverflowMenuStyle</item>
-    </style>
-
-    <style name="nav_menu_style" parent="@style/ThemeOverlay.AppCompat.ActionBar">
-        <item name="selectableItemBackground">@drawable/nav_menu_bg</item>
+        <item name="android:itemBackground">@color/colorPrimaryDark</item>
+        <item name="android:colorBackground">@color/colorPrimaryDark</item>
+        <item name="android:textColor">@color/white</item>
     </style>
 
     <style name="OverflowMenuStyle" parent="Widget.AppCompat.Light.PopupMenu.Overflow">
@@ -38,7 +76,8 @@
         <item name="colorControlNormal">@color/white</item>
     </style>
 
-    <style name="ConsoleTheme" parent="@android:style/Theme.Light">
+    <style name="ConsoleTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+        <item name="android:windowFullscreen">false</item>
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
@@ -47,38 +86,19 @@
         <item name="android:windowContentOverlay">@null</item>
     </style>
 
-
-    <style name="WebViewTheme" parent="FinestWebViewTheme.Light">
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/white</item>
-        <item name="android:textColorPrimary">@color/white</item>
-        <item name="android:textColorSecondary">@color/white</item>
-        <item name="windowActionModeOverlay">true</item>
-    </style>
+    <style name="toolbar_text" parent="TextAppearance.AppCompat.Widget.ActionBar.Title"/>
+    <!--<style name="WebViewTheme" parent="FinestWebViewTheme.Light">-->
+    <!--<item name="colorPrimary">@color/colorPrimary</item>-->
+    <!--<item name="colorPrimaryDark">@color/colorPrimaryDark</item>-->
+    <!--<item name="colorAccent">@color/white</item>-->
+    <!--<item name="android:textColorPrimary">@color/white</item>-->
+    <!--<item name="android:textColorSecondary">@color/white</item>-->
+    <!--<item name="windowActionModeOverlay">true</item>-->
+    <!--</style>-->
 
 
     <!-- Base application theme. -->
-    <style name="DownActivityTheme" parent="AppTheme">
-        <!-- Customize your theme here. -->
-
-        <item name="selectableItemBackground">@drawable/nav_menu_bg</item>
-    </style>
-
 
-    <style name="EditorSettingTheme" parent="AppTheme">
-        <item name="android:textColorPrimary">@color/text_dark</item>
-    </style>
-
-    <style name="ItemMenuTheme">
-        <item name="android:layout_width">wrap_content</item>
-        <item name="android:layout_height">match_parent</item>
-        <item name="android:gravity">center</item>
-        <item name="android:paddingLeft">16dp</item>
-        <item name="android:paddingRight">16dp</item>
-        <item name="android:textColor">@color/white</item>
-        <item name="android:textSize">15sp</item>
-    </style>
 
     <style name="Toolbar.Item" parent="TextAppearance.AppCompat.Widget.ActionBar.Menu">
         <item name="android:textColor">@android:color/white</item>
@@ -102,4 +122,182 @@
         <item name="colorControlNormal">#fff</item>
     </style>
 
+    <style name="MyEditText" parent="Theme.AppCompat.Light">
+        <item name="colorControlNormal">@color/theme_green</item>
+    </style>
+
+    <style name="Dialog" parent="BaseDialog">
+        <item name="android:windowCloseOnTouchOutside">true</item>
+    </style>
+
+    <style name="BaseDialog" parent="Theme.AppCompat.Dialog">
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:windowFrame">@null</item>
+        <item name="android:windowCloseOnTouchOutside">false</item>
+        <item name="colorAccent">@color/colorAccent</item>
+    </style>
+
+    <style name="BottomAnim" parent="@android:style/Animation">
+        <item name="android:windowEnterAnimation">@anim/slide_in_bottom</item>
+        <item name="android:windowExitAnimation">@anim/slide_out_bottom</item>
+    </style>
+
+    <!--  透明背景  -->
+
+    <style name="setting_tv">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_marginTop">1dp</item>
+        <item name="android:background">#FF363636</item>
+        <item name="android:drawableRight">@drawable/ic_white_arrow_right</item>
+        <item name="android:padding">@dimen/default_margin</item>
+        <!--<item name="android:paddingTop">10dp</item>-->
+        <!--<item name="android:paddingBottom">10dp</item>-->
+        <!--<item name="android:paddingRight">@dimen/default_margin</item>-->
+        <!--<item name="android:paddingLeft">@dimen/default_margin</item>-->
+        <item name="android:gravity">center_vertical</item>
+        <item name="android:textColor">#FFF</item>
+    </style>
+
+    <style name="grid_item">
+        <item name="android:layout_width">0dp</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_weight">1</item>
+        <item name="android:gravity">center</item>
+        <item name="android:orientation">vertical</item>
+    </style>
+
+    <style name="row_ll">
+        <item name="android:layout_width">0dp</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_weight">1</item>
+        <item name="android:gravity">center</item>
+        <item name="android:orientation">vertical</item>
+    </style>
+
+    <style name="tab_btn">
+        <item name="android:textAllCaps">false</item>
+        <item name="android:layout_width">0dp</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:padding">@dimen/default_margin</item>
+        <item name="android:layout_weight">1</item>
+        <item name="android:background">@color/colorPrimaryDark</item>
+        <item name="android:textColor">@drawable/select_green_text</item>
+    </style>
+
+    <style name="param_text">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_alignParentRight">true</item>
+        <item name="android:layout_centerVertical">true</item>
+        <item name="android:textColor">#FF888888</item>
+        <item name="android:layout_marginRight">45dp</item>
+    </style>
+
+    <style name="param_hint">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:drawableRight">@drawable/ic_white_arrow_right</item>
+        <item name="android:gravity">center_vertical</item>
+        <item name="android:textColor">#FFF</item>
+    </style>
+
+    <style name="TextTitle">
+        <item name="android:paddingTop">14dp</item>
+        <item name="android:textSize">24sp</item>
+        <item name="android:textStyle">bold</item>
+    </style>
+
+    <style name="TextSubTitle">
+        <item name="android:paddingTop">10dp</item>
+        <item name="android:textSize">18sp</item>
+    </style>
+
+    <style name="TextContent">
+        <item name="android:paddingTop">6dp</item>
+        <item name="android:textSize">14sp</item>
+    </style>
+
+    <style name="green_btn">
+        <item name="android:layout_width">80dp</item>
+        <item name="android:layout_height">35dp</item>
+        <item name="android:background">@drawable/green_btn_bg</item>
+        <item name="android:textColor">#FFF</item>
+        <item name="android:textSize">18sp</item>
+    </style>
+
+    <style name="dialog_item">
+        <item name="android:textSize">15sp</item>
+        <item name="android:layout_marginTop">1dp</item>
+        <item name="android:padding">16dp</item>
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:background">#FF4A4A4A</item>
+        <item name="android:textColor">#FFF</item>
+    </style>
+
+    <style name="editor_bottom_btn">
+        <item name="android:layout_width">47dp</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:background">@null</item>
+        <item name="android:clickable">true</item>
+        <item name="android:padding">5dip</item>
+    </style>
+
+    <style name="editor_marks_btn">
+        <item name="android:textColor">@color/colorPrimaryDark</item>
+        <item name="android:layout_width">47dp</item>
+        <item name="android:minWidth">47dp</item>
+        <item name="android:padding">5dp</item>
+        <item name="android:textStyle">bold</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:background">@color/transparency</item>
+        <item name="android:clickable">true</item>
+    </style>
+
+    <style name="Theme.AppCompat.Dialog">
+        <item name="android:windowBackground">@color/colorPrimaryDark</item>
+        <item name="android:windowSoftInputMode">stateUnspecified|adjustPan</item>
+        <item name="android:textColor">@color/white</item>
+        <item name="android:textColorSecondary">@color/colorAccent</item>
+    </style>
+
+    <style name="top_hint">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:background">@color/colorPrimaryDark</item>
+        <item name="android:padding">@dimen/default_margin</item>
+        <item name="android:textColor">#FFF</item>
+        <item name="android:textSize">15sp</item>
+    </style>
+
+    <style name="top_describe">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:background">@color/colorPrimaryDark</item>
+        <item name="android:paddingBottom">@dimen/default_margin</item>
+        <item name="android:paddingLeft">@dimen/default_margin</item>
+        <item name="android:paddingRight">@dimen/default_margin</item>
+        <item name="android:textColor">#9B9B9B</item>
+    </style>
+
+    <style name="MyDialog" parent="Theme.AppCompat.Light.Dialog.Alert">
+        <item name="android:windowIsFloating">true</item>
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <!-- Used for the buttons -->
+        <item name="colorAccent">#FFF</item>
+        <!--<item name="colorPrimary">#FF4BAC07</item>-->
+        <item name="android:textColor">@color/colorAccent</item>
+        <item name="android:textColorAlertDialogListItem">#FFF</item>
+        <item name="textColorAlertDialogListItem">#FFF</item>
+        <!-- Used for the title and text -->
+        <item name="android:textColorPrimary">#FFF</item>
+        <item name="android:textColorSecondary">#FFF</item>
+        <!--<item name="android:textColorTertiary">#FF4BAC07</item>-->
+        <!-- Used for the background -->
+        <item name="android:background">@color/colorPrimary</item>
+    </style>
+
 </resources>
diff --git a/qpython/src/main/res/values/textview_dimens.xml b/qpython/src/main/res/values/textview_dimens.xml
index 31be6401..febee99d 100644
--- a/qpython/src/main/res/values/textview_dimens.xml
+++ b/qpython/src/main/res/values/textview_dimens.xml
@@ -1,12 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="text_handle_min_size">40dp</dimen>
-    <dimen name="editor_text_size">18sp</dimen>
 
     <!-- Size of the fastscroll hint letter -->
-    <dimen name="fastscroll_overlay_size">104dp</dimen>
     <!-- Width of the fastscroll thumb -->
-    <dimen name="fastscroll_thumb_width">64dp</dimen>
     <!-- Height of the fastscroll thumb -->
-    <dimen name="fastscroll_thumb_height">52dp</dimen>
 </resources>
diff --git a/qpython/src/main/res/values/textview_material_dimens.xml b/qpython/src/main/res/values/textview_material_dimens.xml
index b357a56a..743ecdfa 100644
--- a/qpython/src/main/res/values/textview_material_dimens.xml
+++ b/qpython/src/main/res/values/textview_material_dimens.xml
@@ -14,82 +14,29 @@
 -->
 <resources>
     <!-- Preference activity, vertical padding for the header list -->
-    <dimen name="preference_screen_header_vertical_padding_material">8dp</dimen>
 
     <!-- Preference activity side margins -->
-    <dimen name="preference_screen_side_margin_material">0dp</dimen>
     <!-- Preference activity side margins negative-->
-    <dimen name="preference_screen_side_margin_negative_material">0dp</dimen>
 
     <!-- Preference fragment padding, sides -->
-    <dimen name="preference_fragment_padding_side_material">8dp</dimen>
 
     <!-- Preference breadcrumbs padding, start padding -->
-    <dimen name="preference_breadcrumbs_padding_start_material">12dp</dimen>
 
     <!-- Preference breadcrumbs padding, end padding -->
-    <dimen name="preference_breadcrumbs_padding_end_material">24dp</dimen>
-
-    <dimen name="preference_screen_header_padding_side_material">0dp</dimen>
 
     <!-- Default height of an action bar. -->
-    <dimen name="action_bar_default_height_material">56dp</dimen>
     <!-- Default padding of an action bar. -->
-    <dimen name="action_bar_default_padding_material">4dp</dimen>
     <!-- Vertical padding around action bar icons. -->
-    <dimen name="action_bar_icon_vertical_padding_material">16dp</dimen>
     <!-- Top margin for action bar subtitles -->
-    <dimen name="action_bar_subtitle_top_margin_material">-3dp</dimen>
     <!-- Bottom margin for action bar subtitles -->
-    <dimen name="action_bar_subtitle_bottom_margin_material">5dp</dimen>
-
-    <dimen name="action_button_min_width_overflow_material">36dp</dimen>
-    <dimen name="action_button_min_width_material">48dp</dimen>
-    <dimen name="action_button_min_height_material">48dp</dimen>
-
-    <dimen name="text_size_display_4_material">112sp</dimen>
-    <dimen name="text_size_display_3_material">56sp</dimen>
-    <dimen name="text_size_display_2_material">45sp</dimen>
-    <dimen name="text_size_display_1_material">34sp</dimen>
-    <dimen name="text_size_headline_material">24sp</dimen>
-    <dimen name="text_size_title_material">20sp</dimen>
-    <dimen name="text_size_subhead_material">16sp</dimen>
-    <dimen name="text_size_title_material_toolbar">20dp</dimen>
-    <dimen name="text_size_subtitle_material_toolbar">16dp</dimen>
-    <dimen name="text_size_menu_material">16sp</dimen>
-    <dimen name="text_size_body_2_material">14sp</dimen>
-    <dimen name="text_size_body_1_material">14sp</dimen>
-    <dimen name="text_size_caption_material">12sp</dimen>
-    <dimen name="text_size_button_material">14sp</dimen>
-
-    <dimen name="text_size_large_material">22sp</dimen>
-    <dimen name="text_size_medium_material">18sp</dimen>
-    <dimen name="text_size_small_material">14sp</dimen>
-
-    <dimen name="floating_window_z">16dp</dimen>
-    <dimen name="floating_window_margin_left">16dp</dimen>
-    <dimen name="floating_window_margin_top">8dp</dimen>
-    <dimen name="floating_window_margin_right">16dp</dimen>
-    <dimen name="floating_window_margin_bottom">32dp</dimen>
 
     <!-- Elevation when button is pressed -->
-    <dimen name="button_elevation_material">1dp</dimen>
     <!-- Z translation to apply when button is pressed -->
-    <dimen name="button_pressed_z_material">2dp</dimen>
     <!-- Default insets (outer padding) around buttons -->
-    <dimen name="button_inset_vertical_material">6dp</dimen>
-    <dimen name="button_inset_horizontal_material">@dimen/control_inset_material</dimen>
     <!-- Default inner padding within buttons -->
-    <dimen name="button_padding_vertical_material">@dimen/control_padding_material</dimen>
-    <dimen name="button_padding_horizontal_material">8dp</dimen>
 
     <!-- Default insets (outer padding) around controls -->
-    <dimen name="control_inset_material">4dp</dimen>
     <!-- Default inner padding within controls -->
-    <dimen name="control_padding_material">4dp</dimen>
     <!-- Default rounded corner for controls -->
-    <dimen name="control_corner_material">2dp</dimen>
 
-    <dimen name="alert_dialog_padding_material">24dp</dimen>
-    <dimen name="alert_dialog_padding_top_material">18dp</dimen>
 </resources>
diff --git a/qpython/src/main/res/values/textview_strings.xml b/qpython/src/main/res/values/textview_strings.xml
deleted file mode 100644
index 8ac03f93..00000000
--- a/qpython/src/main/res/values/textview_strings.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<!--
-  ~ Copyright (C) 2016 Jecelyin Peng <jecelyin@gmail.com>
-  ~
-  ~ This file is part of 920 Text Editor.
-  ~
-  ~ 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.
-  -->
-
-<resources>
-    <string name="delete">删除</string>
-    <string name="addToDictionary">添加到字典</string>
-    <string name="deleteText">删除文本</string>
-    <string name="paste">粘贴</string>
-    <string name="replace">替换</string>
-    <string name="textSelectionCABTitle">选取文字</string>
-    <string name="selectAll">全选</string>
-    <string name="cut">剪切</string>
-    <string name="copy">复制</string>
-    <string name="find">查找</string>
-</resources>
diff --git a/qpython/src/main/res/values/textview_styles.xml b/qpython/src/main/res/values/textview_styles.xml
index 7b2edba0..d781ec5f 100644
--- a/qpython/src/main/res/values/textview_styles.xml
+++ b/qpython/src/main/res/values/textview_styles.xml
@@ -1,12 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="TextAppearanceLarge">
-        <item name="android:textSize">@dimen/text_size_large_material</item>
-    </style>
-
-    <style name="SuggestionHighlight">
-        <item name="android:textSize">18sp</item>
-        <item name="android:textColor">#177bbd</item>
-    </style>
 </resources>
diff --git a/qpython/src/main/res/values/toasts.xml b/qpython/src/main/res/values/toasts.xml
new file mode 100644
index 00000000..53a181ad
--- /dev/null
+++ b/qpython/src/main/res/values/toasts.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="toast_recent_files_invalid">"File doesn't exist anymore, removing from recent list."</string>
+    <string name="toast_recent_files_deleted">File deleted from recent list</string>
+    <string name="toast_intent_invalid_uri">Unable to open the file, URI is invalid</string>
+    <string name="toast_intent_illegal">Unable to open the file</string>
+    <string name="toast_activity_open">Unable to load the file browser</string>
+    <string name="toast_memory_open">Unable to open the file, not enough memory</string>
+    <string name="toast_open_error">Unable to open the file (maybe the file is too big, or corrupted)</string>
+    <string name="toast_save_null">Unable to save, path is null</string>
+    <string name="toast_save_temp">Unable to save to temp file</string>
+    <string name="toast_save_delete">Unable to save (error while copying temp file to save location)</string>
+    <string name="toast_save_rename">Unable to save (error while copying temp file to save location)</string>
+    <string name="toast_save_success">File saved</string>
+    <string name="toast_folder_cant_write">"Can't use this folder cause it isn't writeable"</string>
+    <string name="toast_file_cant_read">"Can't use this file cause it isn't readable"</string>
+    <string name="toast_search_not_found">No match was found in the current file</string>
+    <string name="toast_search_eof">No more match found in the current file</string>
+    <string name="toast_search_no_input">Type a text to search in the search bar</string>
+    <string name="toast_filename_empty">The filename must not be empty</string>
+    <string name="toast_warn_no_undo">Nothing to undo anymore.</string>
+    <string name="toast_open_home_page_error">Default file not found, try setting a new one in the settings.</string>
+    <string name="toast_home_page_cant_read">"Can't open default file cause it isn't readable"</string>
+    <string name="toast_widget_select">Select a file to associate with this new widget</string>
+    <string name="toast_open_select">Select a file to open</string>
+    <string name="toast_home_page_select">Select a file to open when you launch Ted from your home screen</string>
+    <string name="toast_file_saved_auto">"The opened file was saved automatically, and will be opened at next startup"</string>
+
+
+    <!--  -->
+    <string name="toast_folder_doesnt_exist">"Can't display folder cause it doesn't exist"</string>
+    <string name="toast_folder_not_folder">Can\'t display folder cause it isn\'t a folder</string>
+    <string name="toast_folder_cant_read">"Can't display folder cause it isn't readable"</string>
+    <string name="toast_no_market">The Android Play Store is not present on this device</string>
+
+</resources>
\ No newline at end of file
diff --git a/qpython/src/main/res/xml/editor_preference.xml b/qpython/src/main/res/xml/editor_preference.xml
deleted file mode 100644
index c81ca22b..00000000
--- a/qpython/src/main/res/xml/editor_preference.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <PreferenceCategory android:title="@string/editor">
-
-        <org.qpython.qpy.editor2.preference.FontSizePreference
-            android:key="pref_font_size"
-            android:summary="@string/default_value"
-            android:title="@string/font_size" />
-        <org.qpython.qpy.editor2.preference.CursorWidthPreference
-            android:key="pref_cursor_width"
-            android:summary="@string/default_value"
-            android:title="@string/cursor_width" />
-
-        <CheckBoxPreference
-            android:key="pref_touch_to_adjust_text_size"
-            android:title="@string/touch_to_adjust_text_size" />
-
-        <CheckBoxPreference
-            android:key="pref_word_wrap"
-            android:title="@string/word_wrap_in_editor" />
-
-        <CheckBoxPreference
-            android:key="pref_show_linenumber"
-            android:title="@string/show_linenumber" />
-
-        <CheckBoxPreference
-            android:key="pref_show_whitespace"
-            android:title="@string/show_whitespace" />
-
-        <CheckBoxPreference
-            android:key="pref_auto_indent"
-            android:title="@string/auto_indent" />
-
-        <CheckBoxPreference
-            android:key="pref_insert_space_for_tab"
-            android:title="@string/insert_space_for_tab" />
-
-        <com.afollestad.materialdialogs.prefs.MaterialEditTextPreference
-            android:inputType="number"
-            android:key="pref_tab_size"
-            android:maxLength="1"
-            android:singleLine="true"
-            android:summary="4"
-            android:title="@string/tab_size" />
-
-        <CheckBoxPreference
-            android:key="pref_auto_capitalize"
-            android:title="@string/auto_capitalize" />
-    </PreferenceCategory>
-
-    <PreferenceCategory android:title="@string/highlight_and_theme">
-        <CheckBoxPreference
-            android:key="pref_enable_highlight"
-            android:title="@string/enable_highlight" />
-
-        <com.afollestad.materialdialogs.prefs.MaterialEditTextPreference
-            android:inputType="number"
-            android:key="pref_highlight_file_size_limit"
-            android:singleLine="true"
-            android:summary="500 KB"
-            android:title="@string/highlight_the_file_size_limit" />
-        <org.qpython.qpy.editor2.preference.JecListPreference
-            android:enabled="false"
-            android:key="pref_theme"
-            android:summary="mac classic"
-            android:title="@string/select_theme" />
-    </PreferenceCategory>
-
-    <PreferenceCategory android:title="@string/other">
-
-        <CheckBoxPreference
-            android:key="pref_auto_save"
-            android:title="@string/auto_save" />
-
-        <CheckBoxPreference
-            android:key="pref_remember_last_opened_files"
-            android:summary="@string/remember_last_opened_files_summary"
-            android:title="@string/remember_last_opened_files" />
-
-        <org.qpython.qpy.editor2.preference.JecListPreference
-            android:entries="@array/screen_orientation"
-            android:entryValues="@array/screen_orientation_values"
-            android:key="pref_screen_orientation"
-            android:title="@string/screen_orientation" />
-
-        <CheckBoxPreference
-            android:key="pref_keep_screen_on"
-            android:title="@string/keep_screen_on" />
-
-        <CheckBoxPreference
-            android:key="pref_enable_root"
-            android:title="@string/enable_root" />
-
-    </PreferenceCategory>    <item name="m_run" type="id" />
-
-
-    <CheckBoxPreference
-        android:key="pref_auto_check_updates"
-        android:title="@string/auto_check_updates" />
-
-    <Preference
-        android:key="pref_donate"
-        android:title="@string/donate" />
-
-    <Preference
-        android:key="pref_feedback"
-        android:title="@string/feedback" />
-
-    <Preference
-        android:key="pref_translate"
-        android:title="@string/help_translate" />
-
-    <Preference
-        android:key="pref_about"
-        android:title="@string/about" />
-</PreferenceScreen>
diff --git a/qpython/src/main/res/xml/network_security_config.xml b/qpython/src/main/res/xml/network_security_config.xml
new file mode 100644
index 00000000..117f8bdf
--- /dev/null
+++ b/qpython/src/main/res/xml/network_security_config.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+    <domain-config cleartextTrafficPermitted="true">
+        <domain includeSubdomains="true">127.0.0.1</domain>
+        <domain includeSubdomains="true">localhost</domain>
+        <domain includeSubdomains="true">apu2.quseit.com</domain>
+        <domain includeSubdomains="true">qpy.io</domain>
+        <domain includeSubdomains="true">dl.qpy.io</domain>
+        <domain includeSubdomains="true">gist.qpy.io</domain>
+        <domain includeSubdomains="true">qpython.org</domain>
+        <domain includeSubdomains="true">gist.qpython.org</domain>
+        <domain includeSubdomains="true">edu.qpython.org</domain>
+        <domain includeSubdomains="true">www.qpython.org</domain>
+        <domain includeSubdomains="true">qpypi.qpython.org</domain>
+        <domain includeSubdomains="true">qpypi3.qpython.org</domain>
+
+    </domain-config>
+</network-security-config>
\ No newline at end of file
diff --git a/qpython/src/main/res/xml/qpython_setting.xml b/qpython/src/main/res/xml/qpython_setting.xml
new file mode 100644
index 00000000..245731f7
--- /dev/null
+++ b/qpython/src/main/res/xml/qpython_setting.xml
@@ -0,0 +1,201 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    android:key="setting_page"
+    >
+    <PreferenceCategory
+        android:key="other"
+        android:title="@string/about"/>
+    <!--<Preference-->
+        <!--android:key="install_py3"-->
+        <!--android:title="@string/install_py3"/>-->
+
+    <Preference
+        android:key="course"
+        android:title="@string/course"
+        android:summary="@string/learn_course"/>
+
+
+    <Preference
+        android:key="community"
+        android:title="@string/get_help"
+        android:summary="@string/get_support_from_community"/>
+    <Preference
+        android:key="@string/key_about"
+        android:title="@string/about"
+        android:summary="About / Feedback / Contributors"/>
+
+
+    <Preference
+        android:key="ipaddress"
+        android:title="@string/ip_address"
+        android:summary=""/>
+
+    <PreferenceCategory
+        android:key="config"
+        android:title="@string/more"/>
+
+
+    <Preference
+        android:key="lastlog"
+        android:title="@string/last_log"
+        android:summary="@string/get_last_log"/>
+
+    <PreferenceScreen
+        android:key="@string/key_py_inter"
+        android:title="@string/py_inter">
+
+        <!--PreferenceCategory
+            android:key="py_inter_update"
+            android:title="@string/py_resources">
+
+            <Preference
+                android:key="@string/key_update_qpy3"
+                android:summary=""
+                android:title="@string/update_py3"/>
+
+            <Preference
+                android:key="@string/key_update_qpy2compatible"
+                android:title="@string/update_py2compatible"/>
+
+        </PreferenceCategory-->
+
+        <PreferenceCategory
+            android:key="py_inter_update"
+            android:title="@string/py_inter">
+
+            <Preference
+                android:key="@string/key_py3"
+                android:title="@string/switch_py3"/>
+
+            <Preference
+                android:key="@string/key_py2"
+                android:title="@string/switch_py2"/>
+
+
+            <!--Preference
+                android:key="@string/key_py2compatible"
+                android:summary="@string/switch_py2_libs"
+                android:title="@string/switch_py2compatible"/-->
+
+        </PreferenceCategory>
+    </PreferenceScreen>
+
+
+    <!--CheckBoxPreference
+        android:key="@string/key_aipy"
+        android:summary="@string/aipy_install"
+        android:title="@string/install_aipy"/-->
+    <PreferenceScreen
+        android:summary="@string/notebook_not_started"
+        android:key="@string/key_notebook_page"
+        android:title="@string/notebook">
+        <!--PreferenceCategory
+            android:key="notebook_update"
+            android:title="@string/notebook_res">
+            <Preference
+                android:key="@string/key_notebook"
+                android:title="@string/install_notebook"/>
+
+        </PreferenceCategory-->
+
+        <PreferenceCategory
+            android:key="notebook_update"
+            android:title="@string/notebook_service">
+
+            <CheckBoxPreference
+                android:key="@string/key_notebook_run"
+                android:summary="@string/notebook_explorer_bg_start"
+                android:title="@string/notebook_explorer"/>
+        </PreferenceCategory>
+    </PreferenceScreen>
+
+    <CheckBoxPreference
+        android:key="@string/key_root"
+        android:summaryOn="@string/enable_root"
+        android:summaryOff="@string/disable_root"
+        android:title="@string/root_mode"/>
+
+    <CheckBoxPreference
+        android:key="@string/key_sl4a"
+        android:summaryOn="@string/sl4a_running"
+        android:summaryOff="@string/sl4a_un_running"
+        android:title="@string/sl4a_server"/>
+    <!--Preference
+        android:key="@string/key_qpypi"
+        android:summary="@string/http_qpypi_qpython_org"
+        android:title="@string/extra_pypi"/-->
+    <Preference
+        android:key="@string/key_reset"
+        android:title="@string/internal_space"/>
+    <PreferenceScreen
+        android:key="ftp"
+        android:title="@string/ftp_server">
+        <!-- Arbitrary key/value pairs can be included for fragment arguments -->
+        <!--<extra-->
+        <!--android:name="someKey"-->
+        <!--android:value="somePrefValue"/>-->
+
+        <CheckBoxPreference
+            android:defaultValue="false"
+            android:key="@string/key_ftp_state"
+            android:summary="@string/running_summary_stopped"
+            android:title="@string/running_label"/>
+
+        <PreferenceCategory
+            android:key="config"
+            android:title="@string/config">
+            <Preference
+                android:defaultValue="@string/username_default"
+                android:key="@string/key_username"
+                android:theme="@style/MyDialog"
+                android:title="@string/username_label"/>
+            <Preference
+                android:defaultValue="@string/password_default"
+                android:inputType="textPassword"
+                android:key="@string/key_ftp_pwd"
+                android:title="@string/password_label"/>
+            <Preference
+                android:defaultValue="@string/portnumber_default"
+                android:key="@string/key_port_num"
+                android:title="@string/portnumber_label"/>
+        </PreferenceCategory>
+
+        <PreferenceCategory
+            android:key="settings"
+            android:title="@string/settings_label">
+
+            <CheckBoxPreference
+                android:defaultValue="@string/show_password_default"
+                android:key="@string/key_show_pwd"
+                android:title="@string/show_password_label"/>
+            <Preference
+                android:defaultValue="@string/chroot_default"
+                android:key="@string/key_root_dir"
+                android:title="@string/chroot_label"/>
+
+            <CheckBoxPreference
+                android:defaultValue="@string/wakelock_default"
+                android:key="@string/key_stay_awake"
+                android:title="@string/wakelock_label"/>
+            <!--<PreferenceScreen-->
+            <!--xmlns:android="http://schemas.android.com/apk/res/android"-->
+            <!--android:title="@string/advancedsettings_label">-->
+
+            <!--</PreferenceScreen>-->
+
+        </PreferenceCategory>
+    </PreferenceScreen>
+    <PreferenceCategory
+        android:key="notify"
+        android:title="Notifications">
+        <SwitchPreference
+            android:defaultValue="true"
+            android:key="@string/key_hide_noti"
+            android:title="@string/log_noti"/>
+        <SwitchPreference
+            android:defaultValue="true"
+            android:key="@string/key_hide_push"
+            android:title="@string/app_noti"/>
+    </PreferenceCategory>
+
+</PreferenceScreen>
\ No newline at end of file
diff --git a/qpython/src/main/res/xml/shortcuts.xml b/qpython/src/main/res/xml/shortcuts.xml
new file mode 100644
index 00000000..e8e30d6d
--- /dev/null
+++ b/qpython/src/main/res/xml/shortcuts.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shortcuts xmlns:android="http://schemas.android.com/apk/res/android">
+    <shortcut
+        android:enabled="true"
+        android:icon="@drawable/ic_home_editor"
+        android:shortcutDisabledMessage="@string/editor"
+        android:shortcutId="editor"
+        android:shortcutLongLabel="@string/editor"
+        android:shortcutShortLabel="@string/editor">
+        <intent
+            android:action="android.intent.action.VIEW"
+            android:targetClass="org.qpython.qpy.texteditor.EditorActivity"
+            android:targetPackage="org.qpython.qpy"/>
+        <!-- If your shortcut is associated with multiple intents, include them
+             here. The last intent in the list determines what the user sees when
+             they launch this shortcut. -->
+        <!--<categories android:name="android.shortcut.conversation"/>-->
+    </shortcut>
+
+    <shortcut
+        android:enabled="true"
+        android:icon="@drawable/ic_home_terminal"
+        android:shortcutDisabledMessage="@string/application_terminal"
+        android:shortcutId="terminal"
+        android:shortcutLongLabel="@string/application_terminal"
+        android:shortcutShortLabel="@string/application_terminal">
+        <intent
+            android:action="android.intent.action.VIEW"
+            android:targetClass="org.qpython.qpy.console.TermActivity"
+            android:targetPackage="org.qpython.qpy"/>
+        <!-- If your shortcut is associated with multiple intents, include them
+             here. The last intent in the list determines what the user sees when
+             they launch this shortcut. -->
+        <!--<categories android:name="android.shortcut.conversation"/>-->
+    </shortcut>
+</shortcuts>
\ No newline at end of file
diff --git a/qpython/src/main/res/xml/ted_prefs.xml b/qpython/src/main/res/xml/ted_prefs.xml
new file mode 100644
index 00000000..33ae6370
--- /dev/null
+++ b/qpython/src/main/res/xml/ted_prefs.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+                  android:key="ted_settings"
+                  android:title="@string/title_settings">
+
+    <PreferenceCategory android:title="@string/config_cat_display">
+        <!--CheckBoxPreference
+            android:defaultValue="false"
+            android:key="show_gist"
+            android:summaryOn="@string/config_gist_icon"
+            android:title="@string/config_title_gist"/-->
+
+        <CheckBoxPreference
+            android:defaultValue="true"
+            android:key="show_line_numbers"
+            android:summaryOn="@string/config_summary_line_numbers"
+            android:title="@string/config_title_line_numbers"/>
+        <CheckBoxPreference
+            android:defaultValue="false"
+            android:key="auto_break_lines"
+            android:summaryOn="@string/config_summary_word_wrap"
+            android:title="@string/config_title_word_wrap"/>
+
+        <CheckBoxPreference
+            android:defaultValue="true"
+            android:key="fling_to_scroll"
+            android:summary="@string/config_summary_scroll_fling"
+            android:title="@string/config_title_scroll_fling"/>
+
+        <Preference
+            android:key="select_font"
+            android:title="@string/config_title_font"/>
+
+        <ListPreference
+            android:defaultValue="0"
+            android:entries="@array/color_theme_names"
+            android:entryValues="@array/color_theme_values"
+            android:key="color_theme"
+            android:title="@string/config_title_color_theme"/>
+        <ListPreference
+            android:defaultValue="14"
+            android:entries="@array/text_size_names"
+            android:entryValues="@array/text_size_values"
+            android:key="text_size"
+            android:title="@string/config_title_text_size"/>
+
+        <!--ListPreference
+            android:defaultValue="300"
+            android:entries="@array/max_lines_num_with_syntax_values"
+            android:entryValues="@array/max_lines_num_with_syntax_values"
+            android:key="max_lines_num_with_syntax"
+            android:summary="@string/max_lines_num_with_syntax_summary"
+            android:title="@string/max_lines_num_with_syntax_title"/-->
+    </PreferenceCategory>
+</PreferenceScreen>
diff --git a/qpython/src/oh/AndroidManifest.xml b/qpython/src/oh/AndroidManifest.xml
new file mode 100644
index 00000000..4a0dc7d5
--- /dev/null
+++ b/qpython/src/oh/AndroidManifest.xml
@@ -0,0 +1,408 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          xmlns:tools="http://schemas.android.com/tools"
+          package="org.qpython.qpy">
+
+    <uses-feature
+        android:name="android.hardware.touchscreen"
+        android:required="false"/>
+
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+    <uses-permission android:name="android.permission.CAMERA"/>
+    <uses-permission android:name="android.permission.FLASHLIGHT"/>
+    <uses-permission android:name="android.permission.VIBRATE" />
+    <uses-permission android:name="android.permission.RECEIVE_USER_PRESENT" />
+    <uses-permission android:name="com.android.vending.BILLING"/>
+    <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
+    <uses-permission android:name="com.android.launcher.permission.UNINSTALL_SHORTCUT" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_MEDIA_STORAGE" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.BLUETOOTH" />
+    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
+    <uses-permission android:name="android.permission.NFC" />
+    <uses-permission android:name="android.permission.RECORD_AUDIO" />
+    <uses-permission android:name="android.permission.ACCESS_NOTIFICATION_POLICY" />
+    <uses-permission android:name="android.permission.KILL_BACKGROUND_PROCESSES"/>
+    <uses-permission android:name="net.dinglisch.android.tasker.PERMISSION_RUN_TASKS" />
+    <!-- privacy sensitive permissions -->
+    <uses-permission android:name="android.permission.ACCESS_SUPERUSER" />
+    <!--uses-permission android:name="android.permission.READ_SMS"/>
+    <uses-permission android:name="android.permission.SEND_SMS" />
+    <uses-permission android:name="android.permission.RECEIVE_SMS"/>
+    <uses-permission android:name="android.permission.WRITE_SMS"/-->
+    <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
+    <uses-permission android:name="android.permission.CALL_PHONE"/>
+    <!--uses-permission android:name="android.permission.READ_CALL_LOG"/>
+    <uses-permission android:name="android.permission.PROCESS_OUTGOING_CALLS"/-->
+    <uses-permission android:name="android.permission.READ_CONTACTS"/>
+    <uses-permission android:name="android.permission.GET_ACCOUNTS"/>
+    <!--uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/-->
+
+    <uses-feature android:name="android.hardware.microphone" android:required="false"/>
+    <uses-feature android:name="android.hardware.telephony" android:required="false"/>
+    <uses-feature android:name="android.hardware.camera" android:required="false"/>
+    <uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
+    <uses-feature android:name="android.hardware.camera.flash" android:required="false"/>
+    <uses-feature android:name="android.hardware.screen.landscape" android:required="false"/>
+    <uses-feature android:name="android.hardware.wifi" android:required="false"/>
+    <uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
+    <uses-feature android:name="android.hardware.location.gps" android:required="false"/>
+    <uses-feature android:name="android.hardware.location.network" android:required="false"/>
+    <uses-feature android:name="android.hardware.bluetooth" android:required="false"/>
+
+    <uses-feature android:glEsVersion="0x00020000" android:required="false"/>
+
+    <application
+        android:networkSecurityConfig="@xml/network_security_config"
+        android:name="org.qpython.qpy.main.app.App"
+        android:allowBackup="true"
+        android:hardwareAccelerated="true"
+        android:icon="@drawable/ic_launcher"
+        android:label="@string/app_name"
+        android:largeHeap="true"
+        android:supportsRtl="true"
+        android:theme="@style/AppTheme">
+        <uses-library android:name="org.apache.http.legacy" android:required="false"/>
+
+        <meta-data
+            android:name="com.google.firebase.messaging.default_notification_icon"
+            android:resource="@drawable/img_home_logo"/>
+
+        <service android:name=".main.service.QPyService"/>
+        <service android:name="org.qpython.qsl4a.QPyScriptService"/>
+        <service android:name=".main.service.FTPServerService"/>
+        <activity
+            android:name=".main.activity.SignInActivity"
+            android:launchMode="singleTask"/>
+        <activity
+            android:name="org.renpy.android.PythonSDLActivity"
+            android:hardwareAccelerated="true"
+            android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|screenLayout|fontScale|uiMode|orientation"
+            android:launchMode="singleTask"
+            android:process=":python"
+            android:screenOrientation="user"
+            android:theme="@style/AppTheme"
+            android:windowSoftInputMode="stateAlwaysHidden">
+        </activity>
+
+        <activity
+            android:name="org.qpython.qpylib.MPyApi"
+            android:exported="true"
+            android:theme="@style/Theme.AppCompat"/>
+
+        <service
+            android:name="org.qpython.qpylib.MPyService"
+            android:exported="true"
+            tools:ignore="ExportedService"/>
+
+        <activity
+            android:name=".main.activity.SplashActivity"
+            android:theme="@style/FullscreenTheme"
+            >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
+        </activity>
+
+        <activity
+            android:name="org.qpython.qpy.main.activity.HomeMainActivity"
+            android:launchMode="singleTask">
+            <meta-data
+                android:name="android.app.shortcuts"
+                android:resource="@xml/shortcuts"/>
+        </activity>
+
+        <activity
+            android:name="org.qpython.qpy.main.activity.QWebViewActivity"
+            android:label="@string/browser">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW"/>
+
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.BROWSABLE"/>
+
+                <data android:mimeType="text/plain"/>
+                <data android:mimeType="image/*"/>
+                <data
+                    android:host="course"
+                    android:path="/"
+                    android:scheme="qpython"/>
+            </intent-filter>
+
+            <!-- Used to handle Chrome then menu then share.-->
+            <intent-filter>
+                <action android:name="android.intent.action.SEND"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <data android:mimeType="text/plain"/>
+                <data android:mimeType="image/*"/>
+            </intent-filter>
+        </activity>
+        <activity
+            android:name=".main.activity.CourseActivity"
+            android:configChanges="orientation|screenSize"/>
+        <activity android:name=".main.activity.CourseIndexActivity"/>
+        <activity android:name=".main.activity.GistEditActivity"/>
+        <activity android:name=".main.activity.CodeDetailActivity"/>
+        <activity android:name=".main.activity.CodeShareActivity"/>
+        <activity android:name=".main.activity.UserActivity"/>
+        <activity
+            android:name="org.qpython.qpy.main.activity.SettingActivity"
+            android:theme="@style/AppTheme"/>
+        <activity
+            android:name="org.qpython.qpy.console.TermActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:theme="@style/AppTheme"/>
+        <activity
+            android:name=".main.activity.LogActivity"
+            android:theme="@style/AppTheme"/>
+        <activity
+            android:name=".texteditor.EditorActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:exported="true"
+            android:label="@string/editor">
+            <intent-filter>
+                <!--<action android:name="android.intent.action.SEND"/>-->
+                <action android:name="android.intent.action.VIEW"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:mimeType="text/*"/>
+                <data android:scheme="file"/>
+            </intent-filter>
+
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="content"/>
+                <data android:host="*"/>
+                <data android:mimeType="*/*"/>
+                <data android:pathPattern=".*\\.txt"/>
+                <data android:pathPattern=".*\\.html"/>
+                <data android:pathPattern=".*\\.css"/>
+                <data android:pathPattern=".*\\.js"/>
+                <data android:pathPattern=".*\\.md"/>
+                <data android:pathPattern=".*\\.php"/>
+                <data android:pathPattern=".*\\.py"/>
+            </intent-filter>
+        </activity>
+
+        <activity
+            android:name="org.qpython.qpy.texteditor.TedLocalActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar"/>
+        <activity
+            android:name="org.qpython.qpy.texteditor.TedSettingsActivity"
+            android:theme="@style/SettingTheme"
+            android:windowSoftInputMode="stateHidden"/>
+        <activity
+            android:name="org.qpython.qpy.texteditor.TedFontActivity"
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar"/>
+
+        <activity
+            android:name=".main.activity.LibActivity"
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar">
+            <intent-filter>
+                <action android:name="org.qpython.qpy.OPEN_AIPY_FRAGMENT"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity>
+
+        <activity
+            android:name=".main.activity.AboutActivity"/>
+
+        <activity
+            android:name=".main.activity.AppListActivity"
+            android:exported="true"
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar">
+        </activity>
+        <activity
+            android:name="org.swiftp.gui.ServerPreferenceActivity"
+            android:label="Preferences"/>
+        <activity android:name=".texteditor.MFTPSettingActivity"/>
+        <activity android:name=".main.activity.PurchaseActivity"/>
+
+        <activity-alias
+            android:name="TermInternal"
+            android:exported="false"
+            android:targetActivity="org.qpython.qpy.console.TermActivity"
+            android:theme="@style/ConsoleTheme">
+            <intent-filter>
+                <action android:name="jackpal.androidterm.private.OPEN_NEW_WINDOW"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+            <intent-filter>
+                <action android:name="jackpal.androidterm.private.SWITCH_WINDOW"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity-alias>
+        <activity
+            android:name="org.qpython.qpy.console.RemoteInterface"
+            android:excludeFromRecents="true"
+            android:theme="@style/ConsoleTheme">
+            <intent-filter>
+                <action android:name="jackpal.androidterm.OPEN_NEW_WINDOW"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity>
+        <activity-alias
+            android:name="TermHere"
+            android:exported="true"
+            android:label="@string/activity_term_here_title"
+            android:targetActivity="org.qpython.qpy.console.RemoteInterface"
+            android:theme="@style/ConsoleTheme">
+        </activity-alias>
+
+        <activity
+            android:name="org.qpython.qsl4a.qsl4a.activity.FutureActivity"
+            android:label="QSL4A FutureActivity"
+            android:theme="@style/AppTheme">
+            <intent-filter>
+                <action android:name="android.nfc.action.NDEF_DISCOVERED"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <data android:mimeType="application/com.hipipal.qpy.nfc"/>
+            </intent-filter>
+        </activity>
+
+        <activity
+            android:name="org.qpython.qpy.console.RunScript"
+            android:excludeFromRecents="true"
+            android:permission="jackpal.androidterm.permission.RUN_SCRIPT"
+            android:theme="@style/ConsoleTheme">
+            <intent-filter>
+                <action android:name="jackpal.androidterm.RUN_SCRIPT"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity>
+        <activity
+            android:name="org.qpython.qpy.console.RunShortcut"
+            android:excludeFromRecents="true"
+            android:theme="@style/ConsoleTheme">
+            <intent-filter>
+                <action android:name="jackpal.androidterm.RUN_SHORTCUT"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity>
+        <activity
+            android:name="org.qpython.qpy.console.TermPreferences"
+            android:label="@string/preferences"
+            android:theme="@style/ConsoleTheme"/>
+        <activity
+            android:name="org.qpython.qpy.console.WindowList"
+            android:label="@string/window_list"
+            android:theme="@style/ConsoleTheme"/>
+        <activity
+            android:name="org.qpython.qpy.console.shortcuts.AddShortcut"
+            android:configChanges="orientation|keyboard|keyboardHidden"
+            android:label="@string/activity_shortcut_create"
+            android:launchMode="singleTop"
+            android:theme="@style/Theme.AppCompat">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.CREATE_SHORTCUT"/>
+            </intent-filter>
+            <intent-filter>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <data android:mimeType="text/*"/>
+            </intent-filter>
+        </activity>
+        <activity
+            android:name="org.qpython.qpy.console.shortcuts.FSNavigator"
+            android:configChanges="orientation|keyboardHidden"
+            android:exported="true"
+            android:label="@string/addshortcut_button_find_command"
+            android:launchMode="singleTop"
+            android:theme="@style/ConsoleTheme">
+            <intent-filter>
+                <action android:name="android.intent.action.PICK"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.GET_CONTENT"/>
+
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.OPENABLE"/>
+
+                <data android:mimeType="*/*"/>
+            </intent-filter>
+        </activity>
+
+        <activity android:name="org.qpython.qpy.plugin.activity.PluginManagerActivity"/>
+        <activity android:name="org.qpython.qpy.plugin.activity.LocalPluginInstallActivity"/>
+
+        <!--zxing-->
+        <activity android:name="org.qpython.qpy.main.activity.QrCodeActivity"/>
+        <activity
+            android:name=".main.activity.GistActivity"
+            android:configChanges="orientation"
+            android:launchMode="singleTask"/>
+        <activity
+            android:name=".main.activity.GistDetailActivity"
+            android:configChanges="orientation"/>
+        <activity
+            android:name=".main.activity.MyGistActivity"
+            android:configChanges="orientation"/>
+        <!--SERVICE-->
+        <service android:name="org.qpython.qpy.console.TermService"
+                 tools:ignore="ExportedService">
+            <intent-filter>
+                <action android:name="jackpal.androidterm.action.START_TERM.v1"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </service>
+
+        <activity android:name=".main.activity.CourseIndexFundingActivity"/>
+        <activity android:name=".main.activity.FundingPurchaseActivity"/>
+        <activity
+            android:name=".main.activity.NotebookActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:launchMode="singleTask"
+            android:windowSoftInputMode="adjustResize"
+            android:exported="true">
+            <intent-filter >
+                <action android:name="android.intent.action.VIEW"/>
+            </intent-filter>
+        </activity>
+        <activity
+            android:name=".main.activity.NotebookListActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"/>
+
+        <!--友盟-->
+        <meta-data
+            android:name="UMENG_APPKEY"
+            android:value="5a24fdea8f4a9d34b00000b5"/>
+        <meta-data
+            android:name="UMENG_CHANNEL"
+            android:value="QPython"/>
+
+        <!--微信-->
+        <!--activity
+            android:name="com.hipipal.qpyplus.wxapi.WXEntryActivity"
+            android:exported="true"
+            android:label="@string/app_name"
+            android:theme="@android:style/Theme.Translucent.NoTitleBar"/>
+        <activity
+            android:name="com.hipipal.qpyplus.wxapi.WXPayEntryActivity"
+            android:exported="true"
+            android:label="@string/app_name"
+            android:theme="@android:style/Theme.Translucent.NoTitleBar"/-->
+
+    </application>
+
+    <meta-data
+        android:name="com.sec.android.support.multiwindow"
+        android:value="true"/>
+
+</manifest>
diff --git a/qpython/src/oh/java/org/qpython/qpy/main/activity/BaseActivity.java b/qpython/src/oh/java/org/qpython/qpy/main/activity/BaseActivity.java
new file mode 100644
index 00000000..9c3765d4
--- /dev/null
+++ b/qpython/src/oh/java/org/qpython/qpy/main/activity/BaseActivity.java
@@ -0,0 +1,235 @@
+package org.qpython.qpy.main.activity;
+
+import android.content.ActivityNotFoundException;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Bundle;
+import android.os.Environment;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v4.app.ActivityCompat;
+import android.support.v4.content.ContextCompat;
+import android.support.v4.util.ArrayMap;
+import android.support.v7.app.AppCompatActivity;
+import android.text.TextUtils;
+import android.widget.Toast;
+
+import com.quseit.util.NAction;
+import com.quseit.util.NUtil;
+import com.umeng.analytics.MobclickAgent;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.console.ShellTermSession;
+import org.qpython.qpy.console.util.TermSettings;
+import org.qpython.qpy.main.server.gist.TokenManager;
+import org.renpy.android.ResourceManager;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.Map;
+
+
+public class BaseActivity extends AppCompatActivity {
+    // QPython interfaces
+    private static final int SCRIPT_CONSOLE_CODE = 1237;
+    private static final int PID_INIT_VALUE      = -1;
+    private static final int DEFAULT_BUFFER_SIZE = 8192;
+    private static final int LOG_NOTIFICATION_ID = (int) System.currentTimeMillis();
+    private ArrayList<String> mArguments = new ArrayList<>();
+    private InputStream  mIn;
+    private OutputStream mOut;
+    private Map<Integer, PermissionAction> mActionMap = new ArrayMap<>();
+    private TermSettings     mSettings;
+    private ShellTermSession session;
+
+    private boolean permissionGrant = true;
+
+    protected static ShellTermSession createTermSession(Context context, TermSettings settings, String initialCommand, String path) {
+        ShellTermSession session = null;
+        try {
+            session = new ShellTermSession(context, settings, initialCommand, path);
+            session.setProcessExitMessage(context.getString(R.string.process_exit_message));
+
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+        return session;
+    }
+
+    protected void toast(String content) {
+        Toast.makeText(this, content, Toast.LENGTH_SHORT).show();
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        MobclickAgent.onPageStart(this.getLocalClassName());
+        MobclickAgent.onResume(this);
+    }
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        MobclickAgent.setDebugMode(true);
+        MobclickAgent.openActivityDurationTrack(false);
+        MobclickAgent.setScenarioType(this, MobclickAgent.EScenarioType.E_UM_NORMAL);
+    }
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+        MobclickAgent.onPageEnd(this.getLocalClassName());
+        MobclickAgent.onPause(this);
+    }
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+        PermissionAction action = mActionMap.get(requestCode);
+        if (action != null) {
+            if (grantResults.length > 0 && (grantResults[0] == PackageManager.PERMISSION_GRANTED)) {
+                action.onGrant();
+            } else {
+                action.onDeny();
+            }
+
+        }
+        mActionMap.remove(action);
+    }
+
+
+    public final void checkPermissionDo(String[] permissions, PermissionAction action) {
+        if (Build.VERSION.SDK_INT >= 23) {
+            boolean granted = true;
+            for (String permission : permissions) {
+                int checkPermission = ContextCompat.checkSelfPermission(this, permission);
+                granted = checkPermission == PackageManager.PERMISSION_GRANTED;
+            }
+            if (!granted) {
+                int code = permissions.hashCode() & 0xffff;
+                mActionMap.put(code, action);
+                ActivityCompat.requestPermissions(this, permissions, code);
+            } else {
+                action.onGrant();
+            }
+        } else {
+            action.onGrant();
+        }
+    }
+
+
+    // feedback
+    public void onFeedback(String feedback) {
+
+        String app = getString(R.string.app_name);
+        int ver = NUtil.getVersinoCode(getApplicationContext());
+        String subject = MessageFormat.format(getString(com.quseit.android.R.string.feeback_email_title), app, ver, Build.PRODUCT);
+
+        String lastError = "";
+        String code = NAction.getCode(getApplicationContext());
+        File log = new File(Environment.getExternalStorageDirectory() + "/" + code + "_last_err.log");
+        if (log.exists()) {
+            lastError = com.quseit.util.FileHelper.getFileContents(log.getAbsolutePath());
+        }
+
+        String body = MessageFormat.format(getString(R.string.feedback_email_body), Build.PRODUCT,
+                Build.VERSION.RELEASE, Build.VERSION.SDK, lastError, feedback);
+
+        Intent intent = new Intent(Intent.ACTION_SENDTO, Uri.parse("mailto:" + getString(R.string.ui_feedback_mail)));
+
+        intent.putExtra(Intent.EXTRA_SUBJECT, subject);
+        intent.putExtra(Intent.EXTRA_TEXT, session == null ? body : session.getTranscriptText().trim());
+        try {
+            startActivity(Intent.createChooser(intent,
+                    getString(R.string.email_transcript_chooser_title)));
+        } catch (ActivityNotFoundException e) {
+            Toast.makeText(this,
+                    R.string.email_transcript_no_email_activity_found,
+                    Toast.LENGTH_LONG)
+                    .show();
+        }
+    }
+
+    protected boolean checkExpired(final String resource, String filesDir, String tag) {
+        ResourceManager resourceManager = new ResourceManager(this);
+
+        String data_version = resourceManager.getString(resource + "_version");
+        String disk_version = "0";
+
+        // If no version, no unpacking is necessary.
+        if (data_version == null) {
+            return false;
+        }
+
+        // Check the current disk version, if any.
+        String disk_version_fn = filesDir + "/lib/" + tag + "_" + resource + ".version";
+
+        try {
+            byte buf[] = new byte[64];
+            InputStream is = new FileInputStream(disk_version_fn);
+            int len = is.read(buf);
+            disk_version = new String(buf, 0, len);
+            is.close();
+        } catch (Exception e) {
+
+            disk_version = "0";
+            //Mint.logException(e);
+
+        }
+
+        //LogUtil.d(TAG, "data_version:"+Math.round(Double.parseDouble(data_version))+"-disk_version:"+Math.round(Double.parseDouble(disk_version))+"-RET:"+(int)(Double.parseDouble(data_version)-Double.parseDouble(disk_version)));
+        if ((int) (Double.parseDouble(data_version) - Double.parseDouble(disk_version)) > 0 || disk_version.equals("0")) {
+            try {
+                FileOutputStream os = new FileOutputStream(disk_version_fn);
+                try {
+                    os.write(data_version.getBytes());
+                    os.close();
+
+                } catch (IOException e) {
+                    e.printStackTrace();
+                    //Mint.logException(e);
+
+                }
+
+            } catch (FileNotFoundException e) {
+                e.printStackTrace();
+                //Mint.logException(e);
+
+            }
+
+
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    public interface PermissionAction {
+        void onGrant();
+
+        void onDeny();
+    }
+
+    public void ifLogin(Login afterLogin) {
+        if (!TextUtils.isEmpty(TokenManager.getToken())) {
+            afterLogin.process();
+        } else {
+            Toast.makeText(this, R.string.login_first, Toast.LENGTH_SHORT).show();
+        }
+    }
+
+    public interface Login {
+        void process();
+    }
+
+}
diff --git a/qpython/src/oh/java/org/qpython/qpy/main/activity/FundingPurchaseActivity.java b/qpython/src/oh/java/org/qpython/qpy/main/activity/FundingPurchaseActivity.java
new file mode 100644
index 00000000..afd953e4
--- /dev/null
+++ b/qpython/src/oh/java/org/qpython/qpy/main/activity/FundingPurchaseActivity.java
@@ -0,0 +1,107 @@
+package org.qpython.qpy.main.activity;
+
+import android.content.Context;
+import android.content.Intent;
+import android.databinding.DataBindingUtil;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.text.TextUtils;
+import android.view.View;
+import android.widget.Toast;
+
+//import com.hipipal.qpyplus.wxapi.PaymentStatus;
+//import com.hipipal.qpyplus.wxapi.WXAPIManager;
+//import com.hipipal.qpyplus.wxapi.WeixinPay;
+import com.quseit.util.VeDate;
+
+import org.greenrobot.eventbus.Subscribe;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.qpython.qpy.R;
+import org.qpython.qpy.databinding.ActivityFundingPurchaseBinding;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.utils.UpdateHelper;
+
+import rx.Observer;
+
+/**
+ * Created by Hmei
+ * 1/30/18.
+ */
+
+public class FundingPurchaseActivity extends PayActivity {
+    private static final String FUNDING_COUNT = "fundingCount";
+    private ActivityFundingPurchaseBinding binding;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        binding = DataBindingUtil.setContentView(this, R.layout.activity_funding_purchase);
+        initView();
+        String[] count = getResources().getStringArray(R.array.funding_count_divider);
+        String[] prices = getResources().getStringArray(R.array.wechat_funding_price);
+        String price = null;
+        int fundingCount = getIntent().getIntExtra(FUNDING_COUNT, 0);
+        for (int i = 0; i < count.length; i++) {
+            if ((Integer.parseInt(count[i]) - fundingCount) > 0) {
+                price = prices[i];
+                break;
+            }
+        }
+        if (TextUtils.isEmpty(price)) price = prices[prices.length - 1];
+        binding.price.setText(getString(R.string.rmb, price));
+        String finalPrice = price;
+//        binding.price.setOnClickListener(v -> payUtil.purchase(finalPrice, getIntent().getStringExtra(ARTICLE_ID), new Observer<WeixinPay>() {
+//            @Override
+//            public void onCompleted() {
+//                binding.pb.setVisibility(View.GONE);
+//                // 统计赞赏数据
+//                JSONObject jsonObject = new JSONObject();
+//                try {
+//                    jsonObject.put("type", finalPrice);
+//                    jsonObject.put("time", VeDate.getStringDateHourAsInt());
+//                    int percent = getIntent().getIntExtra(FUNDING_COUNT, 0);
+//                    String[] fundingCount = getResources().getStringArray(R.array.funding_count_divider);
+//                    jsonObject.put("crowdfunding",
+//                            percent > (Integer.parseInt(fundingCount[1]) / Integer.parseInt(fundingCount[2])) ? 3 :
+//                                    percent > (Integer.parseInt(fundingCount[0]) / Integer.parseInt(fundingCount[1])) ? 2 : 1);//0 非众筹/ 1: 0-100 /2: 100-500/3 500-2000
+//                    jsonObject.put("articleId", getIntent().getStringExtra(ARTICLE_ID));
+//                    if (App.getUser() != null) {
+//                        jsonObject.put("account", App.getUser().getEmail());
+//                    }
+//                } catch (JSONException e) {
+//                    e.printStackTrace();
+//                }
+//                UpdateHelper.submitIAPLog(FundingPurchaseActivity.this, mOrderNo, App.getGson().toJson(jsonObject));
+//            }
+//
+//            @Override
+//            public void onError(Throwable e) {
+//                Toast.makeText(FundingPurchaseActivity.this, R.string.conn_error, Toast.LENGTH_SHORT).show();
+//                binding.pb.setVisibility(View.GONE);
+//            }
+//
+//            @Override
+//            public void onNext(WeixinPay weixinPay) {
+//                WXAPIManager.wxPayReq(weixinPay);
+//                mOrderNo = weixinPay.out_trade_no;
+//            }
+//        }));
+    }
+
+    public static void startSupport(Context context, String articleId, int fundingPercent) {
+        Intent starter = new Intent(context, FundingPurchaseActivity.class);
+        starter.putExtra(ARTICLE_ID, articleId);
+        starter.putExtra(FUNDING_COUNT, fundingPercent);
+        context.startActivity(starter);
+    }
+
+    private void initView() {
+        setSupportActionBar(binding.lt.toolbar);
+        binding.lt.toolbar.setNavigationIcon(R.drawable.ic_back);
+        binding.lt.toolbar.setNavigationOnClickListener(v -> finish());
+        setTitle(R.string.reward);
+        binding.tvThanks.setVisibility(View.VISIBLE);
+        binding.price.setVisibility(View.VISIBLE);
+    }
+}
diff --git a/qpython/src/oh/java/org/qpython/qpy/main/activity/PayActivity.java b/qpython/src/oh/java/org/qpython/qpy/main/activity/PayActivity.java
new file mode 100644
index 00000000..89e16879
--- /dev/null
+++ b/qpython/src/oh/java/org/qpython/qpy/main/activity/PayActivity.java
@@ -0,0 +1,72 @@
+package org.qpython.qpy.main.activity;
+
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.app.AppCompatActivity;
+import android.view.View;
+import android.widget.Toast;
+
+
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.qpython.qpy.R;
+import org.qpython.qpy.main.service.PayUtil;
+
+import rx.Observer;
+
+/**
+ * Created by Hmei
+ * 1/31/18.
+ */
+
+public class PayActivity extends AppCompatActivity {
+    protected static final String ARTICLE_ID      = "article_id";
+    protected String mOrderNo;
+    protected PayUtil payUtil;
+
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        payUtil = new PayUtil(this);
+        EventBus.getDefault().register(this);
+    }
+
+    @Subscribe
+    public void onPayResp(String msg) {
+//        if (msg.equals(PaymentStatus.SUCCESS)) {
+//            payUtil.checkOrderStatus(mOrderNo,new Observer<PaymentStatus>() {
+//                @Override
+//                public void onCompleted() {
+//
+//                }
+//
+//                @Override
+//                public void onError(Throwable e) {
+//                    e.printStackTrace();
+//                    if (findViewById(R.id.pb) != null)
+//                        findViewById(R.id.pb).setVisibility(View.GONE);
+//                    Toast.makeText(PayActivity.this, "支付失败！", Toast.LENGTH_SHORT).show();
+//                }
+//
+//                @Override
+//                public void onNext(PaymentStatus paymentStatus) {
+//                    if (paymentStatus.isSuccess()) {
+//                        if (findViewById(R.id.pb) != null)
+//                            findViewById(R.id.pb).setVisibility(View.GONE);
+//                        Toast.makeText(PayActivity.this, "感谢您的支持！", Toast.LENGTH_SHORT).show();
+//                        finish();
+//                    } else {
+//                        payUtil.checkOrderStatus(mOrderNo,this);
+//                    }
+//                }
+//            });
+//        }
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        EventBus.getDefault().unregister(this);
+    }
+}
diff --git a/qpython/src/oh/java/org/qpython/qpy/main/activity/PurchaseActivity.java b/qpython/src/oh/java/org/qpython/qpy/main/activity/PurchaseActivity.java
new file mode 100644
index 00000000..8520aa06
--- /dev/null
+++ b/qpython/src/oh/java/org/qpython/qpy/main/activity/PurchaseActivity.java
@@ -0,0 +1,149 @@
+package org.qpython.qpy.main.activity;
+
+import android.content.Context;
+import android.content.Intent;
+import android.databinding.DataBindingUtil;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.widget.GridLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Toast;
+
+//import com.hipipal.qpyplus.wxapi.PaymentStatus;
+//import com.hipipal.qpyplus.wxapi.WXAPIManager;
+//import com.hipipal.qpyplus.wxapi.WeixinPay;
+import com.quseit.util.ImageUtil;
+import com.quseit.util.VeDate;
+
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.qpython.qpy.R;
+import org.qpython.qpy.databinding.ActivityPurchaseBinding;
+import org.qpython.qpy.databinding.ItemPriceBinding;
+import org.qpython.qpy.main.adapter.MyViewHolder;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.app.User;
+import org.qpython.qpy.main.service.PayUtil;
+import org.qpython.qpy.main.widget.GridSpace;
+import org.qpython.qpy.utils.UpdateHelper;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import rx.Observer;
+import rx.Subscription;
+import rx.android.schedulers.AndroidSchedulers;
+import rx.schedulers.Schedulers;
+
+/**
+ * Weixin purchase activity
+ * Created by Hmei on 2017-07-19.
+ */
+
+public class PurchaseActivity extends PayActivity {
+    private static String[] prices = new String[]{"6", "12", "18", "24", "30", "36"};
+
+    private ActivityPurchaseBinding binding;
+    private String                  articleId;
+
+    public static void start(Context context, String articleId) {
+        Intent starter = new Intent(context, PurchaseActivity.class);
+        starter.putExtra(ARTICLE_ID, articleId);
+        context.startActivity(starter);
+    }
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        binding = DataBindingUtil.setContentView(this, R.layout.activity_purchase);
+        articleId = getIntent().getStringExtra(ARTICLE_ID);
+        initView();
+        getPrices();
+    }
+
+    private void initView() {
+        setSupportActionBar(binding.lt.toolbar);
+        binding.lt.toolbar.setNavigationIcon(R.drawable.ic_back);
+        binding.lt.toolbar.setNavigationOnClickListener(v -> finish());
+        setTitle(R.string.reward);
+    }
+
+    private void getPrices() {
+        invalidateData();
+        GridSpace gridSpace = new GridSpace(2, (int) ImageUtil.dp2px(16), false);
+        binding.list.setLayoutManager(new GridLayoutManager(PurchaseActivity.this, 2));
+        binding.list.addItemDecoration(gridSpace);
+        binding.list.setAdapter(new ListAdapter(prices));
+    }
+
+    private void invalidateData() {
+        binding.tvThanks.setVisibility(View.VISIBLE);
+        binding.list.setVisibility(View.VISIBLE);
+        binding.noData.llRoot.setVisibility(View.GONE);
+    }
+
+    private class ListAdapter extends RecyclerView.Adapter<MyViewHolder<ItemPriceBinding>> {
+        String[] dataList;
+
+        ListAdapter(String[] dataList) {
+            this.dataList = dataList;
+        }
+
+        @Override
+        public MyViewHolder<ItemPriceBinding> onCreateViewHolder(ViewGroup parent, int viewType) {
+            ItemPriceBinding binding = DataBindingUtil.inflate(LayoutInflater.from(PurchaseActivity.this), R.layout.item_price, parent, false);
+            MyViewHolder<ItemPriceBinding> holder = new MyViewHolder<>(binding.getRoot());
+            holder.setBinding(binding);
+            return holder;
+        }
+
+        @Override
+        public void onBindViewHolder(MyViewHolder<ItemPriceBinding> holder, int position) {
+            ItemPriceBinding itemBinding = holder.getBinding();
+            itemBinding.tvPrices.setText(dataList[position]);
+//            itemBinding.tvPrices.setOnClickListener(v -> payUtil.purchase(dataList[position], articleId, new Observer<WeixinPay>() {
+//                @Override
+//                public void onCompleted() {
+//                    binding.pb.setVisibility(View.GONE);
+//                    JSONObject jsonObject = new JSONObject();
+//                    try {
+//                        jsonObject.put("type", dataList[position]);
+//                        jsonObject.put("time", VeDate.getStringDateHourAsInt());
+//                        jsonObject.put("crowdfunding",0);//0 非众筹/ 1: 0-100 /2: 100-500/3 500-2000
+//                        jsonObject.put("articleId", articleId);
+//                        if (App.getUser() != null) {
+//                            jsonObject.put("account", App.getUser().getEmail());
+//                        }
+//                    } catch (JSONException e) {
+//                        e.printStackTrace();
+//                    }
+//                    UpdateHelper.submitIAPLog(PurchaseActivity.this, mOrderNo, App.getGson().toJson
+//                            (jsonObject));
+//                }
+//
+//                @Override
+//                public void onError(Throwable e) {
+//                    e.printStackTrace();
+//                    Toast.makeText(PurchaseActivity.this, "connection error!", Toast.LENGTH_SHORT).show();
+//                    binding.pb.setVisibility(View.GONE);
+//                }
+//
+//                @Override
+//                public void onNext(WeixinPay weixinPay) {
+//                    WXAPIManager.wxPayReq(weixinPay);
+//                    mOrderNo = weixinPay.out_trade_no;
+//                }
+//            }));
+        }
+
+        @Override
+        public int getItemCount() {
+            return dataList.length;
+        }
+    }
+}
diff --git a/qpython/src/oh/java/org/qpython/qpy/main/activity/SignInActivity.java b/qpython/src/oh/java/org/qpython/qpy/main/activity/SignInActivity.java
new file mode 100644
index 00000000..fe4bc7b8
--- /dev/null
+++ b/qpython/src/oh/java/org/qpython/qpy/main/activity/SignInActivity.java
@@ -0,0 +1,95 @@
+package org.qpython.qpy.main.activity;
+
+import android.content.Intent;
+import android.databinding.DataBindingUtil;
+import android.net.Uri;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.app.AppCompatActivity;
+import android.text.Html;
+import android.util.Log;
+import android.view.View;
+import android.widget.Toast;
+
+//import com.hipipal.qpyplus.wxapi.WXAPIManager;
+
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.qpython.qpy.R;
+import org.qpython.qpy.databinding.ActivitySignInBinding;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.app.User;
+import org.qpython.qpy.main.server.gist.loginScreen.LoginControler;
+import org.qpython.qpy.main.server.gist.loginScreen.LoginView;
+
+/**
+ * SignIn
+ * Created by Hmei on 2017-08-04.
+ */
+
+public class SignInActivity extends AppCompatActivity implements LoginView{
+    private static final int RC_SIGN_IN = 54503;
+
+    private ActivitySignInBinding binding;
+    private LoginControler        mLoginControler;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        binding = DataBindingUtil.setContentView(this, R.layout.activity_sign_in);
+        binding.textView3.setText(Html.fromHtml(getString(R.string.by_signing_in_you_agree_to_out_privacy_policy_term_of_service)));
+        initListener();
+        EventBus.getDefault().register(this);
+        mLoginControler = new LoginControler(this);
+    }
+
+    private void initListener() {
+        binding.textView3.setOnClickListener(v -> startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.privacy_html)))));
+        binding.button2.setOnClickListener(v -> signIn());
+        binding.button3.setOnClickListener(v -> finish());
+    }
+
+    @Subscribe
+    public void loginFail(String result) {
+        Toast.makeText(this, R.string.login_failed, Toast.LENGTH_SHORT).show();
+    }
+
+    @Subscribe
+    public void loginSuccess(User user) {
+        Log.d("SignInActivity", "loginSuccess");
+
+    }
+
+    private void signIn() {
+
+//        WXAPIManager.wxLogin();
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        EventBus.getDefault().unregister(this);
+        mLoginControler.onDestroy();
+    }
+
+    @Override
+    public void showLoading() {
+        binding.progressBar2.setVisibility(View.VISIBLE);
+    }
+
+    @Override
+    public void hideLoading() {
+        binding.progressBar2.setVisibility(View.GONE);
+    }
+
+    @Override
+    public void showToast(String msg) {
+        Toast.makeText(this, msg, Toast.LENGTH_SHORT).show();
+    }
+
+    @Override
+    public void loginSuccess() {
+        setResult(RESULT_OK);
+        finish();
+    }
+}
diff --git a/qpython/src/oh/java/org/qpython/qpy/main/activity/UserActivity.java b/qpython/src/oh/java/org/qpython/qpy/main/activity/UserActivity.java
new file mode 100644
index 00000000..38bc570f
--- /dev/null
+++ b/qpython/src/oh/java/org/qpython/qpy/main/activity/UserActivity.java
@@ -0,0 +1,78 @@
+package org.qpython.qpy.main.activity;
+
+import android.content.Context;
+import android.content.Intent;
+import android.databinding.DataBindingUtil;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.app.AlertDialog;
+import android.support.v7.app.AppCompatActivity;
+import android.widget.Toast;
+
+import com.quseit.util.ImageDownLoader;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.codeshare.CONSTANT;
+import org.qpython.qpy.codeshare.ShareCodeUtil;
+import org.qpython.qpy.databinding.ActivityUserBinding;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.app.CONF;
+
+import java.io.File;
+
+public class UserActivity extends AppCompatActivity {
+    ActivityUserBinding binding;
+
+    public static void start(Context context) {
+        Intent starter = new Intent(context, UserActivity.class);
+        context.startActivity(starter);
+    }
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        binding = DataBindingUtil.setContentView(this, R.layout.activity_user);
+        setSupportActionBar(binding.toolbar);
+        setTitle(getString(R.string.me));
+        binding.toolbar.setNavigationIcon(R.drawable.ic_back);
+        binding.toolbar.setNavigationOnClickListener(v -> finish());
+
+        ImageDownLoader.setImageFromUrl(this, binding.avatar, App.getUser().getAvatarUrl());
+        binding.name.setText(App.getUser().getNick());
+//        binding.email.setText(App.getUser().getEmail());
+
+        if (ShareCodeUtil.getInstance().getUsage() == -1) {
+            Toast.makeText(App.getContext(), "usage not init", Toast.LENGTH_SHORT).show();
+            ShareCodeUtil.getInstance().initUsage();
+        } else {
+            binding.usage.setText(getString(R.string.my_space, ShareCodeUtil.getInstance().getUsage()));
+        }
+        binding.logout.setOnClickListener(v -> logout());
+
+        initListener();
+    }
+
+    private void initListener() {
+        binding.myShareLayout.setOnClickListener(v -> MyGistActivity.startMyShare(this));
+    }
+
+    private void logout() {
+        new AlertDialog.Builder(this, R.style.MyDialog)
+                .setTitle(R.string.lout)
+                .setPositiveButton(R.string.yes, (dialog, which) -> {
+                    App.setUser(null);
+                    getPreferences(MODE_PRIVATE).edit().putBoolean(CONSTANT.IS_UPLOAD_INIT, false)
+                            .putString(CONSTANT.CLOUDED_MAP, "")
+                            .apply();
+                    finish();
+                })
+                .setNegativeButton(R.string.no, null)
+                .create()
+                .show();
+
+        File cloud_cache = new File(CONF.CLOUD_MAP_CACHE_PATH);
+        if (cloud_cache.exists()) {
+            cloud_cache.delete();
+        }
+    }
+}
\ No newline at end of file
diff --git a/qpython/src/oh/java/org/qpython/qpy/main/app/AppInit.java b/qpython/src/oh/java/org/qpython/qpy/main/app/AppInit.java
new file mode 100644
index 00000000..812871d8
--- /dev/null
+++ b/qpython/src/oh/java/org/qpython/qpy/main/app/AppInit.java
@@ -0,0 +1,25 @@
+package org.qpython.qpy.main.app;
+
+import android.content.Context;
+import android.util.Log;
+
+import org.qpython.qpy.BuildConfig;
+import org.qpython.qpy.codeshare.ShareCodeUtil;
+//import com.hipipal.qpyplus.wxapi.WXAPIManager;
+
+/**
+ * 文 件 名: AppInit
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2018/3/8 15:13
+ * 修改时间：
+ * 修改备注：
+ */
+
+public class AppInit {
+
+    public static void init(Context context){
+        //wx
+//        WXAPIManager.init(context);
+        ShareCodeUtil.getInstance();
+    }
+}
diff --git a/qpython/src/oh/java/org/qpython/qpy/main/fragment/ExplorerFragment.java b/qpython/src/oh/java/org/qpython/qpy/main/fragment/ExplorerFragment.java
new file mode 100644
index 00000000..a5836685
--- /dev/null
+++ b/qpython/src/oh/java/org/qpython/qpy/main/fragment/ExplorerFragment.java
@@ -0,0 +1,449 @@
+package org.qpython.qpy.main.fragment;
+
+import android.content.Intent;
+import android.databinding.DataBindingUtil;
+import android.graphics.Color;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.Environment;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.support.v7.app.AlertDialog;
+import android.support.v7.widget.LinearLayoutManager;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Toast;
+
+import com.quseit.util.FileHelper;
+import com.quseit.util.ImageUtil;
+import com.yanzhenjie.recyclerview.swipe.SwipeMenuCreator;
+import com.yanzhenjie.recyclerview.swipe.SwipeMenuItem;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.codeshare.ShareCodeUtil;
+import org.qpython.qpy.codeshare.pojo.CloudFile;
+import org.qpython.qpy.databinding.FragmentExplorerBinding;
+import org.qpython.qpy.main.activity.NotebookActivity;
+import org.qpython.qpy.main.activity.SignInActivity;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.app.CONF;
+import org.qpython.qpy.main.event.ShareCodeCallback;
+import org.qpython.qpy.texteditor.EditorActivity;
+import org.qpython.qpy.texteditor.TedLocalActivity;
+import org.qpython.qpy.texteditor.common.CommonEnums;
+import org.qpython.qpy.texteditor.common.RecentFiles;
+import org.qpython.qpy.texteditor.ui.adapter.FolderAdapter;
+import org.qpython.qpy.texteditor.ui.adapter.bean.FolderBean;
+import org.qpython.qpy.texteditor.ui.view.EnterDialog;
+import org.qpython.qpy.texteditor.widget.crouton.Crouton;
+import org.qpython.qpy.texteditor.widget.crouton.Style;
+import org.qpython.qpy.utils.FileUtils;
+import org.qpython.qpy.utils.NotebookUtil;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static com.quseit.util.FolderUtils.sortTypeByName;
+
+
+public class ExplorerFragment extends Fragment {
+    private static final int REQUEST_SAVE_AS   = 107;
+    private static final int REQUEST_HOME_PAGE = 109;
+    private static final int REQUEST_RECENT    = 111;
+    private static final int LOGIN_REQUEST     = 2741;
+
+    private static final String TYPE = "type";
+
+    private int WIDTH = (int) ImageUtil.dp2px(60);
+
+    private FragmentExplorerBinding binding;
+    private List<FolderBean>        folderList;
+    private FolderAdapter           adapter;
+    private Map<String, Boolean> cloudedMap = new HashMap<>();
+
+    private boolean openable = true; // 是否可打开文件
+
+    private int    type;
+    private String curPath;
+
+    public static ExplorerFragment newInstance(int type) {
+        ExplorerFragment myFragment = new ExplorerFragment();
+
+        Bundle args = new Bundle();
+        args.putInt(TYPE, type);
+        myFragment.setArguments(args);
+
+        return myFragment;
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.fragment_explorer, null);
+    }
+
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        binding = DataBindingUtil.bind(view);
+        type = getArguments().getInt(TYPE);
+        initView();
+        initListener();
+        initCloud();
+        switch (type) {
+            case REQUEST_RECENT:
+                binding.rlPath.setVisibility(View.GONE);
+                break;
+            case REQUEST_SAVE_AS:
+                binding.ivNewFolder.setVisibility(View.VISIBLE);
+                break;
+            case REQUEST_HOME_PAGE:
+                binding.ivNewFolder.setVisibility(View.VISIBLE);
+                break;
+        }
+    }
+
+    private void initView() {
+        SwipeMenuCreator swipeMenuCreator = (leftMenu, rightMenu, viewType) -> {
+//            SwipeMenuItem uploadItem = new SwipeMenuItem(getContext())
+//                    .setBackgroundColor(Color.parseColor("#FF4798F3"))
+//                    .setImage(R.drawable.ic_cloud_upload)
+//                    .setHeight(ViewGroup.LayoutParams.MATCH_PARENT)
+//                    .setWidth(WIDTH);
+
+            SwipeMenuItem renameItem = new SwipeMenuItem(getContext())
+                    .setBackgroundColor(Color.parseColor("#FF4BAC07"))
+                    .setImage(R.drawable.ic_file_rename)
+                    .setHeight(ViewGroup.LayoutParams.MATCH_PARENT)
+                    .setWidth(WIDTH);
+
+            SwipeMenuItem deleteItem = new SwipeMenuItem(getContext())
+                    .setBackgroundColor(Color.parseColor("#FFD14136"))
+                    .setImage(R.drawable.ic_editor_filetree_close)
+                    .setHeight(ViewGroup.LayoutParams.MATCH_PARENT)
+                    .setWidth(WIDTH);
+
+            switch (type) {
+                case REQUEST_RECENT:
+                    rightMenu.addMenuItem(deleteItem);
+                    break;
+                case REQUEST_SAVE_AS:
+                    rightMenu.addMenuItem(deleteItem);
+                    break;
+                case REQUEST_HOME_PAGE:
+                    //rightMenu.addMenuItem(uploadItem);
+                    rightMenu.addMenuItem(renameItem);
+                    rightMenu.addMenuItem(deleteItem);
+                    break;
+            }
+        };
+
+        folderList = new ArrayList<>();
+        adapter = new FolderAdapter(folderList, getArguments().getInt(TYPE) == REQUEST_RECENT);
+        adapter.setCloudMap(cloudedMap);
+        binding.swipeList.setLayoutManager(new LinearLayoutManager(getContext()));
+        binding.swipeList.setSwipeMenuCreator(swipeMenuCreator);
+        openDir(CONF.ABSOLUTE_PATH);
+    }
+
+    private void initListener() {
+        binding.ivNewFolder.setOnClickListener(v -> doNewDir());
+        binding.prevFolder.setOnClickListener(v -> {
+            String parentPath = new File(curPath).getParent();
+
+            if (parentPath.length()>=Environment.getExternalStorageDirectory().getAbsolutePath().length()) {
+                openDir(parentPath);
+            }
+        });
+        binding.swipeList.setSwipeMenuItemClickListener(menuBridge -> {
+            binding.swipeList.smoothCloseMenu();
+            switch (menuBridge.getPosition()) {
+                case 0:
+                    renameFile(menuBridge.getAdapterPosition());
+                    break;
+                case 1:
+                    deleteFile(menuBridge.getAdapterPosition());
+                    break;
+            }
+        });
+        adapter.setClickListener(new FolderAdapter.Click() {
+            @Override
+            public void onItemClick(int position) {
+                FolderBean item = folderList.get(position);
+                if (item.getType().equals(CommonEnums.FileType.FILE)) {
+                    if (!openable) {
+                        Toast.makeText(getActivity(), R.string.cant_open, Toast.LENGTH_SHORT).show();
+                        return;
+                    }
+                    //判断文件类型
+                    int lastDot = item.getName().lastIndexOf(".");
+                    if (lastDot != -1) {
+                        String ext = item.getName().substring(lastDot + 1);
+                        openFile(item.getFile(), ext);
+                    }
+                } else {
+                    openDir(item.getPath());
+                }
+            }
+
+            @Override
+            public void onLongClick(int position) {
+                binding.swipeList.smoothOpenRightMenu(position);
+            }
+        });
+
+        binding.swipeList.setAdapter(adapter);
+    }
+
+    private void gotoSetting() {
+        org.qpython.qpy.main.activity.SettingActivity.startActivity(getActivity());
+    }
+    private void openFile(File file, String ext) {
+        List<String> textExts = Arrays.asList(getContext().getResources().getStringArray(R.array.text_ext));
+        if (textExts.contains(ext)) {
+            EditorActivity.start(getContext(), Uri.fromFile(file));
+        } else if (ext.equals("ipynb")) {
+            boolean notebookenable = NotebookUtil.isNotebookEnable(getActivity());
+            if (notebookenable) {
+                NotebookActivity.start(getActivity(), file.getAbsolutePath(), false);
+            } else {
+
+                new AlertDialog.Builder(getActivity(),R.style.MyDialog)
+                        .setTitle(R.string.dialog_alert)
+                        .setMessage(getString(R.string.ennable_notebook_first))
+                        .setNegativeButton(R.string.cancel, (dialog1, which) -> dialog1.dismiss())
+                        .setPositiveButton(R.string.ok, (dialog1, which) -> gotoSetting())
+                        .create()
+                        .show();
+
+                //Toast.makeText(getActivity(), R.string.ennable_notebook_first, Toast.LENGTH_SHORT).show();
+            }
+        } else {
+            FileUtils.openFile(getContext(), file);
+        }
+    }
+
+    private void uploadFile(int adapterPosition) {
+        File file = folderList.get(adapterPosition).getFile();
+
+        // only support type in <R.array.support_file_ext>
+        String ext = "";
+        if (file.getName().lastIndexOf(".") > 0) {
+            ext = file.getName().substring(file.getName().lastIndexOf(".") + 1);
+        }
+        boolean isSupport = false;
+        if (!file.isDirectory()) {
+            for (String s : getResources().getStringArray(R.array.support_file_ext)) {
+                if (s.equals(ext)) {
+                    isSupport = true;
+                    break;
+                }
+            }
+        } else {
+            isSupport = true;
+        }
+
+        if (!isSupport) {
+            Toast.makeText(getContext(), R.string.not_support_type_hint, Toast.LENGTH_SHORT).show();
+            return;
+        }
+
+        // only available for already login user
+        if (App.getUser() == null) {
+            new AlertDialog.Builder(getActivity(), R.style.MyDialog)
+                    .setTitle(R.string.need_login)
+                    .setMessage(R.string.upload_login_hint)
+                    .setNegativeButton(R.string.no, null)
+                    .setPositiveButton(getString(R.string.login_now), (dialog, which) ->
+                            startActivityForResult(new Intent(getActivity(), SignInActivity.class), LOGIN_REQUEST)
+                    )
+                    .create()
+                    .show();
+            return;
+        }
+
+        // upload
+
+        File folder = folderList.get(adapterPosition).getFile();
+        folderList.get(adapterPosition).setUploading(true);
+        adapter.notifyItemChanged(adapterPosition);
+        if (folder.isDirectory()) {
+            //ShareCodeUtil.getInstance().uploadFolder(folder, callback, 0);
+        } else {
+            //ShareCodeUtil.getInstance().uploadFile(folder, callback);
+        }
+    }
+
+    private void renameFile(int adapterPosition) {
+        new EnterDialog(getContext())
+            .setTitle(getString(R.string.rename))
+            .setConfirmListener(name -> {
+                File oldFile = folderList.get(adapterPosition).getFile();
+                File newFile = new File(oldFile.getParent(), name);
+                boolean renameSuc = oldFile.renameTo(newFile);
+                if (renameSuc) {
+                    folderList.set(adapterPosition, new FolderBean(newFile));
+                    adapter.notifyItemChanged(adapterPosition);
+                    return true;
+                } else {
+                    Toast.makeText(getActivity(), R.string.rename_fail, Toast.LENGTH_SHORT).show();
+                    return false;
+                }
+            })
+            .setText(folderList.get(adapterPosition).getName())
+            .show();
+    }
+
+    private void deleteFile(int adapterPosition) {
+        switch (type) {
+            case REQUEST_RECENT:
+                RecentFiles.removePath(folderList.get(adapterPosition).getPath());
+                folderList.remove(adapterPosition);
+                adapter.notifyDataSetChanged();
+                break;
+            case REQUEST_HOME_PAGE:
+            case REQUEST_SAVE_AS:
+                AlertDialog.Builder builder = new AlertDialog.Builder(getActivity(), R.style.MyDialog);
+                builder.setTitle(R.string.warning)
+                        .setMessage(R.string.delete_file_hint)
+                        .setNegativeButton(R.string.no, null)
+                        .setPositiveButton(R.string.yes, (dialog, which) -> {
+                            FileHelper.clearDir(folderList.get(adapterPosition).getFile().getAbsolutePath(), 0, true);
+                            folderList.remove(adapterPosition);
+                            adapter.notifyItemRemoved(adapterPosition);
+                            adapter.notifyDataSetChanged();
+                        })
+                        .show();
+                break;
+        }
+    }
+
+    private void openDir(String dirPath) {
+        if (type == REQUEST_RECENT) {
+            folderList.clear();
+            for (String path : RecentFiles.getRecentFiles()) {
+                folderList.add(new FolderBean(new File(path)));
+            }
+
+            if (folderList.size() == 0) {
+                binding.emptyHint.setVisibility(View.VISIBLE);
+            } else {
+                binding.emptyHint.setVisibility(View.GONE);
+                adapter.notifyDataSetChanged();
+            }
+        } else {
+            File dir = new File(dirPath);
+            if (dir.exists()) {
+                File[] files = dir.listFiles();
+                if (files != null) {
+                    Arrays.sort(files, sortTypeByName);
+                    folderList.clear();
+                    for (File file : files) {
+                        //if (!file.getName().startsWith(".")) {
+                        folderList.add(new FolderBean(file));
+                        //}
+                    }
+                    adapter.notifyDataSetChanged();
+                    binding.tvPath.setText(dirPath);
+                    curPath = dirPath;
+                    adapter.notifyDataSetChanged();
+
+                }
+            } else {
+                Toast.makeText(getContext(), R.string.file_not_exists, Toast.LENGTH_SHORT).show();
+            }
+        }
+    }
+
+    private void doNewDir() {
+        new EnterDialog(getContext())
+                .setTitle(getString(R.string.new_folder))
+                .setHint(getString(R.string.folder_name))
+                .setConfirmListener(name -> {
+                    File dirN = new File(curPath, name.equals("") ? getString(R.string.untitled_folder) : name);
+                    if (dirN.exists()) {
+                        Crouton.makeText(getActivity(), getString(R.string.toast_folder_exist), Style.ALERT).show();
+                        return false;
+                    } else {
+                        if (dirN.mkdirs()) {
+                            openDir(curPath + "/" + name);
+                        } else {
+                            Toast.makeText(getContext(), R.string.mkdir_fail, Toast.LENGTH_SHORT).show();
+                        }
+                        return true;
+                    }
+                })
+                .show();
+    }
+
+    public void backToPrev() {
+
+        String qpyDir = Environment.getExternalStorageDirectory().getAbsolutePath()+"/qpython";
+
+        if (curPath == null || qpyDir.equals(curPath) || Environment.getExternalStorageDirectory().getAbsolutePath().equals(curPath)) {
+            getActivity().finish();
+        } else {
+            String parentPath = new File(curPath).getParent();
+            openDir(parentPath);
+        }
+    }
+
+    private void updateClouded(File file) {
+        cloudedMap.put(file.getAbsolutePath(), true);
+        if (file.isDirectory()) {
+            for (File file1 : file.listFiles()) {
+                if (file1.isDirectory()) {
+                    updateClouded(file1);
+                } else {
+                    cloudedMap.put(file.getAbsolutePath(), true);
+                }
+            }
+        }
+    }
+
+    public String getCurPath() {
+        return curPath;
+    }
+
+    private void initCloud() {
+        if (App.getUser() == null) {
+            return;
+        }
+        //获取云端脚本
+
+    }
+
+    private void savePath(String path) {
+        String[] paths = path.split("/");
+        StringBuffer realPath = new StringBuffer(CONF.ABSOLUTE_PATH);
+        for (String p : paths) {
+            if (!TextUtils.isEmpty(p)) {
+                realPath.append("/");
+                realPath.append(p);
+                if (!p.equals("projects") && !p.equals("scripts") && !cloudedMap.keySet().contains(realPath.toString()))
+                    cloudedMap.put(realPath.toString(), true);
+            }
+        }
+    }
+
+    public void deleteCloudedMap(String absolutePath) {
+        if (cloudedMap.containsKey(absolutePath)) {
+            cloudedMap.remove(absolutePath);
+            adapter.notifyDataSetChanged();
+        }
+    }
+
+    public void updateCloudedFiles(Map<String, Boolean> map) {
+        if (map != null) {
+            cloudedMap.putAll(map);
+        }
+        adapter.notifyDataSetChanged();
+    }
+}
+// GIT TEST
\ No newline at end of file
diff --git a/qpython/src/oh/java/org/qpython/qpy/main/fragment/MyProjectFragment.java b/qpython/src/oh/java/org/qpython/qpy/main/fragment/MyProjectFragment.java
new file mode 100644
index 00000000..ddeda639
--- /dev/null
+++ b/qpython/src/oh/java/org/qpython/qpy/main/fragment/MyProjectFragment.java
@@ -0,0 +1,277 @@
+package org.qpython.qpy.main.fragment;
+
+import android.content.SharedPreferences;
+import android.databinding.DataBindingUtil;
+import android.graphics.Color;
+import android.os.Bundle;
+import android.preference.PreferenceManager;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.support.v7.app.AlertDialog;
+import android.support.v7.widget.LinearLayoutManager;
+import android.text.Html;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Toast;
+
+import com.google.gson.reflect.TypeToken;
+import com.quseit.util.DateTimeHelper;
+import com.quseit.util.ImageUtil;
+import com.yanzhenjie.recyclerview.swipe.SwipeMenuCreator;
+import com.yanzhenjie.recyclerview.swipe.SwipeMenuItem;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.codeshare.ShareCodeUtil;
+import org.qpython.qpy.codeshare.pojo.CloudFile;
+import org.qpython.qpy.databinding.FragmentRefreshRvBinding;
+import org.qpython.qpy.main.adapter.CloudScriptAdapter;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.app.CONF;
+import org.qpython.qpy.main.event.ShareCodeCallback;
+import org.qpython.qpy.texteditor.TedLocalActivity;
+import org.qpython.qpysdk.QPyConstants;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+import rx.Observable;
+import rx.android.schedulers.AndroidSchedulers;
+
+import static android.content.Context.MODE_PRIVATE;
+import static org.qpython.qpy.codeshare.CONSTANT.CLOUDED_MAP;
+import static org.qpython.qpy.codeshare.CONSTANT.IS_UPLOAD_INIT;
+
+public class MyProjectFragment extends Fragment {
+    private int WIDTH = (int) ImageUtil.dp2px(60);
+    private FragmentRefreshRvBinding binding;
+    private CloudScriptAdapter adapter;
+    private List<CloudFile> scriptList = new ArrayList<>();
+    private boolean isSaverOn;
+    public boolean isLoading;
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) {
+        binding = DataBindingUtil.bind(LayoutInflater.from(getContext()).inflate(R.layout.fragment_refresh_rv, null));
+        return binding.getRoot();
+    }
+
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        scriptList = new ArrayList<>();
+        adapter = new CloudScriptAdapter(scriptList);
+        isSaverOn = PreferenceManager.getDefaultSharedPreferences(getContext()).getBoolean(getString(R.string.key_saver), true);
+        initView();
+        initListener();
+        retry(!isSaverOn);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        if (adapter != null) {
+            adapter.notifyDataSetChanged();
+        }
+    }
+
+    @Override
+    public void onStop() {
+        super.onStop();
+        locatedCloud(scriptList);
+    }
+
+    public void retry(boolean forceRefresh) {
+        if (scriptList != null && adapter != null) {
+            scriptList.clear();
+            adapter.notifyDataSetChanged();
+        }
+        startProgressBar();
+        isLoading = true;
+        // TODO: 2017/12/4 获取云端脚本
+
+    }
+
+    public void notifyDataSetChange(){
+        if (adapter!=null){
+            adapter.notifyDataSetChanged();
+        }
+    }
+
+    /**
+     * 保存云端文件目录到本地
+     */
+    private void locatedCloud(List<CloudFile> cloudFiles) {
+        if (cloudFiles.size() > 0) {
+            HashMap<String, Boolean> clouded = new HashMap<>();
+            for (CloudFile cloudFile : cloudFiles) {
+                if (cloudFile.getPath().contains("/projects/")) {
+                    clouded.put(CONF.ABSOLUTE_PATH + "/projects/" + cloudFile.getProjectName(), true);
+                }
+                clouded.put(CONF.ABSOLUTE_PATH + cloudFile.getPath(), true);
+            }
+            SharedPreferences sp = getActivity().getPreferences(MODE_PRIVATE);
+            Type type = new TypeToken<HashMap<String, Boolean>>() {
+            }.getType();
+            sp.edit().putBoolean(IS_UPLOAD_INIT, true)
+                    .putString(CLOUDED_MAP, App.getGson().toJson(clouded, type)).apply();
+        }
+    }
+
+    private void startProgressBar() {
+        binding.progressBar.setVisibility(View.VISIBLE);
+        binding.netError.setVisibility(View.GONE);
+        Observable.just(null)
+                .delay(5, TimeUnit.SECONDS)
+                .observeOn(AndroidSchedulers.mainThread())
+                .doOnNext(o -> showNetErrorText())
+                .subscribe();
+    }
+
+    private void showEmpty() {
+        if (binding.progressBar.getVisibility() == View.VISIBLE) {
+            binding.progressBar.setVisibility(View.GONE);
+            binding.netError.setText(R.string.cloud_empty_hint);
+            binding.netError.setVisibility(View.VISIBLE);
+        }
+    }
+
+    private void showNetErrorText() {
+        if (binding.progressBar.getVisibility() == View.VISIBLE) {
+            binding.progressBar.setVisibility(View.GONE);
+            binding.netError.setText(R.string.net_lagging);
+            binding.netError.setVisibility(View.VISIBLE);
+        }
+    }
+
+    private void initView() {
+        SwipeMenuCreator swipeMenuCreator = (leftMenu, rightMenu, viewType) -> {
+            SwipeMenuItem deleteItem = new SwipeMenuItem(getContext())
+                    .setBackgroundColor(Color.parseColor("#FFD14136"))
+                    .setImage(R.drawable.ic_editor_filetree_close)
+                    .setHeight(ViewGroup.LayoutParams.MATCH_PARENT)
+                    .setWidth(WIDTH);
+
+            SwipeMenuItem downloadItem = new SwipeMenuItem(getContext())
+                    .setBackgroundColor(Color.parseColor("#FF4798F3"))
+                    .setImage(R.drawable.ic_cloud_download)
+                    .setHeight(ViewGroup.LayoutParams.MATCH_PARENT)
+                    .setWidth(WIDTH);
+            rightMenu.addMenuItem(downloadItem);
+            rightMenu.addMenuItem(deleteItem);
+        };
+        binding.swipeList.setLayoutManager(new LinearLayoutManager(getContext()));
+        binding.swipeList.setSwipeMenuCreator(swipeMenuCreator);
+    }
+
+    private void initListener() {
+        binding.netError.setOnClickListener(v -> retry(true));
+        binding.swipeList.setSwipeMenuItemClickListener(menuBridge -> {
+            menuBridge.closeMenu();
+            switch (menuBridge.getPosition()) {
+                case 0:
+                    CloudFile cloudFile = scriptList.get(menuBridge.getAdapterPosition());
+                    String path;
+                    path = QPyConstants.ABSOLUTE_PATH + cloudFile.getPath();
+                    File file = new File(path);
+                    if (file.exists()) {
+//                        new AlertDialog.Builder(getContext(), R.style.MyDialog)
+//                                .setTitle(R.string.override_hint)
+//                                .setMessage(Html.fromHtml(getString(R.string.conflict_hint,
+//                                        cloudFile.getUploadTime(),
+//                                        DateTimeHelper.AGO_FULL_DATE_FORMATTER.format(new Date(file.lastModified())))))
+//                                .setNegativeButton(R.string.no, null)
+//                                .setPositiveButton(R.string.yes, (dialog, which) -> writeFile(file, cloudFile, menuBridge.getAdapterPosition()))
+//                                .create()
+//                                .show();
+                    } else {
+                        //create file
+                        File dir = new File(path.substring(0, path.lastIndexOf("/")));
+                        if (!dir.exists()) {
+                            dir.mkdirs();
+                        }
+                        try {
+                            file.createNewFile();
+                        } catch (IOException e) {
+                            e.printStackTrace();
+                        }
+                        writeFile(file, cloudFile, menuBridge.getAdapterPosition());
+                    }
+                    break;
+                case 1:
+                    // delete
+                    scriptList.get(menuBridge.getAdapterPosition()).setUploading(true);
+                    adapter.notifyItemChanged(menuBridge.getAdapterPosition());
+                    // TODO: 2017/12/4 删除上传的脚本文件
+//                    ShareCodeUtil.getInstance().deleteUploadScript(scriptList.get(menuBridge.getAdapterPosition()), new LeancloudStorage.SaveFileCallback() {
+//                        @Override
+//                        public void onSuccess(int code) {
+//                            Toast.makeText(getContext(), R.string.delete_remote_suc, Toast.LENGTH_SHORT).show();
+//                            adapter.notifyItemRemoved(menuBridge.getAdapterPosition());
+//                            ((TedLocalActivity) getActivity()).deleteCloudFile(scriptList.get(menuBridge.getAdapterPosition()).getAbsolutePath());
+//                            scriptList.remove(menuBridge.getAdapterPosition());
+//                        }
+//
+//                        @Override
+//                        public void onFail(String msg) {
+//                            Toast.makeText(getContext(), "删除出错", Toast.LENGTH_SHORT).show();
+//                        }
+//                    });
+                    break;
+            }
+        });
+        adapter.setCallback((position) -> binding.swipeList.smoothOpenRightMenu(position));
+        binding.swipeList.setAdapter(adapter);
+    }
+
+    private void writeFile(File file, CloudFile cloudFile, int adapterPosition) {
+        cloudFile.setUploading(true);
+        adapter.notifyDataSetChanged();
+//        ShareCodeUtil.getInstance().downloadFile(cloudFile.getFileObject().getFileId(), new LeancloudStorage.DownloadCallback() {
+//            @Override
+//            public void onSuccess(String content) {
+//                try {
+//                    FileWriter writer = new FileWriter(file, false);
+//                    writer.write(content);
+//                    writer.close();
+//                } catch (IOException e) {
+//                    e.printStackTrace();
+//                    cloudFile.setUploading(false);
+//                    adapter.notifyDataSetChanged();
+//                    Toast.makeText(getContext(), R.string.override_fail_hint, Toast.LENGTH_SHORT).show();
+//                }
+//                Toast.makeText(getContext(), R.string.file_downloaded, Toast.LENGTH_SHORT).show();
+//                cloudFile.setUploading(false);
+//                adapter.notifyItemChanged(adapterPosition);
+//            }
+//
+//            @Override
+//            public void onFail(String msg) {
+//
+//            }
+//
+//            @Override
+//            public void onProgress(int progress) {
+//
+//            }
+//        });
+    }
+
+    public void needRefresh(boolean isNewUpload) {
+        if (binding == null) {
+            // not init yet
+            return;
+        }
+        if (isNewUpload) {
+            retry(!isSaverOn);
+        }
+    }
+}
diff --git a/qpython/src/oh/java/org/qpython/qpy/main/service/PayUtil.java b/qpython/src/oh/java/org/qpython/qpy/main/service/PayUtil.java
new file mode 100644
index 00000000..273081a3
--- /dev/null
+++ b/qpython/src/oh/java/org/qpython/qpy/main/service/PayUtil.java
@@ -0,0 +1,96 @@
+package org.qpython.qpy.main.service;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.view.View;
+import android.widget.Toast;
+
+//import com.hipipal.qpyplus.wxapi.PaymentStatus;
+//import com.hipipal.qpyplus.wxapi.WXAPIManager;
+//import com.hipipal.qpyplus.wxapi.WeixinPay;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.main.activity.PayActivity;
+import org.qpython.qpy.main.activity.SignInActivity;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.app.User;
+import org.qpython.qpy.main.server.MySubscriber;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import rx.Observable;
+import rx.Observer;
+import rx.Subscription;
+import rx.android.schedulers.AndroidSchedulers;
+import rx.schedulers.Schedulers;
+
+/**
+ * Created by Hmei
+ * 1/31/18.
+ */
+
+public class PayUtil {
+    private static final String             GET_ORDER_URL   = "https://api.wegox.net/create_order";
+    public static final  String             CHECK_ORDER_URL = "https://api.wegox.net/check_order";
+    private              List<Subscription> mSubscriptions  = new ArrayList<>();
+
+    private int checkCount = 0;
+    private Activity context;
+
+    public PayUtil(Activity context) {
+        this.context = context;
+    }
+
+    public void initIAP(PayCallback callback) {
+        callback.doAfterConn();
+    }
+
+    /**
+     * 赞赏
+     */
+//    public void purchase(String price, String articleId, Observer<WeixinPay> callback) {
+//        User user = App.getUser();
+//        if (user == null) {
+//            context.startActivity(new Intent(context, SignInActivity.class));
+//            return;
+//        }
+//        String userName = user.getUserName();
+//        String userId = user.getUserId();
+//        WXAPIManager.getWXService().requestPay(GET_ORDER_URL, price, userName, userId, articleId)
+//                .subscribeOn(Schedulers.io())
+//                .subscribeOn(AndroidSchedulers.mainThread())
+//                .observeOn(AndroidSchedulers.mainThread())
+//                .subscribe(callback);
+//    }
+
+    /**
+     * 查询订单
+     */
+//    public void checkOrderStatus(String mOrderNo, Observer<PaymentStatus> callback) {
+//        checkCount++;
+//        if (checkCount < 31) {
+//            Subscription subscription = WXAPIManager.getWXService().checkStatus(CHECK_ORDER_URL, mOrderNo)
+//                    .subscribeOn(Schedulers.io())
+//                    .observeOn(AndroidSchedulers.mainThread())
+//                    .subscribe(callback);
+//            mSubscriptions.add(subscription);
+//        } else {
+//            if (context.findViewById(R.id.pb) != null)
+//                context.findViewById(R.id.pb).setVisibility(View.GONE);
+//            Toast.makeText(context, "支付失败！", Toast.LENGTH_SHORT).show();
+//        }
+//    }
+
+    public void unbindPayService() {
+        for (Subscription subscription : mSubscriptions) {
+            if (subscription != null && subscription.isUnsubscribed()) {
+                subscription.unsubscribe();
+            }
+        }
+    }
+
+    public interface PayCallback {
+        void doAfterConn();
+    }
+}
diff --git a/qpython/src/oh/java/org/qpython/qpy/sharecode/ShareCodeUtil.java b/qpython/src/oh/java/org/qpython/qpy/sharecode/ShareCodeUtil.java
new file mode 100644
index 00000000..4e2aabaa
--- /dev/null
+++ b/qpython/src/oh/java/org/qpython/qpy/sharecode/ShareCodeUtil.java
@@ -0,0 +1,137 @@
+package org.qpython.qpy.codeshare;
+
+import android.app.Activity;
+import android.content.SharedPreferences;
+import android.os.Handler;
+import android.preference.PreferenceManager;
+import android.widget.Toast;
+
+import com.google.gson.reflect.TypeToken;
+import com.quseit.util.ACache;
+import com.quseit.util.FileHelper;
+import com.quseit.util.NetStateUtil;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.codeshare.pojo.CloudFile;
+import org.qpython.qpy.codeshare.pojo.Gist;
+
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.event.ShareCodeCallback;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
+
+import static org.qpython.qpy.main.server.CacheKey.CLOUD_FILE;
+
+/**
+ * FireBase database util
+ * Created by Hmei on 2017-08-10.
+ */
+
+public class ShareCodeUtil {
+
+    public static final String USAGE = "usage";
+    public static final String PROJECT = "project";
+    public static final String SCRIPT = "script";
+    public static final String PROJECT_PATH = "/projects/";
+    public static final String SCRIPTS_PATH = "/scripts/";
+
+    private static final int MAX_FILE = 100;
+
+    private SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(App.getContext());
+    private int currentFileCount = -1;
+    private Handler mHandler = new Handler(App.getContext().getMainLooper());
+
+    private ShareCodeUtil() {
+        if (App.getUser() != null) {
+            initUsage();
+        }
+    }
+
+    public static ShareCodeUtil getInstance() {
+        return ShareCodeHolder.INSTANCE;
+    }
+
+    /**
+     * 上传文件夹
+     */
+
+    /**
+     * 管理文件内存
+     */
+    private List<CloudFile> getCacheFile() {
+        String content = ACache.get(App.getContext()).getAsString(CLOUD_FILE);
+        List<CloudFile> cloudFiles = App.getGson().fromJson(content, new TypeToken<List<CloudFile>>() {
+        }.getType());
+        return cloudFiles == null ? new ArrayList<>() : cloudFiles;
+    }
+
+    private void saveCacheFile(List<CloudFile> cloudFiles) {
+        ACache.get(App.getContext()).put(CLOUD_FILE, App.getGson().toJson(cloudFiles));
+    }
+
+    private void saveCacheFile(CloudFile cloudFile) {
+        List<CloudFile> list = getCacheFile();
+        if (!list.contains(cloudFile)) {
+            list.add(cloudFile);
+        }
+        saveCacheFile(list);
+    }
+
+    private void deleteCacheFile(CloudFile cloudFile) {
+        List<CloudFile> list = getCacheFile();
+        if (list.contains(cloudFile)) {
+            list.remove(cloudFile);
+        }
+        saveCacheFile(list);
+    }
+
+    private void clearCacheFile() {
+        ACache.get(App.getContext()).put(CLOUD_FILE, "");
+    }
+
+    /**
+     * 初始化用户文件空间
+     */
+    public void initUsage() {
+        // TODO
+    }
+
+    public int changeUsage(int change) {
+        currentFileCount += change;
+        sharedPreferences.edit().putInt(USAGE, currentFileCount).apply();
+        return currentFileCount;
+    }
+
+    public int getUsage() {
+        return currentFileCount;
+    }
+
+    private boolean hasSpace(int waiting) {
+        if (currentFileCount < 0) {
+            Toast.makeText(App.getContext(), "usage not init", Toast.LENGTH_SHORT).show();
+            return false;
+        } else {
+            return currentFileCount + waiting < MAX_FILE;
+        }
+    }
+
+    public interface CommentCallback {
+        void commentBean(Gist.CommentBean comment);
+    }
+
+    private static class ShareCodeHolder {
+        private static final ShareCodeUtil INSTANCE = new ShareCodeUtil();
+    }
+
+
+    private boolean isConnect() {
+        if (!NetStateUtil.isConnected(App.getContext())) {
+            Toast.makeText(App.getContext(), "connection error!", Toast.LENGTH_SHORT).show();
+            return false;
+        }
+        return true;
+    }
+}
\ No newline at end of file
diff --git a/qpython/src/oh/java/org/qpython/qpy/sharecode/pojo/CloudFile.java b/qpython/src/oh/java/org/qpython/qpy/sharecode/pojo/CloudFile.java
new file mode 100644
index 00000000..f6a44ea8
--- /dev/null
+++ b/qpython/src/oh/java/org/qpython/qpy/sharecode/pojo/CloudFile.java
@@ -0,0 +1,85 @@
+package org.qpython.qpy.codeshare.pojo;
+
+
+import org.qpython.qpysdk.QPyConstants;
+
+import java.io.Serializable;
+
+import static org.qpython.qpy.codeshare.ShareCodeUtil.PROJECT;
+import static org.qpython.qpy.codeshare.ShareCodeUtil.PROJECT_PATH;
+import static org.qpython.qpy.codeshare.ShareCodeUtil.SCRIPT;
+import static org.qpython.qpy.codeshare.ShareCodeUtil.SCRIPTS_PATH;
+
+public class CloudFile implements Serializable {
+    private String projectName;
+    private String path;
+    private String uploadTime;
+    private String name;
+    private String content;
+    private String key;
+    private boolean uploading;
+
+    public String getPath() {
+        return path;
+    }
+
+    public void setPath(String path) {
+        this.path = path;
+    }
+
+    public String getUploadTime() {
+        return uploadTime;
+    }
+
+    public void setUploadTime(String uploadTime) {
+        this.uploadTime = uploadTime;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+
+    public long getContentSize() {
+        return content.length();
+    }
+
+    public String getProjectName() {
+        return projectName;
+    }
+
+    public void setProjectName(String projectName) {
+        this.projectName = projectName;
+    }
+
+    public boolean isUploading() {
+        return uploading;
+    }
+
+    public void setUploading(boolean uploading) {
+        this.uploading = uploading;
+    }
+
+    public String getKey() {
+        return key;
+    }
+
+    public void setKey(String key) {
+        this.key = key;
+    }
+
+    public String getAbsolutePath() {
+        return QPyConstants.ABSOLUTE_PATH + getPath();
+    }
+}
diff --git a/qpython/src/oh/java/org/qpython/qpy/texteditor/TedLocalActivity.java b/qpython/src/oh/java/org/qpython/qpy/texteditor/TedLocalActivity.java
new file mode 100644
index 00000000..f0b132f1
--- /dev/null
+++ b/qpython/src/oh/java/org/qpython/qpy/texteditor/TedLocalActivity.java
@@ -0,0 +1,321 @@
+package org.qpython.qpy.texteditor;
+
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.content.res.Configuration;
+import android.databinding.DataBindingUtil;
+import android.graphics.drawable.Drawable;
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.support.v7.app.AlertDialog;
+import android.support.v7.app.AppCompatActivity;
+import android.text.InputType;
+import android.view.MotionEvent;
+import android.view.View;
+import android.widget.EditText;
+import android.widget.Toast;
+
+import com.google.gson.reflect.TypeToken;
+import com.quseit.util.FileHelper;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.codeshare.pojo.CloudFile;
+import org.qpython.qpy.databinding.ActivityLocalBinding;
+import org.qpython.qpy.main.activity.SignInActivity;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.app.CONF;
+import org.qpython.qpy.main.fragment.ExplorerFragment;
+import org.qpython.qpy.main.fragment.LocalFragment;
+import org.qpython.qpy.main.fragment.MyProjectFragment;
+import org.qpython.qpy.texteditor.ui.view.EnterDialog;
+import org.qpython.qpy.utils.NotebookUtil;
+import org.qpython.qpysdk.QPyConstants;
+
+import java.io.File;
+import java.lang.reflect.Type;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class TedLocalActivity extends AppCompatActivity {
+    public static final  int REQUEST_SAVE_AS    = 107;
+    public static final  int REQUEST_OPEN       = 108;
+    public static final  int REQUEST_HOME_PAGE  = 109;
+    public static final  int REQUEST_RECENT     = 111;
+    private static final int LOGIN_REQUEST_CODE = 4806;
+
+    private static final String EXTRA_REQUEST_CODE = "request_code";
+    private static final String FRAGMENT_EXPLORER  = "explorer";
+    private static final String FRAGMENT_CLOUD     = "cloud";
+    private static final String EXTRA_REQUEST_FN = "request_fn";
+
+    private ActivityLocalBinding binding;
+
+    private Fragment          firstPageFragment;
+    private MyProjectFragment myProjectFragment;
+
+    private boolean isExplorer  = true;
+    private boolean isNewUpload = false;
+    private String defaultFileName = "";
+
+    public static void start(Context context, int type) {
+        Intent starter = new Intent(context, TedLocalActivity.class);
+        starter.putExtra(EXTRA_REQUEST_CODE, type);
+        context.startActivity(starter);
+    }
+
+    public static void start(Activity context, int type, int requestCode,  String filename) {
+        Intent starter = new Intent(context, TedLocalActivity.class);
+        starter.putExtra(EXTRA_REQUEST_CODE, type);
+        starter.putExtra(EXTRA_REQUEST_FN, filename);
+
+        context.startActivityForResult(starter, requestCode);
+    }
+
+    public void finishForGetPath(String path) {
+        Intent intent = new Intent();
+        intent.putExtra("path", path);
+        setResult(Activity.RESULT_OK, intent);
+        finish();
+    }
+
+    public void finishForOpen(String path, boolean isProj) {
+        Intent intent = new Intent();
+        intent.putExtra("path", path);
+        intent.putExtra("isProj", isProj);
+        setResult(Activity.RESULT_OK, intent);
+        finish();
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        binding = DataBindingUtil.setContentView(this, R.layout.activity_local);
+        setSupportActionBar(binding.toolbar);
+        int type = getIntent().getIntExtra(EXTRA_REQUEST_CODE, REQUEST_HOME_PAGE);
+        initView();
+        initListener();
+        switch (type) {
+            case REQUEST_RECENT:
+                setTitle(R.string.recent);
+                binding.switchBtn.setVisibility(View.GONE);
+                firstPageFragment = ExplorerFragment.newInstance(type);
+                break;
+            case REQUEST_OPEN:
+                setTitle(R.string.open);
+                binding.switchBtn.setVisibility(View.GONE);
+                binding.explore.setVisibility(View.VISIBLE);
+                firstPageFragment = new LocalFragment();
+                break;
+            case REQUEST_SAVE_AS:
+                setTitle(R.string.save_as);
+                binding.vsSave.getRoot().setVisibility(View.VISIBLE);
+                initSaveListener();
+                String fn = getIntent().getStringExtra(EXTRA_REQUEST_FN);
+                if (fn!=null) {
+                    binding.vsSave.etName.setText(fn);
+                }
+
+                binding.switchBtn.setVisibility(View.GONE);
+                firstPageFragment = ExplorerFragment.newInstance(type);
+                break;
+            case REQUEST_HOME_PAGE:
+                setTitle(R.string.explorer);
+                firstPageFragment = ExplorerFragment.newInstance(type);
+                break;
+        }
+
+        getSupportFragmentManager().beginTransaction()
+                .add(R.id.container, firstPageFragment, FRAGMENT_EXPLORER)
+                .commit();
+    }
+
+    @Override
+    public void onConfigurationChanged(Configuration newConfig) {
+        super.onConfigurationChanged(newConfig);
+    }
+
+    private void initView() {
+        binding.toolbar.setNavigationIcon(R.drawable.ic_back);
+        binding.toolbar.setNavigationOnClickListener(v -> finish());
+        if (binding.switchBtn.getVisibility() == View.VISIBLE) {
+            myProjectFragment = new MyProjectFragment();
+        }
+    }
+
+    private void initListener() {
+        binding.switchBtn.setOnClickListener(v -> {
+            if (isExplorer) {
+                if (App.getUser() == null) {
+                    startActivityForResult(new Intent(this, SignInActivity.class), LOGIN_REQUEST_CODE);
+                    return;
+                }
+                binding.switchBtn.setImageResource(R.drawable.ic_folder_open);
+                binding.refresh.setVisibility(View.VISIBLE);
+                if (getSupportFragmentManager().findFragmentByTag(FRAGMENT_CLOUD) == null) {
+                    getSupportFragmentManager().beginTransaction().add(R.id.container, myProjectFragment, FRAGMENT_CLOUD).commit();
+                    getSupportFragmentManager().beginTransaction().hide(firstPageFragment).commit();
+                } else {
+                    getSupportFragmentManager().beginTransaction()
+                            .hide(firstPageFragment)
+                            .show(myProjectFragment)
+                            .commit();
+                }
+                myProjectFragment.needRefresh(isNewUpload);
+                isNewUpload = false;
+                if (!myProjectFragment.isLoading) {
+                    myProjectFragment.notifyDataSetChange();
+                }
+            } else {
+                binding.switchBtn.setImageResource(R.drawable.ic_cloud_list);
+                binding.refresh.setVisibility(View.GONE);
+                getSupportFragmentManager().beginTransaction()
+                        .hide(myProjectFragment)
+                        .show(firstPageFragment)
+                        .commit();
+            }
+            isExplorer = !isExplorer;
+        });
+
+        binding.refresh.setOnClickListener(v -> myProjectFragment.retry(true));
+
+        binding.explore.setOnClickListener(v -> {
+            start(this, REQUEST_HOME_PAGE);
+            finish();
+        });
+    }
+
+    public void doSave(String fn) {
+        if (fn.length() == 0) {
+            Toast.makeText(getApplicationContext(), R.string.toast_filename_empty, Toast.LENGTH_SHORT).show();
+        } else {
+            String filename = ((ExplorerFragment) firstPageFragment).getCurPath() + "/" + fn;
+            final File f = new File(filename);
+            if (f.exists()) {
+                AlertDialog.Builder builder = new AlertDialog.Builder(this, R.style.MyDialog);
+                builder.setTitle(R.string.confirm)
+                        .setMessage(R.string.editor_override)
+                        .setPositiveButton(R.string.yes, (dialog, which) -> {
+                            setSaveResult(f.getAbsolutePath());
+
+                        })
+                        .setNegativeButton(R.string.cancel, ((dialog, which) -> nothing()))
+                        .show();
+
+
+                //Toast.makeText(this, R.string.file_exist_hint, Toast.LENGTH_SHORT).show();
+            } else {
+                setSaveResult(f.getAbsolutePath());
+            }
+        }
+    }
+    private void nothing() {
+
+
+    }
+
+    protected boolean setSaveResult(String filepath) {
+        File f = new File(filepath);
+        if (f.getParentFile().canWrite()) {
+            finishForGetPath(filepath);
+        } else {
+            Toast.makeText(getApplicationContext(), R.string.toast_folder_cant_write, Toast.LENGTH_SHORT).show();
+        }
+        return true;
+    }
+
+    private void initSaveListener() {
+        binding.vsSave.btnSave.setOnClickListener(v -> doSave(binding.vsSave.etName.getText().toString()));
+        binding.vsSave.etName.setOnTouchListener((v, event) -> {
+            final int DRAWABLE_RIGHT = 2;
+            switch (event.getAction()) {
+                case MotionEvent.ACTION_DOWN:
+                    Drawable deleteText = ((EditText) v).getCompoundDrawables()[DRAWABLE_RIGHT];
+                    if (deleteText != null) {
+                        if (event.getRawX() >= (v.getRight() - deleteText.getBounds().width())) {
+                            ((EditText) v).setText("");
+                            return true;
+                        }
+                    }
+                    break;
+                case MotionEvent.ACTION_UP:
+                    v.performClick();
+                    break;
+                default:
+                    break;
+            }
+            return false;
+        });
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (resultCode == RESULT_OK) {
+            switch (requestCode) {
+                case LOGIN_REQUEST_CODE:
+                    binding.switchBtn.setImageResource(R.drawable.ic_folder_open);
+                    if (getSupportFragmentManager().findFragmentByTag(FRAGMENT_CLOUD) == null) {
+                        getSupportFragmentManager().beginTransaction().add(R.id.container, myProjectFragment, FRAGMENT_CLOUD).commit();
+                        getSupportFragmentManager().beginTransaction().hide(firstPageFragment).commit();
+                    } else {
+                        getSupportFragmentManager().beginTransaction()
+                                .hide(firstPageFragment)
+                                .show(myProjectFragment)
+                                .commit();
+                    }
+                    isExplorer = !isExplorer;
+                    break;
+            }
+        }
+    }
+
+    @Override
+    public void onBackPressed() {
+        if (firstPageFragment.isVisible() && firstPageFragment instanceof ExplorerFragment) {
+            ((ExplorerFragment) firstPageFragment).backToPrev();
+        } else {
+            super.onBackPressed();
+        }
+    }
+
+//    public void deleteCloudFile(String path) {
+//        if (firstPageFragment instanceof ExplorerFragment) {
+//            ((ExplorerFragment) firstPageFragment).deleteCloudedMap(path);
+//        }
+//    }
+//
+//    public void updateCloudFiles(List<CloudFile> cloudFiles) {
+//        Map<String, Boolean> map = new HashMap<>();
+//        for (CloudFile cloudFile : cloudFiles) {
+//            if (cloudFile.getPath().contains("/projects/")) {
+//                map.put(QPyConstants.ABSOLUTE_PATH + "/projects/" + cloudFile.getProjectName(), true);
+//            }
+//            map.put(QPyConstants.ABSOLUTE_PATH + cloudFile.getPath(), true);
+//        }
+//        ((ExplorerFragment) firstPageFragment).updateCloudedFiles(map);
+//    }
+//
+//    public void setNewUpload() {
+//        isNewUpload = true;
+//    }
+//
+//    /**
+//     * 保存云端文件目录到本地
+//     */
+//    public void locatedCloud(List<CloudFile> cloudFiles) {
+//        if (cloudFiles.size() > 0) {
+//            Type type = new TypeToken<List<CloudFile>>() {
+//            }.getType();
+//            FileHelper.writeToFile(CONF.CLOUD_MAP_CACHE_PATH, App.getGson().toJson(cloudFiles, type));
+//        }
+//    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        NotebookUtil.killServer();
+    }
+}
diff --git a/qpython/src/oh/res/drawable-xxhdpi/ic_login.png b/qpython/src/oh/res/drawable-xxhdpi/ic_login.png
new file mode 100644
index 00000000..d45ba05f
Binary files /dev/null and b/qpython/src/oh/res/drawable-xxhdpi/ic_login.png differ
diff --git a/qpython/src/oh/res/layout/activity_local.xml b/qpython/src/oh/res/layout/activity_local.xml
new file mode 100644
index 00000000..4a03abe2
--- /dev/null
+++ b/qpython/src/oh/res/layout/activity_local.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <LinearLayout
+        android:id="@+id/gd_action_bar_host"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:background="@color/colorPrimaryDark"
+        android:orientation="vertical">
+
+        <android.support.design.widget.AppBarLayout
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize">
+
+            <android.support.v7.widget.Toolbar
+                android:id="@+id/toolbar"
+                style="@style/Toolbar"
+                android:layout_width="match_parent"
+                android:layout_height="?attr/actionBarSize"
+                android:background="#FF4A4A4A"
+                android:elevation="2dp"
+                app:popupTheme="@style/DefaultBlueToolbar"
+                app:theme="@style/ToolbarTheme">
+
+                <ImageButton
+                    android:id="@+id/switch_btn"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="end"
+                    android:background="@null"
+                    android:padding="10dp"
+                    android:src="@drawable/ic_cloud_list"
+                    android:visibility="gone"/>
+
+                <ImageButton
+                    android:id="@+id/refresh"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="end"
+                    android:layout_marginEnd="30dp"
+                    android:layout_marginRight="30dp"
+                    android:background="@color/transparency"
+                    android:src="@drawable/ic_library_reinstall"
+                    android:visibility="gone"/>
+
+                <Button
+                    android:id="@+id/explore"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="end"
+                    android:textColor="#FFF"
+                    android:background="@color/transparency"
+                    android:text="@string/explorer"
+                    android:visibility="gone"/>
+            </android.support.v7.widget.Toolbar>
+        </android.support.design.widget.AppBarLayout>
+
+        <RelativeLayout
+            xmlns:android="http://schemas.android.com/apk/res/android"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@color/colorPrimaryDark">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="vertical">
+
+                <FrameLayout
+                    android:id="@+id/container"
+                    android:layout_width="match_parent"
+                    android:layout_height="0dp"
+                    android:layout_weight="9"/>
+
+                <include
+                    android:id="@+id/vs_save"
+                    layout="@layout/view_stub_save_prompt"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"/>
+            </LinearLayout>
+        </RelativeLayout>
+    </LinearLayout>
+
+
+</layout>
\ No newline at end of file
diff --git a/qpython/src/oh/res/values-zh-rCN/strings.xml b/qpython/src/oh/res/values-zh-rCN/strings.xml
new file mode 100644
index 00000000..5d429fa5
--- /dev/null
+++ b/qpython/src/oh/res/values-zh-rCN/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="sign_in_with_google">使用微信登录</string>
+    <string name="app_name">QPython OH</string>
+</resources>
\ No newline at end of file
diff --git a/qpython/src/oh/res/values-zh-rTW/strings.xml b/qpython/src/oh/res/values-zh-rTW/strings.xml
new file mode 100644
index 00000000..014a5c4a
--- /dev/null
+++ b/qpython/src/oh/res/values-zh-rTW/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="sign_in_with_google">使用微信登錄</string>
+    <string name="app_name">Qpython L</string>
+</resources>
\ No newline at end of file
diff --git a/qpython/src/oh/res/values/strings.xml b/qpython/src/oh/res/values/strings.xml
new file mode 100644
index 00000000..591ba63c
--- /dev/null
+++ b/qpython/src/oh/res/values/strings.xml
@@ -0,0 +1,4 @@
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="ExtraTranslation">
+    <string name="sign_in_with_google">Sign in with Wechat</string>
+    <string name="app_name">QPython OH</string>
+</resources>
diff --git a/qpython/src/ol/AndroidManifest.xml b/qpython/src/ol/AndroidManifest.xml
new file mode 100644
index 00000000..de317662
--- /dev/null
+++ b/qpython/src/ol/AndroidManifest.xml
@@ -0,0 +1,402 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          xmlns:tools="http://schemas.android.com/tools"
+          package="org.qpython.qpy">
+
+    <uses-feature
+        android:name="android.hardware.touchscreen"
+        android:required="false"/>
+
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+    <uses-permission android:name="android.permission.CAMERA"/>
+    <uses-permission android:name="android.permission.FLASHLIGHT"/>
+    <uses-permission android:name="android.permission.VIBRATE" />
+    <uses-permission android:name="android.permission.RECEIVE_USER_PRESENT" />
+    <uses-permission android:name="com.android.vending.BILLING"/>
+    <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
+    <uses-permission android:name="com.android.launcher.permission.UNINSTALL_SHORTCUT" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_MEDIA_STORAGE" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.BLUETOOTH" />
+    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
+    <uses-permission android:name="android.permission.NFC" />
+    <uses-permission android:name="android.permission.RECORD_AUDIO" />
+    <uses-permission android:name="android.permission.ACCESS_NOTIFICATION_POLICY" />
+    <uses-permission android:name="android.permission.KILL_BACKGROUND_PROCESSES"/>
+    <uses-permission android:name="net.dinglisch.android.tasker.PERMISSION_RUN_TASKS" />
+    <!-- privacy sensitive permissions -->
+    <uses-permission android:name="android.permission.ACCESS_SUPERUSER" />
+    <!--uses-permission android:name="android.permission.READ_SMS"/>
+    <uses-permission android:name="android.permission.SEND_SMS" />
+    <uses-permission android:name="android.permission.RECEIVE_SMS"/>
+    <uses-permission android:name="android.permission.WRITE_SMS"/-->
+    <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
+    <uses-permission android:name="android.permission.CALL_PHONE"/>
+    <!--uses-permission android:name="android.permission.READ_CALL_LOG"/>
+    <uses-permission android:name="android.permission.PROCESS_OUTGOING_CALLS"/-->
+    <uses-permission android:name="android.permission.READ_CONTACTS"/>
+    <uses-permission android:name="android.permission.GET_ACCOUNTS"/>
+    <!--uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/-->
+
+    <uses-feature android:name="android.hardware.microphone" android:required="false"/>
+    <uses-feature android:name="android.hardware.telephony" android:required="false"/>
+    <uses-feature android:name="android.hardware.camera" android:required="false"/>
+    <uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
+    <uses-feature android:name="android.hardware.camera.flash" android:required="false"/>
+    <uses-feature android:name="android.hardware.screen.landscape" android:required="false"/>
+    <uses-feature android:name="android.hardware.wifi" android:required="false"/>
+    <uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
+    <uses-feature android:name="android.hardware.location.gps" android:required="false"/>
+    <uses-feature android:name="android.hardware.location.network" android:required="false"/>
+    <uses-feature android:name="android.hardware.bluetooth" android:required="false"/>
+
+    <uses-feature android:glEsVersion="0x00020000" android:required="false"/>
+
+    <application
+        android:networkSecurityConfig="@xml/network_security_config"
+        android:name="org.qpython.qpy.main.app.App"
+        android:allowBackup="true"
+        android:hardwareAccelerated="true"
+        android:icon="@drawable/ic_launcher"
+        android:label="@string/app_name"
+        android:largeHeap="true"
+        android:supportsRtl="true"
+        android:theme="@style/AppTheme">
+        <uses-library android:name="org.apache.http.legacy" android:required="false"/>
+
+        <meta-data
+            android:name="com.google.firebase.messaging.default_notification_icon"
+            android:resource="@drawable/img_home_logo"/>
+
+        <service android:name=".main.service.QPyService"/>
+        <service android:name="org.qpython.qsl4a.QPyScriptService"/>
+        <service android:name=".main.service.FTPServerService"/>
+        <activity
+            android:name=".main.activity.SignInActivity"
+            android:launchMode="singleTask"/>
+        <activity
+            android:name="org.renpy.android.PythonSDLActivity"
+            android:hardwareAccelerated="true"
+            android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|screenLayout|fontScale|uiMode|orientation"
+            android:launchMode="singleTask"
+            android:process=":python"
+            android:screenOrientation="user"
+            android:theme="@style/AppTheme"
+            android:windowSoftInputMode="stateAlwaysHidden">
+        </activity>
+
+        <activity
+            android:name="org.qpython.qpylib.MPyApi"
+            android:exported="true"
+            android:theme="@style/Theme.AppCompat"/>
+
+        <service
+            android:name="org.qpython.qpylib.MPyService"
+            android:exported="true"
+            tools:ignore="ExportedService"/>
+
+        <activity
+            android:name=".main.activity.SplashActivity"
+            android:theme="@style/FullscreenTheme"
+            >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
+        </activity>
+
+        <activity
+            android:name="org.qpython.qpy.main.activity.HomeMainActivity"
+            android:launchMode="singleTask">
+            <meta-data
+                android:name="android.app.shortcuts"
+                android:resource="@xml/shortcuts"/>
+        </activity>
+
+        <activity
+            android:name="org.qpython.qpy.main.activity.QWebViewActivity"
+            android:label="@string/browser">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW"/>
+
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.BROWSABLE"/>
+
+                <data android:mimeType="text/plain"/>
+                <data android:mimeType="image/*"/>
+                <data
+                    android:host="course"
+                    android:path="/"
+                    android:scheme="qpython"/>
+            </intent-filter>
+
+            <!-- Used to handle Chrome then menu then share.-->
+            <intent-filter>
+                <action android:name="android.intent.action.SEND"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <data android:mimeType="text/plain"/>
+                <data android:mimeType="image/*"/>
+            </intent-filter>
+        </activity>
+        <activity
+            android:name=".main.activity.CourseActivity"
+            android:configChanges="orientation|screenSize"/>
+        <activity android:name=".main.activity.CourseIndexActivity"/>
+        <activity android:name=".main.activity.GistEditActivity"/>
+        <activity android:name=".main.activity.CodeDetailActivity"/>
+        <activity android:name=".main.activity.CodeShareActivity"/>
+        <activity android:name=".main.activity.UserActivity"/>
+        <activity
+            android:name="org.qpython.qpy.main.activity.SettingActivity"
+            android:theme="@style/AppTheme"/>
+        <activity
+            android:name="org.qpython.qpy.console.TermActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:theme="@style/AppTheme"/>
+        <activity
+            android:name=".main.activity.LogActivity"
+            android:theme="@style/AppTheme"/>
+        <activity
+            android:name=".texteditor.EditorActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:exported="true"
+            android:label="@string/editor">
+            <intent-filter>
+                <!--<action android:name="android.intent.action.SEND"/>-->
+                <action android:name="android.intent.action.VIEW"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:mimeType="text/*"/>
+                <data android:scheme="file"/>
+            </intent-filter>
+
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="content"/>
+                <data android:host="*"/>
+                <data android:mimeType="*/*"/>
+                <data android:pathPattern=".*\\.txt"/>
+                <data android:pathPattern=".*\\.html"/>
+                <data android:pathPattern=".*\\.css"/>
+                <data android:pathPattern=".*\\.js"/>
+                <data android:pathPattern=".*\\.md"/>
+                <data android:pathPattern=".*\\.php"/>
+                <data android:pathPattern=".*\\.py"/>
+            </intent-filter>
+        </activity>
+
+        <activity
+            android:name="org.qpython.qpy.texteditor.TedLocalActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar"/>
+        <activity
+            android:name="org.qpython.qpy.texteditor.TedSettingsActivity"
+            android:theme="@style/SettingTheme"
+            android:windowSoftInputMode="stateHidden"/>
+        <activity
+            android:name="org.qpython.qpy.texteditor.TedFontActivity"
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar"/>
+
+        <activity
+            android:name=".main.activity.LibActivity"
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar">
+            <intent-filter>
+                <action android:name="org.qpython.qpy.OPEN_AIPY_FRAGMENT"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity>
+
+        <activity
+            android:name=".main.activity.AboutActivity"/>
+
+        <activity
+            android:name=".main.activity.AppListActivity"
+            android:exported="true"
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar">
+        </activity>
+        <activity
+            android:name="org.swiftp.gui.ServerPreferenceActivity"
+            android:label="Preferences"/>
+        <activity android:name=".texteditor.MFTPSettingActivity"/>
+        <activity android:name=".main.activity.PurchaseActivity"/>
+
+        <activity-alias
+            android:name="TermInternal"
+            android:exported="false"
+            android:targetActivity="org.qpython.qpy.console.TermActivity"
+            android:theme="@style/ConsoleTheme">
+            <intent-filter>
+                <action android:name="jackpal.androidterm.private.OPEN_NEW_WINDOW"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+            <intent-filter>
+                <action android:name="jackpal.androidterm.private.SWITCH_WINDOW"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity-alias>
+        <activity
+            android:name="org.qpython.qpy.console.RemoteInterface"
+            android:excludeFromRecents="true"
+            android:theme="@style/ConsoleTheme">
+            <intent-filter>
+                <action android:name="jackpal.androidterm.OPEN_NEW_WINDOW"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity>
+        <activity-alias
+            android:name="TermHere"
+            android:exported="true"
+            android:label="@string/activity_term_here_title"
+            android:targetActivity="org.qpython.qpy.console.RemoteInterface"
+            android:theme="@style/ConsoleTheme">
+        </activity-alias>
+
+        <activity
+            android:name="org.qpython.qsl4a.qsl4a.activity.FutureActivity"
+            android:label="QSL4A FutureActivity"
+            android:theme="@style/AppTheme">
+            <intent-filter>
+                <action android:name="android.nfc.action.NDEF_DISCOVERED"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <data android:mimeType="application/com.hipipal.qpy.nfc"/>
+            </intent-filter>
+        </activity>
+
+        <activity
+            android:name="org.qpython.qpy.console.RunScript"
+            android:excludeFromRecents="true"
+            android:permission="jackpal.androidterm.permission.RUN_SCRIPT"
+            android:theme="@style/ConsoleTheme">
+            <intent-filter>
+                <action android:name="jackpal.androidterm.RUN_SCRIPT"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity>
+        <activity
+            android:name="org.qpython.qpy.console.RunShortcut"
+            android:excludeFromRecents="true"
+            android:theme="@style/ConsoleTheme">
+            <intent-filter>
+                <action android:name="jackpal.androidterm.RUN_SHORTCUT"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity>
+        <activity
+            android:name="org.qpython.qpy.console.TermPreferences"
+            android:label="@string/preferences"
+            android:theme="@style/ConsoleTheme"/>
+        <activity
+            android:name="org.qpython.qpy.console.WindowList"
+            android:label="@string/window_list"
+            android:theme="@style/ConsoleTheme"/>
+        <activity
+            android:name="org.qpython.qpy.console.shortcuts.AddShortcut"
+            android:configChanges="orientation|keyboard|keyboardHidden"
+            android:label="@string/activity_shortcut_create"
+            android:launchMode="singleTop"
+            android:theme="@style/Theme.AppCompat">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.CREATE_SHORTCUT"/>
+            </intent-filter>
+            <intent-filter>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <data android:mimeType="text/*"/>
+            </intent-filter>
+        </activity>
+        <activity
+            android:name="org.qpython.qpy.console.shortcuts.FSNavigator"
+            android:configChanges="orientation|keyboardHidden"
+            android:exported="true"
+            android:label="@string/addshortcut_button_find_command"
+            android:launchMode="singleTop"
+            android:theme="@style/ConsoleTheme">
+            <intent-filter>
+                <action android:name="android.intent.action.PICK"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.GET_CONTENT"/>
+
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.OPENABLE"/>
+
+                <data android:mimeType="*/*"/>
+            </intent-filter>
+        </activity>
+
+        <activity android:name="org.qpython.qpy.plugin.activity.PluginManagerActivity"/>
+        <activity android:name="org.qpython.qpy.plugin.activity.LocalPluginInstallActivity"/>
+
+        <!--zxing-->
+        <activity android:name="org.qpython.qpy.main.activity.QrCodeActivity"/>
+        <activity
+            android:name=".main.activity.GistActivity"
+            android:configChanges="orientation"
+            android:launchMode="singleTask"/>
+        <activity
+            android:name=".main.activity.GistDetailActivity"
+            android:configChanges="orientation"/>
+        <activity
+            android:name=".main.activity.MyGistActivity"
+            android:configChanges="orientation"/>
+        <!--SERVICE-->
+        <service android:name="org.qpython.qpy.console.TermService"
+                 tools:ignore="ExportedService">
+            <intent-filter>
+                <action android:name="jackpal.androidterm.action.START_TERM.v1"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </service>
+
+        <activity android:name=".main.activity.CourseIndexFundingActivity"/>
+        <activity android:name=".main.activity.FundingPurchaseActivity"/>
+        <activity
+            android:name=".main.activity.NotebookActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:launchMode="singleTask"
+            android:windowSoftInputMode="adjustResize"
+            android:exported="true">
+            <intent-filter >
+                <action android:name="android.intent.action.VIEW"/>
+            </intent-filter>
+        </activity>
+        <activity
+            android:name=".main.activity.NotebookListActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"/>
+
+        <service
+            android:name=".main.service.MyFirebaseMessagingService"
+            tools:ignore="ExportedService">
+            <intent-filter>
+                <action android:name="com.google.firebase.MESSAGING_EVENT"/>
+            </intent-filter>
+        </service>
+        <service
+            android:name=".main.service.MyFirebaseInstanceIDService"
+            tools:ignore="ExportedService">
+            <intent-filter>
+                <action android:name="com.google.firebase.INSTANCE_ID_EVENT"/>
+            </intent-filter>
+        </service>
+    </application>
+
+    <meta-data
+        android:name="com.sec.android.support.multiwindow"
+        android:value="true"/>
+
+</manifest>
\ No newline at end of file
diff --git a/qpython/src/ol/java/org/qpython/qpy/codeshare/ShareCodeUtil.java b/qpython/src/ol/java/org/qpython/qpy/codeshare/ShareCodeUtil.java
new file mode 100644
index 00000000..3841e9a9
--- /dev/null
+++ b/qpython/src/ol/java/org/qpython/qpy/codeshare/ShareCodeUtil.java
@@ -0,0 +1,743 @@
+package org.qpython.qpy.codeshare;
+
+import android.app.Activity;
+import android.content.SharedPreferences;
+import android.preference.PreferenceManager;
+import android.util.Log;
+import android.widget.Toast;
+
+import com.google.firebase.database.DataSnapshot;
+import com.google.firebase.database.DatabaseError;
+import com.google.firebase.database.DatabaseReference;
+import com.google.firebase.database.FirebaseDatabase;
+import com.google.firebase.database.ValueEventListener;
+import com.google.gson.reflect.TypeToken;
+import com.quseit.util.ACache;
+import com.quseit.util.FileHelper;
+import com.quseit.util.NetStateUtil;
+
+import org.json.JSONObject;
+import org.qpython.qpy.R;
+import org.qpython.qpy.codeshare.pojo.BookmarkerList;
+import org.qpython.qpy.codeshare.pojo.CloudFile;
+import org.qpython.qpy.codeshare.pojo.Gist;
+import org.qpython.qpy.codeshare.pojo.GistBase;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.app.CONF;
+import org.qpython.qpy.texteditor.common.TextFileUtils;
+import org.qpython.qpysdk.utils.DateTimeHelper;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import rx.Observable;
+import rx.functions.Action1;
+
+import static org.qpython.qpy.codeshare.CONSTANT.DOT_REPLACE;
+import static org.qpython.qpy.codeshare.CONSTANT.SLASH_REPLACE;
+import static org.qpython.qpy.main.server.CacheKey.CLOUD_FILE;
+
+/**
+ * FireBase database util
+ * Created by Hmei on 2017-08-10.
+ */
+
+public class ShareCodeUtil {
+    private static final boolean CLEAR = false;
+
+    private static final String CLOUD        = "cloud";
+    private static final String GIST         = "gist";
+    private static final String USER         = "user";
+    private static final String BASE         = "base";
+    private static final String GIST_LIST    = "gist_list";
+    private static final String HISTORY      = "history";
+    private static final String COMMENT      = "comment";
+    private static final String BOOKMARK     = "bookmark";
+    private static final String COMMIT       = "commit";
+    private static final String INDEX        = "index";
+    private static final String USAGE        = "usage";
+    private static final String PROJECT      = "project";
+    private static final String SCRIPT       = "script";
+    private static final String OTHER        = "other";
+    private static final String PROJECT_PATH = "/projects/";
+    private static final String SCRIPTS_PATH = "/scripts/";
+
+    private static final int MAX_FILE = 100;
+
+    private DatabaseReference reference;
+    private String            email;
+    private String            userName;
+    private String            avatarUrl;
+
+    private SharedPreferences sharedPreferences;
+    private int currentFileCount = -1;
+
+    private ShareCodeUtil() {
+        reference = FirebaseDatabase.getInstance().getReference();
+        if (App.getUser() != null) {
+            email = App.getUser().getEmail().replace(".", "_");
+            userName = App.getUser().getUserName();
+            avatarUrl = App.getUser().getAvatarUrl();
+            sharedPreferences = PreferenceManager.getDefaultSharedPreferences(App.getContext());
+            initUsage(null);
+        } else {
+            email = "";
+            userName = "";
+            avatarUrl = "";
+        }
+        //LogUtil.d("ShareCodeUtil", "ShareCodeUtil:"+App.getUser().getEmail());
+
+        Log.d("ShareCodeUtil", "ShareCodeUtil:"+email);
+    }
+
+    public static ShareCodeUtil getInstance() {
+        return ShareCodeHolder.INSTANCE;
+    }
+
+    @SuppressWarnings({"DEBUG_ONLY"})
+    public void clearAll() {
+        if (CLEAR) {
+            reference.child(CLOUD).child(email).removeValue(
+                    (databaseError, databaseReference) ->
+                            Toast.makeText(App.getContext(), "Clear", Toast.LENGTH_SHORT).show());
+        }
+    }
+
+    public void createScriptGist(String title, String desc, String msg, String content, DatabaseReference.CompletionListener listener) {
+        String date = DateTimeHelper.getDate();
+        // Add to all gist repo
+        Gist gist = new Gist();
+        gist.setTitle(title);
+        gist.setAuthor(userName);
+        gist.setAvatar(avatarUrl);
+        gist.setDescribe(desc);
+        gist.setDate(date);
+        DatabaseReference path = reference.child(GIST).child(SCRIPT).push();// gist/script/<gist_id>
+        String gistId = path.getKey();
+        path.setValue(gist, listener);
+        commitGist(gistId, msg, content, null, null);
+
+        // Add to user repo
+        GistBase baseGist = new GistBase();
+        baseGist.setAuthor(userName);
+        baseGist.setAvatar(avatarUrl);
+        baseGist.setDate(date);
+        baseGist.setTitle(title);
+        reference.child(USER).child(email).child(GIST_LIST).child(SCRIPT).child(gistId).setValue(baseGist);// user/<email>/gist_list/script/<gist_id>
+
+        // Add to base repo
+        reference.child(BASE).child(SCRIPT).child(gistId).setValue(baseGist); // base/script/<gist_id>
+    }
+
+    public void createProjectGist(String projectName, String desc, String msg, List<String> paths, DatabaseReference.CompletionListener completionListener) {
+        for (String path : paths) {
+            File file = new File(path);
+            String code = TextFileUtils.readTextFile(file);
+            String fileName = file.getName().replace(".", DOT_REPLACE);
+
+            String date = DateTimeHelper.getDate();
+            // Add to all gist repo
+            Gist gist = new Gist();
+            gist.setTitle(fileName);
+            gist.setAuthor(userName);
+            gist.setAvatar(avatarUrl);
+            gist.setDescribe(desc);
+            gist.setDate(date);
+            DatabaseReference subReference = reference.child(GIST).child(PROJECT);// gist/script/<gist_id>
+            String gistId = subReference.getKey();
+            subReference.child(gistId).child(projectName).child(fileName).setValue(gist, completionListener);// gist/project/<gist_id>/<projectName>/<fileName>
+            commitGist(gistId, msg, code, projectName, fileName);
+
+            // Add to user repo
+            GistBase baseGist = new GistBase();
+            baseGist.setAuthor(userName);
+            baseGist.setAuthor(avatarUrl);
+            baseGist.setDate(date);
+            baseGist.setTitle(fileName);
+            // user/<email>/gist_list/project/<gist_id>/<projectName>/<fileName>
+            reference.child(USER).child(email).child(GIST_LIST).child(PROJECT).child(gistId).child(projectName).child(fileName).setValue(baseGist);
+
+            // Add to base repo
+            // base/project/<gist_id>/<projectName>/<fileName>
+            reference.child(BASE).child(PROJECT).child(gistId).child(projectName).child(fileName).setValue(baseGist);
+        }
+    }
+
+    public void commitGist(String gistId, String msg, String content, String projName, String fileName) {
+        Gist.HistoryBean historyBean = new Gist.HistoryBean();
+        historyBean.setData(DateTimeHelper.getDate());
+        historyBean.setMassage(msg);
+        historyBean.setContent(content);
+        if (projName != null) {
+            DatabaseReference subRe = reference.child(GIST).child(PROJECT).child(gistId).child(projName).child(fileName).child(HISTORY).push();
+            String historyId = subRe.getKey();
+            subRe.child(historyId).setValue(historyBean); // gist/<gist_id>/history/<historyId>}
+        } else {
+            DatabaseReference subRe = reference.child(GIST).child(SCRIPT).child(gistId).child(HISTORY).push();
+            String historyId = subRe.getKey();
+            subRe.child(historyId).setValue(historyBean); // gist/<gist_id>/history/<historyId>}
+            reference.child(GIST).child(SCRIPT).child(gistId).child("lastCommitCode").setValue(content);
+        }
+    }
+
+    public void sendComment(String gistId, String comment, boolean isProj, CommentCallback callback) {
+        sendComment(gistId, "", comment, "", isProj, callback);
+    }
+
+    /**
+     * @param comment   评论
+     * @param reComment 被回复的评论
+     */
+    public void sendComment(String gistId, String to, String comment, String reComment, boolean isProj, CommentCallback callback) {
+        Gist.CommentBean commentBean = new Gist.CommentBean();
+        commentBean.setFrom_content(comment);
+        commentBean.setData(DateTimeHelper.getDate());
+        commentBean.setFrom(userName);
+        commentBean.setAvatar(avatarUrl);
+        commentBean.setRe(to);
+        commentBean.setRe_content(reComment);
+        callback.commentBean(commentBean);
+        DatabaseReference subRe = reference.child(GIST).child(isProj ? PROJECT : SCRIPT).child(gistId).child(COMMENT).push();
+        String commentId = subRe.getKey();
+        subRe.child(commentId).setValue(commentBean);
+    }
+
+    public void bookmark(String gistId) {
+        reference.child(GIST).child(gistId).child(BOOKMARK).child(email).setValue(userName);
+        reference.child(USER).child(email).child(BOOKMARK).child(gistId).setValue(true);
+    }
+
+    public void cancelBookmark(String gistId) {
+        reference.child(GIST).child(gistId).child(BOOKMARK).child(email).removeValue();
+        reference.child(USER).child(email).child(BOOKMARK).child(gistId).removeValue();
+    }
+
+    public void getBaseScriptGistList(Action1<List<GistBase>> callback) {
+        reference.child(BASE).child(SCRIPT).addListenerForSingleValueEvent(new SimpleValueEventListener() {
+            @Override
+            public void onDataGet(HashMap value) {
+                List<GistBase> dataList = new ArrayList<>();
+                for (Object key : value.keySet()) {
+                    GistBase gistBase = App.getGson().fromJson(new JSONObject((Map) value.get(key)).toString(), GistBase.class);
+                    gistBase.setId((String) key);
+                    dataList.add(gistBase);
+                }
+                Observable.just(dataList)
+                        .subscribe(callback);
+            }
+        });
+    }
+
+    public void getBaseProjectGistList(Action1<List<GistBase>> callback) {
+        reference.child(BASE).child(PROJECT).addListenerForSingleValueEvent(new SimpleValueEventListener() {
+            @Override
+            public void onDataGet(HashMap value) {
+                List<GistBase> dataList = new ArrayList<>();
+                for (Object key : value.keySet()) {
+                    GistBase gistBase = App.getGson().fromJson(new JSONObject((Map) value.get(key)).toString(), GistBase.class);
+                    gistBase.setId((String) key);
+                    dataList.add(gistBase);
+                }
+                Observable.just(dataList)
+                        .subscribe(callback);
+            }
+        });
+    }
+
+    public void getGistDetail(String gistId, boolean isProj, Action1<Gist> callback) {
+        reference.child(GIST).child(isProj ? PROJECT : SCRIPT).child(gistId).addListenerForSingleValueEvent(new SimpleValueEventListener() {
+            @Override
+            public void onDataGet(HashMap value) {
+                JSONObject jsonObject = new JSONObject(value);
+                Gist gist = App.getGson().fromJson(String.valueOf(jsonObject), Gist.class);
+
+                HashMap historyMap = (HashMap) value.get(HISTORY);
+                if (historyMap != null) {
+                    List<Gist.HistoryBean> historyList = new ArrayList<>();
+                    for (Object historyKey : historyMap.keySet()) {
+                        Gist.HistoryBean historyBean = App.getGson().fromJson(String.valueOf(new JSONObject((Map) historyMap.get(historyKey))), Gist.HistoryBean.class);
+                        historyBean.setHistoryId((String) historyKey);
+                        historyList.add(historyBean);
+                    }
+                    gist.setHistory(historyList);
+                }
+
+                HashMap commentMap = (HashMap) value.get(COMMENT);
+                if (commentMap != null) {
+                    List<Gist.CommentBean> commentList = new ArrayList<>();
+                    for (Object commentKey : commentMap.keySet()) {
+                        Gist.CommentBean commentBean = App.getGson().fromJson(String.valueOf(new JSONObject((Map) commentMap.get(commentKey))), Gist.CommentBean.class);
+                        commentBean.setId((String) commentKey);
+                        commentList.add(commentBean);
+                    }
+                    gist.setComment(commentList);
+                }
+
+                HashMap bookmarkMap = (HashMap) value.get(BOOKMARK);
+                if (bookmarkMap != null) {
+                    List<Gist.BookmarkerBean> bookmarkerList = new ArrayList<>();
+                    for (Object bookmarkKey : bookmarkMap.keySet()) {
+                        Gist.BookmarkerBean bookmarkerBean = App.getGson().fromJson(String.valueOf(new JSONObject((Map) bookmarkMap.get(bookmarkKey))), Gist.BookmarkerBean.class);
+                        bookmarkerBean.setId((String) bookmarkKey);
+                        bookmarkerList.add(bookmarkerBean);
+                    }
+                    gist.setBookmarker(bookmarkerList);
+                }
+                Observable.just(gist)
+                        .subscribe(callback);
+            }
+        });
+    }
+
+    // TODO: 2017-08-14 Need to fix
+    public void getMyGistList(Action1<List<GistBase>> callback) {
+        reference.child(USER).child(GIST_LIST).addListenerForSingleValueEvent(new ValueEventListener() {
+            @Override
+            public void onDataChange(DataSnapshot dataSnapshot) {
+                HashMap object = (HashMap) dataSnapshot.getValue();
+                List<GistBase> userGist = new ArrayList<>();
+                if (object == null) {
+                    return;
+                }
+                for (Object key : object.keySet()) {
+                    userGist.add(App.getGson().fromJson(new JSONObject((Map) object.get(key)).toString(), GistBase.class));
+                }
+                Observable.just(userGist)
+                        .subscribe(callback);
+            }
+
+            @Override
+            public void onCancelled(DatabaseError databaseError) {
+
+            }
+        });
+    }
+
+    public void getMyBookmarkList(Action1<List<BookmarkerList>> callback) {
+        reference.child(USER).child(BOOKMARK).addListenerForSingleValueEvent(new ValueEventListener() {
+            @Override
+            public void onDataChange(DataSnapshot dataSnapshot) {
+                HashMap object = (HashMap) dataSnapshot.getValue();
+                List<BookmarkerList> userGist = new ArrayList<>();
+                if (object == null) {
+                    return;
+                }
+                for (Object key : object.keySet()) {
+                    userGist.add(App.getGson().fromJson(new JSONObject((Map) object.get(key)).toString(), BookmarkerList.class));
+                }
+                Observable.just(userGist)
+                        .subscribe(callback);
+            }
+
+            @Override
+            public void onCancelled(DatabaseError databaseError) {
+
+            }
+        });
+    }
+
+    public void getGistCommentList(String gistId, Action1<List<Gist.CommentBean>> callback) {
+        reference.child(GIST).child(gistId).child(COMMENT).addListenerForSingleValueEvent(new ValueEventListener() {
+            @Override
+            public void onDataChange(DataSnapshot dataSnapshot) {
+                HashMap object = (HashMap) dataSnapshot.getValue();
+                List<Gist.CommentBean> commentList = new ArrayList<>();
+                if (object == null) {
+                    return;
+                }
+                for (Object key : object.keySet()) {
+                    commentList.add(App.getGson().fromJson(new JSONObject((Map) object.get(key)).toString(), Gist.CommentBean.class));
+                }
+                Observable.just(commentList)
+                        .subscribe(callback);
+            }
+
+            @Override
+            public void onCancelled(DatabaseError databaseError) {
+
+            }
+        });
+    }
+
+    public boolean uploadFolder(String path, DatabaseReference.CompletionListener completionListener, int[] size) {
+        File folder = new File(path);
+        // 获取该文件夹下符合后缀文件及非隐藏文件
+
+        if (!folder.isDirectory()) {
+            return false;
+        }
+        List<File> files = FileHelper.filterExt(folder, App.getContext().getResources().getStringArray(R.array.support_file_ext), size[0]);
+        if (files.size() == 0) {
+            Toast.makeText(App.getContext(), R.string.no_file, Toast.LENGTH_SHORT).show();
+            return false;
+        }
+
+        if (!hasSpace(files.size())) {
+            return false;
+        }
+
+        for (File file : files) {
+            uploadFile(file.getAbsolutePath(), completionListener);
+        }
+
+//        // 如果在project目录下
+//        if ("projects".equals(folder.getName())) {
+//            DatabaseReference projNode = reference.child(CLOUD).child(email).child(PROJECT).child(folder.getName().replace(".", DOT_REPLACE));
+//            for (int i = 0; i < files.size(); i++) {
+//                String date = DateTimeHelper.AGO_FULL_DATE_FORMATTER.format(new Date(files.get(i).lastModified()));
+//                String subPath = files.get(i).getAbsolutePath();
+//                String subKey = subPath.substring(subPath.indexOf(folder.getName()) + folder.getName().length(), subPath.length()).replace(".", DOT_REPLACE).replace("/", SLASH_REPLACE);
+//                if (i == files.size() - 1) {
+//                    projNode.child(subKey)
+//                            .child(date)
+//                            .setValue(TextFileUtils.readTextFile(files.get(i)), completionListener);
+//                } else {
+//                    projNode.child(subKey)
+//                            .child(date)
+//                            .setValue(TextFileUtils.readTextFile(files.get(i)));
+//                }
+//                reference.child(CLOUD)
+//                        .child(email)
+//                        .child(INDEX)
+//                        .child(PROJECT)
+//                        .child(folder.getName().replace(".", DOT_REPLACE) + subKey)
+//                        .setValue(date);
+//            }
+//        } else if ("scripts".equals(folder.getName())) {
+//            // 上传整个scripts文件夹
+//            for (int i = 0; i < files.size(); i++) {
+//                String abs_path = files.get(i).getAbsolutePath();
+//                String key = abs_path
+//                        .substring(abs_path.indexOf(SCRIPTS_PATH) + SCRIPTS_PATH.length())
+//                        .replace(".", DOT_REPLACE)
+//                        .replace("/", SLASH_REPLACE);
+//                DatabaseReference content = reference.child(CLOUD)
+//                        .child(email)
+//                        .child(SCRIPT)
+//                        .child(key)
+//                        .child(DateTimeHelper.AGO_FULL_DATE_FORMATTER.format(new Date(files.get(i).lastModified())));
+//                if (i == files.size() - 1) {
+//                    content.setValue(TextFileUtils.readTextFile(files.get(i)), completionListener);
+//                } else {
+//                    content.setValue(TextFileUtils.readTextFile(files.get(i)));
+//                }
+//
+//                reference.child(CLOUD)
+//                        .child(email)
+//                        .child(INDEX)
+//                        .child(SCRIPT)
+//                        .child(key)
+//                        .setValue(DateTimeHelper.AGO_FULL_DATE_FORMATTER.format(new Date(files.get(i).lastModified())));
+//            }
+//        } else {
+//            // 普通文件夹
+//            int fileListSize = files.size();
+//            for (File file : files) {
+//                fileListSize--;
+//                final String rootNode = "/qpython/";
+//                String node = file.getAbsolutePath().substring(path.indexOf(rootNode) + rootNode.length());
+//                DatabaseReference child =
+//                        reference
+//                                .child(CLOUD)
+//                                .child(email)/*.child(folder.getName().replace(".", DOT_REPLACE))*/
+//                                .child(OTHER)
+//                                .child(node.replace(".", DOT_REPLACE).replace("/", SLASH_REPLACE))
+//                                .child(DateTimeHelper.getDate());
+//                if (fileListSize == 0) {
+//                    child.setValue(TextFileUtils.readTextFile(file), completionListener);
+//                } else {
+//                    child.setValue(TextFileUtils.readTextFile(file));
+//                }
+//
+//                reference.child(CLOUD)
+//                        .child(email)
+//                        .child(INDEX)
+//                        .child(OTHER)
+//                        .child(node.replace(".", DOT_REPLACE).replace("/", SLASH_REPLACE))
+//                        .setValue(DateTimeHelper.getDate());
+//            }
+//        }
+        return true;
+    }
+
+    public boolean uploadFile(String path, DatabaseReference.CompletionListener completionListener) {
+        File file = new File(path);
+
+        if (!hasSpace(1)) {
+            return false;
+        }
+
+        if (path.contains(PROJECT_PATH)) {
+            String subPath = path.substring(path.indexOf(PROJECT_PATH) + PROJECT_PATH.length());
+            String projName = subPath.split("/")[0];
+            reference.child(CLOUD)
+                    .child(email)
+                    .child(PROJECT)
+                    .child(projName)
+                    .child(subPath.replace(".", DOT_REPLACE).replace("/", SLASH_REPLACE).replace(projName, ""))
+                    .child(DateTimeHelper.AGO_FULL_DATE_FORMATTER.format(new Date(file.lastModified())))
+                    .setValue(TextFileUtils.readTextFile(file), completionListener);
+
+            reference.child(CLOUD)
+                    .child(email)
+                    .child(INDEX)
+                    .child(PROJECT)
+                    .child(subPath.replace(".", DOT_REPLACE).replace("/", SLASH_REPLACE))
+                    .setValue(DateTimeHelper.AGO_FULL_DATE_FORMATTER.format(new Date(file.lastModified())));
+        } else if (path.contains(SCRIPTS_PATH)) {
+            reference.child(CLOUD)
+                    .child(email)
+                    .child(SCRIPT)
+                    .child(file.getName().replace(".", DOT_REPLACE))
+                    .child(DateTimeHelper.AGO_FULL_DATE_FORMATTER.format(new Date(file.lastModified())))
+                    .setValue(TextFileUtils.readTextFile(file), completionListener);
+
+            reference.child(CLOUD)
+                    .child(email)
+                    .child(INDEX)
+                    .child(SCRIPT)
+                    .child(file.getName().replace(".", DOT_REPLACE))
+                    .setValue(DateTimeHelper.AGO_FULL_DATE_FORMATTER.format(new Date(file.lastModified())));
+        } else {
+            final String rootNode = "/qpython/";
+            String uploadKey = path.substring(path.indexOf(rootNode) + rootNode.length());
+            reference.child(CLOUD)
+                    .child(email)
+                    .child(OTHER)
+                    .child(uploadKey.replace(".", DOT_REPLACE).replace("/", SLASH_REPLACE))
+                    .child(DateTimeHelper.getDate())
+                    .setValue(TextFileUtils.readTextFile(file), completionListener);
+
+            reference.child(CLOUD)
+                    .child(email)
+                    .child(INDEX)
+                    .child(OTHER)
+                    .child(uploadKey.replace(".", DOT_REPLACE).replace("/", SLASH_REPLACE))
+                    .setValue(DateTimeHelper.getDate());
+        }
+        return true;
+    }
+
+    public void getUploadedScripts(boolean forceRefresh, Activity context, Action1<List<CloudFile>> callback) {
+        if (CLEAR) {
+            return;
+        }
+        String content = FileHelper.getFileContents(CONF.CLOUD_MAP_CACHE_PATH);
+        List<CloudFile> cloudFiles = content == null ? null : App.getGson().fromJson(content, new TypeToken<List<CloudFile>>() {
+        }.getType());
+        if (cloudFiles != null && !forceRefresh) {
+            Observable.just(cloudFiles)
+                    .subscribe(callback);
+        } else {
+            email = App.getUser()!=null?App.getUser().getEmail().replace(".","_"):"";
+            if (email.equals("")) {
+                Toast.makeText(context, "Waiting the firebase to initializ...",Toast.LENGTH_SHORT).show();
+
+            } else {
+                reference.child(CLOUD).child(email).child(INDEX).addListenerForSingleValueEvent(new ValueEventListener() {
+                    @Override
+                    public void onDataChange(DataSnapshot dataSnapshot) {
+                        HashMap<String, Object> value = (HashMap<String, Object>) dataSnapshot.getValue();
+                        if (value == null) {
+                            resetUsage(0);
+                            Observable.just(new ArrayList<CloudFile>())
+                                    .subscribe(callback);
+                            return;
+                        }
+                        List<CloudFile> cloudFiles = new ArrayList<>();
+                        for (String node : value.keySet()) {
+                            switch (node) {
+                                case SCRIPT:
+                                    HashMap<String, Object> script;
+                                    script = (HashMap<String, Object>) value.get(SCRIPT);
+                                    for (String o : script.keySet()) {
+                                        CloudFile cloudFile = new CloudFile();
+                                        cloudFile.setName(o);
+                                        cloudFile.setKey(SCRIPT + "/" + o);
+                                        cloudFile.setPath(SCRIPTS_PATH);
+                                        cloudFile.setUploadTime((String) script.get(o));
+                                        cloudFiles.add(cloudFile);
+                                    }
+                                    break;
+                                case PROJECT:
+                                    HashMap<String, Object> project = (HashMap<String, Object>) value.get(PROJECT);
+                                    for (String s : project.keySet()) {
+                                        CloudFile cloudFile = new CloudFile();
+                                        cloudFile.setKey(PROJECT + "/" + s);
+                                        String[] nodes = s.split(SLASH_REPLACE);
+                                        cloudFile.setName(nodes[nodes.length - 1]);
+                                        cloudFile.setProjectName(nodes[0]);
+                                        cloudFile.setPath(s.replace(nodes[0], ""));
+                                        cloudFile.setUploadTime((String) project.get(s));
+                                        cloudFiles.add(cloudFile);
+                                    }
+                                    break;
+                                default:
+                                    HashMap<String, Object> other = (HashMap<String, Object>) value.get(OTHER);
+                                    for (String s : other.keySet()) {
+                                        CloudFile cloudFile = new CloudFile();
+                                        cloudFile.setPath(s);
+                                        cloudFile.setKey(OTHER + "/" + s);
+                                        String[] nodes = s.split(SLASH_REPLACE);
+                                        boolean index = false;
+                                        for (String node1 : nodes) {
+                                            if (index) {
+                                                cloudFile.setProjectName(node1);
+                                                break;
+                                            } else if (node1.equals("projects3")) {
+                                                index = true;
+                                            }
+                                        }
+                                        cloudFile.setName(nodes[nodes.length - 1]);
+                                        cloudFile.setUploadTime((String) other.get(s));
+                                        cloudFiles.add(cloudFile);
+                                    }
+                                    break;
+                            }
+                        }
+                        resetUsage(cloudFiles.size());
+                        Observable.just(cloudFiles)
+                                .subscribe(callback);
+                        ACache.get(context).put(CLOUD_FILE, App.getGson().toJson(cloudFiles));
+
+                    }
+
+                    @Override
+                    public void onCancelled(DatabaseError databaseError) {
+
+                    }
+                });
+            }
+        }
+    }
+
+    public void getFileContent(String path, Action1<String> callback) {
+        reference.child(CLOUD)
+                .child(email)
+                .child(path)
+                .addListenerForSingleValueEvent(new ValueEventListener() {
+                    @Override
+                    public void onDataChange(DataSnapshot dataSnapshot) {
+                        HashMap<String, String> dateContent = (HashMap<String, String>) dataSnapshot.getValue();
+                        String latest = "";
+                        for (String s : dateContent.keySet()) {
+                            latest = DateTimeHelper.isLater(s, latest) ? s : latest;
+                        }
+
+                        Observable.just(dateContent.get(latest))
+                                .subscribe(callback);
+                    }
+
+                    @Override
+                    public void onCancelled(DatabaseError databaseError) {
+
+                    }
+                });
+    }
+
+    public void deleteUploadScript(CloudFile cloudFile, DatabaseReference.CompletionListener listener) {
+        reference.child(CLOUD)
+                .child(email)
+                .child(cloudFile.getKey())
+                .removeValue(listener);
+        reference.child(CLOUD)
+                .child(email)
+                .child(INDEX)
+                .child(cloudFile.getKey())
+                .removeValue();
+        changeUsage(-1);
+    }
+
+    public void initUsage(Action1<Integer> callback) {
+        if (CLEAR) {
+            return;
+        }
+        if (currentFileCount == -1) {
+            if (NetStateUtil.isConnected(App.getContext())) {
+                reference.child(CLOUD)
+                        .child(email)
+                        .child(USAGE)
+                        .addListenerForSingleValueEvent(new ValueEventListener() {
+                            @Override
+                            public void onDataChange(DataSnapshot dataSnapshot) {
+                                if (dataSnapshot.getValue() != null) {
+                                    currentFileCount = ((Long) dataSnapshot.getValue()).intValue();
+                                } else {
+                                    currentFileCount = 0;
+                                }
+                                if (callback != null) {
+                                    Observable.just(currentFileCount)
+                                            .subscribe(callback);
+                                }
+                            }
+
+                            @Override
+                            public void onCancelled(DatabaseError databaseError) {
+
+                            }
+                        });
+            }
+        } else {
+            callback.call(currentFileCount);
+        }
+    }
+
+    public int changeUsage(int change) {
+        currentFileCount += change;
+        reference.child(CLOUD)
+                .child(email)
+                .child(USAGE)
+                .setValue(currentFileCount);
+        return currentFileCount;
+    }
+
+    public void resetUsage(int value) {
+        currentFileCount = value;
+        reference.child(CLOUD)
+                .child(email)
+                .child(USAGE)
+                .setValue(currentFileCount);
+    }
+
+    private boolean hasSpace(int waiting) {
+        if (currentFileCount < 0) {
+            Toast.makeText(App.getContext(), R.string.usage_not_init, Toast.LENGTH_SHORT).show();
+            return false;
+        } else if (currentFileCount + waiting > MAX_FILE) {
+            Toast.makeText(App.getContext(), R.string.no_space, Toast.LENGTH_SHORT).show();
+            return false;
+        } else {
+            return true;
+        }
+    }
+
+    public interface CommentCallback {
+        void commentBean(Gist.CommentBean comment);
+    }
+
+    private static class ShareCodeHolder {
+        private static final ShareCodeUtil INSTANCE = new ShareCodeUtil();
+    }
+
+    abstract class SimpleValueEventListener implements ValueEventListener {
+        @Override
+        public void onDataChange(DataSnapshot dataSnapshot) {
+            HashMap<String, Object> object = (HashMap<String, Object>) dataSnapshot.getValue();
+            if (object == null) {
+                return;
+            }
+            onDataGet(object);
+        }
+
+        @Override
+        public void onCancelled(DatabaseError databaseError) {
+
+        }
+
+        public abstract void onDataGet(HashMap<String, Object> value);
+    }
+}
\ No newline at end of file
diff --git a/qpython/src/ol/java/org/qpython/qpy/codeshare/pojo/CloudFile.java b/qpython/src/ol/java/org/qpython/qpy/codeshare/pojo/CloudFile.java
new file mode 100644
index 00000000..09a9471c
--- /dev/null
+++ b/qpython/src/ol/java/org/qpython/qpy/codeshare/pojo/CloudFile.java
@@ -0,0 +1,97 @@
+package org.qpython.qpy.codeshare.pojo;
+
+
+import org.qpython.qpy.codeshare.CONSTANT;
+import org.qpython.qpysdk.QPyConstants;
+
+import java.io.Serializable;
+
+public class CloudFile implements Serializable {
+    private String  projectName;
+    private String  path;
+    private String  uploadTime;
+    private String  name;
+    private String  content;
+    private String  key;
+    private boolean uploading;
+
+    public String getPath() {
+        if (projectName == null) {
+            if (path.contains("scripts3")) {
+                return "/" + path.replace(CONSTANT.SLASH_REPLACE, "/").replace(CONSTANT.DOT_REPLACE, ".");
+            } else if (path.contains("scripts")) {
+                return path.replace(CONSTANT.SLASH_REPLACE, "/") + getName();
+            } else {
+                return "/" + path.replace(CONSTANT.SLASH_REPLACE, "/").replace(CONSTANT.DOT_REPLACE, ".");
+            }
+        } else {
+            String projNode = path.contains("projects3") ? "projects3/" : "projects/";
+            return "/" + projNode + getProjectName() + path
+                    .replace(CONSTANT.SLASH_REPLACE, "/")
+                    .replace(CONSTANT.DOT_REPLACE, ".")
+                    .replace(projNode, "")
+                    .replace(getProjectName(), "");
+        }
+    }
+
+    public void setPath(String path) {
+        this.path = path;
+    }
+
+    public String getUploadTime() {
+        return uploadTime;
+    }
+
+    public void setUploadTime(String uploadTime) {
+        this.uploadTime = uploadTime;
+    }
+
+    public String getName() {
+        return name.replace(CONSTANT.DOT_REPLACE, ".");
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+
+    public long getContentSize() {
+        return content == null ? 0 : content.length();
+    }
+
+    public String getProjectName() {
+        return projectName == null ? null : projectName.
+                replace(CONSTANT.SLASH_REPLACE, "/").replace(CONSTANT.DOT_REPLACE, ".");
+    }
+
+    public void setProjectName(String projectName) {
+        this.projectName = projectName;
+    }
+
+    public boolean isUploading() {
+        return uploading;
+    }
+
+    public void setUploading(boolean uploading) {
+        this.uploading = uploading;
+    }
+
+    public String getKey() {
+        return key == null ? getName().replace(".", CONSTANT.DOT_REPLACE) : key;
+    }
+
+    public void setKey(String key) {
+        this.key = key;
+    }
+
+    public String getAbsolutePath() {
+        return QPyConstants.ABSOLUTE_PATH + getPath();
+    }
+}
diff --git a/qpython/src/ol/java/org/qpython/qpy/main/PayActivity.java b/qpython/src/ol/java/org/qpython/qpy/main/PayActivity.java
new file mode 100644
index 00000000..c1a7b8d2
--- /dev/null
+++ b/qpython/src/ol/java/org/qpython/qpy/main/PayActivity.java
@@ -0,0 +1,188 @@
+package org.qpython.qpy.main;
+
+import android.app.PendingIntent;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentSender;
+import android.content.ServiceConnection;
+import android.os.Bundle;
+import android.os.IBinder;
+import android.os.RemoteException;
+import android.support.annotation.Nullable;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.GridLayoutManager;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.Toast;
+
+import com.android.vending.billing.IInAppBillingService;
+import com.quseit.util.ImageUtil;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.qpython.qpy.R;
+import org.qpython.qpy.main.activity.PurchaseActivity;
+import org.qpython.qpy.main.server.MySubscriber;
+import org.qpython.qpy.main.widget.GridSpace;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import rx.Observable;
+import rx.android.schedulers.AndroidSchedulers;
+import rx.schedulers.Schedulers;
+
+/**
+ * Created by Hmei
+ * 1/30/18.
+ */
+
+public class PayActivity extends AppCompatActivity {
+    public static final int BUY_REQUEST_CODE = 2333;
+    private IInAppBillingService   mService;
+    private ServiceConnection      mServiceConn;
+    private ArrayList<String>      skuList;
+    private MySubscriber<String[]> callback;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+    }
+
+    void initIAB(ArrayList<String> skuList, MySubscriber<String[]> callback) {
+        this.skuList = skuList;
+        this.callback = callback;
+        mServiceConn = new ServiceConnection() {
+            @Override
+            public void onServiceDisconnected(ComponentName name) {
+                mService = null;
+            }
+
+            @Override
+            public void onServiceConnected(ComponentName name,
+                                           IBinder service) {
+                mService = IInAppBillingService.Stub.asInterface(service);
+                getPrices(skuList, callback);
+            }
+        };
+
+        Intent serviceIntent = new Intent("com.android.vending.billing.InAppBillingService.BIND");
+        serviceIntent.setPackage("com.android.vending");
+        bindService(serviceIntent, mServiceConn, Context.BIND_AUTO_CREATE);
+    }
+
+    /**
+     * 从Google服务器获取不同国家价格表并显示
+     */
+    private void getPrices(ArrayList<String> skuList, MySubscriber<String[]> callback) {
+        if (mService == null) {
+            Toast.makeText(this, R.string.lose_google_server, Toast.LENGTH_SHORT).show();
+            if (findViewById(R.id.pb) != null) findViewById(R.id.pb).setVisibility(View.GONE);
+            return;
+        }
+//        ArrayList<String> skuList;
+//        if (!isCrowdFunding) {
+//            skuList = new ArrayList<>(Arrays.asList(getResources().getStringArray(R.array.sku)));
+//        } else {
+//            skuList = new ArrayList<>(Arrays.asList(getResources().getStringArray(R.array.crowdfunding)));
+//            int index = (int) (getIntent().getIntExtra(PERCENT, 0) / 100.00 * 4);
+//            String sku = skuList.get(index);
+//            skuList.clear();
+//            skuList.add(sku);
+//        }
+        Bundle querySkus = new Bundle();
+        querySkus.putStringArrayList("ITEM_ID_LIST", skuList);
+        try {
+            Observable.just(mService.getSkuDetails(3, getPackageName(), "inapp", querySkus))
+                    .map(bundle -> {
+                                ArrayList<String> responseList = bundle.getStringArrayList("DETAILS_LIST");
+                                if (responseList == null) {
+                                    return null;
+                                }
+                                String[] prices = new String[responseList.size()];
+                                for (int i = 0; i < responseList.size(); i++) {
+                                    JSONObject object;
+                                    try {
+                                        object = new JSONObject(responseList.get(i));
+                                        String price = object.getString("price");
+                                        prices[i] = price;
+                                    } catch (JSONException e) {
+                                        e.printStackTrace();
+                                    }
+                                }
+                                Arrays.sort(prices, (o1, o2) -> Integer.parseInt(o1.replaceAll("[^0-9]", "")) - Integer.parseInt(o2.replaceAll("[^0-9]", "")));
+                                return prices;
+                            }
+                    )
+                    .subscribeOn(Schedulers.newThread())
+                    .observeOn(AndroidSchedulers.mainThread())
+                    .subscribe(callback
+//                            new MySubscriber<String[]>() {
+//                        @Override
+//                        public void onNext(String[] o) {
+//                            super.onNext(o);
+//                            if (o == null) {
+//                                return;
+//                            }
+//                            invalidateData();
+//                            GridSpace gridSpace = new GridSpace(2, (int) ImageUtil.dp2px(16), false);
+//                            binding.list.setLayoutManager(new GridLayoutManager(PurchaseActivity.this, 2));
+//                            binding.list.addItemDecoration(gridSpace);
+//                            binding.list.setAdapter(new PurchaseActivity.ListAdapter(o));
+//                        }
+//                    }
+                    );
+        } catch (RemoteException e) {
+            e.printStackTrace();
+        }
+    }
+
+    private void purchase(String sku) {
+//        String[] skus;
+//        if (isCrowdFunding) {
+//            skus = getResources().getStringArray(R.array.crowdfunding);
+//        } else {
+//            skus = getResources().getStringArray(R.array.sku);
+//        }
+        try {
+            if (mService == null) {
+                Toast.makeText(this, R.string.lose_google_server, Toast.LENGTH_SHORT).show();
+                return;
+            }
+            Bundle buyIntentBundle = mService.getBuyIntent(3, getPackageName(),
+                    sku, "inapp", "bGoa+V7g/yqDXvKRqq+JTFn4uQZbPiQJo4pf9RzJ");
+            switch (buyIntentBundle.getInt("RESPONSE_CODE")) {
+                case 0:
+                    //BILLING_RESPONSE_RESULT_OK
+                    PendingIntent pendingIntent = buyIntentBundle.getParcelable("BUY_INTENT");
+                    startIntentSenderForResult(pendingIntent.getIntentSender(),
+                            BUY_REQUEST_CODE, new Intent(), 0, 0, 0);
+                    break;
+
+            }
+        } catch (RemoteException | IntentSender.SendIntentException | NullPointerException e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == R.id.refresh_menu) {
+            if (findViewById(R.id.pb) != null) findViewById(R.id.pb).setVisibility(View.VISIBLE);
+            getPrices(skuList, callback);
+            return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        if (mService != null) {
+            unbindService(mServiceConn);
+        }
+    }
+
+}
diff --git a/qpython/src/ol/java/org/qpython/qpy/main/activity/BaseActivity.java b/qpython/src/ol/java/org/qpython/qpy/main/activity/BaseActivity.java
new file mode 100644
index 00000000..d3e259f8
--- /dev/null
+++ b/qpython/src/ol/java/org/qpython/qpy/main/activity/BaseActivity.java
@@ -0,0 +1,301 @@
+package org.qpython.qpy.main.activity;
+
+import android.content.ActivityNotFoundException;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.content.res.Configuration;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Bundle;
+import android.os.Environment;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v4.app.ActivityCompat;
+import android.support.v4.content.ContextCompat;
+import android.support.v4.util.ArrayMap;
+import android.support.v7.app.AlertDialog;
+import android.support.v7.app.AppCompatActivity;
+import android.widget.ArrayAdapter;
+import android.widget.Toast;
+import android.text.TextUtils;
+
+import com.quseit.util.NAction;
+import com.quseit.util.NUtil;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.console.ShellTermSession;
+import org.qpython.qpy.console.util.TermSettings;
+import org.renpy.android.ResourceManager;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import org.qpython.qpy.main.server.gist.TokenManager;
+
+public class BaseActivity extends AppCompatActivity {
+    // QPython interfaces
+    private static final int SCRIPT_CONSOLE_CODE = 1237;
+    private static final int PID_INIT_VALUE = -1;
+    private static final int DEFAULT_BUFFER_SIZE = 8192;
+    private static final int LOG_NOTIFICATION_ID = (int) System.currentTimeMillis();
+
+
+    //private FirebaseAnalytics mFirebaseAnalytics;
+    private ArrayList<String> mArguments = new ArrayList<>();
+    private InputStream mIn;
+    private OutputStream mOut;
+    private Map<Integer, PermissionAction> mActionMap = new ArrayMap<>();
+    private TermSettings mSettings;
+    private ShellTermSession session;
+
+    private boolean permissionGrant = true;
+
+    protected static ShellTermSession createTermSession(Context context, TermSettings settings, String initialCommand, String path) {
+        ShellTermSession session = null;
+        try {
+            session = new ShellTermSession(context, settings, initialCommand, path);
+            session.setProcessExitMessage(context.getString(R.string.process_exit_message));
+
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+        return session;
+    }
+
+    protected void toast(String content) {
+        Toast.makeText(this, content, Toast.LENGTH_SHORT).show();
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+    }
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        //mFirebaseAnalytics = FirebaseAnalytics.getInstance(this);
+    }
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+    }
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+        PermissionAction action = mActionMap.get(requestCode);
+        if (action != null) {
+            if (grantResults.length > 0 && (grantResults[0] == PackageManager.PERMISSION_GRANTED)) {
+                action.onGrant();
+            } else {
+                action.onDeny();
+            }
+
+        }
+        mActionMap.remove(action);
+    }
+
+    public final void checkPermissionDo(String[] permissions, PermissionAction action) {
+        if (Build.VERSION.SDK_INT >= 23) {
+            boolean granted = true;
+            for (String permission : permissions) {
+                int checkPermission = ContextCompat.checkSelfPermission(this, permission);
+                granted = checkPermission == PackageManager.PERMISSION_GRANTED;
+            }
+            if (!granted) {
+                int code = permissions.hashCode() & 0xffff;
+                mActionMap.put(code, action);
+                ActivityCompat.requestPermissions(this, permissions, code);
+            } else {
+                action.onGrant();
+            }
+        } else {
+            action.onGrant();
+        }
+    }
+
+
+    // feedback
+    public void onFeedback(String feedback) {
+        String app = getString(R.string.app_name);
+        int ver = NUtil.getVersinoCode(getApplicationContext());
+        String subject = MessageFormat.format(getString(com.quseit.android.R.string.feeback_email_title), app, ver, Build.PRODUCT);
+
+        String lastError = "";
+        String code = NAction.getCode(getApplicationContext());
+        File log = new File(Environment.getExternalStorageDirectory() + "/" + code + "_last_err.log");
+        if (log.exists()) {
+            lastError = com.quseit.util.FileHelper.getFileContents(log.getAbsolutePath());
+        }
+
+        String body = feedback.isEmpty() ? feedback : MessageFormat.format(getString(R.string.feedback_email_body), Build.PRODUCT,
+                Build.VERSION.RELEASE, Build.VERSION.SDK, lastError, feedback);
+
+
+        Intent twitterIntent = getPackageManager().getLaunchIntentForPackage("com.twitter.android");
+        if (twitterIntent != null) {
+            List<String> list = new ArrayList<>();
+            list.add("Feedback with Twitter");
+            list.add("Feedback with Email");
+            new AlertDialog.Builder(this)
+                    .setTitle(R.string.feedback)
+                    .setNegativeButton(R.string.close, (dialog, which) -> dialog.dismiss())
+                    .setAdapter(new ArrayAdapter<>(this, R.layout.dialog_feedback, list), (dialog, which) -> {
+                        if (which == 0) {
+                            twitter(body);
+                        } else {
+                            email(subject, body);
+                        }
+                    })
+                    .show();
+        } else {
+            email(subject, body);
+        }
+    }
+
+    private void email(String subject, String body) {
+        Intent intent = new Intent(Intent.ACTION_SENDTO, Uri.parse("mailto:" + getString(R.string.ui_feedback_mail)));
+
+        intent.putExtra(Intent.EXTRA_SUBJECT, subject);
+        intent.putExtra(Intent.EXTRA_TEXT, session == null ? body : session.getTranscriptText().trim());
+        try {
+            startActivity(Intent.createChooser(intent,
+                    getString(R.string.email_transcript_chooser_title)));
+        } catch (ActivityNotFoundException e) {
+            Toast.makeText(this,
+                    R.string.email_transcript_no_email_activity_found,
+                    Toast.LENGTH_LONG)
+                    .show();
+        }
+    }
+
+    private void twitter(String message) {
+        Intent tweetIntent = new Intent(Intent.ACTION_SEND);
+        if (message.isEmpty()){
+            tweetIntent.putExtra(Intent.EXTRA_TEXT, "@qpython,");
+        }else {
+            tweetIntent.putExtra(Intent.EXTRA_TEXT, "@qpython\n" + message);
+        }
+        tweetIntent.setType("text/plain");
+
+        PackageManager packManager = getPackageManager();
+        List<ResolveInfo> resolvedInfoList = packManager.queryIntentActivities(tweetIntent, PackageManager.MATCH_DEFAULT_ONLY);
+
+        boolean resolved = false;
+        for (ResolveInfo resolveInfo : resolvedInfoList) {
+            if (resolveInfo.activityInfo.packageName.startsWith("com.twitter.android")) {
+                tweetIntent.setClassName(
+                        resolveInfo.activityInfo.packageName,
+                        resolveInfo.activityInfo.name);
+                resolved = true;
+                break;
+            }
+        }
+        if (resolved) {
+            startActivity(tweetIntent);
+        } else {
+            Intent i = new Intent();
+            i.putExtra(Intent.EXTRA_TEXT, message);
+            i.setAction(Intent.ACTION_VIEW);
+            i.setData(Uri.parse("https://twitter.com/intent/tweet?text=" + urlEncode(message)));
+            startActivity(i);
+            Toast.makeText(this, "Twitter app isn't found", Toast.LENGTH_LONG).show();
+        }
+    }
+
+    private String urlEncode(String s) {
+        try {
+            return URLEncoder.encode(s, "UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+            return "";
+        }
+    }
+
+    protected boolean checkExpired(final String resource, String filesDir, String tag) {
+        ResourceManager resourceManager = new ResourceManager(this);
+
+        String data_version = resourceManager.getString(resource + "_version");
+        String disk_version = "0";
+
+        // If no version, no unpacking is necessary.
+        if (data_version == null) {
+            return false;
+        }
+
+        // Check the current disk version, if any.
+        String disk_version_fn = filesDir + "/" + tag + "_" + resource + ".version";
+
+        try {
+            byte buf[] = new byte[64];
+            InputStream is = new FileInputStream(disk_version_fn);
+            int len = is.read(buf);
+            disk_version = new String(buf, 0, len);
+            is.close();
+        } catch (Exception e) {
+
+            disk_version = "0";
+
+        }
+
+        if (!NUtil.isNumeric(disk_version)) {
+            disk_version = "0";
+
+        }
+
+        if ((int) (Double.parseDouble(data_version) - Double.parseDouble(disk_version)) > 0 || disk_version.equals("0")) {
+            try {
+                FileOutputStream os = new FileOutputStream(disk_version_fn);
+                try {
+                    os.write(data_version.getBytes());
+                    os.close();
+
+                } catch (IOException e) {
+                    e.printStackTrace();
+                    //Mint.logException(e);
+
+                }
+
+            } catch (FileNotFoundException e) {
+                e.printStackTrace();
+                //Mint.logException(e);
+
+            }
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    public interface PermissionAction {
+        void onGrant();
+
+        void onDeny();
+    }
+
+    public void ifLogin(Login afterLogin) {
+        if (!TextUtils.isEmpty(TokenManager.getToken())) {
+            afterLogin.process();
+        } else {
+            Toast.makeText(this, R.string.login_first, Toast.LENGTH_SHORT).show();
+        }
+    }
+    public interface Login {
+        void process();
+    }
+}
\ No newline at end of file
diff --git a/qpython/src/ol/java/org/qpython/qpy/main/activity/FundingPurchaseActivity.java b/qpython/src/ol/java/org/qpython/qpy/main/activity/FundingPurchaseActivity.java
new file mode 100644
index 00000000..6e6cf10a
--- /dev/null
+++ b/qpython/src/ol/java/org/qpython/qpy/main/activity/FundingPurchaseActivity.java
@@ -0,0 +1,143 @@
+package org.qpython.qpy.main.activity;
+
+import android.content.Context;
+import android.content.Intent;
+import android.databinding.DataBindingUtil;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.view.Menu;
+import android.view.View;
+import android.widget.Toast;
+
+import com.quseit.util.VeDate;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.qpython.qpy.R;
+import org.qpython.qpy.databinding.ActivityFundingPurchaseBinding;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.server.MySubscriber;
+import org.qpython.qpy.main.server.model.GooglePurchaseModel;
+import org.qpython.qpy.utils.UpdateHelper;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+
+/**
+ * Created by Hmei
+ * 1/30/18.
+ */
+
+public class FundingPurchaseActivity extends PayActivity {
+    private static final String ARTICLE_ID    = "article_id";
+    private static final String FUNDING_COUNT = "fundingCount";
+    //    private final String[] prices = get
+    private ActivityFundingPurchaseBinding binding;
+    private String                         sku;
+
+    public static void startSupport(Context context, String articleId, int fundingPercent) {
+        Intent starter = new Intent(context, FundingPurchaseActivity.class);
+        starter.putExtra(ARTICLE_ID, articleId);
+        starter.putExtra(FUNDING_COUNT, fundingPercent);
+        context.startActivity(starter);
+    }
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        binding = DataBindingUtil.setContentView(this, R.layout.activity_funding_purchase);
+        binding.pb.setVisibility(View.VISIBLE);
+        initView();
+        initPrice();
+        initListener();
+    }
+
+    private void initView() {
+        setSupportActionBar(binding.lt.toolbar);
+        binding.lt.toolbar.setNavigationIcon(R.drawable.ic_back);
+        binding.lt.toolbar.setNavigationOnClickListener(v -> finish());
+        setTitle(R.string.reward);
+    }
+
+    private void initPrice() {
+        String[] skus = getResources().getStringArray(R.array.crowdfunding);
+        int fundingCount = getIntent().getIntExtra(FUNDING_COUNT, 0);
+        if (fundingCount < 100) {
+            sku = skus[0];
+        } else if (fundingCount < 500) {
+            sku = skus[1];
+        } else if (fundingCount < 2000) {
+            sku = skus[2];
+        } else {
+            sku = skus[3];
+        }
+        ArrayList<String> skuList = new ArrayList<>();
+        skuList.add(sku);
+        initIAB(skuList, new MySubscriber<String[]>() {
+            @Override
+            public void onNext(String[] o) {
+                super.onNext(o);
+                if (o == null) {
+                    return;
+                }
+                invalidateData(true);
+                binding.price.setText(o[0]);
+            }
+        });
+    }
+
+    private void initListener() {
+        binding.price.setOnClickListener(v -> payUtil.purchase(sku));
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.refresh_menu, menu);
+        return true;
+    }
+
+    private void invalidateData(boolean showData) {
+        binding.price.setVisibility(showData ? View.VISIBLE : View.GONE);
+        binding.tvThanks.setVisibility(showData ? View.VISIBLE : View.GONE);
+        binding.noData.llRoot.setVisibility(showData ? View.GONE : View.VISIBLE);
+        binding.pb.setVisibility(View.GONE);
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (requestCode == BUY_REQUEST_CODE) {
+            if (resultCode == RESULT_OK) {
+                GooglePurchaseModel model = App.getGson().fromJson(data.getStringExtra("INAPP_PURCHASE_DATA"), GooglePurchaseModel.class);
+                if (model == null) {
+                    return;
+                }
+                switch (model.getProductId()) {
+                    default:
+                        Toast.makeText(this, R.string.thanks_your_support, Toast.LENGTH_SHORT).show();
+                        break;
+                }
+                // 统计赞赏数据
+                JSONObject jsonObject = new JSONObject();
+                try {
+                    jsonObject.put("type", model.getProductId());
+                    jsonObject.put("time", VeDate.getStringDateHourAsInt());
+                    int percent = getIntent().getIntExtra(FUNDING_COUNT, 0);
+                    String[] fundingCount = getResources().getStringArray(R.array.funding_count_divider);
+                    jsonObject.put("crowdfunding",
+                            percent > (Integer.parseInt(fundingCount[1]) / Integer.parseInt(fundingCount[2])) ? 3 :
+                                    percent > (Integer.parseInt(fundingCount[0]) / Integer.parseInt(fundingCount[1])) ? 2 : 1);//0 非众筹/ 1: 0-100 /2: 100-500/3 500-2000
+                    jsonObject.put("articleId", getIntent().getStringExtra(ARTICLE_ID));
+                    if (App.getUser() != null) {
+                        jsonObject.put("account", App.getUser().getEmail());
+                    }
+                } catch (JSONException e) {
+                    e.printStackTrace();
+                }
+                UpdateHelper.submitIAPLog(this, model.getOrderId(), App.getGson().toJson(jsonObject));
+                payUtil.digestPurchase(model.getPurchaseToken());
+                finish();
+            }
+        }
+    }
+}
diff --git a/qpython/src/ol/java/org/qpython/qpy/main/activity/PayActivity.java b/qpython/src/ol/java/org/qpython/qpy/main/activity/PayActivity.java
new file mode 100644
index 00000000..c637254e
--- /dev/null
+++ b/qpython/src/ol/java/org/qpython/qpy/main/activity/PayActivity.java
@@ -0,0 +1,54 @@
+package org.qpython.qpy.main.activity;
+
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.app.AppCompatActivity;
+import android.view.MenuItem;
+import android.view.View;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.main.server.MySubscriber;
+import org.qpython.qpy.main.service.PayUtil;
+
+import java.util.ArrayList;
+
+/**
+ * Created by Hmei
+ * 1/30/18.
+ */
+
+public class PayActivity extends AppCompatActivity {
+    public static final int BUY_REQUEST_CODE = 2333;
+    private ArrayList<String>      skuList;
+    private MySubscriber<String[]> callback;
+    protected PayUtil payUtil;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        payUtil = new PayUtil(this);
+    }
+
+    protected void initIAB(ArrayList<String> skuList, MySubscriber<String[]> callback) {
+        this.skuList = skuList;
+        this.callback = callback;
+        payUtil.initIAP(() -> payUtil.getPrices(skuList,callback));
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == R.id.refresh_menu) {
+            if (findViewById(R.id.pb) != null) findViewById(R.id.pb).setVisibility(View.VISIBLE);
+            payUtil.getPrices(skuList, callback);
+            return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        payUtil.unbindPayService();
+    }
+
+}
diff --git a/qpython/src/ol/java/org/qpython/qpy/main/activity/PurchaseActivity.java b/qpython/src/ol/java/org/qpython/qpy/main/activity/PurchaseActivity.java
new file mode 100644
index 00000000..74335cc2
--- /dev/null
+++ b/qpython/src/ol/java/org/qpython/qpy/main/activity/PurchaseActivity.java
@@ -0,0 +1,158 @@
+package org.qpython.qpy.main.activity;
+
+import android.content.Context;
+import android.content.Intent;
+import android.databinding.DataBindingUtil;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.widget.GridLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Toast;
+
+import com.quseit.util.ImageUtil;
+import com.quseit.util.VeDate;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.qpython.qpy.R;
+import org.qpython.qpy.databinding.ActivityPurchaseBinding;
+import org.qpython.qpy.databinding.ItemPriceBinding;
+import org.qpython.qpy.main.adapter.MyViewHolder;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.server.MySubscriber;
+import org.qpython.qpy.main.server.model.GooglePurchaseModel;
+import org.qpython.qpy.main.widget.GridSpace;
+import org.qpython.qpy.utils.UpdateHelper;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+
+/**
+ * Google purchase activity
+ * Created by Hmei on 2017-07-19.
+ */
+
+public class PurchaseActivity extends PayActivity {
+
+    private static final String ARTICLE_ID = "article_id";
+
+    private ActivityPurchaseBinding binding;
+    private ArrayList<String>       skus;
+
+    public static void start(Context context, String articleId) {
+        Intent starter = new Intent(context, PurchaseActivity.class);
+        starter.putExtra(ARTICLE_ID, articleId);
+        context.startActivity(starter);
+    }
+
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        binding = DataBindingUtil.setContentView(this, R.layout.activity_purchase);
+        skus = new ArrayList<>(Arrays.asList(getResources().getStringArray(R.array.sku)));
+
+        initIAB(skus, new MySubscriber<String[]>() {
+            @Override
+            public void onNext(String[] o) {
+                super.onNext(o);
+                if (o == null) {
+                    return;
+                }
+                invalidateData();
+                GridSpace gridSpace = new GridSpace(2, (int) ImageUtil.dp2px(16), false);
+                binding.list.setLayoutManager(new GridLayoutManager(PurchaseActivity.this, 2));
+                binding.list.addItemDecoration(gridSpace);
+                binding.list.setAdapter(new PurchaseActivity.ListAdapter(o));
+            }
+        });
+
+        initView();
+    }
+
+    private void initView() {
+        setSupportActionBar(binding.lt.toolbar);
+        binding.lt.toolbar.setNavigationIcon(R.drawable.ic_back);
+        binding.lt.toolbar.setNavigationOnClickListener(v -> finish());
+        setTitle(R.string.reward);
+    }
+
+    private void invalidateData() {
+        binding.tvThanks.setVisibility(View.VISIBLE);
+        binding.list.setVisibility(View.VISIBLE);
+        binding.noData.llRoot.setVisibility(View.GONE);
+    }
+
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.refresh_menu, menu);
+        return true;
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (requestCode == BUY_REQUEST_CODE) {
+            if (resultCode == RESULT_OK) {
+                GooglePurchaseModel model = App.getGson().fromJson(data.getStringExtra("INAPP_PURCHASE_DATA"), GooglePurchaseModel.class);
+                if (model == null) {
+                    return;
+                }
+                switch (model.getProductId()) {
+                    default:
+                        Toast.makeText(this, R.string.thanks_your_support, Toast.LENGTH_SHORT).show();
+                        break;
+                }
+                // 统计赞赏数据
+                JSONObject jsonObject = new JSONObject();
+                try {
+                    jsonObject.put("type", model.getProductId());
+                    jsonObject.put("time", VeDate.getStringDateHourAsInt());
+                    jsonObject.put("crowdfunding", 0);//0 非众筹/ 1: 0-100 /2: 100-500/3 500-2000
+                    jsonObject.put("articleId", getIntent().getStringExtra(ARTICLE_ID));
+                    if (App.getUser() != null) {
+                        jsonObject.put("account", App.getUser().getEmail());
+                    }
+                } catch (JSONException e) {
+                    e.printStackTrace();
+                }
+                UpdateHelper.submitIAPLog(this, model.getOrderId(), App.getGson().toJson(jsonObject));
+                payUtil.digestPurchase(model.getPurchaseToken());
+                finish();
+            }
+        }
+    }
+
+    private class ListAdapter extends RecyclerView.Adapter<MyViewHolder<ItemPriceBinding>> {
+        String[] dataList;
+
+        ListAdapter(String[] dataList) {
+            this.dataList = dataList;
+        }
+
+        @Override
+        public MyViewHolder<ItemPriceBinding> onCreateViewHolder(ViewGroup parent, int viewType) {
+            ItemPriceBinding binding = DataBindingUtil.inflate(LayoutInflater.from(PurchaseActivity.this), R.layout.item_price, parent, false);
+            MyViewHolder<ItemPriceBinding> holder = new MyViewHolder<>(binding.getRoot());
+            holder.setBinding(binding);
+            return holder;
+        }
+
+        @Override
+        public void onBindViewHolder(MyViewHolder<ItemPriceBinding> holder, int position) {
+            ItemPriceBinding binding = holder.getBinding();
+            binding.tvPrices.setText(dataList[position]);
+            binding.tvPrices.setOnClickListener(v -> payUtil.purchase(skus.get(position)));
+        }
+
+        @Override
+        public int getItemCount() {
+            return dataList.length;
+        }
+    }
+}
diff --git a/qpython/src/ol/java/org/qpython/qpy/main/activity/SignInActivity.java b/qpython/src/ol/java/org/qpython/qpy/main/activity/SignInActivity.java
new file mode 100644
index 00000000..b5fc5d2c
--- /dev/null
+++ b/qpython/src/ol/java/org/qpython/qpy/main/activity/SignInActivity.java
@@ -0,0 +1,184 @@
+package org.qpython.qpy.main.activity;
+
+import android.content.Intent;
+import android.databinding.DataBindingUtil;
+import android.net.Uri;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v7.app.AppCompatActivity;
+import android.text.Html;
+import android.util.Log;
+import android.view.View;
+import android.widget.Toast;
+
+import com.google.android.gms.auth.api.Auth;
+import com.google.android.gms.auth.api.signin.GoogleSignInAccount;
+import com.google.android.gms.auth.api.signin.GoogleSignInOptions;
+import com.google.android.gms.auth.api.signin.GoogleSignInResult;
+import com.google.android.gms.common.ConnectionResult;
+import com.google.android.gms.common.api.GoogleApiClient;
+import com.google.firebase.auth.AuthCredential;
+import com.google.firebase.auth.FirebaseAuth;
+import com.google.firebase.auth.FirebaseUser;
+import com.google.firebase.auth.GoogleAuthProvider;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.databinding.ActivitySignInBinding;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.app.CONF;
+import org.qpython.qpy.main.app.User;
+import org.qpython.qpy.main.server.gist.loginScreen.LoginControler;
+import org.qpython.qpy.main.server.gist.loginScreen.LoginView;
+
+/**
+ * SignIn
+ * Created by Hmei on 2017-08-04.
+ */
+
+public class SignInActivity extends AppCompatActivity implements GoogleApiClient.OnConnectionFailedListener ,LoginView{
+    private static final int RC_SIGN_IN = 54503;
+
+    private GoogleApiClient mGoogleApiClient;
+    private ActivitySignInBinding binding;
+    private FirebaseAuth mAuth;
+
+    private LoginControler mLoginControler;
+
+    {
+        mAuth = FirebaseAuth.getInstance();
+        FirebaseUser currentUser = mAuth.getCurrentUser();
+        initUserInfo(currentUser);
+    }
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        binding = DataBindingUtil.setContentView(this, R.layout.activity_sign_in);
+        binding.textView3.setText(Html.fromHtml(getString(R.string.by_signing_in_you_agree_to_out_privacy_policy_term_of_service)));
+        GoogleSignInOptions gso = new GoogleSignInOptions.Builder(GoogleSignInOptions.DEFAULT_SIGN_IN)
+                .requestIdToken(CONF.GOOGLE_ID_TOKEN)
+                .requestEmail()
+                .build();
+
+        mGoogleApiClient = new GoogleApiClient.Builder(this)
+                .enableAutoManage(this, this)
+                .addApi(Auth.GOOGLE_SIGN_IN_API, gso)
+                .addOnConnectionFailedListener(connectionResult -> showToast(getString(R.string.lost_google_hint)))
+                .build();
+        initListener();
+
+        mLoginControler = new LoginControler(this);
+    }
+
+    private void initListener() {
+        binding.textView3.setOnClickListener(v -> startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.privacy_html)))));
+        binding.button2.setOnClickListener(v -> signIn());
+        binding.button3.setOnClickListener(v -> finish());
+    }
+
+    private void signIn() {
+        Intent signInIntent = Auth.GoogleSignInApi.getSignInIntent(mGoogleApiClient);
+        startActivityForResult(signInIntent, RC_SIGN_IN);
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        // Result returned from launching the Intent from GoogleSignInApi.getSignInIntent(...);
+        if (requestCode == RC_SIGN_IN) {
+            GoogleSignInResult result = Auth.GoogleSignInApi.getSignInResultFromIntent(data);
+            if (result.isSuccess()) {
+                GoogleSignInAccount account = result.getSignInAccount();
+                firebaseAuthWithGoogle(account);
+            } else {
+                Log.e("LOGIN", result.getStatus().toString());
+                try {
+                    String msg = result.getStatus().getStatusMessage().trim();
+                    showToast(getString(R.string.login_error) + (msg.equals("") ? "" : ": ") + msg);
+                    initUserInfo(null);
+                } catch (NullPointerException ignore) {
+                    showToast(getString(R.string.no_google));
+                }
+            }
+        }
+    }
+
+    private void firebaseAuthWithGoogle(GoogleSignInAccount acct) {
+        showLoading();
+        AuthCredential credential = GoogleAuthProvider.getCredential(acct.getIdToken(), "45:FD:60:98:01:9A:37:D9:84:03:06:36:02:F6:85:2C:A2:1F:B8:67");
+        mAuth.signInWithCredential(credential)
+                .addOnCompleteListener(this, task -> {
+                    if (task.isSuccessful()) {
+                        FirebaseUser user = mAuth.getCurrentUser();
+                        initUserInfo(user);
+                    } else {
+                        showToast(getString(R.string.auth_failed));
+                        initUserInfo(null);
+                        hideLoading();
+                    }
+                });
+    }
+
+    private void initUserInfo(FirebaseUser currentUser) {
+        if (currentUser == null) {
+            App.setUser(null);
+            return;
+        }
+        Log.d("SingInActivity", "NICK:"+currentUser.getDisplayName()+"-UN:"+currentUser.getEmail());
+        User user = new User();
+        user.setUserId(currentUser.getUid());
+        user.setAvatarUrl(currentUser.getPhotoUrl() == null ? "" : currentUser.getPhotoUrl().toString());
+        user.setEmail(currentUser.getEmail());
+        user.setUserName(currentUser.getEmail());
+        user.setNick(currentUser.getDisplayName());
+        App.setUser(user);
+        if (mLoginControler!=null) {
+            mLoginControler.login(user);
+        } else {
+            Toast.makeText(this, R.string.signin_error, Toast.LENGTH_SHORT).show();
+        }
+    }
+
+    @Override
+    public void onConnectionFailed(@NonNull ConnectionResult connectionResult) {
+        initUserInfo(null);
+    }
+
+    @Override
+    public void showLoading() {
+        binding.progressBar2.setVisibility(View.VISIBLE);
+    }
+
+    @Override
+    public void hideLoading() {
+        binding.progressBar2.setVisibility(View.GONE);
+    }
+
+    @Override
+    public void showToast(String msg) {
+        Toast.makeText(SignInActivity.this, msg, Toast.LENGTH_SHORT)
+                .show();
+    }
+
+    @Override
+    public void loginSuccess() {
+        Log.d("SignInActivity", "loginSuccess");
+//        setResult(RESULT_OK);
+//        this.finish();
+
+        setResult(RESULT_OK);
+        binding.progressBar2.setVisibility(View.GONE);
+        showToast("login successfully");
+        finish();
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        if (mLoginControler!=null) {
+
+            mLoginControler.onDestroy();
+        }
+    }
+}
\ No newline at end of file
diff --git a/qpython/src/ol/java/org/qpython/qpy/main/activity/UserActivity.java b/qpython/src/ol/java/org/qpython/qpy/main/activity/UserActivity.java
new file mode 100644
index 00000000..b142018e
--- /dev/null
+++ b/qpython/src/ol/java/org/qpython/qpy/main/activity/UserActivity.java
@@ -0,0 +1,76 @@
+package org.qpython.qpy.main.activity;
+
+import android.content.Context;
+import android.content.Intent;
+import android.databinding.DataBindingUtil;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.app.AlertDialog;
+import android.support.v7.app.AppCompatActivity;
+import android.view.View;
+
+import com.google.firebase.auth.FirebaseAuth;
+import com.quseit.util.ImageDownLoader;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.codeshare.CONSTANT;
+import org.qpython.qpy.codeshare.ShareCodeUtil;
+import org.qpython.qpy.databinding.ActivityUserBinding;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.app.CONF;
+
+import java.io.File;
+
+public class UserActivity extends AppCompatActivity {
+    ActivityUserBinding binding;
+
+    public static void start(Context context) {
+        Intent starter = new Intent(context, UserActivity.class);
+        context.startActivity(starter);
+    }
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        binding = DataBindingUtil.setContentView(this, R.layout.activity_user);
+        setSupportActionBar(binding.toolbar);
+        setTitle(getString(R.string.me));
+        binding.toolbar.setNavigationIcon(R.drawable.ic_back);
+        binding.toolbar.setNavigationOnClickListener(v -> finish());
+
+        ImageDownLoader.setImageFromUrl(this, binding.avatar, App.getUser().getAvatarUrl());
+        binding.name.setText(App.getUser().getNick());
+        //binding.email.setText(App.getUser().getEmail());
+
+        binding.usage.setText(R.string.my_space_empty);
+        binding.logout.setOnClickListener(v -> logout());
+        binding.myShareLayout.setOnClickListener(v -> MyGistActivity.startMyShare(UserActivity.this));
+        setUsage();
+    }
+
+    private void setUsage() {
+        ShareCodeUtil.getInstance().initUsage(integer ->
+                binding.usage.setText(getString(R.string.my_space, integer == null ? 0 : integer)));
+    }
+
+    private void logout() {
+        new AlertDialog.Builder(this, R.style.MyDialog)
+                .setTitle(R.string.lout)
+                .setPositiveButton(R.string.yes, (dialog, which) -> {
+                    FirebaseAuth.getInstance().signOut();
+                    App.setUser(null);
+                    getPreferences(MODE_PRIVATE).edit().putBoolean(CONSTANT.IS_UPLOAD_INIT, false)
+                            .putString(CONSTANT.CLOUDED_MAP, "")
+                            .apply();
+                    File cloud_cache = new File(CONF.CLOUD_MAP_CACHE_PATH);
+                    if (cloud_cache.exists()) {
+                        cloud_cache.delete();
+                    }
+                    finish();
+                })
+                .setNegativeButton(R.string.no, null)
+                .create()
+                .show();
+
+    }
+}
\ No newline at end of file
diff --git a/qpython/src/ol/java/org/qpython/qpy/main/app/AppInit.java b/qpython/src/ol/java/org/qpython/qpy/main/app/AppInit.java
new file mode 100644
index 00000000..76cc52ab
--- /dev/null
+++ b/qpython/src/ol/java/org/qpython/qpy/main/app/AppInit.java
@@ -0,0 +1,37 @@
+package org.qpython.qpy.main.app;
+
+import android.content.Context;
+import android.util.Log;
+
+import com.google.firebase.FirebaseApp;
+import com.google.firebase.iid.FirebaseInstanceId;
+import com.quseit.config.BASE_CONF;
+
+import org.qpython.qpy.codeshare.ShareCodeUtil;
+
+/**
+ * 文 件 名: AppInit
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2018/3/8 15:13
+ * 修改时间：
+ * 修改备注：
+ */
+
+public class AppInit {
+
+    public static void init(Context context){
+
+        FirebaseApp.initializeApp(context);
+        if (BASE_CONF.DEBUG) {
+            try {
+                FirebaseInstanceId xx = FirebaseInstanceId.getInstance();
+                if (xx != null) {
+                    Log.e("Firebase", xx.getToken());
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+        ShareCodeUtil.getInstance();
+    }
+}
diff --git a/qpython/src/ol/java/org/qpython/qpy/main/fragment/ExplorerFragment.java b/qpython/src/ol/java/org/qpython/qpy/main/fragment/ExplorerFragment.java
new file mode 100644
index 00000000..6705c248
--- /dev/null
+++ b/qpython/src/ol/java/org/qpython/qpy/main/fragment/ExplorerFragment.java
@@ -0,0 +1,503 @@
+package org.qpython.qpy.main.fragment;
+
+import android.content.Intent;
+import android.databinding.DataBindingUtil;
+import android.graphics.Color;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.Environment;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.support.v7.app.AlertDialog;
+import android.support.v7.widget.LinearLayoutManager;
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Toast;
+
+import com.google.firebase.database.DatabaseReference;
+import com.quseit.util.FileHelper;
+import com.quseit.util.ImageUtil;
+import com.yanzhenjie.recyclerview.swipe.SwipeMenuCreator;
+import com.yanzhenjie.recyclerview.swipe.SwipeMenuItem;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.codeshare.ShareCodeUtil;
+import org.qpython.qpy.codeshare.pojo.CloudFile;
+import org.qpython.qpy.databinding.FragmentExplorerBinding;
+import org.qpython.qpy.main.activity.NotebookActivity;
+import org.qpython.qpy.main.activity.SettingActivity;
+import org.qpython.qpy.main.activity.SignInActivity;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.app.CONF;
+import org.qpython.qpy.texteditor.EditorActivity;
+import org.qpython.qpy.texteditor.TedLocalActivity;
+import org.qpython.qpy.texteditor.common.CommonEnums;
+import org.qpython.qpy.texteditor.common.RecentFiles;
+import org.qpython.qpy.texteditor.ui.adapter.FolderAdapter;
+import org.qpython.qpy.texteditor.ui.adapter.bean.FolderBean;
+import org.qpython.qpy.texteditor.ui.view.EnterDialog;
+import org.qpython.qpy.texteditor.widget.crouton.Crouton;
+import org.qpython.qpy.texteditor.widget.crouton.Style;
+import org.qpython.qpy.utils.FileUtils;
+import org.qpython.qpy.utils.NotebookUtil;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static com.quseit.util.FolderUtils.sortTypeByName;
+
+public class ExplorerFragment extends Fragment {
+    private static final int REQUEST_SAVE_AS   = 107;
+    private static final int REQUEST_HOME_PAGE = 109;
+    private static final int REQUEST_RECENT    = 111;
+    private static final int LOGIN_REQUEST     = 2741;
+
+    private static final String TYPE = "type";
+
+    private int WIDTH = (int) ImageUtil.dp2px(60);
+
+    private FragmentExplorerBinding binding;
+    private List<FolderBean>        folderList;
+    private FolderAdapter           adapter;
+    private Map<String, Boolean> cloudedMap = new HashMap<>();
+
+    private boolean openable = true; // 是否可打开文件
+    private boolean uploadable;
+
+    private int    type;
+    private String curPath;
+
+    public static ExplorerFragment newInstance(int type) {
+        ExplorerFragment myFragment = new ExplorerFragment();
+
+        Bundle args = new Bundle();
+        args.putInt(TYPE, type);
+        myFragment.setArguments(args);
+
+        return myFragment;
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.fragment_explorer, null);
+    }
+
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        binding = DataBindingUtil.bind(view);
+        type = getArguments().getInt(TYPE);
+        initView();
+        initListener();
+        initCloud();
+        switch (type) {
+            case REQUEST_RECENT:
+                binding.rlPath.setVisibility(View.GONE);
+                uploadable = false;
+                break;
+            case REQUEST_SAVE_AS:
+                binding.ivNewFolder.setVisibility(View.VISIBLE);
+                uploadable = false;
+                break;
+            case REQUEST_HOME_PAGE:
+                binding.ivNewFolder.setVisibility(View.VISIBLE);
+                uploadable = true;
+                break;
+        }
+    }
+
+    private void initView() {
+        SwipeMenuCreator swipeMenuCreator = (leftMenu, rightMenu, viewType) -> {
+//            SwipeMenuItem uploadItem = new SwipeMenuItem(getContext())
+//                    .setBackgroundColor(Color.parseColor("#FF4798F3"))
+//                    .setImage(R.drawable.ic_cloud_upload)
+//                    .setHeight(ViewGroup.LayoutParams.MATCH_PARENT)
+//                    .setWidth(WIDTH);
+
+            SwipeMenuItem renameItem = new SwipeMenuItem(getContext())
+                    .setBackgroundColor(Color.parseColor("#FF4BAC07"))
+                    .setImage(R.drawable.ic_file_rename)
+                    .setHeight(ViewGroup.LayoutParams.MATCH_PARENT)
+                    .setWidth(WIDTH);
+
+            SwipeMenuItem deleteItem = new SwipeMenuItem(getContext())
+                    .setBackgroundColor(Color.parseColor("#FFD14136"))
+                    .setImage(R.drawable.ic_editor_filetree_close)
+                    .setHeight(ViewGroup.LayoutParams.MATCH_PARENT)
+                    .setWidth(WIDTH);
+
+            switch (type) {
+                case REQUEST_RECENT:
+                    rightMenu.addMenuItem(deleteItem);
+                    break;
+                case REQUEST_SAVE_AS:
+                    rightMenu.addMenuItem(deleteItem);
+                    break;
+                case REQUEST_HOME_PAGE:
+                    //rightMenu.addMenuItem(uploadItem);
+                    rightMenu.addMenuItem(renameItem);
+                    rightMenu.addMenuItem(deleteItem);
+                    break;
+            }
+        };
+
+        folderList = new ArrayList<>();
+        adapter = new FolderAdapter(folderList, getArguments().getInt(TYPE) == REQUEST_RECENT);
+        adapter.setCloudMap(cloudedMap);
+        binding.swipeList.setLayoutManager(new LinearLayoutManager(getContext()));
+        binding.swipeList.setSwipeMenuCreator(swipeMenuCreator);
+        openDir(CONF.ABSOLUTE_PATH);
+    }
+
+    private void initListener() {
+        binding.ivNewFolder.setOnClickListener(v -> doNewDir());
+        binding.prevFolder.setOnClickListener(v -> {
+            try {
+                //采用Environment来获取sdcard路径
+                String parentPath = new File(curPath).getParent();
+
+                if (parentPath.length()>=Environment.getExternalStorageDirectory().getAbsolutePath().length()) {
+                    openDir(parentPath);
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        });
+        binding.swipeList.setSwipeMenuItemClickListener(menuBridge -> {
+            binding.swipeList.smoothCloseMenu();
+            switch (menuBridge.getPosition()) {
+                case 0:
+//                    if (uploadable) {
+//                        uploadFile(menuBridge.getAdapterPosition());
+//                    } else {
+//                        deleteFile(menuBridge.getAdapterPosition());
+//                    }
+//                    break;
+//                case 1:
+                    renameFile(menuBridge.getAdapterPosition());
+                    break;
+                case 1:
+                    deleteFile(menuBridge.getAdapterPosition());
+                    break;
+            }
+        });
+        adapter.setClickListener(new FolderAdapter.Click() {
+            @Override
+            public void onItemClick(int position) {
+                FolderBean item = folderList.get(position);
+                if (item.getType().equals(CommonEnums.FileType.FILE)) {
+                    if (!openable) {
+                        Toast.makeText(getActivity(), R.string.cant_open, Toast.LENGTH_SHORT).show();
+                        return;
+                    }
+                    //判断文件类型
+                    int lastDot = item.getName().lastIndexOf(".");
+                    if (lastDot != -1) {
+                        String ext = item.getName().substring(lastDot + 1);
+                        openFile(item.getFile(), ext);
+                    }
+                } else {
+                    openDir(item.getPath());
+                }
+            }
+
+            @Override
+            public void onLongClick(int position) {
+                binding.swipeList.smoothOpenRightMenu(position);
+            }
+        });
+
+        binding.swipeList.setAdapter(adapter);
+    }
+
+    private void gotoSetting() {
+        SettingActivity.startActivity(getActivity());
+    }
+    private void openFile(File file, String ext) {
+        List<String> textExts = Arrays.asList(getContext().getResources().getStringArray(R.array.text_ext));
+        if (textExts.contains(ext)) {
+            EditorActivity.start(getContext(), Uri.fromFile(file));
+        } else if (ext.equals("ipynb")) {
+            boolean notebookenable = NotebookUtil.isNotebookEnable(getActivity());
+            if (notebookenable) {
+                NotebookActivity.start(getActivity(), file.getAbsolutePath(), false);
+            } else {
+
+                new AlertDialog.Builder(getActivity(),R.style.MyDialog)
+                        .setTitle(R.string.dialog_alert)
+                        .setMessage(getString(R.string.ennable_notebook_first))
+                        .setNegativeButton(R.string.cancel, (dialog1, which) -> dialog1.dismiss())
+                        .setPositiveButton(R.string.ok, (dialog1, which) -> gotoSetting())
+                        .create()
+                        .show();
+
+                //Toast.makeText(getActivity(), R.string.ennable_notebook_first, Toast.LENGTH_SHORT).show();
+            }
+        } else {
+            FileUtils.openFile(getContext(), file);
+        }
+    }
+
+    private void uploadFile(int adapterPosition) {
+        File file = folderList.get(adapterPosition).getFile();
+
+        // only support type in <R.array.support_file_ext>
+        String ext = "";
+        if (file.getName().lastIndexOf(".") > 0) {
+            ext = file.getName().substring(file.getName().lastIndexOf(".") + 1);
+        }
+        boolean isSupport = false;
+        if (!file.isDirectory()) {
+            for (String s : getResources().getStringArray(R.array.support_file_ext)) {
+                if (s.equals(ext)) {
+                    isSupport = true;
+                    break;
+                }
+            }
+        } else {
+            isSupport = true;
+        }
+
+        if (!isSupport) {
+            Toast.makeText(getContext(), R.string.not_support_type_hint, Toast.LENGTH_SHORT).show();
+            return;
+        }
+
+        // only available for already login user
+        if (App.getUser() == null) {
+            new AlertDialog.Builder(getActivity(), R.style.MyDialog)
+                    .setTitle(R.string.need_login)
+                    .setMessage(R.string.upload_login_hint)
+                    .setNegativeButton(R.string.no, null)
+                    .setPositiveButton(getString(R.string.login_now), (dialog, which) ->
+                            startActivityForResult(new Intent(getActivity(), SignInActivity.class), LOGIN_REQUEST)
+                    )
+                    .create()
+                    .show();
+            return;
+        }
+
+        // upload
+        folderList.get(adapterPosition).setUploading(true);
+        adapter.notifyItemChanged(adapterPosition);
+        int[] size = {1};
+        DatabaseReference.CompletionListener listener = ((databaseError, databaseReference) -> {
+            if (databaseError == null) {
+//                updateClouded(folderList.get(adapterPosition).getFile());
+//                adapter.setUploadFile(adapterPosition);
+//                ((TedLocalActivity) getActivity()).setNewUpload();
+//                Toast.makeText(getActivity(), R.string.upload_suc, Toast.LENGTH_SHORT).show();
+//                ShareCodeUtil.getInstance().changeUsage(size[0]);
+            } else {
+                Toast.makeText(getActivity(), databaseError.getMessage(), Toast.LENGTH_SHORT).show();
+            }
+            folderList.get(adapterPosition).setUploading(false);
+            adapter.notifyDataSetChanged();
+        });
+        if (folderList.get(adapterPosition).getFile().isDirectory()) {
+            // 如果上传整个projects目录，则将该目录下项目分开上传
+            if (folderList.get(adapterPosition).getName().contains("projects")) {
+                File[] files = folderList.get(adapterPosition).getFile().listFiles();
+                for (int i = 0; i < files.length; i++) {
+                    if (!ShareCodeUtil.getInstance().uploadFolder(files[i].getPath(), i == 0 ? null : listener, size)) {
+                        folderList.get(adapterPosition).setUploading(false);
+                        adapter.notifyDataSetChanged();
+                    }
+                }
+            } else {
+                if (!ShareCodeUtil.getInstance().uploadFolder(folderList.get(adapterPosition).getPath(), listener, size)) {
+                    folderList.get(adapterPosition).setUploading(false);
+                    adapter.notifyDataSetChanged();
+                }
+            }
+        } else {
+            if (!ShareCodeUtil.getInstance().uploadFile(folderList.get(adapterPosition).getPath(), listener)) {
+                folderList.get(adapterPosition).setUploading(false);
+                adapter.notifyDataSetChanged();
+            }
+        }
+    }
+
+    private void renameFile(int adapterPosition) {
+        new EnterDialog(getContext())
+                .setTitle(getString(R.string.rename))
+                .setConfirmListener(name -> {
+                    File oldFile = folderList.get(adapterPosition).getFile();
+                    File newFile = new File(oldFile.getParent(), name);
+                    boolean renameSuc = oldFile.renameTo(newFile);
+                    if (renameSuc) {
+                        folderList.set(adapterPosition, new FolderBean(newFile));
+                        adapter.notifyItemChanged(adapterPosition);
+                        return true;
+                    } else {
+                        Toast.makeText(getActivity(), R.string.rename_fail, Toast.LENGTH_SHORT).show();
+                        return false;
+                    }
+                })
+                .setText(folderList.get(adapterPosition).getName())
+                .show();
+    }
+
+    private void deleteFile(int adapterPosition) {
+        switch (type) {
+            case REQUEST_RECENT:
+                RecentFiles.removePath(folderList.get(adapterPosition).getPath());
+                folderList.remove(adapterPosition);
+                adapter.notifyDataSetChanged();
+                break;
+            case REQUEST_HOME_PAGE:
+            case REQUEST_SAVE_AS:
+                AlertDialog.Builder builder = new AlertDialog.Builder(getActivity(), R.style.MyDialog);
+                builder.setTitle(R.string.warning)
+                        .setMessage(R.string.delete_file_hint)
+                        .setNegativeButton(R.string.no, null)
+                        .setPositiveButton(R.string.yes, (dialog, which) -> {
+                            String dir = folderList.get(adapterPosition).getFile().getParent();
+                            FileHelper.clearDir(folderList.get(adapterPosition).getFile().getAbsolutePath(), 0, true);
+                            openDir(dir);
+
+//                            folderList.remove(adapterPosition);
+//                            adapter.notifyItemRemoved(adapterPosition);
+                        })
+                        .show();
+                break;
+        }
+    }
+
+    private void openDir(String dirPath) {
+        if (type == REQUEST_RECENT) {
+            folderList.clear();
+            for (String path : RecentFiles.getRecentFiles()) {
+                folderList.add(new FolderBean(new File(path)));
+            }
+
+            if (folderList.size() == 0) {
+                binding.emptyHint.setVisibility(View.VISIBLE);
+            } else {
+                binding.emptyHint.setVisibility(View.GONE);
+                adapter.notifyDataSetChanged();
+            }
+        } else {
+            binding.tvPath.setText(dirPath);
+            curPath = dirPath;
+            File dir = new File(dirPath);
+            if (dir.exists()) {
+                File[] files = dir.listFiles();
+                if (files != null) {
+                    Arrays.sort(files, sortTypeByName);
+                    folderList.clear();
+                    adapter.notifyDataSetChanged();
+                    for (File file : files) {
+                        if (!dir.getName().equals(CONF.BASE_PATH)) {
+                            if (!file.getName().startsWith(".")) {
+                                folderList.add(new FolderBean(file));
+                            }
+
+                        } else {
+                            folderList.add(new FolderBean(file));
+
+                        }
+
+                    }
+                    adapter.notifyDataSetChanged();
+                }
+            } else {
+                Toast.makeText(getContext(), R.string.file_not_exists, Toast.LENGTH_SHORT).show();
+            }
+        }
+    }
+
+    private void doNewDir() {
+        new EnterDialog(getContext())
+                .setTitle(getString(R.string.new_folder))
+                .setHint(getString(R.string.folder_name))
+                .setConfirmListener(name -> {
+                    File dirN = new File(curPath, name.equals("") ? getString(R.string.untitled_folder) : name);
+                    if (dirN.exists()) {
+                        Crouton.makeText(getActivity(), getString(R.string.toast_folder_exist), Style.ALERT).show();
+                        return false;
+                    } else {
+                        if (dirN.mkdirs()) {
+                            openDir(curPath + "/" + name);
+                        } else {
+                            Toast.makeText(getContext(), R.string.mkdir_fail, Toast.LENGTH_SHORT).show();
+                        }
+                        return true;
+                    }
+                })
+                .show();
+    }
+
+    public void backToPrev() {
+        Log.d("ExplorerFragment", "backToPrev:"+curPath);
+        String qpyDir = Environment.getExternalStorageDirectory().getAbsolutePath()+"/qpython";
+        if (curPath == null || qpyDir.equals(curPath) || Environment.getExternalStorageDirectory().getAbsolutePath().equals(curPath)) {
+            getActivity().finish();
+        } else {
+            String parentPath = new File(curPath).getParent();
+            if (!TextUtils.isEmpty(parentPath)) openDir(parentPath);
+        }
+    }
+
+    private void updateClouded(File file) {
+        if (file.getParent().contains("projects")) {
+            String parent = file.getParent() + "/";
+            String subPath = file.getPath().substring(file.getPath().indexOf(parent) + parent.length());
+            String projName = subPath.contains("/") ? subPath.substring(0, subPath.indexOf("/")) : "/" + subPath;
+            cloudedMap.put(CONF.ABSOLUTE_PATH + projName, true);
+        }
+        if (file.isDirectory()) {
+            for (File file1 : FileHelper.filterExt(file, getResources().getStringArray(R.array.support_file_ext))) {
+                cloudedMap.put(file1.getPath(), true);
+            }
+        } else {
+            cloudedMap.put(file.getPath(), true);
+        }
+    }
+
+    public String getCurPath() {
+        return curPath;
+    }
+
+    private void initCloud() {
+        if (App.getUser() == null) {
+            return;
+        }
+        ShareCodeUtil.getInstance().getUploadedScripts(false, getActivity(), cloudFiles -> {
+            if (cloudFiles == null || cloudFiles.size() == 0) {
+                return;
+            }
+            for (CloudFile cloudFile : cloudFiles) {
+                if (cloudFile.getPath().contains("/projects")) {
+                    String projNode = cloudFile.getPath().contains("/projects3/") ? "/projects3/" : "/projects/";
+                    cloudedMap.put(CONF.ABSOLUTE_PATH + projNode + cloudFile.getProjectName(), true);
+                }
+                cloudedMap.put(CONF.ABSOLUTE_PATH + cloudFile.getPath(), true);
+            }
+            adapter.setCloudMap(cloudedMap);
+            adapter.notifyDataSetChanged();
+        });
+    }
+
+    public void deleteCloudedMap(String absolutePath) {
+        if (cloudedMap.containsKey(absolutePath)) {
+            cloudedMap.remove(absolutePath);
+            adapter.notifyDataSetChanged();
+        }
+    }
+
+    public void updateCloudedFiles(Map<String, Boolean> map) {
+        if (map != null) {
+            cloudedMap.putAll(map);
+        }
+        adapter.notifyDataSetChanged();
+    }
+}
diff --git a/qpython/src/ol/java/org/qpython/qpy/main/fragment/MyProjectFragment.java b/qpython/src/ol/java/org/qpython/qpy/main/fragment/MyProjectFragment.java
new file mode 100644
index 00000000..1b52cf26
--- /dev/null
+++ b/qpython/src/ol/java/org/qpython/qpy/main/fragment/MyProjectFragment.java
@@ -0,0 +1,256 @@
+package org.qpython.qpy.main.fragment;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.databinding.DataBindingUtil;
+import android.graphics.Color;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.support.v7.app.AlertDialog;
+import android.support.v7.widget.LinearLayoutManager;
+import android.text.Html;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Toast;
+
+import com.quseit.util.DateTimeHelper;
+import com.quseit.util.ImageUtil;
+import com.yanzhenjie.recyclerview.swipe.SwipeMenuCreator;
+import com.yanzhenjie.recyclerview.swipe.SwipeMenuItem;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.codeshare.CONSTANT;
+import org.qpython.qpy.codeshare.ShareCodeUtil;
+import org.qpython.qpy.codeshare.pojo.CloudFile;
+import org.qpython.qpy.databinding.FragmentRefreshRvBinding;
+import org.qpython.qpy.main.adapter.CloudScriptAdapter;
+import org.qpython.qpy.texteditor.TedLocalActivity;
+import org.qpython.qpysdk.QPyConstants;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+import rx.Observable;
+import rx.android.schedulers.AndroidSchedulers;
+
+public class MyProjectFragment extends Fragment {
+    private int WIDTH = (int) ImageUtil.dp2px(60);
+    private FragmentRefreshRvBinding binding;
+    private CloudScriptAdapter adapter;
+    private List<CloudFile> scriptList = new ArrayList<>();
+    private TedLocalActivity activity;
+
+    public boolean isLoading;
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) {
+        binding = DataBindingUtil.bind(LayoutInflater.from(getContext()).inflate(R.layout.fragment_refresh_rv, null));
+        return binding.getRoot();
+    }
+
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        scriptList = new ArrayList<>();
+        adapter = new CloudScriptAdapter(scriptList);
+        ShareCodeUtil.getInstance().clearAll();
+        initView();
+        initListener();
+        retry(true);
+    }
+
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        activity = (TedLocalActivity) context;
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        if (adapter != null) {
+            adapter.notifyDataSetChanged();
+        }
+    }
+
+    @Override
+    public void onStop() {
+        super.onStop();
+//        activity.locatedCloud(scriptList);
+    }
+
+    public void retry(boolean forceRefresh) {
+        if (scriptList != null && adapter != null) {
+            scriptList.clear();
+            adapter.notifyDataSetChanged();
+        }
+        startProgressBar();
+        isLoading = true;
+        ShareCodeUtil.getInstance().getUploadedScripts(forceRefresh, getActivity(), cloudFiles -> {
+            isLoading = false;
+            if (cloudFiles == null || cloudFiles.size() == 0) {
+                showEmpty();
+                return;
+            }
+//            ((TedLocalActivity) getActivity()).updateCloudFiles(cloudFiles);
+            scriptList.clear();
+            scriptList.addAll(cloudFiles);
+            adapter.notifyDataSetChanged();
+            binding.progressBar.setVisibility(View.GONE);
+            binding.netError.setVisibility(View.GONE);
+        });
+    }
+
+    public void notifyDataSetChange() {
+        if (adapter != null) adapter.notifyDataSetChanged();
+    }
+
+    private void startProgressBar() {
+        binding.progressBar.setVisibility(View.VISIBLE);
+        binding.netError.setVisibility(View.GONE);
+        Observable.just(null)
+                .delay(5, TimeUnit.SECONDS)
+                .observeOn(AndroidSchedulers.mainThread())
+                .doOnNext(o -> showNetErrorText())
+                .subscribe();
+    }
+
+    private void showEmpty() {
+        if (binding.progressBar.getVisibility() == View.VISIBLE) {
+            binding.progressBar.setVisibility(View.GONE);
+            binding.netError.setText(R.string.cloud_empty_hint);
+            binding.netError.setVisibility(View.VISIBLE);
+        }
+    }
+
+    private void showNetErrorText() {
+        if (binding.progressBar.getVisibility() == View.VISIBLE) {
+            binding.progressBar.setVisibility(View.GONE);
+            binding.netError.setText(R.string.net_lagging);
+            binding.netError.setVisibility(View.VISIBLE);
+        }
+    }
+
+    private void initView() {
+        SwipeMenuCreator swipeMenuCreator = (leftMenu, rightMenu, viewType) -> {
+            SwipeMenuItem deleteItem = new SwipeMenuItem(getContext())
+                    .setBackgroundColor(Color.parseColor("#FFD14136"))
+                    .setImage(R.drawable.ic_editor_filetree_close)
+                    .setHeight(ViewGroup.LayoutParams.MATCH_PARENT)
+                    .setWidth(WIDTH);
+
+            SwipeMenuItem downloadItem = new SwipeMenuItem(getContext())
+                    .setBackgroundColor(Color.parseColor("#FF4798F3"))
+                    .setImage(R.drawable.ic_cloud_download)
+                    .setHeight(ViewGroup.LayoutParams.MATCH_PARENT)
+                    .setWidth(WIDTH);
+            rightMenu.addMenuItem(downloadItem);
+            rightMenu.addMenuItem(deleteItem);
+        };
+        binding.swipeList.setLayoutManager(new LinearLayoutManager(getContext()));
+        binding.swipeList.setSwipeMenuCreator(swipeMenuCreator);
+    }
+
+    @SuppressLint("StringFormatMatches")
+    private void initListener() {
+        binding.netError.setOnClickListener(v -> retry(true));
+        binding.swipeList.setSwipeMenuItemClickListener(menuBridge -> {
+            menuBridge.closeMenu();
+            switch (menuBridge.getPosition()) {
+                case 0:
+                    // download
+                    CloudFile cloudFile = scriptList.get(menuBridge.getAdapterPosition());
+                    cloudFile.setUploading(true);
+                    adapter.notifyItemChanged(menuBridge.getAdapterPosition());
+                    String path;
+                    path = QPyConstants.ABSOLUTE_PATH + cloudFile.getPath();
+                    File file = new File(path);
+                    if (file.exists()) {
+                        new AlertDialog.Builder(getContext(), R.style.MyDialog)
+                                .setTitle(R.string.override_hint)
+                                .setMessage(Html.fromHtml(getString(R.string.conflict_hint,
+                                        cloudFile.getUploadTime(),
+                                        DateTimeHelper.AGO_FULL_DATE_FORMATTER.format(new Date(file.lastModified())))))
+                                .setNegativeButton(R.string.no, (dialog, which) ->{
+                                    cloudFile.setUploading(false);
+                                    adapter.notifyItemChanged(menuBridge.getAdapterPosition());
+                                })
+                                .setPositiveButton(R.string.yes,
+                                        (dialog, which) ->
+                                                getRemoteContentNWrite(cloudFile, path, menuBridge.getAdapterPosition()))
+                                .create()
+                                .show();
+                    } else {
+                        getRemoteContentNWrite(cloudFile, path, menuBridge.getAdapterPosition());
+                    }
+                    break;
+                case 1:
+                    // delete
+                    scriptList.get(menuBridge.getAdapterPosition()).setUploading(true);
+                    adapter.notifyItemChanged(menuBridge.getAdapterPosition());
+                    ShareCodeUtil.getInstance().deleteUploadScript(scriptList.get(menuBridge.getAdapterPosition()), (databaseError, databaseReference) -> {
+//                        if (databaseError == null && getContext() != null) {
+//                            Toast.makeText(getContext(), R.string.delete_remote_suc, Toast.LENGTH_SHORT).show();
+//                            adapter.notifyItemRemoved(menuBridge.getAdapterPosition());
+//                            ((TedLocalActivity) getActivity()).deleteCloudFile(scriptList.get(menuBridge.getAdapterPosition()).getAbsolutePath());
+//                            scriptList.remove(menuBridge.getAdapterPosition());
+//                            if (scriptList.size() == 0) {
+//                                binding.netError.setText(R.string.cloud_empty_hint);
+//                                binding.netError.setVisibility(View.VISIBLE);
+//                            } else {
+//                                binding.netError.setVisibility(View.INVISIBLE);
+//                            }
+//                        } else {
+//                            Toast.makeText(getContext(), databaseError.getMessage(), Toast.LENGTH_SHORT).show();
+//                        }
+                    });
+                    break;
+            }
+        });
+        adapter.setCallback((position) -> binding.swipeList.smoothOpenRightMenu(position));
+        binding.swipeList.setAdapter(adapter);
+    }
+
+    private void getRemoteContentNWrite(CloudFile cloudFile, String path, int position) {
+        String key = cloudFile.getKey();
+        if (cloudFile.getProjectName() != null && !cloudFile.getKey().contains("projects3")) {
+            key = key.replace(cloudFile.getProjectName() + CONSTANT.SLASH_REPLACE, cloudFile.getProjectName() + "/" + CONSTANT.SLASH_REPLACE);
+        }
+        ShareCodeUtil.getInstance().getFileContent(key, content -> {
+            writeFile(path, content, position);
+            scriptList.get(position).setUploading(false);
+            adapter.notifyItemChanged(position);
+        });
+    }
+
+    private void writeFile(String path, String content, int adapterPosition) {
+        try {
+            FileWriter writer = new FileWriter(new File(path), false);
+            writer.write(content);
+            writer.close();
+            Toast.makeText(getContext(), R.string.file_downloaded, Toast.LENGTH_SHORT).show();
+            adapter.notifyItemChanged(adapterPosition);
+        } catch (IOException e) {
+            e.printStackTrace();
+            Toast.makeText(getContext(), R.string.override_fail_hint, Toast.LENGTH_SHORT).show();
+        }
+    }
+
+    public void needRefresh(boolean isNewUpload) {
+        if (binding == null) {
+            // not init yet
+            return;
+        }
+        if (isNewUpload) {
+            retry(true);
+        }
+    }
+}
diff --git a/qpython/src/ol/java/org/qpython/qpy/main/receiver/LeancloudReceiver.java b/qpython/src/ol/java/org/qpython/qpy/main/receiver/LeancloudReceiver.java
new file mode 100644
index 00000000..6f12375e
--- /dev/null
+++ b/qpython/src/ol/java/org/qpython/qpy/main/receiver/LeancloudReceiver.java
@@ -0,0 +1,18 @@
+package org.qpython.qpy.main.receiver;
+
+import android.annotation.SuppressLint;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+
+/**
+ * 处理leancloud的消息推送
+ */
+public class LeancloudReceiver extends BroadcastReceiver {
+
+    @SuppressLint("UnsafeProtectedBroadcastReceiver")
+    @Override
+    public void onReceive(Context context, Intent intent) {
+
+    }
+}
\ No newline at end of file
diff --git a/qpython/src/ol/java/org/qpython/qpy/main/service/MyFirebaseInstanceIDService.java b/qpython/src/ol/java/org/qpython/qpy/main/service/MyFirebaseInstanceIDService.java
new file mode 100644
index 00000000..362c2336
--- /dev/null
+++ b/qpython/src/ol/java/org/qpython/qpy/main/service/MyFirebaseInstanceIDService.java
@@ -0,0 +1,15 @@
+package org.qpython.qpy.main.service;
+
+import com.google.firebase.iid.FirebaseInstanceId;
+import com.google.firebase.iid.FirebaseInstanceIdService;
+
+/**
+ * Created by Hmei on 2017-06-29.
+ */
+
+public class MyFirebaseInstanceIDService extends FirebaseInstanceIdService {
+    @Override
+    public void onTokenRefresh() {
+        String refreshedToken = FirebaseInstanceId.getInstance().getToken();
+    }
+}
diff --git a/qpython/src/ol/java/org/qpython/qpy/main/service/MyFirebaseMessagingService.java b/qpython/src/ol/java/org/qpython/qpy/main/service/MyFirebaseMessagingService.java
new file mode 100644
index 00000000..9f333943
--- /dev/null
+++ b/qpython/src/ol/java/org/qpython/qpy/main/service/MyFirebaseMessagingService.java
@@ -0,0 +1,88 @@
+package org.qpython.qpy.main.service;
+
+import android.app.Notification;
+import android.app.NotificationManager;
+import android.app.PendingIntent;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.net.Uri;
+import android.os.Bundle;
+import android.preference.PreferenceManager;
+
+import com.google.firebase.messaging.FirebaseMessagingService;
+import com.google.firebase.messaging.RemoteMessage;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.qpython.qpy.R;
+import org.qpython.qpy.main.activity.QWebViewActivity;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.app.CONF;
+import org.qpython.qpy.main.receiver.NotificationBean;
+
+import java.util.Map;
+
+
+public class MyFirebaseMessagingService extends FirebaseMessagingService {
+    private static final int LOG_NOTIFICATION_ID = (int) System.currentTimeMillis();
+
+    private boolean handled = false;
+
+    @Override
+    public void onMessageReceived(RemoteMessage remoteMessage) {
+        super.onMessageReceived(remoteMessage);
+        Map<String, String> data = remoteMessage.getData();
+        String json = App.getGson().toJson(data);
+        NotificationBean bean = App.getGson().fromJson(json, NotificationBean.class);
+        if (!bean.isForce()&&!PreferenceManager.getDefaultSharedPreferences(this).getBoolean(getString(R.string.key_hide_push), true)) {
+            return;
+        }
+        Intent intent;
+        if (bean.getType().equals("ext")) {
+            intent = new Intent(Intent.ACTION_VIEW, Uri.parse(bean.getLink()));
+        } else {
+            intent = new Intent(App.getContext(), QWebViewActivity.class);
+            intent.putExtra(QWebViewActivity.TITLE, bean.getTitle());
+            intent.putExtra("url", bean.getLink());
+        }
+
+        PendingIntent pendingIntent = PendingIntent.getActivity(this, 0, intent, PendingIntent.FLAG_ONE_SHOT);
+
+        Notification.Builder builder = new Notification.Builder(this)
+                .setSmallIcon(R.drawable.img_home_logo)
+                .setContentTitle(getString(R.string.app_name))
+                .setContentText(bean.getMsg())
+                .setContentIntent(pendingIntent)
+                .setAutoCancel(true);
+
+        Notification notification;
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN) {
+            notification = builder.build();
+        } else {
+            notification = builder.getNotification();
+        }
+        NotificationManager mNotifyMgr = (NotificationManager) getSystemService(NOTIFICATION_SERVICE);
+        mNotifyMgr.notify(LOG_NOTIFICATION_ID, notification);
+        handled = true;
+    }
+
+ /*   @Override
+    public void handleIntent(Intent intent) {
+        super.handleIntent(intent);
+        if (handled) {
+            return;
+        }
+        Bundle bundle = intent.getExtras();
+        JSONObject extras = new JSONObject();
+        try {
+            for (String s : bundle.keySet()) {
+                extras.put(s, bundle.get(s));
+            }
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+        SharedPreferences.Editor editor = getSharedPreferences(CONF.NOTIFICATION_SP_NAME, MODE_PRIVATE).edit();
+        editor.putString(CONF.NOTIFICATION_SP_OBJ, extras.toString());
+        editor.apply();
+    }*/
+}
\ No newline at end of file
diff --git a/qpython/src/ol/java/org/qpython/qpy/main/service/PayUtil.java b/qpython/src/ol/java/org/qpython/qpy/main/service/PayUtil.java
new file mode 100644
index 00000000..8b88e8cc
--- /dev/null
+++ b/qpython/src/ol/java/org/qpython/qpy/main/service/PayUtil.java
@@ -0,0 +1,150 @@
+package org.qpython.qpy.main.service;
+
+import android.app.Activity;
+import android.app.PendingIntent;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentSender;
+import android.content.ServiceConnection;
+import android.os.Bundle;
+import android.os.IBinder;
+import android.os.RemoteException;
+import android.view.View;
+import android.widget.Toast;
+
+import com.android.vending.billing.IInAppBillingService;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.qpython.qpy.R;
+import org.qpython.qpy.main.server.MySubscriber;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+
+import rx.Observable;
+import rx.android.schedulers.AndroidSchedulers;
+import rx.schedulers.Schedulers;
+
+/**
+ * Created by Hmei
+ * 1/31/18.
+ */
+
+public class PayUtil {
+    private static final int BUY_REQUEST_CODE = 2333;
+    private IInAppBillingService mService;
+    private ServiceConnection    mServiceConn;
+    private Activity             context;
+
+    public PayUtil(Activity context) {
+        this.context = context;
+    }
+
+    public void initIAP(PayCallback callback) {
+        mServiceConn = new ServiceConnection() {
+            @Override
+            public void onServiceDisconnected(ComponentName name) {
+                mService = null;
+            }
+
+            @Override
+            public void onServiceConnected(ComponentName name,
+                                           IBinder service) {
+                mService = IInAppBillingService.Stub.asInterface(service);
+                if (callback != null) callback.doAfterConn();
+            }
+        };
+        Intent serviceIntent = new Intent("com.android.vending.billing.InAppBillingService.BIND");
+        serviceIntent.setPackage("com.android.vending");
+        context.bindService(serviceIntent, mServiceConn, Context.BIND_AUTO_CREATE);
+    }
+
+    /**
+     * 从Google服务器获取不同国家价格表并显示
+     */
+    public void getPrices(ArrayList<String> skuList, MySubscriber<String[]> callback) {
+        if (mService == null) {
+            Toast.makeText(context, R.string.lose_google_server, Toast.LENGTH_SHORT).show();
+            if (context.findViewById(R.id.pb) != null)
+                context.findViewById(R.id.pb).setVisibility(View.GONE);
+            return;
+        }
+        Bundle querySkus = new Bundle();
+        querySkus.putStringArrayList("ITEM_ID_LIST", skuList);
+        try {
+            Observable.just(mService.getSkuDetails(3, context.getPackageName(), "inapp", querySkus))
+                    .map(bundle -> {
+                                ArrayList<String> responseList = bundle.getStringArrayList("DETAILS_LIST");
+                                if (responseList == null) {
+                                    return null;
+                                }
+                                String[] prices = new String[responseList.size()];
+                                for (int i = 0; i < responseList.size(); i++) {
+                                    JSONObject object;
+                                    try {
+                                        object = new JSONObject(responseList.get(i));
+                                        String price = object.getString("price");
+                                        prices[i] = price;
+                                    } catch (JSONException e) {
+                                        e.printStackTrace();
+                                    }
+                                }
+                                Arrays.sort(prices, (o1, o2) -> Integer.parseInt(o1.replaceAll("[^0-9]", "")) - Integer.parseInt(o2.replaceAll("[^0-9]", "")));
+                                return prices;
+                            }
+                    )
+                    .subscribeOn(Schedulers.newThread())
+                    .observeOn(AndroidSchedulers.mainThread())
+                    .subscribe(callback);
+        } catch (RemoteException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public void digestPurchase(String purchaseToken) {
+        // 消耗购买，使能重复赞赏同一金额
+        try {
+            Observable.just(mService.consumePurchase(3, context.getPackageName(), purchaseToken))
+                    .subscribeOn(Schedulers.newThread())
+                    .observeOn(AndroidSchedulers.mainThread())
+                    .subscribe();
+        } catch (RemoteException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public void purchase(String sku) {
+        try {
+            if (mService == null) {
+                Toast.makeText(context, R.string.lose_google_server, Toast.LENGTH_SHORT).show();
+                return;
+            }
+            Bundle buyIntentBundle = mService.getBuyIntent(3, context.getPackageName(),
+                    sku, "inapp", "bGoa+V7g/yqDXvKRqq+JTFn4uQZbPiQJo4pf9RzJ");
+            switch (buyIntentBundle.getInt("RESPONSE_CODE")) {
+                case 0:
+                    //BILLING_RESPONSE_RESULT_OK
+                    PendingIntent pendingIntent = buyIntentBundle.getParcelable("BUY_INTENT");
+                    context.startIntentSenderForResult(pendingIntent.getIntentSender(),
+                            BUY_REQUEST_CODE, new Intent(), 0, 0, 0);
+                    break;
+
+            }
+        } catch (RemoteException | IntentSender.SendIntentException | NullPointerException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public void unbindPayService() {
+        if (mService != null) {
+            context.unbindService(mServiceConn);
+        }
+    }
+
+    public interface PayCallback {
+        void doAfterConn();
+    }
+
+}
diff --git a/qpython/src/ol/java/org/qpython/qpy/texteditor/TedLocalActivity.java b/qpython/src/ol/java/org/qpython/qpy/texteditor/TedLocalActivity.java
new file mode 100644
index 00000000..466f0c8a
--- /dev/null
+++ b/qpython/src/ol/java/org/qpython/qpy/texteditor/TedLocalActivity.java
@@ -0,0 +1,308 @@
+package org.qpython.qpy.texteditor;
+
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.content.res.Configuration;
+import android.databinding.DataBindingUtil;
+import android.graphics.drawable.Drawable;
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.support.v7.app.AppCompatActivity;
+import android.view.MotionEvent;
+import android.view.View;
+import android.widget.EditText;
+import android.widget.Toast;
+
+import com.google.gson.reflect.TypeToken;
+import com.quseit.util.FileHelper;
+import com.quseit.util.NAction;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.codeshare.pojo.CloudFile;
+import org.qpython.qpy.databinding.ActivityLocalBinding;
+import org.qpython.qpy.main.activity.SignInActivity;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.app.CONF;
+import org.qpython.qpy.main.fragment.ExplorerFragment;
+import org.qpython.qpy.main.fragment.LocalFragment;
+import org.qpython.qpy.main.fragment.MyProjectFragment;
+import org.qpython.qpy.utils.NotebookUtil;
+import org.qpython.qpysdk.QPyConstants;
+
+import java.io.File;
+import java.lang.reflect.Type;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class TedLocalActivity extends AppCompatActivity {
+    public static final  int REQUEST_SAVE_AS    = 107;
+    public static final  int REQUEST_OPEN       = 108;
+    public static final  int REQUEST_HOME_PAGE  = 109;
+    public static final  int REQUEST_RECENT     = 111;
+    private static final int LOGIN_REQUEST_CODE = 4806;
+
+    private static final String EXTRA_REQUEST_CODE = "request_code";
+    private static final String EXTRA_REQUEST_FN = "request_fn";
+
+    private static final String FRAGMENT_EXPLORER  = "explorer";
+    private static final String FRAGMENT_CLOUD     = "cloud";
+
+    private ActivityLocalBinding binding;
+
+    private Fragment firstPageFragment;
+    private MyProjectFragment myProjectFragment;
+
+    private boolean isExplorer  = true;
+    private boolean isNewUpload = false;
+    //private String defaultFileName = "";
+
+    public static void start(Context context, int type) {
+        Intent starter = new Intent(context, TedLocalActivity.class);
+        starter.putExtra(EXTRA_REQUEST_CODE, type);
+        context.startActivity(starter);
+    }
+
+    public static void start(Activity context, int type, int requestCode, String filename) {
+        Intent starter = new Intent(context, TedLocalActivity.class);
+        starter.putExtra(EXTRA_REQUEST_CODE, type);
+        starter.putExtra(EXTRA_REQUEST_FN, filename);
+
+        context.startActivityForResult(starter, requestCode);
+    }
+
+    public void finishForGetPath(String path) {
+        Intent intent = new Intent();
+        intent.putExtra("path", path);
+        setResult(Activity.RESULT_OK, intent);
+        finish();
+    }
+
+    public void finishForOpen(String path, boolean isProj) {
+        Intent intent = new Intent();
+        intent.putExtra("path", path);
+        intent.putExtra("isProj", isProj);
+        setResult(Activity.RESULT_OK, intent);
+        finish();
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        binding = DataBindingUtil.setContentView(this, R.layout.activity_local);
+        setSupportActionBar(binding.toolbar);
+        int type = getIntent().getIntExtra(EXTRA_REQUEST_CODE, REQUEST_HOME_PAGE);
+
+        initView();
+        initListener();
+        switch (type) {
+            case REQUEST_RECENT:
+                setTitle(R.string.recent);
+                binding.switchBtn.setVisibility(View.GONE);
+                firstPageFragment = ExplorerFragment.newInstance(type);
+                break;
+            case REQUEST_OPEN:
+                setTitle(R.string.open);
+                binding.switchBtn.setVisibility(View.GONE);
+                binding.explore.setVisibility(View.VISIBLE);
+                firstPageFragment = new LocalFragment();
+                break;
+            case REQUEST_SAVE_AS:
+                setTitle(R.string.save_as);
+                binding.vsSave.getRoot().setVisibility(View.VISIBLE);
+                initSaveListener();
+
+                String fn = getIntent().getStringExtra(EXTRA_REQUEST_FN);
+                if (fn!=null) {
+                    binding.vsSave.etName.setText(fn);
+                }
+                binding.switchBtn.setVisibility(View.GONE);
+                firstPageFragment = ExplorerFragment.newInstance(type);
+                break;
+            case REQUEST_HOME_PAGE:
+                setTitle(R.string.explorer);
+                firstPageFragment = ExplorerFragment.newInstance(type);
+                break;
+        }
+
+        getSupportFragmentManager().beginTransaction()
+                .add(R.id.container, firstPageFragment, FRAGMENT_EXPLORER)
+                .commit();
+    }
+
+    @Override
+    public void onConfigurationChanged(Configuration newConfig) {
+        super.onConfigurationChanged(newConfig);
+    }
+
+    private void initView() {
+        binding.toolbar.setNavigationIcon(R.drawable.ic_back);
+        binding.toolbar.setNavigationOnClickListener(v -> finish());
+        if (binding.switchBtn.getVisibility() == View.VISIBLE) {
+            myProjectFragment = new MyProjectFragment();
+        }
+    }
+
+    private void initListener() {
+        binding.switchBtn.setOnClickListener(v -> {
+            if (isExplorer) {
+                if (App.getUser() == null) {
+                    startActivityForResult(new Intent(this, SignInActivity.class), LOGIN_REQUEST_CODE);
+                    return;
+                }
+                binding.switchBtn.setImageResource(R.drawable.ic_folder_open);
+                binding.refresh.setVisibility(View.VISIBLE);
+                if (getSupportFragmentManager().findFragmentByTag(FRAGMENT_CLOUD) == null) {
+                    getSupportFragmentManager().beginTransaction().add(R.id.container, myProjectFragment, FRAGMENT_CLOUD).commit();
+                    getSupportFragmentManager().beginTransaction().hide(firstPageFragment).commit();
+                } else {
+                    getSupportFragmentManager().beginTransaction()
+                            .hide(firstPageFragment)
+                            .show(myProjectFragment)
+                            .commit();
+                }
+                myProjectFragment.needRefresh(isNewUpload);
+                isNewUpload = false;
+                if (!myProjectFragment.isLoading) {
+                    myProjectFragment.notifyDataSetChange();
+                }
+            } else {
+                binding.switchBtn.setImageResource(R.drawable.ic_cloud_list);
+                binding.refresh.setVisibility(View.GONE);
+                getSupportFragmentManager().beginTransaction()
+                        .hide(myProjectFragment)
+                        .show(firstPageFragment)
+                        .commit();
+            }
+            isExplorer = !isExplorer;
+        });
+
+        binding.refresh.setOnClickListener(v -> myProjectFragment.retry(true));
+
+        binding.explore.setOnClickListener(v -> {
+            start(this, REQUEST_HOME_PAGE);
+            finish();
+        });
+    }
+
+    public void doSave(String fn) {
+        if (fn.length() == 0) {
+            Toast.makeText(getApplicationContext(), R.string.toast_filename_empty, Toast.LENGTH_SHORT).show();
+        } else {
+            String filename = ((ExplorerFragment) firstPageFragment).getCurPath() + "/" + fn;
+            final File f = new File(filename);
+            if (f.exists()) {
+                Toast.makeText(this, R.string.file_exist_hint, Toast.LENGTH_SHORT).show();
+            } else {
+                setSaveResult(f.getAbsolutePath());
+            }
+        }
+    }
+
+    protected boolean setSaveResult(String filepath) {
+        File f = new File(filepath);
+        if (f.getParentFile().canWrite()) {
+            finishForGetPath(filepath);
+        } else {
+            Toast.makeText(getApplicationContext(), R.string.toast_folder_cant_write, Toast.LENGTH_SHORT).show();
+        }
+        return true;
+    }
+
+    private void initSaveListener() {
+        binding.vsSave.btnSave.setOnClickListener(v -> doSave(binding.vsSave.etName.getText().toString()));
+        binding.vsSave.etName.setOnTouchListener((v, event) -> {
+            final int DRAWABLE_RIGHT = 2;
+            switch (event.getAction()) {
+                case MotionEvent.ACTION_DOWN:
+                    Drawable deleteText = ((EditText) v).getCompoundDrawables()[DRAWABLE_RIGHT];
+                    if (deleteText != null) {
+                        if (event.getRawX() >= (v.getRight() - deleteText.getBounds().width())) {
+                            ((EditText) v).setText("");
+                            return true;
+                        }
+                    }
+                    break;
+                case MotionEvent.ACTION_UP:
+                    v.performClick();
+                    break;
+                default:
+                    break;
+            }
+            return false;
+        });
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (resultCode == RESULT_OK) {
+            switch (requestCode) {
+                case LOGIN_REQUEST_CODE:
+                    binding.switchBtn.setImageResource(R.drawable.ic_folder_open);
+                    if (getSupportFragmentManager().findFragmentByTag(FRAGMENT_CLOUD) == null) {
+                        getSupportFragmentManager().beginTransaction().add(R.id.container, myProjectFragment, FRAGMENT_CLOUD).commit();
+                        getSupportFragmentManager().beginTransaction().hide(firstPageFragment).commit();
+                    } else {
+                        getSupportFragmentManager().beginTransaction()
+                                .hide(firstPageFragment)
+                                .show(myProjectFragment)
+                                .commit();
+                    }
+                    isExplorer = !isExplorer;
+                    break;
+            }
+        }
+    }
+
+    @Override
+    public void onBackPressed() {
+        if (firstPageFragment.isVisible() && firstPageFragment instanceof ExplorerFragment) {
+            ((ExplorerFragment) firstPageFragment).backToPrev();
+        } else {
+            super.onBackPressed();
+        }
+    }
+
+//    public void deleteCloudFile(String path) {
+//        if (firstPageFragment instanceof ExplorerFragment) {
+//            ((ExplorerFragment) firstPageFragment).deleteCloudedMap(path);
+//        }
+//    }
+//
+//    public void updateCloudFiles(List<CloudFile> cloudFiles) {
+//        Map<String, Boolean> map = new HashMap<>();
+//        boolean isQPy3 = NAction.isQPy3(getBaseContext());
+//        String tag = isQPy3?"/projects3/":"/projects/";
+//        for (CloudFile cloudFile : cloudFiles) {
+//            if (cloudFile.getPath().contains(tag)) {
+//                map.put(QPyConstants.ABSOLUTE_PATH + tag + cloudFile.getProjectName(), true);
+//            }
+//            map.put(QPyConstants.ABSOLUTE_PATH + cloudFile.getPath(), true);
+//        }
+//        ((ExplorerFragment) firstPageFragment).updateCloudedFiles(map);
+//    }
+//
+//    public void setNewUpload() {
+//        isNewUpload = true;
+//    }
+
+    /**
+     * 保存云端文件目录到本地
+     */
+//    public void locatedCloud(List<CloudFile> cloudFiles) {
+//        if (cloudFiles.size() > 0) {
+//            Type type = new TypeToken<List<CloudFile>>() {
+//            }.getType();
+//            FileHelper.writeToFile(CONF.CLOUD_MAP_CACHE_PATH, App.getGson().toJson(cloudFiles, type));
+//        }
+//    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        NotebookUtil.killServer();
+    }
+}
diff --git a/qpython/src/ol/res/layout/activity_local.xml b/qpython/src/ol/res/layout/activity_local.xml
new file mode 100644
index 00000000..abdcb0aa
--- /dev/null
+++ b/qpython/src/ol/res/layout/activity_local.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <LinearLayout
+        android:id="@+id/gd_action_bar_host"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:background="@color/colorPrimaryDark"
+        android:orientation="vertical">
+
+        <android.support.design.widget.AppBarLayout
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize">
+
+            <android.support.v7.widget.Toolbar
+                android:id="@+id/toolbar"
+                style="@style/Toolbar"
+                android:layout_width="match_parent"
+                android:layout_height="?attr/actionBarSize"
+                android:background="#FF4A4A4A"
+                android:elevation="2dp"
+                app:popupTheme="@style/DefaultBlueToolbar"
+                app:theme="@style/ToolbarTheme">
+
+                <ImageButton
+                    android:id="@+id/switch_btn"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="end"
+                    android:background="@null"
+                    android:padding="10dp"
+                    android:src="@drawable/ic_cloud_list"
+                    android:visibility="gone"/>
+
+                <ImageButton
+                    android:id="@+id/refresh"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="end"
+                    android:visibility="gone"
+                    android:layout_marginEnd="30dp"
+                    android:layout_marginRight="30dp"
+                    android:background="@color/transparency"
+                    android:src="@drawable/ic_library_reinstall"/>
+
+                <Button
+                    android:id="@+id/explore"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="end"
+                    android:textColor="#FFF"
+                    android:background="@color/transparency"
+                    android:text="@string/explorer"
+                    android:visibility="gone"/>
+            </android.support.v7.widget.Toolbar>
+        </android.support.design.widget.AppBarLayout>
+
+        <RelativeLayout
+            xmlns:android="http://schemas.android.com/apk/res/android"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@color/colorPrimaryDark">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="vertical">
+
+                <FrameLayout
+                    android:id="@+id/container"
+                    android:layout_width="match_parent"
+                    android:layout_height="0dp"
+                    android:layout_weight="9"/>
+
+                <include
+                    android:id="@+id/vs_save"
+                    layout="@layout/view_stub_save_prompt"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"/>
+            </LinearLayout>
+        </RelativeLayout>
+    </LinearLayout>
+
+
+</layout>
\ No newline at end of file
diff --git a/qpython/src/ol/res/values-zh-rCN/strings.xml b/qpython/src/ol/res/values-zh-rCN/strings.xml
new file mode 100644
index 00000000..513c3f8e
--- /dev/null
+++ b/qpython/src/ol/res/values-zh-rCN/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="sign_in_with_google">使用谷歌登录</string>
+    <string name="app_name">QPython OL</string>
+</resources>
diff --git a/qpython/src/ol/res/values/strings.xml b/qpython/src/ol/res/values/strings.xml
new file mode 100644
index 00000000..1d40e7b6
--- /dev/null
+++ b/qpython/src/ol/res/values/strings.xml
@@ -0,0 +1,4 @@
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="ExtraTranslation">
+    <string name="sign_in_with_google">Sign in with Google</string>
+    <string name="app_name">QPython OL</string>
+</resources>
diff --git a/qpython/src/op/AndroidManifest.xml b/qpython/src/op/AndroidManifest.xml
new file mode 100644
index 00000000..af9d90a7
--- /dev/null
+++ b/qpython/src/op/AndroidManifest.xml
@@ -0,0 +1,408 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          xmlns:tools="http://schemas.android.com/tools"
+          package="org.qpython.qpy">
+
+    <uses-feature
+        android:name="android.hardware.touchscreen"
+        android:required="false"/>
+
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+    <uses-permission android:name="android.permission.CAMERA"/>
+    <uses-permission android:name="android.permission.FLASHLIGHT"/>
+    <uses-permission android:name="android.permission.VIBRATE" />
+    <uses-permission android:name="android.permission.RECEIVE_USER_PRESENT" />
+    <uses-permission android:name="com.android.vending.BILLING"/>
+    <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
+    <uses-permission android:name="com.android.launcher.permission.UNINSTALL_SHORTCUT" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_MEDIA_STORAGE" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.BLUETOOTH" />
+    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
+    <uses-permission android:name="android.permission.NFC" />
+    <uses-permission android:name="android.permission.RECORD_AUDIO" />
+    <uses-permission android:name="android.permission.ACCESS_NOTIFICATION_POLICY" />
+    <uses-permission android:name="android.permission.KILL_BACKGROUND_PROCESSES"/>
+    <uses-permission android:name="net.dinglisch.android.tasker.PERMISSION_RUN_TASKS" />
+    <!-- privacy sensitive permissions -->
+    <uses-permission android:name="android.permission.ACCESS_SUPERUSER" />
+    <uses-permission android:name="android.permission.READ_SMS"/>
+    <uses-permission android:name="android.permission.SEND_SMS" />
+    <uses-permission android:name="android.permission.RECEIVE_SMS"/>
+    <uses-permission android:name="android.permission.WRITE_SMS"/>
+    <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
+    <uses-permission android:name="android.permission.CALL_PHONE"/>
+    <uses-permission android:name="android.permission.READ_CALL_LOG"/>
+    <uses-permission android:name="android.permission.PROCESS_OUTGOING_CALLS"/>
+    <uses-permission android:name="android.permission.READ_CONTACTS"/>
+    <uses-permission android:name="android.permission.GET_ACCOUNTS"/>
+    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
+
+    <uses-feature android:name="android.hardware.microphone" android:required="false"/>
+    <uses-feature android:name="android.hardware.telephony" android:required="false"/>
+    <uses-feature android:name="android.hardware.camera" android:required="false"/>
+    <uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
+    <uses-feature android:name="android.hardware.camera.flash" android:required="false"/>
+    <uses-feature android:name="android.hardware.screen.landscape" android:required="false"/>
+    <uses-feature android:name="android.hardware.wifi" android:required="false"/>
+    <uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
+    <uses-feature android:name="android.hardware.location.gps" android:required="false"/>
+    <uses-feature android:name="android.hardware.location.network" android:required="false"/>
+    <uses-feature android:name="android.hardware.bluetooth" android:required="false"/>
+
+    <uses-feature android:glEsVersion="0x00020000" android:required="false"/>
+
+    <application
+        android:networkSecurityConfig="@xml/network_security_config"
+        android:name="org.qpython.qpy.main.app.App"
+        android:allowBackup="true"
+        android:hardwareAccelerated="true"
+        android:icon="@drawable/ic_launcher"
+        android:label="@string/app_name"
+        android:largeHeap="true"
+        android:supportsRtl="true"
+        android:theme="@style/AppTheme">
+        <uses-library android:name="org.apache.http.legacy" android:required="false"/>
+
+        <meta-data
+            android:name="com.google.firebase.messaging.default_notification_icon"
+            android:resource="@drawable/img_home_logo"/>
+
+        <service android:name=".main.service.QPyService"/>
+        <service android:name="org.qpython.qsl4a.QPyScriptService"/>
+        <service android:name=".main.service.FTPServerService"/>
+        <activity
+            android:name=".main.activity.SignInActivity"
+            android:launchMode="singleTask"/>
+        <activity
+            android:name="org.renpy.android.PythonSDLActivity"
+            android:hardwareAccelerated="true"
+            android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|screenLayout|fontScale|uiMode|orientation"
+            android:launchMode="singleTask"
+            android:process=":python"
+            android:screenOrientation="user"
+            android:theme="@style/AppTheme"
+            android:windowSoftInputMode="stateAlwaysHidden">
+        </activity>
+
+        <activity
+            android:name="org.qpython.qpylib.MPyApi"
+            android:exported="true"
+            android:theme="@style/Theme.AppCompat"/>
+
+        <service
+            android:name="org.qpython.qpylib.MPyService"
+            android:exported="true"
+            tools:ignore="ExportedService"/>
+
+        <activity
+            android:name=".main.activity.SplashActivity"
+            android:theme="@style/FullscreenTheme"
+            >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
+        </activity>
+
+        <activity
+            android:name="org.qpython.qpy.main.activity.HomeMainActivity"
+            android:launchMode="singleTask">
+            <meta-data
+                android:name="android.app.shortcuts"
+                android:resource="@xml/shortcuts"/>
+        </activity>
+
+        <activity
+            android:name="org.qpython.qpy.main.activity.QWebViewActivity"
+            android:label="@string/browser">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW"/>
+
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.BROWSABLE"/>
+
+                <data android:mimeType="text/plain"/>
+                <data android:mimeType="image/*"/>
+                <data
+                    android:host="course"
+                    android:path="/"
+                    android:scheme="qpython"/>
+            </intent-filter>
+
+            <!-- Used to handle Chrome then menu then share.-->
+            <intent-filter>
+                <action android:name="android.intent.action.SEND"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <data android:mimeType="text/plain"/>
+                <data android:mimeType="image/*"/>
+            </intent-filter>
+        </activity>
+        <activity
+            android:name=".main.activity.CourseActivity"
+            android:configChanges="orientation|screenSize"/>
+        <activity android:name=".main.activity.CourseIndexActivity"/>
+        <activity android:name=".main.activity.GistEditActivity"/>
+        <activity android:name=".main.activity.CodeDetailActivity"/>
+        <activity android:name=".main.activity.CodeShareActivity"/>
+        <activity android:name=".main.activity.UserActivity"/>
+        <activity
+            android:name="org.qpython.qpy.main.activity.SettingActivity"
+            android:theme="@style/AppTheme"/>
+        <activity
+            android:name="org.qpython.qpy.console.TermActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:theme="@style/AppTheme"/>
+        <activity
+            android:name=".main.activity.LogActivity"
+            android:theme="@style/AppTheme"/>
+        <activity
+            android:name=".texteditor.EditorActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:exported="true"
+            android:label="@string/editor">
+            <intent-filter>
+                <!--<action android:name="android.intent.action.SEND"/>-->
+                <action android:name="android.intent.action.VIEW"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:mimeType="text/*"/>
+                <data android:scheme="file"/>
+            </intent-filter>
+
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="content"/>
+                <data android:host="*"/>
+                <data android:mimeType="*/*"/>
+                <data android:pathPattern=".*\\.txt"/>
+                <data android:pathPattern=".*\\.html"/>
+                <data android:pathPattern=".*\\.css"/>
+                <data android:pathPattern=".*\\.js"/>
+                <data android:pathPattern=".*\\.md"/>
+                <data android:pathPattern=".*\\.php"/>
+                <data android:pathPattern=".*\\.py"/>
+            </intent-filter>
+        </activity>
+
+        <activity
+            android:name="org.qpython.qpy.texteditor.TedLocalActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar"/>
+        <activity
+            android:name="org.qpython.qpy.texteditor.TedSettingsActivity"
+            android:theme="@style/SettingTheme"
+            android:windowSoftInputMode="stateHidden"/>
+        <activity
+            android:name="org.qpython.qpy.texteditor.TedFontActivity"
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar"/>
+
+        <activity
+            android:name=".main.activity.LibActivity"
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar">
+            <intent-filter>
+                <action android:name="org.qpython.qpy.OPEN_AIPY_FRAGMENT"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity>
+
+        <activity
+            android:name=".main.activity.AboutActivity"/>
+
+        <activity
+            android:name=".main.activity.AppListActivity"
+            android:exported="true"
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar">
+        </activity>
+        <activity
+            android:name="org.swiftp.gui.ServerPreferenceActivity"
+            android:label="Preferences"/>
+        <activity android:name=".texteditor.MFTPSettingActivity"/>
+        <activity android:name=".main.activity.PurchaseActivity"/>
+
+        <activity-alias
+            android:name="TermInternal"
+            android:exported="false"
+            android:targetActivity="org.qpython.qpy.console.TermActivity"
+            android:theme="@style/ConsoleTheme">
+            <intent-filter>
+                <action android:name="jackpal.androidterm.private.OPEN_NEW_WINDOW"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+            <intent-filter>
+                <action android:name="jackpal.androidterm.private.SWITCH_WINDOW"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity-alias>
+        <activity
+            android:name="org.qpython.qpy.console.RemoteInterface"
+            android:excludeFromRecents="true"
+            android:theme="@style/ConsoleTheme">
+            <intent-filter>
+                <action android:name="jackpal.androidterm.OPEN_NEW_WINDOW"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity>
+        <activity-alias
+            android:name="TermHere"
+            android:exported="true"
+            android:label="@string/activity_term_here_title"
+            android:targetActivity="org.qpython.qpy.console.RemoteInterface"
+            android:theme="@style/ConsoleTheme">
+        </activity-alias>
+
+        <activity
+            android:name="org.qpython.qsl4a.qsl4a.activity.FutureActivity"
+            android:label="QSL4A FutureActivity"
+            android:theme="@style/AppTheme">
+            <intent-filter>
+                <action android:name="android.nfc.action.NDEF_DISCOVERED"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <data android:mimeType="application/com.hipipal.qpy.nfc"/>
+            </intent-filter>
+        </activity>
+
+        <activity
+            android:name="org.qpython.qpy.console.RunScript"
+            android:excludeFromRecents="true"
+            android:permission="jackpal.androidterm.permission.RUN_SCRIPT"
+            android:theme="@style/ConsoleTheme">
+            <intent-filter>
+                <action android:name="jackpal.androidterm.RUN_SCRIPT"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity>
+        <activity
+            android:name="org.qpython.qpy.console.RunShortcut"
+            android:excludeFromRecents="true"
+            android:theme="@style/ConsoleTheme">
+            <intent-filter>
+                <action android:name="jackpal.androidterm.RUN_SHORTCUT"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity>
+        <activity
+            android:name="org.qpython.qpy.console.TermPreferences"
+            android:label="@string/preferences"
+            android:theme="@style/ConsoleTheme"/>
+        <activity
+            android:name="org.qpython.qpy.console.WindowList"
+            android:label="@string/window_list"
+            android:theme="@style/ConsoleTheme"/>
+        <activity
+            android:name="org.qpython.qpy.console.shortcuts.AddShortcut"
+            android:configChanges="orientation|keyboard|keyboardHidden"
+            android:label="@string/activity_shortcut_create"
+            android:launchMode="singleTop"
+            android:theme="@style/Theme.AppCompat">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.CREATE_SHORTCUT"/>
+            </intent-filter>
+            <intent-filter>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <data android:mimeType="text/*"/>
+            </intent-filter>
+        </activity>
+        <activity
+            android:name="org.qpython.qpy.console.shortcuts.FSNavigator"
+            android:configChanges="orientation|keyboardHidden"
+            android:exported="true"
+            android:label="@string/addshortcut_button_find_command"
+            android:launchMode="singleTop"
+            android:theme="@style/ConsoleTheme">
+            <intent-filter>
+                <action android:name="android.intent.action.PICK"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.GET_CONTENT"/>
+
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.OPENABLE"/>
+
+                <data android:mimeType="*/*"/>
+            </intent-filter>
+        </activity>
+
+        <activity android:name="org.qpython.qpy.plugin.activity.PluginManagerActivity"/>
+        <activity android:name="org.qpython.qpy.plugin.activity.LocalPluginInstallActivity"/>
+
+        <!--zxing-->
+        <activity android:name="org.qpython.qpy.main.activity.QrCodeActivity"/>
+        <activity
+            android:name=".main.activity.GistActivity"
+            android:configChanges="orientation"
+            android:launchMode="singleTask"/>
+        <activity
+            android:name=".main.activity.GistDetailActivity"
+            android:configChanges="orientation"/>
+        <activity
+            android:name=".main.activity.MyGistActivity"
+            android:configChanges="orientation"/>
+        <!--SERVICE-->
+        <service android:name="org.qpython.qpy.console.TermService"
+                 tools:ignore="ExportedService">
+            <intent-filter>
+                <action android:name="jackpal.androidterm.action.START_TERM.v1"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </service>
+
+        <activity android:name=".main.activity.CourseIndexFundingActivity"/>
+        <activity android:name=".main.activity.FundingPurchaseActivity"/>
+        <activity
+            android:name=".main.activity.NotebookActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:launchMode="singleTask"
+            android:windowSoftInputMode="adjustResize"
+            android:exported="true">
+            <intent-filter >
+                <action android:name="android.intent.action.VIEW"/>
+            </intent-filter>
+        </activity>
+        <activity
+            android:name=".main.activity.NotebookListActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"/>
+
+        <!--友盟-->
+        <meta-data
+            android:name="UMENG_APPKEY"
+            android:value="5a24fdea8f4a9d34b00000b5"/>
+        <meta-data
+            android:name="UMENG_CHANNEL"
+            android:value="QPython"/>
+
+        <!--微信-->
+        <!--activity
+            android:name="com.hipipal.qpyplus.wxapi.WXEntryActivity"
+            android:exported="true"
+            android:label="@string/app_name"
+            android:theme="@android:style/Theme.Translucent.NoTitleBar"/>
+        <activity
+            android:name="com.hipipal.qpyplus.wxapi.WXPayEntryActivity"
+            android:exported="true"
+            android:label="@string/app_name"
+            android:theme="@android:style/Theme.Translucent.NoTitleBar"/-->
+
+    </application>
+
+    <meta-data
+        android:name="com.sec.android.support.multiwindow"
+        android:value="true"/>
+
+</manifest>
diff --git a/qpython/src/op/java/org/qpython/qpy/main/activity/BaseActivity.java b/qpython/src/op/java/org/qpython/qpy/main/activity/BaseActivity.java
new file mode 100644
index 00000000..9c3765d4
--- /dev/null
+++ b/qpython/src/op/java/org/qpython/qpy/main/activity/BaseActivity.java
@@ -0,0 +1,235 @@
+package org.qpython.qpy.main.activity;
+
+import android.content.ActivityNotFoundException;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Bundle;
+import android.os.Environment;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v4.app.ActivityCompat;
+import android.support.v4.content.ContextCompat;
+import android.support.v4.util.ArrayMap;
+import android.support.v7.app.AppCompatActivity;
+import android.text.TextUtils;
+import android.widget.Toast;
+
+import com.quseit.util.NAction;
+import com.quseit.util.NUtil;
+import com.umeng.analytics.MobclickAgent;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.console.ShellTermSession;
+import org.qpython.qpy.console.util.TermSettings;
+import org.qpython.qpy.main.server.gist.TokenManager;
+import org.renpy.android.ResourceManager;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.Map;
+
+
+public class BaseActivity extends AppCompatActivity {
+    // QPython interfaces
+    private static final int SCRIPT_CONSOLE_CODE = 1237;
+    private static final int PID_INIT_VALUE      = -1;
+    private static final int DEFAULT_BUFFER_SIZE = 8192;
+    private static final int LOG_NOTIFICATION_ID = (int) System.currentTimeMillis();
+    private ArrayList<String> mArguments = new ArrayList<>();
+    private InputStream  mIn;
+    private OutputStream mOut;
+    private Map<Integer, PermissionAction> mActionMap = new ArrayMap<>();
+    private TermSettings     mSettings;
+    private ShellTermSession session;
+
+    private boolean permissionGrant = true;
+
+    protected static ShellTermSession createTermSession(Context context, TermSettings settings, String initialCommand, String path) {
+        ShellTermSession session = null;
+        try {
+            session = new ShellTermSession(context, settings, initialCommand, path);
+            session.setProcessExitMessage(context.getString(R.string.process_exit_message));
+
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+        return session;
+    }
+
+    protected void toast(String content) {
+        Toast.makeText(this, content, Toast.LENGTH_SHORT).show();
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        MobclickAgent.onPageStart(this.getLocalClassName());
+        MobclickAgent.onResume(this);
+    }
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        MobclickAgent.setDebugMode(true);
+        MobclickAgent.openActivityDurationTrack(false);
+        MobclickAgent.setScenarioType(this, MobclickAgent.EScenarioType.E_UM_NORMAL);
+    }
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+        MobclickAgent.onPageEnd(this.getLocalClassName());
+        MobclickAgent.onPause(this);
+    }
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+        PermissionAction action = mActionMap.get(requestCode);
+        if (action != null) {
+            if (grantResults.length > 0 && (grantResults[0] == PackageManager.PERMISSION_GRANTED)) {
+                action.onGrant();
+            } else {
+                action.onDeny();
+            }
+
+        }
+        mActionMap.remove(action);
+    }
+
+
+    public final void checkPermissionDo(String[] permissions, PermissionAction action) {
+        if (Build.VERSION.SDK_INT >= 23) {
+            boolean granted = true;
+            for (String permission : permissions) {
+                int checkPermission = ContextCompat.checkSelfPermission(this, permission);
+                granted = checkPermission == PackageManager.PERMISSION_GRANTED;
+            }
+            if (!granted) {
+                int code = permissions.hashCode() & 0xffff;
+                mActionMap.put(code, action);
+                ActivityCompat.requestPermissions(this, permissions, code);
+            } else {
+                action.onGrant();
+            }
+        } else {
+            action.onGrant();
+        }
+    }
+
+
+    // feedback
+    public void onFeedback(String feedback) {
+
+        String app = getString(R.string.app_name);
+        int ver = NUtil.getVersinoCode(getApplicationContext());
+        String subject = MessageFormat.format(getString(com.quseit.android.R.string.feeback_email_title), app, ver, Build.PRODUCT);
+
+        String lastError = "";
+        String code = NAction.getCode(getApplicationContext());
+        File log = new File(Environment.getExternalStorageDirectory() + "/" + code + "_last_err.log");
+        if (log.exists()) {
+            lastError = com.quseit.util.FileHelper.getFileContents(log.getAbsolutePath());
+        }
+
+        String body = MessageFormat.format(getString(R.string.feedback_email_body), Build.PRODUCT,
+                Build.VERSION.RELEASE, Build.VERSION.SDK, lastError, feedback);
+
+        Intent intent = new Intent(Intent.ACTION_SENDTO, Uri.parse("mailto:" + getString(R.string.ui_feedback_mail)));
+
+        intent.putExtra(Intent.EXTRA_SUBJECT, subject);
+        intent.putExtra(Intent.EXTRA_TEXT, session == null ? body : session.getTranscriptText().trim());
+        try {
+            startActivity(Intent.createChooser(intent,
+                    getString(R.string.email_transcript_chooser_title)));
+        } catch (ActivityNotFoundException e) {
+            Toast.makeText(this,
+                    R.string.email_transcript_no_email_activity_found,
+                    Toast.LENGTH_LONG)
+                    .show();
+        }
+    }
+
+    protected boolean checkExpired(final String resource, String filesDir, String tag) {
+        ResourceManager resourceManager = new ResourceManager(this);
+
+        String data_version = resourceManager.getString(resource + "_version");
+        String disk_version = "0";
+
+        // If no version, no unpacking is necessary.
+        if (data_version == null) {
+            return false;
+        }
+
+        // Check the current disk version, if any.
+        String disk_version_fn = filesDir + "/lib/" + tag + "_" + resource + ".version";
+
+        try {
+            byte buf[] = new byte[64];
+            InputStream is = new FileInputStream(disk_version_fn);
+            int len = is.read(buf);
+            disk_version = new String(buf, 0, len);
+            is.close();
+        } catch (Exception e) {
+
+            disk_version = "0";
+            //Mint.logException(e);
+
+        }
+
+        //LogUtil.d(TAG, "data_version:"+Math.round(Double.parseDouble(data_version))+"-disk_version:"+Math.round(Double.parseDouble(disk_version))+"-RET:"+(int)(Double.parseDouble(data_version)-Double.parseDouble(disk_version)));
+        if ((int) (Double.parseDouble(data_version) - Double.parseDouble(disk_version)) > 0 || disk_version.equals("0")) {
+            try {
+                FileOutputStream os = new FileOutputStream(disk_version_fn);
+                try {
+                    os.write(data_version.getBytes());
+                    os.close();
+
+                } catch (IOException e) {
+                    e.printStackTrace();
+                    //Mint.logException(e);
+
+                }
+
+            } catch (FileNotFoundException e) {
+                e.printStackTrace();
+                //Mint.logException(e);
+
+            }
+
+
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    public interface PermissionAction {
+        void onGrant();
+
+        void onDeny();
+    }
+
+    public void ifLogin(Login afterLogin) {
+        if (!TextUtils.isEmpty(TokenManager.getToken())) {
+            afterLogin.process();
+        } else {
+            Toast.makeText(this, R.string.login_first, Toast.LENGTH_SHORT).show();
+        }
+    }
+
+    public interface Login {
+        void process();
+    }
+
+}
diff --git a/qpython/src/op/java/org/qpython/qpy/main/activity/FundingPurchaseActivity.java b/qpython/src/op/java/org/qpython/qpy/main/activity/FundingPurchaseActivity.java
new file mode 100644
index 00000000..afd953e4
--- /dev/null
+++ b/qpython/src/op/java/org/qpython/qpy/main/activity/FundingPurchaseActivity.java
@@ -0,0 +1,107 @@
+package org.qpython.qpy.main.activity;
+
+import android.content.Context;
+import android.content.Intent;
+import android.databinding.DataBindingUtil;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.text.TextUtils;
+import android.view.View;
+import android.widget.Toast;
+
+//import com.hipipal.qpyplus.wxapi.PaymentStatus;
+//import com.hipipal.qpyplus.wxapi.WXAPIManager;
+//import com.hipipal.qpyplus.wxapi.WeixinPay;
+import com.quseit.util.VeDate;
+
+import org.greenrobot.eventbus.Subscribe;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.qpython.qpy.R;
+import org.qpython.qpy.databinding.ActivityFundingPurchaseBinding;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.utils.UpdateHelper;
+
+import rx.Observer;
+
+/**
+ * Created by Hmei
+ * 1/30/18.
+ */
+
+public class FundingPurchaseActivity extends PayActivity {
+    private static final String FUNDING_COUNT = "fundingCount";
+    private ActivityFundingPurchaseBinding binding;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        binding = DataBindingUtil.setContentView(this, R.layout.activity_funding_purchase);
+        initView();
+        String[] count = getResources().getStringArray(R.array.funding_count_divider);
+        String[] prices = getResources().getStringArray(R.array.wechat_funding_price);
+        String price = null;
+        int fundingCount = getIntent().getIntExtra(FUNDING_COUNT, 0);
+        for (int i = 0; i < count.length; i++) {
+            if ((Integer.parseInt(count[i]) - fundingCount) > 0) {
+                price = prices[i];
+                break;
+            }
+        }
+        if (TextUtils.isEmpty(price)) price = prices[prices.length - 1];
+        binding.price.setText(getString(R.string.rmb, price));
+        String finalPrice = price;
+//        binding.price.setOnClickListener(v -> payUtil.purchase(finalPrice, getIntent().getStringExtra(ARTICLE_ID), new Observer<WeixinPay>() {
+//            @Override
+//            public void onCompleted() {
+//                binding.pb.setVisibility(View.GONE);
+//                // 统计赞赏数据
+//                JSONObject jsonObject = new JSONObject();
+//                try {
+//                    jsonObject.put("type", finalPrice);
+//                    jsonObject.put("time", VeDate.getStringDateHourAsInt());
+//                    int percent = getIntent().getIntExtra(FUNDING_COUNT, 0);
+//                    String[] fundingCount = getResources().getStringArray(R.array.funding_count_divider);
+//                    jsonObject.put("crowdfunding",
+//                            percent > (Integer.parseInt(fundingCount[1]) / Integer.parseInt(fundingCount[2])) ? 3 :
+//                                    percent > (Integer.parseInt(fundingCount[0]) / Integer.parseInt(fundingCount[1])) ? 2 : 1);//0 非众筹/ 1: 0-100 /2: 100-500/3 500-2000
+//                    jsonObject.put("articleId", getIntent().getStringExtra(ARTICLE_ID));
+//                    if (App.getUser() != null) {
+//                        jsonObject.put("account", App.getUser().getEmail());
+//                    }
+//                } catch (JSONException e) {
+//                    e.printStackTrace();
+//                }
+//                UpdateHelper.submitIAPLog(FundingPurchaseActivity.this, mOrderNo, App.getGson().toJson(jsonObject));
+//            }
+//
+//            @Override
+//            public void onError(Throwable e) {
+//                Toast.makeText(FundingPurchaseActivity.this, R.string.conn_error, Toast.LENGTH_SHORT).show();
+//                binding.pb.setVisibility(View.GONE);
+//            }
+//
+//            @Override
+//            public void onNext(WeixinPay weixinPay) {
+//                WXAPIManager.wxPayReq(weixinPay);
+//                mOrderNo = weixinPay.out_trade_no;
+//            }
+//        }));
+    }
+
+    public static void startSupport(Context context, String articleId, int fundingPercent) {
+        Intent starter = new Intent(context, FundingPurchaseActivity.class);
+        starter.putExtra(ARTICLE_ID, articleId);
+        starter.putExtra(FUNDING_COUNT, fundingPercent);
+        context.startActivity(starter);
+    }
+
+    private void initView() {
+        setSupportActionBar(binding.lt.toolbar);
+        binding.lt.toolbar.setNavigationIcon(R.drawable.ic_back);
+        binding.lt.toolbar.setNavigationOnClickListener(v -> finish());
+        setTitle(R.string.reward);
+        binding.tvThanks.setVisibility(View.VISIBLE);
+        binding.price.setVisibility(View.VISIBLE);
+    }
+}
diff --git a/qpython/src/op/java/org/qpython/qpy/main/activity/PayActivity.java b/qpython/src/op/java/org/qpython/qpy/main/activity/PayActivity.java
new file mode 100644
index 00000000..89e16879
--- /dev/null
+++ b/qpython/src/op/java/org/qpython/qpy/main/activity/PayActivity.java
@@ -0,0 +1,72 @@
+package org.qpython.qpy.main.activity;
+
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.app.AppCompatActivity;
+import android.view.View;
+import android.widget.Toast;
+
+
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.qpython.qpy.R;
+import org.qpython.qpy.main.service.PayUtil;
+
+import rx.Observer;
+
+/**
+ * Created by Hmei
+ * 1/31/18.
+ */
+
+public class PayActivity extends AppCompatActivity {
+    protected static final String ARTICLE_ID      = "article_id";
+    protected String mOrderNo;
+    protected PayUtil payUtil;
+
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        payUtil = new PayUtil(this);
+        EventBus.getDefault().register(this);
+    }
+
+    @Subscribe
+    public void onPayResp(String msg) {
+//        if (msg.equals(PaymentStatus.SUCCESS)) {
+//            payUtil.checkOrderStatus(mOrderNo,new Observer<PaymentStatus>() {
+//                @Override
+//                public void onCompleted() {
+//
+//                }
+//
+//                @Override
+//                public void onError(Throwable e) {
+//                    e.printStackTrace();
+//                    if (findViewById(R.id.pb) != null)
+//                        findViewById(R.id.pb).setVisibility(View.GONE);
+//                    Toast.makeText(PayActivity.this, "支付失败！", Toast.LENGTH_SHORT).show();
+//                }
+//
+//                @Override
+//                public void onNext(PaymentStatus paymentStatus) {
+//                    if (paymentStatus.isSuccess()) {
+//                        if (findViewById(R.id.pb) != null)
+//                            findViewById(R.id.pb).setVisibility(View.GONE);
+//                        Toast.makeText(PayActivity.this, "感谢您的支持！", Toast.LENGTH_SHORT).show();
+//                        finish();
+//                    } else {
+//                        payUtil.checkOrderStatus(mOrderNo,this);
+//                    }
+//                }
+//            });
+//        }
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        EventBus.getDefault().unregister(this);
+    }
+}
diff --git a/qpython/src/op/java/org/qpython/qpy/main/activity/PurchaseActivity.java b/qpython/src/op/java/org/qpython/qpy/main/activity/PurchaseActivity.java
new file mode 100644
index 00000000..8520aa06
--- /dev/null
+++ b/qpython/src/op/java/org/qpython/qpy/main/activity/PurchaseActivity.java
@@ -0,0 +1,149 @@
+package org.qpython.qpy.main.activity;
+
+import android.content.Context;
+import android.content.Intent;
+import android.databinding.DataBindingUtil;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.widget.GridLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Toast;
+
+//import com.hipipal.qpyplus.wxapi.PaymentStatus;
+//import com.hipipal.qpyplus.wxapi.WXAPIManager;
+//import com.hipipal.qpyplus.wxapi.WeixinPay;
+import com.quseit.util.ImageUtil;
+import com.quseit.util.VeDate;
+
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.qpython.qpy.R;
+import org.qpython.qpy.databinding.ActivityPurchaseBinding;
+import org.qpython.qpy.databinding.ItemPriceBinding;
+import org.qpython.qpy.main.adapter.MyViewHolder;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.app.User;
+import org.qpython.qpy.main.service.PayUtil;
+import org.qpython.qpy.main.widget.GridSpace;
+import org.qpython.qpy.utils.UpdateHelper;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import rx.Observer;
+import rx.Subscription;
+import rx.android.schedulers.AndroidSchedulers;
+import rx.schedulers.Schedulers;
+
+/**
+ * Weixin purchase activity
+ * Created by Hmei on 2017-07-19.
+ */
+
+public class PurchaseActivity extends PayActivity {
+    private static String[] prices = new String[]{"6", "12", "18", "24", "30", "36"};
+
+    private ActivityPurchaseBinding binding;
+    private String                  articleId;
+
+    public static void start(Context context, String articleId) {
+        Intent starter = new Intent(context, PurchaseActivity.class);
+        starter.putExtra(ARTICLE_ID, articleId);
+        context.startActivity(starter);
+    }
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        binding = DataBindingUtil.setContentView(this, R.layout.activity_purchase);
+        articleId = getIntent().getStringExtra(ARTICLE_ID);
+        initView();
+        getPrices();
+    }
+
+    private void initView() {
+        setSupportActionBar(binding.lt.toolbar);
+        binding.lt.toolbar.setNavigationIcon(R.drawable.ic_back);
+        binding.lt.toolbar.setNavigationOnClickListener(v -> finish());
+        setTitle(R.string.reward);
+    }
+
+    private void getPrices() {
+        invalidateData();
+        GridSpace gridSpace = new GridSpace(2, (int) ImageUtil.dp2px(16), false);
+        binding.list.setLayoutManager(new GridLayoutManager(PurchaseActivity.this, 2));
+        binding.list.addItemDecoration(gridSpace);
+        binding.list.setAdapter(new ListAdapter(prices));
+    }
+
+    private void invalidateData() {
+        binding.tvThanks.setVisibility(View.VISIBLE);
+        binding.list.setVisibility(View.VISIBLE);
+        binding.noData.llRoot.setVisibility(View.GONE);
+    }
+
+    private class ListAdapter extends RecyclerView.Adapter<MyViewHolder<ItemPriceBinding>> {
+        String[] dataList;
+
+        ListAdapter(String[] dataList) {
+            this.dataList = dataList;
+        }
+
+        @Override
+        public MyViewHolder<ItemPriceBinding> onCreateViewHolder(ViewGroup parent, int viewType) {
+            ItemPriceBinding binding = DataBindingUtil.inflate(LayoutInflater.from(PurchaseActivity.this), R.layout.item_price, parent, false);
+            MyViewHolder<ItemPriceBinding> holder = new MyViewHolder<>(binding.getRoot());
+            holder.setBinding(binding);
+            return holder;
+        }
+
+        @Override
+        public void onBindViewHolder(MyViewHolder<ItemPriceBinding> holder, int position) {
+            ItemPriceBinding itemBinding = holder.getBinding();
+            itemBinding.tvPrices.setText(dataList[position]);
+//            itemBinding.tvPrices.setOnClickListener(v -> payUtil.purchase(dataList[position], articleId, new Observer<WeixinPay>() {
+//                @Override
+//                public void onCompleted() {
+//                    binding.pb.setVisibility(View.GONE);
+//                    JSONObject jsonObject = new JSONObject();
+//                    try {
+//                        jsonObject.put("type", dataList[position]);
+//                        jsonObject.put("time", VeDate.getStringDateHourAsInt());
+//                        jsonObject.put("crowdfunding",0);//0 非众筹/ 1: 0-100 /2: 100-500/3 500-2000
+//                        jsonObject.put("articleId", articleId);
+//                        if (App.getUser() != null) {
+//                            jsonObject.put("account", App.getUser().getEmail());
+//                        }
+//                    } catch (JSONException e) {
+//                        e.printStackTrace();
+//                    }
+//                    UpdateHelper.submitIAPLog(PurchaseActivity.this, mOrderNo, App.getGson().toJson
+//                            (jsonObject));
+//                }
+//
+//                @Override
+//                public void onError(Throwable e) {
+//                    e.printStackTrace();
+//                    Toast.makeText(PurchaseActivity.this, "connection error!", Toast.LENGTH_SHORT).show();
+//                    binding.pb.setVisibility(View.GONE);
+//                }
+//
+//                @Override
+//                public void onNext(WeixinPay weixinPay) {
+//                    WXAPIManager.wxPayReq(weixinPay);
+//                    mOrderNo = weixinPay.out_trade_no;
+//                }
+//            }));
+        }
+
+        @Override
+        public int getItemCount() {
+            return dataList.length;
+        }
+    }
+}
diff --git a/qpython/src/op/java/org/qpython/qpy/main/activity/SignInActivity.java b/qpython/src/op/java/org/qpython/qpy/main/activity/SignInActivity.java
new file mode 100644
index 00000000..fe4bc7b8
--- /dev/null
+++ b/qpython/src/op/java/org/qpython/qpy/main/activity/SignInActivity.java
@@ -0,0 +1,95 @@
+package org.qpython.qpy.main.activity;
+
+import android.content.Intent;
+import android.databinding.DataBindingUtil;
+import android.net.Uri;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.app.AppCompatActivity;
+import android.text.Html;
+import android.util.Log;
+import android.view.View;
+import android.widget.Toast;
+
+//import com.hipipal.qpyplus.wxapi.WXAPIManager;
+
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.qpython.qpy.R;
+import org.qpython.qpy.databinding.ActivitySignInBinding;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.app.User;
+import org.qpython.qpy.main.server.gist.loginScreen.LoginControler;
+import org.qpython.qpy.main.server.gist.loginScreen.LoginView;
+
+/**
+ * SignIn
+ * Created by Hmei on 2017-08-04.
+ */
+
+public class SignInActivity extends AppCompatActivity implements LoginView{
+    private static final int RC_SIGN_IN = 54503;
+
+    private ActivitySignInBinding binding;
+    private LoginControler        mLoginControler;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        binding = DataBindingUtil.setContentView(this, R.layout.activity_sign_in);
+        binding.textView3.setText(Html.fromHtml(getString(R.string.by_signing_in_you_agree_to_out_privacy_policy_term_of_service)));
+        initListener();
+        EventBus.getDefault().register(this);
+        mLoginControler = new LoginControler(this);
+    }
+
+    private void initListener() {
+        binding.textView3.setOnClickListener(v -> startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.privacy_html)))));
+        binding.button2.setOnClickListener(v -> signIn());
+        binding.button3.setOnClickListener(v -> finish());
+    }
+
+    @Subscribe
+    public void loginFail(String result) {
+        Toast.makeText(this, R.string.login_failed, Toast.LENGTH_SHORT).show();
+    }
+
+    @Subscribe
+    public void loginSuccess(User user) {
+        Log.d("SignInActivity", "loginSuccess");
+
+    }
+
+    private void signIn() {
+
+//        WXAPIManager.wxLogin();
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        EventBus.getDefault().unregister(this);
+        mLoginControler.onDestroy();
+    }
+
+    @Override
+    public void showLoading() {
+        binding.progressBar2.setVisibility(View.VISIBLE);
+    }
+
+    @Override
+    public void hideLoading() {
+        binding.progressBar2.setVisibility(View.GONE);
+    }
+
+    @Override
+    public void showToast(String msg) {
+        Toast.makeText(this, msg, Toast.LENGTH_SHORT).show();
+    }
+
+    @Override
+    public void loginSuccess() {
+        setResult(RESULT_OK);
+        finish();
+    }
+}
diff --git a/qpython/src/op/java/org/qpython/qpy/main/activity/UserActivity.java b/qpython/src/op/java/org/qpython/qpy/main/activity/UserActivity.java
new file mode 100644
index 00000000..38bc570f
--- /dev/null
+++ b/qpython/src/op/java/org/qpython/qpy/main/activity/UserActivity.java
@@ -0,0 +1,78 @@
+package org.qpython.qpy.main.activity;
+
+import android.content.Context;
+import android.content.Intent;
+import android.databinding.DataBindingUtil;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.app.AlertDialog;
+import android.support.v7.app.AppCompatActivity;
+import android.widget.Toast;
+
+import com.quseit.util.ImageDownLoader;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.codeshare.CONSTANT;
+import org.qpython.qpy.codeshare.ShareCodeUtil;
+import org.qpython.qpy.databinding.ActivityUserBinding;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.app.CONF;
+
+import java.io.File;
+
+public class UserActivity extends AppCompatActivity {
+    ActivityUserBinding binding;
+
+    public static void start(Context context) {
+        Intent starter = new Intent(context, UserActivity.class);
+        context.startActivity(starter);
+    }
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        binding = DataBindingUtil.setContentView(this, R.layout.activity_user);
+        setSupportActionBar(binding.toolbar);
+        setTitle(getString(R.string.me));
+        binding.toolbar.setNavigationIcon(R.drawable.ic_back);
+        binding.toolbar.setNavigationOnClickListener(v -> finish());
+
+        ImageDownLoader.setImageFromUrl(this, binding.avatar, App.getUser().getAvatarUrl());
+        binding.name.setText(App.getUser().getNick());
+//        binding.email.setText(App.getUser().getEmail());
+
+        if (ShareCodeUtil.getInstance().getUsage() == -1) {
+            Toast.makeText(App.getContext(), "usage not init", Toast.LENGTH_SHORT).show();
+            ShareCodeUtil.getInstance().initUsage();
+        } else {
+            binding.usage.setText(getString(R.string.my_space, ShareCodeUtil.getInstance().getUsage()));
+        }
+        binding.logout.setOnClickListener(v -> logout());
+
+        initListener();
+    }
+
+    private void initListener() {
+        binding.myShareLayout.setOnClickListener(v -> MyGistActivity.startMyShare(this));
+    }
+
+    private void logout() {
+        new AlertDialog.Builder(this, R.style.MyDialog)
+                .setTitle(R.string.lout)
+                .setPositiveButton(R.string.yes, (dialog, which) -> {
+                    App.setUser(null);
+                    getPreferences(MODE_PRIVATE).edit().putBoolean(CONSTANT.IS_UPLOAD_INIT, false)
+                            .putString(CONSTANT.CLOUDED_MAP, "")
+                            .apply();
+                    finish();
+                })
+                .setNegativeButton(R.string.no, null)
+                .create()
+                .show();
+
+        File cloud_cache = new File(CONF.CLOUD_MAP_CACHE_PATH);
+        if (cloud_cache.exists()) {
+            cloud_cache.delete();
+        }
+    }
+}
\ No newline at end of file
diff --git a/qpython/src/op/java/org/qpython/qpy/main/app/AppInit.java b/qpython/src/op/java/org/qpython/qpy/main/app/AppInit.java
new file mode 100644
index 00000000..812871d8
--- /dev/null
+++ b/qpython/src/op/java/org/qpython/qpy/main/app/AppInit.java
@@ -0,0 +1,25 @@
+package org.qpython.qpy.main.app;
+
+import android.content.Context;
+import android.util.Log;
+
+import org.qpython.qpy.BuildConfig;
+import org.qpython.qpy.codeshare.ShareCodeUtil;
+//import com.hipipal.qpyplus.wxapi.WXAPIManager;
+
+/**
+ * 文 件 名: AppInit
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2018/3/8 15:13
+ * 修改时间：
+ * 修改备注：
+ */
+
+public class AppInit {
+
+    public static void init(Context context){
+        //wx
+//        WXAPIManager.init(context);
+        ShareCodeUtil.getInstance();
+    }
+}
diff --git a/qpython/src/op/java/org/qpython/qpy/main/fragment/ExplorerFragment.java b/qpython/src/op/java/org/qpython/qpy/main/fragment/ExplorerFragment.java
new file mode 100644
index 00000000..a5836685
--- /dev/null
+++ b/qpython/src/op/java/org/qpython/qpy/main/fragment/ExplorerFragment.java
@@ -0,0 +1,449 @@
+package org.qpython.qpy.main.fragment;
+
+import android.content.Intent;
+import android.databinding.DataBindingUtil;
+import android.graphics.Color;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.Environment;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.support.v7.app.AlertDialog;
+import android.support.v7.widget.LinearLayoutManager;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Toast;
+
+import com.quseit.util.FileHelper;
+import com.quseit.util.ImageUtil;
+import com.yanzhenjie.recyclerview.swipe.SwipeMenuCreator;
+import com.yanzhenjie.recyclerview.swipe.SwipeMenuItem;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.codeshare.ShareCodeUtil;
+import org.qpython.qpy.codeshare.pojo.CloudFile;
+import org.qpython.qpy.databinding.FragmentExplorerBinding;
+import org.qpython.qpy.main.activity.NotebookActivity;
+import org.qpython.qpy.main.activity.SignInActivity;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.app.CONF;
+import org.qpython.qpy.main.event.ShareCodeCallback;
+import org.qpython.qpy.texteditor.EditorActivity;
+import org.qpython.qpy.texteditor.TedLocalActivity;
+import org.qpython.qpy.texteditor.common.CommonEnums;
+import org.qpython.qpy.texteditor.common.RecentFiles;
+import org.qpython.qpy.texteditor.ui.adapter.FolderAdapter;
+import org.qpython.qpy.texteditor.ui.adapter.bean.FolderBean;
+import org.qpython.qpy.texteditor.ui.view.EnterDialog;
+import org.qpython.qpy.texteditor.widget.crouton.Crouton;
+import org.qpython.qpy.texteditor.widget.crouton.Style;
+import org.qpython.qpy.utils.FileUtils;
+import org.qpython.qpy.utils.NotebookUtil;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static com.quseit.util.FolderUtils.sortTypeByName;
+
+
+public class ExplorerFragment extends Fragment {
+    private static final int REQUEST_SAVE_AS   = 107;
+    private static final int REQUEST_HOME_PAGE = 109;
+    private static final int REQUEST_RECENT    = 111;
+    private static final int LOGIN_REQUEST     = 2741;
+
+    private static final String TYPE = "type";
+
+    private int WIDTH = (int) ImageUtil.dp2px(60);
+
+    private FragmentExplorerBinding binding;
+    private List<FolderBean>        folderList;
+    private FolderAdapter           adapter;
+    private Map<String, Boolean> cloudedMap = new HashMap<>();
+
+    private boolean openable = true; // 是否可打开文件
+
+    private int    type;
+    private String curPath;
+
+    public static ExplorerFragment newInstance(int type) {
+        ExplorerFragment myFragment = new ExplorerFragment();
+
+        Bundle args = new Bundle();
+        args.putInt(TYPE, type);
+        myFragment.setArguments(args);
+
+        return myFragment;
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.fragment_explorer, null);
+    }
+
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        binding = DataBindingUtil.bind(view);
+        type = getArguments().getInt(TYPE);
+        initView();
+        initListener();
+        initCloud();
+        switch (type) {
+            case REQUEST_RECENT:
+                binding.rlPath.setVisibility(View.GONE);
+                break;
+            case REQUEST_SAVE_AS:
+                binding.ivNewFolder.setVisibility(View.VISIBLE);
+                break;
+            case REQUEST_HOME_PAGE:
+                binding.ivNewFolder.setVisibility(View.VISIBLE);
+                break;
+        }
+    }
+
+    private void initView() {
+        SwipeMenuCreator swipeMenuCreator = (leftMenu, rightMenu, viewType) -> {
+//            SwipeMenuItem uploadItem = new SwipeMenuItem(getContext())
+//                    .setBackgroundColor(Color.parseColor("#FF4798F3"))
+//                    .setImage(R.drawable.ic_cloud_upload)
+//                    .setHeight(ViewGroup.LayoutParams.MATCH_PARENT)
+//                    .setWidth(WIDTH);
+
+            SwipeMenuItem renameItem = new SwipeMenuItem(getContext())
+                    .setBackgroundColor(Color.parseColor("#FF4BAC07"))
+                    .setImage(R.drawable.ic_file_rename)
+                    .setHeight(ViewGroup.LayoutParams.MATCH_PARENT)
+                    .setWidth(WIDTH);
+
+            SwipeMenuItem deleteItem = new SwipeMenuItem(getContext())
+                    .setBackgroundColor(Color.parseColor("#FFD14136"))
+                    .setImage(R.drawable.ic_editor_filetree_close)
+                    .setHeight(ViewGroup.LayoutParams.MATCH_PARENT)
+                    .setWidth(WIDTH);
+
+            switch (type) {
+                case REQUEST_RECENT:
+                    rightMenu.addMenuItem(deleteItem);
+                    break;
+                case REQUEST_SAVE_AS:
+                    rightMenu.addMenuItem(deleteItem);
+                    break;
+                case REQUEST_HOME_PAGE:
+                    //rightMenu.addMenuItem(uploadItem);
+                    rightMenu.addMenuItem(renameItem);
+                    rightMenu.addMenuItem(deleteItem);
+                    break;
+            }
+        };
+
+        folderList = new ArrayList<>();
+        adapter = new FolderAdapter(folderList, getArguments().getInt(TYPE) == REQUEST_RECENT);
+        adapter.setCloudMap(cloudedMap);
+        binding.swipeList.setLayoutManager(new LinearLayoutManager(getContext()));
+        binding.swipeList.setSwipeMenuCreator(swipeMenuCreator);
+        openDir(CONF.ABSOLUTE_PATH);
+    }
+
+    private void initListener() {
+        binding.ivNewFolder.setOnClickListener(v -> doNewDir());
+        binding.prevFolder.setOnClickListener(v -> {
+            String parentPath = new File(curPath).getParent();
+
+            if (parentPath.length()>=Environment.getExternalStorageDirectory().getAbsolutePath().length()) {
+                openDir(parentPath);
+            }
+        });
+        binding.swipeList.setSwipeMenuItemClickListener(menuBridge -> {
+            binding.swipeList.smoothCloseMenu();
+            switch (menuBridge.getPosition()) {
+                case 0:
+                    renameFile(menuBridge.getAdapterPosition());
+                    break;
+                case 1:
+                    deleteFile(menuBridge.getAdapterPosition());
+                    break;
+            }
+        });
+        adapter.setClickListener(new FolderAdapter.Click() {
+            @Override
+            public void onItemClick(int position) {
+                FolderBean item = folderList.get(position);
+                if (item.getType().equals(CommonEnums.FileType.FILE)) {
+                    if (!openable) {
+                        Toast.makeText(getActivity(), R.string.cant_open, Toast.LENGTH_SHORT).show();
+                        return;
+                    }
+                    //判断文件类型
+                    int lastDot = item.getName().lastIndexOf(".");
+                    if (lastDot != -1) {
+                        String ext = item.getName().substring(lastDot + 1);
+                        openFile(item.getFile(), ext);
+                    }
+                } else {
+                    openDir(item.getPath());
+                }
+            }
+
+            @Override
+            public void onLongClick(int position) {
+                binding.swipeList.smoothOpenRightMenu(position);
+            }
+        });
+
+        binding.swipeList.setAdapter(adapter);
+    }
+
+    private void gotoSetting() {
+        org.qpython.qpy.main.activity.SettingActivity.startActivity(getActivity());
+    }
+    private void openFile(File file, String ext) {
+        List<String> textExts = Arrays.asList(getContext().getResources().getStringArray(R.array.text_ext));
+        if (textExts.contains(ext)) {
+            EditorActivity.start(getContext(), Uri.fromFile(file));
+        } else if (ext.equals("ipynb")) {
+            boolean notebookenable = NotebookUtil.isNotebookEnable(getActivity());
+            if (notebookenable) {
+                NotebookActivity.start(getActivity(), file.getAbsolutePath(), false);
+            } else {
+
+                new AlertDialog.Builder(getActivity(),R.style.MyDialog)
+                        .setTitle(R.string.dialog_alert)
+                        .setMessage(getString(R.string.ennable_notebook_first))
+                        .setNegativeButton(R.string.cancel, (dialog1, which) -> dialog1.dismiss())
+                        .setPositiveButton(R.string.ok, (dialog1, which) -> gotoSetting())
+                        .create()
+                        .show();
+
+                //Toast.makeText(getActivity(), R.string.ennable_notebook_first, Toast.LENGTH_SHORT).show();
+            }
+        } else {
+            FileUtils.openFile(getContext(), file);
+        }
+    }
+
+    private void uploadFile(int adapterPosition) {
+        File file = folderList.get(adapterPosition).getFile();
+
+        // only support type in <R.array.support_file_ext>
+        String ext = "";
+        if (file.getName().lastIndexOf(".") > 0) {
+            ext = file.getName().substring(file.getName().lastIndexOf(".") + 1);
+        }
+        boolean isSupport = false;
+        if (!file.isDirectory()) {
+            for (String s : getResources().getStringArray(R.array.support_file_ext)) {
+                if (s.equals(ext)) {
+                    isSupport = true;
+                    break;
+                }
+            }
+        } else {
+            isSupport = true;
+        }
+
+        if (!isSupport) {
+            Toast.makeText(getContext(), R.string.not_support_type_hint, Toast.LENGTH_SHORT).show();
+            return;
+        }
+
+        // only available for already login user
+        if (App.getUser() == null) {
+            new AlertDialog.Builder(getActivity(), R.style.MyDialog)
+                    .setTitle(R.string.need_login)
+                    .setMessage(R.string.upload_login_hint)
+                    .setNegativeButton(R.string.no, null)
+                    .setPositiveButton(getString(R.string.login_now), (dialog, which) ->
+                            startActivityForResult(new Intent(getActivity(), SignInActivity.class), LOGIN_REQUEST)
+                    )
+                    .create()
+                    .show();
+            return;
+        }
+
+        // upload
+
+        File folder = folderList.get(adapterPosition).getFile();
+        folderList.get(adapterPosition).setUploading(true);
+        adapter.notifyItemChanged(adapterPosition);
+        if (folder.isDirectory()) {
+            //ShareCodeUtil.getInstance().uploadFolder(folder, callback, 0);
+        } else {
+            //ShareCodeUtil.getInstance().uploadFile(folder, callback);
+        }
+    }
+
+    private void renameFile(int adapterPosition) {
+        new EnterDialog(getContext())
+            .setTitle(getString(R.string.rename))
+            .setConfirmListener(name -> {
+                File oldFile = folderList.get(adapterPosition).getFile();
+                File newFile = new File(oldFile.getParent(), name);
+                boolean renameSuc = oldFile.renameTo(newFile);
+                if (renameSuc) {
+                    folderList.set(adapterPosition, new FolderBean(newFile));
+                    adapter.notifyItemChanged(adapterPosition);
+                    return true;
+                } else {
+                    Toast.makeText(getActivity(), R.string.rename_fail, Toast.LENGTH_SHORT).show();
+                    return false;
+                }
+            })
+            .setText(folderList.get(adapterPosition).getName())
+            .show();
+    }
+
+    private void deleteFile(int adapterPosition) {
+        switch (type) {
+            case REQUEST_RECENT:
+                RecentFiles.removePath(folderList.get(adapterPosition).getPath());
+                folderList.remove(adapterPosition);
+                adapter.notifyDataSetChanged();
+                break;
+            case REQUEST_HOME_PAGE:
+            case REQUEST_SAVE_AS:
+                AlertDialog.Builder builder = new AlertDialog.Builder(getActivity(), R.style.MyDialog);
+                builder.setTitle(R.string.warning)
+                        .setMessage(R.string.delete_file_hint)
+                        .setNegativeButton(R.string.no, null)
+                        .setPositiveButton(R.string.yes, (dialog, which) -> {
+                            FileHelper.clearDir(folderList.get(adapterPosition).getFile().getAbsolutePath(), 0, true);
+                            folderList.remove(adapterPosition);
+                            adapter.notifyItemRemoved(adapterPosition);
+                            adapter.notifyDataSetChanged();
+                        })
+                        .show();
+                break;
+        }
+    }
+
+    private void openDir(String dirPath) {
+        if (type == REQUEST_RECENT) {
+            folderList.clear();
+            for (String path : RecentFiles.getRecentFiles()) {
+                folderList.add(new FolderBean(new File(path)));
+            }
+
+            if (folderList.size() == 0) {
+                binding.emptyHint.setVisibility(View.VISIBLE);
+            } else {
+                binding.emptyHint.setVisibility(View.GONE);
+                adapter.notifyDataSetChanged();
+            }
+        } else {
+            File dir = new File(dirPath);
+            if (dir.exists()) {
+                File[] files = dir.listFiles();
+                if (files != null) {
+                    Arrays.sort(files, sortTypeByName);
+                    folderList.clear();
+                    for (File file : files) {
+                        //if (!file.getName().startsWith(".")) {
+                        folderList.add(new FolderBean(file));
+                        //}
+                    }
+                    adapter.notifyDataSetChanged();
+                    binding.tvPath.setText(dirPath);
+                    curPath = dirPath;
+                    adapter.notifyDataSetChanged();
+
+                }
+            } else {
+                Toast.makeText(getContext(), R.string.file_not_exists, Toast.LENGTH_SHORT).show();
+            }
+        }
+    }
+
+    private void doNewDir() {
+        new EnterDialog(getContext())
+                .setTitle(getString(R.string.new_folder))
+                .setHint(getString(R.string.folder_name))
+                .setConfirmListener(name -> {
+                    File dirN = new File(curPath, name.equals("") ? getString(R.string.untitled_folder) : name);
+                    if (dirN.exists()) {
+                        Crouton.makeText(getActivity(), getString(R.string.toast_folder_exist), Style.ALERT).show();
+                        return false;
+                    } else {
+                        if (dirN.mkdirs()) {
+                            openDir(curPath + "/" + name);
+                        } else {
+                            Toast.makeText(getContext(), R.string.mkdir_fail, Toast.LENGTH_SHORT).show();
+                        }
+                        return true;
+                    }
+                })
+                .show();
+    }
+
+    public void backToPrev() {
+
+        String qpyDir = Environment.getExternalStorageDirectory().getAbsolutePath()+"/qpython";
+
+        if (curPath == null || qpyDir.equals(curPath) || Environment.getExternalStorageDirectory().getAbsolutePath().equals(curPath)) {
+            getActivity().finish();
+        } else {
+            String parentPath = new File(curPath).getParent();
+            openDir(parentPath);
+        }
+    }
+
+    private void updateClouded(File file) {
+        cloudedMap.put(file.getAbsolutePath(), true);
+        if (file.isDirectory()) {
+            for (File file1 : file.listFiles()) {
+                if (file1.isDirectory()) {
+                    updateClouded(file1);
+                } else {
+                    cloudedMap.put(file.getAbsolutePath(), true);
+                }
+            }
+        }
+    }
+
+    public String getCurPath() {
+        return curPath;
+    }
+
+    private void initCloud() {
+        if (App.getUser() == null) {
+            return;
+        }
+        //获取云端脚本
+
+    }
+
+    private void savePath(String path) {
+        String[] paths = path.split("/");
+        StringBuffer realPath = new StringBuffer(CONF.ABSOLUTE_PATH);
+        for (String p : paths) {
+            if (!TextUtils.isEmpty(p)) {
+                realPath.append("/");
+                realPath.append(p);
+                if (!p.equals("projects") && !p.equals("scripts") && !cloudedMap.keySet().contains(realPath.toString()))
+                    cloudedMap.put(realPath.toString(), true);
+            }
+        }
+    }
+
+    public void deleteCloudedMap(String absolutePath) {
+        if (cloudedMap.containsKey(absolutePath)) {
+            cloudedMap.remove(absolutePath);
+            adapter.notifyDataSetChanged();
+        }
+    }
+
+    public void updateCloudedFiles(Map<String, Boolean> map) {
+        if (map != null) {
+            cloudedMap.putAll(map);
+        }
+        adapter.notifyDataSetChanged();
+    }
+}
+// GIT TEST
\ No newline at end of file
diff --git a/qpython/src/op/java/org/qpython/qpy/main/fragment/MyProjectFragment.java b/qpython/src/op/java/org/qpython/qpy/main/fragment/MyProjectFragment.java
new file mode 100644
index 00000000..ddeda639
--- /dev/null
+++ b/qpython/src/op/java/org/qpython/qpy/main/fragment/MyProjectFragment.java
@@ -0,0 +1,277 @@
+package org.qpython.qpy.main.fragment;
+
+import android.content.SharedPreferences;
+import android.databinding.DataBindingUtil;
+import android.graphics.Color;
+import android.os.Bundle;
+import android.preference.PreferenceManager;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.support.v7.app.AlertDialog;
+import android.support.v7.widget.LinearLayoutManager;
+import android.text.Html;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Toast;
+
+import com.google.gson.reflect.TypeToken;
+import com.quseit.util.DateTimeHelper;
+import com.quseit.util.ImageUtil;
+import com.yanzhenjie.recyclerview.swipe.SwipeMenuCreator;
+import com.yanzhenjie.recyclerview.swipe.SwipeMenuItem;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.codeshare.ShareCodeUtil;
+import org.qpython.qpy.codeshare.pojo.CloudFile;
+import org.qpython.qpy.databinding.FragmentRefreshRvBinding;
+import org.qpython.qpy.main.adapter.CloudScriptAdapter;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.app.CONF;
+import org.qpython.qpy.main.event.ShareCodeCallback;
+import org.qpython.qpy.texteditor.TedLocalActivity;
+import org.qpython.qpysdk.QPyConstants;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+import rx.Observable;
+import rx.android.schedulers.AndroidSchedulers;
+
+import static android.content.Context.MODE_PRIVATE;
+import static org.qpython.qpy.codeshare.CONSTANT.CLOUDED_MAP;
+import static org.qpython.qpy.codeshare.CONSTANT.IS_UPLOAD_INIT;
+
+public class MyProjectFragment extends Fragment {
+    private int WIDTH = (int) ImageUtil.dp2px(60);
+    private FragmentRefreshRvBinding binding;
+    private CloudScriptAdapter adapter;
+    private List<CloudFile> scriptList = new ArrayList<>();
+    private boolean isSaverOn;
+    public boolean isLoading;
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) {
+        binding = DataBindingUtil.bind(LayoutInflater.from(getContext()).inflate(R.layout.fragment_refresh_rv, null));
+        return binding.getRoot();
+    }
+
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        scriptList = new ArrayList<>();
+        adapter = new CloudScriptAdapter(scriptList);
+        isSaverOn = PreferenceManager.getDefaultSharedPreferences(getContext()).getBoolean(getString(R.string.key_saver), true);
+        initView();
+        initListener();
+        retry(!isSaverOn);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        if (adapter != null) {
+            adapter.notifyDataSetChanged();
+        }
+    }
+
+    @Override
+    public void onStop() {
+        super.onStop();
+        locatedCloud(scriptList);
+    }
+
+    public void retry(boolean forceRefresh) {
+        if (scriptList != null && adapter != null) {
+            scriptList.clear();
+            adapter.notifyDataSetChanged();
+        }
+        startProgressBar();
+        isLoading = true;
+        // TODO: 2017/12/4 获取云端脚本
+
+    }
+
+    public void notifyDataSetChange(){
+        if (adapter!=null){
+            adapter.notifyDataSetChanged();
+        }
+    }
+
+    /**
+     * 保存云端文件目录到本地
+     */
+    private void locatedCloud(List<CloudFile> cloudFiles) {
+        if (cloudFiles.size() > 0) {
+            HashMap<String, Boolean> clouded = new HashMap<>();
+            for (CloudFile cloudFile : cloudFiles) {
+                if (cloudFile.getPath().contains("/projects/")) {
+                    clouded.put(CONF.ABSOLUTE_PATH + "/projects/" + cloudFile.getProjectName(), true);
+                }
+                clouded.put(CONF.ABSOLUTE_PATH + cloudFile.getPath(), true);
+            }
+            SharedPreferences sp = getActivity().getPreferences(MODE_PRIVATE);
+            Type type = new TypeToken<HashMap<String, Boolean>>() {
+            }.getType();
+            sp.edit().putBoolean(IS_UPLOAD_INIT, true)
+                    .putString(CLOUDED_MAP, App.getGson().toJson(clouded, type)).apply();
+        }
+    }
+
+    private void startProgressBar() {
+        binding.progressBar.setVisibility(View.VISIBLE);
+        binding.netError.setVisibility(View.GONE);
+        Observable.just(null)
+                .delay(5, TimeUnit.SECONDS)
+                .observeOn(AndroidSchedulers.mainThread())
+                .doOnNext(o -> showNetErrorText())
+                .subscribe();
+    }
+
+    private void showEmpty() {
+        if (binding.progressBar.getVisibility() == View.VISIBLE) {
+            binding.progressBar.setVisibility(View.GONE);
+            binding.netError.setText(R.string.cloud_empty_hint);
+            binding.netError.setVisibility(View.VISIBLE);
+        }
+    }
+
+    private void showNetErrorText() {
+        if (binding.progressBar.getVisibility() == View.VISIBLE) {
+            binding.progressBar.setVisibility(View.GONE);
+            binding.netError.setText(R.string.net_lagging);
+            binding.netError.setVisibility(View.VISIBLE);
+        }
+    }
+
+    private void initView() {
+        SwipeMenuCreator swipeMenuCreator = (leftMenu, rightMenu, viewType) -> {
+            SwipeMenuItem deleteItem = new SwipeMenuItem(getContext())
+                    .setBackgroundColor(Color.parseColor("#FFD14136"))
+                    .setImage(R.drawable.ic_editor_filetree_close)
+                    .setHeight(ViewGroup.LayoutParams.MATCH_PARENT)
+                    .setWidth(WIDTH);
+
+            SwipeMenuItem downloadItem = new SwipeMenuItem(getContext())
+                    .setBackgroundColor(Color.parseColor("#FF4798F3"))
+                    .setImage(R.drawable.ic_cloud_download)
+                    .setHeight(ViewGroup.LayoutParams.MATCH_PARENT)
+                    .setWidth(WIDTH);
+            rightMenu.addMenuItem(downloadItem);
+            rightMenu.addMenuItem(deleteItem);
+        };
+        binding.swipeList.setLayoutManager(new LinearLayoutManager(getContext()));
+        binding.swipeList.setSwipeMenuCreator(swipeMenuCreator);
+    }
+
+    private void initListener() {
+        binding.netError.setOnClickListener(v -> retry(true));
+        binding.swipeList.setSwipeMenuItemClickListener(menuBridge -> {
+            menuBridge.closeMenu();
+            switch (menuBridge.getPosition()) {
+                case 0:
+                    CloudFile cloudFile = scriptList.get(menuBridge.getAdapterPosition());
+                    String path;
+                    path = QPyConstants.ABSOLUTE_PATH + cloudFile.getPath();
+                    File file = new File(path);
+                    if (file.exists()) {
+//                        new AlertDialog.Builder(getContext(), R.style.MyDialog)
+//                                .setTitle(R.string.override_hint)
+//                                .setMessage(Html.fromHtml(getString(R.string.conflict_hint,
+//                                        cloudFile.getUploadTime(),
+//                                        DateTimeHelper.AGO_FULL_DATE_FORMATTER.format(new Date(file.lastModified())))))
+//                                .setNegativeButton(R.string.no, null)
+//                                .setPositiveButton(R.string.yes, (dialog, which) -> writeFile(file, cloudFile, menuBridge.getAdapterPosition()))
+//                                .create()
+//                                .show();
+                    } else {
+                        //create file
+                        File dir = new File(path.substring(0, path.lastIndexOf("/")));
+                        if (!dir.exists()) {
+                            dir.mkdirs();
+                        }
+                        try {
+                            file.createNewFile();
+                        } catch (IOException e) {
+                            e.printStackTrace();
+                        }
+                        writeFile(file, cloudFile, menuBridge.getAdapterPosition());
+                    }
+                    break;
+                case 1:
+                    // delete
+                    scriptList.get(menuBridge.getAdapterPosition()).setUploading(true);
+                    adapter.notifyItemChanged(menuBridge.getAdapterPosition());
+                    // TODO: 2017/12/4 删除上传的脚本文件
+//                    ShareCodeUtil.getInstance().deleteUploadScript(scriptList.get(menuBridge.getAdapterPosition()), new LeancloudStorage.SaveFileCallback() {
+//                        @Override
+//                        public void onSuccess(int code) {
+//                            Toast.makeText(getContext(), R.string.delete_remote_suc, Toast.LENGTH_SHORT).show();
+//                            adapter.notifyItemRemoved(menuBridge.getAdapterPosition());
+//                            ((TedLocalActivity) getActivity()).deleteCloudFile(scriptList.get(menuBridge.getAdapterPosition()).getAbsolutePath());
+//                            scriptList.remove(menuBridge.getAdapterPosition());
+//                        }
+//
+//                        @Override
+//                        public void onFail(String msg) {
+//                            Toast.makeText(getContext(), "删除出错", Toast.LENGTH_SHORT).show();
+//                        }
+//                    });
+                    break;
+            }
+        });
+        adapter.setCallback((position) -> binding.swipeList.smoothOpenRightMenu(position));
+        binding.swipeList.setAdapter(adapter);
+    }
+
+    private void writeFile(File file, CloudFile cloudFile, int adapterPosition) {
+        cloudFile.setUploading(true);
+        adapter.notifyDataSetChanged();
+//        ShareCodeUtil.getInstance().downloadFile(cloudFile.getFileObject().getFileId(), new LeancloudStorage.DownloadCallback() {
+//            @Override
+//            public void onSuccess(String content) {
+//                try {
+//                    FileWriter writer = new FileWriter(file, false);
+//                    writer.write(content);
+//                    writer.close();
+//                } catch (IOException e) {
+//                    e.printStackTrace();
+//                    cloudFile.setUploading(false);
+//                    adapter.notifyDataSetChanged();
+//                    Toast.makeText(getContext(), R.string.override_fail_hint, Toast.LENGTH_SHORT).show();
+//                }
+//                Toast.makeText(getContext(), R.string.file_downloaded, Toast.LENGTH_SHORT).show();
+//                cloudFile.setUploading(false);
+//                adapter.notifyItemChanged(adapterPosition);
+//            }
+//
+//            @Override
+//            public void onFail(String msg) {
+//
+//            }
+//
+//            @Override
+//            public void onProgress(int progress) {
+//
+//            }
+//        });
+    }
+
+    public void needRefresh(boolean isNewUpload) {
+        if (binding == null) {
+            // not init yet
+            return;
+        }
+        if (isNewUpload) {
+            retry(!isSaverOn);
+        }
+    }
+}
diff --git a/qpython/src/op/java/org/qpython/qpy/main/service/PayUtil.java b/qpython/src/op/java/org/qpython/qpy/main/service/PayUtil.java
new file mode 100644
index 00000000..273081a3
--- /dev/null
+++ b/qpython/src/op/java/org/qpython/qpy/main/service/PayUtil.java
@@ -0,0 +1,96 @@
+package org.qpython.qpy.main.service;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.view.View;
+import android.widget.Toast;
+
+//import com.hipipal.qpyplus.wxapi.PaymentStatus;
+//import com.hipipal.qpyplus.wxapi.WXAPIManager;
+//import com.hipipal.qpyplus.wxapi.WeixinPay;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.main.activity.PayActivity;
+import org.qpython.qpy.main.activity.SignInActivity;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.app.User;
+import org.qpython.qpy.main.server.MySubscriber;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import rx.Observable;
+import rx.Observer;
+import rx.Subscription;
+import rx.android.schedulers.AndroidSchedulers;
+import rx.schedulers.Schedulers;
+
+/**
+ * Created by Hmei
+ * 1/31/18.
+ */
+
+public class PayUtil {
+    private static final String             GET_ORDER_URL   = "https://api.wegox.net/create_order";
+    public static final  String             CHECK_ORDER_URL = "https://api.wegox.net/check_order";
+    private              List<Subscription> mSubscriptions  = new ArrayList<>();
+
+    private int checkCount = 0;
+    private Activity context;
+
+    public PayUtil(Activity context) {
+        this.context = context;
+    }
+
+    public void initIAP(PayCallback callback) {
+        callback.doAfterConn();
+    }
+
+    /**
+     * 赞赏
+     */
+//    public void purchase(String price, String articleId, Observer<WeixinPay> callback) {
+//        User user = App.getUser();
+//        if (user == null) {
+//            context.startActivity(new Intent(context, SignInActivity.class));
+//            return;
+//        }
+//        String userName = user.getUserName();
+//        String userId = user.getUserId();
+//        WXAPIManager.getWXService().requestPay(GET_ORDER_URL, price, userName, userId, articleId)
+//                .subscribeOn(Schedulers.io())
+//                .subscribeOn(AndroidSchedulers.mainThread())
+//                .observeOn(AndroidSchedulers.mainThread())
+//                .subscribe(callback);
+//    }
+
+    /**
+     * 查询订单
+     */
+//    public void checkOrderStatus(String mOrderNo, Observer<PaymentStatus> callback) {
+//        checkCount++;
+//        if (checkCount < 31) {
+//            Subscription subscription = WXAPIManager.getWXService().checkStatus(CHECK_ORDER_URL, mOrderNo)
+//                    .subscribeOn(Schedulers.io())
+//                    .observeOn(AndroidSchedulers.mainThread())
+//                    .subscribe(callback);
+//            mSubscriptions.add(subscription);
+//        } else {
+//            if (context.findViewById(R.id.pb) != null)
+//                context.findViewById(R.id.pb).setVisibility(View.GONE);
+//            Toast.makeText(context, "支付失败！", Toast.LENGTH_SHORT).show();
+//        }
+//    }
+
+    public void unbindPayService() {
+        for (Subscription subscription : mSubscriptions) {
+            if (subscription != null && subscription.isUnsubscribed()) {
+                subscription.unsubscribe();
+            }
+        }
+    }
+
+    public interface PayCallback {
+        void doAfterConn();
+    }
+}
diff --git a/qpython/src/op/java/org/qpython/qpy/sharecode/ShareCodeUtil.java b/qpython/src/op/java/org/qpython/qpy/sharecode/ShareCodeUtil.java
new file mode 100644
index 00000000..4e2aabaa
--- /dev/null
+++ b/qpython/src/op/java/org/qpython/qpy/sharecode/ShareCodeUtil.java
@@ -0,0 +1,137 @@
+package org.qpython.qpy.codeshare;
+
+import android.app.Activity;
+import android.content.SharedPreferences;
+import android.os.Handler;
+import android.preference.PreferenceManager;
+import android.widget.Toast;
+
+import com.google.gson.reflect.TypeToken;
+import com.quseit.util.ACache;
+import com.quseit.util.FileHelper;
+import com.quseit.util.NetStateUtil;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.codeshare.pojo.CloudFile;
+import org.qpython.qpy.codeshare.pojo.Gist;
+
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.event.ShareCodeCallback;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
+
+import static org.qpython.qpy.main.server.CacheKey.CLOUD_FILE;
+
+/**
+ * FireBase database util
+ * Created by Hmei on 2017-08-10.
+ */
+
+public class ShareCodeUtil {
+
+    public static final String USAGE = "usage";
+    public static final String PROJECT = "project";
+    public static final String SCRIPT = "script";
+    public static final String PROJECT_PATH = "/projects/";
+    public static final String SCRIPTS_PATH = "/scripts/";
+
+    private static final int MAX_FILE = 100;
+
+    private SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(App.getContext());
+    private int currentFileCount = -1;
+    private Handler mHandler = new Handler(App.getContext().getMainLooper());
+
+    private ShareCodeUtil() {
+        if (App.getUser() != null) {
+            initUsage();
+        }
+    }
+
+    public static ShareCodeUtil getInstance() {
+        return ShareCodeHolder.INSTANCE;
+    }
+
+    /**
+     * 上传文件夹
+     */
+
+    /**
+     * 管理文件内存
+     */
+    private List<CloudFile> getCacheFile() {
+        String content = ACache.get(App.getContext()).getAsString(CLOUD_FILE);
+        List<CloudFile> cloudFiles = App.getGson().fromJson(content, new TypeToken<List<CloudFile>>() {
+        }.getType());
+        return cloudFiles == null ? new ArrayList<>() : cloudFiles;
+    }
+
+    private void saveCacheFile(List<CloudFile> cloudFiles) {
+        ACache.get(App.getContext()).put(CLOUD_FILE, App.getGson().toJson(cloudFiles));
+    }
+
+    private void saveCacheFile(CloudFile cloudFile) {
+        List<CloudFile> list = getCacheFile();
+        if (!list.contains(cloudFile)) {
+            list.add(cloudFile);
+        }
+        saveCacheFile(list);
+    }
+
+    private void deleteCacheFile(CloudFile cloudFile) {
+        List<CloudFile> list = getCacheFile();
+        if (list.contains(cloudFile)) {
+            list.remove(cloudFile);
+        }
+        saveCacheFile(list);
+    }
+
+    private void clearCacheFile() {
+        ACache.get(App.getContext()).put(CLOUD_FILE, "");
+    }
+
+    /**
+     * 初始化用户文件空间
+     */
+    public void initUsage() {
+        // TODO
+    }
+
+    public int changeUsage(int change) {
+        currentFileCount += change;
+        sharedPreferences.edit().putInt(USAGE, currentFileCount).apply();
+        return currentFileCount;
+    }
+
+    public int getUsage() {
+        return currentFileCount;
+    }
+
+    private boolean hasSpace(int waiting) {
+        if (currentFileCount < 0) {
+            Toast.makeText(App.getContext(), "usage not init", Toast.LENGTH_SHORT).show();
+            return false;
+        } else {
+            return currentFileCount + waiting < MAX_FILE;
+        }
+    }
+
+    public interface CommentCallback {
+        void commentBean(Gist.CommentBean comment);
+    }
+
+    private static class ShareCodeHolder {
+        private static final ShareCodeUtil INSTANCE = new ShareCodeUtil();
+    }
+
+
+    private boolean isConnect() {
+        if (!NetStateUtil.isConnected(App.getContext())) {
+            Toast.makeText(App.getContext(), "connection error!", Toast.LENGTH_SHORT).show();
+            return false;
+        }
+        return true;
+    }
+}
\ No newline at end of file
diff --git a/qpython/src/op/java/org/qpython/qpy/sharecode/pojo/CloudFile.java b/qpython/src/op/java/org/qpython/qpy/sharecode/pojo/CloudFile.java
new file mode 100644
index 00000000..f6a44ea8
--- /dev/null
+++ b/qpython/src/op/java/org/qpython/qpy/sharecode/pojo/CloudFile.java
@@ -0,0 +1,85 @@
+package org.qpython.qpy.codeshare.pojo;
+
+
+import org.qpython.qpysdk.QPyConstants;
+
+import java.io.Serializable;
+
+import static org.qpython.qpy.codeshare.ShareCodeUtil.PROJECT;
+import static org.qpython.qpy.codeshare.ShareCodeUtil.PROJECT_PATH;
+import static org.qpython.qpy.codeshare.ShareCodeUtil.SCRIPT;
+import static org.qpython.qpy.codeshare.ShareCodeUtil.SCRIPTS_PATH;
+
+public class CloudFile implements Serializable {
+    private String projectName;
+    private String path;
+    private String uploadTime;
+    private String name;
+    private String content;
+    private String key;
+    private boolean uploading;
+
+    public String getPath() {
+        return path;
+    }
+
+    public void setPath(String path) {
+        this.path = path;
+    }
+
+    public String getUploadTime() {
+        return uploadTime;
+    }
+
+    public void setUploadTime(String uploadTime) {
+        this.uploadTime = uploadTime;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+
+    public long getContentSize() {
+        return content.length();
+    }
+
+    public String getProjectName() {
+        return projectName;
+    }
+
+    public void setProjectName(String projectName) {
+        this.projectName = projectName;
+    }
+
+    public boolean isUploading() {
+        return uploading;
+    }
+
+    public void setUploading(boolean uploading) {
+        this.uploading = uploading;
+    }
+
+    public String getKey() {
+        return key;
+    }
+
+    public void setKey(String key) {
+        this.key = key;
+    }
+
+    public String getAbsolutePath() {
+        return QPyConstants.ABSOLUTE_PATH + getPath();
+    }
+}
diff --git a/qpython/src/op/java/org/qpython/qpy/texteditor/TedLocalActivity.java b/qpython/src/op/java/org/qpython/qpy/texteditor/TedLocalActivity.java
new file mode 100644
index 00000000..f0b132f1
--- /dev/null
+++ b/qpython/src/op/java/org/qpython/qpy/texteditor/TedLocalActivity.java
@@ -0,0 +1,321 @@
+package org.qpython.qpy.texteditor;
+
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.content.res.Configuration;
+import android.databinding.DataBindingUtil;
+import android.graphics.drawable.Drawable;
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.support.v7.app.AlertDialog;
+import android.support.v7.app.AppCompatActivity;
+import android.text.InputType;
+import android.view.MotionEvent;
+import android.view.View;
+import android.widget.EditText;
+import android.widget.Toast;
+
+import com.google.gson.reflect.TypeToken;
+import com.quseit.util.FileHelper;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.codeshare.pojo.CloudFile;
+import org.qpython.qpy.databinding.ActivityLocalBinding;
+import org.qpython.qpy.main.activity.SignInActivity;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.app.CONF;
+import org.qpython.qpy.main.fragment.ExplorerFragment;
+import org.qpython.qpy.main.fragment.LocalFragment;
+import org.qpython.qpy.main.fragment.MyProjectFragment;
+import org.qpython.qpy.texteditor.ui.view.EnterDialog;
+import org.qpython.qpy.utils.NotebookUtil;
+import org.qpython.qpysdk.QPyConstants;
+
+import java.io.File;
+import java.lang.reflect.Type;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class TedLocalActivity extends AppCompatActivity {
+    public static final  int REQUEST_SAVE_AS    = 107;
+    public static final  int REQUEST_OPEN       = 108;
+    public static final  int REQUEST_HOME_PAGE  = 109;
+    public static final  int REQUEST_RECENT     = 111;
+    private static final int LOGIN_REQUEST_CODE = 4806;
+
+    private static final String EXTRA_REQUEST_CODE = "request_code";
+    private static final String FRAGMENT_EXPLORER  = "explorer";
+    private static final String FRAGMENT_CLOUD     = "cloud";
+    private static final String EXTRA_REQUEST_FN = "request_fn";
+
+    private ActivityLocalBinding binding;
+
+    private Fragment          firstPageFragment;
+    private MyProjectFragment myProjectFragment;
+
+    private boolean isExplorer  = true;
+    private boolean isNewUpload = false;
+    private String defaultFileName = "";
+
+    public static void start(Context context, int type) {
+        Intent starter = new Intent(context, TedLocalActivity.class);
+        starter.putExtra(EXTRA_REQUEST_CODE, type);
+        context.startActivity(starter);
+    }
+
+    public static void start(Activity context, int type, int requestCode,  String filename) {
+        Intent starter = new Intent(context, TedLocalActivity.class);
+        starter.putExtra(EXTRA_REQUEST_CODE, type);
+        starter.putExtra(EXTRA_REQUEST_FN, filename);
+
+        context.startActivityForResult(starter, requestCode);
+    }
+
+    public void finishForGetPath(String path) {
+        Intent intent = new Intent();
+        intent.putExtra("path", path);
+        setResult(Activity.RESULT_OK, intent);
+        finish();
+    }
+
+    public void finishForOpen(String path, boolean isProj) {
+        Intent intent = new Intent();
+        intent.putExtra("path", path);
+        intent.putExtra("isProj", isProj);
+        setResult(Activity.RESULT_OK, intent);
+        finish();
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        binding = DataBindingUtil.setContentView(this, R.layout.activity_local);
+        setSupportActionBar(binding.toolbar);
+        int type = getIntent().getIntExtra(EXTRA_REQUEST_CODE, REQUEST_HOME_PAGE);
+        initView();
+        initListener();
+        switch (type) {
+            case REQUEST_RECENT:
+                setTitle(R.string.recent);
+                binding.switchBtn.setVisibility(View.GONE);
+                firstPageFragment = ExplorerFragment.newInstance(type);
+                break;
+            case REQUEST_OPEN:
+                setTitle(R.string.open);
+                binding.switchBtn.setVisibility(View.GONE);
+                binding.explore.setVisibility(View.VISIBLE);
+                firstPageFragment = new LocalFragment();
+                break;
+            case REQUEST_SAVE_AS:
+                setTitle(R.string.save_as);
+                binding.vsSave.getRoot().setVisibility(View.VISIBLE);
+                initSaveListener();
+                String fn = getIntent().getStringExtra(EXTRA_REQUEST_FN);
+                if (fn!=null) {
+                    binding.vsSave.etName.setText(fn);
+                }
+
+                binding.switchBtn.setVisibility(View.GONE);
+                firstPageFragment = ExplorerFragment.newInstance(type);
+                break;
+            case REQUEST_HOME_PAGE:
+                setTitle(R.string.explorer);
+                firstPageFragment = ExplorerFragment.newInstance(type);
+                break;
+        }
+
+        getSupportFragmentManager().beginTransaction()
+                .add(R.id.container, firstPageFragment, FRAGMENT_EXPLORER)
+                .commit();
+    }
+
+    @Override
+    public void onConfigurationChanged(Configuration newConfig) {
+        super.onConfigurationChanged(newConfig);
+    }
+
+    private void initView() {
+        binding.toolbar.setNavigationIcon(R.drawable.ic_back);
+        binding.toolbar.setNavigationOnClickListener(v -> finish());
+        if (binding.switchBtn.getVisibility() == View.VISIBLE) {
+            myProjectFragment = new MyProjectFragment();
+        }
+    }
+
+    private void initListener() {
+        binding.switchBtn.setOnClickListener(v -> {
+            if (isExplorer) {
+                if (App.getUser() == null) {
+                    startActivityForResult(new Intent(this, SignInActivity.class), LOGIN_REQUEST_CODE);
+                    return;
+                }
+                binding.switchBtn.setImageResource(R.drawable.ic_folder_open);
+                binding.refresh.setVisibility(View.VISIBLE);
+                if (getSupportFragmentManager().findFragmentByTag(FRAGMENT_CLOUD) == null) {
+                    getSupportFragmentManager().beginTransaction().add(R.id.container, myProjectFragment, FRAGMENT_CLOUD).commit();
+                    getSupportFragmentManager().beginTransaction().hide(firstPageFragment).commit();
+                } else {
+                    getSupportFragmentManager().beginTransaction()
+                            .hide(firstPageFragment)
+                            .show(myProjectFragment)
+                            .commit();
+                }
+                myProjectFragment.needRefresh(isNewUpload);
+                isNewUpload = false;
+                if (!myProjectFragment.isLoading) {
+                    myProjectFragment.notifyDataSetChange();
+                }
+            } else {
+                binding.switchBtn.setImageResource(R.drawable.ic_cloud_list);
+                binding.refresh.setVisibility(View.GONE);
+                getSupportFragmentManager().beginTransaction()
+                        .hide(myProjectFragment)
+                        .show(firstPageFragment)
+                        .commit();
+            }
+            isExplorer = !isExplorer;
+        });
+
+        binding.refresh.setOnClickListener(v -> myProjectFragment.retry(true));
+
+        binding.explore.setOnClickListener(v -> {
+            start(this, REQUEST_HOME_PAGE);
+            finish();
+        });
+    }
+
+    public void doSave(String fn) {
+        if (fn.length() == 0) {
+            Toast.makeText(getApplicationContext(), R.string.toast_filename_empty, Toast.LENGTH_SHORT).show();
+        } else {
+            String filename = ((ExplorerFragment) firstPageFragment).getCurPath() + "/" + fn;
+            final File f = new File(filename);
+            if (f.exists()) {
+                AlertDialog.Builder builder = new AlertDialog.Builder(this, R.style.MyDialog);
+                builder.setTitle(R.string.confirm)
+                        .setMessage(R.string.editor_override)
+                        .setPositiveButton(R.string.yes, (dialog, which) -> {
+                            setSaveResult(f.getAbsolutePath());
+
+                        })
+                        .setNegativeButton(R.string.cancel, ((dialog, which) -> nothing()))
+                        .show();
+
+
+                //Toast.makeText(this, R.string.file_exist_hint, Toast.LENGTH_SHORT).show();
+            } else {
+                setSaveResult(f.getAbsolutePath());
+            }
+        }
+    }
+    private void nothing() {
+
+
+    }
+
+    protected boolean setSaveResult(String filepath) {
+        File f = new File(filepath);
+        if (f.getParentFile().canWrite()) {
+            finishForGetPath(filepath);
+        } else {
+            Toast.makeText(getApplicationContext(), R.string.toast_folder_cant_write, Toast.LENGTH_SHORT).show();
+        }
+        return true;
+    }
+
+    private void initSaveListener() {
+        binding.vsSave.btnSave.setOnClickListener(v -> doSave(binding.vsSave.etName.getText().toString()));
+        binding.vsSave.etName.setOnTouchListener((v, event) -> {
+            final int DRAWABLE_RIGHT = 2;
+            switch (event.getAction()) {
+                case MotionEvent.ACTION_DOWN:
+                    Drawable deleteText = ((EditText) v).getCompoundDrawables()[DRAWABLE_RIGHT];
+                    if (deleteText != null) {
+                        if (event.getRawX() >= (v.getRight() - deleteText.getBounds().width())) {
+                            ((EditText) v).setText("");
+                            return true;
+                        }
+                    }
+                    break;
+                case MotionEvent.ACTION_UP:
+                    v.performClick();
+                    break;
+                default:
+                    break;
+            }
+            return false;
+        });
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (resultCode == RESULT_OK) {
+            switch (requestCode) {
+                case LOGIN_REQUEST_CODE:
+                    binding.switchBtn.setImageResource(R.drawable.ic_folder_open);
+                    if (getSupportFragmentManager().findFragmentByTag(FRAGMENT_CLOUD) == null) {
+                        getSupportFragmentManager().beginTransaction().add(R.id.container, myProjectFragment, FRAGMENT_CLOUD).commit();
+                        getSupportFragmentManager().beginTransaction().hide(firstPageFragment).commit();
+                    } else {
+                        getSupportFragmentManager().beginTransaction()
+                                .hide(firstPageFragment)
+                                .show(myProjectFragment)
+                                .commit();
+                    }
+                    isExplorer = !isExplorer;
+                    break;
+            }
+        }
+    }
+
+    @Override
+    public void onBackPressed() {
+        if (firstPageFragment.isVisible() && firstPageFragment instanceof ExplorerFragment) {
+            ((ExplorerFragment) firstPageFragment).backToPrev();
+        } else {
+            super.onBackPressed();
+        }
+    }
+
+//    public void deleteCloudFile(String path) {
+//        if (firstPageFragment instanceof ExplorerFragment) {
+//            ((ExplorerFragment) firstPageFragment).deleteCloudedMap(path);
+//        }
+//    }
+//
+//    public void updateCloudFiles(List<CloudFile> cloudFiles) {
+//        Map<String, Boolean> map = new HashMap<>();
+//        for (CloudFile cloudFile : cloudFiles) {
+//            if (cloudFile.getPath().contains("/projects/")) {
+//                map.put(QPyConstants.ABSOLUTE_PATH + "/projects/" + cloudFile.getProjectName(), true);
+//            }
+//            map.put(QPyConstants.ABSOLUTE_PATH + cloudFile.getPath(), true);
+//        }
+//        ((ExplorerFragment) firstPageFragment).updateCloudedFiles(map);
+//    }
+//
+//    public void setNewUpload() {
+//        isNewUpload = true;
+//    }
+//
+//    /**
+//     * 保存云端文件目录到本地
+//     */
+//    public void locatedCloud(List<CloudFile> cloudFiles) {
+//        if (cloudFiles.size() > 0) {
+//            Type type = new TypeToken<List<CloudFile>>() {
+//            }.getType();
+//            FileHelper.writeToFile(CONF.CLOUD_MAP_CACHE_PATH, App.getGson().toJson(cloudFiles, type));
+//        }
+//    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        NotebookUtil.killServer();
+    }
+}
diff --git a/qpython/src/op/res/drawable-xxhdpi/ic_login.png b/qpython/src/op/res/drawable-xxhdpi/ic_login.png
new file mode 100644
index 00000000..d45ba05f
Binary files /dev/null and b/qpython/src/op/res/drawable-xxhdpi/ic_login.png differ
diff --git a/qpython/src/op/res/layout/activity_local.xml b/qpython/src/op/res/layout/activity_local.xml
new file mode 100644
index 00000000..4a03abe2
--- /dev/null
+++ b/qpython/src/op/res/layout/activity_local.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <LinearLayout
+        android:id="@+id/gd_action_bar_host"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:background="@color/colorPrimaryDark"
+        android:orientation="vertical">
+
+        <android.support.design.widget.AppBarLayout
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize">
+
+            <android.support.v7.widget.Toolbar
+                android:id="@+id/toolbar"
+                style="@style/Toolbar"
+                android:layout_width="match_parent"
+                android:layout_height="?attr/actionBarSize"
+                android:background="#FF4A4A4A"
+                android:elevation="2dp"
+                app:popupTheme="@style/DefaultBlueToolbar"
+                app:theme="@style/ToolbarTheme">
+
+                <ImageButton
+                    android:id="@+id/switch_btn"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="end"
+                    android:background="@null"
+                    android:padding="10dp"
+                    android:src="@drawable/ic_cloud_list"
+                    android:visibility="gone"/>
+
+                <ImageButton
+                    android:id="@+id/refresh"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="end"
+                    android:layout_marginEnd="30dp"
+                    android:layout_marginRight="30dp"
+                    android:background="@color/transparency"
+                    android:src="@drawable/ic_library_reinstall"
+                    android:visibility="gone"/>
+
+                <Button
+                    android:id="@+id/explore"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="end"
+                    android:textColor="#FFF"
+                    android:background="@color/transparency"
+                    android:text="@string/explorer"
+                    android:visibility="gone"/>
+            </android.support.v7.widget.Toolbar>
+        </android.support.design.widget.AppBarLayout>
+
+        <RelativeLayout
+            xmlns:android="http://schemas.android.com/apk/res/android"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@color/colorPrimaryDark">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="vertical">
+
+                <FrameLayout
+                    android:id="@+id/container"
+                    android:layout_width="match_parent"
+                    android:layout_height="0dp"
+                    android:layout_weight="9"/>
+
+                <include
+                    android:id="@+id/vs_save"
+                    layout="@layout/view_stub_save_prompt"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"/>
+            </LinearLayout>
+        </RelativeLayout>
+    </LinearLayout>
+
+
+</layout>
\ No newline at end of file
diff --git a/qpython/src/op/res/values-zh-rCN/strings.xml b/qpython/src/op/res/values-zh-rCN/strings.xml
new file mode 100644
index 00000000..c41af5e6
--- /dev/null
+++ b/qpython/src/op/res/values-zh-rCN/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="sign_in_with_google">使用微信登录</string>
+    <string name="app_name">QPython OP</string>
+</resources>
diff --git a/qpython/src/op/res/values-zh-rTW/strings.xml b/qpython/src/op/res/values-zh-rTW/strings.xml
new file mode 100644
index 00000000..014a5c4a
--- /dev/null
+++ b/qpython/src/op/res/values-zh-rTW/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="sign_in_with_google">使用微信登錄</string>
+    <string name="app_name">Qpython L</string>
+</resources>
\ No newline at end of file
diff --git a/qpython/src/op/res/values/strings.xml b/qpython/src/op/res/values/strings.xml
new file mode 100644
index 00000000..04e7d001
--- /dev/null
+++ b/qpython/src/op/res/values/strings.xml
@@ -0,0 +1,4 @@
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="ExtraTranslation">
+    <string name="sign_in_with_google">Sign in with Wechat</string>
+    <string name="app_name">QPython OP</string>
+</resources>
diff --git a/qpython/src/os/AndroidManifest.xml b/qpython/src/os/AndroidManifest.xml
new file mode 100644
index 00000000..2cf45938
--- /dev/null
+++ b/qpython/src/os/AndroidManifest.xml
@@ -0,0 +1,402 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          xmlns:tools="http://schemas.android.com/tools"
+          package="org.qpython.qpy">
+
+    <uses-feature
+        android:name="android.hardware.touchscreen"
+        android:required="false"/>
+
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+    <uses-permission android:name="android.permission.CAMERA"/>
+    <uses-permission android:name="android.permission.FLASHLIGHT"/>
+    <uses-permission android:name="android.permission.VIBRATE" />
+    <uses-permission android:name="android.permission.RECEIVE_USER_PRESENT" />
+    <uses-permission android:name="com.android.vending.BILLING"/>
+    <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
+    <uses-permission android:name="com.android.launcher.permission.UNINSTALL_SHORTCUT" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_MEDIA_STORAGE" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.BLUETOOTH" />
+    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
+    <uses-permission android:name="android.permission.NFC" />
+    <uses-permission android:name="android.permission.RECORD_AUDIO" />
+    <uses-permission android:name="android.permission.ACCESS_NOTIFICATION_POLICY" />
+    <uses-permission android:name="android.permission.KILL_BACKGROUND_PROCESSES"/>
+    <uses-permission android:name="net.dinglisch.android.tasker.PERMISSION_RUN_TASKS" />
+    <!-- privacy sensitive permissions -->
+    <uses-permission android:name="android.permission.ACCESS_SUPERUSER" />
+    <uses-permission android:name="android.permission.READ_SMS"/>
+    <uses-permission android:name="android.permission.SEND_SMS" />
+    <uses-permission android:name="android.permission.RECEIVE_SMS"/>
+    <uses-permission android:name="android.permission.WRITE_SMS"/>
+    <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
+    <uses-permission android:name="android.permission.CALL_PHONE"/>
+    <uses-permission android:name="android.permission.READ_CALL_LOG"/>
+    <uses-permission android:name="android.permission.PROCESS_OUTGOING_CALLS"/>
+    <uses-permission android:name="android.permission.READ_CONTACTS"/>
+    <uses-permission android:name="android.permission.GET_ACCOUNTS"/>
+    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
+
+    <uses-feature android:name="android.hardware.microphone" android:required="false"/>
+    <uses-feature android:name="android.hardware.telephony" android:required="false"/>
+    <uses-feature android:name="android.hardware.camera" android:required="false"/>
+    <uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
+    <uses-feature android:name="android.hardware.camera.flash" android:required="false"/>
+    <uses-feature android:name="android.hardware.screen.landscape" android:required="false"/>
+    <uses-feature android:name="android.hardware.wifi" android:required="false"/>
+    <uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
+    <uses-feature android:name="android.hardware.location.gps" android:required="false"/>
+    <uses-feature android:name="android.hardware.location.network" android:required="false"/>
+    <uses-feature android:name="android.hardware.bluetooth" android:required="false"/>
+
+    <uses-feature android:glEsVersion="0x00020000" android:required="false"/>
+
+    <application
+        android:networkSecurityConfig="@xml/network_security_config"
+        android:name="org.qpython.qpy.main.app.App"
+        android:allowBackup="true"
+        android:hardwareAccelerated="true"
+        android:icon="@drawable/ic_launcher"
+        android:label="@string/app_name"
+        android:largeHeap="true"
+        android:supportsRtl="true"
+        android:theme="@style/AppTheme">
+        <uses-library android:name="org.apache.http.legacy" android:required="false"/>
+
+        <meta-data
+            android:name="com.google.firebase.messaging.default_notification_icon"
+            android:resource="@drawable/img_home_logo"/>
+
+        <service android:name=".main.service.QPyService"/>
+        <service android:name="org.qpython.qsl4a.QPyScriptService"/>
+        <service android:name=".main.service.FTPServerService"/>
+        <activity
+            android:name=".main.activity.SignInActivity"
+            android:launchMode="singleTask"/>
+        <activity
+            android:name="org.renpy.android.PythonSDLActivity"
+            android:hardwareAccelerated="true"
+            android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|screenLayout|fontScale|uiMode|orientation"
+            android:launchMode="singleTask"
+            android:process=":python"
+            android:screenOrientation="user"
+            android:theme="@style/AppTheme"
+            android:windowSoftInputMode="stateAlwaysHidden">
+        </activity>
+
+        <activity
+            android:name="org.qpython.qpylib.MPyApi"
+            android:exported="true"
+            android:theme="@style/Theme.AppCompat"/>
+
+        <service
+            android:name="org.qpython.qpylib.MPyService"
+            android:exported="true"
+            tools:ignore="ExportedService"/>
+
+        <activity
+            android:name=".main.activity.SplashActivity"
+            android:theme="@style/FullscreenTheme"
+            >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
+        </activity>
+
+        <activity
+            android:name="org.qpython.qpy.main.activity.HomeMainActivity"
+            android:launchMode="singleTask">
+            <meta-data
+                android:name="android.app.shortcuts"
+                android:resource="@xml/shortcuts"/>
+        </activity>
+
+        <activity
+            android:name="org.qpython.qpy.main.activity.QWebViewActivity"
+            android:label="@string/browser">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW"/>
+
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.BROWSABLE"/>
+
+                <data android:mimeType="text/plain"/>
+                <data android:mimeType="image/*"/>
+                <data
+                    android:host="course"
+                    android:path="/"
+                    android:scheme="qpython"/>
+            </intent-filter>
+
+            <!-- Used to handle Chrome then menu then share.-->
+            <intent-filter>
+                <action android:name="android.intent.action.SEND"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <data android:mimeType="text/plain"/>
+                <data android:mimeType="image/*"/>
+            </intent-filter>
+        </activity>
+        <activity
+            android:name=".main.activity.CourseActivity"
+            android:configChanges="orientation|screenSize"/>
+        <activity android:name=".main.activity.CourseIndexActivity"/>
+        <activity android:name=".main.activity.GistEditActivity"/>
+        <activity android:name=".main.activity.CodeDetailActivity"/>
+        <activity android:name=".main.activity.CodeShareActivity"/>
+        <activity android:name=".main.activity.UserActivity"/>
+        <activity
+            android:name="org.qpython.qpy.main.activity.SettingActivity"
+            android:theme="@style/AppTheme"/>
+        <activity
+            android:name="org.qpython.qpy.console.TermActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:theme="@style/AppTheme"/>
+        <activity
+            android:name=".main.activity.LogActivity"
+            android:theme="@style/AppTheme"/>
+        <activity
+            android:name=".texteditor.EditorActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:exported="true"
+            android:label="@string/editor">
+            <intent-filter>
+                <!--<action android:name="android.intent.action.SEND"/>-->
+                <action android:name="android.intent.action.VIEW"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:mimeType="text/*"/>
+                <data android:scheme="file"/>
+            </intent-filter>
+
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="content"/>
+                <data android:host="*"/>
+                <data android:mimeType="*/*"/>
+                <data android:pathPattern=".*\\.txt"/>
+                <data android:pathPattern=".*\\.html"/>
+                <data android:pathPattern=".*\\.css"/>
+                <data android:pathPattern=".*\\.js"/>
+                <data android:pathPattern=".*\\.md"/>
+                <data android:pathPattern=".*\\.php"/>
+                <data android:pathPattern=".*\\.py"/>
+            </intent-filter>
+        </activity>
+
+        <activity
+            android:name="org.qpython.qpy.texteditor.TedLocalActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar"/>
+        <activity
+            android:name="org.qpython.qpy.texteditor.TedSettingsActivity"
+            android:theme="@style/SettingTheme"
+            android:windowSoftInputMode="stateHidden"/>
+        <activity
+            android:name="org.qpython.qpy.texteditor.TedFontActivity"
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar"/>
+
+        <activity
+            android:name=".main.activity.LibActivity"
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar">
+            <intent-filter>
+                <action android:name="org.qpython.qpy.OPEN_AIPY_FRAGMENT"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity>
+
+        <activity
+            android:name=".main.activity.AboutActivity"/>
+
+        <activity
+            android:name=".main.activity.AppListActivity"
+            android:exported="true"
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar">
+        </activity>
+        <activity
+            android:name="org.swiftp.gui.ServerPreferenceActivity"
+            android:label="Preferences"/>
+        <activity android:name=".texteditor.MFTPSettingActivity"/>
+        <activity android:name=".main.activity.PurchaseActivity"/>
+
+        <activity-alias
+            android:name="TermInternal"
+            android:exported="false"
+            android:targetActivity="org.qpython.qpy.console.TermActivity"
+            android:theme="@style/ConsoleTheme">
+            <intent-filter>
+                <action android:name="jackpal.androidterm.private.OPEN_NEW_WINDOW"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+            <intent-filter>
+                <action android:name="jackpal.androidterm.private.SWITCH_WINDOW"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity-alias>
+        <activity
+            android:name="org.qpython.qpy.console.RemoteInterface"
+            android:excludeFromRecents="true"
+            android:theme="@style/ConsoleTheme">
+            <intent-filter>
+                <action android:name="jackpal.androidterm.OPEN_NEW_WINDOW"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity>
+        <activity-alias
+            android:name="TermHere"
+            android:exported="true"
+            android:label="@string/activity_term_here_title"
+            android:targetActivity="org.qpython.qpy.console.RemoteInterface"
+            android:theme="@style/ConsoleTheme">
+        </activity-alias>
+
+        <activity
+            android:name="org.qpython.qsl4a.qsl4a.activity.FutureActivity"
+            android:label="QSL4A FutureActivity"
+            android:theme="@style/AppTheme">
+            <intent-filter>
+                <action android:name="android.nfc.action.NDEF_DISCOVERED"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <data android:mimeType="application/com.hipipal.qpy.nfc"/>
+            </intent-filter>
+        </activity>
+
+        <activity
+            android:name="org.qpython.qpy.console.RunScript"
+            android:excludeFromRecents="true"
+            android:permission="jackpal.androidterm.permission.RUN_SCRIPT"
+            android:theme="@style/ConsoleTheme">
+            <intent-filter>
+                <action android:name="jackpal.androidterm.RUN_SCRIPT"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity>
+        <activity
+            android:name="org.qpython.qpy.console.RunShortcut"
+            android:excludeFromRecents="true"
+            android:theme="@style/ConsoleTheme">
+            <intent-filter>
+                <action android:name="jackpal.androidterm.RUN_SHORTCUT"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity>
+        <activity
+            android:name="org.qpython.qpy.console.TermPreferences"
+            android:label="@string/preferences"
+            android:theme="@style/ConsoleTheme"/>
+        <activity
+            android:name="org.qpython.qpy.console.WindowList"
+            android:label="@string/window_list"
+            android:theme="@style/ConsoleTheme"/>
+        <activity
+            android:name="org.qpython.qpy.console.shortcuts.AddShortcut"
+            android:configChanges="orientation|keyboard|keyboardHidden"
+            android:label="@string/activity_shortcut_create"
+            android:launchMode="singleTop"
+            android:theme="@style/Theme.AppCompat">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.CREATE_SHORTCUT"/>
+            </intent-filter>
+            <intent-filter>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <data android:mimeType="text/*"/>
+            </intent-filter>
+        </activity>
+        <activity
+            android:name="org.qpython.qpy.console.shortcuts.FSNavigator"
+            android:configChanges="orientation|keyboardHidden"
+            android:exported="true"
+            android:label="@string/addshortcut_button_find_command"
+            android:launchMode="singleTop"
+            android:theme="@style/ConsoleTheme">
+            <intent-filter>
+                <action android:name="android.intent.action.PICK"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.GET_CONTENT"/>
+
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.OPENABLE"/>
+
+                <data android:mimeType="*/*"/>
+            </intent-filter>
+        </activity>
+
+        <activity android:name="org.qpython.qpy.plugin.activity.PluginManagerActivity"/>
+        <activity android:name="org.qpython.qpy.plugin.activity.LocalPluginInstallActivity"/>
+
+        <!--zxing-->
+        <activity android:name="org.qpython.qpy.main.activity.QrCodeActivity"/>
+        <activity
+            android:name=".main.activity.GistActivity"
+            android:configChanges="orientation"
+            android:launchMode="singleTask"/>
+        <activity
+            android:name=".main.activity.GistDetailActivity"
+            android:configChanges="orientation"/>
+        <activity
+            android:name=".main.activity.MyGistActivity"
+            android:configChanges="orientation"/>
+        <!--SERVICE-->
+        <service android:name="org.qpython.qpy.console.TermService"
+                 tools:ignore="ExportedService">
+            <intent-filter>
+                <action android:name="jackpal.androidterm.action.START_TERM.v1"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </service>
+
+        <activity android:name=".main.activity.CourseIndexFundingActivity"/>
+        <activity android:name=".main.activity.FundingPurchaseActivity"/>
+        <activity
+            android:name=".main.activity.NotebookActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:launchMode="singleTask"
+            android:windowSoftInputMode="adjustResize"
+            android:exported="true">
+            <intent-filter >
+                <action android:name="android.intent.action.VIEW"/>
+            </intent-filter>
+        </activity>
+        <activity
+            android:name=".main.activity.NotebookListActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"/>
+
+        <service
+            android:name=".main.service.MyFirebaseMessagingService"
+            tools:ignore="ExportedService">
+            <intent-filter>
+                <action android:name="com.google.firebase.MESSAGING_EVENT"/>
+            </intent-filter>
+        </service>
+        <service
+            android:name=".main.service.MyFirebaseInstanceIDService"
+            tools:ignore="ExportedService">
+            <intent-filter>
+                <action android:name="com.google.firebase.INSTANCE_ID_EVENT"/>
+            </intent-filter>
+        </service>
+    </application>
+
+    <meta-data
+        android:name="com.sec.android.support.multiwindow"
+        android:value="true"/>
+
+</manifest>
diff --git a/qpython/src/os/java/org/qpython/qpy/codeshare/ShareCodeUtil.java b/qpython/src/os/java/org/qpython/qpy/codeshare/ShareCodeUtil.java
new file mode 100644
index 00000000..3841e9a9
--- /dev/null
+++ b/qpython/src/os/java/org/qpython/qpy/codeshare/ShareCodeUtil.java
@@ -0,0 +1,743 @@
+package org.qpython.qpy.codeshare;
+
+import android.app.Activity;
+import android.content.SharedPreferences;
+import android.preference.PreferenceManager;
+import android.util.Log;
+import android.widget.Toast;
+
+import com.google.firebase.database.DataSnapshot;
+import com.google.firebase.database.DatabaseError;
+import com.google.firebase.database.DatabaseReference;
+import com.google.firebase.database.FirebaseDatabase;
+import com.google.firebase.database.ValueEventListener;
+import com.google.gson.reflect.TypeToken;
+import com.quseit.util.ACache;
+import com.quseit.util.FileHelper;
+import com.quseit.util.NetStateUtil;
+
+import org.json.JSONObject;
+import org.qpython.qpy.R;
+import org.qpython.qpy.codeshare.pojo.BookmarkerList;
+import org.qpython.qpy.codeshare.pojo.CloudFile;
+import org.qpython.qpy.codeshare.pojo.Gist;
+import org.qpython.qpy.codeshare.pojo.GistBase;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.app.CONF;
+import org.qpython.qpy.texteditor.common.TextFileUtils;
+import org.qpython.qpysdk.utils.DateTimeHelper;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import rx.Observable;
+import rx.functions.Action1;
+
+import static org.qpython.qpy.codeshare.CONSTANT.DOT_REPLACE;
+import static org.qpython.qpy.codeshare.CONSTANT.SLASH_REPLACE;
+import static org.qpython.qpy.main.server.CacheKey.CLOUD_FILE;
+
+/**
+ * FireBase database util
+ * Created by Hmei on 2017-08-10.
+ */
+
+public class ShareCodeUtil {
+    private static final boolean CLEAR = false;
+
+    private static final String CLOUD        = "cloud";
+    private static final String GIST         = "gist";
+    private static final String USER         = "user";
+    private static final String BASE         = "base";
+    private static final String GIST_LIST    = "gist_list";
+    private static final String HISTORY      = "history";
+    private static final String COMMENT      = "comment";
+    private static final String BOOKMARK     = "bookmark";
+    private static final String COMMIT       = "commit";
+    private static final String INDEX        = "index";
+    private static final String USAGE        = "usage";
+    private static final String PROJECT      = "project";
+    private static final String SCRIPT       = "script";
+    private static final String OTHER        = "other";
+    private static final String PROJECT_PATH = "/projects/";
+    private static final String SCRIPTS_PATH = "/scripts/";
+
+    private static final int MAX_FILE = 100;
+
+    private DatabaseReference reference;
+    private String            email;
+    private String            userName;
+    private String            avatarUrl;
+
+    private SharedPreferences sharedPreferences;
+    private int currentFileCount = -1;
+
+    private ShareCodeUtil() {
+        reference = FirebaseDatabase.getInstance().getReference();
+        if (App.getUser() != null) {
+            email = App.getUser().getEmail().replace(".", "_");
+            userName = App.getUser().getUserName();
+            avatarUrl = App.getUser().getAvatarUrl();
+            sharedPreferences = PreferenceManager.getDefaultSharedPreferences(App.getContext());
+            initUsage(null);
+        } else {
+            email = "";
+            userName = "";
+            avatarUrl = "";
+        }
+        //LogUtil.d("ShareCodeUtil", "ShareCodeUtil:"+App.getUser().getEmail());
+
+        Log.d("ShareCodeUtil", "ShareCodeUtil:"+email);
+    }
+
+    public static ShareCodeUtil getInstance() {
+        return ShareCodeHolder.INSTANCE;
+    }
+
+    @SuppressWarnings({"DEBUG_ONLY"})
+    public void clearAll() {
+        if (CLEAR) {
+            reference.child(CLOUD).child(email).removeValue(
+                    (databaseError, databaseReference) ->
+                            Toast.makeText(App.getContext(), "Clear", Toast.LENGTH_SHORT).show());
+        }
+    }
+
+    public void createScriptGist(String title, String desc, String msg, String content, DatabaseReference.CompletionListener listener) {
+        String date = DateTimeHelper.getDate();
+        // Add to all gist repo
+        Gist gist = new Gist();
+        gist.setTitle(title);
+        gist.setAuthor(userName);
+        gist.setAvatar(avatarUrl);
+        gist.setDescribe(desc);
+        gist.setDate(date);
+        DatabaseReference path = reference.child(GIST).child(SCRIPT).push();// gist/script/<gist_id>
+        String gistId = path.getKey();
+        path.setValue(gist, listener);
+        commitGist(gistId, msg, content, null, null);
+
+        // Add to user repo
+        GistBase baseGist = new GistBase();
+        baseGist.setAuthor(userName);
+        baseGist.setAvatar(avatarUrl);
+        baseGist.setDate(date);
+        baseGist.setTitle(title);
+        reference.child(USER).child(email).child(GIST_LIST).child(SCRIPT).child(gistId).setValue(baseGist);// user/<email>/gist_list/script/<gist_id>
+
+        // Add to base repo
+        reference.child(BASE).child(SCRIPT).child(gistId).setValue(baseGist); // base/script/<gist_id>
+    }
+
+    public void createProjectGist(String projectName, String desc, String msg, List<String> paths, DatabaseReference.CompletionListener completionListener) {
+        for (String path : paths) {
+            File file = new File(path);
+            String code = TextFileUtils.readTextFile(file);
+            String fileName = file.getName().replace(".", DOT_REPLACE);
+
+            String date = DateTimeHelper.getDate();
+            // Add to all gist repo
+            Gist gist = new Gist();
+            gist.setTitle(fileName);
+            gist.setAuthor(userName);
+            gist.setAvatar(avatarUrl);
+            gist.setDescribe(desc);
+            gist.setDate(date);
+            DatabaseReference subReference = reference.child(GIST).child(PROJECT);// gist/script/<gist_id>
+            String gistId = subReference.getKey();
+            subReference.child(gistId).child(projectName).child(fileName).setValue(gist, completionListener);// gist/project/<gist_id>/<projectName>/<fileName>
+            commitGist(gistId, msg, code, projectName, fileName);
+
+            // Add to user repo
+            GistBase baseGist = new GistBase();
+            baseGist.setAuthor(userName);
+            baseGist.setAuthor(avatarUrl);
+            baseGist.setDate(date);
+            baseGist.setTitle(fileName);
+            // user/<email>/gist_list/project/<gist_id>/<projectName>/<fileName>
+            reference.child(USER).child(email).child(GIST_LIST).child(PROJECT).child(gistId).child(projectName).child(fileName).setValue(baseGist);
+
+            // Add to base repo
+            // base/project/<gist_id>/<projectName>/<fileName>
+            reference.child(BASE).child(PROJECT).child(gistId).child(projectName).child(fileName).setValue(baseGist);
+        }
+    }
+
+    public void commitGist(String gistId, String msg, String content, String projName, String fileName) {
+        Gist.HistoryBean historyBean = new Gist.HistoryBean();
+        historyBean.setData(DateTimeHelper.getDate());
+        historyBean.setMassage(msg);
+        historyBean.setContent(content);
+        if (projName != null) {
+            DatabaseReference subRe = reference.child(GIST).child(PROJECT).child(gistId).child(projName).child(fileName).child(HISTORY).push();
+            String historyId = subRe.getKey();
+            subRe.child(historyId).setValue(historyBean); // gist/<gist_id>/history/<historyId>}
+        } else {
+            DatabaseReference subRe = reference.child(GIST).child(SCRIPT).child(gistId).child(HISTORY).push();
+            String historyId = subRe.getKey();
+            subRe.child(historyId).setValue(historyBean); // gist/<gist_id>/history/<historyId>}
+            reference.child(GIST).child(SCRIPT).child(gistId).child("lastCommitCode").setValue(content);
+        }
+    }
+
+    public void sendComment(String gistId, String comment, boolean isProj, CommentCallback callback) {
+        sendComment(gistId, "", comment, "", isProj, callback);
+    }
+
+    /**
+     * @param comment   评论
+     * @param reComment 被回复的评论
+     */
+    public void sendComment(String gistId, String to, String comment, String reComment, boolean isProj, CommentCallback callback) {
+        Gist.CommentBean commentBean = new Gist.CommentBean();
+        commentBean.setFrom_content(comment);
+        commentBean.setData(DateTimeHelper.getDate());
+        commentBean.setFrom(userName);
+        commentBean.setAvatar(avatarUrl);
+        commentBean.setRe(to);
+        commentBean.setRe_content(reComment);
+        callback.commentBean(commentBean);
+        DatabaseReference subRe = reference.child(GIST).child(isProj ? PROJECT : SCRIPT).child(gistId).child(COMMENT).push();
+        String commentId = subRe.getKey();
+        subRe.child(commentId).setValue(commentBean);
+    }
+
+    public void bookmark(String gistId) {
+        reference.child(GIST).child(gistId).child(BOOKMARK).child(email).setValue(userName);
+        reference.child(USER).child(email).child(BOOKMARK).child(gistId).setValue(true);
+    }
+
+    public void cancelBookmark(String gistId) {
+        reference.child(GIST).child(gistId).child(BOOKMARK).child(email).removeValue();
+        reference.child(USER).child(email).child(BOOKMARK).child(gistId).removeValue();
+    }
+
+    public void getBaseScriptGistList(Action1<List<GistBase>> callback) {
+        reference.child(BASE).child(SCRIPT).addListenerForSingleValueEvent(new SimpleValueEventListener() {
+            @Override
+            public void onDataGet(HashMap value) {
+                List<GistBase> dataList = new ArrayList<>();
+                for (Object key : value.keySet()) {
+                    GistBase gistBase = App.getGson().fromJson(new JSONObject((Map) value.get(key)).toString(), GistBase.class);
+                    gistBase.setId((String) key);
+                    dataList.add(gistBase);
+                }
+                Observable.just(dataList)
+                        .subscribe(callback);
+            }
+        });
+    }
+
+    public void getBaseProjectGistList(Action1<List<GistBase>> callback) {
+        reference.child(BASE).child(PROJECT).addListenerForSingleValueEvent(new SimpleValueEventListener() {
+            @Override
+            public void onDataGet(HashMap value) {
+                List<GistBase> dataList = new ArrayList<>();
+                for (Object key : value.keySet()) {
+                    GistBase gistBase = App.getGson().fromJson(new JSONObject((Map) value.get(key)).toString(), GistBase.class);
+                    gistBase.setId((String) key);
+                    dataList.add(gistBase);
+                }
+                Observable.just(dataList)
+                        .subscribe(callback);
+            }
+        });
+    }
+
+    public void getGistDetail(String gistId, boolean isProj, Action1<Gist> callback) {
+        reference.child(GIST).child(isProj ? PROJECT : SCRIPT).child(gistId).addListenerForSingleValueEvent(new SimpleValueEventListener() {
+            @Override
+            public void onDataGet(HashMap value) {
+                JSONObject jsonObject = new JSONObject(value);
+                Gist gist = App.getGson().fromJson(String.valueOf(jsonObject), Gist.class);
+
+                HashMap historyMap = (HashMap) value.get(HISTORY);
+                if (historyMap != null) {
+                    List<Gist.HistoryBean> historyList = new ArrayList<>();
+                    for (Object historyKey : historyMap.keySet()) {
+                        Gist.HistoryBean historyBean = App.getGson().fromJson(String.valueOf(new JSONObject((Map) historyMap.get(historyKey))), Gist.HistoryBean.class);
+                        historyBean.setHistoryId((String) historyKey);
+                        historyList.add(historyBean);
+                    }
+                    gist.setHistory(historyList);
+                }
+
+                HashMap commentMap = (HashMap) value.get(COMMENT);
+                if (commentMap != null) {
+                    List<Gist.CommentBean> commentList = new ArrayList<>();
+                    for (Object commentKey : commentMap.keySet()) {
+                        Gist.CommentBean commentBean = App.getGson().fromJson(String.valueOf(new JSONObject((Map) commentMap.get(commentKey))), Gist.CommentBean.class);
+                        commentBean.setId((String) commentKey);
+                        commentList.add(commentBean);
+                    }
+                    gist.setComment(commentList);
+                }
+
+                HashMap bookmarkMap = (HashMap) value.get(BOOKMARK);
+                if (bookmarkMap != null) {
+                    List<Gist.BookmarkerBean> bookmarkerList = new ArrayList<>();
+                    for (Object bookmarkKey : bookmarkMap.keySet()) {
+                        Gist.BookmarkerBean bookmarkerBean = App.getGson().fromJson(String.valueOf(new JSONObject((Map) bookmarkMap.get(bookmarkKey))), Gist.BookmarkerBean.class);
+                        bookmarkerBean.setId((String) bookmarkKey);
+                        bookmarkerList.add(bookmarkerBean);
+                    }
+                    gist.setBookmarker(bookmarkerList);
+                }
+                Observable.just(gist)
+                        .subscribe(callback);
+            }
+        });
+    }
+
+    // TODO: 2017-08-14 Need to fix
+    public void getMyGistList(Action1<List<GistBase>> callback) {
+        reference.child(USER).child(GIST_LIST).addListenerForSingleValueEvent(new ValueEventListener() {
+            @Override
+            public void onDataChange(DataSnapshot dataSnapshot) {
+                HashMap object = (HashMap) dataSnapshot.getValue();
+                List<GistBase> userGist = new ArrayList<>();
+                if (object == null) {
+                    return;
+                }
+                for (Object key : object.keySet()) {
+                    userGist.add(App.getGson().fromJson(new JSONObject((Map) object.get(key)).toString(), GistBase.class));
+                }
+                Observable.just(userGist)
+                        .subscribe(callback);
+            }
+
+            @Override
+            public void onCancelled(DatabaseError databaseError) {
+
+            }
+        });
+    }
+
+    public void getMyBookmarkList(Action1<List<BookmarkerList>> callback) {
+        reference.child(USER).child(BOOKMARK).addListenerForSingleValueEvent(new ValueEventListener() {
+            @Override
+            public void onDataChange(DataSnapshot dataSnapshot) {
+                HashMap object = (HashMap) dataSnapshot.getValue();
+                List<BookmarkerList> userGist = new ArrayList<>();
+                if (object == null) {
+                    return;
+                }
+                for (Object key : object.keySet()) {
+                    userGist.add(App.getGson().fromJson(new JSONObject((Map) object.get(key)).toString(), BookmarkerList.class));
+                }
+                Observable.just(userGist)
+                        .subscribe(callback);
+            }
+
+            @Override
+            public void onCancelled(DatabaseError databaseError) {
+
+            }
+        });
+    }
+
+    public void getGistCommentList(String gistId, Action1<List<Gist.CommentBean>> callback) {
+        reference.child(GIST).child(gistId).child(COMMENT).addListenerForSingleValueEvent(new ValueEventListener() {
+            @Override
+            public void onDataChange(DataSnapshot dataSnapshot) {
+                HashMap object = (HashMap) dataSnapshot.getValue();
+                List<Gist.CommentBean> commentList = new ArrayList<>();
+                if (object == null) {
+                    return;
+                }
+                for (Object key : object.keySet()) {
+                    commentList.add(App.getGson().fromJson(new JSONObject((Map) object.get(key)).toString(), Gist.CommentBean.class));
+                }
+                Observable.just(commentList)
+                        .subscribe(callback);
+            }
+
+            @Override
+            public void onCancelled(DatabaseError databaseError) {
+
+            }
+        });
+    }
+
+    public boolean uploadFolder(String path, DatabaseReference.CompletionListener completionListener, int[] size) {
+        File folder = new File(path);
+        // 获取该文件夹下符合后缀文件及非隐藏文件
+
+        if (!folder.isDirectory()) {
+            return false;
+        }
+        List<File> files = FileHelper.filterExt(folder, App.getContext().getResources().getStringArray(R.array.support_file_ext), size[0]);
+        if (files.size() == 0) {
+            Toast.makeText(App.getContext(), R.string.no_file, Toast.LENGTH_SHORT).show();
+            return false;
+        }
+
+        if (!hasSpace(files.size())) {
+            return false;
+        }
+
+        for (File file : files) {
+            uploadFile(file.getAbsolutePath(), completionListener);
+        }
+
+//        // 如果在project目录下
+//        if ("projects".equals(folder.getName())) {
+//            DatabaseReference projNode = reference.child(CLOUD).child(email).child(PROJECT).child(folder.getName().replace(".", DOT_REPLACE));
+//            for (int i = 0; i < files.size(); i++) {
+//                String date = DateTimeHelper.AGO_FULL_DATE_FORMATTER.format(new Date(files.get(i).lastModified()));
+//                String subPath = files.get(i).getAbsolutePath();
+//                String subKey = subPath.substring(subPath.indexOf(folder.getName()) + folder.getName().length(), subPath.length()).replace(".", DOT_REPLACE).replace("/", SLASH_REPLACE);
+//                if (i == files.size() - 1) {
+//                    projNode.child(subKey)
+//                            .child(date)
+//                            .setValue(TextFileUtils.readTextFile(files.get(i)), completionListener);
+//                } else {
+//                    projNode.child(subKey)
+//                            .child(date)
+//                            .setValue(TextFileUtils.readTextFile(files.get(i)));
+//                }
+//                reference.child(CLOUD)
+//                        .child(email)
+//                        .child(INDEX)
+//                        .child(PROJECT)
+//                        .child(folder.getName().replace(".", DOT_REPLACE) + subKey)
+//                        .setValue(date);
+//            }
+//        } else if ("scripts".equals(folder.getName())) {
+//            // 上传整个scripts文件夹
+//            for (int i = 0; i < files.size(); i++) {
+//                String abs_path = files.get(i).getAbsolutePath();
+//                String key = abs_path
+//                        .substring(abs_path.indexOf(SCRIPTS_PATH) + SCRIPTS_PATH.length())
+//                        .replace(".", DOT_REPLACE)
+//                        .replace("/", SLASH_REPLACE);
+//                DatabaseReference content = reference.child(CLOUD)
+//                        .child(email)
+//                        .child(SCRIPT)
+//                        .child(key)
+//                        .child(DateTimeHelper.AGO_FULL_DATE_FORMATTER.format(new Date(files.get(i).lastModified())));
+//                if (i == files.size() - 1) {
+//                    content.setValue(TextFileUtils.readTextFile(files.get(i)), completionListener);
+//                } else {
+//                    content.setValue(TextFileUtils.readTextFile(files.get(i)));
+//                }
+//
+//                reference.child(CLOUD)
+//                        .child(email)
+//                        .child(INDEX)
+//                        .child(SCRIPT)
+//                        .child(key)
+//                        .setValue(DateTimeHelper.AGO_FULL_DATE_FORMATTER.format(new Date(files.get(i).lastModified())));
+//            }
+//        } else {
+//            // 普通文件夹
+//            int fileListSize = files.size();
+//            for (File file : files) {
+//                fileListSize--;
+//                final String rootNode = "/qpython/";
+//                String node = file.getAbsolutePath().substring(path.indexOf(rootNode) + rootNode.length());
+//                DatabaseReference child =
+//                        reference
+//                                .child(CLOUD)
+//                                .child(email)/*.child(folder.getName().replace(".", DOT_REPLACE))*/
+//                                .child(OTHER)
+//                                .child(node.replace(".", DOT_REPLACE).replace("/", SLASH_REPLACE))
+//                                .child(DateTimeHelper.getDate());
+//                if (fileListSize == 0) {
+//                    child.setValue(TextFileUtils.readTextFile(file), completionListener);
+//                } else {
+//                    child.setValue(TextFileUtils.readTextFile(file));
+//                }
+//
+//                reference.child(CLOUD)
+//                        .child(email)
+//                        .child(INDEX)
+//                        .child(OTHER)
+//                        .child(node.replace(".", DOT_REPLACE).replace("/", SLASH_REPLACE))
+//                        .setValue(DateTimeHelper.getDate());
+//            }
+//        }
+        return true;
+    }
+
+    public boolean uploadFile(String path, DatabaseReference.CompletionListener completionListener) {
+        File file = new File(path);
+
+        if (!hasSpace(1)) {
+            return false;
+        }
+
+        if (path.contains(PROJECT_PATH)) {
+            String subPath = path.substring(path.indexOf(PROJECT_PATH) + PROJECT_PATH.length());
+            String projName = subPath.split("/")[0];
+            reference.child(CLOUD)
+                    .child(email)
+                    .child(PROJECT)
+                    .child(projName)
+                    .child(subPath.replace(".", DOT_REPLACE).replace("/", SLASH_REPLACE).replace(projName, ""))
+                    .child(DateTimeHelper.AGO_FULL_DATE_FORMATTER.format(new Date(file.lastModified())))
+                    .setValue(TextFileUtils.readTextFile(file), completionListener);
+
+            reference.child(CLOUD)
+                    .child(email)
+                    .child(INDEX)
+                    .child(PROJECT)
+                    .child(subPath.replace(".", DOT_REPLACE).replace("/", SLASH_REPLACE))
+                    .setValue(DateTimeHelper.AGO_FULL_DATE_FORMATTER.format(new Date(file.lastModified())));
+        } else if (path.contains(SCRIPTS_PATH)) {
+            reference.child(CLOUD)
+                    .child(email)
+                    .child(SCRIPT)
+                    .child(file.getName().replace(".", DOT_REPLACE))
+                    .child(DateTimeHelper.AGO_FULL_DATE_FORMATTER.format(new Date(file.lastModified())))
+                    .setValue(TextFileUtils.readTextFile(file), completionListener);
+
+            reference.child(CLOUD)
+                    .child(email)
+                    .child(INDEX)
+                    .child(SCRIPT)
+                    .child(file.getName().replace(".", DOT_REPLACE))
+                    .setValue(DateTimeHelper.AGO_FULL_DATE_FORMATTER.format(new Date(file.lastModified())));
+        } else {
+            final String rootNode = "/qpython/";
+            String uploadKey = path.substring(path.indexOf(rootNode) + rootNode.length());
+            reference.child(CLOUD)
+                    .child(email)
+                    .child(OTHER)
+                    .child(uploadKey.replace(".", DOT_REPLACE).replace("/", SLASH_REPLACE))
+                    .child(DateTimeHelper.getDate())
+                    .setValue(TextFileUtils.readTextFile(file), completionListener);
+
+            reference.child(CLOUD)
+                    .child(email)
+                    .child(INDEX)
+                    .child(OTHER)
+                    .child(uploadKey.replace(".", DOT_REPLACE).replace("/", SLASH_REPLACE))
+                    .setValue(DateTimeHelper.getDate());
+        }
+        return true;
+    }
+
+    public void getUploadedScripts(boolean forceRefresh, Activity context, Action1<List<CloudFile>> callback) {
+        if (CLEAR) {
+            return;
+        }
+        String content = FileHelper.getFileContents(CONF.CLOUD_MAP_CACHE_PATH);
+        List<CloudFile> cloudFiles = content == null ? null : App.getGson().fromJson(content, new TypeToken<List<CloudFile>>() {
+        }.getType());
+        if (cloudFiles != null && !forceRefresh) {
+            Observable.just(cloudFiles)
+                    .subscribe(callback);
+        } else {
+            email = App.getUser()!=null?App.getUser().getEmail().replace(".","_"):"";
+            if (email.equals("")) {
+                Toast.makeText(context, "Waiting the firebase to initializ...",Toast.LENGTH_SHORT).show();
+
+            } else {
+                reference.child(CLOUD).child(email).child(INDEX).addListenerForSingleValueEvent(new ValueEventListener() {
+                    @Override
+                    public void onDataChange(DataSnapshot dataSnapshot) {
+                        HashMap<String, Object> value = (HashMap<String, Object>) dataSnapshot.getValue();
+                        if (value == null) {
+                            resetUsage(0);
+                            Observable.just(new ArrayList<CloudFile>())
+                                    .subscribe(callback);
+                            return;
+                        }
+                        List<CloudFile> cloudFiles = new ArrayList<>();
+                        for (String node : value.keySet()) {
+                            switch (node) {
+                                case SCRIPT:
+                                    HashMap<String, Object> script;
+                                    script = (HashMap<String, Object>) value.get(SCRIPT);
+                                    for (String o : script.keySet()) {
+                                        CloudFile cloudFile = new CloudFile();
+                                        cloudFile.setName(o);
+                                        cloudFile.setKey(SCRIPT + "/" + o);
+                                        cloudFile.setPath(SCRIPTS_PATH);
+                                        cloudFile.setUploadTime((String) script.get(o));
+                                        cloudFiles.add(cloudFile);
+                                    }
+                                    break;
+                                case PROJECT:
+                                    HashMap<String, Object> project = (HashMap<String, Object>) value.get(PROJECT);
+                                    for (String s : project.keySet()) {
+                                        CloudFile cloudFile = new CloudFile();
+                                        cloudFile.setKey(PROJECT + "/" + s);
+                                        String[] nodes = s.split(SLASH_REPLACE);
+                                        cloudFile.setName(nodes[nodes.length - 1]);
+                                        cloudFile.setProjectName(nodes[0]);
+                                        cloudFile.setPath(s.replace(nodes[0], ""));
+                                        cloudFile.setUploadTime((String) project.get(s));
+                                        cloudFiles.add(cloudFile);
+                                    }
+                                    break;
+                                default:
+                                    HashMap<String, Object> other = (HashMap<String, Object>) value.get(OTHER);
+                                    for (String s : other.keySet()) {
+                                        CloudFile cloudFile = new CloudFile();
+                                        cloudFile.setPath(s);
+                                        cloudFile.setKey(OTHER + "/" + s);
+                                        String[] nodes = s.split(SLASH_REPLACE);
+                                        boolean index = false;
+                                        for (String node1 : nodes) {
+                                            if (index) {
+                                                cloudFile.setProjectName(node1);
+                                                break;
+                                            } else if (node1.equals("projects3")) {
+                                                index = true;
+                                            }
+                                        }
+                                        cloudFile.setName(nodes[nodes.length - 1]);
+                                        cloudFile.setUploadTime((String) other.get(s));
+                                        cloudFiles.add(cloudFile);
+                                    }
+                                    break;
+                            }
+                        }
+                        resetUsage(cloudFiles.size());
+                        Observable.just(cloudFiles)
+                                .subscribe(callback);
+                        ACache.get(context).put(CLOUD_FILE, App.getGson().toJson(cloudFiles));
+
+                    }
+
+                    @Override
+                    public void onCancelled(DatabaseError databaseError) {
+
+                    }
+                });
+            }
+        }
+    }
+
+    public void getFileContent(String path, Action1<String> callback) {
+        reference.child(CLOUD)
+                .child(email)
+                .child(path)
+                .addListenerForSingleValueEvent(new ValueEventListener() {
+                    @Override
+                    public void onDataChange(DataSnapshot dataSnapshot) {
+                        HashMap<String, String> dateContent = (HashMap<String, String>) dataSnapshot.getValue();
+                        String latest = "";
+                        for (String s : dateContent.keySet()) {
+                            latest = DateTimeHelper.isLater(s, latest) ? s : latest;
+                        }
+
+                        Observable.just(dateContent.get(latest))
+                                .subscribe(callback);
+                    }
+
+                    @Override
+                    public void onCancelled(DatabaseError databaseError) {
+
+                    }
+                });
+    }
+
+    public void deleteUploadScript(CloudFile cloudFile, DatabaseReference.CompletionListener listener) {
+        reference.child(CLOUD)
+                .child(email)
+                .child(cloudFile.getKey())
+                .removeValue(listener);
+        reference.child(CLOUD)
+                .child(email)
+                .child(INDEX)
+                .child(cloudFile.getKey())
+                .removeValue();
+        changeUsage(-1);
+    }
+
+    public void initUsage(Action1<Integer> callback) {
+        if (CLEAR) {
+            return;
+        }
+        if (currentFileCount == -1) {
+            if (NetStateUtil.isConnected(App.getContext())) {
+                reference.child(CLOUD)
+                        .child(email)
+                        .child(USAGE)
+                        .addListenerForSingleValueEvent(new ValueEventListener() {
+                            @Override
+                            public void onDataChange(DataSnapshot dataSnapshot) {
+                                if (dataSnapshot.getValue() != null) {
+                                    currentFileCount = ((Long) dataSnapshot.getValue()).intValue();
+                                } else {
+                                    currentFileCount = 0;
+                                }
+                                if (callback != null) {
+                                    Observable.just(currentFileCount)
+                                            .subscribe(callback);
+                                }
+                            }
+
+                            @Override
+                            public void onCancelled(DatabaseError databaseError) {
+
+                            }
+                        });
+            }
+        } else {
+            callback.call(currentFileCount);
+        }
+    }
+
+    public int changeUsage(int change) {
+        currentFileCount += change;
+        reference.child(CLOUD)
+                .child(email)
+                .child(USAGE)
+                .setValue(currentFileCount);
+        return currentFileCount;
+    }
+
+    public void resetUsage(int value) {
+        currentFileCount = value;
+        reference.child(CLOUD)
+                .child(email)
+                .child(USAGE)
+                .setValue(currentFileCount);
+    }
+
+    private boolean hasSpace(int waiting) {
+        if (currentFileCount < 0) {
+            Toast.makeText(App.getContext(), R.string.usage_not_init, Toast.LENGTH_SHORT).show();
+            return false;
+        } else if (currentFileCount + waiting > MAX_FILE) {
+            Toast.makeText(App.getContext(), R.string.no_space, Toast.LENGTH_SHORT).show();
+            return false;
+        } else {
+            return true;
+        }
+    }
+
+    public interface CommentCallback {
+        void commentBean(Gist.CommentBean comment);
+    }
+
+    private static class ShareCodeHolder {
+        private static final ShareCodeUtil INSTANCE = new ShareCodeUtil();
+    }
+
+    abstract class SimpleValueEventListener implements ValueEventListener {
+        @Override
+        public void onDataChange(DataSnapshot dataSnapshot) {
+            HashMap<String, Object> object = (HashMap<String, Object>) dataSnapshot.getValue();
+            if (object == null) {
+                return;
+            }
+            onDataGet(object);
+        }
+
+        @Override
+        public void onCancelled(DatabaseError databaseError) {
+
+        }
+
+        public abstract void onDataGet(HashMap<String, Object> value);
+    }
+}
\ No newline at end of file
diff --git a/qpython/src/os/java/org/qpython/qpy/codeshare/pojo/CloudFile.java b/qpython/src/os/java/org/qpython/qpy/codeshare/pojo/CloudFile.java
new file mode 100644
index 00000000..09a9471c
--- /dev/null
+++ b/qpython/src/os/java/org/qpython/qpy/codeshare/pojo/CloudFile.java
@@ -0,0 +1,97 @@
+package org.qpython.qpy.codeshare.pojo;
+
+
+import org.qpython.qpy.codeshare.CONSTANT;
+import org.qpython.qpysdk.QPyConstants;
+
+import java.io.Serializable;
+
+public class CloudFile implements Serializable {
+    private String  projectName;
+    private String  path;
+    private String  uploadTime;
+    private String  name;
+    private String  content;
+    private String  key;
+    private boolean uploading;
+
+    public String getPath() {
+        if (projectName == null) {
+            if (path.contains("scripts3")) {
+                return "/" + path.replace(CONSTANT.SLASH_REPLACE, "/").replace(CONSTANT.DOT_REPLACE, ".");
+            } else if (path.contains("scripts")) {
+                return path.replace(CONSTANT.SLASH_REPLACE, "/") + getName();
+            } else {
+                return "/" + path.replace(CONSTANT.SLASH_REPLACE, "/").replace(CONSTANT.DOT_REPLACE, ".");
+            }
+        } else {
+            String projNode = path.contains("projects3") ? "projects3/" : "projects/";
+            return "/" + projNode + getProjectName() + path
+                    .replace(CONSTANT.SLASH_REPLACE, "/")
+                    .replace(CONSTANT.DOT_REPLACE, ".")
+                    .replace(projNode, "")
+                    .replace(getProjectName(), "");
+        }
+    }
+
+    public void setPath(String path) {
+        this.path = path;
+    }
+
+    public String getUploadTime() {
+        return uploadTime;
+    }
+
+    public void setUploadTime(String uploadTime) {
+        this.uploadTime = uploadTime;
+    }
+
+    public String getName() {
+        return name.replace(CONSTANT.DOT_REPLACE, ".");
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+
+    public long getContentSize() {
+        return content == null ? 0 : content.length();
+    }
+
+    public String getProjectName() {
+        return projectName == null ? null : projectName.
+                replace(CONSTANT.SLASH_REPLACE, "/").replace(CONSTANT.DOT_REPLACE, ".");
+    }
+
+    public void setProjectName(String projectName) {
+        this.projectName = projectName;
+    }
+
+    public boolean isUploading() {
+        return uploading;
+    }
+
+    public void setUploading(boolean uploading) {
+        this.uploading = uploading;
+    }
+
+    public String getKey() {
+        return key == null ? getName().replace(".", CONSTANT.DOT_REPLACE) : key;
+    }
+
+    public void setKey(String key) {
+        this.key = key;
+    }
+
+    public String getAbsolutePath() {
+        return QPyConstants.ABSOLUTE_PATH + getPath();
+    }
+}
diff --git a/qpython/src/os/java/org/qpython/qpy/main/PayActivity.java b/qpython/src/os/java/org/qpython/qpy/main/PayActivity.java
new file mode 100644
index 00000000..c1a7b8d2
--- /dev/null
+++ b/qpython/src/os/java/org/qpython/qpy/main/PayActivity.java
@@ -0,0 +1,188 @@
+package org.qpython.qpy.main;
+
+import android.app.PendingIntent;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentSender;
+import android.content.ServiceConnection;
+import android.os.Bundle;
+import android.os.IBinder;
+import android.os.RemoteException;
+import android.support.annotation.Nullable;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.GridLayoutManager;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.Toast;
+
+import com.android.vending.billing.IInAppBillingService;
+import com.quseit.util.ImageUtil;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.qpython.qpy.R;
+import org.qpython.qpy.main.activity.PurchaseActivity;
+import org.qpython.qpy.main.server.MySubscriber;
+import org.qpython.qpy.main.widget.GridSpace;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import rx.Observable;
+import rx.android.schedulers.AndroidSchedulers;
+import rx.schedulers.Schedulers;
+
+/**
+ * Created by Hmei
+ * 1/30/18.
+ */
+
+public class PayActivity extends AppCompatActivity {
+    public static final int BUY_REQUEST_CODE = 2333;
+    private IInAppBillingService   mService;
+    private ServiceConnection      mServiceConn;
+    private ArrayList<String>      skuList;
+    private MySubscriber<String[]> callback;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+    }
+
+    void initIAB(ArrayList<String> skuList, MySubscriber<String[]> callback) {
+        this.skuList = skuList;
+        this.callback = callback;
+        mServiceConn = new ServiceConnection() {
+            @Override
+            public void onServiceDisconnected(ComponentName name) {
+                mService = null;
+            }
+
+            @Override
+            public void onServiceConnected(ComponentName name,
+                                           IBinder service) {
+                mService = IInAppBillingService.Stub.asInterface(service);
+                getPrices(skuList, callback);
+            }
+        };
+
+        Intent serviceIntent = new Intent("com.android.vending.billing.InAppBillingService.BIND");
+        serviceIntent.setPackage("com.android.vending");
+        bindService(serviceIntent, mServiceConn, Context.BIND_AUTO_CREATE);
+    }
+
+    /**
+     * 从Google服务器获取不同国家价格表并显示
+     */
+    private void getPrices(ArrayList<String> skuList, MySubscriber<String[]> callback) {
+        if (mService == null) {
+            Toast.makeText(this, R.string.lose_google_server, Toast.LENGTH_SHORT).show();
+            if (findViewById(R.id.pb) != null) findViewById(R.id.pb).setVisibility(View.GONE);
+            return;
+        }
+//        ArrayList<String> skuList;
+//        if (!isCrowdFunding) {
+//            skuList = new ArrayList<>(Arrays.asList(getResources().getStringArray(R.array.sku)));
+//        } else {
+//            skuList = new ArrayList<>(Arrays.asList(getResources().getStringArray(R.array.crowdfunding)));
+//            int index = (int) (getIntent().getIntExtra(PERCENT, 0) / 100.00 * 4);
+//            String sku = skuList.get(index);
+//            skuList.clear();
+//            skuList.add(sku);
+//        }
+        Bundle querySkus = new Bundle();
+        querySkus.putStringArrayList("ITEM_ID_LIST", skuList);
+        try {
+            Observable.just(mService.getSkuDetails(3, getPackageName(), "inapp", querySkus))
+                    .map(bundle -> {
+                                ArrayList<String> responseList = bundle.getStringArrayList("DETAILS_LIST");
+                                if (responseList == null) {
+                                    return null;
+                                }
+                                String[] prices = new String[responseList.size()];
+                                for (int i = 0; i < responseList.size(); i++) {
+                                    JSONObject object;
+                                    try {
+                                        object = new JSONObject(responseList.get(i));
+                                        String price = object.getString("price");
+                                        prices[i] = price;
+                                    } catch (JSONException e) {
+                                        e.printStackTrace();
+                                    }
+                                }
+                                Arrays.sort(prices, (o1, o2) -> Integer.parseInt(o1.replaceAll("[^0-9]", "")) - Integer.parseInt(o2.replaceAll("[^0-9]", "")));
+                                return prices;
+                            }
+                    )
+                    .subscribeOn(Schedulers.newThread())
+                    .observeOn(AndroidSchedulers.mainThread())
+                    .subscribe(callback
+//                            new MySubscriber<String[]>() {
+//                        @Override
+//                        public void onNext(String[] o) {
+//                            super.onNext(o);
+//                            if (o == null) {
+//                                return;
+//                            }
+//                            invalidateData();
+//                            GridSpace gridSpace = new GridSpace(2, (int) ImageUtil.dp2px(16), false);
+//                            binding.list.setLayoutManager(new GridLayoutManager(PurchaseActivity.this, 2));
+//                            binding.list.addItemDecoration(gridSpace);
+//                            binding.list.setAdapter(new PurchaseActivity.ListAdapter(o));
+//                        }
+//                    }
+                    );
+        } catch (RemoteException e) {
+            e.printStackTrace();
+        }
+    }
+
+    private void purchase(String sku) {
+//        String[] skus;
+//        if (isCrowdFunding) {
+//            skus = getResources().getStringArray(R.array.crowdfunding);
+//        } else {
+//            skus = getResources().getStringArray(R.array.sku);
+//        }
+        try {
+            if (mService == null) {
+                Toast.makeText(this, R.string.lose_google_server, Toast.LENGTH_SHORT).show();
+                return;
+            }
+            Bundle buyIntentBundle = mService.getBuyIntent(3, getPackageName(),
+                    sku, "inapp", "bGoa+V7g/yqDXvKRqq+JTFn4uQZbPiQJo4pf9RzJ");
+            switch (buyIntentBundle.getInt("RESPONSE_CODE")) {
+                case 0:
+                    //BILLING_RESPONSE_RESULT_OK
+                    PendingIntent pendingIntent = buyIntentBundle.getParcelable("BUY_INTENT");
+                    startIntentSenderForResult(pendingIntent.getIntentSender(),
+                            BUY_REQUEST_CODE, new Intent(), 0, 0, 0);
+                    break;
+
+            }
+        } catch (RemoteException | IntentSender.SendIntentException | NullPointerException e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == R.id.refresh_menu) {
+            if (findViewById(R.id.pb) != null) findViewById(R.id.pb).setVisibility(View.VISIBLE);
+            getPrices(skuList, callback);
+            return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        if (mService != null) {
+            unbindService(mServiceConn);
+        }
+    }
+
+}
diff --git a/qpython/src/os/java/org/qpython/qpy/main/activity/BaseActivity.java b/qpython/src/os/java/org/qpython/qpy/main/activity/BaseActivity.java
new file mode 100644
index 00000000..d3e259f8
--- /dev/null
+++ b/qpython/src/os/java/org/qpython/qpy/main/activity/BaseActivity.java
@@ -0,0 +1,301 @@
+package org.qpython.qpy.main.activity;
+
+import android.content.ActivityNotFoundException;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.content.res.Configuration;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Bundle;
+import android.os.Environment;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v4.app.ActivityCompat;
+import android.support.v4.content.ContextCompat;
+import android.support.v4.util.ArrayMap;
+import android.support.v7.app.AlertDialog;
+import android.support.v7.app.AppCompatActivity;
+import android.widget.ArrayAdapter;
+import android.widget.Toast;
+import android.text.TextUtils;
+
+import com.quseit.util.NAction;
+import com.quseit.util.NUtil;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.console.ShellTermSession;
+import org.qpython.qpy.console.util.TermSettings;
+import org.renpy.android.ResourceManager;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import org.qpython.qpy.main.server.gist.TokenManager;
+
+public class BaseActivity extends AppCompatActivity {
+    // QPython interfaces
+    private static final int SCRIPT_CONSOLE_CODE = 1237;
+    private static final int PID_INIT_VALUE = -1;
+    private static final int DEFAULT_BUFFER_SIZE = 8192;
+    private static final int LOG_NOTIFICATION_ID = (int) System.currentTimeMillis();
+
+
+    //private FirebaseAnalytics mFirebaseAnalytics;
+    private ArrayList<String> mArguments = new ArrayList<>();
+    private InputStream mIn;
+    private OutputStream mOut;
+    private Map<Integer, PermissionAction> mActionMap = new ArrayMap<>();
+    private TermSettings mSettings;
+    private ShellTermSession session;
+
+    private boolean permissionGrant = true;
+
+    protected static ShellTermSession createTermSession(Context context, TermSettings settings, String initialCommand, String path) {
+        ShellTermSession session = null;
+        try {
+            session = new ShellTermSession(context, settings, initialCommand, path);
+            session.setProcessExitMessage(context.getString(R.string.process_exit_message));
+
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+        return session;
+    }
+
+    protected void toast(String content) {
+        Toast.makeText(this, content, Toast.LENGTH_SHORT).show();
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+    }
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        //mFirebaseAnalytics = FirebaseAnalytics.getInstance(this);
+    }
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+    }
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+        PermissionAction action = mActionMap.get(requestCode);
+        if (action != null) {
+            if (grantResults.length > 0 && (grantResults[0] == PackageManager.PERMISSION_GRANTED)) {
+                action.onGrant();
+            } else {
+                action.onDeny();
+            }
+
+        }
+        mActionMap.remove(action);
+    }
+
+    public final void checkPermissionDo(String[] permissions, PermissionAction action) {
+        if (Build.VERSION.SDK_INT >= 23) {
+            boolean granted = true;
+            for (String permission : permissions) {
+                int checkPermission = ContextCompat.checkSelfPermission(this, permission);
+                granted = checkPermission == PackageManager.PERMISSION_GRANTED;
+            }
+            if (!granted) {
+                int code = permissions.hashCode() & 0xffff;
+                mActionMap.put(code, action);
+                ActivityCompat.requestPermissions(this, permissions, code);
+            } else {
+                action.onGrant();
+            }
+        } else {
+            action.onGrant();
+        }
+    }
+
+
+    // feedback
+    public void onFeedback(String feedback) {
+        String app = getString(R.string.app_name);
+        int ver = NUtil.getVersinoCode(getApplicationContext());
+        String subject = MessageFormat.format(getString(com.quseit.android.R.string.feeback_email_title), app, ver, Build.PRODUCT);
+
+        String lastError = "";
+        String code = NAction.getCode(getApplicationContext());
+        File log = new File(Environment.getExternalStorageDirectory() + "/" + code + "_last_err.log");
+        if (log.exists()) {
+            lastError = com.quseit.util.FileHelper.getFileContents(log.getAbsolutePath());
+        }
+
+        String body = feedback.isEmpty() ? feedback : MessageFormat.format(getString(R.string.feedback_email_body), Build.PRODUCT,
+                Build.VERSION.RELEASE, Build.VERSION.SDK, lastError, feedback);
+
+
+        Intent twitterIntent = getPackageManager().getLaunchIntentForPackage("com.twitter.android");
+        if (twitterIntent != null) {
+            List<String> list = new ArrayList<>();
+            list.add("Feedback with Twitter");
+            list.add("Feedback with Email");
+            new AlertDialog.Builder(this)
+                    .setTitle(R.string.feedback)
+                    .setNegativeButton(R.string.close, (dialog, which) -> dialog.dismiss())
+                    .setAdapter(new ArrayAdapter<>(this, R.layout.dialog_feedback, list), (dialog, which) -> {
+                        if (which == 0) {
+                            twitter(body);
+                        } else {
+                            email(subject, body);
+                        }
+                    })
+                    .show();
+        } else {
+            email(subject, body);
+        }
+    }
+
+    private void email(String subject, String body) {
+        Intent intent = new Intent(Intent.ACTION_SENDTO, Uri.parse("mailto:" + getString(R.string.ui_feedback_mail)));
+
+        intent.putExtra(Intent.EXTRA_SUBJECT, subject);
+        intent.putExtra(Intent.EXTRA_TEXT, session == null ? body : session.getTranscriptText().trim());
+        try {
+            startActivity(Intent.createChooser(intent,
+                    getString(R.string.email_transcript_chooser_title)));
+        } catch (ActivityNotFoundException e) {
+            Toast.makeText(this,
+                    R.string.email_transcript_no_email_activity_found,
+                    Toast.LENGTH_LONG)
+                    .show();
+        }
+    }
+
+    private void twitter(String message) {
+        Intent tweetIntent = new Intent(Intent.ACTION_SEND);
+        if (message.isEmpty()){
+            tweetIntent.putExtra(Intent.EXTRA_TEXT, "@qpython,");
+        }else {
+            tweetIntent.putExtra(Intent.EXTRA_TEXT, "@qpython\n" + message);
+        }
+        tweetIntent.setType("text/plain");
+
+        PackageManager packManager = getPackageManager();
+        List<ResolveInfo> resolvedInfoList = packManager.queryIntentActivities(tweetIntent, PackageManager.MATCH_DEFAULT_ONLY);
+
+        boolean resolved = false;
+        for (ResolveInfo resolveInfo : resolvedInfoList) {
+            if (resolveInfo.activityInfo.packageName.startsWith("com.twitter.android")) {
+                tweetIntent.setClassName(
+                        resolveInfo.activityInfo.packageName,
+                        resolveInfo.activityInfo.name);
+                resolved = true;
+                break;
+            }
+        }
+        if (resolved) {
+            startActivity(tweetIntent);
+        } else {
+            Intent i = new Intent();
+            i.putExtra(Intent.EXTRA_TEXT, message);
+            i.setAction(Intent.ACTION_VIEW);
+            i.setData(Uri.parse("https://twitter.com/intent/tweet?text=" + urlEncode(message)));
+            startActivity(i);
+            Toast.makeText(this, "Twitter app isn't found", Toast.LENGTH_LONG).show();
+        }
+    }
+
+    private String urlEncode(String s) {
+        try {
+            return URLEncoder.encode(s, "UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+            return "";
+        }
+    }
+
+    protected boolean checkExpired(final String resource, String filesDir, String tag) {
+        ResourceManager resourceManager = new ResourceManager(this);
+
+        String data_version = resourceManager.getString(resource + "_version");
+        String disk_version = "0";
+
+        // If no version, no unpacking is necessary.
+        if (data_version == null) {
+            return false;
+        }
+
+        // Check the current disk version, if any.
+        String disk_version_fn = filesDir + "/" + tag + "_" + resource + ".version";
+
+        try {
+            byte buf[] = new byte[64];
+            InputStream is = new FileInputStream(disk_version_fn);
+            int len = is.read(buf);
+            disk_version = new String(buf, 0, len);
+            is.close();
+        } catch (Exception e) {
+
+            disk_version = "0";
+
+        }
+
+        if (!NUtil.isNumeric(disk_version)) {
+            disk_version = "0";
+
+        }
+
+        if ((int) (Double.parseDouble(data_version) - Double.parseDouble(disk_version)) > 0 || disk_version.equals("0")) {
+            try {
+                FileOutputStream os = new FileOutputStream(disk_version_fn);
+                try {
+                    os.write(data_version.getBytes());
+                    os.close();
+
+                } catch (IOException e) {
+                    e.printStackTrace();
+                    //Mint.logException(e);
+
+                }
+
+            } catch (FileNotFoundException e) {
+                e.printStackTrace();
+                //Mint.logException(e);
+
+            }
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    public interface PermissionAction {
+        void onGrant();
+
+        void onDeny();
+    }
+
+    public void ifLogin(Login afterLogin) {
+        if (!TextUtils.isEmpty(TokenManager.getToken())) {
+            afterLogin.process();
+        } else {
+            Toast.makeText(this, R.string.login_first, Toast.LENGTH_SHORT).show();
+        }
+    }
+    public interface Login {
+        void process();
+    }
+}
\ No newline at end of file
diff --git a/qpython/src/os/java/org/qpython/qpy/main/activity/FundingPurchaseActivity.java b/qpython/src/os/java/org/qpython/qpy/main/activity/FundingPurchaseActivity.java
new file mode 100644
index 00000000..6e6cf10a
--- /dev/null
+++ b/qpython/src/os/java/org/qpython/qpy/main/activity/FundingPurchaseActivity.java
@@ -0,0 +1,143 @@
+package org.qpython.qpy.main.activity;
+
+import android.content.Context;
+import android.content.Intent;
+import android.databinding.DataBindingUtil;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.view.Menu;
+import android.view.View;
+import android.widget.Toast;
+
+import com.quseit.util.VeDate;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.qpython.qpy.R;
+import org.qpython.qpy.databinding.ActivityFundingPurchaseBinding;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.server.MySubscriber;
+import org.qpython.qpy.main.server.model.GooglePurchaseModel;
+import org.qpython.qpy.utils.UpdateHelper;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+
+/**
+ * Created by Hmei
+ * 1/30/18.
+ */
+
+public class FundingPurchaseActivity extends PayActivity {
+    private static final String ARTICLE_ID    = "article_id";
+    private static final String FUNDING_COUNT = "fundingCount";
+    //    private final String[] prices = get
+    private ActivityFundingPurchaseBinding binding;
+    private String                         sku;
+
+    public static void startSupport(Context context, String articleId, int fundingPercent) {
+        Intent starter = new Intent(context, FundingPurchaseActivity.class);
+        starter.putExtra(ARTICLE_ID, articleId);
+        starter.putExtra(FUNDING_COUNT, fundingPercent);
+        context.startActivity(starter);
+    }
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        binding = DataBindingUtil.setContentView(this, R.layout.activity_funding_purchase);
+        binding.pb.setVisibility(View.VISIBLE);
+        initView();
+        initPrice();
+        initListener();
+    }
+
+    private void initView() {
+        setSupportActionBar(binding.lt.toolbar);
+        binding.lt.toolbar.setNavigationIcon(R.drawable.ic_back);
+        binding.lt.toolbar.setNavigationOnClickListener(v -> finish());
+        setTitle(R.string.reward);
+    }
+
+    private void initPrice() {
+        String[] skus = getResources().getStringArray(R.array.crowdfunding);
+        int fundingCount = getIntent().getIntExtra(FUNDING_COUNT, 0);
+        if (fundingCount < 100) {
+            sku = skus[0];
+        } else if (fundingCount < 500) {
+            sku = skus[1];
+        } else if (fundingCount < 2000) {
+            sku = skus[2];
+        } else {
+            sku = skus[3];
+        }
+        ArrayList<String> skuList = new ArrayList<>();
+        skuList.add(sku);
+        initIAB(skuList, new MySubscriber<String[]>() {
+            @Override
+            public void onNext(String[] o) {
+                super.onNext(o);
+                if (o == null) {
+                    return;
+                }
+                invalidateData(true);
+                binding.price.setText(o[0]);
+            }
+        });
+    }
+
+    private void initListener() {
+        binding.price.setOnClickListener(v -> payUtil.purchase(sku));
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.refresh_menu, menu);
+        return true;
+    }
+
+    private void invalidateData(boolean showData) {
+        binding.price.setVisibility(showData ? View.VISIBLE : View.GONE);
+        binding.tvThanks.setVisibility(showData ? View.VISIBLE : View.GONE);
+        binding.noData.llRoot.setVisibility(showData ? View.GONE : View.VISIBLE);
+        binding.pb.setVisibility(View.GONE);
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (requestCode == BUY_REQUEST_CODE) {
+            if (resultCode == RESULT_OK) {
+                GooglePurchaseModel model = App.getGson().fromJson(data.getStringExtra("INAPP_PURCHASE_DATA"), GooglePurchaseModel.class);
+                if (model == null) {
+                    return;
+                }
+                switch (model.getProductId()) {
+                    default:
+                        Toast.makeText(this, R.string.thanks_your_support, Toast.LENGTH_SHORT).show();
+                        break;
+                }
+                // 统计赞赏数据
+                JSONObject jsonObject = new JSONObject();
+                try {
+                    jsonObject.put("type", model.getProductId());
+                    jsonObject.put("time", VeDate.getStringDateHourAsInt());
+                    int percent = getIntent().getIntExtra(FUNDING_COUNT, 0);
+                    String[] fundingCount = getResources().getStringArray(R.array.funding_count_divider);
+                    jsonObject.put("crowdfunding",
+                            percent > (Integer.parseInt(fundingCount[1]) / Integer.parseInt(fundingCount[2])) ? 3 :
+                                    percent > (Integer.parseInt(fundingCount[0]) / Integer.parseInt(fundingCount[1])) ? 2 : 1);//0 非众筹/ 1: 0-100 /2: 100-500/3 500-2000
+                    jsonObject.put("articleId", getIntent().getStringExtra(ARTICLE_ID));
+                    if (App.getUser() != null) {
+                        jsonObject.put("account", App.getUser().getEmail());
+                    }
+                } catch (JSONException e) {
+                    e.printStackTrace();
+                }
+                UpdateHelper.submitIAPLog(this, model.getOrderId(), App.getGson().toJson(jsonObject));
+                payUtil.digestPurchase(model.getPurchaseToken());
+                finish();
+            }
+        }
+    }
+}
diff --git a/qpython/src/os/java/org/qpython/qpy/main/activity/PayActivity.java b/qpython/src/os/java/org/qpython/qpy/main/activity/PayActivity.java
new file mode 100644
index 00000000..c637254e
--- /dev/null
+++ b/qpython/src/os/java/org/qpython/qpy/main/activity/PayActivity.java
@@ -0,0 +1,54 @@
+package org.qpython.qpy.main.activity;
+
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.app.AppCompatActivity;
+import android.view.MenuItem;
+import android.view.View;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.main.server.MySubscriber;
+import org.qpython.qpy.main.service.PayUtil;
+
+import java.util.ArrayList;
+
+/**
+ * Created by Hmei
+ * 1/30/18.
+ */
+
+public class PayActivity extends AppCompatActivity {
+    public static final int BUY_REQUEST_CODE = 2333;
+    private ArrayList<String>      skuList;
+    private MySubscriber<String[]> callback;
+    protected PayUtil payUtil;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        payUtil = new PayUtil(this);
+    }
+
+    protected void initIAB(ArrayList<String> skuList, MySubscriber<String[]> callback) {
+        this.skuList = skuList;
+        this.callback = callback;
+        payUtil.initIAP(() -> payUtil.getPrices(skuList,callback));
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == R.id.refresh_menu) {
+            if (findViewById(R.id.pb) != null) findViewById(R.id.pb).setVisibility(View.VISIBLE);
+            payUtil.getPrices(skuList, callback);
+            return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        payUtil.unbindPayService();
+    }
+
+}
diff --git a/qpython/src/os/java/org/qpython/qpy/main/activity/PurchaseActivity.java b/qpython/src/os/java/org/qpython/qpy/main/activity/PurchaseActivity.java
new file mode 100644
index 00000000..74335cc2
--- /dev/null
+++ b/qpython/src/os/java/org/qpython/qpy/main/activity/PurchaseActivity.java
@@ -0,0 +1,158 @@
+package org.qpython.qpy.main.activity;
+
+import android.content.Context;
+import android.content.Intent;
+import android.databinding.DataBindingUtil;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.widget.GridLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Toast;
+
+import com.quseit.util.ImageUtil;
+import com.quseit.util.VeDate;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.qpython.qpy.R;
+import org.qpython.qpy.databinding.ActivityPurchaseBinding;
+import org.qpython.qpy.databinding.ItemPriceBinding;
+import org.qpython.qpy.main.adapter.MyViewHolder;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.server.MySubscriber;
+import org.qpython.qpy.main.server.model.GooglePurchaseModel;
+import org.qpython.qpy.main.widget.GridSpace;
+import org.qpython.qpy.utils.UpdateHelper;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+
+/**
+ * Google purchase activity
+ * Created by Hmei on 2017-07-19.
+ */
+
+public class PurchaseActivity extends PayActivity {
+
+    private static final String ARTICLE_ID = "article_id";
+
+    private ActivityPurchaseBinding binding;
+    private ArrayList<String>       skus;
+
+    public static void start(Context context, String articleId) {
+        Intent starter = new Intent(context, PurchaseActivity.class);
+        starter.putExtra(ARTICLE_ID, articleId);
+        context.startActivity(starter);
+    }
+
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        binding = DataBindingUtil.setContentView(this, R.layout.activity_purchase);
+        skus = new ArrayList<>(Arrays.asList(getResources().getStringArray(R.array.sku)));
+
+        initIAB(skus, new MySubscriber<String[]>() {
+            @Override
+            public void onNext(String[] o) {
+                super.onNext(o);
+                if (o == null) {
+                    return;
+                }
+                invalidateData();
+                GridSpace gridSpace = new GridSpace(2, (int) ImageUtil.dp2px(16), false);
+                binding.list.setLayoutManager(new GridLayoutManager(PurchaseActivity.this, 2));
+                binding.list.addItemDecoration(gridSpace);
+                binding.list.setAdapter(new PurchaseActivity.ListAdapter(o));
+            }
+        });
+
+        initView();
+    }
+
+    private void initView() {
+        setSupportActionBar(binding.lt.toolbar);
+        binding.lt.toolbar.setNavigationIcon(R.drawable.ic_back);
+        binding.lt.toolbar.setNavigationOnClickListener(v -> finish());
+        setTitle(R.string.reward);
+    }
+
+    private void invalidateData() {
+        binding.tvThanks.setVisibility(View.VISIBLE);
+        binding.list.setVisibility(View.VISIBLE);
+        binding.noData.llRoot.setVisibility(View.GONE);
+    }
+
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.refresh_menu, menu);
+        return true;
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (requestCode == BUY_REQUEST_CODE) {
+            if (resultCode == RESULT_OK) {
+                GooglePurchaseModel model = App.getGson().fromJson(data.getStringExtra("INAPP_PURCHASE_DATA"), GooglePurchaseModel.class);
+                if (model == null) {
+                    return;
+                }
+                switch (model.getProductId()) {
+                    default:
+                        Toast.makeText(this, R.string.thanks_your_support, Toast.LENGTH_SHORT).show();
+                        break;
+                }
+                // 统计赞赏数据
+                JSONObject jsonObject = new JSONObject();
+                try {
+                    jsonObject.put("type", model.getProductId());
+                    jsonObject.put("time", VeDate.getStringDateHourAsInt());
+                    jsonObject.put("crowdfunding", 0);//0 非众筹/ 1: 0-100 /2: 100-500/3 500-2000
+                    jsonObject.put("articleId", getIntent().getStringExtra(ARTICLE_ID));
+                    if (App.getUser() != null) {
+                        jsonObject.put("account", App.getUser().getEmail());
+                    }
+                } catch (JSONException e) {
+                    e.printStackTrace();
+                }
+                UpdateHelper.submitIAPLog(this, model.getOrderId(), App.getGson().toJson(jsonObject));
+                payUtil.digestPurchase(model.getPurchaseToken());
+                finish();
+            }
+        }
+    }
+
+    private class ListAdapter extends RecyclerView.Adapter<MyViewHolder<ItemPriceBinding>> {
+        String[] dataList;
+
+        ListAdapter(String[] dataList) {
+            this.dataList = dataList;
+        }
+
+        @Override
+        public MyViewHolder<ItemPriceBinding> onCreateViewHolder(ViewGroup parent, int viewType) {
+            ItemPriceBinding binding = DataBindingUtil.inflate(LayoutInflater.from(PurchaseActivity.this), R.layout.item_price, parent, false);
+            MyViewHolder<ItemPriceBinding> holder = new MyViewHolder<>(binding.getRoot());
+            holder.setBinding(binding);
+            return holder;
+        }
+
+        @Override
+        public void onBindViewHolder(MyViewHolder<ItemPriceBinding> holder, int position) {
+            ItemPriceBinding binding = holder.getBinding();
+            binding.tvPrices.setText(dataList[position]);
+            binding.tvPrices.setOnClickListener(v -> payUtil.purchase(skus.get(position)));
+        }
+
+        @Override
+        public int getItemCount() {
+            return dataList.length;
+        }
+    }
+}
diff --git a/qpython/src/os/java/org/qpython/qpy/main/activity/SignInActivity.java b/qpython/src/os/java/org/qpython/qpy/main/activity/SignInActivity.java
new file mode 100644
index 00000000..b5fc5d2c
--- /dev/null
+++ b/qpython/src/os/java/org/qpython/qpy/main/activity/SignInActivity.java
@@ -0,0 +1,184 @@
+package org.qpython.qpy.main.activity;
+
+import android.content.Intent;
+import android.databinding.DataBindingUtil;
+import android.net.Uri;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v7.app.AppCompatActivity;
+import android.text.Html;
+import android.util.Log;
+import android.view.View;
+import android.widget.Toast;
+
+import com.google.android.gms.auth.api.Auth;
+import com.google.android.gms.auth.api.signin.GoogleSignInAccount;
+import com.google.android.gms.auth.api.signin.GoogleSignInOptions;
+import com.google.android.gms.auth.api.signin.GoogleSignInResult;
+import com.google.android.gms.common.ConnectionResult;
+import com.google.android.gms.common.api.GoogleApiClient;
+import com.google.firebase.auth.AuthCredential;
+import com.google.firebase.auth.FirebaseAuth;
+import com.google.firebase.auth.FirebaseUser;
+import com.google.firebase.auth.GoogleAuthProvider;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.databinding.ActivitySignInBinding;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.app.CONF;
+import org.qpython.qpy.main.app.User;
+import org.qpython.qpy.main.server.gist.loginScreen.LoginControler;
+import org.qpython.qpy.main.server.gist.loginScreen.LoginView;
+
+/**
+ * SignIn
+ * Created by Hmei on 2017-08-04.
+ */
+
+public class SignInActivity extends AppCompatActivity implements GoogleApiClient.OnConnectionFailedListener ,LoginView{
+    private static final int RC_SIGN_IN = 54503;
+
+    private GoogleApiClient mGoogleApiClient;
+    private ActivitySignInBinding binding;
+    private FirebaseAuth mAuth;
+
+    private LoginControler mLoginControler;
+
+    {
+        mAuth = FirebaseAuth.getInstance();
+        FirebaseUser currentUser = mAuth.getCurrentUser();
+        initUserInfo(currentUser);
+    }
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        binding = DataBindingUtil.setContentView(this, R.layout.activity_sign_in);
+        binding.textView3.setText(Html.fromHtml(getString(R.string.by_signing_in_you_agree_to_out_privacy_policy_term_of_service)));
+        GoogleSignInOptions gso = new GoogleSignInOptions.Builder(GoogleSignInOptions.DEFAULT_SIGN_IN)
+                .requestIdToken(CONF.GOOGLE_ID_TOKEN)
+                .requestEmail()
+                .build();
+
+        mGoogleApiClient = new GoogleApiClient.Builder(this)
+                .enableAutoManage(this, this)
+                .addApi(Auth.GOOGLE_SIGN_IN_API, gso)
+                .addOnConnectionFailedListener(connectionResult -> showToast(getString(R.string.lost_google_hint)))
+                .build();
+        initListener();
+
+        mLoginControler = new LoginControler(this);
+    }
+
+    private void initListener() {
+        binding.textView3.setOnClickListener(v -> startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.privacy_html)))));
+        binding.button2.setOnClickListener(v -> signIn());
+        binding.button3.setOnClickListener(v -> finish());
+    }
+
+    private void signIn() {
+        Intent signInIntent = Auth.GoogleSignInApi.getSignInIntent(mGoogleApiClient);
+        startActivityForResult(signInIntent, RC_SIGN_IN);
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        // Result returned from launching the Intent from GoogleSignInApi.getSignInIntent(...);
+        if (requestCode == RC_SIGN_IN) {
+            GoogleSignInResult result = Auth.GoogleSignInApi.getSignInResultFromIntent(data);
+            if (result.isSuccess()) {
+                GoogleSignInAccount account = result.getSignInAccount();
+                firebaseAuthWithGoogle(account);
+            } else {
+                Log.e("LOGIN", result.getStatus().toString());
+                try {
+                    String msg = result.getStatus().getStatusMessage().trim();
+                    showToast(getString(R.string.login_error) + (msg.equals("") ? "" : ": ") + msg);
+                    initUserInfo(null);
+                } catch (NullPointerException ignore) {
+                    showToast(getString(R.string.no_google));
+                }
+            }
+        }
+    }
+
+    private void firebaseAuthWithGoogle(GoogleSignInAccount acct) {
+        showLoading();
+        AuthCredential credential = GoogleAuthProvider.getCredential(acct.getIdToken(), "45:FD:60:98:01:9A:37:D9:84:03:06:36:02:F6:85:2C:A2:1F:B8:67");
+        mAuth.signInWithCredential(credential)
+                .addOnCompleteListener(this, task -> {
+                    if (task.isSuccessful()) {
+                        FirebaseUser user = mAuth.getCurrentUser();
+                        initUserInfo(user);
+                    } else {
+                        showToast(getString(R.string.auth_failed));
+                        initUserInfo(null);
+                        hideLoading();
+                    }
+                });
+    }
+
+    private void initUserInfo(FirebaseUser currentUser) {
+        if (currentUser == null) {
+            App.setUser(null);
+            return;
+        }
+        Log.d("SingInActivity", "NICK:"+currentUser.getDisplayName()+"-UN:"+currentUser.getEmail());
+        User user = new User();
+        user.setUserId(currentUser.getUid());
+        user.setAvatarUrl(currentUser.getPhotoUrl() == null ? "" : currentUser.getPhotoUrl().toString());
+        user.setEmail(currentUser.getEmail());
+        user.setUserName(currentUser.getEmail());
+        user.setNick(currentUser.getDisplayName());
+        App.setUser(user);
+        if (mLoginControler!=null) {
+            mLoginControler.login(user);
+        } else {
+            Toast.makeText(this, R.string.signin_error, Toast.LENGTH_SHORT).show();
+        }
+    }
+
+    @Override
+    public void onConnectionFailed(@NonNull ConnectionResult connectionResult) {
+        initUserInfo(null);
+    }
+
+    @Override
+    public void showLoading() {
+        binding.progressBar2.setVisibility(View.VISIBLE);
+    }
+
+    @Override
+    public void hideLoading() {
+        binding.progressBar2.setVisibility(View.GONE);
+    }
+
+    @Override
+    public void showToast(String msg) {
+        Toast.makeText(SignInActivity.this, msg, Toast.LENGTH_SHORT)
+                .show();
+    }
+
+    @Override
+    public void loginSuccess() {
+        Log.d("SignInActivity", "loginSuccess");
+//        setResult(RESULT_OK);
+//        this.finish();
+
+        setResult(RESULT_OK);
+        binding.progressBar2.setVisibility(View.GONE);
+        showToast("login successfully");
+        finish();
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        if (mLoginControler!=null) {
+
+            mLoginControler.onDestroy();
+        }
+    }
+}
\ No newline at end of file
diff --git a/qpython/src/os/java/org/qpython/qpy/main/activity/UserActivity.java b/qpython/src/os/java/org/qpython/qpy/main/activity/UserActivity.java
new file mode 100644
index 00000000..b142018e
--- /dev/null
+++ b/qpython/src/os/java/org/qpython/qpy/main/activity/UserActivity.java
@@ -0,0 +1,76 @@
+package org.qpython.qpy.main.activity;
+
+import android.content.Context;
+import android.content.Intent;
+import android.databinding.DataBindingUtil;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.app.AlertDialog;
+import android.support.v7.app.AppCompatActivity;
+import android.view.View;
+
+import com.google.firebase.auth.FirebaseAuth;
+import com.quseit.util.ImageDownLoader;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.codeshare.CONSTANT;
+import org.qpython.qpy.codeshare.ShareCodeUtil;
+import org.qpython.qpy.databinding.ActivityUserBinding;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.app.CONF;
+
+import java.io.File;
+
+public class UserActivity extends AppCompatActivity {
+    ActivityUserBinding binding;
+
+    public static void start(Context context) {
+        Intent starter = new Intent(context, UserActivity.class);
+        context.startActivity(starter);
+    }
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        binding = DataBindingUtil.setContentView(this, R.layout.activity_user);
+        setSupportActionBar(binding.toolbar);
+        setTitle(getString(R.string.me));
+        binding.toolbar.setNavigationIcon(R.drawable.ic_back);
+        binding.toolbar.setNavigationOnClickListener(v -> finish());
+
+        ImageDownLoader.setImageFromUrl(this, binding.avatar, App.getUser().getAvatarUrl());
+        binding.name.setText(App.getUser().getNick());
+        //binding.email.setText(App.getUser().getEmail());
+
+        binding.usage.setText(R.string.my_space_empty);
+        binding.logout.setOnClickListener(v -> logout());
+        binding.myShareLayout.setOnClickListener(v -> MyGistActivity.startMyShare(UserActivity.this));
+        setUsage();
+    }
+
+    private void setUsage() {
+        ShareCodeUtil.getInstance().initUsage(integer ->
+                binding.usage.setText(getString(R.string.my_space, integer == null ? 0 : integer)));
+    }
+
+    private void logout() {
+        new AlertDialog.Builder(this, R.style.MyDialog)
+                .setTitle(R.string.lout)
+                .setPositiveButton(R.string.yes, (dialog, which) -> {
+                    FirebaseAuth.getInstance().signOut();
+                    App.setUser(null);
+                    getPreferences(MODE_PRIVATE).edit().putBoolean(CONSTANT.IS_UPLOAD_INIT, false)
+                            .putString(CONSTANT.CLOUDED_MAP, "")
+                            .apply();
+                    File cloud_cache = new File(CONF.CLOUD_MAP_CACHE_PATH);
+                    if (cloud_cache.exists()) {
+                        cloud_cache.delete();
+                    }
+                    finish();
+                })
+                .setNegativeButton(R.string.no, null)
+                .create()
+                .show();
+
+    }
+}
\ No newline at end of file
diff --git a/qpython/src/os/java/org/qpython/qpy/main/app/AppInit.java b/qpython/src/os/java/org/qpython/qpy/main/app/AppInit.java
new file mode 100644
index 00000000..76cc52ab
--- /dev/null
+++ b/qpython/src/os/java/org/qpython/qpy/main/app/AppInit.java
@@ -0,0 +1,37 @@
+package org.qpython.qpy.main.app;
+
+import android.content.Context;
+import android.util.Log;
+
+import com.google.firebase.FirebaseApp;
+import com.google.firebase.iid.FirebaseInstanceId;
+import com.quseit.config.BASE_CONF;
+
+import org.qpython.qpy.codeshare.ShareCodeUtil;
+
+/**
+ * 文 件 名: AppInit
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2018/3/8 15:13
+ * 修改时间：
+ * 修改备注：
+ */
+
+public class AppInit {
+
+    public static void init(Context context){
+
+        FirebaseApp.initializeApp(context);
+        if (BASE_CONF.DEBUG) {
+            try {
+                FirebaseInstanceId xx = FirebaseInstanceId.getInstance();
+                if (xx != null) {
+                    Log.e("Firebase", xx.getToken());
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+        ShareCodeUtil.getInstance();
+    }
+}
diff --git a/qpython/src/os/java/org/qpython/qpy/main/fragment/ExplorerFragment.java b/qpython/src/os/java/org/qpython/qpy/main/fragment/ExplorerFragment.java
new file mode 100644
index 00000000..6705c248
--- /dev/null
+++ b/qpython/src/os/java/org/qpython/qpy/main/fragment/ExplorerFragment.java
@@ -0,0 +1,503 @@
+package org.qpython.qpy.main.fragment;
+
+import android.content.Intent;
+import android.databinding.DataBindingUtil;
+import android.graphics.Color;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.Environment;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.support.v7.app.AlertDialog;
+import android.support.v7.widget.LinearLayoutManager;
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Toast;
+
+import com.google.firebase.database.DatabaseReference;
+import com.quseit.util.FileHelper;
+import com.quseit.util.ImageUtil;
+import com.yanzhenjie.recyclerview.swipe.SwipeMenuCreator;
+import com.yanzhenjie.recyclerview.swipe.SwipeMenuItem;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.codeshare.ShareCodeUtil;
+import org.qpython.qpy.codeshare.pojo.CloudFile;
+import org.qpython.qpy.databinding.FragmentExplorerBinding;
+import org.qpython.qpy.main.activity.NotebookActivity;
+import org.qpython.qpy.main.activity.SettingActivity;
+import org.qpython.qpy.main.activity.SignInActivity;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.app.CONF;
+import org.qpython.qpy.texteditor.EditorActivity;
+import org.qpython.qpy.texteditor.TedLocalActivity;
+import org.qpython.qpy.texteditor.common.CommonEnums;
+import org.qpython.qpy.texteditor.common.RecentFiles;
+import org.qpython.qpy.texteditor.ui.adapter.FolderAdapter;
+import org.qpython.qpy.texteditor.ui.adapter.bean.FolderBean;
+import org.qpython.qpy.texteditor.ui.view.EnterDialog;
+import org.qpython.qpy.texteditor.widget.crouton.Crouton;
+import org.qpython.qpy.texteditor.widget.crouton.Style;
+import org.qpython.qpy.utils.FileUtils;
+import org.qpython.qpy.utils.NotebookUtil;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static com.quseit.util.FolderUtils.sortTypeByName;
+
+public class ExplorerFragment extends Fragment {
+    private static final int REQUEST_SAVE_AS   = 107;
+    private static final int REQUEST_HOME_PAGE = 109;
+    private static final int REQUEST_RECENT    = 111;
+    private static final int LOGIN_REQUEST     = 2741;
+
+    private static final String TYPE = "type";
+
+    private int WIDTH = (int) ImageUtil.dp2px(60);
+
+    private FragmentExplorerBinding binding;
+    private List<FolderBean>        folderList;
+    private FolderAdapter           adapter;
+    private Map<String, Boolean> cloudedMap = new HashMap<>();
+
+    private boolean openable = true; // 是否可打开文件
+    private boolean uploadable;
+
+    private int    type;
+    private String curPath;
+
+    public static ExplorerFragment newInstance(int type) {
+        ExplorerFragment myFragment = new ExplorerFragment();
+
+        Bundle args = new Bundle();
+        args.putInt(TYPE, type);
+        myFragment.setArguments(args);
+
+        return myFragment;
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.fragment_explorer, null);
+    }
+
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        binding = DataBindingUtil.bind(view);
+        type = getArguments().getInt(TYPE);
+        initView();
+        initListener();
+        initCloud();
+        switch (type) {
+            case REQUEST_RECENT:
+                binding.rlPath.setVisibility(View.GONE);
+                uploadable = false;
+                break;
+            case REQUEST_SAVE_AS:
+                binding.ivNewFolder.setVisibility(View.VISIBLE);
+                uploadable = false;
+                break;
+            case REQUEST_HOME_PAGE:
+                binding.ivNewFolder.setVisibility(View.VISIBLE);
+                uploadable = true;
+                break;
+        }
+    }
+
+    private void initView() {
+        SwipeMenuCreator swipeMenuCreator = (leftMenu, rightMenu, viewType) -> {
+//            SwipeMenuItem uploadItem = new SwipeMenuItem(getContext())
+//                    .setBackgroundColor(Color.parseColor("#FF4798F3"))
+//                    .setImage(R.drawable.ic_cloud_upload)
+//                    .setHeight(ViewGroup.LayoutParams.MATCH_PARENT)
+//                    .setWidth(WIDTH);
+
+            SwipeMenuItem renameItem = new SwipeMenuItem(getContext())
+                    .setBackgroundColor(Color.parseColor("#FF4BAC07"))
+                    .setImage(R.drawable.ic_file_rename)
+                    .setHeight(ViewGroup.LayoutParams.MATCH_PARENT)
+                    .setWidth(WIDTH);
+
+            SwipeMenuItem deleteItem = new SwipeMenuItem(getContext())
+                    .setBackgroundColor(Color.parseColor("#FFD14136"))
+                    .setImage(R.drawable.ic_editor_filetree_close)
+                    .setHeight(ViewGroup.LayoutParams.MATCH_PARENT)
+                    .setWidth(WIDTH);
+
+            switch (type) {
+                case REQUEST_RECENT:
+                    rightMenu.addMenuItem(deleteItem);
+                    break;
+                case REQUEST_SAVE_AS:
+                    rightMenu.addMenuItem(deleteItem);
+                    break;
+                case REQUEST_HOME_PAGE:
+                    //rightMenu.addMenuItem(uploadItem);
+                    rightMenu.addMenuItem(renameItem);
+                    rightMenu.addMenuItem(deleteItem);
+                    break;
+            }
+        };
+
+        folderList = new ArrayList<>();
+        adapter = new FolderAdapter(folderList, getArguments().getInt(TYPE) == REQUEST_RECENT);
+        adapter.setCloudMap(cloudedMap);
+        binding.swipeList.setLayoutManager(new LinearLayoutManager(getContext()));
+        binding.swipeList.setSwipeMenuCreator(swipeMenuCreator);
+        openDir(CONF.ABSOLUTE_PATH);
+    }
+
+    private void initListener() {
+        binding.ivNewFolder.setOnClickListener(v -> doNewDir());
+        binding.prevFolder.setOnClickListener(v -> {
+            try {
+                //采用Environment来获取sdcard路径
+                String parentPath = new File(curPath).getParent();
+
+                if (parentPath.length()>=Environment.getExternalStorageDirectory().getAbsolutePath().length()) {
+                    openDir(parentPath);
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        });
+        binding.swipeList.setSwipeMenuItemClickListener(menuBridge -> {
+            binding.swipeList.smoothCloseMenu();
+            switch (menuBridge.getPosition()) {
+                case 0:
+//                    if (uploadable) {
+//                        uploadFile(menuBridge.getAdapterPosition());
+//                    } else {
+//                        deleteFile(menuBridge.getAdapterPosition());
+//                    }
+//                    break;
+//                case 1:
+                    renameFile(menuBridge.getAdapterPosition());
+                    break;
+                case 1:
+                    deleteFile(menuBridge.getAdapterPosition());
+                    break;
+            }
+        });
+        adapter.setClickListener(new FolderAdapter.Click() {
+            @Override
+            public void onItemClick(int position) {
+                FolderBean item = folderList.get(position);
+                if (item.getType().equals(CommonEnums.FileType.FILE)) {
+                    if (!openable) {
+                        Toast.makeText(getActivity(), R.string.cant_open, Toast.LENGTH_SHORT).show();
+                        return;
+                    }
+                    //判断文件类型
+                    int lastDot = item.getName().lastIndexOf(".");
+                    if (lastDot != -1) {
+                        String ext = item.getName().substring(lastDot + 1);
+                        openFile(item.getFile(), ext);
+                    }
+                } else {
+                    openDir(item.getPath());
+                }
+            }
+
+            @Override
+            public void onLongClick(int position) {
+                binding.swipeList.smoothOpenRightMenu(position);
+            }
+        });
+
+        binding.swipeList.setAdapter(adapter);
+    }
+
+    private void gotoSetting() {
+        SettingActivity.startActivity(getActivity());
+    }
+    private void openFile(File file, String ext) {
+        List<String> textExts = Arrays.asList(getContext().getResources().getStringArray(R.array.text_ext));
+        if (textExts.contains(ext)) {
+            EditorActivity.start(getContext(), Uri.fromFile(file));
+        } else if (ext.equals("ipynb")) {
+            boolean notebookenable = NotebookUtil.isNotebookEnable(getActivity());
+            if (notebookenable) {
+                NotebookActivity.start(getActivity(), file.getAbsolutePath(), false);
+            } else {
+
+                new AlertDialog.Builder(getActivity(),R.style.MyDialog)
+                        .setTitle(R.string.dialog_alert)
+                        .setMessage(getString(R.string.ennable_notebook_first))
+                        .setNegativeButton(R.string.cancel, (dialog1, which) -> dialog1.dismiss())
+                        .setPositiveButton(R.string.ok, (dialog1, which) -> gotoSetting())
+                        .create()
+                        .show();
+
+                //Toast.makeText(getActivity(), R.string.ennable_notebook_first, Toast.LENGTH_SHORT).show();
+            }
+        } else {
+            FileUtils.openFile(getContext(), file);
+        }
+    }
+
+    private void uploadFile(int adapterPosition) {
+        File file = folderList.get(adapterPosition).getFile();
+
+        // only support type in <R.array.support_file_ext>
+        String ext = "";
+        if (file.getName().lastIndexOf(".") > 0) {
+            ext = file.getName().substring(file.getName().lastIndexOf(".") + 1);
+        }
+        boolean isSupport = false;
+        if (!file.isDirectory()) {
+            for (String s : getResources().getStringArray(R.array.support_file_ext)) {
+                if (s.equals(ext)) {
+                    isSupport = true;
+                    break;
+                }
+            }
+        } else {
+            isSupport = true;
+        }
+
+        if (!isSupport) {
+            Toast.makeText(getContext(), R.string.not_support_type_hint, Toast.LENGTH_SHORT).show();
+            return;
+        }
+
+        // only available for already login user
+        if (App.getUser() == null) {
+            new AlertDialog.Builder(getActivity(), R.style.MyDialog)
+                    .setTitle(R.string.need_login)
+                    .setMessage(R.string.upload_login_hint)
+                    .setNegativeButton(R.string.no, null)
+                    .setPositiveButton(getString(R.string.login_now), (dialog, which) ->
+                            startActivityForResult(new Intent(getActivity(), SignInActivity.class), LOGIN_REQUEST)
+                    )
+                    .create()
+                    .show();
+            return;
+        }
+
+        // upload
+        folderList.get(adapterPosition).setUploading(true);
+        adapter.notifyItemChanged(adapterPosition);
+        int[] size = {1};
+        DatabaseReference.CompletionListener listener = ((databaseError, databaseReference) -> {
+            if (databaseError == null) {
+//                updateClouded(folderList.get(adapterPosition).getFile());
+//                adapter.setUploadFile(adapterPosition);
+//                ((TedLocalActivity) getActivity()).setNewUpload();
+//                Toast.makeText(getActivity(), R.string.upload_suc, Toast.LENGTH_SHORT).show();
+//                ShareCodeUtil.getInstance().changeUsage(size[0]);
+            } else {
+                Toast.makeText(getActivity(), databaseError.getMessage(), Toast.LENGTH_SHORT).show();
+            }
+            folderList.get(adapterPosition).setUploading(false);
+            adapter.notifyDataSetChanged();
+        });
+        if (folderList.get(adapterPosition).getFile().isDirectory()) {
+            // 如果上传整个projects目录，则将该目录下项目分开上传
+            if (folderList.get(adapterPosition).getName().contains("projects")) {
+                File[] files = folderList.get(adapterPosition).getFile().listFiles();
+                for (int i = 0; i < files.length; i++) {
+                    if (!ShareCodeUtil.getInstance().uploadFolder(files[i].getPath(), i == 0 ? null : listener, size)) {
+                        folderList.get(adapterPosition).setUploading(false);
+                        adapter.notifyDataSetChanged();
+                    }
+                }
+            } else {
+                if (!ShareCodeUtil.getInstance().uploadFolder(folderList.get(adapterPosition).getPath(), listener, size)) {
+                    folderList.get(adapterPosition).setUploading(false);
+                    adapter.notifyDataSetChanged();
+                }
+            }
+        } else {
+            if (!ShareCodeUtil.getInstance().uploadFile(folderList.get(adapterPosition).getPath(), listener)) {
+                folderList.get(adapterPosition).setUploading(false);
+                adapter.notifyDataSetChanged();
+            }
+        }
+    }
+
+    private void renameFile(int adapterPosition) {
+        new EnterDialog(getContext())
+                .setTitle(getString(R.string.rename))
+                .setConfirmListener(name -> {
+                    File oldFile = folderList.get(adapterPosition).getFile();
+                    File newFile = new File(oldFile.getParent(), name);
+                    boolean renameSuc = oldFile.renameTo(newFile);
+                    if (renameSuc) {
+                        folderList.set(adapterPosition, new FolderBean(newFile));
+                        adapter.notifyItemChanged(adapterPosition);
+                        return true;
+                    } else {
+                        Toast.makeText(getActivity(), R.string.rename_fail, Toast.LENGTH_SHORT).show();
+                        return false;
+                    }
+                })
+                .setText(folderList.get(adapterPosition).getName())
+                .show();
+    }
+
+    private void deleteFile(int adapterPosition) {
+        switch (type) {
+            case REQUEST_RECENT:
+                RecentFiles.removePath(folderList.get(adapterPosition).getPath());
+                folderList.remove(adapterPosition);
+                adapter.notifyDataSetChanged();
+                break;
+            case REQUEST_HOME_PAGE:
+            case REQUEST_SAVE_AS:
+                AlertDialog.Builder builder = new AlertDialog.Builder(getActivity(), R.style.MyDialog);
+                builder.setTitle(R.string.warning)
+                        .setMessage(R.string.delete_file_hint)
+                        .setNegativeButton(R.string.no, null)
+                        .setPositiveButton(R.string.yes, (dialog, which) -> {
+                            String dir = folderList.get(adapterPosition).getFile().getParent();
+                            FileHelper.clearDir(folderList.get(adapterPosition).getFile().getAbsolutePath(), 0, true);
+                            openDir(dir);
+
+//                            folderList.remove(adapterPosition);
+//                            adapter.notifyItemRemoved(adapterPosition);
+                        })
+                        .show();
+                break;
+        }
+    }
+
+    private void openDir(String dirPath) {
+        if (type == REQUEST_RECENT) {
+            folderList.clear();
+            for (String path : RecentFiles.getRecentFiles()) {
+                folderList.add(new FolderBean(new File(path)));
+            }
+
+            if (folderList.size() == 0) {
+                binding.emptyHint.setVisibility(View.VISIBLE);
+            } else {
+                binding.emptyHint.setVisibility(View.GONE);
+                adapter.notifyDataSetChanged();
+            }
+        } else {
+            binding.tvPath.setText(dirPath);
+            curPath = dirPath;
+            File dir = new File(dirPath);
+            if (dir.exists()) {
+                File[] files = dir.listFiles();
+                if (files != null) {
+                    Arrays.sort(files, sortTypeByName);
+                    folderList.clear();
+                    adapter.notifyDataSetChanged();
+                    for (File file : files) {
+                        if (!dir.getName().equals(CONF.BASE_PATH)) {
+                            if (!file.getName().startsWith(".")) {
+                                folderList.add(new FolderBean(file));
+                            }
+
+                        } else {
+                            folderList.add(new FolderBean(file));
+
+                        }
+
+                    }
+                    adapter.notifyDataSetChanged();
+                }
+            } else {
+                Toast.makeText(getContext(), R.string.file_not_exists, Toast.LENGTH_SHORT).show();
+            }
+        }
+    }
+
+    private void doNewDir() {
+        new EnterDialog(getContext())
+                .setTitle(getString(R.string.new_folder))
+                .setHint(getString(R.string.folder_name))
+                .setConfirmListener(name -> {
+                    File dirN = new File(curPath, name.equals("") ? getString(R.string.untitled_folder) : name);
+                    if (dirN.exists()) {
+                        Crouton.makeText(getActivity(), getString(R.string.toast_folder_exist), Style.ALERT).show();
+                        return false;
+                    } else {
+                        if (dirN.mkdirs()) {
+                            openDir(curPath + "/" + name);
+                        } else {
+                            Toast.makeText(getContext(), R.string.mkdir_fail, Toast.LENGTH_SHORT).show();
+                        }
+                        return true;
+                    }
+                })
+                .show();
+    }
+
+    public void backToPrev() {
+        Log.d("ExplorerFragment", "backToPrev:"+curPath);
+        String qpyDir = Environment.getExternalStorageDirectory().getAbsolutePath()+"/qpython";
+        if (curPath == null || qpyDir.equals(curPath) || Environment.getExternalStorageDirectory().getAbsolutePath().equals(curPath)) {
+            getActivity().finish();
+        } else {
+            String parentPath = new File(curPath).getParent();
+            if (!TextUtils.isEmpty(parentPath)) openDir(parentPath);
+        }
+    }
+
+    private void updateClouded(File file) {
+        if (file.getParent().contains("projects")) {
+            String parent = file.getParent() + "/";
+            String subPath = file.getPath().substring(file.getPath().indexOf(parent) + parent.length());
+            String projName = subPath.contains("/") ? subPath.substring(0, subPath.indexOf("/")) : "/" + subPath;
+            cloudedMap.put(CONF.ABSOLUTE_PATH + projName, true);
+        }
+        if (file.isDirectory()) {
+            for (File file1 : FileHelper.filterExt(file, getResources().getStringArray(R.array.support_file_ext))) {
+                cloudedMap.put(file1.getPath(), true);
+            }
+        } else {
+            cloudedMap.put(file.getPath(), true);
+        }
+    }
+
+    public String getCurPath() {
+        return curPath;
+    }
+
+    private void initCloud() {
+        if (App.getUser() == null) {
+            return;
+        }
+        ShareCodeUtil.getInstance().getUploadedScripts(false, getActivity(), cloudFiles -> {
+            if (cloudFiles == null || cloudFiles.size() == 0) {
+                return;
+            }
+            for (CloudFile cloudFile : cloudFiles) {
+                if (cloudFile.getPath().contains("/projects")) {
+                    String projNode = cloudFile.getPath().contains("/projects3/") ? "/projects3/" : "/projects/";
+                    cloudedMap.put(CONF.ABSOLUTE_PATH + projNode + cloudFile.getProjectName(), true);
+                }
+                cloudedMap.put(CONF.ABSOLUTE_PATH + cloudFile.getPath(), true);
+            }
+            adapter.setCloudMap(cloudedMap);
+            adapter.notifyDataSetChanged();
+        });
+    }
+
+    public void deleteCloudedMap(String absolutePath) {
+        if (cloudedMap.containsKey(absolutePath)) {
+            cloudedMap.remove(absolutePath);
+            adapter.notifyDataSetChanged();
+        }
+    }
+
+    public void updateCloudedFiles(Map<String, Boolean> map) {
+        if (map != null) {
+            cloudedMap.putAll(map);
+        }
+        adapter.notifyDataSetChanged();
+    }
+}
diff --git a/qpython/src/os/java/org/qpython/qpy/main/fragment/MyProjectFragment.java b/qpython/src/os/java/org/qpython/qpy/main/fragment/MyProjectFragment.java
new file mode 100644
index 00000000..1b52cf26
--- /dev/null
+++ b/qpython/src/os/java/org/qpython/qpy/main/fragment/MyProjectFragment.java
@@ -0,0 +1,256 @@
+package org.qpython.qpy.main.fragment;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.databinding.DataBindingUtil;
+import android.graphics.Color;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.support.v7.app.AlertDialog;
+import android.support.v7.widget.LinearLayoutManager;
+import android.text.Html;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Toast;
+
+import com.quseit.util.DateTimeHelper;
+import com.quseit.util.ImageUtil;
+import com.yanzhenjie.recyclerview.swipe.SwipeMenuCreator;
+import com.yanzhenjie.recyclerview.swipe.SwipeMenuItem;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.codeshare.CONSTANT;
+import org.qpython.qpy.codeshare.ShareCodeUtil;
+import org.qpython.qpy.codeshare.pojo.CloudFile;
+import org.qpython.qpy.databinding.FragmentRefreshRvBinding;
+import org.qpython.qpy.main.adapter.CloudScriptAdapter;
+import org.qpython.qpy.texteditor.TedLocalActivity;
+import org.qpython.qpysdk.QPyConstants;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+import rx.Observable;
+import rx.android.schedulers.AndroidSchedulers;
+
+public class MyProjectFragment extends Fragment {
+    private int WIDTH = (int) ImageUtil.dp2px(60);
+    private FragmentRefreshRvBinding binding;
+    private CloudScriptAdapter adapter;
+    private List<CloudFile> scriptList = new ArrayList<>();
+    private TedLocalActivity activity;
+
+    public boolean isLoading;
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) {
+        binding = DataBindingUtil.bind(LayoutInflater.from(getContext()).inflate(R.layout.fragment_refresh_rv, null));
+        return binding.getRoot();
+    }
+
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        scriptList = new ArrayList<>();
+        adapter = new CloudScriptAdapter(scriptList);
+        ShareCodeUtil.getInstance().clearAll();
+        initView();
+        initListener();
+        retry(true);
+    }
+
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        activity = (TedLocalActivity) context;
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        if (adapter != null) {
+            adapter.notifyDataSetChanged();
+        }
+    }
+
+    @Override
+    public void onStop() {
+        super.onStop();
+//        activity.locatedCloud(scriptList);
+    }
+
+    public void retry(boolean forceRefresh) {
+        if (scriptList != null && adapter != null) {
+            scriptList.clear();
+            adapter.notifyDataSetChanged();
+        }
+        startProgressBar();
+        isLoading = true;
+        ShareCodeUtil.getInstance().getUploadedScripts(forceRefresh, getActivity(), cloudFiles -> {
+            isLoading = false;
+            if (cloudFiles == null || cloudFiles.size() == 0) {
+                showEmpty();
+                return;
+            }
+//            ((TedLocalActivity) getActivity()).updateCloudFiles(cloudFiles);
+            scriptList.clear();
+            scriptList.addAll(cloudFiles);
+            adapter.notifyDataSetChanged();
+            binding.progressBar.setVisibility(View.GONE);
+            binding.netError.setVisibility(View.GONE);
+        });
+    }
+
+    public void notifyDataSetChange() {
+        if (adapter != null) adapter.notifyDataSetChanged();
+    }
+
+    private void startProgressBar() {
+        binding.progressBar.setVisibility(View.VISIBLE);
+        binding.netError.setVisibility(View.GONE);
+        Observable.just(null)
+                .delay(5, TimeUnit.SECONDS)
+                .observeOn(AndroidSchedulers.mainThread())
+                .doOnNext(o -> showNetErrorText())
+                .subscribe();
+    }
+
+    private void showEmpty() {
+        if (binding.progressBar.getVisibility() == View.VISIBLE) {
+            binding.progressBar.setVisibility(View.GONE);
+            binding.netError.setText(R.string.cloud_empty_hint);
+            binding.netError.setVisibility(View.VISIBLE);
+        }
+    }
+
+    private void showNetErrorText() {
+        if (binding.progressBar.getVisibility() == View.VISIBLE) {
+            binding.progressBar.setVisibility(View.GONE);
+            binding.netError.setText(R.string.net_lagging);
+            binding.netError.setVisibility(View.VISIBLE);
+        }
+    }
+
+    private void initView() {
+        SwipeMenuCreator swipeMenuCreator = (leftMenu, rightMenu, viewType) -> {
+            SwipeMenuItem deleteItem = new SwipeMenuItem(getContext())
+                    .setBackgroundColor(Color.parseColor("#FFD14136"))
+                    .setImage(R.drawable.ic_editor_filetree_close)
+                    .setHeight(ViewGroup.LayoutParams.MATCH_PARENT)
+                    .setWidth(WIDTH);
+
+            SwipeMenuItem downloadItem = new SwipeMenuItem(getContext())
+                    .setBackgroundColor(Color.parseColor("#FF4798F3"))
+                    .setImage(R.drawable.ic_cloud_download)
+                    .setHeight(ViewGroup.LayoutParams.MATCH_PARENT)
+                    .setWidth(WIDTH);
+            rightMenu.addMenuItem(downloadItem);
+            rightMenu.addMenuItem(deleteItem);
+        };
+        binding.swipeList.setLayoutManager(new LinearLayoutManager(getContext()));
+        binding.swipeList.setSwipeMenuCreator(swipeMenuCreator);
+    }
+
+    @SuppressLint("StringFormatMatches")
+    private void initListener() {
+        binding.netError.setOnClickListener(v -> retry(true));
+        binding.swipeList.setSwipeMenuItemClickListener(menuBridge -> {
+            menuBridge.closeMenu();
+            switch (menuBridge.getPosition()) {
+                case 0:
+                    // download
+                    CloudFile cloudFile = scriptList.get(menuBridge.getAdapterPosition());
+                    cloudFile.setUploading(true);
+                    adapter.notifyItemChanged(menuBridge.getAdapterPosition());
+                    String path;
+                    path = QPyConstants.ABSOLUTE_PATH + cloudFile.getPath();
+                    File file = new File(path);
+                    if (file.exists()) {
+                        new AlertDialog.Builder(getContext(), R.style.MyDialog)
+                                .setTitle(R.string.override_hint)
+                                .setMessage(Html.fromHtml(getString(R.string.conflict_hint,
+                                        cloudFile.getUploadTime(),
+                                        DateTimeHelper.AGO_FULL_DATE_FORMATTER.format(new Date(file.lastModified())))))
+                                .setNegativeButton(R.string.no, (dialog, which) ->{
+                                    cloudFile.setUploading(false);
+                                    adapter.notifyItemChanged(menuBridge.getAdapterPosition());
+                                })
+                                .setPositiveButton(R.string.yes,
+                                        (dialog, which) ->
+                                                getRemoteContentNWrite(cloudFile, path, menuBridge.getAdapterPosition()))
+                                .create()
+                                .show();
+                    } else {
+                        getRemoteContentNWrite(cloudFile, path, menuBridge.getAdapterPosition());
+                    }
+                    break;
+                case 1:
+                    // delete
+                    scriptList.get(menuBridge.getAdapterPosition()).setUploading(true);
+                    adapter.notifyItemChanged(menuBridge.getAdapterPosition());
+                    ShareCodeUtil.getInstance().deleteUploadScript(scriptList.get(menuBridge.getAdapterPosition()), (databaseError, databaseReference) -> {
+//                        if (databaseError == null && getContext() != null) {
+//                            Toast.makeText(getContext(), R.string.delete_remote_suc, Toast.LENGTH_SHORT).show();
+//                            adapter.notifyItemRemoved(menuBridge.getAdapterPosition());
+//                            ((TedLocalActivity) getActivity()).deleteCloudFile(scriptList.get(menuBridge.getAdapterPosition()).getAbsolutePath());
+//                            scriptList.remove(menuBridge.getAdapterPosition());
+//                            if (scriptList.size() == 0) {
+//                                binding.netError.setText(R.string.cloud_empty_hint);
+//                                binding.netError.setVisibility(View.VISIBLE);
+//                            } else {
+//                                binding.netError.setVisibility(View.INVISIBLE);
+//                            }
+//                        } else {
+//                            Toast.makeText(getContext(), databaseError.getMessage(), Toast.LENGTH_SHORT).show();
+//                        }
+                    });
+                    break;
+            }
+        });
+        adapter.setCallback((position) -> binding.swipeList.smoothOpenRightMenu(position));
+        binding.swipeList.setAdapter(adapter);
+    }
+
+    private void getRemoteContentNWrite(CloudFile cloudFile, String path, int position) {
+        String key = cloudFile.getKey();
+        if (cloudFile.getProjectName() != null && !cloudFile.getKey().contains("projects3")) {
+            key = key.replace(cloudFile.getProjectName() + CONSTANT.SLASH_REPLACE, cloudFile.getProjectName() + "/" + CONSTANT.SLASH_REPLACE);
+        }
+        ShareCodeUtil.getInstance().getFileContent(key, content -> {
+            writeFile(path, content, position);
+            scriptList.get(position).setUploading(false);
+            adapter.notifyItemChanged(position);
+        });
+    }
+
+    private void writeFile(String path, String content, int adapterPosition) {
+        try {
+            FileWriter writer = new FileWriter(new File(path), false);
+            writer.write(content);
+            writer.close();
+            Toast.makeText(getContext(), R.string.file_downloaded, Toast.LENGTH_SHORT).show();
+            adapter.notifyItemChanged(adapterPosition);
+        } catch (IOException e) {
+            e.printStackTrace();
+            Toast.makeText(getContext(), R.string.override_fail_hint, Toast.LENGTH_SHORT).show();
+        }
+    }
+
+    public void needRefresh(boolean isNewUpload) {
+        if (binding == null) {
+            // not init yet
+            return;
+        }
+        if (isNewUpload) {
+            retry(true);
+        }
+    }
+}
diff --git a/qpython/src/os/java/org/qpython/qpy/main/receiver/LeancloudReceiver.java b/qpython/src/os/java/org/qpython/qpy/main/receiver/LeancloudReceiver.java
new file mode 100644
index 00000000..6f12375e
--- /dev/null
+++ b/qpython/src/os/java/org/qpython/qpy/main/receiver/LeancloudReceiver.java
@@ -0,0 +1,18 @@
+package org.qpython.qpy.main.receiver;
+
+import android.annotation.SuppressLint;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+
+/**
+ * 处理leancloud的消息推送
+ */
+public class LeancloudReceiver extends BroadcastReceiver {
+
+    @SuppressLint("UnsafeProtectedBroadcastReceiver")
+    @Override
+    public void onReceive(Context context, Intent intent) {
+
+    }
+}
\ No newline at end of file
diff --git a/qpython/src/os/java/org/qpython/qpy/main/service/MyFirebaseInstanceIDService.java b/qpython/src/os/java/org/qpython/qpy/main/service/MyFirebaseInstanceIDService.java
new file mode 100644
index 00000000..362c2336
--- /dev/null
+++ b/qpython/src/os/java/org/qpython/qpy/main/service/MyFirebaseInstanceIDService.java
@@ -0,0 +1,15 @@
+package org.qpython.qpy.main.service;
+
+import com.google.firebase.iid.FirebaseInstanceId;
+import com.google.firebase.iid.FirebaseInstanceIdService;
+
+/**
+ * Created by Hmei on 2017-06-29.
+ */
+
+public class MyFirebaseInstanceIDService extends FirebaseInstanceIdService {
+    @Override
+    public void onTokenRefresh() {
+        String refreshedToken = FirebaseInstanceId.getInstance().getToken();
+    }
+}
diff --git a/qpython/src/os/java/org/qpython/qpy/main/service/MyFirebaseMessagingService.java b/qpython/src/os/java/org/qpython/qpy/main/service/MyFirebaseMessagingService.java
new file mode 100644
index 00000000..9f333943
--- /dev/null
+++ b/qpython/src/os/java/org/qpython/qpy/main/service/MyFirebaseMessagingService.java
@@ -0,0 +1,88 @@
+package org.qpython.qpy.main.service;
+
+import android.app.Notification;
+import android.app.NotificationManager;
+import android.app.PendingIntent;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.net.Uri;
+import android.os.Bundle;
+import android.preference.PreferenceManager;
+
+import com.google.firebase.messaging.FirebaseMessagingService;
+import com.google.firebase.messaging.RemoteMessage;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.qpython.qpy.R;
+import org.qpython.qpy.main.activity.QWebViewActivity;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.app.CONF;
+import org.qpython.qpy.main.receiver.NotificationBean;
+
+import java.util.Map;
+
+
+public class MyFirebaseMessagingService extends FirebaseMessagingService {
+    private static final int LOG_NOTIFICATION_ID = (int) System.currentTimeMillis();
+
+    private boolean handled = false;
+
+    @Override
+    public void onMessageReceived(RemoteMessage remoteMessage) {
+        super.onMessageReceived(remoteMessage);
+        Map<String, String> data = remoteMessage.getData();
+        String json = App.getGson().toJson(data);
+        NotificationBean bean = App.getGson().fromJson(json, NotificationBean.class);
+        if (!bean.isForce()&&!PreferenceManager.getDefaultSharedPreferences(this).getBoolean(getString(R.string.key_hide_push), true)) {
+            return;
+        }
+        Intent intent;
+        if (bean.getType().equals("ext")) {
+            intent = new Intent(Intent.ACTION_VIEW, Uri.parse(bean.getLink()));
+        } else {
+            intent = new Intent(App.getContext(), QWebViewActivity.class);
+            intent.putExtra(QWebViewActivity.TITLE, bean.getTitle());
+            intent.putExtra("url", bean.getLink());
+        }
+
+        PendingIntent pendingIntent = PendingIntent.getActivity(this, 0, intent, PendingIntent.FLAG_ONE_SHOT);
+
+        Notification.Builder builder = new Notification.Builder(this)
+                .setSmallIcon(R.drawable.img_home_logo)
+                .setContentTitle(getString(R.string.app_name))
+                .setContentText(bean.getMsg())
+                .setContentIntent(pendingIntent)
+                .setAutoCancel(true);
+
+        Notification notification;
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN) {
+            notification = builder.build();
+        } else {
+            notification = builder.getNotification();
+        }
+        NotificationManager mNotifyMgr = (NotificationManager) getSystemService(NOTIFICATION_SERVICE);
+        mNotifyMgr.notify(LOG_NOTIFICATION_ID, notification);
+        handled = true;
+    }
+
+ /*   @Override
+    public void handleIntent(Intent intent) {
+        super.handleIntent(intent);
+        if (handled) {
+            return;
+        }
+        Bundle bundle = intent.getExtras();
+        JSONObject extras = new JSONObject();
+        try {
+            for (String s : bundle.keySet()) {
+                extras.put(s, bundle.get(s));
+            }
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+        SharedPreferences.Editor editor = getSharedPreferences(CONF.NOTIFICATION_SP_NAME, MODE_PRIVATE).edit();
+        editor.putString(CONF.NOTIFICATION_SP_OBJ, extras.toString());
+        editor.apply();
+    }*/
+}
\ No newline at end of file
diff --git a/qpython/src/os/java/org/qpython/qpy/main/service/PayUtil.java b/qpython/src/os/java/org/qpython/qpy/main/service/PayUtil.java
new file mode 100644
index 00000000..8b88e8cc
--- /dev/null
+++ b/qpython/src/os/java/org/qpython/qpy/main/service/PayUtil.java
@@ -0,0 +1,150 @@
+package org.qpython.qpy.main.service;
+
+import android.app.Activity;
+import android.app.PendingIntent;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentSender;
+import android.content.ServiceConnection;
+import android.os.Bundle;
+import android.os.IBinder;
+import android.os.RemoteException;
+import android.view.View;
+import android.widget.Toast;
+
+import com.android.vending.billing.IInAppBillingService;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.qpython.qpy.R;
+import org.qpython.qpy.main.server.MySubscriber;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+
+import rx.Observable;
+import rx.android.schedulers.AndroidSchedulers;
+import rx.schedulers.Schedulers;
+
+/**
+ * Created by Hmei
+ * 1/31/18.
+ */
+
+public class PayUtil {
+    private static final int BUY_REQUEST_CODE = 2333;
+    private IInAppBillingService mService;
+    private ServiceConnection    mServiceConn;
+    private Activity             context;
+
+    public PayUtil(Activity context) {
+        this.context = context;
+    }
+
+    public void initIAP(PayCallback callback) {
+        mServiceConn = new ServiceConnection() {
+            @Override
+            public void onServiceDisconnected(ComponentName name) {
+                mService = null;
+            }
+
+            @Override
+            public void onServiceConnected(ComponentName name,
+                                           IBinder service) {
+                mService = IInAppBillingService.Stub.asInterface(service);
+                if (callback != null) callback.doAfterConn();
+            }
+        };
+        Intent serviceIntent = new Intent("com.android.vending.billing.InAppBillingService.BIND");
+        serviceIntent.setPackage("com.android.vending");
+        context.bindService(serviceIntent, mServiceConn, Context.BIND_AUTO_CREATE);
+    }
+
+    /**
+     * 从Google服务器获取不同国家价格表并显示
+     */
+    public void getPrices(ArrayList<String> skuList, MySubscriber<String[]> callback) {
+        if (mService == null) {
+            Toast.makeText(context, R.string.lose_google_server, Toast.LENGTH_SHORT).show();
+            if (context.findViewById(R.id.pb) != null)
+                context.findViewById(R.id.pb).setVisibility(View.GONE);
+            return;
+        }
+        Bundle querySkus = new Bundle();
+        querySkus.putStringArrayList("ITEM_ID_LIST", skuList);
+        try {
+            Observable.just(mService.getSkuDetails(3, context.getPackageName(), "inapp", querySkus))
+                    .map(bundle -> {
+                                ArrayList<String> responseList = bundle.getStringArrayList("DETAILS_LIST");
+                                if (responseList == null) {
+                                    return null;
+                                }
+                                String[] prices = new String[responseList.size()];
+                                for (int i = 0; i < responseList.size(); i++) {
+                                    JSONObject object;
+                                    try {
+                                        object = new JSONObject(responseList.get(i));
+                                        String price = object.getString("price");
+                                        prices[i] = price;
+                                    } catch (JSONException e) {
+                                        e.printStackTrace();
+                                    }
+                                }
+                                Arrays.sort(prices, (o1, o2) -> Integer.parseInt(o1.replaceAll("[^0-9]", "")) - Integer.parseInt(o2.replaceAll("[^0-9]", "")));
+                                return prices;
+                            }
+                    )
+                    .subscribeOn(Schedulers.newThread())
+                    .observeOn(AndroidSchedulers.mainThread())
+                    .subscribe(callback);
+        } catch (RemoteException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public void digestPurchase(String purchaseToken) {
+        // 消耗购买，使能重复赞赏同一金额
+        try {
+            Observable.just(mService.consumePurchase(3, context.getPackageName(), purchaseToken))
+                    .subscribeOn(Schedulers.newThread())
+                    .observeOn(AndroidSchedulers.mainThread())
+                    .subscribe();
+        } catch (RemoteException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public void purchase(String sku) {
+        try {
+            if (mService == null) {
+                Toast.makeText(context, R.string.lose_google_server, Toast.LENGTH_SHORT).show();
+                return;
+            }
+            Bundle buyIntentBundle = mService.getBuyIntent(3, context.getPackageName(),
+                    sku, "inapp", "bGoa+V7g/yqDXvKRqq+JTFn4uQZbPiQJo4pf9RzJ");
+            switch (buyIntentBundle.getInt("RESPONSE_CODE")) {
+                case 0:
+                    //BILLING_RESPONSE_RESULT_OK
+                    PendingIntent pendingIntent = buyIntentBundle.getParcelable("BUY_INTENT");
+                    context.startIntentSenderForResult(pendingIntent.getIntentSender(),
+                            BUY_REQUEST_CODE, new Intent(), 0, 0, 0);
+                    break;
+
+            }
+        } catch (RemoteException | IntentSender.SendIntentException | NullPointerException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public void unbindPayService() {
+        if (mService != null) {
+            context.unbindService(mServiceConn);
+        }
+    }
+
+    public interface PayCallback {
+        void doAfterConn();
+    }
+
+}
diff --git a/qpython/src/os/java/org/qpython/qpy/texteditor/TedLocalActivity.java b/qpython/src/os/java/org/qpython/qpy/texteditor/TedLocalActivity.java
new file mode 100644
index 00000000..466f0c8a
--- /dev/null
+++ b/qpython/src/os/java/org/qpython/qpy/texteditor/TedLocalActivity.java
@@ -0,0 +1,308 @@
+package org.qpython.qpy.texteditor;
+
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.content.res.Configuration;
+import android.databinding.DataBindingUtil;
+import android.graphics.drawable.Drawable;
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.support.v7.app.AppCompatActivity;
+import android.view.MotionEvent;
+import android.view.View;
+import android.widget.EditText;
+import android.widget.Toast;
+
+import com.google.gson.reflect.TypeToken;
+import com.quseit.util.FileHelper;
+import com.quseit.util.NAction;
+
+import org.qpython.qpy.R;
+import org.qpython.qpy.codeshare.pojo.CloudFile;
+import org.qpython.qpy.databinding.ActivityLocalBinding;
+import org.qpython.qpy.main.activity.SignInActivity;
+import org.qpython.qpy.main.app.App;
+import org.qpython.qpy.main.app.CONF;
+import org.qpython.qpy.main.fragment.ExplorerFragment;
+import org.qpython.qpy.main.fragment.LocalFragment;
+import org.qpython.qpy.main.fragment.MyProjectFragment;
+import org.qpython.qpy.utils.NotebookUtil;
+import org.qpython.qpysdk.QPyConstants;
+
+import java.io.File;
+import java.lang.reflect.Type;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class TedLocalActivity extends AppCompatActivity {
+    public static final  int REQUEST_SAVE_AS    = 107;
+    public static final  int REQUEST_OPEN       = 108;
+    public static final  int REQUEST_HOME_PAGE  = 109;
+    public static final  int REQUEST_RECENT     = 111;
+    private static final int LOGIN_REQUEST_CODE = 4806;
+
+    private static final String EXTRA_REQUEST_CODE = "request_code";
+    private static final String EXTRA_REQUEST_FN = "request_fn";
+
+    private static final String FRAGMENT_EXPLORER  = "explorer";
+    private static final String FRAGMENT_CLOUD     = "cloud";
+
+    private ActivityLocalBinding binding;
+
+    private Fragment firstPageFragment;
+    private MyProjectFragment myProjectFragment;
+
+    private boolean isExplorer  = true;
+    private boolean isNewUpload = false;
+    //private String defaultFileName = "";
+
+    public static void start(Context context, int type) {
+        Intent starter = new Intent(context, TedLocalActivity.class);
+        starter.putExtra(EXTRA_REQUEST_CODE, type);
+        context.startActivity(starter);
+    }
+
+    public static void start(Activity context, int type, int requestCode, String filename) {
+        Intent starter = new Intent(context, TedLocalActivity.class);
+        starter.putExtra(EXTRA_REQUEST_CODE, type);
+        starter.putExtra(EXTRA_REQUEST_FN, filename);
+
+        context.startActivityForResult(starter, requestCode);
+    }
+
+    public void finishForGetPath(String path) {
+        Intent intent = new Intent();
+        intent.putExtra("path", path);
+        setResult(Activity.RESULT_OK, intent);
+        finish();
+    }
+
+    public void finishForOpen(String path, boolean isProj) {
+        Intent intent = new Intent();
+        intent.putExtra("path", path);
+        intent.putExtra("isProj", isProj);
+        setResult(Activity.RESULT_OK, intent);
+        finish();
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        binding = DataBindingUtil.setContentView(this, R.layout.activity_local);
+        setSupportActionBar(binding.toolbar);
+        int type = getIntent().getIntExtra(EXTRA_REQUEST_CODE, REQUEST_HOME_PAGE);
+
+        initView();
+        initListener();
+        switch (type) {
+            case REQUEST_RECENT:
+                setTitle(R.string.recent);
+                binding.switchBtn.setVisibility(View.GONE);
+                firstPageFragment = ExplorerFragment.newInstance(type);
+                break;
+            case REQUEST_OPEN:
+                setTitle(R.string.open);
+                binding.switchBtn.setVisibility(View.GONE);
+                binding.explore.setVisibility(View.VISIBLE);
+                firstPageFragment = new LocalFragment();
+                break;
+            case REQUEST_SAVE_AS:
+                setTitle(R.string.save_as);
+                binding.vsSave.getRoot().setVisibility(View.VISIBLE);
+                initSaveListener();
+
+                String fn = getIntent().getStringExtra(EXTRA_REQUEST_FN);
+                if (fn!=null) {
+                    binding.vsSave.etName.setText(fn);
+                }
+                binding.switchBtn.setVisibility(View.GONE);
+                firstPageFragment = ExplorerFragment.newInstance(type);
+                break;
+            case REQUEST_HOME_PAGE:
+                setTitle(R.string.explorer);
+                firstPageFragment = ExplorerFragment.newInstance(type);
+                break;
+        }
+
+        getSupportFragmentManager().beginTransaction()
+                .add(R.id.container, firstPageFragment, FRAGMENT_EXPLORER)
+                .commit();
+    }
+
+    @Override
+    public void onConfigurationChanged(Configuration newConfig) {
+        super.onConfigurationChanged(newConfig);
+    }
+
+    private void initView() {
+        binding.toolbar.setNavigationIcon(R.drawable.ic_back);
+        binding.toolbar.setNavigationOnClickListener(v -> finish());
+        if (binding.switchBtn.getVisibility() == View.VISIBLE) {
+            myProjectFragment = new MyProjectFragment();
+        }
+    }
+
+    private void initListener() {
+        binding.switchBtn.setOnClickListener(v -> {
+            if (isExplorer) {
+                if (App.getUser() == null) {
+                    startActivityForResult(new Intent(this, SignInActivity.class), LOGIN_REQUEST_CODE);
+                    return;
+                }
+                binding.switchBtn.setImageResource(R.drawable.ic_folder_open);
+                binding.refresh.setVisibility(View.VISIBLE);
+                if (getSupportFragmentManager().findFragmentByTag(FRAGMENT_CLOUD) == null) {
+                    getSupportFragmentManager().beginTransaction().add(R.id.container, myProjectFragment, FRAGMENT_CLOUD).commit();
+                    getSupportFragmentManager().beginTransaction().hide(firstPageFragment).commit();
+                } else {
+                    getSupportFragmentManager().beginTransaction()
+                            .hide(firstPageFragment)
+                            .show(myProjectFragment)
+                            .commit();
+                }
+                myProjectFragment.needRefresh(isNewUpload);
+                isNewUpload = false;
+                if (!myProjectFragment.isLoading) {
+                    myProjectFragment.notifyDataSetChange();
+                }
+            } else {
+                binding.switchBtn.setImageResource(R.drawable.ic_cloud_list);
+                binding.refresh.setVisibility(View.GONE);
+                getSupportFragmentManager().beginTransaction()
+                        .hide(myProjectFragment)
+                        .show(firstPageFragment)
+                        .commit();
+            }
+            isExplorer = !isExplorer;
+        });
+
+        binding.refresh.setOnClickListener(v -> myProjectFragment.retry(true));
+
+        binding.explore.setOnClickListener(v -> {
+            start(this, REQUEST_HOME_PAGE);
+            finish();
+        });
+    }
+
+    public void doSave(String fn) {
+        if (fn.length() == 0) {
+            Toast.makeText(getApplicationContext(), R.string.toast_filename_empty, Toast.LENGTH_SHORT).show();
+        } else {
+            String filename = ((ExplorerFragment) firstPageFragment).getCurPath() + "/" + fn;
+            final File f = new File(filename);
+            if (f.exists()) {
+                Toast.makeText(this, R.string.file_exist_hint, Toast.LENGTH_SHORT).show();
+            } else {
+                setSaveResult(f.getAbsolutePath());
+            }
+        }
+    }
+
+    protected boolean setSaveResult(String filepath) {
+        File f = new File(filepath);
+        if (f.getParentFile().canWrite()) {
+            finishForGetPath(filepath);
+        } else {
+            Toast.makeText(getApplicationContext(), R.string.toast_folder_cant_write, Toast.LENGTH_SHORT).show();
+        }
+        return true;
+    }
+
+    private void initSaveListener() {
+        binding.vsSave.btnSave.setOnClickListener(v -> doSave(binding.vsSave.etName.getText().toString()));
+        binding.vsSave.etName.setOnTouchListener((v, event) -> {
+            final int DRAWABLE_RIGHT = 2;
+            switch (event.getAction()) {
+                case MotionEvent.ACTION_DOWN:
+                    Drawable deleteText = ((EditText) v).getCompoundDrawables()[DRAWABLE_RIGHT];
+                    if (deleteText != null) {
+                        if (event.getRawX() >= (v.getRight() - deleteText.getBounds().width())) {
+                            ((EditText) v).setText("");
+                            return true;
+                        }
+                    }
+                    break;
+                case MotionEvent.ACTION_UP:
+                    v.performClick();
+                    break;
+                default:
+                    break;
+            }
+            return false;
+        });
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (resultCode == RESULT_OK) {
+            switch (requestCode) {
+                case LOGIN_REQUEST_CODE:
+                    binding.switchBtn.setImageResource(R.drawable.ic_folder_open);
+                    if (getSupportFragmentManager().findFragmentByTag(FRAGMENT_CLOUD) == null) {
+                        getSupportFragmentManager().beginTransaction().add(R.id.container, myProjectFragment, FRAGMENT_CLOUD).commit();
+                        getSupportFragmentManager().beginTransaction().hide(firstPageFragment).commit();
+                    } else {
+                        getSupportFragmentManager().beginTransaction()
+                                .hide(firstPageFragment)
+                                .show(myProjectFragment)
+                                .commit();
+                    }
+                    isExplorer = !isExplorer;
+                    break;
+            }
+        }
+    }
+
+    @Override
+    public void onBackPressed() {
+        if (firstPageFragment.isVisible() && firstPageFragment instanceof ExplorerFragment) {
+            ((ExplorerFragment) firstPageFragment).backToPrev();
+        } else {
+            super.onBackPressed();
+        }
+    }
+
+//    public void deleteCloudFile(String path) {
+//        if (firstPageFragment instanceof ExplorerFragment) {
+//            ((ExplorerFragment) firstPageFragment).deleteCloudedMap(path);
+//        }
+//    }
+//
+//    public void updateCloudFiles(List<CloudFile> cloudFiles) {
+//        Map<String, Boolean> map = new HashMap<>();
+//        boolean isQPy3 = NAction.isQPy3(getBaseContext());
+//        String tag = isQPy3?"/projects3/":"/projects/";
+//        for (CloudFile cloudFile : cloudFiles) {
+//            if (cloudFile.getPath().contains(tag)) {
+//                map.put(QPyConstants.ABSOLUTE_PATH + tag + cloudFile.getProjectName(), true);
+//            }
+//            map.put(QPyConstants.ABSOLUTE_PATH + cloudFile.getPath(), true);
+//        }
+//        ((ExplorerFragment) firstPageFragment).updateCloudedFiles(map);
+//    }
+//
+//    public void setNewUpload() {
+//        isNewUpload = true;
+//    }
+
+    /**
+     * 保存云端文件目录到本地
+     */
+//    public void locatedCloud(List<CloudFile> cloudFiles) {
+//        if (cloudFiles.size() > 0) {
+//            Type type = new TypeToken<List<CloudFile>>() {
+//            }.getType();
+//            FileHelper.writeToFile(CONF.CLOUD_MAP_CACHE_PATH, App.getGson().toJson(cloudFiles, type));
+//        }
+//    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        NotebookUtil.killServer();
+    }
+}
diff --git a/qpython/src/os/res/layout/activity_local.xml b/qpython/src/os/res/layout/activity_local.xml
new file mode 100644
index 00000000..abdcb0aa
--- /dev/null
+++ b/qpython/src/os/res/layout/activity_local.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <LinearLayout
+        android:id="@+id/gd_action_bar_host"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:background="@color/colorPrimaryDark"
+        android:orientation="vertical">
+
+        <android.support.design.widget.AppBarLayout
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize">
+
+            <android.support.v7.widget.Toolbar
+                android:id="@+id/toolbar"
+                style="@style/Toolbar"
+                android:layout_width="match_parent"
+                android:layout_height="?attr/actionBarSize"
+                android:background="#FF4A4A4A"
+                android:elevation="2dp"
+                app:popupTheme="@style/DefaultBlueToolbar"
+                app:theme="@style/ToolbarTheme">
+
+                <ImageButton
+                    android:id="@+id/switch_btn"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="end"
+                    android:background="@null"
+                    android:padding="10dp"
+                    android:src="@drawable/ic_cloud_list"
+                    android:visibility="gone"/>
+
+                <ImageButton
+                    android:id="@+id/refresh"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="end"
+                    android:visibility="gone"
+                    android:layout_marginEnd="30dp"
+                    android:layout_marginRight="30dp"
+                    android:background="@color/transparency"
+                    android:src="@drawable/ic_library_reinstall"/>
+
+                <Button
+                    android:id="@+id/explore"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="end"
+                    android:textColor="#FFF"
+                    android:background="@color/transparency"
+                    android:text="@string/explorer"
+                    android:visibility="gone"/>
+            </android.support.v7.widget.Toolbar>
+        </android.support.design.widget.AppBarLayout>
+
+        <RelativeLayout
+            xmlns:android="http://schemas.android.com/apk/res/android"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@color/colorPrimaryDark">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="vertical">
+
+                <FrameLayout
+                    android:id="@+id/container"
+                    android:layout_width="match_parent"
+                    android:layout_height="0dp"
+                    android:layout_weight="9"/>
+
+                <include
+                    android:id="@+id/vs_save"
+                    layout="@layout/view_stub_save_prompt"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"/>
+            </LinearLayout>
+        </RelativeLayout>
+    </LinearLayout>
+
+
+</layout>
\ No newline at end of file
diff --git a/qpython/src/os/res/values-zh-rCN/strings.xml b/qpython/src/os/res/values-zh-rCN/strings.xml
new file mode 100644
index 00000000..a900de8f
--- /dev/null
+++ b/qpython/src/os/res/values-zh-rCN/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="sign_in_with_google">使用谷歌登录</string>
+    <string name="app_name">QPython OS</string>
+</resources>
diff --git a/qpython/src/os/res/values/strings.xml b/qpython/src/os/res/values/strings.xml
new file mode 100644
index 00000000..49b3ca29
--- /dev/null
+++ b/qpython/src/os/res/values/strings.xml
@@ -0,0 +1,4 @@
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="ExtraTranslation">
+    <string name="sign_in_with_google">Sign in with Google</string>
+    <string name="app_name">QPython OS</string>
+</resources>
diff --git a/qpython/src/res/raw/beep.ogg b/qpython/src/res/raw/beep.ogg
deleted file mode 100644
index 14199476..00000000
Binary files a/qpython/src/res/raw/beep.ogg and /dev/null differ
diff --git a/qpython/src/res/raw/samplewebapp.zip b/qpython/src/res/raw/samplewebapp.zip
deleted file mode 100644
index 65fa894a..00000000
Binary files a/qpython/src/res/raw/samplewebapp.zip and /dev/null differ
diff --git a/qpython/src/res/raw/scripts.zip b/qpython/src/res/raw/scripts.zip
deleted file mode 100644
index d72bce94..00000000
Binary files a/qpython/src/res/raw/scripts.zip and /dev/null differ
diff --git a/scripts-test/test-notify.py b/scripts-test/test-notify.py
deleted file mode 100644
index c23ed10c..00000000
--- a/scripts-test/test-notify.py
+++ /dev/null
@@ -1,3 +0,0 @@
-import androidhelper
-droid = androidhelper.Android()
-droid.notify('Hello','QPython')
diff --git a/settings.gradle b/settings.gradle
index df2f4fee..7ec06007 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1,8 @@
-include ':qpython', ':termemulator', ':termexec', ':qpypluginman', ':qpysl4a', ':qpysdk'
+include ':qpython',
+        ':termemulator',
+        ':termexec',
+        ':qpypluginman',
+        ':qpysl4a',
+        ':qpysdk',
+        ':qbaselib',
+        ':qftplib'
diff --git a/termemulator/.gitignore b/termemulator/.gitignore
deleted file mode 100644
index 796b96d1..00000000
--- a/termemulator/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
diff --git a/termemulator/build.gradle b/termemulator/build.gradle
index 06242b3b..e93699a1 100644
--- a/termemulator/build.gradle
+++ b/termemulator/build.gradle
@@ -1,19 +1,23 @@
-apply plugin: 'com.android.library'
-
-android {
-    compileSdkVersion 23
-    buildToolsVersion '25.0.0'
-    defaultConfig {
-        minSdkVersion 15
-        targetSdkVersion 23
-        versionCode 1
-        versionName "1.0"
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
-        }
-    }
-}
+apply plugin: 'com.android.library'
+
+android {
+    compileSdkVersion rootProject.ext.compileSdkVersion
+    buildToolsVersion rootProject.ext.buildToolsVersion
+    defaultConfig {
+        minSdkVersion rootProject.ext.minSdkVersion
+        targetSdkVersion rootProject.ext.targetSdkVersion
+        versionCode 1
+        versionName "1.0"
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
+        }
+    }
+
+    lintOptions {
+        abortOnError false
+    }
+}
diff --git a/termemulator/src/main/java/jackpal/androidterm/emulatorview/ByteQueue.java b/termemulator/src/main/java/jackpal/androidterm/emulatorview/ByteQueue.java
index 753fd1fb..8f6a1fde 100644
--- a/termemulator/src/main/java/jackpal/androidterm/emulatorview/ByteQueue.java
+++ b/termemulator/src/main/java/jackpal/androidterm/emulatorview/ByteQueue.java
@@ -22,11 +22,11 @@
  */
 
 class ByteQueue {
-    public ByteQueue(int size) {
+    ByteQueue(int size) {
         mBuffer = new byte[size];
     }
 
-    public int getBytesAvailable() {
+    int getBytesAvailable() {
         synchronized (this) {
             return mStoredBytes;
         }
diff --git a/termemulator/src/main/java/jackpal/androidterm/emulatorview/EmulatorDebug.java b/termemulator/src/main/java/jackpal/androidterm/emulatorview/EmulatorDebug.java
index f8e3b057..1bd2fa9a 100644
--- a/termemulator/src/main/java/jackpal/androidterm/emulatorview/EmulatorDebug.java
+++ b/termemulator/src/main/java/jackpal/androidterm/emulatorview/EmulatorDebug.java
@@ -24,7 +24,7 @@ class EmulatorDebug {
     /**
      * Set to true to add debugging code and logging.
      */
-    public static final boolean DEBUG = false;
+    public static final boolean DEBUG = true;
 
     /**
      * Set to true to log IME calls.
@@ -36,7 +36,7 @@ class EmulatorDebug {
      * android log, which makes it easier to debug some kinds of problems with
      * emulating escape sequences and control codes.
      */
-    public static final boolean LOG_CHARACTERS_FLAG = DEBUG & false;
+    public static final boolean LOG_CHARACTERS_FLAG = DEBUG;
 
     /**
      * Set to true to log unknown escape sequences.
diff --git a/termemulator/src/main/java/jackpal/androidterm/emulatorview/EmulatorView.java b/termemulator/src/main/java/jackpal/androidterm/emulatorview/EmulatorView.java
index f063aee1..6b2fb8bf 100644
--- a/termemulator/src/main/java/jackpal/androidterm/emulatorview/EmulatorView.java
+++ b/termemulator/src/main/java/jackpal/androidterm/emulatorview/EmulatorView.java
@@ -24,6 +24,8 @@
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.Hashtable;
+import java.util.LinkedList;
+import java.util.List;
 
 import android.content.Context;
 import android.graphics.Canvas;
@@ -31,6 +33,7 @@
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
+import android.text.Editable;
 import android.text.SpannableStringBuilder;
 import android.text.TextUtils;
 import android.text.style.URLSpan;
@@ -52,6 +55,12 @@
 import android.view.inputmethod.InputConnection;
 import android.widget.Scroller;
 
+import static android.view.inputmethod.EditorInfo.IME_ACTION_DONE;
+import static android.view.inputmethod.EditorInfo.IME_ACTION_NEXT;
+import static android.view.inputmethod.EditorInfo.IME_ACTION_NONE;
+import static android.view.inputmethod.EditorInfo.IME_ACTION_UNSPECIFIED;
+import static android.view.inputmethod.EditorInfo.IME_MASK_ACTION;
+
 /**
  * A view on a {@link TermSession}.  Displays the terminal emulator's screen,
  * provides access to its scrollback buffer, and passes input through to the
@@ -124,6 +133,12 @@ public class EmulatorView extends View implements GestureDetector.OnGestureListe
      * Our terminal emulator.
      */
     private TerminalEmulator mEmulator;
+    private HistoryCmdUtils mHistory;
+    private StringBuffer mStringBuffer = new StringBuffer();
+
+    public TerminalEmulator getEmulator() {
+        return mEmulator;
+    }
 
     /**
      * The number of rows of text to display.
@@ -164,6 +179,7 @@ public class EmulatorView extends View implements GestureDetector.OnGestureListe
     private int mFnKeyCode;
     private boolean mIsControlKeySent = false;
     private boolean mIsFnKeySent = false;
+    private boolean mIsTabKeySent = false;
 
     private boolean mMouseTracking;
 
@@ -497,6 +513,7 @@ public EmulatorView(Context context, TermSession session, DisplayMetrics metrics
         attachSession(session);
         setDensity(metrics);
         commonConstructor(context);
+        mHistory = HistoryCmdUtils.getInstance(context);
     }
 
     /**
@@ -623,9 +640,12 @@ public boolean onCheckIsTextEditor() {
 
     @Override
     public InputConnection onCreateInputConnection(EditorInfo outAttrs) {
-        outAttrs.inputType = mUseCookedIme ?
+        outAttrs.inputType =
+                //EditorInfo.TYPE_CLASS_TEXT | EditorInfo.TYPE_TEXT_FLAG_NO_SUGGESTIONS;
+                mUseCookedIme ?
                 EditorInfo.TYPE_CLASS_TEXT :
                 EditorInfo.TYPE_NULL;
+       // outAttrs.imeOptions = IME_ACTION_DONE;
         return new BaseInputConnection(this, true) {
             /**
              * Used to handle composing text requests
@@ -637,6 +657,7 @@ public InputConnection onCreateInputConnection(EditorInfo outAttrs) {
             private int mSelectedTextEnd;
 
             private void sendText(CharSequence text) {
+                Log.d(TAG, "sendText:"+text);
                 int n = text.length();
                 char c;
                 try {
@@ -670,6 +691,7 @@ private void mapAndSend(int c) throws IOException {
                 clearSpecialKeyStatus();
             }
 
+            @Override
             public boolean beginBatchEdit() {
                 if (LOG_IME) {
                     Log.w(TAG, "beginBatchEdit");
@@ -681,6 +703,7 @@ public boolean beginBatchEdit() {
                 return true;
             }
 
+            @Override
             public boolean clearMetaKeyStates(int arg0) {
                 if (LOG_IME) {
                     Log.w(TAG, "clearMetaKeyStates " + arg0);
@@ -688,6 +711,7 @@ public boolean clearMetaKeyStates(int arg0) {
                 return false;
             }
 
+            @Override
             public boolean commitCompletion(CompletionInfo arg0) {
                 if (LOG_IME) {
                     Log.w(TAG, "commitCompletion " + arg0);
@@ -695,6 +719,7 @@ public boolean commitCompletion(CompletionInfo arg0) {
                 return false;
             }
 
+            @Override
             public boolean endBatchEdit() {
                 if (LOG_IME) {
                     Log.w(TAG, "endBatchEdit");
@@ -702,6 +727,7 @@ public boolean endBatchEdit() {
                 return true;
             }
 
+            @Override
             public boolean finishComposingText() {
                 if (LOG_IME) {
                     Log.w(TAG, "finishComposingText");
@@ -714,6 +740,7 @@ public boolean finishComposingText() {
                 return true;
             }
 
+            @Override
             public int getCursorCapsMode(int reqModes) {
                 if (LOG_IME) {
                     Log.w(TAG, "getCursorCapsMode(" + reqModes + ")");
@@ -725,6 +752,7 @@ public int getCursorCapsMode(int reqModes) {
                 return mode;
             }
 
+            @Override
             public ExtractedText getExtractedText(ExtractedTextRequest arg0,
                                                   int arg1) {
                 if (LOG_IME) {
@@ -733,6 +761,12 @@ public ExtractedText getExtractedText(ExtractedTextRequest arg0,
                 return null;
             }
 
+            @Override
+            public Editable getEditable() {
+                return super.getEditable();
+            }
+
+            @Override
             public CharSequence getTextAfterCursor(int n, int flags) {
                 if (LOG_IME) {
                     Log.w(TAG, "getTextAfterCursor(" + n + "," + flags + ")");
@@ -744,6 +778,7 @@ public CharSequence getTextAfterCursor(int n, int flags) {
                 return mImeBuffer.substring(mCursor, mCursor + len);
             }
 
+            @Override
             public CharSequence getTextBeforeCursor(int n, int flags) {
                 if (LOG_IME) {
                     Log.w(TAG, "getTextBeforeCursor(" + n + "," + flags + ")");
@@ -755,6 +790,7 @@ public CharSequence getTextBeforeCursor(int n, int flags) {
                 return mImeBuffer.substring(mCursor - len, mCursor);
             }
 
+            @Override
             public boolean performContextMenuAction(int arg0) {
                 if (LOG_IME) {
                     Log.w(TAG, "performContextMenuAction" + arg0);
@@ -762,6 +798,7 @@ public boolean performContextMenuAction(int arg0) {
                 return true;
             }
 
+            @Override
             public boolean performPrivateCommand(String arg0, Bundle arg1) {
                 if (LOG_IME) {
                     Log.w(TAG, "performPrivateCommand" + arg0 + "," + arg1);
@@ -769,6 +806,7 @@ public boolean performPrivateCommand(String arg0, Bundle arg1) {
                 return true;
             }
 
+            @Override
             public boolean reportFullscreenMode(boolean arg0) {
                 if (LOG_IME) {
                     Log.w(TAG, "reportFullscreenMode" + arg0);
@@ -776,6 +814,7 @@ public boolean reportFullscreenMode(boolean arg0) {
                 return true;
             }
 
+            @Override
             public boolean commitCorrection(CorrectionInfo correctionInfo) {
                 if (LOG_IME) {
                     Log.w(TAG, "commitCorrection");
@@ -783,12 +822,14 @@ public boolean commitCorrection(CorrectionInfo correctionInfo) {
                 return true;
             }
 
+            @Override
             public boolean commitText(CharSequence text, int newCursorPosition) {
                 if (LOG_IME) {
                     Log.w(TAG, "commitText(\"" + text + "\", " + newCursorPosition + ")");
                 }
                 clearComposingText();
                 sendText(text);
+                mStringBuffer.append(text);
                 setImeBuffer("");
                 mCursor = 0;
                 return true;
@@ -812,6 +853,7 @@ private void clearComposingText() {
                 mComposingTextEnd = mComposingTextStart = 0;
             }
 
+            @Override
             public boolean deleteSurroundingText(int leftLength, int rightLength) {
                 if (LOG_IME) {
                     Log.w(TAG, "deleteSurroundingText(" + leftLength +
@@ -831,21 +873,28 @@ public boolean deleteSurroundingText(int leftLength, int rightLength) {
                 return true;
             }
 
+            @Override
             public boolean performEditorAction(int actionCode) {
                 if (LOG_IME) {
                     Log.w(TAG, "performEditorAction(" + actionCode + ")");
                 }
-                if (actionCode == EditorInfo.IME_ACTION_UNSPECIFIED) {
+                if (actionCode == IME_ACTION_UNSPECIFIED) {
                     // The "return" key has been pressed on the IME.
                     sendText("\r");
                 }
+                if (LOG_IME) {
+                    Log.w(TAG, "stringbuff(" + mStringBuffer.toString() + ")");
+                }
+                mHistory.addCmd(mStringBuffer.toString());
+                mStringBuffer.delete(0, mStringBuffer.length());
                 return true;
             }
 
+            @Override
             public boolean sendKeyEvent(KeyEvent event) {
-                if (LOG_IME) {
-                    Log.w(TAG, "sendKeyEvent(" + event + ")");
-                }
+//                if (LOG_IME) {
+//                    Log.w(TAG, "sendKeyEvent(" + event + ")");
+//                }
                 // Some keys are sent here rather than to commitText.
                 // In particular, del and the digit keys are sent here.
                 // (And I have reports that the HTC Magic also sends Return here.)
@@ -854,6 +903,7 @@ public boolean sendKeyEvent(KeyEvent event) {
                 return true;
             }
 
+            @Override
             public boolean setComposingText(CharSequence text, int newCursorPosition) {
                 if (LOG_IME) {
                     Log.w(TAG, "setComposingText(\"" + text + "\", " + newCursorPosition + ")");
@@ -870,6 +920,7 @@ public boolean setComposingText(CharSequence text, int newCursorPosition) {
                 return true;
             }
 
+            @Override
             public boolean setSelection(int start, int end) {
                 if (LOG_IME) {
                     Log.w(TAG, "setSelection" + start + "," + end);
@@ -886,6 +937,7 @@ public boolean setSelection(int start, int end) {
                 return true;
             }
 
+            @Override
             public boolean setComposingRegion(int start, int end) {
                 if (LOG_IME) {
                     Log.w(TAG, "setComposingRegion " + start + "," + end);
@@ -898,6 +950,7 @@ public boolean setComposingRegion(int start, int end) {
                 return true;
             }
 
+            @Override
             public CharSequence getSelectedText(int flags) {
                 if (LOG_IME) {
                     Log.w(TAG, "getSelectedText " + flags);
@@ -919,6 +972,14 @@ private void setImeBuffer(String buffer) {
         mImeBuffer = buffer;
     }
 
+    public LinkedList<String> getHistoryCmd() {
+        return mHistory.getCmdList();
+    }
+
+    public void setTextBuff(String text) {
+        mStringBuffer.append(text);
+    }
+
     /**
      * Get the terminal emulator's keypad application mode.
      */
@@ -1111,6 +1172,7 @@ private void sendMouseEventCode(MotionEvent e, int button_code) {
 
     // Begin GestureDetector.OnGestureListener methods
 
+    @Override
     public boolean onSingleTapUp(MotionEvent e) {
         if (mExtGestureListener != null && mExtGestureListener.onSingleTapUp(e)) {
             return true;
@@ -1125,11 +1187,13 @@ public boolean onSingleTapUp(MotionEvent e) {
         return true;
     }
 
+    @Override
     public void onLongPress(MotionEvent e) {
         // XXX hook into external gesture listener
         showContextMenu();
     }
 
+    @Override
     public boolean onScroll(MotionEvent e1, MotionEvent e2,
                             float distanceX, float distanceY) {
         if (mExtGestureListener != null && mExtGestureListener.onScroll(e1, e2, distanceX, distanceY)) {
@@ -1176,6 +1240,7 @@ public boolean onJumpTapUp(MotionEvent e1, MotionEvent e2) {
         return true;
     }
 
+    @Override
     public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX,
                            float velocityY) {
         if (mExtGestureListener != null && mExtGestureListener.onFling(e1, e2, velocityX, velocityY)) {
@@ -1197,12 +1262,14 @@ public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX,
         return true;
     }
 
+    @Override
     public void onShowPress(MotionEvent e) {
         if (mExtGestureListener != null) {
             mExtGestureListener.onShowPress(e);
         }
     }
 
+    @Override
     public boolean onDown(MotionEvent e) {
         if (mExtGestureListener != null && mExtGestureListener.onDown(e)) {
             return true;
@@ -1284,6 +1351,10 @@ public boolean onKeyDown(int keyCode, KeyEvent event) {
                 // Don't intercept the system keys
                 return super.onKeyDown(keyCode, event);
             }
+        } else if (keyCode == KeyEvent.KEYCODE_DEL) {
+            mEmulator.deleteChar();
+            if (mStringBuffer.length() > 0)
+                mStringBuffer.delete(mStringBuffer.length() - 1, mStringBuffer.length());
         }
 
         // Translate the keyCode into an ASCII character.
@@ -1630,6 +1701,12 @@ public void sendFnKey() {
         invalidate();
     }
 
+    public void sendTabKey() {
+        mIsTabKeySent = true;
+        mKeyListener.handleTabKey(true);
+        invalidate();
+
+    }
     /**
      * Set the key code to be sent when the Back key is pressed.
      */
@@ -1709,4 +1786,5 @@ public String getURLat(float x, float y) {
         else
             return null;
     }
+
 }
diff --git a/termemulator/src/main/java/jackpal/androidterm/emulatorview/HistoryCmdUtils.java b/termemulator/src/main/java/jackpal/androidterm/emulatorview/HistoryCmdUtils.java
new file mode 100644
index 00000000..5c9edadf
--- /dev/null
+++ b/termemulator/src/main/java/jackpal/androidterm/emulatorview/HistoryCmdUtils.java
@@ -0,0 +1,79 @@
+package jackpal.androidterm.emulatorview;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.text.TextUtils;
+import android.util.Log;
+
+import java.util.LinkedList;
+
+/**
+ * 文 件 名: HIstoryCmdUtils
+ * 创 建 人: ZhangRonghua
+ * 创建日期: 2018/1/31 17:15
+ * 修改时间：
+ * 修改备注：
+ */
+
+public class HistoryCmdUtils {
+    private static HistoryCmdUtils instance = null;
+    private SharedPreferences mSharedPreferences;
+    private LinkedList<String> cmdList;
+    private static final int COUNT_MAX = 10;
+    private static final String CACHE_NAME = "history";
+
+    private HistoryCmdUtils(Context context) {
+        mSharedPreferences = context.getSharedPreferences(CACHE_NAME, Context.MODE_PRIVATE);
+        cmdList = stringToList(mSharedPreferences.getString(CACHE_NAME,""));
+    }
+
+    public static HistoryCmdUtils getInstance(Context context) {
+        if (instance == null) {
+            instance = new HistoryCmdUtils(context);
+        }
+        return instance;
+    }
+
+    public void addCmd(String cmd) {
+        Log.d("HistoryCmdUtils", "addCmd:"+cmd);
+        int index = cmdList.indexOf(cmd);
+        if (TextUtils.isEmpty(cmd) || index==0){
+            return;
+        }
+        if (index>0){
+            cmdList.remove(index);
+        }else if (cmdList.size()==COUNT_MAX){
+            cmdList.pollLast();
+        }
+        cmdList.addFirst(cmd);
+
+        mSharedPreferences.edit().putString(CACHE_NAME,listToString(cmdList)).apply();
+    }
+
+    private LinkedList<String> stringToList(String text){
+        LinkedList<String> list = new LinkedList<>();
+        if (!TextUtils.isEmpty(text)){
+            String[] tempList = text.split("\n");
+            for (String str:tempList){
+                list.addLast(str);
+            }
+        }
+        return list;
+    }
+
+    private String listToString(LinkedList<String> list){
+        StringBuffer stringBuffer = new StringBuffer();
+        for (String str:list){
+            stringBuffer.append(str);
+            if (!str.equals(list.peekLast())){
+                stringBuffer.append("\n");
+            }
+        }
+        return stringBuffer.toString();
+    }
+
+    public LinkedList<String> getCmdList(){
+        return cmdList;
+    }
+
+}
diff --git a/termemulator/src/main/java/jackpal/androidterm/emulatorview/ShortcutBean.java b/termemulator/src/main/java/jackpal/androidterm/emulatorview/ShortcutBean.java
new file mode 100644
index 00000000..10307ae2
--- /dev/null
+++ b/termemulator/src/main/java/jackpal/androidterm/emulatorview/ShortcutBean.java
@@ -0,0 +1,44 @@
+package jackpal.androidterm.emulatorview;
+
+import android.view.View;
+
+import java.io.Serializable;
+
+/**
+ * Created by Hmei
+ * 11/15/17
+ */
+public class ShortcutBean implements Serializable{
+    private String name;
+    private boolean isUnDeletable;
+    private View.OnClickListener listener;
+
+    public ShortcutBean(String name, boolean isUnDeletable) {
+        this.name = name;
+        this.isUnDeletable = isUnDeletable;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public boolean isUnDeletable() {
+        return isUnDeletable;
+    }
+
+    public void setUnDeletable(boolean unDeletable) {
+        isUnDeletable = unDeletable;
+    }
+
+    public View.OnClickListener getListener() {
+        return listener;
+    }
+
+    public void setListener(View.OnClickListener listener) {
+        this.listener = listener;
+    }
+}
diff --git a/termemulator/src/main/java/jackpal/androidterm/emulatorview/TermKeyListener.java b/termemulator/src/main/java/jackpal/androidterm/emulatorview/TermKeyListener.java
index 563ac15a..cdda0660 100644
--- a/termemulator/src/main/java/jackpal/androidterm/emulatorview/TermKeyListener.java
+++ b/termemulator/src/main/java/jackpal/androidterm/emulatorview/TermKeyListener.java
@@ -6,6 +6,7 @@
 import java.io.IOException;
 import java.util.Map;
 import java.util.HashMap;
+import java.util.Stack;
 
 import android.util.Log;
 import android.view.KeyCharacterMap;
@@ -18,9 +19,9 @@
  * the current state of the alt, shift, fn, and control keys.
  */
 class TermKeyListener {
-    private final static String TAG = "TermKeyListener";
-    private static final boolean LOG_MISC = false;
-    private static final boolean LOG_KEYS = false;
+    private final static String  TAG                  = "TermKeyListener";
+    private static final boolean LOG_MISC             = false;
+    private static final boolean LOG_KEYS             = false;
     private static final boolean LOG_COMBINING_ACCENT = false;
 
     /**
@@ -28,21 +29,21 @@ class TermKeyListener {
      */
     private final static boolean SUPPORT_8_BIT_META = false;
 
-    private static final int KEYMOD_ALT = 0x80000000;
-    private static final int KEYMOD_CTRL = 0x40000000;
+    private static final int KEYMOD_ALT   = 0x80000000;
+    private static final int KEYMOD_CTRL  = 0x40000000;
     private static final int KEYMOD_SHIFT = 0x20000000;
     /**
      * Means this maps raw scancode
      */
-    private static final int KEYMOD_SCAN = 0x10000000;
+    private static final int KEYMOD_SCAN  = 0x10000000;
 
     private static Map<Integer, String> mKeyMap;
 
-    private String[] mKeyCodes = new String[256];
+    private String[] mKeyCodes    = new String[256];
     private String[] mAppKeyCodes = new String[256];
 
     private void initKeyCodes() {
-        mKeyMap = new HashMap<Integer, String>();
+        mKeyMap = new HashMap<>();
         mKeyMap.put(KEYMOD_SHIFT | KEYCODE_DPAD_LEFT, "\033[1;2D");
         mKeyMap.put(KEYMOD_ALT | KEYCODE_DPAD_LEFT, "\033[1;3D");
         mKeyMap.put(KEYMOD_ALT | KEYMOD_SHIFT | KEYCODE_DPAD_LEFT, "\033[1;4D");
@@ -183,7 +184,7 @@ private void initKeyCodes() {
         mAppKeyCodes[KEYCODE_NUMPAD_9] = "\033Oy";
     }
 
-    public void setCursorKeysApplicationMode(boolean val) {
+    void setCursorKeysApplicationMode(boolean val) {
         if (LOG_MISC) {
             Log.d(EmulatorDebug.LOG_TAG, "CursorKeysApplicationMode=" + val);
         }
@@ -221,11 +222,11 @@ private class ModifierKey {
         /**
          * Construct a modifier key. UNPRESSED by default.
          */
-        public ModifierKey() {
+        ModifierKey() {
             mState = UNPRESSED;
         }
 
-        public void onPress() {
+        void onPress() {
             switch (mState) {
                 case PRESSED:
                     // This is a repeat before use
@@ -245,7 +246,7 @@ public void onPress() {
             }
         }
 
-        public void onRelease() {
+        void onRelease() {
             switch (mState) {
                 case USED:
                     mState = UNPRESSED;
@@ -259,7 +260,7 @@ public void onRelease() {
             }
         }
 
-        public void adjustAfterKeypress() {
+        void adjustAfterKeypress() {
             switch (mState) {
                 case PRESSED:
                     mState = USED;
@@ -273,11 +274,12 @@ public void adjustAfterKeypress() {
             }
         }
 
-        public boolean isActive() {
+        boolean isActive() {
+            Log.d(TAG, "isActive:"+mState);
             return mState != UNPRESSED;
         }
 
-        public int getUIMode() {
+        int getUIMode() {
             switch (mState) {
                 default:
                 case UNPRESSED:
@@ -300,38 +302,40 @@ public int getUIMode() {
 
     private ModifierKey mFnKey = new ModifierKey();
 
+    private ModifierKey mTabKey = new ModifierKey();
+
     private int mCursorMode;
 
     private boolean mHardwareControlKey;
 
     private TermSession mTermSession;
 
-    private int mBackKeyCode;
+    private int     mBackKeyCode;
     private boolean mAltSendsEsc;
 
     private int mCombiningAccent;
 
     // Map keycodes out of (above) the Unicode code point space.
-    static public final int KEYCODE_OFFSET = 0xA00000;
+    static final int KEYCODE_OFFSET = 0xA00000;
 
     /**
      * Construct a term key listener.
      */
-    public TermKeyListener(TermSession termSession) {
+    TermKeyListener(TermSession termSession) {
         mTermSession = termSession;
         initKeyCodes();
         updateCursorMode();
     }
 
-    public void setBackKeyCharacter(int code) {
+    void setBackKeyCharacter(int code) {
         mBackKeyCode = code;
     }
 
-    public void setAltSendsEsc(boolean flag) {
+    void setAltSendsEsc(boolean flag) {
         mAltSendsEsc = flag;
     }
 
-    public void handleHardwareControlKey(boolean down) {
+    void handleHardwareControlKey(boolean down) {
         mHardwareControlKey = down;
     }
 
@@ -345,7 +349,20 @@ public void onResume() {
         // Nothing special.
     }
 
-    public void handleControlKey(boolean down) {
+    void handleTabKey(boolean down) {
+        Log.d(TAG,"handleTabKey:"+down);
+
+        if (down) {
+            mTabKey.onPress();
+        } else {
+            mTabKey.onRelease();
+        }
+        updateCursorMode();
+    }
+
+    void handleControlKey(boolean down) {
+        Log.d(TAG,"handleControlKey:"+down);
+
         if (down) {
             mControlKey.onPress();
         } else {
@@ -354,7 +371,9 @@ public void handleControlKey(boolean down) {
         updateCursorMode();
     }
 
-    public void handleFnKey(boolean down) {
+    void handleFnKey(boolean down) {
+        Log.d(TAG,"handleFnKey:"+down);
+
         if (down) {
             mFnKey.onPress();
         } else {
@@ -363,7 +382,7 @@ public void handleFnKey(boolean down) {
         updateCursorMode();
     }
 
-    public void setTermType(String termType) {
+    void setTermType(String termType) {
         setFnKeys(termType);
     }
 
@@ -422,11 +441,12 @@ private void setFnKeys(String termType) {
         }
     }
 
-    public int mapControlChar(int ch) {
+    int mapControlChar(int ch) {
         return mapControlChar(mHardwareControlKey || mControlKey.isActive(), mFnKey.isActive(), ch);
     }
 
-    public int mapControlChar(boolean control, boolean fn, int ch) {
+    private int mapControlChar(boolean control, boolean fn, int ch) {
+        Log.d(TAG, "mapControlChar:"+ch+"-:control:"+control+"-fn:"+fn);
         int result = ch;
         if (control) {
             // Search is the control key.
@@ -508,8 +528,8 @@ public int mapControlChar(boolean control, boolean fn, int ch) {
      *
      * @param keyCode the keycode of the keyDown event
      */
-    public void keyDown(int keyCode, KeyEvent event, boolean appMode,
-                        boolean allowToggle) throws IOException {
+    void keyDown(int keyCode, KeyEvent event, boolean appMode,
+                 boolean allowToggle) throws IOException {
         if (LOG_KEYS) {
             Log.i(TAG, "keyDown(" + keyCode + "," + event + "," + appMode + "," + allowToggle + ")");
         }
@@ -552,6 +572,9 @@ public void keyDown(int keyCode, KeyEvent event, boolean appMode,
             case KeyEvent.KEYCODE_BACK:
                 result = mBackKeyCode;
                 break;
+//            case KeyEvent.KEYCODE_ENTER:
+//                history.push(stringBuffer.toString());
+//                break;
 
             default: {
                 int metaState = event.getMetaState();
@@ -627,14 +650,18 @@ public void keyDown(int keyCode, KeyEvent event, boolean appMode,
                 result |= 0x80;
             }
             mTermSession.write(result);
+//            stringBuffer.append(result);
         }
     }
+//
+//    private Stack<String> history      = new Stack<>();
+//    private StringBuffer  stringBuffer = new StringBuffer();
 
-    public int getCombiningAccent() {
+    int getCombiningAccent() {
         return mCombiningAccent;
     }
 
-    public int getCursorMode() {
+    int getCursorMode() {
         return mCursorMode;
     }
 
@@ -642,7 +669,8 @@ private void updateCursorMode() {
         mCursorMode = getCursorModeHelper(mCapKey, TextRenderer.MODE_SHIFT_SHIFT)
                 | getCursorModeHelper(mAltKey, TextRenderer.MODE_ALT_SHIFT)
                 | getCursorModeHelper(mControlKey, TextRenderer.MODE_CTRL_SHIFT)
-                | getCursorModeHelper(mFnKey, TextRenderer.MODE_FN_SHIFT);
+                | getCursorModeHelper(mFnKey, TextRenderer.MODE_FN_SHIFT)
+                | getCursorModeHelper(mTabKey, TextRenderer.MODE_TAB_SHIFT);
     }
 
     private static int getCursorModeHelper(ModifierKey key, int shift) {
@@ -650,16 +678,17 @@ private static int getCursorModeHelper(ModifierKey key, int shift) {
     }
 
     static boolean isEventFromToggleDevice(KeyEvent event) {
-        if (AndroidCompat.SDK < 11) {
+        //if (AndroidCompat.SDK < 11) {
             return true;
-        }
-        KeyCharacterMapCompat kcm = KeyCharacterMapCompat.wrap(
-                KeyCharacterMap.load(event.getDeviceId()));
-        return kcm.getModifierBehaviour() ==
-                KeyCharacterMapCompat.MODIFIER_BEHAVIOR_CHORDED_OR_TOGGLED;
+        //}
+//        KeyCharacterMapCompat kcm = KeyCharacterMapCompat.wrap(
+//                KeyCharacterMap.load(event.getDeviceId()));
+//
+//        return kcm.getModifierBehaviour() ==
+//                KeyCharacterMapCompat.MODIFIER_BEHAVIOR_CHORDED_OR_TOGGLED;
     }
 
-    public boolean handleKeyCode(int keyCode, KeyEvent event, boolean appMode) throws IOException {
+    boolean handleKeyCode(int keyCode, KeyEvent event, boolean appMode) throws IOException {
         String code = null;
         if (event != null) {
             int keyMod = 0;
@@ -694,8 +723,9 @@ public boolean handleKeyCode(int keyCode, KeyEvent event, boolean appMode) throw
         if (code != null) {
             if (EmulatorDebug.LOG_CHARACTERS_FLAG) {
                 byte[] bytes = code.getBytes();
-                Log.d(EmulatorDebug.LOG_TAG, "Out: '" + EmulatorDebug.bytesToString(bytes, 0, bytes.length) + "'");
+                //Log.d(EmulatorDebug.LOG_TAG, "Out: '" + EmulatorDebug.bytesToString(bytes, 0, bytes.length) + "'");
             }
+            //Log.d(TAG, "handleKeyCode:"+code);
             mTermSession.write(code);
             return true;
         }
@@ -707,7 +737,7 @@ public boolean handleKeyCode(int keyCode, KeyEvent event, boolean appMode) throw
      *
      * @param keyCode the keyCode of the keyUp event
      */
-    public void keyUp(int keyCode, KeyEvent event) {
+    void keyUp(int keyCode, KeyEvent event) {
         boolean allowToggle = isEventFromToggleDevice(event);
         switch (keyCode) {
             case KeyEvent.KEYCODE_ALT_LEFT:
@@ -736,15 +766,15 @@ public void keyUp(int keyCode, KeyEvent event) {
         }
     }
 
-    public boolean getAltSendsEsc() {
+    boolean getAltSendsEsc() {
         return mAltSendsEsc;
     }
 
-    public boolean isAltActive() {
+    boolean isAltActive() {
         return mAltKey.isActive();
     }
 
-    public boolean isCtrlActive() {
+    boolean isCtrlActive() {
         return mControlKey.isActive();
     }
 }
diff --git a/termemulator/src/main/java/jackpal/androidterm/emulatorview/TermSession.java b/termemulator/src/main/java/jackpal/androidterm/emulatorview/TermSession.java
index 4dc107d6..e29c7c8c 100644
--- a/termemulator/src/main/java/jackpal/androidterm/emulatorview/TermSession.java
+++ b/termemulator/src/main/java/jackpal/androidterm/emulatorview/TermSession.java
@@ -16,6 +16,7 @@
 
 package jackpal.androidterm.emulatorview;
 
+import android.annotation.SuppressLint;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
@@ -29,6 +30,7 @@
 import java.nio.charset.Charset;
 import java.nio.charset.CharsetEncoder;
 import java.nio.charset.CodingErrorAction;
+import java.util.Arrays;
 
 /**
  * A terminal session, consisting of a VT100 terminal emulator and its
@@ -56,63 +58,37 @@
  * and closes the attached I/O streams.
  */
 public class TermSession {
-    public void setKeyListener(TermKeyListener l) {
-        mKeyListener = l;
-    }
-
+    // Number of rows in the transcript
+    private static final int TRANSCRIPT_ROWS = 10000;
+    private static final int NEW_INPUT       = 1;
+    private static final int NEW_OUTPUT      = 2;
+    private static final int FINISH          = 3;
+    private static final int EOF             = 4;
     private TermKeyListener mKeyListener;
-
     private ColorScheme mColorScheme = BaseTextRenderer.defaultColorScheme;
-    private UpdateCallback mNotify;
-
-    private OutputStream mTermOut;
-    private InputStream mTermIn;
-
-    private String mTitle;
-
+    private UpdateCallback   mNotify;
+    private OutputStream     mTermOut;
+    private InputStream      mTermIn;
+    private String           mTitle;
     private TranscriptScreen mTranscriptScreen;
     private TerminalEmulator mEmulator;
+    private boolean          mDefaultUTF8Mode;
+    private Thread           mReaderThread;
+    private ByteQueue        mByteQueue;
+    private byte[]           mReceiveBuffer;
+    private Thread           mWriterThread;
+    private ByteQueue        mWriteQueue;
+    private Handler          mWriterHandler;
+    private CharBuffer       mWriteCharBuffer;
+    private ByteBuffer       mWriteByteBuffer;
+    private CharsetEncoder   mUTF8Encoder;
+    private FinishCallback   mFinishCallback;
+    private boolean mIsRunning  = false;
+    private Handler mMsgHandler = new MyHandler();
+    private UpdateCallback mTitleChangedListener;
 
-    private boolean mDefaultUTF8Mode;
-
-    private Thread mReaderThread;
-    private ByteQueue mByteQueue;
-    private byte[] mReceiveBuffer;
-
-    private Thread mWriterThread;
-    private ByteQueue mWriteQueue;
-    private Handler mWriterHandler;
-
-    private CharBuffer mWriteCharBuffer;
-    private ByteBuffer mWriteByteBuffer;
-    private CharsetEncoder mUTF8Encoder;
-
-    // Number of rows in the transcript
-    private static final int TRANSCRIPT_ROWS = 10000;
-
-    private static final int NEW_INPUT = 1;
-    private static final int NEW_OUTPUT = 2;
-    private static final int FINISH = 3;
-    private static final int EOF = 4;
-
-    /**
-     * Callback to be invoked when a {@link TermSession} finishes.
-     *
-     * @see TermSession#setUpdateCallback
-     */
-    public interface FinishCallback {
-        /**
-         * Callback function to be invoked when a {@link TermSession} finishes.
-         *
-         * @param session The <code>TermSession</code> which has finished.
-         */
-        void onSessionFinish(TermSession session);
-    }
-
-    private FinishCallback mFinishCallback;
-
-    private boolean mIsRunning = false;
-    private Handler mMsgHandler = new Handler() {
+    @SuppressLint("HandlerLeak")
+    private class MyHandler extends Handler {
         @Override
         public void handleMessage(Message msg) {
             if (!mIsRunning) {
@@ -129,9 +105,7 @@ public void run() {
                 });
             }
         }
-    };
-
-    private UpdateCallback mTitleChangedListener;
+    }
 
     public TermSession() {
         this(false);
@@ -154,6 +128,7 @@ public void run() {
                 try {
                     while (true) {
                         int read = mTermIn.read(mBuffer);
+                        //System.out.println("READER + " + convert(mBuffer));
                         if (read == -1) {
                             // EOF -- process exited
                             break;
@@ -175,7 +150,7 @@ public void run() {
                 if (exitOnEOF) mMsgHandler.sendMessage(mMsgHandler.obtainMessage(EOF));
             }
         };
-        mReaderThread.setName("TermSession input reader");
+        mReaderThread.setName("% input reader");
 
         mWriteQueue = new ByteQueue(4096);
         mWriterThread = new Thread() {
@@ -206,7 +181,7 @@ private void writeToOutput() {
                 ByteQueue writeQueue = mWriteQueue;
                 byte[] buffer = mBuffer;
                 OutputStream termOut = mTermOut;
-
+                //System.out.println("OUTPUT+ " + convert(buffer));
                 int bytesAvailable = writeQueue.getBytesAvailable();
                 int bytesToWrite = Math.min(bytesAvailable, buffer.length);
 
@@ -231,6 +206,39 @@ private void writeToOutput() {
         mWriterThread.setName("TermSession output writer");
     }
 
+    public void appendTextToEmulator(String text) {
+        byte[] input = text.getBytes();
+        int read = input.length;
+        int offset = 0;
+        while (read > 0) {
+            int written;
+            try {
+                written = mByteQueue.write(input,
+                        offset, read);
+                offset += written;
+                read -= written;
+                mMsgHandler.sendMessage(
+                        mMsgHandler.obtainMessage(NEW_INPUT));
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+    private String convert(byte[] bytes) {
+        StringBuffer stringBuffer = new StringBuffer();
+        int index = 0;
+        while (index < bytes.length && bytes[index] != 0) {
+            stringBuffer.append(Character.toString((char) bytes[index]));
+            index++;
+        }
+        return stringBuffer.toString();
+    }
+
+    public void setKeyListener(TermKeyListener l) {
+        mKeyListener = l;
+    }
+
     protected void onProcessExit() {
         finish();
     }
@@ -408,7 +416,7 @@ public void setUpdateCallback(UpdateCallback notify) {
      * Notify the {@link UpdateCallback} registered by {@link
      * #setUpdateCallback setUpdateCallback} that the screen has changed.
      */
-    protected void notifyUpdate() {
+    public void notifyUpdate() {
         if (mNotify != null) {
             mNotify.onUpdate();
         }
@@ -512,7 +520,7 @@ private void readFromProcess() {
      * @param offset The offset into the buffer where the read data begins.
      * @param count  The number of bytes read.
      */
-    protected void processInput(byte[] data, int offset, int count) {
+    public void processInput(byte[] data, int offset, int count) {
         mEmulator.append(data, offset, count);
     }
 
@@ -615,7 +623,9 @@ public void setFinishCallback(FinishCallback callback) {
      */
     public void finish() {
         mIsRunning = false;
-        mEmulator.finish();
+        if (mEmulator != null) {
+            mEmulator.finish();
+        }
         if (mTranscriptScreen != null) {
             mTranscriptScreen.finish();
         }
@@ -641,10 +651,23 @@ public void finish() {
     public void shellRun() {
         //Exec.setPtyUTF8Mode(mTermFd, getUTF8Mode());
         //setUTF8ModeUpdateCallback(mUTF8ModeNotify);
-        initializeEmulator(80,24);
+        initializeEmulator(72, 24);
         /*mWatcherThread.start();
         sendInitialCommand(mInitialCommand);*/
 
     }
 
+    /**
+     * Callback to be invoked when a {@link TermSession} finishes.
+     *
+     * @see TermSession#setUpdateCallback
+     */
+    public interface FinishCallback {
+        /**
+         * Callback function to be invoked when a {@link TermSession} finishes.
+         *
+         * @param session The <code>TermSession</code> which has finished.
+         */
+        void onSessionFinish(TermSession session);
+    }
 }
diff --git a/termemulator/src/main/java/jackpal/androidterm/emulatorview/TermShortcutLayout.java b/termemulator/src/main/java/jackpal/androidterm/emulatorview/TermShortcutLayout.java
new file mode 100644
index 00000000..b948ee0f
--- /dev/null
+++ b/termemulator/src/main/java/jackpal/androidterm/emulatorview/TermShortcutLayout.java
@@ -0,0 +1,212 @@
+package jackpal.androidterm.emulatorview;
+
+import android.app.Instrumentation;
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.KeyEvent;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.Button;
+import android.widget.ImageButton;
+import android.widget.LinearLayout;
+
+import java.util.ArrayList;
+
+/**
+ * Created by Hmei
+ * 11/20/17
+ */
+public class TermShortcutLayout extends LinearLayout {
+    private EnterCallback callback;
+
+    public TermShortcutLayout(Context context) {
+        super(context);
+    }
+
+    public TermShortcutLayout(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public TermShortcutLayout(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    public void setCallback(EnterCallback callback) {
+        this.callback = callback;
+    }
+
+    @Override
+    protected void onAttachedToWindow() {
+        super.onAttachedToWindow();
+        initShortcut();
+    }
+
+    private void initShortcut() {
+        LayoutInflater inflater = (LayoutInflater) getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+        String[] shortcuts1 = getResources().getStringArray(R.array.term_shortcut_head);
+        String[] shortcuts2 = getResources().getStringArray(R.array.term_shortcut);
+        ArrayList<String> shortcuts = new ArrayList<>();
+        for (int i=0;i<shortcuts1.length;i++) {
+            shortcuts.add(shortcuts1[i]);
+        }
+        for (int i=0;i<shortcuts2.length;i++) {
+            shortcuts.add(shortcuts2[i]);
+        }
+        for (String shortcut : shortcuts) {
+            final ShortcutBean shortcutBean = new ShortcutBean(shortcut, true);
+            switch (shortcutBean.getName()) {
+                case "tab":
+                    shortcutBean.setListener(new OnClickListener() {
+                        @Override
+                        public void onClick(View v) {
+                            callback.enter("[tab]");
+                        }
+                    });
+                    break;
+                case "del":
+                    shortcutBean.setListener(new OnClickListener() {
+                        @Override
+                        public void onClick(View v) {
+                            new Thread(new Runnable() {
+                                @Override
+                                public void run() {
+                                    Instrumentation inst = new Instrumentation();
+                                    inst.sendKeyDownUpSync(KeyEvent.KEYCODE_DEL);
+                                }
+                            }).start();
+                        }
+                    });
+                    break;
+                case "ltab":
+                    shortcutBean.setListener(new OnClickListener() {
+                        @Override
+                        public void onClick(View v) {
+                            new Thread(new Runnable() {
+                                @Override
+                                public void run() {
+                                    Instrumentation inst = new Instrumentation();
+                                    for (int i = 0; i < 4; i++) {
+                                        inst.sendKeyDownUpSync(KeyEvent.KEYCODE_DEL);
+                                    }
+                                }
+                            }).start();
+                        }
+                    });
+                    break;
+                case "rtab":
+                    shortcutBean.setListener(new OnClickListener() {
+                        @Override
+                        public void onClick(View v) {
+                            callback.enter("    ");
+                        }
+                    });
+                    break;
+                case "def":
+                    shortcutBean.setListener(new OnClickListener() {
+                        @Override
+                        public void onClick(View v) {
+                            callback.enter("def ");
+                        }
+                    });
+                    break;
+                case "if":
+                    shortcutBean.setListener(new OnClickListener() {
+                        @Override
+                        public void onClick(View v) {
+                            callback.enter("if ");
+                        }
+                    });
+                    break;
+                case "for":
+                    shortcutBean.setListener(new OnClickListener() {
+                        @Override
+                        public void onClick(View v) {
+                            callback.enter("for ");
+                        }
+                    });
+                    break;
+                case "imt":
+                    shortcutBean.setListener(new OnClickListener() {
+                        @Override
+                        public void onClick(View v) {
+                            callback.enter("import ");
+                        }
+                    });
+                    break;
+                case "frm":
+                    shortcutBean.setListener(new OnClickListener() {
+                        @Override
+                        public void onClick(View v) {
+                            callback.enter("from ");
+                        }
+                    });
+                    break;
+                case "clz":
+                    shortcutBean.setListener(new OnClickListener() {
+                        @Override
+                        public void onClick(View v) {
+                            callback.enter("class ");
+                        }
+                    });
+                    break;
+                case "ef":
+                    shortcutBean.setListener(new OnClickListener() {
+                        @Override
+                        public void onClick(View v) {
+                            callback.enter("elif ");
+                        }
+                    });
+                    break;
+                case "el":
+                    shortcutBean.setListener(new OnClickListener() {
+                        @Override
+                        public void onClick(View v) {
+                            callback.enter("else ");
+                        }
+                    });
+                    break;
+                case "ret":
+                    shortcutBean.setListener(new OnClickListener() {
+                        @Override
+                        public void onClick(View v) {
+                            callback.enter("return ");
+                        }
+                    });
+                    break;
+                default:
+                    shortcutBean.setListener(new OnClickListener() {
+                        @Override
+                        public void onClick(View v) {
+                            callback.enter(shortcutBean.getName());
+                        }
+                    });
+                    break;
+            }
+
+            switch (shortcutBean.getName()) {
+                case "ltab":
+                    ImageButton tab = (ImageButton) inflater.inflate(R.layout.widget_shortcut_imgbtn, null);
+                    tab.setImageResource(R.drawable.tab1);
+                    tab.setOnClickListener(shortcutBean.getListener());
+                    addView(tab);
+                    break;
+                case "rtab":
+                    ImageButton rtab = (ImageButton) inflater.inflate(R.layout.widget_shortcut_imgbtn, null);
+                    rtab.setImageResource(R.drawable.tab2);
+                    rtab.setOnClickListener(shortcutBean.getListener());
+                    addView(rtab);
+                    break;
+                default:
+                    Button button = (Button) inflater.inflate(R.layout.widget_shortcut_btn, null);
+                    button.setText(shortcutBean.getName());
+                    button.setOnClickListener(shortcutBean.getListener());
+                    addView(button);
+                    break;
+            }
+        }
+    }
+
+    public interface EnterCallback {
+        void enter(String text);
+    }
+}
diff --git a/termemulator/src/main/java/jackpal/androidterm/emulatorview/TerminalEmulator.java b/termemulator/src/main/java/jackpal/androidterm/emulatorview/TerminalEmulator.java
index d620b060..612f57c3 100644
--- a/termemulator/src/main/java/jackpal/androidterm/emulatorview/TerminalEmulator.java
+++ b/termemulator/src/main/java/jackpal/androidterm/emulatorview/TerminalEmulator.java
@@ -22,7 +22,9 @@
 import java.nio.charset.Charset;
 import java.nio.charset.CharsetDecoder;
 import java.nio.charset.CodingErrorAction;
+import java.util.LinkedList;
 import java.util.Locale;
+import java.util.Stack;
 
 import android.util.Log;
 
@@ -33,7 +35,7 @@
  * terminal. Missing functionality: text attributes (bold, underline, reverse
  * video, color) alternate screen cursor key and keypad escape sequences.
  */
-class TerminalEmulator {
+public class TerminalEmulator {
     public void setKeyListener(TermKeyListener l) {
         mKeyListener = l;
     }
@@ -42,7 +44,7 @@ public void setKeyListener(TermKeyListener l) {
     /**
      * The cursor row. Numbered 0..mRows-1.
      */
-    private int mCursorRow;
+    private int             mCursorRow;
 
     /**
      * The cursor column. Numbered 0..mColumns-1.
@@ -319,10 +321,10 @@ public void setKeyListener(TermKeyListener l) {
      */
     private boolean mAlternateCharSet;
 
-    private final static int CHAR_SET_UK = 0;
-    private final static int CHAR_SET_ASCII = 1;
-    private final static int CHAR_SET_SPECIAL_GRAPHICS = 2;
-    private final static int CHAR_SET_ALT_STANDARD = 3;
+    private final static int CHAR_SET_UK                  = 0;
+    private final static int CHAR_SET_ASCII               = 1;
+    private final static int CHAR_SET_SPECIAL_GRAPHICS    = 2;
+    private final static int CHAR_SET_ALT_STANDARD        = 3;
     private final static int CHAR_SET_ALT_SPECIAL_GRAPICS = 4;
 
     /**
@@ -393,13 +395,13 @@ public void setKeyListener(TermKeyListener l) {
     /**
      * UTF-8 support
      */
-    private static final int UNICODE_REPLACEMENT_CHAR = 0xfffd;
-    private boolean mDefaultUTF8Mode = false;
-    private boolean mUTF8Mode = false;
-    private boolean mUTF8EscapeUsed = false;
-    private int mUTF8ToFollow = 0;
-    private ByteBuffer mUTF8ByteBuffer;
-    private CharBuffer mInputCharBuffer;
+    private static final int     UNICODE_REPLACEMENT_CHAR = 0xfffd;
+    private              boolean mDefaultUTF8Mode         = false;
+    private              boolean mUTF8Mode                = false;
+    private              boolean mUTF8EscapeUsed          = false;
+    private              int     mUTF8ToFollow            = 0;
+    private ByteBuffer     mUTF8ByteBuffer;
+    private CharBuffer     mInputCharBuffer;
     private CharsetDecoder mUTF8Decoder;
     private UpdateCallback mUTF8ModeNotify;
 
@@ -670,9 +672,34 @@ private void setDefaultTabStops() {
      * @param length the number of bytes in the array to process
      */
     public void append(byte[] buffer, int base, int length) {
-        if (EmulatorDebug.LOG_CHARACTERS_FLAG) {
-            Log.d(EmulatorDebug.LOG_TAG, "In: '" + EmulatorDebug.bytesToString(buffer, base, length) + "'");
-        }
+
+        //Log.d(EmulatorDebug.LOG_TAG, "In: '" + EmulatorDebug.bytesToString(buffer, base, length) + "'");
+
+
+        if (EmulatorDebug.bytesToString(buffer, base, length).endsWith(">>> ")) {
+            sb = new StringBuffer();
+        } else if (sb != null) {
+            sb.append(EmulatorDebug.bytesToString(buffer, base, length)
+                    .replace("\\x0d", "")
+                    .replace("\\x0a", "")
+                    .replace("\\x08", ""));
+        }
+
+//        if (sb != null && EmulatorDebug.bytesToString(buffer, base, length).equals("\\x0d\\x0a")) {
+//            if (!history.contains(sb.toString().trim())){
+//
+//                if (history.size() >= HISTORY_MAX) {
+//                    history.remove(history.size()-1);
+//                }
+//                history.add(0,sb.toString().trim());
+//
+//                Log.d(EmulatorDebug.LOG_TAG, "History Added: " + sb.toString());
+//
+//            }
+//            Log.d(EmulatorDebug.LOG_TAG, "History: " + sb.toString());
+//            sb = null;
+//        }
+
         for (int i = 0; i < length; i++) {
             byte b = buffer[base + i];
             try {
@@ -686,6 +713,27 @@ public void append(byte[] buffer, int base, int length) {
         }
     }
 
+    void deleteChar() {
+        if (sb != null) {
+            if (sb.length() <= 1) {
+                sb = sb.delete(0,1);
+            } else {
+                String temp = sb.substring(0, sb.length() - 1);
+                sb.setLength(0);
+                sb.append(temp);
+            }
+        }
+    }
+
+//    public LinkedList<String> getHistory() {
+//        return history;
+//    }
+
+    private static final int HISTORY_MAX = 10;
+
+    //private LinkedList<String> history = new LinkedList<>();
+    private StringBuffer       sb      = null;
+
     private void process(byte b) {
         process(b, true);
     }
@@ -1807,9 +1855,7 @@ private boolean autoWrapEnabled() {
     /**
      * Send a Unicode code point to the screen.
      *
-     * @param c         The code point of the character to display
-     * @param foreColor The foreground color of the character
-     * @param backColor The background color of the character
+     * @param c The code point of the character to display
      */
     private void emit(int c, int style) {
         boolean autoWrap = autoWrapEnabled();
diff --git a/termemulator/src/main/java/jackpal/androidterm/emulatorview/TextRenderer.java b/termemulator/src/main/java/jackpal/androidterm/emulatorview/TextRenderer.java
index 67c00db9..4bfa61d1 100644
--- a/termemulator/src/main/java/jackpal/androidterm/emulatorview/TextRenderer.java
+++ b/termemulator/src/main/java/jackpal/androidterm/emulatorview/TextRenderer.java
@@ -32,6 +32,7 @@ interface TextRenderer {
     public static final int MODE_ALT_SHIFT = 2;
     public static final int MODE_CTRL_SHIFT = 4;
     public static final int MODE_FN_SHIFT = 6;
+    public static final int MODE_TAB_SHIFT = 8;
 
     void setReverseVideo(boolean reverseVideo);
 
diff --git a/termemulator/src/main/java/jackpal/androidterm/emulatorview/package.html b/termemulator/src/main/java/jackpal/androidterm/emulatorview/package.html
deleted file mode 100644
index 4ae1f786..00000000
--- a/termemulator/src/main/java/jackpal/androidterm/emulatorview/package.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<html>
-<body>
-<p>This package provides a fairly complete VT100 terminal emulator {@link
-    jackpal.androidterm.emulatorview.TermSession TermSession} and a corresponding
-    Android view {@link jackpal.androidterm.emulatorview.EmulatorView EmulatorView}.
-
-<p>Most users will create a <code>TermSession</code>, connect it to an {@link
-    java.io.InputStream InputStream} and {@link java.io.OutputStream OutputStream}
-    from the emulation client, then instantiate the <code>EmulatorView</code> and
-    add it to an activity's layout.
-</body>
-</html>
diff --git a/termemulator/src/main/res/drawable-xxhdpi/ic_terminal_history.png b/termemulator/src/main/res/drawable-xxhdpi/ic_terminal_history.png
new file mode 100644
index 00000000..1a364541
Binary files /dev/null and b/termemulator/src/main/res/drawable-xxhdpi/ic_terminal_history.png differ
diff --git a/termemulator/src/main/res/drawable-xxhdpi/tab1.png b/termemulator/src/main/res/drawable-xxhdpi/tab1.png
new file mode 100644
index 00000000..1329eaf3
Binary files /dev/null and b/termemulator/src/main/res/drawable-xxhdpi/tab1.png differ
diff --git a/termemulator/src/main/res/drawable-xxhdpi/tab2.png b/termemulator/src/main/res/drawable-xxhdpi/tab2.png
new file mode 100644
index 00000000..85d09a8e
Binary files /dev/null and b/termemulator/src/main/res/drawable-xxhdpi/tab2.png differ
diff --git a/termemulator/src/main/res/layout/widget_shortcut_btn.xml b/termemulator/src/main/res/layout/widget_shortcut_btn.xml
new file mode 100644
index 00000000..9e18fe9d
--- /dev/null
+++ b/termemulator/src/main/res/layout/widget_shortcut_btn.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Button
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="47dp"
+    android:layout_height="wrap_content"
+    android:background="#00000000"
+    android:clickable="true"
+    android:focusable="true"
+    android:minWidth="47dp"
+    android:padding="5dp"
+    android:textColor="#4BAC07"
+    android:textStyle="bold"/>
\ No newline at end of file
diff --git a/termemulator/src/main/res/layout/widget_shortcut_imgbtn.xml b/termemulator/src/main/res/layout/widget_shortcut_imgbtn.xml
new file mode 100644
index 00000000..89466318
--- /dev/null
+++ b/termemulator/src/main/res/layout/widget_shortcut_imgbtn.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ImageButton
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="47dp"
+    android:layout_height="wrap_content"
+    android:background="@null"
+    android:clickable="true"
+    android:focusable="true"
+    android:padding="5dp"/>
\ No newline at end of file
diff --git a/termemulator/src/main/res/values/arrays.xml b/termemulator/src/main/res/values/arrays.xml
new file mode 100644
index 00000000..d0711845
--- /dev/null
+++ b/termemulator/src/main/res/values/arrays.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string-array name="term_shortcut_head" translatable="false">
+        <item>tab</item>
+        <item>del</item>
+    </string-array>
+    <string-array name="term_shortcut" translatable="false">
+        <item>ltab</item>
+        <item>rtab</item>
+        <item>def</item>
+        <item>if</item>
+        <item>ef</item>
+        <item>el</item>
+        <item>for</item>
+        <item>imt</item>
+        <item>frm</item>
+        <item>clz</item>
+        <item>ret</item>
+        <item>:</item>
+        <item>\@</item>
+        <item>=</item>
+        <item>\"</item>
+        <item>\'</item>
+        <item>;</item>
+        <item>,</item>
+        <item>+</item>
+        <item>-</item>
+        <item>*</item>
+        <item>/</item>
+        <item>|</item>
+        <item><![CDATA[<]]></item>
+        <item><![CDATA[>]]></item>
+        <item>(</item>
+        <item>)</item>
+        <item>[</item>
+        <item>]</item>
+        <item>{</item>
+        <item>}</item>
+        <item>#</item>
+    </string-array>
+
+</resources>
\ No newline at end of file
diff --git a/termexec/.gitignore b/termexec/.gitignore
deleted file mode 100644
index 796b96d1..00000000
--- a/termexec/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
diff --git a/termexec/build.gradle b/termexec/build.gradle
index d0f64fd8..03a46484 100644
--- a/termexec/build.gradle
+++ b/termexec/build.gradle
@@ -1,55 +1,66 @@
-buildscript {
-    repositories {
-        jcenter()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.0'
-    }
-}
-apply plugin: 'com.android.library'
-
-repositories {
-    jcenter()
-}
-
-android {
-    compileSdkVersion 23
-    buildToolsVersion '25.0.0'
-    defaultConfig {
-        minSdkVersion 15
-        targetSdkVersion 23
-        versionCode 1
-        versionName "1.0"
-        ndk {
-            moduleName 'libjackpal-termexec2'
-            ldLibs 'log', 'c'
-        }
-    }
-
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-        }
-    }
-}
-
-// by default recent plugin version does not copy any AIDL files "to avoid publishing too much"
-android.libraryVariants.all { variant ->
-    Sync packageAidl = project.tasks.create("addPublic${variant.name.capitalize()}Aidl", Sync) { sync ->
-        from "$project.projectDir/src/main/aidl/"
-        into "$buildDir/intermediates/bundles/${variant.dirName}/aidl/"
-    }
-
-    variant.javaCompile.dependsOn packageAidl
-}
-
-dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:support-annotations:23.4.0'
-}
+buildscript {
+    repositories {
+        jcenter()
+    }
+//    dependencies {
+//        classpath 'com.android.tools.build:gradle:3.0.0'
+//    }
+}
+
+apply plugin: 'com.android.library'
+
+repositories {
+    jcenter()
+    google()
+}
+
+android {
+    compileSdkVersion rootProject.ext.compileSdkVersion
+    buildToolsVersion rootProject.ext.buildToolsVersion
+    defaultConfig {
+        minSdkVersion rootProject.ext.minSdkVersion
+        targetSdkVersion rootProject.ext.minSdkVersion
+        versionCode 1
+        versionName "1.0"
+        ndk {
+            abiFilters 'armeabi-v7a',"arm64-v8a"
+
+        }
+    }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_7
+        targetCompatibility JavaVersion.VERSION_1_7
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+    externalNativeBuild {
+        ndkBuild {
+            path '../termexec/src/main/jni/Android.mk'
+        }
+
+    }
+    lintOptions {
+        abortOnError false
+    }
+}
+
+// by default recent plugin version does not copy any AIDL files "to avoid publishing too much"
+android.libraryVariants.all { variant ->
+    Sync packageAidl = project.tasks.create("addPublic${variant.name.capitalize()}Aidl", Sync) { sync ->
+        from "$project.projectDir/src/main/aidl/"
+        into "$buildDir/intermediates/bundles/${variant.dirName}/aidl/"
+    }
+
+    variant.javaCompile.dependsOn packageAidl
+}
+
+dependencies {
+//    api fileTree(dir: 'libs', include: ['*.jar'])
+    api rootProject.ext.libSupportAnnotation
+}
diff --git a/termexec/src/main/AndroidManifest.xml b/termexec/src/main/AndroidManifest.xml
index 1028e519..6748b56b 100644
--- a/termexec/src/main/AndroidManifest.xml
+++ b/termexec/src/main/AndroidManifest.xml
@@ -1,4 +1,4 @@
-<manifest package="jackpal.androidterm.libtermexec">
-
-    <application />
-</manifest>
+<manifest package="jackpal.androidterm.libtermexec">
+
+    <application />
+</manifest>
diff --git a/termexec/src/main/java/jackpal/androidterm/TermExec.java b/termexec/src/main/java/jackpal/androidterm/TermExec.java
index c62e8b68..243d4752 100644
--- a/termexec/src/main/java/jackpal/androidterm/TermExec.java
+++ b/termexec/src/main/java/jackpal/androidterm/TermExec.java
@@ -26,7 +26,7 @@
 public class TermExec {
     // Warning: bump the library revision, when an incompatible change happens
     static {
-        System.loadLibrary("jackpal-termexec2");
+        System.loadLibrary("termexec");
     }
 
     public static final String SERVICE_ACTION_V1 = "jackpal.androidterm.action.START_TERM.v1";
diff --git a/termexec/src/main/jni/Android.mk b/termexec/src/main/jni/Android.mk
new file mode 100644
index 00000000..fcfc5787
--- /dev/null
+++ b/termexec/src/main/jni/Android.mk
@@ -0,0 +1,32 @@
+LOCAL_PATH := $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := termexec
+LOCAL_LDFLAGS := -Wl,--build-id
+LOCAL_LDLIBS := \
+	-llog \
+	-lc \
+
+LOCAL_SRC_FILES := \
+	process.cpp \
+
+LOCAL_C_INCLUDES += ../jni
+
+include $(BUILD_SHARED_LIBRARY)
+
+# for androidterm
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := androidterm
+LOCAL_LDFLAGS := -Wl,--build-id
+LOCAL_LDLIBS := \
+	-llog \
+
+LOCAL_SRC_FILES := \
+	common.cpp \
+	fileCompat.cpp \
+	termExec.cpp \
+
+LOCAL_C_INCLUDES += ../jni
+
+include $(BUILD_SHARED_LIBRARY)
diff --git a/termexec/src/main/jni/Application.mk b/termexec/src/main/jni/Application.mk
new file mode 100644
index 00000000..5b9d979c
--- /dev/null
+++ b/termexec/src/main/jni/Application.mk
@@ -0,0 +1,3 @@
+# Build for ARMv5TE, mips and x86 architectures.
+APP_ABI := armeabi-v7a arm64-v8a
+APP_PLATFORM := android-15
diff --git a/qpython/src/main/jni/common.cpp b/termexec/src/main/jni/common.cpp
similarity index 100%
rename from qpython/src/main/jni/common.cpp
rename to termexec/src/main/jni/common.cpp
diff --git a/qpython/src/main/jni/common.h b/termexec/src/main/jni/common.h
similarity index 100%
rename from qpython/src/main/jni/common.h
rename to termexec/src/main/jni/common.h
diff --git a/qpython/src/main/jni/fileCompat.cpp b/termexec/src/main/jni/fileCompat.cpp
similarity index 100%
rename from qpython/src/main/jni/fileCompat.cpp
rename to termexec/src/main/jni/fileCompat.cpp
diff --git a/qpython/src/main/jni/fileCompat.h b/termexec/src/main/jni/fileCompat.h
similarity index 100%
rename from qpython/src/main/jni/fileCompat.h
rename to termexec/src/main/jni/fileCompat.h
diff --git a/termexec/src/main/jni/process.cpp b/termexec/src/main/jni/process.cpp
index 7f062ce8..dfbb70e1 100644
--- a/termexec/src/main/jni/process.cpp
+++ b/termexec/src/main/jni/process.cpp
@@ -27,7 +27,7 @@
 #include <termios.h>
 #include <signal.h>
 
-typedef unsigned short char16_t;
+typedef unsigned short char16_tt;
 
 class String8 {
 public:
@@ -41,7 +41,7 @@ class String8 {
         }
     }
 
-    void set(const char16_t *o, size_t numChars) {
+    void set(const char16_tt *o, size_t numChars) {
         if (mString) {
             free(mString);
         }
diff --git a/termexec/src/main/jni/process.h b/termexec/src/main/jni/process.h
index 1886f808..1a370aba 100644
--- a/termexec/src/main/jni/process.h
+++ b/termexec/src/main/jni/process.h
@@ -18,6 +18,7 @@
 #define _JACKPAL_PROCESS_H 1
 
 #include <stddef.h>
+#include <string.h>
 #include "jni.h"
 #include <android/log.h>
 
diff --git a/qpython/src/main/jni/termExec.cpp b/termexec/src/main/jni/termExec.cpp
similarity index 100%
rename from qpython/src/main/jni/termExec.cpp
rename to termexec/src/main/jni/termExec.cpp
diff --git a/qpython/src/main/jni/termExec.h b/termexec/src/main/jni/termExec.h
similarity index 100%
rename from qpython/src/main/jni/termExec.h
rename to termexec/src/main/jni/termExec.h
diff --git a/utils/copy.sh b/utils/copy.sh
new file mode 100644
index 00000000..b056cca1
--- /dev/null
+++ b/utils/copy.sh
@@ -0,0 +1,2 @@
+cp {../qpython-android/,}$1
+git add $1
diff --git a/utils/diff.sh b/utils/diff.sh
new file mode 100644
index 00000000..99913579
--- /dev/null
+++ b/utils/diff.sh
@@ -0,0 +1 @@
+diff -u {../qpython-android/,}$1